diff --git a/AMBuildScript b/AMBuildScript
index e3f0e646..d9000218 100644
--- a/AMBuildScript
+++ b/AMBuildScript
@@ -337,7 +337,8 @@ class SMConfig(object):
       os.path.join(context.currentSourcePath, 'sdk'),
       os.path.join(builder.sourcePath, 'public', 'extensions'),
       os.path.join(builder.sourcePath, 'sourcepawn', 'include'),
-      os.path.join(builder.sourcePath, 'public', 'amtl', 'include'),
+      os.path.join(builder.sourcePath, 'public', 'amtl', 'amtl'),
+      os.path.join(builder.sourcePath, 'public', 'amtl'),
     ]
     return compiler
 
diff --git a/core/logic/AMBuilder b/core/logic/AMBuilder
index af59296f..02ca251e 100644
--- a/core/logic/AMBuilder
+++ b/core/logic/AMBuilder
@@ -6,7 +6,8 @@ binary.compiler.cxxincludes += [
   os.path.join(builder.sourcePath, 'core', 'logic'),
   os.path.join(builder.sourcePath, 'public'),
   os.path.join(builder.sourcePath, 'sourcepawn', 'include'),
-  os.path.join(builder.sourcePath, 'public', 'amtl', 'include'),
+  os.path.join(builder.sourcePath, 'public', 'amtl', 'amtl'),
+  os.path.join(builder.sourcePath, 'public', 'amtl'),
   os.path.join(SM.mms_root, 'core', 'sourcehook')
 ]
 binary.compiler.defines += [
diff --git a/public/amtl b/public/amtl
index 1a66ad10..448a1bf2 160000
--- a/public/amtl
+++ b/public/amtl
@@ -1 +1 @@
-Subproject commit 1a66ad1033ce337dce26d121468404f459a521ca
+Subproject commit 448a1bf2123b4ed8489ef883326963165cb99c36
diff --git a/sourcepawn b/sourcepawn
index 734f8e0b..f5fd57fb 160000
--- a/sourcepawn
+++ b/sourcepawn
@@ -1 +1 @@
-Subproject commit 734f8e0bc5d272d44cefc788f193f5431fbb4338
+Subproject commit f5fd57fb7fb1e0d5d8de3ae1979d6085fb390bf1