diff --git a/AMBuildScript b/AMBuildScript
index 3bbe5285..25b09d9f 100644
--- a/AMBuildScript
+++ b/AMBuildScript
@@ -300,6 +300,7 @@ class SM:
 		compiler['CXXINCLUDES'].append(os.path.join(AMBuild.sourceFolder, 'public'))
 		compiler['CXXINCLUDES'].append(os.path.join(AMBuild.sourceFolder, 'public', 'extensions'))
 		compiler['CXXINCLUDES'].append(os.path.join(AMBuild.sourceFolder, 'public', 'sourcepawn'))
+		compiler['CXXINCLUDES'].append(os.path.join(AMBuild.sourceFolder, 'public', 'amtl'))
 		return compiler
 
 	def AutoVersion(self, folder, binary):
diff --git a/core/logic/AMBuilder b/core/logic/AMBuilder
index 45f0deb1..80bd2e38 100644
--- a/core/logic/AMBuilder
+++ b/core/logic/AMBuilder
@@ -7,6 +7,7 @@ compiler['CXXINCLUDES'].append(os.path.join(SM.mmsPath, 'core', 'sourcehook'))
 compiler['CXXINCLUDES'].append(os.path.join(base, 'core', 'logic'))
 compiler['CXXINCLUDES'].append(os.path.join(base, 'public'))
 compiler['CXXINCLUDES'].append(os.path.join(base, 'public', 'sourcepawn'))
+compiler['CXXINCLUDES'].append(os.path.join(base, 'public', 'amtl'))
 compiler['CDEFINES'].append('SM_DEFAULT_THREADER')
 compiler['CDEFINES'].append('SM_LOGIC')
 
diff --git a/extensions/clientprefs/extension.h b/extensions/clientprefs/extension.h
index dc5a2358..4fad5e18 100644
--- a/extensions/clientprefs/extension.h
+++ b/extensions/clientprefs/extension.h
@@ -156,7 +156,6 @@ public:
 	IPhraseCollection *phrases;
 	const DatabaseInfo *DBInfo;
 
-	IMutex *cookieMutex;
 	bool databaseLoading;
 
 private:
diff --git a/public/sourcepawn/ke_allocator_policies.h b/public/amtl/ke_allocator_policies.h
similarity index 100%
rename from public/sourcepawn/ke_allocator_policies.h
rename to public/amtl/ke_allocator_policies.h
diff --git a/public/sourcepawn/ke_inline_list.h b/public/amtl/ke_inline_list.h
similarity index 100%
rename from public/sourcepawn/ke_inline_list.h
rename to public/amtl/ke_inline_list.h
diff --git a/public/sourcepawn/ke_thread_posix.h b/public/amtl/ke_thread_posix.h
similarity index 100%
rename from public/sourcepawn/ke_thread_posix.h
rename to public/amtl/ke_thread_posix.h
diff --git a/public/sourcepawn/ke_thread_utils.h b/public/amtl/ke_thread_utils.h
similarity index 100%
rename from public/sourcepawn/ke_thread_utils.h
rename to public/amtl/ke_thread_utils.h
diff --git a/public/sourcepawn/ke_thread_windows.h b/public/amtl/ke_thread_windows.h
similarity index 100%
rename from public/sourcepawn/ke_thread_windows.h
rename to public/amtl/ke_thread_windows.h
diff --git a/public/sourcepawn/ke_utility.h b/public/amtl/ke_utility.h
similarity index 100%
rename from public/sourcepawn/ke_utility.h
rename to public/amtl/ke_utility.h
diff --git a/public/sourcepawn/ke_vector.h b/public/amtl/ke_vector.h
similarity index 100%
rename from public/sourcepawn/ke_vector.h
rename to public/amtl/ke_vector.h
diff --git a/sourcepawn/jit/AMBuilder b/sourcepawn/jit/AMBuilder
index 3dfaa9f7..10fd1692 100644
--- a/sourcepawn/jit/AMBuilder
+++ b/sourcepawn/jit/AMBuilder
@@ -8,6 +8,7 @@ compiler['CXXINCLUDES'].append(os.path.join(base, 'sourcepawn', 'jit'))
 compiler['CXXINCLUDES'].append(os.path.join(base, 'sourcepawn', 'jit', 'x86'))
 compiler['CXXINCLUDES'].append(os.path.join(base, 'public'))
 compiler['CXXINCLUDES'].append(os.path.join(base, 'public', 'sourcepawn'))
+compiler['CXXINCLUDES'].append(os.path.join(base, 'public', 'amtl'))
 compiler['CXXINCLUDES'].append(os.path.join(base, 'public', 'jit'))
 compiler['CXXINCLUDES'].append(os.path.join(base, 'public', 'jit', 'x86'))
 compiler['CXXINCLUDES'].append(os.path.join(base, 'knight', 'shared'))