Revert "Remove the .vcproj files before rewriting them"

Revert .vcproj files and accompanying commits as the build stuff
needs more work.

29 files changed, 79 insertions, 1713 deletions

diff --git a/Makefile.am b/Makefile.am
index b0b56ec6..8b0889f2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to create Makefile.in.
 
-SUBDIRS= pango modules pango-view examples docs tools tests build
+SUBDIRS= pango modules pango-view examples docs tools tests
 
 EXTRA_DIST = 			\
 	autogen.sh		\
@@ -31,11 +31,9 @@ EXTRA_DIST = 			\
 	MAINTAINERS		\
 	HACKING			\
 	README.win32		\
-	config.h.win32		\
 	pango-zip.sh.in		\
 	sanitize-la.sh		\
 	pango.doap
-
 MAINTAINERCLEANFILES = \
 	$(srcdir)/INSTALL \
 	$(srcdir)/aclocal.m4 \
diff --git a/README.win32 b/README.win32
index 283b6cb8..68fcd8ab 100644
--- a/README.win32
+++ b/README.win32
@@ -6,11 +6,11 @@ pangowin32). Much of the GDI font API calls are in cairo.
 The pangoft2 backend was originally written with Win32 in mind, but
 its main use nowadays is on other platforms than Win32.
 
-There are three ways to build Pango for Win32:
+There are two ways to build Pango for Win32:
 
 1) Use gcc (mingw), libtool, make, like on Unix.
 
-If building from git, run the autogen.sh script that runs aclocal,
+If building from CVS, run the autogen.sh script that runs aclocal,
 automake, autoconf and configure to build makefiles etc. This is what
 tml@novell.com uses. Pass the same switches to autogen.sh that you
 would pass to the configure script.
@@ -20,15 +20,31 @@ make should be enough. But, as always, you need to understand what is
 happening and follow the progress in case manual intervention is
 needed.
 
+If you want to support complex scripts (which you should!), you need
+the usp10.h header from the Platform SDK. Otherwise the basic-win32
+shaper module won' use Uniscribe and for instance Arabic and Indic
+scripts will look like crap. (Yes, complex script support *is*
+important. It is one of the main selling points of GTK+ and Pango.)
+Pass the --with-usp10 flag to the configure script to tell it where
+you have the Platform SDK (or other source of an "usp10.h" or
+"include/usp10.h" file).
+
 tml ran the configure script like this when building binaries for
 Pango 1.10.0:
 
-PATH=/devel/dist/glib-2.8.0/bin:$PATH ACLOCAL_FLAGS="-I /devel/dist/glib-2.8.0/share/aclocal" PKG_CONFIG_PATH=/devel/dist/glib-2.8.0/lib/pkgconfig:$PKG_CONFIG_PATH CC='gcc -mtune=pentium3' CPPFLAGS='-I/opt/gnu/include' LDFLAGS='-L/opt/gnu/lib' CFLAGS=-O ./configure --disable-gtk-doc  --without-x --prefix=c:/devel/target/pango-1.10.0
+PATH=/devel/dist/glib-2.8.0/bin:$PATH ACLOCAL_FLAGS="-I /devel/dist/glib-2.8.0/share/aclocal" PKG_CONFIG_PATH=/devel/dist/glib-2.8.0/lib/pkgconfig:$PKG_CONFIG_PATH CC='gcc -mtune=pentium3' CPPFLAGS='-I/opt/gnu/include' LDFLAGS='-L/opt/gnu/lib' CFLAGS=-O ./configure --disable-gtk-doc --with-usp10=/opt/psdk  --without-x --prefix=c:/devel/target/pango-1.10.0
+
+The pango.modules file tends not to get automatically set up correctly
+on Win32. Check that. Also make sure you set up a pango.aliases file
+if you want to support non-Latin scripts. pango.aliases file used by
+tml looks like this:
 
-2) Use Visual Studio 2008. Use the solution file in
-build/win32/vs9. See the README.txt there for more information.
+tahoma = "tahoma,browallia new,mingliu,simhei,gulimche,ms gothic,latha,mangal"
+sans = "arial,browallia new,mingliu,simhei,gulimche,ms gothic,latha,mangal"
+serif = "times new roman,angsana new,mingliu,simsun,gulimche,ms gothic,latha,mangal"
+monospace = "courier new,courier monothai,mingliu,simsun,gulimche,ms gothic,latha,mangal"
 
-3) Use MSVC and nmake. Use the makefile.msc makefiles. These makefiles
+2) Use MSVC and nmake. Use the makefile.msc makefiles. These makefiles
 are supported by Hans Breuer. They requires manual editing. You need
 to have the source code to some suitable version of glib in a sibling
 directory. Ask Hans for advice.
diff --git a/build/Makefile.am b/build/Makefile.am
deleted file mode 100644
index 0f81afe3..00000000
--- a/build/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS = win32
diff --git a/build/win32/Makefile.am b/build/win32/Makefile.am
deleted file mode 100644
index ea035c25..00000000
--- a/build/win32/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS = vs9
diff --git a/build/win32/vs9/Makefile.am b/build/win32/vs9/Makefile.am
deleted file mode 100644
index 88ec9805..00000000
--- a/build/win32/vs9/Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
-EXTRA_DIST = \
-	pango.sln \
-	pango.vsprops \
-	pango.vcprojin \
-	pango.vcproj \
-	pangoft2.vcprojin \
-	pangoft2.vcproj \
-	pangowin32.vcproj \
-	pangocairo.vcprojin \
-	pangocairo.vcproj \
-	install.vcproj
diff --git a/build/win32/vs9/README.txt b/build/win32/vs9/README.txt
deleted file mode 100644
index b7c4e908..00000000
--- a/build/win32/vs9/README.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-Note that all this is rather experimental.

-

-This VS9 solution and the projects it includes are intented to be used

-in a Pango source tree unpacked from a tarball. In a git checkout you

-first need to use some Unix-like environment or manual work to expand

-files as needed, for instance the .vcprojin files here into .vcproj

-files.

-

-Set up the source tree as follows under some arbitrary top folder

-<root>:

-

-<root>\pango\<this-pango-source-tree>

-<root>\vs9\<PlatformName>

-

-*this* file you are now reading is thus located at

-<root>\pango\<this-pango-source-tree>\build\win32\vs9\README.txt.

-

-<PlatformName> is either Win32 or x64, as in VS9 project files.

-

-You should unpack the glib-dev zip file into

-<root>\vs9\<PlatformName>, so that for instance glib.h ends up at

-<root>\vs9\<PlatformName>\include\glib-2.0\glib.h.

-

-The "install" project will copy build results and headers into their

-appropriate location under <root>\vs9\<PlatformName>. For instance,

-built DLLs go into <root>\vs9\<PlatformName>\bin, built LIBs into

-<root>\vs9\<PlatformName>\lib and headers into

-<root>\vs9\<PlatformName>\include\pangpo-1.0. This is then from where

-project files higher in the stack are supposed to look for them, not

-from a specific Pango source tree like this one. It is important to

-keep separate the concept of a "source tree", where also non-public

-headers are present, and an "install tree" where only public headers

-are present.

-

---Tor Lillqvist <tml@iki.fi>

diff --git a/build/win32/vs9/install.vcproj b/build/win32/vs9/install.vcproj
deleted file mode 100644
index 3b9dad66..00000000
--- a/build/win32/vs9/install.vcproj
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="install"
-	ProjectGUID="{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}"
-	RootNamespace="install"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			InheritedPropertySheets=".\pango.vsprops"
-			OutputDirectory="$(GlibEtcInstallRoot)"
-			
-ConfigurationType="10"
-			CharacterSet="2"
-			DeleteExtensionsOnClean=""
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine="$(PangoDoInstall)"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			InheritedPropertySheets=".\pango.vsprops"
-			OutputDirectory="$(GlibEtcInstallRoot)"
-			ConfigurationType="10"
-			CharacterSet="2"
-			DeleteExtensionsOnClean=""
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine="$(PangoDoInstall)"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			InheritedPropertySheets=".\pango.vsprops"
-			OutputDirectory="$(GlibEtcInstallRoot)"
-			ConfigurationType="10"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			DeleteExtensionsOnClean=""
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine="$(PangoDoInstall)"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			InheritedPropertySheets=".\pango.vsprops"
-			OutputDirectory="$(GlibEtcInstallRoot)"
-			ConfigurationType="10"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			DeleteExtensionsOnClean=""
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine="$(PangoDoInstall)"
-			/>
-		</Configuration>
-	</Configurations>
-</VisualStudioProject>
diff --git a/build/win32/vs9/pango.sln b/build/win32/vs9/pango.sln
deleted file mode 100644
index ededa745..00000000
--- a/build/win32/vs9/pango.sln
+++ /dev/null
@@ -1,79 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pango", "pango.vcproj", "{68CC80B9-7225-4FB5-B9AB-9C1DF50B6C72}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pangoft2", "pangoft2.vcproj", "{68CC80B9-7225-4FB5-B9AB-9C1DF50B6C73}"
-	ProjectSection(ProjectDependencies) = postProject
-		{68CC80B9-7225-4FB5-B9AB-9C1DF50B6C72} = {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C72}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pangowin32", "pangowin32.vcproj", "{68CC80B9-7225-4FB5-B9AB-9C1DF50B6C74}"
-	ProjectSection(ProjectDependencies) = postProject
-		{68CC80B9-7225-4FB5-B9AB-9C1DF50B6C72} = {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C72}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pangocairo", "pangocairo.vcproj", "{68CC80B9-7225-4FB5-B9AB-9C1DF50B6C76}"
-	ProjectSection(ProjectDependencies) = postProject
-		{68CC80B9-7225-4FB5-B9AB-9C1DF50B6C72} = {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C72}
-		{68CC80B9-7225-4FB5-B9AB-9C1DF50B6C73} = {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C73}
-		{68CC80B9-7225-4FB5-B9AB-9C1DF50B6C74} = {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C74}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "install", "install.vcproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}"
-	ProjectSection(ProjectDependencies) = postProject
-		{68CC80B9-7225-4FB5-B9AB-9C1DF50B6C72} = {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C72}
-		{68CC80B9-7225-4FB5-B9AB-9C1DF50B6C73} = {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C73}
-		{68CC80B9-7225-4FB5-B9AB-9C1DF50B6C74} = {68CC80B9-7225-4FB5-B9AB-9C1DF50B6C74}
-	EndProjectSection
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Debug|x64 = Debug|x64
-		Release|Win32 = Release|Win32
-		Release|x64 = Release|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{68CC80B9-7225-4FB5-B9AB-9C1DF50B6C72}.Debug|Win32.ActiveCfg = Debug|Win32
-		{68CC80B9-7225-4FB5-B9AB-9C1DF50B6C72}.Debug|Win32.Build.0 = Debug|Win32
-		{68CC80B9-7225-4FB5-B9AB-9C1DF50B6C72}.Debug|x64.ActiveCfg = Debug|x64
-		{68CC80B9-7225-4FB5-B9AB-9C1DF50B6C72}.Debug|x64.Build.0 = Debug|x64
-		{68CC80B9-7225-4FB5-B9AB-9C1DF50B6C72}.Release|Win32.ActiveCfg = Release|Win32
-		{68CC80B9-7225-4FB5-B9AB-9C1DF50B6C72}.Release|Win32.Build.0 = Release|Win32
-		{68CC80B9-7225-4FB5-B9AB-9C1DF50B6C72}.Release|x64.ActiveCfg = Release|x64
-		{68CC80B9-7225-4FB5-B9AB-9C1DF50B6C72}.Release|x64.Build.0 = Release|x64
-		{68CC80B9-7225-4FB5-B9AB-9C1DF50B6C73}.Debug|Win32.ActiveCfg = Debug|Win32
-		{68CC80B9-7225-4FB5-B9AB-9C1DF50B6C73}.Debug|Win32.Build.0 = Debug|Win32
-		{68CC80B9-7225-4FB5-B9AB-9C1DF50B6C73}.Debug|x64.ActiveCfg = Debug|x64
-		{68CC80B9-7225-4FB5-B9AB-9C1DF50B6C73}.Debug|x64.Build.0 = Debug|x64
-		{68CC80B9-7225-4FB5-B9AB-9C1DF50B6C73}.Release|Win32.ActiveCfg = Release|Win32
-		{68CC80B9-7225-4FB5-B9AB-9C1DF50B6C73}.Release|Win32.Build.0 = Release|Win32
-		{68CC80B9-7225-4FB5-B9AB-9C1DF50B6C73}.Release|x64.ActiveCfg = Release|x64
-		{68CC80B9-7225-4FB5-B9AB-9C1DF50B6C73}.Release|x64.Build.0 = Release|x64
-		{68CC80B9-7225-4FB5-B9AB-9C1DF50B6C74}.Debug|Win32.ActiveCfg = Debug|Win32
-		{68CC80B9-7225-4FB5-B9AB-9C1DF50B6C74}.Debug|Win32.Build.0 = Debug|Win32
-		{68CC80B9-7225-4FB5-B9AB-9C1DF50B6C74}.Debug|x64.ActiveCfg = Debug|x64
-		{68CC80B9-7225-4FB5-B9AB-9C1DF50B6C74}.Debug|x64.Build.0 = Debug|x64
-		{68CC80B9-7225-4FB5-B9AB-9C1DF50B6C74}.Release|Win32.ActiveCfg = Release|Win32
-		{68CC80B9-7225-4FB5-B9AB-9C1DF50B6C74}.Release|Win32.Build.0 = Release|Win32
-		{68CC80B9-7225-4FB5-B9AB-9C1DF50B6C74}.Release|x64.ActiveCfg = Release|x64
-		{68CC80B9-7225-4FB5-B9AB-9C1DF50B6C74}.Release|x64.Build.0 = Release|x64
-		{68CC80B9-7225-4FB5-B9AB-9C1DF50B6C76}.Debug|Win32.ActiveCfg = Debug|Win32
-		{68CC80B9-7225-4FB5-B9AB-9C1DF50B6C76}.Debug|x64.ActiveCfg = Debug|x64
-		{68CC80B9-7225-4FB5-B9AB-9C1DF50B6C76}.Debug|x64.Build.0 = Debug|x64
-		{68CC80B9-7225-4FB5-B9AB-9C1DF50B6C76}.Release|Win32.ActiveCfg = Release|x64
-		{68CC80B9-7225-4FB5-B9AB-9C1DF50B6C76}.Release|x64.ActiveCfg = Release|x64
-		{68CC80B9-7225-4FB5-B9AB-9C1DF50B6C76}.Release|x64.Build.0 = Release|x64
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Debug|Win32.ActiveCfg = Debug|Win32
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Debug|Win32.Build.0 = Debug|Win32
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Debug|x64.ActiveCfg = Debug|x64
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Debug|x64.Build.0 = Debug|x64
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Release|Win32.ActiveCfg = Release|Win32
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Release|Win32.Build.0 = Release|Win32
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Release|x64.ActiveCfg = Release|x64
-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7073FB}.Release|x64.Build.0 = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/build/win32/vs9/pango.vcprojin b/build/win32/vs9/pango.vcprojin
deleted file mode 100644
index ad7db04f..00000000
--- a/build/win32/vs9/pango.vcprojin
+++ /dev/null
@@ -1,211 +0,0 @@
-<?xml version="1.0" encoding="us-ascii"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="pango"
-	ProjectGUID="{68CC80B9-7225-4FB5-B9AB-9C1DF50B6C72}"
-	RootNamespace="pango"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="0"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			InheritedPropertySheets=".\pango.vsprops"
-			ConfigurationType="2"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="_DEBUG;$(PangoDefines)"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="$(OutDir)\$(PangoDllPrefix)$(ProjectName)$(PangoDllSuffix).dll"
-				LinkIncremental="2"
-				ModuleDefinitionFile="..\..\..\pango\pango.def"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				ImportLibrary="$(TargetDir)$(ProjectName)-$(PangoApiVersion).lib"
-				TargetMachine="1"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			InheritedPropertySheets=".\pango.vsprops"
-			ConfigurationType="2"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCCLCompilerTool"
-				PreprocessorDefinitions="$(PangoDefines)"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="$(OutDir)\$(PangoDllPrefix)$(ProjectName)$(PangoDllSuffix).dll"
-				LinkIncremental="2"
-				ModuleDefinitionFile="..\..\..\pango\pango.def"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				ImportLibrary="$(TargetDir)$(ProjectName)-$(PangoApiVersion).lib"
-				TargetMachine="1"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			InheritedPropertySheets=".\pango.vsprops"
-			ConfigurationType="2"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="_DEBUG;$(PangoDefines)"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="$(OutDir)\$(PangoDllPrefix)$(ProjectName)$(PangoDllSuffix).dll"
-				LinkIncremental="2"
-				ModuleDefinitionFile="..\..\..\pango\pango.def"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				ImportLibrary="$(TargetDir)$(ProjectName)-$(PangoApiVersion).lib"
-				TargetMachine="17"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			InheritedPropertySheets=".\pango.vsprops"
-			ConfigurationType="2"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCCLCompilerTool"
-				PreprocessorDefinitions="$(PangoDefines)"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="$(OutDir)\$(PangoDllPrefix)$(ProjectName)$(PangoDllSuffix).dll"
-				LinkIncremental="2"
-				ModuleDefinitionFile="..\..\..\pango\pango.def"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				ImportLibrary="$(TargetDir)$(ProjectName)-$(PangoApiVersion).lib"
-				TargetMachine="17"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-			<File
-				RelativePath="..\..\..\pango\pango.rc"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File RelativePath="..\..\..\modules\arabic\arabic-lang.c">
-				<FileConfiguration Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_arabic_lang"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Debug|x64">
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_arabic_lang"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_arabic_lang"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Release|x64">
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_arabic_lang"
-					/>
-				</FileConfiguration>
-			</File>
-			<File RelativePath="..\..\..\modules\indic\indic-lang.c">
-				<FileConfiguration Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_indic_lang"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Debug|x64">
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_indic_lang"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_indic_lang"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Release|x64">
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_indic_lang"
-					/>
-				</FileConfiguration>
-			</File>
-#include "libpango.sourcefiles"
-#include "mini-fribidi/libmini-fribidi.sourcefiles"
-		</Filter>
-	</Files>
-</VisualStudioProject>
diff --git a/build/win32/vs9/pango.vsprops b/build/win32/vs9/pango.vsprops
deleted file mode 100644
index f2350069..00000000
--- a/build/win32/vs9/pango.vsprops
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="pangoprops"
-	OutputDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin"
-	IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\obj"
-	>
-	<Tool
-		Name="VCCLCompilerTool"
-		AdditionalIncludeDirectories="..\..\..;..\..\..\pango;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\include;$(GlibEtcInstallRoot)\include\cairo;$(GlibEtcInstallRoot)\include\fontconfig;$(GlibEtcInstallRoot)\include\freetype2"
-		PreprocessorDefinitions="HAVE_CONFIG_H;G_DISABLE_DEPRECATED;G_DISABLE_SINGLE_INCLUDES"
-		ForcedIncludeFiles="msvc_recommended_pragmas.h"
-	/>
-	<Tool
-		Name="VCLinkerTool"
-		AdditionalDependencies="gio-2.0.lib gmodule-2.0.lib gobject-2.0.lib glib-2.0.lib intl.lib"
-		AdditionalLibraryDirectories="$(GlibEtcInstallRoot)\lib"
-	/>
-	<Tool
-		Name="VCPreBuildEventTool"
-		CommandLine="
-if exist ..\..\..\config.h goto DONE_CONFIG_H&#x0D;&#x0A;
-copy ..\..\..\config.h.win32 ..\..\..\config.h&#x0D;&#x0A;
-:DONE_CONFIG_H&#x0D;&#x0A;
-
-if exist ..\..\..\pango\DONE_MODULE_DEFS_H goto DONE_MODULE_DEFS_H&#x0D;&#x0A;
-copy /y ..\..\..\pango\module-defs.h.win32 ..\..\..\pango\module-defs.h&#x0D;&#x0A;
-copy ..\..\..\pango\module-defs.h.win32 ..\..\..\pango\DONE_MODULE_DEFS_H&#x0D;&#x0A;
-:DONE_MODULE_DEFS_H&#x0D;&#x0A;
-
-if exist ..\..\..\pango\module-defs-lang.c goto DONE_MODULE_DEFS_LANG_C&#x0D;&#x0A;
-copy ..\..\..\pango\module-defs-lang.c.win32 ..\..\..\pango\module-defs-lang.c&#x0D;&#x0A;
-:DONE_MODULE_DEFS_LANG_C&#x0D;&#x0A;
-
-if exist ..\..\..\pango\module-defs-fc.c goto DONE_MODULE_DEFS_FC_C&#x0D;&#x0A;
-copy ..\..\..\pango\module-defs-fc.c.win32 ..\..\..\pango\module-defs-fc.c&#x0D;&#x0A;
-:DONE_MODULE_DEFS_FC_C&#x0D;&#x0A;
-
-if exist ..\..\..\pango\module-defs-win32.c goto DONE_MODULE_DEFS_WIN32_C&#x0D;&#x0A;
-copy ..\..\..\pango\module-defs-win32.c.win32 ..\..\..\pango\module-defs-win32.c&#x0D;&#x0A;
-:DONE_MODULE_DEFS_WIN32_C&#x0D;&#x0A;
-"
-	/>
-	<UserMacro
-		Name="PangoApiVersion"
-		Value="1.0"
-	/>
-	<UserMacro
-		Name="PangoBinaryVersion"
-		Value="1.6.0"
-	/>
-	<UserMacro
-		Name="PangoDummyPrefix"
-		Value="/dummy"
-	/>
-	<UserMacro
-		Name="PangoDefines"
-		Value="G_LOG_DOMAIN=\&quot;Pango\&quot;;PANGO_ENABLE_BACKEND;PANGO_ENABLE_ENGINE;SYSCONFDIR=\&quot;$(PangoDummyPrefix)/etc\&quot;;LIBDIR=\&quot;$(PangoDummyPrefix)/lib\&quot;"
-	/>
-	<UserMacro
-		Name="PangoDoInstall"
-		Value="
-echo on&#x0D;&#x0A;
-mkdir $(OutDir)\bin&#x0D;&#x0A;
-copy $(ConfigurationName)\$(PlatformName)\bin\*.dll $(OutDir)\bin&#x0D;&#x0A;
-copy $(ConfigurationName)\$(PlatformName)\bin\*.exe $(OutDir)\bin&#x0D;&#x0A;
-
-mkdir $(OutDir)\lib&#x0D;&#x0A;
-copy $(ConfigurationName)\$(PlatformName)\bin\*-$(PangoApiVersion).lib $(OutDir)\lib&#x0D;&#x0A;
-
-mkdir $(OutDir)\include\pango-$(PangoApiVersion)\pango&#x0D;&#x0A;
-copy ..\..\..\pango\pango.h $(OutDir)\include\pango-$(PangoApiVersion)\pango&#x0D;&#x0A;
-copy ..\..\..\pango\pango-attributes.h $(OutDir)\include\pango-$(PangoApiVersion)\pango&#x0D;&#x0A;
-copy ..\..\..\pango\pango-bidi-type.h $(OutDir)\include\pango-$(PangoApiVersion)\pango&#x0D;&#x0A;
-copy ..\..\..\pango\pango-break.h $(OutDir)\include\pango-$(PangoApiVersion)\pango&#x0D;&#x0A;
-copy ..\..\..\pango\pango-context.h $(OutDir)\include\pango-$(PangoApiVersion)\pango&#x0D;&#x0A;
-copy ..\..\..\pango\pango-coverage.h $(OutDir)\include\pango-$(PangoApiVersion)\pango&#x0D;&#x0A;
-copy ..\..\..\pango\pango-engine.h $(OutDir)\include\pango-$(PangoApiVersion)\pango&#x0D;&#x0A;
-copy ..\..\..\pango\pango-enum-types.h $(OutDir)\include\pango-$(PangoApiVersion)\pango&#x0D;&#x0A;
-copy ..\..\..\pango\pango-features.h $(OutDir)\include\pango-$(PangoApiVersion)\pango&#x0D;&#x0A;
-copy ..\..\..\pango\pango-font.h $(OutDir)\include\pango-$(PangoApiVersion)\pango&#x0D;&#x0A;
-copy ..\..\..\pango\pango-fontmap.h $(OutDir)\include\pango-$(PangoApiVersion)\pango&#x0D;&#x0A;
-copy ..\..\..\pango\pango-fontset.h $(OutDir)\include\pango-$(PangoApiVersion)\pango&#x0D;&#x0A;
-copy ..\..\..\pango\pango-glyph-item.h $(OutDir)\include\pango-$(PangoApiVersion)\pango&#x0D;&#x0A;
-copy ..\..\..\pango\pango-glyph.h $(OutDir)\include\pango-$(PangoApiVersion)\pango&#x0D;&#x0A;
-copy ..\..\..\pango\pango-gravity.h $(OutDir)\include\pango-$(PangoApiVersion)\pango&#x0D;&#x0A;
-copy ..\..\..\pango\pango-item.h $(OutDir)\include\pango-$(PangoApiVersion)\pango&#x0D;&#x0A;
-copy ..\..\..\pango\pango-language.h $(OutDir)\include\pango-$(PangoApiVersion)\pango&#x0D;&#x0A;
-copy ..\..\..\pango\pango-layout.h $(OutDir)\include\pango-$(PangoApiVersion)\pango&#x0D;&#x0A;
-copy ..\..\..\pango\pango-matrix.h $(OutDir)\include\pango-$(PangoApiVersion)\pango&#x0D;&#x0A;
-copy ..\..\..\pango\pango-modules.h $(OutDir)\include\pango-$(PangoApiVersion)\pango&#x0D;&#x0A;
-copy ..\..\..\pango\pango-ot.h $(OutDir)\include\pango-$(PangoApiVersion)\pango&#x0D;&#x0A;
-copy ..\..\..\pango\pango-renderer.h $(OutDir)\include\pango-$(PangoApiVersion)\pango&#x0D;&#x0A;
-copy ..\..\..\pango\pango-script.h $(OutDir)\include\pango-$(PangoApiVersion)\pango&#x0D;&#x0A;
-copy ..\..\..\pango\pango-tabs.h $(OutDir)\include\pango-$(PangoApiVersion)\pango&#x0D;&#x0A;
-copy ..\..\..\pango\pango-types.h $(OutDir)\include\pango-$(PangoApiVersion)\pango&#x0D;&#x0A;
-copy ..\..\..\pango\pango-utils.h $(OutDir)\include\pango-$(PangoApiVersion)\pango&#x0D;&#x0A;
-copy ..\..\..\pango\pangocairo.h $(OutDir)\include\pango-$(PangoApiVersion)\pango&#x0D;&#x0A;
-copy ..\..\..\pango\pangofc-decoder.h $(OutDir)\include\pango-$(PangoApiVersion)\pango&#x0D;&#x0A;
-copy ..\..\..\pango\pangofc-font.h $(OutDir)\include\pango-$(PangoApiVersion)\pango&#x0D;&#x0A;
-copy ..\..\..\pango\pangofc-fontmap.h $(OutDir)\include\pango-$(PangoApiVersion)\pango&#x0D;&#x0A;
-copy ..\..\..\pango\pangoft2.h $(OutDir)\include\pango-$(PangoApiVersion)\pango&#x0D;&#x0A;
-copy ..\..\..\pango\pangowin32.h $(OutDir)\include\pango-$(PangoApiVersion)\pango&#x0D;&#x0A;
-"
-	/>
-	<UserMacro
-		Name="PangoLibtoolCompatibleDllPrefix"
-		Value="lib"
-	/>
-	<UserMacro
-		Name="PangoLibtoolCompatibleDllSuffix"
-		Value="-$(PangoApiVersion)-0"
-	/>
-	<UserMacro
-		Name="PangoSeparateVS9DllPrefix"
-		Value=""
-	/>
-	<UserMacro
-		Name="PangoSeparateVS9DllSuffix"
-		Value="-1-vs9"
-	/>
-	<!-- Change these two to PangoLibtoolCompatibleDllPrefix and
-	PangoLibtoolCompatibleDllSuffix if that is what you want -->
-	<UserMacro
-		Name="PangoDllPrefix"
-		Value="$(PangoSeparateVS9DllPrefix)"
-	/>
-	<UserMacro
-		Name="PangoDllSuffix"
-		Value="$(PangoSeparateVS9DllSuffix)"
-	/>
-	<UserMacro
-		Name="GlibEtcInstallRoot"
-		Value="..\..\..\..\..\vs9\$(PlatformName)"
-	/>
-</VisualStudioPropertySheet>
diff --git a/build/win32/vs9/pangocairo.vcprojin b/build/win32/vs9/pangocairo.vcprojin
deleted file mode 100644
index 8b30b3ed..00000000
--- a/build/win32/vs9/pangocairo.vcprojin
+++ /dev/null
@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="us-ascii"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="pangocairo"
-	ProjectGUID="{68CC80B9-7225-4FB5-B9AB-9C1DF50B6C76}"
-	RootNamespace="pangocairo"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="0"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			InheritedPropertySheets=".\pango.vsprops"
-			ConfigurationType="2"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="."
-				PreprocessorDefinitions="_DEBUG;$(PangoDefines)"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="cairo.lib fontconfig.lib freetype.lib"
-				OutputFile="$(OutDir)\$(PangoDllPrefix)$(ProjectName)$(PangoDllSuffix).dll"
-				LinkIncremental="2"
-				ModuleDefinitionFile="..\..\..\pango\pangocairo.def"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				ImportLibrary="$(TargetDir)$(ProjectName)-$(PangoApiVersion).lib"
-				TargetMachine="1"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			InheritedPropertySheets=".\pango.vsprops"
-			ConfigurationType="2"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="."
-				PreprocessorDefinitions="$(PangoDefines)"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="cairo.lib fontconfig.lib freetype.lib"
-				OutputFile="$(OutDir)\$(PangoDllPrefix)$(ProjectName)$(PangoDllSuffix).dll"
-				LinkIncremental="2"
-				ModuleDefinitionFile="..\..\..\pango\pangocairo.def"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				ImportLibrary="$(TargetDir)$(ProjectName)-$(PangoApiVersion).lib"
-				TargetMachine="1"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			InheritedPropertySheets=".\pango.vsprops"
-			ConfigurationType="2"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="."
-				PreprocessorDefinitions="_DEBUG;$(PangoDefines)"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="cairo.lib fontconfig.lib freetype.lib"
-				OutputFile="$(OutDir)\$(PangoDllPrefix)$(ProjectName)$(PangoDllSuffix).dll"
-				LinkIncremental="2"
-				ModuleDefinitionFile="..\..\..\pango\pangocairo.def"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				ImportLibrary="$(TargetDir)$(ProjectName)-$(PangoApiVersion).lib"
-				TargetMachine="17"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			InheritedPropertySheets=".\pango.vsprops"
-			ConfigurationType="2"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="."
-				PreprocessorDefinitions="$(PangoDefines)"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="cairo.lib fontconfig.lib freetype.lib"
-				OutputFile="$(OutDir)\$(PangoDllPrefix)$(ProjectName)$(PangoDllSuffix).dll"
-				LinkIncremental="2"
-				ModuleDefinitionFile="..\..\..\pango\pangocairo.def"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				ImportLibrary="$(TargetDir)$(ProjectName)-$(PangoApiVersion).lib"
-				TargetMachine="17"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-			<File
-				RelativePath="..\..\..\pango\pangocairo.rc"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File RelativePath="..\..\..\pango\pangocairo-fcfont.c" />
-			<File RelativePath="..\..\..\pango\pangocairo-fcfontmap.c" />
-			<File RelativePath="..\..\..\pango\pangocairo-win32font.c" />
-			<File RelativePath="..\..\..\pango\pangocairo-win32fontmap.c" />
-#include "libpangocairo.sourcefiles"
-		</Filter>
-	</Files>
-</VisualStudioProject>
diff --git a/build/win32/vs9/pangoft2.vcprojin b/build/win32/vs9/pangoft2.vcprojin
deleted file mode 100644
index caf6e928..00000000
--- a/build/win32/vs9/pangoft2.vcprojin
+++ /dev/null
@@ -1,408 +0,0 @@
-<?xml version="1.0" encoding="us-ascii"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="pangoft2"
-	ProjectGUID="{68CC80B9-7225-4FB5-B9AB-9C1DF50B6C73}"
-	RootNamespace="pangoft2"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="0"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			InheritedPropertySheets=".\pango.vsprops"
-			ConfigurationType="2"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="."
-				PreprocessorDefinitions="_DEBUG;$(PangoDefines);HAVE_GLIB"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="fontconfig.lib freetype.lib"
-				OutputFile="$(OutDir)\$(PangoDllPrefix)$(ProjectName)$(PangoDllSuffix).dll"
-				LinkIncremental="2"
-				ModuleDefinitionFile="..\..\..\pango\pangoft2.def"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				ImportLibrary="$(TargetDir)$(ProjectName)-$(PangoApiVersion).lib"
-				TargetMachine="1"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			InheritedPropertySheets=".\pango.vsprops"
-			ConfigurationType="2"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCCLCompilerTool"
-				PreprocessorDefinitions="$(PangoDefines)"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="fontconfig.lib freetype.lib"
-				OutputFile="$(OutDir)\$(PangoDllPrefix)$(ProjectName)$(PangoDllSuffix).dll"
-				LinkIncremental="2"
-				ModuleDefinitionFile="..\..\..\pango\pangoft2.def"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				ImportLibrary="$(TargetDir)$(ProjectName)-$(PangoApiVersion).lib"
-				TargetMachine="1"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			InheritedPropertySheets=".\pango.vsprops"
-			ConfigurationType="2"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="_DEBUG;$(PangoDefines)"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="fontconfig.lib freetype.lib"
-				OutputFile="$(OutDir)\$(PangoDllPrefix)$(ProjectName)$(PangoDllSuffix).dll"
-				LinkIncremental="2"
-				ModuleDefinitionFile="..\..\..\pango\pangoft2.def"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				ImportLibrary="$(TargetDir)$(ProjectName)-$(PangoApiVersion).lib"
-				TargetMachine="17"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			InheritedPropertySheets=".\pango.vsprops"
-			ConfigurationType="2"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCCLCompilerTool"
-				PreprocessorDefinitions="$(PangoDefines)"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="fontconfig.lib freetype.lib"
-				OutputFile="$(OutDir)\$(PangoDllPrefix)$(ProjectName)$(PangoDllSuffix).dll"
-				LinkIncremental="2"
-				ModuleDefinitionFile="..\..\..\pango\pangoft2.def"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				ImportLibrary="$(TargetDir)$(ProjectName)-$(PangoApiVersion).lib"
-				TargetMachine="17"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-			<File
-				RelativePath="..\..\..\pango\pangoft2.rc"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File RelativePath="..\..\..\modules\arabic\arabic-fc.c">
-				<FileConfiguration Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_arabic_fc"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Debug|x64">
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_arabic_fc"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_arabic_fc"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Release|x64">
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_arabic_fc"
-					/>
-				</FileConfiguration>
-			</File>
-			<File RelativePath="..\..\..\modules\arabic\arabic-ot.c" />
-			<File RelativePath="..\..\..\modules\basic\basic-fc.c">
-				<FileConfiguration Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_basic_fc"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Debug|x64">
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_basic_fc"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_basic_fc"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Release|x64">
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_basic_fc"
-					/>
-				</FileConfiguration>
-			</File>
-			<File RelativePath="..\..\..\modules\hangul\hangul-fc.c">
-				<FileConfiguration Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_hangul_fc"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Debug|x64">
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_hangul_fc"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_hangul_fc"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Release|x64">
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_hangul_fc"
-					/>
-				</FileConfiguration>
-			</File>
-			<File RelativePath="..\..\..\modules\hebrew\hebrew-fc.c">
-				<FileConfiguration Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_hebrew_fc"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Debug|x64">
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_hebrew_fc"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_hebrew_fc"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Release|x64">
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_hebrew_fc"
-					/>
-				</FileConfiguration>
-			</File>
-			<File RelativePath="..\..\..\modules\hebrew\hebrew-shaper.c" />
-			<File RelativePath="..\..\..\modules\indic\indic-fc.c">
-				<FileConfiguration Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_indic_fc"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Debug|x64">
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_indic_fc"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_indic_fc"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Release|x64">
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_indic_fc"
-					/>
-				</FileConfiguration>
-			</File>
-			<File RelativePath="..\..\..\modules\indic\indic-ot.c" />
-			<File RelativePath="..\..\..\modules\indic\indic-ot-class-tables.c" />
-			<File RelativePath="..\..\..\modules\indic\mprefixups.c" />
-			<File RelativePath="..\..\..\modules\khmer\khmer-fc.c">
-				<FileConfiguration Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_khmer_fc"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Debug|x64">
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_khmer_fc"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_khmer_fc"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Release|x64">
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_khmer_fc"
-					/>
-				</FileConfiguration>
-			</File>
-			<File RelativePath="..\..\..\modules\syriac\syriac-fc.c">
-				<FileConfiguration Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_syriac_fc"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Debug|x64">
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_syriac_fc"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_syriac_fc"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Release|x64">
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_syriac_fc"
-					/>
-				</FileConfiguration>
-			</File>
-			<File RelativePath="..\..\..\modules\syriac\syriac-ot.c" />
-			<File RelativePath="..\..\..\modules\thai\thai-charprop.c" />
-			<File RelativePath="..\..\..\modules\thai\thai-fc.c">
-				<FileConfiguration Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_thai_fc"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Debug|x64">
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_thai_fc"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_thai_fc"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Release|x64">
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_thai_fc"
-					/>
-				</FileConfiguration>
-			</File>
-			<File RelativePath="..\..\..\modules\thai\thai-shaper.c" />
-			<File RelativePath="..\..\..\modules\tibetan\tibetan-fc.c">
-				<FileConfiguration Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_tibetan_fc"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Debug|x64">
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_tibetan_fc"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_tibetan_fc"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Release|x64">
-					<Tool
-						Name="VCCLCompilerTool"
-						PreprocessorDefinitions="PANGO_MODULE_PREFIX=_pango_tibetan_fc"
-					/>
-				</FileConfiguration>
-			</File>
-#include "opentype/libharfbuzz.sourcefiles"
-#include "libpangoft2.sourcefiles"
-		</Filter>
-	</Files>
-</VisualStudioProject>
diff --git a/build/win32/vs9/pangowin32.vcproj b/build/win32/vs9/pangowin32.vcproj
deleted file mode 100644
index 80e1f205..00000000
--- a/build/win32/vs9/pangowin32.vcproj
+++ /dev/null
@@ -1,165 +0,0 @@
-<?xml version="1.0" encoding="us-ascii"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="pangowin32"
-	ProjectGUID="{68CC80B9-7225-4FB5-B9AB-9C1DF50B6C74}"
-	RootNamespace="pangowin32"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="0"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			InheritedPropertySheets=".\pango.vsprops"
-			ConfigurationType="2"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="."
-				PreprocessorDefinitions="_DEBUG;$(PangoDefines)"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="$(OutDir)\$(PangoDllPrefix)$(ProjectName)$(PangoDllSuffix).dll"
-				LinkIncremental="2"
-				ModuleDefinitionFile="..\..\..\pango\pangowin32.def"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				ImportLibrary="$(TargetDir)$(ProjectName)-$(PangoApiVersion).lib"
-				TargetMachine="1"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			InheritedPropertySheets=".\pango.vsprops"
-			ConfigurationType="2"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCCLCompilerTool"
-				PreprocessorDefinitions="$(PangoDefines)"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="$(OutDir)\$(PangoDllPrefix)$(ProjectName)$(PangoDllSuffix).dll"
-				LinkIncremental="2"
-				ModuleDefinitionFile="..\..\..\pango\pangowin32.def"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				ImportLibrary="$(TargetDir)$(ProjectName)-$(PangoApiVersion).lib"
-				TargetMachine="1"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			InheritedPropertySheets=".\pango.vsprops"
-			ConfigurationType="2"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="_DEBUG;$(PangoDefines)"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="$(OutDir)\$(PangoDllPrefix)$(ProjectName)$(PangoDllSuffix).dll"
-				LinkIncremental="2"
-				ModuleDefinitionFile="..\..\..\pango\pangowin32.def"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				ImportLibrary="$(TargetDir)$(ProjectName)-$(PangoApiVersion).lib"
-				TargetMachine="17"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			InheritedPropertySheets=".\pango.vsprops"
-			ConfigurationType="2"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCCLCompilerTool"
-				PreprocessorDefinitions="$(PangoDefines)"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="$(OutDir)\$(PangoDllPrefix)$(ProjectName)$(PangoDllSuffix).dll"
-				LinkIncremental="2"
-				ModuleDefinitionFile="..\..\..\pango\pangowin32.def"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				ImportLibrary="$(TargetDir)$(ProjectName)-$(PangoApiVersion).lib"
-				TargetMachine="17"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-			<File
-				RelativePath="..\..\..\pango\pangowin32.rc"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File RelativePath="..\..\..\modules\basic\basic-win32.c" />
-			<File RelativePath="..\..\..\pango\module-defs-win32.c" />
-			<File RelativePath="..\..\..\pango\pangowin32.c" />
-			<File RelativePath="..\..\..\pango\pangowin32-fontcache.c" />
-			<File RelativePath="..\..\..\pango\pangowin32-fontmap.c" />
-		</Filter>
-	</Files>
-</VisualStudioProject>
diff --git a/build/win32/vs9/stdint.h b/build/win32/vs9/stdint.h
deleted file mode 100644
index fcab43a8..00000000
--- a/build/win32/vs9/stdint.h
+++ /dev/null
@@ -1,36 +0,0 @@
-typedef signed char int8_t;
-typedef unsigned char   uint8_t;
-typedef short  int16_t;
-typedef unsigned short  uint16_t;
-typedef int  int32_t;
-typedef unsigned   uint32_t;
-typedef long long  int64_t;
-typedef unsigned long long   uint64_t;
-typedef signed char int_least8_t;
-typedef unsigned char   uint_least8_t;
-typedef short  int_least16_t;
-typedef unsigned short  uint_least16_t;
-typedef int  int_least32_t;
-typedef unsigned   uint_least32_t;
-typedef long long  int_least64_t;
-typedef unsigned long long   uint_least64_t;
-typedef char int_fast8_t;
-typedef unsigned char uint_fast8_t;
-typedef short  int_fast16_t;
-typedef unsigned short  uint_fast16_t;
-typedef int  int_fast32_t;
-typedef unsigned  int  uint_fast32_t;
-typedef long long  int_fast64_t;
-typedef unsigned long long   uint_fast64_t;
-#ifdef _WIN64
-typedef __int64 intptr_t;
-#else
-typedef int intptr_t;
-#endif
-#ifdef _WIN64
-typedef unsigned __int64 uintptr_t;
-#else
-typedef unsigned int uintptr_t;
-#endif
-typedef __int64  intmax_t;
-typedef unsigned __int64 uintmax_t;
diff --git a/build/win32/vs9/unistd.h b/build/win32/vs9/unistd.h
deleted file mode 100644
index 8655b1d5..00000000
--- a/build/win32/vs9/unistd.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <io.h>
diff --git a/config.h.win32.in b/config.h.win32.in
deleted file mode 100644
index 1864ad04..00000000
--- a/config.h.win32.in
+++ /dev/null
@@ -1,151 +0,0 @@
-/* config.h.  Generated from config.h.in by configure.  */
-/* config.h.in.  Generated from configure.in by autoheader.  */
-/* Actually, this version of config.h is manually edited from the above */
-
-/* Have usable Cairo library and font backend */
-#define HAVE_CAIRO 1
-
-/* Whether Cairo can use ATSUI for fonts */
-/* #undef HAVE_CAIRO_ATSUI */
-
-/* Whether Cairo can use FreeType for fonts */
-#define HAVE_CAIRO_FREETYPE 1
-
-/* Whether Cairo has PDF support */
-#define HAVE_CAIRO_PDF 1
-
-/* Whether Cairo has PNG support */
-#define HAVE_CAIRO_PNG 1
-
-/* Whether Cairo has PS support */
-#define HAVE_CAIRO_PS 1
-
-/* Whether Cairo can use the Win32 GDI for fonts */
-#define HAVE_CAIRO_WIN32 1
-
-/* Whether Cairo has Xlib support */
-/* #undef HAVE_CAIRO_XLIB */
-
-/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
-   */
-/* #undef HAVE_DIRENT_H */
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-/* #undef HAVE_DLFCN_H */
-
-/* Define to 1 if you have the `flockfile' function. */
-/* #undef HAVE_FLOCKFILE */
-
-/* Have FreeType 2 library */
-#define HAVE_FREETYPE 1
-
-/* Define to 1 if you have the `getpagesize' function. */
-/* #undef HAVE_GETPAGESIZE */
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-/*#undef HAVE_INTTYPES_H */
-
-/* Define to 1 if you have the <memory.h> header file. */
-/* #undef HAVE_MEMORY_H */
-
-/* Define to 1 if you have the `mprotect' function. */
-/* #undef HAVE_MPROTECT */
-
-/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
-/* #undef HAVE_NDIR_H */
-
-/* Define to 1 if you have the <stdint.h> header file. */
-/* #undef HAVE_STDINT_H */
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#define HAVE_STDLIB_H 1
-
-/* Define to 1 if you have the <strings.h> header file. */
-/* #undef HAVE_STRINGS_H */
-
-/* Define to 1 if you have the <string.h> header file. */
-#define HAVE_STRING_H 1
-
-/* Define to 1 if you have the `strtok_r' function. */
-/* #undef HAVE_STRTOK_R */
-
-/* Define to 1 if you have the `sysconf' function. */
-/* #undef HAVE_SYSCONF */
-
-/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'.
-   */
-/* #undef HAVE_SYS_DIR_H */
-
-/* Define to 1 if you have the <sys/mman.h> header file. */
-/* #undef HAVE_SYS_MMAN_H */
-
-/* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'.
-   */
-/* #undef HAVE_SYS_NDIR_H */
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#define HAVE_SYS_STAT_H 1
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#define HAVE_SYS_TYPES_H 1
-
-/* Define to 1 if you have the <unistd.h> header file. */
-/* #undef HAVE_UNISTD_H */
-
-/* Have X libraries */
-/* #undef HAVE_X */
-
-/* Have Xft library */
-/* #undef HAVE_XFT */
-
-/* Define to the sub-directory in which libtool stores uninstalled libraries.
-   */
-#define LT_OBJDIR ".libs/"
-
-/* Module interface version */
-#define MODULE_VERSION "1.6.0"
-
-/* Name of package */
-#define PACKAGE "pango"
-
-/* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT "http://bugzilla.gnome.org/enter_bug.cgi?product=pango"
-
-/* Define to the full name of this package. */
-#define PACKAGE_NAME "pango"
-
-/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "pango @PANGO_VERSION"
-
-/* Define to the one symbol short name of this package. */
-#define PACKAGE_TARNAME "pango"
-
-/* Define to the version of this package. */
-#define PACKAGE_VERSION "@PANGO_VERSION@"
-
-/* PANGO binary age */
-#define PANGO_BINARY_AGE @PANGO_BINARY_AGE@
-
-/* PANGO interface age */
-#define PANGO_INTERFACE_AGE @PANGO_INTERFACE_AGE@
-
-/* PANGO major version */
-#define PANGO_VERSION_MAJOR @PANEG_VERSION_MAJOR@
-
-/* PANGO micro version */
-#define PANGO_VERSION_MICRO @PANGO_VERSION_MICRO@
-
-/* PANGO minor version */
-#define PANGO_VERSION_MINOR @PANGO_VERSION_MINOR@
-
-/* Define to 1 if you have the ANSI C header files. */
-#define STDC_HEADERS 1
-
-/* Whether to load modules via .la files rather than directly */
-/* #undef USE_LA_MODULES */
-
-/* Version number of package */
-#define VERSION "@PANGO_VERSION@"
-
-/* Define to 1 if the X Window System is missing or not being used. */
-/* #undef X_DISPLAY_MISSING */
diff --git a/configure.in b/configure.in
index 2e03066a..8e2bebc5 100644
--- a/configure.in
+++ b/configure.in
@@ -758,9 +758,9 @@ for module in $included_modules; do
   module_c=`echo $module | sed s/-/_/`
   cat >> pango/module-defs.h <<EOTEXT
 extern void         _pango_${module_c}_script_engine_list (PangoEngineInfo **engines, int *n_engines);
-extern void         _pango_${module_c}_script_engine_init (GTypeModule *module);
+extern PangoEngine *_pango_${module_c}_script_engine_init (GTypeModule *module);
 extern void         _pango_${module_c}_script_engine_exit (void);
-extern PangoEngine *_pango_${module_c}_script_engine_create (const char *id);
+extern void         _pango_${module_c}_script_engine_create (const char *id);
 
 EOTEXT
 done 
@@ -963,7 +963,6 @@ pango/opentype/Makefile
 pango/pango.rc
 pango/pangoft2.rc
 pango/pangowin32.rc
-pango/pangocairo.rc
 pango/pangox.rc
 pango/pangoxft.rc
 pango-view/Makefile
@@ -982,9 +981,6 @@ docs/Makefile
 docs/version.xml
 tools/Makefile
 tests/Makefile
-build/Makefile
-build/win32/Makefile
-build/win32/vs9/Makefile
 pango.pc
 pangox.pc
 pangowin32.pc
@@ -998,7 +994,6 @@ pangoft2-uninstalled.pc
 pangoxft-uninstalled.pc
 pangocairo-uninstalled.pc
 pango-zip.sh
-config.h.win32
 ])
 
 AC_CONFIG_FILES([tests/runtests.sh],
diff --git a/modules/basic/basic-fc.c b/modules/basic/basic-fc.c
index e3852c39..6e0d2ef2 100644
--- a/modules/basic/basic-fc.c
+++ b/modules/basic/basic-fc.c
@@ -26,7 +26,6 @@
 #include <string.h>
 
 #include <glib/gprintf.h>
-
 #include "pango-engine.h"
 #include "pango-utils.h"
 #include "pangofc-font.h"
diff --git a/modules/basic/basic-win32.c b/modules/basic/basic-win32.c
index 1565a7c7..ecb139e0 100644
--- a/modules/basic/basic-win32.c
+++ b/modules/basic/basic-win32.c
@@ -30,11 +30,6 @@
 #include <glib.h>
 
 #include "pangowin32.h"
-
-#ifndef PANGO_MODULE_PREFIX
-#define PANGO_MODULE_PREFIX _pango_basic_win32
-#endif
-
 #include "pango-engine.h"
 #include "pango-utils.h"
 
diff --git a/modules/hebrew/hebrew-fc.c b/modules/hebrew/hebrew-fc.c
index 12f25c5e..fcfed2b4 100644
--- a/modules/hebrew/hebrew-fc.c
+++ b/modules/hebrew/hebrew-fc.c
@@ -27,7 +27,6 @@
 #include <string.h>
 
 #include <pango/pango-ot.h>
-
 #include "pango-engine.h"
 #include "pango-utils.h"
 #include "pangofc-font.h"
diff --git a/modules/thai/thai-fc.c b/modules/thai/thai-fc.c
index 80c945da..837a0286 100644
--- a/modules/thai/thai-fc.c
+++ b/modules/thai/thai-fc.c
@@ -32,7 +32,6 @@
 
 #include <glib.h>
 #include "pango-ot.h"
-
 #include "pango-engine.h"
 #include "pangofc-font.h"
 
diff --git a/pango/Makefile.am b/pango/Makefile.am
index 37510fa0..cef644f1 100644
--- a/pango/Makefile.am
+++ b/pango/Makefile.am
@@ -14,6 +14,8 @@ if HAVE_FREETYPE
 OPENTYPE_SUBDIR=opentype
 endif
 
+EXTRA_DIST = 
+
 FRIBIDI_SUBDIR=mini-fribidi
 
 SUBDIRS = $(OPENTYPE_SUBDIR) $(FRIBIDI_SUBDIR)
@@ -348,23 +350,18 @@ libpangocairo_1_0_la_LIBADD =			\
 	$(libm)
 libpangocairo_1_0_la_DEPENDENCIES =		\
 	libpango-$(PANGO_API_VERSION).la
-pangocairo_core_sources = \
+libpangocairo_1_0_la_SOURCES =  \
 	pangocairo-context.c    \
 	pangocairo-font.c	\
 	pangocairo-fontmap.c    \
 	pangocairo-render.c	\
 	pangocairo-private.h
 
-libpangocairo_1_0_la_SOURCES = $(pangocairo_core_sources)
-
 if HAVE_CAIRO_WIN32
 if PLATFORM_WIN32
-libpangocairo_1_0_la_LDFLAGS += -export-symbols $(srcdir)/pangocairo.def -Wl,pangocairo-win32-res.o
-libpangocairo_1_0_la_DEPENDENCIES += pangocairo-win32-res.o pangocairo.def
+libpangocairo_1_0_la_LDFLAGS += -export-symbols $(srcdir)/pangocairo.def
+libpangocairo_1_0_la_DEPENDENCIES += pangocairo.def
 endif
-pangocairo-win32-res.o: pangocairo.rc
-	$(AM_V_GEN) $(WINDRES) $< $@
-
 
 libpangocairo_1_0_la_LIBADD += libpangowin32-$(PANGO_API_VERSION).la $(WIN32_LIBS)
 libpangocairo_1_0_la_DEPENDENCIES += libpangowin32-$(PANGO_API_VERSION).la 
@@ -559,11 +556,9 @@ pango_querymodules_LDADD += libpangowin32-$(PANGO_API_VERSION).la
 endif
 pango_querymodules_LDADD += libpango-$(PANGO_API_VERSION).la $(GLIB_LIBS)
 
-EXTRA_DIST =					\
+EXTRA_DIST +=					\
 	pango-enum-types.h			\
 	module-defs.h				\
-	module-defs.h.win32			\
-	module-defs-lang.c.win32		\
 	module-defs-fc.c.win32			\
 	module-defs-win32.c.win32		\
 	pango.def				\
@@ -578,8 +573,6 @@ EXTRA_DIST =					\
 	pangoft2.rc.in				\
 	pangowin32.rc				\
 	pangowin32.rc.in			\
-	pangocairo.rc				\
-	pangocairo.rc.in			\
 	pangox.rc				\
 	pangox.rc.in				\
 	pangoxft.rc				\
@@ -637,43 +630,4 @@ uninstall-local: uninstall-ms-lib uninstall-def-files
 
 TESTS = check.defs
 
-dist-hook: \
-	../build/win32/vs9/pango.vcproj \
-	../build/win32/vs9/pangoft2.vcproj \
-	../build/win32/vs9/pangocairo.vcproj
-
-# pangowin32.vcproj is not automatically built, it is not being changed
-
-../build/win32/vs9/pango.vcproj: $(top_srcdir)/build/win32/vs9/pango.vcprojin mini-fribidi/libmini-fribidi.sourcefiles
-	-rm $@
-	for F in $(libpango_1_0_la_SOURCES); do \
-		case $$F in \
-		*.c) echo '   <File RelativePath="..\..\..\pango\'$$F'" />' \
-		     ;; \
-		esac; \
-	done >libpango.sourcefiles
-	$(CPP) -P - <$(top_srcdir)/build/win32/vs9/pango.vcprojin >$@
-
-../build/win32/vs9/pangoft2.vcproj: $(top_srcdir)/build/win32/vs9/pangoft2.vcprojin opentype/libharfbuzz.sourcefiles
-	-rm $@
-	for F in $(libpangoft2_1_0_la_SOURCES); do \
-		case $$F in \
-		*.c) echo '   <File RelativePath="..\..\..\pango\'$$F'" />' \
-		     ;; \
-		esac; \
-	done >libpangoft2.sourcefiles
-	$(CPP) -P - <$(top_srcdir)/build/win32/vs9/pangoft2.vcprojin >$@
-
-../build/win32/vs9/pangocairo.vcproj: $(top_srcdir)/build/win32/vs9/pangocairo.vcprojin
-# Backend-specific sources for the libpangocairo DLL are explicitly
-# listed in the vcprojin file
-	-rm $@
-	for F in $(pangocairo_core_sources); do \
-		case $$F in \
-		*.c) echo '   <File RelativePath="..\..\..\pango\'$$F'" />' \
-		     ;; \
-		esac; \
-	done >libpangocairo.sourcefiles
-	$(CPP) -P - <$(top_srcdir)/build/win32/vs9/pangocairo.vcprojin >$@
-
 -include $(top_srcdir)/git.mk
diff --git a/pango/mini-fribidi/Makefile.am b/pango/mini-fribidi/Makefile.am
index a0baa6b0..a9e08d6e 100644
--- a/pango/mini-fribidi/Makefile.am
+++ b/pango/mini-fribidi/Makefile.am
@@ -30,14 +30,4 @@ EXTRA_DIST = 			\
         fribidi_types.i
 
 
-dist-hook: libmini-fribidi.sourcefiles
-
-libmini-fribidi.sourcefiles: Makefile
-	for F in $(libmini_fribidi_la_SOURCES); do \
-		case $$F in \
-		*.c) echo '			<File RelativePath="..\..\..\pango\mini-fribidi\'$$F'" />' \
-		     ;; \
-		esac; \
-	done >libmini-fribidi.sourcefiles
-
 -include $(top_srcdir)/git.mk
diff --git a/pango/module-defs-fc.c.win32 b/pango/module-defs-fc.c.win32
index 7a44537c..a6ae1cff 100644
--- a/pango/module-defs-fc.c.win32
+++ b/pango/module-defs-fc.c.win32
@@ -1,17 +1,31 @@
-/* Autogenerated by configure and then saved for use when compiling with
-   Visual C. */
+/* Hand-written. Once the GNU configure mechanism is used
+ * on Win32, too, can be generated.
+*/
 
-#include "module-defs.h"
+#include "modules.h"
+
+#ifdef PANGO_MODULE_PREFIX
+/* by defining PANGO_MODULE_PREFIX the basic module gets include in the
+ * backend library, here ../modules/basic/basic-fc.c
+ * It helps the backend to not fall on its nose even with a screwed module
+ * configuration. There should be at least enough fonts available to show
+ * an error message ...
+ */
+void         _pango_basic_ft2_script_engine_list   (PangoEngineInfo **engines,
+                                                    gint             *n_engines);
+void         _pango_basic_ft2_script_engine_init   (GTypeModule      *module);
+void         _pango_basic_ft2_script_engine_exit   (void);
+PangoEngine *_pango_basic_ft2_script_engine_create (const char       *id);
+#endif
 
 PangoIncludedModule _pango_included_fc_modules[] = {
- { _pango_arabic_fc_script_engine_list, _pango_arabic_fc_script_engine_init, _pango_arabic_fc_script_engine_exit, _pango_arabic_fc_script_engine_create },
- { _pango_basic_fc_script_engine_list, _pango_basic_fc_script_engine_init, _pango_basic_fc_script_engine_exit, _pango_basic_fc_script_engine_create },
- { _pango_hangul_fc_script_engine_list, _pango_hangul_fc_script_engine_init, _pango_hangul_fc_script_engine_exit, _pango_hangul_fc_script_engine_create },
- { _pango_hebrew_fc_script_engine_list, _pango_hebrew_fc_script_engine_init, _pango_hebrew_fc_script_engine_exit, _pango_hebrew_fc_script_engine_create },
- { _pango_indic_fc_script_engine_list, _pango_indic_fc_script_engine_init, _pango_indic_fc_script_engine_exit, _pango_indic_fc_script_engine_create },
- { _pango_khmer_fc_script_engine_list, _pango_khmer_fc_script_engine_init, _pango_khmer_fc_script_engine_exit, _pango_khmer_fc_script_engine_create },
- { _pango_syriac_fc_script_engine_list, _pango_syriac_fc_script_engine_init, _pango_syriac_fc_script_engine_exit, _pango_syriac_fc_script_engine_create },
- { _pango_thai_fc_script_engine_list, _pango_thai_fc_script_engine_init, _pango_thai_fc_script_engine_exit, _pango_thai_fc_script_engine_create },
- { _pango_tibetan_fc_script_engine_list, _pango_tibetan_fc_script_engine_init, _pango_tibetan_fc_script_engine_exit, _pango_tibetan_fc_script_engine_create },
- { NULL, NULL, NULL, NULL },
+#ifdef PANGO_MODULE_PREFIX
+ { 
+   _pango_basic_ft2_script_engine_list,  
+   _pango_basic_ft2_script_engine_init, 
+   _pango_basic_ft2_script_engine_exit,  
+   _pango_basic_ft2_script_engine_create 
+ },
+#endif
+ { NULL, NULL, NULL },
 };
diff --git a/pango/module-defs-lang.c.win32 b/pango/module-defs-lang.c.win32
deleted file mode 100644
index d1fe979d..00000000
--- a/pango/module-defs-lang.c.win32
+++ /dev/null
@@ -1,11 +0,0 @@
-/* Autogenerated and saved for builds using Microsoft's compiler,
- * when the configure mechanism isn't used.
- */
-
-#include "module-defs.h"
-
-PangoIncludedModule _pango_included_lang_modules[] = {
- { _pango_arabic_lang_script_engine_list, _pango_arabic_lang_script_engine_init, _pango_arabic_lang_script_engine_exit, _pango_arabic_lang_script_engine_create },
- { _pango_indic_lang_script_engine_list, _pango_indic_lang_script_engine_init, _pango_indic_lang_script_engine_exit, _pango_indic_lang_script_engine_create },
- { NULL, NULL, NULL, NULL },
-};
diff --git a/pango/module-defs-win32.c.win32 b/pango/module-defs-win32.c.win32
index 5c1698c6..80fc90a3 100644
--- a/pango/module-defs-win32.c.win32
+++ b/pango/module-defs-win32.c.win32
@@ -1,9 +1,25 @@
-/* Autogenerated by configure and then saved for use when compiling with
-   Visual C. */
+/* Hand-written, for builds using Microsoft's compiler and makefile.msc,
+ * where the configure mechanism isn't used.
+ */
 
-#include "module-defs.h"
+#include "modules.h"
+
+#ifdef PANGO_MODULE_PREFIX
+void         _pango_basic_win32_script_engine_list   (PangoEngineInfo **engines,
+                                                      gint             *n_engines);
+void         _pango_basic_win32_script_engine_init   (GTypeModule      *module);
+void         _pango_basic_win32_script_engine_exit   (void);
+PangoEngine *_pango_basic_win32_script_engine_create (const char       *id);
+#endif
 
 PangoIncludedModule _pango_included_win32_modules[] = {
- { _pango_basic_win32_script_engine_list, _pango_basic_win32_script_engine_init, _pango_basic_win32_script_engine_exit, _pango_basic_win32_script_engine_create },
- { NULL, NULL, NULL, NULL },
+#ifdef PANGO_MODULE_PREFIX
+ { 
+   _pango_basic_win32_script_engine_list,  
+   _pango_basic_win32_script_engine_init, 
+   _pango_basic_win32_script_engine_exit,  
+   _pango_basic_win32_script_engine_create 
+ },
+#endif
+ { NULL, NULL, NULL },
 };
diff --git a/pango/module-defs.h.win32 b/pango/module-defs.h.win32
deleted file mode 100644
index 463935ef..00000000
--- a/pango/module-defs.h.win32
+++ /dev/null
@@ -1,74 +0,0 @@
-/* Autogenerated by configure and then saved for use when compiling with
-   Visual C. */
-
-#include "modules.h"
-
-extern void         _pango_arabic_fc_script_engine_list (PangoEngineInfo **engines, int *n_engines);
-extern void         _pango_arabic_fc_script_engine_init (GTypeModule *module);
-extern void         _pango_arabic_fc_script_engine_exit (void);
-extern PangoEngine *_pango_arabic_fc_script_engine_create (const char *id);
-
-extern void         _pango_arabic_lang_script_engine_list (PangoEngineInfo **engines, int *n_engines);
-extern void         _pango_arabic_lang_script_engine_init (GTypeModule *module);
-extern void         _pango_arabic_lang_script_engine_exit (void);
-extern PangoEngine *_pango_arabic_lang_script_engine_create (const char *id);
-
-extern void         _pango_basic_fc_script_engine_list (PangoEngineInfo **engines, int *n_engines);
-extern void         _pango_basic_fc_script_engine_init (GTypeModule *module);
-extern void         _pango_basic_fc_script_engine_exit (void);
-extern PangoEngine *_pango_basic_fc_script_engine_create (const char *id);
-
-extern void         _pango_basic_win32_script_engine_list (PangoEngineInfo **engines, int *n_engines);
-extern void         _pango_basic_win32_script_engine_init (GTypeModule *module);
-extern void         _pango_basic_win32_script_engine_exit (void);
-extern PangoEngine *_pango_basic_win32_script_engine_create (const char *id);
-
-extern void         _pango_basic_x_script_engine_list (PangoEngineInfo **engines, int *n_engines);
-extern void         _pango_basic_x_script_engine_init (GTypeModule *module);
-extern void         _pango_basic_x_script_engine_exit (void);
-extern PangoEngine *_pango_basic_x_script_engine_create (const char *id);
-
-extern void         _pango_basic_atsui_script_engine_list (PangoEngineInfo **engines, int *n_engines);
-extern void         _pango_basic_atsui_script_engine_init (GTypeModule *module);
-extern void         _pango_basic_atsui_script_engine_exit (void);
-extern PangoEngine *_pango_basic_atsui_script_engine_create (const char *id);
-
-extern void         _pango_hangul_fc_script_engine_list (PangoEngineInfo **engines, int *n_engines);
-extern void         _pango_hangul_fc_script_engine_init (GTypeModule *module);
-extern void         _pango_hangul_fc_script_engine_exit (void);
-extern PangoEngine *_pango_hangul_fc_script_engine_create (const char *id);
-
-extern void         _pango_hebrew_fc_script_engine_list (PangoEngineInfo **engines, int *n_engines);
-extern void         _pango_hebrew_fc_script_engine_init (GTypeModule *module);
-extern void         _pango_hebrew_fc_script_engine_exit (void);
-extern PangoEngine *_pango_hebrew_fc_script_engine_create (const char *id);
-
-extern void         _pango_indic_fc_script_engine_list (PangoEngineInfo **engines, int *n_engines);
-extern void         _pango_indic_fc_script_engine_init (GTypeModule *module);
-extern void         _pango_indic_fc_script_engine_exit (void);
-extern PangoEngine *_pango_indic_fc_script_engine_create (const char *id);
-
-extern void         _pango_indic_lang_script_engine_list (PangoEngineInfo **engines, int *n_engines);
-extern void         _pango_indic_lang_script_engine_init (GTypeModule *module);
-extern void         _pango_indic_lang_script_engine_exit (void);
-extern PangoEngine *_pango_indic_lang_script_engine_create (const char *id);
-
-extern void         _pango_khmer_fc_script_engine_list (PangoEngineInfo **engines, int *n_engines);
-extern void         _pango_khmer_fc_script_engine_init (GTypeModule *module);
-extern void         _pango_khmer_fc_script_engine_exit (void);
-extern PangoEngine *_pango_khmer_fc_script_engine_create (const char *id);
-
-extern void         _pango_syriac_fc_script_engine_list (PangoEngineInfo **engines, int *n_engines);
-extern void         _pango_syriac_fc_script_engine_init (GTypeModule *module);
-extern void         _pango_syriac_fc_script_engine_exit (void);
-extern PangoEngine *_pango_syriac_fc_script_engine_create (const char *id);
-
-extern void         _pango_thai_fc_script_engine_list (PangoEngineInfo **engines, int *n_engines);
-extern void         _pango_thai_fc_script_engine_init (GTypeModule *module);
-extern void         _pango_thai_fc_script_engine_exit (void);
-extern PangoEngine *_pango_thai_fc_script_engine_create (const char *id);
-
-extern void         _pango_tibetan_fc_script_engine_list (PangoEngineInfo **engines, int *n_engines);
-extern void         _pango_tibetan_fc_script_engine_init (GTypeModule *module);
-extern void         _pango_tibetan_fc_script_engine_exit (void);
-extern PangoEngine *_pango_tibetan_fc_script_engine_create (const char *id);
diff --git a/pango/opentype/Makefile.am b/pango/opentype/Makefile.am
index 23bb55b3..ebec8ce6 100644
--- a/pango/opentype/Makefile.am
+++ b/pango/opentype/Makefile.am
@@ -55,14 +55,4 @@ main_LDADD = libharfbuzz.la $(GLIB_LIBS)
 
 EXTRA_DIST = README COPYING
 
-dist-hook: libharfbuzz.sourcefiles
-
-libharfbuzz.sourcefiles: Makefile
-	for F in $(libharfbuzz_la_SOURCES); do \
-		case $$F in \
-		*.c|*.cc) echo '   <File RelativePath="..\..\..\pango\opentype\'$$F'" />' \
-		     ;; \
-		esac; \
-	done >libharfbuzz.sourcefiles
-
 -include $(top_srcdir)/git.mk
diff --git a/pango/pangocairo.rc.in b/pango/pangocairo.rc.in
deleted file mode 100644
index 728cce70..00000000
--- a/pango/pangocairo.rc.in
+++ /dev/null
@@ -1,30 +0,0 @@
-#include <winver.h>
-
-VS_VERSION_INFO VERSIONINFO
-  FILEVERSION @PANGO_VERSION_MAJOR@,@PANGO_VERSION_MINOR@,@PANGO_VERSION_MICRO@,0
-  PRODUCTVERSION @PANGO_VERSION_MAJOR@,@PANGO_VERSION_MINOR@,@PANGO_VERSION_MICRO@,0
-  FILEFLAGSMASK 0
-  FILEFLAGS 0
-  FILEOS VOS__WINDOWS32
-  FILETYPE VFT_DLL
-  FILESUBTYPE VFT2_UNKNOWN
-  BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-      BLOCK "040904B0"
-      BEGIN
-	VALUE "CompanyName", "Red Hat Software"
-	VALUE "FileDescription", "PangoCairo"
-	VALUE "FileVersion", "@PANGO_VERSION_MAJOR@.@PANGO_VERSION_MINOR@.@PANGO_VERSION_MICRO@.0"
-	VALUE "InternalName", "pangocairo-@PANGO_API_VERSION@-@PANGO_CURRENT_MINUS_AGE@"
-	VALUE "LegalCopyright", "Copyright © 2010 Red Hat Software."
-	VALUE "OriginalFilename", "pangocairo-@PANGO_API_VERSION@-@PANGO_CURRENT_MINUS_AGE@.dll"
-	VALUE "ProductName", "PangoCairo"
-	VALUE "ProductVersion", "@PANGO_VERSION_MAJOR@.@PANGO_VERSION_MINOR@.@PANGO_VERSION_MICRO@"
-      END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-      VALUE "Translation", 0x409, 1200
-    END
-  END