diff --git a/amxmodx/CTextParsers.h b/amxmodx/CTextParsers.h
index 45ebe52c..c05929c1 100644
--- a/amxmodx/CTextParsers.h
+++ b/amxmodx/CTextParsers.h
@@ -35,8 +35,6 @@
 #include <ITextParsers.h>
 #include <am-vector.h>
 
-using namespace SourceMod;
-
 /**
 * @param void *			IN: Stream pointer
 * @param char *			IN/OUT: Stream buffer
diff --git a/amxmodx/trie_natives.cpp b/amxmodx/trie_natives.cpp
index 286a1725..700d1f38 100644
--- a/amxmodx/trie_natives.cpp
+++ b/amxmodx/trie_natives.cpp
@@ -14,8 +14,6 @@
 #include "amxmodx.h"
 #include "trie_natives.h"
 
-using namespace SourceMod;
-
 TrieHandles<CellTrie> g_TrieHandles;
 TrieHandles<TrieSnapshot> g_TrieSnapshotHandles;
 
diff --git a/amxmodx/trie_natives.h b/amxmodx/trie_natives.h
index 5f85971d..3bc3b02b 100644
--- a/amxmodx/trie_natives.h
+++ b/amxmodx/trie_natives.h
@@ -15,8 +15,6 @@
 #include <sm_memtable.h>
 #include "CVector.h"
 
-using namespace SourceMod;
-
 enum EntryType
 {
 	EntryType_Cell,
diff --git a/dlls/cstrike/cstrike/CstrikeHacks.cpp b/dlls/cstrike/cstrike/CstrikeHacks.cpp
index 4094d4e4..056e29f9 100644
--- a/dlls/cstrike/cstrike/CstrikeHacks.cpp
+++ b/dlls/cstrike/cstrike/CstrikeHacks.cpp
@@ -16,8 +16,6 @@
 #include "CDetour/detours.h"
 #include <sm_stringhashmap.h>
 
-using namespace SourceMod; // hashmap 
-
 void CtrlDetours_ClientCommand(bool set);
 void CtrlDetours_BuyCommands(bool set);
 
diff --git a/dlls/nvault/Journal.h b/dlls/nvault/Journal.h
index 9789a2c0..bf51c1a1 100755
--- a/dlls/nvault/Journal.h
+++ b/dlls/nvault/Journal.h
@@ -19,8 +19,6 @@
 #include <sm_stringhashmap.h>
 #include <am-string.h>
 
-using namespace SourceMod;
-
 enum JOp
 {
 	Journal_Nop=0,		//no operation
diff --git a/dlls/nvault/NVault.h b/dlls/nvault/NVault.h
index a7b11826..09958670 100755
--- a/dlls/nvault/NVault.h
+++ b/dlls/nvault/NVault.h
@@ -19,8 +19,6 @@
 #include "IVault.h"
 #include "Journal.h"
 
-using namespace SourceMod;
-
 #define VAULT_MAGIC		0x6E564C54			//nVLT
 #define	VAULT_VERSION	0x0200				//second version
 
diff --git a/dlls/nvault/amxxapi.cpp b/dlls/nvault/amxxapi.cpp
index c89dca3a..bb8f9618 100755
--- a/dlls/nvault/amxxapi.cpp
+++ b/dlls/nvault/amxxapi.cpp
@@ -16,8 +16,6 @@
 #include "NVault.h"
 #include <sm_queue.h>
 
-using namespace SourceMod;
-
 #ifdef WIN32
 #define MKDIR(p) mkdir(p)
 #else
diff --git a/public/ITextParsers.h b/public/ITextParsers.h
index 0f88be9e..2a643d32 100644
--- a/public/ITextParsers.h
+++ b/public/ITextParsers.h
@@ -36,8 +36,8 @@
  * @file ITextParsers.h
  * @brief Defines various text/file parsing functions, as well as UTF-8 support code.
  */
-namespace SourceMod
-{
+//namespace SourceMod
+//{
 
 	#define SMINTERFACE_TEXTPARSERS_NAME		"ITextParsers"
 	#define SMINTERFACE_TEXTPARSERS_VERSION		4
@@ -450,9 +450,9 @@ namespace SourceMod
 		}
 		return 1;
 	}
-}
+//}
 
-extern SourceMod::ITextParsers *textparsers;
+extern ITextParsers *textparsers;
 
 #endif //_INCLUDE_SOURCEMOD_TEXTPARSERS_INTERFACE_H_
 
diff --git a/public/sm_stringhashmap.h b/public/sm_stringhashmap.h
index 39f9c0b0..8b521e13 100644
--- a/public/sm_stringhashmap.h
+++ b/public/sm_stringhashmap.h
@@ -50,8 +50,8 @@
 #include <am-moveable.h>
 #include <string.h>
 
-namespace SourceMod
-{
+//namespace SourceMod
+//{
 
 namespace detail
 {
@@ -236,6 +236,6 @@ private:
 	size_t memory_used_;
 };
 
-}
+//}
 
 #endif // _include_sourcemod_hashtable_h_