diff --git a/build/win32/vs9/cogl-pango.vcprojin b/build/win32/vs9/cogl-pango.vcprojin
index d4c7a2567..e02668378 100644
--- a/build/win32/vs9/cogl-pango.vcprojin
+++ b/build/win32/vs9/cogl-pango.vcprojin
@@ -27,7 +27,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="$(PreBuildCmd)"
+				CommandLine=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
@@ -60,7 +60,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="$(PreBuildCmd)"
+				CommandLine=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
@@ -94,7 +94,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="$(PreBuildCmd)"
+				CommandLine=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
@@ -129,7 +129,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="$(PreBuildCmd)"
+				CommandLine=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
diff --git a/build/win32/vs9/cogl-path.vcprojin b/build/win32/vs9/cogl-path.vcprojin
index 1573c2c98..727e3780d 100644
--- a/build/win32/vs9/cogl-path.vcprojin
+++ b/build/win32/vs9/cogl-path.vcprojin
@@ -20,15 +20,12 @@
 		<Configuration
 			Name="Debug|Win32"
 			InheritedPropertySheets=".\cogl.vsprops"
-			ConfigurationType="4"
+			ConfigurationType="2"
 			CharacterSet="2"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="
-$(DoDefines)
-$(PreBuildCmd)
-				            "
+				CommandLine=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
@@ -44,48 +41,10 @@ $(PreBuildCmd)
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="opengl32.lib intl.lib cairo.lib gdk_pixbuf-2.0.lib gmodule-2.0.lib"
+				AdditionalDependencies=""
 				OutputFile="$(OutDir)\$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll"
 				LinkIncremental="2"
-				ModuleDefinitionFile="$(IntDir)\cogl.def"
-				ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				TargetMachine="1"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug_SDL|Win32"
-			InheritedPropertySheets=".\cogl.vsprops"
-			OutputDirectory="$(SolutionDir)\Debug\$(PlatformName)\bin"
-			ConfigurationType="4"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine="
-$(DoDefinesSDL)
-$(PreBuildCmd)
-				            "
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\cogl-path\tesselator;..\..\..\cogl\winsys"
-				PreprocessorDefinitions="$(DebugLibBuildDefines);$(CoglPathBuildDefines)"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="SDL.lib opengl32.lib intl.lib cairo.lib gdk_pixbuf-2.0.lib gmodule-2.0.lib"
-				OutputFile="$(OutDir)\$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll"
-				LinkIncremental="2"
-				ModuleDefinitionFile="$(IntDir)\cogl.def"
+				ModuleDefinitionFile="$(IntDir)\$(ProjectName).def"
 				ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
 				GenerateDebugInformation="true"
 				SubSystem="2"
@@ -95,15 +54,12 @@ $(PreBuildCmd)
 		<Configuration
 			Name="Debug|x64"
 			InheritedPropertySheets=".\cogl.vsprops"
-			ConfigurationType="4"
+			ConfigurationType="2"
 			CharacterSet="2"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="
-$(DoDefines)
-$(PreBuildCmd)
-				            "
+				CommandLine=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
@@ -119,48 +75,10 @@ $(PreBuildCmd)
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="opengl32.lib intl.lib cairo.lib gdk_pixbuf-2.0.lib gmodule-2.0.lib"
+				AdditionalDependencies=""
 				OutputFile="$(OutDir)\$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll"
 				LinkIncremental="2"
-				ModuleDefinitionFile="$(IntDir)\cogl.def"
-				ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				TargetMachine="17"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug_SDL|x64"
-			InheritedPropertySheets=".\cogl.vsprops"
-			OutputDirectory="$(SolutionDir)\Debug\$(PlatformName)\bin"
-			ConfigurationType="4"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine="
-$(DoDefinesSDL)
-$(PreBuildCmd)
-				            "
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\cogl-path\tesselator;..\..\..\cogl\winsys"
-				PreprocessorDefinitions="$(DebugLibBuildDefines);$(CoglPathBuildDefines)"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="SDL.lib opengl32.lib intl.lib cairo.lib gdk_pixbuf-2.0.lib gmodule-2.0.lib"
-				OutputFile="$(OutDir)\$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll"
-				LinkIncremental="2"
-				ModuleDefinitionFile="$(IntDir)\cogl.def"
+				ModuleDefinitionFile="$(IntDir)\$(ProjectName).def"
 				ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
 				GenerateDebugInformation="true"
 				SubSystem="2"
@@ -170,16 +88,13 @@ $(PreBuildCmd)
 		<Configuration
 			Name="Release|Win32"
 			InheritedPropertySheets=".\cogl.vsprops"
-			ConfigurationType="4"
+			ConfigurationType="2"
 			CharacterSet="2"
 			WholeProgramOptimization="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="
-$(DoDefines)
-$(PreBuildCmd)
-				            "
+				CommandLine=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
@@ -195,51 +110,10 @@ $(PreBuildCmd)
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="opengl32.lib intl.lib cairo.lib gdk_pixbuf-2.0.lib gmodule-2.0.lib"
+				AdditionalDependencies=""
 				OutputFile="$(OutDir)\$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll"
 				LinkIncremental="1"
-				ModuleDefinitionFile="$(IntDir)\cogl.def"
-				ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release_SDL|Win32"
-			InheritedPropertySheets=".\cogl.vsprops"
-			OutputDirectory="$(SolutionDir)\Release\$(PlatformName)\bin"
-			ConfigurationType="4"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-			Name="VCPreBuildEventTool"
-			CommandLine="
-$(DoDefinesSDL)
-$(PreBuildCmd)
-			            "
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				AdditionalIncludeDirectories="..\..\..\cogl-path\tesselator;..\..\..\cogl\winsys"
-				EnableIntrinsicFunctions="true"
-				PreprocessorDefinitions="$(ReleaseLibBuildDefines);$(CoglPathBuildDefines)"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="SDL.lib opengl32.lib intl.lib cairo.lib gdk_pixbuf-2.0.lib gmodule-2.0.lib"
-				OutputFile="$(OutDir)\$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll"
-				LinkIncremental="1"
-				ModuleDefinitionFile="$(IntDir)\cogl.def"
+				ModuleDefinitionFile="$(IntDir)\$(ProjectName).def"
 				ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
 				GenerateDebugInformation="true"
 				SubSystem="2"
@@ -251,15 +125,12 @@ $(PreBuildCmd)
 		<Configuration
 			Name="Release|x64"
 			InheritedPropertySheets=".\cogl.vsprops"
-			ConfigurationType="4"
+			ConfigurationType="2"
 			CharacterSet="2"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="
-$(DoDefines)
-$(PreBuildCmd)
-				            "
+				CommandLine=""
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
@@ -272,47 +143,10 @@ $(PreBuildCmd)
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="opengl32.lib intl.lib cairo.lib gdk_pixbuf-2.0.lib gmodule-2.0.lib"
+				AdditionalDependencies=""
 				OutputFile="$(OutDir)\$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll"
 				LinkIncremental="2"
-				ModuleDefinitionFile="$(IntDir)\cogl.def"
-				ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="17"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release_SDL|x64"
-			InheritedPropertySheets=".\cogl.vsprops"
-			OutputDirectory="$(SolutionDir)\Release\$(PlatformName)\bin"
-			ConfigurationType="4"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine="
-$(DoDefinesSDL)
-$(PreBuildCmd)
-				            "
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\cogl-path\tesselator;..\..\..\cogl\winsys"
-				PreprocessorDefinitions="$(ReleaseLibBuildDefines);$(CoglPathBuildDefines)"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="SDL.lib opengl32.lib intl.lib cairo.lib gdk_pixbuf-2.0.lib gmodule-2.0.lib"
-				OutputFile="$(OutDir)\$(CoglDllPrefix)$(ProjectName)$(CoglDllSuffix).dll"
-				LinkIncremental="2"
-				ModuleDefinitionFile="$(IntDir)\cogl.def"
+				ModuleDefinitionFile="$(IntDir)\$(ProjectName).def"
 				ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
 				GenerateDebugInformation="true"
 				SubSystem="2"
@@ -323,137 +157,111 @@ $(PreBuildCmd)
 		</Configuration>
 	</Configurations>
 	<Files>
-	<Filter Name="Sources"
-		Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-		UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-		>
+		<Filter Name="Sources"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
 #include "cogl-path.sourcefiles"
-		<File RelativePath="..\..\..\cogl-path\cogl-path-enum-types.c" />
-	</Filter>
-	<Filter Name="Headers"
-		Filter="h;hpp;hxx;hm;inl;inc;xsd"
-		UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-		>
-	</Filter>
-	<Filter Name="Resource Files">
-		<File RelativePath="..\..\..\cogl-path\cogl-path-enum-types.h.in">
-			<FileConfiguration Name="Debug|Win32">
-				<Tool Name="VCCustomBuildTool"
-					Description="Generating ..\..\..\cogl-path\cogl-path-enum-types.h"
-					CommandLine="$(GenCoglPathEnumsH)"
-					Outputs="..\..\..\cogl-path\cogl-path-enum-types.h"
-				/>
-			</FileConfiguration>
-			<FileConfiguration Name="Debug_SDL|Win32">
-				<Tool Name="VCCustomBuildTool"
-					Description="Generating ..\..\..\cogl-path\cogl-path-enum-types.h"
-					CommandLine="$(GenCoglPathEnumsH)"
-					Outputs="..\..\..\cogl-path\cogl-path-enum-types.h"
-				/>
-			</FileConfiguration>
-			<FileConfiguration Name="Debug|x64">
-				<Tool Name="VCCustomBuildTool"
-					Description="Generating ..\..\..\cogl-path\cogl-path-enum-types.h"
-					CommandLine="$(GenCoglPathEnumsH)"
-					Outputs="..\..\..\cogl-path\cogl-path-enum-types.h"
-				/>
-			</FileConfiguration>
-			<FileConfiguration Name="Debug_SDL|x64">
-				<Tool Name="VCCustomBuildTool"
-					Description="Generating ..\..\..\cogl-path\cogl-path-enum-types.h"
-					CommandLine="$(GenCoglPathEnumsH)"
-					Outputs="..\..\..\cogl-path\cogl-path-enum-types.h"
-				/>
-			</FileConfiguration>
-			<FileConfiguration Name="Release|Win32">
-				<Tool Name="VCCustomBuildTool"
-					Description="Generating ..\..\..\cogl-path\cogl-path-enum-types.h"
-					CommandLine="$(GenCoglPathEnumsH)"
-					Outputs="..\..\..\cogl-path\cogl-path-enum-types.h"
-				/>
-			</FileConfiguration>
-			<FileConfiguration Name="Release_SDL|Win32">
-				<Tool Name="VCCustomBuildTool"
-					Description="Generating ..\..\..\cogl-path\cogl-path-enum-types.h"
-					CommandLine="$(GenCoglPathEnumsH)"
-					Outputs="..\..\..\cogl-path\cogl-path-enum-types.h"
-				/>
-			</FileConfiguration>
-			<FileConfiguration Name="Release|x64">
-				<Tool Name="VCCustomBuildTool"
-					Description="Generating ..\..\..\cogl-path\cogl-path-enum-types.h"
-					CommandLine="$(GenCoglPathEnumsH)"
-					Outputs="..\..\..\cogl-path\cogl-path-enum-types.h"
-				/>
-			</FileConfiguration>
-			<FileConfiguration Name="Release_SDL|x64">
-				<Tool Name="VCCustomBuildTool"
-					Description="Generating ..\..\..\cogl-path\cogl-path-enum-types.h"
-					CommandLine="$(GenCoglPathEnumsH)"
-					Outputs="..\..\..\cogl-path\cogl-path-enum-types.h"
-				/>
-			</FileConfiguration>
-		</File>
-		<File RelativePath="..\..\..\cogl-path\cogl-path-enum-types.c.in">
-			<FileConfiguration Name="Debug|Win32">
-				<Tool Name="VCCustomBuildTool"
-					Description="Generating ..\..\..\cogl-path\cogl-path-enum-types.c"
-					CommandLine="$(GenCoglPathEnumsC)"
-					Outputs="..\..\..\cogl-path\cogl-path-enum-types.c"
-				/>
-			</FileConfiguration>
-			<FileConfiguration Name="Debug_SDL|Win32">
-				<Tool Name="VCCustomBuildTool"
-					Description="Generating ..\..\..\cogl-path\cogl-path-enum-types.c"
-					CommandLine="$(GenCoglPathEnumsC)"
-					Outputs="..\..\..\cogl-path\cogl-path-enum-types.c"
-				/>
-			</FileConfiguration>
-			<FileConfiguration Name="Debug|x64">
-				<Tool Name="VCCustomBuildTool"
-					Description="Generating ..\..\..\cogl-path\cogl-path-enum-types.c"
-					CommandLine="$(GenCoglPathEnumsC)"
-					Outputs="..\..\..\cogl-path\cogl-path-enum-types.c"
-				/>
-			</FileConfiguration>
-			<FileConfiguration Name="Debug_SDL|x64">
-				<Tool Name="VCCustomBuildTool"
-					Description="Generating ..\..\..\cogl-path\cogl-path-enum-types.c"
-					CommandLine="$(GenCoglPathEnumsC)"
-					Outputs="..\..\..\cogl-path\cogl-path-enum-types.c"
-				/>
-			</FileConfiguration>
-			<FileConfiguration Name="Release|Win32">
-				<Tool Name="VCCustomBuildTool"
-					Description="Generating ..\..\..\cogl-path\cogl-path-enum-types.c"
-					CommandLine="$(GenCoglPathEnumsC)"
-					Outputs="..\..\..\cogl-path\cogl-path-enum-types.c"
-				/>
-			</FileConfiguration>
-			<FileConfiguration Name="Release_SDL|Win32">
-				<Tool Name="VCCustomBuildTool"
-					Description="Generating ..\..\..\cogl-path\cogl-path-enum-types.c"
-					CommandLine="$(GenCoglPathEnumsC)"
-					Outputs="..\..\..\cogl-path\cogl-path-enum-types.c"
-				/>
-			</FileConfiguration>
-			<FileConfiguration Name="Release|x64">
-				<Tool Name="VCCustomBuildTool"
-					Description="Generating ..\..\..\cogl-path\cogl-path-enum-types.c"
-					CommandLine="$(GenCoglPathEnumsC)"
-					Outputs="..\..\..\cogl-path\cogl-path-enum-types.c"
-				/>
-			</FileConfiguration>
-			<FileConfiguration Name="Release_SDL|x64">
-				<Tool Name="VCCustomBuildTool"
-					Description="Generating ..\..\..\cogl-path\cogl-path-enum-types.c"
-					CommandLine="$(GenCoglPathEnumsC)"
-					Outputs="..\..\..\cogl-path\cogl-path-enum-types.c"
-				/>
-			</FileConfiguration>
-   </File>
-  </Filter>
- </Files>
- <Globals>
- </Globals>
+			<File RelativePath="..\..\..\cogl-path\cogl-path-enum-types.c" />
+		</Filter>
+		<Filter Name="Headers"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+		</Filter>
+		<Filter Name="Resource Files">
+			<File RelativePath="..\..\..\cogl-path\cogl-path-enum-types.h.in">
+				<FileConfiguration Name="Debug|Win32">
+					<Tool Name="VCCustomBuildTool"
+						Description="Generating ..\..\..\cogl-path\cogl-path-enum-types.h"
+						CommandLine="$(GenCoglPathEnumsH)"
+						Outputs="..\..\..\cogl-path\cogl-path-enum-types.h"
+					/>
+				</FileConfiguration>
+				<FileConfiguration Name="Debug|x64">
+					<Tool Name="VCCustomBuildTool"
+						Description="Generating ..\..\..\cogl-path\cogl-path-enum-types.h"
+						CommandLine="$(GenCoglPathEnumsH)"
+						Outputs="..\..\..\cogl-path\cogl-path-enum-types.h"
+					/>
+				</FileConfiguration>
+				<FileConfiguration Name="Release|Win32">
+					<Tool Name="VCCustomBuildTool"
+						Description="Generating ..\..\..\cogl-path\cogl-path-enum-types.h"
+						CommandLine="$(GenCoglPathEnumsH)"
+						Outputs="..\..\..\cogl-path\cogl-path-enum-types.h"
+					/>
+				</FileConfiguration>
+				<FileConfiguration Name="Release|x64">
+					<Tool Name="VCCustomBuildTool"
+						Description="Generating ..\..\..\cogl-path\cogl-path-enum-types.h"
+						CommandLine="$(GenCoglPathEnumsH)"
+						Outputs="..\..\..\cogl-path\cogl-path-enum-types.h"
+					/>
+				</FileConfiguration>
+			</File>
+			<File RelativePath="..\..\..\cogl-path\cogl-path-enum-types.c.in">
+				<FileConfiguration Name="Debug|Win32">
+					<Tool Name="VCCustomBuildTool"
+						Description="Generating ..\..\..\cogl-path\cogl-path-enum-types.c"
+						CommandLine="$(GenCoglPathEnumsC)"
+						Outputs="..\..\..\cogl-path\cogl-path-enum-types.c"
+					/>
+				</FileConfiguration>
+				<FileConfiguration Name="Debug|x64">
+					<Tool Name="VCCustomBuildTool"
+						Description="Generating ..\..\..\cogl-path\cogl-path-enum-types.c"
+						CommandLine="$(GenCoglPathEnumsC)"
+						Outputs="..\..\..\cogl-path\cogl-path-enum-types.c"
+					/>
+				</FileConfiguration>
+				<FileConfiguration Name="Release|Win32">
+					<Tool Name="VCCustomBuildTool"
+						Description="Generating ..\..\..\cogl-path\cogl-path-enum-types.c"
+						CommandLine="$(GenCoglPathEnumsC)"
+						Outputs="..\..\..\cogl-path\cogl-path-enum-types.c"
+					/>
+				</FileConfiguration>
+				<FileConfiguration Name="Release|x64">
+					<Tool Name="VCCustomBuildTool"
+						Description="Generating ..\..\..\cogl-path\cogl-path-enum-types.c"
+						CommandLine="$(GenCoglPathEnumsC)"
+						Outputs="..\..\..\cogl-path\cogl-path-enum-types.c"
+					/>
+				</FileConfiguration>
+			</File>
+			<File RelativePath="..\..\..\cogl-path\cogl-path.symbols">
+				<FileConfiguration Name="Debug|Win32">
+					<Tool Name="VCCustomBuildTool"
+						Description="Generating cogl-path.def"
+						CommandLine="$(GenerateCoglPathDef)"
+						Outputs="$(IntDir)\$(ProjectName).def"
+					/>
+				</FileConfiguration>
+				<FileConfiguration Name="Debug|x64">
+					<Tool Name="VCCustomBuildTool"
+						Description="Generating cogl-path.def"
+						CommandLine="$(GenerateCoglPathDef)"
+						Outputs="$(IntDir)\$(ProjectName).def"
+					/>
+				</FileConfiguration>
+				<FileConfiguration Name="Release|Win32">
+					<Tool Name="VCCustomBuildTool"
+						Description="Generating cogl-path.def"
+						CommandLine="$(GenerateCoglPathDef)"
+						Outputs="$(IntDir)\$(ProjectName).def"
+					/>
+				</FileConfiguration>
+				<FileConfiguration Name="Release|x64">
+					<Tool Name="VCCustomBuildTool"
+						Description="Generating cogl-path.def"
+						CommandLine="$(GenerateCoglPathDef)"
+						Outputs="$(IntDir)\$(ProjectName).def"
+					/>
+				</FileConfiguration>
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
 </VisualStudioProject>
diff --git a/build/win32/vs9/cogl.vsprops b/build/win32/vs9/cogl.vsprops
index 1f768c382..0f57e539e 100644
--- a/build/win32/vs9/cogl.vsprops
+++ b/build/win32/vs9/cogl.vsprops
@@ -251,22 +251,29 @@ cd vs$(VSVer)&#x0D;&#x0A;
 	<UserMacro
 		Name="GenerateCoglDef"
 		Value="
-		       echo EXPORTS &gt; $(DefDir)\cogl.def&#x0D;&#x0A;
-		       cl -EP -D_COGL_SUPPORTS_GTYPE_INTEGRATION -DCOGL_HAS_WIN32_SUPPORT -DCOGL_HAS_GLIB_SUPPORT -DCOGL_ENABLE_EXPERIMENTAL_API ..\..\..\cogl\cogl.symbols &gt;&gt; $(DefDir)\cogl.def&#x0D;&#x0A;
+echo EXPORTS &gt; $(DefDir)\cogl.def&#x0D;&#x0A;
+cl -EP -D_COGL_SUPPORTS_GTYPE_INTEGRATION -DCOGL_HAS_WIN32_SUPPORT -DCOGL_HAS_GLIB_SUPPORT -DCOGL_ENABLE_EXPERIMENTAL_API ..\..\..\cogl\cogl.symbols &gt;&gt; $(DefDir)\cogl.def&#x0D;&#x0A;
 			  "
 	/>
 	<UserMacro
 		Name="GenerateCoglSDLDef"
 		Value="
-		       echo EXPORTS &gt; $(DefDir)\cogl.def&#x0D;&#x0A;
-		       cl -EP -D_COGL_SUPPORTS_GTYPE_INTEGRATION -DCOGL_HAS_WIN32_SUPPORT -DCOGL_HAS_GLIB_SUPPORT -DCOGL_HAS_SDL_SUPPORT -DCOGL_ENABLE_EXPERIMENTAL_API ..\..\..\cogl\cogl.symbols &gt;&gt; $(DefDir)\cogl.def&#x0D;&#x0A;
+echo EXPORTS &gt; $(DefDir)\cogl.def&#x0D;&#x0A;
+cl -EP -D_COGL_SUPPORTS_GTYPE_INTEGRATION -DCOGL_HAS_WIN32_SUPPORT -DCOGL_HAS_GLIB_SUPPORT -DCOGL_HAS_SDL_SUPPORT -DCOGL_ENABLE_EXPERIMENTAL_API ..\..\..\cogl\cogl.symbols &gt;&gt; $(DefDir)\cogl.def&#x0D;&#x0A;
+			  "
+	/>
+	<UserMacro
+		Name="GenerateCoglPathDef"
+		Value="
+echo EXPORTS &gt; $(DefDir)\cogl-path.def&#x0D;&#x0A;
+cl -EP ..\..\..\cogl-path\cogl-path.symbols &gt;&gt; $(DefDir)\cogl-path.def&#x0D;&#x0A;
 			  "
 	/>
 	<UserMacro
 		Name="GenerateCoglPangoDef"
 		Value="
-		       echo EXPORTS &gt; $(DefDir)\cogl-pango.def&#x0D;&#x0A;
-			   cl -EP ..\..\..\cogl-pango\cogl-pango.symbols &gt;&gt; $(DefDir)\cogl-pango.def&#x0D;&#x0A;
+echo EXPORTS &gt; $(DefDir)\cogl-pango.def&#x0D;&#x0A;
+cl -EP ..\..\..\cogl-pango\cogl-pango.symbols &gt;&gt; $(DefDir)\cogl-pango.def&#x0D;&#x0A;
 			  "
 	/>
 	<UserMacro