MSVC builds: Support MSVC 2013 and later

We now need C99 features from the compiler which are only supported by
Visual Studio 2013 and later, so drop the MSVC 2008~2012 projects, and make
the baseline supported Visual Studio version be 2013.  Update the build files
as a result.

72 files changed, 203 insertions, 3889 deletions

diff --git a/build/Makefile-newvs.am b/build/Makefile-newvs.am
index b5e321607e..9fd89f95dd 100644
--- a/build/Makefile-newvs.am
+++ b/build/Makefile-newvs.am
@@ -9,37 +9,39 @@
 # Author: Fan, Chun-wei
 # November 05, 2012
 
+# MSVC_BASE_VER: Baseline MSVC 201x version to copy/process project files from (10 for 2010, 11 for 2012, 12 for 2013, 14 for 2015 and so on)
+# MSVC_BASE_VER_LONG: Long Version of baseline Visual Studio 201x version (2010, 2012, 2013, 14 and so on)
 # MSVC_VER_LONG: Long Version of Visual Studio (2012, 2013, 14 and so on)
 # MSVC_VER: Short Version of Visual Studio (11 for 2012, 12 for 2013, 14 for 2015 and so on)
 # MSVC_FORMAT_VER: Use 12 for MSVC 2012 through 2015
 
 %.sln:
-	sed 's/11\.00/$(MSVC_FORMAT_VER)\.00/g' < $(top_srcdir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp
-	sed 's/2010/$(MSVC_VER_LONG)/g' < $(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@
+	sed 's/11\.00/$(MSVC_FORMAT_VER)\.00/g' < $(top_srcdir)/build/win32/vs$(MSVC_BASE_VER)/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp
+	sed 's/$(MSVC_BASE_VER_LONG)/$(MSVC_VER_LONG)/g' < $(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@
 	rm $(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp
 
 %.txt:
-	sed 's/vs10/vs$(MSVC_VER)/g' < $(top_srcdir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp
-	sed 's/VS10/VS$(MSVC_VER)/g' < $(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@
+	sed 's/vs$(MSVC_BASE_VER)/vs$(MSVC_VER)/g' < $(top_srcdir)/build/win32/vs$(MSVC_BASE_VER)/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp
+	sed 's/VS$(MSVC_BASE_VER)/VS$(MSVC_VER)/g' < $(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@
 	rm $(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp
 
 %.vcxproj:
-	if test -e $(top_srcdir)/build/win32/vs10/$@; then \
-		sed 's/v100/v$(MSVC_VER)0/g' < $(top_srcdir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \
+	if test -e $(top_srcdir)/build/win32/vs$(MSVC_BASE_VER)/$@; then \
+		sed 's/v$(MSVC_BASE_VER)0/v$(MSVC_VER)0/g' < $(top_srcdir)/build/win32/vs$(MSVC_BASE_VER)/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \
 	else \
-		sed 's/v100/v$(MSVC_VER)0/g' < $(top_builddir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \
+		sed 's/v$(MSVC_BASE_VER)0/v$(MSVC_VER)0/g' < $(top_builddir)/build/win32/vs$(MSVC_BASE_VER)/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \
 	fi
 
-%.props: $(top_builddir)/build/win32/vs10/Makefile
-	if test -e $(top_srcdir)/build/win32/vs10/$@; then \
-		sed 's/<VSVer>10<\/VSVer>/<VSVer>$(MSVC_VER)<\/VSVer>/g' < $(top_srcdir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \
+%.props: $(top_builddir)/build/win32/vs$(MSVC_BASE_VER)/Makefile
+	if test -e $(top_srcdir)/build/win32/vs$(MSVC_BASE_VER)/$@; then \
+		sed 's/<VSVer>$(MSVC_BASE_VER)<\/VSVer>/<VSVer>$(MSVC_VER)<\/VSVer>/g' < $(top_srcdir)/build/win32/vs$(MSVC_BASE_VER)/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \
 	else \
-		sed 's/<VSVer>10<\/VSVer>/<VSVer>$(MSVC_VER)<\/VSVer>/g' < $(top_builddir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \
+		sed 's/<VSVer>$(MSVC_BASE_VER)<\/VSVer>/<VSVer>$(MSVC_VER)<\/VSVer>/g' < $(top_builddir)/build/win32/vs$(MSVC_BASE_VER)/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \
 	fi
 
 %.vcxproj.filters:
-	if test -e $(top_srcdir)/build/win32/vs10/$@; then \
-		cp $(top_srcdir)/build/win32/vs10/$@ $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \
+	if test -e $(top_srcdir)/build/win32/vs$(MSVC_BASE_VER)/$@; then \
+		cp $(top_srcdir)/build/win32/vs$(MSVC_BASE_VER)/$@ $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \
 	else \
-		cp $(top_builddir)/build/win32/vs10/$@ $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \
+		cp $(top_builddir)/build/win32/vs$(MSVC_BASE_VER)/$@ $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \
 	fi
diff --git a/build/win32/Makefile.am b/build/win32/Makefile.am
index 60f01af68f..17294f5ad5 100644
--- a/build/win32/Makefile.am
+++ b/build/win32/Makefile.am
@@ -27,9 +27,6 @@ DISTCLEANFILES =
 endif
 
 SUBDIRS =	\
-	vs9 	\
-	vs10	\
-	vs11	\
 	vs12	\
 	vs14
 
diff --git a/build/win32/vs10/Makefile.am b/build/win32/vs10/Makefile.am
deleted file mode 100644
index de544a81a4..0000000000
--- a/build/win32/vs10/Makefile.am
+++ /dev/null
@@ -1,78 +0,0 @@
-include $(top_srcdir)/Makefile.decl
-
-GENERATED_ITEMS = \
-	gdk4-win32.vcxproj			\
-	gdk4-win32.vcxproj.filters		\
-	gdk4-broadway.vcxproj			\
-	gdk4-broadway.vcxproj.filters		\
-	broadwayd.vcxproj			\
-	broadwayd.vcxproj.filters		\
-	gdk-4.vcxproj				\
-	gdk-4.vcxproj.filters			\
-	gtk-4.vcxproj				\
-	gtk-4.vcxproj.filters			\
-	gtk4-demo.vcxproj			\
-	gtk4-demo.vcxproj.filters		\
-	gtk4-demo-application.vcxproj		\
-	gtk4-demo-application.vcxproj.filters	\
-	gtk4-icon-browser.vcxproj		\
-	gtk4-icon-browser.vcxproj.filters	\
-	gtk4-install.props			\
-	gtk4-version-paths.props
-
-MSVC10_HEADERS_LISTS =	\
-	gdk4-win32.vs10.headers		\
-	gdk4-broadway.vs10.headers	\
-	gdk-4.vs10.headers		\
-	gtk-4.vs10.headers
-
-EXTRA_DIST += \
-	README.txt				\
-	gtk+-4.sln				\
-	gtk4-prebuild.vcxproj			\
-	gtk4-prebuild.vcxproj.filters		\
-	gdk4-win32.vcxprojin			\
-	gdk4-win32.vcxproj.filtersin		\
-	gdk4-broadway.vcxprojin			\
-	gdk4-broadway.vcxproj.filtersin		\
-	broadwayd.vcxprojin			\
-	broadwayd.vcxproj.filtersin		\
-	gdk-4.vcxprojin				\
-	gdk-4.vcxproj.filtersin			\
-	gtk-4.vcxprojin				\
-	gtk-4.vcxproj.filtersin			\
-	gtk-builder-tool.vcxproj		\
-	gtk-builder-tool.vcxproj.filters	\
-	gtk-encode-symbolic-svg.vcxproj		\
-	gtk-encode-symbolic-svg.vcxproj.filters	\
-	gtk-query-settings.vcxproj		\
-	gtk-query-settings.vcxproj.filters	\
-	gtk-update-icon-cache.vcxproj		\
-	gtk-update-icon-cache.vcxproj.filters	\
-	gtk4-demo.vcxprojin			\
-	gtk4-demo.vcxproj.filtersin		\
-	gtk4-demo-application.vcxprojin		\
-	gtk4-demo-application.vcxproj.filtersin	\
-	gtk4-icon-browser.vcxprojin		\
-	gtk4-icon-browser.vcxproj.filtersin	\
-	gtk4-install.vcxproj			\
-	gtk4-install.vcxproj.filters		\
-	gtk4-build-defines.props		\
-	gtk4-copy-gdk-broadway.props		\
-	gtk4-gen-srcs.props			\
-	gtk4-ignore-broadway.props		\
-	gtk4-install.propsin			\
-	gtk4-version-paths.props.in		\
-	$(GENERATED_ITEMS)
-
-DISTCLEANFILES = \
-	$(GENERATED_ITEMS)
-
-gtk4-install.props: $(top_srcdir)/build/win32/vs10/gtk4-install.propsin $(MSVC10_HEADERS_LISTS)
-	-$(RM) $(top_builddir)/build/win32/vs11/gtk4-install.props
-	-$(RM) $(top_builddir)/build/win32/vs12/gtk4-install.props
-	-$(RM) $(top_builddir)/build/win32/vs14/gtk4-install.props
-	$(CPP) -P - <$(top_srcdir)/build/win32/vs10/gtk4-install.propsin >$@
-	rm $(MSVC10_HEADERS_LISTS)
-
--include $(top_srcdir)/git.mk
diff --git a/build/win32/vs11/Makefile.am b/build/win32/vs11/Makefile.am
deleted file mode 100644
index 893bf9f8df..0000000000
--- a/build/win32/vs11/Makefile.am
+++ /dev/null
@@ -1,49 +0,0 @@
-include $(top_srcdir)/Makefile.decl
-
-EXTRA_DIST +=	\
-	README.txt	\
-	gtk+-4.sln	\
-	gtk4-prebuild.vcxproj	\
-	gtk4-prebuild.vcxproj.filters	\
-	gdk4-win32.vcxproj	\
-	gdk4-win32.vcxproj.filters	\
-	gdk-4.vcxproj	\
-	gdk-4.vcxproj.filters	\
-	gtk-4.vcxproj	\
-	gtk-4.vcxproj.filters	\
-	gtk-builder-tool.vcxproj		\
-	gtk-builder-tool.vcxproj.filters	\
-	gtk-encode-symbolic-svg.vcxproj	\
-	gtk-encode-symbolic-svg.vcxproj.filters	\
-	gtk-update-icon-cache.vcxproj		\
-	gtk-update-icon-cache.vcxproj.filters	\
-	gtk-query-settings.vcxproj		\
-	gtk-query-settings.vcxproj.filters	\
-	gtk4-demo.vcxproj	\
-	gtk4-demo.vcxproj.filters	\
-	gtk4-demo-application.vcxproj	\
-	gtk4-demo-application.vcxproj.filters	\
-	gtk4-icon-browser.vcxproj	\
-	gtk4-icon-browser.vcxproj.filters	\
-	gtk4-install.vcxproj	\
-	gtk4-install.vcxproj.filters	\
-	broadwayd.vcxproj	\
-	broadwayd.vcxproj.filters	\
-	gdk4-broadway.vcxproj	\
-	gdk4-broadway.vcxproj.filters	\
-	gtk4-build-defines.props	\
-	gtk4-copy-gdk-broadway.props	\
-	gtk4-gen-srcs.props	\
-	gtk4-ignore-broadway.props	\
-	gtk4-install.props	\
-	gtk4-version-paths.props
-
-DISTCLEANFILES = $(EXTRA_DIST)
-
-MSVC_VER = 11
-MSVC_FORMAT_VER = 12
-MSVC_VER_LONG = 2012
-
-include $(top_srcdir)/build/Makefile-newvs.am
-
--include $(top_srcdir)/git.mk
diff --git a/build/win32/vs12/Makefile.am b/build/win32/vs12/Makefile.am
index 130321417c..8c37a97d54 100644
--- a/build/win32/vs12/Makefile.am
+++ b/build/win32/vs12/Makefile.am
@@ -1,49 +1,76 @@
 include $(top_srcdir)/Makefile.decl
 
-EXTRA_DIST +=	\
-	README.txt	\
-	gtk+-4.sln	\
-	gtk4-prebuild.vcxproj	\
-	gtk4-prebuild.vcxproj.filters	\
-	gdk4-win32.vcxproj	\
-	gdk4-win32.vcxproj.filters	\
-	gdk-4.vcxproj	\
-	gdk-4.vcxproj.filters	\
-	gtk-4.vcxproj	\
-	gtk-4.vcxproj.filters	\
+GENERATED_ITEMS = \
+	gdk4-win32.vcxproj			\
+	gdk4-win32.vcxproj.filters		\
+	gdk4-broadway.vcxproj			\
+	gdk4-broadway.vcxproj.filters		\
+	broadwayd.vcxproj			\
+	broadwayd.vcxproj.filters		\
+	gdk-4.vcxproj				\
+	gdk-4.vcxproj.filters			\
+	gtk-4.vcxproj				\
+	gtk-4.vcxproj.filters			\
+	gtk4-demo.vcxproj			\
+	gtk4-demo.vcxproj.filters		\
+	gtk4-demo-application.vcxproj		\
+	gtk4-demo-application.vcxproj.filters	\
+	gtk4-icon-browser.vcxproj		\
+	gtk4-icon-browser.vcxproj.filters	\
+	gtk4-install.props			\
+	gtk4-version-paths.props
+
+MSVC12_HEADERS_LISTS =	\
+	gdk4-win32.vs12.headers		\
+	gdk4-broadway.vs12.headers	\
+	gdk-4.vs12.headers		\
+	gtk-4.vs12.headers
+
+EXTRA_DIST += \
+	README.txt				\
+	gtk+-4.sln				\
+	gtk4-prebuild.vcxproj			\
+	gtk4-prebuild.vcxproj.filters		\
+	gdk4-win32.vcxprojin			\
+	gdk4-win32.vcxproj.filtersin		\
+	gdk4-broadway.vcxprojin			\
+	gdk4-broadway.vcxproj.filtersin		\
+	broadwayd.vcxprojin			\
+	broadwayd.vcxproj.filtersin		\
+	gdk-4.vcxprojin				\
+	gdk-4.vcxproj.filtersin			\
+	gtk-4.vcxprojin				\
+	gtk-4.vcxproj.filtersin			\
 	gtk-builder-tool.vcxproj		\
 	gtk-builder-tool.vcxproj.filters	\
-	gtk-encode-symbolic-svg.vcxproj	\
+	gtk-encode-symbolic-svg.vcxproj		\
 	gtk-encode-symbolic-svg.vcxproj.filters	\
 	gtk-query-settings.vcxproj		\
 	gtk-query-settings.vcxproj.filters	\
 	gtk-update-icon-cache.vcxproj		\
 	gtk-update-icon-cache.vcxproj.filters	\
-	gtk4-demo.vcxproj	\
-	gtk4-demo.vcxproj.filters	\
-	gtk4-demo-application.vcxproj	\
-	gtk4-demo-application.vcxproj.filters	\
-	gtk4-icon-browser.vcxproj	\
-	gtk4-icon-browser.vcxproj.filters	\
-	gtk4-install.vcxproj	\
-	gtk4-install.vcxproj.filters	\
-	broadwayd.vcxproj	\
-	broadwayd.vcxproj.filters	\
-	gdk4-broadway.vcxproj	\
-	gdk4-broadway.vcxproj.filters	\
-	gtk4-build-defines.props	\
-	gtk4-copy-gdk-broadway.props	\
-	gtk4-gen-srcs.props	\
-	gtk4-ignore-broadway.props	\
-	gtk4-install.props	\
-	gtk4-version-paths.props
-
-DISTCLEANFILES = $(EXTRA_DIST)
+	gtk4-demo.vcxprojin			\
+	gtk4-demo.vcxproj.filtersin		\
+	gtk4-demo-application.vcxprojin		\
+	gtk4-demo-application.vcxproj.filtersin	\
+	gtk4-icon-browser.vcxprojin		\
+	gtk4-icon-browser.vcxproj.filtersin	\
+	gtk4-install.vcxproj			\
+	gtk4-install.vcxproj.filters		\
+	gtk4-build-defines.props		\
+	gtk4-copy-gdk-broadway.props		\
+	gtk4-gen-srcs.props			\
+	gtk4-ignore-broadway.props		\
+	gtk4-install.propsin			\
+	gtk4-version-paths.props.in		\
+	$(GENERATED_ITEMS)
 
-MSVC_VER = 12
-MSVC_FORMAT_VER = 12
-MSVC_VER_LONG = 2013
+DISTCLEANFILES = \
+	$(GENERATED_ITEMS)
 
-include $(top_srcdir)/build/Makefile-newvs.am
+gtk4-install.props: $(top_srcdir)/build/win32/vs12/gtk4-install.propsin $(MSVC12_HEADERS_LISTS)
+	-$(RM) $(top_builddir)/build/win32/vs14/gtk4-install.props
+	$(CPP) -P - <$(top_srcdir)/build/win32/vs12/gtk4-install.propsin >$@
+	rm $(MSVC12_HEADERS_LISTS)
 
 -include $(top_srcdir)/git.mk
diff --git a/build/win32/vs10/README.txt b/build/win32/vs12/README.txt
index 3ccb187219..2abcd661ff 100644
--- a/build/win32/vs10/README.txt
+++ b/build/win32/vs12/README.txt
@@ -7,7 +7,7 @@ C++ can be found in the following GNOME Live! page:
 

 https://wiki.gnome.org/Projects/GTK+/Win32/MSVCCompilationOfGTKStack

 

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

+This VS12 solution and the projects it includes are intented to be used

 in a GTK+ source tree unpacked from a tarball. In a git checkout you

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

 the files needed, like config.h.win32.in into config.h.win32 and the

@@ -18,7 +18,7 @@ You will need the parts from below in the GTK+ stack: GDK-Pixbuf, Pango,
 ATK and GLib.  External dependencies are at least Cairo

 (with Cairo-GObject support, meaning Cairo 1.10.x or later), zlib, libpng,

 gettext-runtime, fontconfig*, freetype*, expat*.  See the 

-build/win32/vs10/README.txt file in glib for details where to unpack them.

+build/win32/vs12/README.txt file in glib for details where to unpack them.

 

 You will also need a Python 2.6+/3.x interpretor installed on your system,

 which can be obtained from the official installers available from

@@ -29,34 +29,34 @@ If you happen to change the PythonPath setting in gtk-version-paths.props after
 opening gtk+.sln with Visual Studio, you will need to close the gtk+.sln solution,

 delete all the *.sdf, *.suo and *.user files before re-attempting the build.

 

-It is recommended that one builds the dependencies with VS10 as far as

+It is recommended that one builds the dependencies with VS12 as far as

 possible, especially those from and using the GTK+ stack (i.e. GLib,

 Cairo, ATK, Pango, GDK-Pixbuf), so that crashes caused by mixing calls

 to different CRTs can be kept at a minimum.

 

-zlib, libpng, and Cairo do contain support for compiling under VS10

+zlib, libpng, and Cairo do contain support for compiling under VS12

 using VS project files and/or makefiles at this time of writing, For the

-GTK+ stack, VS10 project files are either available under

-$(srcroot)/build/vs10 in the case of GLib (stable/unstable), ATK

+GTK+ stack, VS12 project files are either available under

+$(srcroot)/build/vs12 in the case of GLib (stable/unstable), ATK

 (stable/unstable) and GDK-Pixbuf (unstable), and should be in the next

-unstable version of Pango.  There is no known official VS10 build

+unstable version of Pango.  There is no known official VS12 build

 support for fontconfig (along with freetype and expat) and

 gettext-runtime, so please use the binaries from: 

 

 ftp://ftp.gnome.org/pub/GNOME/binaries/win32/dependencies/ (32 bit)

 ftp://ftp.gnome.org/pub/GNOME/binaries/win64/dependencies/ (64 bit)

 

-Unzip the binaries obtained from ftp.gnome.org in <root>\vs10\<PlatformName>,

+Unzip the binaries obtained from ftp.gnome.org in <root>\vs12\<PlatformName>,

 and build the following, if not already done so: 

 

 Note: put the resulting zlib, libpng, pcre and Cairo files as follows:

- .dll files: <root>\vs10\<PlatformName>\bin

- .lib files: <root>\vs10\<PlatformName>\lib

- .h files: <root>\vs10\<PlatformName>\include

+ .dll files: <root>\vs12\<PlatformName>\bin

+ .lib files: <root>\vs12\<PlatformName>\lib

+ .h files: <root>\vs12\<PlatformName>\include

 

 The recommended build order for these dependencies:

 (first unzip any dependent binaries downloaded from the ftp.gnome.org

- as described in the README.txt file in the build/win32/vs10 folder)

+ as described in the README.txt file in the build/win32/vs12 folder)

 -zlib

 -libpng

 -(for GDK-Pixbuf, if not using GDI+) IJG JPEG or libjpeg-turbo

@@ -64,7 +64,7 @@ The recommended build order for these dependencies:
  [libtiff requires zlib and IJG JPEG or libjpeg-turbo]

 -(for GDK-Pixbuf, if not using GDI+) jasper [jpeg-2000 library]

 -(optional for GLib) PCRE (version 8.12 or later, use of CMake to

-  build PCRE is recommended-see build/win32/vs10/README.txt of GLib)

+  build PCRE is recommended-see build/win32/vs12/README.txt of GLib)

 -GLib **

 -Cairo (inclusive of Cairo-GObject)

 -ATK**

@@ -74,10 +74,10 @@ The recommended build order for these dependencies:
  dependencies can be built in any order)

 

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

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

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

-<root>\vs10\<PlatformName>\lib and GTK+ headers into

-<root>\vs10\<PlatformName>\include\gtk-3.0. This is then from where

+appropriate location under <root>\vs12\<PlatformName>. For instance,

+built DLLs go into <root>\vs12\<PlatformName>\bin, built LIBs into

+<root>\vs12\<PlatformName>\lib and GTK+ headers into

+<root>\vs12\<PlatformName>\include\gtk-3.0. This is then from where

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

 from a specific GLib source tree.

 

@@ -95,7 +95,7 @@ GTK+ section) on how to get those icons set up for use with GTK+.
  and Pango.

 

 **:Put the sources of the packages marked with ** in <root>\<package-

-    source-tree>, and build with VS10 from there.

+    source-tree>, and build with VS12 from there.

 

 --Tor Lillqvist <tml@iki.fi>

 --Updated by Chun-wei Fan <fanc999@yahoo.com.tw>

diff --git a/build/win32/vs10/broadwayd.vcxproj.filtersin b/build/win32/vs12/broadwayd.vcxproj.filtersin
index ad496bc438..e26d87ca04 100644
--- a/build/win32/vs10/broadwayd.vcxproj.filtersin
+++ b/build/win32/vs12/broadwayd.vcxproj.filtersin
@@ -15,6 +15,6 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-#include "broadwayd.vs10.sourcefiles.filters"
+#include "broadwayd.vs12.sourcefiles.filters"
   </ItemGroup>
 </Project>
diff --git a/build/win32/vs10/broadwayd.vcxprojin b/build/win32/vs12/broadwayd.vcxprojin
index 14c575938f..6d8958e367 100644
--- a/build/win32/vs10/broadwayd.vcxprojin
+++ b/build/win32/vs12/broadwayd.vcxprojin
@@ -28,23 +28,23 @@
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -163,7 +163,7 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-#include "broadwayd.vs10.sourcefiles"
+#include "broadwayd.vs12.sourcefiles"
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="gtk4-prebuild.vcxproj">
diff --git a/build/win32/vs10/gdk-4.vcxproj.filtersin b/build/win32/vs12/gdk-4.vcxproj.filtersin
index 6f24d8c623..a6d1e923cf 100644
--- a/build/win32/vs10/gdk-4.vcxproj.filtersin
+++ b/build/win32/vs12/gdk-4.vcxproj.filtersin
@@ -18,7 +18,7 @@
     <ResourceCompile Include="..\..\..\gdk\win32\rc\gdk.rc"><Filter>Resource Files</Filter></ResourceCompile>
   </ItemGroup>
   <ItemGroup>
-#include "gdk-4.vs10.sourcefiles.filters"
+#include "gdk-4.vs12.sourcefiles.filters"
     <ClCompile Include="..\..\..\gdk\gdkkeynames.c"><Filter>Source Files</Filter></ClCompile>
   </ItemGroup>
 </Project>
diff --git a/build/win32/vs10/gdk-4.vcxprojin b/build/win32/vs12/gdk-4.vcxprojin
index 109e3877ad..c66d7f67c2 100644
--- a/build/win32/vs10/gdk-4.vcxprojin
+++ b/build/win32/vs12/gdk-4.vcxprojin
@@ -44,45 +44,45 @@
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -314,7 +314,7 @@
     <ResourceCompile Include="..\..\..\gdk\win32\rc\gdk.rc" />
   </ItemGroup>
   <ItemGroup>
-#include "gdk-4.vs10.sourcefiles"
+#include "gdk-4.vs12.sourcefiles"
     <ClCompile Include="..\..\..\gdk\gdkkeynames.c" />
   </ItemGroup>
   <ItemGroup>
diff --git a/build/win32/vs10/gdk4-broadway.vcxproj.filtersin b/build/win32/vs12/gdk4-broadway.vcxproj.filtersin
index 8e7eae14dd..39231ac549 100644
--- a/build/win32/vs10/gdk4-broadway.vcxproj.filtersin
+++ b/build/win32/vs12/gdk4-broadway.vcxproj.filtersin
@@ -15,6 +15,6 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-#include "gdk4-broadway.vs10.sourcefiles.filters"
+#include "gdk4-broadway.vs12.sourcefiles.filters"
   </ItemGroup>
 </Project>
diff --git a/build/win32/vs10/gdk4-broadway.vcxprojin b/build/win32/vs12/gdk4-broadway.vcxprojin
index c88e5c6ac2..dcf4a48e1f 100644
--- a/build/win32/vs10/gdk4-broadway.vcxprojin
+++ b/build/win32/vs12/gdk4-broadway.vcxprojin
@@ -28,23 +28,23 @@
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -117,7 +117,7 @@
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
-#include "gdk4-broadway.vs10.sourcefiles"
+#include "gdk4-broadway.vs12.sourcefiles"
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="gtk4-prebuild.vcxproj">
diff --git a/build/win32/vs10/gdk4-win32.vcxproj.filtersin b/build/win32/vs12/gdk4-win32.vcxproj.filtersin
index 36ba1caa08..3f36439852 100644
--- a/build/win32/vs10/gdk4-win32.vcxproj.filtersin
+++ b/build/win32/vs12/gdk4-win32.vcxproj.filtersin
@@ -15,6 +15,6 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-#include "gdk4-win32.vs10.sourcefiles.filters"
+#include "gdk4-win32.vs12.sourcefiles.filters"
   </ItemGroup>
 </Project>
diff --git a/build/win32/vs10/gdk4-win32.vcxprojin b/build/win32/vs12/gdk4-win32.vcxprojin
index 003088307a..4963618d02 100644
--- a/build/win32/vs10/gdk4-win32.vcxprojin
+++ b/build/win32/vs12/gdk4-win32.vcxprojin
@@ -28,23 +28,23 @@
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -117,7 +117,7 @@
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
-#include "gdk4-win32.vs10.sourcefiles"
+#include "gdk4-win32.vs12.sourcefiles"
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="gtk4-prebuild.vcxproj">
diff --git a/build/win32/vs10/gtk+-4.sln b/build/win32/vs12/gtk+-4.sln
index 7b784d1366..6c18434a3a 100644
--- a/build/win32/vs10/gtk+-4.sln
+++ b/build/win32/vs12/gtk+-4.sln
@@ -1,5 +1,5 @@
-Microsoft Visual Studio Solution File, Format Version 11.00

-# Visual Studio 2010

+Microsoft Visual Studio Solution File, Format Version 12.00

+# Visual Studio 2013

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk4-prebuild", "gtk4-prebuild.vcxproj", "{B98FBE68-B03C-48E3-8F32-C3C010720D30}"

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdk4-win32", "gdk4-win32.vcxproj", "{ABA7685A-7CBB-4626-B5E5-6EEEA5B489EF}"

diff --git a/build/win32/vs10/gtk-4.vcxproj.filtersin b/build/win32/vs12/gtk-4.vcxproj.filtersin
index 33162a27eb..1b541bba06 100644
--- a/build/win32/vs10/gtk-4.vcxproj.filtersin
+++ b/build/win32/vs12/gtk-4.vcxproj.filtersin
@@ -23,7 +23,7 @@
     <CustomBuild Include="..\..\..\gtk\libgtk4.manifest.in"><Filter>Resource Files</Filter></CustomBuild>
   </ItemGroup>
   <ItemGroup>
-#include "gtk-4.vs10.sourcefiles.filters"
+#include "gtk-4.vs12.sourcefiles.filters"
     <ClCompile Include="..\..\..\modules\input\gtkimcontextime.c"><Filter>Source Files</Filter></ClCompile>
     <ClCompile Include="..\..\..\modules\input\gtkimcontextmultipress.c"><Filter>Source Files</Filter></ClCompile>
     <ClCompile Include="..\..\..\modules\input\gtkimcontextthai.c"><Filter>Source Files</Filter></ClCompile>
diff --git a/build/win32/vs10/gtk-4.vcxprojin b/build/win32/vs12/gtk-4.vcxprojin
index 86b98b5125..f32094e047 100644
--- a/build/win32/vs10/gtk-4.vcxprojin
+++ b/build/win32/vs12/gtk-4.vcxprojin
@@ -29,22 +29,22 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -210,7 +210,7 @@
     <ResourceCompile Include="..\..\..\gtk\gtk-win32.rc" />
   </ItemGroup>
   <ItemGroup>
-#include "gtk-4.vs10.sourcefiles"
+#include "gtk-4.vs12.sourcefiles"
     <ClCompile Include="..\..\..\modules\input\gtkimcontextime.c" />
     <ClCompile Include="..\..\..\modules\input\gtkimcontextmultipress.c" />
     <ClCompile Include="..\..\..\modules\input\gtkimcontextthai.c" />
diff --git a/build/win32/vs10/gtk-builder-tool.vcxproj b/build/win32/vs12/gtk-builder-tool.vcxproj
index e5771d2f61..0c2ce14bb3 100644
--- a/build/win32/vs10/gtk-builder-tool.vcxproj
+++ b/build/win32/vs12/gtk-builder-tool.vcxproj
@@ -28,23 +28,23 @@
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
diff --git a/build/win32/vs10/gtk-builder-tool.vcxproj.filters b/build/win32/vs12/gtk-builder-tool.vcxproj.filters
index 8b19c8b0f3..8b19c8b0f3 100644
--- a/build/win32/vs10/gtk-builder-tool.vcxproj.filters
+++ b/build/win32/vs12/gtk-builder-tool.vcxproj.filters
diff --git a/build/win32/vs10/gtk-encode-symbolic-svg.vcxproj b/build/win32/vs12/gtk-encode-symbolic-svg.vcxproj
index b910be53ff..a424f8be4f 100644
--- a/build/win32/vs10/gtk-encode-symbolic-svg.vcxproj
+++ b/build/win32/vs12/gtk-encode-symbolic-svg.vcxproj
@@ -28,23 +28,23 @@
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
diff --git a/build/win32/vs10/gtk-encode-symbolic-svg.vcxproj.filters b/build/win32/vs12/gtk-encode-symbolic-svg.vcxproj.filters
index 22a3155d84..22a3155d84 100644
--- a/build/win32/vs10/gtk-encode-symbolic-svg.vcxproj.filters
+++ b/build/win32/vs12/gtk-encode-symbolic-svg.vcxproj.filters
diff --git a/build/win32/vs10/gtk-query-settings.vcxproj b/build/win32/vs12/gtk-query-settings.vcxproj
index 8dd75d7cb5..9514793102 100644
--- a/build/win32/vs10/gtk-query-settings.vcxproj
+++ b/build/win32/vs12/gtk-query-settings.vcxproj
@@ -28,23 +28,23 @@
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
diff --git a/build/win32/vs10/gtk-query-settings.vcxproj.filters b/build/win32/vs12/gtk-query-settings.vcxproj.filters
index 42804c1aee..42804c1aee 100644
--- a/build/win32/vs10/gtk-query-settings.vcxproj.filters
+++ b/build/win32/vs12/gtk-query-settings.vcxproj.filters
diff --git a/build/win32/vs10/gtk-update-icon-cache.vcxproj b/build/win32/vs12/gtk-update-icon-cache.vcxproj
index 505b3fe721..509f5a7181 100644
--- a/build/win32/vs10/gtk-update-icon-cache.vcxproj
+++ b/build/win32/vs12/gtk-update-icon-cache.vcxproj
@@ -28,23 +28,23 @@
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
diff --git a/build/win32/vs10/gtk-update-icon-cache.vcxproj.filters b/build/win32/vs12/gtk-update-icon-cache.vcxproj.filters
index 24d654bd72..24d654bd72 100644
--- a/build/win32/vs10/gtk-update-icon-cache.vcxproj.filters
+++ b/build/win32/vs12/gtk-update-icon-cache.vcxproj.filters
diff --git a/build/win32/vs10/gtk4-build-defines.props b/build/win32/vs12/gtk4-build-defines.props
index f618190fa4..f618190fa4 100644
--- a/build/win32/vs10/gtk4-build-defines.props
+++ b/build/win32/vs12/gtk4-build-defines.props
diff --git a/build/win32/vs10/gtk4-copy-gdk-broadway.props b/build/win32/vs12/gtk4-copy-gdk-broadway.props
index 4901b2ff9a..4901b2ff9a 100644
--- a/build/win32/vs10/gtk4-copy-gdk-broadway.props
+++ b/build/win32/vs12/gtk4-copy-gdk-broadway.props
diff --git a/build/win32/vs10/gtk4-demo-application.vcxproj.filtersin b/build/win32/vs12/gtk4-demo-application.vcxproj.filtersin
index 463134383f..5d39916a0c 100644
--- a/build/win32/vs10/gtk4-demo-application.vcxproj.filtersin
+++ b/build/win32/vs12/gtk4-demo-application.vcxproj.filtersin
@@ -15,6 +15,6 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-#include "gtk4-demo-application.vs10.sourcefiles.filters"
+#include "gtk4-demo-application.vs12.sourcefiles.filters"
   </ItemGroup>
 </Project>
diff --git a/build/win32/vs10/gtk4-demo-application.vcxprojin b/build/win32/vs12/gtk4-demo-application.vcxprojin
index 7bd290b542..f5ed864659 100644
--- a/build/win32/vs10/gtk4-demo-application.vcxprojin
+++ b/build/win32/vs12/gtk4-demo-application.vcxprojin
@@ -28,23 +28,23 @@
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -155,7 +155,7 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-#include "gtk4-demo-application.vs10.sourcefiles"
+#include "gtk4-demo-application.vs12.sourcefiles"
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="gdk-4.vcxproj">
diff --git a/build/win32/vs10/gtk4-demo.vcxproj.filtersin b/build/win32/vs12/gtk4-demo.vcxproj.filtersin
index 7ffdcf679b..37f1af4455 100644
--- a/build/win32/vs10/gtk4-demo.vcxproj.filtersin
+++ b/build/win32/vs12/gtk4-demo.vcxproj.filtersin
@@ -11,6 +11,6 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-#include "gtk4-demo.vs10.sourcefiles.filters"
+#include "gtk4-demo.vs12.sourcefiles.filters"
   </ItemGroup>
 </Project>
diff --git a/build/win32/vs10/gtk4-demo.vcxprojin b/build/win32/vs12/gtk4-demo.vcxprojin
index 31df52cd5b..3022f4187e 100644
--- a/build/win32/vs10/gtk4-demo.vcxprojin
+++ b/build/win32/vs12/gtk4-demo.vcxprojin
@@ -28,23 +28,23 @@
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -169,7 +169,7 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-#include "gtk4-demo.vs10.sourcefiles"
+#include "gtk4-demo.vs12.sourcefiles"
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="gdk-4.vcxproj">
diff --git a/build/win32/vs10/gtk4-gen-srcs.props b/build/win32/vs12/gtk4-gen-srcs.props
index 53555c3dfb..53555c3dfb 100644
--- a/build/win32/vs10/gtk4-gen-srcs.props
+++ b/build/win32/vs12/gtk4-gen-srcs.props
diff --git a/build/win32/vs10/gtk4-icon-browser.vcxproj.filtersin b/build/win32/vs12/gtk4-icon-browser.vcxproj.filtersin
index 4ff5822911..3350174665 100644
--- a/build/win32/vs10/gtk4-icon-browser.vcxproj.filtersin
+++ b/build/win32/vs12/gtk4-icon-browser.vcxproj.filtersin
@@ -15,6 +15,6 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-#include "gtk4-icon-browser.vs10.sourcefiles.filters"
+#include "gtk4-icon-browser.vs12.sourcefiles.filters"
   </ItemGroup>
 </Project>
diff --git a/build/win32/vs10/gtk4-icon-browser.vcxprojin b/build/win32/vs12/gtk4-icon-browser.vcxprojin
index 4c254db7a3..01015a0cd0 100644
--- a/build/win32/vs10/gtk4-icon-browser.vcxprojin
+++ b/build/win32/vs12/gtk4-icon-browser.vcxprojin
@@ -28,23 +28,23 @@
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -159,7 +159,7 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-#include "gtk4-icon-browser.vs10.sourcefiles"
+#include "gtk4-icon-browser.vs12.sourcefiles"
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="gdk-4.vcxproj">
diff --git a/build/win32/vs10/gtk4-ignore-broadway.props b/build/win32/vs12/gtk4-ignore-broadway.props
index 5b4c893fa5..5b4c893fa5 100644
--- a/build/win32/vs10/gtk4-ignore-broadway.props
+++ b/build/win32/vs12/gtk4-ignore-broadway.props
diff --git a/build/win32/vs10/gtk4-install.propsin b/build/win32/vs12/gtk4-install.propsin
index 1b6d6c9237..a69fa128e5 100644
--- a/build/win32/vs10/gtk4-install.propsin
+++ b/build/win32/vs12/gtk4-install.propsin
@@ -94,12 +94,12 @@ echo off
 mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gdk\win32
 mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gdk\deprecated
 copy ..\..\..\gdk\win32\gdkwin32.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk
-#include "gdk-4.vs10.headers"
-#include "gdk4-win32.vs10.headers"
+#include "gdk-4.vs12.headers"
+#include "gdk4-win32.vs12.headers"
 
 mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y
 mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated
-#include "gtk-4.vs10.headers"
+#include "gtk-4.vs12.headers"
 
 mkdir $(CopyDir)\share\icons\hicolor\16x16\apps
 copy ..\..\..\demos\gtk-demo\data\16x16\gtk4-demo.png $(CopyDir)\share\icons\hicolor\16x16\apps
@@ -122,7 +122,7 @@ copy ..\..\..\demos\gtk-demo\org.gtk.Demo.gschema.xml $(CopyDir)\share\glib-2.0\
     <GtkDoInstallBroadwayHeaders>
 copy ..\..\..\gdk\broadway\gdkbroadway.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk
 mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gdk\broadway
-#include "gdk4-broadway.vs10.headers"
+#include "gdk4-broadway.vs12.headers"
     </GtkDoInstallBroadwayHeaders>
     <GtkPostInstall>
 echo "Compiling gsettings XML Files..."
diff --git a/build/win32/vs10/gtk4-install.vcxproj b/build/win32/vs12/gtk4-install.vcxproj
index 70b89e2c62..5c9f12d4ad 100644
--- a/build/win32/vs10/gtk4-install.vcxproj
+++ b/build/win32/vs12/gtk4-install.vcxproj
@@ -44,45 +44,45 @@
     <ConfigurationType>Utility</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Utility</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Utility</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Utility</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|Win32'" Label="Configuration">
     <ConfigurationType>Utility</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'" Label="Configuration">
     <ConfigurationType>Utility</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'" Label="Configuration">
     <ConfigurationType>Utility</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|x64'" Label="Configuration">
     <ConfigurationType>Utility</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
diff --git a/build/win32/vs10/gtk4-install.vcxproj.filters b/build/win32/vs12/gtk4-install.vcxproj.filters
index c75e9b3cc0..c75e9b3cc0 100644
--- a/build/win32/vs10/gtk4-install.vcxproj.filters
+++ b/build/win32/vs12/gtk4-install.vcxproj.filters
diff --git a/build/win32/vs10/gtk4-prebuild.vcxproj b/build/win32/vs12/gtk4-prebuild.vcxproj
index d68bfe83d6..d49f59d95e 100644
--- a/build/win32/vs10/gtk4-prebuild.vcxproj
+++ b/build/win32/vs12/gtk4-prebuild.vcxproj
@@ -44,45 +44,45 @@
     <ConfigurationType>Utility</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Utility</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Utility</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Utility</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|Win32'" Label="Configuration">
     <ConfigurationType>Utility</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|Win32'" Label="Configuration">
     <ConfigurationType>Utility</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_Broadway|x64'" Label="Configuration">
     <ConfigurationType>Utility</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Broadway|x64'" Label="Configuration">
     <ConfigurationType>Utility</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
diff --git a/build/win32/vs10/gtk4-prebuild.vcxproj.filters b/build/win32/vs12/gtk4-prebuild.vcxproj.filters
index f97b21d08b..f97b21d08b 100644
--- a/build/win32/vs10/gtk4-prebuild.vcxproj.filters
+++ b/build/win32/vs12/gtk4-prebuild.vcxproj.filters
diff --git a/build/win32/vs10/gtk4-version-paths.props.in b/build/win32/vs12/gtk4-version-paths.props.in
index fb74684c83..8d16191cc9 100644
--- a/build/win32/vs10/gtk4-version-paths.props.in
+++ b/build/win32/vs12/gtk4-version-paths.props.in
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup Label="UserMacros">
-    <VSVer>10</VSVer>
+    <VSVer>12</VSVer>
     <GlibEtcInstallRoot>$(SolutionDir)\..\..\..\..\vs$(VSVer)\$(Platform)</GlibEtcInstallRoot>
     <CopyDir>..\..\..\..\vs$(VSVer)\$(Platform)</CopyDir>
     <ApiVersion>4.0</ApiVersion>
diff --git a/build/win32/vs14/Makefile.am b/build/win32/vs14/Makefile.am
index dc0625cf1d..917d2b4726 100644
--- a/build/win32/vs14/Makefile.am
+++ b/build/win32/vs14/Makefile.am
@@ -40,6 +40,8 @@ EXTRA_DIST +=	\
 
 DISTCLEANFILES = $(EXTRA_DIST)
 
+MSVC_BASE_VER = 12
+MSVC_BASE_VER_LONG = 2013
 MSVC_VER = 14
 MSVC_FORMAT_VER = 12
 MSVC_VER_LONG = 14
diff --git a/build/win32/vs9/Makefile.am b/build/win32/vs9/Makefile.am
deleted file mode 100644
index d30a568114..0000000000
--- a/build/win32/vs9/Makefile.am
+++ /dev/null
@@ -1,52 +0,0 @@
-include $(top_srcdir)/Makefile.decl
-
-MSVC_HEADERS_LISTS =	\
-	gdk4-win32.headers	\
-	gdk4-broadway.headers	\
-	gdk-4.headers		\
-	gtk-4.headers
-
-GENERATED_ITEMS = \
-	gdk4-win32.vcproj		\
-	gdk4-broadway.vcproj		\
-	broadwayd.vcproj		\
-	gdk-4.vcproj			\
-	gtk-4.vcproj			\
-	gtk4-demo.vcproj		\
-	gtk4-demo-application.vcproj	\
-	gtk4-icon-browser.vcproj	\
-	gtk4-install.vsprops		\
-	gtk4-version-paths.vsprops
-
-EXTRA_DIST += \
-	README.txt			\
-	gtk+-4.sln			\
-	gtk4-prebuild.vcproj		\
-	gdk4-win32.vcprojin		\
-	gdk-4.vcprojin			\
-	gtk-4.vcprojin			\
-	gtk-builder-tool.vcproj	\
-	gtk-encode-symbolic-svg.vcproj	\
-	gtk-query-settings.vcproj	\
-	gtk-update-icon-cache.vcproj	\
-	gtk4-demo.vcprojin		\
-	gtk4-demo-application.vcprojin	\
-	gtk4-icon-browser.vcprojin	\
-	gtk4-install.vcproj		\
-	broadwayd.vcprojin		\
-	gdk4-broadway.vcprojin		\
-	gtk4-build-defines.vsprops	\
-	gtk4-copy-gdk-broadway.vsprops	\
-	gtk4-gen-srcs.vsprops		\
-	gtk4-ignore-broadway.vsprops	\
-	gtk4-install.vspropsin		\
-	gtk4-version-paths.vsprops.in	\
-	$(GENERATED_ITEMS)
-
-gtk4-install.vsprops: $(top_srcdir)/build/win32/vs9/gtk4-install.vspropsin $(MSVC_HEADERS_LISTS)
-	$(CPP) -P - <$(top_srcdir)/build/win32/vs9/gtk4-install.vspropsin >$@
-	rm $(MSVC_HEADERS_LISTS)
-
-DISTCLEANFILES = $(GENERATED_ITEMS)
-
--include $(top_srcdir)/git.mk
diff --git a/build/win32/vs9/README.txt b/build/win32/vs9/README.txt
deleted file mode 100644
index 974f1381eb..0000000000
--- a/build/win32/vs9/README.txt
+++ /dev/null
@@ -1,100 +0,0 @@
-Please do not compile this package (GTK+) in paths that contain

-spaces in them-as strange problems may occur during compilation or during

-the use of the library.

-

-A more detailed outline for instructions on building the GTK+ with Visual

-C++ can be found in the following GNOME Live! page:

-

-https://wiki.gnome.org/Projects/GTK+/Win32/MSVCCompilationOfGTKStack

-

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

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

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

-the files needed, like config.h.win32.in into config.h.win32 and the

-.vcprojin files here into corresponding actual .vcproj files.

-

-You will need the parts from below in the GTK+ stack: GDK-Pixbuf, Pango,

-ATK and GLib.  External dependencies are at least Cairo

-(with Cairo-GObject support, meaning Cairo 1.10.x or later), zlib, libpng,

-gettext-runtime, fontconfig*, freetype*, expat*.  See the 

-build/win32/vs9/README.txt file in glib for details where to unpack them.

-

-You will also need a Python 2.6+/3.x interpretor installed on your system,

-which can be obtained from the official installers available from

-http://www.python.org.  Please note that the Python interpretor (python.exe)

-either needs to be in your PATH before attempting the build of GTK+, or it

-can be found in the path specified by PythonPath in gtk-version-paths.vsprops.

-If you happen to change the PythonPath setting in gtk-version-paths.vsprops after

-opening gtk+.sln with Visual Studio, you will need to close the gtk+.sln solution,

-delete all the *.ncb, *.suo and *.user files before re-attempting the build.

-

-It is recommended that one builds the dependencies with VS9 as far as

-possible, especially those from and using the GTK+ stack (i.e. GLib,

-Cairo, ATK, Pango, GDK-Pixbuf), so that crashes caused by mixing calls

-to different CRTs can be kept at a minimum.  

-

-zlib, libpng, and Cairo do contain support for compiling under VS9

-using VS project files and/or makefiles at this time of writing, For the

-GTK+ stack, VS9 project files are either available under

-$(srcroot)/build/vs9 in the case of GLib (stable/unstable), ATK

-(stable/unstable) and GDK-Pixbuf (unstable), and should be in the next

-unstable version of Pango.  There is no known official VS9 build

-support for fontconfig (along with freetype and expat) and

-gettext-runtime, so please use the binaries from: 

-

-ftp://ftp.gnome.org/pub/GNOME/binaries/win32/dependencies/ (32 bit)

-ftp://ftp.gnome.org/pub/GNOME/binaries/win64/dependencies/ (64 bit)

-

-Unzip the binaries obtained from ftp.gnome.org in <root>\vs9\<PlatformName>,

-and build the following, if not already done so: 

-

-Note: put the resulting zlib, libpng, pcre and Cairo files as follows:

- .dll files: <root>\vs9\<PlatformName>\bin

- .lib files: <root>\vs9\<PlatformName>\lib

- .h files: <root>\vs9\<PlatformName>\include

-

-The recommended build order for these dependencies:

-(first unzip any dependent binaries downloaded from the ftp.gnome.org

- as described in the README.txt file in the build/win32/vs9 folder)

--zlib

--libpng

--(for GDK-Pixbuf, if not using GDI+) IJG JPEG or libjpeg-turbo

--(for GDK-Pixbuf, if not using GDI+) libtiff

- [libtiff requires zlib and IJG JPEG or libjpeg-turbo]

--(for GDK-Pixbuf, if not using GDI+) jasper [jpeg-2000 library])

--(optional for GLib) PCRE (version 8.12 or later, use of CMake to

-  build PCRE is recommended-see build/win32/vs9/README.txt of GLib)

--GLib **

--Cairo (inclusive of Cairo-GObject)

--ATK**

--Pango**

--GDK-Pixbuf**

-(note the last 3 dependencies are not interdependent, so the last 3

- dependencies can be built in any order)

-

-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 GTK+ headers into

-<root>\vs9\<PlatformName>\include\gtk-3.0. This is then from where

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

-from a specific GLib source tree.

-

-Please note, as GTK+ uses the Adwaita theme for all platforms by default,

-most icons used are not included with GTK+ (which *are* needed), so please see

-https://live.gnome.org/GTK%2B/Win32/MSVCCompilationOfGTKStack (under the

-GTK+ section) on how to get those icons set up for use with GTK+.

-

-*About the dependencies marked with *: These dependencies are optional

- as those are not compulsory components for building and running GTK+

- itself, but note that they are needed for people running and building

- GIMP or those who need complex script support via fontconfig.  They

- are referred to by components in Cairo and Pango mainly.

- Decide whether you need fontconfig support prior to building Cairo

- and Pango.

-

-**:Put the sources of the packages marked with ** in <root>\<package-

-    source-tree>, and build with VS9 from there.

-

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

---Updated by Chun-wei Fan <fanc999@yahoo.com.tw>

diff --git a/build/win32/vs9/broadwayd.vcprojin b/build/win32/vs9/broadwayd.vcprojin
deleted file mode 100644
index 1984e48baf..0000000000
--- a/build/win32/vs9/broadwayd.vcprojin
+++ /dev/null
@@ -1,176 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="broadwayd"
-	ProjectGUID="{E9687D21-E214-4A0C-9EB4-8B38EBB783E5}"
-	RootNamespace="broadwayd"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="196613"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug_Broadway|Win32"
-			InheritedPropertySheets=".\gtk4-build-defines.vsprops"
-			ConfigurationType="1"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\broadway"
-				PreprocessorDefinitions="_DEBUG;$(GdkDefines)"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				TargetMachine="1"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release_Broadway|Win32"
-			InheritedPropertySheets=".\gtk4-build-defines.vsprops"
-			ConfigurationType="1"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\broadway"
-				EnableIntrinsicFunctions="true"
-				PreprocessorDefinitions="$(GdkDefines)"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug_Broadway|x64"
-			InheritedPropertySheets=".\gtk4-build-defines.vsprops"
-			ConfigurationType="1"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\broadway"
-				PreprocessorDefinitions="_DEBUG;$(GdkDefines)"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				TargetMachine="17"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release_Broadway|x64"
-			InheritedPropertySheets=".\gtk4-build-defines.vsprops"
-			ConfigurationType="1"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\broadway"
-				EnableIntrinsicFunctions="true"
-				PreprocessorDefinitions="$(GdkDefines)"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="17"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Sources"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-#include "broadwayd.sourcefiles"
-		</Filter>
-		<Filter
-			Name="Headers"
-			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}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/build/win32/vs9/gdk-4.vcprojin b/build/win32/vs9/gdk-4.vcprojin
deleted file mode 100644
index cf07ad6677..0000000000
--- a/build/win32/vs9/gdk-4.vcprojin
+++ /dev/null
@@ -1,304 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="gdk-4"
-	ProjectGUID="{5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8}"
-	RootNamespace="gdk4"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="0"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			InheritedPropertySheets=".\gtk4-ignore-broadway.vsprops"
-			ConfigurationType="2"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32"
-				PreprocessorDefinitions="_DEBUG;G_ENABLE_DEBUG;$(GdkDefines)"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="$(GdkAdditionalLibs)"
-				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				ImportLibrary="$(TargetDir)$(ProjectName).0.lib"
-				TargetMachine="1"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug_Broadway|Win32"
-			InheritedPropertySheets=".\gtk4-copy-gdk-broadway.vsprops"
-			ConfigurationType="2"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32;..\..\..\gdk\broadway"
-				PreprocessorDefinitions="_DEBUG;G_ENABLE_DEBUG;$(GdkDefines)"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="$(GdkAdditionalLibs) $(GdkBroadwayAdditionalLibs)"
-				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				ImportLibrary="$(TargetDir)$(ProjectName).0.lib"
-				TargetMachine="1"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			InheritedPropertySheets=".\gtk4-ignore-broadway.vsprops"
-			ConfigurationType="2"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32"
-				PreprocessorDefinitions="$(GdkDefines)"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="$(GdkAdditionalLibs)"
-				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				ImportLibrary="$(TargetDir)$(ProjectName).0.lib"
-				TargetMachine="1"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release_Broadway|Win32"
-			InheritedPropertySheets=".\gtk4-copy-gdk-broadway.vsprops"
-			ConfigurationType="2"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32;..\..\..\gdk\broadway"
-				PreprocessorDefinitions="$(GdkDefines)"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="$(GdkAdditionalLibs) $(GdkBroadwayAdditionalLibs)"
-				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				ImportLibrary="$(TargetDir)$(ProjectName).0.lib"
-				TargetMachine="1"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			InheritedPropertySheets=".\gtk4-ignore-broadway.vsprops"
-			ConfigurationType="2"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32"
-				PreprocessorDefinitions="_DEBUG;G_ENABLE_DEBUG;$(GdkDefines)"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="$(GdkAdditionalLibs)"
-				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				ImportLibrary="$(TargetDir)$(ProjectName).0.lib"
-				TargetMachine="17"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug_Broadway|x64"
-			InheritedPropertySheets=".\gtk4-copy-gdk-broadway.vsprops"
-			ConfigurationType="2"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32;..\..\..\gdk\broadway"
-				PreprocessorDefinitions="_DEBUG;G_ENABLE_DEBUG;$(GdkDefines)"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="$(GdkAdditionalLibs) $(GdkBroadwayAdditionalLibs)"
-				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				ImportLibrary="$(TargetDir)$(ProjectName).0.lib"
-				TargetMachine="17"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			InheritedPropertySheets=".\gtk4-ignore-broadway.vsprops"
-			ConfigurationType="2"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32"
-				PreprocessorDefinitions="$(GdkDefines)"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="$(GdkAdditionalLibs)"
-				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				ImportLibrary="$(TargetDir)$(ProjectName).0.lib"
-				TargetMachine="17"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release_Broadway|x64"
-			InheritedPropertySheets=".\gtk4-copy-gdk-broadway.vsprops"
-			ConfigurationType="2"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32;..\..\..\gdk\broadway"
-				PreprocessorDefinitions="$(GdkDefines)"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="$(GdkAdditionalLibs) $(GdkBroadwayAdditionalLibs)"
-				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				ImportLibrary="$(TargetDir)$(ProjectName).0.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"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-			<File RelativePath="..\..\..\gdk\win32\rc\gdk.rc" />
-		</Filter>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-#include "gdk-4.sourcefiles"
-			<File RelativePath="..\..\..\gdk\gdkkeynames.c" />
-		</Filter>
-	</Files>
-</VisualStudioProject>
diff --git a/build/win32/vs9/gdk4-broadway.vcprojin b/build/win32/vs9/gdk4-broadway.vcprojin
deleted file mode 100644
index 1831705929..0000000000
--- a/build/win32/vs9/gdk4-broadway.vcprojin
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="gdk4-broadway"
-	ProjectGUID="{1DF4C475-4472-4EE4-AC2B-3AB5A4C1A453}"
-	RootNamespace="gdk3broadway"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="0"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug_Broadway|Win32"
-			InheritedPropertySheets=".\gtk4-build-defines.vsprops"
-			ConfigurationType="4"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\broadway"
-				PreprocessorDefinitions="_DEBUG;G_ENABLE_DEBUG;$(GdkDefines)"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release_Broadway|Win32"
-			InheritedPropertySheets=".\gtk4-build-defines.vsprops"
-			ConfigurationType="4"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\broadway"
-				PreprocessorDefinitions="$(GdkDefines)"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug_Broadway|x64"
-			InheritedPropertySheets=".\gtk4-build-defines.vsprops"
-			ConfigurationType="4"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\broadway"
-				PreprocessorDefinitions="_DEBUG;G_ENABLE_DEBUG;$(GdkDefines)"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release_Broadway|x64"
-			InheritedPropertySheets=".\gtk4-build-defines.vsprops"
-			ConfigurationType="4"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\broadway"
-				PreprocessorDefinitions="$(GdkDefines)"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-		</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"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-#include "gdk4-broadway.sourcefiles"
-		</Filter>
-	</Files>
-</VisualStudioProject>
diff --git a/build/win32/vs9/gdk4-win32.vcprojin b/build/win32/vs9/gdk4-win32.vcprojin
deleted file mode 100644
index dace95b0c3..0000000000
--- a/build/win32/vs9/gdk4-win32.vcprojin
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="gdk4-win32"
-	ProjectGUID="{ABA7685A-7CBB-4626-B5E5-6EEEA5B489EF}"
-	RootNamespace="gdk4win32"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="0"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			InheritedPropertySheets=".\gtk4-build-defines.vsprops"
-			ConfigurationType="4"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32"
-				PreprocessorDefinitions="_DEBUG;G_ENABLE_DEBUG;$(GdkDefines);INSIDE_GDK_WIN32"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			InheritedPropertySheets=".\gtk4-build-defines.vsprops"
-			ConfigurationType="4"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32"
-				PreprocessorDefinitions="$(GdkDefines);INSIDE_GDK_WIN32"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			InheritedPropertySheets=".\gtk4-build-defines.vsprops"
-			ConfigurationType="4"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32"
-				PreprocessorDefinitions="_DEBUG;G_ENABLE_DEBUG;$(GdkDefines);INSIDE_GDK_WIN32"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			InheritedPropertySheets=".\gtk4-build-defines.vsprops"
-			ConfigurationType="4"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gdk\win32"
-				PreprocessorDefinitions="$(GdkDefines);INSIDE_GDK_WIN32"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-		</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"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-#include "gdk4-win32.sourcefiles"
-		</Filter>
-	</Files>
-</VisualStudioProject>
diff --git a/build/win32/vs9/gtk+-4.sln b/build/win32/vs9/gtk+-4.sln
deleted file mode 100644
index 436f583ac8..0000000000
--- a/build/win32/vs9/gtk+-4.sln
+++ /dev/null
@@ -1,309 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 10.00

-# Visual Studio 2008

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk4-prebuild", "gtk4-prebuild.vcproj", "{B98FBE68-B03C-48E3-8F32-C3C010720D30}"

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdk4-win42", "gdk4-win32.vcproj", "{ABA7685A-7CBB-4626-B5E5-6EEEA5B489EF}"

-	ProjectSection(ProjectDependencies) = postProject

-		{B98FBE68-B03C-48E3-8F32-C3C010720D30} = {B98FBE68-B03C-48E3-8F32-C3C010720D30}

-	EndProjectSection

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdk4-broadway", "gdk4-broadway.vcproj", "{1DF4C475-4472-4EE4-AC2B-3AB5A4C1A453}"

-	ProjectSection(ProjectDependencies) = postProject

-		{B98FBE68-B03C-48E3-8F32-C3C010720D30} = {B98FBE68-B03C-48E3-8F32-C3C010720D30}

-	EndProjectSection

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "broadwayd", "broadwayd.vcproj", "{E9687D21-E214-4A0C-9EB4-8B38EBB783E5}"

-	ProjectSection(ProjectDependencies) = postProject

-		{B98FBE68-B03C-48E3-8F32-C3C010720D30} = {B98FBE68-B03C-48E3-8F32-C3C010720D30}

-	EndProjectSection

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdk-4", "gdk-4.vcproj", "{5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8}"

-	ProjectSection(ProjectDependencies) = postProject

-		{ABA7685A-7CBB-4626-B5E5-6EEEA5B489EF} = {ABA7685A-7CBB-4626-B5E5-6EEEA5B489EF}

-		{1DF4C475-4472-4EE4-AC2B-3AB5A4C1A453} = {1DF4C475-4472-4EE4-AC2B-3AB5A4C1A453}

-	EndProjectSection

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk-4", "gtk-4.vcproj", "{95A4B53D-2773-4406-A2C1-8FD2840BBAD8}"

-	ProjectSection(ProjectDependencies) = postProject

-		{5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8} = {5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8}

-	EndProjectSection

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk4-demo", "gtk4-demo.vcproj", "{BDAE6DE2-6BCC-4107-94F0-DA12214A02DE}"

-	ProjectSection(ProjectDependencies) = postProject

-		{5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8} = {5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8}

-		{95A4B53D-2773-4406-A2C1-8FD2840BBAD8} = {95A4B53D-2773-4406-A2C1-8FD2840BBAD8}

-	EndProjectSection

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk4-demo-application", "gtk4-demo-application.vcproj", "{BE6B4973-C6FF-4C8F-8E97-A47793C50F44}"

-	ProjectSection(ProjectDependencies) = postProject

-		{5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8} = {5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8}

-		{95A4B53D-2773-4406-A2C1-8FD2840BBAD8} = {95A4B53D-2773-4406-A2C1-8FD2840BBAD8}

-	EndProjectSection

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk-encode-symbolic-svg", "gtk-encode-symbolic-svg.vcproj", "{F280BF1A-777A-4FB5-8005-DFBE04621EDB}"

-	ProjectSection(ProjectDependencies) = postProject

-		{5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8} = {5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8}

-	EndProjectSection

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk4-icon-browser", "gtk4-icon-browser.vcproj", "{343333C4-D46C-4C97-A986-959CCA6F1DE0}"

-	ProjectSection(ProjectDependencies) = postProject

-		{5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8} = {5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8}

-		{95A4B53D-2773-4406-A2C1-8FD2840BBAD8} = {95A4B53D-2773-4406-A2C1-8FD2840BBAD8}

-	EndProjectSection

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk-update-icon-cache", "gtk-update-icon-cache.vcproj", "{FC98AF16-4C68-42DF-906B-93A6804C198A}"

-	ProjectSection(ProjectDependencies) = postProject

-		{B98FBE68-B03C-48E3-8F32-C3C010720D30} = {B98FBE68-B03C-48E3-8F32-C3C010720D30}

-	EndProjectSection

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk-builder-tool", "gtk-builder-tool.vcproj", "{7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}"

-	ProjectSection(ProjectDependencies) = postProject

-		{5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8} = {5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8}

-		{95A4B53D-2773-4406-A2C1-8FD2840BBAD8} = {95A4B53D-2773-4406-A2C1-8FD2840BBAD8}

-	EndProjectSection

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk-query-settings", "gtk-query-settings.vcproj", "{9F22107A-3EF7-4B52-B269-747B65307F36}"

-	ProjectSection(ProjectDependencies) = postProject

-		{5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8} = {5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8}

-		{95A4B53D-2773-4406-A2C1-8FD2840BBAD8} = {95A4B53D-2773-4406-A2C1-8FD2840BBAD8}

-	EndProjectSection

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk4-install", "gtk4-install.vcproj", "{23BBF35F-78AF-4E8C-983F-7B90448CD7DF}"

-	ProjectSection(ProjectDependencies) = postProject

-		{5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8} = {5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8}

-		{95A4B53D-2773-4406-A2C1-8FD2840BBAD8} = {95A4B53D-2773-4406-A2C1-8FD2840BBAD8}

-		{BDAE6DE2-6BCC-4107-94F0-DA12214A02DE} = {BDAE6DE2-6BCC-4107-94F0-DA12214A02DE}

-		{BE6B4973-C6FF-4C8F-8E97-A47793C50F44} = {BE6B4973-C6FF-4C8F-8E97-A47793C50F44}

-		{343333C4-D46C-4C97-A986-959CCA6F1DE0} = {343333C4-D46C-4C97-A986-959CCA6F1DE0}

-		{E9687D21-E214-4A0C-9EB4-8B38EBB783E5} = {E9687D21-E214-4A0C-9EB4-8B38EBB783E5}

-		{F280BF1A-777A-4FB5-8005-DFBE04621EDB} = {F280BF1A-777A-4FB5-8005-DFBE04621EDB}

-		{FC98AF16-4C68-42DF-906B-93A6804C198A} = {FC98AF16-4C68-42DF-906B-93A6804C198A}

-		{7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD} = {7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}

-		{9F22107A-3EF7-4B52-B269-747B65307F36} = {9F22107A-3EF7-4B52-B269-747B65307F36}

-	EndProjectSection

-EndProject

-Global

-	GlobalSection(SolutionConfigurationPlatforms) = preSolution

-		Debug|Win32 = Debug|Win32

-		Debug_Broadway|Win32 = Debug_Broadway|Win32

-		Debug|x64 = Debug|x64

-		Debug_Broadway|x64 = Debug_Broadway|x64

-		Release|Win32 = Release|Win32

-		Release_Broadway|Win32 = Release_Broadway|Win32

-		Release|x64 = Release|x64

-		Release_Broadway|x64 = Release_Broadway|x64

-	EndGlobalSection

-	GlobalSection(ProjectConfigurationPlatforms) = postSolution

-		{B98FBE68-B03C-48E3-8F32-C3C010720D30}.Debug|Win32.ActiveCfg = Debug|Win32

-		{B98FBE68-B03C-48E3-8F32-C3C010720D30}.Debug|Win32.Build.0 = Debug|Win32

-		{B98FBE68-B03C-48E3-8F32-C3C010720D30}.Debug|x64.ActiveCfg = Debug|x64

-		{B98FBE68-B03C-48E3-8F32-C3C010720D30}.Debug|x64.Build.0 = Debug|x64

-		{B98FBE68-B03C-48E3-8F32-C3C010720D30}.Release|Win32.ActiveCfg = Release|Win32

-		{B98FBE68-B03C-48E3-8F32-C3C010720D30}.Release|Win32.Build.0 = Release|Win32

-		{B98FBE68-B03C-48E3-8F32-C3C010720D30}.Release|x64.ActiveCfg = Release|x64

-		{B98FBE68-B03C-48E3-8F32-C3C010720D30}.Release|x64.Build.0 = Release|x64

-		{B98FBE68-B03C-48E3-8F32-C3C010720D30}.Debug_Broadway|Win32.ActiveCfg = Debug_Broadway|Win32

-		{B98FBE68-B03C-48E3-8F32-C3C010720D30}.Debug_Broadway|Win32.Build.0 = Debug_Broadway|Win32

-		{B98FBE68-B03C-48E3-8F32-C3C010720D30}.Debug_Broadway|x64.ActiveCfg = Debug_Broadway|x64

-		{B98FBE68-B03C-48E3-8F32-C3C010720D30}.Debug_Broadway|x64.Build.0 = Debug_Broadway|x64

-		{B98FBE68-B03C-48E3-8F32-C3C010720D30}.Release_Broadway|Win32.ActiveCfg = Release_Broadway|Win32

-		{B98FBE68-B03C-48E3-8F32-C3C010720D30}.Release_Broadway|Win32.Build.0 = Release_Broadway|Win32

-		{B98FBE68-B03C-48E3-8F32-C3C010720D30}.Release_Broadway|x64.ActiveCfg = Release_Broadway|x64

-		{B98FBE68-B03C-48E3-8F32-C3C010720D30}.Release_Broadway|x64.Build.0 = Release_Broadway|x64

-		{ABA7685A-7CBB-4626-B5E5-6EEEA5B489EF}.Debug|Win32.ActiveCfg = Debug|Win32

-		{ABA7685A-7CBB-4626-B5E5-6EEEA5B489EF}.Debug|Win32.Build.0 = Debug|Win32

-		{ABA7685A-7CBB-4626-B5E5-6EEEA5B489EF}.Debug|x64.ActiveCfg = Debug|x64

-		{ABA7685A-7CBB-4626-B5E5-6EEEA5B489EF}.Debug|x64.Build.0 = Debug|x64

-		{ABA7685A-7CBB-4626-B5E5-6EEEA5B489EF}.Release|Win32.ActiveCfg = Release|Win32

-		{ABA7685A-7CBB-4626-B5E5-6EEEA5B489EF}.Release|Win32.Build.0 = Release|Win32

-		{ABA7685A-7CBB-4626-B5E5-6EEEA5B489EF}.Release|x64.ActiveCfg = Release|x64

-		{ABA7685A-7CBB-4626-B5E5-6EEEA5B489EF}.Release|x64.Build.0 = Release|x64

-		{ABA7685A-7CBB-4626-B5E5-6EEEA5B489EF}.Debug_Broadway|Win32.ActiveCfg = Debug|Win32

-		{ABA7685A-7CBB-4626-B5E5-6EEEA5B489EF}.Debug_Broadway|Win32.Build.0 = Debug|Win32

-		{ABA7685A-7CBB-4626-B5E5-6EEEA5B489EF}.Debug_Broadway|x64.ActiveCfg = Debug|x64

-		{ABA7685A-7CBB-4626-B5E5-6EEEA5B489EF}.Debug_Broadway|x64.Build.0 = Debug|x64

-		{ABA7685A-7CBB-4626-B5E5-6EEEA5B489EF}.Release_Broadway|Win32.ActiveCfg = Release|Win32

-		{ABA7685A-7CBB-4626-B5E5-6EEEA5B489EF}.Release_Broadway|Win32.Build.0 = Release|Win32

-		{ABA7685A-7CBB-4626-B5E5-6EEEA5B489EF}.Release_Broadway|x64.ActiveCfg = Release|x64

-		{ABA7685A-7CBB-4626-B5E5-6EEEA5B489EF}.Release_Broadway|x64.Build.0 = Release|x64

-		{E9687D21-E214-4A0C-9EB4-8B38EBB783E5}.Debug_Broadway|Win32.ActiveCfg = Debug_Broadway|Win32

-		{E9687D21-E214-4A0C-9EB4-8B38EBB783E5}.Debug_Broadway|Win32.Build.0 = Debug_Broadway|Win32

-		{E9687D21-E214-4A0C-9EB4-8B38EBB783E5}.Debug_Broadway|x64.ActiveCfg = Debug_Broadway|x64

-		{E9687D21-E214-4A0C-9EB4-8B38EBB783E5}.Debug_Broadway|x64.Build.0 = Debug_Broadway|x64

-		{E9687D21-E214-4A0C-9EB4-8B38EBB783E5}.Release_Broadway|Win32.ActiveCfg = Release_Broadway|Win32

-		{E9687D21-E214-4A0C-9EB4-8B38EBB783E5}.Release_Broadway|Win32.Build.0 = Release_Broadway|Win32

-		{E9687D21-E214-4A0C-9EB4-8B38EBB783E5}.Release_Broadway|x64.ActiveCfg = Release_Broadway|x64

-		{E9687D21-E214-4A0C-9EB4-8B38EBB783E5}.Release_Broadway|x64.Build.0 = Release_Broadway|x64

-		{1DF4C475-4472-4EE4-AC2B-3AB5A4C1A453}.Debug_Broadway|Win32.ActiveCfg = Debug_Broadway|Win32

-		{1DF4C475-4472-4EE4-AC2B-3AB5A4C1A453}.Debug_Broadway|Win32.Build.0 = Debug_Broadway|Win32

-		{1DF4C475-4472-4EE4-AC2B-3AB5A4C1A453}.Debug_Broadway|x64.ActiveCfg = Debug_Broadway|x64

-		{1DF4C475-4472-4EE4-AC2B-3AB5A4C1A453}.Debug_Broadway|x64.Build.0 = Debug_Broadway|x64

-		{1DF4C475-4472-4EE4-AC2B-3AB5A4C1A453}.Release_Broadway|Win32.ActiveCfg = Release_Broadway|Win32

-		{1DF4C475-4472-4EE4-AC2B-3AB5A4C1A453}.Release_Broadway|Win32.Build.0 = Release_Broadway|Win32

-		{1DF4C475-4472-4EE4-AC2B-3AB5A4C1A453}.Release_Broadway|x64.ActiveCfg = Release_Broadway|x64

-		{1DF4C475-4472-4EE4-AC2B-3AB5A4C1A453}.Release_Broadway|x64.Build.0 = Release_Broadway|x64

-		{5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8}.Debug|Win32.ActiveCfg = Debug|Win32

-		{5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8}.Debug|Win32.Build.0 = Debug|Win32

-		{5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8}.Debug|x64.ActiveCfg = Debug|x64

-		{5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8}.Debug|x64.Build.0 = Debug|x64

-		{5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8}.Release|Win32.ActiveCfg = Release|Win32

-		{5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8}.Release|Win32.Build.0 = Release|Win32

-		{5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8}.Release|x64.ActiveCfg = Release|x64

-		{5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8}.Release|x64.Build.0 = Release|x64

-		{5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8}.Debug_Broadway|Win32.ActiveCfg = Debug_Broadway|Win32

-		{5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8}.Debug_Broadway|Win32.Build.0 = Debug_Broadway|Win32

-		{5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8}.Debug_Broadway|x64.ActiveCfg = Debug_Broadway|x64

-		{5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8}.Debug_Broadway|x64.Build.0 = Debug_Broadway|x64

-		{5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8}.Release_Broadway|Win32.ActiveCfg = Release_Broadway|Win32

-		{5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8}.Release_Broadway|Win32.Build.0 = Release_Broadway|Win32

-		{5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8}.Release_Broadway|x64.ActiveCfg = Release_Broadway|x64

-		{5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8}.Release_Broadway|x64.Build.0 = Release_Broadway|x64

-		{95A4B53D-2773-4406-A2C1-8FD2840BBAD8}.Debug|Win32.ActiveCfg = Debug|Win32

-		{95A4B53D-2773-4406-A2C1-8FD2840BBAD8}.Debug|Win32.Build.0 = Debug|Win32

-		{95A4B53D-2773-4406-A2C1-8FD2840BBAD8}.Debug|x64.ActiveCfg = Debug|x64

-		{95A4B53D-2773-4406-A2C1-8FD2840BBAD8}.Debug|x64.Build.0 = Debug|x64

-		{95A4B53D-2773-4406-A2C1-8FD2840BBAD8}.Release|Win32.ActiveCfg = Release|Win32

-		{95A4B53D-2773-4406-A2C1-8FD2840BBAD8}.Release|Win32.Build.0 = Release|Win32

-		{95A4B53D-2773-4406-A2C1-8FD2840BBAD8}.Release|x64.ActiveCfg = Release|x64

-		{95A4B53D-2773-4406-A2C1-8FD2840BBAD8}.Release|x64.Build.0 = Release|x64

-		{95A4B53D-2773-4406-A2C1-8FD2840BBAD8}.Debug_Broadway|Win32.ActiveCfg = Debug|Win32

-		{95A4B53D-2773-4406-A2C1-8FD2840BBAD8}.Debug_Broadway|Win32.Build.0 = Debug|Win32

-		{95A4B53D-2773-4406-A2C1-8FD2840BBAD8}.Debug_Broadway|x64.ActiveCfg = Debug|x64

-		{95A4B53D-2773-4406-A2C1-8FD2840BBAD8}.Debug_Broadway|x64.Build.0 = Debug|x64

-		{95A4B53D-2773-4406-A2C1-8FD2840BBAD8}.Release_Broadway|Win32.ActiveCfg = Release|Win32

-		{95A4B53D-2773-4406-A2C1-8FD2840BBAD8}.Release_Broadway|Win32.Build.0 = Release|Win32

-		{95A4B53D-2773-4406-A2C1-8FD2840BBAD8}.Release_Broadway|x64.ActiveCfg = Release|x64

-		{95A4B53D-2773-4406-A2C1-8FD2840BBAD8}.Release_Broadway|x64.Build.0 = Release|x64

-		{23BBF35F-78AF-4E8C-983F-7B90448CD7DF}.Debug|Win32.ActiveCfg = Debug|Win32

-		{23BBF35F-78AF-4E8C-983F-7B90448CD7DF}.Debug|Win32.Build.0 = Debug|Win32

-		{23BBF35F-78AF-4E8C-983F-7B90448CD7DF}.Debug|x64.ActiveCfg = Debug|x64

-		{23BBF35F-78AF-4E8C-983F-7B90448CD7DF}.Debug|x64.Build.0 = Debug|x64

-		{23BBF35F-78AF-4E8C-983F-7B90448CD7DF}.Release|Win32.ActiveCfg = Release|Win32

-		{23BBF35F-78AF-4E8C-983F-7B90448CD7DF}.Release|Win32.Build.0 = Release|Win32

-		{23BBF35F-78AF-4E8C-983F-7B90448CD7DF}.Release|x64.ActiveCfg = Release|x64

-		{23BBF35F-78AF-4E8C-983F-7B90448CD7DF}.Release|x64.Build.0 = Release|x64

-		{23BBF35F-78AF-4E8C-983F-7B90448CD7DF}.Debug_Broadway|Win32.ActiveCfg = Debug_Broadway|Win32

-		{23BBF35F-78AF-4E8C-983F-7B90448CD7DF}.Debug_Broadway|Win32.Build.0 = Debug_Broadway|Win32

-		{23BBF35F-78AF-4E8C-983F-7B90448CD7DF}.Debug_Broadway|x64.ActiveCfg = Debug_Broadway|x64

-		{23BBF35F-78AF-4E8C-983F-7B90448CD7DF}.Debug_Broadway|x64.Build.0 = Debug_Broadway|x64

-		{23BBF35F-78AF-4E8C-983F-7B90448CD7DF}.Release_Broadway|Win32.ActiveCfg = Release_Broadway|Win32

-		{23BBF35F-78AF-4E8C-983F-7B90448CD7DF}.Release_Broadway|Win32.Build.0 = Release_Broadway|Win32

-		{23BBF35F-78AF-4E8C-983F-7B90448CD7DF}.Release_Broadway|x64.ActiveCfg = Release_Broadway|x64

-		{23BBF35F-78AF-4E8C-983F-7B90448CD7DF}.Release_Broadway|x64.Build.0 = Release_Broadway|x64

-		{BDAE6DE2-6BCC-4107-94F0-DA12214A02DE}.Debug|Win32.ActiveCfg = Debug|Win32

-		{BDAE6DE2-6BCC-4107-94F0-DA12214A02DE}.Debug|Win32.Build.0 = Debug|Win32

-		{BDAE6DE2-6BCC-4107-94F0-DA12214A02DE}.Debug|x64.ActiveCfg = Debug|x64

-		{BDAE6DE2-6BCC-4107-94F0-DA12214A02DE}.Debug|x64.Build.0 = Debug|x64

-		{BDAE6DE2-6BCC-4107-94F0-DA12214A02DE}.Release|Win32.ActiveCfg = Release|Win32

-		{BDAE6DE2-6BCC-4107-94F0-DA12214A02DE}.Release|Win32.Build.0 = Release|Win32

-		{BDAE6DE2-6BCC-4107-94F0-DA12214A02DE}.Release|x64.ActiveCfg = Release|x64

-		{BDAE6DE2-6BCC-4107-94F0-DA12214A02DE}.Release|x64.Build.0 = Release|x64

-		{BDAE6DE2-6BCC-4107-94F0-DA12214A02DE}.Debug_Broadway|Win32.ActiveCfg = Debug|Win32

-		{BDAE6DE2-6BCC-4107-94F0-DA12214A02DE}.Debug_Broadway|Win32.Build.0 = Debug|Win32

-		{BDAE6DE2-6BCC-4107-94F0-DA12214A02DE}.Debug_Broadway|x64.ActiveCfg = Debug|x64

-		{BDAE6DE2-6BCC-4107-94F0-DA12214A02DE}.Debug_Broadway|x64.Build.0 = Debug|x64

-		{BDAE6DE2-6BCC-4107-94F0-DA12214A02DE}.Release_Broadway|Win32.ActiveCfg = Release|Win32

-		{BDAE6DE2-6BCC-4107-94F0-DA12214A02DE}.Release_Broadway|Win32.Build.0 = Release|Win32

-		{BDAE6DE2-6BCC-4107-94F0-DA12214A02DE}.Release_Broadway|x64.ActiveCfg = Release|x64

-		{BDAE6DE2-6BCC-4107-94F0-DA12214A02DE}.Release_Broadway|x64.Build.0 = Release|x64

-		{BE6B4973-C6FF-4C8F-8E97-A47793C50F44}.Debug|Win32.ActiveCfg = Debug|Win32

-		{BE6B4973-C6FF-4C8F-8E97-A47793C50F44}.Debug|Win32.Build.0 = Debug|Win32

-		{BE6B4973-C6FF-4C8F-8E97-A47793C50F44}.Debug|x64.ActiveCfg = Debug|x64

-		{BE6B4973-C6FF-4C8F-8E97-A47793C50F44}.Debug|x64.Build.0 = Debug|x64

-		{BE6B4973-C6FF-4C8F-8E97-A47793C50F44}.Release|Win32.ActiveCfg = Release|Win32

-		{BE6B4973-C6FF-4C8F-8E97-A47793C50F44}.Release|Win32.Build.0 = Release|Win32

-		{BE6B4973-C6FF-4C8F-8E97-A47793C50F44}.Release|x64.ActiveCfg = Release|x64

-		{BE6B4973-C6FF-4C8F-8E97-A47793C50F44}.Release|x64.Build.0 = Release|x64

-		{BE6B4973-C6FF-4C8F-8E97-A47793C50F44}.Debug_Broadway|Win32.ActiveCfg = Debug|Win32

-		{BE6B4973-C6FF-4C8F-8E97-A47793C50F44}.Debug_Broadway|Win32.Build.0 = Debug|Win32

-		{BE6B4973-C6FF-4C8F-8E97-A47793C50F44}.Debug_Broadway|x64.ActiveCfg = Debug|x64

-		{BE6B4973-C6FF-4C8F-8E97-A47793C50F44}.Debug_Broadway|x64.Build.0 = Debug|x64

-		{BE6B4973-C6FF-4C8F-8E97-A47793C50F44}.Release_Broadway|Win32.ActiveCfg = Release|Win32

-		{BE6B4973-C6FF-4C8F-8E97-A47793C50F44}.Release_Broadway|Win32.Build.0 = Release|Win32

-		{BE6B4973-C6FF-4C8F-8E97-A47793C50F44}.Release_Broadway|x64.ActiveCfg = Release|x64

-		{BE6B4973-C6FF-4C8F-8E97-A47793C50F44}.Release_Broadway|x64.Build.0 = Release|x64

-		{343333C4-D46C-4C97-A986-959CCA6F1DE0}.Debug|Win32.ActiveCfg = Debug|Win32

-		{343333C4-D46C-4C97-A986-959CCA6F1DE0}.Debug|Win32.Build.0 = Debug|Win32

-		{343333C4-D46C-4C97-A986-959CCA6F1DE0}.Debug|x64.ActiveCfg = Debug|x64

-		{343333C4-D46C-4C97-A986-959CCA6F1DE0}.Debug|x64.Build.0 = Debug|x64

-		{343333C4-D46C-4C97-A986-959CCA6F1DE0}.Release|Win32.ActiveCfg = Release|Win32

-		{343333C4-D46C-4C97-A986-959CCA6F1DE0}.Release|Win32.Build.0 = Release|Win32

-		{343333C4-D46C-4C97-A986-959CCA6F1DE0}.Release|x64.ActiveCfg = Release|x64

-		{343333C4-D46C-4C97-A986-959CCA6F1DE0}.Release|x64.Build.0 = Release|x64

-		{343333C4-D46C-4C97-A986-959CCA6F1DE0}.Debug_Broadway|Win32.ActiveCfg = Debug|Win32

-		{343333C4-D46C-4C97-A986-959CCA6F1DE0}.Debug_Broadway|Win32.Build.0 = Debug|Win32

-		{343333C4-D46C-4C97-A986-959CCA6F1DE0}.Debug_Broadway|x64.ActiveCfg = Debug|x64

-		{343333C4-D46C-4C97-A986-959CCA6F1DE0}.Debug_Broadway|x64.Build.0 = Debug|x64

-		{343333C4-D46C-4C97-A986-959CCA6F1DE0}.Release_Broadway|Win32.ActiveCfg = Release|Win32

-		{343333C4-D46C-4C97-A986-959CCA6F1DE0}.Release_Broadway|Win32.Build.0 = Release|Win32

-		{343333C4-D46C-4C97-A986-959CCA6F1DE0}.Release_Broadway|x64.ActiveCfg = Release|x64

-		{343333C4-D46C-4C97-A986-959CCA6F1DE0}.Release_Broadway|x64.Build.0 = Release|x64

-		{F280BF1A-777A-4FB5-8005-DFBE04621EDB}.Debug|Win32.ActiveCfg = Debug|Win32

-		{F280BF1A-777A-4FB5-8005-DFBE04621EDB}.Debug|Win32.Build.0 = Debug|Win32

-		{F280BF1A-777A-4FB5-8005-DFBE04621EDB}.Debug|x64.ActiveCfg = Debug|x64

-		{F280BF1A-777A-4FB5-8005-DFBE04621EDB}.Debug|x64.Build.0 = Debug|x64

-		{F280BF1A-777A-4FB5-8005-DFBE04621EDB}.Release|Win32.ActiveCfg = Release|Win32

-		{F280BF1A-777A-4FB5-8005-DFBE04621EDB}.Release|Win32.Build.0 = Release|Win32

-		{F280BF1A-777A-4FB5-8005-DFBE04621EDB}.Release|x64.ActiveCfg = Release|x64

-		{F280BF1A-777A-4FB5-8005-DFBE04621EDB}.Release|x64.Build.0 = Release|x64

-		{F280BF1A-777A-4FB5-8005-DFBE04621EDB}.Debug_Broadway|Win32.ActiveCfg = Debug|Win32

-		{F280BF1A-777A-4FB5-8005-DFBE04621EDB}.Debug_Broadway|Win32.Build.0 = Debug|Win32

-		{F280BF1A-777A-4FB5-8005-DFBE04621EDB}.Debug_Broadway|x64.ActiveCfg = Debug|x64

-		{F280BF1A-777A-4FB5-8005-DFBE04621EDB}.Debug_Broadway|x64.Build.0 = Debug|x64

-		{F280BF1A-777A-4FB5-8005-DFBE04621EDB}.Release_Broadway|Win32.ActiveCfg = Release|Win32

-		{F280BF1A-777A-4FB5-8005-DFBE04621EDB}.Release_Broadway|Win32.Build.0 = Release|Win32

-		{F280BF1A-777A-4FB5-8005-DFBE04621EDB}.Release_Broadway|x64.ActiveCfg = Release|x64

-		{F280BF1A-777A-4FB5-8005-DFBE04621EDB}.Release_Broadway|x64.Build.0 = Release|x64

-		{FC98AF16-4C68-42DF-906B-93A6804C198A}.Debug|Win32.ActiveCfg = Debug|Win32

-		{FC98AF16-4C68-42DF-906B-93A6804C198A}.Debug|Win32.Build.0 = Debug|Win32

-		{FC98AF16-4C68-42DF-906B-93A6804C198A}.Debug|x64.ActiveCfg = Debug|x64

-		{FC98AF16-4C68-42DF-906B-93A6804C198A}.Debug|x64.Build.0 = Debug|x64

-		{FC98AF16-4C68-42DF-906B-93A6804C198A}.Release|Win32.ActiveCfg = Release|Win32

-		{FC98AF16-4C68-42DF-906B-93A6804C198A}.Release|Win32.Build.0 = Release|Win32

-		{FC98AF16-4C68-42DF-906B-93A6804C198A}.Release|x64.ActiveCfg = Release|x64

-		{FC98AF16-4C68-42DF-906B-93A6804C198A}.Release|x64.Build.0 = Release|x64

-		{FC98AF16-4C68-42DF-906B-93A6804C198A}.Debug_Broadway|Win32.ActiveCfg = Debug|Win32

-		{FC98AF16-4C68-42DF-906B-93A6804C198A}.Debug_Broadway|Win32.Build.0 = Debug|Win32

-		{FC98AF16-4C68-42DF-906B-93A6804C198A}.Debug_Broadway|x64.ActiveCfg = Debug|x64

-		{FC98AF16-4C68-42DF-906B-93A6804C198A}.Debug_Broadway|x64.Build.0 = Debug|x64

-		{FC98AF16-4C68-42DF-906B-93A6804C198A}.Release_Broadway|Win32.ActiveCfg = Release|Win32

-		{FC98AF16-4C68-42DF-906B-93A6804C198A}.Release_Broadway|Win32.Build.0 = Release|Win32

-		{FC98AF16-4C68-42DF-906B-93A6804C198A}.Release_Broadway|x64.ActiveCfg = Release|x64

-		{FC98AF16-4C68-42DF-906B-93A6804C198A}.Release_Broadway|x64.Build.0 = Release|x64

-		{7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Debug|Win32.ActiveCfg = Debug|Win32

-		{7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Debug|Win32.Build.0 = Debug|Win32

-		{7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Debug|x64.ActiveCfg = Debug|x64

-		{7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Debug|x64.Build.0 = Debug|x64

-		{7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Release|Win32.ActiveCfg = Release|Win32

-		{7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Release|Win32.Build.0 = Release|Win32

-		{7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Release|x64.ActiveCfg = Release|x64

-		{7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Release|x64.Build.0 = Release|x64

-		{7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Debug_Broadway|Win32.ActiveCfg = Debug|Win32

-		{7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Debug_Broadway|Win32.Build.0 = Debug|Win32

-		{7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Debug_Broadway|x64.ActiveCfg = Debug|x64

-		{7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Debug_Broadway|x64.Build.0 = Debug|x64

-		{7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Release_Broadway|Win32.ActiveCfg = Release|Win32

-		{7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Release_Broadway|Win32.Build.0 = Release|Win32

-		{7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Release_Broadway|x64.ActiveCfg = Release|x64

-		{7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}.Release_Broadway|x64.Build.0 = Release|x64

-		{9F22107A-3EF7-4B52-B269-747B65307F36}.Debug|Win32.ActiveCfg = Debug|Win32

-		{9F22107A-3EF7-4B52-B269-747B65307F36}.Debug|Win32.Build.0 = Debug|Win32

-		{9F22107A-3EF7-4B52-B269-747B65307F36}.Debug|x64.ActiveCfg = Debug|x64

-		{9F22107A-3EF7-4B52-B269-747B65307F36}.Debug|x64.Build.0 = Debug|x64

-		{9F22107A-3EF7-4B52-B269-747B65307F36}.Release|Win32.ActiveCfg = Release|Win32

-		{9F22107A-3EF7-4B52-B269-747B65307F36}.Release|Win32.Build.0 = Release|Win32

-		{9F22107A-3EF7-4B52-B269-747B65307F36}.Release|x64.ActiveCfg = Release|x64

-		{9F22107A-3EF7-4B52-B269-747B65307F36}.Release|x64.Build.0 = Release|x64

-		{9F22107A-3EF7-4B52-B269-747B65307F36}.Debug_Broadway|Win32.ActiveCfg = Debug|Win32

-		{9F22107A-3EF7-4B52-B269-747B65307F36}.Debug_Broadway|Win32.Build.0 = Debug|Win32

-		{9F22107A-3EF7-4B52-B269-747B65307F36}.Debug_Broadway|x64.ActiveCfg = Debug|x64

-		{9F22107A-3EF7-4B52-B269-747B65307F36}.Debug_Broadway|x64.Build.0 = Debug|x64

-		{9F22107A-3EF7-4B52-B269-747B65307F36}.Release_Broadway|Win32.ActiveCfg = Release|Win32

-		{9F22107A-3EF7-4B52-B269-747B65307F36}.Release_Broadway|Win32.Build.0 = Release|Win32

-		{9F22107A-3EF7-4B52-B269-747B65307F36}.Release_Broadway|x64.ActiveCfg = Release|x64

-		{9F22107A-3EF7-4B52-B269-747B65307F36}.Release_Broadway|x64.Build.0 = Release|x64

-	EndGlobalSection

-	GlobalSection(SolutionProperties) = preSolution

-		HideSolutionNode = FALSE

-	EndGlobalSection

-EndGlobal

diff --git a/build/win32/vs9/gtk-4.vcprojin b/build/win32/vs9/gtk-4.vcprojin
deleted file mode 100644
index e387d6a086..0000000000
--- a/build/win32/vs9/gtk-4.vcprojin
+++ /dev/null
@@ -1,281 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="gtk-4"
-	ProjectGUID="{95A4B53D-2773-4406-A2C1-8FD2840BBAD8}"
-	RootNamespace="gtk4"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="0"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			InheritedPropertySheets=".\gtk4-gen-srcs.vsprops"
-			ConfigurationType="2"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32"
-				PreprocessorDefinitions="_DEBUG;G_ENABLE_DEBUG;$(GtkDefines)"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="$(GtkAdditionalLibs)"
-				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				ImportLibrary="$(TargetDir)$(ProjectName).0.lib"
-				TargetMachine="1"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			InheritedPropertySheets=".\gtk4-gen-srcs.vsprops"
-			ConfigurationType="2"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32"
-				PreprocessorDefinitions="$(GtkDefines)"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="$(GtkAdditionalLibs)"
-				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				ImportLibrary="$(TargetDir)$(ProjectName).0.lib"
-				TargetMachine="1"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			InheritedPropertySheets=".\gtk4-gen-srcs.vsprops"
-			ConfigurationType="2"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32"
-				PreprocessorDefinitions="_DEBUG;G_ENABLE_DEBUG;$(GtkDefines)"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="$(GtkAdditionalLibs)"
-				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				ImportLibrary="$(TargetDir)$(ProjectName).0.lib"
-				TargetMachine="17"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			InheritedPropertySheets=".\gtk4-gen-srcs.vsprops"
-			ConfigurationType="2"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\gtk;..\..\..\gdk;..\..\..\gdk\win32"
-				PreprocessorDefinitions="$(GtkDefines)"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="$(GtkAdditionalLibs)"
-				OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				ImportLibrary="$(TargetDir)$(ProjectName).0.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"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-			<File RelativePath="..\..\..\gtk\gtkdbusinterfaces.xml">
-				<FileConfiguration Name="Debug|Win32">
-				<Tool Name="VCCustomBuildTool"
-						Description="Generating GTK+ DBus Sources..."
-						CommandLine="$(GenerateGtkDbusBuiltSources)"
-						Outputs="..\..\..\gtk\gtkdbusgenerated.c;..\..\..\gtk\gtkdbusgenerated.h"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Release|Win32">
-					<Tool Name="VCCustomBuildTool"
-						Description="Generating GTK+ DBus Sources..."
-						CommandLine="$(GenerateGtkDbusBuiltSources)"
-						Outputs="..\..\..\gtk\gtkdbusgenerated.c;..\..\..\gtk\gtkdbusgenerated.h"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Debug|x64">
-					<Tool Name="VCCustomBuildTool"
-						Description="Generating GTK+ DBus Sources..."
-						CommandLine="$(GenerateGtkDbusBuiltSourcesX64)"
-						Outputs="..\..\..\gtk\gtkdbusgenerated.c;..\..\..\gtk\gtkdbusgenerated.h"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Release|x64">
-					<Tool Name="VCCustomBuildTool"
-						Description="Generating GTK+ DBus Sources..."
-						CommandLine="$(GenerateGtkDbusBuiltSourcesX64)"
-						Outputs="..\..\..\gtk\gtkdbusgenerated.c;..\..\..\gtk\gtkdbusgenerated.h"
-					/>
-				</FileConfiguration>
-			</File>
-			<File RelativePath="..\..\..\gtk\gtk-win32.rc.body">
-				<FileConfiguration Name="Debug|Win32">
-				<Tool Name="VCCustomBuildTool"
-						Description="Copying GTK+ Win32 Version Resource..."
-						CommandLine="$(CopyGtkWin32RC)"
-						Outputs="..\..\..\gtk\gtk-win32.rc"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Release|Win32">
-					<Tool Name="VCCustomBuildTool"
-						Description="Copying GTK+ Win32 Version Resource..."
-						CommandLine="$(CopyGtkWin32RC)"
-						Outputs="..\..\..\gtk\gtk-win32.rc"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Debug|x64">
-					<Tool Name="VCCustomBuildTool"
-						Description="Copying GTK+ Win32 Version Resource..."
-						CommandLine="$(CopyGtkWin32RC)"
-						Outputs="..\..\..\gtk\gtk-win32.rc"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Release|x64">
-					<Tool Name="VCCustomBuildTool"
-						Description="Copying GTK+ Win32 Version Resource..."
-						CommandLine="$(CopyGtkWin32RC)"
-						Outputs="..\..\..\gtk\gtk-win32.rc"
-					/>
-				</FileConfiguration>
-			</File>
-			<File RelativePath="..\..\..\gtk\libgtk4.manifest.in">
-				<FileConfiguration Name="Debug|Win32">
-				<Tool Name="VCCustomBuildTool"
-						Description="Generating GTK+ Win32 Manifest..."
-						CommandLine="$(GenerateGtkWin32Manifest)"
-						Outputs="..\..\..\gtk\libgtk4.manifest"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Release|Win32">
-					<Tool Name="VCCustomBuildTool"
-						Description="Generating GTK+ Win32 Manifest..."
-						CommandLine="$(GenerateGtkWin32Manifest)"
-						Outputs="..\..\..\gtk\libgtk4.manifest"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Debug|x64">
-					<Tool Name="VCCustomBuildTool"
-						Description="Generating GTK+ Win32 Manifest..."
-						CommandLine="$(GenerateGtkWin32Manifest)"
-						Outputs="..\..\..\gtk\libgtk4.manifest"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Release|x64">
-					<Tool Name="VCCustomBuildTool"
-						Description="Generating GTK+ Win32 Manifest..."
-						CommandLine="$(GenerateGtkWin32Manifest)"
-						Outputs="..\..\..\gtk\libgtk4.manifest"
-					/>
-				</FileConfiguration>
-			</File>
-			<File RelativePath="..\..\..\gtk\gtk-win32.rc" />
-			<File RelativePath="..\..\..\gtk\libgtk4.manifest" />
-		</Filter>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-#include "gtk-4.sourcefiles"
-			<File RelativePath="..\..\..\modules\input\gtkimcontextime.c" />
-			<File RelativePath="..\..\..\modules\input\gtkimcontextmultipress.c" />
-			<File RelativePath="..\..\..\modules\input\gtkimcontextthai.c" />
-			<File RelativePath="..\..\..\modules\input\imam-et.c" />
-			<File RelativePath="..\..\..\modules\input\imcedilla.c" />
-			<File RelativePath="..\..\..\modules\input\imcyrillic-translit.c" />
-			<File RelativePath="..\..\..\modules\input\imime.c" />
-			<File RelativePath="..\..\..\modules\input\iminuktitut.c" />
-			<File RelativePath="..\..\..\modules\input\imipa.c" />
-			<File RelativePath="..\..\..\modules\input\immultipress.c" />
-			<File RelativePath="..\..\..\modules\input\imthai.c" />
-			<File RelativePath="..\..\..\modules\input\imti-er.c" />
-			<File RelativePath="..\..\..\modules\input\imti-et.c" />
-			<File RelativePath="..\..\..\modules\input\imviqr.c" />
-			<File RelativePath="..\..\..\modules\input\thai-charprop.c" />
-		</Filter>
-	</Files>
-</VisualStudioProject>
diff --git a/build/win32/vs9/gtk-builder-tool.vcproj b/build/win32/vs9/gtk-builder-tool.vcproj
deleted file mode 100644
index e4c3127c15..0000000000
--- a/build/win32/vs9/gtk-builder-tool.vcproj
+++ /dev/null
@@ -1,172 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="gtk-builder-tool"
-	ProjectGUID="{7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}"
-	RootNamespace="gtkbuildertool"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="196613"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			InheritedPropertySheets=".\gtk4-build-defines.vsprops"
-			ConfigurationType="1"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="_DEBUG"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				TargetMachine="1"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			InheritedPropertySheets=".\gtk4-build-defines.vsprops"
-			ConfigurationType="1"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				PreprocessorDefinitions=""
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			InheritedPropertySheets=".\gtk4-build-defines.vsprops"
-			ConfigurationType="1"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories=""
-				PreprocessorDefinitions="_DEBUG"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies=""
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				TargetMachine="17"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			InheritedPropertySheets=".\gtk4-build-defines.vsprops"
-			ConfigurationType="1"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				AdditionalIncludeDirectories=""
-				EnableIntrinsicFunctions="true"
-				PreprocessorDefinitions=""
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies=""
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="17"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Sources"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File RelativePath="..\..\..\gtk\gtk-builder-tool.c" />
-		</Filter>
-		<Filter
-			Name="Headers"
-			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}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/build/win32/vs9/gtk-encode-symbolic-svg.vcproj b/build/win32/vs9/gtk-encode-symbolic-svg.vcproj
deleted file mode 100644
index 70c6849563..0000000000
--- a/build/win32/vs9/gtk-encode-symbolic-svg.vcproj
+++ /dev/null
@@ -1,176 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="gtk-encode-symbolic-svg"
-	ProjectGUID="{F280BF1A-777A-4FB5-8005-DFBE04621EDB}"
-	RootNamespace="gtkencodesymbolicsvg"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="196613"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			InheritedPropertySheets=".\gtk4-build-defines.vsprops"
-			ConfigurationType="1"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\gdk"
-				PreprocessorDefinitions="_DEBUG"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies=""
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				TargetMachine="1"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			InheritedPropertySheets=".\gtk4-build-defines.vsprops"
-			ConfigurationType="1"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				AdditionalIncludeDirectories="..\..\..\gdk"
-				EnableIntrinsicFunctions="true"
-				PreprocessorDefinitions=""
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies=""
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			InheritedPropertySheets=".\gtk4-build-defines.vsprops"
-			ConfigurationType="1"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\gdk"
-				PreprocessorDefinitions="_DEBUG"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies=""
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				TargetMachine="17"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			InheritedPropertySheets=".\gtk4-build-defines.vsprops"
-			ConfigurationType="1"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				AdditionalIncludeDirectories="..\..\..\gdk"
-				EnableIntrinsicFunctions="true"
-				PreprocessorDefinitions=""
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies=""
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="17"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Sources"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File RelativePath="..\..\..\gtk\encodesymbolic.c" />
-		</Filter>
-		<Filter
-			Name="Headers"
-			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}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/build/win32/vs9/gtk-query-settings.vcproj b/build/win32/vs9/gtk-query-settings.vcproj
deleted file mode 100644
index 9e734a16c8..0000000000
--- a/build/win32/vs9/gtk-query-settings.vcproj
+++ /dev/null
@@ -1,172 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="gtk-query-settings"
-	ProjectGUID="{9F22107A-3EF7-4B52-B269-747B65307F36}"
-	RootNamespace="gtkquerysettings"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="196613"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			InheritedPropertySheets=".\gtk4-build-defines.vsprops"
-			ConfigurationType="1"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="_DEBUG"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				TargetMachine="1"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			InheritedPropertySheets=".\gtk4-build-defines.vsprops"
-			ConfigurationType="1"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				PreprocessorDefinitions=""
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			InheritedPropertySheets=".\gtk4-build-defines.vsprops"
-			ConfigurationType="1"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories=""
-				PreprocessorDefinitions="_DEBUG"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies=""
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				TargetMachine="17"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			InheritedPropertySheets=".\gtk4-build-defines.vsprops"
-			ConfigurationType="1"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				AdditionalIncludeDirectories=""
-				EnableIntrinsicFunctions="true"
-				PreprocessorDefinitions=""
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies=""
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="17"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Sources"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File RelativePath="..\..\..\gtk\gtk-query-settings.c" />
-		</Filter>
-		<Filter
-			Name="Headers"
-			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}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/build/win32/vs9/gtk-update-icon-cache.vcproj b/build/win32/vs9/gtk-update-icon-cache.vcproj
deleted file mode 100644
index 1b1ff483f3..0000000000
--- a/build/win32/vs9/gtk-update-icon-cache.vcproj
+++ /dev/null
@@ -1,172 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="gtk-update-icon-cache"
-	ProjectGUID="{FC98AF16-4C68-42DF-906B-93A6804C198A}"
-	RootNamespace="gtkupdateiconcache"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="196613"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			InheritedPropertySheets=".\gtk4-build-defines.vsprops"
-			ConfigurationType="1"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="_DEBUG"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				TargetMachine="1"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			InheritedPropertySheets=".\gtk4-build-defines.vsprops"
-			ConfigurationType="1"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				PreprocessorDefinitions=""
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			InheritedPropertySheets=".\gtk4-build-defines.vsprops"
-			ConfigurationType="1"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories=""
-				PreprocessorDefinitions="_DEBUG"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies=""
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				TargetMachine="17"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			InheritedPropertySheets=".\gtk4-build-defines.vsprops"
-			ConfigurationType="1"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				AdditionalIncludeDirectories=""
-				EnableIntrinsicFunctions="true"
-				PreprocessorDefinitions=""
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies=""
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="17"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Sources"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File RelativePath="..\..\..\gtk\updateiconcache.c" />
-		</Filter>
-		<Filter
-			Name="Headers"
-			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}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/build/win32/vs9/gtk4-build-defines.vsprops b/build/win32/vs9/gtk4-build-defines.vsprops
deleted file mode 100644
index a7f338170a..0000000000
--- a/build/win32/vs9/gtk4-build-defines.vsprops
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="gtk4builddefinesprops"
-	OutputDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin"
-	IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\obj\$(ProjectName)\"
-	InheritedPropertySheets=".\gtk4-version-paths.vsprops"
-	>
-	<Tool
-		Name="VCCLCompilerTool"
-		AdditionalIncludeDirectories="..\..\..;$(GlibEtcInstallRoot)\include\gdk-pixbuf-2.0;$(GlibEtcInstallRoot)\include\pango-1.0;$(GlibEtcInstallRoot)\include\atk-1.0;$(GlibEtcInstallRoot)\include\cairo;$(GlibEtcInstallRoot)\include\gio-win32-2.0;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include"
-		PreprocessorDefinitions="HAVE_CONFIG_H;G_DISABLE_SINGLE_INCLUDES;ATK_DISABLE_SINGLE_INCLUDES;GDK_PIXBUF_DISABLE_SINGLE_INCLUDES;GTK_DISABLE_SINGLE_INCLUDES;_USE_MATH_DEFINES"
-		ForcedIncludeFiles="msvc_recommended_pragmas.h"
-		AdditionalOptions="/MP"
-	/>
-	<Tool
-		Name="VCLinkerTool"
-		AdditionalDependencies="gdk_pixbuf-2.0.lib pangocairo-1.0.lib pango-1.0.lib cairo-gobject.lib cairo.lib gio-2.0.lib gmodule-2.0.lib gobject-2.0.lib glib-2.0.lib intl.lib epoxy.lib"
-		AdditionalLibraryDirectories="$(GlibEtcInstallRoot)\lib"
-	/>
-	<UserMacro
-		Name="GtkBinaryVersion"
-		Value="4.0.0"
-	/>
-	<UserMacro
-		Name="GtkDummyPrefix"
-		Value="/dummy"
-	/>
-	<UserMacro
-		Name="GtkPrefixDefine"
-		Value="GTK_PREFIX=\&quot;$(GtkDummyPrefix)\&quot;"
-	/>
-	<UserMacro
-		Name="GdkDefines"
-		Value="GDK_COMPILATION;G_LOG_DOMAIN=\&quot;Gdk\&quot;"
-	/>
-	<UserMacro
-		Name="GtkIncludedImmodulesDefines"
-		Value="INCLUDE_IM_am_et;INCLUDE_IM_cedilla;INCLUDE_IM_cyrillic_translit;INCLUDE_IM_ime;INCLUDE_IM_inuktitut;INCLUDE_IM_ipa;INCLUDE_IM_multipress;INCLUDE_IM_thai;INCLUDE_IM_ti_er;INCLUDE_IM_ti_et;INCLUDE_IM_viqr"
-	/>
-	<UserMacro
-		Name="GtkDefines"
-		Value="GTK_COMPILATION;G_LOG_DOMAIN=\&quot;Gtk\&quot;;GTK_HOST=\&quot;i686-pc-vs$(VSVer)\&quot;;GTK_PRINT_BACKENDS=\&quot;file\&quot;;GTK_PRINT_BACKEND_ENABLE_UNSUPPORTED;$(GtkIncludedImmodulesDefines);GTK_LIBDIR=\&quot;$(GtkDummyPrefix)/lib\&quot;;GTK_DATADIR=\&quot;$(GtkDummyPrefix)/share\&quot;GTK_DATA_PREFIX=\&quot;$(GtkDummyPrefix)\&quot;;GTK_SYSCONFDIR=\&quot;$(GtkDummyPrefix)/etc\&quot;;MULTIPRESS_CONFDIR=\&quot;$(GtkDummyPrefix)/etc/gtk-$(ApiVersion)\&quot;;MULTIPRESS_LOCALEDIR=\&quot;$(GtkDummyPrefix)/share/locale\&quot;;GTK_VERSION=\&quot;$(GtkVersion)/etc\&quot;;GTK_BINARY_VERSION=\&quot;$(GtkBinaryVersion)/etc\&quot;;GDK_DISABLE_DEPRECATED;ISOLATION_AWARE_ENABLED"
-	/>
-	<UserMacro
-		Name="GtkGdkCommonLibs"
-		Value="imm32.lib"
-	/>
-	<UserMacro
-		Name="GdkBroadwayAdditionalLibs"
-		Value="ws2_32.lib"
-	/>
-	<UserMacro
-		Name="GdkAdditionalLibs"
-		Value="winmm.lib dwmapi.lib setupapi.lib $(GtkGdkCommonLibs)"
-	/>
-	<UserMacro
-		Name="GtkAdditionalLibs"
-		Value="atk-1.0.lib pangowin32-1.0.lib winspool.lib comctl32.lib $(GtkGdkCommonLibs)"
-	/>
-</VisualStudioPropertySheet>
diff --git a/build/win32/vs9/gtk4-copy-gdk-broadway.vsprops b/build/win32/vs9/gtk4-copy-gdk-broadway.vsprops
deleted file mode 100644
index 81831a032d..0000000000
--- a/build/win32/vs9/gtk4-copy-gdk-broadway.vsprops
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="gtk4copygdkbroadwayprops"
-	InheritedPropertySheets=".\gtk4-build-defines.vsprops"
-	>
-	<Tool
-		Name="VCLinkerTool"
-		AdditionalOptions="/EXPORT:gdk_win32_display_manager_get_type"
-	/>
-	<Tool
-		Name="VCPostBuildEventTool"
-		CommandLine="
-if &quot;$(ConfigurationName)&quot; == &quot;Release_Broadway&quot; goto DoRelease&#x0D;&#x0A;
-if &quot;$(ConfigurationName)&quot; == &quot;Debug_Broadway&quot; goto DoDebug&#x0D;&#x0A;
-
-:DoRelease&#x0D;&#x0A;
-mkdir .\Release\$(PlatformName)\bin&#x0D;&#x0A;
-copy /b $(ConfigurationName)\$(PlatformName)\bin\$(GtkDllPrefix)gdk$(GtkDllSuffix).dll .\Release\$(PlatformName)\bin\&#x0D;&#x0A;
-copy /b $(ConfigurationName)\$(PlatformName)\bin\gdk-$(ApiVersion).lib .\Release\$(PlatformName)\bin\&#x0D;&#x0A;
-goto END&#x0D;&#x0A;
-
-:DoDebug&#x0D;&#x0A;
-mkdir .\Debug\$(PlatformName)\bin&#x0D;&#x0A;
-copy /b $(ConfigurationName)\$(PlatformName)\bin\$(GtkDllPrefix)gdk$(GtkDllSuffix).dll .\Debug\$(PlatformName)\bin\&#x0D;&#x0A;
-copy /b $(ConfigurationName)\$(PlatformName)\bin\gdk-$(ApiVersion).lib .\Debug\$(PlatformName)\bin\&#x0D;&#x0A;
-goto END&#x0D;&#x0A;
-
-:END&#x0D;&#x0A;
-"
-	/>
-</VisualStudioPropertySheet>
diff --git a/build/win32/vs9/gtk4-demo-application.vcprojin b/build/win32/vs9/gtk4-demo-application.vcprojin
deleted file mode 100644
index 5b173d8dd1..0000000000
--- a/build/win32/vs9/gtk4-demo-application.vcprojin
+++ /dev/null
@@ -1,168 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="gtk4-demo-application"
-	ProjectGUID="{BE6B4973-C6FF-4C8F-8E97-A47793C50F44}"
-	RootNamespace="gtk4demoapplication"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="196613"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			InheritedPropertySheets=".\gtk4-build-defines.vsprops"
-			ConfigurationType="1"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="_DEBUG"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				TargetMachine="1"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			InheritedPropertySheets=".\gtk4-build-defines.vsprops"
-			ConfigurationType="1"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				PreprocessorDefinitions=""
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			InheritedPropertySheets=".\gtk4-build-defines.vsprops"
-			ConfigurationType="1"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="_DEBUG"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				TargetMachine="17"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			InheritedPropertySheets=".\gtk4-build-defines.vsprops"
-			ConfigurationType="1"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				PreprocessorDefinitions=""
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="17"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Sources"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-#include "gtk4-demo-application.sourcefiles"
-		</Filter>
-		<Filter
-			Name="Headers"
-			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}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/build/win32/vs9/gtk4-demo.vcprojin b/build/win32/vs9/gtk4-demo.vcprojin
deleted file mode 100644
index 45baf16e5d..0000000000
--- a/build/win32/vs9/gtk4-demo.vcprojin
+++ /dev/null
@@ -1,174 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="gtk4-demo"
-	ProjectGUID="{BDAE6DE2-6BCC-4107-94F0-DA12214A02DE}"
-	RootNamespace="gtk4demo"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			ConfigurationType="1"
-			InheritedPropertySheets=".\gtk4-build-defines.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gtk"
-				PreprocessorDefinitions="_DEBUG;$(GtkPrefixDefine)"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies=""
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			ConfigurationType="1"
-			InheritedPropertySheets=".\gtk4-build-defines.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gtk"
-				PreprocessorDefinitions="_DEBUG;$(GtkPrefixDefine)"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies=""
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			ConfigurationType="1"
-			InheritedPropertySheets=".\gtk4-build-defines.vsprops"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gtk"
-				PreprocessorDefinitions="$(GtkPrefixDefine)"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies=""
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			ConfigurationType="1"
-			InheritedPropertySheets=".\gtk4-build-defines.vsprops"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\gtk"
-				PreprocessorDefinitions="$(GtkPrefixDefine)"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies=""
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-#include "gtk4-demo.sourcefiles"
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/build/win32/vs9/gtk4-gen-srcs.vsprops b/build/win32/vs9/gtk4-gen-srcs.vsprops
deleted file mode 100644
index 1014e2ee36..0000000000
--- a/build/win32/vs9/gtk4-gen-srcs.vsprops
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="gtk4gensrcsprops"
-	InheritedPropertySheets=".\gtk4-build-defines.vsprops"
-	>
-	<UserMacro
-		Name="GenConfigH"
-		Value="
-copy ..\..\..\config.h.win32 ..\..\..\config.h
-		      "
-	/>
-	<UserMacro
-		Name="GenGdkConfigHWin32"
-		Value="
-if exist ..\..\..\MSVC_$(ConfigurationName) goto DONE_GDKCONFIG_H&#x0D;&#x0A;
-
-if exist ..\..\..\gdk\gdkconfig.h del ..\..\..\gdk\gdkconfig.h&#x0D;&#x0A;
-if exist ..\..\..\GDK_BROADWAY_BUILD del ..\..\..\GDK_BROADWAY_BUILD&#x0D;&#x0A;
-if exist ..\..\..\MSVC_$(ConfigurationName)_Broadway del ..\..\..\MSVC_$(ConfigurationName)_Broadway&#x0D;&#x0A;
-
-if exist $(ConfigurationName)\$(PlatformName)\bin\$(GtkDllPrefix)gdk$(GtkDllSuffix).dll del $(ConfigurationName)\$(PlatformName)\bin\$(GtkDllPrefix)gdk$(GtkDllSuffix).dll&#x0D;&#x0A;
-if exist $(ConfigurationName)\$(PlatformName)\bin\gdk-$(ApiVersion).lib del $(ConfigurationName)\$(PlatformName)\bin\gdk-$(ApiVersion).lib&#x0D;&#x0A;
-
-if &quot;$(ConfigurationName)&quot; == &quot;Release&quot; del ..\..\..\MSVC_Debug&#x0D;&#x0A;
-if &quot;$(ConfigurationName)&quot; == &quot;Debug&quot; del ..\..\..\MSVC_Release&#x0D;&#x0A;
-
-copy ..\..\..\gdk\gdkconfig.h.win32 ..\..\..\gdk\gdkconfig.h&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkconfig.h.win32 ..\..\..\GDK_WIN32ONLY_BUILD&#x0D;&#x0A;
-
-echo $(ConfigurationName) &gt; ..\..\..\MSVC_$(ConfigurationName)&#x0D;&#x0A;
-:DONE_GDKCONFIG_H&#x0D;&#x0A;
-		      "
-	/>
-	<UserMacro
-		Name="GenGdkConfigHBroadway"
-		Value="
-if exist ..\..\..\MSVC_$(ConfigurationName)_Broadway goto DONE_GDKCONFIG_H&#x0D;&#x0A;
-
-if exist ..\..\..\gdk\gdkconfig.h del ..\..\..\gdk\gdkconfig.h&#x0D;&#x0A;
-if exist ..\..\..\GDK_WIN32ONLY_BUILD del ..\..\..\GDK_WIN32ONLY_BUILD&#x0D;&#x0A;
-
-if exist ..\..\..\MSVC_Release del ..\..\..\MSVC_Release&#x0D;&#x0A;
-if exist ..\..\..\MSVC_Debug del ..\..\..\MSVC_Debug&#x0D;&#x0A;
-
-if &quot;$(ConfigurationName)&quot; == &quot;Release_Broadway&quot; del ..\..\..\MSVC_Debug_Broadway&#x0D;&#x0A;
-if &quot;$(ConfigurationName)&quot; == &quot;Debug_Broadway&quot; del ..\..\..\MSVC_Release_Broadway&#x0D;&#x0A;
-
-copy ..\..\..\gdk\gdkconfig.h.win32_broadway ..\..\..\gdk\gdkconfig.h&#x0D;&#x0A;
-copy ..\..\..\gdk\gdkconfig.h.win32_broadway ..\..\..\GDK_BROADWAY_BUILD&#x0D;&#x0A;
-
-echo $(ConfigurationName) &gt; ..\..\..\MSVC_$(ConfigurationName)_Broadway&#x0D;&#x0A;
-:DONE_GDKCONFIG_H&#x0D;&#x0A;
-		      "
-	/>
-	<UserMacro
-		Name="GDbusCodeGenCmd"
-		Value="$(GlibEtcInstallRoot)\bin\gdbus-codegen --interface-prefix org.Gtk. --c-namespace _Gtk --generate-c-code gtkdbusgenerated ./gtkdbusinterfaces.xml"
-	/>
-	<UserMacro
-		Name="GenerateGtkDbusBuiltSources"
-		Value="cd ..\..\..\gtk &amp; $(PythonPath)\python $(GDbusCodeGenCmd) &amp; cd $(SolutionDir)"
-	/>
-	<UserMacro
-		Name="GenerateGtkDbusBuiltSourcesX64"
-		Value="cd ..\..\..\gtk &amp; $(PythonPathX64)\python $(GDbusCodeGenCmd) &amp; cd $(SolutionDir)"
-	/>
-	<UserMacro
-		Name="CopyGtkWin32RC"
-		Value="copy ..\..\..\gtk\gtk-win32.rc.body ..\..\..\gtk\gtk-win32.rc"
-	/>
-	<UserMacro
-		Name="GenerateGtkWin32Manifest"
-		Value="$(PythonPath)\python ..\replace.py --action=replace-var --input=..\..\..\gtk\libgtk4.manifest.in --output=..\..\..\gtk\libgtk4.manifest --var=EXE_MANIFEST_ARCHITECTURE --outstring=*"
-	/>
-	<UserMacro
-		Name="CopyDemosH"
-		Value="copy ..\..\..\demos\gtk-demo\demos.h.win32 ..\..\..\demos\gtk-demo\demos.h"
-	/>
-</VisualStudioPropertySheet>
diff --git a/build/win32/vs9/gtk4-icon-browser.vcprojin b/build/win32/vs9/gtk4-icon-browser.vcprojin
deleted file mode 100644
index 8f031ab002..0000000000
--- a/build/win32/vs9/gtk4-icon-browser.vcprojin
+++ /dev/null
@@ -1,176 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="gtk4-icon-browser"
-	ProjectGUID="{343333C4-D46C-4C97-A986-959CCA6F1DE0}"
-	RootNamespace="gtk4iconbrowser"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="196613"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			InheritedPropertySheets=".\gtk4-build-defines.vsprops"
-			ConfigurationType="1"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\demos\icon-browser"
-				PreprocessorDefinitions="_DEBUG"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies=""
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				TargetMachine="1"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			InheritedPropertySheets=".\gtk4-build-defines.vsprops"
-			ConfigurationType="1"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\demos\icon-browser"
-				EnableIntrinsicFunctions="true"
-				PreprocessorDefinitions=""
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies=""
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			InheritedPropertySheets=".\gtk4-build-defines.vsprops"
-			ConfigurationType="1"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\demos\icon-browser"
-				PreprocessorDefinitions="_DEBUG"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies=""
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				TargetMachine="17"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			InheritedPropertySheets=".\gtk4-build-defines.vsprops"
-			ConfigurationType="1"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				AdditionalIncludeDirectories="..\..\..\gdk;..\..\..\demos\icon-browser"
-				EnableIntrinsicFunctions="true"
-				PreprocessorDefinitions=""
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies=""
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="17"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Sources"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-#include "gtk4-icon-browser.sourcefiles"
-		</Filter>
-		<Filter
-			Name="Headers"
-			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}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/build/win32/vs9/gtk4-ignore-broadway.vsprops b/build/win32/vs9/gtk4-ignore-broadway.vsprops
deleted file mode 100644
index 42051665e2..0000000000
--- a/build/win32/vs9/gtk4-ignore-broadway.vsprops
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="gtk4ignorebroadwayprops"
-	InheritedPropertySheets=".\gtk4-build-defines.vsprops"
-	>
-	<Tool
-		Name="VCLinkerTool"
-		LinkLibraryDependencies="false"
-		AdditionalDependencies="$(OutDir)\gdk4-win32.lib"
-		AdditionalOptions="/EXPORT:gdk_win32_display_manager_get_type"
-	/>
-</VisualStudioPropertySheet>
diff --git a/build/win32/vs9/gtk4-install.vcproj b/build/win32/vs9/gtk4-install.vcproj
deleted file mode 100644
index 5dd4eabe6f..0000000000
--- a/build/win32/vs9/gtk4-install.vcproj
+++ /dev/null
@@ -1,204 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="gtk4-install"
-	ProjectGUID="{23BBF35F-78AF-4E8C-983F-7B90448CD7DF}"
-	RootNamespace="gtk4install"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(GlibEtcInstallRoot)"
-			ConfigurationType="10"
-			InheritedPropertySheets=".\gtk4-install.vsprops"
-			CharacterSet="2"
-			DeleteExtensionsOnClean=""
-			>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="$(GtkDoInstallBin)$(GtkDoInstall)$(GtkPostInstall)"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(GlibEtcInstallRoot)"
-			ConfigurationType="10"
-			InheritedPropertySheets=".\gtk4-install.vsprops"
-			CharacterSet="2"
-			DeleteExtensionsOnClean=""
-			>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="$(GtkDoInstallBin)$(GtkDoInstall)$(GtkPostInstall)"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug_Broadway|Win32"
-			OutputDirectory="$(GlibEtcInstallRoot)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="10"
-			InheritedPropertySheets=".\gtk4-install.vsprops"
-			CharacterSet="2"
-			DeleteExtensionsOnClean=""
-			>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="$(GtkDoInstallBin)$(GtkDoInstall)$(GtkDoInstallBroadwayHeaders)$(GtkPostInstall)"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug_Broadway|x64"
-			OutputDirectory="$(GlibEtcInstallRoot)"
-			ConfigurationType="10"
-			InheritedPropertySheets=".\gtk4-install.vsprops"
-			CharacterSet="2"
-			DeleteExtensionsOnClean=""
-			>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="$(GtkDoInstallBin)$(GtkDoInstall)$(GtkDoInstallBroadwayHeaders)$(GtkPostInstall)"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(GlibEtcInstallRoot)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="10"
-			InheritedPropertySheets=".\gtk4-install.vsprops"
-			CharacterSet="2"
-			DeleteExtensionsOnClean=""
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="$(GtkDoInstallBin)$(GtkDoInstall)$(GtkPostInstall)"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(GlibEtcInstallRoot)"
-			ConfigurationType="10"
-			InheritedPropertySheets=".\gtk4-install.vsprops"
-			CharacterSet="2"
-			DeleteExtensionsOnClean=""
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="$(GtkDoInstallBin)$(GtkDoInstall)$(GtkPostInstall)"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release_Broadway|Win32"
-			OutputDirectory="$(GlibEtcInstallRoot)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="10"
-			InheritedPropertySheets=".\gtk4-install.vsprops"
-			CharacterSet="2"
-			DeleteExtensionsOnClean=""
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="$(GtkDoInstallBin)$(GtkDoInstall)$(GtkDoInstallBroadwayHeaders)$(GtkPostInstall)"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release_Broadway|x64"
-			OutputDirectory="$(GlibEtcInstallRoot)"
-			ConfigurationType="10"
-			InheritedPropertySheets=".\gtk4-install.vsprops"
-			CharacterSet="2"
-			DeleteExtensionsOnClean=""
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="$(GtkDoInstallBin)$(GtkDoInstall)$(GtkDoInstallBroadwayHeaders)$(GtkPostInstall)"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-			<File RelativePath="..\..\..\gtkpc.py">
-				<FileConfiguration Name="Debug|Win32">
-					<Tool Name="VCCustomBuildTool"
-						Description="Generating .pc files..."
-						CommandLine="$(GenerateGtkPC)"
-						Outputs="..\gdk-4.0.pc;..\gtk+-4.0.pc;..\gail-4.0.pc"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Release|Win32">
-					<Tool Name="VCCustomBuildTool"
-						Description="Generating .pc files..."
-						CommandLine="$(GenerateGtkPC)"
-						Outputs="..\gdk-4.0.pc;..\gtk+-4.0.pc;..\gail-4.0.pc"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Debug|x64">
-					<Tool Name="VCCustomBuildTool"
-						Description="Generating .pc files..."
-						CommandLine="$(GenerateGtkPCX64)"
-						Outputs="..\gdk-4.0.pc;..\gtk+-4.0.pc;..\gail-4.0.pc"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Release|x64">
-					<Tool Name="VCCustomBuildTool"
-						Description="Generating .pc files..."
-						CommandLine="$(GenerateGtkPCX64)"
-						Outputs="..\gdk-4.0.pc;..\gtk+-4.0.pc;..\gail-4.0.pc"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Debug_Broadway|Win32">
-					<Tool Name="VCCustomBuildTool"
-						Description="Generating .pc files..."
-						CommandLine="$(GenerateGtkPC) --broadway"
-						Outputs="..\gdk-4.0.pc;..\gtk+-4.0.pc;..\gail-4.0.pc"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Release_Broadway|Win32">
-					<Tool Name="VCCustomBuildTool"
-						Description="Generating .pc files..."
-						CommandLine="$(GenerateGtkPC) --broadway"
-						Outputs="..\gdk-4.0.pc;..\gtk+-4.0.pc;..\gail-4.0.pc"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Debug_Broadway|x64">
-					<Tool Name="VCCustomBuildTool"
-						Description="Generating .pc files..."
-						CommandLine="$(GenerateGtkPCX64) --broadway"
-						Outputs="..\gdk-4.0.pc;..\gtk+-4.0.pc;..\gail-4.0.pc"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Release_Broadway|x64">
-					<Tool Name="VCCustomBuildTool"
-						Description="Generating .pc files..."
-						CommandLine="$(GenerateGtkPCX64) --broadway"
-						Outputs="..\gdk-4.0.pc;..\gtk+-4.0.pc;..\gail-4.0.pc"
-					/>
-				</FileConfiguration>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/build/win32/vs9/gtk4-install.vspropsin b/build/win32/vs9/gtk4-install.vspropsin
deleted file mode 100644
index afeedb1929..0000000000
--- a/build/win32/vs9/gtk4-install.vspropsin
+++ /dev/null
@@ -1,154 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="gtkinstallprops"
-	InheritedPropertySheets=".\gtk4-build-defines.vsprops"
-	>
-	<UserMacro
-		Name="GtkDoInstallBin"
-		Value="
-mkdir $(CopyDir)\bin&#x0D;&#x0A;
-mkdir $(CopyDir)\lib\pkgconfig&#x0D;&#x0A;
-
-copy $(ConfigurationName)\$(PlatformName)\bin\$(GtkDllPrefix)gdk-4$(GtkDllSuffix).dll $(CopyDir)\bin&#x0D;&#x0A;
-copy $(ConfigurationName)\$(PlatformName)\bin\$(GtkDllPrefix)gdk-4$(GtkDllSuffix).pdb $(CopyDir)\bin&#x0D;&#x0A;
-copy $(ConfigurationName)\$(PlatformName)\bin\gdk-$(ApiVersion).lib $(CopyDir)\lib&#x0D;&#x0A;
-
-if &quot;$(ConfigurationName)&quot; == &quot;Release_Broadway&quot; goto DO_BROADWAY_BIN&#x0D;&#x0A;
-if &quot;$(ConfigurationName)&quot; == &quot;Debug_Broadway&quot; goto DO_BROADWAY_BIN&#x0D;&#x0A;
-copy $(ConfigurationName)\$(PlatformName)\bin\$(GtkDllPrefix)gtk-4$(GtkDllSuffix).dll $(CopyDir)\bin&#x0D;&#x0A;
-copy $(ConfigurationName)\$(PlatformName)\bin\$(GtkDllPrefix)gtk-4$(GtkDllSuffix).pdb $(CopyDir)\bin&#x0D;&#x0A;
-copy $(ConfigurationName)\$(PlatformName)\bin\gtk-$(ApiVersion).lib $(CopyDir)\lib&#x0D;&#x0A;
-copy $(ConfigurationName)\$(PlatformName)\bin\gailutil-$(ApiVersion).lib $(CopyDir)\lib&#x0D;&#x0A;
-copy $(ConfigurationName)\$(PlatformName)\bin\gtk4-demo.exe $(CopyDir)\bin&#x0D;&#x0A;
-copy $(ConfigurationName)\$(PlatformName)\bin\gtk4-demo.pdb $(CopyDir)\bin&#x0D;&#x0A;
-copy $(ConfigurationName)\$(PlatformName)\bin\gtk4-demo-application.exe $(CopyDir)\bin&#x0D;&#x0A;
-copy $(ConfigurationName)\$(PlatformName)\bin\gtk4-demo-application.pdb $(CopyDir)\bin&#x0D;&#x0A;
-copy $(ConfigurationName)\$(PlatformName)\bin\gtk4-icon-browser.exe $(CopyDir)\bin&#x0D;&#x0A;
-copy $(ConfigurationName)\$(PlatformName)\bin\gtk4-icon-browser.pdb $(CopyDir)\bin&#x0D;&#x0A;
-copy $(ConfigurationName)\$(PlatformName)\bin\gtk-encode-symbolic-svg.exe $(CopyDir)\bin&#x0D;&#x0A;
-copy $(ConfigurationName)\$(PlatformName)\bin\gtk-encode-symbolic-svg.pdb $(CopyDir)\bin&#x0D;&#x0A;
-copy $(ConfigurationName)\$(PlatformName)\bin\gtk-update-icon-cache.exe $(CopyDir)\bin&#x0D;&#x0A;
-copy $(ConfigurationName)\$(PlatformName)\bin\gtk-update-icon-cache.pdb $(CopyDir)\bin&#x0D;&#x0A;
-copy $(ConfigurationName)\$(PlatformName)\bin\gtk-query-settings.exe $(CopyDir)\bin&#x0D;&#x0A;
-copy $(ConfigurationName)\$(PlatformName)\bin\gtk-query-settings.pdb $(CopyDir)\bin&#x0D;&#x0A;
-copy $(ConfigurationName)\$(PlatformName)\bin\gtk-builder-tool.exe $(CopyDir)\bin&#x0D;&#x0A;
-copy $(ConfigurationName)\$(PlatformName)\bin\gtk-builder-tool.pdb $(CopyDir)\bin&#x0D;&#x0A;
-goto DONE_BIN&#x0D;&#x0A;
-
-:DO_BROADWAY_BIN&#x0D;&#x0A;
-copy $(ConfigurationName)\$(PlatformName)\bin\broadwayd.exe $(CopyDir)\bin&#x0D;&#x0A;
-copy $(ConfigurationName)\$(PlatformName)\bin\broadwayd.pdb $(CopyDir)\bin&#x0D;&#x0A;
-
-if &quot;$(ConfigurationName)&quot; == &quot;Release_Broadway&quot; goto DO_BROADWAY_RELEASE&#x0D;&#x0A;
-if &quot;$(ConfigurationName)&quot; == &quot;Debug_Broadway&quot; goto DO_BROADWAY_DEBUG&#x0D;&#x0A;
-:DO_BROADWAY_RELEASE&#x0D;&#x0A;
-copy .\Release\$(PlatformName)\bin\$(GtkDllPrefix)gtk-4$(GtkDllSuffix).dll $(CopyDir)\bin&#x0D;&#x0A;
-copy .\Release\$(PlatformName)\bin\$(GtkDllPrefix)gtk-4$(GtkDllSuffix).pdb $(CopyDir)\bin&#x0D;&#x0A;
-copy .\Release\$(PlatformName)\bin\gtk-$(ApiVersion).lib $(CopyDir)\lib&#x0D;&#x0A;
-copy .\Release\$(PlatformName)\bin\gailutil-$(ApiVersion).lib $(CopyDir)\lib&#x0D;&#x0A;
-copy .\Release\$(PlatformName)\bin\gtk4-demo.exe $(CopyDir)\bin&#x0D;&#x0A;
-copy .\Release\$(PlatformName)\bin\gtk4-demo.pdb $(CopyDir)\bin&#x0D;&#x0A;
-copy .\Release\$(PlatformName)\bin\gtk4-demo-application.exe $(CopyDir)\bin&#x0D;&#x0A;
-copy .\Release\$(PlatformName)\bin\gtk4-demo-application.pdb $(CopyDir)\bin&#x0D;&#x0A;
-copy .\Release\$(PlatformName)\bin\gtk4-icon-browser.exe $(CopyDir)\bin&#x0D;&#x0A;
-copy .\Release\$(PlatformName)\bin\gtk4-icon-browser.pdb $(CopyDir)\bin&#x0D;&#x0A;
-copy .\Release\$(PlatformName)\bin\gtk-encode-symbolic-svg.exe $(CopyDir)\bin&#x0D;&#x0A;
-copy .\Release\$(PlatformName)\bin\gtk-encode-symbolic-svg.pdb $(CopyDir)\bin&#x0D;&#x0A;
-copy .\Release\$(PlatformName)\bin\gtk-update-icon-cache.exe $(CopyDir)\bin&#x0D;&#x0A;
-copy .\Release\$(PlatformName)\bin\gtk-update-icon-cache.pdb $(CopyDir)\bin&#x0D;&#x0A;
-copy .\Release\$(PlatformName)\bin\gtk-query-settings.exe $(CopyDir)\bin&#x0D;&#x0A;
-copy .\Release\$(PlatformName)\bin\gtk-query-settings.pdb $(CopyDir)\bin&#x0D;&#x0A;
-copy .\Release\$(PlatformName)\bin\gtk-builder-tool.exe $(CopyDir)\bin&#x0D;&#x0A;
-copy .\Release\$(PlatformName)\bin\gtk-builder-tool.pdb $(CopyDir)\bin&#x0D;&#x0A;
-goto DONE_BIN&#x0D;&#x0A;
-
-:DO_BROADWAY_DEBUG&#x0D;&#x0A;
-copy .\Debug\$(PlatformName)\bin\$(GtkDllPrefix)gtk-4$(GtkDllSuffix).dll $(CopyDir)\bin&#x0D;&#x0A;
-copy .\Debug\$(PlatformName)\bin\$(GtkDllPrefix)gtk-4$(GtkDllSuffix).pdb $(CopyDir)\bin&#x0D;&#x0A;
-copy .\Debug\$(PlatformName)\bin\gtk-$(ApiVersion).lib $(CopyDir)\lib&#x0D;&#x0A;
-copy .\Debug\$(PlatformName)\bin\gailutil-$(ApiVersion).lib $(CopyDir)\lib&#x0D;&#x0A;
-copy .\Debug\$(PlatformName)\bin\gtk4-demo.exe $(CopyDir)\bin&#x0D;&#x0A;
-copy .\Debug\$(PlatformName)\bin\gtk4-demo.pdb $(CopyDir)\bin&#x0D;&#x0A;
-copy .\Debug\$(PlatformName)\bin\gtk4-demo-application.exe $(CopyDir)\bin&#x0D;&#x0A;
-copy .\Debug\$(PlatformName)\bin\gtk4-demo-application.pdb $(CopyDir)\bin&#x0D;&#x0A;
-copy .\Debug\$(PlatformName)\bin\gtk4-icon-browser.exe $(CopyDir)\bin&#x0D;&#x0A;
-copy .\Debug\$(PlatformName)\bin\gtk4-icon-browser.pdb $(CopyDir)\bin&#x0D;&#x0A;
-copy .\Debug\$(PlatformName)\bin\gtk-encode-symbolic-svg.exe $(CopyDir)\bin&#x0D;&#x0A;
-copy .\Debug\$(PlatformName)\bin\gtk-encode-symbolic-svg.pdb $(CopyDir)\bin&#x0D;&#x0A;
-copy .\Debug\$(PlatformName)\bin\gtk-update-icon-cache.exe $(CopyDir)\bin&#x0D;&#x0A;
-copy .\Debug\$(PlatformName)\bin\gtk-update-icon-cache.pdb $(CopyDir)\bin&#x0D;&#x0A;
-copy .\Debug\$(PlatformName)\bin\gtk-query-settings.exe $(CopyDir)\bin&#x0D;&#x0A;
-copy .\Debug\$(PlatformName)\bin\gtk-query-settings.pdb $(CopyDir)\bin&#x0D;&#x0A;
-copy .\Debug\$(PlatformName)\bin\gtk-builder-tool.exe $(CopyDir)\bin&#x0D;&#x0A;
-copy .\Debug\$(PlatformName)\bin\gtk-builder-tool.pdb $(CopyDir)\bin&#x0D;&#x0A;
-:DONE_BIN&#x0D;&#x0A;
-
-copy ..\gdk-4.0.pc $(CopyDir)\lib\pkgconfig&#x0D;&#x0A;
-copy &quot;..\gtk+-4.0.pc&quot; $(CopyDir)\lib\pkgconfig&#x0D;&#x0A;
-copy ..\gail-4.0.pc $(CopyDir)\lib\pkgconfig&#x0D;&#x0A;
-			  "
-	/>
-	<UserMacro
-		Name="GtkDoInstall"
-		Value="
-echo off&#x0D;&#x0A;
-mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gdk\win32&#x0D;&#x0A;
-mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gdk\deprecated&#x0D;&#x0A;
-
-copy ..\..\..\gdk\win32\gdkwin32.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk&#x0D;&#x0A;
-#include "gdk-4.headers"
-#include "gdk4-win32.headers"
-
-mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y&#x0D;&#x0A;
-mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated&#x0D;&#x0A;
-#include "gtk-4.headers"
-
-mkdir $(CopyDir)\share\icons\hicolor\16x16\apps&#x0D;&#x0A;
-copy ..\..\..\demos\gtk-demo\data\16x16\gtk4-demo.png $(CopyDir)\share\icons\hicolor\16x16\apps\&#x0D;&#x0A;
-mkdir $(CopyDir)\share\icons\hicolor\22x22\apps&#x0D;&#x0A;
-copy ..\..\..\demos\gtk-demo\data\22x22\gtk4-demo.png $(CopyDir)\share\icons\hicolor\22x22\apps\&#x0D;&#x0A;
-mkdir $(CopyDir)\share\icons\hicolor\24x24\apps&#x0D;&#x0A;
-copy ..\..\..\demos\gtk-demo\data\24x24\gtk4-demo.png $(CopyDir)\share\icons\hicolor\24x24\apps\&#x0D;&#x0A;
-mkdir $(CopyDir)\share\icons\hicolor\32x32\apps&#x0D;&#x0A;
-copy ..\..\..\demos\gtk-demo\data\32x32\gtk4-demo.png $(CopyDir)\share\icons\hicolor\32x32\apps\&#x0D;&#x0A;
-mkdir $(CopyDir)\share\icons\hicolor\48x48\apps&#x0D;&#x0A;
-copy ..\..\..\demos\gtk-demo\data\48x48\gtk4-demo.png $(CopyDir)\share\icons\hicolor\48x48\apps\&#x0D;&#x0A;
-mkdir $(CopyDir)\share\icons\hicolor\256x256\apps&#x0D;&#x0A;
-copy ..\..\..\demos\gtk-demo\data\256x256\gtk4-demo.png $(CopyDir)\share\icons\hicolor\256x256\apps\&#x0D;&#x0A;
-
-mkdir $(CopyDir)\share\glib-2.0\schemas&#x0D;&#x0A;
-copy ..\..\..\gtk\org.gtk.Settings.FileChooser.gschema.xml $(CopyDir)\share\glib-2.0\schemas&#x0D;&#x0A;
-copy ..\..\..\gtk\org.gtk.Settings.ColorChooser.gschema.xml $(CopyDir)\share\glib-2.0\schemas&#x0D;&#x0A;
-copy ..\..\..\gtk\org.gtk.Settings.Debug.gschema.xml $(CopyDir)\share\glib-2.0\schemas&#x0D;&#x0A;
-copy ..\..\..\demos\gtk-demo\org.gtk.Demo.gschema.xml $(CopyDir)\share\glib-2.0\schemas&#x0D;&#x0A;
-		      "
-	/>
-	<UserMacro
-		Name="GtkPostInstall"
-		Value="
-echo &quot;Compiling gsettings XML Files...&quot;&#x0D;&#x0A;
-$(GlibEtcInstallRoot)\bin\glib-compile-schemas.exe $(CopyDir)\share\glib-2.0\schemas&#x0D;&#x0A;
-
-echo &quot;Generating icon cache...&quot;&#x0D;&#x0A;
-$(CopyDir)\bin\gtk-update-icon-cache.exe --ignore-theme-index --force &quot;$(CopyDir)\share\icons\hicolor&quot;
-		      "
-	/>
-	<UserMacro
-		Name="GtkDoInstallBroadwayHeaders"
-		Value="
-copy ..\..\..\gdk\broadway\gdkbroadway.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk&#x0D;&#x0A;
-mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gdk\broadway&#x0D;&#x0A;
-#include "gdk4-broadway.headers"
-        "
-	/>
-	<UserMacro
-		Name="GenerateGtkPC"
-		Value="$(PythonPath)\python ..\gtkpc.py --prefix=$(CopyDir) --version=$(GtkVersion) --host=i686-pc-vs$(VSVer)"
-	/>
-	<UserMacro
-		Name="GenerateGtkPCX64"
-		Value="$(PythonPathX64)\python ..\gtkpc.py --prefix=$(CopyDir) --version=$(GtkVersion) --host=x86_64-pc-vs$(VSVer)"
-	/>
-</VisualStudioPropertySheet>
diff --git a/build/win32/vs9/gtk4-prebuild.vcproj b/build/win32/vs9/gtk4-prebuild.vcproj
deleted file mode 100644
index e4963886bc..0000000000
--- a/build/win32/vs9/gtk4-prebuild.vcproj
+++ /dev/null
@@ -1,282 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="gtk4-prebuild"
-	ProjectGUID="{B98FBE68-B03C-48E3-8F32-C3C010720D30}"
-	RootNamespace="gtk4prebuild"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			ConfigurationType="10"
-			InheritedPropertySheets=".\gtk4-gen-srcs.vsprops"
-			CharacterSet="2"
-			DeleteExtensionsOnClean=""
-			>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			ConfigurationType="10"
-			InheritedPropertySheets=".\gtk4-gen-srcs.vsprops"
-			CharacterSet="2"
-			DeleteExtensionsOnClean=""
-			>
-		</Configuration>
-		<Configuration
-			Name="Debug_Broadway|Win32"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="10"
-			InheritedPropertySheets=".\gtk4-gen-srcs.vsprops"
-			CharacterSet="2"
-			DeleteExtensionsOnClean=""
-			>
-		</Configuration>
-		<Configuration
-			Name="Debug_Broadway|x64"
-			ConfigurationType="10"
-			InheritedPropertySheets=".\gtk4-gen-srcs.vsprops"
-			CharacterSet="2"
-			DeleteExtensionsOnClean=""
-			>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="10"
-			InheritedPropertySheets=".\gtk4-gen-srcs.vsprops"
-			CharacterSet="2"
-			DeleteExtensionsOnClean=""
-			WholeProgramOptimization="1"
-			>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			ConfigurationType="10"
-			InheritedPropertySheets=".\gtk4-gen-srcs.vsprops"
-			CharacterSet="2"
-			DeleteExtensionsOnClean=""
-			WholeProgramOptimization="1"
-			>
-		</Configuration>
-		<Configuration
-			Name="Release_Broadway|Win32"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="10"
-			InheritedPropertySheets=".\gtk4-gen-srcs.vsprops"
-			CharacterSet="2"
-			DeleteExtensionsOnClean=""
-			WholeProgramOptimization="1"
-			>
-		</Configuration>
-		<Configuration
-			Name="Release_Broadway|x64"
-			ConfigurationType="10"
-			InheritedPropertySheets=".\gtk4-gen-srcs.vsprops"
-			CharacterSet="2"
-			DeleteExtensionsOnClean=""
-			WholeProgramOptimization="1"
-			>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-			<File RelativePath="..\..\..\config.h.win32">
-				<FileConfiguration Name="Debug|Win32">
-					<Tool Name="VCCustomBuildTool"
-						Description="Copying config.h from config.h.win32..."
-						CommandLine="$(GenConfigH)"
-						Outputs="..\..\..\config.h"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Debug_Broadway|Win32">
-					<Tool Name="VCCustomBuildTool"
-						Description="Copying config.h from config.h.win32..."
-						CommandLine="$(GenConfigH)"
-						Outputs="..\..\..\config.h"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Release|Win32">
-					<Tool Name="VCCustomBuildTool"
-						Description="Copying config.h from config.h.win32..."
-						CommandLine="$(GenConfigH)"
-						Outputs="..\..\..\config.h"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Release_Broadway|Win32">
-					<Tool Name="VCCustomBuildTool"
-						Description="Copying config.h from config.h.win32..."
-						CommandLine="$(GenConfigH)"
-						Outputs="..\..\..\config.h"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Debug|x64">
-					<Tool Name="VCCustomBuildTool"
-						Description="Copying config.h from config.h.win32..."
-						CommandLine="$(GenConfigH)"
-						Outputs="..\..\..\config.h"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Debug_Broadway|x64">
-					<Tool Name="VCCustomBuildTool"
-						Description="Copying config.h from config.h.win32..."
-						CommandLine="$(GenConfigH)"
-						Outputs="..\..\..\config.h"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Release|x64">
-					<Tool Name="VCCustomBuildTool"
-						Description="Copying config.h from config.h.win32..."
-						CommandLine="$(GenConfigH)"
-						Outputs="..\..\..\config.h"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Release_Broadway|x64">
-					<Tool Name="VCCustomBuildTool"
-						Description="Copying config.h from config.h.win32..."
-						CommandLine="$(GenConfigH)"
-						Outputs="..\..\..\config.h"
-					/>
-				</FileConfiguration>
-			</File>
-			<File RelativePath="..\..\..\gdk\gdkconfig.h.win32">
-				<FileConfiguration Name="Debug|Win32">
-					<Tool Name="VCCustomBuildTool"
-						Description="Copying gdkconfig.h from gdkconfig.h.win32..."
-						CommandLine="$(GenGdkConfigHWin32)"
-						Outputs="..\..\..\gdk\gdkconfig.h;..\..\..\GDK_WIN32ONLY_BUILD;..\..\..\MSVC_$(ConfigurationName)"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Release|Win32">
-					<Tool Name="VCCustomBuildTool"
-						Description="Copying gdkconfig.h from gdkconfig.h.win32..."
-						CommandLine="$(GenGdkConfigHWin32)"
-						Outputs="..\..\..\gdk\gdkconfig.h;..\..\..\GDK_WIN32ONLY_BUILD;..\..\..\MSVC_$(ConfigurationName)"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Debug|x64">
-					<Tool Name="VCCustomBuildTool"
-						Description="Copying gdkconfig.h from gdkconfig.h.win32..."
-						CommandLine="$(GenGdkConfigHWin32)"
-						Outputs="..\..\..\gdk\gdkconfig.h;..\..\..\GDK_WIN32ONLY_BUILD;..\..\..\MSVC_$(ConfigurationName)"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Release|x64">
-					<Tool Name="VCCustomBuildTool"
-						Description="Copying gdkconfig.h from gdkconfig.h.win32..."
-						CommandLine="$(GenGdkConfigHWin32)"
-						Outputs="..\..\..\gdk\gdkconfig.h;..\..\..\GDK_WIN32ONLY_BUILD;..\..\..\MSVC_$(ConfigurationName)"
-					/>
-				</FileConfiguration>
-			</File>
-			<File RelativePath="..\..\..\gdk\gdkconfig.h.win32_broadway">
-				<FileConfiguration Name="Debug_Broadway|Win32">
-					<Tool Name="VCCustomBuildTool"
-						Description="Copying gdkconfig.h from gdkconfig.h.win32_broadway..."
-						CommandLine="$(GenGdkConfigHBroadway)"
-						Outputs="..\..\..\gdk\gdkconfig.h;..\..\..\GDK_BROADWAY_BUILD;..\..\..\MSVC_$(ConfigurationName)_Broadway"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Release_Broadway|Win32">
-					<Tool Name="VCCustomBuildTool"
-						Description="Copying gdkconfig.h from gdkconfig.h.win32_broadway..."
-						CommandLine="$(GenGdkConfigHBroadway)"
-						Outputs="..\..\..\gdk\gdkconfig.h;..\..\..\GDK_BROADWAY_BUILD;..\..\..\MSVC_$(ConfigurationName)_Broadway"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Debug_Broadway|x64">
-					<Tool Name="VCCustomBuildTool"
-						Description="Copying gdkconfig.h from gdkconfig.h.win32_broadway..."
-						CommandLine="$(GenGdkConfigHBroadway)"
-						Outputs="..\..\..\gdk\gdkconfig.h;..\..\..\GDK_BROADWAY_BUILD;..\..\..\MSVC_$(ConfigurationName)_Broadway"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Release_Broadway|x64">
-					<Tool Name="VCCustomBuildTool"
-						Description="Copying gdkconfig.h from gdkconfig.h.win32_broadway..."
-						CommandLine="$(GenGdkConfigHBroadway)"
-						Outputs="..\..\..\gdk\gdkconfig.h;..\..\..\GDK_BROADWAY_BUILD;..\..\..\MSVC_$(ConfigurationName)_Broadway"
-					/>
-				</FileConfiguration>
-			</File>
-			<File RelativePath="..\..\..\demos\gtk-demo\demos.h.win32">
-				<FileConfiguration Name="Debug|Win32">
-					<Tool Name="VCCustomBuildTool"
-						Description="Copying demos.h from demos.h.win32..."
-						CommandLine="$(CopyDemosH)"
-						Outputs="..\..\..\demos\gtk-demo\demos.h"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Debug_Broadway|Win32">
-					<Tool Name="VCCustomBuildTool"
-						Description="Copying demos.h from demos.h.win32..."
-						CommandLine="$(CopyDemosH)"
-						Outputs="..\..\..\demos\gtk-demo\demos.h"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Release|Win32">
-					<Tool Name="VCCustomBuildTool"
-						Description="Copying demos.h from demos.h.win32..."
-						CommandLine="$(CopyDemosH)"
-						Outputs="..\..\..\demos\gtk-demo\demos.h"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Release_Broadway|Win32">
-					<Tool Name="VCCustomBuildTool"
-						Description="Copying demos.h from demos.h.win32..."
-						CommandLine="$(CopyDemosH)"
-						Outputs="..\..\..\demos\gtk-demo\demos.h"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Debug|x64">
-					<Tool Name="VCCustomBuildTool"
-						Description="Copying demos.h from demos.h.win32..."
-						CommandLine="$(CopyDemosH)"
-						Outputs="..\..\..\demos\gtk-demo\demos.h"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Debug_Broadway|x64">
-					<Tool Name="VCCustomBuildTool"
-						Description="Copying demos.h from demos.h.win32..."
-						CommandLine="$(CopyDemosH)"
-						Outputs="..\..\..\demos\gtk-demo\demos.h"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Release|x64">
-					<Tool Name="VCCustomBuildTool"
-						Description="Copying demos.h from demos.h.win32..."
-						CommandLine="$(CopyDemosH)"
-						Outputs="..\..\..\demos\gtk-demo\demos.h"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Release_Broadway|x64">
-					<Tool Name="VCCustomBuildTool"
-						Description="Copying demos.h from demos.h.win32..."
-						CommandLine="$(CopyDemosH)"
-						Outputs="..\..\..\demos\gtk-demo\demos.h"
-					/>
-				</FileConfiguration>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/build/win32/vs9/gtk4-version-paths.vsprops.in b/build/win32/vs9/gtk4-version-paths.vsprops.in
deleted file mode 100644
index 88378601ac..0000000000
--- a/build/win32/vs9/gtk4-version-paths.vsprops.in
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="gtk4versionpathsprops"
-	>
-	<UserMacro
-		Name="VSVer"
-		Value="9"
-	/>
-	<UserMacro
-		Name="GlibEtcInstallRoot"
-		Value="$(SolutionDir)\..\..\..\..\vs$(VSVer)\$(PlatformName)"
-	/>
-	<UserMacro
-		Name="CopyDir"
-		Value="..\..\..\..\vs$(VSVer)\$(PlatformName)"
-	/>
-	<UserMacro
-		Name="ApiVersion"
-		Value="4.0"
-	/>
-	<UserMacro
-		Name="GtkVersion"
-		Value="@GTK_VERSION@"
-	/>
-	<UserMacro
-		Name="GtkLibtoolCompatibleDllPrefix"
-		Value="lib"
-	/>
-	<UserMacro
-		Name="GtkLibtoolCompatibleDllSuffix"
-		Value=".0-0"
-	/>
-	<UserMacro
-		Name="GtkSeparateVSDllPrefix"
-		Value=""
-	/>
-	<UserMacro
-		Name="GtkSeparateVSDllSuffix"
-		Value="-vs$(VSVer)"
-	/>
-	<!-- Change these two to GtkLibtoolCompatibleDllPrefix and
-	GtkLibtoolCompatibleDllSuffix if that is what you want -->
-	<UserMacro
-		Name="GtkDllPrefix"
-		Value="$(GtkSeparateVSDllPrefix)"
-	/>
-	<UserMacro
-		Name="GtkDllSuffix"
-		Value="$(GtkSeparateVSDllSuffix)"
-	/>
-	<UserMacro
-		Name="PythonPath"
-		Value="c:\python27"
-	/>
-	<UserMacro
-		Name="PythonPathX64"
-		Value="$(PythonPath).x64"
-	/>
-</VisualStudioPropertySheet>
diff --git a/configure.ac b/configure.ac
index f93c2d3944..e2425f22fb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1993,12 +1993,8 @@ docs/reference/gtk/version.xml
 docs/tools/Makefile
 build/Makefile
 build/win32/Makefile
-build/win32/vs9/Makefile
-build/win32/vs9/gtk4-version-paths.vsprops
-build/win32/vs10/Makefile
-build/win32/vs10/gtk4-version-paths.props
-build/win32/vs11/Makefile
 build/win32/vs12/Makefile
+build/win32/vs12/gtk4-version-paths.props
 build/win32/vs14/Makefile
 gdk/Makefile
 gdk/broadway/Makefile
diff --git a/demos/gtk-demo/Makefile.am b/demos/gtk-demo/Makefile.am
index b873418b2b..beb88a8d75 100644
--- a/demos/gtk-demo/Makefile.am
+++ b/demos/gtk-demo/Makefile.am
@@ -194,8 +194,8 @@ gtk4_demo_application_EXCLUDES = dummy
 include $(top_srcdir)/build/Makefile.msvcproj
 
 dist-hook: \
-	$(top_builddir)/build/win32/vs9/gtk4-demo.vcproj	\
-	$(top_builddir)/build/win32/vs9/gtk4-demo-application.vcproj
+	$(top_builddir)/build/win32/vs12/gtk4-demo.vcxproj	\
+	$(top_builddir)/build/win32/vs12/gtk4-demo-application.vcxproj
 
 DISTCLEANFILES = demos.h demos.h.win32
 
diff --git a/demos/icon-browser/Makefile.am b/demos/icon-browser/Makefile.am
index 111ce3520b..8a2722bfbd 100644
--- a/demos/icon-browser/Makefile.am
+++ b/demos/icon-browser/Makefile.am
@@ -43,6 +43,6 @@ gtk4_icon_browser_EXCLUDES = dummy
 
 include $(top_srcdir)/build/Makefile.msvcproj
 
-dist-hook: $(top_builddir)/build/win32/vs9/gtk4-icon-browser.vcproj
+dist-hook: $(top_builddir)/build/win32/vs12/gtk4-icon-browser.vcxproj
 
 -include $(top_srcdir)/git.mk
diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index 538d113a65..b31e7e264b 100644
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -546,8 +546,8 @@ INTROSPECTION_INTERMEDIATE_ITEMS =
 endif
 
 dist-hook: \
-	$(top_builddir)/build/win32/vs9/gdk-4.vcproj	\
-	$(top_builddir)/build/win32/vs9/gdk-4.headers	\
+	$(top_builddir)/build/win32/vs12/gdk-4.vcxproj	\
+	$(top_builddir)/build/win32/vs12/gdk-4.vs12.headers	\
 	$(INTROSPECTION_INTERMEDIATE_ITEMS)
 
 DISTCLEANFILES = gdkconfig.h stamp-gc-h
diff --git a/gdk/broadway/Makefile.am b/gdk/broadway/Makefile.am
index 342086578c..97b790d8ad 100644
--- a/gdk/broadway/Makefile.am
+++ b/gdk/broadway/Makefile.am
@@ -124,8 +124,8 @@ broadwayd_EXCLUDES = dummy
 include $(top_srcdir)/build/Makefile.msvcproj
 
 dist-hook: \
-	$(top_builddir)/build/win32/vs9/gdk4-broadway.vcproj		\
-	$(top_builddir)/build/win32/vs9/broadwayd.vcproj		\
-	$(top_builddir)/build/win32/vs9/gdk4-broadway.headers
+	$(top_builddir)/build/win32/vs12/gdk4-broadway.vcxproj		\
+	$(top_builddir)/build/win32/vs12/broadwayd.vcxproj		\
+	$(top_builddir)/build/win32/vs12/gdk4-broadway.vs12.headers
 
 -include $(top_srcdir)/git.mk
diff --git a/gdk/win32/Makefile.am b/gdk/win32/Makefile.am
index 2b89eead55..ebd4ae6f9f 100644
--- a/gdk/win32/Makefile.am
+++ b/gdk/win32/Makefile.am
@@ -101,7 +101,7 @@ gdk4_win32_HEADERS_EXCLUDES = dummy
 include $(top_srcdir)/build/Makefile.msvcproj
 
 dist-hook: \
-	$(top_builddir)/build/win32/vs9/gdk4-win32.vcproj	\
-	$(top_builddir)/build/win32/vs9/gdk4-win32.headers
+	$(top_builddir)/build/win32/vs12/gdk4-win32.vcxproj	\
+	$(top_builddir)/build/win32/vs12/gdk4-win32.vs12.headers
 
 -include $(top_srcdir)/git.mk
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 356523fb24..b83cc3b949 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -1479,8 +1479,8 @@ INTROSPECTION_INTERMEDIATE_ITEMS =
 endif
 
 dist-hook: \
-	$(top_builddir)/build/win32/vs9/gtk-4.vcproj	\
-	$(top_builddir)/build/win32/vs9/gtk-4.headers	\
+	$(top_builddir)/build/win32/vs12/gtk-4.vcxproj	\
+	$(top_builddir)/build/win32/vs12/gtk-4.vs12.headers	\
 	$(INTROSPECTION_INTERMEDIATE_ITEMS)
 
 # Install a RC file for the default GTK+ theme, and key themes