diff --git a/core/HalfLife2.h b/core/HalfLife2.h
index 90059620..8ad5466e 100644
--- a/core/HalfLife2.h
+++ b/core/HalfLife2.h
@@ -41,6 +41,8 @@
 #include "sm_queue.h"
 #include <IGameHelpers.h>
 #include <KeyValues.h>
+#include <server_class.h>
+#include <datamap.h>
 
 class CCommand;
 
diff --git a/core/smn_entities.cpp b/core/smn_entities.cpp
index 29b341bd..73d7e1e6 100644
--- a/core/smn_entities.cpp
+++ b/core/smn_entities.cpp
@@ -32,7 +32,6 @@
 #include "sm_globals.h"
 #include "sourcemod.h"
 #include "sourcemm_api.h"
-#include "server_class.h"
 #include "PlayerManager.h"
 #include "HalfLife2.h"
 #include "GameConfigs.h"
diff --git a/extensions/sdktools/extension.h b/extensions/sdktools/extension.h
index 9460b4bc..80b67776 100644
--- a/extensions/sdktools/extension.h
+++ b/extensions/sdktools/extension.h
@@ -45,6 +45,8 @@
 #include <IEngineSound.h>
 #include <ivoiceserver.h>
 #include <iplayerinfo.h>
+#include <server_class.h>
+#include <datamap.h>
 #include <convar.h>
 #include <iserver.h>
 #include <cdll_int.h>
diff --git a/extensions/tf2/extension.h b/extensions/tf2/extension.h
index ebb3ae10..2f31e003 100644
--- a/extensions/tf2/extension.h
+++ b/extensions/tf2/extension.h
@@ -39,6 +39,7 @@
 
 #include "smsdk_ext.h"
 #include <IBinTools.h>
+#include <server_class.h>
 
 /**
  * @brief Sample implementation of the SDK Extension.
diff --git a/public/IGameHelpers.h b/public/IGameHelpers.h
index 1467ed6c..9133f655 100644
--- a/public/IGameHelpers.h
+++ b/public/IGameHelpers.h
@@ -32,20 +32,21 @@
 #ifndef _INCLUDE_SOURCEMOD_GAMEHELPERS_H_
 #define _INCLUDE_SOURCEMOD_GAMEHELPERS_H_
 
-#include <IShareSys.h>
-#include <dt_send.h>
-#include <server_class.h>
-#include <datamap.h>
-#include <edict.h>
-
-#define SMINTERFACE_GAMEHELPERS_NAME		"IGameHelpers"
-#define SMINTERFACE_GAMEHELPERS_VERSION		2
-
 /**
  * @file IGameHelpers.h
  * @brief Provides Source helper functions.
  */
 
+#define SMINTERFACE_GAMEHELPERS_NAME		"IGameHelpers"
+#define SMINTERFACE_GAMEHELPERS_VERSION		2
+
+class CBaseEntity;
+class SendProp;
+class ServerClass;
+struct edict_t;
+struct datamap_t;
+struct typedescription_t;
+
 namespace SourceMod
 {
 	/**