diff --git a/ChangeLog b/ChangeLog
index de16c5ad36..78e36fb5a7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2004-08-09  Steve Lhomme  <steve.lhomme@free.fr>
+
+	* win32/gstbytestream.vcproj:
+	* win32/gstelements.vcproj:
+	* win32/gstgetbits.vcproj:
+	* win32/gst-inspect.vcproj:
+	* win32/gst-launch.vcproj:
+	* win32/gstoptimalscheduler.vcproj:
+	* win32/GStreamer.vcproj:
+	* win32/gst-register.vcproj:
+	* win32/gstspider.vcproj:
+	  update the include and lib dirs to fit standard libraries as
+      described in the Win32 manual
+
 2004-08-09  Steve Lhomme  <steve.lhomme@free.fr>
 
 	* win32/config.h:
diff --git a/win32/GStreamer.vcproj b/win32/GStreamer.vcproj
index f6e302e843..5b67bfa28c 100644
--- a/win32/GStreamer.vcproj
+++ b/win32/GStreamer.vcproj
@@ -21,11 +21,12 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="D:\Perso\Programmes\GStreamer\gstreamer\win32;.\;..\;..\libs;..\..\popt\include;..\..\glib\gmodule;..\..\gettext\include;..\..\libiconv\include;..\..\libxml2\include\libxml2;..\..\glib;..\..\glib\glib;..\..\glib\build\win32"
+				AdditionalIncludeDirectories=".\;..\;..\libs;c:\usr\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;HAVE_CONFIG_H;HAVE_WIN32;GST_EXPORTS"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
+				BufferSecurityCheck="TRUE"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="config.h"
 				WarningLevel="3"
@@ -36,11 +37,11 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="libpopt.lib glib-2.0.lib gobject-2.0.lib gthread-2.0.lib gmodule-2.0.lib libxml2.lib wsock32.lib intl.lib"
+				AdditionalDependencies="popt.lib glib-2.0.lib gobject-2.0.lib gthread-2.0.lib gmodule-2.0.lib libxml2.lib wsock32.lib intl.lib"
 				OutputFile="$(OutDir)/libgtreamer-0.8.dll"
 				LinkIncremental="0"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\..\glib\glib;..\..\glib\gobject;..\..\glib\gthread;..\..\glib\gmodule;..\..\popt\lib;..\..\gettext\lib;..\..\libxml2\lib"
+				AdditionalLibraryDirectories="c:\usr\lib"
 				IgnoreAllDefaultLibraries="FALSE"
 				ModuleDefinitionFile="gst.def"
 				DelayLoadDLLs=""
@@ -65,11 +66,11 @@ copy $(ProjectDir)\gstversion.h $(ProjectDir)\..\gst\gstversion.h
 copy $(ProjectDir)\gstenumtypes.h $(ProjectDir)\..\gst\gstenumtypes.h
 copy $(ProjectDir)\gstenumtypes.c $(ProjectDir)\..\gst\gstenumtypes.c
 echo #include &quot;gst/gstconfig.h&quot; &gt; gstmarshal.h.tmp
-$(ProjectDir)..\..\glib\gobject\glib-genmarshal --header --prefix=gst_marshal $(ProjectDir)..\gst\gstmarshal.list &gt;&gt; gstmarshal.h.tmp
+glib-genmarshal --header --prefix=gst_marshal $(ProjectDir)..\gst\gstmarshal.list &gt;&gt; gstmarshal.h.tmp
 move gstmarshal.h.tmp $(ProjectDir)..\gst\gstmarshal.h
 echo #include &quot;glib-object.h&quot; &gt; gstmarshal.c.tmp
 echo #include &quot;gstmarshal.h&quot; &gt;&gt; gstmarshal.c.tmp
-$(ProjectDir)..\..\glib\gobject\glib-genmarshal --body --prefix=gst_marshal $(ProjectDir)..\gst\gstmarshal.list &gt;&gt; gstmarshal.c.tmp
+glib-genmarshal --body --prefix=gst_marshal $(ProjectDir)..\gst\gstmarshal.list &gt;&gt; gstmarshal.c.tmp
 move gstmarshal.c.tmp $(ProjectDir)..\gst\gstmarshal.c
 bison -d -v -p_gst_parse__yy $(ProjectDir)..\gst\parse\grammar.y -o $(ProjectDir)..\gst\parse\grammar.tab.c
 flex -P_gst_parse_yy $(ProjectDir)..\gst\parse\parse.l
@@ -100,7 +101,7 @@ type gstreamer-dbg.def &gt;&gt; gst.def
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories=".\;..\;..\libs;..\..\popt\include;..\..\glib\gmodule;..\..\gettext\include;..\..\libiconv\include;..\..\libxml2\include\libxml2;..\..\glib;..\..\glib\glib;..\..\glib\win32"
+				AdditionalIncludeDirectories=".\;..\;..\libs;c:\usr\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;HAVE_CONFIG_H;HAVE_WIN32;GST_DISABLE_GST_DEBUG;GST_EXPORTS"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="2"
@@ -113,14 +114,15 @@ type gstreamer-dbg.def &gt;&gt; gst.def
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="libpopt.lib glib-2.0.lib gobject-2.0.lib gthread-2.0.lib gmodule-2.0.lib libxml2.lib wsock32.lib intl.lib"
+				AdditionalDependencies="popt.lib glib-2.0.lib gobject-2.0.lib gthread-2.0.lib gmodule-2.0.lib libxml2.lib wsock32.lib intl.lib"
 				OutputFile="$(OutDir)/libgtreamer-0.8.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\..\glib\glib;..\..\glib\gobject;..\..\glib\gthread;..\..\glib\gmodule;..\..\popt\lib;..\..\gettext\lib;..\..\libxml2\lib"
+				AdditionalLibraryDirectories="c:\usr\lib"
 				IgnoreAllDefaultLibraries="FALSE"
 				ModuleDefinitionFile="gst.def"
 				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile="$(OutDir)/GStreamer.pdb"
 				SubSystem="2"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
@@ -140,11 +142,11 @@ copy $(ProjectDir)\gstversion.h $(ProjectDir)\..\gst\gstversion.h
 copy $(ProjectDir)\gstenumtypes.h $(ProjectDir)\..\gst\gstenumtypes.h
 copy $(ProjectDir)\gstenumtypes.c $(ProjectDir)\..\gst\gstenumtypes.c
 echo #include &quot;gst/gstconfig.h&quot; &gt; gstmarshal.h.tmp
-$(ProjectDir)..\..\glib\gobject\glib-genmarshal --header --prefix=gst_marshal $(ProjectDir)..\gst\gstmarshal.list &gt;&gt; gstmarshal.h.tmp
+glib-genmarshal --header --prefix=gst_marshal $(ProjectDir)..\gst\gstmarshal.list &gt;&gt; gstmarshal.h.tmp
 move gstmarshal.h.tmp $(ProjectDir)..\gst\gstmarshal.h
 echo #include &quot;glib-object.h&quot; &gt; gstmarshal.c.tmp
 echo #include &quot;gstmarshal.h&quot; &gt;&gt; gstmarshal.c.tmp
-$(ProjectDir)..\..\glib\gobject\glib-genmarshal --body --prefix=gst_marshal $(ProjectDir)..\gst\gstmarshal.list &gt;&gt; gstmarshal.c.tmp
+glib-genmarshal --body --prefix=gst_marshal $(ProjectDir)..\gst\gstmarshal.list &gt;&gt; gstmarshal.c.tmp
 move gstmarshal.c.tmp $(ProjectDir)..\gst\gstmarshal.c
 bison -d -v -p_gst_parse__yy $(ProjectDir)..\gst\parse\grammar.y -o $(ProjectDir)..\gst\parse\grammar.tab.c
 flex -P_gst_parse_yy $(ProjectDir)..\gst\parse\parse.l
diff --git a/win32/gst-inspect.vcproj b/win32/gst-inspect.vcproj
index be00ce297e..a8d9937247 100644
--- a/win32/gst-inspect.vcproj
+++ b/win32/gst-inspect.vcproj
@@ -20,7 +20,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".\;..\;..\libs;..\..\libxml2\include\libxml2;..\..\popt\include;..\..\glib;..\..\glib\glib;..\..\glib\gmodule;..\..\glib\win32;..\..\gettext\include"
+				AdditionalIncludeDirectories=".\;..\;..\libs;c:\usr\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;HAVE_CONFIG_H"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
@@ -38,7 +38,7 @@
 				OutputFile="$(OutDir)/gst-inspect.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\..\glib\glib;..\..\glib\gobject;..\..\gettext\lib"
+				AdditionalLibraryDirectories="c:\usr\lib"
 				IgnoreAllDefaultLibraries="FALSE"
 				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile="$(OutDir)/gst-inspect.pdb"
@@ -74,7 +74,7 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories=".\;..\;..\libs;..\..\libxml2\include\libxml2;..\..\popt\include;..\..\glib;..\..\glib\glib;..\..\glib\gmodule;..\..\glib\win32;..\..\gettext\include"
+				AdditionalIncludeDirectories=".\;..\;..\libs;c:\usr\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;GST_DISABLE_GST_DEBUG;HAVE_CONFIG_H"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -90,7 +90,7 @@
 				OutputFile="$(OutDir)/gst-inspect.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\..\glib\glib;..\..\glib\gobject;..\..\gettext\lib"
+				AdditionalLibraryDirectories="c:\usr\lib"
 				GenerateDebugInformation="TRUE"
 				SubSystem="1"
 				OptimizeReferences="2"
diff --git a/win32/gst-launch.vcproj b/win32/gst-launch.vcproj
index dbc0abfd2e..06323c81af 100644
--- a/win32/gst-launch.vcproj
+++ b/win32/gst-launch.vcproj
@@ -20,7 +20,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".\;..\;..\..\libxml2\include\libxml2;..\..\popt\include;..\..\glib;..\..\glib\glib;..\..\glib\gmodule;..\..\glib\win32;..\..\gettext\include"
+				AdditionalIncludeDirectories=".\;..\;c:\usr\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;HAVE_CONFIG_H"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
@@ -38,7 +38,7 @@
 				OutputFile="$(OutDir)/gst-launch.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\..\glib\glib;..\..\glib\gobject;..\..\gettext\lib"
+				AdditionalLibraryDirectories="c:\usr\lib"
 				IgnoreAllDefaultLibraries="FALSE"
 				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile="$(OutDir)/gst-launch.pdb"
@@ -74,7 +74,7 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories=".\;..\;..\..\libxml2\include\libxml2;..\..\popt\include;..\..\glib;..\..\glib\glib;..\..\glib\gmodule;..\..\glib\win32;..\..\gettext\include"
+				AdditionalIncludeDirectories=".\;..\;c:\usr\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;GST_DISABLE_GST_DEBUG;HAVE_CONFIG_H"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -90,7 +90,7 @@
 				OutputFile="$(OutDir)/gst-launch.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\..\glib\glib;..\..\glib\gobject;..\..\gettext\lib"
+				AdditionalLibraryDirectories="c:\usr\lib"
 				GenerateDebugInformation="TRUE"
 				SubSystem="1"
 				OptimizeReferences="2"
diff --git a/win32/gst-register.vcproj b/win32/gst-register.vcproj
index a0784d04b8..0b8e38a4e5 100644
--- a/win32/gst-register.vcproj
+++ b/win32/gst-register.vcproj
@@ -20,7 +20,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".\;..\;..\..\libxml2\include\libxml2;..\..\popt\include;..\..\glib;..\..\glib\glib;..\..\glib\gmodule;..\..\glib\win32;..\..\gettext\include"
+				AdditionalIncludeDirectories=".\;..\;c:\usr\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;HAVE_CONFIG_H"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
@@ -38,7 +38,7 @@
 				OutputFile="$(OutDir)/gst-register.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\..\glib\glib;..\..\glib\gobject;..\..\gettext\lib"
+				AdditionalLibraryDirectories="c:\usr\lib"
 				IgnoreAllDefaultLibraries="FALSE"
 				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile="$(OutDir)/gst-register.pdb"
@@ -74,7 +74,7 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories=".\;..\;..\..\libxml2\include\libxml2;..\..\popt\include;..\..\glib;..\..\glib\glib;..\..\glib\gmodule;..\..\glib\win32;..\..\gettext\include"
+				AdditionalIncludeDirectories=".\;..\;c:\usr\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;GST_DISABLE_GST_DEBUG;HAVE_CONFIG_H"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -90,8 +90,9 @@
 				OutputFile="$(OutDir)/gst-register.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\..\glib\glib;..\..\glib\gobject;..\..\gettext\lib"
+				AdditionalLibraryDirectories="c:\usr\lib"
 				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile="$(OutDir)/gst-register.pdb"
 				SubSystem="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
diff --git a/win32/gstbytestream.vcproj b/win32/gstbytestream.vcproj
index 0328280bfc..198f63545e 100644
--- a/win32/gstbytestream.vcproj
+++ b/win32/gstbytestream.vcproj
@@ -20,7 +20,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".\;..\;..\..\libxml2\include\libxml2;..\..\popt\include;..\..\glib;..\..\glib\glib;..\..\glib\gmodule;..\..\glib\win32;..\..\gettext\include"
+				AdditionalIncludeDirectories=".\;..\;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=".\;..\;..\..\libxml2\include\libxml2;..\..\popt\include;..\..\glib;..\..\glib\glib;..\..\glib\gmodule;..\..\glib\win32;..\..\gettext\include"
+				AdditionalIncludeDirectories=".\;..\;c:\usr\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;HAVE_CONFIG_H;GST_DISABLE_GST_DEBUG;HAVE_WIN32"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
diff --git a/win32/gstelements.vcproj b/win32/gstelements.vcproj
index e87658a1fd..7e3ce4285b 100644
--- a/win32/gstelements.vcproj
+++ b/win32/gstelements.vcproj
@@ -20,7 +20,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".\;..\;..\..\libxml2\include\libxml2;..\..\popt\include;..\..\glib;..\..\glib\glib;..\..\glib\gmodule;..\..\glib\win32;..\..\gettext\include"
+				AdditionalIncludeDirectories=".\;..\;c:\usr\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H;HAVE_WIN32"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
@@ -38,7 +38,7 @@
 				OutputFile="$(OutDir)/gstelements.dll"
 				LinkIncremental="2"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\..\glib\glib;..\..\glib\gobject;..\..\gettext\lib"
+				AdditionalLibraryDirectories="c:\usr\lib"
 				IgnoreAllDefaultLibraries="FALSE"
 				ModuleDefinitionFile=""
 				GenerateDebugInformation="TRUE"
@@ -74,7 +74,7 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories=".\;..\;..\..\libxml2\include\libxml2;..\..\popt\include;..\..\glib;..\..\glib\glib;..\..\glib\gmodule;..\..\glib\win32;..\..\gettext\include"
+				AdditionalIncludeDirectories=".\;..\;c:\usr\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;HAVE_CONFIG_H;GST_DISABLE_GST_DEBUG;HAVE_WIN32"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -90,7 +90,7 @@
 				OutputFile="$(OutDir)/gstelements.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\..\glib\glib;..\..\glib\gobject;..\..\gettext\lib"
+				AdditionalLibraryDirectories="c:\usr\lib"
 				ModuleDefinitionFile=""
 				GenerateDebugInformation="TRUE"
 				SubSystem="2"
diff --git a/win32/gstgetbits.vcproj b/win32/gstgetbits.vcproj
index ae84330391..66a351050b 100644
--- a/win32/gstgetbits.vcproj
+++ b/win32/gstgetbits.vcproj
@@ -20,7 +20,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".\;..\;..\..\libxml2\include\libxml2;..\..\popt\include;..\..\glib;..\..\glib\glib;..\..\glib\gmodule;..\..\glib\win32;..\..\gettext\include"
+				AdditionalIncludeDirectories=".\;..\;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=".\;..\;..\..\libxml2\include\libxml2;..\..\popt\include;..\..\glib;..\..\glib\glib;..\..\glib\gmodule;..\..\glib\win32;..\..\gettext\include"
+				AdditionalIncludeDirectories=".\;..\;c:\usr\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;HAVE_CONFIG_H;GST_DISABLE_GST_DEBUG;HAVE_WIN32"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
diff --git a/win32/gstoptimalscheduler.vcproj b/win32/gstoptimalscheduler.vcproj
index 4ad92a138a..72a169dd3d 100644
--- a/win32/gstoptimalscheduler.vcproj
+++ b/win32/gstoptimalscheduler.vcproj
@@ -20,7 +20,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".\;..\;..\..\libxml2\include\libxml2;..\..\popt\include;..\..\glib;..\..\glib\glib;..\..\glib\gmodule;..\..\glib\win32;..\..\gettext\include"
+				AdditionalIncludeDirectories=".\;..\;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=".\;..\;..\..\libxml2\include\libxml2;..\..\popt\include;..\..\glib;..\..\glib\glib;..\..\glib\gmodule;..\..\glib\win32;..\..\gettext\include"
+				AdditionalIncludeDirectories=".\;..\;c:\usr\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;HAVE_CONFIG_H;GST_DISABLE_GST_DEBUG;HAVE_WIN32"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
diff --git a/win32/gstspider.vcproj b/win32/gstspider.vcproj
index a3ce248bb8..909e5ec5ff 100644
--- a/win32/gstspider.vcproj
+++ b/win32/gstspider.vcproj
@@ -20,7 +20,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".\;..\;..\..\libxml2\include\libxml2;..\..\popt\include;..\..\glib;..\..\glib\glib;..\..\glib\gmodule;..\..\glib\win32;..\..\gettext\include"
+				AdditionalIncludeDirectories=".\;..\;c:\usr\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H;HAVE_WIN32"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
@@ -38,7 +38,7 @@
 				OutputFile="$(OutDir)/gstspider.dll"
 				LinkIncremental="2"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\..\glib\glib;..\..\glib\gobject;..\..\gettext\lib"
+				AdditionalLibraryDirectories="c:\usr\lib"
 				IgnoreAllDefaultLibraries="FALSE"
 				ModuleDefinitionFile=""
 				GenerateDebugInformation="TRUE"
@@ -74,7 +74,7 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories=".\;..\;..\..\libxml2\include\libxml2;..\..\popt\include;..\..\glib;..\..\glib\glib;..\..\glib\gmodule;..\..\glib\win32;..\..\gettext\include"
+				AdditionalIncludeDirectories=".\;..\;c:\usr\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;HAVE_CONFIG_H;GST_DISABLE_GST_DEBUG;HAVE_WIN32"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -90,7 +90,7 @@
 				OutputFile="$(OutDir)/gstspider.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\..\glib\glib;..\..\glib\gobject;..\..\gettext\lib"
+				AdditionalLibraryDirectories="c:\usr\lib"
 				ModuleDefinitionFile=""
 				GenerateDebugInformation="TRUE"
 				SubSystem="2"
diff --git a/win32/vs7/GStreamer.vcproj b/win32/vs7/GStreamer.vcproj
index f6e302e843..5b67bfa28c 100644
--- a/win32/vs7/GStreamer.vcproj
+++ b/win32/vs7/GStreamer.vcproj
@@ -21,11 +21,12 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="D:\Perso\Programmes\GStreamer\gstreamer\win32;.\;..\;..\libs;..\..\popt\include;..\..\glib\gmodule;..\..\gettext\include;..\..\libiconv\include;..\..\libxml2\include\libxml2;..\..\glib;..\..\glib\glib;..\..\glib\build\win32"
+				AdditionalIncludeDirectories=".\;..\;..\libs;c:\usr\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;HAVE_CONFIG_H;HAVE_WIN32;GST_EXPORTS"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
+				BufferSecurityCheck="TRUE"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="config.h"
 				WarningLevel="3"
@@ -36,11 +37,11 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="libpopt.lib glib-2.0.lib gobject-2.0.lib gthread-2.0.lib gmodule-2.0.lib libxml2.lib wsock32.lib intl.lib"
+				AdditionalDependencies="popt.lib glib-2.0.lib gobject-2.0.lib gthread-2.0.lib gmodule-2.0.lib libxml2.lib wsock32.lib intl.lib"
 				OutputFile="$(OutDir)/libgtreamer-0.8.dll"
 				LinkIncremental="0"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\..\glib\glib;..\..\glib\gobject;..\..\glib\gthread;..\..\glib\gmodule;..\..\popt\lib;..\..\gettext\lib;..\..\libxml2\lib"
+				AdditionalLibraryDirectories="c:\usr\lib"
 				IgnoreAllDefaultLibraries="FALSE"
 				ModuleDefinitionFile="gst.def"
 				DelayLoadDLLs=""
@@ -65,11 +66,11 @@ copy $(ProjectDir)\gstversion.h $(ProjectDir)\..\gst\gstversion.h
 copy $(ProjectDir)\gstenumtypes.h $(ProjectDir)\..\gst\gstenumtypes.h
 copy $(ProjectDir)\gstenumtypes.c $(ProjectDir)\..\gst\gstenumtypes.c
 echo #include &quot;gst/gstconfig.h&quot; &gt; gstmarshal.h.tmp
-$(ProjectDir)..\..\glib\gobject\glib-genmarshal --header --prefix=gst_marshal $(ProjectDir)..\gst\gstmarshal.list &gt;&gt; gstmarshal.h.tmp
+glib-genmarshal --header --prefix=gst_marshal $(ProjectDir)..\gst\gstmarshal.list &gt;&gt; gstmarshal.h.tmp
 move gstmarshal.h.tmp $(ProjectDir)..\gst\gstmarshal.h
 echo #include &quot;glib-object.h&quot; &gt; gstmarshal.c.tmp
 echo #include &quot;gstmarshal.h&quot; &gt;&gt; gstmarshal.c.tmp
-$(ProjectDir)..\..\glib\gobject\glib-genmarshal --body --prefix=gst_marshal $(ProjectDir)..\gst\gstmarshal.list &gt;&gt; gstmarshal.c.tmp
+glib-genmarshal --body --prefix=gst_marshal $(ProjectDir)..\gst\gstmarshal.list &gt;&gt; gstmarshal.c.tmp
 move gstmarshal.c.tmp $(ProjectDir)..\gst\gstmarshal.c
 bison -d -v -p_gst_parse__yy $(ProjectDir)..\gst\parse\grammar.y -o $(ProjectDir)..\gst\parse\grammar.tab.c
 flex -P_gst_parse_yy $(ProjectDir)..\gst\parse\parse.l
@@ -100,7 +101,7 @@ type gstreamer-dbg.def &gt;&gt; gst.def
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories=".\;..\;..\libs;..\..\popt\include;..\..\glib\gmodule;..\..\gettext\include;..\..\libiconv\include;..\..\libxml2\include\libxml2;..\..\glib;..\..\glib\glib;..\..\glib\win32"
+				AdditionalIncludeDirectories=".\;..\;..\libs;c:\usr\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;HAVE_CONFIG_H;HAVE_WIN32;GST_DISABLE_GST_DEBUG;GST_EXPORTS"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="2"
@@ -113,14 +114,15 @@ type gstreamer-dbg.def &gt;&gt; gst.def
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="libpopt.lib glib-2.0.lib gobject-2.0.lib gthread-2.0.lib gmodule-2.0.lib libxml2.lib wsock32.lib intl.lib"
+				AdditionalDependencies="popt.lib glib-2.0.lib gobject-2.0.lib gthread-2.0.lib gmodule-2.0.lib libxml2.lib wsock32.lib intl.lib"
 				OutputFile="$(OutDir)/libgtreamer-0.8.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\..\glib\glib;..\..\glib\gobject;..\..\glib\gthread;..\..\glib\gmodule;..\..\popt\lib;..\..\gettext\lib;..\..\libxml2\lib"
+				AdditionalLibraryDirectories="c:\usr\lib"
 				IgnoreAllDefaultLibraries="FALSE"
 				ModuleDefinitionFile="gst.def"
 				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile="$(OutDir)/GStreamer.pdb"
 				SubSystem="2"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
@@ -140,11 +142,11 @@ copy $(ProjectDir)\gstversion.h $(ProjectDir)\..\gst\gstversion.h
 copy $(ProjectDir)\gstenumtypes.h $(ProjectDir)\..\gst\gstenumtypes.h
 copy $(ProjectDir)\gstenumtypes.c $(ProjectDir)\..\gst\gstenumtypes.c
 echo #include &quot;gst/gstconfig.h&quot; &gt; gstmarshal.h.tmp
-$(ProjectDir)..\..\glib\gobject\glib-genmarshal --header --prefix=gst_marshal $(ProjectDir)..\gst\gstmarshal.list &gt;&gt; gstmarshal.h.tmp
+glib-genmarshal --header --prefix=gst_marshal $(ProjectDir)..\gst\gstmarshal.list &gt;&gt; gstmarshal.h.tmp
 move gstmarshal.h.tmp $(ProjectDir)..\gst\gstmarshal.h
 echo #include &quot;glib-object.h&quot; &gt; gstmarshal.c.tmp
 echo #include &quot;gstmarshal.h&quot; &gt;&gt; gstmarshal.c.tmp
-$(ProjectDir)..\..\glib\gobject\glib-genmarshal --body --prefix=gst_marshal $(ProjectDir)..\gst\gstmarshal.list &gt;&gt; gstmarshal.c.tmp
+glib-genmarshal --body --prefix=gst_marshal $(ProjectDir)..\gst\gstmarshal.list &gt;&gt; gstmarshal.c.tmp
 move gstmarshal.c.tmp $(ProjectDir)..\gst\gstmarshal.c
 bison -d -v -p_gst_parse__yy $(ProjectDir)..\gst\parse\grammar.y -o $(ProjectDir)..\gst\parse\grammar.tab.c
 flex -P_gst_parse_yy $(ProjectDir)..\gst\parse\parse.l
diff --git a/win32/vs7/gst-inspect.vcproj b/win32/vs7/gst-inspect.vcproj
index be00ce297e..a8d9937247 100644
--- a/win32/vs7/gst-inspect.vcproj
+++ b/win32/vs7/gst-inspect.vcproj
@@ -20,7 +20,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".\;..\;..\libs;..\..\libxml2\include\libxml2;..\..\popt\include;..\..\glib;..\..\glib\glib;..\..\glib\gmodule;..\..\glib\win32;..\..\gettext\include"
+				AdditionalIncludeDirectories=".\;..\;..\libs;c:\usr\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;HAVE_CONFIG_H"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
@@ -38,7 +38,7 @@
 				OutputFile="$(OutDir)/gst-inspect.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\..\glib\glib;..\..\glib\gobject;..\..\gettext\lib"
+				AdditionalLibraryDirectories="c:\usr\lib"
 				IgnoreAllDefaultLibraries="FALSE"
 				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile="$(OutDir)/gst-inspect.pdb"
@@ -74,7 +74,7 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories=".\;..\;..\libs;..\..\libxml2\include\libxml2;..\..\popt\include;..\..\glib;..\..\glib\glib;..\..\glib\gmodule;..\..\glib\win32;..\..\gettext\include"
+				AdditionalIncludeDirectories=".\;..\;..\libs;c:\usr\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;GST_DISABLE_GST_DEBUG;HAVE_CONFIG_H"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -90,7 +90,7 @@
 				OutputFile="$(OutDir)/gst-inspect.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\..\glib\glib;..\..\glib\gobject;..\..\gettext\lib"
+				AdditionalLibraryDirectories="c:\usr\lib"
 				GenerateDebugInformation="TRUE"
 				SubSystem="1"
 				OptimizeReferences="2"
diff --git a/win32/vs7/gst-launch.vcproj b/win32/vs7/gst-launch.vcproj
index dbc0abfd2e..06323c81af 100644
--- a/win32/vs7/gst-launch.vcproj
+++ b/win32/vs7/gst-launch.vcproj
@@ -20,7 +20,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".\;..\;..\..\libxml2\include\libxml2;..\..\popt\include;..\..\glib;..\..\glib\glib;..\..\glib\gmodule;..\..\glib\win32;..\..\gettext\include"
+				AdditionalIncludeDirectories=".\;..\;c:\usr\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;HAVE_CONFIG_H"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
@@ -38,7 +38,7 @@
 				OutputFile="$(OutDir)/gst-launch.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\..\glib\glib;..\..\glib\gobject;..\..\gettext\lib"
+				AdditionalLibraryDirectories="c:\usr\lib"
 				IgnoreAllDefaultLibraries="FALSE"
 				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile="$(OutDir)/gst-launch.pdb"
@@ -74,7 +74,7 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories=".\;..\;..\..\libxml2\include\libxml2;..\..\popt\include;..\..\glib;..\..\glib\glib;..\..\glib\gmodule;..\..\glib\win32;..\..\gettext\include"
+				AdditionalIncludeDirectories=".\;..\;c:\usr\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;GST_DISABLE_GST_DEBUG;HAVE_CONFIG_H"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -90,7 +90,7 @@
 				OutputFile="$(OutDir)/gst-launch.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\..\glib\glib;..\..\glib\gobject;..\..\gettext\lib"
+				AdditionalLibraryDirectories="c:\usr\lib"
 				GenerateDebugInformation="TRUE"
 				SubSystem="1"
 				OptimizeReferences="2"
diff --git a/win32/vs7/gst-register.vcproj b/win32/vs7/gst-register.vcproj
index a0784d04b8..0b8e38a4e5 100644
--- a/win32/vs7/gst-register.vcproj
+++ b/win32/vs7/gst-register.vcproj
@@ -20,7 +20,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".\;..\;..\..\libxml2\include\libxml2;..\..\popt\include;..\..\glib;..\..\glib\glib;..\..\glib\gmodule;..\..\glib\win32;..\..\gettext\include"
+				AdditionalIncludeDirectories=".\;..\;c:\usr\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;HAVE_CONFIG_H"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
@@ -38,7 +38,7 @@
 				OutputFile="$(OutDir)/gst-register.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\..\glib\glib;..\..\glib\gobject;..\..\gettext\lib"
+				AdditionalLibraryDirectories="c:\usr\lib"
 				IgnoreAllDefaultLibraries="FALSE"
 				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile="$(OutDir)/gst-register.pdb"
@@ -74,7 +74,7 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories=".\;..\;..\..\libxml2\include\libxml2;..\..\popt\include;..\..\glib;..\..\glib\glib;..\..\glib\gmodule;..\..\glib\win32;..\..\gettext\include"
+				AdditionalIncludeDirectories=".\;..\;c:\usr\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;GST_DISABLE_GST_DEBUG;HAVE_CONFIG_H"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -90,8 +90,9 @@
 				OutputFile="$(OutDir)/gst-register.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\..\glib\glib;..\..\glib\gobject;..\..\gettext\lib"
+				AdditionalLibraryDirectories="c:\usr\lib"
 				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile="$(OutDir)/gst-register.pdb"
 				SubSystem="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
diff --git a/win32/vs7/gstelements.vcproj b/win32/vs7/gstelements.vcproj
index e87658a1fd..7e3ce4285b 100644
--- a/win32/vs7/gstelements.vcproj
+++ b/win32/vs7/gstelements.vcproj
@@ -20,7 +20,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".\;..\;..\..\libxml2\include\libxml2;..\..\popt\include;..\..\glib;..\..\glib\glib;..\..\glib\gmodule;..\..\glib\win32;..\..\gettext\include"
+				AdditionalIncludeDirectories=".\;..\;c:\usr\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H;HAVE_WIN32"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
@@ -38,7 +38,7 @@
 				OutputFile="$(OutDir)/gstelements.dll"
 				LinkIncremental="2"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\..\glib\glib;..\..\glib\gobject;..\..\gettext\lib"
+				AdditionalLibraryDirectories="c:\usr\lib"
 				IgnoreAllDefaultLibraries="FALSE"
 				ModuleDefinitionFile=""
 				GenerateDebugInformation="TRUE"
@@ -74,7 +74,7 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories=".\;..\;..\..\libxml2\include\libxml2;..\..\popt\include;..\..\glib;..\..\glib\glib;..\..\glib\gmodule;..\..\glib\win32;..\..\gettext\include"
+				AdditionalIncludeDirectories=".\;..\;c:\usr\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;HAVE_CONFIG_H;GST_DISABLE_GST_DEBUG;HAVE_WIN32"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -90,7 +90,7 @@
 				OutputFile="$(OutDir)/gstelements.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories="..\..\glib\glib;..\..\glib\gobject;..\..\gettext\lib"
+				AdditionalLibraryDirectories="c:\usr\lib"
 				ModuleDefinitionFile=""
 				GenerateDebugInformation="TRUE"
 				SubSystem="2"
diff --git a/win32/vs7/gstgetbits.vcproj b/win32/vs7/gstgetbits.vcproj
index ae84330391..66a351050b 100644
--- a/win32/vs7/gstgetbits.vcproj
+++ b/win32/vs7/gstgetbits.vcproj
@@ -20,7 +20,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".\;..\;..\..\libxml2\include\libxml2;..\..\popt\include;..\..\glib;..\..\glib\glib;..\..\glib\gmodule;..\..\glib\win32;..\..\gettext\include"
+				AdditionalIncludeDirectories=".\;..\;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=".\;..\;..\..\libxml2\include\libxml2;..\..\popt\include;..\..\glib;..\..\glib\glib;..\..\glib\gmodule;..\..\glib\win32;..\..\gettext\include"
+				AdditionalIncludeDirectories=".\;..\;c:\usr\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;HAVE_CONFIG_H;GST_DISABLE_GST_DEBUG;HAVE_WIN32"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"