diff --git a/aegisub/config.h b/aegisub/config.h
index 21e7cd859..72ba9438c 100644
--- a/aegisub/config.h
+++ b/aegisub/config.h
@@ -1,4 +1,4 @@
-#ifdef __WINDOWS__
+#ifdef _WIN32
 
 // Windows specific settings
 #include "config/config_windows.h"
diff --git a/aegisub/config/config_windows0.h b/aegisub/config/config_windows0.h
index 0ec2a20fb..df9830f04 100644
--- a/aegisub/config/config_windows0.h
+++ b/aegisub/config/config_windows0.h
@@ -52,17 +52,17 @@
 
 // Enable Automation
 // Requires: Nothing
-//#define WITH_AUTOMATION
+#define WITH_AUTOMATION
 
 
 // Enable Automation 4 Lua
 // Requires: Lua 5.1 (in repository)
-//#define WITH_AUTO4_LUA
+#define WITH_AUTO4_LUA
 
 
 // Enable Automation 3
 // Requires: auto3 dll (in repository), Lua (in repository)
-//#define WITH_AUTO3
+#define WITH_AUTO3
 
 
 // Enable DirectSound audio player
@@ -72,7 +72,7 @@
 
 // Enable Avisynth
 // Requires: nothing (just the avisynth dlls)
-//#define WITH_AVISYNTH
+#define WITH_AVISYNTH
 
 
 
@@ -88,7 +88,7 @@
 
 // Enable CSRI, required for styles previews in the style editor and some video providers
 // Requires: csri (in repository)
-//#define WITH_CSRI
+#define WITH_CSRI
 
 
 // Enable universal charset detector, so Aegisub can automatically detect the encoding of non-unicode subtitles
@@ -144,7 +144,7 @@
 
 // Enable ffmpegsource video and audio providers
 // Requires: ffmpegsource version 2
-#define WITH_FFMPEGSOURCE
+//#define WITH_FFMPEGSOURCE
 
 
 // Enable Ruby support for Automation
diff --git a/build/aegisub_vs2008/aegisub_vs2008.vcproj b/build/aegisub_vs2008/aegisub_vs2008.vcproj
index aa1a12693..51dbb59ae 100644
--- a/build/aegisub_vs2008/aegisub_vs2008.vcproj
+++ b/build/aegisub_vs2008/aegisub_vs2008.vcproj
@@ -1939,30 +1939,18 @@
 		<Filter
 			Name="Config"
 			>
-			<Filter
-				Name="win32"
+			<File
+				RelativePath="..\..\aegisub\config\config_unix.h"
 				>
-				<File
-					RelativePath="..\..\aegisub\win32\config.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\aegisub\win32\config0.h"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="win64"
+			</File>
+			<File
+				RelativePath="..\..\aegisub\config\config_windows.h"
 				>
-				<File
-					RelativePath="..\..\aegisub\win64\config.h"
-					>
-				</File>
-				<File
-					RelativePath="..\..\aegisub\win64\config0.h"
-					>
-				</File>
-			</Filter>
+			</File>
+			<File
+				RelativePath="..\..\aegisub\config\config_windows0.h"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="Include"
diff --git a/csri/csri_2008.vcproj b/csri/csri_2008.vcproj
index b266e3192..5faeffc0a 100644
--- a/csri/csri_2008.vcproj
+++ b/csri/csri_2008.vcproj
@@ -44,14 +44,14 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="lib;lib/win32;include;../aegisub/win32"
+				AdditionalIncludeDirectories="lib;lib/win32;include;../aegisub/msvc"
 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
+				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="4"
 				CompileAs="1"
 				DisableSpecificWarnings="4996"
@@ -177,12 +177,12 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="lib;lib/win32;include;../aegisub/win32"
+				AdditionalIncludeDirectories="lib;lib/win32;include;../aegisub/msvc"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
+				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="3"
 				DisableSpecificWarnings="4996"
 			/>