diff --git a/AMBuildScript b/AMBuildScript
index 3788e118..f7c0d143 100644
--- a/AMBuildScript
+++ b/AMBuildScript
@@ -325,7 +325,7 @@ class SMConfig(object):
       os.path.join(context.currentSourcePath, 'sdk'),
       os.path.join(builder.sourcePath, 'public'),
       os.path.join(builder.sourcePath, 'public', 'extensions'),
-      os.path.join(builder.sourcePath, 'public', 'sourcepawn'),
+      os.path.join(builder.sourcePath, 'sourcepawn', 'include'),
       os.path.join(builder.sourcePath, 'public', 'amtl'),
     ]
     return compiler
diff --git a/core/logic/AMBuilder b/core/logic/AMBuilder
index a22d8751..368ccc3a 100644
--- a/core/logic/AMBuilder
+++ b/core/logic/AMBuilder
@@ -5,7 +5,7 @@ binary = SM.Library(builder, 'sourcemod.logic')
 binary.compiler.cxxincludes += [
   os.path.join(builder.sourcePath, 'core', 'logic'),
   os.path.join(builder.sourcePath, 'public'),
-  os.path.join(builder.sourcePath, 'public', 'sourcepawn'),
+  os.path.join(builder.sourcePath, 'sourcepawn', 'include'),
   os.path.join(builder.sourcePath, 'public', 'amtl'),
   os.path.join(SM.mms_root, 'core', 'sourcehook')
 ]
diff --git a/public/sourcepawn/sp_typeutil.h b/sourcepawn/include/sp_typeutil.h
similarity index 100%
rename from public/sourcepawn/sp_typeutil.h
rename to sourcepawn/include/sp_typeutil.h
diff --git a/public/sourcepawn/sp_vm_api.h b/sourcepawn/include/sp_vm_api.h
similarity index 100%
rename from public/sourcepawn/sp_vm_api.h
rename to sourcepawn/include/sp_vm_api.h
diff --git a/public/sourcepawn/sp_vm_base.h b/sourcepawn/include/sp_vm_base.h
similarity index 100%
rename from public/sourcepawn/sp_vm_base.h
rename to sourcepawn/include/sp_vm_base.h
diff --git a/public/sourcepawn/sp_vm_types.h b/sourcepawn/include/sp_vm_types.h
similarity index 100%
rename from public/sourcepawn/sp_vm_types.h
rename to sourcepawn/include/sp_vm_types.h