From 6091f15217cdde3a043c2d0dc6bf9bdf20bdbc13 Mon Sep 17 00:00:00 2001
From: PeakKS <bbatson101@gmail.com>
Date: Sun, 2 Mar 2025 02:58:45 -0500
Subject: [PATCH] Fix missing includes and standardize non-system includes to
 quotes

---
 core/IPluginManager.h                           |  2 +-
 core/ISmmAPI.h                                  | 12 +++++-------
 core/ISmmPlugin.h                               | 12 ++++++------
 core/ISmmPluginExt.h                            |  2 +-
 core/gamedll_bridge.cpp                         |  5 +++--
 core/metamod.cpp                                | 11 ++++++-----
 core/metamod.h                                  | 12 ++++++------
 core/metamod_console.cpp                        |  7 ++++---
 core/metamod_convar.h                           |  2 +-
 core/metamod_oslink.cpp                         | 10 +++++-----
 core/metamod_oslink.h                           |  4 ++--
 core/metamod_plugins.cpp                        |  5 ++---
 core/metamod_plugins.h                          | 13 +++++++------
 core/metamod_provider.h                         |  2 ++
 core/metamod_util.cpp                           |  5 +++--
 core/metamod_util.h                             |  3 ++-
 core/provider/provider_base.cpp                 | 15 ++++++++-------
 core/provider/provider_base.h                   |  6 +++---
 core/provider/source/provider_source.cpp        | 16 ++++++++--------
 core/provider/source/provider_source.h          |  5 +++--
 core/provider/source2/provider_source2.cpp      | 16 ++++++++--------
 core/provider/source2/provider_source2.h        |  7 ++++---
 core/sourcehook/sh_list.h                       |  1 -
 core/sourcehook/sh_memory.h                     |  2 ++
 core/sourcehook/sh_vector.h                     |  1 +
 core/sourcehook/sourcehook_hookmangen.cpp       |  5 +++--
 core/sourcehook/sourcehook_hookmangen.h         |  8 +++++---
 core/sourcehook/sourcehook_hookmangen_x86.cpp   |  5 +++--
 core/sourcehook/sourcehook_hookmangen_x86.h     |  3 ++-
 .../sourcehook/sourcehook_hookmangen_x86_64.cpp | 11 ++++++-----
 core/sourcehook/sourcehook_hookmangen_x86_64.h  |  3 ++-
 core/sourcehook/sourcehook_impl_chook.h         |  2 ++
 core/sourcehook/sourcehook_impl_chookidman.h    |  2 ++
 core/sourcehook/sourcehook_impl_ciface.h        |  1 +
 core/sourcehook/sourcehook_impl_cproto.h        |  5 +++++
 core/sourcehook/sourcehook_impl_cvfnptr.h       |  2 ++
 core/vsp_bridge.cpp                             | 14 +++++++-------
 loader/gamedll.cpp                              | 17 +++++++++--------
 loader/loader.cpp                               | 13 +++++++------
 loader/loader_bridge.h                          |  2 ++
 loader/serverplugin.cpp                         | 13 +++++++------
 loader/utility.cpp                              | 13 +++++++------
 loader/utility.h                                |  2 +-
 public/metamod_version.h                        |  4 ++--
 versionlib/versionlib.cpp                       |  4 ++--
 45 files changed, 170 insertions(+), 135 deletions(-)

diff --git a/core/IPluginManager.h b/core/IPluginManager.h
index ac0b7c0..14048e1 100644
--- a/core/IPluginManager.h
+++ b/core/IPluginManager.h
@@ -33,7 +33,7 @@
  * @file IPluginManager.h
  */
 
-#include <ISmmPluginExt.h>
+#include "ISmmPluginExt.h"
 
 namespace SourceMM
 {
diff --git a/core/ISmmAPI.h b/core/ISmmAPI.h
index fdd2ec4..2b15adb 100644
--- a/core/ISmmAPI.h
+++ b/core/ISmmAPI.h
@@ -33,9 +33,10 @@
  * @file ISmmAPI.h
  */
 
-#include <stdarg.h>
-#include <sourcehook.h>
-#include <IPluginManager.h>
+#include <cstdarg>
+
+#include "sourcehook.h"
+#include "IPluginManager.h"
 
 #if defined META_NO_HL2SDK
 class CGlobalVars;
@@ -44,7 +45,7 @@ class ConCommandBase;
 typedef ConCommandBase ProviderConVar;
 typedef ConCommandBase ProviderConCommand;
 #else
-#include <eiface.h>
+#include "eiface.h"
 
 #if defined META_IS_SOURCE2
 typedef ConVarRefAbstract ProviderConVar;
@@ -56,9 +57,6 @@ typedef ConCommandBase ProviderConCommand;
 #endif
 #endif
 
-#include <ISmmPlugin.h>
-#include <ISmmPluginExt.h>
-
 #define	MMIFACE_SOURCEHOOK		"ISourceHook"			/**< ISourceHook Pointer */
 #define	MMIFACE_PLMANAGER		"IPluginManager"		/**< SourceMM Plugin Functions */
 #define MMIFACE_SH_HOOKMANAUTOGEN	"IHookManagerAutoGen"		/**< SourceHook::IHookManagerAutoGen Pointer */
diff --git a/core/ISmmPlugin.h b/core/ISmmPlugin.h
index b5a2d11..11a5d50 100644
--- a/core/ISmmPlugin.h
+++ b/core/ISmmPlugin.h
@@ -34,16 +34,16 @@
  * The pure-virtual ISmmPlugin callbacks must be implemented for the load to load.
  */
 
-#include <sourcehook.h>
-#include <IPluginManager.h>
-#include <ISmmAPI.h>
-#include <ISmmPluginExt.h>
+#include "sourcehook.h"
+#include "IPluginManager.h"
+#include "ISmmAPI.h"
+#include "ISmmPluginExt.h"
 
 #ifndef META_NO_HL2SDK
 #if META_IS_SOURCE2
-#include <interfaces/interfaces.h>
+#include "interfaces/interfaces.h"
 #else
-#include <tier1/interface.h>
+#include "tier1/interface.h"
 #endif
 #endif
 
diff --git a/core/ISmmPluginExt.h b/core/ISmmPluginExt.h
index fb0d9e8..5298d4b 100644
--- a/core/ISmmPluginExt.h
+++ b/core/ISmmPluginExt.h
@@ -26,7 +26,7 @@
 #ifndef _INCLUDE_METAMOD_SOURCE_PLUGIN_EXT_H_
 #define _INCLUDE_METAMOD_SOURCE_PLUGIN_EXT_H_
 
-#include <stddef.h>
+#include <cstddef>
 
 /**
  * @file ISmmPluginExt.h Provides an alternate method for loading plugins, 
diff --git a/core/gamedll_bridge.cpp b/core/gamedll_bridge.cpp
index 8e11e80..92e98cc 100644
--- a/core/gamedll_bridge.cpp
+++ b/core/gamedll_bridge.cpp
@@ -23,11 +23,12 @@
  * 3. This notice may not be removed or altered from any source distribution.
  */
 
-#include <assert.h>
+#include <cassert>
+
 #include "metamod.h"
 #include "metamod_plugins.h"
 #include "metamod_util.h"
-#include <loader_bridge.h>
+#include "loader_bridge.h"
 #include "provider/provider_base.h"
 
 using namespace SourceMM;
diff --git a/core/metamod.cpp b/core/metamod.cpp
index 226be81..32347ab 100644
--- a/core/metamod.cpp
+++ b/core/metamod.cpp
@@ -23,18 +23,19 @@
  * 3. This notice may not be removed or altered from any source distribution.
  */
 
-#include <stdio.h>
+#include <cstdio>
+#include <sys/stat.h>
+
 #include "metamod_oslink.h"
 #include "metamod.h"
-#include <interface.h>
-#include <eiface.h>
-#include <metamod_version.h>
+#include "interface.h"
+#include "eiface.h"
+#include "metamod_version.h"
 #include "metamod_provider.h"
 #include "metamod_plugins.h"
 #include "metamod_util.h"
 #include "metamod_console.h"
 #include "provider/provider_base.h"
-#include <sys/stat.h>
 
 #define X64_SUFFIX ".x64"
 
diff --git a/core/metamod.h b/core/metamod.h
index f25e0c7..bee44d3 100644
--- a/core/metamod.h
+++ b/core/metamod.h
@@ -31,12 +31,12 @@
  * @file sourcemm.h
  */
 
-#include <interface.h>
-#include <eiface.h>
-#include <sourcehook/sourcehook_impl.h>
-#include <sourcehook/sourcehook_hookmangen.h>
-#include <sourcehook/sourcehook.h>
-#include <ISmmPlugin.h>
+#include "interface.h"
+#include "eiface.h"
+#include "sourcehook/sourcehook_impl.h"
+#include "sourcehook/sourcehook_hookmangen.h"
+#include "sourcehook/sourcehook.h"
+#include "ISmmPlugin.h"
 #include "metamod_provider.h"
 
 using namespace SourceMM;
diff --git a/core/metamod_console.cpp b/core/metamod_console.cpp
index 5f1f19c..a6e1244 100644
--- a/core/metamod_console.cpp
+++ b/core/metamod_console.cpp
@@ -23,10 +23,11 @@
  * 3. This notice may not be removed or altered from any source distribution.
  */
 
-#include <stdio.h>
+#include <cstdio>
+#include <cctype>
+
 #include "metamod_oslink.h"
-#include <ctype.h>
-#include <metamod_version.h>
+#include "metamod_version.h"
 #include "metamod.h"
 #include "metamod_util.h"
 #include "metamod_console.h"
diff --git a/core/metamod_convar.h b/core/metamod_convar.h
index 0a67996..a880cfd 100644
--- a/core/metamod_convar.h
+++ b/core/metamod_convar.h
@@ -32,7 +32,7 @@
 #define private public
 #endif
 
-#include <convar.h>
+#include "convar.h"
 
 #ifndef META_IS_SOURCE2
 #undef protected
diff --git a/core/metamod_oslink.cpp b/core/metamod_oslink.cpp
index caf2041..f33b543 100644
--- a/core/metamod_oslink.cpp
+++ b/core/metamod_oslink.cpp
@@ -25,14 +25,14 @@
  * Version: $Id$
  */
 
-#include <stdio.h>
-#include "metamod_oslink.h"
-#include <stdlib.h>
-#include <stdio.h>
+#include <cstdlib>
+#include <cstdio>
 #if defined __linux__ || defined __APPLE__
-#include <errno.h>
+#include <cerrno>
 #endif
 
+#include "metamod_oslink.h"
+
 #if defined __WIN32__ || defined _WIN32 || defined WIN32
 const char *dlerror()
 {
diff --git a/core/metamod_oslink.h b/core/metamod_oslink.h
index 83c04d1..add2218 100644
--- a/core/metamod_oslink.h
+++ b/core/metamod_oslink.h
@@ -85,7 +85,7 @@
 #endif
 
 #if defined __linux__ || defined __APPLE__
-	#include <errno.h>
+	#include <cerrno>
 	int GetLastError();
 #endif
 
@@ -103,7 +103,7 @@ bool GetFileOfAddress(void *pAddr, char *buffer, size_t maxlength);
 	typedef __int32				int32_t;
 	typedef unsigned __int32	uint32_t;
 #elif defined __GNUC__
-#include <stdint.h>
+#include <cstdint>
 #endif
 
 #if !defined __linux__ && !defined __APPLE__
diff --git a/core/metamod_plugins.cpp b/core/metamod_plugins.cpp
index 8b45798..f888173 100644
--- a/core/metamod_plugins.cpp
+++ b/core/metamod_plugins.cpp
@@ -23,11 +23,10 @@
  * 3. This notice may not be removed or altered from any source distribution.
  */
 
-#include <stdio.h>
-
+#include <cstdio>
 #include <memory>
 
-#include <amtl/am-string.h>
+#include "amtl/am-string.h"
 #include "metamod_oslink.h"
 #include "metamod.h"
 #include "metamod_plugins.h"
diff --git a/core/metamod_plugins.h b/core/metamod_plugins.h
index 972185b..0a6b1d9 100644
--- a/core/metamod_plugins.h
+++ b/core/metamod_plugins.h
@@ -33,12 +33,13 @@
  * @file CPlugin.cpp
  */
 
-#include <interface.h>
-#include <eiface.h>
-#include <sh_list.h>
-#include <sh_string.h>
-#include <IPluginManager.h>
-#include <ISmmPluginExt.h>
+#include "interface.h"
+#include "eiface.h"
+#include "sh_list.h"
+#include "sh_string.h"
+#include "ISmmAPI.h"
+#include "IPluginManager.h"
+#include "ISmmPluginExt.h"
 #include "metamod_oslink.h"
 
 /**
diff --git a/core/metamod_provider.h b/core/metamod_provider.h
index e29ccc0..1e19159 100644
--- a/core/metamod_provider.h
+++ b/core/metamod_provider.h
@@ -26,6 +26,8 @@
 #ifndef _INCLUDE_METAMOD_SOURCE_SUPPORT_H_
 #define _INCLUDE_METAMOD_SOURCE_SUPPORT_H_
 
+#include "ISmmAPI.h"
+
 namespace SourceMM
 {
 	class MetamodSourceConVar;
diff --git a/core/metamod_util.cpp b/core/metamod_util.cpp
index ad8c74a..86e1009 100644
--- a/core/metamod_util.cpp
+++ b/core/metamod_util.cpp
@@ -26,11 +26,12 @@
  */
 
 #include <cctype>
-#include <string.h>
-#include <stdio.h>
+#include <cstring>
+#include <cstdio>
 #include <string>
 #include <vector>
 #include <algorithm>
+
 #include "metamod_util.h"
 #include "metamod_oslink.h"
 
diff --git a/core/metamod_util.h b/core/metamod_util.h
index 234b804..60e7225 100644
--- a/core/metamod_util.h
+++ b/core/metamod_util.h
@@ -28,7 +28,8 @@
 #ifndef _INCLUDE_UTIL_H
 #define _INCLUDE_UTIL_H
 
-#include <stdarg.h>
+#include <cstddef>
+#include <cstdarg>
 
 #if defined(WIN32) || defined(_WIN32)
 #define BINARY_EXT ".dll"
diff --git a/core/provider/provider_base.cpp b/core/provider/provider_base.cpp
index 6788794..f870e20 100644
--- a/core/provider/provider_base.cpp
+++ b/core/provider/provider_base.cpp
@@ -23,18 +23,19 @@
  * 3. This notice may not be removed or altered from any source distribution.
  */
 
-#include <stdio.h>
-#include <setjmp.h>
+#include <cstdio>
+#include <csetjmp>
+
 #include "../metamod_oslink.h"
-#include <sourcehook.h>
-#include <eiface.h>
-#include <tier0/icommandline.h>
 #include "../metamod_util.h"
+#include "sourcehook.h"
+#include "eiface.h"
+#include "tier0/icommandline.h"
 #include "provider_base.h"
 #include "metamod_console.h"
-#include <filesystem.h>
+#include "filesystem.h"
 #include "metamod.h"
-#include <tier1/KeyValues.h>
+#include "tier1/KeyValues.h"
 
 
 /* Imports */
diff --git a/core/provider/provider_base.h b/core/provider/provider_base.h
index 3e28338..4823583 100644
--- a/core/provider/provider_base.h
+++ b/core/provider/provider_base.h
@@ -32,10 +32,10 @@
 #define DEBUG2
 #undef _DEBUG
 #endif
-#include <sourcehook.h>
-#include <sh_memfuncinfo.h>
+#include "sourcehook.h"
+#include "sh_memfuncinfo.h"
 #if !defined META_IS_SOURCE2
-#include <iserverplugin.h>
+#include "iserverplugin.h"
 #endif
 #include "ISmmAPI.h"
 #include "metamod_provider.h"
diff --git a/core/provider/source/provider_source.cpp b/core/provider/source/provider_source.cpp
index 96247e7..1985790 100644
--- a/core/provider/source/provider_source.cpp
+++ b/core/provider/source/provider_source.cpp
@@ -23,15 +23,15 @@
  * 3. This notice may not be removed or altered from any source distribution.
  */
 
-#include "provider_source.h"
-#include <metamod.h>
-#include <metamod_util.h>
-#include <metamod_console.h>
-#include <KeyValues.h>
-#include <filesystem.h>
-#include <tier0/icommandline.h>
+ #include <csetjmp>
 
-#include <setjmp.h>
+#include "provider_source.h"
+#include "metamod.h"
+#include "metamod_util.h"
+#include "metamod_console.h"
+#include "KeyValues.h"
+#include "filesystem.h"
+#include "tier0/icommandline.h"
 
 #if SOURCE_ENGINE >= SE_ORANGEBOX
 void LocalCommand_Meta(const CCommand& args);
diff --git a/core/provider/source/provider_source.h b/core/provider/source/provider_source.h
index db302ac..77336ca 100644
--- a/core/provider/source/provider_source.h
+++ b/core/provider/source/provider_source.h
@@ -28,10 +28,11 @@
 #ifndef _INCLUDE_METAMOD_SOURCE_SOURCE1_PROVIDER_H_
 #define _INCLUDE_METAMOD_SOURCE_SOURCE1_PROVIDER_H_
 
-#include "../provider_base.h"
 #include <string>
 #include <vector>
-#include <sh_list.h>
+
+#include "../provider_base.h"
+#include "sh_list.h"
 
 class IFileSystem;
 
diff --git a/core/provider/source2/provider_source2.cpp b/core/provider/source2/provider_source2.cpp
index 4b9dc23..9155331 100644
--- a/core/provider/source2/provider_source2.cpp
+++ b/core/provider/source2/provider_source2.cpp
@@ -24,14 +24,14 @@
  */
 
 #include "provider_source2.h"
-#include <metamod.h>
-#include <metamod_util.h>
-#include <metamod_console.h>
-#include <amtl/am-string.h>
-#include <eiface.h>
-#include <KeyValues.h>
-#include <filesystem.h>
-#include <iserver.h>
+#include "metamod.h"
+#include "metamod_util.h"
+#include "metamod_console.h"
+#include "amtl/am-string.h"
+#include "eiface.h"
+#include "KeyValues.h"
+#include "filesystem.h"
+#include "iserver.h"
 
 
 static Source2Provider g_Source2Provider;
diff --git a/core/provider/source2/provider_source2.h b/core/provider/source2/provider_source2.h
index 4363395..818d7f1 100644
--- a/core/provider/source2/provider_source2.h
+++ b/core/provider/source2/provider_source2.h
@@ -28,12 +28,13 @@
 #ifndef _INCLUDE_METAMOD_SOURCE_SOURCE2_PROVIDER_H_
 #define _INCLUDE_METAMOD_SOURCE_SOURCE2_PROVIDER_H_
 
-#include "../provider_base.h"
-#include <tier1/utlvector.h>
-#include <IEngineService.h>
 #include <string>
 #include <vector>
 
+#include "../provider_base.h"
+#include "tier1/utlvector.h"
+#include "IEngineService.h"
+
 // TODO: is this still needed for Dota or CS2 on any platform?
 #if SOURCE_ENGINE == SE_DOTA && defined( _WIN32 )
 #define SHOULD_OVERRIDE_ALLOWDEDICATED_SERVER
diff --git a/core/sourcehook/sh_list.h b/core/sourcehook/sh_list.h
index 21d57c0..927501e 100644
--- a/core/sourcehook/sh_list.h
+++ b/core/sourcehook/sh_list.h
@@ -11,7 +11,6 @@
 #ifndef _INCLUDE_SMM_LIST_H
 #define _INCLUDE_SMM_LIST_H
 
-#include <new>
 #include <stdlib.h>
 
 namespace SourceHook
diff --git a/core/sourcehook/sh_memory.h b/core/sourcehook/sh_memory.h
index d34a9b5..0ea57cf 100644
--- a/core/sourcehook/sh_memory.h
+++ b/core/sourcehook/sh_memory.h
@@ -12,6 +12,8 @@
 #ifndef __SHINT_MEMORY_H__
 #define __SHINT_MEMORY_H__
 
+#include "sourcehook.h"
+
 // Feb 17 / 2005:
 //  Unprotect now sets to readwrite
 //  The vtable doesn't need to be executable anyway
diff --git a/core/sourcehook/sh_vector.h b/core/sourcehook/sh_vector.h
index 9e682a1..b416760 100755
--- a/core/sourcehook/sh_vector.h
+++ b/core/sourcehook/sh_vector.h
@@ -11,6 +11,7 @@
 #ifndef __CVECTOR_H__
 #define __CVECTOR_H__
 
+#include <cstddef>
 #include <assert.h>
 
 //This file originally from AMX Mod X
diff --git a/core/sourcehook/sourcehook_hookmangen.cpp b/core/sourcehook/sourcehook_hookmangen.cpp
index 78be8c4..b6bc7f7 100644
--- a/core/sourcehook/sourcehook_hookmangen.cpp
+++ b/core/sourcehook/sourcehook_hookmangen.cpp
@@ -15,7 +15,9 @@
 // http://www.angelcode.com/dev/callconv/callconv.html
 // http://www.arl.wustl.edu/~lockwood/class/cs306/books/artofasm/Chapter_6/CH06-1.html
 
-#include <stdio.h>
+#include <cstdio>
+#include <cstdarg>							// we might need the address of vsnprintf
+
 #include "sourcehook_impl.h"
 #include "sourcehook_hookmangen.h"
 #if defined( PLATFORM_64BITS ) && !defined( _LINUX )
@@ -26,7 +28,6 @@ typedef SourceHook::Impl::x64GenContext SHGenContext;
 typedef SourceHook::Impl::GenContext SHGenContext;
 #endif
 #include "sh_memory.h"
-#include <stdarg.h>							// we might need the address of vsnprintf
 
 #if SH_COMP == SH_COMP_MSVC
 # define GCC_ONLY(x)
diff --git a/core/sourcehook/sourcehook_hookmangen.h b/core/sourcehook/sourcehook_hookmangen.h
index 8b42bdb..d083879 100644
--- a/core/sourcehook/sourcehook_hookmangen.h
+++ b/core/sourcehook/sourcehook_hookmangen.h
@@ -11,11 +11,13 @@
 #ifndef __SOURCEHOOK_HOOKMANGEN_H__
 #define __SOURCEHOOK_HOOKMANGEN_H__
 
-#include "sh_pagealloc.h"
-#include "sh_asm.h"
 #include <list>
 #include <memory>
 
+#include "sourcehook_impl_cproto.h"
+#include "sh_pagealloc.h"
+#include "sh_asm.h"
+
 namespace SourceHook
 {
 	namespace Impl
@@ -23,7 +25,7 @@ namespace SourceHook
 
 		// Code gen stuff
 #if SH_COMP == SH_COMP_GCC
-#include <stdint.h>
+#include <cstdint>
 		typedef int8_t jit_int8_t;
 		typedef uint8_t jit_uint8_t;
 		typedef int32_t jit_int32_t;
diff --git a/core/sourcehook/sourcehook_hookmangen_x86.cpp b/core/sourcehook/sourcehook_hookmangen_x86.cpp
index a105a19..7653ddf 100644
--- a/core/sourcehook/sourcehook_hookmangen_x86.cpp
+++ b/core/sourcehook/sourcehook_hookmangen_x86.cpp
@@ -15,12 +15,13 @@
 // http://www.angelcode.com/dev/callconv/callconv.html
 // http://www.arl.wustl.edu/~lockwood/class/cs306/books/artofasm/Chapter_6/CH06-1.html
 
-#include <stdio.h>
+#include <cstdio>
+#include <cstdarg>							// we might need the address of vsnprintf
+
 #include "sourcehook_impl.h"
 #include "sourcehook_hookmangen.h"
 #include "sourcehook_hookmangen_x86.h"
 #include "sh_memory.h"
-#include <stdarg.h>							// we might need the address of vsnprintf
 
 #if SH_COMP == SH_COMP_MSVC
 # define GCC_ONLY(x)
diff --git a/core/sourcehook/sourcehook_hookmangen_x86.h b/core/sourcehook/sourcehook_hookmangen_x86.h
index fbc9745..a8a4d04 100644
--- a/core/sourcehook/sourcehook_hookmangen_x86.h
+++ b/core/sourcehook/sourcehook_hookmangen_x86.h
@@ -12,8 +12,9 @@
 #ifndef __SOURCEHOOK_HOOKMANGEN_X86_H__
 #define __SOURCEHOOK_HOOKMANGEN_X86_H__
 
-#include <limits.h>
+#include <climits>
 
+#include "sourcehook_hookmangen.h"
 #include "sh_asm.h"
 
 #undef REG_EAX
diff --git a/core/sourcehook/sourcehook_hookmangen_x86_64.cpp b/core/sourcehook/sourcehook_hookmangen_x86_64.cpp
index 3c748f6..f26f15e 100644
--- a/core/sourcehook/sourcehook_hookmangen_x86_64.cpp
+++ b/core/sourcehook/sourcehook_hookmangen_x86_64.cpp
@@ -15,8 +15,9 @@
 // https://learn.microsoft.com/en-us/cpp/build/x64-calling-convention
 // https://refspecs.linuxbase.orgz/elf/x86_64-abi-0.99.pdf
 
-#include <stdio.h>
+#include <cstdio>
 #include <string>
+
 #include "sourcehook_impl.h"
 #include "sourcehook_hookmangen.h"
 #include "sourcehook_hookmangen_x86_64.h"
@@ -24,10 +25,10 @@
 
 #include "metamod_oslink.h"
 #include "metamod.h"
-#include <interface.h>
-#include <eiface.h>
-#include <metamod_version.h>
-#include <metamod_provider.h>
+#include "interface.h"
+#include "eiface.h"
+#include "metamod_version.h"
+#include "metamod_provider.h"
 
 extern SourceHook::ISourceHook *g_SHPtr;
 extern SourceMM::IMetamodSourceProvider *provider;
diff --git a/core/sourcehook/sourcehook_hookmangen_x86_64.h b/core/sourcehook/sourcehook_hookmangen_x86_64.h
index 37c56fb..38f1320 100644
--- a/core/sourcehook/sourcehook_hookmangen_x86_64.h
+++ b/core/sourcehook/sourcehook_hookmangen_x86_64.h
@@ -12,7 +12,8 @@
 #define __SOURCEHOOK_HOOKMANGEN_X86_64_H__
 
 #include <cstdint>
-#include <limits.h>
+#include <climits>
+
 #include "sh_asm_x86_64.h"
 
 namespace SourceHook
diff --git a/core/sourcehook/sourcehook_impl_chook.h b/core/sourcehook/sourcehook_impl_chook.h
index 2050ed7..1df33bc 100644
--- a/core/sourcehook/sourcehook_impl_chook.h
+++ b/core/sourcehook/sourcehook_impl_chook.h
@@ -11,6 +11,8 @@
 #ifndef __SOURCEHOOK_IMPL_CHOOK_H__
 #define __SOURCEHOOK_IMPL_CHOOK_H__
 
+#include "sourcehook.h"
+
 namespace SourceHook
 {
 	namespace Impl
diff --git a/core/sourcehook/sourcehook_impl_chookidman.h b/core/sourcehook/sourcehook_impl_chookidman.h
index 03f0bc5..c50e102 100644
--- a/core/sourcehook/sourcehook_impl_chookidman.h
+++ b/core/sourcehook/sourcehook_impl_chookidman.h
@@ -11,6 +11,8 @@
 #ifndef __SOURCEHOOK_IMPL_CHOOKIDMAN_H__
 #define __SOURCEHOOK_IMPL_CHOOKIDMAN_H__
 
+#include "sourcehook.h"
+#include "sourcehook_impl_cproto.h"
 #include "sh_vector.h"
 
 namespace SourceHook
diff --git a/core/sourcehook/sourcehook_impl_ciface.h b/core/sourcehook/sourcehook_impl_ciface.h
index 978c16a..34d462c 100644
--- a/core/sourcehook/sourcehook_impl_ciface.h
+++ b/core/sourcehook/sourcehook_impl_ciface.h
@@ -12,6 +12,7 @@
 #define __SOURCEHOOK_IMPL_CIFACE_H__
 
 #include "sh_list.h"
+#include "sourcehook_impl_chook.h"
 
 namespace SourceHook
 {
diff --git a/core/sourcehook/sourcehook_impl_cproto.h b/core/sourcehook/sourcehook_impl_cproto.h
index cb436f1..3519113 100644
--- a/core/sourcehook/sourcehook_impl_cproto.h
+++ b/core/sourcehook/sourcehook_impl_cproto.h
@@ -11,6 +11,11 @@
 #ifndef __SOURCEHOOK_IMPL_CPROTO_H__
 #define __SOURCEHOOK_IMPL_CPROTO_H__
 
+#include <cstddef>
+
+#include "sourcehook.h"
+#include "sh_vector.h"
+
 namespace SourceHook
 {
 	namespace Impl
diff --git a/core/sourcehook/sourcehook_impl_cvfnptr.h b/core/sourcehook/sourcehook_impl_cvfnptr.h
index 1575728..1875113 100644
--- a/core/sourcehook/sourcehook_impl_cvfnptr.h
+++ b/core/sourcehook/sourcehook_impl_cvfnptr.h
@@ -15,6 +15,8 @@
 #include "sh_memory.h"
 #include "sh_pagealloc.h"
 #include "sourcehook_impl_cleanuptask.h"
+#include "sourcehook_impl_chookmaninfo.h"
+#include "sourcehook_impl_ciface.h"
 
 namespace SourceHook
 {
diff --git a/core/vsp_bridge.cpp b/core/vsp_bridge.cpp
index ee385b3..83b5665 100644
--- a/core/vsp_bridge.cpp
+++ b/core/vsp_bridge.cpp
@@ -22,16 +22,16 @@
  * misrepresented as being the original software.
  * 3. This notice may not be removed or altered from any source distribution.
  */
+#include <cassert>
 
 #include "metamod.h"
 #include "metamod_util.h"
-#include <interface.h>
-#include <eiface.h>
-#include <iplayerinfo.h>
-#include <assert.h>
-#include <loader_bridge.h>
-#include <metamod_version.h>
-#include <sh_string.h>
+#include "interface.h"
+#include "eiface.h"
+#include "iplayerinfo.h"
+#include "loader_bridge.h"
+#include "metamod_version.h"
+#include "sh_string.h"
 #include "provider/provider_base.h"
 
 #if SOURCE_ENGINE >= SE_ORANGEBOX
diff --git a/loader/gamedll.cpp b/loader/gamedll.cpp
index de06c51..a0611f6 100644
--- a/loader/gamedll.cpp
+++ b/loader/gamedll.cpp
@@ -23,15 +23,16 @@
  * 3. This notice may not be removed or altered from any source distribution.
  */
 
-#include <stdio.h>
-#include <ctype.h>
-#include <string.h>
-#include <assert.h>
-#include <stdlib.h>
-#include <stddef.h>
+#include <cstdio>
+#include <cctype>
+#include <cstring>
+#include <cassert>
+#include <cstdlib>
+#include <cstddef>
+
 #include "loader.h"
-#include <sh_memfuncinfo.h>
-#include <sh_memory.h>
+#include "sh_memfuncinfo.h"
+#include "sh_memory.h"
 #include "utility.h"
 #include "gamedll.h"
 
diff --git a/loader/loader.cpp b/loader/loader.cpp
index f57283e..574a3e8 100644
--- a/loader/loader.cpp
+++ b/loader/loader.cpp
@@ -23,14 +23,15 @@
  * 3. This notice may not be removed or altered from any source distribution.
  */
 
-#include <time.h>
-#include <assert.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <ctime>
+#include <cassert>
+#include <cstdarg>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include <cstdint>
 #include <cstdlib>
+
 #include "loader.h"
 #include "serverplugin.h"
 #include "gamedll.h"
diff --git a/loader/loader_bridge.h b/loader/loader_bridge.h
index 3fcd8df..aa0be02 100644
--- a/loader/loader_bridge.h
+++ b/loader/loader_bridge.h
@@ -26,6 +26,8 @@
 #ifndef _INCLUDE_METAMOD_SOURCE_LOADER_BRIDGE_H_
 #define _INCLUDE_METAMOD_SOURCE_LOADER_BRIDGE_H_
 
+#include <cstddef>
+
 typedef void* (*QueryValveInterface)(const char *pName, int *pReturnCode);
 class IServerPluginCallbacks;
 
diff --git a/loader/serverplugin.cpp b/loader/serverplugin.cpp
index c6bf4fd..5e8d38c 100644
--- a/loader/serverplugin.cpp
+++ b/loader/serverplugin.cpp
@@ -23,13 +23,14 @@
  * 3. This notice may not be removed or altered from any source distribution.
  */
 
-#include <stdio.h>
-#include <string.h>
-#include <assert.h>
-#include <stddef.h>
+#include <cstdio>
+#include <cstring>
+#include <cassert>
+#include <cstddef>
+
 #include "loader.h"
-#include <sh_memfuncinfo.h>
-#include <sh_memory.h>
+#include "sh_memfuncinfo.h"
+#include "sh_memory.h"
 #include "serverplugin.h"
 #include "gamedll.h"
 
diff --git a/loader/utility.cpp b/loader/utility.cpp
index f7a5f76..f90c518 100644
--- a/loader/utility.cpp
+++ b/loader/utility.cpp
@@ -25,12 +25,13 @@
  * Version: $Id$
  */
 
-#include <stdio.h>
-#include <assert.h>
-#include <string.h>
-#include <ctype.h>
-#include <stdarg.h>
-#include <stdlib.h>
+#include <cstdio>
+#include <cassert>
+#include <cstring>
+#include <cctype>
+#include <cstdarg>
+#include <cstdlib>
+
 #include "loader.h"
 #include "utility.h"
 
diff --git a/loader/utility.h b/loader/utility.h
index 7409061..46c6fe1 100644
--- a/loader/utility.h
+++ b/loader/utility.h
@@ -28,7 +28,7 @@
 #ifndef _INCLUDE_METAMOD_SOURCE_LOADER_UTILITY_H_
 #define _INCLUDE_METAMOD_SOURCE_LOADER_UTILITY_H_
 
-#include <stddef.h>
+#include <cstddef>
 
 extern size_t
 mm_Format(char *buffer, size_t maxlength, const char *fmt, ...);
diff --git a/public/metamod_version.h b/public/metamod_version.h
index 0d4dc60..7ba6436 100644
--- a/public/metamod_version.h
+++ b/public/metamod_version.h
@@ -37,9 +37,9 @@
 #  undef MMS_USE_VERSIONLIB
 # endif
 # if defined MMS_USE_VERSIONLIB
-#  include <versionlib.h>
+#  include "versionlib.h"
 # else 
-#  include <metamod_version_auto.h>
+#  include "metamod_version_auto.h"
 # endif
 #else
 #define MMS_BUILD_TAG		"manual"
diff --git a/versionlib/versionlib.cpp b/versionlib/versionlib.cpp
index 76db83f..c221212 100644
--- a/versionlib/versionlib.cpp
+++ b/versionlib/versionlib.cpp
@@ -23,8 +23,8 @@
  * 3. This notice may not be removed or altered from any source distribution.
  */
 
-#include <metamod_version.h>
-#include <versionlib.h>
+#include "metamod_version.h"
+#include "versionlib.h"
 
 const char *METAMOD_LOCAL_REV = MMS_BUILD_LOCAL_REV;
 const char *METAMOD_SHA = MMS_BUILD_CSET;