diff --git a/client/Mac/.gitignore b/client/Mac/.gitignore
new file mode 100644
index 000000000..600769254
--- /dev/null
+++ b/client/Mac/.gitignore
@@ -0,0 +1,2 @@
+*.app
+
diff --git a/client/Mac/Info.plist b/client/Mac/Info.plist
index 530ecb9a7..119d3fec6 100644
--- a/client/Mac/Info.plist
+++ b/client/Mac/Info.plist
@@ -5,7 +5,7 @@
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleExecutable</key>
-	<string>${EXECUTABLE_NAME}</string>
+	<string></string>
 	<key>CFBundleIconFile</key>
 	<string></string>
 	<key>CFBundleIdentifier</key>
@@ -13,7 +13,7 @@
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
-	<string>${PRODUCT_NAME}</string>
+	<string></string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
@@ -23,7 +23,7 @@
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>LSMinimumSystemVersion</key>
-	<string>${MACOSX_DEPLOYMENT_TARGET}</string>
+	<string></string>
 	<key>NSHumanReadableCopyright</key>
 	<string>Copyright © 2012 __MyCompanyName__. All rights reserved.</string>
 	<key>NSMainNibFile</key>
diff --git a/libfreerdp/core/http.c b/libfreerdp/core/http.c
index da25709ef..561174326 100644
--- a/libfreerdp/core/http.c
+++ b/libfreerdp/core/http.c
@@ -151,10 +151,6 @@ void http_request_set_auth_param(HttpRequest* http_request, char* auth_param)
 
 #ifndef _WIN32
 
-#ifndef errno_t
-typedef int errno_t;
-#endif
-
 errno_t _itoa_s(int value, char* buffer, size_t sizeInCharacters, int radix)
 {
 	int length;
diff --git a/libfreerdp/locale/keyboard_keymap.c b/libfreerdp/locale/keyboard_keymap.c
index e4eb06b9e..920e6b59f 100644
--- a/libfreerdp/locale/keyboard_keymap.c
+++ b/libfreerdp/locale/keyboard_keymap.c
@@ -23,6 +23,10 @@
 
 #include "keyboard_keymap.h"
 
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
 #include <freerdp/utils/file.h>
 #include <freerdp/utils/memory.h>
 #include <freerdp/locale/vkcodes.h>
diff --git a/winpr/include/winpr/wtypes.h b/winpr/include/winpr/wtypes.h
index 65868531c..6a7c1099e 100644
--- a/winpr/include/winpr/wtypes.h
+++ b/winpr/include/winpr/wtypes.h
@@ -262,7 +262,6 @@ typedef struct _PROCESS_INFORMATION
 typedef DWORD (*PTHREAD_START_ROUTINE)(LPVOID lpThreadParameter);
 typedef PTHREAD_START_ROUTINE LPTHREAD_START_ROUTINE;
 
-typedef void* HMODULE;
 typedef void* FARPROC;
 
 #endif
diff --git a/winpr/libwinpr/crt/alignment.c b/winpr/libwinpr/crt/alignment.c
index 084eef03f..bc60d35a6 100644
--- a/winpr/libwinpr/crt/alignment.c
+++ b/winpr/libwinpr/crt/alignment.c
@@ -28,7 +28,12 @@
 #ifndef _WIN32
 
 #include <stdlib.h>
+
+#ifdef __APPLE__
+#include <malloc/malloc.h>
+#else
 #include <malloc.h>
+#endif
 
 void* _aligned_malloc(size_t size, size_t alignment)
 {