diff --git a/amxmodx/CTask.cpp b/amxmodx/CTask.cpp
index 41da3cd6..430e53b9 100755
--- a/amxmodx/CTask.cpp
+++ b/amxmodx/CTask.cpp
@@ -29,8 +29,6 @@
 *  version.
 */
 
-#include <extdll.h>
-#include <meta_api.h>
 #include "amxmodx.h"
 #include "CTask.h"
 
diff --git a/amxmodx/emsg.cpp b/amxmodx/emsg.cpp
index 28459bc4..d3746e17 100755
--- a/amxmodx/emsg.cpp
+++ b/amxmodx/emsg.cpp
@@ -29,8 +29,6 @@
 *  version.
 */
 
-#include <extdll.h>
-#include <meta_api.h>
 #include "amxmodx.h"
 
 int gmsgAmmoPickup;
diff --git a/amxmodx/strptime.cpp b/amxmodx/strptime.cpp
index 3f93a7c8..043cc5ca 100755
--- a/amxmodx/strptime.cpp
+++ b/amxmodx/strptime.cpp
@@ -14,6 +14,11 @@
 #define strnicmp strncasecmp
 #endif
 
+// this file does not include amxmodx.h, so we have to include the memory manager here
+#ifdef MEMORY_TEST
+#include "mmgr/mmgr.h"
+#endif // MEMORY_TEST
+
 const char *_lc_Wday_ [2][ 7],
                   *_lc_Month_[2][12],
                   *_lc_AmPm_ [2][ 2];