From b0b997e493a33095383c0f10dfd6d1244ff8ad83 Mon Sep 17 00:00:00 2001
From: Garux <garux@mail.ru>
Date: Sun, 31 Oct 2021 12:38:53 +0300
Subject: [PATCH] manage stl includes

---
 contrib/bkgrnd2d/plugin.h         | 2 +-
 contrib/bobtoolz/DBrush.h         | 2 +-
 contrib/bobtoolz/DPatch.h         | 2 +-
 contrib/bobtoolz/DShape.cpp       | 2 +-
 contrib/bobtoolz/DShape.h         | 2 +-
 contrib/bobtoolz/ScriptParser.cpp | 2 +-
 contrib/bobtoolz/cportals.cpp     | 4 ++--
 contrib/bobtoolz/shapes.cpp       | 2 +-
 contrib/brushexport/support.h     | 4 ----
 contrib/hydratoolz/plugin.h       | 7 +++----
 contrib/prtview/ConfigDialog.cpp  | 2 +-
 contrib/prtview/portals.cpp       | 6 +++---
 contrib/prtview/prtview.cpp       | 4 ++--
 include/igl.h                     | 2 +-
 libs/bytestreamutils.h            | 2 +-
 libs/cmdlib.h                     | 2 +-
 libs/cmdlib/cmdlib.cpp            | 4 ++--
 libs/debugging/debugging.h        | 2 +-
 libs/eclasslib.h                  | 4 ++--
 libs/gtkutil/cursor.cpp           | 2 +-
 libs/gtkutil/entry.h              | 4 ++--
 libs/gtkutil/menu.cpp             | 2 +-
 libs/imagelib.h                   | 2 +-
 libs/math/vector.h                | 2 +-
 libs/memory/allocator.h           | 2 +-
 libs/os/file.h                    | 2 +-
 libs/picomodel/picointernal.c     | 1 -
 libs/profile/file.cpp             | 8 ++++----
 libs/profile/file.h               | 2 +-
 libs/profile/profile.cpp          | 8 ++++----
 libs/scenelib.h                   | 2 +-
 libs/selectionlib.h               | 2 +-
 libs/str.h                        | 8 ++++----
 libs/stream/textfilestream.h      | 2 +-
 libs/stream/textstream.h          | 4 ++--
 libs/stringio.h                   | 2 +-
 libs/versionlib.h                 | 2 +-
 libs/xml/xmlparser.h              | 4 ++--
 plugins/assmodel/plugin.cpp       | 4 ++--
 plugins/entity/light.cpp          | 2 +-
 plugins/entity/namekeys.h         | 2 +-
 plugins/image/dds.cpp             | 2 +-
 plugins/image/jpeg.cpp            | 8 ++++----
 plugins/image/ktx.cpp             | 2 +-
 plugins/image/pcx.cpp             | 2 +-
 plugins/image/tga.cpp             | 2 +-
 plugins/imagehl/hlw.cpp           | 6 +++---
 plugins/imagehl/mip.cpp           | 6 +++---
 plugins/imagehl/sprite.cpp        | 6 +++---
 plugins/imagepng/plugin.cpp       | 2 +-
 plugins/md3model/ident.h          | 2 +-
 plugins/md3model/mdlimage.cpp     | 4 ++--
 plugins/model/plugin.cpp          | 4 ++--
 plugins/shaders/shaders.cpp       | 4 ++--
 plugins/spritemodel/plugin.h      | 4 ++--
 plugins/textool/StdAfx.h          | 4 ++--
 plugins/vfspk3/archive.cpp        | 4 ++--
 plugins/vfspk3/vfs.cpp            | 4 ++--
 radiant/console.cpp               | 2 +-
 radiant/dialog.cpp                | 2 +-
 radiant/eclass_def.cpp            | 2 +-
 radiant/environment.cpp           | 2 +-
 radiant/error.cpp                 | 2 +-
 radiant/grid.cpp                  | 2 +-
 radiant/gtktheme.cpp              | 6 +++---
 radiant/mru.cpp                   | 4 ++--
 radiant/qgl.cpp                   | 6 +++---
 radiant/texmanip.cpp              | 2 +-
 radiant/timer.cpp                 | 4 ++--
 radiant/url.cpp                   | 4 ++--
 radiant/view.cpp                  | 2 +-
 tools/quake3/common/jpeg.cpp      | 8 ++++----
 tools/quake3/common/unzip.cpp     | 6 +++---
 73 files changed, 120 insertions(+), 126 deletions(-)

diff --git a/contrib/bkgrnd2d/plugin.h b/contrib/bkgrnd2d/plugin.h
index cd548196..3dcec2c3 100644
--- a/contrib/bkgrnd2d/plugin.h
+++ b/contrib/bkgrnd2d/plugin.h
@@ -34,7 +34,7 @@
    and the external dependencies (such as GLib, STL, mathlib etc.)
  */
 
-#include <stdio.h>
+#include <cstdio>
 // for CPtrArray for idata.h
 #include "missing.h"
 
diff --git a/contrib/bobtoolz/DBrush.h b/contrib/bobtoolz/DBrush.h
index ea71454d..19734e9c 100644
--- a/contrib/bobtoolz/DBrush.h
+++ b/contrib/bobtoolz/DBrush.h
@@ -23,7 +23,7 @@
 
 #pragma once
 
-#include <stdio.h>
+#include <cstdio>
 #include <list>
 #include "mathlib.h"
 #include "str.h"
diff --git a/contrib/bobtoolz/DPatch.h b/contrib/bobtoolz/DPatch.h
index 43f3b7f8..fd226b59 100644
--- a/contrib/bobtoolz/DPatch.h
+++ b/contrib/bobtoolz/DPatch.h
@@ -24,7 +24,7 @@
 #pragma once
 
 #include <list>
-#include <stdlib.h>
+#include <cstdlib>
 
 typedef struct
 {
diff --git a/contrib/bobtoolz/DShape.cpp b/contrib/bobtoolz/DShape.cpp
index 8c675ff9..201390b8 100644
--- a/contrib/bobtoolz/DShape.cpp
+++ b/contrib/bobtoolz/DShape.cpp
@@ -24,7 +24,7 @@
 #include "DShape.h"
 
 #include <list>
-#include <time.h>
+#include <ctime>
 #include "str.h"
 
 #include "DPoint.h"
diff --git a/contrib/bobtoolz/DShape.h b/contrib/bobtoolz/DShape.h
index 649c030a..e0858351 100644
--- a/contrib/bobtoolz/DShape.h
+++ b/contrib/bobtoolz/DShape.h
@@ -23,7 +23,7 @@
 
 #pragma once
 
-#include <stdlib.h>
+#include <cstdlib>
 #include "mathlib.h"
 #include "DMap.h"
 class DBrush;
diff --git a/contrib/bobtoolz/ScriptParser.cpp b/contrib/bobtoolz/ScriptParser.cpp
index d53c7fe8..c48c64cc 100644
--- a/contrib/bobtoolz/ScriptParser.cpp
+++ b/contrib/bobtoolz/ScriptParser.cpp
@@ -18,7 +18,7 @@
  */
 
 #include "ScriptParser.h"
-#include <string.h>
+#include <cstring>
 
 CScriptParser::CScriptParser( void ) :
 	m_pScript( NULL ),
diff --git a/contrib/bobtoolz/cportals.cpp b/contrib/bobtoolz/cportals.cpp
index 6674f169..fc8363f6 100644
--- a/contrib/bobtoolz/cportals.cpp
+++ b/contrib/bobtoolz/cportals.cpp
@@ -19,8 +19,8 @@
 
 #include "CPortals.h"
 
-#include <string.h>
-#include <math.h>
+#include <cstring>
+#include <cmath>
 
 #include "misc.h"
 
diff --git a/contrib/bobtoolz/shapes.cpp b/contrib/bobtoolz/shapes.cpp
index 4c9e020b..5cb09dc9 100644
--- a/contrib/bobtoolz/shapes.cpp
+++ b/contrib/bobtoolz/shapes.cpp
@@ -40,7 +40,7 @@
 #include <list>
 #include <map>
 #include <algorithm>
-#include <time.h>
+#include <ctime>
 
 #include "scenelib.h"
 #include "texturelib.h"
diff --git a/contrib/brushexport/support.h b/contrib/brushexport/support.h
index 50a33c7c..f02cd776 100644
--- a/contrib/brushexport/support.h
+++ b/contrib/brushexport/support.h
@@ -4,10 +4,6 @@
 
 #pragma once
 
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
 #include <gtk/gtk.h>
 
 /*
diff --git a/contrib/hydratoolz/plugin.h b/contrib/hydratoolz/plugin.h
index 9a3cd3f9..854e663e 100644
--- a/contrib/hydratoolz/plugin.h
+++ b/contrib/hydratoolz/plugin.h
@@ -22,9 +22,9 @@
 #pragma once
 
 #include "mathlib.h"
-#include <string.h>
+#include <cstring>
 #include "qertypes.h"
-#include <stdio.h>
+#include <cstdio>
 
 #define USE_QERTABLE_DEFINE
 #include "iscenegraph.h"
@@ -35,8 +35,7 @@
 #include "ientity.h"
 
 #include <gtk/gtk.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "iplugin.h"
 
diff --git a/contrib/prtview/ConfigDialog.cpp b/contrib/prtview/ConfigDialog.cpp
index 73baae83..c3ababd5 100644
--- a/contrib/prtview/ConfigDialog.cpp
+++ b/contrib/prtview/ConfigDialog.cpp
@@ -18,7 +18,7 @@
  */
 
 #include "ConfigDialog.h"
-#include <stdio.h>
+#include <cstdio>
 #include <gtk/gtk.h>
 #include "gtkutil/pointer.h"
 
diff --git a/contrib/prtview/portals.cpp b/contrib/prtview/portals.cpp
index 55d754d7..8f61f241 100644
--- a/contrib/prtview/portals.cpp
+++ b/contrib/prtview/portals.cpp
@@ -18,12 +18,12 @@
  */
 
 #include "portals.h"
-#include <string.h>
-#include <stdlib.h>
+#include <cstring>
+#include <cstdlib>
 #ifndef __APPLE__
 #include <search.h>
 #endif
-#include <stdio.h>
+#include <cstdio>
 
 #include "iglrender.h"
 #include "cullable.h"
diff --git a/contrib/prtview/prtview.cpp b/contrib/prtview/prtview.cpp
index ad8c6f21..2d93fd9a 100644
--- a/contrib/prtview/prtview.cpp
+++ b/contrib/prtview/prtview.cpp
@@ -19,8 +19,8 @@
 
 
 #include "prtview.h"
-#include <stdio.h>
-#include <stdlib.h>
+#include <cstdio>
+#include <cstdlib>
 
 #include "profile/profile.h"
 
diff --git a/include/igl.h b/include/igl.h
index e9526270..a37b0a70 100644
--- a/include/igl.h
+++ b/include/igl.h
@@ -22,7 +22,7 @@
 #pragma once
 
 #include <cstddef>
-#include <string.h>
+#include <cstring>
 #include "generic/constant.h"
 
 #if defined( WIN32 )
diff --git a/libs/bytestreamutils.h b/libs/bytestreamutils.h
index 6c0a7aca..278bdfe4 100644
--- a/libs/bytestreamutils.h
+++ b/libs/bytestreamutils.h
@@ -29,7 +29,7 @@
 #define __USE_ISOC9X    1
 #define __USE_ISOC99    1
 
-#include <stdint.h>
+#include <cstdint>
 
 #endif
 
diff --git a/libs/cmdlib.h b/libs/cmdlib.h
index 09634a32..0df55e98 100644
--- a/libs/cmdlib.h
+++ b/libs/cmdlib.h
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#include <time.h>
+#include <ctime>
 
 
 // TTimo started adding portability code:
diff --git a/libs/cmdlib/cmdlib.cpp b/libs/cmdlib/cmdlib.cpp
index 44cda8cd..ecf24abd 100644
--- a/libs/cmdlib/cmdlib.cpp
+++ b/libs/cmdlib/cmdlib.cpp
@@ -25,8 +25,8 @@
 
 #include "cmdlib.h"
 
-#include <string.h>
-#include <stdio.h>
+#include <cstring>
+#include <cstdio>
 
 #include "string/string.h"
 #include "os/path.h"
diff --git a/libs/debugging/debugging.h b/libs/debugging/debugging.h
index 27cf6299..debe855c 100644
--- a/libs/debugging/debugging.h
+++ b/libs/debugging/debugging.h
@@ -33,7 +33,7 @@
 #elif ( defined ( __i386__ ) || defined ( __x86_64__ ) ) && defined ( __GNUC__ ) && __GNUC__ >= 2
 #define DEBUGGER_BREAKPOINT() __asm__ __volatile__ ( "int $03" )
 #else
-#include <signal.h>
+#include <csignal>
 
 #define DEBUGGER_BREAKPOINT() raise( SIGTRAP );
 #endif
diff --git a/libs/eclasslib.h b/libs/eclasslib.h
index 8ff4148b..c57c90fc 100644
--- a/libs/eclasslib.h
+++ b/libs/eclasslib.h
@@ -21,8 +21,8 @@
 
 #pragma once
 
-#include <stdio.h>
-#include <stdlib.h>
+#include <cstdio>
+#include <cstdlib>
 #include <list>
 #include <map>
 #include <vector>
diff --git a/libs/gtkutil/cursor.cpp b/libs/gtkutil/cursor.cpp
index 58d3f2d4..8eefe980 100644
--- a/libs/gtkutil/cursor.cpp
+++ b/libs/gtkutil/cursor.cpp
@@ -23,7 +23,7 @@
 
 #include "stream/textstream.h"
 
-#include <string.h>
+#include <cstring>
 #include <gdk/gdk.h>
 
 #if 0
diff --git a/libs/gtkutil/entry.h b/libs/gtkutil/entry.h
index 48b9292b..0ad82689 100644
--- a/libs/gtkutil/entry.h
+++ b/libs/gtkutil/entry.h
@@ -21,8 +21,8 @@
 
 #pragma once
 
-#include <stdio.h>
-#include <stdlib.h>
+#include <cstdio>
+#include <cstdlib>
 #include <gtk/gtk.h>
 
 inline void entry_set_string( GtkEntry* entry, const char* string ){
diff --git a/libs/gtkutil/menu.cpp b/libs/gtkutil/menu.cpp
index 70cd3106..b0258523 100644
--- a/libs/gtkutil/menu.cpp
+++ b/libs/gtkutil/menu.cpp
@@ -21,7 +21,7 @@
 
 #include "menu.h"
 
-#include <ctype.h>
+#include <cctype>
 #include <gtk/gtk.h>
 
 #include "generic/callback.h"
diff --git a/libs/imagelib.h b/libs/imagelib.h
index ba65ade3..c9f7c8f6 100644
--- a/libs/imagelib.h
+++ b/libs/imagelib.h
@@ -24,7 +24,7 @@
 #include "iimage.h"
 #include "iarchive.h"
 #include "idatastream.h"
-#include <stdlib.h>
+#include <cstdlib>
 
 struct RGBAPixel
 {
diff --git a/libs/math/vector.h b/libs/math/vector.h
index ab424897..d5272821 100644
--- a/libs/math/vector.h
+++ b/libs/math/vector.h
@@ -68,7 +68,7 @@ inline long long llrint( double f ){
 #endif
 
 #include <cmath>
-#include <float.h>
+#include <cfloat>
 #include <algorithm>
 
 
diff --git a/libs/memory/allocator.h b/libs/memory/allocator.h
index 99d89658..611dfe2c 100644
--- a/libs/memory/allocator.h
+++ b/libs/memory/allocator.h
@@ -22,7 +22,7 @@
 #pragma once
 
 #include <memory>
-#include <stddef.h>
+#include <cstddef>
 
 #if 0
 
diff --git a/libs/os/file.h b/libs/os/file.h
index 4d6d3f51..29af303f 100644
--- a/libs/os/file.h
+++ b/libs/os/file.h
@@ -45,7 +45,7 @@
 #include <unistd.h> // access()
 #endif
 
-#include <stdio.h> // rename(), remove()
+#include <cstdio> // rename(), remove()
 #include <sys/stat.h> // stat()
 #include <sys/types.h> // this is included by stat.h on win32
 #include <cstddef>
diff --git a/libs/picomodel/picointernal.c b/libs/picomodel/picointernal.c
index 4405f82f..e79248ac 100644
--- a/libs/picomodel/picointernal.c
+++ b/libs/picomodel/picointernal.c
@@ -35,7 +35,6 @@
 
 
 /* dependencies */
-#include <string.h>
 #include "picointernal.h"
 
 
diff --git a/libs/profile/file.cpp b/libs/profile/file.cpp
index f8fb6699..e9a7cbd5 100644
--- a/libs/profile/file.cpp
+++ b/libs/profile/file.cpp
@@ -37,10 +37,10 @@
 
 #include "file.h"
 
-#include <memory.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdarg.h>
+#include <memory>
+#include <cstdlib>
+#include <cstring>
+#include <cstdarg>
 
 /////////////////////////////////////////////////////////////////////////////
 // File construction/destruction
diff --git a/libs/profile/file.h b/libs/profile/file.h
index 495aa690..e85d985c 100644
--- a/libs/profile/file.h
+++ b/libs/profile/file.h
@@ -71,7 +71,7 @@ public:
 	virtual void Close() = 0;
 };
 
-#include <stdio.h>
+#include <cstdio>
 
 class MemStream : public IDataStream
 {
diff --git a/libs/profile/profile.cpp b/libs/profile/profile.cpp
index c1505e07..83af032e 100644
--- a/libs/profile/profile.cpp
+++ b/libs/profile/profile.cpp
@@ -36,13 +36,13 @@
 
 #include "profile.h"
 
-#include <string.h>
-#include <stdio.h>
-#include <math.h>
+#include <cstring>
+#include <cstdio>
+#include <cmath>
 
 #include "file.h"
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "str.h"
 
diff --git a/libs/scenelib.h b/libs/scenelib.h
index b0f6a3db..57ce015b 100644
--- a/libs/scenelib.h
+++ b/libs/scenelib.h
@@ -26,7 +26,7 @@
 
 #include "warnings.h"
 #include <cstddef>
-#include <string.h>
+#include <cstring>
 
 #include "math/aabb.h"
 #include "transformlib.h"
diff --git a/libs/selectionlib.h b/libs/selectionlib.h
index 89304e73..8bb732db 100644
--- a/libs/selectionlib.h
+++ b/libs/selectionlib.h
@@ -24,7 +24,7 @@
 #include "iselection.h"
 #include "generic/callback.h"
 #include "scenelib.h"
-#include <stdlib.h>
+#include <cstdlib>
 
 class SelectableBool : public Selectable
 {
diff --git a/libs/str.h b/libs/str.h
index ed7eeec4..c6d59827 100644
--- a/libs/str.h
+++ b/libs/str.h
@@ -35,11 +35,11 @@
 // loose replacement for CString from MFC
 //
 
-#include <string.h>
-#include <ctype.h>
+#include <cstring>
+#include <cctype>
 
-#include <stdio.h>
-#include <stdarg.h>
+#include <cstdio>
+#include <cstdarg>
 
 #include <cstdio>
 
diff --git a/libs/stream/textfilestream.h b/libs/stream/textfilestream.h
index df0e6d12..0697d262 100644
--- a/libs/stream/textfilestream.h
+++ b/libs/stream/textfilestream.h
@@ -22,7 +22,7 @@
 #pragma once
 
 #include "itextstream.h"
-#include <stdio.h>
+#include <cstdio>
 
 /// \brief A wrapper around a file input stream opened for reading in text mode. Similar to std::ifstream.
 class TextFileInputStream : public TextInputStream
diff --git a/libs/stream/textstream.h b/libs/stream/textstream.h
index a53442f3..96ee3cd8 100644
--- a/libs/stream/textstream.h
+++ b/libs/stream/textstream.h
@@ -29,8 +29,8 @@
 #include <cctype>
 #include <cstddef>
 #include <cmath>
-#include <stdio.h>
-#include <string.h>
+#include <cstdio>
+#include <cstring>
 #include <algorithm>
 
 #include "generic/arrayrange.h"
diff --git a/libs/stringio.h b/libs/stringio.h
index b91ebccd..f85da6ea 100644
--- a/libs/stringio.h
+++ b/libs/stringio.h
@@ -21,7 +21,7 @@
 
 #pragma once
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <cctype>
 
 #include "generic/vector.h"
diff --git a/libs/versionlib.h b/libs/versionlib.h
index 1e211e7b..1b9cee7f 100644
--- a/libs/versionlib.h
+++ b/libs/versionlib.h
@@ -22,7 +22,7 @@
 #pragma once
 
 #include <cstddef>
-#include <string.h>
+#include <cstring>
 #include <algorithm>
 
 class Version
diff --git a/libs/xml/xmlparser.h b/libs/xml/xmlparser.h
index e30093d0..86c2811c 100644
--- a/libs/xml/xmlparser.h
+++ b/libs/xml/xmlparser.h
@@ -22,7 +22,7 @@
 #pragma once
 
 #include <cstdio>
-#include <string.h>
+#include <cstring>
 #include "ixml.h"
 #include "libxml/parser.h"
 #include "convert.h"
@@ -62,7 +62,7 @@ private:
 	const char** m_atts;
 };
 
-#include <stdarg.h>
+#include <cstdarg>
 
 class FormattedVA
 {
diff --git a/plugins/assmodel/plugin.cpp b/plugins/assmodel/plugin.cpp
index af5c0217..e4965f2c 100644
--- a/plugins/assmodel/plugin.cpp
+++ b/plugins/assmodel/plugin.cpp
@@ -21,9 +21,9 @@
 
 #include "plugin.h"
 
-#include <stdio.h>
+#include <cstdio>
 typedef unsigned char byte;
-#include <stdlib.h>
+#include <cstdlib>
 #include <algorithm>
 #include <list>
 
diff --git a/plugins/entity/light.cpp b/plugins/entity/light.cpp
index 8ea1394a..c93d1717 100644
--- a/plugins/entity/light.cpp
+++ b/plugins/entity/light.cpp
@@ -36,7 +36,7 @@
 
 #include "light.h"
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "cullable.h"
 #include "renderable.h"
diff --git a/plugins/entity/namekeys.h b/plugins/entity/namekeys.h
index 3755b357..35a7c378 100644
--- a/plugins/entity/namekeys.h
+++ b/plugins/entity/namekeys.h
@@ -21,7 +21,7 @@
 
 #pragma once
 
-#include <stdio.h>
+#include <cstdio>
 #include <map>
 #include "generic/static.h"
 #include "entitylib.h"
diff --git a/plugins/image/dds.cpp b/plugins/image/dds.cpp
index 0da0d3a2..2a6f0666 100644
--- a/plugins/image/dds.cpp
+++ b/plugins/image/dds.cpp
@@ -21,7 +21,7 @@
 
 #include "dds.h"
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "ifilesystem.h"
 #include "iarchive.h"
diff --git a/plugins/image/jpeg.cpp b/plugins/image/jpeg.cpp
index 1d1c933a..6c2616dc 100644
--- a/plugins/image/jpeg.cpp
+++ b/plugins/image/jpeg.cpp
@@ -36,10 +36,10 @@
 
 #include "jpeg.h"
 
-#include <setjmp.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
+#include <csetjmp>
+#include <cstdlib>
+#include <cstdio>
+#include <cstring>
 
 extern "C" {
 #include <jpeglib.h>
diff --git a/plugins/image/ktx.cpp b/plugins/image/ktx.cpp
index 4df65d42..ca073a40 100644
--- a/plugins/image/ktx.cpp
+++ b/plugins/image/ktx.cpp
@@ -21,7 +21,7 @@
 
 #include "ktx.h"
 
-#include <string.h>
+#include <cstring>
 
 #include "bytestreamutils.h"
 #include "etclib.h"
diff --git a/plugins/image/pcx.cpp b/plugins/image/pcx.cpp
index 02f2a041..2f77e075 100644
--- a/plugins/image/pcx.cpp
+++ b/plugins/image/pcx.cpp
@@ -25,7 +25,7 @@
 
 typedef unsigned char byte;
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "imagelib.h"
 #include "bytestreamutils.h"
diff --git a/plugins/image/tga.cpp b/plugins/image/tga.cpp
index a845d5c6..3cdd308e 100644
--- a/plugins/image/tga.cpp
+++ b/plugins/image/tga.cpp
@@ -27,7 +27,7 @@
 
 typedef unsigned char byte;
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "generic/bitfield.h"
 #include "imagelib.h"
diff --git a/plugins/imagehl/hlw.cpp b/plugins/imagehl/hlw.cpp
index 73275547..5986611f 100644
--- a/plugins/imagehl/hlw.cpp
+++ b/plugins/imagehl/hlw.cpp
@@ -29,9 +29,9 @@
 
 #include "hlw.h"
 
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
+#include <cstdlib>
+#include <cstring>
+#include <cstdio>
 
 typedef unsigned char byte;
 
diff --git a/plugins/imagehl/mip.cpp b/plugins/imagehl/mip.cpp
index 94332ff5..f9738e53 100644
--- a/plugins/imagehl/mip.cpp
+++ b/plugins/imagehl/mip.cpp
@@ -21,9 +21,9 @@
 
 #include "mip.h"
 
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
+#include <cstdlib>
+#include <cstring>
+#include <cstdio>
 
 typedef unsigned char byte;
 
diff --git a/plugins/imagehl/sprite.cpp b/plugins/imagehl/sprite.cpp
index cb82ef91..23b1c05a 100644
--- a/plugins/imagehl/sprite.cpp
+++ b/plugins/imagehl/sprite.cpp
@@ -23,9 +23,9 @@
 
 #include "sprite.h"
 
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
+#include <cstdlib>
+#include <cstring>
+#include <cstdio>
 
 typedef unsigned char byte;
 
diff --git a/plugins/imagepng/plugin.cpp b/plugins/imagepng/plugin.cpp
index 2e0a2925..e7ad3e7c 100644
--- a/plugins/imagepng/plugin.cpp
+++ b/plugins/imagepng/plugin.cpp
@@ -31,7 +31,7 @@
 // ====== PNG loader functionality ======
 
 #include "png.h"
-#include <stdlib.h>
+#include <cstdlib>
 
 void user_warning_fn( png_structp png_ptr, png_const_charp warning_msg ){
 	globalWarningStream() << "libpng warning: " << warning_msg << "\n";
diff --git a/plugins/md3model/ident.h b/plugins/md3model/ident.h
index 6b66967c..c388ca59 100644
--- a/plugins/md3model/ident.h
+++ b/plugins/md3model/ident.h
@@ -21,7 +21,7 @@
 
 #pragma once
 
-#include <string.h>
+#include <cstring>
 
 // equality comparison for two 4-byte ident strings
 inline bool ident_equal( const unsigned char* ident, const unsigned char* other ){
diff --git a/plugins/md3model/mdlimage.cpp b/plugins/md3model/mdlimage.cpp
index 8a2adad2..cb719551 100644
--- a/plugins/md3model/mdlimage.cpp
+++ b/plugins/md3model/mdlimage.cpp
@@ -21,8 +21,8 @@
 
 #include "mdlimage.h"
 
-#include <math.h>
-#include <stdlib.h>
+#include <cmath>
+#include <cstdlib>
 
 #include "ifilesystem.h"
 #include "bytestreamutils.h"
diff --git a/plugins/model/plugin.cpp b/plugins/model/plugin.cpp
index ef8d13b2..e3daf174 100644
--- a/plugins/model/plugin.cpp
+++ b/plugins/model/plugin.cpp
@@ -21,10 +21,10 @@
 
 #include "plugin.h"
 
-#include <stdio.h>
+#include <cstdio>
 #include "picomodel.h"
 typedef unsigned char byte;
-#include <stdlib.h>
+#include <cstdlib>
 #include <algorithm>
 #include <list>
 
diff --git a/plugins/shaders/shaders.cpp b/plugins/shaders/shaders.cpp
index f12bf8e3..f735aeae 100644
--- a/plugins/shaders/shaders.cpp
+++ b/plugins/shaders/shaders.cpp
@@ -36,8 +36,8 @@
 
 #include "shaders.h"
 
-#include <stdio.h>
-#include <stdlib.h>
+#include <cstdio>
+#include <cstdlib>
 #include <map>
 #include <list>
 
diff --git a/plugins/spritemodel/plugin.h b/plugins/spritemodel/plugin.h
index 97f5e2e9..0de913f9 100644
--- a/plugins/spritemodel/plugin.h
+++ b/plugins/spritemodel/plugin.h
@@ -29,9 +29,9 @@
 #pragma once
 
 #include "mathlib.h"
-#include <string.h>
+#include <cstring>
 #include "qertypes.h"
-#include <stdio.h>
+#include <cstdio>
 
 #define USE_QERTABLE_DEFINE
 #include "qerplugin.h"
diff --git a/plugins/textool/StdAfx.h b/plugins/textool/StdAfx.h
index cf37f940..f586529b 100644
--- a/plugins/textool/StdAfx.h
+++ b/plugins/textool/StdAfx.h
@@ -25,8 +25,8 @@
 // standard headers
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include <cstdio>
+#include <cstdlib>
 
 #if !defined( WIN32 )
 
diff --git a/plugins/vfspk3/archive.cpp b/plugins/vfspk3/archive.cpp
index 2f6de2f3..eec494da 100644
--- a/plugins/vfspk3/archive.cpp
+++ b/plugins/vfspk3/archive.cpp
@@ -24,8 +24,8 @@
 #include "idatastream.h"
 #include "iarchive.h"
 
-#include <stdio.h>
-#include <stdlib.h>
+#include <cstdio>
+#include <cstdlib>
 #include <vector>
 
 #include "stream/filestream.h"
diff --git a/plugins/vfspk3/vfs.cpp b/plugins/vfspk3/vfs.cpp
index c16f7672..28146e86 100644
--- a/plugins/vfspk3/vfs.cpp
+++ b/plugins/vfspk3/vfs.cpp
@@ -43,8 +43,8 @@
 
 #include "vfs.h"
 
-#include <stdio.h>
-#include <stdlib.h>
+#include <cstdio>
+#include <cstdlib>
 #include <glib.h>
 
 #include "qerplugin.h"
diff --git a/radiant/console.cpp b/radiant/console.cpp
index e3049591..14660ad2 100644
--- a/radiant/console.cpp
+++ b/radiant/console.cpp
@@ -21,7 +21,7 @@
 
 #include "console.h"
 
-#include <time.h>
+#include <ctime>
 #include <gtk/gtk.h>
 
 #include "gtkutil/accelerator.h"
diff --git a/radiant/dialog.cpp b/radiant/dialog.cpp
index f340c339..39d724b5 100644
--- a/radiant/dialog.cpp
+++ b/radiant/dialog.cpp
@@ -33,7 +33,7 @@
 
 #include "mainframe.h"
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include <gtk/gtk.h>
 
diff --git a/radiant/eclass_def.cpp b/radiant/eclass_def.cpp
index 45951fd5..c32ebb21 100644
--- a/radiant/eclass_def.cpp
+++ b/radiant/eclass_def.cpp
@@ -66,7 +66,7 @@ StaticRegisterModule staticRegisterEclassDef( StaticEclassDefModule::instance()
 
 #include "string/string.h"
 
-#include <stdlib.h>
+#include <cstdlib>
 
 
 char com_token[1024];
diff --git a/radiant/environment.cpp b/radiant/environment.cpp
index da39ca9c..192689e6 100644
--- a/radiant/environment.cpp
+++ b/radiant/environment.cpp
@@ -207,7 +207,7 @@ void cmdMap(){
 
 #if defined( POSIX )
 
-#include <stdlib.h>
+#include <cstdlib>
 #include <pwd.h>
 #include <unistd.h>
 
diff --git a/radiant/error.cpp b/radiant/error.cpp
index d6a5112e..eed1aa03 100644
--- a/radiant/error.cpp
+++ b/radiant/error.cpp
@@ -33,7 +33,7 @@
 #define UNICODE
 #include <windows.h>
 #else
-#include <errno.h>
+#include <cerrno>
 #include <unistd.h>
 #endif
 
diff --git a/radiant/grid.cpp b/radiant/grid.cpp
index b501f542..ccd23fe9 100644
--- a/radiant/grid.cpp
+++ b/radiant/grid.cpp
@@ -21,7 +21,7 @@
 
 #include "grid.h"
 
-#include <math.h>
+#include <cmath>
 #include <vector>
 #include <algorithm>
 
diff --git a/radiant/gtktheme.cpp b/radiant/gtktheme.cpp
index 2813b169..5f176bad 100644
--- a/radiant/gtktheme.cpp
+++ b/radiant/gtktheme.cpp
@@ -9,7 +9,7 @@
 
 #include <iostream>
 #include <fstream>
-#include <stdlib.h>
+#include <cstdlib>
 #include <sstream>
 #include <gtk/gtk.h>
 
@@ -22,8 +22,8 @@
 #include <unistd.h>
 
 #include <sys/types.h>
-#include <string.h>
-#include <stdio.h>
+#include <cstring>
+#include <cstdio>
 #include <gdk/gdkkeysyms.h>
 
 #include "gtktheme.h"
diff --git a/radiant/mru.cpp b/radiant/mru.cpp
index 46908ad8..6e82d6d6 100644
--- a/radiant/mru.cpp
+++ b/radiant/mru.cpp
@@ -21,8 +21,8 @@
 
 #include "mru.h"
 
-#include <string.h>
-#include <stdio.h>
+#include <cstring>
+#include <cstdio>
 #include <gtk/gtk.h>
 
 #include "os/file.h"
diff --git a/radiant/qgl.cpp b/radiant/qgl.cpp
index 8e0b3936..f207030a 100644
--- a/radiant/qgl.cpp
+++ b/radiant/qgl.cpp
@@ -24,9 +24,9 @@
 
 #include "debugging/debugging.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 
 #if defined( _WIN32 )
 #define WINGDIAPI __declspec( dllimport )
diff --git a/radiant/texmanip.cpp b/radiant/texmanip.cpp
index 6fec694b..fbeafc52 100644
--- a/radiant/texmanip.cpp
+++ b/radiant/texmanip.cpp
@@ -31,7 +31,7 @@
 
 #include "texmanip.h"
 
-#include <stdlib.h>
+#include <cstdlib>
 #include "stream/textstream.h"
 
 static byte *row1 = NULL, *row2 = NULL;
diff --git a/radiant/timer.cpp b/radiant/timer.cpp
index e6c3012e..abdd6dab 100644
--- a/radiant/timer.cpp
+++ b/radiant/timer.cpp
@@ -64,8 +64,8 @@ MillisecondTime MillisecondTime::current(){
 
 #elif defined( POSIX )
 
-#include <time.h>
-#include "sys/time.h"
+#include <ctime>
+#include <sys/time.h>
 
 MillisecondTime MillisecondTime::current(){
 	static class Cached
diff --git a/radiant/url.cpp b/radiant/url.cpp
index 4300416d..c033fdd6 100644
--- a/radiant/url.cpp
+++ b/radiant/url.cpp
@@ -33,7 +33,7 @@ bool open_url( const char* url ){
 #endif
 
 #if defined( __linux__ ) || defined( __FreeBSD__ )
-#include <stdlib.h>
+#include <cstdlib>
 bool open_url( const char* url ){
 	char command[2 * PATH_MAX];
 	snprintf( command, sizeof( command ),
@@ -43,7 +43,7 @@ bool open_url( const char* url ){
 #endif
 
 #ifdef __APPLE__
-#include <stdlib.h>
+#include <cstdlib>
 bool open_url( const char* url ){
 	char command[2 * PATH_MAX];
 	snprintf( command, sizeof( command ), "open \"%s\" &", url );
diff --git a/radiant/view.cpp b/radiant/view.cpp
index a0a48c43..3ea76367 100644
--- a/radiant/view.cpp
+++ b/radiant/view.cpp
@@ -23,7 +23,7 @@
 
 #if defined( DEBUG_CULLING )
 
-#include <stdio.h>
+#include <cstdio>
 
 char g_cull_stats[1024];
 int g_count_dots;
diff --git a/tools/quake3/common/jpeg.cpp b/tools/quake3/common/jpeg.cpp
index 74a7e186..1b546654 100644
--- a/tools/quake3/common/jpeg.cpp
+++ b/tools/quake3/common/jpeg.cpp
@@ -34,10 +34,10 @@
 // Leonardo Zide (leo@lokigames.com)
 //
 
-#include <setjmp.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
+#include <csetjmp>
+#include <cstdlib>
+#include <cstdio>
+#include <cstring>
 
 #include <jpeglib.h>
 #include <jerror.h>
diff --git a/tools/quake3/common/unzip.cpp b/tools/quake3/common/unzip.cpp
index ba77f2d0..5cbd594c 100644
--- a/tools/quake3/common/unzip.cpp
+++ b/tools/quake3/common/unzip.cpp
@@ -33,9 +33,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
  *****************************************************************************/
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstdio>
+#include <cstring>
 #include "unzip.h"
 
 // TTimo added for safe_malloc wrapping