Drop Autotools from the projectwip/ebassi/no-autotools

We only use Meson, so we can drop a lot of unnecessary files.

66 files changed, 57 insertions, 7737 deletions

diff --git a/INSTALL b/INSTALL
deleted file mode 100644
index e69de29bb..000000000
--- a/INSTALL
+++ /dev/null
diff --git a/Makefile.am b/Makefile.am
deleted file mode 100644
index 8e1e31d06..000000000
--- a/Makefile.am
+++ /dev/null
@@ -1,47 +0,0 @@
-SUBDIRS = gdk-pixbuf po docs thumbnailer tests contrib win32
-
-EXTRA_DIST = 			\
-	config.h.win32 		\
-	glib-tap.mk		\
-	tap-driver.sh		\
-	tap-test
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = gdk-pixbuf-2.0.pc
-
-ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
-
-DISTCLEANFILES = 		\
-	gdk-pixbuf-2.0.pc
-
-DISTCHECK_CONFIGURE_FLAGS = 	\
-	--enable-gtk-doc	\
-	--enable-man		\
-	--enable-introspection
-
-MAINTAINERCLEANFILES = \
-	ABOUT-NLS \
-	aclocal.m4 \
-	config.guess \
-	config.h.in \
-	config.rpath \
-	config.sub \
-	depcomp \
-	gtk-doc.make \
-	install-sh \
-	ltmain.sh \
-	missing
-
-if WITH_COVERAGE
-.PHONY: coverage clear-coverage
-
-coverage:
-	$(AM_V_GEN) $(LCOV) --quiet --directory $(top_builddir) --capture --output-file $(top_builddir)/coverage.info --no-checksum --compat-libtool; \
-	  $(GENHTML) --quiet --output-directory $(top_builddir)/coverage $(top_builddir)/coverage.info
-	@echo "file://$(abs_top_builddir)/coverage/index.html"
-
-clear-coverage:
-	$(AM_V_GEN) $(LCOV) --directory . --zerocounters
-endif
-
--include $(top_srcdir)/git.mk
diff --git a/README b/README
deleted file mode 100644
index e69de29bb..000000000
--- a/README
+++ /dev/null
diff --git a/README.md b/README.md
new file mode 100644
index 000000000..1c1273059
--- /dev/null
+++ b/README.md
@@ -0,0 +1,57 @@
+# GDK-Pixbuf - An image loading library
+
+GDK-Pixbuf loads, manipulates, and saves image data from files, memory areas,
+and streams.
+
+GDK-Pixbuf supports multiple file and image formats, and can be extended to
+support third party loaders.
+
+Once an image is loaded, GDK-Pixbuf exposes it as a memory area in order to
+perform pixel-based operations.
+
+## Building GDK-Pixbuf
+
+Once you cloned the Git repository, using:
+
+```sh
+$ git clone https://git.gnome.org/browse/gdk-pixbuf
+```
+
+You can build GDK-Pixbuf using [Meson][meson-web] and [Ninja][ninja-web]:
+
+```sh
+$ meson _build .
+$ ninja -C _build
+```
+
+You can run the test suite using `mesontest`:
+
+```sh
+$ mesontest -C _build
+```
+
+And, finally, you can install GDK-Pixbuf using Ninja:
+
+```
+$ sudo ninja -C _build install
+```
+
+## Dependencies
+
+GDK-Pixbuf depends on [GLib][glib-git] for its basic types. Additionally,
+there are dependencies for image loading:
+
+  - libpng
+  - libtiff
+  - libjpeg
+  - libjasper
+
+## Licensing
+
+GDK-Pixbuf is released under the terms of the GNU Library General Public
+License, version 2 or, at your option, later versions. See the `COPYING`
+file in the project's root directory for further information.
+
+[meson-web]: http://mesonbuild.com
+[ninja-web]: https://ninja-build.org
+[glib-git]: https://git.gnome.org/browse/glib
diff --git a/autogen.sh b/autogen.sh
deleted file mode 100755
index 4a373e9b9..000000000
--- a/autogen.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/sh
-# Run this to generate all the initial makefiles, etc.
-
-test -n "$srcdir" || srcdir=`dirname "$0"`
-test -n "$srcdir" || srcdir=.
-
-olddir=`pwd`
-cd "$srcdir"
-
-GTKDOCIZE=`which gtkdocize`
-if test -z $GTKDOCIZE; then
-        echo "*** No GTK-Doc found, please install it ***"
-        exit 1
-else
-        gtkdocize || exit $?
-fi
-
-# README and INSTALL are required by automake, but may be deleted by clean
-# up rules. to get automake to work, simply touch these here, they will be
-# regenerated from their corresponding *.in files by ./configure anyway.
-touch README INSTALL
-
-AUTORECONF=`which autoreconf`
-if test -z $AUTORECONF; then
-        echo "*** No autoreconf found, please install it ***"
-        exit 1
-else
-        autoreconf --force --install --verbose || exit $?
-fi
-
-cd "$olddir"
-test -n "$NOCONFIGURE" || "$srcdir/configure" "$@"
diff --git a/config.h.win32.in b/config.h.win32.in
deleted file mode 100644
index 1aaa149f0..000000000
--- a/config.h.win32.in
+++ /dev/null
@@ -1,170 +0,0 @@
-/* config.h.in.  Generated from configure.ac by autoheader.  */
-
-/* Define to 1 if translation of program messages to the user's native
-   language is requested. */
-#define ENABLE_NLS 1
-
-/* Define if gio can sniff image data */
-/*#define GDK_PIXBUF_USE_GIO_MIME 1*/
-
-/* The prefix for our gettext translation domains. */
-#define GETTEXT_PACKAGE "@GETTEXT_PACKAGE@"
-
-/* Define to 1 if you have the `bind_textdomain_codeset' function. */
-#define HAVE_BIND_TEXTDOMAIN_CODESET 1
-
-/* Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the
-   CoreFoundation framework. */
-/*#undef HAVE_CFLOCALECOPYCURRENT*/
-
-/* Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in
-   the CoreFoundation framework. */
-/*#undef HAVE_CFPREFERENCESCOPYAPPVALUE*/
-
-/* Define if the GNU dcgettext() function is already present or preinstalled.
-   */
-#define HAVE_DCGETTEXT 1
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-/*#undef HAVE_DLFCN_H*/
-
-/* Define if the GNU gettext() function is already present or preinstalled. */
-#define HAVE_GETTEXT 1
-
-/* Define if you have the iconv() function and it works. */
-#define HAVE_ICONV 1
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#ifndef _MSC_VER
-#define HAVE_INTTYPES_H 1
-#else
-/*#define HAVE_INTTYPES_H*/
-#endif
-
-/* Define to 1 if lrint() is available */
-#if !defined (_MSC_VER) || (_MSC_VER >= 1800)
-#define HAVE_LRINT 1
-#endif
-
-/* Define to 1 if you have the <memory.h> header file. */
-#define HAVE_MEMORY_H 1
-
-/* Define to 1 is libjpeg supports progressive JPEG */
-#define HAVE_PROGRESSIVE_JPEG 1
-
-/* Define to 1 if round() is available */
-#if !defined (_MSC_VER) || (_MSC_VER >= 1800)
-#define HAVE_ROUND 1
-#endif
-
-/* Define to 1 if sigsetjmp is available */
-/*#undef HAVE_SIGSETJMP*/
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#ifndef _MSC_VER
-#define HAVE_STDINT_H 1
-#else
-#if (_MSC_VER >= 1600)
-#define HAVE_STDINT_H 1
-#endif
-/*#undef HAVE_STDINT_H*/
-#endif
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#define HAVE_STDLIB_H 1
-
-/* Define to 1 if you have the <strings.h> header file. */
-#ifndef _MSC_VER
-#define HAVE_STRINGS_H 1
-#else
-/*#undef HAVE_STRINGS_H*/
-#endif
-
-/* Define to 1 if you have the <string.h> header file. */
-#define HAVE_STRING_H
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#define HAVE_SYS_STAT_H 1
-
-/* Define to 1 if sys/sysinfo.h is available */
-/*#undef HAVE_SYS_SYSINFO_H*/
-
-/* Define to 1 if sys/systeminfo.h is available */
-/*#undef HAVE_SYS_SYSTEMINFO_H*/
-
-/* 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
-#else
-/*#undef HAVE_UNISTD_H*/
-#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. */
-#ifdef _MSC_VER
-#define NO_MINUS_C_MINUS_O 1
-#else
-/*#undef NO_MINUS_C_MINUS_O 1*/
-#endif
-
-/* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT "http://bugzilla.gnome.org/enter_bug.cgi?product=gdk-pixbuf"
-
-/* Define to the full name of this package. */
-#define PACKAGE_NAME "gdk-pixbuf"
-
-/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "gdk-pixbuf @GDK_PIXBUF_MAJOR@.@GDK_PIXBUF_MINOR@.@GDK_PIXBUF_MICRO@"
-
-/* Define to the one symbol short name of this package. */
-#define PACKAGE_TARNAME "gdk-pixbuf"
-
-/* Define to the home page for this package. */
-#define PACKAGE_URL "http://www.gtk.org/"
-
-/* Define to the version of this package. */
-#define PACKAGE_VERSION "@GDK_PIXBUF_MAJOR@.@GDK_PIXBUF_MINOR@.@GDK_PIXBUF_MICRO@"
-
-/* Define to 1 if you have the ANSI C header files. */
-#define STDC_HEADERS 1
-
-/* Define to 1 if gmodule works and should be used */
-#define USE_GMODULE 1
-
-/* Whether to load modules via .la files rather than directly */
-/*#undef USE_LA_MODULES*/
-
-/* Define to 1 if medialib is available and should be used */
-/*#undef USE_MEDIALIB*/
-
-/* Define to 1 if medialib 2.5 is available */
-/*#undef USE_MEDIALIB25*/
-
-/* Define to 1 if MMX is available and should be used */
-#ifdef _MSC_VER
-/*#undef USE_MMX*/
-#else
-#define USE_MMX 1
-#endif
-
-/* Number of bits in a file offset, on hosts where this is settable. */
-/*#undef _FILE_OFFSET_BITS*/
-
-/* defines how to decorate public symbols while building */
-#ifdef _MSC_VER
-#define _GDK_PIXBUF_EXTERN __declspec(dllexport) extern
-#else
-#define _GDK_PIXBUF_EXTERN __attribute__((visibility("default"))) __declspec(dllexport) extern
-#endif
-
-/* Define for large files, on AIX-style hosts. */
-/*#undef _LARGE_FILES*/
-
-/* Define to empty if `const' does not conform to ANSI C. */
-/*#undef const*/
diff --git a/configure.ac b/configure.ac
deleted file mode 100644
index 01438d12f..000000000
--- a/configure.ac
+++ /dev/null
@@ -1,1017 +0,0 @@
-# Process this file with autoconf to produce a configure script.
-AC_PREREQ([2.63])
-
-# Making point releases:
-#   gdk_pixbuf_micro_version += 1;
-#   gdk_pixbuf_interface_age += 1;
-#   gdk_pixbuf_binary_age += 1;
-#
-# if any functions have been added, set gdk_pixbuf_interface_age to 0.
-#
-# if backwards compatibility has been broken:
-#   gdk_pixbuf_major_version += 1;
-#   gdk_pixbuf_interface_age = 0;
-#   gdk_pixbuf_binary_age = 0;
-
-m4_define([gdk_pixbuf_major_version], [2])
-m4_define([gdk_pixbuf_minor_version], [36])
-m4_define([gdk_pixbuf_micro_version], [7])
-m4_define([gdk_pixbuf_interface_age], [0])
-m4_define([gdk_pixbuf_binary_age],
-          [m4_eval(100 * gdk_pixbuf_minor_version + gdk_pixbuf_micro_version)])
-m4_define([gdk_pixbuf_version],
-          [gdk_pixbuf_major_version.gdk_pixbuf_minor_version.gdk_pixbuf_micro_version])
-m4_define([gdk_pixbuf_api_version], [2.0])
-m4_define([gdk_pixbuf_binary_version], [2.10.0])
-
-
-# required versions of other packages
-m4_define([glib_required_version], [2.48.0])
-
-AC_INIT([gdk-pixbuf], [gdk_pixbuf_version],
-        [http://bugzilla.gnome.org/enter_bug.cgi?product=gdk-pixbuf],
-        [gdk-pixbuf])
-
-AC_CONFIG_HEADER([config.h])
-AC_CONFIG_SRCDIR([gdk-pixbuf/gdk-pixbuf.h])
-AC_CONFIG_MACRO_DIR([m4])
-
-# Save this value here, since automake will set cflags later
-cflags_set=${CFLAGS+set}
-
-AM_INIT_AUTOMAKE([1.11 foreign no-define -Wno-portability dist-xz no-dist-gzip tar-ustar])
-AM_MAINTAINER_MODE([enable])
-
-# Support silent build rules. Disable
-# by either passing --disable-silent-rules to configure or passing V=0
-# to make
-AM_SILENT_RULES([yes])
-
-#
-# For each of the libraries we build, we define the following
-# substituted variables:
-#
-# foo_PACKAGES:     pkg-config packages this library requires
-# foo_EXTRA_LIBS:   Libraries this module requires not pulled in by pkg-config
-# foo_EXTRA_CFLAGS: cflags this module requires not pulled in by pkg-config
-# foo_DEP_LIBS:     All libraries this module requires
-# foo_DEP_CFLAGS:   All cflags this module requires
-
-GDK_PIXBUF_MAJOR=gdk_pixbuf_major_version
-GDK_PIXBUF_MINOR=gdk_pixbuf_minor_version
-GDK_PIXBUF_MICRO=gdk_pixbuf_micro_version
-GDK_PIXBUF_VERSION=gdk_pixbuf_version
-GDK_PIXBUF_API_VERSION=gdk_pixbuf_api_version
-GDK_PIXBUF_BINARY_VERSION=gdk_pixbuf_binary_version
-AC_SUBST(GDK_PIXBUF_MAJOR)
-AC_SUBST(GDK_PIXBUF_MINOR)
-AC_SUBST(GDK_PIXBUF_MICRO)
-AC_SUBST(GDK_PIXBUF_VERSION)
-AC_SUBST(GDK_PIXBUF_API_VERSION)
-AC_SUBST(GDK_PIXBUF_BINARY_VERSION)
-
-# libtool versioning
-#LT_RELEASE=$GTK_MAJOR_VERSION.$GTK_MINOR_VERSION
-#LT_CURRENT=`expr $GTK_MICRO_VERSION - $GTK_INTERFACE_AGE`
-#LT_REVISION=$GTK_INTERFACE_AGE
-#LT_AGE=`expr $GTK_BINARY_AGE - $GTK_INTERFACE_AGE`
-#LT_CURRENT_MINUS_AGE=`expr $LT_CURRENT - $LT_AGE`
-
-m4_define([lt_current], [m4_eval(100 * gdk_pixbuf_minor_version + gdk_pixbuf_micro_version - gdk_pixbuf_interface_age)])
-m4_define([lt_revision], [gdk_pixbuf_interface_age])
-m4_define([lt_age], [m4_eval(gdk_pixbuf_binary_age - gdk_pixbuf_interface_age)])
-LT_VERSION_INFO="lt_current:lt_revision:lt_age"
-LT_CURRENT_MINUS_AGE=m4_eval(lt_current - lt_age)
-AC_SUBST(LT_VERSION_INFO)
-AC_SUBST(LT_CURRENT_MINUS_AGE)
-
-# Checks for programs.
-AC_PROG_CC
-AC_PROG_CC_C_O
-AC_PROG_CC_STDC
-AC_PROG_INSTALL
-AC_PROG_MAKE_SET
-AC_PROG_AWK
-PKG_PROG_PKG_CONFIG
-
-AC_CANONICAL_HOST
-
-# Check for libm and look for these C99 functions
-AC_CHECK_LIBM
-AC_SUBST(LIBM)
-AC_CHECK_LIB(m, round, AC_DEFINE(HAVE_ROUND, [1], [Define to 1 if libm has round]))
-AC_CHECK_LIB(m, lrint, AC_DEFINE(HAVE_LRINT, [1], [Define to 1 if libm has lrint]))
-
-AC_MSG_CHECKING([for native Win32])
-LIB_EXE_MACHINE_FLAG=X86
-EXE_MANIFEST_ARCHITECTURE=X86
-case "$host" in
-  *-*-mingw*)
-    os_win32=yes
-    gio_can_sniff=no
-    case "$host" in
-    x86_64-*-*)
-      LIB_EXE_MACHINE_FLAG=X64
-      EXE_MANIFEST_ARCHITECTURE=AMD64
-      ;;
-    esac
-    ;;
-  *)
-    os_win32=no
-    ;;
-esac
-AC_MSG_RESULT([$os_win32])
-
-AC_SUBST(LIB_EXE_MACHINE_FLAG)
-AC_SUBST(EXE_MANIFEST_ARCHITECTURE)
-
-case $host in
-  *-*-linux*)
-    os_linux=yes
-    AC_DEFINE(OS_LINUX, 1, [Define to 1 if it's a Linux platform])
-    ;;
-  *-*-darwin*)
-    AC_DEFINE(OS_DARWIN, 1, [Define to 1 if it's a darwin platform])
-    ;;
-esac
-
-dnl Initialize libtool
-LT_PREREQ([2.2.6])
-LT_INIT([disable-static win32-dll])
-# Create libtool early, because it's used in configure
-LT_OUTPUT
-
-# Make sure we use 64-bit versions of various file stuff.
-AC_SYS_LARGEFILE
-
-AM_PROG_AS
-AC_CHECK_TOOLS(NM, nm, nm)
-
-AC_MSG_CHECKING([for some Win32 platform])
-AS_CASE(["$host"],
-        [*-*-mingw*|*-*-cygwin*], [platform_win32=yes],
-        [platform_win32=no]
-)
-AC_MSG_RESULT([$platform_win32])
-AM_CONDITIONAL(PLATFORM_WIN32, test "$platform_win32" = "yes")
-
-AM_CONDITIONAL(OS_WIN32, test "$os_win32" = "yes")
-AM_CONDITIONAL(OS_UNIX, test "$os_win32" != "yes")
-AM_CONDITIONAL(OS_LINUX, test "$os_linux" = "yes")
-
-if test "$os_win32" = "yes"; then
-  AC_CHECK_TOOL(WINDRES, windres, no)
-  if test "$WINDRES" = no; then
-    AC_MSG_ERROR([*** Could not find an implementation of windres in your PATH.])
-  fi
-  AC_CHECK_PROG(ms_librarian, lib.exe, yes, no)
-fi
-AM_CONDITIONAL(MS_LIB_AVAILABLE, test x$ms_librarian = xyes)
-
-m4_define([debug_default],
-          m4_if(m4_eval(gdk_pixbuf_minor_version % 2), [1], [yes], [minimum]))
-
-dnl declare --enable-* args and collect ac_help strings
-AC_ARG_ENABLE(debug,
-              AC_HELP_STRING([--enable-debug=@<:@no/minimum/yes@:>@],
-                             [turn on debugging @<:@default=debug_default@:>@]),,
-              enable_debug=debug_default)
-AC_ARG_ENABLE(rebuilds,
-              [AC_HELP_STRING([--disable-rebuilds],
-                              [disable all source autogeneration rules])],,
-              [enable_rebuilds=yes])
-
-AS_CASE([$enable_debug],
-        [yes],
-        [
-          test "$cflags_set" = set || CFLAGS="$CFLAGS -g"
-          GDK_PIXBUF_DEBUG_FLAGS="-DG_ENABLE_DEBUG -DG_ERRORCHECK_MUTEXES"
-        ],
-
-        [no], [GDK_PIXBUF_DEBUG_FLAGS="-DG_DISABLE_ASSERT -DG_DISABLE_CHECKS -DG_DISABLE_CAST_CHECKS"],
-
-        [minimum], [GDK_PIXBUF_DEBUG_FLAGS="-DG_DISABLE_CAST_CHECKS"]
-)
-
-# Build time sanity check...
-AM_SANITY_CHECK
-
-changequote(,)dnl
-if test "x$GCC" = "xyes"; then
-  case " $CFLAGS " in
-  *[\ \	]-Wall[\ \	]*) ;;
-  *) CFLAGS="$CFLAGS -Wall" ;;
-  esac
-
-  if test "x$enable_ansi" = "xyes"; then
-    case " $CFLAGS " in
-    *[\ \	]-ansi[\ \	]*) ;;
-    *) CFLAGS="$CFLAGS -ansi" ;;
-    esac
-
-    case " $CFLAGS " in
-    *[\ \	]-pedantic[\ \	]*) ;;
-    *) CFLAGS="$CFLAGS -pedantic" ;;
-    esac
-  fi
-fi
-changequote([,])dnl
-
-CPPFLAGS="$CPPFLAGS -DG_DISABLE_SINGLE_INCLUDES"
-
-# Ensure MSVC-compatible struct packing convention is used when
-# compiling for Win32 with gcc.
-# What flag to depends on gcc version: gcc3 uses "-mms-bitfields", while
-# gcc2 uses "-fnative-struct".
-if test x"$os_win32" = xyes; then
-  if test x"$GCC" = xyes; then
-    msnative_struct=''
-    AC_MSG_CHECKING([how to get MSVC-compatible struct packing])
-    if test -z "$ac_cv_prog_CC"; then
-      our_gcc="$CC"
-    else
-      our_gcc="$ac_cv_prog_CC"
-    fi
-    case `$our_gcc --version | sed -e 's,\..*,.,' -e q` in
-      2.)
-        if $our_gcc -v --help 2>/dev/null | grep fnative-struct >/dev/null; then
-          msnative_struct='-fnative-struct'
-        fi
-        ;;
-      *)
-        if $our_gcc -v --help 2>/dev/null | grep ms-bitfields >/dev/null; then
-          msnative_struct='-mms-bitfields'
-        fi
-        ;;
-    esac
-    if test x"$msnative_struct" = x ; then
-      AC_MSG_RESULT([no way])
-      AC_MSG_WARN([produced libraries might be incompatible with MSVC-compiled code])
-    else
-      CFLAGS="$CFLAGS $msnative_struct"
-      AC_MSG_RESULT([${msnative_struct}])
-    fi
-  fi
-fi
-
-## Initial sanity check, done here so that users get told they
-## have the wrong dependencies as early in the process as possible.
-## Later on we actually use the cflags/libs from separate pkg-config
-## calls. Oh, also the later pkg-config calls don't include
-## the version requirements since those make the module lists
-## annoying to construct
-PKG_CHECK_MODULES(BASE_DEPENDENCIES, [glib-2.0 >= glib_required_version])
-
-if test "$os_win32" != yes; then
-    # libtool option to control which symbols are exported
-    # right now, symbols starting with _ are not exported
-    LIBTOOL_EXPORT_OPTIONS='-export-symbols-regex "^[[^_]].*"'
-else
-    # We currently use .def files on Windows (for gdk-pixbuf, gdk and gtk)
-    LIBTOOL_EXPORT_OPTIONS=
-fi
-AC_SUBST(LIBTOOL_EXPORT_OPTIONS)
-
-dnl ******************************************************
-dnl * See whether to include shared library dependencies *
-dnl ******************************************************
-
-AC_ARG_ENABLE(explicit-deps,
-              [AC_HELP_STRING([--enable-explicit-deps=@<:@yes/no/auto@:>@],
-                              [use explicit dependencies in .pc files [default=auto]])],,
-              [enable_explicit_deps=auto])
-
-AC_MSG_CHECKING([Whether to write dependencies into .pc files])
-case $enable_explicit_deps in
-  auto)
-    export SED
-    deplibs_check_method=`(./libtool --config; echo 'eval echo \"$deplibs_check_method\"') | sh`
-    if test "x$deplibs_check_method" '!=' xpass_all || test "x$enable_static" = xyes ; then
-      enable_explicit_deps=yes
-    else
-      enable_explicit_deps=no
-    fi
-  ;;
-  yes|no)
-  ;;
-  *) AC_MSG_ERROR([Value given to --enable-explicit-deps must be one of yes, no or auto])
-  ;;
-esac
-AC_MSG_RESULT($enable_explicit_deps)
-
-AM_CONDITIONAL(DISABLE_EXPLICIT_DEPS, test $enable_explicit_deps = no)
-
-# define a MAINT-like variable REBUILD which is set if Perl
-# and awk are found, so autogenerated sources can be rebuilt
-
-AC_PATH_PROGS(PERL, perl5 perl)
-
-REBUILD=\#
-if test "x$enable_rebuilds" = "xyes" && \
-     test -n "$PERL" && \
-     $PERL -e 'exit !($] >= 5.002)' > /dev/null 2>&1 ; then
-  REBUILD=
-fi
-AC_SUBST(REBUILD)
-
-# sigsetjmp is a macro on some platforms, so AC_CHECK_FUNCS is not reliable
-AC_MSG_CHECKING(for sigsetjmp)
-AC_TRY_LINK([#include <setjmp.h>], [
-sigjmp_buf env;
-sigsetjmp(env, 0);
-], gtk_ok=yes, gtk_ok=no)
-AC_MSG_RESULT($gtk_ok)
-if test "$gtk_ok" = "yes"; then
-  AC_DEFINE(HAVE_SIGSETJMP, 1,
-            [Define to 1 if sigsetjmp is available])
-fi
-
-# i18n stuff
-AM_GNU_GETTEXT_VERSION([0.19])
-AM_GNU_GETTEXT([external])
-
-GETTEXT_PACKAGE="$PACKAGE"
-AC_SUBST(GETTEXT_PACKAGE)
-AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE",
-                   [The prefix for our gettext translation domains.])
-
-#
-# Run AM_PATH_GLIB_2_0 to make sure that GLib is installed and working
-#
-
-GLIB_PACKAGES="gobject-2.0 gio-2.0 gmodule-no-export-2.0"
-
-AM_PATH_GLIB_2_0(glib_required_version, :,
-  AC_MSG_ERROR([
-*** GLIB glib_required_version or better is required. The latest version of
-*** GLIB is always available from ftp://ftp.gtk.org/pub/gtk/.]),
-  gobject gmodule-no-export gthread)
-
-dnl
-dnl Check for bind_textdomain_codeset, including -lintl if GLib brings it in.
-dnl
-gtk_save_LIBS=$LIBS
-LIBS="$LIBS $GLIB_LIBS"
-AC_CHECK_FUNCS(bind_textdomain_codeset)
-LIBS=$gtk_save_LIBS
-
-AC_CHECK_HEADERS(unistd.h sys/resource.h)
-AC_CHECK_FUNCS(setrlimit)
-
-saved_cflags="$CFLAGS"
-saved_ldflags="$LDFLAGS"
-
-# Checks for header files.
-AC_HEADER_STDC
-
-# Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-
-##################################################
-# Checks for gdk-pixbuf
-##################################################
-
-dnl ********************************************************
-dnl * See whether we need to load our modules as .la files *
-dnl ********************************************************
-
-use_la_modules=false
-case $host in
-  *-aix*) use_la_modules=true
-esac
-
-if $use_la_modules ; then
-   AC_DEFINE(USE_LA_MODULES, 1,
-             [Whether to load modules via .la files rather than directly])
-fi
-
-
-AC_MSG_CHECKING(whether to build gmodulized gdk-pixbuf)
-
-AC_ARG_ENABLE(modules,
-              [AC_HELP_STRING([--disable-modules],
-                              [disable dynamic module loading])])
-
-dynworks=false
-deps=
-if test x$enable_modules = xno; then
-    AC_MSG_RESULT(no)
-else
-    AC_MSG_RESULT(yes)
-    AC_MSG_CHECKING(whether dynamic modules work)
-    ## for loop is to strip newline
-    tmp=`$PKG_CONFIG --variable=gmodule_supported gmodule-no-export-2.0`
-    for I in $tmp; do
-        dynworks=$I
-    done
-
-    dnl Now we check to see if our libtool supports shared lib deps
-    dnl (in a rather ugly way even)
-    if $dynworks; then
-        pixbuf_libtool_config="${CONFIG_SHELL-/bin/sh} ./libtool --config"
-        pixbuf_deplibs_check=`$pixbuf_libtool_config | \
-            grep '^[[a-z_]]*check[[a-z_]]*_method=[['\''"]]' | \
-            sed 's/.*[['\''"]]\(.*\)[['\''"]]$/\1/'`
-        if test "x$pixbuf_deplibs_check" = "xnone" || \
-           test "x$pixbuf_deplibs_check" = "xunknown" || \
-           test "x$pixbuf_deplibs_check" = "x"; then
-            dynworks=false
-        fi
-    fi
-
-    if $dynworks; then
-        AC_DEFINE(USE_GMODULE, 1,
-                  [Define to 1 if gmodule works and should be used])
-        AC_MSG_RESULT(yes)
-    else
-        AC_MSG_RESULT(no)
-    fi
-fi
-
-dnl We allow people to disable image loaders explicitely, but if they don't we error
-dnl out so that people don't accidentally build without them.
-
-AC_ARG_WITH(libpng,
-            [AC_HELP_STRING([--without-libpng],
-                            [disable PNG loader for gdk-pixbuf])])
-AC_ARG_WITH(libjpeg,
-            [AC_HELP_STRING([--without-libjpeg],
-                            [disable JPEG loader for gdk-pixbuf])])
-AC_ARG_WITH(libtiff,
-            [AC_HELP_STRING([--without-libtiff],
-                            [disable TIFF loader for gdk-pixbuf])])
-AC_ARG_WITH(libjasper,
-            [AC_HELP_STRING([--with-libjasper],
-                            [enable JPEG2000 loader for gdk-pixbuf])])
-AC_ARG_WITH(gdiplus,
-            [AC_HELP_STRING([--without-gdiplus],
-                            [disable GDI+ loaders for gdk-pixbuf on Windows])])
-
-AM_CONDITIONAL(BUILD_GDIPLUS_LOADERS, [ test x$os_win32 = xyes && test x$with_gdiplus != xno ])
-
-dnl Test for libtiff
-libtiff_found=no
-if test x$os_win32 = xno || test x$with_gdiplus = xno; then
-  if test x$with_libtiff != xno; then
-    PKG_CHECK_MODULES(TIFF, libtiff-4)
-    libtiff_found=yes
-  fi
-
-  if test x$with_libtiff != xno && test x$libtiff_found = xno; then
-     AC_MSG_ERROR([
-*** Checks for TIFF loader failed. You can build without it by passing
-*** --without-libtiff to configure but some programs using GTK+ may
-*** not work properly])
-  fi
-fi
-
-dnl Test for libjpeg
-if test x$os_win32 = xno || test x$with_gdiplus = xno; then
-  if test x$with_libjpeg != xno && test -z "$LIBJPEG"; then
-    AC_CHECK_LIB(jpeg, jpeg_destroy_decompress,
-      jpeg_ok=yes,
-      jpeg_ok=no
-      AC_MSG_WARN(*** JPEG loader will not be built (JPEG library not found) ***))
-    if test "$jpeg_ok" = yes; then
-      AC_MSG_CHECKING([for jpeglib.h])
-      AC_TRY_CPP(
-[#include <stdio.h>
-#undef PACKAGE
-#undef VERSION
-#undef HAVE_STDLIB_H
-#include <jpeglib.h>],
-        jpeg_ok=yes,
-        jpeg_ok=no)
-      AC_MSG_RESULT($jpeg_ok)
-      if test "$jpeg_ok" = yes; then
-        LIBJPEG='-ljpeg'
-        AC_CHECK_LIB(jpeg, jpeg_simple_progression,
-          AC_DEFINE(HAVE_PROGRESSIVE_JPEG, 1,
-                    [Define to 1 is libjpeg supports progressive JPEG]),
-          AC_MSG_WARN(JPEG library does not support progressive saving.))
-      else
-          AC_MSG_WARN(*** JPEG loader will not be built (JPEG header file not found) ***)
-      fi
-    fi
-  fi
-
-  if test x$with_libjpeg != xno && test -z "$LIBJPEG"; then
-     AC_MSG_ERROR([
-*** Checks for JPEG loader failed. You can build without it by passing
-*** --without-libjpeg to configure but some programs using GTK+ may
-*** not work properly])
-  fi
-fi
-
-dnl Test for libpng
-  if test x$with_libpng != xno && test -z "$LIBPNG"; then
-    for l in libpng16 libpng15 libpng14 libpng12 libpng13 libpng10; do
-      AC_MSG_CHECKING(for $l)
-      if $PKG_CONFIG --exists $l ; then
-        AC_MSG_RESULT(yes)
-        PNG='png'
-        PNG_DEP_CFLAGS_PACKAGES=$l
-        LIBPNG=`$PKG_CONFIG --libs $l`
-        break
-      else
-        AC_MSG_RESULT(no)
-      fi
-    done
-    if test x$PNG != xpng; then
-      AC_MSG_RESULT(no)
-      AC_CHECK_LIB(png, png_read_info,
-        [AC_CHECK_HEADER(png.h,
-          png_ok=yes,
-          png_ok=no)],
-        AC_MSG_WARN(*** PNG loader will not be built (PNG library not found) ***), -lz -lm)
-      if test "$png_ok" = yes; then
-        AC_MSG_CHECKING([for png_structp in png.h])
-        AC_TRY_COMPILE([#include <png.h>],
-          [png_structp pp; png_infop info; png_colorp cmap; png_create_read_struct;],
-          png_ok=yes,
-          png_ok=no)
-        AC_MSG_RESULT($png_ok)
-        if test "$png_ok" = yes; then
-          PNG='png'; LIBPNG='-lpng -lz'
-        else
-          AC_MSG_WARN(*** PNG loader will not be built (PNG library is too old) ***)
-        fi
-      else
-       AC_MSG_WARN(*** PNG loader will not be built (PNG header file not found) ***)
-      fi
-    fi
-  fi
-
-  if test x$with_libpng != xno && test -z "$LIBPNG"; then
-     AC_MSG_ERROR([
-*** Checks for PNG loader failed. You can build without it by passing
-*** --without-libpng to configure but many programs using GTK+ will
-*** not work properly. The PNG loader is also needed if you are compiling
-*** from Git.])
-  fi
-
-dnl Test for libjasper
-  if test x$with_libjasper = xyes && test -z "$LIBJASPER"; then
-    AC_CHECK_LIB(jasper, jas_init, LIBJASPER=-ljasper, [], -ljpeg -lm)
-  fi
-
-  if test x$with_libjasper = xyes && test -z "$LIBJASPER"; then
-     AC_MSG_ERROR([
-*** Checks for JPEG2000 loader failed. You can build without it by passing
-*** --without-libjasper to configure])
-  fi
-
-AC_SUBST(LIBTIFF)
-AC_SUBST(LIBJPEG)
-AC_SUBST(LIBPNG)
-AC_SUBST(LIBJASPER)
-
-AM_CONDITIONAL(BUILD_DYNAMIC_MODULES, $dynworks)
-
-#
-# Allow building some or all gdk-pixbuf loaders included
-#
-AC_MSG_CHECKING(pixbuf loaders to build)
-
-dnl due to an autoconf bug, commas in the first arg to
-dnl AC_HELP_STRING cause problems.
-dnl AC_HELP_STRING([--with-included-loaders=LOADER1 LOADER2 ...],
-dnl                [build the specified loaders into gdk-pixbuf])
-AC_ARG_WITH(included_loaders,
-[  --with-included-loaders=LOADER1,LOADER2,...
-                          build the specified loaders into gdk-pixbuf])
-
-if $dynworks; then
-   :
-else
-   ## if the option was specified, leave it; otherwise disable included loaders
-   if test x$with_included_loaders = xno; then
-           with_included_loaders=yes
-   fi
-fi
-
-# Use the traditional png loader instead of the GDI+ one on Windows,
-# because some important apps like GIMP need to read and write
-# arbitrary tEXt chunks which doesn't seem to be possible through GDI+
-
-all_loaders="ani,icns,tga,png,pnm,xbm,xpm,qtif"
-if test x$with_libjasper = xyes; then
-  all_loaders="$all_loaders,jasper"
-fi
-if test x$os_win32 = xyes && test x$with_gdiplus != xno; then
-  # Skip PNG, see comment above
-  gdip_formats="bmp emf gif ico jpeg tiff wmf"
-  for f in $gdip_formats; do
-    all_loaders="$all_loaders,gdip-$f"
-  done
-else
-  all_loaders="$all_loaders,bmp,gif,ico,jpeg,tiff"
-fi
-included_loaders=""
-# If no loaders specified, include all
-if test "x$with_included_loaders" = xyes ; then
-  included_loaders="$all_loaders"
-else
-  included_loaders="$with_included_loaders"
-fi
-
-AC_MSG_RESULT($included_loaders)
-
-INCLUDED_LOADER_OBJ=
-INCLUDED_LOADER_DEFINE=
-
-IFS="${IFS=     }"; gtk_save_ifs="$IFS"; IFS=","
-for loader in $included_loaders; do
- if echo "$all_loaders" | egrep "(^|,)$loader(\$|,)" > /dev/null; then
-   :
- else
-   AC_MSG_ERROR([the specified loader $loader does not exist])
- fi
-
- loader_underscores=`echo $loader | sed -e 's/-/_/g'`
- INCLUDED_LOADER_OBJ="$INCLUDED_LOADER_OBJ libstatic-pixbufloader-$loader.la"
-
- # Don't bother defining separate -DINCLUDE_gdip_foo for each gdip-foo loader
- case $loader in
-   gdip-*) ;;
-   *) INCLUDED_LOADER_DEFINE="$INCLUDED_LOADER_DEFINE -DINCLUDE_$loader_underscores";;
- esac
- eval INCLUDE_$loader_underscores=yes
-done
-
-# Just define one -DINCLUDE_gdiplus for all the gdip-foo loaders
-# (except gdip-png, which isn't built at all)
-if test x"$INCLUDE_gdip_ico" = xyes; then
-  INCLUDED_LOADER_DEFINE="$INCLUDED_LOADER_DEFINE -DINCLUDE_gdiplus"
-fi
-
-IFS="$gtk_save_ifs"
-AC_SUBST(INCLUDED_LOADER_OBJ)
-AC_SUBST(INCLUDED_LOADER_DEFINE)
-
-AM_CONDITIONAL(INCLUDE_PNG, [test x"$INCLUDE_png" = xyes])
-AM_CONDITIONAL(INCLUDE_BMP, [test x"$INCLUDE_bmp" = xyes])
-AM_CONDITIONAL(INCLUDE_GIF, [test x"$INCLUDE_gif" = xyes])
-AM_CONDITIONAL(INCLUDE_ICO, [test x"$INCLUDE_ico" = xyes])
-AM_CONDITIONAL(INCLUDE_ANI, [test x"$INCLUDE_ani" = xyes])
-AM_CONDITIONAL(INCLUDE_JPEG, [test x"$INCLUDE_jpeg" = xyes])
-AM_CONDITIONAL(INCLUDE_PNM, [test x"$INCLUDE_pnm" = xyes])
-AM_CONDITIONAL(INCLUDE_TIFF, [test x"$INCLUDE_tiff" = xyes])
-AM_CONDITIONAL(INCLUDE_XPM, [test x"$INCLUDE_xpm" = xyes])
-AM_CONDITIONAL(INCLUDE_XBM, [test x"$INCLUDE_xbm" = xyes])
-AM_CONDITIONAL(INCLUDE_TGA, [test x"$INCLUDE_tga" = xyes])
-AM_CONDITIONAL(INCLUDE_ICNS, [test x"$INCLUDE_icns" = xyes])
-AM_CONDITIONAL(INCLUDE_JASPER, [test x"$INCLUDE_jasper" = xyes])
-AM_CONDITIONAL(INCLUDE_QTIF, [test x"$INCLUDE_qtif" = xyes])
-# As all GDI+ loaders are either built-in or not, arbitrarily just
-# check one of the variables here
-AM_CONDITIONAL(INCLUDE_GDIPLUS, [test x"$INCLUDE_gdip_ico" = xyes])
-
-if test x$gio_can_sniff = x; then
-  # Will not run on win32, so require shared-mime-info
-  PKG_CHECK_MODULES(SHARED_MIME_INFO, shared-mime-info)
-  AC_DEFINE(GDK_PIXBUF_USE_GIO_MIME, 1, [Define if gio can sniff image data])
-fi
-
-AM_CONDITIONAL(HAVE_TIFF, test "x$LIBTIFF" != x)
-AM_CONDITIONAL(HAVE_PNG, test "x$LIBPNG" != x)
-AM_CONDITIONAL(HAVE_JPEG, test "x$LIBJPEG" != x)
-AM_CONDITIONAL(HAVE_JASPER, test "x$LIBJASPER" != x)
-
-if $dynworks ; then
-  STATIC_LIB_DEPS=
-  if echo "$included_loaders" | egrep '(^|,)tiff($|,)' > /dev/null; then
-    STATIC_LIB_DEPS="$STATIC_LIB_DEPS $LIBTIFF"
-  fi
-  if echo "$included_loaders" | egrep '(^|,)jpeg($|,)' > /dev/null; then
-    STATIC_LIB_DEPS="$STATIC_LIB_DEPS $LIBJPEG"
-  fi
-  if echo "$included_loaders" | egrep '(^|,)png($|,)' > /dev/null; then
-    if test -z $PNG_DEP_CFLAGS_PACKAGES; then
-      STATIC_LIB_DEPS="$STATIC_LIB_DEPS $LIBPNG"
-    fi
-  fi
-  if echo "$included_loaders" | egrep '(^|,)jasper($|,)' > /dev/null; then
-    STATIC_LIB_DEPS="$STATIC_LIB_DEPS $LIBJASPER"
-  fi
-else
-  STATIC_LIB_DEPS="$LIBTIFF $LIBJPEG $LIBPNG $LIBJASPER"
-fi
-
-# Checks to see whether we should include mediaLib
-# support.
-#
-AC_CHECK_HEADER(sys/systeminfo.h,
-                AC_DEFINE(HAVE_SYS_SYSTEMINFO_H, 1,
-                          [Define to 1 if sys/systeminfo.h is available]))
-AC_CHECK_HEADER(sys/sysinfo.h,
-                AC_DEFINE(HAVE_SYS_SYSINFO_H, 1,
-                          [Define to 1 if sys/sysinfo.h is available]))
-
-AC_MSG_CHECKING(for mediaLib 2.3)
-use_mlib25=no
-# Check for a mediaLib 2.3 function since that is what the GTK+ mediaLib
-# patch requires.
-AC_CHECK_LIB(mlib, mlib_ImageSetStruct, use_mlib=yes, use_mlib=no)
-if test $use_mlib = yes; then
-    AC_DEFINE(USE_MEDIALIB, 1,
-              [Define to 1 if medialib is available and should be used])
-    MEDIA_LIB=-lmlib
-
-    AC_MSG_CHECKING(for mediaLib 2.5)
-    # Check for a mediaLib 2.5 function since that is what is needed for
-    # gdk_rgb_convert integration.
-    AC_CHECK_LIB(mlib, mlib_VideoColorRGBint_to_BGRAint, use_mlib25=yes, use_mlib25=no)
-    if test $use_mlib25 = yes; then
-        AC_DEFINE(USE_MEDIALIB25, 1,
-                  [Define to 1 if medialib 2.5 is available])
-    fi
-fi
-AM_CONDITIONAL(USE_MEDIALIB, test $use_mlib = yes)
-AM_CONDITIONAL(USE_MEDIALIB25, test $use_mlib25 = yes)
-
-# Checks to see if we should compile in MMX support (there will be
-# a runtime test when the code is actually run to see if it should
-# be used - this just checks if we can compile it.)
-#
-# This code is partially taken from Mesa
-#
-AC_MSG_CHECKING(for x86 platform)
-case $host_cpu in
-  i386|i486|i586|i686|i786|k6|k7)
-        use_x86_asm=yes
-        ;;
-   *)
-        use_x86_asm=no
-esac
-AC_MSG_RESULT($use_x86_asm)
-
-use_mmx_asm=no
-if test $use_x86_asm = yes; then
-    save_ac_ext=$ac_ext
-    ac_ext=S
-
-    AC_MSG_CHECKING(compiler support for MMX)
-    cp $srcdir/gdk-pixbuf/pixops/scale_line_22_33_mmx.S conftest.S
-    if AC_TRY_EVAL(ac_compile); then
-        use_mmx_asm=yes
-    fi
-
-    rm -rf conftest*
-
-    ac_ext=$save_ac_ext
-    if test $use_mmx_asm = yes; then
-      AC_DEFINE(USE_MMX, 1,
-                [Define to 1 if MMX is available and should be used])
-      AC_MSG_RESULT(yes)
-    else
-      AC_MSG_RESULT(no)
-    fi
-fi
-
-AM_CONDITIONAL(USE_MMX, test x$use_mmx_asm = xyes)
-
-AM_CONDITIONAL(CROSS_COMPILING, test $cross_compiling = yes)
-
-GDK_PIXBUF_PACKAGES="gmodule-no-export-2.0 gobject-2.0 gio-2.0"
-GDK_PIXBUF_EXTRA_LIBS="$STATIC_LIB_DEPS $LIBM $MEDIA_LIB"
-GDK_PIXBUF_EXTRA_CFLAGS=
-GDK_PIXBUF_DEP_LIBS="`$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES $PNG_DEP_CFLAGS_PACKAGES` $GDK_PIXBUF_EXTRA_LIBS"
-GDK_PIXBUF_DEP_CFLAGS="`$PKG_CONFIG --cflags  gthread-2.0 $GDK_PIXBUF_PACKAGES $PNG_DEP_CFLAGS_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS"
-
-AC_SUBST(PNG_DEP_CFLAGS_PACKAGES)
-AC_SUBST(GDK_PIXBUF_PACKAGES)
-AC_SUBST(GDK_PIXBUF_EXTRA_LIBS)
-AC_SUBST(GDK_PIXBUF_EXTRA_CFLAGS)
-AC_SUBST(GDK_PIXBUF_DEP_LIBS)
-AC_SUBST(GDK_PIXBUF_DEP_CFLAGS)
-
-###############
-# Check for X11
-###############
-
-GDK_PIXBUF_XLIB_PACKAGES=
-GDK_PIXBUF_XLIB_EXTRA_CFLAGS=
-GDK_PIXBUF_XLIB_EXTRA_LIBS=
-
-AC_ARG_WITH(x11,
-            [AC_HELP_STRING([--with-x11],
-                            [build X11 support])])
-
-if test x$with_x11 = xyes; then
-  AM_CONDITIONAL(USE_X11, true)
-  PKG_CHECK_MODULES(GDK_PIXBUF_XLIB_DEP, x11 gobject-2.0)
-else
-  AM_CONDITIONAL(USE_X11, false)
-fi
-
-################################################################
-# Strip -export-dynamic from the link lines of various libraries
-################################################################
-
-#
-# pkg-config --libs gmodule includes the "export_dynamic" flag,
-#  but this flag is only meaningful for executables. For libraries
-#  the effect is undefined; what it causes on Linux is that the
-#  export list from -export-symbols-regex is ignored and everything
-#  is exported
-#
-# We are using gmodule-no-export now, but I'm leaving the stripping
-# code in place for now, since pango and atk still require gmodule.
-export SED
-export_dynamic=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
-if test -n "$export_dynamic"; then
-  GDK_PIXBUF_DEP_LIBS=`echo $GDK_PIXBUF_DEP_LIBS | sed -e "s/$export_dynamic//"`
-fi
-
-##################################################
-# GObject introspection
-##################################################
-
-GOBJECT_INTROSPECTION_CHECK([0.9.3])
-
-##################################################
-# Checks for gtk-doc and docbook-tools
-##################################################
-
-GTK_DOC_CHECK([1.20], [--flavour=no-tmpl])
-
-AC_CHECK_PROG(DB2HTML, db2html, true, false)
-AM_CONDITIONAL(HAVE_DOCBOOK, $DB2HTML)
-
-AC_ARG_ENABLE(man,
-              [AC_HELP_STRING([--enable-man],
-                              [regenerate man pages from Docbook [default=no]])],enable_man=yes,
-              enable_man=no)
-
-if test "${enable_man}" != no; then
-  dnl
-  dnl Check for xsltproc
-  dnl
-  AC_PATH_PROG([XSLTPROC], [xsltproc])
-  if test -z "$XSLTPROC"; then
-    enable_man=no
-  fi
-fi
-
-AM_CONDITIONAL(ENABLE_MAN, test x$enable_man != xno)
-
-###################################################################
-# Check for -fvisibility=hidden to determine if we can do GNU-style
-# visibility attributes for symbol export control
-###################################################################
-GDK_PIXBUF_HIDDEN_VISIBILITY_CFLAGS=""
-case "$host" in
-  *-*-mingw*)
-    dnl on mingw32 we do -fvisibility=hidden and __declspec(dllexport)
-    AC_DEFINE([_GDK_PIXBUF_EXTERN], [__attribute__((visibility("default"))) __declspec(dllexport) extern],
-              [defines how to decorate public symbols while building])
-    CFLAGS="${CFLAGS} -fvisibility=hidden"
-    ;;
-  *)
-    dnl on other compilers, check if we can do -fvisibility=hidden
-    SAVED_CFLAGS="${CFLAGS}"
-    CFLAGS="-fvisibility=hidden"
-    AC_MSG_CHECKING([for -fvisibility=hidden compiler flag])
-    AC_TRY_COMPILE([], [return 0],
-                   AC_MSG_RESULT(yes)
-                   enable_fvisibility_hidden=yes,
-                   AC_MSG_RESULT(no)
-                   enable_fvisibility_hidden=no)
-    CFLAGS="${SAVED_CFLAGS}"
-
-    AS_IF([test "${enable_fvisibility_hidden}" = "yes"], [
-      AC_DEFINE([_GDK_PIXBUF_EXTERN], [__attribute__((visibility("default"))) extern],
-                [defines how to decorate public symbols while building])
-      GDK_PIXBUF_HIDDEN_VISIBILITY_CFLAGS="-fvisibility=hidden"
-    ])
-    ;;
-esac
-AC_SUBST(GDK_PIXBUF_HIDDEN_VISIBILITY_CFLAGS)
-
-
-##################################################
-# Check for -Bsymbolic-functions linker flag used
-# to avoid intra-library PLT jumps, if available.
-##################################################
-
-AC_ARG_ENABLE(Bsymbolic,
-              [AC_HELP_STRING([--disable-Bsymbolic],
-                              [avoid linking with -Bsymbolic])],,
-              [SAVED_LDFLAGS="${LDFLAGS}"
-               AC_MSG_CHECKING([for -Bsymbolic-functions linker flag])
-               LDFLAGS=-Wl,-Bsymbolic-functions
-               AC_TRY_LINK([], [int main (void) { return 0; }],
-                           AC_MSG_RESULT(yes)
-                           enable_Bsymbolic=yes,
-                           AC_MSG_RESULT(no)
-                           enable_Bsymbolic=no)
-               LDFLAGS="${SAVED_LDFLAGS}"])
-
-if test "x${enable_Bsymbolic}" = "xyes"; then
-  GDK_PIXBUF_LINK_FLAGS=-Wl,-Bsymbolic-functions
-fi
-
-AC_SUBST(GDK_PIXBUF_LINK_FLAGS)
-
-GLIB_TESTS
-
-AC_MSG_CHECKING([whether to build with gcov testing])
-AC_ARG_ENABLE([coverage],
-		AS_HELP_STRING([--enable-coverage],
-			[Whether to enable coverage testing ]),
-		[],
-		[enable_coverage=no])
-
-AC_MSG_RESULT([$enable_coverage])
-
-if test "$enable_coverage" = "yes"; then
-	if test "$GCC" != "yes"; then
-		AC_MSG_ERROR(Coverage testing requires GCC)
-	fi
-
-	AC_PATH_PROG(GCOV, gcov, no)
-	if test "$GCOV" = "no" ; then
-		AC_MSG_ERROR(gcov tool is not available)
-	fi
-
-	AC_PATH_PROG(LCOV, lcov, no)
-	if test "$LCOV" = "no" ; then
-		AC_MSG_ERROR(lcov tool is not installed)
-	fi
-
-	AC_PATH_PROG(GENHTML, genhtml, no)
-	if test "$GENHTML" = "no" ; then
-		AC_MSG_ERROR(lcov's genhtml tool is not installed)
-	fi
-
-	CFLAGS="$CFLAGS -O0 -g -fprofile-arcs -ftest-coverage"
-	LDFLAGS="$LDFLAGS -lgcov"
-fi
-
-AM_CONDITIONAL([WITH_COVERAGE], [test "$enable_coverage" = "yes"])
-AC_SUBST(LCOV)
-AC_SUBST(GCOV)
-AC_SUBST(GENHTML)
-
-#######################################################
-# Enable replacing the build-time prefix in the loaders
-# cache with the installation prefix on this machine
-# for relocatable packages such as Windows and OS X
-# applications and linux bundles
-#######################################################
-
-AC_MSG_CHECKING([whether to build with application bundle relocation support])
-AC_ARG_ENABLE([relocations],
-              AS_HELP_STRING([--enable-relocations],
-                             [Whether to build with application bundle relocation support]),
-              [],
-              [enable_relocations=no])
-
-AC_MSG_RESULT([$enable_relocations])
-
-if test "x$enable_relocations" = "xyes"; then
-  AC_DEFINE(GDK_PIXBUF_RELOCATABLE, 1,
-                  [Define to 1 to replace the build-time prefix in modules])
-fi
-
-##############################################
-# Check whether MSVC toolset is explicitly set
-##############################################
-AM_CONDITIONAL(MSVC_BASE_NO_TOOLSET_SET, [test x$MSVC_BASE_TOOLSET = x])
-AM_CONDITIONAL(MSVC_NO_TOOLSET_SET, [test x$MSVC_TOOLSET = x])
-
-##################################################
-# Output commands
-##################################################
-
-AC_CONFIG_FILES([
-Makefile
-gdk-pixbuf-2.0.pc
-gdk-pixbuf/Makefile
-gdk-pixbuf/gdk_pixbuf.rc
-gdk-pixbuf/gdk-pixbuf-features.h
-gdk-pixbuf/pixops/Makefile
-win32/Makefile
-win32/vs9/Makefile
-win32/vs9/gdk-pixbuf-version-paths.vsprops
-win32/vs10/Makefile
-win32/vs10/gdk-pixbuf-version-paths.props
-win32/vs11/Makefile
-win32/vs12/Makefile
-win32/vs14/Makefile
-win32/vs15/Makefile
-docs/Makefile
-docs/reference/Makefile
-docs/reference/gdk-pixbuf/Makefile
-docs/reference/gdk-pixbuf/version.xml
-po/Makefile.in
-tests/Makefile
-thumbnailer/Makefile
-contrib/Makefile
-contrib/gdk-pixbuf-xlib/Makefile
-contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.0.pc
-config.h.win32
-])
-
-AC_OUTPUT
diff --git a/contrib/Makefile.am b/contrib/Makefile.am
deleted file mode 100644
index adff28464..000000000
--- a/contrib/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-SUBDIRS =
-if USE_X11
-SUBDIRS += gdk-pixbuf-xlib
-endif
-
--include $(top_srcdir)/git.mk
diff --git a/contrib/gdk-pixbuf-xlib/Makefile.am b/contrib/gdk-pixbuf-xlib/Makefile.am
deleted file mode 100644
index 3a65935ab..000000000
--- a/contrib/gdk-pixbuf-xlib/Makefile.am
+++ /dev/null
@@ -1,40 +0,0 @@
-if PLATFORM_WIN32
-no_undefined = -no-undefined
-endif
-
-lib_LTLIBRARIES=libgdk_pixbuf_xlib-2.0.la
-
-AM_CPPFLAGS = \
-	-I$(top_srcdir) -I$(top_builddir) 	\
-	-I$(top_srcdir)/gdk-pixbuf 		\
-	-I$(top_srcdir)/contrib 		\
-	$(GDK_PIXBUF_XLIB_DEP_CFLAGS)
-
-libgdk_pixbuf_xlib_2_0_la_LDFLAGS =         \
-	-export-dynamic						\
-	$(no_undefined)						\
-	-version-info $(LT_VERSION_INFO)
-
-libgdk_pixbuf_xlib_2_0_la_LIBADD = \
-        $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GDK_PIXBUF_API_VERSION).la \
-	$(GDK_PIXBUF_XLIB_DEP_LIBS)
-
-libgdk_pixbuf_xlib_2_0_la_SOURCES =         \
-	gdk-pixbuf-xlib-private.h	\
-        gdk-pixbuf-xlib.c               \
-        gdk-pixbuf-xlib-render.c        \
-        gdk-pixbuf-xlib-drawable.c      \
-        gdk-pixbuf-xlibrgb.c
-
-libgdk_pixbuf_xlibincludedir=$(includedir)/gdk-pixbuf-2.0/gdk-pixbuf-xlib
-
-libgdk_pixbuf_xlibinclude_HEADERS =         		\
-        gdk-pixbuf-xlib.h               	    	\
-        gdk-pixbuf-xlibrgb.h
-
-pkgconfigdir   = $(libdir)/pkgconfig
-pkgconfig_DATA = gdk-pixbuf-xlib-2.0.pc
-
-EXTRA_DIST = gdk-pixbuf-xlib-2.0.pc.in
-
--include $(top_srcdir)/git.mk
diff --git a/docs/Makefile.am b/docs/Makefile.am
deleted file mode 100644
index 034926c59..000000000
--- a/docs/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-SUBDIRS = reference
-
--include $(top_srcdir)/git.mk
diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
deleted file mode 100644
index 3248edfb3..000000000
--- a/docs/reference/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-SUBDIRS = gdk-pixbuf
-
-GITIGNOREFILES = */*.1
-
--include $(top_srcdir)/git.mk
diff --git a/docs/reference/gdk-pixbuf/Makefile.am b/docs/reference/gdk-pixbuf/Makefile.am
deleted file mode 100644
index 652da275d..000000000
--- a/docs/reference/gdk-pixbuf/Makefile.am
+++ /dev/null
@@ -1,122 +0,0 @@
-AUTOMAKE_OPTIONS = 1.6
-
-# The name of the module.
-DOC_MODULE=gdk-pixbuf
-
-# The top-level SGML file.
-DOC_MAIN_SGML_FILE=gdk-pixbuf.xml
-
-# Extra options to supply to gtkdoc-scan
-SCAN_OPTIONS= \
-	--source-dir=../../../contrib/gdk-pixbuf-xlib \
-	--deprecated-guards="GDK_PIXBUF_ENABLE_BROKEN|GDK_PIXBUF_DISABLE_DEPRECATED"
-
-# The directory containing the source code. Relative to $(srcdir)
-DOC_SOURCE_DIR=../../../gdk-pixbuf
-
-# Used for dependencies
-HFILE_GLOB=$(top_srcdir)/gdk-pixbuf/*.h $(top_srcdir)/contrib/gdk-pixbuf-xlib/*.h
-CFILE_GLOB=$(top_srcdir)/gdk-pixbuf/*.c $(top_srcdir)/contrib/gdk-pixbuf-xlib/*.c
-
-# Header files to ignore when scanning
-IGNORE_HFILES=				\
-	pixops				\
-	gdk-pixbuf-alias.h		\
-	gdk-pixbuf-marshal.h		\
-	gdk-pixbuf-private.h		\
-	gdk-pixbuf-xlib-private.h	\
-	io-gif-animation.h		\
-	io-ani-animation.h		\
-	xpm-color-table.h		\
-	test-images.h
-
-AM_CPPFLAGS = 				\
-	-I$(top_srcdir) 		\
-	-I$(top_builddir) 		\
-	$(GDK_PIXBUF_DEBUG_FLAGS)	\
-	$(GDK_PIXBUF_DEP_CFLAGS)
-
-GTKDOC_LIBS = \
-	$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GDK_PIXBUF_API_VERSION).la \
-	$(GDK_PIXBUF_DEP_LIBS)
-
-
-# Extra options to supply to gtkdoc-mkdb
-MKDB_OPTIONS= \
-	--main-sgml-file=$(DOC_MAIN_SGML_FILE) 	\
-	--source-dir=../../../contrib/gdk-pixbuf-xlib \
-	--output-format=xml 			\
-	--name-space=gdk_pixbuf
-
-# Extra SGML files that are included by DOC_MAIN_SGML_FILE
-content_files =				\
-	version.xml			\
-	gdk-pixbuf-from-drawables.xml	\
-	gdk-pixbuf-rendering.xml	\
-	gdk-pixbuf.xml			\
-	gdk-pixbuf-csource.xml		\
-	gdk-pixbuf-query-loaders.xml
-
-# Images to copy into HTML directory
-HTML_IMAGES = composite.png
-
-# Extra options to supply to gtkdoc-fixref
-FIXXREF_OPTIONS= --extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/gobject \
-	--extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/glib
-
-
-include $(top_srcdir)/gtk-doc.make
-
-# Other files to distribute
-EXTRA_DIST += version.xml.in \
-	composite.png \
-	composite.dia \
-	apple-red-1a.png \
-	apple-red-2c.png \
-	gnome-gmush-1.png
-
-########################################################################
-
-man_MANS = 				\
-	gdk-pixbuf-csource.1		\
-	gdk-pixbuf-query-loaders.1
-
-if ENABLE_MAN
-
-XSLTPROC_FLAGS = \
-        --nonet \
-        --stringparam man.output.quietly 1 \
-        --stringparam funcsynopsis.style ansi \
-        --stringparam man.th.extra1.suppress 1 \
-        --stringparam man.authors.section.enabled 0 \
-        --stringparam man.copyright.section.enabled 0
-
-.xml.1:
-	$(AM_V_GEN) $(XSLTPROC) $(XSLTPROC_FLAGS) http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
-
-dist-local-check-mans-enabled:
-	if grep "Man generation disabled" $(man_MANS) >/dev/null; then $(RM) $(man_MANS); fi
-
-else
-
-$(man_MANS):
-	echo Man generation disabled.  Creating dummy $@.  Configure with --enable-man to enable it.
-	echo Man generation disabled.  Remove this file, configure with --enable-man, and rebuild > $@
-
-
-dist-local-check-mans-enabled:
-	echo "*** --enable-man must be used in order to make dist"
-	false
-
-endif
-
-MAINTAINERCLEANFILES = $(man_MANS) $(BUILT_SOURCES)
-
-EXTRA_DIST += $(man_MANS)
-
-dist-hook-local: dist-local-check-mans-enabled all-local
-
-gtk-docs-clean: clean
-	cd $(srcdir) && rm -rf xml html
-
--include $(top_srcdir)/git.mk
diff --git a/gdk-pixbuf/Makefile.am b/gdk-pixbuf/Makefile.am
deleted file mode 100644
index d5901dcdf..000000000
--- a/gdk-pixbuf/Makefile.am
+++ /dev/null
@@ -1,730 +0,0 @@
--include $(INTROSPECTION_MAKEFILE)
-
-INTROSPECTION_GIRS =
-INTROSPECTION_SCANNER_ENV = CC="$(CC)"
-
-SUBDIRS = pixops
-
-if PLATFORM_WIN32
-no_undefined = -no-undefined
-endif
-
-if OS_WIN32
-
-gdk_pixbuf_win32_res = gdk_pixbuf-win32-res.o
-gdk_pixbuf_win32_res_ldflag = -Wl,gdk_pixbuf-win32-res.o
-
-libole32 = -lole32
-
-gdk_pixbuf-win32-res.o : gdk_pixbuf.rc
-	$(AM_V_GEN)$(WINDRES) gdk_pixbuf.rc $@
-endif
-
-lib_LTLIBRARIES = libgdk_pixbuf-2.0.la
-
-loaderdir = $(libdir)/gdk-pixbuf-2.0/$(GDK_PIXBUF_BINARY_VERSION)/loaders
-
-module_libs = libgdk_pixbuf-$(GDK_PIXBUF_API_VERSION).la $(GDK_PIXBUF_DEP_LIBS)
-
-#
-# The PNG loader
-#
-libstatic_pixbufloader_png_la_SOURCES = io-png.c
-libpixbufloader_png_la_SOURCES = io-png.c
-libpixbufloader_png_la_LDFLAGS = -avoid-version -module $(no_undefined)
-libpixbufloader_png_la_LIBADD = $(LIBPNG) $(module_libs)
-
-#
-# The BMP loader
-#
-libstatic_pixbufloader_bmp_la_SOURCES = io-bmp.c
-libpixbufloader_bmp_la_SOURCES = io-bmp.c
-libpixbufloader_bmp_la_LDFLAGS = -avoid-version -module $(no_undefined)
-libpixbufloader_bmp_la_LIBADD = $(module_libs)
-
-#
-# The GIF loader
-#
-libstatic_pixbufloader_gif_la_SOURCES = io-gif.c io-gif-animation.c io-gif-animation.h
-libpixbufloader_gif_la_SOURCES = io-gif.c io-gif-animation.c io-gif-animation.h
-libpixbufloader_gif_la_LDFLAGS = -avoid-version -module $(no_undefined)
-libpixbufloader_gif_la_LIBADD = $(module_libs)
-
-#
-# The ICO loader
-#
-libstatic_pixbufloader_ico_la_SOURCES = io-ico.c
-libpixbufloader_ico_la_SOURCES = io-ico.c
-libpixbufloader_ico_la_LDFLAGS = -avoid-version -module $(no_undefined)
-libpixbufloader_ico_la_LIBADD = $(module_libs)
-
-#
-# The ANI loader
-#
-libstatic_pixbufloader_ani_la_SOURCES = io-ani.c io-ani-animation.c io-ani-animation.h
-libpixbufloader_ani_la_SOURCES = io-ani.c io-ani-animation.c io-ani-animation.h
-libpixbufloader_ani_la_LDFLAGS = -avoid-version -module $(no_undefined)
-libpixbufloader_ani_la_LIBADD = $(module_libs)
-
-#
-# The JPEG loader
-#
-libstatic_pixbufloader_jpeg_la_SOURCES = io-jpeg.c
-libpixbufloader_jpeg_la_SOURCES = io-jpeg.c
-libpixbufloader_jpeg_la_LDFLAGS = -avoid-version -module $(no_undefined)
-libpixbufloader_jpeg_la_LIBADD = $(LIBJPEG) $(module_libs)
-
-#
-# The PNM loader
-#
-libstatic_pixbufloader_pnm_la_SOURCES = io-pnm.c
-libpixbufloader_pnm_la_SOURCES = io-pnm.c
-libpixbufloader_pnm_la_LDFLAGS = -avoid-version -module $(no_undefined)
-libpixbufloader_pnm_la_LIBADD = $(module_libs)
-
-#
-# The TIFF loader
-#
-libstatic_pixbufloader_tiff_la_SOURCES = io-tiff.c
-libpixbufloader_tiff_la_SOURCES = io-tiff.c
-libpixbufloader_tiff_la_LDFLAGS = -avoid-version -module $(no_undefined)
-libpixbufloader_tiff_la_LIBADD = $(LIBTIFF) $(module_libs)
-
-#
-# The XPM loader
-#
-libstatic_pixbufloader_xpm_la_SOURCES = io-xpm.c
-libpixbufloader_xpm_la_SOURCES = io-xpm.c
-libpixbufloader_xpm_la_LDFLAGS = -avoid-version -module $(no_undefined)
-libpixbufloader_xpm_la_LIBADD = $(module_libs)
-
-#
-# The XBM loader
-#
-libstatic_pixbufloader_xbm_la_SOURCES = io-xbm.c
-libpixbufloader_xbm_la_SOURCES = io-xbm.c
-libpixbufloader_xbm_la_LDFLAGS = -avoid-version -module $(no_undefined)
-libpixbufloader_xbm_la_LIBADD = $(module_libs)
-
-#
-# The TGA loader
-#
-libstatic_pixbufloader_tga_la_SOURCES = io-tga.c gdk-pixbuf-buffer-queue.c
-libpixbufloader_tga_la_SOURCES = io-tga.c gdk-pixbuf-buffer-queue.c
-libpixbufloader_tga_la_LDFLAGS = -avoid-version -module $(no_undefined)
-libpixbufloader_tga_la_LIBADD = $(module_libs)
-
-#
-# The .icns loader
-#
-libstatic_pixbufloader_icns_la_SOURCES = io-icns.c
-libpixbufloader_icns_la_SOURCES = io-icns.c
-libpixbufloader_icns_la_LDFLAGS = -avoid-version -module $(no_undefined)
-libpixbufloader_icns_la_LIBADD = $(module_libs)
-
-#
-# The JPEG2000 loader
-#
-libstatic_pixbufloader_jasper_la_SOURCES = io-jasper.c
-libpixbufloader_jasper_la_SOURCES = io-jasper.c
-libpixbufloader_jasper_la_LDFLAGS = -avoid-version -module $(no_undefined)
-libpixbufloader_jasper_la_LIBADD = $(LIBJASPER) $(module_libs)
-
-#
-# The QTIF loader
-#
-libstatic_pixbufloader_qtif_la_SOURCES = io-qtif.c
-libpixbufloader_qtif_la_SOURCES = io-qtif.c
-libpixbufloader_qtif_la_LDFLAGS = -avoid-version -module $(no_undefined)
-libpixbufloader_qtif_la_LIBADD = $(module_libs)
-
-if BUILD_GDIPLUS_LOADERS
-
-# MinGW doesn't come with any import library for gdiplus.dll, so
-# create a partial one that's enough for our use.
-
-libgdiplus = libgdiplus.dll.a
-gdiplus_ldflag = -Wl,$(libgdiplus)
-
-libgdiplus.dll.a: gdiplus.def
-	$(AM_V_GEN)$(DLLTOOL) --kill-at --dllname gdiplus.dll --input-def $(srcdir)/gdiplus.def --output-lib $@
-
-if INCLUDE_GDIPLUS
-
-# When building the GDI+ loader statically, we put the "common" objects
-# only in one of the archives to avoid duplicate definitions
-
-STATIC_GDIPLUS_LIBS = \
-	libstatic-pixbufloader-gdip-ico.la \
-	libstatic-pixbufloader-gdip-wmf.la \
-	libstatic-pixbufloader-gdip-emf.la \
-	libstatic-pixbufloader-gdip-bmp.la \
-	libstatic-pixbufloader-gdip-gif.la \
-	libstatic-pixbufloader-gdip-jpeg.la \
-	libstatic-pixbufloader-gdip-tiff.la
-
-libstatic_pixbufloader_gdip_ico_la_SOURCES = 	\
-	io-gdip-native.h		\
-	io-gdip-propertytags.h		\
-	io-gdip-utils.h			\
-	io-gdip-utils.c			\
-	io-gdip-animation.c		\
-	io-gdip-animation.h		\
-	io-gdip-ico.c
-
-libstatic_pixbufloader_gdip_wmf_la_SOURCES = 	\
-	io-gdip-wmf.c
-
-libstatic_pixbufloader_gdip_emf_la_SOURCES = 	\
-	io-gdip-emf.c
-
-libstatic_pixbufloader_gdip_bmp_la_SOURCES = 	\
-	io-gdip-bmp.c
-
-libstatic_pixbufloader_gdip_gif_la_SOURCES = 	\
-	io-gdip-gif.c
-
-libstatic_pixbufloader_gdip_jpeg_la_SOURCES = 	\
-	io-gdip-jpeg.c
-
-libstatic_pixbufloader_gdip_tiff_la_SOURCES = 	\
-	io-gdip-tiff.c
-
-else
-
-GDIPLUS_LIBS = \
-	libpixbufloader-gdip-ico.la \
-	libpixbufloader-gdip-wmf.la \
-	libpixbufloader-gdip-emf.la \
-	libpixbufloader-gdip-bmp.la \
-	libpixbufloader-gdip-gif.la \
-	libpixbufloader-gdip-jpeg.la \
-	libpixbufloader-gdip-tiff.la
-
-libpixbufloader_gdip_ico_la_LDFLAGS = -avoid-version -module -no-undefined $(gdiplus_ldflag)
-libpixbufloader_gdip_ico_la_SOURCES = 	\
-	io-gdip-native.h		\
-	io-gdip-propertytags.h		\
-	io-gdip-utils.h			\
-	io-gdip-utils.c			\
-	io-gdip-animation.c		\
-	io-gdip-animation.h		\
-	io-gdip-ico.c
-libpixbufloader_gdip_ico_la_LIBADD = $(module_libs) $(libole32)
-
-libpixbufloader_gdip_wmf_la_LDFLAGS = -avoid-version -module -no-undefined $(gdiplus_ldflag)
-libpixbufloader_gdip_wmf_la_SOURCES = 	\
-	io-gdip-native.h		\
-	io-gdip-propertytags.h		\
-	io-gdip-utils.h			\
-	io-gdip-utils.c			\
-	io-gdip-animation.c		\
-	io-gdip-animation.h		\
-	io-gdip-wmf.c
-libpixbufloader_gdip_wmf_la_LIBADD = $(module_libs) $(libole32)
-
-libpixbufloader_gdip_emf_la_LDFLAGS = -avoid-version -module -no-undefined $(gdiplus_ldflag)
-libpixbufloader_gdip_emf_la_SOURCES = 	\
-	io-gdip-native.h		\
-	io-gdip-propertytags.h		\
-	io-gdip-utils.h			\
-	io-gdip-utils.c			\
-	io-gdip-animation.c		\
-	io-gdip-animation.h		\
-	io-gdip-emf.c
-libpixbufloader_gdip_emf_la_LIBADD = $(module_libs) $(libole32)
-
-libpixbufloader_gdip_bmp_la_LDFLAGS = -avoid-version -module -no-undefined $(gdiplus_ldflag)
-libpixbufloader_gdip_bmp_la_SOURCES = 	\
-	io-gdip-native.h		\
-	io-gdip-propertytags.h		\
-	io-gdip-utils.h			\
-	io-gdip-utils.c			\
-	io-gdip-animation.c		\
-	io-gdip-animation.h		\
-	io-gdip-bmp.c
-libpixbufloader_gdip_bmp_la_LIBADD = $(module_libs) $(libole32)
-
-libpixbufloader_gdip_gif_la_LDFLAGS = -avoid-version -module -no-undefined $(gdiplus_ldflag)
-libpixbufloader_gdip_gif_la_SOURCES = 	\
-	io-gdip-native.h		\
-	io-gdip-propertytags.h		\
-	io-gdip-utils.h			\
-	io-gdip-utils.c			\
-	io-gdip-animation.c		\
-	io-gdip-animation.h		\
-	io-gdip-gif.c
-libpixbufloader_gdip_gif_la_LIBADD = $(module_libs) $(libole32)
-
-libpixbufloader_gdip_jpeg_la_LDFLAGS = -avoid-version -module -no-undefined $(gdiplus_ldflag)
-libpixbufloader_gdip_jpeg_la_SOURCES = 	\
-	io-gdip-native.h		\
-	io-gdip-propertytags.h		\
-	io-gdip-utils.h			\
-	io-gdip-utils.c			\
-	io-gdip-animation.c		\
-	io-gdip-animation.h		\
-	io-gdip-jpeg.c
-libpixbufloader_gdip_jpeg_la_LIBADD = $(module_libs) $(libole32)
-
-libpixbufloader_gdip_tiff_la_LDFLAGS = -avoid-version -module -no-undefined $(gdiplus_ldflag)
-libpixbufloader_gdip_tiff_la_SOURCES = 	\
-	io-gdip-native.h		\
-	io-gdip-propertytags.h		\
-	io-gdip-utils.h			\
-	io-gdip-utils.c			\
-	io-gdip-animation.c		\
-	io-gdip-animation.h		\
-	io-gdip-tiff.c
-libpixbufloader_gdip_tiff_la_LIBADD = $(module_libs) $(libole32)
-
-endif
-
-else
-
-# Loaders that aren't built if we build the GDI+ loader
-
-if INCLUDE_BMP
-STATIC_BMP_LIB = libstatic-pixbufloader-bmp.la
-else
-BMP_LIB = libpixbufloader-bmp.la
-endif
-
-if INCLUDE_GIF
-STATIC_GIF_LIB = libstatic-pixbufloader-gif.la
-else
-GIF_LIB = libpixbufloader-gif.la
-endif
-
-if INCLUDE_ICO
-STATIC_ICO_LIB = libstatic-pixbufloader-ico.la
-else
-ICO_LIB = libpixbufloader-ico.la
-endif
-
-if HAVE_JPEG
-if INCLUDE_JPEG
-STATIC_JPEG_LIB = libstatic-pixbufloader-jpeg.la
-else
-JPEG_LIB = libpixbufloader-jpeg.la
-endif
-endif
-
-if HAVE_TIFF
-if INCLUDE_TIFF
-STATIC_TIFF_LIB = libstatic-pixbufloader-tiff.la
-else
-TIFF_LIB = libpixbufloader-tiff.la
-endif
-endif
-
-# End of loaders not built if building GDI+ loader
-endif
-
-if HAVE_PNG
-if INCLUDE_PNG
-STATIC_PNG_LIB = libstatic-pixbufloader-png.la
-else
-PNG_LIB = libpixbufloader-png.la
-endif
-endif
-
-if INCLUDE_ANI
-STATIC_ANI_LIB = libstatic-pixbufloader-ani.la
-else
-ANI_LIB = libpixbufloader-ani.la
-endif
-
-if INCLUDE_PNM
-STATIC_PNM_LIB = libstatic-pixbufloader-pnm.la
-else
-PNM_LIB = libpixbufloader-pnm.la
-endif
-
-if INCLUDE_XPM
-STATIC_XPM_LIB = libstatic-pixbufloader-xpm.la
-else
-XPM_LIB = libpixbufloader-xpm.la
-endif
-
-if INCLUDE_XBM
-STATIC_XBM_LIB = libstatic-pixbufloader-xbm.la
-else
-XBM_LIB = libpixbufloader-xbm.la
-endif
-
-if INCLUDE_TGA
-STATIC_TGA_LIB = libstatic-pixbufloader-tga.la
-else
-TGA_LIB = libpixbufloader-tga.la
-endif
-
-if INCLUDE_ICNS
-STATIC_ICNS_LIB = libstatic-pixbufloader-icns.la
-else
-ICNS_LIB = libpixbufloader-icns.la
-endif
-
-if HAVE_JASPER
-if INCLUDE_JASPER
-STATIC_JASPER_LIB = libstatic-pixbufloader-jasper.la
-else
-JASPER_LIB = libpixbufloader-jasper.la
-endif
-endif
-
-if INCLUDE_QTIF
-STATIC_QTIF_LIB = libstatic-pixbufloader-qtif.la
-else
-QTIF_LIB = libpixbufloader-qtif.la
-endif
-
-if BUILD_DYNAMIC_MODULES
-
-loader_LTLIBRARIES = 	\
-	$(PNG_LIB)	\
-	$(BMP_LIB)	\
-	$(GIF_LIB)	\
-	$(ICO_LIB)	\
-	$(ANI_LIB)	\
-	$(JPEG_LIB)	\
-	$(PNM_LIB)	\
-	$(TIFF_LIB)	\
-	$(XPM_LIB)	\
-	$(XBM_LIB)	\
-	$(TGA_LIB)	\
-	$(ICNS_LIB)	\
-	$(JASPER_LIB)	\
-	$(QTIF_LIB)	\
-	$(GDIPLUS_LIBS)
-
-
-endif
-
-noinst_LTLIBRARIES =		\
-	$(STATIC_PIXDATA_LIB)	\
-	$(STATIC_PNG_LIB)	\
-	$(STATIC_BMP_LIB)	\
-	$(STATIC_GIF_LIB)	\
-	$(STATIC_ICO_LIB)	\
-	$(STATIC_ANI_LIB)	\
-	$(STATIC_JPEG_LIB)	\
-	$(STATIC_PNM_LIB)	\
-	$(STATIC_TIFF_LIB)	\
-	$(STATIC_XPM_LIB)	\
-	$(STATIC_XBM_LIB)	\
-	$(STATIC_TGA_LIB)	\
-	$(STATIC_ICNS_LIB)	\
-	$(STATIC_JASPER_LIB)	\
-	$(STATIC_QTIF_LIB)	\
-	$(STATIC_GDIPLUS_LIBS)
-
-builtin_objs = @INCLUDED_LOADER_OBJ@ $(STATIC_PIXDATA_LIB)
-
-DEPS = libgdk_pixbuf-$(GDK_PIXBUF_API_VERSION).la
-AM_CPPFLAGS = \
-	-DG_LOG_DOMAIN=\"GdkPixbuf\"					\
-	-DGDK_PIXBUF_COMPILATION					\
-	-I$(top_srcdir) -I$(top_builddir) 				\
-	-I$(top_srcdir)/gdk-pixbuf 					\
-	-I$(top_builddir)/gdk-pixbuf 					\
-	-DGDK_PIXBUF_LOCALEDIR=\"$(localedir)\"				\
-	-DGDK_PIXBUF_LIBDIR=\"$(libdir)\"				\
-	-DGDK_PIXBUF_BINARY_VERSION=\"$(GDK_PIXBUF_BINARY_VERSION)\"	\
-	-DGDK_PIXBUF_PREFIX=\"$(prefix)\"				\
-	$(INCLUDED_LOADER_DEFINE) 					\
-	$(GDK_PIXBUF_DEBUG_FLAGS)					\
-	$(GDK_PIXBUF_DEP_CFLAGS)					\
-	-DGDK_PIXBUF_ENABLE_BACKEND					\
-	-DPIXBUF_LIBDIR=\"$(loaderdir)\"				\
-	-DBUILT_MODULES_DIR=\"$(srcdir)/.libs\"
-
-LDADDS = libgdk_pixbuf-$(GDK_PIXBUF_API_VERSION).la $(GDK_PIXBUF_DEP_LIBS)
-
-noinst_PROGRAMS = test-gdk-pixbuf
-test_gdk_pixbuf_LDADD = $(LDADDS)
-
-bin_PROGRAMS = gdk-pixbuf-csource gdk-pixbuf-pixdata gdk-pixbuf-query-loaders
-gdk_pixbuf_csource_SOURCES = gdk-pixbuf-csource.c
-gdk_pixbuf_csource_LDADD = $(LDADDS)
-
-gdk_pixbuf_pixdata_SOURCES = gdk-pixbuf-pixdata.c
-gdk_pixbuf_pixdata_LDADD = $(LDADDS)
-
-gdk_pixbuf_query_loaders_DEPENDENCIES = $(DEPS)
-gdk_pixbuf_query_loaders_LDADD = $(LDADDS)
-
-gdk_pixbuf_query_loaders_SOURCES = queryloaders.c
-
-
-#
-# The GdkPixBuf library
-#
-libgdk_pixbufincludedir = $(includedir)/gdk-pixbuf-2.0/gdk-pixbuf
-libgdk_pixbuf_2_0_la_SOURCES =   \
-	gdk-pixbuf.c		 \
-	gdk-pixbuf-animation.c	 \
-	gdk-pixbuf-data.c	 \
-	gdk-pixbuf-io.c		 \
-	gdk-pixbuf-loader.c	 \
-	gdk-pixbuf-scale.c	 \
-	gdk-pixbuf-simple-anim.c \
-	gdk-pixbuf-scaled-anim.c \
-	gdk-pixbuf-util.c	 \
-	gdk-pixdata.c		 \
-	gdk-pixbuf-enum-types.c  \
-	gdk-pixbuf-marshal.c
-
-libgdk_pixbuf_2_0_la_CFLAGS =			\
-	$(AM_CPPFLAGS)				\
-	$(GDK_PIXBUF_HIDDEN_VISIBILITY_CFLAGS)
-
-libgdk_pixbuf_2_0_la_LDFLAGS = \
-	$(GDK_PIXBUF_LINK_FLAGS)		\
-	$(gdk_pixbuf_win32_res_ldflag)		\
-	-version-info $(LT_VERSION_INFO)	\
-	$(LIBTOOL_EXPORT_OPTIONS)		\
-	$(no_undefined)				\
-	$(gdiplus_ldflag)
-
-
-libgdk_pixbuf_2_0_la_LIBADD = pixops/libpixops.la $(builtin_objs) $(GDK_PIXBUF_DEP_LIBS) $(libole32)
-libgdk_pixbuf_2_0_la_DEPENDENCIES = pixops/libpixops.la $(builtin_objs) $(gdk_pixbuf_def) $(gdk_pixbuf_win32_res) $(libgdiplus)
-
-gdk_pixbuf_headers = 			\
-	gdk-pixbuf.h			\
-	gdk-pixbuf-autocleanups.h	\
-	gdk-pixbuf-core.h		\
-	gdk-pixbuf-transform.h		\
-	gdk-pixbuf-io.h			\
-	gdk-pixbuf-animation.h		\
-	gdk-pixbuf-simple-anim.h	\
-	gdk-pixbuf-loader.h
-
-libgdk_pixbufinclude_HEADERS =  	\
-	$(gdk_pixbuf_headers)		\
-	gdk-pixbuf-enum-types.h		\
-	gdk-pixbuf-marshal.h		\
-	gdk-pixbuf-features.h		\
-	gdk-pixdata.h			\
-	gdk-pixbuf-macros.h
-
-noinst_HEADERS = 		\
-	gdk-pixbuf-private.h	\
-	gdk-pixbuf-buffer-queue-private.h \
-	gdk-pixbuf-scaled-anim.h \
-	xpm-color-table.h
-
-BUILT_SOURCES = 		\
-	gdk-pixbuf-enum-types.h \
-	gdk-pixbuf-enum-types.c \
-	gdk-pixbuf-marshal.h 	\
-	gdk-pixbuf-marshal.c	\
-	gdk-pixbuf-features.h
-
-CLEANFILES =
-MAINTAINERCLEANFILES = 		\
-	gdk-pixbuf-enum-types.h \
-	gdk-pixbuf-enum-types.c \
-	gdk-pixbuf-marshal.h 	\
-	gdk-pixbuf-marshal.c 	\
-	loaders.cache
-
-#
-# gdk-pixbuf-enum-types.h
-#
-gdk-pixbuf-enum-types.h: s-enum-types-h
-	@true
-
-s-enum-types-h: @REBUILD@ $(gdk_pixbuf_headers) gdk-pixbuf-enum-types.h.template
-	$(AM_V_GEN)( cd $(srcdir) && $(GLIB_MKENUMS) --template gdk-pixbuf-enum-types.h.template \
-		$(gdk_pixbuf_headers) ) > tmp-gdk-pixbuf-enum-types.h \
-	&& (cmp -s tmp-gdk-pixbuf-enum-types.h gdk-pixbuf-enum-types.h || cp tmp-gdk-pixbuf-enum-types.h gdk-pixbuf-enum-types.h ) \
-	&& rm -f tmp-gdk-pixbuf-enum-types.h \
-	&& echo timestamp > $(@F)
-
-CLEANFILES += tmp-gdk-pixbuf-enum-types.h
-MAINTAINERCLEANFILES += s-enum-types-h
-
-#
-# gdk-pixbuf-enum-types.c
-#
-gdk-pixbuf-enum-types.c: @REBUILD@ $(gdk_pixbuf_headers) gdk-pixbuf-enum-types.c.template
-	$(AM_V_GEN)(cd $(srcdir) && $(GLIB_MKENUMS) --template gdk-pixbuf-enum-types.c.template \
-		  $(gdk_pixbuf_headers)) > gdk-pixbuf-enum-types.c
-
-#
-# gdk-pixbuf-marshal.h
-#
-gdk-pixbuf-marshal.h: @REBUILD@ stamp-gdk-pixbuf-marshal.h
-	@true
-
-stamp-gdk-pixbuf-marshal.h: @REBUILD@ $(srcdir)/gdk-pixbuf-marshal.list
-	$(AM_V_GEN)echo "#if !defined(GDK_PIXBUF_DISABLE_DEPRECATED) || defined(GDK_PIXBUF_COMPILATION)" > xgen-gmh \
-	&& $(GLIB_GENMARSHAL) --prefix=_gdk_pixbuf_marshal $(srcdir)/gdk-pixbuf-marshal.list --header >> xgen-gmh \
-	&& echo "#endif /* !GDK_PIXBUF_DISABLE_DEPRECATED || GDK_PIXBUF_COMPILATION */" >> xgen-gmh \
-	&& (cmp -s xgen-gmh gdk-pixbuf-marshal.h || cp xgen-gmh gdk-pixbuf-marshal.h) \
-	&& rm -f xgen-gmh xgen-gmh~ \
-	&& echo timestamp > $(@F)
-
-CLEANFILES += xgen-gmh
-MAINTAINERCLEANFILES += stamp-gdk-pixbuf-marshal.h
-
-#
-# gdk-pixbuf-marshal.c
-#
-$(srcdir)/gdk-pixbuf-marshal.c: @REBUILD@ $(srcdir)/gdk-pixbuf-marshal.list
-	$(AM_V_GEN)(echo -e "#include <gdk-pixbuf/gdk-pixbuf.h>\n" | $(GLIB_GENMARSHAL) --prefix=_gdk_pixbuf_marshal $(srcdir)/gdk-pixbuf-marshal.list --body ) >> xgen-gmc \
-	&& cp xgen-gmc gdk-pixbuf-marshal.c \
-	&& rm -f xgen-gmc xgen-gmc~
-
-CLEANFILES += xgen-gmc
-
-# if srcdir!=builddir, clean out maintainer-clean files from builddir
-# this allows dist to pass.
-distclean-local:
-	if test $(srcdir) != .; then \
-	  rm -f $(MAINTAINERCLEANFILES); \
-	fi
-
-EXTRA_DIST =					\
-        gdk-pixbuf-csource.1			\
-	makefile.msc				\
-	gdk_pixbuf.rc				\
-	gdk-pixbuf-marshal.c			\
-	gdk-pixbuf-marshal.list			\
-	gdk-pixbuf-enum-types.c.template	\
-	gdk-pixbuf-enum-types.h.template	\
-	gen-color-table.pl			\
-	gdiplus.def				\
-	fallback-c89.c
-
-# ---------- MSVC Items ------------------
-
-MSVCPROJS = gdk-pixbuf
-
-gdk_pixbuf_FILES = \
-	$(libgdk_pixbuf_2_0_la_SOURCES)		\
-	$(libstatic_pixbufloader_ani_la_SOURCES)	\
-	$(libstatic_pixbufloader_icns_la_SOURCES)	\
-	$(libstatic_pixbufloader_pnm_la_SOURCES)	\
-	$(libstatic_pixbufloader_png_la_SOURCES)	\
-	$(libstatic_pixbufloader_qtif_la_SOURCES)	\
-	$(libstatic_pixbufloader_tga_la_SOURCES)	\
-	$(libstatic_pixbufloader_xpm_la_SOURCES)	\
-	$(libstatic_pixbufloader_xbm_la_SOURCES)
-
-gdk_pixbuf_EXCLUDES = gdkpdummy
-
-gdk_pixbuf_HEADERS_DIR = $(libgdk_pixbufincludedir)
-gdk_pixbuf_HEADERS_INST = $(libgdk_pixbufinclude_HEADERS)
-gdk_pixbuf_HEADERS_EXCLUDES = gdkpdummy
-
-include $(top_srcdir)/win32/Makefile.msvcproj
-
-if HAVE_INTROSPECTION
-
-GdkPixbuf-2.0.gir: libgdk_pixbuf-2.0.la Makefile
-GdkPixbuf_2_0_gir_SCANNERFLAGS = --warn-all --identifier-prefix=Gdk --c-include="gdk-pixbuf/gdk-pixbuf.h"
-GdkPixbuf_2_0_gir_EXPORT_PACKAGES = gdk-pixbuf-2.0
-GdkPixbuf_2_0_gir_INCLUDES = GModule-2.0 Gio-2.0
-GdkPixbuf_2_0_gir_LIBS = libgdk_pixbuf-2.0.la
-GdkPixbuf_2_0_gir_CFLAGS = \
-	-DGDK_PIXBUF_COMPILATION					\
-	-I$(top_builddir) -I$(top_srcdir) 				\
-	-I$(top_srcdir)/gdk-pixbuf 					\
-	-I$(top_builddir)/gdk-pixbuf 					\
-	$(GDK_PIXBUF_DEP_CFLAGS)
-GdkPixbuf_2_0_gir_FILES = \
-    $(libgdk_pixbufinclude_HEADERS) \
-    $(libgdk_pixbuf_2_0_la_SOURCES)
-INTROSPECTION_GIRS += GdkPixbuf-2.0.gir
-
-girdir = $(datadir)/gir-1.0
-gir_DATA = $(INTROSPECTION_GIRS)
-
-typelibsdir = $(libdir)/girepository-1.0
-typelibs_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
-
-CLEANFILES += $(gir_DATA) $(typelibs_DATA)
-
-# --- MSVC Introspection Items ---
-
-MSVC_INTROSPECT_GIRS = GdkPixbuf-2.0.gir
-
-MSVC_INTROSPECTION_INTERMEDIATE_ITEMS = \
-	$(top_builddir)/win32/GdkPixbuf-2.0.gir.msvc.introspect	\
-	$(top_builddir)/win32/GdkPixbuf_2_0_gir_list
-
-GdkPixbuf_2_0_gir_MSVC_INCLUDE_GIRS = $(GdkPixbuf_2_0_gir_INCLUDES)
-GdkPixbuf_2_0_gir_MSVC_EXPORT_PACKAGES = $(GdkPixbuf_2_0_gir_EXPORT_PACKAGES)
-GdkPixbuf_2_0_gir_MSVC_LIBS = gdk_pixbuf-2.0
-GdkPixbuf_2_0_gir_MSVC_FILES = $(GdkPixbuf_2_0_gir_FILES)
-
-GdkPixbuf_2_0_gir_MSVC_CFLAGS =		\
-	-DGDK_PIXBUF_COMPILATION	\
-	-I..				\
-	-I../gdk-pixbuf
-
-GdkPixbuf_2_0_gir_MSVC_SCANNERFLAGS = $(GdkPixbuf_2_0_gir_SCANNERFLAGS)
-
-include $(top_srcdir)/win32/Makefile.msvc-introspection
-else
-MSVC_INTROSPECTION_INTERMEDIATE_ITEMS =
-endif
-
-dist-hook:	\
-	$(top_builddir)/win32/vs9/gdk-pixbuf.vcproj	\
-	$(top_builddir)/win32/vs9/gdk-pixbuf.headers	\
-	$(MSVC_INTROSPECTION_INTERMEDIATE_ITEMS)
-
-if CROSS_COMPILING
-RUN_QUERY_LOADER_TEST=false
-else
-RUN_QUERY_LOADER_TEST=test -z "$(DESTDIR)"
-endif
-
-# Running this if cross compiling or if DESTDIR is set is going to
-# not work at all, so skip it
-# We use install-data-hook here to workaround a bug in automake and/or libtool
-# that makes the install target for the loader libraries a dependency on
-# install-data-am, and not install-exec-am. We need to ensure this gets run
-# after the libraries are installed in their final locations.
-install-data-hook:
-	@if $(RUN_QUERY_LOADER_TEST) ; then \
-	  $(mkinstalldirs) $(DESTDIR)$(libdir)/gdk-pixbuf-2.0/$(GDK_PIXBUF_BINARY_VERSION) ; \
-	  $(top_builddir)/gdk-pixbuf/gdk-pixbuf-query-loaders$(EXEEXT) > $(DESTDIR)$(libdir)/gdk-pixbuf-2.0/$(GDK_PIXBUF_BINARY_VERSION)/loaders.cache ; \
-	else \
-	  echo "***" ; \
-	  echo "*** Warning: loaders.cache not built" ; \
-	  echo "***" ; \
-	  echo "*** Generate this file manually on host" ; \
-	  echo "*** system using gdk-pixbuf-query-loaders" ; \
-	  echo "***" ; \
-	fi
-
-uninstall-local:
-	rm -f $(DESTDIR)$(libdir)/gdk-pixbuf-2.0/$(GDK_PIXBUF_BINARY_VERSION)/loaders.cache
-
-if CROSS_COMPILING
-else
-all-local: loaders.cache
-endif
-
-if BUILD_DYNAMIC_MODULES
-loaders.cache: $(loader_LTLIBRARIES) gdk-pixbuf-query-loaders$(EXEEXT)
-	LOADERS=`echo libpixbufloader-*.la` ; \
-	if test "x$$LOADERS" != 'xlibpixbufloader-*.la' ; then \
-          echo "Writing a loaders.cache file to use when running examples before installing gdk-pixbuf."; \
-	  $(top_builddir)/gdk-pixbuf/gdk-pixbuf-query-loaders$(EXEEXT) $$LOADERS > ./loaders.cache ;\
-	else \
-          echo "No dynamic modules found; will use only static modules for uninstalled example programs."; \
-	  touch loaders.cache; \
-	fi
-else
-loaders.cache:
-	echo "No dynamic modules found; will use only static modules for uninstalled example programs."; \
-	touch loaders.cache;
-endif
-
--include $(top_srcdir)/git.mk
diff --git a/gdk-pixbuf/pixops/Makefile.am b/gdk-pixbuf/pixops/Makefile.am
deleted file mode 100644
index eb1fef473..000000000
--- a/gdk-pixbuf/pixops/Makefile.am
+++ /dev/null
@@ -1,32 +0,0 @@
-noinst_LTLIBRARIES = libpixops.la
-
-AM_CPPFLAGS = \
-	-I$(top_srcdir) -I$(top_builddir) 	\
-	$(GTK_DEBUG_FLAGS)			\
-	$(GDK_PIXBUF_DEP_CFLAGS)
-
-noinst_PROGRAMS = timescale
-
-timescale_SOURCES = timescale.c
-timescale_LDADD = libpixops.la $(GLIB_LIBS) $(GDK_PIXBUF_DEP_LIBS)
-
-if USE_MMX
-mmx_sources =				\
-	have_mmx.S			\
-	scale_line_22_33_mmx.S 		\
-	composite_line_22_4a4_mmx.S 	\
-	composite_line_color_22_4a4_mmx.S
-endif
-
-libpixops_la_SOURCES =  		\
-	pixops.c			\
-	pixops.h			\
-	pixops-internal.h		\
-	$(mmx_sources)
-
-EXTRA_DIST =				\
-	DETAILS				\
-	pixbuf-transform-math.ltx	\
-	makefile.msc
-
--include $(top_srcdir)/git.mk
diff --git a/git.mk b/git.mk
deleted file mode 100644
index 5ab41bab3..000000000
--- a/git.mk
+++ /dev/null
@@ -1,187 +0,0 @@
-# git.mk
-#
-# Copyright 2009, Red Hat, Inc.
-# Written by Behdad Esfahbod
-#
-# 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.
-#
-# The canonical source for this file is pango/git.mk, or whereever the
-# header of pango/git.mk suggests in the future.
-#
-# To use in your project, import this file in your git repo's toplevel,
-# then do "make -f git.mk".  This modifies all Makefile.am files in
-# your project to include git.mk.
-#
-# This enables automatic .gitignore generation.  If you need to ignore
-# more files, add them to the GITIGNOREFILES variable in your Makefile.am.
-# But think twice before doing that.  If a file has to be in .gitignore,
-# chances are very high that it's a generated file and should be in one
-# of MOSTLYCLEANFILES, CLEANFILES, DISTCLEANFILES, or MAINTAINERCLEANFILES.
-#
-# The only case that you need to manually add a file to GITIGNOREFILES is
-# when remove files in one of mostlyclean-local, clean-local, distclean-local,
-# or maintainer-clean-local.
-#
-# Note that for files like editor backup, etc, there are better places to
-# ignore them.  See "man gitignore".
-#
-# If "make maintainer-clean" removes the files but they are not recognized
-# by this script (that is, if "git status" shows untracked files still), send
-# me the output of "git status" as well as your Makefile.am and Makefile for
-# the directories involved.
-#
-# For a list of toplevel files that should be in MAINTAINERCLEANFILES, see
-# pango/Makefile.am.
-#
-# Don't EXTRA_DIST this file.  It is supposed to only live in git clones,
-# not tarballs.  It serves no useful purpose in tarballs and clutters the
-# build dir.
-#
-# This file knows how to handle autoconf, automake, libtool, gtk-doc,
-# gnome-doc-utils, intltool.
-#
-#
-# KNOWN ISSUES:
-#
-# - Recursive configure doesn't work as $(top_srcdir)/git.mk inside the
-#   submodule doesn't find us.  If you have configure.{in,ac} files in
-#   subdirs, add a proxy git.mk file in those dirs that simply does:
-#   "include $(top_srcdir)/../git.mk".  Add more ..'s to your taste.
-#   And add those files to git.  See vte/gnome-pty-helper/git.mk for
-#   example.
-#
-
-git-all: git-mk-install
-
-git-mk-install:
-	@echo Installing git makefile
-	@any_failed=; find $(top_srcdir) -name Makefile.am | while read x; do \
-		if grep 'include .*/git.mk' $$x >/dev/null; then \
-			echo $$x already includes git.mk; \
-		else \
-			failed=; \
-			echo "Updating $$x"; \
-			{ cat $$x; \
-			  echo ''; \
-			  echo '-include $$(top_srcdir)/git.mk'; \
-			} > $$x.tmp || failed=1; \
-			if test x$$failed = x; then \
-				mv $$x.tmp $$x || failed=1; \
-			fi; \
-			if test x$$failed = x; then : else \
-				echo Failed updating $$x; >&2 \
-				any_failed=1; \
-			fi; \
-	fi; done; test -z "$$any_failed"
-
-.PHONY: git-all git-mk-install
-
-
-### .gitignore generation
-
-$(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
-	$(AM_V_GEN) \
-	{ \
-		if test "x$(DOC_MODULE)" = x -o "x$(DOC_MAIN_SGML_FILE)" = x; then :; else \
-			for x in \
-				$(DOC_MODULE)-decl-list.txt \
-				$(DOC_MODULE)-decl.txt \
-				tmpl/$(DOC_MODULE)-unused.sgml \
-				"tmpl/*.bak" \
-				xml html \
-			; do echo /$$x; done; \
-		fi; \
-		if test "x$(DOC_MODULE)" = x -o "x$(DOC_LINGUAS)" = x; then :; else \
-			for x in \
-				$(_DOC_C_DOCS) \
-				$(_DOC_LC_DOCS) \
-				$(_DOC_OMF_ALL) \
-				$(_DOC_DSK_ALL) \
-				$(_DOC_HTML_ALL) \
-				$(_DOC_POFILES) \
-				"*/.xml2po.mo" \
-				"*/*.omf.out" \
-			; do echo /$$x; done; \
-		fi; \
-		if test -f $(srcdir)/po/Makefile.in.in; then \
-			for x in \
-				po/Makefile.in.in \
-				po/Makefile.in \
-				po/Makefile \
-				po/POTFILES \
-				po/stamp-it \
-				po/.intltool-merge-cache \
-				"po/*.gmo" \
-				"po/*.mo" \
-				po/$(GETTEXT_PACKAGE).pot \
-				intltool-extract.in \
-				intltool-merge.in \
-				intltool-update.in \
-			; do echo /$$x; done; \
-		fi; \
-		if test -f $(srcdir)/configure; then \
-			for x in \
-				autom4te.cache \
-				configure \
-				config.h \
-				stamp-h1 \
-				libtool \
-				config.lt \
-			; do echo /$$x; done; \
-		fi; \
-		for x in \
-			.gitignore \
-			$(GITIGNOREFILES) \
-			$(CLEANFILES) \
-			$(PROGRAMS) \
-			$(check_PROGRAMS) \
-			$(EXTRA_PROGRAMS) \
-			$(LTLIBRARIES) \
-			so_locations \
-			.libs _libs \
-			$(MOSTLYCLEANFILES) \
-			"*.$(OBJEXT)" \
-			"*.lo" \
-			$(DISTCLEANFILES) \
-			$(am__CONFIG_DISTCLEAN_FILES) \
-			$(CONFIG_CLEAN_FILES) \
-			TAGS ID GTAGS GRTAGS GSYMS GPATH tags \
-			"*.tab.c" \
-			$(MAINTAINERCLEANFILES) \
-			$(BUILT_SOURCES) \
-			$(DEPDIR) \
-			Makefile \
-			Makefile.in \
-			"*.orig" \
-			"*.rej" \
-			"*.bak" \
-			"*~" \
-			".*.sw[nop]" \
-		; do echo /$$x; done; \
-	} | \
-	sed "s@^/`echo "$(srcdir)" | sed 's/\(.\)/[\1]/g'`/@/@" | \
-	sed 's@/[.]/@/@g' | \
-	LC_ALL=C sort | uniq > $@.tmp && \
-	mv $@.tmp $@;
-
-all: $(srcdir)/.gitignore gitignore-recurse-maybe
-gitignore-recurse-maybe:
-	@if test "x$(SUBDIRS)" = "x$(DIST_SUBDIRS)"; then :; else \
-		$(MAKE) $(AM_MAKEFLAGS) gitignore-recurse; \
-	fi;
-gitignore-recurse:
-	@for subdir in $(DIST_SUBDIRS); do \
-	  case " $(SUBDIRS) " in \
-	    *" $$subdir "*) :;; \
-	    *) test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) .gitignore gitignore-recurse || echo "Skipping $$subdir");; \
-	  esac; \
-	done
-gitignore: $(srcdir)/.gitignore gitignore-recurse
-
-maintainer-clean: gitignore-clean
-gitignore-clean:
-	-rm -f $(srcdir)/.gitignore
-
-.PHONY: gitignore-clean gitignore gitignore-recurse gitignore-recurse-maybe
diff --git a/glib-tap.mk b/glib-tap.mk
deleted file mode 100644
index 016cb914f..000000000
--- a/glib-tap.mk
+++ /dev/null
@@ -1,135 +0,0 @@
-# GLIB - Library of useful C routines
-
-TESTS_ENVIRONMENT= \
-	G_TEST_SRCDIR="$(abs_srcdir)" 		\
-	G_TEST_BUILDDIR="$(abs_builddir)" 	\
-	G_DEBUG=gc-friendly 			\
-	MALLOC_CHECK_=2 			\
-	MALLOC_PERTURB_=$$(($${RANDOM:-256} % 256))
-LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) $(top_srcdir)/tap-driver.sh
-LOG_COMPILER = $(top_srcdir)/tap-test
-
-NULL =
-
-# initialize variables for unconditional += appending
-BUILT_SOURCES =
-BUILT_EXTRA_DIST =
-CLEANFILES = *.log *.trs
-DISTCLEANFILES =
-MAINTAINERCLEANFILES =
-EXTRA_DIST =
-TESTS =
-
-installed_test_LTLIBRARIES =
-installed_test_PROGRAMS =
-installed_test_SCRIPTS =
-nobase_installed_test_DATA =
-
-noinst_LTLIBRARIES =
-noinst_PROGRAMS =
-noinst_SCRIPTS =
-noinst_DATA =
-
-check_LTLIBRARIES =
-check_PROGRAMS =
-check_SCRIPTS =
-check_DATA =
-
-# We support a fairly large range of possible variables.  It is expected that all types of files in a test suite
-# will belong in exactly one of the following variables.
-#
-# First, we support the usual automake suffixes, but in lowercase, with the customary meaning:
-#
-#   test_programs, test_scripts, test_data, test_ltlibraries
-#
-# The above are used to list files that are involved in both uninstalled and installed testing.  The
-# test_programs and test_scripts are taken to be actual testcases and will be run as part of the test suite.
-# Note that _data is always used with the nobase_ automake variable name to ensure that installed test data is
-# installed in the same way as it appears in the package layout.
-#
-# In order to mark a particular file as being only for one type of testing, use 'installed' or 'uninstalled',
-# like so:
-#
-#   installed_test_programs, uninstalled_test_programs
-#   installed_test_scripts, uninstalled_test_scripts
-#   installed_test_data, uninstalled_test_data
-#   installed_test_ltlibraries, uninstalled_test_ltlibraries
-#
-# Additionally, we support 'extra' infixes for programs and scripts.  This is used for support programs/scripts
-# that should not themselves be run as testcases (but exist to be used from other testcases):
-#
-#   test_extra_programs, installed_test_extra_programs, uninstalled_test_extra_programs
-#   test_extra_scripts, installed_test_extra_scripts, uninstalled_test_extra_scripts
-#
-# Additionally, for _scripts and _data, we support the customary dist_ prefix so that the named script or data
-# file automatically end up in the tarball.
-#
-#   dist_test_scripts, dist_test_data, dist_test_extra_scripts
-#   dist_installed_test_scripts, dist_installed_test_data, dist_installed_test_extra_scripts
-#   dist_uninstalled_test_scripts, dist_uninstalled_test_data, dist_uninstalled_test_extra_scripts
-#
-# Note that no file is automatically disted unless it appears in one of the dist_ variables.  This follows the
-# standard automake convention of not disting programs scripts or data by default.
-#
-# test_programs, test_scripts, uninstalled_test_programs and uninstalled_test_scripts (as well as their disted
-# variants) will be run as part of the in-tree 'make check'.  These are all assumed to be runnable under
-# gtester.  That's a bit strange for scripts, but it's possible.
-
-TESTS += $(test_programs) $(test_scripts) $(uninstalled_test_programs) $(uninstalled_test_scripts) \
-         $(dist_test_scripts) $(dist_uninstalled_test_scripts)
-
-# Note: build even the installed-only targets during 'make check' to ensure that they still work.
-# We need to do a bit of trickery here and manage disting via EXTRA_DIST instead of using dist_ prefixes to
-# prevent automake from mistreating gmake functions like $(wildcard ...) and $(addprefix ...) as if they were
-# filenames, including removing duplicate instances of the opening part before the space, eg. '$(addprefix'.
-all_test_programs     = $(test_programs) $(uninstalled_test_programs) $(installed_test_programs) \
-                        $(test_extra_programs) $(uninstalled_test_extra_programs) $(installed_test_extra_programs)
-all_test_scripts      = $(test_scripts) $(uninstalled_test_scripts) $(installed_test_scripts) \
-                        $(test_extra_scripts) $(uninstalled_test_extra_scripts) $(installed_test_extra_scripts)
-all_dist_test_scripts = $(dist_test_scripts) $(dist_uninstalled_test_scripts) $(dist_installed_test_scripts) \
-                        $(dist_test_extra_scripts) $(dist_uninstalled_test_extra_scripts) $(dist_installed_test_extra_scripts)
-all_test_scripts     += $(all_dist_test_scripts)
-EXTRA_DIST           += $(all_dist_test_scripts)
-all_test_data         = $(test_data) $(uninstalled_test_data) $(installed_test_data)
-all_dist_test_data    = $(dist_test_data) $(dist_uninstalled_test_data) $(dist_installed_test_data)
-all_test_data        += $(all_dist_test_data)
-EXTRA_DIST           += $(all_dist_test_data)
-all_test_ltlibs       = $(test_ltlibraries) $(uninstalled_test_ltlibraries) $(installed_test_ltlibraries)
-
-if ENABLE_ALWAYS_BUILD_TESTS
-noinst_LTLIBRARIES += $(all_test_ltlibs)
-noinst_PROGRAMS += $(all_test_programs)
-noinst_SCRIPTS += $(all_test_scripts)
-noinst_DATA += $(all_test_data)
-else
-check_LTLIBRARIES += $(all_test_ltlibs)
-check_PROGRAMS += $(all_test_programs)
-check_SCRIPTS += $(all_test_scripts)
-check_DATA += $(all_test_data)
-endif
-
-if ENABLE_INSTALLED_TESTS
-installed_test_PROGRAMS += $(test_programs) $(installed_test_programs) \
-                          $(test_extra_programs) $(installed_test_extra_programs)
-installed_test_SCRIPTS += $(test_scripts) $(installed_test_scripts) \
-                          $(test_extra_scripts) $(test_installed_extra_scripts)
-installed_test_SCRIPTS += $(dist_test_scripts) $(dist_test_extra_scripts) \
-                          $(dist_installed_test_scripts) $(dist_installed_test_extra_scripts)
-nobase_installed_test_DATA += $(test_data) $(installed_test_data)
-nobase_installed_test_DATA += $(dist_test_data) $(dist_installed_test_data)
-installed_test_LTLIBRARIES += $(test_ltlibraries) $(installed_test_ltlibraries)
-installed_testcases = $(test_programs) $(installed_test_programs) \
-                      $(test_scripts) $(installed_test_scripts) \
-                      $(dist_test_scripts) $(dist_installed_test_scripts)
-
-installed_test_meta_DATA = $(installed_testcases:=.test)
-
-%.test: %$(EXEEXT) Makefile
-	$(AM_V_GEN) (echo '[Test]' > $@.tmp; \
-	echo 'Type=session' >> $@.tmp; \
-	echo 'Exec=$(installed_testdir)/$(notdir $<) --tap' >> $@.tmp; \
-	echo 'Output=TAP' >> $@.tmp; \
-	mv $@.tmp $@)
-
-CLEANFILES += $(installed_test_meta_DATA)
-endif
diff --git a/m4/.gitignore b/m4/.gitignore
deleted file mode 100644
index 78d4f1ce8..000000000
--- a/m4/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-*.m4
-# We maintain these files in our tree
-!introspection.m4
-!glibtests.m4
diff --git a/m4/glibtests.m4 b/m4/glibtests.m4
deleted file mode 100644
index 7d5920a43..000000000
--- a/m4/glibtests.m4
+++ /dev/null
@@ -1,28 +0,0 @@
-dnl GLIB_TESTS
-dnl
-
-AC_DEFUN([GLIB_TESTS],
-[
-  AC_ARG_ENABLE(installed-tests,
-                AS_HELP_STRING([--enable-installed-tests],
-                               [Enable installation of some test cases]),
-                [case ${enableval} in
-                  yes) ENABLE_INSTALLED_TESTS="1"  ;;
-                  no)  ENABLE_INSTALLED_TESTS="" ;;
-                  *) AC_MSG_ERROR([bad value ${enableval} for --enable-installed-tests]) ;;
-                 esac])
-  AM_CONDITIONAL([ENABLE_INSTALLED_TESTS], test "$ENABLE_INSTALLED_TESTS" = "1")
-  AC_ARG_ENABLE(always-build-tests,
-                AS_HELP_STRING([--enable-always-build-tests],
-                               [Enable always building tests during 'make all']),
-                [case ${enableval} in
-                  yes) ENABLE_ALWAYS_BUILD_TESTS="1"  ;;
-                  no)  ENABLE_ALWAYS_BUILD_TESTS="" ;;
-                  *) AC_MSG_ERROR([bad value ${enableval} for --enable-always-build-tests]) ;;
-                 esac])
-  AM_CONDITIONAL([ENABLE_ALWAYS_BUILD_TESTS], test "$ENABLE_ALWAYS_BUILD_TESTS" = "1")
-  if test "$ENABLE_INSTALLED_TESTS" = "1"; then
-    AC_SUBST(installed_test_metadir, [${datadir}/installed-tests/]AC_PACKAGE_NAME)
-    AC_SUBST(installed_testdir, [${libexecdir}/installed-tests/]AC_PACKAGE_NAME)
-  fi
-])
diff --git a/m4/introspection.m4 b/m4/introspection.m4
deleted file mode 100644
index 589721c5a..000000000
--- a/m4/introspection.m4
+++ /dev/null
@@ -1,94 +0,0 @@
-dnl -*- mode: autoconf -*-
-dnl Copyright 2009 Johan Dahlin
-dnl
-dnl This file is free software; the author(s) gives unlimited
-dnl permission to copy and/or distribute it, with or without
-dnl modifications, as long as this notice is preserved.
-dnl
-
-# serial 1
-
-m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL],
-[
-    AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
-    AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
-    AC_BEFORE([LT_INIT],[$0])dnl setup libtool first
-
-    dnl enable/disable introspection
-    m4_if([$2], [require],
-    [dnl
-        enable_introspection=yes
-    ],[dnl
-        AC_ARG_ENABLE(introspection,
-                  AS_HELP_STRING([--enable-introspection[=@<:@no/auto/yes@:>@]],
-                                 [Enable introspection for this build]),, 
-                                 [enable_introspection=auto])
-    ])dnl
-
-    AC_MSG_CHECKING([for gobject-introspection])
-
-    dnl presence/version checking
-    AS_CASE([$enable_introspection],
-    [no], [dnl
-        found_introspection="no (disabled, use --enable-introspection to enable)"
-    ],dnl
-    [yes],[dnl
-        PKG_CHECK_EXISTS([gobject-introspection-1.0],,
-                         AC_MSG_ERROR([gobject-introspection-1.0 is not installed]))
-        PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1],
-                         found_introspection=yes,
-                         AC_MSG_ERROR([You need to have gobject-introspection >= $1 installed to build AC_PACKAGE_NAME]))
-    ],dnl
-    [auto],[dnl
-        PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], found_introspection=yes, found_introspection=no)
-    ],dnl
-    [dnl	
-        AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @<:@no/auto/yes@:>@])
-    ])dnl
-
-    AC_MSG_RESULT([$found_introspection])
-
-    INTROSPECTION_SCANNER=
-    INTROSPECTION_COMPILER=
-    INTROSPECTION_GENERATE=
-    INTROSPECTION_GIRDIR=
-    INTROSPECTION_TYPELIBDIR=
-    if test "x$found_introspection" = "xyes"; then
-       INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
-       INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
-       INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
-       INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
-       INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
-       INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0`
-       INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0`
-       INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection
-    fi
-    AC_SUBST(INTROSPECTION_SCANNER)
-    AC_SUBST(INTROSPECTION_COMPILER)
-    AC_SUBST(INTROSPECTION_GENERATE)
-    AC_SUBST(INTROSPECTION_GIRDIR)
-    AC_SUBST(INTROSPECTION_TYPELIBDIR)
-    AC_SUBST(INTROSPECTION_CFLAGS)
-    AC_SUBST(INTROSPECTION_LIBS)
-    AC_SUBST(INTROSPECTION_MAKEFILE)
-
-    AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes")
-])
-
-
-dnl Usage:
-dnl   GOBJECT_INTROSPECTION_CHECK([minimum-g-i-version])
-
-AC_DEFUN([GOBJECT_INTROSPECTION_CHECK],
-[
-  _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1])
-])
-
-dnl Usage:
-dnl   GOBJECT_INTROSPECTION_REQUIRE([minimum-g-i-version])
-
-
-AC_DEFUN([GOBJECT_INTROSPECTION_REQUIRE],
-[
-  _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1], [require])
-])
diff --git a/tap-driver.sh b/tap-driver.sh
deleted file mode 100755
index 19aa531de..000000000
--- a/tap-driver.sh
+++ /dev/null
@@ -1,652 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2011-2013 Free Software Foundation, Inc.
-#
-# 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, 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 <http://www.gnu.org/licenses/>.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# This file is maintained in Automake, please report
-# bugs to <bug-automake@gnu.org> or send patches to
-# <automake-patches@gnu.org>.
-
-scriptversion=2011-12-27.17; # UTC
-
-# Make unconditional expansion of undefined variables an error.  This
-# helps a lot in preventing typo-related bugs.
-set -u
-
-me=tap-driver.sh
-
-fatal ()
-{
-  echo "$me: fatal: $*" >&2
-  exit 1
-}
-
-usage_error ()
-{
-  echo "$me: $*" >&2
-  print_usage >&2
-  exit 2
-}
-
-print_usage ()
-{
-  cat <<END
-Usage:
-  tap-driver.sh --test-name=NAME --log-file=PATH --trs-file=PATH
-                [--expect-failure={yes|no}] [--color-tests={yes|no}]
-                [--enable-hard-errors={yes|no}] [--ignore-exit]
-                [--diagnostic-string=STRING] [--merge|--no-merge]
-                [--comments|--no-comments] [--] TEST-COMMAND
-The \`--test-name', \`--log-file' and \`--trs-file' options are mandatory.
-END
-}
-
-# TODO: better error handling in option parsing (in particular, ensure
-# TODO: $log_file, $trs_file and $test_name are defined).
-test_name= # Used for reporting.
-log_file=  # Where to save the result and output of the test script.
-trs_file=  # Where to save the metadata of the test run.
-expect_failure=0
-color_tests=0
-merge=0
-ignore_exit=0
-comments=0
-diag_string='#'
-while test $# -gt 0; do
-  case $1 in
-  --help) print_usage; exit $?;;
-  --version) echo "$me $scriptversion"; exit $?;;
-  --test-name) test_name=$2; shift;;
-  --log-file) log_file=$2; shift;;
-  --trs-file) trs_file=$2; shift;;
-  --color-tests) color_tests=$2; shift;;
-  --expect-failure) expect_failure=$2; shift;;
-  --enable-hard-errors) shift;; # No-op.
-  --merge) merge=1;;
-  --no-merge) merge=0;;
-  --ignore-exit) ignore_exit=1;;
-  --comments) comments=1;;
-  --no-comments) comments=0;;
-  --diagnostic-string) diag_string=$2; shift;;
-  --) shift; break;;
-  -*) usage_error "invalid option: '$1'";;
-  esac
-  shift
-done
-
-test $# -gt 0 || usage_error "missing test command"
-
-case $expect_failure in
-  yes) expect_failure=1;;
-    *) expect_failure=0;;
-esac
-
-if test $color_tests = yes; then
-  init_colors='
-    color_map["red"]="" # Red.
-    color_map["grn"]="" # Green.
-    color_map["lgn"]="" # Light green.
-    color_map["blu"]="" # Blue.
-    color_map["mgn"]="" # Magenta.
-    color_map["std"]=""     # No color.
-    color_for_result["ERROR"] = "mgn"
-    color_for_result["PASS"]  = "grn"
-    color_for_result["XPASS"] = "red"
-    color_for_result["FAIL"]  = "red"
-    color_for_result["XFAIL"] = "lgn"
-    color_for_result["SKIP"]  = "blu"'
-else
-  init_colors=''
-fi
-
-# :; is there to work around a bug in bash 3.2 (and earlier) which
-# does not always set '$?' properly on redirection failure.
-# See the Autoconf manual for more details.
-:;{
-  (
-    # Ignore common signals (in this subshell only!), to avoid potential
-    # problems with Korn shells.  Some Korn shells are known to propagate
-    # to themselves signals that have killed a child process they were
-    # waiting for; this is done at least for SIGINT (and usually only for
-    # it, in truth).  Without the `trap' below, such a behaviour could
-    # cause a premature exit in the current subshell, e.g., in case the
-    # test command it runs gets terminated by a SIGINT.  Thus, the awk
-    # script we are piping into would never seen the exit status it
-    # expects on its last input line (which is displayed below by the
-    # last `echo $?' statement), and would thus die reporting an internal
-    # error.
-    # For more information, see the Autoconf manual and the threads:
-    # <http://lists.gnu.org/archive/html/bug-autoconf/2011-09/msg00004.html>
-    # <http://mail.opensolaris.org/pipermail/ksh93-integration-discuss/2009-February/004121.html>
-    trap : 1 3 2 13 15
-    if test $merge -gt 0; then
-      exec 2>&1
-    else
-      exec 2>&3
-    fi
-    "$@"
-    echo $?
-  ) | LC_ALL=C ${AM_TAP_AWK-awk} \
-        -v me="$me" \
-        -v test_script_name="$test_name" \
-        -v log_file="$log_file" \
-        -v trs_file="$trs_file" \
-        -v expect_failure="$expect_failure" \
-        -v merge="$merge" \
-        -v ignore_exit="$ignore_exit" \
-        -v comments="$comments" \
-        -v diag_string="$diag_string" \
-'
-# FIXME: the usages of "cat >&3" below could be optimized when using
-# FIXME: GNU awk, and/on on systems that supports /dev/fd/.
-
-# Implementation note: in what follows, `result_obj` will be an
-# associative array that (partly) simulates a TAP result object
-# from the `TAP::Parser` perl module.
-
-## ----------- ##
-##  FUNCTIONS  ##
-## ----------- ##
-
-function fatal(msg)
-{
-  print me ": " msg | "cat >&2"
-  exit 1
-}
-
-function abort(where)
-{
-  fatal("internal error " where)
-}
-
-# Convert a boolean to a "yes"/"no" string.
-function yn(bool)
-{
-  return bool ? "yes" : "no";
-}
-
-function add_test_result(result)
-{
-  if (!test_results_index)
-    test_results_index = 0
-  test_results_list[test_results_index] = result
-  test_results_index += 1
-  test_results_seen[result] = 1;
-}
-
-# Whether the test script should be re-run by "make recheck".
-function must_recheck()
-{
-  for (k in test_results_seen)
-    if (k != "XFAIL" && k != "PASS" && k != "SKIP")
-      return 1
-  return 0
-}
-
-# Whether the content of the log file associated to this test should
-# be copied into the "global" test-suite.log.
-function copy_in_global_log()
-{
-  for (k in test_results_seen)
-    if (k != "PASS")
-      return 1
-  return 0
-}
-
-# FIXME: this can certainly be improved ...
-function get_global_test_result()
-{
-    if ("ERROR" in test_results_seen)
-      return "ERROR"
-    if ("FAIL" in test_results_seen || "XPASS" in test_results_seen)
-      return "FAIL"
-    all_skipped = 1
-    for (k in test_results_seen)
-      if (k != "SKIP")
-        all_skipped = 0
-    if (all_skipped)
-      return "SKIP"
-    return "PASS";
-}
-
-function stringify_result_obj(result_obj)
-{
-  if (result_obj["is_unplanned"] || result_obj["number"] != testno)
-    return "ERROR"
-
-  if (plan_seen == LATE_PLAN)
-    return "ERROR"
-
-  if (result_obj["directive"] == "TODO")
-    return result_obj["is_ok"] ? "XPASS" : "XFAIL"
-
-  if (result_obj["directive"] == "SKIP")
-    return result_obj["is_ok"] ? "SKIP" : COOKED_FAIL;
-
-  if (length(result_obj["directive"]))
-      abort("in function stringify_result_obj()")
-
-  return result_obj["is_ok"] ? COOKED_PASS : COOKED_FAIL
-}
-
-function decorate_result(result)
-{
-  color_name = color_for_result[result]
-  if (color_name)
-    return color_map[color_name] "" result "" color_map["std"]
-  # If we are not using colorized output, or if we do not know how
-  # to colorize the given result, we should return it unchanged.
-  return result
-}
-
-function report(result, details)
-{
-  if (result ~ /^(X?(PASS|FAIL)|SKIP|ERROR)/)
-    {
-      msg = ": " test_script_name
-      add_test_result(result)
-    }
-  else if (result == "#")
-    {
-      msg = " " test_script_name ":"
-    }
-  else
-    {
-      abort("in function report()")
-    }
-  if (length(details))
-    msg = msg " " details
-  # Output on console might be colorized.
-  print decorate_result(result) msg
-  # Log the result in the log file too, to help debugging (this is
-  # especially true when said result is a TAP error or "Bail out!").
-  print result msg | "cat >&3";
-}
-
-function testsuite_error(error_message)
-{
-  report("ERROR", "- " error_message)
-}
-
-function handle_tap_result()
-{
-  details = result_obj["number"];
-  if (length(result_obj["description"]))
-    details = details " " result_obj["description"]
-
-  if (plan_seen == LATE_PLAN)
-    {
-      details = details " # AFTER LATE PLAN";
-    }
-  else if (result_obj["is_unplanned"])
-    {
-       details = details " # UNPLANNED";
-    }
-  else if (result_obj["number"] != testno)
-    {
-       details = sprintf("%s # OUT-OF-ORDER (expecting %d)",
-                         details, testno);
-    }
-  else if (result_obj["directive"])
-    {
-      details = details " # " result_obj["directive"];
-      if (length(result_obj["explanation"]))
-        details = details " " result_obj["explanation"]
-    }
-
-  report(stringify_result_obj(result_obj), details)
-}
-
-# `skip_reason` should be empty whenever planned > 0.
-function handle_tap_plan(planned, skip_reason)
-{
-  planned += 0 # Avoid getting confused if, say, `planned` is "00"
-  if (length(skip_reason) && planned > 0)
-    abort("in function handle_tap_plan()")
-  if (plan_seen)
-    {
-      # Error, only one plan per stream is acceptable.
-      testsuite_error("multiple test plans")
-      return;
-    }
-  planned_tests = planned
-  # The TAP plan can come before or after *all* the TAP results; we speak
-  # respectively of an "early" or a "late" plan.  If we see the plan line
-  # after at least one TAP result has been seen, assume we have a late
-  # plan; in this case, any further test result seen after the plan will
-  # be flagged as an error.
-  plan_seen = (testno >= 1 ? LATE_PLAN : EARLY_PLAN)
-  # If testno > 0, we have an error ("too many tests run") that will be
-  # automatically dealt with later, so do not worry about it here.  If
-  # $plan_seen is true, we have an error due to a repeated plan, and that
-  # has already been dealt with above.  Otherwise, we have a valid "plan
-  # with SKIP" specification, and should report it as a particular kind
-  # of SKIP result.
-  if (planned == 0 && testno == 0)
-    {
-      if (length(skip_reason))
-        skip_reason = "- "  skip_reason;
-      report("SKIP", skip_reason);
-    }
-}
-
-function extract_tap_comment(line)
-{
-  if (index(line, diag_string) == 1)
-    {
-      # Strip leading `diag_string` from `line`.
-      line = substr(line, length(diag_string) + 1)
-      # And strip any leading and trailing whitespace left.
-      sub("^[ \t]*", "", line)
-      sub("[ \t]*$", "", line)
-      # Return what is left (if any).
-      return line;
-    }
-  return "";
-}
-
-# When this function is called, we know that line is a TAP result line,
-# so that it matches the (perl) RE "^(not )?ok\b".
-function setup_result_obj(line)
-{
-  # Get the result, and remove it from the line.
-  result_obj["is_ok"] = (substr(line, 1, 2) == "ok" ? 1 : 0)
-  sub("^(not )?ok[ \t]*", "", line)
-
-  # If the result has an explicit number, get it and strip it; otherwise,
-  # automatically assing the next progresive number to it.
-  if (line ~ /^[0-9]+$/ || line ~ /^[0-9]+[^a-zA-Z0-9_]/)
-    {
-      match(line, "^[0-9]+")
-      # The final `+ 0` is to normalize numbers with leading zeros.
-      result_obj["number"] = substr(line, 1, RLENGTH) + 0
-      line = substr(line, RLENGTH + 1)
-    }
-  else
-    {
-      result_obj["number"] = testno
-    }
-
-  if (plan_seen == LATE_PLAN)
-    # No further test results are acceptable after a "late" TAP plan
-    # has been seen.
-    result_obj["is_unplanned"] = 1
-  else if (plan_seen && testno > planned_tests)
-    result_obj["is_unplanned"] = 1
-  else
-    result_obj["is_unplanned"] = 0
-
-  # Strip trailing and leading whitespace.
-  sub("^[ \t]*", "", line)
-  sub("[ \t]*$", "", line)
-
-  # This will have to be corrected if we have a "TODO"/"SKIP" directive.
-  result_obj["description"] = line
-  result_obj["directive"] = ""
-  result_obj["explanation"] = ""
-
-  if (index(line, "#") == 0)
-    return # No possible directive, nothing more to do.
-
-  # Directives are case-insensitive.
-  rx = "[ \t]*#[ \t]*([tT][oO][dD][oO]|[sS][kK][iI][pP])[ \t]*"
-
-  # See whether we have the directive, and if yes, where.
-  pos = match(line, rx "$")
-  if (!pos)
-    pos = match(line, rx "[^a-zA-Z0-9_]")
-
-  # If there was no TAP directive, we have nothing more to do.
-  if (!pos)
-    return
-
-  # Let`s now see if the TAP directive has been escaped.  For example:
-  #  escaped:     ok \# SKIP
-  #  not escaped: ok \\# SKIP
-  #  escaped:     ok \\\\\# SKIP
-  #  not escaped: ok \ # SKIP
-  if (substr(line, pos, 1) == "#")
-    {
-      bslash_count = 0
-      for (i = pos; i > 1 && substr(line, i - 1, 1) == "\\"; i--)
-        bslash_count += 1
-      if (bslash_count % 2)
-        return # Directive was escaped.
-    }
-
-  # Strip the directive and its explanation (if any) from the test
-  # description.
-  result_obj["description"] = substr(line, 1, pos - 1)
-  # Now remove the test description from the line, that has been dealt
-  # with already.
-  line = substr(line, pos)
-  # Strip the directive, and save its value (normalized to upper case).
-  sub("^[ \t]*#[ \t]*", "", line)
-  result_obj["directive"] = toupper(substr(line, 1, 4))
-  line = substr(line, 5)
-  # Now get the explanation for the directive (if any), with leading
-  # and trailing whitespace removed.
-  sub("^[ \t]*", "", line)
-  sub("[ \t]*$", "", line)
-  result_obj["explanation"] = line
-}
-
-function get_test_exit_message(status)
-{
-  if (status == 0)
-    return ""
-  if (status !~ /^[1-9][0-9]*$/)
-    abort("getting exit status")
-  if (status < 127)
-    exit_details = ""
-  else if (status == 127)
-    exit_details = " (command not found?)"
-  else if (status >= 128 && status <= 255)
-    exit_details = sprintf(" (terminated by signal %d?)", status - 128)
-  else if (status > 256 && status <= 384)
-    # We used to report an "abnormal termination" here, but some Korn
-    # shells, when a child process die due to signal number n, can leave
-    # in $? an exit status of 256+n instead of the more standard 128+n.
-    # Apparently, both behaviours are allowed by POSIX (2008), so be
-    # prepared to handle them both.  See also Austing Group report ID
-    # 0000051 <http://www.austingroupbugs.net/view.php?id=51>
-    exit_details = sprintf(" (terminated by signal %d?)", status - 256)
-  else
-    # Never seen in practice.
-    exit_details = " (abnormal termination)"
-  return sprintf("exited with status %d%s", status, exit_details)
-}
-
-function write_test_results()
-{
-  print ":global-test-result: " get_global_test_result() > trs_file
-  print ":recheck: "  yn(must_recheck()) > trs_file
-  print ":copy-in-global-log: " yn(copy_in_global_log()) > trs_file
-  for (i = 0; i < test_results_index; i += 1)
-    print ":test-result: " test_results_list[i] > trs_file
-  close(trs_file);
-}
-
-BEGIN {
-
-## ------- ##
-##  SETUP  ##
-## ------- ##
-
-'"$init_colors"'
-
-# Properly initialized once the TAP plan is seen.
-planned_tests = 0
-
-COOKED_PASS = expect_failure ? "XPASS": "PASS";
-COOKED_FAIL = expect_failure ? "XFAIL": "FAIL";
-
-# Enumeration-like constants to remember which kind of plan (if any)
-# has been seen.  It is important that NO_PLAN evaluates "false" as
-# a boolean.
-NO_PLAN = 0
-EARLY_PLAN = 1
-LATE_PLAN = 2
-
-testno = 0     # Number of test results seen so far.
-bailed_out = 0 # Whether a "Bail out!" directive has been seen.
-
-# Whether the TAP plan has been seen or not, and if yes, which kind
-# it is ("early" is seen before any test result, "late" otherwise).
-plan_seen = NO_PLAN
-
-## --------- ##
-##  PARSING  ##
-## --------- ##
-
-is_first_read = 1
-
-while (1)
-  {
-    # Involutions required so that we are able to read the exit status
-    # from the last input line.
-    st = getline
-    if (st < 0) # I/O error.
-      fatal("I/O error while reading from input stream")
-    else if (st == 0) # End-of-input
-      {
-        if (is_first_read)
-          abort("in input loop: only one input line")
-        break
-      }
-    if (is_first_read)
-      {
-        is_first_read = 0
-        nextline = $0
-        continue
-      }
-    else
-      {
-        curline = nextline
-        nextline = $0
-        $0 = curline
-      }
-    # Copy any input line verbatim into the log file.
-    print | "cat >&3"
-    # Parsing of TAP input should stop after a "Bail out!" directive.
-    if (bailed_out)
-      continue
-
-    # TAP test result.
-    if ($0 ~ /^(not )?ok$/ || $0 ~ /^(not )?ok[^a-zA-Z0-9_]/)
-      {
-        testno += 1
-        setup_result_obj($0)
-        handle_tap_result()
-      }
-    # TAP plan (normal or "SKIP" without explanation).
-    else if ($0 ~ /^1\.\.[0-9]+[ \t]*$/)
-      {
-        # The next two lines will put the number of planned tests in $0.
-        sub("^1\\.\\.", "")
-        sub("[^0-9]*$", "")
-        handle_tap_plan($0, "")
-        continue
-      }
-    # TAP "SKIP" plan, with an explanation.
-    else if ($0 ~ /^1\.\.0+[ \t]*#/)
-      {
-        # The next lines will put the skip explanation in $0, stripping
-        # any leading and trailing whitespace.  This is a little more
-        # tricky in truth, since we want to also strip a potential leading
-        # "SKIP" string from the message.
-        sub("^[^#]*#[ \t]*(SKIP[: \t][ \t]*)?", "")
-        sub("[ \t]*$", "");
-        handle_tap_plan(0, $0)
-      }
-    # "Bail out!" magic.
-    # Older versions of prove and TAP::Harness (e.g., 3.17) did not
-    # recognize a "Bail out!" directive when preceded by leading
-    # whitespace, but more modern versions (e.g., 3.23) do.  So we
-    # emulate the latter, "more modern" behaviour.
-    else if ($0 ~ /^[ \t]*Bail out!/)
-      {
-        bailed_out = 1
-        # Get the bailout message (if any), with leading and trailing
-        # whitespace stripped.  The message remains stored in `$0`.
-        sub("^[ \t]*Bail out![ \t]*", "");
-        sub("[ \t]*$", "");
-        # Format the error message for the
-        bailout_message = "Bail out!"
-        if (length($0))
-          bailout_message = bailout_message " " $0
-        testsuite_error(bailout_message)
-      }
-    # Maybe we have too look for dianogtic comments too.
-    else if (comments != 0)
-      {
-        comment = extract_tap_comment($0);
-        if (length(comment))
-          report("#", comment);
-      }
-  }
-
-## -------- ##
-##  FINISH  ##
-## -------- ##
-
-# A "Bail out!" directive should cause us to ignore any following TAP
-# error, as well as a non-zero exit status from the TAP producer.
-if (!bailed_out)
-  {
-    if (!plan_seen)
-      {
-        testsuite_error("missing test plan")
-      }
-    else if (planned_tests != testno)
-      {
-        bad_amount = testno > planned_tests ? "many" : "few"
-        testsuite_error(sprintf("too %s tests run (expected %d, got %d)",
-                                bad_amount, planned_tests, testno))
-      }
-    if (!ignore_exit)
-      {
-        # Fetch exit status from the last line.
-        exit_message = get_test_exit_message(nextline)
-        if (exit_message)
-          testsuite_error(exit_message)
-      }
-  }
-
-write_test_results()
-
-exit 0
-
-} # End of "BEGIN" block.
-'
-
-# TODO: document that we consume the file descriptor 3 :-(
-} 3>"$log_file"
-
-test $? -eq 0 || fatal "I/O or internal error"
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
-# time-stamp-end: "; # UTC"
-# End:
diff --git a/tap-test b/tap-test
deleted file mode 100755
index 481e333ec..000000000
--- a/tap-test
+++ /dev/null
@@ -1,5 +0,0 @@
-#! /bin/sh
-
-# run a GTest in tap mode. The test binary is passed as $1
-
-$1 -k --tap
diff --git a/tests/Makefile.am b/tests/Makefile.am
deleted file mode 100644
index 66b103fdd..000000000
--- a/tests/Makefile.am
+++ /dev/null
@@ -1,214 +0,0 @@
-include $(top_srcdir)/glib-tap.mk
-
-.NOTPARALLEL:
-
-AM_CPPFLAGS =				\
-	-I$(top_srcdir)			\
-	-I$(top_srcdir)/gdk-pixbuf	\
-	$(GDK_PIXBUF_DEBUG_FLAGS)	\
-	$(GDK_PIXBUF_DEP_CFLAGS)	\
-	$(NULL)
-
-DEPS = \
-	$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GDK_PIXBUF_API_VERSION).la
-
-LDADD = \
-	$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GDK_PIXBUF_API_VERSION).la 	\
-	$(GDK_PIXBUF_DEP_LIBS) \
-	$(GLIB_LIBS) \
-	$(NULL)
-
-noinst_PROGRAMS += 			\
-	pixbuf-read			\
-	pixbuf-random			\
-	pixbuf-lowmem			\
-	pixbuf-save-ref			\
-	$(NULL)
-
-test_programs = 			\
-	animation			\
-	cve-2015-4491			\
-	pixbuf-fail			\
-	pixbuf-icon-serialize 		\
-	pixbuf-randomly-modified	\
-	pixbuf-threads			\
-	pixbuf-icc			\
-	pixbuf-jpeg			\
-	pixbuf-dpi			\
-	pixbuf-pixdata			\
-	pixbuf-stream			\
-	pixbuf-reftest			\
-	pixbuf-resource			\
-	pixbuf-scale			\
-	pixbuf-scale-two-step		\
-	pixbuf-short-gif-write		\
-	pixbuf-save			\
-	pixbuf-readonly-to-mutable	\
-	pixbuf-composite		\
-	pixbuf-area-updated		\
-	$(NULL)
-
-dist_installed_test_data =		\
-	test-image.png			\
-	test-animation.gif		\
-	1_partyanimsm2.gif		\
-	test-animation.ani		\
-	icc-profile.jpeg		\
-	icc-profile.png			\
-	dpi.jpeg			\
-	dpi.png				\
-	dpi.tiff			\
-	premature-end.png		\
-	premature-end.jpg		\
-	bug143608-comment.jpg		\
-	bug725582-testrotate.jpg	\
-	bug725582-testrotate.png	\
-	cve-2015-4491.bmp		\
-	large.png			\
-	large.jpg			\
-	bug775218.jpg			\
-	test-image.pixdata		\
-	test-image-rle.pixdata		\
-	bug775693.pixdata		\
-	aero.gif			\
-	$(wildcard $(srcdir)/test-images/fail/*) \
-	$(wildcard $(srcdir)/test-images/randomly-modified/*) \
-	$(wildcard $(srcdir)/test-images/reftests/*.*) \
-	$(wildcard $(srcdir)/test-images/reftests/tga/*) \
-	$(NULL)
-
-pixbuf_area_updated_SOURCES =		\
-	pixbuf-area-updated.c		\
-	test-common.c			\
-	test-common.h			\
-	$(NULL)
-
-pixbuf_randomly_modified_SOURCES =	\
-	pixbuf-randomly-modified.c	\
-	test-common.c			\
-	test-common.h			\
-	$(NULL)
-
-cve_2015_4491_SOURCES =			\
-	cve-2015-4491.c			\
-	test-common.c			\
-	test-common.h			\
-	resources.h			\
-	resources.c			\
-	$(NULL)
-
-pixbuf_icc_SOURCES = 			\
-	pixbuf-icc.c			\
-	test-common.c			\
-	test-common.h			\
-	$(NULL)
-
-pixbuf_dpi_SOURCES = 			\
-	pixbuf-dpi.c			\
-	test-common.c			\
-	test-common.h			\
-	$(NULL)
-
-pixbuf_fail_SOURCES =			\
-	pixbuf-fail.c			\
-	test-common.c			\
-	test-common.h			\
-	$(NULL)
-
-pixbuf_scale_SOURCES = 			\
-	pixbuf-scale.c			\
-	test-common.c			\
-	test-common.h			\
-	$(NULL)
-
-pixbuf_scale_two_step_SOURCES =		\
-	pixbuf-scale-two-step.c		\
-	test-common.c			\
-	test-common.h			\
-	$(NULL)
-
-pixbuf_stream_SOURCES =			\
-	pixbuf-stream.c			\
-	test-common.c			\
-	test-common.h			\
-	$(NULL)
-
-pixbuf_threads_SOURCES =		\
-	pixbuf-threads.c		\
-	test-common.c			\
-	test-common.h			\
-	$(NULL)
-
-pixbuf_icon_serialize_SOURCES =		\
-	pixbuf-icon-serialize.c		\
-	test-common.c			\
-	test-common.h			\
-	$(NULL)
-
-pixbuf_save_SOURCES =			\
-	pixbuf-save.c			\
-	test-common.c			\
-	test-common.h			\
-	$(NULL)
-
-pixbuf_reftest_SOURCES =		\
-	pixbuf-reftest.c		\
-	test-common.c			\
-	test-common.h			\
-	$(NULL)
-
-pixbuf_jpeg_SOURCES =			\
-	pixbuf-jpeg.c			\
-	test-common.c			\
-	test-common.h			\
-	$(NULL)
-
-pixbuf_short_gif_write_SOURCES =	\
-	pixbuf-short-gif-write.c
-
-pixbuf_readonly_to_mutable_SOURCES =	\
-	pixbuf-readonly-to-mutable.c	\
-	test-common.c			\
-	test-common.h			\
-	$(NULL)
-
-pixbuf_composite_SOURCES =		\
-	pixbuf-composite.c		\
-	test-common.c			\
-	test-common.h			\
-	$(NULL)
-
-pixbuf_resource_SOURCES = 		\
-	pixbuf-resource.c		\
-	test-common.c			\
-	test-common.h			\
-	resources.h			\
-	resources.c			\
-	$(NULL)
-
-pixbuf_pixdata_SOURCES =		\
-	pixbuf-pixdata.c		\
-	test-common.c			\
-	test-common.h			\
-	resources.h			\
-	resources.c			\
-	$(NULL)
-
-BUILT_SOURCES += resources.h resources.c
-DISTCLEANFILES += 			\
-	resources.h resources.c 	\
-	pixbuf-save-options		\
-	pixbuf-randomly-modified-image	\
-	pixbuf-save-roundtrip		\
-	$(NULL)
-	
-EXTRA_DIST += resources.gresource.xml
-TESTS_ENVIRONMENT += GDK_PIXBUF_MODULE_FILE=$(top_builddir)/gdk-pixbuf/loaders.cache
-
-resources.h: resources.gresource.xml
-	$(AM_V_GEN) GDK_PIXBUF_MODULE_FILE=$(top_builddir)/gdk-pixbuf/loaders.cache GDK_PIXBUF_PIXDATA=$(top_builddir)/gdk-pixbuf/gdk-pixbuf-pixdata $(GLIB_COMPILE_RESOURCES) $(srcdir)/resources.gresource.xml --target=$@ --sourcedir=$(srcdir) --generate-header
-
-resources.c: resources.gresource.xml
-	$(AM_V_GEN) GDK_PIXBUF_MODULE_FILE=$(top_builddir)/gdk-pixbuf/loaders.cache GDK_PIXBUF_PIXDATA=$(top_builddir)/gdk-pixbuf/gdk-pixbuf-pixdata $(GLIB_COMPILE_RESOURCES) $(srcdir)/resources.gresource.xml --target=$@ --sourcedir=$(srcdir) --generate-source
-
--include $(top_srcdir)/git.mk
diff --git a/thumbnailer/Makefile.am b/thumbnailer/Makefile.am
deleted file mode 100644
index c9fe123f8..000000000
--- a/thumbnailer/Makefile.am
+++ /dev/null
@@ -1,35 +0,0 @@
-bin_PROGRAMS = gdk-pixbuf-thumbnailer
-noinst_PROGRAMS = gdk-pixbuf-print-mime-types
-
-gdk_pixbuf_thumbnailer_SOURCES = gdk-pixbuf-thumbnailer.c gnome-thumbnailer-skeleton.c gnome-thumbnailer-skeleton.h
-gdk_pixbuf_thumbnailer_CPPFLAGS =			\
-	-I$(top_srcdir)					\
-	-I$(top_srcdir)/gdk-pixbuf			\
-	$(GDK_PIXBUF_DEP_CFLAGS)			\
-	-DTHUMBNAILER_RETURNS_PIXBUF			\
-	-DTHUMBNAILER_USAGE="\"Thumbnail images\""	\
-	$(WARN_CFLAGS)
-gdk_pixbuf_thumbnailer_LDADD =				\
-	$(GDK_PIXBUF_DEP_LIBS)				\
-	$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GDK_PIXBUF_API_VERSION).la
-
-gdk_pixbuf_print_mime_types_SOURCES = gdk-pixbuf-print-mime-types.c
-gdk_pixbuf_print_mime_types_CPPFLAGS =			\
-	-I$(top_srcdir)					\
-	-I$(top_srcdir)/gdk-pixbuf			\
-	$(GDK_PIXBUF_DEP_CFLAGS)			\
-	$(WARN_CFLAGS)
-gdk_pixbuf_print_mime_types_LDADD =			\
-	$(GDK_PIXBUF_DEP_LIBS)				\
-	$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GDK_PIXBUF_API_VERSION).la
-
-thumbnailerdir = $(datadir)/thumbnailers/
-thumbnailer_DATA = gdk-pixbuf-thumbnailer.thumbnailer
-gdk-pixbuf-thumbnailer.thumbnailer: gdk-pixbuf-thumbnailer.thumbnailer.in Makefile gdk-pixbuf-print-mime-types$(EXEEXT) $(top_builddir)/gdk-pixbuf/loaders.cache
-	$(AM_V_GEN) $(SED) -e "s|\@bindir\@|$(bindir)|"						\
-	-e "s|\@mimetypes\@|`GDK_PIXBUF_MODULE_FILE=$(top_builddir)/gdk-pixbuf/loaders.cache GDK_PIXBUF_PIXDATA=$(top_builddir)/gdk-pixbuf/gdk-pixbuf-pixdata $(builddir)/gdk-pixbuf-print-mime-types`|" \
-	$< > $@
-
-EXTRA_DIST = gdk-pixbuf-thumbnailer.thumbnailer.in
-
-CLEANFILES = $(thumbnailer_DATA)
diff --git a/win32/Makefile-newvs.am b/win32/Makefile-newvs.am
deleted file mode 100644
index 3a91862b6..000000000
--- 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 a97609a64..000000000
--- a/win32/Makefile.am
+++ /dev/null
@@ -1,39 +0,0 @@
-if HAVE_INTROSPECTION
-GENERATED_ITEMS = \
-	introspection.body.mak	\
-	GdkPixbuf_2_0_gir_list
-
-introspection.body.mak: GdkPixbuf-2.0.gir.msvc.introspect
-	-$(RM) introspection.body.mak
-	for F in `ls *.msvc.introspect`; do \
-		case $$F in \
-			*)	cat $(top_builddir)/win32/$$F >>$@ \
-			;; \
-		esac; \
-	done
-	$(RM) GdkPixbuf-2.0.gir.msvc.introspect
-
-DISTCLEANFILES = $(GENERATED_ITEMS)
-
-else
-GENERATED_ITEMS =
-endif
-
-SUBDIRS =	\
-	vs9	\
-	vs10	\
-	vs11	\
-	vs12	\
-	vs14	\
-	vs15
-
-EXTRA_DIST =	\
-	detectenv-msvc.mak			\
-	introspection-msvc.mak			\
-	gdk-pixbuf-introspection-msvc.mak	\
-	gdkpixbuf-pc.py				\
-	pc_base.py				\
-	replace.py				\
-	$(GENERATED_ITEMS)
-
--include $(top_srcdir)/git.mk
diff --git a/win32/Makefile.msvc-introspection b/win32/Makefile.msvc-introspection
deleted file mode 100644
index 1a244e0d5..000000000
--- 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 2e96e12bc..000000000
--- 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 6fd96ccc6..000000000
--- 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/gdk-pixbuf-introspection-msvc.mak b/win32/gdk-pixbuf-introspection-msvc.mak
deleted file mode 100644
index 850b8e94f..000000000
--- a/win32/gdk-pixbuf-introspection-msvc.mak
+++ /dev/null
@@ -1,35 +0,0 @@
-# NMake Makefile to build Introspection Files for GDK-Pixbuf
-
-!include detectenv-msvc.mak
-
-APIVERSION = 2.0
-
-CHECK_PACKAGE = gio-2.0
-
-!include introspection-msvc.mak
-
-!if "$(BUILD_INTROSPECTION)" == "TRUE"
-all: setgirbuildenv GdkPixbuf-$(APIVERSION).gir GdkPixbuf-$(APIVERSION).typelib
-
-setgirbuildenv:
-	@-set PYTHONPATH=$(PREFIX)\lib\gobject-introspection
-	@-set PATH=vs$(VSVER)\$(CFG)\$(PLAT)\bin;$(PREFIX)\bin;$(PATH)
-	@-set PKG_CONFIG_PATH=$(PKG_CONFIG_PATH)
-	@-set LIB=vs$(VSVER)\$(CFG)\$(PLAT)\bin;$(LIB)
-
-!include introspection.body.mak
-
-install-introspection: all
-	@-copy GdkPixbuf-$(APIVERSION).gir $(G_IR_INCLUDEDIR)
-	@-copy /b GdkPixbuf-$(APIVERSION).typelib $(G_IR_TYPELIBDIR)
-
-!else
-all:
-	@-echo $(ERROR_MSG)
-
-install-introspection: all
-!endif
-
-clean:
-	@-del /f/q GdkPixbuf-$(APIVERSION).typelib
-	@-del /f/q GdkPixbuf-$(APIVERSION).gir
diff --git a/win32/gdkpixbuf-pc.py b/win32/gdkpixbuf-pc.py
deleted file mode 100644
index 6321f6161..000000000
--- a/win32/gdkpixbuf-pc.py
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/usr/bin/python
-#
-# Utility script to generate .pc files for GDK-Pixbuf
-# for Visual Studio builds, to be used for
-# building introspection files
-
-# Author: Fan, Chun-wei
-# Date: April 22, 2016
-
-import os
-import sys
-import argparse
-
-from replace import replace_multi, replace
-from pc_base import BasePCItems
-
-def main(argv):
-    base_pc = BasePCItems()
-    base_pc.setup(argv)
-    pkg_replace_items = {'@GDK_PIXBUF_API_VERSION@': '2.0',
-                         '@GDK_PIXBUF_BINARY_VERSION@': '2.10.0',
-                         '@PNG_DEP_CFLAGS_PACKAGES@': '',
-                         '@GDK_PIXBUF_EXTRA_LIBS@': '',
-                         '@GDK_PIXBUF_EXTRA_CFLAGS@': ''}
-
-    pkg_replace_items.update(base_pc.base_replace_items)
-
-    # Generate gdk-pixbuf-2.0.pc.tmp to replace the module directory
-    replace_multi(base_pc.top_srcdir + '/gdk-pixbuf-2.0.pc.in',
-                  base_pc.srcdir + '/gdk-pixbuf-2.0.pc.tmp',
-                  pkg_replace_items)
-    replace(base_pc.srcdir + '/gdk-pixbuf-2.0.pc.tmp',
-            base_pc.srcdir + '/gdk-pixbuf-2.0.pc',
-            '${prefix}/lib/gdk-pixbuf',
-            '${exec_prefix}/lib/gdk-pixbuf')
-    os.unlink(base_pc.srcdir + '/gdk-pixbuf-2.0.pc.tmp')
-
-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 26501f525..000000000
--- 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 285b6cdd8..000000000
--- 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 f215cce58..000000000
--- a/win32/replace.py
+++ /dev/null
@@ -1,115 +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 open_file(filename, mode):
-    if sys.version_info[0] < 3:
-        return open(filename, mode=mode)
-    else:
-        return open(filename, mode=mode, encoding='utf-8')
-
-def replace_multi(src, dest, replace_items):
-    with open_file(src, 'r') as s:
-        with open_file(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 ea7c92f5e..000000000
--- a/win32/vs10/Makefile.am
+++ /dev/null
@@ -1,35 +0,0 @@
-GENERATED_ITEMS = \
-	gdk-pixbuf.vcxproj	\
-	gdk-pixbuf.vcxproj.filters	\
-	gdk-pixbuf-install.props
-
-EXTRA_DIST = \
-	README.txt	\
-	gdk-pixbuf.sln	\
-	gdk-pixbuf-version-paths.props	\
-	gdk-pixbuf-build-defines.props	\
-	gdk-pixbuf-gen-srcs.props	\
-	gdk-pixbuf-install.propsin	\
-	gdk-pixbuf.vcxprojin	\
-	gdk-pixbuf.vcxproj.filtersin	\
-	gdk-pixbuf-csource.vcxproj	\
-	gdk-pixbuf-csource.vcxproj.filters	\
-	gdk-pixbuf-query-loaders.vcxproj	\
-	gdk-pixbuf-query-loaders.vcxproj.filters	\
-	gdk-pixbuf-pixdata.vcxproj	\
-	gdk-pixbuf-pixdata.vcxproj.filters	\
-	gdk-pixbuf-install.vcxproj	\
-	gdk-pixbuf-install.vcxproj.filters	\
-	$(GENERATED_ITEMS)
-
-gdk-pixbuf-install.props: $(top_srcdir)/win32/vs10/gdk-pixbuf-install.propsin gdk-pixbuf.vs10.headers
-	-$(RM) $(top_builddir)/win32/vs11/gdk-pixbuf-install.props
-	-$(RM) $(top_builddir)/win32/vs12/gdk-pixbuf-install.props
-	-$(RM) $(top_builddir)/win32/vs14/gdk-pixbuf-install.props
-	-$(RM) $(top_builddir)/win32/vs15/gdk-pixbuf-install.props
-	$(CPP) -P - <$(top_srcdir)/win32/vs10/gdk-pixbuf-install.propsin >$@
-	rm gdk-pixbuf.vs10.headers
-
-DISTCLEANFILES = $(GENERATED_ITEMS)
-
--include $(top_srcdir)/git.mk
diff --git a/win32/vs10/README.txt b/win32/vs10/README.txt
deleted file mode 100644
index 677c723a7..000000000
--- a/win32/vs10/README.txt
+++ /dev/null
@@ -1,127 +0,0 @@
-Note that all this is rather experimental.

-

-Please do not build this package in a path that contains spaces to avoid

-possible problems during the build or during the usage of the library.

-

-Please refer to the following GNOME Live! page for more detailed

-instructions on building GDK-Pixbuf 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 GDK-Pixbuf source tree unpacked from a tarball. In a git checkout you

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

-the .in files needed, mainly config.h.win32.in into config.h.win32.

-You will also need to expand gdk-pixbuf.vcprojin here into

-gdk-pixbuf.vcproj.

-

-Two variants of the library are supported here for compilation-one

-that makes use of native GDI+ APIs (The Debug/Release configurations)

-and another that does not use GDI+ (those that use external third

-party image manipulation libraries, the Debug_NoGDIP/Release_NoGDIP

-configurations).  Note that both variants require LibPNG and ZLib, and

-both variants have the image loaders built into the main GDK-Pixbuf library.

-

-If one wants to build additional GDK-Pixbuf image loaders/modules that are

-not included in the main GDK-Pixbuf library, such as the one included in

-librsvg, he/she needs to place the compiled loader DLL (preferably built

-with Visual C++ 2010) into the following location:

-<parent_folder_of_the_GDK-Pixbuf_DLL>\lib\gdk-pixbuf-2.0\2.10.0\loaders\

-and run the gdk-pixbuf-query-loaders utility to generate a loaders.cache

-file in <parent_folder_of_the_GDK-Pixbuf_DLL>\lib\gdk-pixbuf-2.0\2.10.0.

-

-The dependencies for this package are gettext-runtime (libintl), GLib*,

-ZLib and LibPNG at the minimum.  Note that if you intend to build GDK-Pixbuf

-that does not use GDI+, you will also need the IJG JPEG libraries, libTIFF and

-libjasper (for JPEG-2000 operations).

-

-Please note that the Visual Studio project files will typically link to the

-latest stable release of LibPNG which the GDK-Pixbuf codebase supports by

-default.  If you intend to use and link to an older version of LibPNG, you

-may change the "Additional Dependencies" setting accordingly (such as changing

-from libpng16.lib to libpng14.lib) for the GDK-Pixbuf project.  The minimum

-supported release series for LibPNG is 1.0.x at this time of writing.

-

-For the Dependencies, you may either:

-

-a) look for all of the dependencies (except GLib*, libjasper) under

-

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

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

-

-   Please use the latest versions of these libraries that are available there,

-   these are packaged by Tor Lillqvist, which are built with MinGW/GCC.

-   Please see b) below regarding the build of libjasper and GLib*

-

-   Note for LibPNG, version 1.5.x is needed.

-

--OR-

-

-b) Build them yourself with VS10 (but you may most probably wish to get

-   gettext-runtime from the URL(s) mentioned in a)).  Use the latest

-   stable versions for them (you may need to get the latest unstable version of

-   GLib if you are using an unstable version of GDK-Pixbuf):

-

-   GLib*:   Grab the latest sources from http://www.gtk.org under "Download"

-            (stable only-please make a search for the latest unstable versions)

-   IJG JPEG: http://www.ijg.org/

-   LibPNG: http://www.libpng.org/pub/png/libpng.html (1.5.x is needed here)

-   LibTIFF: http://www.remotesensing.org/libtiff/

-   LibJasper: http://www.ece.uvic.ca/~mdadams/jasper/

-   ZLib:   http://www.zlib.net

-

-   The above 6 packages all have supported mechanisms (Makefiles and/or Project

-   Files) for building under VS10 (upgrade the Project Files from earlier VS

-   versions will do for these, when applicable).  It is recommended that ZLib

-   is built using the win32/Makefile.msc makefile with VS10 with the ASM routines

-   to avoid linking problems (copy zdll.lib to zlib1.lib[Release] or to zlib1d.lib

-   [Debug] after completion of compilation)-see win32/Makefile.msc in ZLib for

-   more details.

-

-* This GLib refers to a build that is built by VS10

-

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

-folder <root>:

-

-<root>\gdk-pixbuf\<this-gdk-pixbuf-source-tree>

-<root>\vs10\<PlatformName>

-

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

-<root>\gdk-pixbuf\<this-gdk-pixbuf-source-tree>\win32\vs10\README.

-

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

-

-You should unpack the <dependent-package>-dev and <dependent-packge> (runtime)

-into <root>\vs10\<PlatformName>, if you download any of the packages from

-

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

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

-

-so that for instance libintl.h end up at 

-<root>\vs10\<PlatformName>\include\libintl.h.

-

-If you build any of the dependencies yourselves, copy the: 

--DLLs and EXEs into <root>\vs10\<PlatformName>\bin

--headers into <root>\vs10\<PlatformName>\include\

--LIBs into <root>\vs10\<PlatformName>\lib

-

-If you have not built GLib with VS10 and placed the LIBs and headers in a

-place where VS10 can find them automatically, you should also uncompress

-your GLib sources in <root>\ and build it from there, following the

-instructions in <root>\glib<-version>\win32\vs10, so that the required

-headers, EXEs, DLLs and LIBs will end up in

-<root>\vs10\<PlatformName>\include\glib-2.0 (headers)

-<root>\vs10\<PlatformName>\lib (LIBs, also glib-2.0/include/glibconfig.h)

-<root>\vs10\<PlatformName>\bin (EXEs/DLLs)

-respectively.

-

-After the build of GDK-Pixbuf, 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 GDK-Pixbuf headers into

-<root>\vs10\<PlatformName>\include\GDKPixbuf-2.0. This is then from where

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

-from a specific GDK-Pixbuf source tree.

-

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

---(adapted from the GLib VS9 README.txt file originally written by Tor Lillqvist)

diff --git a/win32/vs10/gdk-pixbuf-build-defines.props b/win32/vs10/gdk-pixbuf-build-defines.props
deleted file mode 100644
index 2aad4a137..000000000
--- a/win32/vs10/gdk-pixbuf-build-defines.props
+++ /dev/null
@@ -1,73 +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="gdk-pixbuf-version-paths.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros">
-    <GdkPixbufBinaryVersion>2.10.0</GdkPixbufBinaryVersion>
-    <GDIP_MACROS>INCLUDE_gdiplus</GDIP_MACROS>
-    <NOGDIP_MACROS>JAS_WIN_MSVC_BUILD;INCLUDE_bmp;INCLUDE_gif;INCLUDE_ico;INCLUDE_jasper;INCLUDE_jpeg;INCLUDE_tiff;</NOGDIP_MACROS>
-    <MODULAR_MACROS>INCLUDE_ani;INCLUDE_tga;INCLUDE_xbm;INCLUDE_png;INCLUDE_qtif;INCLUDE_pnm;INCLUDE_icns;INCLUDE_xpm</MODULAR_MACROS>
-    <GdkPixbufDummyPrefix>/dummy</GdkPixbufDummyPrefix>
-    <GdkPixbufPrefixDefine>GDK_PIXBUF_PREFIX="$(GdkPixbufDummyPrefix)"</GdkPixbufPrefixDefine>
-    <GdkPixbufLibdirDefine>PIXBUF_LIBDIR="$(GdkPixbufDummyPrefix)/lib/gdk-pixbuf-$(ApiVersion)/$(GdkPixbufBinaryVersion)/loaders"</GdkPixbufLibdirDefine>
-    <GdkPixbufBinVerDefine>GDK_PIXBUF_BINARY_VERSION="$(GdkPixbufBinaryVersion)"</GdkPixbufBinVerDefine>
-    <GdkPixbufDefines>HAVE_CONFIG_H;GDK_PIXBUF_COMPILATION;GDK_PIXBUF_ENABLE_BACKEND;DLL_EXPORT;GDK_PIXBUF_RELOCATABLE;$(GdkPixbufPrefixDefine);$(GdkPixbufBinVerDefine);$(MODULAR_MACROS)</GdkPixbufDefines>
-    <GdipLibs>gdiplus.lib</GdipLibs>
-    <ImagingLibs>jpeg.lib;libjasper.lib;libtiff_i.lib</ImagingLibs>
-  </PropertyGroup>
-  <PropertyGroup>
-    <_PropertySheetDisplayName>gdk-pixbufbuilddefinesprops</_PropertySheetDisplayName>
-    <OutDir>$(SolutionDir)$(Configuration)\$(PlatformName)\bin\</OutDir>
-    <IntDir>$(SolutionDir)$(Configuration)\$(PlatformName)\obj\$(ProjectName)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..;..\..\gdk-pixbuf;.;$(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;G_DISABLE_SINGLE_INCLUDES;GDK_PIXBUF_DISABLE_SINGLE_INCLUDES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ForcedIncludeFiles>msvc_recommended_pragmas.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <AdditionalOptions>/d2Zi+ %(AdditionalOptions)</AdditionalOptions>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>gio-2.0.lib;gmodule-2.0.lib;gobject-2.0.lib;glib-2.0.lib;intl.lib;libpng16.lib;zlib1.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(GlibEtcInstallRoot)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <IgnoreSpecificDefaultLibraries>LIBCMTD.lib;LIBCMT.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <BuildMacro Include="GdkPixbufBinaryVersion">
-      <Value>$(GdkPixbufBinaryVersion)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GDIP_MACROS">
-      <Value>$(GDIP_MACROS)</Value>
-    </BuildMacro>
-    <BuildMacro Include="NOGDIP_MACROS">
-      <Value>$(NOGDIP_MACROS)</Value>
-    </BuildMacro>
-    <BuildMacro Include="MODULAR_MACROS">
-      <Value>$(MODULAR_MACROS)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GdkPixbufDummyPrefix">
-      <Value>$(GdkPixbufDummyPrefix)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GdkPixbufPrefixDefine">
-      <Value>$(GdkPixbufPrefixDefine)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GdkPixbufLibdirDefine">
-      <Value>$(GdkPixbufLibdirDefine)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GdkPixbufBinVerDefine">
-      <Value>$(GdkPixbufBinVerDefine)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GdkPixbufDefines">
-      <Value>$(GdkPixbufDefines)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GdipLibs">
-      <Value>$(GdipLibs)</Value>
-    </BuildMacro>
-    <BuildMacro Include="ImagingLibs">
-      <Value>$(ImagingLibs)</Value>
-    </BuildMacro>
-  </ItemGroup>
-</Project>
diff --git a/win32/vs10/gdk-pixbuf-csource.vcxproj b/win32/vs10/gdk-pixbuf-csource.vcxproj
deleted file mode 100644
index 374164fc2..000000000
--- a/win32/vs10/gdk-pixbuf-csource.vcxproj
+++ /dev/null
@@ -1,179 +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>{3689C772-49A9-4E32-8161-686E1381ADB4}</ProjectGuid>
-    <RootNamespace>gdk-pixbuf-csource</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>
-    <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="gdk-pixbuf-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="gdk-pixbuf-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="gdk-pixbuf-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="gdk-pixbuf-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>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;$(GdkPixbufDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>$(GdkPixbufDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;$(GdkPixbufDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>$(GdkPixbufDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\gdk-pixbuf\gdk-pixbuf-csource.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="gdk-pixbuf.vcxproj">
-      <Project>{01ade22d-f6ec-4d09-8fe1-b9a97dec2ba3}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/win32/vs10/gdk-pixbuf-csource.vcxproj.filters b/win32/vs10/gdk-pixbuf-csource.vcxproj.filters
deleted file mode 100644
index 51d1103b8..000000000
--- a/win32/vs10/gdk-pixbuf-csource.vcxproj.filters
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\gdk-pixbuf\gdk-pixbuf-csource.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
diff --git a/win32/vs10/gdk-pixbuf-gen-srcs.props b/win32/vs10/gdk-pixbuf-gen-srcs.props
deleted file mode 100644
index 167a673f3..000000000
--- a/win32/vs10/gdk-pixbuf-gen-srcs.props
+++ /dev/null
@@ -1,17 +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="gdk-pixbuf-build-defines.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros">
-    <GenConfigH>copy ..\..\config.h.win32 ..\..\config.h</GenConfigH>
-  </PropertyGroup>
-  <PropertyGroup>
-    <_PropertySheetDisplayName>gdk-pixbufgensrcsprops</_PropertySheetDisplayName>
-  </PropertyGroup>
-  <ItemGroup>
-    <BuildMacro Include="GenConfigH">
-      <Value>$(GenConfigH)</Value>
-    </BuildMacro>
-  </ItemGroup>
-</Project>
diff --git a/win32/vs10/gdk-pixbuf-install.propsin b/win32/vs10/gdk-pixbuf-install.propsin
deleted file mode 100644
index 1abc6f874..000000000
--- a/win32/vs10/gdk-pixbuf-install.propsin
+++ /dev/null
@@ -1,49 +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="gdk-pixbuf-build-defines.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros">
-    <BinDir>$(SolutionDir)$(Configuration)\$(Platform)\bin</BinDir>
-    <GdkPixbufDoInstall>
-echo on
-
-mkdir $(CopyDir)\bin
-copy $(BinDir)\$(GdkPixbufDllPrefix)gdk_pixbuf$(GdkPixbufDllSuffix).dll $(CopyDir)\bin
-copy $(BinDir)\$(GdkPixbufDllPrefix)gdk_pixbuf$(GdkPixbufDllSuffix).pdb $(CopyDir)\bin
-copy $(BinDir)\gdk-pixbuf-*.exe $(CopyDir)\bin
-copy $(BinDir)\gdk-pixbuf-*.pdb $(CopyDir)\bin
-
-mkdir $(CopyDir)\lib
-copy $(BinDir)\gdk_pixbuf-$(ApiVersion).lib $(CopyDir)\lib
-
-mkdir $(CopyDir)\include\gdk-pixbuf-$(ApiVersion)\gdk-pixbuf
-#include "gdk-pixbuf.vs10.headers"
-
-if exist ..\gdk-pixbuf-2.0.pc (mkdir $(CopyDir)\lib\pkgconfig &amp; copy ..\gdk-pixbuf-2.0.pc $(CopyDir)\lib\pkgconfig)
-    </GdkPixbufDoInstall>
-    <GenGdkPixbufPC>if exist $(PythonPath)\python.exe $(PythonPath)\python.exe ..\gdkpixbuf-pc.py --version=$(GdkPixbufMajorVersion).$(GdkPixbufMinorVersion).$(GdkPixbufMicroVersion) --prefix=$(CopyDir)</GenGdkPixbufPC>
-    <GenGdkPixbufPCX64>if exist $(PythonPathX64)\python.exe $(PythonPathX64)\python.exe ..\gdkpixbuf-pc.py --version=$(GdkPixbufMajorVersion).$(GdkPixbufMinorVersion).$(GdkPixbufMicroVersion) --prefix=$(CopyDir)</GenGdkPixbufPCX64>
-    <GdkPixbufPCFiles>..\gdk-pixbuf-2.0.pc</GdkPixbufPCFiles>
-  </PropertyGroup>
-  <PropertyGroup>
-    <_PropertySheetDisplayName>gdk-pixbufinstallprops</_PropertySheetDisplayName>
-  </PropertyGroup>
-  <ItemGroup>
-    <BuildMacro Include="BinDir">
-      <Value>$(BinDir)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GdkPixbufDoInstall">
-      <Value>$(GdkPixbufDoInstall)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GenGdkPixbufPC">
-      <Value>$(GenGdkPixbufPC)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GenGdkPixbufPCX64">
-      <Value>$(GenGdkPixbufPCX64)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GdkPixbufPCFiles">
-      <Value>$(GdkPixbufPCFiles)</Value>
-    </BuildMacro>
-  </ItemGroup>
-</Project>
diff --git a/win32/vs10/gdk-pixbuf-install.vcxproj b/win32/vs10/gdk-pixbuf-install.vcxproj
deleted file mode 100644
index cd651e1fe..000000000
--- a/win32/vs10/gdk-pixbuf-install.vcxproj
+++ /dev/null
@@ -1,130 +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>{FC5AADB5-95CD-4BF0-BA8B-0C16FE7074FB}</ProjectGuid>
-    <RootNamespace>gdkpixbufinstall</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="gdk-pixbuf-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="gdk-pixbuf-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="gdk-pixbuf-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="gdk-pixbuf-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)'=='Release|Win32'">
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-  </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'">$(GdkPixbufPCFiles)</AdditionalInputs>
-      <Command Condition="'$(Configuration)'=='Debug'">$(GdkPixbufDoInstall)</Command>
-      <Outputs Condition="'$(Configuration)'=='Debug'">blah;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)'=='Release'">Installing Build Results...</Message>
-      <AdditionalInputs Condition="'$(Configuration)'=='Release'">$(GdkPixbufPCFiles)</AdditionalInputs>
-      <Command Condition="'$(Configuration)'=='Release'">$(GdkPixbufDoInstall)</Command>
-      <Outputs Condition="'$(Configuration)'=='Release'">blah;%(Outputs)</Outputs>
-    </CustomBuild>
-    <CustomBuild Include="..\..\gdk-pixbuf-2.0.pc.in">
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating .pc files...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GenGdkPixbufPC)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GdkPixbufPCFiles);%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Generating .pc files...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GenGdkPixbufPCX64)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GdkPixbufPCFiles);%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Generating .pc files...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GenGdkPixbufPC)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GdkPixbufPCFiles);%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Generating .pc files...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GenGdkPixbufPCX64)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GdkPixbufPCFiles);%(Outputs)</Outputs>
-    </CustomBuild>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="gdk-pixbuf-csource.vcxproj">
-      <Project>{3689c772-49a9-4e32-8161-686e1381adb4}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="gdk-pixbuf-pixdata.vcxproj">
-      <Project>{2ad2ff07-0514-41a8-8a32-920c744ea1a6}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="gdk-pixbuf-query-loaders.vcxproj">
-      <Project>{7212330c-14df-4815-9e3b-4bdb3d21f665}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="gdk-pixbuf.vcxproj">
-      <Project>{01ade22d-f6ec-4d09-8fe1-b9a97dec2ba3}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/win32/vs10/gdk-pixbuf-install.vcxproj.filters b/win32/vs10/gdk-pixbuf-install.vcxproj.filters
deleted file mode 100644
index bcde1a791..000000000
--- a/win32/vs10/gdk-pixbuf-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</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <CustomBuild Include="..\..\config.h.win32"><Filter>Resource Files</Filter></CustomBuild>
-    <CustomBuild Include="..\..\gdk-pixbuf-2.0.pc.in"><Filter>Resource Files</Filter></CustomBuild>
-  </ItemGroup>
-</Project>
diff --git a/win32/vs10/gdk-pixbuf-pixdata.vcxproj b/win32/vs10/gdk-pixbuf-pixdata.vcxproj
deleted file mode 100644
index 79675d33b..000000000
--- a/win32/vs10/gdk-pixbuf-pixdata.vcxproj
+++ /dev/null
@@ -1,172 +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>{2AD2FF07-0514-41A8-8A32-920C744EA1A6}</ProjectGuid>
-    <RootNamespace>gdkpixbufpixdata</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="gdk-pixbuf-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="gdk-pixbuf-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="gdk-pixbuf-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="gdk-pixbuf-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;$(GdkPixbufDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</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>$(GdkPixbufDefines);%(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'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;$(GdkPixbufDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>$(GdkPixbufDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\gdk-pixbuf\gdk-pixbuf-pixdata.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="gdk-pixbuf.vcxproj">
-      <Project>{01ade22d-f6ec-4d09-8fe1-b9a97dec2ba3}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/win32/vs10/gdk-pixbuf-pixdata.vcxproj.filters b/win32/vs10/gdk-pixbuf-pixdata.vcxproj.filters
deleted file mode 100644
index 21d9ee66a..000000000
--- a/win32/vs10/gdk-pixbuf-pixdata.vcxproj.filters
+++ /dev/null
@@ -1,14 +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>

-  </ItemGroup>

-  <ItemGroup>

-    <ClCompile Include="..\..\gdk-pixbuf\gdk-pixbuf-pixdata.c">

-      <Filter>Sources</Filter>

-    </ClCompile>

-  </ItemGroup>

-</Project>

diff --git a/win32/vs10/gdk-pixbuf-query-loaders.vcxproj b/win32/vs10/gdk-pixbuf-query-loaders.vcxproj
deleted file mode 100644
index 5ebc5e28b..000000000
--- a/win32/vs10/gdk-pixbuf-query-loaders.vcxproj
+++ /dev/null
@@ -1,176 +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>{7212330C-14DF-4815-9E3B-4BDB3D21F665}</ProjectGuid>
-    <RootNamespace>gdkpixbufqueryloaders</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="gdk-pixbuf-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="gdk-pixbuf-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="gdk-pixbuf-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="gdk-pixbuf-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>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;$(GdkPixbufDefines);$(GdkPixbufLibdirDefine);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <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>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>$(GdkPixbufDefines);$(GdkPixbufLibdirDefine);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;$(GdkPixbufDefines);$(GdkPixbufLibdirDefine);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>$(GdkPixbufDefines);$(GdkPixbufLibdirDefine);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\gdk-pixbuf\queryloaders.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="gdk-pixbuf.vcxproj">
-      <Project>{01ade22d-f6ec-4d09-8fe1-b9a97dec2ba3}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/win32/vs10/gdk-pixbuf-query-loaders.vcxproj.filters b/win32/vs10/gdk-pixbuf-query-loaders.vcxproj.filters
deleted file mode 100644
index 39f085dcf..000000000
--- a/win32/vs10/gdk-pixbuf-query-loaders.vcxproj.filters
+++ /dev/null
@@ -1,14 +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>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\gdk-pixbuf\queryloaders.c">
-      <Filter>Sources</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
diff --git a/win32/vs10/gdk-pixbuf-version-paths.props.in b/win32/vs10/gdk-pixbuf-version-paths.props.in
deleted file mode 100644
index 8ed4bafae..000000000
--- a/win32/vs10/gdk-pixbuf-version-paths.props.in
+++ /dev/null
@@ -1,74 +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>
-    <GdkPixbufMajorVersion>@GDK_PIXBUF_MAJOR@</GdkPixbufMajorVersion>
-    <GdkPixbufMinorVersion>@GDK_PIXBUF_MINOR@</GdkPixbufMinorVersion>
-    <GdkPixbufMicroVersion>@GDK_PIXBUF_MICRO@</GdkPixbufMicroVersion>
-    <ApiVersion>2.0</ApiVersion>
-    <GlibEtcInstallRoot>$(SolutionDir)\..\..\..\vs$(VSVer)\$(Platform)</GlibEtcInstallRoot>
-    <CopyDir>$(GlibEtcInstallRoot)</CopyDir>
-    <DefDir>$(SolutionDir)$(Configuration)\$(PlatformName)\obj\$(ProjectName)\</DefDir>
-    <GdkPixbufLibtoolCompatibleDllPrefix>lib</GdkPixbufLibtoolCompatibleDllPrefix>
-    <GdkPixbufLibtoolCompatibleDllSuffix>-$(ApiVersion)-0</GdkPixbufLibtoolCompatibleDllSuffix>
-    <GdkPixbufSeparateVSDllPrefix />
-    <GdkPixbufSeparateVSDllSuffix>-2-vs$(VSVer)</GdkPixbufSeparateVSDllSuffix>
-    <GdkPixbufDllPrefix>$(GdkPixbufSeparateVSDllPrefix)</GdkPixbufDllPrefix>
-    <GdkPixbufDllSuffix>$(GdkPixbufSeparateVSDllSuffix)</GdkPixbufDllSuffix>
-    <PythonPath>c:\python34</PythonPath>
-    <PythonPathX64>$(PythonPath).x64</PythonPathX64>
-  </PropertyGroup>
-  <PropertyGroup>
-    <_PropertySheetDisplayName>gdk-versionpathsprops</_PropertySheetDisplayName>
-  </PropertyGroup>
-  <ItemGroup>
-    <BuildMacro Include="VSVer">
-      <Value>$(VSVer)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GdkPixbufMajorVersion">
-      <Value>$(GdkPixbufMajorVersion)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GdkPixbufMinorVersion">
-      <Value>$(GdkPixbufMinorVersion)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GdkPixbufMicroVersion">
-      <Value>$(GdkPixbufMicroVersion)</Value>
-    </BuildMacro>
-    <BuildMacro Include="ApiVersion">
-      <Value>$(ApiVersion)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GlibEtcInstallRoot">
-      <Value>$(GlibEtcInstallRoot)</Value>
-    </BuildMacro>
-    <BuildMacro Include="CopyDir">
-      <Value>$(CopyDir)</Value>
-    </BuildMacro>
-    <BuildMacro Include="DefDir">
-      <Value>$(DefDir)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GdkPixbufLibtoolCompatibleDllPrefix">
-      <Value>$(GdkPixbufLibtoolCompatibleDllPrefix)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GdkPixbufLibtoolCompatibleDllSuffix">
-      <Value>$(GdkPixbufLibtoolCompatibleDllSuffix)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GdkPixbufSeparateVSDllPrefix">
-      <Value>$(GdkPixbufSeparateVSDllPrefix)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GdkPixbufSeparateVSDllSuffix">
-      <Value>$(GdkPixbufSeparateVSDllSuffix)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GdkPixbufDllPrefix">
-      <Value>$(GdkPixbufDllPrefix)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GdkPixbufDllSuffix">
-      <Value>$(GdkPixbufDllSuffix)</Value>
-    </BuildMacro>
-    <BuildMacro Include="PythonPath">
-      <Value>$(PythonPath)</Value>
-    </BuildMacro>
-    <BuildMacro Include="PythonPathX64">
-      <Value>$(PythonPathX64)</Value>
-    </BuildMacro>
-  </ItemGroup>
-</Project>
diff --git a/win32/vs10/gdk-pixbuf.sln b/win32/vs10/gdk-pixbuf.sln
deleted file mode 100644
index 6e7cd44a5..000000000
--- a/win32/vs10/gdk-pixbuf.sln
+++ /dev/null
@@ -1,110 +0,0 @@
-

-Microsoft Visual Studio Solution File, Format Version 11.00

-# Visual Studio 2010

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdk-pixbuf", "gdk-pixbuf.vcxproj", "{01ADE22D-F6EC-4D09-8FE1-B9A97DEC2BA3}"

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdk-pixbuf-csource", "gdk-pixbuf-csource.vcxproj", "{3689C772-49A9-4E32-8161-686E1381ADB4}"

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdk-pixbuf-install", "gdk-pixbuf-install.vcxproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7074FB}"

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdk-pixbuf-query-loaders", "gdk-pixbuf-query-loaders.vcxproj", "{7212330C-14DF-4815-9E3B-4BDB3D21F665}"

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdk-pixbuf-pixdata", "gdk-pixbuf-pixdata.vcxproj", "{2AD2FF07-0514-41A8-8A32-920C744EA1A6}"

-EndProject

-Global

-	GlobalSection(SolutionConfigurationPlatforms) = preSolution

-		Debug|Win32 = Debug|Win32

-		Debug|x64 = Debug|x64

-		Debug_GDI+|Win32 = Debug_GDI+|Win32

-		Debug_GDI+|x64 = Debug_GDI+|x64

-		Release|Win32 = Release|Win32

-		Release|x64 = Release|x64

-		Release_GDI+|Win32 = Release_GDI+|Win32

-		Release_GDI+|x64 = Release_GDI+|x64

-	EndGlobalSection

-	GlobalSection(ProjectConfigurationPlatforms) = postSolution

-		{01ADE22D-F6EC-4D09-8FE1-B9A97DEC2BA3}.Debug|Win32.ActiveCfg = Debug|Win32

-		{01ADE22D-F6EC-4D09-8FE1-B9A97DEC2BA3}.Debug|Win32.Build.0 = Debug|Win32

-		{01ADE22D-F6EC-4D09-8FE1-B9A97DEC2BA3}.Debug|x64.ActiveCfg = Debug|x64

-		{01ADE22D-F6EC-4D09-8FE1-B9A97DEC2BA3}.Debug|x64.Build.0 = Debug|x64

-		{01ADE22D-F6EC-4D09-8FE1-B9A97DEC2BA3}.Debug_GDI+|Win32.ActiveCfg = Debug_GDI+|Win32

-		{01ADE22D-F6EC-4D09-8FE1-B9A97DEC2BA3}.Debug_GDI+|Win32.Build.0 = Debug_GDI+|Win32

-		{01ADE22D-F6EC-4D09-8FE1-B9A97DEC2BA3}.Debug_GDI+|x64.ActiveCfg = Debug_GDI+|x64

-		{01ADE22D-F6EC-4D09-8FE1-B9A97DEC2BA3}.Debug_GDI+|x64.Build.0 = Debug_GDI+|x64

-		{01ADE22D-F6EC-4D09-8FE1-B9A97DEC2BA3}.Release|Win32.ActiveCfg = Release|Win32

-		{01ADE22D-F6EC-4D09-8FE1-B9A97DEC2BA3}.Release|Win32.Build.0 = Release|Win32

-		{01ADE22D-F6EC-4D09-8FE1-B9A97DEC2BA3}.Release|x64.ActiveCfg = Release|x64

-		{01ADE22D-F6EC-4D09-8FE1-B9A97DEC2BA3}.Release|x64.Build.0 = Release|x64

-		{01ADE22D-F6EC-4D09-8FE1-B9A97DEC2BA3}.Release_GDI+|Win32.ActiveCfg = Release_GDI+|Win32

-		{01ADE22D-F6EC-4D09-8FE1-B9A97DEC2BA3}.Release_GDI+|Win32.Build.0 = Release_GDI+|Win32

-		{01ADE22D-F6EC-4D09-8FE1-B9A97DEC2BA3}.Release_GDI+|x64.ActiveCfg = Release_GDI+|x64

-		{01ADE22D-F6EC-4D09-8FE1-B9A97DEC2BA3}.Release_GDI+|x64.Build.0 = Release_GDI+|x64

-		{3689C772-49A9-4E32-8161-686E1381ADB4}.Debug|Win32.ActiveCfg = Debug|Win32

-		{3689C772-49A9-4E32-8161-686E1381ADB4}.Debug|Win32.Build.0 = Debug|Win32

-		{3689C772-49A9-4E32-8161-686E1381ADB4}.Debug|x64.ActiveCfg = Debug|x64

-		{3689C772-49A9-4E32-8161-686E1381ADB4}.Debug|x64.Build.0 = Debug|x64

-		{3689C772-49A9-4E32-8161-686E1381ADB4}.Debug_GDI+|Win32.ActiveCfg = Debug|Win32

-		{3689C772-49A9-4E32-8161-686E1381ADB4}.Debug_GDI+|Win32.Build.0 = Debug|Win32

-		{3689C772-49A9-4E32-8161-686E1381ADB4}.Debug_GDI+|x64.ActiveCfg = Debug|x64

-		{3689C772-49A9-4E32-8161-686E1381ADB4}.Debug_GDI+|x64.Build.0 = Debug|x64

-		{3689C772-49A9-4E32-8161-686E1381ADB4}.Release|Win32.ActiveCfg = Release|Win32

-		{3689C772-49A9-4E32-8161-686E1381ADB4}.Release|Win32.Build.0 = Release|Win32

-		{3689C772-49A9-4E32-8161-686E1381ADB4}.Release|x64.ActiveCfg = Release|x64

-		{3689C772-49A9-4E32-8161-686E1381ADB4}.Release|x64.Build.0 = Release|x64

-		{3689C772-49A9-4E32-8161-686E1381ADB4}.Release_GDI+|Win32.ActiveCfg = Release|Win32

-		{3689C772-49A9-4E32-8161-686E1381ADB4}.Release_GDI+|Win32.Build.0 = Release|Win32

-		{3689C772-49A9-4E32-8161-686E1381ADB4}.Release_GDI+|x64.ActiveCfg = Release|x64

-		{3689C772-49A9-4E32-8161-686E1381ADB4}.Release_GDI+|x64.Build.0 = Release|x64

-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7074FB}.Debug|Win32.ActiveCfg = Debug|Win32

-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7074FB}.Debug|Win32.Build.0 = Debug|Win32

-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7074FB}.Debug|x64.ActiveCfg = Debug|x64

-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7074FB}.Debug|x64.Build.0 = Debug|x64

-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7074FB}.Debug_GDI+|Win32.ActiveCfg = Debug|Win32

-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7074FB}.Debug_GDI+|Win32.Build.0 = Debug|Win32

-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7074FB}.Debug_GDI+|x64.ActiveCfg = Debug|x64

-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7074FB}.Debug_GDI+|x64.Build.0 = Debug|x64

-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7074FB}.Release|Win32.ActiveCfg = Release|Win32

-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7074FB}.Release|Win32.Build.0 = Release|Win32

-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7074FB}.Release|x64.ActiveCfg = Release|x64

-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7074FB}.Release|x64.Build.0 = Release|x64

-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7074FB}.Release_GDI+|Win32.ActiveCfg = Release|Win32

-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7074FB}.Release_GDI+|Win32.Build.0 = Release|Win32

-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7074FB}.Release_GDI+|x64.ActiveCfg = Release|x64

-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7074FB}.Release_GDI+|x64.Build.0 = Release|x64

-		{7212330C-14DF-4815-9E3B-4BDB3D21F665}.Debug|Win32.ActiveCfg = Debug|Win32

-		{7212330C-14DF-4815-9E3B-4BDB3D21F665}.Debug|Win32.Build.0 = Debug|Win32

-		{7212330C-14DF-4815-9E3B-4BDB3D21F665}.Debug|x64.ActiveCfg = Debug|x64

-		{7212330C-14DF-4815-9E3B-4BDB3D21F665}.Debug|x64.Build.0 = Debug|x64

-		{7212330C-14DF-4815-9E3B-4BDB3D21F665}.Debug_GDI+|Win32.ActiveCfg = Debug|Win32

-		{7212330C-14DF-4815-9E3B-4BDB3D21F665}.Debug_GDI+|Win32.Build.0 = Debug|Win32

-		{7212330C-14DF-4815-9E3B-4BDB3D21F665}.Debug_GDI+|x64.ActiveCfg = Debug|x64

-		{7212330C-14DF-4815-9E3B-4BDB3D21F665}.Debug_GDI+|x64.Build.0 = Debug|x64

-		{7212330C-14DF-4815-9E3B-4BDB3D21F665}.Release|Win32.ActiveCfg = Release|Win32

-		{7212330C-14DF-4815-9E3B-4BDB3D21F665}.Release|Win32.Build.0 = Release|Win32

-		{7212330C-14DF-4815-9E3B-4BDB3D21F665}.Release|x64.ActiveCfg = Release|x64

-		{7212330C-14DF-4815-9E3B-4BDB3D21F665}.Release|x64.Build.0 = Release|x64

-		{7212330C-14DF-4815-9E3B-4BDB3D21F665}.Release_GDI+|Win32.ActiveCfg = Release|Win32

-		{7212330C-14DF-4815-9E3B-4BDB3D21F665}.Release_GDI+|Win32.Build.0 = Release|Win32

-		{7212330C-14DF-4815-9E3B-4BDB3D21F665}.Release_GDI+|x64.ActiveCfg = Release|x64

-		{7212330C-14DF-4815-9E3B-4BDB3D21F665}.Release_GDI+|x64.Build.0 = Release|x64

-		{2AD2FF07-0514-41A8-8A32-920C744EA1A6}.Debug|Win32.ActiveCfg = Debug|Win32

-		{2AD2FF07-0514-41A8-8A32-920C744EA1A6}.Debug|Win32.Build.0 = Debug|Win32

-		{2AD2FF07-0514-41A8-8A32-920C744EA1A6}.Debug|x64.ActiveCfg = Debug|x64

-		{2AD2FF07-0514-41A8-8A32-920C744EA1A6}.Debug|x64.Build.0 = Debug|x64

-		{2AD2FF07-0514-41A8-8A32-920C744EA1A6}.Debug_GDI+|Win32.ActiveCfg = Debug|Win32

-		{2AD2FF07-0514-41A8-8A32-920C744EA1A6}.Debug_GDI+|Win32.Build.0 = Debug|Win32

-		{2AD2FF07-0514-41A8-8A32-920C744EA1A6}.Debug_GDI+|x64.ActiveCfg = Debug|x64

-		{2AD2FF07-0514-41A8-8A32-920C744EA1A6}.Debug_GDI+|x64.Build.0 = Debug|x64

-		{2AD2FF07-0514-41A8-8A32-920C744EA1A6}.Release|Win32.ActiveCfg = Release|Win32

-		{2AD2FF07-0514-41A8-8A32-920C744EA1A6}.Release|Win32.Build.0 = Release|Win32

-		{2AD2FF07-0514-41A8-8A32-920C744EA1A6}.Release|x64.ActiveCfg = Release|x64

-		{2AD2FF07-0514-41A8-8A32-920C744EA1A6}.Release|x64.Build.0 = Release|x64

-		{2AD2FF07-0514-41A8-8A32-920C744EA1A6}.Release_GDI+|Win32.ActiveCfg = Release|Win32

-		{2AD2FF07-0514-41A8-8A32-920C744EA1A6}.Release_GDI+|Win32.Build.0 = Release|Win32

-		{2AD2FF07-0514-41A8-8A32-920C744EA1A6}.Release_GDI+|x64.ActiveCfg = Release|x64

-		{2AD2FF07-0514-41A8-8A32-920C744EA1A6}.Release_GDI+|x64.Build.0 = Release|x64

-	EndGlobalSection

-	GlobalSection(SolutionProperties) = preSolution

-		HideSolutionNode = FALSE

-	EndGlobalSection

-EndGlobal

diff --git a/win32/vs10/gdk-pixbuf.vcxproj.filtersin b/win32/vs10/gdk-pixbuf.vcxproj.filtersin
deleted file mode 100644
index a2feeefe7..000000000
--- a/win32/vs10/gdk-pixbuf.vcxproj.filtersin
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Source Files\GDI+">
-      <UniqueIdentifier>{c4d26c4e-e8c9-48fa-b402-0ab65b5eee2f}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\Opensource_Imaging">
-      <UniqueIdentifier>{744a1b93-b9d4-44cc-a3c0-15944c405223}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files">
-      <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</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-#include "gdk-pixbuf.vs10.sourcefiles.filters"
-    <ClCompile Include="..\..\gdk-pixbuf\pixops\pixops.c"><Filter>Source Files</Filter></ClCompile>
-    <ClCompile Include="..\..\gdk-pixbuf\io-gdip-animation.c"><Filter>Source Files\GDI+</Filter></ClCompile>
-    <ClCompile Include="..\..\gdk-pixbuf\io-gdip-bmp.c"><Filter>Source Files\GDI+</Filter></ClCompile>
-    <ClCompile Include="..\..\gdk-pixbuf\io-gdip-emf.c"><Filter>Source Files\GDI+</Filter></ClCompile>
-    <ClCompile Include="..\..\gdk-pixbuf\io-gdip-gif.c"><Filter>Source Files\GDI+</Filter></ClCompile>
-    <ClCompile Include="..\..\gdk-pixbuf\io-gdip-ico.c"><Filter>Source Files\GDI+</Filter></ClCompile>
-    <ClCompile Include="..\..\gdk-pixbuf\io-gdip-jpeg.c"><Filter>Source Files\GDI+</Filter></ClCompile>
-    <ClCompile Include="..\..\gdk-pixbuf\io-gdip-tiff.c"><Filter>Source Files\GDI+</Filter></ClCompile>
-    <ClCompile Include="..\..\gdk-pixbuf\io-gdip-utils.c"><Filter>Source Files\GDI+</Filter></ClCompile>
-    <ClCompile Include="..\..\gdk-pixbuf\io-gdip-wmf.c"><Filter>Source Files\GDI+</Filter></ClCompile>
-    <ClCompile Include="..\..\gdk-pixbuf\io-bmp.c"><Filter>Source Files\Opensource_Imaging</Filter></ClCompile>
-    <ClCompile Include="..\..\gdk-pixbuf\io-gif.c"><Filter>Source Files\Opensource_Imaging</Filter></ClCompile>
-    <ClCompile Include="..\..\gdk-pixbuf\io-gif-animation.c"><Filter>Source Files\Opensource_Imaging</Filter></ClCompile>
-    <ClCompile Include="..\..\gdk-pixbuf\io-ico.c"><Filter>Source Files\Opensource_Imaging</Filter></ClCompile>
-    <ClCompile Include="..\..\gdk-pixbuf\io-jasper.c"><Filter>Source Files\Opensource_Imaging</Filter></ClCompile>
-    <ClCompile Include="..\..\gdk-pixbuf\io-jpeg.c"><Filter>Source Files\Opensource_Imaging</Filter></ClCompile>
-    <ClCompile Include="..\..\gdk-pixbuf\io-tiff.c"><Filter>Source Files\Opensource_Imaging</Filter></ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <CustomBuild Include="..\..\config.h.win32"><Filter>Resource Files</Filter></CustomBuild>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="..\..\gdk-pixbuf\gdk_pixbuf.rc"><Filter>Resource Files</Filter></ResourceCompile>
-  </ItemGroup>
-</Project>
diff --git a/win32/vs10/gdk-pixbuf.vcxprojin b/win32/vs10/gdk-pixbuf.vcxprojin
deleted file mode 100644
index 81934b9fe..000000000
--- a/win32/vs10/gdk-pixbuf.vcxprojin
+++ /dev/null
@@ -1,404 +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="Debug_GDI+|Win32">
-      <Configuration>Debug_GDI+</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug_GDI+|x64">
-      <Configuration>Debug_GDI+</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>
-    <ProjectConfiguration Include="Release_GDI+|Win32">
-      <Configuration>Release_GDI+</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release_GDI+|x64">
-      <Configuration>Release_GDI+</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{01ADE22D-F6EC-4D09-8FE1-B9A97DEC2BA3}</ProjectGuid>
-    <RootNamespace>gdk-pixbuf</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>
-    <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_GDI+|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_GDI+|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>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_GDI+|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_GDI+|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="gdk-pixbuf-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="gdk-pixbuf-gen-srcs.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_GDI+|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gdk-pixbuf-gen-srcs.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_GDI+|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gdk-pixbuf-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="gdk-pixbuf-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="gdk-pixbuf-gen-srcs.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_GDI+|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gdk-pixbuf-gen-srcs.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_GDI+|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gdk-pixbuf-gen-srcs.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <LinkIncremental Condition="'$(Configuration)'=='Debug'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)'=='Debug_GDI+'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)'=='Debug_GDI+'">Debug\$(Platform)\bin\</OutDir>
-    <LinkIncremental Condition="'$(Configuration)'=='Release_GDI+'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)'=='Release_GDI+'">Release\$(Platform)\bin\</OutDir>
-    <LinkIncremental Condition="'$(Configuration)'=='Release'">false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_GDI+|Win32'">
-    <ClCompile>
-      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;$(GdkPixbufDefines);$(GDIP_MACROS);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>$(GdipLibs);%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(GdkPixbufDllPrefix)gdk_pixbuf$(GdkPixbufDllSuffix).dll</OutputFile>
-      <ImportLibrary>$(OutDir)gdk_pixbuf-$(ApiVersion).lib</ImportLibrary>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(GdkPixbufDllPrefix)gdk_pixbuf$(GdkPixbufDllSuffix).pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_GDI+|Win32'">
-    <ClCompile>
-      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
-      <Optimization>Full</Optimization>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>$(GdkPixbufDefines);$(GDIP_MACROS);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>$(GdipLibs);%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(GdkPixbufDllPrefix)gdk_pixbuf$(GdkPixbufDllSuffix).dll</OutputFile>
-      <ImportLibrary>$(OutDir)gdk_pixbuf-$(ApiVersion).lib</ImportLibrary>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(GdkPixbufDllPrefix)gdk_pixbuf$(GdkPixbufDllSuffix).pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_GDI+|x64'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;$(GdkPixbufDefines);$(GDIP_MACROS);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>$(GdipLibs);%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(GdkPixbufDllPrefix)gdk_pixbuf$(GdkPixbufDllSuffix).dll</OutputFile>
-      <ImportLibrary>$(OutDir)gdk_pixbuf-$(ApiVersion).lib</ImportLibrary>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(GdkPixbufDllPrefix)gdk_pixbuf$(GdkPixbufDllSuffix).pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_GDI+|x64'">
-    <ClCompile>
-      <PreprocessorDefinitions>$(GdkPixbufDefines);$(GDIP_MACROS);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>$(GdipLibs);%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(GdkPixbufDllPrefix)gdk_pixbuf$(GdkPixbufDllSuffix).dll</OutputFile>
-      <ImportLibrary>$(OutDir)gdk_pixbuf-$(ApiVersion).lib</ImportLibrary>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(GdkPixbufDllPrefix)gdk_pixbuf$(GdkPixbufDllSuffix).pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>$(GdkPixbufDefines);$(NOGDIP_MACROS);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>$(ImagingLibs);%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(GdkPixbufDllPrefix)gdk_pixbuf$(GdkPixbufDllSuffix).dll</OutputFile>
-      <ImportLibrary>$(OutDir)gdk_pixbuf-$(ApiVersion).lib</ImportLibrary>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(GdkPixbufDllPrefix)gdk_pixbuf$(GdkPixbufDllSuffix).pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
-      <Optimization>Full</Optimization>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>$(GdkPixbufDefines);$(NOGDIP_MACROS);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>$(ImagingLibs);%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(GdkPixbufDllPrefix)gdk_pixbuf$(GdkPixbufDllSuffix).dll</OutputFile>
-      <ImportLibrary>$(OutDir)gdk_pixbuf-$(ApiVersion).lib</ImportLibrary>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(GdkPixbufDllPrefix)gdk_pixbuf$(GdkPixbufDllSuffix).pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;$(GdkPixbufDefines);$(NOGDIP_MACROS);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>$(ImagingLibs);%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(GdkPixbufDllPrefix)gdk_pixbuf$(GdkPixbufDllSuffix).dll</OutputFile>
-      <ImportLibrary>$(OutDir)gdk_pixbuf-$(ApiVersion).lib</ImportLibrary>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(GdkPixbufDllPrefix)gdk_pixbuf$(GdkPixbufDllSuffix).pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <PreprocessorDefinitions>$(GdkPixbufDefines);$(NOGDIP_MACROS);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>$(ImagingLibs);%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(GdkPixbufDllPrefix)gdk_pixbuf$(GdkPixbufDllSuffix).dll</OutputFile>
-      <ImportLibrary>$(OutDir)gdk_pixbuf-$(ApiVersion).lib</ImportLibrary>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(GdkPixbufDllPrefix)gdk_pixbuf$(GdkPixbufDllSuffix).pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-#include "gdk-pixbuf.vs10.sourcefiles"
-    <ClCompile Include="..\..\gdk-pixbuf\pixops\pixops.c" />
-    <ClCompile Include="..\..\gdk-pixbuf\io-gdip-animation.c">
-      <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\gdk-pixbuf\io-gdip-bmp.c">
-      <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\gdk-pixbuf\io-gdip-emf.c">
-      <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\gdk-pixbuf\io-gdip-gif.c">
-      <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\gdk-pixbuf\io-gdip-ico.c">
-      <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\gdk-pixbuf\io-gdip-jpeg.c">
-      <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\gdk-pixbuf\io-gdip-tiff.c">
-      <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\gdk-pixbuf\io-gdip-utils.c">
-      <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\gdk-pixbuf\io-gdip-wmf.c">
-      <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\gdk-pixbuf\io-bmp.c">
-      <ExcludedFromBuild Condition="'$(Configuration)'=='Debug_GDI+'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)'=='Release_GDI+'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\gdk-pixbuf\io-gif.c">
-      <ExcludedFromBuild Condition="'$(Configuration)'=='Debug_GDI+'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)'=='Release_GDI+'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\gdk-pixbuf\io-gif-animation.c">
-      <ExcludedFromBuild Condition="'$(Configuration)'=='Debug_GDI+'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)'=='Release_GDI+'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\gdk-pixbuf\io-ico.c">
-      <ExcludedFromBuild Condition="'$(Configuration)'=='Debug_GDI+'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)'=='Release_GDI+'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\gdk-pixbuf\io-jasper.c">
-      <ExcludedFromBuild Condition="'$(Configuration)'=='Debug_GDI+'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)'=='Release_GDI+'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\gdk-pixbuf\io-jpeg.c">
-      <ExcludedFromBuild Condition="'$(Configuration)'=='Debug_GDI+'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)'=='Release_GDI+'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\gdk-pixbuf\io-tiff.c">
-      <ExcludedFromBuild Condition="'$(Configuration)'=='Debug_GDI+'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)'=='Release_GDI+'">true</ExcludedFromBuild>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <CustomBuild Include="..\..\config.h.win32">
-      <Message>Copying config.h from config.h.win32...</Message>
-      <Command>$(GenConfigH)</Command>
-      <Outputs>..\..\config.h;%(Outputs)</Outputs>
-    </CustomBuild>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="..\..\gdk-pixbuf\gdk_pixbuf.rc" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/win32/vs11/Makefile.am b/win32/vs11/Makefile.am
deleted file mode 100644
index 08743e013..000000000
--- a/win32/vs11/Makefile.am
+++ /dev/null
@@ -1,28 +0,0 @@
-EXTRA_DIST = \
-	README.txt	\
-	gdk-pixbuf.sln	\
-	gdk-pixbuf-version-paths.props	\
-	gdk-pixbuf-build-defines.props	\
-	gdk-pixbuf-gen-srcs.props	\
-	gdk-pixbuf-install.props	\
-	gdk-pixbuf.vcxproj	\
-	gdk-pixbuf.vcxproj.filters	\
-	gdk-pixbuf-csource.vcxproj	\
-	gdk-pixbuf-csource.vcxproj.filters	\
-	gdk-pixbuf-query-loaders.vcxproj	\
-	gdk-pixbuf-query-loaders.vcxproj.filters	\
-	gdk-pixbuf-pixdata.vcxproj	\
-	gdk-pixbuf-pixdata.vcxproj.filters	\
-	gdk-pixbuf-install.vcxproj	\
-	gdk-pixbuf-install.vcxproj.filters
-
-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
-
--include $(top_srcdir)/git.mk
diff --git a/win32/vs12/Makefile.am b/win32/vs12/Makefile.am
deleted file mode 100644
index 8a3638959..000000000
--- a/win32/vs12/Makefile.am
+++ /dev/null
@@ -1,28 +0,0 @@
-EXTRA_DIST = \
-	README.txt      \
-	gdk-pixbuf.sln  \
-	gdk-pixbuf-version-paths.props  \
-	gdk-pixbuf-build-defines.props  \
-	gdk-pixbuf-gen-srcs.props	\
-	gdk-pixbuf-install.props	 \
-	gdk-pixbuf.vcxproj      \
-	gdk-pixbuf.vcxproj.filters      \
-	gdk-pixbuf-csource.vcxproj      \
-	gdk-pixbuf-csource.vcxproj.filters      \
-	gdk-pixbuf-query-loaders.vcxproj	 \
-	gdk-pixbuf-query-loaders.vcxproj.filters	 \
-	gdk-pixbuf-pixdata.vcxproj      \
-	gdk-pixbuf-pixdata.vcxproj.filters      \
-	gdk-pixbuf-install.vcxproj		\
-	gdk-pixbuf-install.vcxproj.filters
-
-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
-
--include $(top_srcdir)/git.mk
diff --git a/win32/vs14/Makefile.am b/win32/vs14/Makefile.am
deleted file mode 100644
index 0738fec2e..000000000
--- a/win32/vs14/Makefile.am
+++ /dev/null
@@ -1,28 +0,0 @@
-EXTRA_DIST = \
-	README.txt      \
-	gdk-pixbuf.sln  \
-	gdk-pixbuf-version-paths.props  \
-	gdk-pixbuf-build-defines.props  \
-	gdk-pixbuf-gen-srcs.props	\
-	gdk-pixbuf-install.props	 \
-	gdk-pixbuf.vcxproj      \
-	gdk-pixbuf.vcxproj.filters      \
-	gdk-pixbuf-csource.vcxproj      \
-	gdk-pixbuf-csource.vcxproj.filters      \
-	gdk-pixbuf-query-loaders.vcxproj	 \
-	gdk-pixbuf-query-loaders.vcxproj.filters	 \
-	gdk-pixbuf-pixdata.vcxproj      \
-	gdk-pixbuf-pixdata.vcxproj.filters      \
-	gdk-pixbuf-install.vcxproj		\
-	gdk-pixbuf-install.vcxproj.filters
-
-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
-
--include $(top_srcdir)/git.mk
diff --git a/win32/vs15/Makefile.am b/win32/vs15/Makefile.am
deleted file mode 100644
index 119935ecc..000000000
--- a/win32/vs15/Makefile.am
+++ /dev/null
@@ -1,29 +0,0 @@
-EXTRA_DIST = \
-	README.txt      \
-	gdk-pixbuf.sln  \
-	gdk-pixbuf-version-paths.props  \
-	gdk-pixbuf-build-defines.props  \
-	gdk-pixbuf-gen-srcs.props	\
-	gdk-pixbuf-install.props	 \
-	gdk-pixbuf.vcxproj      \
-	gdk-pixbuf.vcxproj.filters      \
-	gdk-pixbuf-csource.vcxproj      \
-	gdk-pixbuf-csource.vcxproj.filters      \
-	gdk-pixbuf-query-loaders.vcxproj	 \
-	gdk-pixbuf-query-loaders.vcxproj.filters	 \
-	gdk-pixbuf-pixdata.vcxproj      \
-	gdk-pixbuf-pixdata.vcxproj.filters      \
-	gdk-pixbuf-install.vcxproj		\
-	gdk-pixbuf-install.vcxproj.filters
-
-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
-
--include $(top_srcdir)/git.mk
diff --git a/win32/vs9/Makefile.am b/win32/vs9/Makefile.am
deleted file mode 100644
index 66016c638..000000000
--- a/win32/vs9/Makefile.am
+++ /dev/null
@@ -1,25 +0,0 @@
-GENERATED_ITEMS = \
-	gdk-pixbuf.vcproj	\
-	gdk-pixbuf-install.vsprops
-
-EXTRA_DIST =	\
-	README.txt	\
-	gdk-pixbuf.sln	\
-	gdk-pixbuf-version-paths.vsprops	\
-	gdk-pixbuf-build-defines.vsprops	\
-	gdk-pixbuf-gen-srcs.vsprops	\
-	gdk-pixbuf-install.vspropsin	\
-	gdk-pixbuf.vcprojin	\
-	gdk-pixbuf-csource.vcproj	\
-	gdk-pixbuf-query-loaders.vcproj	\
-	gdk-pixbuf-pixdata.vcproj	\
-	gdk-pixbuf-install.vcproj	\
-	$(GENERATED_ITEMS)
-
-gdk-pixbuf-install.vsprops: $(top_srcdir)/win32/vs9/gdk-pixbuf-install.vspropsin gdk-pixbuf.headers
-	$(CPP) -P - <$(top_srcdir)/win32/vs9/gdk-pixbuf-install.vspropsin >$@
-	rm gdk-pixbuf.headers
-
-DISTCLEANFILES = $(GENERATED_ITEMS)
-
--include $(top_srcdir)/git.mk
diff --git a/win32/vs9/README.txt b/win32/vs9/README.txt
deleted file mode 100644
index 099d4e208..000000000
--- a/win32/vs9/README.txt
+++ /dev/null
@@ -1,127 +0,0 @@
-Note that all this is rather experimental.

-

-Please do not build this package in a path that contains spaces to avoid

-possible problems during the build or during the usage of the library.

-

-Please refer to the following GNOME Live! page for more detailed

-instructions on building GDK-Pixbuf 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 GDK-Pixbuf source tree unpacked from a tarball. In a git checkout you

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

-the .in files needed, mainly config.h.win32.in into config.h.win32.

-You will also need to expand gdk-pixbuf.vcprojin here into

-gdk-pixbuf.vcproj.

-

-Two variants of the library are supported here for compilation-one

-that makes use of native GDI+ APIs (The Debug/Release configurations)

-and another that does not use GDI+ (those that use external third

-party image manipulation libraries, the Debug_NoGDIP/Release_NoGDIP

-configurations).  Note that both variants require LibPNG and ZLib, and

-both variants have the image loaders built into the main GDK-Pixbuf library.

-

-If one wants to build additional GDK-Pixbuf image loaders/modules that are

-not included in the main GDK-Pixbuf library, such as the one included in

-librsvg, he/she needs to place the compiled loader DLL (preferably built

-with Visual C++ 2008) into the following location:

-<parent_folder_of_the_GDK-Pixbuf_DLL>\lib\gdk-pixbuf-2.0\2.10.0\loaders\

-and run the gdk-pixbuf-query-loaders utility to generate a loaders.cache

-file in <parent_folder_of_the_GDK-Pixbuf_DLL>\lib\gdk-pixbuf-2.0\2.10.0.

-

-The dependencies for this package are gettext-runtime (libintl), GLib*

-ZLib and LibPNG at the minimum.  Note that if you intend to build GDK-Pixbuf

-that does not use GDI+, you will also need the IJG JPEG libraries, libTIFF and

-libjasper (for JPEG-2000 operations).

-

-Please note that the Visual Studio project files will typically link to the

-latest stable release of LibPNG which the GDK-Pixbuf codebase supports by

-default.  If you intend to use and link to an older version of LibPNG, you

-may change the "Additional Dependencies" setting accordingly (such as changing

-from libpng16.lib to libpng14.lib) for the GDK-Pixbuf project.  The minimum

-supported release series for LibPNG is 1.0.x at this time of writing.

-

-For the Dependencies, you may either:

-

-a) look for all of the dependencies (except GLib*, libjasper) under

-

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

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

-

-   Please use the latest versions of these libraries that are available there,

-   these are packaged by Tor Lillqvist, which are built with MinGW/GCC.

-   Please see b) below regarding the build of libjasper and GLib*

-

-   Note for LibPNG, version 1.5.x is needed.

-

--OR-

-

-b) Build them yourself with VS9 (but you may most probably wish to get

-   gettext-runtime from the URL(s) mentioned in a)).  Use the latest

-   stable versions for them (you may need to get the latest unstable version of

-   GLib if you are using an unstable version of GDK-Pixbuf):

-

-   GLib*:   Grab the latest sources from http://www.gtk.org under "Download"

-            (stable only-please make a search for the latest unstable versions)

-   IJG JPEG: http://www.ijg.org/

-   LibPNG: http://www.libpng.org/pub/png/libpng.html (1.5.x is needed here)

-   LibTIFF: http://www.remotesensing.org/libtiff/

-   LibJasper: http://www.ece.uvic.ca/~mdadams/jasper/

-   ZLib:   http://www.zlib.net

-

-   The above 6 packages all have supported mechanisms (Makefiles and/or Project

-   Files) for building under VS9 (upgrade the Project Files from earlier VS

-   versions will do for these, when applicable).  It is recommended that ZLib

-   is built using the win32/Makefile.msc makefile with VS9 with the ASM routines

-   to avoid linking problems (copy zdll.lib to zlib1.lib[Release] or to zlib1d.lib

-   [Debug] after completion of compilation)-see win32/Makefile.msc in ZLib for

-   more details.

-

-* This GLib refers to a build that is built by VS9

-

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

-folder <root>:

-

-<root>\gdk-pixbuf\<this-gdk-pixbuf-source-tree>

-<root>\vs9\<PlatformName>

-

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

-<root>\gdk-pixbuf\<this-gdk-pixbuf-source-tree>\win32\vs9\README.

-

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

-

-You should unpack the <dependent-package>-dev and <dependent-packge> (runtime)

-into <root>\vs9\<PlatformName>, if you download any of the packages from

-

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

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

-

-so that for instance libintl.h end up at 

-<root>\vs9\<PlatformName>\include\libintl.h.

-

-If you build any of the dependencies yourselves, copy the: 

--DLLs and EXEs into <root>\vs9\<PlatformName>\bin

--headers into <root>\vs9\<PlatformName>\include\

--LIBs into <root>\vs9\<PlatformName>\lib

-

-If you have not built GLib with VS9 and placed the LIBs and headers in a

-place where VS9 can find them automatically, you should also uncompress

-your GLib sources in <root>\ and build it from there, following the

-instructions in <root>\glib<-version>\win32\vs9, so that the required

-headers, EXEs, DLLs and LIBs will end up in

-<root>\vs9\<PlatformName>\include\glib-2.0 (headers)

-<root>\vs9\<PlatformName>\lib (LIBs, also glib-2.0/include/glibconfig.h)

-<root>\vs9\<PlatformName>\bin (EXEs/DLLs)

-respectively.

-

-After the build of GDK-Pixbuf, 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 GDK-Pixbuf headers into

-<root>\vs9\<PlatformName>\include\GDKPixbuf-2.0. This is then from where

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

-from a specific GDK-Pixbuf source tree.

-

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

---(adapted from the GLib VS9 README.txt file originally written by Tor Lillqvist)

diff --git a/win32/vs9/gdk-pixbuf-build-defines.vsprops b/win32/vs9/gdk-pixbuf-build-defines.vsprops
deleted file mode 100644
index d69c575f2..000000000
--- a/win32/vs9/gdk-pixbuf-build-defines.vsprops
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="gdk-pixbufbuilddefinesprops"
-	OutputDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin"
-	IntermediateDirectory="$(SolutionDir)$(ConfigurationName)\$(PlatformName)\obj\$(ProjectName)\"
-	InheritedPropertySheets=".\gdk-pixbuf-version-paths.vsprops"
-	>
-	<Tool
-		Name="VCCLCompilerTool"
-		AdditionalIncludeDirectories="..\..;..\..\gdk-pixbuf;.;$(GlibEtcInstallRoot)\include\gio-win32-2.0;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include"
-		PreprocessorDefinitions="HAVE_CONFIG_H;G_DISABLE_SINGLE_INCLUDES;GDK_PIXBUF_DISABLE_SINGLE_INCLUDES"
-		ForcedIncludeFiles="msvc_recommended_pragmas.h"
-		AdditionalOptions="/MP"
-	/>
-	<Tool
-		Name="VCLinkerTool"
-		AdditionalDependencies="gio-2.0.lib gmodule-2.0.lib gobject-2.0.lib glib-2.0.lib intl.lib libpng16.lib zlib1.lib"
-		AdditionalLibraryDirectories="$(GlibEtcInstallRoot)\lib"
-		IgnoreDefaultLibraryNames="LIBCMTD.lib;LIBCMT.lib"
-	/>
-	<UserMacro
-		Name="GdkPixbufBinaryVersion"
-		Value="2.10.0"
-	/>
-	<UserMacro
-		Name="GDIP_MACROS"
-		Value="INCLUDE_gdiplus"
-	/>
-	<UserMacro
-		Name="NOGDIP_MACROS"
-		Value="JAS_WIN_MSVC_BUILD;INCLUDE_bmp;INCLUDE_gif;INCLUDE_ico;INCLUDE_jasper;INCLUDE_jpeg;INCLUDE_tiff;"
-	/>
-	<UserMacro
-		Name="MODULAR_MACROS"
-		Value="INCLUDE_ani;INCLUDE_tga;INCLUDE_xbm;INCLUDE_png;INCLUDE_qtif;INCLUDE_pnm;INCLUDE_icns;INCLUDE_xpm"
-	/>
-	<UserMacro
-		Name="GdkPixbufDummyPrefix"
-		Value="/dummy"
-	/>
-	<UserMacro
-		Name="GdkPixbufPrefixDefine"
-		Value="GDK_PIXBUF_PREFIX=&quot;\&quot;$(GdkPixbufDummyPrefix)\&quot;&quot;"
-	/>
-	<UserMacro
-		Name="GdkPixbufLibdirDefine"
-		Value="PIXBUF_LIBDIR=&quot;\&quot;$(GdkPixbufDummyPrefix)/lib/gdk-pixbuf-$(ApiVersion)/$(GdkPixbufBinaryVersion)/loaders\&quot;&quot;"
-	/>
-	<UserMacro
-		Name="GdkPixbufBinVerDefine"
-		Value="GDK_PIXBUF_BINARY_VERSION=&quot;\&quot;$(GdkPixbufBinaryVersion)\&quot;&quot;"
-	/>
-	<UserMacro
-		Name="GdkPixbufDefines"
-		Value="HAVE_CONFIG_H;GDK_PIXBUF_COMPILATION;GDK_PIXBUF_ENABLE_BACKEND;DLL_EXPORT;GDK_PIXBUF_RELOCATABLE;$(GdkPixbufBinVerDefine);$(GdkPixbufPrefixDefine);$(MODULAR_MACROS)"
-	/>
-	<UserMacro
-		Name="GdipLibs"
-		Value="gdiplus.lib"
-	/>
-	<UserMacro
-		Name="ImagingLibs"
-		Value="jpeg.lib libjasper.lib libtiff_i.lib"
-	/>
-</VisualStudioPropertySheet>
diff --git a/win32/vs9/gdk-pixbuf-csource.vcproj b/win32/vs9/gdk-pixbuf-csource.vcproj
deleted file mode 100644
index be78fa93e..000000000
--- a/win32/vs9/gdk-pixbuf-csource.vcproj
+++ /dev/null
@@ -1,166 +0,0 @@
-<?xml version="1.0" encoding="big5"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="gdk-pixbuf-csource"
-	ProjectGUID="{3689C772-49A9-4E32-8161-686E1381ADB4}"
-	RootNamespace="gdk-pixbuf-csource"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			ConfigurationType="1"
-			InheritedPropertySheets=".\gdk-pixbuf-build-defines.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories=""
-				PreprocessorDefinitions="_DEBUG;$(GdkPixbufDefines)"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies=""
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			InheritedPropertySheets=".\gdk-pixbuf-build-defines.vsprops"
-			ConfigurationType="1"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="3"
-				AdditionalIncludeDirectories=""
-				PreprocessorDefinitions="$(GdkPixbufDefines)"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies=""
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			ConfigurationType="1"
-			InheritedPropertySheets=".\gdk-pixbuf-build-defines.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories=""
-				PreprocessorDefinitions="_DEBUG;$(GdkPixbufDefines)"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies=""
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			ConfigurationType="1"
-			InheritedPropertySheets=".\gdk-pixbuf-build-defines.vsprops"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories=""
-				PreprocessorDefinitions="$(GdkPixbufDefines)"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies=""
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File RelativePath="..\..\gdk-pixbuf\gdk-pixbuf-csource.c" />
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/win32/vs9/gdk-pixbuf-gen-srcs.vsprops b/win32/vs9/gdk-pixbuf-gen-srcs.vsprops
deleted file mode 100644
index b92819e89..000000000
--- a/win32/vs9/gdk-pixbuf-gen-srcs.vsprops
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="gdk-pixbufgensrcsprops"
-	InheritedPropertySheets=".\gdk-pixbuf-build-defines.vsprops"
-	>
-	<UserMacro
-		Name="GenConfigH"
-		Value="copy ..\..\config.h.win32 ..\..\config.h"
-	/>
-</VisualStudioPropertySheet>
diff --git a/win32/vs9/gdk-pixbuf-install.vcproj b/win32/vs9/gdk-pixbuf-install.vcproj
deleted file mode 100644
index d023725ce..000000000
--- a/win32/vs9/gdk-pixbuf-install.vcproj
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="gdk-pixbuf-install"
-	ProjectGUID="{FC5AADB5-95CD-4BF0-BA8B-0C16FE7074FB}"
-	RootNamespace="gdkpixbufinstall"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(GlibEtcInstallRoot)"
-			ConfigurationType="10"
-			InheritedPropertySheets=".\gdk-pixbuf-install.vsprops"
-			CharacterSet="2"
-			DeleteExtensionsOnClean=""
-			>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="$(GdkPixbufDoInstall)"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(GlibEtcInstallRoot)"
-			ConfigurationType="10"
-			InheritedPropertySheets=".\gdk-pixbuf-install.vsprops"
-			CharacterSet="2"
-			DeleteExtensionsOnClean=""
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="$(GdkPixbufDoInstall)"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			InheritedPropertySheets=".\gdk-pixbuf-install.vsprops"
-			OutputDirectory="$(GlibEtcInstallRoot)"
-			ConfigurationType="10"
-			CharacterSet="2"
-			DeleteExtensionsOnClean=""
-			>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="$(GdkPixbufDoInstall)"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			InheritedPropertySheets=".\gdk-pixbuf-install.vsprops"
-			OutputDirectory="$(GlibEtcInstallRoot)"
-			ConfigurationType="10"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			DeleteExtensionsOnClean=""
-			>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="$(GdkPixbufDoInstall)"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-			<File RelativePath="..\..\gdk-pixbuf-2.0.pc.in">
-				<FileConfiguration Name="Debug|Win32">
-					<Tool Name="VCCustomBuildTool"
-						Description="Generating .pc files..."
-						CommandLine="$(GenGdkPixbufPC)"
-						Outputs="..\gdk-pixbuf-2.0.pc"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Release|Win32">
-					<Tool Name="VCCustomBuildTool"
-						Description="Generating .pc files..."
-						CommandLine="$(GenGdkPixbufPC)"
-						Outputs="..\gdk-pixbuf-2.0.pc"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Debug|x64">
-					<Tool Name="VCCustomBuildTool"
-						Description="Generating .pc files..."
-						CommandLine="$(GenGdkPixbufPCX64)"
-						Outputs="..\gdk-pixbuf-2.0.pc"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Release|x64">
-					<Tool Name="VCCustomBuildTool"
-						Description="Generating .pc files..."
-						CommandLine="$(GenGdkPixbufPCX64)"
-						Outputs="..\gdk-pixbuf-2.0.pc"
-					/>
-				</FileConfiguration>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/win32/vs9/gdk-pixbuf-install.vspropsin b/win32/vs9/gdk-pixbuf-install.vspropsin
deleted file mode 100644
index 119600eea..000000000
--- a/win32/vs9/gdk-pixbuf-install.vspropsin
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="gdk-pixbufinstallprops"
-	InheritedPropertySheets=".\gdk-pixbuf-build-defines.vsprops"
-	>
-	<UserMacro
-		Name="GdkPixbufDoInstall"
-		Value="
-mkdir $(CopyDir)\bin&#x0D;&#x0A;
-copy $(ConfigurationName)\$(PlatformName)\bin\$(GdkPixbufDllPrefix)gdk_pixbuf$(GdkPixbufDllSuffix).dll $(CopyDir)\bin&#x0D;&#x0A;
-copy $(ConfigurationName)\$(PlatformName)\bin\$(GdkPixbufDllPrefix)gdk_pixbuf$(GdkPixbufDllSuffix).pdb $(CopyDir)\bin&#x0D;&#x0A;
-copy $(ConfigurationName)\$(PlatformName)\bin\gdk-pixbuf-*.exe $(CopyDir)\bin&#x0D;&#x0A;
-copy $(ConfigurationName)\$(PlatformName)\bin\gdk-pixbuf-*.pdb $(CopyDir)\bin&#x0D;&#x0A;
-
-mkdir $(CopyDir)\lib&#x0D;&#x0A;
-copy $(ConfigurationName)\$(PlatformName)\bin\gdk_pixbuf-$(ApiVersion).lib $(CopyDir)\lib&#x0D;&#x0A;
-
-mkdir $(CopyDir)\include\gdk-pixbuf-$(ApiVersion)\gdk-pixbuf&#x0D;&#x0A;
-#include "gdk-pixbuf.headers"
-
-if exist ..\gdk-pixbuf-$(ApiVersion).pc (mkdir $(CopyDir)\lib\pkgconfig &amp; copy ..\gdk-pixbuf-$(ApiVersion).pc $(CopyDir)\lib\pkgconfig)&#x0D;&#x0A;
-"
-	/>
-	<UserMacro
-		Name="GenGdkPixbufPC"
-		Value="if exist $(PythonPath)\python.exe $(PythonPath)\python.exe ..\gdkpixbuf-pc.py --version=$(GdkPixbufMajorVersion).$(GdkPixbufMinorVersion).$(GdkPixbufMicroVersion) --prefix=$(CopyDir)"
-	/>
-	<UserMacro
-		Name="GenGdkPixbufPCX64"
-		Value="if exist $(PythonPathX64)\python.exe $(PythonPathX64)\python.exe ..\gdkpixbuf-pc.py --version=$(GdkPixbufMajorVersion).$(GdkPixbufMinorVersion).$(GdkPixbufMicroVersion) --prefix=$(CopyDir)"
-	/>
-</VisualStudioPropertySheet>
diff --git a/win32/vs9/gdk-pixbuf-pixdata.vcproj b/win32/vs9/gdk-pixbuf-pixdata.vcproj
deleted file mode 100644
index de8842105..000000000
--- a/win32/vs9/gdk-pixbuf-pixdata.vcproj
+++ /dev/null
@@ -1,161 +0,0 @@
-<?xml version="1.0" encoding="big5"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="gdk-pixbuf-pixdata"
-	ProjectGUID="{2AD2FF07-0514-41A8-8A32-920C744EA1A6}"
-	RootNamespace="gdkpixbufpixdata"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="196613"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			InheritedPropertySheets=".\gdk-pixbuf-build-defines.vsprops"
-			ConfigurationType="1"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="_DEBUG;$(GdkPixbufDefines)"
-				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="Debug|x64"
-			ConfigurationType="1"
-			InheritedPropertySheets=".\gdk-pixbuf-build-defines.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories=""
-				PreprocessorDefinitions="_DEBUG;$(GdkPixbufDefines)"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies=""
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			InheritedPropertySheets=".\gdk-pixbuf-build-defines.vsprops"
-			ConfigurationType="1"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				PreprocessorDefinitions="$(GdkPixbufDefines)"
-				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="Release|x64"
-			ConfigurationType="1"
-			InheritedPropertySheets=".\gdk-pixbuf-build-defines.vsprops"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories=""
-				PreprocessorDefinitions="$(GdkPixbufDefines)"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies=""
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Sources"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File RelativePath="..\..\gdk-pixbuf\gdk-pixbuf-pixdata.c" />
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/win32/vs9/gdk-pixbuf-query-loaders.vcproj b/win32/vs9/gdk-pixbuf-query-loaders.vcproj
deleted file mode 100644
index a6eda730d..000000000
--- a/win32/vs9/gdk-pixbuf-query-loaders.vcproj
+++ /dev/null
@@ -1,165 +0,0 @@
-<?xml version="1.0" encoding="big5"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="gdk-pixbuf-query-loaders"
-	ProjectGUID="{7212330C-14DF-4815-9E3B-4BDB3D21F665}"
-	RootNamespace="gdkpixbufqueryloaders"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="196613"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			ConfigurationType="1"
-			InheritedPropertySheets=".\gdk-pixbuf-build-defines.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories=""
-				PreprocessorDefinitions="_DEBUG;$(GdkPixbufDefines);$(GdkPixbufLibdirDefine)"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies=""
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				TargetMachine="1"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			ConfigurationType="1"
-			InheritedPropertySheets=".\gdk-pixbuf-build-defines.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories=""
-				PreprocessorDefinitions="_DEBUG;$(GdkPixbufDefines);$(GdkPixbufLibdirDefine)"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies=""
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			ConfigurationType="1"
-			InheritedPropertySheets=".\gdk-pixbuf-build-defines.vsprops"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories=""
-				PreprocessorDefinitions="$(GdkPixbufDefines);$(GdkPixbufLibdirDefine)"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies=""
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			ConfigurationType="1"
-			InheritedPropertySheets=".\gdk-pixbuf-build-defines.vsprops"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories=""
-				PreprocessorDefinitions="$(GdkPixbufDefines);$(GdkPixbufLibdirDefine)"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies=""
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="17"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Sources"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File RelativePath="..\..\gdk-pixbuf\queryloaders.c" />
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/win32/vs9/gdk-pixbuf-version-paths.vsprops.in b/win32/vs9/gdk-pixbuf-version-paths.vsprops.in
deleted file mode 100644
index 7aa59cf8d..000000000
--- a/win32/vs9/gdk-pixbuf-version-paths.vsprops.in
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="gdk-pixbufversionpathsprops"
-	>
-	<UserMacro
-		Name="VSVer"
-		Value="9"
-	/>
-	<UserMacro
-		Name="GdkPixbufMajorVersion"
-		Value="@GDK_PIXBUF_MAJOR@"
-	/>
-	<UserMacro
-		Name="GdkPixbufMinorVersion"
-		Value="@GDK_PIXBUF_MINOR@"
-	/>
-	<UserMacro
-		Name="GdkPixbufMicroVersion"
-		Value="@GDK_PIXBUF_MICRO@"
-	/>
-	<UserMacro
-		Name="ApiVersion"
-		Value="2.0"
-	/>
-	<UserMacro
-		Name="GlibEtcInstallRoot"
-		Value="$(SolutionDir)\..\..\..\vs$(VSVer)\$(PlatformName)"
-	/>
-	<UserMacro
-		Name="DefDir"
-		Value="$(SolutionDir)\$(ConfigurationName)\$(PlatformName)\obj\$(ProjectName)"
-	/>
-	<UserMacro
-		Name="CopyDir"
-		Value="$(GlibEtcInstallRoot)"
-	/>
-	<UserMacro
-		Name="GdkPixbufLibtoolCompatibleDllPrefix"
-		Value="lib"
-	/>
-	<UserMacro
-		Name="GdkPixbufLibtoolCompatibleDllSuffix"
-		Value="-$(ApiVersion)-0"
-	/>
-	<UserMacro
-		Name="GdkPixbufSeparateVSDllPrefix"
-		Value=""
-	/>
-	<UserMacro
-		Name="GdkPixbufSeparateVSDllSuffix"
-		Value="-2-vs$(VSVer)"
-	/>
-	<!-- Change these two to GdkPixbufLibtoolCompatibleDllPrefix and
-	GdkPixbufLibtoolCompatibleDllSuffix if that is what you want -->
-	<UserMacro
-		Name="GdkPixbufDllPrefix"
-		Value="$(GdkPixbufSeparateVSDllPrefix)"
-	/>
-	<UserMacro
-		Name="GdkPixbufDllSuffix"
-		Value="$(GdkPixbufSeparateVSDllSuffix)"
-	/>
-	<UserMacro
-		Name="PythonPath"
-		Value="c:\python27"
-	/>
-	<UserMacro
-		Name="PythonPathX64"
-		Value="$(PythonPath).x64"
-	/>
-</VisualStudioPropertySheet>
diff --git a/win32/vs9/gdk-pixbuf.sln b/win32/vs9/gdk-pixbuf.sln
deleted file mode 100644
index 3fb3e0601..000000000
--- a/win32/vs9/gdk-pixbuf.sln
+++ /dev/null
@@ -1,125 +0,0 @@
-

-Microsoft Visual Studio Solution File, Format Version 10.00

-# Visual Studio 2008

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdk-pixbuf", "gdk-pixbuf.vcproj", "{01ADE22D-F6EC-4D09-8FE1-B9A97DEC2BA3}"

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdk-pixbuf-csource", "gdk-pixbuf-csource.vcproj", "{3689C772-49A9-4E32-8161-686E1381ADB4}"

-	ProjectSection(ProjectDependencies) = postProject

-		{01ADE22D-F6EC-4D09-8FE1-B9A97DEC2BA3} = {01ADE22D-F6EC-4D09-8FE1-B9A97DEC2BA3}

-	EndProjectSection

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdk-pixbuf-install", "gdk-pixbuf-install.vcproj", "{FC5AADB5-95CD-4BF0-BA8B-0C16FE7074FB}"

-	ProjectSection(ProjectDependencies) = postProject

-		{7212330C-14DF-4815-9E3B-4BDB3D21F665} = {7212330C-14DF-4815-9E3B-4BDB3D21F665}

-		{01ADE22D-F6EC-4D09-8FE1-B9A97DEC2BA3} = {01ADE22D-F6EC-4D09-8FE1-B9A97DEC2BA3}

-		{3689C772-49A9-4E32-8161-686E1381ADB4} = {3689C772-49A9-4E32-8161-686E1381ADB4}

-		{2AD2FF07-0514-41A8-8A32-920C744EA1A6} = {2AD2FF07-0514-41A8-8A32-920C744EA1A6}

-	EndProjectSection

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdk-pixbuf-query-loaders", "gdk-pixbuf-query-loaders.vcproj", "{7212330C-14DF-4815-9E3B-4BDB3D21F665}"

-	ProjectSection(ProjectDependencies) = postProject

-		{01ADE22D-F6EC-4D09-8FE1-B9A97DEC2BA3} = {01ADE22D-F6EC-4D09-8FE1-B9A97DEC2BA3}

-	EndProjectSection

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdk-pixbuf-pixdata", "gdk-pixbuf-pixdata.vcproj", "{2AD2FF07-0514-41A8-8A32-920C744EA1A6}"

-	ProjectSection(ProjectDependencies) = postProject

-		{01ADE22D-F6EC-4D09-8FE1-B9A97DEC2BA3} = {01ADE22D-F6EC-4D09-8FE1-B9A97DEC2BA3}

-	EndProjectSection

-EndProject

-Global

-	GlobalSection(SolutionConfigurationPlatforms) = preSolution

-		Debug|Win32 = Debug|Win32

-		Debug|x64 = Debug|x64

-		Debug_GDI+|Win32 = Debug_GDI+|Win32

-		Debug_GDI+|x64 = Debug_GDI+|x64

-		Release|Win32 = Release|Win32

-		Release|x64 = Release|x64

-		Release_GDI+|Win32 = Release_GDI+|Win32

-		Release_GDI+|x64 = Release_GDI+|x64

-	EndGlobalSection

-	GlobalSection(ProjectConfigurationPlatforms) = postSolution

-		{01ADE22D-F6EC-4D09-8FE1-B9A97DEC2BA3}.Debug|Win32.ActiveCfg = Debug|Win32

-		{01ADE22D-F6EC-4D09-8FE1-B9A97DEC2BA3}.Debug|Win32.Build.0 = Debug|Win32

-		{01ADE22D-F6EC-4D09-8FE1-B9A97DEC2BA3}.Debug|x64.ActiveCfg = Debug|x64

-		{01ADE22D-F6EC-4D09-8FE1-B9A97DEC2BA3}.Debug|x64.Build.0 = Debug|x64

-		{01ADE22D-F6EC-4D09-8FE1-B9A97DEC2BA3}.Debug_GDI+|Win32.ActiveCfg = Debug_GDI+|Win32

-		{01ADE22D-F6EC-4D09-8FE1-B9A97DEC2BA3}.Debug_GDI+|Win32.Build.0 = Debug_GDI+|Win32

-		{01ADE22D-F6EC-4D09-8FE1-B9A97DEC2BA3}.Debug_GDI+|x64.ActiveCfg = Debug_GDI+|x64

-		{01ADE22D-F6EC-4D09-8FE1-B9A97DEC2BA3}.Debug_GDI+|x64.Build.0 = Debug_GDI+|x64

-		{01ADE22D-F6EC-4D09-8FE1-B9A97DEC2BA3}.Release|Win32.ActiveCfg = Release|Win32

-		{01ADE22D-F6EC-4D09-8FE1-B9A97DEC2BA3}.Release|Win32.Build.0 = Release|Win32

-		{01ADE22D-F6EC-4D09-8FE1-B9A97DEC2BA3}.Release|x64.ActiveCfg = Release|x64

-		{01ADE22D-F6EC-4D09-8FE1-B9A97DEC2BA3}.Release|x64.Build.0 = Release|x64

-		{01ADE22D-F6EC-4D09-8FE1-B9A97DEC2BA3}.Release_GDI+|Win32.ActiveCfg = Release_GDI+|Win32

-		{01ADE22D-F6EC-4D09-8FE1-B9A97DEC2BA3}.Release_GDI+|Win32.Build.0 = Release_GDI+|Win32

-		{01ADE22D-F6EC-4D09-8FE1-B9A97DEC2BA3}.Release_GDI+|x64.ActiveCfg = Release_GDI+|x64

-		{01ADE22D-F6EC-4D09-8FE1-B9A97DEC2BA3}.Release_GDI+|x64.Build.0 = Release_GDI+|x64

-		{3689C772-49A9-4E32-8161-686E1381ADB4}.Debug|Win32.ActiveCfg = Debug|Win32

-		{3689C772-49A9-4E32-8161-686E1381ADB4}.Debug|Win32.Build.0 = Debug|Win32

-		{3689C772-49A9-4E32-8161-686E1381ADB4}.Debug|x64.ActiveCfg = Debug|x64

-		{3689C772-49A9-4E32-8161-686E1381ADB4}.Debug|x64.Build.0 = Debug|x64

-		{3689C772-49A9-4E32-8161-686E1381ADB4}.Debug_GDI+|Win32.ActiveCfg = Debug|Win32

-		{3689C772-49A9-4E32-8161-686E1381ADB4}.Debug_GDI+|Win32.Build.0 = Debug|Win32

-		{3689C772-49A9-4E32-8161-686E1381ADB4}.Debug_GDI+|x64.ActiveCfg = Debug|x64

-		{3689C772-49A9-4E32-8161-686E1381ADB4}.Debug_GDI+|x64.Build.0 = Debug|x64

-		{3689C772-49A9-4E32-8161-686E1381ADB4}.Release|Win32.ActiveCfg = Release|Win32

-		{3689C772-49A9-4E32-8161-686E1381ADB4}.Release|Win32.Build.0 = Release|Win32

-		{3689C772-49A9-4E32-8161-686E1381ADB4}.Release|x64.ActiveCfg = Release|x64

-		{3689C772-49A9-4E32-8161-686E1381ADB4}.Release|x64.Build.0 = Release|x64

-		{3689C772-49A9-4E32-8161-686E1381ADB4}.Release_GDI+|Win32.ActiveCfg = Release|Win32

-		{3689C772-49A9-4E32-8161-686E1381ADB4}.Release_GDI+|Win32.Build.0 = Release|Win32

-		{3689C772-49A9-4E32-8161-686E1381ADB4}.Release_GDI+|x64.ActiveCfg = Release|x64

-		{3689C772-49A9-4E32-8161-686E1381ADB4}.Release_GDI+|x64.Build.0 = Release|x64

-		{2AD2FF07-0514-41A8-8A32-920C744EA1A6}.Debug|Win32.ActiveCfg = Debug|Win32

-		{2AD2FF07-0514-41A8-8A32-920C744EA1A6}.Debug|Win32.Build.0 = Debug|Win32

-		{2AD2FF07-0514-41A8-8A32-920C744EA1A6}.Debug|x64.ActiveCfg = Debug|x64

-		{2AD2FF07-0514-41A8-8A32-920C744EA1A6}.Debug|x64.Build.0 = Debug|x64

-		{2AD2FF07-0514-41A8-8A32-920C744EA1A6}.Debug_GDI+|Win32.ActiveCfg = Debug|Win32

-		{2AD2FF07-0514-41A8-8A32-920C744EA1A6}.Debug_GDI+|Win32.Build.0 = Debug|Win32

-		{2AD2FF07-0514-41A8-8A32-920C744EA1A6}.Debug_GDI+|x64.ActiveCfg = Debug|x64

-		{2AD2FF07-0514-41A8-8A32-920C744EA1A6}.Debug_GDI+|x64.Build.0 = Debug|x64

-		{2AD2FF07-0514-41A8-8A32-920C744EA1A6}.Release|Win32.ActiveCfg = Release|Win32

-		{2AD2FF07-0514-41A8-8A32-920C744EA1A6}.Release|Win32.Build.0 = Release|Win32

-		{2AD2FF07-0514-41A8-8A32-920C744EA1A6}.Release|x64.ActiveCfg = Release|x64

-		{2AD2FF07-0514-41A8-8A32-920C744EA1A6}.Release|x64.Build.0 = Release|x64

-		{2AD2FF07-0514-41A8-8A32-920C744EA1A6}.Release_GDI+|Win32.ActiveCfg = Release|Win32

-		{2AD2FF07-0514-41A8-8A32-920C744EA1A6}.Release_GDI+|Win32.Build.0 = Release|Win32

-		{2AD2FF07-0514-41A8-8A32-920C744EA1A6}.Release_GDI+|x64.ActiveCfg = Release|x64

-		{2AD2FF07-0514-41A8-8A32-920C744EA1A6}.Release_GDI+|x64.Build.0 = Release|x64

-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7074FB}.Debug|Win32.ActiveCfg = Debug|Win32

-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7074FB}.Debug|Win32.Build.0 = Debug|Win32

-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7074FB}.Debug|x64.ActiveCfg = Debug|x64

-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7074FB}.Debug|x64.Build.0 = Debug|x64

-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7074FB}.Debug_GDI+|Win32.ActiveCfg = Debug|Win32

-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7074FB}.Debug_GDI+|Win32.Build.0 = Debug|Win32

-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7074FB}.Debug_GDI+|x64.ActiveCfg = Debug|x64

-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7074FB}.Debug_GDI+|x64.Build.0 = Debug|x64

-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7074FB}.Release|Win32.ActiveCfg = Release|Win32

-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7074FB}.Release|Win32.Build.0 = Release|Win32

-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7074FB}.Release|x64.ActiveCfg = Release|x64

-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7074FB}.Release|x64.Build.0 = Release|x64

-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7074FB}.Release_GDI+|Win32.ActiveCfg = Release|Win32

-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7074FB}.Release_GDI+|Win32.Build.0 = Release|Win32

-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7074FB}.Release_GDI+|x64.ActiveCfg = Release|x64

-		{FC5AADB5-95CD-4BF0-BA8B-0C16FE7074FB}.Release_GDI+|x64.Build.0 = Release|x64

-		{7212330C-14DF-4815-9E3B-4BDB3D21F665}.Debug|Win32.ActiveCfg = Debug|Win32

-		{7212330C-14DF-4815-9E3B-4BDB3D21F665}.Debug|Win32.Build.0 = Debug|Win32

-		{7212330C-14DF-4815-9E3B-4BDB3D21F665}.Debug|x64.ActiveCfg = Debug|x64

-		{7212330C-14DF-4815-9E3B-4BDB3D21F665}.Debug|x64.Build.0 = Debug|x64

-		{7212330C-14DF-4815-9E3B-4BDB3D21F665}.Debug_GDI+|Win32.ActiveCfg = Debug|Win32

-		{7212330C-14DF-4815-9E3B-4BDB3D21F665}.Debug_GDI+|Win32.Build.0 = Debug|Win32

-		{7212330C-14DF-4815-9E3B-4BDB3D21F665}.Debug_GDI+|x64.ActiveCfg = Debug|x64

-		{7212330C-14DF-4815-9E3B-4BDB3D21F665}.Debug_GDI+|x64.Build.0 = Debug|x64

-		{7212330C-14DF-4815-9E3B-4BDB3D21F665}.Release|Win32.ActiveCfg = Release|Win32

-		{7212330C-14DF-4815-9E3B-4BDB3D21F665}.Release|Win32.Build.0 = Release|Win32

-		{7212330C-14DF-4815-9E3B-4BDB3D21F665}.Release|x64.ActiveCfg = Release|x64

-		{7212330C-14DF-4815-9E3B-4BDB3D21F665}.Release|x64.Build.0 = Release|x64

-		{7212330C-14DF-4815-9E3B-4BDB3D21F665}.Release_GDI+|Win32.ActiveCfg = Release|Win32

-		{7212330C-14DF-4815-9E3B-4BDB3D21F665}.Release_GDI+|Win32.Build.0 = Release|Win32

-		{7212330C-14DF-4815-9E3B-4BDB3D21F665}.Release_GDI+|x64.ActiveCfg = Release|x64

-		{7212330C-14DF-4815-9E3B-4BDB3D21F665}.Release_GDI+|x64.Build.0 = Release|x64

-	EndGlobalSection

-	GlobalSection(SolutionProperties) = preSolution

-		HideSolutionNode = FALSE

-	EndGlobalSection

-EndGlobal

diff --git a/win32/vs9/gdk-pixbuf.vcprojin b/win32/vs9/gdk-pixbuf.vcprojin
deleted file mode 100644
index acb8a2e6c..000000000
--- a/win32/vs9/gdk-pixbuf.vcprojin
+++ /dev/null
@@ -1,481 +0,0 @@
-<?xml version="1.0" encoding="big5"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="gdk-pixbuf"
-	ProjectGUID="{01ADE22D-F6EC-4D09-8FE1-B9A97DEC2BA3}"
-	RootNamespace="gdk-pixbuf"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug_GDI+|Win32"
-			ConfigurationType="2"
-			InheritedPropertySheets=".\gdk-pixbuf-gen-srcs.vsprops"
-			OutputDirectory="Debug\$(PlatformName)\bin"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions=""
-				Optimization="0"
-				AdditionalIncludeDirectories=""
-				PreprocessorDefinitions="_DEBUG;$(GdkPixbufDefines);$(GDIP_MACROS)"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="$(GdipLibs)"
-				OutputFile="$(OutDir)\$(GdkPixbufDllPrefix)gdk_pixbuf$(GdkPixbufDllSuffix).dll"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(OutDir)\gdk_pixbuf-$(ApiVersion).lib"
-				TargetMachine="1"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release_GDI+|Win32"
-			ConfigurationType="2"
-			InheritedPropertySheets=".\gdk-pixbuf-gen-srcs.vsprops"
-			OutputDirectory="Release\$(PlatformName)\bin"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions=""
-				Optimization="3"
-				AdditionalIncludeDirectories=""
-				PreprocessorDefinitions="$(GdkPixbufDefines);$(GDIP_MACROS)"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="$(GdipLibs)"
-				OutputFile="$(OutDir)\$(GdkPixbufDllPrefix)gdk_pixbuf$(GdkPixbufDllSuffix).dll"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(OutDir)\gdk_pixbuf-$(ApiVersion).lib"
-				TargetMachine="1"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug_GDI+|x64"
-			InheritedPropertySheets=".\gdk-pixbuf-gen-srcs.vsprops"
-			OutputDirectory="Debug\$(PlatformName)\bin"
-			ConfigurationType="2"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories=""
-				PreprocessorDefinitions="_DEBUG;$(GdkPixbufDefines);$(GDIP_MACROS)"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="$(GdipLibs)"
-				OutputFile="$(OutDir)\$(GdkPixbufDllPrefix)gdk_pixbuf$(GdkPixbufDllSuffix).dll"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				ImportLibrary="$(OutDir)\gdk_pixbuf-$(ApiVersion).lib"
-				TargetMachine="17"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release_GDI+|x64"
-			InheritedPropertySheets=".\gdk-pixbuf-gen-srcs.vsprops"
-			OutputDirectory="Release\$(PlatformName)\bin"
-			ConfigurationType="2"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				PreprocessorDefinitions="$(GdkPixbufDefines);$(GDIP_MACROS)"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="$(GdipLibs)"
-				OutputFile="$(OutDir)\$(GdkPixbufDllPrefix)gdk_pixbuf$(GdkPixbufDllSuffix).dll"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				ImportLibrary="$(OutDir)\gdk_pixbuf-$(ApiVersion).lib"
-				TargetMachine="17"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="Debug\$(PlatformName)\bin"
-			ConfigurationType="2"
-			InheritedPropertySheets=".\gdk-pixbuf-gen-srcs.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalOptions=""
-				AdditionalIncludeDirectories=""
-				PreprocessorDefinitions="$(GdkPixbufDefines);$(NOGDIP_MACROS)"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="$(ImagingLibs)"
-				OutputFile="$(OutDir)\$(GdkPixbufDllPrefix)gdk_pixbuf$(GdkPixbufDllSuffix).dll"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(OutDir)\gdk_pixbuf-$(ApiVersion).lib"
-				TargetMachine="1"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="Release\$(PlatformName)\bin"
-			ConfigurationType="2"
-			InheritedPropertySheets=".\gdk-pixbuf-gen-srcs.vsprops"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions=""
-				Optimization="3"
-				AdditionalIncludeDirectories=""
-				PreprocessorDefinitions="$(GdkPixbufDefines);$(NOGDIP_MACROS)"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="$(ImagingLibs)"
-				OutputFile="$(OutDir)\$(GdkPixbufDllPrefix)gdk_pixbuf$(GdkPixbufDllSuffix).dll"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				ImportLibrary="$(OutDir)\gdk_pixbuf-$(ApiVersion).lib"
-				TargetMachine="1"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="Debug\$(PlatformName)\bin"
-			InheritedPropertySheets=".\gdk-pixbuf-gen-srcs.vsprops"
-			ConfigurationType="2"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories=""
-				PreprocessorDefinitions="_DEBUG;$(GdkPixbufDefines);$(NOGDIP_MACROS)"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="$(ImagingLibs)"
-				OutputFile="$(OutDir)\$(GdkPixbufDllPrefix)gdk_pixbuf$(GdkPixbufDllSuffix).dll"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				ImportLibrary="$(OutDir)\gdk_pixbuf-$(ApiVersion).lib"
-				TargetMachine="17"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="Release\$(PlatformName)\bin"
-			InheritedPropertySheets=".\gdk-pixbuf-gen-srcs.vsprops"
-			ConfigurationType="2"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				PreprocessorDefinitions="$(GdkPixbufDefines);$(NOGDIP_MACROS)"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="$(ImagingLibs)"
-				OutputFile="$(OutDir)\$(GdkPixbufDllPrefix)gdk_pixbuf$(GdkPixbufDllSuffix).dll"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				ImportLibrary="$(OutDir)\gdk_pixbuf-$(ApiVersion).lib"
-				TargetMachine="17"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-#include "gdk-pixbuf.sourcefiles"
-			<File RelativePath="..\..\gdk-pixbuf\pixops\pixops.c" />
-			<Filter	Name="Native" >
-				<File RelativePath="..\..\gdk-pixbuf\io-gdip-animation.c" >
-					<FileConfiguration Name="Release|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Debug|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Release|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Debug|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-				</File>
-				<File RelativePath="..\..\gdk-pixbuf\io-gdip-bmp.c" >
-					<FileConfiguration Name="Release|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Debug|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Release|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Debug|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-				</File>
-				<File RelativePath="..\..\gdk-pixbuf\io-gdip-emf.c" >
-					<FileConfiguration Name="Release|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Debug|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Release|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Debug|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-				</File>
-				<File RelativePath="..\..\gdk-pixbuf\io-gdip-gif.c" >
-					<FileConfiguration Name="Release|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Debug|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Release|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Debug|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-				</File>
-				<File RelativePath="..\..\gdk-pixbuf\io-gdip-ico.c" >
-					<FileConfiguration Name="Release|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Debug|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Release|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Debug|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-				</File>
-				<File RelativePath="..\..\gdk-pixbuf\io-gdip-jpeg.c" >
-					<FileConfiguration Name="Release|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Debug|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Release|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Debug|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-				</File>
-				<File RelativePath="..\..\gdk-pixbuf\io-gdip-tiff.c" >
-					<FileConfiguration Name="Release|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Debug|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Release|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Debug|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-				</File>
-				<File RelativePath="..\..\gdk-pixbuf\io-gdip-utils.c" >
-					<FileConfiguration Name="Release|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Debug|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Release|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Debug|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-				</File>
-				<File RelativePath="..\..\gdk-pixbuf\io-gdip-wmf.c" >
-					<FileConfiguration Name="Release|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Debug|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Release|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Debug|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-				</File>
-			</Filter>
-			<Filter Name="Non-Native" >
-				<File RelativePath="..\..\gdk-pixbuf\io-bmp.c" >
-					<FileConfiguration Name="Debug_GDI+|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Release_GDI+|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Debug_GDI+|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Release_GDI+|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-				</File>
-				<File RelativePath="..\..\gdk-pixbuf\io-gif.c" >
-					<FileConfiguration Name="Debug_GDI+|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Release_GDI+|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Debug_GDI+|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Release_GDI+|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-				</File>
-				<File RelativePath="..\..\gdk-pixbuf\io-gif-animation.c">
-					<FileConfiguration Name="Debug_GDI+|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Release_GDI+|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Debug_GDI+|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Release_GDI+|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-				</File>
-				<File RelativePath="..\..\gdk-pixbuf\io-ico.c" >
-					<FileConfiguration Name="Debug_GDI+|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Release_GDI+|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Debug_GDI+|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Release_GDI+|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-				</File>
-				<File RelativePath="..\..\gdk-pixbuf\io-jasper.c" >
-					<FileConfiguration Name="Debug_GDI+|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Release_GDI+|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Debug_GDI+|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Release_GDI+|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-				</File>
-				<File RelativePath="..\..\gdk-pixbuf\io-jpeg.c" >
-					<FileConfiguration Name="Debug_GDI+|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Release_GDI+|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Debug_GDI+|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Release_GDI+|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-				</File>
-				<File RelativePath="..\..\gdk-pixbuf\io-tiff.c" >
-					<FileConfiguration Name="Debug_GDI+|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Release_GDI+|Win32" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Debug_GDI+|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-					<FileConfiguration Name="Release_GDI+|x64" ExcludedFromBuild="true" ><Tool Name="VCCLCompilerTool" /></FileConfiguration>
-				</File>
-			</Filter>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-			<File RelativePath="..\..\config.h.win32">
-				<FileConfiguration Name="Debug_GDI+|Win32">
-					<Tool Name="VCCustomBuildTool"
-						Description="Copying config.h from config.h.win32..."
-						CommandLine="$(GenConfigH)"
-						Outputs="..\..\config.h"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Debug|Win32">
-					<Tool Name="VCCustomBuildTool"
-						Description="Copying config.h from config.h.win32..."
-						CommandLine="$(GenConfigH)"
-						Outputs="..\..\config.h"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Release_GDI+|Win32">
-					<Tool Name="VCCustomBuildTool"
-						Description="Copying config.h from config.h.win32..."
-						CommandLine="$(GenConfigH)"
-						Outputs="..\..\config.h"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Release|Win32">
-					<Tool Name="VCCustomBuildTool"
-						Description="Copying config.h from config.h.win32..."
-						CommandLine="$(GenConfigH)"
-						Outputs="..\..\config.h"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Debug_GDI+|x64">
-					<Tool Name="VCCustomBuildTool"
-						Description="Copying config.h from config.h.win32..."
-						CommandLine="$(GenConfigH)"
-						Outputs="..\..\config.h"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Debug|x64">
-					<Tool Name="VCCustomBuildTool"
-						Description="Copying config.h from config.h.win32..."
-						CommandLine="$(GenConfigH)"
-						Outputs="..\..\config.h"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Release_GDI+|x64">
-					<Tool Name="VCCustomBuildTool"
-						Description="Copying config.h from config.h.win32..."
-						CommandLine="$(GenConfigH)"
-						Outputs="..\..\config.h"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Release|x64">
-					<Tool Name="VCCustomBuildTool"
-						Description="Copying config.h from config.h.win32..."
-						CommandLine="$(GenConfigH)"
-						Outputs="..\..\config.h"
-					/>
-				</FileConfiguration>
-			</File>
-			<File RelativePath="..\..\gdk-pixbuf\gdk_pixbuf.rc" />
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>