diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 84d65ea23..b8531384b 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1328,7 +1328,12 @@ else()
 	set( NOT_COMPILED_SOURCE_FILES ${NOT_COMPILED_SOURCE_FILES} ${VM_JIT_SOURCES} )
 endif()
 
-enable_precompiled_headers( g_pch.h PCH_SOURCES )
+if( MSVC )
+	enable_precompiled_headers( g_pch.h PCH_SOURCES )
+else()
+	# Temporary solution for compilers other than MSVC
+	set_source_files_properties( ${PCH_SOURCES} PROPERTIES COMPILE_FLAGS "-include g_pch.h" )
+endif()
 
 add_executable( zdoom WIN32 MACOSX_BUNDLE
 	${HEADER_FILES}
diff --git a/src/g_pch.h b/src/g_pch.h
index bf2833cf8..bad3eda56 100644
--- a/src/g_pch.h
+++ b/src/g_pch.h
@@ -16,8 +16,10 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <cassert>
+#ifdef _MSC_VER
 #include <direct.h>
 #include <io.h>
+#endif // _MSC_VER
 #include <limits>
 #include <memory>
 #include <tuple>
diff --git a/src/maploader/glnodes.cpp b/src/maploader/glnodes.cpp
index 185de68cf..7d606696d 100644
--- a/src/maploader/glnodes.cpp
+++ b/src/maploader/glnodes.cpp
@@ -1153,7 +1153,7 @@ UNSAFE_CCMD(clearnodecache)
 
 	if (!ScanDirectory(list, path))
 	{
-		Printf("Unable to scan node cache directory %s\n", path);
+		Printf("Unable to scan node cache directory %s\n", path.GetChars());
 		return;
 	}
 
diff --git a/src/utility/files.h b/src/utility/files.h
index f3d768e37..854af172b 100644
--- a/src/utility/files.h
+++ b/src/utility/files.h
@@ -36,6 +36,7 @@
 #ifndef FILES_H
 #define FILES_H
 
+#include <stddef.h>
 #include <stdio.h>
 #include <stdint.h>
 #include <functional>
diff --git a/src/utility/palette.cpp b/src/utility/palette.cpp
index 84debab9f..e79e68a54 100644
--- a/src/utility/palette.cpp
+++ b/src/utility/palette.cpp
@@ -35,11 +35,6 @@
 #include "palette.h"
 #include "palentry.h"
 
-#include <float.h>
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
-
 /****************************/
 /* Palette management stuff */
 /****************************/