From: DongHun Kwak <dh0128.kwak@samsung.com>
Date: Thu, 10 Jan 2019 04:15:40 +0000 (+0900)
Subject: Imported Upstream version 1.57.2
X-Git-Tag: upstream/1.57.2^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a666a250c1ecaa634441886be0982de04147ff88;p=platform%2Fupstream%2Fgobject-introspection.git

Imported Upstream version 1.57.2
---

diff --git a/AUTHORS b/AUTHORS
deleted file mode 100644
index f791187..0000000
--- a/AUTHORS
+++ /dev/null
@@ -1,9 +0,0 @@
-Colin Walters <walters@verbum.org>
-Johan Dahlin <johan@gnome.org>
-
-Original girepository author:
-Matthias Clasen <mclasen@redhat.com>
-
-Original scanner author:
-Jürg Billeter  <j@bitron.ch>
-
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
deleted file mode 100644
index 1b2f67d..0000000
--- a/CONTRIBUTORS
+++ /dev/null
@@ -1,78 +0,0 @@
-Adam Sampson
-Adel Gadllah
-Alan Knowles
-Alexey Zakhlestin
-Andreas Rottmann
-Bastien Nocera
-Brian Cameron
-Chris Rivera
-Christian Persch
-Christophe Fergeau
-Colin Walters
-C. Scott Ananian
-Damien Lespiau
-Danielle Madeley
-Dan Winship
-David Ignacio
-David Zeuthen
-Didier 'Ptitjes
-dyfet@gnutelephony.org
-Eduardo Lima Mitev
-Emmanuele Bassi
-Florian Müllner
-Funda Wang
-Gustavo J. A. M. Carneiro
-Gustavo Noronha Silva
-Halton Huo
-Havoc Pennington
-Holger Hans Peter Freyther
-Iain Nicol
-Jani Monoses
-Jasper Lievisse Adriaanse
-Javier Jardón
-Joe Marcus Clarke
-Johan Bilien
-Johan Dahlin
-John (J5) Palmieri
-John Ehresman
-Jonathan Matthew
-Josselin Mouette
-Jürg Billeter
-Kedar Sovani
-Luca Bruno
-Lucas Rocha
-Maciej Katafiasz
-Marc-Andre Lureau
-Marco Pesenti Gritti
-Marina Zhurakhinskaya
-Mark Doffman
-Mark Lee
-Matthias Clasen
-Maxim Ermilov
-Michael Meeks
-Owen Taylor
-Pavel Holejsovsky
-Philip Van Hoof
-Richard Hult
-Robert Ancell
-Robert Carr
-Rob Taylor
-Ryan Lortie
-Saikiran Madugula
-Saleem Abdulrasool
-Saleem Ansari
-Simon McVittie
-Simon van der Linden
-Simón Pena
-Stefan Kost
-Steve Frécinaux
-Theppitak Karoonboonyanan
-Tim Horton
-Tobias Mueller
-Tomeu Vizoso
-Tommi Komulainen
-Tor Lillqvist
-Torsten Schönfeld
-Tristan Van Berkom
-Xan Lopez
-Zachary Goldberg
diff --git a/COPYING b/COPYING
index 60b8bdd..2f70ea4 100644
--- a/COPYING
+++ b/COPYING
@@ -1,12 +1,13 @@
 gobject-introspection has two licenses; one for the typelib library,
 and one for the tools.
 
-The scanner (giscanner/) and typelib libraries (girepository/) are
-licensed under the LGPLv2+.  See the file COPYING.LGPL.
+* The typelib libraries (girepository/) are licensed under the LGPLv2+.
+  See the file COPYING.LGPL.
 
-The tools (tools/) are licensed under the GPLv2+.  See the file COPYING.GPL.
-
-There is also some MIT code in giscanner/.  In general where
-applicable files should have headers denoting their license status; if
-they do not, please file a bug at https://gitlab.gnome.org/GNOME/gobject-introspection/issues.
+* The remaining code is GPLv2+ compatible (see the file COPYING.GPL) and
+  consists of a mix of GPLv2+, LGPLv2+ and MIT. See the license headers in
+  each file for details.
 
+In general where applicable files should have headers denoting their license
+status; if they do not, please file a bug at
+https://gitlab.gnome.org/GNOME/gobject-introspection/issues.
diff --git a/ChangeLog b/ChangeLog
deleted file mode 100644
index e69de29..0000000
diff --git a/MSVC.README.rst b/MSVC.README.rst
new file mode 100644
index 0000000..8200077
--- /dev/null
+++ b/MSVC.README.rst
@@ -0,0 +1,82 @@
+Building GObject-Introspection (G-I) on Windows using Visual Studio
+===================================================================
+
+Building G-I on Windows with Visual Studio is now supported via the use
+of the Meson build system, the Visual Studio 2008~2017 projects have been
+dropped from the distribution.  This README.msvc file will outline the
+steps of performing such a build on Visual Studio 2008~2017.
+
+You will need the following, in addition to your Visual Studio installation:
+
+- A Python installation that matches the build configuration that you are
+  planning to build.  That is, you need the 32-bit Python installation for
+  building 32-bit builds of G-I and the 64-bit (amd64) Python installation
+  for building x64/x86_64/amd64 builds of G-I.  You need at least the version
+  that is required for Meson, which is 3.4.x at the time of writing.  You will
+  then need to install Meson using the pip tool.
+
+- The Ninja build tool, which is optional on Visual Studio 2010, 2015 and 2017
+  builds (if one chooses to generate Visual Studio projects with Meson), but is
+  required for 2008, 2012 and 2013 builds.
+
+- GIT for Windows is recommended, as Meson will download using GIT the sources
+  of libraries that it depends on, if they cannot be found (such as GLib, please
+  see below)
+
+- A recent enough version of GLib, preferably built with the same compiler that
+  is now being used to build G-I.  If none is found, the Meson build will fetch
+  GLib from GIT master and build it first before continuing to build G-I.  Note
+  that it will require a libintl implementation (must be installed beforehand, the
+  headers and lib and DLL must be found in the paths specified by %INCLUDE, %LIB%
+  and %PATH% respectively), along with ZLib and libffi (GLib's own Meson build will
+  build  them if they are not found).  If a pre-existing copy of GLib is available,
+  be sure to set PKG_CONFIG_PATH to where its .pc files can be found, and ensure
+  that its DLLs/ executables can be first found in the paths specified in %PATH%.
+  Note that libffi is needed both by GLib and G-I.
+
+- A DLL build of Cairo with Cairo-GObject built, also preferably with the same
+  compiler that is now used to build G-I.
+
+- A recent version of winflex/flex and Bison. They can be obtained via MSYS/MSYS64
+  or Cygwin installations.  Either the 32-bit or 64-bit version will work, as long
+  as they run on your system.
+
+Set PATH to contain your Python-3.4.x+ interpreter, Ninja build tool (if needed) and
+winflex/flex and Bison executables towards its end.
+
+Note that if you plan to use g-ir-scanner for other packages built using Meson, you
+need to use the same Python release series (3.4, 3.5...) for running Meson there as
+well.
+
+Open a Visual Studio command prompt and create an empty build directory (which needs
+to be on the same drive as the G-I sources).  In that directory, run the following::
+
+  python $(PythonInstallationPath)\scripts\meson.py $(G-I_srcdir) --buildtype=<build_configuration> --prefix=$(PREFIX) -Dcairo-libname=<DLL filename of cairo-gobject>
+
+When Meson completes configuring and generating the build files, proceed building
+using Ninja or the generated Visual Studio projects.
+
+Additional notes for building with Visual Studio 2008 only
+----------------------------------------------------------
+Due to its use of security manifests, after Meson completes configuring and
+generating the build files, first build the giscanner\_giscanner.pyd target
+using 'ninja giscanner\_giscanner.pyd'.  After doing so, embed the manifest
+using the following command::
+
+  mt /manifest giscanner\_giscanner.pyd.manifest /outputresource:giscanner\_giscanner.pyd;2
+
+The .gir files cannot be successfully generated without this step.
+
+On x64 builds, building girepository\girepository-1.0-1.dll may hang during compilation.
+If this happens, terminate all 'cl.exe' processes, which will terminate the build process.
+Open build.ninja and change the compiler flags by changing /O2 to /O1 for all the sources
+that hang during compilation.  At this time of writing, girepository\girwriter.c,
+girepository\girparser.c and girepository\girnode.c are affected--this is due to an issue
+in Visual Studio 2008's x64 compiler in regards to optimization.  Re-attempt the build, and
+the build should complete normally.  This does not affect Win32/x86 builds.
+
+On all Visual Studio 2008 builds, after successfully completing/installing the build, run
+the following so that we ensure the manifests are embedded to the built DLLs and EXEs::
+
+  for /r %f in (*.dll.manifest) do if exist $(PREFIX)\bin\%~nf mt /manifest %f /outputresource:$(PREFIX)\bin\%~nf;2
+  for /r %f in (*.exe.manifest) do if exist $(PREFIX)\bin\%~nf mt /manifest %f /outputresource:$(PREFIX)\bin\%~nf;1
diff --git a/Makefile-cmph.am b/Makefile-cmph.am
index 5e2133a..a0bf229 100644
--- a/Makefile-cmph.am
+++ b/Makefile-cmph.am
@@ -3,6 +3,9 @@ EXTRA_LTLIBRARIES += libcmph.la
 libcmph_la_CPPFLAGS = -Icmph $(GLIB_CFLAGS) $(GI_HIDDEN_VISIBILITY_CFLAGS)
 libcmph_la_LIBADD = -lm $(GLIB_LIBS)
 
+EXTRA_DIST += \
+	girepository/cmph/meson.build
+
 libcmph_la_SOURCES = \
 	girepository/cmph/bdz.c \
 	girepository/cmph/bdz.h \
diff --git a/Makefile-examples.am b/Makefile-examples.am
index 0d9cedc..cc882a8 100644
--- a/Makefile-examples.am
+++ b/Makefile-examples.am
@@ -1,5 +1,9 @@
 noinst_PROGRAMS += glib-print
 
 glib_print_SOURCES = examples/glib-print.c
-glib_print_CFLAGS = $(GOBJECT_CFLAGS) -I$(top_srcdir)/girepository
+glib_print_CFLAGS = $(GOBJECT_CFLAGS) $(WARN_CFLAGS) -I$(top_srcdir)/girepository
+glib_print_LDFLAGS = $(WARN_LDFLAGS)
 glib_print_LDADD = libgirepository-1.0.la $(GOBJECT_LIBS)
+
+EXTRA_DIST += \
+	examples/meson.build
diff --git a/Makefile-gir.am b/Makefile-gir.am
index 86ab5bf..2cd7358 100644
--- a/Makefile-gir.am
+++ b/Makefile-gir.am
@@ -15,11 +15,14 @@ STATIC_GIRSOURCES =                 \
         gir/win32-1.0.gir
 EXTRA_DIST += $(STATIC_GIRSOURCES)
 
+EXTRA_DIST += \
+	gir/meson.build
+
 gir/cairo-1.0.gir: gir/cairo-1.0.gir.in Makefile
 	[ -d $(@D) ] || $(mkdir_p) $(@D) ; \
 	sed \
-	-e s,%CAIRO_SHARED_LIBRARY%,$(CAIRO_SHARED_LIBRARY), \
-	-e s,%CAIRO_GIR_PACKAGE%,$(CAIRO_GIR_PACKAGE), \
+	-e s,\@CAIRO_SHARED_LIBRARY\@,$(CAIRO_SHARED_LIBRARY), \
+	-e s,\@CAIRO_GIR_PACKAGE\@,$(CAIRO_GIR_PACKAGE), \
 	< $< > $@.tmp && mv $@.tmp $@
 BUILT_SOURCES += gir/cairo-1.0.gir
 SUBSTITUTED_GIRSOURCES += gir/cairo-1.0.gir
@@ -47,10 +50,10 @@ if WITH_GLIBSRC
      GModule_2_0_gir_DOCSRC = $(GLIBSRC)/gmodule/*.c
      Gio_2_0_gir_DOCSRC = $(GLIBSRC)/gio/*.c
 else
-    GLib_2_0_gir_DOCSRC = 
-    GObject_2_0_gir_DOCSRC = 
-    GModule_2_0_gir_DOCSRC = 
-    Gio_2_0_gir_DOCSRC = 
+    GLib_2_0_gir_DOCSRC =
+    GObject_2_0_gir_DOCSRC =
+    GModule_2_0_gir_DOCSRC =
+    Gio_2_0_gir_DOCSRC =
 
 endif
 
@@ -194,7 +197,7 @@ GIRepository-2.0.gir: GObject-2.0.gir libgirepository-1.0.la
 
 GIRepository_2_0_gir_LIBS = libgirepository-1.0.la
 GIRepository_2_0_gir_SCANNERFLAGS = \
-	--warn-all \
+        $(WARN_SCANNERFLAGS) \
         --identifier-prefix=GI \
         --symbol-prefix=g \
         --c-include="girepository.h" \
diff --git a/Makefile-girepository.am b/Makefile-girepository.am
index 44b508d..2af8c4a 100644
--- a/Makefile-girepository.am
+++ b/Makefile-girepository.am
@@ -1,5 +1,6 @@
 EXTRA_DIST +=						\
-	girepository/docs.c
+	girepository/docs.c \
+	girepository/meson.build
 
 girepodir = $(includedir)/gobject-introspection-1.0/
 girepo_HEADERS =					\
@@ -31,10 +32,12 @@ noinst_LTLIBRARIES += libgirepository-internals.la libgirepository-gthash.la
 libgirepository_gthash_la_SOURCES =				\
 	girepository/gthash.c
 libgirepository_gthash_la_CFLAGS =	\
+	$(WARN_CFLAGS) \
 	$(GIREPO_CFLAGS)	\
 	$(GI_HIDDEN_VISIBILITY_CFLAGS)	\
 	-I$(top_srcdir)/girepository
-
+libgirepository_gthash_la_LDFLAGS =	\
+	$(WARN_LDFLAGS)
 libgirepository_gthash_la_LIBADD = libcmph.la $(GIREPO_LIBS)
 
 libgirepository_internals_la_SOURCES =				\
@@ -49,10 +52,14 @@ libgirepository_internals_la_SOURCES =				\
 	girepository/girwriter.h
 
 libgirepository_internals_la_CFLAGS =	\
+	$(WARN_CFLAGS) \
 	$(GIREPO_CFLAGS)	\
 	$(GI_HIDDEN_VISIBILITY_CFLAGS)	\
 	-I$(top_srcdir)/girepository
 
+libgirepository_internals_la_LDFLAGS = \
+	$(WARN_LDFLAGS)
+
 libgirepository_internals_la_LIBADD = libgirepository-gthash.la $(GIREPO_LIBS)
 
 libgirepository_1_0_la_SOURCES =			\
@@ -82,12 +89,14 @@ libgirepository_1_0_la_SOURCES =			\
 	girepository/givfuncinfo.c
 
 libgirepository_1_0_la_CPPFLAGS =	\
+	$(WARN_CFLAGS) \
 	$(GIREPO_CFLAGS)	\
 	$(GI_HIDDEN_VISIBILITY_CFLAGS)	\
 	-I$(top_srcdir)/girepository	\
 	-DG_IREPOSITORY_COMPILATION
 libgirepository_1_0_la_LIBADD = libgirepository-gthash.la $(GIREPO_LIBS)
 libgirepository_1_0_la_LDFLAGS = \
+	$(WARN_LDFLAGS) \
 	$(EXTRA_LINK_FLAGS) \
 	-no-undefined -version-number 1:0:0
 
@@ -98,7 +107,8 @@ if !OS_WIN32
 noinst_PROGRAMS += gi-dump-types
 
 gi_dump_types_SOURCES = girepository/gdump.c girepository/gi-dump-types.c
-gi_dump_types_CFLAGS = $(GIO_UNIX_CFLAGS) $(GMODULE_CFLAGS)
+gi_dump_types_CFLAGS = $(GIO_UNIX_CFLAGS) $(GMODULE_CFLAGS) $(WARN_CFLAGS)
+gi_dump_types_LDFLAGS = $(WARN_LDFLAGS)
 gi_dump_types_LDADD = $(GIO_UNIX_LIBS) $(GMODULE_LIBS)
 endif
 
diff --git a/Makefile-giscanner.am b/Makefile-giscanner.am
index 06bc4be..4f08934 100644
--- a/Makefile-giscanner.am
+++ b/Makefile-giscanner.am
@@ -6,6 +6,9 @@ BUILT_SOURCES += 			\
 	giscanner/scannerlexer.c 	\
 	giscanner/scannerlexer.h
 
+EXTRA_DIST += \
+	giscanner/meson.build
+
 AM_YFLAGS = -d -t
 
 # Why do I have to do this automake?
@@ -20,13 +23,15 @@ libgiscanner_la_SOURCES = \
 	giscanner/scannerparser.y
 libgiscanner_la_CPPFLAGS = -I$(top_srcdir)/girepository -I$(top_srcdir)/giscanner
 libgiscanner_la_LIBADD = $(GOBJECT_LIBS) $(GIO_LIBS)
-libgiscanner_la_CFLAGS = $(GOBJECT_CFLAGS) $(GIO_CFLAGS)
+libgiscanner_la_CFLAGS = $(GOBJECT_CFLAGS) $(GIO_CFLAGS) $(WARN_CFLAGS_FLEX)
+libgiscanner_la_LDFLAGS = $(WARN_LDFLAGS)
 
 # Python module
 pkgpyexecdir = $(pkglibdir)/giscanner
 pkgpyexec_LTLIBRARIES = _giscanner.la
 pkgpyexec_PYTHON = 			\
 	giscanner/__init__.py		\
+	giscanner/_version.py		\
 	giscanner/annotationmain.py	\
 	giscanner/annotationparser.py	\
 	giscanner/ast.py		\
@@ -36,98 +41,93 @@ pkgpyexec_PYTHON = 			\
 	giscanner/docmain.py		\
 	giscanner/docwriter.py		\
 	giscanner/dumper.py		\
-	giscanner/introspectablepass.py	\
+	giscanner/gdumpparser.py 	\
 	giscanner/girparser.py		\
 	giscanner/girwriter.py		\
-	giscanner/gdumpparser.py 	\
+	giscanner/introspectablepass.py	\
 	giscanner/libtoolimporter.py	\
 	giscanner/maintransformer.py	\
 	giscanner/message.py		\
 	giscanner/msvccompiler.py	\
-	giscanner/shlibs.py		\
+	giscanner/pkgconfig.py		\
 	giscanner/scannermain.py	\
 	giscanner/sectionparser.py	\
+	giscanner/shlibs.py		\
 	giscanner/sourcescanner.py	\
 	giscanner/testcodegen.py	\
 	giscanner/transformer.py	\
 	giscanner/utils.py		\
 	giscanner/xmlwriter.py
 
-collectionsdir = $(pkgpyexecdir)/collections
-collections_PYTHON =		\
-	giscanner/collections/__init__.py	\
-	giscanner/collections/counter.py	\
-	giscanner/collections/ordereddict.py
-
 templatedir = $(pkglibdir)
 nobase_dist_template_DATA =		\
-	giscanner/doctemplates/base.tmpl	\
-	giscanner/doctemplates/class.tmpl	\
-	giscanner/doctemplates/namespace.tmpl	\
-	giscanner/doctemplates/C/callback.tmpl 	\
-	giscanner/doctemplates/C/class.tmpl	\
-	giscanner/doctemplates/C/constructor.tmpl	\
-	giscanner/doctemplates/C/default.tmpl	\
-	giscanner/doctemplates/C/enum.tmpl	\
-	giscanner/doctemplates/C/function.tmpl	\
-	giscanner/doctemplates/C/field.tmpl 	\
-	giscanner/doctemplates/C/interface.tmpl	\
-	giscanner/doctemplates/C/method.tmpl		\
-	giscanner/doctemplates/C/namespace.tmpl	\
-	giscanner/doctemplates/C/property.tmpl	\
-	giscanner/doctemplates/C/record.tmpl	\
-	giscanner/doctemplates/C/signal.tmpl	\
-	giscanner/doctemplates/C/vfunc.tmpl	\
-	giscanner/doctemplates/Python/callback.tmpl 	\
-	giscanner/doctemplates/Python/class.tmpl	\
-	giscanner/doctemplates/Python/constructor.tmpl	\
-	giscanner/doctemplates/Python/default.tmpl	\
-	giscanner/doctemplates/Python/enum.tmpl	\
-	giscanner/doctemplates/Python/function.tmpl	\
-	giscanner/doctemplates/Python/field.tmpl 	\
-	giscanner/doctemplates/Python/interface.tmpl	\
-	giscanner/doctemplates/Python/method.tmpl	\
-	giscanner/doctemplates/Python/namespace.tmpl	\
-	giscanner/doctemplates/Python/property.tmpl	\
-	giscanner/doctemplates/Python/record.tmpl	\
-	giscanner/doctemplates/Python/signal.tmpl	\
-	giscanner/doctemplates/Python/vfunc.tmpl	\
-	giscanner/doctemplates/Gjs/callback.tmpl 	\
-	giscanner/doctemplates/Gjs/class.tmpl	\
-	giscanner/doctemplates/Gjs/constructor.tmpl	\
-	giscanner/doctemplates/Gjs/default.tmpl	\
-	giscanner/doctemplates/Gjs/enum.tmpl	\
-	giscanner/doctemplates/Gjs/function.tmpl	\
-	giscanner/doctemplates/Gjs/field.tmpl 	\
-	giscanner/doctemplates/Gjs/interface.tmpl	\
-	giscanner/doctemplates/Gjs/method.tmpl	\
-	giscanner/doctemplates/Gjs/namespace.tmpl	\
-	giscanner/doctemplates/Gjs/property.tmpl	\
-	giscanner/doctemplates/Gjs/record.tmpl	\
-	giscanner/doctemplates/Gjs/signal.tmpl	\
-	giscanner/doctemplates/Gjs/vfunc.tmpl
+	giscanner/doctemplates/mallard/base.tmpl		\
+	giscanner/doctemplates/mallard/class.tmpl		\
+	giscanner/doctemplates/mallard/namespace.tmpl		\
+	giscanner/doctemplates/mallard/C/callback.tmpl 		\
+	giscanner/doctemplates/mallard/C/class.tmpl		\
+	giscanner/doctemplates/mallard/C/constructor.tmpl	\
+	giscanner/doctemplates/mallard/C/default.tmpl		\
+	giscanner/doctemplates/mallard/C/enum.tmpl		\
+	giscanner/doctemplates/mallard/C/function.tmpl		\
+	giscanner/doctemplates/mallard/C/field.tmpl 		\
+	giscanner/doctemplates/mallard/C/interface.tmpl		\
+	giscanner/doctemplates/mallard/C/method.tmpl		\
+	giscanner/doctemplates/mallard/C/namespace.tmpl		\
+	giscanner/doctemplates/mallard/C/property.tmpl		\
+	giscanner/doctemplates/mallard/C/record.tmpl		\
+	giscanner/doctemplates/mallard/C/signal.tmpl		\
+	giscanner/doctemplates/mallard/C/vfunc.tmpl		\
+	giscanner/doctemplates/mallard/Python/callback.tmpl 	\
+	giscanner/doctemplates/mallard/Python/class.tmpl	\
+	giscanner/doctemplates/mallard/Python/constructor.tmpl	\
+	giscanner/doctemplates/mallard/Python/default.tmpl	\
+	giscanner/doctemplates/mallard/Python/enum.tmpl		\
+	giscanner/doctemplates/mallard/Python/function.tmpl	\
+	giscanner/doctemplates/mallard/Python/field.tmpl 	\
+	giscanner/doctemplates/mallard/Python/interface.tmpl	\
+	giscanner/doctemplates/mallard/Python/method.tmpl	\
+	giscanner/doctemplates/mallard/Python/namespace.tmpl	\
+	giscanner/doctemplates/mallard/Python/property.tmpl	\
+	giscanner/doctemplates/mallard/Python/record.tmpl	\
+	giscanner/doctemplates/mallard/Python/signal.tmpl	\
+	giscanner/doctemplates/mallard/Python/vfunc.tmpl	\
+	giscanner/doctemplates/mallard/Gjs/callback.tmpl 	\
+	giscanner/doctemplates/mallard/Gjs/class.tmpl		\
+	giscanner/doctemplates/mallard/Gjs/constructor.tmpl	\
+	giscanner/doctemplates/mallard/Gjs/default.tmpl		\
+	giscanner/doctemplates/mallard/Gjs/enum.tmpl		\
+	giscanner/doctemplates/mallard/Gjs/function.tmpl	\
+	giscanner/doctemplates/mallard/Gjs/field.tmpl 		\
+	giscanner/doctemplates/mallard/Gjs/interface.tmpl	\
+	giscanner/doctemplates/mallard/Gjs/method.tmpl		\
+	giscanner/doctemplates/mallard/Gjs/namespace.tmpl	\
+	giscanner/doctemplates/mallard/Gjs/property.tmpl	\
+	giscanner/doctemplates/mallard/Gjs/record.tmpl		\
+	giscanner/doctemplates/mallard/Gjs/signal.tmpl		\
+	giscanner/doctemplates/mallard/Gjs/vfunc.tmpl
 
 _giscanner_la_CFLAGS = \
 	$(PYTHON_INCLUDES) \
 	$(GOBJECT_CFLAGS) \
+	$(WARN_CFLAGS_PYTHON) \
 	-I$(top_srcdir)/giscanner
 _giscanner_la_LIBADD = libgiscanner.la $(GOBJECT_LIBS)
 
 _giscanner_la_LDFLAGS = \
+	$(WARN_LDFLAGS) \
 	-module -avoid-version \
 	-export-symbols-regex "init_giscanner|PyInit__giscanner"
 
 if OS_WIN32
 # Windows requires Python extension modules to be explicitly
-# linked to libpython. Extension modules are shared libaries
-# (.dll files), but need to be called .pyd for Python to load
-# them as extension modules.
+# linked to libpython.
 _giscanner_la_LIBADD += \
 	$(PYTHON_LIBS)
 
 _giscanner_la_LDFLAGS += \
 	-no-undefined \
-	-shrext ".pyd"
+	-shrext $(PYTHON_SO)
 endif
 
 _giscanner_la_SOURCES = giscanner/giscannermodule.c
diff --git a/Makefile-msvcproj.am b/Makefile-msvcproj.am
deleted file mode 100644
index bb53e32..0000000
--- a/Makefile-msvcproj.am
+++ /dev/null
@@ -1,82 +0,0 @@
-# This is to fill in Visual C++ projects for projects which add/remove
-# sources from them every now and then.
-
-MSVCPROJS = cmph girepository g-ir-compiler
-
-cmph_FILES = $(libcmph_la_SOURCES)
-cmph_EXCLUDES = dummy
-
-girepository_FILES = $(libgirepository_1_0_la_SOURCES) $(libgirepository_gthash_la_SOURCES)
-girepository_EXCLUDES = gidummy
-girepository_HEADERS_DIR = $(includedir)/gobject-introspection-1.0
-girepository_HEADERS_INST = $(girepo_HEADERS)
-girepository_HEADERS_EXCLUDES = gidummy
-
-g_ir_compiler_FILES = $(libgirepository_gthash_la_SOURCES) $(libgirepository_internals_la_SOURCES)
-g_ir_compiler_EXCLUDES = gidummy
-
-$(top_builddir)/win32/vs9/giscanner.scripts:
-	echo '' >>$(top_builddir)/win32/vs9/giscanner.scripts
-	echo 'mkdir $$(CopyDir)\lib\gobject-introspection\giscanner&#x0D;&#x0A;' >>$(top_builddir)/win32/vs9/giscanner.scripts
-	echo 'mkdir $$(CopyDir)\lib\gobject-introspection\giscanner\collections&#x0D;&#x0A;' >>$(top_builddir)/win32/vs9/giscanner.scripts
-	echo 'mkdir $$(CopyDir)\lib\gobject-introspection\giscanner\doctemplates&#x0D;&#x0A;' >>$(top_builddir)/win32/vs9/giscanner.scripts
-	echo 'mkdir $$(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C&#x0D;&#x0A;' >>$(top_builddir)/win32/vs9/giscanner.scripts
-	echo 'mkdir $$(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs&#x0D;&#x0A;' >>$(top_builddir)/win32/vs9/giscanner.scripts
-	echo 'mkdir $$(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python&#x0D;&#x0A;' >>$(top_builddir)/win32/vs9/giscanner.scripts
-	echo '' >>$(top_builddir)/win32/vs9/giscanner.scripts
-
-	echo '' >>$(top_builddir)/win32/vs10/giscanner.vs10.scripts
-	echo 'mkdir $$(CopyDir)\lib\gobject-introspection\giscanner' >>$(top_builddir)/win32/vs10/giscanner.vs10.scripts
-	echo 'mkdir $$(CopyDir)\lib\gobject-introspection\giscanner\collections' >>$(top_builddir)/win32/vs10/giscanner.vs10.scripts
-	echo 'mkdir $$(CopyDir)\lib\gobject-introspection\giscanner\doctemplates' >>$(top_builddir)/win32/vs10/giscanner.vs10.scripts
-	echo 'mkdir $$(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C' >>$(top_builddir)/win32/vs10/giscanner.vs10.scripts
-	echo 'mkdir $$(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs' >>$(top_builddir)/win32/vs10/giscanner.vs10.scripts
-	echo 'mkdir $$(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python' >>$(top_builddir)/win32/vs10/giscanner.vs10.scripts
-
-	for F in `echo $(pkgpyexec_PYTHON) $(collections_PYTHON) $(nobase_dist_template_DATA) | tr '/' '\\\\'`; do \
-		case $$F in \
-		giscanner\\doctemplates\\C\\*.tmpl) echo 'copy ..\..\'$$F' $$(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C&#x0D;&#x0A;' \
-			;; \
-		giscanner\\doctemplates\\Gjs\\*.tmpl) echo 'copy ..\..\'$$F' $$(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs&#x0D;&#x0A;' \
-			;; \
-		giscanner\\doctemplates\\Python\\*.tmpl) echo 'copy ..\..\'$$F' $$(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python&#x0D;&#x0A;' \
-			;; \
-		giscanner\\doctemplates\\*.tmpl) echo 'copy ..\..\'$$F' $$(CopyDir)\lib\gobject-introspection\giscanner\doctemplates&#x0D;&#x0A;' \
-			;; \
-		giscanner\\collections\\*.py) echo 'copy ..\..\'$$F' $$(CopyDir)\lib\gobject-introspection\giscanner\collections&#x0D;&#x0A;' \
-			;; \
-		giscanner\\*.py) echo 'copy ..\..\'$$F' $$(CopyDir)\lib\gobject-introspection\giscanner&#x0D;&#x0A;' \
-			;; \
-		esac; \
-	done >>$(top_builddir)/win32/vs9/giscanner.scripts
-
-	for F in `echo $(pkgpyexec_PYTHON) $(collections_PYTHON) $(nobase_dist_template_DATA) | tr '/' '\\\\'`; do \
-		case $$F in \
-		giscanner\\doctemplates\\C\\*.tmpl) echo 'copy ..\..\'$$F' $$(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C' \
-			;; \
-		giscanner\\doctemplates\\Gjs\\*.tmpl) echo 'copy ..\..\'$$F' $$(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs' \
-			;; \
-		giscanner\\doctemplates\\Python\\*.tmpl) echo 'copy ..\..\'$$F' $$(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python' \
-			;; \
-		giscanner\\doctemplates\\*.tmpl) echo 'copy ..\..\'$$F' $$(CopyDir)\lib\gobject-introspection\giscanner\doctemplates' \
-			;; \
-		giscanner\\collections\\*.py) echo 'copy ..\..\'$$F' $$(CopyDir)\lib\gobject-introspection\giscanner\collections' \
-			;; \
-		giscanner\\*.py) echo 'copy ..\..\'$$F' $$(CopyDir)\lib\gobject-introspection\giscanner' \
-			;; \
-		esac; \
-	done >>$(top_builddir)/win32/vs10/giscanner.vs10.scripts
-
-include $(top_srcdir)/win32/Makefile.msvcproj
-
-# Autotools: Why must we do this instead of 'dist-hook'?
-MSVCPROJ_GENERATED = \
-	$(top_builddir)/win32/vs9/cmph.vcproj	\
-	$(top_builddir)/win32/vs9/girepository.vcproj	\
-	$(top_builddir)/win32/vs9/g-ir-compiler.vcproj
-
-$(MSVCPROJ_GENERATED): $(top_builddir)/win32/vs9/girepository.headers $(top_builddir)/win32/vs9/giscanner.scripts
-
-EXTRA_DIST += $(MSVCPROJ_GENERATED) config.h.win32
-
-DISTCLEANFILES = config.h.win32
diff --git a/Makefile-tools.am b/Makefile-tools.am
index 9529373..8c4a069 100644
--- a/Makefile-tools.am
+++ b/Makefile-tools.am
@@ -6,7 +6,8 @@ bin_SCRIPTS += g-ir-doc-tool
 endif
 
 EXTRA_DIST += 				\
-	tools/g-ir-tool-template.in
+	tools/g-ir-tool-template.in \
+	tools/meson.build
 
 TOOL_SUBSTITUTIONS = -e s,@libdir\@,$(libdir), -e s,@datarootdir\@,$(datarootdir), -e s,@PYTHON\@,$(PYTHON),
 
@@ -23,25 +24,26 @@ g-ir-doc-tool: tools/g-ir-tool-template.in _giscanner.la Makefile
 	@chmod a+x $@
 
 g_ir_compiler_SOURCES = tools/compiler.c
-g_ir_compiler_CPPFLAGS = -DGIREPO_DEFAULT_SEARCH_PATH="\"$(libdir)\"" \
-			 -I$(top_srcdir)/girepository
-g_ir_compiler_CFLAGS = $(GIO_CFLAGS)
+g_ir_compiler_CPPFLAGS = -I$(top_srcdir)/girepository
+g_ir_compiler_CFLAGS = $(GIO_CFLAGS) $(WARN_CFLAGS)
+g_ir_compiler_LDFLAGS = $(WARN_LDFLAGS)
 g_ir_compiler_LDADD = \
 	libgirepository-internals.la	\
 	libgirepository-1.0.la		\
 	$(GIREPO_LIBS)
 
 g_ir_generate_SOURCES = tools/generate.c
-g_ir_generate_CPPFLAGS = -DGIREPO_DEFAULT_SEARCH_PATH="\"$(libdir)\"" \
-			 -I$(top_srcdir)/girepository
-g_ir_generate_CFLAGS = $(GIO_CFLAGS)
+g_ir_generate_CPPFLAGS = -I$(top_srcdir)/girepository
+g_ir_generate_CFLAGS = $(GIO_CFLAGS) $(WARN_CFLAGS)
+g_ir_generate_LDFLAGS = $(WARN_LDFLAGS)
 g_ir_generate_LDADD = \
 	libgirepository-internals.la	\
 	libgirepository-1.0.la		\
 	$(GIREPO_LIBS)
 
 g_ir_inspect_SOURCES = tools/g-ir-inspect.c
-g_ir_inspect_CFLAGS = $(GIO_CFLAGS) -I$(top_srcdir)/girepository
+g_ir_inspect_CFLAGS = $(GIO_CFLAGS)  $(WARN_CFLAGS) -I$(top_srcdir)/girepository
+g_ir_inspect_LDFLAGS = $(WARN_LDFLAGS)
 g_ir_inspect_LDADD = \
         libgirepository-1.0.la	\
         $(GIREPO_LIBS)
diff --git a/Makefile.am b/Makefile.am
index dafea38..e071ec2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -23,12 +23,11 @@ include Makefile-giscanner.am
 include Makefile-examples.am
 include Makefile-gir.am
 include Makefile-tools.am
-include Makefile-msvcproj.am
 
 ## Process this file with automake to produce Makefile.in
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 
-SUBDIRS = . docs tests win32
+SUBDIRS = . docs tests
 
 DIST_SUBDIRS = $(SUBDIRS)
 DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-doctool
@@ -51,7 +50,6 @@ EXTRA_DIST += 			\
 	COPYING.LGPL		\
 	COPYING.GPL		\
 	autogen.sh		\
-	CONTRIBUTORS		\
 	$(pkgconfig_DATA)	\
 	$(man_MANS)		\
 	$(m4_DATA)		\
@@ -59,7 +57,11 @@ EXTRA_DIST += 			\
 	misc/pyflakes.py	\
 	misc/update-glib-annotations.py	\
 	misc/update-gtkdoc-tests.py	\
-	misc/verbump.py
+	misc/verbump.py		\
+	README.rst \
+	MSVC.README.rst \
+	meson.build \
+	meson_options.txt
 
 # Default pep8.py --exclude + emacs backup files
 PEP8_EXCLUDES=--exclude='.svn,CVS,.bzr,.hg,.git,__pycache__,.\#*'
diff --git a/Makefile.in b/Makefile.in
index a3d8822..01cc4c3 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -62,43 +62,6 @@
 #   CLEANFILES = $(dist_gir_DATA) $(typelib_DATA)
 #
 
-# This is to fill in Visual C++ projects for projects which add/remove
-# sources from them every now and then.
-
-# Author: Fan, Chun-wei
-# Common Autotools file used to generate Visual Studio 2008+
-# Projects from their templates
-
-# This autotools file, from GLib, can be used in other projects
-# that have Visual Studio build support.
-
-# * Input variables:
-#
-#   MSVCPROJS - List of Projects that should be generated
-#
-# * Simple tutorial
-#
-# Add this to Makefile.am where your library/program is built:
-#   include <this Makefile.msvcproj>
-#   MSVCPROJS = YourProject (can be multiple projects in a single srcdir)
-#   YourProject_FILES = $(libyourlib_1_0_SOURCES)
-#   YourProject_EXCLUDES = ... # list of sources to exclude, separated by '|', wildcards allowed; use random unsed value if none
-#   (the following 3 lines if headers need to be installed)
-#   YourProject_HEADERS_DIR = $(libyourlibincludedir)
-#   YourProject_HEADERS_INST = $(libyourlib_1_0_HEADERS)
-#   YourProject_HEADERS_EXCLUDES = ... # <list of headers to exclude from installation, separated by '|', wildcards allowed; use random unsed value if none>
-#
-#   dist-hook: \ # (or add to it if it is already there, note the vs9 items will also call the vs10 items in the process)
-#   	$(top_builddir)/win32/vs9/YourProject.vcproj	\
-#   	$(top_builddir)/win32/vs9/YourProject.headers	# if headers need to be installed
-#
-#   --or, if Visual Studio 2013 or later is required--
-#   dist-hook: \ # (or add to it if it is already there, this does -not- call other vs items in the process)
-#	$(top_builddir)/win32/vs12/YourProject.vcxproj	\
-#	$(top_builddir)/win32/vs12/YourProject.vs12.headers	# if headers need to be installed
-
-# Private functions
-
 
 
 
@@ -186,15 +149,13 @@ TESTS = cmph-bdz-test$(EXEEXT) gthash-test$(EXEEXT)
 @OS_WIN32_FALSE@am__append_1 = gi-dump-types
 
 # Windows requires Python extension modules to be explicitly
-# linked to libpython. Extension modules are shared libaries
-# (.dll files), but need to be called .pyd for Python to load
-# them as extension modules.
+# linked to libpython.
 @OS_WIN32_TRUE@am__append_2 = \
 @OS_WIN32_TRUE@	$(PYTHON_LIBS)
 
 @OS_WIN32_TRUE@am__append_3 = \
 @OS_WIN32_TRUE@	-no-undefined \
-@OS_WIN32_TRUE@	-shrext ".pyd"
+@OS_WIN32_TRUE@	-shrext $(PYTHON_SO)
 
 @HAVE_GIO_UNIX_TRUE@am__append_4 = $(GLIB_INCLUDEDIR)/glib-unix.h
 @BUILD_DOCTOOL_TRUE@am__append_5 = g-ir-doc-tool
@@ -208,16 +169,16 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
-	$(am__configure_deps) $(collections_PYTHON) \
-	$(pkgpyexec_PYTHON) $(dist_make_DATA) \
+	$(am__configure_deps) $(pkgpyexec_PYTHON) $(dist_make_DATA) \
 	$(nobase_dist_template_DATA) $(girepo_HEADERS) \
 	$(am__DIST_COMMON)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
  configure.lineno config.status.lineno
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES = gobject-introspection-1.0.pc \
-	gobject-introspection-no-export-1.0.pc config.h.win32
+CONFIG_CLEAN_FILES = giscanner/_version.py \
+	gobject-introspection-1.0.pc \
+	gobject-introspection-no-export-1.0.pc
 CONFIG_CLEAN_VPATH_FILES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
@@ -248,12 +209,11 @@ am__uninstall_files_from_dir = { \
   }
 am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgpyexecdir)" \
 	"$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" \
-	"$(DESTDIR)$(collectionsdir)" "$(DESTDIR)$(pkgpyexecdir)" \
-	"$(DESTDIR)$(man1dir)" "$(DESTDIR)$(makedir)" \
-	"$(DESTDIR)$(gdumpdir)" "$(DESTDIR)$(girdir)" \
-	"$(DESTDIR)$(m4dir)" "$(DESTDIR)$(templatedir)" \
-	"$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(typelibsdir)" \
-	"$(DESTDIR)$(girepodir)"
+	"$(DESTDIR)$(pkgpyexecdir)" "$(DESTDIR)$(man1dir)" \
+	"$(DESTDIR)$(makedir)" "$(DESTDIR)$(gdumpdir)" \
+	"$(DESTDIR)$(girdir)" "$(DESTDIR)$(m4dir)" \
+	"$(DESTDIR)$(templatedir)" "$(DESTDIR)$(pkgconfigdir)" \
+	"$(DESTDIR)$(typelibsdir)" "$(DESTDIR)$(girepodir)"
 LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES) \
 	$(pkgpyexec_LTLIBRARIES)
 am__DEPENDENCIES_1 =
@@ -332,8 +292,8 @@ libgirepository_gthash_la_OBJECTS =  \
 	$(am_libgirepository_gthash_la_OBJECTS)
 libgirepository_gthash_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(libgirepository_gthash_la_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+	$(libgirepository_gthash_la_CFLAGS) $(CFLAGS) \
+	$(libgirepository_gthash_la_LDFLAGS) $(LDFLAGS) -o $@
 libgirepository_internals_la_DEPENDENCIES = libgirepository-gthash.la \
 	$(am__DEPENDENCIES_1)
 am_libgirepository_internals_la_OBJECTS =  \
@@ -346,8 +306,8 @@ libgirepository_internals_la_OBJECTS =  \
 	$(am_libgirepository_internals_la_OBJECTS)
 libgirepository_internals_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(libgirepository_internals_la_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+	$(libgirepository_internals_la_CFLAGS) $(CFLAGS) \
+	$(libgirepository_internals_la_LDFLAGS) $(LDFLAGS) -o $@
 libgiscanner_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1)
 am_libgiscanner_la_OBJECTS =  \
@@ -357,8 +317,8 @@ am_libgiscanner_la_OBJECTS =  \
 libgiscanner_la_OBJECTS = $(am_libgiscanner_la_OBJECTS)
 libgiscanner_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(libgiscanner_la_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
-	-o $@
+	$(libgiscanner_la_CFLAGS) $(CFLAGS) $(libgiscanner_la_LDFLAGS) \
+	$(LDFLAGS) -o $@
 @OS_WIN32_FALSE@am__EXEEXT_1 = gi-dump-types$(EXEEXT)
 PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
 am_cmph_bdz_test_OBJECTS =  \
@@ -374,21 +334,21 @@ g_ir_compiler_DEPENDENCIES = libgirepository-internals.la \
 	libgirepository-1.0.la $(am__DEPENDENCIES_1)
 g_ir_compiler_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(g_ir_compiler_CFLAGS) \
-	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+	$(CFLAGS) $(g_ir_compiler_LDFLAGS) $(LDFLAGS) -o $@
 am_g_ir_generate_OBJECTS = tools/g_ir_generate-generate.$(OBJEXT)
 g_ir_generate_OBJECTS = $(am_g_ir_generate_OBJECTS)
 g_ir_generate_DEPENDENCIES = libgirepository-internals.la \
 	libgirepository-1.0.la $(am__DEPENDENCIES_1)
 g_ir_generate_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(g_ir_generate_CFLAGS) \
-	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+	$(CFLAGS) $(g_ir_generate_LDFLAGS) $(LDFLAGS) -o $@
 am_g_ir_inspect_OBJECTS = tools/g_ir_inspect-g-ir-inspect.$(OBJEXT)
 g_ir_inspect_OBJECTS = $(am_g_ir_inspect_OBJECTS)
 g_ir_inspect_DEPENDENCIES = libgirepository-1.0.la \
 	$(am__DEPENDENCIES_1)
 g_ir_inspect_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(g_ir_inspect_CFLAGS) \
-	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+	$(CFLAGS) $(g_ir_inspect_LDFLAGS) $(LDFLAGS) -o $@
 am__gi_dump_types_SOURCES_DIST = girepository/gdump.c \
 	girepository/gi-dump-types.c
 @OS_WIN32_FALSE@am_gi_dump_types_OBJECTS =  \
@@ -399,13 +359,13 @@ gi_dump_types_OBJECTS = $(am_gi_dump_types_OBJECTS)
 @OS_WIN32_FALSE@	$(am__DEPENDENCIES_1)
 gi_dump_types_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(gi_dump_types_CFLAGS) \
-	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+	$(CFLAGS) $(gi_dump_types_LDFLAGS) $(LDFLAGS) -o $@
 am_glib_print_OBJECTS = examples/glib_print-glib-print.$(OBJEXT)
 glib_print_OBJECTS = $(am_glib_print_OBJECTS)
 glib_print_DEPENDENCIES = libgirepository-1.0.la $(am__DEPENDENCIES_1)
 glib_print_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(glib_print_CFLAGS) \
-	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+	$(CFLAGS) $(glib_print_LDFLAGS) $(LDFLAGS) -o $@
 am_gthash_test_OBJECTS = girepository/gthash_test-gthash.$(OBJEXT) \
 	girepository/gthash_test-gthash-test.$(OBJEXT)
 gthash_test_OBJECTS = $(am_gthash_test_OBJECTS)
@@ -716,10 +676,9 @@ TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \
 am__DIST_COMMON = $(srcdir)/Makefile-cmph.am \
 	$(srcdir)/Makefile-examples.am $(srcdir)/Makefile-gir.am \
 	$(srcdir)/Makefile-girepository.am \
-	$(srcdir)/Makefile-giscanner.am $(srcdir)/Makefile-msvcproj.am \
-	$(srcdir)/Makefile-tools.am $(srcdir)/Makefile.in \
-	$(srcdir)/Makefile.introspection $(srcdir)/common.mk \
-	$(srcdir)/config.h.in $(srcdir)/config.h.win32.in \
+	$(srcdir)/Makefile-giscanner.am $(srcdir)/Makefile-tools.am \
+	$(srcdir)/Makefile.in $(srcdir)/Makefile.introspection \
+	$(srcdir)/common.mk $(srcdir)/config.h.in \
 	$(srcdir)/gobject-introspection-1.0.pc.in \
 	$(srcdir)/gobject-introspection-no-export-1.0.pc.in \
 	$(top_srcdir)/build-aux/compile \
@@ -732,12 +691,12 @@ am__DIST_COMMON = $(srcdir)/Makefile-cmph.am \
 	$(top_srcdir)/build-aux/py-compile \
 	$(top_srcdir)/build-aux/test-driver \
 	$(top_srcdir)/build-aux/ylwrap \
-	$(top_srcdir)/win32/Makefile.msvcproj AUTHORS COPYING \
-	ChangeLog NEWS README TODO build-aux/compile \
-	build-aux/config.guess build-aux/config.sub build-aux/depcomp \
-	build-aux/install-sh build-aux/ltmain.sh build-aux/missing \
-	build-aux/py-compile build-aux/ylwrap giscanner/scannerlexer.c \
-	giscanner/scannerparser.c giscanner/scannerparser.h
+	$(top_srcdir)/giscanner/_version.py.in COPYING NEWS TODO \
+	build-aux/compile build-aux/config.guess build-aux/config.sub \
+	build-aux/depcomp build-aux/install-sh build-aux/ltmain.sh \
+	build-aux/missing build-aux/py-compile build-aux/ylwrap \
+	giscanner/scannerlexer.c giscanner/scannerparser.c \
+	giscanner/scannerparser.h
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
@@ -892,6 +851,7 @@ PYTHON_INCLUDES = @PYTHON_INCLUDES@
 PYTHON_LIBS = @PYTHON_LIBS@
 PYTHON_PLATFORM = @PYTHON_PLATFORM@
 PYTHON_PREFIX = @PYTHON_PREFIX@
+PYTHON_SO = @PYTHON_SO@
 PYTHON_VERSION = @PYTHON_VERSION@
 RANLIB = @RANLIB@
 SCANNER_CFLAGS = @SCANNER_CFLAGS@
@@ -901,6 +861,11 @@ SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
+WARN_CFLAGS = @WARN_CFLAGS@
+WARN_CFLAGS_FLEX = @WARN_CFLAGS_FLEX@
+WARN_CFLAGS_PYTHON = @WARN_CFLAGS_PYTHON@
+WARN_LDFLAGS = @WARN_LDFLAGS@
+WARN_SCANNERFLAGS = @WARN_SCANNERFLAGS@
 YACC = @YACC@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
@@ -963,14 +928,16 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 man_MANS = docs/g-ir-compiler.1 docs/g-ir-generate.1 \
 	docs/g-ir-scanner.1
-EXTRA_DIST = girepository/docs.c $(STATIC_GIRSOURCES) \
+EXTRA_DIST = girepository/cmph/meson.build girepository/docs.c \
+	girepository/meson.build giscanner/meson.build \
+	examples/meson.build $(STATIC_GIRSOURCES) gir/meson.build \
 	gir/cairo-1.0.gir.in gir/glib-2.0.c gir/gmodule-2.0.c \
 	gir/gobject-2.0.c gir/gio-2.0.c tools/g-ir-tool-template.in \
-	$(MSVCPROJ_GENERATED) config.h.win32 COPYING.LGPL COPYING.GPL \
-	autogen.sh CONTRIBUTORS $(pkgconfig_DATA) $(man_MANS) \
-	$(m4_DATA) misc/pep8.py misc/pyflakes.py \
-	misc/update-glib-annotations.py misc/update-gtkdoc-tests.py \
-	misc/verbump.py
+	tools/meson.build COPYING.LGPL COPYING.GPL autogen.sh \
+	$(pkgconfig_DATA) $(man_MANS) $(m4_DATA) misc/pep8.py \
+	misc/pyflakes.py misc/update-glib-annotations.py \
+	misc/update-gtkdoc-tests.py misc/verbump.py README.rst \
+	MSVC.README.rst meson.build meson_options.txt
 lib_LTLIBRARIES = libgirepository-1.0.la
 noinst_LTLIBRARIES = libgirepository-internals.la \
 	libgirepository-gthash.la libgiscanner.la
@@ -1052,12 +1019,8 @@ _gir_includes = $(foreach include,$($(_gir_name)_INCLUDES),--include=$(include))
 _gir_export_packages = $(foreach pkg,$($(_gir_name)_EXPORT_PACKAGES),--pkg-export=$(pkg))
 _gir_c_includes = $(foreach include,$($(_gir_name)_C_INCLUDES),--c-include=$(include))
 
-# Reuse the LIBTOOL variable from automake if it's set, but
-# work around MSYS weirdness: When running g-ir-scanner, MSYS changes
-# a command-line argument --libtool="/bin/sh ../../libtool" into
-# --libtool=c:/opt/msys/1.0/bin/libtool. So just use sh.exe without path
-# because we already "know" where the libtool configure produced is.
-_gir_libtool = $(if $(findstring MINGW,$(shell uname -s)),--libtool="$(top_builddir)/libtool",$(if $(LIBTOOL),--libtool="$(LIBTOOL)"))
+# Reuse the LIBTOOL variable from automake if it's set
+_gir_libtool = $(if $(LIBTOOL),--libtool="$(LIBTOOL)")
 
 # Macros for AM_SILENT_RULES prettiness
 _gir_verbosity = $(if $(AM_DEFAULT_VERBOSITY),$(AM_DEFAULT_VERBOSITY),1)
@@ -1167,10 +1130,14 @@ libgirepository_gthash_la_SOURCES = \
 	girepository/gthash.c
 
 libgirepository_gthash_la_CFLAGS = \
+	$(WARN_CFLAGS) \
 	$(GIREPO_CFLAGS)	\
 	$(GI_HIDDEN_VISIBILITY_CFLAGS)	\
 	-I$(top_srcdir)/girepository
 
+libgirepository_gthash_la_LDFLAGS = \
+	$(WARN_LDFLAGS)
+
 libgirepository_gthash_la_LIBADD = libcmph.la $(GIREPO_LIBS)
 libgirepository_internals_la_SOURCES = \
 	girepository/girmodule.c				\
@@ -1184,10 +1151,14 @@ libgirepository_internals_la_SOURCES = \
 	girepository/girwriter.h
 
 libgirepository_internals_la_CFLAGS = \
+	$(WARN_CFLAGS) \
 	$(GIREPO_CFLAGS)	\
 	$(GI_HIDDEN_VISIBILITY_CFLAGS)	\
 	-I$(top_srcdir)/girepository
 
+libgirepository_internals_la_LDFLAGS = \
+	$(WARN_LDFLAGS)
+
 libgirepository_internals_la_LIBADD = libgirepository-gthash.la $(GIREPO_LIBS)
 libgirepository_1_0_la_SOURCES = \
 	girepository/gdump.c				\
@@ -1216,6 +1187,7 @@ libgirepository_1_0_la_SOURCES = \
 	girepository/givfuncinfo.c
 
 libgirepository_1_0_la_CPPFLAGS = \
+	$(WARN_CFLAGS) \
 	$(GIREPO_CFLAGS)	\
 	$(GI_HIDDEN_VISIBILITY_CFLAGS)	\
 	-I$(top_srcdir)/girepository	\
@@ -1223,13 +1195,15 @@ libgirepository_1_0_la_CPPFLAGS = \
 
 libgirepository_1_0_la_LIBADD = libgirepository-gthash.la $(GIREPO_LIBS)
 libgirepository_1_0_la_LDFLAGS = \
+	$(WARN_LDFLAGS) \
 	$(EXTRA_LINK_FLAGS) \
 	-no-undefined -version-number 1:0:0
 
 gdumpdir = $(datadir)/gobject-introspection-1.0/
 gdump_DATA = girepository/gdump.c
 @OS_WIN32_FALSE@gi_dump_types_SOURCES = girepository/gdump.c girepository/gi-dump-types.c
-@OS_WIN32_FALSE@gi_dump_types_CFLAGS = $(GIO_UNIX_CFLAGS) $(GMODULE_CFLAGS)
+@OS_WIN32_FALSE@gi_dump_types_CFLAGS = $(GIO_UNIX_CFLAGS) $(GMODULE_CFLAGS) $(WARN_CFLAGS)
+@OS_WIN32_FALSE@gi_dump_types_LDFLAGS = $(WARN_LDFLAGS)
 @OS_WIN32_FALSE@gi_dump_types_LDADD = $(GIO_UNIX_LIBS) $(GMODULE_LIBS)
 gthash_test_SOURCES = girepository/gthash.c girepository/gthash-test.c
 gthash_test_CFLAGS = -I$(top_srcdir)/girepository $(GOBJECT_CFLAGS)
@@ -1243,10 +1217,12 @@ libgiscanner_la_SOURCES = \
 
 libgiscanner_la_CPPFLAGS = -I$(top_srcdir)/girepository -I$(top_srcdir)/giscanner
 libgiscanner_la_LIBADD = $(GOBJECT_LIBS) $(GIO_LIBS)
-libgiscanner_la_CFLAGS = $(GOBJECT_CFLAGS) $(GIO_CFLAGS)
+libgiscanner_la_CFLAGS = $(GOBJECT_CFLAGS) $(GIO_CFLAGS) $(WARN_CFLAGS_FLEX)
+libgiscanner_la_LDFLAGS = $(WARN_LDFLAGS)
 pkgpyexec_LTLIBRARIES = _giscanner.la
 pkgpyexec_PYTHON = \
 	giscanner/__init__.py		\
+	giscanner/_version.py		\
 	giscanner/annotationmain.py	\
 	giscanner/annotationparser.py	\
 	giscanner/ast.py		\
@@ -1256,88 +1232,86 @@ pkgpyexec_PYTHON = \
 	giscanner/docmain.py		\
 	giscanner/docwriter.py		\
 	giscanner/dumper.py		\
-	giscanner/introspectablepass.py	\
+	giscanner/gdumpparser.py 	\
 	giscanner/girparser.py		\
 	giscanner/girwriter.py		\
-	giscanner/gdumpparser.py 	\
+	giscanner/introspectablepass.py	\
 	giscanner/libtoolimporter.py	\
 	giscanner/maintransformer.py	\
 	giscanner/message.py		\
 	giscanner/msvccompiler.py	\
-	giscanner/shlibs.py		\
+	giscanner/pkgconfig.py		\
 	giscanner/scannermain.py	\
 	giscanner/sectionparser.py	\
+	giscanner/shlibs.py		\
 	giscanner/sourcescanner.py	\
 	giscanner/testcodegen.py	\
 	giscanner/transformer.py	\
 	giscanner/utils.py		\
 	giscanner/xmlwriter.py
 
-collectionsdir = $(pkgpyexecdir)/collections
-collections_PYTHON = \
-	giscanner/collections/__init__.py	\
-	giscanner/collections/counter.py	\
-	giscanner/collections/ordereddict.py
-
 templatedir = $(pkglibdir)
 nobase_dist_template_DATA = \
-	giscanner/doctemplates/base.tmpl	\
-	giscanner/doctemplates/class.tmpl	\
-	giscanner/doctemplates/namespace.tmpl	\
-	giscanner/doctemplates/C/callback.tmpl 	\
-	giscanner/doctemplates/C/class.tmpl	\
-	giscanner/doctemplates/C/constructor.tmpl	\
-	giscanner/doctemplates/C/default.tmpl	\
-	giscanner/doctemplates/C/enum.tmpl	\
-	giscanner/doctemplates/C/function.tmpl	\
-	giscanner/doctemplates/C/field.tmpl 	\
-	giscanner/doctemplates/C/interface.tmpl	\
-	giscanner/doctemplates/C/method.tmpl		\
-	giscanner/doctemplates/C/namespace.tmpl	\
-	giscanner/doctemplates/C/property.tmpl	\
-	giscanner/doctemplates/C/record.tmpl	\
-	giscanner/doctemplates/C/signal.tmpl	\
-	giscanner/doctemplates/C/vfunc.tmpl	\
-	giscanner/doctemplates/Python/callback.tmpl 	\
-	giscanner/doctemplates/Python/class.tmpl	\
-	giscanner/doctemplates/Python/constructor.tmpl	\
-	giscanner/doctemplates/Python/default.tmpl	\
-	giscanner/doctemplates/Python/enum.tmpl	\
-	giscanner/doctemplates/Python/function.tmpl	\
-	giscanner/doctemplates/Python/field.tmpl 	\
-	giscanner/doctemplates/Python/interface.tmpl	\
-	giscanner/doctemplates/Python/method.tmpl	\
-	giscanner/doctemplates/Python/namespace.tmpl	\
-	giscanner/doctemplates/Python/property.tmpl	\
-	giscanner/doctemplates/Python/record.tmpl	\
-	giscanner/doctemplates/Python/signal.tmpl	\
-	giscanner/doctemplates/Python/vfunc.tmpl	\
-	giscanner/doctemplates/Gjs/callback.tmpl 	\
-	giscanner/doctemplates/Gjs/class.tmpl	\
-	giscanner/doctemplates/Gjs/constructor.tmpl	\
-	giscanner/doctemplates/Gjs/default.tmpl	\
-	giscanner/doctemplates/Gjs/enum.tmpl	\
-	giscanner/doctemplates/Gjs/function.tmpl	\
-	giscanner/doctemplates/Gjs/field.tmpl 	\
-	giscanner/doctemplates/Gjs/interface.tmpl	\
-	giscanner/doctemplates/Gjs/method.tmpl	\
-	giscanner/doctemplates/Gjs/namespace.tmpl	\
-	giscanner/doctemplates/Gjs/property.tmpl	\
-	giscanner/doctemplates/Gjs/record.tmpl	\
-	giscanner/doctemplates/Gjs/signal.tmpl	\
-	giscanner/doctemplates/Gjs/vfunc.tmpl
+	giscanner/doctemplates/mallard/base.tmpl		\
+	giscanner/doctemplates/mallard/class.tmpl		\
+	giscanner/doctemplates/mallard/namespace.tmpl		\
+	giscanner/doctemplates/mallard/C/callback.tmpl 		\
+	giscanner/doctemplates/mallard/C/class.tmpl		\
+	giscanner/doctemplates/mallard/C/constructor.tmpl	\
+	giscanner/doctemplates/mallard/C/default.tmpl		\
+	giscanner/doctemplates/mallard/C/enum.tmpl		\
+	giscanner/doctemplates/mallard/C/function.tmpl		\
+	giscanner/doctemplates/mallard/C/field.tmpl 		\
+	giscanner/doctemplates/mallard/C/interface.tmpl		\
+	giscanner/doctemplates/mallard/C/method.tmpl		\
+	giscanner/doctemplates/mallard/C/namespace.tmpl		\
+	giscanner/doctemplates/mallard/C/property.tmpl		\
+	giscanner/doctemplates/mallard/C/record.tmpl		\
+	giscanner/doctemplates/mallard/C/signal.tmpl		\
+	giscanner/doctemplates/mallard/C/vfunc.tmpl		\
+	giscanner/doctemplates/mallard/Python/callback.tmpl 	\
+	giscanner/doctemplates/mallard/Python/class.tmpl	\
+	giscanner/doctemplates/mallard/Python/constructor.tmpl	\
+	giscanner/doctemplates/mallard/Python/default.tmpl	\
+	giscanner/doctemplates/mallard/Python/enum.tmpl		\
+	giscanner/doctemplates/mallard/Python/function.tmpl	\
+	giscanner/doctemplates/mallard/Python/field.tmpl 	\
+	giscanner/doctemplates/mallard/Python/interface.tmpl	\
+	giscanner/doctemplates/mallard/Python/method.tmpl	\
+	giscanner/doctemplates/mallard/Python/namespace.tmpl	\
+	giscanner/doctemplates/mallard/Python/property.tmpl	\
+	giscanner/doctemplates/mallard/Python/record.tmpl	\
+	giscanner/doctemplates/mallard/Python/signal.tmpl	\
+	giscanner/doctemplates/mallard/Python/vfunc.tmpl	\
+	giscanner/doctemplates/mallard/Gjs/callback.tmpl 	\
+	giscanner/doctemplates/mallard/Gjs/class.tmpl		\
+	giscanner/doctemplates/mallard/Gjs/constructor.tmpl	\
+	giscanner/doctemplates/mallard/Gjs/default.tmpl		\
+	giscanner/doctemplates/mallard/Gjs/enum.tmpl		\
+	giscanner/doctemplates/mallard/Gjs/function.tmpl	\
+	giscanner/doctemplates/mallard/Gjs/field.tmpl 		\
+	giscanner/doctemplates/mallard/Gjs/interface.tmpl	\
+	giscanner/doctemplates/mallard/Gjs/method.tmpl		\
+	giscanner/doctemplates/mallard/Gjs/namespace.tmpl	\
+	giscanner/doctemplates/mallard/Gjs/property.tmpl	\
+	giscanner/doctemplates/mallard/Gjs/record.tmpl		\
+	giscanner/doctemplates/mallard/Gjs/signal.tmpl		\
+	giscanner/doctemplates/mallard/Gjs/vfunc.tmpl
 
 _giscanner_la_CFLAGS = \
 	$(PYTHON_INCLUDES) \
 	$(GOBJECT_CFLAGS) \
+	$(WARN_CFLAGS_PYTHON) \
 	-I$(top_srcdir)/giscanner
 
 _giscanner_la_LIBADD = libgiscanner.la $(GOBJECT_LIBS) $(am__append_2)
-_giscanner_la_LDFLAGS = -module -avoid-version -export-symbols-regex \
-	"init_giscanner|PyInit__giscanner" $(am__append_3)
+_giscanner_la_LDFLAGS = $(WARN_LDFLAGS) -module -avoid-version \
+	-export-symbols-regex "init_giscanner|PyInit__giscanner" \
+	$(am__append_3)
 _giscanner_la_SOURCES = giscanner/giscannermodule.c
 glib_print_SOURCES = examples/glib-print.c
-glib_print_CFLAGS = $(GOBJECT_CFLAGS) -I$(top_srcdir)/girepository
+glib_print_CFLAGS = $(GOBJECT_CFLAGS) $(WARN_CFLAGS) -I$(top_srcdir)/girepository
+glib_print_LDFLAGS = $(WARN_LDFLAGS)
 glib_print_LDADD = libgirepository-1.0.la $(GOBJECT_LIBS)
 BUILT_GIRSOURCES = GLib-2.0.gir GObject-2.0.gir GModule-2.0.gir \
 	Gio-2.0.gir GIRepository-2.0.gir
@@ -1478,7 +1452,7 @@ Gio_2_0_gir_FILES = \
 
 GIRepository_2_0_gir_LIBS = libgirepository-1.0.la
 GIRepository_2_0_gir_SCANNERFLAGS = \
-	--warn-all \
+        $(WARN_SCANNERFLAGS) \
         --identifier-prefix=GI \
         --symbol-prefix=g \
         --c-include="girepository.h" \
@@ -1505,27 +1479,26 @@ typelibsdir = $(libdir)/girepository-1.0
 typelibs_DATA = $(gir_DATA:.gir=.typelib)
 TOOL_SUBSTITUTIONS = -e s,@libdir\@,$(libdir), -e s,@datarootdir\@,$(datarootdir), -e s,@PYTHON\@,$(PYTHON),
 g_ir_compiler_SOURCES = tools/compiler.c
-g_ir_compiler_CPPFLAGS = -DGIREPO_DEFAULT_SEARCH_PATH="\"$(libdir)\"" \
-			 -I$(top_srcdir)/girepository
-
-g_ir_compiler_CFLAGS = $(GIO_CFLAGS)
+g_ir_compiler_CPPFLAGS = -I$(top_srcdir)/girepository
+g_ir_compiler_CFLAGS = $(GIO_CFLAGS) $(WARN_CFLAGS)
+g_ir_compiler_LDFLAGS = $(WARN_LDFLAGS)
 g_ir_compiler_LDADD = \
 	libgirepository-internals.la	\
 	libgirepository-1.0.la		\
 	$(GIREPO_LIBS)
 
 g_ir_generate_SOURCES = tools/generate.c
-g_ir_generate_CPPFLAGS = -DGIREPO_DEFAULT_SEARCH_PATH="\"$(libdir)\"" \
-			 -I$(top_srcdir)/girepository
-
-g_ir_generate_CFLAGS = $(GIO_CFLAGS)
+g_ir_generate_CPPFLAGS = -I$(top_srcdir)/girepository
+g_ir_generate_CFLAGS = $(GIO_CFLAGS) $(WARN_CFLAGS)
+g_ir_generate_LDFLAGS = $(WARN_LDFLAGS)
 g_ir_generate_LDADD = \
 	libgirepository-internals.la	\
 	libgirepository-1.0.la		\
 	$(GIREPO_LIBS)
 
 g_ir_inspect_SOURCES = tools/g-ir-inspect.c
-g_ir_inspect_CFLAGS = $(GIO_CFLAGS) -I$(top_srcdir)/girepository
+g_ir_inspect_CFLAGS = $(GIO_CFLAGS)  $(WARN_CFLAGS) -I$(top_srcdir)/girepository
+g_ir_inspect_LDFLAGS = $(WARN_LDFLAGS)
 g_ir_inspect_LDADD = \
         libgirepository-1.0.la	\
         $(GIREPO_LIBS)
@@ -1534,39 +1507,8 @@ GCOVSOURCES = \
 	$(g_ir_compiler_SOURCES)		\
 	$(g_ir_generate_SOURCES)
 
-MSVCPROJS = cmph girepository g-ir-compiler
-cmph_FILES = $(libcmph_la_SOURCES)
-cmph_EXCLUDES = dummy
-girepository_FILES = $(libgirepository_1_0_la_SOURCES) $(libgirepository_gthash_la_SOURCES)
-girepository_EXCLUDES = gidummy
-girepository_HEADERS_DIR = $(includedir)/gobject-introspection-1.0
-girepository_HEADERS_INST = $(girepo_HEADERS)
-girepository_HEADERS_EXCLUDES = gidummy
-g_ir_compiler_FILES = $(libgirepository_gthash_la_SOURCES) $(libgirepository_internals_la_SOURCES)
-g_ir_compiler_EXCLUDES = gidummy
-_proj_name = $(subst /,_,$(subst -,_,$(subst .,_,$(1))))
-_proj_path_raw := $(subst $(abs_top_srcdir),,$(abs_srcdir))
-_proj_path = $(subst /,\\,$(_proj_path_raw))
-_proj_subdir_int = $(subst \\\\,\\,\\$(_proj_path)\\)
-_proj_subdir = $(subst \\.\\,\\,$(_proj_subdir_int))
-_proj_files_raw = $(subst /,\\,$($(_proj_name)_FILES))
-_proj_files = $(subst $(srcdir)\\,,$(subst $(builddir)\\,,$(subst $(top_builddir)\\$(_proj_path)\\,\\,$(_proj_files_raw))))
-_proj_filters = $($(_proj_name)_EXCLUDES)
-_proj_headers_raw = $(subst /,\\,$($(_proj_name)_HEADERS_INST))
-_proj_headers = $(subst $(srcdir)\\,,$(subst $(builddir)\\,,$(subst $(top_builddir)\\$(_proj_path)\\,\\,$(_proj_headers_raw))))
-_proj_headers_excludes = $($(_proj_name)_HEADERS_EXCLUDES)
-_headers_dest_posix = $(subst $(includedir),,$($(_proj_name)_HEADERS_DIR))
-_headers_destdir = $(subst /,\\,$(_headers_dest_posix))
-
-# Autotools: Why must we do this instead of 'dist-hook'?
-MSVCPROJ_GENERATED = \
-	$(top_builddir)/win32/vs9/cmph.vcproj	\
-	$(top_builddir)/win32/vs9/girepository.vcproj	\
-	$(top_builddir)/win32/vs9/g-ir-compiler.vcproj
-
-DISTCLEANFILES = config.h.win32
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
-SUBDIRS = . docs tests win32
+SUBDIRS = . docs tests
 DIST_SUBDIRS = $(SUBDIRS)
 DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-doctool
 pkgconfigdir = $(libdir)/pkgconfig
@@ -1601,7 +1543,7 @@ all: $(BUILT_SOURCES) config.h
 .SUFFIXES: .c .l .lo .log .o .obj .test .test$(EXEEXT) .trs .y
 am--refresh: Makefile
 	@:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/common.mk $(srcdir)/Makefile.introspection $(srcdir)/Makefile-cmph.am $(srcdir)/Makefile-girepository.am $(srcdir)/Makefile-giscanner.am $(srcdir)/Makefile-examples.am $(srcdir)/Makefile-gir.am $(srcdir)/Makefile-tools.am $(srcdir)/Makefile-msvcproj.am $(top_srcdir)/win32/Makefile.msvcproj $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/common.mk $(srcdir)/Makefile.introspection $(srcdir)/Makefile-cmph.am $(srcdir)/Makefile-girepository.am $(srcdir)/Makefile-giscanner.am $(srcdir)/Makefile-examples.am $(srcdir)/Makefile-gir.am $(srcdir)/Makefile-tools.am $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -1623,7 +1565,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
 	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
 	esac;
-$(srcdir)/common.mk $(srcdir)/Makefile.introspection $(srcdir)/Makefile-cmph.am $(srcdir)/Makefile-girepository.am $(srcdir)/Makefile-giscanner.am $(srcdir)/Makefile-examples.am $(srcdir)/Makefile-gir.am $(srcdir)/Makefile-tools.am $(srcdir)/Makefile-msvcproj.am $(top_srcdir)/win32/Makefile.msvcproj $(am__empty):
+$(srcdir)/common.mk $(srcdir)/Makefile.introspection $(srcdir)/Makefile-cmph.am $(srcdir)/Makefile-girepository.am $(srcdir)/Makefile-giscanner.am $(srcdir)/Makefile-examples.am $(srcdir)/Makefile-gir.am $(srcdir)/Makefile-tools.am $(am__empty):
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	$(SHELL) ./config.status --recheck
@@ -1648,12 +1590,12 @@ $(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 
 distclean-hdr:
 	-rm -f config.h stamp-h1
+giscanner/_version.py: $(top_builddir)/config.status $(top_srcdir)/giscanner/_version.py.in
+	cd $(top_builddir) && $(SHELL) ./config.status $@
 gobject-introspection-1.0.pc: $(top_builddir)/config.status $(srcdir)/gobject-introspection-1.0.pc.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
 gobject-introspection-no-export-1.0.pc: $(top_builddir)/config.status $(srcdir)/gobject-introspection-no-export-1.0.pc.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
-config.h.win32: $(top_builddir)/config.status $(srcdir)/config.h.win32.in
-	cd $(top_builddir) && $(SHELL) ./config.status $@
 
 clean-checkLTLIBRARIES:
 	-test -z "$(check_LTLIBRARIES)" || rm -f $(check_LTLIBRARIES)
@@ -2732,54 +2674,6 @@ clean-libtool:
 
 distclean-libtool:
 	-rm -f libtool config.lt
-install-collectionsPYTHON: $(collections_PYTHON)
-	@$(NORMAL_INSTALL)
-	@list='$(collections_PYTHON)'; dlist=; list2=; test -n "$(collectionsdir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(collectionsdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(collectionsdir)" || exit 1; \
-	fi; \
-	for p in $$list; do \
-	  if test -f "$$p"; then b=; else b="$(srcdir)/"; fi; \
-	  if test -f $$b$$p; then \
-	    $(am__strip_dir) \
-	    dlist="$$dlist $$f"; \
-	    list2="$$list2 $$b$$p"; \
-	  else :; fi; \
-	done; \
-	for file in $$list2; do echo $$file; done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(collectionsdir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(collectionsdir)" || exit $$?; \
-	done || exit $$?; \
-	if test -n "$$dlist"; then \
-	  $(am__py_compile) --destdir "$(DESTDIR)" \
-	                    --basedir "$(collectionsdir)" $$dlist; \
-	else :; fi
-
-uninstall-collectionsPYTHON:
-	@$(NORMAL_UNINSTALL)
-	@list='$(collections_PYTHON)'; test -n "$(collectionsdir)" || list=; \
-	py_files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$py_files" || exit 0; \
-	dir='$(DESTDIR)$(collectionsdir)'; \
-	pyc_files=`echo "$$py_files" | sed 's|$$|c|'`; \
-	pyo_files=`echo "$$py_files" | sed 's|$$|o|'`; \
-	py_files_pep3147=`echo "$$py_files" | $(am__pep3147_tweak)`; \
-	echo "$$py_files_pep3147";\
-	pyc_files_pep3147=`echo "$$py_files_pep3147" | sed 's|$$|c|'`; \
-	pyo_files_pep3147=`echo "$$py_files_pep3147" | sed 's|$$|o|'`; \
-	st=0; \
-	for files in \
-	  "$$py_files" \
-	  "$$pyc_files" \
-	  "$$pyo_files" \
-	  "$$pyc_files_pep3147" \
-	  "$$pyo_files_pep3147" \
-	; do \
-	  $(am__uninstall_files_from_dir) || st=$$?; \
-	done; \
-	exit $$st
 install-pkgpyexecPYTHON: $(pkgpyexec_PYTHON)
 	@$(NORMAL_INSTALL)
 	@list='$(pkgpyexec_PYTHON)'; dlist=; list2=; test -n "$(pkgpyexecdir)" || list=; \
@@ -3517,7 +3411,7 @@ install-binPROGRAMS: install-libLTLIBRARIES
 
 installdirs: installdirs-recursive
 installdirs-am:
-	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgpyexecdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(collectionsdir)" "$(DESTDIR)$(pkgpyexecdir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(makedir)" "$(DESTDIR)$(gdumpdir)" "$(DESTDIR)$(girdir)" "$(DESTDIR)$(m4dir)" "$(DESTDIR)$(templatedir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(typelibsdir)" "$(DESTDIR)$(girepodir)"; do \
+	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgpyexecdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkgpyexecdir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(makedir)" "$(DESTDIR)$(gdumpdir)" "$(DESTDIR)$(girdir)" "$(DESTDIR)$(m4dir)" "$(DESTDIR)$(templatedir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(typelibsdir)" "$(DESTDIR)$(girepodir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: $(BUILT_SOURCES)
@@ -3561,7 +3455,6 @@ distclean-generic:
 	-rm -f giscanner/$(am__dirstamp)
 	-rm -f tools/$(DEPDIR)/$(am__dirstamp)
 	-rm -f tools/$(am__dirstamp)
-	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -3596,9 +3489,9 @@ info: info-recursive
 
 info-am:
 
-install-data-am: install-collectionsPYTHON install-dist_makeDATA \
-	install-gdumpDATA install-girDATA install-girepoHEADERS \
-	install-m4DATA install-man install-nobase_dist_templateDATA \
+install-data-am: install-dist_makeDATA install-gdumpDATA \
+	install-girDATA install-girepoHEADERS install-m4DATA \
+	install-man install-nobase_dist_templateDATA \
 	install-pkgconfigDATA install-typelibsDATA
 
 install-dvi: install-dvi-recursive
@@ -3650,9 +3543,9 @@ ps: ps-recursive
 ps-am:
 
 uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \
-	uninstall-collectionsPYTHON uninstall-dist_makeDATA \
-	uninstall-gdumpDATA uninstall-girDATA uninstall-girepoHEADERS \
-	uninstall-libLTLIBRARIES uninstall-m4DATA uninstall-man \
+	uninstall-dist_makeDATA uninstall-gdumpDATA uninstall-girDATA \
+	uninstall-girepoHEADERS uninstall-libLTLIBRARIES \
+	uninstall-m4DATA uninstall-man \
 	uninstall-nobase_dist_templateDATA uninstall-pkgconfigDATA \
 	uninstall-pkgpyexecLTLIBRARIES uninstall-pkgpyexecPYTHON \
 	uninstall-typelibsDATA
@@ -3674,12 +3567,11 @@ uninstall-man: uninstall-man1
 	distclean-libtool distclean-tags distcleancheck distdir \
 	distuninstallcheck dvi dvi-am html html-am info info-am \
 	install install-am install-binPROGRAMS install-binSCRIPTS \
-	install-collectionsPYTHON install-data install-data-am \
-	install-dist_makeDATA install-dvi install-dvi-am install-exec \
-	install-exec-am install-gdumpDATA install-girDATA \
-	install-girepoHEADERS install-html install-html-am \
-	install-info install-info-am install-libLTLIBRARIES \
-	install-m4DATA install-man install-man1 \
+	install-data install-data-am install-dist_makeDATA install-dvi \
+	install-dvi-am install-exec install-exec-am install-gdumpDATA \
+	install-girDATA install-girepoHEADERS install-html \
+	install-html-am install-info install-info-am \
+	install-libLTLIBRARIES install-m4DATA install-man install-man1 \
 	install-nobase_dist_templateDATA install-pdf install-pdf-am \
 	install-pkgconfigDATA install-pkgpyexecLTLIBRARIES \
 	install-pkgpyexecPYTHON install-ps install-ps-am install-strip \
@@ -3688,13 +3580,12 @@ uninstall-man: uninstall-man1
 	mostlyclean mostlyclean-compile mostlyclean-generic \
 	mostlyclean-libtool pdf pdf-am ps ps-am recheck tags tags-am \
 	uninstall uninstall-am uninstall-binPROGRAMS \
-	uninstall-binSCRIPTS uninstall-collectionsPYTHON \
-	uninstall-dist_makeDATA uninstall-gdumpDATA uninstall-girDATA \
-	uninstall-girepoHEADERS uninstall-libLTLIBRARIES \
-	uninstall-m4DATA uninstall-man uninstall-man1 \
-	uninstall-nobase_dist_templateDATA uninstall-pkgconfigDATA \
-	uninstall-pkgpyexecLTLIBRARIES uninstall-pkgpyexecPYTHON \
-	uninstall-typelibsDATA
+	uninstall-binSCRIPTS uninstall-dist_makeDATA \
+	uninstall-gdumpDATA uninstall-girDATA uninstall-girepoHEADERS \
+	uninstall-libLTLIBRARIES uninstall-m4DATA uninstall-man \
+	uninstall-man1 uninstall-nobase_dist_templateDATA \
+	uninstall-pkgconfigDATA uninstall-pkgpyexecLTLIBRARIES \
+	uninstall-pkgpyexecPYTHON uninstall-typelibsDATA
 
 .PRECIOUS: Makefile
 
@@ -3794,8 +3685,8 @@ giscanner/scannerlexer.h: giscanner/scannerlexer.c
 gir/cairo-1.0.gir: gir/cairo-1.0.gir.in Makefile
 	[ -d $(@D) ] || $(mkdir_p) $(@D) ; \
 	sed \
-	-e s,%CAIRO_SHARED_LIBRARY%,$(CAIRO_SHARED_LIBRARY), \
-	-e s,%CAIRO_GIR_PACKAGE%,$(CAIRO_GIR_PACKAGE), \
+	-e s,\@CAIRO_SHARED_LIBRARY\@,$(CAIRO_SHARED_LIBRARY), \
+	-e s,\@CAIRO_GIR_PACKAGE\@,$(CAIRO_GIR_PACKAGE), \
 	< $< > $@.tmp && mv $@.tmp $@
 
 # Doesn't seem to work to do gir/%.typelib =(
@@ -3837,159 +3728,6 @@ g-ir-doc-tool: tools/g-ir-tool-template.in _giscanner.la Makefile
 	$(AM_V_GEN) sed $(TOOL_SUBSTITUTIONS) -e s,@TOOL_MODULE\@,docmain, -e s,@TOOL_FUNCTION\@,doc_main, $< > $@.tmp && mv $@.tmp $@
 	@chmod a+x $@
 
-$(top_builddir)/win32/vs9/giscanner.scripts:
-	echo '' >>$(top_builddir)/win32/vs9/giscanner.scripts
-	echo 'mkdir $$(CopyDir)\lib\gobject-introspection\giscanner&#x0D;&#x0A;' >>$(top_builddir)/win32/vs9/giscanner.scripts
-	echo 'mkdir $$(CopyDir)\lib\gobject-introspection\giscanner\collections&#x0D;&#x0A;' >>$(top_builddir)/win32/vs9/giscanner.scripts
-	echo 'mkdir $$(CopyDir)\lib\gobject-introspection\giscanner\doctemplates&#x0D;&#x0A;' >>$(top_builddir)/win32/vs9/giscanner.scripts
-	echo 'mkdir $$(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C&#x0D;&#x0A;' >>$(top_builddir)/win32/vs9/giscanner.scripts
-	echo 'mkdir $$(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs&#x0D;&#x0A;' >>$(top_builddir)/win32/vs9/giscanner.scripts
-	echo 'mkdir $$(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python&#x0D;&#x0A;' >>$(top_builddir)/win32/vs9/giscanner.scripts
-	echo '' >>$(top_builddir)/win32/vs9/giscanner.scripts
-
-	echo '' >>$(top_builddir)/win32/vs10/giscanner.vs10.scripts
-	echo 'mkdir $$(CopyDir)\lib\gobject-introspection\giscanner' >>$(top_builddir)/win32/vs10/giscanner.vs10.scripts
-	echo 'mkdir $$(CopyDir)\lib\gobject-introspection\giscanner\collections' >>$(top_builddir)/win32/vs10/giscanner.vs10.scripts
-	echo 'mkdir $$(CopyDir)\lib\gobject-introspection\giscanner\doctemplates' >>$(top_builddir)/win32/vs10/giscanner.vs10.scripts
-	echo 'mkdir $$(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C' >>$(top_builddir)/win32/vs10/giscanner.vs10.scripts
-	echo 'mkdir $$(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs' >>$(top_builddir)/win32/vs10/giscanner.vs10.scripts
-	echo 'mkdir $$(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python' >>$(top_builddir)/win32/vs10/giscanner.vs10.scripts
-
-	for F in `echo $(pkgpyexec_PYTHON) $(collections_PYTHON) $(nobase_dist_template_DATA) | tr '/' '\\\\'`; do \
-		case $$F in \
-		giscanner\\doctemplates\\C\\*.tmpl) echo 'copy ..\..\'$$F' $$(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C&#x0D;&#x0A;' \
-			;; \
-		giscanner\\doctemplates\\Gjs\\*.tmpl) echo 'copy ..\..\'$$F' $$(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs&#x0D;&#x0A;' \
-			;; \
-		giscanner\\doctemplates\\Python\\*.tmpl) echo 'copy ..\..\'$$F' $$(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python&#x0D;&#x0A;' \
-			;; \
-		giscanner\\doctemplates\\*.tmpl) echo 'copy ..\..\'$$F' $$(CopyDir)\lib\gobject-introspection\giscanner\doctemplates&#x0D;&#x0A;' \
-			;; \
-		giscanner\\collections\\*.py) echo 'copy ..\..\'$$F' $$(CopyDir)\lib\gobject-introspection\giscanner\collections&#x0D;&#x0A;' \
-			;; \
-		giscanner\\*.py) echo 'copy ..\..\'$$F' $$(CopyDir)\lib\gobject-introspection\giscanner&#x0D;&#x0A;' \
-			;; \
-		esac; \
-	done >>$(top_builddir)/win32/vs9/giscanner.scripts
-
-	for F in `echo $(pkgpyexec_PYTHON) $(collections_PYTHON) $(nobase_dist_template_DATA) | tr '/' '\\\\'`; do \
-		case $$F in \
-		giscanner\\doctemplates\\C\\*.tmpl) echo 'copy ..\..\'$$F' $$(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C' \
-			;; \
-		giscanner\\doctemplates\\Gjs\\*.tmpl) echo 'copy ..\..\'$$F' $$(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs' \
-			;; \
-		giscanner\\doctemplates\\Python\\*.tmpl) echo 'copy ..\..\'$$F' $$(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python' \
-			;; \
-		giscanner\\doctemplates\\*.tmpl) echo 'copy ..\..\'$$F' $$(CopyDir)\lib\gobject-introspection\giscanner\doctemplates' \
-			;; \
-		giscanner\\collections\\*.py) echo 'copy ..\..\'$$F' $$(CopyDir)\lib\gobject-introspection\giscanner\collections' \
-			;; \
-		giscanner\\*.py) echo 'copy ..\..\'$$F' $$(CopyDir)\lib\gobject-introspection\giscanner' \
-			;; \
-		esac; \
-	done >>$(top_builddir)/win32/vs10/giscanner.vs10.scripts
-
-#
-# Creates Visual Studio 2008/2010 projects from items passed in from autotools files
-# $(1) - Base Name of the MSVC project files (outputs)
-#
-
-define msvcproj-builder
-
-$(top_builddir)/win32/vs10/$(1).vcxproj: $(top_builddir)/win32/vs9/$(1).vcproj
-$(top_builddir)/win32/vs10/$(1).vcxproj.filters: $(top_builddir)/win32/vs9/$(1).vcproj
-$(1).sourcefiles: $(top_builddir)/win32/vs9/$(1).vcproj
-$(1).vs10.sourcefiles: $(top_builddir)/win32/vs9/$(1).vcproj
-$(1).vs10.sourcefiles.filters: $(top_builddir)/win32/vs9/$(1).vcproj
-
-$(top_builddir)/win32/vs9/$(1).vcproj: Makefile
-	-$(RM) $(top_builddir)/win32/vs9/$(1).vcproj
-	-$(RM) $(top_builddir)/win32/vs10/$(1).vcxproj
-	-$(RM) $(top_builddir)/win32/vs10/$(1).vcxproj.filters
-	-$(RM) $(top_builddir)/win32/vs11/$(1).vcxproj
-	-$(RM) $(top_builddir)/win32/vs11/$(1).vcxproj.filters
-	-$(RM) $(top_builddir)/win32/vs12/$(1).vcxproj
-	-$(RM) $(top_builddir)/win32/vs12/$(1).vcxproj.filters
-	-$(RM) $(top_builddir)/win32/vs14/$(1).vcxproj
-	-$(RM) $(top_builddir)/win32/vs14/$(1).vcxproj.filters
-
-	for F in $(_proj_files); do \
-		case $$$$F in \
-		$(_proj_filters)) \
-			;; \
-		*.c|*.cpp|*.cc|*.cxx) \
-			echo '   <File RelativePath="..\..'$(_proj_subdir)$$$$F'" />' >>$(1).sourcefiles && \
-			echo '   <ClCompile Include="..\..'$(_proj_subdir)$$$$F'" />' >>$(1).vs10.sourcefiles && \
-			echo '   <ClCompile Include="..\..'$(_proj_subdir)$$$$F'"><Filter>Source Files</Filter></ClCompile>' >>$(1).vs10.sourcefiles.filters \
-			;; \
-		esac;	\
-	done
-
-	$(CPP) -P - <$(top_srcdir)/win32/vs9/$(1).vcprojin >$(top_builddir)/win32/vs9/$(1).vcproj
-	$(CPP) -P - <$(top_srcdir)/win32/vs10/$(1).vcxprojin >$(top_builddir)/win32/vs10/$(1).vcxproj
-	$(CPP) -P - <$(top_srcdir)/win32/vs10/$(1).vcxproj.filtersin >$(top_builddir)/win32/vs10/$(1).vcxproj.filters
-	$(RM) $(1).sourcefiles
-	$(RM) $(1).vs10.sourcefiles
-	$(RM) $(1).vs10.sourcefiles.filters
-
-$(top_builddir)/win32/vs10/$(1).vs10.headers: $(top_builddir)/win32/vs9/$(1).headers
-
-$(top_builddir)/win32/vs9/$(1).headers: Makefile
-	-$(RM) $(top_builddir)/win32/vs9/$(1).headers
-	-$(RM) $(top_builddir)/win32/vs10/$(1).vs10.headers
-
-	for F in $(_proj_headers); do \
-		case $$$$F in \
-		$(_proj_headers_excludes)) \
-			;; \
-		*.h|*.hpp|*.hh|*.hxx) \
-			echo 'copy ..\..'$(_proj_subdir)$$$$F' $$$$(CopyDir)\include'$(_headers_destdir)'\'$$$$F'&#x0D;&#x0A;' >>$(top_builddir)/win32/vs9/$(1).headers && \
-			echo 'copy ..\..'$(_proj_subdir)$$$$F' $$$$(CopyDir)\include'$(_headers_destdir)'\'$$$$F >>$(top_builddir)/win32/vs10/$(1).vs10.headers \
-			;; \
-		esac;	\
-	done
-
-$(top_builddir)/win32/vs12/$(1).vcxproj.filters: $(top_builddir)/win32/vs12/$(1).vcxproj
-
-$(top_builddir)/win32/vs12/$(1).vcxproj: Makefile
-	-$(RM) $(top_builddir)/win32/vs14/$(1).vcxproj
-	-$(RM) $(top_builddir)/win32/vs14/$(1).vcxproj.filters
-
-	for F in $(_proj_files); do \
-		case $$$$F in \
-		$(_proj_filters)) \
-			;; \
-		*.c|*.cpp|*.cc|*.cxx) \
-			echo '   <ClCompile Include="..\..'$(_proj_subdir)$$$$F'" />' >>$(1).vs12.sourcefiles && \
-			echo '   <ClCompile Include="..\..'$(_proj_subdir)$$$$F'"><Filter>Source Files</Filter></ClCompile>' >>$(1).vs12.sourcefiles.filters \
-			;; \
-		esac;	\
-	done
-
-	$(CPP) -P - <$(top_srcdir)/win32/vs12/$(1).vcxprojin >$(top_builddir)/win32/vs12/$(1).vcxproj
-	$(CPP) -P - <$(top_srcdir)/win32/vs12/$(1).vcxproj.filtersin >$(top_builddir)/win32/vs12/$(1).vcxproj.filters
-	$(RM) $(1).vs12.sourcefiles
-	$(RM) $(1).vs12.sourcefiles.filters
-
-$(top_builddir)/win32/vs12/$(1).vs12.headers: Makefile
-	-$(RM) $(top_builddir)/win32/vs12/$(1).vs12.headers
-
-	for F in $(_proj_headers); do \
-		case $$$$F in \
-		$(_proj_headers_excludes)) \
-			;; \
-		*.h|*.hpp|*.hh|*.hxx) \
-			echo 'copy ..\..'$(_proj_subdir)$$$$F' $$$$(CopyDir)\include'$(_headers_destdir)'\'$$$$F >>$(top_builddir)/win32/vs12/$(1).vs12.headers \
-			;; \
-		esac;	\
-	done
-
-endef
-
-$(foreach proj,$(MSVCPROJS),$(eval $(call msvcproj-builder,$(proj))))
-
-$(MSVCPROJ_GENERATED): $(top_builddir)/win32/vs9/girepository.headers $(top_builddir)/win32/vs9/giscanner.scripts
-
 check-local:
 	@echo "TEST: PEP-8 INQUISITION"
 	@find $(top_srcdir)/giscanner -name \*.py | sort | uniq | xargs \
diff --git a/Makefile.introspection b/Makefile.introspection
index 5b38e35..7fabff6 100644
--- a/Makefile.introspection
+++ b/Makefile.introspection
@@ -64,12 +64,8 @@ _gir_includes = $(foreach include,$($(_gir_name)_INCLUDES),--include=$(include))
 _gir_export_packages = $(foreach pkg,$($(_gir_name)_EXPORT_PACKAGES),--pkg-export=$(pkg))
 _gir_c_includes = $(foreach include,$($(_gir_name)_C_INCLUDES),--c-include=$(include))
 
-# Reuse the LIBTOOL variable from automake if it's set, but
-# work around MSYS weirdness: When running g-ir-scanner, MSYS changes
-# a command-line argument --libtool="/bin/sh ../../libtool" into
-# --libtool=c:/opt/msys/1.0/bin/libtool. So just use sh.exe without path
-# because we already "know" where the libtool configure produced is.
-_gir_libtool = $(if $(findstring MINGW,$(shell uname -s)),--libtool="$(top_builddir)/libtool",$(if $(LIBTOOL),--libtool="$(LIBTOOL)"))
+# Reuse the LIBTOOL variable from automake if it's set
+_gir_libtool = $(if $(LIBTOOL),--libtool="$(LIBTOOL)")
 
 # Macros for AM_SILENT_RULES prettiness
 _gir_verbosity = $(if $(AM_DEFAULT_VERBOSITY),$(AM_DEFAULT_VERBOSITY),1)
diff --git a/NEWS b/NEWS
index 928b4f6..7499f43 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,36 @@
+=== 2.58 ======================================================================
+
+    • Changes:
+      - Update annotations imported from GLib, and require GLib 2.58
+      - Ensure that G-I builds on macOS
+      - Add a --version argument to the Python-based tools
+      - Allow selecting the output format for g-ir-doc-tool
+      - Drop the Visual Studio templates
+      - Use Sphinx to generate the user documentation; gtk-doc is still
+        required for the girepository-1.0 C API reference
+      - Support all _Float* C types from ISO/IEC TS 18661-3:2015
+
+    • Issues resolved on gitlab.gnome.org:
+      - #139 - make check fails for gobject-introspection 1.44.0 on
+               OS X 10.10.4
+      - #184 - Default element-type not set for GByteArray object
+               properties
+      - #189 - c:type missing pointer/array information in GIR for
+               C array parameters
+      - #134 - Allow multiple output formats
+      - #218 - gtk2 hits unreachable code after enable -Wswitch-default
+      - #113 - Memory leaks in GI regress and marshalling tests property
+               setters
+
+    • Bugs resolved on bugzilla.gnome.org:
+      - #702788 - The girepository DLL is acquiring pointers incorrectly
+                  on Windows/x64
+
+    • Contributors:
+      Tomasz Miąsko, Emmanuele Bassi, Rico Tzschichholz, Chun-wei Fan,
+      Philip Chimento, Tom Schoonjans, Christoph Reiter, Ray Donnelly,
+      Marcus Calhoun-Lopez, Florian Müllner
+
 === 2.56 ======================================================================
 
     • Changes:
diff --git a/README b/README.rst
similarity index 92%
rename from README
rename to README.rst
index 4a57dc0..b8e82a9 100644
--- a/README
+++ b/README.rst
@@ -4,8 +4,7 @@ The goal of the project is to describe the APIs and collect them in
 a uniform, machine readable format.
 
 GIR XML format
-==============
-
+--------------
 There's an XML format called GIR used by GObjectIntrospection.
 The purpose of it is to provide a common structure to access the complete
 available API that a library or other unit of code exports.
@@ -16,8 +15,7 @@ meant to be usable to use in other situations, for instance to/from another
 set of languages.
 
 Typelib
-=======
-
+-------
 The typelib is an on-disk version of the GIR designed to be fast, memory
 efficient and complete enough so that language bindings can be written
 on top of it without other sources of information.
@@ -26,9 +24,9 @@ accessed from the language binding or another application who wishes to
 use the information.
 
 Tools
-=====
-
+-----
 The following tools are shipped with GObject Introspection:
+
 - g-ir-scanner, a tool which generates GIR XML files by parsing headers,
   GTK-Doc comment blocks including annotations and introspecting GObject
   based libraries.
@@ -41,8 +39,7 @@ The following tools are shipped with GObject Introspection:
 - g-ir-doc-tool, generates API reference documentation from a GIR XML file.
 
 API library
-===========
-
+-----------
 There's also a C based library called libgirepository which provides
 an API to access to the typelib metadata. It also contains an API to
 invoke functions, given the function info object. The implementation is
@@ -53,18 +50,18 @@ There are a number of GIR test files in tests/, and a script to do
 roundtrip tests (GIR -> typelib -> GIR).
 
 Helping out
-===========
+-----------
 The introspection framework needs a lot more work, see TODO.
 
 Homepage
-========
-http://live.gnome.org/GObjectIntrospection
+--------
+https://gi.readthedocs.io/
 
 Reporting bugs
-==============
+--------------
 Bugs should be reported in https://gitlab.gnome.org/GNOME/gobject-introspection/issues.
 
 Contact
-=======
-Mail: gtk-devel-list@gnome.org
-IRC: #introspection@irc.gnome.org
+-------
+:Mail: gtk-devel-list@gnome.org
+:IRC: #introspection@irc.gnome.org
\ No newline at end of file
diff --git a/aclocal.m4 b/aclocal.m4
index 9900000..b89e4ce 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -296,6 +296,893 @@ AS_VAR_COPY([$1], [pkg_cv_][$1])
 AS_VAR_IF([$1], [""], [$5], [$4])dnl
 ])dnl PKG_CHECK_VAR
 
+# ============================================================================
+#  https://www.gnu.org/software/autoconf-archive/ax_append_compile_flags.html
+# ============================================================================
+#
+# SYNOPSIS
+#
+#   AX_APPEND_COMPILE_FLAGS([FLAG1 FLAG2 ...], [FLAGS-VARIABLE], [EXTRA-FLAGS], [INPUT])
+#
+# DESCRIPTION
+#
+#   For every FLAG1, FLAG2 it is checked whether the compiler works with the
+#   flag.  If it does, the flag is added FLAGS-VARIABLE
+#
+#   If FLAGS-VARIABLE is not specified, the current language's flags (e.g.
+#   CFLAGS) is used.  During the check the flag is always added to the
+#   current language's flags.
+#
+#   If EXTRA-FLAGS is defined, it is added to the current language's default
+#   flags (e.g. CFLAGS) when the check is done.  The check is thus made with
+#   the flags: "CFLAGS EXTRA-FLAGS FLAG".  This can for example be used to
+#   force the compiler to issue an error when a bad flag is given.
+#
+#   INPUT gives an alternative input source to AC_COMPILE_IFELSE.
+#
+#   NOTE: This macro depends on the AX_APPEND_FLAG and
+#   AX_CHECK_COMPILE_FLAG. Please keep this macro in sync with
+#   AX_APPEND_LINK_FLAGS.
+#
+# LICENSE
+#
+#   Copyright (c) 2011 Maarten Bosmans <mkbosmans@gmail.com>
+#
+#   This program is free software: you can redistribute it and/or modify it
+#   under the terms of the GNU General Public License as published by the
+#   Free Software Foundation, either version 3 of the License, or (at your
+#   option) any later version.
+#
+#   This program is distributed in the hope that it will be useful, but
+#   WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+#   Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License along
+#   with this program. If not, see <https://www.gnu.org/licenses/>.
+#
+#   As a special exception, the respective Autoconf Macro's copyright owner
+#   gives unlimited permission to copy, distribute and modify the configure
+#   scripts that are the output of Autoconf when processing the Macro. You
+#   need not follow the terms of the GNU General Public License when using
+#   or distributing such scripts, even though portions of the text of the
+#   Macro appear in them. The GNU General Public License (GPL) does govern
+#   all other use of the material that constitutes the Autoconf Macro.
+#
+#   This special exception to the GPL applies to versions of the Autoconf
+#   Macro released by the Autoconf Archive. When you make and distribute a
+#   modified version of the Autoconf Macro, you may extend this special
+#   exception to the GPL to apply to your modified version as well.
+
+#serial 6
+
+AC_DEFUN([AX_APPEND_COMPILE_FLAGS],
+[AX_REQUIRE_DEFINED([AX_CHECK_COMPILE_FLAG])
+AX_REQUIRE_DEFINED([AX_APPEND_FLAG])
+for flag in $1; do
+  AX_CHECK_COMPILE_FLAG([$flag], [AX_APPEND_FLAG([$flag], [$2])], [], [$3], [$4])
+done
+])dnl AX_APPEND_COMPILE_FLAGS
+
+# ===========================================================================
+#      https://www.gnu.org/software/autoconf-archive/ax_append_flag.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+#   AX_APPEND_FLAG(FLAG, [FLAGS-VARIABLE])
+#
+# DESCRIPTION
+#
+#   FLAG is appended to the FLAGS-VARIABLE shell variable, with a space
+#   added in between.
+#
+#   If FLAGS-VARIABLE is not specified, the current language's flags (e.g.
+#   CFLAGS) is used.  FLAGS-VARIABLE is not changed if it already contains
+#   FLAG.  If FLAGS-VARIABLE is unset in the shell, it is set to exactly
+#   FLAG.
+#
+#   NOTE: Implementation based on AX_CFLAGS_GCC_OPTION.
+#
+# LICENSE
+#
+#   Copyright (c) 2008 Guido U. Draheim <guidod@gmx.de>
+#   Copyright (c) 2011 Maarten Bosmans <mkbosmans@gmail.com>
+#
+#   This program is free software: you can redistribute it and/or modify it
+#   under the terms of the GNU General Public License as published by the
+#   Free Software Foundation, either version 3 of the License, or (at your
+#   option) any later version.
+#
+#   This program is distributed in the hope that it will be useful, but
+#   WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+#   Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License along
+#   with this program. If not, see <https://www.gnu.org/licenses/>.
+#
+#   As a special exception, the respective Autoconf Macro's copyright owner
+#   gives unlimited permission to copy, distribute and modify the configure
+#   scripts that are the output of Autoconf when processing the Macro. You
+#   need not follow the terms of the GNU General Public License when using
+#   or distributing such scripts, even though portions of the text of the
+#   Macro appear in them. The GNU General Public License (GPL) does govern
+#   all other use of the material that constitutes the Autoconf Macro.
+#
+#   This special exception to the GPL applies to versions of the Autoconf
+#   Macro released by the Autoconf Archive. When you make and distribute a
+#   modified version of the Autoconf Macro, you may extend this special
+#   exception to the GPL to apply to your modified version as well.
+
+#serial 7
+
+AC_DEFUN([AX_APPEND_FLAG],
+[dnl
+AC_PREREQ(2.64)dnl for _AC_LANG_PREFIX and AS_VAR_SET_IF
+AS_VAR_PUSHDEF([FLAGS], [m4_default($2,_AC_LANG_PREFIX[FLAGS])])
+AS_VAR_SET_IF(FLAGS,[
+  AS_CASE([" AS_VAR_GET(FLAGS) "],
+    [*" $1 "*], [AC_RUN_LOG([: FLAGS already contains $1])],
+    [
+     AS_VAR_APPEND(FLAGS,[" $1"])
+     AC_RUN_LOG([: FLAGS="$FLAGS"])
+    ])
+  ],
+  [
+  AS_VAR_SET(FLAGS,[$1])
+  AC_RUN_LOG([: FLAGS="$FLAGS"])
+  ])
+AS_VAR_POPDEF([FLAGS])dnl
+])dnl AX_APPEND_FLAG
+
+# ===========================================================================
+#   https://www.gnu.org/software/autoconf-archive/ax_append_link_flags.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+#   AX_APPEND_LINK_FLAGS([FLAG1 FLAG2 ...], [FLAGS-VARIABLE], [EXTRA-FLAGS], [INPUT])
+#
+# DESCRIPTION
+#
+#   For every FLAG1, FLAG2 it is checked whether the linker works with the
+#   flag.  If it does, the flag is added FLAGS-VARIABLE
+#
+#   If FLAGS-VARIABLE is not specified, the linker's flags (LDFLAGS) is
+#   used. During the check the flag is always added to the linker's flags.
+#
+#   If EXTRA-FLAGS is defined, it is added to the linker's default flags
+#   when the check is done.  The check is thus made with the flags: "LDFLAGS
+#   EXTRA-FLAGS FLAG".  This can for example be used to force the linker to
+#   issue an error when a bad flag is given.
+#
+#   INPUT gives an alternative input source to AC_COMPILE_IFELSE.
+#
+#   NOTE: This macro depends on the AX_APPEND_FLAG and AX_CHECK_LINK_FLAG.
+#   Please keep this macro in sync with AX_APPEND_COMPILE_FLAGS.
+#
+# LICENSE
+#
+#   Copyright (c) 2011 Maarten Bosmans <mkbosmans@gmail.com>
+#
+#   This program is free software: you can redistribute it and/or modify it
+#   under the terms of the GNU General Public License as published by the
+#   Free Software Foundation, either version 3 of the License, or (at your
+#   option) any later version.
+#
+#   This program is distributed in the hope that it will be useful, but
+#   WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+#   Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License along
+#   with this program. If not, see <https://www.gnu.org/licenses/>.
+#
+#   As a special exception, the respective Autoconf Macro's copyright owner
+#   gives unlimited permission to copy, distribute and modify the configure
+#   scripts that are the output of Autoconf when processing the Macro. You
+#   need not follow the terms of the GNU General Public License when using
+#   or distributing such scripts, even though portions of the text of the
+#   Macro appear in them. The GNU General Public License (GPL) does govern
+#   all other use of the material that constitutes the Autoconf Macro.
+#
+#   This special exception to the GPL applies to versions of the Autoconf
+#   Macro released by the Autoconf Archive. When you make and distribute a
+#   modified version of the Autoconf Macro, you may extend this special
+#   exception to the GPL to apply to your modified version as well.
+
+#serial 6
+
+AC_DEFUN([AX_APPEND_LINK_FLAGS],
+[AX_REQUIRE_DEFINED([AX_CHECK_LINK_FLAG])
+AX_REQUIRE_DEFINED([AX_APPEND_FLAG])
+for flag in $1; do
+  AX_CHECK_LINK_FLAG([$flag], [AX_APPEND_FLAG([$flag], [m4_default([$2], [LDFLAGS])])], [], [$3], [$4])
+done
+])dnl AX_APPEND_LINK_FLAGS
+
+# ===========================================================================
+#  https://www.gnu.org/software/autoconf-archive/ax_check_compile_flag.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+#   AX_CHECK_COMPILE_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE], [EXTRA-FLAGS], [INPUT])
+#
+# DESCRIPTION
+#
+#   Check whether the given FLAG works with the current language's compiler
+#   or gives an error.  (Warnings, however, are ignored)
+#
+#   ACTION-SUCCESS/ACTION-FAILURE are shell commands to execute on
+#   success/failure.
+#
+#   If EXTRA-FLAGS is defined, it is added to the current language's default
+#   flags (e.g. CFLAGS) when the check is done.  The check is thus made with
+#   the flags: "CFLAGS EXTRA-FLAGS FLAG".  This can for example be used to
+#   force the compiler to issue an error when a bad flag is given.
+#
+#   INPUT gives an alternative input source to AC_COMPILE_IFELSE.
+#
+#   NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. Please keep this
+#   macro in sync with AX_CHECK_{PREPROC,LINK}_FLAG.
+#
+# LICENSE
+#
+#   Copyright (c) 2008 Guido U. Draheim <guidod@gmx.de>
+#   Copyright (c) 2011 Maarten Bosmans <mkbosmans@gmail.com>
+#
+#   This program is free software: you can redistribute it and/or modify it
+#   under the terms of the GNU General Public License as published by the
+#   Free Software Foundation, either version 3 of the License, or (at your
+#   option) any later version.
+#
+#   This program is distributed in the hope that it will be useful, but
+#   WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+#   Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License along
+#   with this program. If not, see <https://www.gnu.org/licenses/>.
+#
+#   As a special exception, the respective Autoconf Macro's copyright owner
+#   gives unlimited permission to copy, distribute and modify the configure
+#   scripts that are the output of Autoconf when processing the Macro. You
+#   need not follow the terms of the GNU General Public License when using
+#   or distributing such scripts, even though portions of the text of the
+#   Macro appear in them. The GNU General Public License (GPL) does govern
+#   all other use of the material that constitutes the Autoconf Macro.
+#
+#   This special exception to the GPL applies to versions of the Autoconf
+#   Macro released by the Autoconf Archive. When you make and distribute a
+#   modified version of the Autoconf Macro, you may extend this special
+#   exception to the GPL to apply to your modified version as well.
+
+#serial 5
+
+AC_DEFUN([AX_CHECK_COMPILE_FLAG],
+[AC_PREREQ(2.64)dnl for _AC_LANG_PREFIX and AS_VAR_IF
+AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_[]_AC_LANG_ABBREV[]flags_$4_$1])dnl
+AC_CACHE_CHECK([whether _AC_LANG compiler accepts $1], CACHEVAR, [
+  ax_check_save_flags=$[]_AC_LANG_PREFIX[]FLAGS
+  _AC_LANG_PREFIX[]FLAGS="$[]_AC_LANG_PREFIX[]FLAGS $4 $1"
+  AC_COMPILE_IFELSE([m4_default([$5],[AC_LANG_PROGRAM()])],
+    [AS_VAR_SET(CACHEVAR,[yes])],
+    [AS_VAR_SET(CACHEVAR,[no])])
+  _AC_LANG_PREFIX[]FLAGS=$ax_check_save_flags])
+AS_VAR_IF(CACHEVAR,yes,
+  [m4_default([$2], :)],
+  [m4_default([$3], :)])
+AS_VAR_POPDEF([CACHEVAR])dnl
+])dnl AX_CHECK_COMPILE_FLAGS
+
+# ===========================================================================
+#    https://www.gnu.org/software/autoconf-archive/ax_check_link_flag.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+#   AX_CHECK_LINK_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE], [EXTRA-FLAGS], [INPUT])
+#
+# DESCRIPTION
+#
+#   Check whether the given FLAG works with the linker or gives an error.
+#   (Warnings, however, are ignored)
+#
+#   ACTION-SUCCESS/ACTION-FAILURE are shell commands to execute on
+#   success/failure.
+#
+#   If EXTRA-FLAGS is defined, it is added to the linker's default flags
+#   when the check is done.  The check is thus made with the flags: "LDFLAGS
+#   EXTRA-FLAGS FLAG".  This can for example be used to force the linker to
+#   issue an error when a bad flag is given.
+#
+#   INPUT gives an alternative input source to AC_LINK_IFELSE.
+#
+#   NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. Please keep this
+#   macro in sync with AX_CHECK_{PREPROC,COMPILE}_FLAG.
+#
+# LICENSE
+#
+#   Copyright (c) 2008 Guido U. Draheim <guidod@gmx.de>
+#   Copyright (c) 2011 Maarten Bosmans <mkbosmans@gmail.com>
+#
+#   This program is free software: you can redistribute it and/or modify it
+#   under the terms of the GNU General Public License as published by the
+#   Free Software Foundation, either version 3 of the License, or (at your
+#   option) any later version.
+#
+#   This program is distributed in the hope that it will be useful, but
+#   WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+#   Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License along
+#   with this program. If not, see <https://www.gnu.org/licenses/>.
+#
+#   As a special exception, the respective Autoconf Macro's copyright owner
+#   gives unlimited permission to copy, distribute and modify the configure
+#   scripts that are the output of Autoconf when processing the Macro. You
+#   need not follow the terms of the GNU General Public License when using
+#   or distributing such scripts, even though portions of the text of the
+#   Macro appear in them. The GNU General Public License (GPL) does govern
+#   all other use of the material that constitutes the Autoconf Macro.
+#
+#   This special exception to the GPL applies to versions of the Autoconf
+#   Macro released by the Autoconf Archive. When you make and distribute a
+#   modified version of the Autoconf Macro, you may extend this special
+#   exception to the GPL to apply to your modified version as well.
+
+#serial 5
+
+AC_DEFUN([AX_CHECK_LINK_FLAG],
+[AC_PREREQ(2.64)dnl for _AC_LANG_PREFIX and AS_VAR_IF
+AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_ldflags_$4_$1])dnl
+AC_CACHE_CHECK([whether the linker accepts $1], CACHEVAR, [
+  ax_check_save_flags=$LDFLAGS
+  LDFLAGS="$LDFLAGS $4 $1"
+  AC_LINK_IFELSE([m4_default([$5],[AC_LANG_PROGRAM()])],
+    [AS_VAR_SET(CACHEVAR,[yes])],
+    [AS_VAR_SET(CACHEVAR,[no])])
+  LDFLAGS=$ax_check_save_flags])
+AS_VAR_IF(CACHEVAR,yes,
+  [m4_default([$2], :)],
+  [m4_default([$3], :)])
+AS_VAR_POPDEF([CACHEVAR])dnl
+])dnl AX_CHECK_LINK_FLAGS
+
+# ===========================================================================
+#    https://www.gnu.org/software/autoconf-archive/ax_compiler_flags.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+#   AX_COMPILER_FLAGS([CFLAGS-VARIABLE], [LDFLAGS-VARIABLE], [IS-RELEASE], [EXTRA-BASE-CFLAGS], [EXTRA-YES-CFLAGS], [UNUSED], [UNUSED], [UNUSED], [EXTRA-BASE-LDFLAGS], [EXTRA-YES-LDFLAGS], [UNUSED], [UNUSED], [UNUSED])
+#
+# DESCRIPTION
+#
+#   Check for the presence of an --enable-compile-warnings option to
+#   configure, defaulting to "error" in normal operation, or "yes" if
+#   IS-RELEASE is equal to "yes".  Return the value in the variable
+#   $ax_enable_compile_warnings.
+#
+#   Depending on the value of --enable-compile-warnings, different compiler
+#   warnings are checked to see if they work with the current compiler and,
+#   if so, are appended to CFLAGS-VARIABLE and LDFLAGS-VARIABLE.  This
+#   allows a consistent set of baseline compiler warnings to be used across
+#   a code base, irrespective of any warnings enabled locally by individual
+#   developers.  By standardising the warnings used by all developers of a
+#   project, the project can commit to a zero-warnings policy, using -Werror
+#   to prevent compilation if new warnings are introduced.  This makes
+#   catching bugs which are flagged by warnings a lot easier.
+#
+#   By providing a consistent --enable-compile-warnings argument across all
+#   projects using this macro, continuous integration systems can easily be
+#   configured the same for all projects.  Automated systems or build
+#   systems aimed at beginners may want to pass the --disable-Werror
+#   argument to unconditionally prevent warnings being fatal.
+#
+#   --enable-compile-warnings can take the values:
+#
+#    * no:      Base compiler warnings only; not even -Wall.
+#    * yes:     The above, plus a broad range of useful warnings.
+#    * error:   The above, plus -Werror so that all warnings are fatal.
+#               Use --disable-Werror to override this and disable fatal
+#               warnings.
+#
+#   The set of base and enabled flags can be augmented using the
+#   EXTRA-*-CFLAGS and EXTRA-*-LDFLAGS variables, which are tested and
+#   appended to the output variable if --enable-compile-warnings is not
+#   "no". Flags should not be disabled using these arguments, as the entire
+#   point of AX_COMPILER_FLAGS is to enforce a consistent set of useful
+#   compiler warnings on code, using warnings which have been chosen for low
+#   false positive rates.  If a compiler emits false positives for a
+#   warning, a #pragma should be used in the code to disable the warning
+#   locally. See:
+#
+#     https://gcc.gnu.org/onlinedocs/gcc-4.9.2/gcc/Diagnostic-Pragmas.html#Diagnostic-Pragmas
+#
+#   The EXTRA-* variables should only be used to supply extra warning flags,
+#   and not general purpose compiler flags, as they are controlled by
+#   configure options such as --disable-Werror.
+#
+#   IS-RELEASE can be used to disable -Werror when making a release, which
+#   is useful for those hairy moments when you just want to get the release
+#   done as quickly as possible.  Set it to "yes" to disable -Werror. By
+#   default, it uses the value of $ax_is_release, so if you are using the
+#   AX_IS_RELEASE macro, there is no need to pass this parameter. For
+#   example:
+#
+#     AX_IS_RELEASE([git-directory])
+#     AX_COMPILER_FLAGS()
+#
+#   CFLAGS-VARIABLE defaults to WARN_CFLAGS, and LDFLAGS-VARIABLE defaults
+#   to WARN_LDFLAGS.  Both variables are AC_SUBST-ed by this macro, but must
+#   be manually added to the CFLAGS and LDFLAGS variables for each target in
+#   the code base.
+#
+#   If C++ language support is enabled with AC_PROG_CXX, which must occur
+#   before this macro in configure.ac, warning flags for the C++ compiler
+#   are AC_SUBST-ed as WARN_CXXFLAGS, and must be manually added to the
+#   CXXFLAGS variables for each target in the code base.  EXTRA-*-CFLAGS can
+#   be used to augment the base and enabled flags.
+#
+#   Warning flags for g-ir-scanner (from GObject Introspection) are
+#   AC_SUBST-ed as WARN_SCANNERFLAGS.  This variable must be manually added
+#   to the SCANNERFLAGS variable for each GIR target in the code base.  If
+#   extra g-ir-scanner flags need to be enabled, the AX_COMPILER_FLAGS_GIR
+#   macro must be invoked manually.
+#
+#   AX_COMPILER_FLAGS may add support for other tools in future, in addition
+#   to the compiler and linker.  No extra EXTRA-* variables will be added
+#   for those tools, and all extra support will still use the single
+#   --enable-compile-warnings configure option.  For finer grained control
+#   over the flags for individual tools, use AX_COMPILER_FLAGS_CFLAGS,
+#   AX_COMPILER_FLAGS_LDFLAGS and AX_COMPILER_FLAGS_* for new tools.
+#
+#   The UNUSED variables date from a previous version of this macro, and are
+#   automatically appended to the preceding non-UNUSED variable. They should
+#   be left empty in new uses of the macro.
+#
+# LICENSE
+#
+#   Copyright (c) 2014, 2015 Philip Withnall <philip@tecnocode.co.uk>
+#   Copyright (c) 2015 David King <amigadave@amigadave.com>
+#
+#   Copying and distribution of this file, with or without modification, are
+#   permitted in any medium without royalty provided the copyright notice
+#   and this notice are preserved.  This file is offered as-is, without any
+#   warranty.
+
+#serial 14
+
+# _AX_COMPILER_FLAGS_LANG([LANGNAME])
+m4_defun([_AX_COMPILER_FLAGS_LANG],
+[m4_ifdef([_AX_COMPILER_FLAGS_LANG_]$1[_enabled], [],
+          [m4_define([_AX_COMPILER_FLAGS_LANG_]$1[_enabled], [])dnl
+           AX_REQUIRE_DEFINED([AX_COMPILER_FLAGS_]$1[FLAGS])])dnl
+])
+
+AC_DEFUN([AX_COMPILER_FLAGS],[
+    # C support is enabled by default.
+    _AX_COMPILER_FLAGS_LANG([C])
+    # Only enable C++ support if AC_PROG_CXX is called. The redefinition of
+    # AC_PROG_CXX is so that a fatal error is emitted if this macro is called
+    # before AC_PROG_CXX, which would otherwise cause no C++ warnings to be
+    # checked.
+    AC_PROVIDE_IFELSE([AC_PROG_CXX],
+                      [_AX_COMPILER_FLAGS_LANG([CXX])],
+                      [m4_define([AC_PROG_CXX], defn([AC_PROG_CXX])[_AX_COMPILER_FLAGS_LANG([CXX])])])
+    AX_REQUIRE_DEFINED([AX_COMPILER_FLAGS_LDFLAGS])
+
+    # Default value for IS-RELEASE is $ax_is_release
+    ax_compiler_flags_is_release=m4_tolower(m4_normalize(ifelse([$3],,
+                                                                [$ax_is_release],
+                                                                [$3])))
+
+    AC_ARG_ENABLE([compile-warnings],
+                  AS_HELP_STRING([--enable-compile-warnings=@<:@no/yes/error@:>@],
+                                 [Enable compiler warnings and errors]),,
+                  [AS_IF([test "$ax_compiler_flags_is_release" = "yes"],
+                         [enable_compile_warnings="yes"],
+                         [enable_compile_warnings="error"])])
+    AC_ARG_ENABLE([Werror],
+                  AS_HELP_STRING([--disable-Werror],
+                                 [Unconditionally make all compiler warnings non-fatal]),,
+                  [enable_Werror=maybe])
+
+    # Return the user's chosen warning level
+    AS_IF([test "$enable_Werror" = "no" -a \
+                "$enable_compile_warnings" = "error"],[
+        enable_compile_warnings="yes"
+    ])
+
+    ax_enable_compile_warnings=$enable_compile_warnings
+
+    AX_COMPILER_FLAGS_CFLAGS([$1],[$ax_compiler_flags_is_release],
+                             [$4],[$5 $6 $7 $8])
+    m4_ifdef([_AX_COMPILER_FLAGS_LANG_CXX_enabled],
+             [AX_COMPILER_FLAGS_CXXFLAGS([WARN_CXXFLAGS],
+                                         [$ax_compiler_flags_is_release],
+                                         [$4],[$5 $6 $7 $8])])
+    AX_COMPILER_FLAGS_LDFLAGS([$2],[$ax_compiler_flags_is_release],
+                              [$9],[$10 $11 $12 $13])
+    AX_COMPILER_FLAGS_GIR([WARN_SCANNERFLAGS],[$ax_compiler_flags_is_release])
+])dnl AX_COMPILER_FLAGS
+
+# =============================================================================
+#  https://www.gnu.org/software/autoconf-archive/ax_compiler_flags_cflags.html
+# =============================================================================
+#
+# SYNOPSIS
+#
+#   AX_COMPILER_FLAGS_CFLAGS([VARIABLE], [IS-RELEASE], [EXTRA-BASE-FLAGS], [EXTRA-YES-FLAGS])
+#
+# DESCRIPTION
+#
+#   Add warning flags for the C compiler to VARIABLE, which defaults to
+#   WARN_CFLAGS.  VARIABLE is AC_SUBST-ed by this macro, but must be
+#   manually added to the CFLAGS variable for each target in the code base.
+#
+#   This macro depends on the environment set up by AX_COMPILER_FLAGS.
+#   Specifically, it uses the value of $ax_enable_compile_warnings to decide
+#   which flags to enable.
+#
+# LICENSE
+#
+#   Copyright (c) 2014, 2015 Philip Withnall <philip@tecnocode.co.uk>
+#   Copyright (c) 2017, 2018 Reini Urban <rurban@cpan.org>
+#
+#   Copying and distribution of this file, with or without modification, are
+#   permitted in any medium without royalty provided the copyright notice
+#   and this notice are preserved.  This file is offered as-is, without any
+#   warranty.
+
+#serial 16
+
+AC_DEFUN([AX_COMPILER_FLAGS_CFLAGS],[
+    AC_REQUIRE([AC_PROG_SED])
+    AX_REQUIRE_DEFINED([AX_APPEND_COMPILE_FLAGS])
+    AX_REQUIRE_DEFINED([AX_APPEND_FLAG])
+    AX_REQUIRE_DEFINED([AX_CHECK_COMPILE_FLAG])
+
+    # Variable names
+    m4_define([ax_warn_cflags_variable],
+              [m4_normalize(ifelse([$1],,[WARN_CFLAGS],[$1]))])
+
+    AC_LANG_PUSH([C])
+
+    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
+      [#ifndef __cplusplus
+       #error "no C++"
+       #endif]])],
+      [ax_compiler_cxx=yes;],
+      [ax_compiler_cxx=no;])
+
+    # Always pass -Werror=unknown-warning-option to get Clang to fail on bad
+    # flags, otherwise they are always appended to the warn_cflags variable, and
+    # Clang warns on them for every compilation unit.
+    # If this is passed to GCC, it will explode, so the flag must be enabled
+    # conditionally.
+    AX_CHECK_COMPILE_FLAG([-Werror=unknown-warning-option],[
+        ax_compiler_flags_test="-Werror=unknown-warning-option"
+    ],[
+        ax_compiler_flags_test=""
+    ])
+
+    # Check that -Wno-suggest-attribute=format is supported
+    AX_CHECK_COMPILE_FLAG([-Wno-suggest-attribute=format],[
+        ax_compiler_no_suggest_attribute_flags="-Wno-suggest-attribute=format"
+    ],[
+        ax_compiler_no_suggest_attribute_flags=""
+    ])
+
+    # Base flags
+    AX_APPEND_COMPILE_FLAGS([ dnl
+        -fno-strict-aliasing dnl
+        $3 dnl
+    ],ax_warn_cflags_variable,[$ax_compiler_flags_test])
+
+    AS_IF([test "$ax_enable_compile_warnings" != "no"],[
+        # "yes" flags
+        AX_APPEND_COMPILE_FLAGS([ dnl
+            -Wall dnl
+            -Wextra dnl
+            -Wundef dnl
+            -Wwrite-strings dnl
+            -Wpointer-arith dnl
+            -Wmissing-declarations dnl
+            -Wredundant-decls dnl
+            -Wno-unused-parameter dnl
+            -Wno-missing-field-initializers dnl
+            -Wformat=2 dnl
+            -Wcast-align dnl
+            -Wformat-nonliteral dnl
+            -Wformat-security dnl
+            -Wsign-compare dnl
+            -Wstrict-aliasing dnl
+            -Wshadow dnl
+            -Winline dnl
+            -Wpacked dnl
+            -Wmissing-format-attribute dnl
+            -Wmissing-noreturn dnl
+            -Winit-self dnl
+            -Wredundant-decls dnl
+            -Wmissing-include-dirs dnl
+            -Wunused-but-set-variable dnl
+            -Warray-bounds dnl
+            -Wreturn-type dnl
+            -Wswitch-enum dnl
+            -Wswitch-default dnl
+            -Wduplicated-cond dnl
+            -Wduplicated-branches dnl
+            -Wlogical-op dnl
+            -Wrestrict dnl
+            -Wnull-dereference dnl
+            -Wdouble-promotion dnl
+            $4 dnl
+            $5 dnl
+            $6 dnl
+            $7 dnl
+        ],ax_warn_cflags_variable,[$ax_compiler_flags_test])
+        if test "$ax_compiler_cxx" = "no" ; then
+            # C-only flags. Warn in C++
+            AX_APPEND_COMPILE_FLAGS([ dnl
+            -Wnested-externs dnl
+            -Wmissing-prototypes dnl
+            -Wstrict-prototypes dnl
+            -Wdeclaration-after-statement dnl
+            -Wimplicit-function-declaration dnl
+            -Wold-style-definition dnl
+            -Wjump-misses-init dnl
+            ],ax_warn_cflags_variable,[$ax_compiler_flags_test])
+        fi
+    ])
+    AS_IF([test "$ax_enable_compile_warnings" = "error"],[
+        # "error" flags; -Werror has to be appended unconditionally because
+        # it's not possible to test for
+        #
+        # suggest-attribute=format is disabled because it gives too many false
+        # positives
+        AX_APPEND_FLAG([-Werror],ax_warn_cflags_variable)
+
+        AX_APPEND_COMPILE_FLAGS([ dnl
+            [$ax_compiler_no_suggest_attribute_flags] dnl
+        ],ax_warn_cflags_variable,[$ax_compiler_flags_test])
+    ])
+
+    # In the flags below, when disabling specific flags, always add *both*
+    # -Wno-foo and -Wno-error=foo. This fixes the situation where (for example)
+    # we enable -Werror, disable a flag, and a build bot passes CFLAGS=-Wall,
+    # which effectively turns that flag back on again as an error.
+    for flag in $ax_warn_cflags_variable; do
+        AS_CASE([$flag],
+                [-Wno-*=*],[],
+                [-Wno-*],[
+                    AX_APPEND_COMPILE_FLAGS([-Wno-error=$(AS_ECHO([$flag]) | $SED 's/^-Wno-//')],
+                                            ax_warn_cflags_variable,
+                                            [$ax_compiler_flags_test])
+                ])
+    done
+
+    AC_LANG_POP([C])
+
+    # Substitute the variables
+    AC_SUBST(ax_warn_cflags_variable)
+])dnl AX_COMPILER_FLAGS
+
+# ===========================================================================
+#  https://www.gnu.org/software/autoconf-archive/ax_compiler_flags_gir.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+#   AX_COMPILER_FLAGS_GIR([VARIABLE], [IS-RELEASE], [EXTRA-BASE-FLAGS], [EXTRA-YES-FLAGS])
+#
+# DESCRIPTION
+#
+#   Add warning flags for the g-ir-scanner (from GObject Introspection) to
+#   VARIABLE, which defaults to WARN_SCANNERFLAGS.  VARIABLE is AC_SUBST-ed
+#   by this macro, but must be manually added to the SCANNERFLAGS variable
+#   for each GIR target in the code base.
+#
+#   This macro depends on the environment set up by AX_COMPILER_FLAGS.
+#   Specifically, it uses the value of $ax_enable_compile_warnings to decide
+#   which flags to enable.
+#
+# LICENSE
+#
+#   Copyright (c) 2015 Philip Withnall <philip@tecnocode.co.uk>
+#
+#   Copying and distribution of this file, with or without modification, are
+#   permitted in any medium without royalty provided the copyright notice
+#   and this notice are preserved.  This file is offered as-is, without any
+#   warranty.
+
+#serial 6
+
+AC_DEFUN([AX_COMPILER_FLAGS_GIR],[
+    AX_REQUIRE_DEFINED([AX_APPEND_FLAG])
+
+    # Variable names
+    m4_define([ax_warn_scannerflags_variable],
+              [m4_normalize(ifelse([$1],,[WARN_SCANNERFLAGS],[$1]))])
+
+    # Base flags
+    AX_APPEND_FLAG([$3],ax_warn_scannerflags_variable)
+
+    AS_IF([test "$ax_enable_compile_warnings" != "no"],[
+        # "yes" flags
+        AX_APPEND_FLAG([ dnl
+            --warn-all dnl
+            $4 dnl
+            $5 dnl
+            $6 dnl
+            $7 dnl
+        ],ax_warn_scannerflags_variable)
+    ])
+    AS_IF([test "$ax_enable_compile_warnings" = "error"],[
+        # "error" flags
+        AX_APPEND_FLAG([ dnl
+            --warn-error dnl
+        ],ax_warn_scannerflags_variable)
+    ])
+
+    # Substitute the variables
+    AC_SUBST(ax_warn_scannerflags_variable)
+])dnl AX_COMPILER_FLAGS
+
+# ==============================================================================
+#  https://www.gnu.org/software/autoconf-archive/ax_compiler_flags_ldflags.html
+# ==============================================================================
+#
+# SYNOPSIS
+#
+#   AX_COMPILER_FLAGS_LDFLAGS([VARIABLE], [IS-RELEASE], [EXTRA-BASE-FLAGS], [EXTRA-YES-FLAGS])
+#
+# DESCRIPTION
+#
+#   Add warning flags for the linker to VARIABLE, which defaults to
+#   WARN_LDFLAGS.  VARIABLE is AC_SUBST-ed by this macro, but must be
+#   manually added to the LDFLAGS variable for each target in the code base.
+#
+#   This macro depends on the environment set up by AX_COMPILER_FLAGS.
+#   Specifically, it uses the value of $ax_enable_compile_warnings to decide
+#   which flags to enable.
+#
+# LICENSE
+#
+#   Copyright (c) 2014, 2015 Philip Withnall <philip@tecnocode.co.uk>
+#   Copyright (c) 2017, 2018 Reini Urban <rurban@cpan.org>
+#
+#   Copying and distribution of this file, with or without modification, are
+#   permitted in any medium without royalty provided the copyright notice
+#   and this notice are preserved.  This file is offered as-is, without any
+#   warranty.
+
+#serial 9
+
+AC_DEFUN([AX_COMPILER_FLAGS_LDFLAGS],[
+    AX_REQUIRE_DEFINED([AX_APPEND_LINK_FLAGS])
+    AX_REQUIRE_DEFINED([AX_APPEND_FLAG])
+    AX_REQUIRE_DEFINED([AX_CHECK_COMPILE_FLAG])
+    AX_REQUIRE_DEFINED([AX_CHECK_LINK_FLAG])
+
+    # Variable names
+    m4_define([ax_warn_ldflags_variable],
+              [m4_normalize(ifelse([$1],,[WARN_LDFLAGS],[$1]))])
+
+    # Always pass -Werror=unknown-warning-option to get Clang to fail on bad
+    # flags, otherwise they are always appended to the warn_ldflags variable,
+    # and Clang warns on them for every compilation unit.
+    # If this is passed to GCC, it will explode, so the flag must be enabled
+    # conditionally.
+    AX_CHECK_COMPILE_FLAG([-Werror=unknown-warning-option],[
+        ax_compiler_flags_test="-Werror=unknown-warning-option"
+    ],[
+        ax_compiler_flags_test=""
+    ])
+
+    AX_CHECK_LINK_FLAG([-Wl,--as-needed], [
+        AX_APPEND_LINK_FLAGS([-Wl,--as-needed],
+          [AM_LDFLAGS],[$ax_compiler_flags_test])
+    ])
+    AX_CHECK_LINK_FLAG([-Wl,-z,relro], [
+        AX_APPEND_LINK_FLAGS([-Wl,-z,relro],
+          [AM_LDFLAGS],[$ax_compiler_flags_test])
+    ])
+    AX_CHECK_LINK_FLAG([-Wl,-z,now], [
+        AX_APPEND_LINK_FLAGS([-Wl,-z,now],
+          [AM_LDFLAGS],[$ax_compiler_flags_test])
+    ])
+    AX_CHECK_LINK_FLAG([-Wl,-z,noexecstack], [
+        AX_APPEND_LINK_FLAGS([-Wl,-z,noexecstack],
+          [AM_LDFLAGS],[$ax_compiler_flags_test])
+    ])
+    # textonly, retpolineplt not yet
+
+    # macOS and cygwin linker do not have --as-needed
+    AX_CHECK_LINK_FLAG([-Wl,--no-as-needed], [
+        ax_compiler_flags_as_needed_option="-Wl,--no-as-needed"
+    ], [
+        ax_compiler_flags_as_needed_option=""
+    ])
+
+    # macOS linker speaks with a different accent
+    ax_compiler_flags_fatal_warnings_option=""
+    AX_CHECK_LINK_FLAG([-Wl,--fatal-warnings], [
+        ax_compiler_flags_fatal_warnings_option="-Wl,--fatal-warnings"
+    ])
+    AX_CHECK_LINK_FLAG([-Wl,-fatal_warnings], [
+        ax_compiler_flags_fatal_warnings_option="-Wl,-fatal_warnings"
+    ])
+
+    # Base flags
+    AX_APPEND_LINK_FLAGS([ dnl
+        $ax_compiler_flags_as_needed_option dnl
+        $3 dnl
+    ],ax_warn_ldflags_variable,[$ax_compiler_flags_test])
+
+    AS_IF([test "$ax_enable_compile_warnings" != "no"],[
+        # "yes" flags
+        AX_APPEND_LINK_FLAGS([$4 $5 $6 $7],
+                                ax_warn_ldflags_variable,
+                                [$ax_compiler_flags_test])
+    ])
+    AS_IF([test "$ax_enable_compile_warnings" = "error"],[
+        # "error" flags; -Werror has to be appended unconditionally because
+        # it's not possible to test for
+        #
+        # suggest-attribute=format is disabled because it gives too many false
+        # positives
+        AX_APPEND_LINK_FLAGS([ dnl
+            $ax_compiler_flags_fatal_warnings_option dnl
+        ],ax_warn_ldflags_variable,[$ax_compiler_flags_test])
+    ])
+
+    # Substitute the variables
+    AC_SUBST(ax_warn_ldflags_variable)
+])dnl AX_COMPILER_FLAGS
+
+# ===========================================================================
+#    https://www.gnu.org/software/autoconf-archive/ax_require_defined.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+#   AX_REQUIRE_DEFINED(MACRO)
+#
+# DESCRIPTION
+#
+#   AX_REQUIRE_DEFINED is a simple helper for making sure other macros have
+#   been defined and thus are available for use.  This avoids random issues
+#   where a macro isn't expanded.  Instead the configure script emits a
+#   non-fatal:
+#
+#     ./configure: line 1673: AX_CFLAGS_WARN_ALL: command not found
+#
+#   It's like AC_REQUIRE except it doesn't expand the required macro.
+#
+#   Here's an example:
+#
+#     AX_REQUIRE_DEFINED([AX_CHECK_LINK_FLAG])
+#
+# LICENSE
+#
+#   Copyright (c) 2014 Mike Frysinger <vapier@gentoo.org>
+#
+#   Copying and distribution of this file, with or without modification, are
+#   permitted in any medium without royalty provided the copyright notice
+#   and this notice are preserved. This file is offered as-is, without any
+#   warranty.
+
+#serial 2
+
+AC_DEFUN([AX_REQUIRE_DEFINED], [dnl
+  m4_ifndef([$1], [m4_fatal([macro ]$1[ is not defined; is a m4 file missing?])])
+])dnl AX_REQUIRE_DEFINED
+
 # Copyright (C) 2002-2017 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
diff --git a/build-aux/ltmain.sh b/build-aux/ltmain.sh
index a736cf9..4366587 100644
--- a/build-aux/ltmain.sh
+++ b/build-aux/ltmain.sh
@@ -31,7 +31,7 @@
 
 PROGRAM=libtool
 PACKAGE=libtool
-VERSION="2.4.6 Debian-2.4.6-2"
+VERSION="2.4.6 Debian-2.4.6-2.1build1"
 package_revision=2.4.6
 
 
@@ -64,7 +64,7 @@ package_revision=2.4.6
 # libraries, which are installed to $pkgauxdir.
 
 # Set a version string for this script.
-scriptversion=2015-01-20.17; # UTC
+scriptversion=2015-10-12.13; # UTC
 
 # General shell script boiler plate, and helper functions.
 # Written by Gary V. Vaughan, 2004
@@ -580,16 +580,16 @@ if test yes = "$_G_HAVE_PLUSEQ_OP"; then
   {
     $debug_cmd
 
-    func_quote_for_eval "$2"
-    eval "$1+=\\ \$func_quote_for_eval_result"
+    func_quote_arg pretty "$2"
+    eval "$1+=\\ \$func_quote_arg_result"
   }'
 else
   func_append_quoted ()
   {
     $debug_cmd
 
-    func_quote_for_eval "$2"
-    eval "$1=\$$1\\ \$func_quote_for_eval_result"
+    func_quote_arg pretty "$2"
+    eval "$1=\$$1\\ \$func_quote_arg_result"
   }
 fi
 
@@ -1091,85 +1091,181 @@ func_relative_path ()
 }
 
 
-# func_quote_for_eval ARG...
-# --------------------------
-# Aesthetically quote ARGs to be evaled later.
-# This function returns two values:
-#   i) func_quote_for_eval_result
-#      double-quoted, suitable for a subsequent eval
-#  ii) func_quote_for_eval_unquoted_result
-#      has all characters that are still active within double
-#      quotes backslashified.
-func_quote_for_eval ()
+# func_quote_portable EVAL ARG
+# ----------------------------
+# Internal function to portably implement func_quote_arg.  Note that we still
+# keep attention to performance here so we as much as possible try to avoid
+# calling sed binary (so far O(N) complexity as long as func_append is O(1)).
+func_quote_portable ()
 {
     $debug_cmd
 
-    func_quote_for_eval_unquoted_result=
-    func_quote_for_eval_result=
-    while test 0 -lt $#; do
-      case $1 in
-        *[\\\`\"\$]*)
-	  _G_unquoted_arg=`printf '%s\n' "$1" |$SED "$sed_quote_subst"` ;;
-        *)
-          _G_unquoted_arg=$1 ;;
-      esac
-      if test -n "$func_quote_for_eval_unquoted_result"; then
-	func_append func_quote_for_eval_unquoted_result " $_G_unquoted_arg"
-      else
-        func_append func_quote_for_eval_unquoted_result "$_G_unquoted_arg"
+    func_quote_portable_result=$2
+
+    # one-time-loop (easy break)
+    while true
+    do
+      if $1; then
+        func_quote_portable_result=`$ECHO "$2" | $SED \
+          -e "$sed_double_quote_subst" -e "$sed_double_backslash"`
+        break
       fi
 
-      case $_G_unquoted_arg in
-        # Double-quote args containing shell metacharacters to delay
-        # word splitting, command substitution and variable expansion
-        # for a subsequent eval.
-        # Many Bourne shells cannot handle close brackets correctly
-        # in scan sets, so we specify it separately.
-        *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-          _G_quoted_arg=\"$_G_unquoted_arg\"
+      # Quote for eval.
+      case $func_quote_portable_result in
+        *[\\\`\"\$]*)
+          case $func_quote_portable_result in
+            *[\[\*\?]*)
+              func_quote_portable_result=`$ECHO "$func_quote_portable_result" | $SED "$sed_quote_subst"`
+              break
+              ;;
+          esac
+
+          func_quote_portable_old_IFS=$IFS
+          for _G_char in '\' '`' '"' '$'
+          do
+            # STATE($1) PREV($2) SEPARATOR($3)
+            set start "" ""
+            func_quote_portable_result=dummy"$_G_char$func_quote_portable_result$_G_char"dummy
+            IFS=$_G_char
+            for _G_part in $func_quote_portable_result
+            do
+              case $1 in
+              quote)
+                func_append func_quote_portable_result "$3$2"
+                set quote "$_G_part" "\\$_G_char"
+                ;;
+              start)
+                set first "" ""
+                func_quote_portable_result=
+                ;;
+              first)
+                set quote "$_G_part" ""
+                ;;
+              esac
+            done
+          done
+          IFS=$func_quote_portable_old_IFS
           ;;
-        *)
-          _G_quoted_arg=$_G_unquoted_arg
-	  ;;
+        *) ;;
       esac
-
-      if test -n "$func_quote_for_eval_result"; then
-	func_append func_quote_for_eval_result " $_G_quoted_arg"
-      else
-        func_append func_quote_for_eval_result "$_G_quoted_arg"
-      fi
-      shift
+      break
     done
+
+    func_quote_portable_unquoted_result=$func_quote_portable_result
+    case $func_quote_portable_result in
+      # double-quote args containing shell metacharacters to delay
+      # word splitting, command substitution and variable expansion
+      # for a subsequent eval.
+      # many bourne shells cannot handle close brackets correctly
+      # in scan sets, so we specify it separately.
+      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+        func_quote_portable_result=\"$func_quote_portable_result\"
+        ;;
+    esac
 }
 
 
-# func_quote_for_expand ARG
-# -------------------------
-# Aesthetically quote ARG to be evaled later; same as above,
-# but do not quote variable references.
-func_quote_for_expand ()
-{
-    $debug_cmd
+# func_quotefast_eval ARG
+# -----------------------
+# Quote one ARG (internal).  This is equivalent to 'func_quote_arg eval ARG',
+# but optimized for speed.  Result is stored in $func_quotefast_eval.
+if test xyes = `(x=; printf -v x %q yes; echo x"$x") 2>/dev/null`; then
+  func_quotefast_eval ()
+  {
+    printf -v func_quotefast_eval_result %q "$1"
+  }
+else
+  func_quotefast_eval ()
+  {
+    func_quote_portable false "$1"
+    func_quotefast_eval_result=$func_quote_portable_result
+  }
+fi
 
-    case $1 in
-      *[\\\`\"]*)
-	_G_arg=`$ECHO "$1" | $SED \
-	    -e "$sed_double_quote_subst" -e "$sed_double_backslash"` ;;
-      *)
-        _G_arg=$1 ;;
+
+# func_quote_arg MODEs ARG
+# ------------------------
+# Quote one ARG to be evaled later.  MODEs argument may contain zero ore more
+# specifiers listed below separated by ',' character.  This function returns two
+# values:
+#   i) func_quote_arg_result
+#      double-quoted (when needed), suitable for a subsequent eval
+#  ii) func_quote_arg_unquoted_result
+#      has all characters that are still active within double
+#      quotes backslashified.  Available only if 'unquoted' is specified.
+#
+# Available modes:
+# ----------------
+# 'eval' (default)
+#       - escape shell special characters
+# 'expand'
+#       - the same as 'eval';  but do not quote variable references
+# 'pretty'
+#       - request aesthetic output, i.e. '"a b"' instead of 'a\ b'.  This might
+#         later used in func_quote to get output like: 'echo "a b"' instead of
+#         'echo a\ b'.  This is slower than default on some shells.
+# 'unquoted'
+#       - produce also $func_quote_arg_unquoted_result which does not contain
+#         wrapping double-quotes.
+#
+# Examples for 'func_quote_arg pretty,unquoted string':
+#
+#   string      | *_result              | *_unquoted_result
+#   ------------+-----------------------+-------------------
+#   "           | \"                    | \"
+#   a b         | "a b"                 | a b
+#   "a b"       | "\"a b\""             | \"a b\"
+#   *           | "*"                   | *
+#   z="${x-$y}" | "z=\"\${x-\$y}\""     | z=\"\${x-\$y}\"
+#
+# Examples for 'func_quote_arg pretty,unquoted,expand string':
+#
+#   string        |   *_result          |  *_unquoted_result
+#   --------------+---------------------+--------------------
+#   z="${x-$y}"   | "z=\"${x-$y}\""     | z=\"${x-$y}\"
+func_quote_arg ()
+{
+    _G_quote_expand=false
+    case ,$1, in
+      *,expand,*)
+        _G_quote_expand=:
+        ;;
     esac
 
-    case $_G_arg in
-      # Double-quote args containing shell metacharacters to delay
-      # word splitting and command substitution for a subsequent eval.
-      # Many Bourne shells cannot handle close brackets correctly
-      # in scan sets, so we specify it separately.
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-        _G_arg=\"$_G_arg\"
+    case ,$1, in
+      *,pretty,*|*,expand,*|*,unquoted,*)
+        func_quote_portable $_G_quote_expand "$2"
+        func_quote_arg_result=$func_quote_portable_result
+        func_quote_arg_unquoted_result=$func_quote_portable_unquoted_result
+        ;;
+      *)
+        # Faster quote-for-eval for some shells.
+        func_quotefast_eval "$2"
+        func_quote_arg_result=$func_quotefast_eval_result
         ;;
     esac
+}
 
-    func_quote_for_expand_result=$_G_arg
+
+# func_quote MODEs ARGs...
+# ------------------------
+# Quote all ARGs to be evaled later and join them into single command.  See
+# func_quote_arg's description for more info.
+func_quote ()
+{
+    $debug_cmd
+    _G_func_quote_mode=$1 ; shift
+    func_quote_result=
+    while test 0 -lt $#; do
+      func_quote_arg "$_G_func_quote_mode" "$1"
+      if test -n "$func_quote_result"; then
+        func_append func_quote_result " $func_quote_arg_result"
+      else
+        func_append func_quote_result "$func_quote_arg_result"
+      fi
+      shift
+    done
 }
 
 
@@ -1215,8 +1311,8 @@ func_show_eval ()
     _G_cmd=$1
     _G_fail_exp=${2-':'}
 
-    func_quote_for_expand "$_G_cmd"
-    eval "func_notquiet $func_quote_for_expand_result"
+    func_quote_arg pretty,expand "$_G_cmd"
+    eval "func_notquiet $func_quote_arg_result"
 
     $opt_dry_run || {
       eval "$_G_cmd"
@@ -1241,8 +1337,8 @@ func_show_eval_locale ()
     _G_fail_exp=${2-':'}
 
     $opt_quiet || {
-      func_quote_for_expand "$_G_cmd"
-      eval "func_echo $func_quote_for_expand_result"
+      func_quote_arg expand,pretty "$_G_cmd"
+      eval "func_echo $func_quote_arg_result"
     }
 
     $opt_dry_run || {
@@ -1370,7 +1466,7 @@ func_lt_ver ()
 #! /bin/sh
 
 # Set a version string for this script.
-scriptversion=2014-01-07.03; # UTC
+scriptversion=2015-10-12.13; # UTC
 
 # A portable, pluggable option parser for Bourne shell.
 # Written by Gary V. Vaughan, 2010
@@ -1530,6 +1626,8 @@ func_run_hooks ()
 {
     $debug_cmd
 
+    _G_rc_run_hooks=false
+
     case " $hookable_fns " in
       *" $1 "*) ;;
       *) func_fatal_error "'$1' does not support hook funcions.n" ;;
@@ -1538,16 +1636,16 @@ func_run_hooks ()
     eval _G_hook_fns=\$$1_hooks; shift
 
     for _G_hook in $_G_hook_fns; do
-      eval $_G_hook '"$@"'
-
-      # store returned options list back into positional
-      # parameters for next 'cmd' execution.
-      eval _G_hook_result=\$${_G_hook}_result
-      eval set dummy "$_G_hook_result"; shift
+      if eval $_G_hook '"$@"'; then
+        # store returned options list back into positional
+        # parameters for next 'cmd' execution.
+        eval _G_hook_result=\$${_G_hook}_result
+        eval set dummy "$_G_hook_result"; shift
+        _G_rc_run_hooks=:
+      fi
     done
 
-    func_quote_for_eval ${1+"$@"}
-    func_run_hooks_result=$func_quote_for_eval_result
+    $_G_rc_run_hooks && func_run_hooks_result=$_G_hook_result
 }
 
 
@@ -1557,10 +1655,16 @@ func_run_hooks ()
 ## --------------- ##
 
 # In order to add your own option parsing hooks, you must accept the
-# full positional parameter list in your hook function, remove any
-# options that you action, and then pass back the remaining unprocessed
+# full positional parameter list in your hook function, you may remove/edit
+# any options that you action, and then pass back the remaining unprocessed
 # options in '<hooked_function_name>_result', escaped suitably for
-# 'eval'.  Like this:
+# 'eval'.  In this case you also must return $EXIT_SUCCESS to let the
+# hook's caller know that it should pay attention to
+# '<hooked_function_name>_result'.  Returning $EXIT_FAILURE signalizes that
+# arguments are left untouched by the hook and therefore caller will ignore the
+# result variable.
+#
+# Like this:
 #
 #    my_options_prep ()
 #    {
@@ -1570,9 +1674,11 @@ func_run_hooks ()
 #        usage_message=$usage_message'
 #      -s, --silent       don'\''t print informational messages
 #    '
-#
-#        func_quote_for_eval ${1+"$@"}
-#        my_options_prep_result=$func_quote_for_eval_result
+#        # No change in '$@' (ignored completely by this hook).  There is
+#        # no need to do the equivalent (but slower) action:
+#        # func_quote eval ${1+"$@"}
+#        # my_options_prep_result=$func_quote_result
+#        false
 #    }
 #    func_add_hook func_options_prep my_options_prep
 #
@@ -1581,25 +1687,37 @@ func_run_hooks ()
 #    {
 #        $debug_cmd
 #
+#        args_changed=false
+#
 #        # Note that for efficiency, we parse as many options as we can
 #        # recognise in a loop before passing the remainder back to the
 #        # caller on the first unrecognised argument we encounter.
 #        while test $# -gt 0; do
 #          opt=$1; shift
 #          case $opt in
-#            --silent|-s) opt_silent=: ;;
+#            --silent|-s) opt_silent=:
+#                         args_changed=:
+#                         ;;
 #            # Separate non-argument short options:
 #            -s*)         func_split_short_opt "$_G_opt"
 #                         set dummy "$func_split_short_opt_name" \
 #                             "-$func_split_short_opt_arg" ${1+"$@"}
 #                         shift
+#                         args_changed=:
 #                         ;;
-#            *)            set dummy "$_G_opt" "$*"; shift; break ;;
+#            *)           # Make sure the first unrecognised option "$_G_opt"
+#                         # is added back to "$@", we could need that later
+#                         # if $args_changed is true.
+#                         set dummy "$_G_opt" ${1+"$@"}; shift; break ;;
 #          esac
 #        done
 #
-#        func_quote_for_eval ${1+"$@"}
-#        my_silent_option_result=$func_quote_for_eval_result
+#        if $args_changed; then
+#          func_quote eval ${1+"$@"}
+#          my_silent_option_result=$func_quote_result
+#        fi
+#
+#        $args_changed
 #    }
 #    func_add_hook func_parse_options my_silent_option
 #
@@ -1611,16 +1729,32 @@ func_run_hooks ()
 #        $opt_silent && $opt_verbose && func_fatal_help "\
 #    '--silent' and '--verbose' options are mutually exclusive."
 #
-#        func_quote_for_eval ${1+"$@"}
-#        my_option_validation_result=$func_quote_for_eval_result
+#        false
 #    }
 #    func_add_hook func_validate_options my_option_validation
 #
-# You'll alse need to manually amend $usage_message to reflect the extra
+# You'll also need to manually amend $usage_message to reflect the extra
 # options you parse.  It's preferable to append if you can, so that
 # multiple option parsing hooks can be added safely.
 
 
+# func_options_finish [ARG]...
+# ----------------------------
+# Finishing the option parse loop (call 'func_options' hooks ATM).
+func_options_finish ()
+{
+    $debug_cmd
+
+    _G_func_options_finish_exit=false
+    if func_run_hooks func_options ${1+"$@"}; then
+      func_options_finish_result=$func_run_hooks_result
+      _G_func_options_finish_exit=:
+    fi
+
+    $_G_func_options_finish_exit
+}
+
+
 # func_options [ARG]...
 # ---------------------
 # All the functions called inside func_options are hookable. See the
@@ -1630,17 +1764,28 @@ func_options ()
 {
     $debug_cmd
 
-    func_options_prep ${1+"$@"}
-    eval func_parse_options \
-        ${func_options_prep_result+"$func_options_prep_result"}
-    eval func_validate_options \
-        ${func_parse_options_result+"$func_parse_options_result"}
+    _G_rc_options=false
 
-    eval func_run_hooks func_options \
-        ${func_validate_options_result+"$func_validate_options_result"}
+    for my_func in options_prep parse_options validate_options options_finish
+    do
+      if eval func_$my_func '${1+"$@"}'; then
+        eval _G_res_var='$'"func_${my_func}_result"
+        eval set dummy "$_G_res_var" ; shift
+        _G_rc_options=:
+      fi
+    done
 
-    # save modified positional parameters for caller
-    func_options_result=$func_run_hooks_result
+    # Save modified positional parameters for caller.  As a top-level
+    # options-parser function we always need to set the 'func_options_result'
+    # variable (regardless the $_G_rc_options value).
+    if $_G_rc_options; then
+      func_options_result=$_G_res_var
+    else
+      func_quote eval ${1+"$@"}
+      func_options_result=$func_quote_result
+    fi
+
+    $_G_rc_options
 }
 
 
@@ -1649,9 +1794,9 @@ func_options ()
 # All initialisations required before starting the option parse loop.
 # Note that when calling hook functions, we pass through the list of
 # positional parameters.  If a hook function modifies that list, and
-# needs to propogate that back to rest of this script, then the complete
+# needs to propagate that back to rest of this script, then the complete
 # modified list must be put in 'func_run_hooks_result' before
-# returning.
+# returning $EXIT_SUCCESS (otherwise $EXIT_FAILURE is returned).
 func_hookable func_options_prep
 func_options_prep ()
 {
@@ -1661,10 +1806,14 @@ func_options_prep ()
     opt_verbose=false
     opt_warning_types=
 
-    func_run_hooks func_options_prep ${1+"$@"}
+    _G_rc_options_prep=false
+    if func_run_hooks func_options_prep ${1+"$@"}; then
+      _G_rc_options_prep=:
+      # save modified positional parameters for caller
+      func_options_prep_result=$func_run_hooks_result
+    fi
 
-    # save modified positional parameters for caller
-    func_options_prep_result=$func_run_hooks_result
+    $_G_rc_options_prep
 }
 
 
@@ -1678,18 +1827,20 @@ func_parse_options ()
 
     func_parse_options_result=
 
+    _G_rc_parse_options=false
     # this just eases exit handling
     while test $# -gt 0; do
       # Defer to hook functions for initial option parsing, so they
       # get priority in the event of reusing an option name.
-      func_run_hooks func_parse_options ${1+"$@"}
-
-      # Adjust func_parse_options positional parameters to match
-      eval set dummy "$func_run_hooks_result"; shift
+      if func_run_hooks func_parse_options ${1+"$@"}; then
+        eval set dummy "$func_run_hooks_result"; shift
+        _G_rc_parse_options=:
+      fi
 
       # Break out of the loop if we already parsed every option.
       test $# -gt 0 || break
 
+      _G_match_parse_options=:
       _G_opt=$1
       shift
       case $_G_opt in
@@ -1704,7 +1855,10 @@ func_parse_options ()
 		      ;;
 
         --warnings|--warning|-W)
-                      test $# = 0 && func_missing_arg $_G_opt && break
+                      if test $# = 0 && func_missing_arg $_G_opt; then
+                        _G_rc_parse_options=:
+                        break
+                      fi
                       case " $warning_categories $1" in
                         *" $1 "*)
                           # trailing space prevents matching last $1 above
@@ -1757,15 +1911,25 @@ func_parse_options ()
                       shift
                       ;;
 
-        --)           break ;;
+        --)           _G_rc_parse_options=: ; break ;;
         -*)           func_fatal_help "unrecognised option: '$_G_opt'" ;;
-        *)            set dummy "$_G_opt" ${1+"$@"}; shift; break ;;
+        *)            set dummy "$_G_opt" ${1+"$@"}; shift
+                      _G_match_parse_options=false
+                      break
+                      ;;
       esac
+
+      $_G_match_parse_options && _G_rc_parse_options=:
     done
 
-    # save modified positional parameters for caller
-    func_quote_for_eval ${1+"$@"}
-    func_parse_options_result=$func_quote_for_eval_result
+
+    if $_G_rc_parse_options; then
+      # save modified positional parameters for caller
+      func_quote eval ${1+"$@"}
+      func_parse_options_result=$func_quote_result
+    fi
+
+    $_G_rc_parse_options
 }
 
 
@@ -1778,16 +1942,21 @@ func_validate_options ()
 {
     $debug_cmd
 
+    _G_rc_validate_options=false
+
     # Display all warnings if -W was not given.
     test -n "$opt_warning_types" || opt_warning_types=" $warning_categories"
 
-    func_run_hooks func_validate_options ${1+"$@"}
+    if func_run_hooks func_validate_options ${1+"$@"}; then
+      # save modified positional parameters for caller
+      func_validate_options_result=$func_run_hooks_result
+      _G_rc_validate_options=:
+    fi
 
     # Bail if the options were screwed!
     $exit_cmd $EXIT_FAILURE
 
-    # save modified positional parameters for caller
-    func_validate_options_result=$func_run_hooks_result
+    $_G_rc_validate_options
 }
 
 
@@ -2068,7 +2237,7 @@ include the following information:
        compiler:       $LTCC
        compiler flags: $LTCFLAGS
        linker:         $LD (gnu? $with_gnu_ld)
-       version:        $progname $scriptversion Debian-2.4.6-2
+       version:        $progname $scriptversion Debian-2.4.6-2.1build1
        automake:       `($AUTOMAKE --version) 2>/dev/null |$SED 1q`
        autoconf:       `($AUTOCONF --version) 2>/dev/null |$SED 1q`
 
@@ -2270,6 +2439,8 @@ libtool_options_prep ()
     nonopt=
     preserve_args=
 
+    _G_rc_lt_options_prep=:
+
     # Shorthand for --mode=foo, only valid as the first argument
     case $1 in
     clean|clea|cle|cl)
@@ -2293,11 +2464,18 @@ libtool_options_prep ()
     uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
       shift; set dummy --mode uninstall ${1+"$@"}; shift
       ;;
+    *)
+      _G_rc_lt_options_prep=false
+      ;;
     esac
 
-    # Pass back the list of options.
-    func_quote_for_eval ${1+"$@"}
-    libtool_options_prep_result=$func_quote_for_eval_result
+    if $_G_rc_lt_options_prep; then
+      # Pass back the list of options.
+      func_quote eval ${1+"$@"}
+      libtool_options_prep_result=$func_quote_result
+    fi
+
+    $_G_rc_lt_options_prep
 }
 func_add_hook func_options_prep libtool_options_prep
 
@@ -2309,9 +2487,12 @@ libtool_parse_options ()
 {
     $debug_cmd
 
+    _G_rc_lt_parse_options=false
+
     # Perform our own loop to consume as many options as possible in
     # each iteration.
     while test $# -gt 0; do
+      _G_match_lt_parse_options=:
       _G_opt=$1
       shift
       case $_G_opt in
@@ -2386,15 +2567,22 @@ libtool_parse_options ()
                         func_append preserve_args " $_G_opt"
                         ;;
 
-	# An option not handled by this hook function:
-        *)		set dummy "$_G_opt" ${1+"$@"};	shift; break  ;;
+        # An option not handled by this hook function:
+        *)              set dummy "$_G_opt" ${1+"$@"} ; shift
+                        _G_match_lt_parse_options=false
+                        break
+                        ;;
       esac
+      $_G_match_lt_parse_options && _G_rc_lt_parse_options=:
     done
 
+    if $_G_rc_lt_parse_options; then
+      # save modified positional parameters for caller
+      func_quote eval ${1+"$@"}
+      libtool_parse_options_result=$func_quote_result
+    fi
 
-    # save modified positional parameters for caller
-    func_quote_for_eval ${1+"$@"}
-    libtool_parse_options_result=$func_quote_for_eval_result
+    $_G_rc_lt_parse_options
 }
 func_add_hook func_parse_options libtool_parse_options
 
@@ -2451,8 +2639,8 @@ libtool_validate_options ()
     }
 
     # Pass back the unparsed argument list
-    func_quote_for_eval ${1+"$@"}
-    libtool_validate_options_result=$func_quote_for_eval_result
+    func_quote eval ${1+"$@"}
+    libtool_validate_options_result=$func_quote_result
 }
 func_add_hook func_validate_options libtool_validate_options
 
@@ -3418,8 +3606,8 @@ func_mode_compile ()
       esac
     done
 
-    func_quote_for_eval "$libobj"
-    test "X$libobj" != "X$func_quote_for_eval_result" \
+    func_quote_arg pretty "$libobj"
+    test "X$libobj" != "X$func_quote_arg_result" \
       && $ECHO "X$libobj" | $GREP '[]~#^*{};<>?"'"'"'	 &()|`$[]' \
       && func_warning "libobj name '$libobj' may not contain shell special characters."
     func_dirname_and_basename "$obj" "/" ""
@@ -3492,8 +3680,8 @@ compiler."
 
     func_to_tool_file "$srcfile" func_convert_file_msys_to_w32
     srcfile=$func_to_tool_file_result
-    func_quote_for_eval "$srcfile"
-    qsrcfile=$func_quote_for_eval_result
+    func_quote_arg pretty "$srcfile"
+    qsrcfile=$func_quote_arg_result
 
     # Only build a PIC object if we are building libtool libraries.
     if test yes = "$build_libtool_libs"; then
@@ -4096,8 +4284,8 @@ func_mode_install ()
        case $nonopt in *shtool*) :;; *) false;; esac
     then
       # Aesthetically quote it.
-      func_quote_for_eval "$nonopt"
-      install_prog="$func_quote_for_eval_result "
+      func_quote_arg pretty "$nonopt"
+      install_prog="$func_quote_arg_result "
       arg=$1
       shift
     else
@@ -4107,8 +4295,8 @@ func_mode_install ()
 
     # The real first argument should be the name of the installation program.
     # Aesthetically quote it.
-    func_quote_for_eval "$arg"
-    func_append install_prog "$func_quote_for_eval_result"
+    func_quote_arg pretty "$arg"
+    func_append install_prog "$func_quote_arg_result"
     install_shared_prog=$install_prog
     case " $install_prog " in
       *[\\\ /]cp\ *) install_cp=: ;;
@@ -4165,12 +4353,12 @@ func_mode_install ()
       esac
 
       # Aesthetically quote the argument.
-      func_quote_for_eval "$arg"
-      func_append install_prog " $func_quote_for_eval_result"
+      func_quote_arg pretty "$arg"
+      func_append install_prog " $func_quote_arg_result"
       if test -n "$arg2"; then
-	func_quote_for_eval "$arg2"
+	func_quote_arg pretty "$arg2"
       fi
-      func_append install_shared_prog " $func_quote_for_eval_result"
+      func_append install_shared_prog " $func_quote_arg_result"
     done
 
     test -z "$install_prog" && \
@@ -4181,8 +4369,8 @@ func_mode_install ()
 
     if test -n "$install_override_mode" && $no_mode; then
       if $install_cp; then :; else
-	func_quote_for_eval "$install_override_mode"
-	func_append install_shared_prog " -m $func_quote_for_eval_result"
+	func_quote_arg pretty "$install_override_mode"
+	func_append install_shared_prog " -m $func_quote_arg_result"
       fi
     fi
 
@@ -4478,8 +4666,8 @@ func_mode_install ()
 	        relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'`
 
 	        $opt_quiet || {
-	          func_quote_for_expand "$relink_command"
-		  eval "func_echo $func_quote_for_expand_result"
+	          func_quote_arg expand,pretty "$relink_command"
+		  eval "func_echo $func_quote_arg_result"
 	        }
 	        if eval "$relink_command"; then :
 	          else
@@ -5258,7 +5446,8 @@ else
   if test \"\$libtool_execute_magic\" != \"$magic\"; then
     file=\"\$0\""
 
-    qECHO=`$ECHO "$ECHO" | $SED "$sed_quote_subst"`
+    func_quote_arg pretty "$ECHO"
+    qECHO=$func_quote_arg_result
     $ECHO "\
 
 # A function that is used when there is no print builtin or printf.
@@ -5268,7 +5457,7 @@ func_fallback_echo ()
 \$1
 _LTECHO_EOF'
 }
-    ECHO=\"$qECHO\"
+    ECHO=$qECHO
   fi
 
 # Very basic option parsing. These options are (a) specific to
@@ -6611,9 +6800,9 @@ func_mode_link ()
     while test "$#" -gt 0; do
       arg=$1
       shift
-      func_quote_for_eval "$arg"
-      qarg=$func_quote_for_eval_unquoted_result
-      func_append libtool_args " $func_quote_for_eval_result"
+      func_quote_arg pretty,unquoted "$arg"
+      qarg=$func_quote_arg_unquoted_result
+      func_append libtool_args " $func_quote_arg_result"
 
       # If the previous option needs an argument, assign it.
       if test -n "$prev"; then
@@ -7211,9 +7400,9 @@ func_mode_link ()
 	save_ifs=$IFS; IFS=,
 	for flag in $args; do
 	  IFS=$save_ifs
-          func_quote_for_eval "$flag"
-	  func_append arg " $func_quote_for_eval_result"
-	  func_append compiler_flags " $func_quote_for_eval_result"
+          func_quote_arg pretty "$flag"
+	  func_append arg " $func_quote_arg_result"
+	  func_append compiler_flags " $func_quote_arg_result"
 	done
 	IFS=$save_ifs
 	func_stripname ' ' '' "$arg"
@@ -7227,10 +7416,10 @@ func_mode_link ()
 	save_ifs=$IFS; IFS=,
 	for flag in $args; do
 	  IFS=$save_ifs
-          func_quote_for_eval "$flag"
-	  func_append arg " $wl$func_quote_for_eval_result"
-	  func_append compiler_flags " $wl$func_quote_for_eval_result"
-	  func_append linker_flags " $func_quote_for_eval_result"
+          func_quote_arg pretty "$flag"
+	  func_append arg " $wl$func_quote_arg_result"
+	  func_append compiler_flags " $wl$func_quote_arg_result"
+	  func_append linker_flags " $func_quote_arg_result"
 	done
 	IFS=$save_ifs
 	func_stripname ' ' '' "$arg"
@@ -7254,8 +7443,8 @@ func_mode_link ()
 
       # -msg_* for osf cc
       -msg_*)
-	func_quote_for_eval "$arg"
-	arg=$func_quote_for_eval_result
+	func_quote_arg pretty "$arg"
+	arg=$func_quote_arg_result
 	;;
 
       # Flags to be passed through unchanged, with rationale:
@@ -7279,8 +7468,8 @@ func_mode_link ()
       -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
       -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \
       -specs=*|-fsanitize=*)
-        func_quote_for_eval "$arg"
-	arg=$func_quote_for_eval_result
+        func_quote_arg pretty "$arg"
+	arg=$func_quote_arg_result
         func_append compile_command " $arg"
         func_append finalize_command " $arg"
         func_append compiler_flags " $arg"
@@ -7301,15 +7490,15 @@ func_mode_link ()
 	  continue
         else
 	  # Otherwise treat like 'Some other compiler flag' below
-	  func_quote_for_eval "$arg"
-	  arg=$func_quote_for_eval_result
+	  func_quote_arg pretty "$arg"
+	  arg=$func_quote_arg_result
         fi
 	;;
 
       # Some other compiler flag.
       -* | +*)
-        func_quote_for_eval "$arg"
-	arg=$func_quote_for_eval_result
+        func_quote_arg pretty "$arg"
+	arg=$func_quote_arg_result
 	;;
 
       *.$objext)
@@ -7429,8 +7618,8 @@ func_mode_link ()
       *)
 	# Unknown arguments in both finalize_command and compile_command need
 	# to be aesthetically quoted because they are evaled later.
-	func_quote_for_eval "$arg"
-	arg=$func_quote_for_eval_result
+	func_quote_arg pretty "$arg"
+	arg=$func_quote_arg_result
 	;;
       esac # arg
 
@@ -9942,8 +10131,8 @@ EOF
 	    for cmd in $concat_cmds; do
 	      IFS=$save_ifs
 	      $opt_quiet || {
-		  func_quote_for_expand "$cmd"
-		  eval "func_echo $func_quote_for_expand_result"
+		  func_quote_arg expand,pretty "$cmd"
+		  eval "func_echo $func_quote_arg_result"
 	      }
 	      $opt_dry_run || eval "$cmd" || {
 		lt_exit=$?
@@ -10036,8 +10225,8 @@ EOF
 	  eval cmd=\"$cmd\"
 	  IFS=$save_ifs
 	  $opt_quiet || {
-	    func_quote_for_expand "$cmd"
-	    eval "func_echo $func_quote_for_expand_result"
+	    func_quote_arg expand,pretty "$cmd"
+	    eval "func_echo $func_quote_arg_result"
 	  }
 	  $opt_dry_run || eval "$cmd" || {
 	    lt_exit=$?
@@ -10511,12 +10700,12 @@ EOF
 	  elif eval var_value=\$$var; test -z "$var_value"; then
 	    relink_command="$var=; export $var; $relink_command"
 	  else
-	    func_quote_for_eval "$var_value"
-	    relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command"
+	    func_quote_arg pretty "$var_value"
+	    relink_command="$var=$func_quote_arg_result; export $var; $relink_command"
 	  fi
 	done
-	relink_command="(cd `pwd`; $relink_command)"
-	relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
+	func_quote_arg pretty,unquoted "(cd `pwd`; $relink_command)"
+	relink_command=$func_quote_arg_unquoted_result
       fi
 
       # Only actually do things if not in dry run mode.
@@ -10756,13 +10945,14 @@ EOF
 	elif eval var_value=\$$var; test -z "$var_value"; then
 	  relink_command="$var=; export $var; $relink_command"
 	else
-	  func_quote_for_eval "$var_value"
-	  relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command"
+	  func_quote_arg pretty,unquoted "$var_value"
+	  relink_command="$var=$func_quote_arg_unquoted_result; export $var; $relink_command"
 	fi
       done
       # Quote the link command for shipping.
       relink_command="(cd `pwd`; $SHELL \"$progpath\" $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
-      relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
+      func_quote_arg pretty,unquoted "$relink_command"
+      relink_command=$func_quote_arg_unquoted_result
       if test yes = "$hardcode_automatic"; then
 	relink_command=
       fi
diff --git a/config.h.win32 b/config.h.win32
deleted file mode 100644
index 552a55b..0000000
--- a/config.h.win32
+++ /dev/null
@@ -1,143 +0,0 @@
-/* config.h.in.  Generated from configure.ac by autoheader.  */
-
-/* Director prefix for gir installation */
-#define GIR_DIR "/some/dynamically/constructed/dir"
-
-/* Name of the gir directory */
-#define GIR_SUFFIX "gir-1.0"
-
-/* Directory prefix for typelib installation */
-#define GOBJECT_INTROSPECTION_LIBDIR "/some/dynamically/constructed/dir"
-
-/* Define to 1 if you have the `backtrace' function. */
-/* #undef HAVE_BACKTRACE */
-
-/* Define to 1 if you have the `backtrace_symbols' function. */
-/* #undef HAVE_BACKTRACE_SYMBOLS */
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-/* #undef HAVE_DLFCN_H */
-
-/* Define to 1 if you have the <fcntl.h> header file. */
-#define HAVE_FCNTL_H 1
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#ifndef _MSC_VER
-#define HAVE_INTTYPES_H 1
-#endif
-
-/* Define to 1 if you have the `dl' library (-ldl). */
-/* #undef HAVE_LIBDL */
-
-/* Define to 1 if you have the `memchr' function. */
-#define HAVE_MEMCHR 1
-
-/* Define to 1 if you have the <memory.h> header file. */
-#define HAVE_MEMORY_H 1
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#if (!defined (_MSC_VER) || (_MSC_VER >= 1600))
-#define HAVE_STDINT_H 1
-#endif
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#define HAVE_STDLIB_H 1
-
-/* Define to 1 if you have the `strchr' function. */
-#define HAVE_STRCHR 1
-
-/* Define to 1 if you have the <strings.h> header file. */
-#ifndef _MSC_VER
-#define HAVE_STRINGS_H 1
-#endif
-
-/* Define to 1 if you have the <string.h> header file. */
-#define HAVE_STRING_H 1
-
-/* Define to 1 if you have the `strspn' function. */
-#define HAVE_STRSPN 1
-
-/* Define to 1 if you have the `strstr' function. */
-#define HAVE_STRSTR 1
-
-/* Define to 1 if you have the `strtol' function. */
-#define HAVE_STRTOL 1
-
-/* Define to 1 if you have the `strtoull' function. */
-#ifndef _MSC_VER
-#define HAVE_STRTOULL 1
-#endif
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#define HAVE_SYS_STAT_H 1
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#define HAVE_SYS_TYPES_H 1
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#ifndef _MSC_VER
-#define HAVE_UNISTD_H 1
-#endif
-
-/* Define to the sub-directory in which libtool stores uninstalled libraries.
-   */
-#define LT_OBJDIR ".libs/"
-
-/* Define to 1 if your C compiler doesn't accept -c and -o together. */
-/* #undef NO_MINUS_C_MINUS_O
-
-/* Name of package */
-#define PACKAGE "gobject-introspection"
-
-/* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT "http://bugzilla.gnome.org/enter_bug.cgi?product=gobject-introspection"
-
-/* Define to the full name of this package. */
-#define PACKAGE_NAME "gobject-introspection"
-
-/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "gojbect-introspection 1.56.1"
-
-/* Define to the one symbol short name of this package. */
-#define PACKAGE_TARNAME "gobject-introspection"
-
-/* Define to the home page for this package. */
-#define PACKAGE_URL ""
-
-/* Define to the version of this package. */
-#define PACKAGE_VERSION "1.56.1"
-
-/* Define to the platform's shared library suffix */
-#define SHLIB_SUFFIX ".dll"
-
-/* The size of `char', as computed by sizeof. */
-#define SIZEOF_CHAR 1
-
-/* The size of `int', as computed by sizeof. */
-#define SIZEOF_INT 4
-
-/* The size of `long', as computed by sizeof. */
-#define SIZEOF_LONG 4
-
-/* The size of `short', as computed by sizeof. */
-#define SIZEOF_SHORT 2
-
-/* Define to 1 if you have the ANSI C header files. */
-#define STDC_HEADERS 1
-
-/* Version number of package */
-#define VERSION "1.56.1"
-
-/* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a
-   `char[]'. */
-#define YYTEXT_POINTER 1
-
-/* defines how to decorate public symbols while building */
-#ifdef _MSC_VER
-#define _GI_EXTERN __declspec (dllexport) extern
-#else
-#define _GI_EXTERN __attribute__((visibility("default"))) __declspec (dllexport) extern
-#endif
-
-/* Define to empty if `const' does not conform to ANSI C. */
-/* #undef const */
diff --git a/config.h.win32.in b/config.h.win32.in
deleted file mode 100644
index f6e12cc..0000000
--- a/config.h.win32.in
+++ /dev/null
@@ -1,143 +0,0 @@
-/* config.h.in.  Generated from configure.ac by autoheader.  */
-
-/* Director prefix for gir installation */
-#define GIR_DIR "/some/dynamically/constructed/dir"
-
-/* Name of the gir directory */
-#define GIR_SUFFIX "@GIR_SUFFIX@"
-
-/* Directory prefix for typelib installation */
-#define GOBJECT_INTROSPECTION_LIBDIR "/some/dynamically/constructed/dir"
-
-/* Define to 1 if you have the `backtrace' function. */
-/* #undef HAVE_BACKTRACE */
-
-/* Define to 1 if you have the `backtrace_symbols' function. */
-/* #undef HAVE_BACKTRACE_SYMBOLS */
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-/* #undef HAVE_DLFCN_H */
-
-/* Define to 1 if you have the <fcntl.h> header file. */
-#define HAVE_FCNTL_H 1
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#ifndef _MSC_VER
-#define HAVE_INTTYPES_H 1
-#endif
-
-/* Define to 1 if you have the `dl' library (-ldl). */
-/* #undef HAVE_LIBDL */
-
-/* Define to 1 if you have the `memchr' function. */
-#define HAVE_MEMCHR 1
-
-/* Define to 1 if you have the <memory.h> header file. */
-#define HAVE_MEMORY_H 1
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#if (!defined (_MSC_VER) || (_MSC_VER >= 1600))
-#define HAVE_STDINT_H 1
-#endif
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#define HAVE_STDLIB_H 1
-
-/* Define to 1 if you have the `strchr' function. */
-#define HAVE_STRCHR 1
-
-/* Define to 1 if you have the <strings.h> header file. */
-#ifndef _MSC_VER
-#define HAVE_STRINGS_H 1
-#endif
-
-/* Define to 1 if you have the <string.h> header file. */
-#define HAVE_STRING_H 1
-
-/* Define to 1 if you have the `strspn' function. */
-#define HAVE_STRSPN 1
-
-/* Define to 1 if you have the `strstr' function. */
-#define HAVE_STRSTR 1
-
-/* Define to 1 if you have the `strtol' function. */
-#define HAVE_STRTOL 1
-
-/* Define to 1 if you have the `strtoull' function. */
-#ifndef _MSC_VER
-#define HAVE_STRTOULL 1
-#endif
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#define HAVE_SYS_STAT_H 1
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#define HAVE_SYS_TYPES_H 1
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#ifndef _MSC_VER
-#define HAVE_UNISTD_H 1
-#endif
-
-/* Define to the sub-directory in which libtool stores uninstalled libraries.
-   */
-#define LT_OBJDIR ".libs/"
-
-/* Define to 1 if your C compiler doesn't accept -c and -o together. */
-/* #undef NO_MINUS_C_MINUS_O
-
-/* Name of package */
-#define PACKAGE "gobject-introspection"
-
-/* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT "@PACKAGE_BUGREPORT@"
-
-/* Define to the full name of this package. */
-#define PACKAGE_NAME "gobject-introspection"
-
-/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "gojbect-introspection @PACKAGE_VERSION@"
-
-/* Define to the one symbol short name of this package. */
-#define PACKAGE_TARNAME "gobject-introspection"
-
-/* Define to the home page for this package. */
-#define PACKAGE_URL ""
-
-/* Define to the version of this package. */
-#define PACKAGE_VERSION "@PACKAGE_VERSION@"
-
-/* Define to the platform's shared library suffix */
-#define SHLIB_SUFFIX ".dll"
-
-/* The size of `char', as computed by sizeof. */
-#define SIZEOF_CHAR 1
-
-/* The size of `int', as computed by sizeof. */
-#define SIZEOF_INT 4
-
-/* The size of `long', as computed by sizeof. */
-#define SIZEOF_LONG 4
-
-/* The size of `short', as computed by sizeof. */
-#define SIZEOF_SHORT 2
-
-/* Define to 1 if you have the ANSI C header files. */
-#define STDC_HEADERS 1
-
-/* Version number of package */
-#define VERSION "@PACKAGE_VERSION@"
-
-/* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a
-   `char[]'. */
-#define YYTEXT_POINTER 1
-
-/* defines how to decorate public symbols while building */
-#ifdef _MSC_VER
-#define _GI_EXTERN __declspec (dllexport) extern
-#else
-#define _GI_EXTERN __attribute__((visibility("default"))) __declspec (dllexport) extern
-#endif
-
-/* Define to empty if `const' does not conform to ANSI C. */
-/* #undef const */
diff --git a/configure b/configure
index d707924..7dce5fb 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for gobject-introspection 1.56.1.
+# Generated by GNU Autoconf 2.69 for gobject-introspection 1.57.2.
 #
 # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=gobject-introspection>.
 #
@@ -591,8 +591,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='gobject-introspection'
 PACKAGE_TARNAME='gobject-introspection'
-PACKAGE_VERSION='1.56.1'
-PACKAGE_STRING='gobject-introspection 1.56.1'
+PACKAGE_VERSION='1.57.2'
+PACKAGE_STRING='gobject-introspection 1.57.2'
 PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=gobject-introspection'
 PACKAGE_URL=''
 
@@ -646,6 +646,7 @@ WITH_GLIBSRC_FALSE
 WITH_GLIBSRC_TRUE
 BUILD_DOCTOOL_FALSE
 BUILD_DOCTOOL_TRUE
+PYTHON_SO
 PYTHON_LIBS
 PYTHON_INCLUDES
 pkgpyexecdir
@@ -714,6 +715,11 @@ EXPANDED_LIBDIR
 EXPANDED_BINDIR
 EXPANDED_SYSCONFDIR
 EXPANDED_LOCALSTATEDIR
+WARN_CFLAGS_FLEX
+WARN_CFLAGS_PYTHON
+WARN_SCANNERFLAGS
+WARN_LDFLAGS
+WARN_CFLAGS
 YACC
 LEXLIB
 LEX_OUTPUT_ROOT
@@ -855,6 +861,8 @@ with_aix_soname
 with_gnu_ld
 with_sysroot
 enable_libtool_lock
+enable_compile_warnings
+enable_Werror
 with_cairo
 with_html_dir
 enable_gtk_doc
@@ -1449,7 +1457,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures gobject-introspection 1.56.1 to adapt to many kinds of systems.
+\`configure' configures gobject-introspection 1.57.2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1521,7 +1529,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of gobject-introspection 1.56.1:";;
+     short | recursive ) echo "Configuration of gobject-introspection 1.57.2:";;
    esac
   cat <<\_ACEOF
 
@@ -1543,6 +1551,9 @@ Optional Features:
   --enable-fast-install[=PKGS]
                           optimize for fast installation [default=yes]
   --disable-libtool-lock  avoid locking (might break parallel builds)
+  --enable-compile-warnings=[no/yes/error]
+                          Enable compiler warnings and errors
+  --disable-Werror        Unconditionally make all compiler warnings non-fatal
   --enable-gtk-doc        use gtk-doc to build documentation [[default=no]]
   --enable-gtk-doc-html   build documentation in html format [[default=yes]]
   --enable-gtk-doc-pdf    build documentation in pdf format [[default=no]]
@@ -1683,7 +1694,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-gobject-introspection configure 1.56.1
+gobject-introspection configure 1.57.2
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2235,7 +2246,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by gobject-introspection $as_me 1.56.1, which was
+It was created by gobject-introspection $as_me 1.57.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3103,7 +3114,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='gobject-introspection'
- VERSION='1.56.1'
+ VERSION='1.57.2'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3377,7 +3388,7 @@ AM_BACKSLASH='\'
 
 
 # Used in docs/reference/version.xml
-GI_VERSION=1.56.1
+GI_VERSION=1.57.2
 
 
 # Check for Win32
@@ -12860,28 +12871,1867 @@ if test "$YACC" = :; then
 	as_fn_error $? "bison not found but required" "$LINENO" 5
 fi
 
+# Default compiler warnings
 
-ensureflag() {
-  flag="$1"; shift
-  result="$@"
 
-  case " ${result} " in
-  *[\ \	]${flag}[\ \	]*) ;;
-  *) result="${flag} ${result}" ;;
-  esac
+    # C support is enabled by default.
+
+
+    # Only enable C++ support if AC_PROG_CXX is called. The redefinition of
+    # AC_PROG_CXX is so that a fatal error is emitted if this macro is called
+    # before AC_PROG_CXX, which would otherwise cause no C++ warnings to be
+    # checked.
+
+
+
+
+    # Default value for IS-RELEASE is $ax_is_release
+    ax_compiler_flags_is_release=yes
+
+    # Check whether --enable-compile-warnings was given.
+if test "${enable_compile_warnings+set}" = set; then :
+  enableval=$enable_compile_warnings;
+else
+  if test "$ax_compiler_flags_is_release" = "yes"; then :
+  enable_compile_warnings="yes"
+else
+  enable_compile_warnings="error"
+fi
+fi
+
+    # Check whether --enable-Werror was given.
+if test "${enable_Werror+set}" = set; then :
+  enableval=$enable_Werror;
+else
+  enable_Werror=maybe
+fi
+
+
+    # Return the user's chosen warning level
+    if test "$enable_Werror" = "no" -a \
+                "$enable_compile_warnings" = "error"; then :
+
+        enable_compile_warnings="yes"
+
+fi
+
+    ax_enable_compile_warnings=$enable_compile_warnings
+
+
+
+
+
+
+
+
+
+
+    # Variable names
+
+
+    ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+      #ifndef __cplusplus
+       #error "no C++"
+       #endif
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ax_compiler_cxx=yes;
+else
+  ax_compiler_cxx=no;
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+    # Always pass -Werror=unknown-warning-option to get Clang to fail on bad
+    # flags, otherwise they are always appended to the warn_cflags variable, and
+    # Clang warns on them for every compilation unit.
+    # If this is passed to GCC, it will explode, so the flag must be enabled
+    # conditionally.
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Werror=unknown-warning-option" >&5
+$as_echo_n "checking whether C compiler accepts -Werror=unknown-warning-option... " >&6; }
+if ${ax_cv_check_cflags___Werror_unknown_warning_option+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+  ax_check_save_flags=$CFLAGS
+  CFLAGS="$CFLAGS  -Werror=unknown-warning-option"
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ax_cv_check_cflags___Werror_unknown_warning_option=yes
+else
+  ax_cv_check_cflags___Werror_unknown_warning_option=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  CFLAGS=$ax_check_save_flags
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___Werror_unknown_warning_option" >&5
+$as_echo "$ax_cv_check_cflags___Werror_unknown_warning_option" >&6; }
+if test "x$ax_cv_check_cflags___Werror_unknown_warning_option" = xyes; then :
+
+        ax_compiler_flags_test="-Werror=unknown-warning-option"
+
+else
+
+        ax_compiler_flags_test=""
+
+fi
+
+
+    # Check that -Wno-suggest-attribute=format is supported
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Wno-suggest-attribute=format" >&5
+$as_echo_n "checking whether C compiler accepts -Wno-suggest-attribute=format... " >&6; }
+if ${ax_cv_check_cflags___Wno_suggest_attribute_format+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+  ax_check_save_flags=$CFLAGS
+  CFLAGS="$CFLAGS  -Wno-suggest-attribute=format"
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ax_cv_check_cflags___Wno_suggest_attribute_format=yes
+else
+  ax_cv_check_cflags___Wno_suggest_attribute_format=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  CFLAGS=$ax_check_save_flags
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___Wno_suggest_attribute_format" >&5
+$as_echo "$ax_cv_check_cflags___Wno_suggest_attribute_format" >&6; }
+if test "x$ax_cv_check_cflags___Wno_suggest_attribute_format" = xyes; then :
+
+        ax_compiler_no_suggest_attribute_flags="-Wno-suggest-attribute=format"
+
+else
+
+        ax_compiler_no_suggest_attribute_flags=""
+
+fi
+
+
+    # Base flags
+
+
+
+
+for flag in          -fno-strict-aliasing              ; do
+  as_CACHEVAR=`$as_echo "ax_cv_check_cflags_$ax_compiler_flags_test_$flag" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts $flag" >&5
+$as_echo_n "checking whether C compiler accepts $flag... " >&6; }
+if eval \${$as_CACHEVAR+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+  ax_check_save_flags=$CFLAGS
+  CFLAGS="$CFLAGS $ax_compiler_flags_test $flag"
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  eval "$as_CACHEVAR=yes"
+else
+  eval "$as_CACHEVAR=no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  CFLAGS=$ax_check_save_flags
+fi
+eval ac_res=\$$as_CACHEVAR
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if eval test \"x\$"$as_CACHEVAR"\" = x"yes"; then :
+
+if ${WARN_CFLAGS+:} false; then :
+
+  case " $WARN_CFLAGS " in #(
+  *" $flag "*) :
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: : WARN_CFLAGS already contains \$flag"; } >&5
+  (: WARN_CFLAGS already contains $flag) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } ;; #(
+  *) :
+
+     as_fn_append WARN_CFLAGS " $flag"
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: : WARN_CFLAGS=\"\$WARN_CFLAGS\""; } >&5
+  (: WARN_CFLAGS="$WARN_CFLAGS") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+     ;;
+esac
+
+else
+
+  WARN_CFLAGS=$flag
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: : WARN_CFLAGS=\"\$WARN_CFLAGS\""; } >&5
+  (: WARN_CFLAGS="$WARN_CFLAGS") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+
+fi
+
+else
+  :
+fi
+
+done
+
+
+    if test "$ax_enable_compile_warnings" != "no"; then :
+
+        # "yes" flags
+
+
+
+
+for flag in              -Wall             -Wextra             -Wundef             -Wwrite-strings             -Wpointer-arith             -Wmissing-declarations             -Wredundant-decls             -Wno-unused-parameter             -Wno-missing-field-initializers             -Wformat=2             -Wcast-align             -Wformat-nonliteral             -Wformat-security             -Wsign-compare             -Wstrict-aliasing             -Wshadow             -Winline             -Wpacked             -Wmissing-format-attribute             -Wmissing-noreturn             -Winit-self             -Wredundant-decls             -Wmissing-include-dirs             -Wunused-but-set-variable             -Warray-bounds             -Wreturn-type             -Wswitch-enum             -Wswitch-default             -Wduplicated-cond             -Wduplicated-branches             -Wlogical-op             -Wrestrict             -Wnull-dereference             -Wdouble-promotion                                                                ; do
+  as_CACHEVAR=`$as_echo "ax_cv_check_cflags_$ax_compiler_flags_test_$flag" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts $flag" >&5
+$as_echo_n "checking whether C compiler accepts $flag... " >&6; }
+if eval \${$as_CACHEVAR+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+  ax_check_save_flags=$CFLAGS
+  CFLAGS="$CFLAGS $ax_compiler_flags_test $flag"
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  eval "$as_CACHEVAR=yes"
+else
+  eval "$as_CACHEVAR=no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  CFLAGS=$ax_check_save_flags
+fi
+eval ac_res=\$$as_CACHEVAR
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if eval test \"x\$"$as_CACHEVAR"\" = x"yes"; then :
+
+if ${WARN_CFLAGS+:} false; then :
+
+  case " $WARN_CFLAGS " in #(
+  *" $flag "*) :
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: : WARN_CFLAGS already contains \$flag"; } >&5
+  (: WARN_CFLAGS already contains $flag) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } ;; #(
+  *) :
+
+     as_fn_append WARN_CFLAGS " $flag"
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: : WARN_CFLAGS=\"\$WARN_CFLAGS\""; } >&5
+  (: WARN_CFLAGS="$WARN_CFLAGS") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+     ;;
+esac
+
+else
+
+  WARN_CFLAGS=$flag
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: : WARN_CFLAGS=\"\$WARN_CFLAGS\""; } >&5
+  (: WARN_CFLAGS="$WARN_CFLAGS") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+
+fi
+
+else
+  :
+fi
+
+done
+
+        if test "$ax_compiler_cxx" = "no" ; then
+            # C-only flags. Warn in C++
+
+
+
+
+for flag in              -Wnested-externs             -Wmissing-prototypes             -Wstrict-prototypes             -Wdeclaration-after-statement             -Wimplicit-function-declaration             -Wold-style-definition             -Wjump-misses-init             ; do
+  as_CACHEVAR=`$as_echo "ax_cv_check_cflags_$ax_compiler_flags_test_$flag" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts $flag" >&5
+$as_echo_n "checking whether C compiler accepts $flag... " >&6; }
+if eval \${$as_CACHEVAR+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+  ax_check_save_flags=$CFLAGS
+  CFLAGS="$CFLAGS $ax_compiler_flags_test $flag"
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  eval "$as_CACHEVAR=yes"
+else
+  eval "$as_CACHEVAR=no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  CFLAGS=$ax_check_save_flags
+fi
+eval ac_res=\$$as_CACHEVAR
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if eval test \"x\$"$as_CACHEVAR"\" = x"yes"; then :
+
+if ${WARN_CFLAGS+:} false; then :
+
+  case " $WARN_CFLAGS " in #(
+  *" $flag "*) :
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: : WARN_CFLAGS already contains \$flag"; } >&5
+  (: WARN_CFLAGS already contains $flag) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } ;; #(
+  *) :
+
+     as_fn_append WARN_CFLAGS " $flag"
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: : WARN_CFLAGS=\"\$WARN_CFLAGS\""; } >&5
+  (: WARN_CFLAGS="$WARN_CFLAGS") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+     ;;
+esac
+
+else
+
+  WARN_CFLAGS=$flag
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: : WARN_CFLAGS=\"\$WARN_CFLAGS\""; } >&5
+  (: WARN_CFLAGS="$WARN_CFLAGS") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+
+fi
+
+else
+  :
+fi
+
+done
+
+        fi
+
+fi
+    if test "$ax_enable_compile_warnings" = "error"; then :
+
+        # "error" flags; -Werror has to be appended unconditionally because
+        # it's not possible to test for
+        #
+        # suggest-attribute=format is disabled because it gives too many false
+        # positives
+
+if ${WARN_CFLAGS+:} false; then :
+
+  case " $WARN_CFLAGS " in #(
+  *" -Werror "*) :
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: : WARN_CFLAGS already contains -Werror"; } >&5
+  (: WARN_CFLAGS already contains -Werror) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } ;; #(
+  *) :
+
+     as_fn_append WARN_CFLAGS " -Werror"
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: : WARN_CFLAGS=\"\$WARN_CFLAGS\""; } >&5
+  (: WARN_CFLAGS="$WARN_CFLAGS") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+     ;;
+esac
+
+else
+
+  WARN_CFLAGS=-Werror
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: : WARN_CFLAGS=\"\$WARN_CFLAGS\""; } >&5
+  (: WARN_CFLAGS="$WARN_CFLAGS") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+
+fi
+
+
+
+
+
+
+for flag in              $ax_compiler_no_suggest_attribute_flags         ; do
+  as_CACHEVAR=`$as_echo "ax_cv_check_cflags_$ax_compiler_flags_test_$flag" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts $flag" >&5
+$as_echo_n "checking whether C compiler accepts $flag... " >&6; }
+if eval \${$as_CACHEVAR+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+  ax_check_save_flags=$CFLAGS
+  CFLAGS="$CFLAGS $ax_compiler_flags_test $flag"
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  eval "$as_CACHEVAR=yes"
+else
+  eval "$as_CACHEVAR=no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  CFLAGS=$ax_check_save_flags
+fi
+eval ac_res=\$$as_CACHEVAR
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if eval test \"x\$"$as_CACHEVAR"\" = x"yes"; then :
+
+if ${WARN_CFLAGS+:} false; then :
+
+  case " $WARN_CFLAGS " in #(
+  *" $flag "*) :
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: : WARN_CFLAGS already contains \$flag"; } >&5
+  (: WARN_CFLAGS already contains $flag) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } ;; #(
+  *) :
+
+     as_fn_append WARN_CFLAGS " $flag"
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: : WARN_CFLAGS=\"\$WARN_CFLAGS\""; } >&5
+  (: WARN_CFLAGS="$WARN_CFLAGS") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+     ;;
+esac
+
+else
+
+  WARN_CFLAGS=$flag
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: : WARN_CFLAGS=\"\$WARN_CFLAGS\""; } >&5
+  (: WARN_CFLAGS="$WARN_CFLAGS") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+
+fi
+
+else
+  :
+fi
+
+done
+
+
+fi
+
+    # In the flags below, when disabling specific flags, always add *both*
+    # -Wno-foo and -Wno-error=foo. This fixes the situation where (for example)
+    # we enable -Werror, disable a flag, and a build bot passes CFLAGS=-Wall,
+    # which effectively turns that flag back on again as an error.
+    for flag in $WARN_CFLAGS; do
+        case $flag in #(
+  -Wno-*=*) :
+     ;; #(
+  -Wno-*) :
+
+
+
+
+
+for flag in -Wno-error=$($as_echo $flag | $SED 's/^-Wno-//'); do
+  as_CACHEVAR=`$as_echo "ax_cv_check_cflags_$ax_compiler_flags_test_$flag" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts $flag" >&5
+$as_echo_n "checking whether C compiler accepts $flag... " >&6; }
+if eval \${$as_CACHEVAR+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+  ax_check_save_flags=$CFLAGS
+  CFLAGS="$CFLAGS $ax_compiler_flags_test $flag"
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  eval "$as_CACHEVAR=yes"
+else
+  eval "$as_CACHEVAR=no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  CFLAGS=$ax_check_save_flags
+fi
+eval ac_res=\$$as_CACHEVAR
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if eval test \"x\$"$as_CACHEVAR"\" = x"yes"; then :
+
+if ${WARN_CFLAGS+:} false; then :
+
+  case " $WARN_CFLAGS " in #(
+  *" $flag "*) :
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: : WARN_CFLAGS already contains \$flag"; } >&5
+  (: WARN_CFLAGS already contains $flag) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } ;; #(
+  *) :
+
+     as_fn_append WARN_CFLAGS " $flag"
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: : WARN_CFLAGS=\"\$WARN_CFLAGS\""; } >&5
+  (: WARN_CFLAGS="$WARN_CFLAGS") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+     ;;
+esac
+
+else
+
+  WARN_CFLAGS=$flag
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: : WARN_CFLAGS=\"\$WARN_CFLAGS\""; } >&5
+  (: WARN_CFLAGS="$WARN_CFLAGS") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+
+fi
+
+else
+  :
+fi
+
+done
+
+                 ;; #(
+  *) :
+     ;;
+esac
+    done
+
+    ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+    # Substitute the variables
+
+
+
+
+
+
+
+
+
+
+
+
+
+    # Variable names
+
+
+    # Always pass -Werror=unknown-warning-option to get Clang to fail on bad
+    # flags, otherwise they are always appended to the warn_ldflags variable,
+    # and Clang warns on them for every compilation unit.
+    # If this is passed to GCC, it will explode, so the flag must be enabled
+    # conditionally.
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Werror=unknown-warning-option" >&5
+$as_echo_n "checking whether C compiler accepts -Werror=unknown-warning-option... " >&6; }
+if ${ax_cv_check_cflags___Werror_unknown_warning_option+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+  ax_check_save_flags=$CFLAGS
+  CFLAGS="$CFLAGS  -Werror=unknown-warning-option"
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ax_cv_check_cflags___Werror_unknown_warning_option=yes
+else
+  ax_cv_check_cflags___Werror_unknown_warning_option=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  CFLAGS=$ax_check_save_flags
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___Werror_unknown_warning_option" >&5
+$as_echo "$ax_cv_check_cflags___Werror_unknown_warning_option" >&6; }
+if test "x$ax_cv_check_cflags___Werror_unknown_warning_option" = xyes; then :
+
+        ax_compiler_flags_test="-Werror=unknown-warning-option"
+
+else
+
+        ax_compiler_flags_test=""
+
+fi
+
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the linker accepts -Wl,--as-needed" >&5
+$as_echo_n "checking whether the linker accepts -Wl,--as-needed... " >&6; }
+if ${ax_cv_check_ldflags___Wl___as_needed+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+  ax_check_save_flags=$LDFLAGS
+  LDFLAGS="$LDFLAGS  -Wl,--as-needed"
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ax_cv_check_ldflags___Wl___as_needed=yes
+else
+  ax_cv_check_ldflags___Wl___as_needed=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+  LDFLAGS=$ax_check_save_flags
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_ldflags___Wl___as_needed" >&5
+$as_echo "$ax_cv_check_ldflags___Wl___as_needed" >&6; }
+if test "x$ax_cv_check_ldflags___Wl___as_needed" = xyes; then :
+
+
+
+
+
+for flag in -Wl,--as-needed; do
+  as_CACHEVAR=`$as_echo "ax_cv_check_ldflags_$ax_compiler_flags_test_$flag" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the linker accepts $flag" >&5
+$as_echo_n "checking whether the linker accepts $flag... " >&6; }
+if eval \${$as_CACHEVAR+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+  ax_check_save_flags=$LDFLAGS
+  LDFLAGS="$LDFLAGS $ax_compiler_flags_test $flag"
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  eval "$as_CACHEVAR=yes"
+else
+  eval "$as_CACHEVAR=no"
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+  LDFLAGS=$ax_check_save_flags
+fi
+eval ac_res=\$$as_CACHEVAR
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if eval test \"x\$"$as_CACHEVAR"\" = x"yes"; then :
+
+if ${AM_LDFLAGS+:} false; then :
+
+  case " $AM_LDFLAGS " in #(
+  *" $flag "*) :
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: : AM_LDFLAGS already contains \$flag"; } >&5
+  (: AM_LDFLAGS already contains $flag) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } ;; #(
+  *) :
+
+     as_fn_append AM_LDFLAGS " $flag"
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: : AM_LDFLAGS=\"\$AM_LDFLAGS\""; } >&5
+  (: AM_LDFLAGS="$AM_LDFLAGS") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+     ;;
+esac
+
+else
+
+  AM_LDFLAGS=$flag
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: : AM_LDFLAGS=\"\$AM_LDFLAGS\""; } >&5
+  (: AM_LDFLAGS="$AM_LDFLAGS") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+
+fi
+
+else
+  :
+fi
+
+done
+
+
+else
+  :
+fi
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the linker accepts -Wl,-z,relro" >&5
+$as_echo_n "checking whether the linker accepts -Wl,-z,relro... " >&6; }
+if ${ax_cv_check_ldflags___Wl__z_relro+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+  ax_check_save_flags=$LDFLAGS
+  LDFLAGS="$LDFLAGS  -Wl,-z,relro"
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ax_cv_check_ldflags___Wl__z_relro=yes
+else
+  ax_cv_check_ldflags___Wl__z_relro=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+  LDFLAGS=$ax_check_save_flags
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_ldflags___Wl__z_relro" >&5
+$as_echo "$ax_cv_check_ldflags___Wl__z_relro" >&6; }
+if test "x$ax_cv_check_ldflags___Wl__z_relro" = xyes; then :
+
+
+
+
+
+for flag in -Wl,-z,relro; do
+  as_CACHEVAR=`$as_echo "ax_cv_check_ldflags_$ax_compiler_flags_test_$flag" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the linker accepts $flag" >&5
+$as_echo_n "checking whether the linker accepts $flag... " >&6; }
+if eval \${$as_CACHEVAR+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+  ax_check_save_flags=$LDFLAGS
+  LDFLAGS="$LDFLAGS $ax_compiler_flags_test $flag"
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  eval "$as_CACHEVAR=yes"
+else
+  eval "$as_CACHEVAR=no"
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+  LDFLAGS=$ax_check_save_flags
+fi
+eval ac_res=\$$as_CACHEVAR
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if eval test \"x\$"$as_CACHEVAR"\" = x"yes"; then :
+
+if ${AM_LDFLAGS+:} false; then :
+
+  case " $AM_LDFLAGS " in #(
+  *" $flag "*) :
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: : AM_LDFLAGS already contains \$flag"; } >&5
+  (: AM_LDFLAGS already contains $flag) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } ;; #(
+  *) :
+
+     as_fn_append AM_LDFLAGS " $flag"
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: : AM_LDFLAGS=\"\$AM_LDFLAGS\""; } >&5
+  (: AM_LDFLAGS="$AM_LDFLAGS") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+     ;;
+esac
+
+else
+
+  AM_LDFLAGS=$flag
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: : AM_LDFLAGS=\"\$AM_LDFLAGS\""; } >&5
+  (: AM_LDFLAGS="$AM_LDFLAGS") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+
+fi
+
+else
+  :
+fi
+
+done
+
+
+else
+  :
+fi
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the linker accepts -Wl,-z,now" >&5
+$as_echo_n "checking whether the linker accepts -Wl,-z,now... " >&6; }
+if ${ax_cv_check_ldflags___Wl__z_now+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+  ax_check_save_flags=$LDFLAGS
+  LDFLAGS="$LDFLAGS  -Wl,-z,now"
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ax_cv_check_ldflags___Wl__z_now=yes
+else
+  ax_cv_check_ldflags___Wl__z_now=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+  LDFLAGS=$ax_check_save_flags
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_ldflags___Wl__z_now" >&5
+$as_echo "$ax_cv_check_ldflags___Wl__z_now" >&6; }
+if test "x$ax_cv_check_ldflags___Wl__z_now" = xyes; then :
+
+
+
+
+
+for flag in -Wl,-z,now; do
+  as_CACHEVAR=`$as_echo "ax_cv_check_ldflags_$ax_compiler_flags_test_$flag" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the linker accepts $flag" >&5
+$as_echo_n "checking whether the linker accepts $flag... " >&6; }
+if eval \${$as_CACHEVAR+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+  ax_check_save_flags=$LDFLAGS
+  LDFLAGS="$LDFLAGS $ax_compiler_flags_test $flag"
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  eval "$as_CACHEVAR=yes"
+else
+  eval "$as_CACHEVAR=no"
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+  LDFLAGS=$ax_check_save_flags
+fi
+eval ac_res=\$$as_CACHEVAR
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if eval test \"x\$"$as_CACHEVAR"\" = x"yes"; then :
+
+if ${AM_LDFLAGS+:} false; then :
+
+  case " $AM_LDFLAGS " in #(
+  *" $flag "*) :
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: : AM_LDFLAGS already contains \$flag"; } >&5
+  (: AM_LDFLAGS already contains $flag) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } ;; #(
+  *) :
+
+     as_fn_append AM_LDFLAGS " $flag"
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: : AM_LDFLAGS=\"\$AM_LDFLAGS\""; } >&5
+  (: AM_LDFLAGS="$AM_LDFLAGS") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+     ;;
+esac
+
+else
+
+  AM_LDFLAGS=$flag
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: : AM_LDFLAGS=\"\$AM_LDFLAGS\""; } >&5
+  (: AM_LDFLAGS="$AM_LDFLAGS") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+
+fi
+
+else
+  :
+fi
+
+done
+
+
+else
+  :
+fi
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the linker accepts -Wl,-z,noexecstack" >&5
+$as_echo_n "checking whether the linker accepts -Wl,-z,noexecstack... " >&6; }
+if ${ax_cv_check_ldflags___Wl__z_noexecstack+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+  ax_check_save_flags=$LDFLAGS
+  LDFLAGS="$LDFLAGS  -Wl,-z,noexecstack"
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ax_cv_check_ldflags___Wl__z_noexecstack=yes
+else
+  ax_cv_check_ldflags___Wl__z_noexecstack=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+  LDFLAGS=$ax_check_save_flags
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_ldflags___Wl__z_noexecstack" >&5
+$as_echo "$ax_cv_check_ldflags___Wl__z_noexecstack" >&6; }
+if test "x$ax_cv_check_ldflags___Wl__z_noexecstack" = xyes; then :
+
+
+
+
+
+for flag in -Wl,-z,noexecstack; do
+  as_CACHEVAR=`$as_echo "ax_cv_check_ldflags_$ax_compiler_flags_test_$flag" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the linker accepts $flag" >&5
+$as_echo_n "checking whether the linker accepts $flag... " >&6; }
+if eval \${$as_CACHEVAR+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+  ax_check_save_flags=$LDFLAGS
+  LDFLAGS="$LDFLAGS $ax_compiler_flags_test $flag"
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  eval "$as_CACHEVAR=yes"
+else
+  eval "$as_CACHEVAR=no"
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+  LDFLAGS=$ax_check_save_flags
+fi
+eval ac_res=\$$as_CACHEVAR
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if eval test \"x\$"$as_CACHEVAR"\" = x"yes"; then :
+
+if ${AM_LDFLAGS+:} false; then :
+
+  case " $AM_LDFLAGS " in #(
+  *" $flag "*) :
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: : AM_LDFLAGS already contains \$flag"; } >&5
+  (: AM_LDFLAGS already contains $flag) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } ;; #(
+  *) :
+
+     as_fn_append AM_LDFLAGS " $flag"
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: : AM_LDFLAGS=\"\$AM_LDFLAGS\""; } >&5
+  (: AM_LDFLAGS="$AM_LDFLAGS") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+     ;;
+esac
+
+else
+
+  AM_LDFLAGS=$flag
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: : AM_LDFLAGS=\"\$AM_LDFLAGS\""; } >&5
+  (: AM_LDFLAGS="$AM_LDFLAGS") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+
+fi
+
+else
+  :
+fi
+
+done
+
+
+else
+  :
+fi
+
+    # textonly, retpolineplt not yet
+
+    # macOS and cygwin linker do not have --as-needed
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the linker accepts -Wl,--no-as-needed" >&5
+$as_echo_n "checking whether the linker accepts -Wl,--no-as-needed... " >&6; }
+if ${ax_cv_check_ldflags___Wl___no_as_needed+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+  ax_check_save_flags=$LDFLAGS
+  LDFLAGS="$LDFLAGS  -Wl,--no-as-needed"
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ax_cv_check_ldflags___Wl___no_as_needed=yes
+else
+  ax_cv_check_ldflags___Wl___no_as_needed=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+  LDFLAGS=$ax_check_save_flags
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_ldflags___Wl___no_as_needed" >&5
+$as_echo "$ax_cv_check_ldflags___Wl___no_as_needed" >&6; }
+if test "x$ax_cv_check_ldflags___Wl___no_as_needed" = xyes; then :
+
+        ax_compiler_flags_as_needed_option="-Wl,--no-as-needed"
+
+else
+
+        ax_compiler_flags_as_needed_option=""
+
+fi
+
+
+    # macOS linker speaks with a different accent
+    ax_compiler_flags_fatal_warnings_option=""
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the linker accepts -Wl,--fatal-warnings" >&5
+$as_echo_n "checking whether the linker accepts -Wl,--fatal-warnings... " >&6; }
+if ${ax_cv_check_ldflags___Wl___fatal_warnings+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+  ax_check_save_flags=$LDFLAGS
+  LDFLAGS="$LDFLAGS  -Wl,--fatal-warnings"
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ax_cv_check_ldflags___Wl___fatal_warnings=yes
+else
+  ax_cv_check_ldflags___Wl___fatal_warnings=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+  LDFLAGS=$ax_check_save_flags
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_ldflags___Wl___fatal_warnings" >&5
+$as_echo "$ax_cv_check_ldflags___Wl___fatal_warnings" >&6; }
+if test "x$ax_cv_check_ldflags___Wl___fatal_warnings" = xyes; then :
+
+        ax_compiler_flags_fatal_warnings_option="-Wl,--fatal-warnings"
+
+else
+  :
+fi
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the linker accepts -Wl,-fatal_warnings" >&5
+$as_echo_n "checking whether the linker accepts -Wl,-fatal_warnings... " >&6; }
+if ${ax_cv_check_ldflags___Wl__fatal_warnings+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+  ax_check_save_flags=$LDFLAGS
+  LDFLAGS="$LDFLAGS  -Wl,-fatal_warnings"
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ax_cv_check_ldflags___Wl__fatal_warnings=yes
+else
+  ax_cv_check_ldflags___Wl__fatal_warnings=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+  LDFLAGS=$ax_check_save_flags
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_ldflags___Wl__fatal_warnings" >&5
+$as_echo "$ax_cv_check_ldflags___Wl__fatal_warnings" >&6; }
+if test "x$ax_cv_check_ldflags___Wl__fatal_warnings" = xyes; then :
+
+        ax_compiler_flags_fatal_warnings_option="-Wl,-fatal_warnings"
+
+else
+  :
+fi
+
+
+    # Base flags
+
+
+
+
+for flag in          $ax_compiler_flags_as_needed_option              ; do
+  as_CACHEVAR=`$as_echo "ax_cv_check_ldflags_$ax_compiler_flags_test_$flag" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the linker accepts $flag" >&5
+$as_echo_n "checking whether the linker accepts $flag... " >&6; }
+if eval \${$as_CACHEVAR+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+  ax_check_save_flags=$LDFLAGS
+  LDFLAGS="$LDFLAGS $ax_compiler_flags_test $flag"
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  eval "$as_CACHEVAR=yes"
+else
+  eval "$as_CACHEVAR=no"
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+  LDFLAGS=$ax_check_save_flags
+fi
+eval ac_res=\$$as_CACHEVAR
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if eval test \"x\$"$as_CACHEVAR"\" = x"yes"; then :
+
+if ${WARN_LDFLAGS+:} false; then :
+
+  case " $WARN_LDFLAGS " in #(
+  *" $flag "*) :
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: : WARN_LDFLAGS already contains \$flag"; } >&5
+  (: WARN_LDFLAGS already contains $flag) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } ;; #(
+  *) :
+
+     as_fn_append WARN_LDFLAGS " $flag"
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: : WARN_LDFLAGS=\"\$WARN_LDFLAGS\""; } >&5
+  (: WARN_LDFLAGS="$WARN_LDFLAGS") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+     ;;
+esac
+
+else
+
+  WARN_LDFLAGS=$flag
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: : WARN_LDFLAGS=\"\$WARN_LDFLAGS\""; } >&5
+  (: WARN_LDFLAGS="$WARN_LDFLAGS") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+
+fi
+
+else
+  :
+fi
+
+done
+
+
+    if test "$ax_enable_compile_warnings" != "no"; then :
+
+        # "yes" flags
+
+
+
+
+for flag in       ; do
+  as_CACHEVAR=`$as_echo "ax_cv_check_ldflags_$ax_compiler_flags_test_$flag" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the linker accepts $flag" >&5
+$as_echo_n "checking whether the linker accepts $flag... " >&6; }
+if eval \${$as_CACHEVAR+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+  ax_check_save_flags=$LDFLAGS
+  LDFLAGS="$LDFLAGS $ax_compiler_flags_test $flag"
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  eval "$as_CACHEVAR=yes"
+else
+  eval "$as_CACHEVAR=no"
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+  LDFLAGS=$ax_check_save_flags
+fi
+eval ac_res=\$$as_CACHEVAR
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if eval test \"x\$"$as_CACHEVAR"\" = x"yes"; then :
+
+if ${WARN_LDFLAGS+:} false; then :
+
+  case " $WARN_LDFLAGS " in #(
+  *" $flag "*) :
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: : WARN_LDFLAGS already contains \$flag"; } >&5
+  (: WARN_LDFLAGS already contains $flag) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } ;; #(
+  *) :
+
+     as_fn_append WARN_LDFLAGS " $flag"
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: : WARN_LDFLAGS=\"\$WARN_LDFLAGS\""; } >&5
+  (: WARN_LDFLAGS="$WARN_LDFLAGS") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+     ;;
+esac
+
+else
+
+  WARN_LDFLAGS=$flag
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: : WARN_LDFLAGS=\"\$WARN_LDFLAGS\""; } >&5
+  (: WARN_LDFLAGS="$WARN_LDFLAGS") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+
+fi
+
+else
+  :
+fi
+
+done
+
+
+fi
+    if test "$ax_enable_compile_warnings" = "error"; then :
+
+        # "error" flags; -Werror has to be appended unconditionally because
+        # it's not possible to test for
+        #
+        # suggest-attribute=format is disabled because it gives too many false
+        # positives
+
+
+
+
+for flag in              $ax_compiler_flags_fatal_warnings_option         ; do
+  as_CACHEVAR=`$as_echo "ax_cv_check_ldflags_$ax_compiler_flags_test_$flag" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the linker accepts $flag" >&5
+$as_echo_n "checking whether the linker accepts $flag... " >&6; }
+if eval \${$as_CACHEVAR+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+  ax_check_save_flags=$LDFLAGS
+  LDFLAGS="$LDFLAGS $ax_compiler_flags_test $flag"
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  eval "$as_CACHEVAR=yes"
+else
+  eval "$as_CACHEVAR=no"
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+  LDFLAGS=$ax_check_save_flags
+fi
+eval ac_res=\$$as_CACHEVAR
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if eval test \"x\$"$as_CACHEVAR"\" = x"yes"; then :
+
+if ${WARN_LDFLAGS+:} false; then :
+
+  case " $WARN_LDFLAGS " in #(
+  *" $flag "*) :
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: : WARN_LDFLAGS already contains \$flag"; } >&5
+  (: WARN_LDFLAGS already contains $flag) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } ;; #(
+  *) :
+
+     as_fn_append WARN_LDFLAGS " $flag"
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: : WARN_LDFLAGS=\"\$WARN_LDFLAGS\""; } >&5
+  (: WARN_LDFLAGS="$WARN_LDFLAGS") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+     ;;
+esac
+
+else
+
+  WARN_LDFLAGS=$flag
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: : WARN_LDFLAGS=\"\$WARN_LDFLAGS\""; } >&5
+  (: WARN_LDFLAGS="$WARN_LDFLAGS") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+
+fi
+
+else
+  :
+fi
+
+done
+
+
+fi
+
+    # Substitute the variables
+
+
+
+
+
+
+    # Variable names
+
+
+    # Base flags
+
+if ${WARN_SCANNERFLAGS+:} false; then :
+
+  case " $WARN_SCANNERFLAGS " in #(
+  *"  "*) :
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: : WARN_SCANNERFLAGS already contains "; } >&5
+  (: WARN_SCANNERFLAGS already contains ) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } ;; #(
+  *) :
+
+     as_fn_append WARN_SCANNERFLAGS " "
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: : WARN_SCANNERFLAGS=\"\$WARN_SCANNERFLAGS\""; } >&5
+  (: WARN_SCANNERFLAGS="$WARN_SCANNERFLAGS") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+     ;;
+esac
+
+else
+
+  WARN_SCANNERFLAGS=
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: : WARN_SCANNERFLAGS=\"\$WARN_SCANNERFLAGS\""; } >&5
+  (: WARN_SCANNERFLAGS="$WARN_SCANNERFLAGS") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+
+fi
+
+
+    if test "$ax_enable_compile_warnings" != "no"; then :
+
+        # "yes" flags
+
+if ${WARN_SCANNERFLAGS+:} false; then :
+
+  case " $WARN_SCANNERFLAGS " in #(
+  *"              --warn-all                                                              "*) :
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: : WARN_SCANNERFLAGS already contains              --warn-all                                                             "; } >&5
+  (: WARN_SCANNERFLAGS already contains              --warn-all                                                             ) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } ;; #(
+  *) :
+
+     as_fn_append WARN_SCANNERFLAGS "              --warn-all                                                             "
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: : WARN_SCANNERFLAGS=\"\$WARN_SCANNERFLAGS\""; } >&5
+  (: WARN_SCANNERFLAGS="$WARN_SCANNERFLAGS") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+     ;;
+esac
+
+else
+
+  WARN_SCANNERFLAGS=             --warn-all
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: : WARN_SCANNERFLAGS=\"\$WARN_SCANNERFLAGS\""; } >&5
+  (: WARN_SCANNERFLAGS="$WARN_SCANNERFLAGS") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+
+fi
+
+
+fi
+    if test "$ax_enable_compile_warnings" = "error"; then :
+
+        # "error" flags
+
+if ${WARN_SCANNERFLAGS+:} false; then :
+
+  case " $WARN_SCANNERFLAGS " in #(
+  *"              --warn-error          "*) :
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: : WARN_SCANNERFLAGS already contains              --warn-error         "; } >&5
+  (: WARN_SCANNERFLAGS already contains              --warn-error         ) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } ;; #(
+  *) :
+
+     as_fn_append WARN_SCANNERFLAGS "              --warn-error         "
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: : WARN_SCANNERFLAGS=\"\$WARN_SCANNERFLAGS\""; } >&5
+  (: WARN_SCANNERFLAGS="$WARN_SCANNERFLAGS") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+     ;;
+esac
+
+else
+
+  WARN_SCANNERFLAGS=             --warn-error
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: : WARN_SCANNERFLAGS=\"\$WARN_SCANNERFLAGS\""; } >&5
+  (: WARN_SCANNERFLAGS="$WARN_SCANNERFLAGS") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+
+fi
+
+
+fi
+
+    # Substitute the variables
 
-  echo ${result}
+
+
+# These get triggered a lot, not worth it imo, but feel free to fix them
+
+
+
+
+for flag in -Wno-duplicated-branches -Wno-switch-enum; do
+  as_CACHEVAR=`$as_echo "ax_cv_check_cflags__$flag" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts $flag" >&5
+$as_echo_n "checking whether C compiler accepts $flag... " >&6; }
+if eval \${$as_CACHEVAR+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+  ax_check_save_flags=$CFLAGS
+  CFLAGS="$CFLAGS  $flag"
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
 }
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  eval "$as_CACHEVAR=yes"
+else
+  eval "$as_CACHEVAR=no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  CFLAGS=$ax_check_save_flags
+fi
+eval ac_res=\$$as_CACHEVAR
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if eval test \"x\$"$as_CACHEVAR"\" = x"yes"; then :
 
-if test "$GCC" = "yes"; then
-    for flag in -Wall -Wchar-subscripts -Wmissing-declarations \
-        -Wmissing-prototypes -Wnested-externs -Wpointer-arith -Wcast-align \
-        -Wsign-compare -fno-strict-aliasing;
-    do
-        CFLAGS="$(ensureflag $flag $CFLAGS)"
-    done
+if ${CFLAGS+:} false; then :
+
+  case " $CFLAGS " in #(
+  *" $flag "*) :
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS already contains \$flag"; } >&5
+  (: CFLAGS already contains $flag) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } ;; #(
+  *) :
+
+     as_fn_append CFLAGS " $flag"
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS\""; } >&5
+  (: CFLAGS="$CFLAGS") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+     ;;
+esac
+
+else
+
+  CFLAGS=$flag
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: : CFLAGS=\"\$CFLAGS\""; } >&5
+  (: CFLAGS="$CFLAGS") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+
+fi
+
+else
+  :
+fi
+
+done
+
+
+WARN_CFLAGS_PYTHON="$WARN_CFLAGS"
+
+
+
+
+for flag in -Wno-discarded-qualifiers; do
+  as_CACHEVAR=`$as_echo "ax_cv_check_cflags__$flag" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts $flag" >&5
+$as_echo_n "checking whether C compiler accepts $flag... " >&6; }
+if eval \${$as_CACHEVAR+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+  ax_check_save_flags=$CFLAGS
+  CFLAGS="$CFLAGS  $flag"
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  eval "$as_CACHEVAR=yes"
+else
+  eval "$as_CACHEVAR=no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  CFLAGS=$ax_check_save_flags
+fi
+eval ac_res=\$$as_CACHEVAR
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if eval test \"x\$"$as_CACHEVAR"\" = x"yes"; then :
+
+if ${WARN_CFLAGS_PYTHON+:} false; then :
+
+  case " $WARN_CFLAGS_PYTHON " in #(
+  *" $flag "*) :
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: : WARN_CFLAGS_PYTHON already contains \$flag"; } >&5
+  (: WARN_CFLAGS_PYTHON already contains $flag) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } ;; #(
+  *) :
+
+     as_fn_append WARN_CFLAGS_PYTHON " $flag"
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: : WARN_CFLAGS_PYTHON=\"\$WARN_CFLAGS_PYTHON\""; } >&5
+  (: WARN_CFLAGS_PYTHON="$WARN_CFLAGS_PYTHON") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+     ;;
+esac
+
+else
+
+  WARN_CFLAGS_PYTHON=$flag
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: : WARN_CFLAGS_PYTHON=\"\$WARN_CFLAGS_PYTHON\""; } >&5
+  (: WARN_CFLAGS_PYTHON="$WARN_CFLAGS_PYTHON") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+
+fi
+
+else
+  :
+fi
+
+done
+
+
+
+WARN_CFLAGS_FLEX="$WARN_CFLAGS"
+
+
+
+
+for flag in -Wno-sign-compare -Wno-switch-default -Wno-redundant-decls; do
+  as_CACHEVAR=`$as_echo "ax_cv_check_cflags__$flag" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts $flag" >&5
+$as_echo_n "checking whether C compiler accepts $flag... " >&6; }
+if eval \${$as_CACHEVAR+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+  ax_check_save_flags=$CFLAGS
+  CFLAGS="$CFLAGS  $flag"
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  eval "$as_CACHEVAR=yes"
+else
+  eval "$as_CACHEVAR=no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  CFLAGS=$ax_check_save_flags
+fi
+eval ac_res=\$$as_CACHEVAR
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if eval test \"x\$"$as_CACHEVAR"\" = x"yes"; then :
+
+if ${WARN_CFLAGS_FLEX+:} false; then :
+
+  case " $WARN_CFLAGS_FLEX " in #(
+  *" $flag "*) :
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: : WARN_CFLAGS_FLEX already contains \$flag"; } >&5
+  (: WARN_CFLAGS_FLEX already contains $flag) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } ;; #(
+  *) :
+
+     as_fn_append WARN_CFLAGS_FLEX " $flag"
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: : WARN_CFLAGS_FLEX=\"\$WARN_CFLAGS_FLEX\""; } >&5
+  (: WARN_CFLAGS_FLEX="$WARN_CFLAGS_FLEX") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+     ;;
+esac
+
+else
+
+  WARN_CFLAGS_FLEX=$flag
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: : WARN_CFLAGS_FLEX=\"\$WARN_CFLAGS_FLEX\""; } >&5
+  (: WARN_CFLAGS_FLEX="$WARN_CFLAGS_FLEX") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+
+fi
+
+else
+  :
 fi
 
+done
+
+
+
 # Checks for libraries.
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
 $as_echo_n "checking for dlopen in -ldl... " >&6; }
@@ -13160,12 +15010,12 @@ if test -n "$GLIB_CFLAGS"; then
     pkg_cv_GLIB_CFLAGS="$GLIB_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.56.1\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.56.1") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.57.2\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.57.2") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.56.1" 2>/dev/null`
+  pkg_cv_GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.57.2" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -13177,12 +15027,12 @@ if test -n "$GLIB_LIBS"; then
     pkg_cv_GLIB_LIBS="$GLIB_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.56.1\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.56.1") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.57.2\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.57.2") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_GLIB_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.56.1" 2>/dev/null`
+  pkg_cv_GLIB_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.57.2" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -13203,14 +15053,14 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "glib-2.0 >= 2.56.1" 2>&1`
+	        GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "glib-2.0 >= 2.57.2" 2>&1`
         else
-	        GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "glib-2.0 >= 2.56.1" 2>&1`
+	        GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "glib-2.0 >= 2.57.2" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$GLIB_PKG_ERRORS" >&5
 
-	as_fn_error $? "Package requirements (glib-2.0 >= 2.56.1) were not met:
+	as_fn_error $? "Package requirements (glib-2.0 >= 2.57.2) were not met:
 
 $GLIB_PKG_ERRORS
 
@@ -15258,7 +17108,7 @@ if test "x$os_win32" = "xyes"; then
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libraries required to link against libpython" >&5
 $as_echo_n "checking for libraries required to link against libpython... " >&6; }
 if test "x$PYTHON_LIBS" = x; then
-	PYTHON_LIBS=`$PYTHON-config --ldflags --libs`
+	PYTHON_LIBS=`$PYTHON-config --ldflags`
 fi
 
 save_LIBS="$LIBS"
@@ -15294,6 +17144,9 @@ rm -f core conftest.err conftest.$ac_objext \
 
 fi
 
+PYTHON_SO=`$PYTHON -c "import sysconfig, sys; get = sysconfig.get_config_var; sys.stdout.write(get('EXT_SUFFIX') or get('SO') or '.so');"`
+
+
 # Check whether --enable-doctool was given.
 if test "${enable_doctool+set}" = set; then :
   enableval=$enable_doctool;
@@ -15488,7 +17341,7 @@ else
 fi
 
 
-ac_config_files="$ac_config_files Makefile tests/Makefile tests/offsets/Makefile tests/scanner/Makefile tests/scanner/annotationparser/Makefile tests/repository/Makefile tests/warn/Makefile docs/Makefile docs/reference/Makefile docs/reference/version.xml gobject-introspection-1.0.pc gobject-introspection-no-export-1.0.pc config.h.win32 win32/Makefile win32/vs9/Makefile win32/vs9/gi-version-paths.vsprops win32/vs10/Makefile win32/vs10/gi-version-paths.props win32/vs11/Makefile win32/vs12/Makefile win32/vs14/Makefile win32/vs15/Makefile"
+ac_config_files="$ac_config_files Makefile tests/Makefile tests/offsets/Makefile tests/scanner/Makefile tests/scanner/annotationparser/Makefile tests/repository/Makefile tests/warn/Makefile docs/Makefile docs/reference/Makefile docs/reference/version.xml giscanner/_version.py gobject-introspection-1.0.pc gobject-introspection-no-export-1.0.pc"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -16076,7 +17929,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by gobject-introspection $as_me 1.56.1, which was
+This file was extended by gobject-introspection $as_me 1.57.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -16142,7 +17995,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-gobject-introspection config.status 1.56.1
+gobject-introspection config.status 1.57.2
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -16567,18 +18420,9 @@ do
     "docs/Makefile") CONFIG_FILES="$CONFIG_FILES docs/Makefile" ;;
     "docs/reference/Makefile") CONFIG_FILES="$CONFIG_FILES docs/reference/Makefile" ;;
     "docs/reference/version.xml") CONFIG_FILES="$CONFIG_FILES docs/reference/version.xml" ;;
+    "giscanner/_version.py") CONFIG_FILES="$CONFIG_FILES giscanner/_version.py" ;;
     "gobject-introspection-1.0.pc") CONFIG_FILES="$CONFIG_FILES gobject-introspection-1.0.pc" ;;
     "gobject-introspection-no-export-1.0.pc") CONFIG_FILES="$CONFIG_FILES gobject-introspection-no-export-1.0.pc" ;;
-    "config.h.win32") CONFIG_FILES="$CONFIG_FILES config.h.win32" ;;
-    "win32/Makefile") CONFIG_FILES="$CONFIG_FILES win32/Makefile" ;;
-    "win32/vs9/Makefile") CONFIG_FILES="$CONFIG_FILES win32/vs9/Makefile" ;;
-    "win32/vs9/gi-version-paths.vsprops") CONFIG_FILES="$CONFIG_FILES win32/vs9/gi-version-paths.vsprops" ;;
-    "win32/vs10/Makefile") CONFIG_FILES="$CONFIG_FILES win32/vs10/Makefile" ;;
-    "win32/vs10/gi-version-paths.props") CONFIG_FILES="$CONFIG_FILES win32/vs10/gi-version-paths.props" ;;
-    "win32/vs11/Makefile") CONFIG_FILES="$CONFIG_FILES win32/vs11/Makefile" ;;
-    "win32/vs12/Makefile") CONFIG_FILES="$CONFIG_FILES win32/vs12/Makefile" ;;
-    "win32/vs14/Makefile") CONFIG_FILES="$CONFIG_FILES win32/vs14/Makefile" ;;
-    "win32/vs15/Makefile") CONFIG_FILES="$CONFIG_FILES win32/vs15/Makefile" ;;
 
   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac
diff --git a/configure.ac b/configure.ac
index 2a68514..29bddde 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,8 +3,8 @@
 
 dnl the gi version number
 m4_define(gi_major_version, 1)
-m4_define(gi_minor_version, 56)
-m4_define(gi_micro_version, 1)
+m4_define(gi_minor_version, 57)
+m4_define(gi_micro_version, 2)
 m4_define(gi_version, gi_major_version.gi_minor_version.gi_micro_version)
 
 AC_PREREQ([2.63])
@@ -59,29 +59,19 @@ if test "$YACC" = :; then
 	AC_MSG_ERROR([bison not found but required])
 fi
 
+# Default compiler warnings
+m4_ifndef([AX_COMPILER_FLAGS], [AC_MSG_ERROR(['autoconf-archive' missing])])
+AX_COMPILER_FLAGS(,, [yes])
+# These get triggered a lot, not worth it imo, but feel free to fix them
+AX_APPEND_COMPILE_FLAGS([-Wno-duplicated-branches -Wno-switch-enum])
 
-changequote(,)dnl
-ensureflag() {
-  flag="$1"; shift
-  result="$@"
+WARN_CFLAGS_PYTHON="$WARN_CFLAGS"
+AX_APPEND_COMPILE_FLAGS([-Wno-discarded-qualifiers], [WARN_CFLAGS_PYTHON])
+AC_SUBST(WARN_CFLAGS_PYTHON)
 
-  case " ${result} " in
-  *[\ \	]${flag}[\ \	]*) ;;
-  *) result="${flag} ${result}" ;;
-  esac
-
-  echo ${result}
-}
-changequote([,])dnl
-
-if test "$GCC" = "yes"; then
-    for flag in -Wall -Wchar-subscripts -Wmissing-declarations \
-        -Wmissing-prototypes -Wnested-externs -Wpointer-arith -Wcast-align \
-        -Wsign-compare -fno-strict-aliasing;
-    do
-        CFLAGS="$(ensureflag $flag $CFLAGS)"
-    done
-fi
+WARN_CFLAGS_FLEX="$WARN_CFLAGS"
+AX_APPEND_COMPILE_FLAGS([-Wno-sign-compare -Wno-switch-default -Wno-redundant-decls], [WARN_CFLAGS_FLEX])
+AC_SUBST(WARN_CFLAGS_FLEX)
 
 # Checks for libraries.
 AC_CHECK_LIB([dl], [dlopen])
@@ -128,7 +118,7 @@ GIR_DIR="$EXPANDED_DATADIR/$GIR_SUFFIX"
 AC_SUBST(GIR_DIR)
 AC_DEFINE_UNQUOTED(GIR_DIR, "$GIR_DIR", [Director prefix for gir installation])
 
-PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.56.1])
+PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.57.2])
 
 PKG_CHECK_MODULES(GOBJECT, [gobject-2.0])
 PKG_CHECK_MODULES(GMODULE, [gmodule-2.0])
@@ -278,6 +268,9 @@ if test "x$os_win32" = "xyes"; then
   AM_CHECK_PYTHON_LIBS(, AC_MSG_ERROR([Python libs not found. Windows requires Python modules to be explicitly linked to libpython.]))
 fi
 
+PYTHON_SO=`$PYTHON -c "import sysconfig, sys; get = sysconfig.get_config_var; sys.stdout.write(get('EXT_SUFFIX') or get('SO') or '.so');"`
+AC_SUBST(PYTHON_SO)
+
 dnl Not enabled by default until 3.6 cycle when we can propose mako as
 dnl an external dependency
 AC_ARG_ENABLE(doctool,[  --disable-doctool           disable g-ir-doc-tool ],,enable_doctool=auto)
@@ -378,16 +371,7 @@ tests/warn/Makefile
 docs/Makefile
 docs/reference/Makefile
 docs/reference/version.xml
+giscanner/_version.py
 gobject-introspection-1.0.pc
-gobject-introspection-no-export-1.0.pc
-config.h.win32
-win32/Makefile
-win32/vs9/Makefile
-win32/vs9/gi-version-paths.vsprops
-win32/vs10/Makefile
-win32/vs10/gi-version-paths.props
-win32/vs11/Makefile
-win32/vs12/Makefile
-win32/vs14/Makefile
-win32/vs15/Makefile])
+gobject-introspection-no-export-1.0.pc])
 AC_OUTPUT
diff --git a/docs/Makefile.am b/docs/Makefile.am
index f47966d..5505303 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -5,3 +5,6 @@ endif
 # Install the gir-1.2 schema
 schemadir = $(datadir)/gir-1.0
 dist_schema_DATA = gir-1.2.rnc
+
+EXTRA_DIST = \
+	meson.build
diff --git a/docs/Makefile.in b/docs/Makefile.in
index fc066d3..de508d6 100644
--- a/docs/Makefile.in
+++ b/docs/Makefile.in
@@ -326,6 +326,7 @@ PYTHON_INCLUDES = @PYTHON_INCLUDES@
 PYTHON_LIBS = @PYTHON_LIBS@
 PYTHON_PLATFORM = @PYTHON_PLATFORM@
 PYTHON_PREFIX = @PYTHON_PREFIX@
+PYTHON_SO = @PYTHON_SO@
 PYTHON_VERSION = @PYTHON_VERSION@
 RANLIB = @RANLIB@
 SCANNER_CFLAGS = @SCANNER_CFLAGS@
@@ -335,6 +336,11 @@ SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
+WARN_CFLAGS = @WARN_CFLAGS@
+WARN_CFLAGS_FLEX = @WARN_CFLAGS_FLEX@
+WARN_CFLAGS_PYTHON = @WARN_CFLAGS_PYTHON@
+WARN_LDFLAGS = @WARN_LDFLAGS@
+WARN_SCANNERFLAGS = @WARN_SCANNERFLAGS@
 YACC = @YACC@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
@@ -398,6 +404,9 @@ top_srcdir = @top_srcdir@
 # Install the gir-1.2 schema
 schemadir = $(datadir)/gir-1.0
 dist_schema_DATA = gir-1.2.rnc
+EXTRA_DIST = \
+	meson.build
+
 all: all-recursive
 
 .SUFFIXES:
diff --git a/docs/g-ir-compiler.1 b/docs/g-ir-compiler.1
index c2197b4..65c439b 100644
--- a/docs/g-ir-compiler.1
+++ b/docs/g-ir-compiler.1
@@ -1,41 +1,77 @@
-.TH "g-ir-compiler" 1
-.nh
+.\" Man page generated from reStructuredText.
+.
+.TH G-IR-COMPILER 1 "" "" ""
 .SH NAME
-g-ir-compiler \- typelib compiler.
+g-ir-compiler \- Typelib compiler
+.
+.nr rst2man-indent-level 0
+.
+.de1 rstReportMargin
+\\$1 \\n[an-margin]
+level \\n[rst2man-indent-level]
+level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
+-
+\\n[rst2man-indent0]
+\\n[rst2man-indent1]
+\\n[rst2man-indent2]
+..
+.de1 INDENT
+.\" .rstReportMargin pre:
+. RS \\$1
+. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin]
+. nr rst2man-indent-level +1
+.\" .rstReportMargin post:
+..
+.de UNINDENT
+. RE
+.\" indent \\n[an-margin]
+.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.nr rst2man-indent-level -1
+.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
+..
 .SH SYNOPSIS
-.B g-ir-compiler
-[OPTION...] GIRFILE
+.sp
+\fBg\-ir\-compiler\fP [OPTION...] GIRFILE
 .SH DESCRIPTION
-g-ir-compiler converts one or more GIR files into one or more typelib. 
-The output will be written to standard output unless the --output 
-is specified.
+.sp
+g\-ir\-compiler converts one or more GIR files into one or more typelib. The
+output will be written to standard output unless the \fB\-\-output\fP is
+specified.
 .SH OPTIONS
+.INDENT 0.0
 .TP
-.B \--help
+.B \-\-help
 Show help options
 .TP
-.B \--output=FILENAME
+.BI \-\-output\fB= FILENAME
 Save the resulting output in FILENAME.
 .TP
-.B \--verbose
+.B \-\-verbose
 Show verbose messages
 .TP
-.B \--debug
+.B \-\-debug
 Show debug messages
 .TP
-.B \--includedir=DIRECTORY
+.BI \-\-includedir\fB= DIRECTORY
 Adds a directory which will be used to find includes inside the GIR format.
 .TP
-.B \--module=MODULE
+.BI \-\-module\fB= MODULE
 FIXME
 .TP
-.B \--shared-library=FILENAME
-Specifies the shared library where the symbols in the typelib can be found.
-The name of the library should not contain the ending shared library suffix.
-.TP
+.BI \-\-shared\-library\fB= FILENAME
+Specifies the shared library where the symbols in the typelib can be
+found. The name of the library should not contain the ending shared
+library suffix.
+.UNINDENT
 .SH BUGS
-Report bugs at https://gitlab.gnome.org/GNOME/gobject\-introspection/issues.
-.SH HOMEPAGE and CONTACT
-http://live.gnome.org/GObjectIntrospection
+.sp
+Report bugs at \fI\%https://gitlab.gnome.org/GNOME/gobject\-introspection/issues\fP
+.SH HOMEPAGE AND CONTACT
+.sp
+\fI\%http://live.gnome.org/GObjectIntrospection\fP
 .SH AUTHORS
+.sp
 Mattias Clasen
+.\" Generated by docutils manpage writer.
+.
diff --git a/docs/g-ir-generate.1 b/docs/g-ir-generate.1
index ffe4904..fb07de7 100644
--- a/docs/g-ir-generate.1
+++ b/docs/g-ir-generate.1
@@ -1,29 +1,63 @@
-.TH "g-ir-generate" 1
-.nh
+.\" Man page generated from reStructuredText.
+.
+.TH G-IR-GENERATE 1 "" "" ""
 .SH NAME
-g-ir-generate \- typelib generator
+g-ir-generate \- Typelib generator
+.
+.nr rst2man-indent-level 0
+.
+.de1 rstReportMargin
+\\$1 \\n[an-margin]
+level \\n[rst2man-indent-level]
+level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
+-
+\\n[rst2man-indent0]
+\\n[rst2man-indent1]
+\\n[rst2man-indent2]
+..
+.de1 INDENT
+.\" .rstReportMargin pre:
+. RS \\$1
+. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin]
+. nr rst2man-indent-level +1
+.\" .rstReportMargin post:
+..
+.de UNINDENT
+. RE
+.\" indent \\n[an-margin]
+.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.nr rst2man-indent-level -1
+.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
+..
 .SH SYNOPSIS
-.B g-ir-generate
-[OPTION...] FILES...
+.sp
+\fBg\-ir\-generate\fP [OPTION...] FILES...
 .SH DESCRIPTION
-g-ir-generate is an GIR generator, using the repository API. It generates
-GIR files from a raw typelib or in a shared library (--shlib).
-The output will be written to standard output unless the --output 
-is specified.
+.sp
+g\-ir\-generate is an GIR generator, using the repository API. It generates GIR
+files from a raw typelib or in a shared library (\fB\-\-shlib\fP). The output will
+be written to standard output unless the \fB\-\-output\fP is specified.
 .SH OPTIONS
+.INDENT 0.0
 .TP
-.B \, --help
+.B \-\-help
 Show help options
 .TP
-.B \, --shlib=FILENAME
+.BI \-\-shlib\fB= FILENAME
 The shared library to read the symbols from.
 .TP
-.B \, --output=FILENAME
+.BI \-\-output\fB= FILENAME
 Save the resulting output in FILENAME.
-.TP
+.UNINDENT
 .SH BUGS
-Report bugs at https://gitlab.gnome.org/GNOME/gobject\-introspection/issues.
-.SH HOMEPAGE and CONTACT
-http://live.gnome.org/GObjectIntrospection
+.sp
+Report bugs at \fI\%https://gitlab.gnome.org/GNOME/gobject\-introspection/issues\fP
+.SH HOMEPAGE AND CONTACT
+.sp
+\fI\%http://live.gnome.org/GObjectIntrospection\fP
 .SH AUTHORS
+.sp
 Mattias Clasen
+.\" Generated by docutils manpage writer.
+.
diff --git a/docs/g-ir-scanner.1 b/docs/g-ir-scanner.1
index d38241f..2078d92 100644
--- a/docs/g-ir-scanner.1
+++ b/docs/g-ir-scanner.1
@@ -1,154 +1,177 @@
-.TH "g-ir-scanner" 1
-.nh
+.\" Man page generated from reStructuredText.
+.
+.TH G-IR-SCANNER 1 "" "" ""
 .SH NAME
-g-ir-scanner \- extracting C metadata from sources and headers
+g-ir-scanner \- Extracting C metadata from sources and headers
+.
+.nr rst2man-indent-level 0
+.
+.de1 rstReportMargin
+\\$1 \\n[an-margin]
+level \\n[rst2man-indent-level]
+level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
+-
+\\n[rst2man-indent0]
+\\n[rst2man-indent1]
+\\n[rst2man-indent2]
+..
+.de1 INDENT
+.\" .rstReportMargin pre:
+. RS \\$1
+. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin]
+. nr rst2man-indent-level +1
+.\" .rstReportMargin post:
+..
+.de UNINDENT
+. RE
+.\" indent \\n[an-margin]
+.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.nr rst2man-indent-level -1
+.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
+..
 .SH SYNOPSIS
-.B g-ir-scanner
-[OPTION...] FILES...
+.sp
+\fBg\-ir\-scanner\fP [OPTION...] FILES...
 .SH DESCRIPTION
-g-ir-scanner is a tool which generates GIR XML files by parsing headers
-and introspecting GObject based libraries.
-It is usually invoked during the normal build step for a project and
-the information is saved to disk and later installed, so that language bindings
-and other applications can use it.
-Header files and source files are passed in as arguments on the command line.
-The suffix determines whether a file be treated as a source file (.c) or a
-header file (.h). Currently only C based libraries are supported by the scanner.
+.sp
+g\-ir\-scanner is a tool which generates GIR XML files by parsing headers and
+introspecting GObject based libraries. It is usually invoked during the normal
+build step for a project and the information is saved to disk and later
+installed, so that language bindings and other applications can use it. Header
+files and source files are passed in as arguments on the command line. The
+suffix determines whether a file be treated as a source file (.c) or a header
+file (.h). Currently only C based libraries are supported by the scanner.
 .SH OPTIONS
+.INDENT 0.0
 .TP
-.B \--help
+.B \-\-help
 Show help options
 .TP
-.B \--quiet
+.B \-\-quiet
 If passed, do not print details of normal operation.
 .TP
-.B \--warn-all
+.B \-\-warn\-all
 Display warnings for public API which is not introspectable.
 .TP
-.B \--warn-error
+.B \-\-warn\-error
 Make warnings be fatal errors.
 .TP
-.B \--format=FORMAT
-This parameters decides which the resulting format will be used.
-The default value is gir.
+.BI \-\-format\fB= FORMAT
+This parameters decides which the resulting format will be used. The
+default value is gir.
 .TP
-.B \--include=NAME
+.BI \-\-include\fB= NAME
 Add the specified introspection dependency to the scanned namespace.
-NAME is of the form NAMESPACE-VERSION, like Gtk-3.0.
+NAME is of the form NAMESPACE\-VERSION, like Gtk\-3.0.
 .TP
-.B \--include-uninstalled=PATH
+.BI \-\-include\-uninstalled\fB= PATH
 Add the specified introspection dependency to the scanned namespace.
-This differs from \--include in that it takes a file path, and
-does not process the pkg-config dependencies (since they may not
-be installed yet).
+This differs from \fB\-\-include\fP in that it takes a file path, and does not
+process the pkg\-config dependencies (since they may not be installed yet).
 .TP
-.B \--add-include-path=PATH
-Add a directory to the path which the scanner uses to find GIR files.
-Can be used multiple times to specify multiple directories
+.BI \-\-add\-include\-path\fB= PATH
+Add a directory to the path which the scanner uses to find GIR files. Can
+be used multiple times to specify multiple directories
 .TP
-.B \-i, --library=LIBRARY
+.BI \-i\fP,\fB  \-\-library\fB= LIBRARY
 Specifies a library that will be introspected. This means that the
-*_get_type() functions in it will be called for GObject data types.
-The name of the library should not contain the leading lib prefix nor
-the ending shared library suffix.
+*_get_type() functions in it will be called for GObject data types. The
+name of the library should not contain the leading lib prefix nor the
+ending shared library suffix.
 .TP
-.B \-L, --library-path=PATH
-Include this directory when searching for a library.
-This option can be specified multiple times to include more than one
-directory to look for libraries in.
+.BI \-L\fP,\fB  \-\-library\-path\fB= PATH
+Include this directory when searching for a library. This option can be
+specified multiple times to include more than one directory to look for
+libraries in.
 .TP
-.B \-Idirectory
+.BI \-I\fB directory
 Include this directory in the list of directories to be searched for
-header files.  You need to pass to the scanner all the directories
-you'd normally pass to the compiler when using the specified source
-files.
+header files. You need to pass to the scanner all the directories you\(aqd
+normally pass to the compiler when using the specified source files.
 .TP
-.B \-n, --namespace=NAME
+.BI \-n\fP,\fB  \-\-namespace\fB= NAME
 The namespace name. This name should be capitalized, eg the first letter
 should be upper case. Examples: Gtk, Clutter, WebKit.
 .TP
-.B \--no-libtool
-Disable usage of libtool for compiling stub introspection binary.  Use this
+.B \-\-no\-libtool
+Disable usage of libtool for compiling stub introspection binary. Use this
 if your build system does not require libtool.
 .TP
-.B \--libtool
-Full path to libtool executable.  Typically used for Automake systems.
+.B \-\-libtool
+Full path to libtool executable. Typically used for Automake systems.
 .TP
-.B \--nsversion=VERSION
-The namespace version. For instance 1.0. This is usually the platform version,
-eg 2.0 for Gtk+, not 2.12.7.
+.BI \-\-nsversion\fB= VERSION
+The namespace version. For instance 1.0. This is usually the platform
+version, eg 2.0 for Gtk+, not 2.12.7.
 .TP
-.B \-p, --program=PROGRAM
+.BI \-p\fP,\fB  \-\-program\fB= PROGRAM
 Specifies a binary that will be introspected. This means that the
-*_get_type() functions in it will be called for GObject data types.
-The binary must be modified to take a --introspect-dump= option, and
-to pass the argument to this function to g_irepository_dump.
+*_get_type() functions in it will be called for GObject data types. The
+binary must be modified to take a \fB\-\-introspect\-dump=\fP option, and to pass
+the argument to this function to g_irepository_dump.
 .TP
-.B \--program-arg=ARG
+.BI \-\-program\-arg\fB= ARG
 Additional argument to pass to program for introspection.
 .TP
-.B \--identifier-prefix=PREFIX
-This option may be specified multiple times.  Each one
-gives a prefix that will be stripped from all C identifiers.
-If none specified, the namespace will be used.
-Eg, an identifier prefix of
-.B Foo
-will export the identifier
-.B typdef struct _FooBar FooBar;
-as
-.B Foo.Bar.
-.TP
-.B \--symbol-prefix=PREFIX
-This option may be specified multiple times.  Each one
-gives a prefix that will be stripped from all C symbols.
-Eg, an symbol prefix of
-.B foo
-will export the symbol
-.B foo_bar_do_something
-as
-.B Foo.Bar.do_something.
-.TP
-.B \--accept-unprefixed
-If specified, the scanner will accept identifiers and symbols which
-do not match the namespace prefix.  Try to avoid using this if possible.
-.TP
-.B \--output=FILENAME
-Name of the file to output. Normally namespace + format extension.
-Eg, GLib-2.0.gir.
-.TP
-.B \--pkg=PACKAGE
-List of pkg-config packages to get compiler and linker flags from.
-This option can be specified multiple times to include flags from
-several pkg-config packages.
-.TP
-.B \--pkg-export=PACKAGE
-List of pkg-config packages that are provided by the generated gir.
-This option can be specified multiple times if the gir provides more
-packages.
-If not specified, the packages specified with --pkg= will be used.
-.TP
-.B \--verbose
+.BI \-\-identifier\-prefix\fB= PREFIX
+This option may be specified multiple times. Each one gives a prefix that
+will be stripped from all C identifiers. If none specified, the namespace
+will be used. Eg, an identifier prefix of Foo will export the identifier
+typdef struct _FooBar FooBar; as Foo.Bar.
+.TP
+.BI \-\-symbol\-prefix\fB= PREFIX
+This option may be specified multiple times. Each one gives a
+prefix that will be stripped from all C symbols. Eg, an symbol
+prefix of foo will export the symbol foo_bar_do_something as
+Foo.Bar.do_something.
+.TP
+.B \-\-accept\-unprefixed
+If specified, the scanner will accept identifiers and symbols which do not
+match the namespace prefix. Try to avoid using this if possible.
+.TP
+.BI \-\-output\fB= FILENAME
+Name of the file to output. Normally namespace + format extension. Eg,
+GLib\-2.0.gir.
+.TP
+.BI \-\-pkg\fB= PACKAGE
+List of pkg\-config packages to get compiler and linker flags from. This
+option can be specified multiple times to include flags from several
+pkg\-config packages.
+.TP
+.BI \-\-pkg\-export\fB= PACKAGE
+List of pkg\-config packages that are provided by the generated gir. This
+option can be specified multiple times if the gir provides more packages.
+If not specified, the packages specified with \fB\-\-pkg=\fP will be used.
+.TP
+.B \-\-verbose
 Be verbose, include some debugging information.
-.TP
+.UNINDENT
 .SH ENVIRONMENT VARIABLES
-The g-ir-scanner uses the XDG_DATA_DIRS variable to check for dirs,
-the girs are located in XDG_DATA_DIRS/gir-1.0. It is normally
-set on a distribution so you shouldn't need to set it yourself.
-
-The variable GI_SCANNER_DISABLE_CACHE ensures that the scanner will
-not write cache data to $HOME.
-
-The variable GI_SCANNER_DEBUG can be used to debug issues in the build-system that
-involve g-ir-scanner. When it is set to 'save-temps', then g-ir-scanner will not remove
-temporary files and directories after it terminates.
-
-The variable GI_HOST_OS can be used to control the OS name on the
-host that runs the scanner. It has the same semantics as the Python
-os.name property.
+.sp
+The g\-ir\-scanner uses the \fBXDG_DATA_DIRS\fP variable to check for dirs, the
+girs are located in \fBXDG_DATA_DIRS/gir\-1.0\fP\&. It is normally set on a
+distribution so you shouldn\(aqt need to set it yourself.
+.sp
+The variable \fBGI_SCANNER_DISABLE_CACHE\fP ensures that the scanner will not
+write cache data to \fB$HOME\fP\&.
+.sp
+The variable \fBGI_SCANNER_DEBUG\fP can be used to debug issues in the
+build\-system that involve g\-ir\-scanner. When it is set to \fBsave\-temps\fP, then
+g\-ir\-scanner will not remove temporary files and directories after it
+terminates.
+.sp
+The variable \fBGI_HOST_OS\fP can be used to control the OS name on the host
+that runs the scanner. It has the same semantics as the Python \fBos.name\fP
+property.
 .SH BUGS
-Report bugs at https://gitlab.gnome.org/GNOME/gobject\-introspection/issues.
-.SH HOMEPAGE and CONTACT
-http://live.gnome.org/GObjectIntrospection
+.sp
+Report bugs at \fI\%https://gitlab.gnome.org/GNOME/gobject\-introspection/issues\fP
+.SH HOMEPAGE AND CONTACT
+.sp
+\fI\%http://live.gnome.org/GObjectIntrospection\fP
 .SH AUTHORS
+.sp
 Johan Dahlin
-
+.\" Generated by docutils manpage writer.
+.
diff --git a/docs/meson.build b/docs/meson.build
new file mode 100644
index 0000000..cebaad8
--- /dev/null
+++ b/docs/meson.build
@@ -0,0 +1,6 @@
+install_man('g-ir-compiler.1', 'g-ir-generate.1', 'g-ir-scanner.1')
+install_data('gir-1.2.rnc', install_dir: join_paths(get_option('datadir'), 'gir-1.0'))
+
+if get_option('gtk-doc')
+  subdir('reference')
+endif
diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
index 994b114..ed55e59 100644
--- a/docs/reference/Makefile.am
+++ b/docs/reference/Makefile.am
@@ -99,7 +99,9 @@ GTKDOC_LIBS=						\
 include $(top_srcdir)/gtk-doc.make # generated by autogen.sh
 
 # Other files to distribute
-EXTRA_DIST += version.xml.in
+EXTRA_DIST += \
+	version.xml.in \
+	meson.build
 
 # Files not to distribute
 # for --rebuild-types in $(SCAN_OPTIONS), e.g. $(DOC_MODULE).types
diff --git a/docs/reference/Makefile.in b/docs/reference/Makefile.in
index 803bda5..3b14397 100644
--- a/docs/reference/Makefile.in
+++ b/docs/reference/Makefile.in
@@ -260,6 +260,7 @@ PYTHON_INCLUDES = @PYTHON_INCLUDES@
 PYTHON_LIBS = @PYTHON_LIBS@
 PYTHON_PLATFORM = @PYTHON_PLATFORM@
 PYTHON_PREFIX = @PYTHON_PREFIX@
+PYTHON_SO = @PYTHON_SO@
 PYTHON_VERSION = @PYTHON_VERSION@
 RANLIB = @RANLIB@
 SCANNER_CFLAGS = @SCANNER_CFLAGS@
@@ -269,6 +270,11 @@ SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
+WARN_CFLAGS = @WARN_CFLAGS@
+WARN_CFLAGS_FLEX = @WARN_CFLAGS_FLEX@
+WARN_CFLAGS_PYTHON = @WARN_CFLAGS_PYTHON@
+WARN_LDFLAGS = @WARN_LDFLAGS@
+WARN_SCANNERFLAGS = @WARN_SCANNERFLAGS@
 YACC = @YACC@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
@@ -452,7 +458,7 @@ SETUP_FILES = \
 # e.g. EXTRA_DIST += version.xml.in
 
 # Other files to distribute
-EXTRA_DIST = $(HTML_IMAGES) $(SETUP_FILES) version.xml.in
+EXTRA_DIST = $(HTML_IMAGES) $(SETUP_FILES) version.xml.in meson.build
 DOC_STAMPS = setup-build.stamp scan-build.stamp sgml-build.stamp \
 	html-build.stamp pdf-build.stamp \
 	sgml.stamp html.stamp pdf.stamp
@@ -814,6 +820,7 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) $(expand_con
 	for file in $(HTML_IMAGES) ; do \
 	  test -f $(abs_srcdir)/$$file && cp $(abs_srcdir)/$$file $(abs_builddir)/html; \
 	  test -f $(abs_builddir)/$$file && cp $(abs_builddir)/$$file $(abs_builddir)/html; \
+	  test -f $$file && cp $$file $(abs_builddir)/html; \
 	done;
 	$(GTK_DOC_V_XREF)gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
 	$(AM_V_at)touch html-build.stamp
diff --git a/docs/reference/html/index.html b/docs/reference/html/index.html
index 85e44c5..c22dcde 100644
--- a/docs/reference/html/index.html
+++ b/docs/reference/html/index.html
@@ -15,7 +15,7 @@
 <div>
 <div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">GObject Introspection Reference Manual</p></th></tr></table></div>
 <div><p class="releaseinfo">
-      This document is for GObject Introspection version 1.56.1
+      This document is for GObject Introspection version 1.57.2
 .
       The latest version of this documentation can be found on-line at
       <a class="ulink" href="http://developer.gnome.org/gi/unstable/" target="_top">http://developer.gnome.org/gi/unstable/</a>.
diff --git a/docs/reference/meson.build b/docs/reference/meson.build
new file mode 100644
index 0000000..b617311
--- /dev/null
+++ b/docs/reference/meson.build
@@ -0,0 +1,41 @@
+gnome = import('gnome')
+
+version_conf = configuration_data()
+version_conf.set('GI_VERSION', meson.project_version())
+
+version_xml = configure_file(
+  input: 'version.xml.in',
+  output: 'version.xml',
+  configuration: version_conf,
+)
+
+ignore_headers = [
+  'cmph',
+  'girnode.h',
+  'girparser.h',
+  'girwriter.h',
+  'girmodule.h',
+  'girepository-private.h',
+]
+
+gnome.gtkdoc('gi',
+  main_xml: 'gi-docs.xml',
+  dependencies: girepo_dep,
+  src_dir: 'girepository',
+  html_assets: 'images/overview.png',
+  content_files: [
+    'overview-building.xml',
+    'overview-programming.xml',
+    'gi-gir-reference.xml',
+    'gi-struct-hierarchy.xml',
+  ],
+  scan_args: [
+    '--rebuild-types',
+    '--ignore-headers=' + ' '.join(ignore_headers),
+  ],
+  mkdb_args: [
+    '--name-space=g',
+    '--ignore-files=cmph',
+  ],
+  install: true,
+)
diff --git a/docs/reference/version.xml b/docs/reference/version.xml
index 43c989b..0af844b 100644
--- a/docs/reference/version.xml
+++ b/docs/reference/version.xml
@@ -1 +1 @@
-1.56.1
+1.57.2
diff --git a/examples/glib-print.c b/examples/glib-print.c
index caa7cda..595ae48 100644
--- a/examples/glib-print.c
+++ b/examples/glib-print.c
@@ -24,11 +24,11 @@ main (void)
       return 1;
     }
 
-  in_args[0].v_pointer = "domain";
-  in_args[1].v_pointer = "glib-print.c";
+  in_args[0].v_pointer = (gpointer)"domain";
+  in_args[1].v_pointer = (gpointer)"glib-print.c";
   in_args[2].v_int = 42;
-  in_args[3].v_pointer = "main";
-  in_args[4].v_pointer = "hello world";
+  in_args[3].v_pointer = (gpointer)"main";
+  in_args[4].v_pointer = (gpointer)"hello world";
 
   if (!g_function_info_invoke ((GIFunctionInfo *) base_info,
                                (const GIArgument *) &in_args,
diff --git a/examples/meson.build b/examples/meson.build
new file mode 100644
index 0000000..6cc214b
--- /dev/null
+++ b/examples/meson.build
@@ -0,0 +1,3 @@
+executable('glib-print', 'glib-print.c',
+  dependencies: girepo_dep,
+)
diff --git a/gir/cairo-1.0.gir.in b/gir/cairo-1.0.gir.in
index 73c993a..60113e6 100644
--- a/gir/cairo-1.0.gir.in
+++ b/gir/cairo-1.0.gir.in
@@ -3,9 +3,9 @@
 	    xmlns="http://www.gtk.org/introspection/core/1.0"
 	    xmlns:c="http://www.gtk.org/introspection/c/1.0"
 	    xmlns:glib="http://www.gtk.org/introspection/glib/1.0">
-  <package name="%CAIRO_GIR_PACKAGE%"/>
+  <package name="@CAIRO_GIR_PACKAGE@"/>
   <namespace name="cairo" version="1.0"
-	     shared-library="%CAIRO_SHARED_LIBRARY%"
+	     shared-library="@CAIRO_SHARED_LIBRARY@"
 	     c:identifier-prefixes="cairo"
 	     c:symbol-prefixes="cairo">
     <record name="Context" c:type="cairo_t" foreign="1"
diff --git a/gir/gio-2.0.c b/gir/gio-2.0.c
index edb5a17..2084202 100644
--- a/gir/gio-2.0.c
+++ b/gir/gio-2.0.c
@@ -973,7 +973,7 @@
  * @manager: The #GDBusObjectManagerClient emitting the signal.
  * @object_proxy: The #GDBusObjectProxy on which an interface has properties that are changing.
  * @interface_proxy: The #GDBusProxy that has properties that are changing.
- * @changed_properties: A #GVariant containing the properties that changed.
+ * @changed_properties: A #GVariant containing the properties that changed (type: `a{sv}`).
  * @invalidated_properties: (array zero-terminated=1) (element-type utf8): A %NULL terminated
  *   array of properties that were invalidated.
  *
@@ -1170,7 +1170,7 @@
 /**
  * GDBusProxy::g-properties-changed:
  * @proxy: The #GDBusProxy emitting the signal.
- * @changed_properties: A #GVariant containing the properties that changed
+ * @changed_properties: A #GVariant containing the properties that changed (type: `a{sv}`)
  * @invalidated_properties: A %NULL terminated array of properties that was invalidated
  *
  * Emitted when one or more D-Bus properties on @proxy changes. The
@@ -2315,6 +2315,29 @@
 
 
 /**
+ * GMountOperation:is-tcrypt-hidden-volume:
+ *
+ * Whether the device to be unlocked is a TCRYPT hidden volume.
+ * See https://www.veracrypt.fr/en/Hidden%20Volume.html.
+ *
+ * Since: 2.58
+ */
+
+
+/**
+ * GMountOperation:is-tcrypt-system-volume:
+ *
+ * Whether the device to be unlocked is a TCRYPT system volume.
+ * In this context, a system volume is a volume with a bootloader
+ * and operating system installed. This is only supported for Windows
+ * operating systems. For further documentation, see
+ * https://www.veracrypt.fr/en/System%20Encryption.html.
+ *
+ * Since: 2.58
+ */
+
+
+/**
  * GMountOperation:password:
  *
  * The password that is used for authentication when carrying out
@@ -2330,6 +2353,16 @@
 
 
 /**
+ * GMountOperation:pim:
+ *
+ * The VeraCrypt PIM value, when unlocking a VeraCrypt volume. See
+ * https://www.veracrypt.fr/en/Personal%20Iterations%20Multiplier%20(PIM).html.
+ *
+ * Since: 2.58
+ */
+
+
+/**
  * GMountOperation:username:
  *
  * The user name that is used for authentication when carrying out
@@ -2918,12 +2951,14 @@
 /**
  * GSimpleAction::activate:
  * @simple: the #GSimpleAction
- * @parameter: (nullable): the parameter to the activation
+ * @parameter: (nullable): the parameter to the activation, or %NULL if it has
+ *   no parameter
  *
  * Indicates that the action was just activated.
  *
- * @parameter will always be of the expected type.  In the event that
- * an incorrect type was given, no signal will be emitted.
+ * @parameter will always be of the expected type, i.e. the parameter type
+ * specified when the action was created. If an incorrect type is given when
+ * activating the action, this signal is not emitted.
  *
  * Since GLib 2.40, if no handler is connected to this signal then the
  * default behaviour for boolean-stated actions with a %NULL parameter
@@ -2945,8 +2980,10 @@
  * Indicates that the action just received a request to change its
  * state.
  *
- * @value will always be of the correct state type.  In the event that
- * an incorrect type was given, no signal will be emitted.
+ * @value will always be of the correct state type, i.e. the type of the
+ * initial state passed to g_simple_action_new_stateful(). If an incorrect
+ * type is given when requesting to change the state, this signal is not
+ * emitted.
  *
  * If no handler is connected to this signal then the default
  * behaviour is to call g_simple_action_set_state() to set the state
@@ -7427,6 +7464,12 @@
  * #GtkMountOperation. If no user interaction is desired (for example
  * when automounting filesystems at login time), usually %NULL can be
  * passed, see each method taking a #GMountOperation for details.
+ *
+ * The term ‘TCRYPT’ is used to mean ‘compatible with TrueCrypt and VeraCrypt’.
+ * [TrueCrypt](https://en.wikipedia.org/wiki/TrueCrypt) is a discontinued system for
+ * encrypting file containers, partitions or whole disks, typically used with Windows.
+ * [VeraCrypt](https://www.veracrypt.fr/) is a maintained fork of TrueCrypt with various
+ * improvements and auditing fixes.
  */
 
 
@@ -8855,9 +8898,16 @@
  * of server sockets and helps you accept sockets from any of the
  * socket, either sync or async.
  *
+ * Add addresses and ports to listen on using g_socket_listener_add_address()
+ * and g_socket_listener_add_inet_port(). These will be listened on until
+ * g_socket_listener_close() is called. Dropping your final reference to the
+ * #GSocketListener will not cause g_socket_listener_close() to be called
+ * implicitly, as some references to the #GSocketListener may be held
+ * internally.
+ *
  * If you want to implement a network server, also look at #GSocketService
- * and #GThreadedSocketService which are subclass of #GSocketListener
- * that makes this even easier.
+ * and #GThreadedSocketService which are subclasses of #GSocketListener
+ * that make this even easier.
  *
  * Since: 2.22
  */
@@ -10039,7 +10089,7 @@
  * different kinds of identifiers, such as Hal UDIs, filesystem labels,
  * traditional Unix devices (e.g. `/dev/sda2`), UUIDs. GIO uses predefined
  * strings as names for the different kinds of identifiers:
- * #G_VOLUME_IDENTIFIER_KIND_HAL_UDI, #G_VOLUME_IDENTIFIER_KIND_LABEL, etc.
+ * #G_VOLUME_IDENTIFIER_KIND_UUID, #G_VOLUME_IDENTIFIER_KIND_LABEL, etc.
  * Use g_volume_get_identifier() to obtain an identifier for a volume.
  *
  *
@@ -11875,8 +11925,8 @@
  * The result is cached after it is generated the first time, and
  * the function is thread-safe.
  *
- * Returns: (transfer none): an object implementing
- *     @extension_point, or %NULL if there are no usable
+ * Returns: (transfer none): the type to instantiate to implement
+ *     @extension_point, or %G_TYPE_INVALID if there are no usable
  *     implementations.
  */
 
@@ -15384,8 +15434,8 @@
  *
  * Gets the mime type for the content type, if one is registered.
  *
- * Returns: (nullable): the registered mime type for the given @type,
- *     or %NULL if unknown.
+ * Returns: (nullable) (transfer full): the registered mime type for the
+ *     given @type, or %NULL if unknown; free with g_free().
  */
 
 
@@ -17128,7 +17178,7 @@
  * @cancellable: (nullable): a #GCancellable or %NULL
  * @error: return location for error or %NULL
  *
- * Synchronously closees @connection. The calling thread is blocked
+ * Synchronously closes @connection. The calling thread is blocked
  * until this is done. See g_dbus_connection_close() for the
  * asynchronous version of this method and more details about what it
  * does.
@@ -21172,11 +21222,12 @@
  * launch applications.  Ordinary applications should use
  * g_app_info_launch_uris().
  *
- * If the application is launched via traditional UNIX fork()/exec()
- * then @spawn_flags, @user_setup and @user_setup_data are used for the
- * call to g_spawn_async().  Additionally, @pid_callback (with
- * @pid_callback_data) will be called to inform about the PID of the
- * created process.
+ * If the application is launched via GSpawn, then @spawn_flags, @user_setup
+ * and @user_setup_data are used for the call to g_spawn_async().
+ * Additionally, @pid_callback (with @pid_callback_data) will be called to
+ * inform about the PID of the created process. See g_spawn_async_with_pipes()
+ * for information on certain parameter conditions that can enable an
+ * optimized posix_spawn() codepath to be used.
  *
  * If application launching occurs via some other mechanism (eg: D-Bus
  * activation) then @spawn_flags, @user_setup, @user_setup_data,
@@ -21187,6 +21238,34 @@
 
 
 /**
+ * g_desktop_app_info_launch_uris_as_manager_with_fds:
+ * @appinfo: a #GDesktopAppInfo
+ * @uris: (element-type utf8): List of URIs
+ * @launch_context: (nullable): a #GAppLaunchContext
+ * @spawn_flags: #GSpawnFlags, used for each process
+ * @user_setup: (scope async) (nullable): a #GSpawnChildSetupFunc, used once
+ *     for each process.
+ * @user_setup_data: (closure user_setup) (nullable): User data for @user_setup
+ * @pid_callback: (scope call) (nullable): Callback for child processes
+ * @pid_callback_data: (closure pid_callback) (nullable): User data for @callback
+ * @stdin_fd: file descriptor to use for child's stdin, or -1
+ * @stdout_fd: file descriptor to use for child's stdout, or -1
+ * @stderr_fd: file descriptor to use for child's stderr, or -1
+ * @error: return location for a #GError, or %NULL
+ *
+ * Equivalent to g_desktop_app_info_launch_uris_as_manager() but allows
+ * you to pass in file descriptors for the stdin, stdout and stderr streams
+ * of the launched process.
+ *
+ * If application launching occurs via some non-spawn mechanism (e.g. D-Bus
+ * activation) then @stdin_fd, @stdout_fd and @stderr_fd are ignored.
+ *
+ * Returns: %TRUE on successful launch, %FALSE otherwise.
+ * Since: 2.58
+ */
+
+
+/**
  * g_desktop_app_info_list_actions:
  * @info: a #GDesktopAppInfo
  *
@@ -21236,7 +21315,8 @@
  * (i.e. a desktop id of kde-foo.desktop will match
  * `/usr/share/applications/kde/foo.desktop`).
  *
- * Returns: a new #GDesktopAppInfo, or %NULL if no desktop file with that id
+ * Returns: (nullable): a new #GDesktopAppInfo, or %NULL if no desktop
+ *     file with that id exists.
  */
 
 
@@ -21247,7 +21327,7 @@
  *
  * Creates a new #GDesktopAppInfo.
  *
- * Returns: a new #GDesktopAppInfo or %NULL on error.
+ * Returns: (nullable): a new #GDesktopAppInfo or %NULL on error.
  */
 
 
@@ -21257,7 +21337,7 @@
  *
  * Creates a new #GDesktopAppInfo.
  *
- * Returns: a new #GDesktopAppInfo or %NULL on error.
+ * Returns: (nullable): a new #GDesktopAppInfo or %NULL on error.
  * Since: 2.18
  */
 
@@ -21447,10 +21527,12 @@
  * @drive: a #GDrive
  * @kind: the kind of identifier to return
  *
- * Gets the identifier of the given kind for @drive.
+ * Gets the identifier of the given kind for @drive. The only
+ * identifier currently available is
+ * #G_DRIVE_IDENTIFIER_KIND_UNIX_DEVICE.
  *
- * Returns: a newly allocated string containing the
- *     requested identfier, or %NULL if the #GDrive
+ * Returns: (nullable) (transfer full): a newly allocated string containing the
+ *     requested identifier, or %NULL if the #GDrive
  *     doesn't have this kind of identifier.
  */
 
@@ -21472,7 +21554,7 @@
  *
  * Gets the sort key for @drive, if any.
  *
- * Returns: Sorting key for @drive or %NULL if no such key is available.
+ * Returns: (nullable): Sorting key for @drive or %NULL if no such key is available.
  * Since: 2.32
  */
 
@@ -22902,6 +22984,11 @@
  * the actual file or directory represented by the #GFile; see
  * g_file_copy() if attempting to copy a file.
  *
+ * g_file_dup() is useful when a second handle is needed to the same underlying
+ * file, for use in a separate thread (#GFile is not thread-safe). For use
+ * within the same thread, use g_object_ref() to increment the existing object’s
+ * reference count.
+ *
  * This call does no blocking I/O.
  *
  * Returns: (transfer full): a new #GFile that is a duplicate
@@ -24073,7 +24160,7 @@
  * @value_p: (not nullable): pointer to the value
  *
  * Sets the @attribute to contain the given value, if possible. To unset the
- * attribute, use %G_ATTRIBUTE_TYPE_INVALID for @type.
+ * attribute, use %G_FILE_ATTRIBUTE_TYPE_INVALID for @type.
  */
 
 
@@ -24483,7 +24570,7 @@
  *
  * Checks to see if a file is native to the platform.
  *
- * A native file s one expressed in the platform-native filename format,
+ * A native file is one expressed in the platform-native filename format,
  * e.g. "C:\Windows" or "/usr/bin/". This does not mean the file is local,
  * as it might be on a locally mounted remote filesystem.
  *
@@ -29948,7 +30035,8 @@
  * This is a convenience method for getting the #GVolume and then
  * using that object to get the #GDrive.
  *
- * Returns: (transfer full): a #GDrive or %NULL if @mount is not associated with a volume or a drive.
+ * Returns: (transfer full) (nullable): a #GDrive or %NULL if @mount is not
+ *      associated with a volume or a drive.
  *      The returned object should be unreffed with
  *      g_object_unref() when no longer needed.
  */
@@ -29996,7 +30084,7 @@
  *
  * Gets the sort key for @mount, if any.
  *
- * Returns: Sorting key for @mount or %NULL if no such key is available.
+ * Returns: (nullable): Sorting key for @mount or %NULL if no such key is available.
  * Since: 2.32
  */
 
@@ -30023,7 +30111,8 @@
  * considered an opaque string. Returns %NULL if there is no UUID
  * available.
  *
- * Returns: the UUID for @mount or %NULL if no UUID can be computed.
+ * Returns: (nullable) (transfer full): the UUID for @mount or %NULL if no UUID
+ *     can be computed.
  *     The returned string should be freed with g_free()
  *     when no longer needed.
  */
@@ -30035,7 +30124,8 @@
  *
  * Gets the volume for the @mount.
  *
- * Returns: (transfer full): a #GVolume or %NULL if @mount is not associated with a volume.
+ * Returns: (transfer full) (nullable): a #GVolume or %NULL if @mount is not
+ *      associated with a volume.
  *      The returned object should be unreffed with
  *      g_object_unref() when no longer needed.
  */
@@ -30176,6 +30266,30 @@
 
 
 /**
+ * g_mount_operation_get_is_tcrypt_hidden_volume:
+ * @op: a #GMountOperation.
+ *
+ * Check to see whether the mount operation is being used
+ * for a TCRYPT hidden volume.
+ *
+ * Returns: %TRUE if mount operation is for hidden volume.
+ * Since: 2.58
+ */
+
+
+/**
+ * g_mount_operation_get_is_tcrypt_system_volume:
+ * @op: a #GMountOperation.
+ *
+ * Check to see whether the mount operation is being used
+ * for a TCRYPT system volume.
+ *
+ * Returns: %TRUE if mount operation is for system volume.
+ * Since: 2.58
+ */
+
+
+/**
  * g_mount_operation_get_password:
  * @op: a #GMountOperation.
  *
@@ -30196,6 +30310,17 @@
 
 
 /**
+ * g_mount_operation_get_pim:
+ * @op: a #GMountOperation.
+ *
+ * Gets a PIM from the mount operation.
+ *
+ * Returns: The VeraCrypt PIM within @op.
+ * Since: 2.58
+ */
+
+
+/**
  * g_mount_operation_get_username:
  * @op: a #GMountOperation.
  *
@@ -30251,6 +30376,28 @@
 
 
 /**
+ * g_mount_operation_set_is_tcrypt_hidden_volume:
+ * @op: a #GMountOperation.
+ * @hidden_volume: boolean value.
+ *
+ * Sets the mount operation to use a hidden volume if @hidden_volume is %TRUE.
+ *
+ * Since: 2.58
+ */
+
+
+/**
+ * g_mount_operation_set_is_tcrypt_system_volume:
+ * @op: a #GMountOperation.
+ * @system_volume: boolean value.
+ *
+ * Sets the mount operation to use a system volume if @system_volume is %TRUE.
+ *
+ * Since: 2.58
+ */
+
+
+/**
  * g_mount_operation_set_password:
  * @op: a #GMountOperation.
  * @password: password to set.
@@ -30269,6 +30416,17 @@
 
 
 /**
+ * g_mount_operation_set_pim:
+ * @op: a #GMountOperation.
+ * @pim: an unsigned integer.
+ *
+ * Sets the mount operation's PIM to @pim.
+ *
+ * Since: 2.58
+ */
+
+
+/**
  * g_mount_operation_set_username:
  * @op: a #GMountOperation.
  * @username: input username.
@@ -33721,8 +33879,7 @@
  * to call g_settings_get_child().
  *
  * For GSettings objects that are lists, this value can change at any
- * time and you should connect to the "children-changed" signal to watch
- * for those changes.  Note that there is a race condition here: you may
+ * time. Note that there is a race condition here: you may
  * request a child after listing it only for it to have been destroyed
  * in the meantime.  For this reason, g_settings_get_child() may return
  * %NULL even for a child that was listed by this function.
@@ -34688,11 +34845,13 @@
 /**
  * g_simple_action_new:
  * @name: the name of the action
- * @parameter_type: (nullable): the type of parameter to the activate function
+ * @parameter_type: (nullable): the type of parameter that will be passed to
+ *   handlers for the #GSimpleAction::activate signal, or %NULL for no parameter
  *
  * Creates a new action.
  *
- * The created action is stateless.  See g_simple_action_new_stateful().
+ * The created action is stateless. See g_simple_action_new_stateful() to create
+ * an action that has state.
  *
  * Returns: a new #GSimpleAction
  * Since: 2.28
@@ -34702,15 +34861,16 @@
 /**
  * g_simple_action_new_stateful:
  * @name: the name of the action
- * @parameter_type: (nullable): the type of the parameter to the activate function
+ * @parameter_type: (nullable): the type of the parameter that will be passed to
+ *   handlers for the #GSimpleAction::activate signal, or %NULL for no parameter
  * @state: the initial state of the action
  *
  * Creates a new stateful action.
  *
- * @state is the initial state of the action.  All future state values
- * must have the same #GVariantType as the initial state.
+ * All future state values must have the same #GVariantType as the initial
+ * @state.
  *
- * If the @state GVariant is floating, it is consumed.
+ * If the @state #GVariant is floating, it is consumed.
  *
  * Returns: a new #GSimpleAction
  * Since: 2.28
@@ -37003,6 +37163,10 @@
  * requesting a binding to port 0 (ie: "any port").  This address, if
  * requested, belongs to the caller and must be freed.
  *
+ * Call g_socket_listener_close() to stop listening on @address; this will not
+ * be done automatically when you drop your final reference to @listener, as
+ * references may be held internally.
+ *
  * Returns: %TRUE on success, %FALSE on error.
  * Since: 2.22
  */
@@ -37047,6 +37211,10 @@
  * useful if you're listening on multiple addresses and do
  * different things depending on what address is connected to.
  *
+ * Call g_socket_listener_close() to stop listening on @port; this will not
+ * be done automatically when you drop your final reference to @listener, as
+ * references may be held internally.
+ *
  * Returns: %TRUE on success, %FALSE on error.
  * Since: 2.22
  */
@@ -41638,6 +41806,22 @@
 
 
 /**
+ * g_unix_mount_get_options:
+ * @mount_entry: a #GUnixMountEntry.
+ *
+ * Gets a comma-separated list of mount options for the unix mount. For example,
+ * `rw,relatime,seclabel,data=ordered`.
+ *
+ * This is similar to g_unix_mount_point_get_options(), but it takes
+ * a #GUnixMountEntry as an argument.
+ *
+ * Returns: (nullable): a string containing the options, or %NULL if not
+ * available.
+ * Since: 2.58
+ */
+
+
+/**
  * g_unix_mount_guess_can_eject:
  * @mount_entry: a #GUnixMountEntry
  *
@@ -42439,7 +42623,7 @@
  *
  * Gets the drive for the @volume.
  *
- * Returns: (transfer full): a #GDrive or %NULL if @volume is not
+ * Returns: (transfer full) (nullable): a #GDrive or %NULL if @volume is not
  *     associated with a drive. The returned object should be unreffed
  *     with g_object_unref() when no longer needed.
  */
@@ -42466,8 +42650,8 @@
  * See the [introduction][volume-identifier] for more
  * information about volume identifiers.
  *
- * Returns: a newly allocated string containing the
- *     requested identfier, or %NULL if the #GVolume
+ * Returns: (nullable) (transfer full): a newly allocated string containing the
+ *     requested identifier, or %NULL if the #GVolume
  *     doesn't have this kind of identifier
  */
 
@@ -42478,7 +42662,7 @@
  *
  * Gets the mount for the @volume.
  *
- * Returns: (transfer full): a #GMount or %NULL if @volume isn't mounted.
+ * Returns: (transfer full) (nullable): a #GMount or %NULL if @volume isn't mounted.
  *     The returned object should be unreffed with g_object_unref()
  *     when no longer needed.
  */
@@ -42501,7 +42685,7 @@
  *
  * Gets the sort key for @volume, if any.
  *
- * Returns: Sorting key for @volume or %NULL if no such key is available
+ * Returns: (nullable): Sorting key for @volume or %NULL if no such key is available
  * Since: 2.32
  */
 
@@ -42528,7 +42712,8 @@
  * considered an opaque string. Returns %NULL if there is no UUID
  * available.
  *
- * Returns: the UUID for @volume or %NULL if no UUID can be computed.
+ * Returns: (nullable) (transfer full): the UUID for @volume or %NULL if no UUID
+ *     can be computed.
  *     The returned string should be freed with g_free()
  *     when no longer needed.
  */
diff --git a/gir/glib-2.0.c b/gir/glib-2.0.c
index 56926fc..d12726a 100644
--- a/gir/glib-2.0.c
+++ b/gir/glib-2.0.c
@@ -2731,6 +2731,26 @@
 
 
 /**
+ * G_APPROX_VALUE:
+ * @a: a numeric value
+ * @b: a numeric value
+ * @epsilon: a numeric value that expresses the tolerance between @a and @b
+ *
+ * Evaluates to a truth value if the absolute difference between @a and @b is
+ * smaller than @epsilon, and to a false value otherwise.
+ *
+ * For example,
+ * - `G_APPROX_VALUE (5, 6, 2)` evaluates to true
+ * - `G_APPROX_VALUE (3.14, 3.15, 0.001)` evaluates to false
+ * - `G_APPROX_VALUE (n, 0.f, FLT_EPSILON)` evaluates to true if `n` is within
+ *   the single precision floating point epsilon from zero
+ *
+ * Returns: %TRUE if the two values are within the desired range
+ * Since: 2.58
+ */
+
+
+/**
  * G_ASCII_DTOSTR_BUF_SIZE:
  *
  * A good size for a buffer to be passed into g_ascii_dtostr().
@@ -3410,6 +3430,26 @@
 
 
 /**
+ * G_GNUC_NO_INLINE:
+ *
+ * Expands to the GNU C `noinline` function attribute if the compiler is gcc.
+ * If the compiler is not gcc, this macro expands to nothing.
+ *
+ * Declaring a function as `noinline` prevents the function from being
+ * considered for inlining.
+ *
+ * The attribute may be placed before the declaration, right before the
+ * `static` keyword.
+ *
+ * See the
+ * [GNU C documentation](https://gcc.gnu.org/onlinedocs/gcc/Common-Function-Attributes.html#index-noinline-function-attribute)
+ * for more details.
+ *
+ * Since: 2.58
+ */
+
+
+/**
  * G_GNUC_NO_INSTRUMENT:
  *
  * Expands to the GNU C no_instrument_function function attribute if the
@@ -5050,6 +5090,132 @@
 
 
 /**
+ * SECTION:arcbox
+ * @Title: Atomically reference counted data
+ * @Short_description: Allocated memory with atomic reference counting semantics
+ *
+ * An "atomically reference counted box", or "ArcBox", is an opaque wrapper
+ * data type that is guaranteed to be as big as the size of a given data type,
+ * and which augments the given data type with thread safe reference counting
+ * semantics for its memory management.
+ *
+ * ArcBox is useful if you have a plain old data type, like a structure
+ * typically placed on the stack, and you wish to provide additional API
+ * to use it on the heap; or if you want to implement a new type to be
+ * passed around by reference without necessarily implementing copy/free
+ * semantics or your own reference counting.
+ *
+ * The typical use is:
+ *
+ * |[<!-- language="C" -->
+ * typedef struct {
+ *   char *name;
+ *   char *address;
+ *   char *city;
+ *   char *state;
+ *   int age;
+ * } Person;
+ *
+ * Person *
+ * person_new (void)
+ * {
+ *   return g_atomic_rc_box_new0 (Person);
+ * }
+ * ]|
+ *
+ * Every time you wish to acquire a reference on the memory, you should
+ * call g_atomic_rc_box_acquire(); similarly, when you wish to release a reference
+ * you should call g_atomic_rc_box_release():
+ *
+ * |[<!-- language="C" -->
+ * // Add a Person to the Database; the Database acquires ownership
+ * // of the Person instance
+ * void
+ * add_person_to_database (Database *db, Person *p)
+ * {
+ *   db->persons = g_list_prepend (db->persons, g_atomic_rc_box_acquire (p));
+ * }
+ *
+ * // Removes a Person from the Database; the reference acquired by
+ * // add_person_to_database() is released here
+ * void
+ * remove_person_from_database (Database *db, Person *p)
+ * {
+ *   db->persons = g_list_remove (db->persons, p);
+ *   g_atomic_rc_box_release (p);
+ * }
+ * ]|
+ *
+ * If you have additional memory allocated inside the structure, you can
+ * use g_atomic_rc_box_release_full(), which takes a function pointer, which
+ * will be called if the reference released was the last:
+ *
+ * |[<!-- language="C" -->
+ * void
+ * person_clear (Person *p)
+ * {
+ *   g_free (p->name);
+ *   g_free (p->address);
+ *   g_free (p->city);
+ *   g_free (p->state);
+ * }
+ *
+ * void
+ * remove_person_from_database (Database *db, Person *p)
+ * {
+ *   db->persons = g_list_remove (db->persons, p);
+ *   g_atomic_rc_box_release_full (p, (GDestroyNotify) person_clear);
+ * }
+ * ]|
+ *
+ * If you wish to transfer the ownership of a reference counted data
+ * type without increasing the reference count, you can use g_steal_pointer():
+ *
+ * |[<!-- language="C" -->
+ *   Person *p = g_atomic_rc_box_new (Person);
+ *
+ *   fill_person_details (p);
+ *
+ *   add_person_to_database (db, g_steal_pointer (&p));
+ * ]|
+ *
+ * ## Thread safety
+ *
+ * The reference counting operations on data allocated using g_atomic_rc_box_alloc(),
+ * g_atomic_rc_box_new(), and g_atomic_rc_box_dup() are guaranteed to be atomic, and thus
+ * can be safely be performed by different threads. It is important to note that
+ * only the reference acquisition and release are atomic; changes to the content
+ * of the data are your responsibility.
+ *
+ * ## Automatic pointer clean up
+ *
+ * If you want to add g_autoptr() support to your plain old data type through
+ * reference counting, you can use the G_DEFINE_AUTOPTR_CLEANUP_FUNC() and
+ * g_atomic_rc_box_release():
+ *
+ * |[<!-- language="C" -->
+ * G_DEFINE_AUTOPTR_CLEANUP_FUNC (MyDataStruct, g_atomic_rc_box_release)
+ * ]|
+ *
+ * If you need to clear the contents of the data, you will need to use an
+ * ancillary function that calls g_rc_box_release_full():
+ *
+ * |[<!-- laguage="C" -->
+ * static void
+ * my_data_struct_release (MyDataStruct *data)
+ * {
+ *   // my_data_struct_clear() is defined elsewhere
+ *   g_atomic_rc_box_release_full (data, (GDestroyNotify) my_data_struct_clear);
+ * }
+ *
+ * G_DEFINE_AUTOPTR_CLEANUP_FUNC (MyDataStruct, my_data_struct_clear)
+ * ]|
+ *
+ * Since: 2.58.
+ */
+
+
+/**
  * SECTION:arrays
  * @title: Arrays
  * @short_description: arrays of arbitrary elements which grow
@@ -7727,6 +7893,9 @@
  * using one of the [Type Conversion Macros][glib-Type-Conversion-Macros],
  * or simply pointers to any type of data.
  *
+ * As with all other GLib data structures, #GQueue is not thread-safe.
+ * For a thread-safe queue, use #GAsyncQueue.
+ *
  * To create a new GQueue, use g_queue_new().
  *
  * To initialize a statically-allocated GQueue, use #G_QUEUE_INIT or
@@ -7794,6 +7963,230 @@
 
 
 /**
+ * SECTION:rcbox
+ * @Title: Reference counted data
+ * @Short_description: Allocated memory with reference counting semantics
+ *
+ * A "reference counted box", or "RcBox", is an opaque wrapper data type
+ * that is guaranteed to be as big as the size of a given data type, and
+ * which augments the given data type with reference counting semantics
+ * for its memory management.
+ *
+ * RcBox is useful if you have a plain old data type, like a structure
+ * typically placed on the stack, and you wish to provide additional API
+ * to use it on the heap; or if you want to implement a new type to be
+ * passed around by reference without necessarily implementing copy/free
+ * semantics or your own reference counting.
+ *
+ * The typical use is:
+ *
+ * |[<!-- language="C" -->
+ * typedef struct {
+ *   char *name;
+ *   char *address;
+ *   char *city;
+ *   char *state;
+ *   int age;
+ * } Person;
+ *
+ * Person *
+ * person_new (void)
+ * {
+ *   return g_rc_box_new0 (Person);
+ * }
+ * ]|
+ *
+ * Every time you wish to acquire a reference on the memory, you should
+ * call g_rc_box_acquire(); similarly, when you wish to release a reference
+ * you should call g_rc_box_release():
+ *
+ * |[<!-- language="C" -->
+ * // Add a Person to the Database; the Database acquires ownership
+ * // of the Person instance
+ * void
+ * add_person_to_database (Database *db, Person *p)
+ * {
+ *   db->persons = g_list_prepend (db->persons, g_rc_box_acquire (p));
+ * }
+ *
+ * // Removes a Person from the Database; the reference acquired by
+ * // add_person_to_database() is released here
+ * void
+ * remove_person_from_database (Database *db, Person *p)
+ * {
+ *   db->persons = g_list_remove (db->persons, p);
+ *   g_rc_box_release (p);
+ * }
+ * ]|
+ *
+ * If you have additional memory allocated inside the structure, you can
+ * use g_rc_box_release_full(), which takes a function pointer, which
+ * will be called if the reference released was the last:
+ *
+ * |[<!-- language="C" -->
+ * void
+ * person_clear (Person *p)
+ * {
+ *   g_free (p->name);
+ *   g_free (p->address);
+ *   g_free (p->city);
+ *   g_free (p->state);
+ * }
+ *
+ * void
+ * remove_person_from_database (Database *db, Person *p)
+ * {
+ *   db->persons = g_list_remove (db->persons, p);
+ *   g_rc_box_release_full (p, (GDestroyNotify) person_clear);
+ * }
+ * ]|
+ *
+ * If you wish to transfer the ownership of a reference counted data
+ * type without increasing the reference count, you can use g_steal_pointer():
+ *
+ * |[<!-- language="C" -->
+ *   Person *p = g_rc_box_new (Person);
+ *
+ *   // fill_person_details() is defined elsewhere
+ *   fill_person_details (p);
+ *
+ *   // add_person_to_database_no_ref() is defined elsewhere; it adds
+ *   // a Person to the Database without taking a reference
+ *   add_person_to_database_no_ref (db, g_steal_pointer (&p));
+ * ]|
+ *
+ * ## Thread safety
+ *
+ * The reference counting operations on data allocated using g_rc_box_alloc(),
+ * g_rc_box_new(), and g_rc_box_dup() are not thread safe; it is your code's
+ * responsibility to ensure that references are acquired are released on the
+ * same thread.
+ *
+ * If you need thread safe reference counting, see the [atomic reference counted
+ * data][arcbox] API.
+ *
+ * ## Automatic pointer clean up
+ *
+ * If you want to add g_autoptr() support to your plain old data type through
+ * reference counting, you can use the G_DEFINE_AUTOPTR_CLEANUP_FUNC() and
+ * g_rc_box_release():
+ *
+ * |[<!-- language="C" -->
+ * G_DEFINE_AUTOPTR_CLEANUP_FUNC (MyDataStruct, g_rc_box_release)
+ * ]|
+ *
+ * If you need to clear the contents of the data, you will need to use an
+ * ancillary function that calls g_rc_box_release_full():
+ *
+ * |[<!-- language="C" -->
+ * static void
+ * my_data_struct_release (MyDataStruct *data)
+ * {
+ *   // my_data_struct_clear() is defined elsewhere
+ *   g_rc_box_release_full (data, (GDestroyNotify) my_data_struct_clear);
+ * }
+ *
+ * G_DEFINE_AUTOPTR_CLEANUP_FUNC (MyDataStruct, my_data_struct_clear)
+ * ]|
+ *
+ * Since: 2.58.
+ */
+
+
+/**
+ * SECTION:refcount
+ * @Title: Reference counting
+ * @Short_description: Reference counting types and functions
+ *
+ * Reference counting is a garbage collection mechanism that is based on
+ * assigning a counter to a data type, or any memory area; the counter is
+ * increased whenever a new reference to that data type is acquired, and
+ * decreased whenever the reference is released. Once the last reference
+ * is released, the resources associated to that data type are freed.
+ *
+ * GLib uses reference counting in many of its data types, and provides
+ * the #grefcount and #gatomicrefcount types to implement safe and atomic
+ * reference counting semantics in new data types.
+ *
+ * It is important to note that #grefcount and #gatomicrefcount should be
+ * considered completely opaque types; you should always use the provided
+ * API to increase and decrease the counters, and you should never check
+ * their content directly, or compare their content with other values.
+ *
+ * Since: 2.58
+ */
+
+
+/**
+ * SECTION:refstring
+ * @Title: Reference counted strings
+ * @Short_description: Strings with reference counted memory management
+ *
+ * Reference counted strings are normal C strings that have been augmented
+ * with a reference counter to manage their resources. You allocate a new
+ * reference counted string and acquire and release references as needed,
+ * instead of copying the string among callers; when the last reference on
+ * the string is released, the resources allocated for it are freed.
+ *
+ * Typically, reference counted strings can be used when parsing data from
+ * files and storing them into data structures that are passed to various
+ * callers:
+ *
+ * |[<!-- language="C" -->
+ * PersonDetails *
+ * person_details_from_data (const char *data)
+ * {
+ *   // Use g_autoptr() to simplify error cases
+ *   g_autoptr(GRefString) full_name = NULL;
+ *   g_autoptr(GRefString) address =  NULL;
+ *   g_autoptr(GRefString) city = NULL;
+ *   g_autoptr(GRefString) state = NULL;
+ *   g_autoptr(GRefString) zip_code = NULL;
+ *
+ *   // parse_person_details() is defined elsewhere; returns refcounted strings
+ *   if (!parse_person_details (data, &full_name, &address, &city, &state, &zip_code))
+ *     return NULL;
+ *
+ *   if (!validate_zip_code (zip_code))
+ *     return NULL;
+ *
+ *   // add_address_to_cache() and add_full_name_to_cache() are defined
+ *   // elsewhere; they add strings to various caches, using refcounted
+ *   // strings to avoid copying data over and over again
+ *   add_address_to_cache (address, city, state, zip_code);
+ *   add_full_name_to_cache (full_name);
+ *
+ *   // person_details_new() is defined elsewhere; it takes a reference
+ *   // on each string
+ *   PersonDetails *res = person_details_new (full_name,
+ *                                            address,
+ *                                            city,
+ *                                            state,
+ *                                            zip_code);
+ *
+ *   return res;
+ * }
+ * ]|
+ *
+ * In the example above, we have multiple functions taking the same strings
+ * for different uses; with typical C strings, we'd have to copy the strings
+ * every time the life time rules of the data differ from the life time of
+ * the string parsed from the original buffer. With reference counted strings,
+ * each caller can take a reference on the data, and keep it as long as it
+ * needs to own the string.
+ *
+ * Reference counted strings can also be "interned" inside a global table
+ * owned by GLib; while an interned string has at least a reference, creating
+ * a new interned reference counted string with the same contents will return
+ * a reference to the existing string instead of creating a new reference
+ * counted string instance. Once the string loses its last reference, it will
+ * be automatically removed from the global interned strings table.
+ *
+ * Since: 2.58
+ */
+
+
+/**
  * SECTION:scanner
  * @title: Lexical Scanner
  * @short_description: a general purpose lexical scanner
@@ -8047,12 +8440,17 @@
  * creates a test suite called "misc" with a single test case named
  * "assertions", which consists of running the test_assertions function.
  *
- * In addition to the traditional g_assert(), the test framework provides
+ * In addition to the traditional g_assert_true(), the test framework provides
  * an extended set of assertions for comparisons: g_assert_cmpfloat(),
- * g_assert_cmpint(), g_assert_cmpuint(), g_assert_cmphex(),
- * g_assert_cmpstr(), and g_assert_cmpmem(). The advantage of these
- * variants over plain g_assert() is that the assertion messages can be
- * more elaborate, and include the values of the compared entities.
+ * g_assert_cmpfloat_with_epsilon(), g_assert_cmpint(), g_assert_cmpuint(),
+ * g_assert_cmphex(), g_assert_cmpstr(), and g_assert_cmpmem(). The
+ * advantage of these variants over plain g_assert_true() is that the assertion
+ * messages can be more elaborate, and include the values of the compared
+ * entities.
+ *
+ * Note that g_assert() should not be used in unit tests, since it is a no-op
+ * when compiling with `G_DISABLE_ASSERT`. Use g_assert() in production code,
+ * and g_assert_true() in unit tests.
  *
  * A full example of creating a test suite with two tests using fixtures:
  * |[<!-- language="C" -->
@@ -8350,10 +8748,17 @@
  * #GTimeZone is a structure that represents a time zone, at no
  * particular point in time.  It is refcounted and immutable.
  *
+ * Each time zone has an identifier (for example, ‘Europe/London’) which is
+ * platform dependent. See g_time_zone_new() for information on the identifier
+ * formats. The identifier of a time zone can be retrieved using
+ * g_time_zone_get_identifier().
+ *
  * A time zone contains a number of intervals.  Each interval has
- * an abbreviation to describe it, an offet to UTC and a flag indicating
- * if the daylight savings time is in effect during that interval.  A
- * time zone always has at least one interval -- interval 0.
+ * an abbreviation to describe it (for example, ‘PDT’), an offet to UTC and a
+ * flag indicating if the daylight savings time is in effect during that
+ * interval.  A time zone always has at least one interval — interval 0. Note
+ * that interval abbreviations are not the same as time zone identifiers
+ * (apart from ‘UTC’), and cannot be passed to g_time_zone_new().
  *
  * Every UTC time is contained within exactly one interval, but a given
  * local time may be contained within zero, one or two intervals (due to
@@ -8491,7 +8896,7 @@
  *   i = (int) (long) p;
  * ]|
  * The GLib macros GPOINTER_TO_INT(), GINT_TO_POINTER(), etc. take care
- * to do the right thing on the every platform.
+ * to do the right thing on every platform.
  *
  * Warning: You may not store pointers in integers. This is not
  * portable in any way, shape or form. These macros only allow storing
@@ -8525,6 +8930,12 @@
  * GLib also defines macros for the limits of some of the standard
  * integer and floating point types, as well as macros for suitable
  * printf() formats for these types.
+ *
+ * Note that depending on the platform and build configuration, the format
+ * macros might not be compatible with the system provided printf() function,
+ * because GLib might use a different printf() implementation internally.
+ * The format macros will always work with GLib API (like g_print()), and with
+ * any C99 compatible printf() implementation.
  */
 
 
@@ -8783,11 +9194,19 @@
  * g_array_insert_vals:
  * @array: a #GArray
  * @index_: the index to place the elements at
- * @data: (not nullable): a pointer to the elements to insert
+ * @data: (nullable): a pointer to the elements to insert
  * @len: the number of elements to insert
  *
  * Inserts @len elements into a #GArray at the given index.
  *
+ * If @index_ is greater than the array’s current length, the array is expanded.
+ * The elements between the old end of the array and the newly inserted elements
+ * will be initialised to zero if the array was configured to clear elements;
+ * otherwise their values will be undefined.
+ *
+ * @data may be %NULL if (and only if) @len is zero. If @len is zero, this
+ * function is a no-op.
+ *
  * Returns: the #GArray
  */
 
@@ -8829,11 +9248,14 @@
 /**
  * g_array_prepend_vals:
  * @array: a #GArray
- * @data: (not nullable): a pointer to the elements to prepend to the start of the array
- * @len: the number of elements to prepend
+ * @data: (nullable): a pointer to the elements to prepend to the start of the array
+ * @len: the number of elements to prepend, which may be zero
  *
  * Adds @len elements onto the start of the array.
  *
+ * @data may be %NULL if (and only if) @len is zero. If @len is zero, this
+ * function is a no-op.
+ *
  * This operation is slower than g_array_append_vals() since the
  * existing elements in the array have to be moved to make space for
  * the new elements.
@@ -9528,7 +9950,10 @@
  *
  * The macro can be turned off in final releases of code by defining
  * `G_DISABLE_ASSERT` when compiling the application, so code must
- * not depend on any side effects from @expr.
+ * not depend on any side effects from @expr. Similarly, it must not be used
+ * in unit tests, otherwise the unit tests will be ineffective if compiled with
+ * `G_DISABLE_ASSERT`. Use g_assert_true() and related macros in unit tests
+ * instead.
  */
 
 
@@ -9551,6 +9976,24 @@
 
 
 /**
+ * g_assert_cmpfloat_with_epsilon:
+ * @n1: an floating point number
+ * @n2: another floating point number
+ * @epsilon: a numeric value that expresses the expected tolerance
+ *   between @n1 and @n2
+ *
+ * Debugging macro to compare two floating point numbers within an epsilon.
+ *
+ * The effect of `g_assert_cmpfloat_with_epsilon (n1, n2, epsilon)` is
+ * the same as `g_assert_true (abs (n1 - n2) < epsilon)`. The advantage
+ * of this macro is that it can produce a message that includes the
+ * actual values of @n1 and @n2.
+ *
+ * Since: 2.58
+ */
+
+
+/**
  * g_assert_cmphex:
  * @n1: an unsigned integer
  * @cmp: The comparison operator to use.
@@ -9684,6 +10127,10 @@
  * an error message is logged and the application is either
  * terminated or the testcase marked as failed.
  *
+ * Note that unlike g_assert(), this macro is unaffected by whether
+ * `G_DISABLE_ASSERT` is defined. Hence it should only be used in tests and,
+ * conversely, g_assert() should not be used in tests.
+ *
  * See g_test_set_nonfatal_assertions().
  *
  * Since: 2.38
@@ -9715,6 +10162,10 @@
  * an error message is logged and the application is either
  * terminated or the testcase marked as failed.
  *
+ * Note that unlike g_assert(), this macro is unaffected by whether
+ * `G_DISABLE_ASSERT` is defined. Hence it should only be used in tests and,
+ * conversely, g_assert() should not be used in tests.
+ *
  * See g_test_set_nonfatal_assertions().
  *
  * Since: 2.40
@@ -9729,7 +10180,8 @@
  * application is terminated.
  *
  * The macro can be turned off in final releases of code by defining
- * `G_DISABLE_ASSERT` when compiling the application.
+ * `G_DISABLE_ASSERT` when compiling the application. Hence, it should not be
+ * used in unit tests, where assertions should always be effective.
  */
 
 
@@ -9743,6 +10195,10 @@
  * an error message is logged and the application is either
  * terminated or the testcase marked as failed.
  *
+ * Note that unlike g_assert(), this macro is unaffected by whether
+ * `G_DISABLE_ASSERT` is defined. Hence it should only be used in tests and,
+ * conversely, g_assert() should not be used in tests.
+ *
  * See g_test_set_nonfatal_assertions().
  *
  * Since: 2.38
@@ -9759,6 +10215,10 @@
  * an error message is logged and the application is either
  * terminated or the testcase marked as failed.
  *
+ * Note that unlike g_assert(), this macro is unaffected by whether
+ * `G_DISABLE_ASSERT` is defined. Hence it should only be used in tests and,
+ * conversely, g_assert() should not be used in tests.
+ *
  * See g_test_set_nonfatal_assertions().
  *
  * Since: 2.38
@@ -10540,6 +11000,183 @@
 
 
 /**
+ * g_atomic_rc_box_acquire:
+ * @mem_block: (not nullable): a pointer to reference counted data
+ *
+ * Atomically acquires a reference on the data pointed by @mem_block.
+ *
+ * Returns: (transfer full) (not nullable): a pointer to the data,
+ *   with its reference count increased
+ * Since: 2.58
+ */
+
+
+/**
+ * g_atomic_rc_box_alloc:
+ * @block_size: the size of the allocation, must be greater than 0
+ *
+ * Allocates @block_size bytes of memory, and adds atomic
+ * reference counting semantics to it.
+ *
+ * The data will be freed when its reference count drops to
+ * zero.
+ *
+ * Returns: (transfer full) (not nullable): a pointer to the allocated memory
+ * Since: 2.58
+ */
+
+
+/**
+ * g_atomic_rc_box_alloc0:
+ * @block_size: the size of the allocation, must be greater than 0
+ *
+ * Allocates @block_size bytes of memory, and adds atomic
+ * referenc counting semantics to it.
+ *
+ * The contents of the returned data is set to zero.
+ *
+ * The data will be freed when its reference count drops to
+ * zero.
+ *
+ * Returns: (transfer full) (not nullable): a pointer to the allocated memory
+ * Since: 2.58
+ */
+
+
+/**
+ * g_atomic_rc_box_dup:
+ * @block_size: the number of bytes to copy, must be greater than 0
+ * @mem_block: (not nullable): the memory to copy
+ *
+ * Allocates a new block of data with atomit reference counting
+ * semantics, and copies @block_size bytes of @mem_block
+ * into it.
+ *
+ * Returns: (transfer full) (not nullable): a pointer to the allocated
+ *   memory
+ * Since: 2.58
+ */
+
+
+/**
+ * g_atomic_rc_box_get_size:
+ * @mem_block: (not nullable): a pointer to reference counted data
+ *
+ * Retrieves the size of the reference counted data pointed by @mem_block.
+ *
+ * Returns: the size of the data, in bytes
+ * Since: 2.58
+ */
+
+
+/**
+ * g_atomic_rc_box_new:
+ * @type: the type to allocate, typically a structure name
+ *
+ * A convenience macro to allocate atomically reference counted
+ * data with the size of the given @type.
+ *
+ * This macro calls g_atomic_rc_box_alloc() with `sizeof (@type)` and
+ * casts the returned pointer to a pointer of the given @type,
+ * avoiding a type cast in the source code.
+ *
+ * Returns: (transfer full) (not nullable): a pointer to the allocated
+ *   memory, cast to a pointer for the given @type
+ * Since: 2.58
+ */
+
+
+/**
+ * g_atomic_rc_box_new0:
+ * @type: the type to allocate, typically a structure name
+ *
+ * A convenience macro to allocate atomically reference counted
+ * data with the size of the given @type, and set its contents
+ * to zero.
+ *
+ * This macro calls g_atomic_rc_box_alloc0() with `sizeof (@type)` and
+ * casts the returned pointer to a pointer of the given @type,
+ * avoiding a type cast in the source code.
+ *
+ * Returns: (transfer full) (not nullable): a pointer to the allocated
+ *   memory, cast to a pointer for the given @type
+ * Since: 2.58
+ */
+
+
+/**
+ * g_atomic_rc_box_release:
+ * @mem_block: (transfer full) (not nullable): a pointer to reference counted data
+ *
+ * Atomically releases a reference on the data pointed by @mem_block.
+ *
+ * If the reference was the last one, it will free the
+ * resources allocated for @mem_block.
+ *
+ * Since: 2.58
+ */
+
+
+/**
+ * g_atomic_rc_box_release_full:
+ * @mem_block: (transfer full) (not nullable): a pointer to reference counted data
+ * @clear_func: (not nullable): a function to call when clearing the data
+ *
+ * Atomically releases a reference on the data pointed by @mem_block.
+ *
+ * If the reference was the last one, it will call @clear_func
+ * to clear the contents of @mem_block, and then will free the
+ * resources allocated for @mem_block.
+ *
+ * Since: 2.58
+ */
+
+
+/**
+ * g_atomic_ref_count_compare:
+ * @arc: the address of an atomic reference count variable
+ * @val: the value to compare
+ *
+ * Atomically compares the current value of @arc with @val.
+ *
+ * Returns: %TRUE if the reference count is the same
+ *   as the given value
+ * Since: 2.58
+ */
+
+
+/**
+ * g_atomic_ref_count_dec:
+ * @arc: the address of an atomic reference count variable
+ *
+ * Atomically decreases the reference count.
+ *
+ * Returns: %TRUE if the reference count reached 0, and %FALSE otherwise
+ * Since: 2.58
+ */
+
+
+/**
+ * g_atomic_ref_count_inc:
+ * @arc: the address of an atomic reference count variable
+ *
+ * Atomically increases the reference count.
+ *
+ * Since: 2.58
+ */
+
+
+/**
+ * g_atomic_ref_count_init:
+ * @arc: the address of an atomic reference count variable
+ *
+ * Atomically initializes a reference count variable.
+ *
+ * Since: 2.58
+ */
+
+
+/**
  * g_auto:
  * @TypeName: a supported variable type
  *
@@ -11363,7 +12000,7 @@
  * This function looks for a desktop bookmark file named @file in the
  * paths returned from g_get_user_data_dir() and g_get_system_data_dirs(),
  * loads the file into @bookmark and returns the file's full path in
- * @full_path.  If the file could not be loaded then an %error is
+ * @full_path.  If the file could not be loaded then @error is
  * set to either a #GFileError or #GBookmarkFileError.
  *
  * Returns: %TRUE if a key file could be loaded, %FALSE otherwise
@@ -12241,6 +12878,33 @@
 
 
 /**
+ * g_canonicalize_filename:
+ * @filename: (type filename): the name of the file
+ * @relative_to: (type filename) (nullable): the relative directory, or %NULL
+ * to use the current working directory
+ *
+ * Gets the canonical file name from @filename. All triple slashes are turned into
+ * single slashes, and all `..` and `.`s resolved against @relative_to.
+ *
+ * Symlinks are not followed, and the returned path is guaranteed to be absolute.
+ *
+ * If @filename is an absolute path, @relative_to is ignored. Otherwise,
+ * @relative_to will be prepended to @filename to make it absolute. @relative_to
+ * must be an absolute path, or %NULL. If @relative_to is %NULL, it'll fallback
+ * to g_get_current_dir().
+ *
+ * This function never fails, and will canonicalize file paths even if they don't
+ * exist.
+ *
+ * No file system I/O is done.
+ *
+ * Returns: (type filename) (transfer full): a newly allocated string with the
+ * canonical file path
+ * Since: 2.58
+ */
+
+
+/**
  * g_chdir:
  * @path: (type filename): a pathname in the GLib file name encoding
  *     (UTF-8 on Windows)
@@ -12282,8 +12946,8 @@
 /**
  * g_checksum_get_digest: (skip)
  * @checksum: a #GChecksum
- * @buffer: output buffer
- * @digest_len: an inout parameter. The caller initializes it to the size of @buffer.
+ * @buffer: (array length=digest_len): output buffer
+ * @digest_len: (inout): an inout parameter. The caller initializes it to the size of @buffer.
  *   After the call it contains the length of the digest.
  *
  * Gets the digest from @checksum as a raw binary vector and places it
@@ -13012,13 +13676,16 @@
  *     into the format string (as with printf())
  *
  * Logs a "critical warning" (#G_LOG_LEVEL_CRITICAL).
- * It's more or less application-defined what constitutes
- * a critical vs. a regular warning. You could call
- * g_log_set_always_fatal() to make critical warnings exit
- * the program, then use g_critical() for fatal errors, for
- * example.
  *
- * You can also make critical warnings fatal at runtime by
+ * Critical warnings are intended to be used in the event of an error
+ * that originated in the current process (a programmer error).
+ * Logging of a critical error is by definition an indication of a bug
+ * somewhere in the current program (or its libraries).
+ *
+ * g_return_if_fail(), g_return_val_if_fail(), g_return_if_reached() and
+ * g_return_val_if_reached() log at %G_LOG_LEVEL_CRITICAL.
+ *
+ * You can make critical warnings fatal at runtime by
  * setting the `G_DEBUG` environment variable (see
  * [Running GLib Applications](glib-running.html)):
  *
@@ -13026,6 +13693,8 @@
  *   G_DEBUG=fatal-warnings gdb ./my-program
  * ]|
  *
+ * You can also use g_log_set_always_fatal().
+ *
  * Any unrelated failures can be skipped over in
  * [gdb](https://www.gnu.org/software/gdb/) using the `continue` command.
  *
@@ -13877,7 +14546,10 @@
  *
  * To set the value of a date to the current day, you could write:
  * |[<!-- language="C" -->
- *  g_date_set_time_t (date, time (NULL));
+ *  time_t now = time (NULL);
+ *  if (now == (time_t) -1)
+ *    // handle the error
+ *  g_date_set_time_t (date, now);
  * ]|
  *
  * Since: 2.10
@@ -14366,6 +15038,17 @@
 
 
 /**
+ * g_date_time_get_timezone:
+ * @datetime: a #GDateTime
+ *
+ * Get the time zone for this @datetime.
+ *
+ * Returns: (transfer none): the time zone
+ * Since: 2.58
+ */
+
+
+/**
  * g_date_time_get_timezone_abbreviation:
  * @datetime: a #GDateTime
  *
@@ -15570,6 +16253,17 @@
  *   lists, metadata etc. may be lost. If @filename is a symbolic link,
  *   the link itself will be replaced, not the linked file.
  *
+ * - On UNIX, if @filename already exists and is non-empty, and if the system
+ *   supports it (via a journalling filesystem or equivalent), the fsync()
+ *   call (or equivalent) will be used to ensure atomic replacement: @filename
+ *   will contain either its old contents or @contents, even in the face of
+ *   system power loss, the disk being unsafely removed, etc.
+ *
+ * - On UNIX, if @filename does not already exist or is empty, there is a
+ *   possibility that system power loss etc. after calling this function will
+ *   leave @filename empty or full of NUL bytes, depending on the underlying
+ *   filesystem.
+ *
  * - On Windows renaming a file will not remove an existing file with the
  *   new name, so on Windows there is a race condition between the existing
  *   file being removed and the temporary file being renamed.
@@ -16171,6 +16865,27 @@
 
 
 /**
+ * g_get_language_names_with_category:
+ * @category_name: a locale category name
+ *
+ * Computes a list of applicable locale names with a locale category name,
+ * which can be used to construct the fallback locale-dependent filenames
+ * or search paths. The returned list is sorted from most desirable to
+ * least desirable and always contains the default locale "C".
+ *
+ * This function consults the environment variables `LANGUAGE`, `LC_ALL`,
+ * @category_name, and `LANG` to find the list of locales specified by the
+ * user.
+ *
+ * g_get_language_names() returns g_get_language_names_with_category("LC_MESSAGES").
+ *
+ * Returns: (array zero-terminated=1) (transfer none): a %NULL-terminated array of strings owned by GLib
+ *    that must not be modified or freed.
+ * Since: 2.58
+ */
+
+
+/**
  * g_get_locale_variants:
  * @locale: a locale identifier
  *
@@ -17029,6 +17744,31 @@
 
 
 /**
+ * g_hash_table_steal_extended:
+ * @hash_table: a #GHashTable
+ * @lookup_key: the key to look up
+ * @stolen_key: (out) (optional) (transfer full): return location for the
+ *    original key
+ * @stolen_value: (out) (optional) (nullable) (transfer full): return location
+ *    for the value associated with the key
+ *
+ * Looks up a key in the #GHashTable, stealing the original key and the
+ * associated value and returning %TRUE if the key was found. If the key was
+ * not found, %FALSE is returned.
+ *
+ * If found, the stolen key and value are removed from the hash table without
+ * calling the key and value destroy functions, and ownership is transferred to
+ * the caller of this method; as with g_hash_table_steal().
+ *
+ * You can pass %NULL for @lookup_key, provided the hash and equal functions
+ * of @hash_table are %NULL-safe.
+ *
+ * Returns: %TRUE if the key was found in the #GHashTable
+ * Since: 2.58
+ */
+
+
+/**
  * g_hash_table_thaw:
  * @hash_table: a #GHashTable
  *
@@ -17067,8 +17807,8 @@
 /**
  * g_hmac_get_digest:
  * @hmac: a #GHmac
- * @buffer: output buffer
- * @digest_len: an inout parameter. The caller initializes it to the
+ * @buffer: (array length=digest_len): output buffer
+ * @digest_len: (inout): an inout parameter. The caller initializes it to the
  *   size of @buffer. After the call it contains the length of the digest
  *
  * Gets the digest from @checksum as a raw binary array and places it
@@ -20095,6 +20835,11 @@
  * g_log_set_writer_func(). See
  * [Using Structured Logging][using-structured-logging].
  *
+ * This function is mostly intended to be used with
+ * %G_LOG_LEVEL_CRITICAL.  You should typically not set
+ * %G_LOG_LEVEL_WARNING, %G_LOG_LEVEL_MESSAGE, %G_LOG_LEVEL_INFO or
+ * %G_LOG_LEVEL_DEBUG as fatal except inside of test programs.
+ *
  * Returns: the old fatal mask for the log domain
  */
 
@@ -20955,6 +21700,7 @@
  *
  * Returns: %TRUE if the operation succeeded, and
  *   this thread is now the owner of @context.
+ * Deprecated: 2.58: Use g_main_context_is_owner() and separate locking instead.
  */
 
 
@@ -23377,7 +24123,7 @@
  *
  * Increments the reference count of @group by one.
  *
- * Returns: a #GoptionGroup
+ * Returns: a #GOptionGroup
  * Since: 2.44
  */
 
@@ -24097,9 +24843,10 @@
  * Removes the pointer at the given index from the pointer array.
  * The following elements are moved down one place. If @array has
  * a non-%NULL #GDestroyNotify function it is called for the removed
- * element.
+ * element. If so, the return value from this function will potentially point
+ * to freed memory (depending on the #GDestroyNotify implementation).
  *
- * Returns: the pointer which was removed
+ * Returns: (nullable): the pointer which was removed
  */
 
 
@@ -24112,9 +24859,11 @@
  * The last element in the array is used to fill in the space, so
  * this function does not preserve the order of the array. But it
  * is faster than g_ptr_array_remove_index(). If @array has a non-%NULL
- * #GDestroyNotify function it is called for the removed element.
+ * #GDestroyNotify function it is called for the removed element. If so, the
+ * return value from this function will potentially point to freed memory
+ * (depending on the #GDestroyNotify implementation).
  *
- * Returns: the pointer which was removed
+ * Returns: (nullable): the pointer which was removed
  */
 
 
@@ -24209,6 +24958,38 @@
 
 
 /**
+ * g_ptr_array_steal_index:
+ * @array: a #GPtrArray
+ * @index_: the index of the pointer to steal
+ *
+ * Removes the pointer at the given index from the pointer array.
+ * The following elements are moved down one place. The #GDestroyNotify for
+ * @array is *not* called on the removed element; ownership is transferred to
+ * the caller of this function.
+ *
+ * Returns: (transfer full) (nullable): the pointer which was removed
+ * Since: 2.58
+ */
+
+
+/**
+ * g_ptr_array_steal_index_fast:
+ * @array: a #GPtrArray
+ * @index_: the index of the pointer to steal
+ *
+ * Removes the pointer at the given index from the pointer array.
+ * The last element in the array is used to fill in the space, so
+ * this function does not preserve the order of the array. But it
+ * is faster than g_ptr_array_steal_index(). The #GDestroyNotify for @array is
+ * *not* called on the removed element; ownership is transferred to the caller
+ * of this function.
+ *
+ * Returns: (transfer full) (nullable): the pointer which was removed
+ * Since: 2.58
+ */
+
+
+/**
  * g_ptr_array_unref:
  * @array: A #GPtrArray
  *
@@ -24992,6 +25773,138 @@
 
 
 /**
+ * g_rc_box_acquire:
+ * @mem_block: (not nullable): a pointer to reference counted data
+ *
+ * Acquires a reference on the data pointed by @mem_block.
+ *
+ * Returns: (transfer full) (not nullable): a pointer to the data,
+ *   with its reference count increased
+ * Since: 2.58
+ */
+
+
+/**
+ * g_rc_box_alloc:
+ * @block_size: the size of the allocation, must be greater than 0
+ *
+ * Allocates @block_size bytes of memory, and adds reference
+ * counting semantics to it.
+ *
+ * The data will be freed when its reference count drops to
+ * zero.
+ *
+ * Returns: (transfer full) (not nullable): a pointer to the allocated memory
+ * Since: 2.58
+ */
+
+
+/**
+ * g_rc_box_alloc0:
+ * @block_size: the size of the allocation, must be greater than 0
+ *
+ * Allocates @block_size bytes of memory, and adds reference
+ * counting semantics to it.
+ *
+ * The contents of the returned data is set to zero.
+ *
+ * The data will be freed when its reference count drops to
+ * zero.
+ *
+ * Returns: (transfer full) (not nullable): a pointer to the allocated memory
+ * Since: 2.58
+ */
+
+
+/**
+ * g_rc_box_dup:
+ * @block_size: the number of bytes to copy, must be greater than 0
+ * @mem_block: (not nullable): the memory to copy
+ *
+ * Allocates a new block of data with reference counting
+ * semantics, and copies @block_size bytes of @mem_block
+ * into it.
+ *
+ * Returns: (transfer full) (not nullable): a pointer to the allocated
+ *   memory
+ * Since: 2.58
+ */
+
+
+/**
+ * g_rc_box_get_size:
+ * @mem_block: (not nullable): a pointer to reference counted data
+ *
+ * Retrieves the size of the reference counted data pointed by @mem_block.
+ *
+ * Returns: the size of the data, in bytes
+ * Since: 2.58
+ */
+
+
+/**
+ * g_rc_box_new:
+ * @type: the type to allocate, typically a structure name
+ *
+ * A convenience macro to allocate reference counted data with
+ * the size of the given @type.
+ *
+ * This macro calls g_rc_box_alloc() with `sizeof (@type)` and
+ * casts the returned pointer to a pointer of the given @type,
+ * avoiding a type cast in the source code.
+ *
+ * Returns: (transfer full) (not nullable): a pointer to the
+ *   allocated memory, cast to a pointer for the given @type
+ * Since: 2.58
+ */
+
+
+/**
+ * g_rc_box_new0:
+ * @type: the type to allocate, typically a structure name
+ *
+ * A convenience macro to allocate reference counted data with
+ * the size of the given @type, and set its contents to zero.
+ *
+ * This macro calls g_rc_box_alloc0() with `sizeof (@type)` and
+ * casts the returned pointer to a pointer of the given @type,
+ * avoiding a type cast in the source code.
+ *
+ * Returns: (transfer full) (not nullable): a pointer to the
+ *   allocated memory, cast to a pointer for the given @type
+ * Since: 2.58
+ */
+
+
+/**
+ * g_rc_box_release:
+ * @mem_block: (transfer full) (not nullable): a pointer to reference counted data
+ *
+ * Releases a reference on the data pointed by @mem_block.
+ *
+ * If the reference was the last one, it will free the
+ * resources allocated for @mem_block.
+ *
+ * Since: 2.58
+ */
+
+
+/**
+ * g_rc_box_release_full:
+ * @mem_block: (transfer full) (not nullable): a pointer to reference counted data
+ * @clear_func: (not nullable): a function to call when clearing the data
+ *
+ * Releases a reference on the data pointed by @mem_block.
+ *
+ * If the reference was the last one, it will call @clear_func
+ * to clear the contents of @mem_block, and then will free the
+ * resources allocated for @mem_block.
+ *
+ * Since: 2.58
+ */
+
+
+/**
  * g_realloc:
  * @mem: (nullable): the memory to reallocate
  * @n_bytes: new size of the memory in bytes
@@ -25116,6 +26029,128 @@
 
 
 /**
+ * g_ref_count_compare:
+ * @rc: the address of a reference count variable
+ * @val: the value to compare
+ *
+ * Compares the current value of @rc with @val.
+ *
+ * Returns: %TRUE if the reference count is the same
+ *   as the given value
+ * Since: 2.58
+ */
+
+
+/**
+ * g_ref_count_dec:
+ * @rc: the address of a reference count variable
+ *
+ * Decreases the reference count.
+ *
+ * Returns: %TRUE if the reference count reached 0, and %FALSE otherwise
+ * Since: 2.58
+ */
+
+
+/**
+ * g_ref_count_inc:
+ * @rc: the address of a reference count variable
+ *
+ * Increases the reference count.
+ *
+ * Since: 2.58
+ */
+
+
+/**
+ * g_ref_count_init:
+ * @rc: the address of a reference count variable
+ *
+ * Initializes a reference count variable.
+ *
+ * Since: 2.58
+ */
+
+
+/**
+ * g_ref_string_acquire:
+ * @str: a reference counted string
+ *
+ * Acquires a reference on a string.
+ *
+ * Returns: the given string, with its reference count increased
+ * Since: 2.58
+ */
+
+
+/**
+ * g_ref_string_length:
+ * @str: a reference counted string
+ *
+ * Retrieves the length of @str.
+ *
+ * Returns: the length of the given string, in bytes
+ * Since: 2.58
+ */
+
+
+/**
+ * g_ref_string_new:
+ * @str: (not nullable): a NUL-terminated string
+ *
+ * Creates a new reference counted string and copies the contents of @str
+ * into it.
+ *
+ * Returns: (transfer full) (not nullable): the newly created reference counted string
+ * Since: 2.58
+ */
+
+
+/**
+ * g_ref_string_new_intern:
+ * @str: (not nullable): a NUL-terminated string
+ *
+ * Creates a new reference counted string and copies the content of @str
+ * into it.
+ *
+ * If you call this function multiple times with the same @str, or with
+ * the same contents of @str, it will return a new reference, instead of
+ * creating a new string.
+ *
+ * Returns: (transfer full) (not nullable): the newly created reference
+ *   counted string, or a new reference to an existing string
+ * Since: 2.58
+ */
+
+
+/**
+ * g_ref_string_new_len:
+ * @str: (not nullable): a string
+ * @len: length of @str to use, or -1 if @str is nul-terminated
+ *
+ * Creates a new reference counted string and copies the contents of @str
+ * into it, up to @len bytes.
+ *
+ * Since this function does not stop at nul bytes, it is the caller's
+ * responsibility to ensure that @str has at least @len addressable bytes.
+ *
+ * Returns: (transfer full) (not nullable): the newly created reference counted string
+ * Since: 2.58
+ */
+
+
+/**
+ * g_ref_string_release:
+ * @str: a reference counted string
+ *
+ * Releases a reference on a string; if it was the last reference, the
+ * resources allocated by the string are freed as well.
+ *
+ * Since: 2.58
+ */
+
+
+/**
  * g_regex_check_replacement:
  * @replacement: the replacement string
  * @has_references: (out) (optional): location to store information about
@@ -25156,7 +26191,7 @@
 /**
  * g_regex_escape_string:
  * @string: (array length=length): the string to escape
- * @length: the length of @string, or -1 if @string is nul-terminated
+ * @length: the length of @string, in bytes, or -1 if @string is nul-terminated
  *
  * Escapes the special characters used for regular expressions
  * in @string, for instance "a.b*c" becomes "a\.b\*c". This
@@ -25278,11 +26313,13 @@
  * @match_info: (out) (optional): pointer to location where to store
  *     the #GMatchInfo, or %NULL if you do not need it
  *
- * Scans for a match in string for the pattern in @regex.
+ * Scans for a match in @string for the pattern in @regex.
  * The @match_options are combined with the match options specified
  * when the @regex structure was created, letting you have more
  * flexibility in reusing #GRegex structures.
  *
+ * Unless %G_REGEX_RAW is specified in the options, @string must be valid UTF-8.
+ *
  * A #GMatchInfo structure, used to get information on the match,
  * is stored in @match_info if not %NULL. Note that if @match_info
  * is not %NULL then it is created even if the function returns %FALSE,
@@ -25354,7 +26391,7 @@
  * g_regex_match_all_full:
  * @regex: a #GRegex structure from g_regex_new()
  * @string: (array length=string_len): the string to scan for matches
- * @string_len: the length of @string, or -1 if @string is nul-terminated
+ * @string_len: the length of @string, in bytes, or -1 if @string is nul-terminated
  * @start_position: starting index of the string to match, in bytes
  * @match_options: match options
  * @match_info: (out) (optional): pointer to location where to store
@@ -25362,7 +26399,7 @@
  * @error: location to store the error occurring, or %NULL to ignore errors
  *
  * Using the standard algorithm for regular expression matching only
- * the longest match in the string is retrieved, it is not possible
+ * the longest match in the @string is retrieved, it is not possible
  * to obtain all the available matches. For instance matching
  * "<a> <b> <c>" against the pattern "<.*>"
  * you get "<a> <b> <c>".
@@ -25388,6 +26425,8 @@
  * string and setting #G_REGEX_MATCH_NOTBOL in the case of a pattern
  * that begins with any kind of lookbehind assertion, such as "\b".
  *
+ * Unless %G_REGEX_RAW is specified in the options, @string must be valid UTF-8.
+ *
  * A #GMatchInfo structure, used to get information on the match, is
  * stored in @match_info if not %NULL. Note that if @match_info is
  * not %NULL then it is created even if the function returns %FALSE,
@@ -25407,14 +26446,14 @@
  * g_regex_match_full:
  * @regex: a #GRegex structure from g_regex_new()
  * @string: (array length=string_len): the string to scan for matches
- * @string_len: the length of @string, or -1 if @string is nul-terminated
+ * @string_len: the length of @string, in bytes, or -1 if @string is nul-terminated
  * @start_position: starting index of the string to match, in bytes
  * @match_options: match options
  * @match_info: (out) (optional): pointer to location where to store
  *     the #GMatchInfo, or %NULL if you do not need it
  * @error: location to store the error occurring, or %NULL to ignore errors
  *
- * Scans for a match in string for the pattern in @regex.
+ * Scans for a match in @string for the pattern in @regex.
  * The @match_options are combined with the match options specified
  * when the @regex structure was created, letting you have more
  * flexibility in reusing #GRegex structures.
@@ -25423,6 +26462,8 @@
  * string and setting #G_REGEX_MATCH_NOTBOL in the case of a pattern
  * that begins with any kind of lookbehind assertion, such as "\b".
  *
+ * Unless %G_REGEX_RAW is specified in the options, @string must be valid UTF-8.
+ *
  * A #GMatchInfo structure, used to get information on the match, is
  * stored in @match_info if not %NULL. Note that if @match_info is
  * not %NULL then it is created even if the function returns %FALSE,
@@ -25523,7 +26564,7 @@
  * g_regex_replace:
  * @regex: a #GRegex structure
  * @string: (array length=string_len): the string to perform matches against
- * @string_len: the length of @string, or -1 if @string is nul-terminated
+ * @string_len: the length of @string, in bytes, or -1 if @string is nul-terminated
  * @start_position: starting index of the string to match, in bytes
  * @replacement: text to replace each match with
  * @match_options: options for the match
@@ -25565,7 +26606,7 @@
  * g_regex_replace_eval:
  * @regex: a #GRegex structure from g_regex_new()
  * @string: (array length=string_len): string to perform matches against
- * @string_len: the length of @string, or -1 if @string is nul-terminated
+ * @string_len: the length of @string, in bytes, or -1 if @string is nul-terminated
  * @start_position: starting index of the string to match, in bytes
  * @match_options: options for the match
  * @eval: a function to call for each match
@@ -25627,7 +26668,7 @@
  * g_regex_replace_literal:
  * @regex: a #GRegex structure
  * @string: (array length=string_len): the string to perform matches against
- * @string_len: the length of @string, or -1 if @string is nul-terminated
+ * @string_len: the length of @string, in bytes, or -1 if @string is nul-terminated
  * @start_position: starting index of the string to match, in bytes
  * @replacement: text to replace each match with
  * @match_options: options for the match
@@ -25681,7 +26722,7 @@
  * g_regex_split_full:
  * @regex: a #GRegex structure
  * @string: (array length=string_len): the string to split with the pattern
- * @string_len: the length of @string, or -1 if @string is nul-terminated
+ * @string_len: the length of @string, in bytes, or -1 if @string is nul-terminated
  * @start_position: starting index of the string to match, in bytes
  * @match_options: match time option flags
  * @max_tokens: the maximum number of tokens to split @string into.
@@ -26436,14 +27477,14 @@
  * @cmp_func: the function used to compare items in the sequence
  * @cmp_data: user data passed to @cmp_func.
  *
- * Inserts @data into @sequence using @func to determine the new
+ * Inserts @data into @seq using @cmp_func to determine the new
  * position. The sequence must already be sorted according to @cmp_func;
  * otherwise the new position of @data is undefined.
  *
- * @cmp_func is called with two items of the @seq and @user_data.
+ * @cmp_func is called with two items of the @seq, and @cmp_data.
  * It should return 0 if the items are equal, a negative value
  * if the first item comes before the second, and a positive value
- * if the second  item comes before the first.
+ * if the second item comes before the first.
  *
  * Note that when adding a large amount of data to a #GSequence,
  * it is more efficient to do unsorted insertions and then call
@@ -26459,7 +27500,7 @@
  * @seq: a #GSequence
  * @data: data for the new item
  * @iter_cmp: the function used to compare iterators in the sequence
- * @cmp_data: user data passed to @cmp_func
+ * @cmp_data: user data passed to @iter_cmp
  *
  * Like g_sequence_insert_sorted(), but uses
  * a #GSequenceIterCompareFunc instead of a #GCompareDataFunc as
@@ -26470,11 +27511,6 @@
  * value if the first iterator comes before the second, and a
  * positive value if the second iterator comes before the first.
  *
- * It is called with two iterators pointing into @seq. It should
- * return 0 if the iterators are equal, a negative value if the
- * first iterator comes before the second, and a positive value
- * if the second iterator comes before the first.
- *
  * Note that when adding a large amount of data to a #GSequence,
  * it is more efficient to do unsorted insertions and then call
  * g_sequence_sort() or g_sequence_sort_iter().
@@ -26613,7 +27649,7 @@
  * returned. In that case, you can use g_sequence_iter_next() and
  * g_sequence_iter_prev() to get others.
  *
- * @cmp_func is called with two items of the @seq and @user_data.
+ * @cmp_func is called with two items of the @seq, and @cmp_data.
  * It should return 0 if the items are equal, a negative value if
  * the first item comes before the second, and a positive value if
  * the second item comes before the first.
@@ -26647,7 +27683,7 @@
  * unsorted.
  *
  * Returns: (transfer none) (nullable): an #GSequenceIter pointing to the position of
- *     the first item found equal to @data according to @cmp_func
+ *     the first item found equal to @data according to @iter_cmp
  *     and @cmp_data, or %NULL if no such item exists
  * Since: 2.28
  */
@@ -26674,13 +27710,13 @@
  * @begin: a #GSequenceIter
  * @end: a #GSequenceIter
  *
- * Inserts the (@begin, @end) range at the destination pointed to by ptr.
+ * Inserts the (@begin, @end) range at the destination pointed to by @dest.
  * The @begin and @end iters must point into the same sequence. It is
  * allowed for @dest to point to a different sequence than the one pointed
  * into by @begin and @end.
  *
- * If @dest is NULL, the range indicated by @begin and @end is
- * removed from the sequence. If @dest iter points to a place within
+ * If @dest is %NULL, the range indicated by @begin and @end is
+ * removed from the sequence. If @dest points to a place within
  * the (@begin, @end) range, the range does not move.
  *
  * Since: 2.14
@@ -26768,7 +27804,7 @@
  * Returns an iterator pointing to the position where @data would
  * be inserted according to @cmp_func and @cmp_data.
  *
- * @cmp_func is called with two items of the @seq and @user_data.
+ * @cmp_func is called with two items of the @seq, and @cmp_data.
  * It should return 0 if the items are equal, a negative value if
  * the first item comes before the second, and a positive value if
  * the second item comes before the first.
@@ -26849,12 +27885,13 @@
  * @cmp_func: the function used to compare items in the sequence
  * @cmp_data: user data passed to @cmp_func.
  *
- * Moves the data pointed to a new position as indicated by @cmp_func. This
+ * Moves the data pointed to by @iter to a new position as indicated by
+ * @cmp_func. This
  * function should be called for items in a sequence already sorted according
  * to @cmp_func whenever some aspect of an item changes so that @cmp_func
  * may return different values for that item.
  *
- * @cmp_func is called with two items of the @seq and @user_data.
+ * @cmp_func is called with two items of the @seq, and @cmp_data.
  * It should return 0 if the items are equal, a negative value if
  * the first item comes before the second, and a positive value if
  * the second item comes before the first.
@@ -26873,7 +27910,8 @@
  * a #GSequenceIterCompareFunc instead of a #GCompareDataFunc as
  * the compare function.
  *
- * @iter_cmp is called with two iterators pointing into @seq. It should
+ * @iter_cmp is called with two iterators pointing into the #GSequence that
+ * @iter points into. It should
  * return 0 if the iterators are equal, a negative value if the first
  * iterator comes before the second, and a positive value if the second
  * iterator comes before the first.
@@ -26889,7 +27927,7 @@
  * @cmp_data: user data passed to @cmp_func
  *
  * Like g_sequence_sort(), but uses a #GSequenceIterCompareFunc instead
- * of a GCompareDataFunc as the compare function
+ * of a #GCompareDataFunc as the compare function
  *
  * @cmp_func is called with two iterators pointing into @seq. It should
  * return 0 if the iterators are equal, a negative value if the first
@@ -27992,6 +29030,11 @@
  * context. The reverse
  * mapping from ID to source is done by g_main_context_find_source_by_id().
  *
+ * You can only call this function while the source is associated to a
+ * #GMainContext instance; calling this function before g_source_attach()
+ * or after g_source_destroy() yields undefined behavior. The ID returned
+ * is unique within the #GMainContext instance passed to g_source_attach().
+ *
  * Returns: the ID (greater than 0) for the source
  */
 
@@ -28310,7 +29353,8 @@
  *
  * The exact type of @func depends on the type of source; ie. you
  * should not count on @func being called with @data as its first
- * parameter.
+ * parameter. Cast @func with G_SOURCE_FUNC() to avoid warnings about
+ * incompatible function types.
  *
  * See [memory management of sources][mainloop-memory-management] for details
  * on how to handle memory management of @data.
@@ -28521,6 +29565,44 @@
 
 
 /**
+ * g_spawn_async_with_fds:
+ * @working_directory: (type filename) (nullable): child's current working directory, or %NULL to inherit parent's, in the GLib file name encoding
+ * @argv: (array zero-terminated=1): child's argument vector, in the GLib file name encoding
+ * @envp: (array zero-terminated=1) (nullable): child's environment, or %NULL to inherit parent's, in the GLib file name encoding
+ * @flags: flags from #GSpawnFlags
+ * @child_setup: (scope async) (nullable): function to run in the child just before exec()
+ * @user_data: (closure): user data for @child_setup
+ * @child_pid: (out) (optional): return location for child process ID, or %NULL
+ * @stdin_fd: file descriptor to use for child's stdin, or -1
+ * @stdout_fd: file descriptor to use for child's stdout, or -1
+ * @stderr_fd: file descriptor to use for child's stderr, or -1
+ * @error: return location for error
+ *
+ * Identical to g_spawn_async_with_pipes() but instead of
+ * creating pipes for the stdin/stdout/stderr, you can pass existing
+ * file descriptors into this function through the @stdin_fd,
+ * @stdout_fd and @stderr_fd parameters. The following @flags
+ * also have their behaviour slightly tweaked as a result:
+ *
+ * %G_SPAWN_STDOUT_TO_DEV_NULL means that the child's standard output
+ * will be discarded, instead of going to the same location as the parent's
+ * standard output. If you use this flag, @standard_output must be -1.
+ * %G_SPAWN_STDERR_TO_DEV_NULL means that the child's standard error
+ * will be discarded, instead of going to the same location as the parent's
+ * standard error. If you use this flag, @standard_error must be -1.
+ * %G_SPAWN_CHILD_INHERITS_STDIN means that the child will inherit the parent's
+ * standard input (by default, the child's standard input is attached to
+ * /dev/null). If you use this flag, @standard_input must be -1.
+ *
+ * It is valid to pass the same fd in multiple parameters (e.g. you can pass
+ * a single fd for both stdout and stderr).
+ *
+ * Returns: %TRUE on success, %FALSE if an error was set
+ * Since: 2.58
+ */
+
+
+/**
  * g_spawn_async_with_pipes:
  * @working_directory: (type filename) (nullable): child's current working
  *     directory, or %NULL to inherit parent's, in the GLib file name encoding
@@ -28606,10 +29688,11 @@
  * is equivalent to calling CloseHandle() on the process handle returned
  * in @child_pid). See g_child_watch_add().
  *
- * %G_SPAWN_LEAVE_DESCRIPTORS_OPEN means that the parent's open file
- * descriptors will be inherited by the child; otherwise all descriptors
- * except stdin/stdout/stderr will be closed before calling exec() in
- * the child. %G_SPAWN_SEARCH_PATH means that @argv[0] need not be an
+ * Open UNIX file descriptors marked as `FD_CLOEXEC` will be automatically
+ * closed in the child process. %G_SPAWN_LEAVE_DESCRIPTORS_OPEN means that
+ * other open file descriptors will be inherited by the child; otherwise all
+ * descriptors except stdin/stdout/stderr will be closed before calling exec()
+ * in the child. %G_SPAWN_SEARCH_PATH means that @argv[0] need not be an
  * absolute path, it will be looked for in the `PATH` environment
  * variable. %G_SPAWN_SEARCH_PATH_FROM_ENVP means need not be an
  * absolute path, it will be looked for in the `PATH` variable from
@@ -28684,6 +29767,21 @@
  * If @child_pid is not %NULL and an error does not occur then the returned
  * process reference must be closed using g_spawn_close_pid().
  *
+ * On modern UNIX platforms, GLib can use an efficient process launching
+ * codepath driven internally by posix_spawn(). This has the advantage of
+ * avoiding the fork-time performance costs of cloning the parent process
+ * address space, and avoiding associated memory overcommit checks that are
+ * not relevant in the context of immediately executing a distinct process.
+ * This optimized codepath will be used provided that the following conditions
+ * are met:
+ *
+ * 1. %G_SPAWN_DO_NOT_REAP_CHILD is set
+ * 2. %G_SPAWN_LEAVE_DESCRIPTORS_OPEN is set
+ * 3. %G_SPAWN_SEARCH_PATH_FROM_ENVP is not set
+ * 4. @working_directory is %NULL
+ * 5. @child_setup is %NULL
+ * 6. The program is of a recognised binary format, or has a shebang. Otherwise, GLib will have to execute the program through the shell, which is not done using the optimized codepath.
+ *
  * If you are writing a GTK+ application, and the program you are spawning is a
  * graphical application too, then to ensure that the spawned program opens its
  * windows on the right screen, you may want to use #GdkAppLaunchContext,
@@ -28928,9 +30026,9 @@
  * @key_equal_func parameter, when using non-%NULL strings as keys in a
  * #GHashTable.
  *
- * Note that this function is primarily meant as a hash table comparison
- * function. For a general-purpose, %NULL-safe string comparison function,
- * see g_strcmp0().
+ * This function is typically used for hash table comparisons, but can be used
+ * for general purpose comparisons of non-%NULL strings. For a %NULL-safe string
+ * comparison function, see g_strcmp0().
  *
  * Returns: %TRUE if the two keys match
  */
@@ -29045,12 +30143,12 @@
  * If the source language of @str is known, it can used to improve the
  * accuracy of the translation by passing it as @from_locale.  It should
  * be a valid POSIX locale string (of the form
- * "language[_territory][.codeset][@modifier]").
+ * `language[_territory][.codeset][@modifier]`).
  *
  * If @from_locale is %NULL then the current locale is used.
  *
  * If you want to do translation for no specific locale, and you want it
- * to be done independently of the currently locale, specify "C" for
+ * to be done independently of the currently locale, specify `"C"` for
  * @from_locale.
  *
  * Returns: a string in plain ASCII
@@ -30319,7 +31417,7 @@
  * @str_array: a %NULL-terminated array of strings
  *
  * Returns the length of the given %NULL-terminated
- * string array @str_array.
+ * string array @str_array. @str_array must not be %NULL.
  *
  * Returns: length of @str_array.
  * Since: 2.6
@@ -31979,6 +33077,24 @@
 
 
 /**
+ * g_time_zone_get_identifier:
+ * @tz: a #GTimeZone
+ *
+ * Get the identifier of this #GTimeZone, as passed to g_time_zone_new().
+ * If the identifier passed at construction time was not recognised, `UTC` will
+ * be returned. If it was %NULL, the identifier of the local timezone at
+ * construction time will be returned.
+ *
+ * The identifier will be returned in the same format as provided at
+ * construction time: if provided as a time offset, that will be returned by
+ * this function.
+ *
+ * Returns: identifier for this timezone
+ * Since: 2.58
+ */
+
+
+/**
  * g_time_zone_get_offset:
  * @tz: a #GTimeZone
  * @interval: an interval within the timezone
@@ -32101,6 +33217,21 @@
 
 
 /**
+ * g_time_zone_new_offset:
+ * @seconds: offset to UTC, in seconds
+ *
+ * Creates a #GTimeZone corresponding to the given constant offset from UTC,
+ * in seconds.
+ *
+ * This is equivalent to calling g_time_zone_new() with a string in the form
+ * `[+|-]hh[:mm[:ss]]`.
+ *
+ * Returns: (transfer full): a timezone at the given offset from UTC
+ * Since: 2.58
+ */
+
+
+/**
  * g_time_zone_new_utc:
  *
  * Creates a #GTimeZone corresponding to UTC.
@@ -32209,7 +33340,7 @@
  * context. You can do these steps manually if you need greater control or to
  * use a custom main context.
  *
- * The interval given in terms of monotonic time, not wall clock time.
+ * The interval given is in terms of monotonic time, not wall clock time.
  * See g_get_monotonic_time().
  *
  * Returns: the ID (greater than 0) of the event source.
@@ -32328,7 +33459,7 @@
  * The scheduling granularity/accuracy of this timeout source will be
  * in seconds.
  *
- * The interval given in terms of monotonic time, not wall clock time.
+ * The interval given is in terms of monotonic time, not wall clock time.
  * See g_get_monotonic_time().
  *
  * Returns: the newly-created timeout source
@@ -35174,7 +36305,7 @@
  * It is an error to call this function with a @value of any type
  * other than %G_VARIANT_TYPE_BYTE.
  *
- * Returns: a #guchar
+ * Returns: a #guint8
  * Since: 2.24
  */
 
@@ -35357,7 +36488,7 @@
  * the appropriate type:
  * - %G_VARIANT_TYPE_INT16 (etc.): #gint16 (etc.)
  * - %G_VARIANT_TYPE_BOOLEAN: #guchar (not #gboolean!)
- * - %G_VARIANT_TYPE_BYTE: #guchar
+ * - %G_VARIANT_TYPE_BYTE: #guint8
  * - %G_VARIANT_TYPE_HANDLE: #guint32
  * - %G_VARIANT_TYPE_DOUBLE: #gdouble
  *
@@ -35764,10 +36895,10 @@
  * should ensure that a string is a valid D-Bus object path before
  * passing it to g_variant_new_object_path().
  *
- * A valid object path starts with '/' followed by zero or more
- * sequences of characters separated by '/' characters.  Each sequence
- * must contain only the characters "[A-Z][a-z][0-9]_".  No sequence
- * (including the one following the final '/' character) may be empty.
+ * A valid object path starts with `/` followed by zero or more
+ * sequences of characters separated by `/` characters.  Each sequence
+ * must contain only the characters `[A-Z][a-z][0-9]_`.  No sequence
+ * (including the one following the final `/` character) may be empty.
  *
  * Returns: %TRUE if @string is a D-Bus object path
  * Since: 2.24
@@ -37666,6 +38797,16 @@
  * preferred for that instead, as it allows calling functions to perform actions
  * conditional on the type of error.
  *
+ * Warning messages are intended to be used in the event of unexpected
+ * external conditions (system misconfiguration, missing files,
+ * other trusted programs violating protocol, invalid contents in
+ * trusted files, etc.)
+ *
+ * If attempting to deal with programmer errors (for example, incorrect function
+ * parameters) then you should use %G_LOG_LEVEL_CRITICAL instead.
+ *
+ * g_warn_if_reached() and g_warn_if_fail() log at %G_LOG_LEVEL_WARNING.
+ *
  * You can make warnings fatal at runtime by setting the `G_DEBUG`
  * environment variable (see
  * [Running GLib Applications](glib-running.html)):
@@ -37960,6 +39101,23 @@
 
 
 /**
+ * gatomicrefcount:
+ *
+ * A type for implementing atomic reference count semantics.
+ *
+ * Use g_atomic_ref_count_init() to initialize it; g_atomic_ref_count_inc()
+ * to increase the counter, and g_atomic_ref_count_dec() to decrease it.
+ *
+ * It is safe to use #gatomicrefcount if you're expecting to operate on the
+ * reference counter from multiple threads.
+ *
+ * See also: #grefcount
+ *
+ * Since: 2.58
+ */
+
+
+/**
  * gboolean:
  *
  * A standard boolean type.
@@ -38232,6 +39390,25 @@
 
 
 /**
+ * grefcount:
+ *
+ * A type for implementing non-atomic reference count semantics.
+ *
+ * Use g_ref_count_init() to initialize it; g_ref_count_inc() to
+ * increase the counter, and g_ref_count_dec() to decrease it.
+ *
+ * It is safe to use #grefcount only if you're expecting to operate
+ * on the reference counter from a single thread. It is entirely up
+ * to you to ensure that all reference count changes happen in the
+ * same thread.
+ *
+ * See also: #gatomicrefcount
+ *
+ * Since: 2.58
+ */
+
+
+/**
  * gshort:
  *
  * Corresponds to the standard C short type.
diff --git a/gir/gobject-2.0.c b/gir/gobject-2.0.c
index 4e964e0..87f646a 100644
--- a/gir/gobject-2.0.c
+++ b/gir/gobject-2.0.c
@@ -54,11 +54,17 @@
  * @gobject: the object which received the signal.
  * @pspec: the #GParamSpec of the property which changed.
  *
- * The notify signal is emitted on an object when one of its
- * properties has been changed. Note that getting this signal
- * doesn't guarantee that the value of the property has actually
- * changed, it may also be emitted when the setter for the property
- * is called to reinstate the previous value.
+ * The notify signal is emitted on an object when one of its properties has
+ * its value set through g_object_set_property(), g_object_set(), et al.
+ *
+ * Note that getting this signal doesn’t itself guarantee that the value of
+ * the property has actually changed. When it is emitted is determined by the
+ * derived GObject class. If the implementor did not create the property with
+ * %G_PARAM_EXPLICIT_NOTIFY, then any call to g_object_set_property() results
+ * in ::notify being emitted, even if the new value is the same as the old.
+ * If they did pass %G_PARAM_EXPLICIT_NOTIFY, then this signal is emitted only
+ * when they explicitly call g_object_notify() or g_object_notify_by_pspec(),
+ * and common practice is to do that only when the value has actually changed.
  *
  * This signal is typically used to obtain change notification for a
  * single property, by specifying the property name as a detail in the
@@ -69,7 +75,7 @@
  *                   text_view)
  * ]|
  * It is important to note that you must use
- * [canonical][canonical-parameter-name] parameter names as
+ * [canonical parameter names][canonical-parameter-names] as
  * detail strings for the notify signal.
  */
 
@@ -267,7 +273,9 @@
  * library provides the #GCClosure type for this purpose. Bindings for
  * other languages need marshallers which convert between #GValues
  * and suitable representations in the runtime of the language in
- * order to use functions written in that languages as callbacks.
+ * order to use functions written in that language as callbacks. Use
+ * g_closure_set_marshal() to set the marshaller on such a custom
+ * closure implementation.
  *
  * Within GObject, closures play an important role in the
  * implementation of signals. When a signal is registered, the
@@ -436,7 +444,7 @@
  *
  * Type instance and class structs are limited to a total of 64 KiB,
  * including all parent types. Similarly, type instances' private data
- * (as created by g_type_class_add_private()) are limited to a total of
+ * (as created by G_ADD_PRIVATE()) are limited to a total of
  * 64 KiB. If a type instance needs a large static buffer, allocate it
  * separately (typically by using #GArray or #GPtrArray) and put a pointer
  * to the buffer in the structure.
@@ -811,7 +819,7 @@
 
 /**
  * g_binding_unbind:
- * @binding: a #GBinding
+ * @binding: (transfer full): a #GBinding
  *
  * Explicitly releases the binding between the source and the target
  * property expressed by @binding.
@@ -3019,7 +3027,7 @@
 
 
 /**
- * g_object_new_with_properties: (rename-to g_object_new)
+ * g_object_new_with_properties: (skip)
  * @object_type: the object type to instantiate
  * @n_properties: the number of properties
  * @names: (array length=n_properties): the names of each property to be set
@@ -4827,7 +4835,7 @@
  * Creates a new signal. (This is usually done in the class initializer.)
  *
  * This is a variant of g_signal_new() that takes a C callback instead
- * off a class offset for the signal's class handler. This function
+ * of a class offset for the signal's class handler. This function
  * doesn't need a function pointer exposed in the class structure of
  * an object definition, instead the function pointer is passed
  * directly and can be overriden by derived classes with
@@ -5259,6 +5267,8 @@
  * ]|
  *
  * Since: 2.4
+ * Deprecated: 2.58: Use the G_ADD_PRIVATE() macro with the `G_DEFINE_*`
+ *   family of macros to add instance private data to a type
  */
 
 
diff --git a/gir/meson.build b/gir/meson.build
new file mode 100644
index 0000000..607bbc4
--- /dev/null
+++ b/gir/meson.build
@@ -0,0 +1,432 @@
+cairo_conf = configuration_data()
+if get_option('cairo-libname') != ''
+  cairo_library_name = get_option('cairo-libname')
+elif host_machine.system() == 'win32'
+  cairo_library_name = 'libcairo-gobject-2.dll'
+elif host_machine.system() == 'darwin'
+  cairo_library_name = 'libcairo-gobject.2.dylib'
+else
+  cairo_library_name = 'libcairo-gobject.so.2'
+endif
+
+cairo_conf.set('CAIRO_SHARED_LIBRARY', cairo_library_name)
+cairo_conf.set('CAIRO_GIR_PACKAGE', 'cairo-gobject')
+
+cairo_gir = configure_file(
+  input: 'cairo-1.0.gir.in',
+  output: 'cairo-1.0.gir',
+  configuration: cairo_conf,
+)
+
+gir_files = [
+  cairo_gir,
+  'DBus-1.0.gir',
+  'DBusGLib-1.0.gir',
+  'fontconfig-2.0.gir',
+  'freetype2-2.0.gir',
+  'GL-1.0.gir',
+  'libxml2-2.0.gir',
+  'xft-2.0.gir',
+  'xlib-2.0.gir',
+  'xfixes-4.0.gir',
+  'xrandr-1.3.gir',
+  'win32-1.0.gir',
+]
+
+typelibdir = join_paths(get_option('libdir'), 'girepository-1.0')
+girdir = join_paths(get_option('datadir'), 'gir-1.0')
+install_data(gir_files, install_dir: girdir)
+
+scanner_command = [
+  python,
+  girscanner,
+  '--output=@OUTPUT@',
+  '--no-libtool',
+  '--reparse-validate',
+  '--add-include-path', join_paths(meson.current_build_dir()),
+  '--add-include-path', join_paths(meson.current_source_dir()),
+]
+
+dep_type = glib_dep.type_name()
+if dep_type == 'internal'
+  # XXX: Instead of hard-coding the subproject directory, we should use
+  # gnome.generate_gir() because that will take care of dependencies, include
+  # paths, library paths, and more that we now have to handle manually when
+  # building with subprojects.
+  subprojdir = 'subprojects'
+  scanner_command += ['--extra-library=gio-2.0', '--extra-library=gmodule-2.0',
+                      '--extra-library=glib-2.0', '--extra-library=gobject-2.0']
+endif
+
+# Take a glob and print to newlines
+globber = '''
+from glob import glob
+
+# Sort the glob for stable results. Also ensures that gmarshal.h is not
+# #include-ed by scannerparser.y first because it does not include glib.h
+# itself, which leaves several defines unresolved.
+for f in sorted(glob('@0@')):
+  print(f)
+'''
+
+# GLib
+glib_files = []
+glib_command = scanner_command + [
+  '--identifier-prefix=G',
+  '--symbol-prefix=g',
+  '--symbol-prefix=glib',
+  '--c-include=glib.h',
+  '--namespace=GLib',
+  '--nsversion=2.0',
+  '--library=glib-2.0',
+  '--library=gobject-2.0',
+]
+
+if dep_type == 'pkgconfig'
+  glib_command += ['--external-library', '--pkg=glib-2.0']
+  glib_libdir = glib_dep.get_pkgconfig_variable('libdir')
+  glib_incdir = join_paths(glib_dep.get_pkgconfig_variable('includedir'), 'glib-2.0')
+  glib_libincdir = join_paths(glib_libdir, 'glib-2.0', 'include')
+  glib_files += join_paths(glib_incdir, 'gobject', 'glib-types.h')
+  glib_files += join_paths(glib_libincdir, 'glibconfig.h')
+  if giounix_dep.found()
+    glib_files += join_paths(glib_incdir, 'glib-unix.h')
+  endif
+  # Parse glob to get installed header list
+  ret = run_command(python, '-c', globber.format(join_paths(glib_incdir, 'glib', '*.h')))
+  if ret.returncode() != 0
+    error('Failed to get glib header list')
+  endif
+  glib_headers = ret.stdout().strip().split('\n')
+  # Get a list of all source files
+  glib_srcdir = get_option('glib-src-dir')
+  if glib_srcdir != ''
+    ret = run_command(python, '-c', globber.format(join_paths(glib_srcdir, 'glib', '*.c')))
+    if ret.returncode() != 0
+      error('Failed to get glib source list')
+    endif
+    glib_files += ret.stdout().strip().split('\n')
+  endif
+  glib_includes = ['-I' + glib_incdir, '-I' + glib_libincdir]
+elif dep_type == 'internal'
+  glib_command += ['--pkg-export=glib-2.0']
+  # XXX: Assumes that the builddir layout is 'mirror'
+  glib_libdir = join_paths(meson.build_root(), subprojdir, 'glib', 'glib')
+  # XXX: Assumes the location of the glib subproject dir
+  # We should add API to meson to get a specific file from a specific subproject
+  glibproj_incdir = join_paths(meson.source_root(), subprojdir, 'glib')
+  glib_incdir = join_paths(glibproj_incdir, 'glib')
+  glib_libincdir = glib_libdir
+  glib_files += join_paths(glibproj_incdir, 'gobject', 'glib-types.h')
+  glib_files += join_paths(glib_libincdir, 'glibconfig.h')
+  if giounix_dep.found()
+    glib_files += join_paths(glib_incdir, 'glib-unix.h')
+  endif
+  # We know exactly what headers will be installed, so just fetch that
+  glib_subproject = subproject('glib')
+  glib_headers = glib_subproject.get_variable('glib_sub_headers')
+  glib_files += glib_subproject.get_variable('glib_sources')
+  # XXX: Assumes that the builddir layout is 'mirror'
+  gobject_libdir = join_paths(meson.build_root(), subprojdir, 'glib', 'gobject')
+  gmodule_libdir = join_paths(meson.build_root(), subprojdir, 'glib', 'gmodule')
+  gio_libdir = join_paths(meson.build_root(), subprojdir, 'glib', 'gio')
+  glib_libpaths = ['-L' + glib_libdir, '-L' + gobject_libdir,
+                   '-L' + gmodule_libdir, '-L' + gio_libdir]
+  # Includes that will be used to compile the scanner executable
+  glib_buildinc = join_paths(meson.build_root(), subprojdir, 'glib')
+  gmodule_incdir = join_paths(glibproj_incdir, 'gmodule')
+  gio_incdir = join_paths(glibproj_incdir, 'gio')
+  glib_includes = ['-I' + glibproj_incdir, '-I' + glib_incdir, '-I' + glib_libincdir,
+                   '-I' + glib_buildinc, '-I' + gmodule_incdir, '-I' + gio_incdir]
+  # XXX: We need include paths to all glib dependencies too. We assume that the
+  # dependencies are only libffi and proxy-libintl, and that they are used as
+  # subprojects. In the worst case we add paths to non-existent directories.
+  ffi_incdir = join_paths(meson.build_root(), subprojdir, 'libffi', 'include')
+  glib_includes += ['-I' + ffi_incdir]
+  intl_incdir = join_paths(meson.source_root(), subprojdir, 'proxy-libintl')
+  glib_includes += ['-I' + intl_incdir]
+
+  ffi_libdir = join_paths(meson.build_root(), subprojdir, 'libffi', 'src')
+  intl_libdir = join_paths(meson.build_root(), subprojdir, 'proxy-libintl')
+  glib_libpaths = ['-L' + ffi_libdir, '-L' + intl_libdir] + glib_libpaths
+
+  glib_command += glib_libpaths
+
+else
+  error('Unknown glib dependency type: ' + dep_type)
+endif
+
+foreach h : glib_headers
+  hstr = '@0@'.format(h)
+  if not hstr.endswith('autocleanups.h')
+    glib_files += h
+  endif
+endforeach
+
+# NOTE: Always add this last so that we prefer the annotations in the sources
+# (if they are available) since it contains 'backup' annotations that can be
+# out of date.
+glib_files += files('glib-2.0.c')
+
+glib_gir = custom_target('gir-glib',
+  input: glib_files,
+  output: 'GLib-2.0.gir',
+  depends: giscanner_pymod,
+  depend_files: giscanner_built_files,
+  install: true,
+  install_dir: girdir,
+  command: glib_command + [
+    '--cflags-begin'] + glib_includes + [
+    '-DGLIB_COMPILATION',
+    '-D__G_I18N_LIB_H__',
+    '-DGETTEXT_PACKAGE=Dummy',
+    '--cflags-end',
+    '@INPUT@',
+  ]
+)
+
+gir_files += glib_gir
+
+# GObject
+gobject_files = []
+gobject_command = scanner_command + [
+  '--identifier-prefix=G',
+  '--c-include=glib-object.h',
+  '--namespace=GObject',
+  '--nsversion=2.0',
+  '--library=gobject-2.0',
+]
+
+if dep_type == 'pkgconfig'
+  gobject_command += ['--external-library', '--pkg=gobject-2.0']
+  # Get the installed header list
+  ret = run_command(python, '-c', globber.format(join_paths(glib_incdir, 'gobject', '*.h')))
+  if ret.returncode() != 0
+    error('Failed to get gobject header list')
+  endif
+  gobject_headers = ret.stdout().strip().split('\n')
+  if glib_srcdir != ''
+    ret = run_command(python, '-c', globber.format(join_paths(glib_srcdir, 'gobject', '*.c')))
+    if ret.returncode() != 0
+      error('Failed to get gobject source list')
+    endif
+    gobject_files += ret.stdout().strip().split('\n')
+  endif
+else
+  gobject_command += ['--pkg-export=gobject-2.0']
+  gobject_headers = glib_subproject.get_variable('gobject_install_headers')
+  gobject_files += glib_subproject.get_variable('gobject_sources')
+  gobject_command += glib_libpaths
+endif
+
+foreach h : gobject_headers
+  hstr = '@0@'.format(h)
+  if not hstr.endswith('autocleanups.h') and not hstr.endswith('glib-types.h')
+    gobject_files += h
+  endif
+endforeach
+
+# NOTE: Always add this last so that we prefer the annotations in the sources
+# (if they are available) since it contains 'backup' annotations that can be
+# out of date.
+gobject_files += files('gobject-2.0.c')
+
+gobject_gir = custom_target('gir-gobject',
+  input: gobject_files,
+  output: 'GObject-2.0.gir',
+  depends: [glib_gir, giscanner_pymod],
+  depend_files: giscanner_built_files,
+  install: true,
+  install_dir: girdir,
+  command: gobject_command + [
+    '--include-uninstalled=' + glib_gir.full_path(),
+    '--cflags-begin'] + glib_includes + [
+    '-DGOBJECT_COMPILATION',
+    '--cflags-end',
+    '@INPUT@',
+  ]
+)
+
+gir_files += gobject_gir
+
+# GModule
+gmodule_files = []
+gmodule_command = scanner_command + [
+  '--identifier-prefix=G',
+  '--symbol-prefix=g',
+  '--c-include=gmodule.h',
+  '--namespace=GModule',
+  '--nsversion=2.0',
+  '--library=gmodule-2.0',
+]
+
+if dep_type == 'pkgconfig'
+  gmodule_command += ['--external-library', '--pkg=gmodule-2.0']
+  gmodule_files += join_paths(glib_incdir, 'gmodule.h')
+  if glib_srcdir != ''
+    gmodule_files += join_paths(glib_srcdir, 'gmodule', 'gmodule.c')
+  endif
+else
+  gmodule_command += ['--pkg-export=gmodule-2.0']
+  gmodule_command += glib_libpaths
+  gmodule_files += [join_paths(glibproj_incdir, 'gmodule', 'gmodule.h'),
+                    join_paths(glibproj_incdir, 'gmodule', 'gmodule.c')]
+endif
+
+# NOTE: Always add this last so that we prefer the annotations in the sources
+# (if they are available) since it contains 'backup' annotations that can be
+# out of date.
+gmodule_files += files('gmodule-2.0.c')
+
+gir_files += custom_target('gir-gmodule',
+  input: gmodule_files,
+  output: 'GModule-2.0.gir',
+  depends: [glib_gir, giscanner_pymod],
+  depend_files: giscanner_built_files,
+  install: true,
+  install_dir: girdir,
+  command: gmodule_command + [
+    '--include-uninstalled=' + glib_gir.full_path(),
+    '--cflags-begin'] + glib_includes + [
+    '--cflags-end',
+    '@INPUT@',
+  ]
+)
+
+## Gio
+gio_files = []
+gio_command = scanner_command + [
+  '--identifier-prefix=G',
+  '--symbol-prefix=g',
+  '--c-include=gio/gio.h',
+  '--namespace=Gio',
+  '--nsversion=2.0',
+  '--library=gio-2.0',
+]
+
+if dep_type == 'pkgconfig'
+  gio_command += ['--external-library', '--pkg=gio-2.0']
+  # Get the installed header list
+  ret = run_command(python, '-c', globber.format(join_paths(glib_incdir, 'gio', '*.h')))
+  if ret.returncode() != 0
+    error('Failed to get gio header list')
+  endif
+  gio_headers = ret.stdout().strip().split('\n')
+  # Get all gio (and gio-unix) sources. This is not entirely correct, but it's
+  # probably fine since it matches what Autotools does. We are more exact in
+  # the subproject case.
+  if glib_srcdir != ''
+    ret = run_command(python, '-c', globber.format(join_paths(glib_srcdir, 'gio', '*.c')))
+    if ret.returncode() != 0
+      error('Failed to get gio source list')
+    endif
+    gio_files += ret.stdout().strip().split('\n')
+  endif
+else
+  gio_command += ['--pkg-export=gio-2.0']
+  gio_headers = glib_subproject.get_variable('gio_headers')
+  gio_files += glib_subproject.get_variable('gio_sources')
+  gio_command += glib_libpaths
+endif
+
+foreach h : gio_headers
+  hstr = '@0@'.format(h)
+  if not hstr.endswith('autocleanups.h')
+    gio_files += h
+  endif
+endforeach
+
+if giounix_dep.found()
+  if dep_type == 'pkgconfig'
+    gio_command += ['--pkg=gio-unix-2.0']
+    giounix_includedir = join_paths(giounix_dep.get_pkgconfig_variable('includedir'), 'gio-unix-2.0')
+    # Get the installed gio-unix header list
+    ret = run_command(python, '-c', globber.format(join_paths(giounix_includedir, 'gio', '*.h')))
+    if ret.returncode() != 0
+      error('Failed to get gio-unix header list')
+    endif
+    giounix_headers = ret.stdout().strip().split('\n')
+  else
+    gio_command += ['--pkg-export=gio-unix-2.0']
+    giounix_headers = glib_subproject.get_variable('gio_unix_include_headers')
+  endif
+  # No filtering needed
+  gio_files += giounix_headers
+  # GIO Unix headers must be included explicitly since there is no catch-all
+  # header that includes all of them unlike gio/gio.h above
+  foreach header : giounix_headers
+    hstr = '@0@'.format(header)
+    hbase = hstr.split('/')[-1]
+    gio_command += '--c-include=gio/@0@'.format(hbase)
+  endforeach
+endif
+
+# NOTE: Always add this last so that we prefer the annotations in the sources
+# (if they are available) since it contains 'backup' annotations that can be
+# out of date.
+gio_files += files('gio-2.0.c')
+
+gir_files += custom_target('gir-gio',
+  input: gio_files,
+  output: 'Gio-2.0.gir',
+  depends: [gobject_gir, giscanner_pymod],
+  depend_files: giscanner_built_files,
+  install: true,
+  install_dir: girdir,
+  command: gio_command + [
+    '--include-uninstalled=' + gobject_gir.full_path(),
+    '--cflags-begin'] + glib_includes + [
+    '-DGIO_COMPILATION',
+    '-DG_SETTINGS_ENABLE_BACKEND',
+    '--cflags-end',
+    '@INPUT@',
+  ]
+)
+
+# GIRepository
+
+girepository_command = scanner_command + [
+  '--identifier-prefix=GI',
+  '--symbol-prefix=g',
+  '--c-include=girepository.h',
+  '--namespace=GIRepository',
+  '--nsversion=2.0',
+  '--library=girepository-1.0',
+  '--pkg-export=gobject-introspection-1.0',
+  '-L' + meson.current_build_dir() + '/../girepository',
+]
+
+if dep_type != 'pkgconfig'
+  girepository_command += glib_libpaths
+endif
+
+gir_files += custom_target('gir-girepository',
+  input: girepo_gir_sources,
+  output: 'GIRepository-2.0.gir',
+  depends: [gobject_gir, giscanner_pymod],
+  depend_files: giscanner_built_files,
+  install: true,
+  install_dir: girdir,
+  command: girepository_command + [
+    '--include-uninstalled=' + gobject_gir.full_path(),
+    '--cflags-begin'] + glib_includes + [
+    '-I' + meson.current_source_dir() + '/../girepository',
+    '-DGI_COMPILATION',
+    '--cflags-end',
+    '@INPUT@',
+  ]
+)
+
+foreach gir : gir_files
+  custom_target('generate-typelib-@0@'.format(gir).underscorify(),
+    input: gir,
+    output: '@BASENAME@.typelib',
+    depends: [gobject_gir, ],
+    command: [gircompiler, '-o', '@OUTPUT@', '@INPUT@',
+              '--includedir', meson.current_build_dir(),
+              '--includedir', meson.current_source_dir(),
+    ],
+    install: true,
+    install_dir: typelibdir,
+  )
+endforeach
diff --git a/girepository/cmph/meson.build b/girepository/cmph/meson.build
new file mode 100644
index 0000000..368afc7
--- /dev/null
+++ b/girepository/cmph/meson.build
@@ -0,0 +1,50 @@
+cmph_sources = [
+  'bdz.c',
+  'bdz_ph.c',
+  'bmz8.c',
+  'bmz.c',
+  'brz.c',
+  'buffer_entry.c',
+  'buffer_manager.c',
+  'chd.c',
+  'chd_ph.c',
+  'chm.c',
+  'cmph.c',
+  'cmph_structs.c',
+  'compressed_rank.c',
+  'compressed_seq.c',
+  'fch_buckets.c',
+  'fch.c',
+  'graph.c',
+  'hash.c',
+  'jenkins_hash.c',
+  'miller_rabin.c',
+  'select.c',
+  'vqueue.c',
+  'vstack.c',
+]
+
+cmph_deps = [
+  glib_dep,
+  cc.find_library('m', required: false),
+]
+
+cmph = static_library('cmph',
+  sources: cmph_sources,
+  c_args: gi_hidden_visibility_cflags,
+  dependencies: cmph_deps,
+)
+
+cmph_dep = declare_dependency(
+  link_with: cmph,
+  include_directories: include_directories('.'),
+)
+
+cmph_test = executable('cmph-bdz-test', '../cmph-bdz-test.c',
+  dependencies: [
+    cmph_dep,
+    glib_dep,
+  ]
+)
+
+test('cmph-bdz-test', cmph_test)
diff --git a/girepository/gdump.c b/girepository/gdump.c
index 6aa8bfd..0e8c603 100644
--- a/girepository/gdump.c
+++ b/girepository/gdump.c
@@ -311,7 +311,7 @@ dump_flags_type (GType type, const char *symbol, GOutputStream *out)
     {
       GFlagsValue *value = &(klass->values[i]);
 
-      escaped_printf (out, "    <member name=\"%s\" nick=\"%s\" value=\"%d\"/>\n",
+      escaped_printf (out, "    <member name=\"%s\" nick=\"%s\" value=\"%u\"/>\n",
 		      value->value_name, value->value_nick, value->value);
     }
   goutput_write (out, "  </flags>\n");
diff --git a/girepository/gicallableinfo.c b/girepository/gicallableinfo.c
index bfbcc25..e9a426e 100644
--- a/girepository/gicallableinfo.c
+++ b/girepository/gicallableinfo.c
@@ -77,6 +77,8 @@ signature_offset (GICallableInfo *info)
     case GI_INFO_TYPE_SIGNAL:
       sigoff = G_STRUCT_OFFSET (SignalBlob, signature);
       break;
+    default:
+      g_assert_not_reached ();
     }
   if (sigoff >= 0)
     return *(guint32 *)&rinfo->typelib->data[rinfo->offset + sigoff];
@@ -535,7 +537,7 @@ gi_type_info_extract_ffi_return_value (GITypeInfo                  *return_info,
                 arg->v_int32 = (gint32) ffi_value->v_long;
                 break;
             default:
-                arg->v_pointer = (gpointer) ffi_value->v_ulong;
+                arg->v_pointer = (gpointer) ffi_value->v_pointer;
                 break;
             }
 
@@ -543,7 +545,7 @@ gi_type_info_extract_ffi_return_value (GITypeInfo                  *return_info,
         }
         break;
     default:
-        arg->v_pointer = (gpointer) ffi_value->v_ulong;
+        arg->v_pointer = (gpointer) ffi_value->v_pointer;
         break;
     }
 }
diff --git a/girepository/giconstantinfo.c b/girepository/giconstantinfo.c
index 60715a4..d44646e 100644
--- a/girepository/giconstantinfo.c
+++ b/girepository/giconstantinfo.c
@@ -166,6 +166,8 @@ g_constant_info_get_value (GIConstantInfo *info,
 	    case GI_TYPE_TAG_DOUBLE:
 	      DO_ALIGNED_COPY(&value->v_double, &rinfo->typelib->data[blob->offset], gdouble);
 	      break;
+	    default:
+	      g_assert_not_reached ();
 	    }
 	}
     }
diff --git a/girepository/gifieldinfo.c b/girepository/gifieldinfo.c
index ea64dab..4d07304 100644
--- a/girepository/gifieldinfo.c
+++ b/girepository/gifieldinfo.c
@@ -337,12 +337,16 @@ g_field_info_get_field (GIFieldInfo *field_info,
 			  g_base_info_get_name ((GIBaseInfo *)field_info),
 			  g_base_info_get_type (interface));
 		break;
+	      default:
+		break;
 	      }
 
 	    g_base_info_unref ((GIBaseInfo *)interface);
 	    break;
 	  }
 	  break;
+	default:
+	  break;
 	}
     }
 
@@ -513,12 +517,16 @@ g_field_info_set_field (GIFieldInfo     *field_info,
 			  g_base_info_get_name ((GIBaseInfo *)field_info),
 			  g_base_info_get_type (interface));
 		break;
+	      default:
+		break;
 	      }
 
 	    g_base_info_unref ((GIBaseInfo *)interface);
 	    break;
 	  }
 	  break;
+	default:
+	  break;
 	}
     } else {
       switch (g_type_info_get_tag (type_info))
diff --git a/girepository/girepository-private.h b/girepository/girepository-private.h
index bbd34e3..de0b04e 100644
--- a/girepository/girepository-private.h
+++ b/girepository/girepository-private.h
@@ -113,13 +113,4 @@ GIVFuncInfo * _g_base_info_find_vfunc (GIRealInfo   *rinfo,
 				       gint          n_vfuncs,
 				       const gchar  *name);
 
-extern ffi_status ffi_prep_closure_loc (ffi_closure *,
-                                        ffi_cif *,
-                                        void (*fun)(ffi_cif *, void *, void **, void *),
-                                        void *user_data,
-                                        void *codeloc);
-extern void *ffi_closure_alloc (size_t size, void **code);
-extern void ffi_closure_free (void *);
-
-
 #endif /* __GIREPOSITORY_PRIVATE_H__ */
diff --git a/girepository/girepository.c b/girepository/girepository.c
index 10282c7..c1fa3d3 100644
--- a/girepository/girepository.c
+++ b/girepository/girepository.c
@@ -56,7 +56,7 @@
 
 
 static GIRepository *default_repository = NULL;
-static GSList *search_path = NULL;
+static GSList *typelib_search_path = NULL;
 
 struct _GIRepositoryPrivate
 {
@@ -66,7 +66,7 @@ struct _GIRepositoryPrivate
   GHashTable *info_by_error_domain; /* GQuark -> GIBaseInfo */
 };
 
-G_DEFINE_TYPE (GIRepository, g_irepository, G_TYPE_OBJECT);
+G_DEFINE_TYPE_WITH_CODE (GIRepository, g_irepository, G_TYPE_OBJECT, G_ADD_PRIVATE (GIRepository));
 
 #ifdef G_PLATFORM_WIN32
 
@@ -104,8 +104,7 @@ DllMain (HINSTANCE hinstDLL,
 static void
 g_irepository_init (GIRepository *repository)
 {
-  repository->priv = G_TYPE_INSTANCE_GET_PRIVATE (repository, G_TYPE_IREPOSITORY,
-						  GIRepositoryPrivate);
+  repository->priv = g_irepository_get_instance_private (repository);
   repository->priv->typelibs
     = g_hash_table_new_full (g_str_hash, g_str_equal,
 			     (GDestroyNotify) NULL,
@@ -145,8 +144,6 @@ g_irepository_class_init (GIRepositoryClass *class)
   gobject_class = G_OBJECT_CLASS (class);
 
   gobject_class->finalize = g_irepository_finalize;
-
-  g_type_class_add_private (class, sizeof (GIRepositoryPrivate));
 }
 
 static void
@@ -160,7 +157,7 @@ init_globals (void)
   if (default_repository == NULL)
     default_repository = g_object_new (G_TYPE_IREPOSITORY, NULL);
 
-  if (search_path == NULL)
+  if (typelib_search_path == NULL)
     {
       const char *libdir;
       char *typelib_dir;
@@ -172,7 +169,7 @@ init_globals (void)
        */
       type_lib_path_env = g_getenv ("GI_TYPELIB_PATH");
 
-      search_path = NULL;
+      typelib_search_path = NULL;
       if (type_lib_path_env)
         {
           gchar **custom_dirs;
@@ -183,7 +180,7 @@ init_globals (void)
           d = custom_dirs;
           while (*d)
             {
-              search_path = g_slist_prepend (search_path, *d);
+              typelib_search_path = g_slist_prepend (typelib_search_path, *d);
               d++;
             }
 
@@ -195,9 +192,9 @@ init_globals (void)
 
       typelib_dir = g_build_filename (libdir, "girepository-1.0", NULL);
 
-      search_path = g_slist_prepend (search_path, typelib_dir);
+      typelib_search_path = g_slist_prepend (typelib_search_path, typelib_dir);
 
-      search_path = g_slist_reverse (search_path);
+      typelib_search_path = g_slist_reverse (typelib_search_path);
     }
 
   g_once_init_leave (&initialized, 1);
@@ -216,7 +213,7 @@ void
 g_irepository_prepend_search_path (const char *directory)
 {
   init_globals ();
-  search_path = g_slist_prepend (search_path, g_strdup (directory));
+  typelib_search_path = g_slist_prepend (typelib_search_path, g_strdup (directory));
 }
 
 /**
@@ -231,7 +228,7 @@ g_irepository_prepend_search_path (const char *directory)
 GSList *
 g_irepository_get_search_path (void)
 {
-  return search_path;
+  return typelib_search_path;
 }
 
 static char *
@@ -1362,7 +1359,7 @@ find_namespace_latest (const gchar  *namespace,
       *path_ret = elected->path;
       *version_ret = elected->version;
       g_slice_free (struct NamespaceVersionCandidadate, elected); /* just free the container */
-      g_slist_foreach (candidates, (GFunc) free_candidate, NULL);
+      g_slist_foreach (candidates, (GFunc) (void *) free_candidate, NULL);
       g_slist_free (candidates);
     }
   return result;
@@ -1388,7 +1385,7 @@ g_irepository_enumerate_versions (GIRepository *repository,
   const gchar *loaded_version;
 
   init_globals ();
-  candidates = enumerate_namespace_versions (namespace_, search_path);
+  candidates = enumerate_namespace_versions (namespace_, typelib_search_path);
 
   for (link = candidates; link; link = link->next)
     {
@@ -1555,7 +1552,7 @@ g_irepository_require (GIRepository  *repository,
 
   init_globals ();
   typelib = require_internal (repository, namespace, version, flags,
-			      search_path, error);
+			      typelib_search_path, error);
 
   return typelib;
 }
diff --git a/girepository/girffi.c b/girepository/girffi.c
index 30642fe..86a1305 100644
--- a/girepository/girffi.c
+++ b/girepository/girffi.c
@@ -102,6 +102,8 @@ gi_type_tag_get_ffi_type_internal (GITypeTag   tag,
         return &ffi_type_pointer;
       else
         return &ffi_type_void;
+    default:
+      break;
     }
 
   g_assert_not_reached ();
diff --git a/girepository/girnode.c b/girepository/girnode.c
index 4d439a6..fadfe56 100644
--- a/girepository/girnode.c
+++ b/girepository/girnode.c
@@ -923,6 +923,8 @@ _g_ir_node_can_have_member (GIrNode    *node)
     case G_IR_NODE_FIELD:
     case G_IR_NODE_XREF:
       return FALSE;
+    default:
+      g_assert_not_reached ();
     };
   return FALSE;
 }
@@ -1182,14 +1184,14 @@ get_index_of_member_type (GIrNodeInterface *node,
 
   for (l = node->members; l; l = l->next)
     {
-      GIrNode *node = l->data;
+      GIrNode *member_node = l->data;
 
-      if (node->type != type)
+      if (member_node->type != type)
         continue;
 
       index++;
 
-      if (strcmp (node->name, name) == 0)
+      if (strcmp (member_node->name, name) == 0)
         break;
     }
 
@@ -1543,13 +1545,13 @@ _g_ir_node_build_typelib (GIrNode         *node,
 
 		  case GI_TYPE_TAG_ERROR:
 		    {
-		      ErrorTypeBlob *blob = (ErrorTypeBlob *)&data[*offset2];
+		      ErrorTypeBlob *error_blob = (ErrorTypeBlob *)&data[*offset2];
 
-		      blob->pointer = 1;
-		      blob->reserved = 0;
-		      blob->tag = type->tag;
-		      blob->reserved2 = 0;
-		      blob->n_domains = 0;
+		      error_blob->pointer = 1;
+		      error_blob->reserved = 0;
+		      error_blob->tag = type->tag;
+		      error_blob->reserved2 = 0;
+		      error_blob->n_domains = 0;
 
 		      *offset2 += sizeof (ErrorTypeBlob);
 		    }
@@ -2305,6 +2307,8 @@ _g_ir_node_build_typelib (GIrNode         *node,
 	    blob->size = strlen (constant->value) + 1;
 	    memcpy (&data[blob->offset], constant->value, blob->size);
 	    break;
+	  default:
+	    break;
 	  }
 	*offset2 += ALIGN_VALUE (blob->size, 4);
 
diff --git a/girepository/girparser.c b/girepository/girparser.c
index 4c43e0a..97e62a5 100644
--- a/girepository/girparser.c
+++ b/girepository/girparser.c
@@ -2761,7 +2761,6 @@ start_element_handler (GMarkupParseContext *context,
 		       GError             **error)
 {
   ParseContext *ctx = user_data;
-  gint line_number, char_number;
 
   if (logged_levels & G_LOG_LEVEL_DEBUG)
     {
@@ -3093,10 +3092,13 @@ start_element_handler (GMarkupParseContext *context,
 		      ctx, error))
 	goto out;
       break;
+    default:
+      break;
     }
 
   if (*error == NULL && ctx->state != STATE_PASSTHROUGH)
     {
+      gint line_number, char_number;
       g_markup_parse_context_get_position (context, &line_number, &char_number);
       if (!g_str_has_prefix (element_name, "c:"))
 	g_printerr ("%s:%d:%d: warning: element %s from state %d is unknown, ignoring\n",
@@ -3108,6 +3110,7 @@ start_element_handler (GMarkupParseContext *context,
  out:
   if (*error)
     {
+      gint line_number, char_number;
       g_markup_parse_context_get_position (context, &line_number, &char_number);
 
       g_printerr ("%s:%d:%d: error: %s\n", ctx->file_path, line_number, char_number, (*error)->message);
@@ -3478,8 +3481,8 @@ end_element_handler (GMarkupParseContext *context,
 	  (strcmp ("varargs", element_name) == 0))
 	{
 	  end_type (ctx);
-	  break;
 	}
+      break;
     case STATE_ATTRIBUTE:
       if (strcmp ("attribute", element_name) == 0)
         {
diff --git a/girepository/girwriter.c b/girepository/girwriter.c
index 4bc7fc9..7b25542 100644
--- a/girepository/girwriter.c
+++ b/girepository/girwriter.c
@@ -62,6 +62,9 @@ xml_element_free (XmlElement *elem)
 }
 
 static void
+xml_printf (Xml *xml, const char *fmt, ...) G_GNUC_PRINTF (2, 3);
+
+static void
 xml_printf (Xml *xml, const char *fmt, ...)
 {
   va_list ap;
@@ -237,7 +240,7 @@ write_type_info (const gchar *namespace,
   else if (tag == GI_TYPE_TAG_ARRAY)
     {
       gint length, size;
-      char *name = NULL;
+      const char *name = NULL;
 
       xml_start_element (file, "array");
 
@@ -502,6 +505,8 @@ write_callable_info (const gchar    *namespace,
 	case GI_DIRECTION_INOUT:
 	  xml_printf (file, " direction=\"inout\"");
 	  break;
+	default:
+	  g_assert_not_reached ();
 	}
 
       if (g_arg_info_may_be_null (arg))
@@ -526,6 +531,8 @@ write_callable_info (const gchar    *namespace,
         case GI_SCOPE_TYPE_NOTIFIED:
           xml_printf (file, " scope=\"notified\"");
           break;
+        default:
+          g_assert_not_reached ();
         }
 
       if (g_arg_info_get_closure (arg) >= 0)
@@ -748,7 +755,7 @@ write_constant_value (const gchar *namespace,
       xml_printf (file, "%" G_GUINT64_FORMAT, value->v_uint64);
       break;
     case GI_TYPE_TAG_FLOAT:
-      xml_printf (file, "%f", value->v_float);
+      xml_printf (file, "%f", (double)value->v_float);
       break;
     case GI_TYPE_TAG_DOUBLE:
       xml_printf (file, "%f", value->v_double);
diff --git a/girepository/gitypelib.c b/girepository/gitypelib.c
index d9e924f..dbc7261 100644
--- a/girepository/gitypelib.c
+++ b/girepository/gitypelib.c
@@ -272,7 +272,7 @@ strsplit_iter_init (StrSplitIter  *iter,
 
 static gboolean
 strsplit_iter_next (StrSplitIter  *iter,
-                    char         **out_val)
+                    const char   **out_val)
 {
   const char *s = iter->s;
   const char *next;
@@ -324,7 +324,7 @@ g_typelib_matches_gtype_name_prefix (GITypelib *typelib,
 {
   Header *header = (Header *)typelib->data;
   const char *c_prefix;
-  gchar *prefix;
+  const gchar *prefix;
   gboolean ret = FALSE;
   StrSplitIter split_iter;
   gsize gtype_name_len;
@@ -1500,7 +1500,7 @@ validate_struct_blob (ValidateContext *ctx,
   field_offset = offset + sizeof (StructBlob);
   for (i = 0; i < blob->n_fields; i++)
     {
-      FieldBlob *blob = (FieldBlob*) &typelib->data[field_offset];
+      FieldBlob *field_blob = (FieldBlob*) &typelib->data[field_offset];
 
       if (!validate_field_blob (ctx,
 				field_offset,
@@ -1508,7 +1508,7 @@ validate_struct_blob (ValidateContext *ctx,
 	return FALSE;
 
       field_offset += sizeof (FieldBlob);
-      if (blob->has_embedded_type)
+      if (field_blob->has_embedded_type)
         field_offset += sizeof (CallbackBlob);
     }
 
@@ -1778,14 +1778,14 @@ validate_object_blob (ValidateContext *ctx,
   n_field_callbacks = 0;
   for (i = 0; i < blob->n_fields; i++)
     {
-      FieldBlob *blob = (FieldBlob*) &typelib->data[offset2];
+      FieldBlob *field_blob = (FieldBlob*) &typelib->data[offset2];
 
       if (!validate_field_blob (ctx, offset2, error))
 	return FALSE;
 
       offset2 += sizeof (FieldBlob);
       /* Special case fields which are callbacks. */
-      if (blob->has_embedded_type) {
+      if (field_blob->has_embedded_type) {
         offset2 += sizeof (CallbackBlob);
         n_field_callbacks++;
       }
@@ -2455,7 +2455,7 @@ g_typelib_free (GITypelib *typelib)
       g_free (typelib->data);
   if (typelib->modules)
     {
-      g_list_foreach (typelib->modules, (GFunc) g_module_close, NULL);
+      g_list_foreach (typelib->modules, (GFunc) (void *) g_module_close, NULL);
       g_list_free (typelib->modules);
     }
   g_slice_free (GITypelib, typelib);
diff --git a/girepository/gthash.c b/girepository/gthash.c
index 7440913..16bfb4b 100644
--- a/girepository/gthash.c
+++ b/girepository/gthash.c
@@ -158,7 +158,7 @@ _gi_typelib_hash_builder_pack (GITypelibHashBuilder *builder, guint8* mem, guint
   g_return_if_fail (builder->buildable);
 
   g_assert (len >= builder->packed_size);
-  g_assert ((((unsigned long)mem) & 0x3) == 0);
+  g_assert ((((size_t)mem) & 0x3) == 0);
 
   memset (mem, 0, len);
 
@@ -177,7 +177,7 @@ _gi_typelib_hash_builder_pack (GITypelibHashBuilder *builder, guint8* mem, guint
       guint32 hashv;
 
       hashv = cmph_search_packed (packed_mem, str, strlen (str));
-      g_assert (hashv >= 0 && hashv < num_elts);
+      g_assert (hashv < num_elts);
       table[hashv] = strval;
     }
 }
@@ -202,7 +202,7 @@ _gi_typelib_hash_search (guint8* memory, const char *str, guint n_entries)
   guint32 dirmap_offset;
   guint32 offset;
 
-  g_assert ((((unsigned long)memory) & 0x3) == 0);
+  g_assert ((((size_t)memory) & 0x3) == 0);
   mph = ((guint32*)memory)+1;
 
   offset = cmph_search_packed (mph, str, strlen (str));
diff --git a/girepository/meson.build b/girepository/meson.build
new file mode 100644
index 0000000..6a8c5b5
--- /dev/null
+++ b/girepository/meson.build
@@ -0,0 +1,162 @@
+subdir('cmph')
+
+girepo_gthash_lib = static_library('girepository-gthash',
+  sources: 'gthash.c',
+  include_directories : configinc,
+  c_args: gi_hidden_visibility_cflags,
+  dependencies: [
+    cmph_dep,
+    glib_dep,
+    gmodule_dep,
+  ],
+)
+
+girepo_gthash_dep = declare_dependency(
+  link_with: girepo_gthash_lib,
+  dependencies: [glib_dep, gmodule_dep],
+  include_directories: include_directories('.'),
+)
+
+girepo_internals_lib = static_library('girepository-internals',
+  sources: [
+    'girmodule.c',
+    'girnode.c',
+    'giroffsets.c',
+    'girparser.c',
+    'girwriter.c',
+  ],
+  c_args: gi_hidden_visibility_cflags,
+  include_directories : configinc,
+  dependencies: [girepo_gthash_dep, libffi_dep],
+)
+
+girepo_internals_dep = declare_dependency(
+  link_with: girepo_internals_lib,
+  dependencies: libffi_dep,
+  include_directories: include_directories('.'),
+)
+
+girepo_headers = [
+  'giarginfo.h',
+  'gibaseinfo.h',
+  'gicallableinfo.h',
+  'giconstantinfo.h',
+  'gienuminfo.h',
+  'gifieldinfo.h',
+  'gifunctioninfo.h',
+  'giinterfaceinfo.h',
+  'giobjectinfo.h',
+  'gipropertyinfo.h',
+  'giregisteredtypeinfo.h',
+  'girepository.h',
+  'girffi.h',
+  'gisignalinfo.h',
+  'gistructinfo.h',
+  'gitypeinfo.h',
+  'gitypelib.h',
+  'gitypes.h',
+  'giunioninfo.h',
+  'giversionmacros.h',
+  'givfuncinfo.h',
+]
+
+girepo_sources = [
+  'gdump.c',
+  'giarginfo.c',
+  'gibaseinfo.c',
+  'gicallableinfo.c',
+  'giconstantinfo.c',
+  'gienuminfo.c',
+  'gifieldinfo.c',
+  'gifunctioninfo.c',
+  'ginvoke.c',
+  'giinterfaceinfo.c',
+  'giobjectinfo.c',
+  'gipropertyinfo.c',
+  'giregisteredtypeinfo.c',
+  'girepository.c',
+  'girffi.c',
+  'gisignalinfo.c',
+  'gistructinfo.c',
+  'gitypeinfo.c',
+  'gitypelib.c',
+  'giunioninfo.c',
+  'givfuncinfo.c',
+]
+
+# Used in gir/meson.build
+girepo_gir_sources = files(
+  'giarginfo.c',
+  'gibaseinfo.c',
+  'gicallableinfo.c',
+  'giconstantinfo.c',
+  'gienuminfo.c',
+  'gifieldinfo.c',
+  'gifunctioninfo.c',
+  'giinterfaceinfo.c',
+  'giobjectinfo.c',
+  'gipropertyinfo.c',
+  'giregisteredtypeinfo.c',
+  'girepository.c',
+  'gisignalinfo.c',
+  'gistructinfo.c',
+  'gitypeinfo.c',
+  'giunioninfo.c',
+  'givfuncinfo.c',
+  'giarginfo.h',
+  'gibaseinfo.h',
+  'gicallableinfo.h',
+  'giconstantinfo.h',
+  'gienuminfo.h',
+  'gifieldinfo.h',
+  'gifunctioninfo.h',
+  'giinterfaceinfo.h',
+  'giobjectinfo.h',
+  'gipropertyinfo.h',
+  'giregisteredtypeinfo.h',
+  'girepository.h',
+  'gisignalinfo.h',
+  'gistructinfo.h',
+  'gitypeinfo.h',
+  'gitypelib.h',
+  'gitypes.h',
+  'giunioninfo.h',
+  'givfuncinfo.h',
+)
+
+install_headers(girepo_headers, subdir: 'gobject-introspection-1.0')
+
+girepo_lib = shared_library('girepository-1.0',
+  sources: girepo_sources,
+  include_directories : configinc,
+  c_args: gi_hidden_visibility_cflags + ['-DG_IREPOSITORY_COMPILATION'],
+  dependencies: [glib_dep, gobject_dep, gmodule_dep,
+                 gio_dep, girepo_internals_dep],
+  version: '1.0.0',
+  install: true,
+)
+
+# Copy to builddir for use with giscanner/dumper.py when running uninstalled
+configure_file(input : 'gdump.c',
+  output : 'gdump.c',
+  configuration : configuration_data(),
+  install_dir: join_paths(get_option('datadir'), 'gobject-introspection-1.0'),
+  install : true,
+)
+
+girepo_dep = declare_dependency(
+  link_with: girepo_lib,
+  dependencies: [glib_dep, gobject_dep, gio_dep, gmodule_dep],
+  include_directories: include_directories('.'),
+)
+
+gthash_test = executable('gthash-test', 'gthash-test.c',
+  dependencies: girepo_gthash_dep,
+)
+
+test('gthash-test', gthash_test)
+
+if giounix_dep.found()
+  executable('gi-dump-types', 'gi-dump-types.c',
+    dependencies: [girepo_dep, giounix_dep])
+endif
diff --git a/giscanner/__init__.py b/giscanner/__init__.py
index 139b518..391d36b 100644
--- a/giscanner/__init__.py
+++ b/giscanner/__init__.py
@@ -22,3 +22,7 @@ import os
 builddir = os.environ.get('UNINSTALLED_INTROSPECTION_BUILDDIR')
 if builddir is not None:
     __path__.append(os.path.join(builddir, 'giscanner'))
+try:
+    from ._version import __version__
+except ImportError:
+    __version__ = '0.0.0'
diff --git a/giscanner/_version.py b/giscanner/_version.py
new file mode 100644
index 0000000..11691f1
--- /dev/null
+++ b/giscanner/_version.py
@@ -0,0 +1 @@
+__version__ = '1.57.2'
diff --git a/giscanner/_version.py.in b/giscanner/_version.py.in
new file mode 100644
index 0000000..4b56f5b
--- /dev/null
+++ b/giscanner/_version.py.in
@@ -0,0 +1 @@
+__version__ = '@VERSION@'
diff --git a/giscanner/annotationmain.py b/giscanner/annotationmain.py
index b82ff81..c7be4f7 100644
--- a/giscanner/annotationmain.py
+++ b/giscanner/annotationmain.py
@@ -28,6 +28,7 @@ import optparse
 import codecs
 from contextlib import contextmanager
 
+import giscanner
 from giscanner import message
 from giscanner.annotationparser import GtkDocCommentBlockParser, GtkDocCommentBlockWriter
 from giscanner.scannermain import (get_preprocessor_option_group,
@@ -54,7 +55,8 @@ def encode_stdout(encoding):
 
 
 def annotation_main(args):
-    parser = optparse.OptionParser('%prog [options] sources')
+    parser = optparse.OptionParser('%prog [options] sources',
+                                   version='%prog ' + giscanner.__version__)
 
     group = optparse.OptionGroup(parser, "Tool modes, one is required")
     group.add_option("-e", "--extract",
diff --git a/giscanner/annotationparser.py b/giscanner/annotationparser.py
index 31a6292..1b82b35 100644
--- a/giscanner/annotationparser.py
+++ b/giscanner/annotationparser.py
@@ -116,10 +116,9 @@ import os
 import re
 import operator
 
-from collections import namedtuple
 from operator import ne, gt, lt
+from collections import namedtuple, Counter, OrderedDict
 
-from .collections import Counter, OrderedDict
 from .message import Position, warn, error
 
 
@@ -519,15 +518,15 @@ class GtkDocAnnotations(OrderedDict):
 
     __slots__ = ('position')
 
-    def __init__(self, position=None, sequence=None):
-        OrderedDict.__init__(self, sequence)
-
+    def __init__(self, *args, **kwargs):
         #: A :class:`giscanner.message.Position` instance specifying the location of the
         #: annotations in the source file or :const:`None`.
-        self.position = position
+        self.position = kwargs.pop('position', None)
+
+        OrderedDict.__init__(self, *args, **kwargs)
 
     def __copy__(self):
-        return GtkDocAnnotations(self.position, self)
+        return GtkDocAnnotations(self, position=self.position)
 
 
 class GtkDocAnnotatable(object):
@@ -1872,7 +1871,7 @@ class GtkDocCommentBlockParser(object):
 
         if parse_options:
             if annotations is None:
-                parsed_annotations = GtkDocAnnotations(position)
+                parsed_annotations = GtkDocAnnotations(position=position)
             else:
                 parsed_annotations = annotations.copy()
         else:
diff --git a/giscanner/ast.py b/giscanner/ast.py
index 7a2b5b1..a1a57cc 100644
--- a/giscanner/ast.py
+++ b/giscanner/ast.py
@@ -27,10 +27,10 @@ from __future__ import unicode_literals
 import copy
 import operator
 from itertools import chain
+from collections import OrderedDict
 
 from . import message
 
-from .collections import OrderedDict
 from .message import Position
 from .utils import to_underscores
 
@@ -109,7 +109,9 @@ in contrast to the other create_type() functions."""
                        ctype=fundamental.ctype)
         if gtype_name == 'GHashTable':
             return Map(TYPE_ANY, TYPE_ANY, gtype_name=gtype_name)
-        elif gtype_name in ('GArray', 'GPtrArray', 'GByteArray'):
+        elif gtype_name == 'GByteArray':
+            return Array('GLib.ByteArray', TYPE_UINT8, gtype_name=gtype_name)
+        elif gtype_name in ('GArray', 'GPtrArray'):
             return Array('GLib.' + gtype_name[1:], TYPE_ANY,
                          gtype_name=gtype_name)
         elif gtype_name == 'GStrv':
@@ -307,8 +309,6 @@ type_names['int32_t'] = TYPE_INT32
 type_names['uint32_t'] = TYPE_UINT32
 type_names['int64_t'] = TYPE_INT64
 type_names['uint64_t'] = TYPE_UINT64
-# C99 stdbool
-type_names['bool'] = TYPE_BOOLEAN
 
 # A few additional GLib type aliases
 type_names['guchar'] = TYPE_UINT8
diff --git a/giscanner/ccompiler.py b/giscanner/ccompiler.py
index d10327c..b6b45e6 100644
--- a/giscanner/ccompiler.py
+++ b/giscanner/ccompiler.py
@@ -119,7 +119,7 @@ class CCompiler(object):
         if os.name == 'nt':
             runtime_path_envvar = ['LIB', 'PATH']
         else:
-            runtime_path_envvar = ['LD_LIBRARY_PATH', 'DYLD_LIBRARY_PATH']
+            runtime_path_envvar = ['LD_LIBRARY_PATH', 'DYLD_FALLBACK_LIBRARY_PATH']
             # Search the current directory first
             # (This flag is not supported nor needed for Visual C++)
             args.append('-L.')
@@ -280,8 +280,6 @@ class CCompiler(object):
         else:
             libtool = utils.get_libtool_command(options)
             if libtool:
-                if os.name == 'nt':
-                    args.append(utils.which(os.environ.get('SHELL', 'sh.exe')))
                 args.extend(libtool)
                 args.append('--mode=execute')
             args.extend([os.environ.get('DLLTOOL', 'dlltool.exe'), '--identify'])
@@ -356,10 +354,7 @@ class CCompiler(object):
         return shlibs
 
     def check_is_msvc(self):
-        if isinstance(self.compiler, MSVCCompiler):
-            return True
-        else:
-            return False
+        return isinstance(self.compiler, MSVCCompiler)
 
     # Private APIs
     def _set_cpp_options(self, options):
diff --git a/giscanner/collections/__init__.py b/giscanner/collections/__init__.py
deleted file mode 100644
index 6cfcc51..0000000
--- a/giscanner/collections/__init__.py
+++ /dev/null
@@ -1,27 +0,0 @@
-# -*- Mode: Python -*-
-# GObject-Introspection - a framework for introspecting GObject libraries
-# Copyright (C) 2013 Dieter Verfaillie <dieterv@optionexplicit.be>
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
-#
-
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
-
-from .counter import Counter
-from .ordereddict import OrderedDict
diff --git a/giscanner/collections/counter.py b/giscanner/collections/counter.py
deleted file mode 100644
index b337ab3..0000000
--- a/giscanner/collections/counter.py
+++ /dev/null
@@ -1,305 +0,0 @@
-# -*- Mode: Python -*-
-# GObject-Introspection - a framework for introspecting GObject libraries
-# Copyright (C) 2013 Dieter Verfaillie <dieterv@optionexplicit.be>
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
-#
-
-
-from __future__ import absolute_import
-
-
-try:
-    from collections import Counter
-except ImportError:
-    # collections.Counter for Python 2.6, backported from
-    # http://hg.python.org/cpython/file/d047928ae3f6/Lib/collections/__init__.py#l402
-
-    from operator import itemgetter
-    from heapq import nlargest
-    from itertools import repeat, ifilter
-
-    class Counter(dict):
-        '''Dict subclass for counting hashable items.  Sometimes called a bag
-        or multiset.  Elements are stored as dictionary keys and their counts
-        are stored as dictionary values.
-
-        >>> c = Counter('abcdeabcdabcaba')  # count elements from a string
-
-        >>> c.most_common(3)                # three most common elements
-        [('a', 5), ('b', 4), ('c', 3)]
-        >>> sorted(c)                       # list all unique elements
-        ['a', 'b', 'c', 'd', 'e']
-        >>> ''.join(sorted(c.elements()))   # list elements with repetitions
-        'aaaaabbbbcccdde'
-        >>> sum(c.values())                 # total of all counts
-        15
-
-        >>> c['a']                          # count of letter 'a'
-        5
-        >>> for elem in 'shazam':           # update counts from an iterable
-        ...     c[elem] += 1                # by adding 1 to each element's count
-        >>> c['a']                          # now there are seven 'a'
-        7
-        >>> del c['b']                      # remove all 'b'
-        >>> c['b']                          # now there are zero 'b'
-        0
-
-        >>> d = Counter('simsalabim')       # make another counter
-        >>> c.update(d)                     # add in the second counter
-        >>> c['a']                          # now there are nine 'a'
-        9
-
-        >>> c.clear()                       # empty the counter
-        >>> c
-        Counter()
-
-        Note:  If a count is set to zero or reduced to zero, it will remain
-        in the counter until the entry is deleted or the counter is cleared:
-
-        >>> c = Counter('aaabbc')
-        >>> c['b'] -= 2                     # reduce the count of 'b' by two
-        >>> c.most_common()                 # 'b' is still in, but its count is zero
-        [('a', 3), ('c', 1), ('b', 0)]
-
-        '''
-        # References:
-        #   http://en.wikipedia.org/wiki/Multiset
-        #   http://www.gnu.org/software/smalltalk/manual-base/html_node/Bag.html
-        #   http://www.demo2s.com/Tutorial/Cpp/0380__set-multiset/Catalog0380__set-multiset.htm
-        #   http://code.activestate.com/recipes/259174/
-        #   Knuth, TAOCP Vol. II section 4.6.3
-
-        def __init__(self, iterable=None, **kwds):
-            '''Create a new, empty Counter object.  And if given, count elements
-            from an input iterable.  Or, initialize the count from another mapping
-            of elements to their counts.
-
-            >>> c = Counter()                           # a new, empty counter
-            >>> c = Counter('gallahad')                 # a new counter from an iterable
-            >>> c = Counter({'a': 4, 'b': 2})           # a new counter from a mapping
-            >>> c = Counter(a=4, b=2)                   # a new counter from keyword args
-
-            '''
-            self.update(iterable, **kwds)
-
-        def __missing__(self, key):
-            'The count of elements not in the Counter is zero.'
-            # Needed so that self[missing_item] does not raise KeyError
-            return 0
-
-        def most_common(self, n=None):
-            '''List the n most common elements and their counts from the most
-            common to the least.  If n is None, then list all element counts.
-
-            >>> Counter('abcdeabcdabcaba').most_common(3)
-            [('a', 5), ('b', 4), ('c', 3)]
-
-            '''
-            # Emulate Bag.sortedByCount from Smalltalk
-            if n is None:
-                return sorted(self.iteritems(), key=itemgetter(1), reverse=True)
-            return nlargest(n, self.iteritems(), key=itemgetter(1))
-
-        def elements(self):
-            '''Iterator over elements repeating each as many times as its count.
-
-            >>> c = Counter('ABCABC')
-            >>> sorted(c.elements())
-            ['A', 'A', 'B', 'B', 'C', 'C']
-
-            # Knuth's example for prime factors of 1836:  2**2 * 3**3 * 17**1
-            >>> prime_factors = Counter({2: 2, 3: 3, 17: 1})
-            >>> product = 1
-            >>> for factor in prime_factors.elements():     # loop over factors
-            ...     product *= factor                       # and multiply them
-            >>> product
-            1836
-
-            Note, if an element's count has been set to zero or is a negative
-            number, elements() will ignore it.
-
-            '''
-            # Emulate Bag.do from Smalltalk and Multiset.begin from C++.
-            for elem, count in self.iteritems():
-                for _ in repeat(None, count):
-                    yield elem
-
-        # Override dict methods where necessary
-
-        @classmethod
-        def fromkeys(cls, iterable, v=None):
-            # There is no equivalent method for counters because setting v=1
-            # means that no element can have a count greater than one.
-            raise NotImplementedError(
-                'Counter.fromkeys() is undefined.  Use Counter(iterable) instead.')
-
-        def update(self, iterable=None, **kwds):
-            '''Like dict.update() but add counts instead of replacing them.
-
-            Source can be an iterable, a dictionary, or another Counter instance.
-
-            >>> c = Counter('which')
-            >>> c.update('witch')           # add elements from another iterable
-            >>> d = Counter('watch')
-            >>> c.update(d)                 # add elements from another counter
-            >>> c['h']                      # four 'h' in which, witch, and watch
-            4
-
-            '''
-            # The regular dict.update() operation makes no sense here because the
-            # replace behavior results in the some of original untouched counts
-            # being mixed-in with all of the other counts for a mismash that
-            # doesn't have a straight-forward interpretation in most counting
-            # contexts.  Instead, we implement straight-addition.  Both the inputs
-            # and outputs are allowed to contain zero and negative counts.
-
-            if iterable is not None:
-                if hasattr(iterable, 'iteritems'):
-                    if self:
-                        self_get = self.get
-                        for elem, count in iterable.iteritems():
-                            self[elem] = self_get(elem, 0) + count
-                    else:
-                        dict.update(self, iterable)  # fast path when counter is empty
-                else:
-                    self_get = self.get
-                    for elem in iterable:
-                        self[elem] = self_get(elem, 0) + 1
-            if kwds:
-                self.update(kwds)
-
-        def subtract(self, iterable=None, **kwds):
-            '''Like dict.update() but subtracts counts instead of replacing them.
-            Counts can be reduced below zero.  Both the inputs and outputs are
-            allowed to contain zero and negative counts.
-
-            Source can be an iterable, a dictionary, or another Counter instance.
-
-            >>> c = Counter('which')
-            >>> c.subtract('witch')             # subtract elements from another iterable
-            >>> c.subtract(Counter('watch'))    # subtract elements from another counter
-            >>> c['h']                          # 2 in which, minus 1 in witch, minus 1 in watch
-            0
-            >>> c['w']                          # 1 in which, minus 1 in witch, minus 1 in watch
-            -1
-
-            '''
-            if hasattr(iterable, 'iteritems'):
-                for elem, count in iterable.iteritems():
-                    self[elem] -= count
-            else:
-                for elem in iterable:
-                    self[elem] -= 1
-
-        def copy(self):
-            'Return a shallow copy.'
-            return self.__class__(self)
-
-        def __reduce__(self):
-            return self.__class__, (dict(self), )
-
-        def __delitem__(self, elem):
-            'Like dict.__delitem__() but does not raise KeyError for missing values.'
-            if elem in self:
-                dict.__delitem__(self, elem)
-
-        def __repr__(self):
-            if not self:
-                return '%s()' % self.__class__.__name__
-            items = ', '.join(map('%r: %r'.__mod__, self.most_common()))
-            return '%s({%s})' % (self.__class__.__name__, items)
-
-        # Multiset-style mathematical operations discussed in:
-        #       Knuth TAOCP Volume II section 4.6.3 exercise 19
-        #       and at http://en.wikipedia.org/wiki/Multiset
-        #
-        # Outputs guaranteed to only include positive counts.
-        #
-        # To strip negative and zero counts, add-in an empty counter:
-        #       c += Counter()
-
-        def __add__(self, other):
-            '''Add counts from two counters.
-
-            >>> Counter('abbb') + Counter('bcc')
-            Counter({'b': 4, 'c': 2, 'a': 1})
-
-            '''
-            if not isinstance(other, Counter):
-                return NotImplemented
-            result = Counter()
-            for elem in set(self) | set(other):
-                newcount = self[elem] + other[elem]
-                if newcount > 0:
-                    result[elem] = newcount
-            return result
-
-        def __sub__(self, other):
-            ''' Subtract count, but keep only results with positive counts.
-
-            >>> Counter('abbbc') - Counter('bccd')
-            Counter({'b': 2, 'a': 1})
-
-            '''
-            if not isinstance(other, Counter):
-                return NotImplemented
-            result = Counter()
-            for elem in set(self) | set(other):
-                newcount = self[elem] - other[elem]
-                if newcount > 0:
-                    result[elem] = newcount
-            return result
-
-        def __or__(self, other):
-            '''Union is the maximum of value in either of the input counters.
-
-            >>> Counter('abbb') | Counter('bcc')
-            Counter({'b': 3, 'c': 2, 'a': 1})
-
-            '''
-            if not isinstance(other, Counter):
-                return NotImplemented
-            _max = max
-            result = Counter()
-            for elem in set(self) | set(other):
-                newcount = _max(self[elem], other[elem])
-                if newcount > 0:
-                    result[elem] = newcount
-            return result
-
-        def __and__(self, other):
-            ''' Intersection is the minimum of corresponding counts.
-
-            >>> Counter('abbb') & Counter('bcc')
-            Counter({'b': 1})
-
-            '''
-            if not isinstance(other, Counter):
-                return NotImplemented
-            _min = min
-            result = Counter()
-            if len(self) < len(other):
-                self, other = other, self
-            for elem in ifilter(self.__contains__, other):
-                newcount = _min(self[elem], other[elem])
-                if newcount > 0:
-                    result[elem] = newcount
-            return result
-
-    if __name__ == '__main__':
-        import doctest
-        print(doctest.testmod())
diff --git a/giscanner/collections/ordereddict.py b/giscanner/collections/ordereddict.py
deleted file mode 100644
index b2466dc..0000000
--- a/giscanner/collections/ordereddict.py
+++ /dev/null
@@ -1,132 +0,0 @@
-# -*- Mode: Python -*-
-# GObject-Introspection - a framework for introspecting GObject libraries
-# Copyright (C) 2008  Johan Dahlin
-# Copyright (C) 2013 Dieter Verfaillie <dieterv@optionexplicit.be>
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
-
-
-# Borrowed from:
-# http://hg.sqlalchemy.org/sqlalchemy/raw-file/77e2264283d4/lib/sqlalchemy/util/_collections.py
-# http://hg.sqlalchemy.org/sqlalchemy/raw-file/77e2264283d4/AUTHORS
-#
-# util/_collections.py
-# Copyright (C) 2005-2012 the SQLAlchemy authors and contributors <see AUTHORS file>
-#
-# This module is part of SQLAlchemy and is released under
-# the MIT License: http://www.opensource.org/licenses/mit-license.php
-
-
-import sys
-
-
-py2k = sys.version_info < (3, 0)
-
-
-class OrderedDict(dict):
-    """A dict that returns keys/values/items in the order they were added."""
-
-    __slots__ = '_list',
-
-    def __reduce__(self):
-        return OrderedDict, (self.items(),)
-
-    def __init__(self, ____sequence=None, **kwargs):
-        self._list = []
-        if ____sequence is None:
-            if kwargs:
-                self.update(**kwargs)
-        else:
-            self.update(____sequence, **kwargs)
-
-    def clear(self):
-        self._list = []
-        dict.clear(self)
-
-    def copy(self):
-        return self.__copy__()
-
-    def __copy__(self):
-        return OrderedDict(self)
-
-    def sort(self, *arg, **kw):
-        self._list.sort(*arg, **kw)
-
-    def update(self, ____sequence=None, **kwargs):
-        if ____sequence is not None:
-            if hasattr(____sequence, 'keys'):
-                for key in ____sequence.keys():
-                    self.__setitem__(key, ____sequence[key])
-            else:
-                for key, value in ____sequence:
-                    self[key] = value
-        if kwargs:
-            self.update(kwargs)
-
-    def setdefault(self, key, value):
-        if key not in self:
-            self.__setitem__(key, value)
-            return value
-        else:
-            return self.__getitem__(key)
-
-    def __iter__(self):
-        return iter(self._list)
-
-    def keys(self):
-        return list(self)
-
-    def values(self):
-        return [self[key] for key in self._list]
-
-    def items(self):
-        return [(key, self[key]) for key in self._list]
-
-    if py2k:
-        def itervalues(self):
-            return iter(self.values())
-
-        def iterkeys(self):
-            return iter(self)
-
-        def iteritems(self):
-            return iter(self.items())
-
-    def __setitem__(self, key, object):
-        if key not in self:
-            try:
-                self._list.append(key)
-            except AttributeError:
-                # work around Python pickle loads() with
-                # dict subclass (seems to ignore __setstate__?)
-                self._list = [key]
-        dict.__setitem__(self, key, object)
-
-    def __delitem__(self, key):
-        dict.__delitem__(self, key)
-        self._list.remove(key)
-
-    def pop(self, key, *default):
-        present = key in self
-        value = dict.pop(self, key, *default)
-        if present:
-            self._list.remove(key)
-        return value
-
-    def popitem(self):
-        item = dict.popitem(self)
-        self._list.remove(item[0])
-        return item
diff --git a/giscanner/docmain.py b/giscanner/docmain.py
index 3bea542..966b33c 100644
--- a/giscanner/docmain.py
+++ b/giscanner/docmain.py
@@ -24,16 +24,21 @@ from __future__ import print_function
 from __future__ import unicode_literals
 
 import os
+import sys
 import argparse
 
+import giscanner
 from .docwriter import DocWriter
 from .sectionparser import generate_sections_file, write_sections_file
 from .transformer import Transformer
 
+FORMATS = ('mallard', 'sections')
+
 
 def doc_main(args):
     parser = argparse.ArgumentParser()
-
+    parser.add_argument('--version', action='version',
+                      version='%(prog)s ' + giscanner.__version__)
     parser.add_argument("girfile")
     parser.add_argument("-o", "--output",
                       action="store", dest="output",
@@ -42,12 +47,16 @@ def doc_main(args):
                       action="store", dest="language",
                       default="c",
                       help="Output language")
+    parser.add_argument("-f", "--format",
+                        action="store", dest="format",
+                        choices=FORMATS, default=FORMATS[0],
+                        help="Output format")
     parser.add_argument("-I", "--add-include-path",
                       action="append", dest="include_paths", default=[],
                       help="include paths for other GIR files")
     parser.add_argument("-s", "--write-sections-file",
-                      action="store_true", dest="write_sections",
-                      help="Generate and write out a sections file")
+                        action="store_const", dest="format", const="sections",
+                        help="Backwards-compatible equivalent to -f sections")
 
     args = parser.parse_args(args[1:])
     if not args.output:
@@ -62,13 +71,13 @@ def doc_main(args):
     extra_include_dirs.extend(args.include_paths)
     transformer = Transformer.parse_from_gir(args.girfile, extra_include_dirs)
 
-    if args.write_sections:
+    if args.format == 'sections':
         sections_file = generate_sections_file(transformer)
 
         with open(args.output, 'w') as fp:
             write_sections_file(fp, sections_file)
     else:
-        writer = DocWriter(transformer, args.language)
+        writer = DocWriter(transformer, args.language, args.format)
         writer.write(args.output)
 
     return 0
diff --git a/giscanner/doctemplates/C/callback.tmpl b/giscanner/doctemplates/mallard/C/callback.tmpl
similarity index 100%
rename from giscanner/doctemplates/C/callback.tmpl
rename to giscanner/doctemplates/mallard/C/callback.tmpl
diff --git a/giscanner/doctemplates/C/class.tmpl b/giscanner/doctemplates/mallard/C/class.tmpl
similarity index 100%
rename from giscanner/doctemplates/C/class.tmpl
rename to giscanner/doctemplates/mallard/C/class.tmpl
diff --git a/giscanner/doctemplates/Python/constructor.tmpl b/giscanner/doctemplates/mallard/C/constructor.tmpl
similarity index 100%
rename from giscanner/doctemplates/Python/constructor.tmpl
rename to giscanner/doctemplates/mallard/C/constructor.tmpl
diff --git a/giscanner/doctemplates/Python/default.tmpl b/giscanner/doctemplates/mallard/C/default.tmpl
similarity index 100%
rename from giscanner/doctemplates/Python/default.tmpl
rename to giscanner/doctemplates/mallard/C/default.tmpl
diff --git a/giscanner/doctemplates/C/enum.tmpl b/giscanner/doctemplates/mallard/C/enum.tmpl
similarity index 100%
rename from giscanner/doctemplates/C/enum.tmpl
rename to giscanner/doctemplates/mallard/C/enum.tmpl
diff --git a/giscanner/doctemplates/Python/field.tmpl b/giscanner/doctemplates/mallard/C/field.tmpl
similarity index 100%
rename from giscanner/doctemplates/Python/field.tmpl
rename to giscanner/doctemplates/mallard/C/field.tmpl
diff --git a/giscanner/doctemplates/C/function.tmpl b/giscanner/doctemplates/mallard/C/function.tmpl
similarity index 100%
rename from giscanner/doctemplates/C/function.tmpl
rename to giscanner/doctemplates/mallard/C/function.tmpl
diff --git a/giscanner/doctemplates/C/interface.tmpl b/giscanner/doctemplates/mallard/C/interface.tmpl
similarity index 100%
rename from giscanner/doctemplates/C/interface.tmpl
rename to giscanner/doctemplates/mallard/C/interface.tmpl
diff --git a/giscanner/doctemplates/Python/method.tmpl b/giscanner/doctemplates/mallard/C/method.tmpl
similarity index 100%
rename from giscanner/doctemplates/Python/method.tmpl
rename to giscanner/doctemplates/mallard/C/method.tmpl
diff --git a/giscanner/doctemplates/C/namespace.tmpl b/giscanner/doctemplates/mallard/C/namespace.tmpl
similarity index 100%
rename from giscanner/doctemplates/C/namespace.tmpl
rename to giscanner/doctemplates/mallard/C/namespace.tmpl
diff --git a/giscanner/doctemplates/C/property.tmpl b/giscanner/doctemplates/mallard/C/property.tmpl
similarity index 100%
rename from giscanner/doctemplates/C/property.tmpl
rename to giscanner/doctemplates/mallard/C/property.tmpl
diff --git a/giscanner/doctemplates/C/record.tmpl b/giscanner/doctemplates/mallard/C/record.tmpl
similarity index 100%
rename from giscanner/doctemplates/C/record.tmpl
rename to giscanner/doctemplates/mallard/C/record.tmpl
diff --git a/giscanner/doctemplates/C/signal.tmpl b/giscanner/doctemplates/mallard/C/signal.tmpl
similarity index 100%
rename from giscanner/doctemplates/C/signal.tmpl
rename to giscanner/doctemplates/mallard/C/signal.tmpl
diff --git a/giscanner/doctemplates/C/vfunc.tmpl b/giscanner/doctemplates/mallard/C/vfunc.tmpl
similarity index 100%
rename from giscanner/doctemplates/C/vfunc.tmpl
rename to giscanner/doctemplates/mallard/C/vfunc.tmpl
diff --git a/giscanner/doctemplates/Gjs/callback.tmpl b/giscanner/doctemplates/mallard/Gjs/callback.tmpl
similarity index 100%
rename from giscanner/doctemplates/Gjs/callback.tmpl
rename to giscanner/doctemplates/mallard/Gjs/callback.tmpl
diff --git a/giscanner/doctemplates/Gjs/class.tmpl b/giscanner/doctemplates/mallard/Gjs/class.tmpl
similarity index 100%
rename from giscanner/doctemplates/Gjs/class.tmpl
rename to giscanner/doctemplates/mallard/Gjs/class.tmpl
diff --git a/giscanner/doctemplates/Gjs/constructor.tmpl b/giscanner/doctemplates/mallard/Gjs/constructor.tmpl
similarity index 100%
rename from giscanner/doctemplates/Gjs/constructor.tmpl
rename to giscanner/doctemplates/mallard/Gjs/constructor.tmpl
diff --git a/giscanner/doctemplates/Gjs/default.tmpl b/giscanner/doctemplates/mallard/Gjs/default.tmpl
similarity index 100%
rename from giscanner/doctemplates/Gjs/default.tmpl
rename to giscanner/doctemplates/mallard/Gjs/default.tmpl
diff --git a/giscanner/doctemplates/Gjs/enum.tmpl b/giscanner/doctemplates/mallard/Gjs/enum.tmpl
similarity index 100%
rename from giscanner/doctemplates/Gjs/enum.tmpl
rename to giscanner/doctemplates/mallard/Gjs/enum.tmpl
diff --git a/giscanner/doctemplates/Gjs/field.tmpl b/giscanner/doctemplates/mallard/Gjs/field.tmpl
similarity index 100%
rename from giscanner/doctemplates/Gjs/field.tmpl
rename to giscanner/doctemplates/mallard/Gjs/field.tmpl
diff --git a/giscanner/doctemplates/Gjs/function.tmpl b/giscanner/doctemplates/mallard/Gjs/function.tmpl
similarity index 100%
rename from giscanner/doctemplates/Gjs/function.tmpl
rename to giscanner/doctemplates/mallard/Gjs/function.tmpl
diff --git a/giscanner/doctemplates/Gjs/interface.tmpl b/giscanner/doctemplates/mallard/Gjs/interface.tmpl
similarity index 100%
rename from giscanner/doctemplates/Gjs/interface.tmpl
rename to giscanner/doctemplates/mallard/Gjs/interface.tmpl
diff --git a/giscanner/doctemplates/Gjs/method.tmpl b/giscanner/doctemplates/mallard/Gjs/method.tmpl
similarity index 100%
rename from giscanner/doctemplates/Gjs/method.tmpl
rename to giscanner/doctemplates/mallard/Gjs/method.tmpl
diff --git a/giscanner/doctemplates/Python/namespace.tmpl b/giscanner/doctemplates/mallard/Gjs/namespace.tmpl
similarity index 100%
rename from giscanner/doctemplates/Python/namespace.tmpl
rename to giscanner/doctemplates/mallard/Gjs/namespace.tmpl
diff --git a/giscanner/doctemplates/Gjs/property.tmpl b/giscanner/doctemplates/mallard/Gjs/property.tmpl
similarity index 100%
rename from giscanner/doctemplates/Gjs/property.tmpl
rename to giscanner/doctemplates/mallard/Gjs/property.tmpl
diff --git a/giscanner/doctemplates/Python/record.tmpl b/giscanner/doctemplates/mallard/Gjs/record.tmpl
similarity index 100%
rename from giscanner/doctemplates/Python/record.tmpl
rename to giscanner/doctemplates/mallard/Gjs/record.tmpl
diff --git a/giscanner/doctemplates/Gjs/signal.tmpl b/giscanner/doctemplates/mallard/Gjs/signal.tmpl
similarity index 100%
rename from giscanner/doctemplates/Gjs/signal.tmpl
rename to giscanner/doctemplates/mallard/Gjs/signal.tmpl
diff --git a/giscanner/doctemplates/Gjs/vfunc.tmpl b/giscanner/doctemplates/mallard/Gjs/vfunc.tmpl
similarity index 100%
rename from giscanner/doctemplates/Gjs/vfunc.tmpl
rename to giscanner/doctemplates/mallard/Gjs/vfunc.tmpl
diff --git a/giscanner/doctemplates/Python/callback.tmpl b/giscanner/doctemplates/mallard/Python/callback.tmpl
similarity index 100%
rename from giscanner/doctemplates/Python/callback.tmpl
rename to giscanner/doctemplates/mallard/Python/callback.tmpl
diff --git a/giscanner/doctemplates/Python/class.tmpl b/giscanner/doctemplates/mallard/Python/class.tmpl
similarity index 100%
rename from giscanner/doctemplates/Python/class.tmpl
rename to giscanner/doctemplates/mallard/Python/class.tmpl
diff --git a/giscanner/doctemplates/C/constructor.tmpl b/giscanner/doctemplates/mallard/Python/constructor.tmpl
similarity index 100%
rename from giscanner/doctemplates/C/constructor.tmpl
rename to giscanner/doctemplates/mallard/Python/constructor.tmpl
diff --git a/giscanner/doctemplates/C/default.tmpl b/giscanner/doctemplates/mallard/Python/default.tmpl
similarity index 100%
rename from giscanner/doctemplates/C/default.tmpl
rename to giscanner/doctemplates/mallard/Python/default.tmpl
diff --git a/giscanner/doctemplates/Python/enum.tmpl b/giscanner/doctemplates/mallard/Python/enum.tmpl
similarity index 100%
rename from giscanner/doctemplates/Python/enum.tmpl
rename to giscanner/doctemplates/mallard/Python/enum.tmpl
diff --git a/giscanner/doctemplates/C/field.tmpl b/giscanner/doctemplates/mallard/Python/field.tmpl
similarity index 100%
rename from giscanner/doctemplates/C/field.tmpl
rename to giscanner/doctemplates/mallard/Python/field.tmpl
diff --git a/giscanner/doctemplates/Python/function.tmpl b/giscanner/doctemplates/mallard/Python/function.tmpl
similarity index 100%
rename from giscanner/doctemplates/Python/function.tmpl
rename to giscanner/doctemplates/mallard/Python/function.tmpl
diff --git a/giscanner/doctemplates/Python/interface.tmpl b/giscanner/doctemplates/mallard/Python/interface.tmpl
similarity index 100%
rename from giscanner/doctemplates/Python/interface.tmpl
rename to giscanner/doctemplates/mallard/Python/interface.tmpl
diff --git a/giscanner/doctemplates/C/method.tmpl b/giscanner/doctemplates/mallard/Python/method.tmpl
similarity index 100%
rename from giscanner/doctemplates/C/method.tmpl
rename to giscanner/doctemplates/mallard/Python/method.tmpl
diff --git a/giscanner/doctemplates/Gjs/namespace.tmpl b/giscanner/doctemplates/mallard/Python/namespace.tmpl
similarity index 100%
rename from giscanner/doctemplates/Gjs/namespace.tmpl
rename to giscanner/doctemplates/mallard/Python/namespace.tmpl
diff --git a/giscanner/doctemplates/Python/property.tmpl b/giscanner/doctemplates/mallard/Python/property.tmpl
similarity index 100%
rename from giscanner/doctemplates/Python/property.tmpl
rename to giscanner/doctemplates/mallard/Python/property.tmpl
diff --git a/giscanner/doctemplates/Gjs/record.tmpl b/giscanner/doctemplates/mallard/Python/record.tmpl
similarity index 100%
rename from giscanner/doctemplates/Gjs/record.tmpl
rename to giscanner/doctemplates/mallard/Python/record.tmpl
diff --git a/giscanner/doctemplates/Python/signal.tmpl b/giscanner/doctemplates/mallard/Python/signal.tmpl
similarity index 100%
rename from giscanner/doctemplates/Python/signal.tmpl
rename to giscanner/doctemplates/mallard/Python/signal.tmpl
diff --git a/giscanner/doctemplates/Python/vfunc.tmpl b/giscanner/doctemplates/mallard/Python/vfunc.tmpl
similarity index 100%
rename from giscanner/doctemplates/Python/vfunc.tmpl
rename to giscanner/doctemplates/mallard/Python/vfunc.tmpl
diff --git a/giscanner/doctemplates/base.tmpl b/giscanner/doctemplates/mallard/base.tmpl
similarity index 100%
rename from giscanner/doctemplates/base.tmpl
rename to giscanner/doctemplates/mallard/base.tmpl
diff --git a/giscanner/doctemplates/class.tmpl b/giscanner/doctemplates/mallard/class.tmpl
similarity index 100%
rename from giscanner/doctemplates/class.tmpl
rename to giscanner/doctemplates/mallard/class.tmpl
diff --git a/giscanner/doctemplates/namespace.tmpl b/giscanner/doctemplates/mallard/namespace.tmpl
similarity index 100%
rename from giscanner/doctemplates/namespace.tmpl
rename to giscanner/doctemplates/mallard/namespace.tmpl
diff --git a/giscanner/docwriter.py b/giscanner/docwriter.py
index cfc4172..d9c2ed5 100644
--- a/giscanner/docwriter.py
+++ b/giscanner/docwriter.py
@@ -462,6 +462,8 @@ class DocFormatter(object):
 class DocFormatterC(DocFormatter):
     language = "C"
     mime_type = "text/x-csrc"
+    output_format = "mallard"
+    output_extension = ".page"
 
     fundamentals = {
         "TRUE": "TRUE",
@@ -507,6 +509,8 @@ class DocFormatterIntrospectableBase(DocFormatter):
 class DocFormatterPython(DocFormatterIntrospectableBase):
     language = "Python"
     mime_type = "text/python"
+    output_format = "mallard"
+    output_extension = ".page"
 
     fundamentals = {
         "TRUE": "True",
@@ -514,6 +518,12 @@ class DocFormatterPython(DocFormatterIntrospectableBase):
         "NULL": "None",
     }
 
+    def get_output_format(self):
+        return 'mallard'
+
+    def get_output_extension(self):
+        return 'page'
+
     def should_render_node(self, node):
         if getattr(node, "is_constructor", False):
             return False
@@ -585,6 +595,8 @@ class DocFormatterPython(DocFormatterIntrospectableBase):
 class DocFormatterGjs(DocFormatterIntrospectableBase):
     language = "Gjs"
     mime_type = "text/x-gjs"
+    output_format = "mallard"
+    output_extension = ".page"
 
     fundamentals = {
         "TRUE": "true",
@@ -878,20 +890,23 @@ class DocFormatterGjs(DocFormatterIntrospectableBase):
                              for p in construct_params)
 
 LANGUAGES = {
-    "c": DocFormatterC,
-    "python": DocFormatterPython,
-    "gjs": DocFormatterGjs,
+    "mallard": {
+        "c": DocFormatterC,
+        "python": DocFormatterPython,
+        "gjs": DocFormatterGjs,
+    },
 }
 
 
 class DocWriter(object):
-    def __init__(self, transformer, language):
+    def __init__(self, transformer, language, output_format):
         self._transformer = transformer
 
         try:
-            formatter_class = LANGUAGES[language.lower()]
+            formatter_class = LANGUAGES[output_format][language.lower()]
         except KeyError:
-            raise SystemExit("Unsupported language: %s" % (language, ))
+            raise SystemExit("Unsupported language %s for output format %s" %
+                             (language, output_format))
 
         self._formatter = formatter_class(self._transformer)
         self._language = self._formatter.language
@@ -905,7 +920,8 @@ class DocWriter(object):
         else:
             srcdir = os.path.dirname(__file__)
 
-        template_dir = os.path.join(srcdir, 'doctemplates')
+        template_dir = os.path.join(srcdir, 'doctemplates',
+                                    self._formatter.output_format)
 
         return TemplateLookup(directories=[template_dir],
                               module_directory=tempfile.mkdtemp(),
@@ -955,7 +971,8 @@ class DocWriter(object):
                                  formatter=self._formatter,
                                  ast=ast)
 
+        output_base_name = page_id + self._formatter.output_extension
         output_file_name = os.path.join(os.path.abspath(output),
-                                        page_id + '.page')
+                                        output_base_name)
         with open(output_file_name, 'wb') as fp:
             fp.write(result)
diff --git a/giscanner/dumper.py b/giscanner/dumper.py
index 3c7220b..494c7ff 100644
--- a/giscanner/dumper.py
+++ b/giscanner/dumper.py
@@ -28,12 +28,11 @@ import os
 import sys
 import shlex
 import subprocess
-import shutil
 import tempfile
 from distutils.errors import LinkError
 
 from .gdumpparser import IntrospectionBinary
-from . import utils
+from . import pkgconfig, utils
 from .ccompiler import CCompiler
 
 # bugzilla.gnome.org/558436
@@ -95,9 +94,8 @@ class DumpCompiler(object):
         # Acquire the compiler (and linker) commands via the CCompiler class in ccompiler.py
         self._compiler = CCompiler()
 
-        self._pkgconfig_cmd = os.environ.get('PKG_CONFIG', 'pkg-config')
         self._uninst_srcdir = os.environ.get('UNINSTALLED_INTROSPECTION_SRCDIR')
-        self._packages = ['gio-2.0 gmodule-2.0']
+        self._packages = ['gio-2.0', 'gmodule-2.0']
         self._packages.extend(options.packages)
         if self._compiler.check_is_msvc():
             self._linker_cmd = ['link.exe']
@@ -116,8 +114,11 @@ class DumpCompiler(object):
         if self._uninst_srcdir is not None:
             gdump_path = os.path.join(self._uninst_srcdir, 'girepository', 'gdump.c')
         else:
-            gdump_path = os.path.join(os.path.join(DATADIR), 'gobject-introspection-1.0',
-                                      'gdump.c')
+            try:
+                gdump_path = GDUMP_PATH
+            except NameError:
+                gdump_path = os.path.join(os.path.join(DATADIR),
+                                          'gobject-introspection-1.0', 'gdump.c')
         if not os.path.isfile(gdump_path):
             raise SystemExit("Couldn't find %r" % (gdump_path, ))
         with open(gdump_path) as gdump_file:
@@ -168,14 +169,14 @@ class DumpCompiler(object):
             introspection_obj = self._compile(c_path)
         except CompilerError as e:
             if not utils.have_debug_flag('save-temps'):
-                shutil.rmtree(tmpdir)
+                utils.rmtree(tmpdir)
             raise SystemExit('compilation of temporary binary failed:' + str(e))
 
         try:
             self._link(bin_path, introspection_obj)
         except LinkerError as e:
             if not utils.have_debug_flag('save-temps'):
-                shutil.rmtree(tmpdir)
+                utils.rmtree(tmpdir)
             raise SystemExit('linking of temporary binary failed: ' + str(e))
 
         return IntrospectionBinary([bin_path], tmpdir)
@@ -187,22 +188,11 @@ class DumpCompiler(object):
                             self._options.namespace_version, suffix)
         return os.path.join(tmpdir, tmpl)
 
-    def _run_pkgconfig(self, flag):
-        # Enable the --msvc-syntax pkg-config flag when
-        # the Microsoft compiler is used
-        if self._compiler.check_is_msvc():
-            cmd = [self._pkgconfig_cmd, '--msvc-syntax', flag]
-        else:
-            cmd = [self._pkgconfig_cmd, flag]
-        proc = subprocess.Popen(
-            cmd + self._packages,
-            stdout=subprocess.PIPE)
-        out, err = proc.communicate()
-        return out.decode('ascii').split()
-
     def _compile(self, *sources):
-        pkgconfig_flags = self._run_pkgconfig('--cflags')
-        return self._compiler.compile(pkgconfig_flags,
+        cflags = pkgconfig.cflags(self._packages,
+                                  msvc_syntax=self._compiler.check_is_msvc())
+        cflags.extend(self._options.cflags)
+        return self._compiler.compile(cflags,
                                       self._options.cpp_includes,
                                       sources,
                                       self._options.init_sections)
@@ -252,7 +242,8 @@ class DumpCompiler(object):
 
         args.extend(sources)
 
-        pkg_config_libs = self._run_pkgconfig('--libs')
+        pkg_config_libs = pkgconfig.libs(self._packages,
+                                         msvc_syntax=self._compiler.check_is_msvc())
 
         if not self._options.external_library:
             self._compiler.get_internal_link_flags(args,
@@ -284,6 +275,8 @@ class DumpCompiler(object):
             with os.fdopen(tf, 'wb') as f:
                 shellcontents = ' '.join([x.replace('\\', '/') for x in args])
                 fcontents = '#!/bin/sh\nunset PWD\n{}\n'.format(shellcontents)
+                if not isinstance(fcontents, bytes):
+                    fcontents = fcontents.encode('utf-8')
                 f.write(fcontents)
             shell = utils.which(shell)
             args = [shell, tf_name.replace('\\', '/')]
diff --git a/giscanner/gdumpparser.py b/giscanner/gdumpparser.py
index 1134f33..cd9d94d 100644
--- a/giscanner/gdumpparser.py
+++ b/giscanner/gdumpparser.py
@@ -26,7 +26,6 @@ from __future__ import unicode_literals
 import os
 import sys
 import tempfile
-import shutil
 import subprocess
 from xml.etree.cElementTree import parse
 
@@ -89,12 +88,12 @@ class GDumpParser(object):
         """
 
         # First pass: parsing
-        for node in self._namespace.values():
+        for node in list(self._namespace.values()):
             if isinstance(node, ast.Function):
                 self._initparse_function(node)
 
         if self._namespace.name == 'GObject' or self._namespace.name == 'GLib':
-            for node in self._namespace.values():
+            for node in list(self._namespace.values()):
                 if isinstance(node, ast.Record):
                     self._initparse_gobject_record(node)
 
@@ -123,7 +122,7 @@ class GDumpParser(object):
         # Pair up boxed types and class records
         for name, boxed in self._boxed_types.items():
             self._pair_boxed_type(boxed)
-        for node in self._namespace.values():
+        for node in list(self._namespace.values()):
             if isinstance(node, (ast.Class, ast.Interface)):
                 self._find_class_record(node)
 
@@ -181,7 +180,7 @@ blob containing data gleaned from GObject's primitive introspection."""
             return parse(out_path)
         finally:
             if not utils.have_debug_flag('save-temps'):
-                shutil.rmtree(self._binary.tmpdir)
+                utils.rmtree(self._binary.tmpdir)
 
     # Parser
 
diff --git a/giscanner/girparser.py b/giscanner/girparser.py
index 909e08d..6841b6c 100644
--- a/giscanner/girparser.py
+++ b/giscanner/girparser.py
@@ -25,11 +25,11 @@ from __future__ import unicode_literals
 
 import os
 
+from collections import OrderedDict
 from xml.etree.cElementTree import parse
 
 from . import ast
 from .girwriter import COMPATIBLE_GIR_VERSION
-from .collections import OrderedDict
 
 CORE_NS = "http://www.gtk.org/introspection/core/1.0"
 C_NS = "http://www.gtk.org/introspection/c/1.0"
diff --git a/giscanner/giscannermodule.c b/giscanner/giscannermodule.c
index 4c1f00f..a024f1a 100644
--- a/giscanner/giscannermodule.c
+++ b/giscanner/giscannermodule.c
@@ -24,19 +24,7 @@
 #endif
 #include <Python.h>
 #include "sourcescanner.h"
-
-#ifdef G_OS_WIN32
-#define USE_WINDOWS
-#endif
-
-#ifdef _WIN32
-#include <fcntl.h>
-#include <io.h>
-#define WIN32_LEAN_AND_MEAN
-#define STRICT
-#include <windows.h>
-#endif
-
+#include <stdio.h>
 #include <glib-object.h>
 
 #ifndef Py_TYPE
@@ -53,10 +41,10 @@
 #endif
 
 /* forward declaration */
-MOD_INIT(_giscanner);
+_GI_EXTERN MOD_INIT(_giscanner);
 
 #define NEW_CLASS(ctype, name, cname, num_methods)	      \
-static const PyMethodDef _Py##cname##_methods[num_methods];    \
+static const PyMethodDef _Py##cname##_methods[num_methods] G_GNUC_UNUSED;    \
 PyTypeObject Py##cname##_Type = {             \
     PyVarObject_HEAD_INIT(NULL, 0)            \
     "scanner." name,                          \
@@ -451,90 +439,6 @@ pygi_source_scanner_parse_file (PyGISourceScanner *self,
   if (!PyArg_ParseTuple (args, "i:SourceScanner.parse_file", &fd))
     return NULL;
 
-#ifdef _WIN32
-  /* The file descriptor passed to us is from the C library Python
-   * uses. That is msvcr71.dll for Python 2.5 and msvcr90.dll for
-   * Python 2.6, 2.7, 3.2 etc; and msvcr100.dll for Python 3.3 and 3.4.
-   * Python 3.5 and later is built with Visual Studio 2015, which uses
-   * the universal CRT, so we need to deal with urtbase.dll here instead.
-   * This code, at least if compiled with mingw, uses
-   * msvcrt.dll, so we cannot use the file descriptor directly. So
-   * perform appropriate magic.
-   */
-
-  /* If we are using the following combinations,
-   * we can use the file descriptors directly
-   * (Not if a build using WDK is used):
-   * Python 2.6.x/2.7.x with Visual C++ 2008
-   * Python 3.1.x/3.2.x with Visual C++ 2008
-   * Python 3.3.x/3.4.x with Visual C++ 2010
-   */
-
-  /* XXX: Somehow we cannot use the FD directly on Python 3.5+ even when
-   *      using Visual Studio 2015, so we currently need to use _get_osfhandle() when
-   *      in all cases on Python 3.5+
-   */
-
-#if (defined(_MSC_VER) && !defined(USE_WIN_DDK))
-#if (PY_MAJOR_VERSION==2 && PY_MINOR_VERSION>=6 && (_MSC_VER >= 1500 && _MSC_VER < 1600))
-#define MSVC_USE_FD_DIRECTLY 1
-#elif (PY_MAJOR_VERSION==3 && PY_MINOR_VERSION<=2 && (_MSC_VER >= 1500 && _MSC_VER < 1600))
-#define MSVC_USE_FD_DIRECTLY 1
-#elif (PY_MAJOR_VERSION==3 && PY_MINOR_VERSION<=4 && (_MSC_VER >= 1600 && _MSC_VER < 1700))
-#define MSVC_USE_FD_DIRECTLY 1
-#endif
-#endif
-
-#if !defined(MSVC_USE_FD_DIRECTLY) && !defined(__MINGW64_VERSION_MAJOR)
-  {
-#if defined(PY_MAJOR_VERSION) && PY_MAJOR_VERSION==2 && PY_MINOR_VERSION==5
-#define PYTHON_MSVCRXX_DLL "msvcr71.dll"
-#elif defined(PY_MAJOR_VERSION) && PY_MAJOR_VERSION==2 && PY_MINOR_VERSION==7
-#define PYTHON_MSVCRXX_DLL "msvcr90.dll"
-#elif defined(PY_MAJOR_VERSION) && PY_MAJOR_VERSION==3 && PY_MINOR_VERSION<=2
-#define PYTHON_MSVCRXX_DLL "msvcr90.dll"
-#elif defined(PY_MAJOR_VERSION) && PY_MAJOR_VERSION==3 &&  PY_MINOR_VERSION<=4
-#define PYTHON_MSVCRXX_DLL "msvcr100.dll"
-#elif defined(PY_MAJOR_VERSION) && PY_MAJOR_VERSION==3 && PY_MINOR_VERSION>=5
-#define PYTHON_MSVCRXX_DLL "ucrtbase.dll"
-#else
-#error This Python version not handled
-#endif
-    HMODULE msvcrxx;
-    intptr_t (*p__get_osfhandle) (int);
-    HANDLE handle;
-
-    msvcrxx = GetModuleHandle (PYTHON_MSVCRXX_DLL);
-    if (!msvcrxx)
-    {
-      g_print ("No " PYTHON_MSVCRXX_DLL " loaded.\n");
-      return NULL;
-    }
-
-    p__get_osfhandle = (intptr_t (*) (int)) GetProcAddress (msvcrxx, "_get_osfhandle");
-    if (!p__get_osfhandle)
-    {
-      g_print ("No _get_osfhandle found in " PYTHON_MSVCRXX_DLL ".\n");
-      return NULL;
-    }
-
-    handle = (HANDLE) p__get_osfhandle (fd);
-    if (!p__get_osfhandle)
-    {
-      g_print ("Could not get OS handle from " PYTHON_MSVCRXX_DLL " fd.\n");
-      return NULL;
-    }
-
-    fd = _open_osfhandle ((intptr_t) handle, _O_RDONLY);
-    if (fd == -1)
-    {
-      g_print ("Could not open C fd from OS handle.\n");
-      return NULL;
-    }
-  }
-#endif
-#endif
-
   fp = fdopen (fd, "r");
   if (!fp)
     {
@@ -591,7 +495,7 @@ pygi_source_scanner_set_macro_scan (PyGISourceScanner *self,
 }
 
 static PyObject *
-pygi_source_scanner_get_symbols (PyGISourceScanner *self)
+pygi_source_scanner_get_symbols (PyGISourceScanner *self, G_GNUC_UNUSED PyObject *unused)
 {
   GSList *l, *symbols;
   PyObject *list;
@@ -612,7 +516,7 @@ pygi_source_scanner_get_symbols (PyGISourceScanner *self)
 }
 
 static PyObject *
-pygi_source_scanner_get_comments (PyGISourceScanner *self)
+pygi_source_scanner_get_comments (PyGISourceScanner *self, G_GNUC_UNUSED PyObject *unused)
 {
   GSList *l, *comments;
   PyObject *list;
@@ -677,171 +581,15 @@ static const PyMethodDef _PyGISourceScanner_methods[] = {
   { NULL, NULL, 0 }
 };
 
-
-static int calc_attrs_length(PyObject *attributes, int indent,
-			     int self_indent)
-{
-  int attr_length = 0;
-  int i;
-
-  if (indent == -1)
-    return -1;
-
-  for (i = 0; i < PyList_Size (attributes); ++i)
-    {
-      PyObject *tuple, *pyvalue;
-      PyObject *s = NULL;
-      char *attr, *value;
-      char *escaped;
-
-      tuple = PyList_GetItem (attributes, i);
-      if (PyTuple_GetItem(tuple, 1) == Py_None)
-	continue;
-
-      if (!PyArg_ParseTuple(tuple, "sO", &attr, &pyvalue))
-        return -1;
-
-      if (PyUnicode_Check(pyvalue)) {
-        s = PyUnicode_AsUTF8String(pyvalue);
-        if (!s) {
-          return -1;
-        }
-        value = PyBytes_AsString(s);
-      } else if (PyBytes_Check(pyvalue)) {
-        value = PyBytes_AsString(pyvalue);
-      } else {
-        PyErr_SetString(PyExc_TypeError,
-                        "value must be string or unicode");
-        return -1;
-      }
-
-      escaped = g_markup_escape_text (value, -1);
-      attr_length += 2 + strlen(attr) + strlen(escaped) + 2;
-      g_free(escaped);
-      Py_XDECREF(s);
-    }
-
-  return attr_length + indent + self_indent;
-}
-
-/* Hall of shame, wasted time debugging the code below
- * 20min - Johan 2009-02-19
- */
-static PyObject *
-pygi_collect_attributes (PyObject *self,
-			 PyObject *args)
-{
-  char *tag_name;
-  PyObject *attributes;
-  int indent, indent_len, i, j, self_indent;
-  char *indent_char;
-  gboolean first;
-  GString *attr_value = NULL;
-  int len;
-  PyObject *result = NULL;
-
-  if (!PyArg_ParseTuple(args, "sO!isi",
-			&tag_name, &PyList_Type, &attributes,
-			&self_indent, &indent_char,
-			&indent))
-    return NULL;
-
-  if (attributes == Py_None || !PyList_Size(attributes))
-    return PyUnicode_DecodeUTF8("", 0, "strict");
-
-  len = calc_attrs_length(attributes, indent, self_indent);
-  if (len < 0)
-    return NULL;
-  if (len > 79)
-    indent_len = self_indent + strlen(tag_name) + 1;
-  else
-    indent_len = 0;
-
-  first = TRUE;
-  attr_value = g_string_new ("");
-
-  for (i = 0; i < PyList_Size (attributes); ++i)
-    {
-      PyObject *tuple, *pyvalue;
-      PyObject *s = NULL;
-      char *attr, *value, *escaped;
-
-      tuple = PyList_GetItem (attributes, i);
-
-      if (!PyTuple_Check (tuple))
-        {
-          PyErr_SetString(PyExc_TypeError,
-                          "attribute item must be a tuple");
-	  goto out;
-        }
-
-      if (PyTuple_Size (tuple) != 2)
-        {
-          PyErr_SetString(PyExc_IndexError,
-                          "attribute item must be a tuple of length 2");
-	  goto out;
-        }
-
-      if (PyTuple_GetItem(tuple, 1) == Py_None)
-	continue;
-
-      /* this leaks, but we exit after, so */
-      if (!PyArg_ParseTuple(tuple, "sO", &attr, &pyvalue))
-	goto out;
-
-      if (PyUnicode_Check(pyvalue)) {
-        s = PyUnicode_AsUTF8String(pyvalue);
-        if (!s)
-	  goto out;
-        value = PyBytes_AsString(s);
-      } else if (PyBytes_Check(pyvalue)) {
-        value = PyBytes_AsString(pyvalue);
-      } else {
-        PyErr_SetString(PyExc_TypeError,
-                        "value must be string or unicode");
-	goto out;
-      }
-
-      if (indent_len && !first)
-	{
-	  g_string_append_c (attr_value, '\n');
-	  for (j = 0; j < indent_len; j++)
-	    g_string_append_c (attr_value, ' ');
-	}
-      g_string_append_c (attr_value, ' ');
-      g_string_append (attr_value, attr);
-      g_string_append_c (attr_value, '=');
-      g_string_append_c (attr_value, '\"');
-      escaped = g_markup_escape_text (value, -1);
-      g_string_append (attr_value, escaped);
-      g_string_append_c (attr_value, '\"');
-      if (first)
-	first = FALSE;
-      Py_XDECREF(s);
-  }
-
-  result = PyUnicode_DecodeUTF8 (attr_value->str, attr_value->len, "strict");
- out:
-  if (attr_value != NULL)
-    g_string_free (attr_value, TRUE);
-  return result;
-}
-
 /* Module */
 
-static PyMethodDef pyscanner_functions[] = {
-  { "collect_attributes",
-    (PyCFunction) pygi_collect_attributes, METH_VARARGS },
-  { NULL, NULL, 0, NULL }
-};
-
 #if PY_MAJOR_VERSION >= 3
 static struct PyModuleDef moduledef = {
 	PyModuleDef_HEAD_INIT,
 	NULL, /* m_name */
 	NULL, /* m_doc */
 	0,
-	pyscanner_functions,
+	NULL,
 	NULL
 };
 #endif /* PY_MAJOR_VERSION >= 3 */
@@ -864,7 +612,7 @@ MOD_INIT(_giscanner)
     moduledef.m_name = module_name;
     m = PyModule_Create (&moduledef);
 #else
-    m = Py_InitModule (module_name, (PyMethodDef*)pyscanner_functions);
+    m = Py_InitModule (module_name, NULL);
 #endif
     d = PyModule_GetDict (m);
 
diff --git a/giscanner/introspectablepass.py b/giscanner/introspectablepass.py
index 19d1388..072494b 100644
--- a/giscanner/introspectablepass.py
+++ b/giscanner/introspectablepass.py
@@ -84,7 +84,7 @@ class IntrospectablePass(object):
 
         if not node.type.resolved:
             self._parameter_warning(parent, node,
-                                    "Unresolved type: %r" % (node.type.unresolved_string, ))
+                                    "Unresolved type: '%s'" % (node.type.unresolved_string, ))
             parent.introspectable = False
             return
 
diff --git a/giscanner/maintransformer.py b/giscanner/maintransformer.py
index 275f1c0..a7287ec 100644
--- a/giscanner/maintransformer.py
+++ b/giscanner/maintransformer.py
@@ -361,14 +361,11 @@ class MainTransformer(object):
                 message.warn("invalid (element-type) for a GPtrArray, "
                              "must be a pointer", annotations.position)
 
-        # GByteArrays have (element-type) guint8 by default
-        if array_type == ast.Array.GLIB_BYTEARRAY:
-            if element_type == ast.TYPE_ANY:
-                array.element_type = ast.TYPE_UINT8
-            elif element_type not in [ast.TYPE_UINT8, ast.TYPE_INT8, ast.TYPE_CHAR]:
-                message.warn("invalid (element-type) for a GByteArray, "
-                             "must be one of guint8, gint8 or gchar",
-                             annotations.position)
+        if (array_type == ast.Array.GLIB_BYTEARRAY
+        and element_type not in [ast.TYPE_UINT8, ast.TYPE_INT8, ast.TYPE_CHAR]):
+            message.warn("invalid (element-type) for a GByteArray, "
+                         "must be one of guint8, gint8 or gchar",
+                         annotations.position)
 
     def _apply_annotations_array(self, parent, node, annotations):
         element_type_options = annotations.get(ANN_ELEMENT_TYPE)
@@ -392,6 +389,7 @@ class MainTransformer(object):
 
         array_options = annotations.get(ANN_ARRAY)
         container_type = ast.Array(array_type, element_type_node, ctype=node.type.ctype,
+                                   complete_ctype=node.type.complete_ctype,
                                    is_const=node.type.is_const)
         if array_options.get(OPT_ARRAY_ZERO_TERMINATED, '0') == '0':
             container_type.zeroterminated = False
@@ -896,7 +894,7 @@ class MainTransformer(object):
             # the number of parameters (@foo) is the same or greater
             # than the number of signal parameters
             if len(block.params) > len(signal.parameters):
-                names = block.params.items()
+                names = [(k, v) for k, v in block.params.items()]
                 # Resolve real parameter names early, so that in later
                 # phase we can refer to them while resolving annotations.
                 for i, param in enumerate(signal.parameters):
diff --git a/giscanner/meson.build b/giscanner/meson.build
new file mode 100644
index 0000000..7b4b0d9
--- /dev/null
+++ b/giscanner/meson.build
@@ -0,0 +1,91 @@
+giscanner_files = [
+  '__init__.py',
+  'annotationmain.py',
+  'annotationparser.py',
+  'ast.py',
+  'cachestore.py',
+  'ccompiler.py',
+  'codegen.py',
+  'docmain.py',
+  'docwriter.py',
+  'dumper.py',
+  'introspectablepass.py',
+  'girparser.py',
+  'girwriter.py',
+  'gdumpparser.py',
+  'libtoolimporter.py',
+  'maintransformer.py',
+  'message.py',
+  'msvccompiler.py',
+  'pkgconfig.py',
+  'shlibs.py',
+  'scannermain.py',
+  'sectionparser.py',
+  'sourcescanner.py',
+  'testcodegen.py',
+  'transformer.py',
+  'utils.py',
+  'xmlwriter.py',
+]
+
+pkglibdir = join_paths(get_option('libdir'), meson.project_name())
+giscannerdir = join_paths(pkglibdir, 'giscanner')
+
+giscanner_built_files = []
+giscanner_conf_data = configuration_data()
+giscanner_conf_data.set('VERSION', meson.project_version())
+giscanner_built_files += configure_file(input: '_version.py.in',
+                                        output: '_version.py',
+                                        install : true,
+                                        install_dir : giscannerdir,
+                                        configuration: giscanner_conf_data)
+foreach f : giscanner_files
+  giscanner_built_files += configure_file(input : f, output : f,
+                                          install : true,
+                                          install_dir : giscannerdir,
+                                          configuration : giscanner_conf_data)
+endforeach
+
+install_subdir('doctemplates', install_dir: giscannerdir)
+
+flex = find_program('flex', 'win_flex')
+bison = find_program('bison', 'win_bison')
+
+scannerparser = custom_target('scannerparser',
+    input: 'scannerparser.y',
+   output: ['scannerparser.c', 'scannerparser.h'],
+  command: [bison, '@INPUT@', '--defines=@OUTPUT1@', '--output=@OUTPUT0@']
+
+)
+
+scannerlexer = custom_target('scannerlexer',
+    input: 'scannerlexer.l',
+   output: 'scannerlexer.c',
+  command: [flex, '-o', '@OUTPUT@', '@INPUT@']
+)
+
+giscanner_args = []
+if not cc.has_header('unistd.h')
+  giscanner_args += '-DYY_NO_UNISTD_H'
+endif
+
+giscanner_lib = static_library('giscanner',
+  sources: [
+    'sourcescanner.c',
+    scannerparser,
+    scannerlexer,
+  ],
+  c_args: giscanner_args,
+  include_directories : configinc,
+  dependencies: [glib_dep, gobject_dep, gio_dep, gmodule_dep],
+)
+
+giscanner_pymod = python.extension_module('_giscanner', ['giscannermodule.c'],
+  link_with: giscanner_lib,
+  c_args: [gi_hidden_visibility_cflags],
+  include_directories : configinc,
+  dependencies: [glib_dep, gobject_dep, gio_dep, gmodule_dep,
+                 python.dependency()],
+  install: true,
+  install_dir: giscannerdir,
+)
diff --git a/giscanner/pkgconfig.py b/giscanner/pkgconfig.py
new file mode 100644
index 0000000..6f0b2d5
--- /dev/null
+++ b/giscanner/pkgconfig.py
@@ -0,0 +1,58 @@
+# GObject-Introspection - a framework for introspecting GObject libraries
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the
+# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
+#
+
+import os
+import shlex
+import subprocess
+
+
+class PkgConfigError(Exception):
+    pass
+
+
+def check_output(flags, ignore_errors, command=None):
+    if command is None:
+        command = [os.environ.get('PKG_CONFIG', 'pkg-config')]
+    argv = command[:]
+    argv.extend(flags)
+    try:
+        return subprocess.check_output(argv, universal_newlines=True, stderr=subprocess.STDOUT)
+    except subprocess.CalledProcessError as e:
+        output = e.output or ''
+        if ignore_errors:
+            print(output)
+            return ''
+        raise PkgConfigError('pkg-config: %s\n%s' % (e, output))
+    except OSError as e:
+        raise PkgConfigError('pkg-config: error executing command %s: %s' % (argv, e))
+
+
+def cflags(packages, msvc_syntax=False, ignore_errors=True, command=None):
+    flags = ['--msvc-syntax'] if msvc_syntax else []
+    flags.append('--cflags')
+    flags.extend(packages)
+    out = check_output(flags, ignore_errors, command)
+    return shlex.split(out)
+
+
+def libs(packages, msvc_syntax=False, ignore_errors=True, command=None):
+    flags = ['--msvc-syntax'] if msvc_syntax else []
+    flags.append('--libs')
+    flags.extend(packages)
+    out = check_output(flags, ignore_errors, command)
+    return shlex.split(out)
diff --git a/giscanner/scannerlexer.c b/giscanner/scannerlexer.c
index 477e526..c4cc9eb 100644
--- a/giscanner/scannerlexer.c
+++ b/giscanner/scannerlexer.c
@@ -351,8 +351,8 @@ static void yynoreturn yy_fatal_error ( const char* msg  );
 	(yy_hold_char) = *yy_cp; \
 	*yy_cp = '\0'; \
 	(yy_c_buf_p) = yy_cp;
-#define YY_NUM_RULES 163
-#define YY_END_OF_BUFFER 164
+#define YY_NUM_RULES 168
+#define YY_END_OF_BUFFER 169
 /* This struct is not used in this scanner,
    but its presence is necessary. */
 struct yy_trans_info
@@ -360,132 +360,133 @@ struct yy_trans_info
 	flex_int32_t yy_verify;
 	flex_int32_t yy_nxt;
 	};
-static const flex_int16_t yy_acclist[1095] =
+static const flex_int16_t yy_acclist[1110] =
     {   0,
-      164,  162,  163,    3,  162,  163,    1,  163,   45,  162,
-      163,  162,  163,   20,  162,  163,   40,  162,  163,   42,
-      162,  163,  162,  163,   29,  162,  163,   30,  162,  163,
-       38,  162,  163,   36,  162,  163,   69,  162,  163,   37,
-      162,  163,   35,  162,  163,   39,  162,  163,  155,  162,
-      163,  155,  162,  163,   32,  162,  163,   31,  162,  163,
-       47,  162,  163,   46,  162,  163,   48,  162,  163,   34,
-      162,  163,  111,  152,  162,  163,  111,  152,  162,  163,
-      111,  152,  162,  163,  111,  152,  162,  163,  111,  152,
-      162,  163,   25,  162,  163,  162,  163,   27,  162,  163,
-
-       41,  162,  163,  111,  152,  162,  163,  111,  152,  162,
-      163,  111,  152,  162,  163,  111,  152,  162,  163,  111,
-      152,  162,  163,  111,  152,  162,  163,  111,  152,  162,
-      163,  111,  152,  162,  163,  111,  152,  162,  163,  111,
-      152,  162,  163,  111,  152,  162,  163,  111,  152,  162,
-      163,  111,  152,  162,  163,  111,  152,  162,  163,  111,
-      152,  162,  163,  111,  152,  162,  163,   21,  162,  163,
-       43,  162,  163,   23,  162,  163,   44,  162,  163,    3,
-        1,   62,  160,   53,   24,   65,   55,  158,   51,   67,
-       49,   68,   50,   70,  156,    4,    6,   52,  156,  154,
-
-      155,  155,  155,  155,   28,   22,   26,   57,   63,   61,
-       64,   58,  111,  152,  111,  152,  111,  152,  111,  152,
-        2,   54,  111,  152,  111,  152,  111,  152,  111,  152,
-      111,  152,  111,  152,  111,  152,  111,  152,  111,  152,
-      111,  152,  111,  152,  111,  152,  111,  152,  111,  121,
-      152,  111,  152,  111,  152,  111,  152,  111,  152,  111,
-      152,  111,  152,  111,  152,  111,  129,  152,  111,  152,
-      111,  152,  111,  152,  111,  152,  111,  152,  111,  152,
-      111,  152,  111,  152,  111,  152,  111,  152,  111,  152,
-      111,  152,  111,  152,   56,   66,   33,  156,    6,  154,
-
-      155,  154,  155,  157,  155,  155,  155,  153,   59,   60,
-      111,  152,  111,  152,  161,  159,  111,  152,  111,  152,
-      111,  152,  111,  152,  111,  152,  111,  152,  111,  152,
-      111,  152,  111,  152,  111,  152,  111,  152,  111,  152,
-      111,  152,  111,  152,  111,  152,  111,  152,  111,  152,
-      111,  152,  111,  112,  152,  111,  152,  111,  152,  111,
-      152,  111,  152,  111,  152,  111,  152,  111,  152,  111,
-      152,  111,  152,  111,  152,  111,  152,  111,  152,  111,
-      152,  111,  127,  152,  111,  152,  111,  152,  111,  131,
-      152,  111,  152,  111,  152,  111,  152,  111,  152,  111,
-
-      152,  111,  152,  111,  152,  111,  152,  111,  152,  111,
-      152,  111,  152,  111,  152,  111,  152,  111,  152,  111,
-      152,  111,  152,  111,  152,  111,  152,  156,  154,  155,
-      154,  155,  154,  155,  157,  155,  153,  153,  111,  152,
-      111,  152,  111,  152,  107,  111,  152,  111,  152,  111,
-      152,  111,  152,  111,  152,  111,  152,  111,  152,  111,
-      152,  111,  152,  111,  152,  111,  152,  111,  152,  111,
-      152,  111,  152,  111,  152,  111,  152,  111,  152,  111,
-      152,  111,  152,  111,  152,  111,  152,  111,  152,  111,
-      113,  152,  111,  114,  152,  111,  152,  111,  116,  152,
-
-      111,  117,  152,  111,  152,  111,  152,  111,  152,  111,
-      152,  111,  123,  152,  111,  124,  152,  111,  152,  111,
-      152,  111,  152,  111,  128,  152,  111,  152,  111,  136,
-      152,  111,  152,  111,  152,  111,  152,  111,  152,  111,
-      152,  111,  152,  111,  152,  111,  152,  111,  152,  111,
-      152,  109,  111,  152,  111,  152,  111,  152,  111,  152,
-      111,  149,  152,  111,  152,  111,  152,   18,   13,  154,
-      155,  153,  153,  153,  108,  111,  152,  111,  152,  111,
-      152,   96,  111,  152,  111,  152,  111,  152,  111,  152,
-      111,  152,  111,  152,   74,  111,  152,  111,  152,  111,
-
-      152,  111,  152,  111,  152,  111,  152,  111,  152,  111,
-      152,  111,  152,  111,  152,  111,  152,  111,  152,  111,
-      152,  111,  152,  111,  152,  102,  111,  152,  111,  115,
-      152,  111,  118,  152,  111,  152,  111,  152,  111,  152,
-      111,  152,  110,  111,  152,  111,  126,  152,  111,  152,
-      111,  152,  111,  152,  111,  152,  111,  140,  152,  111,
-      152,  111,  152,  111,  152,  111,  152,  111,  152,  111,
-      152,  111,  152,  111,  147,  152,  111,  152,  111,  152,
-      111,  151,  152,   15,  153,  111,  152,  111,  152,  111,
-      152,  111,  152,  111,  152,  111,  152,  111,  152,  111,
-
-      152,  111,  152,  111,  152,  111,  152,  111,  152,  111,
-      152,  111,  152,  111,  152,  111,  152,  111,  152,  111,
-      152,  111,  152,  111,  152,  111,  152,  111,  152,  111,
-      152,  111,  152,  111,  152,  111,  152,  111,  122,  152,
-      111,  125,  152,  111,  130,  152,  111,  152,  111,  152,
-      111,  139,  152,  111,  141,  152,  111,  142,  152,  111,
-      143,  152,  111,  144,  152,  111,  145,  152,  111,  152,
-      111,  152,  111,  152,  111,  152,   14,   16,    5,  111,
-      152,  111,  152,  111,  152,  111,  152,  111,  152,  111,
-      152,  111,  152,  111,  152,   75,  111,  152,  111,  152,
-
-       98,  111,  152,   78,  111,  152,  111,  152,  111,  152,
-      111,  152,  111,  152,  103,  111,  152,  111,  152,  111,
-      152,  111,  152,  111,  152,  111,  152,  111,  152,  111,
-      152,  111,  152,  111,  120,  152,  111,  152,  111,  152,
-      111,  152,  111,  146,  152,  111,  152,  111,  152,   12,
-      111,  152,  111,  152,  111,  152,   83,  111,  152,  111,
-      152,  111,  152,  111,  152,  111,  152,  111,  152,  111,
-      152,  111,  152,   81,  111,  152,  111,  135,  152,  111,
-      152,  111,  152,   87,  111,  152,  111,  152,   93,  111,
-      152,  111,  152,  111,  152,  111,  119,  152,  111,  137,
-
-      152,  111,  138,  152,  111,  152,  111,  148,  152,  111,
-      150,  152,    8,   11,   19,   17,  111,  152,  111,  152,
-      104,  111,  152,   86,  111,  152,  111,  152,   84,  111,
-      152,  111,  152,  111,  152,  111,  152,  111,  152,  111,
-      152,  111,  152,   82,  111,  152,  111,  152,  111,  152,
-      101,  111,  152,  111,  134,  152,  111,  152,  111,  152,
-        7,    8,  111,  152,  111,  152,  111,  152,  111,  152,
-      111,  152,  111,  152,  111,  152,   80,  111,  152,  111,
-      133,  152,   89,  111,  152,   88,  111,  152,  111,  152,
-       94,  111,  152,  111,  152,  111,  152,  111,  152,  111,
-
-      152,  111,  152,   77,  111,  152,  111,  152,  111,  152,
-      111,  132,  152,  111,  152,  111,  152,  111,  152,  111,
-      152,  111,  152,  111,  152,  111,  152,  111,  152,   90,
-      111,  152,   95,  111,  152,   91,  111,  152,  111,  152,
-      111,  152,  111,  152,   92,  111,  152,   76,  111,  152,
-      100,   79,  111,  152,  111,  152,  111,  152,  111,  152,
-       71,  111,  152,  111,  152,  111,  152,  111,  152,  111,
-      152,  111,  152,   72,  105,  111,  152,  111,  152,   85,
-      111,  152,  106,  111,  152,   73,    9,    9,   12,   10,
-       10,   11,   99,   97
-
+      169,  167,  168,    3,  167,  168,    1,  168,   45,  167,
+      168,  167,  168,   20,  167,  168,   40,  167,  168,   42,
+      167,  168,  167,  168,   29,  167,  168,   30,  167,  168,
+       38,  167,  168,   36,  167,  168,   69,  167,  168,   37,
+      167,  168,   35,  167,  168,   39,  167,  168,  160,  167,
+      168,  160,  167,  168,   32,  167,  168,   31,  167,  168,
+       47,  167,  168,   46,  167,  168,   48,  167,  168,   34,
+      167,  168,  107,  157,  167,  168,  107,  157,  167,  168,
+      107,  157,  167,  168,  107,  157,  167,  168,  107,  157,
+      167,  168,   25,  167,  168,  167,  168,   27,  167,  168,
+
+       41,  167,  168,  107,  157,  167,  168,  107,  157,  167,
+      168,  107,  157,  167,  168,  107,  157,  167,  168,  107,
+      157,  167,  168,  107,  157,  167,  168,  107,  157,  167,
+      168,  107,  157,  167,  168,  107,  157,  167,  168,  107,
+      157,  167,  168,  107,  157,  167,  168,  107,  157,  167,
+      168,  107,  157,  167,  168,  107,  157,  167,  168,  107,
+      157,  167,  168,  107,  157,  167,  168,   21,  167,  168,
+       43,  167,  168,   23,  167,  168,   44,  167,  168,    3,
+        1,   62,  165,   53,   24,   65,   55,  163,   51,   67,
+       49,   68,   50,   70,  161,    4,    6,   52,  161,  159,
+
+      160,  160,  160,  160,   28,   22,   26,   57,   63,   61,
+       64,   58,  107,  157,  107,  157,  107,  157,  107,  157,
+        2,   54,  107,  157,  107,  157,  107,  157,  107,  157,
+      107,  157,  107,  157,  107,  157,  107,  157,  107,  157,
+      107,  157,  107,  157,  107,  157,  107,  116,  157,  107,
+      157,  107,  157,  107,  157,  107,  157,  107,  157,  107,
+      157,  107,  157,  107,  131,  157,  107,  157,  107,  157,
+      107,  157,  107,  157,  107,  157,  107,  157,  107,  157,
+      107,  157,  107,  157,  107,  157,  107,  157,  107,  157,
+      107,  157,   56,   66,   33,  161,    6,  159,  160,  159,
+
+      160,  162,  160,  160,  160,  158,   59,   60,  107,  157,
+      107,  157,  166,  164,  107,  157,  107,  157,  107,  157,
+      107,  157,  107,  157,  107,  157,  107,  157,  107,  157,
+      107,  157,  107,  157,  107,  157,  107,  157,  107,  157,
+      107,  157,  107,  157,  107,  157,  107,  157,  107,  157,
+      107,  108,  157,  107,  157,  107,  157,  107,  157,  107,
+      157,  107,  157,  107,  157,  107,  157,  107,  157,  107,
+      157,  107,  157,  107,  157,  107,  157,  107,  129,  157,
+      107,  157,  107,  157,  107,  133,  157,  107,  157,  107,
+      157,  107,  157,  107,  157,  107,  157,  107,  157,  107,
+
+      157,  107,  157,  107,  157,  107,  157,  107,  157,  107,
+      157,  107,  157,  107,  157,  107,  157,  107,  157,  107,
+      157,  107,  157,  161,  159,  160,  159,  160,  159,  160,
+      162,  160,  158,  158,  107,  157,  107,  157,  107,  157,
+      103,  107,  157,  107,  157,  107,  157,  107,  157,  107,
+      157,  107,  157,  107,  157,  107,  157,  107,  157,  107,
+      157,  107,  157,  107,  157,  107,  157,  107,  157,  107,
+      157,  107,  157,  107,  157,  107,  157,  107,  157,  107,
+      157,  107,  157,  107,  157,  107,  109,  157,  107,  157,
+      107,  111,  157,  107,  112,  157,  107,  157,  107,  157,
+
+      107,  157,  107,  157,  107,  118,  157,  107,  119,  157,
+      107,  157,  107,  157,  107,  157,  107,  130,  157,  107,
+      157,  107,  139,  157,  107,  157,  107,  157,  107,  157,
+      107,  157,  107,  157,  107,  157,  107,  157,  107,  157,
+      107,  157,  107,  157,  105,  107,  157,  107,  157,  107,
+      157,  107,  157,  107,  154,  157,  107,  157,  107,  157,
+       18,   13,  159,  160,  158,  158,  158,  104,  107,  157,
+      107,  157,  107,  157,   94,  107,  157,  107,  157,  107,
+      157,  107,  157,  107,  157,  107,  157,   74,  107,  157,
+      107,  157,  107,  157,  107,  157,  107,  157,  107,  157,
+
+      107,  157,  107,  157,  107,  157,  107,  157,  107,  157,
+      107,  157,  107,  157,  107,  157,  107,  157,  100,  107,
+      157,  107,  110,  157,  107,  113,  157,  107,  157,  107,
+      157,  107,  157,  107,  157,  106,  107,  157,  107,  121,
+      157,  107,  157,  107,  157,  107,  157,  107,  157,  107,
+      143,  157,  107,  157,  107,  157,  107,  157,  107,  157,
+      107,  157,  107,  157,  107,  157,  107,  152,  157,  107,
+      157,  107,  157,  107,  156,  157,   15,  158,  107,  157,
+      107,  157,  107,  157,  107,  157,  107,  157,  107,  157,
+      107,  157,  107,  157,  107,  157,  107,  157,  107,  157,
+
+      107,  157,  107,  157,  107,  157,  107,  157,  107,  157,
+      107,  157,  107,  157,  107,  157,  107,  157,  107,  157,
+      107,  157,  107,  157,  107,  157,  107,  157,  107,  157,
+      107,  117,  157,  107,  120,  157,  107,  132,  157,  107,
+      157,  107,  157,  107,  142,  157,  107,  144,  157,  107,
+      147,  157,  107,  148,  157,  107,  149,  157,  107,  150,
+      157,  107,  157,  107,  157,  107,  157,  107,  157,   14,
+       16,    5,  107,  157,  107,  157,  107,  157,  107,  157,
+      107,  157,  107,  157,  107,  157,  107,  157,  107,  157,
+      107,  157,   75,  107,  157,  107,  157,   96,  107,  157,
+
+       78,  107,  157,  107,  157,  107,  157,  107,  157,  107,
+      157,  107,  134,  157,  107,  157,  107,  157,  107,  157,
+      107,  157,  107,  157,  107,  157,  107,  157,  107,  157,
+      107,  115,  157,  107,  157,  107,  157,  107,  157,  107,
+      151,  157,  107,  157,  107,  157,   12,  107,  157,  107,
+      157,  107,  157,  107,  122,  157,  107,  123,  157,  107,
+      124,  157,   83,  107,  157,  107,  157,  107,  157,  107,
+      157,  107,  157,  107,  157,  107,  157,  107,  157,   81,
+      107,  157,  107,  138,  157,  107,  157,  107,  157,  107,
+      145,  157,  107,  157,   91,  107,  157,  107,  157,  107,
+
+      157,  107,  114,  157,  107,  140,  157,  107,  141,  157,
+      107,  157,  107,  153,  157,  107,  155,  157,    8,   11,
+       19,   17,  107,  157,  107,  157,  107,  125,  157,  107,
+      126,  157,  107,  127,  157,   86,  107,  157,  107,  157,
+       84,  107,  157,  107,  157,  107,  157,  107,  157,  107,
+      157,  107,  157,  107,  157,   82,  107,  157,  107,  157,
+      107,  157,   99,  107,  157,  107,  137,  157,  107,  157,
+      107,  157,    7,    8,  107,  157,  107,  157,  107,  128,
+      157,  107,  157,  107,  157,  107,  157,  107,  157,  107,
+      157,   80,  107,  157,  107,  136,  157,   87,  107,  157,
+
+      107,  146,  157,  107,  157,   92,  107,  157,  107,  157,
+      107,  157,  107,  157,  107,  157,  107,  157,   77,  107,
+      157,  107,  157,  107,  157,  107,  135,  157,  107,  157,
+      107,  157,  107,  157,  107,  157,  107,  157,  107,  157,
+      107,  157,  107,  157,   88,  107,  157,   93,  107,  157,
+       89,  107,  157,  107,  157,  107,  157,  107,  157,   90,
+      107,  157,   76,  107,  157,   98,   79,  107,  157,  107,
+      157,  107,  157,  107,  157,   71,  107,  157,  107,  157,
+      107,  157,  107,  157,  107,  157,  107,  157,   72,  101,
+      107,  157,  107,  157,   85,  107,  157,  102,  107,  157,
+
+       73,    9,    9,   12,   10,   10,   11,   97,   95
     } ;
 
-static const flex_int16_t yy_accept[733] =
+static const flex_int16_t yy_accept[738] =
     {   0,
         1,    1,    1,    2,    4,    7,    9,   12,   14,   17,
        20,   23,   25,   28,   31,   34,   37,   40,   43,   46,
@@ -500,74 +501,74 @@ static const flex_int16_t yy_accept[733] =
 
       211,  212,  213,  215,  217,  219,  219,  219,  221,  222,
       223,  225,  227,  229,  231,  233,  235,  237,  239,  241,
-      243,  245,  247,  249,  252,  254,  256,  258,  260,  262,
-      264,  266,  269,  271,  273,  275,  277,  279,  281,  283,
-      285,  287,  289,  291,  293,  295,  296,  297,  297,  297,
-      297,  297,  297,  297,  297,  298,  298,  299,  299,  299,
-      300,  302,  304,  304,  305,  306,  307,  308,  309,  310,
-      311,  313,  315,  315,  316,  316,  316,  317,  317,  319,
+      243,  245,  247,  250,  252,  254,  256,  258,  260,  262,
+      264,  267,  269,  271,  273,  275,  277,  279,  281,  283,
+      285,  287,  289,  291,  293,  294,  295,  295,  295,  295,
+      295,  295,  295,  295,  296,  296,  297,  297,  297,  298,
+      300,  302,  302,  303,  304,  305,  306,  307,  308,  309,
+      311,  313,  313,  314,  314,  314,  315,  315,  317,  319,
       321,  323,  325,  327,  329,  331,  333,  335,  337,  339,
-      341,  343,  345,  347,  349,  351,  353,  356,  358,  360,
+      341,  343,  345,  347,  349,  351,  354,  356,  358,  360,
 
-      362,  364,  366,  368,  370,  372,  374,  376,  378,  380,
-      382,  385,  387,  389,  392,  394,  396,  398,  400,  402,
+      362,  364,  366,  368,  370,  372,  374,  376,  378,  381,
+      383,  385,  388,  390,  392,  394,  396,  398,  400,  402,
       404,  406,  408,  410,  412,  414,  416,  418,  420,  422,
-      424,  426,  428,  428,  428,  428,  428,  428,  428,  428,
-      428,  428,  428,  428,  429,  429,  431,  433,  435,  436,
-      437,  438,  439,  441,  443,  445,  448,  450,  452,  454,
+      424,  424,  424,  424,  424,  424,  424,  424,  424,  424,
+      424,  424,  425,  425,  427,  429,  431,  432,  433,  434,
+      435,  437,  439,  441,  444,  446,  448,  450,  452,  454,
       456,  458,  460,  462,  464,  466,  468,  470,  472,  474,
-      476,  478,  480,  482,  484,  486,  488,  490,  493,  496,
-      498,  501,  504,  506,  508,  510,  512,  515,  518,  520,
-      522,  524,  527,  529,  532,  534,  536,  538,  540,  542,
-
-      544,  546,  548,  550,  552,  555,  557,  559,  561,  564,
-      566,  568,  568,  569,  569,  569,  569,  569,  569,  570,
-      570,  570,  570,  570,  570,  572,  573,  574,  575,  578,
-      580,  582,  585,  587,  589,  591,  593,  595,  598,  600,
-      602,  604,  606,  608,  610,  612,  614,  616,  618,  620,
-      622,  624,  626,  629,  632,  635,  637,  639,  641,  643,
-      646,  649,  651,  653,  655,  657,  660,  662,  664,  666,
-      668,  670,  672,  674,  677,  679,  681,  684,  684,  684,
-      684,  685,  685,  685,  685,  685,  685,  685,  685,  686,
-      688,  690,  692,  694,  696,  698,  700,  702,  702,  704,
-
-      706,  708,  710,  712,  714,  716,  718,  720,  722,  724,
-      726,  728,  730,  732,  734,  736,  738,  741,  744,  747,
-      749,  751,  754,  757,  760,  763,  766,  769,  771,  773,
-      775,  777,  777,  777,  778,  778,  779,  779,  779,  779,
-      779,  779,  780,  782,  784,  786,  788,  790,  792,  794,
-      796,  796,  799,  801,  804,  807,  809,  811,  813,  815,
-      818,  820,  822,  824,  826,  828,  830,  832,  834,  837,
-      839,  841,  843,  846,  848,  850,  850,  850,  850,  850,
-      851,  851,  851,  851,  851,  851,  853,  855,  857,  860,
-      862,  864,  866,  868,  868,  868,  870,  872,  874,  877,
-
-      880,  882,  884,  887,  889,  892,  894,  896,  899,  902,
-      905,  907,  907,  910,  913,  914,  914,  914,  914,  914,
-      914,  915,  915,  915,  916,  916,  917,  919,  921,  924,
-      927,  929,  932,  934,  934,  934,  934,  936,  938,  940,
-      942,  944,  947,  949,  951,  954,  957,  959,  961,  961,
-      962,  963,  963,  963,  963,  963,  965,  967,  969,  971,
-      971,  971,  971,  973,  975,  977,  980,  983,  986,  989,
-      991,  994,  996,  996,  996,  996,  996,  996,  998, 1000,
-     1002, 1004, 1004, 1004, 1004, 1007, 1007, 1007, 1009, 1011,
-     1014, 1016, 1018, 1018, 1018, 1018, 1018, 1018, 1020, 1022,
-
-     1024, 1026, 1026, 1026, 1026, 1028, 1028, 1028, 1028, 1030,
-     1033, 1036, 1039, 1039, 1039, 1039, 1039, 1039, 1041, 1043,
-     1045, 1048, 1048, 1048, 1048, 1051, 1052, 1052, 1055, 1055,
-     1055, 1055, 1055, 1055, 1057, 1059, 1061, 1062, 1062, 1062,
-     1062, 1062, 1062, 1062, 1062, 1062, 1064, 1066, 1068, 1068,
-     1068, 1068, 1068, 1068, 1068, 1068, 1068, 1070, 1072, 1074,
-     1074, 1075, 1075, 1075, 1075, 1075, 1075, 1075, 1078, 1080,
-     1083, 1083, 1083, 1083, 1083, 1083, 1083, 1083, 1086, 1086,
-     1086, 1086, 1086, 1086, 1086, 1086, 1086, 1086, 1086, 1086,
-     1086, 1086, 1086, 1087, 1087, 1087, 1087, 1087, 1087, 1087,
-
-     1087, 1087, 1087, 1087, 1088, 1088, 1088, 1090, 1090, 1090,
-     1090, 1090, 1090, 1090, 1091, 1091, 1091, 1093, 1093, 1093,
-     1093, 1094, 1094, 1094, 1094, 1094, 1094, 1094, 1094, 1094,
-     1095, 1095
+      476,  478,  480,  482,  484,  486,  489,  491,  494,  497,
+      499,  501,  503,  505,  508,  511,  513,  515,  517,  520,
+      522,  525,  527,  529,  531,  533,  535,  537,  539,  541,
+
+      543,  545,  548,  550,  552,  554,  557,  559,  561,  561,
+      562,  562,  562,  562,  562,  562,  563,  563,  563,  563,
+      563,  563,  565,  566,  567,  568,  571,  573,  575,  578,
+      580,  582,  584,  586,  588,  591,  593,  595,  597,  599,
+      601,  603,  605,  607,  609,  611,  613,  615,  617,  619,
+      622,  625,  628,  630,  632,  634,  636,  639,  642,  644,
+      646,  648,  650,  653,  655,  657,  659,  661,  663,  665,
+      667,  670,  672,  674,  677,  677,  677,  677,  678,  678,
+      678,  678,  678,  678,  678,  678,  679,  681,  683,  685,
+      687,  689,  691,  693,  695,  695,  697,  699,  701,  703,
+
+      705,  707,  709,  711,  713,  715,  717,  719,  721,  723,
+      725,  727,  729,  731,  734,  737,  740,  742,  744,  747,
+      750,  753,  756,  759,  762,  764,  766,  768,  770,  770,
+      770,  771,  771,  772,  772,  772,  772,  772,  772,  773,
+      775,  777,  779,  781,  783,  785,  787,  789,  791,  793,
+      793,  796,  798,  801,  804,  806,  808,  810,  812,  815,
+      817,  819,  821,  823,  825,  827,  829,  831,  834,  836,
+      838,  840,  843,  845,  847,  847,  847,  847,  847,  848,
+      848,  848,  848,  848,  848,  850,  852,  854,  857,  860,
+      863,  866,  868,  870,  872,  874,  874,  874,  876,  878,
+
+      880,  883,  886,  888,  890,  893,  895,  898,  900,  902,
+      905,  908,  911,  913,  913,  916,  919,  920,  920,  920,
+      920,  920,  920,  921,  921,  921,  922,  922,  923,  925,
+      927,  930,  933,  936,  939,  941,  944,  946,  946,  946,
+      946,  948,  950,  952,  954,  956,  959,  961,  963,  966,
+      969,  971,  973,  973,  974,  975,  975,  975,  975,  975,
+      977,  979,  982,  984,  986,  986,  986,  986,  988,  990,
+      992,  995,  998, 1001, 1004, 1006, 1009, 1011, 1011, 1011,
+     1011, 1011, 1011, 1013, 1015, 1017, 1019, 1019, 1019, 1019,
+     1022, 1022, 1022, 1024, 1026, 1029, 1031, 1033, 1033, 1033,
+
+     1033, 1033, 1033, 1035, 1037, 1039, 1041, 1041, 1041, 1041,
+     1043, 1043, 1043, 1043, 1045, 1048, 1051, 1054, 1054, 1054,
+     1054, 1054, 1054, 1056, 1058, 1060, 1063, 1063, 1063, 1063,
+     1066, 1067, 1067, 1070, 1070, 1070, 1070, 1070, 1070, 1072,
+     1074, 1076, 1077, 1077, 1077, 1077, 1077, 1077, 1077, 1077,
+     1077, 1079, 1081, 1083, 1083, 1083, 1083, 1083, 1083, 1083,
+     1083, 1083, 1085, 1087, 1089, 1089, 1090, 1090, 1090, 1090,
+     1090, 1090, 1090, 1093, 1095, 1098, 1098, 1098, 1098, 1098,
+     1098, 1098, 1098, 1101, 1101, 1101, 1101, 1101, 1101, 1101,
+     1101, 1101, 1101, 1101, 1101, 1101, 1101, 1101, 1102, 1102,
+
+     1102, 1102, 1102, 1102, 1102, 1102, 1102, 1102, 1102, 1103,
+     1103, 1103, 1105, 1105, 1105, 1105, 1105, 1105, 1105, 1106,
+     1106, 1106, 1108, 1108, 1108, 1108, 1109, 1109, 1109, 1109,
+     1109, 1109, 1109, 1109, 1109, 1110, 1110
     } ;
 
 static const YY_CHAR yy_ec[256] =
@@ -577,15 +578,15 @@ static const YY_CHAR yy_ec[256] =
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    5,    6,    7,    8,    1,    9,   10,   11,   12,
        13,   14,   15,   16,   17,   18,   19,   20,   21,   22,
-       23,   24,   23,   25,   23,   26,   27,   28,   29,   30,
-       31,   32,   33,    1,   34,   35,   36,   37,   38,   39,
-       40,   41,   42,   41,   41,   43,   41,   44,   45,   41,
-       41,   46,   47,   48,   49,   41,   41,   50,   41,   41,
-       51,   52,   53,   54,   55,    1,   56,   57,   58,   59,
-
-       60,   61,   62,   63,   64,   65,   66,   67,   68,   69,
-       70,   71,   65,   72,   73,   74,   75,   76,   77,   78,
-       79,   80,   81,   82,   83,   84,    1,    1,    1,    1,
+       23,   24,   25,   26,   25,   27,   28,   29,   30,   31,
+       32,   33,   34,    1,   35,   36,   37,   38,   39,   40,
+       41,   42,   43,   42,   42,   44,   42,   45,   46,   42,
+       42,   47,   48,   49,   50,   42,   42,   51,   42,   42,
+       52,   53,   54,   55,   56,    1,   57,   58,   59,   60,
+
+       61,   62,   63,   64,   65,   66,   67,   68,   69,   70,
+       71,   72,   66,   73,   74,   75,   76,   77,   78,   79,
+       80,   81,   82,   83,   84,   85,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
@@ -602,343 +603,363 @@ static const YY_CHAR yy_ec[256] =
         1,    1,    1,    1,    1
     } ;
 
-static const YY_CHAR yy_meta[85] =
+static const YY_CHAR yy_meta[86] =
     {   0,
         1,    2,    3,    1,    2,    1,    1,    1,    1,    1,
         1,    4,    1,    1,    1,    5,    1,    1,    1,    6,
-        6,    6,    6,    6,    6,    6,    6,    1,    1,    1,
-        5,    1,    1,    7,    7,    7,    7,    7,    7,    8,
-        8,    8,    8,    8,    8,    8,    8,    8,    8,    8,
-        1,    1,    1,    1,    8,    9,    9,    9,    9,    9,
-        9,   10,   10,   10,   10,   10,   10,   10,   10,   10,
-       10,   10,   10,   10,   10,   10,   10,   10,   10,   10,
-        1,    1,    1,    1
+        6,    6,    6,    6,    6,    6,    6,    6,    1,    1,
+        1,    5,    1,    1,    7,    7,    7,    7,    8,    9,
+       10,   10,   10,   11,   10,   10,   10,   10,   10,   10,
+       10,    1,    1,    1,    1,   10,   12,   12,   12,   12,
+       13,   14,   15,   15,   15,   15,   15,   16,   15,   15,
+       15,   15,   15,   15,   15,   15,   15,   15,   15,   15,
+       15,    1,    1,    1,    1
     } ;
 
-static const flex_int16_t yy_base[759] =
+static const flex_int16_t yy_base[767] =
     {   0,
-        0,    0, 1228, 1229,   83,    0, 1196,   79,   84,   59,
-       82,   82, 1229, 1229, 1195,   79, 1229,   80,   78,   95,
-      138,  199, 1193, 1229,   97, 1193,   76, 1229,    0, 1189,
-     1167,  108, 1175, 1229, 1217, 1229, 1188,   85,   43,   51,
-       76,   75,   69,  101, 1148,   61, 1147, 1156,  103,  106,
-     1146, 1144, 1150, 1229,  110, 1229, 1229,  148,    0, 1229,
-      130, 1229, 1209,  207, 1151,  103, 1149, 1145, 1136, 1229,
-     1229, 1229, 1229,  131, 1229, 1204, 1229, 1229, 1229, 1229,
-     1229, 1229, 1188,  255,  184,    0, 1229,    0,  195,    0,
-      280,  197,  106,    0, 1229, 1229, 1229, 1174, 1229, 1229,
-
-     1229, 1173,    0, 1160, 1162,  147,  163, 1152, 1229, 1229,
-     1130, 1132,  109, 1135,  254, 1129, 1122, 1125, 1134, 1120,
-     1136, 1122, 1129, 1114, 1115, 1112, 1112, 1118, 1114, 1111,
-     1108,    0,  123, 1112,  129, 1110,  113,  138, 1115, 1106,
-     1102, 1105,  131,  142, 1111, 1229, 1229,  230, 1113,  185,
-     1114,  202, 1103, 1115, 1229,  317, 1229, 1140,    0,    0,
-      242,  169,  325,  333,  190, 1229,  200,  318, 1229, 1229,
-     1122,  159,  189, 1229, 1165,  236, 1229, 1164, 1128, 1095,
-     1094,  191, 1096, 1090,  195,  141, 1101, 1082, 1090, 1088,
-     1097,  222, 1077, 1091, 1084, 1128,    0, 1082, 1084, 1094,
-
-     1089, 1076,  210, 1091, 1089, 1085, 1076, 1083, 1069, 1085,
-        0, 1070, 1075,    0, 1076, 1073, 1062, 1060, 1062, 1064,
-     1072, 1057, 1055, 1055, 1068, 1067, 1066, 1055, 1060, 1064,
-     1066, 1054, 1117, 1055, 1057, 1057, 1052, 1112, 1054, 1054,
-     1052, 1049,  357,  381, 1078,  250, 1229,  244, 1229, 1229,
-      320,  319, 1071, 1064, 1065,    0, 1039, 1049, 1035, 1043,
-     1035, 1041, 1032, 1025, 1038, 1028, 1038, 1021,  297, 1025,
-     1020, 1030, 1032, 1019, 1020, 1021, 1063,    0,    0, 1020,
-        0,    0, 1011, 1020, 1008, 1015,    0,    0, 1009, 1020,
-     1005,    0, 1009,    0, 1004, 1004, 1003, 1000, 1013, 1002,
-
-     1007, 1012, 1011, 1012,    0, 1008,  997, 1003,    0,  990,
-     1003, 1059, 1229,  992, 1055, 1056,  997, 1054, 1229,  995,
-      995, 1049,  985,  319, 1229,  316, 1229,  323,    0, 1004,
-     1007,    0,  976,  974,  974,  234,  991,  394,  974,  987,
-      971,  976,  982,  977,  349,  971,  965,  969,  979,  976,
-      961,  978,    0,    0,    0,  964,  965,  971,  961,    0,
-        0,  969,  954,  963,  957,    0,  966,  963,  965,  948,
-      958,  961,  959,    0,  949,  953,    0,  956, 1012, 1011,
-     1229, 1010,  387,  951,  389,  955,  996,  990, 1229,  983,
-      959,  985,  938,  929,  928,  945,  942,  417,  945,  935,
-
-      931,  923,  923,  926,  925,  971,  968,  916,  918,  929,
-      932,  917,  965,  911,  909,  909,    0,    0,    0,  922,
-      923,    0,    0,    0,    0,    0,    0,  925,  918,  918,
-      910,  971,  972, 1229,  971, 1229,  421,  425,  427,  413,
-      968, 1229,  948,  946,  948,  902,  896,  898,  899,  910,
-      894,  439,  906,    0,    0,  891,  888,  900,  933,    0,
-      891,  893,  897,  888,  893,  931,  888,  891,    0,  878,
-      875,  881,  942,  887,  885,    0,  889,  940,  448, 1229,
-      333,  450,  454,  939,  938,  885,  915,  912,    0,  868,
-      863,  875,  867,  866,  456,  857,  871,  866,  874,  873,
-
-      860,  868,  870,  857,    0,  897,  855,    0,    0,    0,
-      851,  862,    0,    0,  907,  878,  414,  862,  913,  460,
-     1229,  370,  912, 1229,  911, 1229,  877,  857,    0,    0,
-      840,    0,  840,  853,  853,  837,  832,  847,  834,  848,
-      828,    0,  827,  845,    0,  844,  838,  839,  833, 1229,
-      883,  852,  428,  853,  442,  847,  855,  830,  831,  814,
-      811,  819,  825,  462,  815,    0,    0,  828,    0,  808,
-      826,  824,  823,  823,  443,  835,  444,  832,  830,  816,
-      817,  808,  801,  814,  814,  466,  809,  812,  811,    0,
-      810,  797,  791,  815,  463,  806,  466,  813,  815,  794,
-
-      790,  789,  788,  780,  798,    0,  839,  459,  796,    0,
-        0,    0,  845,  813,  332,  801,  470,  799,  799,  784,
-        0,  784,  787,  778,    0, 1229,  462,    0,  786,  806,
-      474,  803,  476,  804,  789,  772, 1229,  761,  767,  468,
-      778,  788,  480,  797,  482,  786,  795,  768,  763,  766,
-      471,  752,  780,  484,  779,  485,  774,  777,  761,  752,
-     1229,  476,  744,  779,  487,  755,  491,    0,  706,    0,
-      693,  482,  696,  705,  493,  712,  488,    0,  694,  479,
-      668,  585,  494,  593,  496,  561,  487,  542,  516,  499,
-      512,  501, 1229,  493,  505,  541,  555,  500,  504,  307,
-
-      496,  547,  545, 1229,  542,  538, 1229,  559,  563,  524,
-      480,  527,  524, 1229,  520,  519, 1229,  507,  505,  441,
-      500,  428,  337,  303,  234,  237,  144,  114,   92, 1229,
-     1229,  568,  578,  588,  593,  603,  608,  617,  627,  636,
-      646,  656,  666,  676,  686,  696,  700,  710,  720,  730,
-      737,  746,  756,  766,  776,  786,  796,  806
+        0,    0, 1401, 1402,   84,    0, 1368,   80,   85,   59,
+       83,   83, 1402, 1402, 1367,   80, 1402,   81,   79,   97,
+      140,  202, 1365, 1402,   99, 1365,   77, 1402,    0, 1361,
+     1339,  110, 1347, 1402, 1390, 1402, 1360,   98,   44, 1318,
+       68,   66,   56,   84, 1319,   78, 1318, 1327,  105,  108,
+     1317, 1315, 1321, 1402,   90, 1402, 1402,  172,    0, 1402,
+       89, 1402, 1381,  172, 1322,   81, 1320, 1316, 1307, 1402,
+     1402, 1402, 1402,  133, 1402, 1376, 1402, 1402, 1402, 1402,
+     1402, 1402, 1360,  170,  154,    0, 1402,  196,  193,    0,
+      259,  171,  134,    0, 1402, 1402, 1402, 1345, 1402, 1402,
+
+     1402, 1344,    0, 1331, 1333,  164,  192, 1323, 1402, 1402,
+     1301, 1303,  111, 1306,  231, 1300, 1293, 1306, 1292, 1308,
+     1294, 1301, 1286, 1287, 1284, 1284, 1290, 1286, 1283, 1280,
+        0,  136, 1284,  179, 1282,  126,  161, 1287, 1278, 1274,
+     1277,  185,  183, 1283, 1402, 1402,  290, 1285,  191, 1286,
+      207, 1275, 1287, 1402,  304, 1402, 1312,    0,    0,  289,
+      205,  320,  231,  218, 1402,  254,  305, 1402, 1402, 1294,
+      163,  282, 1402, 1338,  244, 1402, 1337, 1300, 1267, 1266,
+      230, 1268, 1262,  262,  263, 1273, 1254, 1262, 1260, 1269,
+      285, 1249, 1263, 1256, 1300,    0, 1254, 1267, 1262, 1249,
+
+      277, 1264, 1262, 1258, 1249, 1256, 1242, 1258,    0, 1243,
+     1248,    0, 1249, 1246, 1235, 1233, 1235, 1237, 1245, 1230,
+     1228, 1228, 1241, 1240, 1239, 1228, 1233, 1237, 1239, 1227,
+     1291, 1228, 1230, 1230, 1225, 1286, 1227, 1227, 1225, 1222,
+      362,  330, 1251,  288, 1402,  309, 1402, 1402,  325,  310,
+     1244, 1237, 1238,    0, 1212, 1222, 1208, 1216, 1208, 1214,
+     1205, 1198, 1211, 1201, 1211, 1194,  288, 1198, 1193, 1203,
+     1205, 1192, 1193, 1194, 1237,    0, 1193,    0,    0, 1184,
+     1193, 1181, 1188,    0,    0, 1182, 1193, 1178,    0, 1182,
+        0, 1177, 1177, 1176, 1173, 1186, 1175, 1180, 1185, 1184,
+
+     1185,    0, 1181, 1170, 1176,    0, 1163, 1176, 1233, 1402,
+     1165, 1229, 1230, 1170, 1228, 1402, 1168, 1168, 1223, 1158,
+      357, 1402,  318, 1402,  323,    0, 1177, 1180,    0, 1149,
+     1147, 1147,  323, 1164,  395, 1147, 1160, 1144, 1149, 1155,
+     1150,  340, 1144, 1138, 1142, 1152, 1149, 1134, 1151,    0,
+        0,    0, 1137, 1138, 1144, 1134,    0,    0, 1142, 1127,
+     1136, 1130,    0, 1139, 1136, 1138, 1121, 1131, 1134, 1132,
+        0, 1122, 1126,    0, 1129, 1186, 1185, 1402, 1184,  400,
+     1124,  386, 1128, 1170, 1164, 1402, 1156, 1132,  394, 1112,
+     1103, 1102, 1119, 1116,  414, 1119, 1109, 1105, 1097, 1097,
+
+     1100, 1099, 1146, 1143, 1090, 1092, 1103, 1106, 1091, 1140,
+     1085, 1083, 1083,    0,    0,    0, 1096, 1097,    0,    0,
+        0,    0,    0,    0, 1099, 1092, 1092, 1084, 1146, 1147,
+     1402, 1146, 1402,  419,  420,  424,  422, 1143, 1402, 1123,
+     1120,   97, 1123, 1120, 1075, 1069, 1071, 1072, 1083, 1067,
+      426, 1079,    0,    0, 1064, 1061, 1073, 1106,    0, 1064,
+     1066, 1070, 1061, 1066, 1105, 1061, 1064,    0, 1051, 1048,
+     1054, 1116, 1060, 1058,    0, 1062, 1114,  430, 1402,  400,
+      432,  436, 1113, 1112, 1058, 1089, 1085,    0, 1032, 1031,
+        0, 1039, 1034, 1046, 1038, 1037,  450, 1028, 1042, 1037,
+
+     1045, 1044, 1031, 1039, 1041, 1028,    0, 1068, 1026,    0,
+        0,    0, 1022, 1033,    0,    0, 1079, 1049,  317, 1033,
+     1085,  455, 1402,  433, 1084, 1402, 1083, 1402, 1048, 1028,
+     1004,    0,    0,    0, 1010,    0, 1010, 1023, 1023, 1007,
+     1002, 1017, 1004, 1018,  998,    0,  997, 1015,    0, 1014,
+     1008, 1009, 1003, 1402, 1054, 1022,  259, 1023,  437, 1017,
+     1025,    0, 1000, 1001,  984,  981,  989,  995,  457,  985,
+        0,    0,  998,    0,  978,  996,  994,  993,  993,  458,
+     1005,  450, 1002, 1000,  986,  987,  978,  971,  984,  984,
+      461,  979,  982,  981,    0,  980,  967,  961,  985,  461,
+
+      976,  462,  983,  985,  964,  960,  959,  958,  950,  968,
+        0, 1010,  454,  966,    0,    0,    0, 1016,  983,  465,
+      971,  468,  969,  969,  954,    0,  954,  957,  948,    0,
+     1402,  457,    0,  956,  976,  369,  973,  471,  974,  959,
+      942, 1402,  931,  937,  459,  948,  958,  474,  967,  477,
+      956,  936,  838,  833,  836,  469,  822,  850,  476,  849,
+      478,  844,  847,  831,  810, 1402,  472,  678,  712,  481,
+      705,  480,    0,  699,    0,  685,  477,  688,  663,  491,
+      669,  494,    0,  651,  474,  630,  647,  492,  655,  493,
+      632,  485,  622,  594,  496,  593,  497, 1402,  490,  572,
+
+      502,  534,  571,  498,  383,  568,  619,  616, 1402,  558,
+      554, 1402,  539,  553,  538,  490,  542,  540, 1402,  532,
+      525, 1402,  513,  511,  448,  504,  439,  449,  303,  191,
+      204,  158,  202,  172, 1402, 1402,  558,  574,  590,  601,
+      612,  628,  639,  653,  669,  684,  695,  711,  727,  738,
+      754,  770,  786,  802,  812,  828,  844,  860,  873,  888,
+      904,  920,  936,  952,  968,  984
     } ;
 
-static const flex_int16_t yy_def[759] =
+static const flex_int16_t yy_def[767] =
     {   0,
-      731,    1,  731,  731,  731,  732,  731,  733,  731,  731,
-      731,  734,  731,  731,  731,  731,  731,  731,  731,  731,
-      731,  731,  731,  731,  731,  731,  731,  731,  735,  735,
-      735,  735,  735,  731,  731,  731,  731,  735,  735,  735,
-      735,  735,  735,  735,  735,  735,  735,  735,  735,  735,
-      735,  735,  735,  731,  731,  731,  731,  731,  732,  731,
-      733,  731,  733,  731,  731,  731,  731,  731,  731,  731,
-      731,  731,  731,  734,  731,  734,  731,  731,  731,  731,
-      731,  731,  731,  731,  731,  736,  731,   84,   21,   22,
-      731,  731,  731,  737,  731,  731,  731,  731,  731,  731,
-
-      731,  731,  735,  735,  735,  738,  739,  735,  731,  731,
-      735,  735,  735,  735,  735,  735,  735,  735,  735,  735,
-      735,  735,  735,  735,  735,  735,  735,  735,  735,  735,
-      735,  735,  735,  735,  735,  735,  735,  735,  735,  735,
-      735,  735,  735,  735,  735,  731,  731,  731,  731,  731,
-      731,  731,  731,  731,  731,  731,  731,  731,  740,  736,
-      731,  731,  731,  731,  731,  731,  731,  737,  731,  731,
-      735,  735,  738,  731,  738,  739,  731,  739,  735,  735,
-      735,  735,  735,  735,  735,  735,  735,  735,  735,  735,
-      735,  735,  735,  735,  735,  735,  735,  735,  735,  735,
-
-      735,  735,  735,  735,  735,  735,  735,  735,  735,  735,
-      735,  735,  735,  735,  735,  735,  735,  735,  735,  735,
-      735,  735,  735,  735,  735,  735,  735,  735,  735,  735,
-      735,  735,  741,  731,  731,  731,  731,  742,  731,  731,
-      731,  731,  731,  731,  740,  731,  731,  731,  731,  731,
-      731,  731,  735,  735,  735,  735,  735,  735,  735,  735,
-      735,  735,  735,  735,  735,  735,  735,  735,  735,  735,
-      735,  735,  735,  735,  735,  735,  735,  735,  735,  735,
-      735,  735,  735,  735,  735,  735,  735,  735,  735,  735,
-      735,  735,  735,  735,  735,  735,  735,  735,  735,  735,
-
-      735,  735,  735,  735,  735,  735,  735,  735,  735,  735,
-      735,  741,  731,  731,  731,  743,  731,  742,  731,  731,
-      731,  731,  731,  731,  731,  731,  731,  731,  735,  735,
-      735,  735,  735,  735,  735,  735,  735,  735,  735,  735,
-      735,  735,  735,  735,  735,  735,  735,  735,  735,  735,
-      735,  735,  735,  735,  735,  735,  735,  735,  735,  735,
-      735,  735,  735,  735,  735,  735,  735,  735,  735,  735,
-      735,  735,  735,  735,  735,  735,  735,  731,  744,  743,
-      731,  745,  731,  731,  731,  731,  731,  731,  731,  735,
-      735,  735,  735,  735,  735,  735,  735,  731,  735,  735,
-
-      735,  735,  735,  735,  735,  735,  735,  735,  735,  735,
-      735,  735,  735,  735,  735,  735,  735,  735,  735,  735,
-      735,  735,  735,  735,  735,  735,  735,  735,  735,  735,
-      735,  731,  744,  731,  745,  731,  731,  746,  731,  731,
-      731,  731,  735,  735,  735,  735,  735,  735,  735,  735,
-      731,  735,  735,  735,  735,  735,  735,  735,  735,  735,
-      735,  735,  735,  735,  735,  735,  735,  735,  735,  735,
-      735,  735,  735,  735,  735,  747,  731,  746,  746,  731,
-      746,  731,  748,  749,  750,  735,  735,  735,  735,  735,
-      735,  735,  735,  731,  731,  735,  735,  735,  735,  735,
-
-      735,  735,  735,  735,  735,  735,  735,  735,  735,  735,
-      735,  731,  735,  735,  751,  731,  746,  731,  748,  748,
-      731,  748,  749,  731,  750,  731,  735,  735,  735,  735,
-      735,  735,  735,  731,  731,  731,  735,  735,  735,  735,
-      735,  735,  735,  735,  735,  735,  735,  735,  731,  731,
-      751,  731,  746,  731,  748,  735,  735,  735,  735,  731,
-      731,  731,  735,  735,  735,  735,  735,  735,  735,  735,
-      735,  735,  731,  731,  746,  731,  748,  735,  735,  735,
-      735,  731,  731,  731,  735,  731,  752,  735,  735,  735,
-      735,  735,  731,  731,  746,  731,  748,  735,  735,  735,
-
-      735,  731,  731,  731,  735,  752,  752,  752,  735,  735,
-      735,  735,  731,  731,  746,  731,  748,  735,  735,  735,
-      735,  731,  731,  731,  735,  731,  752,  735,  731,  731,
-      746,  731,  748,  735,  735,  735,  731,  731,  731,  752,
-      731,  731,  746,  731,  748,  735,  735,  735,  731,  731,
-      752,  731,  731,  746,  731,  748,  735,  735,  735,  731,
-      731,  752,  731,  731,  746,  731,  748,  735,  735,  735,
-      731,  752,  731,  731,  746,  731,  748,  735,  731,  752,
-      731,  731,  746,  731,  748,  731,  752,  731,  731,  746,
-      731,  748,  731,  752,  731,  753,  754,  731,  748,  752,
-
-      731,  753,  753,  731,  754,  754,  731,  755,  756,  757,
-      731,  755,  755,  731,  756,  756,  731,  757,  757,  731,
-      757,  731,  731,  731,  731,  731,  731,  758,  758,  731,
-        0,  731,  731,  731,  731,  731,  731,  731,  731,  731,
-      731,  731,  731,  731,  731,  731,  731,  731,  731,  731,
-      731,  731,  731,  731,  731,  731,  731,  731
+      736,    1,  736,  736,  736,  737,  736,  738,  736,  736,
+      736,  739,  736,  736,  736,  736,  736,  736,  736,  736,
+      736,  736,  736,  736,  736,  736,  736,  736,  740,  740,
+      740,  740,  740,  736,  736,  736,  736,  740,  740,  740,
+      740,  740,  740,  740,  740,  740,  740,  740,  740,  740,
+      740,  740,  740,  736,  736,  736,  736,  736,  737,  736,
+      738,  736,  738,  736,  736,  736,  736,  736,  736,  736,
+      736,  736,  736,  739,  736,  739,  736,  736,  736,  736,
+      736,  736,  736,  741,  736,  742,  736,  741,   21,   22,
+      736,  736,  736,  743,  736,  736,  736,  736,  736,  736,
+
+      736,  736,  740,  740,  740,  744,  745,  740,  736,  736,
+      740,  740,  740,  740,  740,  740,  740,  740,  740,  740,
+      740,  740,  740,  740,  740,  740,  740,  740,  740,  740,
+      740,  740,  740,  740,  740,  740,  740,  740,  740,  740,
+      740,  740,  740,  740,  736,  736,  736,  736,  736,  736,
+      736,  736,  736,  736,  736,  736,  736,  746,  742,  736,
+      736,  736,  747,  736,  736,  736,  743,  736,  736,  740,
+      740,  744,  736,  744,  745,  736,  745,  740,  740,  740,
+      740,  740,  740,  740,  740,  740,  740,  740,  740,  740,
+      740,  740,  740,  740,  740,  740,  740,  740,  740,  740,
+
+      740,  740,  740,  740,  740,  740,  740,  740,  740,  740,
+      740,  740,  740,  740,  740,  740,  740,  740,  740,  740,
+      740,  740,  740,  740,  740,  740,  740,  740,  740,  740,
+      748,  736,  736,  736,  736,  749,  736,  736,  736,  736,
+      736,  750,  746,  736,  736,  736,  736,  736,  736,  736,
+      740,  740,  740,  740,  740,  740,  740,  740,  740,  740,
+      740,  740,  740,  740,  740,  740,  740,  740,  740,  740,
+      740,  740,  740,  740,  740,  740,  740,  740,  740,  740,
+      740,  740,  740,  740,  740,  740,  740,  740,  740,  740,
+      740,  740,  740,  740,  740,  740,  740,  740,  740,  740,
+
+      740,  740,  740,  740,  740,  740,  740,  740,  748,  736,
+      736,  736,  751,  736,  749,  736,  736,  736,  736,  736,
+      736,  736,  736,  736,  736,  740,  740,  740,  740,  740,
+      740,  740,  740,  740,  740,  740,  740,  740,  740,  740,
+      740,  740,  740,  740,  740,  740,  740,  740,  740,  740,
+      740,  740,  740,  740,  740,  740,  740,  740,  740,  740,
+      740,  740,  740,  740,  740,  740,  740,  740,  740,  740,
+      740,  740,  740,  740,  736,  752,  751,  736,  753,  736,
+      736,  736,  736,  736,  736,  736,  740,  740,  740,  740,
+      740,  740,  740,  740,  736,  740,  740,  740,  740,  740,
+
+      740,  740,  740,  740,  740,  740,  740,  740,  740,  740,
+      740,  740,  740,  740,  740,  740,  740,  740,  740,  740,
+      740,  740,  740,  740,  740,  740,  740,  740,  736,  752,
+      736,  753,  736,  736,  754,  736,  736,  736,  736,  740,
+      740,  740,  740,  740,  740,  740,  740,  740,  740,  736,
+      740,  740,  740,  740,  740,  740,  740,  740,  740,  740,
+      740,  740,  740,  740,  740,  740,  740,  740,  740,  740,
+      740,  740,  740,  740,  755,  736,  754,  754,  736,  754,
+      736,  756,  757,  758,  740,  740,  740,  740,  740,  740,
+      740,  740,  740,  740,  740,  736,  736,  740,  740,  740,
+
+      740,  740,  740,  740,  740,  740,  740,  740,  740,  740,
+      740,  740,  740,  736,  740,  740,  759,  736,  754,  736,
+      756,  756,  736,  756,  757,  736,  758,  736,  740,  740,
+      740,  740,  740,  740,  740,  740,  740,  736,  736,  736,
+      740,  740,  740,  740,  740,  740,  740,  740,  740,  740,
+      740,  740,  736,  736,  759,  736,  754,  736,  756,  740,
+      740,  740,  740,  740,  736,  736,  736,  740,  740,  740,
+      740,  740,  740,  740,  740,  740,  740,  736,  736,  754,
+      736,  756,  740,  740,  740,  740,  736,  736,  736,  740,
+      736,  760,  740,  740,  740,  740,  740,  736,  736,  754,
+
+      736,  756,  740,  740,  740,  740,  736,  736,  736,  740,
+      760,  760,  760,  740,  740,  740,  740,  736,  736,  754,
+      736,  756,  740,  740,  740,  740,  736,  736,  736,  740,
+      736,  760,  740,  736,  736,  754,  736,  756,  740,  740,
+      740,  736,  736,  736,  760,  736,  736,  754,  736,  756,
+      740,  740,  740,  736,  736,  760,  736,  736,  754,  736,
+      756,  740,  740,  740,  736,  736,  760,  736,  736,  754,
+      736,  756,  740,  740,  740,  736,  760,  736,  736,  754,
+      736,  756,  740,  736,  760,  736,  736,  754,  736,  756,
+      736,  760,  736,  736,  754,  736,  756,  736,  760,  736,
+
+      761,  762,  736,  756,  760,  736,  761,  761,  736,  762,
+      762,  736,  763,  764,  765,  736,  763,  763,  736,  764,
+      764,  736,  765,  765,  736,  765,  736,  736,  736,  736,
+      736,  736,  766,  766,  736,    0,  736,  736,  736,  736,
+      736,  736,  736,  736,  736,  736,  736,  736,  736,  736,
+      736,  736,  736,  736,  736,  736,  736,  736,  736,  736,
+      736,  736,  736,  736,  736,  736
     } ;
 
-static const flex_int16_t yy_nxt[1314] =
+static const flex_int16_t yy_nxt[1488] =
     {   0,
         4,    5,    6,    5,    5,    7,    8,    9,   10,   11,
        12,   13,   14,   15,   16,   17,   18,   19,   20,   21,
-       22,   22,   22,   22,   22,   22,   22,   23,   24,   25,
-       26,   27,   28,   29,   29,   29,   29,   29,   30,   31,
-       29,   29,   32,   29,   29,   29,   29,   33,   29,   29,
-       34,   35,   36,   37,   38,   39,   40,   41,   42,   43,
-       44,   45,   29,   46,   29,   29,   47,   29,   29,   29,
-       29,   48,   49,   50,   51,   52,   53,   29,   29,   29,
-       54,   55,   56,   57,   58,   62,   58,   58,   64,   70,
-       71,   72,   75,   78,  730,   83,   80,   84,   84,   84,
-
-       84,   84,   84,   84,   84,   96,  101,  102,   85,   79,
-       81,   82,   73,   86,  106,  116,  730,  117,  107,  111,
-      118,  132,  119,  112,   97,   87,   98,   99,  113,  133,
-       63,  120,  114,   76,  123,  125,   62,  126,  121,  115,
-      146,   75,   65,   66,  124,  122,  127,   67,  167,   58,
-       68,   58,   58,  174,   69,   88,  128,   89,   89,   89,
-       89,   89,   89,   90,   90,  136,  137,  129,  140,  150,
-      130,  151,  167,  177,  220,   91,  138,  141,  182,  139,
-       92,   63,   76,  183,  142,  158,   93,   94,  158,  213,
-      216,  147,  221,  222,  228,  174,  214,   91,  175,  265,
-
-      254,  217,  218,  229,   92,  230,  238,  255,  231,  223,
-      266,  248,   93,  159,  178,   94,   88,  728,   90,   90,
-       90,   90,   90,   90,   90,   90,  148,  148,  148,  148,
-      148,  148,  148,  148,  233,  248,   91,  161,  166,  165,
-      175,   92,  250,  162,  731,  166,  177,   93,  235,  148,
-      148,  148,  148,  148,  148,  148,  148,  236,   91,  259,
-      239,  161,  260,  165,  166,   92,  250,  263,  264,  162,
-      240,  166,  731,   93,   84,   84,   84,   84,   84,   84,
-       84,   84,  283,  284,  246,  272,  325,  178,  395,  396,
-      247,  727,  156,  157,  163,  273,  163,  157,  247,  164,
-
-      164,  164,  164,  164,  164,  164,  164,  726,  246,  185,
-      325,  186,  187,  188,  156,  157,  247,  189,  710,  626,
-      387,  157,  190,  387,  247,  191,  192,  193,  194,  195,
-      196,  243,  388,  243,  480,  480,  244,  244,  244,  244,
-      244,  244,  244,  244,  164,  164,  164,  164,  164,  164,
-      164,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-      251,  328,  326,  344,  327,  389,  252,  631,  327,  406,
-      345,  249,  521,  407,  725,  249,  244,  244,  244,  244,
-      244,  244,  244,  244,  251,  328,  326,  517,  437,  389,
-      327,  438,  252,  249,  327,  398,  724,  398,  398,  249,
-
-      244,  244,  244,  244,  244,  244,  244,  244,  440,  440,
-      440,  440,  440,  440,  440,  440,  480,  484,  398,  157,
-      398,  398,  437,  157,  555,  437,  479,  480,  482,  479,
-      480,  483,  440,  440,  440,  440,  440,  440,  440,  440,
-      495,  157,  495,  495,  521,  480,  521,  157,  399,  479,
-      480,  482,  479,  553,  482,  520,  521,  495,  520,  495,
-      495,  520,  521,  586,  520,  480,  586,  586,  521,  575,
-      586,  626,  521,  587,  626,  477,  480,  606,  521,  481,
-      626,  577,  480,  626,  521,  597,  480,  521,  626,  480,
-      521,  626,  451,  521,  626,  480,  480,  595,  521,  626,
-
-      723,  480,  481,  521,  518,  626,  521,  643,  522,  615,
-      535,  645,  721,  722,  522,  656,  633,  721,  627,  719,
-      617,  717,  717,  654,  675,  685,  714,  665,  667,  714,
-      662,  536,  640,  672,  677,  720,  719,  680,  683,  651,
-      707,  692,  703,  704,  707,  703,  694,  704,  690,  704,
-      711,  700,  687,  697,  708,  699,  706,  707,  709,  706,
-      713,  714,  701,  713,  716,  717,  698,  716,   59,   59,
-      696,   59,   59,   59,   59,   59,   59,   59,   61,   61,
-       61,   61,   61,   61,   61,   61,   61,   61,   74,   74,
-       74,   74,   74,   74,   74,   74,   74,   74,  103,  103,
-
-      103,  103,  103,  160,  160,  695,  160,  160,  160,  160,
-      160,  160,  160,  168,  168,  693,  168,  173,  173,  173,
-      173,  173,  173,  173,  173,  173,  173,  176,  176,  176,
-      176,  176,  176,  176,  176,  176,  176,  245,  691,  689,
-      245,  245,  245,  245,  245,  245,  312,  312,  312,  312,
-      312,  312,  312,  312,  312,  312,  318,  318,  318,  318,
-      318,  318,  318,  318,  318,  318,  380,  380,  380,  380,
-      380,  380,  380,  380,  380,  380,  433,  433,  433,  433,
-      433,  433,  433,  433,  433,  433,  435,  435,  435,  435,
-      435,  435,  435,  435,  435,  435,  478,  478,  478,  478,
-
-      478,  478,  478,  478,  478,  478,  515,  515,  515,  515,
-      519,  519,  519,  519,  519,  519,  519,  519,  519,  519,
-      523,  523,  523,  523,  523,  523,  523,  523,  523,  523,
+       22,   22,   22,   22,   22,   22,   22,   22,   23,   24,
+       25,   26,   27,   28,   29,   29,   29,   29,   29,   30,
+       31,   29,   29,   32,   29,   29,   29,   29,   33,   29,
+       29,   34,   35,   36,   37,   38,   39,   40,   41,   42,
+       43,   44,   45,   29,   46,   29,   29,   47,   29,   29,
+       29,   29,   48,   49,   50,   51,   52,   53,   29,   29,
+       29,   54,   55,   56,   57,   58,   62,   58,   58,   64,
+       70,   71,   72,   75,   78,   62,   83,   80,   84,   84,
+
+       84,   84,   84,   84,   84,   84,   84,   96,  101,  102,
+       85,   79,   81,   82,   73,   86,  106,  116,  487,  117,
+      107,  145,  488,  124,  119,  125,  122,   97,   87,   98,
+       99,  120,   63,  111,  126,   76,  123,  112,  121,  131,
+      127,   63,  113,   75,   65,   66,  114,  132,  149,   67,
+      150,  128,   68,  115,  129,  157,   69,   88,  157,   89,
+       89,   89,   89,   89,   89,   89,   90,   90,  135,  136,
+      173,  139,  146,   58,  735,   58,   58,  166,   91,  137,
+      140,  181,  138,   92,  158,   76,  182,  141,  218,   93,
+       94,  147,  147,  147,  147,  147,  147,  147,  147,  147,
+
+       91,  166,  176,  211,  735,  252,  219,   92,  155,  156,
+      212,  236,  253,  156,  164,   93,  174,  220,   94,   88,
+      165,   90,   90,   90,   90,   90,   90,   90,   90,   90,
+      155,  156,  733,  221,  155,  156,  160,  156,  164,  156,
+       91,  214,  161,  736,  177,   92,  165,  228,  246,  226,
+      229,   93,  215,  216,  176,  233,  155,  156,  227,  732,
+      160,  479,   91,  156,  234,  731,  237,  165,  161,   92,
+      247,  736,  246,  162,  247,  162,  238,   93,  163,  163,
+      163,  163,  163,  163,  163,  163,  163,  184,  173,  185,
+      186,  187,  247,  165,  231,  188,  177,  248,  247,  257,
+
+      189,  580,  258,  190,  191,  192,  193,  194,  195,  147,
+      147,  147,  147,  147,  147,  147,  147,  147,  241,  479,
+      241,  248,  263,  242,  242,  242,  242,  242,  242,  242,
+      242,  242,  244,  264,  174,  261,  262,  245,  245,  163,
+      163,  163,  163,  163,  163,  163,  163,  163,  249,  270,
+      280,  281,  322,  325,  250,  341,  244,  557,  384,  271,
+      403,  384,  342,  245,  245,  404,  386,  324,  323,  156,
+      385,  479,  249,  156,  324,  730,  322,  325,  392,  393,
+      250,  242,  242,  242,  242,  242,  242,  242,  242,  242,
+      386,  156,  323,  324,  715,  631,  395,  156,  395,  395,
+
+      324,  434,  479,  648,  435,  437,  437,  437,  437,  437,
+      437,  437,  437,  437,  442,  395,  443,  395,  395,  444,
+      434,  478,  479,  434,  478,  481,  483,  497,  482,  497,
+      497,  478,  479,  481,  478,  523,  481,  522,  523,  523,
+      522,  437,  437,  437,  437,  437,  437,  437,  437,  437,
+      396,  497,  523,  497,  497,  519,  522,  523,  591,  522,
+      479,  591,  591,  479,  523,  591,  631,  479,  592,  631,
+      523,  631,  611,  523,  476,  480,  479,  582,  479,  523,
+      523,  631,  523,  479,  631,  480,  631,  520,  559,  631,
+      450,  524,  602,  479,  479,  523,  523,  631,  479,  523,
+
+      523,  636,  631,  708,  709,  539,  708,  650,  620,  729,
+      524,  661,  728,  600,  632,  638,  726,  622,  659,  680,
+      670,  727,  672,  726,  682,  724,  540,  722,  645,  667,
+      677,  656,  690,  685,  722,  711,  712,  688,  711,  697,
+      718,  719,  719,  718,  719,  699,  725,  695,  692,  705,
+      724,  702,  704,  714,  721,  722,  712,  721,   59,   59,
+      712,   59,   59,   59,   59,   59,   59,   59,   59,   59,
+       59,   59,   59,   59,   61,   61,   61,   61,   61,   61,
+       61,   61,   61,   61,   61,   61,   61,   61,   61,   61,
+       74,   74,   74,   74,   74,   74,   74,   74,   74,   74,
+
+       74,   74,   74,   74,   74,   74,  103,  103,  103,  103,
+      103,  103,  103,  103,  103,  103,  103,   84,  709,   84,
+       84,  709,   84,  716,   84,   84,  713,   84,  159,  159,
+      706,  159,  159,  159,  159,  159,  159,  159,  159,  159,
+      159,  159,  159,  159,  167,  167,  167,  167,  703,  701,
+      167,  167,  167,  172,  172,  172,  172,  172,  172,  172,
+      172,  172,  172,  172,  172,  172,  172,  172,  172,  175,
+      175,  175,  175,  175,  175,  175,  175,  175,  175,  175,
+      175,  175,  175,  175,  175,  243,  700,  698,  243,  243,
+      243,  243,  243,  243,  243,  243,  243,  243,  243,  243,
+
+      163,  696,  694,  163,  693,  163,  691,  689,  163,  687,
+      163,  309,  309,  309,  309,  309,  309,  309,  309,  309,
+      309,  309,  309,  309,  309,  309,  309,  315,  315,  315,
+      315,  315,  315,  315,  315,  315,  315,  315,  315,  315,
+      315,  315,  315,  242,  686,  684,  242,  683,  242,  681,
+      679,  242,  678,  242,  377,  377,  377,  377,  377,  377,
+      377,  377,  377,  377,  377,  377,  377,  377,  377,  377,
+      430,  430,  430,  430,  430,  430,  430,  430,  430,  430,
+      430,  430,  430,  430,  430,  430,  432,  432,  432,  432,
+      432,  432,  432,  432,  432,  432,  432,  432,  432,  432,
+
+      432,  432,  477,  477,  477,  477,  477,  477,  477,  477,
+      477,  477,  477,  477,  477,  477,  477,  477,  517,  517,
+      517,  517,  517,  517,  517,  517,  517,  517,  521,  521,
+      521,  521,  521,  521,  521,  521,  521,  521,  521,  521,
+      521,  521,  521,  521,  525,  525,  525,  525,  525,  525,
       525,  525,  525,  525,  525,  525,  525,  525,  525,  525,
-      551,  688,  551,  551,  551,  551,  551,  607,  686,  684,
-      682,  681,  679,  678,  607,  607,  702,  702,  702,  702,
-      702,  702,  702,  702,  702,  702,  705,  705,  705,  705,
-      705,  705,  705,  705,  705,  705,  712,  712,  712,  712,
-      712,  712,  712,  712,  712,  712,  715,  715,  715,  715,
-      715,  715,  715,  715,  715,  715,  718,  718,  676,  718,
-
-      718,  718,  718,  718,  718,  718,  729,  729,  729,  729,
-      729,  729,  729,  729,  729,  729,  674,  673,  671,  670,
-      669,  668,  666,  664,  663,  661,  660,  659,  658,  657,
-      655,  653,  652,  650,  649,  648,  647,  646,  644,  642,
-      641,  639,  638,  637,  636,  635,  634,  632,  630,  629,
-      628,  626,  625,  624,  623,  622,  621,  620,  619,  618,
-      616,  614,  613,  612,  611,  610,  609,  608,  605,  604,
-      603,  602,  601,  600,  599,  598,  596,  594,  593,  592,
-      591,  590,  589,  588,  585,  584,  583,  582,  581,  580,
-      579,  578,  576,  574,  550,  573,  572,  571,  570,  569,
-
-      568,  567,  566,  565,  564,  563,  562,  561,  560,  559,
-      558,  557,  556,  526,  524,  521,  554,  552,  550,  549,
-      548,  547,  546,  545,  544,  543,  542,  541,  540,  539,
-      538,  537,  534,  533,  532,  531,  530,  529,  528,  527,
-      526,  524,  480,  516,  514,  513,  512,  511,  510,  509,
-      508,  507,  506,  505,  504,  503,  502,  501,  500,  499,
-      498,  497,  496,  494,  493,  492,  491,  490,  489,  488,
-      487,  486,  485,  436,  434,  476,  475,  474,  473,  472,
-      471,  470,  469,  468,  467,  466,  465,  464,  463,  462,
-      461,  460,  459,  458,  457,  456,  455,  454,  453,  452,
-
-      450,  449,  448,  447,  446,  445,  444,  443,  442,  388,
-      441,  439,  436,  381,  434,  432,  431,  430,  429,  428,
-      427,  426,  425,  424,  423,  422,  421,  420,  419,  418,
-      417,  416,  415,  414,  413,  412,  411,  410,  409,  408,
-      405,  404,  403,  402,  401,  400,  397,  394,  393,  392,
-      391,  390,  386,  385,  384,  383,  319,  382,  381,  379,
-      378,  313,  377,  376,  375,  374,  373,  372,  371,  370,
-      369,  368,  367,  366,  365,  364,  363,  362,  361,  360,
-      359,  358,  357,  356,  355,  354,  353,  352,  351,  350,
-      349,  348,  347,  346,  343,  342,  341,  340,  339,  338,
-
-      337,  336,  335,  334,  333,  332,  331,  330,  329,  324,
-      323,  322,  321,  320,  319,  317,  316,  315,  314,  313,
-      311,  310,  309,  308,  307,  306,  305,  304,  303,  302,
-      301,  300,  299,  298,  297,  296,  295,  294,  293,  292,
-      291,  290,  289,  288,  287,  286,  285,  282,  281,  280,
-      279,  278,  277,  276,  275,  274,  271,  270,  269,  268,
-      267,  262,  261,  258,  257,  256,  731,  731,  253,  159,
-      242,  241,  237,  234,  232,  227,  226,  225,  224,  219,
-      215,  212,  211,  210,  209,  208,  207,  206,  205,  204,
-      203,  202,  201,  200,  199,  198,  197,  184,  181,  180,
-
-      179,  172,  171,  170,  169,  155,  731,  154,  153,  152,
-      149,  731,  145,  144,  143,  135,  134,  131,  110,  109,
-      108,  105,  104,  100,   95,   77,   60,  731,    3,  731,
-      731,  731,  731,  731,  731,  731,  731,  731,  731,  731,
-      731,  731,  731,  731,  731,  731,  731,  731,  731,  731,
-      731,  731,  731,  731,  731,  731,  731,  731,  731,  731,
-      731,  731,  731,  731,  731,  731,  731,  731,  731,  731,
-      731,  731,  731,  731,  731,  731,  731,  731,  731,  731,
-      731,  731,  731,  731,  731,  731,  731,  731,  731,  731,
-      731,  731,  731,  731,  731,  731,  731,  731,  731,  731,
-
-      731,  731,  731,  731,  731,  731,  731,  731,  731,  731,
-      731,  731,  731
+      527,  527,  527,  527,  527,  527,  527,  527,  527,  527,
+      527,  527,  527,  527,  527,  527,  555,  676,  555,  555,
+      555,  555,  555,  555,  555,  555,  555,  555,  555,  612,
+      675,  674,  673,  671,  669,  668,  666,  665,  664,  612,
+
+      612,  612,  612,  612,  707,  707,  707,  707,  707,  707,
+      707,  707,  707,  707,  707,  707,  707,  707,  707,  707,
+      710,  710,  710,  710,  710,  710,  710,  710,  710,  710,
+      710,  710,  710,  710,  710,  710,  717,  717,  717,  717,
+      717,  717,  717,  717,  717,  717,  717,  717,  717,  717,
+      717,  717,  720,  720,  720,  720,  720,  720,  720,  720,
+      720,  720,  720,  720,  720,  720,  720,  720,  723,  723,
+      663,  723,  723,  723,  723,  723,  723,  723,  723,  723,
+      723,  723,  723,  723,  734,  734,  734,  734,  734,  734,
+      734,  734,  734,  734,  734,  734,  734,  734,  734,  734,
+
+      662,  660,  658,  657,  655,  654,  653,  652,  651,  649,
+      647,  646,  644,  643,  642,  641,  640,  639,  637,  635,
+      634,  633,  631,  630,  629,  628,  627,  626,  625,  624,
+      623,  621,  619,  618,  617,  616,  615,  614,  613,  610,
+      609,  608,  607,  606,  605,  604,  603,  601,  599,  598,
+      597,  596,  595,  594,  593,  590,  589,  588,  587,  586,
+      585,  584,  583,  581,  579,  554,  578,  577,  576,  575,
+      574,  573,  572,  571,  570,  569,  568,  567,  566,  565,
+      564,  563,  562,  561,  560,  528,  526,  523,  558,  556,
+      554,  553,  552,  551,  550,  549,  548,  547,  546,  545,
+
+      544,  543,  542,  541,  538,  537,  536,  535,  534,  533,
+      532,  531,  530,  529,  528,  526,  479,  518,  516,  515,
+      514,  513,  512,  511,  510,  509,  508,  507,  506,  505,
+      504,  503,  502,  501,  500,  499,  498,  496,  495,  494,
+      493,  492,  491,  490,  489,  486,  485,  484,  433,  431,
+      475,  474,  473,  472,  471,  470,  469,  468,  467,  466,
+      465,  464,  463,  462,  461,  460,  459,  458,  457,  456,
+      455,  454,  453,  452,  451,  449,  448,  447,  446,  445,
+      441,  440,  439,  385,  438,  436,  433,  378,  431,  429,
+      428,  427,  426,  425,  424,  423,  422,  421,  420,  419,
+
+      418,  417,  416,  415,  414,  413,  412,  411,  410,  409,
+      408,  407,  406,  405,  402,  401,  400,  399,  398,  397,
+      394,  391,  390,  389,  388,  387,  383,  382,  381,  380,
+      316,  379,  378,  376,  375,  310,  374,  373,  372,  371,
+      370,  369,  368,  367,  366,  365,  364,  363,  362,  361,
+      360,  359,  358,  357,  356,  355,  354,  353,  352,  351,
+      350,  349,  348,  347,  346,  345,  344,  343,  340,  339,
+      338,  337,  336,  335,  334,  333,  332,  331,  330,  329,
+      328,  327,  326,  321,  320,  319,  318,  317,  316,  314,
+      313,  312,  311,  310,  308,  307,  306,  305,  304,  303,
+
+      302,  301,  300,  299,  298,  297,  296,  295,  294,  293,
+      292,  291,  290,  289,  288,  287,  286,  285,  284,  283,
+      282,  279,  278,  277,  276,  275,  274,  273,  272,  269,
+      268,  267,  266,  265,  260,  259,  256,  255,  254,  736,
+      736,  251,  158,  240,  239,  235,  232,  230,  225,  224,
+      223,  222,  217,  213,  210,  209,  208,  207,  206,  205,
+      204,  203,  202,  201,  200,  199,  198,  197,  196,  183,
+      180,  179,  178,  171,  170,  169,  168,  154,  736,  153,
+      152,  151,  148,  736,  144,  143,  142,  134,  133,  130,
+      118,  110,  109,  108,  105,  104,  100,   95,   77,   60,
+
+      736,    3,  736,  736,  736,  736,  736,  736,  736,  736,
+      736,  736,  736,  736,  736,  736,  736,  736,  736,  736,
+      736,  736,  736,  736,  736,  736,  736,  736,  736,  736,
+      736,  736,  736,  736,  736,  736,  736,  736,  736,  736,
+      736,  736,  736,  736,  736,  736,  736,  736,  736,  736,
+      736,  736,  736,  736,  736,  736,  736,  736,  736,  736,
+      736,  736,  736,  736,  736,  736,  736,  736,  736,  736,
+      736,  736,  736,  736,  736,  736,  736,  736,  736,  736,
+      736,  736,  736,  736,  736,  736,  736
     } ;
 
-static const flex_int16_t yy_chk[1314] =
+static const flex_int16_t yy_chk[1488] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
@@ -948,143 +969,161 @@ static const flex_int16_t yy_chk[1314] =
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    5,    8,    5,    5,    9,   10,
-       10,   11,   12,   16,  729,   19,   18,   19,   19,   19,
-
-       19,   19,   19,   19,   19,   25,   27,   27,   20,   16,
-       18,   18,   11,   20,   32,   39,  728,   39,   32,   38,
-       40,   46,   40,   38,   25,   20,   25,   25,   38,   46,
-        8,   41,   38,   12,   42,   43,   61,   43,   41,   38,
-       55,   74,    9,    9,   42,   41,   43,    9,   93,   58,
-        9,   58,   58,  106,    9,   21,   44,   21,   21,   21,
-       21,   21,   21,   21,   21,   49,   49,   44,   50,   66,
-       44,   66,   93,  107,  137,   21,   49,   50,  113,   49,
-       21,   61,   74,  113,   50,   85,   21,   21,   85,  133,
-      135,   55,  137,  138,  143,  173,  133,   21,  106,  186,
-
-      172,  135,  135,  143,   21,  144,  152,  172,  144,  138,
-      186,  162,   21,   85,  107,   21,   22,  727,   22,   22,
-       22,   22,   22,   22,   22,   22,   64,   64,   64,   64,
-       64,   64,   64,   64,  148,  162,   22,   89,  165,   92,
-      173,   22,  167,   89,   89,   92,  176,   22,  150,  148,
-      148,  148,  148,  148,  148,  148,  148,  150,   22,  182,
-      152,   89,  182,   92,  165,   22,  167,  185,  185,   89,
-      152,   92,   89,   22,   84,   84,   84,   84,   84,   84,
-       84,   84,  203,  203,  161,  192,  248,  176,  336,  336,
-      161,  726,   84,   84,   91,  192,   91,   84,  246,   91,
-
-       91,   91,   91,   91,   91,   91,   91,  725,  161,  115,
-      248,  115,  115,  115,   84,   84,  161,  115,  700,  700,
-      324,   84,  115,  324,  246,  115,  115,  115,  115,  115,
-      115,  156,  324,  156,  615,  481,  156,  156,  156,  156,
-      156,  156,  156,  156,  163,  163,  163,  163,  163,  163,
-      163,  163,  164,  164,  164,  164,  164,  164,  164,  164,
-      168,  252,  251,  269,  326,  328,  168,  615,  251,  345,
-      269,  164,  522,  345,  724,  164,  243,  243,  243,  243,
-      243,  243,  243,  243,  168,  252,  251,  481,  383,  328,
-      326,  383,  168,  164,  251,  338,  723,  338,  338,  164,
-
-      244,  244,  244,  244,  244,  244,  244,  244,  385,  385,
-      385,  385,  385,  385,  385,  385,  517,  440,  398,  244,
-      398,  398,  437,  244,  522,  437,  438,  438,  439,  438,
-      553,  439,  440,  440,  440,  440,  440,  440,  440,  440,
-      452,  244,  452,  452,  555,  575,  577,  244,  338,  479,
-      479,  482,  479,  517,  482,  483,  483,  495,  483,  495,
-      495,  520,  520,  564,  520,  595,  564,  586,  597,  553,
-      586,  608,  617,  564,  627,  437,  631,  586,  633,  438,
-      640,  555,  643,  651,  645,  577,  654,  656,  662,  665,
-      677,  680,  398,  667,  672,  675,  683,  575,  685,  687,
-
-      722,  690,  479,  692,  482,  694,  699,  631,  483,  595,
-      495,  633,  721,  720,  520,  645,  617,  719,  608,  718,
-      597,  716,  715,  643,  665,  677,  713,  654,  656,  712,
-      651,  495,  627,  662,  667,  711,  710,  672,  675,  640,
-      706,  685,  696,  696,  705,  696,  687,  703,  683,  702,
-      701,  694,  680,  690,  698,  692,  697,  697,  699,  697,
-      708,  708,  695,  708,  709,  709,  691,  709,  732,  732,
-      689,  732,  732,  732,  732,  732,  732,  732,  733,  733,
-      733,  733,  733,  733,  733,  733,  733,  733,  734,  734,
-      734,  734,  734,  734,  734,  734,  734,  734,  735,  735,
-
-      735,  735,  735,  736,  736,  688,  736,  736,  736,  736,
-      736,  736,  736,  737,  737,  686,  737,  738,  738,  738,
-      738,  738,  738,  738,  738,  738,  738,  739,  739,  739,
-      739,  739,  739,  739,  739,  739,  739,  740,  684,  682,
-      740,  740,  740,  740,  740,  740,  741,  741,  741,  741,
-      741,  741,  741,  741,  741,  741,  742,  742,  742,  742,
-      742,  742,  742,  742,  742,  742,  743,  743,  743,  743,
-      743,  743,  743,  743,  743,  743,  744,  744,  744,  744,
-      744,  744,  744,  744,  744,  744,  745,  745,  745,  745,
-      745,  745,  745,  745,  745,  745,  746,  746,  746,  746,
-
-      746,  746,  746,  746,  746,  746,  747,  747,  747,  747,
-      748,  748,  748,  748,  748,  748,  748,  748,  748,  748,
+        1,    1,    1,    1,    1,    5,    8,    5,    5,    9,
+       10,   10,   11,   12,   16,   61,   19,   18,   19,   19,
+
+       19,   19,   19,   19,   19,   19,   19,   25,   27,   27,
+       20,   16,   18,   18,   11,   20,   32,   39,  442,   39,
+       32,   55,  442,   43,   41,   43,   42,   25,   20,   25,
+       25,   41,    8,   38,   43,   12,   42,   38,   41,   46,
+       44,   61,   38,   74,    9,    9,   38,   46,   66,    9,
+       66,   44,    9,   38,   44,   85,    9,   21,   85,   21,
+       21,   21,   21,   21,   21,   21,   21,   21,   49,   49,
+      106,   50,   55,   58,  734,   58,   58,   93,   21,   49,
+       50,  113,   49,   21,   85,   74,  113,   50,  136,   21,
+       21,   64,   64,   64,   64,   64,   64,   64,   64,   64,
+
+       21,   93,  107,  132,  733,  171,  136,   21,   84,   84,
+      132,  151,  171,   84,   92,   21,  106,  137,   21,   22,
+       92,   22,   22,   22,   22,   22,   22,   22,   22,   22,
+       84,   84,  732,  137,   88,   88,   89,   84,   92,   88,
+       22,  134,   89,   89,  107,   22,   92,  143,  161,  142,
+      143,   22,  134,  134,  175,  149,   88,   88,  142,  731,
+       89,  557,   22,   88,  149,  730,  151,  164,   89,   22,
+      163,   89,  161,   91,  163,   91,  151,   22,   91,   91,
+       91,   91,   91,   91,   91,   91,   91,  115,  172,  115,
+      115,  115,  163,  164,  147,  115,  175,  166,  163,  181,
+
+      115,  557,  181,  115,  115,  115,  115,  115,  115,  147,
+      147,  147,  147,  147,  147,  147,  147,  147,  155,  519,
+      155,  166,  185,  155,  155,  155,  155,  155,  155,  155,
+      155,  155,  160,  185,  172,  184,  184,  244,  160,  162,
+      162,  162,  162,  162,  162,  162,  162,  162,  167,  191,
+      201,  201,  246,  250,  167,  267,  160,  519,  321,  191,
+      342,  321,  267,  244,  160,  342,  325,  323,  249,  242,
+      321,  636,  167,  242,  249,  729,  246,  250,  333,  333,
+      167,  241,  241,  241,  241,  241,  241,  241,  241,  241,
+      325,  242,  249,  323,  705,  705,  335,  242,  335,  335,
+
+      249,  380,  480,  636,  380,  382,  382,  382,  382,  382,
+      382,  382,  382,  382,  389,  395,  389,  395,  395,  389,
+      434,  435,  435,  434,  435,  436,  437,  451,  436,  451,
+      451,  478,  478,  481,  478,  524,  481,  482,  482,  559,
+      482,  437,  437,  437,  437,  437,  437,  437,  437,  437,
+      335,  497,  582,  497,  497,  480,  522,  522,  569,  522,
+      580,  569,  591,  600,  602,  591,  613,  620,  569,  632,
+      622,  645,  591,  638,  434,  435,  648,  559,  659,  650,
+      661,  656,  672,  670,  667,  478,  685,  481,  524,  677,
+      395,  482,  582,  680,  688,  690,  682,  692,  695,  697,
+
+      704,  620,  699,  701,  701,  497,  701,  638,  600,  728,
+      522,  650,  727,  580,  613,  622,  726,  602,  648,  670,
+      659,  725,  661,  724,  672,  723,  497,  721,  632,  656,
+      667,  645,  682,  677,  720,  702,  702,  680,  702,  690,
+      713,  713,  718,  713,  717,  692,  716,  688,  685,  699,
+      715,  695,  697,  704,  714,  714,  711,  714,  737,  737,
+      710,  737,  737,  737,  737,  737,  737,  737,  737,  737,
+      737,  737,  737,  737,  738,  738,  738,  738,  738,  738,
+      738,  738,  738,  738,  738,  738,  738,  738,  738,  738,
+      739,  739,  739,  739,  739,  739,  739,  739,  739,  739,
+
+      739,  739,  739,  739,  739,  739,  740,  740,  740,  740,
+      740,  740,  740,  740,  740,  740,  740,  741,  708,  741,
+      741,  707,  741,  706,  741,  741,  703,  741,  742,  742,
+      700,  742,  742,  742,  742,  742,  742,  742,  742,  742,
+      742,  742,  742,  742,  743,  743,  743,  743,  696,  694,
+      743,  743,  743,  744,  744,  744,  744,  744,  744,  744,
+      744,  744,  744,  744,  744,  744,  744,  744,  744,  745,
+      745,  745,  745,  745,  745,  745,  745,  745,  745,  745,
+      745,  745,  745,  745,  745,  746,  693,  691,  746,  746,
+      746,  746,  746,  746,  746,  746,  746,  746,  746,  746,
+
+      747,  689,  687,  747,  686,  747,  684,  681,  747,  679,
+      747,  748,  748,  748,  748,  748,  748,  748,  748,  748,
+      748,  748,  748,  748,  748,  748,  748,  749,  749,  749,
       749,  749,  749,  749,  749,  749,  749,  749,  749,  749,
-      750,  750,  750,  750,  750,  750,  750,  750,  750,  750,
-      751,  681,  751,  751,  751,  751,  751,  752,  679,  676,
-      674,  673,  671,  669,  752,  752,  753,  753,  753,  753,
-      753,  753,  753,  753,  753,  753,  754,  754,  754,  754,
-      754,  754,  754,  754,  754,  754,  755,  755,  755,  755,
-      755,  755,  755,  755,  755,  755,  756,  756,  756,  756,
-      756,  756,  756,  756,  756,  756,  757,  757,  666,  757,
-
-      757,  757,  757,  757,  757,  757,  758,  758,  758,  758,
-      758,  758,  758,  758,  758,  758,  664,  663,  660,  659,
-      658,  657,  655,  653,  652,  650,  649,  648,  647,  646,
-      644,  642,  641,  639,  638,  636,  635,  634,  632,  630,
-      629,  624,  623,  622,  620,  619,  618,  616,  614,  613,
-      609,  607,  605,  604,  603,  602,  601,  600,  599,  598,
-      596,  594,  593,  592,  591,  589,  588,  587,  585,  584,
-      583,  582,  581,  580,  579,  578,  576,  574,  573,  572,
-      571,  570,  568,  565,  563,  562,  561,  560,  559,  558,
-      557,  556,  554,  552,  551,  549,  548,  547,  546,  544,
-
-      543,  541,  540,  539,  538,  537,  536,  535,  534,  533,
-      531,  528,  527,  525,  523,  519,  518,  516,  515,  512,
-      511,  507,  506,  504,  503,  502,  501,  500,  499,  498,
-      497,  496,  494,  493,  492,  491,  490,  488,  487,  486,
-      485,  484,  478,  477,  475,  474,  473,  472,  471,  470,
-      468,  467,  466,  465,  464,  463,  462,  461,  459,  458,
-      457,  456,  453,  451,  450,  449,  448,  447,  446,  445,
-      444,  443,  441,  435,  433,  432,  431,  430,  429,  428,
-      421,  420,  416,  415,  414,  413,  412,  411,  410,  409,
-      408,  407,  406,  405,  404,  403,  402,  401,  400,  399,
-
-      397,  396,  395,  394,  393,  392,  391,  390,  388,  387,
-      386,  384,  382,  380,  379,  378,  376,  375,  373,  372,
-      371,  370,  369,  368,  367,  365,  364,  363,  362,  359,
-      358,  357,  356,  352,  351,  350,  349,  348,  347,  346,
-      344,  343,  342,  341,  340,  339,  337,  335,  334,  333,
-      331,  330,  323,  322,  321,  320,  318,  317,  316,  315,
-      314,  312,  311,  310,  308,  307,  306,  304,  303,  302,
-      301,  300,  299,  298,  297,  296,  295,  293,  291,  290,
-      289,  286,  285,  284,  283,  280,  277,  276,  275,  274,
-      273,  272,  271,  270,  268,  267,  266,  265,  264,  263,
-
-      262,  261,  260,  259,  258,  257,  255,  254,  253,  245,
-      242,  241,  240,  239,  238,  237,  236,  235,  234,  233,
-      232,  231,  230,  229,  228,  227,  226,  225,  224,  223,
-      222,  221,  220,  219,  218,  217,  216,  215,  213,  212,
-      210,  209,  208,  207,  206,  205,  204,  202,  201,  200,
-      199,  198,  196,  195,  194,  193,  191,  190,  189,  188,
-      187,  184,  183,  181,  180,  179,  178,  175,  171,  158,
-      154,  153,  151,  149,  145,  142,  141,  140,  139,  136,
-      134,  131,  130,  129,  128,  127,  126,  125,  124,  123,
-      122,  121,  120,  119,  118,  117,  116,  114,  112,  111,
-
-      108,  105,  104,  102,   98,   83,   76,   69,   68,   67,
-       65,   63,   53,   52,   51,   48,   47,   45,   37,   35,
-       33,   31,   30,   26,   23,   15,    7,    3,  731,  731,
-      731,  731,  731,  731,  731,  731,  731,  731,  731,  731,
-      731,  731,  731,  731,  731,  731,  731,  731,  731,  731,
-      731,  731,  731,  731,  731,  731,  731,  731,  731,  731,
-      731,  731,  731,  731,  731,  731,  731,  731,  731,  731,
-      731,  731,  731,  731,  731,  731,  731,  731,  731,  731,
-      731,  731,  731,  731,  731,  731,  731,  731,  731,  731,
-      731,  731,  731,  731,  731,  731,  731,  731,  731,  731,
-
-      731,  731,  731,  731,  731,  731,  731,  731,  731,  731,
-      731,  731,  731
+      749,  749,  749,  750,  678,  676,  750,  674,  750,  671,
+      669,  750,  668,  750,  751,  751,  751,  751,  751,  751,
+      751,  751,  751,  751,  751,  751,  751,  751,  751,  751,
+      752,  752,  752,  752,  752,  752,  752,  752,  752,  752,
+      752,  752,  752,  752,  752,  752,  753,  753,  753,  753,
+      753,  753,  753,  753,  753,  753,  753,  753,  753,  753,
+
+      753,  753,  754,  754,  754,  754,  754,  754,  754,  754,
+      754,  754,  754,  754,  754,  754,  754,  754,  755,  755,
+      755,  755,  755,  755,  755,  755,  755,  755,  756,  756,
+      756,  756,  756,  756,  756,  756,  756,  756,  756,  756,
+      756,  756,  756,  756,  757,  757,  757,  757,  757,  757,
+      757,  757,  757,  757,  757,  757,  757,  757,  757,  757,
+      758,  758,  758,  758,  758,  758,  758,  758,  758,  758,
+      758,  758,  758,  758,  758,  758,  759,  665,  759,  759,
+      759,  759,  759,  759,  759,  759,  759,  759,  759,  760,
+      664,  663,  662,  660,  658,  657,  655,  654,  653,  760,
+
+      760,  760,  760,  760,  761,  761,  761,  761,  761,  761,
+      761,  761,  761,  761,  761,  761,  761,  761,  761,  761,
+      762,  762,  762,  762,  762,  762,  762,  762,  762,  762,
+      762,  762,  762,  762,  762,  762,  763,  763,  763,  763,
+      763,  763,  763,  763,  763,  763,  763,  763,  763,  763,
+      763,  763,  764,  764,  764,  764,  764,  764,  764,  764,
+      764,  764,  764,  764,  764,  764,  764,  764,  765,  765,
+      652,  765,  765,  765,  765,  765,  765,  765,  765,  765,
+      765,  765,  765,  765,  766,  766,  766,  766,  766,  766,
+      766,  766,  766,  766,  766,  766,  766,  766,  766,  766,
+
+      651,  649,  647,  646,  644,  643,  641,  640,  639,  637,
+      635,  634,  629,  628,  627,  625,  624,  623,  621,  619,
+      618,  614,  612,  610,  609,  608,  607,  606,  605,  604,
+      603,  601,  599,  598,  597,  596,  594,  593,  592,  590,
+      589,  588,  587,  586,  585,  584,  583,  581,  579,  578,
+      577,  576,  575,  573,  570,  568,  567,  566,  565,  564,
+      563,  561,  560,  558,  556,  555,  553,  552,  551,  550,
+      548,  547,  545,  544,  543,  542,  541,  540,  539,  538,
+      537,  535,  531,  530,  529,  527,  525,  521,  520,  518,
+      517,  514,  513,  509,  508,  506,  505,  504,  503,  502,
+
+      501,  500,  499,  498,  496,  495,  494,  493,  492,  490,
+      489,  487,  486,  485,  484,  483,  477,  476,  474,  473,
+      472,  471,  470,  469,  467,  466,  465,  464,  463,  462,
+      461,  460,  458,  457,  456,  455,  452,  450,  449,  448,
+      447,  446,  445,  444,  443,  441,  440,  438,  432,  430,
+      429,  428,  427,  426,  425,  418,  417,  413,  412,  411,
+      410,  409,  408,  407,  406,  405,  404,  403,  402,  401,
+      400,  399,  398,  397,  396,  394,  393,  392,  391,  390,
+      388,  387,  385,  384,  383,  381,  379,  377,  376,  375,
+      373,  372,  370,  369,  368,  367,  366,  365,  364,  362,
+
+      361,  360,  359,  356,  355,  354,  353,  349,  348,  347,
+      346,  345,  344,  343,  341,  340,  339,  338,  337,  336,
+      334,  332,  331,  330,  328,  327,  320,  319,  318,  317,
+      315,  314,  313,  312,  311,  309,  308,  307,  305,  304,
+      303,  301,  300,  299,  298,  297,  296,  295,  294,  293,
+      292,  290,  288,  287,  286,  283,  282,  281,  280,  277,
+      275,  274,  273,  272,  271,  270,  269,  268,  266,  265,
+      264,  263,  262,  261,  260,  259,  258,  257,  256,  255,
+      253,  252,  251,  243,  240,  239,  238,  237,  236,  235,
+      234,  233,  232,  231,  230,  229,  228,  227,  226,  225,
+
+      224,  223,  222,  221,  220,  219,  218,  217,  216,  215,
+      214,  213,  211,  210,  208,  207,  206,  205,  204,  203,
+      202,  200,  199,  198,  197,  195,  194,  193,  192,  190,
+      189,  188,  187,  186,  183,  182,  180,  179,  178,  177,
+      174,  170,  157,  153,  152,  150,  148,  144,  141,  140,
+      139,  138,  135,  133,  130,  129,  128,  127,  126,  125,
+      124,  123,  122,  121,  120,  119,  118,  117,  116,  114,
+      112,  111,  108,  105,  104,  102,   98,   83,   76,   69,
+       68,   67,   65,   63,   53,   52,   51,   48,   47,   45,
+       40,   37,   35,   33,   31,   30,   26,   23,   15,    7,
+
+        3,  736,  736,  736,  736,  736,  736,  736,  736,  736,
+      736,  736,  736,  736,  736,  736,  736,  736,  736,  736,
+      736,  736,  736,  736,  736,  736,  736,  736,  736,  736,
+      736,  736,  736,  736,  736,  736,  736,  736,  736,  736,
+      736,  736,  736,  736,  736,  736,  736,  736,  736,  736,
+      736,  736,  736,  736,  736,  736,  736,  736,  736,  736,
+      736,  736,  736,  736,  736,  736,  736,  736,  736,  736,
+      736,  736,  736,  736,  736,  736,  736,  736,  736,  736,
+      736,  736,  736,  736,  736,  736,  736
     } ;
 
 extern int yy_flex_debug;
@@ -1147,10 +1186,6 @@ char *yytext;
 #include "sourcescanner.h"
 #include "scannerparser.h"
 
-#ifdef USE_WINDOWS
-#include <windows.h>
-#endif
-
 int lineno;
 char linebuf[2000];
 
@@ -1175,8 +1210,8 @@ static void print_error (GISourceScanner *scanner);
 #define IS_EOF EOF
 #endif
 
-#line 1179 "giscanner/scannerlexer.c"
-#line 1180 "giscanner/scannerlexer.c"
+#line 1214 "giscanner/scannerlexer.c"
+#line 1215 "giscanner/scannerlexer.c"
 
 #define INITIAL 0
 
@@ -1397,10 +1432,10 @@ YY_DECL
 		}
 
 	{
-#line 82 "giscanner/scannerlexer.l"
+#line 78 "giscanner/scannerlexer.l"
 
 
-#line 1404 "giscanner/scannerlexer.c"
+#line 1439 "giscanner/scannerlexer.c"
 
 	while ( /*CONSTCOND*/1 )		/* loops until end-of-file is reached */
 		{
@@ -1426,14 +1461,14 @@ yy_match:
 			while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 				{
 				yy_current_state = (int) yy_def[yy_current_state];
-				if ( yy_current_state >= 732 )
+				if ( yy_current_state >= 737 )
 					yy_c = yy_meta[yy_c];
 				}
 			yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
 			*(yy_state_ptr)++ = yy_current_state;
 			++yy_cp;
 			}
-		while ( yy_base[yy_current_state] != 1229 );
+		while ( yy_base[yy_current_state] != 1402 );
 
 yy_find_action:
 		yy_current_state = *--(yy_state_ptr);
@@ -1465,7 +1500,7 @@ do_action:	/* This label is used only to access EOF actions. */
 case 1:
 /* rule 1 can match eol */
 YY_RULE_SETUP
-#line 84 "giscanner/scannerlexer.l"
+#line 80 "giscanner/scannerlexer.l"
 { strncpy(linebuf, yytext+1, sizeof(linebuf)); /* save the next line */
 						linebuf[sizeof(linebuf)-1]='\0';
 						/* printf("%4d:%s\n",lineno,linebuf); */
@@ -1476,831 +1511,856 @@ YY_RULE_SETUP
 case 2:
 /* rule 2 can match eol */
 YY_RULE_SETUP
-#line 90 "giscanner/scannerlexer.l"
+#line 86 "giscanner/scannerlexer.l"
 { ++lineno; }
 	YY_BREAK
 case 3:
 YY_RULE_SETUP
-#line 92 "giscanner/scannerlexer.l"
+#line 88 "giscanner/scannerlexer.l"
 { /* Ignore whitespace. */ }
 	YY_BREAK
 case 4:
 YY_RULE_SETUP
-#line 94 "giscanner/scannerlexer.l"
+#line 90 "giscanner/scannerlexer.l"
 { parse_comment(scanner); }
 	YY_BREAK
 case 5:
 YY_RULE_SETUP
-#line 95 "giscanner/scannerlexer.l"
+#line 91 "giscanner/scannerlexer.l"
 { parse_trigraph(scanner); }
 	YY_BREAK
 case 6:
 YY_RULE_SETUP
-#line 96 "giscanner/scannerlexer.l"
+#line 92 "giscanner/scannerlexer.l"
 { /* Ignore C++ style comments. */ }
 	YY_BREAK
 case 7:
 YY_RULE_SETUP
-#line 98 "giscanner/scannerlexer.l"
+#line 94 "giscanner/scannerlexer.l"
 { yyless (yyleng - 1); return FUNCTION_MACRO; }
 	YY_BREAK
 case 8:
 YY_RULE_SETUP
-#line 99 "giscanner/scannerlexer.l"
+#line 95 "giscanner/scannerlexer.l"
 { return OBJECT_MACRO; }
 	YY_BREAK
 case 9:
 /* rule 9 can match eol */
 YY_RULE_SETUP
-#line 100 "giscanner/scannerlexer.l"
+#line 96 "giscanner/scannerlexer.l"
 { ++lineno; return IFDEF_GI_SCANNER; }
 	YY_BREAK
 case 10:
 /* rule 10 can match eol */
 YY_RULE_SETUP
-#line 101 "giscanner/scannerlexer.l"
+#line 97 "giscanner/scannerlexer.l"
 { ++lineno; return IFNDEF_GI_SCANNER; }
 	YY_BREAK
 case 11:
 /* rule 11 can match eol */
 YY_RULE_SETUP
-#line 102 "giscanner/scannerlexer.l"
+#line 98 "giscanner/scannerlexer.l"
 { ++lineno; return IFNDEF_COND; }
 	YY_BREAK
 case 12:
 /* rule 12 can match eol */
 YY_RULE_SETUP
-#line 103 "giscanner/scannerlexer.l"
+#line 99 "giscanner/scannerlexer.l"
 { ++lineno; return IFDEF_COND; }
 	YY_BREAK
 case 13:
 /* rule 13 can match eol */
 YY_RULE_SETUP
-#line 104 "giscanner/scannerlexer.l"
+#line 100 "giscanner/scannerlexer.l"
 { ++lineno; return IF_COND; }
 	YY_BREAK
 case 14:
 /* rule 14 can match eol */
 YY_RULE_SETUP
-#line 105 "giscanner/scannerlexer.l"
+#line 101 "giscanner/scannerlexer.l"
 { ++lineno; return ELIF_COND; }
 	YY_BREAK
 case 15:
 /* rule 15 can match eol */
 YY_RULE_SETUP
-#line 106 "giscanner/scannerlexer.l"
+#line 102 "giscanner/scannerlexer.l"
 { ++lineno; return ELSE_COND; }
 	YY_BREAK
 case 16:
 /* rule 16 can match eol */
 YY_RULE_SETUP
-#line 107 "giscanner/scannerlexer.l"
+#line 103 "giscanner/scannerlexer.l"
 { ++lineno; return ENDIF_COND; }
 	YY_BREAK
 case 17:
 /* rule 17 can match eol */
 YY_RULE_SETUP
-#line 108 "giscanner/scannerlexer.l"
+#line 104 "giscanner/scannerlexer.l"
 { ++lineno; /* Ignore pragma. */ }
 	YY_BREAK
 case 18:
 /* rule 18 can match eol */
 YY_RULE_SETUP
-#line 110 "giscanner/scannerlexer.l"
+#line 106 "giscanner/scannerlexer.l"
 { ++lineno; process_linemarks(scanner, FALSE); }
 	YY_BREAK
 case 19:
 /* rule 19 can match eol */
 YY_RULE_SETUP
-#line 111 "giscanner/scannerlexer.l"
+#line 107 "giscanner/scannerlexer.l"
 { ++lineno; process_linemarks(scanner, TRUE); }
 	YY_BREAK
 case 20:
 YY_RULE_SETUP
-#line 112 "giscanner/scannerlexer.l"
+#line 108 "giscanner/scannerlexer.l"
 { }
 	YY_BREAK
 case 21:
 YY_RULE_SETUP
-#line 113 "giscanner/scannerlexer.l"
+#line 109 "giscanner/scannerlexer.l"
 { return '{'; }
 	YY_BREAK
 case 22:
 YY_RULE_SETUP
-#line 114 "giscanner/scannerlexer.l"
+#line 110 "giscanner/scannerlexer.l"
 { return '{'; }
 	YY_BREAK
 case 23:
 YY_RULE_SETUP
-#line 115 "giscanner/scannerlexer.l"
+#line 111 "giscanner/scannerlexer.l"
 { return '}'; }
 	YY_BREAK
 case 24:
 YY_RULE_SETUP
-#line 116 "giscanner/scannerlexer.l"
+#line 112 "giscanner/scannerlexer.l"
 { return '}'; }
 	YY_BREAK
 case 25:
 YY_RULE_SETUP
-#line 117 "giscanner/scannerlexer.l"
+#line 113 "giscanner/scannerlexer.l"
 { return '['; }
 	YY_BREAK
 case 26:
 YY_RULE_SETUP
-#line 118 "giscanner/scannerlexer.l"
+#line 114 "giscanner/scannerlexer.l"
 { return '['; }
 	YY_BREAK
 case 27:
 YY_RULE_SETUP
-#line 119 "giscanner/scannerlexer.l"
+#line 115 "giscanner/scannerlexer.l"
 { return ']'; }
 	YY_BREAK
 case 28:
 YY_RULE_SETUP
-#line 120 "giscanner/scannerlexer.l"
+#line 116 "giscanner/scannerlexer.l"
 { return ']'; }
 	YY_BREAK
 case 29:
 YY_RULE_SETUP
-#line 121 "giscanner/scannerlexer.l"
+#line 117 "giscanner/scannerlexer.l"
 { return '('; }
 	YY_BREAK
 case 30:
 YY_RULE_SETUP
-#line 122 "giscanner/scannerlexer.l"
+#line 118 "giscanner/scannerlexer.l"
 { return ')'; }
 	YY_BREAK
 case 31:
 YY_RULE_SETUP
-#line 123 "giscanner/scannerlexer.l"
+#line 119 "giscanner/scannerlexer.l"
 { return ';'; }
 	YY_BREAK
 case 32:
 YY_RULE_SETUP
-#line 124 "giscanner/scannerlexer.l"
+#line 120 "giscanner/scannerlexer.l"
 { return ':'; }
 	YY_BREAK
 case 33:
 YY_RULE_SETUP
-#line 125 "giscanner/scannerlexer.l"
+#line 121 "giscanner/scannerlexer.l"
 { return ELLIPSIS; }
 	YY_BREAK
 case 34:
 YY_RULE_SETUP
-#line 126 "giscanner/scannerlexer.l"
+#line 122 "giscanner/scannerlexer.l"
 { return '?'; }
 	YY_BREAK
 case 35:
 YY_RULE_SETUP
-#line 127 "giscanner/scannerlexer.l"
+#line 123 "giscanner/scannerlexer.l"
 { return '.'; }
 	YY_BREAK
 case 36:
 YY_RULE_SETUP
-#line 128 "giscanner/scannerlexer.l"
+#line 124 "giscanner/scannerlexer.l"
 { return '+'; }
 	YY_BREAK
 case 37:
 YY_RULE_SETUP
-#line 129 "giscanner/scannerlexer.l"
+#line 125 "giscanner/scannerlexer.l"
 { return '-'; }
 	YY_BREAK
 case 38:
 YY_RULE_SETUP
-#line 130 "giscanner/scannerlexer.l"
+#line 126 "giscanner/scannerlexer.l"
 { return '*'; }
 	YY_BREAK
 case 39:
 YY_RULE_SETUP
-#line 131 "giscanner/scannerlexer.l"
+#line 127 "giscanner/scannerlexer.l"
 { return '/'; }
 	YY_BREAK
 case 40:
 YY_RULE_SETUP
-#line 132 "giscanner/scannerlexer.l"
+#line 128 "giscanner/scannerlexer.l"
 { return '%'; }
 	YY_BREAK
 case 41:
 YY_RULE_SETUP
-#line 133 "giscanner/scannerlexer.l"
+#line 129 "giscanner/scannerlexer.l"
 { return '^'; }
 	YY_BREAK
 case 42:
 YY_RULE_SETUP
-#line 134 "giscanner/scannerlexer.l"
+#line 130 "giscanner/scannerlexer.l"
 { return '&'; }
 	YY_BREAK
 case 43:
 YY_RULE_SETUP
-#line 135 "giscanner/scannerlexer.l"
+#line 131 "giscanner/scannerlexer.l"
 { return '|'; }
 	YY_BREAK
 case 44:
 YY_RULE_SETUP
-#line 136 "giscanner/scannerlexer.l"
+#line 132 "giscanner/scannerlexer.l"
 { return '~'; }
 	YY_BREAK
 case 45:
 YY_RULE_SETUP
-#line 137 "giscanner/scannerlexer.l"
+#line 133 "giscanner/scannerlexer.l"
 { return '!'; }
 	YY_BREAK
 case 46:
 YY_RULE_SETUP
-#line 138 "giscanner/scannerlexer.l"
+#line 134 "giscanner/scannerlexer.l"
 { return '='; }
 	YY_BREAK
 case 47:
 YY_RULE_SETUP
-#line 139 "giscanner/scannerlexer.l"
+#line 135 "giscanner/scannerlexer.l"
 { return '<'; }
 	YY_BREAK
 case 48:
 YY_RULE_SETUP
-#line 140 "giscanner/scannerlexer.l"
+#line 136 "giscanner/scannerlexer.l"
 { return '>'; }
 	YY_BREAK
 case 49:
 YY_RULE_SETUP
-#line 141 "giscanner/scannerlexer.l"
+#line 137 "giscanner/scannerlexer.l"
 { return ADDEQ; }
 	YY_BREAK
 case 50:
 YY_RULE_SETUP
-#line 142 "giscanner/scannerlexer.l"
+#line 138 "giscanner/scannerlexer.l"
 { return SUBEQ; }
 	YY_BREAK
 case 51:
 YY_RULE_SETUP
-#line 143 "giscanner/scannerlexer.l"
+#line 139 "giscanner/scannerlexer.l"
 { return MULEQ; }
 	YY_BREAK
 case 52:
 YY_RULE_SETUP
-#line 144 "giscanner/scannerlexer.l"
+#line 140 "giscanner/scannerlexer.l"
 { return DIVEQ; }
 	YY_BREAK
 case 53:
 YY_RULE_SETUP
-#line 145 "giscanner/scannerlexer.l"
+#line 141 "giscanner/scannerlexer.l"
 { return MODEQ; }
 	YY_BREAK
 case 54:
 YY_RULE_SETUP
-#line 146 "giscanner/scannerlexer.l"
+#line 142 "giscanner/scannerlexer.l"
 { return XOREQ; }
 	YY_BREAK
 case 55:
 YY_RULE_SETUP
-#line 147 "giscanner/scannerlexer.l"
+#line 143 "giscanner/scannerlexer.l"
 { return ANDEQ; }
 	YY_BREAK
 case 56:
 YY_RULE_SETUP
-#line 148 "giscanner/scannerlexer.l"
+#line 144 "giscanner/scannerlexer.l"
 { return OREQ; }
 	YY_BREAK
 case 57:
 YY_RULE_SETUP
-#line 149 "giscanner/scannerlexer.l"
+#line 145 "giscanner/scannerlexer.l"
 { return SL; }
 	YY_BREAK
 case 58:
 YY_RULE_SETUP
-#line 150 "giscanner/scannerlexer.l"
+#line 146 "giscanner/scannerlexer.l"
 { return SR; }
 	YY_BREAK
 case 59:
 YY_RULE_SETUP
-#line 151 "giscanner/scannerlexer.l"
+#line 147 "giscanner/scannerlexer.l"
 { return SLEQ; }
 	YY_BREAK
 case 60:
 YY_RULE_SETUP
-#line 152 "giscanner/scannerlexer.l"
+#line 148 "giscanner/scannerlexer.l"
 { return SREQ; }
 	YY_BREAK
 case 61:
 YY_RULE_SETUP
-#line 153 "giscanner/scannerlexer.l"
+#line 149 "giscanner/scannerlexer.l"
 { return EQ; }
 	YY_BREAK
 case 62:
 YY_RULE_SETUP
-#line 154 "giscanner/scannerlexer.l"
+#line 150 "giscanner/scannerlexer.l"
 { return NOTEQ; }
 	YY_BREAK
 case 63:
 YY_RULE_SETUP
-#line 155 "giscanner/scannerlexer.l"
+#line 151 "giscanner/scannerlexer.l"
 { return LTEQ; }
 	YY_BREAK
 case 64:
 YY_RULE_SETUP
-#line 156 "giscanner/scannerlexer.l"
+#line 152 "giscanner/scannerlexer.l"
 { return GTEQ; }
 	YY_BREAK
 case 65:
 YY_RULE_SETUP
-#line 157 "giscanner/scannerlexer.l"
+#line 153 "giscanner/scannerlexer.l"
 { return ANDAND; }
 	YY_BREAK
 case 66:
 YY_RULE_SETUP
-#line 158 "giscanner/scannerlexer.l"
+#line 154 "giscanner/scannerlexer.l"
 { return OROR; }
 	YY_BREAK
 case 67:
 YY_RULE_SETUP
-#line 159 "giscanner/scannerlexer.l"
+#line 155 "giscanner/scannerlexer.l"
 { return PLUSPLUS; }
 	YY_BREAK
 case 68:
 YY_RULE_SETUP
-#line 160 "giscanner/scannerlexer.l"
+#line 156 "giscanner/scannerlexer.l"
 { return MINUSMINUS; }
 	YY_BREAK
 case 69:
 YY_RULE_SETUP
-#line 161 "giscanner/scannerlexer.l"
+#line 157 "giscanner/scannerlexer.l"
 { return ','; }
 	YY_BREAK
 case 70:
 YY_RULE_SETUP
-#line 162 "giscanner/scannerlexer.l"
+#line 158 "giscanner/scannerlexer.l"
 { return ARROW; }
 	YY_BREAK
 case 71:
 YY_RULE_SETUP
-#line 164 "giscanner/scannerlexer.l"
+#line 160 "giscanner/scannerlexer.l"
 { if (!parse_ignored_macro()) REJECT; }
 	YY_BREAK
 case 72:
 YY_RULE_SETUP
-#line 165 "giscanner/scannerlexer.l"
+#line 161 "giscanner/scannerlexer.l"
 { if (!parse_ignored_macro()) REJECT; }
 	YY_BREAK
 case 73:
 YY_RULE_SETUP
-#line 166 "giscanner/scannerlexer.l"
+#line 162 "giscanner/scannerlexer.l"
 { if (!parse_ignored_macro()) REJECT; }
 	YY_BREAK
 case 74:
 YY_RULE_SETUP
-#line 167 "giscanner/scannerlexer.l"
+#line 163 "giscanner/scannerlexer.l"
 { if (!parse_ignored_macro()) REJECT; }
 	YY_BREAK
 case 75:
 YY_RULE_SETUP
-#line 168 "giscanner/scannerlexer.l"
+#line 164 "giscanner/scannerlexer.l"
 { if (!parse_ignored_macro()) REJECT; }
 	YY_BREAK
 case 76:
 YY_RULE_SETUP
-#line 169 "giscanner/scannerlexer.l"
+#line 165 "giscanner/scannerlexer.l"
 { if (!parse_ignored_macro()) REJECT; }
 	YY_BREAK
 case 77:
 YY_RULE_SETUP
-#line 170 "giscanner/scannerlexer.l"
+#line 166 "giscanner/scannerlexer.l"
 { if (!parse_ignored_macro()) REJECT; }
 	YY_BREAK
 case 78:
 YY_RULE_SETUP
-#line 171 "giscanner/scannerlexer.l"
+#line 167 "giscanner/scannerlexer.l"
 { return CONST; }
 	YY_BREAK
 case 79:
 YY_RULE_SETUP
-#line 172 "giscanner/scannerlexer.l"
+#line 168 "giscanner/scannerlexer.l"
 { return EXTENSION; }
 	YY_BREAK
 case 80:
 YY_RULE_SETUP
-#line 173 "giscanner/scannerlexer.l"
+#line 169 "giscanner/scannerlexer.l"
 { return INLINE; }
 	YY_BREAK
 case 81:
 YY_RULE_SETUP
-#line 174 "giscanner/scannerlexer.l"
+#line 170 "giscanner/scannerlexer.l"
 { return INLINE; }
 	YY_BREAK
 case 82:
 YY_RULE_SETUP
-#line 175 "giscanner/scannerlexer.l"
+#line 171 "giscanner/scannerlexer.l"
 { if (!parse_ignored_macro()) REJECT; }
 	YY_BREAK
 case 83:
 YY_RULE_SETUP
-#line 176 "giscanner/scannerlexer.l"
+#line 172 "giscanner/scannerlexer.l"
 { /* Ignore */ }
 	YY_BREAK
 case 84:
 YY_RULE_SETUP
-#line 177 "giscanner/scannerlexer.l"
+#line 173 "giscanner/scannerlexer.l"
 { /* Ignore */ }
 	YY_BREAK
 case 85:
 YY_RULE_SETUP
-#line 178 "giscanner/scannerlexer.l"
+#line 174 "giscanner/scannerlexer.l"
 { /* Ignore */ }
 	YY_BREAK
 case 86:
 YY_RULE_SETUP
-#line 179 "giscanner/scannerlexer.l"
+#line 175 "giscanner/scannerlexer.l"
 { /* Ignore */ }
 	YY_BREAK
 case 87:
 YY_RULE_SETUP
-#line 180 "giscanner/scannerlexer.l"
-{ return SIGNED; }
+#line 176 "giscanner/scannerlexer.l"
+{ return RESTRICT; }
 	YY_BREAK
 case 88:
 YY_RULE_SETUP
-#line 181 "giscanner/scannerlexer.l"
-{ return SIGNED; }
+#line 177 "giscanner/scannerlexer.l"
+{ return RESTRICT; }
 	YY_BREAK
 case 89:
 YY_RULE_SETUP
-#line 182 "giscanner/scannerlexer.l"
-{ return RESTRICT; }
+#line 178 "giscanner/scannerlexer.l"
+{ return THREAD_LOCAL; }
 	YY_BREAK
 case 90:
 YY_RULE_SETUP
-#line 183 "giscanner/scannerlexer.l"
-{ return RESTRICT; }
+#line 179 "giscanner/scannerlexer.l"
+{ return THREAD_LOCAL; }
 	YY_BREAK
 case 91:
 YY_RULE_SETUP
-#line 184 "giscanner/scannerlexer.l"
-{ return THREAD_LOCAL; }
+#line 180 "giscanner/scannerlexer.l"
+{ if (!parse_ignored_macro()) REJECT; }
 	YY_BREAK
 case 92:
 YY_RULE_SETUP
-#line 185 "giscanner/scannerlexer.l"
-{ return THREAD_LOCAL; }
+#line 181 "giscanner/scannerlexer.l"
+{ return VOLATILE; }
 	YY_BREAK
 case 93:
 YY_RULE_SETUP
-#line 186 "giscanner/scannerlexer.l"
-{ if (!parse_ignored_macro()) REJECT; }
+#line 182 "giscanner/scannerlexer.l"
+{ return VOLATILE; }
 	YY_BREAK
 case 94:
 YY_RULE_SETUP
-#line 187 "giscanner/scannerlexer.l"
-{ return VOLATILE; }
+#line 183 "giscanner/scannerlexer.l"
+{ return BASIC_TYPE; }
 	YY_BREAK
 case 95:
+/* rule 95 can match eol */
 YY_RULE_SETUP
-#line 188 "giscanner/scannerlexer.l"
-{ return VOLATILE; }
+#line 184 "giscanner/scannerlexer.l"
+{ ++lineno; /* Ignore */ }
 	YY_BREAK
 case 96:
 YY_RULE_SETUP
-#line 189 "giscanner/scannerlexer.l"
-{ return BOOL; }
+#line 185 "giscanner/scannerlexer.l"
+{ /* Ignore */ }
 	YY_BREAK
 case 97:
-/* rule 97 can match eol */
 YY_RULE_SETUP
-#line 190 "giscanner/scannerlexer.l"
-{ ++lineno; /* Ignore */ }
+#line 186 "giscanner/scannerlexer.l"
+{ /* Ignore */ }
 	YY_BREAK
 case 98:
 YY_RULE_SETUP
-#line 191 "giscanner/scannerlexer.l"
+#line 187 "giscanner/scannerlexer.l"
 { /* Ignore */ }
 	YY_BREAK
 case 99:
 YY_RULE_SETUP
-#line 192 "giscanner/scannerlexer.l"
-{ /* Ignore */ }
+#line 188 "giscanner/scannerlexer.l"
+{ /* ignore */ }
 	YY_BREAK
 case 100:
 YY_RULE_SETUP
-#line 193 "giscanner/scannerlexer.l"
-{ /* Ignore */ }
+#line 189 "giscanner/scannerlexer.l"
+{ /* ignore */ }
 	YY_BREAK
 case 101:
 YY_RULE_SETUP
-#line 194 "giscanner/scannerlexer.l"
-{ /* ignore */ }
+#line 191 "giscanner/scannerlexer.l"
+{ return INTL_CONST; }
 	YY_BREAK
 case 102:
 YY_RULE_SETUP
-#line 195 "giscanner/scannerlexer.l"
-{ /* ignore */ }
+#line 192 "giscanner/scannerlexer.l"
+{ return INTUL_CONST; }
 	YY_BREAK
 case 103:
 YY_RULE_SETUP
-#line 196 "giscanner/scannerlexer.l"
-{ return INT; }
+#line 194 "giscanner/scannerlexer.l"
+{ return BOOLEAN; }
 	YY_BREAK
 case 104:
 YY_RULE_SETUP
-#line 197 "giscanner/scannerlexer.l"
-{ return FLOAT; }
+#line 195 "giscanner/scannerlexer.l"
+{ return BOOLEAN; }
 	YY_BREAK
 case 105:
 YY_RULE_SETUP
-#line 199 "giscanner/scannerlexer.l"
-{ return INTL_CONST; }
+#line 196 "giscanner/scannerlexer.l"
+{ return BOOLEAN; }
 	YY_BREAK
 case 106:
 YY_RULE_SETUP
-#line 200 "giscanner/scannerlexer.l"
-{ return INTUL_CONST; }
+#line 197 "giscanner/scannerlexer.l"
+{ return BOOLEAN; }
 	YY_BREAK
 case 107:
 YY_RULE_SETUP
-#line 202 "giscanner/scannerlexer.l"
-{ return BOOLEAN; }
+#line 199 "giscanner/scannerlexer.l"
+{ if (scanner->macro_scan) return check_identifier(scanner, yytext); else REJECT; }
 	YY_BREAK
 case 108:
 YY_RULE_SETUP
-#line 203 "giscanner/scannerlexer.l"
-{ return BOOLEAN; }
+#line 201 "giscanner/scannerlexer.l"
+{ if (!parse_ignored_macro()) REJECT; }
 	YY_BREAK
 case 109:
 YY_RULE_SETUP
-#line 204 "giscanner/scannerlexer.l"
-{ return BOOLEAN; }
+#line 202 "giscanner/scannerlexer.l"
+{ return AUTO; }
 	YY_BREAK
 case 110:
 YY_RULE_SETUP
-#line 205 "giscanner/scannerlexer.l"
-{ return BOOLEAN; }
+#line 203 "giscanner/scannerlexer.l"
+{ return BREAK; }
 	YY_BREAK
 case 111:
 YY_RULE_SETUP
-#line 207 "giscanner/scannerlexer.l"
-{ if (scanner->macro_scan) return check_identifier(scanner, yytext); else REJECT; }
+#line 204 "giscanner/scannerlexer.l"
+{ return CASE; }
 	YY_BREAK
 case 112:
 YY_RULE_SETUP
-#line 209 "giscanner/scannerlexer.l"
-{ if (!parse_ignored_macro()) REJECT; }
+#line 205 "giscanner/scannerlexer.l"
+{ return BASIC_TYPE; }
 	YY_BREAK
 case 113:
 YY_RULE_SETUP
-#line 210 "giscanner/scannerlexer.l"
-{ return AUTO; }
+#line 206 "giscanner/scannerlexer.l"
+{ return CONST; }
 	YY_BREAK
 case 114:
 YY_RULE_SETUP
-#line 211 "giscanner/scannerlexer.l"
-{ return BOOL; }
+#line 207 "giscanner/scannerlexer.l"
+{ return CONTINUE; }
 	YY_BREAK
 case 115:
 YY_RULE_SETUP
-#line 212 "giscanner/scannerlexer.l"
-{ return BREAK; }
+#line 208 "giscanner/scannerlexer.l"
+{ return DEFAULT; }
 	YY_BREAK
 case 116:
 YY_RULE_SETUP
-#line 213 "giscanner/scannerlexer.l"
-{ return CASE; }
+#line 209 "giscanner/scannerlexer.l"
+{ return DO; }
 	YY_BREAK
 case 117:
 YY_RULE_SETUP
-#line 214 "giscanner/scannerlexer.l"
-{ return CHAR; }
+#line 210 "giscanner/scannerlexer.l"
+{ return BASIC_TYPE; }
 	YY_BREAK
 case 118:
 YY_RULE_SETUP
-#line 215 "giscanner/scannerlexer.l"
-{ return CONST; }
+#line 211 "giscanner/scannerlexer.l"
+{ return ELSE; }
 	YY_BREAK
 case 119:
 YY_RULE_SETUP
-#line 216 "giscanner/scannerlexer.l"
-{ return CONTINUE; }
+#line 212 "giscanner/scannerlexer.l"
+{ return ENUM; }
 	YY_BREAK
 case 120:
 YY_RULE_SETUP
-#line 217 "giscanner/scannerlexer.l"
-{ return DEFAULT; }
+#line 213 "giscanner/scannerlexer.l"
+{ return EXTERN; }
 	YY_BREAK
 case 121:
 YY_RULE_SETUP
-#line 218 "giscanner/scannerlexer.l"
-{ return DO; }
+#line 214 "giscanner/scannerlexer.l"
+{ return BASIC_TYPE; }
 	YY_BREAK
 case 122:
 YY_RULE_SETUP
-#line 219 "giscanner/scannerlexer.l"
-{ return DOUBLE; }
+#line 215 "giscanner/scannerlexer.l"
+{ return BASIC_TYPE; }
 	YY_BREAK
 case 123:
 YY_RULE_SETUP
-#line 220 "giscanner/scannerlexer.l"
-{ return ELSE; }
+#line 216 "giscanner/scannerlexer.l"
+{ return BASIC_TYPE; }
 	YY_BREAK
 case 124:
 YY_RULE_SETUP
-#line 221 "giscanner/scannerlexer.l"
-{ return ENUM; }
+#line 217 "giscanner/scannerlexer.l"
+{ return BASIC_TYPE; }
 	YY_BREAK
 case 125:
 YY_RULE_SETUP
-#line 222 "giscanner/scannerlexer.l"
-{ return EXTERN; }
+#line 218 "giscanner/scannerlexer.l"
+{ return BASIC_TYPE; }
 	YY_BREAK
 case 126:
 YY_RULE_SETUP
-#line 223 "giscanner/scannerlexer.l"
-{ return FLOAT; }
+#line 219 "giscanner/scannerlexer.l"
+{ return BASIC_TYPE; }
 	YY_BREAK
 case 127:
 YY_RULE_SETUP
-#line 224 "giscanner/scannerlexer.l"
-{ return FOR; }
+#line 220 "giscanner/scannerlexer.l"
+{ return BASIC_TYPE; }
 	YY_BREAK
 case 128:
 YY_RULE_SETUP
-#line 225 "giscanner/scannerlexer.l"
-{ return GOTO; }
+#line 221 "giscanner/scannerlexer.l"
+{ return BASIC_TYPE; }
 	YY_BREAK
 case 129:
 YY_RULE_SETUP
-#line 226 "giscanner/scannerlexer.l"
-{ return IF; }
+#line 222 "giscanner/scannerlexer.l"
+{ return FOR; }
 	YY_BREAK
 case 130:
 YY_RULE_SETUP
-#line 227 "giscanner/scannerlexer.l"
-{ return INLINE; }
+#line 223 "giscanner/scannerlexer.l"
+{ return GOTO; }
 	YY_BREAK
 case 131:
 YY_RULE_SETUP
-#line 228 "giscanner/scannerlexer.l"
-{ return INT; }
+#line 224 "giscanner/scannerlexer.l"
+{ return IF; }
 	YY_BREAK
 case 132:
 YY_RULE_SETUP
-#line 229 "giscanner/scannerlexer.l"
-{ return INT; }
+#line 225 "giscanner/scannerlexer.l"
+{ return INLINE; }
 	YY_BREAK
 case 133:
 YY_RULE_SETUP
-#line 230 "giscanner/scannerlexer.l"
-{ return INT; }
+#line 226 "giscanner/scannerlexer.l"
+{ return BASIC_TYPE; }
 	YY_BREAK
 case 134:
 YY_RULE_SETUP
-#line 231 "giscanner/scannerlexer.l"
-{ return INT; }
+#line 227 "giscanner/scannerlexer.l"
+{ return BASIC_TYPE; }
 	YY_BREAK
 case 135:
 YY_RULE_SETUP
-#line 232 "giscanner/scannerlexer.l"
-{ return INT; }
+#line 228 "giscanner/scannerlexer.l"
+{ return BASIC_TYPE; }
 	YY_BREAK
 case 136:
 YY_RULE_SETUP
-#line 233 "giscanner/scannerlexer.l"
-{ return LONG; }
+#line 229 "giscanner/scannerlexer.l"
+{ return BASIC_TYPE; }
 	YY_BREAK
 case 137:
 YY_RULE_SETUP
-#line 234 "giscanner/scannerlexer.l"
-{ return REGISTER; }
+#line 230 "giscanner/scannerlexer.l"
+{ return BASIC_TYPE; }
 	YY_BREAK
 case 138:
 YY_RULE_SETUP
-#line 235 "giscanner/scannerlexer.l"
-{ return RESTRICT; }
+#line 231 "giscanner/scannerlexer.l"
+{ return BASIC_TYPE; }
 	YY_BREAK
 case 139:
 YY_RULE_SETUP
-#line 236 "giscanner/scannerlexer.l"
-{ return RETURN; }
+#line 232 "giscanner/scannerlexer.l"
+{ return BASIC_TYPE; }
 	YY_BREAK
 case 140:
 YY_RULE_SETUP
-#line 237 "giscanner/scannerlexer.l"
-{ return SHORT; }
+#line 233 "giscanner/scannerlexer.l"
+{ return REGISTER; }
 	YY_BREAK
 case 141:
 YY_RULE_SETUP
-#line 238 "giscanner/scannerlexer.l"
-{ return SIGNED; }
+#line 234 "giscanner/scannerlexer.l"
+{ return RESTRICT; }
 	YY_BREAK
 case 142:
 YY_RULE_SETUP
-#line 239 "giscanner/scannerlexer.l"
-{ return SIZEOF; }
+#line 235 "giscanner/scannerlexer.l"
+{ return RETURN; }
 	YY_BREAK
 case 143:
 YY_RULE_SETUP
-#line 240 "giscanner/scannerlexer.l"
-{ return STATIC; }
+#line 236 "giscanner/scannerlexer.l"
+{ return BASIC_TYPE; }
 	YY_BREAK
 case 144:
 YY_RULE_SETUP
-#line 241 "giscanner/scannerlexer.l"
-{ return STRUCT; }
+#line 237 "giscanner/scannerlexer.l"
+{ return SIGNED; }
 	YY_BREAK
 case 145:
 YY_RULE_SETUP
-#line 242 "giscanner/scannerlexer.l"
-{ return SWITCH; }
+#line 238 "giscanner/scannerlexer.l"
+{ return SIGNED; }
 	YY_BREAK
 case 146:
 YY_RULE_SETUP
-#line 243 "giscanner/scannerlexer.l"
-{ return TYPEDEF; }
+#line 239 "giscanner/scannerlexer.l"
+{ return SIGNED; }
 	YY_BREAK
 case 147:
 YY_RULE_SETUP
-#line 244 "giscanner/scannerlexer.l"
-{ return UNION; }
+#line 240 "giscanner/scannerlexer.l"
+{ return SIZEOF; }
 	YY_BREAK
 case 148:
 YY_RULE_SETUP
-#line 245 "giscanner/scannerlexer.l"
-{ return UNSIGNED; }
+#line 241 "giscanner/scannerlexer.l"
+{ return STATIC; }
 	YY_BREAK
 case 149:
 YY_RULE_SETUP
-#line 246 "giscanner/scannerlexer.l"
-{ return VOID; }
+#line 242 "giscanner/scannerlexer.l"
+{ return STRUCT; }
 	YY_BREAK
 case 150:
 YY_RULE_SETUP
-#line 247 "giscanner/scannerlexer.l"
-{ return VOLATILE; }
+#line 243 "giscanner/scannerlexer.l"
+{ return SWITCH; }
 	YY_BREAK
 case 151:
 YY_RULE_SETUP
-#line 248 "giscanner/scannerlexer.l"
-{ return WHILE; }
+#line 244 "giscanner/scannerlexer.l"
+{ return TYPEDEF; }
 	YY_BREAK
 case 152:
 YY_RULE_SETUP
-#line 250 "giscanner/scannerlexer.l"
-{ return check_identifier(scanner, yytext); }
+#line 245 "giscanner/scannerlexer.l"
+{ return UNION; }
 	YY_BREAK
 case 153:
 YY_RULE_SETUP
-#line 252 "giscanner/scannerlexer.l"
-{ return INTEGER; }
+#line 246 "giscanner/scannerlexer.l"
+{ return UNSIGNED; }
 	YY_BREAK
 case 154:
 YY_RULE_SETUP
+#line 247 "giscanner/scannerlexer.l"
+{ return VOID; }
+	YY_BREAK
+case 155:
+YY_RULE_SETUP
+#line 248 "giscanner/scannerlexer.l"
+{ return VOLATILE; }
+	YY_BREAK
+case 156:
+YY_RULE_SETUP
+#line 249 "giscanner/scannerlexer.l"
+{ return WHILE; }
+	YY_BREAK
+case 157:
+YY_RULE_SETUP
+#line 251 "giscanner/scannerlexer.l"
+{ return check_identifier(scanner, yytext); }
+	YY_BREAK
+case 158:
+YY_RULE_SETUP
 #line 253 "giscanner/scannerlexer.l"
 { return INTEGER; }
 	YY_BREAK
-case 155:
+case 159:
 YY_RULE_SETUP
 #line 254 "giscanner/scannerlexer.l"
 { return INTEGER; }
 	YY_BREAK
-case 156:
+case 160:
 YY_RULE_SETUP
-#line 256 "giscanner/scannerlexer.l"
-{ return FLOATING; }
+#line 255 "giscanner/scannerlexer.l"
+{ return INTEGER; }
 	YY_BREAK
-case 157:
+case 161:
 YY_RULE_SETUP
 #line 257 "giscanner/scannerlexer.l"
 { return FLOATING; }
 	YY_BREAK
-case 158:
-/* rule 158 can match eol */
+case 162:
 YY_RULE_SETUP
-#line 259 "giscanner/scannerlexer.l"
-{ return CHARACTER; }
+#line 258 "giscanner/scannerlexer.l"
+{ return FLOATING; }
 	YY_BREAK
-case 159:
-/* rule 159 can match eol */
+case 163:
+/* rule 163 can match eol */
 YY_RULE_SETUP
 #line 260 "giscanner/scannerlexer.l"
 { return CHARACTER; }
 	YY_BREAK
-case 160:
-/* rule 160 can match eol */
+case 164:
+/* rule 164 can match eol */
 YY_RULE_SETUP
-#line 262 "giscanner/scannerlexer.l"
-{ return STRING; }
+#line 261 "giscanner/scannerlexer.l"
+{ return CHARACTER; }
 	YY_BREAK
-case 161:
-/* rule 161 can match eol */
+case 165:
+/* rule 165 can match eol */
 YY_RULE_SETUP
 #line 263 "giscanner/scannerlexer.l"
 { return STRING; }
 	YY_BREAK
-case 162:
+case 166:
+/* rule 166 can match eol */
+YY_RULE_SETUP
+#line 264 "giscanner/scannerlexer.l"
+{ return STRING; }
+	YY_BREAK
+case 167:
 YY_RULE_SETUP
-#line 265 "giscanner/scannerlexer.l"
+#line 266 "giscanner/scannerlexer.l"
 { print_error(scanner); }
 	YY_BREAK
-case 163:
+case 168:
 YY_RULE_SETUP
-#line 267 "giscanner/scannerlexer.l"
+#line 268 "giscanner/scannerlexer.l"
 ECHO;
 	YY_BREAK
-#line 2304 "giscanner/scannerlexer.c"
+#line 2364 "giscanner/scannerlexer.c"
 			case YY_STATE_EOF(INITIAL):
 				yyterminate();
 
@@ -2565,7 +2625,7 @@ static int yy_get_next_buffer (void)
 		while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 			{
 			yy_current_state = (int) yy_def[yy_current_state];
-			if ( yy_current_state >= 732 )
+			if ( yy_current_state >= 737 )
 				yy_c = yy_meta[yy_c];
 			}
 		yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
@@ -2588,11 +2648,11 @@ static int yy_get_next_buffer (void)
 	while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 		{
 		yy_current_state = (int) yy_def[yy_current_state];
-		if ( yy_current_state >= 732 )
+		if ( yy_current_state >= 737 )
 			yy_c = yy_meta[yy_c];
 		}
 	yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
-	yy_is_jam = (yy_current_state == 731);
+	yy_is_jam = (yy_current_state == 736);
 	if ( ! yy_is_jam )
 		*(yy_state_ptr)++ = yy_current_state;
 
@@ -3241,7 +3301,7 @@ void yyfree (void * ptr )
 
 #define YYTABLES_NAME "yytables"
 
-#line 267 "giscanner/scannerlexer.l"
+#line 268 "giscanner/scannerlexer.l"
 
 
 static int
@@ -3358,9 +3418,7 @@ _realpath (const char *path)
    * GetFullPathNameA() here unless we already defined it, like
    * in giscanner.c.
    */
-#ifndef USE_WINDOWS
-  extern __stdcall GetFullPathNameA(const char*, int, char*, char**);
-#endif
+  extern unsigned long __stdcall GetFullPathNameA(const char*, int, char*, char**);
   char *buffer;
   char dummy;
   int rc, len;
diff --git a/giscanner/scannerlexer.l b/giscanner/scannerlexer.l
index 7ffaad7..2f45b66 100644
--- a/giscanner/scannerlexer.l
+++ b/giscanner/scannerlexer.l
@@ -40,10 +40,6 @@
 #include "sourcescanner.h"
 #include "scannerparser.h"
 
-#ifdef USE_WINDOWS
-#include <windows.h>
-#endif
-
 int lineno;
 char linebuf[2000];
 
@@ -177,8 +173,6 @@ stringtext				([^\\\"])|(\\.)
 "_Nullable"				{ /* Ignore */ }
 "_Null_unspecified"			{ /* Ignore */ }
 "_Noreturn" 			        { /* Ignore */ }
-"__signed"                              { return SIGNED; }
-"__signed__"				{ return SIGNED; }
 "__restrict"				{ return RESTRICT; }
 "__restrict__"				{ return RESTRICT; }
 "thread_local"				{ return THREAD_LOCAL; }
@@ -186,15 +180,13 @@ stringtext				([^\\\"])|(\\.)
 "__typeof"				{ if (!parse_ignored_macro()) REJECT; }
 "__volatile"	        	        { return VOLATILE; }
 "__volatile__"	        	        { return VOLATILE; }
-"_Bool"					{ return BOOL; }
+"_Bool"					{ return BASIC_TYPE; }
 "typedef char __static_assert_t".*"\n"	{ ++lineno; /* Ignore */ }
 "__cdecl" 	        	        { /* Ignore */ }
 "__declspec(deprecated(".*"))"		{ /* Ignore */ }
 "__declspec"[\t ]*"("[a-z\t ]+")"	{ /* Ignore */ }
 "__stdcall" 			        { /* ignore */ }
 "__w64"					{ /* ignore */ }
-"__int64"				{ return INT; }
-"_Float128"                             { return FLOAT; }
 
 "G_GINT64_CONSTANT"			{ return INTL_CONST; }
 "G_GUINT64_CONSTANT"			{ return INTUL_CONST; }
@@ -208,34 +200,43 @@ stringtext				([^\\\"])|(\\.)
 
 "asm"           		        { if (!parse_ignored_macro()) REJECT; }
 "auto"					{ return AUTO; }
-"bool"                                  { return BOOL; }
 "break"					{ return BREAK; }
 "case"					{ return CASE; }
-"char"					{ return CHAR; }
+"char"					{ return BASIC_TYPE; }
 "const"					{ return CONST; }
 "continue"				{ return CONTINUE; }
 "default"				{ return DEFAULT; }
 "do"					{ return DO; }
-"double"				{ return DOUBLE; }
+"double"				{ return BASIC_TYPE; }
 "else"					{ return ELSE; }
 "enum"					{ return ENUM; }
 "extern"				{ return EXTERN; }
-"float"					{ return FLOAT; }
+"float"					{ return BASIC_TYPE; }
+"_Float16"                              { return BASIC_TYPE; }
+"_Float32"                              { return BASIC_TYPE; }
+"_Float64"                              { return BASIC_TYPE; }
+"_Float128"                             { return BASIC_TYPE; }
+"_Float32x"                             { return BASIC_TYPE; }
+"_Float64x"                             { return BASIC_TYPE; }
+"_Float128x"                            { return BASIC_TYPE; }
 "for"					{ return FOR; }
 "goto"					{ return GOTO; }
 "if"					{ return IF; }
 "inline"				{ return INLINE; }
-"int"					{ return INT; }
-"__uint128_t"				{ return INT; }
-"__int128_t"				{ return INT; }
-"__uint128"				{ return INT; }
-"__int128"				{ return INT; }
-"long"					{ return LONG; }
+"int"					{ return BASIC_TYPE; }
+"__int64"				{ return BASIC_TYPE; }
+"__uint128_t"				{ return BASIC_TYPE; }
+"__int128_t"				{ return BASIC_TYPE; }
+"__uint128"				{ return BASIC_TYPE; }
+"__int128"				{ return BASIC_TYPE; }
+"long"					{ return BASIC_TYPE; }
 "register"				{ return REGISTER; }
 "restrict"				{ return RESTRICT; }
 "return"				{ return RETURN; }
-"short"					{ return SHORT; }
+"short"					{ return BASIC_TYPE; }
 "signed"				{ return SIGNED; }
+"__signed"                              { return SIGNED; }
+"__signed__"				{ return SIGNED; }
 "sizeof"				{ return SIZEOF; }
 "static"				{ return STATIC; }
 "struct"				{ return STRUCT; }
@@ -380,9 +381,7 @@ _realpath (const char *path)
    * GetFullPathNameA() here unless we already defined it, like
    * in giscanner.c.
    */
-#ifndef USE_WINDOWS
-  extern __stdcall GetFullPathNameA(const char*, int, char*, char**);
-#endif
+  extern unsigned long __stdcall GetFullPathNameA(const char*, int, char*, char**);
   char *buffer;
   char dummy;
   int rc, len;
diff --git a/giscanner/scannermain.py b/giscanner/scannermain.py
old mode 100755
new mode 100644
index ffcb95c..e0af993
--- a/giscanner/scannermain.py
+++ b/giscanner/scannermain.py
@@ -34,8 +34,10 @@ import subprocess
 import sys
 import tempfile
 import platform
+import shlex
 
-from giscanner import message
+import giscanner
+from giscanner import message, pkgconfig
 from giscanner.annotationparser import GtkDocCommentBlockParser
 from giscanner.ast import Include, Namespace
 from giscanner.dumper import compile_introspection_binary
@@ -101,7 +103,8 @@ def get_windows_option_group(parser):
 
 
 def _get_option_parser():
-    parser = optparse.OptionParser('%prog [options] sources')
+    parser = optparse.OptionParser('%prog [options] sources',
+                                   version='%prog ' + giscanner.__version__)
     parser.add_option('', "--quiet",
                       action="store_true", dest="quiet",
                       default=False,
@@ -285,7 +288,7 @@ def test_codegen(optstring,
 
 
 def process_options(output, allowed_flags):
-    for option in output.split():
+    for option in output:
         for flag in allowed_flags:
             if not option.startswith(flag):
                 continue
@@ -294,19 +297,11 @@ def process_options(output, allowed_flags):
 
 
 def process_packages(options, packages):
-    args = [os.environ.get('PKG_CONFIG', 'pkg-config'), '--cflags']
-    args.extend(packages)
-    output = subprocess.Popen(args,
-                              stdout=subprocess.PIPE).communicate()[0]
-    if output is None:
-        # the error output should have already appeared on our stderr,
-        # so we just exit
-        return 1
-    output = output.decode('ascii')
+    flags = pkgconfig.cflags(packages)
     # Some pkg-config files on Windows have options we don't understand,
     # so we explicitly filter to only the ones we need.
     options_whitelist = ['-I', '-D', '-U', '-l', '-L']
-    filtered_output = list(process_options(output, options_whitelist))
+    filtered_output = list(process_options(flags, options_whitelist))
     parser = _get_option_parser()
     pkg_options, unused = parser.parse_args(filtered_output)
     options.cpp_includes.extend([os.path.realpath(f) for f in pkg_options.cpp_includes])
@@ -380,10 +375,12 @@ see --identifier-prefix and --symbol-prefix.""")
 
 
 def create_transformer(namespace, options):
+    identifier_filter_cmd = shlex.split(options.identifier_filter_cmd)
+    symbol_filter_cmd = shlex.split(options.symbol_filter_cmd)
     transformer = Transformer(namespace,
                               accept_unprefixed=options.accept_unprefixed,
-                              identifier_filter_cmd=options.identifier_filter_cmd,
-                              symbol_filter_cmd=options.symbol_filter_cmd)
+                              identifier_filter_cmd=identifier_filter_cmd,
+                              symbol_filter_cmd=symbol_filter_cmd)
     transformer.set_include_paths(options.include_paths)
     if options.passthrough_gir or options.reparse_validate_gir:
         transformer.disable_cache()
@@ -494,6 +491,9 @@ def scanner_main(args):
     parser = _get_option_parser()
     (options, args) = parser.parse_args(args)
 
+    if options.verbose:
+        import distutils
+        distutils.log.set_threshold(distutils.log.DEBUG)
     if options.passthrough_gir:
         passthrough_gir(options.passthrough_gir, sys.stdout)
     if options.test_codegen:
@@ -531,9 +531,10 @@ def scanner_main(args):
     packages = set(options.packages)
     packages.update(transformer.get_pkgconfig_packages())
     if packages:
-        exit_code = process_packages(options, packages)
-        if exit_code:
-            return exit_code
+        try:
+            process_packages(options, packages)
+        except pkgconfig.PkgConfigError as e:
+            _error(str(e))
 
     ss = create_source_scanner(options, args)
 
diff --git a/giscanner/scannerparser.c b/giscanner/scannerparser.c
index 8147f9c..baf8d8d 100644
--- a/giscanner/scannerparser.c
+++ b/giscanner/scannerparser.c
@@ -301,165 +301,155 @@ extern int yydebug;
 # define YYTOKENTYPE
   enum yytokentype
   {
-    IDENTIFIER = 258,
-    TYPEDEF_NAME = 259,
-    INTEGER = 260,
-    FLOATING = 261,
-    BOOLEAN = 262,
-    CHARACTER = 263,
-    STRING = 264,
-    INTL_CONST = 265,
-    INTUL_CONST = 266,
-    ELLIPSIS = 267,
-    ADDEQ = 268,
-    SUBEQ = 269,
-    MULEQ = 270,
-    DIVEQ = 271,
-    MODEQ = 272,
-    XOREQ = 273,
-    ANDEQ = 274,
-    OREQ = 275,
-    SL = 276,
-    SR = 277,
-    SLEQ = 278,
-    SREQ = 279,
-    EQ = 280,
-    NOTEQ = 281,
-    LTEQ = 282,
-    GTEQ = 283,
-    ANDAND = 284,
-    OROR = 285,
-    PLUSPLUS = 286,
-    MINUSMINUS = 287,
-    ARROW = 288,
-    AUTO = 289,
-    BOOL = 290,
+    BASIC_TYPE = 258,
+    IDENTIFIER = 259,
+    TYPEDEF_NAME = 260,
+    INTEGER = 261,
+    FLOATING = 262,
+    BOOLEAN = 263,
+    CHARACTER = 264,
+    STRING = 265,
+    INTL_CONST = 266,
+    INTUL_CONST = 267,
+    ELLIPSIS = 268,
+    ADDEQ = 269,
+    SUBEQ = 270,
+    MULEQ = 271,
+    DIVEQ = 272,
+    MODEQ = 273,
+    XOREQ = 274,
+    ANDEQ = 275,
+    OREQ = 276,
+    SL = 277,
+    SR = 278,
+    SLEQ = 279,
+    SREQ = 280,
+    EQ = 281,
+    NOTEQ = 282,
+    LTEQ = 283,
+    GTEQ = 284,
+    ANDAND = 285,
+    OROR = 286,
+    PLUSPLUS = 287,
+    MINUSMINUS = 288,
+    ARROW = 289,
+    AUTO = 290,
     BREAK = 291,
     CASE = 292,
-    CHAR = 293,
-    CONST = 294,
-    CONTINUE = 295,
-    DEFAULT = 296,
-    DO = 297,
-    DOUBLE = 298,
-    ELSE = 299,
-    ENUM = 300,
-    EXTENSION = 301,
-    EXTERN = 302,
-    FLOAT = 303,
-    FOR = 304,
-    GOTO = 305,
-    IF = 306,
-    INLINE = 307,
-    INT = 308,
-    LONG = 309,
-    REGISTER = 310,
-    RESTRICT = 311,
-    RETURN = 312,
-    SHORT = 313,
-    SIGNED = 314,
-    SIZEOF = 315,
-    STATIC = 316,
-    STRUCT = 317,
-    SWITCH = 318,
-    THREAD_LOCAL = 319,
-    TYPEDEF = 320,
-    UNION = 321,
-    UNSIGNED = 322,
-    VOID = 323,
-    VOLATILE = 324,
-    WHILE = 325,
-    FUNCTION_MACRO = 326,
-    OBJECT_MACRO = 327,
-    IFDEF_GI_SCANNER = 328,
-    IFNDEF_GI_SCANNER = 329,
-    IFDEF_COND = 330,
-    IFNDEF_COND = 331,
-    IF_COND = 332,
-    ELIF_COND = 333,
-    ELSE_COND = 334,
-    ENDIF_COND = 335
+    CONST = 293,
+    CONTINUE = 294,
+    DEFAULT = 295,
+    DO = 296,
+    ELSE = 297,
+    ENUM = 298,
+    EXTENSION = 299,
+    EXTERN = 300,
+    FOR = 301,
+    GOTO = 302,
+    IF = 303,
+    INLINE = 304,
+    REGISTER = 305,
+    RESTRICT = 306,
+    RETURN = 307,
+    SHORT = 308,
+    SIGNED = 309,
+    SIZEOF = 310,
+    STATIC = 311,
+    STRUCT = 312,
+    SWITCH = 313,
+    THREAD_LOCAL = 314,
+    TYPEDEF = 315,
+    UNION = 316,
+    UNSIGNED = 317,
+    VOID = 318,
+    VOLATILE = 319,
+    WHILE = 320,
+    FUNCTION_MACRO = 321,
+    OBJECT_MACRO = 322,
+    IFDEF_GI_SCANNER = 323,
+    IFNDEF_GI_SCANNER = 324,
+    IFDEF_COND = 325,
+    IFNDEF_COND = 326,
+    IF_COND = 327,
+    ELIF_COND = 328,
+    ELSE_COND = 329,
+    ENDIF_COND = 330
   };
 #endif
 /* Tokens.  */
-#define IDENTIFIER 258
-#define TYPEDEF_NAME 259
-#define INTEGER 260
-#define FLOATING 261
-#define BOOLEAN 262
-#define CHARACTER 263
-#define STRING 264
-#define INTL_CONST 265
-#define INTUL_CONST 266
-#define ELLIPSIS 267
-#define ADDEQ 268
-#define SUBEQ 269
-#define MULEQ 270
-#define DIVEQ 271
-#define MODEQ 272
-#define XOREQ 273
-#define ANDEQ 274
-#define OREQ 275
-#define SL 276
-#define SR 277
-#define SLEQ 278
-#define SREQ 279
-#define EQ 280
-#define NOTEQ 281
-#define LTEQ 282
-#define GTEQ 283
-#define ANDAND 284
-#define OROR 285
-#define PLUSPLUS 286
-#define MINUSMINUS 287
-#define ARROW 288
-#define AUTO 289
-#define BOOL 290
+#define BASIC_TYPE 258
+#define IDENTIFIER 259
+#define TYPEDEF_NAME 260
+#define INTEGER 261
+#define FLOATING 262
+#define BOOLEAN 263
+#define CHARACTER 264
+#define STRING 265
+#define INTL_CONST 266
+#define INTUL_CONST 267
+#define ELLIPSIS 268
+#define ADDEQ 269
+#define SUBEQ 270
+#define MULEQ 271
+#define DIVEQ 272
+#define MODEQ 273
+#define XOREQ 274
+#define ANDEQ 275
+#define OREQ 276
+#define SL 277
+#define SR 278
+#define SLEQ 279
+#define SREQ 280
+#define EQ 281
+#define NOTEQ 282
+#define LTEQ 283
+#define GTEQ 284
+#define ANDAND 285
+#define OROR 286
+#define PLUSPLUS 287
+#define MINUSMINUS 288
+#define ARROW 289
+#define AUTO 290
 #define BREAK 291
 #define CASE 292
-#define CHAR 293
-#define CONST 294
-#define CONTINUE 295
-#define DEFAULT 296
-#define DO 297
-#define DOUBLE 298
-#define ELSE 299
-#define ENUM 300
-#define EXTENSION 301
-#define EXTERN 302
-#define FLOAT 303
-#define FOR 304
-#define GOTO 305
-#define IF 306
-#define INLINE 307
-#define INT 308
-#define LONG 309
-#define REGISTER 310
-#define RESTRICT 311
-#define RETURN 312
-#define SHORT 313
-#define SIGNED 314
-#define SIZEOF 315
-#define STATIC 316
-#define STRUCT 317
-#define SWITCH 318
-#define THREAD_LOCAL 319
-#define TYPEDEF 320
-#define UNION 321
-#define UNSIGNED 322
-#define VOID 323
-#define VOLATILE 324
-#define WHILE 325
-#define FUNCTION_MACRO 326
-#define OBJECT_MACRO 327
-#define IFDEF_GI_SCANNER 328
-#define IFNDEF_GI_SCANNER 329
-#define IFDEF_COND 330
-#define IFNDEF_COND 331
-#define IF_COND 332
-#define ELIF_COND 333
-#define ELSE_COND 334
-#define ENDIF_COND 335
+#define CONST 293
+#define CONTINUE 294
+#define DEFAULT 295
+#define DO 296
+#define ELSE 297
+#define ENUM 298
+#define EXTENSION 299
+#define EXTERN 300
+#define FOR 301
+#define GOTO 302
+#define IF 303
+#define INLINE 304
+#define REGISTER 305
+#define RESTRICT 306
+#define RETURN 307
+#define SHORT 308
+#define SIGNED 309
+#define SIZEOF 310
+#define STATIC 311
+#define STRUCT 312
+#define SWITCH 313
+#define THREAD_LOCAL 314
+#define TYPEDEF 315
+#define UNION 316
+#define UNSIGNED 317
+#define VOID 318
+#define VOLATILE 319
+#define WHILE 320
+#define FUNCTION_MACRO 321
+#define OBJECT_MACRO 322
+#define IFDEF_GI_SCANNER 323
+#define IFNDEF_GI_SCANNER 324
+#define IFDEF_COND 325
+#define IFNDEF_COND 326
+#define IF_COND 327
+#define ELIF_COND 328
+#define ELSE_COND 329
+#define ENDIF_COND 330
 
 /* Value type.  */
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
@@ -477,7 +467,7 @@ union YYSTYPE
   FunctionSpecifier function_specifier;
   UnaryOperator unary_operator;
 
-#line 481 "giscanner/scannerparser.c" /* yacc.c:355  */
+#line 471 "giscanner/scannerparser.c" /* yacc.c:355  */
 };
 
 typedef union YYSTYPE YYSTYPE;
@@ -494,7 +484,7 @@ int yyparse (GISourceScanner* scanner);
 
 /* Copy the second part of user declarations.  */
 
-#line 498 "giscanner/scannerparser.c" /* yacc.c:358  */
+#line 488 "giscanner/scannerparser.c" /* yacc.c:358  */
 
 #ifdef short
 # undef short
@@ -734,23 +724,23 @@ union yyalloc
 #endif /* !YYCOPY_NEEDED */
 
 /* YYFINAL -- State number of the termination state.  */
-#define YYFINAL  77
+#define YYFINAL  72
 /* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   2610
+#define YYLAST   2370
 
 /* YYNTOKENS -- Number of terminals.  */
-#define YYNTOKENS  105
+#define YYNTOKENS  100
 /* YYNNTS -- Number of nonterminals.  */
-#define YYNNTS  77
+#define YYNNTS  78
 /* YYNRULES -- Number of rules.  */
-#define YYNRULES  257
+#define YYNRULES  252
 /* YYNSTATES -- Number of states.  */
-#define YYNSTATES  427
+#define YYNSTATES  422
 
 /* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned
    by yylex, with out-of-bounds checking.  */
 #define YYUNDEFTOK  2
-#define YYMAXUTOK   335
+#define YYMAXUTOK   330
 
 #define YYTRANSLATE(YYX)                                                \
   ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
@@ -762,16 +752,16 @@ static const yytype_uint8 yytranslate[] =
        0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,    94,     2,     2,     2,    96,    89,     2,
-      81,    82,    90,    91,    88,    92,    87,    95,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,   102,   104,
-      97,   103,    98,   101,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,    89,     2,     2,     2,    91,    84,     2,
+      76,    77,    85,    86,    83,    87,    82,    90,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,    97,    99,
+      92,    98,    93,    96,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,    85,     2,    86,    99,     2,     2,     2,     2,     2,
+       2,    80,     2,    81,    94,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,    83,   100,    84,    93,     2,     2,     2,
+       2,     2,     2,    78,    95,    79,    88,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
@@ -792,39 +782,39 @@ static const yytype_uint8 yytranslate[] =
       45,    46,    47,    48,    49,    50,    51,    52,    53,    54,
       55,    56,    57,    58,    59,    60,    61,    62,    63,    64,
       65,    66,    67,    68,    69,    70,    71,    72,    73,    74,
-      75,    76,    77,    78,    79,    80
+      75
 };
 
 #if YYDEBUG
   /* YYRLINE[YYN] -- Source line where rule number YYN was defined.  */
 static const yytype_uint16 yyrline[] =
 {
-       0,   326,   326,   335,   351,   357,   363,   370,   371,   375,
-     383,   398,   412,   419,   420,   424,   425,   429,   433,   437,
-     441,   445,   449,   456,   457,   461,   462,   466,   470,   493,
-     500,   507,   511,   519,   523,   527,   531,   535,   539,   546,
-     547,   559,   560,   566,   574,   585,   586,   592,   601,   602,
-     614,   623,   624,   630,   636,   642,   651,   652,   658,   667,
-     668,   677,   678,   687,   688,   697,   698,   709,   710,   721,
-     722,   729,   730,   737,   738,   739,   740,   741,   742,   743,
-     744,   745,   746,   747,   751,   752,   753,   760,   766,   784,
-     791,   796,   801,   814,   815,   820,   825,   830,   838,   842,
-     849,   850,   854,   858,   862,   866,   870,   874,   881,   885,
-     889,   893,   897,   901,   905,   909,   913,   917,   921,   922,
-     923,   931,   951,   956,   964,   969,   977,   978,   985,  1005,
-    1010,  1011,  1016,  1024,  1028,  1036,  1039,  1040,  1044,  1055,
-    1062,  1069,  1076,  1083,  1090,  1099,  1099,  1108,  1116,  1124,
-    1136,  1140,  1144,  1148,  1155,  1162,  1167,  1171,  1176,  1180,
-    1185,  1190,  1200,  1207,  1216,  1221,  1225,  1236,  1249,  1250,
-    1257,  1261,  1268,  1273,  1278,  1283,  1290,  1296,  1305,  1306,
-    1310,  1315,  1316,  1324,  1328,  1333,  1338,  1343,  1348,  1354,
-    1364,  1370,  1383,  1390,  1391,  1392,  1396,  1397,  1403,  1404,
-    1405,  1406,  1407,  1408,  1412,  1413,  1414,  1418,  1419,  1423,
-    1424,  1428,  1429,  1433,  1434,  1438,  1439,  1440,  1444,  1445,
-    1446,  1447,  1448,  1449,  1450,  1451,  1452,  1453,  1457,  1458,
-    1459,  1460,  1461,  1467,  1468,  1472,  1473,  1474,  1478,  1479,
-    1483,  1484,  1490,  1497,  1504,  1508,  1525,  1530,  1535,  1540,
-    1545,  1550,  1557,  1562,  1570,  1571,  1572,  1573
+       0,   328,   328,   337,   353,   359,   365,   372,   373,   377,
+     385,   400,   414,   421,   422,   426,   427,   431,   435,   439,
+     443,   447,   451,   458,   459,   463,   464,   468,   472,   495,
+     502,   509,   513,   521,   525,   529,   533,   537,   541,   548,
+     549,   561,   562,   568,   576,   587,   588,   594,   603,   604,
+     616,   625,   626,   632,   638,   644,   653,   654,   660,   669,
+     670,   679,   680,   689,   690,   699,   700,   711,   712,   723,
+     724,   731,   732,   739,   740,   741,   742,   743,   744,   745,
+     746,   747,   748,   749,   753,   754,   755,   762,   768,   786,
+     793,   798,   803,   816,   817,   822,   827,   832,   840,   844,
+     851,   852,   856,   860,   864,   868,   872,   876,   883,   890,
+     894,   898,   902,   907,   908,   909,   917,   937,   942,   950,
+     955,   963,   964,   971,   991,   996,   997,  1002,  1010,  1014,
+    1022,  1025,  1026,  1030,  1041,  1048,  1055,  1062,  1069,  1076,
+    1085,  1085,  1094,  1102,  1110,  1122,  1126,  1130,  1134,  1141,
+    1148,  1153,  1157,  1162,  1166,  1171,  1176,  1186,  1193,  1202,
+    1207,  1211,  1222,  1235,  1236,  1243,  1247,  1254,  1259,  1264,
+    1269,  1276,  1282,  1291,  1292,  1296,  1301,  1302,  1310,  1314,
+    1319,  1324,  1329,  1334,  1340,  1350,  1356,  1369,  1376,  1377,
+    1378,  1382,  1383,  1389,  1390,  1391,  1392,  1393,  1394,  1398,
+    1399,  1400,  1404,  1405,  1409,  1410,  1414,  1415,  1419,  1420,
+    1424,  1425,  1426,  1430,  1431,  1432,  1433,  1434,  1435,  1436,
+    1437,  1438,  1439,  1443,  1444,  1445,  1446,  1447,  1453,  1454,
+    1458,  1459,  1460,  1464,  1465,  1469,  1470,  1476,  1483,  1490,
+    1494,  1511,  1516,  1521,  1526,  1531,  1536,  1543,  1548,  1556,
+    1557,  1558,  1559
 };
 #endif
 
@@ -833,23 +823,22 @@ static const yytype_uint16 yyrline[] =
    First, the terminals, then, starting at YYNTOKENS, nonterminals.  */
 static const char *const yytname[] =
 {
-  "$end", "error", "$undefined", "\"identifier\"", "\"typedef-name\"",
-  "INTEGER", "FLOATING", "BOOLEAN", "CHARACTER", "STRING", "INTL_CONST",
-  "INTUL_CONST", "ELLIPSIS", "ADDEQ", "SUBEQ", "MULEQ", "DIVEQ", "MODEQ",
-  "XOREQ", "ANDEQ", "OREQ", "SL", "SR", "SLEQ", "SREQ", "EQ", "NOTEQ",
-  "LTEQ", "GTEQ", "ANDAND", "OROR", "PLUSPLUS", "MINUSMINUS", "ARROW",
-  "AUTO", "BOOL", "BREAK", "CASE", "CHAR", "CONST", "CONTINUE", "DEFAULT",
-  "DO", "DOUBLE", "ELSE", "ENUM", "EXTENSION", "EXTERN", "FLOAT", "FOR",
-  "GOTO", "IF", "INLINE", "INT", "LONG", "REGISTER", "RESTRICT", "RETURN",
-  "SHORT", "SIGNED", "SIZEOF", "STATIC", "STRUCT", "SWITCH",
-  "THREAD_LOCAL", "TYPEDEF", "UNION", "UNSIGNED", "VOID", "VOLATILE",
-  "WHILE", "FUNCTION_MACRO", "OBJECT_MACRO", "IFDEF_GI_SCANNER",
-  "IFNDEF_GI_SCANNER", "IFDEF_COND", "IFNDEF_COND", "IF_COND", "ELIF_COND",
-  "ELSE_COND", "ENDIF_COND", "'('", "')'", "'{'", "'}'", "'['", "']'",
-  "'.'", "','", "'&'", "'*'", "'+'", "'-'", "'~'", "'!'", "'/'", "'%'",
-  "'<'", "'>'", "'^'", "'|'", "'?'", "':'", "'='", "';'", "$accept",
-  "primary_expression", "strings", "identifier",
-  "identifier_or_typedef_name", "postfix_expression",
+  "$end", "error", "$undefined", "BASIC_TYPE", "\"identifier\"",
+  "\"typedef-name\"", "INTEGER", "FLOATING", "BOOLEAN", "CHARACTER",
+  "STRING", "INTL_CONST", "INTUL_CONST", "ELLIPSIS", "ADDEQ", "SUBEQ",
+  "MULEQ", "DIVEQ", "MODEQ", "XOREQ", "ANDEQ", "OREQ", "SL", "SR", "SLEQ",
+  "SREQ", "EQ", "NOTEQ", "LTEQ", "GTEQ", "ANDAND", "OROR", "PLUSPLUS",
+  "MINUSMINUS", "ARROW", "AUTO", "BREAK", "CASE", "CONST", "CONTINUE",
+  "DEFAULT", "DO", "ELSE", "ENUM", "EXTENSION", "EXTERN", "FOR", "GOTO",
+  "IF", "INLINE", "REGISTER", "RESTRICT", "RETURN", "SHORT", "SIGNED",
+  "SIZEOF", "STATIC", "STRUCT", "SWITCH", "THREAD_LOCAL", "TYPEDEF",
+  "UNION", "UNSIGNED", "VOID", "VOLATILE", "WHILE", "FUNCTION_MACRO",
+  "OBJECT_MACRO", "IFDEF_GI_SCANNER", "IFNDEF_GI_SCANNER", "IFDEF_COND",
+  "IFNDEF_COND", "IF_COND", "ELIF_COND", "ELSE_COND", "ENDIF_COND", "'('",
+  "')'", "'{'", "'}'", "'['", "']'", "'.'", "','", "'&'", "'*'", "'+'",
+  "'-'", "'~'", "'!'", "'/'", "'%'", "'<'", "'>'", "'^'", "'|'", "'?'",
+  "':'", "'='", "';'", "$accept", "primary_expression", "strings",
+  "identifier", "identifier_or_typedef_name", "postfix_expression",
   "argument_expression_list", "unary_expression", "unary_operator",
   "cast_expression", "multiplicative_expression", "additive_expression",
   "shift_expression", "relational_expression", "equality_expression",
@@ -858,8 +847,9 @@ static const char *const yytname[] =
   "conditional_expression", "assignment_expression", "assignment_operator",
   "expression", "constant_expression", "declaration",
   "declaration_specifiers", "init_declarator_list", "init_declarator",
-  "storage_class_specifier", "type_specifier", "struct_or_union_specifier",
-  "struct_or_union", "struct_declaration_list", "struct_declaration",
+  "storage_class_specifier", "basic_type", "type_specifier",
+  "struct_or_union_specifier", "struct_or_union",
+  "struct_declaration_list", "struct_declaration",
   "specifier_qualifier_list", "struct_declarator_list",
   "struct_declarator", "enum_specifier", "enum_keyword", "enumerator_list",
   "$@1", "enumerator", "type_qualifier", "function_specifier",
@@ -888,10 +878,9 @@ static const yytype_uint16 yytoknum[] =
      295,   296,   297,   298,   299,   300,   301,   302,   303,   304,
      305,   306,   307,   308,   309,   310,   311,   312,   313,   314,
      315,   316,   317,   318,   319,   320,   321,   322,   323,   324,
-     325,   326,   327,   328,   329,   330,   331,   332,   333,   334,
-     335,    40,    41,   123,   125,    91,    93,    46,    44,    38,
-      42,    43,    45,   126,    33,    47,    37,    60,    62,    94,
-     124,    63,    58,    61,    59
+     325,   326,   327,   328,   329,   330,    40,    41,   123,   125,
+      91,    93,    46,    44,    38,    42,    43,    45,   126,    33,
+      47,    37,    60,    62,    94,   124,    63,    58,    61,    59
 };
 # endif
 
@@ -909,125 +898,125 @@ static const yytype_uint16 yytoknum[] =
      STATE-NUM.  */
 static const yytype_int16 yypact[] =
 {
-    2256,  -237,  -237,  -237,  -237,  -237,  -237,  -237,  -237,  -237,
+    2078,  -237,  -237,  -237,  -237,  -237,  -237,  -237,  -237,  -237,
     -237,  -237,  -237,  -237,  -237,  -237,  -237,  -237,  -237,  -237,
     -237,  -237,  -237,  -237,  -237,  -237,  -237,  -237,  -237,  -237,
-    -237,  -237,  -237,  -237,  -237,  -237,  -237,  -237,    39,  2505,
-    2505,  -237,    23,  -237,    61,  2505,  2505,  -237,  2133,  -237,
-    -237,   -47,  1783,  -237,  -237,  -237,  -237,  -237,    34,   125,
-    -237,  -237,   -45,  -237,  1092,    87,    33,  -237,  -237,  2541,
-    -237,   -35,  -237,  -237,   -29,  -237,  -237,  -237,  -237,    66,
-    -237,  -237,  -237,  -237,  -237,   -36,    14,  1825,  1825,    36,
-    1881,  1226,  -237,  -237,  -237,  -237,  -237,  -237,  -237,   116,
-    -237,   157,  -237,  1783,  -237,    84,   216,   154,    11,   278,
-       4,    67,    35,   130,   -11,  -237,  -237,   122,  -237,  -237,
-     125,    34,  -237,   471,  1335,  -237,    39,  -237,  2372,  2334,
-    1391,    87,  2541,  2179,  -237,    32,  2541,  2541,   -10,    66,
-    -237,  -237,    69,  1825,  1825,  1923,  -237,  -237,   131,  1226,
-    -237,  1979,   565,  -237,  -237,   105,   120,   159,  -237,  -237,
-    -237,   213,  1433,  1923,   213,  -237,  1783,  1783,  1783,  1783,
-    1783,  1783,  1783,  1783,  1783,  1783,  1783,  1783,  1783,  1783,
-    1783,  1783,  1783,  1783,  1923,  -237,  -237,  -237,  -237,   145,
-     152,  1783,   155,   166,   816,   190,   213,   205,   882,   210,
-     234,  -237,  -237,   181,   192,   -44,  -237,   219,  -237,  -237,
-    -237,   563,  -237,  -237,  -237,  -237,  -237,  1335,  -237,  -237,
-    -237,  -237,  -237,  -237,    47,   110,  -237,   121,  -237,   243,
-    -237,  -237,  -237,  1783,   -20,  -237,   228,  -237,  2216,  -237,
-      12,   231,  -237,   204,  -237,    66,   249,   254,  1979,   747,
-     255,  1159,   250,  -237,  -237,  -237,  -237,  -237,  -237,  -237,
-    -237,  -237,  -237,  -237,  1783,  -237,  1783,  2063,  1489,   212,
-    -237,   215,  1783,  -237,  -237,   124,  -237,    60,  -237,  -237,
-    -237,  -237,    84,    84,   216,   216,   154,   154,   154,   154,
-      11,    11,   278,     4,    67,    35,   130,   -39,  -237,   237,
-    -237,   816,   270,   924,   241,  1923,  -237,   -18,  1923,  1923,
-     816,  -237,  -237,  -237,  -237,   217,  1997,  -237,    22,  -237,
-    -237,  2469,  -237,  -237,  -237,    32,  -237,  1783,  -237,  -237,
-    -237,  1783,  -237,    15,  -237,  -237,  -237,   655,  -237,  -237,
-    -237,  -237,   158,   259,  -237,   260,   215,  2431,  1531,  -237,
-    -237,  1783,  -237,  1923,   816,  -237,   272,   988,   -17,  -237,
-     163,  -237,   167,   178,  -237,  -237,  1293,  -237,  -237,  -237,
-    -237,  -237,   273,  -237,  -237,  -237,  -237,   179,  -237,   271,
-    -237,   250,  -237,  1923,  1587,    57,  1030,   816,   816,   816,
-    -237,  -237,  -237,  -237,  -237,   182,   816,   187,  1629,  1685,
-      65,   312,  -237,  -237,   257,  -237,   816,   816,   191,   816,
-     194,  1727,   816,  -237,  -237,  -237,   816,  -237,   816,   816,
-     202,  -237,  -237,  -237,  -237,   816,  -237
+    -237,  -237,    11,  2306,  -237,  2306,  -237,    44,  -237,    47,
+    2306,  2306,  -237,  1997,  -237,  -237,   -41,  1635,  -237,  -237,
+    -237,  -237,  -237,   138,   207,  -237,  -237,   -61,  -237,   884,
+      87,    19,  -237,  -237,  2179,  -237,   -23,  -237,  -237,   -10,
+    -237,  -237,  -237,  -237,    74,  -237,  -237,  -237,  -237,  -237,
+      29,    50,  1674,  1674,    65,  1724,  1222,  -237,  -237,  -237,
+    -237,  -237,  -237,  -237,   134,  -237,   145,  -237,  1635,  -237,
+      58,    94,   209,   176,   267,    98,    96,   104,   211,    25,
+    -237,  -237,   136,  -237,  -237,   207,   138,  -237,   441,  1322,
+    -237,    11,  -237,  2047,  2151,  1341,    87,  2179,  1929,  -237,
+      21,  2179,  2179,   137,    74,  -237,  -237,   -18,  1674,  1674,
+    1763,  -237,  -237,   129,  1222,  -237,  1782,   177,  -237,  -237,
+     -11,   130,   166,  -237,  -237,  -237,   324,  1380,  1763,   324,
+    -237,  1635,  1635,  1635,  1635,  1635,  1635,  1635,  1635,  1635,
+    1635,  1635,  1635,  1635,  1635,  1635,  1635,  1635,  1635,  1763,
+    -237,  -237,  -237,  -237,   154,   178,  1635,   185,   189,   827,
+     196,   324,   237,   945,   240,   243,  -237,  -237,   210,   233,
+     -30,  -237,   252,  -237,  -237,  -237,   547,  -237,  -237,  -237,
+    -237,  -237,  1322,  -237,  -237,  -237,  -237,  -237,  -237,    90,
+      69,  -237,   152,  -237,   224,  -237,  -237,  -237,  1635,   -20,
+    -237,   257,  -237,  1966,  -237,    32,   241,  -237,   231,  -237,
+      74,   278,   279,  1782,   741,   280,  1160,   275,  -237,  -237,
+    -237,  -237,  -237,  -237,  -237,  -237,  -237,  -237,  -237,  1635,
+    -237,  1635,  1902,  1430,   242,  -237,   245,  1635,  -237,  -237,
+     173,  -237,   -49,  -237,  -237,  -237,  -237,    58,    58,    94,
+      94,   209,   209,   209,   209,   176,   176,   267,    98,    96,
+     104,   211,   -22,  -237,   263,  -237,   827,   296,   961,   264,
+    1763,  -237,    18,  1763,  1763,   827,  -237,  -237,  -237,  -237,
+     248,  1840,  -237,    39,  -237,  -237,  2275,  -237,  -237,  -237,
+      21,  -237,  1635,  -237,  -237,  -237,  1635,  -237,    37,  -237,
+    -237,  -237,   644,  -237,  -237,  -237,  -237,   180,   285,  -237,
+     283,   245,  2213,  1469,  -237,  -237,  1635,  -237,  1763,   827,
+    -237,   289,  1047,    46,  -237,   182,  -237,   184,   193,  -237,
+    -237,  1283,  -237,  -237,  -237,  -237,  -237,   290,  -237,  -237,
+    -237,  -237,   197,  -237,   287,  -237,   275,  -237,  1763,  1488,
+      72,  1063,   827,   827,   827,  -237,  -237,  -237,  -237,  -237,
+     208,   827,   218,  1527,  1577,    73,   329,  -237,  -237,   274,
+    -237,   827,   827,   220,   827,   221,  1616,   827,  -237,  -237,
+    -237,   827,  -237,   827,   827,   229,  -237,  -237,  -237,  -237,
+     827,  -237
 };
 
   /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM.
      Performed when YYTABLE does not specify something else to do.  Zero
      means the default is an error.  */
-static const yytype_uint16 yydefact[] =
+static const yytype_uint8 yydefact[] =
 {
-       0,   257,   192,   105,   117,   109,   150,   114,   144,   152,
-     103,   113,   154,   111,   112,   106,   151,   110,   115,   104,
-     124,   107,   102,   125,   116,   108,   153,   242,   243,   246,
-     247,   248,   249,   250,   251,   252,   253,   236,     0,    91,
-      93,   118,     0,   119,     0,    95,    97,   120,     0,   233,
-     235,     0,     0,   254,   255,   256,   237,    12,     0,   165,
-      89,   157,     0,    98,   100,   156,     0,    90,    92,     0,
-      13,   123,    14,   145,   143,    94,    96,     1,   234,     0,
-       3,     6,     4,     5,    10,     0,     0,     0,     0,     0,
-       0,     0,    33,    34,    35,    36,    37,    38,    15,     7,
-       2,    25,    39,     0,    41,    45,    48,    51,    56,    59,
-      61,    63,    65,    67,    69,    87,   245,     0,   168,   167,
-     164,     0,    88,     0,     0,   240,     0,   239,     0,     0,
-       0,   155,   130,     0,   126,   135,   132,     0,     0,     0,
-     145,   176,     0,     0,     0,     0,    26,    27,     0,     0,
-      31,   152,    39,    71,    84,     0,   178,     0,    11,    21,
-      22,     0,     0,     0,     0,    28,     0,     0,     0,     0,
+       0,   252,   108,   187,   105,   145,   139,   147,   103,   149,
+     106,   146,   110,   104,   119,   107,   102,   120,   111,   109,
+     148,   237,   238,   241,   242,   243,   244,   245,   246,   247,
+     248,   231,     0,    91,   112,    93,   113,     0,   114,     0,
+      95,    97,   115,     0,   228,   230,     0,     0,   249,   250,
+     251,   232,    12,     0,   160,    89,   152,     0,    98,   100,
+     151,     0,    90,    92,     0,    13,   118,    14,   140,   138,
+      94,    96,     1,   229,     0,     3,     6,     4,     5,    10,
+       0,     0,     0,     0,     0,     0,     0,    33,    34,    35,
+      36,    37,    38,    15,     7,     2,    25,    39,     0,    41,
+      45,    48,    51,    56,    59,    61,    63,    65,    67,    69,
+      87,   240,     0,   163,   162,   159,     0,    88,     0,     0,
+     235,     0,   234,     0,     0,     0,   150,   125,     0,   121,
+     130,   127,     0,     0,     0,   140,   171,     0,     0,     0,
+       0,    26,    27,     0,     0,    31,   147,    39,    71,    84,
+       0,   173,     0,    11,    21,    22,     0,     0,     0,     0,
+      28,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   158,   169,   166,    99,   100,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   207,   213,     2,     0,     0,   211,   120,   212,   198,
-     199,     0,   209,   200,   201,   202,   203,     0,   193,   101,
-     241,   238,   175,   163,   174,     0,   170,     0,   160,     0,
-     129,   122,   127,     0,     0,   133,   136,   131,     0,   140,
-       0,   148,   146,     0,   244,     0,     0,     0,     0,     0,
-       0,     0,    86,    77,    78,    74,    75,    76,    82,    81,
-      83,    79,    80,    73,     0,     8,     0,     0,     0,   180,
-     179,   181,     0,    20,    18,     0,    23,     0,    19,    42,
-      43,    44,    46,    47,    49,    50,    54,    55,    52,    53,
-      57,    58,    60,    62,    64,    66,    68,     0,   230,     0,
-     229,     0,     0,     0,     0,     0,   231,     0,     0,     0,
-       0,   214,   208,   210,   196,     0,     0,   172,   180,   173,
-     161,     0,   162,   159,   137,   135,   128,     0,   121,   142,
-     147,     0,   139,     0,   177,    29,    30,     0,    32,    72,
-      85,   188,     0,     0,   184,     0,   182,     0,     0,    40,
-      17,     0,    16,     0,     0,   206,     0,     0,     0,   228,
-       0,   232,     0,     0,   204,   194,     0,   171,   134,   138,
-     149,   141,     0,   189,   183,   185,   190,     0,   186,     0,
-      24,    70,   205,     0,     0,     0,     0,     0,     0,     0,
-     195,   197,     9,   191,   187,     0,     0,     0,     0,     0,
-       0,   215,   217,   218,     0,   220,     0,     0,     0,     0,
-       0,     0,     0,   219,   224,   222,     0,   221,     0,     0,
-       0,   216,   226,   225,   223,     0,   227
+     153,   164,   161,    99,   100,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   202,   208,     2,     0,
+       0,   206,   115,   207,   193,   194,     0,   204,   195,   196,
+     197,   198,     0,   188,   101,   236,   233,   170,   158,   169,
+       0,   165,     0,   155,     0,   124,   117,   122,     0,     0,
+     128,   131,   126,     0,   135,     0,   143,   141,     0,   239,
+       0,     0,     0,     0,     0,     0,     0,    86,    77,    78,
+      74,    75,    76,    82,    81,    83,    79,    80,    73,     0,
+       8,     0,     0,     0,   175,   174,   176,     0,    20,    18,
+       0,    23,     0,    19,    42,    43,    44,    46,    47,    49,
+      50,    54,    55,    52,    53,    57,    58,    60,    62,    64,
+      66,    68,     0,   225,     0,   224,     0,     0,     0,     0,
+       0,   226,     0,     0,     0,     0,   209,   203,   205,   191,
+       0,     0,   167,   175,   168,   156,     0,   157,   154,   132,
+     130,   123,     0,   116,   137,   142,     0,   134,     0,   172,
+      29,    30,     0,    32,    72,    85,   183,     0,     0,   179,
+       0,   177,     0,     0,    40,    17,     0,    16,     0,     0,
+     201,     0,     0,     0,   223,     0,   227,     0,     0,   199,
+     189,     0,   166,   129,   133,   144,   136,     0,   184,   178,
+     180,   185,     0,   181,     0,    24,    70,   200,     0,     0,
+       0,     0,     0,     0,     0,   190,   192,     9,   186,   182,
+       0,     0,     0,     0,     0,     0,   210,   212,   213,     0,
+     215,     0,     0,     0,     0,     0,     0,     0,   214,   219,
+     217,     0,   216,     0,     0,     0,   211,   221,   220,   218,
+       0,   222
 };
 
   /* YYPGOTO[NTERM-NUM].  */
 static const yytype_int16 yypgoto[] =
 {
-    -237,  -237,  -237,   -38,   -34,  -237,  -237,    52,  -237,   -87,
-     141,   142,   144,   149,   180,   183,   184,   185,   189,  -237,
-     -50,  -101,  -237,   -51,  -177,     3,     7,  -237,   245,  -237,
-     -60,  -237,  -237,   225,  -120,   -74,  -237,    45,  -237,  -237,
-     224,  -237,   252,   253,  -237,   -16,   -65,   -54,  -237,  -108,
-      71,   264,   233,  -132,  -236,   -12,  -206,  -237,    42,  -237,
-      -7,   139,  -199,  -237,  -237,  -237,  -237,  -237,   350,  -237,
-    -237,  -237,  -237,  -237,  -237,  -237,  -237
+    -237,  -237,  -237,   -32,   -26,  -237,  -237,   255,  -237,   -81,
+     183,   175,   164,   172,   192,   199,   204,   206,   212,  -237,
+     -39,   -99,  -237,   -70,  -168,    14,     4,  -237,   268,  -237,
+    -237,     7,  -237,  -237,   254,  -101,   -77,  -237,    67,  -237,
+    -237,   256,  -237,   258,   -24,  -237,   -31,   -59,   -51,  -237,
+    -118,    81,   265,   259,  -105,  -236,    -6,  -200,  -237,  -165,
+    -237,   -40,   155,  -196,  -237,  -237,  -237,  -237,  -237,   357,
+    -237,  -237,  -237,  -237,  -237,  -237,  -237,  -237
 };
 
   /* YYDEFGOTO[NTERM-NUM].  */
 static const yytype_int16 yydefgoto[] =
 {
-      -1,    98,    99,   100,   204,   101,   275,   152,   103,   104,
-     105,   106,   107,   108,   109,   110,   111,   112,   113,   114,
-     153,   154,   264,   205,   116,   206,   126,    62,    63,    39,
-      40,    41,    42,   133,   134,   135,   234,   235,    43,    44,
-     138,   139,   330,    45,    46,   117,    65,    66,   120,   342,
-     226,   142,   157,   343,   271,    47,   219,   315,   208,   209,
-     210,   211,   212,   213,   214,   215,   216,    48,    49,    50,
-     128,    51,    52,    53,    54,    55,    56
+      -1,    93,    94,    95,   199,    96,   270,   147,    98,    99,
+     100,   101,   102,   103,   104,   105,   106,   107,   108,   109,
+     148,   149,   259,   200,   111,   201,   121,    57,    58,    33,
+      34,    35,    36,    37,   128,   129,   130,   229,   230,    38,
+      39,   133,   134,   325,    40,    41,   112,    60,    61,   115,
+     337,   221,   137,   152,   338,   266,    42,   214,   310,   203,
+     204,   205,   206,   207,   208,   209,   210,   211,    43,    44,
+      45,   123,    46,    47,    48,    49,    50,    51
 };
 
   /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM.  If
@@ -1035,614 +1024,566 @@ static const yytype_int16 yydefgoto[] =
      number is the opposite.  If YYTABLE_NINF, syntax error.  */
 static const yytype_int16 yytable[] =
 {
-      61,   131,   115,    37,    70,   119,    70,    38,    71,   132,
-      74,   314,   313,   232,   299,    57,   165,   156,    57,   183,
-      61,   225,    64,   218,   270,    57,    57,     2,    61,   229,
-      72,   132,    72,   346,    79,    57,    57,    57,   173,   174,
-     155,   141,    57,   121,   266,   143,    67,    68,   137,   266,
-      57,    37,    75,    76,   140,    38,   324,   127,   230,   122,
-     311,   276,   237,   353,    57,     2,   187,   125,   325,    57,
-     266,   266,   132,   132,   239,   156,   132,   132,   240,   279,
-     280,   281,   346,    61,   326,   203,   361,   386,    61,   132,
-     184,   141,   319,   179,   155,   144,   329,    61,   155,   371,
-     252,   241,   269,   316,   102,   189,    69,   268,   175,   176,
-     189,   207,   277,    58,    58,    58,   218,   148,   232,   236,
-      58,   221,    59,    70,    59,   158,    70,   273,   316,    59,
-     278,   220,   268,   297,   233,   181,   224,    59,   313,   146,
-     147,   115,   150,    60,    73,   266,   352,   307,   266,    72,
-     369,   244,    72,   266,   370,   102,   203,   245,    70,   182,
-     391,   398,   304,   339,     6,   340,   180,   345,   129,   411,
-     318,     9,   130,   203,   166,   171,   172,   156,   132,   167,
-     168,    16,    72,   115,    72,   349,    61,   265,   159,   160,
-     161,   132,   320,   266,    26,   246,   247,   252,   321,   207,
-     155,   267,   241,   322,   185,   268,   350,   334,   317,   245,
-      59,   203,   351,   269,   249,    59,    57,     2,   102,   102,
-     102,   102,   102,   102,   102,   102,   102,   102,   102,   102,
-     102,   102,   102,   102,   102,   102,   302,   207,   162,   377,
-     373,   272,   163,   102,   164,   387,   321,   379,   124,   388,
-     380,   266,   358,   131,   360,   266,   298,   362,   363,   300,
-     389,   393,   318,   203,   404,   218,   266,   321,   301,   406,
-     266,   303,   203,   416,   224,   266,   418,   115,    61,   266,
-      61,   115,   266,   -13,   425,   102,   305,    61,   332,    72,
-     266,   308,   333,   267,   310,   241,   347,   268,    72,   203,
-     348,   365,   381,   177,   178,   366,   385,   169,   170,   236,
-     282,   283,   118,   284,   285,   309,   203,   286,   287,   288,
-     289,   -14,   136,   224,   102,   207,   290,   291,   224,   323,
-     327,   335,   395,   397,   331,   400,   336,   338,   266,   354,
-     356,   374,    72,   355,   136,   359,   375,   408,   410,   203,
-     203,   203,   364,   383,   224,   392,   412,   394,   203,   292,
-     420,   413,   238,   293,   243,   294,   188,   295,   203,   203,
-     368,   203,   296,   186,   203,    72,    72,    72,   203,   102,
-     203,   203,   250,   102,    72,   136,   136,   203,   337,   136,
-     136,   242,   367,   227,    72,    72,   382,    72,    78,     0,
-      72,     0,   136,     0,    72,     0,    72,    72,     0,     0,
-       0,     0,     0,    72,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   401,
-     402,   403,     0,     0,     0,     0,     0,     0,   405,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   414,   415,
-       0,   417,     0,     0,   421,     0,     0,     0,   422,     0,
-     423,   424,     0,     0,     0,     0,     0,   426,     0,     0,
-       0,     0,     0,     0,    57,     2,    80,    81,    82,    83,
-      84,    85,    86,     0,     0,     0,     0,     0,     0,     0,
-       0,   136,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,    87,    88,   136,     3,     4,   190,   191,     5,
-       6,   192,   193,   194,     7,     0,     8,   151,    10,    11,
-     195,   196,   197,    12,    13,    14,    15,    16,   198,    17,
-      18,    90,    19,    20,   199,    21,    22,    23,    24,    25,
-      26,   200,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,    91,     0,   123,   201,     0,     0,     0,     0,
-      92,    93,    94,    95,    96,    97,    57,     2,    80,    81,
-      82,    83,    84,    85,    86,   202,     0,     0,   253,   254,
-     255,   256,   257,   258,   259,   260,     0,     0,   261,   262,
-       0,     0,     0,     0,    87,    88,     0,     3,     4,   190,
-     191,     5,     6,   192,   193,   194,     7,     0,     8,   151,
-      10,    11,   195,   196,   197,    12,    13,    14,    15,    16,
-     198,    17,    18,    90,    19,    20,   199,    21,    22,    23,
-      24,    25,    26,   200,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,    91,     0,   123,   312,     0,     0,
-       0,     0,    92,    93,    94,    95,    96,    97,    57,     2,
-      80,    81,    82,    83,    84,    85,    86,   202,   263,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,    87,    88,     0,     3,
-       4,   190,   191,     5,     6,   192,   193,   194,     7,     0,
-       8,   151,    10,    11,   195,   196,   197,    12,    13,    14,
-      15,    16,   198,    17,    18,    90,    19,    20,   199,    21,
-      22,    23,    24,    25,    26,   200,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,    91,     0,   123,   372,
-       0,     0,     0,     0,    92,    93,    94,    95,    96,    97,
-      57,     2,    80,    81,    82,    83,    84,    85,    86,   202,
+      56,    59,   126,   114,    32,    65,   220,    65,   110,   151,
+     308,    66,   309,    69,    31,    52,   150,   160,   294,   122,
+     213,    56,   116,    52,   297,    52,   224,   227,   341,    56,
+     113,    67,   347,    67,   261,    74,    52,    62,   117,    63,
+     131,    52,   136,    52,    70,    71,   265,    32,    52,     3,
+     225,    52,     3,   261,   232,   132,   178,    31,   271,   239,
+     319,   261,   131,   320,   182,   240,   260,   151,   135,   306,
+     150,   127,   261,   120,   150,   348,   247,   341,    52,   321,
+     274,   275,   276,   216,    56,   184,   198,    53,   272,    56,
+     184,   181,   136,   127,    52,    53,    54,    53,    56,   231,
+     264,   261,   236,   131,   131,   138,    54,   131,   131,   292,
+      55,   324,   202,   213,   314,   311,   366,   356,   228,   263,
+     131,   179,    64,   302,    65,    68,   139,    65,   219,   261,
+     268,   350,   227,   273,   127,   127,   308,   215,   127,   127,
+     359,   143,    52,   161,   153,   381,   315,   110,   162,   163,
+      67,   127,   316,    67,   364,   261,   261,   198,   365,    65,
+     334,   386,   335,   124,   340,   299,   311,   125,   313,   151,
+     263,   393,   406,   247,   198,    54,   150,   154,   155,   156,
+     164,   165,   174,    67,   377,    67,   344,    56,   312,   110,
+     175,   248,   249,   250,   251,   252,   253,   254,   255,   176,
+     202,   256,   257,   236,   168,   169,   262,   244,   329,   131,
+     263,   264,   198,   180,    53,    54,   234,   396,   397,   398,
+     235,   157,   131,    54,   372,   158,   400,   159,   353,   317,
+     355,   166,   167,   357,   358,   240,   409,   410,   202,   412,
+     127,   177,   416,   267,   374,     5,   417,   375,   418,   419,
+     345,     7,   119,   127,   126,   421,   346,   368,    11,   382,
+     313,   383,   213,   316,   198,   261,   219,   261,   170,   171,
+     384,    20,   298,   198,   388,   258,   261,   293,   376,    56,
+     316,    56,   380,   110,   295,   399,   296,   110,    56,   231,
+      67,   261,    54,   172,   173,   401,   236,   411,   413,    67,
+     198,   261,    97,   261,   261,   318,   420,   -13,   390,   392,
+     327,   395,   261,   300,   328,   219,   303,   198,   262,   304,
+     219,   342,   263,   403,   405,   343,   202,   360,    52,     3,
+     305,   361,   281,   282,   283,   284,   415,   141,   142,   326,
+     145,   279,   280,    67,   285,   286,   219,   277,   278,   -14,
+     198,   198,   198,    97,   322,   330,   331,   333,   261,   198,
+     349,   351,   369,   354,   370,   378,   287,   387,   389,   198,
+     198,   407,   198,   408,   288,   198,    67,    67,    67,   198,
+     289,   198,   198,   290,   183,    67,   233,   363,   198,   222,
+     291,   238,   237,   241,   242,    67,    67,   362,    67,   332,
+      73,    67,     0,   245,     0,    67,     0,    67,    67,     0,
+       0,     0,     0,     0,    67,     0,    97,    97,    97,    97,
+      97,    97,    97,    97,    97,    97,    97,    97,    97,    97,
+      97,    97,    97,    97,     0,     0,     0,     0,     0,     0,
+       0,    97,     0,     0,     2,    52,     3,    75,    76,    77,
+      78,    79,    80,    81,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,    87,    88,
-       0,     3,     4,   190,   191,     5,     6,   192,   193,   194,
-       7,     0,     8,   151,    10,    11,   195,   196,   197,    12,
-      13,    14,    15,    16,   198,    17,    18,    90,    19,    20,
-     199,    21,    22,    23,    24,    25,    26,   200,     0,    57,
-       2,    80,    81,    82,    83,    84,    85,    86,    91,     0,
-     123,     0,     0,     0,     0,     0,    92,    93,    94,    95,
-      96,    97,     0,     0,     0,     0,     0,    87,    88,     0,
-       0,   202,   190,   191,     0,     0,   192,   193,   194,     0,
-       0,     0,   248,     0,     0,   195,   196,   197,     0,     0,
-       0,     0,     0,   198,     0,     0,    90,     0,     0,   199,
-       0,     0,     0,     0,     0,    57,   200,    80,    81,    82,
-      83,    84,    85,    86,     0,     0,     0,    91,     0,   123,
-       0,     0,     0,     0,     0,    92,    93,    94,    95,    96,
-      97,     0,     0,    87,    88,     0,     0,     0,     0,     0,
-     202,     0,     0,     0,     0,     0,     0,    57,   248,    80,
-      81,    82,    83,    84,    85,    86,     0,     0,     0,     0,
-       0,     0,    90,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,    87,    88,     0,     0,     0,
-       0,     0,     0,    91,     0,     0,     0,     0,     0,     0,
-     248,    92,    93,    94,    95,    96,    97,     0,     0,     0,
-       0,     0,     0,     0,    90,     0,   306,     0,     0,     0,
-       0,    57,     0,    80,    81,    82,    83,    84,    85,    86,
-       0,     0,     0,     0,     0,    91,     0,     0,     0,     0,
-       0,     0,     0,    92,    93,    94,    95,    96,    97,    87,
-      88,     0,     0,     0,     0,     0,     0,     0,   357,     0,
-       0,     0,     0,    57,   248,    80,    81,    82,    83,    84,
-      85,    86,     0,     0,     0,     0,     0,     0,    90,     0,
+       0,     0,     0,    82,    83,     0,     4,   185,   186,     5,
+     187,   188,   189,    97,     6,   146,     8,   190,   191,   192,
+       9,    10,    11,   193,     0,    12,    85,    13,    14,   194,
+      15,    16,    17,    18,    19,    20,   195,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,    86,     0,   118,
+     196,     0,    97,     0,     0,    87,    88,    89,    90,    91,
+      92,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     197,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       2,    52,     3,    75,    76,    77,    78,    79,    80,    81,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,    87,    88,     0,     0,     0,     0,     0,     0,    91,
-       0,     0,     0,     0,     0,     0,   248,    92,    93,    94,
-      95,    96,    97,     0,     0,     0,     0,     0,     0,     0,
-      90,     0,   384,     0,     0,     0,     2,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,    97,     0,    82,
+      83,    97,     4,   185,   186,     5,   187,   188,   189,     0,
+       6,   146,     8,   190,   191,   192,     9,    10,    11,   193,
+       0,    12,    85,    13,    14,   194,    15,    16,    17,    18,
+      19,    20,   195,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,    86,     0,   118,   307,     0,     0,     0,
+       0,    87,    88,    89,    90,    91,    92,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   197,     2,    52,     3,
+      75,    76,    77,    78,    79,    80,    81,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,    91,     0,     0,     0,     0,     0,     0,     0,    92,
-      93,    94,    95,    96,    97,     0,     3,     4,     0,     0,
-       5,     6,     0,     0,   399,     7,     0,     8,     9,    10,
-      11,     0,     0,     0,    12,    13,    14,    15,    16,     0,
-      17,    18,     0,    19,    20,     0,    21,    22,    23,    24,
-      25,    26,    57,     2,    80,    81,    82,    83,    84,    85,
-      86,     0,     0,     0,     0,   123,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,    82,    83,     0,     4,
+     185,   186,     5,   187,   188,   189,     0,     6,   146,     8,
+     190,   191,   192,     9,    10,    11,   193,     0,    12,    85,
+      13,    14,   194,    15,    16,    17,    18,    19,    20,   195,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-      87,    88,     0,     0,     4,   124,     0,     5,     6,     0,
-       0,     0,     7,     0,     8,   151,     0,    11,     0,     0,
-       0,     0,    13,    14,     0,    16,     0,    17,    18,    90,
-       0,    20,     0,     0,     0,    23,    24,    25,    26,    57,
-       2,    80,    81,    82,    83,    84,    85,    86,     0,     0,
-      91,     0,   249,     0,     0,     0,     0,     0,    92,    93,
-      94,    95,    96,    97,     0,     0,     0,    87,    88,     0,
-       0,     4,     0,     0,     5,     6,     0,     0,     0,     7,
-       0,     8,   151,     0,    11,     0,     0,     0,     0,    13,
-      14,     0,    16,     0,    17,    18,    90,     0,    20,     0,
-       0,     0,    23,    24,    25,    26,    57,     0,    80,    81,
-      82,    83,    84,    85,    86,     0,     0,    91,     0,     0,
-       0,     0,     0,     0,     0,    92,    93,    94,    95,    96,
-      97,     0,     0,     0,    87,    88,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,    57,    89,
-      80,    81,    82,    83,    84,    85,    86,     0,     0,     0,
-       0,     0,     0,    90,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,    87,    88,     0,     0,
-       0,     0,     0,     0,    91,     0,   217,   390,     0,     0,
-       0,    89,    92,    93,    94,    95,    96,    97,     0,     0,
-       0,     0,     0,     0,    57,    90,    80,    81,    82,    83,
-      84,    85,    86,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,    91,     0,   217,     0,
-       0,     0,    87,    88,    92,    93,    94,    95,    96,    97,
-       0,     0,     0,     0,     0,     0,    57,    89,    80,    81,
-      82,    83,    84,    85,    86,     0,     0,     0,     0,     0,
-       0,    90,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,    87,    88,     0,     0,     0,     0,
-       0,     0,    91,     0,     0,     0,     0,   228,     0,    89,
-      92,    93,    94,    95,    96,    97,     0,     0,     0,     0,
-       0,     0,    57,    90,    80,    81,    82,    83,    84,    85,
-      86,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,    91,   274,     0,     0,     0,     0,
-      87,    88,    92,    93,    94,    95,    96,    97,     0,     0,
-       0,     0,     0,     0,    57,    89,    80,    81,    82,    83,
-      84,    85,    86,     0,     0,     0,     0,     0,     0,    90,
+      86,     0,   118,   367,     0,     0,     0,     0,    87,    88,
+      89,    90,    91,    92,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,   197,     2,    52,     3,    75,    76,    77,
+      78,    79,    80,    81,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,    87,    88,     0,     0,     0,     0,     0,     0,
-      91,     0,     0,     0,     0,   344,     0,    89,    92,    93,
-      94,    95,    96,    97,     0,     0,     0,     0,     0,     0,
-      57,    90,    80,    81,    82,    83,    84,    85,    86,     0,
+       0,     0,     0,    82,    83,     0,     4,   185,   186,     5,
+     187,   188,   189,     0,     6,   146,     8,   190,   191,   192,
+       9,    10,    11,   193,     0,    12,    85,    13,    14,   194,
+      15,    16,    17,    18,    19,    20,   195,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,    86,     0,   118,
+       0,     0,     0,     0,     0,    87,    88,    89,    90,    91,
+      92,    52,     3,    75,    76,    77,    78,    79,    80,    81,
+     197,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,    82,
+      83,     0,     0,   185,   186,     0,   187,   188,   189,     0,
+       0,   243,     0,   190,   191,   192,     0,     0,     0,   193,
+       0,     0,    85,     0,     0,   194,     0,     2,     0,     3,
+       0,     0,   195,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,    86,     0,   118,     0,     0,     0,     0,
+       0,    87,    88,    89,    90,    91,    92,     0,     0,     4,
+       0,     0,     5,     0,     0,     0,   197,     6,     7,     8,
+       0,     0,     0,     9,    10,    11,     0,     0,    12,     0,
+      13,    14,     0,    15,    16,    17,    18,    19,    20,    52,
+       0,    75,    76,    77,    78,    79,    80,    81,     0,     0,
+       0,     0,   118,     0,     0,    52,     0,    75,    76,    77,
+      78,    79,    80,    81,     0,     0,     0,    82,    83,     0,
+       0,     0,   119,     0,     0,     0,     0,     0,     0,   243,
+       0,     0,     0,    82,    83,     0,     0,     0,     0,     0,
+      85,     0,     0,     0,     0,   243,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,    85,     0,     0,     0,
+       0,    86,     0,     0,     0,     0,     0,     0,     0,    87,
+      88,    89,    90,    91,    92,     0,     0,    86,     0,     0,
+       0,     0,     0,     0,   301,    87,    88,    89,    90,    91,
+      92,    52,     0,    75,    76,    77,    78,    79,    80,    81,
+     352,     0,     0,     0,     0,     0,     0,    52,     0,    75,
+      76,    77,    78,    79,    80,    81,     0,     0,     0,    82,
+      83,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,   243,     0,     0,     0,    82,    83,     0,     0,     0,
+       0,     0,    85,     0,     0,     0,     0,   243,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,    85,     0,
+       0,     0,     0,    86,     0,     0,     0,     0,     0,     0,
+       0,    87,    88,    89,    90,    91,    92,     0,     0,    86,
+       0,     0,     0,     0,     0,     0,   379,    87,    88,    89,
+      90,    91,    92,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,   394,     2,    52,     3,    75,    76,    77,    78,
+      79,    80,    81,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,    91,     0,     0,     0,     0,   378,    87,    88,
-      92,    93,    94,    95,    96,    97,     0,     0,     0,     0,
-       0,     0,    57,   248,    80,    81,    82,    83,    84,    85,
-      86,     0,     0,     0,     0,     0,     0,    90,     0,     0,
+       0,     0,    82,    83,     0,     0,     0,     0,     5,     0,
+       0,     0,     0,     6,   146,     0,     0,     0,     0,     0,
+       0,    11,     0,     0,    12,    85,     0,    14,     0,     0,
+       0,    17,    18,    19,    20,     2,    52,     3,    75,    76,
+      77,    78,    79,    80,    81,     0,    86,     0,   244,     0,
+       0,     0,     0,     0,    87,    88,    89,    90,    91,    92,
+       0,     0,     0,     0,    82,    83,     0,     0,     0,     0,
+       5,     0,     0,     0,     0,     6,   146,     0,     0,     0,
+       0,     0,     0,    11,     0,     0,    12,    85,     0,    14,
+       0,     0,     0,    17,    18,    19,    20,    52,     0,    75,
+      76,    77,    78,    79,    80,    81,     0,     0,    86,     0,
+       0,     0,     0,     0,     0,     0,    87,    88,    89,    90,
+      91,    92,     0,     0,     0,    82,    83,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,    52,    84,    75,    76,
+      77,    78,    79,    80,    81,     0,     0,     0,    85,     0,
+       0,     0,     0,     0,     0,    52,     0,    75,    76,    77,
+      78,    79,    80,    81,    82,    83,     0,     0,     0,    86,
+       0,   212,   385,     0,     0,     0,    84,    87,    88,    89,
+      90,    91,    92,    82,    83,     0,     0,    85,     0,     0,
+       0,     0,     0,     0,    52,    84,    75,    76,    77,    78,
+      79,    80,    81,     0,     0,     0,    85,     0,    86,     0,
+     212,     0,     0,     0,     0,     0,    87,    88,    89,    90,
+      91,    92,    82,    83,     0,     0,     0,    86,     0,     0,
+       0,     0,   223,     0,    84,    87,    88,    89,    90,    91,
+      92,     0,     0,     0,    52,    85,    75,    76,    77,    78,
+      79,    80,    81,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,    86,   269,     0,     0,
+       0,     0,    82,    83,    87,    88,    89,    90,    91,    92,
+       0,     0,     0,    52,    84,    75,    76,    77,    78,    79,
+      80,    81,     0,     0,     0,    85,     0,     0,     0,     0,
+       0,     0,    52,     0,    75,    76,    77,    78,    79,    80,
+      81,    82,    83,     0,     0,     0,    86,     0,     0,     0,
+       0,   339,     0,    84,    87,    88,    89,    90,    91,    92,
+      82,    83,     0,     0,    85,     0,     0,     0,     0,     0,
+       0,    52,   243,    75,    76,    77,    78,    79,    80,    81,
+       0,     0,     0,    85,     0,    86,     0,     0,     0,     0,
+     373,     0,     0,    87,    88,    89,    90,    91,    92,    82,
+      83,     0,     0,     0,    86,   391,     0,     0,     0,     0,
+       0,   243,    87,    88,    89,    90,    91,    92,     0,     0,
+       0,    52,    85,    75,    76,    77,    78,    79,    80,    81,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-      87,    88,     0,     0,     0,     0,     0,     0,    91,   396,
-       0,     0,     0,     0,     0,   248,    92,    93,    94,    95,
-      96,    97,     0,     0,     0,     0,     0,     0,    57,    90,
-      80,    81,    82,    83,    84,    85,    86,     0,     0,     0,
+       0,     0,     0,    86,   402,     0,     0,     0,     0,    82,
+      83,    87,    88,    89,    90,    91,    92,     0,     0,     0,
+      52,   243,    75,    76,    77,    78,    79,    80,    81,     0,
+       0,     0,    85,     0,     0,     0,     0,     0,     0,    52,
+       0,    75,    76,    77,    78,    79,    80,    81,    82,    83,
+       0,     0,     0,    86,   404,     0,     0,     0,     0,     0,
+     243,    87,    88,    89,    90,    91,    92,    82,    83,     0,
+       0,    85,     0,     0,     0,     0,     0,     0,    52,    84,
+      75,    76,    77,    78,    79,    80,    81,     0,     0,     0,
+      85,     0,    86,   414,     0,     0,     0,     0,     0,     0,
+      87,    88,    89,    90,    91,    92,    82,    83,     0,     0,
+       0,    86,     0,     0,     0,     0,     0,     0,    84,    87,
+      88,    89,    90,    91,    92,     0,     0,     0,    52,    85,
+      75,    76,    77,    78,    79,    80,    81,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-      91,   407,     0,     0,     0,     0,    87,    88,    92,    93,
-      94,    95,    96,    97,     0,     0,     0,     0,     0,     0,
-      57,   248,    80,    81,    82,    83,    84,    85,    86,     0,
-       0,     0,     0,     0,     0,    90,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,    87,    88,
-       0,     0,     0,     0,     0,     0,    91,   409,     0,     0,
-       0,     0,     0,   248,    92,    93,    94,    95,    96,    97,
-       0,     0,     0,     0,     0,     0,    57,    90,    80,    81,
-      82,    83,    84,    85,    86,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,    91,   419,
-       0,     0,     0,     0,    87,    88,    92,    93,    94,    95,
-      96,    97,     0,     0,     0,     0,     0,     0,    57,    89,
-      80,    81,    82,    83,    84,    85,    86,     0,     0,     0,
-       0,     0,     0,    90,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,    87,    88,     0,     0,
-       0,     0,     0,     0,    91,     0,     0,     0,     0,     0,
-       0,    89,    92,    93,    94,    95,    96,    97,     0,     0,
-       0,     0,     0,     0,    57,    90,    80,    81,    82,    83,
-      84,    85,    86,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,   145,     0,     0,     0,
-       0,     0,    87,    88,    92,    93,    94,    95,    96,    97,
-       0,     0,     0,     0,     0,     0,    57,    89,    80,    81,
-      82,    83,    84,    85,    86,     0,     0,     0,     0,     0,
-       0,    90,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,    87,    88,     0,     0,     0,     0,
-       0,     0,   149,     0,     0,     0,     0,     0,     0,   248,
-      92,    93,    94,    95,    96,    97,     0,     0,     0,     0,
-       0,     0,    57,    90,    80,    81,    82,    83,    84,    85,
-      86,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-      57,     2,     0,     0,    91,     0,     0,     0,     0,   222,
-      87,    88,    92,    93,    94,    95,    96,    97,     0,     0,
-       0,     0,     0,     0,     0,   248,     0,     0,     0,     0,
-       0,     3,     4,     0,     0,     5,     6,     0,     0,    90,
-       7,     0,     8,     9,    10,    11,     0,     0,     0,    12,
-      13,    14,    15,    16,     0,    17,    18,     0,    19,    20,
-     251,    21,    22,    23,    24,    25,    26,     2,    92,    93,
-      94,    95,    96,    97,     0,   222,     0,     0,   316,   341,
-       0,     0,   268,     0,     0,     0,     0,    59,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     3,     4,     0,
-       0,     5,     6,     0,     0,     0,     7,     0,     8,     9,
-      10,    11,     0,     0,     0,    12,    13,    14,    15,    16,
-       0,    17,    18,     0,    19,    20,     0,    21,    22,    23,
-      24,    25,    26,    77,     1,     0,     0,     2,     0,     0,
-       0,     0,     0,     0,   267,   341,     0,     0,   268,     0,
-       0,     0,     0,    59,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     3,     4,     0,
-       0,     5,     6,     0,     0,     0,     7,     0,     8,     9,
-      10,    11,     0,     2,     0,    12,    13,    14,    15,    16,
-       0,    17,    18,     0,    19,    20,     0,    21,    22,    23,
-      24,    25,    26,     0,    27,    28,    29,    30,    31,    32,
-      33,    34,    35,    36,     4,     0,     0,     5,     6,     0,
-       2,     0,     7,     0,     8,     9,     0,    11,     0,     0,
-       0,     0,    13,    14,     0,    16,     0,    17,    18,     0,
-       0,    20,     0,     0,     0,    23,    24,    25,    26,     0,
-       0,     4,     0,     0,     5,     6,     0,     1,     0,     7,
-       2,     8,     9,   231,    11,     0,     0,     0,     0,    13,
-      14,     0,    16,     0,    17,    18,     0,     0,    20,     0,
-       0,     0,    23,    24,    25,    26,     0,     0,     0,     0,
-       3,     4,     0,     0,     5,     6,     0,     0,     0,     7,
-     328,     8,     9,    10,    11,     0,     0,     0,    12,    13,
-      14,    15,    16,     0,    17,    18,     0,    19,    20,     0,
-      21,    22,    23,    24,    25,    26,     0,    27,    28,    29,
-      30,    31,    32,    33,    34,    35,    36,    57,     2,     0,
-       0,     0,     0,     0,     0,     0,   222,     0,     0,     0,
+     140,     0,     0,     0,     0,     0,    82,    83,    87,    88,
+      89,    90,    91,    92,     0,     0,     0,    52,    84,    75,
+      76,    77,    78,    79,    80,    81,     0,     0,     0,    85,
+       0,     0,     0,     0,     0,     0,    52,     0,    75,    76,
+      77,    78,    79,    80,    81,    82,    83,     0,     0,     0,
+     144,     0,     0,     0,     0,     0,     0,   243,    87,    88,
+      89,    90,    91,    92,    82,    83,     0,     0,    85,     0,
+       0,     0,     0,     0,     0,     0,   243,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,    85,     0,    86,
+       0,     0,     0,     2,    52,     3,     0,    87,    88,    89,
+      90,    91,    92,   217,     0,     0,     0,     0,   246,     0,
+       0,     0,     0,     0,     0,     0,    87,    88,    89,    90,
+      91,    92,     0,     0,     0,     4,     0,     0,     5,     0,
+       0,     0,     0,     6,     7,     8,     0,     0,     0,     9,
+      10,    11,     0,     0,    12,     0,    13,    14,     0,    15,
+      16,    17,    18,    19,    20,     2,     0,     3,     0,     0,
+       0,     0,     0,     0,     0,   217,   311,   336,     0,     0,
+     263,     0,     0,     0,     0,    54,     0,     0,     0,     0,
+       0,     0,     2,     0,     3,     0,     0,     4,     0,     0,
+       5,     0,     0,     0,     0,     6,     7,     8,     0,     0,
+       0,     9,    10,    11,     0,     0,    12,     0,    13,    14,
+       0,    15,    16,    17,    18,    19,    20,     5,     0,     2,
+       0,     3,     6,     7,     0,     0,     0,     0,   262,   336,
+      11,     0,   263,    12,     0,     0,    14,    54,     0,     0,
+      17,    18,    19,    20,     0,     0,     0,    72,     1,     0,
+       2,     0,     3,     0,     5,     0,     0,     0,   226,     6,
+       7,     0,     0,     0,     0,     0,     0,    11,     0,     0,
+      12,     0,     0,    14,     0,     0,     0,    17,    18,    19,
+      20,     0,     4,     0,     0,     5,     0,     0,     0,     0,
+       6,     7,     8,     0,     0,   323,     9,    10,    11,     0,
+       2,    12,     3,    13,    14,     0,    15,    16,    17,    18,
+      19,    20,     0,    21,    22,    23,    24,    25,    26,    27,
+      28,    29,    30,     0,     0,     0,     0,     0,     0,     1,
+       0,     2,     4,     3,     0,     5,     0,     0,     0,     0,
+       6,     7,     8,     0,     0,     0,     9,    10,    11,     0,
+       0,    12,     0,    13,    14,     0,    15,    16,    17,    18,
+      19,    20,     0,     4,     0,     0,     5,     0,     0,     0,
+       0,     6,     7,     8,     0,   118,     0,     9,    10,    11,
+       0,     0,    12,     0,    13,    14,     0,    15,    16,    17,
+      18,    19,    20,     0,    21,    22,    23,    24,    25,    26,
+      27,    28,    29,    30,     2,    52,     3,     0,     0,     0,
+       0,     0,     0,     0,   217,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     3,     4,
-       0,     0,     5,     6,     0,     0,     2,     7,     0,     8,
-       9,    10,    11,     0,     0,     0,    12,    13,    14,    15,
-      16,     0,    17,    18,     0,    19,    20,     0,    21,    22,
-      23,    24,    25,    26,     0,     0,     3,     4,     0,     0,
-       5,     6,     0,     0,     0,     7,   223,     8,     9,    10,
-      11,     0,     0,     0,    12,    13,    14,    15,    16,     0,
-      17,    18,     0,    19,    20,     2,    21,    22,    23,    24,
-      25,    26,     0,   222,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   123,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     3,     4,     0,     0,     5,
-       6,     0,     0,     2,     7,     0,     8,     9,    10,    11,
-       0,   222,     0,    12,    13,    14,    15,    16,     0,    17,
-      18,     0,    19,    20,     0,    21,    22,    23,    24,    25,
-      26,     0,     0,     3,     4,     0,     0,     5,     6,     2,
-       0,     0,     7,   376,     8,     9,    10,    11,     0,     0,
-       0,    12,    13,    14,    15,    16,     0,    17,    18,     0,
-      19,    20,     0,    21,    22,    23,    24,    25,    26,     3,
-       4,     0,     0,     5,     6,     2,     0,     0,     7,     0,
-       8,     9,    10,    11,     0,     0,     0,    12,    13,    14,
-      15,    16,     0,    17,    18,     0,    19,    20,     0,    21,
-      22,    23,    24,    25,    26,     0,     4,     0,     0,     5,
-       6,     0,     0,     0,     7,     0,     8,     9,     0,    11,
-       0,     0,     0,     0,    13,    14,     0,    16,     0,    17,
-      18,     0,     0,    20,     0,     0,     0,    23,    24,    25,
-      26
+       0,     0,     2,     0,     3,     0,     4,     0,     0,     5,
+       0,     0,     0,     0,     6,     7,     8,     0,     0,     0,
+       9,    10,    11,     0,     0,    12,     0,    13,    14,     0,
+      15,    16,    17,    18,    19,    20,     2,     5,     3,     0,
+       0,     0,     6,     7,     0,     0,   217,     0,   218,     0,
+      11,     0,     0,    12,     0,     0,    14,     0,     0,     0,
+      17,    18,    19,    20,     0,     0,     0,     0,     4,     0,
+       0,     5,     0,     0,     0,     0,     6,     7,     8,     0,
+       0,     0,     9,    10,    11,     0,     0,    12,     0,    13,
+      14,     0,    15,    16,    17,    18,    19,    20,     2,     0,
+       3,     0,     0,     0,     0,     0,     0,     0,   217,     0,
+     371,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     2,
+       4,     3,     0,     5,     0,     0,     0,     0,     6,     7,
+       8,     0,     0,     0,     9,    10,    11,     0,     0,    12,
+       0,    13,    14,     0,    15,    16,    17,    18,    19,    20,
+       0,     4,     0,     0,     5,     0,     0,     0,     0,     6,
+       7,     8,     0,     0,     0,     9,    10,    11,     0,     0,
+      12,     0,    13,    14,     0,    15,    16,    17,    18,    19,
+      20
 };
 
 static const yytype_int16 yycheck[] =
 {
-      38,    66,    52,     0,    42,    59,    44,     0,    42,    69,
-      44,   217,   211,   133,   191,     3,   103,    91,     3,    30,
-      58,   129,    38,   124,   156,     3,     3,     4,    66,   130,
-      42,    91,    44,   269,    81,     3,     3,     3,    27,    28,
-      91,    79,     3,    88,    88,    81,    39,    40,    83,    88,
-       3,    48,    45,    46,    83,    48,   233,    64,   132,   104,
-     104,   162,   136,   102,     3,     4,   120,    64,    88,     3,
-      88,    88,   132,   133,    84,   149,   136,   137,    88,   166,
-     167,   168,   318,   121,   104,   123,   104,   104,   126,   149,
-     101,   129,   224,    89,   145,    81,    84,   135,   149,    84,
-     151,   139,   156,    81,    52,   121,    83,    85,    97,    98,
-     126,   123,   163,    81,    81,    81,   217,    81,   238,   135,
-      81,   128,    90,   161,    90,     9,   164,   161,    81,    90,
-     164,   128,    85,   184,   102,   100,   129,    90,   337,    87,
-      88,   191,    90,   104,    83,    88,    86,   198,    88,   161,
-     327,    82,   164,    88,   331,   103,   194,    88,   196,    29,
-     366,   104,   196,   264,    39,   266,    99,   268,    81,   104,
-     224,    46,    85,   211,    90,    21,    22,   251,   238,    95,
-      96,    56,   194,   233,   196,   272,   224,    82,    31,    32,
-      33,   251,    82,    88,    69,   143,   144,   248,    88,   211,
-     251,    81,   240,    82,    82,    85,    82,   245,   224,    88,
-      90,   249,    88,   267,    83,    90,     3,     4,   166,   167,
-     168,   169,   170,   171,   172,   173,   174,   175,   176,   177,
-     178,   179,   180,   181,   182,   183,   194,   249,    81,   347,
-      82,    82,    85,   191,    87,    82,    88,   348,   103,    82,
-     351,    88,   303,   318,   305,    88,   104,   308,   309,   104,
-      82,    82,   316,   301,    82,   366,    88,    88,   102,    82,
-      88,    81,   310,    82,   267,    88,    82,   327,   316,    88,
-     318,   331,    88,   102,    82,   233,    81,   325,    84,   301,
-      88,    81,    88,    81,   102,   333,    81,    85,   310,   337,
-      85,    84,   353,    25,    26,    88,   357,    91,    92,   325,
-     169,   170,    59,   171,   172,    81,   354,   173,   174,   175,
-     176,   102,    69,   316,   272,   337,   177,   178,   321,    86,
-     102,    82,   383,   384,   103,   386,    82,    82,    88,   102,
-      70,    82,   354,   301,    91,   104,    86,   398,   399,   387,
-     388,   389,   310,    81,   347,    82,    44,    86,   396,   179,
-     411,   104,   137,   180,   140,   181,   121,   182,   406,   407,
-     325,   409,   183,   120,   412,   387,   388,   389,   416,   327,
-     418,   419,   149,   331,   396,   132,   133,   425,   249,   136,
-     137,   139,   321,   129,   406,   407,   354,   409,    48,    -1,
-     412,    -1,   149,    -1,   416,    -1,   418,   419,    -1,    -1,
-      -1,    -1,    -1,   425,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   387,
-     388,   389,    -1,    -1,    -1,    -1,    -1,    -1,   396,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   406,   407,
-      -1,   409,    -1,    -1,   412,    -1,    -1,    -1,   416,    -1,
-     418,   419,    -1,    -1,    -1,    -1,    -1,   425,    -1,    -1,
-      -1,    -1,    -1,    -1,     3,     4,     5,     6,     7,     8,
-       9,    10,    11,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   238,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    31,    32,   251,    34,    35,    36,    37,    38,
-      39,    40,    41,    42,    43,    -1,    45,    46,    47,    48,
-      49,    50,    51,    52,    53,    54,    55,    56,    57,    58,
-      59,    60,    61,    62,    63,    64,    65,    66,    67,    68,
-      69,    70,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    81,    -1,    83,    84,    -1,    -1,    -1,    -1,
-      89,    90,    91,    92,    93,    94,     3,     4,     5,     6,
-       7,     8,     9,    10,    11,   104,    -1,    -1,    13,    14,
-      15,    16,    17,    18,    19,    20,    -1,    -1,    23,    24,
-      -1,    -1,    -1,    -1,    31,    32,    -1,    34,    35,    36,
-      37,    38,    39,    40,    41,    42,    43,    -1,    45,    46,
-      47,    48,    49,    50,    51,    52,    53,    54,    55,    56,
-      57,    58,    59,    60,    61,    62,    63,    64,    65,    66,
-      67,    68,    69,    70,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    81,    -1,    83,    84,    -1,    -1,
-      -1,    -1,    89,    90,    91,    92,    93,    94,     3,     4,
-       5,     6,     7,     8,     9,    10,    11,   104,   103,    -1,
+      32,    32,    61,    54,     0,    37,   124,    39,    47,    86,
+     206,    37,   212,    39,     0,     4,    86,    98,   186,    59,
+     119,    53,    83,     4,   189,     4,   125,   128,   264,    61,
+      54,    37,    81,    39,    83,    76,     4,    33,    99,    35,
+      64,     4,    74,     4,    40,    41,   151,    43,     4,     5,
+     127,     4,     5,    83,   131,    78,    31,    43,   157,    77,
+     228,    83,    86,    83,   115,    83,    77,   144,    78,    99,
+     140,    64,    83,    59,   144,    97,   146,   313,     4,    99,
+     161,   162,   163,   123,   116,   116,   118,    76,   158,   121,
+     121,   115,   124,    86,     4,    76,    85,    76,   130,   130,
+     151,    83,   134,   127,   128,    76,    85,   131,   132,   179,
+      99,    79,   118,   212,   219,    76,    79,    99,    97,    80,
+     144,    96,    78,   193,   156,    78,    76,   159,   124,    83,
+     156,   296,   233,   159,   127,   128,   332,   123,   131,   132,
+     305,    76,     4,    85,    10,    99,    77,   186,    90,    91,
+     156,   144,    83,   159,   322,    83,    83,   189,   326,   191,
+     259,   361,   261,    76,   263,   191,    76,    80,   219,   246,
+      80,    99,    99,   243,   206,    85,   246,    32,    33,    34,
+      86,    87,    84,   189,   349,   191,   267,   219,   219,   228,
+      94,    14,    15,    16,    17,    18,    19,    20,    21,    95,
+     206,    24,    25,   235,    28,    29,    76,    78,   240,   233,
+      80,   262,   244,    77,    76,    85,    79,   382,   383,   384,
+      83,    76,   246,    85,   342,    80,   391,    82,   298,    77,
+     300,    22,    23,   303,   304,    83,   401,   402,   244,   404,
+     233,    30,   407,    77,   343,    38,   411,   346,   413,   414,
+      77,    44,    98,   246,   313,   420,    83,    77,    51,    77,
+     311,    77,   361,    83,   296,    83,   262,    83,    92,    93,
+      77,    64,    76,   305,    77,    98,    83,    99,   348,   311,
+      83,   313,   352,   322,    99,    77,    97,   326,   320,   320,
+     296,    83,    85,    26,    27,    77,   328,    77,    77,   305,
+     332,    83,    47,    83,    83,    81,    77,    97,   378,   379,
+      79,   381,    83,    76,    83,   311,    76,   349,    76,    76,
+     316,    76,    80,   393,   394,    80,   332,    79,     4,     5,
+      97,    83,   168,   169,   170,   171,   406,    82,    83,    98,
+      85,   166,   167,   349,   172,   173,   342,   164,   165,    97,
+     382,   383,   384,    98,    97,    77,    77,    77,    83,   391,
+      97,    65,    77,    99,    81,    76,   174,    77,    81,   401,
+     402,    42,   404,    99,   175,   407,   382,   383,   384,   411,
+     176,   413,   414,   177,   116,   391,   132,   320,   420,   124,
+     178,   135,   134,   138,   139,   401,   402,   316,   404,   244,
+      43,   407,    -1,   144,    -1,   411,    -1,   413,   414,    -1,
+      -1,    -1,    -1,    -1,   420,    -1,   161,   162,   163,   164,
+     165,   166,   167,   168,   169,   170,   171,   172,   173,   174,
+     175,   176,   177,   178,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   186,    -1,    -1,     3,     4,     5,     6,     7,     8,
+       9,    10,    11,    12,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    31,    32,    -1,    34,
-      35,    36,    37,    38,    39,    40,    41,    42,    43,    -1,
-      45,    46,    47,    48,    49,    50,    51,    52,    53,    54,
-      55,    56,    57,    58,    59,    60,    61,    62,    63,    64,
-      65,    66,    67,    68,    69,    70,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    81,    -1,    83,    84,
-      -1,    -1,    -1,    -1,    89,    90,    91,    92,    93,    94,
-       3,     4,     5,     6,     7,     8,     9,    10,    11,   104,
+      -1,    -1,    -1,    32,    33,    -1,    35,    36,    37,    38,
+      39,    40,    41,   228,    43,    44,    45,    46,    47,    48,
+      49,    50,    51,    52,    -1,    54,    55,    56,    57,    58,
+      59,    60,    61,    62,    63,    64,    65,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    76,    -1,    78,
+      79,    -1,   267,    -1,    -1,    84,    85,    86,    87,    88,
+      89,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      99,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       3,     4,     5,     6,     7,     8,     9,    10,    11,    12,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    31,    32,
-      -1,    34,    35,    36,    37,    38,    39,    40,    41,    42,
-      43,    -1,    45,    46,    47,    48,    49,    50,    51,    52,
-      53,    54,    55,    56,    57,    58,    59,    60,    61,    62,
-      63,    64,    65,    66,    67,    68,    69,    70,    -1,     3,
-       4,     5,     6,     7,     8,     9,    10,    11,    81,    -1,
-      83,    -1,    -1,    -1,    -1,    -1,    89,    90,    91,    92,
-      93,    94,    -1,    -1,    -1,    -1,    -1,    31,    32,    -1,
-      -1,   104,    36,    37,    -1,    -1,    40,    41,    42,    -1,
-      -1,    -1,    46,    -1,    -1,    49,    50,    51,    -1,    -1,
-      -1,    -1,    -1,    57,    -1,    -1,    60,    -1,    -1,    63,
-      -1,    -1,    -1,    -1,    -1,     3,    70,     5,     6,     7,
-       8,     9,    10,    11,    -1,    -1,    -1,    81,    -1,    83,
-      -1,    -1,    -1,    -1,    -1,    89,    90,    91,    92,    93,
-      94,    -1,    -1,    31,    32,    -1,    -1,    -1,    -1,    -1,
-     104,    -1,    -1,    -1,    -1,    -1,    -1,     3,    46,     5,
-       6,     7,     8,     9,    10,    11,    -1,    -1,    -1,    -1,
-      -1,    -1,    60,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    31,    32,    -1,    -1,    -1,
-      -1,    -1,    -1,    81,    -1,    -1,    -1,    -1,    -1,    -1,
-      46,    89,    90,    91,    92,    93,    94,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    60,    -1,   104,    -1,    -1,    -1,
-      -1,     3,    -1,     5,     6,     7,     8,     9,    10,    11,
-      -1,    -1,    -1,    -1,    -1,    81,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    89,    90,    91,    92,    93,    94,    31,
-      32,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   104,    -1,
-      -1,    -1,    -1,     3,    46,     5,     6,     7,     8,     9,
-      10,    11,    -1,    -1,    -1,    -1,    -1,    -1,    60,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   322,    -1,    32,
+      33,   326,    35,    36,    37,    38,    39,    40,    41,    -1,
+      43,    44,    45,    46,    47,    48,    49,    50,    51,    52,
+      -1,    54,    55,    56,    57,    58,    59,    60,    61,    62,
+      63,    64,    65,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    76,    -1,    78,    79,    -1,    -1,    -1,
+      -1,    84,    85,    86,    87,    88,    89,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    99,     3,     4,     5,
+       6,     7,     8,     9,    10,    11,    12,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    31,    32,    -1,    -1,    -1,    -1,    -1,    -1,    81,
-      -1,    -1,    -1,    -1,    -1,    -1,    46,    89,    90,    91,
-      92,    93,    94,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      60,    -1,   104,    -1,    -1,    -1,     4,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    32,    33,    -1,    35,
+      36,    37,    38,    39,    40,    41,    -1,    43,    44,    45,
+      46,    47,    48,    49,    50,    51,    52,    -1,    54,    55,
+      56,    57,    58,    59,    60,    61,    62,    63,    64,    65,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    81,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    89,
-      90,    91,    92,    93,    94,    -1,    34,    35,    -1,    -1,
-      38,    39,    -1,    -1,   104,    43,    -1,    45,    46,    47,
-      48,    -1,    -1,    -1,    52,    53,    54,    55,    56,    -1,
-      58,    59,    -1,    61,    62,    -1,    64,    65,    66,    67,
-      68,    69,     3,     4,     5,     6,     7,     8,     9,    10,
-      11,    -1,    -1,    -1,    -1,    83,    -1,    -1,    -1,    -1,
+      76,    -1,    78,    79,    -1,    -1,    -1,    -1,    84,    85,
+      86,    87,    88,    89,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    99,     3,     4,     5,     6,     7,     8,
+       9,    10,    11,    12,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      31,    32,    -1,    -1,    35,   103,    -1,    38,    39,    -1,
-      -1,    -1,    43,    -1,    45,    46,    -1,    48,    -1,    -1,
-      -1,    -1,    53,    54,    -1,    56,    -1,    58,    59,    60,
-      -1,    62,    -1,    -1,    -1,    66,    67,    68,    69,     3,
-       4,     5,     6,     7,     8,     9,    10,    11,    -1,    -1,
-      81,    -1,    83,    -1,    -1,    -1,    -1,    -1,    89,    90,
-      91,    92,    93,    94,    -1,    -1,    -1,    31,    32,    -1,
-      -1,    35,    -1,    -1,    38,    39,    -1,    -1,    -1,    43,
-      -1,    45,    46,    -1,    48,    -1,    -1,    -1,    -1,    53,
-      54,    -1,    56,    -1,    58,    59,    60,    -1,    62,    -1,
-      -1,    -1,    66,    67,    68,    69,     3,    -1,     5,     6,
-       7,     8,     9,    10,    11,    -1,    -1,    81,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    89,    90,    91,    92,    93,
-      94,    -1,    -1,    -1,    31,    32,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,     3,    46,
-       5,     6,     7,     8,     9,    10,    11,    -1,    -1,    -1,
-      -1,    -1,    -1,    60,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    31,    32,    -1,    -1,
-      -1,    -1,    -1,    -1,    81,    -1,    83,    84,    -1,    -1,
-      -1,    46,    89,    90,    91,    92,    93,    94,    -1,    -1,
-      -1,    -1,    -1,    -1,     3,    60,     5,     6,     7,     8,
-       9,    10,    11,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    81,    -1,    83,    -1,
-      -1,    -1,    31,    32,    89,    90,    91,    92,    93,    94,
-      -1,    -1,    -1,    -1,    -1,    -1,     3,    46,     5,     6,
-       7,     8,     9,    10,    11,    -1,    -1,    -1,    -1,    -1,
-      -1,    60,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    31,    32,    -1,    -1,    -1,    -1,
-      -1,    -1,    81,    -1,    -1,    -1,    -1,    86,    -1,    46,
-      89,    90,    91,    92,    93,    94,    -1,    -1,    -1,    -1,
-      -1,    -1,     3,    60,     5,     6,     7,     8,     9,    10,
-      11,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    81,    82,    -1,    -1,    -1,    -1,
-      31,    32,    89,    90,    91,    92,    93,    94,    -1,    -1,
-      -1,    -1,    -1,    -1,     3,    46,     5,     6,     7,     8,
-       9,    10,    11,    -1,    -1,    -1,    -1,    -1,    -1,    60,
+      -1,    -1,    -1,    32,    33,    -1,    35,    36,    37,    38,
+      39,    40,    41,    -1,    43,    44,    45,    46,    47,    48,
+      49,    50,    51,    52,    -1,    54,    55,    56,    57,    58,
+      59,    60,    61,    62,    63,    64,    65,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    76,    -1,    78,
+      -1,    -1,    -1,    -1,    -1,    84,    85,    86,    87,    88,
+      89,     4,     5,     6,     7,     8,     9,    10,    11,    12,
+      99,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    32,
+      33,    -1,    -1,    36,    37,    -1,    39,    40,    41,    -1,
+      -1,    44,    -1,    46,    47,    48,    -1,    -1,    -1,    52,
+      -1,    -1,    55,    -1,    -1,    58,    -1,     3,    -1,     5,
+      -1,    -1,    65,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    76,    -1,    78,    -1,    -1,    -1,    -1,
+      -1,    84,    85,    86,    87,    88,    89,    -1,    -1,    35,
+      -1,    -1,    38,    -1,    -1,    -1,    99,    43,    44,    45,
+      -1,    -1,    -1,    49,    50,    51,    -1,    -1,    54,    -1,
+      56,    57,    -1,    59,    60,    61,    62,    63,    64,     4,
+      -1,     6,     7,     8,     9,    10,    11,    12,    -1,    -1,
+      -1,    -1,    78,    -1,    -1,     4,    -1,     6,     7,     8,
+       9,    10,    11,    12,    -1,    -1,    -1,    32,    33,    -1,
+      -1,    -1,    98,    -1,    -1,    -1,    -1,    -1,    -1,    44,
+      -1,    -1,    -1,    32,    33,    -1,    -1,    -1,    -1,    -1,
+      55,    -1,    -1,    -1,    -1,    44,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    55,    -1,    -1,    -1,
+      -1,    76,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    84,
+      85,    86,    87,    88,    89,    -1,    -1,    76,    -1,    -1,
+      -1,    -1,    -1,    -1,    99,    84,    85,    86,    87,    88,
+      89,     4,    -1,     6,     7,     8,     9,    10,    11,    12,
+      99,    -1,    -1,    -1,    -1,    -1,    -1,     4,    -1,     6,
+       7,     8,     9,    10,    11,    12,    -1,    -1,    -1,    32,
+      33,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    44,    -1,    -1,    -1,    32,    33,    -1,    -1,    -1,
+      -1,    -1,    55,    -1,    -1,    -1,    -1,    44,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    55,    -1,
+      -1,    -1,    -1,    76,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    84,    85,    86,    87,    88,    89,    -1,    -1,    76,
+      -1,    -1,    -1,    -1,    -1,    -1,    99,    84,    85,    86,
+      87,    88,    89,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    99,     3,     4,     5,     6,     7,     8,     9,
+      10,    11,    12,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    31,    32,    -1,    -1,    -1,    -1,    -1,    -1,
-      81,    -1,    -1,    -1,    -1,    86,    -1,    46,    89,    90,
-      91,    92,    93,    94,    -1,    -1,    -1,    -1,    -1,    -1,
-       3,    60,     5,     6,     7,     8,     9,    10,    11,    -1,
+      -1,    -1,    32,    33,    -1,    -1,    -1,    -1,    38,    -1,
+      -1,    -1,    -1,    43,    44,    -1,    -1,    -1,    -1,    -1,
+      -1,    51,    -1,    -1,    54,    55,    -1,    57,    -1,    -1,
+      -1,    61,    62,    63,    64,     3,     4,     5,     6,     7,
+       8,     9,    10,    11,    12,    -1,    76,    -1,    78,    -1,
+      -1,    -1,    -1,    -1,    84,    85,    86,    87,    88,    89,
+      -1,    -1,    -1,    -1,    32,    33,    -1,    -1,    -1,    -1,
+      38,    -1,    -1,    -1,    -1,    43,    44,    -1,    -1,    -1,
+      -1,    -1,    -1,    51,    -1,    -1,    54,    55,    -1,    57,
+      -1,    -1,    -1,    61,    62,    63,    64,     4,    -1,     6,
+       7,     8,     9,    10,    11,    12,    -1,    -1,    76,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    84,    85,    86,    87,
+      88,    89,    -1,    -1,    -1,    32,    33,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,     4,    44,     6,     7,
+       8,     9,    10,    11,    12,    -1,    -1,    -1,    55,    -1,
+      -1,    -1,    -1,    -1,    -1,     4,    -1,     6,     7,     8,
+       9,    10,    11,    12,    32,    33,    -1,    -1,    -1,    76,
+      -1,    78,    79,    -1,    -1,    -1,    44,    84,    85,    86,
+      87,    88,    89,    32,    33,    -1,    -1,    55,    -1,    -1,
+      -1,    -1,    -1,    -1,     4,    44,     6,     7,     8,     9,
+      10,    11,    12,    -1,    -1,    -1,    55,    -1,    76,    -1,
+      78,    -1,    -1,    -1,    -1,    -1,    84,    85,    86,    87,
+      88,    89,    32,    33,    -1,    -1,    -1,    76,    -1,    -1,
+      -1,    -1,    81,    -1,    44,    84,    85,    86,    87,    88,
+      89,    -1,    -1,    -1,     4,    55,     6,     7,     8,     9,
+      10,    11,    12,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    76,    77,    -1,    -1,
+      -1,    -1,    32,    33,    84,    85,    86,    87,    88,    89,
+      -1,    -1,    -1,     4,    44,     6,     7,     8,     9,    10,
+      11,    12,    -1,    -1,    -1,    55,    -1,    -1,    -1,    -1,
+      -1,    -1,     4,    -1,     6,     7,     8,     9,    10,    11,
+      12,    32,    33,    -1,    -1,    -1,    76,    -1,    -1,    -1,
+      -1,    81,    -1,    44,    84,    85,    86,    87,    88,    89,
+      32,    33,    -1,    -1,    55,    -1,    -1,    -1,    -1,    -1,
+      -1,     4,    44,     6,     7,     8,     9,    10,    11,    12,
+      -1,    -1,    -1,    55,    -1,    76,    -1,    -1,    -1,    -1,
+      81,    -1,    -1,    84,    85,    86,    87,    88,    89,    32,
+      33,    -1,    -1,    -1,    76,    77,    -1,    -1,    -1,    -1,
+      -1,    44,    84,    85,    86,    87,    88,    89,    -1,    -1,
+      -1,     4,    55,     6,     7,     8,     9,    10,    11,    12,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    81,    -1,    -1,    -1,    -1,    86,    31,    32,
-      89,    90,    91,    92,    93,    94,    -1,    -1,    -1,    -1,
-      -1,    -1,     3,    46,     5,     6,     7,     8,     9,    10,
-      11,    -1,    -1,    -1,    -1,    -1,    -1,    60,    -1,    -1,
+      -1,    -1,    -1,    76,    77,    -1,    -1,    -1,    -1,    32,
+      33,    84,    85,    86,    87,    88,    89,    -1,    -1,    -1,
+       4,    44,     6,     7,     8,     9,    10,    11,    12,    -1,
+      -1,    -1,    55,    -1,    -1,    -1,    -1,    -1,    -1,     4,
+      -1,     6,     7,     8,     9,    10,    11,    12,    32,    33,
+      -1,    -1,    -1,    76,    77,    -1,    -1,    -1,    -1,    -1,
+      44,    84,    85,    86,    87,    88,    89,    32,    33,    -1,
+      -1,    55,    -1,    -1,    -1,    -1,    -1,    -1,     4,    44,
+       6,     7,     8,     9,    10,    11,    12,    -1,    -1,    -1,
+      55,    -1,    76,    77,    -1,    -1,    -1,    -1,    -1,    -1,
+      84,    85,    86,    87,    88,    89,    32,    33,    -1,    -1,
+      -1,    76,    -1,    -1,    -1,    -1,    -1,    -1,    44,    84,
+      85,    86,    87,    88,    89,    -1,    -1,    -1,     4,    55,
+       6,     7,     8,     9,    10,    11,    12,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      31,    32,    -1,    -1,    -1,    -1,    -1,    -1,    81,    82,
-      -1,    -1,    -1,    -1,    -1,    46,    89,    90,    91,    92,
-      93,    94,    -1,    -1,    -1,    -1,    -1,    -1,     3,    60,
-       5,     6,     7,     8,     9,    10,    11,    -1,    -1,    -1,
+      76,    -1,    -1,    -1,    -1,    -1,    32,    33,    84,    85,
+      86,    87,    88,    89,    -1,    -1,    -1,     4,    44,     6,
+       7,     8,     9,    10,    11,    12,    -1,    -1,    -1,    55,
+      -1,    -1,    -1,    -1,    -1,    -1,     4,    -1,     6,     7,
+       8,     9,    10,    11,    12,    32,    33,    -1,    -1,    -1,
+      76,    -1,    -1,    -1,    -1,    -1,    -1,    44,    84,    85,
+      86,    87,    88,    89,    32,    33,    -1,    -1,    55,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    44,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    55,    -1,    76,
+      -1,    -1,    -1,     3,     4,     5,    -1,    84,    85,    86,
+      87,    88,    89,    13,    -1,    -1,    -1,    -1,    76,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    84,    85,    86,    87,
+      88,    89,    -1,    -1,    -1,    35,    -1,    -1,    38,    -1,
+      -1,    -1,    -1,    43,    44,    45,    -1,    -1,    -1,    49,
+      50,    51,    -1,    -1,    54,    -1,    56,    57,    -1,    59,
+      60,    61,    62,    63,    64,     3,    -1,     5,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    13,    76,    77,    -1,    -1,
+      80,    -1,    -1,    -1,    -1,    85,    -1,    -1,    -1,    -1,
+      -1,    -1,     3,    -1,     5,    -1,    -1,    35,    -1,    -1,
+      38,    -1,    -1,    -1,    -1,    43,    44,    45,    -1,    -1,
+      -1,    49,    50,    51,    -1,    -1,    54,    -1,    56,    57,
+      -1,    59,    60,    61,    62,    63,    64,    38,    -1,     3,
+      -1,     5,    43,    44,    -1,    -1,    -1,    -1,    76,    77,
+      51,    -1,    80,    54,    -1,    -1,    57,    85,    -1,    -1,
+      61,    62,    63,    64,    -1,    -1,    -1,     0,     1,    -1,
+       3,    -1,     5,    -1,    38,    -1,    -1,    -1,    79,    43,
+      44,    -1,    -1,    -1,    -1,    -1,    -1,    51,    -1,    -1,
+      54,    -1,    -1,    57,    -1,    -1,    -1,    61,    62,    63,
+      64,    -1,    35,    -1,    -1,    38,    -1,    -1,    -1,    -1,
+      43,    44,    45,    -1,    -1,    79,    49,    50,    51,    -1,
+       3,    54,     5,    56,    57,    -1,    59,    60,    61,    62,
+      63,    64,    -1,    66,    67,    68,    69,    70,    71,    72,
+      73,    74,    75,    -1,    -1,    -1,    -1,    -1,    -1,     1,
+      -1,     3,    35,     5,    -1,    38,    -1,    -1,    -1,    -1,
+      43,    44,    45,    -1,    -1,    -1,    49,    50,    51,    -1,
+      -1,    54,    -1,    56,    57,    -1,    59,    60,    61,    62,
+      63,    64,    -1,    35,    -1,    -1,    38,    -1,    -1,    -1,
+      -1,    43,    44,    45,    -1,    78,    -1,    49,    50,    51,
+      -1,    -1,    54,    -1,    56,    57,    -1,    59,    60,    61,
+      62,    63,    64,    -1,    66,    67,    68,    69,    70,    71,
+      72,    73,    74,    75,     3,     4,     5,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    13,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      81,    82,    -1,    -1,    -1,    -1,    31,    32,    89,    90,
-      91,    92,    93,    94,    -1,    -1,    -1,    -1,    -1,    -1,
-       3,    46,     5,     6,     7,     8,     9,    10,    11,    -1,
-      -1,    -1,    -1,    -1,    -1,    60,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    31,    32,
-      -1,    -1,    -1,    -1,    -1,    -1,    81,    82,    -1,    -1,
-      -1,    -1,    -1,    46,    89,    90,    91,    92,    93,    94,
-      -1,    -1,    -1,    -1,    -1,    -1,     3,    60,     5,     6,
-       7,     8,     9,    10,    11,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    81,    82,
-      -1,    -1,    -1,    -1,    31,    32,    89,    90,    91,    92,
-      93,    94,    -1,    -1,    -1,    -1,    -1,    -1,     3,    46,
-       5,     6,     7,     8,     9,    10,    11,    -1,    -1,    -1,
-      -1,    -1,    -1,    60,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    31,    32,    -1,    -1,
-      -1,    -1,    -1,    -1,    81,    -1,    -1,    -1,    -1,    -1,
-      -1,    46,    89,    90,    91,    92,    93,    94,    -1,    -1,
-      -1,    -1,    -1,    -1,     3,    60,     5,     6,     7,     8,
-       9,    10,    11,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    81,    -1,    -1,    -1,
-      -1,    -1,    31,    32,    89,    90,    91,    92,    93,    94,
-      -1,    -1,    -1,    -1,    -1,    -1,     3,    46,     5,     6,
-       7,     8,     9,    10,    11,    -1,    -1,    -1,    -1,    -1,
-      -1,    60,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    31,    32,    -1,    -1,    -1,    -1,
-      -1,    -1,    81,    -1,    -1,    -1,    -1,    -1,    -1,    46,
-      89,    90,    91,    92,    93,    94,    -1,    -1,    -1,    -1,
-      -1,    -1,     3,    60,     5,     6,     7,     8,     9,    10,
-      11,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-       3,     4,    -1,    -1,    81,    -1,    -1,    -1,    -1,    12,
-      31,    32,    89,    90,    91,    92,    93,    94,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    46,    -1,    -1,    -1,    -1,
-      -1,    34,    35,    -1,    -1,    38,    39,    -1,    -1,    60,
-      43,    -1,    45,    46,    47,    48,    -1,    -1,    -1,    52,
-      53,    54,    55,    56,    -1,    58,    59,    -1,    61,    62,
-      81,    64,    65,    66,    67,    68,    69,     4,    89,    90,
-      91,    92,    93,    94,    -1,    12,    -1,    -1,    81,    82,
-      -1,    -1,    85,    -1,    -1,    -1,    -1,    90,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    34,    35,    -1,
-      -1,    38,    39,    -1,    -1,    -1,    43,    -1,    45,    46,
-      47,    48,    -1,    -1,    -1,    52,    53,    54,    55,    56,
-      -1,    58,    59,    -1,    61,    62,    -1,    64,    65,    66,
-      67,    68,    69,     0,     1,    -1,    -1,     4,    -1,    -1,
-      -1,    -1,    -1,    -1,    81,    82,    -1,    -1,    85,    -1,
-      -1,    -1,    -1,    90,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    34,    35,    -1,
-      -1,    38,    39,    -1,    -1,    -1,    43,    -1,    45,    46,
-      47,    48,    -1,     4,    -1,    52,    53,    54,    55,    56,
-      -1,    58,    59,    -1,    61,    62,    -1,    64,    65,    66,
-      67,    68,    69,    -1,    71,    72,    73,    74,    75,    76,
-      77,    78,    79,    80,    35,    -1,    -1,    38,    39,    -1,
-       4,    -1,    43,    -1,    45,    46,    -1,    48,    -1,    -1,
-      -1,    -1,    53,    54,    -1,    56,    -1,    58,    59,    -1,
-      -1,    62,    -1,    -1,    -1,    66,    67,    68,    69,    -1,
-      -1,    35,    -1,    -1,    38,    39,    -1,     1,    -1,    43,
-       4,    45,    46,    84,    48,    -1,    -1,    -1,    -1,    53,
-      54,    -1,    56,    -1,    58,    59,    -1,    -1,    62,    -1,
-      -1,    -1,    66,    67,    68,    69,    -1,    -1,    -1,    -1,
-      34,    35,    -1,    -1,    38,    39,    -1,    -1,    -1,    43,
-      84,    45,    46,    47,    48,    -1,    -1,    -1,    52,    53,
-      54,    55,    56,    -1,    58,    59,    -1,    61,    62,    -1,
-      64,    65,    66,    67,    68,    69,    -1,    71,    72,    73,
-      74,    75,    76,    77,    78,    79,    80,     3,     4,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    12,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    34,    35,
-      -1,    -1,    38,    39,    -1,    -1,     4,    43,    -1,    45,
-      46,    47,    48,    -1,    -1,    -1,    52,    53,    54,    55,
-      56,    -1,    58,    59,    -1,    61,    62,    -1,    64,    65,
-      66,    67,    68,    69,    -1,    -1,    34,    35,    -1,    -1,
-      38,    39,    -1,    -1,    -1,    43,    82,    45,    46,    47,
-      48,    -1,    -1,    -1,    52,    53,    54,    55,    56,    -1,
-      58,    59,    -1,    61,    62,     4,    64,    65,    66,    67,
-      68,    69,    -1,    12,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    83,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    34,    35,    -1,    -1,    38,
-      39,    -1,    -1,     4,    43,    -1,    45,    46,    47,    48,
-      -1,    12,    -1,    52,    53,    54,    55,    56,    -1,    58,
-      59,    -1,    61,    62,    -1,    64,    65,    66,    67,    68,
-      69,    -1,    -1,    34,    35,    -1,    -1,    38,    39,     4,
-      -1,    -1,    43,    82,    45,    46,    47,    48,    -1,    -1,
-      -1,    52,    53,    54,    55,    56,    -1,    58,    59,    -1,
-      61,    62,    -1,    64,    65,    66,    67,    68,    69,    34,
-      35,    -1,    -1,    38,    39,     4,    -1,    -1,    43,    -1,
-      45,    46,    47,    48,    -1,    -1,    -1,    52,    53,    54,
-      55,    56,    -1,    58,    59,    -1,    61,    62,    -1,    64,
-      65,    66,    67,    68,    69,    -1,    35,    -1,    -1,    38,
-      39,    -1,    -1,    -1,    43,    -1,    45,    46,    -1,    48,
-      -1,    -1,    -1,    -1,    53,    54,    -1,    56,    -1,    58,
-      59,    -1,    -1,    62,    -1,    -1,    -1,    66,    67,    68,
-      69
+      -1,    -1,     3,    -1,     5,    -1,    35,    -1,    -1,    38,
+      -1,    -1,    -1,    -1,    43,    44,    45,    -1,    -1,    -1,
+      49,    50,    51,    -1,    -1,    54,    -1,    56,    57,    -1,
+      59,    60,    61,    62,    63,    64,     3,    38,     5,    -1,
+      -1,    -1,    43,    44,    -1,    -1,    13,    -1,    77,    -1,
+      51,    -1,    -1,    54,    -1,    -1,    57,    -1,    -1,    -1,
+      61,    62,    63,    64,    -1,    -1,    -1,    -1,    35,    -1,
+      -1,    38,    -1,    -1,    -1,    -1,    43,    44,    45,    -1,
+      -1,    -1,    49,    50,    51,    -1,    -1,    54,    -1,    56,
+      57,    -1,    59,    60,    61,    62,    63,    64,     3,    -1,
+       5,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    13,    -1,
+      77,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,     3,
+      35,     5,    -1,    38,    -1,    -1,    -1,    -1,    43,    44,
+      45,    -1,    -1,    -1,    49,    50,    51,    -1,    -1,    54,
+      -1,    56,    57,    -1,    59,    60,    61,    62,    63,    64,
+      -1,    35,    -1,    -1,    38,    -1,    -1,    -1,    -1,    43,
+      44,    45,    -1,    -1,    -1,    49,    50,    51,    -1,    -1,
+      54,    -1,    56,    57,    -1,    59,    60,    61,    62,    63,
+      64
 };
 
   /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
      symbol of state STATE-NUM.  */
 static const yytype_uint8 yystos[] =
 {
-       0,     1,     4,    34,    35,    38,    39,    43,    45,    46,
-      47,    48,    52,    53,    54,    55,    56,    58,    59,    61,
-      62,    64,    65,    66,    67,    68,    69,    71,    72,    73,
-      74,    75,    76,    77,    78,    79,    80,   130,   131,   134,
-     135,   136,   137,   143,   144,   148,   149,   160,   172,   173,
-     174,   176,   177,   178,   179,   180,   181,     3,    81,    90,
-     104,   108,   132,   133,   150,   151,   152,   131,   131,    83,
-     108,   109,   160,    83,   109,   131,   131,     0,   173,    81,
-       5,     6,     7,     8,     9,    10,    11,    31,    32,    46,
-      60,    81,    89,    90,    91,    92,    93,    94,   106,   107,
-     108,   110,   112,   113,   114,   115,   116,   117,   118,   119,
-     120,   121,   122,   123,   124,   125,   129,   150,   148,   152,
-     153,    88,   104,    83,   103,   130,   131,   165,   175,    81,
-      85,   151,   135,   138,   139,   140,   148,    83,   145,   146,
-      83,   108,   156,    81,    81,    81,   112,   112,    81,    81,
-     112,    46,   112,   125,   126,   128,   140,   157,     9,    31,
-      32,    33,    81,    85,    87,   114,    90,    95,    96,    91,
-      92,    21,    22,    27,    28,    97,    98,    25,    26,    89,
-      99,   100,    29,    30,   101,    82,   148,   152,   133,   150,
-      36,    37,    40,    41,    42,    49,    50,    51,    57,    63,
-      70,    84,   104,   108,   109,   128,   130,   160,   163,   164,
-     165,   166,   167,   168,   169,   170,   171,    83,   126,   161,
-     130,   165,    12,    82,   131,   154,   155,   156,    86,   126,
-     140,    84,   139,   102,   141,   142,   150,   140,   138,    84,
-      88,   108,   147,   145,    82,    88,   112,   112,    46,    83,
-     157,    81,   128,    13,    14,    15,    16,    17,    18,    19,
-      20,    23,    24,   103,   127,    82,    88,    81,    85,   152,
-     158,   159,    82,   109,    82,   111,   126,   128,   109,   114,
-     114,   114,   115,   115,   116,   116,   117,   117,   117,   117,
-     118,   118,   119,   120,   121,   122,   123,   128,   104,   129,
-     104,   102,   163,    81,   109,    81,   104,   128,    81,    81,
-     102,   104,    84,   167,   161,   162,    81,   150,   152,   158,
-      82,    88,    82,    86,   129,    88,   104,   102,    84,    84,
-     147,   103,    84,    88,   108,    82,    82,   166,    82,   126,
-     126,    82,   154,   158,    86,   126,   159,    81,    85,   114,
-      82,    88,    86,   102,   102,   163,    70,   104,   128,   104,
-     128,   104,   128,   128,   163,    84,    88,   155,   142,   129,
-     129,    84,    84,    82,    82,    86,    82,   154,    86,   126,
-     126,   128,   163,    81,   104,   128,   104,    82,    82,    82,
-      84,   161,    82,    82,    86,   128,    82,   128,   104,   104,
-     128,   163,   163,   163,    82,   163,    82,    82,   128,    82,
-     128,   104,    44,   104,   163,   163,    82,   163,    82,    82,
-     128,   163,   163,   163,   163,    82,   163
+       0,     1,     3,     5,    35,    38,    43,    44,    45,    49,
+      50,    51,    54,    56,    57,    59,    60,    61,    62,    63,
+      64,    66,    67,    68,    69,    70,    71,    72,    73,    74,
+      75,   125,   126,   129,   130,   131,   132,   133,   139,   140,
+     144,   145,   156,   168,   169,   170,   172,   173,   174,   175,
+     176,   177,     4,    76,    85,    99,   103,   127,   128,   146,
+     147,   148,   126,   126,    78,   103,   104,   156,    78,   104,
+     126,   126,     0,   169,    76,     6,     7,     8,     9,    10,
+      11,    12,    32,    33,    44,    55,    76,    84,    85,    86,
+      87,    88,    89,   101,   102,   103,   105,   107,   108,   109,
+     110,   111,   112,   113,   114,   115,   116,   117,   118,   119,
+     120,   124,   146,   144,   148,   149,    83,    99,    78,    98,
+     125,   126,   161,   171,    76,    80,   147,   131,   134,   135,
+     136,   144,    78,   141,   142,    78,   103,   152,    76,    76,
+      76,   107,   107,    76,    76,   107,    44,   107,   120,   121,
+     123,   136,   153,    10,    32,    33,    34,    76,    80,    82,
+     109,    85,    90,    91,    86,    87,    22,    23,    28,    29,
+      92,    93,    26,    27,    84,    94,    95,    30,    31,    96,
+      77,   144,   148,   128,   146,    36,    37,    39,    40,    41,
+      46,    47,    48,    52,    58,    65,    79,    99,   103,   104,
+     123,   125,   156,   159,   160,   161,   162,   163,   164,   165,
+     166,   167,    78,   121,   157,   125,   161,    13,    77,   126,
+     150,   151,   152,    81,   121,   136,    79,   135,    97,   137,
+     138,   146,   136,   134,    79,    83,   103,   143,   141,    77,
+      83,   107,   107,    44,    78,   153,    76,   123,    14,    15,
+      16,    17,    18,    19,    20,    21,    24,    25,    98,   122,
+      77,    83,    76,    80,   148,   154,   155,    77,   104,    77,
+     106,   121,   123,   104,   109,   109,   109,   110,   110,   111,
+     111,   112,   112,   112,   112,   113,   113,   114,   115,   116,
+     117,   118,   123,    99,   124,    99,    97,   159,    76,   104,
+      76,    99,   123,    76,    76,    97,    99,    79,   163,   157,
+     158,    76,   146,   148,   154,    77,    83,    77,    81,   124,
+      83,    99,    97,    79,    79,   143,    98,    79,    83,   103,
+      77,    77,   162,    77,   121,   121,    77,   150,   154,    81,
+     121,   155,    76,    80,   109,    77,    83,    81,    97,    97,
+     159,    65,    99,   123,    99,   123,    99,   123,   123,   159,
+      79,    83,   151,   138,   124,   124,    79,    79,    77,    77,
+      81,    77,   150,    81,   121,   121,   123,   159,    76,    99,
+     123,    99,    77,    77,    77,    79,   157,    77,    77,    81,
+     123,    77,   123,    99,    99,   123,   159,   159,   159,    77,
+     159,    77,    77,   123,    77,   123,    99,    42,    99,   159,
+     159,    77,   159,    77,    77,   123,   159,   159,   159,   159,
+      77,   159
 };
 
   /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
 static const yytype_uint8 yyr1[] =
 {
-       0,   105,   106,   106,   106,   106,   106,   106,   106,   106,
-     107,   107,   108,   109,   109,   110,   110,   110,   110,   110,
-     110,   110,   110,   111,   111,   112,   112,   112,   112,   112,
-     112,   112,   112,   113,   113,   113,   113,   113,   113,   114,
-     114,   115,   115,   115,   115,   116,   116,   116,   117,   117,
-     117,   118,   118,   118,   118,   118,   119,   119,   119,   120,
-     120,   121,   121,   122,   122,   123,   123,   124,   124,   125,
-     125,   126,   126,   127,   127,   127,   127,   127,   127,   127,
-     127,   127,   127,   127,   128,   128,   128,   129,   130,   130,
-     131,   131,   131,   131,   131,   131,   131,   131,   132,   132,
-     133,   133,   134,   134,   134,   134,   134,   134,   135,   135,
-     135,   135,   135,   135,   135,   135,   135,   135,   135,   135,
-     135,   136,   136,   136,   137,   137,   138,   138,   139,   140,
-     140,   140,   140,   141,   141,   142,   142,   142,   142,   143,
-     143,   143,   143,   143,   144,   146,   145,   145,   147,   147,
-     148,   148,   148,   148,   149,   150,   150,   151,   151,   151,
-     151,   151,   151,   151,   152,   152,   152,   152,   153,   153,
-     154,   154,   155,   155,   155,   155,   156,   156,   157,   157,
-     158,   158,   158,   159,   159,   159,   159,   159,   159,   159,
-     159,   159,   160,   161,   161,   161,   162,   162,   163,   163,
-     163,   163,   163,   163,   164,   164,   164,   165,   165,   166,
-     166,   167,   167,   168,   168,   169,   169,   169,   170,   170,
-     170,   170,   170,   170,   170,   170,   170,   170,   171,   171,
-     171,   171,   171,   172,   172,   173,   173,   173,   174,   174,
-     175,   175,   176,   177,   178,   179,   180,   180,   180,   180,
-     180,   180,   180,   180,   181,   181,   181,   181
+       0,   100,   101,   101,   101,   101,   101,   101,   101,   101,
+     102,   102,   103,   104,   104,   105,   105,   105,   105,   105,
+     105,   105,   105,   106,   106,   107,   107,   107,   107,   107,
+     107,   107,   107,   108,   108,   108,   108,   108,   108,   109,
+     109,   110,   110,   110,   110,   111,   111,   111,   112,   112,
+     112,   113,   113,   113,   113,   113,   114,   114,   114,   115,
+     115,   116,   116,   117,   117,   118,   118,   119,   119,   120,
+     120,   121,   121,   122,   122,   122,   122,   122,   122,   122,
+     122,   122,   122,   122,   123,   123,   123,   124,   125,   125,
+     126,   126,   126,   126,   126,   126,   126,   126,   127,   127,
+     128,   128,   129,   129,   129,   129,   129,   129,   130,   131,
+     131,   131,   131,   131,   131,   131,   132,   132,   132,   133,
+     133,   134,   134,   135,   136,   136,   136,   136,   137,   137,
+     138,   138,   138,   138,   139,   139,   139,   139,   139,   140,
+     142,   141,   141,   143,   143,   144,   144,   144,   144,   145,
+     146,   146,   147,   147,   147,   147,   147,   147,   147,   148,
+     148,   148,   148,   149,   149,   150,   150,   151,   151,   151,
+     151,   152,   152,   153,   153,   154,   154,   154,   155,   155,
+     155,   155,   155,   155,   155,   155,   155,   156,   157,   157,
+     157,   158,   158,   159,   159,   159,   159,   159,   159,   160,
+     160,   160,   161,   161,   162,   162,   163,   163,   164,   164,
+     165,   165,   165,   166,   166,   166,   166,   166,   166,   166,
+     166,   166,   166,   167,   167,   167,   167,   167,   168,   168,
+     169,   169,   169,   170,   170,   171,   171,   172,   173,   174,
+     175,   176,   176,   176,   176,   176,   176,   176,   176,   177,
+     177,   177,   177
 };
 
   /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN.  */
@@ -1659,21 +1600,21 @@ static const yytype_uint8 yyr2[] =
        1,     1,     1,     1,     1,     3,     2,     1,     3,     2,
        2,     1,     2,     1,     2,     1,     2,     1,     1,     3,
        1,     3,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     5,     4,     2,     1,     1,     1,     2,     3,     2,
-       1,     2,     1,     1,     3,     0,     1,     2,     3,     5,
-       4,     6,     5,     2,     1,     0,     2,     3,     1,     3,
-       1,     1,     1,     1,     1,     2,     1,     1,     3,     4,
-       3,     4,     4,     3,     2,     1,     3,     2,     1,     2,
-       1,     3,     2,     2,     1,     1,     1,     3,     1,     2,
-       1,     1,     2,     3,     2,     3,     3,     4,     2,     3,
-       3,     4,     1,     1,     3,     4,     1,     3,     1,     1,
-       1,     1,     1,     1,     3,     4,     3,     2,     3,     1,
-       2,     1,     1,     1,     2,     5,     7,     5,     5,     7,
-       6,     7,     7,     8,     7,     8,     8,     9,     3,     2,
-       2,     2,     3,     1,     2,     1,     1,     1,     4,     3,
-       1,     2,     1,     1,     4,     2,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     1,     1,     1
+       1,     1,     1,     1,     1,     1,     5,     4,     2,     1,
+       1,     1,     2,     3,     2,     1,     2,     1,     1,     3,
+       0,     1,     2,     3,     5,     4,     6,     5,     2,     1,
+       0,     2,     3,     1,     3,     1,     1,     1,     1,     1,
+       2,     1,     1,     3,     4,     3,     4,     4,     3,     2,
+       1,     3,     2,     1,     2,     1,     3,     2,     2,     1,
+       1,     1,     3,     1,     2,     1,     1,     2,     3,     2,
+       3,     3,     4,     2,     3,     3,     4,     1,     1,     3,
+       4,     1,     3,     1,     1,     1,     1,     1,     1,     3,
+       4,     3,     2,     3,     1,     2,     1,     1,     1,     2,
+       5,     7,     5,     5,     7,     6,     7,     7,     8,     7,
+       8,     8,     9,     3,     2,     2,     2,     3,     1,     2,
+       1,     1,     1,     4,     3,     1,     2,     1,     1,     4,
+       2,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     1
 };
 
 
@@ -2352,7 +2293,7 @@ yyreduce:
   switch (yyn)
     {
         case 2:
-#line 327 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 329 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 		(yyval.symbol) = g_hash_table_lookup (scanner->const_table, (yyvsp[0].str));
 		if ((yyval.symbol) == NULL) {
@@ -2361,11 +2302,11 @@ yyreduce:
 			(yyval.symbol) = gi_source_symbol_ref ((yyval.symbol));
 		}
 	  }
-#line 2365 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 2306 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 3:
-#line 336 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 338 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 		char *rest;
 		guint64 value;
@@ -2381,58 +2322,58 @@ yyreduce:
 		(yyval.symbol)->const_int = value;
 		(yyval.symbol)->const_int_is_unsigned = (rest && (rest[0] == 'U'));
 	  }
-#line 2385 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 2326 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 4:
-#line 352 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 354 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 		(yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_CONST, scanner->current_file, lineno);
 		(yyval.symbol)->const_boolean_set = TRUE;
 		(yyval.symbol)->const_boolean = g_ascii_strcasecmp (yytext, "true") == 0 ? TRUE : FALSE;
 	  }
-#line 2395 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 2336 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 5:
-#line 358 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 360 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 		(yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_CONST, scanner->current_file, lineno);
 		(yyval.symbol)->const_int_set = TRUE;
 		(yyval.symbol)->const_int = g_utf8_get_char(yytext + 1);
 	  }
-#line 2405 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 2346 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 6:
-#line 364 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 366 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 		(yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_CONST, scanner->current_file, lineno);
 		(yyval.symbol)->const_double_set = TRUE;
 		(yyval.symbol)->const_double = 0.0;
         sscanf (yytext, "%lf", &((yyval.symbol)->const_double));
 	  }
-#line 2416 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 2357 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 8:
-#line 372 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 374 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 		(yyval.symbol) = (yyvsp[-1].symbol);
 	  }
-#line 2424 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 2365 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 9:
-#line 376 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 378 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 		(yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_INVALID, scanner->current_file, lineno);
 	  }
-#line 2432 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 2373 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 10:
-#line 384 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 386 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 		(yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_CONST, scanner->current_file, lineno);
 		yytext[strlen (yytext) - 1] = '\0';
@@ -2447,11 +2388,11 @@ yyreduce:
                   }
 
 	  }
-#line 2451 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 2392 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 11:
-#line 399 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 401 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 		char *strings, *string2;
 		(yyval.symbol) = (yyvsp[-1].symbol);
@@ -2462,91 +2403,91 @@ yyreduce:
 		g_free (string2);
 		(yyval.symbol)->const_string = strings;
 	  }
-#line 2466 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 2407 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 12:
-#line 413 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 415 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 		(yyval.str) = g_strdup (yytext);
 	  }
-#line 2474 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 2415 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 16:
-#line 426 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 428 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 		(yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_INVALID, scanner->current_file, lineno);
 	  }
-#line 2482 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 2423 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 17:
-#line 430 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 432 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 		(yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_INVALID, scanner->current_file, lineno);
 	  }
-#line 2490 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 2431 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 18:
-#line 434 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 436 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 		(yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_INVALID, scanner->current_file, lineno);
 	  }
-#line 2498 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 2439 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 19:
-#line 438 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 440 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 		(yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_INVALID, scanner->current_file, lineno);
 	  }
-#line 2506 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 2447 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 20:
-#line 442 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 444 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 		(yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_INVALID, scanner->current_file, lineno);
 	  }
-#line 2514 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 2455 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 21:
-#line 446 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 448 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 		(yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_INVALID, scanner->current_file, lineno);
 	  }
-#line 2522 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 2463 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 22:
-#line 450 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 452 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 		(yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_INVALID, scanner->current_file, lineno);
 	  }
-#line 2530 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 2471 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 26:
-#line 463 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 465 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 		(yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_INVALID, scanner->current_file, lineno);
 	  }
-#line 2538 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 2479 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 27:
-#line 467 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 469 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 		(yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_INVALID, scanner->current_file, lineno);
 	  }
-#line 2546 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 2487 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 28:
-#line 471 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 473 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 		switch ((yyvsp[-1].unary_operator)) {
 		case UNARY_PLUS:
@@ -2569,98 +2510,98 @@ yyreduce:
 			break;
 		}
 	  }
-#line 2573 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 2514 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 29:
-#line 494 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 496 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 		(yyval.symbol) = (yyvsp[-1].symbol);
 		if ((yyval.symbol)->const_int_set) {
 			(yyval.symbol)->base_type = gi_source_basic_type_new ((yyval.symbol)->const_int_is_unsigned ? "guint64" : "gint64");
 		}
 	  }
-#line 2584 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 2525 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 30:
-#line 501 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 503 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 		(yyval.symbol) = (yyvsp[-1].symbol);
 		if ((yyval.symbol)->const_int_set) {
 			(yyval.symbol)->base_type = gi_source_basic_type_new ("guint64");
 		}
 	  }
-#line 2595 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 2536 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 31:
-#line 508 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 510 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 		(yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_INVALID, scanner->current_file, lineno);
 	  }
-#line 2603 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 2544 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 32:
-#line 512 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 514 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 		ctype_free ((yyvsp[-1].ctype));
 		(yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_INVALID, scanner->current_file, lineno);
 	  }
-#line 2612 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 2553 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 33:
-#line 520 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 522 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 		(yyval.unary_operator) = UNARY_ADDRESS_OF;
 	  }
-#line 2620 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 2561 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 34:
-#line 524 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 526 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 		(yyval.unary_operator) = UNARY_POINTER_INDIRECTION;
 	  }
-#line 2628 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 2569 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 35:
-#line 528 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 530 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 		(yyval.unary_operator) = UNARY_PLUS;
 	  }
-#line 2636 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 2577 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 36:
-#line 532 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 534 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 		(yyval.unary_operator) = UNARY_MINUS;
 	  }
-#line 2644 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 2585 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 37:
-#line 536 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 538 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 		(yyval.unary_operator) = UNARY_BITWISE_COMPLEMENT;
 	  }
-#line 2652 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 2593 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 38:
-#line 540 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 542 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 		(yyval.unary_operator) = UNARY_LOGICAL_NEGATION;
 	  }
-#line 2660 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 2601 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 40:
-#line 548 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 550 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 		(yyval.symbol) = (yyvsp[0].symbol);
 		if ((yyval.symbol)->const_int_set || (yyval.symbol)->const_double_set || (yyval.symbol)->const_string != NULL) {
@@ -2669,21 +2610,21 @@ yyreduce:
 			ctype_free ((yyvsp[-2].ctype));
 		}
 	  }
-#line 2673 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 2614 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 42:
-#line 561 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 563 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 		(yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_CONST, scanner->current_file, lineno);
 		(yyval.symbol)->const_int_set = TRUE;
 		(yyval.symbol)->const_int = (yyvsp[-2].symbol)->const_int * (yyvsp[0].symbol)->const_int;
 	  }
-#line 2683 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 2624 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 43:
-#line 567 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 569 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 		(yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_CONST, scanner->current_file, lineno);
 		(yyval.symbol)->const_int_set = TRUE;
@@ -2691,11 +2632,11 @@ yyreduce:
 			(yyval.symbol)->const_int = (yyvsp[-2].symbol)->const_int / (yyvsp[0].symbol)->const_int;
 		}
 	  }
-#line 2695 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 2636 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 44:
-#line 575 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 577 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 		(yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_CONST, scanner->current_file, lineno);
 		(yyval.symbol)->const_int_set = TRUE;
@@ -2703,31 +2644,31 @@ yyreduce:
 			(yyval.symbol)->const_int = (yyvsp[-2].symbol)->const_int % (yyvsp[0].symbol)->const_int;
 		}
 	  }
-#line 2707 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 2648 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 46:
-#line 587 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 589 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 		(yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_CONST, scanner->current_file, lineno);
 		(yyval.symbol)->const_int_set = TRUE;
 		(yyval.symbol)->const_int = (yyvsp[-2].symbol)->const_int + (yyvsp[0].symbol)->const_int;
 	  }
-#line 2717 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 2658 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 47:
-#line 593 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 595 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 		(yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_CONST, scanner->current_file, lineno);
 		(yyval.symbol)->const_int_set = TRUE;
 		(yyval.symbol)->const_int = (yyvsp[-2].symbol)->const_int - (yyvsp[0].symbol)->const_int;
 	  }
-#line 2727 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 2668 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 49:
-#line 603 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 605 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 		(yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_CONST, scanner->current_file, lineno);
 		(yyval.symbol)->const_int_set = TRUE;
@@ -2739,111 +2680,111 @@ yyreduce:
 		 */
 		is_bitfield = TRUE;
 	  }
-#line 2743 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 2684 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 50:
-#line 615 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 617 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 		(yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_CONST, scanner->current_file, lineno);
 		(yyval.symbol)->const_int_set = TRUE;
 		(yyval.symbol)->const_int = (yyvsp[-2].symbol)->const_int >> (yyvsp[0].symbol)->const_int;
 	  }
-#line 2753 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 2694 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 52:
-#line 625 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 627 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 		(yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_CONST, scanner->current_file, lineno);
 		(yyval.symbol)->const_int_set = TRUE;
 		(yyval.symbol)->const_int = (yyvsp[-2].symbol)->const_int < (yyvsp[0].symbol)->const_int;
 	  }
-#line 2763 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 2704 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 53:
-#line 631 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 633 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 		(yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_CONST, scanner->current_file, lineno);
 		(yyval.symbol)->const_int_set = TRUE;
 		(yyval.symbol)->const_int = (yyvsp[-2].symbol)->const_int > (yyvsp[0].symbol)->const_int;
 	  }
-#line 2773 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 2714 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 54:
-#line 637 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 639 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 		(yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_CONST, scanner->current_file, lineno);
 		(yyval.symbol)->const_int_set = TRUE;
 		(yyval.symbol)->const_int = (yyvsp[-2].symbol)->const_int <= (yyvsp[0].symbol)->const_int;
 	  }
-#line 2783 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 2724 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 55:
-#line 643 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 645 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 		(yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_CONST, scanner->current_file, lineno);
 		(yyval.symbol)->const_int_set = TRUE;
 		(yyval.symbol)->const_int = (yyvsp[-2].symbol)->const_int >= (yyvsp[0].symbol)->const_int;
 	  }
-#line 2793 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 2734 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 57:
-#line 653 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 655 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 		(yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_CONST, scanner->current_file, lineno);
 		(yyval.symbol)->const_int_set = TRUE;
 		(yyval.symbol)->const_int = (yyvsp[-2].symbol)->const_int == (yyvsp[0].symbol)->const_int;
 	  }
-#line 2803 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 2744 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 58:
-#line 659 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 661 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 		(yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_CONST, scanner->current_file, lineno);
 		(yyval.symbol)->const_int_set = TRUE;
 		(yyval.symbol)->const_int = (yyvsp[-2].symbol)->const_int != (yyvsp[0].symbol)->const_int;
 	  }
-#line 2813 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 2754 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 60:
-#line 669 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 671 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 		(yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_CONST, scanner->current_file, lineno);
 		(yyval.symbol)->const_int_set = TRUE;
 		(yyval.symbol)->const_int = (yyvsp[-2].symbol)->const_int & (yyvsp[0].symbol)->const_int;
 	  }
-#line 2823 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 2764 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 62:
-#line 679 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 681 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 		(yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_CONST, scanner->current_file, lineno);
 		(yyval.symbol)->const_int_set = TRUE;
 		(yyval.symbol)->const_int = (yyvsp[-2].symbol)->const_int ^ (yyvsp[0].symbol)->const_int;
 	  }
-#line 2833 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 2774 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 64:
-#line 689 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 691 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 		(yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_CONST, scanner->current_file, lineno);
 		(yyval.symbol)->const_int_set = TRUE;
 		(yyval.symbol)->const_int = (yyvsp[-2].symbol)->const_int | (yyvsp[0].symbol)->const_int;
 	  }
-#line 2843 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 2784 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 66:
-#line 699 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 701 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 		(yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_CONST, scanner->current_file, lineno);
 		(yyval.symbol)->const_int_set = TRUE;
@@ -2851,11 +2792,11 @@ yyreduce:
 		  gi_source_symbol_get_const_boolean ((yyvsp[-2].symbol)) &&
 		  gi_source_symbol_get_const_boolean ((yyvsp[0].symbol));
 	  }
-#line 2855 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 2796 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 68:
-#line 711 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 713 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 		(yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_CONST, scanner->current_file, lineno);
 		(yyval.symbol)->const_int_set = TRUE;
@@ -2863,35 +2804,35 @@ yyreduce:
 		  gi_source_symbol_get_const_boolean ((yyvsp[-2].symbol)) ||
 		  gi_source_symbol_get_const_boolean ((yyvsp[0].symbol));
 	  }
-#line 2867 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 2808 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 70:
-#line 723 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 725 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 		(yyval.symbol) = gi_source_symbol_get_const_boolean ((yyvsp[-4].symbol)) ? (yyvsp[-2].symbol) : (yyvsp[0].symbol);
 	  }
-#line 2875 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 2816 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 72:
-#line 731 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 733 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 		(yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_INVALID, scanner->current_file, lineno);
 	  }
-#line 2883 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 2824 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 86:
-#line 754 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 756 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 		(yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_INVALID, scanner->current_file, lineno);
 	  }
-#line 2891 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 2832 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 88:
-#line 767 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 769 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 		GList *l;
 		for (l = (yyvsp[-1].list); l != NULL; l = l->next) {
@@ -2909,37 +2850,37 @@ yyreduce:
 		}
 		ctype_free ((yyvsp[-2].ctype));
 	  }
-#line 2913 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 2854 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 89:
-#line 785 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 787 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 		ctype_free ((yyvsp[-1].ctype));
 	  }
-#line 2921 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 2862 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 90:
-#line 792 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 794 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 		(yyval.ctype) = (yyvsp[0].ctype);
 		(yyval.ctype)->storage_class_specifier |= (yyvsp[-1].storage_class_specifier);
 	  }
-#line 2930 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 2871 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 91:
-#line 797 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 799 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 		(yyval.ctype) = gi_source_type_new (CTYPE_INVALID);
 		(yyval.ctype)->storage_class_specifier |= (yyvsp[0].storage_class_specifier);
 	  }
-#line 2939 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 2880 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 92:
-#line 802 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 804 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 		(yyval.ctype) = (yyvsp[-1].ctype);
 		/* combine basic types like unsigned int and long long */
@@ -2952,200 +2893,161 @@ yyreduce:
 			set_or_merge_base_type ((yyvsp[-1].ctype), (yyvsp[0].ctype));
 		}
 	  }
-#line 2956 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 2897 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 94:
-#line 816 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 818 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 		(yyval.ctype) = (yyvsp[0].ctype);
 		(yyval.ctype)->type_qualifier |= (yyvsp[-1].type_qualifier);
 	  }
-#line 2965 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 2906 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 95:
-#line 821 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 823 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 		(yyval.ctype) = gi_source_type_new (CTYPE_INVALID);
 		(yyval.ctype)->type_qualifier |= (yyvsp[0].type_qualifier);
 	  }
-#line 2974 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 2915 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 96:
-#line 826 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 828 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 		(yyval.ctype) = (yyvsp[0].ctype);
 		(yyval.ctype)->function_specifier |= (yyvsp[-1].function_specifier);
 	  }
-#line 2983 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 2924 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 97:
-#line 831 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 833 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 		(yyval.ctype) = gi_source_type_new (CTYPE_INVALID);
 		(yyval.ctype)->function_specifier |= (yyvsp[0].function_specifier);
 	  }
-#line 2992 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 2933 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 98:
-#line 839 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 841 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 		(yyval.list) = g_list_append (NULL, (yyvsp[0].symbol));
 	  }
-#line 3000 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 2941 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 99:
-#line 843 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 845 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 		(yyval.list) = g_list_append ((yyvsp[-2].list), (yyvsp[0].symbol));
 	  }
-#line 3008 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 2949 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 102:
-#line 855 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 857 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 		(yyval.storage_class_specifier) = STORAGE_CLASS_TYPEDEF;
 	  }
-#line 3016 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 2957 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 103:
-#line 859 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 861 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 		(yyval.storage_class_specifier) = STORAGE_CLASS_EXTERN;
 	  }
-#line 3024 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 2965 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 104:
-#line 863 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 865 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 		(yyval.storage_class_specifier) = STORAGE_CLASS_STATIC;
 	  }
-#line 3032 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 2973 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 105:
-#line 867 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 869 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 		(yyval.storage_class_specifier) = STORAGE_CLASS_AUTO;
 	  }
-#line 3040 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 2981 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 106:
-#line 871 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 873 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 		(yyval.storage_class_specifier) = STORAGE_CLASS_REGISTER;
 	  }
-#line 3048 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 2989 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 107:
-#line 875 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 877 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 		(yyval.storage_class_specifier) = STORAGE_CLASS_THREAD_LOCAL;
 	  }
-#line 3056 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 2997 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 108:
-#line 882 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 884 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
-		(yyval.ctype) = gi_source_type_new (CTYPE_VOID);
+		(yyval.str) = g_strdup (yytext);
 	  }
-#line 3064 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 3005 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 109:
-#line 886 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 891 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
-		(yyval.ctype) = gi_source_basic_type_new ("char");
+		(yyval.ctype) = gi_source_type_new (CTYPE_VOID);
 	  }
-#line 3072 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 3013 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 110:
-#line 890 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 895 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
-		(yyval.ctype) = gi_source_basic_type_new ("short");
+		(yyval.ctype) = gi_source_basic_type_new ("signed");
 	  }
-#line 3080 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 3021 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 111:
-#line 894 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 899 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
-		(yyval.ctype) = gi_source_basic_type_new ("int");
+		(yyval.ctype) = gi_source_basic_type_new ("unsigned");
 	  }
-#line 3088 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 3029 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 112:
-#line 898 "giscanner/scannerparser.y" /* yacc.c:1646  */
-    {
-		(yyval.ctype) = gi_source_basic_type_new ("long");
-	  }
-#line 3096 "giscanner/scannerparser.c" /* yacc.c:1646  */
-    break;
-
-  case 113:
-#line 902 "giscanner/scannerparser.y" /* yacc.c:1646  */
-    {
-		(yyval.ctype) = gi_source_basic_type_new ("float");
-	  }
-#line 3104 "giscanner/scannerparser.c" /* yacc.c:1646  */
-    break;
-
-  case 114:
-#line 906 "giscanner/scannerparser.y" /* yacc.c:1646  */
+#line 903 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
-		(yyval.ctype) = gi_source_basic_type_new ("double");
+		(yyval.ctype) = gi_source_type_new (CTYPE_BASIC_TYPE);
+		(yyval.ctype)->name = (yyvsp[0].str);
 	  }
-#line 3112 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 3038 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
   case 115:
 #line 910 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
-		(yyval.ctype) = gi_source_basic_type_new ("signed");
-	  }
-#line 3120 "giscanner/scannerparser.c" /* yacc.c:1646  */
-    break;
-
-  case 116:
-#line 914 "giscanner/scannerparser.y" /* yacc.c:1646  */
-    {
-		(yyval.ctype) = gi_source_basic_type_new ("unsigned");
-	  }
-#line 3128 "giscanner/scannerparser.c" /* yacc.c:1646  */
-    break;
-
-  case 117:
-#line 918 "giscanner/scannerparser.y" /* yacc.c:1646  */
-    {
-		(yyval.ctype) = gi_source_basic_type_new ("bool");
-	  }
-#line 3136 "giscanner/scannerparser.c" /* yacc.c:1646  */
-    break;
-
-  case 120:
-#line 924 "giscanner/scannerparser.y" /* yacc.c:1646  */
-    {
 		(yyval.ctype) = gi_source_typedef_new ((yyvsp[0].str));
 		g_free ((yyvsp[0].str));
 	  }
-#line 3145 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 3047 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 121:
-#line 932 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 116:
+#line 918 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 		GISourceSymbol *sym;
 		(yyval.ctype) = (yyvsp[-4].ctype);
@@ -3165,55 +3067,55 @@ yyreduce:
 		gi_source_scanner_add_symbol (scanner, sym);
 		gi_source_symbol_unref (sym);
 	  }
-#line 3169 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 3071 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 122:
-#line 952 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 117:
+#line 938 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 		(yyval.ctype) = (yyvsp[-3].ctype);
 		(yyval.ctype)->child_list = (yyvsp[-1].list);
 	  }
-#line 3178 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 3080 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 123:
-#line 957 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 118:
+#line 943 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 		(yyval.ctype) = (yyvsp[-1].ctype);
 		(yyval.ctype)->name = (yyvsp[0].str);
 	  }
-#line 3187 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 3089 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 124:
-#line 965 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 119:
+#line 951 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                 scanner->private = FALSE;
 		(yyval.ctype) = gi_source_struct_new (NULL);
 	  }
-#line 3196 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 3098 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 125:
-#line 970 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 120:
+#line 956 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                 scanner->private = FALSE;
 		(yyval.ctype) = gi_source_union_new (NULL);
 	  }
-#line 3205 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 3107 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 127:
-#line 979 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 122:
+#line 965 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 		(yyval.list) = g_list_concat ((yyvsp[-1].list), (yyvsp[0].list));
 	  }
-#line 3213 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 3115 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 128:
-#line 986 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 123:
+#line 972 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 	    GList *l;
 	    (yyval.list) = NULL;
@@ -3230,70 +3132,70 @@ yyreduce:
 	      }
 	    ctype_free ((yyvsp[-2].ctype));
 	  }
-#line 3234 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 3136 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 129:
-#line 1006 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 124:
+#line 992 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 		(yyval.ctype) = (yyvsp[-1].ctype);
 		set_or_merge_base_type ((yyvsp[-1].ctype), (yyvsp[0].ctype));
 	  }
-#line 3243 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 3145 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 131:
-#line 1012 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 126:
+#line 998 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 		(yyval.ctype) = (yyvsp[0].ctype);
 		(yyval.ctype)->type_qualifier |= (yyvsp[-1].type_qualifier);
 	  }
-#line 3252 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 3154 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 132:
-#line 1017 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 127:
+#line 1003 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 		(yyval.ctype) = gi_source_type_new (CTYPE_INVALID);
 		(yyval.ctype)->type_qualifier |= (yyvsp[0].type_qualifier);
 	  }
-#line 3261 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 3163 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 133:
-#line 1025 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 128:
+#line 1011 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 		(yyval.list) = g_list_append (NULL, (yyvsp[0].symbol));
 	  }
-#line 3269 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 3171 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 134:
-#line 1029 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 129:
+#line 1015 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 		(yyval.list) = g_list_append ((yyvsp[-2].list), (yyvsp[0].symbol));
 	  }
-#line 3277 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 3179 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 135:
-#line 1036 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 130:
+#line 1022 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 		(yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_INVALID, scanner->current_file, lineno);
 	  }
-#line 3285 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 3187 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 137:
-#line 1041 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 132:
+#line 1027 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 		(yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_INVALID, scanner->current_file, lineno);
 	  }
-#line 3293 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 3195 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 138:
-#line 1045 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 133:
+#line 1031 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 		(yyval.symbol) = (yyvsp[-2].symbol);
 		if ((yyvsp[0].symbol)->const_int_set) {
@@ -3301,99 +3203,99 @@ yyreduce:
 		  (yyval.symbol)->const_int = (yyvsp[0].symbol)->const_int;
 		}
 	  }
-#line 3305 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 3207 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 139:
-#line 1056 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 134:
+#line 1042 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 		(yyval.ctype) = gi_source_enum_new ((yyvsp[-3].str));
 		(yyval.ctype)->child_list = (yyvsp[-1].list);
 		(yyval.ctype)->is_bitfield = is_bitfield || scanner->flags;
 		last_enum_value = -1;
 	  }
-#line 3316 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 3218 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 140:
-#line 1063 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 135:
+#line 1049 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 		(yyval.ctype) = gi_source_enum_new (NULL);
 		(yyval.ctype)->child_list = (yyvsp[-1].list);
 		(yyval.ctype)->is_bitfield = is_bitfield || scanner->flags;
 		last_enum_value = -1;
 	  }
-#line 3327 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 3229 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 141:
-#line 1070 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 136:
+#line 1056 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 		(yyval.ctype) = gi_source_enum_new ((yyvsp[-4].str));
 		(yyval.ctype)->child_list = (yyvsp[-2].list);
 		(yyval.ctype)->is_bitfield = is_bitfield || scanner->flags;
 		last_enum_value = -1;
 	  }
-#line 3338 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 3240 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 142:
-#line 1077 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 137:
+#line 1063 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 		(yyval.ctype) = gi_source_enum_new (NULL);
 		(yyval.ctype)->child_list = (yyvsp[-2].list);
 		(yyval.ctype)->is_bitfield = is_bitfield || scanner->flags;
 		last_enum_value = -1;
 	  }
-#line 3349 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 3251 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 143:
-#line 1084 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 138:
+#line 1070 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 		(yyval.ctype) = gi_source_enum_new ((yyvsp[0].str));
 	  }
-#line 3357 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 3259 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 144:
-#line 1091 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 139:
+#line 1077 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
                 scanner->flags = FALSE;
                 scanner->private = FALSE;
           }
-#line 3366 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 3268 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 145:
-#line 1099 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 140:
+#line 1085 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 		/* reset flag before the first enum value */
 		is_bitfield = FALSE;
 	  }
-#line 3375 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 3277 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 146:
-#line 1104 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 141:
+#line 1090 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
             (yyvsp[0].symbol)->private = scanner->private;
             (yyval.list) = g_list_append (NULL, (yyvsp[0].symbol));
 	  }
-#line 3384 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 3286 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 147:
-#line 1109 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 142:
+#line 1095 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
             (yyvsp[0].symbol)->private = scanner->private;
             (yyval.list) = g_list_append ((yyvsp[-2].list), (yyvsp[0].symbol));
 	  }
-#line 3393 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 3295 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 148:
-#line 1117 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 143:
+#line 1103 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 		(yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_OBJECT, scanner->current_file, lineno);
 		(yyval.symbol)->ident = (yyvsp[0].str);
@@ -3401,11 +3303,11 @@ yyreduce:
 		(yyval.symbol)->const_int = ++last_enum_value;
 		g_hash_table_insert (scanner->const_table, g_strdup ((yyval.symbol)->ident), gi_source_symbol_ref ((yyval.symbol)));
 	  }
-#line 3405 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 3307 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 149:
-#line 1125 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 144:
+#line 1111 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 		(yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_OBJECT, scanner->current_file, lineno);
 		(yyval.symbol)->ident = (yyvsp[-2].str);
@@ -3414,95 +3316,95 @@ yyreduce:
 		last_enum_value = (yyval.symbol)->const_int;
 		g_hash_table_insert (scanner->const_table, g_strdup ((yyval.symbol)->ident), gi_source_symbol_ref ((yyval.symbol)));
 	  }
-#line 3418 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 3320 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 150:
-#line 1137 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 145:
+#line 1123 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 		(yyval.type_qualifier) = TYPE_QUALIFIER_CONST;
 	  }
-#line 3426 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 3328 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 151:
-#line 1141 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 146:
+#line 1127 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 		(yyval.type_qualifier) = TYPE_QUALIFIER_RESTRICT;
 	  }
-#line 3434 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 3336 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 152:
-#line 1145 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 147:
+#line 1131 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 		(yyval.type_qualifier) = TYPE_QUALIFIER_EXTENSION;
 	  }
-#line 3442 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 3344 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 153:
-#line 1149 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 148:
+#line 1135 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 		(yyval.type_qualifier) = TYPE_QUALIFIER_VOLATILE;
 	  }
-#line 3450 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 3352 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 154:
-#line 1156 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 149:
+#line 1142 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 		(yyval.function_specifier) = FUNCTION_INLINE;
 	  }
-#line 3458 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 3360 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 155:
-#line 1163 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 150:
+#line 1149 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 		(yyval.symbol) = (yyvsp[0].symbol);
 		gi_source_symbol_merge_type ((yyval.symbol), (yyvsp[-1].ctype));
 	  }
-#line 3467 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 3369 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 157:
-#line 1172 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 152:
+#line 1158 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 		(yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_INVALID, scanner->current_file, lineno);
 		(yyval.symbol)->ident = (yyvsp[0].str);
 	  }
-#line 3476 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 3378 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 158:
-#line 1177 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 153:
+#line 1163 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 		(yyval.symbol) = (yyvsp[-1].symbol);
 	  }
-#line 3484 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 3386 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 159:
-#line 1181 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 154:
+#line 1167 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 		(yyval.symbol) = (yyvsp[-3].symbol);
 		gi_source_symbol_merge_type ((yyval.symbol), gi_source_array_new ((yyvsp[-1].symbol)));
 	  }
-#line 3493 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 3395 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 160:
-#line 1186 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 155:
+#line 1172 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 		(yyval.symbol) = (yyvsp[-2].symbol);
 		gi_source_symbol_merge_type ((yyval.symbol), gi_source_array_new (NULL));
 	  }
-#line 3502 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 3404 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 161:
-#line 1191 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 156:
+#line 1177 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 		GISourceType *func = gi_source_function_new ();
 		// ignore (void) parameter list
@@ -3512,49 +3414,49 @@ yyreduce:
 		(yyval.symbol) = (yyvsp[-3].symbol);
 		gi_source_symbol_merge_type ((yyval.symbol), func);
 	  }
-#line 3516 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 3418 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 162:
-#line 1201 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 157:
+#line 1187 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 		GISourceType *func = gi_source_function_new ();
 		func->child_list = (yyvsp[-1].list);
 		(yyval.symbol) = (yyvsp[-3].symbol);
 		gi_source_symbol_merge_type ((yyval.symbol), func);
 	  }
-#line 3527 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 3429 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 163:
-#line 1208 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 158:
+#line 1194 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 		GISourceType *func = gi_source_function_new ();
 		(yyval.symbol) = (yyvsp[-2].symbol);
 		gi_source_symbol_merge_type ((yyval.symbol), func);
 	  }
-#line 3537 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 3439 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 164:
-#line 1217 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 159:
+#line 1203 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 		(yyval.ctype) = gi_source_pointer_new (NULL);
 		(yyval.ctype)->type_qualifier = (yyvsp[0].type_qualifier);
 	  }
-#line 3546 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 3448 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 165:
-#line 1222 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 160:
+#line 1208 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 		(yyval.ctype) = gi_source_pointer_new (NULL);
 	  }
-#line 3554 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 3456 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 166:
-#line 1226 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 161:
+#line 1212 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 		GISourceType **base = &((yyvsp[0].ctype)->base_type);
 
@@ -3565,11 +3467,11 @@ yyreduce:
 		(*base)->type_qualifier = (yyvsp[-1].type_qualifier);
 		(yyval.ctype) = (yyvsp[0].ctype);
 	  }
-#line 3569 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 3471 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 167:
-#line 1237 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 162:
+#line 1223 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 		GISourceType **base = &((yyvsp[0].ctype)->base_type);
 
@@ -3579,162 +3481,162 @@ yyreduce:
 		*base = gi_source_pointer_new (NULL);
 		(yyval.ctype) = (yyvsp[0].ctype);
 	  }
-#line 3583 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 3485 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 169:
-#line 1251 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 164:
+#line 1237 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 		(yyval.type_qualifier) = (yyvsp[-1].type_qualifier) | (yyvsp[0].type_qualifier);
 	  }
-#line 3591 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 3493 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 170:
-#line 1258 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 165:
+#line 1244 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 		(yyval.list) = g_list_append (NULL, (yyvsp[0].symbol));
 	  }
-#line 3599 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 3501 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 171:
-#line 1262 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 166:
+#line 1248 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 		(yyval.list) = g_list_append ((yyvsp[-2].list), (yyvsp[0].symbol));
 	  }
-#line 3607 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 3509 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 172:
-#line 1269 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 167:
+#line 1255 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 		(yyval.symbol) = (yyvsp[0].symbol);
 		gi_source_symbol_merge_type ((yyval.symbol), (yyvsp[-1].ctype));
 	  }
-#line 3616 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 3518 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 173:
-#line 1274 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 168:
+#line 1260 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 		(yyval.symbol) = (yyvsp[0].symbol);
 		gi_source_symbol_merge_type ((yyval.symbol), (yyvsp[-1].ctype));
 	  }
-#line 3625 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 3527 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 174:
-#line 1279 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 169:
+#line 1265 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 		(yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_INVALID, scanner->current_file, lineno);
 		(yyval.symbol)->base_type = (yyvsp[0].ctype);
 	  }
-#line 3634 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 3536 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 175:
-#line 1284 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 170:
+#line 1270 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 		(yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_ELLIPSIS, scanner->current_file, lineno);
 	  }
-#line 3642 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 3544 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 176:
-#line 1291 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 171:
+#line 1277 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 		GISourceSymbol *sym = gi_source_symbol_new (CSYMBOL_TYPE_INVALID, scanner->current_file, lineno);
 		sym->ident = (yyvsp[0].str);
 		(yyval.list) = g_list_append (NULL, sym);
 	  }
-#line 3652 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 3554 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 177:
-#line 1297 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 172:
+#line 1283 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 		GISourceSymbol *sym = gi_source_symbol_new (CSYMBOL_TYPE_INVALID, scanner->current_file, lineno);
 		sym->ident = (yyvsp[0].str);
 		(yyval.list) = g_list_append ((yyvsp[-2].list), sym);
 	  }
-#line 3662 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 3564 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 180:
-#line 1311 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 175:
+#line 1297 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 		(yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_INVALID, scanner->current_file, lineno);
 		gi_source_symbol_merge_type ((yyval.symbol), (yyvsp[0].ctype));
 	  }
-#line 3671 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 3573 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 182:
-#line 1317 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 177:
+#line 1303 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 		(yyval.symbol) = (yyvsp[0].symbol);
 		gi_source_symbol_merge_type ((yyval.symbol), (yyvsp[-1].ctype));
 	  }
-#line 3680 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 3582 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 183:
-#line 1325 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 178:
+#line 1311 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 		(yyval.symbol) = (yyvsp[-1].symbol);
 	  }
-#line 3688 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 3590 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 184:
-#line 1329 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 179:
+#line 1315 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 		(yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_INVALID, scanner->current_file, lineno);
 		gi_source_symbol_merge_type ((yyval.symbol), gi_source_array_new (NULL));
 	  }
-#line 3697 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 3599 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 185:
-#line 1334 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 180:
+#line 1320 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 		(yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_INVALID, scanner->current_file, lineno);
 		gi_source_symbol_merge_type ((yyval.symbol), gi_source_array_new ((yyvsp[-1].symbol)));
 	  }
-#line 3706 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 3608 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 186:
-#line 1339 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 181:
+#line 1325 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 		(yyval.symbol) = (yyvsp[-2].symbol);
 		gi_source_symbol_merge_type ((yyval.symbol), gi_source_array_new (NULL));
 	  }
-#line 3715 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 3617 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 187:
-#line 1344 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 182:
+#line 1330 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 		(yyval.symbol) = (yyvsp[-3].symbol);
 		gi_source_symbol_merge_type ((yyval.symbol), gi_source_array_new ((yyvsp[-1].symbol)));
 	  }
-#line 3724 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 3626 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 188:
-#line 1349 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 183:
+#line 1335 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 		GISourceType *func = gi_source_function_new ();
 		(yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_INVALID, scanner->current_file, lineno);
 		gi_source_symbol_merge_type ((yyval.symbol), func);
 	  }
-#line 3734 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 3636 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 189:
-#line 1355 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 184:
+#line 1341 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 		GISourceType *func = gi_source_function_new ();
 		// ignore (void) parameter list
@@ -3744,21 +3646,21 @@ yyreduce:
 		(yyval.symbol) = gi_source_symbol_new (CSYMBOL_TYPE_INVALID, scanner->current_file, lineno);
 		gi_source_symbol_merge_type ((yyval.symbol), func);
 	  }
-#line 3748 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 3650 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 190:
-#line 1365 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 185:
+#line 1351 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 		GISourceType *func = gi_source_function_new ();
 		(yyval.symbol) = (yyvsp[-2].symbol);
 		gi_source_symbol_merge_type ((yyval.symbol), func);
 	  }
-#line 3758 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 3660 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 191:
-#line 1371 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 186:
+#line 1357 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 		GISourceType *func = gi_source_function_new ();
 		// ignore (void) parameter list
@@ -3768,35 +3670,35 @@ yyreduce:
 		(yyval.symbol) = (yyvsp[-3].symbol);
 		gi_source_symbol_merge_type ((yyval.symbol), func);
 	  }
-#line 3772 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 3674 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 192:
-#line 1384 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 187:
+#line 1370 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 		(yyval.str) = g_strdup (yytext);
 	  }
-#line 3780 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 3682 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 242:
-#line 1491 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 237:
+#line 1477 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 		(yyval.str) = g_strdup (yytext + strlen ("#define "));
 	  }
-#line 3788 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 3690 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 243:
-#line 1498 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 238:
+#line 1484 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 		(yyval.str) = g_strdup (yytext + strlen ("#define "));
 	  }
-#line 3796 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 3698 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 245:
-#line 1509 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 240:
+#line 1495 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 		if ((yyvsp[0].symbol)->const_int_set || (yyvsp[0].symbol)->const_boolean_set || (yyvsp[0].symbol)->const_double_set || (yyvsp[0].symbol)->const_string != NULL) {
 			GISourceSymbol *macro = gi_source_symbol_copy ((yyvsp[0].symbol));
@@ -3810,85 +3712,85 @@ yyreduce:
 			gi_source_symbol_unref ((yyvsp[0].symbol));
 		}
 	  }
-#line 3814 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 3716 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 246:
-#line 1526 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 241:
+#line 1512 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 		push_conditional (scanner, FOR_GI_SCANNER);
 		update_skipping (scanner);
 	  }
-#line 3823 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 3725 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 247:
-#line 1531 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 242:
+#line 1517 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 		push_conditional (scanner, NOT_GI_SCANNER);
 		update_skipping (scanner);
 	  }
-#line 3832 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 3734 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 248:
-#line 1536 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 243:
+#line 1522 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 	 	warn_if_cond_has_gi_scanner (scanner, yytext);
 		push_conditional (scanner, IRRELEVANT);
 	  }
-#line 3841 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 3743 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 249:
-#line 1541 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 244:
+#line 1527 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 		warn_if_cond_has_gi_scanner (scanner, yytext);
 		push_conditional (scanner, IRRELEVANT);
 	  }
-#line 3850 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 3752 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 250:
-#line 1546 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 245:
+#line 1532 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 		warn_if_cond_has_gi_scanner (scanner, yytext);
 		push_conditional (scanner, IRRELEVANT);
 	  }
-#line 3859 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 3761 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 251:
-#line 1551 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 246:
+#line 1537 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 		warn_if_cond_has_gi_scanner (scanner, yytext);
 		pop_conditional (scanner);
 		push_conditional (scanner, IRRELEVANT);
 		update_skipping (scanner);
 	  }
-#line 3870 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 3772 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 252:
-#line 1558 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 247:
+#line 1544 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 		toggle_conditional (scanner);
 		update_skipping (scanner);
 	  }
-#line 3879 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 3781 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
-  case 253:
-#line 1563 "giscanner/scannerparser.y" /* yacc.c:1646  */
+  case 248:
+#line 1549 "giscanner/scannerparser.y" /* yacc.c:1646  */
     {
 		pop_conditional (scanner);
 		update_skipping (scanner);
 	  }
-#line 3888 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 3790 "giscanner/scannerparser.c" /* yacc.c:1646  */
     break;
 
 
-#line 3892 "giscanner/scannerparser.c" /* yacc.c:1646  */
+#line 3794 "giscanner/scannerparser.c" /* yacc.c:1646  */
       default: break;
     }
   /* User semantic actions sometimes alter yychar, and that requires
@@ -4116,7 +4018,7 @@ yyreturn:
 #endif
   return yyresult;
 }
-#line 1576 "giscanner/scannerparser.y" /* yacc.c:1906  */
+#line 1562 "giscanner/scannerparser.y" /* yacc.c:1906  */
 
 static void
 yyerror (GISourceScanner *scanner, const char *s)
diff --git a/giscanner/scannerparser.h b/giscanner/scannerparser.h
index 23ec535..25e15eb 100644
--- a/giscanner/scannerparser.h
+++ b/giscanner/scannerparser.h
@@ -45,165 +45,155 @@ extern int yydebug;
 # define YYTOKENTYPE
   enum yytokentype
   {
-    IDENTIFIER = 258,
-    TYPEDEF_NAME = 259,
-    INTEGER = 260,
-    FLOATING = 261,
-    BOOLEAN = 262,
-    CHARACTER = 263,
-    STRING = 264,
-    INTL_CONST = 265,
-    INTUL_CONST = 266,
-    ELLIPSIS = 267,
-    ADDEQ = 268,
-    SUBEQ = 269,
-    MULEQ = 270,
-    DIVEQ = 271,
-    MODEQ = 272,
-    XOREQ = 273,
-    ANDEQ = 274,
-    OREQ = 275,
-    SL = 276,
-    SR = 277,
-    SLEQ = 278,
-    SREQ = 279,
-    EQ = 280,
-    NOTEQ = 281,
-    LTEQ = 282,
-    GTEQ = 283,
-    ANDAND = 284,
-    OROR = 285,
-    PLUSPLUS = 286,
-    MINUSMINUS = 287,
-    ARROW = 288,
-    AUTO = 289,
-    BOOL = 290,
+    BASIC_TYPE = 258,
+    IDENTIFIER = 259,
+    TYPEDEF_NAME = 260,
+    INTEGER = 261,
+    FLOATING = 262,
+    BOOLEAN = 263,
+    CHARACTER = 264,
+    STRING = 265,
+    INTL_CONST = 266,
+    INTUL_CONST = 267,
+    ELLIPSIS = 268,
+    ADDEQ = 269,
+    SUBEQ = 270,
+    MULEQ = 271,
+    DIVEQ = 272,
+    MODEQ = 273,
+    XOREQ = 274,
+    ANDEQ = 275,
+    OREQ = 276,
+    SL = 277,
+    SR = 278,
+    SLEQ = 279,
+    SREQ = 280,
+    EQ = 281,
+    NOTEQ = 282,
+    LTEQ = 283,
+    GTEQ = 284,
+    ANDAND = 285,
+    OROR = 286,
+    PLUSPLUS = 287,
+    MINUSMINUS = 288,
+    ARROW = 289,
+    AUTO = 290,
     BREAK = 291,
     CASE = 292,
-    CHAR = 293,
-    CONST = 294,
-    CONTINUE = 295,
-    DEFAULT = 296,
-    DO = 297,
-    DOUBLE = 298,
-    ELSE = 299,
-    ENUM = 300,
-    EXTENSION = 301,
-    EXTERN = 302,
-    FLOAT = 303,
-    FOR = 304,
-    GOTO = 305,
-    IF = 306,
-    INLINE = 307,
-    INT = 308,
-    LONG = 309,
-    REGISTER = 310,
-    RESTRICT = 311,
-    RETURN = 312,
-    SHORT = 313,
-    SIGNED = 314,
-    SIZEOF = 315,
-    STATIC = 316,
-    STRUCT = 317,
-    SWITCH = 318,
-    THREAD_LOCAL = 319,
-    TYPEDEF = 320,
-    UNION = 321,
-    UNSIGNED = 322,
-    VOID = 323,
-    VOLATILE = 324,
-    WHILE = 325,
-    FUNCTION_MACRO = 326,
-    OBJECT_MACRO = 327,
-    IFDEF_GI_SCANNER = 328,
-    IFNDEF_GI_SCANNER = 329,
-    IFDEF_COND = 330,
-    IFNDEF_COND = 331,
-    IF_COND = 332,
-    ELIF_COND = 333,
-    ELSE_COND = 334,
-    ENDIF_COND = 335
+    CONST = 293,
+    CONTINUE = 294,
+    DEFAULT = 295,
+    DO = 296,
+    ELSE = 297,
+    ENUM = 298,
+    EXTENSION = 299,
+    EXTERN = 300,
+    FOR = 301,
+    GOTO = 302,
+    IF = 303,
+    INLINE = 304,
+    REGISTER = 305,
+    RESTRICT = 306,
+    RETURN = 307,
+    SHORT = 308,
+    SIGNED = 309,
+    SIZEOF = 310,
+    STATIC = 311,
+    STRUCT = 312,
+    SWITCH = 313,
+    THREAD_LOCAL = 314,
+    TYPEDEF = 315,
+    UNION = 316,
+    UNSIGNED = 317,
+    VOID = 318,
+    VOLATILE = 319,
+    WHILE = 320,
+    FUNCTION_MACRO = 321,
+    OBJECT_MACRO = 322,
+    IFDEF_GI_SCANNER = 323,
+    IFNDEF_GI_SCANNER = 324,
+    IFDEF_COND = 325,
+    IFNDEF_COND = 326,
+    IF_COND = 327,
+    ELIF_COND = 328,
+    ELSE_COND = 329,
+    ENDIF_COND = 330
   };
 #endif
 /* Tokens.  */
-#define IDENTIFIER 258
-#define TYPEDEF_NAME 259
-#define INTEGER 260
-#define FLOATING 261
-#define BOOLEAN 262
-#define CHARACTER 263
-#define STRING 264
-#define INTL_CONST 265
-#define INTUL_CONST 266
-#define ELLIPSIS 267
-#define ADDEQ 268
-#define SUBEQ 269
-#define MULEQ 270
-#define DIVEQ 271
-#define MODEQ 272
-#define XOREQ 273
-#define ANDEQ 274
-#define OREQ 275
-#define SL 276
-#define SR 277
-#define SLEQ 278
-#define SREQ 279
-#define EQ 280
-#define NOTEQ 281
-#define LTEQ 282
-#define GTEQ 283
-#define ANDAND 284
-#define OROR 285
-#define PLUSPLUS 286
-#define MINUSMINUS 287
-#define ARROW 288
-#define AUTO 289
-#define BOOL 290
+#define BASIC_TYPE 258
+#define IDENTIFIER 259
+#define TYPEDEF_NAME 260
+#define INTEGER 261
+#define FLOATING 262
+#define BOOLEAN 263
+#define CHARACTER 264
+#define STRING 265
+#define INTL_CONST 266
+#define INTUL_CONST 267
+#define ELLIPSIS 268
+#define ADDEQ 269
+#define SUBEQ 270
+#define MULEQ 271
+#define DIVEQ 272
+#define MODEQ 273
+#define XOREQ 274
+#define ANDEQ 275
+#define OREQ 276
+#define SL 277
+#define SR 278
+#define SLEQ 279
+#define SREQ 280
+#define EQ 281
+#define NOTEQ 282
+#define LTEQ 283
+#define GTEQ 284
+#define ANDAND 285
+#define OROR 286
+#define PLUSPLUS 287
+#define MINUSMINUS 288
+#define ARROW 289
+#define AUTO 290
 #define BREAK 291
 #define CASE 292
-#define CHAR 293
-#define CONST 294
-#define CONTINUE 295
-#define DEFAULT 296
-#define DO 297
-#define DOUBLE 298
-#define ELSE 299
-#define ENUM 300
-#define EXTENSION 301
-#define EXTERN 302
-#define FLOAT 303
-#define FOR 304
-#define GOTO 305
-#define IF 306
-#define INLINE 307
-#define INT 308
-#define LONG 309
-#define REGISTER 310
-#define RESTRICT 311
-#define RETURN 312
-#define SHORT 313
-#define SIGNED 314
-#define SIZEOF 315
-#define STATIC 316
-#define STRUCT 317
-#define SWITCH 318
-#define THREAD_LOCAL 319
-#define TYPEDEF 320
-#define UNION 321
-#define UNSIGNED 322
-#define VOID 323
-#define VOLATILE 324
-#define WHILE 325
-#define FUNCTION_MACRO 326
-#define OBJECT_MACRO 327
-#define IFDEF_GI_SCANNER 328
-#define IFNDEF_GI_SCANNER 329
-#define IFDEF_COND 330
-#define IFNDEF_COND 331
-#define IF_COND 332
-#define ELIF_COND 333
-#define ELSE_COND 334
-#define ENDIF_COND 335
+#define CONST 293
+#define CONTINUE 294
+#define DEFAULT 295
+#define DO 296
+#define ELSE 297
+#define ENUM 298
+#define EXTENSION 299
+#define EXTERN 300
+#define FOR 301
+#define GOTO 302
+#define IF 303
+#define INLINE 304
+#define REGISTER 305
+#define RESTRICT 306
+#define RETURN 307
+#define SHORT 308
+#define SIGNED 309
+#define SIZEOF 310
+#define STATIC 311
+#define STRUCT 312
+#define SWITCH 313
+#define THREAD_LOCAL 314
+#define TYPEDEF 315
+#define UNION 316
+#define UNSIGNED 317
+#define VOID 318
+#define VOLATILE 319
+#define WHILE 320
+#define FUNCTION_MACRO 321
+#define OBJECT_MACRO 322
+#define IFDEF_GI_SCANNER 323
+#define IFNDEF_GI_SCANNER 324
+#define IFDEF_COND 325
+#define IFNDEF_COND 326
+#define IF_COND 327
+#define ELIF_COND 328
+#define ELSE_COND 329
+#define ENDIF_COND 330
 
 /* Value type.  */
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
@@ -221,7 +211,7 @@ union YYSTYPE
   FunctionSpecifier function_specifier;
   UnaryOperator unary_operator;
 
-#line 225 "giscanner/scannerparser.h" /* yacc.c:1909  */
+#line 215 "giscanner/scannerparser.h" /* yacc.c:1909  */
 };
 
 typedef union YYSTYPE YYSTYPE;
diff --git a/giscanner/scannerparser.y b/giscanner/scannerparser.y
index abfbe06..9b4e136 100644
--- a/giscanner/scannerparser.y
+++ b/giscanner/scannerparser.y
@@ -245,6 +245,7 @@ set_or_merge_base_type (GISourceType *type,
 %parse-param { GISourceScanner* scanner }
 %lex-param { GISourceScanner* scanner }
 
+%token <str> BASIC_TYPE
 %token <str> IDENTIFIER "identifier"
 %token <str> TYPEDEF_NAME "typedef-name"
 
@@ -254,8 +255,8 @@ set_or_merge_base_type (GISourceType *type,
 %token ELLIPSIS ADDEQ SUBEQ MULEQ DIVEQ MODEQ XOREQ ANDEQ OREQ SL SR
 %token SLEQ SREQ EQ NOTEQ LTEQ GTEQ ANDAND OROR PLUSPLUS MINUSMINUS ARROW
 
-%token AUTO BOOL BREAK CASE CHAR CONST CONTINUE DEFAULT DO DOUBLE ELSE ENUM
-%token EXTENSION EXTERN FLOAT FOR GOTO IF INLINE INT LONG REGISTER RESTRICT
+%token AUTO BREAK CASE CONST CONTINUE DEFAULT DO ELSE ENUM
+%token EXTENSION EXTERN FOR GOTO IF INLINE REGISTER RESTRICT
 %token RETURN SHORT SIGNED SIZEOF STATIC STRUCT SWITCH THREAD_LOCAL TYPEDEF
 %token UNION UNSIGNED VOID VOLATILE WHILE
 
@@ -274,6 +275,7 @@ set_or_merge_base_type (GISourceType *type,
 %type <ctype> struct_or_union_specifier
 %type <ctype> type_specifier
 %type <str> identifier
+%type <str> basic_type
 %type <str> typedef_name
 %type <str> identifier_or_typedef_name
 %type <symbol> abstract_declarator
@@ -877,35 +879,18 @@ storage_class_specifier
 	  }
 	;
 
+basic_type
+	: BASIC_TYPE
+	  {
+		$$ = g_strdup (yytext);
+	  }
+	;
+
 type_specifier
 	: VOID
 	  {
 		$$ = gi_source_type_new (CTYPE_VOID);
 	  }
-	| CHAR
-	  {
-		$$ = gi_source_basic_type_new ("char");
-	  }
-	| SHORT
-	  {
-		$$ = gi_source_basic_type_new ("short");
-	  }
-	| INT
-	  {
-		$$ = gi_source_basic_type_new ("int");
-	  }
-	| LONG
-	  {
-		$$ = gi_source_basic_type_new ("long");
-	  }
-	| FLOAT
-	  {
-		$$ = gi_source_basic_type_new ("float");
-	  }
-	| DOUBLE
-	  {
-		$$ = gi_source_basic_type_new ("double");
-	  }
 	| SIGNED
 	  {
 		$$ = gi_source_basic_type_new ("signed");
@@ -914,9 +899,10 @@ type_specifier
 	  {
 		$$ = gi_source_basic_type_new ("unsigned");
 	  }
-	| BOOL
+	| basic_type
 	  {
-		$$ = gi_source_basic_type_new ("bool");
+		$$ = gi_source_type_new (CTYPE_BASIC_TYPE);
+		$$->name = $1;
 	  }
 	| struct_or_union_specifier
 	| enum_specifier
diff --git a/giscanner/shlibs.py b/giscanner/shlibs.py
index 525bdba..7b7b2d0 100644
--- a/giscanner/shlibs.py
+++ b/giscanner/shlibs.py
@@ -49,19 +49,17 @@ def _resolve_libtool(options, binary, libraries):
 #  libpangoft2-1.0.so.0 => /usr/lib/libpangoft2-1.0.so.0 (0x006c1000)
 #
 # We say that if something in the output looks like libpangoft2<blah>
-# then the *first* such in the output is the soname. We require <blah>
-# to start with [^A-Za-z0-9_-] to avoid problems with libpango vs libpangoft2
-#
-# The negative lookbehind at the start is to avoid problems if someone
-# is crazy enough to name a library liblib<foo> when lib<foo> exists.
-#
-# Match absolute paths on OS X to conform to how libraries are usually
-# referenced on OS X systems.
+# then the *first* such in the output is the soname.
 def _ldd_library_pattern(library_name):
-    pattern = "(?<![A-Za-z0-9_-])(lib*%s[^A-Za-z0-9_-][^\s\(\)]*)"
-    if platform.system() == 'Darwin':
-        pattern = "([^\s]*lib*%s[^A-Za-z0-9_-][^\s\(\)]*)"
-    return re.compile(pattern % re.escape(library_name))
+    return re.compile(r"""^
+    # Require trailing slash to avoid matching liblibfoo when looking for libfoo.
+    (.*[/])?
+    lib%s
+    # Prohibit library name characters to avoid matching libpangoft2 when looking for libpango.
+    [^/A-Za-z0-9_-]
+    # Anything but the path separator to avoid matching directories.
+    [^/]*
+    $""" % re.escape(library_name), re.VERBOSE)
 
 
 # This is a what we do for non-la files. We assume that we are on an
@@ -96,8 +94,7 @@ def _resolve_non_libtool(options, binary, libraries):
 
     if host_os() == 'nt':
         cc = CCompiler()
-        shlibs = cc.resolve_windows_libs(libraries, options)
-
+        return cc.resolve_windows_libs(libraries, options)
     else:
         args = []
         libtool = get_libtool_command(options)
@@ -109,31 +106,43 @@ def _resolve_non_libtool(options, binary, libraries):
             args.extend(['otool', '-L', binary.args[0]])
         else:
             args.extend(['ldd', binary.args[0]])
-        proc = subprocess.Popen(args, stdout=subprocess.PIPE)
-        patterns = {}
-        for library in libraries:
-            patterns[library] = _ldd_library_pattern(library)
-
-        shlibs = []
-        for line in proc.stdout:
-            line = line.decode('ascii')
-            # ldd on *BSD show the argument passed on the first line even if
-            # there is only one argument. We have to ignore it because it is
-            # possible for the name of the binary to match _ldd_library_pattern.
-            if line == binary.args[0] + ':\n':
-                continue
+        output = subprocess.check_output(args)
+        if isinstance(output, bytes):
+            output = output.decode("utf-8", "replace")
+
+        # Use absolute paths on OS X to conform to how libraries are usually
+        # referenced on OS X systems, and file names everywhere else.
+        basename = platform.system() != 'Darwin'
+        return resolve_from_ldd_output(libraries, output, basename=basename)
+
+
+def resolve_from_ldd_output(libraries, output, basename=False):
+    patterns = {}
+    for library in libraries:
+        patterns[library] = _ldd_library_pattern(library)
+
+    shlibs = []
+    for line in output.splitlines():
+        # ldd on *BSD show the argument passed on the first line even if
+        # there is only one argument. We have to ignore it because it is
+        # possible for the name of the binary to match _ldd_library_pattern.
+        if line.endswith(':'):
+            continue
+        for word in line.split():
             for library, pattern in patterns.items():
-                m = pattern.search(line)
+                m = pattern.match(word)
                 if m:
                     del patterns[library]
-                    shlibs.append(m.group(1))
+                    shlibs.append(m.group())
                     break
 
-        if len(patterns) > 0:
-            raise SystemExit(
-                "ERROR: can't resolve libraries to shared libraries: " +
-                ", ".join(patterns.keys()))
+    if len(patterns) > 0:
+        raise SystemExit(
+            "ERROR: can't resolve libraries to shared libraries: " +
+            ", ".join(patterns.keys()))
 
+    if basename:
+        shlibs = list(map(os.path.basename, shlibs))
     return shlibs
 
 
diff --git a/giscanner/sourcescanner.c b/giscanner/sourcescanner.c
index 8c40017..464e469 100644
--- a/giscanner/sourcescanner.c
+++ b/giscanner/sourcescanner.c
@@ -39,7 +39,7 @@ void
 ctype_free (GISourceType * type)
 {
   g_free (type->name);
-  g_list_foreach (type->child_list, (GFunc)gi_source_symbol_unref, NULL);
+  g_list_foreach (type->child_list, (GFunc)(void *)gi_source_symbol_unref, NULL);
   g_list_free (type->child_list);
   g_slice_free (GISourceType, type);
 }
@@ -242,9 +242,9 @@ gi_source_scanner_free (GISourceScanner *scanner)
   g_hash_table_destroy (scanner->typedef_table);
   g_hash_table_destroy (scanner->const_table);
 
-  g_slist_foreach (scanner->comments, (GFunc)gi_source_comment_free, NULL);
+  g_slist_foreach (scanner->comments, (GFunc)(void *)gi_source_comment_free, NULL);
   g_slist_free (scanner->comments);
-  g_slist_foreach (scanner->symbols, (GFunc)gi_source_symbol_unref, NULL);
+  g_slist_foreach (scanner->symbols, (GFunc)(void *)gi_source_symbol_unref, NULL);
   g_slist_free (scanner->symbols);
 
   g_hash_table_unref (scanner->files);
diff --git a/giscanner/transformer.py b/giscanner/transformer.py
index 81b4d0a..1a27aa3 100644
--- a/giscanner/transformer.py
+++ b/giscanner/transformer.py
@@ -50,7 +50,7 @@ class Transformer(object):
     namespace = property(lambda self: self._namespace)
 
     def __init__(self, namespace, accept_unprefixed=False,
-                 identifier_filter_cmd='', symbol_filter_cmd=''):
+                 identifier_filter_cmd=None, symbol_filter_cmd=None):
         self._cachestore = CacheStore()
         self._accept_unprefixed = accept_unprefixed
         self._namespace = namespace
@@ -259,14 +259,14 @@ currently-scanned namespace is first."""
             proc = subprocess.Popen(self._symbol_filter_cmd,
                                     stdin=subprocess.PIPE,
                                     stdout=subprocess.PIPE,
-                                    stderr=subprocess.PIPE,
-                                    shell=True)
+                                    stderr=subprocess.PIPE)
             _name = name
             proc_name, err = proc.communicate(name.encode())
             if proc.returncode:
-                raise ValueError('filter: "%s" exited: %d with error: %s' %
+                raise ValueError('filter: %r exited: %d with error: %s' %
                                  (self._symbol_filter_cmd, proc.returncode, err))
             name = proc_name.decode('ascii')
+            name = name.strip()
 
         matches = []  # Namespaces which might contain this name
         unprefixed_namespaces = []  # Namespaces with no prefix, last resort
@@ -325,13 +325,12 @@ raise ValueError."""
             proc = subprocess.Popen(self._identifier_filter_cmd,
                                     stdin=subprocess.PIPE,
                                     stdout=subprocess.PIPE,
-                                    stderr=subprocess.PIPE,
-                                    shell=True)
+                                    stderr=subprocess.PIPE)
             proc_ident, err = proc.communicate(ident.encode())
             if proc.returncode:
-                raise ValueError('filter: "%s" exited: %d with error: %s' %
+                raise ValueError('filter: %r exited: %d with error: %s' %
                                  (self._identifier_filter_cmd, proc.returncode, err))
-            ident = proc_ident.decode('ascii')
+            ident = proc_ident.decode('ascii').strip()
 
         hidden = ident.startswith('_')
         if hidden:
@@ -455,7 +454,7 @@ raise ValueError."""
         func.add_symbol_reference(symbol)
         return func
 
-    def _create_source_type(self, source_type):
+    def _create_source_type(self, source_type, is_parameter=False):
         assert source_type is not None
         if source_type.type == CTYPE_VOID:
             value = 'void'
@@ -463,15 +462,19 @@ raise ValueError."""
             value = source_type.name
         elif source_type.type == CTYPE_TYPEDEF:
             value = source_type.name
+        elif (source_type.type == CTYPE_POINTER or
+                # Array to pointer adjustment as per 6.7.6.3.
+                # This is performed only on the outermost array,
+                # so we don't forward is_parameter.
+                (source_type.type == CTYPE_ARRAY and is_parameter)):
+            value = self._create_source_type(source_type.base_type) + '*'
         elif source_type.type == CTYPE_ARRAY:
             return self._create_source_type(source_type.base_type)
-        elif source_type.type == CTYPE_POINTER:
-            value = self._create_source_type(source_type.base_type) + '*'
         else:
             value = 'gpointer'
         return value
 
-    def _create_complete_source_type(self, source_type):
+    def _create_complete_source_type(self, source_type, is_parameter=False):
         assert source_type is not None
 
         const = (source_type.type_qualifier & TYPE_QUALIFIER_CONST)
@@ -491,16 +494,21 @@ raise ValueError."""
                 value = 'const ' + value
             if volatile:
                 value = 'volatile ' + value
-        elif source_type.type == CTYPE_ARRAY:
-            return self._create_complete_source_type(source_type.base_type)
-        elif source_type.type == CTYPE_POINTER:
+            return value
+        elif (source_type.type == CTYPE_POINTER or
+                # Array to pointer adjustment as per 6.7.6.3.
+                # This is performed only on the outermost array,
+                # so we don't forward is_parameter.
+                (source_type.type == CTYPE_ARRAY and is_parameter)):
             value = self._create_complete_source_type(source_type.base_type) + '*'
             # TODO: handle pointer to function as a special case?
             if const:
                 value += ' const'
             if volatile:
                 value += ' volatile'
-
+            return value
+        elif source_type.type == CTYPE_ARRAY:
+            return self._create_complete_source_type(source_type.base_type)
         else:
             if const:
                 value = 'gconstpointer'
@@ -510,8 +518,6 @@ raise ValueError."""
                 value = 'volatile ' + value
             return value
 
-        return value
-
     def _create_parameters(self, symbol, base_type):
         for i, child in enumerate(base_type.child_list):
             yield self._create_parameter(symbol, i, child)
@@ -651,8 +657,8 @@ raise ValueError."""
         return canonical
 
     def _create_type_from_base(self, source_type, is_parameter=False, is_return=False):
-        ctype = self._create_source_type(source_type)
-        complete_ctype = self._create_complete_source_type(source_type)
+        ctype = self._create_source_type(source_type, is_parameter=is_parameter)
+        complete_ctype = self._create_complete_source_type(source_type, is_parameter=is_parameter)
         const = ((source_type.type == CTYPE_POINTER) and
                  (source_type.base_type.type_qualifier & TYPE_QUALIFIER_CONST))
         return self.create_type_from_ctype_string(ctype, is_const=const,
@@ -668,9 +674,12 @@ raise ValueError."""
                 name = base
             return ast.List(name, ast.TYPE_ANY, ctype=ctype,
                         is_const=is_const, complete_ctype=complete_ctype)
-        elif base in ('GArray', 'GPtrArray', 'GByteArray',
-                      'GLib.Array', 'GLib.PtrArray', 'GLib.ByteArray',
-                      'GObject.Array', 'GObject.PtrArray', 'GObject.ByteArray'):
+        elif base in ('GByteArray', 'GLib.ByteArray', 'GObject.ByteArray'):
+            return ast.Array('GLib.ByteArray', ast.TYPE_UINT8, ctype=ctype,
+                         is_const=is_const, complete_ctype=complete_ctype)
+        elif base in ('GArray', 'GPtrArray',
+                      'GLib.Array', 'GLib.PtrArray',
+                      'GObject.Array', 'GObject.PtrArray'):
             if '.' in base:
                 name = 'GLib.' + base.split('.', 1)[1]
             else:
@@ -688,6 +697,15 @@ raise ValueError."""
         canonical = self._canonicalize_ctype(ctype)
         base = canonical.replace('*', '')
 
+        # While gboolean and _Bool are distinct types, they used to be treated
+        # by scanner as exactly the same one. In general this is incorrect
+        # because of different ABI, but this usually works fine,
+        # so for backward compatibility lets continue for now:
+        # https://gitlab.gnome.org/GNOME/gobject-introspection/merge_requests/24#note_92792
+        if canonical == '_Bool':
+            canonical = 'gboolean'
+            base = canonical
+
         # Special default: char ** -> ast.Array, same for GStrv
         if (is_return and canonical == 'utf8*') or base == 'GStrv':
             bare_utf8 = ast.TYPE_STRING.clone()
diff --git a/giscanner/utils.py b/giscanner/utils.py
index 09132b2..f6cd0b4 100644
--- a/giscanner/utils.py
+++ b/giscanner/utils.py
@@ -27,6 +27,8 @@ import re
 import os
 import subprocess
 import platform
+import shutil
+import time
 
 
 _debugflags = None
@@ -291,3 +293,26 @@ def get_system_data_dirs():
         xdg_data_dirs.append('/usr/share')
 
     return xdg_data_dirs
+
+
+def rmtree(*args, **kwargs):
+    '''
+    A variant of shutil.rmtree() which waits and tries again in case one of
+    the files in the directory tree can't be deleted.
+
+    This can be the case if a file is still in use by some process,
+    for example a Virus scanner on Windows scanning .exe files when they are
+    created.
+    '''
+
+    tries = 3
+    for i in range(1, tries + 1):
+        try:
+            shutil.rmtree(*args, **kwargs)
+        except OSError:
+            if i == tries:
+                raise
+            time.sleep(i)
+            continue
+        else:
+            return
diff --git a/giscanner/xmlwriter.py b/giscanner/xmlwriter.py
index 54419f7..a65fc40 100755
--- a/giscanner/xmlwriter.py
+++ b/giscanner/xmlwriter.py
@@ -28,9 +28,7 @@ import os
 import sys
 
 from contextlib import contextmanager
-from xml.sax.saxutils import escape
-
-from .libtoolimporter import LibtoolImporter
+from xml.sax.saxutils import escape, quoteattr
 
 if sys.version_info.major < 3:
     from StringIO import StringIO
@@ -39,11 +37,43 @@ else:
     unicode = str
 
 
-with LibtoolImporter(None, None):
-    if 'UNINSTALLED_INTROSPECTION_SRCDIR' in os.environ:
-        from _giscanner import collect_attributes
+def _calc_attrs_length(attributes, indent, self_indent):
+    if indent == -1:
+        return -1
+    attr_length = 0
+    for attr, value in attributes:
+        # FIXME: actually, if we have attributes with None as value this
+        # should be considered a bug and raise an error. We are just
+        # ignoring them here while we fix GIRParser to create the right
+        # ast with the correct attributes.
+        if value is None:
+            continue
+        attr_length += 2 + len(attr) + len(quoteattr(value))
+    return attr_length + indent + self_indent
+
+
+def collect_attributes(tag_name, attributes, self_indent, self_indent_char, indent=-1):
+    if not attributes:
+        return ''
+    if _calc_attrs_length(attributes, indent, self_indent) > 79:
+        indent_len = self_indent + len(tag_name) + 1
     else:
-        from giscanner._giscanner import collect_attributes
+        indent_len = 0
+    first = True
+    attr_value = ''
+    for attr, value in attributes:
+        # FIXME: actually, if we have attributes with None as value this
+        # should be considered a bug and raise an error. We are just
+        # ignoring them here while we fix GIRParser to create the right
+        # ast with the correct attributes.
+        if value is None:
+            continue
+        if indent_len and not first:
+            attr_value += '\n%s' % (self_indent_char * indent_len)
+        attr_value += ' %s=%s' % (attr, quoteattr(value))
+        if first:
+            first = False
+    return attr_value
 
 
 def build_xml_tag(tag_name, attributes=None, data=None, self_indent=0,
@@ -149,27 +179,3 @@ class XMLWriter(object):
             yield
         finally:
             self.pop_tag()
-
-
-def test():
-    w = XMLWriter()
-    w.push_tag('repository')
-    w.push_tag('namespace')
-    w.push_tag('enumeration')
-    w.push_tag('member',
-               [('name', 'west'),
-                ('value', '7'),
-                ('c:identifier', 'GTK_ANCHOR_WEST'),
-                ('glib:nick', 'west')])
-
-    w.pop_tag()
-    w.pop_tag()
-    w.pop_tag()
-    x = w.get_xml()
-    lines = x.split('\n')
-    import pprint
-    pprint.pprint(lines)
-    assert len(lines[3]) < 80, len(lines[3])
-
-if __name__ == '__main__':
-    test()
diff --git a/gobject-introspection-1.0.pc b/gobject-introspection-1.0.pc
index 9a1e74c..1adf41d 100644
--- a/gobject-introspection-1.0.pc
+++ b/gobject-introspection-1.0.pc
@@ -21,4 +21,4 @@ Libs.private:
 
 Name: gobject-introspection
 Description: GObject Introspection
-Version: 1.56.1
+Version: 1.57.2
diff --git a/gobject-introspection-no-export-1.0.pc b/gobject-introspection-no-export-1.0.pc
index 7f9fa2b..653ca96 100644
--- a/gobject-introspection-no-export-1.0.pc
+++ b/gobject-introspection-no-export-1.0.pc
@@ -20,4 +20,4 @@ Libs.private:
 
 Name: gobject-introspection
 Description: GObject Introspection
-Version: 1.56.1
+Version: 1.57.2
diff --git a/gtk-doc.make b/gtk-doc.make
index f87eaab..7d9a27f 100644
--- a/gtk-doc.make
+++ b/gtk-doc.make
@@ -212,6 +212,7 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) $(expand_con
 	for file in $(HTML_IMAGES) ; do \
 	  test -f $(abs_srcdir)/$$file && cp $(abs_srcdir)/$$file $(abs_builddir)/html; \
 	  test -f $(abs_builddir)/$$file && cp $(abs_builddir)/$$file $(abs_builddir)/html; \
+	  test -f $$file && cp $$file $(abs_builddir)/html; \
 	done;
 	$(GTK_DOC_V_XREF)gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
 	$(AM_V_at)touch html-build.stamp
diff --git a/m4/python.m4 b/m4/python.m4
index ed5559d..451fd74 100644
--- a/m4/python.m4
+++ b/m4/python.m4
@@ -64,7 +64,7 @@ AC_DEFUN([AM_CHECK_PYTHON_LIBS],
 AC_MSG_CHECKING(for libraries required to link against libpython)
 dnl deduce PYTHON_LIBS
 if test "x$PYTHON_LIBS" = x; then
-	PYTHON_LIBS=`$PYTHON-config --ldflags --libs`
+	PYTHON_LIBS=`$PYTHON-config --ldflags`
 fi
 AC_SUBST(PYTHON_LIBS)
 dnl check if libpython exist:
diff --git a/meson.build b/meson.build
new file mode 100644
index 0000000..1a4761f
--- /dev/null
+++ b/meson.build
@@ -0,0 +1,127 @@
+project('gobject-introspection', 'c',
+  version: '1.57.2',
+  meson_version: '>= 0.46.0',
+  default_options: [
+    'warning_level=1',
+    'buildtype=debugoptimized',
+  ],
+)
+
+host_system = host_machine.system()
+gi_versions = meson.project_version().split('.')
+
+configinc = include_directories('.')
+
+pymod = import('python')
+python = pymod.find_installation(get_option('python'))
+
+cc = meson.get_compiler('c')
+config = configuration_data()
+config.set_quoted('GIR_SUFFIX', 'gir-1.0')
+config.set_quoted('GIR_DIR', join_paths(get_option('prefix'), get_option('datadir'), 'gir-1.0'))
+config.set_quoted('GOBJECT_INTROSPECTION_LIBDIR', join_paths(get_option('prefix'), get_option('libdir')))
+
+foreach type : ['char', 'short', 'int', 'long']
+  size = cc.sizeof(type)
+  if size == -1
+    error('Failed to get size of @0@'.format(type))
+  endif
+  config.set('SIZEOF_@0@'.format(type.to_upper()), size)
+endforeach
+
+add_project_arguments(['-DHAVE_CONFIG_H'], language: 'c')
+
+gi_hidden_visibility_cflags = []
+if host_system == 'windows'
+  config.set('DLL_EXPORT', true)
+  config.set('_GI_EXTERN', '__declspec(dllexport) extern')
+  if cc.get_id() != 'msvc'
+    gi_hidden_visibility_cflags += '-fvisibility=hidden'
+  endif
+else
+  config.set('_GI_EXTERN', '__attribute__((visibility("default"))) extern')
+  gi_hidden_visibility_cflags += '-fvisibility=hidden'
+endif
+
+configure_file(
+  configuration: config,
+  output: 'config.h'
+)
+
+# FIXME: Always bumped to match our version
+#glib_version = '>=2.@0@.@1@'.format(gi_versions[1], gi_versions[2])
+glib_version = '>= 2.57.2'
+
+glib_dep = dependency('glib-2.0', version : glib_version,
+  fallback: ['glib', 'libglib_dep'])
+gobject_dep = dependency('gobject-2.0', version : glib_version,
+  fallback: ['glib', 'libgobject_dep'])
+gio_dep = dependency('gio-2.0', version : glib_version,
+  fallback: ['glib', 'libgio_dep'])
+gmodule_dep = dependency('gmodule-2.0', version : glib_version,
+  fallback: ['glib', 'libgmodule_dep'])
+if host_system != 'windows'
+  giounix_dep = dependency('gio-unix-2.0', version : glib_version,
+    fallback: ['glib', 'libgiounix_dep'])
+else
+  # Don't even try to look for gio-unix-2.0 on Windows because Meson will
+  # fruitlessly try to find it in the glib subproject even when we don't want
+  # it to look in the subproject at all. Just use a not-found dependency.
+  giounix_dep = dependency('', required : false)
+  # XXX: Autotools doesn't build girs for gio-win32-2.0, but maybe we should?
+endif
+libffi_dep = dependency('libffi',
+  fallback : ['libffi', 'ffi_dep'])
+
+subdir('girepository')
+subdir('tools')
+subdir('giscanner')
+subdir('gir')
+subdir('examples')
+subdir('docs')
+subdir('tests')
+
+install_data('Makefile.introspection', install_dir: join_paths(get_option('datadir'), 'gobject-introspection-1.0'))
+install_data('m4/introspection.m4', install_dir: join_paths(get_option('datadir'), 'aclocal'))
+
+prefix = get_option('prefix')
+pkgconfig_conf = configuration_data()
+pkgconfig_conf.set('prefix', prefix)
+pkgconfig_conf.set('exec_prefix', '${prefix}')
+pkgconfig_conf.set('bindir', join_paths('${prefix}', get_option('bindir')))
+pkgconfig_conf.set('libdir', join_paths('${prefix}', get_option('libdir')))
+pkgconfig_conf.set('datarootdir', join_paths('${prefix}', get_option('datadir')))
+pkgconfig_conf.set('datadir', '${datarootdir}')
+pkgconfig_conf.set('includedir', join_paths('${prefix}', get_option('includedir')))
+if host_system == 'windows' or host_system == 'cygwin'
+  pkgconfig_conf.set('EXEEXT', '.exe')
+else
+  pkgconfig_conf.set('EXEEXT', '')
+endif
+pkgconfig_conf.set('VERSION', meson.project_version())
+pkgconfig_conf.set('FFI_PC_PACKAGES', 'libffi')
+if libffi_dep.type_name() == 'pkgconfig'
+  pkgconfig_conf.set('FFI_PC_CFLAGS', libffi_dep.get_pkgconfig_variable('Cflags'))
+  pkgconfig_conf.set('FFI_PC_LIBS', libffi_dep.get_pkgconfig_variable('Libs'))
+else
+  # XXX: We can't know the correct values for these, needs meson API. Maybe we
+  # should use meson's pkgconfig module to generate the whole file.
+  pkgconfig_conf.set('FFI_PC_CFLAGS', '')
+  pkgconfig_conf.set('FFI_PC_LIBS', '-lffi')
+endif
+
+configure_file(
+  input: 'gobject-introspection-no-export-1.0.pc.in',
+  output: 'gobject-introspection-no-export-1.0.pc',
+  configuration: pkgconfig_conf,
+  install: true,
+  install_dir: join_paths(get_option('libdir'), 'pkgconfig'),
+)
+
+configure_file(
+  input: 'gobject-introspection-1.0.pc.in',
+  output: 'gobject-introspection-1.0.pc',
+  configuration: pkgconfig_conf,
+  install: true,
+  install_dir: join_paths(get_option('libdir'), 'pkgconfig'),
+)
diff --git a/meson_options.txt b/meson_options.txt
new file mode 100644
index 0000000..49726be
--- /dev/null
+++ b/meson_options.txt
@@ -0,0 +1,23 @@
+option('cairo', type: 'boolean', value : false,
+  description: 'Use cairo for tests'
+)
+
+option('doctool', type: 'boolean', value : true,
+  description: 'Install g-ir-doc-tool'
+)
+
+option('glib-src-dir', type: 'string',
+  description: 'Source directory for glib - needed to add docs to gir'
+)
+
+option('gtk-doc', type: 'boolean', value: false,
+  description: 'Build and install documentation'
+)
+
+option('cairo-libname', type: 'string',
+  description: 'Custom name for the cairo-gobject library name'
+)
+
+option('python', type: 'string', value: 'python3',
+  description: 'Path or name of the Python interpreter to build for'
+)
diff --git a/tests/Makefile.am b/tests/Makefile.am
index bdd0fa7..4bdb9c3 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -6,9 +6,6 @@ EXTRA_DIST=
 BUILT_SOURCES=
 CLEANFILES=
 
-AM_CFLAGS = $(GOBJECT_CFLAGS) $(GI_HIDDEN_VISIBILITY_CFLAGS) -I$(srcdir)
-LIBADD = $(GOBJECT_LIBS)
-
 testsdir = $(datadir)/gobject-introspection-1.0/tests
 tests_DATA =		    \
     everything.c	    \
@@ -20,12 +17,20 @@ tests_DATA =		    \
 EXTRA_LTLIBRARIES = libeverything-1.0.la libgimarshallingtests-1.0.la
 
 libeverything_1_0_la_SOURCES = everything.c
+libeverything_1_0_la_CFLAGS = $(GOBJECT_CFLAGS) $(GI_HIDDEN_VISIBILITY_CFLAGS) $(WARN_CFLAGS) -I$(srcdir)
+libeverything_1_0_la_LDFLAGS = $(WARN_LDFLAGS)
+libeverything_1_0_la_LIBADD = $(GOBJECT_LIBS)
+
 libgimarshallingtests_1_0_la_SOURCES = gimarshallingtests.c
+libgimarshallingtests_1_0_la_CFLAGS = $(GOBJECT_CFLAGS) $(GI_HIDDEN_VISIBILITY_CFLAGS) $(WARN_CFLAGS) -I$(srcdir)
+libgimarshallingtests_1_0_la_LDFLAGS = $(WARN_LDFLAGS)
+libgimarshallingtests_1_0_la_LIBADD = $(GOBJECT_LIBS)
 
 EXTRA_DIST += \
 	gimarshallingtests.h \
 	gi-tester \
-	gitestmacros.h
+	gitestmacros.h \
+	meson.build
 
 BUILT_SOURCES += everything.c everything.h
 
@@ -74,4 +79,4 @@ GIMarshallingTests-1.0.gir: libgimarshallingtests-1.0.la Makefile
 	$(AM_V_GEN) $(INTROSPECTION_COMPILER) $(INTROSPECTION_COMPILER_ARGS) $< -o $@
 
 TESTS=Everything-1.0.typelib GIMarshallingTests-1.0.typelib
-LOG_COMPILER=$(srcdir)/gi-tester
+LOG_COMPILER=$(PYTHON) $(srcdir)/gi-tester
diff --git a/tests/Makefile.in b/tests/Makefile.in
index af04c46..b561582 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -110,17 +110,27 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
-libeverything_1_0_la_LIBADD =
-am_libeverything_1_0_la_OBJECTS = everything.lo
+am__DEPENDENCIES_1 =
+libeverything_1_0_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+am_libeverything_1_0_la_OBJECTS = libeverything_1_0_la-everything.lo
 libeverything_1_0_la_OBJECTS = $(am_libeverything_1_0_la_OBJECTS)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
 am__v_lt_1 = 
-libgimarshallingtests_1_0_la_LIBADD =
-am_libgimarshallingtests_1_0_la_OBJECTS = gimarshallingtests.lo
+libeverything_1_0_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(libeverything_1_0_la_CFLAGS) $(CFLAGS) \
+	$(libeverything_1_0_la_LDFLAGS) $(LDFLAGS) -o $@
+libgimarshallingtests_1_0_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+am_libgimarshallingtests_1_0_la_OBJECTS =  \
+	libgimarshallingtests_1_0_la-gimarshallingtests.lo
 libgimarshallingtests_1_0_la_OBJECTS =  \
 	$(am_libgimarshallingtests_1_0_la_OBJECTS)
+libgimarshallingtests_1_0_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(libgimarshallingtests_1_0_la_CFLAGS) $(CFLAGS) \
+	$(libgimarshallingtests_1_0_la_LDFLAGS) $(LDFLAGS) -o $@
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
 am__v_P_0 = false
@@ -546,6 +556,7 @@ PYTHON_INCLUDES = @PYTHON_INCLUDES@
 PYTHON_LIBS = @PYTHON_LIBS@
 PYTHON_PLATFORM = @PYTHON_PLATFORM@
 PYTHON_PREFIX = @PYTHON_PREFIX@
+PYTHON_SO = @PYTHON_SO@
 PYTHON_VERSION = @PYTHON_VERSION@
 RANLIB = @RANLIB@
 SCANNER_CFLAGS = @SCANNER_CFLAGS@
@@ -555,6 +566,11 @@ SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
+WARN_CFLAGS = @WARN_CFLAGS@
+WARN_CFLAGS_FLEX = @WARN_CFLAGS_FLEX@
+WARN_CFLAGS_PYTHON = @WARN_CFLAGS_PYTHON@
+WARN_LDFLAGS = @WARN_LDFLAGS@
+WARN_SCANNERFLAGS = @WARN_SCANNERFLAGS@
 YACC = @YACC@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
@@ -663,13 +679,11 @@ INTROSPECTION_DOCTOOL_ARGS = \
     --add-include-path=$(top_builddir)/gir
 
 SUBDIRS = . scanner repository offsets warn
-EXTRA_DIST = gimarshallingtests.h gi-tester gitestmacros.h
+EXTRA_DIST = gimarshallingtests.h gi-tester gitestmacros.h meson.build
 BUILT_SOURCES = everything.c everything.h
 CLEANFILES = $(BUILT_SOURCES) $(EXTRA_LTLIBRARIES) everything-stamp.h \
 	Everything-1.0.gir Everything-1.0.typelib \
 	GIMarshallingTests-1.0.gir GIMarshallingTests-1.0.typelib
-AM_CFLAGS = $(GOBJECT_CFLAGS) $(GI_HIDDEN_VISIBILITY_CFLAGS) -I$(srcdir)
-LIBADD = $(GOBJECT_LIBS)
 testsdir = $(datadir)/gobject-introspection-1.0/tests
 tests_DATA = \
     everything.c	    \
@@ -680,9 +694,15 @@ tests_DATA = \
 
 EXTRA_LTLIBRARIES = libeverything-1.0.la libgimarshallingtests-1.0.la
 libeverything_1_0_la_SOURCES = everything.c
+libeverything_1_0_la_CFLAGS = $(GOBJECT_CFLAGS) $(GI_HIDDEN_VISIBILITY_CFLAGS) $(WARN_CFLAGS) -I$(srcdir)
+libeverything_1_0_la_LDFLAGS = $(WARN_LDFLAGS)
+libeverything_1_0_la_LIBADD = $(GOBJECT_LIBS)
 libgimarshallingtests_1_0_la_SOURCES = gimarshallingtests.c
+libgimarshallingtests_1_0_la_CFLAGS = $(GOBJECT_CFLAGS) $(GI_HIDDEN_VISIBILITY_CFLAGS) $(WARN_CFLAGS) -I$(srcdir)
+libgimarshallingtests_1_0_la_LDFLAGS = $(WARN_LDFLAGS)
+libgimarshallingtests_1_0_la_LIBADD = $(GOBJECT_LIBS)
 TESTS = Everything-1.0.typelib GIMarshallingTests-1.0.typelib
-LOG_COMPILER = $(srcdir)/gi-tester
+LOG_COMPILER = $(PYTHON) $(srcdir)/gi-tester
 all: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
@@ -720,10 +740,10 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 $(am__aclocal_m4_deps):
 
 libeverything-1.0.la: $(libeverything_1_0_la_OBJECTS) $(libeverything_1_0_la_DEPENDENCIES) $(EXTRA_libeverything_1_0_la_DEPENDENCIES) 
-	$(AM_V_CCLD)$(LINK)  $(libeverything_1_0_la_OBJECTS) $(libeverything_1_0_la_LIBADD) $(LIBS)
+	$(AM_V_CCLD)$(libeverything_1_0_la_LINK)  $(libeverything_1_0_la_OBJECTS) $(libeverything_1_0_la_LIBADD) $(LIBS)
 
 libgimarshallingtests-1.0.la: $(libgimarshallingtests_1_0_la_OBJECTS) $(libgimarshallingtests_1_0_la_DEPENDENCIES) $(EXTRA_libgimarshallingtests_1_0_la_DEPENDENCIES) 
-	$(AM_V_CCLD)$(LINK)  $(libgimarshallingtests_1_0_la_OBJECTS) $(libgimarshallingtests_1_0_la_LIBADD) $(LIBS)
+	$(AM_V_CCLD)$(libgimarshallingtests_1_0_la_LINK)  $(libgimarshallingtests_1_0_la_OBJECTS) $(libgimarshallingtests_1_0_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -731,8 +751,8 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/everything.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimarshallingtests.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libeverything_1_0_la-everything.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgimarshallingtests_1_0_la-gimarshallingtests.Plo@am__quote@
 
 .c.o:
 @am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
@@ -758,6 +778,20 @@ distclean-compile:
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
+libeverything_1_0_la-everything.lo: everything.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libeverything_1_0_la_CFLAGS) $(CFLAGS) -MT libeverything_1_0_la-everything.lo -MD -MP -MF $(DEPDIR)/libeverything_1_0_la-everything.Tpo -c -o libeverything_1_0_la-everything.lo `test -f 'everything.c' || echo '$(srcdir)/'`everything.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libeverything_1_0_la-everything.Tpo $(DEPDIR)/libeverything_1_0_la-everything.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='everything.c' object='libeverything_1_0_la-everything.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libeverything_1_0_la_CFLAGS) $(CFLAGS) -c -o libeverything_1_0_la-everything.lo `test -f 'everything.c' || echo '$(srcdir)/'`everything.c
+
+libgimarshallingtests_1_0_la-gimarshallingtests.lo: gimarshallingtests.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgimarshallingtests_1_0_la_CFLAGS) $(CFLAGS) -MT libgimarshallingtests_1_0_la-gimarshallingtests.lo -MD -MP -MF $(DEPDIR)/libgimarshallingtests_1_0_la-gimarshallingtests.Tpo -c -o libgimarshallingtests_1_0_la-gimarshallingtests.lo `test -f 'gimarshallingtests.c' || echo '$(srcdir)/'`gimarshallingtests.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libgimarshallingtests_1_0_la-gimarshallingtests.Tpo $(DEPDIR)/libgimarshallingtests_1_0_la-gimarshallingtests.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gimarshallingtests.c' object='libgimarshallingtests_1_0_la-gimarshallingtests.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgimarshallingtests_1_0_la_CFLAGS) $(CFLAGS) -c -o libgimarshallingtests_1_0_la-gimarshallingtests.lo `test -f 'gimarshallingtests.c' || echo '$(srcdir)/'`gimarshallingtests.c
+
 mostlyclean-libtool:
 	-rm -f *.lo
 
diff --git a/tests/gi-tester b/tests/gi-tester
index 26e2259..98817d1 100755
--- a/tests/gi-tester
+++ b/tests/gi-tester
@@ -1,55 +1,121 @@
-#!/usr/bin/env bash
-
-targetname=$1
-
-# Note the target name for the documentation targets (-C, -Python, -Gjs)
-# incorrectly include a relative path to the srcdir, strip that off for usage
-# in directory diffs.
-targetbase=${targetname##*/}
-
-case $targetname in
-*.gir)
-    len=${#targetname}
-    limit=$(expr $len - 4)
-    diff -u -U 10 ${srcdir}/${targetname:0:${limit}}-expected.gir ${builddir}/${targetname}
-    exit $?
-    ;;
-*.typelib)
-    # Do nothing for typelibs, this just ensures they build as part of the tests
-    exit 0
-    ;;
-*-C)
-    diff -r -u -w -I '^\s*$' -U 10 ${srcdir}/${targetbase}-expected ${builddir}/${targetbase}
-    exit $?
-    ;;
-*-Python)
-    diff -r -u -w -I '^\s*$' -U 10 ${srcdir}/${targetbase}-expected ${builddir}/${targetbase}
-    exit $?
-    ;;
-*-Gjs)
-    diff -r -u -w -I '^\s*$' -U 10 ${srcdir}/${targetbase}-expected ${builddir}/${targetbase}
-    exit $?
-    ;;
-*-sections.txt)
-    diff -u -w -I '^\s*$' -U 10 ${srcdir}/${targetname::-4}-expected.txt ${builddir}/${targetname}
-    exit $?
-    ;;
-*.py)
-    if [[ -z "${TESTARGS}" ]]; then
-        # Run as regular Python file if TESTARGS is empty
-        PYTHONPATH=${top_builddir}:${top_srcdir} ${PYTHON} ${targetname}
-        exit $?
-    else
-        # Run as Python unittest module with TESTARGS concatenated to the basename of target.
-        # Ensure we are in the directory containing the python module first.
-        export PYTHONPATH=$(readlink -f ${top_builddir}):$(readlink -f ${top_srcdir})
-        modulename=$(basename "${targetbase}" .py)
-        (cd $(dirname ${targetname}) &&  ${PYTHON} -m unittest -v "${modulename}.${TESTARGS}")
-        exit $?
-    fi
-    ;;
-*)
-    echo $"Usage: [TESTARGS=<args>] gi-tester <targetname>"
-    exit 1
-    ;;
-esac
+#!/usr/bin/env python3
+
+import io
+import sys
+import os
+import re
+import difflib
+import subprocess
+
+
+def assert_files_no_diff(a, b, ignore=None):
+    if ignore is None:
+        ignore = []
+
+    def filter_lines(lines):
+        filtered = []
+        for line in lines:
+            do_ignore = False
+            for pattern in ignore:
+                if re.search(pattern, line) is not None:
+                    do_ignore = True
+                    break
+            if not do_ignore:
+                filtered.append(line)
+        return filtered
+
+    with io.open(a, encoding="utf-8") as ah, \
+            io.open(b, encoding="utf-8") as bh:
+
+        result = difflib.unified_diff(
+            filter_lines(ah.readlines()),
+            filter_lines(bh.readlines()),
+            fromfile=a, tofile=b)
+
+        result = "".join(result)
+        if result:
+            raise AssertionError(result)
+
+
+def assert_dirs_no_diff(a, b, ignore=None):
+    list_a = sorted(os.listdir(a))
+    list_b = sorted(os.listdir(b))
+
+    result = difflib.unified_diff(
+        [l + "\n" for l in list_a],
+        [l + "\n" for l in list_b],
+        fromfile=a, tofile=b)
+    result = "".join(result)
+    if result:
+        raise AssertionError(result)
+
+    for entry in list_a:
+        assert_files_no_diff(
+            os.path.join(a, entry),
+            os.path.join(b, entry),
+            ignore=ignore)
+
+
+def assert_no_diff(a, b, ignore=None):
+    """
+    Args:
+        a (str): file or directory
+        b (str): file or directory
+        ignore (list): a list of regexes for lines in files to ignore
+    """
+
+    if os.path.isdir(a) != os.path.isdir(b):
+        raise AssertionError
+
+    if os.path.isdir(a):
+        assert_dirs_no_diff(a, b, ignore=ignore)
+    else:
+        assert_files_no_diff(a, b, ignore=ignore)
+
+
+def main(argv):
+    if len(argv) != 2:
+        raise SystemError("exactly one arg, not %r" % argv[1:])
+
+    targetname = argv[1]
+    targetbase = os.path.basename(targetname)
+    srcdir = os.environ.get("srcdir", "")
+    builddir = os.environ.get("builddir", "")
+
+    if targetname.endswith(".typelib"):
+        # Do nothing for typelibs, this just ensures they build as part of
+        # the tests
+        if not os.path.exists(targetname):
+            raise SystemError("%s does not exist" % targetname)
+    elif targetname.endswith(".gir"):
+        # The "shared-library" field of the GIR is platform-dependent.
+        # For example, on OSX, shared libraries have the extension .dylib.
+        # Ignore this field when determining whether the output succeeded.
+        ignore = ['shared-library=".*"$']
+        expected = os.path.join(
+            srcdir, os.path.splitext(targetname)[0] + "-expected.gir")
+        actual = os.path.join(builddir, targetname)
+        assert_no_diff(expected, actual, ignore=ignore)
+    elif targetname.rsplit("-")[-1] in ("C", "Python", "Gjs"):
+        expected = os.path.join(srcdir, targetbase + "-expected")
+        actual = os.path.join(builddir, targetbase)
+        assert_no_diff(expected, actual, ignore=['^\s*$'])
+    elif targetname.endswith("-sections.txt"):
+        expected = os.path.join(
+            srcdir, os.path.splitext(targetname)[0] + "-expected.txt")
+        actual = os.path.join(builddir, targetname)
+        assert_no_diff(expected, actual, ignore=['^\s*$'])
+    elif targetname.endswith(".py"):
+        env = os.environ.copy()
+        env["PYTHONPATH"] = os.pathsep.join(
+            filter(
+                None,
+                [os.environ.get("top_builddir"),
+                 os.environ.get("top_srcdir")]))
+        subprocess.check_call([env["PYTHON"], targetname], env=env)
+    else:
+        raise SystemError("Unknown file type: %s" % targetbase)
+
+
+if __name__ == "__main__":
+    sys.exit(main(sys.argv))
diff --git a/tests/gimarshallingtests.c b/tests/gimarshallingtests.c
index 40ba573..d65ce53 100644
--- a/tests/gimarshallingtests.c
+++ b/tests/gimarshallingtests.c
@@ -1091,7 +1091,7 @@ gi_marshalling_tests_utf8_as_uint8array_in (const guint8 *array, gsize len)
  * @utf8: (out) (transfer none):
  */
 void
-gi_marshalling_tests_utf8_none_out (gchar **utf8)
+gi_marshalling_tests_utf8_none_out (const gchar **utf8)
 {
   *utf8 = GI_MARSHALLING_TESTS_CONSTANT_UTF8;
 }
@@ -1125,7 +1125,7 @@ gi_marshalling_tests_utf8_dangling_out (gchar **utf8)
  * @utf8: (inout) (transfer none):
  */
 void
-gi_marshalling_tests_utf8_none_inout (gchar **utf8)
+gi_marshalling_tests_utf8_none_inout (const gchar **utf8)
 {
   g_assert_cmpstr (GI_MARSHALLING_TESTS_CONSTANT_UTF8, ==, *utf8);
   *utf8 = "";
@@ -1413,7 +1413,7 @@ gi_marshalling_tests_array_uint64_in (const guint64 *ints, gint length)
 void
 gi_marshalling_tests_array_unichar_in (const gunichar *chars, gint length)
 {
-  unsigned ix;
+  int ix;
   static const gunichar expected[] = GI_MARSHALLING_TESTS_CONSTANT_UCS4;
   g_assert_cmpint (length, ==, 12);
   for (ix = 0; ix < length; ix++)
@@ -1671,10 +1671,10 @@ gi_marshalling_tests_array_in_nonzero_nonlen (gint first, const guint8 *chars)
  *
  * Returns: (array zero-terminated) (transfer none):
  */
-gchar **
+const gchar **
 gi_marshalling_tests_array_zero_terminated_return (void)
 {
-  static gchar *values[] = { "0", "1", "2", NULL };
+  static const gchar *values[] = { "0", "1", "2", NULL };
   return values;
 }
 
@@ -1745,9 +1745,9 @@ gi_marshalling_tests_array_zero_terminated_in (gchar **utf8s)
  * @utf8s: (out) (array zero-terminated) (transfer none):
  */
 void
-gi_marshalling_tests_array_zero_terminated_out (gchar *** utf8s)
+gi_marshalling_tests_array_zero_terminated_out (const gchar ***utf8s)
 {
-  static gchar *values[] = { "0", "1", "2", NULL };
+  static const gchar *values[] = { "0", "1", "2", NULL };
   *utf8s = values;
 }
 
@@ -1756,11 +1756,11 @@ gi_marshalling_tests_array_zero_terminated_out (gchar *** utf8s)
  * @utf8s: (inout) (array zero-terminated) (transfer none):
  */
 void
-gi_marshalling_tests_array_zero_terminated_inout (gchar *** utf8s)
+gi_marshalling_tests_array_zero_terminated_inout (const gchar ***utf8s)
 {
-  static gchar *values[] = { "-1", "0", "1", "2", NULL };
+  static const gchar *values[] = { "-1", "0", "1", "2", NULL };
 
-  g_assert (g_strv_length (*utf8s));
+  g_assert (g_strv_length ((gchar **) (*utf8s)));
   g_assert_cmpstr ((*utf8s)[0], ==, "0");
   g_assert_cmpstr ((*utf8s)[1], ==, "1");
   g_assert_cmpstr ((*utf8s)[2], ==, "2");
@@ -1899,7 +1899,7 @@ GArray *
 gi_marshalling_tests_garray_utf8_none_return (void)
 {
   static GArray *array = NULL;
-  static gchar *values[] = { "0", "1", "2", NULL };
+  static const gchar *values[] = { "0", "1", "2", NULL };
   gint i;
 
   if (array == NULL)
@@ -1921,7 +1921,7 @@ GArray *
 gi_marshalling_tests_garray_utf8_container_return (void)
 {
   GArray *array = NULL;
-  static gchar *values[] = { "0", "1", "2", NULL };
+  static const gchar *values[] = { "0", "1", "2", NULL };
   gint i;
 
   array = g_array_new (TRUE, TRUE, sizeof (gchar *));
@@ -1940,7 +1940,7 @@ GArray *
 gi_marshalling_tests_garray_utf8_full_return (void)
 {
   GArray *array = NULL;
-  static gchar *values[] = { "0", "1", "2", NULL };
+  static const gchar *values[] = { "0", "1", "2", NULL };
   gint i;
 
   array = g_array_new (TRUE, TRUE, sizeof (gchar *));
@@ -2000,7 +2000,7 @@ void
 gi_marshalling_tests_garray_utf8_none_out (GArray **array_)
 {
   static GArray *internal = NULL;
-  static gchar *values[] = { "0", "1", "2", NULL };
+  static const gchar *values[] = { "0", "1", "2", NULL };
   gint i;
 
   if (internal == NULL)
@@ -2020,7 +2020,7 @@ gi_marshalling_tests_garray_utf8_none_out (GArray **array_)
 void
 gi_marshalling_tests_garray_utf8_container_out (GArray **array_)
 {
-  static gchar *values[] = { "0", "1", "2", NULL };
+  static const gchar *values[] = { "0", "1", "2", NULL };
   gint i;
 
   *array_ = NULL;
@@ -2037,7 +2037,7 @@ gi_marshalling_tests_garray_utf8_container_out (GArray **array_)
 void
 gi_marshalling_tests_garray_utf8_full_out (GArray **array_)
 {
-  static gchar *values[] = { "0", "1", "2", NULL };
+  static const gchar *values[] = { "0", "1", "2", NULL };
   gint i;
 
   *array_ = NULL;
@@ -2057,7 +2057,7 @@ gi_marshalling_tests_garray_utf8_full_out (GArray **array_)
 void
 gi_marshalling_tests_garray_utf8_full_out_caller_allocated (GArray *array_)
 {
-  static gchar *values[] = { "0", "1", "2", NULL };
+  static const gchar *values[] = { "0", "1", "2", NULL };
   gint i;
 
   g_array_set_size (array_, 0);
@@ -2076,7 +2076,7 @@ void
 gi_marshalling_tests_garray_utf8_none_inout (GArray **array_)
 {
   static GArray *internal = NULL;
-  static gchar *values[] = { "-2", "-1", "0", "1", NULL };
+  static const gchar *values[] = { "-2", "-1", "0", "1", NULL };
   gint i;
 
   g_assert_cmpint ((*array_)->len, ==, 3);
@@ -2101,10 +2101,10 @@ gi_marshalling_tests_garray_utf8_none_inout (GArray **array_)
 void
 gi_marshalling_tests_garray_utf8_container_inout (GArray **array_)
 {
-  static gchar *val1 = "-2";
-  static gchar *val2 = "-1";
-  static gchar *val3 = "0";
-  static gchar *val4 = "1";
+  static const gchar *val1 = "-2";
+  static const gchar *val2 = "-1";
+  static const gchar *val3 = "0";
+  static const gchar *val4 = "1";
   GArray *result;
 
   g_assert_cmpint ((*array_)->len, ==, 3);
@@ -2129,8 +2129,8 @@ gi_marshalling_tests_garray_utf8_container_inout (GArray **array_)
 void
 gi_marshalling_tests_garray_utf8_full_inout (GArray **array_)
 {
-  static gchar *val1 = "-1";
-  static gchar *val2 = "-2";
+  static const gchar *val1 = "-1";
+  static const gchar *val2 = "-2";
   gchar *val;
   GArray *result;
 
@@ -2190,7 +2190,7 @@ GPtrArray *
 gi_marshalling_tests_gptrarray_utf8_none_return (void)
 {
   static GPtrArray *parray = NULL;
-  static gchar *values[] = { "0", "1", "2" };
+  static const gchar *values[] = { "0", "1", "2" };
   gint i;
 
   if (parray == NULL)
@@ -2212,7 +2212,7 @@ GPtrArray *
 gi_marshalling_tests_gptrarray_utf8_container_return (void)
 {
   GPtrArray *parray = NULL;
-  static gchar *values[] = { "0", "1", "2", NULL };
+  static const gchar *values[] = { "0", "1", "2", NULL };
   gint i;
 
   parray = g_ptr_array_new ();
@@ -2231,7 +2231,7 @@ GPtrArray *
 gi_marshalling_tests_gptrarray_utf8_full_return (void)
 {
   GPtrArray *parray = NULL;
-  static gchar *values[] = { "0", "1", "2", NULL };
+  static const gchar *values[] = { "0", "1", "2", NULL };
   gint i;
 
   parray = g_ptr_array_new ();
@@ -2265,7 +2265,7 @@ void
 gi_marshalling_tests_gptrarray_utf8_none_out (GPtrArray **parray_)
 {
   static GPtrArray *internal = NULL;
-  static gchar *values[] = { "0", "1", "2", NULL };
+  static const gchar *values[] = { "0", "1", "2", NULL };
   gint i;
 
   if (internal == NULL)
@@ -2285,7 +2285,7 @@ gi_marshalling_tests_gptrarray_utf8_none_out (GPtrArray **parray_)
 void
 gi_marshalling_tests_gptrarray_utf8_container_out (GPtrArray **parray_)
 {
-  static gchar *values[] = { "0", "1", "2", NULL };
+  static const gchar *values[] = { "0", "1", "2", NULL };
   gint i;
 
   *parray_ = NULL;
@@ -2302,7 +2302,7 @@ gi_marshalling_tests_gptrarray_utf8_container_out (GPtrArray **parray_)
 void
 gi_marshalling_tests_gptrarray_utf8_full_out (GPtrArray **parray_)
 {
-  static gchar *values[] = { "0", "1", "2", NULL };
+  static const gchar *values[] = { "0", "1", "2", NULL };
   gint i;
 
   *parray_ = NULL;
@@ -2323,7 +2323,7 @@ void
 gi_marshalling_tests_gptrarray_utf8_none_inout (GPtrArray **parray_)
 {
   static GPtrArray *internal = NULL;
-  static gchar *values[] = { "-2", "-1", "0", "1", NULL };
+  static const gchar *values[] = { "-2", "-1", "0", "1", NULL };
   gint i;
 
   g_assert_cmpint ((*parray_)->len, ==, 3);
@@ -2348,10 +2348,10 @@ gi_marshalling_tests_gptrarray_utf8_none_inout (GPtrArray **parray_)
 void
 gi_marshalling_tests_gptrarray_utf8_container_inout (GPtrArray **parray_)
 {
-  static gchar *val1 = "-2";
-  static gchar *val2 = "-1";
-  static gchar *val3 = "0";
-  static gchar *val4 = "1";
+  static const gchar *val1 = "-2";
+  static const gchar *val2 = "-1";
+  static const gchar *val3 = "0";
+  static const gchar *val4 = "1";
   GPtrArray *result;
 
   g_assert_cmpint ((*parray_)->len, ==, 3);
@@ -2376,8 +2376,8 @@ gi_marshalling_tests_gptrarray_utf8_container_inout (GPtrArray **parray_)
 void
 gi_marshalling_tests_gptrarray_utf8_full_inout (GPtrArray **parray_)
 {
-  static gchar *val1 = "-1";
-  static gchar *val2 = "-2";
+  static const gchar *val1 = "-1";
+  static const gchar *val2 = "-2";
   gchar *val;
   GPtrArray *result;
 
@@ -2498,8 +2498,8 @@ gi_marshalling_tests_gstrv_in (GStrv g_strv)
 void
 gi_marshalling_tests_gstrv_out (GStrv *g_strv)
 {
-  static gchar *values[] = { "0", "1", "2", NULL };
-  *g_strv = values;
+  static const gchar *values[] = { "0", "1", "2", NULL };
+  *g_strv = (gchar **) values;
 }
 
 /**
@@ -2509,14 +2509,14 @@ gi_marshalling_tests_gstrv_out (GStrv *g_strv)
 void
 gi_marshalling_tests_gstrv_inout (GStrv *g_strv)
 {
-  static gchar *values[] = { "-1", "0", "1", "2", NULL };
+  static const gchar *values[] = { "-1", "0", "1", "2", NULL };
 
   g_assert (g_strv_length (*g_strv) == 3);
   g_assert (strcmp ((*g_strv)[0], "0") == 0);
   g_assert (strcmp ((*g_strv)[1], "1") == 0);
   g_assert (strcmp ((*g_strv)[2], "2") == 0);
 
-  *g_strv = values;
+  *g_strv = (gchar **) values;
 }
 
 /**
@@ -2571,9 +2571,9 @@ gi_marshalling_tests_glist_utf8_none_return (void)
 
   if (list == NULL)
     {
-      list = g_list_append (list, "0");
-      list = g_list_append (list, "1");
-      list = g_list_append (list, "2");
+      list = g_list_append (list, (gpointer) "0");
+      list = g_list_append (list, (gpointer) "1");
+      list = g_list_append (list, (gpointer) "2");
     }
 
   return list;
@@ -2589,9 +2589,9 @@ gi_marshalling_tests_glist_utf8_container_return (void)
 {
   GList *list = NULL;
 
-  list = g_list_append (list, "0");
-  list = g_list_append (list, "1");
-  list = g_list_append (list, "2");
+  list = g_list_append (list, (gpointer) "0");
+  list = g_list_append (list, (gpointer) "1");
+  list = g_list_append (list, (gpointer) "2");
 
   return list;
 }
@@ -2663,9 +2663,9 @@ gi_marshalling_tests_glist_utf8_none_out (GList **list)
 
   if (values == NULL)
     {
-      values = g_list_append (values, "0");
-      values = g_list_append (values, "1");
-      values = g_list_append (values, "2");
+      values = g_list_append (values, (gpointer) "0");
+      values = g_list_append (values, (gpointer) "1");
+      values = g_list_append (values, (gpointer) "2");
     }
 
   *list = values;
@@ -2680,9 +2680,9 @@ gi_marshalling_tests_glist_utf8_container_out (GList **list)
 {
   *list = NULL;
 
-  *list = g_list_append (*list, "0");
-  *list = g_list_append (*list, "1");
-  *list = g_list_append (*list, "2");
+  *list = g_list_append (*list, (gpointer) "0");
+  *list = g_list_append (*list, (gpointer) "1");
+  *list = g_list_append (*list, (gpointer) "2");
 }
 
 /**
@@ -2715,10 +2715,10 @@ gi_marshalling_tests_glist_utf8_none_inout (GList **list)
 
   if (values == NULL)
     {
-      values = g_list_append (values, "-2");
-      values = g_list_append (values, "-1");
-      values = g_list_append (values, "0");
-      values = g_list_append (values, "1");
+      values = g_list_append (values, (gpointer) "-2");
+      values = g_list_append (values, (gpointer) "-1");
+      values = g_list_append (values, (gpointer) "0");
+      values = g_list_append (values, (gpointer) "1");
     }
 
   *list = values;
@@ -2738,10 +2738,10 @@ gi_marshalling_tests_glist_utf8_container_inout (GList **list)
   g_assert_cmpstr (g_list_nth_data (*list, 1), ==, "1");
   g_assert_cmpstr (g_list_nth_data (*list, 2), ==, "2");
 
-  result = g_list_prepend (result, "1");
-  result = g_list_prepend (result, "0");
-  result = g_list_prepend (result, "-1");
-  result = g_list_prepend (result, "-2");
+  result = g_list_prepend (result, (gpointer) "1");
+  result = g_list_prepend (result, (gpointer) "0");
+  result = g_list_prepend (result, (gpointer) "-1");
+  result = g_list_prepend (result, (gpointer) "-2");
 
   g_list_free (*list);
   *list = result;
@@ -2805,9 +2805,9 @@ gi_marshalling_tests_gslist_utf8_none_return (void)
 
   if (list == NULL)
     {
-      list = g_slist_prepend (list, "0");
-      list = g_slist_prepend (list, "1");
-      list = g_slist_prepend (list, "2");
+      list = g_slist_prepend (list, (gpointer) "0");
+      list = g_slist_prepend (list, (gpointer) "1");
+      list = g_slist_prepend (list, (gpointer) "2");
       list = g_slist_reverse (list);
     }
 
@@ -2824,9 +2824,9 @@ gi_marshalling_tests_gslist_utf8_container_return (void)
 {
   GSList *list = NULL;
 
-  list = g_slist_prepend (list, "0");
-  list = g_slist_prepend (list, "1");
-  list = g_slist_prepend (list, "2");
+  list = g_slist_prepend (list, (gpointer) "0");
+  list = g_slist_prepend (list, (gpointer) "1");
+  list = g_slist_prepend (list, (gpointer) "2");
   list = g_slist_reverse (list);
 
   return list;
@@ -2888,9 +2888,9 @@ gi_marshalling_tests_gslist_utf8_none_out (GSList **list)
 
   if (values == NULL)
     {
-      values = g_slist_prepend (values, "0");
-      values = g_slist_prepend (values, "1");
-      values = g_slist_prepend (values, "2");
+      values = g_slist_prepend (values, (gpointer) "0");
+      values = g_slist_prepend (values, (gpointer) "1");
+      values = g_slist_prepend (values, (gpointer) "2");
       values = g_slist_reverse (values);
     }
 
@@ -2906,9 +2906,9 @@ gi_marshalling_tests_gslist_utf8_container_out (GSList **list)
 {
   *list = NULL;
 
-  *list = g_slist_prepend (*list, "0");
-  *list = g_slist_prepend (*list, "1");
-  *list = g_slist_prepend (*list, "2");
+  *list = g_slist_prepend (*list, (gpointer) "0");
+  *list = g_slist_prepend (*list, (gpointer) "1");
+  *list = g_slist_prepend (*list, (gpointer) "2");
   *list = g_slist_reverse (*list);
 }
 
@@ -2943,10 +2943,10 @@ gi_marshalling_tests_gslist_utf8_none_inout (GSList **list)
 
   if (values == NULL)
     {
-      values = g_slist_prepend (values, "-2");
-      values = g_slist_prepend (values, "-1");
-      values = g_slist_prepend (values, "0");
-      values = g_slist_prepend (values, "1");
+      values = g_slist_prepend (values, (gpointer) "-2");
+      values = g_slist_prepend (values, (gpointer) "-1");
+      values = g_slist_prepend (values, (gpointer) "0");
+      values = g_slist_prepend (values, (gpointer) "1");
       values = g_slist_reverse (values);
     }
 
@@ -2967,10 +2967,10 @@ gi_marshalling_tests_gslist_utf8_container_inout (GSList **list)
   g_assert_cmpstr (g_slist_nth_data (*list, 1), ==, "1");
   g_assert_cmpstr (g_slist_nth_data (*list, 2), ==, "2");
 
-  result = g_slist_prepend (result, "1");
-  result = g_slist_prepend (result, "0");
-  result = g_slist_prepend (result, "-1");
-  result = g_slist_prepend (result, "-2");
+  result = g_slist_prepend (result, (gpointer) "1");
+  result = g_slist_prepend (result, (gpointer) "0");
+  result = g_slist_prepend (result, (gpointer) "-1");
+  result = g_slist_prepend (result, (gpointer) "-2");
 
   g_slist_free (*list);
   *list = result;
@@ -3035,10 +3035,10 @@ gi_marshalling_tests_ghashtable_utf8_none_return (void)
   if (hash_table == NULL)
     {
       hash_table = g_hash_table_new (g_str_hash, g_str_equal);
-      g_hash_table_insert (hash_table, "-1", "1");
-      g_hash_table_insert (hash_table, "0", "0");
-      g_hash_table_insert (hash_table, "1", "-1");
-      g_hash_table_insert (hash_table, "2", "-2");
+      g_hash_table_insert (hash_table, (gpointer) "-1", (gpointer) "1");
+      g_hash_table_insert (hash_table, (gpointer) "0",  (gpointer) "0");
+      g_hash_table_insert (hash_table, (gpointer) "1",  (gpointer) "-1");
+      g_hash_table_insert (hash_table, (gpointer) "2",  (gpointer) "-2");
     }
 
   return hash_table;
@@ -3055,10 +3055,10 @@ gi_marshalling_tests_ghashtable_utf8_container_return (void)
   GHashTable *hash_table = NULL;
 
   hash_table = g_hash_table_new (g_str_hash, g_str_equal);
-  g_hash_table_insert (hash_table, "-1", "1");
-  g_hash_table_insert (hash_table, "0", "0");
-  g_hash_table_insert (hash_table, "1", "-1");
-  g_hash_table_insert (hash_table, "2", "-2");
+  g_hash_table_insert (hash_table, (gpointer) "-1", (gpointer) "1");
+  g_hash_table_insert (hash_table, (gpointer) "0",  (gpointer) "0");
+  g_hash_table_insert (hash_table, (gpointer) "1",  (gpointer) "-1");
+  g_hash_table_insert (hash_table, (gpointer) "2",  (gpointer) "-2");
 
   return hash_table;
 }
@@ -3204,10 +3204,10 @@ gi_marshalling_tests_ghashtable_utf8_none_out (GHashTable **hash_table)
   if (new_hash_table == NULL)
     {
       new_hash_table = g_hash_table_new (g_str_hash, g_str_equal);
-      g_hash_table_insert (new_hash_table, "-1", "1");
-      g_hash_table_insert (new_hash_table, "0", "0");
-      g_hash_table_insert (new_hash_table, "1", "-1");
-      g_hash_table_insert (new_hash_table, "2", "-2");
+      g_hash_table_insert (new_hash_table, (gpointer) "-1", (gpointer) "1");
+      g_hash_table_insert (new_hash_table, (gpointer) "0",  (gpointer) "0");
+      g_hash_table_insert (new_hash_table, (gpointer) "1",  (gpointer) "-1");
+      g_hash_table_insert (new_hash_table, (gpointer) "2",  (gpointer) "-2");
     }
 
   *hash_table = new_hash_table;
@@ -3221,10 +3221,10 @@ void
 gi_marshalling_tests_ghashtable_utf8_container_out (GHashTable **hash_table)
 {
   *hash_table = g_hash_table_new (g_str_hash, g_str_equal);
-  g_hash_table_insert (*hash_table, "-1", "1");
-  g_hash_table_insert (*hash_table, "0", "0");
-  g_hash_table_insert (*hash_table, "1", "-1");
-  g_hash_table_insert (*hash_table, "2", "-2");
+  g_hash_table_insert (*hash_table, (gpointer) "-1", (gpointer) "1");
+  g_hash_table_insert (*hash_table, (gpointer) "0",  (gpointer) "0");
+  g_hash_table_insert (*hash_table, (gpointer) "1",  (gpointer) "-1");
+  g_hash_table_insert (*hash_table, (gpointer) "2",  (gpointer) "-2");
 }
 
 /**
@@ -3258,9 +3258,9 @@ gi_marshalling_tests_ghashtable_utf8_none_inout (GHashTable **hash_table)
   if (new_hash_table == NULL)
     {
       new_hash_table = g_hash_table_new (g_str_hash, g_str_equal);
-      g_hash_table_insert (new_hash_table, "-1", "1");
-      g_hash_table_insert (new_hash_table, "0", "0");
-      g_hash_table_insert (new_hash_table, "1", "1");
+      g_hash_table_insert (new_hash_table, (gpointer) "-1", (gpointer) "1");
+      g_hash_table_insert (new_hash_table, (gpointer) "0",  (gpointer) "0");
+      g_hash_table_insert (new_hash_table, (gpointer) "1",  (gpointer) "1");
     }
 
   *hash_table = new_hash_table;
@@ -3280,9 +3280,9 @@ gi_marshalling_tests_ghashtable_utf8_container_inout (GHashTable **hash_table)
   g_assert_cmpstr (g_hash_table_lookup (*hash_table, "1"), ==, "-1");
   g_assert_cmpstr (g_hash_table_lookup (*hash_table, "2"), ==, "-2");
 
-  g_hash_table_insert (result, "-1", "1");
-  g_hash_table_insert (result, "0", "0");
-  g_hash_table_insert (result, "1", "1");
+  g_hash_table_insert (result, (gpointer) "-1", (gpointer) "1");
+  g_hash_table_insert (result, (gpointer) "0",  (gpointer) "0");
+  g_hash_table_insert (result, (gpointer) "1",  (gpointer) "1");
 
   g_hash_table_unref (*hash_table);
   *hash_table = result;
@@ -4859,7 +4859,7 @@ static void gi_marshalling_tests_sub_sub_object_class_init (GIMarshallingTestsSu
 /* Interfaces */
 
 static void
-gi_marshalling_tests_interface_class_init (void *g_iface)
+gi_marshalling_tests_interface_class_init (void *g_iface, void *data)
 {
 }
 
@@ -4938,7 +4938,7 @@ gi_marshalling_tests_interface_impl_get_as_interface (GIMarshallingTestsInterfac
 }
 
 static void
-gi_marshalling_tests_interface2_class_init (void *g_iface)
+gi_marshalling_tests_interface2_class_init (void *g_iface, void *data)
 {
 }
 
@@ -4959,7 +4959,7 @@ gi_marshalling_tests_interface2_get_type (void)
 }
 
 static void
-gi_marshalling_tests_interface3_class_init (void *g_iface)
+gi_marshalling_tests_interface3_class_init (void *g_iface, void *data)
 {
 }
 
@@ -5163,7 +5163,7 @@ gi_marshalling_tests_gerror_out_transfer_none (GError **err, const gchar **debug
 {
   static GError error = { 0,
     GI_MARSHALLING_TESTS_CONSTANT_GERROR_CODE,
-    GI_MARSHALLING_TESTS_CONSTANT_GERROR_MESSAGE
+    (gchar *) GI_MARSHALLING_TESTS_CONSTANT_GERROR_MESSAGE
   };
   error.domain = g_quark_from_static_string (GI_MARSHALLING_TESTS_CONSTANT_GERROR_DOMAIN);
   *err = &error;
@@ -5182,7 +5182,7 @@ gi_marshalling_tests_gerror_return (void)
 {
   GQuark quark = g_quark_from_static_string (GI_MARSHALLING_TESTS_CONSTANT_GERROR_DOMAIN);
 
-  return g_error_new (quark, GI_MARSHALLING_TESTS_CONSTANT_GERROR_CODE, GI_MARSHALLING_TESTS_CONSTANT_GERROR_MESSAGE);
+  return g_error_new_literal (quark, GI_MARSHALLING_TESTS_CONSTANT_GERROR_CODE, GI_MARSHALLING_TESTS_CONSTANT_GERROR_MESSAGE);
 }
 
 static GIMarshallingTestsOverridesStruct *
@@ -5355,6 +5355,8 @@ enum
   SOME_OBJECT_PROPERTY,
   SOME_FLAGS_PROPERTY,
   SOME_ENUM_PROPERTY,
+  SOME_BYTE_ARRAY_PROPERTY,
+  SOME_READONLY_PROPERTY,
 };
 
 G_DEFINE_TYPE (GIMarshallingTestsPropertiesObject, gi_marshalling_tests_properties_object, G_TYPE_OBJECT);
@@ -5369,16 +5371,17 @@ gi_marshalling_tests_properties_object_finalize (GObject *obj)
   GIMarshallingTestsPropertiesObject *self;
   self = GI_MARSHALLING_TESTS_PROPERTIES_OBJECT (obj);
 
-  if (self->some_strv != NULL) {
-    g_strfreev (self->some_strv);
-    self->some_strv = NULL;
-  }
-
   if (self->some_gvalue) {
     g_boxed_free (G_TYPE_VALUE, self->some_gvalue);
     self->some_gvalue = NULL;
   }
 
+  g_clear_pointer (&self->some_strv, g_strfreev);
+  g_clear_pointer (&self->some_boxed_struct, gi_marshalling_tests_boxed_struct_free);
+  g_clear_pointer (&self->some_variant, g_variant_unref);
+  g_clear_pointer (&self->some_boxed_glist, g_list_free);
+  g_clear_object (&self->some_object);
+
   G_OBJECT_CLASS (gi_marshalling_tests_properties_object_parent_class)->finalize (obj);
 }
 
@@ -5447,6 +5450,12 @@ gi_marshalling_tests_properties_object_get_property (GObject *object,
     case SOME_ENUM_PROPERTY:
       g_value_set_enum (value, self->some_enum);
       break;
+    case SOME_BYTE_ARRAY_PROPERTY:
+      g_value_set_boxed (value, self->some_byte_array);
+      break;
+    case SOME_READONLY_PROPERTY:
+      g_value_set_int (value, 42);
+      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
       break;
@@ -5529,6 +5538,11 @@ gi_marshalling_tests_properties_object_set_property (GObject *object,
     case SOME_ENUM_PROPERTY:
       self->some_enum = g_value_get_enum (value);
       break;
+    case SOME_BYTE_ARRAY_PROPERTY:
+      if (self->some_byte_array != NULL)
+        g_byte_array_unref (self->some_byte_array);
+      self->some_byte_array = g_value_dup_boxed (value);
+      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
       break;
@@ -5682,6 +5696,20 @@ static void gi_marshalling_tests_properties_object_class_init (GIMarshallingTest
                                                       GI_MARSHALLING_TESTS_TYPE_GENUM,
                                                       GI_MARSHALLING_TESTS_GENUM_VALUE1,
                                                       G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, SOME_BYTE_ARRAY_PROPERTY,
+                                   g_param_spec_boxed ("some-byte-array",
+                                                       "some-byte-array",
+                                                       "some-byte-array",
+                                                       G_TYPE_BYTE_ARRAY,
+                                                       G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class, SOME_READONLY_PROPERTY,
+                                   g_param_spec_int ("some-readonly",
+                                                     "some-readonly",
+                                                     "some-readonly",
+                                                     G_MININT, G_MAXINT, 0,
+                                                     G_PARAM_READABLE));
 }
 
 GIMarshallingTestsPropertiesObject *
diff --git a/tests/gimarshallingtests.h b/tests/gimarshallingtests.h
index 0c59952..95e5240 100644
--- a/tests/gimarshallingtests.h
+++ b/tests/gimarshallingtests.h
@@ -506,7 +506,7 @@ void gi_marshalling_tests_utf8_full_in (gchar *utf8);
 
 
 _GI_TEST_EXTERN
-void gi_marshalling_tests_utf8_none_out (gchar **utf8);
+void gi_marshalling_tests_utf8_none_out (const gchar **utf8);
 
 _GI_TEST_EXTERN
 void gi_marshalling_tests_utf8_full_out (gchar **utf8);
@@ -517,7 +517,7 @@ void gi_marshalling_tests_utf8_dangling_out (gchar **utf8);
 
 
 _GI_TEST_EXTERN
-void gi_marshalling_tests_utf8_none_inout (gchar **utf8);
+void gi_marshalling_tests_utf8_none_inout (const gchar **utf8);
 
 _GI_TEST_EXTERN
 void gi_marshalling_tests_utf8_full_inout (gchar **utf8);
@@ -781,7 +781,7 @@ void gi_marshalling_tests_array_in_nonzero_nonlen (gint first, const guint8 *cha
 
 
 _GI_TEST_EXTERN
-gchar **gi_marshalling_tests_array_zero_terminated_return (void);
+const gchar **gi_marshalling_tests_array_zero_terminated_return (void);
 
 _GI_TEST_EXTERN
 gchar **gi_marshalling_tests_array_zero_terminated_return_null (void);
@@ -798,11 +798,11 @@ void gi_marshalling_tests_array_zero_terminated_in (gchar **utf8s);
 
 
 _GI_TEST_EXTERN
-void gi_marshalling_tests_array_zero_terminated_out (gchar ***utf8s);
+void gi_marshalling_tests_array_zero_terminated_out (const gchar ***utf8s);
 
 
 _GI_TEST_EXTERN
-void gi_marshalling_tests_array_zero_terminated_inout (gchar ***utf8s);
+void gi_marshalling_tests_array_zero_terminated_inout (const gchar ***utf8s);
 
 
 _GI_TEST_EXTERN
@@ -1975,6 +1975,7 @@ struct _GIMarshallingTestsPropertiesObject {
     GObject *some_object;
     GIMarshallingTestsFlags some_flags;
     GIMarshallingTestsGEnum some_enum;
+    GByteArray *some_byte_array;
 };
 
 struct _GIMarshallingTestsPropertiesObjectClass {
diff --git a/tests/meson.build b/tests/meson.build
new file mode 100644
index 0000000..71cd97f
--- /dev/null
+++ b/tests/meson.build
@@ -0,0 +1,20 @@
+test_regress_sources = files('scanner/regress.c')
+test_regress_headers = files('scanner/regress.h')
+test_marshalling_sources = files('gimarshallingtests.c')
+test_marshalling_headers = files('gimarshallingtests.h')
+
+test_regress_incdirs = include_directories(['.', 'scanner'])
+
+installed_sources = [
+  'scanner/regress.c',
+  'scanner/regress.h',
+  'gimarshallingtests.c',
+  'gimarshallingtests.h',
+  'gitestmacros.h',
+]
+
+install_data(installed_sources, install_dir: join_paths(get_option('datadir'), 'gobject-introspection-1.0', 'tests'))
+
+### TODO: actually test
+subdir('warn')
+subdir('scanner')
diff --git a/tests/offsets/Makefile.am b/tests/offsets/Makefile.am
index 0df9c15..269b0ce 100644
--- a/tests/offsets/Makefile.am
+++ b/tests/offsets/Makefile.am
@@ -17,8 +17,9 @@ liboffsets_la_SOURCES = \
 	offsets.h	\
 	offsets.c
 liboffsets_la_CPPFLAGS = $(GIREPO_CFLAGS) $(GI_HIDDEN_VISIBILITY_CFLAGS) -I$(top_srcdir)/tests
+liboffsets_la_CFLAGS = $(WARN_CFLAGS)
 # dummy rpath to get built dynamically (huh?)
-liboffsets_la_LDFLAGS = -avoid-version -rpath $(libdir)
+liboffsets_la_LDFLAGS = $(WARN_LDFLAGS) -avoid-version -rpath $(libdir)
 
 Offsets-1.0.gir: liboffsets.la offsets.h
 Offsets_1_0_gir_INCLUDES = GObject-2.0
@@ -36,12 +37,16 @@ EXTRA_PROGRAMS += gitestoffsets
 
 nodist_gitestoffsets_SOURCES = gitestoffsets.c
 gitestoffsets_CPPFLAGS = $(GIREPO_CFLAGS) -I$(top_srcdir)/girepository -I$(top_srcdir)/tests
+gitestoffsets_CFLAGS = $(WARN_CFLAGS)
+gitestoffsets_LDFLAGS = $(WARN_LDFLAGS)
 gitestoffsets_LDADD = $(top_builddir)/libgirepository-1.0.la $(GIREPO_LIBS)
 
 gitestoffsets.c: gen-gitestoffsets offsets.h Offsets-1.0.typelib
 	$(AM_V_GEN) $(PYTHON) $(srcdir)/gen-gitestoffsets $(srcdir)/offsets.h > $@ || ( rm -f $@ && false )
 
-EXTRA_DIST += gen-gitestoffsets
+EXTRA_DIST += \
+	gen-gitestoffsets \
+	test_offsets.py
 BUILT_SOURCES += gitestoffsets.c
 CLEANFILES += gitestoffsets.c $(EXTRA_PROGRAMS)
 
@@ -50,7 +55,5 @@ CLEANFILES += gitestoffsets.c $(EXTRA_PROGRAMS)
 # The trailing "echo" in LOG_COMPILER is used to ignore automake passing
 # gitestoffsets as we already run this in the same command line.
 TESTS = gitestoffsets
-LOG_COMPILER = env GI_TYPELIB_PATH=:$(top_builddir) ./gitestoffsets$(EXEEXT) offsets.compiled offsets.introspected && \
-	diff -u offsets.compiled offsets.introspected && echo
-
-CLEANFILES += offsets.compiled offsets.introspected
+TESTS_ENVIRONMENT = env top_builddir=$(top_builddir) builddir=$(builddir)
+LOG_COMPILER = $(PYTHON) $(srcdir)/test_offsets.py && echo
diff --git a/tests/offsets/Makefile.in b/tests/offsets/Makefile.in
index e65ac9e..2191f87 100644
--- a/tests/offsets/Makefile.in
+++ b/tests/offsets/Makefile.in
@@ -159,13 +159,16 @@ am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
 am__v_lt_1 = 
 liboffsets_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(liboffsets_la_LDFLAGS) $(LDFLAGS) -o $@
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(liboffsets_la_CFLAGS) \
+	$(CFLAGS) $(liboffsets_la_LDFLAGS) $(LDFLAGS) -o $@
 nodist_gitestoffsets_OBJECTS = gitestoffsets-gitestoffsets.$(OBJEXT)
 gitestoffsets_OBJECTS = $(nodist_gitestoffsets_OBJECTS)
 am__DEPENDENCIES_1 =
 gitestoffsets_DEPENDENCIES = $(top_builddir)/libgirepository-1.0.la \
 	$(am__DEPENDENCIES_1)
+gitestoffsets_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(gitestoffsets_CFLAGS) \
+	$(CFLAGS) $(gitestoffsets_LDFLAGS) $(LDFLAGS) -o $@
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
 am__v_P_0 = false
@@ -547,6 +550,7 @@ PYTHON_INCLUDES = @PYTHON_INCLUDES@
 PYTHON_LIBS = @PYTHON_LIBS@
 PYTHON_PLATFORM = @PYTHON_PLATFORM@
 PYTHON_PREFIX = @PYTHON_PREFIX@
+PYTHON_SO = @PYTHON_SO@
 PYTHON_VERSION = @PYTHON_VERSION@
 RANLIB = @RANLIB@
 SCANNER_CFLAGS = @SCANNER_CFLAGS@
@@ -556,6 +560,11 @@ SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
+WARN_CFLAGS = @WARN_CFLAGS@
+WARN_CFLAGS_FLEX = @WARN_CFLAGS_FLEX@
+WARN_CFLAGS_PYTHON = @WARN_CFLAGS_PYTHON@
+WARN_LDFLAGS = @WARN_LDFLAGS@
+WARN_SCANNERFLAGS = @WARN_SCANNERFLAGS@
 YACC = @YACC@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
@@ -682,12 +691,8 @@ _gir_includes = $(foreach include,$($(_gir_name)_INCLUDES),--include=$(include))
 _gir_export_packages = $(foreach pkg,$($(_gir_name)_EXPORT_PACKAGES),--pkg-export=$(pkg))
 _gir_c_includes = $(foreach include,$($(_gir_name)_C_INCLUDES),--c-include=$(include))
 
-# Reuse the LIBTOOL variable from automake if it's set, but
-# work around MSYS weirdness: When running g-ir-scanner, MSYS changes
-# a command-line argument --libtool="/bin/sh ../../libtool" into
-# --libtool=c:/opt/msys/1.0/bin/libtool. So just use sh.exe without path
-# because we already "know" where the libtool configure produced is.
-_gir_libtool = $(if $(findstring MINGW,$(shell uname -s)),--libtool="$(top_builddir)/libtool",$(if $(LIBTOOL),--libtool="$(LIBTOOL)"))
+# Reuse the LIBTOOL variable from automake if it's set
+_gir_libtool = $(if $(LIBTOOL),--libtool="$(LIBTOOL)")
 
 # Macros for AM_SILENT_RULES prettiness
 _gir_verbosity = $(if $(AM_DEFAULT_VERBOSITY),$(AM_DEFAULT_VERBOSITY),1)
@@ -703,9 +708,8 @@ _gir_silent_compiler_0 = @echo "  GICOMP   $(1)";
 _gir_default_scanner_env = CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" CC="$(CC)" PKG_CONFIG="$(PKG_CONFIG)" GI_HOST_OS="$(GI_HOST_OS)" DLLTOOL="$(DLLTOOL)"
 BUILT_SOURCES = gitestoffsets.c
 CLEANFILES = Offsets-1.0.gir Offsets-1.0.typelib liboffsets.la \
-	gitestoffsets.c $(EXTRA_PROGRAMS) offsets.compiled \
-	offsets.introspected
-EXTRA_DIST = gen-gitestoffsets
+	gitestoffsets.c $(EXTRA_PROGRAMS)
+EXTRA_DIST = gen-gitestoffsets test_offsets.py
 INTROSPECTION_GIRS = Offsets-1.0.gir
 
 ############################################################
@@ -715,8 +719,9 @@ liboffsets_la_SOURCES = \
 	offsets.c
 
 liboffsets_la_CPPFLAGS = $(GIREPO_CFLAGS) $(GI_HIDDEN_VISIBILITY_CFLAGS) -I$(top_srcdir)/tests
+liboffsets_la_CFLAGS = $(WARN_CFLAGS)
 # dummy rpath to get built dynamically (huh?)
-liboffsets_la_LDFLAGS = -avoid-version -rpath $(libdir)
+liboffsets_la_LDFLAGS = $(WARN_LDFLAGS) -avoid-version -rpath $(libdir)
 Offsets_1_0_gir_INCLUDES = GObject-2.0
 Offsets_1_0_gir_LIBS = liboffsets.la
 Offsets_1_0_gir_PACKAGES = gobject-2.0
@@ -724,10 +729,11 @@ Offsets_1_0_gir_FILES = offsets.h offsets.c
 Offsets_1_0_gir_SCANNERFLAGS = $(INTROSPECTION_SCANNER_ARGS) --warn-all --warn-error  -I$(top_srcdir)/tests
 nodist_gitestoffsets_SOURCES = gitestoffsets.c
 gitestoffsets_CPPFLAGS = $(GIREPO_CFLAGS) -I$(top_srcdir)/girepository -I$(top_srcdir)/tests
+gitestoffsets_CFLAGS = $(WARN_CFLAGS)
+gitestoffsets_LDFLAGS = $(WARN_LDFLAGS)
 gitestoffsets_LDADD = $(top_builddir)/libgirepository-1.0.la $(GIREPO_LIBS)
-LOG_COMPILER = env GI_TYPELIB_PATH=:$(top_builddir) ./gitestoffsets$(EXEEXT) offsets.compiled offsets.introspected && \
-	diff -u offsets.compiled offsets.introspected && echo
-
+TESTS_ENVIRONMENT = env top_builddir=$(top_builddir) builddir=$(builddir)
+LOG_COMPILER = $(PYTHON) $(srcdir)/test_offsets.py && echo
 all: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) all-am
 
@@ -769,7 +775,7 @@ liboffsets.la: $(liboffsets_la_OBJECTS) $(liboffsets_la_DEPENDENCIES) $(EXTRA_li
 
 gitestoffsets$(EXEEXT): $(gitestoffsets_OBJECTS) $(gitestoffsets_DEPENDENCIES) $(EXTRA_gitestoffsets_DEPENDENCIES) 
 	@rm -f gitestoffsets$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(gitestoffsets_OBJECTS) $(gitestoffsets_LDADD) $(LIBS)
+	$(AM_V_CCLD)$(gitestoffsets_LINK) $(gitestoffsets_OBJECTS) $(gitestoffsets_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -805,25 +811,25 @@ distclean-compile:
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
 liboffsets_la-offsets.lo: offsets.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liboffsets_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liboffsets_la-offsets.lo -MD -MP -MF $(DEPDIR)/liboffsets_la-offsets.Tpo -c -o liboffsets_la-offsets.lo `test -f 'offsets.c' || echo '$(srcdir)/'`offsets.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liboffsets_la_CPPFLAGS) $(CPPFLAGS) $(liboffsets_la_CFLAGS) $(CFLAGS) -MT liboffsets_la-offsets.lo -MD -MP -MF $(DEPDIR)/liboffsets_la-offsets.Tpo -c -o liboffsets_la-offsets.lo `test -f 'offsets.c' || echo '$(srcdir)/'`offsets.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/liboffsets_la-offsets.Tpo $(DEPDIR)/liboffsets_la-offsets.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='offsets.c' object='liboffsets_la-offsets.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liboffsets_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liboffsets_la-offsets.lo `test -f 'offsets.c' || echo '$(srcdir)/'`offsets.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liboffsets_la_CPPFLAGS) $(CPPFLAGS) $(liboffsets_la_CFLAGS) $(CFLAGS) -c -o liboffsets_la-offsets.lo `test -f 'offsets.c' || echo '$(srcdir)/'`offsets.c
 
 gitestoffsets-gitestoffsets.o: gitestoffsets.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gitestoffsets_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gitestoffsets-gitestoffsets.o -MD -MP -MF $(DEPDIR)/gitestoffsets-gitestoffsets.Tpo -c -o gitestoffsets-gitestoffsets.o `test -f 'gitestoffsets.c' || echo '$(srcdir)/'`gitestoffsets.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gitestoffsets_CPPFLAGS) $(CPPFLAGS) $(gitestoffsets_CFLAGS) $(CFLAGS) -MT gitestoffsets-gitestoffsets.o -MD -MP -MF $(DEPDIR)/gitestoffsets-gitestoffsets.Tpo -c -o gitestoffsets-gitestoffsets.o `test -f 'gitestoffsets.c' || echo '$(srcdir)/'`gitestoffsets.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/gitestoffsets-gitestoffsets.Tpo $(DEPDIR)/gitestoffsets-gitestoffsets.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gitestoffsets.c' object='gitestoffsets-gitestoffsets.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gitestoffsets_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gitestoffsets-gitestoffsets.o `test -f 'gitestoffsets.c' || echo '$(srcdir)/'`gitestoffsets.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gitestoffsets_CPPFLAGS) $(CPPFLAGS) $(gitestoffsets_CFLAGS) $(CFLAGS) -c -o gitestoffsets-gitestoffsets.o `test -f 'gitestoffsets.c' || echo '$(srcdir)/'`gitestoffsets.c
 
 gitestoffsets-gitestoffsets.obj: gitestoffsets.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gitestoffsets_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gitestoffsets-gitestoffsets.obj -MD -MP -MF $(DEPDIR)/gitestoffsets-gitestoffsets.Tpo -c -o gitestoffsets-gitestoffsets.obj `if test -f 'gitestoffsets.c'; then $(CYGPATH_W) 'gitestoffsets.c'; else $(CYGPATH_W) '$(srcdir)/gitestoffsets.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gitestoffsets_CPPFLAGS) $(CPPFLAGS) $(gitestoffsets_CFLAGS) $(CFLAGS) -MT gitestoffsets-gitestoffsets.obj -MD -MP -MF $(DEPDIR)/gitestoffsets-gitestoffsets.Tpo -c -o gitestoffsets-gitestoffsets.obj `if test -f 'gitestoffsets.c'; then $(CYGPATH_W) 'gitestoffsets.c'; else $(CYGPATH_W) '$(srcdir)/gitestoffsets.c'; fi`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/gitestoffsets-gitestoffsets.Tpo $(DEPDIR)/gitestoffsets-gitestoffsets.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gitestoffsets.c' object='gitestoffsets-gitestoffsets.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gitestoffsets_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gitestoffsets-gitestoffsets.obj `if test -f 'gitestoffsets.c'; then $(CYGPATH_W) 'gitestoffsets.c'; else $(CYGPATH_W) '$(srcdir)/gitestoffsets.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gitestoffsets_CPPFLAGS) $(CPPFLAGS) $(gitestoffsets_CFLAGS) $(CFLAGS) -c -o gitestoffsets-gitestoffsets.obj `if test -f 'gitestoffsets.c'; then $(CYGPATH_W) 'gitestoffsets.c'; else $(CYGPATH_W) '$(srcdir)/gitestoffsets.c'; fi`
 
 mostlyclean-libtool:
 	-rm -f *.lo
diff --git a/tests/offsets/test_offsets.py b/tests/offsets/test_offsets.py
new file mode 100755
index 0000000..84a852d
--- /dev/null
+++ b/tests/offsets/test_offsets.py
@@ -0,0 +1,48 @@
+import io
+import os
+import tempfile
+import difflib
+import contextlib
+import subprocess
+import unittest
+
+
+@contextlib.contextmanager
+def temp_filename(*args, **kwargs):
+    fd, name = tempfile.mkstemp(*args, **kwargs)
+    try:
+        os.close(fd)
+        yield name
+    finally:
+        os.unlink(name)
+
+
+class TestOffsets(unittest.TestCase):
+
+    def test_main(self):
+        exe = ".exe" if os.name == "nt" else ""
+        gitestoffsets = os.path.join(os.environ["builddir"], "gitestoffsets" + exe)
+
+        env = os.environ.copy()
+        env["GI_TYPELIB_PATH"] = os.pathsep.join(
+            [os.environ["builddir"], os.environ["top_builddir"]])
+
+        with temp_filename(suffix=".compiled") as compiled_name, \
+                temp_filename(suffix=".introspected") as introspected_name:
+
+            subprocess.check_call(
+                [gitestoffsets, compiled_name, introspected_name], env=env)
+
+            with io.open(compiled_name, encoding="utf-8") as compiled, \
+                    io.open(introspected_name, encoding="utf-8") as introspected:
+
+                result = difflib.unified_diff(
+                    compiled.readlines(), introspected.readlines(),
+                    fromfile=compiled_name, tofile=introspected_name)
+                result = "".join(result)
+                if result:
+                    raise AssertionError(result)
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tests/repository/Makefile.am b/tests/repository/Makefile.am
index 6b4b782..b6bde9d 100644
--- a/tests/repository/Makefile.am
+++ b/tests/repository/Makefile.am
@@ -1,5 +1,5 @@
-AM_CFLAGS = $(GOBJECT_CFLAGS)
-AM_LDFLAGS = -module -avoid-version
+AM_CFLAGS = $(WARN_CFLAGS) $(GOBJECT_CFLAGS)
+AM_LDFLAGS = $(WARN_LDFLAGS) -module -avoid-version
 LIBS = $(GOBJECT_LIBS)
 
 EXTRA_PROGRAMS = gitestrepo giteststructinfo gitestthrows gitypelibtest
diff --git a/tests/repository/Makefile.in b/tests/repository/Makefile.in
index 136f05b..ae027b3 100644
--- a/tests/repository/Makefile.in
+++ b/tests/repository/Makefile.in
@@ -509,6 +509,7 @@ PYTHON_INCLUDES = @PYTHON_INCLUDES@
 PYTHON_LIBS = @PYTHON_LIBS@
 PYTHON_PLATFORM = @PYTHON_PLATFORM@
 PYTHON_PREFIX = @PYTHON_PREFIX@
+PYTHON_SO = @PYTHON_SO@
 PYTHON_VERSION = @PYTHON_VERSION@
 RANLIB = @RANLIB@
 SCANNER_CFLAGS = @SCANNER_CFLAGS@
@@ -518,6 +519,11 @@ SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
+WARN_CFLAGS = @WARN_CFLAGS@
+WARN_CFLAGS_FLEX = @WARN_CFLAGS_FLEX@
+WARN_CFLAGS_PYTHON = @WARN_CFLAGS_PYTHON@
+WARN_LDFLAGS = @WARN_LDFLAGS@
+WARN_SCANNERFLAGS = @WARN_SCANNERFLAGS@
 YACC = @YACC@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
@@ -576,8 +582,8 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-AM_CFLAGS = $(GOBJECT_CFLAGS)
-AM_LDFLAGS = -module -avoid-version
+AM_CFLAGS = $(WARN_CFLAGS) $(GOBJECT_CFLAGS)
+AM_LDFLAGS = $(WARN_LDFLAGS) -module -avoid-version
 CLEANFILES = $(EXTRA_PROGRAMS)
 gitestrepo_SOURCES = gitestrepo.c
 gitestrepo_CPPFLAGS = $(GIREPO_CFLAGS) -I$(top_srcdir)/girepository
diff --git a/tests/scanner/Makefile.am b/tests/scanner/Makefile.am
index 6b705f5..f707585 100644
--- a/tests/scanner/Makefile.am
+++ b/tests/scanner/Makefile.am
@@ -22,10 +22,10 @@ CLEANFILES += $(EXTRA_LTLIBRARIES)
 
 GI_SCANNER_CFLAGS = -I$(top_srcdir)/tests
 AM_CPPFLAGS = -I$(top_srcdir)/girepository
-AM_CFLAGS = $(GIO_CFLAGS) $(GOBJECT_CFLAGS) $(GTHREAD_CFLAGS) $(GI_HIDDEN_VISIBILITY_CFLAGS) $(GI_SCANNER_CFLAGS)
+AM_CFLAGS = $(GIO_CFLAGS) $(GOBJECT_CFLAGS) $(GTHREAD_CFLAGS) $(GI_HIDDEN_VISIBILITY_CFLAGS) $(GI_SCANNER_CFLAGS) $(WARN_CFLAGS)
 # -rpath needed to force libtool to build a shared library for a check_LTLIBRARIES
 # target. See http://lists.gnu.org/archive/html/automake/2005-10/msg00107.html
-AM_LDFLAGS = -rpath /unused -avoid-version
+AM_LDFLAGS = $(WARN_LDFLAGS) -rpath /unused -avoid-version
 LIBS = $(GOBJECT_LIBS) $(GTHREAD_LIBS)
 
 libsletter_la_SOURCES = sletter.c sletter.h
@@ -229,14 +229,17 @@ CHECKDOCS =
 endif
 
 PYTESTS = \
+	test_shlibs.py \
+	test_pkgconfig.py \
 	test_sourcescanner.py \
-	test_transformer.py
+	test_transformer.py \
+	test_xmlwriter.py
 
 TESTS = $(CHECKGIRS) $(CHECKDOCS) $(TYPELIBS) $(PYTESTS)
 TESTS_ENVIRONMENT = env srcdir=$(srcdir) top_srcdir=$(top_srcdir) builddir=$(builddir) top_builddir=$(top_builddir) \
 	CC="$(CC)" \
 	PYTHON=$(PYTHON) UNINSTALLED_INTROSPECTION_SRCDIR=$(top_srcdir)
-LOG_COMPILER = $(top_srcdir)/tests/gi-tester
+LOG_COMPILER = $(PYTHON) $(top_srcdir)/tests/gi-tester
 
 EXTRA_DIST += \
 	$(PYTESTS) \
diff --git a/tests/scanner/Makefile.in b/tests/scanner/Makefile.in
index 04ae974..c6a15d1 100644
--- a/tests/scanner/Makefile.in
+++ b/tests/scanner/Makefile.in
@@ -648,6 +648,7 @@ PYTHON_INCLUDES = @PYTHON_INCLUDES@
 PYTHON_LIBS = @PYTHON_LIBS@
 PYTHON_PLATFORM = @PYTHON_PLATFORM@
 PYTHON_PREFIX = @PYTHON_PREFIX@
+PYTHON_SO = @PYTHON_SO@
 PYTHON_VERSION = @PYTHON_VERSION@
 RANLIB = @RANLIB@
 SCANNER_CFLAGS = @SCANNER_CFLAGS@
@@ -657,6 +658,11 @@ SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
+WARN_CFLAGS = @WARN_CFLAGS@
+WARN_CFLAGS_FLEX = @WARN_CFLAGS_FLEX@
+WARN_CFLAGS_PYTHON = @WARN_CFLAGS_PYTHON@
+WARN_LDFLAGS = @WARN_LDFLAGS@
+WARN_SCANNERFLAGS = @WARN_SCANNERFLAGS@
 YACC = @YACC@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
@@ -781,12 +787,8 @@ _gir_includes = $(foreach include,$($(_gir_name)_INCLUDES),--include=$(include))
 _gir_export_packages = $(foreach pkg,$($(_gir_name)_EXPORT_PACKAGES),--pkg-export=$(pkg))
 _gir_c_includes = $(foreach include,$($(_gir_name)_C_INCLUDES),--c-include=$(include))
 
-# Reuse the LIBTOOL variable from automake if it's set, but
-# work around MSYS weirdness: When running g-ir-scanner, MSYS changes
-# a command-line argument --libtool="/bin/sh ../../libtool" into
-# --libtool=c:/opt/msys/1.0/bin/libtool. So just use sh.exe without path
-# because we already "know" where the libtool configure produced is.
-_gir_libtool = $(if $(findstring MINGW,$(shell uname -s)),--libtool="$(top_builddir)/libtool",$(if $(LIBTOOL),--libtool="$(LIBTOOL)"))
+# Reuse the LIBTOOL variable from automake if it's set
+_gir_libtool = $(if $(LIBTOOL),--libtool="$(LIBTOOL)")
 
 # Macros for AM_SILENT_RULES prettiness
 _gir_verbosity = $(if $(AM_DEFAULT_VERBOSITY),$(AM_DEFAULT_VERBOSITY),1)
@@ -816,10 +818,11 @@ EXTRA_LTLIBRARIES = \
 
 GI_SCANNER_CFLAGS = -I$(top_srcdir)/tests
 AM_CPPFLAGS = -I$(top_srcdir)/girepository
-AM_CFLAGS = $(GIO_CFLAGS) $(GOBJECT_CFLAGS) $(GTHREAD_CFLAGS) $(GI_HIDDEN_VISIBILITY_CFLAGS) $(GI_SCANNER_CFLAGS)
+AM_CFLAGS = $(GIO_CFLAGS) $(GOBJECT_CFLAGS) $(GTHREAD_CFLAGS) $(GI_HIDDEN_VISIBILITY_CFLAGS) $(GI_SCANNER_CFLAGS) $(WARN_CFLAGS)
 # -rpath needed to force libtool to build a shared library for a check_LTLIBRARIES
 # target. See http://lists.gnu.org/archive/html/automake/2005-10/msg00107.html
-AM_LDFLAGS = -rpath /unused -avoid-version $(am__append_4)
+AM_LDFLAGS = $(WARN_LDFLAGS) -rpath /unused -avoid-version \
+	$(am__append_4)
 libsletter_la_SOURCES = sletter.c sletter.h
 libsletter_la_LIBADD = $(GIO_LIBS)
 libsletter_la_CFLAGS = $(AM_CFLAGS)
@@ -918,14 +921,17 @@ Typedefs_1_0_gir_SCANNERFLAGS = $(INTROSPECTION_SCANNER_ARGS) --c-include="typed
 @BUILD_DOCTOOL_TRUE@MALLARD_CLEAN = $(DOCGIRS:.gir=-C)/* $(DOCGIRS:.gir=-Python)/* $(DOCGIRS:.gir=-Gjs)/* $(DOCGIRS:.gir=-sections.txt)
 @BUILD_DOCTOOL_TRUE@EXPECTED_MALLARD_DIRS = $(MALLARD_DIRS:=-expected)
 PYTESTS = \
+	test_shlibs.py \
+	test_pkgconfig.py \
 	test_sourcescanner.py \
-	test_transformer.py
+	test_transformer.py \
+	test_xmlwriter.py
 
 TESTS_ENVIRONMENT = env srcdir=$(srcdir) top_srcdir=$(top_srcdir) builddir=$(builddir) top_builddir=$(top_builddir) \
 	CC="$(CC)" \
 	PYTHON=$(PYTHON) UNINSTALLED_INTROSPECTION_SRCDIR=$(top_srcdir)
 
-LOG_COMPILER = $(top_srcdir)/tests/gi-tester
+LOG_COMPILER = $(PYTHON) $(top_srcdir)/tests/gi-tester
 all: all-recursive
 
 .SUFFIXES:
@@ -1498,6 +1504,20 @@ Bar-1.0.typelib.log: Bar-1.0.typelib
 	--log-file $$b.log --trs-file $$b.trs \
 	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
 	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test_shlibs.py.log: test_shlibs.py
+	@p='test_shlibs.py'; \
+	b='test_shlibs.py'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test_pkgconfig.py.log: test_pkgconfig.py
+	@p='test_pkgconfig.py'; \
+	b='test_pkgconfig.py'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 test_sourcescanner.py.log: test_sourcescanner.py
 	@p='test_sourcescanner.py'; \
 	b='test_sourcescanner.py'; \
@@ -1512,6 +1532,13 @@ test_transformer.py.log: test_transformer.py
 	--log-file $$b.log --trs-file $$b.trs \
 	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
 	"$$tst" $(AM_TESTS_FD_REDIRECT)
+test_xmlwriter.py.log: test_xmlwriter.py
+	@p='test_xmlwriter.py'; \
+	b='test_xmlwriter.py'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 .test.log:
 	@p='$<'; \
 	$(am__set_b); \
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestInterface-interface-signal.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestInterface-interface-signal.page
new file mode 100644
index 0000000..d7ac0a7
--- /dev/null
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestInterface-interface-signal.page
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+<page id="Regress.TestInterface-interface-signal"
+      type="topic"
+      style="signal"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestInterface" group="signal" type="guide"/>
+    <title type="link" role="topic">interface-signal</title>
+  </info>
+  <title>Regress.TestInterface::interface-signal</title>
+  <synopsis><code mime="text/x-csrc">
+void interface-signal (gpointer ptr);
+  </code></synopsis>
+
+
+<terms>
+<item>
+<title><code>ptr</code></title>
+  <p>the code must look up the signal with
+  g_interface_info_find_signal() in order to get this to work.</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
+
+</page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestInterface.emit_signal.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestInterface.emit_signal.page
new file mode 100644
index 0000000..cf5f700
--- /dev/null
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestInterface.emit_signal.page
@@ -0,0 +1,38 @@
+<?xml version="1.0"?>
+<page id="Regress.TestInterface.emit_signal"
+      type="topic"
+      style="method"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestInterface" group="method" type="guide"/>
+    <api:function>
+      <api:returns>
+        <api:type>void</api:type>
+      </api:returns>
+      <api:name>regress_test_interface_emit_signal</api:name>
+      <api:arg>
+        <api:type>RegressTestInterface*</api:type>
+        <api:name>self</api:name>
+      </api:arg>
+    </api:function>
+  </info>
+  <title>regress_test_interface_emit_signal</title>
+  <synopsis><code mime="text/x-csrc">
+void regress_test_interface_emit_signal (RegressTestInterface* self);
+  </code></synopsis>
+
+
+<terms>
+<item>
+<title><code>self</code></title>
+  <p>the object to emit the signal</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
+
+</page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-byte-array.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-byte-array.page
new file mode 100644
index 0000000..368ed46
--- /dev/null
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-byte-array.page
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<page id="Regress.TestObj-byte-array"
+      type="topic"
+      style="property"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestObj" group="property" type="guide"/>
+    <title type="link" role="topic">byte-array</title>
+  </info>
+  <title>Regress.TestObj:byte-array</title>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-inout-int.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-inout-int.page
new file mode 100644
index 0000000..ce3d96f
--- /dev/null
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-inout-int.page
@@ -0,0 +1,31 @@
+<?xml version="1.0"?>
+<page id="Regress.TestObj-sig-with-inout-int"
+      type="topic"
+      style="signal"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestObj" group="signal" type="guide"/>
+    <title type="link" role="topic">sig-with-inout-int</title>
+  </info>
+  <title>Regress.TestObj::sig-with-inout-int</title>
+  <synopsis><code mime="text/x-csrc">
+void sig-with-inout-int (gpointer position);
+  </code></synopsis>
+  <p>This signal is modeled after GtkEditable::insert-text.</p>
+
+<terms>
+<item>
+<title><code>position</code></title>
+  <p>The position, in characters, at which to
+    insert the new text. This is an in-out paramter. After the signal
+    emission is finished, it should point after the newly inserted text.</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
+
+</page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.emit_sig_with_inout_int.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.emit_sig_with_inout_int.page
new file mode 100644
index 0000000..3dabfea
--- /dev/null
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.emit_sig_with_inout_int.page
@@ -0,0 +1,38 @@
+<?xml version="1.0"?>
+<page id="Regress.TestObj.emit_sig_with_inout_int"
+      type="topic"
+      style="method"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestObj" group="method" type="guide"/>
+    <api:function>
+      <api:returns>
+        <api:type>void</api:type>
+      </api:returns>
+      <api:name>regress_test_obj_emit_sig_with_inout_int</api:name>
+      <api:arg>
+        <api:type>RegressTestObj*</api:type>
+        <api:name>obj</api:name>
+      </api:arg>
+    </api:function>
+  </info>
+  <title>regress_test_obj_emit_sig_with_inout_int</title>
+  <synopsis><code mime="text/x-csrc">
+void regress_test_obj_emit_sig_with_inout_int (RegressTestObj* obj);
+  </code></synopsis>
+  <p>The signal handler must increment the inout parameter by 1.</p>
+
+<terms>
+<item>
+<title><code>obj</code></title>
+  <p>The object to emit the signal.</p>
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
+
+</page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_out_container.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_out_container.page
index 3e27a2e..827e480 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_out_container.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_out_container.page
@@ -16,7 +16,7 @@
   </info>
   <title>regress_test_strv_out_container</title>
   <synopsis><code mime="text/x-csrc">
-char** regress_test_strv_out_container (void);
+const char** regress_test_strv_out_container (void);
   </code></synopsis>
 
 
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInterface-interface-signal.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInterface-interface-signal.page
new file mode 100644
index 0000000..ae24b90
--- /dev/null
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInterface-interface-signal.page
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+<page id="Regress.TestInterface-interface-signal"
+      type="topic"
+      style="signal"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestInterface" group="signal" type="guide"/>
+    <title type="link" role="topic">interface-signal</title>
+  </info>
+  <title>Regress.TestInterface::interface-signal</title>
+  <synopsis><code mime="text/x-gjs">
+connect('interface-signal', function (testInterface, ptr: Number(gint), ): void);
+  </code></synopsis>
+
+
+<terms>
+<item>
+<title><code>testInterface</code></title>
+<p>instance of <link xref="Regress.TestInterface"/> that is emitting the signal</p>
+</item>
+<item>
+<title><code>ptr</code></title>
+  <p>the code must look up the signal with
+  g_interface_info_find_signal() in order to get this to work.</p>
+</item>
+</terms>
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInterface.emit_signal.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInterface.emit_signal.page
new file mode 100644
index 0000000..4e51736
--- /dev/null
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInterface.emit_signal.page
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<page id="Regress.TestInterface.emit_signal"
+      type="topic"
+      style="method"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestInterface" group="method" type="guide"/>
+    <api:function>
+      <api:returns>
+        <api:type>void</api:type>
+      </api:returns>
+      <api:name>regress_test_interface_emit_signal</api:name>
+    </api:function>
+  </info>
+  <title>Regress.TestInterface.prototype.emit_signal</title>
+  <synopsis><code mime="text/x-gjs">
+function emit_signal(): void {
+    // Gjs wrapper for regress_test_interface_emit_signal()
+}
+  </code></synopsis>
+
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-byte-array.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-byte-array.page
new file mode 100644
index 0000000..73d0b5d
--- /dev/null
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-byte-array.page
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<page id="Regress.TestObj-byte-array"
+      type="topic"
+      style="property"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestObj" group="property" type="guide"/>
+    <title type="link" role="topic">byte-array</title>
+  </info>
+  <title>Regress.TestObj.byte_array</title>
+  <synopsis><code mime="text/x-gjs">
+TestObj.byte_array: ByteArray (Read / Write / Construct)
+  </code></synopsis>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-inout-int.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-inout-int.page
new file mode 100644
index 0000000..a90ab67
--- /dev/null
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-inout-int.page
@@ -0,0 +1,31 @@
+<?xml version="1.0"?>
+<page id="Regress.TestObj-sig-with-inout-int"
+      type="topic"
+      style="signal"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestObj" group="signal" type="guide"/>
+    <title type="link" role="topic">sig-with-inout-int</title>
+  </info>
+  <title>Regress.TestObj::sig-with-inout-int</title>
+  <synopsis><code mime="text/x-gjs">
+connect('sig-with-inout-int', function (testObj, position: Number(gint), ): void);
+  </code></synopsis>
+  <p>This signal is modeled after GtkEditable::insert-text.</p>
+
+<terms>
+<item>
+<title><code>testObj</code></title>
+<p>instance of <link xref="Regress.TestObj"/> that is emitting the signal</p>
+</item>
+<item>
+<title><code>position</code></title>
+  <p>The position, in characters, at which to
+    insert the new text. This is an in-out paramter. After the signal
+    emission is finished, it should point after the newly inserted text.</p>
+</item>
+</terms>
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_inout_int.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_inout_int.page
new file mode 100644
index 0000000..f7f8ecc
--- /dev/null
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_inout_int.page
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<page id="Regress.TestObj.emit_sig_with_inout_int"
+      type="topic"
+      style="method"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestObj" group="method" type="guide"/>
+    <api:function>
+      <api:returns>
+        <api:type>void</api:type>
+      </api:returns>
+      <api:name>regress_test_obj_emit_sig_with_inout_int</api:name>
+    </api:function>
+  </info>
+  <title>Regress.TestObj.prototype.emit_sig_with_inout_int</title>
+  <synopsis><code mime="text/x-gjs">
+function emit_sig_with_inout_int(): void {
+    // Gjs wrapper for regress_test_obj_emit_sig_with_inout_int()
+}
+  </code></synopsis>
+  <p>The signal handler must increment the inout parameter by 1.</p>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.page
index d0cdfaf..bacdcff 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.page
@@ -13,6 +13,7 @@
 const Regress = imports.gi.Regress;
 
 let testObj = new Regress.TestObj({
+    <link xref='Regress.TestObj-byte-array'>byte_array</link>: value,
     <link xref='Regress.TestObj-name-conflict'>name_conflict</link>: value,
 });
   </code></synopsis>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestInterface-interface-signal.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestInterface-interface-signal.page
new file mode 100644
index 0000000..7ec79a3
--- /dev/null
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestInterface-interface-signal.page
@@ -0,0 +1,36 @@
+<?xml version="1.0"?>
+<page id="Regress.TestInterface-interface-signal"
+      type="topic"
+      style="signal"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestInterface" group="signal" type="guide"/>
+    <title type="link" role="topic">interface-signal</title>
+  </info>
+  <title>Regress.TestInterface::interface-signal</title>
+  <synopsis><code mime="text/x-python">
+def callback(test_interface, ptr, user_param1, ...)
+  </code></synopsis>
+
+
+<terms>
+<item>
+<title><code>test_interface</code></title>
+<p>instance of <link xref="Regress.TestInterface"/> that is emitting the signal</p>
+</item>
+<item>
+<title><code>ptr</code></title>
+  <p>the code must look up the signal with
+  g_interface_info_find_signal() in order to get this to work.</p>
+</item>
+<title><code>user_param1</code></title>
+<p>first user parameter (if any) specified with the connect() method</p>
+<item>
+<title><code>...</code></title>
+<p>additional user parameters (if any)</p>
+</item>
+</terms>
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestInterface.emit_signal.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestInterface.emit_signal.page
new file mode 100644
index 0000000..72d5b6d
--- /dev/null
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestInterface.emit_signal.page
@@ -0,0 +1,37 @@
+<?xml version="1.0"?>
+<page id="Regress.TestInterface.emit_signal"
+      type="topic"
+      style="method"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestInterface" group="method" type="guide"/>
+    <api:function>
+      <api:returns>
+        <api:type>none</api:type>
+      </api:returns>
+      <api:name>regress_test_interface_emit_signal</api:name>
+      <api:arg>
+        <api:type>Regress.TestInterface</api:type>
+        <api:name>self</api:name>
+      </api:arg>
+    </api:function>
+  </info>
+  <title>Regress.TestInterface.emit_signal</title>
+  <synopsis><code mime="text/x-python">
+@accepts(Regress.TestInterface)
+@returns(none)
+def emit_signal(self):
+    # Python wrapper for regress_test_interface_emit_signal()
+  </code></synopsis>
+
+
+<terms>
+<item>
+<title><code>self</code></title>
+  <p>the object to emit the signal</p>
+</item>
+</terms>
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-byte-array.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-byte-array.page
new file mode 100644
index 0000000..62b5289
--- /dev/null
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-byte-array.page
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<page id="Regress.TestObj-byte-array"
+      type="topic"
+      style="property"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestObj" group="property" type="guide"/>
+    <title type="link" role="topic">byte-array</title>
+  </info>
+  <title>Regress.TestObj:byte-array</title>
+  <synopsis><code mime="text/x-python">
+"byte-array"             [guint8]                : Read / Write / Construct
+  </code></synopsis>
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-inout-int.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-inout-int.page
new file mode 100644
index 0000000..7547a26
--- /dev/null
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-inout-int.page
@@ -0,0 +1,37 @@
+<?xml version="1.0"?>
+<page id="Regress.TestObj-sig-with-inout-int"
+      type="topic"
+      style="signal"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestObj" group="signal" type="guide"/>
+    <title type="link" role="topic">sig-with-inout-int</title>
+  </info>
+  <title>Regress.TestObj::sig-with-inout-int</title>
+  <synopsis><code mime="text/x-python">
+def callback(test_obj, position, user_param1, ...)
+  </code></synopsis>
+  <p>This signal is modeled after GtkEditable::insert-text.</p>
+
+<terms>
+<item>
+<title><code>test_obj</code></title>
+<p>instance of <link xref="Regress.TestObj"/> that is emitting the signal</p>
+</item>
+<item>
+<title><code>position</code></title>
+  <p>The position, in characters, at which to
+    insert the new text. This is an in-out paramter. After the signal
+    emission is finished, it should point after the newly inserted text.</p>
+</item>
+<title><code>user_param1</code></title>
+<p>first user parameter (if any) specified with the connect() method</p>
+<item>
+<title><code>...</code></title>
+<p>additional user parameters (if any)</p>
+</item>
+</terms>
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_inout_int.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_inout_int.page
new file mode 100644
index 0000000..f2ae270
--- /dev/null
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_inout_int.page
@@ -0,0 +1,37 @@
+<?xml version="1.0"?>
+<page id="Regress.TestObj.emit_sig_with_inout_int"
+      type="topic"
+      style="method"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestObj" group="method" type="guide"/>
+    <api:function>
+      <api:returns>
+        <api:type>none</api:type>
+      </api:returns>
+      <api:name>regress_test_obj_emit_sig_with_inout_int</api:name>
+      <api:arg>
+        <api:type>Regress.TestObj</api:type>
+        <api:name>self</api:name>
+      </api:arg>
+    </api:function>
+  </info>
+  <title>Regress.TestObj.emit_sig_with_inout_int</title>
+  <synopsis><code mime="text/x-python">
+@accepts(Regress.TestObj)
+@returns(none)
+def emit_sig_with_inout_int(self):
+    # Python wrapper for regress_test_obj_emit_sig_with_inout_int()
+  </code></synopsis>
+  <p>The signal handler must increment the inout parameter by 1.</p>
+
+<terms>
+<item>
+<title><code>self</code></title>
+  <p>The object to emit the signal.</p>
+</item>
+</terms>
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.page
index e28fae6..6f45704 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.page
@@ -12,7 +12,7 @@
   <synopsis><code>
 from gi.repository import Regress
 
-test_obj = Regress.TestObj(<link xref='Regress.TestObj-bare'>bare</link>=value, <link xref='Regress.TestObj-boxed'>boxed</link>=value, <link xref='Regress.TestObj-double'>double</link>=value, <link xref='Regress.TestObj-float'>float</link>=value, <link xref='Regress.TestObj-gtype'>gtype</link>=value, <link xref='Regress.TestObj-hash-table'>hash_table</link>=value, <link xref='Regress.TestObj-hash-table-old'>hash_table_old</link>=value, <link xref='Regress.TestObj-int'>int</link>=value, <link xref='Regress.TestObj-list'>list</link>=value, <link xref='Regress.TestObj-list-old'>list_old</link>=value, <link xref='Regress.TestObj-name-conflict'>name_conflict</link>=value, <link xref='Regress.TestObj-pptrarray'>pptrarray</link>=value, <link xref='Regress.TestObj-string'>string</link>=value)
+test_obj = Regress.TestObj(<link xref='Regress.TestObj-bare'>bare</link>=value, <link xref='Regress.TestObj-boxed'>boxed</link>=value, <link xref='Regress.TestObj-byte-array'>byte_array</link>=value, <link xref='Regress.TestObj-double'>double</link>=value, <link xref='Regress.TestObj-float'>float</link>=value, <link xref='Regress.TestObj-gtype'>gtype</link>=value, <link xref='Regress.TestObj-hash-table'>hash_table</link>=value, <link xref='Regress.TestObj-hash-table-old'>hash_table_old</link>=value, <link xref='Regress.TestObj-int'>int</link>=value, <link xref='Regress.TestObj-list'>list</link>=value, <link xref='Regress.TestObj-list-old'>list_old</link>=value, <link xref='Regress.TestObj-name-conflict'>name_conflict</link>=value, <link xref='Regress.TestObj-pptrarray'>pptrarray</link>=value, <link xref='Regress.TestObj-string'>string</link>=value)
   </code></synopsis>
 
 
diff --git a/tests/scanner/Regress-1.0-expected.gir b/tests/scanner/Regress-1.0-expected.gir
index cd47fcb..ad6af89 100644
--- a/tests/scanner/Regress-1.0-expected.gir
+++ b/tests/scanner/Regress-1.0-expected.gir
@@ -623,7 +623,7 @@ each string needs to be freed.</doc>
           </instance-parameter>
           <parameter name="data" transfer-ownership="none">
             <doc xml:space="preserve">The data</doc>
-            <array length="1" zero-terminated="0" c:type="guchar*">
+            <array length="1" zero-terminated="0" c:type="const guchar*">
               <type name="guint8" c:type="guchar"/>
             </array>
           </parameter>
@@ -646,7 +646,7 @@ each string needs to be freed.</doc>
           </instance-parameter>
           <parameter name="data" transfer-ownership="none">
             <doc xml:space="preserve">The data</doc>
-            <array length="1" zero-terminated="0" c:type="gchar*">
+            <array length="1" zero-terminated="0" c:type="const gchar*">
               <type name="gint8"/>
             </array>
           </parameter>
@@ -2374,7 +2374,7 @@ use it should be.</doc>
           <type name="gsize" c:type="gsize"/>
         </parameter>
         <parameter name="two" transfer-ownership="none">
-          <array length="3" zero-terminated="0" c:type="char**">
+          <array length="3" zero-terminated="0" c:type="const char**">
             <type name="utf8"/>
           </array>
         </parameter>
@@ -2907,6 +2907,30 @@ use it should be.</doc>
                glib:type-name="RegressTestInterface"
                glib:get-type="regress_test_interface_get_type"
                glib:type-struct="TestInterfaceIface">
+      <method name="emit_signal"
+              c:identifier="regress_test_interface_emit_signal">
+        <return-value transfer-ownership="none">
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <instance-parameter name="self" transfer-ownership="none">
+            <doc xml:space="preserve">the object to emit the signal</doc>
+            <type name="TestInterface" c:type="RegressTestInterface*"/>
+          </instance-parameter>
+        </parameters>
+      </method>
+      <glib:signal name="interface-signal" when="last">
+        <return-value transfer-ownership="none">
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="ptr" transfer-ownership="none">
+            <doc xml:space="preserve">the code must look up the signal with
+  g_interface_info_find_signal() in order to get this to work.</doc>
+            <type name="gint" c:type="gpointer"/>
+          </parameter>
+        </parameters>
+      </glib:signal>
     </interface>
     <record name="TestInterfaceIface"
             c:type="RegressTestInterfaceIface"
@@ -3110,6 +3134,19 @@ case.</doc>
           </instance-parameter>
         </parameters>
       </method>
+      <method name="emit_sig_with_inout_int"
+              c:identifier="regress_test_obj_emit_sig_with_inout_int">
+        <doc xml:space="preserve">The signal handler must increment the inout parameter by 1.</doc>
+        <return-value transfer-ownership="none">
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <instance-parameter name="obj" transfer-ownership="none">
+            <doc xml:space="preserve">The object to emit the signal.</doc>
+            <type name="TestObj" c:type="RegressTestObj*"/>
+          </instance-parameter>
+        </parameters>
+      </method>
       <method name="emit_sig_with_int64"
               c:identifier="regress_test_obj_emit_sig_with_int64">
         <return-value transfer-ownership="none">
@@ -3576,6 +3613,14 @@ raise an error.</doc>
       <property name="boxed" writable="1" transfer-ownership="none">
         <type name="TestBoxed"/>
       </property>
+      <property name="byte-array"
+                writable="1"
+                construct="1"
+                transfer-ownership="none">
+        <array name="GLib.ByteArray">
+          <type name="guint8" c:type="guint8"/>
+        </array>
+      </property>
       <property name="double" writable="1" transfer-ownership="none">
         <type name="gdouble" c:type="gdouble"/>
       </property>
@@ -3755,6 +3800,23 @@ raise from the introspection client language.</doc>
           </parameter>
         </parameters>
       </glib:signal>
+      <glib:signal name="sig-with-inout-int" when="last">
+        <doc xml:space="preserve">This signal is modeled after GtkEditable::insert-text.</doc>
+        <return-value transfer-ownership="none">
+          <type name="none" c:type="void"/>
+        </return-value>
+        <parameters>
+          <parameter name="position"
+                     direction="inout"
+                     caller-allocates="0"
+                     transfer-ownership="full">
+            <doc xml:space="preserve">The position, in characters, at which to
+    insert the new text. This is an in-out paramter. After the signal
+    emission is finished, it should point after the newly inserted text.</doc>
+            <type name="gint" c:type="gpointer"/>
+          </parameter>
+        </parameters>
+      </glib:signal>
       <glib:signal name="sig-with-int64-prop" when="last">
         <doc xml:space="preserve">You can use this with regress_test_obj_emit_sig_with_int64, or raise from
 the introspection client langage.</doc>
@@ -4528,7 +4590,7 @@ detection, and fixing it via annotations.</doc>
           <type name="guint" c:type="guint"/>
         </parameter>
         <parameter name="properties" transfer-ownership="none">
-          <array length="0" zero-terminated="0" c:type="gchar*">
+          <array length="0" zero-terminated="0" c:type="const gchar* const*">
             <type name="utf8"/>
           </array>
         </parameter>
@@ -6547,7 +6609,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=685399</doc>
     <function name="test_strv_out_container"
               c:identifier="regress_test_strv_out_container">
       <return-value transfer-ownership="container">
-        <array c:type="char**">
+        <array c:type="const char**">
           <type name="utf8"/>
         </array>
       </return-value>
@@ -6561,7 +6623,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=685399</doc>
                    direction="out"
                    caller-allocates="0"
                    transfer-ownership="container">
-          <array c:type="char***">
+          <array c:type="const char***">
             <type name="utf8" c:type="char**"/>
           </array>
         </parameter>
diff --git a/tests/scanner/Regress-1.0-sections-expected.txt b/tests/scanner/Regress-1.0-sections-expected.txt
index a9abd20..b7aa62f 100644
--- a/tests/scanner/Regress-1.0-sections-expected.txt
+++ b/tests/scanner/Regress-1.0-sections-expected.txt
@@ -331,6 +331,7 @@ regress_test_inherit_drawable_get_size
 <TITLE>RegressTestInterface</TITLE>
 RegressTestInterface
 RegressTestInterfaceIface
+regress_test_interface_emit_signal
 
 <SECTION>
 <FILE>regress-test-obj</FILE>
@@ -340,6 +341,7 @@ RegressTestObjClass
 regress_test_obj_do_matrix
 regress_test_obj_emit_sig_with_array_len_prop
 regress_test_obj_emit_sig_with_foreign_struct
+regress_test_obj_emit_sig_with_inout_int
 regress_test_obj_emit_sig_with_int64
 regress_test_obj_emit_sig_with_obj
 regress_test_obj_emit_sig_with_uint64
diff --git a/tests/scanner/annotation.c b/tests/scanner/annotation.c
index 49bdd24..fb8b48f 100644
--- a/tests/scanner/annotation.c
+++ b/tests/scanner/annotation.c
@@ -400,7 +400,7 @@ regress_annotation_object_get_objects (RegressAnnotationObject *object)
 GObject*
 regress_annotation_object_create_object (RegressAnnotationObject *object)
 {
-  return g_object_ref (object);
+  return G_OBJECT (g_object_ref (object));
 }
 
 /**
@@ -816,7 +816,7 @@ regress_annotation_space_after_comment_bug631690 (void)
 gchar*
 regress_annotation_return_filename (void)
 {
-  return "a utf-8 filename";
+  return g_strdup ("a utf-8 filename");
 }
 
 /**
diff --git a/tests/scanner/annotationparser/Makefile.am b/tests/scanner/annotationparser/Makefile.am
index c00f109..4445808 100644
--- a/tests/scanner/annotationparser/Makefile.am
+++ b/tests/scanner/annotationparser/Makefile.am
@@ -6,7 +6,7 @@ TESTS = \
 
 TESTS_ENVIRONMENT = env builddir=$(builddir) top_builddir=$(top_builddir) srcdir=$(srcdir) top_srcdir=$(top_srcdir) \
 	PYTHON=$(PYTHON) UNINSTALLED_INTROSPECTION_SRCDIR=$(top_srcdir)
-LOG_COMPILER = $(top_srcdir)/tests/gi-tester
+LOG_COMPILER = $(PYTHON) $(top_srcdir)/tests/gi-tester
 
 EXTRA_DIST = \
 	$(TESTS)				\
diff --git a/tests/scanner/annotationparser/Makefile.in b/tests/scanner/annotationparser/Makefile.in
index 7edffd1..8dd3c0e 100644
--- a/tests/scanner/annotationparser/Makefile.in
+++ b/tests/scanner/annotationparser/Makefile.in
@@ -449,6 +449,7 @@ PYTHON_INCLUDES = @PYTHON_INCLUDES@
 PYTHON_LIBS = @PYTHON_LIBS@
 PYTHON_PLATFORM = @PYTHON_PLATFORM@
 PYTHON_PREFIX = @PYTHON_PREFIX@
+PYTHON_SO = @PYTHON_SO@
 PYTHON_VERSION = @PYTHON_VERSION@
 RANLIB = @RANLIB@
 SCANNER_CFLAGS = @SCANNER_CFLAGS@
@@ -458,6 +459,11 @@ SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
+WARN_CFLAGS = @WARN_CFLAGS@
+WARN_CFLAGS_FLEX = @WARN_CFLAGS_FLEX@
+WARN_CFLAGS_PYTHON = @WARN_CFLAGS_PYTHON@
+WARN_LDFLAGS = @WARN_LDFLAGS@
+WARN_SCANNERFLAGS = @WARN_SCANNERFLAGS@
 YACC = @YACC@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
@@ -572,7 +578,7 @@ TESTS = \
 TESTS_ENVIRONMENT = env builddir=$(builddir) top_builddir=$(top_builddir) srcdir=$(srcdir) top_srcdir=$(top_srcdir) \
 	PYTHON=$(PYTHON) UNINSTALLED_INTROSPECTION_SRCDIR=$(top_srcdir)
 
-LOG_COMPILER = $(top_srcdir)/tests/gi-tester
+LOG_COMPILER = $(PYTHON) $(top_srcdir)/tests/gi-tester
 EXTRA_DIST = \
 	$(TESTS)				\
 	README					\
diff --git a/tests/scanner/foo.c b/tests/scanner/foo.c
index 66b2984..2fc8ed9 100644
--- a/tests/scanner/foo.c
+++ b/tests/scanner/foo.c
@@ -10,7 +10,6 @@ int regress_foo_init_argv (int argc, char **argv);
 int regress_foo_init_argv_address (int *argc, char ***argv);
 void regress_foo_private_function (RegressFooObject *regress_foo);
 void regress_foo_test_unsigned (unsigned int uint);
-void regress_foo_interface_do_regress_foo (RegressFooInterface *self, int x);
 void regress_foo_do_regress_foo (RegressFooInterface *self, int x);
 int regress_foo_enum_method (RegressFooEnumType regress_foo_enum);
 RegressFooHidden * regress_foo_hidden_copy (const RegressFooHidden *boxed);
@@ -466,6 +465,12 @@ regress_foo_dbus_data_get_type (void)
   return our_type;
 }
 
+static RegressFooBRect *
+regress_foo_brect_copy (const RegressFooBRect *boxed)
+{
+  return (RegressFooBRect *)g_memdup (boxed, sizeof (RegressFooBRect));
+}
+
 GType
 regress_foo_brect_get_type (void)
 {
@@ -473,11 +478,17 @@ regress_foo_brect_get_type (void)
   
   if (our_type == 0)
     our_type = g_boxed_type_register_static ("RegressFooBRect",
-					     (GBoxedCopyFunc) g_memdup, /* Won't work */
+					     (GBoxedCopyFunc) regress_foo_brect_copy,
 					     (GBoxedFreeFunc) g_free);
   return our_type;
 }
 
+static RegressFooBUnion *
+regress_foo_bunion_copy (const RegressFooBUnion *boxed)
+{
+  return (RegressFooBUnion *)g_memdup (boxed, sizeof (RegressFooBUnion));
+}
+
 GType
 regress_foo_bunion_get_type (void)
 {
@@ -485,7 +496,7 @@ regress_foo_bunion_get_type (void)
   
   if (our_type == 0)
     our_type = g_boxed_type_register_static ("RegressFooBUnion",
-					     (GBoxedCopyFunc) g_memdup, /* Won't work */
+					     (GBoxedCopyFunc) regress_foo_bunion_copy,
 					     (GBoxedFreeFunc) g_free);
   return our_type;
 }
diff --git a/tests/scanner/regress.c b/tests/scanner/regress.c
index 85e00d9..2302209 100644
--- a/tests/scanner/regress.c
+++ b/tests/scanner/regress.c
@@ -292,7 +292,7 @@ regress_test_int_value_arg(const GValue *v)
   return i;
 }
 
-static GValue value;
+static GValue global_value;
 /**
  * regress_test_value_return:
  * @i: an int
@@ -302,12 +302,12 @@ static GValue value;
 const GValue *
 regress_test_value_return(int i)
 {
-  memset(&value, '\0', sizeof(GValue));
+  memset(&global_value, '\0', sizeof(GValue));
 
-  g_value_init (&value, G_TYPE_INT);
-  g_value_set_int (&value, i);
+  g_value_init (&global_value, G_TYPE_INT);
+  g_value_set_int (&global_value, i);
 
-  return &value;
+  return &global_value;
 }
 
 /************************************************************************/
@@ -795,10 +795,10 @@ regress_test_strv_out (void)
  *
  * Return value: (array zero-terminated=1) (transfer container):
  */
-char **
+const char **
 regress_test_strv_out_container (void)
 {
-  char **ret = g_new (char *, 4);
+  const char **ret = g_new (const char *, 4);
   ret[0] = "1";
   ret[1] = "2";
   ret[2] = "3";
@@ -811,9 +811,9 @@ regress_test_strv_out_container (void)
  * @retp: (array zero-terminated=1) (out) (transfer container):
  */
 void
-regress_test_strv_outarg (char ***retp)
+regress_test_strv_outarg (const char ***retp)
 {
-  char **ret = g_new (char *, 4);
+  const char **ret = g_new (const char *, 4);
   ret[0] = "1";
   ret[1] = "2";
   ret[2] = "3";
@@ -1198,7 +1198,7 @@ regress_test_gslist_null_out (GSList **out_list)
 /************************************************************************/
 /* GHash */
 
-static char *table_data[3][2] = {
+static const char *table_data[3][2] = {
   { "foo", "bar" }, { "baz", "bat" }, { "qux", "quux" }
 };
 
@@ -1209,7 +1209,9 @@ regress_test_table_ghash_new_container (void)
   int i;
   hash = g_hash_table_new(g_str_hash, g_str_equal);
   for (i=0; i<3; i++)
-    g_hash_table_insert(hash, table_data[i][0], table_data[i][1]);
+    g_hash_table_insert(hash,
+                        (gpointer) table_data[i][0],
+                        (gpointer) table_data[i][1]);
   return hash;
 }
 
@@ -2099,7 +2101,8 @@ enum
   PROP_TEST_OBJ_DOUBLE,
   PROP_TEST_OBJ_STRING,
   PROP_TEST_OBJ_GTYPE,
-  PROP_TEST_OBJ_NAME_CONFLICT
+  PROP_TEST_OBJ_NAME_CONFLICT,
+  PROP_TEST_OBJ_BYTE_ARRAY,
 };
 
 static void
@@ -2132,15 +2135,9 @@ regress_test_obj_set_property (GObject      *object,
 
     case PROP_TEST_OBJ_LIST:
     case PROP_TEST_OBJ_LIST_OLD:
-      if (self->list != NULL)
-        {
-          for (list = self->list; list != NULL; list = g_list_next (list))
-            g_free (list->data);
-          g_list_free (self->list);
-        }
-      self->list = NULL;
-      for (list = g_value_get_pointer (value); list != NULL; list = g_list_next (list))
-        self->list = g_list_append (self->list, g_strdup (list->data));
+      g_list_free_full (self->list, g_free);
+      list = g_value_get_pointer (value);
+      self->list = g_list_copy_deep (list, (GCopyFunc) (void *) g_strdup, NULL);
       break;
 
     case PROP_TEST_OBJ_INT:
@@ -2156,6 +2153,7 @@ regress_test_obj_set_property (GObject      *object,
       break;
 
     case PROP_TEST_OBJ_STRING:
+      g_clear_pointer (&self->string, g_free);
       self->string = g_value_dup_string (value);
       break;
 
@@ -2253,6 +2251,15 @@ regress_test_obj_dispose (GObject *gobject)
       self->boxed = NULL;
     }
 
+  if (self->list)
+    {
+      g_list_free_full (self->list, g_free);
+      self->list = NULL;
+    }
+
+  g_clear_pointer (&self->hash_table, g_hash_table_unref);
+  g_clear_pointer (&self->string, g_free);
+
   /* Chain up to the parent class */
   G_OBJECT_CLASS (regress_test_obj_parent_class)->dispose (gobject);
 }
@@ -2276,6 +2283,7 @@ enum {
   REGRESS_TEST_OBJ_SIGNAL_SIG_WITH_INT64_PROP,
   REGRESS_TEST_OBJ_SIGNAL_SIG_WITH_UINT64_PROP,
   REGRESS_TEST_OBJ_SIGNAL_SIG_WITH_INTARRAY_RET,
+  REGRESS_TEST_OBJ_SIGNAL_SIG_WITH_INOUT_INT,
   N_REGRESS_TEST_OBJ_SIGNALS
 };
 
@@ -2526,6 +2534,27 @@ regress_test_obj_class_init (RegressTestObjClass *klass)
 		  1,
 		  G_TYPE_INT);
 
+  /**
+   * RegressTestObj::sig-with-inout-int
+   * @self: The object that emitted the signal
+   * @position: (inout) (type int): The position, in characters, at which to
+   *     insert the new text. This is an in-out paramter. After the signal
+   *     emission is finished, it should point after the newly inserted text.
+   *
+   * This signal is modeled after GtkEditable::insert-text.
+   */
+  regress_test_obj_signals[REGRESS_TEST_OBJ_SIGNAL_SIG_WITH_INOUT_INT] =
+    g_signal_new ("sig-with-inout-int",
+                  G_TYPE_FROM_CLASS (gobject_class),
+                  G_SIGNAL_RUN_LAST,
+                  0,
+                  NULL,
+                  NULL,
+                  NULL,
+                  G_TYPE_NONE,
+                  1,
+                  G_TYPE_POINTER);
+
   gobject_class->set_property = regress_test_obj_set_property;
   gobject_class->get_property = regress_test_obj_get_property;
   gobject_class->dispose = regress_test_obj_dispose;
@@ -2643,7 +2672,7 @@ regress_test_obj_class_init (RegressTestObjClass *klass)
                                "A contained double",
                                G_MINDOUBLE,
                                G_MAXDOUBLE,
-                               1.0f,
+                               1.0,
                                G_PARAM_READWRITE);
   g_object_class_install_property (gobject_class,
                                    PROP_TEST_OBJ_DOUBLE,
@@ -2688,6 +2717,18 @@ regress_test_obj_class_init (RegressTestObjClass *klass)
                                    PROP_TEST_OBJ_NAME_CONFLICT,
                                    pspec);
 
+  /**
+   * TestObj:byte-array:
+   */
+  pspec = g_param_spec_boxed ("byte-array",
+                              "GByteArray property",
+                              "A contained byte array without any element-type annotations",
+                              G_TYPE_BYTE_ARRAY,
+                              G_PARAM_READWRITE | G_PARAM_CONSTRUCT);
+  g_object_class_install_property (gobject_class,
+                                   PROP_TEST_OBJ_BYTE_ARRAY,
+                                   pspec);
+
   klass->matrix = regress_test_obj_default_matrix;
 }
 
@@ -2792,6 +2833,20 @@ regress_test_obj_emit_sig_with_array_len_prop (RegressTestObj *obj)
   g_signal_emit_by_name (obj, "sig-with-array-len-prop", &arr, 5);
 }
 
+/**
+ * regress_test_obj_emit_sig_with_inout_int:
+ * @obj: The object to emit the signal.
+ *
+ * The signal handler must increment the inout parameter by 1.
+ */
+void
+regress_test_obj_emit_sig_with_inout_int (RegressTestObj *obj)
+{
+  int inout = 42;
+  g_signal_emit_by_name (obj, "sig-with-inout-int", &inout);
+  g_assert_cmpint (inout, ==, 43);
+}
+
 int
 regress_test_obj_instance_method (RegressTestObj *obj)
 {
@@ -3165,7 +3220,7 @@ regress_test_sub_obj_init (RegressTestSubObj *obj)
 }
 
 RegressTestObj*
-regress_test_sub_obj_new ()
+regress_test_sub_obj_new (void)
 {
   return g_object_new (REGRESS_TEST_TYPE_SUB_OBJ, NULL);
 }
@@ -3480,6 +3535,8 @@ regress_test_fundamental_sub_object_new (const char * data)
 #define regress_test_fundamental_hidden_sub_object_get_type \
   _regress_test_fundamental_hidden_sub_object_get_type
 
+GType regress_test_fundamental_hidden_sub_object_get_type (void);
+
 typedef struct _RegressTestFundamentalHiddenSubObject RegressTestFundamentalHiddenSubObject;
 typedef struct _GObjectClass                   RegressTestFundamentalHiddenSubObjectClass;
 struct _RegressTestFundamentalHiddenSubObject {
@@ -3885,14 +3942,38 @@ regress_test_skip_unannotated_callback (RegressTestCallback callback)
 
 /* interface */
 
+typedef RegressTestInterfaceIface RegressTestInterfaceInterface;
+G_DEFINE_INTERFACE (RegressTestInterface, regress_test_interface, G_TYPE_OBJECT)
+
 static void
 regress_test_interface_default_init(RegressTestInterfaceIface *iface)
 {
-}
+  static gboolean initialized = FALSE;
+  if (initialized)
+    return;
 
-typedef RegressTestInterfaceIface RegressTestInterfaceInterface;
-G_DEFINE_INTERFACE (RegressTestInterface, regress_test_interface, G_TYPE_OBJECT)
+  /**
+   * RegressTestInterface::interface-signal:
+   * @self: the object which emitted the signal
+   * @ptr: (type int): the code must look up the signal with
+   *   g_interface_info_find_signal() in order to get this to work.
+   */
+  g_signal_new ("interface-signal", REGRESS_TEST_TYPE_INTERFACE,
+                G_SIGNAL_RUN_LAST, 0, NULL, NULL, NULL,
+                G_TYPE_NONE, 1, G_TYPE_POINTER);
+
+  initialized = TRUE;
+}
 
+/**
+ * regress_test_interface_emit_signal:
+ * @self: the object to emit the signal
+ */
+void
+regress_test_interface_emit_signal (RegressTestInterface *self)
+{
+  g_signal_emit_by_name (self, "interface-signal", NULL);
+}
 
 /* gobject with non-standard prefix */
 G_DEFINE_TYPE(RegressTestWi8021x, regress_test_wi_802_1x, G_TYPE_OBJECT);
diff --git a/tests/scanner/regress.h b/tests/scanner/regress.h
index e1c995a..f07d162 100644
--- a/tests/scanner/regress.h
+++ b/tests/scanner/regress.h
@@ -165,7 +165,7 @@ _GI_TEST_EXTERN
 char *regress_test_array_gtype_in (int n_types, GType *types);
 
 _GI_TEST_EXTERN
-char **regress_test_strv_out_container (void);
+const char **regress_test_strv_out_container (void);
 
 _GI_TEST_EXTERN
 char **regress_test_strv_out (void);
@@ -174,7 +174,7 @@ _GI_TEST_EXTERN
 const char * const * regress_test_strv_out_c (void);
 
 _GI_TEST_EXTERN
-void   regress_test_strv_outarg (char ***retp);
+void   regress_test_strv_outarg (const char ***retp);
 
 _GI_TEST_EXTERN
 int regress_test_array_fixed_size_int_in (int *ints);
@@ -840,6 +840,9 @@ _GI_TEST_EXTERN
 void       regress_test_obj_emit_sig_with_array_len_prop (RegressTestObj *obj);
 
 _GI_TEST_EXTERN
+void       regress_test_obj_emit_sig_with_inout_int (RegressTestObj *obj);
+
+_GI_TEST_EXTERN
 int        regress_test_obj_instance_method (RegressTestObj *obj);
 
 _GI_TEST_EXTERN
@@ -1196,6 +1199,9 @@ struct _RegressTestInterfaceIface {
 _GI_TEST_EXTERN
 GType regress_test_interface_get_type (void) G_GNUC_CONST;
 
+_GI_TEST_EXTERN
+void regress_test_interface_emit_signal (RegressTestInterface *self);
+
 /* gobject with non-standard prefix */
 #define REGRESS_TEST_TYPE_WI_802_1X              (regress_test_wi_802_1x_get_type ())
 #define REGRESS_TEST_WI_802_1X(object)        (G_TYPE_CHECK_INSTANCE_CAST ((object), REGRESS_TEST_TYPE_WI_802_1X, RegressTestWi8021x))
diff --git a/tests/scanner/test_pkgconfig.py b/tests/scanner/test_pkgconfig.py
new file mode 100644
index 0000000..cca0bf8
--- /dev/null
+++ b/tests/scanner/test_pkgconfig.py
@@ -0,0 +1,118 @@
+# -*- coding: UTF-8 -*-
+#
+# GObject-Introspection - a framework for introspecting GObject libraries
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the
+# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
+#
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+from __future__ import unicode_literals
+
+import contextlib
+import os
+import sys
+import tempfile
+import tempfile
+import textwrap
+import time
+import unittest
+
+from giscanner import pkgconfig
+
+
+@contextlib.contextmanager
+def pkg_config_script(code):
+    """Points PKG_CONFIG environment variable to an executable file with given python code.
+    Common leading whitespace is removed from code for convenience."""
+
+    with tempfile.NamedTemporaryFile(mode='wb', suffix='.py', delete=False) as file:
+        file.write('#!{}\n'.format(sys.executable).encode("utf-8"))
+        file.write(textwrap.dedent(code).encode("utf-8"))
+        os.chmod(file.name, 0o777)
+
+    try:
+        yield [sys.executable, file.name]
+    finally:
+        os.unlink(file.name)
+
+
+class PkgConfigTest(unittest.TestCase):
+
+    def test_non_zero_exit_code(self):
+        """Checks that non-zero exit code from pkg-config results in exception."""
+        s = """
+        import sys
+        sys.exit(1)
+        """
+        with self.assertRaises(pkgconfig.PkgConfigError):
+            with pkg_config_script(s) as command:
+                pkgconfig.cflags(['foo'], command=command, ignore_errors=False)
+
+    def test_cflags(self):
+        """Checks arguments passed to pkg-config when asking for --cflags."""
+        s = """
+        import sys
+        args = sys.argv[1:]
+        assert len(args) == 4
+        assert args[0] == '--cflags'
+        assert args[1] == 'foo-1.0'
+        assert args[2] == 'bar-2.0'
+        assert args[3] == 'baz'
+        """
+        with pkg_config_script(s) as command:
+            pkgconfig.cflags(['foo-1.0', 'bar-2.0', 'baz'], command=command)
+
+    def test_libs(self):
+        """Checks arguments passed to pkg-config when asking for --libs."""
+        s = """
+        import sys
+        args = sys.argv[1:]
+        assert len(args) == 3
+        assert args[0] == '--libs'
+        assert args[1] == 'a'
+        assert args[2] == 'b-42.0'
+        """
+        with pkg_config_script(s) as command:
+            pkgconfig.libs(['a', 'b-42.0'], command=command)
+
+    @unittest.skipIf(
+        sys.version_info < (3, 0) or os.name == "nt",
+        "Python 2 defaults to ascii encoding in text file I/O and nothing is done to change that")
+    def test_non_ascii_output(self):
+        with pkg_config_script("""print("-L'zażółć gęślą jaźń'")""") as command:
+            flags = pkgconfig.cflags(['test-1.0'], command=command)
+            self.assertEqual(flags, ["-Lzażółć gęślą jaźń"])
+
+        with pkg_config_script("""print('-Lé')""") as command:
+            flags = pkgconfig.cflags(['test-1.0'], command=command)
+            self.assertEqual(flags, ['-Lé'])
+
+    def test_shell_word_splitting_rules(self):
+        # Regression test for issue #171.
+        with pkg_config_script("""print('-L"/usr/lib64" -lgit2')""") as command:
+            flags = pkgconfig.cflags(['foo-2.0'], command=command)
+            self.assertEqual(flags, ['-L/usr/lib64', '-lgit2'])
+
+        # Macro define for a C string literal.
+        with pkg_config_script('''print("""-DLOG='"HELLO"'""")''') as command:
+            flags = pkgconfig.cflags(['bar-3.0'], command=command)
+            self.assertEqual(flags, ['-DLOG="HELLO"'])
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tests/scanner/test_shlibs.py b/tests/scanner/test_shlibs.py
new file mode 100644
index 0000000..c3e2889
--- /dev/null
+++ b/tests/scanner/test_shlibs.py
@@ -0,0 +1,102 @@
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+from __future__ import unicode_literals
+
+import unittest
+
+from giscanner.shlibs import resolve_from_ldd_output
+
+
+class TestLddParser(unittest.TestCase):
+
+    def test_resolve_from_ldd_output(self):
+        output = '''\
+            libglib-2.0.so.0 => /usr/lib/x86_64-linux-gnu/libglib-2.0.so.0 (0x00007fbe12d68000)
+            libgtk-3.so.0 => /usr/lib/x86_64-linux-gnu/libgtk-3.so.0 (0x00007fbe12462000)
+            libgdk-3.so.0 => /usr/lib/x86_64-linux-gnu/libgdk-3.so.0 (0x00007fbe1216c000)
+            libpango-1.0.so.0 => /usr/lib/x86_64-linux-gnu/libpango-1.0.so.0 (0x00007fbe11d1a000)
+            libatk-1.0.so.0 => /usr/lib/x86_64-linux-gnu/libatk-1.0.so.0 (0x00007fbe11af4000)'''
+        libraries = ['glib-2.0', 'gtk-3', 'pango-1.0']
+
+        self.assertEqual(
+            ['libglib-2.0.so.0', 'libgtk-3.so.0', 'libpango-1.0.so.0'],
+            resolve_from_ldd_output(libraries, output))
+
+    def test_unresolved_library(self):
+        output = ''
+        libraries = ['foo']
+
+        with self.assertRaises(SystemExit, msg='can\'t resolve libraries to shared libraries: foo'):
+            resolve_from_ldd_output(libraries, output)
+
+    def test_prefixed_library_name(self):
+        output = '''\
+           /usr/lib/liblibX.so
+           /usr/lib/libX.so'''
+
+        self.assertEqual(
+            ['/usr/lib/libX.so'],
+            resolve_from_ldd_output(['X'], output))
+        self.assertEqual(
+            ['/usr/lib/liblibX.so'],
+            resolve_from_ldd_output(['libX'], output))
+
+    def test_suffixed_library_name(self):
+        output = '''\
+            libpangocairo.so.0 => /usr/lib/x86_64-linux-gnu/libpangocairo.so.0 (0x00)
+            libpangoft2.so.0 => /usr/lib/x86_64-linux-gnu/libpangoft2.so.0 (0x00)
+            libpango.so.0 => /usr/lib/x86_64-linux-gnu/libpango.so.0 (0x00)'''
+        libraries = ['pango']
+
+        self.assertEqual(
+            ['libpango.so.0'],
+            resolve_from_ldd_output(libraries, output))
+
+    def test_header_is_ignored(self):
+        output = '''/tmp-introspection/libfoo.so.999:
+            0000000000000000 0000000000000000 rlib  0    3   0      /usr/local/lib/libfoo.so.1'''
+        libraries = ['foo']
+
+        self.assertEqual(
+            ['/usr/local/lib/libfoo.so.1'],
+            resolve_from_ldd_output(libraries, output))
+
+    def test_executable_path_includes_library_name(self):
+        """
+        Regression test for https://gitlab.gnome.org/GNOME/gobject-introspection/issues/208
+        """
+        output = '''/usr/ports/pobj/libgepub-0.6.0/build-amd64/tmp-introspectnxmyodg1/Gepub-0.6:
+            Start            End              Type  Open Ref GrpRef Name
+            00001066c8400000 00001066c8605000 exe   2    0   0      /usr/ports/pobj/libgepub-0.6.0/build-amd64/tmp-introspectnxmyodg1/Gepub-0.6
+            000010690019c000 00001069003a8000 rlib  0    1   0      /usr/local/lib/libgepub-0.6.so.0.0'''
+        libraries = ['gepub-0.6']
+
+        self.assertEqual(
+            ['/usr/local/lib/libgepub-0.6.so.0.0'],
+            resolve_from_ldd_output(libraries, output))
+
+    def test_library_path_includes_library_name(self):
+        output = '''/usr/ports/pobj/gnome-music-3.28.1/build-amd64/tmp-introspectuz5xaun3/Gd-1.0:
+            Start            End              Type  Open Ref GrpRef Name
+            0000070e40f00000 0000070e41105000 exe   2    0   0      /usr/ports/pobj/gnome-music-3.28.1/build-amd64/tmp-introspectuz5xaun3/Gd-1.0
+            00000710f9b39000 00000710f9d51000 rlib  0    1   0      /usr/ports/pobj/gnome-music-3.28.1/build-amd64/subprojects/libgd/libgd/libgd.so'''
+        libraries = ['gd']
+
+        self.assertEqual(
+            ['/usr/ports/pobj/gnome-music-3.28.1/build-amd64/subprojects/libgd/libgd/libgd.so'],
+            resolve_from_ldd_output(libraries, output))
+
+    def test_basename(self):
+        output = '''/usr/lib/libfoo.so'''
+
+        self.assertEqual(
+            ['/usr/lib/libfoo.so'],
+            resolve_from_ldd_output(['foo'], output, basename=False))
+        self.assertEqual(
+            ['libfoo.so'],
+            resolve_from_ldd_output(['foo'], output, basename=True))
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tests/scanner/test_transformer.py b/tests/scanner/test_transformer.py
index 175a8d3..467f0c5 100644
--- a/tests/scanner/test_transformer.py
+++ b/tests/scanner/test_transformer.py
@@ -7,6 +7,7 @@ import unittest
 import tempfile
 import os
 import sys
+import textwrap
 
 if sys.version_info.major < 3:
     import __builtin__ as builtins
@@ -15,12 +16,6 @@ else:
 
 
 os.environ['GI_SCANNER_DISABLE_CACHE'] = '1'
-path = os.getenv('UNINSTALLED_INTROSPECTION_SRCDIR', None)
-assert path is not None
-sys.path.insert(0, path)
-
-# Not correct, but enough to get the tests going uninstalled
-builtins.__dict__['DATADIR'] = path
 
 from giscanner import ast
 from giscanner.sourcescanner import SourceScanner
@@ -46,12 +41,16 @@ def load_namespace_from_source_string(namespace, source):
 
 
 class TestIdentifierFilter(unittest.TestCase):
-    def test_underscore_t_sed_filter(self):
-        cmd = r"sed " \
-              r"-e 's/^test_t$/TestContext/' " \
-              r"-e 's/\(.*\)_t$/\1/' " \
-              r"-e 's/^test_/Test_/' " \
-              r"-e 's/_\([a-z]\)/" + '\\u' + r"\1/g'"
+    def test_underscore_t_identifier_filter(self):
+        cmd = [sys.executable, '-c', textwrap.dedent("""
+            import sys, re
+            for line in sys.stdin:
+                line = re.sub(r"^test_t$", "TestContext", line)
+                line = re.sub(r"_t$", "", line)
+                line = re.sub(r"^test_", "Test_", line)
+                line = re.sub(r"_([a-z])", lambda m: m.group(1).title(),
+                              line)
+                sys.stdout.write(line)""")]
 
         namespace = ast.Namespace('Test', '1.0')
         xformer = Transformer(namespace, identifier_filter_cmd=cmd)
@@ -63,18 +62,31 @@ class TestIdentifierFilter(unittest.TestCase):
         self.assertEqual(xformer.strip_identifier('test_foo_tart'), 'FooTart')
 
     def test_invalid_command(self):
-        cmd = r'this-is-not-a-real-command'
+        cmd = ['this-is-not-a-real-command']
         namespace = ast.Namespace('Test', '1.0')
         xformer = Transformer(namespace, identifier_filter_cmd=cmd)
-        self.assertRaises(ValueError, xformer.strip_identifier, 'test_t')
+        self.assertRaises(OSError, xformer.strip_identifier, 'test_t')
 
     def test_invalid_argument(self):
-        cmd = r'sed --not-a-valid-argument'
+        cmd = [sys.executable, '--not-a-valid-argument']
         namespace = ast.Namespace('Test', '1.0')
         xformer = Transformer(namespace, identifier_filter_cmd=cmd)
         self.assertRaises(ValueError, xformer.strip_identifier, 'test_t')
 
 
+class TestSymbolFilter(unittest.TestCase):
+
+    def test_split_csymbol(self):
+        cmd = [
+            sys.executable, '-c',
+            'import sys; sys.stdout.write("test_" + sys.stdin.read())']
+        namespace = ast.Namespace('Test', '1.0')
+        xformer = Transformer(namespace, symbol_filter_cmd=cmd)
+
+        self.assertEqual(
+            xformer.split_csymbol('foo_bar_quux')[1], "foo_bar_quux")
+
+
 class TestStructTypedefs(unittest.TestCase):
     def setUp(self):
         # Hack to set logging singleton
diff --git a/tests/scanner/test_xmlwriter.py b/tests/scanner/test_xmlwriter.py
new file mode 100644
index 0000000..c6748c0
--- /dev/null
+++ b/tests/scanner/test_xmlwriter.py
@@ -0,0 +1,94 @@
+import unittest
+
+from giscanner.xmlwriter import XMLWriter, collect_attributes, build_xml_tag
+
+
+class TestXMLWriter(unittest.TestCase):
+
+    def test_various(self):
+        w = XMLWriter()
+        w.push_tag('repository')
+        w.push_tag('namespace')
+        w.push_tag('enumeration')
+        w.push_tag('member',
+                   [('name', 'west'),
+                    ('value', '7'),
+                    ('c:identifier', 'GTK_ANCHOR_WEST'),
+                    ('glib:nick', 'west')])
+
+        w.pop_tag()
+        w.pop_tag()
+        w.pop_tag()
+        x = w.get_xml()
+        self.assertTrue('GTK_ANCHOR_WEST' in x)
+        lines = x.split('\n')
+        self.assertTrue(len(lines[3]) < 80)
+
+    def test_collect_attributes(self):
+        ca = collect_attributes
+        res = ca('parameters', [], 6, ' ', 12)
+        self.assertEqual(res, "")
+
+        res = ca('type', [('name', 'utf8')], 12, ' ', 7)
+        self.assertEqual(res, ' name="utf8"')
+
+        res = ca('type', [('name', 'GLib.SList'), ('c:type', 'const GSList*')], 8, ' ', 6)
+        self.assertEqual(res, ' name="GLib.SList" c:type="const GSList*"')
+
+    def test_build_xml_tag(self):
+        res = build_xml_tag('tag', [('attr', 'utf8')])
+        self.assertEqual(res, '<tag attr="utf8"/>')
+
+        res = build_xml_tag('tag', [('attr', 'foo\nbar')])
+        self.assertEqual(res, '<tag attr="foo&#10;bar"/>')
+
+        res = build_xml_tag('tag', [('attr', 'foo\tbar')])
+        self.assertEqual(res, '<tag attr="foo&#9;bar"/>')
+
+        res = build_xml_tag('tag', [('attr', '\004')])
+        self.assertEqual(res, '<tag attr="\x04"/>')
+
+        res = build_xml_tag('tag', [('attr', 'limba1\t\034')])
+        self.assertEqual(res, '<tag attr="limba1&#9;\034"/>')
+
+        res = build_xml_tag('tag', [('attr', '')])
+        self.assertEqual(res, '<tag attr=""/>')
+
+        res = build_xml_tag('tag', [('attr', ' ')])
+        self.assertEqual(res, '<tag attr=" "/>')
+
+        res = build_xml_tag('tag', [('attr', '>&<')])
+        self.assertEqual(res, '<tag attr="&gt;&amp;&lt;"/>')
+
+        res = build_xml_tag('tag', [('a', 'b'), ('c', 'd')])
+        self.assertEqual(res, '<tag a="b" c="d"/>')
+
+        res = build_xml_tag('tag', [('foo', None), ('bar', 'quux')])
+        self.assertEqual(res, '<tag bar="quux"/>')
+
+    def test_build_xml_tag_data(self):
+        res = build_xml_tag('tag', [], b'foo')
+        self.assertEqual(res, '<tag>foo</tag>')
+
+        res = build_xml_tag('tag', [], u'\xf6\xe4\xfc')
+        self.assertEqual(res, u'<tag>\xf6\xe4\xfc</tag>')
+
+        res = build_xml_tag('tag', [], '>&<')
+        self.assertEqual(res, '<tag>&gt;&amp;&lt;</tag>')
+
+    def test_build_xml_tag_indent(self):
+        res = build_xml_tag(
+            'tag', [('a' * 10, 'b' * 30), ('c' * 30, 'd' * 10)], None)
+        self.assertEqual(res, '''\
+<tag aaaaaaaaaa="bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"
+     cccccccccccccccccccccccccccccc="dddddddddd"/>''')
+
+        res = build_xml_tag(
+            'tag', [('a' * 10, 'b' * 30), ('c' * 30, 'd' * 10)], None, 3)
+        self.assertEqual(res, '''\
+<tag aaaaaaaaaa="bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"
+        cccccccccccccccccccccccccccccc="dddddddddd"/>''')
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tests/warn/Makefile.am b/tests/warn/Makefile.am
index 5f47df0..7cdcc00 100644
--- a/tests/warn/Makefile.am
+++ b/tests/warn/Makefile.am
@@ -24,4 +24,4 @@ TESTS = \
 LOG_COMPILER = env PYTHONPATH=$(top_builddir):$(top_srcdir) TOP_BUILDDIR=$(top_builddir) UNINSTALLED_INTROSPECTION_SRCDIR=$(top_srcdir) \
 	$(PYTHON) $(srcdir)/warningtester.py
 
-EXTRA_DIST = warningtester.py common.h $(TESTS)
+EXTRA_DIST = warningtester.py common.h meson.build $(TESTS)
diff --git a/tests/warn/Makefile.in b/tests/warn/Makefile.in
index ff9a391..583972e 100644
--- a/tests/warn/Makefile.in
+++ b/tests/warn/Makefile.in
@@ -448,6 +448,7 @@ PYTHON_INCLUDES = @PYTHON_INCLUDES@
 PYTHON_LIBS = @PYTHON_LIBS@
 PYTHON_PLATFORM = @PYTHON_PLATFORM@
 PYTHON_PREFIX = @PYTHON_PREFIX@
+PYTHON_SO = @PYTHON_SO@
 PYTHON_VERSION = @PYTHON_VERSION@
 RANLIB = @RANLIB@
 SCANNER_CFLAGS = @SCANNER_CFLAGS@
@@ -457,6 +458,11 @@ SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
+WARN_CFLAGS = @WARN_CFLAGS@
+WARN_CFLAGS_FLEX = @WARN_CFLAGS_FLEX@
+WARN_CFLAGS_PYTHON = @WARN_CFLAGS_PYTHON@
+WARN_LDFLAGS = @WARN_LDFLAGS@
+WARN_SCANNERFLAGS = @WARN_SCANNERFLAGS@
 YACC = @YACC@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
@@ -588,7 +594,7 @@ TESTS = \
 LOG_COMPILER = env PYTHONPATH=$(top_builddir):$(top_srcdir) TOP_BUILDDIR=$(top_builddir) UNINSTALLED_INTROSPECTION_SRCDIR=$(top_srcdir) \
 	$(PYTHON) $(srcdir)/warningtester.py
 
-EXTRA_DIST = warningtester.py common.h $(TESTS)
+EXTRA_DIST = warningtester.py common.h meson.build $(TESTS)
 all: all-am
 
 .SUFFIXES:
diff --git a/tests/warn/meson.build b/tests/warn/meson.build
new file mode 100644
index 0000000..f14590c
--- /dev/null
+++ b/tests/warn/meson.build
@@ -0,0 +1,41 @@
+warn_tests = [
+  'annotationparser.h',
+  'callback-invalid-scope.h',
+  'callback-missing-scope.h',
+  'invalid-allow-none.h',
+  'invalid-array.h',
+  'invalid-closure.h',
+  'invalid-constructor.h',
+  'invalid-element-type.h',
+  'invalid-method.h',
+  'invalid-nullable.h',
+  'invalid-optional.h',
+  'invalid-option.h',
+  'invalid-out.h',
+  'invalid-return.h',
+  'invalid-transfer.h',
+  'missing-element-type.h',
+  'return-gobject.h',
+  'unknown-parameter.h',
+  'unresolved-type.h',
+]
+
+warn_test_env = environment()
+warn_test_env.set('UNINSTALLED_INTROSPECTION_SRCDIR', meson.source_root())
+warn_test_env.set('TOP_BUILDDIR', meson.build_root())
+warn_test_env.set(
+  'PYTHONPATH',
+  meson.build_root(),
+  join_paths(meson.build_root(), 'giscanner'))
+
+# FIXME: Windows
+if host_system != 'windows'
+  foreach warn_fn : warn_tests
+    test(
+      'warn-' + warn_fn.split('.')[0], python,
+      workdir: meson.current_source_dir(),
+      env: warn_test_env,
+      args: ['warningtester.py', warn_fn],
+    )
+  endforeach
+endif
diff --git a/tests/warn/unresolved-type.h b/tests/warn/unresolved-type.h
index d20182c..7588dff 100644
--- a/tests/warn/unresolved-type.h
+++ b/tests/warn/unresolved-type.h
@@ -1,23 +1,50 @@
+#include <stdbool.h>
 #include "common.h"
 
 typedef struct {
    int i;
 } MyStruct;
 
-// EXPECT:5: Warning: Test: symbol='MyStruct': Unknown namespace for identifier 'MyStruct'
+// EXPECT:6: Warning: Test: symbol='MyStruct': Unknown namespace for identifier 'MyStruct'
 
 typedef enum {
   TEST_MY_ENUM_A = 0
 } MyEnum;
 
-// EXPECT:11: Warning: Test: symbol='MyEnum': Unknown namespace for identifier 'MyEnum'
+// EXPECT:12: Warning: Test: symbol='MyEnum': Unknown namespace for identifier 'MyEnum'
 
 typedef enum {
   MY_ENUM_A = 0
 } TestMyEnum2;
 
-// EXPECT:17: Warning: Test: symbol='TestMyEnum2': Unknown namespace for symbol 'MY_ENUM_A'
+// EXPECT:18: Warning: Test: symbol='TestMyEnum2': Unknown namespace for symbol 'MY_ENUM_A'
 
-/* Stub function here so namespace isn't empty */
-void test_foo (void);
+void test_bool3 (gboolean b);
 
+void test_f16 (_Float16 f);
+// EXPECT:24: Warning: Test: test_f16: argument f: Unresolved type: '_Float16'
+
+void test_f32 (_Float32 f);
+// EXPECT:27: Warning: Test: test_f32: argument f: Unresolved type: '_Float32'
+
+void test_f64 (_Float64 f);
+// EXPECT:30: Warning: Test: test_f64: argument f: Unresolved type: '_Float64'
+
+void test_f128 (_Float128 f);
+// EXPECT:33: Warning: Test: test_f128: argument f: Unresolved type: '_Float128'
+
+void test_f32x (_Float32x f);
+// EXPECT:36: Warning: Test: test_f32x: argument f: Unresolved type: '_Float32x'
+
+void test_f64x (_Float64x f);
+// EXPECT:39: Warning: Test: test_f64x: argument f: Unresolved type: '_Float64x'
+
+void test_f128x (_Float128x f);
+// EXPECT:42: Warning: Test: test_f128x: argument f: Unresolved type: '_Float128x'
+
+// For backward compatibility we don't warn about _Bool
+_Bool test_ret_bool1 ();
+bool test_ret_bool2 ();
+gboolean test_ret_bool3 ();
+void test_bool2 (bool b);
+void test_bool1 (_Bool b);
diff --git a/tests/warn/warningtester.py b/tests/warn/warningtester.py
index 1f7f91e..6b0ae7d 100644
--- a/tests/warn/warningtester.py
+++ b/tests/warn/warningtester.py
@@ -109,7 +109,11 @@ def check(args):
     logger.enable_warnings((WARNING, ERROR, FATAL))
 
     transformer = Transformer(namespace)
-    transformer.set_include_paths([os.path.join(top_srcdir, 'gir'), top_builddir])
+    transformer.set_include_paths([
+        os.path.join(top_srcdir, 'gir'),
+        top_builddir,
+        os.path.join(top_builddir, 'gir'),
+    ])
     transformer.register_include(Include.from_string('GObject-2.0'))
 
     ss = SourceScanner()
diff --git a/tools/g-ir-tool-template.in b/tools/g-ir-tool-template.in
old mode 100644
new mode 100755
index edc68a4..39b1b3d
--- a/tools/g-ir-tool-template.in
+++ b/tools/g-ir-tool-template.in
@@ -47,18 +47,43 @@ if debug:
             pdb.pm()
         sys.excepthook = on_exception
 
-if os.name == 'nt':
-    datadir = os.path.join(os.path.dirname(__file__), '..', 'share')
-    pylibdir = os.path.join(os.path.dirname(__file__), '..', 'lib', 'gobject-introspection')
-else:
+# Detect and set datadir, pylibdir, etc as applicable
+# Similar to the method used in gdbus-codegen
+filedir = os.path.dirname(__file__)
+
+# Try using relative paths first so that the installation prefix is relocatable
+datadir = os.path.abspath(os.path.join(filedir, '..', 'share'))
+# Fallback to hard-coded paths if the relocatable paths are wrong
+if not os.path.isdir(os.path.join(datadir, 'gir-1.0')):
     datadir = "@datarootdir@"
-    pylibdir = os.path.join('@libdir@', 'gobject-introspection')
 
 builtins.__dict__['DATADIR'] = datadir
 
-srcdir = os.getenv('UNINSTALLED_INTROSPECTION_SRCDIR', None)
-if srcdir is not None:
-    pylibdir = srcdir
+# Again, relative paths first so that the installation prefix is relocatable
+pylibdir = os.path.abspath(os.path.join(filedir, '..', 'lib', 'gobject-introspection'))
+if not os.path.isfile(os.path.join(pylibdir, 'giscanner', '_giscanner.so')):
+    # Running uninstalled?
+    builddir = os.getenv('UNINSTALLED_INTROSPECTION_BUILDDIR', None)
+    if builddir is not None:
+        # Autotools, most likely
+        builddir = os.path.abspath(builddir)
+        # For _giscanner.so
+        sys.path.insert(0, os.path.join(builddir, '.libs'))
+        srcdir = os.getenv('UNINSTALLED_INTROSPECTION_SRCDIR', None)
+        if srcdir:
+            # For the giscanner python files
+            pylibdir = srcdir
+    elif os.path.isdir(os.path.join(filedir, '..', 'giscanner')):
+        # We're running uninstalled inside meson
+        builddir = os.path.abspath(os.path.join(filedir, '..'))
+        pylibdir = builddir
+        gdump_path = os.path.join(builddir, 'girepository', 'gdump.c')
+        if os.path.isfile(gdump_path):
+            builtins.__dict__['GDUMP_PATH'] = gdump_path
+    else:
+        # Okay, we're not running uninstalled and the prefix is not
+        # relocatable. Use hard-coded libdir.
+        pylibdir = os.path.join('@libdir@', 'gobject-introspection')
 
 sys.path.insert(0, pylibdir)
 
diff --git a/tools/generate.c b/tools/generate.c
index 926ffca..36e1d05 100644
--- a/tools/generate.c
+++ b/tools/generate.c
@@ -60,7 +60,12 @@ main (int argc, char *argv[])
 
   context = g_option_context_new ("");
   g_option_context_add_main_entries (context, options, NULL);
-  g_option_context_parse (context, &argc, &argv, &error);
+  if (!g_option_context_parse (context, &argc, &argv, &error))
+    {
+      g_fprintf (stderr, "failed to parse: %s\n", error->message);
+      g_error_free (error);
+      return 1;
+    }
 
   if (!input)
     {
@@ -75,11 +80,11 @@ main (int argc, char *argv[])
 
   for (i = 0; input[i]; i++)
     {
-      GError *error = NULL;
       const char *namespace;
       GMappedFile *mfile;
       GITypelib *typelib;
 
+      error = NULL;
       mfile = g_mapped_file_new (input[i], FALSE, &error);
       if (!mfile)
 	g_error ("failed to read '%s': %s", input[i], error->message);
diff --git a/tools/meson.build b/tools/meson.build
new file mode 100644
index 0000000..7347266
--- /dev/null
+++ b/tools/meson.build
@@ -0,0 +1,55 @@
+libdir_abs = join_paths(get_option('prefix'), get_option('libdir'))
+datadir_abs = join_paths(get_option('prefix'), get_option('datadir'))
+
+tools = [
+  ['g-ir-scanner', 'scannermain', 'scanner_main'],
+  ['g-ir-annotation-tool', 'annotationmain', 'annotation_main'],
+]
+if get_option('doctool')
+  tools += [['g-ir-doc-tool', 'docmain', 'doc_main']]
+endif
+
+python_name = 'python@0@'.format(python.language_version().split('.')[0])
+tool_output = []
+foreach tool : tools
+  tools_conf = configuration_data()
+  tools_conf.set('libdir', libdir_abs)
+  tools_conf.set('datarootdir', datadir_abs)
+  tools_conf.set('PYTHON', python_name)
+
+  tools_conf.set('TOOL_MODULE', tool[1])
+  tools_conf.set('TOOL_FUNCTION', tool[2])
+  tool_bin = configure_file(
+    input: 'g-ir-tool-template.in',
+    output: tool[0],
+    configuration: tools_conf,
+    install: true,
+    install_dir: get_option('bindir'),
+  )
+  tool_output += tool_bin
+  # Provide tools for others when we're a subproject and they use the Meson GNOME module
+  meson.override_find_program(tool[0], tool_bin)
+endforeach
+
+girscanner = tool_output[0]
+
+gircompiler = executable('g-ir-compiler', 'compiler.c',
+  dependencies: [
+    girepo_internals_dep,
+    girepo_dep,
+  ],
+  install: true,
+)
+
+girgenerate = executable('g-ir-generate', 'generate.c',
+  dependencies: [
+    girepo_internals_dep,
+    girepo_dep,
+  ],
+  install: true,
+)
+
+girinspect = executable('g-ir-inspect', 'g-ir-inspect.c',
+  dependencies: girepo_dep,
+  install: true,
+)
diff --git a/win32/Makefile-newvs.am b/win32/Makefile-newvs.am
deleted file mode 100644
index 3a91862..0000000
--- a/win32/Makefile-newvs.am
+++ /dev/null
@@ -1,55 +0,0 @@
-# Centralized autotools file
-# Create the Visual Studio 2012/2013/2015 project files
-# from the Visual Studio 2010 project files
-
-# This autotools file, from GLib, can be used in other projects
-# that have Visual Studio build support.
-
-# Author: Fan, Chun-wei
-# November 05, 2012
-
-# MSVC_BASE_VER: Baseline MSVC 201x version to copy/process project files from (100 for 2010, 120 for 2013)
-# MSVC_BASE_VER_LONG: Long Version of baseline Visual Studio 201x version (2010, 2012, 2013, 14, 15)
-# MSVC_BASE_TOOLSET: Use if baseline MSVC toolset is not in the form v$(MSVC_BASE_VER)0, meaning v$(MSVC_BASE_TOOLSET)
-# MSVC_VER_LONG: Long Version of target Visual Studio (2012, 2013, 14 and so on)
-# MSVC_VER: Short Version of target Visual Studio (110 for 2012, 120 for 2013, 140 for 2015, 141 for 2017)
-# MSVC_TOOLSET: Use if target MSVC toolsett is not in the form v $(MSVC_VER)0, meaning v$(MSVC_TOOLSET)
-
-if MSVC_BASE_NO_TOOLSET_SET
-MSVC_BASE_TOOLSET = $(MSVC_BASE_VER)0
-endif
-
-if MSVC_NO_TOOLSET_SET
-MSVC_TOOLSET = $(MSVC_VER)0
-endif
-
-%.sln:
-	sed 's/11\.00/12\.00/g' < $(top_srcdir)/win32/vs$(MSVC_BASE_VER)/$@ > $(top_builddir)/win32/vs$(MSVC_VER)/$@.tmp
-	sed 's/$(MSVC_BASE_VER_LONG)/$(MSVC_VER_LONG)/g' < $(top_builddir)/win32/vs$(MSVC_VER)/$@.tmp > $(top_builddir)/win32/vs$(MSVC_VER)/$@
-	rm $(top_builddir)/win32/vs$(MSVC_VER)/$@.tmp
-
-%.txt:
-	sed 's/vs$(MSVC_BASE_VER)/vs$(MSVC_VER)/g' < $(top_srcdir)/win32/vs$(MSVC_BASE_VER)/$@ > $(top_builddir)/win32/vs$(MSVC_VER)/$@.tmp
-	sed 's/VS$(MSVC_BASE_VER)/VS$(MSVC_VER)/g' < $(top_builddir)/win32/vs$(MSVC_VER)/$@.tmp > $(top_builddir)/win32/vs$(MSVC_VER)/$@
-	rm $(top_builddir)/win32/vs$(MSVC_VER)/$@.tmp
-
-%.vcxproj:
-	if test -e $(top_srcdir)/win32/vs$(MSVC_BASE_VER)/$@; then \
-		sed 's/v$(MSVC_BASE_TOOLSET)/v$(MSVC_TOOLSET)/g' < $(top_srcdir)/win32/vs$(MSVC_BASE_VER)/$@ > $(top_builddir)/win32/vs$(MSVC_VER)/$@; \
-	else \
-		sed 's/v$(MSVC_BASE_TOOLSET)/v$(MSVC_TOOLSET)/g' < $(top_builddir)/win32/vs$(MSVC_BASE_VER)/$@ > $(top_builddir)/win32/vs$(MSVC_VER)/$@; \
-	fi
-
-%.props: $(top_builddir)/win32/vs$(MSVC_BASE_VER)/Makefile
-	if test -e $(top_srcdir)/win32/vs$(MSVC_BASE_VER)/$@; then \
-		sed 's/<VSVer>$(MSVC_BASE_VER)<\/VSVer>/<VSVer>$(MSVC_VER)<\/VSVer>/g' < $(top_srcdir)/win32/vs$(MSVC_BASE_VER)/$@ > $(top_builddir)/win32/vs$(MSVC_VER)/$@; \
-	else \
-		sed 's/<VSVer>$(MSVC_BASE_VER)<\/VSVer>/<VSVer>$(MSVC_VER)<\/VSVer>/g' < $(top_builddir)/win32/vs$(MSVC_BASE_VER)/$@ > $(top_builddir)/win32/vs$(MSVC_VER)/$@; \
-	fi
-
-%.vcxproj.filters:
-	if test -e $(top_srcdir)/win32/vs$(MSVC_BASE_VER)/$@; then \
-		cp $(top_srcdir)/win32/vs$(MSVC_BASE_VER)/$@ $(top_builddir)/win32/vs$(MSVC_VER)/$@; \
-	else \
-		cp $(top_builddir)/win32/vs$(MSVC_BASE_VER)/$@ $(top_builddir)/win32/vs$(MSVC_VER)/$@; \
-	fi
diff --git a/win32/Makefile.am b/win32/Makefile.am
deleted file mode 100644
index b223873..0000000
--- a/win32/Makefile.am
+++ /dev/null
@@ -1,17 +0,0 @@
-SUBDIRS = vs9 vs10 vs11 vs12 vs14 vs15
-
-EXTRA_DIST =	\
-	Makefile.msvc-introspection	\
-	detectenv-msvc.mak		\
-	gen-win32-cairo-gir.py		\
-	gen-win32-g-ir-tools.py		\
-	gi-build-common-msvc.mak	\
-	gi-introspection-msvc.mak	\
-	gi_msvc_build_utils.py		\
-	gi-setenv-msvc.mak		\
-	gi-tests-msvc.mak		\
-	gipc.py				\
-	introspection-msvc.mak		\
-	pc_base.py			\
-	replace.py
-
diff --git a/win32/Makefile.in b/win32/Makefile.in
deleted file mode 100644
index dd9c79d..0000000
--- a/win32/Makefile.in
+++ /dev/null
@@ -1,695 +0,0 @@
-# Makefile.in generated by automake 1.15.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994-2017 Free Software Foundation, Inc.
-
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-VPATH = @srcdir@
-am__is_gnu_make = { \
-  if test -z '$(MAKELEVEL)'; then \
-    false; \
-  elif test -n '$(MAKE_HOST)'; then \
-    true; \
-  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
-    true; \
-  else \
-    false; \
-  fi; \
-}
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -[dEDm]) skip_next=yes;; \
-      -[JT]) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = win32
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
-	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/python.m4 \
-	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN     " $@;
-am__v_GEN_1 = 
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 = 
-SOURCES =
-DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
-	ctags-recursive dvi-recursive html-recursive info-recursive \
-	install-data-recursive install-dvi-recursive \
-	install-exec-recursive install-html-recursive \
-	install-info-recursive install-pdf-recursive \
-	install-ps-recursive install-recursive installcheck-recursive \
-	installdirs-recursive pdf-recursive ps-recursive \
-	tags-recursive uninstall-recursive
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
-  distclean-recursive maintainer-clean-recursive
-am__recursive_targets = \
-  $(RECURSIVE_TARGETS) \
-  $(RECURSIVE_CLEAN_TARGETS) \
-  $(am__extra_recursive_targets)
-AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
-	distdir
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-# Read a list of newline-separated strings from the standard input,
-# and print each of them once, without duplicates.  Input order is
-# *not* preserved.
-am__uniquify_input = $(AWK) '\
-  BEGIN { nonempty = 0; } \
-  { items[$$0] = 1; nonempty = 1; } \
-  END { if (nonempty) { for (i in items) print i; }; } \
-'
-# Make sure the list of sources is unique.  This is necessary because,
-# e.g., the same source file might be shared among _SOURCES variables
-# for different programs/libraries.
-am__define_uniq_tagged_files = \
-  list='$(am__tagged_files)'; \
-  unique=`for i in $$list; do \
-    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-  done | $(am__uniquify_input)`
-ETAGS = etags
-CTAGS = ctags
-DIST_SUBDIRS = $(SUBDIRS)
-am__DIST_COMMON = $(srcdir)/Makefile.in
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-am__relativize = \
-  dir0=`pwd`; \
-  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
-  sed_rest='s,^[^/]*/*,,'; \
-  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
-  sed_butlast='s,/*[^/]*$$,,'; \
-  while test -n "$$dir1"; do \
-    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
-    if test "$$first" != "."; then \
-      if test "$$first" = ".."; then \
-        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
-        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
-      else \
-        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
-        if test "$$first2" = "$$first"; then \
-          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
-        else \
-          dir2="../$$dir2"; \
-        fi; \
-        dir0="$$dir0"/"$$first"; \
-      fi; \
-    fi; \
-    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
-  done; \
-  reldir="$$dir2"
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CAIRO_CFLAGS = @CAIRO_CFLAGS@
-CAIRO_GIR_PACKAGE = @CAIRO_GIR_PACKAGE@
-CAIRO_LIBS = @CAIRO_LIBS@
-CAIRO_SHARED_LIBRARY = @CAIRO_SHARED_LIBRARY@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-EXPANDED_BINDIR = @EXPANDED_BINDIR@
-EXPANDED_DATADIR = @EXPANDED_DATADIR@
-EXPANDED_LIBDIR = @EXPANDED_LIBDIR@
-EXPANDED_LIBEXECDIR = @EXPANDED_LIBEXECDIR@
-EXPANDED_LOCALSTATEDIR = @EXPANDED_LOCALSTATEDIR@
-EXPANDED_SYSCONFDIR = @EXPANDED_SYSCONFDIR@
-EXTRA_LINK_FLAGS = @EXTRA_LINK_FLAGS@
-FFI_CFLAGS = @FFI_CFLAGS@
-FFI_LIBS = @FFI_LIBS@
-FFI_PC_CFLAGS = @FFI_PC_CFLAGS@
-FFI_PC_LIBS = @FFI_PC_LIBS@
-FFI_PC_PACKAGES = @FFI_PC_PACKAGES@
-FGREP = @FGREP@
-GIO_CFLAGS = @GIO_CFLAGS@
-GIO_LIBS = @GIO_LIBS@
-GIO_UNIX_CFLAGS = @GIO_UNIX_CFLAGS@
-GIO_UNIX_LIBS = @GIO_UNIX_LIBS@
-GIREPO_CFLAGS = @GIREPO_CFLAGS@
-GIREPO_LIBS = @GIREPO_LIBS@
-GIR_DIR = @GIR_DIR@
-GIR_SUFFIX = @GIR_SUFFIX@
-GI_HIDDEN_VISIBILITY_CFLAGS = @GI_HIDDEN_VISIBILITY_CFLAGS@
-GI_VERSION = @GI_VERSION@
-GLIBSRC = @GLIBSRC@
-GLIB_CFLAGS = @GLIB_CFLAGS@
-GLIB_LIBS = @GLIB_LIBS@
-GMODULE_CFLAGS = @GMODULE_CFLAGS@
-GMODULE_LIBS = @GMODULE_LIBS@
-GOBJECT_CFLAGS = @GOBJECT_CFLAGS@
-GOBJECT_INTROSPECTION_LIBDIR = @GOBJECT_INTROSPECTION_LIBDIR@
-GOBJECT_LIBS = @GOBJECT_LIBS@
-GREP = @GREP@
-GTKDOC_CHECK = @GTKDOC_CHECK@
-GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
-GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
-GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
-GTKDOC_MKPDF = @GTKDOC_MKPDF@
-GTKDOC_REBASE = @GTKDOC_REBASE@
-HTML_DIR = @HTML_DIR@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LEX = @LEX@
-LEXLIB = @LEXLIB@
-LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MKDIR_P = @MKDIR_P@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-POW_LIB = @POW_LIB@
-PYTHON = @PYTHON@
-PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
-PYTHON_INCLUDES = @PYTHON_INCLUDES@
-PYTHON_LIBS = @PYTHON_LIBS@
-PYTHON_PLATFORM = @PYTHON_PLATFORM@
-PYTHON_PREFIX = @PYTHON_PREFIX@
-PYTHON_VERSION = @PYTHON_VERSION@
-RANLIB = @RANLIB@
-SCANNER_CFLAGS = @SCANNER_CFLAGS@
-SCANNER_LIBS = @SCANNER_LIBS@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-VERSION = @VERSION@
-YACC = @YACC@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-pkgpyexecdir = @pkgpyexecdir@
-pkgpythondir = @pkgpythondir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-pyexecdir = @pyexecdir@
-pythondir = @pythondir@
-runstatedir = @runstatedir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-SUBDIRS = vs9 vs10 vs11 vs12 vs14 vs15
-EXTRA_DIST = \
-	Makefile.msvc-introspection	\
-	detectenv-msvc.mak		\
-	gen-win32-cairo-gir.py		\
-	gen-win32-g-ir-tools.py		\
-	gi-build-common-msvc.mak	\
-	gi-introspection-msvc.mak	\
-	gi_msvc_build_utils.py		\
-	gi-setenv-msvc.mak		\
-	gi-tests-msvc.mak		\
-	gipc.py				\
-	introspection-msvc.mak		\
-	pc_base.py			\
-	replace.py
-
-all: all-recursive
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign win32/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign win32/Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-# This directory's subdirectories are mostly independent; you can cd
-# into them and run 'make' without going through this Makefile.
-# To change the values of 'make' variables: instead of editing Makefiles,
-# (1) if the variable is set in 'config.status', edit 'config.status'
-#     (which will cause the Makefiles to be regenerated when you run 'make');
-# (2) otherwise, pass the desired values on the 'make' command line.
-$(am__recursive_targets):
-	@fail=; \
-	if $(am__make_keepgoing); then \
-	  failcom='fail=yes'; \
-	else \
-	  failcom='exit 1'; \
-	fi; \
-	dot_seen=no; \
-	target=`echo $@ | sed s/-recursive//`; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	for subdir in $$list; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    dot_seen=yes; \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done; \
-	if test "$$dot_seen" = "no"; then \
-	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-	fi; test -z "$$fail"
-
-ID: $(am__tagged_files)
-	$(am__define_uniq_tagged_files); mkid -fID $$unique
-tags: tags-recursive
-TAGS: tags
-
-tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
-	set x; \
-	here=`pwd`; \
-	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
-	  include_option=--etags-include; \
-	  empty_fix=.; \
-	else \
-	  include_option=--include; \
-	  empty_fix=; \
-	fi; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test ! -f $$subdir/TAGS || \
-	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
-	  fi; \
-	done; \
-	$(am__define_uniq_tagged_files); \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: ctags-recursive
-
-CTAGS: ctags
-ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
-	$(am__define_uniq_tagged_files); \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-cscopelist: cscopelist-recursive
-
-cscopelist-am: $(am__tagged_files)
-	list='$(am__tagged_files)'; \
-	case "$(srcdir)" in \
-	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
-	  *) sdir=$(subdir)/$(srcdir) ;; \
-	esac; \
-	for i in $$list; do \
-	  if test -f "$$i"; then \
-	    echo "$(subdir)/$$i"; \
-	  else \
-	    echo "$$sdir/$$i"; \
-	  fi; \
-	done >> $(top_builddir)/cscope.files
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    $(am__make_dryrun) \
-	      || test -d "$(distdir)/$$subdir" \
-	      || $(MKDIR_P) "$(distdir)/$$subdir" \
-	      || exit 1; \
-	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
-	    $(am__relativize); \
-	    new_distdir=$$reldir; \
-	    dir1=$$subdir; dir2="$(top_distdir)"; \
-	    $(am__relativize); \
-	    new_top_distdir=$$reldir; \
-	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
-	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
-	    ($(am__cd) $$subdir && \
-	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$$new_top_distdir" \
-	        distdir="$$new_distdir" \
-		am__remove_distdir=: \
-		am__skip_length_check=: \
-		am__skip_mode_fix=: \
-	        distdir) \
-	      || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-recursive
-all-am: Makefile
-installdirs: installdirs-recursive
-installdirs-am:
-install: install-recursive
-install-exec: install-exec-recursive
-install-data: install-data-recursive
-uninstall: uninstall-recursive
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-recursive
-install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-recursive
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-recursive
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-tags
-
-dvi: dvi-recursive
-
-dvi-am:
-
-html: html-recursive
-
-html-am:
-
-info: info-recursive
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-recursive
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-recursive
-
-install-html-am:
-
-install-info: install-info-recursive
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-recursive
-
-install-pdf-am:
-
-install-ps: install-ps-recursive
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-recursive
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-recursive
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-recursive
-
-pdf-am:
-
-ps: ps-recursive
-
-ps-am:
-
-uninstall-am:
-
-.MAKE: $(am__recursive_targets) install-am install-strip
-
-.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
-	check-am clean clean-generic clean-libtool cscopelist-am ctags \
-	ctags-am distclean distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	installdirs-am maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
-	ps ps-am tags tags-am uninstall uninstall-am
-
-.PRECIOUS: Makefile
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/win32/Makefile.msvc-introspection b/win32/Makefile.msvc-introspection
deleted file mode 100644
index 1a244e0..0000000
--- a/win32/Makefile.msvc-introspection
+++ /dev/null
@@ -1,129 +0,0 @@
-# Author: Fan, Chun-wei
-# Common autotools file for constructing the g-ir-scanner and
-# g-ir-compiler command lines for Visual Studio builds.
-
-# This is copied from $(srcroot)/win32 from the gobject-introspection
-# project, which may be included in projects that support both
-# Visual Studio builds and introspection.
-
-# * Input variables:
-#
-#   MSVC_INTROSPECT_GIRS - List of .gir's that should be built
-#                          in the NMake Makefiles
-#
-# * Simple tutorial
-#
-# Add this to Makefile.am where your library/program is built:
-#   (Either YourLib_1_0_gir_MSVC_LIBS or YourLib_1_0_gir_MSVC_PROGRAM
-#    is required unless --headers-only is specified in
-#    YourLib_1_0_gir__MSVC_SCANNERFLAGS)
-#
-#   include <this Makefile.msvc-introspection>
-#   MSVC_INTROSPECT_GIRS = YourLib-1.0.gir
-#   YourLib_1_0_gir_NAMESPACE = YourLib # This is optional
-#   YourLib_1_0_gir_VERSION = 1.0 # This is optional
-#   YourLib_1_0_gir_MSVC_LIBS = yourlib-1.0
-#   YourLib_1_0_gir_MSVC_FILES = $(libyourlib_1_0_SOURCES)
-#   YourLib_1_0_gir_MSVC_PROGRAM = YourProgram
-#   YourLib_1_0_gir_MSVC_PACKAGES = (Dependent .pc files)
-#   YourLib_1_0_gir_MSVC_INCLUDE_GIRS = (Dependent external .gir's)
-#   YourLib_1_0_gir_MSVC_EXPORT_PACKAGES = (Packages exported by this .gir)
-#   YourLib_1_0_gir_MSVC_C_INCLUDES = (List of public C headers which need to be included by
-#                                      consumers at compile time to make use of the API)
-
-# Private functions
-
-## Transform the MSVC project filename (no filename extensions) to something which can reference through a variable
-## without automake/make complaining, eg Gtk-2.0 -> Gtk_2_0
-_gir_name=$(subst /,_,$(subst -,_,$(subst .,_,$(1))))
-
-# Namespace and Version is either fetched from the gir filename
-# or the _NAMESPACE/_VERSION variable combo
-_gir_namespace_msvc = $(or $($(_gir_name)_NAMESPACE),$(firstword $(subst -, ,$(notdir $(1)))))
-_gir_version_msvc = $(or $($(_gir_name)_VERSION),$(lastword $(subst -, ,$(1:.gir=))))
-_typelib_basename_msvc = $(_gir_namespace_msvc)'-'$(_gir_version_msvc)
-
-# _PROGRAM is an optional variable which needs its own --program argument
-_gir_program_msvc = $(if $($(_gir_name)_MSVC_PROGRAM),--program=$($(_gir_name)_MSVC_PROGRAM))
-
-# Deduce the sub-folder from $(srcroot) where the sources reside in
-_gir_source_path_raw_msvc:=$(subst $(abs_top_srcdir),,$(abs_srcdir))
-_gir_source_path_msvc=$(subst /,\\,$(_gir_source_path_raw_msvc))
-_gir_source_subdir_int_msvc=$(subst \\\\,\\,\\$(_gir_source_path_msvc)\\)
-_gir_source_subdir_msvc=$(subst \\.\\,\\,$(_gir_source_subdir_int_msvc))
-
-_gir_files_raw_msvc=$(subst /,\\,$($(_gir_name)_MSVC_FILES))
-_gir_files_msvc=$(subst $(srcdir)\\,,$(subst $(builddir)\\,,$(subst $(top_builddir)\\$(_gir_source_path_msvc)\\,\\,$(_gir_files_raw_msvc))))
-
-# Create a list of items for:
-# - Libraries
-# - Packages
-# - GIRs to include
-# - packages to export
-
-_gir_libraries_msvc = $(foreach lib,$($(_gir_name)_MSVC_LIBS),--library=$(lib))
-_gir_packages_msvc = $(foreach pkg,$($(_gir_name)_MSVC_PACKAGES),--pkg=$(pkg))
-_gir_includes_msvc = $(foreach include,$($(_gir_name)_MSVC_INCLUDE_GIRS),--include=$(include))
-_gir_export_packages_msvc = $(foreach pkg,$($(_gir_name)_MSVC_EXPORT_PACKAGES),--pkg-export=$(pkg))
-_gir_c_includes_msvc = $(foreach include,$($(_gir_name)_MSVC_C_INCLUDES),--c-include=$(include))
-
-#
-# Create NMake Makefile Sections for Building Introspection files
-# from autotools files
-# $(1) - File Name of the .gir that is to be generated
-#
-
-define gir-nmake-builder
-
-# Basic sanity check, to make sure required variables are set
-$(if $($(_gir_name)_MSVC_FILES),,$(error Need to define $(_gir_name)_MSVC_FILES))
-$(if $(or $(findstring --header-only,$($(_gir_name)_MSVC_SCANNERFLAGS)),
-          $($(_gir_name)_MSVC_LIBS),
-          $($(_gir_name)_MSVC_PROGRAM)),,
-    $(error Need to define $(_gir_name)_MSVC_LIBS or $(_gir_name)_MSVC_PROGRAM))
-
-$(top_builddir)/win32/$(_gir_name)_list:
-	for F in $(_gir_files_msvc); do \
-		case $$$$F in \
-		*.c|*.cpp|*.cc|*.cxx|*.h|*.hpp|*.hh|*.hxx) \
-			echo '..'$(_gir_source_subdir_msvc)$$$$F >>$(top_builddir)/win32/$(_gir_name)_list \
-			;; \
-		esac; \
-	done
-
-$(top_builddir)/win32/$(1).msvc.introspect:
-	-$(RM) $(top_builddir)/win32/$(1).msvc.introspect
-
-# Assemble the Command to Run g-ir-scanner
-	echo $(1)': '$(_gir_name)'_list '$($(_gir_name)_MSVC_GIR_DEPS)>>$(top_builddir)/win32/$(1).msvc.introspect
-	echo '	@-echo Generating $$$$@...'>>$(top_builddir)/win32/$(1).msvc.introspect
-	echo '	$$$$(PYTHON) $$$$(G_IR_SCANNER)	\'>>$(top_builddir)/win32/$(1).msvc.introspect
-	echo '	--verbose -no-libtool	\'>>$(top_builddir)/win32/$(1).msvc.introspect
-	echo '	--namespace='$(_gir_namespace_msvc)'	\'>>$(top_builddir)/win32/$(1).msvc.introspect
-	echo '	--nsversion='$(_gir_version_msvc)'	\'>>$(top_builddir)/win32/$(1).msvc.introspect
-	echo '	'$(_gir_packages_msvc)'	\'>>$(top_builddir)/win32/$(1).msvc.introspect
-	echo '	'$(_gir_libraries_msvc)'	\'>>$(top_builddir)/win32/$(1).msvc.introspect
-	echo '	'$(_gir_program_msvc)'	\'>>$(top_builddir)/win32/$(1).msvc.introspect
-	echo '	--add-include-path=$$$$(G_IR_INCLUDEDIR)	\'>>$(top_builddir)/win32/$(1).msvc.introspect
-	echo '	'$(_gir_includes_msvc)'	\'>>$(top_builddir)/win32/$(1).msvc.introspect
-	echo '	'$(_gir_export_packages_msvc)'	\'>>$(top_builddir)/win32/$(1).msvc.introspect
-	echo '  '$(_gir_c_includes_msvc)'	\'>>$(top_builddir)/win32/$(1).msvc.introspect
-	echo '	--cflags-begin	\'>>$(top_builddir)/win32/$(1).msvc.introspect
-	echo '	'$($(_gir_name)_MSVC_CFLAGS)'	\'>>$(top_builddir)/win32/$(1).msvc.introspect
-	echo '	--cflags-end	\'>>$(top_builddir)/win32/$(1).msvc.introspect
-	echo '	'$($(_gir_name)_MSVC_SCANNERFLAGS)'	\'>>$(top_builddir)/win32/$(1).msvc.introspect
-	echo '	--filelist='$(_gir_name)'_list	\'>>$(top_builddir)/win32/$(1).msvc.introspect
-	echo '	-o $$$$@'>>$(top_builddir)/win32/$(1).msvc.introspect
-	echo '' >>$(top_builddir)/win32/$(1).msvc.introspect
-
-# Finally Assemble the Command to Compile the generated .gir
-	echo '$(_typelib_basename_msvc).typelib: '$(_typelib_basename_msvc)'.gir'>>$(top_builddir)/win32/$(1).msvc.introspect
-	echo '	@-echo Compiling $$$$@...'>>$(top_builddir)/win32/$(1).msvc.introspect
-	echo '	$$$$(G_IR_COMPILER)	\'>>$(top_builddir)/win32/$(1).msvc.introspect
-	echo '	--includedir=. --debug --verbose	\'>>$(top_builddir)/win32/$(1).msvc.introspect
-	echo '	'$(1)'	\'>>$(top_builddir)/win32/$(1).msvc.introspect
-	echo '	-o $$$$@'>>$(top_builddir)/win32/$(1).msvc.introspect
-	echo '' >>$(top_builddir)/win32/$(1).msvc.introspect
-endef
-
-$(foreach gir,$(MSVC_INTROSPECT_GIRS),$(eval $(call gir-nmake-builder,$(gir))))
diff --git a/win32/Makefile.msvcproj b/win32/Makefile.msvcproj
deleted file mode 100644
index 2e96e12..0000000
--- a/win32/Makefile.msvcproj
+++ /dev/null
@@ -1,153 +0,0 @@
-# Author: Fan, Chun-wei
-# Common Autotools file used to generate Visual Studio 2008+
-# Projects from their templates
-
-# This autotools file, from GLib, can be used in other projects
-# that have Visual Studio build support.
-
-# * Input variables:
-#
-#   MSVCPROJS - List of Projects that should be generated
-#
-# * Simple tutorial
-#
-# Add this to Makefile.am where your library/program is built:
-#   include <this Makefile.msvcproj>
-#   MSVCPROJS = YourProject (can be multiple projects in a single srcdir)
-#   YourProject_FILES = $(libyourlib_1_0_SOURCES)
-#   YourProject_EXCLUDES = ... # list of sources to exclude, separated by '|', wildcards allowed; use random unsed value if none
-#   (the following 3 lines if headers need to be installed)
-#   YourProject_HEADERS_DIR = $(libyourlibincludedir)
-#   YourProject_HEADERS_INST = $(libyourlib_1_0_HEADERS)
-#   YourProject_HEADERS_EXCLUDES = ... # <list of headers to exclude from installation, separated by '|', wildcards allowed; use random unsed value if none>
-#
-#   dist-hook: \ # (or add to it if it is already there, note the vs9 items will also call the vs10 items in the process)
-#   	$(top_builddir)/win32/vs9/YourProject.vcproj	\
-#   	$(top_builddir)/win32/vs9/YourProject.headers	# if headers need to be installed
-#
-#   --or, if Visual Studio 2013 or later is required--
-#   dist-hook: \ # (or add to it if it is already there, this does -not- call other vs items in the process)
-#	$(top_builddir)/win32/vs12/YourProject.vcxproj	\
-#	$(top_builddir)/win32/vs12/YourProject.vs12.headers	# if headers need to be installed
-
-# Private functions
-
-## Transform the MSVC project filename (no filename extensions) to something which can reference through a variable
-## without automake/make complaining, eg Gtk-2.0 -> Gtk_2_0
-_proj_name=$(subst /,_,$(subst -,_,$(subst .,_,$(1))))
-_proj_path_raw:=$(subst $(abs_top_srcdir),,$(abs_srcdir))
-_proj_path=$(subst /,\\,$(_proj_path_raw))
-_proj_subdir_int=$(subst \\\\,\\,\\$(_proj_path)\\)
-_proj_subdir=$(subst \\.\\,\\,$(_proj_subdir_int))
-
-_proj_files_raw=$(subst /,\\,$($(_proj_name)_FILES))
-_proj_files=$(subst $(srcdir)\\,,$(subst $(builddir)\\,,$(subst $(top_builddir)\\$(_proj_path)\\,\\,$(_proj_files_raw))))
-_proj_filters=$($(_proj_name)_EXCLUDES)
-
-_proj_headers_raw=$(subst /,\\,$($(_proj_name)_HEADERS_INST))
-_proj_headers=$(subst $(srcdir)\\,,$(subst $(builddir)\\,,$(subst $(top_builddir)\\$(_proj_path)\\,\\,$(_proj_headers_raw))))
-_proj_headers_excludes=$($(_proj_name)_HEADERS_EXCLUDES)
-
-_headers_dest_posix=$(subst $(includedir),,$($(_proj_name)_HEADERS_DIR))
-_headers_destdir=$(subst /,\\,$(_headers_dest_posix))
-
-#
-# Creates Visual Studio 2008/2010 projects from items passed in from autotools files
-# $(1) - Base Name of the MSVC project files (outputs)
-#
-
-define msvcproj-builder
-
-$(top_builddir)/win32/vs10/$(1).vcxproj: $(top_builddir)/win32/vs9/$(1).vcproj
-$(top_builddir)/win32/vs10/$(1).vcxproj.filters: $(top_builddir)/win32/vs9/$(1).vcproj
-$(1).sourcefiles: $(top_builddir)/win32/vs9/$(1).vcproj
-$(1).vs10.sourcefiles: $(top_builddir)/win32/vs9/$(1).vcproj
-$(1).vs10.sourcefiles.filters: $(top_builddir)/win32/vs9/$(1).vcproj
-
-$(top_builddir)/win32/vs9/$(1).vcproj: Makefile
-	-$(RM) $(top_builddir)/win32/vs9/$(1).vcproj
-	-$(RM) $(top_builddir)/win32/vs10/$(1).vcxproj
-	-$(RM) $(top_builddir)/win32/vs10/$(1).vcxproj.filters
-	-$(RM) $(top_builddir)/win32/vs11/$(1).vcxproj
-	-$(RM) $(top_builddir)/win32/vs11/$(1).vcxproj.filters
-	-$(RM) $(top_builddir)/win32/vs12/$(1).vcxproj
-	-$(RM) $(top_builddir)/win32/vs12/$(1).vcxproj.filters
-	-$(RM) $(top_builddir)/win32/vs14/$(1).vcxproj
-	-$(RM) $(top_builddir)/win32/vs14/$(1).vcxproj.filters
-
-
-	for F in $(_proj_files); do \
-		case $$$$F in \
-		$(_proj_filters)) \
-			;; \
-		*.c|*.cpp|*.cc|*.cxx) \
-			echo '   <File RelativePath="..\..'$(_proj_subdir)$$$$F'" />' >>$(1).sourcefiles && \
-			echo '   <ClCompile Include="..\..'$(_proj_subdir)$$$$F'" />' >>$(1).vs10.sourcefiles && \
-			echo '   <ClCompile Include="..\..'$(_proj_subdir)$$$$F'"><Filter>Source Files</Filter></ClCompile>' >>$(1).vs10.sourcefiles.filters \
-			;; \
-		esac;	\
-	done
-
-
-	$(CPP) -P - <$(top_srcdir)/win32/vs9/$(1).vcprojin >$(top_builddir)/win32/vs9/$(1).vcproj
-	$(CPP) -P - <$(top_srcdir)/win32/vs10/$(1).vcxprojin >$(top_builddir)/win32/vs10/$(1).vcxproj
-	$(CPP) -P - <$(top_srcdir)/win32/vs10/$(1).vcxproj.filtersin >$(top_builddir)/win32/vs10/$(1).vcxproj.filters
-	$(RM) $(1).sourcefiles
-	$(RM) $(1).vs10.sourcefiles
-	$(RM) $(1).vs10.sourcefiles.filters
-
-$(top_builddir)/win32/vs10/$(1).vs10.headers: $(top_builddir)/win32/vs9/$(1).headers
-
-$(top_builddir)/win32/vs9/$(1).headers: Makefile
-	-$(RM) $(top_builddir)/win32/vs9/$(1).headers
-	-$(RM) $(top_builddir)/win32/vs10/$(1).vs10.headers
-
-	for F in $(_proj_headers); do \
-		case $$$$F in \
-		$(_proj_headers_excludes)) \
-			;; \
-		*.h|*.hpp|*.hh|*.hxx) \
-			echo 'copy ..\..'$(_proj_subdir)$$$$F' $$$$(CopyDir)\include'$(_headers_destdir)'\'$$$$F'&#x0D;&#x0A;' >>$(top_builddir)/win32/vs9/$(1).headers && \
-			echo 'copy ..\..'$(_proj_subdir)$$$$F' $$$$(CopyDir)\include'$(_headers_destdir)'\'$$$$F >>$(top_builddir)/win32/vs10/$(1).vs10.headers \
-			;; \
-		esac;	\
-	done
-
-$(top_builddir)/win32/vs12/$(1).vcxproj.filters: $(top_builddir)/win32/vs12/$(1).vcxproj
-
-$(top_builddir)/win32/vs12/$(1).vcxproj: Makefile
-	-$(RM) $(top_builddir)/win32/vs14/$(1).vcxproj
-	-$(RM) $(top_builddir)/win32/vs14/$(1).vcxproj.filters
-
-	for F in $(_proj_files); do \
-		case $$$$F in \
-		$(_proj_filters)) \
-			;; \
-		*.c|*.cpp|*.cc|*.cxx) \
-			echo '   <ClCompile Include="..\..'$(_proj_subdir)$$$$F'" />' >>$(1).vs12.sourcefiles && \
-			echo '   <ClCompile Include="..\..'$(_proj_subdir)$$$$F'"><Filter>Source Files</Filter></ClCompile>' >>$(1).vs12.sourcefiles.filters \
-			;; \
-		esac;	\
-	done
-
-	$(CPP) -P - <$(top_srcdir)/win32/vs12/$(1).vcxprojin >$(top_builddir)/win32/vs12/$(1).vcxproj
-	$(CPP) -P - <$(top_srcdir)/win32/vs12/$(1).vcxproj.filtersin >$(top_builddir)/win32/vs12/$(1).vcxproj.filters
-	$(RM) $(1).vs12.sourcefiles
-	$(RM) $(1).vs12.sourcefiles.filters
-
-$(top_builddir)/win32/vs12/$(1).vs12.headers: Makefile
-	-$(RM) $(top_builddir)/win32/vs12/$(1).vs12.headers
-
-	for F in $(_proj_headers); do \
-		case $$$$F in \
-		$(_proj_headers_excludes)) \
-			;; \
-		*.h|*.hpp|*.hh|*.hxx) \
-			echo 'copy ..\..'$(_proj_subdir)$$$$F' $$$$(CopyDir)\include'$(_headers_destdir)'\'$$$$F >>$(top_builddir)/win32/vs12/$(1).vs12.headers \
-			;; \
-		esac;	\
-	done
-
-endef
-
-$(foreach proj,$(MSVCPROJS),$(eval $(call msvcproj-builder,$(proj))))
diff --git a/win32/detectenv-msvc.mak b/win32/detectenv-msvc.mak
deleted file mode 100644
index 6fd96cc..0000000
--- a/win32/detectenv-msvc.mak
+++ /dev/null
@@ -1,78 +0,0 @@
-# Common NMake Makefile module for checking the build environment
-# This can be copied from $(glib_srcroot)\build\win32 for GNOME items
-# that support MSVC builds and introspection under MSVC, and can be used
-# for building test programs as well.
-
-# Check to see we are configured to build with MSVC (MSDEVDIR, MSVCDIR or
-# VCINSTALLDIR) or with the MS Platform SDK (MSSDK or WindowsSDKDir)
-!if !defined(VCINSTALLDIR) && !defined(WINDOWSSDKDIR)
-MSG = ^
-This Makefile is only for Visual Studio 2008 and later.^
-You need to ensure that the Visual Studio Environment is properly set up^
-before running this Makefile.
-!error $(MSG)
-!endif
-
-ERRNUL  = 2>NUL
-_HASH=^#
-
-!if ![echo VCVERSION=_MSC_VER > vercl.x] \
-    && ![echo $(_HASH)if defined(_M_IX86) >> vercl.x] \
-    && ![echo PLAT=Win32 >> vercl.x] \
-    && ![echo $(_HASH)elif defined(_M_AMD64) >> vercl.x] \
-    && ![echo PLAT=x64 >> vercl.x] \
-    && ![echo $(_HASH)endif >> vercl.x] \
-    && ![cl -nologo -TC -P vercl.x $(ERRNUL)]
-!include vercl.i
-!if ![echo VCVER= ^\> vercl.vc] \
-    && ![set /a $(VCVERSION) / 100 - 6 >> vercl.vc]
-!include vercl.vc
-!endif
-!endif
-!if ![del $(ERRNUL) /q/f vercl.x vercl.i vercl.vc]
-!endif
-
-!if $(VCVERSION) > 1499 && $(VCVERSION) < 1600
-VSVER = 9
-!elseif $(VCVERSION) > 1599 && $(VCVERSION) < 1700
-VSVER = 10
-!elseif $(VCVERSION) > 1699 && $(VCVERSION) < 1800
-VSVER = 11
-!elseif $(VCVERSION) > 1799 && $(VCVERSION) < 1900
-VSVER = 12
-!elseif $(VCVERSION) > 1899 && $(VCVERSION) < 1910
-VSVER = 14
-!elseif $(VCVERSION) > 1909 && $(VCVERSION) < 2000
-VSVER = 15
-!else
-VSVER = 0
-!endif
-
-!if "$(VSVER)" == "0"
-MSG = ^
-This NMake Makefile set supports Visual Studio^
-9 (2008) through 14 (2015).  Your Visual Studio^
-version is not supported.
-!error $(MSG)
-!endif
-
-VALID_CFGSET = FALSE
-!if "$(CFG)" == "release" || "$(CFG)" == "debug" || "$(CFG)" == "Release" || "$(CFG)" == "Debug"
-VALID_CFGSET = TRUE
-!endif
-
-# We want debugging symbols logged for all builds,
-# using .pdb files for release builds
-CFLAGS_BASE = /Zi
-
-!if "$(CFG)" == "release" || "$(CFG)" == "Release"
-CFLAGS_ADD = /MD /O2 $(CFLAGS_BASE)
-!else
-CFLAGS_ADD = /MDd /Od $(CFLAGS_BASE)
-!endif
-
-!if "$(PLAT)" == "x64"
-LDFLAGS_ARCH = /machine:x64
-!else
-LDFLAGS_ARCH = /machine:x86
-!endif
diff --git a/win32/gen-win32-cairo-gir.py b/win32/gen-win32-cairo-gir.py
deleted file mode 100644
index f26031b..0000000
--- a/win32/gen-win32-cairo-gir.py
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/usr/bin/python
-#
-# Expand the bundled cairo-1.0.gir.in files
-# for use in Visual C++ builds of G-I
-#
-# Author: Fan, Chun-wei
-# Date: January 20, 2014
-#
-# (Adapted from setup.py in
-# $(glib_src_root)/build/win32/setup.py written by Shixin Zeng)
-
-import os
-import sys
-import argparse
-
-import replace
-
-from gi_msvc_build_utils import parent_dir
-
-def main(argv):
-    parser = argparse.ArgumentParser(description='Generate the complete cairo-1.0.gir')
-    parser.add_argument('--dllname',
-                        required=True,
-                        help='Full file name of the Cairo-GObject DLL for the Cairo Introspection File')
-    args = parser.parse_args()
-
-    # Get the srcroot and the path where the bundled .gir files reside in the package
-    srcroot = parent_dir(__file__)
-    preset_gir_path = os.path.join(srcroot, 'gir')
-
-    # Set up variables in cairo-1.0.gir.in to produce cairo-1.0.gir
-    cairo_replace_items = {'%CAIRO_GIR_PACKAGE%': 'cairo-gobject',
-                           '%CAIRO_SHARED_LIBRARY%': args.dllname}
-    replace.replace_multi(os.path.join(preset_gir_path, 'cairo-1.0.gir.in'),
-                          'cairo-1.0.gir',
-                          cairo_replace_items)
-
-if __name__ == '__main__':
-    sys.exit(main(sys.argv))
diff --git a/win32/gen-win32-g-ir-tools.py b/win32/gen-win32-g-ir-tools.py
deleted file mode 100644
index 444fe80..0000000
--- a/win32/gen-win32-g-ir-tools.py
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/usr/bin/python
-#
-# Expand the bundled cairo-1.0.gir.in files
-# for use in Visual C++ builds of G-I
-#
-# Author: Fan, Chun-wei
-# Date: January 20, 2014
-#
-# (Adapted from setup.py in
-# $(glib_src_root)/build/win32/setup.py written by Shixin Zeng)
-
-import os
-import sys
-import optparse
-
-import replace
-from gi_msvc_build_utils import parent_dir
-
-def setup_vars_tools(module, func, srcfile, outfile):
-    # This doesn't really matter for cmd.exe usage, but
-    # let's just set this like this here, in case one
-    # wants to use MinGW with the scripts generated here
-    replace.replace(srcfile,
-                    outfile + '.tmp0',
-                    '@PYTHON@',
-                    'python')
-
-    # Now replace the needed items...
-    replace.replace(outfile + '.tmp0',
-                    outfile + '.tmp',
-                    '@TOOL_MODULE@',
-                    module)
-    os.unlink(outfile + '.tmp0')
-    replace.replace(outfile + '.tmp',
-                    outfile,
-                    '@TOOL_FUNCTION@',
-                    func)
-    os.unlink(outfile + '.tmp')
-
-def main(argv):
-    modules = ['scannermain','annotationmain','docmain']
-    funcs = ['scanner_main','annotation_main','doc_main']
-    tools = ['g-ir-scanner','g-ir-annotation-tool','g-ir-doc-tool']
-
-    srcroot = parent_dir(__file__)
-    preset_tools_path = os.path.join(srcroot, 'tools')
-    src = os.path.join(preset_tools_path, 'g-ir-tool-template.in')
-
-    for i in range(3):
-        dest = os.path.join(preset_tools_path, tools[i])
-        setup_vars_tools(modules[i], funcs[i], src, dest)
-
-if __name__ == '__main__':
-    sys.exit(main(sys.argv))
diff --git a/win32/gi-build-common-msvc.mak b/win32/gi-build-common-msvc.mak
deleted file mode 100644
index 6d36ba8..0000000
--- a/win32/gi-build-common-msvc.mak
+++ /dev/null
@@ -1,19 +0,0 @@
-# Common NMake Makefile to Build Introspection Files and Tests for G-I
-
-# Please do not change anything after this line
-
-!include detectenv-msvc.mak
-
-GI_APIVERSION = 1.0
-GLIB_APIVERSION = 2.0
-
-CHECK_PACKAGE = gio-$(GLIB_APIVERSION)
-
-!include introspection-msvc.mak
-
-BINDIR = vs$(VSVER)\$(CFG)\$(PLAT)\bin
-TOP_SRCDIR = ..
-
-G_IR_SCANNER_CURRENT = $(TOP_SRCDIR)\tools\g-ir-scanner
-G_IR_DOC_TOOL_CURRENT = $(TOP_SRCDIR)\tools\g-ir-doc-tool
-G_IR_COMPILER_CURRENT = $(BINDIR)\g-ir-compiler.exe
diff --git a/win32/gi-introspection-msvc.mak b/win32/gi-introspection-msvc.mak
deleted file mode 100644
index 78ca395..0000000
--- a/win32/gi-introspection-msvc.mak
+++ /dev/null
@@ -1,211 +0,0 @@
-# NMake Makefile to build Introspection Files for G-I
-
-# Change or pass in as a variable/env var if needed
-# The main DLLs that are used to build introspection files that are "installed"
-!if "$(CAIROGOBJECT_DLLNAME)" == ""
-!if "$(USE_LIBTOOL_NAME)" == "1"
-CAIROGOBJECT_DLLNAME = libcairo-gobject-2.dll
-!else
-CAIROGOBJECT_DLLNAME = cairo-gobject-vs$(VSVER).dll
-!endif
-!endif
-
-# Please do not change anything after this line
-
-!include gi-build-common-msvc.mak
-
-# The .gir's that are in $(srcroot)/gir, applicable to Windows
-# cairo-1.0.gir is not listed as it needs to be processed first
-bundled_girs =	\
-	win32-1.0.gir	\
-	fontconfig-2.0.gir	\
-	freetype2-2.0.gir	\
-	GL-1.0.gir	\
-	libxml2-2.0.gir
-
-# The .typelib's that are build from the .gir's bundled with the
-# G-I package, applicable to Windows
-bundled_typelibs =	\
-	cairo-1.0.typelib	\
-	fontconfig-2.0.typelib	\
-	freetype2-2.0.typelib	\
-	GL-1.0.typelib	\
-	libxml2-2.0.typelib	\
-	win32-1.0.typelib
-
-# The .gir's for GLib/G-I that are built and "installed"
-built_install_girs =	\
-	GLib-$(GLIB_APIVERSION).gir	\
-	GModule-$(GLIB_APIVERSION).gir	\
-	GObject-$(GLIB_APIVERSION).gir	\
-	Gio-$(GLIB_APIVERSION).gir	\
-	GIRepository-$(GLIB_APIVERSION).gir
-
-# The .typelib's for GLib/G-I that are built and "installed"
-built_install_typelibs =	\
-	GLib-$(GLIB_APIVERSION).typelib	\
-	GModule-$(GLIB_APIVERSION).typelib	\
-	GObject-$(GLIB_APIVERSION).typelib	\
-	Gio-$(GLIB_APIVERSION).typelib	\
-	GIRepository-$(GLIB_APIVERSION).typelib
-
-generarated_test_srcs = everything.c everything.h
-
-!if "$(BUILD_INTROSPECTION)" == "TRUE"
-all: setgirbuildenv			\
-	$(generarated_test_srcs)	\
-	$(built_install_girs)		\
-	$(built_install_typelibs)	\
-	$(bundled_girs)			\
-	$(bundled_typelibs)		\
-	msg_cairo
-
-!include gi-setenv-msvc.mak
-
-glib_list:
-	@-echo Generating file list for GLib...
-	@-echo $(PREFIX)\lib\glib-2.0\include\glibconfig.h> $@
-	@-for /f %%a in ('dir /b $(PREFIX)\include\glib-2.0\glib\*.h') do @echo $(PREFIX)\include\glib-2.0\glib\%%a>> $@
-	@-echo $(PREFIX)\include\glib-2.0\gobject\glib-types.h>> $@
-	@-echo $(TOP_SRCDIR)\gir\glib-2.0.c>> $@
-
-gobject_list:
-	@-echo Generating file list for GObject...
-	@-type NUL > $@
-	@-for /f %%a in ('dir /b $(PREFIX)\include\glib-2.0\gobject\*.h') do @if not %%a == glib-types.h @echo $(PREFIX)\include\glib-2.0\gobject\%%a>> $@
-	@-echo $(TOP_SRCDIR)\gir\gobject-2.0.c>> $@
-
-gio_list:
-	@-echo Generating file list for GIO...
-	@-type NUL > $@
-	@-for /f %%a in ('dir /b $(PREFIX)\include\gio-win32-2.0\gio\*.h') do @echo $(PREFIX)\include\gio-win32-2.0\gio\%%a>> $@
-	@-for /f %%a in ('dir /b $(PREFIX)\include\glib-2.0\gio\*.h') do @echo $(PREFIX)\include\glib-2.0\gio\%%a>> $@
-	@-echo $(TOP_SRCDIR)\gir\gio-2.0.c>> $@
-
-gi_list:
-	@-echo Generating file list for girepository...
-	@-echo $(TOP_SRCDIR)\girepository\girepository.h > $@
-	@-echo $(TOP_SRCDIR)\girepository\girepository.c >> $@
-	@-for /f %%a in ('dir /b $(TOP_SRCDIR)\girepository\gi*info.c') do @echo $(TOP_SRCDIR)\girepository\%%a >> $@
-	@-for /f %%a in ('dir /b $(TOP_SRCDIR)\girepository\gi*info.h') do @echo $(TOP_SRCDIR)\girepository\%%a >> $@
-	@-echo $(TOP_SRCDIR)\girepository\gitypelib.h >> $@
-	@-echo $(TOP_SRCDIR)\girepository\gitypes.h >> $@
-
-# Generated .gir files for GLib/GModule/GObject/Gio/GIRepository
-GLib-$(GLIB_APIVERSION).gir: glib_list
-	@-echo Generating $@...
-	$(PYTHON) $(G_IR_SCANNER_CURRENT) --verbose -I$(TOP_SRCDIR) --add-include-path=$(TOP_SRCDIR)	\
-	--add-include-path=$(TOP_SRCDIR)\gir --add-include-path=. --namespace=GLib --nsversion=$(GLIB_APIVERSION)	\
-	--no-libtool --pkg=gio-windows-$(GLIB_APIVERSION) --pkg=glib-$(GLIB_APIVERSION)	\
-	--include=win32-$(GI_APIVERSION) --library=glib-2.0 --library=gobject-2.0	\
-	--external-library --reparse-validate --identifier-prefix=G --symbol-prefix=g	\
-	--symbol-prefix=glib --c-include="glib.h" -I$(PREFIX)\include\glib-$(GLIB_APIVERSION)	\
-	-I$(PREFIX)\lib\glib-2.0\include -I$(PREFIX)\include -DGETTEXT_PACKAGE=Dummy	\
-	-DGLIB_COMPILATION -D__G_I18N_LIB_H__ --filelist=glib_list -o $@
-
-GModule-$(GLIB_APIVERSION).gir: GLib-$(GLIB_APIVERSION).gir
-	@-echo Generating $@...
-	$(PYTHON) $(G_IR_SCANNER_CURRENT) --verbose -I$(TOP_SRCDIR) --add-include-path=$(TOP_SRCDIR)	\
-	--add-include-path=$(TOP_SRCDIR)\gir --add-include-path=. --namespace=GModule --nsversion=2.0	\
-	--no-libtool --include=GLib-$(GLIB_APIVERSION) --pkg=gmodule-$(GLIB_APIVERSION) --library=gmodule-2.0	\
-	--external-library --reparse-validate --identifier-prefix=G --c-include="gmodule.h"	\
-	-I$(PREFIX)\include\glib-2.0 -I$(PREFIX)\lib\glib-2.0\include -I$(PREFIX)\include	\
-	$(PREFIX)\include\glib-2.0\gmodule.h $(TOP_SRCDIR)\gir\gmodule-2.0.c -o $@
-
-GObject-$(GLIB_APIVERSION).gir: gobject_list GModule-$(GLIB_APIVERSION).gir
-	@-echo Generating $@...
-	$(PYTHON) $(G_IR_SCANNER_CURRENT) --verbose -I$(TOP_SRCDIR) --add-include-path=$(TOP_SRCDIR)	\
-	--add-include-path=$(TOP_SRCDIR)\gir --add-include-path=. --namespace=GObject --nsversion=$(GLIB_APIVERSION)	\
-	--no-libtool --include=GLib-$(GLIB_APIVERSION) --pkg=gobject-$(GLIB_APIVERSION) --library=gobject-2.0	\
-	--external-library --reparse-validate --identifier-prefix=G --c-include="glib-gobject.h"	\
-	-I$(PREFIX)/include/glib-2.0 -I$(PREFIX)/lib/glib-2.0/include -I$(PREFIX)/include	\
-	-DGOBJECT_COMPILATION --filelist=gobject_list -o $@
-
-Gio-$(GLIB_APIVERSION).gir: gio_list GObject-$(GLIB_APIVERSION).gir
-	@-echo Generating $@...
-	$(PYTHON) $(G_IR_SCANNER_CURRENT) --verbose -I$(TOP_SRCDIR) --add-include-path=$(TOP_SRCDIR)	\
-	--add-include-path=$(TOP_SRCDIR)\gir --add-include-path=. --namespace=Gio --nsversion=$(GLIB_APIVERSION)	\
-	--no-libtool --pkg=gio-$(GLIB_APIVERSION) --pkg=gio-windows-$(GLIB_APIVERSION) --include=GObject-$(GLIB_APIVERSION)	\
-	--library=gio-2.0 --external-library --reparse-validate --warn-all	\
-	--identifier-prefix=G --include=GLib-$(GLIB_APIVERSION) --c-include="gio/gio.h" -DGIO_COMPILATION -DG_SETTINGS_ENABLE_BACKEND	\
-	-I$(PREFIX)\include\glib-2.0 -I$(PREFIX)\lib\glib-2.0\include	\
-	-I$(PREFIX)\include --filelist=gio_list -o $@
-
-GIRepository-$(GLIB_APIVERSION).gir: gi_list GObject-$(GLIB_APIVERSION).gir
-	@-echo Generating $@...
-	$(PYTHON) $(G_IR_SCANNER_CURRENT) --verbose --warn-all	\
-	--add-include-path=$(TOP_SRCDIR)\gir --add-include-path=. --namespace=GIRepository --nsversion=$(GLIB_APIVERSION)	\
-	--identifier-prefix=GI --symbol-prefix=g --c-include="girepository.h" --add-include-path=.	\
-	--no-libtool --pkg=gobject-$(GLIB_APIVERSION) --include=GObject-$(GLIB_APIVERSION)	\
-	--library=girepository-1.0 -I$(TOP_SRCDIR)\girepository -I$(TOP_SRCDIR) -I$(PREFIX)\include 	\
-	-I$(PREFIX)\include\glib-2.0 -I$(PREFIX)\lib\glib-2.0\include --filelist=gi_list	\
-	-DGI_COMPILATION -o $@
-
-# Bundled cairo-1.0.gir.in processing
-cairo-1.0.gir: $(TOP_SRCDIR)\gir\cairo-1.0.gir.in
-	@-echo Generating $@ from $*.gir.in...
-	@-$(PYTHON) gen-win32-cairo-gir.py --dllname=$(CAIROGOBJECT_DLLNAME)
-
-# Copy the .gir's bundled with G-I to this folder
-$(bundled_girs): $(TOP_SRCDIR)\gir\win32-1.0.gir $(TOP_SRCDIR)\gir\fontconfig-2.0.gir $(TOP_SRCDIR)\gir\freetype2-2.0.gir $(TOP_SRCDIR)\gir\GL-1.0.gir $(TOP_SRCDIR)\gir\libxml2-2.0.gir
-	@-echo Copying the bundled $*.gir that came with the GobjectIntrospection package...
-	@-copy $(TOP_SRCDIR)\gir\$*.gir $@
-
-# Generate .typelib's from generated .gir's
-$(built_install_typelibs): $(bundled_girs) $(built_install_girs)
-	@-echo Compiling $*.typelib...
-	@-$(G_IR_COMPILER_CURRENT) --includedir=. --debug --verbose $*.gir -o $@
-
-# Generate .typelib's from bundled .gir's
-$(bundled_typelibs): cairo-1.0.gir $(bundled_girs)
-	@-echo Compiling the bundled $*.gir that came with the GobjectIntrospection package...
-	@-$(G_IR_COMPILER_CURRENT) --includedir=. --debug --verbose $*.gir -o $@
-
-# Rules for source code generation
-$(generarated_test_srcs):
-	$(PYTHON) $(G_IR_SCANNER_CURRENT) -I$(TOP_SRCDIR) \
-	--generate-typelib-tests=Everything,everything.h,everything.c	\
-	--function-decoration=_GI_TEST_EXTERN	\
-	--include-first-in-src=config.h	\
-	--include-last-in-header=gitestmacros.h
-
-msg_cairo:
-	@-echo.
-	@-echo ************* Note ***********************************
-	@-echo The cairo-1.0.gir links to $(CAIROGOBJECT_DLLNAME),
-	@-echo please ensure that this is the correct DLL where the
-	@-echo cairo-gobject symbols can be loaded, which needs to
-	@-echo found when running programs or scripts that would
-	@-echo be using cairo-1.0.typelib.
-	@-echo.
-	@-echo If not, please clean the build and redo the build
-	@-echo specifying the correct DLL by passing in
-	@-echo CAIROGOBJECT_DLLNAME^=^<your DLL full filename^> when
-	@-echo invoking this NMake Makefile
-
-install-introspection: all
-	@-mkdir $(G_IR_INCLUDEDIR)
-	@-mkdir $(G_IR_TYPELIBDIR)
-	@-copy cairo-1.0.gir $(G_IR_INCLUDEDIR)
-	@-for %a in ($(built_install_girs)) do @copy %a $(G_IR_INCLUDEDIR)
-	@-for %b in ($(built_install_typelibs)) do @copy %b $(G_IR_TYPELIBDIR)
-	@-for %c in ($(bundled_girs)) do @copy %c $(G_IR_INCLUDEDIR)
-	@-for %d in ($(bundled_typelibs)) do @copy %d $(G_IR_TYPELIBDIR)
-
-!else
-all: install-introspection
-
-install-introspection:
-	@-echo $(ERROR_MSG)
-!endif
-
-clean:
-	@-del /f/q *.typelib
-	@-del /f/q *.gir
-	@-del /f/q gi_list
-	@-del /f/q gio_list
-	@-del /f/q gobject_list
-	@-del /f/q glib_list
-	@-del /f/q $(generarated_test_srcs)
-	@ if exist __pycache__ rmdir /s /q __pycache__
-	@-del /f/q *.pyc
diff --git a/win32/gi-setenv-msvc.mak b/win32/gi-setenv-msvc.mak
deleted file mode 100644
index fe7935d..0000000
--- a/win32/gi-setenv-msvc.mak
+++ /dev/null
@@ -1,12 +0,0 @@
-# Common NMake Makefile to set Build Environment for
-# Building Introspection Files and Associated Tests
-
-# Please do not change anything after this line
-
-setgirbuildenv:
-	@set UNINSTALLED_INTROSPECTION_SRCDIR=$(TOP_SRCDIR)
-	@set UNINSTALLED_INTROSPECTION_BUILDDIR=$(TOP_SRCDIR)
-	@set PYTHONPATH=$(TOP_SRCDIR);$(BINDIR)
-	@set PATH=$(BINDIR);$(PREFIX)\bin;$(PATH)
-	@set PKG_CONFIG_PATH=$(PKG_CONFIG_PATH)
-	@set LIB=vs$(VSVER)\$(CFG)\$(PLAT)\bin;$(PREFIX)\lib;$(LIB)
diff --git a/win32/gi-tests-msvc.mak b/win32/gi-tests-msvc.mak
deleted file mode 100644
index 939e357..0000000
--- a/win32/gi-tests-msvc.mak
+++ /dev/null
@@ -1,292 +0,0 @@
-# NMake Makefile to build The Tests for G-I
-
-# Please do not change anything after this line
-
-!include gi-build-common-msvc.mak
-
-!if "$(CFG)" == "release"
-!if "$(VSVER)" == "9" && "$(PLAT)" == "x64"
-TESTS_CFLAGS_ADD = /MD /O1 /Oi
-!else
-TESTS_CFLAGS_ADD = $(CFLAGS_ADD)
-!endif
-!else
-TESTS_CFLAGS_ADD = /MDd /Od /Zi /DG_ENABLE_DEBUG
-!endif
-
-BASE_GLIB_LIBS = gio-$(GLIB_APIVERSION).lib gobject-$(GLIB_APIVERSION).lib gmodule-$(GLIB_APIVERSION).lib glib-$(GLIB_APIVERSION).lib
-CFLAGS = $(TESTS_CFLAGS_ADD) /I$(TOP_SRCDIR) /W3 /we4013 /FImsvc_recommended_pragmas.h /DHAVE_CONFIG_H
-LDFLAGS = /link $(LDFLAGS_ARCH) $(BASE_GLIB_LIBS) /DEBUG /opt:noref
-LDFLAGS_DLL = /link $(LDFLAGS_ARCH) /DLL /out:$@ /implib:$*-$(GI_APIVERSION).lib $(BASE_GLIB_LIBS) /DEBUG /opt:noref
-
-# Special CFLAGS for Regress test
-REGRESS_CFLAGS = /I$(PREFIX)\include\cairo /DREGRESS_PRINT_PREVIEW_COMMAND="evince --unlink-tempfile --preview --print-settings %s %f" /DREGRESS_SOME_CHAR='c'
-
-# The test .gir's for G-I that are built
-built_test_girs = 	\
-	GIMarshallingTests-$(GI_APIVERSION).gir	\
-	Everything-$(GI_APIVERSION).gir	\
-	Offsets-$(GI_APIVERSION).gir	\
-	SLetter-$(GI_APIVERSION).gir	\
-	Utility-$(GI_APIVERSION).gir	\
-	GtkFrob-$(GI_APIVERSION).gir	\
-	GetType-$(GI_APIVERSION).gir	\
-	WarnLib-$(GI_APIVERSION).gir	\
-	Typedefs-$(GI_APIVERSION).gir	\
-	Regress-$(GI_APIVERSION).gir	\
-	Bar-$(GI_APIVERSION).gir	\
-	Headeronly-$(GI_APIVERSION).gir	\
-	Identfilter-$(GI_APIVERSION).gir
-
-built_test_typelibs =	\
-	GIMarshallingTests-$(GI_APIVERSION).typelib	\
-	Everything-$(GI_APIVERSION).typelib	\
-	Offsets-$(GI_APIVERSION).typelib	\
-	SLetter-$(GI_APIVERSION).typelib	\
-	Utility-$(GI_APIVERSION).typelib	\
-	GtkFrob-$(GI_APIVERSION).typelib	\
-	GetType-$(GI_APIVERSION).typelib	\
-	WarnLib-$(GI_APIVERSION).typelib	\
-	Typedefs-$(GI_APIVERSION).typelib	\
-	Regress-$(GI_APIVERSION).typelib	\
-	Bar-$(GI_APIVERSION).typelib	\
-	Headeronly-$(GI_APIVERSION).typelib	\
-	Identfilter-$(GI_APIVERSION).typelib
-
-test_programs =	\
-	gitestrepo.exe	\
-	gitestthrows.exe	\
-	giteststructinfo.exe	\
-	gitypelibtest.exe	\
-	gitestoffsets.exe
-
-built_doc_tests =	\
-	Regress-$(GI_APIVERSION)-C	\
-	Regress-$(GI_APIVERSION)-Python	\
-	Regress-$(GI_APIVERSION)-Gjs	\
-	Regress-$(GI_APIVERSION)-sections.txt
-
-!if "$(BUILD_INTROSPECTION)" == "TRUE"
-all: setgirbuildenv $(built_test_girs) $(built_test_typelibs) $(test_programs) $(built_doc_tests) warn_tests_log.txt
-
-!include gi-setenv-msvc.mak
-
-# Rules for building the test DLLs
-gimarshallingtests.dll: $(TOP_SRCDIR)\tests\gimarshallingtests.c
-	$(CC) $(CFLAGS) $(TOP_SRCDIR)\tests\gimarshallingtests.c $(LDFLAGS_DLL)
-	@-if exist $@.manifest @mt /manifest $@.manifest /outputresource:$@;2
-
-everything.dll: everything.c everything.h
-	$(CC) $(CFLAGS) /I$(TOP_SRCDIR)\tests everything.c $(LDFLAGS_DLL)
-	@-if exist $@.manifest @mt /manifest $@.manifest /outputresource:$@;2
-
-offsets.dll: $(TOP_SRCDIR)\tests\offsets\offsets.c
-	$(CC) $(CFLAGS) /I$(TOP_SRCDIR)\tests /I$(TOP_SRCDIR)\tests\offsets $(TOP_SRCDIR)\tests\offsets\offsets.c $(LDFLAGS_DLL)
-	@-if exist $@.manifest @mt /manifest $@.manifest /outputresource:$@;2
-
-{$(TOP_SRCDIR)\tests\scanner\}.c{}.dll:
-	$(CC) $(CFLAGS) /I$(TOP_SRCDIR)\tests $< $(LDFLAGS_DLL)
-	@-if exist $@.manifest @mt /manifest $@.manifest /outputresource:$@;2
-
-regress.dll:
-	$(CC) $(CFLAGS) /I$(TOP_SRCDIR)\tests	\
-	$(REGRESS_CFLAGS)	\
-	$(TOP_SRCDIR)\tests\scanner\regress.c	\
-	$(TOP_SRCDIR)\tests\scanner\annotation.c	\
-	$(TOP_SRCDIR)\tests\scanner\foo.c	\
-	$(TOP_SRCDIR)\tests\scanner\drawable.c	\
-	$(LDFLAGS_DLL) cairo-gobject.lib cairo.lib
-	@-if exist $@.manifest @mt /manifest $@.manifest /outputresource:$@;2
-
-# Rules for test programs
-{$(TOP_SRCDIR)\tests\repository\}.c{}.exe:
-	$(CC) $(CFLAGS) /I$(TOP_SRCDIR)\girepository $< $(LDFLAGS) girepository-$(GI_APIVERSION).lib
-	@-if exist $@.manifest @mt /manifest $@.manifest /outputresource:$@;1
-
-{$(TOP_SRCDIR)\tests\scanner\}.c{}.exe:
-	$(CC) $(CFLAGS) /I$(TOP_SRCDIR)\girepository -I$(TOP_SRCDIR)\tests $< $(LDFLAGS) girepository-$(GI_APIVERSION).lib
-	@-if exist $@.manifest @mt /manifest $@.manifest /outputresource:$@;1
-
-gitestoffsets.exe: gitestoffsets.c
-	$(CC) $(CFLAGS) /I$(TOP_SRCDIR)\girepository /I$(TOP_SRCDIR)\tests\offsets /I$(TOP_SRCDIR)\tests $*.c $(LDFLAGS) girepository-$(GI_APIVERSION).lib
-	@-if exist $@.manifest @mt /manifest $@.manifest /outputresource:$@;1
-	@set GI_TYPELIB_PATH=.
-	@-$@ offsets.compiled offsets.introspected
-	@-fc offsets.compiled offsets.introspected > gitestoffsets.log
-
-# Rules for building the .gir's
-GIMarshallingTests-$(GI_APIVERSION).gir: gimarshallingtests.dll
-	$(PYTHON) $(G_IR_SCANNER_CURRENT) --warn-all --warn-error --reparse-validate	\
-	--namespace=GIMarshallingTests --symbol-prefix=gi_marshalling_tests --nsversion=$(GI_APIVERSION)	\
-	--no-libtool -I$(TOP_SRCDIR)	\
-	--add-include-path=. --include=Gio-$(GLIB_APIVERSION)	\
-	--library=$* --output=$@	\
-	--c-include="tests/gimarshallingtests.h"	\
-	$(TOP_SRCDIR)\tests\gimarshallingtests.h $(TOP_SRCDIR)\tests\gimarshallingtests.c
-
-Everything-$(GI_APIVERSION).gir: everything.dll
-	$(PYTHON) $(G_IR_SCANNER_CURRENT) --warn-all --warn-error --reparse-validate	\
-	--namespace=Everything --nsversion=$(GI_APIVERSION)	\
-	--no-libtool -I$(TOP_SRCDIR) -I$(TOP_SRCDIR)\tests	\
-	--add-include-path=. --include=Gio-$(GLIB_APIVERSION)	\
-	--library=$* --output=$@	\
-	everything.h everything.c
-
-Offsets-$(GI_APIVERSION).gir: offsets.dll
-	$(PYTHON) $(G_IR_SCANNER_CURRENT) --warn-all --warn-error --reparse-validate	\
-	--namespace=Offsets --nsversion=$(GI_APIVERSION)	\
-	--no-libtool -I$(TOP_SRCDIR) -I$(TOP_SRCDIR)\tests\offsets -I$(TOP_SRCDIR)\tests	\
-	--pkg=gobject-$(GLIB_APIVERSION) --add-include-path=. --include=GObject-$(GLIB_APIVERSION)	\
-	--library=$* --output=$@	\
-	$(TOP_SRCDIR)\tests\offsets\offsets.h $(TOP_SRCDIR)\tests\offsets\offsets.c
-
-SLetter-$(GI_APIVERSION).gir: sletter.dll
-	$(PYTHON) $(G_IR_SCANNER_CURRENT) --warn-all --reparse-validate	\
-	--namespace=SLetter --nsversion=$(GI_APIVERSION) \
-	--no-libtool -I$(TOP_SRCDIR)\tests -I$(TOP_SRCDIR)	\
-	--add-include-path=. --include=Gio-$(GLIB_APIVERSION)	\
-	--identifier-prefix=S --c-include="sletter.h" --warn-error	\
-	--library=$* --output=$@	\
-	$(TOP_SRCDIR)\tests\scanner\sletter.h $(TOP_SRCDIR)\tests\scanner\sletter.c
-
-Utility-$(GI_APIVERSION).gir: utility.dll
-	$(PYTHON) $(G_IR_SCANNER_CURRENT) --warn-all --reparse-validate	\
-	--namespace=Utility --nsversion=$(GI_APIVERSION)	\
-	--no-libtool -I$(TOP_SRCDIR)\tests -I$(TOP_SRCDIR) --pkg=gobject-$(GLIB_APIVERSION)	\
-	--add-include-path=. --include=GObject-$(GLIB_APIVERSION)	\
-	--c-include="utility.h" --warn-error	\
-	--library=$* --output=$@ \
-	$(TOP_SRCDIR)\tests\scanner\utility.h $(TOP_SRCDIR)\tests\scanner\utility.c
-
-GtkFrob-$(GI_APIVERSION).gir: gtkfrob.dll
-	$(PYTHON) $(G_IR_SCANNER_CURRENT) --warn-all --reparse-validate	\
-	--namespace=GtkFrob --nsversion=$(GI_APIVERSION)	\
-	--no-libtool -I$(TOP_SRCDIR)\tests -I$(TOP_SRCDIR) --pkg=gobject-$(GLIB_APIVERSION)	\
-	--add-include-path=. --include=GObject-$(GLIB_APIVERSION)	\
-	--identifier-prefix=Gtk --symbol-prefix=gtk_frob --warn-error	\
-	--library=$* --output=$@ \
-	$(TOP_SRCDIR)\tests\scanner\gtkfrob.h $(TOP_SRCDIR)\tests\scanner\gtkfrob.c
-
-GetType-$(GI_APIVERSION).gir: gettype.dll
-	$(PYTHON) $(G_IR_SCANNER_CURRENT) --warn-all --reparse-validate	\
-	--namespace=GetType --nsversion=$(GI_APIVERSION)	\
-	--no-libtool -I$(TOP_SRCDIR)\tests -I$(TOP_SRCDIR) --pkg=gobject-$(GLIB_APIVERSION)	\
-	--add-include-path=. --include=GObject-$(GLIB_APIVERSION)	\
-	--c-include="gettype.h" --identifier-prefix=GetType --symbol-prefix=gettype	\
-	--library=$* --output=$@ \
-	$(TOP_SRCDIR)\tests\scanner\gettype.h $(TOP_SRCDIR)\tests\scanner\gettype.c
-
-Typedefs-$(GI_APIVERSION).gir: typedefs.dll
-	$(PYTHON) $(G_IR_SCANNER_CURRENT) --warn-all --reparse-validate	\
-	--namespace=Typedefs --nsversion=$(GI_APIVERSION)	\
-	--no-libtool -I$(TOP_SRCDIR)\tests -I$(TOP_SRCDIR) --pkg=gobject-$(GLIB_APIVERSION)	\
-	--add-include-path=. --include=GObject-$(GLIB_APIVERSION)	\
-	--c-include="typedefs.h" --identifier-prefix=Typedefs --symbol-prefix=typedefs	\
-	--library=$* --output=$@ \
-	$(TOP_SRCDIR)\tests\scanner\typedefs.h $(TOP_SRCDIR)\tests\scanner\typedefs.c
-
-WarnLib-$(GI_APIVERSION).gir: warnlib.dll
-	$(PYTHON) $(G_IR_SCANNER_CURRENT) --warn-all --reparse-validate	\
-	--namespace=WarnLib --nsversion=$(GI_APIVERSION)	\
-	--no-libtool -I$(TOP_SRCDIR)\tests -I$(TOP_SRCDIR)	\
-	--add-include-path=. --include=Gio-$(GLIB_APIVERSION)	\
-	--c-include="warnlib.h" --symbol-prefix=warnlib_	\
-	--library=$* --output=$@ \
-	$(TOP_SRCDIR)\tests\scanner\warnlib.h $(TOP_SRCDIR)\tests\scanner\warnlib.c
-
-Regress-$(GI_APIVERSION).gir: Utility-$(GI_APIVERSION).gir regress.dll
-	$(PYTHON) $(G_IR_SCANNER_CURRENT) --warn-all	\
-	--namespace=Regress --nsversion=$(GI_APIVERSION)	\
-	--no-libtool -I$(TOP_SRCDIR)\tests -I$(TOP_SRCDIR)	\
-	--add-include-path=. --include=Gio-$(GLIB_APIVERSION)	\
-	--include=Utility-$(GI_APIVERSION) --include=cairo-$(GI_APIVERSION)	\
-	--c-include="regress.h" --warn-error	\
-	--library=$* --output=$@	\
-	$(REGRESS_CFLAGS)	\
-	$(TOP_SRCDIR)\tests\scanner\regress.c $(TOP_SRCDIR)\tests\scanner\regress.h	\
-	$(TOP_SRCDIR)\tests\scanner\annotation.c $(TOP_SRCDIR)\tests\scanner\annotation.h	\
-	$(TOP_SRCDIR)\tests\scanner\foo.c $(TOP_SRCDIR)\tests\scanner\foo.h	\
-	$(TOP_SRCDIR)\tests\scanner\drawable.c $(TOP_SRCDIR)\tests\scanner\drawable.h
-
-Bar-$(GI_APIVERSION).gir: Utility-$(GI_APIVERSION).gir barapp.exe
-	$(PYTHON) $(G_IR_SCANNER_CURRENT) --warn-all	\
-	--namespace=Bar --nsversion=$(GI_APIVERSION)	\
-	--program=barapp	\
-	--no-libtool -I$(TOP_SRCDIR)\tests -I$(TOP_SRCDIR) --pkg=gobject-$(GLIB_APIVERSION)	\
-	--add-include-path=. --include=GObject-$(GLIB_APIVERSION)	\
-	--accept-unprefixed	\
-	--output=$@	\
-	$(TOP_SRCDIR)\tests\scanner\barapp.c $(TOP_SRCDIR)\tests\scanner\barapp.h
-
-Headeronly-$(GI_APIVERSION).gir:
-	$(PYTHON) $(G_IR_SCANNER_CURRENT) --warn-all	\
-	--warn-error --reparse-validate --namespace=Headeronly --nsversion=$(GI_APIVERSION)	\
-	--header-only --output=$@ $(TOP_SRCDIR)\tests\scanner\headeronly.h
-
-Identfilter-$(GI_APIVERSION).gir:
-	$(PYTHON) $(G_IR_SCANNER_CURRENT) --warn-all --reparse-validate	\
-	--namespace=Identfilter --accept-unprefixed --nsversion=1.0 --header-only	\
-	--identifier-filter-cmd="$(PYTHON) $(TOP_SRCDIR)\tests\scanner\identfilter.py"	\
-	--output=$@ $(TOP_SRCDIR)\tests\scanner\identfilter.h
-
-# Rules for doc (Mallard) tests
-Regress-$(GI_APIVERSION)-C: Regress-$(GI_APIVERSION).gir
-	@-if exist $@ @rmdir /s /q $@
-	$(PYTHON) $(G_IR_DOC_TOOL_CURRENT) --add-include-path=. --language C .\Regress-$(GI_APIVERSION).gir -o .\$@\
-
-Regress-$(GI_APIVERSION)-Python: Regress-$(GI_APIVERSION).gir
-	@-if exist $@ @rmdir /s /q $@
-	$(PYTHON) $(G_IR_DOC_TOOL_CURRENT) --add-include-path=. --language Python .\Regress-$(GI_APIVERSION).gir -o .\$@\
-
-Regress-$(GI_APIVERSION)-Gjs: Regress-$(GI_APIVERSION).gir
-	@-if exist $@ @rmdir /s /q $@
-	$(PYTHON) $(G_IR_DOC_TOOL_CURRENT) --add-include-path=. --language Gjs .\Regress-$(GI_APIVERSION).gir -o .\$@\
-
-Regress-$(GI_APIVERSION)-sections.txt: Regress-$(GI_APIVERSION).gir
-	$(PYTHON) $(G_IR_DOC_TOOL_CURRENT) --add-include-path=. --write-sections-file .\Regress-$(GI_APIVERSION).gir -o $@
-
-# Run warn tests
-warn_tests_log.txt:
-	@-echo Runinng warn tests...
-	@-copy GObject-$(GLIB_APIVERSION).gir $(TOP_SRCDIR)\gir
-	@-copy GLib-$(GLIB_APIVERSION).gir $(TOP_SRCDIR)\gir
-	@-set TOP_BUILDDIR=..
-	@-for %a in ($(TOP_SRCDIR)\tests\warn\*.h) do if not "%a" == "$(TOP_SRCDIR)\tests\warn\common.h" $(PYTHON) $(TOP_SRCDIR)\tests\warn\warningtester.py %a >> $@
-	@-del $(TOP_SRCDIR)\gir\GObject-$(GLIB_APIVERSION).gir
-	@-del $(TOP_SRCDIR)\gir\GLib-$(GLIB_APIVERSION).gir
-
-gitestoffsets.c: Offsets-$(GI_APIVERSION).typelib
-	$(PYTHON) $(TOP_SRCDIR)\tests\offsets\gen-gitestoffsets $(TOP_SRCDIR)\tests\offsets\offsets.h > $@
-
-# Generate .typelib's from generated .gir's
-$(built_test_typelibs): $(built_test_girs)
-	@-echo Compiling $*.typelib...
-	@-$(G_IR_COMPILER_CURRENT) --includedir=. --debug --verbose $*.gir -o $@
-
-!else
-all: install-introspection
-
-install-introspection:
-	@-echo $(ERROR_MSG)
-!endif
-
-clean:
-	@-del /f/q warn_tests_log.txt
-	@-del /f/q gitestoffsets.log
-	@-del /f/q Regress-$(GI_APIVERSION)-sections.txt
-	@-rmdir /s /q Regress-$(GI_APIVERSION)-Gjs
-	@-rmdir /s /q Regress-$(GI_APIVERSION)-Python
-	@-rmdir /s /q Regress-$(GI_APIVERSION)-C
-	@-for %a in ($(built_test_typelibs)) do @del %a
-	@-for %a in ($(built_test_girs)) do @del %a
-	@-del /f/q *.ilk
-	@-del /f/q *.lib
-	@-del /f/q *.exp
-	@-del /f/q *.dll
-	@-del /f/q *.exe
-	@-for %a in (*.manifest) do @del /f/q %a
-	@-del /f/q *.pdb
-	@-del /f/q *.obj
-	@-del /f/q gitestoffsets.c
-	@-del offsets.compiled offsets.introspected
-	@-del /f/q *.pyc
diff --git a/win32/gi_msvc_build_utils.py b/win32/gi_msvc_build_utils.py
deleted file mode 100644
index 150f66e..0000000
--- a/win32/gi_msvc_build_utils.py
+++ /dev/null
@@ -1,8 +0,0 @@
-import os
-
-def parent_dir(path):
-    if not os.path.isabs(path):
-        path = os.path.abspath(path)
-    if os.path.isfile(path):
-        path = os.path.dirname(path)
-    return os.path.split(path)[0]
diff --git a/win32/gipc.py b/win32/gipc.py
deleted file mode 100644
index 281f07f..0000000
--- a/win32/gipc.py
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/usr/bin/python
-#
-# Utility script to generate .pc files for GLib
-# for Visual Studio builds, to be used for
-# building introspection files
-
-# Author: Fan, Chun-wei
-# Date: March 10, 2016
-
-import os
-import sys
-
-from replace import replace_multi
-from pc_base import BasePCItems
-
-def main(argv):
-    base_pc = BasePCItems()
-    
-    base_pc.setup(argv)
-    pkg_replace_items = {'@bindir@': '${exec_prefix}/bin',
-                         '@datarootdir@': '${exec_prefix}/share',
-                         '@datadir@': '${datarootdir}',
-                         '@EXEEXT@': '.exe',
-                         '@FFI_PC_CFLAGS@': '',
-                         '@FFI_PC_PACKAGES@': '',
-                         '@FFI_PC_LIBS@': '',
-                         '${bindir}/g-ir-scanner': 'python ${bindir}/g-ir-scanner'}
-
-    pkg_replace_items.update(base_pc.base_replace_items)
-
-    # Generate gobject-introspection-1.0.pc
-    replace_multi(base_pc.top_srcdir + '/gobject-introspection-1.0.pc.in',
-                  base_pc.srcdir + '/gobject-introspection-1.0.pc',
-                  pkg_replace_items)
-
-    # Generate gobject-introspection-no-export-1.0.pc
-    replace_multi(base_pc.top_srcdir + '/gobject-introspection-no-export-1.0.pc.in',
-                  base_pc.srcdir + '/gobject-introspection-no-export-1.0.pc',
-                  pkg_replace_items)
-
-if __name__ == '__main__':
-    sys.exit(main(sys.argv))
diff --git a/win32/introspection-msvc.mak b/win32/introspection-msvc.mak
deleted file mode 100644
index 26501f5..0000000
--- a/win32/introspection-msvc.mak
+++ /dev/null
@@ -1,94 +0,0 @@
-# Common NMake Makefile module for checking the build environment is sane
-# for building introspection files under MSVC/NMake.
-# This can be copied from $(gi_srcroot)\build\win32 for GNOME items
-# that support MSVC builds and introspection under MSVC.
-
-# Can override with env vars as needed
-# You will need to have built gobject-introspection for this to work.
-# Change or pass in or set the following to suit your environment
-
-!if "$(PREFIX)" == ""
-PREFIX = ..\..\vs$(VSVER)\$(PLAT)
-!endif
-
-!if ![setlocal]		&& \
-    ![set PFX=$(PREFIX)]	&& \
-    ![for %P in (%PFX%) do @echo PREFIX_FULL=%~dpnfP > pfx.x]
-!endif
-!include pfx.x
-
-!if "$(PKG_CONFIG_PATH)" == ""
-PKG_CONFIG_PATH=$(PREFIX_FULL)\lib\pkgconfig
-!else
-PKG_CONFIG_PATH=$(PREFIX_FULL)\lib\pkgconfig;$(PKG_CONFIG_PATH)
-!endif
-
-!if ![del $(ERRNUL) /q/f pfx.x]
-!endif
-
-# Note: The PYTHON must be the Python release series that was used to build
-# the GObject-introspection scanner Python module!
-# Either having python.exe your PATH will work or passing in
-# PYTHON=<full path to your Python interpretor> will do
-
-# This is required, and gobject-introspection needs to be built
-# before this can be successfully run.
-!if "$(PYTHON)" == ""
-PYTHON=python
-!endif
-
-# Path to the pkg-config tool, if not already in the PATH
-!if "$(PKG_CONFIG)" == ""
-PKG_CONFIG=pkg-config
-!endif
-
-# Don't change anything following this line!
-
-GIR_SUBDIR = share\gir-1.0
-GIR_TYPELIBDIR = lib\girepository-1.0
-G_IR_SCANNER = $(PREFIX)\bin\g-ir-scanner
-G_IR_COMPILER = $(PREFIX)\bin\g-ir-compiler.exe
-G_IR_INCLUDEDIR = $(PREFIX)\$(GIR_SUBDIR)
-G_IR_TYPELIBDIR = $(PREFIX)\$(GIR_TYPELIBDIR)
-
-VALID_PKG_CONFIG_PATH = FALSE
-
-MSG_INVALID_PKGCONFIG = You must set or specifiy a valid PKG_CONFIG_PATH
-MSG_INVALID_CFG = You need to specify or set CFG to be release or debug to use this Makefile to build the Introspection Files
-
-ERROR_MSG =
-
-BUILD_INTROSPECTION = TRUE
-
-!if ![set PKG_CONFIG_PATH=$(PKG_CONFIG_PATH)]	\
-	&& ![$(PKG_CONFIG) --print-errors --errors-to-stdout $(CHECK_PACKAGE) > pkgconfig.x]	\
-	&& ![setlocal]	\
-	&& ![set file="pkgconfig.x"]	\
-	&& ![FOR %A IN (%file%) DO @echo PKG_CHECK_SIZE=%~zA > pkgconfig.chksize]	\
-	&& ![del $(ERRNUL) /q/f pkgconfig.x]
-!endif
-
-!include pkgconfig.chksize
-!if "$(PKG_CHECK_SIZE)" == "0"
-VALID_PKG_CONFIG_PATH = TRUE
-!else
-VALID_PKG_CONFIG_PATH = FALSE
-!endif
-
-!if ![del $(ERRNUL) /q/f pkgconfig.chksize]
-!endif
-
-VALID_CFGSET = FALSE
-!if "$(CFG)" == "release" || "$(CFG)" == "debug" || "$(CFG)" == "Release" || "$(CFG)" == "Debug"
-VALID_CFGSET = TRUE
-!endif
-
-!if "$(VALID_PKG_CONFIG_PATH)" != "TRUE"
-BUILD_INTROSPECTION = FALSE
-ERROR_MSG = $(MSG_INVALID_PKGCONFIG)
-!endif
-
-!if "$(VALID_CFGSET)" != "TRUE"
-BUILD_INTROSPECTION = FALSE
-ERROR_MSG = $(MSG_INVALID_CFG)
-!endif
diff --git a/win32/pc_base.py b/win32/pc_base.py
deleted file mode 100644
index 285b6cd..0000000
--- a/win32/pc_base.py
+++ /dev/null
@@ -1,124 +0,0 @@
-#!/usr/bin/python
-#
-# Simple utility script to generate the basic info
-# needed in a .pc (pkg-config) file, used especially
-# for introspection purposes
-
-# This can be used in various projects where
-# there is the need to generate .pc files,
-# and is copied from GLib's $(srcroot)/build/win32
-
-# Author: Fan, Chun-wei
-# Date: March 10, 2016
-
-import os
-import sys
-import argparse
-
-class BasePCItems:
-    def __init__(self):
-        self.base_replace_items = {}
-        self.exec_prefix = ''
-        self.includedir = ''
-        self.libdir = ''
-        self.prefix = ''
-        self.srcdir = os.path.dirname(__file__)
-        self.top_srcdir = self.srcdir + '\\..'
-        self.version = ''
-
-    def setup(self, argv, parser=None):
-        if parser is None:
-            parser = argparse.ArgumentParser(description='Setup basic .pc file info')
-        parser.add_argument('--prefix', help='prefix of the installed library',
-                            required=True)
-        parser.add_argument('--exec-prefix',
-                            help='prefix of the installed programs, \
-                                  if different from the prefix')
-        parser.add_argument('--includedir',
-                            help='includedir of the installed library, \
-                                  if different from ${prefix}/include')
-        parser.add_argument('--libdir',
-                            help='libdir of the installed library, \
-                                  if different from ${prefix}/lib')
-        parser.add_argument('--version', help='Version of the package',
-                            required=True)
-        args = parser.parse_args()
-
-        self.version = args.version
-
-        # check whether the prefix and exec_prefix are valid
-        if not os.path.exists(args.prefix):
-            raise SystemExit('Specified prefix \'%s\' is invalid' % args.prefix)
-
-        # use absolute paths for prefix
-        self.prefix = os.path.abspath(args.prefix).replace('\\','/')
-
-        # check and setup the exec_prefix
-        if getattr(args, 'exec_prefix', None) is None:
-            exec_prefix_use_shorthand = True
-            self.exec_prefix = '${prefix}'
-        else:
-            if args.exec_prefix.startswith('${prefix}'):
-                exec_prefix_use_shorthand = True
-                input_exec_prefix = args.prefix + args.exec_prefix[len('${prefix}'):]
-            else:
-                exec_prefix_use_shorthand = False
-                input_exec_prefix = args.exec_prefix
-            if not os.path.exists(input_exec_prefix):
-                raise SystemExit('Specified exec_prefix \'%s\' is invalid' %
-                                  args.exec_prefix)
-            if exec_prefix_use_shorthand is True:
-                self.exec_prefix = args.exec_prefix.replace('\\','/')
-            else:
-                self.exec_prefix = os.path.abspath(input_exec_prefix).replace('\\','/')
-
-        # check and setup the includedir
-        if getattr(args, 'includedir', None) is None:
-            self.includedir = '${prefix}/include'
-        else:
-            if args.includedir.startswith('${prefix}'):
-                includedir_use_shorthand = True
-                input_includedir = args.prefix + args.includedir[len('${prefix}'):]
-            else:
-                if args.includedir.startswith('${exec_prefix}'):
-                    includedir_use_shorthand = True
-                    input_includedir = input_exec_prefix + args.includedir[len('${exec_prefix}'):]
-                else:
-                    includedir_use_shorthand = False
-                    input_includedir = args.includedir
-            if not os.path.exists(input_includedir):
-                raise SystemExit('Specified includedir \'%s\' is invalid' %
-                                  args.includedir)
-            if includedir_use_shorthand is True:
-                self.includedir = args.includedir.replace('\\','/')
-            else:
-                self.includedir = os.path.abspath(input_includedir).replace('\\','/')
-
-        # check and setup the libdir
-        if getattr(args, 'libdir', None) is None:
-            self.libdir = '${prefix}/lib'
-        else:
-            if args.libdir.startswith('${prefix}'):
-                libdir_use_shorthand = True
-                input_libdir = args.prefix + args.libdir[len('${prefix}'):]
-            else:
-                if args.libdir.startswith('${exec_prefix}'):
-                    libdir_use_shorthand = True
-                    input_libdir = input_exec_prefix + args.libdir[len('${exec_prefix}'):]
-                else:
-                    libdir_use_shorthand = False
-                    input_libdir = args.libdir
-            if not os.path.exists(input_libdir):
-                raise SystemExit('Specified libdir \'%s\' is invalid' %
-			                      args.libdir)
-            if libdir_use_shorthand is True:
-                self.libdir = args.libdir.replace('\\','/')
-            else:
-                self.libdir = os.path.abspath(input_libdir).replace('\\','/')
-
-        # setup dictionary for replacing items in *.pc.in
-        self.base_replace_items.update({'@VERSION@': self.version})
-        self.base_replace_items.update({'@prefix@': self.prefix})
-        self.base_replace_items.update({'@exec_prefix@': self.exec_prefix})
-        self.base_replace_items.update({'@libdir@': self.libdir})
-        self.base_replace_items.update({'@includedir@': self.includedir})
diff --git a/win32/replace.py b/win32/replace.py
deleted file mode 100644
index a81bab9..0000000
--- a/win32/replace.py
+++ /dev/null
@@ -1,109 +0,0 @@
-#!/usr/bin/python
-#
-# Simple utility script to manipulate
-# certain types of strings in a file
-
-# This can be used in various projects where
-# there is the need to replace strings in files,
-# and is copied from GLib's $(srcroot)/build/win32
-
-# Author: Fan, Chun-wei
-# Date: September 03, 2014
-
-import os
-import sys
-import re
-import string
-import argparse
-
-valid_actions = ['remove-prefix',
-                 'replace-var',
-                 'replace-str',
-                 'remove-str']
-
-def replace_multi(src, dest, replace_items):
-    with open(src, 'r') as s:
-        with open(dest, 'w') as d:
-            for line in s:
-                replace_dict = dict((re.escape(key), value) \
-                               for key, value in replace_items.items())
-                replace_pattern = re.compile("|".join(replace_dict.keys()))
-                d.write(replace_pattern.sub(lambda m: \
-                        replace_dict[re.escape(m.group(0))], line))
-
-def replace(src, dest, instring, outstring):
-    replace_item = {instring: outstring}
-    replace_multi(src, dest, replace_item)
-
-def check_required_args(args, params):
-    for param in params:
-        if getattr(args, param, None) is None:
-            raise SystemExit('%s: error: --%s argument is required' % (__file__, param))
-
-def warn_ignored_args(args, params):
-    for param in params:
-        if getattr(args, param, None) is not None:
-            print('%s: warning: --%s argument is ignored' % (__file__, param))
-
-def main(argv):
-
-    parser = argparse.ArgumentParser(description='Process strings in a file.')
-    parser.add_argument('-a',
-                        '--action',
-                        help='Action to carry out.  Can be one of:\n'
-                             'remove-prefix\n'
-                             'replace-var\n'
-                             'replace-str\n'
-                             'remove-str',
-                        choices=valid_actions)
-    parser.add_argument('-i', '--input', help='Input file')
-    parser.add_argument('-o', '--output', help='Output file')
-    parser.add_argument('--instring', help='String to replace or remove')
-    parser.add_argument('--var', help='Autotools variable name to replace')
-    parser.add_argument('--outstring',
-                        help='New String to replace specified string or variable')
-    parser.add_argument('--removeprefix', help='Prefix of string to remove')
-
-    args = parser.parse_args()
-
-    input_string = ''
-    output_string = ''
-
-    # We must have action, input, output for all operations
-    check_required_args(args, ['action','input','output'])
-
-    # Build the arguments by the operation that is to be done,
-    # to be fed into replace()
-
-    # Get rid of prefixes from a string
-    if args.action == 'remove-prefix':
-        check_required_args(args, ['instring','removeprefix'])
-        warn_ignored_args(args, ['outstring','var'])
-        input_string = args.removeprefix + args.instring
-        output_string = args.instring
-
-    # Replace an m4-style variable (those surrounded by @...@)
-    if args.action == 'replace-var':
-        check_required_args(args, ['var','outstring'])
-        warn_ignored_args(args, ['instring','removeprefix'])
-        input_string = '@' + args.var + '@'
-        output_string = args.outstring
-
-    # Replace a string
-    if args.action == 'replace-str':
-        check_required_args(args, ['instring','outstring'])
-        warn_ignored_args(args, ['var','removeprefix'])
-        input_string = args.instring
-        output_string = args.outstring
-
-    # Remove a string
-    if args.action == 'remove-str':
-        check_required_args(args, ['instring'])
-        warn_ignored_args(args, ['var','outstring','removeprefix'])
-        input_string = args.instring
-        output_string = ''
-
-    replace(args.input, args.output, input_string, output_string)
-
-if __name__ == '__main__':
-    sys.exit(main(sys.argv))
diff --git a/win32/vs10/Makefile.am b/win32/vs10/Makefile.am
deleted file mode 100644
index fd3f28e..0000000
--- a/win32/vs10/Makefile.am
+++ /dev/null
@@ -1,48 +0,0 @@
-GENERATED_ITEMS = \
-	cmph.vcxproj		\
-	cmph.vcxproj.filters		\
-	girepository.vcxproj	\
-	girepository.vcxproj.filters	\
-	g-ir-compiler.vcxproj	\
-	g-ir-compiler.vcxproj.filters	\
-	gi-install.props
-
-EXTRA_DIST = \
-	gobject-introspection.sln	\
-	gi-build-defines.props	\
-	gi-gen-srcs.props	\
-	gi-install.propsin	\
-	gi-version-paths.props	\
-	gi-prebuild.vcxproj	\
-	girepository.vcxprojin	\
-	girepository.vcxproj.filtersin	\
-	cmph-bdz-test.vcxproj	\
-	cmph-bdz-test.vcxproj.filters	\
-	cmph.vcxprojin	\
-	cmph.vcxproj.filtersin	\
-	g-ir-compiler.vcxprojin	\
-	g-ir-compiler.vcxproj.filtersin	\
-	g-ir-generate.vcxproj	\
-	g-ir-generate.vcxproj.filters	\
-	g-ir-inspect.vcxproj	\
-	g-ir-inspect.vcxproj.filters	\
-	glib-print.vcxproj	\
-	glib-print.vcxproj.filters	\
-	_giscanner.vcxproj	\
-	_giscanner.vcxproj.filters	\
-	gi-install.vcxproj	\
-	gi-install.vcxproj.filters	\
-	gi-introspect.vcxproj	\
-	README.txt	\
-	$(GENERATED_ITEMS)
-
-gi-install.props: $(top_srcdir)/win32/vs10/gi-install.propsin girepository.vs10.headers giscanner.vs10.scripts
-	-$(RM) $(top_builddir)/win32/vs11/gi-install.props
-	-$(RM) $(top_builddir)/win32/vs12/gi-install.props
-	-$(RM) $(top_builddir)/win32/vs14/gi-install.props
-	-$(RM) $(top_builddir)/win32/vs15/gi-install.props
-	$(CPP) -P - <$(top_srcdir)/win32/vs10/gi-install.propsin >$@
-	$(RM) girepository.vs10.headers
-	$(RM) giscanner.vs10.scripts
-
-DISTCLEANFILES = $(GENERATED_ITEMS)
diff --git a/win32/vs10/Makefile.in b/win32/vs10/Makefile.in
deleted file mode 100644
index 128d856..0000000
--- a/win32/vs10/Makefile.in
+++ /dev/null
@@ -1,551 +0,0 @@
-# Makefile.in generated by automake 1.15.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994-2017 Free Software Foundation, Inc.
-
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-VPATH = @srcdir@
-am__is_gnu_make = { \
-  if test -z '$(MAKELEVEL)'; then \
-    false; \
-  elif test -n '$(MAKE_HOST)'; then \
-    true; \
-  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
-    true; \
-  else \
-    false; \
-  fi; \
-}
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -[dEDm]) skip_next=yes;; \
-      -[JT]) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = win32/vs10
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
-	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/python.m4 \
-	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES = gi-version-paths.props
-CONFIG_CLEAN_VPATH_FILES =
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN     " $@;
-am__v_GEN_1 = 
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 = 
-SOURCES =
-DIST_SOURCES =
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-am__DIST_COMMON = $(srcdir)/Makefile.in \
-	$(srcdir)/gi-version-paths.props.in
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CAIRO_CFLAGS = @CAIRO_CFLAGS@
-CAIRO_GIR_PACKAGE = @CAIRO_GIR_PACKAGE@
-CAIRO_LIBS = @CAIRO_LIBS@
-CAIRO_SHARED_LIBRARY = @CAIRO_SHARED_LIBRARY@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-EXPANDED_BINDIR = @EXPANDED_BINDIR@
-EXPANDED_DATADIR = @EXPANDED_DATADIR@
-EXPANDED_LIBDIR = @EXPANDED_LIBDIR@
-EXPANDED_LIBEXECDIR = @EXPANDED_LIBEXECDIR@
-EXPANDED_LOCALSTATEDIR = @EXPANDED_LOCALSTATEDIR@
-EXPANDED_SYSCONFDIR = @EXPANDED_SYSCONFDIR@
-EXTRA_LINK_FLAGS = @EXTRA_LINK_FLAGS@
-FFI_CFLAGS = @FFI_CFLAGS@
-FFI_LIBS = @FFI_LIBS@
-FFI_PC_CFLAGS = @FFI_PC_CFLAGS@
-FFI_PC_LIBS = @FFI_PC_LIBS@
-FFI_PC_PACKAGES = @FFI_PC_PACKAGES@
-FGREP = @FGREP@
-GIO_CFLAGS = @GIO_CFLAGS@
-GIO_LIBS = @GIO_LIBS@
-GIO_UNIX_CFLAGS = @GIO_UNIX_CFLAGS@
-GIO_UNIX_LIBS = @GIO_UNIX_LIBS@
-GIREPO_CFLAGS = @GIREPO_CFLAGS@
-GIREPO_LIBS = @GIREPO_LIBS@
-GIR_DIR = @GIR_DIR@
-GIR_SUFFIX = @GIR_SUFFIX@
-GI_HIDDEN_VISIBILITY_CFLAGS = @GI_HIDDEN_VISIBILITY_CFLAGS@
-GI_VERSION = @GI_VERSION@
-GLIBSRC = @GLIBSRC@
-GLIB_CFLAGS = @GLIB_CFLAGS@
-GLIB_LIBS = @GLIB_LIBS@
-GMODULE_CFLAGS = @GMODULE_CFLAGS@
-GMODULE_LIBS = @GMODULE_LIBS@
-GOBJECT_CFLAGS = @GOBJECT_CFLAGS@
-GOBJECT_INTROSPECTION_LIBDIR = @GOBJECT_INTROSPECTION_LIBDIR@
-GOBJECT_LIBS = @GOBJECT_LIBS@
-GREP = @GREP@
-GTKDOC_CHECK = @GTKDOC_CHECK@
-GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
-GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
-GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
-GTKDOC_MKPDF = @GTKDOC_MKPDF@
-GTKDOC_REBASE = @GTKDOC_REBASE@
-HTML_DIR = @HTML_DIR@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LEX = @LEX@
-LEXLIB = @LEXLIB@
-LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MKDIR_P = @MKDIR_P@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-POW_LIB = @POW_LIB@
-PYTHON = @PYTHON@
-PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
-PYTHON_INCLUDES = @PYTHON_INCLUDES@
-PYTHON_LIBS = @PYTHON_LIBS@
-PYTHON_PLATFORM = @PYTHON_PLATFORM@
-PYTHON_PREFIX = @PYTHON_PREFIX@
-PYTHON_VERSION = @PYTHON_VERSION@
-RANLIB = @RANLIB@
-SCANNER_CFLAGS = @SCANNER_CFLAGS@
-SCANNER_LIBS = @SCANNER_LIBS@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-VERSION = @VERSION@
-YACC = @YACC@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-pkgpyexecdir = @pkgpyexecdir@
-pkgpythondir = @pkgpythondir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-pyexecdir = @pyexecdir@
-pythondir = @pythondir@
-runstatedir = @runstatedir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-GENERATED_ITEMS = \
-	cmph.vcxproj		\
-	cmph.vcxproj.filters		\
-	girepository.vcxproj	\
-	girepository.vcxproj.filters	\
-	g-ir-compiler.vcxproj	\
-	g-ir-compiler.vcxproj.filters	\
-	gi-install.props
-
-EXTRA_DIST = \
-	gobject-introspection.sln	\
-	gi-build-defines.props	\
-	gi-gen-srcs.props	\
-	gi-install.propsin	\
-	gi-version-paths.props	\
-	gi-prebuild.vcxproj	\
-	girepository.vcxprojin	\
-	girepository.vcxproj.filtersin	\
-	cmph-bdz-test.vcxproj	\
-	cmph-bdz-test.vcxproj.filters	\
-	cmph.vcxprojin	\
-	cmph.vcxproj.filtersin	\
-	g-ir-compiler.vcxprojin	\
-	g-ir-compiler.vcxproj.filtersin	\
-	g-ir-generate.vcxproj	\
-	g-ir-generate.vcxproj.filters	\
-	g-ir-inspect.vcxproj	\
-	g-ir-inspect.vcxproj.filters	\
-	glib-print.vcxproj	\
-	glib-print.vcxproj.filters	\
-	_giscanner.vcxproj	\
-	_giscanner.vcxproj.filters	\
-	gi-install.vcxproj	\
-	gi-install.vcxproj.filters	\
-	gi-introspect.vcxproj	\
-	README.txt	\
-	$(GENERATED_ITEMS)
-
-DISTCLEANFILES = $(GENERATED_ITEMS)
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign win32/vs10/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign win32/vs10/Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-gi-version-paths.props: $(top_builddir)/config.status $(srcdir)/gi-version-paths.props.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-tags TAGS:
-
-ctags CTAGS:
-
-cscope cscopelist:
-
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am:
-
-.MAKE: install-am install-strip
-
-.PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	cscopelist-am ctags-am distclean distclean-generic \
-	distclean-libtool distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags-am uninstall uninstall-am
-
-.PRECIOUS: Makefile
-
-
-gi-install.props: $(top_srcdir)/win32/vs10/gi-install.propsin girepository.vs10.headers giscanner.vs10.scripts
-	-$(RM) $(top_builddir)/win32/vs11/gi-install.props
-	-$(RM) $(top_builddir)/win32/vs12/gi-install.props
-	-$(RM) $(top_builddir)/win32/vs14/gi-install.props
-	-$(RM) $(top_builddir)/win32/vs15/gi-install.props
-	$(CPP) -P - <$(top_srcdir)/win32/vs10/gi-install.propsin >$@
-	$(RM) girepository.vs10.headers
-	$(RM) giscanner.vs10.scripts
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/win32/vs10/README.txt b/win32/vs10/README.txt
deleted file mode 100644
index e91adbf..0000000
--- a/win32/vs10/README.txt
+++ /dev/null
@@ -1,104 +0,0 @@
-Please do not compile this package (gobject-introspection) in paths that contain
-spaces in them-as strange problems may occur during compilation or during
-the use of the library.
-
-Please refer to the following GNOME Live! page for more detailed
-instructions on building gobject-introsecption and its dependencies
-with Visual C++:
-
-https://live.gnome.org/GTK%2B/Win32/MSVCCompilationOfGTKStack
-
-This VS10 solution and the projects it includes are intented to be used
-in a gobject-introspection source tree unpacked from a tarball. In a git checkout you
-first need to use some Unix-like environment, which will do the work for you.
-
-The required dependencies are Python 2.7 (2.7) or 3.3 (3.x) or later, GLib and LibFFI.
-It is recommended that GLib is built with Visual C++ 2010 to avoid problems cause by
-usage of different CRTs.
-
-Please refer to the README.txt file in $(GLib_src_root)\build\win32\vs10 on how to build
-GLib using Visual C++ 2010
-
-For LibFFI, please use the Centricular fork of it, which can be found at
-https://github.com/centricular/libffi.  Please refer there on building--please
-note that this will involve the use of the Meson build system and possible the
-Ninja build tool, if the Visual Studio project generation is not used or is
-unavailable.
-
-For Python, retrieving the official Windows binaries for 2.7 (2.x) or 3.3 (3.x) or later
-from http://www.python.org will do the job-be sure that the Python version that
-you downloaded matches the configuration of your build (win32 or x64/amd64).  Ensure that
-the correct path for your Python interpretor is set in gi-extra-paths.vsprops prior to
-opening the project files, or close the project files and delete all the *.user, *.sdf and
-*.suo files and reopening the project files.
-
-For building the Regress test project, cairo (and possibly cairo-gobject support)
-is needed.
-
-Set up the source tree as follows under some arbitrary top
-folder <root>:
-
-<root>\<this-gobject-introspection-source-tree>
-<root>\vs10\<PlatformName>
-
-*this* file you are now reading is thus located at
-<root>\<this-glib-source-tree>\build\win32\vs10\README.
-
-<PlatformName> is either Win32 or x64, as in VS10 project files.
-
-For LibFFI, one should also put the generated ffi.h and ffitarget.h
-into <root>\vs10\<PlatformName>\include\ and the compiled static libffi.lib
-(or copy libffi-convenience.lib into libffi.lib) into
-<root>\vs10\<PlatformName>\lib\.
-
-The libintl.h that is used for building GLib needs to be in
-<root>\vs10\<PlatformName>\include, if not already done so.
-
-A working pkg-config tool is also required-it may be obtained from
-http://www.gtk.org/download/win32.php [32-bit]
-http://www.gtk.org/download/win64.php [64-bit]
-
-*** Note! ***
-The build of G-I is now done within the project files, although it is still possible to
-do it in two stages by using the NMake Makefiles after building the projects.
-
-As there are numerous possible configurations on Python and PKG_CONFIG_PATH, note that:
--For both methods PKG_CONFIG_PATH is by default $(PREFIX)\lib\pkgconfig, where $(PREFIX)
- is by default <parent_dir_of_G-I_srcroot>\vs10\<PlatformName>.  If searching from
- more directories is desired, set the PKG_CONFIG_PATH environment variable before using
- the NMake Makefile or opening the projects, but note that $(PREFIX)\lib\pkgconfig will
- precede the set paths.
--For the Python Path using the project files: check whether the directory settings in
- gi-version-paths.vsprops under PythonDir (32-bit) or PythonDirX64 (x64) is correct.
- If the projects have been loaded by Visual Studio, close the projects and re-open them.
- You may need to delete all the *.suo, *.user and *.ncb files in this directory for
- the changes to take effect.
--For the Python Path using the NMake Makefiles: pass in PYTHON=<full_path_to_python> to
- the NMake Makefile or set it in the environment.  The bit-ness of your Python installation
- must match the configuration that you are building for.
-
-The use of Visual Studio Projects will no longer require the setting of environmental
-variables, but the following environmental variables are needed (either by using "set xxx=yyy"
-or by nmake -f gi-introspection-msvc.mak xxx=yyy) for building the introspection files (which
-should be done after successfully building the Project Files):
-
-Please see $(srcroot)\build\win32\gi-introspection-msvc.mak for more details.  Doing
-"nmake -f gi-introspection-msvc.mak (options omitted)" will build the various introspection files,
-and "nmake -f gi-introspection-msvc.mak (options omitted) install-introspection" will copy the introspection
-files to <root>\vs10\<PlatformName>\share\gir-1.0 (.gir files) and <root>\vs10\<PlatformName>\lib\girepository-1.0
-(.typelib files)
-
-*** End of Note! ***
-
-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 gobject-introspection headers into
-<root>\vs10\<PlatformName>\include\gobject-introsection-1.0.
-
-This is then from where
-project files higher in the stack are supposed to look for them, not
-from a specific gobject-introspection source tree.
-
---Tor Lillqvist <tml@iki.fi>
---Updated by Chun-wei Fan <fanc999@gmail.com>
diff --git a/win32/vs10/_giscanner.vcxproj b/win32/vs10/_giscanner.vcxproj
deleted file mode 100644
index d8cb7f8..0000000
--- a/win32/vs10/_giscanner.vcxproj
+++ /dev/null
@@ -1,188 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{8311394F-9114-4C97-80F2-51BCABA054C9}</ProjectGuid>
-    <RootNamespace>_giscanner</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\giscanner;$(PythonDir)\include;$(PythonDir)\PC;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <ForcedIncludeFiles>%(ForcedIncludeFiles);io.h</ForcedIncludeFiles>
-      <PreprocessorDefinitions>_DEBUG;YY_NO_UNISTD_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(OutDir)$(ProjectName).pyd</OutputFile>
-      <AdditionalLibraryDirectories>$(PythonDir)\libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\..\giscanner;$(PythonDir)\include;$(PythonDir)\PC;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <ForcedIncludeFiles>%(ForcedIncludeFiles);io.h</ForcedIncludeFiles>
-      <PreprocessorDefinitions>YY_NO_UNISTD_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(OutDir)$(ProjectName).pyd</OutputFile>
-      <AdditionalLibraryDirectories>$(PythonDir)\libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\giscanner;$(PythonDirX64)\include;$(PythonDirX64)\PC;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <ForcedIncludeFiles>%(ForcedIncludeFiles);io.h</ForcedIncludeFiles>
-      <PreprocessorDefinitions>_DEBUG;YY_NO_UNISTD_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(OutDir)$(ProjectName).pyd</OutputFile>
-      <AdditionalLibraryDirectories>$(PythonDirX64)\libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\..\giscanner;$(PythonDirX64)\include;$(PythonDirX64)\PC;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <ForcedIncludeFiles>%(ForcedIncludeFiles);io.h</ForcedIncludeFiles>
-      <PreprocessorDefinitions>YY_NO_UNISTD_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(OutDir)$(ProjectName).pyd</OutputFile>
-      <AdditionalLibraryDirectories>$(PythonDirX64)\libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\giscanner\giscannermodule.c" />
-    <ClCompile Include="..\..\scannerlexer.c" />
-    <ClCompile Include="..\..\scannerparser.c" />
-    <ClCompile Include="..\..\giscanner\sourcescanner.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="gi-prebuild.vcxproj">
-      <Project>{2093d218-190e-4194-9421-3ba7cbf33b11}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/win32/vs10/_giscanner.vcxproj.filters b/win32/vs10/_giscanner.vcxproj.filters
deleted file mode 100644
index 1ddc9a2..0000000
--- a/win32/vs10/_giscanner.vcxproj.filters
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Sources">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Headers">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\giscanner\giscannermodule.c"><Filter>Sources</Filter></ClCompile>
-    <ClCompile Include="..\..\scannerlexer.c"><Filter>Sources</Filter></ClCompile>
-    <ClCompile Include="..\..\scannerparser.c"><Filter>Sources</Filter></ClCompile>
-    <ClCompile Include="..\..\giscanner\sourcescanner.c"><Filter>Sources</Filter></ClCompile>
-  </ItemGroup>
-</Project>
diff --git a/win32/vs10/cmph-bdz-test.vcxproj b/win32/vs10/cmph-bdz-test.vcxproj
deleted file mode 100644
index c465fa5..0000000
--- a/win32/vs10/cmph-bdz-test.vcxproj
+++ /dev/null
@@ -1,174 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{E41F378B-CCDD-4B1C-89C3-6D2C950FAF1A}</ProjectGuid>
-    <RootNamespace>cmphbdztest</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\girepository\cmph;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\..\girepository\cmph;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WholeProgramOptimization>false</WholeProgramOptimization>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\girepository\cmph;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\..\girepository\cmph;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\girepository\cmph-bdz-test.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="cmph.vcxproj">
-      <Project>{442c007e-d901-41da-9706-5db4afb4c06b}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/win32/vs10/cmph-bdz-test.vcxproj.filters b/win32/vs10/cmph-bdz-test.vcxproj.filters
deleted file mode 100644
index 2720d49..0000000
--- a/win32/vs10/cmph-bdz-test.vcxproj.filters
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Sources">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Headers">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\girepository\cmph-bdz-test.c">
-      <Filter>Sources</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
diff --git a/win32/vs10/cmph.vcxproj b/win32/vs10/cmph.vcxproj
deleted file mode 100644
index 7fc4797..0000000
--- a/win32/vs10/cmph.vcxproj
+++ /dev/null
@@ -1,163 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{442C007E-D901-41DA-9706-5DB4AFB4C06B}</ProjectGuid>
-    <RootNamespace>cmph</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-   <ClCompile Include="..\..\girepository\cmph\bdz.c" />
-   <ClCompile Include="..\..\girepository\cmph\bdz_ph.c" />
-   <ClCompile Include="..\..\girepository\cmph\bmz8.c" />
-   <ClCompile Include="..\..\girepository\cmph\bmz.c" />
-   <ClCompile Include="..\..\girepository\cmph\brz.c" />
-   <ClCompile Include="..\..\girepository\cmph\buffer_entry.c" />
-   <ClCompile Include="..\..\girepository\cmph\buffer_manager.c" />
-   <ClCompile Include="..\..\girepository\cmph\chd.c" />
-   <ClCompile Include="..\..\girepository\cmph\chd_ph.c" />
-   <ClCompile Include="..\..\girepository\cmph\chm.c" />
-   <ClCompile Include="..\..\girepository\cmph\cmph.c" />
-   <ClCompile Include="..\..\girepository\cmph\cmph_structs.c" />
-   <ClCompile Include="..\..\girepository\cmph\compressed_rank.c" />
-   <ClCompile Include="..\..\girepository\cmph\compressed_seq.c" />
-   <ClCompile Include="..\..\girepository\cmph\fch_buckets.c" />
-   <ClCompile Include="..\..\girepository\cmph\fch.c" />
-   <ClCompile Include="..\..\girepository\cmph\graph.c" />
-   <ClCompile Include="..\..\girepository\cmph\hash.c" />
-   <ClCompile Include="..\..\girepository\cmph\jenkins_hash.c" />
-   <ClCompile Include="..\..\girepository\cmph\miller_rabin.c" />
-   <ClCompile Include="..\..\girepository\cmph\select.c" />
-   <ClCompile Include="..\..\girepository\cmph\vqueue.c" />
-   <ClCompile Include="..\..\girepository\cmph\vstack.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="gi-prebuild.vcxproj">
-      <Project>{2093d218-190e-4194-9421-3ba7cbf33b11}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/win32/vs10/cmph.vcxproj.filters b/win32/vs10/cmph.vcxproj.filters
deleted file mode 100644
index df71f98..0000000
--- a/win32/vs10/cmph.vcxproj.filters
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Sources">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Headers">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-   <ClCompile Include="..\..\girepository\cmph\bdz.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\cmph\bdz_ph.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\cmph\bmz8.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\cmph\bmz.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\cmph\brz.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\cmph\buffer_entry.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\cmph\buffer_manager.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\cmph\chd.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\cmph\chd_ph.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\cmph\chm.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\cmph\cmph.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\cmph\cmph_structs.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\cmph\compressed_rank.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\cmph\compressed_seq.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\cmph\fch_buckets.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\cmph\fch.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\cmph\graph.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\cmph\hash.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\cmph\jenkins_hash.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\cmph\miller_rabin.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\cmph\select.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\cmph\vqueue.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\cmph\vstack.c"><Filter>Source Files</Filter></ClCompile>
-  </ItemGroup>
-</Project>
diff --git a/win32/vs10/cmph.vcxproj.filtersin b/win32/vs10/cmph.vcxproj.filtersin
deleted file mode 100644
index 072d32a..0000000
--- a/win32/vs10/cmph.vcxproj.filtersin
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Sources">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Headers">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-#include "cmph.vs10.sourcefiles.filters"
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/win32/vs10/cmph.vcxprojin b/win32/vs10/cmph.vcxprojin
deleted file mode 100644
index 98d06cc..0000000
--- a/win32/vs10/cmph.vcxprojin
+++ /dev/null
@@ -1,141 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{442C007E-D901-41DA-9706-5DB4AFB4C06B}</ProjectGuid>
-    <RootNamespace>cmph</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;__x86_64__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>__x86_64__;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-#include "cmph.vs10.sourcefiles"
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="gi-prebuild.vcxproj">
-      <Project>{2093d218-190e-4194-9421-3ba7cbf33b11}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/win32/vs10/g-ir-compiler.vcxproj b/win32/vs10/g-ir-compiler.vcxproj
deleted file mode 100644
index cacf713..0000000
--- a/win32/vs10/g-ir-compiler.vcxproj
+++ /dev/null
@@ -1,187 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774}</ProjectGuid>
-    <RootNamespace>gircompiler</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ffi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ffi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ffi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ffi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-   <ClCompile Include="..\..\girepository\gthash.c" />
-   <ClCompile Include="..\..\girepository\girmodule.c" />
-   <ClCompile Include="..\..\girepository\girnode.c" />
-   <ClCompile Include="..\..\girepository\giroffsets.c" />
-   <ClCompile Include="..\..\girepository\girparser.c" />
-   <ClCompile Include="..\..\girepository\girwriter.c" />
-    <ClCompile Include="..\..\tools\compiler.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="cmph.vcxproj">
-      <Project>{442c007e-d901-41da-9706-5db4afb4c06b}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="girepository.vcxproj">
-      <Project>{23e28245-8fc7-4b41-b1c5-8785bd4366a7}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/win32/vs10/g-ir-compiler.vcxproj.filters b/win32/vs10/g-ir-compiler.vcxproj.filters
deleted file mode 100644
index 7b5ec8d..0000000
--- a/win32/vs10/g-ir-compiler.vcxproj.filters
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Sources">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Headers">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-   <ClCompile Include="..\..\girepository\gthash.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\girmodule.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\girnode.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\giroffsets.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\girparser.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\girwriter.c"><Filter>Source Files</Filter></ClCompile>
-    <ClCompile Include="..\..\tools\compiler.c"><Filter>Sources</Filter></ClCompile>
-  </ItemGroup>
-</Project>
diff --git a/win32/vs10/g-ir-compiler.vcxproj.filtersin b/win32/vs10/g-ir-compiler.vcxproj.filtersin
deleted file mode 100644
index 6656d41..0000000
--- a/win32/vs10/g-ir-compiler.vcxproj.filtersin
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Sources">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Headers">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-#include "g-ir-compiler.vs10.sourcefiles.filters"
-    <ClCompile Include="..\..\tools\compiler.c"><Filter>Sources</Filter></ClCompile>
-  </ItemGroup>
-</Project>
diff --git a/win32/vs10/g-ir-compiler.vcxprojin b/win32/vs10/g-ir-compiler.vcxprojin
deleted file mode 100644
index b73575d..0000000
--- a/win32/vs10/g-ir-compiler.vcxprojin
+++ /dev/null
@@ -1,182 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774}</ProjectGuid>
-    <RootNamespace>gircompiler</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ffi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ffi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ffi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ffi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-#include "g-ir-compiler.vs10.sourcefiles"
-    <ClCompile Include="..\..\tools\compiler.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="cmph.vcxproj">
-      <Project>{442c007e-d901-41da-9706-5db4afb4c06b}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="girepository.vcxproj">
-      <Project>{23e28245-8fc7-4b41-b1c5-8785bd4366a7}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/win32/vs10/g-ir-generate.vcxproj b/win32/vs10/g-ir-generate.vcxproj
deleted file mode 100644
index f7ea403..0000000
--- a/win32/vs10/g-ir-generate.vcxproj
+++ /dev/null
@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{F4E6621F-A7DD-4863-8CCF-BA04DFC601E3}</ProjectGuid>
-    <RootNamespace>girgenerate</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\tools\generate.c" />
-    <ClCompile Include="..\..\girepository\girwriter.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="girepository.vcxproj">
-      <Project>{23e28245-8fc7-4b41-b1c5-8785bd4366a7}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/win32/vs10/g-ir-generate.vcxproj.filters b/win32/vs10/g-ir-generate.vcxproj.filters
deleted file mode 100644
index b3b32ef..0000000
--- a/win32/vs10/g-ir-generate.vcxproj.filters
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Sources">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Headers">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\tools\generate.c">
-      <Filter>Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\girepository\girwriter.c">
-      <Filter>Sources</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
diff --git a/win32/vs10/g-ir-inspect.vcxproj b/win32/vs10/g-ir-inspect.vcxproj
deleted file mode 100644
index 489a230..0000000
--- a/win32/vs10/g-ir-inspect.vcxproj
+++ /dev/null
@@ -1,169 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{F4E6621F-A7DD-4863-8CCF-CA04DFC601E3}</ProjectGuid>
-    <RootNamespace>girinspect</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\tools\g-ir-inspect.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="girepository.vcxproj">
-      <Project>{23e28245-8fc7-4b41-b1c5-8785bd4366a7}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/win32/vs10/g-ir-inspect.vcxproj.filters b/win32/vs10/g-ir-inspect.vcxproj.filters
deleted file mode 100644
index 371419a..0000000
--- a/win32/vs10/g-ir-inspect.vcxproj.filters
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Sources">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Headers">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\tools\g-ir-inspect.c"><Filter>Sources</Filter></ClCompile>
-  </ItemGroup>
-</Project>
diff --git a/win32/vs10/gi-build-defines.props b/win32/vs10/gi-build-defines.props
deleted file mode 100644
index 3a7f5fe..0000000
--- a/win32/vs10/gi-build-defines.props
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ImportGroup Label="PropertySheets">
-    <Import Project="gi-version-paths.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros">
-    <GIRepositoryBuildDefines>G_IREPOSITORY_COMPILATION;DLL_EXPORT</GIRepositoryBuildDefines>
-    <GIIntrospectNMakeCmd>cd ..
-set VCInstallDir=$(VCInstallDir)
-nmake -f gi-introspection-msvc.mak CFG=$(Configuration) PREFIX=$(GlibEtcInstallRoot)</GIIntrospectNMakeCmd>
-    <GIIntrospectBuiltFiles>$(SolutionDir)\..\GIRepository-2.0.typelib;$(SolutionDir)\..\cairo-1.0.typelib</GIIntrospectBuiltFiles>
-  </PropertyGroup>
-  <PropertyGroup>
-    <_PropertySheetDisplayName>gibuilddefinesprops</_PropertySheetDisplayName>
-    <OutDir>$(SolutionDir)$(Configuration)\$(PlatformName)\bin\</OutDir>
-    <IntDir>$(SolutionDir)$(Configuration)\$(PlatformName)\obj\$(ProjectName)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..;..\..\girepository;$(GlibEtcInstallRoot)\include\gio-win32-2.0;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>HAVE_CONFIG_H;WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ForcedIncludeFiles>msvc_recommended_pragmas.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <AdditionalOptions>/d2Zi+ %(AdditionalOptions)</AdditionalOptions>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>gio-2.0.lib;gobject-2.0.lib;gmodule-2.0.lib;gthread-2.0.lib;glib-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(GlibEtcInstallRoot)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalOptions Condition="'$(VisualStudioVersion)|$(Platform)'=='11.0|x64'">/HIGHENTROPYVA %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalOptions Condition="'$(VisualStudioVersion)|$(Platform)'=='12.0|x64'">/HIGHENTROPYVA %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalOptions Condition="'$(VisualStudioVersion)|$(Platform)'=='14.0|x64'">/HIGHENTROPYVA %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalOptions Condition="'$(VisualStudioVersion)|$(Platform)'=='15.0|x64'">/HIGHENTROPYVA %(AdditionalOptions)</AdditionalOptions>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <BuildMacro Include="GIRepositoryBuildDefines">
-      <Value>$(GIRepositoryBuildDefines)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GIIntrospectNMakeCmd">
-      <Value>$(GIIntrospectNMakeCmd)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GIIntrospectBuiltFiles">
-      <Value>$(GIIntrospectBuiltFiles)</Value>
-    </BuildMacro>
-  </ItemGroup>
-</Project>
diff --git a/win32/vs10/gi-gen-srcs.props b/win32/vs10/gi-gen-srcs.props
deleted file mode 100644
index 0a5d2c6..0000000
--- a/win32/vs10/gi-gen-srcs.props
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ImportGroup Label="PropertySheets">
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros">
-    <CopyConfigH>copy ..\..\config.h.win32 ..\..\config.h</CopyConfigH>
-    <GenToolsScripts>$(PythonDir)\python ..\gen-win32-g-ir-tools.py</GenToolsScripts>
-    <GenToolsScriptsX64>$(PythonDirX64)\python ..\gen-win32-g-ir-tools.py</GenToolsScriptsX64>
-  </PropertyGroup>
-  <PropertyGroup>
-    <_PropertySheetDisplayName>gigensrcsprops</_PropertySheetDisplayName>
-  </PropertyGroup>
-  <ItemGroup>
-    <BuildMacro Include="CopyConfigH">
-      <Value>$(CopyConfigH)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GenToolsScripts">
-      <Value>$(GenToolsScripts)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GenToolsScriptsX64">
-      <Value>$(GenToolsScriptsX64)</Value>
-    </BuildMacro>
-  </ItemGroup>
-</Project>
diff --git a/win32/vs10/gi-install.props b/win32/vs10/gi-install.props
deleted file mode 100644
index 7643cbd..0000000
--- a/win32/vs10/gi-install.props
+++ /dev/null
@@ -1,202 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ImportGroup Label="PropertySheets">
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros">
-    <BinDir>$(SolutionDir)$(Configuration)\$(Platform)\bin</BinDir>
-    <GIDoInstall>
-mkdir $(CopyDir)
-mkdir $(CopyDir)\bin
-copy $(BinDir)\$(LibGIDllPrefix)girepository$(LibGIDllSuffix).dll $(CopyDir)\bin
-copy $(BinDir)\$(LibGIDllPrefix)girepository$(LibGIDllSuffix).pdb $(CopyDir)\bin
-copy $(BinDir)\g-ir-compiler.exe $(CopyDir)\bin
-copy $(BinDir)\g-ir-compiler.pdb $(CopyDir)\bin
-copy $(BinDir)\g-ir-generate.exe $(CopyDir)\bin
-copy $(BinDir)\g-ir-generate.pdb $(CopyDir)\bin
-copy $(BinDir)\g-ir-inspect.exe $(CopyDir)\bin
-copy $(BinDir)\g-ir-inspect.pdb $(CopyDir)\bin
-copy ..\..\tools\g-ir-annotation-tool $(CopyDir)\bin
-copy ..\..\tools\g-ir-doc-tool $(CopyDir)\bin
-copy ..\..\tools\g-ir-scanner $(CopyDir)\bin
-copy $(BinDir)\glib-print.exe $(CopyDir)\bin
-copy $(BinDir)\glib-print.pdb $(CopyDir)\bin
-mkdir $(CopyDir)\include\gobject-introspection-1.0\girepository
-copy ..\..\girepository\giarginfo.h $(CopyDir)\include\gobject-introspection-1.0\girepository\giarginfo.h
-copy ..\..\girepository\gibaseinfo.h $(CopyDir)\include\gobject-introspection-1.0\girepository\gibaseinfo.h
-copy ..\..\girepository\gicallableinfo.h $(CopyDir)\include\gobject-introspection-1.0\girepository\gicallableinfo.h
-copy ..\..\girepository\giconstantinfo.h $(CopyDir)\include\gobject-introspection-1.0\girepository\giconstantinfo.h
-copy ..\..\girepository\gienuminfo.h $(CopyDir)\include\gobject-introspection-1.0\girepository\gienuminfo.h
-copy ..\..\girepository\gifieldinfo.h $(CopyDir)\include\gobject-introspection-1.0\girepository\gifieldinfo.h
-copy ..\..\girepository\gifunctioninfo.h $(CopyDir)\include\gobject-introspection-1.0\girepository\gifunctioninfo.h
-copy ..\..\girepository\giinterfaceinfo.h $(CopyDir)\include\gobject-introspection-1.0\girepository\giinterfaceinfo.h
-copy ..\..\girepository\giobjectinfo.h $(CopyDir)\include\gobject-introspection-1.0\girepository\giobjectinfo.h
-copy ..\..\girepository\gipropertyinfo.h $(CopyDir)\include\gobject-introspection-1.0\girepository\gipropertyinfo.h
-copy ..\..\girepository\giregisteredtypeinfo.h $(CopyDir)\include\gobject-introspection-1.0\girepository\giregisteredtypeinfo.h
-copy ..\..\girepository\girepository.h $(CopyDir)\include\gobject-introspection-1.0\girepository\girepository.h
-copy ..\..\girepository\girffi.h $(CopyDir)\include\gobject-introspection-1.0\girepository\girffi.h
-copy ..\..\girepository\gisignalinfo.h $(CopyDir)\include\gobject-introspection-1.0\girepository\gisignalinfo.h
-copy ..\..\girepository\gistructinfo.h $(CopyDir)\include\gobject-introspection-1.0\girepository\gistructinfo.h
-copy ..\..\girepository\gitypeinfo.h $(CopyDir)\include\gobject-introspection-1.0\girepository\gitypeinfo.h
-copy ..\..\girepository\gitypelib.h $(CopyDir)\include\gobject-introspection-1.0\girepository\gitypelib.h
-copy ..\..\girepository\gitypes.h $(CopyDir)\include\gobject-introspection-1.0\girepository\gitypes.h
-copy ..\..\girepository\giunioninfo.h $(CopyDir)\include\gobject-introspection-1.0\girepository\giunioninfo.h
-copy ..\..\girepository\giversionmacros.h $(CopyDir)\include\gobject-introspection-1.0\girepository\giversionmacros.h
-copy ..\..\girepository\givfuncinfo.h $(CopyDir)\include\gobject-introspection-1.0\girepository\givfuncinfo.h
-mkdir $(CopyDir)\lib\gobject-introspection\giscanner
-mkdir $(CopyDir)\lib\gobject-introspection\giscanner\collections
-mkdir $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates
-mkdir $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C
-mkdir $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs
-mkdir $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python
-copy ..\..\giscanner\__init__.py $(CopyDir)\lib\gobject-introspection\giscanner
-copy ..\..\giscanner\annotationmain.py $(CopyDir)\lib\gobject-introspection\giscanner
-copy ..\..\giscanner\annotationparser.py $(CopyDir)\lib\gobject-introspection\giscanner
-copy ..\..\giscanner\ast.py $(CopyDir)\lib\gobject-introspection\giscanner
-copy ..\..\giscanner\cachestore.py $(CopyDir)\lib\gobject-introspection\giscanner
-copy ..\..\giscanner\ccompiler.py $(CopyDir)\lib\gobject-introspection\giscanner
-copy ..\..\giscanner\codegen.py $(CopyDir)\lib\gobject-introspection\giscanner
-copy ..\..\giscanner\docmain.py $(CopyDir)\lib\gobject-introspection\giscanner
-copy ..\..\giscanner\docwriter.py $(CopyDir)\lib\gobject-introspection\giscanner
-copy ..\..\giscanner\dumper.py $(CopyDir)\lib\gobject-introspection\giscanner
-copy ..\..\giscanner\introspectablepass.py $(CopyDir)\lib\gobject-introspection\giscanner
-copy ..\..\giscanner\girparser.py $(CopyDir)\lib\gobject-introspection\giscanner
-copy ..\..\giscanner\girwriter.py $(CopyDir)\lib\gobject-introspection\giscanner
-copy ..\..\giscanner\gdumpparser.py $(CopyDir)\lib\gobject-introspection\giscanner
-copy ..\..\giscanner\libtoolimporter.py $(CopyDir)\lib\gobject-introspection\giscanner
-copy ..\..\giscanner\maintransformer.py $(CopyDir)\lib\gobject-introspection\giscanner
-copy ..\..\giscanner\message.py $(CopyDir)\lib\gobject-introspection\giscanner
-copy ..\..\giscanner\msvccompiler.py $(CopyDir)\lib\gobject-introspection\giscanner
-copy ..\..\giscanner\shlibs.py $(CopyDir)\lib\gobject-introspection\giscanner
-copy ..\..\giscanner\scannermain.py $(CopyDir)\lib\gobject-introspection\giscanner
-copy ..\..\giscanner\sectionparser.py $(CopyDir)\lib\gobject-introspection\giscanner
-copy ..\..\giscanner\sourcescanner.py $(CopyDir)\lib\gobject-introspection\giscanner
-copy ..\..\giscanner\testcodegen.py $(CopyDir)\lib\gobject-introspection\giscanner
-copy ..\..\giscanner\transformer.py $(CopyDir)\lib\gobject-introspection\giscanner
-copy ..\..\giscanner\utils.py $(CopyDir)\lib\gobject-introspection\giscanner
-copy ..\..\giscanner\xmlwriter.py $(CopyDir)\lib\gobject-introspection\giscanner
-copy ..\..\giscanner\collections\__init__.py $(CopyDir)\lib\gobject-introspection\giscanner\collections
-copy ..\..\giscanner\collections\counter.py $(CopyDir)\lib\gobject-introspection\giscanner\collections
-copy ..\..\giscanner\collections\ordereddict.py $(CopyDir)\lib\gobject-introspection\giscanner\collections
-copy ..\..\giscanner\doctemplates\base.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates
-copy ..\..\giscanner\doctemplates\class.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates
-copy ..\..\giscanner\doctemplates\namespace.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates
-copy ..\..\giscanner\doctemplates\C\callback.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C
-copy ..\..\giscanner\doctemplates\C\class.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C
-copy ..\..\giscanner\doctemplates\C\constructor.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C
-copy ..\..\giscanner\doctemplates\C\default.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C
-copy ..\..\giscanner\doctemplates\C\enum.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C
-copy ..\..\giscanner\doctemplates\C\function.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C
-copy ..\..\giscanner\doctemplates\C\field.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C
-copy ..\..\giscanner\doctemplates\C\interface.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C
-copy ..\..\giscanner\doctemplates\C\method.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C
-copy ..\..\giscanner\doctemplates\C\namespace.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C
-copy ..\..\giscanner\doctemplates\C\property.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C
-copy ..\..\giscanner\doctemplates\C\record.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C
-copy ..\..\giscanner\doctemplates\C\signal.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C
-copy ..\..\giscanner\doctemplates\C\vfunc.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C
-copy ..\..\giscanner\doctemplates\Python\callback.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python
-copy ..\..\giscanner\doctemplates\Python\class.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python
-copy ..\..\giscanner\doctemplates\Python\constructor.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python
-copy ..\..\giscanner\doctemplates\Python\default.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python
-copy ..\..\giscanner\doctemplates\Python\enum.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python
-copy ..\..\giscanner\doctemplates\Python\function.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python
-copy ..\..\giscanner\doctemplates\Python\field.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python
-copy ..\..\giscanner\doctemplates\Python\interface.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python
-copy ..\..\giscanner\doctemplates\Python\method.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python
-copy ..\..\giscanner\doctemplates\Python\namespace.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python
-copy ..\..\giscanner\doctemplates\Python\property.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python
-copy ..\..\giscanner\doctemplates\Python\record.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python
-copy ..\..\giscanner\doctemplates\Python\signal.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python
-copy ..\..\giscanner\doctemplates\Python\vfunc.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python
-copy ..\..\giscanner\doctemplates\Gjs\callback.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs
-copy ..\..\giscanner\doctemplates\Gjs\class.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs
-copy ..\..\giscanner\doctemplates\Gjs\constructor.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs
-copy ..\..\giscanner\doctemplates\Gjs\default.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs
-copy ..\..\giscanner\doctemplates\Gjs\enum.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs
-copy ..\..\giscanner\doctemplates\Gjs\function.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs
-copy ..\..\giscanner\doctemplates\Gjs\field.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs
-copy ..\..\giscanner\doctemplates\Gjs\interface.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs
-copy ..\..\giscanner\doctemplates\Gjs\method.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs
-copy ..\..\giscanner\doctemplates\Gjs\namespace.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs
-copy ..\..\giscanner\doctemplates\Gjs\property.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs
-copy ..\..\giscanner\doctemplates\Gjs\record.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs
-copy ..\..\giscanner\doctemplates\Gjs\signal.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs
-copy ..\..\giscanner\doctemplates\Gjs\vfunc.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs
-mkdir $(CopyDir)\share\gobject-introspection-1.0\tests
-copy ..\..\tests\gitestmacros.h $(CopyDir)\share\gobject-introspection-1.0\tests
-copy ..\..\tests\gimarshallingtests.c $(CopyDir)\share\gobject-introspection-1.0\tests
-copy ..\..\tests\gimarshallingtests.h $(CopyDir)\share\gobject-introspection-1.0\tests
-copy ..\..\tests\scanner\regress.c $(CopyDir)\share\gobject-introspection-1.0\tests
-copy ..\..\tests\scanner\regress.h $(CopyDir)\share\gobject-introspection-1.0\tests
-copy ..\..\tests\scanner\annotation.c $(CopyDir)\share\gobject-introspection-1.0\tests
-copy ..\..\tests\scanner\annotation.h $(CopyDir)\share\gobject-introspection-1.0\tests
-copy ..\..\tests\scanner\foo.c $(CopyDir)\share\gobject-introspection-1.0\tests
-copy ..\..\tests\scanner\foo.h $(CopyDir)\share\gobject-introspection-1.0\tests
-copy ..\..\tests\scanner\drawable.c $(CopyDir)\share\gobject-introspection-1.0\tests
-copy ..\..\tests\scanner\drawable.h $(CopyDir)\share\gobject-introspection-1.0\tests
-copy ..\..\tests\scanner\warnlib.c $(CopyDir)\share\gobject-introspection-1.0\tests
-copy ..\..\tests\scanner\warnlib.h $(CopyDir)\share\gobject-introspection-1.0\tests
-copy ..\..\tests\scanner\utility.c $(CopyDir)\share\gobject-introspection-1.0\tests
-copy ..\..\tests\scanner\utility.h $(CopyDir)\share\gobject-introspection-1.0\tests
-copy ..\everything.c $(CopyDir)\share\gobject-introspection-1.0\tests
-copy ..\everything.h $(CopyDir)\share\gobject-introspection-1.0\tests
-copy $(BinDir)\_giscanner.pyd $(CopyDir)\lib\gobject-introspection\giscanner
-copy $(BinDir)\_giscanner.pdb $(CopyDir)\lib\gobject-introspection\giscanner
-mkdir $(CopyDir)\share\gobject-introspection-$(ApiVersion)
-copy ..\..\girepository\gdump.c $(CopyDir)\share\gobject-introspection-$(ApiVersion)
-mkdir $(CopyDir)\lib
-copy $(BinDir)\girepository-$(ApiVersion).lib $(CopyDir)\lib
-mkdir $(CopyDir)\share\gir-$(ApiVersion)
-copy ..\cairo-1.0.gir $(CopyDir)\share\gir-$(ApiVersion)
-copy ..\fontconfig-2.0.gir $(CopyDir)\share\gir-$(ApiVersion)
-copy ..\freetype2-2.0.gir $(CopyDir)\share\gir-$(ApiVersion)
-copy ..\Gio-2.0.gir $(CopyDir)\share\gir-$(ApiVersion)
-copy ..\GIRepository-2.0.gir $(CopyDir)\share\gir-$(ApiVersion)
-copy ..\GL-1.0.gir $(CopyDir)\share\gir-$(ApiVersion)
-copy ..\GLib-2.0.gir $(CopyDir)\share\gir-$(ApiVersion)
-copy ..\GModule-2.0.gir $(CopyDir)\share\gir-$(ApiVersion)
-copy ..\GObject-2.0.gir $(CopyDir)\share\gir-$(ApiVersion)
-copy ..\libxml2-2.0.gir $(CopyDir)\share\gir-$(ApiVersion)
-copy ..\win32-1.0.gir $(CopyDir)\share\gir-$(ApiVersion)
-mkdir $(CopyDir)\lib\girepository-$(ApiVersion)
-copy ..\cairo-1.0.typelib $(CopyDir)\lib\girepository-$(ApiVersion)
-copy ..\fontconfig-2.0.typelib $(CopyDir)\lib\girepository-$(ApiVersion)
-copy ..\freetype2-2.0.typelib $(CopyDir)\lib\girepository-$(ApiVersion)
-copy ..\Gio-2.0.typelib $(CopyDir)\lib\girepository-$(ApiVersion)
-copy ..\GIRepository-2.0.typelib $(CopyDir)\lib\girepository-$(ApiVersion)
-copy ..\GL-1.0.typelib $(CopyDir)\lib\girepository-$(ApiVersion)
-copy ..\GLib-2.0.typelib $(CopyDir)\lib\girepository-$(ApiVersion)
-copy ..\GModule-2.0.typelib $(CopyDir)\lib\girepository-$(ApiVersion)
-copy ..\GObject-2.0.typelib $(CopyDir)\lib\girepository-$(ApiVersion)
-copy ..\libxml2-2.0.typelib $(CopyDir)\lib\girepository-$(ApiVersion)
-copy ..\win32-1.0.typelib $(CopyDir)\lib\girepository-$(ApiVersion)
-mkdir $(CopyDir)\lib\pkgconfig
-copy ..\gobject-introspection-1.0.pc $(CopyDir)\lib\pkgconfig
-copy ..\gobject-introspection-no-export-1.0.pc $(CopyDir)\lib\pkgconfig
-    </GIDoInstall>
-    <GIPCFiles>..\gobject-introspection-1.0.pc;..\gobject-introspection-no-export-1.0.pc</GIPCFiles>
-    <GIGenPC>$(PythonDir)\python.exe ..\gipc.py --version=$(GIVersion) --prefix=$(CopyDir)</GIGenPC>
-    <GIGenPCX64>$(PythonDirX64)\python.exe ..\gipc.py --version=$(GIVersion) --prefix=$(CopyDir)</GIGenPCX64>
-  </PropertyGroup>
-  <PropertyGroup>
-    <_PropertySheetDisplayName>giinstallprops</_PropertySheetDisplayName>
-  </PropertyGroup>
-  <ItemGroup>
-    <BuildMacro Include="BinDir">
-      <Value>$(BinDir)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GIDoInstall">
-      <Value>$(GIDoInstall)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GIPCFiles">
-      <Value>$(GIPCFiles)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GIGenPC">
-      <Value>$(GIGenPC)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GIGenPCX64">
-      <Value>$(GIGenPCX64)</Value>
-    </BuildMacro>
-  </ItemGroup>
-</Project>
diff --git a/win32/vs10/gi-install.propsin b/win32/vs10/gi-install.propsin
deleted file mode 100644
index ab991ae..0000000
--- a/win32/vs10/gi-install.propsin
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ImportGroup Label="PropertySheets">
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros">
-    <BinDir>$(SolutionDir)$(Configuration)\$(Platform)\bin</BinDir>
-    <GIDoInstall>
-mkdir $(CopyDir)
-mkdir $(CopyDir)\bin
-
-copy $(BinDir)\$(LibGIDllPrefix)girepository$(LibGIDllSuffix).dll $(CopyDir)\bin
-copy $(BinDir)\$(LibGIDllPrefix)girepository$(LibGIDllSuffix).pdb $(CopyDir)\bin
-copy $(BinDir)\g-ir-compiler.exe $(CopyDir)\bin
-copy $(BinDir)\g-ir-compiler.pdb $(CopyDir)\bin
-copy $(BinDir)\g-ir-generate.exe $(CopyDir)\bin
-copy $(BinDir)\g-ir-generate.pdb $(CopyDir)\bin
-copy $(BinDir)\g-ir-inspect.exe $(CopyDir)\bin
-copy $(BinDir)\g-ir-inspect.pdb $(CopyDir)\bin
-copy ..\..\tools\g-ir-annotation-tool $(CopyDir)\bin
-copy ..\..\tools\g-ir-doc-tool $(CopyDir)\bin
-copy ..\..\tools\g-ir-scanner $(CopyDir)\bin
-
-copy $(BinDir)\glib-print.exe $(CopyDir)\bin
-copy $(BinDir)\glib-print.pdb $(CopyDir)\bin
-
-mkdir $(CopyDir)\include\gobject-introspection-1.0\girepository
-#include "girepository.vs10.headers"
-#include "giscanner.vs10.scripts"
-
-mkdir $(CopyDir)\share\gobject-introspection-1.0\tests
-copy ..\..\tests\gitestmacros.h $(CopyDir)\share\gobject-introspection-1.0\tests
-copy ..\..\tests\gimarshallingtests.c $(CopyDir)\share\gobject-introspection-1.0\tests
-copy ..\..\tests\gimarshallingtests.h $(CopyDir)\share\gobject-introspection-1.0\tests
-copy ..\..\tests\scanner\regress.c $(CopyDir)\share\gobject-introspection-1.0\tests
-copy ..\..\tests\scanner\regress.h $(CopyDir)\share\gobject-introspection-1.0\tests
-copy ..\..\tests\scanner\annotation.c $(CopyDir)\share\gobject-introspection-1.0\tests
-copy ..\..\tests\scanner\annotation.h $(CopyDir)\share\gobject-introspection-1.0\tests
-copy ..\..\tests\scanner\foo.c $(CopyDir)\share\gobject-introspection-1.0\tests
-copy ..\..\tests\scanner\foo.h $(CopyDir)\share\gobject-introspection-1.0\tests
-copy ..\..\tests\scanner\drawable.c $(CopyDir)\share\gobject-introspection-1.0\tests
-copy ..\..\tests\scanner\drawable.h $(CopyDir)\share\gobject-introspection-1.0\tests
-copy ..\..\tests\scanner\warnlib.c $(CopyDir)\share\gobject-introspection-1.0\tests
-copy ..\..\tests\scanner\warnlib.h $(CopyDir)\share\gobject-introspection-1.0\tests
-copy ..\..\tests\scanner\utility.c $(CopyDir)\share\gobject-introspection-1.0\tests
-copy ..\..\tests\scanner\utility.h $(CopyDir)\share\gobject-introspection-1.0\tests
-copy ..\everything.c $(CopyDir)\share\gobject-introspection-1.0\tests
-copy ..\everything.h $(CopyDir)\share\gobject-introspection-1.0\tests
-
-copy $(BinDir)\_giscanner.pyd $(CopyDir)\lib\gobject-introspection\giscanner
-copy $(BinDir)\_giscanner.pdb $(CopyDir)\lib\gobject-introspection\giscanner
-
-mkdir $(CopyDir)\share\gobject-introspection-$(ApiVersion)
-
-copy ..\..\girepository\gdump.c $(CopyDir)\share\gobject-introspection-$(ApiVersion)
-
-mkdir $(CopyDir)\lib
-
-copy $(BinDir)\girepository-$(ApiVersion).lib $(CopyDir)\lib
-
-mkdir $(CopyDir)\share\gir-$(ApiVersion)
-copy ..\cairo-1.0.gir $(CopyDir)\share\gir-$(ApiVersion)
-copy ..\fontconfig-2.0.gir $(CopyDir)\share\gir-$(ApiVersion)
-copy ..\freetype2-2.0.gir $(CopyDir)\share\gir-$(ApiVersion)
-copy ..\Gio-2.0.gir $(CopyDir)\share\gir-$(ApiVersion)
-copy ..\GIRepository-2.0.gir $(CopyDir)\share\gir-$(ApiVersion)
-copy ..\GL-1.0.gir $(CopyDir)\share\gir-$(ApiVersion)
-copy ..\GLib-2.0.gir $(CopyDir)\share\gir-$(ApiVersion)
-copy ..\GModule-2.0.gir $(CopyDir)\share\gir-$(ApiVersion)
-copy ..\GObject-2.0.gir $(CopyDir)\share\gir-$(ApiVersion)
-copy ..\libxml2-2.0.gir $(CopyDir)\share\gir-$(ApiVersion)
-copy ..\win32-1.0.gir $(CopyDir)\share\gir-$(ApiVersion)
-
-mkdir $(CopyDir)\lib\girepository-$(ApiVersion)
-copy ..\cairo-1.0.typelib $(CopyDir)\lib\girepository-$(ApiVersion)
-copy ..\fontconfig-2.0.typelib $(CopyDir)\lib\girepository-$(ApiVersion)
-copy ..\freetype2-2.0.typelib $(CopyDir)\lib\girepository-$(ApiVersion)
-copy ..\Gio-2.0.typelib $(CopyDir)\lib\girepository-$(ApiVersion)
-copy ..\GIRepository-2.0.typelib $(CopyDir)\lib\girepository-$(ApiVersion)
-copy ..\GL-1.0.typelib $(CopyDir)\lib\girepository-$(ApiVersion)
-copy ..\GLib-2.0.typelib $(CopyDir)\lib\girepository-$(ApiVersion)
-copy ..\GModule-2.0.typelib $(CopyDir)\lib\girepository-$(ApiVersion)
-copy ..\GObject-2.0.typelib $(CopyDir)\lib\girepository-$(ApiVersion)
-copy ..\libxml2-2.0.typelib $(CopyDir)\lib\girepository-$(ApiVersion)
-copy ..\win32-1.0.typelib $(CopyDir)\lib\girepository-$(ApiVersion)
-
-mkdir $(CopyDir)\lib\pkgconfig
-copy ..\gobject-introspection-1.0.pc $(CopyDir)\lib\pkgconfig
-copy ..\gobject-introspection-no-export-1.0.pc $(CopyDir)\lib\pkgconfig
-    </GIDoInstall>
-    <GIPCFiles>..\gobject-introspection-1.0.pc;..\gobject-introspection-no-export-1.0.pc</GIPCFiles>
-    <GIGenPC>$(PythonDir)\python.exe ..\gipc.py --version=$(GIVersion) --prefix=$(CopyDir)</GIGenPC>
-    <GIGenPCX64>$(PythonDirX64)\python.exe ..\gipc.py --version=$(GIVersion) --prefix=$(CopyDir)</GIGenPCX64>
-  </PropertyGroup>
-  <PropertyGroup>
-    <_PropertySheetDisplayName>giinstallprops</_PropertySheetDisplayName>
-  </PropertyGroup>
-  <ItemGroup>
-    <BuildMacro Include="BinDir">
-      <Value>$(BinDir)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GIDoInstall">
-      <Value>$(GIDoInstall)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GIPCFiles">
-      <Value>$(GIPCFiles)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GIGenPC">
-      <Value>$(GIGenPC)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GIGenPCX64">
-      <Value>$(GIGenPCX64)</Value>
-    </BuildMacro>
-  </ItemGroup>
-</Project>
diff --git a/win32/vs10/gi-install.vcxproj b/win32/vs10/gi-install.vcxproj
deleted file mode 100644
index e9038fc..0000000
--- a/win32/vs10/gi-install.vcxproj
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{2093D218-190E-4194-9421-3BA7CBF33B10}</ProjectGuid>
-    <RootNamespace>install</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Utility</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Utility</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Utility</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Utility</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-install.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-install.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-install.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-install.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <OutDir Condition="'$(Configuration)'=='Debug'">$(GlibEtcInstallRoot)\</OutDir>
-    <ExtensionsToDeleteOnClean Condition="'$(Configuration)'=='Debug'" />
-    <OutDir Condition="'$(Configuration)'=='Release'">$(GlibEtcInstallRoot)\</OutDir>
-    <ExtensionsToDeleteOnClean Condition="'$(Configuration)'=='Release'" />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <CustomBuild Include="..\..\config.h.win32">
-      <Message Condition="'$(Configuration)'=='Debug'">Installing Build Results...</Message>
-      <AdditionalInputs Condition="'$(Configuration)'=='Debug'">$(GIPCFiles)</AdditionalInputs>
-      <Command Condition="'$(Configuration)'=='Debug'">$(GIDoInstall)</Command>
-      <Outputs Condition="'$(Configuration)'=='Debug'">some_random_file;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)'=='Release'">Installing Build Results...</Message>
-      <AdditionalInputs Condition="'$(Configuration)'=='Release'">$(GIPCFiles)</AdditionalInputs>
-      <Command Condition="'$(Configuration)'=='Release'">$(GIDoInstall)</Command>
-      <Outputs Condition="'$(Configuration)'=='Release'">some_random_file;%(Outputs)</Outputs>
-    </CustomBuild>
-    <CustomBuild Include="..\gipc.py">
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating .pc files...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GIGenPC)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GIPCFiles);%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Generating .pc files...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GIGenPCX64)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GIPCFiles);%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Generating .pc files...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GIGenPC)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GIPCFiles);%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Generating .pc files...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GIGenPCX64)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GIPCFiles);%(Outputs)</Outputs>
-    </CustomBuild>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="g-ir-inspect.vcxproj">
-      <Project>{f4e6621f-a7dd-4863-8ccf-ca04dfc601e3}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="g-ir-compiler.vcxproj">
-      <Project>{5dcb55ce-f32c-4c77-8bf4-b4dad3ec7774}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="g-ir-generate.vcxproj">
-      <Project>{f4e6621f-a7dd-4863-8ccf-ba04dfc601e3}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="girepository.vcxproj">
-      <Project>{23e28245-8fc7-4b41-b1c5-8785bd4366a7}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="_giscanner.vcxproj">
-      <Project>{8311394f-9114-4c97-80f2-51bcaba054c9}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="gi-introspect.vcxproj">
-      <Project>{7a36674c-379d-4989-a978-07124e5f852c}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/win32/vs10/gi-install.vcxproj.filters b/win32/vs10/gi-install.vcxproj.filters
deleted file mode 100644
index 590ad10..0000000
--- a/win32/vs10/gi-install.vcxproj.filters
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <CustomBuild Include="..\..\config.h.win32"><Filter>Resource Files</Filter></CustomBuild>
-    <CustomBuild Include="..\gipc.py"><Filter>Resource Files</Filter></CustomBuild>
-  </ItemGroup>
-</Project>
diff --git a/win32/vs10/gi-introspect.vcxproj b/win32/vs10/gi-introspect.vcxproj
deleted file mode 100644
index b634495..0000000
--- a/win32/vs10/gi-introspect.vcxproj
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{7A36674C-379D-4989-A978-07124E5F852C}</ProjectGuid>
-    <RootNamespace>giintrospect</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <NMakeBuildCommandLine>$(GIIntrospectNMakeCmd) $(IntrospectPythonParam)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>$(GIIntrospectNMakeCmd) $(IntrospectPythonParam) clean all</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>$(GIIntrospectNMakeCmd) $(IntrospectPythonParam) clean</NMakeCleanCommandLine>
-    <NMakeOutput>$(GIIntrospectBuiltFiles)</NMakeOutput>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <NMakeBuildCommandLine>$(GIIntrospectNMakeCmd) $(IntrospectPythonParam)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>$(GIIntrospectNMakeCmd) $(IntrospectPythonParam) clean all</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>$(GIIntrospectNMakeCmd) $(IntrospectPythonParam) clean</NMakeCleanCommandLine>
-    <NMakeOutput>$(GIIntrospectBuiltFiles)</NMakeOutput>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <NMakeBuildCommandLine>$(GIIntrospectNMakeCmd) $(IntrospectPythonParamX64)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>$(GIIntrospectNMakeCmd) $(IntrospectPythonParamX64) clean all</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>$(GIIntrospectNMakeCmd) $(IntrospectPythonParamX64) clean</NMakeCleanCommandLine>
-    <NMakeOutput>$(GIIntrospectBuiltFiles)</NMakeOutput>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <NMakeBuildCommandLine>$(GIIntrospectNMakeCmd) $(IntrospectPythonParamX64)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>$(GIIntrospectNMakeCmd) $(IntrospectPythonParamX64) clean all</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>$(GIIntrospectNMakeCmd) $(IntrospectPythonParamX64) clean</NMakeCleanCommandLine>
-    <NMakeOutput>$(GIIntrospectBuiltFiles)</NMakeOutput>
-  </PropertyGroup>
-  <ItemGroup>
-    <ProjectReference Include="g-ir-compiler.vcxproj">
-      <Project>{5dcb55ce-f32c-4c77-8bf4-b4dad3ec7774}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="g-ir-generate.vcxproj">
-      <Project>{f4e6621f-a7dd-4863-8ccf-ba04dfc601e3}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="girepository.vcxproj">
-      <Project>{23e28245-8fc7-4b41-b1c5-8785bd4366a7}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="_giscanner.vcxproj">
-      <Project>{8311394f-9114-4c97-80f2-51bcaba054c9}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/win32/vs10/gi-prebuild.vcxproj b/win32/vs10/gi-prebuild.vcxproj
deleted file mode 100644
index 88cea9a..0000000
--- a/win32/vs10/gi-prebuild.vcxproj
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{2093D218-190E-4194-9421-3BA7CBF33B11}</ProjectGuid>
-    <RootNamespace>giprebuild</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Utility</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Utility</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Utility</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Utility</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-gen-srcs.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-gen-srcs.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-gen-srcs.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-gen-srcs.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <ExtensionsToDeleteOnClean Condition="'$(Configuration)'=='Debug'" />
-    <ExtensionsToDeleteOnClean Condition="'$(Configuration)'=='Release'" />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <CustomBuild Include="..\..\config.h.win32">
-      <Message Condition="'$(Configuration)'=='Debug'">Copying config.h from config.h.win32...</Message>
-      <Command Condition="'$(Configuration)'=='Debug'">$(CopyConfigH)</Command>
-      <Outputs Condition="'$(Configuration)'=='Debug'">..\..\config.h;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)'=='Release'">Copying config.h from config.h.win32...</Message>
-      <Command Condition="'$(Configuration)'=='Release'">$(CopyConfigH)</Command>
-      <Outputs Condition="'$(Configuration)'=='Release'">..\..\config.h;%(Outputs)</Outputs>
-    </CustomBuild>
-    <CustomBuild Include="..\..\tools\g-ir-tool-template.in">
-      <Message Condition="'$(Configuration)'=='Debug'">Generating Tools Scripts...</Message>
-      <Command Condition="'$(Configuration)'=='Debug'">$(GenToolsScripts)</Command>
-      <Message Condition="'$(Configuration)'=='Release'">Generating Tools Scripts...</Message>
-      <Command Condition="'$(Configuration)'=='Release'">$(GenToolsScripts)</Command>
-      <Outputs Condition="'$(Configuration)'=='Release'">..\..\tools\g-ir-scanner;..\..\tools\g-ir-doc-tool;..\..\tools\g-ir-annotation-tool;%(Outputs)</Outputs>
-    </CustomBuild>
-  </ItemGroup>
-  <ItemGroup>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/win32/vs10/gi-version-paths.props b/win32/vs10/gi-version-paths.props
deleted file mode 100644
index 6be5df9..0000000
--- a/win32/vs10/gi-version-paths.props
+++ /dev/null
@@ -1,81 +0,0 @@
-<?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>
-    <GlibEtcInstallRoot>$(SolutionDir)\..\..\..\vs$(VSVer)\$(Platform)</GlibEtcInstallRoot>
-    <CopyDir>$(GlibEtcInstallRoot)</CopyDir>
-    <!-- PythonDir needs to point to a 32-bit/x86 Python 2.7/3.3+ installation -->
-    <PythonDir Condition="'$(VisualStudioVersion)' == '10.0'">c:\\python34</PythonDir>
-    <PythonDir Condition="'$(VisualStudioVersion)' == '11.0'">c:\\python34</PythonDir>
-    <PythonDir Condition="'$(VisualStudioVersion)' == '12.0'">c:\\python34</PythonDir>
-    <PythonDir Condition="'$(VisualStudioVersion)' == '14.0'">c:\\python36</PythonDir>
-    <PythonDir Condition="'$(VisualStudioVersion)' == '15.0'">c:\\python36</PythonDir>
-    <!-- PythonDirX64 needs to point to an x86-64/x64 Python 2.7/3.3+ installation -->
-    <PythonDirX64>$(PythonDir).x64</PythonDirX64>
-    <IntrospectPythonParam>PYTHON=$(PythonDir)\python.exe</IntrospectPythonParam>
-    <IntrospectPythonParamX64>PYTHON=$(PythonDirX64)\python.exe</IntrospectPythonParamX64>
-    <GIVersion>1.56.1</GIVersion>
-    <BASE_GI_DIR>$(SolutionDir)\..\..</BASE_GI_DIR>
-    <ApiVersion>1.0</ApiVersion>
-    <DefDir>$(SolutionDir)$(Configuration)\$(Platform)\obj\$(ProjectName)</DefDir>
-    <LibGILibtoolCompatibleDllPrefix>lib</LibGILibtoolCompatibleDllPrefix>
-    <LibGILibtoolCompatibleDllSuffix>-$(ApiVersion)-0</LibGILibtoolCompatibleDllSuffix>
-    <LibGISeparateVSDllPrefix />
-    <LibGISeparateVSDllSuffix>-1-vs$(VSVer)</LibGISeparateVSDllSuffix>
-    <LibGIDllPrefix>$(LibGISeparateVSDllPrefix)</LibGIDllPrefix>
-    <LibGIDllSuffix>$(LibGISeparateVSDllSuffix)</LibGIDllSuffix>
-  </PropertyGroup>
-  <PropertyGroup>
-    <_PropertySheetDisplayName>giversionpathsprops</_PropertySheetDisplayName>
-  </PropertyGroup>
-  <ItemGroup>
-    <BuildMacro Include="VSVer">
-      <Value>$(VSVer)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GlibEtcInstallRoot">
-      <Value>$(GlibEtcInstallRoot)</Value>
-    </BuildMacro>
-    <BuildMacro Include="CopyDir">
-      <Value>$(CopyDir)</Value>
-    </BuildMacro>
-    <BuildMacro Include="PythonDir">
-      <Value>$(PythonDir)</Value>
-    </BuildMacro>
-    <BuildMacro Include="PythonDirX64">
-      <Value>$(PythonDirX64)</Value>
-    </BuildMacro>
-    <BuildMacro Include="IntrospectPythonParam">
-      <Value>$(IntrospectPythonParam)</Value>
-    </BuildMacro>
-    <BuildMacro Include="IntrospectPythonParamX64">
-      <Value>$(IntrospectPythonParamX64)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GIVersion">
-      <Value>$(GIVersion)</Value>
-    </BuildMacro>
-    <BuildMacro Include="BASE_GI_DIR">
-      <Value>$(BASE_GI_DIR)</Value>
-    </BuildMacro>
-    <BuildMacro Include="ApiVersion">
-      <Value>$(ApiVersion)</Value>
-    </BuildMacro>
-    <BuildMacro Include="LibGILibtoolCompatibleDllPrefix">
-      <Value>$(LibGILibtoolCompatibleDllPrefix)</Value>
-    </BuildMacro>
-    <BuildMacro Include="LibGILibtoolCompatibleDllSuffix">
-      <Value>$(LibGILibtoolCompatibleDllSuffix)</Value>
-    </BuildMacro>
-    <BuildMacro Include="LibGISeparateVSDllPrefix">
-      <Value>$(LibGISeparateVSDllPrefix)</Value>
-    </BuildMacro>
-    <BuildMacro Include="LibGISeparateVSDllSuffix">
-      <Value>$(LibGISeparateVSDllSuffix)</Value>
-    </BuildMacro>
-    <BuildMacro Include="LibGIDllPrefix">
-      <Value>$(LibGIDllPrefix)</Value>
-    </BuildMacro>
-    <BuildMacro Include="LibGIDllSuffix">
-      <Value>$(LibGIDllSuffix)</Value>
-    </BuildMacro>
-  </ItemGroup>
-</Project>
diff --git a/win32/vs10/gi-version-paths.props.in b/win32/vs10/gi-version-paths.props.in
deleted file mode 100644
index 5793455..0000000
--- a/win32/vs10/gi-version-paths.props.in
+++ /dev/null
@@ -1,81 +0,0 @@
-<?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>
-    <GlibEtcInstallRoot>$(SolutionDir)\..\..\..\vs$(VSVer)\$(Platform)</GlibEtcInstallRoot>
-    <CopyDir>$(GlibEtcInstallRoot)</CopyDir>
-    <!-- PythonDir needs to point to a 32-bit/x86 Python 2.7/3.3+ installation -->
-    <PythonDir Condition="'$(VisualStudioVersion)' == '10.0'">c:\\python34</PythonDir>
-    <PythonDir Condition="'$(VisualStudioVersion)' == '11.0'">c:\\python34</PythonDir>
-    <PythonDir Condition="'$(VisualStudioVersion)' == '12.0'">c:\\python34</PythonDir>
-    <PythonDir Condition="'$(VisualStudioVersion)' == '14.0'">c:\\python36</PythonDir>
-    <PythonDir Condition="'$(VisualStudioVersion)' == '15.0'">c:\\python36</PythonDir>
-    <!-- PythonDirX64 needs to point to an x86-64/x64 Python 2.7/3.3+ installation -->
-    <PythonDirX64>$(PythonDir).x64</PythonDirX64>
-    <IntrospectPythonParam>PYTHON=$(PythonDir)\python.exe</IntrospectPythonParam>
-    <IntrospectPythonParamX64>PYTHON=$(PythonDirX64)\python.exe</IntrospectPythonParamX64>
-    <GIVersion>@PACKAGE_VERSION@</GIVersion>
-    <BASE_GI_DIR>$(SolutionDir)\..\..</BASE_GI_DIR>
-    <ApiVersion>1.0</ApiVersion>
-    <DefDir>$(SolutionDir)$(Configuration)\$(Platform)\obj\$(ProjectName)</DefDir>
-    <LibGILibtoolCompatibleDllPrefix>lib</LibGILibtoolCompatibleDllPrefix>
-    <LibGILibtoolCompatibleDllSuffix>-$(ApiVersion)-0</LibGILibtoolCompatibleDllSuffix>
-    <LibGISeparateVSDllPrefix />
-    <LibGISeparateVSDllSuffix>-1-vs$(VSVer)</LibGISeparateVSDllSuffix>
-    <LibGIDllPrefix>$(LibGISeparateVSDllPrefix)</LibGIDllPrefix>
-    <LibGIDllSuffix>$(LibGISeparateVSDllSuffix)</LibGIDllSuffix>
-  </PropertyGroup>
-  <PropertyGroup>
-    <_PropertySheetDisplayName>giversionpathsprops</_PropertySheetDisplayName>
-  </PropertyGroup>
-  <ItemGroup>
-    <BuildMacro Include="VSVer">
-      <Value>$(VSVer)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GlibEtcInstallRoot">
-      <Value>$(GlibEtcInstallRoot)</Value>
-    </BuildMacro>
-    <BuildMacro Include="CopyDir">
-      <Value>$(CopyDir)</Value>
-    </BuildMacro>
-    <BuildMacro Include="PythonDir">
-      <Value>$(PythonDir)</Value>
-    </BuildMacro>
-    <BuildMacro Include="PythonDirX64">
-      <Value>$(PythonDirX64)</Value>
-    </BuildMacro>
-    <BuildMacro Include="IntrospectPythonParam">
-      <Value>$(IntrospectPythonParam)</Value>
-    </BuildMacro>
-    <BuildMacro Include="IntrospectPythonParamX64">
-      <Value>$(IntrospectPythonParamX64)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GIVersion">
-      <Value>$(GIVersion)</Value>
-    </BuildMacro>
-    <BuildMacro Include="BASE_GI_DIR">
-      <Value>$(BASE_GI_DIR)</Value>
-    </BuildMacro>
-    <BuildMacro Include="ApiVersion">
-      <Value>$(ApiVersion)</Value>
-    </BuildMacro>
-    <BuildMacro Include="LibGILibtoolCompatibleDllPrefix">
-      <Value>$(LibGILibtoolCompatibleDllPrefix)</Value>
-    </BuildMacro>
-    <BuildMacro Include="LibGILibtoolCompatibleDllSuffix">
-      <Value>$(LibGILibtoolCompatibleDllSuffix)</Value>
-    </BuildMacro>
-    <BuildMacro Include="LibGISeparateVSDllPrefix">
-      <Value>$(LibGISeparateVSDllPrefix)</Value>
-    </BuildMacro>
-    <BuildMacro Include="LibGISeparateVSDllSuffix">
-      <Value>$(LibGISeparateVSDllSuffix)</Value>
-    </BuildMacro>
-    <BuildMacro Include="LibGIDllPrefix">
-      <Value>$(LibGIDllPrefix)</Value>
-    </BuildMacro>
-    <BuildMacro Include="LibGIDllSuffix">
-      <Value>$(LibGIDllSuffix)</Value>
-    </BuildMacro>
-  </ItemGroup>
-</Project>
diff --git a/win32/vs10/girepository.vcxproj b/win32/vs10/girepository.vcxproj
deleted file mode 100644
index 6d6b736..0000000
--- a/win32/vs10/girepository.vcxproj
+++ /dev/null
@@ -1,214 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{23E28245-8FC7-4B41-B1C5-8785BD4366A7}</ProjectGuid>
-    <RootNamespace>girepository</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\girepository;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;$(GIRepositoryBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ffi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).dll</OutputFile>
-      <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\..\girepository;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>$(GIRepositoryBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ffi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).dll</OutputFile>
-      <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\girepository;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;$(GIRepositoryBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ffi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).dll</OutputFile>
-      <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\..\girepository;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>$(GIRepositoryBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ffi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).dll</OutputFile>
-      <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-   <ClCompile Include="..\..\girepository\gdump.c" />
-   <ClCompile Include="..\..\girepository\giarginfo.c" />
-   <ClCompile Include="..\..\girepository\gibaseinfo.c" />
-   <ClCompile Include="..\..\girepository\gicallableinfo.c" />
-   <ClCompile Include="..\..\girepository\giconstantinfo.c" />
-   <ClCompile Include="..\..\girepository\gienuminfo.c" />
-   <ClCompile Include="..\..\girepository\gifieldinfo.c" />
-   <ClCompile Include="..\..\girepository\gifunctioninfo.c" />
-   <ClCompile Include="..\..\girepository\ginvoke.c" />
-   <ClCompile Include="..\..\girepository\giinterfaceinfo.c" />
-   <ClCompile Include="..\..\girepository\giobjectinfo.c" />
-   <ClCompile Include="..\..\girepository\gipropertyinfo.c" />
-   <ClCompile Include="..\..\girepository\giregisteredtypeinfo.c" />
-   <ClCompile Include="..\..\girepository\girepository.c" />
-   <ClCompile Include="..\..\girepository\girffi.c" />
-   <ClCompile Include="..\..\girepository\gisignalinfo.c" />
-   <ClCompile Include="..\..\girepository\gistructinfo.c" />
-   <ClCompile Include="..\..\girepository\gitypeinfo.c" />
-   <ClCompile Include="..\..\girepository\gitypelib.c" />
-   <ClCompile Include="..\..\girepository\giunioninfo.c" />
-   <ClCompile Include="..\..\girepository\givfuncinfo.c" />
-   <ClCompile Include="..\..\girepository\gthash.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="gi-prebuild.vcxproj">
-      <Project>{2093d218-190e-4194-9421-3ba7cbf33b11}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="cmph.vcxproj">
-      <Project>{442c007e-d901-41da-9706-5db4afb4c06b}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/win32/vs10/girepository.vcxproj.filters b/win32/vs10/girepository.vcxproj.filters
deleted file mode 100644
index 8201353..0000000
--- a/win32/vs10/girepository.vcxproj.filters
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Sources">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Headers">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-   <ClCompile Include="..\..\girepository\gdump.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\giarginfo.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\gibaseinfo.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\gicallableinfo.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\giconstantinfo.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\gienuminfo.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\gifieldinfo.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\gifunctioninfo.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\ginvoke.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\giinterfaceinfo.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\giobjectinfo.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\gipropertyinfo.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\giregisteredtypeinfo.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\girepository.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\girffi.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\gisignalinfo.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\gistructinfo.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\gitypeinfo.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\gitypelib.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\giunioninfo.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\givfuncinfo.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\gthash.c"><Filter>Source Files</Filter></ClCompile>
-  </ItemGroup>
-</Project>
diff --git a/win32/vs10/girepository.vcxproj.filtersin b/win32/vs10/girepository.vcxproj.filtersin
deleted file mode 100644
index 8e9255d..0000000
--- a/win32/vs10/girepository.vcxproj.filtersin
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Sources">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Headers">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-#include "girepository.vs10.sourcefiles.filters"
-  </ItemGroup>
-</Project>
diff --git a/win32/vs10/girepository.vcxprojin b/win32/vs10/girepository.vcxprojin
deleted file mode 100644
index 2ff1557..0000000
--- a/win32/vs10/girepository.vcxprojin
+++ /dev/null
@@ -1,193 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{23E28245-8FC7-4B41-B1C5-8785BD4366A7}</ProjectGuid>
-    <RootNamespace>girepository</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\girepository;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;$(GIRepositoryBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ffi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).dll</OutputFile>
-      <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\..\girepository;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>$(GIRepositoryBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ffi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).dll</OutputFile>
-      <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\girepository;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;$(GIRepositoryBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ffi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).dll</OutputFile>
-      <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\..\girepository;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>$(GIRepositoryBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ffi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).dll</OutputFile>
-      <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-#include "girepository.vs10.sourcefiles"
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="gi-prebuild.vcxproj">
-      <Project>{2093d218-190e-4194-9421-3ba7cbf33b11}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="cmph.vcxproj">
-      <Project>{442c007e-d901-41da-9706-5db4afb4c06b}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/win32/vs10/glib-print.vcxproj b/win32/vs10/glib-print.vcxproj
deleted file mode 100644
index 78fe23e..0000000
--- a/win32/vs10/glib-print.vcxproj
+++ /dev/null
@@ -1,169 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{2CCD6E09-08E7-44B9-92E6-42F0A5DBBC8B}</ProjectGuid>
-    <RootNamespace>glibprint</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\examples\glib-print.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="girepository.vcxproj">
-      <Project>{23e28245-8fc7-4b41-b1c5-8785bd4366a7}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/win32/vs10/glib-print.vcxproj.filters b/win32/vs10/glib-print.vcxproj.filters
deleted file mode 100644
index f77043c..0000000
--- a/win32/vs10/glib-print.vcxproj.filters
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Sources">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Headers">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\examples\glib-print.c">
-      <Filter>Sources</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
diff --git a/win32/vs10/gobject-introspection.sln b/win32/vs10/gobject-introspection.sln
deleted file mode 100644
index 5227c78..0000000
--- a/win32/vs10/gobject-introspection.sln
+++ /dev/null
@@ -1,126 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gi-prebuild", "gi-prebuild.vcxproj", "{2093D218-190E-4194-9421-3BA7CBF33B11}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cmph", "cmph.vcxproj", "{442C007E-D901-41DA-9706-5DB4AFB4C06B}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cmph-bdz-test", "cmph-bdz-test.vcxproj", "{E41F378B-CCDD-4B1C-89C3-6D2C950FAF1A}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "girepository", "girepository.vcxproj", "{23E28245-8FC7-4B41-B1C5-8785BD4366A7}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_giscanner", "_giscanner.vcxproj", "{8311394F-9114-4C97-80F2-51BCABA054C9}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glib-print", "glib-print.vcxproj", "{2CCD6E09-08E7-44B9-92E6-42F0A5DBBC8B}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "g-ir-generate", "g-ir-generate.vcxproj", "{F4E6621F-A7DD-4863-8CCF-BA04DFC601E3}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "g-ir-compiler", "g-ir-compiler.vcxproj", "{5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "g-ir-inspect", "g-ir-inspect.vcxproj", "{F4E6621F-A7DD-4863-8CCF-CA04DFC601E3}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gi-introspect", "gi-introspect.vcxproj", "{7A36674C-379D-4989-A978-07124E5F852C}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gi-install", "gi-install.vcxproj", "{2093D218-190E-4194-9421-3BA7CBF33B10}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Debug|x64 = Debug|x64
-		Release|Win32 = Release|Win32
-		Release|x64 = Release|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{2093D218-190E-4194-9421-3BA7CBF33B11}.Debug|Win32.ActiveCfg = Debug|Win32
-		{2093D218-190E-4194-9421-3BA7CBF33B11}.Debug|Win32.Build.0 = Debug|Win32
-		{2093D218-190E-4194-9421-3BA7CBF33B11}.Debug|x64.ActiveCfg = Debug|x64
-		{2093D218-190E-4194-9421-3BA7CBF33B11}.Debug|x64.Build.0 = Debug|x64
-		{2093D218-190E-4194-9421-3BA7CBF33B11}.Release|Win32.ActiveCfg = Release|Win32
-		{2093D218-190E-4194-9421-3BA7CBF33B11}.Release|Win32.Build.0 = Release|Win32
-		{2093D218-190E-4194-9421-3BA7CBF33B11}.Release|x64.ActiveCfg = Release|x64
-		{2093D218-190E-4194-9421-3BA7CBF33B11}.Release|x64.Build.0 = Release|x64
-		{442C007E-D901-41DA-9706-5DB4AFB4C06B}.Debug|Win32.ActiveCfg = Debug|Win32
-		{442C007E-D901-41DA-9706-5DB4AFB4C06B}.Debug|Win32.Build.0 = Debug|Win32
-		{442C007E-D901-41DA-9706-5DB4AFB4C06B}.Debug|x64.ActiveCfg = Debug|x64
-		{442C007E-D901-41DA-9706-5DB4AFB4C06B}.Debug|x64.Build.0 = Debug|x64
-		{442C007E-D901-41DA-9706-5DB4AFB4C06B}.Release|Win32.ActiveCfg = Release|Win32
-		{442C007E-D901-41DA-9706-5DB4AFB4C06B}.Release|Win32.Build.0 = Release|Win32
-		{442C007E-D901-41DA-9706-5DB4AFB4C06B}.Release|x64.ActiveCfg = Release|x64
-		{442C007E-D901-41DA-9706-5DB4AFB4C06B}.Release|x64.Build.0 = Release|x64
-		{E41F378B-CCDD-4B1C-89C3-6D2C950FAF1A}.Debug|Win32.ActiveCfg = Debug|Win32
-		{E41F378B-CCDD-4B1C-89C3-6D2C950FAF1A}.Debug|Win32.Build.0 = Debug|Win32
-		{E41F378B-CCDD-4B1C-89C3-6D2C950FAF1A}.Debug|x64.ActiveCfg = Debug|x64
-		{E41F378B-CCDD-4B1C-89C3-6D2C950FAF1A}.Debug|x64.Build.0 = Debug|x64
-		{E41F378B-CCDD-4B1C-89C3-6D2C950FAF1A}.Release|Win32.ActiveCfg = Release|Win32
-		{E41F378B-CCDD-4B1C-89C3-6D2C950FAF1A}.Release|Win32.Build.0 = Release|Win32
-		{E41F378B-CCDD-4B1C-89C3-6D2C950FAF1A}.Release|x64.ActiveCfg = Release|x64
-		{E41F378B-CCDD-4B1C-89C3-6D2C950FAF1A}.Release|x64.Build.0 = Release|x64
-		{23E28245-8FC7-4B41-B1C5-8785BD4366A7}.Debug|Win32.ActiveCfg = Debug|Win32
-		{23E28245-8FC7-4B41-B1C5-8785BD4366A7}.Debug|Win32.Build.0 = Debug|Win32
-		{23E28245-8FC7-4B41-B1C5-8785BD4366A7}.Debug|x64.ActiveCfg = Debug|x64
-		{23E28245-8FC7-4B41-B1C5-8785BD4366A7}.Debug|x64.Build.0 = Debug|x64
-		{23E28245-8FC7-4B41-B1C5-8785BD4366A7}.Release|Win32.ActiveCfg = Release|Win32
-		{23E28245-8FC7-4B41-B1C5-8785BD4366A7}.Release|Win32.Build.0 = Release|Win32
-		{23E28245-8FC7-4B41-B1C5-8785BD4366A7}.Release|x64.ActiveCfg = Release|x64
-		{23E28245-8FC7-4B41-B1C5-8785BD4366A7}.Release|x64.Build.0 = Release|x64
-		{8311394F-9114-4C97-80F2-51BCABA054C9}.Debug|Win32.ActiveCfg = Debug|Win32
-		{8311394F-9114-4C97-80F2-51BCABA054C9}.Debug|Win32.Build.0 = Debug|Win32
-		{8311394F-9114-4C97-80F2-51BCABA054C9}.Debug|x64.ActiveCfg = Debug|x64
-		{8311394F-9114-4C97-80F2-51BCABA054C9}.Debug|x64.Build.0 = Debug|x64
-		{8311394F-9114-4C97-80F2-51BCABA054C9}.Release|Win32.ActiveCfg = Release|Win32
-		{8311394F-9114-4C97-80F2-51BCABA054C9}.Release|Win32.Build.0 = Release|Win32
-		{8311394F-9114-4C97-80F2-51BCABA054C9}.Release|x64.ActiveCfg = Release|x64
-		{8311394F-9114-4C97-80F2-51BCABA054C9}.Release|x64.Build.0 = Release|x64
-		{2CCD6E09-08E7-44B9-92E6-42F0A5DBBC8B}.Debug|Win32.ActiveCfg = Debug|Win32
-		{2CCD6E09-08E7-44B9-92E6-42F0A5DBBC8B}.Debug|Win32.Build.0 = Debug|Win32
-		{2CCD6E09-08E7-44B9-92E6-42F0A5DBBC8B}.Debug|x64.ActiveCfg = Debug|x64
-		{2CCD6E09-08E7-44B9-92E6-42F0A5DBBC8B}.Debug|x64.Build.0 = Debug|x64
-		{2CCD6E09-08E7-44B9-92E6-42F0A5DBBC8B}.Release|Win32.ActiveCfg = Release|Win32
-		{2CCD6E09-08E7-44B9-92E6-42F0A5DBBC8B}.Release|Win32.Build.0 = Release|Win32
-		{2CCD6E09-08E7-44B9-92E6-42F0A5DBBC8B}.Release|x64.ActiveCfg = Release|x64
-		{2CCD6E09-08E7-44B9-92E6-42F0A5DBBC8B}.Release|x64.Build.0 = Release|x64
-		{F4E6621F-A7DD-4863-8CCF-BA04DFC601E3}.Debug|Win32.ActiveCfg = Debug|Win32
-		{F4E6621F-A7DD-4863-8CCF-BA04DFC601E3}.Debug|Win32.Build.0 = Debug|Win32
-		{F4E6621F-A7DD-4863-8CCF-BA04DFC601E3}.Debug|x64.ActiveCfg = Debug|x64
-		{F4E6621F-A7DD-4863-8CCF-BA04DFC601E3}.Debug|x64.Build.0 = Debug|x64
-		{F4E6621F-A7DD-4863-8CCF-BA04DFC601E3}.Release|Win32.ActiveCfg = Release|Win32
-		{F4E6621F-A7DD-4863-8CCF-BA04DFC601E3}.Release|Win32.Build.0 = Release|Win32
-		{F4E6621F-A7DD-4863-8CCF-BA04DFC601E3}.Release|x64.ActiveCfg = Release|x64
-		{F4E6621F-A7DD-4863-8CCF-BA04DFC601E3}.Release|x64.Build.0 = Release|x64
-		{F4E6621F-A7DD-4863-8CCF-CA04DFC601E3}.Debug|Win32.ActiveCfg = Debug|Win32
-		{F4E6621F-A7DD-4863-8CCF-CA04DFC601E3}.Debug|Win32.Build.0 = Debug|Win32
-		{F4E6621F-A7DD-4863-8CCF-CA04DFC601E3}.Debug|x64.ActiveCfg = Debug|x64
-		{F4E6621F-A7DD-4863-8CCF-CA04DFC601E3}.Debug|x64.Build.0 = Debug|x64
-		{F4E6621F-A7DD-4863-8CCF-CA04DFC601E3}.Release|Win32.ActiveCfg = Release|Win32
-		{F4E6621F-A7DD-4863-8CCF-CA04DFC601E3}.Release|Win32.Build.0 = Release|Win32
-		{F4E6621F-A7DD-4863-8CCF-CA04DFC601E3}.Release|x64.ActiveCfg = Release|x64
-		{F4E6621F-A7DD-4863-8CCF-CA04DFC601E3}.Release|x64.Build.0 = Release|x64
-		{5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774}.Debug|Win32.ActiveCfg = Debug|Win32
-		{5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774}.Debug|Win32.Build.0 = Debug|Win32
-		{5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774}.Debug|x64.ActiveCfg = Debug|x64
-		{5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774}.Debug|x64.Build.0 = Debug|x64
-		{5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774}.Release|Win32.ActiveCfg = Release|Win32
-		{5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774}.Release|Win32.Build.0 = Release|Win32
-		{5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774}.Release|x64.ActiveCfg = Release|x64
-		{5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774}.Release|x64.Build.0 = Release|x64
-		{7A36674C-379D-4989-A978-07124E5F852C}.Debug|Win32.ActiveCfg = Debug|Win32
-		{7A36674C-379D-4989-A978-07124E5F852C}.Debug|Win32.Build.0 = Debug|Win32
-		{7A36674C-379D-4989-A978-07124E5F852C}.Debug|x64.ActiveCfg = Debug|x64
-		{7A36674C-379D-4989-A978-07124E5F852C}.Debug|x64.Build.0 = Debug|x64
-		{7A36674C-379D-4989-A978-07124E5F852C}.Release|Win32.ActiveCfg = Release|Win32
-		{7A36674C-379D-4989-A978-07124E5F852C}.Release|Win32.Build.0 = Release|Win32
-		{7A36674C-379D-4989-A978-07124E5F852C}.Release|x64.ActiveCfg = Release|x64
-		{7A36674C-379D-4989-A978-07124E5F852C}.Release|x64.Build.0 = Release|x64
-		{2093D218-190E-4194-9421-3BA7CBF33B10}.Debug|Win32.ActiveCfg = Debug|Win32
-		{2093D218-190E-4194-9421-3BA7CBF33B10}.Debug|Win32.Build.0 = Debug|Win32
-		{2093D218-190E-4194-9421-3BA7CBF33B10}.Debug|x64.ActiveCfg = Debug|x64
-		{2093D218-190E-4194-9421-3BA7CBF33B10}.Debug|x64.Build.0 = Debug|x64
-		{2093D218-190E-4194-9421-3BA7CBF33B10}.Release|Win32.ActiveCfg = Release|Win32
-		{2093D218-190E-4194-9421-3BA7CBF33B10}.Release|Win32.Build.0 = Release|Win32
-		{2093D218-190E-4194-9421-3BA7CBF33B10}.Release|x64.ActiveCfg = Release|x64
-		{2093D218-190E-4194-9421-3BA7CBF33B10}.Release|x64.Build.0 = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/win32/vs11/Makefile.am b/win32/vs11/Makefile.am
deleted file mode 100644
index 086238c..0000000
--- a/win32/vs11/Makefile.am
+++ /dev/null
@@ -1,36 +0,0 @@
-EXTRA_DIST = \
-	gobject-introspection.sln	\
-	gi-build-defines.props	\
-	gi-gen-srcs.props	\
-	gi-install.props	\
-	gi-version-paths.props	\
-	gi-prebuild.vcxproj	\
-	girepository.vcxproj	\
-	girepository.vcxproj.filters	\
-	cmph-bdz-test.vcxproj	\
-	cmph-bdz-test.vcxproj.filters	\
-	cmph.vcxproj	\
-	cmph.vcxproj.filters	\
-	g-ir-compiler.vcxproj	\
-	g-ir-compiler.vcxproj.filters	\
-	g-ir-generate.vcxproj	\
-	g-ir-generate.vcxproj.filters	\
-	g-ir-inspect.vcxproj	\
-	g-ir-inspect.vcxproj.filters	\
-	glib-print.vcxproj	\
-	glib-print.vcxproj.filters	\
-	_giscanner.vcxproj	\
-	_giscanner.vcxproj.filters	\
-	gi-install.vcxproj	\
-	gi-install.vcxproj.filters	\
-	gi-introspect.vcxproj	\
-	README.txt
-
-DISTCLEANFILES = $(EXTRA_DIST)
-
-MSVC_BASE_VER = 10
-MSVC_BASE_VER_LONG = 2010
-MSVC_VER = 11
-MSVC_VER_LONG = 2012
-
-include $(top_srcdir)/win32/Makefile-newvs.am
diff --git a/win32/vs11/Makefile.in b/win32/vs11/Makefile.in
deleted file mode 100644
index 5a4a61f..0000000
--- a/win32/vs11/Makefile.in
+++ /dev/null
@@ -1,585 +0,0 @@
-# Makefile.in generated by automake 1.15.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994-2017 Free Software Foundation, Inc.
-
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-# Centralized autotools file
-# Create the Visual Studio 2012/2013/2015 project files
-# from the Visual Studio 2010 project files
-
-# This autotools file, from GLib, can be used in other projects
-# that have Visual Studio build support.
-
-# Author: Fan, Chun-wei
-# November 05, 2012
-
-# MSVC_BASE_VER: Baseline MSVC 201x version to copy/process project files from (100 for 2010, 120 for 2013)
-# MSVC_BASE_VER_LONG: Long Version of baseline Visual Studio 201x version (2010, 2012, 2013, 14, 15)
-# MSVC_BASE_TOOLSET: Use if baseline MSVC toolset is not in the form v$(MSVC_BASE_VER)0, meaning v$(MSVC_BASE_TOOLSET)
-# MSVC_VER_LONG: Long Version of target Visual Studio (2012, 2013, 14 and so on)
-# MSVC_VER: Short Version of target Visual Studio (110 for 2012, 120 for 2013, 140 for 2015, 141 for 2017)
-# MSVC_TOOLSET: Use if target MSVC toolsett is not in the form v $(MSVC_VER)0, meaning v$(MSVC_TOOLSET)
-VPATH = @srcdir@
-am__is_gnu_make = { \
-  if test -z '$(MAKELEVEL)'; then \
-    false; \
-  elif test -n '$(MAKE_HOST)'; then \
-    true; \
-  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
-    true; \
-  else \
-    false; \
-  fi; \
-}
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -[dEDm]) skip_next=yes;; \
-      -[JT]) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = win32/vs11
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
-	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/python.m4 \
-	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN     " $@;
-am__v_GEN_1 = 
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 = 
-SOURCES =
-DIST_SOURCES =
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-am__DIST_COMMON = $(srcdir)/Makefile.in \
-	$(top_srcdir)/win32/Makefile-newvs.am
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CAIRO_CFLAGS = @CAIRO_CFLAGS@
-CAIRO_GIR_PACKAGE = @CAIRO_GIR_PACKAGE@
-CAIRO_LIBS = @CAIRO_LIBS@
-CAIRO_SHARED_LIBRARY = @CAIRO_SHARED_LIBRARY@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-EXPANDED_BINDIR = @EXPANDED_BINDIR@
-EXPANDED_DATADIR = @EXPANDED_DATADIR@
-EXPANDED_LIBDIR = @EXPANDED_LIBDIR@
-EXPANDED_LIBEXECDIR = @EXPANDED_LIBEXECDIR@
-EXPANDED_LOCALSTATEDIR = @EXPANDED_LOCALSTATEDIR@
-EXPANDED_SYSCONFDIR = @EXPANDED_SYSCONFDIR@
-EXTRA_LINK_FLAGS = @EXTRA_LINK_FLAGS@
-FFI_CFLAGS = @FFI_CFLAGS@
-FFI_LIBS = @FFI_LIBS@
-FFI_PC_CFLAGS = @FFI_PC_CFLAGS@
-FFI_PC_LIBS = @FFI_PC_LIBS@
-FFI_PC_PACKAGES = @FFI_PC_PACKAGES@
-FGREP = @FGREP@
-GIO_CFLAGS = @GIO_CFLAGS@
-GIO_LIBS = @GIO_LIBS@
-GIO_UNIX_CFLAGS = @GIO_UNIX_CFLAGS@
-GIO_UNIX_LIBS = @GIO_UNIX_LIBS@
-GIREPO_CFLAGS = @GIREPO_CFLAGS@
-GIREPO_LIBS = @GIREPO_LIBS@
-GIR_DIR = @GIR_DIR@
-GIR_SUFFIX = @GIR_SUFFIX@
-GI_HIDDEN_VISIBILITY_CFLAGS = @GI_HIDDEN_VISIBILITY_CFLAGS@
-GI_VERSION = @GI_VERSION@
-GLIBSRC = @GLIBSRC@
-GLIB_CFLAGS = @GLIB_CFLAGS@
-GLIB_LIBS = @GLIB_LIBS@
-GMODULE_CFLAGS = @GMODULE_CFLAGS@
-GMODULE_LIBS = @GMODULE_LIBS@
-GOBJECT_CFLAGS = @GOBJECT_CFLAGS@
-GOBJECT_INTROSPECTION_LIBDIR = @GOBJECT_INTROSPECTION_LIBDIR@
-GOBJECT_LIBS = @GOBJECT_LIBS@
-GREP = @GREP@
-GTKDOC_CHECK = @GTKDOC_CHECK@
-GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
-GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
-GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
-GTKDOC_MKPDF = @GTKDOC_MKPDF@
-GTKDOC_REBASE = @GTKDOC_REBASE@
-HTML_DIR = @HTML_DIR@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LEX = @LEX@
-LEXLIB = @LEXLIB@
-LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MKDIR_P = @MKDIR_P@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-POW_LIB = @POW_LIB@
-PYTHON = @PYTHON@
-PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
-PYTHON_INCLUDES = @PYTHON_INCLUDES@
-PYTHON_LIBS = @PYTHON_LIBS@
-PYTHON_PLATFORM = @PYTHON_PLATFORM@
-PYTHON_PREFIX = @PYTHON_PREFIX@
-PYTHON_VERSION = @PYTHON_VERSION@
-RANLIB = @RANLIB@
-SCANNER_CFLAGS = @SCANNER_CFLAGS@
-SCANNER_LIBS = @SCANNER_LIBS@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-VERSION = @VERSION@
-YACC = @YACC@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-pkgpyexecdir = @pkgpyexecdir@
-pkgpythondir = @pkgpythondir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-pyexecdir = @pyexecdir@
-pythondir = @pythondir@
-runstatedir = @runstatedir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-EXTRA_DIST = \
-	gobject-introspection.sln	\
-	gi-build-defines.props	\
-	gi-gen-srcs.props	\
-	gi-install.props	\
-	gi-version-paths.props	\
-	gi-prebuild.vcxproj	\
-	girepository.vcxproj	\
-	girepository.vcxproj.filters	\
-	cmph-bdz-test.vcxproj	\
-	cmph-bdz-test.vcxproj.filters	\
-	cmph.vcxproj	\
-	cmph.vcxproj.filters	\
-	g-ir-compiler.vcxproj	\
-	g-ir-compiler.vcxproj.filters	\
-	g-ir-generate.vcxproj	\
-	g-ir-generate.vcxproj.filters	\
-	g-ir-inspect.vcxproj	\
-	g-ir-inspect.vcxproj.filters	\
-	glib-print.vcxproj	\
-	glib-print.vcxproj.filters	\
-	_giscanner.vcxproj	\
-	_giscanner.vcxproj.filters	\
-	gi-install.vcxproj	\
-	gi-install.vcxproj.filters	\
-	gi-introspect.vcxproj	\
-	README.txt
-
-DISTCLEANFILES = $(EXTRA_DIST)
-MSVC_BASE_VER = 10
-MSVC_BASE_VER_LONG = 2010
-MSVC_VER = 11
-MSVC_VER_LONG = 2012
-@MSVC_BASE_NO_TOOLSET_SET_TRUE@MSVC_BASE_TOOLSET = $(MSVC_BASE_VER)0
-@MSVC_NO_TOOLSET_SET_TRUE@MSVC_TOOLSET = $(MSVC_VER)0
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/win32/Makefile-newvs.am $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign win32/vs11/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign win32/vs11/Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-$(top_srcdir)/win32/Makefile-newvs.am $(am__empty):
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-tags TAGS:
-
-ctags CTAGS:
-
-cscope cscopelist:
-
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am:
-
-.MAKE: install-am install-strip
-
-.PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	cscopelist-am ctags-am distclean distclean-generic \
-	distclean-libtool distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags-am uninstall uninstall-am
-
-.PRECIOUS: Makefile
-
-
-%.sln:
-	sed 's/11\.00/12\.00/g' < $(top_srcdir)/win32/vs$(MSVC_BASE_VER)/$@ > $(top_builddir)/win32/vs$(MSVC_VER)/$@.tmp
-	sed 's/$(MSVC_BASE_VER_LONG)/$(MSVC_VER_LONG)/g' < $(top_builddir)/win32/vs$(MSVC_VER)/$@.tmp > $(top_builddir)/win32/vs$(MSVC_VER)/$@
-	rm $(top_builddir)/win32/vs$(MSVC_VER)/$@.tmp
-
-%.txt:
-	sed 's/vs$(MSVC_BASE_VER)/vs$(MSVC_VER)/g' < $(top_srcdir)/win32/vs$(MSVC_BASE_VER)/$@ > $(top_builddir)/win32/vs$(MSVC_VER)/$@.tmp
-	sed 's/VS$(MSVC_BASE_VER)/VS$(MSVC_VER)/g' < $(top_builddir)/win32/vs$(MSVC_VER)/$@.tmp > $(top_builddir)/win32/vs$(MSVC_VER)/$@
-	rm $(top_builddir)/win32/vs$(MSVC_VER)/$@.tmp
-
-%.vcxproj:
-	if test -e $(top_srcdir)/win32/vs$(MSVC_BASE_VER)/$@; then \
-		sed 's/v$(MSVC_BASE_TOOLSET)/v$(MSVC_TOOLSET)/g' < $(top_srcdir)/win32/vs$(MSVC_BASE_VER)/$@ > $(top_builddir)/win32/vs$(MSVC_VER)/$@; \
-	else \
-		sed 's/v$(MSVC_BASE_TOOLSET)/v$(MSVC_TOOLSET)/g' < $(top_builddir)/win32/vs$(MSVC_BASE_VER)/$@ > $(top_builddir)/win32/vs$(MSVC_VER)/$@; \
-	fi
-
-%.props: $(top_builddir)/win32/vs$(MSVC_BASE_VER)/Makefile
-	if test -e $(top_srcdir)/win32/vs$(MSVC_BASE_VER)/$@; then \
-		sed 's/<VSVer>$(MSVC_BASE_VER)<\/VSVer>/<VSVer>$(MSVC_VER)<\/VSVer>/g' < $(top_srcdir)/win32/vs$(MSVC_BASE_VER)/$@ > $(top_builddir)/win32/vs$(MSVC_VER)/$@; \
-	else \
-		sed 's/<VSVer>$(MSVC_BASE_VER)<\/VSVer>/<VSVer>$(MSVC_VER)<\/VSVer>/g' < $(top_builddir)/win32/vs$(MSVC_BASE_VER)/$@ > $(top_builddir)/win32/vs$(MSVC_VER)/$@; \
-	fi
-
-%.vcxproj.filters:
-	if test -e $(top_srcdir)/win32/vs$(MSVC_BASE_VER)/$@; then \
-		cp $(top_srcdir)/win32/vs$(MSVC_BASE_VER)/$@ $(top_builddir)/win32/vs$(MSVC_VER)/$@; \
-	else \
-		cp $(top_builddir)/win32/vs$(MSVC_BASE_VER)/$@ $(top_builddir)/win32/vs$(MSVC_VER)/$@; \
-	fi
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/win32/vs11/README.txt b/win32/vs11/README.txt
deleted file mode 100644
index 3d67898..0000000
--- a/win32/vs11/README.txt
+++ /dev/null
@@ -1,104 +0,0 @@
-Please do not compile this package (gobject-introspection) in paths that contain
-spaces in them-as strange problems may occur during compilation or during
-the use of the library.
-
-Please refer to the following GNOME Live! page for more detailed
-instructions on building gobject-introsecption and its dependencies
-with Visual C++:
-
-https://live.gnome.org/GTK%2B/Win32/MSVCCompilationOfGTKStack
-
-This VS11 solution and the projects it includes are intented to be used
-in a gobject-introspection source tree unpacked from a tarball. In a git checkout you
-first need to use some Unix-like environment, which will do the work for you.
-
-The required dependencies are Python 2.7 (2.7) or 3.3 (3.x) or later, GLib and LibFFI.
-It is recommended that GLib is built with Visual C++ 2010 to avoid problems cause by
-usage of different CRTs.
-
-Please refer to the README.txt file in $(GLib_src_root)\build\win32\vs11 on how to build
-GLib using Visual C++ 2010
-
-For LibFFI, please use the Centricular fork of it, which can be found at
-https://github.com/centricular/libffi.  Please refer there on building--please
-note that this will involve the use of the Meson build system and possible the
-Ninja build tool, if the Visual Studio project generation is not used or is
-unavailable.
-
-For Python, retrieving the official Windows binaries for 2.7 (2.x) or 3.3 (3.x) or later
-from http://www.python.org will do the job-be sure that the Python version that
-you downloaded matches the configuration of your build (win32 or x64/amd64).  Ensure that
-the correct path for your Python interpretor is set in gi-extra-paths.vsprops prior to
-opening the project files, or close the project files and delete all the *.user, *.sdf and
-*.suo files and reopening the project files.
-
-For building the Regress test project, cairo (and possibly cairo-gobject support)
-is needed.
-
-Set up the source tree as follows under some arbitrary top
-folder <root>:
-
-<root>\<this-gobject-introspection-source-tree>
-<root>\vs11\<PlatformName>
-
-*this* file you are now reading is thus located at
-<root>\<this-glib-source-tree>\build\win32\vs11\README.
-
-<PlatformName> is either Win32 or x64, as in VS11 project files.
-
-For LibFFI, one should also put the generated ffi.h and ffitarget.h
-into <root>\vs11\<PlatformName>\include\ and the compiled static libffi.lib
-(or copy libffi-convenience.lib into libffi.lib) into
-<root>\vs11\<PlatformName>\lib\.
-
-The libintl.h that is used for building GLib needs to be in
-<root>\vs11\<PlatformName>\include, if not already done so.
-
-A working pkg-config tool is also required-it may be obtained from
-http://www.gtk.org/download/win32.php [32-bit]
-http://www.gtk.org/download/win64.php [64-bit]
-
-*** Note! ***
-The build of G-I is now done within the project files, although it is still possible to
-do it in two stages by using the NMake Makefiles after building the projects.
-
-As there are numerous possible configurations on Python and PKG_CONFIG_PATH, note that:
--For both methods PKG_CONFIG_PATH is by default $(PREFIX)\lib\pkgconfig, where $(PREFIX)
- is by default <parent_dir_of_G-I_srcroot>\vs11\<PlatformName>.  If searching from
- more directories is desired, set the PKG_CONFIG_PATH environment variable before using
- the NMake Makefile or opening the projects, but note that $(PREFIX)\lib\pkgconfig will
- precede the set paths.
--For the Python Path using the project files: check whether the directory settings in
- gi-version-paths.vsprops under PythonDir (32-bit) or PythonDirX64 (x64) is correct.
- If the projects have been loaded by Visual Studio, close the projects and re-open them.
- You may need to delete all the *.suo, *.user and *.ncb files in this directory for
- the changes to take effect.
--For the Python Path using the NMake Makefiles: pass in PYTHON=<full_path_to_python> to
- the NMake Makefile or set it in the environment.  The bit-ness of your Python installation
- must match the configuration that you are building for.
-
-The use of Visual Studio Projects will no longer require the setting of environmental
-variables, but the following environmental variables are needed (either by using "set xxx=yyy"
-or by nmake -f gi-introspection-msvc.mak xxx=yyy) for building the introspection files (which
-should be done after successfully building the Project Files):
-
-Please see $(srcroot)\build\win32\gi-introspection-msvc.mak for more details.  Doing
-"nmake -f gi-introspection-msvc.mak (options omitted)" will build the various introspection files,
-and "nmake -f gi-introspection-msvc.mak (options omitted) install-introspection" will copy the introspection
-files to <root>\vs11\<PlatformName>\share\gir-1.0 (.gir files) and <root>\vs11\<PlatformName>\lib\girepository-1.0
-(.typelib files)
-
-*** End of Note! ***
-
-The "install" project will copy build results and headers into their
-appropriate location under <root>\vs11\<PlatformName>. For instance,
-built DLLs go into <root>\vs11\<PlatformName>\bin, built LIBs into
-<root>\vs11\<PlatformName>\lib and gobject-introspection headers into
-<root>\vs11\<PlatformName>\include\gobject-introsection-1.0.
-
-This is then from where
-project files higher in the stack are supposed to look for them, not
-from a specific gobject-introspection source tree.
-
---Tor Lillqvist <tml@iki.fi>
---Updated by Chun-wei Fan <fanc999@gmail.com>
diff --git a/win32/vs11/_giscanner.vcxproj b/win32/vs11/_giscanner.vcxproj
deleted file mode 100644
index a028176..0000000
--- a/win32/vs11/_giscanner.vcxproj
+++ /dev/null
@@ -1,188 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{8311394F-9114-4C97-80F2-51BCABA054C9}</ProjectGuid>
-    <RootNamespace>_giscanner</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\giscanner;$(PythonDir)\include;$(PythonDir)\PC;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <ForcedIncludeFiles>%(ForcedIncludeFiles);io.h</ForcedIncludeFiles>
-      <PreprocessorDefinitions>_DEBUG;YY_NO_UNISTD_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(OutDir)$(ProjectName).pyd</OutputFile>
-      <AdditionalLibraryDirectories>$(PythonDir)\libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\..\giscanner;$(PythonDir)\include;$(PythonDir)\PC;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <ForcedIncludeFiles>%(ForcedIncludeFiles);io.h</ForcedIncludeFiles>
-      <PreprocessorDefinitions>YY_NO_UNISTD_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(OutDir)$(ProjectName).pyd</OutputFile>
-      <AdditionalLibraryDirectories>$(PythonDir)\libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\giscanner;$(PythonDirX64)\include;$(PythonDirX64)\PC;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <ForcedIncludeFiles>%(ForcedIncludeFiles);io.h</ForcedIncludeFiles>
-      <PreprocessorDefinitions>_DEBUG;YY_NO_UNISTD_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(OutDir)$(ProjectName).pyd</OutputFile>
-      <AdditionalLibraryDirectories>$(PythonDirX64)\libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\..\giscanner;$(PythonDirX64)\include;$(PythonDirX64)\PC;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <ForcedIncludeFiles>%(ForcedIncludeFiles);io.h</ForcedIncludeFiles>
-      <PreprocessorDefinitions>YY_NO_UNISTD_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(OutDir)$(ProjectName).pyd</OutputFile>
-      <AdditionalLibraryDirectories>$(PythonDirX64)\libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\giscanner\giscannermodule.c" />
-    <ClCompile Include="..\..\scannerlexer.c" />
-    <ClCompile Include="..\..\scannerparser.c" />
-    <ClCompile Include="..\..\giscanner\sourcescanner.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="gi-prebuild.vcxproj">
-      <Project>{2093d218-190e-4194-9421-3ba7cbf33b11}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/win32/vs11/_giscanner.vcxproj.filters b/win32/vs11/_giscanner.vcxproj.filters
deleted file mode 100644
index 1ddc9a2..0000000
--- a/win32/vs11/_giscanner.vcxproj.filters
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Sources">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Headers">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\giscanner\giscannermodule.c"><Filter>Sources</Filter></ClCompile>
-    <ClCompile Include="..\..\scannerlexer.c"><Filter>Sources</Filter></ClCompile>
-    <ClCompile Include="..\..\scannerparser.c"><Filter>Sources</Filter></ClCompile>
-    <ClCompile Include="..\..\giscanner\sourcescanner.c"><Filter>Sources</Filter></ClCompile>
-  </ItemGroup>
-</Project>
diff --git a/win32/vs11/cmph-bdz-test.vcxproj b/win32/vs11/cmph-bdz-test.vcxproj
deleted file mode 100644
index 0441319..0000000
--- a/win32/vs11/cmph-bdz-test.vcxproj
+++ /dev/null
@@ -1,174 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{E41F378B-CCDD-4B1C-89C3-6D2C950FAF1A}</ProjectGuid>
-    <RootNamespace>cmphbdztest</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\girepository\cmph;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\..\girepository\cmph;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WholeProgramOptimization>false</WholeProgramOptimization>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\girepository\cmph;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\..\girepository\cmph;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\girepository\cmph-bdz-test.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="cmph.vcxproj">
-      <Project>{442c007e-d901-41da-9706-5db4afb4c06b}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/win32/vs11/cmph-bdz-test.vcxproj.filters b/win32/vs11/cmph-bdz-test.vcxproj.filters
deleted file mode 100644
index 2720d49..0000000
--- a/win32/vs11/cmph-bdz-test.vcxproj.filters
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Sources">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Headers">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\girepository\cmph-bdz-test.c">
-      <Filter>Sources</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
diff --git a/win32/vs11/cmph.vcxproj b/win32/vs11/cmph.vcxproj
deleted file mode 100644
index d7fc143..0000000
--- a/win32/vs11/cmph.vcxproj
+++ /dev/null
@@ -1,163 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{442C007E-D901-41DA-9706-5DB4AFB4C06B}</ProjectGuid>
-    <RootNamespace>cmph</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-   <ClCompile Include="..\..\girepository\cmph\bdz.c" />
-   <ClCompile Include="..\..\girepository\cmph\bdz_ph.c" />
-   <ClCompile Include="..\..\girepository\cmph\bmz8.c" />
-   <ClCompile Include="..\..\girepository\cmph\bmz.c" />
-   <ClCompile Include="..\..\girepository\cmph\brz.c" />
-   <ClCompile Include="..\..\girepository\cmph\buffer_entry.c" />
-   <ClCompile Include="..\..\girepository\cmph\buffer_manager.c" />
-   <ClCompile Include="..\..\girepository\cmph\chd.c" />
-   <ClCompile Include="..\..\girepository\cmph\chd_ph.c" />
-   <ClCompile Include="..\..\girepository\cmph\chm.c" />
-   <ClCompile Include="..\..\girepository\cmph\cmph.c" />
-   <ClCompile Include="..\..\girepository\cmph\cmph_structs.c" />
-   <ClCompile Include="..\..\girepository\cmph\compressed_rank.c" />
-   <ClCompile Include="..\..\girepository\cmph\compressed_seq.c" />
-   <ClCompile Include="..\..\girepository\cmph\fch_buckets.c" />
-   <ClCompile Include="..\..\girepository\cmph\fch.c" />
-   <ClCompile Include="..\..\girepository\cmph\graph.c" />
-   <ClCompile Include="..\..\girepository\cmph\hash.c" />
-   <ClCompile Include="..\..\girepository\cmph\jenkins_hash.c" />
-   <ClCompile Include="..\..\girepository\cmph\miller_rabin.c" />
-   <ClCompile Include="..\..\girepository\cmph\select.c" />
-   <ClCompile Include="..\..\girepository\cmph\vqueue.c" />
-   <ClCompile Include="..\..\girepository\cmph\vstack.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="gi-prebuild.vcxproj">
-      <Project>{2093d218-190e-4194-9421-3ba7cbf33b11}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/win32/vs11/cmph.vcxproj.filters b/win32/vs11/cmph.vcxproj.filters
deleted file mode 100644
index df71f98..0000000
--- a/win32/vs11/cmph.vcxproj.filters
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Sources">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Headers">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-   <ClCompile Include="..\..\girepository\cmph\bdz.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\cmph\bdz_ph.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\cmph\bmz8.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\cmph\bmz.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\cmph\brz.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\cmph\buffer_entry.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\cmph\buffer_manager.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\cmph\chd.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\cmph\chd_ph.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\cmph\chm.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\cmph\cmph.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\cmph\cmph_structs.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\cmph\compressed_rank.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\cmph\compressed_seq.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\cmph\fch_buckets.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\cmph\fch.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\cmph\graph.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\cmph\hash.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\cmph\jenkins_hash.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\cmph\miller_rabin.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\cmph\select.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\cmph\vqueue.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\cmph\vstack.c"><Filter>Source Files</Filter></ClCompile>
-  </ItemGroup>
-</Project>
diff --git a/win32/vs11/g-ir-compiler.vcxproj b/win32/vs11/g-ir-compiler.vcxproj
deleted file mode 100644
index 38b3af3..0000000
--- a/win32/vs11/g-ir-compiler.vcxproj
+++ /dev/null
@@ -1,187 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774}</ProjectGuid>
-    <RootNamespace>gircompiler</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ffi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ffi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ffi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ffi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-   <ClCompile Include="..\..\girepository\gthash.c" />
-   <ClCompile Include="..\..\girepository\girmodule.c" />
-   <ClCompile Include="..\..\girepository\girnode.c" />
-   <ClCompile Include="..\..\girepository\giroffsets.c" />
-   <ClCompile Include="..\..\girepository\girparser.c" />
-   <ClCompile Include="..\..\girepository\girwriter.c" />
-    <ClCompile Include="..\..\tools\compiler.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="cmph.vcxproj">
-      <Project>{442c007e-d901-41da-9706-5db4afb4c06b}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="girepository.vcxproj">
-      <Project>{23e28245-8fc7-4b41-b1c5-8785bd4366a7}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/win32/vs11/g-ir-compiler.vcxproj.filters b/win32/vs11/g-ir-compiler.vcxproj.filters
deleted file mode 100644
index 7b5ec8d..0000000
--- a/win32/vs11/g-ir-compiler.vcxproj.filters
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Sources">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Headers">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-   <ClCompile Include="..\..\girepository\gthash.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\girmodule.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\girnode.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\giroffsets.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\girparser.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\girwriter.c"><Filter>Source Files</Filter></ClCompile>
-    <ClCompile Include="..\..\tools\compiler.c"><Filter>Sources</Filter></ClCompile>
-  </ItemGroup>
-</Project>
diff --git a/win32/vs11/g-ir-generate.vcxproj b/win32/vs11/g-ir-generate.vcxproj
deleted file mode 100644
index 10c2ad1..0000000
--- a/win32/vs11/g-ir-generate.vcxproj
+++ /dev/null
@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{F4E6621F-A7DD-4863-8CCF-BA04DFC601E3}</ProjectGuid>
-    <RootNamespace>girgenerate</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\tools\generate.c" />
-    <ClCompile Include="..\..\girepository\girwriter.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="girepository.vcxproj">
-      <Project>{23e28245-8fc7-4b41-b1c5-8785bd4366a7}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/win32/vs11/g-ir-generate.vcxproj.filters b/win32/vs11/g-ir-generate.vcxproj.filters
deleted file mode 100644
index b3b32ef..0000000
--- a/win32/vs11/g-ir-generate.vcxproj.filters
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Sources">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Headers">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\tools\generate.c">
-      <Filter>Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\girepository\girwriter.c">
-      <Filter>Sources</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
diff --git a/win32/vs11/g-ir-inspect.vcxproj b/win32/vs11/g-ir-inspect.vcxproj
deleted file mode 100644
index cf28b30..0000000
--- a/win32/vs11/g-ir-inspect.vcxproj
+++ /dev/null
@@ -1,169 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{F4E6621F-A7DD-4863-8CCF-CA04DFC601E3}</ProjectGuid>
-    <RootNamespace>girinspect</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\tools\g-ir-inspect.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="girepository.vcxproj">
-      <Project>{23e28245-8fc7-4b41-b1c5-8785bd4366a7}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/win32/vs11/g-ir-inspect.vcxproj.filters b/win32/vs11/g-ir-inspect.vcxproj.filters
deleted file mode 100644
index 371419a..0000000
--- a/win32/vs11/g-ir-inspect.vcxproj.filters
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Sources">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Headers">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\tools\g-ir-inspect.c"><Filter>Sources</Filter></ClCompile>
-  </ItemGroup>
-</Project>
diff --git a/win32/vs11/gi-build-defines.props b/win32/vs11/gi-build-defines.props
deleted file mode 100644
index 3a7f5fe..0000000
--- a/win32/vs11/gi-build-defines.props
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ImportGroup Label="PropertySheets">
-    <Import Project="gi-version-paths.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros">
-    <GIRepositoryBuildDefines>G_IREPOSITORY_COMPILATION;DLL_EXPORT</GIRepositoryBuildDefines>
-    <GIIntrospectNMakeCmd>cd ..
-set VCInstallDir=$(VCInstallDir)
-nmake -f gi-introspection-msvc.mak CFG=$(Configuration) PREFIX=$(GlibEtcInstallRoot)</GIIntrospectNMakeCmd>
-    <GIIntrospectBuiltFiles>$(SolutionDir)\..\GIRepository-2.0.typelib;$(SolutionDir)\..\cairo-1.0.typelib</GIIntrospectBuiltFiles>
-  </PropertyGroup>
-  <PropertyGroup>
-    <_PropertySheetDisplayName>gibuilddefinesprops</_PropertySheetDisplayName>
-    <OutDir>$(SolutionDir)$(Configuration)\$(PlatformName)\bin\</OutDir>
-    <IntDir>$(SolutionDir)$(Configuration)\$(PlatformName)\obj\$(ProjectName)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..;..\..\girepository;$(GlibEtcInstallRoot)\include\gio-win32-2.0;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>HAVE_CONFIG_H;WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ForcedIncludeFiles>msvc_recommended_pragmas.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <AdditionalOptions>/d2Zi+ %(AdditionalOptions)</AdditionalOptions>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>gio-2.0.lib;gobject-2.0.lib;gmodule-2.0.lib;gthread-2.0.lib;glib-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(GlibEtcInstallRoot)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalOptions Condition="'$(VisualStudioVersion)|$(Platform)'=='11.0|x64'">/HIGHENTROPYVA %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalOptions Condition="'$(VisualStudioVersion)|$(Platform)'=='12.0|x64'">/HIGHENTROPYVA %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalOptions Condition="'$(VisualStudioVersion)|$(Platform)'=='14.0|x64'">/HIGHENTROPYVA %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalOptions Condition="'$(VisualStudioVersion)|$(Platform)'=='15.0|x64'">/HIGHENTROPYVA %(AdditionalOptions)</AdditionalOptions>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <BuildMacro Include="GIRepositoryBuildDefines">
-      <Value>$(GIRepositoryBuildDefines)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GIIntrospectNMakeCmd">
-      <Value>$(GIIntrospectNMakeCmd)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GIIntrospectBuiltFiles">
-      <Value>$(GIIntrospectBuiltFiles)</Value>
-    </BuildMacro>
-  </ItemGroup>
-</Project>
diff --git a/win32/vs11/gi-gen-srcs.props b/win32/vs11/gi-gen-srcs.props
deleted file mode 100644
index 0a5d2c6..0000000
--- a/win32/vs11/gi-gen-srcs.props
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ImportGroup Label="PropertySheets">
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros">
-    <CopyConfigH>copy ..\..\config.h.win32 ..\..\config.h</CopyConfigH>
-    <GenToolsScripts>$(PythonDir)\python ..\gen-win32-g-ir-tools.py</GenToolsScripts>
-    <GenToolsScriptsX64>$(PythonDirX64)\python ..\gen-win32-g-ir-tools.py</GenToolsScriptsX64>
-  </PropertyGroup>
-  <PropertyGroup>
-    <_PropertySheetDisplayName>gigensrcsprops</_PropertySheetDisplayName>
-  </PropertyGroup>
-  <ItemGroup>
-    <BuildMacro Include="CopyConfigH">
-      <Value>$(CopyConfigH)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GenToolsScripts">
-      <Value>$(GenToolsScripts)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GenToolsScriptsX64">
-      <Value>$(GenToolsScriptsX64)</Value>
-    </BuildMacro>
-  </ItemGroup>
-</Project>
diff --git a/win32/vs11/gi-install.props b/win32/vs11/gi-install.props
deleted file mode 100644
index 7643cbd..0000000
--- a/win32/vs11/gi-install.props
+++ /dev/null
@@ -1,202 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ImportGroup Label="PropertySheets">
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros">
-    <BinDir>$(SolutionDir)$(Configuration)\$(Platform)\bin</BinDir>
-    <GIDoInstall>
-mkdir $(CopyDir)
-mkdir $(CopyDir)\bin
-copy $(BinDir)\$(LibGIDllPrefix)girepository$(LibGIDllSuffix).dll $(CopyDir)\bin
-copy $(BinDir)\$(LibGIDllPrefix)girepository$(LibGIDllSuffix).pdb $(CopyDir)\bin
-copy $(BinDir)\g-ir-compiler.exe $(CopyDir)\bin
-copy $(BinDir)\g-ir-compiler.pdb $(CopyDir)\bin
-copy $(BinDir)\g-ir-generate.exe $(CopyDir)\bin
-copy $(BinDir)\g-ir-generate.pdb $(CopyDir)\bin
-copy $(BinDir)\g-ir-inspect.exe $(CopyDir)\bin
-copy $(BinDir)\g-ir-inspect.pdb $(CopyDir)\bin
-copy ..\..\tools\g-ir-annotation-tool $(CopyDir)\bin
-copy ..\..\tools\g-ir-doc-tool $(CopyDir)\bin
-copy ..\..\tools\g-ir-scanner $(CopyDir)\bin
-copy $(BinDir)\glib-print.exe $(CopyDir)\bin
-copy $(BinDir)\glib-print.pdb $(CopyDir)\bin
-mkdir $(CopyDir)\include\gobject-introspection-1.0\girepository
-copy ..\..\girepository\giarginfo.h $(CopyDir)\include\gobject-introspection-1.0\girepository\giarginfo.h
-copy ..\..\girepository\gibaseinfo.h $(CopyDir)\include\gobject-introspection-1.0\girepository\gibaseinfo.h
-copy ..\..\girepository\gicallableinfo.h $(CopyDir)\include\gobject-introspection-1.0\girepository\gicallableinfo.h
-copy ..\..\girepository\giconstantinfo.h $(CopyDir)\include\gobject-introspection-1.0\girepository\giconstantinfo.h
-copy ..\..\girepository\gienuminfo.h $(CopyDir)\include\gobject-introspection-1.0\girepository\gienuminfo.h
-copy ..\..\girepository\gifieldinfo.h $(CopyDir)\include\gobject-introspection-1.0\girepository\gifieldinfo.h
-copy ..\..\girepository\gifunctioninfo.h $(CopyDir)\include\gobject-introspection-1.0\girepository\gifunctioninfo.h
-copy ..\..\girepository\giinterfaceinfo.h $(CopyDir)\include\gobject-introspection-1.0\girepository\giinterfaceinfo.h
-copy ..\..\girepository\giobjectinfo.h $(CopyDir)\include\gobject-introspection-1.0\girepository\giobjectinfo.h
-copy ..\..\girepository\gipropertyinfo.h $(CopyDir)\include\gobject-introspection-1.0\girepository\gipropertyinfo.h
-copy ..\..\girepository\giregisteredtypeinfo.h $(CopyDir)\include\gobject-introspection-1.0\girepository\giregisteredtypeinfo.h
-copy ..\..\girepository\girepository.h $(CopyDir)\include\gobject-introspection-1.0\girepository\girepository.h
-copy ..\..\girepository\girffi.h $(CopyDir)\include\gobject-introspection-1.0\girepository\girffi.h
-copy ..\..\girepository\gisignalinfo.h $(CopyDir)\include\gobject-introspection-1.0\girepository\gisignalinfo.h
-copy ..\..\girepository\gistructinfo.h $(CopyDir)\include\gobject-introspection-1.0\girepository\gistructinfo.h
-copy ..\..\girepository\gitypeinfo.h $(CopyDir)\include\gobject-introspection-1.0\girepository\gitypeinfo.h
-copy ..\..\girepository\gitypelib.h $(CopyDir)\include\gobject-introspection-1.0\girepository\gitypelib.h
-copy ..\..\girepository\gitypes.h $(CopyDir)\include\gobject-introspection-1.0\girepository\gitypes.h
-copy ..\..\girepository\giunioninfo.h $(CopyDir)\include\gobject-introspection-1.0\girepository\giunioninfo.h
-copy ..\..\girepository\giversionmacros.h $(CopyDir)\include\gobject-introspection-1.0\girepository\giversionmacros.h
-copy ..\..\girepository\givfuncinfo.h $(CopyDir)\include\gobject-introspection-1.0\girepository\givfuncinfo.h
-mkdir $(CopyDir)\lib\gobject-introspection\giscanner
-mkdir $(CopyDir)\lib\gobject-introspection\giscanner\collections
-mkdir $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates
-mkdir $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C
-mkdir $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs
-mkdir $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python
-copy ..\..\giscanner\__init__.py $(CopyDir)\lib\gobject-introspection\giscanner
-copy ..\..\giscanner\annotationmain.py $(CopyDir)\lib\gobject-introspection\giscanner
-copy ..\..\giscanner\annotationparser.py $(CopyDir)\lib\gobject-introspection\giscanner
-copy ..\..\giscanner\ast.py $(CopyDir)\lib\gobject-introspection\giscanner
-copy ..\..\giscanner\cachestore.py $(CopyDir)\lib\gobject-introspection\giscanner
-copy ..\..\giscanner\ccompiler.py $(CopyDir)\lib\gobject-introspection\giscanner
-copy ..\..\giscanner\codegen.py $(CopyDir)\lib\gobject-introspection\giscanner
-copy ..\..\giscanner\docmain.py $(CopyDir)\lib\gobject-introspection\giscanner
-copy ..\..\giscanner\docwriter.py $(CopyDir)\lib\gobject-introspection\giscanner
-copy ..\..\giscanner\dumper.py $(CopyDir)\lib\gobject-introspection\giscanner
-copy ..\..\giscanner\introspectablepass.py $(CopyDir)\lib\gobject-introspection\giscanner
-copy ..\..\giscanner\girparser.py $(CopyDir)\lib\gobject-introspection\giscanner
-copy ..\..\giscanner\girwriter.py $(CopyDir)\lib\gobject-introspection\giscanner
-copy ..\..\giscanner\gdumpparser.py $(CopyDir)\lib\gobject-introspection\giscanner
-copy ..\..\giscanner\libtoolimporter.py $(CopyDir)\lib\gobject-introspection\giscanner
-copy ..\..\giscanner\maintransformer.py $(CopyDir)\lib\gobject-introspection\giscanner
-copy ..\..\giscanner\message.py $(CopyDir)\lib\gobject-introspection\giscanner
-copy ..\..\giscanner\msvccompiler.py $(CopyDir)\lib\gobject-introspection\giscanner
-copy ..\..\giscanner\shlibs.py $(CopyDir)\lib\gobject-introspection\giscanner
-copy ..\..\giscanner\scannermain.py $(CopyDir)\lib\gobject-introspection\giscanner
-copy ..\..\giscanner\sectionparser.py $(CopyDir)\lib\gobject-introspection\giscanner
-copy ..\..\giscanner\sourcescanner.py $(CopyDir)\lib\gobject-introspection\giscanner
-copy ..\..\giscanner\testcodegen.py $(CopyDir)\lib\gobject-introspection\giscanner
-copy ..\..\giscanner\transformer.py $(CopyDir)\lib\gobject-introspection\giscanner
-copy ..\..\giscanner\utils.py $(CopyDir)\lib\gobject-introspection\giscanner
-copy ..\..\giscanner\xmlwriter.py $(CopyDir)\lib\gobject-introspection\giscanner
-copy ..\..\giscanner\collections\__init__.py $(CopyDir)\lib\gobject-introspection\giscanner\collections
-copy ..\..\giscanner\collections\counter.py $(CopyDir)\lib\gobject-introspection\giscanner\collections
-copy ..\..\giscanner\collections\ordereddict.py $(CopyDir)\lib\gobject-introspection\giscanner\collections
-copy ..\..\giscanner\doctemplates\base.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates
-copy ..\..\giscanner\doctemplates\class.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates
-copy ..\..\giscanner\doctemplates\namespace.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates
-copy ..\..\giscanner\doctemplates\C\callback.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C
-copy ..\..\giscanner\doctemplates\C\class.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C
-copy ..\..\giscanner\doctemplates\C\constructor.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C
-copy ..\..\giscanner\doctemplates\C\default.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C
-copy ..\..\giscanner\doctemplates\C\enum.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C
-copy ..\..\giscanner\doctemplates\C\function.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C
-copy ..\..\giscanner\doctemplates\C\field.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C
-copy ..\..\giscanner\doctemplates\C\interface.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C
-copy ..\..\giscanner\doctemplates\C\method.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C
-copy ..\..\giscanner\doctemplates\C\namespace.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C
-copy ..\..\giscanner\doctemplates\C\property.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C
-copy ..\..\giscanner\doctemplates\C\record.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C
-copy ..\..\giscanner\doctemplates\C\signal.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C
-copy ..\..\giscanner\doctemplates\C\vfunc.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C
-copy ..\..\giscanner\doctemplates\Python\callback.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python
-copy ..\..\giscanner\doctemplates\Python\class.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python
-copy ..\..\giscanner\doctemplates\Python\constructor.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python
-copy ..\..\giscanner\doctemplates\Python\default.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python
-copy ..\..\giscanner\doctemplates\Python\enum.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python
-copy ..\..\giscanner\doctemplates\Python\function.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python
-copy ..\..\giscanner\doctemplates\Python\field.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python
-copy ..\..\giscanner\doctemplates\Python\interface.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python
-copy ..\..\giscanner\doctemplates\Python\method.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python
-copy ..\..\giscanner\doctemplates\Python\namespace.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python
-copy ..\..\giscanner\doctemplates\Python\property.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python
-copy ..\..\giscanner\doctemplates\Python\record.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python
-copy ..\..\giscanner\doctemplates\Python\signal.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python
-copy ..\..\giscanner\doctemplates\Python\vfunc.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python
-copy ..\..\giscanner\doctemplates\Gjs\callback.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs
-copy ..\..\giscanner\doctemplates\Gjs\class.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs
-copy ..\..\giscanner\doctemplates\Gjs\constructor.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs
-copy ..\..\giscanner\doctemplates\Gjs\default.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs
-copy ..\..\giscanner\doctemplates\Gjs\enum.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs
-copy ..\..\giscanner\doctemplates\Gjs\function.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs
-copy ..\..\giscanner\doctemplates\Gjs\field.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs
-copy ..\..\giscanner\doctemplates\Gjs\interface.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs
-copy ..\..\giscanner\doctemplates\Gjs\method.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs
-copy ..\..\giscanner\doctemplates\Gjs\namespace.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs
-copy ..\..\giscanner\doctemplates\Gjs\property.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs
-copy ..\..\giscanner\doctemplates\Gjs\record.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs
-copy ..\..\giscanner\doctemplates\Gjs\signal.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs
-copy ..\..\giscanner\doctemplates\Gjs\vfunc.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs
-mkdir $(CopyDir)\share\gobject-introspection-1.0\tests
-copy ..\..\tests\gitestmacros.h $(CopyDir)\share\gobject-introspection-1.0\tests
-copy ..\..\tests\gimarshallingtests.c $(CopyDir)\share\gobject-introspection-1.0\tests
-copy ..\..\tests\gimarshallingtests.h $(CopyDir)\share\gobject-introspection-1.0\tests
-copy ..\..\tests\scanner\regress.c $(CopyDir)\share\gobject-introspection-1.0\tests
-copy ..\..\tests\scanner\regress.h $(CopyDir)\share\gobject-introspection-1.0\tests
-copy ..\..\tests\scanner\annotation.c $(CopyDir)\share\gobject-introspection-1.0\tests
-copy ..\..\tests\scanner\annotation.h $(CopyDir)\share\gobject-introspection-1.0\tests
-copy ..\..\tests\scanner\foo.c $(CopyDir)\share\gobject-introspection-1.0\tests
-copy ..\..\tests\scanner\foo.h $(CopyDir)\share\gobject-introspection-1.0\tests
-copy ..\..\tests\scanner\drawable.c $(CopyDir)\share\gobject-introspection-1.0\tests
-copy ..\..\tests\scanner\drawable.h $(CopyDir)\share\gobject-introspection-1.0\tests
-copy ..\..\tests\scanner\warnlib.c $(CopyDir)\share\gobject-introspection-1.0\tests
-copy ..\..\tests\scanner\warnlib.h $(CopyDir)\share\gobject-introspection-1.0\tests
-copy ..\..\tests\scanner\utility.c $(CopyDir)\share\gobject-introspection-1.0\tests
-copy ..\..\tests\scanner\utility.h $(CopyDir)\share\gobject-introspection-1.0\tests
-copy ..\everything.c $(CopyDir)\share\gobject-introspection-1.0\tests
-copy ..\everything.h $(CopyDir)\share\gobject-introspection-1.0\tests
-copy $(BinDir)\_giscanner.pyd $(CopyDir)\lib\gobject-introspection\giscanner
-copy $(BinDir)\_giscanner.pdb $(CopyDir)\lib\gobject-introspection\giscanner
-mkdir $(CopyDir)\share\gobject-introspection-$(ApiVersion)
-copy ..\..\girepository\gdump.c $(CopyDir)\share\gobject-introspection-$(ApiVersion)
-mkdir $(CopyDir)\lib
-copy $(BinDir)\girepository-$(ApiVersion).lib $(CopyDir)\lib
-mkdir $(CopyDir)\share\gir-$(ApiVersion)
-copy ..\cairo-1.0.gir $(CopyDir)\share\gir-$(ApiVersion)
-copy ..\fontconfig-2.0.gir $(CopyDir)\share\gir-$(ApiVersion)
-copy ..\freetype2-2.0.gir $(CopyDir)\share\gir-$(ApiVersion)
-copy ..\Gio-2.0.gir $(CopyDir)\share\gir-$(ApiVersion)
-copy ..\GIRepository-2.0.gir $(CopyDir)\share\gir-$(ApiVersion)
-copy ..\GL-1.0.gir $(CopyDir)\share\gir-$(ApiVersion)
-copy ..\GLib-2.0.gir $(CopyDir)\share\gir-$(ApiVersion)
-copy ..\GModule-2.0.gir $(CopyDir)\share\gir-$(ApiVersion)
-copy ..\GObject-2.0.gir $(CopyDir)\share\gir-$(ApiVersion)
-copy ..\libxml2-2.0.gir $(CopyDir)\share\gir-$(ApiVersion)
-copy ..\win32-1.0.gir $(CopyDir)\share\gir-$(ApiVersion)
-mkdir $(CopyDir)\lib\girepository-$(ApiVersion)
-copy ..\cairo-1.0.typelib $(CopyDir)\lib\girepository-$(ApiVersion)
-copy ..\fontconfig-2.0.typelib $(CopyDir)\lib\girepository-$(ApiVersion)
-copy ..\freetype2-2.0.typelib $(CopyDir)\lib\girepository-$(ApiVersion)
-copy ..\Gio-2.0.typelib $(CopyDir)\lib\girepository-$(ApiVersion)
-copy ..\GIRepository-2.0.typelib $(CopyDir)\lib\girepository-$(ApiVersion)
-copy ..\GL-1.0.typelib $(CopyDir)\lib\girepository-$(ApiVersion)
-copy ..\GLib-2.0.typelib $(CopyDir)\lib\girepository-$(ApiVersion)
-copy ..\GModule-2.0.typelib $(CopyDir)\lib\girepository-$(ApiVersion)
-copy ..\GObject-2.0.typelib $(CopyDir)\lib\girepository-$(ApiVersion)
-copy ..\libxml2-2.0.typelib $(CopyDir)\lib\girepository-$(ApiVersion)
-copy ..\win32-1.0.typelib $(CopyDir)\lib\girepository-$(ApiVersion)
-mkdir $(CopyDir)\lib\pkgconfig
-copy ..\gobject-introspection-1.0.pc $(CopyDir)\lib\pkgconfig
-copy ..\gobject-introspection-no-export-1.0.pc $(CopyDir)\lib\pkgconfig
-    </GIDoInstall>
-    <GIPCFiles>..\gobject-introspection-1.0.pc;..\gobject-introspection-no-export-1.0.pc</GIPCFiles>
-    <GIGenPC>$(PythonDir)\python.exe ..\gipc.py --version=$(GIVersion) --prefix=$(CopyDir)</GIGenPC>
-    <GIGenPCX64>$(PythonDirX64)\python.exe ..\gipc.py --version=$(GIVersion) --prefix=$(CopyDir)</GIGenPCX64>
-  </PropertyGroup>
-  <PropertyGroup>
-    <_PropertySheetDisplayName>giinstallprops</_PropertySheetDisplayName>
-  </PropertyGroup>
-  <ItemGroup>
-    <BuildMacro Include="BinDir">
-      <Value>$(BinDir)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GIDoInstall">
-      <Value>$(GIDoInstall)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GIPCFiles">
-      <Value>$(GIPCFiles)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GIGenPC">
-      <Value>$(GIGenPC)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GIGenPCX64">
-      <Value>$(GIGenPCX64)</Value>
-    </BuildMacro>
-  </ItemGroup>
-</Project>
diff --git a/win32/vs11/gi-install.vcxproj b/win32/vs11/gi-install.vcxproj
deleted file mode 100644
index adc069a..0000000
--- a/win32/vs11/gi-install.vcxproj
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{2093D218-190E-4194-9421-3BA7CBF33B10}</ProjectGuid>
-    <RootNamespace>install</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Utility</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Utility</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Utility</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Utility</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-install.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-install.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-install.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-install.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <OutDir Condition="'$(Configuration)'=='Debug'">$(GlibEtcInstallRoot)\</OutDir>
-    <ExtensionsToDeleteOnClean Condition="'$(Configuration)'=='Debug'" />
-    <OutDir Condition="'$(Configuration)'=='Release'">$(GlibEtcInstallRoot)\</OutDir>
-    <ExtensionsToDeleteOnClean Condition="'$(Configuration)'=='Release'" />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <CustomBuild Include="..\..\config.h.win32">
-      <Message Condition="'$(Configuration)'=='Debug'">Installing Build Results...</Message>
-      <AdditionalInputs Condition="'$(Configuration)'=='Debug'">$(GIPCFiles)</AdditionalInputs>
-      <Command Condition="'$(Configuration)'=='Debug'">$(GIDoInstall)</Command>
-      <Outputs Condition="'$(Configuration)'=='Debug'">some_random_file;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)'=='Release'">Installing Build Results...</Message>
-      <AdditionalInputs Condition="'$(Configuration)'=='Release'">$(GIPCFiles)</AdditionalInputs>
-      <Command Condition="'$(Configuration)'=='Release'">$(GIDoInstall)</Command>
-      <Outputs Condition="'$(Configuration)'=='Release'">some_random_file;%(Outputs)</Outputs>
-    </CustomBuild>
-    <CustomBuild Include="..\gipc.py">
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating .pc files...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GIGenPC)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GIPCFiles);%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Generating .pc files...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GIGenPCX64)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GIPCFiles);%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Generating .pc files...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GIGenPC)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GIPCFiles);%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Generating .pc files...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GIGenPCX64)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GIPCFiles);%(Outputs)</Outputs>
-    </CustomBuild>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="g-ir-inspect.vcxproj">
-      <Project>{f4e6621f-a7dd-4863-8ccf-ca04dfc601e3}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="g-ir-compiler.vcxproj">
-      <Project>{5dcb55ce-f32c-4c77-8bf4-b4dad3ec7774}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="g-ir-generate.vcxproj">
-      <Project>{f4e6621f-a7dd-4863-8ccf-ba04dfc601e3}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="girepository.vcxproj">
-      <Project>{23e28245-8fc7-4b41-b1c5-8785bd4366a7}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="_giscanner.vcxproj">
-      <Project>{8311394f-9114-4c97-80f2-51bcaba054c9}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="gi-introspect.vcxproj">
-      <Project>{7a36674c-379d-4989-a978-07124e5f852c}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/win32/vs11/gi-install.vcxproj.filters b/win32/vs11/gi-install.vcxproj.filters
deleted file mode 100644
index 590ad10..0000000
--- a/win32/vs11/gi-install.vcxproj.filters
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <CustomBuild Include="..\..\config.h.win32"><Filter>Resource Files</Filter></CustomBuild>
-    <CustomBuild Include="..\gipc.py"><Filter>Resource Files</Filter></CustomBuild>
-  </ItemGroup>
-</Project>
diff --git a/win32/vs11/gi-introspect.vcxproj b/win32/vs11/gi-introspect.vcxproj
deleted file mode 100644
index 1d58fcd..0000000
--- a/win32/vs11/gi-introspect.vcxproj
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{7A36674C-379D-4989-A978-07124E5F852C}</ProjectGuid>
-    <RootNamespace>giintrospect</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <NMakeBuildCommandLine>$(GIIntrospectNMakeCmd) $(IntrospectPythonParam)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>$(GIIntrospectNMakeCmd) $(IntrospectPythonParam) clean all</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>$(GIIntrospectNMakeCmd) $(IntrospectPythonParam) clean</NMakeCleanCommandLine>
-    <NMakeOutput>$(GIIntrospectBuiltFiles)</NMakeOutput>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <NMakeBuildCommandLine>$(GIIntrospectNMakeCmd) $(IntrospectPythonParam)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>$(GIIntrospectNMakeCmd) $(IntrospectPythonParam) clean all</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>$(GIIntrospectNMakeCmd) $(IntrospectPythonParam) clean</NMakeCleanCommandLine>
-    <NMakeOutput>$(GIIntrospectBuiltFiles)</NMakeOutput>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <NMakeBuildCommandLine>$(GIIntrospectNMakeCmd) $(IntrospectPythonParamX64)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>$(GIIntrospectNMakeCmd) $(IntrospectPythonParamX64) clean all</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>$(GIIntrospectNMakeCmd) $(IntrospectPythonParamX64) clean</NMakeCleanCommandLine>
-    <NMakeOutput>$(GIIntrospectBuiltFiles)</NMakeOutput>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <NMakeBuildCommandLine>$(GIIntrospectNMakeCmd) $(IntrospectPythonParamX64)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>$(GIIntrospectNMakeCmd) $(IntrospectPythonParamX64) clean all</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>$(GIIntrospectNMakeCmd) $(IntrospectPythonParamX64) clean</NMakeCleanCommandLine>
-    <NMakeOutput>$(GIIntrospectBuiltFiles)</NMakeOutput>
-  </PropertyGroup>
-  <ItemGroup>
-    <ProjectReference Include="g-ir-compiler.vcxproj">
-      <Project>{5dcb55ce-f32c-4c77-8bf4-b4dad3ec7774}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="g-ir-generate.vcxproj">
-      <Project>{f4e6621f-a7dd-4863-8ccf-ba04dfc601e3}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="girepository.vcxproj">
-      <Project>{23e28245-8fc7-4b41-b1c5-8785bd4366a7}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="_giscanner.vcxproj">
-      <Project>{8311394f-9114-4c97-80f2-51bcaba054c9}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/win32/vs11/gi-prebuild.vcxproj b/win32/vs11/gi-prebuild.vcxproj
deleted file mode 100644
index 239cd34..0000000
--- a/win32/vs11/gi-prebuild.vcxproj
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{2093D218-190E-4194-9421-3BA7CBF33B11}</ProjectGuid>
-    <RootNamespace>giprebuild</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Utility</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Utility</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Utility</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Utility</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-gen-srcs.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-gen-srcs.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-gen-srcs.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-gen-srcs.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <ExtensionsToDeleteOnClean Condition="'$(Configuration)'=='Debug'" />
-    <ExtensionsToDeleteOnClean Condition="'$(Configuration)'=='Release'" />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <CustomBuild Include="..\..\config.h.win32">
-      <Message Condition="'$(Configuration)'=='Debug'">Copying config.h from config.h.win32...</Message>
-      <Command Condition="'$(Configuration)'=='Debug'">$(CopyConfigH)</Command>
-      <Outputs Condition="'$(Configuration)'=='Debug'">..\..\config.h;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)'=='Release'">Copying config.h from config.h.win32...</Message>
-      <Command Condition="'$(Configuration)'=='Release'">$(CopyConfigH)</Command>
-      <Outputs Condition="'$(Configuration)'=='Release'">..\..\config.h;%(Outputs)</Outputs>
-    </CustomBuild>
-    <CustomBuild Include="..\..\tools\g-ir-tool-template.in">
-      <Message Condition="'$(Configuration)'=='Debug'">Generating Tools Scripts...</Message>
-      <Command Condition="'$(Configuration)'=='Debug'">$(GenToolsScripts)</Command>
-      <Message Condition="'$(Configuration)'=='Release'">Generating Tools Scripts...</Message>
-      <Command Condition="'$(Configuration)'=='Release'">$(GenToolsScripts)</Command>
-      <Outputs Condition="'$(Configuration)'=='Release'">..\..\tools\g-ir-scanner;..\..\tools\g-ir-doc-tool;..\..\tools\g-ir-annotation-tool;%(Outputs)</Outputs>
-    </CustomBuild>
-  </ItemGroup>
-  <ItemGroup>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/win32/vs11/gi-version-paths.props b/win32/vs11/gi-version-paths.props
deleted file mode 100644
index 07f9208..0000000
--- a/win32/vs11/gi-version-paths.props
+++ /dev/null
@@ -1,81 +0,0 @@
-<?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>11</VSVer>
-    <GlibEtcInstallRoot>$(SolutionDir)\..\..\..\vs$(VSVer)\$(Platform)</GlibEtcInstallRoot>
-    <CopyDir>$(GlibEtcInstallRoot)</CopyDir>
-    <!-- PythonDir needs to point to a 32-bit/x86 Python 2.7/3.3+ installation -->
-    <PythonDir Condition="'$(VisualStudioVersion)' == '10.0'">c:\\python34</PythonDir>
-    <PythonDir Condition="'$(VisualStudioVersion)' == '11.0'">c:\\python34</PythonDir>
-    <PythonDir Condition="'$(VisualStudioVersion)' == '12.0'">c:\\python34</PythonDir>
-    <PythonDir Condition="'$(VisualStudioVersion)' == '14.0'">c:\\python36</PythonDir>
-    <PythonDir Condition="'$(VisualStudioVersion)' == '15.0'">c:\\python36</PythonDir>
-    <!-- PythonDirX64 needs to point to an x86-64/x64 Python 2.7/3.3+ installation -->
-    <PythonDirX64>$(PythonDir).x64</PythonDirX64>
-    <IntrospectPythonParam>PYTHON=$(PythonDir)\python.exe</IntrospectPythonParam>
-    <IntrospectPythonParamX64>PYTHON=$(PythonDirX64)\python.exe</IntrospectPythonParamX64>
-    <GIVersion>1.56.1</GIVersion>
-    <BASE_GI_DIR>$(SolutionDir)\..\..</BASE_GI_DIR>
-    <ApiVersion>1.0</ApiVersion>
-    <DefDir>$(SolutionDir)$(Configuration)\$(Platform)\obj\$(ProjectName)</DefDir>
-    <LibGILibtoolCompatibleDllPrefix>lib</LibGILibtoolCompatibleDllPrefix>
-    <LibGILibtoolCompatibleDllSuffix>-$(ApiVersion)-0</LibGILibtoolCompatibleDllSuffix>
-    <LibGISeparateVSDllPrefix />
-    <LibGISeparateVSDllSuffix>-1-vs$(VSVer)</LibGISeparateVSDllSuffix>
-    <LibGIDllPrefix>$(LibGISeparateVSDllPrefix)</LibGIDllPrefix>
-    <LibGIDllSuffix>$(LibGISeparateVSDllSuffix)</LibGIDllSuffix>
-  </PropertyGroup>
-  <PropertyGroup>
-    <_PropertySheetDisplayName>giversionpathsprops</_PropertySheetDisplayName>
-  </PropertyGroup>
-  <ItemGroup>
-    <BuildMacro Include="VSVer">
-      <Value>$(VSVer)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GlibEtcInstallRoot">
-      <Value>$(GlibEtcInstallRoot)</Value>
-    </BuildMacro>
-    <BuildMacro Include="CopyDir">
-      <Value>$(CopyDir)</Value>
-    </BuildMacro>
-    <BuildMacro Include="PythonDir">
-      <Value>$(PythonDir)</Value>
-    </BuildMacro>
-    <BuildMacro Include="PythonDirX64">
-      <Value>$(PythonDirX64)</Value>
-    </BuildMacro>
-    <BuildMacro Include="IntrospectPythonParam">
-      <Value>$(IntrospectPythonParam)</Value>
-    </BuildMacro>
-    <BuildMacro Include="IntrospectPythonParamX64">
-      <Value>$(IntrospectPythonParamX64)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GIVersion">
-      <Value>$(GIVersion)</Value>
-    </BuildMacro>
-    <BuildMacro Include="BASE_GI_DIR">
-      <Value>$(BASE_GI_DIR)</Value>
-    </BuildMacro>
-    <BuildMacro Include="ApiVersion">
-      <Value>$(ApiVersion)</Value>
-    </BuildMacro>
-    <BuildMacro Include="LibGILibtoolCompatibleDllPrefix">
-      <Value>$(LibGILibtoolCompatibleDllPrefix)</Value>
-    </BuildMacro>
-    <BuildMacro Include="LibGILibtoolCompatibleDllSuffix">
-      <Value>$(LibGILibtoolCompatibleDllSuffix)</Value>
-    </BuildMacro>
-    <BuildMacro Include="LibGISeparateVSDllPrefix">
-      <Value>$(LibGISeparateVSDllPrefix)</Value>
-    </BuildMacro>
-    <BuildMacro Include="LibGISeparateVSDllSuffix">
-      <Value>$(LibGISeparateVSDllSuffix)</Value>
-    </BuildMacro>
-    <BuildMacro Include="LibGIDllPrefix">
-      <Value>$(LibGIDllPrefix)</Value>
-    </BuildMacro>
-    <BuildMacro Include="LibGIDllSuffix">
-      <Value>$(LibGIDllSuffix)</Value>
-    </BuildMacro>
-  </ItemGroup>
-</Project>
diff --git a/win32/vs11/girepository.vcxproj b/win32/vs11/girepository.vcxproj
deleted file mode 100644
index b448967..0000000
--- a/win32/vs11/girepository.vcxproj
+++ /dev/null
@@ -1,214 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{23E28245-8FC7-4B41-B1C5-8785BD4366A7}</ProjectGuid>
-    <RootNamespace>girepository</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\girepository;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;$(GIRepositoryBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ffi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).dll</OutputFile>
-      <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\..\girepository;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>$(GIRepositoryBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ffi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).dll</OutputFile>
-      <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\girepository;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;$(GIRepositoryBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ffi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).dll</OutputFile>
-      <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\..\girepository;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>$(GIRepositoryBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ffi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).dll</OutputFile>
-      <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-   <ClCompile Include="..\..\girepository\gdump.c" />
-   <ClCompile Include="..\..\girepository\giarginfo.c" />
-   <ClCompile Include="..\..\girepository\gibaseinfo.c" />
-   <ClCompile Include="..\..\girepository\gicallableinfo.c" />
-   <ClCompile Include="..\..\girepository\giconstantinfo.c" />
-   <ClCompile Include="..\..\girepository\gienuminfo.c" />
-   <ClCompile Include="..\..\girepository\gifieldinfo.c" />
-   <ClCompile Include="..\..\girepository\gifunctioninfo.c" />
-   <ClCompile Include="..\..\girepository\ginvoke.c" />
-   <ClCompile Include="..\..\girepository\giinterfaceinfo.c" />
-   <ClCompile Include="..\..\girepository\giobjectinfo.c" />
-   <ClCompile Include="..\..\girepository\gipropertyinfo.c" />
-   <ClCompile Include="..\..\girepository\giregisteredtypeinfo.c" />
-   <ClCompile Include="..\..\girepository\girepository.c" />
-   <ClCompile Include="..\..\girepository\girffi.c" />
-   <ClCompile Include="..\..\girepository\gisignalinfo.c" />
-   <ClCompile Include="..\..\girepository\gistructinfo.c" />
-   <ClCompile Include="..\..\girepository\gitypeinfo.c" />
-   <ClCompile Include="..\..\girepository\gitypelib.c" />
-   <ClCompile Include="..\..\girepository\giunioninfo.c" />
-   <ClCompile Include="..\..\girepository\givfuncinfo.c" />
-   <ClCompile Include="..\..\girepository\gthash.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="gi-prebuild.vcxproj">
-      <Project>{2093d218-190e-4194-9421-3ba7cbf33b11}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="cmph.vcxproj">
-      <Project>{442c007e-d901-41da-9706-5db4afb4c06b}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/win32/vs11/girepository.vcxproj.filters b/win32/vs11/girepository.vcxproj.filters
deleted file mode 100644
index 8201353..0000000
--- a/win32/vs11/girepository.vcxproj.filters
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Sources">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Headers">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-   <ClCompile Include="..\..\girepository\gdump.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\giarginfo.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\gibaseinfo.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\gicallableinfo.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\giconstantinfo.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\gienuminfo.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\gifieldinfo.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\gifunctioninfo.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\ginvoke.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\giinterfaceinfo.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\giobjectinfo.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\gipropertyinfo.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\giregisteredtypeinfo.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\girepository.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\girffi.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\gisignalinfo.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\gistructinfo.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\gitypeinfo.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\gitypelib.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\giunioninfo.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\givfuncinfo.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\gthash.c"><Filter>Source Files</Filter></ClCompile>
-  </ItemGroup>
-</Project>
diff --git a/win32/vs11/glib-print.vcxproj b/win32/vs11/glib-print.vcxproj
deleted file mode 100644
index ea5e188..0000000
--- a/win32/vs11/glib-print.vcxproj
+++ /dev/null
@@ -1,169 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{2CCD6E09-08E7-44B9-92E6-42F0A5DBBC8B}</ProjectGuid>
-    <RootNamespace>glibprint</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\examples\glib-print.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="girepository.vcxproj">
-      <Project>{23e28245-8fc7-4b41-b1c5-8785bd4366a7}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/win32/vs11/glib-print.vcxproj.filters b/win32/vs11/glib-print.vcxproj.filters
deleted file mode 100644
index f77043c..0000000
--- a/win32/vs11/glib-print.vcxproj.filters
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Sources">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Headers">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\examples\glib-print.c">
-      <Filter>Sources</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
diff --git a/win32/vs11/gobject-introspection.sln b/win32/vs11/gobject-introspection.sln
deleted file mode 100644
index 7b4be0d..0000000
--- a/win32/vs11/gobject-introspection.sln
+++ /dev/null
@@ -1,126 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2012
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gi-prebuild", "gi-prebuild.vcxproj", "{2093D218-190E-4194-9421-3BA7CBF33B11}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cmph", "cmph.vcxproj", "{442C007E-D901-41DA-9706-5DB4AFB4C06B}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cmph-bdz-test", "cmph-bdz-test.vcxproj", "{E41F378B-CCDD-4B1C-89C3-6D2C950FAF1A}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "girepository", "girepository.vcxproj", "{23E28245-8FC7-4B41-B1C5-8785BD4366A7}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_giscanner", "_giscanner.vcxproj", "{8311394F-9114-4C97-80F2-51BCABA054C9}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glib-print", "glib-print.vcxproj", "{2CCD6E09-08E7-44B9-92E6-42F0A5DBBC8B}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "g-ir-generate", "g-ir-generate.vcxproj", "{F4E6621F-A7DD-4863-8CCF-BA04DFC601E3}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "g-ir-compiler", "g-ir-compiler.vcxproj", "{5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "g-ir-inspect", "g-ir-inspect.vcxproj", "{F4E6621F-A7DD-4863-8CCF-CA04DFC601E3}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gi-introspect", "gi-introspect.vcxproj", "{7A36674C-379D-4989-A978-07124E5F852C}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gi-install", "gi-install.vcxproj", "{2093D218-190E-4194-9421-3BA7CBF33B10}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Debug|x64 = Debug|x64
-		Release|Win32 = Release|Win32
-		Release|x64 = Release|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{2093D218-190E-4194-9421-3BA7CBF33B11}.Debug|Win32.ActiveCfg = Debug|Win32
-		{2093D218-190E-4194-9421-3BA7CBF33B11}.Debug|Win32.Build.0 = Debug|Win32
-		{2093D218-190E-4194-9421-3BA7CBF33B11}.Debug|x64.ActiveCfg = Debug|x64
-		{2093D218-190E-4194-9421-3BA7CBF33B11}.Debug|x64.Build.0 = Debug|x64
-		{2093D218-190E-4194-9421-3BA7CBF33B11}.Release|Win32.ActiveCfg = Release|Win32
-		{2093D218-190E-4194-9421-3BA7CBF33B11}.Release|Win32.Build.0 = Release|Win32
-		{2093D218-190E-4194-9421-3BA7CBF33B11}.Release|x64.ActiveCfg = Release|x64
-		{2093D218-190E-4194-9421-3BA7CBF33B11}.Release|x64.Build.0 = Release|x64
-		{442C007E-D901-41DA-9706-5DB4AFB4C06B}.Debug|Win32.ActiveCfg = Debug|Win32
-		{442C007E-D901-41DA-9706-5DB4AFB4C06B}.Debug|Win32.Build.0 = Debug|Win32
-		{442C007E-D901-41DA-9706-5DB4AFB4C06B}.Debug|x64.ActiveCfg = Debug|x64
-		{442C007E-D901-41DA-9706-5DB4AFB4C06B}.Debug|x64.Build.0 = Debug|x64
-		{442C007E-D901-41DA-9706-5DB4AFB4C06B}.Release|Win32.ActiveCfg = Release|Win32
-		{442C007E-D901-41DA-9706-5DB4AFB4C06B}.Release|Win32.Build.0 = Release|Win32
-		{442C007E-D901-41DA-9706-5DB4AFB4C06B}.Release|x64.ActiveCfg = Release|x64
-		{442C007E-D901-41DA-9706-5DB4AFB4C06B}.Release|x64.Build.0 = Release|x64
-		{E41F378B-CCDD-4B1C-89C3-6D2C950FAF1A}.Debug|Win32.ActiveCfg = Debug|Win32
-		{E41F378B-CCDD-4B1C-89C3-6D2C950FAF1A}.Debug|Win32.Build.0 = Debug|Win32
-		{E41F378B-CCDD-4B1C-89C3-6D2C950FAF1A}.Debug|x64.ActiveCfg = Debug|x64
-		{E41F378B-CCDD-4B1C-89C3-6D2C950FAF1A}.Debug|x64.Build.0 = Debug|x64
-		{E41F378B-CCDD-4B1C-89C3-6D2C950FAF1A}.Release|Win32.ActiveCfg = Release|Win32
-		{E41F378B-CCDD-4B1C-89C3-6D2C950FAF1A}.Release|Win32.Build.0 = Release|Win32
-		{E41F378B-CCDD-4B1C-89C3-6D2C950FAF1A}.Release|x64.ActiveCfg = Release|x64
-		{E41F378B-CCDD-4B1C-89C3-6D2C950FAF1A}.Release|x64.Build.0 = Release|x64
-		{23E28245-8FC7-4B41-B1C5-8785BD4366A7}.Debug|Win32.ActiveCfg = Debug|Win32
-		{23E28245-8FC7-4B41-B1C5-8785BD4366A7}.Debug|Win32.Build.0 = Debug|Win32
-		{23E28245-8FC7-4B41-B1C5-8785BD4366A7}.Debug|x64.ActiveCfg = Debug|x64
-		{23E28245-8FC7-4B41-B1C5-8785BD4366A7}.Debug|x64.Build.0 = Debug|x64
-		{23E28245-8FC7-4B41-B1C5-8785BD4366A7}.Release|Win32.ActiveCfg = Release|Win32
-		{23E28245-8FC7-4B41-B1C5-8785BD4366A7}.Release|Win32.Build.0 = Release|Win32
-		{23E28245-8FC7-4B41-B1C5-8785BD4366A7}.Release|x64.ActiveCfg = Release|x64
-		{23E28245-8FC7-4B41-B1C5-8785BD4366A7}.Release|x64.Build.0 = Release|x64
-		{8311394F-9114-4C97-80F2-51BCABA054C9}.Debug|Win32.ActiveCfg = Debug|Win32
-		{8311394F-9114-4C97-80F2-51BCABA054C9}.Debug|Win32.Build.0 = Debug|Win32
-		{8311394F-9114-4C97-80F2-51BCABA054C9}.Debug|x64.ActiveCfg = Debug|x64
-		{8311394F-9114-4C97-80F2-51BCABA054C9}.Debug|x64.Build.0 = Debug|x64
-		{8311394F-9114-4C97-80F2-51BCABA054C9}.Release|Win32.ActiveCfg = Release|Win32
-		{8311394F-9114-4C97-80F2-51BCABA054C9}.Release|Win32.Build.0 = Release|Win32
-		{8311394F-9114-4C97-80F2-51BCABA054C9}.Release|x64.ActiveCfg = Release|x64
-		{8311394F-9114-4C97-80F2-51BCABA054C9}.Release|x64.Build.0 = Release|x64
-		{2CCD6E09-08E7-44B9-92E6-42F0A5DBBC8B}.Debug|Win32.ActiveCfg = Debug|Win32
-		{2CCD6E09-08E7-44B9-92E6-42F0A5DBBC8B}.Debug|Win32.Build.0 = Debug|Win32
-		{2CCD6E09-08E7-44B9-92E6-42F0A5DBBC8B}.Debug|x64.ActiveCfg = Debug|x64
-		{2CCD6E09-08E7-44B9-92E6-42F0A5DBBC8B}.Debug|x64.Build.0 = Debug|x64
-		{2CCD6E09-08E7-44B9-92E6-42F0A5DBBC8B}.Release|Win32.ActiveCfg = Release|Win32
-		{2CCD6E09-08E7-44B9-92E6-42F0A5DBBC8B}.Release|Win32.Build.0 = Release|Win32
-		{2CCD6E09-08E7-44B9-92E6-42F0A5DBBC8B}.Release|x64.ActiveCfg = Release|x64
-		{2CCD6E09-08E7-44B9-92E6-42F0A5DBBC8B}.Release|x64.Build.0 = Release|x64
-		{F4E6621F-A7DD-4863-8CCF-BA04DFC601E3}.Debug|Win32.ActiveCfg = Debug|Win32
-		{F4E6621F-A7DD-4863-8CCF-BA04DFC601E3}.Debug|Win32.Build.0 = Debug|Win32
-		{F4E6621F-A7DD-4863-8CCF-BA04DFC601E3}.Debug|x64.ActiveCfg = Debug|x64
-		{F4E6621F-A7DD-4863-8CCF-BA04DFC601E3}.Debug|x64.Build.0 = Debug|x64
-		{F4E6621F-A7DD-4863-8CCF-BA04DFC601E3}.Release|Win32.ActiveCfg = Release|Win32
-		{F4E6621F-A7DD-4863-8CCF-BA04DFC601E3}.Release|Win32.Build.0 = Release|Win32
-		{F4E6621F-A7DD-4863-8CCF-BA04DFC601E3}.Release|x64.ActiveCfg = Release|x64
-		{F4E6621F-A7DD-4863-8CCF-BA04DFC601E3}.Release|x64.Build.0 = Release|x64
-		{F4E6621F-A7DD-4863-8CCF-CA04DFC601E3}.Debug|Win32.ActiveCfg = Debug|Win32
-		{F4E6621F-A7DD-4863-8CCF-CA04DFC601E3}.Debug|Win32.Build.0 = Debug|Win32
-		{F4E6621F-A7DD-4863-8CCF-CA04DFC601E3}.Debug|x64.ActiveCfg = Debug|x64
-		{F4E6621F-A7DD-4863-8CCF-CA04DFC601E3}.Debug|x64.Build.0 = Debug|x64
-		{F4E6621F-A7DD-4863-8CCF-CA04DFC601E3}.Release|Win32.ActiveCfg = Release|Win32
-		{F4E6621F-A7DD-4863-8CCF-CA04DFC601E3}.Release|Win32.Build.0 = Release|Win32
-		{F4E6621F-A7DD-4863-8CCF-CA04DFC601E3}.Release|x64.ActiveCfg = Release|x64
-		{F4E6621F-A7DD-4863-8CCF-CA04DFC601E3}.Release|x64.Build.0 = Release|x64
-		{5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774}.Debug|Win32.ActiveCfg = Debug|Win32
-		{5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774}.Debug|Win32.Build.0 = Debug|Win32
-		{5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774}.Debug|x64.ActiveCfg = Debug|x64
-		{5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774}.Debug|x64.Build.0 = Debug|x64
-		{5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774}.Release|Win32.ActiveCfg = Release|Win32
-		{5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774}.Release|Win32.Build.0 = Release|Win32
-		{5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774}.Release|x64.ActiveCfg = Release|x64
-		{5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774}.Release|x64.Build.0 = Release|x64
-		{7A36674C-379D-4989-A978-07124E5F852C}.Debug|Win32.ActiveCfg = Debug|Win32
-		{7A36674C-379D-4989-A978-07124E5F852C}.Debug|Win32.Build.0 = Debug|Win32
-		{7A36674C-379D-4989-A978-07124E5F852C}.Debug|x64.ActiveCfg = Debug|x64
-		{7A36674C-379D-4989-A978-07124E5F852C}.Debug|x64.Build.0 = Debug|x64
-		{7A36674C-379D-4989-A978-07124E5F852C}.Release|Win32.ActiveCfg = Release|Win32
-		{7A36674C-379D-4989-A978-07124E5F852C}.Release|Win32.Build.0 = Release|Win32
-		{7A36674C-379D-4989-A978-07124E5F852C}.Release|x64.ActiveCfg = Release|x64
-		{7A36674C-379D-4989-A978-07124E5F852C}.Release|x64.Build.0 = Release|x64
-		{2093D218-190E-4194-9421-3BA7CBF33B10}.Debug|Win32.ActiveCfg = Debug|Win32
-		{2093D218-190E-4194-9421-3BA7CBF33B10}.Debug|Win32.Build.0 = Debug|Win32
-		{2093D218-190E-4194-9421-3BA7CBF33B10}.Debug|x64.ActiveCfg = Debug|x64
-		{2093D218-190E-4194-9421-3BA7CBF33B10}.Debug|x64.Build.0 = Debug|x64
-		{2093D218-190E-4194-9421-3BA7CBF33B10}.Release|Win32.ActiveCfg = Release|Win32
-		{2093D218-190E-4194-9421-3BA7CBF33B10}.Release|Win32.Build.0 = Release|Win32
-		{2093D218-190E-4194-9421-3BA7CBF33B10}.Release|x64.ActiveCfg = Release|x64
-		{2093D218-190E-4194-9421-3BA7CBF33B10}.Release|x64.Build.0 = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/win32/vs12/Makefile.am b/win32/vs12/Makefile.am
deleted file mode 100644
index 5830d70..0000000
--- a/win32/vs12/Makefile.am
+++ /dev/null
@@ -1,36 +0,0 @@
-EXTRA_DIST = \
-	gobject-introspection.sln	\
-	gi-build-defines.props	\
-	gi-gen-srcs.props	\
-	gi-install.props	\
-	gi-version-paths.props	\
-	gi-prebuild.vcxproj	\
-	girepository.vcxproj	\
-	girepository.vcxproj.filters	\
-	cmph-bdz-test.vcxproj	\
-	cmph-bdz-test.vcxproj.filters	\
-	cmph.vcxproj	\
-	cmph.vcxproj.filters	\
-	g-ir-compiler.vcxproj	\
-	g-ir-compiler.vcxproj.filters	\
-	g-ir-generate.vcxproj	\
-	g-ir-generate.vcxproj.filters	\
-	g-ir-inspect.vcxproj	\
-	g-ir-inspect.vcxproj.filters	\
-	glib-print.vcxproj	\
-	glib-print.vcxproj.filters	\
-	_giscanner.vcxproj	\
-	_giscanner.vcxproj.filters	\
-	gi-install.vcxproj	\
-	gi-install.vcxproj.filters	\
-	gi-introspect.vcxproj	\
-	README.txt
-
-DISTCLEANFILES = $(EXTRA_DIST)
-
-MSVC_BASE_VER = 10
-MSVC_BASE_VER_LONG = 2010
-MSVC_VER = 12
-MSVC_VER_LONG = 2013
-
-include $(top_srcdir)/win32/Makefile-newvs.am
diff --git a/win32/vs12/Makefile.in b/win32/vs12/Makefile.in
deleted file mode 100644
index 0ecd59e..0000000
--- a/win32/vs12/Makefile.in
+++ /dev/null
@@ -1,585 +0,0 @@
-# Makefile.in generated by automake 1.15.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994-2017 Free Software Foundation, Inc.
-
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-# Centralized autotools file
-# Create the Visual Studio 2012/2013/2015 project files
-# from the Visual Studio 2010 project files
-
-# This autotools file, from GLib, can be used in other projects
-# that have Visual Studio build support.
-
-# Author: Fan, Chun-wei
-# November 05, 2012
-
-# MSVC_BASE_VER: Baseline MSVC 201x version to copy/process project files from (100 for 2010, 120 for 2013)
-# MSVC_BASE_VER_LONG: Long Version of baseline Visual Studio 201x version (2010, 2012, 2013, 14, 15)
-# MSVC_BASE_TOOLSET: Use if baseline MSVC toolset is not in the form v$(MSVC_BASE_VER)0, meaning v$(MSVC_BASE_TOOLSET)
-# MSVC_VER_LONG: Long Version of target Visual Studio (2012, 2013, 14 and so on)
-# MSVC_VER: Short Version of target Visual Studio (110 for 2012, 120 for 2013, 140 for 2015, 141 for 2017)
-# MSVC_TOOLSET: Use if target MSVC toolsett is not in the form v $(MSVC_VER)0, meaning v$(MSVC_TOOLSET)
-VPATH = @srcdir@
-am__is_gnu_make = { \
-  if test -z '$(MAKELEVEL)'; then \
-    false; \
-  elif test -n '$(MAKE_HOST)'; then \
-    true; \
-  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
-    true; \
-  else \
-    false; \
-  fi; \
-}
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -[dEDm]) skip_next=yes;; \
-      -[JT]) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = win32/vs12
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
-	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/python.m4 \
-	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN     " $@;
-am__v_GEN_1 = 
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 = 
-SOURCES =
-DIST_SOURCES =
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-am__DIST_COMMON = $(srcdir)/Makefile.in \
-	$(top_srcdir)/win32/Makefile-newvs.am
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CAIRO_CFLAGS = @CAIRO_CFLAGS@
-CAIRO_GIR_PACKAGE = @CAIRO_GIR_PACKAGE@
-CAIRO_LIBS = @CAIRO_LIBS@
-CAIRO_SHARED_LIBRARY = @CAIRO_SHARED_LIBRARY@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-EXPANDED_BINDIR = @EXPANDED_BINDIR@
-EXPANDED_DATADIR = @EXPANDED_DATADIR@
-EXPANDED_LIBDIR = @EXPANDED_LIBDIR@
-EXPANDED_LIBEXECDIR = @EXPANDED_LIBEXECDIR@
-EXPANDED_LOCALSTATEDIR = @EXPANDED_LOCALSTATEDIR@
-EXPANDED_SYSCONFDIR = @EXPANDED_SYSCONFDIR@
-EXTRA_LINK_FLAGS = @EXTRA_LINK_FLAGS@
-FFI_CFLAGS = @FFI_CFLAGS@
-FFI_LIBS = @FFI_LIBS@
-FFI_PC_CFLAGS = @FFI_PC_CFLAGS@
-FFI_PC_LIBS = @FFI_PC_LIBS@
-FFI_PC_PACKAGES = @FFI_PC_PACKAGES@
-FGREP = @FGREP@
-GIO_CFLAGS = @GIO_CFLAGS@
-GIO_LIBS = @GIO_LIBS@
-GIO_UNIX_CFLAGS = @GIO_UNIX_CFLAGS@
-GIO_UNIX_LIBS = @GIO_UNIX_LIBS@
-GIREPO_CFLAGS = @GIREPO_CFLAGS@
-GIREPO_LIBS = @GIREPO_LIBS@
-GIR_DIR = @GIR_DIR@
-GIR_SUFFIX = @GIR_SUFFIX@
-GI_HIDDEN_VISIBILITY_CFLAGS = @GI_HIDDEN_VISIBILITY_CFLAGS@
-GI_VERSION = @GI_VERSION@
-GLIBSRC = @GLIBSRC@
-GLIB_CFLAGS = @GLIB_CFLAGS@
-GLIB_LIBS = @GLIB_LIBS@
-GMODULE_CFLAGS = @GMODULE_CFLAGS@
-GMODULE_LIBS = @GMODULE_LIBS@
-GOBJECT_CFLAGS = @GOBJECT_CFLAGS@
-GOBJECT_INTROSPECTION_LIBDIR = @GOBJECT_INTROSPECTION_LIBDIR@
-GOBJECT_LIBS = @GOBJECT_LIBS@
-GREP = @GREP@
-GTKDOC_CHECK = @GTKDOC_CHECK@
-GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
-GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
-GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
-GTKDOC_MKPDF = @GTKDOC_MKPDF@
-GTKDOC_REBASE = @GTKDOC_REBASE@
-HTML_DIR = @HTML_DIR@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LEX = @LEX@
-LEXLIB = @LEXLIB@
-LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MKDIR_P = @MKDIR_P@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-POW_LIB = @POW_LIB@
-PYTHON = @PYTHON@
-PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
-PYTHON_INCLUDES = @PYTHON_INCLUDES@
-PYTHON_LIBS = @PYTHON_LIBS@
-PYTHON_PLATFORM = @PYTHON_PLATFORM@
-PYTHON_PREFIX = @PYTHON_PREFIX@
-PYTHON_VERSION = @PYTHON_VERSION@
-RANLIB = @RANLIB@
-SCANNER_CFLAGS = @SCANNER_CFLAGS@
-SCANNER_LIBS = @SCANNER_LIBS@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-VERSION = @VERSION@
-YACC = @YACC@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-pkgpyexecdir = @pkgpyexecdir@
-pkgpythondir = @pkgpythondir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-pyexecdir = @pyexecdir@
-pythondir = @pythondir@
-runstatedir = @runstatedir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-EXTRA_DIST = \
-	gobject-introspection.sln	\
-	gi-build-defines.props	\
-	gi-gen-srcs.props	\
-	gi-install.props	\
-	gi-version-paths.props	\
-	gi-prebuild.vcxproj	\
-	girepository.vcxproj	\
-	girepository.vcxproj.filters	\
-	cmph-bdz-test.vcxproj	\
-	cmph-bdz-test.vcxproj.filters	\
-	cmph.vcxproj	\
-	cmph.vcxproj.filters	\
-	g-ir-compiler.vcxproj	\
-	g-ir-compiler.vcxproj.filters	\
-	g-ir-generate.vcxproj	\
-	g-ir-generate.vcxproj.filters	\
-	g-ir-inspect.vcxproj	\
-	g-ir-inspect.vcxproj.filters	\
-	glib-print.vcxproj	\
-	glib-print.vcxproj.filters	\
-	_giscanner.vcxproj	\
-	_giscanner.vcxproj.filters	\
-	gi-install.vcxproj	\
-	gi-install.vcxproj.filters	\
-	gi-introspect.vcxproj	\
-	README.txt
-
-DISTCLEANFILES = $(EXTRA_DIST)
-MSVC_BASE_VER = 10
-MSVC_BASE_VER_LONG = 2010
-MSVC_VER = 12
-MSVC_VER_LONG = 2013
-@MSVC_BASE_NO_TOOLSET_SET_TRUE@MSVC_BASE_TOOLSET = $(MSVC_BASE_VER)0
-@MSVC_NO_TOOLSET_SET_TRUE@MSVC_TOOLSET = $(MSVC_VER)0
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/win32/Makefile-newvs.am $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign win32/vs12/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign win32/vs12/Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-$(top_srcdir)/win32/Makefile-newvs.am $(am__empty):
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-tags TAGS:
-
-ctags CTAGS:
-
-cscope cscopelist:
-
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am:
-
-.MAKE: install-am install-strip
-
-.PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	cscopelist-am ctags-am distclean distclean-generic \
-	distclean-libtool distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags-am uninstall uninstall-am
-
-.PRECIOUS: Makefile
-
-
-%.sln:
-	sed 's/11\.00/12\.00/g' < $(top_srcdir)/win32/vs$(MSVC_BASE_VER)/$@ > $(top_builddir)/win32/vs$(MSVC_VER)/$@.tmp
-	sed 's/$(MSVC_BASE_VER_LONG)/$(MSVC_VER_LONG)/g' < $(top_builddir)/win32/vs$(MSVC_VER)/$@.tmp > $(top_builddir)/win32/vs$(MSVC_VER)/$@
-	rm $(top_builddir)/win32/vs$(MSVC_VER)/$@.tmp
-
-%.txt:
-	sed 's/vs$(MSVC_BASE_VER)/vs$(MSVC_VER)/g' < $(top_srcdir)/win32/vs$(MSVC_BASE_VER)/$@ > $(top_builddir)/win32/vs$(MSVC_VER)/$@.tmp
-	sed 's/VS$(MSVC_BASE_VER)/VS$(MSVC_VER)/g' < $(top_builddir)/win32/vs$(MSVC_VER)/$@.tmp > $(top_builddir)/win32/vs$(MSVC_VER)/$@
-	rm $(top_builddir)/win32/vs$(MSVC_VER)/$@.tmp
-
-%.vcxproj:
-	if test -e $(top_srcdir)/win32/vs$(MSVC_BASE_VER)/$@; then \
-		sed 's/v$(MSVC_BASE_TOOLSET)/v$(MSVC_TOOLSET)/g' < $(top_srcdir)/win32/vs$(MSVC_BASE_VER)/$@ > $(top_builddir)/win32/vs$(MSVC_VER)/$@; \
-	else \
-		sed 's/v$(MSVC_BASE_TOOLSET)/v$(MSVC_TOOLSET)/g' < $(top_builddir)/win32/vs$(MSVC_BASE_VER)/$@ > $(top_builddir)/win32/vs$(MSVC_VER)/$@; \
-	fi
-
-%.props: $(top_builddir)/win32/vs$(MSVC_BASE_VER)/Makefile
-	if test -e $(top_srcdir)/win32/vs$(MSVC_BASE_VER)/$@; then \
-		sed 's/<VSVer>$(MSVC_BASE_VER)<\/VSVer>/<VSVer>$(MSVC_VER)<\/VSVer>/g' < $(top_srcdir)/win32/vs$(MSVC_BASE_VER)/$@ > $(top_builddir)/win32/vs$(MSVC_VER)/$@; \
-	else \
-		sed 's/<VSVer>$(MSVC_BASE_VER)<\/VSVer>/<VSVer>$(MSVC_VER)<\/VSVer>/g' < $(top_builddir)/win32/vs$(MSVC_BASE_VER)/$@ > $(top_builddir)/win32/vs$(MSVC_VER)/$@; \
-	fi
-
-%.vcxproj.filters:
-	if test -e $(top_srcdir)/win32/vs$(MSVC_BASE_VER)/$@; then \
-		cp $(top_srcdir)/win32/vs$(MSVC_BASE_VER)/$@ $(top_builddir)/win32/vs$(MSVC_VER)/$@; \
-	else \
-		cp $(top_builddir)/win32/vs$(MSVC_BASE_VER)/$@ $(top_builddir)/win32/vs$(MSVC_VER)/$@; \
-	fi
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/win32/vs12/README.txt b/win32/vs12/README.txt
deleted file mode 100644
index b1b5cda..0000000
--- a/win32/vs12/README.txt
+++ /dev/null
@@ -1,104 +0,0 @@
-Please do not compile this package (gobject-introspection) in paths that contain
-spaces in them-as strange problems may occur during compilation or during
-the use of the library.
-
-Please refer to the following GNOME Live! page for more detailed
-instructions on building gobject-introsecption and its dependencies
-with Visual C++:
-
-https://live.gnome.org/GTK%2B/Win32/MSVCCompilationOfGTKStack
-
-This VS12 solution and the projects it includes are intented to be used
-in a gobject-introspection source tree unpacked from a tarball. In a git checkout you
-first need to use some Unix-like environment, which will do the work for you.
-
-The required dependencies are Python 2.7 (2.7) or 3.3 (3.x) or later, GLib and LibFFI.
-It is recommended that GLib is built with Visual C++ 2010 to avoid problems cause by
-usage of different CRTs.
-
-Please refer to the README.txt file in $(GLib_src_root)\build\win32\vs12 on how to build
-GLib using Visual C++ 2010
-
-For LibFFI, please use the Centricular fork of it, which can be found at
-https://github.com/centricular/libffi.  Please refer there on building--please
-note that this will involve the use of the Meson build system and possible the
-Ninja build tool, if the Visual Studio project generation is not used or is
-unavailable.
-
-For Python, retrieving the official Windows binaries for 2.7 (2.x) or 3.3 (3.x) or later
-from http://www.python.org will do the job-be sure that the Python version that
-you downloaded matches the configuration of your build (win32 or x64/amd64).  Ensure that
-the correct path for your Python interpretor is set in gi-extra-paths.vsprops prior to
-opening the project files, or close the project files and delete all the *.user, *.sdf and
-*.suo files and reopening the project files.
-
-For building the Regress test project, cairo (and possibly cairo-gobject support)
-is needed.
-
-Set up the source tree as follows under some arbitrary top
-folder <root>:
-
-<root>\<this-gobject-introspection-source-tree>
-<root>\vs12\<PlatformName>
-
-*this* file you are now reading is thus located at
-<root>\<this-glib-source-tree>\build\win32\vs12\README.
-
-<PlatformName> is either Win32 or x64, as in VS12 project files.
-
-For LibFFI, one should also put the generated ffi.h and ffitarget.h
-into <root>\vs12\<PlatformName>\include\ and the compiled static libffi.lib
-(or copy libffi-convenience.lib into libffi.lib) into
-<root>\vs12\<PlatformName>\lib\.
-
-The libintl.h that is used for building GLib needs to be in
-<root>\vs12\<PlatformName>\include, if not already done so.
-
-A working pkg-config tool is also required-it may be obtained from
-http://www.gtk.org/download/win32.php [32-bit]
-http://www.gtk.org/download/win64.php [64-bit]
-
-*** Note! ***
-The build of G-I is now done within the project files, although it is still possible to
-do it in two stages by using the NMake Makefiles after building the projects.
-
-As there are numerous possible configurations on Python and PKG_CONFIG_PATH, note that:
--For both methods PKG_CONFIG_PATH is by default $(PREFIX)\lib\pkgconfig, where $(PREFIX)
- is by default <parent_dir_of_G-I_srcroot>\vs12\<PlatformName>.  If searching from
- more directories is desired, set the PKG_CONFIG_PATH environment variable before using
- the NMake Makefile or opening the projects, but note that $(PREFIX)\lib\pkgconfig will
- precede the set paths.
--For the Python Path using the project files: check whether the directory settings in
- gi-version-paths.vsprops under PythonDir (32-bit) or PythonDirX64 (x64) is correct.
- If the projects have been loaded by Visual Studio, close the projects and re-open them.
- You may need to delete all the *.suo, *.user and *.ncb files in this directory for
- the changes to take effect.
--For the Python Path using the NMake Makefiles: pass in PYTHON=<full_path_to_python> to
- the NMake Makefile or set it in the environment.  The bit-ness of your Python installation
- must match the configuration that you are building for.
-
-The use of Visual Studio Projects will no longer require the setting of environmental
-variables, but the following environmental variables are needed (either by using "set xxx=yyy"
-or by nmake -f gi-introspection-msvc.mak xxx=yyy) for building the introspection files (which
-should be done after successfully building the Project Files):
-
-Please see $(srcroot)\build\win32\gi-introspection-msvc.mak for more details.  Doing
-"nmake -f gi-introspection-msvc.mak (options omitted)" will build the various introspection files,
-and "nmake -f gi-introspection-msvc.mak (options omitted) install-introspection" will copy the introspection
-files to <root>\vs12\<PlatformName>\share\gir-1.0 (.gir files) and <root>\vs12\<PlatformName>\lib\girepository-1.0
-(.typelib files)
-
-*** End of Note! ***
-
-The "install" project will copy build results and headers into their
-appropriate location under <root>\vs12\<PlatformName>. For instance,
-built DLLs go into <root>\vs12\<PlatformName>\bin, built LIBs into
-<root>\vs12\<PlatformName>\lib and gobject-introspection headers into
-<root>\vs12\<PlatformName>\include\gobject-introsection-1.0.
-
-This is then from where
-project files higher in the stack are supposed to look for them, not
-from a specific gobject-introspection source tree.
-
---Tor Lillqvist <tml@iki.fi>
---Updated by Chun-wei Fan <fanc999@gmail.com>
diff --git a/win32/vs12/_giscanner.vcxproj b/win32/vs12/_giscanner.vcxproj
deleted file mode 100644
index 3b939b7..0000000
--- a/win32/vs12/_giscanner.vcxproj
+++ /dev/null
@@ -1,188 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{8311394F-9114-4C97-80F2-51BCABA054C9}</ProjectGuid>
-    <RootNamespace>_giscanner</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\giscanner;$(PythonDir)\include;$(PythonDir)\PC;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <ForcedIncludeFiles>%(ForcedIncludeFiles);io.h</ForcedIncludeFiles>
-      <PreprocessorDefinitions>_DEBUG;YY_NO_UNISTD_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(OutDir)$(ProjectName).pyd</OutputFile>
-      <AdditionalLibraryDirectories>$(PythonDir)\libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\..\giscanner;$(PythonDir)\include;$(PythonDir)\PC;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <ForcedIncludeFiles>%(ForcedIncludeFiles);io.h</ForcedIncludeFiles>
-      <PreprocessorDefinitions>YY_NO_UNISTD_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(OutDir)$(ProjectName).pyd</OutputFile>
-      <AdditionalLibraryDirectories>$(PythonDir)\libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\giscanner;$(PythonDirX64)\include;$(PythonDirX64)\PC;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <ForcedIncludeFiles>%(ForcedIncludeFiles);io.h</ForcedIncludeFiles>
-      <PreprocessorDefinitions>_DEBUG;YY_NO_UNISTD_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(OutDir)$(ProjectName).pyd</OutputFile>
-      <AdditionalLibraryDirectories>$(PythonDirX64)\libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\..\giscanner;$(PythonDirX64)\include;$(PythonDirX64)\PC;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <ForcedIncludeFiles>%(ForcedIncludeFiles);io.h</ForcedIncludeFiles>
-      <PreprocessorDefinitions>YY_NO_UNISTD_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(OutDir)$(ProjectName).pyd</OutputFile>
-      <AdditionalLibraryDirectories>$(PythonDirX64)\libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\giscanner\giscannermodule.c" />
-    <ClCompile Include="..\..\scannerlexer.c" />
-    <ClCompile Include="..\..\scannerparser.c" />
-    <ClCompile Include="..\..\giscanner\sourcescanner.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="gi-prebuild.vcxproj">
-      <Project>{2093d218-190e-4194-9421-3ba7cbf33b11}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/win32/vs12/_giscanner.vcxproj.filters b/win32/vs12/_giscanner.vcxproj.filters
deleted file mode 100644
index 1ddc9a2..0000000
--- a/win32/vs12/_giscanner.vcxproj.filters
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Sources">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Headers">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\giscanner\giscannermodule.c"><Filter>Sources</Filter></ClCompile>
-    <ClCompile Include="..\..\scannerlexer.c"><Filter>Sources</Filter></ClCompile>
-    <ClCompile Include="..\..\scannerparser.c"><Filter>Sources</Filter></ClCompile>
-    <ClCompile Include="..\..\giscanner\sourcescanner.c"><Filter>Sources</Filter></ClCompile>
-  </ItemGroup>
-</Project>
diff --git a/win32/vs12/cmph-bdz-test.vcxproj b/win32/vs12/cmph-bdz-test.vcxproj
deleted file mode 100644
index b49c7ba..0000000
--- a/win32/vs12/cmph-bdz-test.vcxproj
+++ /dev/null
@@ -1,174 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{E41F378B-CCDD-4B1C-89C3-6D2C950FAF1A}</ProjectGuid>
-    <RootNamespace>cmphbdztest</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\girepository\cmph;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\..\girepository\cmph;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WholeProgramOptimization>false</WholeProgramOptimization>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\girepository\cmph;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\..\girepository\cmph;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\girepository\cmph-bdz-test.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="cmph.vcxproj">
-      <Project>{442c007e-d901-41da-9706-5db4afb4c06b}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/win32/vs12/cmph-bdz-test.vcxproj.filters b/win32/vs12/cmph-bdz-test.vcxproj.filters
deleted file mode 100644
index 2720d49..0000000
--- a/win32/vs12/cmph-bdz-test.vcxproj.filters
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Sources">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Headers">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\girepository\cmph-bdz-test.c">
-      <Filter>Sources</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
diff --git a/win32/vs12/cmph.vcxproj b/win32/vs12/cmph.vcxproj
deleted file mode 100644
index 15fac59..0000000
--- a/win32/vs12/cmph.vcxproj
+++ /dev/null
@@ -1,163 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{442C007E-D901-41DA-9706-5DB4AFB4C06B}</ProjectGuid>
-    <RootNamespace>cmph</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-   <ClCompile Include="..\..\girepository\cmph\bdz.c" />
-   <ClCompile Include="..\..\girepository\cmph\bdz_ph.c" />
-   <ClCompile Include="..\..\girepository\cmph\bmz8.c" />
-   <ClCompile Include="..\..\girepository\cmph\bmz.c" />
-   <ClCompile Include="..\..\girepository\cmph\brz.c" />
-   <ClCompile Include="..\..\girepository\cmph\buffer_entry.c" />
-   <ClCompile Include="..\..\girepository\cmph\buffer_manager.c" />
-   <ClCompile Include="..\..\girepository\cmph\chd.c" />
-   <ClCompile Include="..\..\girepository\cmph\chd_ph.c" />
-   <ClCompile Include="..\..\girepository\cmph\chm.c" />
-   <ClCompile Include="..\..\girepository\cmph\cmph.c" />
-   <ClCompile Include="..\..\girepository\cmph\cmph_structs.c" />
-   <ClCompile Include="..\..\girepository\cmph\compressed_rank.c" />
-   <ClCompile Include="..\..\girepository\cmph\compressed_seq.c" />
-   <ClCompile Include="..\..\girepository\cmph\fch_buckets.c" />
-   <ClCompile Include="..\..\girepository\cmph\fch.c" />
-   <ClCompile Include="..\..\girepository\cmph\graph.c" />
-   <ClCompile Include="..\..\girepository\cmph\hash.c" />
-   <ClCompile Include="..\..\girepository\cmph\jenkins_hash.c" />
-   <ClCompile Include="..\..\girepository\cmph\miller_rabin.c" />
-   <ClCompile Include="..\..\girepository\cmph\select.c" />
-   <ClCompile Include="..\..\girepository\cmph\vqueue.c" />
-   <ClCompile Include="..\..\girepository\cmph\vstack.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="gi-prebuild.vcxproj">
-      <Project>{2093d218-190e-4194-9421-3ba7cbf33b11}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/win32/vs12/cmph.vcxproj.filters b/win32/vs12/cmph.vcxproj.filters
deleted file mode 100644
index df71f98..0000000
--- a/win32/vs12/cmph.vcxproj.filters
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Sources">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Headers">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-   <ClCompile Include="..\..\girepository\cmph\bdz.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\cmph\bdz_ph.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\cmph\bmz8.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\cmph\bmz.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\cmph\brz.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\cmph\buffer_entry.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\cmph\buffer_manager.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\cmph\chd.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\cmph\chd_ph.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\cmph\chm.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\cmph\cmph.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\cmph\cmph_structs.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\cmph\compressed_rank.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\cmph\compressed_seq.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\cmph\fch_buckets.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\cmph\fch.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\cmph\graph.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\cmph\hash.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\cmph\jenkins_hash.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\cmph\miller_rabin.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\cmph\select.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\cmph\vqueue.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\cmph\vstack.c"><Filter>Source Files</Filter></ClCompile>
-  </ItemGroup>
-</Project>
diff --git a/win32/vs12/g-ir-compiler.vcxproj b/win32/vs12/g-ir-compiler.vcxproj
deleted file mode 100644
index 21c5fcd..0000000
--- a/win32/vs12/g-ir-compiler.vcxproj
+++ /dev/null
@@ -1,187 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774}</ProjectGuid>
-    <RootNamespace>gircompiler</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ffi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ffi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ffi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ffi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-   <ClCompile Include="..\..\girepository\gthash.c" />
-   <ClCompile Include="..\..\girepository\girmodule.c" />
-   <ClCompile Include="..\..\girepository\girnode.c" />
-   <ClCompile Include="..\..\girepository\giroffsets.c" />
-   <ClCompile Include="..\..\girepository\girparser.c" />
-   <ClCompile Include="..\..\girepository\girwriter.c" />
-    <ClCompile Include="..\..\tools\compiler.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="cmph.vcxproj">
-      <Project>{442c007e-d901-41da-9706-5db4afb4c06b}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="girepository.vcxproj">
-      <Project>{23e28245-8fc7-4b41-b1c5-8785bd4366a7}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/win32/vs12/g-ir-compiler.vcxproj.filters b/win32/vs12/g-ir-compiler.vcxproj.filters
deleted file mode 100644
index 7b5ec8d..0000000
--- a/win32/vs12/g-ir-compiler.vcxproj.filters
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Sources">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Headers">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-   <ClCompile Include="..\..\girepository\gthash.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\girmodule.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\girnode.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\giroffsets.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\girparser.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\girwriter.c"><Filter>Source Files</Filter></ClCompile>
-    <ClCompile Include="..\..\tools\compiler.c"><Filter>Sources</Filter></ClCompile>
-  </ItemGroup>
-</Project>
diff --git a/win32/vs12/g-ir-generate.vcxproj b/win32/vs12/g-ir-generate.vcxproj
deleted file mode 100644
index a635388..0000000
--- a/win32/vs12/g-ir-generate.vcxproj
+++ /dev/null
@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{F4E6621F-A7DD-4863-8CCF-BA04DFC601E3}</ProjectGuid>
-    <RootNamespace>girgenerate</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\tools\generate.c" />
-    <ClCompile Include="..\..\girepository\girwriter.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="girepository.vcxproj">
-      <Project>{23e28245-8fc7-4b41-b1c5-8785bd4366a7}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/win32/vs12/g-ir-generate.vcxproj.filters b/win32/vs12/g-ir-generate.vcxproj.filters
deleted file mode 100644
index b3b32ef..0000000
--- a/win32/vs12/g-ir-generate.vcxproj.filters
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Sources">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Headers">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\tools\generate.c">
-      <Filter>Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\girepository\girwriter.c">
-      <Filter>Sources</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
diff --git a/win32/vs12/g-ir-inspect.vcxproj b/win32/vs12/g-ir-inspect.vcxproj
deleted file mode 100644
index ac33df6..0000000
--- a/win32/vs12/g-ir-inspect.vcxproj
+++ /dev/null
@@ -1,169 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{F4E6621F-A7DD-4863-8CCF-CA04DFC601E3}</ProjectGuid>
-    <RootNamespace>girinspect</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\tools\g-ir-inspect.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="girepository.vcxproj">
-      <Project>{23e28245-8fc7-4b41-b1c5-8785bd4366a7}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/win32/vs12/g-ir-inspect.vcxproj.filters b/win32/vs12/g-ir-inspect.vcxproj.filters
deleted file mode 100644
index 371419a..0000000
--- a/win32/vs12/g-ir-inspect.vcxproj.filters
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Sources">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Headers">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\tools\g-ir-inspect.c"><Filter>Sources</Filter></ClCompile>
-  </ItemGroup>
-</Project>
diff --git a/win32/vs12/gi-build-defines.props b/win32/vs12/gi-build-defines.props
deleted file mode 100644
index 3a7f5fe..0000000
--- a/win32/vs12/gi-build-defines.props
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ImportGroup Label="PropertySheets">
-    <Import Project="gi-version-paths.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros">
-    <GIRepositoryBuildDefines>G_IREPOSITORY_COMPILATION;DLL_EXPORT</GIRepositoryBuildDefines>
-    <GIIntrospectNMakeCmd>cd ..
-set VCInstallDir=$(VCInstallDir)
-nmake -f gi-introspection-msvc.mak CFG=$(Configuration) PREFIX=$(GlibEtcInstallRoot)</GIIntrospectNMakeCmd>
-    <GIIntrospectBuiltFiles>$(SolutionDir)\..\GIRepository-2.0.typelib;$(SolutionDir)\..\cairo-1.0.typelib</GIIntrospectBuiltFiles>
-  </PropertyGroup>
-  <PropertyGroup>
-    <_PropertySheetDisplayName>gibuilddefinesprops</_PropertySheetDisplayName>
-    <OutDir>$(SolutionDir)$(Configuration)\$(PlatformName)\bin\</OutDir>
-    <IntDir>$(SolutionDir)$(Configuration)\$(PlatformName)\obj\$(ProjectName)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..;..\..\girepository;$(GlibEtcInstallRoot)\include\gio-win32-2.0;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>HAVE_CONFIG_H;WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ForcedIncludeFiles>msvc_recommended_pragmas.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <AdditionalOptions>/d2Zi+ %(AdditionalOptions)</AdditionalOptions>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>gio-2.0.lib;gobject-2.0.lib;gmodule-2.0.lib;gthread-2.0.lib;glib-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(GlibEtcInstallRoot)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalOptions Condition="'$(VisualStudioVersion)|$(Platform)'=='11.0|x64'">/HIGHENTROPYVA %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalOptions Condition="'$(VisualStudioVersion)|$(Platform)'=='12.0|x64'">/HIGHENTROPYVA %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalOptions Condition="'$(VisualStudioVersion)|$(Platform)'=='14.0|x64'">/HIGHENTROPYVA %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalOptions Condition="'$(VisualStudioVersion)|$(Platform)'=='15.0|x64'">/HIGHENTROPYVA %(AdditionalOptions)</AdditionalOptions>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <BuildMacro Include="GIRepositoryBuildDefines">
-      <Value>$(GIRepositoryBuildDefines)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GIIntrospectNMakeCmd">
-      <Value>$(GIIntrospectNMakeCmd)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GIIntrospectBuiltFiles">
-      <Value>$(GIIntrospectBuiltFiles)</Value>
-    </BuildMacro>
-  </ItemGroup>
-</Project>
diff --git a/win32/vs12/gi-gen-srcs.props b/win32/vs12/gi-gen-srcs.props
deleted file mode 100644
index 0a5d2c6..0000000
--- a/win32/vs12/gi-gen-srcs.props
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ImportGroup Label="PropertySheets">
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros">
-    <CopyConfigH>copy ..\..\config.h.win32 ..\..\config.h</CopyConfigH>
-    <GenToolsScripts>$(PythonDir)\python ..\gen-win32-g-ir-tools.py</GenToolsScripts>
-    <GenToolsScriptsX64>$(PythonDirX64)\python ..\gen-win32-g-ir-tools.py</GenToolsScriptsX64>
-  </PropertyGroup>
-  <PropertyGroup>
-    <_PropertySheetDisplayName>gigensrcsprops</_PropertySheetDisplayName>
-  </PropertyGroup>
-  <ItemGroup>
-    <BuildMacro Include="CopyConfigH">
-      <Value>$(CopyConfigH)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GenToolsScripts">
-      <Value>$(GenToolsScripts)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GenToolsScriptsX64">
-      <Value>$(GenToolsScriptsX64)</Value>
-    </BuildMacro>
-  </ItemGroup>
-</Project>
diff --git a/win32/vs12/gi-install.props b/win32/vs12/gi-install.props
deleted file mode 100644
index 7643cbd..0000000
--- a/win32/vs12/gi-install.props
+++ /dev/null
@@ -1,202 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ImportGroup Label="PropertySheets">
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros">
-    <BinDir>$(SolutionDir)$(Configuration)\$(Platform)\bin</BinDir>
-    <GIDoInstall>
-mkdir $(CopyDir)
-mkdir $(CopyDir)\bin
-copy $(BinDir)\$(LibGIDllPrefix)girepository$(LibGIDllSuffix).dll $(CopyDir)\bin
-copy $(BinDir)\$(LibGIDllPrefix)girepository$(LibGIDllSuffix).pdb $(CopyDir)\bin
-copy $(BinDir)\g-ir-compiler.exe $(CopyDir)\bin
-copy $(BinDir)\g-ir-compiler.pdb $(CopyDir)\bin
-copy $(BinDir)\g-ir-generate.exe $(CopyDir)\bin
-copy $(BinDir)\g-ir-generate.pdb $(CopyDir)\bin
-copy $(BinDir)\g-ir-inspect.exe $(CopyDir)\bin
-copy $(BinDir)\g-ir-inspect.pdb $(CopyDir)\bin
-copy ..\..\tools\g-ir-annotation-tool $(CopyDir)\bin
-copy ..\..\tools\g-ir-doc-tool $(CopyDir)\bin
-copy ..\..\tools\g-ir-scanner $(CopyDir)\bin
-copy $(BinDir)\glib-print.exe $(CopyDir)\bin
-copy $(BinDir)\glib-print.pdb $(CopyDir)\bin
-mkdir $(CopyDir)\include\gobject-introspection-1.0\girepository
-copy ..\..\girepository\giarginfo.h $(CopyDir)\include\gobject-introspection-1.0\girepository\giarginfo.h
-copy ..\..\girepository\gibaseinfo.h $(CopyDir)\include\gobject-introspection-1.0\girepository\gibaseinfo.h
-copy ..\..\girepository\gicallableinfo.h $(CopyDir)\include\gobject-introspection-1.0\girepository\gicallableinfo.h
-copy ..\..\girepository\giconstantinfo.h $(CopyDir)\include\gobject-introspection-1.0\girepository\giconstantinfo.h
-copy ..\..\girepository\gienuminfo.h $(CopyDir)\include\gobject-introspection-1.0\girepository\gienuminfo.h
-copy ..\..\girepository\gifieldinfo.h $(CopyDir)\include\gobject-introspection-1.0\girepository\gifieldinfo.h
-copy ..\..\girepository\gifunctioninfo.h $(CopyDir)\include\gobject-introspection-1.0\girepository\gifunctioninfo.h
-copy ..\..\girepository\giinterfaceinfo.h $(CopyDir)\include\gobject-introspection-1.0\girepository\giinterfaceinfo.h
-copy ..\..\girepository\giobjectinfo.h $(CopyDir)\include\gobject-introspection-1.0\girepository\giobjectinfo.h
-copy ..\..\girepository\gipropertyinfo.h $(CopyDir)\include\gobject-introspection-1.0\girepository\gipropertyinfo.h
-copy ..\..\girepository\giregisteredtypeinfo.h $(CopyDir)\include\gobject-introspection-1.0\girepository\giregisteredtypeinfo.h
-copy ..\..\girepository\girepository.h $(CopyDir)\include\gobject-introspection-1.0\girepository\girepository.h
-copy ..\..\girepository\girffi.h $(CopyDir)\include\gobject-introspection-1.0\girepository\girffi.h
-copy ..\..\girepository\gisignalinfo.h $(CopyDir)\include\gobject-introspection-1.0\girepository\gisignalinfo.h
-copy ..\..\girepository\gistructinfo.h $(CopyDir)\include\gobject-introspection-1.0\girepository\gistructinfo.h
-copy ..\..\girepository\gitypeinfo.h $(CopyDir)\include\gobject-introspection-1.0\girepository\gitypeinfo.h
-copy ..\..\girepository\gitypelib.h $(CopyDir)\include\gobject-introspection-1.0\girepository\gitypelib.h
-copy ..\..\girepository\gitypes.h $(CopyDir)\include\gobject-introspection-1.0\girepository\gitypes.h
-copy ..\..\girepository\giunioninfo.h $(CopyDir)\include\gobject-introspection-1.0\girepository\giunioninfo.h
-copy ..\..\girepository\giversionmacros.h $(CopyDir)\include\gobject-introspection-1.0\girepository\giversionmacros.h
-copy ..\..\girepository\givfuncinfo.h $(CopyDir)\include\gobject-introspection-1.0\girepository\givfuncinfo.h
-mkdir $(CopyDir)\lib\gobject-introspection\giscanner
-mkdir $(CopyDir)\lib\gobject-introspection\giscanner\collections
-mkdir $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates
-mkdir $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C
-mkdir $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs
-mkdir $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python
-copy ..\..\giscanner\__init__.py $(CopyDir)\lib\gobject-introspection\giscanner
-copy ..\..\giscanner\annotationmain.py $(CopyDir)\lib\gobject-introspection\giscanner
-copy ..\..\giscanner\annotationparser.py $(CopyDir)\lib\gobject-introspection\giscanner
-copy ..\..\giscanner\ast.py $(CopyDir)\lib\gobject-introspection\giscanner
-copy ..\..\giscanner\cachestore.py $(CopyDir)\lib\gobject-introspection\giscanner
-copy ..\..\giscanner\ccompiler.py $(CopyDir)\lib\gobject-introspection\giscanner
-copy ..\..\giscanner\codegen.py $(CopyDir)\lib\gobject-introspection\giscanner
-copy ..\..\giscanner\docmain.py $(CopyDir)\lib\gobject-introspection\giscanner
-copy ..\..\giscanner\docwriter.py $(CopyDir)\lib\gobject-introspection\giscanner
-copy ..\..\giscanner\dumper.py $(CopyDir)\lib\gobject-introspection\giscanner
-copy ..\..\giscanner\introspectablepass.py $(CopyDir)\lib\gobject-introspection\giscanner
-copy ..\..\giscanner\girparser.py $(CopyDir)\lib\gobject-introspection\giscanner
-copy ..\..\giscanner\girwriter.py $(CopyDir)\lib\gobject-introspection\giscanner
-copy ..\..\giscanner\gdumpparser.py $(CopyDir)\lib\gobject-introspection\giscanner
-copy ..\..\giscanner\libtoolimporter.py $(CopyDir)\lib\gobject-introspection\giscanner
-copy ..\..\giscanner\maintransformer.py $(CopyDir)\lib\gobject-introspection\giscanner
-copy ..\..\giscanner\message.py $(CopyDir)\lib\gobject-introspection\giscanner
-copy ..\..\giscanner\msvccompiler.py $(CopyDir)\lib\gobject-introspection\giscanner
-copy ..\..\giscanner\shlibs.py $(CopyDir)\lib\gobject-introspection\giscanner
-copy ..\..\giscanner\scannermain.py $(CopyDir)\lib\gobject-introspection\giscanner
-copy ..\..\giscanner\sectionparser.py $(CopyDir)\lib\gobject-introspection\giscanner
-copy ..\..\giscanner\sourcescanner.py $(CopyDir)\lib\gobject-introspection\giscanner
-copy ..\..\giscanner\testcodegen.py $(CopyDir)\lib\gobject-introspection\giscanner
-copy ..\..\giscanner\transformer.py $(CopyDir)\lib\gobject-introspection\giscanner
-copy ..\..\giscanner\utils.py $(CopyDir)\lib\gobject-introspection\giscanner
-copy ..\..\giscanner\xmlwriter.py $(CopyDir)\lib\gobject-introspection\giscanner
-copy ..\..\giscanner\collections\__init__.py $(CopyDir)\lib\gobject-introspection\giscanner\collections
-copy ..\..\giscanner\collections\counter.py $(CopyDir)\lib\gobject-introspection\giscanner\collections
-copy ..\..\giscanner\collections\ordereddict.py $(CopyDir)\lib\gobject-introspection\giscanner\collections
-copy ..\..\giscanner\doctemplates\base.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates
-copy ..\..\giscanner\doctemplates\class.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates
-copy ..\..\giscanner\doctemplates\namespace.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates
-copy ..\..\giscanner\doctemplates\C\callback.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C
-copy ..\..\giscanner\doctemplates\C\class.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C
-copy ..\..\giscanner\doctemplates\C\constructor.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C
-copy ..\..\giscanner\doctemplates\C\default.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C
-copy ..\..\giscanner\doctemplates\C\enum.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C
-copy ..\..\giscanner\doctemplates\C\function.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C
-copy ..\..\giscanner\doctemplates\C\field.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C
-copy ..\..\giscanner\doctemplates\C\interface.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C
-copy ..\..\giscanner\doctemplates\C\method.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C
-copy ..\..\giscanner\doctemplates\C\namespace.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C
-copy ..\..\giscanner\doctemplates\C\property.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C
-copy ..\..\giscanner\doctemplates\C\record.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C
-copy ..\..\giscanner\doctemplates\C\signal.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C
-copy ..\..\giscanner\doctemplates\C\vfunc.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C
-copy ..\..\giscanner\doctemplates\Python\callback.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python
-copy ..\..\giscanner\doctemplates\Python\class.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python
-copy ..\..\giscanner\doctemplates\Python\constructor.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python
-copy ..\..\giscanner\doctemplates\Python\default.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python
-copy ..\..\giscanner\doctemplates\Python\enum.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python
-copy ..\..\giscanner\doctemplates\Python\function.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python
-copy ..\..\giscanner\doctemplates\Python\field.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python
-copy ..\..\giscanner\doctemplates\Python\interface.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python
-copy ..\..\giscanner\doctemplates\Python\method.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python
-copy ..\..\giscanner\doctemplates\Python\namespace.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python
-copy ..\..\giscanner\doctemplates\Python\property.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python
-copy ..\..\giscanner\doctemplates\Python\record.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python
-copy ..\..\giscanner\doctemplates\Python\signal.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python
-copy ..\..\giscanner\doctemplates\Python\vfunc.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python
-copy ..\..\giscanner\doctemplates\Gjs\callback.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs
-copy ..\..\giscanner\doctemplates\Gjs\class.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs
-copy ..\..\giscanner\doctemplates\Gjs\constructor.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs
-copy ..\..\giscanner\doctemplates\Gjs\default.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs
-copy ..\..\giscanner\doctemplates\Gjs\enum.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs
-copy ..\..\giscanner\doctemplates\Gjs\function.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs
-copy ..\..\giscanner\doctemplates\Gjs\field.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs
-copy ..\..\giscanner\doctemplates\Gjs\interface.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs
-copy ..\..\giscanner\doctemplates\Gjs\method.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs
-copy ..\..\giscanner\doctemplates\Gjs\namespace.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs
-copy ..\..\giscanner\doctemplates\Gjs\property.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs
-copy ..\..\giscanner\doctemplates\Gjs\record.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs
-copy ..\..\giscanner\doctemplates\Gjs\signal.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs
-copy ..\..\giscanner\doctemplates\Gjs\vfunc.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs
-mkdir $(CopyDir)\share\gobject-introspection-1.0\tests
-copy ..\..\tests\gitestmacros.h $(CopyDir)\share\gobject-introspection-1.0\tests
-copy ..\..\tests\gimarshallingtests.c $(CopyDir)\share\gobject-introspection-1.0\tests
-copy ..\..\tests\gimarshallingtests.h $(CopyDir)\share\gobject-introspection-1.0\tests
-copy ..\..\tests\scanner\regress.c $(CopyDir)\share\gobject-introspection-1.0\tests
-copy ..\..\tests\scanner\regress.h $(CopyDir)\share\gobject-introspection-1.0\tests
-copy ..\..\tests\scanner\annotation.c $(CopyDir)\share\gobject-introspection-1.0\tests
-copy ..\..\tests\scanner\annotation.h $(CopyDir)\share\gobject-introspection-1.0\tests
-copy ..\..\tests\scanner\foo.c $(CopyDir)\share\gobject-introspection-1.0\tests
-copy ..\..\tests\scanner\foo.h $(CopyDir)\share\gobject-introspection-1.0\tests
-copy ..\..\tests\scanner\drawable.c $(CopyDir)\share\gobject-introspection-1.0\tests
-copy ..\..\tests\scanner\drawable.h $(CopyDir)\share\gobject-introspection-1.0\tests
-copy ..\..\tests\scanner\warnlib.c $(CopyDir)\share\gobject-introspection-1.0\tests
-copy ..\..\tests\scanner\warnlib.h $(CopyDir)\share\gobject-introspection-1.0\tests
-copy ..\..\tests\scanner\utility.c $(CopyDir)\share\gobject-introspection-1.0\tests
-copy ..\..\tests\scanner\utility.h $(CopyDir)\share\gobject-introspection-1.0\tests
-copy ..\everything.c $(CopyDir)\share\gobject-introspection-1.0\tests
-copy ..\everything.h $(CopyDir)\share\gobject-introspection-1.0\tests
-copy $(BinDir)\_giscanner.pyd $(CopyDir)\lib\gobject-introspection\giscanner
-copy $(BinDir)\_giscanner.pdb $(CopyDir)\lib\gobject-introspection\giscanner
-mkdir $(CopyDir)\share\gobject-introspection-$(ApiVersion)
-copy ..\..\girepository\gdump.c $(CopyDir)\share\gobject-introspection-$(ApiVersion)
-mkdir $(CopyDir)\lib
-copy $(BinDir)\girepository-$(ApiVersion).lib $(CopyDir)\lib
-mkdir $(CopyDir)\share\gir-$(ApiVersion)
-copy ..\cairo-1.0.gir $(CopyDir)\share\gir-$(ApiVersion)
-copy ..\fontconfig-2.0.gir $(CopyDir)\share\gir-$(ApiVersion)
-copy ..\freetype2-2.0.gir $(CopyDir)\share\gir-$(ApiVersion)
-copy ..\Gio-2.0.gir $(CopyDir)\share\gir-$(ApiVersion)
-copy ..\GIRepository-2.0.gir $(CopyDir)\share\gir-$(ApiVersion)
-copy ..\GL-1.0.gir $(CopyDir)\share\gir-$(ApiVersion)
-copy ..\GLib-2.0.gir $(CopyDir)\share\gir-$(ApiVersion)
-copy ..\GModule-2.0.gir $(CopyDir)\share\gir-$(ApiVersion)
-copy ..\GObject-2.0.gir $(CopyDir)\share\gir-$(ApiVersion)
-copy ..\libxml2-2.0.gir $(CopyDir)\share\gir-$(ApiVersion)
-copy ..\win32-1.0.gir $(CopyDir)\share\gir-$(ApiVersion)
-mkdir $(CopyDir)\lib\girepository-$(ApiVersion)
-copy ..\cairo-1.0.typelib $(CopyDir)\lib\girepository-$(ApiVersion)
-copy ..\fontconfig-2.0.typelib $(CopyDir)\lib\girepository-$(ApiVersion)
-copy ..\freetype2-2.0.typelib $(CopyDir)\lib\girepository-$(ApiVersion)
-copy ..\Gio-2.0.typelib $(CopyDir)\lib\girepository-$(ApiVersion)
-copy ..\GIRepository-2.0.typelib $(CopyDir)\lib\girepository-$(ApiVersion)
-copy ..\GL-1.0.typelib $(CopyDir)\lib\girepository-$(ApiVersion)
-copy ..\GLib-2.0.typelib $(CopyDir)\lib\girepository-$(ApiVersion)
-copy ..\GModule-2.0.typelib $(CopyDir)\lib\girepository-$(ApiVersion)
-copy ..\GObject-2.0.typelib $(CopyDir)\lib\girepository-$(ApiVersion)
-copy ..\libxml2-2.0.typelib $(CopyDir)\lib\girepository-$(ApiVersion)
-copy ..\win32-1.0.typelib $(CopyDir)\lib\girepository-$(ApiVersion)
-mkdir $(CopyDir)\lib\pkgconfig
-copy ..\gobject-introspection-1.0.pc $(CopyDir)\lib\pkgconfig
-copy ..\gobject-introspection-no-export-1.0.pc $(CopyDir)\lib\pkgconfig
-    </GIDoInstall>
-    <GIPCFiles>..\gobject-introspection-1.0.pc;..\gobject-introspection-no-export-1.0.pc</GIPCFiles>
-    <GIGenPC>$(PythonDir)\python.exe ..\gipc.py --version=$(GIVersion) --prefix=$(CopyDir)</GIGenPC>
-    <GIGenPCX64>$(PythonDirX64)\python.exe ..\gipc.py --version=$(GIVersion) --prefix=$(CopyDir)</GIGenPCX64>
-  </PropertyGroup>
-  <PropertyGroup>
-    <_PropertySheetDisplayName>giinstallprops</_PropertySheetDisplayName>
-  </PropertyGroup>
-  <ItemGroup>
-    <BuildMacro Include="BinDir">
-      <Value>$(BinDir)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GIDoInstall">
-      <Value>$(GIDoInstall)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GIPCFiles">
-      <Value>$(GIPCFiles)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GIGenPC">
-      <Value>$(GIGenPC)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GIGenPCX64">
-      <Value>$(GIGenPCX64)</Value>
-    </BuildMacro>
-  </ItemGroup>
-</Project>
diff --git a/win32/vs12/gi-install.vcxproj b/win32/vs12/gi-install.vcxproj
deleted file mode 100644
index 5d82c1c..0000000
--- a/win32/vs12/gi-install.vcxproj
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{2093D218-190E-4194-9421-3BA7CBF33B10}</ProjectGuid>
-    <RootNamespace>install</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Utility</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Utility</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Utility</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Utility</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-install.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-install.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-install.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-install.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <OutDir Condition="'$(Configuration)'=='Debug'">$(GlibEtcInstallRoot)\</OutDir>
-    <ExtensionsToDeleteOnClean Condition="'$(Configuration)'=='Debug'" />
-    <OutDir Condition="'$(Configuration)'=='Release'">$(GlibEtcInstallRoot)\</OutDir>
-    <ExtensionsToDeleteOnClean Condition="'$(Configuration)'=='Release'" />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <CustomBuild Include="..\..\config.h.win32">
-      <Message Condition="'$(Configuration)'=='Debug'">Installing Build Results...</Message>
-      <AdditionalInputs Condition="'$(Configuration)'=='Debug'">$(GIPCFiles)</AdditionalInputs>
-      <Command Condition="'$(Configuration)'=='Debug'">$(GIDoInstall)</Command>
-      <Outputs Condition="'$(Configuration)'=='Debug'">some_random_file;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)'=='Release'">Installing Build Results...</Message>
-      <AdditionalInputs Condition="'$(Configuration)'=='Release'">$(GIPCFiles)</AdditionalInputs>
-      <Command Condition="'$(Configuration)'=='Release'">$(GIDoInstall)</Command>
-      <Outputs Condition="'$(Configuration)'=='Release'">some_random_file;%(Outputs)</Outputs>
-    </CustomBuild>
-    <CustomBuild Include="..\gipc.py">
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating .pc files...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GIGenPC)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GIPCFiles);%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Generating .pc files...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GIGenPCX64)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GIPCFiles);%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Generating .pc files...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GIGenPC)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GIPCFiles);%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Generating .pc files...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GIGenPCX64)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GIPCFiles);%(Outputs)</Outputs>
-    </CustomBuild>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="g-ir-inspect.vcxproj">
-      <Project>{f4e6621f-a7dd-4863-8ccf-ca04dfc601e3}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="g-ir-compiler.vcxproj">
-      <Project>{5dcb55ce-f32c-4c77-8bf4-b4dad3ec7774}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="g-ir-generate.vcxproj">
-      <Project>{f4e6621f-a7dd-4863-8ccf-ba04dfc601e3}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="girepository.vcxproj">
-      <Project>{23e28245-8fc7-4b41-b1c5-8785bd4366a7}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="_giscanner.vcxproj">
-      <Project>{8311394f-9114-4c97-80f2-51bcaba054c9}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="gi-introspect.vcxproj">
-      <Project>{7a36674c-379d-4989-a978-07124e5f852c}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/win32/vs12/gi-install.vcxproj.filters b/win32/vs12/gi-install.vcxproj.filters
deleted file mode 100644
index 590ad10..0000000
--- a/win32/vs12/gi-install.vcxproj.filters
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <CustomBuild Include="..\..\config.h.win32"><Filter>Resource Files</Filter></CustomBuild>
-    <CustomBuild Include="..\gipc.py"><Filter>Resource Files</Filter></CustomBuild>
-  </ItemGroup>
-</Project>
diff --git a/win32/vs12/gi-introspect.vcxproj b/win32/vs12/gi-introspect.vcxproj
deleted file mode 100644
index 1571909..0000000
--- a/win32/vs12/gi-introspect.vcxproj
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{7A36674C-379D-4989-A978-07124E5F852C}</ProjectGuid>
-    <RootNamespace>giintrospect</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <NMakeBuildCommandLine>$(GIIntrospectNMakeCmd) $(IntrospectPythonParam)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>$(GIIntrospectNMakeCmd) $(IntrospectPythonParam) clean all</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>$(GIIntrospectNMakeCmd) $(IntrospectPythonParam) clean</NMakeCleanCommandLine>
-    <NMakeOutput>$(GIIntrospectBuiltFiles)</NMakeOutput>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <NMakeBuildCommandLine>$(GIIntrospectNMakeCmd) $(IntrospectPythonParam)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>$(GIIntrospectNMakeCmd) $(IntrospectPythonParam) clean all</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>$(GIIntrospectNMakeCmd) $(IntrospectPythonParam) clean</NMakeCleanCommandLine>
-    <NMakeOutput>$(GIIntrospectBuiltFiles)</NMakeOutput>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <NMakeBuildCommandLine>$(GIIntrospectNMakeCmd) $(IntrospectPythonParamX64)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>$(GIIntrospectNMakeCmd) $(IntrospectPythonParamX64) clean all</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>$(GIIntrospectNMakeCmd) $(IntrospectPythonParamX64) clean</NMakeCleanCommandLine>
-    <NMakeOutput>$(GIIntrospectBuiltFiles)</NMakeOutput>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <NMakeBuildCommandLine>$(GIIntrospectNMakeCmd) $(IntrospectPythonParamX64)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>$(GIIntrospectNMakeCmd) $(IntrospectPythonParamX64) clean all</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>$(GIIntrospectNMakeCmd) $(IntrospectPythonParamX64) clean</NMakeCleanCommandLine>
-    <NMakeOutput>$(GIIntrospectBuiltFiles)</NMakeOutput>
-  </PropertyGroup>
-  <ItemGroup>
-    <ProjectReference Include="g-ir-compiler.vcxproj">
-      <Project>{5dcb55ce-f32c-4c77-8bf4-b4dad3ec7774}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="g-ir-generate.vcxproj">
-      <Project>{f4e6621f-a7dd-4863-8ccf-ba04dfc601e3}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="girepository.vcxproj">
-      <Project>{23e28245-8fc7-4b41-b1c5-8785bd4366a7}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="_giscanner.vcxproj">
-      <Project>{8311394f-9114-4c97-80f2-51bcaba054c9}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/win32/vs12/gi-prebuild.vcxproj b/win32/vs12/gi-prebuild.vcxproj
deleted file mode 100644
index ef978f7..0000000
--- a/win32/vs12/gi-prebuild.vcxproj
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{2093D218-190E-4194-9421-3BA7CBF33B11}</ProjectGuid>
-    <RootNamespace>giprebuild</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Utility</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Utility</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Utility</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Utility</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-gen-srcs.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-gen-srcs.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-gen-srcs.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-gen-srcs.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <ExtensionsToDeleteOnClean Condition="'$(Configuration)'=='Debug'" />
-    <ExtensionsToDeleteOnClean Condition="'$(Configuration)'=='Release'" />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <CustomBuild Include="..\..\config.h.win32">
-      <Message Condition="'$(Configuration)'=='Debug'">Copying config.h from config.h.win32...</Message>
-      <Command Condition="'$(Configuration)'=='Debug'">$(CopyConfigH)</Command>
-      <Outputs Condition="'$(Configuration)'=='Debug'">..\..\config.h;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)'=='Release'">Copying config.h from config.h.win32...</Message>
-      <Command Condition="'$(Configuration)'=='Release'">$(CopyConfigH)</Command>
-      <Outputs Condition="'$(Configuration)'=='Release'">..\..\config.h;%(Outputs)</Outputs>
-    </CustomBuild>
-    <CustomBuild Include="..\..\tools\g-ir-tool-template.in">
-      <Message Condition="'$(Configuration)'=='Debug'">Generating Tools Scripts...</Message>
-      <Command Condition="'$(Configuration)'=='Debug'">$(GenToolsScripts)</Command>
-      <Message Condition="'$(Configuration)'=='Release'">Generating Tools Scripts...</Message>
-      <Command Condition="'$(Configuration)'=='Release'">$(GenToolsScripts)</Command>
-      <Outputs Condition="'$(Configuration)'=='Release'">..\..\tools\g-ir-scanner;..\..\tools\g-ir-doc-tool;..\..\tools\g-ir-annotation-tool;%(Outputs)</Outputs>
-    </CustomBuild>
-  </ItemGroup>
-  <ItemGroup>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/win32/vs12/gi-version-paths.props b/win32/vs12/gi-version-paths.props
deleted file mode 100644
index fece7da..0000000
--- a/win32/vs12/gi-version-paths.props
+++ /dev/null
@@ -1,81 +0,0 @@
-<?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>12</VSVer>
-    <GlibEtcInstallRoot>$(SolutionDir)\..\..\..\vs$(VSVer)\$(Platform)</GlibEtcInstallRoot>
-    <CopyDir>$(GlibEtcInstallRoot)</CopyDir>
-    <!-- PythonDir needs to point to a 32-bit/x86 Python 2.7/3.3+ installation -->
-    <PythonDir Condition="'$(VisualStudioVersion)' == '10.0'">c:\\python34</PythonDir>
-    <PythonDir Condition="'$(VisualStudioVersion)' == '11.0'">c:\\python34</PythonDir>
-    <PythonDir Condition="'$(VisualStudioVersion)' == '12.0'">c:\\python34</PythonDir>
-    <PythonDir Condition="'$(VisualStudioVersion)' == '14.0'">c:\\python36</PythonDir>
-    <PythonDir Condition="'$(VisualStudioVersion)' == '15.0'">c:\\python36</PythonDir>
-    <!-- PythonDirX64 needs to point to an x86-64/x64 Python 2.7/3.3+ installation -->
-    <PythonDirX64>$(PythonDir).x64</PythonDirX64>
-    <IntrospectPythonParam>PYTHON=$(PythonDir)\python.exe</IntrospectPythonParam>
-    <IntrospectPythonParamX64>PYTHON=$(PythonDirX64)\python.exe</IntrospectPythonParamX64>
-    <GIVersion>1.56.1</GIVersion>
-    <BASE_GI_DIR>$(SolutionDir)\..\..</BASE_GI_DIR>
-    <ApiVersion>1.0</ApiVersion>
-    <DefDir>$(SolutionDir)$(Configuration)\$(Platform)\obj\$(ProjectName)</DefDir>
-    <LibGILibtoolCompatibleDllPrefix>lib</LibGILibtoolCompatibleDllPrefix>
-    <LibGILibtoolCompatibleDllSuffix>-$(ApiVersion)-0</LibGILibtoolCompatibleDllSuffix>
-    <LibGISeparateVSDllPrefix />
-    <LibGISeparateVSDllSuffix>-1-vs$(VSVer)</LibGISeparateVSDllSuffix>
-    <LibGIDllPrefix>$(LibGISeparateVSDllPrefix)</LibGIDllPrefix>
-    <LibGIDllSuffix>$(LibGISeparateVSDllSuffix)</LibGIDllSuffix>
-  </PropertyGroup>
-  <PropertyGroup>
-    <_PropertySheetDisplayName>giversionpathsprops</_PropertySheetDisplayName>
-  </PropertyGroup>
-  <ItemGroup>
-    <BuildMacro Include="VSVer">
-      <Value>$(VSVer)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GlibEtcInstallRoot">
-      <Value>$(GlibEtcInstallRoot)</Value>
-    </BuildMacro>
-    <BuildMacro Include="CopyDir">
-      <Value>$(CopyDir)</Value>
-    </BuildMacro>
-    <BuildMacro Include="PythonDir">
-      <Value>$(PythonDir)</Value>
-    </BuildMacro>
-    <BuildMacro Include="PythonDirX64">
-      <Value>$(PythonDirX64)</Value>
-    </BuildMacro>
-    <BuildMacro Include="IntrospectPythonParam">
-      <Value>$(IntrospectPythonParam)</Value>
-    </BuildMacro>
-    <BuildMacro Include="IntrospectPythonParamX64">
-      <Value>$(IntrospectPythonParamX64)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GIVersion">
-      <Value>$(GIVersion)</Value>
-    </BuildMacro>
-    <BuildMacro Include="BASE_GI_DIR">
-      <Value>$(BASE_GI_DIR)</Value>
-    </BuildMacro>
-    <BuildMacro Include="ApiVersion">
-      <Value>$(ApiVersion)</Value>
-    </BuildMacro>
-    <BuildMacro Include="LibGILibtoolCompatibleDllPrefix">
-      <Value>$(LibGILibtoolCompatibleDllPrefix)</Value>
-    </BuildMacro>
-    <BuildMacro Include="LibGILibtoolCompatibleDllSuffix">
-      <Value>$(LibGILibtoolCompatibleDllSuffix)</Value>
-    </BuildMacro>
-    <BuildMacro Include="LibGISeparateVSDllPrefix">
-      <Value>$(LibGISeparateVSDllPrefix)</Value>
-    </BuildMacro>
-    <BuildMacro Include="LibGISeparateVSDllSuffix">
-      <Value>$(LibGISeparateVSDllSuffix)</Value>
-    </BuildMacro>
-    <BuildMacro Include="LibGIDllPrefix">
-      <Value>$(LibGIDllPrefix)</Value>
-    </BuildMacro>
-    <BuildMacro Include="LibGIDllSuffix">
-      <Value>$(LibGIDllSuffix)</Value>
-    </BuildMacro>
-  </ItemGroup>
-</Project>
diff --git a/win32/vs12/girepository.vcxproj b/win32/vs12/girepository.vcxproj
deleted file mode 100644
index 30b2480..0000000
--- a/win32/vs12/girepository.vcxproj
+++ /dev/null
@@ -1,214 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{23E28245-8FC7-4B41-B1C5-8785BD4366A7}</ProjectGuid>
-    <RootNamespace>girepository</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\girepository;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;$(GIRepositoryBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ffi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).dll</OutputFile>
-      <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\..\girepository;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>$(GIRepositoryBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ffi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).dll</OutputFile>
-      <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\girepository;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;$(GIRepositoryBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ffi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).dll</OutputFile>
-      <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\..\girepository;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>$(GIRepositoryBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ffi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).dll</OutputFile>
-      <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-   <ClCompile Include="..\..\girepository\gdump.c" />
-   <ClCompile Include="..\..\girepository\giarginfo.c" />
-   <ClCompile Include="..\..\girepository\gibaseinfo.c" />
-   <ClCompile Include="..\..\girepository\gicallableinfo.c" />
-   <ClCompile Include="..\..\girepository\giconstantinfo.c" />
-   <ClCompile Include="..\..\girepository\gienuminfo.c" />
-   <ClCompile Include="..\..\girepository\gifieldinfo.c" />
-   <ClCompile Include="..\..\girepository\gifunctioninfo.c" />
-   <ClCompile Include="..\..\girepository\ginvoke.c" />
-   <ClCompile Include="..\..\girepository\giinterfaceinfo.c" />
-   <ClCompile Include="..\..\girepository\giobjectinfo.c" />
-   <ClCompile Include="..\..\girepository\gipropertyinfo.c" />
-   <ClCompile Include="..\..\girepository\giregisteredtypeinfo.c" />
-   <ClCompile Include="..\..\girepository\girepository.c" />
-   <ClCompile Include="..\..\girepository\girffi.c" />
-   <ClCompile Include="..\..\girepository\gisignalinfo.c" />
-   <ClCompile Include="..\..\girepository\gistructinfo.c" />
-   <ClCompile Include="..\..\girepository\gitypeinfo.c" />
-   <ClCompile Include="..\..\girepository\gitypelib.c" />
-   <ClCompile Include="..\..\girepository\giunioninfo.c" />
-   <ClCompile Include="..\..\girepository\givfuncinfo.c" />
-   <ClCompile Include="..\..\girepository\gthash.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="gi-prebuild.vcxproj">
-      <Project>{2093d218-190e-4194-9421-3ba7cbf33b11}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="cmph.vcxproj">
-      <Project>{442c007e-d901-41da-9706-5db4afb4c06b}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/win32/vs12/girepository.vcxproj.filters b/win32/vs12/girepository.vcxproj.filters
deleted file mode 100644
index 8201353..0000000
--- a/win32/vs12/girepository.vcxproj.filters
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Sources">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Headers">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-   <ClCompile Include="..\..\girepository\gdump.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\giarginfo.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\gibaseinfo.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\gicallableinfo.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\giconstantinfo.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\gienuminfo.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\gifieldinfo.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\gifunctioninfo.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\ginvoke.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\giinterfaceinfo.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\giobjectinfo.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\gipropertyinfo.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\giregisteredtypeinfo.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\girepository.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\girffi.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\gisignalinfo.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\gistructinfo.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\gitypeinfo.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\gitypelib.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\giunioninfo.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\givfuncinfo.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\gthash.c"><Filter>Source Files</Filter></ClCompile>
-  </ItemGroup>
-</Project>
diff --git a/win32/vs12/glib-print.vcxproj b/win32/vs12/glib-print.vcxproj
deleted file mode 100644
index 21e7eee..0000000
--- a/win32/vs12/glib-print.vcxproj
+++ /dev/null
@@ -1,169 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{2CCD6E09-08E7-44B9-92E6-42F0A5DBBC8B}</ProjectGuid>
-    <RootNamespace>glibprint</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\examples\glib-print.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="girepository.vcxproj">
-      <Project>{23e28245-8fc7-4b41-b1c5-8785bd4366a7}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/win32/vs12/glib-print.vcxproj.filters b/win32/vs12/glib-print.vcxproj.filters
deleted file mode 100644
index f77043c..0000000
--- a/win32/vs12/glib-print.vcxproj.filters
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Sources">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Headers">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\examples\glib-print.c">
-      <Filter>Sources</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
diff --git a/win32/vs12/gobject-introspection.sln b/win32/vs12/gobject-introspection.sln
deleted file mode 100644
index a4467d3..0000000
--- a/win32/vs12/gobject-introspection.sln
+++ /dev/null
@@ -1,126 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gi-prebuild", "gi-prebuild.vcxproj", "{2093D218-190E-4194-9421-3BA7CBF33B11}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cmph", "cmph.vcxproj", "{442C007E-D901-41DA-9706-5DB4AFB4C06B}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cmph-bdz-test", "cmph-bdz-test.vcxproj", "{E41F378B-CCDD-4B1C-89C3-6D2C950FAF1A}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "girepository", "girepository.vcxproj", "{23E28245-8FC7-4B41-B1C5-8785BD4366A7}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_giscanner", "_giscanner.vcxproj", "{8311394F-9114-4C97-80F2-51BCABA054C9}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glib-print", "glib-print.vcxproj", "{2CCD6E09-08E7-44B9-92E6-42F0A5DBBC8B}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "g-ir-generate", "g-ir-generate.vcxproj", "{F4E6621F-A7DD-4863-8CCF-BA04DFC601E3}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "g-ir-compiler", "g-ir-compiler.vcxproj", "{5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "g-ir-inspect", "g-ir-inspect.vcxproj", "{F4E6621F-A7DD-4863-8CCF-CA04DFC601E3}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gi-introspect", "gi-introspect.vcxproj", "{7A36674C-379D-4989-A978-07124E5F852C}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gi-install", "gi-install.vcxproj", "{2093D218-190E-4194-9421-3BA7CBF33B10}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Debug|x64 = Debug|x64
-		Release|Win32 = Release|Win32
-		Release|x64 = Release|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{2093D218-190E-4194-9421-3BA7CBF33B11}.Debug|Win32.ActiveCfg = Debug|Win32
-		{2093D218-190E-4194-9421-3BA7CBF33B11}.Debug|Win32.Build.0 = Debug|Win32
-		{2093D218-190E-4194-9421-3BA7CBF33B11}.Debug|x64.ActiveCfg = Debug|x64
-		{2093D218-190E-4194-9421-3BA7CBF33B11}.Debug|x64.Build.0 = Debug|x64
-		{2093D218-190E-4194-9421-3BA7CBF33B11}.Release|Win32.ActiveCfg = Release|Win32
-		{2093D218-190E-4194-9421-3BA7CBF33B11}.Release|Win32.Build.0 = Release|Win32
-		{2093D218-190E-4194-9421-3BA7CBF33B11}.Release|x64.ActiveCfg = Release|x64
-		{2093D218-190E-4194-9421-3BA7CBF33B11}.Release|x64.Build.0 = Release|x64
-		{442C007E-D901-41DA-9706-5DB4AFB4C06B}.Debug|Win32.ActiveCfg = Debug|Win32
-		{442C007E-D901-41DA-9706-5DB4AFB4C06B}.Debug|Win32.Build.0 = Debug|Win32
-		{442C007E-D901-41DA-9706-5DB4AFB4C06B}.Debug|x64.ActiveCfg = Debug|x64
-		{442C007E-D901-41DA-9706-5DB4AFB4C06B}.Debug|x64.Build.0 = Debug|x64
-		{442C007E-D901-41DA-9706-5DB4AFB4C06B}.Release|Win32.ActiveCfg = Release|Win32
-		{442C007E-D901-41DA-9706-5DB4AFB4C06B}.Release|Win32.Build.0 = Release|Win32
-		{442C007E-D901-41DA-9706-5DB4AFB4C06B}.Release|x64.ActiveCfg = Release|x64
-		{442C007E-D901-41DA-9706-5DB4AFB4C06B}.Release|x64.Build.0 = Release|x64
-		{E41F378B-CCDD-4B1C-89C3-6D2C950FAF1A}.Debug|Win32.ActiveCfg = Debug|Win32
-		{E41F378B-CCDD-4B1C-89C3-6D2C950FAF1A}.Debug|Win32.Build.0 = Debug|Win32
-		{E41F378B-CCDD-4B1C-89C3-6D2C950FAF1A}.Debug|x64.ActiveCfg = Debug|x64
-		{E41F378B-CCDD-4B1C-89C3-6D2C950FAF1A}.Debug|x64.Build.0 = Debug|x64
-		{E41F378B-CCDD-4B1C-89C3-6D2C950FAF1A}.Release|Win32.ActiveCfg = Release|Win32
-		{E41F378B-CCDD-4B1C-89C3-6D2C950FAF1A}.Release|Win32.Build.0 = Release|Win32
-		{E41F378B-CCDD-4B1C-89C3-6D2C950FAF1A}.Release|x64.ActiveCfg = Release|x64
-		{E41F378B-CCDD-4B1C-89C3-6D2C950FAF1A}.Release|x64.Build.0 = Release|x64
-		{23E28245-8FC7-4B41-B1C5-8785BD4366A7}.Debug|Win32.ActiveCfg = Debug|Win32
-		{23E28245-8FC7-4B41-B1C5-8785BD4366A7}.Debug|Win32.Build.0 = Debug|Win32
-		{23E28245-8FC7-4B41-B1C5-8785BD4366A7}.Debug|x64.ActiveCfg = Debug|x64
-		{23E28245-8FC7-4B41-B1C5-8785BD4366A7}.Debug|x64.Build.0 = Debug|x64
-		{23E28245-8FC7-4B41-B1C5-8785BD4366A7}.Release|Win32.ActiveCfg = Release|Win32
-		{23E28245-8FC7-4B41-B1C5-8785BD4366A7}.Release|Win32.Build.0 = Release|Win32
-		{23E28245-8FC7-4B41-B1C5-8785BD4366A7}.Release|x64.ActiveCfg = Release|x64
-		{23E28245-8FC7-4B41-B1C5-8785BD4366A7}.Release|x64.Build.0 = Release|x64
-		{8311394F-9114-4C97-80F2-51BCABA054C9}.Debug|Win32.ActiveCfg = Debug|Win32
-		{8311394F-9114-4C97-80F2-51BCABA054C9}.Debug|Win32.Build.0 = Debug|Win32
-		{8311394F-9114-4C97-80F2-51BCABA054C9}.Debug|x64.ActiveCfg = Debug|x64
-		{8311394F-9114-4C97-80F2-51BCABA054C9}.Debug|x64.Build.0 = Debug|x64
-		{8311394F-9114-4C97-80F2-51BCABA054C9}.Release|Win32.ActiveCfg = Release|Win32
-		{8311394F-9114-4C97-80F2-51BCABA054C9}.Release|Win32.Build.0 = Release|Win32
-		{8311394F-9114-4C97-80F2-51BCABA054C9}.Release|x64.ActiveCfg = Release|x64
-		{8311394F-9114-4C97-80F2-51BCABA054C9}.Release|x64.Build.0 = Release|x64
-		{2CCD6E09-08E7-44B9-92E6-42F0A5DBBC8B}.Debug|Win32.ActiveCfg = Debug|Win32
-		{2CCD6E09-08E7-44B9-92E6-42F0A5DBBC8B}.Debug|Win32.Build.0 = Debug|Win32
-		{2CCD6E09-08E7-44B9-92E6-42F0A5DBBC8B}.Debug|x64.ActiveCfg = Debug|x64
-		{2CCD6E09-08E7-44B9-92E6-42F0A5DBBC8B}.Debug|x64.Build.0 = Debug|x64
-		{2CCD6E09-08E7-44B9-92E6-42F0A5DBBC8B}.Release|Win32.ActiveCfg = Release|Win32
-		{2CCD6E09-08E7-44B9-92E6-42F0A5DBBC8B}.Release|Win32.Build.0 = Release|Win32
-		{2CCD6E09-08E7-44B9-92E6-42F0A5DBBC8B}.Release|x64.ActiveCfg = Release|x64
-		{2CCD6E09-08E7-44B9-92E6-42F0A5DBBC8B}.Release|x64.Build.0 = Release|x64
-		{F4E6621F-A7DD-4863-8CCF-BA04DFC601E3}.Debug|Win32.ActiveCfg = Debug|Win32
-		{F4E6621F-A7DD-4863-8CCF-BA04DFC601E3}.Debug|Win32.Build.0 = Debug|Win32
-		{F4E6621F-A7DD-4863-8CCF-BA04DFC601E3}.Debug|x64.ActiveCfg = Debug|x64
-		{F4E6621F-A7DD-4863-8CCF-BA04DFC601E3}.Debug|x64.Build.0 = Debug|x64
-		{F4E6621F-A7DD-4863-8CCF-BA04DFC601E3}.Release|Win32.ActiveCfg = Release|Win32
-		{F4E6621F-A7DD-4863-8CCF-BA04DFC601E3}.Release|Win32.Build.0 = Release|Win32
-		{F4E6621F-A7DD-4863-8CCF-BA04DFC601E3}.Release|x64.ActiveCfg = Release|x64
-		{F4E6621F-A7DD-4863-8CCF-BA04DFC601E3}.Release|x64.Build.0 = Release|x64
-		{F4E6621F-A7DD-4863-8CCF-CA04DFC601E3}.Debug|Win32.ActiveCfg = Debug|Win32
-		{F4E6621F-A7DD-4863-8CCF-CA04DFC601E3}.Debug|Win32.Build.0 = Debug|Win32
-		{F4E6621F-A7DD-4863-8CCF-CA04DFC601E3}.Debug|x64.ActiveCfg = Debug|x64
-		{F4E6621F-A7DD-4863-8CCF-CA04DFC601E3}.Debug|x64.Build.0 = Debug|x64
-		{F4E6621F-A7DD-4863-8CCF-CA04DFC601E3}.Release|Win32.ActiveCfg = Release|Win32
-		{F4E6621F-A7DD-4863-8CCF-CA04DFC601E3}.Release|Win32.Build.0 = Release|Win32
-		{F4E6621F-A7DD-4863-8CCF-CA04DFC601E3}.Release|x64.ActiveCfg = Release|x64
-		{F4E6621F-A7DD-4863-8CCF-CA04DFC601E3}.Release|x64.Build.0 = Release|x64
-		{5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774}.Debug|Win32.ActiveCfg = Debug|Win32
-		{5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774}.Debug|Win32.Build.0 = Debug|Win32
-		{5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774}.Debug|x64.ActiveCfg = Debug|x64
-		{5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774}.Debug|x64.Build.0 = Debug|x64
-		{5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774}.Release|Win32.ActiveCfg = Release|Win32
-		{5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774}.Release|Win32.Build.0 = Release|Win32
-		{5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774}.Release|x64.ActiveCfg = Release|x64
-		{5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774}.Release|x64.Build.0 = Release|x64
-		{7A36674C-379D-4989-A978-07124E5F852C}.Debug|Win32.ActiveCfg = Debug|Win32
-		{7A36674C-379D-4989-A978-07124E5F852C}.Debug|Win32.Build.0 = Debug|Win32
-		{7A36674C-379D-4989-A978-07124E5F852C}.Debug|x64.ActiveCfg = Debug|x64
-		{7A36674C-379D-4989-A978-07124E5F852C}.Debug|x64.Build.0 = Debug|x64
-		{7A36674C-379D-4989-A978-07124E5F852C}.Release|Win32.ActiveCfg = Release|Win32
-		{7A36674C-379D-4989-A978-07124E5F852C}.Release|Win32.Build.0 = Release|Win32
-		{7A36674C-379D-4989-A978-07124E5F852C}.Release|x64.ActiveCfg = Release|x64
-		{7A36674C-379D-4989-A978-07124E5F852C}.Release|x64.Build.0 = Release|x64
-		{2093D218-190E-4194-9421-3BA7CBF33B10}.Debug|Win32.ActiveCfg = Debug|Win32
-		{2093D218-190E-4194-9421-3BA7CBF33B10}.Debug|Win32.Build.0 = Debug|Win32
-		{2093D218-190E-4194-9421-3BA7CBF33B10}.Debug|x64.ActiveCfg = Debug|x64
-		{2093D218-190E-4194-9421-3BA7CBF33B10}.Debug|x64.Build.0 = Debug|x64
-		{2093D218-190E-4194-9421-3BA7CBF33B10}.Release|Win32.ActiveCfg = Release|Win32
-		{2093D218-190E-4194-9421-3BA7CBF33B10}.Release|Win32.Build.0 = Release|Win32
-		{2093D218-190E-4194-9421-3BA7CBF33B10}.Release|x64.ActiveCfg = Release|x64
-		{2093D218-190E-4194-9421-3BA7CBF33B10}.Release|x64.Build.0 = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/win32/vs14/Makefile.am b/win32/vs14/Makefile.am
deleted file mode 100644
index cb2953b..0000000
--- a/win32/vs14/Makefile.am
+++ /dev/null
@@ -1,36 +0,0 @@
-EXTRA_DIST = \
-	gobject-introspection.sln	\
-	gi-build-defines.props	\
-	gi-gen-srcs.props	\
-	gi-install.props	\
-	gi-version-paths.props	\
-	gi-prebuild.vcxproj	\
-	girepository.vcxproj	\
-	girepository.vcxproj.filters	\
-	cmph-bdz-test.vcxproj	\
-	cmph-bdz-test.vcxproj.filters	\
-	cmph.vcxproj	\
-	cmph.vcxproj.filters	\
-	g-ir-compiler.vcxproj	\
-	g-ir-compiler.vcxproj.filters	\
-	g-ir-generate.vcxproj	\
-	g-ir-generate.vcxproj.filters	\
-	g-ir-inspect.vcxproj	\
-	g-ir-inspect.vcxproj.filters	\
-	glib-print.vcxproj	\
-	glib-print.vcxproj.filters	\
-	_giscanner.vcxproj	\
-	_giscanner.vcxproj.filters	\
-	gi-install.vcxproj	\
-	gi-install.vcxproj.filters	\
-	gi-introspect.vcxproj	\
-	README.txt
-
-DISTCLEANFILES = $(EXTRA_DIST)
-
-MSVC_BASE_VER = 10
-MSVC_BASE_VER_LONG = 2010
-MSVC_VER = 14
-MSVC_VER_LONG = 14
-
-include $(top_srcdir)/win32/Makefile-newvs.am
diff --git a/win32/vs14/Makefile.in b/win32/vs14/Makefile.in
deleted file mode 100644
index fe16c57..0000000
--- a/win32/vs14/Makefile.in
+++ /dev/null
@@ -1,585 +0,0 @@
-# Makefile.in generated by automake 1.15.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994-2017 Free Software Foundation, Inc.
-
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-# Centralized autotools file
-# Create the Visual Studio 2012/2013/2015 project files
-# from the Visual Studio 2010 project files
-
-# This autotools file, from GLib, can be used in other projects
-# that have Visual Studio build support.
-
-# Author: Fan, Chun-wei
-# November 05, 2012
-
-# MSVC_BASE_VER: Baseline MSVC 201x version to copy/process project files from (100 for 2010, 120 for 2013)
-# MSVC_BASE_VER_LONG: Long Version of baseline Visual Studio 201x version (2010, 2012, 2013, 14, 15)
-# MSVC_BASE_TOOLSET: Use if baseline MSVC toolset is not in the form v$(MSVC_BASE_VER)0, meaning v$(MSVC_BASE_TOOLSET)
-# MSVC_VER_LONG: Long Version of target Visual Studio (2012, 2013, 14 and so on)
-# MSVC_VER: Short Version of target Visual Studio (110 for 2012, 120 for 2013, 140 for 2015, 141 for 2017)
-# MSVC_TOOLSET: Use if target MSVC toolsett is not in the form v $(MSVC_VER)0, meaning v$(MSVC_TOOLSET)
-VPATH = @srcdir@
-am__is_gnu_make = { \
-  if test -z '$(MAKELEVEL)'; then \
-    false; \
-  elif test -n '$(MAKE_HOST)'; then \
-    true; \
-  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
-    true; \
-  else \
-    false; \
-  fi; \
-}
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -[dEDm]) skip_next=yes;; \
-      -[JT]) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = win32/vs14
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
-	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/python.m4 \
-	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN     " $@;
-am__v_GEN_1 = 
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 = 
-SOURCES =
-DIST_SOURCES =
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-am__DIST_COMMON = $(srcdir)/Makefile.in \
-	$(top_srcdir)/win32/Makefile-newvs.am
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CAIRO_CFLAGS = @CAIRO_CFLAGS@
-CAIRO_GIR_PACKAGE = @CAIRO_GIR_PACKAGE@
-CAIRO_LIBS = @CAIRO_LIBS@
-CAIRO_SHARED_LIBRARY = @CAIRO_SHARED_LIBRARY@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-EXPANDED_BINDIR = @EXPANDED_BINDIR@
-EXPANDED_DATADIR = @EXPANDED_DATADIR@
-EXPANDED_LIBDIR = @EXPANDED_LIBDIR@
-EXPANDED_LIBEXECDIR = @EXPANDED_LIBEXECDIR@
-EXPANDED_LOCALSTATEDIR = @EXPANDED_LOCALSTATEDIR@
-EXPANDED_SYSCONFDIR = @EXPANDED_SYSCONFDIR@
-EXTRA_LINK_FLAGS = @EXTRA_LINK_FLAGS@
-FFI_CFLAGS = @FFI_CFLAGS@
-FFI_LIBS = @FFI_LIBS@
-FFI_PC_CFLAGS = @FFI_PC_CFLAGS@
-FFI_PC_LIBS = @FFI_PC_LIBS@
-FFI_PC_PACKAGES = @FFI_PC_PACKAGES@
-FGREP = @FGREP@
-GIO_CFLAGS = @GIO_CFLAGS@
-GIO_LIBS = @GIO_LIBS@
-GIO_UNIX_CFLAGS = @GIO_UNIX_CFLAGS@
-GIO_UNIX_LIBS = @GIO_UNIX_LIBS@
-GIREPO_CFLAGS = @GIREPO_CFLAGS@
-GIREPO_LIBS = @GIREPO_LIBS@
-GIR_DIR = @GIR_DIR@
-GIR_SUFFIX = @GIR_SUFFIX@
-GI_HIDDEN_VISIBILITY_CFLAGS = @GI_HIDDEN_VISIBILITY_CFLAGS@
-GI_VERSION = @GI_VERSION@
-GLIBSRC = @GLIBSRC@
-GLIB_CFLAGS = @GLIB_CFLAGS@
-GLIB_LIBS = @GLIB_LIBS@
-GMODULE_CFLAGS = @GMODULE_CFLAGS@
-GMODULE_LIBS = @GMODULE_LIBS@
-GOBJECT_CFLAGS = @GOBJECT_CFLAGS@
-GOBJECT_INTROSPECTION_LIBDIR = @GOBJECT_INTROSPECTION_LIBDIR@
-GOBJECT_LIBS = @GOBJECT_LIBS@
-GREP = @GREP@
-GTKDOC_CHECK = @GTKDOC_CHECK@
-GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
-GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
-GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
-GTKDOC_MKPDF = @GTKDOC_MKPDF@
-GTKDOC_REBASE = @GTKDOC_REBASE@
-HTML_DIR = @HTML_DIR@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LEX = @LEX@
-LEXLIB = @LEXLIB@
-LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MKDIR_P = @MKDIR_P@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-POW_LIB = @POW_LIB@
-PYTHON = @PYTHON@
-PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
-PYTHON_INCLUDES = @PYTHON_INCLUDES@
-PYTHON_LIBS = @PYTHON_LIBS@
-PYTHON_PLATFORM = @PYTHON_PLATFORM@
-PYTHON_PREFIX = @PYTHON_PREFIX@
-PYTHON_VERSION = @PYTHON_VERSION@
-RANLIB = @RANLIB@
-SCANNER_CFLAGS = @SCANNER_CFLAGS@
-SCANNER_LIBS = @SCANNER_LIBS@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-VERSION = @VERSION@
-YACC = @YACC@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-pkgpyexecdir = @pkgpyexecdir@
-pkgpythondir = @pkgpythondir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-pyexecdir = @pyexecdir@
-pythondir = @pythondir@
-runstatedir = @runstatedir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-EXTRA_DIST = \
-	gobject-introspection.sln	\
-	gi-build-defines.props	\
-	gi-gen-srcs.props	\
-	gi-install.props	\
-	gi-version-paths.props	\
-	gi-prebuild.vcxproj	\
-	girepository.vcxproj	\
-	girepository.vcxproj.filters	\
-	cmph-bdz-test.vcxproj	\
-	cmph-bdz-test.vcxproj.filters	\
-	cmph.vcxproj	\
-	cmph.vcxproj.filters	\
-	g-ir-compiler.vcxproj	\
-	g-ir-compiler.vcxproj.filters	\
-	g-ir-generate.vcxproj	\
-	g-ir-generate.vcxproj.filters	\
-	g-ir-inspect.vcxproj	\
-	g-ir-inspect.vcxproj.filters	\
-	glib-print.vcxproj	\
-	glib-print.vcxproj.filters	\
-	_giscanner.vcxproj	\
-	_giscanner.vcxproj.filters	\
-	gi-install.vcxproj	\
-	gi-install.vcxproj.filters	\
-	gi-introspect.vcxproj	\
-	README.txt
-
-DISTCLEANFILES = $(EXTRA_DIST)
-MSVC_BASE_VER = 10
-MSVC_BASE_VER_LONG = 2010
-MSVC_VER = 14
-MSVC_VER_LONG = 14
-@MSVC_BASE_NO_TOOLSET_SET_TRUE@MSVC_BASE_TOOLSET = $(MSVC_BASE_VER)0
-@MSVC_NO_TOOLSET_SET_TRUE@MSVC_TOOLSET = $(MSVC_VER)0
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/win32/Makefile-newvs.am $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign win32/vs14/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign win32/vs14/Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-$(top_srcdir)/win32/Makefile-newvs.am $(am__empty):
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-tags TAGS:
-
-ctags CTAGS:
-
-cscope cscopelist:
-
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am:
-
-.MAKE: install-am install-strip
-
-.PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	cscopelist-am ctags-am distclean distclean-generic \
-	distclean-libtool distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags-am uninstall uninstall-am
-
-.PRECIOUS: Makefile
-
-
-%.sln:
-	sed 's/11\.00/12\.00/g' < $(top_srcdir)/win32/vs$(MSVC_BASE_VER)/$@ > $(top_builddir)/win32/vs$(MSVC_VER)/$@.tmp
-	sed 's/$(MSVC_BASE_VER_LONG)/$(MSVC_VER_LONG)/g' < $(top_builddir)/win32/vs$(MSVC_VER)/$@.tmp > $(top_builddir)/win32/vs$(MSVC_VER)/$@
-	rm $(top_builddir)/win32/vs$(MSVC_VER)/$@.tmp
-
-%.txt:
-	sed 's/vs$(MSVC_BASE_VER)/vs$(MSVC_VER)/g' < $(top_srcdir)/win32/vs$(MSVC_BASE_VER)/$@ > $(top_builddir)/win32/vs$(MSVC_VER)/$@.tmp
-	sed 's/VS$(MSVC_BASE_VER)/VS$(MSVC_VER)/g' < $(top_builddir)/win32/vs$(MSVC_VER)/$@.tmp > $(top_builddir)/win32/vs$(MSVC_VER)/$@
-	rm $(top_builddir)/win32/vs$(MSVC_VER)/$@.tmp
-
-%.vcxproj:
-	if test -e $(top_srcdir)/win32/vs$(MSVC_BASE_VER)/$@; then \
-		sed 's/v$(MSVC_BASE_TOOLSET)/v$(MSVC_TOOLSET)/g' < $(top_srcdir)/win32/vs$(MSVC_BASE_VER)/$@ > $(top_builddir)/win32/vs$(MSVC_VER)/$@; \
-	else \
-		sed 's/v$(MSVC_BASE_TOOLSET)/v$(MSVC_TOOLSET)/g' < $(top_builddir)/win32/vs$(MSVC_BASE_VER)/$@ > $(top_builddir)/win32/vs$(MSVC_VER)/$@; \
-	fi
-
-%.props: $(top_builddir)/win32/vs$(MSVC_BASE_VER)/Makefile
-	if test -e $(top_srcdir)/win32/vs$(MSVC_BASE_VER)/$@; then \
-		sed 's/<VSVer>$(MSVC_BASE_VER)<\/VSVer>/<VSVer>$(MSVC_VER)<\/VSVer>/g' < $(top_srcdir)/win32/vs$(MSVC_BASE_VER)/$@ > $(top_builddir)/win32/vs$(MSVC_VER)/$@; \
-	else \
-		sed 's/<VSVer>$(MSVC_BASE_VER)<\/VSVer>/<VSVer>$(MSVC_VER)<\/VSVer>/g' < $(top_builddir)/win32/vs$(MSVC_BASE_VER)/$@ > $(top_builddir)/win32/vs$(MSVC_VER)/$@; \
-	fi
-
-%.vcxproj.filters:
-	if test -e $(top_srcdir)/win32/vs$(MSVC_BASE_VER)/$@; then \
-		cp $(top_srcdir)/win32/vs$(MSVC_BASE_VER)/$@ $(top_builddir)/win32/vs$(MSVC_VER)/$@; \
-	else \
-		cp $(top_builddir)/win32/vs$(MSVC_BASE_VER)/$@ $(top_builddir)/win32/vs$(MSVC_VER)/$@; \
-	fi
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/win32/vs14/README.txt b/win32/vs14/README.txt
deleted file mode 100644
index dfbd094..0000000
--- a/win32/vs14/README.txt
+++ /dev/null
@@ -1,104 +0,0 @@
-Please do not compile this package (gobject-introspection) in paths that contain
-spaces in them-as strange problems may occur during compilation or during
-the use of the library.
-
-Please refer to the following GNOME Live! page for more detailed
-instructions on building gobject-introsecption and its dependencies
-with Visual C++:
-
-https://live.gnome.org/GTK%2B/Win32/MSVCCompilationOfGTKStack
-
-This VS14 solution and the projects it includes are intented to be used
-in a gobject-introspection source tree unpacked from a tarball. In a git checkout you
-first need to use some Unix-like environment, which will do the work for you.
-
-The required dependencies are Python 2.7 (2.7) or 3.3 (3.x) or later, GLib and LibFFI.
-It is recommended that GLib is built with Visual C++ 2010 to avoid problems cause by
-usage of different CRTs.
-
-Please refer to the README.txt file in $(GLib_src_root)\build\win32\vs14 on how to build
-GLib using Visual C++ 2010
-
-For LibFFI, please use the Centricular fork of it, which can be found at
-https://github.com/centricular/libffi.  Please refer there on building--please
-note that this will involve the use of the Meson build system and possible the
-Ninja build tool, if the Visual Studio project generation is not used or is
-unavailable.
-
-For Python, retrieving the official Windows binaries for 2.7 (2.x) or 3.3 (3.x) or later
-from http://www.python.org will do the job-be sure that the Python version that
-you downloaded matches the configuration of your build (win32 or x64/amd64).  Ensure that
-the correct path for your Python interpretor is set in gi-extra-paths.vsprops prior to
-opening the project files, or close the project files and delete all the *.user, *.sdf and
-*.suo files and reopening the project files.
-
-For building the Regress test project, cairo (and possibly cairo-gobject support)
-is needed.
-
-Set up the source tree as follows under some arbitrary top
-folder <root>:
-
-<root>\<this-gobject-introspection-source-tree>
-<root>\vs14\<PlatformName>
-
-*this* file you are now reading is thus located at
-<root>\<this-glib-source-tree>\build\win32\vs14\README.
-
-<PlatformName> is either Win32 or x64, as in VS14 project files.
-
-For LibFFI, one should also put the generated ffi.h and ffitarget.h
-into <root>\vs14\<PlatformName>\include\ and the compiled static libffi.lib
-(or copy libffi-convenience.lib into libffi.lib) into
-<root>\vs14\<PlatformName>\lib\.
-
-The libintl.h that is used for building GLib needs to be in
-<root>\vs14\<PlatformName>\include, if not already done so.
-
-A working pkg-config tool is also required-it may be obtained from
-http://www.gtk.org/download/win32.php [32-bit]
-http://www.gtk.org/download/win64.php [64-bit]
-
-*** Note! ***
-The build of G-I is now done within the project files, although it is still possible to
-do it in two stages by using the NMake Makefiles after building the projects.
-
-As there are numerous possible configurations on Python and PKG_CONFIG_PATH, note that:
--For both methods PKG_CONFIG_PATH is by default $(PREFIX)\lib\pkgconfig, where $(PREFIX)
- is by default <parent_dir_of_G-I_srcroot>\vs14\<PlatformName>.  If searching from
- more directories is desired, set the PKG_CONFIG_PATH environment variable before using
- the NMake Makefile or opening the projects, but note that $(PREFIX)\lib\pkgconfig will
- precede the set paths.
--For the Python Path using the project files: check whether the directory settings in
- gi-version-paths.vsprops under PythonDir (32-bit) or PythonDirX64 (x64) is correct.
- If the projects have been loaded by Visual Studio, close the projects and re-open them.
- You may need to delete all the *.suo, *.user and *.ncb files in this directory for
- the changes to take effect.
--For the Python Path using the NMake Makefiles: pass in PYTHON=<full_path_to_python> to
- the NMake Makefile or set it in the environment.  The bit-ness of your Python installation
- must match the configuration that you are building for.
-
-The use of Visual Studio Projects will no longer require the setting of environmental
-variables, but the following environmental variables are needed (either by using "set xxx=yyy"
-or by nmake -f gi-introspection-msvc.mak xxx=yyy) for building the introspection files (which
-should be done after successfully building the Project Files):
-
-Please see $(srcroot)\build\win32\gi-introspection-msvc.mak for more details.  Doing
-"nmake -f gi-introspection-msvc.mak (options omitted)" will build the various introspection files,
-and "nmake -f gi-introspection-msvc.mak (options omitted) install-introspection" will copy the introspection
-files to <root>\vs14\<PlatformName>\share\gir-1.0 (.gir files) and <root>\vs14\<PlatformName>\lib\girepository-1.0
-(.typelib files)
-
-*** End of Note! ***
-
-The "install" project will copy build results and headers into their
-appropriate location under <root>\vs14\<PlatformName>. For instance,
-built DLLs go into <root>\vs14\<PlatformName>\bin, built LIBs into
-<root>\vs14\<PlatformName>\lib and gobject-introspection headers into
-<root>\vs14\<PlatformName>\include\gobject-introsection-1.0.
-
-This is then from where
-project files higher in the stack are supposed to look for them, not
-from a specific gobject-introspection source tree.
-
---Tor Lillqvist <tml@iki.fi>
---Updated by Chun-wei Fan <fanc999@gmail.com>
diff --git a/win32/vs14/_giscanner.vcxproj b/win32/vs14/_giscanner.vcxproj
deleted file mode 100644
index 052efc3..0000000
--- a/win32/vs14/_giscanner.vcxproj
+++ /dev/null
@@ -1,188 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{8311394F-9114-4C97-80F2-51BCABA054C9}</ProjectGuid>
-    <RootNamespace>_giscanner</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\giscanner;$(PythonDir)\include;$(PythonDir)\PC;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <ForcedIncludeFiles>%(ForcedIncludeFiles);io.h</ForcedIncludeFiles>
-      <PreprocessorDefinitions>_DEBUG;YY_NO_UNISTD_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(OutDir)$(ProjectName).pyd</OutputFile>
-      <AdditionalLibraryDirectories>$(PythonDir)\libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\..\giscanner;$(PythonDir)\include;$(PythonDir)\PC;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <ForcedIncludeFiles>%(ForcedIncludeFiles);io.h</ForcedIncludeFiles>
-      <PreprocessorDefinitions>YY_NO_UNISTD_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(OutDir)$(ProjectName).pyd</OutputFile>
-      <AdditionalLibraryDirectories>$(PythonDir)\libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\giscanner;$(PythonDirX64)\include;$(PythonDirX64)\PC;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <ForcedIncludeFiles>%(ForcedIncludeFiles);io.h</ForcedIncludeFiles>
-      <PreprocessorDefinitions>_DEBUG;YY_NO_UNISTD_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(OutDir)$(ProjectName).pyd</OutputFile>
-      <AdditionalLibraryDirectories>$(PythonDirX64)\libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\..\giscanner;$(PythonDirX64)\include;$(PythonDirX64)\PC;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <ForcedIncludeFiles>%(ForcedIncludeFiles);io.h</ForcedIncludeFiles>
-      <PreprocessorDefinitions>YY_NO_UNISTD_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(OutDir)$(ProjectName).pyd</OutputFile>
-      <AdditionalLibraryDirectories>$(PythonDirX64)\libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\giscanner\giscannermodule.c" />
-    <ClCompile Include="..\..\scannerlexer.c" />
-    <ClCompile Include="..\..\scannerparser.c" />
-    <ClCompile Include="..\..\giscanner\sourcescanner.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="gi-prebuild.vcxproj">
-      <Project>{2093d218-190e-4194-9421-3ba7cbf33b11}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/win32/vs14/_giscanner.vcxproj.filters b/win32/vs14/_giscanner.vcxproj.filters
deleted file mode 100644
index 1ddc9a2..0000000
--- a/win32/vs14/_giscanner.vcxproj.filters
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Sources">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Headers">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\giscanner\giscannermodule.c"><Filter>Sources</Filter></ClCompile>
-    <ClCompile Include="..\..\scannerlexer.c"><Filter>Sources</Filter></ClCompile>
-    <ClCompile Include="..\..\scannerparser.c"><Filter>Sources</Filter></ClCompile>
-    <ClCompile Include="..\..\giscanner\sourcescanner.c"><Filter>Sources</Filter></ClCompile>
-  </ItemGroup>
-</Project>
diff --git a/win32/vs14/cmph-bdz-test.vcxproj b/win32/vs14/cmph-bdz-test.vcxproj
deleted file mode 100644
index 79348a4..0000000
--- a/win32/vs14/cmph-bdz-test.vcxproj
+++ /dev/null
@@ -1,174 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{E41F378B-CCDD-4B1C-89C3-6D2C950FAF1A}</ProjectGuid>
-    <RootNamespace>cmphbdztest</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\girepository\cmph;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\..\girepository\cmph;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WholeProgramOptimization>false</WholeProgramOptimization>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\girepository\cmph;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\..\girepository\cmph;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\girepository\cmph-bdz-test.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="cmph.vcxproj">
-      <Project>{442c007e-d901-41da-9706-5db4afb4c06b}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/win32/vs14/cmph-bdz-test.vcxproj.filters b/win32/vs14/cmph-bdz-test.vcxproj.filters
deleted file mode 100644
index 2720d49..0000000
--- a/win32/vs14/cmph-bdz-test.vcxproj.filters
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Sources">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Headers">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\girepository\cmph-bdz-test.c">
-      <Filter>Sources</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
diff --git a/win32/vs14/cmph.vcxproj b/win32/vs14/cmph.vcxproj
deleted file mode 100644
index 4591d8d..0000000
--- a/win32/vs14/cmph.vcxproj
+++ /dev/null
@@ -1,163 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{442C007E-D901-41DA-9706-5DB4AFB4C06B}</ProjectGuid>
-    <RootNamespace>cmph</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-   <ClCompile Include="..\..\girepository\cmph\bdz.c" />
-   <ClCompile Include="..\..\girepository\cmph\bdz_ph.c" />
-   <ClCompile Include="..\..\girepository\cmph\bmz8.c" />
-   <ClCompile Include="..\..\girepository\cmph\bmz.c" />
-   <ClCompile Include="..\..\girepository\cmph\brz.c" />
-   <ClCompile Include="..\..\girepository\cmph\buffer_entry.c" />
-   <ClCompile Include="..\..\girepository\cmph\buffer_manager.c" />
-   <ClCompile Include="..\..\girepository\cmph\chd.c" />
-   <ClCompile Include="..\..\girepository\cmph\chd_ph.c" />
-   <ClCompile Include="..\..\girepository\cmph\chm.c" />
-   <ClCompile Include="..\..\girepository\cmph\cmph.c" />
-   <ClCompile Include="..\..\girepository\cmph\cmph_structs.c" />
-   <ClCompile Include="..\..\girepository\cmph\compressed_rank.c" />
-   <ClCompile Include="..\..\girepository\cmph\compressed_seq.c" />
-   <ClCompile Include="..\..\girepository\cmph\fch_buckets.c" />
-   <ClCompile Include="..\..\girepository\cmph\fch.c" />
-   <ClCompile Include="..\..\girepository\cmph\graph.c" />
-   <ClCompile Include="..\..\girepository\cmph\hash.c" />
-   <ClCompile Include="..\..\girepository\cmph\jenkins_hash.c" />
-   <ClCompile Include="..\..\girepository\cmph\miller_rabin.c" />
-   <ClCompile Include="..\..\girepository\cmph\select.c" />
-   <ClCompile Include="..\..\girepository\cmph\vqueue.c" />
-   <ClCompile Include="..\..\girepository\cmph\vstack.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="gi-prebuild.vcxproj">
-      <Project>{2093d218-190e-4194-9421-3ba7cbf33b11}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/win32/vs14/cmph.vcxproj.filters b/win32/vs14/cmph.vcxproj.filters
deleted file mode 100644
index df71f98..0000000
--- a/win32/vs14/cmph.vcxproj.filters
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Sources">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Headers">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-   <ClCompile Include="..\..\girepository\cmph\bdz.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\cmph\bdz_ph.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\cmph\bmz8.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\cmph\bmz.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\cmph\brz.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\cmph\buffer_entry.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\cmph\buffer_manager.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\cmph\chd.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\cmph\chd_ph.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\cmph\chm.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\cmph\cmph.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\cmph\cmph_structs.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\cmph\compressed_rank.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\cmph\compressed_seq.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\cmph\fch_buckets.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\cmph\fch.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\cmph\graph.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\cmph\hash.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\cmph\jenkins_hash.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\cmph\miller_rabin.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\cmph\select.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\cmph\vqueue.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\cmph\vstack.c"><Filter>Source Files</Filter></ClCompile>
-  </ItemGroup>
-</Project>
diff --git a/win32/vs14/g-ir-compiler.vcxproj b/win32/vs14/g-ir-compiler.vcxproj
deleted file mode 100644
index 21ebd82..0000000
--- a/win32/vs14/g-ir-compiler.vcxproj
+++ /dev/null
@@ -1,187 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774}</ProjectGuid>
-    <RootNamespace>gircompiler</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ffi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ffi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ffi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ffi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-   <ClCompile Include="..\..\girepository\gthash.c" />
-   <ClCompile Include="..\..\girepository\girmodule.c" />
-   <ClCompile Include="..\..\girepository\girnode.c" />
-   <ClCompile Include="..\..\girepository\giroffsets.c" />
-   <ClCompile Include="..\..\girepository\girparser.c" />
-   <ClCompile Include="..\..\girepository\girwriter.c" />
-    <ClCompile Include="..\..\tools\compiler.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="cmph.vcxproj">
-      <Project>{442c007e-d901-41da-9706-5db4afb4c06b}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="girepository.vcxproj">
-      <Project>{23e28245-8fc7-4b41-b1c5-8785bd4366a7}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/win32/vs14/g-ir-compiler.vcxproj.filters b/win32/vs14/g-ir-compiler.vcxproj.filters
deleted file mode 100644
index 7b5ec8d..0000000
--- a/win32/vs14/g-ir-compiler.vcxproj.filters
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Sources">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Headers">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-   <ClCompile Include="..\..\girepository\gthash.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\girmodule.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\girnode.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\giroffsets.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\girparser.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\girwriter.c"><Filter>Source Files</Filter></ClCompile>
-    <ClCompile Include="..\..\tools\compiler.c"><Filter>Sources</Filter></ClCompile>
-  </ItemGroup>
-</Project>
diff --git a/win32/vs14/g-ir-generate.vcxproj b/win32/vs14/g-ir-generate.vcxproj
deleted file mode 100644
index 1465588..0000000
--- a/win32/vs14/g-ir-generate.vcxproj
+++ /dev/null
@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{F4E6621F-A7DD-4863-8CCF-BA04DFC601E3}</ProjectGuid>
-    <RootNamespace>girgenerate</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\tools\generate.c" />
-    <ClCompile Include="..\..\girepository\girwriter.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="girepository.vcxproj">
-      <Project>{23e28245-8fc7-4b41-b1c5-8785bd4366a7}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/win32/vs14/g-ir-generate.vcxproj.filters b/win32/vs14/g-ir-generate.vcxproj.filters
deleted file mode 100644
index b3b32ef..0000000
--- a/win32/vs14/g-ir-generate.vcxproj.filters
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Sources">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Headers">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\tools\generate.c">
-      <Filter>Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\girepository\girwriter.c">
-      <Filter>Sources</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
diff --git a/win32/vs14/g-ir-inspect.vcxproj b/win32/vs14/g-ir-inspect.vcxproj
deleted file mode 100644
index f95da5f..0000000
--- a/win32/vs14/g-ir-inspect.vcxproj
+++ /dev/null
@@ -1,169 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{F4E6621F-A7DD-4863-8CCF-CA04DFC601E3}</ProjectGuid>
-    <RootNamespace>girinspect</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\tools\g-ir-inspect.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="girepository.vcxproj">
-      <Project>{23e28245-8fc7-4b41-b1c5-8785bd4366a7}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/win32/vs14/g-ir-inspect.vcxproj.filters b/win32/vs14/g-ir-inspect.vcxproj.filters
deleted file mode 100644
index 371419a..0000000
--- a/win32/vs14/g-ir-inspect.vcxproj.filters
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Sources">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Headers">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\tools\g-ir-inspect.c"><Filter>Sources</Filter></ClCompile>
-  </ItemGroup>
-</Project>
diff --git a/win32/vs14/gi-build-defines.props b/win32/vs14/gi-build-defines.props
deleted file mode 100644
index 3a7f5fe..0000000
--- a/win32/vs14/gi-build-defines.props
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ImportGroup Label="PropertySheets">
-    <Import Project="gi-version-paths.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros">
-    <GIRepositoryBuildDefines>G_IREPOSITORY_COMPILATION;DLL_EXPORT</GIRepositoryBuildDefines>
-    <GIIntrospectNMakeCmd>cd ..
-set VCInstallDir=$(VCInstallDir)
-nmake -f gi-introspection-msvc.mak CFG=$(Configuration) PREFIX=$(GlibEtcInstallRoot)</GIIntrospectNMakeCmd>
-    <GIIntrospectBuiltFiles>$(SolutionDir)\..\GIRepository-2.0.typelib;$(SolutionDir)\..\cairo-1.0.typelib</GIIntrospectBuiltFiles>
-  </PropertyGroup>
-  <PropertyGroup>
-    <_PropertySheetDisplayName>gibuilddefinesprops</_PropertySheetDisplayName>
-    <OutDir>$(SolutionDir)$(Configuration)\$(PlatformName)\bin\</OutDir>
-    <IntDir>$(SolutionDir)$(Configuration)\$(PlatformName)\obj\$(ProjectName)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..;..\..\girepository;$(GlibEtcInstallRoot)\include\gio-win32-2.0;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>HAVE_CONFIG_H;WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ForcedIncludeFiles>msvc_recommended_pragmas.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <AdditionalOptions>/d2Zi+ %(AdditionalOptions)</AdditionalOptions>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>gio-2.0.lib;gobject-2.0.lib;gmodule-2.0.lib;gthread-2.0.lib;glib-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(GlibEtcInstallRoot)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalOptions Condition="'$(VisualStudioVersion)|$(Platform)'=='11.0|x64'">/HIGHENTROPYVA %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalOptions Condition="'$(VisualStudioVersion)|$(Platform)'=='12.0|x64'">/HIGHENTROPYVA %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalOptions Condition="'$(VisualStudioVersion)|$(Platform)'=='14.0|x64'">/HIGHENTROPYVA %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalOptions Condition="'$(VisualStudioVersion)|$(Platform)'=='15.0|x64'">/HIGHENTROPYVA %(AdditionalOptions)</AdditionalOptions>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <BuildMacro Include="GIRepositoryBuildDefines">
-      <Value>$(GIRepositoryBuildDefines)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GIIntrospectNMakeCmd">
-      <Value>$(GIIntrospectNMakeCmd)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GIIntrospectBuiltFiles">
-      <Value>$(GIIntrospectBuiltFiles)</Value>
-    </BuildMacro>
-  </ItemGroup>
-</Project>
diff --git a/win32/vs14/gi-gen-srcs.props b/win32/vs14/gi-gen-srcs.props
deleted file mode 100644
index 0a5d2c6..0000000
--- a/win32/vs14/gi-gen-srcs.props
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ImportGroup Label="PropertySheets">
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros">
-    <CopyConfigH>copy ..\..\config.h.win32 ..\..\config.h</CopyConfigH>
-    <GenToolsScripts>$(PythonDir)\python ..\gen-win32-g-ir-tools.py</GenToolsScripts>
-    <GenToolsScriptsX64>$(PythonDirX64)\python ..\gen-win32-g-ir-tools.py</GenToolsScriptsX64>
-  </PropertyGroup>
-  <PropertyGroup>
-    <_PropertySheetDisplayName>gigensrcsprops</_PropertySheetDisplayName>
-  </PropertyGroup>
-  <ItemGroup>
-    <BuildMacro Include="CopyConfigH">
-      <Value>$(CopyConfigH)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GenToolsScripts">
-      <Value>$(GenToolsScripts)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GenToolsScriptsX64">
-      <Value>$(GenToolsScriptsX64)</Value>
-    </BuildMacro>
-  </ItemGroup>
-</Project>
diff --git a/win32/vs14/gi-install.props b/win32/vs14/gi-install.props
deleted file mode 100644
index 7643cbd..0000000
--- a/win32/vs14/gi-install.props
+++ /dev/null
@@ -1,202 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ImportGroup Label="PropertySheets">
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros">
-    <BinDir>$(SolutionDir)$(Configuration)\$(Platform)\bin</BinDir>
-    <GIDoInstall>
-mkdir $(CopyDir)
-mkdir $(CopyDir)\bin
-copy $(BinDir)\$(LibGIDllPrefix)girepository$(LibGIDllSuffix).dll $(CopyDir)\bin
-copy $(BinDir)\$(LibGIDllPrefix)girepository$(LibGIDllSuffix).pdb $(CopyDir)\bin
-copy $(BinDir)\g-ir-compiler.exe $(CopyDir)\bin
-copy $(BinDir)\g-ir-compiler.pdb $(CopyDir)\bin
-copy $(BinDir)\g-ir-generate.exe $(CopyDir)\bin
-copy $(BinDir)\g-ir-generate.pdb $(CopyDir)\bin
-copy $(BinDir)\g-ir-inspect.exe $(CopyDir)\bin
-copy $(BinDir)\g-ir-inspect.pdb $(CopyDir)\bin
-copy ..\..\tools\g-ir-annotation-tool $(CopyDir)\bin
-copy ..\..\tools\g-ir-doc-tool $(CopyDir)\bin
-copy ..\..\tools\g-ir-scanner $(CopyDir)\bin
-copy $(BinDir)\glib-print.exe $(CopyDir)\bin
-copy $(BinDir)\glib-print.pdb $(CopyDir)\bin
-mkdir $(CopyDir)\include\gobject-introspection-1.0\girepository
-copy ..\..\girepository\giarginfo.h $(CopyDir)\include\gobject-introspection-1.0\girepository\giarginfo.h
-copy ..\..\girepository\gibaseinfo.h $(CopyDir)\include\gobject-introspection-1.0\girepository\gibaseinfo.h
-copy ..\..\girepository\gicallableinfo.h $(CopyDir)\include\gobject-introspection-1.0\girepository\gicallableinfo.h
-copy ..\..\girepository\giconstantinfo.h $(CopyDir)\include\gobject-introspection-1.0\girepository\giconstantinfo.h
-copy ..\..\girepository\gienuminfo.h $(CopyDir)\include\gobject-introspection-1.0\girepository\gienuminfo.h
-copy ..\..\girepository\gifieldinfo.h $(CopyDir)\include\gobject-introspection-1.0\girepository\gifieldinfo.h
-copy ..\..\girepository\gifunctioninfo.h $(CopyDir)\include\gobject-introspection-1.0\girepository\gifunctioninfo.h
-copy ..\..\girepository\giinterfaceinfo.h $(CopyDir)\include\gobject-introspection-1.0\girepository\giinterfaceinfo.h
-copy ..\..\girepository\giobjectinfo.h $(CopyDir)\include\gobject-introspection-1.0\girepository\giobjectinfo.h
-copy ..\..\girepository\gipropertyinfo.h $(CopyDir)\include\gobject-introspection-1.0\girepository\gipropertyinfo.h
-copy ..\..\girepository\giregisteredtypeinfo.h $(CopyDir)\include\gobject-introspection-1.0\girepository\giregisteredtypeinfo.h
-copy ..\..\girepository\girepository.h $(CopyDir)\include\gobject-introspection-1.0\girepository\girepository.h
-copy ..\..\girepository\girffi.h $(CopyDir)\include\gobject-introspection-1.0\girepository\girffi.h
-copy ..\..\girepository\gisignalinfo.h $(CopyDir)\include\gobject-introspection-1.0\girepository\gisignalinfo.h
-copy ..\..\girepository\gistructinfo.h $(CopyDir)\include\gobject-introspection-1.0\girepository\gistructinfo.h
-copy ..\..\girepository\gitypeinfo.h $(CopyDir)\include\gobject-introspection-1.0\girepository\gitypeinfo.h
-copy ..\..\girepository\gitypelib.h $(CopyDir)\include\gobject-introspection-1.0\girepository\gitypelib.h
-copy ..\..\girepository\gitypes.h $(CopyDir)\include\gobject-introspection-1.0\girepository\gitypes.h
-copy ..\..\girepository\giunioninfo.h $(CopyDir)\include\gobject-introspection-1.0\girepository\giunioninfo.h
-copy ..\..\girepository\giversionmacros.h $(CopyDir)\include\gobject-introspection-1.0\girepository\giversionmacros.h
-copy ..\..\girepository\givfuncinfo.h $(CopyDir)\include\gobject-introspection-1.0\girepository\givfuncinfo.h
-mkdir $(CopyDir)\lib\gobject-introspection\giscanner
-mkdir $(CopyDir)\lib\gobject-introspection\giscanner\collections
-mkdir $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates
-mkdir $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C
-mkdir $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs
-mkdir $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python
-copy ..\..\giscanner\__init__.py $(CopyDir)\lib\gobject-introspection\giscanner
-copy ..\..\giscanner\annotationmain.py $(CopyDir)\lib\gobject-introspection\giscanner
-copy ..\..\giscanner\annotationparser.py $(CopyDir)\lib\gobject-introspection\giscanner
-copy ..\..\giscanner\ast.py $(CopyDir)\lib\gobject-introspection\giscanner
-copy ..\..\giscanner\cachestore.py $(CopyDir)\lib\gobject-introspection\giscanner
-copy ..\..\giscanner\ccompiler.py $(CopyDir)\lib\gobject-introspection\giscanner
-copy ..\..\giscanner\codegen.py $(CopyDir)\lib\gobject-introspection\giscanner
-copy ..\..\giscanner\docmain.py $(CopyDir)\lib\gobject-introspection\giscanner
-copy ..\..\giscanner\docwriter.py $(CopyDir)\lib\gobject-introspection\giscanner
-copy ..\..\giscanner\dumper.py $(CopyDir)\lib\gobject-introspection\giscanner
-copy ..\..\giscanner\introspectablepass.py $(CopyDir)\lib\gobject-introspection\giscanner
-copy ..\..\giscanner\girparser.py $(CopyDir)\lib\gobject-introspection\giscanner
-copy ..\..\giscanner\girwriter.py $(CopyDir)\lib\gobject-introspection\giscanner
-copy ..\..\giscanner\gdumpparser.py $(CopyDir)\lib\gobject-introspection\giscanner
-copy ..\..\giscanner\libtoolimporter.py $(CopyDir)\lib\gobject-introspection\giscanner
-copy ..\..\giscanner\maintransformer.py $(CopyDir)\lib\gobject-introspection\giscanner
-copy ..\..\giscanner\message.py $(CopyDir)\lib\gobject-introspection\giscanner
-copy ..\..\giscanner\msvccompiler.py $(CopyDir)\lib\gobject-introspection\giscanner
-copy ..\..\giscanner\shlibs.py $(CopyDir)\lib\gobject-introspection\giscanner
-copy ..\..\giscanner\scannermain.py $(CopyDir)\lib\gobject-introspection\giscanner
-copy ..\..\giscanner\sectionparser.py $(CopyDir)\lib\gobject-introspection\giscanner
-copy ..\..\giscanner\sourcescanner.py $(CopyDir)\lib\gobject-introspection\giscanner
-copy ..\..\giscanner\testcodegen.py $(CopyDir)\lib\gobject-introspection\giscanner
-copy ..\..\giscanner\transformer.py $(CopyDir)\lib\gobject-introspection\giscanner
-copy ..\..\giscanner\utils.py $(CopyDir)\lib\gobject-introspection\giscanner
-copy ..\..\giscanner\xmlwriter.py $(CopyDir)\lib\gobject-introspection\giscanner
-copy ..\..\giscanner\collections\__init__.py $(CopyDir)\lib\gobject-introspection\giscanner\collections
-copy ..\..\giscanner\collections\counter.py $(CopyDir)\lib\gobject-introspection\giscanner\collections
-copy ..\..\giscanner\collections\ordereddict.py $(CopyDir)\lib\gobject-introspection\giscanner\collections
-copy ..\..\giscanner\doctemplates\base.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates
-copy ..\..\giscanner\doctemplates\class.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates
-copy ..\..\giscanner\doctemplates\namespace.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates
-copy ..\..\giscanner\doctemplates\C\callback.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C
-copy ..\..\giscanner\doctemplates\C\class.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C
-copy ..\..\giscanner\doctemplates\C\constructor.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C
-copy ..\..\giscanner\doctemplates\C\default.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C
-copy ..\..\giscanner\doctemplates\C\enum.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C
-copy ..\..\giscanner\doctemplates\C\function.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C
-copy ..\..\giscanner\doctemplates\C\field.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C
-copy ..\..\giscanner\doctemplates\C\interface.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C
-copy ..\..\giscanner\doctemplates\C\method.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C
-copy ..\..\giscanner\doctemplates\C\namespace.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C
-copy ..\..\giscanner\doctemplates\C\property.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C
-copy ..\..\giscanner\doctemplates\C\record.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C
-copy ..\..\giscanner\doctemplates\C\signal.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C
-copy ..\..\giscanner\doctemplates\C\vfunc.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C
-copy ..\..\giscanner\doctemplates\Python\callback.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python
-copy ..\..\giscanner\doctemplates\Python\class.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python
-copy ..\..\giscanner\doctemplates\Python\constructor.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python
-copy ..\..\giscanner\doctemplates\Python\default.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python
-copy ..\..\giscanner\doctemplates\Python\enum.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python
-copy ..\..\giscanner\doctemplates\Python\function.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python
-copy ..\..\giscanner\doctemplates\Python\field.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python
-copy ..\..\giscanner\doctemplates\Python\interface.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python
-copy ..\..\giscanner\doctemplates\Python\method.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python
-copy ..\..\giscanner\doctemplates\Python\namespace.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python
-copy ..\..\giscanner\doctemplates\Python\property.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python
-copy ..\..\giscanner\doctemplates\Python\record.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python
-copy ..\..\giscanner\doctemplates\Python\signal.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python
-copy ..\..\giscanner\doctemplates\Python\vfunc.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python
-copy ..\..\giscanner\doctemplates\Gjs\callback.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs
-copy ..\..\giscanner\doctemplates\Gjs\class.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs
-copy ..\..\giscanner\doctemplates\Gjs\constructor.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs
-copy ..\..\giscanner\doctemplates\Gjs\default.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs
-copy ..\..\giscanner\doctemplates\Gjs\enum.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs
-copy ..\..\giscanner\doctemplates\Gjs\function.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs
-copy ..\..\giscanner\doctemplates\Gjs\field.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs
-copy ..\..\giscanner\doctemplates\Gjs\interface.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs
-copy ..\..\giscanner\doctemplates\Gjs\method.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs
-copy ..\..\giscanner\doctemplates\Gjs\namespace.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs
-copy ..\..\giscanner\doctemplates\Gjs\property.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs
-copy ..\..\giscanner\doctemplates\Gjs\record.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs
-copy ..\..\giscanner\doctemplates\Gjs\signal.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs
-copy ..\..\giscanner\doctemplates\Gjs\vfunc.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs
-mkdir $(CopyDir)\share\gobject-introspection-1.0\tests
-copy ..\..\tests\gitestmacros.h $(CopyDir)\share\gobject-introspection-1.0\tests
-copy ..\..\tests\gimarshallingtests.c $(CopyDir)\share\gobject-introspection-1.0\tests
-copy ..\..\tests\gimarshallingtests.h $(CopyDir)\share\gobject-introspection-1.0\tests
-copy ..\..\tests\scanner\regress.c $(CopyDir)\share\gobject-introspection-1.0\tests
-copy ..\..\tests\scanner\regress.h $(CopyDir)\share\gobject-introspection-1.0\tests
-copy ..\..\tests\scanner\annotation.c $(CopyDir)\share\gobject-introspection-1.0\tests
-copy ..\..\tests\scanner\annotation.h $(CopyDir)\share\gobject-introspection-1.0\tests
-copy ..\..\tests\scanner\foo.c $(CopyDir)\share\gobject-introspection-1.0\tests
-copy ..\..\tests\scanner\foo.h $(CopyDir)\share\gobject-introspection-1.0\tests
-copy ..\..\tests\scanner\drawable.c $(CopyDir)\share\gobject-introspection-1.0\tests
-copy ..\..\tests\scanner\drawable.h $(CopyDir)\share\gobject-introspection-1.0\tests
-copy ..\..\tests\scanner\warnlib.c $(CopyDir)\share\gobject-introspection-1.0\tests
-copy ..\..\tests\scanner\warnlib.h $(CopyDir)\share\gobject-introspection-1.0\tests
-copy ..\..\tests\scanner\utility.c $(CopyDir)\share\gobject-introspection-1.0\tests
-copy ..\..\tests\scanner\utility.h $(CopyDir)\share\gobject-introspection-1.0\tests
-copy ..\everything.c $(CopyDir)\share\gobject-introspection-1.0\tests
-copy ..\everything.h $(CopyDir)\share\gobject-introspection-1.0\tests
-copy $(BinDir)\_giscanner.pyd $(CopyDir)\lib\gobject-introspection\giscanner
-copy $(BinDir)\_giscanner.pdb $(CopyDir)\lib\gobject-introspection\giscanner
-mkdir $(CopyDir)\share\gobject-introspection-$(ApiVersion)
-copy ..\..\girepository\gdump.c $(CopyDir)\share\gobject-introspection-$(ApiVersion)
-mkdir $(CopyDir)\lib
-copy $(BinDir)\girepository-$(ApiVersion).lib $(CopyDir)\lib
-mkdir $(CopyDir)\share\gir-$(ApiVersion)
-copy ..\cairo-1.0.gir $(CopyDir)\share\gir-$(ApiVersion)
-copy ..\fontconfig-2.0.gir $(CopyDir)\share\gir-$(ApiVersion)
-copy ..\freetype2-2.0.gir $(CopyDir)\share\gir-$(ApiVersion)
-copy ..\Gio-2.0.gir $(CopyDir)\share\gir-$(ApiVersion)
-copy ..\GIRepository-2.0.gir $(CopyDir)\share\gir-$(ApiVersion)
-copy ..\GL-1.0.gir $(CopyDir)\share\gir-$(ApiVersion)
-copy ..\GLib-2.0.gir $(CopyDir)\share\gir-$(ApiVersion)
-copy ..\GModule-2.0.gir $(CopyDir)\share\gir-$(ApiVersion)
-copy ..\GObject-2.0.gir $(CopyDir)\share\gir-$(ApiVersion)
-copy ..\libxml2-2.0.gir $(CopyDir)\share\gir-$(ApiVersion)
-copy ..\win32-1.0.gir $(CopyDir)\share\gir-$(ApiVersion)
-mkdir $(CopyDir)\lib\girepository-$(ApiVersion)
-copy ..\cairo-1.0.typelib $(CopyDir)\lib\girepository-$(ApiVersion)
-copy ..\fontconfig-2.0.typelib $(CopyDir)\lib\girepository-$(ApiVersion)
-copy ..\freetype2-2.0.typelib $(CopyDir)\lib\girepository-$(ApiVersion)
-copy ..\Gio-2.0.typelib $(CopyDir)\lib\girepository-$(ApiVersion)
-copy ..\GIRepository-2.0.typelib $(CopyDir)\lib\girepository-$(ApiVersion)
-copy ..\GL-1.0.typelib $(CopyDir)\lib\girepository-$(ApiVersion)
-copy ..\GLib-2.0.typelib $(CopyDir)\lib\girepository-$(ApiVersion)
-copy ..\GModule-2.0.typelib $(CopyDir)\lib\girepository-$(ApiVersion)
-copy ..\GObject-2.0.typelib $(CopyDir)\lib\girepository-$(ApiVersion)
-copy ..\libxml2-2.0.typelib $(CopyDir)\lib\girepository-$(ApiVersion)
-copy ..\win32-1.0.typelib $(CopyDir)\lib\girepository-$(ApiVersion)
-mkdir $(CopyDir)\lib\pkgconfig
-copy ..\gobject-introspection-1.0.pc $(CopyDir)\lib\pkgconfig
-copy ..\gobject-introspection-no-export-1.0.pc $(CopyDir)\lib\pkgconfig
-    </GIDoInstall>
-    <GIPCFiles>..\gobject-introspection-1.0.pc;..\gobject-introspection-no-export-1.0.pc</GIPCFiles>
-    <GIGenPC>$(PythonDir)\python.exe ..\gipc.py --version=$(GIVersion) --prefix=$(CopyDir)</GIGenPC>
-    <GIGenPCX64>$(PythonDirX64)\python.exe ..\gipc.py --version=$(GIVersion) --prefix=$(CopyDir)</GIGenPCX64>
-  </PropertyGroup>
-  <PropertyGroup>
-    <_PropertySheetDisplayName>giinstallprops</_PropertySheetDisplayName>
-  </PropertyGroup>
-  <ItemGroup>
-    <BuildMacro Include="BinDir">
-      <Value>$(BinDir)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GIDoInstall">
-      <Value>$(GIDoInstall)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GIPCFiles">
-      <Value>$(GIPCFiles)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GIGenPC">
-      <Value>$(GIGenPC)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GIGenPCX64">
-      <Value>$(GIGenPCX64)</Value>
-    </BuildMacro>
-  </ItemGroup>
-</Project>
diff --git a/win32/vs14/gi-install.vcxproj b/win32/vs14/gi-install.vcxproj
deleted file mode 100644
index 5fb1a97..0000000
--- a/win32/vs14/gi-install.vcxproj
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{2093D218-190E-4194-9421-3BA7CBF33B10}</ProjectGuid>
-    <RootNamespace>install</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Utility</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Utility</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Utility</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Utility</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-install.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-install.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-install.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-install.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <OutDir Condition="'$(Configuration)'=='Debug'">$(GlibEtcInstallRoot)\</OutDir>
-    <ExtensionsToDeleteOnClean Condition="'$(Configuration)'=='Debug'" />
-    <OutDir Condition="'$(Configuration)'=='Release'">$(GlibEtcInstallRoot)\</OutDir>
-    <ExtensionsToDeleteOnClean Condition="'$(Configuration)'=='Release'" />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <CustomBuild Include="..\..\config.h.win32">
-      <Message Condition="'$(Configuration)'=='Debug'">Installing Build Results...</Message>
-      <AdditionalInputs Condition="'$(Configuration)'=='Debug'">$(GIPCFiles)</AdditionalInputs>
-      <Command Condition="'$(Configuration)'=='Debug'">$(GIDoInstall)</Command>
-      <Outputs Condition="'$(Configuration)'=='Debug'">some_random_file;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)'=='Release'">Installing Build Results...</Message>
-      <AdditionalInputs Condition="'$(Configuration)'=='Release'">$(GIPCFiles)</AdditionalInputs>
-      <Command Condition="'$(Configuration)'=='Release'">$(GIDoInstall)</Command>
-      <Outputs Condition="'$(Configuration)'=='Release'">some_random_file;%(Outputs)</Outputs>
-    </CustomBuild>
-    <CustomBuild Include="..\gipc.py">
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating .pc files...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GIGenPC)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GIPCFiles);%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Generating .pc files...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GIGenPCX64)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GIPCFiles);%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Generating .pc files...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GIGenPC)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GIPCFiles);%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Generating .pc files...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GIGenPCX64)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GIPCFiles);%(Outputs)</Outputs>
-    </CustomBuild>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="g-ir-inspect.vcxproj">
-      <Project>{f4e6621f-a7dd-4863-8ccf-ca04dfc601e3}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="g-ir-compiler.vcxproj">
-      <Project>{5dcb55ce-f32c-4c77-8bf4-b4dad3ec7774}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="g-ir-generate.vcxproj">
-      <Project>{f4e6621f-a7dd-4863-8ccf-ba04dfc601e3}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="girepository.vcxproj">
-      <Project>{23e28245-8fc7-4b41-b1c5-8785bd4366a7}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="_giscanner.vcxproj">
-      <Project>{8311394f-9114-4c97-80f2-51bcaba054c9}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="gi-introspect.vcxproj">
-      <Project>{7a36674c-379d-4989-a978-07124e5f852c}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/win32/vs14/gi-install.vcxproj.filters b/win32/vs14/gi-install.vcxproj.filters
deleted file mode 100644
index 590ad10..0000000
--- a/win32/vs14/gi-install.vcxproj.filters
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <CustomBuild Include="..\..\config.h.win32"><Filter>Resource Files</Filter></CustomBuild>
-    <CustomBuild Include="..\gipc.py"><Filter>Resource Files</Filter></CustomBuild>
-  </ItemGroup>
-</Project>
diff --git a/win32/vs14/gi-introspect.vcxproj b/win32/vs14/gi-introspect.vcxproj
deleted file mode 100644
index d72d9bc..0000000
--- a/win32/vs14/gi-introspect.vcxproj
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{7A36674C-379D-4989-A978-07124E5F852C}</ProjectGuid>
-    <RootNamespace>giintrospect</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <NMakeBuildCommandLine>$(GIIntrospectNMakeCmd) $(IntrospectPythonParam)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>$(GIIntrospectNMakeCmd) $(IntrospectPythonParam) clean all</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>$(GIIntrospectNMakeCmd) $(IntrospectPythonParam) clean</NMakeCleanCommandLine>
-    <NMakeOutput>$(GIIntrospectBuiltFiles)</NMakeOutput>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <NMakeBuildCommandLine>$(GIIntrospectNMakeCmd) $(IntrospectPythonParam)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>$(GIIntrospectNMakeCmd) $(IntrospectPythonParam) clean all</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>$(GIIntrospectNMakeCmd) $(IntrospectPythonParam) clean</NMakeCleanCommandLine>
-    <NMakeOutput>$(GIIntrospectBuiltFiles)</NMakeOutput>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <NMakeBuildCommandLine>$(GIIntrospectNMakeCmd) $(IntrospectPythonParamX64)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>$(GIIntrospectNMakeCmd) $(IntrospectPythonParamX64) clean all</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>$(GIIntrospectNMakeCmd) $(IntrospectPythonParamX64) clean</NMakeCleanCommandLine>
-    <NMakeOutput>$(GIIntrospectBuiltFiles)</NMakeOutput>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <NMakeBuildCommandLine>$(GIIntrospectNMakeCmd) $(IntrospectPythonParamX64)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>$(GIIntrospectNMakeCmd) $(IntrospectPythonParamX64) clean all</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>$(GIIntrospectNMakeCmd) $(IntrospectPythonParamX64) clean</NMakeCleanCommandLine>
-    <NMakeOutput>$(GIIntrospectBuiltFiles)</NMakeOutput>
-  </PropertyGroup>
-  <ItemGroup>
-    <ProjectReference Include="g-ir-compiler.vcxproj">
-      <Project>{5dcb55ce-f32c-4c77-8bf4-b4dad3ec7774}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="g-ir-generate.vcxproj">
-      <Project>{f4e6621f-a7dd-4863-8ccf-ba04dfc601e3}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="girepository.vcxproj">
-      <Project>{23e28245-8fc7-4b41-b1c5-8785bd4366a7}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="_giscanner.vcxproj">
-      <Project>{8311394f-9114-4c97-80f2-51bcaba054c9}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/win32/vs14/gi-prebuild.vcxproj b/win32/vs14/gi-prebuild.vcxproj
deleted file mode 100644
index 958d192..0000000
--- a/win32/vs14/gi-prebuild.vcxproj
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{2093D218-190E-4194-9421-3BA7CBF33B11}</ProjectGuid>
-    <RootNamespace>giprebuild</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Utility</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Utility</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Utility</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Utility</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-gen-srcs.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-gen-srcs.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-gen-srcs.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-gen-srcs.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <ExtensionsToDeleteOnClean Condition="'$(Configuration)'=='Debug'" />
-    <ExtensionsToDeleteOnClean Condition="'$(Configuration)'=='Release'" />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <CustomBuild Include="..\..\config.h.win32">
-      <Message Condition="'$(Configuration)'=='Debug'">Copying config.h from config.h.win32...</Message>
-      <Command Condition="'$(Configuration)'=='Debug'">$(CopyConfigH)</Command>
-      <Outputs Condition="'$(Configuration)'=='Debug'">..\..\config.h;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)'=='Release'">Copying config.h from config.h.win32...</Message>
-      <Command Condition="'$(Configuration)'=='Release'">$(CopyConfigH)</Command>
-      <Outputs Condition="'$(Configuration)'=='Release'">..\..\config.h;%(Outputs)</Outputs>
-    </CustomBuild>
-    <CustomBuild Include="..\..\tools\g-ir-tool-template.in">
-      <Message Condition="'$(Configuration)'=='Debug'">Generating Tools Scripts...</Message>
-      <Command Condition="'$(Configuration)'=='Debug'">$(GenToolsScripts)</Command>
-      <Message Condition="'$(Configuration)'=='Release'">Generating Tools Scripts...</Message>
-      <Command Condition="'$(Configuration)'=='Release'">$(GenToolsScripts)</Command>
-      <Outputs Condition="'$(Configuration)'=='Release'">..\..\tools\g-ir-scanner;..\..\tools\g-ir-doc-tool;..\..\tools\g-ir-annotation-tool;%(Outputs)</Outputs>
-    </CustomBuild>
-  </ItemGroup>
-  <ItemGroup>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/win32/vs14/gi-version-paths.props b/win32/vs14/gi-version-paths.props
deleted file mode 100644
index 6bb55a2..0000000
--- a/win32/vs14/gi-version-paths.props
+++ /dev/null
@@ -1,81 +0,0 @@
-<?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>14</VSVer>
-    <GlibEtcInstallRoot>$(SolutionDir)\..\..\..\vs$(VSVer)\$(Platform)</GlibEtcInstallRoot>
-    <CopyDir>$(GlibEtcInstallRoot)</CopyDir>
-    <!-- PythonDir needs to point to a 32-bit/x86 Python 2.7/3.3+ installation -->
-    <PythonDir Condition="'$(VisualStudioVersion)' == '10.0'">c:\\python34</PythonDir>
-    <PythonDir Condition="'$(VisualStudioVersion)' == '11.0'">c:\\python34</PythonDir>
-    <PythonDir Condition="'$(VisualStudioVersion)' == '12.0'">c:\\python34</PythonDir>
-    <PythonDir Condition="'$(VisualStudioVersion)' == '14.0'">c:\\python36</PythonDir>
-    <PythonDir Condition="'$(VisualStudioVersion)' == '15.0'">c:\\python36</PythonDir>
-    <!-- PythonDirX64 needs to point to an x86-64/x64 Python 2.7/3.3+ installation -->
-    <PythonDirX64>$(PythonDir).x64</PythonDirX64>
-    <IntrospectPythonParam>PYTHON=$(PythonDir)\python.exe</IntrospectPythonParam>
-    <IntrospectPythonParamX64>PYTHON=$(PythonDirX64)\python.exe</IntrospectPythonParamX64>
-    <GIVersion>1.56.1</GIVersion>
-    <BASE_GI_DIR>$(SolutionDir)\..\..</BASE_GI_DIR>
-    <ApiVersion>1.0</ApiVersion>
-    <DefDir>$(SolutionDir)$(Configuration)\$(Platform)\obj\$(ProjectName)</DefDir>
-    <LibGILibtoolCompatibleDllPrefix>lib</LibGILibtoolCompatibleDllPrefix>
-    <LibGILibtoolCompatibleDllSuffix>-$(ApiVersion)-0</LibGILibtoolCompatibleDllSuffix>
-    <LibGISeparateVSDllPrefix />
-    <LibGISeparateVSDllSuffix>-1-vs$(VSVer)</LibGISeparateVSDllSuffix>
-    <LibGIDllPrefix>$(LibGISeparateVSDllPrefix)</LibGIDllPrefix>
-    <LibGIDllSuffix>$(LibGISeparateVSDllSuffix)</LibGIDllSuffix>
-  </PropertyGroup>
-  <PropertyGroup>
-    <_PropertySheetDisplayName>giversionpathsprops</_PropertySheetDisplayName>
-  </PropertyGroup>
-  <ItemGroup>
-    <BuildMacro Include="VSVer">
-      <Value>$(VSVer)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GlibEtcInstallRoot">
-      <Value>$(GlibEtcInstallRoot)</Value>
-    </BuildMacro>
-    <BuildMacro Include="CopyDir">
-      <Value>$(CopyDir)</Value>
-    </BuildMacro>
-    <BuildMacro Include="PythonDir">
-      <Value>$(PythonDir)</Value>
-    </BuildMacro>
-    <BuildMacro Include="PythonDirX64">
-      <Value>$(PythonDirX64)</Value>
-    </BuildMacro>
-    <BuildMacro Include="IntrospectPythonParam">
-      <Value>$(IntrospectPythonParam)</Value>
-    </BuildMacro>
-    <BuildMacro Include="IntrospectPythonParamX64">
-      <Value>$(IntrospectPythonParamX64)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GIVersion">
-      <Value>$(GIVersion)</Value>
-    </BuildMacro>
-    <BuildMacro Include="BASE_GI_DIR">
-      <Value>$(BASE_GI_DIR)</Value>
-    </BuildMacro>
-    <BuildMacro Include="ApiVersion">
-      <Value>$(ApiVersion)</Value>
-    </BuildMacro>
-    <BuildMacro Include="LibGILibtoolCompatibleDllPrefix">
-      <Value>$(LibGILibtoolCompatibleDllPrefix)</Value>
-    </BuildMacro>
-    <BuildMacro Include="LibGILibtoolCompatibleDllSuffix">
-      <Value>$(LibGILibtoolCompatibleDllSuffix)</Value>
-    </BuildMacro>
-    <BuildMacro Include="LibGISeparateVSDllPrefix">
-      <Value>$(LibGISeparateVSDllPrefix)</Value>
-    </BuildMacro>
-    <BuildMacro Include="LibGISeparateVSDllSuffix">
-      <Value>$(LibGISeparateVSDllSuffix)</Value>
-    </BuildMacro>
-    <BuildMacro Include="LibGIDllPrefix">
-      <Value>$(LibGIDllPrefix)</Value>
-    </BuildMacro>
-    <BuildMacro Include="LibGIDllSuffix">
-      <Value>$(LibGIDllSuffix)</Value>
-    </BuildMacro>
-  </ItemGroup>
-</Project>
diff --git a/win32/vs14/girepository.vcxproj b/win32/vs14/girepository.vcxproj
deleted file mode 100644
index 4208fb9..0000000
--- a/win32/vs14/girepository.vcxproj
+++ /dev/null
@@ -1,214 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{23E28245-8FC7-4B41-B1C5-8785BD4366A7}</ProjectGuid>
-    <RootNamespace>girepository</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\girepository;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;$(GIRepositoryBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ffi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).dll</OutputFile>
-      <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\..\girepository;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>$(GIRepositoryBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ffi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).dll</OutputFile>
-      <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\girepository;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;$(GIRepositoryBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ffi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).dll</OutputFile>
-      <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\..\girepository;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>$(GIRepositoryBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ffi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).dll</OutputFile>
-      <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-   <ClCompile Include="..\..\girepository\gdump.c" />
-   <ClCompile Include="..\..\girepository\giarginfo.c" />
-   <ClCompile Include="..\..\girepository\gibaseinfo.c" />
-   <ClCompile Include="..\..\girepository\gicallableinfo.c" />
-   <ClCompile Include="..\..\girepository\giconstantinfo.c" />
-   <ClCompile Include="..\..\girepository\gienuminfo.c" />
-   <ClCompile Include="..\..\girepository\gifieldinfo.c" />
-   <ClCompile Include="..\..\girepository\gifunctioninfo.c" />
-   <ClCompile Include="..\..\girepository\ginvoke.c" />
-   <ClCompile Include="..\..\girepository\giinterfaceinfo.c" />
-   <ClCompile Include="..\..\girepository\giobjectinfo.c" />
-   <ClCompile Include="..\..\girepository\gipropertyinfo.c" />
-   <ClCompile Include="..\..\girepository\giregisteredtypeinfo.c" />
-   <ClCompile Include="..\..\girepository\girepository.c" />
-   <ClCompile Include="..\..\girepository\girffi.c" />
-   <ClCompile Include="..\..\girepository\gisignalinfo.c" />
-   <ClCompile Include="..\..\girepository\gistructinfo.c" />
-   <ClCompile Include="..\..\girepository\gitypeinfo.c" />
-   <ClCompile Include="..\..\girepository\gitypelib.c" />
-   <ClCompile Include="..\..\girepository\giunioninfo.c" />
-   <ClCompile Include="..\..\girepository\givfuncinfo.c" />
-   <ClCompile Include="..\..\girepository\gthash.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="gi-prebuild.vcxproj">
-      <Project>{2093d218-190e-4194-9421-3ba7cbf33b11}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="cmph.vcxproj">
-      <Project>{442c007e-d901-41da-9706-5db4afb4c06b}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/win32/vs14/girepository.vcxproj.filters b/win32/vs14/girepository.vcxproj.filters
deleted file mode 100644
index 8201353..0000000
--- a/win32/vs14/girepository.vcxproj.filters
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Sources">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Headers">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-   <ClCompile Include="..\..\girepository\gdump.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\giarginfo.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\gibaseinfo.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\gicallableinfo.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\giconstantinfo.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\gienuminfo.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\gifieldinfo.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\gifunctioninfo.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\ginvoke.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\giinterfaceinfo.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\giobjectinfo.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\gipropertyinfo.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\giregisteredtypeinfo.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\girepository.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\girffi.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\gisignalinfo.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\gistructinfo.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\gitypeinfo.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\gitypelib.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\giunioninfo.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\givfuncinfo.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\gthash.c"><Filter>Source Files</Filter></ClCompile>
-  </ItemGroup>
-</Project>
diff --git a/win32/vs14/glib-print.vcxproj b/win32/vs14/glib-print.vcxproj
deleted file mode 100644
index 33019d8..0000000
--- a/win32/vs14/glib-print.vcxproj
+++ /dev/null
@@ -1,169 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{2CCD6E09-08E7-44B9-92E6-42F0A5DBBC8B}</ProjectGuid>
-    <RootNamespace>glibprint</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\examples\glib-print.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="girepository.vcxproj">
-      <Project>{23e28245-8fc7-4b41-b1c5-8785bd4366a7}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/win32/vs14/glib-print.vcxproj.filters b/win32/vs14/glib-print.vcxproj.filters
deleted file mode 100644
index f77043c..0000000
--- a/win32/vs14/glib-print.vcxproj.filters
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Sources">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Headers">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\examples\glib-print.c">
-      <Filter>Sources</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
diff --git a/win32/vs14/gobject-introspection.sln b/win32/vs14/gobject-introspection.sln
deleted file mode 100644
index 599b927..0000000
--- a/win32/vs14/gobject-introspection.sln
+++ /dev/null
@@ -1,126 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gi-prebuild", "gi-prebuild.vcxproj", "{2093D218-190E-4194-9421-3BA7CBF33B11}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cmph", "cmph.vcxproj", "{442C007E-D901-41DA-9706-5DB4AFB4C06B}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cmph-bdz-test", "cmph-bdz-test.vcxproj", "{E41F378B-CCDD-4B1C-89C3-6D2C950FAF1A}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "girepository", "girepository.vcxproj", "{23E28245-8FC7-4B41-B1C5-8785BD4366A7}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_giscanner", "_giscanner.vcxproj", "{8311394F-9114-4C97-80F2-51BCABA054C9}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glib-print", "glib-print.vcxproj", "{2CCD6E09-08E7-44B9-92E6-42F0A5DBBC8B}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "g-ir-generate", "g-ir-generate.vcxproj", "{F4E6621F-A7DD-4863-8CCF-BA04DFC601E3}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "g-ir-compiler", "g-ir-compiler.vcxproj", "{5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "g-ir-inspect", "g-ir-inspect.vcxproj", "{F4E6621F-A7DD-4863-8CCF-CA04DFC601E3}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gi-introspect", "gi-introspect.vcxproj", "{7A36674C-379D-4989-A978-07124E5F852C}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gi-install", "gi-install.vcxproj", "{2093D218-190E-4194-9421-3BA7CBF33B10}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Debug|x64 = Debug|x64
-		Release|Win32 = Release|Win32
-		Release|x64 = Release|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{2093D218-190E-4194-9421-3BA7CBF33B11}.Debug|Win32.ActiveCfg = Debug|Win32
-		{2093D218-190E-4194-9421-3BA7CBF33B11}.Debug|Win32.Build.0 = Debug|Win32
-		{2093D218-190E-4194-9421-3BA7CBF33B11}.Debug|x64.ActiveCfg = Debug|x64
-		{2093D218-190E-4194-9421-3BA7CBF33B11}.Debug|x64.Build.0 = Debug|x64
-		{2093D218-190E-4194-9421-3BA7CBF33B11}.Release|Win32.ActiveCfg = Release|Win32
-		{2093D218-190E-4194-9421-3BA7CBF33B11}.Release|Win32.Build.0 = Release|Win32
-		{2093D218-190E-4194-9421-3BA7CBF33B11}.Release|x64.ActiveCfg = Release|x64
-		{2093D218-190E-4194-9421-3BA7CBF33B11}.Release|x64.Build.0 = Release|x64
-		{442C007E-D901-41DA-9706-5DB4AFB4C06B}.Debug|Win32.ActiveCfg = Debug|Win32
-		{442C007E-D901-41DA-9706-5DB4AFB4C06B}.Debug|Win32.Build.0 = Debug|Win32
-		{442C007E-D901-41DA-9706-5DB4AFB4C06B}.Debug|x64.ActiveCfg = Debug|x64
-		{442C007E-D901-41DA-9706-5DB4AFB4C06B}.Debug|x64.Build.0 = Debug|x64
-		{442C007E-D901-41DA-9706-5DB4AFB4C06B}.Release|Win32.ActiveCfg = Release|Win32
-		{442C007E-D901-41DA-9706-5DB4AFB4C06B}.Release|Win32.Build.0 = Release|Win32
-		{442C007E-D901-41DA-9706-5DB4AFB4C06B}.Release|x64.ActiveCfg = Release|x64
-		{442C007E-D901-41DA-9706-5DB4AFB4C06B}.Release|x64.Build.0 = Release|x64
-		{E41F378B-CCDD-4B1C-89C3-6D2C950FAF1A}.Debug|Win32.ActiveCfg = Debug|Win32
-		{E41F378B-CCDD-4B1C-89C3-6D2C950FAF1A}.Debug|Win32.Build.0 = Debug|Win32
-		{E41F378B-CCDD-4B1C-89C3-6D2C950FAF1A}.Debug|x64.ActiveCfg = Debug|x64
-		{E41F378B-CCDD-4B1C-89C3-6D2C950FAF1A}.Debug|x64.Build.0 = Debug|x64
-		{E41F378B-CCDD-4B1C-89C3-6D2C950FAF1A}.Release|Win32.ActiveCfg = Release|Win32
-		{E41F378B-CCDD-4B1C-89C3-6D2C950FAF1A}.Release|Win32.Build.0 = Release|Win32
-		{E41F378B-CCDD-4B1C-89C3-6D2C950FAF1A}.Release|x64.ActiveCfg = Release|x64
-		{E41F378B-CCDD-4B1C-89C3-6D2C950FAF1A}.Release|x64.Build.0 = Release|x64
-		{23E28245-8FC7-4B41-B1C5-8785BD4366A7}.Debug|Win32.ActiveCfg = Debug|Win32
-		{23E28245-8FC7-4B41-B1C5-8785BD4366A7}.Debug|Win32.Build.0 = Debug|Win32
-		{23E28245-8FC7-4B41-B1C5-8785BD4366A7}.Debug|x64.ActiveCfg = Debug|x64
-		{23E28245-8FC7-4B41-B1C5-8785BD4366A7}.Debug|x64.Build.0 = Debug|x64
-		{23E28245-8FC7-4B41-B1C5-8785BD4366A7}.Release|Win32.ActiveCfg = Release|Win32
-		{23E28245-8FC7-4B41-B1C5-8785BD4366A7}.Release|Win32.Build.0 = Release|Win32
-		{23E28245-8FC7-4B41-B1C5-8785BD4366A7}.Release|x64.ActiveCfg = Release|x64
-		{23E28245-8FC7-4B41-B1C5-8785BD4366A7}.Release|x64.Build.0 = Release|x64
-		{8311394F-9114-4C97-80F2-51BCABA054C9}.Debug|Win32.ActiveCfg = Debug|Win32
-		{8311394F-9114-4C97-80F2-51BCABA054C9}.Debug|Win32.Build.0 = Debug|Win32
-		{8311394F-9114-4C97-80F2-51BCABA054C9}.Debug|x64.ActiveCfg = Debug|x64
-		{8311394F-9114-4C97-80F2-51BCABA054C9}.Debug|x64.Build.0 = Debug|x64
-		{8311394F-9114-4C97-80F2-51BCABA054C9}.Release|Win32.ActiveCfg = Release|Win32
-		{8311394F-9114-4C97-80F2-51BCABA054C9}.Release|Win32.Build.0 = Release|Win32
-		{8311394F-9114-4C97-80F2-51BCABA054C9}.Release|x64.ActiveCfg = Release|x64
-		{8311394F-9114-4C97-80F2-51BCABA054C9}.Release|x64.Build.0 = Release|x64
-		{2CCD6E09-08E7-44B9-92E6-42F0A5DBBC8B}.Debug|Win32.ActiveCfg = Debug|Win32
-		{2CCD6E09-08E7-44B9-92E6-42F0A5DBBC8B}.Debug|Win32.Build.0 = Debug|Win32
-		{2CCD6E09-08E7-44B9-92E6-42F0A5DBBC8B}.Debug|x64.ActiveCfg = Debug|x64
-		{2CCD6E09-08E7-44B9-92E6-42F0A5DBBC8B}.Debug|x64.Build.0 = Debug|x64
-		{2CCD6E09-08E7-44B9-92E6-42F0A5DBBC8B}.Release|Win32.ActiveCfg = Release|Win32
-		{2CCD6E09-08E7-44B9-92E6-42F0A5DBBC8B}.Release|Win32.Build.0 = Release|Win32
-		{2CCD6E09-08E7-44B9-92E6-42F0A5DBBC8B}.Release|x64.ActiveCfg = Release|x64
-		{2CCD6E09-08E7-44B9-92E6-42F0A5DBBC8B}.Release|x64.Build.0 = Release|x64
-		{F4E6621F-A7DD-4863-8CCF-BA04DFC601E3}.Debug|Win32.ActiveCfg = Debug|Win32
-		{F4E6621F-A7DD-4863-8CCF-BA04DFC601E3}.Debug|Win32.Build.0 = Debug|Win32
-		{F4E6621F-A7DD-4863-8CCF-BA04DFC601E3}.Debug|x64.ActiveCfg = Debug|x64
-		{F4E6621F-A7DD-4863-8CCF-BA04DFC601E3}.Debug|x64.Build.0 = Debug|x64
-		{F4E6621F-A7DD-4863-8CCF-BA04DFC601E3}.Release|Win32.ActiveCfg = Release|Win32
-		{F4E6621F-A7DD-4863-8CCF-BA04DFC601E3}.Release|Win32.Build.0 = Release|Win32
-		{F4E6621F-A7DD-4863-8CCF-BA04DFC601E3}.Release|x64.ActiveCfg = Release|x64
-		{F4E6621F-A7DD-4863-8CCF-BA04DFC601E3}.Release|x64.Build.0 = Release|x64
-		{F4E6621F-A7DD-4863-8CCF-CA04DFC601E3}.Debug|Win32.ActiveCfg = Debug|Win32
-		{F4E6621F-A7DD-4863-8CCF-CA04DFC601E3}.Debug|Win32.Build.0 = Debug|Win32
-		{F4E6621F-A7DD-4863-8CCF-CA04DFC601E3}.Debug|x64.ActiveCfg = Debug|x64
-		{F4E6621F-A7DD-4863-8CCF-CA04DFC601E3}.Debug|x64.Build.0 = Debug|x64
-		{F4E6621F-A7DD-4863-8CCF-CA04DFC601E3}.Release|Win32.ActiveCfg = Release|Win32
-		{F4E6621F-A7DD-4863-8CCF-CA04DFC601E3}.Release|Win32.Build.0 = Release|Win32
-		{F4E6621F-A7DD-4863-8CCF-CA04DFC601E3}.Release|x64.ActiveCfg = Release|x64
-		{F4E6621F-A7DD-4863-8CCF-CA04DFC601E3}.Release|x64.Build.0 = Release|x64
-		{5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774}.Debug|Win32.ActiveCfg = Debug|Win32
-		{5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774}.Debug|Win32.Build.0 = Debug|Win32
-		{5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774}.Debug|x64.ActiveCfg = Debug|x64
-		{5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774}.Debug|x64.Build.0 = Debug|x64
-		{5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774}.Release|Win32.ActiveCfg = Release|Win32
-		{5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774}.Release|Win32.Build.0 = Release|Win32
-		{5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774}.Release|x64.ActiveCfg = Release|x64
-		{5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774}.Release|x64.Build.0 = Release|x64
-		{7A36674C-379D-4989-A978-07124E5F852C}.Debug|Win32.ActiveCfg = Debug|Win32
-		{7A36674C-379D-4989-A978-07124E5F852C}.Debug|Win32.Build.0 = Debug|Win32
-		{7A36674C-379D-4989-A978-07124E5F852C}.Debug|x64.ActiveCfg = Debug|x64
-		{7A36674C-379D-4989-A978-07124E5F852C}.Debug|x64.Build.0 = Debug|x64
-		{7A36674C-379D-4989-A978-07124E5F852C}.Release|Win32.ActiveCfg = Release|Win32
-		{7A36674C-379D-4989-A978-07124E5F852C}.Release|Win32.Build.0 = Release|Win32
-		{7A36674C-379D-4989-A978-07124E5F852C}.Release|x64.ActiveCfg = Release|x64
-		{7A36674C-379D-4989-A978-07124E5F852C}.Release|x64.Build.0 = Release|x64
-		{2093D218-190E-4194-9421-3BA7CBF33B10}.Debug|Win32.ActiveCfg = Debug|Win32
-		{2093D218-190E-4194-9421-3BA7CBF33B10}.Debug|Win32.Build.0 = Debug|Win32
-		{2093D218-190E-4194-9421-3BA7CBF33B10}.Debug|x64.ActiveCfg = Debug|x64
-		{2093D218-190E-4194-9421-3BA7CBF33B10}.Debug|x64.Build.0 = Debug|x64
-		{2093D218-190E-4194-9421-3BA7CBF33B10}.Release|Win32.ActiveCfg = Release|Win32
-		{2093D218-190E-4194-9421-3BA7CBF33B10}.Release|Win32.Build.0 = Release|Win32
-		{2093D218-190E-4194-9421-3BA7CBF33B10}.Release|x64.ActiveCfg = Release|x64
-		{2093D218-190E-4194-9421-3BA7CBF33B10}.Release|x64.Build.0 = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/win32/vs15/Makefile.am b/win32/vs15/Makefile.am
deleted file mode 100644
index d8c3860..0000000
--- a/win32/vs15/Makefile.am
+++ /dev/null
@@ -1,37 +0,0 @@
-EXTRA_DIST = \
-	gobject-introspection.sln	\
-	gi-build-defines.props	\
-	gi-gen-srcs.props	\
-	gi-install.props	\
-	gi-version-paths.props	\
-	gi-prebuild.vcxproj	\
-	girepository.vcxproj	\
-	girepository.vcxproj.filters	\
-	cmph-bdz-test.vcxproj	\
-	cmph-bdz-test.vcxproj.filters	\
-	cmph.vcxproj	\
-	cmph.vcxproj.filters	\
-	g-ir-compiler.vcxproj	\
-	g-ir-compiler.vcxproj.filters	\
-	g-ir-generate.vcxproj	\
-	g-ir-generate.vcxproj.filters	\
-	g-ir-inspect.vcxproj	\
-	g-ir-inspect.vcxproj.filters	\
-	glib-print.vcxproj	\
-	glib-print.vcxproj.filters	\
-	_giscanner.vcxproj	\
-	_giscanner.vcxproj.filters	\
-	gi-install.vcxproj	\
-	gi-install.vcxproj.filters	\
-	gi-introspect.vcxproj	\
-	README.txt
-
-DISTCLEANFILES = $(EXTRA_DIST)
-
-MSVC_BASE_VER = 10
-MSVC_BASE_VER_LONG = 2010
-MSVC_VER = 15
-MSVC_VER_LONG = 15
-MSVC_TOOLSET = 141
-
-include $(top_srcdir)/win32/Makefile-newvs.am
diff --git a/win32/vs15/Makefile.in b/win32/vs15/Makefile.in
deleted file mode 100644
index 1afa405..0000000
--- a/win32/vs15/Makefile.in
+++ /dev/null
@@ -1,586 +0,0 @@
-# Makefile.in generated by automake 1.15.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994-2017 Free Software Foundation, Inc.
-
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-# Centralized autotools file
-# Create the Visual Studio 2012/2013/2015 project files
-# from the Visual Studio 2010 project files
-
-# This autotools file, from GLib, can be used in other projects
-# that have Visual Studio build support.
-
-# Author: Fan, Chun-wei
-# November 05, 2012
-
-# MSVC_BASE_VER: Baseline MSVC 201x version to copy/process project files from (100 for 2010, 120 for 2013)
-# MSVC_BASE_VER_LONG: Long Version of baseline Visual Studio 201x version (2010, 2012, 2013, 14, 15)
-# MSVC_BASE_TOOLSET: Use if baseline MSVC toolset is not in the form v$(MSVC_BASE_VER)0, meaning v$(MSVC_BASE_TOOLSET)
-# MSVC_VER_LONG: Long Version of target Visual Studio (2012, 2013, 14 and so on)
-# MSVC_VER: Short Version of target Visual Studio (110 for 2012, 120 for 2013, 140 for 2015, 141 for 2017)
-# MSVC_TOOLSET: Use if target MSVC toolsett is not in the form v $(MSVC_VER)0, meaning v$(MSVC_TOOLSET)
-VPATH = @srcdir@
-am__is_gnu_make = { \
-  if test -z '$(MAKELEVEL)'; then \
-    false; \
-  elif test -n '$(MAKE_HOST)'; then \
-    true; \
-  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
-    true; \
-  else \
-    false; \
-  fi; \
-}
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -[dEDm]) skip_next=yes;; \
-      -[JT]) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = win32/vs15
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
-	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/python.m4 \
-	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN     " $@;
-am__v_GEN_1 = 
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 = 
-SOURCES =
-DIST_SOURCES =
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-am__DIST_COMMON = $(srcdir)/Makefile.in \
-	$(top_srcdir)/win32/Makefile-newvs.am
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CAIRO_CFLAGS = @CAIRO_CFLAGS@
-CAIRO_GIR_PACKAGE = @CAIRO_GIR_PACKAGE@
-CAIRO_LIBS = @CAIRO_LIBS@
-CAIRO_SHARED_LIBRARY = @CAIRO_SHARED_LIBRARY@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-EXPANDED_BINDIR = @EXPANDED_BINDIR@
-EXPANDED_DATADIR = @EXPANDED_DATADIR@
-EXPANDED_LIBDIR = @EXPANDED_LIBDIR@
-EXPANDED_LIBEXECDIR = @EXPANDED_LIBEXECDIR@
-EXPANDED_LOCALSTATEDIR = @EXPANDED_LOCALSTATEDIR@
-EXPANDED_SYSCONFDIR = @EXPANDED_SYSCONFDIR@
-EXTRA_LINK_FLAGS = @EXTRA_LINK_FLAGS@
-FFI_CFLAGS = @FFI_CFLAGS@
-FFI_LIBS = @FFI_LIBS@
-FFI_PC_CFLAGS = @FFI_PC_CFLAGS@
-FFI_PC_LIBS = @FFI_PC_LIBS@
-FFI_PC_PACKAGES = @FFI_PC_PACKAGES@
-FGREP = @FGREP@
-GIO_CFLAGS = @GIO_CFLAGS@
-GIO_LIBS = @GIO_LIBS@
-GIO_UNIX_CFLAGS = @GIO_UNIX_CFLAGS@
-GIO_UNIX_LIBS = @GIO_UNIX_LIBS@
-GIREPO_CFLAGS = @GIREPO_CFLAGS@
-GIREPO_LIBS = @GIREPO_LIBS@
-GIR_DIR = @GIR_DIR@
-GIR_SUFFIX = @GIR_SUFFIX@
-GI_HIDDEN_VISIBILITY_CFLAGS = @GI_HIDDEN_VISIBILITY_CFLAGS@
-GI_VERSION = @GI_VERSION@
-GLIBSRC = @GLIBSRC@
-GLIB_CFLAGS = @GLIB_CFLAGS@
-GLIB_LIBS = @GLIB_LIBS@
-GMODULE_CFLAGS = @GMODULE_CFLAGS@
-GMODULE_LIBS = @GMODULE_LIBS@
-GOBJECT_CFLAGS = @GOBJECT_CFLAGS@
-GOBJECT_INTROSPECTION_LIBDIR = @GOBJECT_INTROSPECTION_LIBDIR@
-GOBJECT_LIBS = @GOBJECT_LIBS@
-GREP = @GREP@
-GTKDOC_CHECK = @GTKDOC_CHECK@
-GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
-GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
-GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
-GTKDOC_MKPDF = @GTKDOC_MKPDF@
-GTKDOC_REBASE = @GTKDOC_REBASE@
-HTML_DIR = @HTML_DIR@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LEX = @LEX@
-LEXLIB = @LEXLIB@
-LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MKDIR_P = @MKDIR_P@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-POW_LIB = @POW_LIB@
-PYTHON = @PYTHON@
-PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
-PYTHON_INCLUDES = @PYTHON_INCLUDES@
-PYTHON_LIBS = @PYTHON_LIBS@
-PYTHON_PLATFORM = @PYTHON_PLATFORM@
-PYTHON_PREFIX = @PYTHON_PREFIX@
-PYTHON_VERSION = @PYTHON_VERSION@
-RANLIB = @RANLIB@
-SCANNER_CFLAGS = @SCANNER_CFLAGS@
-SCANNER_LIBS = @SCANNER_LIBS@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-VERSION = @VERSION@
-YACC = @YACC@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-pkgpyexecdir = @pkgpyexecdir@
-pkgpythondir = @pkgpythondir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-pyexecdir = @pyexecdir@
-pythondir = @pythondir@
-runstatedir = @runstatedir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-EXTRA_DIST = \
-	gobject-introspection.sln	\
-	gi-build-defines.props	\
-	gi-gen-srcs.props	\
-	gi-install.props	\
-	gi-version-paths.props	\
-	gi-prebuild.vcxproj	\
-	girepository.vcxproj	\
-	girepository.vcxproj.filters	\
-	cmph-bdz-test.vcxproj	\
-	cmph-bdz-test.vcxproj.filters	\
-	cmph.vcxproj	\
-	cmph.vcxproj.filters	\
-	g-ir-compiler.vcxproj	\
-	g-ir-compiler.vcxproj.filters	\
-	g-ir-generate.vcxproj	\
-	g-ir-generate.vcxproj.filters	\
-	g-ir-inspect.vcxproj	\
-	g-ir-inspect.vcxproj.filters	\
-	glib-print.vcxproj	\
-	glib-print.vcxproj.filters	\
-	_giscanner.vcxproj	\
-	_giscanner.vcxproj.filters	\
-	gi-install.vcxproj	\
-	gi-install.vcxproj.filters	\
-	gi-introspect.vcxproj	\
-	README.txt
-
-DISTCLEANFILES = $(EXTRA_DIST)
-MSVC_BASE_VER = 10
-MSVC_BASE_VER_LONG = 2010
-MSVC_VER = 15
-MSVC_VER_LONG = 15
-@MSVC_NO_TOOLSET_SET_TRUE@MSVC_TOOLSET = $(MSVC_VER)0
-MSVC_TOOLSET = 141
-@MSVC_BASE_NO_TOOLSET_SET_TRUE@MSVC_BASE_TOOLSET = $(MSVC_BASE_VER)0
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/win32/Makefile-newvs.am $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign win32/vs15/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign win32/vs15/Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-$(top_srcdir)/win32/Makefile-newvs.am $(am__empty):
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-tags TAGS:
-
-ctags CTAGS:
-
-cscope cscopelist:
-
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am:
-
-.MAKE: install-am install-strip
-
-.PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	cscopelist-am ctags-am distclean distclean-generic \
-	distclean-libtool distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags-am uninstall uninstall-am
-
-.PRECIOUS: Makefile
-
-
-%.sln:
-	sed 's/11\.00/12\.00/g' < $(top_srcdir)/win32/vs$(MSVC_BASE_VER)/$@ > $(top_builddir)/win32/vs$(MSVC_VER)/$@.tmp
-	sed 's/$(MSVC_BASE_VER_LONG)/$(MSVC_VER_LONG)/g' < $(top_builddir)/win32/vs$(MSVC_VER)/$@.tmp > $(top_builddir)/win32/vs$(MSVC_VER)/$@
-	rm $(top_builddir)/win32/vs$(MSVC_VER)/$@.tmp
-
-%.txt:
-	sed 's/vs$(MSVC_BASE_VER)/vs$(MSVC_VER)/g' < $(top_srcdir)/win32/vs$(MSVC_BASE_VER)/$@ > $(top_builddir)/win32/vs$(MSVC_VER)/$@.tmp
-	sed 's/VS$(MSVC_BASE_VER)/VS$(MSVC_VER)/g' < $(top_builddir)/win32/vs$(MSVC_VER)/$@.tmp > $(top_builddir)/win32/vs$(MSVC_VER)/$@
-	rm $(top_builddir)/win32/vs$(MSVC_VER)/$@.tmp
-
-%.vcxproj:
-	if test -e $(top_srcdir)/win32/vs$(MSVC_BASE_VER)/$@; then \
-		sed 's/v$(MSVC_BASE_TOOLSET)/v$(MSVC_TOOLSET)/g' < $(top_srcdir)/win32/vs$(MSVC_BASE_VER)/$@ > $(top_builddir)/win32/vs$(MSVC_VER)/$@; \
-	else \
-		sed 's/v$(MSVC_BASE_TOOLSET)/v$(MSVC_TOOLSET)/g' < $(top_builddir)/win32/vs$(MSVC_BASE_VER)/$@ > $(top_builddir)/win32/vs$(MSVC_VER)/$@; \
-	fi
-
-%.props: $(top_builddir)/win32/vs$(MSVC_BASE_VER)/Makefile
-	if test -e $(top_srcdir)/win32/vs$(MSVC_BASE_VER)/$@; then \
-		sed 's/<VSVer>$(MSVC_BASE_VER)<\/VSVer>/<VSVer>$(MSVC_VER)<\/VSVer>/g' < $(top_srcdir)/win32/vs$(MSVC_BASE_VER)/$@ > $(top_builddir)/win32/vs$(MSVC_VER)/$@; \
-	else \
-		sed 's/<VSVer>$(MSVC_BASE_VER)<\/VSVer>/<VSVer>$(MSVC_VER)<\/VSVer>/g' < $(top_builddir)/win32/vs$(MSVC_BASE_VER)/$@ > $(top_builddir)/win32/vs$(MSVC_VER)/$@; \
-	fi
-
-%.vcxproj.filters:
-	if test -e $(top_srcdir)/win32/vs$(MSVC_BASE_VER)/$@; then \
-		cp $(top_srcdir)/win32/vs$(MSVC_BASE_VER)/$@ $(top_builddir)/win32/vs$(MSVC_VER)/$@; \
-	else \
-		cp $(top_builddir)/win32/vs$(MSVC_BASE_VER)/$@ $(top_builddir)/win32/vs$(MSVC_VER)/$@; \
-	fi
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/win32/vs15/README.txt b/win32/vs15/README.txt
deleted file mode 100644
index 1f76a36..0000000
--- a/win32/vs15/README.txt
+++ /dev/null
@@ -1,104 +0,0 @@
-Please do not compile this package (gobject-introspection) in paths that contain
-spaces in them-as strange problems may occur during compilation or during
-the use of the library.
-
-Please refer to the following GNOME Live! page for more detailed
-instructions on building gobject-introsecption and its dependencies
-with Visual C++:
-
-https://live.gnome.org/GTK%2B/Win32/MSVCCompilationOfGTKStack
-
-This VS15 solution and the projects it includes are intented to be used
-in a gobject-introspection source tree unpacked from a tarball. In a git checkout you
-first need to use some Unix-like environment, which will do the work for you.
-
-The required dependencies are Python 2.7 (2.7) or 3.3 (3.x) or later, GLib and LibFFI.
-It is recommended that GLib is built with Visual C++ 2010 to avoid problems cause by
-usage of different CRTs.
-
-Please refer to the README.txt file in $(GLib_src_root)\build\win32\vs15 on how to build
-GLib using Visual C++ 2010
-
-For LibFFI, please use the Centricular fork of it, which can be found at
-https://github.com/centricular/libffi.  Please refer there on building--please
-note that this will involve the use of the Meson build system and possible the
-Ninja build tool, if the Visual Studio project generation is not used or is
-unavailable.
-
-For Python, retrieving the official Windows binaries for 2.7 (2.x) or 3.3 (3.x) or later
-from http://www.python.org will do the job-be sure that the Python version that
-you downloaded matches the configuration of your build (win32 or x64/amd64).  Ensure that
-the correct path for your Python interpretor is set in gi-extra-paths.vsprops prior to
-opening the project files, or close the project files and delete all the *.user, *.sdf and
-*.suo files and reopening the project files.
-
-For building the Regress test project, cairo (and possibly cairo-gobject support)
-is needed.
-
-Set up the source tree as follows under some arbitrary top
-folder <root>:
-
-<root>\<this-gobject-introspection-source-tree>
-<root>\vs15\<PlatformName>
-
-*this* file you are now reading is thus located at
-<root>\<this-glib-source-tree>\build\win32\vs15\README.
-
-<PlatformName> is either Win32 or x64, as in VS15 project files.
-
-For LibFFI, one should also put the generated ffi.h and ffitarget.h
-into <root>\vs15\<PlatformName>\include\ and the compiled static libffi.lib
-(or copy libffi-convenience.lib into libffi.lib) into
-<root>\vs15\<PlatformName>\lib\.
-
-The libintl.h that is used for building GLib needs to be in
-<root>\vs15\<PlatformName>\include, if not already done so.
-
-A working pkg-config tool is also required-it may be obtained from
-http://www.gtk.org/download/win32.php [32-bit]
-http://www.gtk.org/download/win64.php [64-bit]
-
-*** Note! ***
-The build of G-I is now done within the project files, although it is still possible to
-do it in two stages by using the NMake Makefiles after building the projects.
-
-As there are numerous possible configurations on Python and PKG_CONFIG_PATH, note that:
--For both methods PKG_CONFIG_PATH is by default $(PREFIX)\lib\pkgconfig, where $(PREFIX)
- is by default <parent_dir_of_G-I_srcroot>\vs15\<PlatformName>.  If searching from
- more directories is desired, set the PKG_CONFIG_PATH environment variable before using
- the NMake Makefile or opening the projects, but note that $(PREFIX)\lib\pkgconfig will
- precede the set paths.
--For the Python Path using the project files: check whether the directory settings in
- gi-version-paths.vsprops under PythonDir (32-bit) or PythonDirX64 (x64) is correct.
- If the projects have been loaded by Visual Studio, close the projects and re-open them.
- You may need to delete all the *.suo, *.user and *.ncb files in this directory for
- the changes to take effect.
--For the Python Path using the NMake Makefiles: pass in PYTHON=<full_path_to_python> to
- the NMake Makefile or set it in the environment.  The bit-ness of your Python installation
- must match the configuration that you are building for.
-
-The use of Visual Studio Projects will no longer require the setting of environmental
-variables, but the following environmental variables are needed (either by using "set xxx=yyy"
-or by nmake -f gi-introspection-msvc.mak xxx=yyy) for building the introspection files (which
-should be done after successfully building the Project Files):
-
-Please see $(srcroot)\build\win32\gi-introspection-msvc.mak for more details.  Doing
-"nmake -f gi-introspection-msvc.mak (options omitted)" will build the various introspection files,
-and "nmake -f gi-introspection-msvc.mak (options omitted) install-introspection" will copy the introspection
-files to <root>\vs15\<PlatformName>\share\gir-1.0 (.gir files) and <root>\vs15\<PlatformName>\lib\girepository-1.0
-(.typelib files)
-
-*** End of Note! ***
-
-The "install" project will copy build results and headers into their
-appropriate location under <root>\vs15\<PlatformName>. For instance,
-built DLLs go into <root>\vs15\<PlatformName>\bin, built LIBs into
-<root>\vs15\<PlatformName>\lib and gobject-introspection headers into
-<root>\vs15\<PlatformName>\include\gobject-introsection-1.0.
-
-This is then from where
-project files higher in the stack are supposed to look for them, not
-from a specific gobject-introspection source tree.
-
---Tor Lillqvist <tml@iki.fi>
---Updated by Chun-wei Fan <fanc999@gmail.com>
diff --git a/win32/vs15/_giscanner.vcxproj b/win32/vs15/_giscanner.vcxproj
deleted file mode 100644
index 5ea55d8..0000000
--- a/win32/vs15/_giscanner.vcxproj
+++ /dev/null
@@ -1,188 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{8311394F-9114-4C97-80F2-51BCABA054C9}</ProjectGuid>
-    <RootNamespace>_giscanner</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\giscanner;$(PythonDir)\include;$(PythonDir)\PC;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <ForcedIncludeFiles>%(ForcedIncludeFiles);io.h</ForcedIncludeFiles>
-      <PreprocessorDefinitions>_DEBUG;YY_NO_UNISTD_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(OutDir)$(ProjectName).pyd</OutputFile>
-      <AdditionalLibraryDirectories>$(PythonDir)\libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\..\giscanner;$(PythonDir)\include;$(PythonDir)\PC;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <ForcedIncludeFiles>%(ForcedIncludeFiles);io.h</ForcedIncludeFiles>
-      <PreprocessorDefinitions>YY_NO_UNISTD_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(OutDir)$(ProjectName).pyd</OutputFile>
-      <AdditionalLibraryDirectories>$(PythonDir)\libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\giscanner;$(PythonDirX64)\include;$(PythonDirX64)\PC;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <ForcedIncludeFiles>%(ForcedIncludeFiles);io.h</ForcedIncludeFiles>
-      <PreprocessorDefinitions>_DEBUG;YY_NO_UNISTD_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(OutDir)$(ProjectName).pyd</OutputFile>
-      <AdditionalLibraryDirectories>$(PythonDirX64)\libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\..\giscanner;$(PythonDirX64)\include;$(PythonDirX64)\PC;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <ForcedIncludeFiles>%(ForcedIncludeFiles);io.h</ForcedIncludeFiles>
-      <PreprocessorDefinitions>YY_NO_UNISTD_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(OutDir)$(ProjectName).pyd</OutputFile>
-      <AdditionalLibraryDirectories>$(PythonDirX64)\libs;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\giscanner\giscannermodule.c" />
-    <ClCompile Include="..\..\scannerlexer.c" />
-    <ClCompile Include="..\..\scannerparser.c" />
-    <ClCompile Include="..\..\giscanner\sourcescanner.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="gi-prebuild.vcxproj">
-      <Project>{2093d218-190e-4194-9421-3ba7cbf33b11}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/win32/vs15/_giscanner.vcxproj.filters b/win32/vs15/_giscanner.vcxproj.filters
deleted file mode 100644
index 1ddc9a2..0000000
--- a/win32/vs15/_giscanner.vcxproj.filters
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Sources">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Headers">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\giscanner\giscannermodule.c"><Filter>Sources</Filter></ClCompile>
-    <ClCompile Include="..\..\scannerlexer.c"><Filter>Sources</Filter></ClCompile>
-    <ClCompile Include="..\..\scannerparser.c"><Filter>Sources</Filter></ClCompile>
-    <ClCompile Include="..\..\giscanner\sourcescanner.c"><Filter>Sources</Filter></ClCompile>
-  </ItemGroup>
-</Project>
diff --git a/win32/vs15/cmph-bdz-test.vcxproj b/win32/vs15/cmph-bdz-test.vcxproj
deleted file mode 100644
index ce5662c..0000000
--- a/win32/vs15/cmph-bdz-test.vcxproj
+++ /dev/null
@@ -1,174 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{E41F378B-CCDD-4B1C-89C3-6D2C950FAF1A}</ProjectGuid>
-    <RootNamespace>cmphbdztest</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\girepository\cmph;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\..\girepository\cmph;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <WholeProgramOptimization>false</WholeProgramOptimization>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\girepository\cmph;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\..\girepository\cmph;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\girepository\cmph-bdz-test.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="cmph.vcxproj">
-      <Project>{442c007e-d901-41da-9706-5db4afb4c06b}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/win32/vs15/cmph-bdz-test.vcxproj.filters b/win32/vs15/cmph-bdz-test.vcxproj.filters
deleted file mode 100644
index 2720d49..0000000
--- a/win32/vs15/cmph-bdz-test.vcxproj.filters
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Sources">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Headers">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\girepository\cmph-bdz-test.c">
-      <Filter>Sources</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
diff --git a/win32/vs15/cmph.vcxproj b/win32/vs15/cmph.vcxproj
deleted file mode 100644
index c0bc194..0000000
--- a/win32/vs15/cmph.vcxproj
+++ /dev/null
@@ -1,163 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{442C007E-D901-41DA-9706-5DB4AFB4C06B}</ProjectGuid>
-    <RootNamespace>cmph</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-   <ClCompile Include="..\..\girepository\cmph\bdz.c" />
-   <ClCompile Include="..\..\girepository\cmph\bdz_ph.c" />
-   <ClCompile Include="..\..\girepository\cmph\bmz8.c" />
-   <ClCompile Include="..\..\girepository\cmph\bmz.c" />
-   <ClCompile Include="..\..\girepository\cmph\brz.c" />
-   <ClCompile Include="..\..\girepository\cmph\buffer_entry.c" />
-   <ClCompile Include="..\..\girepository\cmph\buffer_manager.c" />
-   <ClCompile Include="..\..\girepository\cmph\chd.c" />
-   <ClCompile Include="..\..\girepository\cmph\chd_ph.c" />
-   <ClCompile Include="..\..\girepository\cmph\chm.c" />
-   <ClCompile Include="..\..\girepository\cmph\cmph.c" />
-   <ClCompile Include="..\..\girepository\cmph\cmph_structs.c" />
-   <ClCompile Include="..\..\girepository\cmph\compressed_rank.c" />
-   <ClCompile Include="..\..\girepository\cmph\compressed_seq.c" />
-   <ClCompile Include="..\..\girepository\cmph\fch_buckets.c" />
-   <ClCompile Include="..\..\girepository\cmph\fch.c" />
-   <ClCompile Include="..\..\girepository\cmph\graph.c" />
-   <ClCompile Include="..\..\girepository\cmph\hash.c" />
-   <ClCompile Include="..\..\girepository\cmph\jenkins_hash.c" />
-   <ClCompile Include="..\..\girepository\cmph\miller_rabin.c" />
-   <ClCompile Include="..\..\girepository\cmph\select.c" />
-   <ClCompile Include="..\..\girepository\cmph\vqueue.c" />
-   <ClCompile Include="..\..\girepository\cmph\vstack.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="gi-prebuild.vcxproj">
-      <Project>{2093d218-190e-4194-9421-3ba7cbf33b11}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/win32/vs15/cmph.vcxproj.filters b/win32/vs15/cmph.vcxproj.filters
deleted file mode 100644
index df71f98..0000000
--- a/win32/vs15/cmph.vcxproj.filters
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Sources">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Headers">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-   <ClCompile Include="..\..\girepository\cmph\bdz.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\cmph\bdz_ph.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\cmph\bmz8.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\cmph\bmz.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\cmph\brz.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\cmph\buffer_entry.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\cmph\buffer_manager.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\cmph\chd.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\cmph\chd_ph.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\cmph\chm.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\cmph\cmph.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\cmph\cmph_structs.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\cmph\compressed_rank.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\cmph\compressed_seq.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\cmph\fch_buckets.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\cmph\fch.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\cmph\graph.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\cmph\hash.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\cmph\jenkins_hash.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\cmph\miller_rabin.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\cmph\select.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\cmph\vqueue.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\cmph\vstack.c"><Filter>Source Files</Filter></ClCompile>
-  </ItemGroup>
-</Project>
diff --git a/win32/vs15/g-ir-compiler.vcxproj b/win32/vs15/g-ir-compiler.vcxproj
deleted file mode 100644
index 4ce3ce7..0000000
--- a/win32/vs15/g-ir-compiler.vcxproj
+++ /dev/null
@@ -1,187 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774}</ProjectGuid>
-    <RootNamespace>gircompiler</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ffi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ffi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ffi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ffi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-   <ClCompile Include="..\..\girepository\gthash.c" />
-   <ClCompile Include="..\..\girepository\girmodule.c" />
-   <ClCompile Include="..\..\girepository\girnode.c" />
-   <ClCompile Include="..\..\girepository\giroffsets.c" />
-   <ClCompile Include="..\..\girepository\girparser.c" />
-   <ClCompile Include="..\..\girepository\girwriter.c" />
-    <ClCompile Include="..\..\tools\compiler.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="cmph.vcxproj">
-      <Project>{442c007e-d901-41da-9706-5db4afb4c06b}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="girepository.vcxproj">
-      <Project>{23e28245-8fc7-4b41-b1c5-8785bd4366a7}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/win32/vs15/g-ir-compiler.vcxproj.filters b/win32/vs15/g-ir-compiler.vcxproj.filters
deleted file mode 100644
index 7b5ec8d..0000000
--- a/win32/vs15/g-ir-compiler.vcxproj.filters
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Sources">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Headers">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-   <ClCompile Include="..\..\girepository\gthash.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\girmodule.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\girnode.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\giroffsets.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\girparser.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\girwriter.c"><Filter>Source Files</Filter></ClCompile>
-    <ClCompile Include="..\..\tools\compiler.c"><Filter>Sources</Filter></ClCompile>
-  </ItemGroup>
-</Project>
diff --git a/win32/vs15/g-ir-generate.vcxproj b/win32/vs15/g-ir-generate.vcxproj
deleted file mode 100644
index 071b276..0000000
--- a/win32/vs15/g-ir-generate.vcxproj
+++ /dev/null
@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{F4E6621F-A7DD-4863-8CCF-BA04DFC601E3}</ProjectGuid>
-    <RootNamespace>girgenerate</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\tools\generate.c" />
-    <ClCompile Include="..\..\girepository\girwriter.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="girepository.vcxproj">
-      <Project>{23e28245-8fc7-4b41-b1c5-8785bd4366a7}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/win32/vs15/g-ir-generate.vcxproj.filters b/win32/vs15/g-ir-generate.vcxproj.filters
deleted file mode 100644
index b3b32ef..0000000
--- a/win32/vs15/g-ir-generate.vcxproj.filters
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Sources">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Headers">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\tools\generate.c">
-      <Filter>Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\girepository\girwriter.c">
-      <Filter>Sources</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
diff --git a/win32/vs15/g-ir-inspect.vcxproj b/win32/vs15/g-ir-inspect.vcxproj
deleted file mode 100644
index 915d20b..0000000
--- a/win32/vs15/g-ir-inspect.vcxproj
+++ /dev/null
@@ -1,169 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{F4E6621F-A7DD-4863-8CCF-CA04DFC601E3}</ProjectGuid>
-    <RootNamespace>girinspect</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\tools\g-ir-inspect.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="girepository.vcxproj">
-      <Project>{23e28245-8fc7-4b41-b1c5-8785bd4366a7}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/win32/vs15/g-ir-inspect.vcxproj.filters b/win32/vs15/g-ir-inspect.vcxproj.filters
deleted file mode 100644
index 371419a..0000000
--- a/win32/vs15/g-ir-inspect.vcxproj.filters
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Sources">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Headers">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\tools\g-ir-inspect.c"><Filter>Sources</Filter></ClCompile>
-  </ItemGroup>
-</Project>
diff --git a/win32/vs15/gi-build-defines.props b/win32/vs15/gi-build-defines.props
deleted file mode 100644
index 3a7f5fe..0000000
--- a/win32/vs15/gi-build-defines.props
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ImportGroup Label="PropertySheets">
-    <Import Project="gi-version-paths.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros">
-    <GIRepositoryBuildDefines>G_IREPOSITORY_COMPILATION;DLL_EXPORT</GIRepositoryBuildDefines>
-    <GIIntrospectNMakeCmd>cd ..
-set VCInstallDir=$(VCInstallDir)
-nmake -f gi-introspection-msvc.mak CFG=$(Configuration) PREFIX=$(GlibEtcInstallRoot)</GIIntrospectNMakeCmd>
-    <GIIntrospectBuiltFiles>$(SolutionDir)\..\GIRepository-2.0.typelib;$(SolutionDir)\..\cairo-1.0.typelib</GIIntrospectBuiltFiles>
-  </PropertyGroup>
-  <PropertyGroup>
-    <_PropertySheetDisplayName>gibuilddefinesprops</_PropertySheetDisplayName>
-    <OutDir>$(SolutionDir)$(Configuration)\$(PlatformName)\bin\</OutDir>
-    <IntDir>$(SolutionDir)$(Configuration)\$(PlatformName)\obj\$(ProjectName)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..;..\..\girepository;$(GlibEtcInstallRoot)\include\gio-win32-2.0;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>HAVE_CONFIG_H;WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ForcedIncludeFiles>msvc_recommended_pragmas.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <AdditionalOptions>/d2Zi+ %(AdditionalOptions)</AdditionalOptions>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>gio-2.0.lib;gobject-2.0.lib;gmodule-2.0.lib;gthread-2.0.lib;glib-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(GlibEtcInstallRoot)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalOptions Condition="'$(VisualStudioVersion)|$(Platform)'=='11.0|x64'">/HIGHENTROPYVA %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalOptions Condition="'$(VisualStudioVersion)|$(Platform)'=='12.0|x64'">/HIGHENTROPYVA %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalOptions Condition="'$(VisualStudioVersion)|$(Platform)'=='14.0|x64'">/HIGHENTROPYVA %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalOptions Condition="'$(VisualStudioVersion)|$(Platform)'=='15.0|x64'">/HIGHENTROPYVA %(AdditionalOptions)</AdditionalOptions>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <BuildMacro Include="GIRepositoryBuildDefines">
-      <Value>$(GIRepositoryBuildDefines)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GIIntrospectNMakeCmd">
-      <Value>$(GIIntrospectNMakeCmd)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GIIntrospectBuiltFiles">
-      <Value>$(GIIntrospectBuiltFiles)</Value>
-    </BuildMacro>
-  </ItemGroup>
-</Project>
diff --git a/win32/vs15/gi-gen-srcs.props b/win32/vs15/gi-gen-srcs.props
deleted file mode 100644
index 0a5d2c6..0000000
--- a/win32/vs15/gi-gen-srcs.props
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ImportGroup Label="PropertySheets">
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros">
-    <CopyConfigH>copy ..\..\config.h.win32 ..\..\config.h</CopyConfigH>
-    <GenToolsScripts>$(PythonDir)\python ..\gen-win32-g-ir-tools.py</GenToolsScripts>
-    <GenToolsScriptsX64>$(PythonDirX64)\python ..\gen-win32-g-ir-tools.py</GenToolsScriptsX64>
-  </PropertyGroup>
-  <PropertyGroup>
-    <_PropertySheetDisplayName>gigensrcsprops</_PropertySheetDisplayName>
-  </PropertyGroup>
-  <ItemGroup>
-    <BuildMacro Include="CopyConfigH">
-      <Value>$(CopyConfigH)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GenToolsScripts">
-      <Value>$(GenToolsScripts)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GenToolsScriptsX64">
-      <Value>$(GenToolsScriptsX64)</Value>
-    </BuildMacro>
-  </ItemGroup>
-</Project>
diff --git a/win32/vs15/gi-install.props b/win32/vs15/gi-install.props
deleted file mode 100644
index 7643cbd..0000000
--- a/win32/vs15/gi-install.props
+++ /dev/null
@@ -1,202 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ImportGroup Label="PropertySheets">
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros">
-    <BinDir>$(SolutionDir)$(Configuration)\$(Platform)\bin</BinDir>
-    <GIDoInstall>
-mkdir $(CopyDir)
-mkdir $(CopyDir)\bin
-copy $(BinDir)\$(LibGIDllPrefix)girepository$(LibGIDllSuffix).dll $(CopyDir)\bin
-copy $(BinDir)\$(LibGIDllPrefix)girepository$(LibGIDllSuffix).pdb $(CopyDir)\bin
-copy $(BinDir)\g-ir-compiler.exe $(CopyDir)\bin
-copy $(BinDir)\g-ir-compiler.pdb $(CopyDir)\bin
-copy $(BinDir)\g-ir-generate.exe $(CopyDir)\bin
-copy $(BinDir)\g-ir-generate.pdb $(CopyDir)\bin
-copy $(BinDir)\g-ir-inspect.exe $(CopyDir)\bin
-copy $(BinDir)\g-ir-inspect.pdb $(CopyDir)\bin
-copy ..\..\tools\g-ir-annotation-tool $(CopyDir)\bin
-copy ..\..\tools\g-ir-doc-tool $(CopyDir)\bin
-copy ..\..\tools\g-ir-scanner $(CopyDir)\bin
-copy $(BinDir)\glib-print.exe $(CopyDir)\bin
-copy $(BinDir)\glib-print.pdb $(CopyDir)\bin
-mkdir $(CopyDir)\include\gobject-introspection-1.0\girepository
-copy ..\..\girepository\giarginfo.h $(CopyDir)\include\gobject-introspection-1.0\girepository\giarginfo.h
-copy ..\..\girepository\gibaseinfo.h $(CopyDir)\include\gobject-introspection-1.0\girepository\gibaseinfo.h
-copy ..\..\girepository\gicallableinfo.h $(CopyDir)\include\gobject-introspection-1.0\girepository\gicallableinfo.h
-copy ..\..\girepository\giconstantinfo.h $(CopyDir)\include\gobject-introspection-1.0\girepository\giconstantinfo.h
-copy ..\..\girepository\gienuminfo.h $(CopyDir)\include\gobject-introspection-1.0\girepository\gienuminfo.h
-copy ..\..\girepository\gifieldinfo.h $(CopyDir)\include\gobject-introspection-1.0\girepository\gifieldinfo.h
-copy ..\..\girepository\gifunctioninfo.h $(CopyDir)\include\gobject-introspection-1.0\girepository\gifunctioninfo.h
-copy ..\..\girepository\giinterfaceinfo.h $(CopyDir)\include\gobject-introspection-1.0\girepository\giinterfaceinfo.h
-copy ..\..\girepository\giobjectinfo.h $(CopyDir)\include\gobject-introspection-1.0\girepository\giobjectinfo.h
-copy ..\..\girepository\gipropertyinfo.h $(CopyDir)\include\gobject-introspection-1.0\girepository\gipropertyinfo.h
-copy ..\..\girepository\giregisteredtypeinfo.h $(CopyDir)\include\gobject-introspection-1.0\girepository\giregisteredtypeinfo.h
-copy ..\..\girepository\girepository.h $(CopyDir)\include\gobject-introspection-1.0\girepository\girepository.h
-copy ..\..\girepository\girffi.h $(CopyDir)\include\gobject-introspection-1.0\girepository\girffi.h
-copy ..\..\girepository\gisignalinfo.h $(CopyDir)\include\gobject-introspection-1.0\girepository\gisignalinfo.h
-copy ..\..\girepository\gistructinfo.h $(CopyDir)\include\gobject-introspection-1.0\girepository\gistructinfo.h
-copy ..\..\girepository\gitypeinfo.h $(CopyDir)\include\gobject-introspection-1.0\girepository\gitypeinfo.h
-copy ..\..\girepository\gitypelib.h $(CopyDir)\include\gobject-introspection-1.0\girepository\gitypelib.h
-copy ..\..\girepository\gitypes.h $(CopyDir)\include\gobject-introspection-1.0\girepository\gitypes.h
-copy ..\..\girepository\giunioninfo.h $(CopyDir)\include\gobject-introspection-1.0\girepository\giunioninfo.h
-copy ..\..\girepository\giversionmacros.h $(CopyDir)\include\gobject-introspection-1.0\girepository\giversionmacros.h
-copy ..\..\girepository\givfuncinfo.h $(CopyDir)\include\gobject-introspection-1.0\girepository\givfuncinfo.h
-mkdir $(CopyDir)\lib\gobject-introspection\giscanner
-mkdir $(CopyDir)\lib\gobject-introspection\giscanner\collections
-mkdir $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates
-mkdir $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C
-mkdir $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs
-mkdir $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python
-copy ..\..\giscanner\__init__.py $(CopyDir)\lib\gobject-introspection\giscanner
-copy ..\..\giscanner\annotationmain.py $(CopyDir)\lib\gobject-introspection\giscanner
-copy ..\..\giscanner\annotationparser.py $(CopyDir)\lib\gobject-introspection\giscanner
-copy ..\..\giscanner\ast.py $(CopyDir)\lib\gobject-introspection\giscanner
-copy ..\..\giscanner\cachestore.py $(CopyDir)\lib\gobject-introspection\giscanner
-copy ..\..\giscanner\ccompiler.py $(CopyDir)\lib\gobject-introspection\giscanner
-copy ..\..\giscanner\codegen.py $(CopyDir)\lib\gobject-introspection\giscanner
-copy ..\..\giscanner\docmain.py $(CopyDir)\lib\gobject-introspection\giscanner
-copy ..\..\giscanner\docwriter.py $(CopyDir)\lib\gobject-introspection\giscanner
-copy ..\..\giscanner\dumper.py $(CopyDir)\lib\gobject-introspection\giscanner
-copy ..\..\giscanner\introspectablepass.py $(CopyDir)\lib\gobject-introspection\giscanner
-copy ..\..\giscanner\girparser.py $(CopyDir)\lib\gobject-introspection\giscanner
-copy ..\..\giscanner\girwriter.py $(CopyDir)\lib\gobject-introspection\giscanner
-copy ..\..\giscanner\gdumpparser.py $(CopyDir)\lib\gobject-introspection\giscanner
-copy ..\..\giscanner\libtoolimporter.py $(CopyDir)\lib\gobject-introspection\giscanner
-copy ..\..\giscanner\maintransformer.py $(CopyDir)\lib\gobject-introspection\giscanner
-copy ..\..\giscanner\message.py $(CopyDir)\lib\gobject-introspection\giscanner
-copy ..\..\giscanner\msvccompiler.py $(CopyDir)\lib\gobject-introspection\giscanner
-copy ..\..\giscanner\shlibs.py $(CopyDir)\lib\gobject-introspection\giscanner
-copy ..\..\giscanner\scannermain.py $(CopyDir)\lib\gobject-introspection\giscanner
-copy ..\..\giscanner\sectionparser.py $(CopyDir)\lib\gobject-introspection\giscanner
-copy ..\..\giscanner\sourcescanner.py $(CopyDir)\lib\gobject-introspection\giscanner
-copy ..\..\giscanner\testcodegen.py $(CopyDir)\lib\gobject-introspection\giscanner
-copy ..\..\giscanner\transformer.py $(CopyDir)\lib\gobject-introspection\giscanner
-copy ..\..\giscanner\utils.py $(CopyDir)\lib\gobject-introspection\giscanner
-copy ..\..\giscanner\xmlwriter.py $(CopyDir)\lib\gobject-introspection\giscanner
-copy ..\..\giscanner\collections\__init__.py $(CopyDir)\lib\gobject-introspection\giscanner\collections
-copy ..\..\giscanner\collections\counter.py $(CopyDir)\lib\gobject-introspection\giscanner\collections
-copy ..\..\giscanner\collections\ordereddict.py $(CopyDir)\lib\gobject-introspection\giscanner\collections
-copy ..\..\giscanner\doctemplates\base.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates
-copy ..\..\giscanner\doctemplates\class.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates
-copy ..\..\giscanner\doctemplates\namespace.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates
-copy ..\..\giscanner\doctemplates\C\callback.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C
-copy ..\..\giscanner\doctemplates\C\class.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C
-copy ..\..\giscanner\doctemplates\C\constructor.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C
-copy ..\..\giscanner\doctemplates\C\default.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C
-copy ..\..\giscanner\doctemplates\C\enum.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C
-copy ..\..\giscanner\doctemplates\C\function.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C
-copy ..\..\giscanner\doctemplates\C\field.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C
-copy ..\..\giscanner\doctemplates\C\interface.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C
-copy ..\..\giscanner\doctemplates\C\method.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C
-copy ..\..\giscanner\doctemplates\C\namespace.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C
-copy ..\..\giscanner\doctemplates\C\property.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C
-copy ..\..\giscanner\doctemplates\C\record.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C
-copy ..\..\giscanner\doctemplates\C\signal.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C
-copy ..\..\giscanner\doctemplates\C\vfunc.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C
-copy ..\..\giscanner\doctemplates\Python\callback.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python
-copy ..\..\giscanner\doctemplates\Python\class.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python
-copy ..\..\giscanner\doctemplates\Python\constructor.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python
-copy ..\..\giscanner\doctemplates\Python\default.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python
-copy ..\..\giscanner\doctemplates\Python\enum.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python
-copy ..\..\giscanner\doctemplates\Python\function.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python
-copy ..\..\giscanner\doctemplates\Python\field.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python
-copy ..\..\giscanner\doctemplates\Python\interface.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python
-copy ..\..\giscanner\doctemplates\Python\method.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python
-copy ..\..\giscanner\doctemplates\Python\namespace.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python
-copy ..\..\giscanner\doctemplates\Python\property.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python
-copy ..\..\giscanner\doctemplates\Python\record.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python
-copy ..\..\giscanner\doctemplates\Python\signal.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python
-copy ..\..\giscanner\doctemplates\Python\vfunc.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python
-copy ..\..\giscanner\doctemplates\Gjs\callback.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs
-copy ..\..\giscanner\doctemplates\Gjs\class.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs
-copy ..\..\giscanner\doctemplates\Gjs\constructor.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs
-copy ..\..\giscanner\doctemplates\Gjs\default.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs
-copy ..\..\giscanner\doctemplates\Gjs\enum.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs
-copy ..\..\giscanner\doctemplates\Gjs\function.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs
-copy ..\..\giscanner\doctemplates\Gjs\field.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs
-copy ..\..\giscanner\doctemplates\Gjs\interface.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs
-copy ..\..\giscanner\doctemplates\Gjs\method.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs
-copy ..\..\giscanner\doctemplates\Gjs\namespace.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs
-copy ..\..\giscanner\doctemplates\Gjs\property.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs
-copy ..\..\giscanner\doctemplates\Gjs\record.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs
-copy ..\..\giscanner\doctemplates\Gjs\signal.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs
-copy ..\..\giscanner\doctemplates\Gjs\vfunc.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs
-mkdir $(CopyDir)\share\gobject-introspection-1.0\tests
-copy ..\..\tests\gitestmacros.h $(CopyDir)\share\gobject-introspection-1.0\tests
-copy ..\..\tests\gimarshallingtests.c $(CopyDir)\share\gobject-introspection-1.0\tests
-copy ..\..\tests\gimarshallingtests.h $(CopyDir)\share\gobject-introspection-1.0\tests
-copy ..\..\tests\scanner\regress.c $(CopyDir)\share\gobject-introspection-1.0\tests
-copy ..\..\tests\scanner\regress.h $(CopyDir)\share\gobject-introspection-1.0\tests
-copy ..\..\tests\scanner\annotation.c $(CopyDir)\share\gobject-introspection-1.0\tests
-copy ..\..\tests\scanner\annotation.h $(CopyDir)\share\gobject-introspection-1.0\tests
-copy ..\..\tests\scanner\foo.c $(CopyDir)\share\gobject-introspection-1.0\tests
-copy ..\..\tests\scanner\foo.h $(CopyDir)\share\gobject-introspection-1.0\tests
-copy ..\..\tests\scanner\drawable.c $(CopyDir)\share\gobject-introspection-1.0\tests
-copy ..\..\tests\scanner\drawable.h $(CopyDir)\share\gobject-introspection-1.0\tests
-copy ..\..\tests\scanner\warnlib.c $(CopyDir)\share\gobject-introspection-1.0\tests
-copy ..\..\tests\scanner\warnlib.h $(CopyDir)\share\gobject-introspection-1.0\tests
-copy ..\..\tests\scanner\utility.c $(CopyDir)\share\gobject-introspection-1.0\tests
-copy ..\..\tests\scanner\utility.h $(CopyDir)\share\gobject-introspection-1.0\tests
-copy ..\everything.c $(CopyDir)\share\gobject-introspection-1.0\tests
-copy ..\everything.h $(CopyDir)\share\gobject-introspection-1.0\tests
-copy $(BinDir)\_giscanner.pyd $(CopyDir)\lib\gobject-introspection\giscanner
-copy $(BinDir)\_giscanner.pdb $(CopyDir)\lib\gobject-introspection\giscanner
-mkdir $(CopyDir)\share\gobject-introspection-$(ApiVersion)
-copy ..\..\girepository\gdump.c $(CopyDir)\share\gobject-introspection-$(ApiVersion)
-mkdir $(CopyDir)\lib
-copy $(BinDir)\girepository-$(ApiVersion).lib $(CopyDir)\lib
-mkdir $(CopyDir)\share\gir-$(ApiVersion)
-copy ..\cairo-1.0.gir $(CopyDir)\share\gir-$(ApiVersion)
-copy ..\fontconfig-2.0.gir $(CopyDir)\share\gir-$(ApiVersion)
-copy ..\freetype2-2.0.gir $(CopyDir)\share\gir-$(ApiVersion)
-copy ..\Gio-2.0.gir $(CopyDir)\share\gir-$(ApiVersion)
-copy ..\GIRepository-2.0.gir $(CopyDir)\share\gir-$(ApiVersion)
-copy ..\GL-1.0.gir $(CopyDir)\share\gir-$(ApiVersion)
-copy ..\GLib-2.0.gir $(CopyDir)\share\gir-$(ApiVersion)
-copy ..\GModule-2.0.gir $(CopyDir)\share\gir-$(ApiVersion)
-copy ..\GObject-2.0.gir $(CopyDir)\share\gir-$(ApiVersion)
-copy ..\libxml2-2.0.gir $(CopyDir)\share\gir-$(ApiVersion)
-copy ..\win32-1.0.gir $(CopyDir)\share\gir-$(ApiVersion)
-mkdir $(CopyDir)\lib\girepository-$(ApiVersion)
-copy ..\cairo-1.0.typelib $(CopyDir)\lib\girepository-$(ApiVersion)
-copy ..\fontconfig-2.0.typelib $(CopyDir)\lib\girepository-$(ApiVersion)
-copy ..\freetype2-2.0.typelib $(CopyDir)\lib\girepository-$(ApiVersion)
-copy ..\Gio-2.0.typelib $(CopyDir)\lib\girepository-$(ApiVersion)
-copy ..\GIRepository-2.0.typelib $(CopyDir)\lib\girepository-$(ApiVersion)
-copy ..\GL-1.0.typelib $(CopyDir)\lib\girepository-$(ApiVersion)
-copy ..\GLib-2.0.typelib $(CopyDir)\lib\girepository-$(ApiVersion)
-copy ..\GModule-2.0.typelib $(CopyDir)\lib\girepository-$(ApiVersion)
-copy ..\GObject-2.0.typelib $(CopyDir)\lib\girepository-$(ApiVersion)
-copy ..\libxml2-2.0.typelib $(CopyDir)\lib\girepository-$(ApiVersion)
-copy ..\win32-1.0.typelib $(CopyDir)\lib\girepository-$(ApiVersion)
-mkdir $(CopyDir)\lib\pkgconfig
-copy ..\gobject-introspection-1.0.pc $(CopyDir)\lib\pkgconfig
-copy ..\gobject-introspection-no-export-1.0.pc $(CopyDir)\lib\pkgconfig
-    </GIDoInstall>
-    <GIPCFiles>..\gobject-introspection-1.0.pc;..\gobject-introspection-no-export-1.0.pc</GIPCFiles>
-    <GIGenPC>$(PythonDir)\python.exe ..\gipc.py --version=$(GIVersion) --prefix=$(CopyDir)</GIGenPC>
-    <GIGenPCX64>$(PythonDirX64)\python.exe ..\gipc.py --version=$(GIVersion) --prefix=$(CopyDir)</GIGenPCX64>
-  </PropertyGroup>
-  <PropertyGroup>
-    <_PropertySheetDisplayName>giinstallprops</_PropertySheetDisplayName>
-  </PropertyGroup>
-  <ItemGroup>
-    <BuildMacro Include="BinDir">
-      <Value>$(BinDir)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GIDoInstall">
-      <Value>$(GIDoInstall)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GIPCFiles">
-      <Value>$(GIPCFiles)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GIGenPC">
-      <Value>$(GIGenPC)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GIGenPCX64">
-      <Value>$(GIGenPCX64)</Value>
-    </BuildMacro>
-  </ItemGroup>
-</Project>
diff --git a/win32/vs15/gi-install.vcxproj b/win32/vs15/gi-install.vcxproj
deleted file mode 100644
index 48557bb..0000000
--- a/win32/vs15/gi-install.vcxproj
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{2093D218-190E-4194-9421-3BA7CBF33B10}</ProjectGuid>
-    <RootNamespace>install</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Utility</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Utility</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Utility</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Utility</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-install.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-install.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-install.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-install.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <OutDir Condition="'$(Configuration)'=='Debug'">$(GlibEtcInstallRoot)\</OutDir>
-    <ExtensionsToDeleteOnClean Condition="'$(Configuration)'=='Debug'" />
-    <OutDir Condition="'$(Configuration)'=='Release'">$(GlibEtcInstallRoot)\</OutDir>
-    <ExtensionsToDeleteOnClean Condition="'$(Configuration)'=='Release'" />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <CustomBuild Include="..\..\config.h.win32">
-      <Message Condition="'$(Configuration)'=='Debug'">Installing Build Results...</Message>
-      <AdditionalInputs Condition="'$(Configuration)'=='Debug'">$(GIPCFiles)</AdditionalInputs>
-      <Command Condition="'$(Configuration)'=='Debug'">$(GIDoInstall)</Command>
-      <Outputs Condition="'$(Configuration)'=='Debug'">some_random_file;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)'=='Release'">Installing Build Results...</Message>
-      <AdditionalInputs Condition="'$(Configuration)'=='Release'">$(GIPCFiles)</AdditionalInputs>
-      <Command Condition="'$(Configuration)'=='Release'">$(GIDoInstall)</Command>
-      <Outputs Condition="'$(Configuration)'=='Release'">some_random_file;%(Outputs)</Outputs>
-    </CustomBuild>
-    <CustomBuild Include="..\gipc.py">
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating .pc files...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GIGenPC)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GIPCFiles);%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Generating .pc files...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GIGenPCX64)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GIPCFiles);%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Generating .pc files...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GIGenPC)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GIPCFiles);%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Generating .pc files...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GIGenPCX64)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GIPCFiles);%(Outputs)</Outputs>
-    </CustomBuild>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="g-ir-inspect.vcxproj">
-      <Project>{f4e6621f-a7dd-4863-8ccf-ca04dfc601e3}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="g-ir-compiler.vcxproj">
-      <Project>{5dcb55ce-f32c-4c77-8bf4-b4dad3ec7774}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="g-ir-generate.vcxproj">
-      <Project>{f4e6621f-a7dd-4863-8ccf-ba04dfc601e3}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="girepository.vcxproj">
-      <Project>{23e28245-8fc7-4b41-b1c5-8785bd4366a7}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="_giscanner.vcxproj">
-      <Project>{8311394f-9114-4c97-80f2-51bcaba054c9}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="gi-introspect.vcxproj">
-      <Project>{7a36674c-379d-4989-a978-07124e5f852c}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/win32/vs15/gi-install.vcxproj.filters b/win32/vs15/gi-install.vcxproj.filters
deleted file mode 100644
index 590ad10..0000000
--- a/win32/vs15/gi-install.vcxproj.filters
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <CustomBuild Include="..\..\config.h.win32"><Filter>Resource Files</Filter></CustomBuild>
-    <CustomBuild Include="..\gipc.py"><Filter>Resource Files</Filter></CustomBuild>
-  </ItemGroup>
-</Project>
diff --git a/win32/vs15/gi-introspect.vcxproj b/win32/vs15/gi-introspect.vcxproj
deleted file mode 100644
index ea1e7f4..0000000
--- a/win32/vs15/gi-introspect.vcxproj
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{7A36674C-379D-4989-A978-07124E5F852C}</ProjectGuid>
-    <RootNamespace>giintrospect</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <NMakeBuildCommandLine>$(GIIntrospectNMakeCmd) $(IntrospectPythonParam)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>$(GIIntrospectNMakeCmd) $(IntrospectPythonParam) clean all</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>$(GIIntrospectNMakeCmd) $(IntrospectPythonParam) clean</NMakeCleanCommandLine>
-    <NMakeOutput>$(GIIntrospectBuiltFiles)</NMakeOutput>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <NMakeBuildCommandLine>$(GIIntrospectNMakeCmd) $(IntrospectPythonParam)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>$(GIIntrospectNMakeCmd) $(IntrospectPythonParam) clean all</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>$(GIIntrospectNMakeCmd) $(IntrospectPythonParam) clean</NMakeCleanCommandLine>
-    <NMakeOutput>$(GIIntrospectBuiltFiles)</NMakeOutput>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <NMakeBuildCommandLine>$(GIIntrospectNMakeCmd) $(IntrospectPythonParamX64)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>$(GIIntrospectNMakeCmd) $(IntrospectPythonParamX64) clean all</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>$(GIIntrospectNMakeCmd) $(IntrospectPythonParamX64) clean</NMakeCleanCommandLine>
-    <NMakeOutput>$(GIIntrospectBuiltFiles)</NMakeOutput>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <NMakeBuildCommandLine>$(GIIntrospectNMakeCmd) $(IntrospectPythonParamX64)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>$(GIIntrospectNMakeCmd) $(IntrospectPythonParamX64) clean all</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>$(GIIntrospectNMakeCmd) $(IntrospectPythonParamX64) clean</NMakeCleanCommandLine>
-    <NMakeOutput>$(GIIntrospectBuiltFiles)</NMakeOutput>
-  </PropertyGroup>
-  <ItemGroup>
-    <ProjectReference Include="g-ir-compiler.vcxproj">
-      <Project>{5dcb55ce-f32c-4c77-8bf4-b4dad3ec7774}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="g-ir-generate.vcxproj">
-      <Project>{f4e6621f-a7dd-4863-8ccf-ba04dfc601e3}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="girepository.vcxproj">
-      <Project>{23e28245-8fc7-4b41-b1c5-8785bd4366a7}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="_giscanner.vcxproj">
-      <Project>{8311394f-9114-4c97-80f2-51bcaba054c9}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/win32/vs15/gi-prebuild.vcxproj b/win32/vs15/gi-prebuild.vcxproj
deleted file mode 100644
index 6b0d505..0000000
--- a/win32/vs15/gi-prebuild.vcxproj
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{2093D218-190E-4194-9421-3BA7CBF33B11}</ProjectGuid>
-    <RootNamespace>giprebuild</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Utility</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Utility</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Utility</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Utility</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-gen-srcs.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-gen-srcs.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-gen-srcs.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-gen-srcs.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <ExtensionsToDeleteOnClean Condition="'$(Configuration)'=='Debug'" />
-    <ExtensionsToDeleteOnClean Condition="'$(Configuration)'=='Release'" />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <CustomBuild Include="..\..\config.h.win32">
-      <Message Condition="'$(Configuration)'=='Debug'">Copying config.h from config.h.win32...</Message>
-      <Command Condition="'$(Configuration)'=='Debug'">$(CopyConfigH)</Command>
-      <Outputs Condition="'$(Configuration)'=='Debug'">..\..\config.h;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)'=='Release'">Copying config.h from config.h.win32...</Message>
-      <Command Condition="'$(Configuration)'=='Release'">$(CopyConfigH)</Command>
-      <Outputs Condition="'$(Configuration)'=='Release'">..\..\config.h;%(Outputs)</Outputs>
-    </CustomBuild>
-    <CustomBuild Include="..\..\tools\g-ir-tool-template.in">
-      <Message Condition="'$(Configuration)'=='Debug'">Generating Tools Scripts...</Message>
-      <Command Condition="'$(Configuration)'=='Debug'">$(GenToolsScripts)</Command>
-      <Message Condition="'$(Configuration)'=='Release'">Generating Tools Scripts...</Message>
-      <Command Condition="'$(Configuration)'=='Release'">$(GenToolsScripts)</Command>
-      <Outputs Condition="'$(Configuration)'=='Release'">..\..\tools\g-ir-scanner;..\..\tools\g-ir-doc-tool;..\..\tools\g-ir-annotation-tool;%(Outputs)</Outputs>
-    </CustomBuild>
-  </ItemGroup>
-  <ItemGroup>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/win32/vs15/gi-version-paths.props b/win32/vs15/gi-version-paths.props
deleted file mode 100644
index 9e1286d..0000000
--- a/win32/vs15/gi-version-paths.props
+++ /dev/null
@@ -1,81 +0,0 @@
-<?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>15</VSVer>
-    <GlibEtcInstallRoot>$(SolutionDir)\..\..\..\vs$(VSVer)\$(Platform)</GlibEtcInstallRoot>
-    <CopyDir>$(GlibEtcInstallRoot)</CopyDir>
-    <!-- PythonDir needs to point to a 32-bit/x86 Python 2.7/3.3+ installation -->
-    <PythonDir Condition="'$(VisualStudioVersion)' == '10.0'">c:\\python34</PythonDir>
-    <PythonDir Condition="'$(VisualStudioVersion)' == '11.0'">c:\\python34</PythonDir>
-    <PythonDir Condition="'$(VisualStudioVersion)' == '12.0'">c:\\python34</PythonDir>
-    <PythonDir Condition="'$(VisualStudioVersion)' == '14.0'">c:\\python36</PythonDir>
-    <PythonDir Condition="'$(VisualStudioVersion)' == '15.0'">c:\\python36</PythonDir>
-    <!-- PythonDirX64 needs to point to an x86-64/x64 Python 2.7/3.3+ installation -->
-    <PythonDirX64>$(PythonDir).x64</PythonDirX64>
-    <IntrospectPythonParam>PYTHON=$(PythonDir)\python.exe</IntrospectPythonParam>
-    <IntrospectPythonParamX64>PYTHON=$(PythonDirX64)\python.exe</IntrospectPythonParamX64>
-    <GIVersion>1.56.1</GIVersion>
-    <BASE_GI_DIR>$(SolutionDir)\..\..</BASE_GI_DIR>
-    <ApiVersion>1.0</ApiVersion>
-    <DefDir>$(SolutionDir)$(Configuration)\$(Platform)\obj\$(ProjectName)</DefDir>
-    <LibGILibtoolCompatibleDllPrefix>lib</LibGILibtoolCompatibleDllPrefix>
-    <LibGILibtoolCompatibleDllSuffix>-$(ApiVersion)-0</LibGILibtoolCompatibleDllSuffix>
-    <LibGISeparateVSDllPrefix />
-    <LibGISeparateVSDllSuffix>-1-vs$(VSVer)</LibGISeparateVSDllSuffix>
-    <LibGIDllPrefix>$(LibGISeparateVSDllPrefix)</LibGIDllPrefix>
-    <LibGIDllSuffix>$(LibGISeparateVSDllSuffix)</LibGIDllSuffix>
-  </PropertyGroup>
-  <PropertyGroup>
-    <_PropertySheetDisplayName>giversionpathsprops</_PropertySheetDisplayName>
-  </PropertyGroup>
-  <ItemGroup>
-    <BuildMacro Include="VSVer">
-      <Value>$(VSVer)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GlibEtcInstallRoot">
-      <Value>$(GlibEtcInstallRoot)</Value>
-    </BuildMacro>
-    <BuildMacro Include="CopyDir">
-      <Value>$(CopyDir)</Value>
-    </BuildMacro>
-    <BuildMacro Include="PythonDir">
-      <Value>$(PythonDir)</Value>
-    </BuildMacro>
-    <BuildMacro Include="PythonDirX64">
-      <Value>$(PythonDirX64)</Value>
-    </BuildMacro>
-    <BuildMacro Include="IntrospectPythonParam">
-      <Value>$(IntrospectPythonParam)</Value>
-    </BuildMacro>
-    <BuildMacro Include="IntrospectPythonParamX64">
-      <Value>$(IntrospectPythonParamX64)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GIVersion">
-      <Value>$(GIVersion)</Value>
-    </BuildMacro>
-    <BuildMacro Include="BASE_GI_DIR">
-      <Value>$(BASE_GI_DIR)</Value>
-    </BuildMacro>
-    <BuildMacro Include="ApiVersion">
-      <Value>$(ApiVersion)</Value>
-    </BuildMacro>
-    <BuildMacro Include="LibGILibtoolCompatibleDllPrefix">
-      <Value>$(LibGILibtoolCompatibleDllPrefix)</Value>
-    </BuildMacro>
-    <BuildMacro Include="LibGILibtoolCompatibleDllSuffix">
-      <Value>$(LibGILibtoolCompatibleDllSuffix)</Value>
-    </BuildMacro>
-    <BuildMacro Include="LibGISeparateVSDllPrefix">
-      <Value>$(LibGISeparateVSDllPrefix)</Value>
-    </BuildMacro>
-    <BuildMacro Include="LibGISeparateVSDllSuffix">
-      <Value>$(LibGISeparateVSDllSuffix)</Value>
-    </BuildMacro>
-    <BuildMacro Include="LibGIDllPrefix">
-      <Value>$(LibGIDllPrefix)</Value>
-    </BuildMacro>
-    <BuildMacro Include="LibGIDllSuffix">
-      <Value>$(LibGIDllSuffix)</Value>
-    </BuildMacro>
-  </ItemGroup>
-</Project>
diff --git a/win32/vs15/girepository.vcxproj b/win32/vs15/girepository.vcxproj
deleted file mode 100644
index b93bb04..0000000
--- a/win32/vs15/girepository.vcxproj
+++ /dev/null
@@ -1,214 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{23E28245-8FC7-4B41-B1C5-8785BD4366A7}</ProjectGuid>
-    <RootNamespace>girepository</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\girepository;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;$(GIRepositoryBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ffi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).dll</OutputFile>
-      <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\..\girepository;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>$(GIRepositoryBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ffi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).dll</OutputFile>
-      <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\girepository;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;$(GIRepositoryBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ffi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).dll</OutputFile>
-      <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\..\girepository;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>$(GIRepositoryBuildDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ffi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).dll</OutputFile>
-      <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-   <ClCompile Include="..\..\girepository\gdump.c" />
-   <ClCompile Include="..\..\girepository\giarginfo.c" />
-   <ClCompile Include="..\..\girepository\gibaseinfo.c" />
-   <ClCompile Include="..\..\girepository\gicallableinfo.c" />
-   <ClCompile Include="..\..\girepository\giconstantinfo.c" />
-   <ClCompile Include="..\..\girepository\gienuminfo.c" />
-   <ClCompile Include="..\..\girepository\gifieldinfo.c" />
-   <ClCompile Include="..\..\girepository\gifunctioninfo.c" />
-   <ClCompile Include="..\..\girepository\ginvoke.c" />
-   <ClCompile Include="..\..\girepository\giinterfaceinfo.c" />
-   <ClCompile Include="..\..\girepository\giobjectinfo.c" />
-   <ClCompile Include="..\..\girepository\gipropertyinfo.c" />
-   <ClCompile Include="..\..\girepository\giregisteredtypeinfo.c" />
-   <ClCompile Include="..\..\girepository\girepository.c" />
-   <ClCompile Include="..\..\girepository\girffi.c" />
-   <ClCompile Include="..\..\girepository\gisignalinfo.c" />
-   <ClCompile Include="..\..\girepository\gistructinfo.c" />
-   <ClCompile Include="..\..\girepository\gitypeinfo.c" />
-   <ClCompile Include="..\..\girepository\gitypelib.c" />
-   <ClCompile Include="..\..\girepository\giunioninfo.c" />
-   <ClCompile Include="..\..\girepository\givfuncinfo.c" />
-   <ClCompile Include="..\..\girepository\gthash.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="gi-prebuild.vcxproj">
-      <Project>{2093d218-190e-4194-9421-3ba7cbf33b11}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="cmph.vcxproj">
-      <Project>{442c007e-d901-41da-9706-5db4afb4c06b}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/win32/vs15/girepository.vcxproj.filters b/win32/vs15/girepository.vcxproj.filters
deleted file mode 100644
index 8201353..0000000
--- a/win32/vs15/girepository.vcxproj.filters
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Sources">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Headers">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-   <ClCompile Include="..\..\girepository\gdump.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\giarginfo.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\gibaseinfo.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\gicallableinfo.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\giconstantinfo.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\gienuminfo.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\gifieldinfo.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\gifunctioninfo.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\ginvoke.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\giinterfaceinfo.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\giobjectinfo.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\gipropertyinfo.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\giregisteredtypeinfo.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\girepository.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\girffi.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\gisignalinfo.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\gistructinfo.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\gitypeinfo.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\gitypelib.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\giunioninfo.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\givfuncinfo.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\girepository\gthash.c"><Filter>Source Files</Filter></ClCompile>
-  </ItemGroup>
-</Project>
diff --git a/win32/vs15/glib-print.vcxproj b/win32/vs15/glib-print.vcxproj
deleted file mode 100644
index 5eba2e0..0000000
--- a/win32/vs15/glib-print.vcxproj
+++ /dev/null
@@ -1,169 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{2CCD6E09-08E7-44B9-92E6-42F0A5DBBC8B}</ProjectGuid>
-    <RootNamespace>glibprint</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gi-build-defines.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\examples\glib-print.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="girepository.vcxproj">
-      <Project>{23e28245-8fc7-4b41-b1c5-8785bd4366a7}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/win32/vs15/glib-print.vcxproj.filters b/win32/vs15/glib-print.vcxproj.filters
deleted file mode 100644
index f77043c..0000000
--- a/win32/vs15/glib-print.vcxproj.filters
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Sources">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Headers">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\examples\glib-print.c">
-      <Filter>Sources</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
diff --git a/win32/vs15/gobject-introspection.sln b/win32/vs15/gobject-introspection.sln
deleted file mode 100644
index 5b10319..0000000
--- a/win32/vs15/gobject-introspection.sln
+++ /dev/null
@@ -1,126 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gi-prebuild", "gi-prebuild.vcxproj", "{2093D218-190E-4194-9421-3BA7CBF33B11}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cmph", "cmph.vcxproj", "{442C007E-D901-41DA-9706-5DB4AFB4C06B}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cmph-bdz-test", "cmph-bdz-test.vcxproj", "{E41F378B-CCDD-4B1C-89C3-6D2C950FAF1A}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "girepository", "girepository.vcxproj", "{23E28245-8FC7-4B41-B1C5-8785BD4366A7}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_giscanner", "_giscanner.vcxproj", "{8311394F-9114-4C97-80F2-51BCABA054C9}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glib-print", "glib-print.vcxproj", "{2CCD6E09-08E7-44B9-92E6-42F0A5DBBC8B}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "g-ir-generate", "g-ir-generate.vcxproj", "{F4E6621F-A7DD-4863-8CCF-BA04DFC601E3}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "g-ir-compiler", "g-ir-compiler.vcxproj", "{5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "g-ir-inspect", "g-ir-inspect.vcxproj", "{F4E6621F-A7DD-4863-8CCF-CA04DFC601E3}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gi-introspect", "gi-introspect.vcxproj", "{7A36674C-379D-4989-A978-07124E5F852C}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gi-install", "gi-install.vcxproj", "{2093D218-190E-4194-9421-3BA7CBF33B10}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Debug|x64 = Debug|x64
-		Release|Win32 = Release|Win32
-		Release|x64 = Release|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{2093D218-190E-4194-9421-3BA7CBF33B11}.Debug|Win32.ActiveCfg = Debug|Win32
-		{2093D218-190E-4194-9421-3BA7CBF33B11}.Debug|Win32.Build.0 = Debug|Win32
-		{2093D218-190E-4194-9421-3BA7CBF33B11}.Debug|x64.ActiveCfg = Debug|x64
-		{2093D218-190E-4194-9421-3BA7CBF33B11}.Debug|x64.Build.0 = Debug|x64
-		{2093D218-190E-4194-9421-3BA7CBF33B11}.Release|Win32.ActiveCfg = Release|Win32
-		{2093D218-190E-4194-9421-3BA7CBF33B11}.Release|Win32.Build.0 = Release|Win32
-		{2093D218-190E-4194-9421-3BA7CBF33B11}.Release|x64.ActiveCfg = Release|x64
-		{2093D218-190E-4194-9421-3BA7CBF33B11}.Release|x64.Build.0 = Release|x64
-		{442C007E-D901-41DA-9706-5DB4AFB4C06B}.Debug|Win32.ActiveCfg = Debug|Win32
-		{442C007E-D901-41DA-9706-5DB4AFB4C06B}.Debug|Win32.Build.0 = Debug|Win32
-		{442C007E-D901-41DA-9706-5DB4AFB4C06B}.Debug|x64.ActiveCfg = Debug|x64
-		{442C007E-D901-41DA-9706-5DB4AFB4C06B}.Debug|x64.Build.0 = Debug|x64
-		{442C007E-D901-41DA-9706-5DB4AFB4C06B}.Release|Win32.ActiveCfg = Release|Win32
-		{442C007E-D901-41DA-9706-5DB4AFB4C06B}.Release|Win32.Build.0 = Release|Win32
-		{442C007E-D901-41DA-9706-5DB4AFB4C06B}.Release|x64.ActiveCfg = Release|x64
-		{442C007E-D901-41DA-9706-5DB4AFB4C06B}.Release|x64.Build.0 = Release|x64
-		{E41F378B-CCDD-4B1C-89C3-6D2C950FAF1A}.Debug|Win32.ActiveCfg = Debug|Win32
-		{E41F378B-CCDD-4B1C-89C3-6D2C950FAF1A}.Debug|Win32.Build.0 = Debug|Win32
-		{E41F378B-CCDD-4B1C-89C3-6D2C950FAF1A}.Debug|x64.ActiveCfg = Debug|x64
-		{E41F378B-CCDD-4B1C-89C3-6D2C950FAF1A}.Debug|x64.Build.0 = Debug|x64
-		{E41F378B-CCDD-4B1C-89C3-6D2C950FAF1A}.Release|Win32.ActiveCfg = Release|Win32
-		{E41F378B-CCDD-4B1C-89C3-6D2C950FAF1A}.Release|Win32.Build.0 = Release|Win32
-		{E41F378B-CCDD-4B1C-89C3-6D2C950FAF1A}.Release|x64.ActiveCfg = Release|x64
-		{E41F378B-CCDD-4B1C-89C3-6D2C950FAF1A}.Release|x64.Build.0 = Release|x64
-		{23E28245-8FC7-4B41-B1C5-8785BD4366A7}.Debug|Win32.ActiveCfg = Debug|Win32
-		{23E28245-8FC7-4B41-B1C5-8785BD4366A7}.Debug|Win32.Build.0 = Debug|Win32
-		{23E28245-8FC7-4B41-B1C5-8785BD4366A7}.Debug|x64.ActiveCfg = Debug|x64
-		{23E28245-8FC7-4B41-B1C5-8785BD4366A7}.Debug|x64.Build.0 = Debug|x64
-		{23E28245-8FC7-4B41-B1C5-8785BD4366A7}.Release|Win32.ActiveCfg = Release|Win32
-		{23E28245-8FC7-4B41-B1C5-8785BD4366A7}.Release|Win32.Build.0 = Release|Win32
-		{23E28245-8FC7-4B41-B1C5-8785BD4366A7}.Release|x64.ActiveCfg = Release|x64
-		{23E28245-8FC7-4B41-B1C5-8785BD4366A7}.Release|x64.Build.0 = Release|x64
-		{8311394F-9114-4C97-80F2-51BCABA054C9}.Debug|Win32.ActiveCfg = Debug|Win32
-		{8311394F-9114-4C97-80F2-51BCABA054C9}.Debug|Win32.Build.0 = Debug|Win32
-		{8311394F-9114-4C97-80F2-51BCABA054C9}.Debug|x64.ActiveCfg = Debug|x64
-		{8311394F-9114-4C97-80F2-51BCABA054C9}.Debug|x64.Build.0 = Debug|x64
-		{8311394F-9114-4C97-80F2-51BCABA054C9}.Release|Win32.ActiveCfg = Release|Win32
-		{8311394F-9114-4C97-80F2-51BCABA054C9}.Release|Win32.Build.0 = Release|Win32
-		{8311394F-9114-4C97-80F2-51BCABA054C9}.Release|x64.ActiveCfg = Release|x64
-		{8311394F-9114-4C97-80F2-51BCABA054C9}.Release|x64.Build.0 = Release|x64
-		{2CCD6E09-08E7-44B9-92E6-42F0A5DBBC8B}.Debug|Win32.ActiveCfg = Debug|Win32
-		{2CCD6E09-08E7-44B9-92E6-42F0A5DBBC8B}.Debug|Win32.Build.0 = Debug|Win32
-		{2CCD6E09-08E7-44B9-92E6-42F0A5DBBC8B}.Debug|x64.ActiveCfg = Debug|x64
-		{2CCD6E09-08E7-44B9-92E6-42F0A5DBBC8B}.Debug|x64.Build.0 = Debug|x64
-		{2CCD6E09-08E7-44B9-92E6-42F0A5DBBC8B}.Release|Win32.ActiveCfg = Release|Win32
-		{2CCD6E09-08E7-44B9-92E6-42F0A5DBBC8B}.Release|Win32.Build.0 = Release|Win32
-		{2CCD6E09-08E7-44B9-92E6-42F0A5DBBC8B}.Release|x64.ActiveCfg = Release|x64
-		{2CCD6E09-08E7-44B9-92E6-42F0A5DBBC8B}.Release|x64.Build.0 = Release|x64
-		{F4E6621F-A7DD-4863-8CCF-BA04DFC601E3}.Debug|Win32.ActiveCfg = Debug|Win32
-		{F4E6621F-A7DD-4863-8CCF-BA04DFC601E3}.Debug|Win32.Build.0 = Debug|Win32
-		{F4E6621F-A7DD-4863-8CCF-BA04DFC601E3}.Debug|x64.ActiveCfg = Debug|x64
-		{F4E6621F-A7DD-4863-8CCF-BA04DFC601E3}.Debug|x64.Build.0 = Debug|x64
-		{F4E6621F-A7DD-4863-8CCF-BA04DFC601E3}.Release|Win32.ActiveCfg = Release|Win32
-		{F4E6621F-A7DD-4863-8CCF-BA04DFC601E3}.Release|Win32.Build.0 = Release|Win32
-		{F4E6621F-A7DD-4863-8CCF-BA04DFC601E3}.Release|x64.ActiveCfg = Release|x64
-		{F4E6621F-A7DD-4863-8CCF-BA04DFC601E3}.Release|x64.Build.0 = Release|x64
-		{F4E6621F-A7DD-4863-8CCF-CA04DFC601E3}.Debug|Win32.ActiveCfg = Debug|Win32
-		{F4E6621F-A7DD-4863-8CCF-CA04DFC601E3}.Debug|Win32.Build.0 = Debug|Win32
-		{F4E6621F-A7DD-4863-8CCF-CA04DFC601E3}.Debug|x64.ActiveCfg = Debug|x64
-		{F4E6621F-A7DD-4863-8CCF-CA04DFC601E3}.Debug|x64.Build.0 = Debug|x64
-		{F4E6621F-A7DD-4863-8CCF-CA04DFC601E3}.Release|Win32.ActiveCfg = Release|Win32
-		{F4E6621F-A7DD-4863-8CCF-CA04DFC601E3}.Release|Win32.Build.0 = Release|Win32
-		{F4E6621F-A7DD-4863-8CCF-CA04DFC601E3}.Release|x64.ActiveCfg = Release|x64
-		{F4E6621F-A7DD-4863-8CCF-CA04DFC601E3}.Release|x64.Build.0 = Release|x64
-		{5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774}.Debug|Win32.ActiveCfg = Debug|Win32
-		{5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774}.Debug|Win32.Build.0 = Debug|Win32
-		{5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774}.Debug|x64.ActiveCfg = Debug|x64
-		{5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774}.Debug|x64.Build.0 = Debug|x64
-		{5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774}.Release|Win32.ActiveCfg = Release|Win32
-		{5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774}.Release|Win32.Build.0 = Release|Win32
-		{5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774}.Release|x64.ActiveCfg = Release|x64
-		{5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774}.Release|x64.Build.0 = Release|x64
-		{7A36674C-379D-4989-A978-07124E5F852C}.Debug|Win32.ActiveCfg = Debug|Win32
-		{7A36674C-379D-4989-A978-07124E5F852C}.Debug|Win32.Build.0 = Debug|Win32
-		{7A36674C-379D-4989-A978-07124E5F852C}.Debug|x64.ActiveCfg = Debug|x64
-		{7A36674C-379D-4989-A978-07124E5F852C}.Debug|x64.Build.0 = Debug|x64
-		{7A36674C-379D-4989-A978-07124E5F852C}.Release|Win32.ActiveCfg = Release|Win32
-		{7A36674C-379D-4989-A978-07124E5F852C}.Release|Win32.Build.0 = Release|Win32
-		{7A36674C-379D-4989-A978-07124E5F852C}.Release|x64.ActiveCfg = Release|x64
-		{7A36674C-379D-4989-A978-07124E5F852C}.Release|x64.Build.0 = Release|x64
-		{2093D218-190E-4194-9421-3BA7CBF33B10}.Debug|Win32.ActiveCfg = Debug|Win32
-		{2093D218-190E-4194-9421-3BA7CBF33B10}.Debug|Win32.Build.0 = Debug|Win32
-		{2093D218-190E-4194-9421-3BA7CBF33B10}.Debug|x64.ActiveCfg = Debug|x64
-		{2093D218-190E-4194-9421-3BA7CBF33B10}.Debug|x64.Build.0 = Debug|x64
-		{2093D218-190E-4194-9421-3BA7CBF33B10}.Release|Win32.ActiveCfg = Release|Win32
-		{2093D218-190E-4194-9421-3BA7CBF33B10}.Release|Win32.Build.0 = Release|Win32
-		{2093D218-190E-4194-9421-3BA7CBF33B10}.Release|x64.ActiveCfg = Release|x64
-		{2093D218-190E-4194-9421-3BA7CBF33B10}.Release|x64.Build.0 = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/win32/vs9/Makefile.am b/win32/vs9/Makefile.am
deleted file mode 100644
index a92d30c..0000000
--- a/win32/vs9/Makefile.am
+++ /dev/null
@@ -1,32 +0,0 @@
-GENERATED_ITEMS = \
-	cmph.vcproj		\
-	girepository.vcproj	\
-	g-ir-compiler.vcproj	\
-	gi-install.vsprops
-
-EXTRA_DIST = \
-	gobject-introspection.sln	\
-	gi-build-defines.vsprops	\
-	gi-gen-srcs.vsprops	\
-	gi-install.vspropsin	\
-	gi-version-paths.vsprops	\
-	gi-prebuild.vcproj	\
-	girepository.vcprojin	\
-	cmph-bdz-test.vcproj		\
-	cmph.vcprojin		\
-	g-ir-compiler.vcprojin	\
-	g-ir-generate.vcproj	\
-	g-ir-inspect.vcproj	\
-	glib-print.vcproj	\
-	gi-install.vcproj	\
-	gi-introspect.vcproj	\
-	_giscanner.vcproj	\
-	README.txt	\
-	$(GENERATED_ITEMS)
-
-gi-install.vsprops: $(top_srcdir)/win32/vs9/gi-install.vspropsin girepository.headers giscanner.scripts
-	$(CPP) -P - <$(top_srcdir)/win32/vs9/gi-install.vspropsin >$@
-	rm girepository.headers
-	rm giscanner.scripts
-
-DISTCLEANFILES = $(GENERATED_ITEMS)
diff --git a/win32/vs9/Makefile.in b/win32/vs9/Makefile.in
deleted file mode 100644
index 4d80628..0000000
--- a/win32/vs9/Makefile.in
+++ /dev/null
@@ -1,535 +0,0 @@
-# Makefile.in generated by automake 1.15.1 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994-2017 Free Software Foundation, Inc.
-
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-VPATH = @srcdir@
-am__is_gnu_make = { \
-  if test -z '$(MAKELEVEL)'; then \
-    false; \
-  elif test -n '$(MAKE_HOST)'; then \
-    true; \
-  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
-    true; \
-  else \
-    false; \
-  fi; \
-}
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -[dEDm]) skip_next=yes;; \
-      -[JT]) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = win32/vs9
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
-	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
-	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/python.m4 \
-	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES = gi-version-paths.vsprops
-CONFIG_CLEAN_VPATH_FILES =
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN     " $@;
-am__v_GEN_1 = 
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 = 
-SOURCES =
-DIST_SOURCES =
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-am__DIST_COMMON = $(srcdir)/Makefile.in \
-	$(srcdir)/gi-version-paths.vsprops.in
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CAIRO_CFLAGS = @CAIRO_CFLAGS@
-CAIRO_GIR_PACKAGE = @CAIRO_GIR_PACKAGE@
-CAIRO_LIBS = @CAIRO_LIBS@
-CAIRO_SHARED_LIBRARY = @CAIRO_SHARED_LIBRARY@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-EXPANDED_BINDIR = @EXPANDED_BINDIR@
-EXPANDED_DATADIR = @EXPANDED_DATADIR@
-EXPANDED_LIBDIR = @EXPANDED_LIBDIR@
-EXPANDED_LIBEXECDIR = @EXPANDED_LIBEXECDIR@
-EXPANDED_LOCALSTATEDIR = @EXPANDED_LOCALSTATEDIR@
-EXPANDED_SYSCONFDIR = @EXPANDED_SYSCONFDIR@
-EXTRA_LINK_FLAGS = @EXTRA_LINK_FLAGS@
-FFI_CFLAGS = @FFI_CFLAGS@
-FFI_LIBS = @FFI_LIBS@
-FFI_PC_CFLAGS = @FFI_PC_CFLAGS@
-FFI_PC_LIBS = @FFI_PC_LIBS@
-FFI_PC_PACKAGES = @FFI_PC_PACKAGES@
-FGREP = @FGREP@
-GIO_CFLAGS = @GIO_CFLAGS@
-GIO_LIBS = @GIO_LIBS@
-GIO_UNIX_CFLAGS = @GIO_UNIX_CFLAGS@
-GIO_UNIX_LIBS = @GIO_UNIX_LIBS@
-GIREPO_CFLAGS = @GIREPO_CFLAGS@
-GIREPO_LIBS = @GIREPO_LIBS@
-GIR_DIR = @GIR_DIR@
-GIR_SUFFIX = @GIR_SUFFIX@
-GI_HIDDEN_VISIBILITY_CFLAGS = @GI_HIDDEN_VISIBILITY_CFLAGS@
-GI_VERSION = @GI_VERSION@
-GLIBSRC = @GLIBSRC@
-GLIB_CFLAGS = @GLIB_CFLAGS@
-GLIB_LIBS = @GLIB_LIBS@
-GMODULE_CFLAGS = @GMODULE_CFLAGS@
-GMODULE_LIBS = @GMODULE_LIBS@
-GOBJECT_CFLAGS = @GOBJECT_CFLAGS@
-GOBJECT_INTROSPECTION_LIBDIR = @GOBJECT_INTROSPECTION_LIBDIR@
-GOBJECT_LIBS = @GOBJECT_LIBS@
-GREP = @GREP@
-GTKDOC_CHECK = @GTKDOC_CHECK@
-GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
-GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
-GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
-GTKDOC_MKPDF = @GTKDOC_MKPDF@
-GTKDOC_REBASE = @GTKDOC_REBASE@
-HTML_DIR = @HTML_DIR@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LEX = @LEX@
-LEXLIB = @LEXLIB@
-LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MKDIR_P = @MKDIR_P@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
-PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
-POW_LIB = @POW_LIB@
-PYTHON = @PYTHON@
-PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
-PYTHON_INCLUDES = @PYTHON_INCLUDES@
-PYTHON_LIBS = @PYTHON_LIBS@
-PYTHON_PLATFORM = @PYTHON_PLATFORM@
-PYTHON_PREFIX = @PYTHON_PREFIX@
-PYTHON_VERSION = @PYTHON_VERSION@
-RANLIB = @RANLIB@
-SCANNER_CFLAGS = @SCANNER_CFLAGS@
-SCANNER_LIBS = @SCANNER_LIBS@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-VERSION = @VERSION@
-YACC = @YACC@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-pkgpyexecdir = @pkgpyexecdir@
-pkgpythondir = @pkgpythondir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-pyexecdir = @pyexecdir@
-pythondir = @pythondir@
-runstatedir = @runstatedir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-GENERATED_ITEMS = \
-	cmph.vcproj		\
-	girepository.vcproj	\
-	g-ir-compiler.vcproj	\
-	gi-install.vsprops
-
-EXTRA_DIST = \
-	gobject-introspection.sln	\
-	gi-build-defines.vsprops	\
-	gi-gen-srcs.vsprops	\
-	gi-install.vspropsin	\
-	gi-version-paths.vsprops	\
-	gi-prebuild.vcproj	\
-	girepository.vcprojin	\
-	cmph-bdz-test.vcproj		\
-	cmph.vcprojin		\
-	g-ir-compiler.vcprojin	\
-	g-ir-generate.vcproj	\
-	g-ir-inspect.vcproj	\
-	glib-print.vcproj	\
-	gi-install.vcproj	\
-	gi-introspect.vcproj	\
-	_giscanner.vcproj	\
-	README.txt	\
-	$(GENERATED_ITEMS)
-
-DISTCLEANFILES = $(GENERATED_ITEMS)
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign win32/vs9/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign win32/vs9/Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-gi-version-paths.vsprops: $(top_builddir)/config.status $(srcdir)/gi-version-paths.vsprops.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-tags TAGS:
-
-ctags CTAGS:
-
-cscope cscopelist:
-
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am:
-
-.MAKE: install-am install-strip
-
-.PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	cscopelist-am ctags-am distclean distclean-generic \
-	distclean-libtool distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags-am uninstall uninstall-am
-
-.PRECIOUS: Makefile
-
-
-gi-install.vsprops: $(top_srcdir)/win32/vs9/gi-install.vspropsin girepository.headers giscanner.scripts
-	$(CPP) -P - <$(top_srcdir)/win32/vs9/gi-install.vspropsin >$@
-	rm girepository.headers
-	rm giscanner.scripts
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/win32/vs9/README.txt b/win32/vs9/README.txt
deleted file mode 100644
index abd0b28..0000000
--- a/win32/vs9/README.txt
+++ /dev/null
@@ -1,103 +0,0 @@
-Please do not compile this package (gobject-introspection) in paths that contain
-spaces in them-as strange problems may occur during compilation or during
-the use of the library.
-
-Please refer to the following GNOME Live! page for more detailed
-instructions on building gobject-introsecption and its dependencies
-with Visual C++:
-
-https://live.gnome.org/GTK%2B/Win32/MSVCCompilationOfGTKStack
-
-This VS9 solution and the projects it includes are intented to be used
-in a gobject-introspection source tree unpacked from a tarball. In a git checkout you
-first need to use some Unix-like environment, which will do the work for you.
-
-The required dependencies are Python 2.7 (2.7) or 3.3 (3.x) or later, GLib and LibFFI.
-It is recommended that GLib is built with Visual C++ 2008 to avoid problems cause by
-usage of different CRTs.
-
-Please refer to the README.txt file in $(GLib_src_root)\build\win32\vs9 on how to build
-GLib using Visual C++ 2008
-
-For LibFFI, please use the Centricular fork of it, which can be found at
-https://github.com/centricular/libffi.  Please refer there on building--please
-note that this will involve the use of the Meson build system and the Ninja
-build tool.
-
-For Python, retrieving the official Windows binaries for 2.7 (2.x) or 3.3 (3.x) or later
-from http://www.python.org will do the job-be sure that the Python version that
-you downloaded matches the configuration of your build (win32 or x64/amd64).  Ensure that
-the correct path for your Python interpretor is set in gi-extra-paths.vsprops prior to
-opening the project files, or close the project files and delete all the *.user, *.ncb and
-*.suo files and reopening the project files.
-
-For building the Regress test project, cairo (and possibly cairo-gobject support)
-is needed.
-
-Set up the source tree as follows under some arbitrary top
-folder <root>:
-
-<root>\<this-gobject-introspection-source-tree>
-<root>\vs9\<PlatformName>
-
-*this* file you are now reading is thus located at
-<root>\<this-glib-source-tree>\build\win32\vs9\README.
-
-<PlatformName> is either Win32 or x64, as in VS9 project files.
-
-For LibFFI, one should also put the generated ffi.h and ffitarget.h
-into <root>\vs9\<PlatformName>\include\ and the compiled static libffi.lib
-(or copy libffi-convenience.lib into libffi.lib) into
-<root>\vs9\<PlatformName>\lib\.
-
-The libintl.h that is used for building GLib needs to be in
-<root>\vs9\<PlatformName>\include, if not already done so
-
-A working pkg-config tool is also required-it may be obtained from
-http://www.gtk.org/download/win32.php [32-bit]
-http://www.gtk.org/download/win64.php [64-bit]
-
-*** Note! ***
-The build of G-I is now done within the project files, although it is still possible to
-do it in two stages by using the NMake Makefiles after building the projects.
-
-As there are numerous possible configurations on Python and PKG_CONFIG_PATH, note that:
--For both methods PKG_CONFIG_PATH is by default $(PREFIX)\lib\pkgconfig, where $(PREFIX)
- is by default <parent_dir_of_G-I_srcroot>\vs9\<PlatformName>.  If searching from
- more directories is desired, set the PKG_CONFIG_PATH environment variable before using
- the NMake Makefile or opening the projects, but note that $(PREFIX)\lib\pkgconfig will
- precede the set paths.
--For the Python Path using the project files: check whether the directory settings in
- gi-version-paths.vsprops under PythonDir (32-bit) or PythonDirX64 (x64) is correct.
- If the projects have been loaded by Visual Studio, close the projects and re-open them.
- You may need to delete all the *.suo, *.user and *.ncb files in this directory for
- the changes to take effect.
--For the Python Path using the NMake Makefiles: pass in PYTHON=<full_path_to_python> to
- the NMake Makefile or set it in the environment.  The bit-ness of your Python installation
- must match the configuration that you are building for.
-
-The use of Visual Studio Projects will no longer require the setting of environmental
-variables, but the following environmental variables are needed (either by using "set xxx=yyy"
-or by nmake -f gi-introspection-msvc.mak xxx=yyy) for building the introspection files (which
-should be done after successfully building the Project Files):
-
-Please see $(srcroot)\build\win32\gi-introspection-msvc.mak for more details.  Doing
-"nmake -f gi-introspection-msvc.mak (options omitted)" will build the various introspection files,
-and "nmake -f gi-introspection-msvc.mak (options omitted) install-introspection" will copy the introspection
-files to <root>\vs9\<PlatformName>\share\gir-1.0 (.gir files) and <root>\vs9\<PlatformName>\lib\girepository-1.0
-(.typelib files)
-
-*** End of Note! ***
-
-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 gobject-introspection headers into
-<root>\vs9\<PlatformName>\include\gobject-introsection-1.0.
-
-This is then from where
-project files higher in the stack are supposed to look for them, not
-from a specific gobject-introspection source tree.
-
---Tor Lillqvist <tml@iki.fi>
---Updated by Chun-wei Fan <fanc999@gmail.com>
diff --git a/win32/vs9/_giscanner.vcproj b/win32/vs9/_giscanner.vcproj
deleted file mode 100644
index c6f0a3e..0000000
--- a/win32/vs9/_giscanner.vcproj
+++ /dev/null
@@ -1,181 +0,0 @@
-<?xml version="1.0" encoding="big5"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="_giscanner"
-	ProjectGUID="{8311394F-9114-4C97-80F2-51BCABA054C9}"
-	RootNamespace="_giscanner"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="196613"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			ConfigurationType="2"
-			InheritedPropertySheets=".\gi-build-defines.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\giscanner;;$(PythonDir)\include;$(PythonDir)\PC"
-				ForcedIncludeFiles="msvc_recommended_pragmas.h;io.h"
-				PreprocessorDefinitions="_DEBUG;YY_NO_UNISTD_H"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="$(OutDir)\$(ProjectName).pyd"
-				LinkIncremental="2"
-				AdditionalLibraryDirectories="$(PythonDir)\libs"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				TargetMachine="1"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			ConfigurationType="2"
-			InheritedPropertySheets=".\gi-build-defines.vsprops"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\giscanner;;$(PythonDir)\include;$(PythonDir)\PC"
-				ForcedIncludeFiles="msvc_recommended_pragmas.h;io.h"
-				PreprocessorDefinitions="YY_NO_UNISTD_H"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="$(OutDir)\$(ProjectName).pyd"
-				LinkIncremental="1"
-				AdditionalLibraryDirectories="$(PythonDir)\libs"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			ConfigurationType="2"
-			InheritedPropertySheets=".\gi-build-defines.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\giscanner;;$(PythonDirX64)\include;$(PythonDirX64)\PC"
-				ForcedIncludeFiles="msvc_recommended_pragmas.h;io.h"
-				PreprocessorDefinitions="_DEBUG;YY_NO_UNISTD_H"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="$(OutDir)\$(ProjectName).pyd"
-				LinkIncremental="2"
-				AdditionalLibraryDirectories="$(PythonDirX64)\libs"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				TargetMachine="17"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			ConfigurationType="2"
-			InheritedPropertySheets=".\gi-build-defines.vsprops"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\giscanner;;$(PythonDirX64)\include;$(PythonDirX64)\PC"
-				ForcedIncludeFiles="msvc_recommended_pragmas.h;io.h"
-				PreprocessorDefinitions="YY_NO_UNISTD_H"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="$(OutDir)\$(ProjectName).pyd"
-				LinkIncremental="1"
-				AdditionalLibraryDirectories="$(PythonDirX64)\libs"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				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="..\..\giscanner\giscannermodule.c" />
-			<File RelativePath="..\..\scannerlexer.c" />
-			<File RelativePath="..\..\scannerparser.c" />
-			<File RelativePath="..\..\giscanner\sourcescanner.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/win32/vs9/cmph-bdz-test.vcproj b/win32/vs9/cmph-bdz-test.vcproj
deleted file mode 100644
index a7d3fb3..0000000
--- a/win32/vs9/cmph-bdz-test.vcproj
+++ /dev/null
@@ -1,167 +0,0 @@
-<?xml version="1.0" encoding="big5"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="cmph-bdz-test"
-	ProjectGUID="{E41F378B-CCDD-4B1C-89C3-6D2C950FAF1A}"
-	RootNamespace="cmphbdztest"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="196613"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			ConfigurationType="1"
-			InheritedPropertySheets=".\gi-build-defines.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\girepository\cmph"
-				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"
-			ConfigurationType="1"
-			InheritedPropertySheets=".\gi-build-defines.vsprops"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\girepository\cmph"
-				PreprocessorDefinitions=""
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				WholeProgramOptimization="false"
-				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"
-			ConfigurationType="1"
-			InheritedPropertySheets=".\gi-build-defines.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\girepository\cmph"
-				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"
-			ConfigurationType="1"
-			InheritedPropertySheets=".\gi-build-defines.vsprops"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\girepository\cmph"
-				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}"
-			>
-			<File RelativePath="..\..\girepository\cmph-bdz-test.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/win32/vs9/cmph.vcproj b/win32/vs9/cmph.vcproj
deleted file mode 100644
index 3f8fa7a..0000000
--- a/win32/vs9/cmph.vcproj
+++ /dev/null
@@ -1,153 +0,0 @@
-<?xml version="1.0" encoding="big5"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="9.00"
- Name="cmph"
- ProjectGUID="{442C007E-D901-41DA-9706-5DB4AFB4C06B}"
- RootNamespace="cmph"
- Keyword="Win32Proj"
- TargetFrameworkVersion="196613"
- >
- <Platforms>
-  <Platform
-   Name="Win32"
-  />
-  <Platform
-   Name="x64"
-  />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
-  <Configuration
-   Name="Debug|Win32"
-   ConfigurationType="4"
-   InheritedPropertySheets=".\gi-build-defines.vsprops"
-   CharacterSet="2"
-   >
-   <Tool
-    Name="VCCLCompilerTool"
-    Optimization="0"
-    PreprocessorDefinitions="_DEBUG"
-    MinimalRebuild="true"
-    BasicRuntimeChecks="3"
-    RuntimeLibrary="3"
-    UsePrecompiledHeader="0"
-    WarningLevel="3"
-    DebugInformationFormat="4"
-   />
-  </Configuration>
-  <Configuration
-   Name="Release|Win32"
-   ConfigurationType="4"
-   InheritedPropertySheets=".\gi-build-defines.vsprops"
-   CharacterSet="2"
-   WholeProgramOptimization="1"
-   >
-   <Tool
-    Name="VCCLCompilerTool"
-    Optimization="2"
-    EnableIntrinsicFunctions="true"
-    PreprocessorDefinitions=""
-    RuntimeLibrary="2"
-    EnableFunctionLevelLinking="true"
-    UsePrecompiledHeader="0"
-    WarningLevel="3"
-    DebugInformationFormat="3"
-   />
-  </Configuration>
-  <Configuration
-   Name="Debug|x64"
-   ConfigurationType="4"
-   InheritedPropertySheets=".\gi-build-defines.vsprops"
-   CharacterSet="2"
-   >
-   <Tool
-    Name="VCMIDLTool"
-    TargetEnvironment="3"
-   />
-   <Tool
-    Name="VCCLCompilerTool"
-    Optimization="0"
-    PreprocessorDefinitions="_DEBUG;__x86_64__"
-    MinimalRebuild="true"
-    BasicRuntimeChecks="3"
-    RuntimeLibrary="3"
-    UsePrecompiledHeader="0"
-    WarningLevel="3"
-    DebugInformationFormat="3"
-   />
-  </Configuration>
-  <Configuration
-   Name="Release|x64"
-   ConfigurationType="4"
-   InheritedPropertySheets=".\gi-build-defines.vsprops"
-   CharacterSet="2"
-   WholeProgramOptimization="1"
-   >
-   <Tool
-    Name="VCMIDLTool"
-    TargetEnvironment="3"
-   />
-   <Tool
-    Name="VCCLCompilerTool"
-    Optimization="2"
-    EnableIntrinsicFunctions="true"
-    EnableMinimalRebuild="true"
-    PreprocessorDefinitions="__x86_64__"
-    RuntimeLibrary="2"
-    EnableFunctionLevelLinking="true"
-    UsePrecompiledHeader="0"
-    WarningLevel="3"
-    DebugInformationFormat="3"
-   />
-  </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="..\..\girepository\cmph\bdz.c" />
-   <File RelativePath="..\..\girepository\cmph\bdz_ph.c" />
-   <File RelativePath="..\..\girepository\cmph\bmz8.c" />
-   <File RelativePath="..\..\girepository\cmph\bmz.c" />
-   <File RelativePath="..\..\girepository\cmph\brz.c" />
-   <File RelativePath="..\..\girepository\cmph\buffer_entry.c" />
-   <File RelativePath="..\..\girepository\cmph\buffer_manager.c" />
-   <File RelativePath="..\..\girepository\cmph\chd.c" />
-   <File RelativePath="..\..\girepository\cmph\chd_ph.c" />
-   <File RelativePath="..\..\girepository\cmph\chm.c" />
-   <File RelativePath="..\..\girepository\cmph\cmph.c" />
-   <File RelativePath="..\..\girepository\cmph\cmph_structs.c" />
-   <File RelativePath="..\..\girepository\cmph\compressed_rank.c" />
-   <File RelativePath="..\..\girepository\cmph\compressed_seq.c" />
-   <File RelativePath="..\..\girepository\cmph\fch_buckets.c" />
-   <File RelativePath="..\..\girepository\cmph\fch.c" />
-   <File RelativePath="..\..\girepository\cmph\graph.c" />
-   <File RelativePath="..\..\girepository\cmph\hash.c" />
-   <File RelativePath="..\..\girepository\cmph\jenkins_hash.c" />
-   <File RelativePath="..\..\girepository\cmph\miller_rabin.c" />
-   <File RelativePath="..\..\girepository\cmph\select.c" />
-   <File RelativePath="..\..\girepository\cmph\vqueue.c" />
-   <File RelativePath="..\..\girepository\cmph\vstack.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/win32/vs9/cmph.vcprojin b/win32/vs9/cmph.vcprojin
deleted file mode 100644
index 5801d73..0000000
--- a/win32/vs9/cmph.vcprojin
+++ /dev/null
@@ -1,131 +0,0 @@
-<?xml version="1.0" encoding="big5"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="cmph"
-	ProjectGUID="{442C007E-D901-41DA-9706-5DB4AFB4C06B}"
-	RootNamespace="cmph"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="196613"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			ConfigurationType="4"
-			InheritedPropertySheets=".\gi-build-defines.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="_DEBUG"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			ConfigurationType="4"
-			InheritedPropertySheets=".\gi-build-defines.vsprops"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				PreprocessorDefinitions=""
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			ConfigurationType="4"
-			InheritedPropertySheets=".\gi-build-defines.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="_DEBUG;__x86_64__"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			ConfigurationType="4"
-			InheritedPropertySheets=".\gi-build-defines.vsprops"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				EnableMinimalRebuild="true"
-				PreprocessorDefinitions="__x86_64__"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-		</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 "cmph.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/win32/vs9/g-ir-compiler.vcproj b/win32/vs9/g-ir-compiler.vcproj
deleted file mode 100644
index dcd48b4..0000000
--- a/win32/vs9/g-ir-compiler.vcproj
+++ /dev/null
@@ -1,178 +0,0 @@
-<?xml version="1.0" encoding="big5"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="9.00"
- Name="g-ir-compiler"
- ProjectGUID="{5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774}"
- RootNamespace="gircompiler"
- Keyword="Win32Proj"
- TargetFrameworkVersion="196613"
- >
- <Platforms>
-  <Platform
-   Name="Win32"
-  />
-  <Platform
-   Name="x64"
-  />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
-  <Configuration
-   Name="Debug|Win32"
-   ConfigurationType="1"
-   InheritedPropertySheets=".\gi-build-defines.vsprops"
-   CharacterSet="2"
-   >
-   <Tool
-    Name="VCCLCompilerTool"
-    Optimization="0"
-    PreprocessorDefinitions="_DEBUG"
-    MinimalRebuild="true"
-    BasicRuntimeChecks="3"
-    RuntimeLibrary="3"
-    UsePrecompiledHeader="0"
-    WarningLevel="3"
-    DebugInformationFormat="4"
-   />
-   <Tool
-    Name="VCLinkerTool"
-    AdditionalDependencies="ffi.lib"
-    LinkIncremental="2"
-    GenerateDebugInformation="true"
-    SubSystem="1"
-    TargetMachine="1"
-   />
-  </Configuration>
-  <Configuration
-   Name="Debug|x64"
-   ConfigurationType="1"
-   InheritedPropertySheets=".\gi-build-defines.vsprops"
-   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"
-    AdditionalDependencies="ffi.lib"
-    LinkIncremental="2"
-    GenerateDebugInformation="true"
-    SubSystem="1"
-    DataExecutionPrevention="0"
-    TargetMachine="17"
-   />
-  </Configuration>
-  <Configuration
-   Name="Release|Win32"
-   ConfigurationType="1"
-   InheritedPropertySheets=".\gi-build-defines.vsprops"
-   CharacterSet="2"
-   WholeProgramOptimization="1"
-   >
-   <Tool
-    Name="VCCLCompilerTool"
-    Optimization="2"
-    EnableIntrinsicFunctions="true"
-    PreprocessorDefinitions=""
-    RuntimeLibrary="2"
-    EnableFunctionLevelLinking="true"
-    UsePrecompiledHeader="0"
-    WarningLevel="3"
-    DebugInformationFormat="3"
-   />
-   <Tool
-    Name="VCLinkerTool"
-    AdditionalDependencies="ffi.lib"
-    LinkIncremental="1"
-    GenerateDebugInformation="true"
-    SubSystem="1"
-    OptimizeReferences="2"
-    EnableCOMDATFolding="2"
-    TargetMachine="1"
-   />
-  </Configuration>
-  <Configuration
-   Name="Release|x64"
-   ConfigurationType="1"
-   InheritedPropertySheets=".\gi-build-defines.vsprops"
-   CharacterSet="2"
-   WholeProgramOptimization="1"
-   >
-   <Tool
-    Name="VCMIDLTool"
-    TargetEnvironment="3"
-   />
-   <Tool
-    Name="VCCLCompilerTool"
-    Optimization="1"
-    EnableIntrinsicFunctions="true"
-    EnableMinimalRebuild="true"
-    WholeProgramOptimization="false"
-    PreprocessorDefinitions=""
-    RuntimeLibrary="2"
-    EnableFunctionLevelLinking="true"
-    UsePrecompiledHeader="0"
-    WarningLevel="3"
-    DebugInformationFormat="3"
-   />
-   <Tool
-    Name="VCLinkerTool"
-    AdditionalDependencies="ffi.lib"
-    LinkIncremental="1"
-    GenerateDebugInformation="true"
-    SubSystem="1"
-    OptimizeReferences="2"
-    EnableCOMDATFolding="2"
-    OptimizeForWindows98="0"
-    LinkTimeCodeGeneration="1"
-    DataExecutionPrevention="0"
-    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="..\..\girepository\gthash.c" />
-   <File RelativePath="..\..\girepository\girmodule.c" />
-   <File RelativePath="..\..\girepository\girnode.c" />
-   <File RelativePath="..\..\girepository\giroffsets.c" />
-   <File RelativePath="..\..\girepository\girparser.c" />
-   <File RelativePath="..\..\girepository\girwriter.c" />
-   <File RelativePath="..\..\tools\compiler.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/win32/vs9/g-ir-compiler.vcprojin b/win32/vs9/g-ir-compiler.vcprojin
deleted file mode 100644
index e85847f..0000000
--- a/win32/vs9/g-ir-compiler.vcprojin
+++ /dev/null
@@ -1,173 +0,0 @@
-<?xml version="1.0" encoding="big5"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="g-ir-compiler"
-	ProjectGUID="{5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774}"
-	RootNamespace="gircompiler"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="196613"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			ConfigurationType="1"
-			InheritedPropertySheets=".\gi-build-defines.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="_DEBUG"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ffi.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				TargetMachine="1"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			ConfigurationType="1"
-			InheritedPropertySheets=".\gi-build-defines.vsprops"
-			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"
-				AdditionalDependencies="ffi.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			ConfigurationType="1"
-			InheritedPropertySheets=".\gi-build-defines.vsprops"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				PreprocessorDefinitions=""
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ffi.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			ConfigurationType="1"
-			InheritedPropertySheets=".\gi-build-defines.vsprops"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="1"
-				EnableIntrinsicFunctions="true"
-				EnableMinimalRebuild="true"
-				WholeProgramOptimization="false"
-				PreprocessorDefinitions=""
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ffi.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="0"
-				LinkTimeCodeGeneration="1"
-				DataExecutionPrevention="0"
-				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 "g-ir-compiler.sourcefiles"
-			<File RelativePath="..\..\tools\compiler.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/win32/vs9/g-ir-generate.vcproj b/win32/vs9/g-ir-generate.vcproj
deleted file mode 100644
index 5e4ee10..0000000
--- a/win32/vs9/g-ir-generate.vcproj
+++ /dev/null
@@ -1,163 +0,0 @@
-<?xml version="1.0" encoding="big5"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="g-ir-generate"
-	ProjectGUID="{F4E6621F-A7DD-4863-8CCF-BA04DFC601E3}"
-	RootNamespace="girgenerate"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="196613"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			ConfigurationType="1"
-			InheritedPropertySheets=".\gi-build-defines.vsprops"
-			CharacterSet="2"
-			>
-			<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"
-			ConfigurationType="1"
-			InheritedPropertySheets=".\gi-build-defines.vsprops"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<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"
-			ConfigurationType="1"
-			InheritedPropertySheets=".\gi-build-defines.vsprops"
-			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"
-			ConfigurationType="1"
-			InheritedPropertySheets=".\gi-build-defines.vsprops"
-			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}"
-			>
-			<File RelativePath="..\..\tools\generate.c" />
-			<File RelativePath="..\..\girepository\girwriter.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/win32/vs9/g-ir-inspect.vcproj b/win32/vs9/g-ir-inspect.vcproj
deleted file mode 100644
index b7b444a..0000000
--- a/win32/vs9/g-ir-inspect.vcproj
+++ /dev/null
@@ -1,162 +0,0 @@
-<?xml version="1.0" encoding="big5"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="g-ir-inspect"
-	ProjectGUID="{F4E6621F-A7DD-4863-8CCF-CA04DFC601E3}"
-	RootNamespace="girinspect"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="196613"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			ConfigurationType="1"
-			InheritedPropertySheets=".\gi-build-defines.vsprops"
-			CharacterSet="2"
-			>
-			<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"
-			ConfigurationType="1"
-			InheritedPropertySheets=".\gi-build-defines.vsprops"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<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"
-			ConfigurationType="1"
-			InheritedPropertySheets=".\gi-build-defines.vsprops"
-			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"
-			ConfigurationType="1"
-			InheritedPropertySheets=".\gi-build-defines.vsprops"
-			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}"
-			>
-			<File RelativePath="..\..\tools\g-ir-inspect.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/win32/vs9/gi-build-defines.vsprops b/win32/vs9/gi-build-defines.vsprops
deleted file mode 100644
index e5d143b..0000000
--- a/win32/vs9/gi-build-defines.vsprops
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="gibuilddefinesprops"
-	InheritedPropertySheets=".\gi-version-paths.vsprops"
-	OutputDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin"
-	IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\obj\$(ProjectName)\"
-	>
-	<Tool
-		Name="VCCLCompilerTool"
-		AdditionalIncludeDirectories="..\..;..\..\girepository;$(GlibEtcInstallRoot)\include\gio-win32-2.0;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include"
-		PreprocessorDefinitions="HAVE_CONFIG_H;WIN32"
-		ForcedIncludeFiles="msvc_recommended_pragmas.h"
-		AdditionalOptions="/MP"
-	/>
-	<Tool
-		Name="VCLinkerTool"
-		AdditionalDependencies="gio-2.0.lib gobject-2.0.lib gmodule-2.0.lib glib-2.0.lib"
-		AdditionalLibraryDirectories="$(GlibEtcInstallRoot)\lib"
-	/>
-	<UserMacro
-		Name="GIRepositoryBuildDefines"
-		Value="G_IREPOSITORY_COMPILATION;DLL_EXPORT"
-	/>
-	<UserMacro
-		Name="GIIntrospectNMakeCmd"
-		Value="cd ..&#x0D;&#x0A;set VCInstallDir=$(VCInstallDir)&#x0D;&#x0A;nmake -f gi-introspection-msvc.mak CFG=$(ConfigurationName) PREFIX=$(GlibEtcInstallRoot)"
-	/>
-	<UserMacro
-		Name="GIIntrospectBuiltFiles"
-		Value="$(SolutionDir)\..\GLib-2.0.gir;$(SolutionDir)\..\GObject-2.0.gir;$(SolutionDir)\..\GModule-2.0.gir;$(SolutionDir)\..\Gio-2.0.gir;$(SolutionDir)\..\GIRepository-2.0.gir;$(SolutionDir)\..\cairo-1.0.gir;$(SolutionDir)\..\win32-1.0.gir;$(SolutionDir)\..\fontconfig-2.0.gir;$(SolutionDir)\..\freetype-2.0.gir;$(SolutionDir)\..\libxml2-2.0.gir;$(SolutionDir)\..\GL-1.0.gir;$(SolutionDir)\..\GLib-2.0.typelib;$(SolutionDir)\..\GObject-2.0.typelib;$(SolutionDir)\..\GModule-2.0.typelib;$(SolutionDir)\..\Gio-2.0.typelib;$(SolutionDir)\..\GIRepository-2.0.typelib;$(SolutionDir)\..\cairo-1.0.typelib;$(SolutionDir)\..\win32-1.0.typelib;$(SolutionDir)\..\fontconfig-2.0.typelib;$(SolutionDir)\..\freetype-2.0.typelib;$(SolutionDir)\..\libxml2-2.0.typelib;$(SolutionDir)\..\GL-1.0.typelib"
-	/>
-</VisualStudioPropertySheet>
diff --git a/win32/vs9/gi-gen-srcs.vsprops b/win32/vs9/gi-gen-srcs.vsprops
deleted file mode 100644
index 124b0d0..0000000
--- a/win32/vs9/gi-gen-srcs.vsprops
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="gigensrcsprops"
-	InheritedPropertySheets=".\gi-build-defines.vsprops"
-	>
-	<UserMacro
-		Name="CopyConfigH"
-		Value="copy ..\..\config.h.win32 ..\..\config.h"
-	/>
-	<UserMacro
-		Name="GenToolsScripts"
-		Value="$(PythonDir)\python ..\gen-win32-g-ir-tools.py"
-	/>
-	<UserMacro
-		Name="GenToolsScriptsX64"
-		Value="$(PythonDirX64)\python ..\gen-win32-g-ir-tools.py"
-	/>
-</VisualStudioPropertySheet>
diff --git a/win32/vs9/gi-install.vcproj b/win32/vs9/gi-install.vcproj
deleted file mode 100644
index 212bf54..0000000
--- a/win32/vs9/gi-install.vcproj
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="install"
-	ProjectGUID="{2093D218-190E-4194-9421-3BA7CBF33B10}"
-	RootNamespace="install"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			InheritedPropertySheets=".\gi-install.vsprops"
-			OutputDirectory="$(GlibEtcInstallRoot)"
-			ConfigurationType="10"
-			CharacterSet="2"
-			DeleteExtensionsOnClean=""
-			>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="$(GIDoInstall)"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			InheritedPropertySheets=".\gi-install.vsprops"
-			OutputDirectory="$(GlibEtcInstallRoot)"
-			ConfigurationType="10"
-			CharacterSet="2"
-			DeleteExtensionsOnClean=""
-			>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="$(GIDoInstall)"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			InheritedPropertySheets=".\gi-install.vsprops"
-			OutputDirectory="$(GlibEtcInstallRoot)"
-			ConfigurationType="10"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			DeleteExtensionsOnClean=""
-			>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="$(GIDoInstall)"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			InheritedPropertySheets=".\gi-install.vsprops"
-			OutputDirectory="$(GlibEtcInstallRoot)"
-			ConfigurationType="10"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			DeleteExtensionsOnClean=""
-			>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="$(GIDoInstall)"
-			/>
-		</Configuration>
-	</Configurations>
-	<Files>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-			<File RelativePath="..\gipc.py">
-				<FileConfiguration Name="Debug|Win32">
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Generating .pc files..."
-						CommandLine="$(GIGenPC)"
-						Outputs="..\gobject-introspection-1.0.pc;..\gobject-introspection-no-export-1.0.pc"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Release|Win32">
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Generating .pc files..."
-						CommandLine="$(GIGenPC)"
-						Outputs="..\gobject-introspection-1.0.pc;..\gobject-introspection-no-export-1.0.pc"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Debug|x64">
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Generating .pc files..."
-						CommandLine="$(GIGenPCX64)"
-						Outputs="..\gobject-introspection-1.0.pc;..\gobject-introspection-no-export-1.0.pc"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Release|x64">
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Generating .pc files..."
-						CommandLine="$(GIGenPCX64)"
-						Outputs="..\gobject-introspection-1.0.pc;..\gobject-introspection-no-export-1.0.pc"
-					/>
-				</FileConfiguration>
-			</File>
-		</Filter>
-	</Files>
-</VisualStudioProject>
diff --git a/win32/vs9/gi-install.vsprops b/win32/vs9/gi-install.vsprops
deleted file mode 100644
index 5665e11..0000000
--- a/win32/vs9/gi-install.vsprops
+++ /dev/null
@@ -1,189 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
- ProjectType="Visual C++"
- Version="8.00"
- Name="giinstallprops"
- InheritedPropertySheets=".\gi-build-defines.vsprops"
- >
- <UserMacro
-  Name="GIDoInstall"
-  Value="
-mkdir $(CopyDir)&#x0D;&#x0A;
-mkdir $(CopyDir)\bin&#x0D;&#x0A;
-copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\$(LibGIDllPrefix)girepository$(LibGIDllSuffix).dll $(CopyDir)\bin&#x0D;&#x0A;
-copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\$(LibGIDllPrefix)girepository$(LibGIDllSuffix).pdb $(CopyDir)\bin&#x0D;&#x0A;
-copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\g-ir-compiler.exe $(CopyDir)\bin&#x0D;&#x0A;
-copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\g-ir-compiler.pdb $(CopyDir)\bin&#x0D;&#x0A;
-copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\g-ir-generate.exe $(CopyDir)\bin&#x0D;&#x0A;
-copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\g-ir-generate.pdb $(CopyDir)\bin&#x0D;&#x0A;
-copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\g-ir-inspect.exe $(CopyDir)\bin&#x0D;&#x0A;
-copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\g-ir-inspect.pdb $(CopyDir)\bin&#x0D;&#x0A;
-copy ..\..\tools\g-ir-annotation-tool $(CopyDir)\bin&#x0D;&#x0A;
-copy ..\..\tools\g-ir-doc-tool $(CopyDir)\bin&#x0D;&#x0A;
-copy ..\..\tools\g-ir-scanner $(CopyDir)\bin&#x0D;&#x0A;
-copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\glib-print.exe $(CopyDir)\bin&#x0D;&#x0A;
-copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\glib-print.pdb $(CopyDir)\bin&#x0D;&#x0A;
-mkdir $(CopyDir)\include\gobject-introspection-1.0\girepository&#x0D;&#x0A;
-copy ..\..\girepository\giarginfo.h $(CopyDir)\include\gobject-introspection-1.0\girepository\giarginfo.h&#x0D;&#x0A;
-copy ..\..\girepository\gibaseinfo.h $(CopyDir)\include\gobject-introspection-1.0\girepository\gibaseinfo.h&#x0D;&#x0A;
-copy ..\..\girepository\gicallableinfo.h $(CopyDir)\include\gobject-introspection-1.0\girepository\gicallableinfo.h&#x0D;&#x0A;
-copy ..\..\girepository\giconstantinfo.h $(CopyDir)\include\gobject-introspection-1.0\girepository\giconstantinfo.h&#x0D;&#x0A;
-copy ..\..\girepository\gienuminfo.h $(CopyDir)\include\gobject-introspection-1.0\girepository\gienuminfo.h&#x0D;&#x0A;
-copy ..\..\girepository\gifieldinfo.h $(CopyDir)\include\gobject-introspection-1.0\girepository\gifieldinfo.h&#x0D;&#x0A;
-copy ..\..\girepository\gifunctioninfo.h $(CopyDir)\include\gobject-introspection-1.0\girepository\gifunctioninfo.h&#x0D;&#x0A;
-copy ..\..\girepository\giinterfaceinfo.h $(CopyDir)\include\gobject-introspection-1.0\girepository\giinterfaceinfo.h&#x0D;&#x0A;
-copy ..\..\girepository\giobjectinfo.h $(CopyDir)\include\gobject-introspection-1.0\girepository\giobjectinfo.h&#x0D;&#x0A;
-copy ..\..\girepository\gipropertyinfo.h $(CopyDir)\include\gobject-introspection-1.0\girepository\gipropertyinfo.h&#x0D;&#x0A;
-copy ..\..\girepository\giregisteredtypeinfo.h $(CopyDir)\include\gobject-introspection-1.0\girepository\giregisteredtypeinfo.h&#x0D;&#x0A;
-copy ..\..\girepository\girepository.h $(CopyDir)\include\gobject-introspection-1.0\girepository\girepository.h&#x0D;&#x0A;
-copy ..\..\girepository\girffi.h $(CopyDir)\include\gobject-introspection-1.0\girepository\girffi.h&#x0D;&#x0A;
-copy ..\..\girepository\gisignalinfo.h $(CopyDir)\include\gobject-introspection-1.0\girepository\gisignalinfo.h&#x0D;&#x0A;
-copy ..\..\girepository\gistructinfo.h $(CopyDir)\include\gobject-introspection-1.0\girepository\gistructinfo.h&#x0D;&#x0A;
-copy ..\..\girepository\gitypeinfo.h $(CopyDir)\include\gobject-introspection-1.0\girepository\gitypeinfo.h&#x0D;&#x0A;
-copy ..\..\girepository\gitypelib.h $(CopyDir)\include\gobject-introspection-1.0\girepository\gitypelib.h&#x0D;&#x0A;
-copy ..\..\girepository\gitypes.h $(CopyDir)\include\gobject-introspection-1.0\girepository\gitypes.h&#x0D;&#x0A;
-copy ..\..\girepository\giunioninfo.h $(CopyDir)\include\gobject-introspection-1.0\girepository\giunioninfo.h&#x0D;&#x0A;
-copy ..\..\girepository\giversionmacros.h $(CopyDir)\include\gobject-introspection-1.0\girepository\giversionmacros.h&#x0D;&#x0A;
-copy ..\..\girepository\givfuncinfo.h $(CopyDir)\include\gobject-introspection-1.0\girepository\givfuncinfo.h&#x0D;&#x0A;
-mkdir $(CopyDir)\lib\gobject-introspection\giscanner&#x0D;&#x0A;
-mkdir $(CopyDir)\lib\gobject-introspection\giscanner\collections&#x0D;&#x0A;
-mkdir $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates&#x0D;&#x0A;
-mkdir $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C&#x0D;&#x0A;
-mkdir $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs&#x0D;&#x0A;
-mkdir $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python&#x0D;&#x0A;
-copy ..\..\giscanner\__init__.py $(CopyDir)\lib\gobject-introspection\giscanner&#x0D;&#x0A;
-copy ..\..\giscanner\annotationmain.py $(CopyDir)\lib\gobject-introspection\giscanner&#x0D;&#x0A;
-copy ..\..\giscanner\annotationparser.py $(CopyDir)\lib\gobject-introspection\giscanner&#x0D;&#x0A;
-copy ..\..\giscanner\ast.py $(CopyDir)\lib\gobject-introspection\giscanner&#x0D;&#x0A;
-copy ..\..\giscanner\cachestore.py $(CopyDir)\lib\gobject-introspection\giscanner&#x0D;&#x0A;
-copy ..\..\giscanner\ccompiler.py $(CopyDir)\lib\gobject-introspection\giscanner&#x0D;&#x0A;
-copy ..\..\giscanner\codegen.py $(CopyDir)\lib\gobject-introspection\giscanner&#x0D;&#x0A;
-copy ..\..\giscanner\docmain.py $(CopyDir)\lib\gobject-introspection\giscanner&#x0D;&#x0A;
-copy ..\..\giscanner\docwriter.py $(CopyDir)\lib\gobject-introspection\giscanner&#x0D;&#x0A;
-copy ..\..\giscanner\dumper.py $(CopyDir)\lib\gobject-introspection\giscanner&#x0D;&#x0A;
-copy ..\..\giscanner\introspectablepass.py $(CopyDir)\lib\gobject-introspection\giscanner&#x0D;&#x0A;
-copy ..\..\giscanner\girparser.py $(CopyDir)\lib\gobject-introspection\giscanner&#x0D;&#x0A;
-copy ..\..\giscanner\girwriter.py $(CopyDir)\lib\gobject-introspection\giscanner&#x0D;&#x0A;
-copy ..\..\giscanner\gdumpparser.py $(CopyDir)\lib\gobject-introspection\giscanner&#x0D;&#x0A;
-copy ..\..\giscanner\libtoolimporter.py $(CopyDir)\lib\gobject-introspection\giscanner&#x0D;&#x0A;
-copy ..\..\giscanner\maintransformer.py $(CopyDir)\lib\gobject-introspection\giscanner&#x0D;&#x0A;
-copy ..\..\giscanner\message.py $(CopyDir)\lib\gobject-introspection\giscanner&#x0D;&#x0A;
-copy ..\..\giscanner\msvccompiler.py $(CopyDir)\lib\gobject-introspection\giscanner&#x0D;&#x0A;
-copy ..\..\giscanner\shlibs.py $(CopyDir)\lib\gobject-introspection\giscanner&#x0D;&#x0A;
-copy ..\..\giscanner\scannermain.py $(CopyDir)\lib\gobject-introspection\giscanner&#x0D;&#x0A;
-copy ..\..\giscanner\sectionparser.py $(CopyDir)\lib\gobject-introspection\giscanner&#x0D;&#x0A;
-copy ..\..\giscanner\sourcescanner.py $(CopyDir)\lib\gobject-introspection\giscanner&#x0D;&#x0A;
-copy ..\..\giscanner\testcodegen.py $(CopyDir)\lib\gobject-introspection\giscanner&#x0D;&#x0A;
-copy ..\..\giscanner\transformer.py $(CopyDir)\lib\gobject-introspection\giscanner&#x0D;&#x0A;
-copy ..\..\giscanner\utils.py $(CopyDir)\lib\gobject-introspection\giscanner&#x0D;&#x0A;
-copy ..\..\giscanner\xmlwriter.py $(CopyDir)\lib\gobject-introspection\giscanner&#x0D;&#x0A;
-copy ..\..\giscanner\collections\__init__.py $(CopyDir)\lib\gobject-introspection\giscanner\collections&#x0D;&#x0A;
-copy ..\..\giscanner\collections\counter.py $(CopyDir)\lib\gobject-introspection\giscanner\collections&#x0D;&#x0A;
-copy ..\..\giscanner\collections\ordereddict.py $(CopyDir)\lib\gobject-introspection\giscanner\collections&#x0D;&#x0A;
-copy ..\..\giscanner\doctemplates\base.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates&#x0D;&#x0A;
-copy ..\..\giscanner\doctemplates\class.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates&#x0D;&#x0A;
-copy ..\..\giscanner\doctemplates\namespace.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates&#x0D;&#x0A;
-copy ..\..\giscanner\doctemplates\C\callback.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C&#x0D;&#x0A;
-copy ..\..\giscanner\doctemplates\C\class.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C&#x0D;&#x0A;
-copy ..\..\giscanner\doctemplates\C\constructor.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C&#x0D;&#x0A;
-copy ..\..\giscanner\doctemplates\C\default.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C&#x0D;&#x0A;
-copy ..\..\giscanner\doctemplates\C\enum.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C&#x0D;&#x0A;
-copy ..\..\giscanner\doctemplates\C\function.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C&#x0D;&#x0A;
-copy ..\..\giscanner\doctemplates\C\field.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C&#x0D;&#x0A;
-copy ..\..\giscanner\doctemplates\C\interface.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C&#x0D;&#x0A;
-copy ..\..\giscanner\doctemplates\C\method.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C&#x0D;&#x0A;
-copy ..\..\giscanner\doctemplates\C\namespace.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C&#x0D;&#x0A;
-copy ..\..\giscanner\doctemplates\C\property.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C&#x0D;&#x0A;
-copy ..\..\giscanner\doctemplates\C\record.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C&#x0D;&#x0A;
-copy ..\..\giscanner\doctemplates\C\signal.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C&#x0D;&#x0A;
-copy ..\..\giscanner\doctemplates\C\vfunc.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C&#x0D;&#x0A;
-copy ..\..\giscanner\doctemplates\Python\callback.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python&#x0D;&#x0A;
-copy ..\..\giscanner\doctemplates\Python\class.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python&#x0D;&#x0A;
-copy ..\..\giscanner\doctemplates\Python\constructor.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python&#x0D;&#x0A;
-copy ..\..\giscanner\doctemplates\Python\default.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python&#x0D;&#x0A;
-copy ..\..\giscanner\doctemplates\Python\enum.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python&#x0D;&#x0A;
-copy ..\..\giscanner\doctemplates\Python\function.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python&#x0D;&#x0A;
-copy ..\..\giscanner\doctemplates\Python\field.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python&#x0D;&#x0A;
-copy ..\..\giscanner\doctemplates\Python\interface.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python&#x0D;&#x0A;
-copy ..\..\giscanner\doctemplates\Python\method.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python&#x0D;&#x0A;
-copy ..\..\giscanner\doctemplates\Python\namespace.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python&#x0D;&#x0A;
-copy ..\..\giscanner\doctemplates\Python\property.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python&#x0D;&#x0A;
-copy ..\..\giscanner\doctemplates\Python\record.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python&#x0D;&#x0A;
-copy ..\..\giscanner\doctemplates\Python\signal.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python&#x0D;&#x0A;
-copy ..\..\giscanner\doctemplates\Python\vfunc.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python&#x0D;&#x0A;
-copy ..\..\giscanner\doctemplates\Gjs\callback.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs&#x0D;&#x0A;
-copy ..\..\giscanner\doctemplates\Gjs\class.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs&#x0D;&#x0A;
-copy ..\..\giscanner\doctemplates\Gjs\constructor.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs&#x0D;&#x0A;
-copy ..\..\giscanner\doctemplates\Gjs\default.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs&#x0D;&#x0A;
-copy ..\..\giscanner\doctemplates\Gjs\enum.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs&#x0D;&#x0A;
-copy ..\..\giscanner\doctemplates\Gjs\function.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs&#x0D;&#x0A;
-copy ..\..\giscanner\doctemplates\Gjs\field.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs&#x0D;&#x0A;
-copy ..\..\giscanner\doctemplates\Gjs\interface.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs&#x0D;&#x0A;
-copy ..\..\giscanner\doctemplates\Gjs\method.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs&#x0D;&#x0A;
-copy ..\..\giscanner\doctemplates\Gjs\namespace.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs&#x0D;&#x0A;
-copy ..\..\giscanner\doctemplates\Gjs\property.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs&#x0D;&#x0A;
-copy ..\..\giscanner\doctemplates\Gjs\record.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs&#x0D;&#x0A;
-copy ..\..\giscanner\doctemplates\Gjs\signal.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs&#x0D;&#x0A;
-copy ..\..\giscanner\doctemplates\Gjs\vfunc.tmpl $(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs&#x0D;&#x0A;
-mkdir $(CopyDir)\share\gobject-introspection-1.0\tests&#x0D;&#x0A;
-copy ..\..\tests\gitestmacros.h $(CopyDir)\share\gobject-introspection-1.0\tests&#x0D;&#x0A;
-copy ..\..\tests\gimarshallingtests.c $(CopyDir)\share\gobject-introspection-1.0\tests&#x0D;&#x0A;
-copy ..\..\tests\gimarshallingtests.h $(CopyDir)\share\gobject-introspection-1.0\tests&#x0D;&#x0A;
-copy ..\..\tests\scanner\regress.c $(CopyDir)\share\gobject-introspection-1.0\tests&#x0D;&#x0A;
-copy ..\..\tests\scanner\regress.h $(CopyDir)\share\gobject-introspection-1.0\tests&#x0D;&#x0A;
-copy ..\..\tests\scanner\annotation.c $(CopyDir)\share\gobject-introspection-1.0\tests&#x0D;&#x0A;
-copy ..\..\tests\scanner\annotation.h $(CopyDir)\share\gobject-introspection-1.0\tests&#x0D;&#x0A;
-copy ..\..\tests\scanner\foo.c $(CopyDir)\share\gobject-introspection-1.0\tests&#x0D;&#x0A;
-copy ..\..\tests\scanner\foo.h $(CopyDir)\share\gobject-introspection-1.0\tests&#x0D;&#x0A;
-copy ..\..\tests\scanner\drawable.c $(CopyDir)\share\gobject-introspection-1.0\tests&#x0D;&#x0A;
-copy ..\..\tests\scanner\drawable.h $(CopyDir)\share\gobject-introspection-1.0\tests&#x0D;&#x0A;
-copy ..\..\tests\scanner\warnlib.c $(CopyDir)\share\gobject-introspection-1.0\tests&#x0D;&#x0A;
-copy ..\..\tests\scanner\warnlib.h $(CopyDir)\share\gobject-introspection-1.0\tests&#x0D;&#x0A;
-copy ..\..\tests\scanner\utility.c $(CopyDir)\share\gobject-introspection-1.0\tests&#x0D;&#x0A;
-copy ..\..\tests\scanner\utility.h $(CopyDir)\share\gobject-introspection-1.0\tests&#x0D;&#x0A;
-copy ..\everything.c $(CopyDir)\share\gobject-introspection-1.0\tests&#x0D;&#x0A;
-copy ..\everything.h $(CopyDir)\share\gobject-introspection-1.0\tests&#x0D;&#x0A;
-copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\_giscanner.pyd $(CopyDir)\lib\gobject-introspection\giscanner&#x0D;&#x0A;
-copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\_giscanner.pdb $(CopyDir)\lib\gobject-introspection\giscanner&#x0D;&#x0A;
-mkdir $(CopyDir)\share\gobject-introspection-$(ApiVersion)&#x0D;&#x0A;
-copy ..\..\girepository\gdump.c $(CopyDir)\share\gobject-introspection-$(ApiVersion)&#x0D;&#x0A;
-mkdir $(CopyDir)\lib&#x0D;&#x0A;
-copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\girepository-$(ApiVersion).lib $(CopyDir)\lib&#x0D;&#x0A;
-mkdir $(CopyDir)\share\gir-$(ApiVersion)&#x0D;&#x0A;
-copy ..\cairo-1.0.gir $(CopyDir)\share\gir-$(ApiVersion)&#x0D;&#x0A;
-copy ..\fontconfig-2.0.gir $(CopyDir)\share\gir-$(ApiVersion)&#x0D;&#x0A;
-copy ..\freetype2-2.0.gir $(CopyDir)\share\gir-$(ApiVersion)&#x0D;&#x0A;
-copy ..\Gio-2.0.gir $(CopyDir)\share\gir-$(ApiVersion)&#x0D;&#x0A;
-copy ..\GIRepository-2.0.gir $(CopyDir)\share\gir-$(ApiVersion)&#x0D;&#x0A;
-copy ..\GL-1.0.gir $(CopyDir)\share\gir-$(ApiVersion)&#x0D;&#x0A;
-copy ..\GLib-2.0.gir $(CopyDir)\share\gir-$(ApiVersion)&#x0D;&#x0A;
-copy ..\GModule-2.0.gir $(CopyDir)\share\gir-$(ApiVersion)&#x0D;&#x0A;
-copy ..\GObject-2.0.gir $(CopyDir)\share\gir-$(ApiVersion)&#x0D;&#x0A;
-copy ..\libxml2-2.0.gir $(CopyDir)\share\gir-$(ApiVersion)&#x0D;&#x0A;
-copy ..\win32-1.0.gir $(CopyDir)\share\gir-$(ApiVersion)&#x0D;&#x0A;
-mkdir $(CopyDir)\lib\girepository-$(ApiVersion)&#x0D;&#x0A;
-copy ..\cairo-1.0.typelib $(CopyDir)\lib\girepository-$(ApiVersion)&#x0D;&#x0A;
-copy ..\fontconfig-2.0.typelib $(CopyDir)\lib\girepository-$(ApiVersion)&#x0D;&#x0A;
-copy ..\freetype2-2.0.typelib $(CopyDir)\lib\girepository-$(ApiVersion)&#x0D;&#x0A;
-copy ..\Gio-2.0.typelib $(CopyDir)\lib\girepository-$(ApiVersion)&#x0D;&#x0A;
-copy ..\GIRepository-2.0.typelib $(CopyDir)\lib\girepository-$(ApiVersion)&#x0D;&#x0A;
-copy ..\GL-1.0.typelib $(CopyDir)\lib\girepository-$(ApiVersion)&#x0D;&#x0A;
-copy ..\GLib-2.0.typelib $(CopyDir)\lib\girepository-$(ApiVersion)&#x0D;&#x0A;
-copy ..\GModule-2.0.typelib $(CopyDir)\lib\girepository-$(ApiVersion)&#x0D;&#x0A;
-copy ..\GObject-2.0.typelib $(CopyDir)\lib\girepository-$(ApiVersion)&#x0D;&#x0A;
-copy ..\libxml2-2.0.typelib $(CopyDir)\lib\girepository-$(ApiVersion)&#x0D;&#x0A;
-copy ..\win32-1.0.typelib $(CopyDir)\lib\girepository-$(ApiVersion)&#x0D;&#x0A;
-mkdir $(CopyDir)\lib\pkgconfig&#x0D;&#x0A;
-copy ..\gobject-introspection-1.0.pc $(CopyDir)\lib\pkgconfig&#x0D;&#x0A;
-copy ..\gobject-introspection-no-export-1.0.pc $(CopyDir)\lib\pkgconfig&#x0D;&#x0A;
-  "
- />
- <UserMacro
-  Name="GIGenPc"
-  Value="$(PythonDir)\python ..\gipc.py --version=$(GIVersion) --prefix=$(CopyDir)"
- />
- <UserMacro
-  Name="GIGenPcX64"
-  Value="$(PythonDirX64)\python ..\gipc.py --version=$(GIVersion) --prefix=$(CopyDir)"
- />
-</VisualStudioPropertySheet>
diff --git a/win32/vs9/gi-install.vspropsin b/win32/vs9/gi-install.vspropsin
deleted file mode 100644
index 9ffa338..0000000
--- a/win32/vs9/gi-install.vspropsin
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="giinstallprops"
-	InheritedPropertySheets=".\gi-build-defines.vsprops"
-	>
-	<UserMacro
-		Name="GIDoInstall"
-		Value="
-mkdir $(CopyDir)&#x0D;&#x0A;
-mkdir $(CopyDir)\bin&#x0D;&#x0A;
-copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\$(LibGIDllPrefix)girepository$(LibGIDllSuffix).dll $(CopyDir)\bin&#x0D;&#x0A;
-copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\$(LibGIDllPrefix)girepository$(LibGIDllSuffix).pdb $(CopyDir)\bin&#x0D;&#x0A;
-copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\g-ir-compiler.exe $(CopyDir)\bin&#x0D;&#x0A;
-copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\g-ir-compiler.pdb $(CopyDir)\bin&#x0D;&#x0A;
-copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\g-ir-generate.exe $(CopyDir)\bin&#x0D;&#x0A;
-copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\g-ir-generate.pdb $(CopyDir)\bin&#x0D;&#x0A;
-copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\g-ir-inspect.exe $(CopyDir)\bin&#x0D;&#x0A;
-copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\g-ir-inspect.pdb $(CopyDir)\bin&#x0D;&#x0A;
-copy ..\..\tools\g-ir-annotation-tool $(CopyDir)\bin&#x0D;&#x0A;
-copy ..\..\tools\g-ir-doc-tool $(CopyDir)\bin&#x0D;&#x0A;
-copy ..\..\tools\g-ir-scanner $(CopyDir)\bin&#x0D;&#x0A;
-
-copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\glib-print.exe $(CopyDir)\bin&#x0D;&#x0A;
-copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\glib-print.pdb $(CopyDir)\bin&#x0D;&#x0A;
-
-mkdir $(CopyDir)\include\gobject-introspection-1.0\girepository&#x0D;&#x0A;
-#include "girepository.headers"
-#include "giscanner.scripts"
-
-mkdir $(CopyDir)\share\gobject-introspection-1.0\tests&#x0D;&#x0A;
-copy ..\..\tests\gitestmacros.h $(CopyDir)\share\gobject-introspection-1.0\tests&#x0D;&#x0A;
-copy ..\..\tests\gimarshallingtests.c $(CopyDir)\share\gobject-introspection-1.0\tests&#x0D;&#x0A;
-copy ..\..\tests\gimarshallingtests.h $(CopyDir)\share\gobject-introspection-1.0\tests&#x0D;&#x0A;
-copy ..\..\tests\scanner\regress.c $(CopyDir)\share\gobject-introspection-1.0\tests&#x0D;&#x0A;
-copy ..\..\tests\scanner\regress.h $(CopyDir)\share\gobject-introspection-1.0\tests&#x0D;&#x0A;
-copy ..\..\tests\scanner\annotation.c $(CopyDir)\share\gobject-introspection-1.0\tests&#x0D;&#x0A;
-copy ..\..\tests\scanner\annotation.h $(CopyDir)\share\gobject-introspection-1.0\tests&#x0D;&#x0A;
-copy ..\..\tests\scanner\foo.c $(CopyDir)\share\gobject-introspection-1.0\tests&#x0D;&#x0A;
-copy ..\..\tests\scanner\foo.h $(CopyDir)\share\gobject-introspection-1.0\tests&#x0D;&#x0A;
-copy ..\..\tests\scanner\drawable.c $(CopyDir)\share\gobject-introspection-1.0\tests&#x0D;&#x0A;
-copy ..\..\tests\scanner\drawable.h $(CopyDir)\share\gobject-introspection-1.0\tests&#x0D;&#x0A;
-copy ..\..\tests\scanner\warnlib.c $(CopyDir)\share\gobject-introspection-1.0\tests&#x0D;&#x0A;
-copy ..\..\tests\scanner\warnlib.h $(CopyDir)\share\gobject-introspection-1.0\tests&#x0D;&#x0A;
-copy ..\..\tests\scanner\utility.c $(CopyDir)\share\gobject-introspection-1.0\tests&#x0D;&#x0A;
-copy ..\..\tests\scanner\utility.h $(CopyDir)\share\gobject-introspection-1.0\tests&#x0D;&#x0A;
-copy ..\everything.c $(CopyDir)\share\gobject-introspection-1.0\tests&#x0D;&#x0A;
-copy ..\everything.h $(CopyDir)\share\gobject-introspection-1.0\tests&#x0D;&#x0A;
-
-copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\_giscanner.pyd $(CopyDir)\lib\gobject-introspection\giscanner&#x0D;&#x0A;
-copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\_giscanner.pdb $(CopyDir)\lib\gobject-introspection\giscanner&#x0D;&#x0A;
-
-
-mkdir $(CopyDir)\share\gobject-introspection-$(ApiVersion)&#x0D;&#x0A;
-
-copy ..\..\girepository\gdump.c $(CopyDir)\share\gobject-introspection-$(ApiVersion)&#x0D;&#x0A;
-
-mkdir $(CopyDir)\lib&#x0D;&#x0A;
-
-copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\girepository-$(ApiVersion).lib $(CopyDir)\lib&#x0D;&#x0A;
-
-mkdir $(CopyDir)\share\gir-$(ApiVersion)&#x0D;&#x0A;
-copy ..\cairo-1.0.gir $(CopyDir)\share\gir-$(ApiVersion)&#x0D;&#x0A;
-copy ..\fontconfig-2.0.gir $(CopyDir)\share\gir-$(ApiVersion)&#x0D;&#x0A;
-copy ..\freetype2-2.0.gir $(CopyDir)\share\gir-$(ApiVersion)&#x0D;&#x0A;
-copy ..\Gio-2.0.gir $(CopyDir)\share\gir-$(ApiVersion)&#x0D;&#x0A;
-copy ..\GIRepository-2.0.gir $(CopyDir)\share\gir-$(ApiVersion)&#x0D;&#x0A;
-copy ..\GL-1.0.gir $(CopyDir)\share\gir-$(ApiVersion)&#x0D;&#x0A;
-copy ..\GLib-2.0.gir $(CopyDir)\share\gir-$(ApiVersion)&#x0D;&#x0A;
-copy ..\GModule-2.0.gir $(CopyDir)\share\gir-$(ApiVersion)&#x0D;&#x0A;
-copy ..\GObject-2.0.gir $(CopyDir)\share\gir-$(ApiVersion)&#x0D;&#x0A;
-copy ..\libxml2-2.0.gir $(CopyDir)\share\gir-$(ApiVersion)&#x0D;&#x0A;
-copy ..\win32-1.0.gir $(CopyDir)\share\gir-$(ApiVersion)&#x0D;&#x0A;
-
-mkdir $(CopyDir)\lib\girepository-$(ApiVersion)&#x0D;&#x0A;
-copy ..\cairo-1.0.typelib $(CopyDir)\lib\girepository-$(ApiVersion)&#x0D;&#x0A;
-copy ..\fontconfig-2.0.typelib $(CopyDir)\lib\girepository-$(ApiVersion)&#x0D;&#x0A;
-copy ..\freetype2-2.0.typelib $(CopyDir)\lib\girepository-$(ApiVersion)&#x0D;&#x0A;
-copy ..\Gio-2.0.typelib $(CopyDir)\lib\girepository-$(ApiVersion)&#x0D;&#x0A;
-copy ..\GIRepository-2.0.typelib $(CopyDir)\lib\girepository-$(ApiVersion)&#x0D;&#x0A;
-copy ..\GL-1.0.typelib $(CopyDir)\lib\girepository-$(ApiVersion)&#x0D;&#x0A;
-copy ..\GLib-2.0.typelib $(CopyDir)\lib\girepository-$(ApiVersion)&#x0D;&#x0A;
-copy ..\GModule-2.0.typelib $(CopyDir)\lib\girepository-$(ApiVersion)&#x0D;&#x0A;
-copy ..\GObject-2.0.typelib $(CopyDir)\lib\girepository-$(ApiVersion)&#x0D;&#x0A;
-copy ..\libxml2-2.0.typelib $(CopyDir)\lib\girepository-$(ApiVersion)&#x0D;&#x0A;
-copy ..\win32-1.0.typelib $(CopyDir)\lib\girepository-$(ApiVersion)&#x0D;&#x0A;
-
-mkdir $(CopyDir)\lib\pkgconfig&#x0D;&#x0A;
-copy ..\gobject-introspection-1.0.pc $(CopyDir)\lib\pkgconfig&#x0D;&#x0A;
-copy ..\gobject-introspection-no-export-1.0.pc $(CopyDir)\lib\pkgconfig&#x0D;&#x0A;
-		"
-	/>
-	<UserMacro
-		Name="GIGenPc"
-		Value="$(PythonDir)\python ..\gipc.py --version=$(GIVersion) --prefix=$(CopyDir)"
-	/>
-	<UserMacro
-		Name="GIGenPcX64"
-		Value="$(PythonDirX64)\python ..\gipc.py --version=$(GIVersion) --prefix=$(CopyDir)"
-	/>
-</VisualStudioPropertySheet>
diff --git a/win32/vs9/gi-introspect.vcproj b/win32/vs9/gi-introspect.vcproj
deleted file mode 100644
index 661c2d5..0000000
--- a/win32/vs9/gi-introspect.vcproj
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="gi-introspect"
-	ProjectGUID="{7A36674C-379D-4989-A978-07124E5F852C}"
-	Keyword="MakeFileProj"
-	TargetFrameworkVersion="196613"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			ConfigurationType="0"
-			InheritedPropertySheets=".\gi-build-defines.vsprops"
-			>
-			<Tool
-				Name="VCNMakeTool"
-				BuildCommandLine="$(GIIntrospectNMakeCmd) $(IntrospectPythonParam)"
-				ReBuildCommandLine="$(GIIntrospectNMakeCmd) $(IntrospectPythonParam) clean all"
-				CleanCommandLine="$(GIIntrospectNMakeCmd) $(IntrospectPythonParam) clean"
-				Output="$(GIIntrospectBuiltFiles)"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			ConfigurationType="0"
-			InheritedPropertySheets=".\gi-build-defines.vsprops"
-			>
-			<Tool
-				Name="VCNMakeTool"
-				BuildCommandLine="$(GIIntrospectNMakeCmd) $(IntrospectPythonParamX64)"
-				ReBuildCommandLine="$(GIIntrospectNMakeCmd) $(IntrospectPythonParamX64) clean all"
-				CleanCommandLine="$(GIIntrospectNMakeCmd) $(IntrospectPythonParamX64) clean"
-				Output="$(GIIntrospectBuiltFiles)"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			ConfigurationType="0"
-			InheritedPropertySheets=".\gi-build-defines.vsprops"
-			CharacterSet="2"
-			DeleteExtensionsOnClean=""
-			>
-			<Tool
-				Name="VCNMakeTool"
-				BuildCommandLine="$(GIIntrospectNMakeCmd) $(IntrospectPythonParam)"
-				ReBuildCommandLine="$(GIIntrospectNMakeCmd) $(IntrospectPythonParam) clean all"
-				CleanCommandLine="$(GIIntrospectNMakeCmd) $(IntrospectPythonParam) clean"
-				Output="$(GIIntrospectBuiltFiles)"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			ConfigurationType="0"
-			InheritedPropertySheets=".\gi-build-defines.vsprops"
-			>
-			<Tool
-				Name="VCNMakeTool"
-				BuildCommandLine="$(GIIntrospectNMakeCmd) $(IntrospectPythonParamX64)"
-				ReBuildCommandLine="$(GIIntrospectNMakeCmd) $(IntrospectPythonParamX64) clean all"
-				CleanCommandLine="$(GIIntrospectNMakeCmd) $(IntrospectPythonParamX64) clean"
-				Output="$(GIIntrospectBuiltFiles)"
-			/>
-		</Configuration>
-	</Configurations>
-</VisualStudioProject>
diff --git a/win32/vs9/gi-prebuild.vcproj b/win32/vs9/gi-prebuild.vcproj
deleted file mode 100644
index b045132..0000000
--- a/win32/vs9/gi-prebuild.vcproj
+++ /dev/null
@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="gi-prebuild"
-	ProjectGUID="{2093D218-190E-4194-9421-3BA7CBF33B11}"
-	RootNamespace="giprebuild"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			InheritedPropertySheets=".\gi-gen-srcs.vsprops"
-			ConfigurationType="10"
-			CharacterSet="2"
-			DeleteExtensionsOnClean=""
-			>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			InheritedPropertySheets=".\gi-gen-srcs.vsprops"
-			ConfigurationType="10"
-			CharacterSet="2"
-			DeleteExtensionsOnClean=""
-			>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			InheritedPropertySheets=".\gi-gen-srcs.vsprops"
-			ConfigurationType="10"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			DeleteExtensionsOnClean=""
-			>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			InheritedPropertySheets=".\gi-gen-srcs.vsprops"
-			ConfigurationType="10"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			DeleteExtensionsOnClean=""
-			>
-		</Configuration>
-	</Configurations>
-	<Files>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-			<File RelativePath="..\..\config.h.win32">
-				<FileConfiguration Name="Debug|Win32">
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Copying config.h from config.h.win32..."
-						CommandLine="$(CopyConfigH)"
-						Outputs="..\..\config.h"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Release|Win32">
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Copying config.h from config.h.win32..."
-						CommandLine="$(CopyConfigH)"
-						Outputs="..\..\config.h"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Debug|x64">
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Copying config.h from config.h.win32..."
-						CommandLine="$(CopyConfigH)"
-						Outputs="..\..\config.h"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Release|x64">
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Copying config.h from config.h.win32..."
-						CommandLine="$(CopyConfigH)"
-						Outputs="..\..\config.h"
-					/>
-				</FileConfiguration>
-			</File>
-			<File RelativePath="..\..\tools\g-ir-tool-template.in">
-				<FileConfiguration Name="Debug|Win32">
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Generating Tools Scripts..."
-						CommandLine="$(GenToolsScripts)"
-						Outputs="..\..\tools\g-ir-scanner;..\..\tools\g-ir-doc-tool;..\..\tools\g-ir-annotation-tool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Release|Win32">
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Generating Tools Scripts..."
-						CommandLine="$(GenToolsScripts)"
-						Outputs="..\..\tools\g-ir-scanner;..\..\tools\g-ir-doc-tool;..\..\tools\g-ir-annotation-tool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Debug|x64">
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Generating Tools Scripts..."
-						CommandLine="$(GenToolsScriptsX64)"
-						Outputs="..\..\tools\g-ir-scanner;..\..\tools\g-ir-doc-tool;..\..\tools\g-ir-annotation-tool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Release|x64">
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Generating Tools Scripts..."
-						CommandLine="$(GenToolsScriptsX64)"
-						Outputs="..\..\tools\g-ir-scanner;..\..\tools\g-ir-doc-tool;..\..\tools\g-ir-annotation-tool"
-					/>
-				</FileConfiguration>
-			</File>
-		</Filter>
-	</Files>
-</VisualStudioProject>
diff --git a/win32/vs9/gi-version-paths.vsprops b/win32/vs9/gi-version-paths.vsprops
deleted file mode 100644
index c8e5c2b..0000000
--- a/win32/vs9/gi-version-paths.vsprops
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="giversionpaths"
-	>
-	<UserMacro
-		Name="VSVer"
-		Value="9"
-	/>
-	<UserMacro
-		Name="GlibEtcInstallRoot"
-		Value="$(SolutionDir)\..\..\..\vs$(VSVer)\$(PlatformName)"
-	/>
-	<UserMacro
-		Name="CopyDir"
-		Value="$(GlibEtcInstallRoot)"
-	/>
-	<!-- PythonDir needs to point to a 32-bit/x86 Python 2.7/3.3+ installation -->
-	<UserMacro
-		Name="PythonDir"
-		Value="c:\\python27"
-	/>
-	<!-- PythonDirX64 needs to point to an x86-64/x64 Python 2.7/3.3+ installation -->
-	<UserMacro
-		Name="PythonDirX64"
-		Value="$(PythonDir).x64"
-	/>
-	<UserMacro
-		Name="IntrospectPythonParam"
-		Value="PYTHON=$(PythonDir)\python.exe"
-	/>
-	<UserMacro
-		Name="IntrospectPythonParamX64"
-		Value="PYTHON=$(PythonDirX64)\python.exe"
-	/>
-	<UserMacro
-		Name="GIVersion"
-		Value="1.56.1"
-	/>
-	<UserMacro
-		Name="BASE_GI_DIR"
-		Value="$(SolutionDir)\..\.."
-	/>
-	<UserMacro
-		Name="ApiVersion"
-		Value="1.0"
-	/>
-	<UserMacro
-		Name="LibGILibtoolCompatibleDllPrefix"
-		Value="lib"
-	/>
-	<UserMacro
-		Name="LibGILibtoolCompatibleDllSuffix"
-		Value="-$(ApiVersion)-0"
-	/>
-	<UserMacro
-		Name="LibGISeparateVSDllPrefix"
-		Value=""
-	/>
-	<UserMacro
-		Name="LibGISeparateVSDllSuffix"
-		Value="-1-vs$(VSVer)"
-	/>
-	<!-- Change these two to LibGILibtoolCompatibleDllPrefix and
-	LibGILibtoolCompatibleDllSuffix if that is what you want -->
-	<UserMacro
-		Name="LibGIDllPrefix"
-		Value="$(LibGISeparateVSDllPrefix)"
-	/>
-	<UserMacro
-		Name="LibGIDllSuffix"
-		Value="$(LibGISeparateVSDllSuffix)"
-	/>
-</VisualStudioPropertySheet>
diff --git a/win32/vs9/gi-version-paths.vsprops.in b/win32/vs9/gi-version-paths.vsprops.in
deleted file mode 100644
index 2375809..0000000
--- a/win32/vs9/gi-version-paths.vsprops.in
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="giversionpaths"
-	>
-	<UserMacro
-		Name="VSVer"
-		Value="9"
-	/>
-	<UserMacro
-		Name="GlibEtcInstallRoot"
-		Value="$(SolutionDir)\..\..\..\vs$(VSVer)\$(PlatformName)"
-	/>
-	<UserMacro
-		Name="CopyDir"
-		Value="$(GlibEtcInstallRoot)"
-	/>
-	<!-- PythonDir needs to point to a 32-bit/x86 Python 2.7/3.3+ installation -->
-	<UserMacro
-		Name="PythonDir"
-		Value="c:\\python27"
-	/>
-	<!-- PythonDirX64 needs to point to an x86-64/x64 Python 2.7/3.3+ installation -->
-	<UserMacro
-		Name="PythonDirX64"
-		Value="$(PythonDir).x64"
-	/>
-	<UserMacro
-		Name="IntrospectPythonParam"
-		Value="PYTHON=$(PythonDir)\python.exe"
-	/>
-	<UserMacro
-		Name="IntrospectPythonParamX64"
-		Value="PYTHON=$(PythonDirX64)\python.exe"
-	/>
-	<UserMacro
-		Name="GIVersion"
-		Value="@PACKAGE_VERSION@"
-	/>
-	<UserMacro
-		Name="BASE_GI_DIR"
-		Value="$(SolutionDir)\..\.."
-	/>
-	<UserMacro
-		Name="ApiVersion"
-		Value="1.0"
-	/>
-	<UserMacro
-		Name="LibGILibtoolCompatibleDllPrefix"
-		Value="lib"
-	/>
-	<UserMacro
-		Name="LibGILibtoolCompatibleDllSuffix"
-		Value="-$(ApiVersion)-0"
-	/>
-	<UserMacro
-		Name="LibGISeparateVSDllPrefix"
-		Value=""
-	/>
-	<UserMacro
-		Name="LibGISeparateVSDllSuffix"
-		Value="-1-vs$(VSVer)"
-	/>
-	<!-- Change these two to LibGILibtoolCompatibleDllPrefix and
-	LibGILibtoolCompatibleDllSuffix if that is what you want -->
-	<UserMacro
-		Name="LibGIDllPrefix"
-		Value="$(LibGISeparateVSDllPrefix)"
-	/>
-	<UserMacro
-		Name="LibGIDllSuffix"
-		Value="$(LibGISeparateVSDllSuffix)"
-	/>
-</VisualStudioPropertySheet>
diff --git a/win32/vs9/girepository.vcproj b/win32/vs9/girepository.vcproj
deleted file mode 100644
index 7b992b6..0000000
--- a/win32/vs9/girepository.vcproj
+++ /dev/null
@@ -1,199 +0,0 @@
-<?xml version="1.0" encoding="big5"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="9.00"
- Name="girepository"
- ProjectGUID="{23E28245-8FC7-4B41-B1C5-8785BD4366A7}"
- RootNamespace="girepository"
- Keyword="Win32Proj"
- TargetFrameworkVersion="196613"
- >
- <Platforms>
-  <Platform
-   Name="Win32"
-  />
-  <Platform
-   Name="x64"
-  />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
-  <Configuration
-   Name="Debug|Win32"
-   ConfigurationType="2"
-   InheritedPropertySheets=".\gi-build-defines.vsprops"
-   CharacterSet="2"
-   >
-   <Tool
-    Name="VCCLCompilerTool"
-    Optimization="0"
-    AdditionalIncludeDirectories="..\..\girepository"
-    PreprocessorDefinitions="_DEBUG;$(GIRepositoryBuildDefines)"
-    MinimalRebuild="true"
-    BasicRuntimeChecks="3"
-    RuntimeLibrary="3"
-    UsePrecompiledHeader="0"
-    WarningLevel="3"
-    DebugInformationFormat="4"
-   />
-   <Tool
-    Name="VCLinkerTool"
-    AdditionalDependencies="ffi.lib"
-    OutputFile="$(OutDir)\$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).dll"
-    LinkIncremental="2"
-    GenerateDebugInformation="true"
-    SubSystem="2"
-    ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
-    TargetMachine="1"
-   />
-  </Configuration>
-  <Configuration
-   Name="Release|Win32"
-   ConfigurationType="2"
-   InheritedPropertySheets=".\gi-build-defines.vsprops"
-   CharacterSet="2"
-   WholeProgramOptimization="1"
-   >
-   <Tool
-    Name="VCCLCompilerTool"
-    Optimization="2"
-    EnableIntrinsicFunctions="true"
-    AdditionalIncludeDirectories="..\..\girepository"
-    PreprocessorDefinitions="$(GIRepositoryBuildDefines)"
-    RuntimeLibrary="2"
-    EnableFunctionLevelLinking="true"
-    UsePrecompiledHeader="0"
-    WarningLevel="3"
-    DebugInformationFormat="3"
-   />
-   <Tool
-    Name="VCLinkerTool"
-    AdditionalDependencies="ffi.lib"
-    OutputFile="$(OutDir)\$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).dll"
-    LinkIncremental="1"
-    GenerateDebugInformation="true"
-    SubSystem="2"
-    OptimizeReferences="2"
-    EnableCOMDATFolding="2"
-    ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
-    TargetMachine="1"
-   />
-  </Configuration>
-  <Configuration
-   Name="Debug|x64"
-   ConfigurationType="2"
-   InheritedPropertySheets=".\gi-build-defines.vsprops"
-   CharacterSet="2"
-   >
-   <Tool
-    Name="VCMIDLTool"
-    TargetEnvironment="3"
-   />
-   <Tool
-    Name="VCCLCompilerTool"
-    Optimization="0"
-    AdditionalIncludeDirectories="..\..\girepository"
-    PreprocessorDefinitions="_DEBUG;$(GIRepositoryBuildDefines)"
-    MinimalRebuild="true"
-    BasicRuntimeChecks="3"
-    RuntimeLibrary="3"
-    UsePrecompiledHeader="0"
-    WarningLevel="3"
-    DebugInformationFormat="3"
-   />
-   <Tool
-    Name="VCLinkerTool"
-    AdditionalDependencies="ffi.lib"
-    OutputFile="$(OutDir)\$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).dll"
-    LinkIncremental="2"
-    GenerateDebugInformation="true"
-    SubSystem="2"
-    ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
-    TargetMachine="17"
-   />
-  </Configuration>
-  <Configuration
-   Name="Release|x64"
-   ConfigurationType="2"
-   InheritedPropertySheets=".\gi-build-defines.vsprops"
-   CharacterSet="2"
-   WholeProgramOptimization="1"
-   >
-   <Tool
-    Name="VCMIDLTool"
-    TargetEnvironment="3"
-   />
-   <Tool
-    Name="VCCLCompilerTool"
-    Optimization="2"
-    EnableIntrinsicFunctions="true"
-    AdditionalIncludeDirectories="..\..\girepository"
-    PreprocessorDefinitions="$(GIRepositoryBuildDefines)"
-    RuntimeLibrary="2"
-    EnableFunctionLevelLinking="true"
-    UsePrecompiledHeader="0"
-    WarningLevel="3"
-    DebugInformationFormat="3"
-   />
-   <Tool
-    Name="VCLinkerTool"
-    AdditionalDependencies="ffi.lib"
-    OutputFile="$(OutDir)\$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).dll"
-    LinkIncremental="1"
-    GenerateDebugInformation="true"
-    SubSystem="2"
-    OptimizeReferences="2"
-    EnableCOMDATFolding="2"
-    ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
-    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="..\..\girepository\gdump.c" />
-   <File RelativePath="..\..\girepository\giarginfo.c" />
-   <File RelativePath="..\..\girepository\gibaseinfo.c" />
-   <File RelativePath="..\..\girepository\gicallableinfo.c" />
-   <File RelativePath="..\..\girepository\giconstantinfo.c" />
-   <File RelativePath="..\..\girepository\gienuminfo.c" />
-   <File RelativePath="..\..\girepository\gifieldinfo.c" />
-   <File RelativePath="..\..\girepository\gifunctioninfo.c" />
-   <File RelativePath="..\..\girepository\ginvoke.c" />
-   <File RelativePath="..\..\girepository\giinterfaceinfo.c" />
-   <File RelativePath="..\..\girepository\giobjectinfo.c" />
-   <File RelativePath="..\..\girepository\gipropertyinfo.c" />
-   <File RelativePath="..\..\girepository\giregisteredtypeinfo.c" />
-   <File RelativePath="..\..\girepository\girepository.c" />
-   <File RelativePath="..\..\girepository\girffi.c" />
-   <File RelativePath="..\..\girepository\gisignalinfo.c" />
-   <File RelativePath="..\..\girepository\gistructinfo.c" />
-   <File RelativePath="..\..\girepository\gitypeinfo.c" />
-   <File RelativePath="..\..\girepository\gitypelib.c" />
-   <File RelativePath="..\..\girepository\giunioninfo.c" />
-   <File RelativePath="..\..\girepository\givfuncinfo.c" />
-   <File RelativePath="..\..\girepository\gthash.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/win32/vs9/girepository.vcprojin b/win32/vs9/girepository.vcprojin
deleted file mode 100644
index 66f3a00..0000000
--- a/win32/vs9/girepository.vcprojin
+++ /dev/null
@@ -1,178 +0,0 @@
-<?xml version="1.0" encoding="big5"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="girepository"
-	ProjectGUID="{23E28245-8FC7-4B41-B1C5-8785BD4366A7}"
-	RootNamespace="girepository"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="196613"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			ConfigurationType="2"
-			InheritedPropertySheets=".\gi-build-defines.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\girepository"
-				PreprocessorDefinitions="_DEBUG;$(GIRepositoryBuildDefines)"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ffi.lib"
-				OutputFile="$(OutDir)\$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).dll"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
-				TargetMachine="1"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			ConfigurationType="2"
-			InheritedPropertySheets=".\gi-build-defines.vsprops"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\girepository"
-				PreprocessorDefinitions="$(GIRepositoryBuildDefines)"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ffi.lib"
-				OutputFile="$(OutDir)\$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).dll"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
-				TargetMachine="1"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			ConfigurationType="2"
-			InheritedPropertySheets=".\gi-build-defines.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\girepository"
-				PreprocessorDefinitions="_DEBUG;$(GIRepositoryBuildDefines)"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ffi.lib"
-				OutputFile="$(OutDir)\$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).dll"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
-				TargetMachine="17"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			ConfigurationType="2"
-			InheritedPropertySheets=".\gi-build-defines.vsprops"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\girepository"
-				PreprocessorDefinitions="$(GIRepositoryBuildDefines)"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ffi.lib"
-				OutputFile="$(OutDir)\$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).dll"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				ImportLibrary="$(TargetDir)$(ProjectName)-$(ApiVersion).lib"
-				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 "girepository.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/win32/vs9/glib-print.vcproj b/win32/vs9/glib-print.vcproj
deleted file mode 100644
index e6aa2d9..0000000
--- a/win32/vs9/glib-print.vcproj
+++ /dev/null
@@ -1,162 +0,0 @@
-<?xml version="1.0" encoding="big5"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="glib-print"
-	ProjectGUID="{2CCD6E09-08E7-44B9-92E6-42F0A5DBBC8B}"
-	RootNamespace="glibprint"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="196613"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			ConfigurationType="1"
-			InheritedPropertySheets=".\gi-build-defines.vsprops"
-			CharacterSet="2"
-			>
-			<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"
-			ConfigurationType="1"
-			InheritedPropertySheets=".\gi-build-defines.vsprops"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<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"
-			ConfigurationType="1"
-			InheritedPropertySheets=".\gi-build-defines.vsprops"
-			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"
-			ConfigurationType="1"
-			InheritedPropertySheets=".\gi-build-defines.vsprops"
-			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}"
-			>
-			<File RelativePath="..\..\examples\glib-print.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/win32/vs9/gobject-introspection.sln b/win32/vs9/gobject-introspection.sln
deleted file mode 100644
index 80826ac..0000000
--- a/win32/vs9/gobject-introspection.sln
+++ /dev/null
@@ -1,166 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gi-prebuild", "gi-prebuild.vcproj", "{2093D218-190E-4194-9421-3BA7CBF33B11}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cmph", "cmph.vcproj", "{442C007E-D901-41DA-9706-5DB4AFB4C06B}"
-	ProjectSection(ProjectDependencies) = postProject
-		{2093D218-190E-4194-9421-3BA7CBF33B11} = {2093D218-190E-4194-9421-3BA7CBF33B11}
-	EndProjectSection
-EndProject
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cmph-bdz-test", "cmph-bdz-test.vcproj", "{E41F378B-CCDD-4B1C-89C3-6D2C950FAF1A}"
-	ProjectSection(ProjectDependencies) = postProject
-		{442C007E-D901-41DA-9706-5DB4AFB4C06B} = {442C007E-D901-41DA-9706-5DB4AFB4C06B}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "girepository", "girepository.vcproj", "{23E28245-8FC7-4B41-B1C5-8785BD4366A7}"
-	ProjectSection(ProjectDependencies) = postProject
-		{442C007E-D901-41DA-9706-5DB4AFB4C06B} = {442C007E-D901-41DA-9706-5DB4AFB4C06B}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_giscanner", "_giscanner.vcproj", "{8311394F-9114-4C97-80F2-51BCABA054C9}"
-	ProjectSection(ProjectDependencies) = postProject
-		{2093D218-190E-4194-9421-3BA7CBF33B11} = {2093D218-190E-4194-9421-3BA7CBF33B11}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glib-print", "glib-print.vcproj", "{2CCD6E09-08E7-44B9-92E6-42F0A5DBBC8B}"
-	ProjectSection(ProjectDependencies) = postProject
-		{23E28245-8FC7-4B41-B1C5-8785BD4366A7} = {23E28245-8FC7-4B41-B1C5-8785BD4366A7}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "g-ir-generate", "g-ir-generate.vcproj", "{F4E6621F-A7DD-4863-8CCF-BA04DFC601E3}"
-	ProjectSection(ProjectDependencies) = postProject
-		{23E28245-8FC7-4B41-B1C5-8785BD4366A7} = {23E28245-8FC7-4B41-B1C5-8785BD4366A7}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "g-ir-compiler", "g-ir-compiler.vcproj", "{5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774}"
-	ProjectSection(ProjectDependencies) = postProject
-		{23E28245-8FC7-4B41-B1C5-8785BD4366A7} = {23E28245-8FC7-4B41-B1C5-8785BD4366A7}
-		{442C007E-D901-41DA-9706-5DB4AFB4C06B} = {442C007E-D901-41DA-9706-5DB4AFB4C06B}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "g-ir-inspect", "g-ir-inspect.vcproj", "{F4E6621F-A7DD-4863-8CCF-CA04DFC601E3}"
-	ProjectSection(ProjectDependencies) = postProject
-		{23E28245-8FC7-4B41-B1C5-8785BD4366A7} = {23E28245-8FC7-4B41-B1C5-8785BD4366A7}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gi-introspect", "gi-introspect.vcproj", "{7A36674C-379D-4989-A978-07124E5F852C}"
-	ProjectSection(ProjectDependencies) = postProject
-		{F4E6621F-A7DD-4863-8CCF-BA04DFC601E3} = {F4E6621F-A7DD-4863-8CCF-BA04DFC601E3}
-		{23E28245-8FC7-4B41-B1C5-8785BD4366A7} = {23E28245-8FC7-4B41-B1C5-8785BD4366A7}
-		{8311394F-9114-4C97-80F2-51BCABA054C9} = {8311394F-9114-4C97-80F2-51BCABA054C9}
-		{5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774} = {5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gi-install", "gi-install.vcproj", "{2093D218-190E-4194-9421-3BA7CBF33B10}"
-	ProjectSection(ProjectDependencies) = postProject
-		{F4E6621F-A7DD-4863-8CCF-CA04DFC601E3} = {F4E6621F-A7DD-4863-8CCF-CA04DFC601E3}
-		{F4E6621F-A7DD-4863-8CCF-BA04DFC601E3} = {F4E6621F-A7DD-4863-8CCF-BA04DFC601E3}
-		{23E28245-8FC7-4B41-B1C5-8785BD4366A7} = {23E28245-8FC7-4B41-B1C5-8785BD4366A7}
-		{8311394F-9114-4C97-80F2-51BCABA054C9} = {8311394F-9114-4C97-80F2-51BCABA054C9}
-		{5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774} = {5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774}
-		{7A36674C-379D-4989-A978-07124E5F852C} = {7A36674C-379D-4989-A978-07124E5F852C}
-	EndProjectSection
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Debug|x64 = Debug|x64
-		Release|Win32 = Release|Win32
-		Release|x64 = Release|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{2093D218-190E-4194-9421-3BA7CBF33B11}.Debug|Win32.ActiveCfg = Debug|Win32
-		{2093D218-190E-4194-9421-3BA7CBF33B11}.Debug|Win32.Build.0 = Debug|Win32
-		{2093D218-190E-4194-9421-3BA7CBF33B11}.Debug|x64.ActiveCfg = Debug|x64
-		{2093D218-190E-4194-9421-3BA7CBF33B11}.Debug|x64.Build.0 = Debug|x64
-		{2093D218-190E-4194-9421-3BA7CBF33B11}.Release|Win32.ActiveCfg = Release|Win32
-		{2093D218-190E-4194-9421-3BA7CBF33B11}.Release|Win32.Build.0 = Release|Win32
-		{2093D218-190E-4194-9421-3BA7CBF33B11}.Release|x64.ActiveCfg = Release|x64
-		{2093D218-190E-4194-9421-3BA7CBF33B11}.Release|x64.Build.0 = Release|x64
-		{442C007E-D901-41DA-9706-5DB4AFB4C06B}.Debug|Win32.ActiveCfg = Debug|Win32
-		{442C007E-D901-41DA-9706-5DB4AFB4C06B}.Debug|Win32.Build.0 = Debug|Win32
-		{442C007E-D901-41DA-9706-5DB4AFB4C06B}.Debug|x64.ActiveCfg = Debug|x64
-		{442C007E-D901-41DA-9706-5DB4AFB4C06B}.Debug|x64.Build.0 = Debug|x64
-		{442C007E-D901-41DA-9706-5DB4AFB4C06B}.Release|Win32.ActiveCfg = Release|Win32
-		{442C007E-D901-41DA-9706-5DB4AFB4C06B}.Release|Win32.Build.0 = Release|Win32
-		{442C007E-D901-41DA-9706-5DB4AFB4C06B}.Release|x64.ActiveCfg = Release|x64
-		{442C007E-D901-41DA-9706-5DB4AFB4C06B}.Release|x64.Build.0 = Release|x64
-		{E41F378B-CCDD-4B1C-89C3-6D2C950FAF1A}.Debug|Win32.ActiveCfg = Debug|Win32
-		{E41F378B-CCDD-4B1C-89C3-6D2C950FAF1A}.Debug|Win32.Build.0 = Debug|Win32
-		{E41F378B-CCDD-4B1C-89C3-6D2C950FAF1A}.Debug|x64.ActiveCfg = Debug|x64
-		{E41F378B-CCDD-4B1C-89C3-6D2C950FAF1A}.Debug|x64.Build.0 = Debug|x64
-		{E41F378B-CCDD-4B1C-89C3-6D2C950FAF1A}.Release|Win32.ActiveCfg = Release|Win32
-		{E41F378B-CCDD-4B1C-89C3-6D2C950FAF1A}.Release|Win32.Build.0 = Release|Win32
-		{E41F378B-CCDD-4B1C-89C3-6D2C950FAF1A}.Release|x64.ActiveCfg = Release|x64
-		{E41F378B-CCDD-4B1C-89C3-6D2C950FAF1A}.Release|x64.Build.0 = Release|x64
-		{23E28245-8FC7-4B41-B1C5-8785BD4366A7}.Debug|Win32.ActiveCfg = Debug|Win32
-		{23E28245-8FC7-4B41-B1C5-8785BD4366A7}.Debug|Win32.Build.0 = Debug|Win32
-		{23E28245-8FC7-4B41-B1C5-8785BD4366A7}.Debug|x64.ActiveCfg = Debug|x64
-		{23E28245-8FC7-4B41-B1C5-8785BD4366A7}.Debug|x64.Build.0 = Debug|x64
-		{23E28245-8FC7-4B41-B1C5-8785BD4366A7}.Release|Win32.ActiveCfg = Release|Win32
-		{23E28245-8FC7-4B41-B1C5-8785BD4366A7}.Release|Win32.Build.0 = Release|Win32
-		{23E28245-8FC7-4B41-B1C5-8785BD4366A7}.Release|x64.ActiveCfg = Release|x64
-		{23E28245-8FC7-4B41-B1C5-8785BD4366A7}.Release|x64.Build.0 = Release|x64
-		{8311394F-9114-4C97-80F2-51BCABA054C9}.Debug|Win32.ActiveCfg = Debug|Win32
-		{8311394F-9114-4C97-80F2-51BCABA054C9}.Debug|Win32.Build.0 = Debug|Win32
-		{8311394F-9114-4C97-80F2-51BCABA054C9}.Debug|x64.ActiveCfg = Debug|x64
-		{8311394F-9114-4C97-80F2-51BCABA054C9}.Debug|x64.Build.0 = Debug|x64
-		{8311394F-9114-4C97-80F2-51BCABA054C9}.Release|Win32.ActiveCfg = Release|Win32
-		{8311394F-9114-4C97-80F2-51BCABA054C9}.Release|Win32.Build.0 = Release|Win32
-		{8311394F-9114-4C97-80F2-51BCABA054C9}.Release|x64.ActiveCfg = Release|x64
-		{8311394F-9114-4C97-80F2-51BCABA054C9}.Release|x64.Build.0 = Release|x64
-		{2CCD6E09-08E7-44B9-92E6-42F0A5DBBC8B}.Debug|Win32.ActiveCfg = Debug|Win32
-		{2CCD6E09-08E7-44B9-92E6-42F0A5DBBC8B}.Debug|Win32.Build.0 = Debug|Win32
-		{2CCD6E09-08E7-44B9-92E6-42F0A5DBBC8B}.Debug|x64.ActiveCfg = Debug|x64
-		{2CCD6E09-08E7-44B9-92E6-42F0A5DBBC8B}.Debug|x64.Build.0 = Debug|x64
-		{2CCD6E09-08E7-44B9-92E6-42F0A5DBBC8B}.Release|Win32.ActiveCfg = Release|Win32
-		{2CCD6E09-08E7-44B9-92E6-42F0A5DBBC8B}.Release|Win32.Build.0 = Release|Win32
-		{2CCD6E09-08E7-44B9-92E6-42F0A5DBBC8B}.Release|x64.ActiveCfg = Release|x64
-		{2CCD6E09-08E7-44B9-92E6-42F0A5DBBC8B}.Release|x64.Build.0 = Release|x64
-		{F4E6621F-A7DD-4863-8CCF-BA04DFC601E3}.Debug|Win32.ActiveCfg = Debug|Win32
-		{F4E6621F-A7DD-4863-8CCF-BA04DFC601E3}.Debug|Win32.Build.0 = Debug|Win32
-		{F4E6621F-A7DD-4863-8CCF-BA04DFC601E3}.Debug|x64.ActiveCfg = Debug|x64
-		{F4E6621F-A7DD-4863-8CCF-BA04DFC601E3}.Debug|x64.Build.0 = Debug|x64
-		{F4E6621F-A7DD-4863-8CCF-BA04DFC601E3}.Release|Win32.ActiveCfg = Release|Win32
-		{F4E6621F-A7DD-4863-8CCF-BA04DFC601E3}.Release|Win32.Build.0 = Release|Win32
-		{F4E6621F-A7DD-4863-8CCF-BA04DFC601E3}.Release|x64.ActiveCfg = Release|x64
-		{F4E6621F-A7DD-4863-8CCF-BA04DFC601E3}.Release|x64.Build.0 = Release|x64
-		{F4E6621F-A7DD-4863-8CCF-CA04DFC601E3}.Debug|Win32.ActiveCfg = Debug|Win32
-		{F4E6621F-A7DD-4863-8CCF-CA04DFC601E3}.Debug|Win32.Build.0 = Debug|Win32
-		{F4E6621F-A7DD-4863-8CCF-CA04DFC601E3}.Debug|x64.ActiveCfg = Debug|x64
-		{F4E6621F-A7DD-4863-8CCF-CA04DFC601E3}.Debug|x64.Build.0 = Debug|x64
-		{F4E6621F-A7DD-4863-8CCF-CA04DFC601E3}.Release|Win32.ActiveCfg = Release|Win32
-		{F4E6621F-A7DD-4863-8CCF-CA04DFC601E3}.Release|Win32.Build.0 = Release|Win32
-		{F4E6621F-A7DD-4863-8CCF-CA04DFC601E3}.Release|x64.ActiveCfg = Release|x64
-		{F4E6621F-A7DD-4863-8CCF-CA04DFC601E3}.Release|x64.Build.0 = Release|x64
-		{5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774}.Debug|Win32.ActiveCfg = Debug|Win32
-		{5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774}.Debug|Win32.Build.0 = Debug|Win32
-		{5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774}.Debug|x64.ActiveCfg = Debug|x64
-		{5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774}.Debug|x64.Build.0 = Debug|x64
-		{5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774}.Release|Win32.ActiveCfg = Release|Win32
-		{5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774}.Release|Win32.Build.0 = Release|Win32
-		{5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774}.Release|x64.ActiveCfg = Release|x64
-		{5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774}.Release|x64.Build.0 = Release|x64
-		{2093D218-190E-4194-9421-3BA7CBF33B10}.Debug|Win32.ActiveCfg = Debug|Win32
-		{2093D218-190E-4194-9421-3BA7CBF33B10}.Debug|Win32.Build.0 = Debug|Win32
-		{2093D218-190E-4194-9421-3BA7CBF33B10}.Debug|x64.ActiveCfg = Debug|x64
-		{2093D218-190E-4194-9421-3BA7CBF33B10}.Debug|x64.Build.0 = Debug|x64
-		{2093D218-190E-4194-9421-3BA7CBF33B10}.Release|Win32.ActiveCfg = Release|Win32
-		{2093D218-190E-4194-9421-3BA7CBF33B10}.Release|Win32.Build.0 = Release|Win32
-		{2093D218-190E-4194-9421-3BA7CBF33B10}.Release|x64.ActiveCfg = Release|x64
-		{2093D218-190E-4194-9421-3BA7CBF33B10}.Release|x64.Build.0 = Release|x64
-		{7A36674C-379D-4989-A978-07124E5F852C}.Debug|Win32.ActiveCfg = Debug|Win32
-		{7A36674C-379D-4989-A978-07124E5F852C}.Debug|Win32.Build.0 = Debug|Win32
-		{7A36674C-379D-4989-A978-07124E5F852C}.Debug|x64.ActiveCfg = Debug|x64
-		{7A36674C-379D-4989-A978-07124E5F852C}.Debug|x64.Build.0 = Debug|x64
-		{7A36674C-379D-4989-A978-07124E5F852C}.Release|Win32.ActiveCfg = Release|Win32
-		{7A36674C-379D-4989-A978-07124E5F852C}.Release|Win32.Build.0 = Release|Win32
-		{7A36674C-379D-4989-A978-07124E5F852C}.Release|x64.ActiveCfg = Release|x64
-		{7A36674C-379D-4989-A978-07124E5F852C}.Release|x64.Build.0 = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal