diff --git a/core/logic/msvc9/logic.vcproj b/core/logic/msvc9/logic.vcproj
index 1d53f5c1..ae9c2c4f 100755
--- a/core/logic/msvc9/logic.vcproj
+++ b/core/logic/msvc9/logic.vcproj
@@ -42,7 +42,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..;"$(MMSOURCE17)\core\sourcehook";..\..\..\public;..\..\..\public\sourcepawn"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;JITX86_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SM_DEFAULT_THREADER"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;JITX86_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SM_DEFAULT_THREADER;SM_LOGIC"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -64,7 +64,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				OutputFile="$(OutDir)\sourcepawn.jit.x86.dll"
+				OutputFile="$(OutDir)\sourcemod.logic.dll"
 				LinkIncremental="2"
 				IgnoreDefaultLibraryNames="LIBC;LIBCD;LIBCMT"
 				GenerateDebugInformation="true"
@@ -185,11 +185,19 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
-				RelativePath="..\smn_functions.cpp"
+				RelativePath="..\common_logic.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\smn_adt_trie.cpp"
+				RelativePath="..\GameConfigs.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\MemoryUtils.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\PhraseCollection.cpp"
 				>
 			</File>
 			<File
@@ -197,7 +205,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\common_logic.cpp"
+				RelativePath="..\sm_crc32.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\smn_admin.cpp"
 				>
 			</File>
 			<File
@@ -208,22 +220,66 @@
 				RelativePath="..\smn_adt_stack.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\smn_adt_trie.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\smn_banning.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\smn_datapacks.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\smn_float.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\smn_functions.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\smn_gameconfigs.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\smn_handles.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\smn_lang.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\smn_maplists.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\smn_players.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\smn_sorting.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\smn_string.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\smn_textparse.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\smn_timers.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\stringutil.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\TextParsers.cpp"
 				>
@@ -232,6 +288,10 @@
 				RelativePath="..\ThreadSupport.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\Translator.cpp"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
@@ -250,6 +310,10 @@
 				RelativePath="..\intercom.h"
 				>
 			</File>
+			<File
+				RelativePath="..\Profiler.h"
+				>
+			</File>
 			<File
 				RelativePath="..\svn_version.h"
 				>
@@ -262,10 +326,6 @@
 				RelativePath="..\ThreadSupport.h"
 				>
 			</File>
-			<File
-				RelativePath="..\Profiler.h"
-				>
-			</File>
 		</Filter>
 		<Filter
 			Name="Resource Files"
@@ -276,10 +336,6 @@
 				RelativePath="..\svn_version.tpl"
 				>
 			</File>
-			<File
-				RelativePath="..\version.rc"
-				>
-			</File>
 		</Filter>
 		<Filter
 			Name="Threads"
diff --git a/core/msvc9/sourcemod_mm.vcproj b/core/msvc9/sourcemod_mm.vcproj
index 55cbf685..eb11fbc0 100644
--- a/core/msvc9/sourcemod_mm.vcproj
+++ b/core/msvc9/sourcemod_mm.vcproj
@@ -1952,10 +1952,6 @@
 				RelativePath="..\frame_hooks.cpp"
 				>
 			</File>
-			<File
-				RelativePath="..\GameConfigs.cpp"
-				>
-			</File>
 			<File
 				RelativePath="..\HalfLife2.cpp"
 				>
@@ -1976,10 +1972,6 @@
 				RelativePath="..\logic_bridge.cpp"
 				>
 			</File>
-			<File
-				RelativePath="..\MemoryUtils.cpp"
-				>
-			</File>
 			<File
 				RelativePath="..\MenuManager.cpp"
 				>
@@ -2012,10 +2004,6 @@
 				RelativePath="..\NextMap.cpp"
 				>
 			</File>
-			<File
-				RelativePath="..\PhraseCollection.cpp"
-				>
-			</File>
 			<File
 				RelativePath="..\PlayerManager.cpp"
 				>
@@ -2036,10 +2024,6 @@
 				RelativePath="..\sm_autonatives.cpp"
 				>
 			</File>
-			<File
-				RelativePath="..\sm_memtable.cpp"
-				>
-			</File>
 			<File
 				RelativePath="..\sm_srvcmds.cpp"
 				>
@@ -2064,10 +2048,6 @@
 				RelativePath="..\TimerSys.cpp"
 				>
 			</File>
-			<File
-				RelativePath="..\Translator.cpp"
-				>
-			</File>
 			<File
 				RelativePath="..\UserMessages.cpp"
 				>
@@ -2442,14 +2422,6 @@
 			Name="Natives"
 			UniqueIdentifier="{052D6D9B-7B50-4c3c-9B82-32CA908DEF24}"
 			>
-			<File
-				RelativePath="..\smn_admin.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\smn_banning.cpp"
-				>
-			</File>
 			<File
 				RelativePath="..\smn_bitbuffer.cpp"
 				>
@@ -2466,10 +2438,6 @@
 				RelativePath="..\smn_database.cpp"
 				>
 			</File>
-			<File
-				RelativePath="..\smn_datapacks.cpp"
-				>
-			</File>
 			<File
 				RelativePath="..\smn_entities.cpp"
 				>
@@ -2486,18 +2454,10 @@
 				RelativePath="..\smn_filesystem.cpp"
 				>
 			</File>
-			<File
-				RelativePath="..\smn_gameconfigs.cpp"
-				>
-			</File>
 			<File
 				RelativePath="..\smn_halflife.cpp"
 				>
 			</File>
-			<File
-				RelativePath="..\smn_handles.cpp"
-				>
-			</File>
 			<File
 				RelativePath="..\smn_hudtext.cpp"
 				>
@@ -2506,10 +2466,6 @@
 				RelativePath="..\smn_keyvalues.cpp"
 				>
 			</File>
-			<File
-				RelativePath="..\smn_lang.cpp"
-				>
-			</File>
 			<File
 				RelativePath="..\smn_menus.cpp"
 				>
@@ -2526,14 +2482,6 @@
 				RelativePath="..\smn_profiler.cpp"
 				>
 			</File>
-			<File
-				RelativePath="..\smn_string.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\smn_timers.cpp"
-				>
-			</File>
 			<File
 				RelativePath="..\smn_usermsgs.cpp"
 				>
diff --git a/extensions/sdktools/msvc9/sdktools.vcproj b/extensions/sdktools/msvc9/sdktools.vcproj
index 09c1f262..b8570996 100644
--- a/extensions/sdktools/msvc9/sdktools.vcproj
+++ b/extensions/sdktools/msvc9/sdktools.vcproj
@@ -1183,6 +1183,14 @@
 			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
 			UniqueIdentifier="{3FC90E55-360F-4370-ACE2-67D7691AFB97}"
 			>
+			<File
+				RelativePath="..\asm\asm.c"
+				>
+			</File>
+			<File
+				RelativePath="..\CDetour\detours.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\extension.cpp"
 				>
@@ -1265,10 +1273,6 @@
 				RelativePath="..\CellRecipientFilter.h"
 				>
 			</File>
-			<File
-				RelativePath="..\detours.h"
-				>
-			</File>
 			<File
 				RelativePath="..\extension.h"
 				>