diff --git a/tools/quake3/common/cmdlib.cpp b/tools/quake3/common/cmdlib.cpp
index dca28710..2bab9070 100644
--- a/tools/quake3/common/cmdlib.cpp
+++ b/tools/quake3/common/cmdlib.cpp
@@ -36,8 +36,8 @@
 #include "stream/textstream.h"
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <time.h>
-#include <errno.h>
+#include <ctime>
+#include <cerrno>
 
 #ifdef WIN32
 #include <direct.h>
diff --git a/tools/quake3/common/cmdlib.h b/tools/quake3/common/cmdlib.h
index aad33332..ad36e83d 100644
--- a/tools/quake3/common/cmdlib.h
+++ b/tools/quake3/common/cmdlib.h
@@ -25,8 +25,8 @@
 
 #include "bytebool.h"
 
-#include <stdio.h>
-#include <stdlib.h>
+#include <cstdio>
+#include <cstdlib>
 #include <utility>
 
 
diff --git a/tools/quake3/common/md4.cpp b/tools/quake3/common/md4.cpp
index 9e27a852..4e233436 100644
--- a/tools/quake3/common/md4.cpp
+++ b/tools/quake3/common/md4.cpp
@@ -27,7 +27,7 @@
     $Id: mdfour.c 7689 2007-11-12 14:28:40Z divverent $
  */
 
-#include <string.h>     /* XoXus: needed for memset call */
+#include <cstring>     /* XoXus: needed for memset call */
 #include <cstdint>
 
 struct mdfour {
diff --git a/tools/quake3/common/polylib.cpp b/tools/quake3/common/polylib.cpp
index 9cdad3d9..0e7b465e 100644
--- a/tools/quake3/common/polylib.cpp
+++ b/tools/quake3/common/polylib.cpp
@@ -20,7 +20,7 @@
  */
 
 
-#include <stddef.h>
+#include <cstddef>
 #include <cstring>
 
 #include "cmdlib.h"
diff --git a/tools/quake3/common/qstringops.h b/tools/quake3/common/qstringops.h
index 3f29df16..4dbcab91 100644
--- a/tools/quake3/common/qstringops.h
+++ b/tools/quake3/common/qstringops.h
@@ -21,8 +21,8 @@
 
 #pragma once
 
-#include <string.h>
-#include <stdlib.h>
+#include <cstring>
+#include <cstdlib>
 #include <cctype>
 
 inline bool strEmpty( const char* string ){
diff --git a/tools/quake3/common/scriplib.cpp b/tools/quake3/common/scriplib.cpp
index da5e5086..7747ce55 100644
--- a/tools/quake3/common/scriplib.cpp
+++ b/tools/quake3/common/scriplib.cpp
@@ -28,7 +28,7 @@
 #include "scriplib.h"
 #include "vfs.h"
 #include <list>
-#include <errno.h>
+#include <cerrno>
 
 /*
    =============================================================================
diff --git a/tools/quake3/common/vfs.cpp b/tools/quake3/common/vfs.cpp
index a4995c69..d1e7f948 100644
--- a/tools/quake3/common/vfs.cpp
+++ b/tools/quake3/common/vfs.cpp
@@ -44,7 +44,6 @@
 #if defined ( __linux__ ) || defined ( __APPLE__ )
 #include <dirent.h>
 #include <unistd.h>
-#include <limits.h>
 #else
 #include <io.h>
 
@@ -54,8 +53,8 @@
 
 #endif
 
-#include <string.h>
-#include <stdlib.h>
+#include <cstring>
+#include <cstdlib>
 #include <sys/stat.h>
 #include <glib.h>
 
diff --git a/tools/quake3/q3map2/path_init.cpp b/tools/quake3/q3map2/path_init.cpp
index ab987171..db21d257 100644
--- a/tools/quake3/q3map2/path_init.cpp
+++ b/tools/quake3/q3map2/path_init.cpp
@@ -31,6 +31,12 @@
 /* dependencies */
 #include "q3map2.h"
 
+/* platform-specific */
+#if defined( __linux__ ) || defined( __APPLE__ )
+	#include <unistd.h>
+	#include <pwd.h>
+	#define Q_UNIX
+#endif
 
 /*
    some of this code is based off the original q3map port from loki
diff --git a/tools/quake3/q3map2/q3map2.h b/tools/quake3/q3map2/q3map2.h
index cb215f26..17f380db 100644
--- a/tools/quake3/q3map2/q3map2.h
+++ b/tools/quake3/q3map2/q3map2.h
@@ -45,21 +45,6 @@
 
    ------------------------------------------------------------------------------- */
 
-/* platform-specific */
-#if defined( __linux__ ) || defined( __APPLE__ )
-	#define Q_UNIX
-#endif
-
-#ifdef Q_UNIX
-	#include <unistd.h>
-	#include <pwd.h>
-	#include <limits.h>
-#endif
-
-#ifdef WIN32
-	#include <windows.h>
-#endif
-
 
 /* general */
 #include "version.h"            /* ttimo: might want to guard that if built outside of the GtkRadiant tree */
@@ -84,8 +69,8 @@
 #include <forward_list>
 #include "qmath.h"
 
-#include <stddef.h>
-#include <stdlib.h>
+#include <cstddef>
+#include <cstdlib>
 
 #include "maxworld.h"
 #include "games.h"