diff --git a/sourcepawn/jit/AMBuilder b/sourcepawn/jit/AMBuilder
index b96a3211..88ba7434 100644
--- a/sourcepawn/jit/AMBuilder
+++ b/sourcepawn/jit/AMBuilder
@@ -32,11 +32,11 @@ library.sources += [
   'api.cpp',
   'code-allocator.cpp',
   'code-stubs.cpp',
+  'plugin-context.cpp',
   'plugin-runtime.cpp',
   'compiled-function.cpp',
   'debug-trace.cpp',
   'environment.cpp',
-  'sp_vm_basecontext.cpp',
   'scripted-invoker.cpp',
   'opcodes.cpp',
   'interpreter.cpp',
diff --git a/sourcepawn/jit/debug-trace.cpp b/sourcepawn/jit/debug-trace.cpp
index d6a0a104..c3a3e60d 100644
--- a/sourcepawn/jit/debug-trace.cpp
+++ b/sourcepawn/jit/debug-trace.cpp
@@ -11,7 +11,7 @@
 // SourcePawn. If not, see http://www.gnu.org/licenses/.
 //
 #include "debug-trace.h"
-#include "sp_vm_basecontext.h"
+#include "plugin-context.h"
 #include "environment.h"
 
 using namespace ke;
diff --git a/sourcepawn/jit/interpreter.h b/sourcepawn/jit/interpreter.h
index bc698b5a..b4603c96 100644
--- a/sourcepawn/jit/interpreter.h
+++ b/sourcepawn/jit/interpreter.h
@@ -20,7 +20,7 @@
 #include <sp_vm_types.h>
 #include <sp_vm_api.h>
 #include "plugin-runtime.h"
-#include "sp_vm_basecontext.h"
+#include "plugin-context.h"
 
 struct tracker_t
 {
diff --git a/sourcepawn/jit/sp_vm_basecontext.cpp b/sourcepawn/jit/plugin-context.cpp
similarity index 95%
rename from sourcepawn/jit/sp_vm_basecontext.cpp
rename to sourcepawn/jit/plugin-context.cpp
index 56bfb1a3..79d0e451 100644
--- a/sourcepawn/jit/sp_vm_basecontext.cpp
+++ b/sourcepawn/jit/plugin-context.cpp
@@ -14,8 +14,8 @@
 #include <stdarg.h>
 #include <assert.h>
 #include <limits.h>
-#include "sp_vm_api.h"
-#include "sp_vm_basecontext.h"
+#include <sp_vm_api.h>
+#include "plugin-context.h"
 #include "watchdog_timer.h"
 #include "x86/jit_x86.h"
 #include "interpreter.h"
diff --git a/sourcepawn/jit/sp_vm_basecontext.h b/sourcepawn/jit/plugin-context.h
similarity index 100%
rename from sourcepawn/jit/sp_vm_basecontext.h
rename to sourcepawn/jit/plugin-context.h
diff --git a/sourcepawn/jit/plugin-runtime.cpp b/sourcepawn/jit/plugin-runtime.cpp
index 9ce3fd14..9f88feeb 100644
--- a/sourcepawn/jit/plugin-runtime.cpp
+++ b/sourcepawn/jit/plugin-runtime.cpp
@@ -16,7 +16,7 @@
 #include <assert.h>
 #include "plugin-runtime.h"
 #include "x86/jit_x86.h"
-#include "sp_vm_basecontext.h"
+#include "plugin-context.h"
 #include "environment.h"
 
 #include "md5/md5.h"
diff --git a/sourcepawn/jit/x86/jit_x86.cpp b/sourcepawn/jit/x86/jit_x86.cpp
index 8a413f14..5c00bcac 100644
--- a/sourcepawn/jit/x86/jit_x86.cpp
+++ b/sourcepawn/jit/x86/jit_x86.cpp
@@ -33,8 +33,8 @@
 #include <stdlib.h>
 #include <assert.h>
 #include "jit_x86.h"
-#include "../plugin-runtime.h"
-#include "../sp_vm_basecontext.h"
+#include "plugin-runtime.h"
+#include "plugin-context.h"
 #include "watchdog_timer.h"
 #include "interpreter.h"
 #include "environment.h"
diff --git a/sourcepawn/jit/x86/jit_x86.h b/sourcepawn/jit/x86/jit_x86.h
index 45e4aa0e..3af246b2 100644
--- a/sourcepawn/jit/x86/jit_x86.h
+++ b/sourcepawn/jit/x86/jit_x86.h
@@ -23,7 +23,7 @@
 #include <am-vector.h>
 #include "jit_shared.h"
 #include "plugin-runtime.h"
-#include "sp_vm_basecontext.h"
+#include "plugin-context.h"
 #include "compiled-function.h"
 #include "opcodes.h"