diff --git a/sourcepawn/vm/AMBuilder b/sourcepawn/vm/AMBuilder
index 607a32f1..f112f43e 100644
--- a/sourcepawn/vm/AMBuilder
+++ b/sourcepawn/vm/AMBuilder
@@ -47,6 +47,7 @@ library.sources += [
   'stack-frames.cpp',
   'smx-v1-image.cpp',
   'watchdog_timer.cpp',
+  'x86/assembler-x86.cpp',
   'x86/code-stubs-x86.cpp',
   'x86/jit_x86.cpp',
   'x86/x86-utils.cpp',
@@ -62,7 +63,6 @@ library.sources += [
   '../third_party/zlib/trees.c',
   '../third_party/zlib/uncompr.c',
   '../third_party/zlib/zutil.c',
-  '../../public/jit/x86/assembler-x86.cpp',
 ]
 libsourcepawn = builder.Add(library).binary
 
diff --git a/public/jit/assembler.h b/sourcepawn/vm/assembler.h
similarity index 100%
rename from public/jit/assembler.h
rename to sourcepawn/vm/assembler.h
diff --git a/public/jit/x86/assembler-x86.cpp b/sourcepawn/vm/x86/assembler-x86.cpp
similarity index 98%
rename from public/jit/x86/assembler-x86.cpp
rename to sourcepawn/vm/x86/assembler-x86.cpp
index f00585aa..93884f1c 100644
--- a/public/jit/x86/assembler-x86.cpp
+++ b/sourcepawn/vm/x86/assembler-x86.cpp
@@ -28,6 +28,6 @@
  *
  * Version: $Id$
  */
-#include <assembler-x86.h>
+#include "assembler-x86.h"
 
 CPUFeatures AssemblerX86::X86Features;
diff --git a/public/jit/x86/assembler-x86.h b/sourcepawn/vm/x86/assembler-x86.h
similarity index 100%
rename from public/jit/x86/assembler-x86.h
rename to sourcepawn/vm/x86/assembler-x86.h
diff --git a/sourcepawn/vm/x86/jit_x86.h b/sourcepawn/vm/x86/jit_x86.h
index 1ad00b62..33e3fac0 100644
--- a/sourcepawn/vm/x86/jit_x86.h
+++ b/sourcepawn/vm/x86/jit_x86.h
@@ -19,12 +19,12 @@
 
 #include <sp_vm_types.h>
 #include <sp_vm_api.h>
-#include <macro-assembler-x86.h>
 #include <am-vector.h>
 #include "plugin-runtime.h"
 #include "plugin-context.h"
 #include "compiled-function.h"
 #include "opcodes.h"
+#include "macro-assembler-x86.h"
 
 using namespace SourcePawn;
 
diff --git a/public/jit/x86/macro-assembler-x86.h b/sourcepawn/vm/x86/macro-assembler-x86.h
similarity index 99%
rename from public/jit/x86/macro-assembler-x86.h
rename to sourcepawn/vm/x86/macro-assembler-x86.h
index 4d67c74c..d664011c 100644
--- a/public/jit/x86/macro-assembler-x86.h
+++ b/sourcepawn/vm/x86/macro-assembler-x86.h
@@ -34,7 +34,7 @@
 #include <assembler.h>
 #include <am-vector.h>
 #include <string.h>
-#include <assembler-x86.h>
+#include "assembler-x86.h"
 
 class MacroAssemblerX86 : public AssemblerX86
 {
diff --git a/sourcepawn/vm/x86/x86-utils.h b/sourcepawn/vm/x86/x86-utils.h
index 02dc679c..e5f40a93 100644
--- a/sourcepawn/vm/x86/x86-utils.h
+++ b/sourcepawn/vm/x86/x86-utils.h
@@ -14,7 +14,7 @@
 #define _include_sourcepawn_vm_x86_utils_h_
 
 #include <stdint.h>
-#include <macro-assembler-x86.h>
+#include "macro-assembler-x86.h"
 
 namespace sp {