diff --git a/win32/GStreamer.vcproj b/win32/GStreamer.vcproj
index 090382c60d..396d26d2e6 100644
--- a/win32/GStreamer.vcproj
+++ b/win32/GStreamer.vcproj
@@ -43,7 +43,7 @@
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories="c:\usr\lib"
 				IgnoreAllDefaultLibraries="FALSE"
-				ModuleDefinitionFile="gst.def"
+				ModuleDefinitionFile="$(ProjectDir)gst.def"
 				DelayLoadDLLs=""
 				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile="$(OutDir)/GStreamer.pdb"
@@ -62,7 +62,8 @@ mkdir c:\gstreamer\bin
 copy /Y $(TargetPath) c:\gstreamer\bin
 for %%i in (af az ca cs en_GB fr nl sq sr sv tr uk) do msgfmt -o ..\po\%%i.gmo ..\po\%%i.po
 for %%i in (af az ca cs en_GB fr nl sq sr sv tr uk) do mkdir c:\gstreamer\locale\%%i
-for %%i in (af az ca cs en_GB fr nl sq sr sv tr uk) do copy /Y ..\po\%%i.gmo c:\gstreamer\locale\%%i\gstreamer-0.8.mo"/>
+for %%i in (af az ca cs en_GB fr nl sq sr sv tr uk) do copy /Y ..\po\%%i.gmo c:\gstreamer\locale\%%i\gstreamer-0.8.mo
+"/>
 			<Tool
 				Name="VCPreBuildEventTool"
 				CommandLine="copy $(ProjectDir)\gstconfig.h $(ProjectDir)\..\gst\gstconfig.h
@@ -124,7 +125,7 @@ type gstreamer-dbg.def &gt;&gt; gst.def
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories="c:\usr\lib"
 				IgnoreAllDefaultLibraries="FALSE"
-				ModuleDefinitionFile="gst.def"
+				ModuleDefinitionFile="$(ProjectDir)gst.def"
 				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile="$(OutDir)/GStreamer.pdb"
 				SubSystem="2"
@@ -142,7 +143,8 @@ mkdir c:\gstreamer\bin
 copy /Y $(TargetPath) c:\gstreamer\bin
 for %%i in (af az ca cs en_GB fr nl sq sr sv tr uk) do msgfmt -o ..\po\%%i.gmo ..\po\%%i.po
 for %%i in (af az ca cs en_GB fr nl sq sr sv tr uk) do mkdir c:\gstreamer\locale\%%i
-for %%i in (af az ca cs en_GB fr nl sq sr sv tr uk) do copy /Y ..\po\%%i.gmo c:\gstreamer\locale\%%i\gstreamer-0.8.mo"/>
+for %%i in (af az ca cs en_GB fr nl sq sr sv tr uk) do copy /Y ..\po\%%i.gmo c:\gstreamer\locale\%%i\gstreamer-0.8.mo
+"/>
 			<Tool
 				Name="VCPreBuildEventTool"
 				CommandLine="copy $(ProjectDir)\gstconfig.h $(ProjectDir)\..\gst\gstconfig.h
@@ -206,6 +208,9 @@ type gstreamer-dbg.def &gt;&gt; gst.def
 			<File
 				RelativePath="..\gst\gstcaps.c">
 			</File>
+			<File
+				RelativePath="..\gst\gstchildproxy.c">
+			</File>
 			<File
 				RelativePath="..\gst\gstclock.c">
 			</File>
@@ -260,6 +265,9 @@ type gstreamer-dbg.def &gt;&gt; gst.def
 			<File
 				RelativePath="..\gst\gstparse.c">
 			</File>
+			<File
+				RelativePath="..\gst\elements\gstpipefilter.c">
+			</File>
 			<File
 				RelativePath="..\gst\gstpipeline.c">
 			</File>
@@ -415,53 +423,6 @@ type gstreamer-dbg.def &gt;&gt; gst.def
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
 			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
 		</Filter>
-		<Filter
-			Name="libs"
-			Filter="">
-			<Filter
-				Name="control"
-				Filter="">
-				<File
-					RelativePath="..\libs\gst\control\control.c">
-				</File>
-				<File
-					RelativePath="..\libs\gst\control\control.h">
-				</File>
-				<File
-					RelativePath="..\libs\gst\control\dparam.c">
-				</File>
-				<File
-					RelativePath="..\libs\gst\control\dparam.h">
-				</File>
-				<File
-					RelativePath="..\libs\gst\control\dparam_smooth.c">
-				</File>
-				<File
-					RelativePath="..\libs\gst\control\dparam_smooth.h">
-				</File>
-				<File
-					RelativePath="..\libs\gst\control\dparamcommon.h">
-				</File>
-				<File
-					RelativePath="..\libs\gst\control\dparammanager.c">
-				</File>
-				<File
-					RelativePath="..\libs\gst\control\dparammanager.h">
-				</File>
-				<File
-					RelativePath="..\libs\gst\control\dplinearinterp.c">
-				</File>
-				<File
-					RelativePath="..\libs\gst\control\dplinearinterp.h">
-				</File>
-				<File
-					RelativePath="..\libs\gst\control\unitconvert.c">
-				</File>
-				<File
-					RelativePath="..\libs\gst\control\unitconvert.h">
-				</File>
-			</Filter>
-		</Filter>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/win32/gstbytestream.vcproj b/win32/gstbytestream.vcproj
index 198f63545e..b45be52e20 100644
--- a/win32/gstbytestream.vcproj
+++ b/win32/gstbytestream.vcproj
@@ -20,7 +20,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".\;..\;c:\usr\include"
+				AdditionalIncludeDirectories=".\;..\;..\libs\;c:\usr\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H;HAVE_WIN32"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
@@ -74,7 +74,7 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories=".\;..\;c:\usr\include"
+				AdditionalIncludeDirectories=".\;..\;..\libs\;c:\usr\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;HAVE_CONFIG_H;GST_DISABLE_GST_DEBUG;HAVE_WIN32"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -127,17 +127,29 @@
 			Name="Source Files"
 			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
+			<File
+				RelativePath="..\libs\gst\bytestream\adapter.c">
+			</File>
 			<File
 				RelativePath="..\libs\gst\bytestream\bytestream.c">
 			</File>
+			<File
+				RelativePath="..\libs\gst\bytestream\filepad.c">
+			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
 			Filter="h;hpp;hxx;hm;inl;inc;xsd"
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+			<File
+				RelativePath="..\libs\gst\bytestream\adapter.h">
+			</File>
 			<File
 				RelativePath="..\libs\gst\bytestream\bytestream.h">
 			</File>
+			<File
+				RelativePath="..\libs\gst\bytestream\filepad.h">
+			</File>
 		</Filter>
 		<Filter
 			Name="Resource Files"
diff --git a/win32/msvc71.sln b/win32/msvc71.sln
index 231b8e7bcc..09276c15a6 100644
--- a/win32/msvc71.sln
+++ b/win32/msvc71.sln
@@ -16,6 +16,7 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gst-inspect", "gst-inspect.vcproj", "{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7F}"
 	ProjectSection(ProjectDependencies) = postProject
 		{FC47A187-6B10-4B19-93B5-ED7BCC75D466} = {FC47A187-6B10-4B19-93B5-ED7BCC75D466}
+		{0CCB8AFC-97D8-4251-9B9D-08E8DC41BB7D} = {0CCB8AFC-97D8-4251-9B9D-08E8DC41BB7D}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gstelements", "gstelements.vcproj", "{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7C}"
@@ -43,7 +44,15 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gstgetbits", "gstgetbits.vc
 		{FC47A187-6B10-4B19-93B5-ED7BCC75D466} = {FC47A187-6B10-4B19-93B5-ED7BCC75D466}
 	EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gstcontrol", "gstcontrol.vcproj", "{0CCB8AFC-97D8-4251-9B9D-08E8DC41BB7D}"
+	ProjectSection(ProjectDependencies) = postProject
+		{FC47A187-6B10-4B19-93B5-ED7BCC75D466} = {FC47A187-6B10-4B19-93B5-ED7BCC75D466}
+	EndProjectSection
+EndProject
 Global
+	GlobalSection(DPCodeReviewSolutionGUID) = preSolution
+		DPCodeReviewSolutionGUID = {00000000-0000-0000-0000-000000000000}
+	EndGlobalSection
 	GlobalSection(SolutionConfiguration) = preSolution
 		Debug = Debug
 		Release = Release
@@ -85,6 +94,10 @@ Global
 		{0CCB8AFC-97D8-4251-9B9D-08E7DC41BA7D}.Debug.Build.0 = Debug|Win32
 		{0CCB8AFC-97D8-4251-9B9D-08E7DC41BA7D}.Release.ActiveCfg = Release|Win32
 		{0CCB8AFC-97D8-4251-9B9D-08E7DC41BA7D}.Release.Build.0 = Release|Win32
+		{0CCB8AFC-97D8-4251-9B9D-08E8DC41BB7D}.Debug.ActiveCfg = Debug|Win32
+		{0CCB8AFC-97D8-4251-9B9D-08E8DC41BB7D}.Debug.Build.0 = Debug|Win32
+		{0CCB8AFC-97D8-4251-9B9D-08E8DC41BB7D}.Release.ActiveCfg = Release|Win32
+		{0CCB8AFC-97D8-4251-9B9D-08E8DC41BB7D}.Release.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 	EndGlobalSection
diff --git a/win32/vs7/GStreamer.vcproj b/win32/vs7/GStreamer.vcproj
index 090382c60d..396d26d2e6 100644
--- a/win32/vs7/GStreamer.vcproj
+++ b/win32/vs7/GStreamer.vcproj
@@ -43,7 +43,7 @@
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories="c:\usr\lib"
 				IgnoreAllDefaultLibraries="FALSE"
-				ModuleDefinitionFile="gst.def"
+				ModuleDefinitionFile="$(ProjectDir)gst.def"
 				DelayLoadDLLs=""
 				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile="$(OutDir)/GStreamer.pdb"
@@ -62,7 +62,8 @@ mkdir c:\gstreamer\bin
 copy /Y $(TargetPath) c:\gstreamer\bin
 for %%i in (af az ca cs en_GB fr nl sq sr sv tr uk) do msgfmt -o ..\po\%%i.gmo ..\po\%%i.po
 for %%i in (af az ca cs en_GB fr nl sq sr sv tr uk) do mkdir c:\gstreamer\locale\%%i
-for %%i in (af az ca cs en_GB fr nl sq sr sv tr uk) do copy /Y ..\po\%%i.gmo c:\gstreamer\locale\%%i\gstreamer-0.8.mo"/>
+for %%i in (af az ca cs en_GB fr nl sq sr sv tr uk) do copy /Y ..\po\%%i.gmo c:\gstreamer\locale\%%i\gstreamer-0.8.mo
+"/>
 			<Tool
 				Name="VCPreBuildEventTool"
 				CommandLine="copy $(ProjectDir)\gstconfig.h $(ProjectDir)\..\gst\gstconfig.h
@@ -124,7 +125,7 @@ type gstreamer-dbg.def &gt;&gt; gst.def
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories="c:\usr\lib"
 				IgnoreAllDefaultLibraries="FALSE"
-				ModuleDefinitionFile="gst.def"
+				ModuleDefinitionFile="$(ProjectDir)gst.def"
 				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile="$(OutDir)/GStreamer.pdb"
 				SubSystem="2"
@@ -142,7 +143,8 @@ mkdir c:\gstreamer\bin
 copy /Y $(TargetPath) c:\gstreamer\bin
 for %%i in (af az ca cs en_GB fr nl sq sr sv tr uk) do msgfmt -o ..\po\%%i.gmo ..\po\%%i.po
 for %%i in (af az ca cs en_GB fr nl sq sr sv tr uk) do mkdir c:\gstreamer\locale\%%i
-for %%i in (af az ca cs en_GB fr nl sq sr sv tr uk) do copy /Y ..\po\%%i.gmo c:\gstreamer\locale\%%i\gstreamer-0.8.mo"/>
+for %%i in (af az ca cs en_GB fr nl sq sr sv tr uk) do copy /Y ..\po\%%i.gmo c:\gstreamer\locale\%%i\gstreamer-0.8.mo
+"/>
 			<Tool
 				Name="VCPreBuildEventTool"
 				CommandLine="copy $(ProjectDir)\gstconfig.h $(ProjectDir)\..\gst\gstconfig.h
@@ -206,6 +208,9 @@ type gstreamer-dbg.def &gt;&gt; gst.def
 			<File
 				RelativePath="..\gst\gstcaps.c">
 			</File>
+			<File
+				RelativePath="..\gst\gstchildproxy.c">
+			</File>
 			<File
 				RelativePath="..\gst\gstclock.c">
 			</File>
@@ -260,6 +265,9 @@ type gstreamer-dbg.def &gt;&gt; gst.def
 			<File
 				RelativePath="..\gst\gstparse.c">
 			</File>
+			<File
+				RelativePath="..\gst\elements\gstpipefilter.c">
+			</File>
 			<File
 				RelativePath="..\gst\gstpipeline.c">
 			</File>
@@ -415,53 +423,6 @@ type gstreamer-dbg.def &gt;&gt; gst.def
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
 			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
 		</Filter>
-		<Filter
-			Name="libs"
-			Filter="">
-			<Filter
-				Name="control"
-				Filter="">
-				<File
-					RelativePath="..\libs\gst\control\control.c">
-				</File>
-				<File
-					RelativePath="..\libs\gst\control\control.h">
-				</File>
-				<File
-					RelativePath="..\libs\gst\control\dparam.c">
-				</File>
-				<File
-					RelativePath="..\libs\gst\control\dparam.h">
-				</File>
-				<File
-					RelativePath="..\libs\gst\control\dparam_smooth.c">
-				</File>
-				<File
-					RelativePath="..\libs\gst\control\dparam_smooth.h">
-				</File>
-				<File
-					RelativePath="..\libs\gst\control\dparamcommon.h">
-				</File>
-				<File
-					RelativePath="..\libs\gst\control\dparammanager.c">
-				</File>
-				<File
-					RelativePath="..\libs\gst\control\dparammanager.h">
-				</File>
-				<File
-					RelativePath="..\libs\gst\control\dplinearinterp.c">
-				</File>
-				<File
-					RelativePath="..\libs\gst\control\dplinearinterp.h">
-				</File>
-				<File
-					RelativePath="..\libs\gst\control\unitconvert.c">
-				</File>
-				<File
-					RelativePath="..\libs\gst\control\unitconvert.h">
-				</File>
-			</Filter>
-		</Filter>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/win32/vs7/msvc71.sln b/win32/vs7/msvc71.sln
index 231b8e7bcc..09276c15a6 100644
--- a/win32/vs7/msvc71.sln
+++ b/win32/vs7/msvc71.sln
@@ -16,6 +16,7 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gst-inspect", "gst-inspect.vcproj", "{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7F}"
 	ProjectSection(ProjectDependencies) = postProject
 		{FC47A187-6B10-4B19-93B5-ED7BCC75D466} = {FC47A187-6B10-4B19-93B5-ED7BCC75D466}
+		{0CCB8AFC-97D8-4251-9B9D-08E8DC41BB7D} = {0CCB8AFC-97D8-4251-9B9D-08E8DC41BB7D}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gstelements", "gstelements.vcproj", "{0CCB8AFC-97D8-4251-9B9D-08E7DC41BB7C}"
@@ -43,7 +44,15 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gstgetbits", "gstgetbits.vc
 		{FC47A187-6B10-4B19-93B5-ED7BCC75D466} = {FC47A187-6B10-4B19-93B5-ED7BCC75D466}
 	EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gstcontrol", "gstcontrol.vcproj", "{0CCB8AFC-97D8-4251-9B9D-08E8DC41BB7D}"
+	ProjectSection(ProjectDependencies) = postProject
+		{FC47A187-6B10-4B19-93B5-ED7BCC75D466} = {FC47A187-6B10-4B19-93B5-ED7BCC75D466}
+	EndProjectSection
+EndProject
 Global
+	GlobalSection(DPCodeReviewSolutionGUID) = preSolution
+		DPCodeReviewSolutionGUID = {00000000-0000-0000-0000-000000000000}
+	EndGlobalSection
 	GlobalSection(SolutionConfiguration) = preSolution
 		Debug = Debug
 		Release = Release
@@ -85,6 +94,10 @@ Global
 		{0CCB8AFC-97D8-4251-9B9D-08E7DC41BA7D}.Debug.Build.0 = Debug|Win32
 		{0CCB8AFC-97D8-4251-9B9D-08E7DC41BA7D}.Release.ActiveCfg = Release|Win32
 		{0CCB8AFC-97D8-4251-9B9D-08E7DC41BA7D}.Release.Build.0 = Release|Win32
+		{0CCB8AFC-97D8-4251-9B9D-08E8DC41BB7D}.Debug.ActiveCfg = Debug|Win32
+		{0CCB8AFC-97D8-4251-9B9D-08E8DC41BB7D}.Debug.Build.0 = Debug|Win32
+		{0CCB8AFC-97D8-4251-9B9D-08E8DC41BB7D}.Release.ActiveCfg = Release|Win32
+		{0CCB8AFC-97D8-4251-9B9D-08E8DC41BB7D}.Release.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 	EndGlobalSection