diff --git a/msvc10/sdk.vcxproj b/msvc10/sdk.vcxproj
index 1a7ad3b..27dfad4 100644
--- a/msvc10/sdk.vcxproj
+++ b/msvc10/sdk.vcxproj
@@ -55,7 +55,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..;..\sdk;$(MMSOURCE10)\core;$(MMSOURCE10)\core\sourcehook;$(SOURCEMOD)\public;$(SOURCEMOD)\public\sourcepawn;$(SOURCEMOD)\public\extensions;$(SOURCEMOD)\public\jit;$(SOURCEMOD)\public\jit\x86;$(SOURCEMOD)\public\amtl</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..;..\sdk;$(MMSOURCE10)\core;$(MMSOURCE10)\core\sourcehook;$(SOURCEMOD)\public;$(SOURCEMOD)\public\sourcepawn;$(SOURCEMOD)\public\extensions;$(SOURCEMOD)\public\jit;$(SOURCEMOD)sourcemod-central\sourcepawn\vm\x86;$(SOURCEMOD)\public\amtl</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;SDK_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD;COMPILER_MSVC;COMPILER_MSVC32;META_NO_HL2SDK;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -80,7 +80,7 @@
     <ClCompile>
       <AdditionalOptions>/MP /D SE_EPISODEONE=1 /D SE_DARKMESSIAH=2 /D SE_ORANGEBOX=3 /D SE_BLOODYGOODTIME=4 /D SE_EYE=5 /D SE_ORANGEBOXVALVE=6 /D SE_LEFT4DEAD=7 /D SE_LEFT4DEAD2=8 /D SE_ALIENSWARM=9 /D SE_PORTAL2=10 /D SE_CSGO=11 %(AdditionalOptions)</AdditionalOptions>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-      <AdditionalIncludeDirectories>..;..\sdk;$(MMSOURCE10)\core;$(MMSOURCE10)\core\sourcehook;$(SOURCEMOD)\public;$(SOURCEMOD)\public\sourcepawn;$(SOURCEMOD)\public\extensions;$(SOURCEMOD)\public\jit;$(SOURCEMOD)\public\jit\x86;$(SOURCEMOD)\public\amtl</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..;..\sdk;$(MMSOURCE110)\core;$(MMSOURCE110)\core\sourcehook;$(SMCENTRAL)\public;$(SMCENTRAL)\sourcepawn;$(SMCENTRAL)\sourcepawn\include;$(SMCENTRAL)\public\extensions;$(SMCENTRAL)\sourcepawn\vm;$(SMCENTRAL)\sourcepawn\vm\x86;$(SMCENTRAL)\public\amtl\amtl</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;SDK_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD;COMPILER_MSVC;COMPILER_MSVC32;META_NO_HL2SDK;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
@@ -106,12 +106,12 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="$(SOURCEMOD)\public\jit\x86\assembler-x86.cpp" />
+    <ClCompile Include="$(SMCENTRAL)\sourcepawn\vm\x86\assembler-x86.cpp" />
     <ClCompile Include="..\extension.cpp" />
     <ClCompile Include="..\listeners.cpp" />
     <ClCompile Include="..\natives.cpp" />
     <ClCompile Include="..\vhook.cpp" />
-    <ClCompile Include="..\sdk\smsdk_ext.cpp" />
+    <ClCompile Include="$(SMCENTRAL)\public\smsdk_ext.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\extension.h" />
@@ -121,7 +121,7 @@
     <ClInclude Include="..\vfunc_call.h" />
     <ClInclude Include="..\vhook.h" />
     <ClInclude Include="..\sdk\smsdk_config.h" />
-    <ClInclude Include="..\sdk\smsdk_ext.h" />
+    <ClInclude Include="$(SMCENTRAL)\public\smsdk_ext.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/msvc10/sdk.vcxproj.filters b/msvc10/sdk.vcxproj.filters
index 4fd9b47..5d070a5 100644
--- a/msvc10/sdk.vcxproj.filters
+++ b/msvc10/sdk.vcxproj.filters
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <ClCompile Include="..\sdk\smsdk_ext.cpp">
-      <Filter>sdk</Filter>
-    </ClCompile>
     <ClCompile Include="..\vhook.cpp" />
     <ClCompile Include="..\extension.cpp" />
     <ClCompile Include="..\natives.cpp" />
     <ClCompile Include="..\listeners.cpp" />
-    <ClCompile Include="$(SOURCEMOD)\public\jit\x86\assembler-x86.cpp" />
+    <ClCompile Include="$(SMCENTRAL)\sourcepawn\vm\x86\assembler-x86.cpp" />
+    <ClCompile Include="$(SMCENTRAL)\public\smsdk_ext.cpp">
+      <Filter>sdk</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\extension.h">
@@ -20,9 +20,6 @@
     <ClInclude Include="..\sdk\smsdk_config.h">
       <Filter>sdk</Filter>
     </ClInclude>
-    <ClInclude Include="..\sdk\smsdk_ext.h">
-      <Filter>sdk</Filter>
-    </ClInclude>
     <ClInclude Include="..\natives.h">
       <Filter>Headers</Filter>
     </ClInclude>
@@ -35,6 +32,9 @@
     <ClInclude Include="..\sdk-hacks.h">
       <Filter>Headers</Filter>
     </ClInclude>
+    <ClInclude Include="$(SMCENTRAL)\public\smsdk_ext.h">
+      <Filter>sdk</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="Headers">