diff --git a/aegisub/lib/ffms2.lib b/aegisub/FFmpegSource2/ffms2.lib
similarity index 100%
rename from aegisub/lib/ffms2.lib
rename to aegisub/FFmpegSource2/ffms2.lib
diff --git a/aegisub/build/aegisub_vs2008/aegisub_vs2008.vcproj b/aegisub/build/aegisub_vs2008/aegisub_vs2008.vcproj
index 05f946796..c3da48189 100644
--- a/aegisub/build/aegisub_vs2008/aegisub_vs2008.vcproj
+++ b/aegisub/build/aegisub_vs2008/aegisub_vs2008.vcproj
@@ -22,7 +22,7 @@
 		<Configuration
 			Name="Debug|Win32"
 			ConfigurationType="1"
-			InheritedPropertySheets=".\suffix_debug32.vsprops;.\libraries_outdirs.vsprops;.\contrib_includedirs.vsprops;.\aegisub_exe_filename.vsprops;.\shipped_stub_libs_dir.vsprops;.\compiler_options.vsprops;.\compiler_options_debug.vsprops;.\svn_rev_header_update.vsprops;.\delayload_ffms2_32.vsprops;.\delayload_perl_32.vsprops;.\delayload_portaudio_32.vsprops;.\delayload_openal_32.vsprops;.\delayload_libauto3.vsprops"
+			InheritedPropertySheets=".\suffix_debug32.vsprops;.\libraries_outdirs.vsprops;.\contrib_includedirs.vsprops;.\aegisub_exe_filename.vsprops;.\ffms2_lib_include_dir.vsprops;.\compiler_options.vsprops;.\compiler_options_debug.vsprops;.\svn_rev_header_update.vsprops;.\delayload_ffms2_32.vsprops;.\delayload_perl_32.vsprops;.\delayload_portaudio_32.vsprops;.\delayload_openal_32.vsprops;.\delayload_libauto3.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
@@ -88,7 +88,7 @@
 		<Configuration
 			Name="Debug|x64"
 			ConfigurationType="1"
-			InheritedPropertySheets=".\suffix_debug64.vsprops;.\libraries_outdirs.vsprops;.\contrib_includedirs.vsprops;.\aegisub_exe_filename.vsprops;.\shipped_stub_libs_dir.vsprops;.\compiler_options.vsprops;.\compiler_options_debug.vsprops;.\svn_rev_header_update.vsprops;.\delayload_libauto3.vsprops"
+			InheritedPropertySheets=".\suffix_debug64.vsprops;.\libraries_outdirs.vsprops;.\contrib_includedirs.vsprops;.\aegisub_exe_filename.vsprops;.\ffms2_lib_include_dir.vsprops;.\compiler_options.vsprops;.\compiler_options_debug.vsprops;.\svn_rev_header_update.vsprops;.\delayload_libauto3.vsprops"
 			CharacterSet="1"
 			>
 			<Tool
@@ -154,7 +154,7 @@
 		<Configuration
 			Name="Release|Win32"
 			ConfigurationType="1"
-			InheritedPropertySheets=".\suffix_release32.vsprops;.\libraries_outdirs.vsprops;.\contrib_includedirs.vsprops;.\aegisub_exe_filename.vsprops;.\shipped_stub_libs_dir.vsprops;.\compiler_options.vsprops;.\svn_rev_header_update.vsprops;.\delayload_ffms2_32.vsprops;.\delayload_perl_32.vsprops;.\delayload_portaudio_32.vsprops;.\delayload_openal_32.vsprops;.\delayload_libauto3.vsprops"
+			InheritedPropertySheets=".\suffix_release32.vsprops;.\libraries_outdirs.vsprops;.\contrib_includedirs.vsprops;.\aegisub_exe_filename.vsprops;.\ffms2_lib_include_dir.vsprops;.\compiler_options.vsprops;.\svn_rev_header_update.vsprops;.\delayload_ffms2_32.vsprops;.\delayload_perl_32.vsprops;.\delayload_portaudio_32.vsprops;.\delayload_openal_32.vsprops;.\delayload_libauto3.vsprops"
 			CharacterSet="1"
 			WholeProgramOptimization="1"
 			>
@@ -223,7 +223,7 @@
 		<Configuration
 			Name="Release|x64"
 			ConfigurationType="1"
-			InheritedPropertySheets=".\suffix_release64.vsprops;.\libraries_outdirs.vsprops;.\contrib_includedirs.vsprops;.\aegisub_exe_filename.vsprops;.\shipped_stub_libs_dir.vsprops;.\compiler_options.vsprops;.\svn_rev_header_update.vsprops;.\delayload_libauto3.vsprops"
+			InheritedPropertySheets=".\suffix_release64.vsprops;.\libraries_outdirs.vsprops;.\contrib_includedirs.vsprops;.\aegisub_exe_filename.vsprops;.\ffms2_lib_include_dir.vsprops;.\compiler_options.vsprops;.\svn_rev_header_update.vsprops;.\delayload_libauto3.vsprops"
 			CharacterSet="1"
 			WholeProgramOptimization="1"
 			>
diff --git a/aegisub/build/aegisub_vs2008/ffms2_lib_include_dir.vsprops b/aegisub/build/aegisub_vs2008/ffms2_lib_include_dir.vsprops
new file mode 100644
index 000000000..dd69e64af
--- /dev/null
+++ b/aegisub/build/aegisub_vs2008/ffms2_lib_include_dir.vsprops
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="ffms2_lib_include_dir"
+	>
+	<Tool
+		Name="VCLinkerTool"
+		AdditionalLibraryDirectories="$(ProjectDir)../../FFmpegSource2/"
+	/>
+	<Tool
+		Name="VCCLCompilerTool"
+		AdditionalIncludeDirectories="&quot;$(ProjectDir)../../FFmpegSource2/&quot;;"
+	/>
+</VisualStudioPropertySheet>
diff --git a/aegisub/build/aegisub_vs2008/shipped_stub_libs_dir.vsprops b/aegisub/build/aegisub_vs2008/shipped_stub_libs_dir.vsprops
deleted file mode 100644
index 50b9bac52..000000000
--- a/aegisub/build/aegisub_vs2008/shipped_stub_libs_dir.vsprops
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="shipped_stub_libs_dir"
-	>
-	<Tool
-		Name="VCLinkerTool"
-		AdditionalLibraryDirectories="$(ProjectDir)../../lib/"
-	/>
-</VisualStudioPropertySheet>
diff --git a/aegisub/lib/aegisub-auto3.lib b/aegisub/lib/aegisub-auto3.lib
deleted file mode 100644
index 614aeb2bb..000000000
Binary files a/aegisub/lib/aegisub-auto3.lib and /dev/null differ
diff --git a/aegisub/src/ffmpegsource_common.h b/aegisub/src/ffmpegsource_common.h
index a2db3725f..80d4f9fcf 100644
--- a/aegisub/src/ffmpegsource_common.h
+++ b/aegisub/src/ffmpegsource_common.h
@@ -41,7 +41,7 @@
 #include <wx/wxprec.h>
 #include <wx/thread.h>
 #include "include/aegisub/aegisub.h"
-#include "../FFmpegSource2/ffms.h"
+#include <ffms.h>
 #include "dialog_progress.h"