diff --git a/core/PlayerManager.cpp b/core/PlayerManager.cpp
index d9b3d701..a0607ae6 100644
--- a/core/PlayerManager.cpp
+++ b/core/PlayerManager.cpp
@@ -47,6 +47,7 @@
 #include "logic_bridge.h"
 #include <sourcemod_version.h>
 #include "smn_keyvalues.h"
+#include <ITranslator.h>
 #include <bridge/include/IExtensionBridge.h>
 #include <bridge/include/IScriptManager.h>
 #include <bridge/include/ILogger.h>
diff --git a/core/sm_stringutil.cpp b/core/sm_stringutil.cpp
index 895e42a1..9ba970d1 100644
--- a/core/sm_stringutil.cpp
+++ b/core/sm_stringutil.cpp
@@ -29,17 +29,10 @@
  * Version: $Id$
  */
 
-#include <stdlib.h>
-#include <ctype.h>
-#include <stdarg.h>
-#include <ITextParsers.h>
 #include "sm_stringutil.h"
-#include "Logger.h"
-#include "PlayerManager.h"
-#include "logic_bridge.h"
-#include "sourcemod.h"
-#include <am-utility.h>
-#include <am-float.h>
+#include <ctype.h>
+#include <string.h>
+#include <stdlib.h>
 
 char *sm_strdup(const char *str)
 {
@@ -62,4 +55,3 @@ char *UTIL_ToLowerCase(const char *str)
 	buffer[len] = '\0';
 	return buffer;
 }
-
diff --git a/core/sm_stringutil.h b/core/sm_stringutil.h
index b1433fa3..4b41c8cd 100644
--- a/core/sm_stringutil.h
+++ b/core/sm_stringutil.h
@@ -32,18 +32,9 @@
 #ifndef _INCLUDE_SOURCEMOD_STRINGUTIL_H_
 #define _INCLUDE_SOURCEMOD_STRINGUTIL_H_
 
-#include <math.h>
-#include <sp_vm_api.h>
-#include <sp_typeutil.h>
-#include <ITranslator.h>
-
-using namespace SourcePawn;
-using namespace SourceMod;
-
 #define IS_STR_FILLED(var) (var[0] != '\0')
 
 char *sm_strdup(const char *str);
 char *UTIL_ToLowerCase(const char *str);
 
 #endif // _INCLUDE_SOURCEMOD_STRINGUTIL_H_
-
diff --git a/core/smn_console.cpp b/core/smn_console.cpp
index 7286b0d8..93be827e 100644
--- a/core/smn_console.cpp
+++ b/core/smn_console.cpp
@@ -49,6 +49,7 @@
 #include "smn_keyvalues.h"
 #include <bridge/include/IScriptManager.h>
 #include <bridge/include/ILogger.h>
+#include <ITranslator.h>
 
 #if SOURCE_ENGINE == SE_CSGO || SOURCE_ENGINE == SE_DOTA
 #include <netmessages.pb.h>