diff --git a/CMakeLists.txt b/CMakeLists.txt
index 347b8214e..7474f69b5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -482,7 +482,7 @@ if(WIN32)
 	add_definitions(-D_WINSOCK_DEPRECATED_NO_WARNINGS)
 
 	set(CMAKE_USE_RELATIVE_PATH ON)
-    if (${CMAKE_GENERATOR} MATCHES "NMake Makefile*" OR ${CMAKE_GENERATOR} MATCHES "Ninja*")
+	if (${CMAKE_GENERATOR} MATCHES "NMake Makefile*" OR ${CMAKE_GENERATOR} MATCHES "Ninja*" OR ${CMAKE_GENERATOR} MATCHES "Unix Makefiles")
 		set(CMAKE_PDB_BINARY_DIR ${CMAKE_BINARY_DIR})
 	elseif (${CMAKE_GENERATOR} MATCHES "Visual Studio*")
 		set(CMAKE_PDB_BINARY_DIR "${CMAKE_BINARY_DIR}/\${CMAKE_INSTALL_CONFIG_NAME}")
diff --git a/channels/audin/client/winmm/audin_winmm.c b/channels/audin/client/winmm/audin_winmm.c
index 5e210055f..00f098d80 100644
--- a/channels/audin/client/winmm/audin_winmm.c
+++ b/channels/audin/client/winmm/audin_winmm.c
@@ -27,8 +27,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <Windows.h>
-#include <MMSystem.h>
+#include <windows.h>
+#include <mmsystem.h>
 
 #include <winpr/crt.h>
 #include <winpr/cmdline.h>
diff --git a/channels/rdpsnd/client/winmm/rdpsnd_winmm.c b/channels/rdpsnd/client/winmm/rdpsnd_winmm.c
index d81345705..706876a4a 100644
--- a/channels/rdpsnd/client/winmm/rdpsnd_winmm.c
+++ b/channels/rdpsnd/client/winmm/rdpsnd_winmm.c
@@ -29,8 +29,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <Windows.h>
-#include <MMSystem.h>
+#include <windows.h>
+#include <mmsystem.h>
 
 #include <winpr/crt.h>
 #include <winpr/cmdline.h>
diff --git a/client/Windows/CMakeLists.txt b/client/Windows/CMakeLists.txt
index c645baf81..627457198 100644
--- a/client/Windows/CMakeLists.txt
+++ b/client/Windows/CMakeLists.txt
@@ -78,6 +78,7 @@ endif()
 
 set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} freerdp-client)
 set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} winpr freerdp)
+set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} msimg32)
 target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS})
 
 if(WITH_CLIENT_INTERFACE)
diff --git a/client/Windows/wf_client.c b/client/Windows/wf_client.c
index 3cd396d0f..b14ada157 100644
--- a/client/Windows/wf_client.c
+++ b/client/Windows/wf_client.c
@@ -783,7 +783,7 @@ static int freerdp_client_focus_out(wfContext* wfc)
 	return 0;
 }
 
-static int freerdp_client_set_window_size(wfContext* wfc, int width, int height)
+int freerdp_client_set_window_size(wfContext* wfc, int width, int height)
 {
 	WLog_DBG(TAG,  "freerdp_client_set_window_size %d, %d", width, height);
 
diff --git a/client/Windows/wf_cliprdr.c b/client/Windows/wf_cliprdr.c
index 75733e6c6..3dac8e63c 100644
--- a/client/Windows/wf_cliprdr.c
+++ b/client/Windows/wf_cliprdr.c
@@ -27,10 +27,10 @@
 #define CINTERFACE
 #define COBJMACROS
 
-#include <Ole2.h>
-#include <ShlObj.h>
-#include <Windows.h>
-#include <WinUser.h>
+#include <ole2.h>
+#include <shlobj.h>
+#include <windows.h>
+#include <winuser.h>
 
 #include <assert.h>
 
@@ -41,7 +41,7 @@
 #include <freerdp/log.h>
 #include <freerdp/client/cliprdr.h>
 
-#include <Strsafe.h>
+#include <strsafe.h>
 
 #include "wf_cliprdr.h"
 
diff --git a/cmake/FindOpenSSL.cmake b/cmake/FindOpenSSL.cmake
index 35af2e50e..11874e085 100644
--- a/cmake/FindOpenSSL.cmake
+++ b/cmake/FindOpenSSL.cmake
@@ -63,13 +63,13 @@ FIND_PATH(OPENSSL_INCLUDE_DIR
     include
 )
 
-IF(WIN32)
+IF(MSVC)
   if(${MSVC_RUNTIME} STREQUAL "static")
     set(MSVC_RUNTIME_SUFFIX "MT")
   else()
     set(MSVC_RUNTIME_SUFFIX "MD")
   endif()
-ENDIF(WIN32)
+ENDIF(MSVC)
 
 IF(ANDROID)
     FIND_LIBRARY(OPENSSL_LIBRARIES
diff --git a/winpr/include/winpr/path.h b/winpr/include/winpr/path.h
index 2e1902ebf..8f9a9d0d6 100644
--- a/winpr/include/winpr/path.h
+++ b/winpr/include/winpr/path.h
@@ -309,7 +309,7 @@ WINPR_API BOOL PathIsDirectoryEmptyW(LPCWSTR pszPath);
 #endif
 
 #ifdef _WIN32
-#include <Shlwapi.h>
+#include <shlwapi.h>
 #endif
 
 #endif /* WINPR_PATH_H */
diff --git a/winpr/libwinpr/CMakeLists.txt b/winpr/libwinpr/CMakeLists.txt
index 078f774f6..ff29801f0 100644
--- a/winpr/libwinpr/CMakeLists.txt
+++ b/winpr/libwinpr/CMakeLists.txt
@@ -121,7 +121,7 @@ if (WIN32)
     @ONLY)
 
   set (WINPR_SRCS ${WINPR_SRCS} ${CMAKE_CURRENT_BINARY_DIR}/version.rc)
-  list(APPEND WINPR_LIBS "Shlwapi")
+  list(APPEND WINPR_LIBS "shlwapi")
 endif()
 
 add_library(${MODULE_NAME} ${WINPR_SRCS})
diff --git a/winpr/libwinpr/clipboard/CMakeLists.txt b/winpr/libwinpr/clipboard/CMakeLists.txt
index 1383fcc18..8c5520000 100644
--- a/winpr/libwinpr/clipboard/CMakeLists.txt
+++ b/winpr/libwinpr/clipboard/CMakeLists.txt
@@ -20,7 +20,8 @@ winpr_module_add(
 	clipboard.c
 	clipboard.h)
 
-if(HAVE_UNISTD_H)
+# MinGW has unistd.h
+if(HAVE_UNISTD_H AND NOT WIN32)
 	winpr_definition_add(-DWITH_WCLIPBOARD_POSIX)
 	winpr_module_add(
 		posix.h
diff --git a/winpr/libwinpr/path/shell.c b/winpr/libwinpr/path/shell.c
index b3c0a8203..95e16dd19 100644
--- a/winpr/libwinpr/path/shell.c
+++ b/winpr/libwinpr/path/shell.c
@@ -41,7 +41,7 @@
 #endif
 
 #if defined(WIN32)
-#include <Shlobj.h>
+#include <shlobj.h>
 #else
 #include <errno.h>
 #include <dirent.h>
diff --git a/winpr/libwinpr/utils/CMakeLists.txt b/winpr/libwinpr/utils/CMakeLists.txt
index b0e828819..335958d9a 100644
--- a/winpr/libwinpr/utils/CMakeLists.txt
+++ b/winpr/libwinpr/utils/CMakeLists.txt
@@ -147,7 +147,7 @@ if((FREEBSD) AND (NOT KFREEBSD))
 endif()
 
 if(WIN32)
-	winpr_library_add(Dbghelp)
+	winpr_library_add(dbghelp)
 endif()
 
 if(BUILD_TESTING)
diff --git a/winpr/libwinpr/utils/debug.c b/winpr/libwinpr/utils/debug.c
index ae199231a..e344e3aef 100644
--- a/winpr/libwinpr/utils/debug.c
+++ b/winpr/libwinpr/utils/debug.c
@@ -36,8 +36,8 @@
 
 #if defined(_WIN32) || defined(_WIN64)
 #include <io.h>
-#include <Windows.h>
-#include <Dbghelp.h>
+#include <windows.h>
+#include <dbghelp.h>
 #define write _write
 #endif
 
diff --git a/winpr/libwinpr/wtsapi/wtsapi_win32.c b/winpr/libwinpr/wtsapi/wtsapi_win32.c
index 5c85d1235..8b12a3ed6 100644
--- a/winpr/libwinpr/wtsapi/wtsapi_win32.c
+++ b/winpr/libwinpr/wtsapi/wtsapi_win32.c
@@ -413,7 +413,7 @@ BOOL WINAPI Win32_WTSVirtualChannelRead_Static(WTSAPI_CHANNEL* pChannel, DWORD d
 
 			CopyMemory(lpBuffer, pChannel->chunk, numBytesToRead);
 			*lpNumberOfBytesTransferred += numBytesToRead;
-			((BYTE*) lpBuffer) += numBytesToRead;
+			lpBuffer = (BYTE*)lpBuffer + numBytesToRead;
 			nNumberOfBytesToRead -= numBytesToRead;
 			pChannel->readOffset += numBytesToRead;
 
@@ -524,7 +524,7 @@ BOOL WINAPI Win32_WTSVirtualChannelRead_Dynamic(WTSAPI_CHANNEL* pChannel, DWORD
 
 				CopyMemory(lpBuffer, pChannel->header, numBytesRead);
 				*lpNumberOfBytesTransferred += numBytesRead;
-				((BYTE*) lpBuffer) += numBytesRead;
+				lpBuffer = (BYTE*)lpBuffer + numBytesRead;
 				nNumberOfBytesToRead -= numBytesRead;
 			}