diff --git a/common.vcproj b/common.vcproj
index d728a42ee..43c1a6454 100644
--- a/common.vcproj
+++ b/common.vcproj
@@ -165,7 +165,7 @@
 				RelativePath=".\src\common\quickparser.cpp">
 			</File>
 			<File
-				RelativePath=".\src\common\tag_common.cpp">
+				RelativePath=".\src\common\random.cpp">
 			</File>
 			<File
 				RelativePath=".\src\common\segmentinfo.cpp">
@@ -173,6 +173,9 @@
 			<File
 				RelativePath=".\src\common\segmentinfo_parser.cpp">
 			</File>
+			<File
+				RelativePath=".\src\common\tag_common.cpp">
+			</File>
 			<File
 				RelativePath=".\src\common\tagparser.cpp">
 			</File>
@@ -265,6 +268,9 @@
 			<File
 				RelativePath=".\src\common\quickparser.h">
 			</File>
+			<File
+				RelativePath=".\src\common\random.h">
+			</File>
 			<File
 				RelativePath=".\src\common\segmentinfo.h">
 			</File>
diff --git a/mkvextract.vcproj b/mkvextract.vcproj
index b694e1449..a879dc60b 100644
--- a/mkvextract.vcproj
+++ b/mkvextract.vcproj
@@ -33,7 +33,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="libebml.lib libmatroska.lib iconv.lib zdll.lib libexpat.lib libFLAC_static.lib ogg_static_d.lib vorbis_static_d.lib"
+				AdditionalDependencies="libebml.lib libmatroska.lib iconv.lib zdll.lib libexpat.lib libFLAC_static.lib ogg_static_d.lib vorbis_static_d.lib Rpcrt4.lib"
 				OutputFile="$(OutDir)/mkvextract.exe"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="..\..\work\libmatroska\make\vc7\lib\static\Debug;..\..\work\libebml\make\vc7\lib\Debug;..\..\..\flac\obj\debug\lib;c:\usr\lib;..\..\..\zlib;..\..\..\expat\lib\Debug;..\..\..\libogg\win32\Static_Debug;..\..\..\libvorbis\win32\Vorbis_Static_Debug"
@@ -140,6 +140,33 @@
 			<File
 				RelativePath=".\src\extract\tracks.cpp">
 			</File>
+			<File
+				RelativePath=".\src\extract\xtr_aac.cpp">
+			</File>
+			<File
+				RelativePath=".\src\extract\xtr_avi.cpp">
+			</File>
+			<File
+				RelativePath=".\src\extract\xtr_base.cpp">
+			</File>
+			<File
+				RelativePath=".\src\extract\xtr_ogg.cpp">
+			</File>
+			<File
+				RelativePath=".\src\extract\xtr_rmff.cpp">
+			</File>
+			<File
+				RelativePath=".\src\extract\xtr_textsubs.cpp">
+			</File>
+			<File
+				RelativePath=".\src\extract\xtr_tta.cpp">
+			</File>
+			<File
+				RelativePath=".\src\extract\xtr_vobsub.cpp">
+			</File>
+			<File
+				RelativePath=".\src\extract\xtr_wav.cpp">
+			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
@@ -148,6 +175,30 @@
 			<File
 				RelativePath=".\src\extract\mkvextract.h">
 			</File>
+			<File
+				RelativePath=".\src\extract\xtr_aac.h">
+			</File>
+			<File
+				RelativePath=".\src\extract\xtr_avi.h">
+			</File>
+			<File
+				RelativePath=".\src\extract\xtr_base.h">
+			</File>
+			<File
+				RelativePath=".\src\extract\xtr_ogg.h">
+			</File>
+			<File
+				RelativePath=".\src\extract\xtr_rmff.h">
+			</File>
+			<File
+				RelativePath=".\src\extract\xtr_textsubs.h">
+			</File>
+			<File
+				RelativePath=".\src\extract\xtr_tta.h">
+			</File>
+			<File
+				RelativePath=".\src\extract\xtr_vobsub.h">
+			</File>
 		</Filter>
 		<Filter
 			Name="Resource Files"
diff --git a/mkvmerge.vcproj b/mkvmerge.vcproj
index e51374d1e..b85723971 100644
--- a/mkvmerge.vcproj
+++ b/mkvmerge.vcproj
@@ -33,7 +33,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="libebml.lib libmatroska.lib iconv.lib zdll.lib libexpat.lib libFLAC_static.lib ogg_static_d.lib vorbis_static_d.lib"
+				AdditionalDependencies="libebml.lib libmatroska.lib iconv.lib zdll.lib libexpat.lib libFLAC_static.lib ogg_static_d.lib vorbis_static_d.lib Rpcrt4.lib"
 				OutputFile="$(OutDir)/mkvmerge.exe"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="..\..\work\libmatroska\make\vc7\lib\static\Debug;..\..\work\libebml\make\vc7\lib\Debug;..\..\..\flac\obj\debug\lib;c:\usr\lib;..\..\..\zlib;..\..\..\expat\lib\Debug;..\..\..\libogg\win32\Static_Debug;..\..\..\libvorbis\win32\Vorbis_Static_Debug"
@@ -309,6 +309,12 @@
 			<File
 				RelativePath=".\src\input\r_tta.h">
 			</File>
+			<File
+				RelativePath=".\src\input\r_usf.cpp">
+			</File>
+			<File
+				RelativePath=".\src\input\r_usf.h">
+			</File>
 			<File
 				RelativePath=".\src\input\r_vobbtn.cpp">
 			</File>