diff --git a/amxmodx/CCmd.cpp b/amxmodx/CCmd.cpp
index d4fb80b2..a0469d4d 100755
--- a/amxmodx/CCmd.cpp
+++ b/amxmodx/CCmd.cpp
@@ -29,8 +29,6 @@
 *  version.
 */
 
-#include <extdll.h>
-#include <meta_api.h>
 #include "amxmodx.h"
 #include "CCmd.h"
 
diff --git a/amxmodx/CFile.cpp b/amxmodx/CFile.cpp
index f63824e0..2743140e 100755
--- a/amxmodx/CFile.cpp
+++ b/amxmodx/CFile.cpp
@@ -29,8 +29,9 @@
 *  version.
 */
 
-#include "CFile.h"
 #include <ctype.h>
+#include "amxmodx.h"
+#include "CFile.h"
 
 // *****************************************************
 // class File
diff --git a/amxmodx/CMenu.cpp b/amxmodx/CMenu.cpp
index 72056d94..1650f45c 100755
--- a/amxmodx/CMenu.cpp
+++ b/amxmodx/CMenu.cpp
@@ -29,8 +29,6 @@
 *  version.
 */
 
-#include <extdll.h>
-#include <meta_api.h>
 #include "amxmodx.h"
 #include "CMenu.h"
 
diff --git a/amxmodx/CModule.cpp b/amxmodx/CModule.cpp
index 6604e7f9..01458de3 100755
--- a/amxmodx/CModule.cpp
+++ b/amxmodx/CModule.cpp
@@ -29,8 +29,6 @@
 *  version.
 */
 
-#include <extdll.h>
-#include <meta_api.h>
 #include "amxmodx.h"
 
 #ifndef FAR
diff --git a/amxmodx/CModule.h b/amxmodx/CModule.h
index 9f9e4d96..0dde3490 100755
--- a/amxmodx/CModule.h
+++ b/amxmodx/CModule.h
@@ -87,7 +87,7 @@ public:
 	bool queryModule();
 	bool detachModule();
 	const char* getStatus() const;
-	inline const char* getType() const { return m_Amxx ? (m_Metamod ? "amxx&mm" : "amxx") : (m_Metamod ? "amx&mm" : "amx"); }
+	inline const char* getType() const { return m_Amxx ? "amxx" : (m_Metamod ? "amx&mm" : "amx"); }
 	inline const char* getAuthor() const { return m_Amxx ? (m_InfoNew.author) : (m_InfoOld ? m_InfoOld->author : "unknown"); }
 	inline const char* getVersion() const { return m_Amxx ? (m_InfoNew.version) : (m_InfoOld ? m_InfoOld->version : "unknown"); }
 	inline const char* getName() const { return m_Amxx ? (m_InfoNew.name) : (m_InfoOld ? m_InfoOld->name : "unknown"); }
diff --git a/amxmodx/CString.cpp b/amxmodx/CString.cpp
index fa22c002..5e137bbc 100755
--- a/amxmodx/CString.cpp
+++ b/amxmodx/CString.cpp
@@ -29,8 +29,9 @@
 *  version.
 */
 
-#include "CString.h"
 #include "string.h"
+#include "amxmodx.h"
+#include "CString.h"
 #include "CFile.h"
 
 String::String()
diff --git a/amxmodx/CVault.cpp b/amxmodx/CVault.cpp
index b7408912..55016ca9 100755
--- a/amxmodx/CVault.cpp
+++ b/amxmodx/CVault.cpp
@@ -29,11 +29,12 @@
 *  version.
 */
 
-#include "CVault.h"
-#include "CFile.h"
 #include <ctype.h>
 #include <stdlib.h>
 #include <string.h>
+#include "amxmodx.h"
+#include "CVault.h"
+#include "CFile.h"
 
 // *****************************************************
 // class Vault