diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 28090d7e..3029398e 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -113,6 +113,12 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang
                 -Wpedantic
         )
     endif()
+    if (NOT WIN32 AND NOT APPLE)
+        target_link_libraries(${EXECUTABLE}
+            PRIVATE
+                X11
+        )
+    endif()
 elseif(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
     target_compile_options(${EXECUTABLE}
         PUBLIC
@@ -120,6 +126,11 @@ elseif(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
     )
 endif()
 
+if (WIN32)
+    target_link_libraries(${EXECUTABLE} PRIVATE
+            winnm)
+endif()
+
 set_target_properties(${EXECUTABLE}
     PROPERTIES
         C_STANDARD 11
diff --git a/src/skel/glfw/glfw.cpp b/src/skel/glfw/glfw.cpp
index 8d3fc7d7..977af517 100644
--- a/src/skel/glfw/glfw.cpp
+++ b/src/skel/glfw/glfw.cpp
@@ -233,7 +233,9 @@ psGrabScreen(RwCamera *pCamera)
  *****************************************************************************
  */
 #ifdef _WIN32
+#if defined _MSC_VER && !defined CMAKE_NO_AUTOLINK
 #pragma comment( lib, "Winmm.lib" ) // Needed for time
+#endif
 RwUInt32
 psTimer(void)
 {
@@ -1129,11 +1131,11 @@ void InitialiseLanguage()
 #else
 	WORD primUserLCID	= PRIMARYLANGID(GetSystemDefaultLCID());
 	WORD primSystemLCID = PRIMARYLANGID(GetUserDefaultLCID());
-	WORD primLayout		= PRIMARYLANGID((DWORD)GetKeyboardLayout(0));
+	WORD primLayout		= PRIMARYLANGID((DWORD_PTR)GetKeyboardLayout(0));
 	
 	WORD subUserLCID	= SUBLANGID(GetSystemDefaultLCID());
 	WORD subSystemLCID	= SUBLANGID(GetUserDefaultLCID());
-	WORD subLayout		= SUBLANGID((DWORD)GetKeyboardLayout(0));
+	WORD subLayout		= SUBLANGID((DWORD_PTR)GetKeyboardLayout(0));
 #endif
 	if (   primUserLCID	  == LANG_GERMAN
 		|| primSystemLCID == LANG_GERMAN