Drop Autotools build

We are officially switching to Meson as the default build system for
GTK+.

115 files changed, 0 insertions, 15936 deletions

diff --git a/Makefile.am b/Makefile.am
deleted file mode 100644
index 98029b6a3f..0000000000
--- a/Makefile.am
+++ /dev/null
@@ -1,112 +0,0 @@
-## Makefile.am for GTK+
-include $(top_srcdir)/Makefile.decl
-
-SRC_SUBDIRS = gdk gsk gtk modules demos tests testsuite examples
-SUBDIRS = po po-properties $(SRC_SUBDIRS) docs win32
-
-ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
-
-meson_build_files = $(shell find . -type f -name '*meson.*' -print 2>/dev/null)
-meson_files = \
-	$(meson_build_files) \
-	meson_options.txt \
-	subprojects/graphene.wrap \
-	gdk/gen-gdk-gresources-xml.py \
-	gsk/gen-gsk-gresources-xml.py \
-	gtk/gen-gtk-gresources-xml.py \
-	gtk/gentypefuncs.py \
-	demos/gtk-demo/geninclude.py \
-	gdk/wayland/genprotocolfiles.py \
-	build-aux/meson/post-install.sh \
-	$()
-
-EXTRA_DIST +=			\
-	autogen.sh		\
-	HACKING			\
-	README			\
-	README.in		\
-	INSTALL			\
-	INSTALL.in		\
-	NEWS.pre-1-0		\
-	README.commits		\
-	README.win32		\
-	config.h.win32		\
-	makefile.msc		\
-	gtk-zip.sh.in		\
-	sanitize-la.sh		\
-	po/README.translators	\
-	po/po2tbl.sed.in	\
-	make-pot		\
-	$(meson_files)
-
-MAINTAINERCLEANFILES = \
-	$(GITIGNORE_MAINTAINERCLEANFILES_TOPLEVEL) \
-	$(GITIGNORE_MAINTAINERCLEANFILES_M4_LIBTOOL) \
-	$(GITIGNORE_MAINTAINERCLEANFILES_MAKEFILE_IN) \
-	$(srcdir)/m4/gtk-doc.m4 \
-	$(srcdir)/INSTALL \
-	$(srcdir)/README \
-	$(srcdir)/gtk-doc.make \
-	$(srcdir)/ChangeLog
-
-
-## Copy .pc files to target-specific names
-gtk+-x11-4.0.pc gtk+-win32-4.0.pc gtk+-quartz-4.0.pc gtk+-broadway-4.0.pc gtk+-wayland-4.0.pc gtk+-mir-4.0.pc: gtk+-4.0.pc
-	rm -f $@ && \
-	cp gtk+-4.0.pc $@
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = gtk+-4.0.pc gail-4.0.pc
-pkgconfig_DATA += ${GDK_BACKENDS:%=gtk+-%-4.0.pc}
-
-if OS_UNIX
-pkgconfig_DATA += gtk+-unix-print-4.0.pc
-endif
-
-DISTCLEANFILES = \
-	gtk+-unix-print-4.0.pc		\
-	gtk+-4.0.pc			\
-	gtk+-x11-4.0.pc			\
-	gtk+-win32-4.0.pc		\
-	gtk+-quartz-4.0.pc		\
-	gtk+-broadway-4.0.pc		\
-	gtk+-wayland-4.0.pc		\
-	gtk+-mir-4.0.pc			\
-	gail-4.0.pc			\
-	config.lt
-
-distclean-local:
-	if test "$(srcdir)" = "."; then :; else \
-		rm -f ChangeLog; \
-	fi
-
-ChangeLog:
-	$(AM_V_GEN) if test -d "$(srcdir)/.git"; then \
-	  (GIT_DIR=$(top_srcdir)/.git $(top_builddir)/build-aux/missing git log GTK_2_16_0^^.. --stat) | fmt --split-only > $@.tmp \
-	  && mv -f $@.tmp $@ \
-	  || ($(RM) $@.tmp; \
-	      echo Failed to generate ChangeLog, your ChangeLog may be outdated >&2; \
-	      (test -f $@ || echo git-log is required to generate this file >> $@)); \
-	else \
-	  test -f $@ || \
-	  (echo A git checkout and git-log is required to generate ChangeLog >&2 && \
-	  echo A git checkout and git-log is required to generate this file >> $@); \
-	fi
-
-.PHONY: ChangeLog
-
-uninstall-local:
-	rm -f $(DESTDIR)$(pkgconfigdir)/gtk+-4.0.pc
-
-AM_DISTCHECK_CONFIGURE_FLAGS =		\
-	--enable-gtk-doc 		\
-	--disable-doc-cross-references  \
-	--enable-man 			\
-	--disable-maintainer-mode 	\
-	--enable-introspection  	\
-	--enable-installed-tests
-
-GITIGNORE_TRANSLATION_DIRS = po-properties
-GITIGNOREFILES = po-properties/gtk40-properties.pot
-
--include $(top_srcdir)/git.mk
diff --git a/Makefile.decl b/Makefile.decl
deleted file mode 100644
index 4bc7784b60..0000000000
--- a/Makefile.decl
+++ /dev/null
@@ -1,96 +0,0 @@
-# GTK+ - The GIMP Toolkit
-
-GTESTER        = gtester -k		# in $PATH for non-GLIB packages
-GTESTER_REPORT = gtester-report		# in $PATH for non-GLIB packages
-
-# initialize variables for unconditional += appending
-EXTRA_DIST =
-TEST_PROGS =
-
-### testing rules
-
-# Xvfb based test rules
-XVFB = Xvfb -ac -noreset -screen 0 1024x768x16
-XIDS = 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309 310 311 \
-   491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 \
-   991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 \
-  1008 1009 4703 4721 4723 4729 4733 4751 9973 9974 9975 9976 9977 9978 9979 \
-  9980 9981 9982 9983 9984 9985 9986 9987 9988 9989 9990 9991 9992 9993 9994 \
-  9995 9996 9997 9998 9999
-
-if USE_X11
-SKIP_GDKTARGET = \
-	false
-else
-SKIP_GDKTARGET = \
-	echo "Gtk+Tests:INFO: Skipping GUI tests for non-X11 target."
-endif
-
-if PLATFORM_WIN32
-no_undefined = -no-undefined
-endif
-
-XVFB_START = \
-	${XVFB} -help 2>/dev/null 1>&2 \
-	&& XID=`for id in $(XIDS) ; do test -e /tmp/.X$$id-lock || { echo $$id; exit 0; }; done; exit 1` \
-	&& { ${XVFB} :$$XID -nolisten tcp -auth /dev/null >/dev/null 2>&1 & \
-	       trap "kill -15 $$! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ; } \
-	|| { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } \
-	&& DISPLAY=:$$XID && export DISPLAY
-# call as: $(XVFB_START) && someprogram
-
-# test: run all tests in cwd and subdirs
-test: test-cwd test-recurse
-# test-cwd: run tests in cwd
-test-cwd: ${TEST_PROGS}
-	@$(SKIP_GDKTARGET) || test -z "${TEST_PROGS}" || { \
-	  $(XVFB_START) && { set -e; $(TESTS_ENVIRONMENT) G_TEST_SRCDIR="${abs_srcdir}" G_TEST_BUILDDIR="${abs_builddir}" ${GTESTER} --verbose ${TEST_PROGS}; }; \
-	}
-# test-recurse: run tests in subdirs
-test-recurse:
-	@ for subdir in $(SUBDIRS) ; do \
-	    test "$$subdir" = "." -o "$$subdir" = "po" -o "$$subdir" = "po-properties" || \
-	    ( cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) test ) || exit $? ; \
-	  done
-# test-report: run tests in subdirs and generate report
-# perf-report: run tests in subdirs with -m perf and generate report
-# full-report: like test-report: with -m perf and -m slow
-test-report perf-report full-report:	${TEST_PROGS}
-	@ ignore_logdir=true ; \
-	  if test -z "$$GTESTER_LOGDIR" ; then \
-	    GTESTER_LOGDIR=`mktemp -d "\`pwd\`/.testlogs-XXXXXX"`; export GTESTER_LOGDIR ; \
-	    ignore_logdir=false ; \
-	  fi ; \
-	  for subdir in $(SUBDIRS) ; do \
-	    test "$$subdir" = "." -o "$$subdir" = "po" -o "$$subdir" = "po-properties" || \
-	    ( cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $@ ) || exit $? ; \
-	  done ; \
-	  $(SKIP_GDKTARGET) || test -z "${TEST_PROGS}" || { \
-	    case $@ in \
-	    test-report) test_options="-k";; \
-	    perf-report) test_options="-k -m=perf";; \
-	    full-report) test_options="-k -m=perf -m=slow";; \
-	    esac ; \
-	    $(XVFB_START) && { \
-	      set -e; \
-	      if test -z "$$GTESTER_LOGDIR" ; then \
-	        G_TEST_SRCDIR="${abs_srcdir}" G_TEST_BUILDDIR="${abs_builddir}" ${GTESTER} --verbose $$test_options -o test-report.xml ${TEST_PROGS} ; \
-	      elif test -n "${TEST_PROGS}" ; then \
-	        G_TEST_SRCDIR="${abs_srcdir}" G_TEST_BUILDDIR="${abs_builddir}" ${GTESTER} --verbose $$test_options -o `mktemp "$$GTESTER_LOGDIR/log-XXXXXX"` ${TEST_PROGS} ; \
-	      fi ; \
-	    }; \
-	  }; \
-	  $$ignore_logdir || { \
-	    echo '<?xml version="1.0"?>' > $@.xml ; \
-	    echo '<report-collection>'  >> $@.xml ; \
-	    for lf in `ls -L "$$GTESTER_LOGDIR"/.` ; do \
-	      sed '1,1s/^<?xml\b[^>?]*?>//' <"$$GTESTER_LOGDIR"/"$$lf" >> $@.xml ; \
-	    done ; \
-	    echo >> $@.xml ; \
-	    echo '</report-collection>' >> $@.xml ; \
-	    rm -rf "$$GTESTER_LOGDIR"/ ; \
-	    ${GTESTER_REPORT} --version 2>/dev/null 1>&2 ; test "$$?" != 0 || ${GTESTER_REPORT} $@.xml >$@.html ; \
-	  }
-.PHONY: test test-cwd test-recurse test-report perf-report full-report
-# run make test-cwd as part of make check
-check-local: test-cwd
diff --git a/acinclude.m4 b/acinclude.m4
deleted file mode 100644
index f6f719d427..0000000000
--- a/acinclude.m4
+++ /dev/null
@@ -1,79 +0,0 @@
-# autoconf 2.13 / 2.50 compatibility macro
-
-# GLIB_AC_DIVERT_BEFORE_HELP(STUFF)
-# ---------------------------------
-# Put STUFF early enough so that they are available for $ac_help expansion.
-# Handle both classic (<= v2.13) and modern autoconf
-AC_DEFUN([GLIB_AC_DIVERT_BEFORE_HELP],
-[ifdef([m4_divert_text], [m4_divert_text([NOTICE],[$1])],
-       [ifdef([AC_DIVERT], [AC_DIVERT([NOTICE],[$1])],
-              [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl
-$1
-AC_DIVERT_POP()])])])
-
-# GTK_ADD_LIB(VAR,LIBNAME)
-# ---------------------------------
-# Helper macro to add a -lBlah to a variable, avoiding repeats
-# Note that this needs to be quoted when used in an enclosing macro
-AC_DEFUN([GTK_ADD_LIB],
-[ case "$$1 " in
-    *-l$2[[\ \	]]*)               ;;
-    *)               $1="-l$2 $$1" ;;
-  esac
-])
-
-
-# Checks the location of the XML Catalog
-# Usage:
-#   JH_PATH_XML_CATALOG([ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-# Defines XMLCATALOG and XML_CATALOG_FILE substitutions
-AC_DEFUN([JH_PATH_XML_CATALOG],
-[
-  # check for the presence of the XML catalog
-  AC_ARG_WITH([xml-catalog],
-              AC_HELP_STRING([--with-xml-catalog=CATALOG],
-                             [path to xml catalog to use]),,
-              [with_xml_catalog=/etc/xml/catalog])
-  jh_found_xmlcatalog=true
-  XML_CATALOG_FILE="$with_xml_catalog"
-  AC_SUBST([XML_CATALOG_FILE])
-  AC_MSG_CHECKING([for XML catalog ($XML_CATALOG_FILE)])
-  if test -f "$XML_CATALOG_FILE"; then
-    AC_MSG_RESULT([found])
-  else
-    jh_found_xmlcatalog=false
-    AC_MSG_RESULT([not found])
-  fi
-
-  # check for the xmlcatalog program
-  AC_PATH_PROG(XMLCATALOG, xmlcatalog, no)
-  if test "x$XMLCATALOG" = xno; then
-    jh_found_xmlcatalog=false
-  fi
-
-  if $jh_found_xmlcatalog; then
-    ifelse([$1],,[:],[$1])
-  else
-    ifelse([$2],,[AC_MSG_ERROR([could not find XML catalog])],[$2])
-  fi
-])
-
-# Checks if a particular URI appears in the XML catalog
-# Usage:
-#   JH_CHECK_XML_CATALOG(URI, [FRIENDLY-NAME], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-AC_DEFUN([JH_CHECK_XML_CATALOG],
-[
-  AC_REQUIRE([JH_PATH_XML_CATALOG],[JH_PATH_XML_CATALOG(,[:])])dnl
-  AC_MSG_CHECKING([for ifelse([$2],,[$1],[$2]) in XML catalog])
-  if $jh_found_xmlcatalog && \
-     AC_RUN_LOG([$XMLCATALOG --noout "$XML_CATALOG_FILE" "$1" >&2]); then
-    AC_MSG_RESULT([found])
-    ifelse([$3],,,[$3
-])dnl
-  else
-    AC_MSG_RESULT([not found])
-    ifelse([$4],,
-       [AC_MSG_ERROR([could not find ifelse([$2],,[$1],[$2]) in XML catalog])],
-       [$4])
-  fi
-])
diff --git a/autogen.sh b/autogen.sh
deleted file mode 100755
index 250f80d25e..0000000000
--- a/autogen.sh
+++ /dev/null
@@ -1,46 +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"
-
-mkdir -p m4
-
-GTKDOCIZE=`which gtkdocize`
-if test -z $GTKDOCIZE; then
-        echo "*** No GTK-Doc found, please install it ***"
-        exit 1
-else
-        gtkdocize || exit $?
-fi
-
-PKGCONFIG=`which pkg-config`
-if test -z "$PKGCONFIG"; then
-        echo "*** pkg-config not found, please install it ***"
-        exit 1
-fi
-
-pkg-config --print-errors gobject-introspection-1.0
-if [ $? != 0 ]; then
-	echo "You probably need to install 'libgirepository1.0-dev'"
-	exit 1
-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 a73067e420..0000000000
--- a/config.h.win32.in
+++ /dev/null
@@ -1,337 +0,0 @@
-/* config.h.win32.in. Merged from two versions generated by configure for gcc and MSVC.  */
-/* config.h.  Generated from config.h.in by configure.  */
-/* config.h.in.  Generated from configure.in by autoheader.  */
-
-/* always defined to indicate that i18n is enabled */
-#define ENABLE_NLS 1
-
-/* define to enable packagekit */
-/* #undef ENABLE_PACKAGEKIT */
-
-/* The prefix for our gettext translation domains. */
-#define GETTEXT_PACKAGE "@GETTEXT_PACKAGE@"
-
-/* Disable deprecation warnings from glib */
-/* #undef GLIB_DISABLE_DEPRECATION_WARNINGS */
-
-/* Define if debugging is enabled */
-#define GTK_COMPILED_WITH_DEBUGGING "yes"
-
-/* Define the location where the catalogs will be installed */
-#define GTK_LOCALEDIR "NONE/share/locale"
-
-/* Define to 1 if you have the `bind_textdomain_codeset' function. */
-#define HAVE_BIND_TEXTDOMAIN_CODESET 1
-
-/* define if we have colord */
-/* #undef HAVE_COLORD */
-
-/* Define to 1 if you have the <crt_externs.h> header file. */
-/* #undef HAVE_CRT_EXTERNS_H */
-
-/* Define to 1 if CUPS 1.2 API is available */
-/* #undef HAVE_CUPS_API_1_2 */
-
-/* Define to 1 if you have the `dcgettext' function. */
-#define HAVE_DCGETTEXT 1
-
-/* Define to 1 if you have the declaration of `isinf', and to 0 if you don't.
-   */
-#if !defined (_MSC_VER) || (_MSC_VER >= 1800)
-#define HAVE_DECL_ISINF 1
-#endif
-
-/* Define to 1 if you have the declaration of `isnan', and to 0 if you don't.
-   */
-#if !defined (_MSC_VER) || (_MSC_VER >= 1800)
-#define HAVE_DECL_ISNAN 1
-#endif
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-/* #undef HAVE_DLFCN_H */
-
-/* Define to 1 if you have the `exp2' function. */
-#if !defined (_MSC_VER) || (_MSC_VER >= 1800)
-#define HAVE_EXP2 1
-#endif
-
-/* Define to 1 if you have the `flockfile' function. */
-#undef HAVE_FLOCKFILE
-
-/* Define to 1 if you have the <ftw.h> header file. */
-/* #undef HAVE_FTW_H */
-
-/* Define to 1 if you have the `getpagesize' function. */
-#ifndef _MSC_VER
-#define HAVE_GETPAGESIZE 1
-#else
-/* #undef HAVE_GETPAGESIZE */
-#endif
-
-/* Define to 1 if you have the `getresuid' function. */
-/* #undef HAVE_GETRESUID */
-
-/* Define if the GNU gettext() function is already present or preinstalled. */
-#define HAVE_GETTEXT 1
-
-/* Define if gio-unix is available */
-/* #undef HAVE_GIO_UNIX */
-
-/* Have GNU ftw */
-/* #undef HAVE_GNU_FTW */
-
-/* Define to 1 if you have the `httpGetAuthString' function. */
-/* #undef HAVE_HTTPGETAUTHSTRING */
-
-/* Define if cups http_t authstring field is accessible */
-/* #undef HAVE_HTTP_AUTHSTRING */
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#if !defined (_MSC_VER) || (_MSC_VER >= 1800)
-#define HAVE_INTTYPES_H 1
-#else
-/* #undef HAVE_INTTYPES_H */
-#endif
-
-/* Define to 1 if the system has the type `IPrintDialogCallback'. */
-#define HAVE_IPRINTDIALOGCALLBACK 1
-
-/* Define if your <locale.h> file defines LC_MESSAGES. */
-/* #undef HAVE_LC_MESSAGES */
-
-/* Define to 1 if you have the `m' library (-lm). */
-#ifndef _MSC_VER
-#define HAVE_LIBM 1
-#endif
-
-/* Define to 1 if you have the <locale.h> header file. */
-#define HAVE_LOCALE_H 1
-
-/* Define to 1 if you have the `localtime_r' function. */
-/* #undef HAVE_LOCALTIME_R */
-
-/* Define to 1 if you have the `log2' function. */
-#if !defined (_MSC_VER) || (_MSC_VER >= 1800)
-#define HAVE_LOG2 1
-#endif
-
-/* Define to 1 if you have the `lstat' function. */
-/* #undef HAVE_LSTAT */
-
-/* Define to 1 if you have the `mallinfo' function. */
-/* #undef HAVE_MALLINFO */
-
-/* Define to 1 if you have the <memory.h> header file. */
-#define HAVE_MEMORY_H 1
-
-/* Define to 1 if you have the `mkstemp' function. */
-/* #undef HAVE_MKSTEMP */
-
-/* Define to 1 if you have a working `mmap' system call. */
-/* #undef HAVE_MMAP */
-
-/* Define to 1 if nearbyint() is available */
-#if !defined (_MSC_VER) || (_MSC_VER >= 1800)
-#define HAVE_NEARBYINT 1
-#endif
-
-/* Define to 1 if libpapi available */
-/* #undef HAVE_PAPI */
-
-/* Define to 1 if you have the <pwd.h> header file. */
-/* #undef HAVE_PWD_H */
-
-/* Have the Xrandr extension library */
-/* #undef HAVE_RANDR */
-
-/* Define to 1 if rint() is available */
-#if !defined (_MSC_VER) || (_MSC_VER >= 1800)
-#define HAVE_RINT 1
-#endif
-
-/* Define to 1 if round() is available */
-#if !defined (_MSC_VER) || (_MSC_VER >= 1800)
-#define HAVE_ROUND 1
-#endif
-
-/* Define to 1 if sincos() is available */
-/* #undef HAVE_SINCOS */
-
-/* Have the sockaddr_un.sun_len member */
-/* #undef HAVE_SOCKADDR_UN_SUN_LEN */
-
-/* Define to 1 if solaris xinerama is available */
-/* #undef HAVE_SOLARIS_XINERAMA */
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#ifndef _MSC_VER
-#define HAVE_STDINT_H 1
-#else
-#if (_MSC_VER >= 1600) /* VS 2010+ ships with stdint.h */
-#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
-#endif
-
-/* Define to 1 if you have the <string.h> header file. */
-#define HAVE_STRING_H 1
-
-/* Define to 1 if you have the <sys/mman.h> header file. */
-/* #undef HAVE_SYS_MMAN_H */
-
-/* Define to 1 if you have the <sys/param.h> header file. */
-/* #undef HAVE_SYS_PARAM_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/time.h> header file. */
-#ifndef _MSC_VER
-#define HAVE_SYS_TIME_H 1
-#else /* _MSC_VER */
-/* #undef HAVE_SYS_TIME_H */
-#endif
-
-/* 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
-
-/* Have the XCOMPOSITE X extension */
-/* #undef HAVE_XCOMPOSITE */
-
-/* Have the Xcursor library */
-/* #undef HAVE_XCURSOR */
-
-/* Have the XDAMAGE X extension */
-/* #undef HAVE_XDAMAGE */
-
-/* Have the XFIXES X extension */
-/* #undef HAVE_XFIXES */
-
-/* Define to 1 if XFree Xinerama is available */
-/* #undef HAVE_XFREE_XINERAMA */
-
-/* Have XGenericEvent */
-/* #undef HAVE_XGENERICEVENTS */
-
-/* Define to 1 if xinerama is available */
-/* #undef HAVE_XINERAMA */
-
-/* Define to use XKB extension */
-/* #undef HAVE_XKB */
-
-/* Have the SYNC extension library */
-/* #undef HAVE_XSYNC */
-
-/* Define to 1 if you have the `_lock_file' function. */
-#define HAVE__LOCK_FILE
-
-/* Define if _NL_MEASUREMENT_MEASUREMENT is available */
-/* #undef HAVE__NL_MEASUREMENT_MEASUREMENT */
-
-/* Define if _NL_PAPER_HEIGHT is available */
-/* #undef HAVE__NL_PAPER_HEIGHT */
-
-/* Define if _NL_PAPER_WIDTH is available */
-/* #undef HAVE__NL_PAPER_WIDTH */
-
-/* Define if _NL_TIME_FIRST_WEEKDAY is available */
-/* #undef HAVE__NL_TIME_FIRST_WEEKDAY */
-
-/* Define to 1 if you have the `_NSGetEnviron' function. */
-/* #undef HAVE__NSGETENVIRON */
-
-/* Define to the sub-directory in which libtool stores uninstalled libraries.
-   */
-#define LT_OBJDIR ".libs/"
-
-/* Define if <X11/extensions/XIproto.h> needed for xReply */
-/* #undef NEED_XIPROTO_H_FOR_XREPLY */
-
-/* Define to 1 if your C compiler doesn't accept -c and -o together. */
-#ifndef _MSC_VER
-/* #undef NO_MINUS_C_MINUS_O */
-#else 
-#define 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=gtk%2B"
-
-/* Define to the full name of this package. */
-#define PACKAGE_NAME "gtk+"
-
-/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "gtk+ @GTK_MAJOR_VERSION@.@GTK_MINOR_VERSION@.@GTK_MICRO_VERSION@"
-
-/* Define to the one symbol short name of this package. */
-#define PACKAGE_TARNAME "gtk+"
-
-/* Define to the home page for this package. */
-#define PACKAGE_URL ""
-
-/* Define to the version of this package. */
-#define PACKAGE_VERSION "@GTK_MAJOR_VERSION@.@GTK_MINOR_VERSION@.@GTK_MICRO_VERSION@"
-
-/* Use NSBundle functions to determine load paths for libraries, translations,
-   etc. */
-/* #undef QUARTZ_RELOCATION */
-
-/* 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
-
-/* Define to 1 if XInput 2.0 is available */
-/* #undef XINPUT_2 */
-
-/* Define to 1 if XInput 2.2 is available */
-/* #undef XINPUT_2_2 */
-
-/* Define to 1 if the X Window System is missing or not being used. */
-/* #undef X_DISPLAY_MISSING */
-
-/* Enable large inode numbers on Mac OS X 10.5.  */
-#ifndef _DARWIN_USE_64_BIT_INODE
-/* # define _DARWIN_USE_64_BIT_INODE 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_EXTERN __declspec (dllexport) extern
-#else
-#define _GDK_EXTERN __attribute__((visibility("default")))  __declspec (dllexport) extern
-#endif
-
-/* Define for large files, on AIX-style hosts. */
-/* #undef _LARGE_FILES */
-
-/* Define to `int' if <sys/types.h> doesn't define. */
-#define gid_t int
-
-/* Define to `int' if <sys/types.h> doesn't define. */
-#define uid_t int
diff --git a/configure.ac b/configure.ac
deleted file mode 100644
index 301310219e..0000000000
--- a/configure.ac
+++ /dev/null
@@ -1,2090 +0,0 @@
-# Process this file with autoconf to produce a configure script.
-
-# Making releases:
-#   GTK_MICRO_VERSION += 1;
-#   GTK_INTERFACE_AGE += 1;
-#   GTK_BINARY_AGE += 1;
-# if any functions have been added, set GTK_INTERFACE_AGE to 0.
-# if backwards compatibility has been broken,
-# set GTK_BINARY_AGE and GTK_INTERFACE_AGE to 0.
-
-m4_define([gtk_major_version], [3])
-m4_define([gtk_minor_version], [91])
-m4_define([gtk_micro_version], [2])
-m4_define([gtk_interface_age], [0])
-m4_define([gtk_binary_age],
-          [m4_eval(100 * gtk_minor_version + gtk_micro_version)])
-m4_define([gtk_version],
-          [gtk_major_version.gtk_minor_version.gtk_micro_version])
-# This is the X.Y used in -lgtk-X.Y
-m4_define([gtk_api_version], [4.0])
-
-AC_PREREQ([2.62])
-AC_INIT([gtk+], [gtk_version],
-        [http://bugzilla.gnome.org/enter_bug.cgi?product=gtk%2B],
-        [gtk+])
-
-AC_CONFIG_HEADERS([config.h])
-AC_CONFIG_SRCDIR([gdk/gdktypes.h])
-AC_CONFIG_MACRO_DIR([m4])
-AC_CONFIG_AUX_DIR([build-aux])
-
-AC_CANONICAL_HOST
-
-# Define a string for the earliest version that this release has
-# backwards binary compatibility with for all interfaces a module
-# might. Unless we add module-only API with lower stability
-# guarantees, this should be unchanged until we break binary compat
-# for GTK+.
-#
-#GTK_BINARY_VERSION=$GTK_MAJOR_VERSION.$GTK_MINOR_VERSION.$LT_CURRENT
-m4_define([gtk_binary_version], [4.0.0])
-
-# required versions of other packages
-m4_define([glib_required_major], [2])
-m4_define([glib_required_minor], [53])
-m4_define([glib_required_micro], [0])
-m4_define([glib_required_version],
-          [glib_required_major.glib_required_minor.glib_required_micro])
-m4_define([glib_min_required_minor],
-          [m4_eval(glib_required_minor - (glib_required_minor % 2))])
-m4_define([glib_max_allowed_minor],
-          [m4_eval(glib_required_minor + (glib_required_minor % 2))])
-m4_define([glib_min_required_version], m4_join([_], [GLIB_VERSION], glib_required_major, glib_min_required_minor))
-m4_define([glib_max_allowed_version], m4_join([_], [GLIB_VERSION], glib_required_major, glib_max_allowed_minor))
-GLIB_VERSION_CFLAGS="-DGLIB_MIN_REQUIRED_VERSION=glib_min_required_version -DGLIB_MAX_ALLOWED_VERSION=glib_max_allowed_version"
-
-m4_define([pango_required_version], [1.37.3])
-m4_define([atk_required_version], [2.15.1])
-m4_define([cairo_required_version], [1.14.0])
-m4_define([gdk_pixbuf_required_version], [2.30.0])
-m4_define([introspection_required_version], [1.39.0])
-m4_define([wayland_required_version], [1.9.91])
-m4_define([wayland_protocols_required_version], [1.9])
-m4_define([mirclient_required_version], [0.22.0])
-m4_define([mircookie_required_version], [0.17.0])
-m4_define([epoxy_required_version], [1.0])
-m4_define([graphene_required_version], [1.5.1])
-GLIB_REQUIRED_VERSION=glib_required_version
-PANGO_REQUIRED_VERSION=pango_required_version
-ATK_REQUIRED_VERSION=atk_required_version
-CAIRO_REQUIRED_VERSION=cairo_required_version
-GDK_PIXBUF_REQUIRED_VERSION=gdk_pixbuf_required_version
-INTROSPECTION_REQUIRED_VERSION=introspection_required_version
-
-AC_SUBST(GLIB_REQUIRED_VERSION)
-AC_SUBST(PANGO_REQUIRED_VERSION)
-AC_SUBST(ATK_REQUIRED_VERSION)
-AC_SUBST(CAIRO_REQUIRED_VERSION)
-AC_SUBST(GDK_PIXBUF_REQUIRED_VERSION)
-AC_SUBST(INTROSPECTION_REQUIRED_VERSION)
-
-# Save this value here, since automake will set cflags later
-cflags_set=${CFLAGS+set}
-
-AM_INIT_AUTOMAKE([1.14 subdir-objects -Wall no-define -Wno-portability tar-ustar no-dist-gzip dist-xz])
-AM_MAINTAINER_MODE([enable])
-
-# Support silent build rules. Disable
-# by either passing --disable-silent-rules to configure or passing V=1
-# 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
-
-
-GTK_MAJOR_VERSION=gtk_major_version
-GTK_MINOR_VERSION=gtk_minor_version
-GTK_MICRO_VERSION=gtk_micro_version
-GTK_INTERFACE_AGE=gtk_interface_age
-GTK_BINARY_AGE=gtk_binary_age
-GTK_VERSION=gtk_version
-GTK_API_VERSION=gtk_api_version
-GTK_BINARY_VERSION=gtk_binary_version
-AC_SUBST(GTK_MAJOR_VERSION)
-AC_SUBST(GTK_MINOR_VERSION)
-AC_SUBST(GTK_MICRO_VERSION)
-AC_SUBST(GTK_INTERFACE_AGE)
-AC_SUBST(GTK_BINARY_AGE)
-AC_SUBST(GTK_API_VERSION)
-AC_SUBST(GTK_VERSION)
-AC_SUBST(GTK_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 * gtk_minor_version + gtk_micro_version - gtk_interface_age)])
-m4_define([lt_revision], [gtk_interface_age])
-m4_define([lt_age], [m4_eval(gtk_binary_age - gtk_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)
-
-m4_define([gail_lt_current],[0])
-m4_define([gail_lt_revision],[0])
-m4_define([gail_lt_age],[0])
-m4_define([gail_lt_version_info],[gail_lt_current:gail_lt_revision:gail_lt_age])
-m4_define([gail_lt_current_minus_age],[m4_eval(gail_lt_current - gail_lt_age)])
-AC_SUBST([GAIL_LT_VERSION_INFO],[gail_lt_version_info])
-AC_SUBST([GAIL_LT_CURRENT_MINUS_AGE],[gail_lt_current_minus_age])
-
-# Workaround for https://bugzilla.gnome.org/show_bug.cgi?id=721346 until fixed upstream in autoconf-archive
-if test "$cross_compiling" = "no"; then
-  if test -n "$CFLAGS"; then
-    CFLAGS_FOR_BUILD=$CFLAGS
-  fi
-  if test -n "$CPPFLAGS"; then
-    CPPFLAGS_FOR_BUILD=$CPPFLAGS
-  fi
-  if test -n "$LDFLAGS"; then
-    LDFLAGS_FOR_BUILD=$LDFLAGS
-  fi
-fi
-
-# Checks for programs.
-AC_PROG_CC
-AX_PROG_CC_FOR_BUILD
-AC_PROG_CC_C_O
-AC_PROG_MKDIR_P
-AC_PROG_INSTALL
-AC_PROG_MAKE_SET
-
-# Define _GNU_SOURCE etc. where appropriate, e.g. for strptime() on glibc
-AC_USE_SYSTEM_EXTENSIONS
-
-# i18n stuff
-AM_GNU_GETTEXT([external])
-AM_GNU_GETTEXT_VERSION([0.19.7])
-
-GETTEXT_PACKAGE=gtk40
-AC_SUBST(GETTEXT_PACKAGE)
-AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE",
-                   [The prefix for our gettext translation domains.])
-
-MATH_LIB=-lm
-AC_MSG_CHECKING([for native Win32])
-LIB_EXE_MACHINE_FLAG=X86
-EXE_MANIFEST_ARCHITECTURE=X86
-DISABLE_ON_W32=''
-case "$host" in
-  *-*-mingw*)
-    dnl Comment-out certain gtk3.types.in lines
-    DISABLE_ON_W32='%'
-    os_win32=yes
-    gio_can_sniff=no
-    MATH_LIB=
-    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(DISABLE_ON_W32)
-AC_SUBST(LIB_EXE_MACHINE_FLAG)
-AC_SUBST(EXE_MANIFEST_ARCHITECTURE)
-
-case $host in
-  *-*-linux*)
-    os_linux=yes
-    ;;
-  *-*-darwin*)
-    os_darwin=yes
-    ;;
-esac
-
-dnl
-dnl Check for a working C++ compiler, but do not bail out, if none is found.
-dnl We use this for an automated test for C++ header correctness.
-dnl
-AC_CHECK_TOOLS(CXX, [$CCC c++ g++ gcc CC cxx cc++ cl], gcc)
-AC_LANG_PUSH([C++])
-
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]],
-                                   [[class a { int b; } c;]])],
-                  [],[CXX=])
-AM_CONDITIONAL(HAVE_CXX, test "$CXX" != "")
-
-gtk_save_cxxflags="$CXXFLAGS"
-CXXFLAGS="$CXXFLAGS -x objective-c++"
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@interface Foo @end]],
-                                   [[]])],
-                  [OBJC=yes],[OBJC=no])
-AM_CONDITIONAL(HAVE_OBJC, test "$OBJC" = "yes")
-CXXFLAGS="$gtk_save_cxxflags"
-AC_LANG_POP([C++])
-
-if test "$os_win32" = "yes"; then
-  if test x$enable_static = xyes -o x$enable_static = x; then
-    AC_MSG_WARN([Disabling static library build, must build as DLL on Windows.])
-    enable_static=no
-  fi
-  if test x$enable_shared = xno; then
-    AC_MSG_WARN([Enabling shared library build, must build as DLL on Windows.])
-  fi
-  enable_shared=yes
-fi
-
-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_PATH_TOOL(NM, nm, nm)
-
-AC_MSG_CHECKING([for some Win32 platform])
-case "$host" in
-  *-*-mingw*|*-*-cygwin*)
-    platform_win32=yes
-    ;;
-  *)
-    platform_win32=no
-    ;;
-esac
-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")
-AM_CONDITIONAL(OS_DARWIN, test "$os_darwin" = "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(gtk_minor_version % 2), [1], [yes], [minimum]))
-
-dnl declare --enable-* args and collect ac_help strings
-AC_ARG_ENABLE(debug,
-              [AS_HELP_STRING([--enable-debug=@<:@no/minimum/yes@:>@],
-                              [turn on debugging @<:@default=debug_default@:>@])],,
-              [enable_debug=debug_default])
-
-AC_ARG_ENABLE(installed_tests,
-              AS_HELP_STRING([--enable-installed-tests],
-                             [Install test programs (default: no)]),,
-              [enable_installed_tests=no])
-AM_CONDITIONAL(BUILDOPT_INSTALL_TESTS, test x$enable_installed_tests = xyes)
-
-AC_ARG_ENABLE(vulkan,
-              [AS_HELP_STRING([--enable-vulkan],
-                              [support Vulkan graphics API [default=maybe]])],,
-              [enable_vulkan="maybe"])
-
-AC_ARG_ENABLE(xkb,
-              [AS_HELP_STRING([--enable-xkb],
-                              [support XKB extension [default=maybe]])],,
-              [enable_xkb="maybe"])
-AC_ARG_ENABLE(xinerama,
-              [AS_HELP_STRING([--enable-xinerama],
-	                      [support Xinerama extension [default=maybe]])],,
-              [enable_xinerama="maybe"])
-AC_ARG_ENABLE(xrandr,
-              [AS_HELP_STRING([--enable-xrandr],
-                              [support XRandR extension [default=maybe]])],,
-              [enable_xrandr="maybe"])
-AC_ARG_ENABLE(xfixes,
-              [AS_HELP_STRING([--enable-xfixes],
-                              [support XFixes extension [default=maybe]])],,
-              [enable_xfixes="maybe"])
-AC_ARG_ENABLE(xcomposite,
-              [AS_HELP_STRING([--enable-xcomposite],
-                              [support X Composite extension [default=maybe]])],,
-              [enable_xcomposite="maybe"])
-AC_ARG_ENABLE(xdamage,
-              [AS_HELP_STRING([--enable-xdamage],
-                              [support X Damage extension [default=maybe]])],,
-              [enable_xdamage="maybe"])
-
-AC_ARG_ENABLE(x11-backend,
-              [AS_HELP_STRING([--enable-x11-backend],
-                              [enable the X11 gdk backend])],
-			      [backend_set=yes])
-AC_ARG_ENABLE(win32-backend,
-              [AS_HELP_STRING([--enable-win32-backend],
-                              [enable the Win32 gdk backend])],
-			      [backend_set=yes])
-AC_ARG_ENABLE(quartz-backend,
-              [AS_HELP_STRING([--enable-quartz-backend],
-                              [enable the quartz gdk backend])],
-			      [backend_set=yes])
-AC_ARG_ENABLE(broadway-backend,
-              [AS_HELP_STRING([--enable-broadway-backend],
-                              [enable the broadway (HTML5) gdk backend])],
-			      [backend_set=yes])
-AC_ARG_ENABLE(wayland-backend,
-              [AS_HELP_STRING([--enable-wayland-backend],
-                              [enable the wayland gdk backend])],
-			      [backend_set=yes])
-AC_ARG_ENABLE(mir-backend,
-              [AS_HELP_STRING([--enable-mir-backend],
-                              [enable the Mir gdk backend])],
-			      [backend_set=yes])
-
-if test -z "$backend_set"; then
-  if test "$platform_win32" = yes; then
-    enable_win32_backend=yes
-  else
-    enable_x11_backend=yes
-    enable_wayland_backend=maybe
-    enable_mir_backend=no
-  fi
-fi
-
-AC_ARG_ENABLE(quartz-relocation,
-              [AS_HELP_STRING([--enable-quartz-relocation],
-                              [enable bundle-based relocation functions])],
-                              [quartz_relocation=yes])
-
-cairo_backends=
-backend_immodules=
-have_gio_unix=no
-GDK_BACKENDS=
-GDK_EXTRA_LIBS=
-GDK_EXTRA_CFLAGS=
-GDK_WINDOWING=
-PANGO_PACKAGES="pango pangocairo"
-
-ENABLE_ON_X11='%'
-if test "$enable_x11_backend" = "yes"; then
-  # GDK calls the xlib backend "x11," cairo calls it "xlib." Other
-  # backend names are identical.
-  cairo_backends="$cairo_backends cairo-xlib"
-  GDK_BACKENDS="$GDK_BACKENDS x11"
-  backend_immodules="$backend_immodules,xim"
-  GDK_WINDOWING="$GDK_WINDOWING
-#define GDK_WINDOWING_X11"
-  ENABLE_ON_X11=''
-fi
-AC_SUBST(ENABLE_ON_X11)
-
-if test "$enable_win32_backend" = "yes"; then
-  cairo_backends="$cairo_backends cairo-win32"
-  GDK_BACKENDS="$GDK_BACKENDS win32"
-  backend_immodules="$backend_immodules,ime"
-  GDK_WINDOWING="$GDK_WINDOWING
-#define GDK_WINDOWING_WIN32"
-  GDK_EXTRA_LIBS="$GDK_EXTRA_LIBS -lgdi32 -limm32 -lshell32 -lole32 -Wl,-luuid -lwinmm -ldwmapi -lsetupapi -lcfgmgr32"
-  AM_CONDITIONAL(USE_WIN32, true)
-  PANGO_PACKAGES="pangowin32 pangocairo"
-else
-  AM_CONDITIONAL(USE_WIN32, false)
-fi
-
-DISABLE_ON_QUARTZ=''
-if test "x$enable_quartz_backend" = xyes; then
-  cairo_backends="$cairo_backends cairo-quartz"
-  GDK_BACKENDS="$GDK_BACKENDS quartz"
-  backend_immodules="$backend_immodules,quartz"
-  GDK_WINDOWING="$GDK_WINDOWING
-#define GDK_WINDOWING_QUARTZ"
-  GDK_EXTRA_LIBS="$GDK_EXTRA_LIBS -framework Cocoa -framework Carbon"
-  DISABLE_ON_QUARTZ='%'
-  AM_CONDITIONAL(USE_QUARTZ, true)
-  if test "x$quartz_relocation" = xyes; then
-    AC_DEFINE([QUARTZ_RELOCATION], [1], [Use NSBundle functions to determine load paths for libraries, translations, etc.])
-  fi
-else
-  AM_CONDITIONAL(USE_QUARTZ, false)
-fi
-AC_SUBST(DISABLE_ON_QUARTZ)
-
-AC_CHECK_LIB([rt], [shm_open], [SHM_LIBS="-lrt"], [SHM_LIBS=""])
-AC_SUBST(SHM_LIBS)
-
-AC_CHECK_FUNCS(posix_fallocate flockfile _lock_file)
-
-if test "x$enable_broadway_backend" = xyes; then
-  GDK_BACKENDS="$GDK_BACKENDS broadway"
-  cairo_backends="$cairo_backends cairo"
-  backend_immodules="$backend_immodules,broadway"
-  GDK_WINDOWING="$GDK_WINDOWING
-#define GDK_WINDOWING_BROADWAY"
-  GDK_EXTRA_LIBS="$GDK_EXTRA_LIBS -lz"
-  AM_CONDITIONAL(USE_BROADWAY, true)
-else
-  AM_CONDITIONAL(USE_BROADWAY, false)
-fi
-
-PKG_PROG_PKG_CONFIG
-
-WAYLAND_DEPENDENCIES="wayland-client >= wayland_required_version wayland-protocols >= wayland_protocols_required_version xkbcommon >= 0.2.0 wayland-cursor >= wayland_required_version wayland-egl"
-if test "$enable_wayland_backend" = "maybe" ; then
-  AC_PATH_PROG([WAYLAND_SCANNER],[wayland-scanner],[no])
-  PKG_CHECK_EXISTS($WAYLAND_DEPENDENCIES, [have_wayland_deps=yes], [have_wayland_deps=no])
-  AC_MSG_CHECKING([for WAYLAND_DEPENDENCIES])
-  if test "$WAYLAND_SCANNER" = "no" -o "$have_wayland_deps" = "no" ; then
-    enable_wayland_backend=no
-  else
-    enable_wayland_backend=yes
-  fi
-  AC_MSG_RESULT($enable_wayland_backend)
-fi
-
-if test "$enable_wayland_backend" = "yes"; then
-  # For the cairo image backend
-  cairo_backends="$cairo_backends cairo"
-  AC_SUBST(WAYLAND_PROTOCOLS_DATADIR, `$PKG_CONFIG --variable=pkgdatadir wayland-protocols`)
-  GDK_BACKENDS="$GDK_BACKENDS wayland"
-  GDK_WINDOWING="$GDK_WINDOWING
-#define GDK_WINDOWING_WAYLAND"
-  WAYLAND_PACKAGES="$WAYLAND_DEPENDENCIES"
-  AC_PATH_PROG([WAYLAND_SCANNER],[wayland-scanner],[no])
-  AS_IF([test "x$WAYLAND_SCANNER" = "xno"],
-    AC_MSG_ERROR([Could not find wayland-scanner in your PATH, required for parsing wayland extension protocols]))
-  AC_SUBST([WAYLAND_SCANNER])
-
-  AM_CONDITIONAL(USE_WAYLAND, true)
-else
-  AM_CONDITIONAL(USE_WAYLAND, false)
-fi
-
-MIR_DEPENDENCIES="mirclient >= mirclient_required_version mircookie >= mircookie_required_version libcontent-hub-glib"
-if test "$enable_mir_backend" = "maybe" ; then
-  PKG_CHECK_EXISTS($MIR_DEPENDENCIES, [have_mir_deps=yes], [have_mir_deps=no])
-  AC_MSG_CHECKING([for MIR_DEPENDENCIES])
-  if test "$have_mir_deps" = "no" ; then
-    enable_mir_backend=no
-  else
-    enable_mir_backend=yes
-  fi
-  AC_MSG_RESULT($enable_mir_backend)
-fi
-
-if test "$enable_mir_backend" = "yes"; then
-  cairo_backends="$cairo_backends cairo"
-  GDK_BACKENDS="$GDK_BACKENDS mir"
-  GDK_WINDOWING="$GDK_WINDOWING
-#define GDK_WINDOWING_MIR"
-  MIR_PACKAGES="$MIR_DEPENDENCIES"
-
-  AM_CONDITIONAL(USE_MIR, true)
-else
-  AM_CONDITIONAL(USE_MIR, false)
-fi
-
-# strip leading space
-GDK_BACKENDS=${GDK_BACKENDS#* }
-
-AC_SUBST(GDK_BACKENDS)
-
-if test -z "$GDK_BACKENDS"; then
-  AC_MSG_ERROR([No GDK backends selected.])
-fi
-
-if test "x$enable_debug" = "xyes"; then
-  test "$cflags_set" = set || CFLAGS="$CFLAGS -g"
-  GTK_DEBUG_FLAGS="-DG_ENABLE_DEBUG -DG_ENABLE_CONSISTENCY_CHECKS"
-else
-  if test "x$enable_debug" = "xno"; then
-    GTK_DEBUG_FLAGS="-DG_DISABLE_ASSERT -DG_DISABLE_CHECKS -DG_DISABLE_CAST_CHECKS"
-  else
-    GTK_DEBUG_FLAGS="-DG_ENABLE_DEBUG -DG_DISABLE_CAST_CHECKS"
-  fi
-fi
-GTK_DEBUG_FLAGS="$GTK_DEBUG_FLAGS $GLIB_VERSION_CFLAGS"
-
-# 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
-
-# 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 dnl
-   atk >= atk_required_version dnl
-   pango >= pango_required_version dnl
-   cairo >= cairo_required_version dnl
-   cairo-gobject >= cairo_required_version dnl
-   gdk-pixbuf-2.0 >= gdk_pixbuf_required_version])
-
-PKG_CHECK_MODULES(CAIRO_BACKEND, [$cairo_backends])
-
-# Remove this check once cairo_required_version reaches at least 1.16.0
-AS_CASE([$host_os],
-  [mingw*],
-  [
-    PKG_CHECK_MODULES(CAIRO, [cairo >= cairo_required_version])
-    gtk_save_LIBS="$LIBS"
-    LIBS="$CAIRO_LIBS $LIBS"
-    AC_CHECK_LIB([cairo], [cairo_win32_surface_create_with_format],
-      [AC_MSG_RESULT([found])],
-      [AC_MSG_ERROR(
-[cairo_win32_surface_create_with_format is not found in cairo library
-You need a cairo snapshot 1.15.x or 1.16.x release or newer])])
-    LIBS="$gtk_save_LIBS"
-  ],
-  []
-)
-
-
-PKG_CHECK_MODULES(GMODULE, [gmodule-2.0])
-
-dnl ******************************************************
-dnl * See whether to include shared library dependencies *
-dnl ******************************************************
-
-AC_ARG_ENABLE(explicit-deps,
-              [AS_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)
-
-AC_CHECK_FUNCS(lstat mkstemp)
-AC_CHECK_FUNCS(localtime_r)
-
-# _NL_TIME_FIRST_WEEKDAY is an enum and not a define
-AC_MSG_CHECKING([for _NL_TIME_FIRST_WEEKDAY])
-AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <langinfo.h>]],
-                                [[char c;
-                                  c = *((unsigned char *)  nl_langinfo(_NL_TIME_FIRST_WEEKDAY));]])],
-               [gtk_ok=yes], [gtk_ok=no])
-AC_MSG_RESULT($gtk_ok)
-if test "$gtk_ok" = "yes"; then
-  AC_DEFINE([HAVE__NL_TIME_FIRST_WEEKDAY], [1],
-	    [Define if _NL_TIME_FIRST_WEEKDAY is available])
-fi
-
-# _NL_MEASUREMENT_MEASUREMENT is an enum and not a define
-AC_MSG_CHECKING([for _NL_MEASUREMENT_MEASUREMENT])
-AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <langinfo.h>]],
-                                [[char c;
-                                  c = *((unsigned char *)  nl_langinfo(_NL_MEASUREMENT_MEASUREMENT));]])],
-               [gtk_ok=yes], [gtk_ok=no])
-AC_MSG_RESULT($gtk_ok)
-if test "$gtk_ok" = "yes"; then
-  AC_DEFINE([HAVE__NL_MEASUREMENT_MEASUREMENT], [1],
-	    [Define if _NL_MEASUREMENT_MEASUREMENT is available])
-fi
-
-# _NL_PAPER_HEIGHT is an enum and not a define
-AC_MSG_CHECKING([for _NL_PAPER_HEIGHT])
-AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <langinfo.h>]],
-                                [[char c;
-                                  c = *((unsigned char *)  nl_langinfo(_NL_PAPER_HEIGHT));]])],
-               [gtk_ok=yes], [gtk_ok=no])
-AC_MSG_RESULT($gtk_ok)
-if test "$gtk_ok" = "yes"; then
-  AC_DEFINE([HAVE__NL_PAPER_HEIGHT], [1],
-	    [Define if _NL_PAPER_HEIGHT is available])
-fi
-
-# _NL_PAPER_WIDTH is an enum and not a define
-AC_MSG_CHECKING([for _NL_PAPER_WIDTH])
-AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <langinfo.h>]],
-                                [[char c;
-                                  c = *((unsigned char *)  nl_langinfo(_NL_PAPER_WIDTH));]])],
-               [gtk_ok=yes], [gtk_ok=no])
-AC_MSG_RESULT($gtk_ok)
-if test "$gtk_ok" = "yes"; then
-  AC_DEFINE([HAVE__NL_PAPER_WIDTH], [1],
-	    [Define if _NL_PAPER_WIDTH is available])
-fi
-
-LIBS="$LIBS $INTLLIBS"
-
-dnl The DU4 header files don't provide library prototypes unless
-dnl -std1 is given to the native cc.
-AC_MSG_CHECKING([for extra flags to get ANSI library prototypes])
-
-gtk_save_LIBS=$LIBS
-LIBS="$LIBS -lm"
-AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <math.h>
-                                int main (void) { return (log(1) != log(1.)); }]])],
-              [AC_MSG_RESULT(none needed)],
-              [gtk_save_CFLAGS="$CFLAGS"
-               CFLAGS="$CFLAGS -std1"
-               AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <math.h>
-                                               int main (void) { return (log(1) != log(1.)); }]])],
-                             [AC_MSG_RESULT(-std1)],
-                             [AC_MSG_RESULT()
-                              CFLAGS="$gtk_save_CFLAGS"
-                              AC_MSG_WARN([No ANSI prototypes found in library. (-std1 did not work.)])],
-                             [true])],
-              [AC_MSG_RESULT(none needed)])
-
-LIBS=$gtk_save_LIBS
-
-AC_MSG_CHECKING(for the BeOS)
-case $host in
-  *-*-beos*)
-    AC_MSG_RESULT(yes)
-    MATH_LIB=
-  ;;
-  *)
-    AC_MSG_RESULT(no)
-  ;;
-esac
-
-AS_CASE([$host_os],
-  [mingw*],
-  [
-    AC_CHECK_SIZEOF(
-      [DISPLAYCONFIG_VIDEO_OUTPUT_TECHNOLOGY],
-      [],
-      [
-#define _WIN32_WINNT 0x601
-#include <windows.h>
-      ]
-    )
-    AS_IF(
-      [test x$ac_cv_sizeof_DISPLAYCONFIG_VIDEO_OUTPUT_TECHNOLOGY = x4],
-      [AC_MSG_RESULT([DISPLAYCONFIG_VIDEO_OUTPUT_TECHNOLOGY is OK])],
-      [test x$ac_cv_sizeof_DISPLAYCONFIG_VIDEO_OUTPUT_TECHNOLOGY = x0],
-      [AC_MSG_ERROR([DISPLAYCONFIG_VIDEO_OUTPUT_TECHNOLOGY is unavailable])],
-      [AC_MSG_RESULT([DISPLAYCONFIG_VIDEO_OUTPUT_TECHNOLOGY is not OK])]
-    )
-    AC_MSG_CHECKING([for SetupDiGetDevicePropertyW])
-    gtk_save_LIBS="$LIBS"
-    LIBS="-lsetupapi $LIBS"
-    AC_TRY_LINK(
-      [
-#define _WIN32_WINNT 0x0600
-#include <windows.h>
-#include <devpropdef.h>
-#include <setupapi.h>
-      ],
-      [return SetupDiGetDevicePropertyW(NULL, NULL, NULL, NULL, NULL, 0, NULL, 0);],
-      [have_SetupDiGetDevicePropertyW=yes],
-      [have_SetupDiGetDevicePropertyW=no]
-    )
-    AS_IF(
-      [test x$have_SetupDiGetDevicePropertyW = xyes],
-      [
-       AC_DEFINE(
-         [HAVE_SETUP_DI_GET_DEVICE_PROPERTY_W],
-         [1],
-         [Define to 1 if SetupDiGetDevicePropertyW() is available]
-       )
-      ]
-    )
-    AC_MSG_RESULT([$have_SetupDiGetDevicePropertyW])
-    LIBS="$gtk_save_LIBS"
-  ],
-  []
-)
-
-AC_SUBST(MATH_LIB)
-#
-# see bug 162979
-#
-AC_MSG_CHECKING(for HP-UX)
-case $host_os in
-  hpux9* | hpux10* | hpux11*)
-    AC_MSG_RESULT(yes)
-    CFLAGS="$CFLAGS -DHPPEX -DSHMLINK"
-  ;;
-  *)
-    AC_MSG_RESULT(no)
-  ;;
-esac
-
-#
-# Run AM_PATH_GLIB_2_0 to make sure that GLib is installed and working
-#
-
-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)
-
-PKG_PROG_PKG_CONFIG_FOR_BUILD
-GLIB_CFLAGS_FOR_BUILD=`$PKG_CONFIG_FOR_BUILD --cflags glib-2.0 gobject-2.0 gmodule-no-export-2.0`
-GLIB_LIBS_FOR_BUILD=`$PKG_CONFIG_FOR_BUILD --libs glib-2.0 gobject-2.0 gmodule-no-export-2.0`
-AC_SUBST(GLIB_CFLAGS_FOR_BUILD)
-AC_SUBST(GLIB_LIBS_FOR_BUILD)
-
-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(linux/memfd.h,
-                 AC_DEFINE(HAVE_LINUX_MEMFD_H, 1,
-                           [Define to 1 if memfd.h is available]))
-AC_CHECK_HEADERS(sys/mman.h,
-                 AC_DEFINE(HAVE_SYS_MMAN_H, 1,
-                           [Define to 1 if mman.h is available]))
-AC_CHECK_HEADERS(sys/time.h,
-                 AC_DEFINE(HAVE_SYS_TIME_H, 1,
-                           [Define to 1 if time.h is available]))
-AC_CHECK_HEADERS(unistd.h,
-                 AC_DEFINE(HAVE_UNISTD_H, 1,
-                           [Define to 1 if unistd.h is available]))
-AC_CHECK_HEADERS(ftw.h,
-                 AC_DEFINE(HAVE_FTW_H, 1,
-                           [Define to 1 if ftw.h is available]))
-
-AC_MSG_CHECKING([for GNU ftw extensions])
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#define _XOPEN_SOURCE 500
-                                     #define _GNU_SOURCE
-                                     #include <ftw.h>]],
-                                   [[int flags = FTW_ACTIONRETVAL;]])],
-                  [gtk_ok=yes],[gtk_ok=no])
-if test $gtk_ok = yes; then
-    AC_MSG_RESULT([yes])
-    AC_DEFINE(HAVE_GNU_FTW, 1, [Have GNU ftw])
-else
-    AC_MSG_RESULT([no])
-fi
-
-#
-# Disable deprecation checks for all libraries we depend on on stable branches.
-# This is so newer versions of those libraries don't cause more warnings with
-# a stable GTK version.
-# We don't ever want to turn off deprecation warnings for master however, because
-# that's where we get rid of deprecated API we use.
-#
-if test m4_eval(gtk_minor_version % 2) = 0 ; then
-  AC_DEFINE_UNQUOTED(GLIB_DISABLE_DEPRECATION_WARNINGS, 1,
-                     [Disable deprecation warnings from glib])
-fi
-
-dnl
-saved_cflags="$CFLAGS"
-saved_ldflags="$LDFLAGS"
-
-
-# Checks for library functions.
-AC_FUNC_MMAP
-
-AC_CHECK_FUNCS(mallinfo)
-AC_CHECK_FUNCS(getresuid)
-AC_TYPE_UID_T
-
-# Check for round(), rint(), isnan(), isinf() and nearbyint()
-AC_CHECK_LIB(m,round,,)
-AC_CHECK_FUNCS(round rint nearbyint sincos exp2 log2)
-AC_CHECK_DECLS([isnan, isinf], [], [], [[#include <math.h>]])
-
-# Checks for gdkspawn
-AC_CHECK_HEADERS(crt_externs.h)
-AC_CHECK_FUNCS(_NSGetEnviron)
-
-AC_MSG_CHECKING(whether to build dynamic modules)
-
-AC_ARG_ENABLE(modules,
-              [AS_HELP_STRING([--disable-modules],
-                              [disable dynamic module loading])])
-
-dynworks=false
-build_dynamic_modules=no
-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
-        module_libtool_config="${CONFIG_SHELL-/bin/sh} ./libtool --config"
-        module_deplibs_check=`$module_libtool_config | \
-            grep '^[[a-z_]]*check[[a-z_]]*_method=[['\''"]]' | \
-            sed 's/.*[['\''"]]\(.*\)[['\''"]]$/\1/'`
-        if test "x$module_deplibs_check" = "xnone" || \
-           test "x$module_deplibs_check" = "xunknown" || \
-           test "x$module_deplibs_check" = "x"; then
-            dynworks=false
-        fi
-    fi
-
-    if $dynworks; then
-        build_dynamic_modules=yes
-        AC_DEFINE(USE_GMODULE, 1,
-                  [Define to 1 if gmodule works and should be used])
-        AC_MSG_RESULT(yes)
-    else
-        build_dynamic_modules=no
-        AC_MSG_RESULT(no)
-    fi
-fi
-
-AM_CONDITIONAL(BUILD_DYNAMIC_MODULES, $dynworks)
-
-#
-# Allow building some or all immodules included
-#
-AC_MSG_CHECKING(immodules to build)
-
-AC_ARG_WITH(included_immodules,
-            [AS_HELP_STRING([--with-included-immodules=MODULE1,MODULE2,...],
-                            [build the specified input methods into gtk])])
-
-if $dynworks; then
-   :
-else
-   ## if the option was specified, leave it; otherwise disable included immodules
-   if test x$with_included_immodules = xno; then
-           with_included_immodules=yes
-   fi
-fi
-
-all_immodules="am-et,cedilla,cyrillic-translit,inuktitut,ipa,multipress,thai,ti-er,ti-et,viqr$backend_immodules"
-
-included_immodules=""
-# If the switch specified without listing any specific ones, include all
-if test "x$with_included_immodules" = xyes ; then
-  included_immodules="$all_immodules"
-else
-  included_immodules="$with_included_immodules"
-fi
-
-AC_MSG_RESULT($included_immodules)
-AM_CONDITIONAL(HAVE_INCLUDED_IMMMODULES, test "x$included_immodules" != x)
-
-INCLUDED_IMMODULE_OBJ=
-INCLUDED_IMMODULE_DEFINE=
-
-IFS="${IFS= 	}"; gtk_save_ifs="$IFS"; IFS=","
-for immodule in $included_immodules; do
- immodule_underscores=`echo $immodule | sed -e 's/-/_/g'`
- if echo "$all_immodules" | egrep "(^|,)$immodule(\$|,)" > /dev/null; then
-   :
- else
-   AC_MSG_ERROR([the specified input method $immodule does not exist])
- fi
-
- INCLUDED_IMMODULE_OBJ="$INCLUDED_IMMODULE_OBJ ../modules/input/libstatic-im-$immodule.la"
- INCLUDED_IMMODULE_DEFINE="$INCLUDED_IMMODULE_DEFINE -DINCLUDE_IM_$immodule_underscores"
- eval INCLUDE_$immodule_underscores=yes
-done
-IFS="$gtk_save_ifs"
-AC_SUBST(INCLUDED_IMMODULE_OBJ)
-AC_SUBST(INCLUDED_IMMODULE_DEFINE)
-
-AM_CONDITIONAL(INCLUDE_IM_AM_ET, [test x"$INCLUDE_am_et" = xyes])
-AM_CONDITIONAL(INCLUDE_IM_CEDILLA, [test x"$INCLUDE_cedilla" = xyes])
-AM_CONDITIONAL(INCLUDE_IM_CYRILLIC_TRANSLIT, [test x"$INCLUDE_cyrillic_translit" = xyes])
-AM_CONDITIONAL(INCLUDE_IM_IME, [test x"$INCLUDE_ime" = xyes])
-AM_CONDITIONAL(INCLUDE_IM_INUKTITUT, [test x"$INCLUDE_inuktitut" = xyes])
-AM_CONDITIONAL(INCLUDE_IM_IPA, [test x"$INCLUDE_ipa" = xyes])
-AM_CONDITIONAL(INCLUDE_IM_MULTIPRESS, [test x"$INCLUDE_multipress" = xyes])
-AM_CONDITIONAL(INCLUDE_IM_QUARTZ, [test x"$INCLUDE_quartz" = xyes])
-AM_CONDITIONAL(INCLUDE_IM_BROADWAY, [test x"$INCLUDE_broadway" = xyes])
-AM_CONDITIONAL(INCLUDE_IM_THAI, [test x"$INCLUDE_thai" = xyes])
-AM_CONDITIONAL(INCLUDE_IM_TI_ER, [test x"$INCLUDE_ti_er" = xyes])
-AM_CONDITIONAL(INCLUDE_IM_TI_ET, [test x"$INCLUDE_ti_et" = xyes])
-AM_CONDITIONAL(INCLUDE_IM_VIQR, [test x"$INCLUDE_viqr" = xyes])
-AM_CONDITIONAL(INCLUDE_IM_XIM, [test x"$INCLUDE_xim" = xyes])
-
-# 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]))
-
-dnl Look for a host system's gdk-pixbuf-csource if we are cross-compiling
-
-AM_CONDITIONAL(CROSS_COMPILING, test $cross_compiling = yes)
-
-########################################
-# Windowing system checks
-########################################
-
-# GTK+ uses some X calls, so needs to link against X directly
-GTK_DEP_PACKAGES_FOR_X=
-GTK_DEP_LIBS_FOR_X=
-X_EXTENSIONS=
-
-if test "x$enable_x11_backend" = xyes; then
-  X_PACKAGES=fontconfig
-
-  #
-  # We use fontconfig very peripherally when decoding the default
-  # settings.
-  #
-  if $PKG_CONFIG --exists fontconfig; then : ; else
-    AC_MSG_ERROR([
-*** fontconfig (http://www.fontconfig.org) is required by the X11 backend.])
-  fi
-
-  #
-  # Check for basic X packages; we use pkg-config if available
-  #
-  if $PKG_CONFIG --exists x11 xext; then
-    have_base_x_pc=true
-    X_PACKAGES="$X_PACKAGES x11 xext"
-    x_libs="`$PKG_CONFIG --libs x11 xext`"
-    X_CFLAGS="`$PKG_CONFIG --cflags x11 xext`"
-
-    # Strip out any .la files that pkg-config might give us (this happens
-    # with -uninstalled.pc files)
-    x_libs_for_checks=
-    for I in $x_libs ; do
-      case $I in
-        *.la) ;;
-        *) x_libs_for_checks="$x_libs_for_checks $I" ;;
-      esac
-    done
-
-    GTK_PACKAGES_FOR_X="x11"
-  else
-    have_base_x_pc=false
-    AC_PATH_XTRA
-    if test x$no_x = xyes ; then
-      AC_MSG_ERROR([X development libraries not found])
-    fi
-
-    x_cflags="$X_CFLAGS"
-    x_libs_for_checks="$X_LIBS -lXext -lX11 $X_EXTRA_LIBS"
-
-    GTK_DEP_LIBS_FOR_X="$X_LIBS -lX11 $X_EXTRA_LIBS"
-  fi
-
-  # Extra libraries found during checks (-lXinerama, etc), not from pkg-config.
-  x_extra_libs=
-
-  gtk_save_cppflags="$CPPFLAGS"
-  CPPFLAGS="$CPPFLAGS $X_CFLAGS"
-
-  gtk_save_LIBS=$LIBS
-  LIBS="$x_libs_for_checks $LIBS"
-
-  # Sanity check for the X11 and Xext libraries. While everything we need from
-  # Xext is optional, the chances a system has *none* of these things is so
-  # small that we just unconditionally require it.
-  AC_CHECK_FUNC(XOpenDisplay, :,
-                AC_MSG_ERROR([*** libX11 and libXext not found. Check 'config.log' for more details.]))
-  AC_CHECK_FUNC(XextFindDisplay, :,
-                AC_MSG_ERROR([*** libX11 and libXext not found. Check 'config.log' for more details.]))
-
-  # Check if <X11/extensions/XIproto.h> is needed for xReply.
-
-  AC_CHECK_TYPE([xReply], ,
-                [AC_CHECK_TYPE([xReply],
-                               [AC_DEFINE([NEED_XIPROTO_H_FOR_XREPLY], 1,
-                                          [Define if <X11/extensions/XIproto.h> needed for xReply])],
-                               [AC_MSG_ERROR([xReply type unavailable. X11 is too old])],
-                               [[#include <X11/extensions/XIproto.h>
-                                 #include <X11/Xlibint.h>]])],
-                [[#include <X11/Xlibint.h>]])
-
-  # Check for XKB support.
-
-  if test "x$enable_xkb" = "xyes"; then
-        AC_CHECK_FUNC(XkbQueryExtension,
-                      X_EXTENSIONS="$X_EXTENSIONS XKB"
-                      AC_DEFINE(HAVE_XKB, 1, [Define to use XKB extension]),
-                      AC_MSG_ERROR([*** XKB extension not found. Check 'config.log' for more details.]))
-  elif test "x$enable_xkb" = "xmaybe"; then
-        AC_CHECK_FUNC(XkbQueryExtension,
-                      X_EXTENSIONS="$X_EXTENSIONS XKB"
-                      AC_DEFINE(HAVE_XKB, 1, [Define to use XKB extension]))
-  else
-        AC_MSG_WARN(XKB support explicitly disabled)
-  fi
-
-  # Check for shaped window extension
-
-  AC_CHECK_FUNC(XShapeCombineMask, :,
-     [AC_MSG_ERROR([Shape extension not found, check your development headers])])
-
-  # X SYNC check
-  gtk_save_CFLAGS="$CFLAGS"
-  CFLAGS="$CFLAGS $x_cflags"
-
-  AC_CHECK_FUNC(XSyncQueryExtension,
-      [AC_CHECK_HEADER(X11/extensions/sync.h,
-	  AC_DEFINE(HAVE_XSYNC, 1, [Have the SYNC extension library]),
-	  :, [#include <X11/Xlib.h>])])
-
-  CFLAGS="$gtk_save_CFLAGS"
-
-  if test "x$enable_xinerama" != "xno"; then
-    # Check for Xinerama extension (Solaris impl or Xfree impl)
-    have_xfree_xinerama=false
-    have_solaris_xinerama=false
-
-    gtk_save_cppflags="$CPPFLAGS"
-    CPPFLAGS="$CPPFLAGS $x_cflags"
-
-    # Check for XFree
-    AC_MSG_CHECKING(for Xinerama packages)
-
-    if $PKG_CONFIG --exists xinerama ; then
-       AC_MSG_RESULT(yes)
-       have_xfree_xinerama=true
-       X_PACKAGES="$X_PACKAGES xinerama"
-    else
-       AC_MSG_RESULT(no)
-       AC_CHECK_LIB(Xinerama, XineramaQueryExtension,
-	   [AC_CHECK_HEADER(X11/extensions/Xinerama.h,
-	   [GTK_ADD_LIB(x_extra_libs,Xinerama)
-	   have_xfree_xinerama=true], :,
-           [#include <X11/Xlib.h>])])
-    fi
-
-    if $have_xfree_xinerama ; then
-      X_EXTENSIONS="$X_EXTENSIONS Xinerama"
-      AC_DEFINE(HAVE_XFREE_XINERAMA, 1,
-                [Define to 1 if XFree Xinerama is available])
-      AC_DEFINE(HAVE_XINERAMA, 1,
-                [Define to 1 is Xinerama is available])
-    else
-      case "$host" in
-        *-*-solaris*)
-            # Check for solaris
-
-	    have_solaris_xinerama=false
-	    AC_CHECK_FUNC(XineramaGetInfo,
-	        [AC_CHECK_HEADER(X11/extensions/xinerama.h,
-		    [have_solaris_xinerama=true], :,
-		    [#include <X11/Xlib.h>])])
-
-	    AC_MSG_CHECKING(for Xinerama support on Solaris)
-
-            if $have_solaris_xinerama ; then
-              X_EXTENSIONS="$X_EXTENSIONS Xinerama"
-              AC_DEFINE(HAVE_SOLARIS_XINERAMA, 1,
-                        [Define to 1 if solaris xinerama is available])
-	      AC_DEFINE(HAVE_XINERAMA, 1,
-                        [Define to 1 if xinerama is available])
-              AC_MSG_RESULT(yes)
-            else
-              AC_MSG_RESULT(no)
-            fi
-            ;;
-        *)
-            ;;
-      esac
-    fi
-  fi
-  if test "x$enable_xinerama" = "xyes" ; then
-    if test "x$have_xfree_xinerama" != "xtrue" -a "x$have_solaris_xinerama" != "xtrue" ; then
-      AC_MSG_ERROR([*** Xinerama extension not found. Check 'config.log' for more details.])
-    fi
-  fi
-
-  # Check for XGetEventData for GenericEvents
-  AC_CHECK_FUNC(XGetEventData,
-                AC_DEFINE(HAVE_XGENERICEVENTS, 1, [Have XGenericEvent]))
-
-  # set up things for XInput
-  if $PKG_CONFIG --exists "xi" ; then
-
-    X_PACKAGES="$X_PACKAGES xi"
-    GTK_PACKAGES_FOR_X="$GTK_PACKAGES_FOR_X xi"
-
-    AC_CHECK_HEADER(X11/extensions/XInput2.h,
-                    have_xinput2=yes
-                    AC_DEFINE(XINPUT_2, 1, [Define to 1 if XInput 2.0 is available]))
-
-    gtk_save_LIBS="$LIBS"
-    LIBS="$LIBS -lXi"
-
-    # Note that we also check that the XIScrollClassInfo struct is defined,
-    # because at least Ubuntu Oneiric seems to have XIAllowTouchEvents(), but not the XIScrollClassInfo struct.
-    AC_CHECK_FUNC([XIAllowTouchEvents],
-      [AC_CHECK_MEMBER([XIScrollClassInfo.number],
-                       have_xinput2_2=yes
-                       AC_DEFINE(XINPUT_2_2, 1, [Define to 1 if XInput 2.2 is available]),
-                       have_xinput2_2=no,
-                       [[#include <X11/extensions/XInput2.h>]])])
-    LIBS="$gtk_save_LIBS"
-
-    if test "x$have_xinput2_2" = "xyes"; then
-      X_EXTENSIONS="$X_EXTENSIONS XI2.2"
-    else
-      X_EXTENSIONS="$X_EXTENSIONS XI2"
-    fi
-  fi
-
-  AS_IF([test "x$have_xinput2" != "xyes"],
-        [AC_MSG_ERROR([*** XInput2 extension not found. Check 'config.log' for more details.])])
-
-  # Check for the RANDR extension
-  if test x"$enable_xrandr" != xno; then
-    if $PKG_CONFIG --exists "xrandr >= 1.2.99" ; then
-      AC_DEFINE(HAVE_RANDR, 1, [Have the Xrandr extension library])
-
-      if $PKG_CONFIG --exists "xrandr >= 1.5.0" ; then
-        AC_DEFINE(HAVE_RANDR15, 1, [Have the Xrandr 1.5 extension library])
-      fi
-      X_PACKAGES="$X_PACKAGES xrandr"
-      X_EXTENSIONS="$X_EXTENSIONS XRANDR"
-    elif test x"$enable_xrandr" = xyes; then
-      AC_MSG_ERROR([RANDR support requested but xrandr not found])
-    fi
-  fi
-
-  # Checks for Xcursor library
-
-  if $PKG_CONFIG --exists xcursor ; then
-    AC_DEFINE(HAVE_XCURSOR, 1, [Have the Xcursor library])
-
-    X_PACKAGES="$X_PACKAGES xcursor"
-  fi
-
-  # Checks for XFixes extension
-
-  if test x"$enable_xfixes" != xno; then
-    if $PKG_CONFIG --exists xfixes ; then
-      AC_DEFINE(HAVE_XFIXES, 1, [Have the XFIXES X extension])
-
-      X_PACKAGES="$X_PACKAGES xfixes"
-      X_EXTENSIONS="$X_EXTENSIONS XFIXES"
-      GTK_PACKAGES_FOR_X="$GTK_PACKAGES_FOR_X xfixes"
-    elif test x"$enable_xfixes" = xyes; then
-      AC_MSG_ERROR([XFixes support requested but xfixes not found])
-    fi
-  fi
-
-  # Checks for Xcomposite extension
-
-  if test x"$enable_xcomposite" != xno; then
-    if $PKG_CONFIG --exists xcomposite ; then
-      AC_DEFINE(HAVE_XCOMPOSITE, 1, [Have the XCOMPOSITE X extension])
-
-      X_PACKAGES="$X_PACKAGES xcomposite"
-      X_EXTENSIONS="$X_EXTENSIONS Composite"
-      GTK_PACKAGES_FOR_X="$GTK_PACKAGES_FOR_X xcomposite"
-    elif test x"$enable_xcomposite" = xyes; then
-      AC_MSG_ERROR([Xcomposite support requested but xcomposite not found])
-    fi
-  fi
-
-  # Checks for Xdamage extension
-
-  if test x"$enable_xdamage" != xno; then
-    if $PKG_CONFIG --exists xdamage ; then
-      AC_DEFINE(HAVE_XDAMAGE, 1, [Have the XDAMAGE X extension])
-
-      X_PACKAGES="$X_PACKAGES xdamage"
-      X_EXTENSIONS="$X_EXTENSIONS DAMAGE"
-      GTK_PACKAGES_FOR_X="$GTK_PACKAGES_FOR_X xdamage"
-    elif test x"$enable_xdamage" = xyes; then
-      AC_MSG_ERROR([Xdamage support requested but xdamage not found])
-    fi
-  fi
-
-  if $have_base_x_pc ; then
-    GDK_EXTRA_LIBS="$x_extra_libs"
-  else
-    GDK_EXTRA_LIBS="$X_LIBS $x_extra_libs -lXext -lX11 $GDK_EXTRA_LIBS"
-  fi
-
-  CPPFLAGS="$gtk_save_cppflags"
-  LIBS="$gtk_save_libs"
-
-  AM_CONDITIONAL(USE_X11, true)
-
-  # strip leading space
-  X_EXTENSIONS=${X_EXTENSIONS#* }
-
-else
-  XPACKAGES=
-
-  AM_CONDITIONAL(USE_X11, false)
-fi
-
-# Check for gio-unix
-if test "$os_win32" != "yes"; then
-  # Pull in gio-unix for gtk-launch usage, see at least
-  # gtk-launch.c
-  have_gio_unix=yes
-fi
-if test "$have_gio_unix" = "yes"; then
-  GDK_GIO_PACKAGE="gio-unix-2.0 >= glib_required_version"
-  AC_DEFINE([HAVE_GIO_UNIX], [1],
-            [Define if gio-unix is available])
-else
-  GDK_GIO_PACKAGE="gio-2.0 >= glib_required_version"
-fi
-
-# Check for Vulkan support.
-
-if test "x$enable_vulkan" != "xno"; then
-      vulkan_error=""
-      AC_CHECK_HEADER([vulkan/vulkan.h],
-          [AC_CHECK_LIB([vulkan], [vkCreateInstance], [], [vulkan_error="Vulkan library not found"])],
-          [vulkan_error="Vulkan header not found"])
-      if test "x$vulkan_error" != "x"; then
-          if test "x$enable_vulkan" = "xyes"; then
-              AC_MSG_ERROR($vulkan_error)
-          else
-              AC_MSG_WARN($vulkan_error)
-          fi
-          vulkan_result="no ($vulkan_error)"
-      else
-          GDK_EXTRA_LIBS="-lvulkan"
-          GDK_WINDOWING="$GDK_WINDOWING
-#define GDK_RENDERING_VULKAN"
-          AC_PATH_PROG([GLSLC], [glslc])
-          vulkan_result="yes"
-      fi
-else
-      AC_MSG_WARN(Vulkan support explicitly disabled)
-      vulkan_result="no (Vulkan support explicitly disabled)"
-fi
-AM_CONDITIONAL(HAVE_VULKAN, test "$vulkan_result" = "yes")
-
-# Check for Pango flags
-
-AC_MSG_CHECKING(Pango flags)
-if $PKG_CONFIG --exists $PANGO_PACKAGES ; then
-        PANGO_CFLAGS=`$PKG_CONFIG --cflags $PANGO_PACKAGES`
-        PANGO_LIBS=`$PKG_CONFIG --libs $PANGO_PACKAGES`
-
-        AC_MSG_RESULT($PANGO_CFLAGS $PANGO_LIBS)
-else
-        AC_MSG_ERROR([
-*** Pango not found. Pango built with Cairo support is required
-*** to build GTK+. See http://www.pango.org for Pango information.
-])
-fi
-
-CFLAGS="$CFLAGS $PANGO_CFLAGS"
-
-if $PKG_CONFIG --uninstalled $PANGO_PACKAGES; then
-        :
-else
-	gtk_save_LIBS="$LIBS"
-        LIBS="$PANGO_LIBS $LIBS"
-        AC_TRY_LINK_FUNC(pango_context_new, :, AC_MSG_ERROR([
-*** Can't link to Pango. Pango is required to build
-*** GTK+. For more information see http://www.pango.org]))
-        LIBS="$gtk_save_LIBS"
-fi
-
-CFLAGS="$saved_cflags"
-LDFLAGS="$saved_ldflags"
-
-GDK_PACKAGES="$PANGO_PACKAGES gdk-pixbuf-2.0 >= gdk_pixbuf_required_version cairo >= cairo_required_version cairo-gobject >= cairo_required_version"
-GDK_PRIVATE_PACKAGES="$GDK_GIO_PACKAGE $X_PACKAGES $WAYLAND_PACKAGES $MIR_PACKAGES $cairo_backends epoxy >= epoxy_required_version"
-
-PKG_CHECK_MODULES(GDK_DEP, $GDK_PACKAGES $GDK_PRIVATE_PACKAGES)
-GDK_DEP_LIBS="$GDK_EXTRA_LIBS $GDK_DEP_LIBS $MATH_LIB"
-GDK_DEP_CFLAGS="$GDK_DEP_CFLAGS $GDK_EXTRA_CFLAGS"
-#
-# If we aren't writing explicit dependencies, then don't put the extra libraries we need
-# into the pkg-config files
-#
-if test $enable_explicit_deps != yes ; then
-  GDK_EXTRA_LIBS=
-fi
-
-AC_SUBST(GDK_PACKAGES)
-AC_SUBST(GDK_PRIVATE_PACKAGES)
-AC_SUBST(GDK_EXTRA_LIBS)
-AC_SUBST(GDK_EXTRA_CFLAGS)
-AC_SUBST(GDK_DEP_LIBS)
-AC_SUBST(GDK_DEP_CFLAGS)
-
-########################################
-# Check for GSK flags
-########################################
-
-GSK_EXTRA_LIBS=
-GSK_EXTRA_CFLAGS=
-
-GSK_PACKAGES="gdk-pixbuf-2.0 >= gdk_pixbuf_required_version cairo >= cairo_required_version cairo-gobject >= cairo_required_version graphene-gobject-1.0 >= graphene_required_version"
-GSK_PRIVATE_PACKAGES="epoxy >= epoxy_required_version $WAYLAND_PACKAGES"
-
-PKG_CHECK_MODULES(GSK_DEP, $PANGO_PACKAGES $GSK_PACKAGES $GSK_PRIVATE_PACKAGES)
-GSK_DEP_LIBS="$GSK_EXTRA_LIBS $GSK_DEP_LIBS $MATH_LIB"
-GSK_DEP_CFLAGS="$GSK_DEP_CFLAGS $GSK_EXTRA_CFLAGS"
-
-AC_SUBST(GSK_PACKAGES)
-AC_SUBST(GSK_PRIVATE_PACKAGES)
-AC_SUBST(GSK_EXTRA_LIBS)
-AC_SUBST(GSK_EXTRA_CFLAGS)
-AC_SUBST(GSK_DEP_LIBS)
-AC_SUBST(GSK_DEP_CFLAGS)
-
-########################################
-# Check for Accessibility Toolkit flags
-########################################
-
-if test x$enable_x11_backend = xyes; then
-   ATK_PACKAGES="atk atk-bridge-2.0"
-else
-   ATK_PACKAGES="atk"
-fi
-
-PKG_CHECK_MODULES(ATK, $ATK_PACKAGES)
-
-GTK_PACKAGES="atk >= atk_required_version cairo >= cairo_required_version cairo-gobject >= cairo_required_version gdk-pixbuf-2.0 >= gdk_pixbuf_required_version gio-2.0 >= glib_required_version"
-GTK_PRIVATE_PACKAGES="$ATK_PACKAGES $WAYLAND_PACKAGES $MIR_PACKAGES epoxy >= epoxy_required_version graphene-gobject-1.0 >= graphene_required_version"
-if test "x$enable_x11_backend" = xyes -o "x$enable_wayland_backend" = xyes; then
-  GTK_PRIVATE_PACKAGES="$GTK_PRIVATE_PACKAGES pangoft2"
-fi
-if test "$have_gio_unix" = "yes"; then
-  GTK_PRIVATE_PACKAGES="$GTK_PRIVATE_PACKAGES gio-unix-2.0 >= glib_required_version"
-fi
-GTK_EXTRA_LIBS=
-
-GTK_EXTRA_CFLAGS=
-PKG_CHECK_MODULES(GTK_DEP, $PANGO_PACKAGES $GTK_PACKAGES_FOR_X $GTK_PACKAGES $GTK_PRIVATE_PACKAGES)
-GTK_DEP_LIBS="$GDK_EXTRA_LIBS $GTK_DEP_LIBS_FOR_X $GTK_DEP_LIBS $GTK_EXTRA_LIBS $MATH_LIB"
-GTK_DEP_CFLAGS="$GTK_DEP_CFLAGS $GDK_EXTRA_CFLAGS $GTK_EXTRA_CFLAGS"
-
-if test x"$os_win32" = xyes; then
-  GTK_EXTRA_CFLAGS="$msnative_struct"
-fi
-
-if $PKG_CONFIG --exists x11; then
-  X11_PREFIX="`$PKG_CONFIG --variable=prefix x11`"
-elif test x"$prefix" != xNONE; then
-  X11_PREFIX="$prefix"
-else
-  X11_PREFIX="$ac_default_prefix"
-fi
-
-GLIB_PREFIX="`$PKG_CONFIG --variable=prefix glib-2.0`"
-ATK_PREFIX="`$PKG_CONFIG --variable=prefix atk`"
-PANGO_PREFIX="`$PKG_CONFIG --variable=prefix pango`"
-CAIRO_PREFIX="`$PKG_CONFIG --variable=prefix cairo`"
-
-AC_SUBST(GTK_PACKAGES)
-AC_SUBST(GTK_PRIVATE_PACKAGES)
-AC_SUBST(GTK_EXTRA_LIBS)
-AC_SUBST(GTK_EXTRA_CFLAGS)
-AC_SUBST(GTK_DEP_LIBS)
-AC_SUBST(GTK_DEP_CFLAGS)
-
-AC_SUBST(X11_PREFIX)
-AC_SUBST(GLIB_PREFIX)
-AC_SUBST(ATK_PREFIX)
-AC_SUBST(PANGO_PREFIX)
-AC_SUBST(CAIRO_PREFIX)
-
-AC_SUBST(GTK_DEBUG_FLAGS)
-AC_SUBST(GTK_XIM_FLAGS)
-
-GDK_PIXBUF_LIBS=`$PKG_CONFIG --libs gdk-pixbuf-2.0`
-AC_SUBST(GDK_PIXBUF_LIBS)
-
-########################
-# Checks needed for gail
-########################
-
-old_LIBS="$LIBS"
-dnl Checks for inet libraries:
-AC_SEARCH_LIBS(gethostent, nsl)
-AC_SEARCH_LIBS(setsockopt, socket)
-AC_SEARCH_LIBS(connect, inet)
-
-dnl check for the sockaddr_un.sun_len member
-AC_CHECK_MEMBER([struct sockaddr_un.sun_len],
-		[struct_sockaddr_un_sun_len=true],
-		[struct_sockaddr_un_suin_len=false],
-		[#include <sys/types.h>
-		 #include <sys/un.h>]
-		)
-case $struct_sockaddr_un_sun_len in
-	true)
-		AC_DEFINE_UNQUOTED(HAVE_SOCKADDR_UN_SUN_LEN, 1,
-		                   [Have the sockaddr_un.sun_len member])
-		;;
-	*)
-		;;
-esac
-
-GAIL_INET_LIBS="$LIBS"
-AC_SUBST([GAIL_INET_LIBS])
-
-LIBS="$old_LIBS"
-
-################################################################
-# Printing system checks
-################################################################
-
-PRINT_BACKENDS="file lpr"
-
-AC_ARG_ENABLE(cups,
-              [AS_HELP_STRING([--disable-cups],
-                              [disable cups print backend])],,
-              [enable_cups=auto])
-
-if test "x$enable_cups" = "xno"; then
-  AM_CONDITIONAL(HAVE_CUPS, false)
-else
-  AC_PATH_TOOL(CUPS_CONFIG, cups-config, no)
-  if test "x$CUPS_CONFIG" = "xno"; then
-    if test "x$enable_cups" = "xauto"; then
-      AM_CONDITIONAL(HAVE_CUPS, false)
-    else
-      AC_MSG_ERROR([
-*** cups not found.
-])
-    fi
-  else
-    CUPS_CFLAGS=`$CUPS_CONFIG --cflags | sed 's/-O[0-9]*//' | sed 's/-m[^\t]*//g'`
-    CUPS_LIBS=`$CUPS_CONFIG --libs`
-
-    CUPS_API_VERSION=`$CUPS_CONFIG --api-version`
-    CUPS_API_MAJOR=`echo $ECHO_N $CUPS_API_VERSION | awk -F. '{print $1}'`
-    CUPS_API_MINOR=`echo $ECHO_N $CUPS_API_VERSION | awk -F. '{print $2}'`
-
-    if test $CUPS_API_MAJOR -lt 1 -o \
-            $CUPS_API_MAJOR -eq 1 -a $CUPS_API_MINOR -lt 2; then
-      AC_MSG_ERROR([CUPS >= 1.2 not found])
-    fi
-    if test $CUPS_API_MAJOR -gt 1 -o \
-	    $CUPS_API_MAJOR -eq 1 -a $CUPS_API_MINOR -ge 6; then
-      AC_DEFINE(HAVE_CUPS_API_1_6, 1,
-                [Define to 1 if CUPS 1.6 API is available])
-      have_cups_api_1_6=yes
-    fi
-
-    AC_SUBST(CUPS_API_MAJOR)
-    AC_SUBST(CUPS_API_MINOR)
-    AC_SUBST(CUPS_CFLAGS)
-    AC_SUBST(CUPS_LIBS)
-
-    AC_CHECK_HEADER(cups/cups.h,,AC_MSG_ERROR([[*** Sorry, cups-config present but cups/cups.h missing.]]))
-
-    PRINT_BACKENDS="$PRINT_BACKENDS cups"
-    AM_CONDITIONAL(HAVE_CUPS, true)
-    have_cups=yes
-
-    gtk_save_cflags="$CFLAGS"
-    CFLAGS="$CUPS_CFLAGS"
-    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <cups/http.h>]],
-                                       [[http_t http; char *s = http.authstring;]])],
-                      [AC_DEFINE([HAVE_HTTP_AUTHSTRING], [],
-                                 [Define if cups http_t authstring field is accessible])],
-                      [])
-    CFLAGS="$gtk_save_cflags"
-
-    AC_SUBST(HAVE_HTTP_AUTHSTRING)
-
-    gtk_save_libs="$LIBS"
-    LIBS="$CUPS_LIBS"
-    AC_CHECK_FUNCS(httpGetAuthString)
-    LIBS="$gtk_save_libs"
-  fi
-fi
-
-# Checks to see if we should compile with PAPI backend for GTK+
-#
-
-AC_ARG_ENABLE(papi,
-              [AS_HELP_STRING([--disable-papi],
-                              [disable papi print backend])],,
-              [enable_papi=auto])
-
-if test "x$enable_papi" = "xno"; then
-  AM_CONDITIONAL(HAVE_PAPI, false)
-else
-  AC_MSG_CHECKING(libpapi)
-  AC_CHECK_LIB(papi, papiServiceCreate, have_papi=yes, have_papi=no)
-  if test $have_papi = yes; then
-    PRINT_BACKENDS="$PRINT_BACKENDS papi"
-    AC_DEFINE([HAVE_PAPI], [], [Define to 1 if libpapi available])
-  fi
-  AM_CONDITIONAL(HAVE_PAPI, test $have_papi = yes)
-  if test "x$enable_papi" = "xyes" -a "x$have_papi" = "xno"; then
-    AC_MSG_ERROR([
-*** papi not found.
-])
-  fi
-fi
-
-# Checks to see if we should compile with cloudprint backend for GTK+
-#
-
-AC_ARG_ENABLE(cloudprint,
-              [AS_HELP_STRING([--disable-cloudprint],
-                              [disable cloudprint print backend])],,
-              [enable_cloudprint=auto])
-
-if test "x$enable_cloudprint" = "xno"; then
-  AM_CONDITIONAL(HAVE_CLOUDPRINT, false)
-else
-  PKG_CHECK_MODULES(REST, [rest-0.7], have_rest=yes, have_rest=no)
-  PKG_CHECK_MODULES(JSON_GLIB, [json-glib-1.0], have_json_glib=yes, have_json_glib=no)
-  if test "x$have_rest" = "xyes" -a "x$have_json_glib" = "xyes"; then
-    PRINT_BACKENDS="$PRINT_BACKENDS cloudprint"
-    have_cloudprint=yes
-  fi
-  AM_CONDITIONAL(HAVE_CLOUDPRINT, test "x$have_cloudprint" = "xyes")
-fi
-
-if test "x$enable_cloudprint" = "xyes" -a "x$have_rest" = "xno"; then
-    AC_MSG_ERROR([
-*** rest not found.
-])
-fi
-
-if test "x$enable_cloudprint" = "xyes" -a "x$have_json_glib" = "xno"; then
-    AC_MSG_ERROR([
-*** json-glib not found.
-])
-fi
-
-gtk_save_cppflags="$CPPFLAGS"
-CPPFLAGS="$CPPFLAGS $GTK_DEP_CFLAGS $GDK_DEP_CFLAGS"
-
-AC_CHECK_HEADER(cairo-pdf.h,,AC_MSG_ERROR([
-*** Can't find cairo-pdf.h. You must build Cairo with the pdf
-*** backend enabled.]))
-
-if test "$os_win32" != "yes"; then
-  AC_CHECK_HEADER(cairo-ps.h,,AC_MSG_ERROR([
-*** Can't find cairo-ps.h. You must build Cairo with the
-*** postscript backend enabled.]))
-
-  AC_CHECK_HEADER(cairo-svg.h,,AC_MSG_ERROR([
-*** Cannot find cairo-svg.h. You must build Cairo with the
-*** svg backend enabled.]))
-fi
-
-CPPFLAGS="$gtk_save_cppflags"
-
-AC_ARG_ENABLE(test-print-backend,
-              [AS_HELP_STRING([--enable-test-print-backend],
-                              [build test print backend])],,
-              [enable_test_print_backend=no])
-if test "x$enable_test_print_backend" != "xno" ; then
-  PRINT_BACKENDS="$PRINT_BACKENDS test"
-fi
-AM_CONDITIONAL(TEST_PRINT_BACKEND, test "x$enable_test_print_backend" != "xno")
-
-if test "$os_win32" = "yes"; then
-  AC_CHECK_TYPES([IPrintDialogCallback],[],[],[[#include <windows.h>]])
-fi
-
-GTK_PRINT_BACKENDS="file"
-if test "$have_papi" = "yes"; then
-  GTK_PRINT_BACKENDS="$GTK_PRINT_BACKENDS,papi"
-fi
-if test "$have_cups" = "yes"; then
-  GTK_PRINT_BACKENDS="$GTK_PRINT_BACKENDS,cups"
-fi
-if test "$have_papi" != "yes" -a "$have_cups" != "yes"; then
-  GTK_PRINT_BACKENDS="$GTK_PRINT_BACKENDS,lpr"
-fi
-if test "$have_cloudprint" = "yes"; then
-  GTK_PRINT_BACKENDS="$GTK_PRINT_BACKENDS,cloudprint"
-fi
-AC_SUBST(GTK_PRINT_BACKENDS)
-
-################################################################
-# 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_DEP_LIBS=`echo $GDK_DEP_LIBS | sed -e "s/$export_dynamic//"`
-  GTK_DEP_LIBS=`echo $GTK_DEP_LIBS | sed -e "s/$export_dynamic//"`
-fi
-
-#############
-# GSettings #
-#############
-
-GLIB_GSETTINGS
-
-##################################################
-# GObject introspection
-##################################################
-
-GOBJECT_INTROSPECTION_CHECK(introspection_required_version)
-
-##################################################
-# colord module
-#################################################
-
-AC_ARG_ENABLE(colord,
-              [AS_HELP_STRING([--enable-colord=@<:@yes/no/auto@:>@],
-                              [build colord support code [default=auto]])],
-              [enable_colord="$enableval"],
-              [enable_colord=auto])
-
-AC_MSG_CHECKING([whether to use colord])
-if test "$enable_colord" = "auto"; then
-  if test "$os_win32" = "yes"; then
-    enable_colord=no
-  fi
-fi
-if test "$enable_colord" != "no"; then
-  AC_MSG_RESULT([yes])
-else
-  AC_MSG_RESULT([no])
-fi
-
-have_colord=no
-if test "$enable_colord" != "no"; then
-        if test "$os_win32" != "yes"; then
-                PKG_CHECK_MODULES(COLORD, colord >= 0.1.9,
-                                  have_colord=yes, have_colord=no)
-                if test "$enable_colord" = "yes"; then
-                        if test "$have_colord" = "no"; then
-                                AC_MSG_ERROR([--enable-colord specified, but not available])
-                        fi
-                fi
-        else
-                AC_MSG_ERROR([colord support is not available on win32])
-        fi
-fi
-
-if test "$have_colord" = "yes"; then
-        AC_DEFINE(HAVE_COLORD, 1, [define if we have colord])
-fi
-AM_CONDITIONAL(HAVE_COLORD, test "x$have_colord" = "xyes")
-
-##################################################
-# Check for harfbuzz and pangoft2
-##################################################
-
-PKG_CHECK_MODULES(FONTDEMO, harfbuzz >= 0.9 pangoft2, build_font_demo=yes, build_font_demo=no)
-AC_SUBST(FONTDEMO_CFLAGS)
-AC_SUBST(FONTDEMO_LIBS)
-AM_CONDITIONAL(BUILD_FONT_DEMO, [ test "x$build_font_demo" = xyes ])
-
-##################################################
-# Checks for gtk-doc and docbook-tools
-##################################################
-
-GTK_DOC_CHECK([1.20],[--flavour no-tmpl])
-
-AC_ARG_ENABLE(man,
-              [AS_HELP_STRING([--enable-man],
-                              [generate man pages [default=auto]])],,
-              enable_man=maybe)
-
-if test "$enable_man" != no; then
-  AC_PATH_PROG([XSLTPROC], [xsltproc])
-  if test -z "$XSLTPROC"; then
-    if test "$enable_man" = yes ; then
-      AC_MSG_ERROR([xsltproc is required for --enable-man])
-    fi
-    enable_man=no
-  fi
-fi
-
-if test "$enable_man" != no; then
-  dnl check for DocBook DTD in the local catalog
-  JH_CHECK_XML_CATALOG([-//OASIS//DTD DocBook XML V4.1.2//EN],
-     [DocBook XML DTD V4.1.2], [have_docbook_dtd=yes], [have_docbook_dtd=no])
-  if test "$have_docbook_dtd" != yes; then
-    if test "$enable_man" = yes ; then
-      AC_MSG_ERROR([DocBook DTD is required for --enable-man])
-    fi
-    enable_man=no
-  fi
-fi
-
-if test "$enable_man" != no; then
-  dnl check for DocBook XSL stylesheets in the local catalog
-  JH_CHECK_XML_CATALOG([http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl],
-     [DocBook XSL Stylesheets], [have_docbook_style=yes],[have_docbook_style=no])
-  if test "$have_docbook_style" != yes; then
-    if test "$enable_man" = yes ; then
-      AC_MSG_ERROR([DocBook XSL Stylesheets are required for --enable-man])
-    fi
-    enable_man=no
-  fi
-fi
-
-AM_CONDITIONAL(ENABLE_MAN, test "$enable_man" != no)
-
-AC_MSG_CHECKING([whether to generate man pages])
-if test "$enable_man" != no; then
-  AC_MSG_RESULT([yes])
-else
-  AC_MSG_RESULT([no])
-fi
-
-AC_ARG_ENABLE(doc-cross-references,
-              AC_HELP_STRING([--disable-doc-cross-references],
-                             [cross reference symbols from other libraries @<:@default=yes@:>@]),
-              enable_doc_cross_references=$enableval,
-              enable_doc_cross_references=yes)
-
-AM_CONDITIONAL(ENABLE_DOC_CROSS_REFERENCES, test x$enable_doc_cross_references != xno)
-
-
-
-##################################################
-# Visibility handling
-##################################################
-
-GDK_HIDDEN_VISIBILITY_CFLAGS=""
-case "$host" in
-  *-*-mingw*)
-    dnl on mingw32 we do -fvisibility=hidden and __declspec(dllexport)
-    AC_DEFINE([_GDK_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([], [int main (void) { 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_EXTERN], [__attribute__((visibility("default"))) extern],
-                [defines how to decorate public symbols while building])
-      GDK_HIDDEN_VISIBILITY_CFLAGS="-fvisibility=hidden"
-    ])
-    ;;
-esac
-AC_SUBST(GDK_HIDDEN_VISIBILITY_CFLAGS)
-
-##################################################
-# Theming
-##################################################
-
-AC_PATH_PROG([SASSC], [sassc])
-AC_ARG_VAR(SASSC)
-AM_CONDITIONAL([REBUILD_SCSS], [test "x${SASSC}" != x])
-
-##################################################
-# Output commands
-##################################################
-
-AC_CONFIG_COMMANDS([gdk/gdkconfig.h], [
-	outfile=gdkconfig.h-tmp
-	cat > $outfile <<\_______EOF
-/* gdkconfig.h
- *
- * This is a generated file.  Please modify `configure.ac'
- */
-
-#ifndef __GDKCONFIG_H__
-#define __GDKCONFIG_H__
-
-#if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
-#error "Only <gdk/gdk.h> can be included directly."
-#endif
-
-#include <glib.h>
-
-G_BEGIN_DECLS
-
-_______EOF
-
-	cat >>$outfile <<_______EOF
-$gdk_windowing
-_______EOF
-
-	cat >>$outfile <<_______EOF
-
-G_END_DECLS
-
-#endif  /* __GDKCONFIG_H__ */
-_______EOF
-
-
-	if cmp -s $outfile gdk/gdkconfig.h; then
-          AC_MSG_NOTICE([gdk/gdkconfig.h is unchanged])
-	  rm -f $outfile
-	else
-	  mv $outfile gdk/gdkconfig.h
-	fi
-],[
-gdk_windowing='$GDK_WINDOWING'
-])
-
-dnl Compiler flags; macro originates from systemd
-dnl See https://bugzilla.gnome.org/show_bug.cgi?id=608953
-AC_ARG_ENABLE(compile-warnings,
-              [AS_HELP_STRING([--disable-compile-warnings], [Do not use builtin compiler warnings])],
-              [],
-              [enable_compile_warnings=yes])
-AS_IF([test "x$enable_compile_warnings" = xyes], [
-  AX_APPEND_COMPILE_FLAGS([ dnl
-    -Wall dnl
-    -Wundef dnl
-    -Wnested-externs dnl
-    -Wpointer-arith dnl
-    -Wstrict-prototypes dnl
-    -Wcast-align dnl
-    -Wuninitialized dnl
-    -Wmissing-include-dirs dnl
-    -Wshadow dnl
-    -Wformat=2 dnl
-    -Wformat-nonliteral dnl
-    -Wformat-security dnl
-    -Wimplicit-function-declaration dnl
-    -Werror=redundant-decls dnl
-    -Werror=write-strings dnl
-    -Werror=missing-declarations dnl
-    -Werror=missing-prototypes dnl
-    -Werror=empty-body dnl
-    -Werror=init-self dnl
-  ], [GTK_WARN_CFLAGS])
-])
-AC_SUBST(GTK_WARN_CFLAGS)
-
-dnl
-dnl Check for -Bsymbolic-functions linker flag used to avoid
-dnl intra-library PLT jumps, if available.
-dnl
-AC_ARG_ENABLE(Bsymbolic,
-              [AS_HELP_STRING([--disable-Bsymbolic],
-                              [avoid linking with -Bsymbolic])],,
-              [SAVED_LDFLAGS="${LDFLAGS}"
-               AC_MSG_CHECKING([for -Bsymbolic-functions linker flag])
-               LDFLAGS=-Wl,-Bsymbolic-functions
-               AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],
-                                               [[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
-  GTK_LINK_FLAGS=-Wl,-Bsymbolic-functions
-fi
-AC_SUBST(GTK_LINK_FLAGS)
-
-dnl
-dnl Check whether MSVC toolset is explicitly set
-dnl
-AM_CONDITIONAL(MSVC_BASE_NO_TOOLSET_SET, [test x$MSVC_BASE_TOOLSET = x])
-AM_CONDITIONAL(MSVC_NO_TOOLSET_SET, [test x$MSVC_TOOLSET = x])
-
-AC_CONFIG_FILES([
-README
-INSTALL
-config.h.win32
-gtk-zip.sh
-Makefile
-gtk+-4.0.pc
-gtk+-unix-print-4.0.pc
-gail-4.0.pc
-po/Makefile.in
-po-properties/Makefile.in
-demos/Makefile
-demos/gtk-demo/Makefile
-demos/gtk-demo/geninclude.pl
-demos/widget-factory/Makefile
-demos/icon-browser/Makefile
-examples/Makefile
-examples/bp/Makefile
-examples/application1/Makefile
-examples/application2/Makefile
-examples/application3/Makefile
-examples/application4/Makefile
-examples/application5/Makefile
-examples/application6/Makefile
-examples/application7/Makefile
-examples/application8/Makefile
-examples/application9/Makefile
-examples/application10/Makefile
-tests/Makefile
-tests/visuals/Makefile
-testsuite/Makefile
-testsuite/a11y/Makefile
-testsuite/a11y/state/Makefile
-testsuite/css/Makefile
-testsuite/css/parser/Makefile
-testsuite/css/nodes/Makefile
-testsuite/css/style/Makefile
-testsuite/gdk/Makefile
-testsuite/gsk/Makefile
-testsuite/gtk/Makefile
-testsuite/reftests/Makefile
-testsuite/tools/Makefile
-docs/Makefile
-docs/reference/Makefile
-docs/reference/gdk/Makefile
-docs/reference/gdk/version.xml
-docs/reference/gsk/Makefile
-docs/reference/gsk/version.xml
-docs/reference/gtk/Makefile
-docs/reference/gtk/gtk4.types
-docs/reference/gtk/version.xml
-docs/tools/Makefile
-win32/Makefile
-win32/vs12/Makefile
-win32/vs12/gtk4-version-paths.props
-win32/vs14/Makefile
-win32/vs15/Makefile
-gdk/Makefile
-gdk/broadway/Makefile
-gdk/x11/Makefile
-gdk/win32/Makefile
-gdk/win32/rc/Makefile
-gdk/quartz/Makefile
-gdk/wayland/Makefile
-gdk/mir/Makefile
-gdk/gdkversionmacros.h
-gsk/Makefile
-gtk/Makefile
-gtk/makefile.msc
-gtk/gtkversion.h
-gtk/gtk-win32.rc.body
-gtk/libgtk4.manifest
-modules/Makefile
-modules/input/Makefile
-modules/printbackends/Makefile
-modules/printbackends/cups/Makefile
-modules/printbackends/cloudprint/Makefile
-modules/printbackends/lpr/Makefile
-modules/printbackends/file/Makefile
-modules/printbackends/papi/Makefile
-modules/printbackends/test/Makefile
-])
-
-AC_OUTPUT
-
-# beautify the immodule list a bit
-included_immodules=$(echo "${included_immodules}" | $SED 's/,/ /g')
-if test -z "${included_immodules}"; then included_immodules="none"; fi
-
-echo ""
-echo "        GTK+ $GTK_VERSION"
-echo "        ==========="
-echo ""
-echo "        GDK backends:         $GDK_BACKENDS"
-if test "$enable_x11_backend" = "yes"; then
-echo "        X11 extensions:       $X_EXTENSIONS"
-fi
-echo "        Vulkan support:       $vulkan_result"
-echo "        Print backends:       $PRINT_BACKENDS"
-echo "        Dynamic modules:      $build_dynamic_modules"
-echo "        Included immodules:   $included_immodules"
-echo "        colord support:       $have_colord"
-echo "        Introspection:        $found_introspection"
-echo "        Debugging:            $enable_debug"
-echo "        Documentation:        $enable_gtk_doc"
diff --git a/demos/Makefile.am b/demos/Makefile.am
deleted file mode 100644
index 5c4873cc10..0000000000
--- a/demos/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-## Makefile.am for gtk+/demos
-include $(top_srcdir)/Makefile.decl
-
-SUBDIRS = gtk-demo widget-factory icon-browser
-
--include $(top_srcdir)/git.mk
diff --git a/demos/gtk-demo/Makefile.am b/demos/gtk-demo/Makefile.am
deleted file mode 100644
index ea20c49684..0000000000
--- a/demos/gtk-demo/Makefile.am
+++ /dev/null
@@ -1,206 +0,0 @@
-## Makefile.am for gtk+/demos
-include $(top_srcdir)/Makefile.decl
-
-## These should be in the order you want them to appear in the
-## demo app, which means alphabetized by demo title, not filename
-demos_base =					\
-	application_demo.c			\
-	assistant.c				\
-	builder.c				\
-	button_box.c				\
-	changedisplay.c				\
-	clipboard.c				\
-	colorsel.c				\
-	combobox.c				\
-	css_accordion.c                         \
-	css_basics.c				\
-	css_blendmodes.c			\
-	css_multiplebgs.c			\
-	css_pixbufs.c				\
-	css_shadows.c				\
-	cursors.c				\
-	dialog.c				\
-	drawingarea.c				\
-	editable_cells.c			\
-	entry_buffer.c				\
-	entry_completion.c			\
-	event_axes.c				\
-	expander.c  				\
-        filtermodel.c				\
-	fishbowl.c				\
-	widgetbowl.c				\
-	foreigndrawing.c			\
-	gestures.c				\
-	glarea.c				\
-	headerbar.c				\
-	hypertext.c				\
-	iconview.c				\
-	iconview_edit.c				\
-	images.c				\
-	infobar.c				\
-	links.c					\
-	listbox.c				\
-	flowbox.c				\
-	list_store.c				\
-	markup.c				\
-	menus.c					\
-	modelbutton.c				\
-	overlay.c				\
-	overlay2.c				\
-	panes.c					\
-	pickers.c				\
-	pixbufs.c				\
-	popover.c				\
-	printing.c				\
-	revealer.c				\
-	rotated_text.c				\
-	scale.c					\
-	search_entry.c				\
-	search_entry2.c				\
-	shortcuts.c				\
-	sidebar.c				\
-	sizegroup.c				\
-	spinbutton.c				\
-	spinner.c				\
-	stack.c					\
-	tabs.c					\
-	textmask.c				\
-	textview.c				\
-	textscroll.c				\
-	theming_style_classes.c			\
-	toolpalette.c				\
-	transparent.c				\
-	tree_store.c
-
-demos_opt =
-
-if BUILD_FONT_DEMO
-demos_opt += font_features.c
-endif
-
-if OS_UNIX
-demos_opt += pagesetup.c
-endif
-
-demos = $(demos_base) $(demos_opt)
-
-AM_CPPFLAGS = \
-	-I$(top_srcdir) 			\
-	-I$(top_builddir)/gdk			\
-	-DGDK_DISABLE_DEPRECATED		\
-	-DGTK_DISABLE_DEPRECATED 		\
-	$(GTK_DEBUG_FLAGS)			\
-	$(GTK_DEP_CFLAGS)
-
-DEPS = \
-	$(top_builddir)/gtk/libgtk-4.la
-
-LDADDS = \
-	$(top_builddir)/gtk/libgtk-4.la		\
-	$(GTK_DEP_LIBS)				\
-	$(GDK_DEP_LIBS)				\
-	-lm
-
-if BUILD_FONT_DEMO
-AM_CPPFLAGS += $(FONTDEMO_CFLAGS)
-LDADDS += $(FONTDEMO_LIBS)
-endif
-
-bin_PROGRAMS = gtk4-demo gtk4-demo-application
-
-desktopdir = $(datadir)/applications
-dist_desktop_DATA = gtk4-demo.desktop
-
-BUILT_SOURCES = demos.h demo_resources.c
-
-EXTRA_DIST += 				\
-	data/source.svg			\
-	data/symbolic-source.svg	\
-	demo.gresource.xml		\
-	$(resource_files)		\
-	org.gtk.Demo.gschema.xml	\
-	demos.h.win32
-
-gsettings_SCHEMAS = \
-	org.gtk.Demo.gschema.xml
-
-@GSETTINGS_RULES@
-
-demos.h: $(demos) geninclude.pl
-	 $(AM_V_GEN) (here=`pwd` ; cd $(srcdir) && $(PERL) $$here/geninclude.pl $(demos)) > demos.h
-
-demos.h.win32: $(demos_base) geninclude.pl
-	 $(AM_V_GEN) (here=`pwd` ; cd $(srcdir) && $(PERL) $$here/geninclude.pl $(demos_base)) > demos.h.win32
-
-nodist_gtk4_demo_SOURCES = demos.h
-
-gtk4_demo_SOURCES = 		\
-	$(demos)		\
-	gtkfishbowl.c		\
-	gtkfishbowl.h		\
-	demo_resources.c	\
-	main.c
-
-gtk4_demo_DEPENDENCIES = $(DEPS)
-gtk4_demo_LDADD = $(LDADDS)
-gtk4_demo_LDFLAGS = -export-dynamic
-
-gtk4_demo_application_SOURCES = \
-	application.c 		\
-	demo_resources.c
-
-gtk4_demo_application_LDADD = $(LDADDS)
-
-resource_files = $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(builddir)/demo.gresource.xml)
-
-demo_resources.c: demo.gresource.xml $(resource_files)
-	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-source $(srcdir)/demo.gresource.xml
-
-iconthemedir = $(datadir)/icons/hicolor
-
-appsicon16dir = $(iconthemedir)/16x16/apps
-appsicon22dir = $(iconthemedir)/22x22/apps
-appsicon24dir = $(iconthemedir)/24x24/apps
-appsicon32dir = $(iconthemedir)/32x32/apps
-appsicon48dir = $(iconthemedir)/48x48/apps
-appsicon256dir = $(iconthemedir)/256x256/apps
-appsiconscalabledir = $(iconthemedir)/scalable/apps
-
-dist_appsicon16_DATA = data/16x16/gtk4-demo.png data/16x16/gtk4-demo-symbolic.symbolic.png
-dist_appsicon22_DATA = data/22x22/gtk4-demo.png data/22x22/gtk4-demo-symbolic.symbolic.png
-dist_appsicon24_DATA = data/24x24/gtk4-demo.png data/24x24/gtk4-demo-symbolic.symbolic.png
-dist_appsicon32_DATA = data/32x32/gtk4-demo.png data/32x32/gtk4-demo-symbolic.symbolic.png
-dist_appsicon48_DATA = data/48x48/gtk4-demo.png data/48x48/gtk4-demo-symbolic.symbolic.png
-dist_appsicon256_DATA = data/256x256/gtk4-demo.png data/256x256/gtk4-demo-symbolic.symbolic.png
-
-update_icon_cache = $(top_builddir)/gtk/gtk4-update-icon-cache$(EXEEXT) --ignore-theme-index --force
-
-install-data-hook: install-update-icon-cache
-uninstall-hook: uninstall-update-icon-cache
-
-install-update-icon-cache:
-	$(AM_V_at)$(POST_INSTALL)
-	test -n "$(DESTDIR)" || $(update_icon_cache) "$(iconthemedir)"
-
-uninstall-update-icon-cache:
-	$(AM_V_at)$(POST_UNINSTALL)
-	test -n "$(DESTDIR)" || $(update_icon_cache) "$(iconthemedir)"
-
-# ------------------- MSVC Build Items ----------------
-MSVCPROJS = gtk4-demo gtk4-demo-application
-
-gtk4_demo_FILES = $(gtk4_demo_SOURCES)
-gtk4_demo_EXCLUDES = font_features.c|pagesetup.c
-
-gtk4_demo_application_FILES = $(gtk4_demo_application_SOURCES)
-gtk4_demo_application_EXCLUDES = dummy
-
-include $(top_srcdir)/win32/Makefile.msvcproj
-
-dist-hook: \
-	$(top_builddir)/win32/vs12/gtk4-demo.vcxproj	\
-	$(top_builddir)/win32/vs12/gtk4-demo-application.vcxproj
-
-DISTCLEANFILES = demos.h demos.h.win32
-
--include $(top_srcdir)/git.mk
diff --git a/demos/icon-browser/Makefile.am b/demos/icon-browser/Makefile.am
deleted file mode 100644
index 56bbc4ce35..0000000000
--- a/demos/icon-browser/Makefile.am
+++ /dev/null
@@ -1,48 +0,0 @@
-AM_CPPFLAGS = \
-	-I$(top_srcdir)			\
-	-I$(top_srcdir)/gdk		\
-	-I$(top_builddir)/gdk		\
-	$(GTK_DEBUG_FLAGS)		\
-	$(GTK_DEP_CFLAGS)
-
-LDADD = \
-        $(top_builddir)/gtk/libgtk-4.la \
-        $(GTK_DEP_LIBS)
-
-
-bin_PROGRAMS = gtk4-icon-browser
-
-desktopdir = $(datadir)/applications
-dist_desktop_DATA = gtk4-icon-browser.desktop
-
-gtk4_icon_browser_SOURCES = \
-	main.c \
-	iconbrowserapp.c iconbrowserapp.h \
-	iconbrowserwin.c iconbrowserwin.h \
-	iconstore.c iconstore.h \
-	resources.c
-
-BUILT_SOURCES = \
-	resources.c
-
-resources.c: iconbrowser.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/iconbrowser.gresource.xml)
-	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $(srcdir)/iconbrowser.gresource.xml \
-		--target=$@ --sourcedir=$(srcdir) --generate-source
-
-EXTRA_DIST = \
-	menus.ui \
-	iconbrowser.gresource.xml \
-	window.ui \
-	icon.list
-
-# ------------------- MSVC Build Items ----------------
-MSVCPROJS = gtk4-icon-browser
-
-gtk4_icon_browser_FILES = $(gtk4_icon_browser_SOURCES)
-gtk4_icon_browser_EXCLUDES = dummy
-
-include $(top_srcdir)/win32/Makefile.msvcproj
-
-dist-hook: $(top_builddir)/win32/vs12/gtk4-icon-browser.vcxproj
-
--include $(top_srcdir)/git.mk
diff --git a/demos/widget-factory/Makefile.am b/demos/widget-factory/Makefile.am
deleted file mode 100644
index 9a5de9d490..0000000000
--- a/demos/widget-factory/Makefile.am
+++ /dev/null
@@ -1,71 +0,0 @@
-include $(top_srcdir)/Makefile.decl
-
-bin_PROGRAMS = gtk4-widget-factory
-
-desktopdir = $(datadir)/applications
-dist_desktop_DATA = gtk4-widget-factory.desktop
-
-gtk4_widget_factory_SOURCES = 		\
-	widget-factory.c		\
-	widget_factory_resources.c
-
-BUILT_SOURCES = 			\
-	widget_factory_resources.c
-
-gtk4_widget_factory_DEPENDENCIES = 	\
-	$(top_builddir)/gtk/libgtk-4.la
-
-gtk4_widget_factory_CPPFLAGS = 		\
-	-I$(top_srcdir)			\
-	$(GTK_DEBUG_FLAGS)		\
-	$(GTK_DEP_CFLAGS)		\
-	$(NULL)
-
-gtk4_widget_factory_LDADD = 		\
-	$(top_builddir)/gtk/libgtk-4.la \
-	$(GTK_DEP_LIBS)			\
-	$(NULL)
-
-widget_factory_resources.c: widget-factory.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/widget-factory.gresource.xml)
-	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-source $<
-
-
-iconthemedir = $(datadir)/icons/hicolor
-
-appsicon16dir = $(iconthemedir)/16x16/apps
-appsicon22dir = $(iconthemedir)/22x22/apps
-appsicon24dir = $(iconthemedir)/24x24/apps
-appsicon32dir = $(iconthemedir)/32x32/apps
-appsicon48dir = $(iconthemedir)/48x48/apps
-appsicon256dir = $(iconthemedir)/256x256/apps
-
-dist_appsicon16_DATA = data/16x16/gtk4-widget-factory.png data/16x16/gtk4-widget-factory-symbolic.symbolic.png
-dist_appsicon22_DATA = data/22x22/gtk4-widget-factory.png data/22x22/gtk4-widget-factory-symbolic.symbolic.png
-dist_appsicon24_DATA = data/24x24/gtk4-widget-factory.png data/24x24/gtk4-widget-factory-symbolic.symbolic.png
-dist_appsicon32_DATA = data/32x32/gtk4-widget-factory.png data/32x32/gtk4-widget-factory-symbolic.symbolic.png
-dist_appsicon48_DATA = data/48x48/gtk4-widget-factory.png data/48x48/gtk4-widget-factory-symbolic.symbolic.png
-dist_appsicon256_DATA = data/256x256/gtk4-widget-factory.png data/256x256/gtk4-widget-factory-symbolic.symbolic.png
-
-update_icon_cache = $(top_builddir)/gtk/gtk4-update-icon-cache$(EXEEXT) --ignore-theme-index --force
-
-install-data-hook: install-update-icon-cache
-uninstall-hook: uninstall-update-icon-cache
-
-install-update-icon-cache:
-	$(AM_V_at)$(POST_INSTALL)
-	test -n "$(DESTDIR)" || $(update_icon_cache) "$(iconthemedir)"
-
-uninstall-update-icon-cache:
-	$(AM_V_at)$(POST_UNINSTALL)
-	test -n "$(DESTDIR)" || $(update_icon_cache) "$(iconthemedir)"
-
-EXTRA_DIST += 				\
-	widget-factory.ui 		\
-	widget-factory.css		\
-	menus.ui 			\
-	help-overlay.ui			\
-	widget-factory.gresource.xml	\
-	data/source.svg			\
-	data/symbolic-source.svg
-
--include $(top_srcdir)/git.mk
diff --git a/docs/Makefile.am b/docs/Makefile.am
deleted file mode 100644
index 020a73a6c7..0000000000
--- a/docs/Makefile.am
+++ /dev/null
@@ -1,20 +0,0 @@
-## Process this file with automake to produce Makefile.in
-include $(top_srcdir)/Makefile.decl
-
-SUBDIRS = reference tools
-
-EXTRA_DIST += \
-	CODING-STYLE			\
-	developers.txt			\
-	dnd_internals.txt		\
-	focus_tracking.txt		\
-	RELEASE-HOWTO			\
-	sizing-test.txt			\
-	styles.txt			\
-	text_widget_internals.txt	\
-	tree-column-sizing.png		\
-	tree-column-sizing.txt		\
-	widget_geometry.txt		\
-	widget_system.txt
-
--include $(top_srcdir)/git.mk
diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
deleted file mode 100644
index 39fe2bea2c..0000000000
--- a/docs/reference/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-## Process this file with automake to produce Makefile.in
-include $(top_srcdir)/Makefile.decl
-
-SUBDIRS = gdk gsk gtk
-
-GITIGNOREFILES = */*.1
-
--include $(top_srcdir)/git.mk
diff --git a/docs/reference/gdk/Makefile.am b/docs/reference/gdk/Makefile.am
deleted file mode 100644
index 68b08e3bc3..0000000000
--- a/docs/reference/gdk/Makefile.am
+++ /dev/null
@@ -1,207 +0,0 @@
-DOC_MODULE = gdk4
-DOC_MAIN_SGML_FILE = gdk4-docs.xml
-SCAN_OPTIONS = \
-	--deprecated-guards=GDK_DISABLE_DEPRECATED \
-        --ignore-decorators=G_GNUC_WARN_UNUSED_RESULT
-
-DOC_SOURCE_DIR = \
-	$(top_srcdir)/gdk \
-	$(top_srcdir)/gdk/x11 \
-	$(top_builddir)/gdk
-
-HFILE_GLOB = \
-	$(top_srcdir)/gdk/*.h \
-	$(top_srcdir)/gdk/x11/gdkx.h \
-	$(top_builddir)/gdk/*.h
-CFILE_GLOB = \
-	$(top_srcdir)/gdk/*.c
-
-IGNORE_HFILES =			\
-	gdkintl.h		\
-	gdkmarshalers.h		\
-	gdkkeysyms.h		\
-	gdkinternals.h		\
-	gdkprivate.h		\
-	gdk-private.h		\
-	gdkapplaunchcontextprivate.h \
-	gdkcursorprivate.h	\
-	gdkdevicemanagerprivate.h \
-	gdkdeviceprivate.h	\
-	gdkdisplaymanagerprivate.h \
-	gdkdisplayprivate.h	\
-	gdkdndprivate.h		\
-	gdkdrawcontextprivate.h	\
-	gdkframeclockprivate.h	\
-	gdkglcontextprivate.h	\
-	gdkkeysprivate.h	\
-	gdkmonitorprivate.h	\
-	gdkscreenprivate.h	\
-	gdkseatdefaultprivate.h	\
-	gdkseatprivate.h	\
-	gdkvisualprivate.h	\
-	gdkvulkancontextprivate.h \
-	keyname-table.h		\
-	win32			\
-	x11			\
-	quartz			\
-	broadway		\
-	wayland			\
-	$()
-
-EXTRA_HFILES = \
-	$(top_srcdir)/gdk/x11/gdkx.h \
-	$()
-
-AM_CPPFLAGS = \
-	-I$(top_srcdir)		\
-	-I$(top_builddir)	\
-	-I$(top_builddir)/gdk	\
-	$(GTK_DEBUG_FLAGS)	\
-	$(GDK_DEP_CFLAGS)
-
-GTKDOC_LIBS = $(top_builddir)/gtk/libgtk-4.la $(GDK_DEP_LIBS)
-
-MKDB_OPTIONS = --output-format=xml --name-space=gdk
-
-content_files = \
-	version.xml \
-	$()
-
-HTML_IMAGES = \
-	images/rotated-text.png		\
-	images/X_cursor.png		\
-	images/arrow.png		\
-	images/based_arrow_down.png	\
-	images/based_arrow_up.png	\
-	images/boat.png			\
-	images/bogosity.png		\
-	images/bottom_left_corner.png	\
-	images/bottom_right_corner.png	\
-	images/bottom_side.png		\
-	images/bottom_tee.png		\
-	images/box_spiral.png		\
-	images/center_ptr.png		\
-	images/circle.png		\
-	images/clock.png		\
-	images/coffee_mug.png		\
-	images/cross.png		\
-	images/cross_reverse.png	\
-	images/crosshair.png		\
-	images/diamond_cross.png	\
-	images/dot.png			\
-	images/dotbox.png		\
-	images/double_arrow.png		\
-	images/draft_large.png		\
-	images/draft_small.png		\
-	images/draped_box.png		\
-	images/exchange.png		\
-	images/fleur.png		\
-	images/gobbler.png		\
-	images/gumby.png		\
-	images/hand1.png		\
-	images/hand2.png		\
-	images/heart.png		\
-	images/icon.png			\
-	images/iron_cross.png		\
-	images/left_ptr.png		\
-	images/left_side.png		\
-	images/left_tee.png		\
-	images/leftbutton.png		\
-	images/ll_angle.png		\
-	images/lr_angle.png		\
-	images/man.png			\
-	images/middlebutton.png		\
-	images/mouse.png		\
-	images/pencil.png		\
-	images/pirate.png		\
-	images/plus.png			\
-	images/question_arrow.png	\
-	images/right_ptr.png		\
-	images/right_side.png		\
-	images/right_tee.png		\
-	images/rightbutton.png		\
-	images/rtl_logo.png		\
-	images/sailboat.png		\
-	images/sb_down_arrow.png	\
-	images/sb_h_double_arrow.png	\
-	images/sb_left_arrow.png	\
-	images/sb_right_arrow.png	\
-	images/sb_up_arrow.png		\
-	images/sb_v_double_arrow.png	\
-	images/shuttle.png		\
-	images/sizing.png		\
-	images/spider.png		\
-	images/spraycan.png		\
-	images/star.png			\
-	images/target.png		\
-	images/tcross.png		\
-	images/top_left_arrow.png	\
-	images/top_left_corner.png	\
-	images/top_right_corner.png	\
-	images/top_side.png		\
-	images/top_tee.png		\
-	images/trek.png			\
-	images/ul_angle.png		\
-	images/umbrella.png		\
-	images/ur_angle.png		\
-	images/watch.png		\
-	images/xterm.png		\
-	images/alias_cursor.png		\
-	images/all_scroll_cursor.png	\
-	images/cell_cursor.png		\
-	images/col_resize_cursor.png	\
-	images/copy_cursor.png		\
-	images/crosshair_cursor.png	\
-	images/default_cursor.png	\
-	images/e_resize_cursor.png	\
-	images/ew_resize_cursor.png	\
-	images/grabbing_cursor.png	\
-	images/grab_cursor.png		\
-	images/hand_cursor.png		\
-	images/context_menu_cursor.png	\
-	images/help_cursor.png		\
-	images/move_cursor.png		\
-	images/ne_resize_cursor.png	\
-	images/nesw_resize_cursor.png	\
-	images/no_drop_cursor.png	\
-	images/not_allowed_cursor.png	\
-	images/n_resize_cursor.png	\
-	images/ns_resize_cursor.png	\
-	images/nw_resize_cursor.png	\
-	images/nwse_resize_cursor.png	\
-	images/pointer_cursor.png	\
-	images/progress_cursor.png	\
-	images/row_resize_cursor.png	\
-	images/se_resize_cursor.png	\
-	images/s_resize_cursor.png	\
-	images/sw_resize_cursor.png	\
-	images/text_cursor.png		\
-	images/vertical_text_cursor.png	\
-	images/wait_cursor.png		\
-	images/w_resize_cursor.png	\
-	images/X_cursor.png		\
-	images/zoom_in_cursor.png	\
-	images/zoom_out_cursor.png	\
-	$()
-
-if ENABLE_DOC_CROSS_REFERENCES
-# 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 \
-	--extra-dir=$(CAIRO_PREFIX)/share/gtk-doc/html/cairo
-endif
-
-include $(top_srcdir)/gtk-doc.make
-
-# Other files to distribute
-EXTRA_DIST += version.xml.in
-
-if ENABLE_GTK_DOC
-TESTS_ENVIRONMENT = cd $(srcdir) && \
-  DOC_MODULE=$(DOC_MODULE) DOC_MAIN_SGML_FILE=$(DOC_MAIN_SGML_FILE) \
-  SRCDIR=$(abs_srcdir) BUILDDIR=$(abs_builddir)
-#TESTS = $(GTKDOC_CHECK)
-endif
-
--include $(top_srcdir)/git.mk
diff --git a/docs/reference/gsk/Makefile.am b/docs/reference/gsk/Makefile.am
deleted file mode 100644
index edd4f363c9..0000000000
--- a/docs/reference/gsk/Makefile.am
+++ /dev/null
@@ -1,64 +0,0 @@
-## Process this file with automake to produce Makefile.in
-DOC_MODULE = gsk4
-DOC_MAIN_SGML_FILE = gsk4-docs.xml
-
-SCAN_OPTIONS = --deprecated-guards=GDK_DISABLE_DEPRECATED \
-               --ignore-decorators=G_GNUC_WARN_UNUSED_RESULT
-
-DOC_SOURCE_DIR = $(top_srcdir)/gsk $(top_builddir)/gsk
-
-HFILE_GLOB = $(top_srcdir)/gsk/*.h
-CFILE_GLOB = $(top_srcdir)/gsk/*.c
-
-IGNORE_HFILES =				\
-	gskcairorendererprivate.h	\
-	gskdebugprivate.h		\
-	gskdriverprivate.h		\
-	gskprofilerprivate.h		\
-	gskglrendererprivate.h		\
-	gskprivate.h			\
-	gskprofilerprivate.h		\
-	gskrendererprivate.h		\
-	gskrendernodeprivate.h		\
-	gskshaderbuilderprivate.h	\
-	$()
-
-EXTRA_HFILES =
-
-AM_CPPFLAGS = \
-	-I$(top_srcdir)		\
-	-I$(top_builddir)	\
-	-I$(top_builddir)/gsk	\
-	$(GTK_DEBUG_FLAGS)	\
-	$(GDK_DEP_CFLAGS)
-
-GTKDOC_LIBS = $(top_builddir)/gtk/libgtk-4.la $(GDK_DEP_LIBS)
-
-MKDB_OPTIONS=--output-format=xml --name-space=gsk
-
-content_files = \
-	version.xml
-
-HTML_IMAGES =
-
-if ENABLE_DOC_CROSS_REFERENCES
-# 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 \
-	--extra-dir=$(CAIRO_PREFIX)/share/gtk-doc/html/cairo
-endif
-
-include $(top_srcdir)/gtk-doc.make
-
-# Other files to distribute
-EXTRA_DIST += version.xml.in
-
-if ENABLE_GTK_DOC
-TESTS_ENVIRONMENT = cd $(srcdir) && \
-  DOC_MODULE=$(DOC_MODULE) DOC_MAIN_SGML_FILE=$(DOC_MAIN_SGML_FILE) \
-  SRCDIR=$(abs_srcdir) BUILDDIR=$(abs_builddir)
-#TESTS = $(GTKDOC_CHECK)
-endif
-
--include $(top_srcdir)/git.mk
diff --git a/docs/reference/gtk/Makefile.am b/docs/reference/gtk/Makefile.am
deleted file mode 100644
index 37f58924c8..0000000000
--- a/docs/reference/gtk/Makefile.am
+++ /dev/null
@@ -1,567 +0,0 @@
-DOC_MODULE = gtk4
-
-DOC_MAIN_SGML_FILE = gtk4-docs.xml
-
-SCAN_OPTIONS = --deprecated-guards="GTK_ENABLE_BROKEN|GTK_DISABLE_DEPRECATED"
-
-DOC_SOURCE_DIR = $(top_srcdir)/gtk $(top_builddir)/gtk
-
-HFILE_GLOB=$(top_srcdir)/gtk/*.h
-CFILE_GLOB=$(top_srcdir)/gtk/*.c
-
-# Header files to ignore when scanning
-IGNORE_HFILES = \
-	inspector			\
-	a11y				\
-	gtkaccelgroupprivate.h		\
-	gtkaccelmapprivate.h		\
-	gtkadjustmentprivate.h		\
-	gtkallocatedbitmaskprivate.h	\
-	gtkappchooserprivate.h		\
-	gtkapplicationaccelsprivate.h	\
-	gtkapplicationprivate.h		\
-	gtkbindingsprivate.h		\
-	gtkbitmaskprivate.h		\
-	gtkboxgadgetprivate.h	        \
-	gtkboxprivate.h		        \
-	gtkbuilderprivate.h		\
-	gtkbuiltiniconprivate.h		\
-	gtkbuttonprivate.h		\
-	gtkcellareaboxcontextprivate.h	\
-	gtkcheckbuttonprivate.h		\
-	gtkclipboardprivate.h		\
-	gtkcolorchooserprivate.h	\
-	gtkcoloreditorprivate.h		\
-	gtkcolorplaneprivate.h		\
-	gtkcolorscaleprivate.h		\
-	gtkcolorswatchprivate.h		\
-	gtkcolorutils.h			\
-	gtkcomboboxprivate.h		\
-	gtkcomposetable.h		\
-	gtkcontainerprivate.h		\
-	gtkcssanimatedstyleprivate.h	\
-	gtkcssanimationprivate.h	\
-	gtkcssarrayvalueprivate.h	\
-	gtkcssbgsizevalueprivate.h	\
-	gtkcssbordervalueprivate.h	\
-	gtkcsscalcvalueprivate.h	\
-	gtkcsscolorvalueprivate.h	\
-	gtkcsscornervalueprivate.h	\
-	gtkcsscustomgadgetprivate.h	\
-	gtkcsscustompropertyprivate.h	\
-	gtkcssdimensionvalueprivate.h	\
-	gtkcsseasevalueprivate.h	\
-	gtkcssenginevalueprivate.h	\
-	gtkcssenumvalueprivate.h	\
-	gtkcssgadgetprivate.h		\
-	gtkcssiconthemevalueprivate.h	\
-	gtkcssimagebuiltinprivate.h	\
-	gtkcssimagecrossfadeprivate.h	\
-	gtkcssimagefallbackprivate.h	\
-	gtkcssimagegradientprivate.h	\
-	gtkcssimageiconthemeprivate.h	\
-	gtkcssimagelinearprivate.h	\
-	gtkcssimageradialprivate.h	\
-	gtkcssimageprivate.h		\
-	gtkcssimagerecolorprivate.h	\
-	gtkcssimagescaledprivate.h	\
-	gtkcssimagesurfaceprivate.h	\
-	gtkcssimageurlprivate.h		\
-	gtkcssimagevalueprivate.h	\
-	gtkcssimagewin32private.h	\
-	gtkcssinheritvalueprivate.h	\
-	gtkcssinitialvalueprivate.h	\
-	gtkcsskeyframesprivate.h	\
-	gtkcsslookupprivate.h		\
-	gtkcssmatcherprivate.h		\
-	gtkcssnodeprivate.h		\
-	gtkcssnodestylecacheprivate.h	\
-	gtkcssnodedeclarationprivate.h	\
-	gtkcssnumbervalueprivate.h	\
-	gtkcsspalettevalueprivate.h	\
-	gtkcsspathnodeprivate.h		\
-	gtkcssparserprivate.h		\
-	gtkcsspositionvalueprivate.h	\
-	gtkcssproviderprivate.h		\
-	gtkcssrepeatvalueprivate.h	\
-	gtkcssrgbavalueprivate.h	\
-	gtkcsssectionprivate.h		\
-	gtkcssselectorprivate.h		\
-	gtkcssshadowsvalueprivate.h	\
-	gtkcssshadowvalueprivate.h	\
-	gtkcssshorthandpropertyprivate.h\
-	gtkcssstaticstyleprivate.h	\
-	gtkcssstringvalueprivate.h	\
-	gtkcssstylechangeprivate.h	\
-	gtkcssstylefuncsprivate.h	\
-	gtkcssstyleprivate.h		\
-	gtkcssstylepropertyprivate.h	\
-	gtkcsstransformvalueprivate.h	\
-	gtkcsstransientnodeprivate.h	\
-	gtkcsstransitionprivate.h	\
-	gtkcsstypedvalueprivate.h	\
-	gtkcsstypesprivate.h		\
-	gtkcssunsetvalueprivate.h	\
-	gtkcssvalueprivate.h		\
-	gtkcsswidgetnodeprivate.h	\
-	gtkcsswin32sizevalueprivate.h	\
-	gtkdebugupdatesprivate.h	\
-	gtkdialogprivate.h		\
-	gtkdndprivate.h			\
-	gtkentryprivate.h		\
-	gtkeventcontrollerprivate.h	\
-	gtkfilechoosernativeprivate.h	\
-	gtkfilechooserprivate.h		\
-	gtkfilechooserwidgetprivate.h	\
-	gtkfontchooserprivate.h		\
-	gtkgesturedragprivate.h		\
-	gtkgesturelongpressprivate.h	\
-	gtkgesturemultipressprivate.h	\
-	gtkgesturepanprivate.h		\
-	gtkgestureprivate.h		\
-	gtkgesturerotateprivate.h	\
-	gtkgesturesingleprivate.h	\
-	gtkgestureswipeprivate.h	\
-	gtkgesturezoomprivate.h		\
-	gtkheaderbarprivate.h		\
-	gtkhslaprivate.h		\
-	gtkiconprivate.h		\
-	gtkiconhelperprivate.h		\
-	gtkiconthemeprivate.h		\
-	gtkiconviewprivate.h		\
-	gtkimagedefinitionprivate.h	\
-	gtkimageprivate.h		\
-	gtkimcontextsimpleprivate.h	\
-	gtkimmoduleprivate.h		\
-	gtklabelprivate.h		\
-	gtklockbuttonprivate.h		\
-	gtkmagnifierprivate.h		\
-	gtkmenubuttonprivate.h		\
-	gtkmenuitemprivate.h		\
-	gtkmenuprivate.h		\
-	gtkmenushellprivate.h		\
-	gtkmodulesprivate.h		\
-	gtkmountoperationprivate.h	\
-	gtkorientableprivate.h		\
-	gtkpixelcacheprivate.h		\
-	gtkplacessidebarprivate.h	\
-	gtkplacesviewprivate.h		\
-	gtkplacesviewrowprivate.h	\
-	gtkpopoverprivate.h		\
-	gtkprinter-private.h		\
-	gtkprintoperation-private.h	\
-	gtkprivate.h		        \
-	gtkprogresstrackerprivate.h     \
-	gtkrangeprivate.h		\
-	gtkrecentchooserprivate.h	\
-	gtkrenderbackgroundprivate.h	\
-	gtkrenderborderprivate.h	\
-	gtkrendericonprivate.h		\
-	gtkroundedboxprivate.h		\
-	gtkscaleprivate.h		\
-	gtksearchengine.h		\
-	gtksearchenginemodel.h		\
-	gtksearchenginequartz.h		\
-	gtksearchenginesimple.h		\
-	gtksearchenginetracker.h	\
-	gtksearchentryprivate.h		\
-	gtkselectionprivate.h		\
-	gtksettingsprivate.h		\
-	gtkshortcutsshortcutprivate.h	\
-	gtkshortcutswindowprivate.h	\
-	gtksidebarrowprivate.h		\
-	gtksizegroup-private.h		\
-	gtksizerequestcacheprivate.h	\
-	gtksnapshotprivate.h		\
-	gtkstyleanimationprivate.h	\
-	gtkstylecascadeprivate.h	\
-	gtkstylecontextprivate.h	\
-	gtkstylepropertyprivate.h	\
-	gtkstyleproviderprivate.h	\
-	gtktextattributes.h		\
-	gtktextattributesprivate.h	\
-	gtktextchildprivate.h		\
-	gtktexthandleprivate.h		\
-	gtktextiterprivate.h		\
-	gtktextmarkprivate.h		\
-	gtktexttagprivate.h		\
-	gtktextviewprivate.h		\
-	gtktogglebuttonprivate.h	\
-	gtktoolbarprivate.h		\
-	gtktoolpaletteprivate.h		\
-	gtktooltipprivate.h		\
-	gtktooltipwindowprivate.h	\
-	gtkutilsprivate.h		\
-	gtktreeprivate.h		\
-	gtkwidgetprivate.h		\
-	gtkwin32themeprivate.h		\
-	gtkwindowprivate.h		\
-	fnmatch.h			\
-	gtkactionmuxer.h		\
-	gtkactionobserver.h		\
-	gtkactionobservable.h		\
-	gtk9slice.h			\
-	gtkanimationdescription.h	\
-	gtkbitmaskprivateimpl.h		\
-	gtkbookmarksmanager.h		\
-	gtkdbusgenerated.c		\
-	gtkdbusgenerated.h		\
-	gtkdebug.h			\
-	gtkactionhelper.h		\
-	gtkdndcursors.h			\
-	gtkfilechooserdefault.h		\
-	gtkfilechooserembed.h		\
-	gtkfilechooserentry.h		\
-	gtkfilechoosersettings.h	\
-	gtkfilechooserutils.h		\
-	gtkfilesystem.h			\
-	gtkfilesystemmodel.h		\
-	gtkfilesystemunix.h		\
-	gtkfilesystemwin32.h		\
-	gtkfontchooserutils.h		\
-	gtkiconcache.h			\
-        gtkiconcachevalidator.h         \
-	gtkiconthemeparser.h		\
-	gtkintl.h			\
-	gtkkeyhash.h			\
-	gtkkineticscrolling.h		\
-	gtkmarshal.h			\
-	gtkmnemonichash.h		\
-	gtkmenutracker.h		\
-	gtkmenutrackeritem.h		\
-	gtkmenusectionbox.h		\
-	gtkmodelmenu.h			\
-	gtkmodelmenuitem.h		\
-	gtkmodifierstyle.h		\
-	gtkpathbar.h			\
-	gtkprintbackend.h		\
-	gtkprinteroption.h		\
-	gtkprinteroptionset.h		\
-	gtkprinteroptionwidget.h	\
-	gtkprinter-private.h		\
-	gtkprintoperation-portal.h	\
-	gtkprint-win32.h		\
-	gtkprintutils.h			\
-	gtkprivate.h			\
-	gtkprivatetypebuiltins.h	\
-	gtkquery.h			\
-	gtkrbtree.h			\
-	gtkrecentchooserdefault.h	\
-	gtkrecentchooserutils.h		\
-	gtksearchengine.h		\
-	gtksearchenginetracker.h	\
-	gtksearchenginesimple.h		\
-	gtksearchenginequartz.h		\
-	gtksequence.h			\
-	gtktextbtree.h			\
-	gtktextbufferserialize.h	\
-	gtktextdisplay.h		\
-	gtktextlayout.h			\
-	gtktextsegment.h		\
-	gtktexttypes.h			\
-	gtktextutil.h			\
-	gtktimeline.h			\
-	gtkthemes.h			\
-	gtktrashmonitor.h		\
-	gtktrayicon.h			\
-	gtktreedatalist.h		\
-	gtktreemenu.h			\
-	gtktypebuiltins.h		\
-	gtkwidgetpathprivate.h		\
-	gtkwindow-decorate.h		\
-	gtkwin32drawprivate.h		\
-	gtkwin32themeprivate.h		\
-	xdgmime				\
-	xembed.h			\
-	$()
-
-AM_CPPFLAGS = \
-	-I$(top_srcdir) 	\
-	-I$(top_builddir) 	\
-	-I$(top_builddir)/gdk	\
-	-DGTK_ENABLE_BROKEN	\
-	-Wno-deprecated-declarations \
-	$(GTK_DEBUG_FLAGS)	\
-	$(GTK_DEP_CFLAGS)
-
-CPPFLAGS += \
-	-UGTK_DISABLE_SINGLE_INCLUDES
-
-GTKDOC_LIBS = \
-	$(top_builddir)/gtk/libgtk-4.la	\
-	$(GTK_DEP_LIBS)
-
-
-# Extra options to supply to gtkdoc-mkdb
-MKDB_OPTIONS = --output-format=xml --name-space=gtk
-
-# Extra SGML files that are included by $(DOC_MAIN_SGML_FILE)
-content_files = \
-	broadway.xml				\
-	building.sgml				\
-	compiling.sgml				\
-	css-overview.xml			\
-	css-properties.xml			\
-	drawing-model.xml			\
-	getting_started.xml			\
-	glossary.xml				\
-	gtk4-broadwayd.xml			\
-	gtk4-demo-application.xml		\
-	gtk4-demo.xml				\
-	gtk4-icon-browser.xml			\
-	gtk4-widget-factory.xml			\
-	gtk4-builder-tool.xml			\
-	gtk4-encode-symbolic-svg.xml		\
-	gtk4-launch.xml				\
-	gtk4-query-immodules.xml		\
-	gtk4-query-settings.xml			\
-	gtk4-update-icon-cache.xml		\
-	input-handling.xml			\
-	migrating-2to4.xml			\
-	migrating-3to4.xml			\
-	mir.xml					\
-	osx.sgml				\
-	overview.xml 				\
-	question_index.sgml			\
-	resources.sgml				\
-	running.sgml				\
-	text_widget.sgml			\
-	tree_widget.sgml			\
-	version.xml				\
-	visual_index.xml			\
-	wayland.xml				\
-	windows.sgml				\
-	x11.sgml				\
-	$()
-
-expand_content_files = \
-	compiling.sgml				\
-	drawing-model.xml			\
-	getting_started.xml			\
-	glossary.xml				\
-	input-handling.xml			\
-	migrating-2to4.xml			\
-	migrating-3to4.xml			\
-	question_index.sgml			\
-	text_widget.sgml			\
-	tree_widget.sgml			\
-	$()
-
-# Images to copy into HTML directory
-HTML_IMAGES = \
-	$(srcdir)/images/aboutdialog.png				\
-	$(srcdir)/images/accel-label.png				\
-	$(srcdir)/images/action-bar.png					\
-	$(srcdir)/images/appchooserbutton.png				\
-	$(srcdir)/images/appchooserdialog.png				\
-	$(srcdir)/images/assistant.png					\
-	$(srcdir)/images/box-packing.png				\
-	$(srcdir)/images/box-expand.png					\
-	$(srcdir)/images/button.png					\
-	$(srcdir)/images/check-button.png				\
-	$(srcdir)/images/color-button.png				\
-	$(srcdir)/images/colorchooser.png				\
-	$(srcdir)/images/combo-box.png					\
-	$(srcdir)/images/combo-box-entry.png				\
-	$(srcdir)/images/combo-box-text.png				\
-	$(srcdir)/images/entry.png					\
-	$(srcdir)/images/figure-hierarchical-drawing.png		\
-	$(srcdir)/images/figure-windowed-label.png			\
-	$(srcdir)/images/file-button.png				\
-	$(srcdir)/images/filechooser.png				\
-	$(srcdir)/images/font-button.png				\
-	$(srcdir)/images/fontchooser.png				\
-	$(srcdir)/images/frame.png					\
-	$(srcdir)/images/glarea.png					\
-	$(srcdir)/images/headerbar.png					\
-	$(srcdir)/images/icon-view.png					\
-	$(srcdir)/images/image.png					\
-	$(srcdir)/images/info-bar.png					\
-	$(srcdir)/images/label.png					\
-	$(srcdir)/images/levelbar.png					\
-	$(srcdir)/images/link-button.png				\
-	$(srcdir)/images/list-and-tree.png				\
-	$(srcdir)/images/lock-button.png				\
-	$(srcdir)/images/lockbutton.png	        			\
-	$(srcdir)/images/lockbutton-locked.png				\
-	$(srcdir)/images/lockbutton-unlocked.png			\
-	$(srcdir)/images/lockbutton-sorry.png				\
-	$(srcdir)/images/menubar.png					\
-	$(srcdir)/images/menu-button.png				\
-	$(srcdir)/images/messagedialog.png				\
-	$(srcdir)/images/multiline-text.png				\
-	$(srcdir)/images/notebook.png					\
-	$(srcdir)/images/panes.png					\
-	$(srcdir)/images/pagesetupdialog.png				\
-	$(srcdir)/images/placessidebar.png				\
-	$(srcdir)/images/popup-anchors.png				\
-	$(srcdir)/images/popup-flip.png					\
-	$(srcdir)/images/popup-slide.png				\
-	$(srcdir)/images/printdialog.png				\
-	$(srcdir)/images/progressbar.png				\
-	$(srcdir)/images/radio-group.png				\
-	$(srcdir)/images/recentchooserdialog.png			\
-	$(srcdir)/images/scales.png					\
-	$(srcdir)/images/scrollbar.png					\
-	$(srcdir)/images/scrolledwindow.png				\
-	$(srcdir)/images/search-bar.png					\
-	$(srcdir)/images/search-entry.png				\
-	$(srcdir)/images/separator.png					\
-	$(srcdir)/images/sidebar.png					\
-	$(srcdir)/images/spinbutton.png					\
-	$(srcdir)/images/spinner.png					\
-	$(srcdir)/images/stack.png					\
-	$(srcdir)/images/stackswitcher.png				\
-	$(srcdir)/images/statusbar.png					\
-	$(srcdir)/images/toggle-button.png				\
-	$(srcdir)/images/toolbar.png					\
-	$(srcdir)/images/toolpalette.png				\
-	$(srcdir)/images/tree-view-coordinates.png			\
-	$(srcdir)/images/volumebutton.png				\
-	$(srcdir)/images/window.png					\
-	$(srcdir)/images/layout-btlr.png				\
-	$(srcdir)/images/layout-btrl.png				\
-	$(srcdir)/images/layout-lrbt.png				\
-	$(srcdir)/images/layout-lrtb.png				\
-	$(srcdir)/images/layout-rlbt.png				\
-	$(srcdir)/images/layout-rltb.png				\
-	$(srcdir)/images/layout-tblr.png				\
-	$(srcdir)/images/layout-tbrl.png				\
-	$(srcdir)/images/widget-hvalign.png				\
-	$(srcdir)/images/window-default.png				\
-	$(srcdir)/images/hello-world.png				\
-	$(srcdir)/images/grid-packing.png				\
-	$(srcdir)/images/drawing.png					\
-	$(srcdir)/images/switch.png					\
-	$(srcdir)/images/linear.png					\
-	$(srcdir)/images/ease.png					\
-	$(srcdir)/images/ease-in-out.png				\
-	$(srcdir)/images/ease-in.png					\
-	$(srcdir)/images/ease-out.png					\
-	$(srcdir)/images/gradient1.png					\
-	$(srcdir)/images/gradient2.png					\
-	$(srcdir)/images/gradient3.png					\
-	$(srcdir)/images/gradient4.png					\
-	$(srcdir)/images/border1.png					\
-	$(srcdir)/images/border2.png					\
-	$(srcdir)/images/border3.png					\
-	$(srcdir)/images/slices.png					\
-	$(srcdir)/images/checks.png					\
-	$(srcdir)/images/options.png					\
-	$(srcdir)/images/arrows.png					\
-	$(srcdir)/images/expanders.png					\
-	$(srcdir)/images/background.png					\
-	$(srcdir)/images/frames.png					\
-	$(srcdir)/images/frame-gap.png					\
-	$(srcdir)/images/sliders.png					\
-	$(srcdir)/images/focus.png					\
-	$(srcdir)/images/handles.png					\
-	$(srcdir)/images/extensions.png					\
-	$(srcdir)/images/bloatpad-osx.png				\
-	$(srcdir)/images/bloatpad-gnome.png				\
-	$(srcdir)/images/bloatpad-xfce.png				\
-	$(srcdir)/images/down-center.png				\
-	$(srcdir)/images/down-end.png					\
-	$(srcdir)/images/down-start.png					\
-	$(srcdir)/images/left-center.png				\
-	$(srcdir)/images/left-end.png					\
-	$(srcdir)/images/left-start.png					\
-	$(srcdir)/images/right-center.png				\
-	$(srcdir)/images/right-end.png					\
-	$(srcdir)/images/right-start.png				\
-	$(srcdir)/images/up-center.png					\
-	$(srcdir)/images/up-end.png					\
-	$(srcdir)/images/up-start.png					\
-	$(srcdir)/images/list-box.png					\
-	$(srcdir)/images/getting-started-app1.png			\
-	$(srcdir)/images/getting-started-app2.png			\
-	$(srcdir)/images/getting-started-app3.png			\
-	$(srcdir)/images/getting-started-app4.png			\
-	$(srcdir)/images/getting-started-app6.png			\
-	$(srcdir)/images/getting-started-app7.png			\
-	$(srcdir)/images/getting-started-app8.png			\
-	$(srcdir)/images/getting-started-app9.png			\
-	$(srcdir)/images/getting-started-app10.png			\
-	$(srcdir)/images/exampleapp.png					\
-	$(srcdir)/images/flow-box.png					\
-	$(srcdir)/images/inspector.png					\
-	$(srcdir)/images/gedit-shortcuts.png				\
-	$(srcdir)/images/clocks-shortcuts.png				\
-	$(srcdir)/images/builder-shortcuts.png
-
-if ENABLE_DOC_CROSS_REFERENCES
-# Extra options to supply to gtkdoc-fixref
-FIXXREF_OPTIONS=--extra-dir=../gdk/html \
-	--extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/gobject \
-	--extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/glib \
-	--extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/gio \
-	--extra-dir=$(ATK_PREFIX)/share/gtk-doc/html/atk \
-	--extra-dir=$(PANGO_PREFIX)/share/gtk-doc/html/pango \
-	--extra-dir=$(CAIRO_PREFIX)/share/gtk-doc/html/cairo
-endif
-
-include $(top_srcdir)/gtk-doc.make
-
-# Other files to distribute
-EXTRA_DIST += version.xml.in gtk4.types.in
-
-########################################################################
-
-man_MANS = 				\
-	gtk4-broadwayd.1		\
-	gtk4-builder-tool.1 		\
-	gtk4-demo.1			\
-	gtk4-demo-application.1		\
-	gtk4-encode-symbolic-svg.1	\
-	gtk4-icon-browser.1		\
-	gtk4-launch.1			\
-	gtk4-query-immodules.1		\
-	gtk4-query-settings.1		\
-	gtk4-update-icon-cache.1	\
-	gtk4-widget-factory.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)
-
-if ENABLE_GTK_DOC
-TESTS_ENVIRONMENT = cd $(srcdir) && \
-  DOC_MODULE=$(DOC_MODULE) DOC_MAIN_SGML_FILE=$(DOC_MAIN_SGML_FILE) \
-  SRCDIR=$(abs_srcdir) BUILDDIR=$(abs_builddir)
-#TESTS = $(GTKDOC_CHECK)
-endif
-
-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/docs/tools/Makefile.am b/docs/tools/Makefile.am
deleted file mode 100644
index 1a701ab97e..0000000000
--- a/docs/tools/Makefile.am
+++ /dev/null
@@ -1,45 +0,0 @@
-include $(top_srcdir)/Makefile.decl
-
-AM_CPPFLAGS = \
-	-I$(top_srcdir)			\
-	-I$(top_builddir)/gdk		\
-	-I$(top_srcdir)/gdk		\
-	-I$(top_srcdir)/gdk/x11		\
-	-I$(top_srcdir)/tests		\
-	$(GTK_DEBUG_FLAGS)		\
-	$(GTK_DEP_CFLAGS)
-
-DEPS = \
-	$(top_builddir)/gtk/libgtk-4.la
-
-LDADDS = \
-	$(top_builddir)/gtk/libgtk-4.la	\
-	$(top_builddir)/gdk/libgdk-4.la	\
-	$(top_builddir)/tests/gtkgears.o \
-	$(GTK_DEP_LIBS)			\
-	$(GDK_DEP_LIBS)			\
-	-lm
-
-if USE_X11
-noinst_PROGRAMS = 		\
-	doc-shooter
-endif
-
-doc_shooter_DEPENDENCIES = $(DEPS)
-doc_shooter_LDADD = $(LDADDS)
-doc_shooter_SOURCES =	\
-	shadow.c	\
-	shadow.h	\
-	shooter.c	\
-	widgets.c	\
-	widgets.h
-
-clean-local:
-	for file in *.png; do \
-	  case "$$file" in \
-	    folder.png|gnome.png) ;; \
-	    *) rm -f $$file ;; \
-	  esac ; \
-	done
-
--include $(top_srcdir)/git.mk
diff --git a/examples/Makefile.am b/examples/Makefile.am
deleted file mode 100644
index ae6d51ca03..0000000000
--- a/examples/Makefile.am
+++ /dev/null
@@ -1,34 +0,0 @@
-SUBDIRS = \
-	bp \
-	application1 application2 application3 \
-	application4 application5 application6 \
-	application7 application8 application9 \
-	application10
-
-AM_CPPFLAGS = \
-	-I$(top_srcdir)				\
-	-I$(top_srcdir)/gdk			\
-	-I$(top_builddir)/gdk			\
-	-DGDK_DISABLE_DEPRECATED		\
-	-DGTK_DISABLE_DEPRECATED		\
-	$(GTK_DEBUG_FLAGS)			\
-	$(GTK_DEP_CFLAGS)
-
-LDADD = \
-	$(top_builddir)/gtk/libgtk-4.la	\
-	$(GTK_DEP_LIBS)
-
-noinst_PROGRAMS = \
-	hello-world				\
-	window-default				\
-	plugman					\
-	sunny					\
-	action-namespace			\
-	grid-packing				\
-	drawing					\
-	builder					\
-	search-bar
-
-EXTRA_DIST = builder.ui
-
--include $(top_srcdir)/git.mk
diff --git a/examples/application1/Makefile.am b/examples/application1/Makefile.am
deleted file mode 100644
index 4f7c7f4fca..0000000000
--- a/examples/application1/Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-GTK_CFLAGS = 					\
-	-I$(top_srcdir)				\
-	$(GTK_DEP_CFLAGS)
-
-GTK_LIBS = 					\
-        $(top_builddir)/gtk/libgtk-4.la 	\
-        $(GTK_DEP_LIBS)
-
-
-noinst_PROGRAMS = exampleapp
-
-exampleapp_CFLAGS = $(GTK_CFLAGS)
-exampleapp_LDADD = $(GTK_LIBS)
-exampleapp_SOURCES = 				\
-	main.c 					\
-	exampleapp.c exampleapp.h 		\
-	exampleappwin.c exampleappwin.h
-
--include $(top_srcdir)/git.mk
diff --git a/examples/application10/Makefile.am b/examples/application10/Makefile.am
deleted file mode 100644
index 47b7a11edf..0000000000
--- a/examples/application10/Makefile.am
+++ /dev/null
@@ -1,48 +0,0 @@
-GTK_CFLAGS =			 		\
-	-I$(top_srcdir)				\
-	$(GTK_DEP_CFLAGS)
-
-GTK_LIBS = 					\
-        $(top_builddir)/gtk/libgtk-4.la 	\
-        $(GTK_DEP_LIBS)
-
-
-noinst_PROGRAMS = exampleapp
-
-exampleapp_CFLAGS = $(GTK_CFLAGS)
-exampleapp_LDADD = $(GTK_LIBS)
-exampleapp_SOURCES = 				\
-	main.c 					\
-	exampleapp.c exampleapp.h 		\
-	exampleappwin.c exampleappwin.h 	\
-	exampleappprefs.c exampleappprefs.h 	\
-	resources.c
-
-BUILT_SOURCES = 				\
-	resources.c 				\
-	gschemas.compiled
-
-resources.c: exampleapp.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/exampleapp.gresource.xml)
-	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $(srcdir)/exampleapp.gresource.xml \
-		--target=$@ --sourcedir=$(srcdir) --generate-source
-
-gsettings_SCHEMAS = 				\
-	org.gtk.exampleapp.gschema.xml
-
-@GSETTINGS_RULES@
-
-gschemas.compiled: org.gtk.exampleapp.gschema.xml
-	$(GLIB_COMPILE_SCHEMAS) .
-
-EXTRA_DIST = 					\
-	window.ui 				\
-	app-menu.ui 				\
-	prefs.ui 				\
-	gears-menu.ui 				\
-	exampleapp.gresource.xml 		\
-	org.gtk.exampleapp.gschema.xml
-
-CLEANFILES = 					\
-	gschemas.compiled
-
--include $(top_srcdir)/git.mk
diff --git a/examples/application2/Makefile.am b/examples/application2/Makefile.am
deleted file mode 100644
index 7f2a64c0fc..0000000000
--- a/examples/application2/Makefile.am
+++ /dev/null
@@ -1,30 +0,0 @@
-GTK_CFLAGS =	 				\
-	-I$(top_srcdir)				\
-	$(GTK_DEP_CFLAGS)
-
-GTK_LIBS = 					\
-        $(top_builddir)/gtk/libgtk-4.la 	\
-        $(GTK_DEP_LIBS)
-
-
-noinst_PROGRAMS = exampleapp
-
-exampleapp_CFLAGS = $(GTK_CFLAGS)
-exampleapp_LDADD = $(GTK_LIBS)
-exampleapp_SOURCES = 				\
-	main.c 					\
-	exampleapp.c exampleapp.h 		\
-	exampleappwin.c exampleappwin.h 	\
-	resources.c
-
-BUILT_SOURCES = resources.c
-
-resources.c: exampleapp.gresource.xml window.ui
-	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $(srcdir)/exampleapp.gresource.xml \
-		--target=$@ --sourcedir=$(srcdir) --generate-source
-
-EXTRA_DIST = 					\
-	window.ui 				\
-	exampleapp.gresource.xml
-
--include $(top_srcdir)/git.mk
diff --git a/examples/application3/Makefile.am b/examples/application3/Makefile.am
deleted file mode 100644
index 7f2a64c0fc..0000000000
--- a/examples/application3/Makefile.am
+++ /dev/null
@@ -1,30 +0,0 @@
-GTK_CFLAGS =	 				\
-	-I$(top_srcdir)				\
-	$(GTK_DEP_CFLAGS)
-
-GTK_LIBS = 					\
-        $(top_builddir)/gtk/libgtk-4.la 	\
-        $(GTK_DEP_LIBS)
-
-
-noinst_PROGRAMS = exampleapp
-
-exampleapp_CFLAGS = $(GTK_CFLAGS)
-exampleapp_LDADD = $(GTK_LIBS)
-exampleapp_SOURCES = 				\
-	main.c 					\
-	exampleapp.c exampleapp.h 		\
-	exampleappwin.c exampleappwin.h 	\
-	resources.c
-
-BUILT_SOURCES = resources.c
-
-resources.c: exampleapp.gresource.xml window.ui
-	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $(srcdir)/exampleapp.gresource.xml \
-		--target=$@ --sourcedir=$(srcdir) --generate-source
-
-EXTRA_DIST = 					\
-	window.ui 				\
-	exampleapp.gresource.xml
-
--include $(top_srcdir)/git.mk
diff --git a/examples/application4/Makefile.am b/examples/application4/Makefile.am
deleted file mode 100644
index 9515304ecf..0000000000
--- a/examples/application4/Makefile.am
+++ /dev/null
@@ -1,31 +0,0 @@
-GTK_CFLAGS = 					\
-	-I$(top_srcdir)				\
-	$(GTK_DEP_CFLAGS)
-
-GTK_LIBS = 					\
-        $(top_builddir)/gtk/libgtk-4.la 	\
-        $(GTK_DEP_LIBS)
-
-
-noinst_PROGRAMS = exampleapp
-
-exampleapp_CFLAGS = $(GTK_CFLAGS)
-exampleapp_LDADD = $(GTK_LIBS)
-exampleapp_SOURCES = 				\
-	main.c 					\
-	exampleapp.c exampleapp.h 		\
-	exampleappwin.c exampleappwin.h 	\
-	resources.c
-
-BUILT_SOURCES = resources.c
-
-resources.c: exampleapp.gresource.xml window.ui app-menu.ui
-	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $(srcdir)/exampleapp.gresource.xml \
-		--target=$@ --sourcedir=$(srcdir) --generate-source
-
-EXTRA_DIST = 					\
-	window.ui 				\
-	app-menu.ui 				\
-	exampleapp.gresource.xml
-
--include $(top_srcdir)/git.mk
diff --git a/examples/application5/Makefile.am b/examples/application5/Makefile.am
deleted file mode 100644
index b5f35ca1e1..0000000000
--- a/examples/application5/Makefile.am
+++ /dev/null
@@ -1,45 +0,0 @@
-GTK_CFLAGS = 					\
-	-I$(top_srcdir)				\
-	$(GTK_DEP_CFLAGS)
-
-GTK_LIBS = 					\
-        $(top_builddir)/gtk/libgtk-4.la 	\
-        $(GTK_DEP_LIBS)
-
-
-noinst_PROGRAMS = exampleapp
-
-exampleapp_CFLAGS = $(GTK_CFLAGS)
-exampleapp_LDADD = $(GTK_LIBS)
-exampleapp_SOURCES = 				\
-	main.c 					\
-	exampleapp.c exampleapp.h 		\
-	exampleappwin.c exampleappwin.h 	\
-	resources.c
-
-BUILT_SOURCES = 				\
-	resources.c 				\
-	gschemas.compiled
-
-resources.c: exampleapp.gresource.xml window.ui app-menu.ui
-	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $(srcdir)/exampleapp.gresource.xml \
-		--target=$@ --sourcedir=$(srcdir) --generate-source
-
-gsettings_SCHEMAS = 				\
-	org.gtk.exampleapp.gschema.xml
-
-@GSETTINGS_RULES@
-
-gschemas.compiled: org.gtk.exampleapp.gschema.xml
-	$(GLIB_COMPILE_SCHEMAS) .
-
-EXTRA_DIST = 					\
-	window.ui 				\
-	app-menu.ui 				\
-	exampleapp.gresource.xml 		\
-	org.gtk.exampleapp.gschema.xml
-
-CLEANFILES = 					\
-	gschemas.compiled
-
--include $(top_srcdir)/git.mk
diff --git a/examples/application6/Makefile.am b/examples/application6/Makefile.am
deleted file mode 100644
index e043cd1074..0000000000
--- a/examples/application6/Makefile.am
+++ /dev/null
@@ -1,47 +0,0 @@
-GTK_CFLAGS = 					\
-	-I$(top_srcdir)				\
-	$(GTK_DEP_CFLAGS)
-
-GTK_LIBS = 					\
-        $(top_builddir)/gtk/libgtk-4.la 	\
-        $(GTK_DEP_LIBS)
-
-
-noinst_PROGRAMS = exampleapp
-
-exampleapp_CFLAGS = $(GTK_CFLAGS)
-exampleapp_LDADD = $(GTK_LIBS)
-exampleapp_SOURCES = 				\
-	main.c 					\
-	exampleapp.c exampleapp.h 		\
-	exampleappwin.c exampleappwin.h 	\
-	exampleappprefs.c exampleappprefs.h 	\
-	resources.c
-
-BUILT_SOURCES = 				\
-	resources.c 				\
-	gschemas.compiled
-
-resources.c: exampleapp.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/exampleapp.gresource.xml)
-	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $(srcdir)/exampleapp.gresource.xml \
-		--target=$@ --sourcedir=$(srcdir) --generate-source
-
-gsettings_SCHEMAS = 				\
-	org.gtk.exampleapp.gschema.xml
-
-@GSETTINGS_RULES@
-
-gschemas.compiled: org.gtk.exampleapp.gschema.xml
-	$(GLIB_COMPILE_SCHEMAS) .
-
-EXTRA_DIST = 					\
-	window.ui 				\
-	app-menu.ui 				\
-	prefs.ui 				\
-	exampleapp.gresource.xml 		\
-	org.gtk.exampleapp.gschema.xml
-
-CLEANFILES = 					\
-	gschemas.compiled
-
--include $(top_srcdir)/git.mk
diff --git a/examples/application7/Makefile.am b/examples/application7/Makefile.am
deleted file mode 100644
index e043cd1074..0000000000
--- a/examples/application7/Makefile.am
+++ /dev/null
@@ -1,47 +0,0 @@
-GTK_CFLAGS = 					\
-	-I$(top_srcdir)				\
-	$(GTK_DEP_CFLAGS)
-
-GTK_LIBS = 					\
-        $(top_builddir)/gtk/libgtk-4.la 	\
-        $(GTK_DEP_LIBS)
-
-
-noinst_PROGRAMS = exampleapp
-
-exampleapp_CFLAGS = $(GTK_CFLAGS)
-exampleapp_LDADD = $(GTK_LIBS)
-exampleapp_SOURCES = 				\
-	main.c 					\
-	exampleapp.c exampleapp.h 		\
-	exampleappwin.c exampleappwin.h 	\
-	exampleappprefs.c exampleappprefs.h 	\
-	resources.c
-
-BUILT_SOURCES = 				\
-	resources.c 				\
-	gschemas.compiled
-
-resources.c: exampleapp.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/exampleapp.gresource.xml)
-	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $(srcdir)/exampleapp.gresource.xml \
-		--target=$@ --sourcedir=$(srcdir) --generate-source
-
-gsettings_SCHEMAS = 				\
-	org.gtk.exampleapp.gschema.xml
-
-@GSETTINGS_RULES@
-
-gschemas.compiled: org.gtk.exampleapp.gschema.xml
-	$(GLIB_COMPILE_SCHEMAS) .
-
-EXTRA_DIST = 					\
-	window.ui 				\
-	app-menu.ui 				\
-	prefs.ui 				\
-	exampleapp.gresource.xml 		\
-	org.gtk.exampleapp.gschema.xml
-
-CLEANFILES = 					\
-	gschemas.compiled
-
--include $(top_srcdir)/git.mk
diff --git a/examples/application8/Makefile.am b/examples/application8/Makefile.am
deleted file mode 100644
index 47b7a11edf..0000000000
--- a/examples/application8/Makefile.am
+++ /dev/null
@@ -1,48 +0,0 @@
-GTK_CFLAGS =			 		\
-	-I$(top_srcdir)				\
-	$(GTK_DEP_CFLAGS)
-
-GTK_LIBS = 					\
-        $(top_builddir)/gtk/libgtk-4.la 	\
-        $(GTK_DEP_LIBS)
-
-
-noinst_PROGRAMS = exampleapp
-
-exampleapp_CFLAGS = $(GTK_CFLAGS)
-exampleapp_LDADD = $(GTK_LIBS)
-exampleapp_SOURCES = 				\
-	main.c 					\
-	exampleapp.c exampleapp.h 		\
-	exampleappwin.c exampleappwin.h 	\
-	exampleappprefs.c exampleappprefs.h 	\
-	resources.c
-
-BUILT_SOURCES = 				\
-	resources.c 				\
-	gschemas.compiled
-
-resources.c: exampleapp.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/exampleapp.gresource.xml)
-	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $(srcdir)/exampleapp.gresource.xml \
-		--target=$@ --sourcedir=$(srcdir) --generate-source
-
-gsettings_SCHEMAS = 				\
-	org.gtk.exampleapp.gschema.xml
-
-@GSETTINGS_RULES@
-
-gschemas.compiled: org.gtk.exampleapp.gschema.xml
-	$(GLIB_COMPILE_SCHEMAS) .
-
-EXTRA_DIST = 					\
-	window.ui 				\
-	app-menu.ui 				\
-	prefs.ui 				\
-	gears-menu.ui 				\
-	exampleapp.gresource.xml 		\
-	org.gtk.exampleapp.gschema.xml
-
-CLEANFILES = 					\
-	gschemas.compiled
-
--include $(top_srcdir)/git.mk
diff --git a/examples/application9/Makefile.am b/examples/application9/Makefile.am
deleted file mode 100644
index 47b7a11edf..0000000000
--- a/examples/application9/Makefile.am
+++ /dev/null
@@ -1,48 +0,0 @@
-GTK_CFLAGS =			 		\
-	-I$(top_srcdir)				\
-	$(GTK_DEP_CFLAGS)
-
-GTK_LIBS = 					\
-        $(top_builddir)/gtk/libgtk-4.la 	\
-        $(GTK_DEP_LIBS)
-
-
-noinst_PROGRAMS = exampleapp
-
-exampleapp_CFLAGS = $(GTK_CFLAGS)
-exampleapp_LDADD = $(GTK_LIBS)
-exampleapp_SOURCES = 				\
-	main.c 					\
-	exampleapp.c exampleapp.h 		\
-	exampleappwin.c exampleappwin.h 	\
-	exampleappprefs.c exampleappprefs.h 	\
-	resources.c
-
-BUILT_SOURCES = 				\
-	resources.c 				\
-	gschemas.compiled
-
-resources.c: exampleapp.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/exampleapp.gresource.xml)
-	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $(srcdir)/exampleapp.gresource.xml \
-		--target=$@ --sourcedir=$(srcdir) --generate-source
-
-gsettings_SCHEMAS = 				\
-	org.gtk.exampleapp.gschema.xml
-
-@GSETTINGS_RULES@
-
-gschemas.compiled: org.gtk.exampleapp.gschema.xml
-	$(GLIB_COMPILE_SCHEMAS) .
-
-EXTRA_DIST = 					\
-	window.ui 				\
-	app-menu.ui 				\
-	prefs.ui 				\
-	gears-menu.ui 				\
-	exampleapp.gresource.xml 		\
-	org.gtk.exampleapp.gschema.xml
-
-CLEANFILES = 					\
-	gschemas.compiled
-
--include $(top_srcdir)/git.mk
diff --git a/examples/bp/Makefile.am b/examples/bp/Makefile.am
deleted file mode 100644
index 72dff40bc2..0000000000
--- a/examples/bp/Makefile.am
+++ /dev/null
@@ -1,32 +0,0 @@
-AM_CPPFLAGS = \
-	-DSRCDIR=\"$(abs_srcdir)\"	\
-	-I$(top_srcdir)			\
-	-I$(top_srcdir)/gdk		\
-	-I$(top_builddir)/gdk		\
-	$(GTK_DEBUG_FLAGS)		\
-	$(GTK_DEP_CFLAGS)
-
-LDADD = \
-        $(top_builddir)/gtk/libgtk-4.la \
-        $(top_builddir)/gdk/libgdk-4.la \
-        $(GTK_DEP_LIBS)
-
-noinst_PROGRAMS = bloatpad
-
-
-bloatpad_SOURCES = bloatpad.c
-nodist_bloatpad_SOURCES = bloatpad-gresources.c
-
-resource_files = \
-	bloatpad.gresources.xml		\
-	gtk/menus.ui			\
-	gtk/help-overlay.ui
-
-bloatpad-gresources.c: $(resource_files)
-	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-source $<
-
-CLEANFILES = bloatpad-gresources.c
-
-EXTRA_DIST = $(resource_files)
-
--include $(top_srcdir)/git.mk
diff --git a/gdk/Makefile.am b/gdk/Makefile.am
deleted file mode 100644
index d830cef1be..0000000000
--- a/gdk/Makefile.am
+++ /dev/null
@@ -1,548 +0,0 @@
-## Makefile.am for gtk+/gdk
-include $(top_srcdir)/Makefile.decl
--include $(INTROSPECTION_MAKEFILE)
-INTROSPECTION_GIRS =
-INTROSPECTION_SCANNER_ENV = \
-   CC="$(CC)"
-INTROSPECTION_SCANNER_ARGS = \
-	--add-include-path=../gdk \
-	--warn-all
-INTROSPECTION_COMPILER_ARGS = \
-   --includedir=$(srcdir) \
-   --includedir=.
-
-SUBDIRS = $(GDK_BACKENDS) .
-
-DIST_SUBDIRS = win32 x11 quartz broadway wayland mir
-
-CLEANFILES =
-
-EXTRA_DIST += 			\
-	keynames.txt		\
-	keynames-translate.txt	\
-	keyname-table.h		\
-	gdkkeynames.c		\
-	gen-keyname-table.pl	\
-	gdkconfig.h.win32	\
-	gdkconfig.h.win32_vulkan	\
-	gdkkeysyms-update.pl	\
-	gdkmarshalers.list	\
-	gdkwindowimpl.h		\
-	makefile.msc		\
-	gdkenumtypes.c.template	\
-	gdkenumtypes.h.template	\
-	gdkversionmacros.h.in
-
-GDK_CFLAGS_DEFINES =	\
-	-DG_LOG_DOMAIN=\"Gdk\"		\
-	-DG_LOG_USE_STRUCTURED=1	\
-	-DGDK_COMPILATION
-
-
-AM_CPPFLAGS =				\
-	$(GDK_CFLAGS_DEFINES)		\
-	-I$(top_builddir)		\
-	-I$(top_builddir)/gdk		\
-	-I$(top_srcdir)			\
-	$(GTK_DEBUG_FLAGS)		\
-	$(GDK_DEP_CFLAGS)
-
-#
-# setup source file variables
-#
-#
-#
-#GDK header files for public installation (non-generated)
-#
-#
-gdk_public_h_sources = 				\
-	gdk.h					\
-	gdk-autocleanup.h			\
-	gdkapplaunchcontext.h			\
-	gdkcairo.h				\
-	gdkcursor.h				\
-	gdkdevice.h				\
-	gdkdevicepad.h				\
-	gdkdevicetool.h				\
-	gdkdevicemanager.h			\
-	gdkdisplay.h				\
-	gdkdisplaymanager.h			\
-	gdkdnd.h				\
-	gdkdrawcontext.h			\
-	gdkdrawingcontext.h			\
-	gdkevents.h				\
-	gdkframetimings.h			\
-	gdkglcontext.h				\
-	gdkkeys.h				\
-	gdkkeysyms.h				\
-	gdkmain.h				\
-	gdkmonitor.h				\
-	gdkpango.h				\
-	gdkframeclock.h				\
-	gdkpixbuf.h				\
-	gdkprivate.h				\
-	gdkproperty.h				\
-	gdkrectangle.h				\
-	gdkrgba.h				\
-	gdkscreen.h				\
-	gdkseat.h				\
-	gdkselection.h				\
-	gdkthreads.h				\
-	gdktypes.h				\
-	gdkvisual.h				\
-	gdkvulkancontext.h			\
-	gdkwindow.h
-
-gdk_h_sources =					\
-	$(gdk_public_h_sources)
-
-gdk_private_headers = 				\
-	gdk-private.h				\
-	gdkapplaunchcontextprivate.h		\
-	gdkcursorprivate.h			\
-	gdkdevicemanagerprivate.h		\
-	gdkdeviceprivate.h			\
-	gdkdevicepadprivate.h			\
-	gdkdevicetoolprivate.h			\
-	gdkdisplaymanagerprivate.h		\
-	gdkdisplayprivate.h			\
-	gdkdndprivate.h				\
-	gdkdrawcontextprivate.h			\
-	gdkdrawingcontextprivate.h		\
-	gdkframeclockidle.h			\
-	gdkframeclockprivate.h			\
-	gdkglcontextprivate.h			\
-	gdkmonitorprivate.h			\
-	gdkscreenprivate.h			\
-	gdkseatprivate.h			\
-	gdkseatdefaultprivate.h			\
-	gdkinternals.h				\
-	gdkintl.h				\
-	gdkkeysprivate.h			\
-	gdkvisualprivate.h			\
-	gdkvulkancontextprivate.h		\
-	gdkx.h
-
-gdk_c_sources = 				\
-	gdk.c					\
-	gdkapplaunchcontext.c			\
-	gdkcairo.c				\
-	gdkcursor.c				\
-	gdkdeprecated.c				\
-	gdkdevice.c				\
-	gdkdevicepad.c				\
-	gdkdevicetool.c				\
-	gdkdevicemanager.c			\
-	gdkdisplay.c				\
-	gdkdisplaymanager.c			\
-	gdkdnd.c				\
-	gdkdrawcontext.c			\
-	gdkdrawingcontext.c			\
-	gdkevents.c     			\
-	gdkframetimings.c			\
-	gdkgl.c					\
-	gdkglcontext.c				\
-	gdkglobals.c				\
-	gdkkeys.c				\
-	gdkkeyuni.c				\
-	gdkmonitor.c				\
-	gdkframeclock.c				\
-	gdkframeclockidle.c			\
-	gdkpango.c				\
-	gdkpixbuf-drawable.c			\
-	gdkproperty.c				\
-	gdkrectangle.c				\
-	gdkrgba.c				\
-	gdkscreen.c				\
-	gdkseat.c				\
-	gdkseatdefault.c			\
-	gdkselection.c				\
-	gdkvisual.c				\
-	gdkvulkancontext.c			\
-	gdkwindow.c				\
-	gdkwindowimpl.c
-
-gdk_built_sources = 				\
-	gdkenumtypes.h				\
-	gdkenumtypes.c				\
-	gdkmarshalers.h 			\
-	gdkmarshalers.c				\
-	gdkresources.h				\
-	gdkresources.c				\
-	gdkversionmacros.h
-
-#
-# setup GDK sources and their dependencies
-#
-
-gdkincludedir = $(includedir)/gtk-4.0/gdk
-gdkinclude_HEADERS = $(gdk_public_h_sources)
-nodist_gdkinclude_HEADERS = gdkconfig.h gdkenumtypes.h gdkversionmacros.h
-
-deprecatedincludedir = $(includedir)/gtk-4.0/gdk/deprecated
-deprecatedinclude_HEADERS = $(deprecated_h_sources)
-
-common_sources = 		\
-	$(gdk_private_headers)	\
-	$(gdk_c_sources)	\
-	gdkenumtypes.c		\
-	gdkmarshalers.c		\
-	gdkmarshalers.h		\
-	gdkresources.h		\
-	gdkresources.c
-
-libgdk_4_la_SOURCES = $(common_sources)
-libgdk_4_la_CFLAGS = $(AM_CFLAGS) $(GTK_WARN_CFLAGS) $(GDK_HIDDEN_VISIBILITY_CFLAGS)
-libgdk_4_la_LIBADD = $(GDK_DEP_LIBS) $(SHM_LIBS)
-libgdk_4_la_LDFLAGS = $(LDADD)
-
-if USE_X11
-libgdk_4_la_LIBADD += x11/libgdk-x11.la
-endif # USE_X11
-
-if USE_QUARTZ
-libgdk_4_la_CFLAGS += -xobjective-c
-libgdk_4_la_LIBADD += quartz/libgdk-quartz.la
-endif # USE_QUARTZ
-
-if USE_WIN32
-libgdk_4_la_LIBADD += win32/libgdk-win32.la
-endif # USE_WIN32
-
-if USE_BROADWAY
-libgdk_4_la_LIBADD += broadway/libgdk-broadway.la
-endif # USE_BROADWAY
-
-if USE_WAYLAND
-libgdk_4_la_LIBADD += wayland/libgdk-wayland.la
-endif
-
-if USE_MIR
-libgdk_4_la_LIBADD += mir/libgdk-mir.la
-endif
-
-if HAVE_INTROSPECTION
-
-introspection_files = \
-	$(gdk_h_sources) \
-	$(gdk_c_sources) \
-        gdkenumtypes.c \
-        gdkenumtypes.h \
-	$()
-
-Gdk-noinst-4.0.gir: libgdk-4.la Makefile
-Gdk_noinst_4_0_gir_SCANNERFLAGS = 	\
-	--c-include="gdk/gdk.h"
-Gdk_noinst_4_0_gir_INCLUDES = Gio-2.0 GdkPixbuf-2.0 Pango-1.0 cairo-1.0
-Gdk_noinst_4_0_gir_LIBS = libgdk-4.la
-Gdk_noinst_4_0_gir_FILES = $(introspection_files)
-Gdk_noinst_4_0_gir_CFLAGS = $(AM_CPPFLAGS)
-Gdk_noinst_4_0_gir_EXPORT_PACKAGES = gdk-4.0
-INTROSPECTION_GIRS += Gdk-noinst-4.0.gir
-if OS_WIN32
-Gdk_noinst_4_0_gir_CFLAGS += -I$(srcdir)/win32 -I$(srcdir)
-endif
-if USE_X11
-x11_introspection_files = 		\
-	x11/gdkapplaunchcontext-x11.c	\
-	x11/gdkasync.c			\
-	x11/gdkcursor-x11.c		\
-	x11/gdkdevice-core-x11.c	\
-	x11/gdkdevicemanager-core-x11.c	\
-	x11/gdkdevicemanager-x11.c	\
-	x11/gdkdevicemanager-xi2.c	\
-	x11/gdkdevice-xi2.c		\
-	x11/gdkdisplay-x11.c		\
-	x11/gdkdnd-x11.c		\
-	x11/gdkeventsource.c		\
-	x11/gdkeventtranslator.c	\
-	x11/gdkgeometry-x11.c		\
-	x11/gdkkeys-x11.c		\
-	x11/gdkmain-x11.c		\
-	x11/gdkproperty-x11.c		\
-	x11/gdkscreen-x11.c		\
-	x11/gdkselection-x11.c		\
-	x11/gdksettings.c		\
-	x11/gdkvisual-x11.c		\
-	x11/gdkwindow-x11.c		\
-	x11/gdkxftdefaults.c		\
-	x11/gdkxid.c			\
-	x11/xsettings-client.c		\
-	x11/gdkx.h			\
-	x11/gdkx11applaunchcontext.h	\
-	x11/gdkx11cursor.h		\
-	x11/gdkx11device.h		\
-	x11/gdkx11device-core.h		\
-	x11/gdkx11device-xi2.h		\
-	x11/gdkx11devicemanager.h	\
-	x11/gdkx11devicemanager-core.h	\
-	x11/gdkx11devicemanager-xi2.h	\
-	x11/gdkx11display.h		\
-	x11/gdkx11dnd.h			\
-	x11/gdkx11keys.h		\
-	x11/gdkx11property.h		\
-	x11/gdkx11screen.h		\
-	x11/gdkx11selection.h		\
-	x11/gdkx11utils.h		\
-	x11/gdkx11visual.h		\
-	x11/gdkx11window.h
-
-GdkX11-noinst-4.0.gir: libgdk-4.la Gdk-noinst-4.0.gir Makefile
-GdkX11_noinst_4_0_gir_SCANNERFLAGS = 		\
-	--identifier-prefix=Gdk		\
-	--c-include="gdk/gdkx.h"	\
-	--include-uninstalled=$(top_builddir)/gdk/Gdk-noinst-4.0.gir
-GdkX11_noinst_4_0_gir_INCLUDES = Gio-2.0 GdkPixbuf-2.0 Pango-1.0 xlib-2.0
-GdkX11_noinst_4_0_gir_LIBS = libgdk-4.la
-GdkX11_noinst_4_0_gir_FILES = $(x11_introspection_files)
-GdkX11_noinst_4_0_gir_CFLAGS = $(AM_CPPFLAGS) -L$(top_builddir)/gdk
-GdkX11_noinst_4_0_gir_EXPORT_PACKAGES = gdk-x11-4.0
-INTROSPECTION_GIRS += GdkX11-noinst-4.0.gir
-
-endif # USE_X11
-
-w32_introspection_files =		\
-	win32/gdkcursor-win32.c		\
-	win32/gdkdevicemanager-win32.c	\
-	win32/gdkdevice-virtual.c	\
-	win32/gdkdevice-win32.c		\
-	win32/gdkdevice-wintab.c	\
-	win32/gdkdisplaymanager-win32.c	\
-	win32/gdkdisplay-win32.c	\
-	win32/gdkdnd-win32.c		\
-	win32/gdkevents-win32.c		\
-	win32/gdkgeometry-win32.c	\
-	win32/gdkglobals-win32.c	\
-	win32/gdkkeys-win32.c		\
-	win32/gdkmain-win32.c		\
-	win32/gdkproperty-win32.c	\
-	win32/gdkscreen-win32.c		\
-	win32/gdkselection-win32.c	\
-	win32/gdkwin32.h		\
-	win32/gdkwin32cursor.h		\
-	win32/gdkwin32display.h		\
-	win32/gdkwin32displaymanager.h	\
-	win32/gdkwin32dnd.h		\
-	win32/gdkwin32id.c		\
-	win32/gdkwin32keys.h		\
-	win32/gdkwin32misc.h		\
-	win32/gdkwin32screen.h		\
-	win32/gdkwin32window.h		\
-	win32/gdkwindow-win32.c
-
-if OS_WIN32
-GdkWin32-noinst-4.0.gir: libgdk-4.la Gdk-noinst-4.0.gir Makefile
-GdkWin32_noinst_4_0_gir_SCANNERFLAGS = \
-	--identifier-prefix=Gdk		\
-	--c-include="gdk/gdkwin32.h"	\
-	--include-uninstalled=$(top_builddir)/gdk/Gdk-noinst-4.0.gir
-GdkWin32_noinst_4_0_gir_INCLUDES = Gio-2.0 GdkPixbuf-2.0 Pango-1.0
-GdkWin32_noinst_4_0_gir_LIBS = libgdk-4.la
-GdkWin32_noinst_4_0_gir_FILES = $(w32_introspection_files)
-GdkWin32_noinst_4_0_gir_CFLAGS = $(AM_CPPFLAGS) -L$(top_builddir)/gdk -I$(srcdir)/win32 -I$(srcdir)
-INTROSPECTION_GIRS += GdkWin32-noinst-4.0.gir
-
-endif # OS_WIN32
-
-noinst_DATA = $(INTROSPECTION_GIRS)
-
-CLEANFILES += $(INTROSPECTION_GIRS)
-
-endif # HAVE_INTROSPECTION
-
-if OS_WIN32
-gdk.def: libgdk-4.la
-	echo "LIBRARY libgdk-$(GTK_MAJOR_VERSION)-@LT_CURRENT_MINUS_AGE@" >$@
-	echo "EXPORTS" >>$@
-	objdump -p .libs/libgdk-$(GTK_MAJOR_VERSION)-@LT_CURRENT_MINUS_AGE@.dll | sed -n -e 's/\t\[\s\+\([0-9]\+\)\]\s\([A-Za-z_][A-Za-z0-9_]\)/\2/p' >>$@
-install-def-file: gdk.def
-	mkdir -p $(DESTDIR)$(libdir)
-	$(INSTALL) gdk.def $(DESTDIR)$(libdir)/gdk-win32-4.0.def
-uninstall-def-file:
-	-rm $(DESTDIR)$(libdir)/gdk-win32-4.0.def
-else
-install-def-file:
-uninstall-def-file:
-endif
-
-if MS_LIB_AVAILABLE
-noinst_DATA = gdk-win32-$(GTK_API_VERSION).lib
-
-gdk-win32-$(GTK_API_VERSION).lib: libgdk-4.la gdk.def
-	lib -machine:@LIB_EXE_MACHINE_FLAG@ -name:libgdk-win32-$(GTK_API_VERSION)-@LT_CURRENT_MINUS_AGE@.dll -def:gdk.def -out:$@
-
-install-ms-lib:
-	mkdir -p $(DESTDIR)$(libdir)
-	$(INSTALL) gdk-win32-$(GTK_API_VERSION).lib $(DESTDIR)$(libdir)
-
-uninstall-ms-lib:
-	-rm $(DESTDIR)$(libdir)/gdk-win32-$(GTK_API_VERSION).lib
-else
-install-ms-lib:
-uninstall-ms-lib:
-endif
-
-noinst_LTLIBRARIES = libgdk-4.la
-
-MAINTAINERCLEANFILES = $(gdk_built_sources) stamp-gdkenumtypes.h
-EXTRA_DIST += \
-	$(gdk_built_sources)	\
-	fallback-c89.c
-
-install-exec-hook:
-if DISABLE_EXPLICIT_DEPS
-	$(SHELL) $(top_srcdir)/sanitize-la.sh $(DESTDIR)$(libdir)/libgdk-4.la
-endif
-
-BUILT_SOURCES = \
-	$(gdk_built_sources)			\
-	gdkconfig.h
-
-gdkenumtypes.h: stamp-gdkenumtypes.h
-	@true
-stamp-gdkenumtypes.h: $(gdk_h_sources) gdkenumtypes.h.template
-	$(AM_V_GEN) ( cd $(srcdir) && $(GLIB_MKENUMS) --template gdkenumtypes.h.template \
-		$(gdk_h_sources) ) >> xgen-geth \
-	&& (cmp -s xgen-geth gdkenumtypes.h || cp xgen-geth gdkenumtypes.h ) \
-	&& rm -f xgen-geth \
-	&& echo timestamp > $(@F)
-gdkenumtypes.c: $(gdk_h_sources) gdkenumtypes.c.template
-	$(AM_V_GEN) ( cd $(srcdir) && $(GLIB_MKENUMS) --template gdkenumtypes.c.template \
-		$(gdk_h_sources) ) > xgen-getc \
-	&& cp xgen-getc gdkenumtypes.c  \
-	&& rm -f xgen-getc
-
-#
-# Marshaller generation
-#
-gdkmarshalers.h: gdkmarshalers.list
-	$(AM_V_GEN) $(GLIB_GENMARSHAL) \
-		--prefix=_gdk_marshal \
-		--header \
-		$(srcdir)/gdkmarshalers.list > gdkmarshalers-h.tmp \
-	&& mv gdkmarshalers-h.tmp gdkmarshalers.h \
-	|| ( rm -f gdkmarshalers-h.tmp && exit 1)
-gdkmarshalers.c: gdkmarshalers.list
-	$(AM_V_GEN) $(GLIB_GENMARSHAL) \
-		--prefix=_gdk_marshal \
-		--body \
-		--prototypes \
-		$(srcdir)/gdkmarshalers.list > gdkmarshalers-c.tmp	\
-	&& mv gdkmarshalers-c.tmp gdkmarshalers.c \
-	|| ( rm -f gdkmarshalers-c.tmp && exit 1 )
-
-gdkconfig.h: stamp-gc-h
-	$(AM_V_GEN) if test -f gdkconfig.h; then :; \
-	else rm -f stamp-gc-h; $(MAKE) stamp-gc-h; fi
-stamp-gc-h: $(top_builddir)/config.status
-	$(AM_V_at) cd $(top_builddir) && $(SHELL) ./config.status gdk/gdkconfig.h \
-	&& echo timestamp > gdk/$(@F)
-
-#
-# Resources
-#
-
-glsl_sources := $(wildcard $(srcdir)/resources/glsl/*.glsl)
-
-gdk.gresource.xml: Makefile.am
-	$(AM_V_GEN) echo "<?xml version='1.0' encoding='UTF-8'?>" > $@; \
-	echo "<gresources>" >> $@; \
-	echo "  <gresource prefix='/org/gtk/libgdk'>" >> $@; \
-	for f in $(glsl_sources); do \
-	  n=`basename $$f`; \
-	  echo "    <file alias='glsl/$$n'>resources/glsl/$$n</file>" >> $@; \
-	done; \
-	echo "  </gresource>" >> $@; \
-	echo "</gresources>" >> $@;
-
-EXTRA_DIST += $(glsl_sources)
-CLEANFILES += gdk.gresource.xml
-
-resource_files = $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(builddir)/gdk.gresource.xml)
-
-gdkresources.h: gdk.gresource.xml
-	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $< --target=$@ \
-		--sourcedir=$(srcdir) --c-name _gdk --generate-header --manual-register
-gdkresources.c: gdk.gresource.xml $(resource_files)
-	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $< --target=$@ \
-		--sourcedir=$(srcdir) --c-name _gdk --generate-source --manual-register
-
-# ------------------- MSVC Build Items ----------------
-MSVCPROJS = gdk-4
-
-gdk_4_FILES = $(libgdk_4_la_SOURCES)
-gdk_4_EXCLUDES = dummy
-gdk_4_HEADERS_DIR = $(gdkincludedir)
-
-gdk_4_HEADERS_INST = \
-	$(gdkinclude_HEADERS)		\
-	$(deprecatedinclude_HEADERS)	\
-	$(nodist_gdkinclude_HEADERS)
-
-gdk_4_HEADERS_EXCLUDES = dummy
-
-include $(top_srcdir)/win32/Makefile.msvcproj
-
-if HAVE_INTROSPECTION
-# Introspection Items for MSVC
-MSVC_INTROSPECT_GIRS = Gdk-4.0.gir GdkWin32-4.0.gir
-
-BASE_MSVC_GIR_CFLAGS =			\
-	$(GDK_CFLAGS_DEFINES)		\
-	-I../.. -I../../gdk -I.../../gdk/win32
-
-INTROSPECTION_INTERMEDIATE_ITEMS = \
-	$(top_builddir)/win32/Gdk-4.0.gir.msvc.introspect	\
-	$(top_builddir)/win32/Gdk_4_0_gir_list			\
-	$(top_builddir)/win32/GdkWin32-4.0.gir.msvc.introspect	\
-	$(top_builddir)/win32/GdkWin32_4_0_gir_list
-
-Gdk_4_0_gir_MSVC_FILES = $(introspection_files)
-Gdk_4_0_gir_MSVC_EXPORT_PACKAGES = $(Gdk_noinst_4_0_gir_EXPORT_PACKAGES)
-Gdk_4_0_gir_MSVC_INCLUDE_GIRS = $(Gdk_noinst_4_0_gir_INCLUDES)
-Gdk_4_0_gir_MSVC_LIBS = gtk-4
-Gdk_4_0_gir_MSVC_CFLAGS = $(BASE_MSVC_GIR_CFLAGS)
-Gdk_4_0_gir_MSVC_SCANNERFLAGS = $(Gdk_noinst_4_0_gir_SCANNERFLAGS)
-
-GdkWin32_4_0_gir_MSVC_FILES = $(w32_introspection_files)
-GdkWin32_4_0_gir_MSVC_INCLUDE_GIRS = $(GdkWin32_noinst_4_0_gir_INCLUDES)
-GdkWin32_4_0_gir_MSVC_LIBS = $(Gdk_4_0_gir_MSVC_LIBS)
-GdkWin32_4_0_gir_MSVC_CFLAGS = $(BASE_MSVC_GIR_CFLAGS)
-GdkWin32_4_0_gir_MSVC_SCANNERFLAGS =	\
-	--identifier-prefix=Gdk		\
-	--c-include="gdk/gdkwin32.h"	\
-	--include-uninstalled=./Gdk-4.0.gir
-
-include $(top_srcdir)/win32/Makefile.msvc-introspection
-
-else
-INTROSPECTION_INTERMEDIATE_ITEMS =
-endif
-
-dist-hook: \
-	$(top_builddir)/win32/vs12/gdk-4.vcxproj	\
-	$(top_builddir)/win32/vs12/gdk-4.vs12.headers	\
-	$(INTROSPECTION_INTERMEDIATE_ITEMS)
-
-DISTCLEANFILES = gdkconfig.h stamp-gc-h
-
-install-data-local: install-ms-lib install-def-file
-
-uninstall-local: uninstall-ms-lib uninstall-def-file
-	rm -f $(DESTDIR)$(configexecincludedir)/gdkconfig.h
-
-# 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
-
-.PHONY: files
-
-files:
-	@files=`ls $(DISTFILES) 2> /dev/null `; for p in $$files; do \
-	  echo $$p; \
-	done
-
--include $(top_srcdir)/git.mk
diff --git a/gdk/broadway/Makefile.am b/gdk/broadway/Makefile.am
deleted file mode 100644
index 05fd5b1e6f..0000000000
--- a/gdk/broadway/Makefile.am
+++ /dev/null
@@ -1,107 +0,0 @@
-## Process this file with automake to produce Makefile.in
-include $(top_srcdir)/Makefile.decl
-NULL =
-
-libgdkincludedir = $(includedir)/gtk-4.0/gdk
-libgdkbroadwayincludedir = $(includedir)/gtk-4.0/gdk/broadway
-
-AM_CPPFLAGS =				\
-	-DG_LOG_DOMAIN=\"Gdk\"		\
-	-DG_LOG_USE_STRUCTURED=1	\
-	-DGDK_COMPILATION		\
-	-I$(top_srcdir)			\
-	-I$(top_srcdir)/gdk		\
-	-I$(top_builddir)/gdk		\
-	$(GDK_HIDDEN_VISIBILITY_CFLAGS) \
-	$(GTK_DEBUG_FLAGS)		\
-	$(GDK_DEP_CFLAGS)
-
-LDADDS = $(GDK_DEP_LIBS) -lrt
-
-noinst_LTLIBRARIES = libgdk-broadway.la
-
-bin_PROGRAMS = gtk4-broadwayd
-
-libgdkinclude_HEADERS = 	\
-	gdkbroadway.h
-
-libgdkbroadwayinclude_HEADERS = 	\
-	gdkbroadwaydisplay.h		\
-	gdkbroadwaywindow.h		\
-	gdkbroadwaycursor.h		\
-	gdkbroadwaymonitor.h
-
-EXTRA_DIST += toarray.pl
-
-clienthtml.h: client.html
-	$(AM_V_GEN) $(PERL) $(srcdir)/toarray.pl client_html $(srcdir)/client.html > $@
-
-EXTRA_DIST += client.html
-
-broadwayjs.h: broadway.js rawinflate.min.js
-	$(AM_V_GEN) $(PERL) $(srcdir)/toarray.pl broadway_js $(srcdir)/broadway.js $(srcdir)/rawinflate.min.js  > $@
-
-EXTRA_DIST += broadway.js rawinflate.min.js
-
-# built headers that don't get installed
-broadway_built_private_headers =	\
-	clienthtml.h			\
-	broadwayjs.h
-
-broadway_built_sources =		\
-	${broadway_built_private_headers}
-
-libgdk_broadway_la_SOURCES =		\
-	${broadway_built_private_headers}\
-	gdkcursor-broadway.c	\
-	gdkdevice-broadway.h	\
-	gdkdevice-broadway.c	\
-	gdkdevicemanager-broadway.h \
-	gdkdevicemanager-broadway.c \
-	gdkdisplay-broadway.c	\
-	gdkdisplay-broadway.h	\
-	gdkdnd-broadway.c	\
-	gdkeventsource.c	\
-	gdkeventsource.h	\
-	gdkglobals-broadway.c	\
-	gdkkeys-broadway.c	\
-	gdkmonitor-broadway.c	\
-	gdkmonitor-broadway.h	\
-	gdkproperty-broadway.c	\
-	gdkscreen-broadway.c	\
-	gdkscreen-broadway.h	\
-	gdkselection-broadway.c	\
-	gdkwindow-broadway.c	\
-	gdkwindow-broadway.h	\
-	gdkprivate-broadway.h   \
-	gdkbroadway-server.h	\
-	gdkbroadway-server.c
-
-if OS_UNIX
-libgdk_broadway_la_LIBADD = \
-	$(SHM_LIBS)         \
-	$(NULL)
-endif
-
-gtk4_broadwayd_SOURCES = \
-	broadway-protocol.h		\
-	broadwayd.c 			\
-	broadway-server.h		\
-	broadway-server.c		\
-	broadway-buffer.c		\
-	broadway-buffer.h		\
-	broadway-output.h		\
-	broadway-output.c
-
-if OS_WIN32
-gtk4_broadwayd_LDADD = $(GDK_DEP_LIBS) -lws2_32
-else
-gtk4_broadwayd_LDADD = $(GDK_DEP_LIBS) @SHM_LIBS@
-endif
-
-MAINTAINERCLEANFILES = $(broadway_built_sources)
-EXTRA_DIST += $(broadway_built_sources)
-
-BUILT_SOURCES = $(broadway_built_sources)
-
--include $(top_srcdir)/git.mk
diff --git a/gdk/mir/Makefile.am b/gdk/mir/Makefile.am
deleted file mode 100644
index 654b8f9bb8..0000000000
--- a/gdk/mir/Makefile.am
+++ /dev/null
@@ -1,42 +0,0 @@
-## Process this file with automake to produce Makefile.in
-include $(top_srcdir)/Makefile.decl
-
-libgdkincludedir = $(includedir)/gtk-4.0/gdk
-libgdkmirincludedir = $(includedir)/gtk-4.0/gdk/mir
-
-AM_CPPFLAGS = \
-	-DG_LOG_DOMAIN=\"Gdk\" \
-	-DG_LOG_USE_STRUCTURED=1	\
-	-DGDK_COMPILATION \
-	-I$(top_srcdir) \
-	-I$(top_srcdir)/gdk \
-	-I$(top_builddir)/gdk \
-	$(GDK_HIDDEN_VISIBILITY_CFLAGS) \
-	$(GTK_DEBUG_FLAGS) \
-	$(GDK_DEP_CFLAGS)
-
-LDADDS = $(GDK_DEP_LIBS)
-
-noinst_LTLIBRARIES = \
-	libgdk-mir.la
-
-libgdk_mir_la_SOURCES =	\
-	gdkmircursor.c \
-	gdkmirdevicemanager.c \
-	gdkmirdisplay.c \
-	gdkmireventsource.c	\
-	gdkmirglcontext.c \
-	gdkmirkeyboard.c \
-	gdkmirkeymap.c \
-	gdkmirpointer.c \
-	gdkmirscreen.c	\
-	gdkmirwindow.c	\
-	gdkmirwindowimpl.c	\
-	gdkmir-debug.c	\
-	gdkmir-private.h \
-	gdkmir.h
-
-libgdkinclude_HEADERS = \
-	gdkmir.h
-
--include $(top_srcdir)/git.mk
diff --git a/gdk/quartz/Makefile.am b/gdk/quartz/Makefile.am
deleted file mode 100644
index 66ebbb50ad..0000000000
--- a/gdk/quartz/Makefile.am
+++ /dev/null
@@ -1,72 +0,0 @@
-include $(top_srcdir)/Makefile.decl
-
-libgdkincludedir = $(includedir)/gtk-4.0/gdk
-libgdkquartzincludedir = $(includedir)/gtk-4.0/gdk/quartz
-
-AM_CPPFLAGS = 				\
-	-DG_LOG_DOMAIN=\"Gdk\"		\
-	-DG_LOG_USE_STRUCTURED=1	\
-	-DGDK_COMPILATION		\
-	-I$(top_srcdir)			\
-	-I$(top_srcdir)/gdk		\
-	-I$(top_builddir)/gdk		\
-	$(GDK_HIDDEN_VISIBILITY_CFLAGS) \
-	$(GTK_DEBUG_FLAGS) 		\
-	$(GDK_DEP_CFLAGS)		\
-	"-xobjective-c"
-
-LDADDS = $(GDK_DEP_LIBS)
-
-noinst_LTLIBRARIES = libgdk-quartz.la
-
-libgdk_quartz_la_SOURCES =    	\
-	GdkQuartzView.c		\
-	GdkQuartzView.h		\
-	GdkQuartzNSWindow.c	\
-	GdkQuartzNSWindow.h	\
-	gdkcursor-quartz.c	\
-	gdkdevice-core-quartz.c	\
-	gdkdevicemanager-core-quartz.c	\
-	gdkdevicemanager-core-quartz.h	\
-	gdkdisplay-quartz.c	\
-	gdkdisplay-quartz.h	\
-	gdkdisplaymanager-quartz.c	\
-	gdkdnd-quartz.c		\
-	gdkdnd-quartz.h		\
-	gdkevents-quartz.c	\
-	gdkeventloop-quartz.c	\
-	gdkglcontext-quartz.c	\
-	gdkglcontext-quartz.h	\
-	gdkglobals-quartz.c	\
-	gdkkeys-quartz.c	\
-	gdkmonitor-quartz.c     \
-	gdkmonitor-quartz.h     \
-	gdkprivate-quartz.h	\
-	gdkproperty-quartz.c	\
-	gdkquartz.h		\
-	gdkscreen-quartz.c	\
-	gdkscreen-quartz.h	\
-	gdkselection-quartz.c	\
-	gdkutils-quartz.c	\
-	gdkwindow-quartz.c	\
-	gdkwindow-quartz.h	\
-	xcursors.h
-
-libgdkinclude_HEADERS = 	\
-	gdkquartz.h
-
-libgdkquartzinclude_HEADERS =		\
-	gdkquartzcursor.h		\
-	gdkquartzdevice-core.h		\
-	gdkquartzdevicemanager-core.h	\
-	gdkquartzdisplay.h		\
-	gdkquartzdisplaymanager.h	\
-	gdkquartzdnd.h			\
-	gdkquartzkeys.h			\
-	gdkquartzmonitor.h		\
-	gdkquartzscreen.h		\
-	gdkquartzutils.h		\
-	gdkquartzwindow.h
-
-
--include $(top_srcdir)/git.mk
diff --git a/gdk/wayland/Makefile.am b/gdk/wayland/Makefile.am
deleted file mode 100644
index 408bf7be5c..0000000000
--- a/gdk/wayland/Makefile.am
+++ /dev/null
@@ -1,109 +0,0 @@
-## Process this file with automake to produce Makefile.in
-include $(top_srcdir)/Makefile.decl
-
-libgdkincludedir = $(includedir)/gtk-4.0/gdk
-libgdkwaylandincludedir = $(includedir)/gtk-4.0/gdk/wayland
-
-AM_CPPFLAGS =					\
-	-DG_LOG_DOMAIN=\"Gdk\"			\
-	-DG_LOG_USE_STRUCTURED=1		\
-	-DGDK_COMPILATION			\
-	-I$(top_srcdir)				\
-	-I$(top_srcdir)/gdk			\
-	-I$(top_builddir)/gdk			\
-	$(GDK_HIDDEN_VISIBILITY_CFLAGS)		\
-	$(GTK_DEBUG_FLAGS)			\
-	$(GDK_DEP_CFLAGS)
-
-LDADDS = $(GDK_DEP_LIBS) $(SHM_LIBS)
-
-noinst_LTLIBRARIES =				\
-	libgdk-wayland.la
-
-BUILT_SOURCES = 				\
-	pointer-gestures-unstable-v1-client-protocol.h		\
-	pointer-gestures-unstable-v1-protocol.c			\
-	xdg-shell-unstable-v6-client-protocol.h			\
-	xdg-shell-unstable-v6-protocol.c			\
-	xdg-foreign-unstable-v1-client-protocol.h		\
-	xdg-foreign-unstable-v1-protocol.c			\
-	gtk-primary-selection-client-protocol.h			\
-	gtk-primary-selection-protocol.c			\
-	tablet-unstable-v2-client-protocol.h	\
-	tablet-unstable-v2-protocol.c		\
-	keyboard-shortcuts-inhibit-unstable-v1-client-protocol.h \
-	keyboard-shortcuts-inhibit-unstable-v1-protocol.c	\
-	gtk-shell-client-protocol.h		\
-	gtk-shell-protocol.c
-
-nodist_libgdk_wayland_la_SOURCES =		\
-	$(BUILT_SOURCES)
-
-DISTCLEANFILES =				\
-	$(BUILT_SOURCES)
-
-libgdk_wayland_la_SOURCES =			\
-	gdkapplaunchcontext-wayland.c		\
-	gdkcursor-wayland.c			\
-	gdkdevice-wayland.c			\
-	gdkdisplay-wayland.c			\
-	gdkdisplay-wayland.h			\
-	gdkdnd-wayland.c			\
-	gdkeventsource.c			\
-	gdkkeys-wayland.c                       \
-	gdkglcontext-wayland.c			\
-	gdkglcontext-wayland.h			\
-	gdkmonitor-wayland.c			\
-	gdkmonitor-wayland.h			\
-	gdkscreen-wayland.c			\
-	gdkseat-wayland.h			\
-	gdkselection-wayland.c			\
-	gdkvulkancontext-wayland.c		\
-	gdkvulkancontext-wayland.h		\
-	gdkwindow-wayland.c			\
-	gdkwayland.h				\
-	gdkprivate-wayland.h			\
-	wm-button-layout-translation.c		\
-	wm-button-layout-translation.h
-
-libgdkinclude_HEADERS =				\
-	gdkwayland.h
-
-libgdkwaylandinclude_HEADERS = 			\
-	gdkwaylanddevice.h			\
-	gdkwaylanddisplay.h			\
-	gdkwaylandglcontext.h			\
-	gdkwaylandmonitor.h			\
-	gdkwaylandselection.h			\
-	gdkwaylandwindow.h
-
-.SECONDEXPANSION:
-
-define protostability
-$(shell echo $1 | sed 's/.*\(\<unstable\>\|\<stable\>\).*/\1/')
-endef
-
-define protoname
-$(shell echo $1 | sed 's/\([a-z\-]\+\)-[a-z]\+-v[0-9]\+/\1/')
-endef
-
-%-protocol.c : $(WAYLAND_PROTOCOLS_DATADIR)/$$(call protostability,$$*)/$$(call protoname,$$*)/$$*.xml
-	$(AM_V_GEN)$(WAYLAND_SCANNER) code < $< > $@
-	$(AM_V_GEN)$(SED) -i -e 's/WL_EXPORT //' $@
-%-client-protocol.h : $(WAYLAND_PROTOCOLS_DATADIR)/$$(call protostability,$$*)/$$(call protoname,$$*)/$$*.xml
-	$(AM_V_GEN)$(WAYLAND_SCANNER) client-header < $< > $@
-
-%-protocol.c : $(srcdir)/protocol/%.xml
-	$(AM_V_GEN)$(WAYLAND_SCANNER) code < $< > $@
-	$(AM_V_GEN)$(SED) -i -e 's/WL_EXPORT //' $@
-
-%-server-protocol.h : $(srcdir)/protocol/%.xml
-	$(AM_V_GEN)$(WAYLAND_SCANNER) server-header < $< > $@
-%-client-protocol.h : $(srcdir)/protocol/%.xml
-	$(AM_V_GEN)$(WAYLAND_SCANNER) client-header < $< > $@
-
-EXTRA_DIST += 					\
-	protocol/gtk-primary-selection.xml	\
-	protocol/gtk-shell.xml
-
--include $(top_srcdir)/git.mk
diff --git a/gdk/win32/Makefile.am b/gdk/win32/Makefile.am
deleted file mode 100644
index 596f183892..0000000000
--- a/gdk/win32/Makefile.am
+++ /dev/null
@@ -1,108 +0,0 @@
-## Process this file with automake to produce Makefile.in
-include $(top_srcdir)/Makefile.decl
-
-libgdkincludedir = $(includedir)/gtk-4.0/gdk
-libgdkwin32includedir = $(includedir)/gtk-4.0/gdk/win32
-
-AM_CPPFLAGS = \
-	-DG_LOG_DOMAIN=\"Gdk\"		\
-	-DG_LOG_USE_STRUCTURED=1	\
-	-DINSIDE_GDK_WIN32		\
-	-I$(top_srcdir)			\
-	-I$(top_srcdir)/gdk		\
-	-I$(top_builddir)/gdk		\
-	$(GDK_HIDDEN_VISIBILITY_CFLAGS) \
-	$(GTK_DEBUG_FLAGS) 		\
-	$(GDK_DEP_CFLAGS)		\
-	$(GDK_WIN32_EXTRA_CFLAGS)	\
-	-DGDK_COMPILATION
-
-LDADDS = $(GDK_DEP_LIBS)
-
-noinst_LTLIBRARIES = libgdk-win32.la
-
-SUBDIRS=rc
-
-EXTRA_DIST += \
-	bdfcursor.c \
-	makefile.msc
-
-libgdk_win32_la_SOURCES = \
-	gdkcursor-win32.c \
-	gdkdevicemanager-win32.c \
-	gdkdevicemanager-win32.h \
-	gdkdevice-virtual.c \
-	gdkdevice-virtual.h \
-	gdkdevice-win32.c \
-	gdkdevice-win32.h \
-	gdkdevice-wintab.c \
-	gdkdevice-wintab.h \
-	gdkdisplay-win32.c \
-	gdkdisplay-win32.h \
-	gdkdisplaymanager-win32.c \
-	gdkdnd-win32.c \
-	gdkevents-win32.c \
-	gdkgeometry-win32.c \
-	gdkglcontext-win32.c \
-	gdkglcontext-win32.h \
-	gdkglobals-win32.c \
-	gdkkeys-win32.c \
-	gdkmain-win32.c \
-	gdkmonitor-win32.c \
-	gdkmonitor-win32.h \
-	gdkprivate-win32.h \
-	gdkproperty-win32.c \
-	gdkscreen-win32.c \
-	gdkselection-win32.c \
-	gdkvulkancontext-win32.c \
-	gdkvulkancontext-win32.h \
-	gdkwin32cursor.h \
-	gdkwin32display.h \
-	gdkwin32displaymanager.h \
-	gdkwin32dnd.h \
-	gdkwin32glcontext.h \
-	gdkwin32.h \
-	gdkwin32id.c \
-	gdkwin32keys.h \
-	gdkwin32monitor.h \
-	gdkwin32screen.h \
-	gdkwin32window.h \
-	gdkwindow-win32.c \
-	gdkwindow-win32.h \
-	pktdef.h \
-	wintab.h \
-	xcursors.h
-
-libgdkinclude_HEADERS =		\
-	gdkwin32.h
-
-libgdkwin32include_HEADERS =	\
-	gdkwin32cursor.h	\
-	gdkwin32display.h	\
-	gdkwin32displaymanager.h\
-	gdkwin32dnd.h		\
-	gdkwin32glcontext.h	\
-	gdkwin32keys.h		\
-	gdkwin32misc.h		\
-	gdkwin32monitor.h	\
-	gdkwin32screen.h	\
-	gdkwin32window.h
-
-# ------------------- MSVC Build Items ----------------
-MSVCPROJS = gdk4-win32
-
-gdk4_win32_FILES = $(libgdk_win32_la_SOURCES)
-gdk4_win32_EXCLUDES = dummy
-gdk4_win32_HEADERS_DIR = $(libgdkwin32includedir)
-
-gdk4_win32_HEADERS_INST = $(libgdkwin32include_HEADERS)
-
-gdk4_win32_HEADERS_EXCLUDES = dummy
-
-include $(top_srcdir)/win32/Makefile.msvcproj
-
-dist-hook: \
-	$(top_builddir)/win32/vs12/gdk4-win32.vcxproj	\
-	$(top_builddir)/win32/vs12/gdk4-win32.vs12.headers
-
--include $(top_srcdir)/git.mk
diff --git a/gdk/win32/rc/Makefile.am b/gdk/win32/rc/Makefile.am
deleted file mode 100644
index beee6fd4ed..0000000000
--- a/gdk/win32/rc/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-include $(top_srcdir)/Makefile.decl
-
-EXTRA_DIST += gtk.ico
-
--include $(top_srcdir)/git.mk
diff --git a/gdk/x11/Makefile.am b/gdk/x11/Makefile.am
deleted file mode 100644
index 21ff9fef23..0000000000
--- a/gdk/x11/Makefile.am
+++ /dev/null
@@ -1,94 +0,0 @@
-## Process this file with automake to produce Makefile.in
-include $(top_srcdir)/Makefile.decl
-
-libgdkincludedir = $(includedir)/gtk-4.0/gdk
-libgdkx11includedir = $(includedir)/gtk-4.0/gdk/x11
-
-AM_CPPFLAGS = 				\
-	-DG_LOG_DOMAIN=\"Gdk\"		\
-	-DG_LOG_USE_STRUCTURED=1	\
-	-DGDK_COMPILATION		\
-	-I$(top_srcdir)			\
-	-I$(top_srcdir)/gdk		\
-	-I$(top_builddir)/gdk		\
-	$(GDK_HIDDEN_VISIBILITY_CFLAGS) \
-	$(GTK_DEBUG_FLAGS) 		\
-	$(GDK_DEP_CFLAGS)
-
-LDADDS = $(GDK_DEP_LIBS)
-
-noinst_LTLIBRARIES = libgdk-x11.la
-
-libgdk_x11_la_SOURCES = 	\
-	MwmUtil.h		\
-	gdkapplaunchcontext-x11.c \
-	gdkasync.c		\
-	gdkasync.h		\
-	gdkcursor-x11.c		\
-	gdkdevice-core-x11.c	\
-	gdkdevice-xi2.c		\
-	gdkdevicemanager-core-x11.c \
-	gdkdevicemanager-x11.c	\
-	gdkdevicemanager-xi2.c	\
-	gdkdevicemanagerprivate-core.h \
-	gdkdisplay-x11.c	\
-	gdkdisplay-x11.h	\
-	gdkdnd-x11.c		\
-	gdkeventsource.c	\
-	gdkeventsource.h	\
-	gdkeventtranslator.c	\
-	gdkeventtranslator.h	\
-	gdkgeometry-x11.c  	\
-	gdkglcontext-x11.c	\
-	gdkglcontext-x11.h	\
-	gdkkeys-x11.c		\
-	gdkmain-x11.c		\
-	gdkmonitor-x11.c	\
-	gdkmonitor-x11.h	\
-	gdkproperty-x11.c	\
-	gdkscreen-x11.c		\
-	gdkscreen-x11.h		\
-	gdkselection-x11.c	\
-	gdkvisual-x11.c		\
-	gdkvulkancontext-x11.c	\
-	gdkvulkancontext-x11.h	\
-	gdkwindow-x11.c		\
-	gdkwindow-x11.h		\
-	gdkxftdefaults.c	\
-	gdkxid.c		\
-	gdkx.h			\
-	gdkprivate-x11.h	\
-	xsettings-client.h	\
-	xsettings-client.c
-
-libgdkinclude_HEADERS = 	\
-	gdkx.h
-
-libgdkx11include_HEADERS = 	\
-	gdkx-autocleanups.h	\
-	gdkx11applaunchcontext.h \
-	gdkx11cursor.h		\
-	gdkx11device.h		\
-	gdkx11device-core.h	\
-	gdkx11device-xi2.h	\
-	gdkx11devicemanager.h   \
-	gdkx11devicemanager-core.h \
-	gdkx11devicemanager-xi2.h \
-	gdkx11display.h		\
-	gdkx11dnd.h		\
-	gdkx11glcontext.h	\
-	gdkx11keys.h		\
-	gdkx11monitor.h		\
-	gdkx11property.h	\
-	gdkx11screen.h		\
-	gdkx11selection.h	\
-	gdkx11utils.h		\
-	gdkx11visual.h		\
-	gdkx11window.h
-
-# We need to include all these C files here since the conditionals
-# don't seem to be correctly expanded for the dist files.
-EXTRA_DIST += 			\
-	gdksettings.c
-
--include $(top_srcdir)/git.mk
diff --git a/git.mk b/git.mk
deleted file mode 100644
index 762c87428e..0000000000
--- a/git.mk
+++ /dev/null
@@ -1,334 +0,0 @@
-# git.mk
-#
-# Copyright 2009, Red Hat, Inc.
-# Copyright 2010,2011,2012,2013 Behdad Esfahbod
-# Written by Behdad Esfahbod
-#
-# Copying and distribution of this file, with or without modification,
-# is permitted in any medium without royalty provided the copyright
-# notice and this notice are preserved.
-#
-# The latest version of this file can be downloaded from:
-#   https://raw.github.com/behdad/git.mk/master/git.mk
-# Bugs, etc, should be reported upstream at:
-#   https://github.com/behdad/git.mk
-#
-# 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.  Remember to add that line to new
-# Makefile.am files you create in your project, or just rerun the
-# "make -f 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 make targets.
-#
-# 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 and I'll diagnose.
-#
-# For a list of toplevel files that should be in MAINTAINERCLEANFILES, see
-# Makefile.am.sample in the git.mk git repo.
-#
-# 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, yelp.m4, mallard, intltool, gsettings, dejagnu, appdata,
-# appstream.
-#
-# This makefile provides the following targets:
-#
-# - all: "make all" will build all gitignore files.
-# - gitignore: makes all gitignore files in the current dir and subdirs.
-# - .gitignore: make gitignore file for the current dir.
-# - gitignore-recurse: makes all gitignore files in the subdirs.
-#
-# 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.
-#
-
-
-
-###############################################################################
-# Variables user modules may want to add to toplevel MAINTAINERCLEANFILES:
-###############################################################################
-
-#
-# Most autotools-using modules should be fine including this variable in their
-# toplevel MAINTAINERCLEANFILES:
-GITIGNORE_MAINTAINERCLEANFILES_TOPLEVEL = \
-	$(srcdir)/aclocal.m4 \
-	$(srcdir)/autoscan.log \
-	$(srcdir)/configure.scan \
-	`AUX_DIR=$(srcdir)/$$(cd $(top_srcdir); $(AUTOCONF) --trace 'AC_CONFIG_AUX_DIR:$$1' ./configure.ac); \
-	 test "x$$AUX_DIR" = "x$(srcdir)/" && AUX_DIR=$(srcdir); \
-	 for x in \
-		ar-lib \
-		compile \
-		config.guess \
-		config.sub \
-		config.rpath \
-		depcomp \
-		install-sh \
-		ltmain.sh \
-		missing \
-		mkinstalldirs \
-		test-driver \
-		ylwrap \
-	 ; do echo "$$AUX_DIR/$$x"; done` \
-	`cd $(top_srcdir); $(AUTOCONF) --trace 'AC_CONFIG_HEADERS:$$1' ./configure.ac | \
-	head -n 1 | while read f; do echo "$(srcdir)/$$f.in"; done`
-#
-# All modules should also be fine including the following variable, which
-# removes automake-generated Makefile.in files:
-GITIGNORE_MAINTAINERCLEANFILES_MAKEFILE_IN = \
-	`cd $(top_srcdir); $(AUTOCONF) --trace 'AC_CONFIG_FILES:$$1' ./configure.ac | \
-	while read f; do \
-	  case $$f in Makefile|*/Makefile) \
-	    test -f "$(srcdir)/$$f.am" && echo "$(srcdir)/$$f.in";; esac; \
-	done`
-#
-# Modules that use libtool and use  AC_CONFIG_MACRO_DIR() may also include this,
-# though it's harmless to include regardless.
-GITIGNORE_MAINTAINERCLEANFILES_M4_LIBTOOL = \
-	`MACRO_DIR=$(srcdir)/$$(cd $(top_srcdir); $(AUTOCONF) --trace 'AC_CONFIG_MACRO_DIR:$$1' ./configure.ac); \
-	 if test "x$$MACRO_DIR" != "x$(srcdir)/"; then \
-		for x in \
-			libtool.m4 \
-			ltoptions.m4 \
-			ltsugar.m4 \
-			ltversion.m4 \
-			lt~obsolete.m4 \
-		; do echo "$$MACRO_DIR/$$x"; done; \
-	 fi`
-
-
-
-###############################################################################
-# Default rule is to install ourselves in all Makefile.am files:
-###############################################################################
-
-git-all: git-mk-install
-
-git-mk-install:
-	@echo "Installing git makefile"
-	@any_failed=; \
-		find "`test -z "$(top_srcdir)" && echo . || echo "$(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
-
-
-
-###############################################################################
-# Actual .gitignore generation:
-###############################################################################
-
-$(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
-	@echo "git.mk: Generating $@"
-	@{ \
-		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; \
-			FLAVOR=$$(cd $(top_srcdir); $(AUTOCONF) --trace 'GTK_DOC_CHECK:$$2' ./configure.ac); \
-			case $$FLAVOR in *no-tmpl*) echo /tmpl;; esac; \
-		fi; \
-		if test "x$(DOC_MODULE)$(DOC_ID)" = x -o "x$(DOC_LINGUAS)" = x; then :; else \
-			for lc in $(DOC_LINGUAS); do \
-				for x in \
-					$(if $(DOC_MODULE),$(DOC_MODULE).xml) \
-					$(DOC_PAGES) \
-					$(DOC_INCLUDES) \
-				; do echo "/$$lc/$$x"; done; \
-			done; \
-			for x in \
-				$(_DOC_OMF_ALL) \
-				$(_DOC_DSK_ALL) \
-				$(_DOC_HTML_ALL) \
-				$(_DOC_MOFILES) \
-				$(DOC_H_FILE) \
-				"*/.xml2po.mo" \
-				"*/*.omf.out" \
-			; do echo /$$x; done; \
-		fi; \
-		if test "x$(HELP_ID)" = x -o "x$(HELP_LINGUAS)" = x; then :; else \
-			for lc in $(HELP_LINGUAS); do \
-				for x in \
-					$(HELP_FILES) \
-					"$$lc.stamp" \
-					"$$lc.mo" \
-				; do echo "/$$lc/$$x"; done; \
-			done; \
-		fi; \
-		if test "x$(gsettings_SCHEMAS)" = x; then :; else \
-			for x in \
-				$(gsettings_SCHEMAS:.xml=.valid) \
-				$(gsettings__enum_file) \
-			; do echo "/$$x"; done; \
-		fi; \
-		if test "x$(appdata_XML)" = x; then :; else \
-			for x in \
-				$(appdata_XML:.xml=.valid) \
-			; do echo "/$$x"; done; \
-		fi; \
-		if test "x$(appstream_XML)" = x; then :; else \
-			for x in \
-				$(appstream_XML:.xml=.valid) \
-			; do echo "/$$x"; done; \
-		fi; \
-		for tdir in po $(GITIGNORE_TRANSLATION_DIRS); do \
-			if test -f "$(srcdir)/$$tdir/Makefile.in.in"; then \
-				for x in \
-					$$tdir/Makefile.in.in \
-					$$tdir/Makefile.in.in~ \
-					$$tdir/Makefile.in \
-					$$tdir/Makefile \
-					$$tdir/Makevars.template \
-					$$tdir/POTFILES \
-					$$tdir/Rules-quot \
-					$$tdir/stamp-it \
-					$$tdir/stamp-po \
-					$$tdir/.intltool-merge-cache \
-					"$$tdir/*.gmo" \
-					"$$tdir/*.header" \
-					"$$tdir/*.mo" \
-					"$$tdir/*.sed" \
-					"$$tdir/*.sin" \
-					$$tdir/$(GETTEXT_PACKAGE).pot \
-				; do echo "/$$x"; done; \
-			fi; \
-			for x in \
-				ABOUT-NLS \
-				intltool-extract.in \
-				intltool-merge.in \
-				intltool-update.in \
-			; do echo "/$$x"; done; \
-		done; \
-		if test -f $(srcdir)/configure; then \
-			for x in \
-				autom4te.cache \
-				configure \
-				config.h \
-				stamp-h1 \
-				libtool \
-				config.lt \
-			; do echo "/$$x"; done; \
-		fi; \
-		if test "x$(DEJATOOL)" = x; then :; else \
-			for x in \
-				$(DEJATOOL) \
-			; do echo "/$$x.sum"; echo "/$$x.log"; done; \
-			echo /site.exp; \
-		fi; \
-		if test "x$(am__dirstamp)" = x; then :; else \
-			echo "$(am__dirstamp)"; \
-		fi; \
-		if test "x$(LTCOMPILE)" = x -a "x$(LTCXXCOMPILE)" = x -a "x$(GTKDOC_RUN)" = x; then :; else \
-			for x in \
-				"*.lo" \
-				".libs" "_libs" \
-			; do echo "$$x"; done; \
-		fi; \
-		for x in \
-			.gitignore \
-			$(GITIGNOREFILES) \
-			$(CLEANFILES) \
-			$(PROGRAMS) $(check_PROGRAMS) $(EXTRA_PROGRAMS) \
-			$(LIBRARIES) $(check_LIBRARIES) $(EXTRA_LIBRARIES) \
-			$(LTLIBRARIES) $(check_LTLIBRARIES) $(EXTRA_LTLIBRARIES) \
-			so_locations \
-			$(MOSTLYCLEANFILES) \
-			$(TEST_LOGS) \
-			$(TEST_LOGS:.log=.trs) \
-			$(TEST_SUITE_LOG) \
-			"*.gcda" \
-			"*.gcno" \
-			$(DISTCLEANFILES) \
-			$(am__CONFIG_DISTCLEAN_FILES) \
-			$(CONFIG_CLEAN_FILES) \
-			TAGS ID GTAGS GRTAGS GSYMS GPATH tags \
-			"*.tab.c" \
-			$(MAINTAINERCLEANFILES) \
-			$(BUILT_SOURCES) \
-			$(patsubst %.vala,%.c,$(filter %.vala,$(SOURCES))) \
-			$(filter %_vala.stamp,$(DIST_COMMON)) \
-			$(filter %.vapi,$(DIST_COMMON)) \
-			$(filter $(addprefix %,$(notdir $(patsubst %.vapi,%.h,$(filter %.vapi,$(DIST_COMMON))))),$(DIST_COMMON)) \
-			Makefile \
-			Makefile.in \
-			"*.orig" \
-			"*.rej" \
-			"*.bak" \
-			"*~" \
-			".*.sw[nop]" \
-			".dirstamp" \
-		; do echo "/$$x"; done; \
-		for x in \
-			"*.$(OBJEXT)" \
-			$(DEPDIR) \
-		; 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: $(srcdir)/.gitignore gitignore-recurse
-
-gitignore-recurse-maybe:
-	@for subdir in $(DIST_SUBDIRS); do \
-	  case " $(SUBDIRS) " in \
-	    *" $$subdir "*) :;; \
-	    *) test "$$subdir" = . -o -e "$$subdir/.git" || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) gitignore || echo "Skipping $$subdir");; \
-	  esac; \
-	done
-gitignore-recurse:
-	@for subdir in $(DIST_SUBDIRS); do \
-	    test "$$subdir" = . -o -e "$$subdir/.git" || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) gitignore || echo "Skipping $$subdir"); \
-	done
-
-maintainer-clean: gitignore-clean
-gitignore-clean:
-	-rm -f $(srcdir)/.gitignore
-
-.PHONY: gitignore-clean gitignore gitignore-recurse gitignore-recurse-maybe
diff --git a/gsk/Makefile.am b/gsk/Makefile.am
deleted file mode 100644
index caef1cc98b..0000000000
--- a/gsk/Makefile.am
+++ /dev/null
@@ -1,334 +0,0 @@
-include $(top_srcdir)/Makefile.decl
-
-GSK_CFLAG_DEFINES = \
-	-DG_LOG_DOMAIN=\"Gsk\"			\
-	-DG_LOG_USE_STRUCTURED=1		\
-	-DGSK_COMPILATION
-
-AM_CPPFLAGS = \
-	$(GSK_CFLAG_DEFINES)			\
-	-I$(top_srcdir)				\
-	-I$(top_srcdir)/gdk			\
-	-I$(top_builddir)			\
-	-I$(top_builddir)/gsk			\
-	$(GTK_DEBUG_FLAGS)			\
-	$(GTK_WARN_FLAGS)			\
-	$(GSK_DEP_CFLAGS)
-
-BUILT_SOURCES =
-
-CLEANFILES =
-DISTCLEANFILES =
-
-noinst_LTLIBRARIES =
-
-if HAVE_VULKAN
-gsk_private_vulkan_source_h = \
-	gskvulkanblendpipelineprivate.h \
-	gskvulkanborderpipelineprivate.h \
-	gskvulkanboxshadowpipelineprivate.h \
-	gskvulkanbufferprivate.h \
-	gskvulkanclipprivate.h \
-	gskvulkancolorpipelineprivate.h \
-	gskvulkancommandpoolprivate.h \
-	gskvulkaneffectpipelineprivate.h \
-	gskvulkanimageprivate.h \
-	gskvulkanlineargradientpipelineprivate.h \
-	gskvulkanmemoryprivate.h \
-	gskvulkanpipelineprivate.h \
-	gskvulkanpushconstantsprivate.h \
-	gskvulkanrenderprivate.h \
-	gskvulkanrendererprivate.h \
-	gskvulkanrenderpassprivate.h \
-	gskvulkanshaderprivate.h
-gsk_private_vulkan_source_c = \
-	gskvulkanblendpipeline.c \
-	gskvulkanborderpipeline.c \
-	gskvulkanboxshadowpipeline.c \
-	gskvulkanbuffer.c \
-	gskvulkanclip.c \
-	gskvulkancolorpipeline.c \
-	gskvulkancommandpool.c \
-	gskvulkaneffectpipeline.c \
-	gskvulkanlineargradientpipeline.c \
-	gskvulkanimage.c \
-	gskvulkanmemory.c \
-	gskvulkanpipeline.c \
-	gskvulkanpushconstants.c \
-	gskvulkanrender.c \
-	gskvulkanrenderer.c \
-	gskvulkanrenderpass.c \
-	gskvulkanshader.c
-gsk_private_vulkan_include_shaders = \
-	resources/vulkan/clip.frag.glsl \
-	resources/vulkan/clip.vert.glsl \
-	resources/vulkan/constants.glsl \
-	resources/vulkan/rounded-rect.glsl
-gsk_private_vulkan_fragment_shaders = \
-	resources/vulkan/blend.frag \
-	resources/vulkan/border.frag \
-	resources/vulkan/color.frag \
-	resources/vulkan/color-matrix.frag \
-	resources/vulkan/inset-shadow.frag \
-	resources/vulkan/linear.frag \
-	resources/vulkan/outset-shadow.frag
-gsk_private_vulkan_vertex_shaders = \
-	resources/vulkan/blend.vert \
-	resources/vulkan/border.vert \
-	resources/vulkan/color.vert \
-	resources/vulkan/color-matrix.vert \
-	resources/vulkan/inset-shadow.vert \
-	resources/vulkan/linear.vert \
-	resources/vulkan/outset-shadow.vert
-gsk_private_vulkan_shaders = \
-	$(gsk_private_vulkan_fragment_shaders) \
-	$(gsk_private_vulkan_vertex_shaders)
-gsk_private_vulkan_compiled_shaders = \
-	$(gsk_private_vulkan_fragment_shaders:.frag=.frag.spv) \
-	$(gsk_private_vulkan_vertex_shaders:.vert=.vert.spv) \
-	$(gsk_private_vulkan_fragment_shaders:.frag=-clip.frag.spv) \
-	$(gsk_private_vulkan_vertex_shaders:.vert=-clip.vert.spv) \
-	$(gsk_private_vulkan_fragment_shaders:.frag=-clip-rounded.frag.spv) \
-	$(gsk_private_vulkan_vertex_shaders:.vert=-clip-rounded.vert.spv)
-endif
-
-gsk_public_source_h = \
-	gskenums.h \
-	gskrenderer.h \
-	gskrendernode.h \
-	gskroundedrect.h \
-	gsktexture.h \
-	gsktypes.h
-gsk_private_source_h = \
-	$(gsk_private_vulkan_source_h) \
-	gskcairoblurprivate.h \
-	gskcairorendererprivate.h \
-	gskdebugprivate.h \
-	gskgldriverprivate.h \
-	gskglprofilerprivate.h \
-	gskglrendererprivate.h \
-	gskprivate.h \
-	gskprofilerprivate.h \
-	gskrendererprivate.h \
-	gskrendernodeprivate.h \
-	gskroundedrectprivate.h \
-	gskshaderbuilderprivate.h \
-	gsktextureprivate.h
-gsk_private_source_shaders = \
-	resources/glsl/blend.fs.glsl \
-	resources/glsl/blend.vs.glsl \
-	resources/glsl/blit.fs.glsl \
-	resources/glsl/blit.vs.glsl \
-	resources/glsl/color.vs.glsl \
-	resources/glsl/color.fs.glsl \
-	resources/glsl/es2_common.fs.glsl \
-	resources/glsl/es2_common.vs.glsl \
-	resources/glsl/gl3_common.fs.glsl \
-	resources/glsl/gl3_common.vs.glsl \
-	resources/glsl/gl_common.fs.glsl \
-	resources/glsl/gl_common.vs.glsl
-gsk_public_source_c = \
-	gskrenderer.c \
-	gskrendernode.c \
-	gskrendernodeimpl.c \
-	gskroundedrect.c \
-	gsktexture.c
-gsk_private_source_c = \
-	$(gsk_private_vulkan_source_c) \
-	gskcairoblur.c \
-	gskcairorenderer.c \
-	gskdebug.c \
-	gskgldriver.c \
-	gskglprofiler.c \
-	gskglrenderer.c \
-	gskprivate.c \
-	gskprofiler.c \
-	gskshaderbuilder.c
-gsk_built_source_h = \
-	gskenumtypes.h \
-	gskresources.h
-gsk_built_source_c = \
-	gskenumtypes.c \
-	gskresources.c
-
-all_sources = \
-	$(gsk_public_source_h) \
-	$(gsk_public_source_c) \
-	$(gsk_private_source_h) \
-	$(gsk_private_source_c)
-
-BUILT_SOURCES += $(gsk_built_source_h) $(gsk_built_source_c) gsk.resources.xml
-
-gskenumtypes.h: $(gsk_public_source_h) gskenumtypes.h.template
-	$(AM_V_GEN) $(GLIB_MKENUMS) --template $(filter %.template,$^) $(filter-out %.template,$^) > \
-	  gskenumtypes.h.tmp && \
-	  mv gskenumtypes.h.tmp gskenumtypes.h
-
-gskenumtypes.c: $(gsk_public_source_h) gskenumtypes.c.template
-	$(AM_V_GEN) $(GLIB_MKENUMS) --template $(filter %.template,$^) $(filter-out %.template,$^) > \
-	  gskenumtypes.c.tmp && \
-	  mv gskenumtypes.c.tmp gskenumtypes.c
-
-EXTRA_DIST += gskenumtypes.h.template gskenumtypes.c.template
-DISTCLEANFILES += gskenumtypes.h gskenumtypes.c
-
-resource_files = \
-	$(gsk_private_source_shaders) \
-	$(gsk_private_vulkan_compiled_shaders) \
-	$(gsk_private_vulkan_shaders)
-
-resources/vulkan/%-clip-rounded.frag.spv: resources/vulkan/%.frag
-	@if test -z "$(GLSLC)"; then echo "Missing glslc. See https://github.com/google/shaderc"; exit 1; fi
-	$(AM_V_GEN) $(GLSLC) -fshader-stage=fragment -DCLIP_ROUNDED_RECT -o $@.tmp $< && mv $@.tmp $@
-
-resources/vulkan/%-clip-rounded.vert.spv: resources/vulkan/%.vert
-	@if test -z "$(GLSLC)"; then echo "Missing glslc. See https://github.com/google/shaderc"; exit 1; fi
-	$(AM_V_GEN) $(GLSLC) -fshader-stage=vertex -DCLIP_ROUNDED_RECT -o $@.tmp $< && mv $@.tmp $@
-
-resources/vulkan/%-clip.frag.spv: resources/vulkan/%.frag
-	@if test -z "$(GLSLC)"; then echo "Missing glslc. See https://github.com/google/shaderc"; exit 1; fi
-	$(AM_V_GEN) $(GLSLC) -fshader-stage=fragment -DCLIP_RECT -o $@.tmp $< && mv $@.tmp $@
-
-resources/vulkan/%-clip.vert.spv: resources/vulkan/%.vert
-	@if test -z "$(GLSLC)"; then echo "Missing glslc. See https://github.com/google/shaderc"; exit 1; fi
-	$(AM_V_GEN) $(GLSLC) -fshader-stage=vertex -DCLIP_RECT -o $@.tmp $< && mv $@.tmp $@
-
-resources/vulkan/%.frag.spv: resources/vulkan/%.frag
-	@if test -z "$(GLSLC)"; then echo "Missing glslc. See https://github.com/google/shaderc"; exit 1; fi
-	$(AM_V_GEN) $(GLSLC) -fshader-stage=fragment -DCLIP_NONE -o $@.tmp $< && mv $@.tmp $@
-
-resources/vulkan/%.vert.spv: resources/vulkan/%.vert
-	@if test -z "$(GLSLC)"; then echo "Missing glslc. See https://github.com/google/shaderc"; exit 1; fi
-	$(AM_V_GEN) $(GLSLC) -fshader-stage=vertex -DCLIP_NONE -o $@.tmp $< && mv $@.tmp $@
-
-gsk.resources.xml: Makefile.am
-	$(AM_V_GEN) echo "<?xml version='1.0' encoding='UTF-8'?>" > $@; \
-	echo "<gresources>" >> $@; \
-	echo "  <gresource prefix='/org/gtk/libgsk'>" >> $@; \
-	for f in $(gsk_private_source_shaders); do \
-	  n=`basename $$f`; \
-	  echo "    <file alias='glsl/$$n'>resources/glsl/$$n</file>" >> $@; \
-	done; \
-	for f in $(gsk_private_vulkan_compiled_shaders); do \
-	  n=`basename $$f`; \
-	  echo "    <file alias='vulkan/$$n'>resources/vulkan/$$n</file>" >> $@; \
-	done; \
-	for f in $(gsk_private_vulkan_shaders); do \
-	  n=`basename $$f`; \
-	  echo "    <file alias='vulkan/$$n'>resources/vulkan/$$n</file>" >> $@; \
-	done; \
-	echo "  </gresource>" >> $@; \
-	echo "</gresources>" >> $@
-
-gskresources.h: gsk.resources.xml $(resource_files)
-	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $< \
-		--target=$@ --sourcedir=$(srcdir) --c-name _gsk --generate-header --manual-register
-
-gskresources.c: gsk.resources.xml $(resource_files)
-	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $< \
-		--target=$@ --sourcedir=$(srcdir) --c-name _gsk --generate-source --manual-register
-
-EXTRA_DIST += $(resource_files) $(gsk_private_vulkan_include_shaders)
-CLEANFILES += gsk.resources.xml
-DISTCLEANFILES += gskresources.h gskresources.c
-
-libgsk_4_la_SOURCES = $(all_sources)
-nodist_libgsk_4_la_SOURCES = $(gsk_built_source_h) $(gsk_built_source_c)
-libgsk_4_la_CFLAGS = $(AM_CFLAGS) $(GDK_HIDDEN_VISIBILITY_CFLAGS)
-libgsk_4_la_LIBADD = $(GSK_DEP_LIBS) $(top_builddir)/gdk/libgdk-4.la
-
-noinst_LTLIBRARIES += libgsk-4.la
-
-gskincludedir = $(includedir)/gtk-4.0/gsk
-gskinclude_HEADERS = $(gsk_public_source_h) gskenumtypes.h gsk.h
-
--include $(INTROSPECTION_MAKEFILE)
-INTROSPECTION_GIRS =
-INTROSPECTION_SCANNER_ENV = CC="$(CC)"
-INTROSPECTION_SCANNER_ARGS = \
-	--add-include-path=../gdk \
-	--add-include-path=../gsk \
-	--warn-all
-INTROSPECTION_COMPILER_ARGS = \
-	--includedir=$(srcdir) \
-	--includedir=. \
-	--includedir=../gdk
-
-if HAVE_INTROSPECTION
-
-introspection_files = $(gsk_public_source_h) $(gsk_public_source_c)
-
-Gsk-noinst-4.0.gir: libgsk-4.la Makefile
-Gsk_noinst_4_0_gir_SCANNERFLAGS = \
-	--add-include-path=$(top_builddir)/gdk \
-	--include-uninstalled=$(top_builddir)/gdk/Gdk-noinst-4.0.gir \
-	--c-include="gsk/gsk.h"
-Gsk_noinst_4_0_gir_LIBS = libgsk-4.la
-Gsk_noinst_4_0_gir_FILES = $(introspection_files)
-Gsk_noinst_4_0_gir_CFLAGS = $(AM_CPPFLAGS) $(GDK_HIDDEN_VISIBILITY_CFLAGS)
-Gsk_noinst_4_0_gir_EXPORT_PACKAGES = gsk-4.0
-Gsk_noinst_4_0_gir_INCLUDES = GObject-2.0 cairo-1.0 Graphene-1.0
-INTROSPECTION_GIRS += Gsk-noinst-4.0.gir
-
-noinst_DATA = $(INTROSPECTION_GIRS)
-
-CLEANFILES += $(INTROSPECTION_GIRS)
-
-endif
-
-# ------------------- MSVC Build Items ----------------
-MSVCPROJS = gsk-4
-
-gsk_4_FILES = $(all_sources) $(gsk_built_source_c)
-gsk_4_EXCLUDES = gskvulkan*.c
-gsk_4_HEADERS_DIR = $(gskincludedir)
-gsk_4_HEADERS_INST = $(gskinclude_HEADERS)
-gsk_4_HEADERS_EXCLUDES = dummy
-
-include $(top_srcdir)/win32/Makefile.msvcproj
-
-$(top_builddir)/win32/gsk.enum.headers: Makefile $(gsk_public_source_h)
-	-$(RM) $(top_builddir)/win32/gsk.enum.headers
-	for F in $(gsk_public_source_h); do \
-		case $$F in \
-		*.h) \
-			echo $$F' ^'>>$(top_builddir)/win32/gsk.enum.headers \
-			;; \
-		esac \
-	done
-
-if HAVE_INTROSPECTION
-# Introspection Items for MSVC
-MSVC_INTROSPECT_GIRS = Gsk-4.0.gir
-
-BASE_MSVC_GIR_CFLAGS =			\
-	$(GSK_CFLAG_DEFINES)		\
-	-I../.. -I../../gdk -I.../../gsk
-
-INTROSPECTION_INTERMEDIATE_ITEMS = \
-	$(top_builddir)/win32/Gsk-4.0.gir.msvc.introspect	\
-	$(top_builddir)/win32/Gsk_4_0_gir_list		\
-	$(top_builddir)/win32/gsk.enum.headers
-
-Gsk_4_0_gir_MSVC_FILES = $(introspection_files)
-Gsk_4_0_gir_MSVC_EXPORT_PACKAGES = $(Gsk_noinst_4_0_gir_EXPORT_PACKAGES)
-Gsk_4_0_gir_MSVC_INCLUDE_GIRS = $(Gsk_noinst_4_0_gir_INCLUDES)
-Gsk_4_0_gir_MSVC_LIBS = gtk-4
-Gsk_4_0_gir_MSVC_CFLAGS = $(BASE_MSVC_GIR_CFLAGS)
-Gsk_4_0_gir_MSVC_SCANNERFLAGS =			\
-	--add-include-path=.			\
-	--include-uninstalled=../gdk/Gdk-4.0.gir
-
-include $(top_srcdir)/win32/Makefile.msvc-introspection
-
-else
-INTROSPECTION_INTERMEDIATE_ITEMS =
-endif
-
-dist-hook: \
-	$(top_builddir)/win32/vs12/gsk-4.vcxproj	\
-	$(top_builddir)/win32/vs12/gsk-4.vs12.headers	\
-	$(top_builddir)/win32/gsk.enum.headers	\
-	$(INTROSPECTION_INTERMEDIATE_ITEMS)
-
--include $(top_srcdir)/git.mk
diff --git a/gtk-zip.sh.in b/gtk-zip.sh.in
deleted file mode 100755
index 1da77b8803..0000000000
--- a/gtk-zip.sh.in
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/bin/sh
-
-# Build zipfiles for GTK on Win32
-
-ZIP=/tmp/gtk+-@GTK_VERSION@.zip
-DEVZIP=/tmp/gtk+-dev-@GTK_VERSION@.zip
-
-SHORTAPIVERSION=`echo @GTK_API_VERSION@ | tr -d '.'`
-APIVERSIONMAJOR=`echo @GTK_API_VERSION@ | sed -e 's/\..*//'`
-
-cd @prefix@
-
-mkdir -p share/doc/gtk+-@GTK_VERSION@
-cp -p @abs_srcdir@/COPYING share/doc/gtk+-@GTK_VERSION@
-
-mkdir -p share/doc/gtk+-dev-@GTK_VERSION@
-cp -p @abs_srcdir@/COPYING share/doc/gtk+-dev-@GTK_VERSION@
-
-rm $ZIP
-zip $ZIP -@ <<EOF
-etc/gtk-@GTK_API_VERSION@/gtkrc
-etc/gtk-@GTK_API_VERSION@/im-multipress.conf
-bin/libgdk-win32-@GTK_API_VERSION@-@LT_CURRENT_MINUS_AGE@.dll
-bin/libgtk-win32-@GTK_API_VERSION@-@LT_CURRENT_MINUS_AGE@.dll
-bin/gtk-query-immodules-@GTK_API_VERSION@.exe
-lib/gtk-@GTK_API_VERSION@/3.0.0/loaders.cache
-lib/gtk-@GTK_API_VERSION@/3.0.0/immodules.cache
-EOF
-
-zip $ZIP lib/gtk-@GTK_API_VERSION@/@GTK_BINARY_VERSION@/loaders/*.dll lib/gtk-@GTK_API_VERSION@/@GTK_BINARY_VERSION@/immodules/*.dll lib/gtk-@GTK_API_VERSION@/@GTK_BINARY_VERSION@/engines/*.dll
-
-zip $ZIP share/themes/Raleigh/gtk-@GTK_API_VERSION@/gtkrc
-zip $ZIP share/themes/Default/gtk-@GTK_API_VERSION@-key/gtkrc
-zip $ZIP share/themes/Emacs/gtk-@GTK_API_VERSION@-key/gtkrc
-zip $ZIP share/themes/MS-Windows/gtk-@GTK_API_VERSION@/gtkrc
-
-zip $ZIP share/locale/*/LC_MESSAGES/gtk${SHORTAPIVERSION}.mo
-zip $ZIP share/locale/*/LC_MESSAGES/gtk${SHORTAPIVERSION}-properties.mo
-
-zip -r -D $ZIP share/doc/gtk+-@GTK_VERSION@
-
-rm $DEVZIP
-zip -r -D $DEVZIP -@ <<EOF
-include/gtk-@GTK_API_VERSION@
-include/gail-1.0
-bin/gtk-builder-convert
-bin/gtk${APIVERSIONMAJOR}-demo.exe
-bin/gtk-update-icon-cache.exe
-share/man
-lib/libgdk-win32-@GTK_API_VERSION@.dll.a
-lib/gdk-win32-@GTK_API_VERSION@.lib
-lib/libgtk-win32-@GTK_API_VERSION@.dll.a
-lib/gtk-win32-@GTK_API_VERSION@.lib
-lib/gailutil.lib
-lib/gtk-@GTK_API_VERSION@/include
-lib/pkgconfig
-share/aclocal
-share/gtk-@GTK_API_VERSION@
-share/gtk-doc
-EOF
-
-zip -r $DEVZIP share/doc/gtk+-dev-@GTK_VERSION@
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
deleted file mode 100644
index 75889b3e5a..0000000000
--- a/gtk/Makefile.am
+++ /dev/null
@@ -1,1728 +0,0 @@
-include $(top_srcdir)/Makefile.decl
-
-GTK_BASE_CFLAGS_DEFINES =				\
-	-DG_LOG_DOMAIN=\"Gtk\"				\
-	-DG_LOG_USE_STRUCTURED=1			\
-	-DGTK_VERSION=\"$(GTK_VERSION)\"		\
-	-DGTK_BINARY_VERSION=\"$(GTK_BINARY_VERSION)\"	\
-	-DGTK_COMPILATION				\
-	-DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED
-
-GTK_PLAT_CFLAGS_DEFINES =				\
-	-DGTK_LIBDIR=\"$(libdir)\"			\
-	-DGTK_LOCALEDIR=\"$(localedir)\"		\
-	-DGTK_DATADIR=\"$(datadir)\"			\
-	-DGTK_DATA_PREFIX=\"$(prefix)\"			\
-	-DGTK_SYSCONFDIR=\"$(sysconfdir)\"		\
-	-DGTK_HOST=\"$(host)\"				\
-	-DGTK_PRINT_BACKENDS=\"$(GTK_PRINT_BACKENDS)\"
-
-AM_CPPFLAGS =						\
-	$(GTK_BASE_CFLAGS_DEFINES)			\
-	$(GTK_PLAT_CFLAGS_DEFINES)			\
-	-DX11_DATA_PREFIX=\"$(X11_PREFIX)\"		\
-	-I$(top_builddir)				\
-	-I$(top_builddir)/gtk				\
-	-I$(top_srcdir) 				\
-	-I$(top_srcdir)/gdk				\
-	-I$(top_srcdir) 				\
-	-I$(top_srcdir)/gsk				\
-	$(GMODULE_CFLAGS)				\
-	$(GTK_DEBUG_FLAGS)				\
-	$(GTK_WARN_CFLAGS)				\
-	$(GDK_HIDDEN_VISIBILITY_CFLAGS)			\
-	$(GTK_DEP_CFLAGS)				\
-	$(INCLUDED_IMMODULE_DEFINE)
-
-if OS_WIN32
-gtk_def = gtk.def
-gtk_win32_symbols = -export-symbols $(srcdir)/gtk.def
-
-gtk_win32_res = gtk-win32-res.o
-gtk_win32_res_ldflag = -Wl,gtk-win32-res.o
-
-gtk-win32-res.o : $(top_srcdir)/gdk/win32/rc/gtk.ico gtk-win32.rc libgtk4.manifest
-	$(WINDRES) -I $(top_srcdir)/gdk/win32/rc gtk-win32.rc $@
-
-gtk-win32.rc: gtk-win32.rc.body
-	echo "#include <winuser.h>" >>$@
-	cat $< >>$@
-	echo "ISOLATIONAWARE_MANIFEST_RESOURCE_ID RT_MANIFEST libgtk4.manifest" >>$@
-
-gtk.def: libgtk-4.la
-	echo "LIBRARY libgtk-$(GTK_MAJOR_VERSION)-@LT_CURRENT_MINUS_AGE@" >$@
-	echo "EXPORTS" >>$@
-	objdump -p .libs/libgtk-$(GTK_MAJOR_VERSION)-@LT_CURRENT_MINUS_AGE@.dll | sed -n -e 's/\t\[\s\+\([0-9]\+\)\]\s\([A-Za-z_][A-Za-z0-9_]\)/\2/p' >>$@
-
-install-def-file: gtk.def
-	$(INSTALL) gtk.def $(DESTDIR)$(libdir)/gtk-win32-4.0.def
-uninstall-def-file:
-	-rm $(DESTDIR)$(libdir)/gtk-win32-4.0.def
-else
-install-def-file:
-uninstall-def-file:
-endif
-
-if MS_LIB_AVAILABLE
-noinst_DATA = gtk-win32-$(GTK_API_VERSION).lib
-
-gtk-win32-$(GTK_API_VERSION).lib: libgtk-4.la gtk.def
-	lib -machine:@LIB_EXE_MACHINE_FLAG@ -name:libgtk-win32-$(GTK_API_VERSION)-@LT_CURRENT_MINUS_AGE@.dll -def:gtk.def -out:$@
-
-install-ms-lib:
-	$(INSTALL) gtk-win32-$(GTK_API_VERSION).lib $(DESTDIR)$(libdir)
-
-uninstall-ms-lib:
-	-rm $(DESTDIR)$(libdir)/gtk-win32-$(GTK_API_VERSION).lib
-else
-install-ms-lib:
-uninstall-ms-lib:
-endif
-
-libadd = 				\
-	$(top_builddir)/gsk/libgsk-4.la	\
-	$(GMODULE_LIBS) 		\
-	$(GTK_DEP_LIBS)
-deps = 					\
-	$(top_builddir)/gsk/libgsk-4.la
-
-# libtool stuff: set version and export symbols for resolving
-# since automake doesn't support conditionalized libsomething_la_LDFLAGS
-# we use the general approach here
-libtool_opts =							\
-  $(GTK_LINK_FLAGS)						\
-  -version-info $(LT_VERSION_INFO)				\
-  -export-dynamic $(no_undefined)				\
-  -rpath $(libdir)
-
-
-included-modules:
-if HAVE_INCLUDED_IMMMODULES
-	@cd $(top_builddir)/modules/input && $(MAKE) $(AM_MAKEFLAGS) included-modules
-
-libadd += $(INCLUDED_IMMODULE_OBJ)
-deps += $(INCLUDED_IMMODULE_OBJ)
-
-$(INCLUDED_IMMODULE_OBJ): included-modules
-	@true
-endif
-
-.PHONY: included-modules
-
-#
-# setup source file variables
-#
-
-include $(srcdir)/a11y/Makefile.inc
-include $(srcdir)/deprecated/Makefile.inc
-include $(srcdir)/inspector/Makefile.inc
-
-# GTK+ header files for public installation (non-generated, or generated
-# by configure)
-
-gtk_public_h_sources = 		\
-	gtk.h			\
-	gtk-autocleanups.h	\
-	gtk-a11y.h		\
-	gtkaboutdialog.h	\
-	gtkaccelgroup.h		\
-	gtkaccellabel.h		\
-	gtkaccelmap.h		\
-	gtkaccessible.h		\
-	gtkactionable.h		\
-	gtkactionbar.h		\
-	gtkadjustment.h		\
-	gtkappchooser.h		\
-	gtkappchooserbutton.h	\
-	gtkappchooserdialog.h	\
-	gtkappchooserwidget.h	\
-	gtkapplication.h	\
-	gtkapplicationwindow.h	\
-	gtkaspectframe.h	\
-	gtkassistant.h		\
-	gtkbbox.h		\
-	gtkbin.h		\
-	gtkbindings.h		\
-	gtkborder.h		\
-	gtkbox.h		\
-	gtkbuilder.h		\
-	gtkbuildable.h		\
-	gtkbutton.h		\
-	gtkcalendar.h		\
-	gtkcellarea.h		\
-	gtkcellareacontext.h	\
-	gtkcellareabox.h	\
-	gtkcelleditable.h	\
-	gtkcelllayout.h		\
-	gtkcellrenderer.h	\
-	gtkcellrendereraccel.h	\
-	gtkcellrenderercombo.h	\
-	gtkcellrendererpixbuf.h	\
-	gtkcellrendererprogress.h \
-	gtkcellrendererspin.h	\
-	gtkcellrendererspinner.h\
-	gtkcellrenderertext.h	\
-	gtkcellrenderertoggle.h	\
-	gtkcellview.h		\
-	gtkcenterbox.h		\
-	gtkcheckbutton.h	\
-	gtkcheckmenuitem.h	\
-	gtkclipboard.h		\
-	gtkcolorbutton.h	\
-	gtkcolorchooser.h	\
-	gtkcolorchooserwidget.h	\
-	gtkcolorchooserdialog.h	\
-	gtkcolorutils.h		\
-	gtkcombobox.h		\
-	gtkcomboboxtext.h	\
-	gtkcontainer.h		\
-	gtkcssprovider.h	\
-	gtkcsssection.h 	\
-	gtkdebug.h		\
-	gtkdialog.h		\
-	gtkdnd.h		\
-	gtkdragdest.h		\
-	gtkdragsource.h		\
-	gtkdrawingarea.h	\
-	gtkeditable.h		\
-	gtkentry.h		\
-	gtkentrybuffer.h	\
-	gtkentrycompletion.h	\
-	gtkenums.h		\
-	gtkeventcontroller.h	\
-	gtkexpander.h		\
-	gtkfilechooser.h	\
-	gtkfilechooserbutton.h	\
-	gtkfilechooserdialog.h	\
-	gtkfilechoosernative.h	\
-	gtkfilechooserwidget.h	\
-	gtkfilefilter.h		\
-	gtkfixed.h		\
-	gtkflowbox.h		\
-	gtkfontbutton.h		\
-	gtkfontchooser.h	\
-	gtkfontchooserdialog.h  \
-	gtkfontchooserwidget.h	\
-	gtkframe.h		\
-	gtkgesture.h		\
-	gtkgesturedrag.h	\
-	gtkgesturelongpress.h	\
-	gtkgesturemultipress.h	\
-	gtkgesturepan.h		\
-	gtkgesturerotate.h	\
-	gtkgesturesingle.h	\
-	gtkgestureswipe.h	\
-	gtkgesturezoom.h	\
-	gtkglarea.h		\
-	gtkgrid.h		\
-	gtkheaderbar.h		\
-	gtkicontheme.h		\
-	gtkiconview.h		\
-	gtkimage.h		\
-	gtkimcontext.h		\
-	gtkimcontextinfo.h	\
-	gtkimcontextsimple.h	\
-	gtkimmodule.h		\
-	gtkimmulticontext.h	\
-	gtkinfobar.h		\
-	gtkinvisible.h		\
-	gtklabel.h		\
-	gtklayout.h		\
-	gtklevelbar.h		\
-	gtklinkbutton.h		\
-	gtklistbox.h		\
-	gtkliststore.h		\
-	gtklockbutton.h		\
-	gtkmain.h		\
-	gtkmenu.h		\
-	gtkmenubar.h		\
-	gtkmenubutton.h		\
-	gtkmenuitem.h		\
-	gtkmenushell.h		\
-	gtkmenutoolbutton.h	\
-	gtkmessagedialog.h	\
-	gtkmodelbutton.h	\
-	gtkmodules.h		\
-	gtkmountoperation.h	\
-	gtknativedialog.h	\
-	gtknotebook.h		\
-	gtkorientable.h		\
-	gtkoverlay.h		\
-	gtkpadcontroller.h	\
-	gtkpagesetup.h		\
-	gtkpaned.h		\
-	gtkpapersize.h		\
-	gtkplacessidebar.h	\
-	gtkpopover.h		\
-	gtkpopovermenu.h	\
-	gtkprintcontext.h	\
-	gtkprintoperation.h	\
-	gtkprintoperationpreview.h \
-	gtkprintsettings.h	\
-	gtkprogressbar.h	\
-	gtkradiobutton.h	\
-	gtkradiomenuitem.h	\
-	gtkradiotoolbutton.h	\
-	gtkrange.h		\
-	gtkrecentchooser.h	\
-	gtkrecentchooserdialog.h \
-	gtkrecentchoosermenu.h	\
-	gtkrecentchooserwidget.h \
-	gtkrecentfilter.h	\
-	gtkrecentmanager.h	\
-	gtkrender.h		\
-	gtkrevealer.h		\
-	gtkscale.h		\
-	gtkscalebutton.h	\
-	gtkscrollable.h		\
-	gtkscrollbar.h		\
-	gtkscrolledwindow.h	\
-	gtksearchbar.h		\
-	gtksearchentry.h	\
-	gtkselection.h		\
-	gtkseparator.h		\
-	gtkseparatormenuitem.h	\
-	gtkseparatortoolitem.h	\
-	gtksettings.h		\
-	gtkshortcutlabel.h	\
-	gtkshortcutsgroup.h	\
-	gtkshortcutssection.h	\
-	gtkshortcutsshortcut.h	\
-	gtkshortcutswindow.h	\
-	gtkshow.h		\
-	gtkstacksidebar.h	\
-	gtksizegroup.h		\
-	gtksizerequest.h	\
-	gtksnapshot.h		\
-	gtkspinbutton.h		\
-	gtkspinner.h		\
-	gtkstack.h		\
-	gtkstackswitcher.h	\
-	gtkstatusbar.h		\
-	gtkstylecontext.h	\
-	gtkstyleprovider.h	\
-	gtkswitch.h		\
-	gtktestutils.h		\
-	gtktextbuffer.h		\
-	gtktextbufferrichtext.h	\
-	gtktextchild.h		\
-	gtktextdisplay.h	\
-	gtktextiter.h		\
-	gtktextmark.h		\
-	gtktexttag.h		\
-	gtktexttagtable.h	\
-	gtktextview.h		\
-	gtktogglebutton.h	\
-	gtktoggletoolbutton.h	\
-	gtktoolbar.h		\
-	gtktoolbutton.h		\
-	gtktoolitem.h		\
-	gtktoolitemgroup.h	\
-	gtktoolpalette.h	\
-	gtktoolshell.h		\
-	gtktooltip.h		\
-	gtktreednd.h		\
-	gtktreemodel.h		\
-	gtktreemodelfilter.h	\
-	gtktreemodelsort.h	\
-	gtktreeselection.h	\
-	gtktreesortable.h	\
-	gtktreestore.h		\
-	gtktreeview.h		\
-	gtktreeviewcolumn.h	\
-	gtktypes.h		\
-	gtkviewport.h		\
-	gtkvolumebutton.h	\
-	gtkwidget.h		\
-	gtkwidgetpath.h		\
-	gtkwindow.h		\
-	gtkwindowgroup.h
-
-if OS_UNIX
-gtk_unix_print_public_h_sources = 	\
-	gtkpagesetupunixdialog.h	\
-	gtkprintunixdialog.h		\
-	gtkprinter.h			\
-	gtkprintjob.h			\
-	gtkunixprint-autocleanups.h	\
-	gtkunixprint.h
-endif
-
-gtk_private_type_h_sources =	\
-	gtkcsstypesprivate.h	\
-	gtktexthandleprivate.h
-
-
-# GTK+ header files that don't get installed
-gtk_private_h_sources =		\
-	$(inspector_h_sources)	\
-	$(gtk_private_type_h_sources) \
-	gtkactionmuxer.h	\
-	gtkactionobserver.h	\
-	gtkactionobservable.h	\
-	gtkadjustmentprivate.h	\
-	gtkapplicationaccelsprivate.h	\
-	gtkapplicationprivate.h	\
-	gtkaccelgroupprivate.h	\
-	gtkaccelmapprivate.h	\
-	gtkactionhelper.h	\
-	gtkallocatedbitmaskprivate.h	\
-	gtkappchooserprivate.h	\
-	gtkbindingsprivate.h	\
-	gtkbitmaskprivate.h	\
-	gtkbitmaskprivateimpl.h	\
-	gtkbookmarksmanager.h	\
-	gtkboxprivate.h         \
-	gtkbuilderprivate.h	\
-	gtkbuttonprivate.h	\
-	gtkcellareaboxcontextprivate.h	\
-	gtkcheckbuttonprivate.h	\
-	gtkcheckmenuitemprivate.h	\
-	gtkclipboardprivate.h		\
-	gtkcolorswatchprivate.h	\
-	gtkcoloreditorprivate.h	\
-	gtkcolorplaneprivate.h	\
-	gtkcolorscaleprivate.h	\
-	gtkcolorchooserprivate.h	\
-	gtkcomboboxprivate.h	\
-	gtkcomposetable.h	\
-	gtkcontainerprivate.h   \
-	gtkcssanimationprivate.h	\
-	gtkcssanimatedstyleprivate.h	\
-	gtkcssarrayvalueprivate.h	\
-	gtkcssbgsizevalueprivate.h	\
-	gtkcssbordervalueprivate.h	\
-	gtkcsscalcvalueprivate.h	\
-	gtkcsscolorvalueprivate.h	\
-	gtkcsscornervalueprivate.h	\
-	gtkcssdimensionvalueprivate.h	\
-	gtkcsseasevalueprivate.h	\
-	gtkcssenumvalueprivate.h	\
-	gtkcssfiltervalueprivate.h	\
-	gtkcssiconthemevalueprivate.h	\
-	gtkcssimagebuiltinprivate.h	\
-	gtkcssimagecrossfadeprivate.h	\
-	gtkcssimagefallbackprivate.h	\
-	gtkcssimageiconthemeprivate.h	\
-	gtkcssimagelinearprivate.h	\
-	gtkcssimageradialprivate.h	\
-	gtkcssimageprivate.h	\
-	gtkcssimagesurfaceprivate.h	\
-	gtkcssimageurlprivate.h	\
-	gtkcssimagerecolorprivate.h	\
-	gtkcssimagescaledprivate.h	\
-	gtkcssimagevalueprivate.h	\
-	gtkcssimagewin32private.h	\
-	gtkcssinheritvalueprivate.h	\
-	gtkcssinitialvalueprivate.h	\
-	gtkcsskeyframesprivate.h	\
-	gtkcsslookupprivate.h	\
-	gtkcssmatcherprivate.h	\
-	gtkcssnodeprivate.h		\
-	gtkcssnodedeclarationprivate.h	\
-	gtkcssnodestylecacheprivate.h	\
-	gtkcssnumbervalueprivate.h	\
-	gtkcsspalettevalueprivate.h	\
-	gtkcssparserprivate.h	\
-	gtkcsspathnodeprivate.h	\
-	gtkcsspositionvalueprivate.h	\
-	gtkcssproviderprivate.h	\
-	gtkcssrepeatvalueprivate.h	\
-	gtkcssrgbavalueprivate.h	\
-	gtkcsssectionprivate.h 	\
-	gtkcssselectorprivate.h	\
-	gtkcssshadowsvalueprivate.h	\
-	gtkcssshadowvalueprivate.h      \
-	gtkcssshorthandpropertyprivate.h \
-	gtkcssstaticstyleprivate.h	\
-	gtkcssstringvalueprivate.h	\
-	gtkcssstylefuncsprivate.h \
-	gtkcssstylechangeprivate.h 	\
-	gtkcssstyleprivate.h 	\
-	gtkcssstylepropertyprivate.h \
-	gtkcsstransformvalueprivate.h	\
-	gtkcsstransientnodeprivate.h	\
-	gtkcsstransitionprivate.h	\
-	gtkcssunsetvalueprivate.h	\
-	gtkcssvalueprivate.h	\
-	gtkcsswin32sizevalueprivate.h   \
-	gtkcsswidgetnodeprivate.h	\
-	gtkcustompaperunixdialog.h \
-	gtkdebugupdatesprivate.h	\
-	gtkdialogprivate.h 	\
-	gtkdndprivate.h		\
-	gtkemojichooser.h	\
-	gtkentryprivate.h	\
-	gtkeventcontrollerprivate.h	\
-	gtkfilechooserembed.h	\
-	gtkfilechooserentry.h	\
-	gtkfilechooserprivate.h	\
-	gtkfilechoosernativeprivate.h	\
-	gtkfilechooserwidgetprivate.h	\
-	gtkfilechoosererrorstackprivate.h \
-	gtkfilechooserutils.h	\
-	gtkfilefilterprivate.h	\
-	gtkfilesystem.h		\
-	gtkfilesystemmodel.h	\
-	gtkfontchooserprivate.h	\
-	gtkfontchooserutils.h	\
-	gtkgestureprivate.h	\
-	gtkgesturedragprivate.h	\
-	gtkgesturelongpressprivate.h	\
-	gtkgesturemultipressprivate.h	\
-	gtkgesturepanprivate.h	\
-	gtkgesturerotateprivate.h	\
-	gtkgesturesingleprivate.h	\
-	gtkgestureswipeprivate.h	\
-	gtkgesturezoomprivate.h	\
-	gtkheaderbarprivate.h	\
-	gtkhslaprivate.h	\
-	gtkiconcache.h		\
-	gtkiconhelperprivate.h  \
-	gtkiconprivate.h	\
-	gtkiconthemeprivate.h  \
-	gtkiconviewprivate.h	\
-	gtkimagedefinitionprivate.h	\
-	gtkimageprivate.h	\
-	gtkimcontextsimpleprivate.h	\
-	gtkimmoduleprivate.h	\
-	gtkimcontextsimpleseqs.h \
-	gtkintl.h		\
-	gtkkeyhash.h		\
-	gtkkineticscrolling.h	\
-	gtklabelprivate.h	\
-	gtklockbuttonprivate.h	\
-	gtkmagnifierprivate.h	\
-	gtkmenubuttonprivate.h	\
-	gtkmenuprivate.h	\
-	gtkmenuitemprivate.h	\
-	gtkmenusectionbox.h	\
-	gtkmenushellprivate.h	\
-	gtkmenutracker.h	\
-	gtkmenutrackeritem.h	\
-	gtkmnemonichash.h	\
-	gtkmodelmenuitem.h	\
-	gtkmodulesprivate.h	\
-	gtkmountoperationprivate.h \
-	gtknativedialogprivate.h \
-	gtkorientableprivate.h	\
-	gtkpango.h		\
-	gtkpathbar.h		\
-	gtkplacessidebarprivate.h	\
-	gtkplacesviewprivate.h	\
-	gtkplacesviewrowprivate.h	\
-	gtkpointerfocusprivate.h	\
-	gtkpopoverprivate.h	\
-	gtkprintoperation-private.h \
-	gtkprintutils.h		\
-	gtkprivate.h		\
-	gtkprogresstrackerprivate.h	\
-	gtkquery.h		\
-	gtkrangeprivate.h	\
-	gtkrbtree.h		\
-	gtkrecentchooserdefault.h \
-	gtkrecentchooserprivate.h \
-	gtkrecentchooserutils.h	\
-	gtkrenderbackgroundprivate.h \
-	gtkrenderborderprivate.h \
-	gtkrendericonprivate.h	\
-	gtkresources.h		\
-	gtkroundedboxprivate.h	\
-	gtksearchengine.h	\
-	gtksearchenginesimple.h	\
-	gtksearchenginemodel.h	\
-	gtksearchentryprivate.h \
-	gtkselectionprivate.h	\
-	gtksettingsprivate.h	\
-	gtkshortcutswindowprivate.h	\
-	gtkshortcutsshortcutprivate.h	\
-	gtksidebarrowprivate.h	\
-	gtksizegroup-private.h	\
-	gtksizerequestcacheprivate.h	\
-	gtksnapshotprivate.h	\
-	gtkstyleanimationprivate.h \
-	gtkstylecascadeprivate.h \
-	gtkstylecontextprivate.h \
-	gtkstylepropertyprivate.h \
-	gtkstyleproviderprivate.h \
-	gtktextattributes.h	\
-	gtktextbtree.h		\
-	gtktextbufferprivate.h \
-	gtktextbufferserialize.h \
-	gtktextchildprivate.h	\
-	gtktexthandleprivate.h	\
-	gtktextiterprivate.h	\
-	gtktextlayout.h		\
-	gtktextmarkprivate.h	\
-	gtktextsegment.h	\
-	gtktexttagprivate.h	\
-	gtktexttypes.h		\
-	gtktextutil.h		\
-	gtktextviewprivate.h	\
-	gtktrashmonitor.h	\
-	gtktogglebuttonprivate.h \
-	gtktoolbarprivate.h	\
-	gtktoolpaletteprivate.h	\
-	gtktooltipprivate.h	\
-	gtktooltipwindowprivate.h \
-	gtktreedatalist.h	\
-	gtktreeprivate.h	\
-	gtkutilsprivate.h	\
-	gtkwidgetprivate.h	\
-	gtkwidgetpathprivate.h	\
-	gtkwin32drawprivate.h	\
-	gtkwin32themeprivate.h	\
-	gtkwindowprivate.h	\
-	gtktreemenu.h		\
-	gdkpixbufutilsprivate.h \
-	gtkgizmoprivate.h
-
-# GTK+ C sources to build the library from
-gtk_base_c_sources = 		\
-	$(a11y_c_sources)	\
-	$(deprecated_c_sources)	\
-	$(inspector_c_sources)	\
-	gtkactionmuxer.c	\
-	gtkactionobserver.c	\
-	gtkactionobservable.c	\
-	gtkactionable.c		\
-	gtkquery.c		\
-	gtksearchbar.c		\
-	gtksearchentry.c	\
-	gtksearchengine.c	\
-	gtksearchenginesimple.c	\
-	gtksearchenginemodel.c	\
-	fnmatch.c		\
-	gtkaboutdialog.c	\
-	gtkaccelgroup.c		\
-	gtkaccellabel.c		\
-	gtkaccelmap.c		\
-	gtkaccessible.c		\
-	gtkactionbar.c		\
-	gtkactionhelper.c	\
-	gtkadjustment.c		\
-	gtkallocatedbitmask.c	\
-	gtkappchooser.c		\
-	gtkappchooserwidget.c	\
-	gtkappchooserbutton.c	\
-	gtkappchooserdialog.c	\
-	gtkapplication.c	\
-	gtkapplicationaccels.c	\
-	gtkapplicationimpl.c	\
-	gtkapplicationwindow.c	\
-	gtkaspectframe.c	\
-	gtkassistant.c		\
-	gtkbbox.c		\
-	gtkbin.c		\
-	gtkbindings.c		\
-	gtkbookmarksmanager.c	\
-	gtkborder.c		\
-	gtkbox.c		\
-	gtkbuildable.c		\
-	gtkbuilder.c		\
-	gtkbuilderparser.c	\
-	gtkbuilder-menus.c	\
-	gtkbutton.c		\
-	gtkcalendar.c		\
-	gtkcellarea.c		\
-	gtkcellareabox.c	\
-	gtkcellareaboxcontext.c	\
-	gtkcellareacontext.c	\
-	gtkcelleditable.c	\
-	gtkcelllayout.c		\
-	gtkcellrenderer.c	\
-	gtkcellrendereraccel.c	\
-	gtkcellrenderercombo.c	\
-	gtkcellrendererpixbuf.c	\
-	gtkcellrendererprogress.c \
-	gtkcellrendererspin.c	\
-	gtkcellrendererspinner.c \
-	gtkcellrenderertext.c	\
-	gtkcellrenderertoggle.c	\
-	gtkcellview.c		\
-	gtkcheckbutton.c	\
-	gtkcheckmenuitem.c	\
-	gtkcolorbutton.c	\
-	gtkcolorchooser.c	\
-	gtkcolorchooserwidget.c	\
-	gtkcolorchooserdialog.c	\
-	gtkcoloreditor.c	\
-	gtkcolorplane.c		\
-	gtkcolorscale.c		\
-	gtkcolorswatch.c	\
-	gtkcolorutils.c		\
-	gtkcombobox.c		\
-	gtkcomboboxtext.c	\
-	gtkcomposetable.c	\
-	gtkcontainer.c		\
-	gtkcssanimation.c	\
-	gtkcssanimatedstyle.c	\
-	gtkcssarrayvalue.c	\
-	gtkcssbgsizevalue.c	\
-	gtkcssbordervalue.c	\
-	gtkcsscalcvalue.c	\
-	gtkcsscolorvalue.c	\
-	gtkcsscornervalue.c	\
-	gtkcssdimensionvalue.c	\
-	gtkcsseasevalue.c	\
-	gtkcssenumvalue.c	\
-	gtkcssfiltervalue.c	\
-	gtkcssiconthemevalue.c	\
-	gtkcssimage.c		\
-	gtkcssimagebuiltin.c	\
-	gtkcssimagecrossfade.c	\
-	gtkcssimagefallback.c	\
-	gtkcssimageicontheme.c	\
-	gtkcssimagelinear.c	\
-	gtkcssimageradial.c	\
-	gtkcssimagesurface.c	\
-	gtkcssimageurl.c	\
-	gtkcssimagerecolor.c	\
-	gtkcssimagescaled.c	\
-	gtkcssimagevalue.c	\
-	gtkcssimagewin32.c	\
-	gtkcssinheritvalue.c	\
-	gtkcssinitialvalue.c	\
-	gtkcsskeyframes.c	\
-	gtkcsslookup.c		\
-	gtkcssmatcher.c		\
-	gtkcssnode.c		\
-	gtkcssnodedeclaration.c	\
-	gtkcssnodestylecache.c	\
-	gtkcssnumbervalue.c	\
-	gtkcsspalettevalue.c	\
-	gtkcssparser.c		\
-	gtkcsspathnode.c	\
-	gtkcsspositionvalue.c	\
-	gtkcssprovider.c	\
-	gtkcssrepeatvalue.c	\
-	gtkcssrgbavalue.c	\
-	gtkcsssection.c 	\
-	gtkcssselector.c	\
-	gtkcssstringvalue.c	\
-	gtkcssstyle.c		\
-	gtkcssstylechange.c 	\
-	gtkcssshadowsvalue.c	\
-	gtkcssshadowvalue.c	\
-	gtkcssshorthandproperty.c \
-	gtkcssshorthandpropertyimpl.c \
-	gtkcssstaticstyle.c	\
-	gtkcssstylefuncs.c	\
-	gtkcssstyleproperty.c	\
-	gtkcssstylepropertyimpl.c \
-	gtkcsstransformvalue.c	\
-	gtkcsstransientnode.c	\
-	gtkcsstransition.c	\
-	gtkcssunsetvalue.c	\
-	gtkcsstypes.c		\
-	gtkcssvalue.c		\
-	gtkcsswidgetnode.c	\
-        gtkcsswin32sizevalue.c  \
-	gtkdebugupdates.c	\
-	gtkdialog.c		\
-	gtkdragsource.c		\
-	gtkdrawingarea.c	\
-	gtkeditable.c		\
-	gtkemojichooser.c	\
-	gtkentry.c		\
-	gtkentrybuffer.c	\
-	gtkentrycompletion.c	\
-	gtkeventcontroller.c	\
-	gtkexpander.c		\
-	gtkfilechooser.c	\
-	gtkfilechooserbutton.c	\
-	gtkfilechooserdialog.c	\
-	gtkfilechooserembed.c	\
-	gtkfilechooserentry.c	\
-	gtkfilechoosernative.c	\
-	gtkfilechoosernativeportal.c	\
-	gtkfilechooserutils.c	\
-	gtkfilechooserwidget.c	\
-	gtkfilefilter.c		\
-	gtkfilesystem.c		\
-	gtkfilesystemmodel.c	\
-	gtkfixed.c		\
-	gtkflowbox.c		\
-	gtkfontbutton.c		\
-	gtkfontchooser.c	\
-	gtkfontchooserdialog.c	\
-	gtkfontchooserutils.c	\
-	gtkfontchooserwidget.c	\
-	gtkframe.c		\
-	gtkgladecatalog.c	\
-	gtkgesture.c		\
-	gtkgesturedrag.c	\
-	gtkgesturelongpress.c	\
-	gtkgesturemultipress.c	\
-	gtkgesturepan.c		\
-	gtkgesturerotate.c	\
-	gtkgesturesingle.c	\
-	gtkgestureswipe.c	\
-	gtkgesturezoom.c	\
-	gtkglarea.c		\
-	gtkgrid.c		\
-	gtkheaderbar.c		\
-	gtkhsla.c		\
-	gtkicon.c		\
-	gtkiconcache.c		\
-	gtkiconcachevalidator.c	\
-	gtkiconhelper.c		\
-	gtkicontheme.c		\
-	gtkiconview.c		\
-	gtkimage.c		\
-	gtkimagedefinition.c	\
-	gtkimcontext.c		\
-	gtkimcontextsimple.c	\
-	gtkimmodule.c		\
-	gtkimmulticontext.c	\
-	gtkinfobar.c		\
-	gtkinvisible.c		\
-	gtkkeyhash.c		\
-	gtkkineticscrolling.c	\
-	gtklabel.c		\
-	gtklayout.c		\
-	gtklevelbar.c		\
-	gtklinkbutton.c		\
-	gtklistbox.c		\
-	gtkliststore.c		\
-	gtklockbutton.c		\
-	gtkmain.c		\
-	gtkmagnifier.c		\
-	gtkmarshalers.c		\
-	gtkmenu.c		\
-	gtkmenubar.c		\
-	gtkmenubutton.c		\
-	gtkmenuitem.c		\
-	gtkmenusectionbox.c	\
-	gtkmenushell.c		\
-	gtkmenutracker.c	\
-	gtkmenutrackeritem.c	\
-	gtkmenutoolbutton.c	\
-	gtkmessagedialog.c	\
-	gtkmnemonichash.c	\
-	gtkmodelmenuitem.c	\
-	gtkmodelbutton.c	\
-	gtkmodules.c		\
-	gtkmountoperation.c	\
-	gtknativedialog.c	\
-	gtknotebook.c		\
-	gtkorientable.c		\
-	gtkoverlay.c		\
-	gtkpadcontroller.c	\
-	gtkpagesetup.c		\
-	gtkpaned.c		\
-	gtkpango.c		\
-	gtkpapersize.c		\
-	gtkpathbar.c		\
-	gtkplacessidebar.c	\
-	gtkplacesview.c		\
-	gtkplacesviewrow.c	\
-	gtkprintcontext.c	\
-	gtkprintoperation.c	\
-	gtkprintoperationpreview.c \
-	gtkprintsettings.c	\
-	gtkprintutils.c		\
-	gtkprivate.c		\
-	gtkprivatetypebuiltins.c \
-	gtkprogressbar.c	\
-	gtkprogresstracker.c	\
-	gtkpointerfocus.c	\
-	gtkpopover.c		\
-	gtkpopovermenu.c	\
-	gtkradiobutton.c	\
-	gtkradiomenuitem.c	\
-	gtkradiotoolbutton.c	\
-	gtkrange.c		\
-	gtkrbtree.c		\
-	gtkrecentchooserdefault.c \
-	gtkrecentchooserdialog.c \
-	gtkrecentchoosermenu.c	\
-	gtkrecentchooserwidget.c \
-	gtkrecentchooserutils.c	\
-	gtkrecentchooser.c	\
-	gtkrecentfilter.c	\
-	gtkrecentmanager.c	\
-	gtkrender.c		\
-	gtkrenderbackground.c	\
-	gtkrenderborder.c	\
-	gtkrendericon.c		\
-	gtkresources.c		\
-	gtkrevealer.c		\
-	gtkroundedbox.c		\
-	gtkscale.c		\
-	gtkscalebutton.c	\
-	gtkscrollable.c		\
-	gtkscrollbar.c		\
-	gtkscrolledwindow.c	\
-	gtkselection.c		\
-	gtkseparator.c		\
-	gtkseparatormenuitem.c	\
-	gtkseparatortoolitem.c	\
-	gtksettings.c		\
-	gtkshortcutsgroup.c	\
-	gtkshortcutlabel.c	\
-	gtkshortcutsshortcut.c	\
-	gtkshortcutssection.c	\
-	gtkshortcutswindow.c	\
-	gtksidebarrow.c		\
-	gtksizegroup.c		\
-	gtksizerequest.c	\
-	gtksizerequestcache.c	\
-	gtkshow.c		\
-	gtksnapshot.c		\
-	gtkspinbutton.c		\
-	gtkspinner.c		\
-	gtkstack.c		\
-	gtkstacksidebar.c	\
-	gtkstackswitcher.c	\
-	gtkstatusbar.c		\
-	gtkstyleanimation.c	\
-	gtkstylecascade.c	\
-	gtkstylecontext.c	\
-	gtkstyleproperty.c	\
-	gtkstyleprovider.c	\
-	gtkstyleproviderprivate.c	\
-	gtkswitch.c		\
-	gtktestutils.c		\
-	gtktextattributes.c	\
-	gtktextbtree.c		\
-	gtktextbuffer.c		\
-	gtktextbufferrichtext.c	\
-	gtktextbufferserialize.c \
-	gtktextchild.c		\
-	gtktextdisplay.c	\
-	gtktexthandle.c		\
-	gtktextiter.c		\
-	gtktextlayout.c		\
-	gtktextmark.c		\
-	gtktextsegment.c	\
-	gtktexttag.c		\
-	gtktexttagtable.c	\
-	gtktexttypes.c		\
-	gtktextutil.c		\
-	gtktextview.c		\
-	gtktogglebutton.c	\
-	gtktoggletoolbutton.c	\
-	gtktoolbar.c		\
-	gtktoolbutton.c		\
-	gtktoolitem.c		\
-	gtktoolitemgroup.c	\
-	gtktoolpalette.c	\
-	gtktoolshell.c		\
-	gtktooltip.c		\
-	gtktooltipwindow.c	\
-	gtktrashmonitor.c	\
-	gtktreedatalist.c	\
-	gtktreednd.c		\
-	gtktreemenu.c		\
-	gtktreemodel.c		\
-	gtktreemodelfilter.c	\
-	gtktreemodelsort.c	\
-	gtktreeselection.c	\
-	gtktreesortable.c	\
-	gtktreestore.c		\
-	gtktreeview.c		\
-	gtktreeviewcolumn.c	\
-	gtktypebuiltins.c	\
-	gtkutils.c		\
-	gtkvolumebutton.c	\
-	gtkviewport.c		\
-	gtkwidget.c		\
-	gtkwidgetfocus.c	\
-	gtkwidgetpath.c		\
-	gtkwindow.c		\
-	gtkwindowgroup.c	\
-	gtkwin32draw.c		\
-	gtkwin32theme.c		\
-	gdkpixbufutils.c 	\
-	gtkgizmo.c 		\
-	gtkcenterbox.c 		\
-	gtkfilechoosererrorstack.c
-
-if USE_QUARTZ
-gtk_base_c_sources += 		\
-	gtkclipboard-quartz.c	\
-	gtkdnd-quartz.c
-else
-gtk_base_c_sources += 		\
-	gtkclipboard.c 		\
-	gtkdnd.c		\
-	gtkdragdest.c
-endif
-
-nodist_gtk_c_sources =
-gtk_c_sources = $(gtk_base_c_sources)
-
-gtk_dbus_built_sources = gtkdbusgenerated.c gtkdbusgenerated.h
-
-$(gtk_dbus_built_sources) : Makefile.am gtkdbusinterfaces.xml
-	$(AM_V_GEN) gdbus-codegen \
-	--interface-prefix org.Gtk. \
-	--c-namespace _Gtk \
-	--generate-c-code gtkdbusgenerated \
-	$(srcdir)/gtkdbusinterfaces.xml
-
-nodist_gtk_c_sources += $(gtk_dbus_built_sources)
-
-gtk_os_unix_c_sources = 		\
-	gtkcustompaperunixdialog.c	\
-	gtkpagesetupunixdialog.c	\
-	gtkprinter.c			\
-	gtkprinteroption.c		\
-	gtkprinteroptionset.c		\
-	gtkprinteroptionwidget.c	\
-	gtkprintjob.c			\
-	gtkprintoperation-unix.c	\
-	gtkprintoperation-portal.h	\
-	gtkprintoperation-portal.c	\
-	gtkprintunixdialog.c		\
-        gtkprintbackend.c		\
-	gtksearchenginetracker.c
-
-if OS_UNIX
-gtk_private_h_sources += \
-	gtkiconcachevalidator.h		\
-	gtkprintbackend.h		\
-	gtkprinter-private.h		\
-	gtkprinteroption.h		\
-	gtkprinteroptionset.h		\
-	gtkprinteroptionwidget.h	\
-	gtksearchenginetracker.h
-
-gtk_c_sources += $(gtk_os_unix_c_sources)
-endif
-
-gtk_os_win32_c_sources = \
-	gtkprint-win32.c		\
-	gtkprintoperation-win32.c	\
-	gtkfilechoosernativewin32.c	\
-	gtkwin32.c
-if OS_WIN32
-gtk_private_h_sources += gtkprint-win32.h
-gtk_c_sources += $(gtk_os_win32_c_sources)
-endif
-
-gtk_use_x11_c_sources = 	\
-	gtkapplication-x11.c	\
-	gtkmountoperation-x11.c
-
-gtk_use_wayland_c_sources = \
-	gtkapplication-wayland.c
-
-gtk_use_wayland_or_x11_c_sources = \
-	gtkapplication-dbus.c
-
-gtk_use_win32_c_sources = 	\
-	gtkmountoperation-stub.c
-gtk_use_quartz_c_sources = 	\
-	gtksearchenginequartz.c	\
-	gtkmountoperation-stub.c \
-	gtkapplication-quartz.c \
-	gtkapplication-quartz-menu.c \
-	gtkfilechoosernativequartz.c \
-	gtkquartz.c
-gtk_use_stub_c_sources = 	\
-	gtkmountoperation-stub.c
-if USE_X11
-gtk_c_sources += $(gtk_use_x11_c_sources)
-endif
-
-if USE_WAYLAND
-gtk_c_sources += $(gtk_use_wayland_c_sources)
-endif
-
-# pretty tricky way to write USE_WAYLAND || USE_X11...
-if USE_WAYLAND
-gtk_c_sources += $(gtk_use_wayland_or_x11_c_sources)
-else
-if USE_X11
-gtk_c_sources += $(gtk_use_wayland_or_x11_c_sources)
-else
-endif
-endif
-
-if USE_WIN32
-gtk_c_sources += $(gtk_use_win32_c_sources)
-endif
-
-gtk_use_quartz_private_h_sources = 	\
-	gtksearchenginequartz.h	\
-	gtkquartz.h
-if USE_QUARTZ
-gtk_c_sources += $(gtk_use_quartz_c_sources)
-libgtk_4_la_CFLAGS = "-xobjective-c"
-gtk_private_h_sources += $(gtk_use_quartz_private_h_sources)
-endif
-
-gtk_all_private_h_sources = \
-	$(a11y_private_h_sources) \
-	$(deprecated_private_h_sources) \
-	$(gtk_private_h_sources) \
-	$(gtk_use_quartz_private_h_sources)
-
-if !USE_X11
-if !USE_WIN32
-if !USE_QUARTZ
-gtk_c_sources += $(gtk_use_stub_c_sources)
-endif
-endif
-endif
-
-# we use our own built_sources variable rules to avoid automake's
-# BUILT_SOURCES oddities
-# we generate frequently rebuild files piggyback on a stamp file, so sources
-# depending on them only get rebuild when the built source actually changed
-# content
-
-# built sources that get installed with the header files
-gtk_built_public_sources =			\
-	gtktypebuiltins.h
-
-# built headers that don't get installed
-gtk_built_private_headers =			\
-	gtkresources.h				\
-	gtkmarshalers.h				\
-	gtkprivatetypebuiltins.h
-
-gtk_built_sources =				\
-	$(gtk_built_private_headers)		\
-	$(gtk_built_public_sources)		\
-	gtkresources.c				\
-	gtk.gresource.xml			\
-	gtktypebuiltins.c			\
-	gtktypefuncs.inc				\
-	gtkmarshalers.c				\
-	gtkprivatetypebuiltins.c
-
-stamp_files =					\
-	stamp-gtkmarshalers.h			\
-	stamp-gtktypebuiltins.h			\
-	stamp-gtkprivatetypebuiltins.h
-
-# non-header sources (headers should be specified in the above variables)
-# that don't serve as direct make target sources, i.e. they don't have
-# their own .lo rules and don't get publically installed
-gtk_extra_sources =				\
-	paper_names.c				\
-	paper_names_offsets.c			\
-	gen-paper-names.c			\
-	gtkversion.h.in				\
-	gtkmarshalers.list			\
-	fallback-c89.c
-
-#
-# setup GTK+ sources and their dependencies
-#
-MAINTAINERCLEANFILES = \
-	$(gtk_built_sources) 			\
-	$(gtk_dbus_built_sources)		\
-	$(print_portal_built_sources)		\
-	$(stamp_files)
-
-DISTCLEANFILES =
-
-if OS_WIN32
-DISTCLEANFILES += gtk-win32.rc
-endif
-
-EXTRA_DIST += $(gtk_all_private_h_sources) $(gtk_extra_sources)
-EXTRA_DIST += $(gtk_built_sources)
-
-
-pkgdatadir = $(datadir)/gtk-$(GTK_API_VERSION)
-pkgdata_DATA = gtkbuilder.rng
-
-EXTRA_DIST += gtkbuilder.rnc gtkbuilder.rng
-
-itsdir = $(datadir)/gettext/its
-its_DATA = gtkbuilder.loc gtkbuilder.its
-
-EXTRA_DIST += $(its_DATA)
-
-templates =				\
-	$(inspector_templates)		\
-	ui/gtkapplication-quartz.ui	\
-	ui/gtkaboutdialog.ui		\
-	ui/gtkappchooserdialog.ui	\
-	ui/gtkappchooserwidget.ui	\
-	ui/gtkassistant.ui		\
-	ui/gtkcolorchooserdialog.ui	\
-	ui/gtkcoloreditor.ui		\
-	ui/gtkcombobox.ui		\
-	ui/gtkdialog.ui			\
-	ui/gtkemojichooser.ui		\
-	ui/gtkfilechooserwidget.ui	\
-	ui/gtkfilechooserdialog.ui	\
-	ui/gtkfontchooserdialog.ui	\
-	ui/gtkfontchooserwidget.ui	\
-	ui/gtkinfobar.ui		\
-	ui/gtklockbutton.ui		\
-	ui/gtkmessagedialog.ui	\
-	ui/gtkpagesetupunixdialog.ui	\
-	ui/gtkpathbar.ui		\
-	ui/gtkplacesview.ui		\
-	ui/gtkplacesviewrow.ui		\
-	ui/gtkprintunixdialog.ui	\
-	ui/gtkrecentchooserdefault.ui	\
-	ui/gtksearchbar.ui		\
-	ui/gtkscalebutton.ui		\
-	ui/gtkstatusbar.ui		\
-	ui/gtktooltipwindow.ui		\
-	ui/gtkvolumebutton.ui		\
-	ui/gtksidebarrow.ui
-
-#
-# rules to generate built sources
-#
-# setup autogeneration dependencies
-gen_sources = xgen-gdef xgen-gtbh xgen-gtic xgen-gmh xgen-gmc xgen-gmlh xgen-gmlc xgen-gtfsrc.c xgen-gtf
-CLEANFILES = $(gen_sources)
-
-BUILT_SOURCES = \
-	$(gtk_built_sources) \
-	$(gtk_dbus_built_sources) \
-	$(print_portal_built_sources)
-
-# all autogenerated files need to be generated in the srcdir,
-# so old versions get remade and are not confused with newer
-# versions in the build dir. thus a development setup requires
-# srcdir to be writable, passing --disable-rebuilds to
-# ../configure will supress all autogeneration rules.
-gtkmarshalers.h: stamp-gtkmarshalers.h
-	@true
-stamp-gtkmarshalers.h: gtkmarshalers.list
-	$(AM_V_GEN) $(GLIB_GENMARSHAL) \
-		--header \
-		--prefix=_gtk_marshal \
-		--valist-marshallers \
-		$(srcdir)/gtkmarshalers.list > xgen-gmlh \
-	&& (cmp -s xgen-gmlh gtkmarshalers.h || cp xgen-gmlh gtkmarshalers.h) \
-	&& rm -f xgen-gmlh \
-	&& echo timestamp > $(@F)
-gtkmarshalers.c: gtkmarshalers.list
-	$(AM_V_GEN) $(GLIB_GENMARSHAL) \
-		--body \
-		--prefix=_gtk_marshal \
-		--valist-marshallers \
-		--include-header="gtkmarshalers.h" \
-		-U G_ENABLE_DEBUG \
-		$(srcdir)/gtkmarshalers.list > xgen-gmlc \
-	&& cp xgen-gmlc gtkmarshalers.c \
-	&& rm -f xgen-gmlc
-
-gtktypebuiltins.h: stamp-gtktypebuiltins.h
-	@true
-stamp-gtktypebuiltins.h: $(gtk_public_h_sources) $(a11y_h_sources) $(deprecated_h_sources) gtktypebuiltins.h.template
-	$(AM_V_GEN) ( cd $(srcdir) && $(GLIB_MKENUMS) --template gtktypebuiltins.h.template \
-		$(gtk_public_h_sources) $(a11y_h_sources) $(deprecated_h_sources) ) > xgen-gtbh \
-	&& (cmp -s xgen-gtbh gtktypebuiltins.h || cp xgen-gtbh gtktypebuiltins.h ) \
-	&& rm -f xgen-gtbh \
-	&& echo timestamp > $(@F)
-gtktypebuiltins.c: $(gtk_public_h_sources) $(a11y_h_sources) $(deprecated_h_sources) gtktypebuiltins.c.template
-	$(AM_V_GEN) ( cd $(srcdir) && $(GLIB_MKENUMS) --template gtktypebuiltins.c.template \
-		$(gtk_public_h_sources) $(a11y_h_sources) $(deprecated_h_sources) ) > xgen-gtbc \
-	&& cp xgen-gtbc gtktypebuiltins.c  \
-	&& rm -f xgen-gtbc
-
-gtk.gresource.xml: Makefile.am inspector/Makefile.inc
-	$(AM_V_GEN) echo "<?xml version='1.0' encoding='UTF-8'?>" > $@; \
-	echo "<gresources>" >> $@; \
-	echo "  <gresource prefix='/org/gtk/libgtk'>" >> $@; \
-        echo "    <file>theme/Adwaita/gtk.css</file>" >> $@; \
-        echo "    <file>theme/Adwaita/gtk-dark.css</file>" >> $@; \
-        echo "    <file>theme/Adwaita/gtk-contained.css</file>" >> $@; \
-        echo "    <file>theme/Adwaita/gtk-contained-dark.css</file>" >> $@; \
-        for f in $(srcdir)/theme/Adwaita/assets/*.png; do \
-          n=`basename $$f`; \
-          echo "    <file preprocess='to-pixdata'>theme/Adwaita/assets/$$n</file>" >> $@; \
-        done; \
-        for f in $(srcdir)/theme/Adwaita/assets/*.svg; do \
-          n=`basename $$f`; \
-          echo "    <file>theme/Adwaita/assets/$$n</file>" >> $@; \
-        done; \
-	echo "    <file>theme/HighContrast/gtk.css</file>" >> $@; \
-	echo "    <file alias='theme/HighContrastInverse/gtk.css'>theme/HighContrast/gtk-inverse.css</file>" >> $@; \
-	echo "    <file>theme/HighContrast/gtk-contained.css</file>" >> $@; \
-	echo "    <file>theme/HighContrast/gtk-contained-inverse.css</file>" >> $@; \
-	      for f in $(srcdir)/theme/HighContrast/assets/*.png; do \
-          n=`basename $$f`; \
-          echo "    <file preprocess='to-pixdata'>theme/HighContrast/assets/$$n</file>" >> $@; \
-        done; \
-        for f in $(srcdir)/theme/HighContrast/assets/*.svg; do \
-          n=`basename $$f`; \
-          echo "    <file>theme/HighContrast/assets/$$n</file>" >> $@; \
-        done; \
-	echo "    <file>theme/win32/gtk-win32-base.css</file>" >> $@; \
-	echo "    <file>theme/win32/gtk.css</file>" >> $@; \
-	for f in $(srcdir)/cursor/*.png; do \
-	  n=`basename $$f`; \
-	  echo "    <file>cursor/$$n</file>" >> $@; \
-	done; \
-	for f in $(srcdir)/gesture/*.symbolic.png; do \
-	  n=`basename $$f`; \
-	  echo "    <file alias='icons/64x64/actions/$$n'>gesture/$$n</file>" >> $@; \
-	done; \
-	for f in $(srcdir)/ui/*.ui; do \
-	  n=`basename $$f`; \
-	  echo "    <file preprocess='xml-stripblanks'>ui/$$n</file>" >> $@; \
-	done; \
-	for s in 16x16 22x22 24x24 32x32 48x48; do \
-	  for c in actions status; do \
-	    for f in $(srcdir)/icons/$$s/$$c/*.png; do \
-	      test "$$f" = "$(srcdir)/icons/$$s/$$c/*.png" && continue; \
-	      n=`basename $$f`; \
-	      echo "    <file>icons/$$s/$$c/$$n</file>" >> $@; \
-	    done; \
-	  done; \
-	done; \
-	for f in $(srcdir)/inspector/*.ui; do \
-	  n=`basename $$f`; \
-	  echo "    <file preprocess='xml-stripblanks'>inspector/$$n</file>" >> $@; \
-	done; \
-	echo "    <file>inspector/logo.png</file>" >> $@; \
-	echo "    <file>emoji/emoji.data</file>" >> $@; \
-	echo "  </gresource>" >> $@; \
-	echo "</gresources>" >> $@;
-
-gesture_sources = 				\
-	gesture/gesture-pinch-symbolic.svg			\
-	gesture/gesture-stretch-symbolic.svg			\
-	gesture/gesture-rotate-clockwise-symbolic.svg		\
-	gesture/gesture-rotate-anticlockwise-symbolic.svg	\
-	gesture/gesture-swipe-left-symbolic.svg			\
-	gesture/gesture-swipe-right-symbolic.svg		\
-	gesture/gesture-two-finger-swipe-left-symbolic.svg	\
-	gesture/gesture-two-finger-swipe-right-symbolic.svg
-
-adwaita_theme_scss = \
-	theme/Adwaita/_colors.scss 		\
-	theme/Adwaita/_colors-public.scss 	\
-	theme/Adwaita/_common.scss 		\
-	theme/Adwaita/_drawing.scss 		\
-	$()
-
-highcontrast_theme_scss = \
-	theme/HighContrast/_colors.scss 	\
-	theme/HighContrast/_common.scss 	\
-	theme/HighContrast/_drawing.scss 	\
-	$()
-
-if REBUILD_SCSS
-# If we have sassc then we can rebuild the theme CSS as soon as the SCSS
-# files have been changed
-
-scss_verbose = $(scss_verbose_@AM_V@)
-scss_verbose_ = $(scss_verbose_@AM_DEFAULT_V@)
-scss_verbose_0 = @echo "  SCSS     $@";
-
-SASSC_OPTS = -a -M -t compact
-
-theme/Adwaita/gtk-contained.css: $(top_srcdir)/gtk/theme/Adwaita/gtk-contained.scss $(adwaita_theme_scss)
-	$(scss_verbose) $(MKDIR_P) $(dir $@) && $(SASSC) $(SASSC_OPTS) $< $@ || rm -f $@
-
-theme/Adwaita/gtk-contained-dark.css: $(top_srcdir)/gtk/theme/Adwaita/gtk-contained-dark.scss $(adwaita_theme_scss)
-	$(scss_verbose) $(MKDIR_P) $(dir $@) && $(SASSC) $(SASSC_OPTS) $< $@ || rm -f $@
-
-theme/HighContrast/gtk-contained.css: $(top_srcdir)/gtk/theme/HighContrast/gtk-contained.scss $(highcontrast_theme_scss)
-	$(scss_verbose) $(MKDIR_P) $(dir $@) && $(SASSC) $(SASSC_OPTS) $< $@ || rm -f $@
-
-theme/HighContrast/gtk-contained-inverse.css: $(top_srcdir)/gtk/theme/HighContrast/gtk-contained-inverse.scss $(highcontrast_theme_scss)
-	$(scss_verbose) $(MKDIR_P) $(dir $@) && $(SASSC) $(SASSC_OPTS) $< $@ || rm -f $@
-
-endif # REBUILD_SCSS
-
-theme_sources = 				\
-	theme/win32/gtk.css	 		\
-	theme/win32/gtk-win32-base.css 		\
-	$(adwaita_theme_scss)			\
-	theme/Adwaita/gtk-contained.scss 	\
-	theme/Adwaita/gtk-contained-dark.scss 	\
-	theme/Adwaita/assets.txt 		\
-	theme/Adwaita/assets.svg 		\
-	theme/Adwaita/README 			\
-	theme/Adwaita/gtk-contained.css 	\
-	theme/Adwaita/gtk-contained-dark.css 	\
-	theme/Adwaita/gtk.css 			\
-	theme/Adwaita/gtk-dark.css 		\
-	$(highcontrast_theme_scss)		\
-	theme/HighContrast/gtk-contained.scss 	\
-	theme/HighContrast/gtk-contained-inverse.scss \
-	theme/HighContrast/gtk-contained.css 	\
-	theme/HighContrast/gtk-contained-inverse.css \
-	theme/HighContrast/gtk.css 		\
-	theme/HighContrast/gtk-inverse.css
-
-resource_files = $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(builddir)/gtk.gresource.xml)
-
-gtkresources.h: gtk.gresource.xml
-	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $< \
-		--target=$@ --sourcedir=$(srcdir) --c-name _gtk --generate-header --manual-register
-gtkresources.c: gtk.gresource.xml $(resource_files)
-	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $< \
-		--target=$@ --sourcedir=$(srcdir) --c-name _gtk --generate-source --manual-register
-
-gtkprivatetypebuiltins.h: stamp-gtkprivatetypebuiltins.h
-	@true
-stamp-gtkprivatetypebuiltins.h: $(gtk_private_type_h_sources) gtkprivatetypebuiltins.h.template
-	$(AM_V_GEN) ( cd $(srcdir) && $(GLIB_MKENUMS) --template gtkprivatetypebuiltins.h.template \
-		$(gtk_private_type_h_sources) ) > xgen-gptbh \
-	&& (cmp -s xgen-gptbh gtkprivatetypebuiltins.h || cp xgen-gptbh gtkprivatetypebuiltins.h ) \
-	&& rm -f xgen-gptbh \
-	&& echo timestamp > $(@F)
-gtkprivatetypebuiltins.c: $(gtk_private_type_h_sources)  gtkprivatetypebuiltins.c.template
-	$(AM_V_GEN) ( cd $(srcdir) && $(GLIB_MKENUMS) --template gtkprivatetypebuiltins.c.template \
-		$(gtk_private_type_h_sources) ) > xgen-gptbc \
-	&& cp xgen-gptbc gtkprivatetypebuiltins.c  \
-	&& rm -f xgen-gptbc
-
-
-gtktypefuncs.inc: stamp-gtktypebuiltins.h stamp-gtkprivatetypebuiltins.h $(top_srcdir)/gtk/*.h $(top_srcdir)/gtk/a11y/*.h $(top_srcdir)/gdk/*.h Makefile
-	$(AM_V_GEN) (echo '#undef GTK_COMPILATION' && echo '#include <gtk/gtk.h>') > xgen-gtfsrc.c && \
-	  echo 'G_GNUC_BEGIN_IGNORE_DEPRECATIONS' > xgen-gtf && \
-	  ${CPP} $(DEFS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) xgen-gtfsrc.c | \
-	  $(GREP) -o '\bg[td]k_[a-zA-Z0-9_]*_get_type\b' | \
-	  sort | uniq | \
-	  $(SED) '{ s/^/*tp++ = /; s/$$/();/; s/^.*\(gdk_x11\).*$$/#ifdef GDK_WINDOWING_X11\n&\n#endif/; }' >> xgen-gtf \
-	&& cp xgen-gtf $@ && rm -f xgen-gtf
-gtktestutils.c: gtktypefuncs.inc
-
-# target platform:
-lib_LTLIBRARIES = libgtk-4.la
-
-gtkincludedir = $(includedir)/gtk-4.0/gtk
-gtkinclude_HEADERS = $(gtk_public_h_sources) $(gtk_built_public_sources) gtkversion.h
-
-a11yincludedir = $(includedir)/gtk-4.0/gtk/a11y
-a11yinclude_HEADERS= $(a11y_h_sources)
-
-deprecatedincludedir = $(includedir)/gtk-4.0/gtk/deprecated
-deprecatedinclude_HEADERS= $(deprecated_h_sources)
-
-gtkunixprintincludedir = $(includedir)/gtk-4.0/unix-print/gtk
-gtkunixprintinclude_HEADERS = $(gtk_unix_print_public_h_sources)
-
-nodist_libgtk_4_la_SOURCES = $(nodist_gtk_c_sources)
-libgtk_4_la_SOURCES = $(gtk_c_sources)
-libgtk_4_la_LDFLAGS = $(libtool_opts)
-libgtk_4_la_LIBADD = $(libadd)
-libgtk_4_la_DEPENDENCIES = $(deps)
-
-if USE_WIN32
-libgtk_4_la_LIBADD += -lole32 -lgdi32 -lcomdlg32 -lwinspool -lcomctl32
-libgtk_4_la_LDFLAGS += -Wl,-luuid $(gtk_win32_res_ldflag)
-libgtk_4_la_DEPENDENCIES += $(gtk_win32_res)
-endif
-
-install-exec-hook:
-if DISABLE_EXPLICIT_DEPS
-	$(SHELL) $(top_srcdir)/sanitize-la.sh $(DESTDIR)$(libdir)/libgtk-4.la
-endif
-
-if USE_QUARTZ
-install-mac-key-theme:
-	$(MKDIR_P) $(DESTDIR)$(datadir)/themes/Mac/gtk-4.0
-	$(INSTALL_DATA) $(srcdir)/gtk-keys.css.mac $(DESTDIR)$(datadir)/themes/Mac/gtk-4.0/gtk-keys.css
-uninstall-mac-key-theme:
-	rm -f $(DESTDIR)$(datadir)/themes/Mac/gtk-4.0/gtk-keys.css
-else
-install-mac-key-theme:
-uninstall-mac-key-theme:
-endif
-
-# ------------------- MSVC Build Items ----------------
-MSVCPROJS = gtk-4
-
-gtk_4_FILES = \
-	$(gtk_base_c_sources)		\
-	$(gtk_os_win32_c_sources)	\
-	$(gtk_use_win32_c_sources)	\
-	$(gtk_dbus_built_sources)
-
-gtk_4_EXCLUDES = dummy
-gtk_4_HEADERS_DIR = $(gtkincludedir)
-
-gtk_4_HEADERS_INST = \
-	$(gtkinclude_HEADERS)	\
-	$(a11y_h_sources)	\
-	$(deprecated_h_sources)
-
-gtk_4_HEADERS_EXCLUDES = dummy
-
-include $(top_srcdir)/win32/Makefile.msvcproj
-
-if HAVE_INTROSPECTION
-# Introspection Items for MSVC
-MSVC_INTROSPECT_GIRS = Gtk-4.0.gir
-
-GTK_MSVC_GIR_CFLAGS =						\
-	$(GTK_BASE_CFLAGS_DEFINES)				\
-	-DGTK_LIBDIR=\\\"/dummy/lib\\\"				\
-	-DGTK_DATADIR=\\\"/dummy/share\\\"			\
-	-DGTK_DATA_PREFIX=\\\"/dummy\\\"			\
-	-DGTK_SYSCONFDIR=\\\"/dummy/etc\\\"			\
-	-DGTK_HOST=\\\"'$$$$(AT_PLAT)'-pc-vs'$$$$(VSVER)'\\\"	\
-	-DGTK_PRINT_BACKENDS=\\\"file\\\"			\
-	-DINCLUDE_IM_am_et			\
-	-DINCLUDE_IM_cedilla			\
-	-DINCLUDE_IM_cyrillic_translit		\
-	-DINCLUDE_IM_ime			\
-	-DINCLUDE_IM_inuktitu			\
-	-DINCLUDE_IM_ipa			\
-	-DINCLUDE_IM_multipress			\
-	-DINCLUDE_IM_thai			\
-	-DINCLUDE_IM_ti_er			\
-	-DINCLUDE_IM_ti_et			\
-	-DINCLUDE_IM_viqr			\
-	-DGTK_TEXT_USE_INTERNAL_UNSUPPORTED_API	\
-	-I../.. -I../../gtk -I../../gdk
-
-INTROSPECTION_INTERMEDIATE_ITEMS = \
-	$(top_builddir)/win32/Gtk-4.0.gir.msvc.introspect		\
-	$(top_builddir)/win32/Gtk_4_0_gir_list
-
-Gtk_4_0_gir_MSVC_FILES =		\
-	$(introspected_pub_headers)	\
-	$(gtk_base_c_sources)		\
-	$(gtk_os_win32_c_sources)	\
-	gtktypebuiltins.h		\
-	gtktypebuiltins.c
-
-Gtk_4_0_gir_MSVC_EXPORT_PACKAGES = $(Gtk_4_0_gir_EXPORT_PACKAGES)
-Gtk_4_0_gir_MSVC_INCLUDE_GIRS = Atk-1.0
-Gtk_4_0_gir_MSVC_LIBS = gtk-4
-Gtk_4_0_gir_MSVC_CFLAGS = $(GTK_MSVC_GIR_CFLAGS)
-Gtk_4_0_gir_MSVC_SCANNERFLAGS = --warn-all --add-include-path=. --include-uninstalled=./Gdk-4.0.gir --include-uninstalled=./Gsk-4.0.gir
-
-include $(top_srcdir)/win32/Makefile.msvc-introspection
-
-else
-INTROSPECTION_INTERMEDIATE_ITEMS =
-
-endif
-
-dist-hook: \
-	$(top_builddir)/win32/vs12/gtk-4.vcxproj	\
-	$(top_builddir)/win32/vs12/gtk-4.vs12.headers	\
-	$(INTROSPECTION_INTERMEDIATE_ITEMS)
-
-# Install a RC file for the default GTK+ theme, and key themes
-install-data-local: install-ms-lib install-def-file install-mac-key-theme
-	$(MKDIR_P) $(DESTDIR)$(datadir)/themes/Default/gtk-4.0
-	$(INSTALL_DATA) $(srcdir)/gtk-keys.css.default $(DESTDIR)$(datadir)/themes/Default/gtk-4.0/gtk-keys.css
-	$(MKDIR_P) $(DESTDIR)$(datadir)/themes/Emacs/gtk-4.0
-	$(INSTALL_DATA) $(srcdir)/gtk-keys.css.emacs $(DESTDIR)$(datadir)/themes/Emacs/gtk-4.0/gtk-keys.css
-
-uninstall-local: uninstall-ms-lib uninstall-def-file uninstall-mac-key-theme
-	rm -f $(DESTDIR)$(datadir)/themes/Default/gtk-4.0/gtk-keys.css
-	rm -f $(DESTDIR)$(datadir)/themes/Emacs/gtk-4.0/gtk-keys.css
-
-# 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
-
-if HAVE_INTROSPECTION
-introspected_pub_headers = $(filter-out %private.h gtktextdisplay.h gtktextlayout.h, $(gtkinclude_HEADERS) $(a11yinclude_HEADERS) $(deprecatedinclude_HEADERS))
-
-introspection_files = \
-    $(introspected_pub_headers) \
-    $(filter-out %win32.c, $(gtk_base_c_sources)) \
-    gtkprintoperation-unix.c \
-    gtktypebuiltins.h \
-    gtktypebuiltins.c
-
-include $(INTROSPECTION_MAKEFILE)
-INTROSPECTION_SCANNER_ENV = CC="$(CC)"
-INTROSPECTION_COMPILER_ARGS = \
-	--includedir=$(srcdir) \
-	--includedir=. \
-	--includedir=../gdk
-
-Gdk-4.0.gir: $(top_builddir)/gdk/Gdk-noinst-4.0.gir
-	$(AM_V_GEN) $(SED) \
-		-e "s/shared-library=\"[^\"]*\"/shared-library=\"libgtk-4.so.0\"/" \
-		-e "s/noinst-4.0/4.0/" \
-	< $(top_builddir)/gdk/Gdk-noinst-4.0.gir > $@
-EXTRA_GIRS = Gdk-4.0.gir
-
-if USE_X11
-GdkX11-4.0.gir: $(top_builddir)/gdk/GdkX11-noinst-4.0.gir Gdk-4.0.gir
-	$(AM_V_GEN) $(SED) \
-		-e "s/shared-library=\"[^\"]*\"/shared-library=\"libgtk-4.so.0\"/" \
-		-e "s/noinst-4.0/4.0/" \
-	< $(top_builddir)/gdk/GdkX11-noinst-4.0.gir > $@
-EXTRA_GIRS += GdkX11-4.0.gir
-endif
-
-if OS_WIN32
-
-GdkWin32-4.0.gir: $(top_builddir)/gdk/GdkX11-noinst-4.0.gir Gdk-4.0.gir
-	$(AM_V_GEN) $(SED) \
-		-e "s/shared-library=\"[^\"]*\"/shared-library=\"libgtk-4.so.0\"/" \
-		-e "s/noinst-4.0/4.0/" \
-	< $(top_builddir)/gdk/GdkX11-noinst-4.0.gir > $@
-EXTRA_GIRS += GdkWin32-4.0.gir
-
-endif
-
-Gsk-4.0.gir: $(top_builddir)/gsk/Gsk-noinst-4.0.gir Gdk-4.0.gir
-	$(AM_V_GEN) $(SED) \
-		-e "s/shared-library=\"[^\"]*\"/shared-library=\"libgtk-4.so.0\"/" \
-		-e "s/noinst-4.0/4.0/" \
-	< $(top_builddir)/gsk/Gsk-noinst-4.0.gir > $@
-EXTRA_GIRS += Gsk-4.0.gir
-
-Gtk-4.0.gir: $(INTROSPECTION_SCANNER) libgtk-4.la Gdk-4.0.gir Gsk-4.0.gir Makefile
-Gtk_4_0_gir_SCANNERFLAGS = 			\
-	--warn-all				\
-	--add-include-path=./			\
-	--include-uninstalled=Gdk-4.0.gir \
-	--include-uninstalled=Gsk-4.0.gir
-Gtk_4_0_gir_INCLUDES = Atk-1.0
-if USE_X11
-Gtk_4_0_gir_SCANNERFLAGS += --add-include-path=$(top_builddir)/gdk/x11
-Gtk_4_0_gir_INCLUDES += xlib-2.0
-endif
-Gtk_4_0_gir_CFLAGS = \
-		$(AM_CPPFLAGS) \
-		-DGTK_TEXT_USE_INTERNAL_UNSUPPORTED_API
-Gtk_4_0_gir_FILES = $(introspection_files)
-Gtk_4_0_gir_LIBS = libgtk-4.la $(top_builddir)/gsk/libgsk-4.la
-Gtk_4_0_gir_EXPORT_PACKAGES = gtk+-4.0
-INTROSPECTION_GIRS = Gtk-4.0.gir
-
-girdir = $(datadir)/gir-1.0
-nodist_gir_DATA = $(INTROSPECTION_GIRS) $(EXTRA_GIRS)
-
-typelibsdir = $(libdir)/girepository-1.0
-nodist_typelibs_DATA = $(INTROSPECTION_GIRS:.gir=.typelib) $(EXTRA_GIRS:.gir=.typelib)
-
-CLEANFILES += $(nodist_gir_DATA) $(nodist_typelibs_DATA)
-endif
-
-#
-# Installed tools
-#
-bin_PROGRAMS = \
-	gtk4-query-immodules	\
-	gtk4-update-icon-cache \
-	gtk4-encode-symbolic-svg \
-	gtk4-builder-tool \
-	gtk4-query-settings \
-	gtk4-launch
-
-gtk4_query_immodules_SOURCES = queryimmodules.c gtkutils.c
-gtk4_query_immodules_LDADD = 		\
-	libgtk-4.la				\
-	$(GMODULE_LIBS)				\
-	$(GTK_DEP_LIBS)
-
-gtk4_update_icon_cache_SOURCES = updateiconcache.c
-gtk4_update_icon_cache_LDADD = $(GDK_PIXBUF_LIBS)
-
-gtk4_encode_symbolic_svg_SOURCES = encodesymbolic.c
-gtk4_encode_symbolic_svg_LDADD =			\
-	libgtk-4.la				\
-	$(GDK_PIXBUF_LIBS)			\
-	$(GTK_DEP_LIBS)
-
-gtk4_builder_tool_SOURCES = gtk-builder-tool.c
-gtk4_builder_tool_LDADD =			\
-	libgtk-4.la				\
-	$(GTK_DEP_LIBS)
-
-gtk4_query_settings_SOURCES = gtk-query-settings.c
-gtk4_query_settings_LDADD= 			\
-	libgtk-4.la				\
-	$(GTK_DEP_LIBS)
-
-gtk4_launch_SOURCES = gtk-launch.c
-gtk4_launch_LDADD =				\
-	libgtk-4.la				\
-	$(GTK_DEP_LIBS)
-
-if OS_WIN32
-
-# Workaround for UAC silliness: programs with "update" in their name
-# are believed to be installers and require elevated privileges to be
-# used... Embed a manifest file into executable to tell Windows that
-# gtk-update-icon-cache.exe doesn't require any special privileges.
-
-GTK_UPDATE_ICON_CACHE_MANIFEST = gtk-update-icon-cache.exe.manifest
-GTK_UPDATE_ICON_CACHE_RC = gtk-update-icon-cache.rc
-GTK_UPDATE_ICON_CACHE_MANIFEST_OBJECT = gtk-update-icon-cache_manifest.o
-
-$(GTK_UPDATE_ICON_CACHE_MANIFEST):
-	(echo '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>' ; \
-	 echo '<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">' ; \
-	 echo '  <assemblyIdentity version="1.0.0.0"' ; \
-	 echo '     processorArchitecture="'$(EXE_MANIFEST_ARCHITECTURE)'"' ; \
-	 echo '     name="gtk-update-icon-cache.exe"' ; \
-	 echo '     type="win32"/>' ; \
-	 echo '  <!-- Identify the application security requirements. -->' ; \
-	 echo '  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">' ; \
-	 echo '    <security>' ; \
-	 echo '      <requestedPrivileges>' ; \
-	 echo '        <requestedExecutionLevel' ; \
-	 echo '          level="asInvoker"' ; \
-	 echo '          uiAccess="false"/>' ; \
-	 echo '        </requestedPrivileges>' ; \
-	 echo '       </security>' ; \
-	 echo '  </trustInfo>' ; \
-	 echo '</assembly>' ) >$@
-
-$(GTK_UPDATE_ICON_CACHE_RC):
-	(echo 'CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST '$(GTK_UPDATE_ICON_CACHE_MANIFEST)) >$@
-
-$(GTK_UPDATE_ICON_CACHE_MANIFEST_OBJECT): $(GTK_UPDATE_ICON_CACHE_RC) $(GTK_UPDATE_ICON_CACHE_MANIFEST)
-	$(WINDRES) --input $< --output $@ --output-format=coff
-
-gtk4_update_icon_cache_LDADD += $(GTK_UPDATE_ICON_CACHE_MANIFEST_OBJECT)
-
-endif
-
-.PHONY: files
-
-files:
-	@files=`ls $(DISTFILES) 2> /dev/null `; for p in $$files; do \
-	  echo $$p; \
-	done
-
-gsettings_SCHEMAS = \
-	org.gtk.Settings.FileChooser.gschema.xml \
-	org.gtk.Settings.ColorChooser.gschema.xml \
-	org.gtk.Settings.EmojiChooser.gschema.xml \
-	org.gtk.Settings.Debug.gschema.xml
-
-@GSETTINGS_RULES@
-
-EXTRA_DIST +=                   \
-	$(resource_files)	\
-	$(gesture_sources)	\
-	$(theme_sources)	\
-	$(gsettings_SCHEMAS)	\
-	emoji/convert-emoji.c	\
-	emoji/emoji.json	\
-	a11y/Makefile.inc	\
-	deprecated/Makefile.inc	\
-	inspector/Makefile.inc	\
-	libgtk4.manifest.in	\
-	gtk-win32.rc.body.in	\
-	gtk-win32.rc.body	\
-	gtkprint-win32.h	\
-	gtkprint-win32.c	\
-	gtksearchenginequartz.h \
-	gtkdbusinterfaces.xml	\
-	gtk-keys.css.default	\
-	gtk-keys.css.emacs	\
-	gtk-keys.css.mac	\
-	makefile.msc		\
-	makefile.msc.in		\
-	gtktypebuiltins.c.template \
-	gtktypebuiltins.h.template \
-	gtkprivatetypebuiltins.c.template \
-	gtkprivatetypebuiltins.h.template
-
--include $(top_srcdir)/git.mk
diff --git a/m4/.gitignore b/m4/.gitignore
deleted file mode 100644
index d425a9182e..0000000000
--- a/m4/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-!/ax_prog_cc_for_build.m4
-!/pkg_config_for_build.m4
-*.m4
diff --git a/m4/ax_prog_cc_for_build.m4 b/m4/ax_prog_cc_for_build.m4
deleted file mode 100644
index 21256bf25b..0000000000
--- a/m4/ax_prog_cc_for_build.m4
+++ /dev/null
@@ -1,127 +0,0 @@
-# ===========================================================================
-#   http://www.gnu.org/software/autoconf-archive/ax_prog_cc_for_build.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_PROG_CC_FOR_BUILD
-#
-# DESCRIPTION
-#
-#   This macro searches for a C compiler that generates native executables,
-#   that is a C compiler that surely is not a cross-compiler. This can be
-#   useful if you have to generate source code at compile-time like for
-#   example GCC does.
-#
-#   The macro sets the CC_FOR_BUILD and CPP_FOR_BUILD macros to anything
-#   needed to compile or link (CC_FOR_BUILD) and preprocess (CPP_FOR_BUILD).
-#   The value of these variables can be overridden by the user by specifying
-#   a compiler with an environment variable (like you do for standard CC).
-#
-#   It also sets BUILD_EXEEXT and BUILD_OBJEXT to the executable and object
-#   file extensions for the build platform, and GCC_FOR_BUILD to `yes' if
-#   the compiler we found is GCC. All these variables but GCC_FOR_BUILD are
-#   substituted in the Makefile.
-#
-# LICENSE
-#
-#   Copyright (c) 2008 Paolo Bonzini <bonzini@gnu.org>
-#
-#   Copying and distribution of this file, with or without modification, are
-#   permitted in any medium without royalty provided the copyright notice
-#   and this notice are preserved. This file is offered as-is, without any
-#   warranty.
-
-#serial 7
-
-AU_ALIAS([AC_PROG_CC_FOR_BUILD], [AX_PROG_CC_FOR_BUILD])
-AC_DEFUN([AX_PROG_CC_FOR_BUILD], [dnl
-AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AC_PROG_CPP])dnl
-AC_REQUIRE([AC_EXEEXT])dnl
-AC_REQUIRE([AC_CANONICAL_HOST])dnl
-
-dnl Use the standard macros, but make them use other variable names
-dnl
-pushdef([ac_cv_prog_CPP], ac_cv_build_prog_CPP)dnl
-pushdef([ac_cv_prog_gcc], ac_cv_build_prog_gcc)dnl
-pushdef([ac_cv_prog_cc_works], ac_cv_build_prog_cc_works)dnl
-pushdef([ac_cv_prog_cc_cross], ac_cv_build_prog_cc_cross)dnl
-pushdef([ac_cv_prog_cc_g], ac_cv_build_prog_cc_g)dnl
-pushdef([ac_cv_exeext], ac_cv_build_exeext)dnl
-pushdef([ac_cv_objext], ac_cv_build_objext)dnl
-pushdef([ac_exeext], ac_build_exeext)dnl
-pushdef([ac_objext], ac_build_objext)dnl
-pushdef([CC], CC_FOR_BUILD)dnl
-pushdef([CPP], CPP_FOR_BUILD)dnl
-pushdef([CFLAGS], CFLAGS_FOR_BUILD)dnl
-pushdef([CPPFLAGS], CPPFLAGS_FOR_BUILD)dnl
-pushdef([LDFLAGS], LDFLAGS_FOR_BUILD)dnl
-pushdef([LIBS], LIBS_FOR_BUILD)dnl
-pushdef([host], build)dnl
-pushdef([host_alias], build_alias)dnl
-pushdef([host_cpu], build_cpu)dnl
-pushdef([host_vendor], build_vendor)dnl
-pushdef([host_os], build_os)dnl
-pushdef([ac_cv_host], ac_cv_build)dnl
-pushdef([ac_cv_host_alias], ac_cv_build_alias)dnl
-pushdef([ac_cv_host_cpu], ac_cv_build_cpu)dnl
-pushdef([ac_cv_host_vendor], ac_cv_build_vendor)dnl
-pushdef([ac_cv_host_os], ac_cv_build_os)dnl
-pushdef([ac_cpp], ac_build_cpp)dnl
-pushdef([ac_compile], ac_build_compile)dnl
-pushdef([ac_link], ac_build_link)dnl
-
-save_cross_compiling=$cross_compiling
-save_ac_tool_prefix=$ac_tool_prefix
-cross_compiling=no
-ac_tool_prefix=
-
-AC_PROG_CC
-AC_PROG_CPP
-AC_EXEEXT
-
-ac_tool_prefix=$save_ac_tool_prefix
-cross_compiling=$save_cross_compiling
-
-dnl Restore the old definitions
-dnl
-popdef([ac_link])dnl
-popdef([ac_compile])dnl
-popdef([ac_cpp])dnl
-popdef([ac_cv_host_os])dnl
-popdef([ac_cv_host_vendor])dnl
-popdef([ac_cv_host_cpu])dnl
-popdef([ac_cv_host_alias])dnl
-popdef([ac_cv_host])dnl
-popdef([host_os])dnl
-popdef([host_vendor])dnl
-popdef([host_cpu])dnl
-popdef([host_alias])dnl
-popdef([host])dnl
-popdef([LIBS])dnl
-popdef([LDFLAGS])dnl
-popdef([CPPFLAGS])dnl
-popdef([CFLAGS])dnl
-popdef([CPP])dnl
-popdef([CC])dnl
-popdef([ac_objext])dnl
-popdef([ac_exeext])dnl
-popdef([ac_cv_objext])dnl
-popdef([ac_cv_exeext])dnl
-popdef([ac_cv_prog_cc_g])dnl
-popdef([ac_cv_prog_cc_cross])dnl
-popdef([ac_cv_prog_cc_works])dnl
-popdef([ac_cv_prog_gcc])dnl
-popdef([ac_cv_prog_CPP])dnl
-
-dnl Finally, set Makefile variables
-dnl
-BUILD_EXEEXT=$ac_build_exeext
-BUILD_OBJEXT=$ac_build_objext
-AC_SUBST(BUILD_EXEEXT)dnl
-AC_SUBST(BUILD_OBJEXT)dnl
-AC_SUBST([CFLAGS_FOR_BUILD])dnl
-AC_SUBST([CPPFLAGS_FOR_BUILD])dnl
-AC_SUBST([LDFLAGS_FOR_BUILD])dnl
-])
diff --git a/m4/pkg_config_for_build.m4 b/m4/pkg_config_for_build.m4
deleted file mode 100644
index 0422f482f2..0000000000
--- a/m4/pkg_config_for_build.m4
+++ /dev/null
@@ -1,20 +0,0 @@
-# PKG_PROG_PKG_CONFIG_FOR_BUILD([MIN-VERSION])
-# ----------------------------------
-AC_DEFUN([PKG_PROG_PKG_CONFIG_FOR_BUILD],
-[m4_pattern_allow([^PKG_CONFIG_FOR_BUILD$])
-AC_ARG_VAR([PKG_CONFIG_FOR_BUILD], [path to build system's pkg-config utility])
-
-if test "x$ac_cv_env_PKG_CONFIG_FOR_BUILD_set" != "xset"; then
-	AC_PATH_PROG([PKG_CONFIG_FOR_BUILD], [pkg-config])
-fi
-if test -n "$PKG_CONFIG_FOR_BUILD"; then
-	_pkg_for_build_min_version=m4_default([$1], [0.9.0])
-	AC_MSG_CHECKING([build system's pkg-config is at least version $_pkg_min_version])
-	if $PKG_CONFIG_FOR_BUILD --atleast-pkgconfig-version $_pkg_min_version; then
-		AC_MSG_RESULT([yes])
-	else
-		AC_MSG_RESULT([no])
-		PKG_CONFIG_FOR_BUILD=""
-	fi
-fi[]dnl
-])# PKG_PROG_PKG_CONFIG_FOR_BUILD
diff --git a/make-pot b/make-pot
deleted file mode 100755
index e95e971f30..0000000000
--- a/make-pot
+++ /dev/null
@@ -1,72 +0,0 @@
-#! /bin/bash
-
-# This script extracts the typical xgettext invokation out of
-# po/Makefile.in.in, in order for it to be available as a shell
-# command without the need to autogen first. This is needed for
-# translation tools such as the damn lies website.
-#
-# Call this from your GTK+ checkout directory, like this:
-#
-#   ./make-pot
-#
-# to generate po/gtk40.pot, and like this:
-#
-#   ./make-pot properties
-#
-# to generate po-properties/gtk40-properties.pot.
-#
-# Various things can be passed in by environment variables, which
-# are heavily inspired by the variables used in po/Makefile.in.in:
-#
-# XGETTEXT - path of the xgettext binary
-# top_srcdir - the location of the GTK+ checkout
-# srcdir - the directory where POTFILES.in is located (defaults to
-#          $top_srcdir/po or $top_srcdir/po-properties)
-# GETTEXT_PACKAGE - the gettext domain, used for naming the resulting
-#          .pot file (defaults to gtk40 or gtk40-properties)
-# XGETTEXT_KEYWORDS - --keyword arguments to pass to xgettext
-
-
-XGETTEXT="${XGETTEXT:-xgettext}"
-top_srcdir="${top_srcdir:-.}"
-
-if test "$1" = "properties"; then
-  srcdir="${srcdir:-$top_srcdir/po-properties}"
-  GETTEXT_PACKAGE="${GETTEXT_PACKAGE:-gtk40-properties}"
-  XGETTEXT_KEYWORDS="${XGETTEXT_KEYWORDS:- --keyword --keyword=P_ }"
-else
-  srcdir="${srcdir:-$top_srcdir/po}"
-  GETTEXT_PACKAGE="${GETTEXT_PACKAGE:-gtk40}"
-  XGETTEXT_KEYWORDS="${XGETTEXT_KEYWORDS:- --keyword=_ --keyword=N_ --keyword=C_:1c,2 --keyword=NC_:1c,2 --keyword=g_dngettext:2,3 }"
-fi
-
-$XGETTEXT --default-domain="$GETTEXT_PACKAGE" \
-          --directory="$top_srcdir" \
-          --add-comments \
-          $XGETTEXT_KEYWORDS \
-          --from-code=utf-8 \
-          --flag=g_dngettext:2:pass-c-format \
-          --flag=g_strdup_printf:1:c-format \
-          --flag=g_string_printf:2:c-format \
-          --flag=g_string_append_printf:2:c-format \
-          --flag=g_error_new:3:c-format \
-          --flag=g_set_error:4:c-format \
-          --flag=g_markup_printf_escaped:1:c-format \
-          --flag=g_log:3:c-format \
-          --flag=g_print:1:c-format \
-          --flag=g_printerr:1:c-format \
-          --flag=g_printf:1:c-format \
-          --flag=g_fprintf:2:c-format \
-          --flag=g_sprintf:2:c-format \
-          --flag=g_snprintf:3:c-format \
-          --flag=g_scanner_error:2:c-format \
-          --flag=g_scanner_warn:2:c-format \
-          --flag=gtk_message_dialog_format_secondary_markup:2:c-format \
-          --flag=gtk_message_dialog_format_secondary_text:2:c-format \
-          --flag=gtk_message_dialog_new:5:c-format \
-          --flag=gtk_message_dialog_new_with_markup:5:c-format \
-          --files-from="$srcdir/POTFILES.in" \
-        && test ! -f "$GETTEXT_PACKAGE.po" \
-           || ( rm -f "$srcdir/$GETTEXT_PACKAGE.pot" \
-                && mv "$GETTEXT_PACKAGE.po" "$srcdir/$GETTEXT_PACKAGE.pot" )
-
diff --git a/makefile.msc b/makefile.msc
deleted file mode 100644
index 3af6b7c911..0000000000
--- a/makefile.msc
+++ /dev/null
@@ -1,24 +0,0 @@
-## Makefile for building the Gtk+ dlls with Microsoft C
-## Use: nmake -f makefile.msc
-
-PARTS = gdk gtk tests
-
-all : \
-	config.h \
-	sub-all
-
-sub-all: 
-	for %d in ($(PARTS)) do nmake -nologo -f makefile.msc sub-one THIS=%d TARGET=all
-
-clean : sub-clean
-
-sub-clean:
-	for %d in ($(PARTS)) do nmake -nologo -f makefile.msc sub-one THIS=%d TARGET=clean
-
-sub-one:
-	@cd $(THIS)
-	@nmake -nologo -f makefile.msc $(TARGET)
-	@cd ..
-
-config.h: config.h.win32
-	copy config.h.win32 config.h
diff --git a/modules/Makefile.am b/modules/Makefile.am
deleted file mode 100644
index f8e7bb8797..0000000000
--- a/modules/Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
-include $(top_srcdir)/Makefile.decl
-
-SUBDIRS = input
-
-if OS_UNIX
-SUBDIRS += printbackends
-endif
-
--include $(top_srcdir)/git.mk
diff --git a/modules/input/Makefile.am b/modules/input/Makefile.am
deleted file mode 100644
index 0388c1fe72..0000000000
--- a/modules/input/Makefile.am
+++ /dev/null
@@ -1,276 +0,0 @@
-## Makefile.am for gtk+/modules/input
-include $(top_srcdir)/Makefile.decl
-
-AM_CPPFLAGS = \
-	-DGTK_LOCALEDIR=\"$(localedir)\" \
-	-I$(top_srcdir) 		\
-	-I$(top_srcdir)/gdk		\
-	-I$(top_builddir)/gdk		\
-	$(GTK_DEBUG_FLAGS)		\
-	$(GTK_XIM_FLAGS)		\
-	$(GTK_DEP_CFLAGS)		\
-	-DGTK_COMPILATION		\
-	$(INCLUDED_IMMODULE_DEFINE)
-
-DEPS = \
-	$(top_builddir)/gtk/libgtk-4.la
-
-LDADDS = \
-	$(top_builddir)/gtk/libgtk-4.la	\
-	$(GTK_DEP_LIBS)
-
-moduledir = $(libdir)/gtk-4.0/$(GTK_BINARY_VERSION)/immodules
-
-im_xim_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module $(no_undefined)
-im_xim_la_SOURCES = 		\
-	gtkimcontextxim.c 	\
-	gtkimcontextxim.h	\
-	imxim.c
-libstatic_im_xim_la_SOURCES = $(im_xim_la_SOURCES)
-im_xim_la_LIBADD = $(LDADDS)
-if USE_X11
-if INCLUDE_IM_XIM
-STATIC_XIM_MODULE = libstatic-im-xim.la
-else
-XIM_MODULE=im-xim.la
-endif
-endif
-
-im_am_et_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module $(no_undefined)
-im_am_et_la_SOURCES = imam-et.c
-libstatic_im_am_et_la_SOURCES = $(im_am_et_la_SOURCES)
-im_am_et_la_LIBADD = $(LDADDS)
-if INCLUDE_IM_AM_ET
-STATIC_AM_ET_MODULE = libstatic-im-am-et.la
-else
-AM_ET_MODULE = im-am-et.la
-endif
-
-im_cedilla_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module $(no_undefined)
-im_cedilla_la_SOURCES = imcedilla.c
-libstatic_im_cedilla_la_SOURCES = $(im_cedilla_la_SOURCES)
-im_cedilla_la_LIBADD = $(LDADDS)
-if INCLUDE_IM_CEDILLA
-STATIC_CEDILLA_MODULE = libstatic-im-cedilla.la
-else
-CEDILLA_MODULE = im-cedilla.la
-endif
-
-im_cyrillic_translit_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module $(no_undefined)
-im_cyrillic_translit_la_SOURCES = imcyrillic-translit.c
-libstatic_im_cyrillic_translit_la_SOURCES = $(im_cyrillic_translit_la_SOURCES)
-im_cyrillic_translit_la_LIBADD = $(LDADDS)
-if INCLUDE_IM_CYRILLIC_TRANSLIT
-STATIC_CYRILLIC_TRANSLIT_MODULE = libstatic-im-cyrillic-translit.la
-else
-CYRILLIC_TRANSLIT_MODULE = im-cyrillic-translit.la
-endif
-
-im_ti_er_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module $(no_undefined)
-im_ti_er_la_SOURCES = imti-er.c
-libstatic_im_ti_er_la_SOURCES = $(im_ti_er_la_SOURCES)
-im_ti_er_la_LIBADD = $(LDADDS)
-if INCLUDE_IM_TI_ER
-STATIC_TI_ER_MODULE = libstatic-im-ti-er.la
-else
-TI_ER_MODULE = im-ti-er.la
-endif
-
-im_ti_et_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module $(no_undefined)
-im_ti_et_la_SOURCES = imti-et.c
-libstatic_im_ti_et_la_SOURCES = $(im_ti_et_la_SOURCES)
-im_ti_et_la_LIBADD = $(LDADDS)
-if INCLUDE_IM_TI_ET
-STATIC_TI_ET_MODULE = libstatic-im-ti-et.la
-else
-TI_ET_MODULE = im-ti-et.la
-endif
-
-im_thai_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module $(no_undefined)
-im_thai_la_SOURCES = 		\
-	thai-charprop.c 	\
-	thai-charprop.h 	\
-	gtkimcontextthai.c 	\
-	gtkimcontextthai.h	\
-	imthai.c
-libstatic_im_thai_la_SOURCES = $(im_thai_la_SOURCES)
-im_thai_la_LIBADD = $(LDADDS)
-if INCLUDE_IM_THAI
-STATIC_THAI_MODULE = libstatic-im-thai.la
-else
-THAI_MODULE = im-thai.la
-endif
-
-im_viqr_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module $(no_undefined)
-im_viqr_la_SOURCES = imviqr.c
-libstatic_im_viqr_la_SOURCES = $(im_viqr_la_SOURCES)
-im_viqr_la_LIBADD = $(LDADDS)
-if INCLUDE_IM_VIQR
-STATIC_VIQR_MODULE = libstatic-im-viqr.la
-else
-VIQR_MODULE = im-viqr.la
-endif
-
-im_inuktitut_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module $(no_undefined)
-im_inuktitut_la_SOURCES = iminuktitut.c
-libstatic_im_inuktitut_la_SOURCES = $(im_inuktitut_la_SOURCES)
-im_inuktitut_la_LIBADD = $(LDADDS)
-if INCLUDE_IM_INUKTITUT
-STATIC_INUKTITUT_MODULE = libstatic-im-inuktitut.la
-else
-INUKTITUT_MODULE = im-inuktitut.la
-endif
-
-im_ipa_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module $(no_undefined)
-im_ipa_la_SOURCES = imipa.c
-libstatic_im_ipa_la_SOURCES = $(im_ipa_la_SOURCES)
-im_ipa_la_LIBADD = $(LDADDS)
-if INCLUDE_IM_IPA
-STATIC_IPA_MODULE = libstatic-im-ipa.la
-else
-IPA_MODULE = im-ipa.la
-endif
-
-im_ime_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module $(no_undefined)
-im_ime_la_SOURCES = \
-	gtkimcontextime.c \
-	gtkimcontextime.h \
-	imime.c 	  \
-	imm-extra.h
-libstatic_im_ime_la_SOURCES = $(im_ime_la_SOURCES)
-im_ime_la_LIBADD = -limm32 $(LDADDS)
-libstatic_im_ime_la_LIBADD = -limm32
-if USE_WIN32
-if INCLUDE_IM_IME
-STATIC_IME_MODULE = libstatic-im-ime.la
-else
-IME_MODULE=im-ime.la
-endif
-endif
-
-im_quartz_la_CPPFLAGS = $(AM_CPPFLAGS) -xobjective-c
-im_quartz_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module $(no_undefined)
-im_quartz_la_SOURCES = imquartz.c
-libstatic_im_quartz_la_SOURCES = $(im_quartz_la_SOURCES)
-im_quartz_la_LIBADD = $(LDADDS)
-if INCLUDE_IM_QUARTZ
-STATIC_QUARTZ_MODULE = libstatic-im-quartz.la
-else
-if USE_QUARTZ
-QUARTZ_MODULE = im-quartz.la
-endif
-endif
-
-im_broadway_la_CPPFLAGS = $(AM_CPPFLAGS)
-im_broadway_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module $(no_undefined)
-im_broadway_la_SOURCES = imbroadway.c
-libstatic_im_broadway_la_SOURCES = $(im_broadway_la_SOURCES)
-im_broadway_la_LIBADD = $(LDADDS)
-if INCLUDE_IM_BROADWAY
-STATIC_BROADWAY_MODULE = libstatic-im-broadway.la
-else
-if USE_BROADWAY
-BROADWAY_MODULE = im-broadway.la
-endif
-endif
-
-multipress_defs = -DMULTIPRESS_LOCALEDIR=\""$(mplocaledir)"\" -DMULTIPRESS_CONFDIR=\""$(sysconfdir)/gtk-2.0"\"
-im_multipress_la_CPPFLAGS = $(AM_CPPFLAGS) $(multipress_defs)
-libstatic_im_multipress_la_CPPFLAGS = $(im_multipress_la_CPPFLAGS)
-im_multipress_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module $(no_undefined)
-im_multipress_la_SOURCES =	\
-	gtkimcontextmultipress.c	\
-	gtkimcontextmultipress.h	\
-	immultipress.c
-libstatic_im_multipress_la_SOURCES = $(im_multipress_la_SOURCES)
-im_multipress_la_LIBADD = $(LDADDS)
-if INCLUDE_IM_MULTIPRESS
-STATIC_MULTIPRESS_MODULE = libstatic-im-multipress.la
-else
-MULTIPRESS_MODULE = im-multipress.la
-endif
-
-imconffiledir = $(sysconfdir)/gtk-4.0
-dist_imconffile_DATA = im-multipress.conf
-
-if CROSS_COMPILING
-RUN_QUERY_IMMODULES_TEST=false
-else
-RUN_QUERY_IMMODULES_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:
-	$(AM_V_GEN) if $(RUN_QUERY_IMMODULES_TEST) ; then \
-	  echo $(mkinstalldirs) $(DESTDIR)$(libdir)/gtk-4.0/4.0.0 ; \
-	  $(mkinstalldirs) $(DESTDIR)$(libdir)/gtk-4.0/4.0.0 ; \
-	  echo "$(top_builddir)/gtk/gtk4-query-immodules$(EXEEXT) > $(DESTDIR)$(libdir)/gtk-4.0/4.0.0/immodules.cache" ; \
-	  $(top_builddir)/gtk/gtk4-query-immodules$(EXEEXT) > $(DESTDIR)$(libdir)/gtk-4.0/4.0.0/immodules.cache ; \
-	else \
-	  echo "***" ; \
-	  echo "*** Warning: immodules.cache not built" ; \
-	  echo "***" ; \
-	  echo "*** Generate this file manually on host" ; \
-	  echo "*** system using gtk4-query-immodules" ; \
-	  echo "***" ; \
-        fi
-
-uninstall-local:
-	rm -f $(DESTDIR)$(libdir)/gtk-4.0/4.0.0/immodules.cache
-
-if BUILD_DYNAMIC_MODULES
-
-module_LTLIBRARIES =			\
-	$(AM_ET_MODULE)			\
-	$(CEDILLA_MODULE)		\
-	$(CYRILLIC_TRANSLIT_MODULE)	\
-	$(IME_MODULE)			\
-	$(INUKTITUT_MODULE)		\
-	$(IPA_MODULE)			\
-	$(MULTIPRESS_MODULE)		\
-	$(QUARTZ_MODULE)		\
-	$(BROADWAY_MODULE)		\
-	$(THAI_MODULE)			\
-	$(TI_ER_MODULE)			\
-	$(TI_ET_MODULE)			\
-	$(VIQR_MODULE)			\
-	$(XIM_MODULE)
-
-endif
-
-noinst_LTLIBRARIES =				\
-	$(STATIC_AM_ET_MODULE)			\
-	$(STATIC_CEDILLA_MODULE)		\
-	$(STATIC_CYRILLIC_TRANSLIT_MODULE)	\
-	$(STATIC_IME_MODULE)			\
-	$(STATIC_INUKTITUT_MODULE)		\
-	$(STATIC_IPA_MODULE)			\
-	$(STATIC_MULTIPRESS_MODULE)		\
-	$(STATIC_QUARTZ_MODULE)			\
-	$(STATIC_BROADWAY_MODULE)		\
-	$(STATIC_THAI_MODULE)			\
-	$(STATIC_TI_ER_MODULE)			\
-	$(STATIC_TI_ET_MODULE)			\
-	$(STATIC_VIQR_MODULE)			\
-	$(STATIC_XIM_MODULE)
-
-included-modules: $(noinst_LTLIBRARIES)
-
-immodules.cache: Makefile.am $(module_LTLIBRARIES)
-	$(AM_V_GEN) $(top_builddir)/gtk/gtk4-query-immodules$(EXEEXT) $(module_LTLIBRARIES) > immodules.cache
-
-EXTRA_DIST += README.multipress
-
-CLEANFILES = immodules.cache
-
-if CROSS_COMPILING
-else
-all-local: immodules.cache
-endif
-
--include $(top_srcdir)/git.mk
diff --git a/modules/printbackends/Makefile.am b/modules/printbackends/Makefile.am
deleted file mode 100644
index 7d6680dffb..0000000000
--- a/modules/printbackends/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-include $(top_srcdir)/Makefile.decl
-
-SUBDIRS = file lpr
-
-if HAVE_CLOUDPRINT
-SUBDIRS += cloudprint
-endif
-
-if HAVE_CUPS
-SUBDIRS += cups
-endif
-
-if TEST_PRINT_BACKEND
-SUBDIRS += test
-endif
-
-if HAVE_PAPI
-SUBDIRS += papi
-endif
-
-DIST_SUBDIRS = cloudprint cups file lpr test papi
-
--include $(top_srcdir)/git.mk
diff --git a/modules/printbackends/cloudprint/Makefile.am b/modules/printbackends/cloudprint/Makefile.am
deleted file mode 100644
index 2a1811f41c..0000000000
--- a/modules/printbackends/cloudprint/Makefile.am
+++ /dev/null
@@ -1,40 +0,0 @@
-include $(top_srcdir)/Makefile.decl
-
-backenddir = $(libdir)/gtk-4.0/$(GTK_BINARY_VERSION)/printbackends
-
-backend_LTLIBRARIES = libprintbackend-cloudprint.la
-
-libprintbackend_cloudprint_la_SOURCES = \
-	gtkprintbackendcloudprint.h \
-	gtkprintbackendcloudprint.c \
-	gtkprintercloudprint.h \
-	gtkprintercloudprint.c \
-	gtkcloudprintaccount.h \
-	gtkcloudprintaccount.c
-
-libprintbackend_cloudprint_la_CPPFLAGS = \
-	-I$(top_srcdir) 				\
-	-I$(top_srcdir)/gtk				\
-	-I$(top_builddir)/gtk				\
-	-I$(top_srcdir)/gdk				\
-	-I$(top_builddir)/gdk				\
-	-DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED		\
-	$(AM_CPPFLAGS)
-
-libprintbackend_cloudprint_la_CFLAGS = \
-	$(GTK_DEP_CFLAGS)				\
-	$(GTK_DEBUG_FLAGS)				\
-	$(REST_CFLAGS)					\
-	$(JSON_GLIB_CFLAGS)				\
-	$(AM_CFLAGS)
-
-libprintbackend_cloudprint_la_LDFLAGS =  \
-	-avoid-version -module $(no_undefined)
-
-libprintbackend_cloudprint_la_LIBADD =			\
-	$(top_builddir)/gtk/libgtk-4.la			\
-	$(REST_LIBS)					\
-	$(JSON_GLIB_LIBS)				\
-	$(GTK_DEP_LIBS)
-
--include $(top_srcdir)/git.mk
diff --git a/modules/printbackends/cups/Makefile.am b/modules/printbackends/cups/Makefile.am
deleted file mode 100644
index 8f36a87fa8..0000000000
--- a/modules/printbackends/cups/Makefile.am
+++ /dev/null
@@ -1,40 +0,0 @@
-include $(top_srcdir)/Makefile.decl
-
-AM_CPPFLAGS = \
-	-I$(top_srcdir) 				\
-	-I$(top_srcdir)/gtk				\
-	-I$(top_builddir)/gtk				\
-	-I$(top_srcdir)/gdk				\
-	-I$(top_builddir)/gdk				\
-	$(CUPS_CFLAGS)					\
-	$(COLORD_CFLAGS)				\
-	-DGTK_COMPILATION				\
-	-DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED		\
-	$(GTK_DEP_CFLAGS)				\
-	$(GTK_DEBUG_FLAGS)
-
-LDADDS = \
-	$(top_builddir)/gtk/libgtk-4.la	\
-	$(COLORD_LIBS)			\
-	$(GTK_DEP_LIBS)
-
-backenddir = $(libdir)/gtk-4.0/$(GTK_BINARY_VERSION)/printbackends
-
-backend_LTLIBRARIES = libprintbackend-cups.la
-
-libprintbackend_cups_la_SOURCES =	\
-	gtkprintbackendcups.c		\
-	gtkprintercups.c		\
-	gtkcupsutils.c			\
-	gtkcupssecretsutils.c
-
-noinst_HEADERS =			\
-	gtkprintbackendcups.h		\
-	gtkprintercups.h		\
-	gtkcupsutils.h			\
-	gtkcupssecretsutils.h
-
-libprintbackend_cups_la_LDFLAGS =  -avoid-version -module $(no_undefined)
-libprintbackend_cups_la_LIBADD = $(LDADDS) $(CUPS_LIBS)
-
--include $(top_srcdir)/git.mk
diff --git a/modules/printbackends/file/Makefile.am b/modules/printbackends/file/Makefile.am
deleted file mode 100644
index ffdd81676a..0000000000
--- a/modules/printbackends/file/Makefile.am
+++ /dev/null
@@ -1,34 +0,0 @@
-include $(top_srcdir)/Makefile.decl
-
-backenddir = $(libdir)/gtk-4.0/$(GTK_BINARY_VERSION)/printbackends
-
-backend_LTLIBRARIES = libprintbackend-file.la
-
-libprintbackend_file_la_SOURCES = \
-	gtkprintbackendfile.c
-
-libprintbackend_file_la_CPPFLAGS = \
-	-I$(top_srcdir) 				\
-	-I$(top_srcdir)/gtk				\
-	-I$(top_builddir)/gtk				\
-	-I$(top_srcdir)/gdk				\
-	-I$(top_builddir)/gdk				\
-	-DGTK_COMPILATION				\
-	-DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED		\
-	$(AM_CPPFLAGS)
-
-libprintbackend_file_la_CFLAGS = \
-	$(GTK_DEP_CFLAGS)				\
-	$(AM_CFLAGS)
-
-libprintbackend_file_la_LDFLAGS =  \
-	-avoid-version -module $(no_undefined)
-
-libprintbackend_file_la_LIBADD = \
-	$(top_builddir)/gtk/libgtk-4.la	\
-	$(GTK_DEP_LIBS)
-
-noinst_HEADERS =			\
-	gtkprintbackendfile.h
-
--include $(top_srcdir)/git.mk
diff --git a/modules/printbackends/lpr/Makefile.am b/modules/printbackends/lpr/Makefile.am
deleted file mode 100644
index 79345edef9..0000000000
--- a/modules/printbackends/lpr/Makefile.am
+++ /dev/null
@@ -1,30 +0,0 @@
-include $(top_srcdir)/Makefile.decl
-
-AM_CPPFLAGS = \
-	-I$(top_srcdir) 				\
-	-I$(top_srcdir)/gtk				\
-	-I$(top_builddir)/gtk				\
-	-I$(top_srcdir)/gdk				\
-	-I$(top_builddir)/gdk				\
-	-DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED		\
-	$(GTK_DEP_CFLAGS)				\
-	$(GTK_DEBUG_FLAGS)
-
-LDADDS = \
-	$(top_builddir)/gtk/libgtk-4.la	\
-	$(GTK_DEP_LIBS)
-
-backenddir = $(libdir)/gtk-4.0/$(GTK_BINARY_VERSION)/printbackends
-
-backend_LTLIBRARIES = libprintbackend-lpr.la
-
-libprintbackend_lpr_la_SOURCES =	\
-	gtkprintbackendlpr.c
-
-noinst_HEADERS =			\
-	gtkprintbackendlpr.h
-
-libprintbackend_lpr_la_LDFLAGS =  -avoid-version -module $(no_undefined)
-libprintbackend_lpr_la_LIBADD = $(LDADDS)
-
--include $(top_srcdir)/git.mk
diff --git a/modules/printbackends/papi/Makefile.am b/modules/printbackends/papi/Makefile.am
deleted file mode 100644
index 48ae2ca729..0000000000
--- a/modules/printbackends/papi/Makefile.am
+++ /dev/null
@@ -1,32 +0,0 @@
-include $(top_srcdir)/Makefile.decl
-
-AM_CPPFLAGS = \
-	-I$(top_srcdir) 				\
-	-I$(top_srcdir)/gtk				\
-	-I$(top_builddir)/gtk				\
-	-I$(top_srcdir)/gdk				\
-	-I$(top_builddir)/gdk				\
-	-DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED		\
-	$(GTK_DEP_CFLAGS)				\
-	$(GTK_DEBUG_FLAGS)
-
-LDADDS = \
-	$(top_builddir)/gtk/libgtk-4.la	\
-	$(GTK_DEP_LIBS)
-
-backenddir = $(libdir)/gtk-4.0/$(GTK_BINARY_VERSION)/printbackends
-
-backend_LTLIBRARIES = libprintbackend-papi.la
-
-libprintbackend_papi_la_SOURCES =	\
-	gtkprinterpapi.c		\
-	gtkprintbackendpapi.c
-
-noinst_HEADERS =			\
-	gtkprinterpapi.h		\
-	gtkprintbackendpapi.h
-
-libprintbackend_papi_la_LDFLAGS =  -avoid-version -module $(no_undefined)
-libprintbackend_papi_la_LIBADD = $(LDADDS) -lpapi
-
--include $(top_srcdir)/git.mk
diff --git a/modules/printbackends/test/Makefile.am b/modules/printbackends/test/Makefile.am
deleted file mode 100644
index 876ef0f667..0000000000
--- a/modules/printbackends/test/Makefile.am
+++ /dev/null
@@ -1,33 +0,0 @@
-include $(top_srcdir)/Makefile.decl
-
-backenddir = $(libdir)/gtk-4.0/$(GTK_BINARY_VERSION)/printbackends
-
-backend_LTLIBRARIES = libprintbackend-test.la
-
-libprintbackend_test_la_SOURCES = \
-	gtkprintbackendtest.c
-
-libprintbackend_test_la_CPPFLAGS = \
-	-I$(top_srcdir) 				\
-	-I$(top_srcdir)/gtk				\
-	-I$(top_builddir)/gtk				\
-	-I$(top_srcdir)/gdk				\
-	-I$(top_builddir)/gdk				\
-	-DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED		\
-	$(AM_CPPFLAGS)
-
-libprintbackend_test_la_CFLAGS = \
-	$(GTK_DEP_CFLAGS)				\
-	$(AM_CFLAGS)
-
-libprintbackend_test_la_LDFLAGS =  \
-	-avoid-version -module $(no_undefined)
-
-libprintbackend_test_la_LIBADD = \
-	$(top_builddir)/gtk/libgtk-4.la	\
-	$(GTK_DEP_LIBS)
-
-noinst_HEADERS =			\
-	gtkprintbackendtest.h
-
--include $(top_srcdir)/git.mk
diff --git a/sanitize-la.sh b/sanitize-la.sh
deleted file mode 100755
index 0f8cb63b3f..0000000000
--- a/sanitize-la.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-if [ -f $1 ]; then
-    sed "s/dependency_libs=.*/dependency_libs=''/" < $1 > $1T && mv $1T $1
-fi
-
diff --git a/tests/Makefile.am b/tests/Makefile.am
deleted file mode 100644
index 40fafa97ac..0000000000
--- a/tests/Makefile.am
+++ /dev/null
@@ -1,492 +0,0 @@
-## Makefile.am for gtk+/tests
-include $(top_srcdir)/Makefile.decl
-
-SUBDIRS = visuals
-
-AM_CPPFLAGS =				\
-	-I$(top_srcdir)			\
-	-I$(top_builddir)/gdk		\
-	-I$(top_srcdir)/gdk		\
-	-I$(top_builddir)/gsk		\
-	-I$(top_srcdir)/gsk		\
-	$(GTK_DEBUG_FLAGS)		\
-	$(GTK_DEP_CFLAGS)		\
-	$(GDK_DEP_CFLAGS)
-
-DEPS =
-
-LDADD = \
-	$(top_builddir)/gtk/libgtk-4.la	\
-	$(GTK_DEP_LIBS)			\
-	$(GDK_DEP_LIBS)			\
-	-lm
-
-
-if OS_LINUX
-fontconfig_programs = testfontchooserdialog
-endif
-
-noinst_PROGRAMS =  $(TEST_PROGS)	\
-	rendernode			\
-	rendernode-create-tests		\
-	overlayscroll			\
-	syncscroll			\
-	animated-resizing		\
-	animated-revealing		\
-	motion-compression		\
-	scrolling-performance		\
-	blur-performance		\
-	simple				\
-	flicker				\
-	print-editor			\
-	video-timer			\
-	testaccel			\
-	testadjustsize			\
-	testappchooser			\
-	testappchooserbutton		\
-	testassistant			\
-	testbaseline			\
-	testbbox			\
-	testbox                         \
-	testboxcss                      \
-	testbuttons			\
-	testcairo			\
-	testcalendar			\
-	testclipboard			\
-	testcolorchooser		\
-	testcolorchooser2		\
-	testcombo			\
-	testcombochange			\
-	testcellrenderertext		\
-	testdialog			\
-	testdnd				\
-	testdnd2			\
-	testellipsise			\
-	testemblems			\
-	testentrycompletion 		\
-	testentryicons			\
-	testfilechooser			\
-	testfilechooserbutton		\
-	testflowbox			\
-	testfontchooser			\
-	testfontoptions			\
-	$(fontconfig_programs)		\
-	testframe			\
-	testfullscreen			\
-	testgiconpixbuf			\
-	testglarea			\
-	testglblending			\
-	testgrid			\
-	testgtk				\
-	testheaderbar			\
-	testheightforwidth		\
-	testiconview			\
-	testiconview-keynav		\
-	testicontheme			\
-	testimage			\
-	testinput			\
-	testkineticscrolling		\
-	testlist			\
-	testlist2			\
-	testlist3			\
-	testlevelbar			\
-	testlockbutton			\
-	testmenubutton			\
-	testmountoperation		\
-	testmultidisplay		\
-	testnotebookdnd			\
-	testnouiprint			\
-	testorientable			\
-	testoverlay			\
-	testoverlaystyleclass		\
-	testprint			\
-	testrecentchooser 		\
-	testrecentchoosermenu		\
-	testrichtext			\
-	testscale			\
-	testselection			\
-	testselectionmode		\
-	testspinbutton			\
-	testtoolbar			\
-	testtoolbar2			\
-	stresstest-toolbar		\
-	testtreechanging                \
-	testtreednd			\
-	testtreeedit			\
-	testtreemodel			\
-	testtreeview			\
-	testtreefocus			\
-	testtreeflow			\
-	testtreecolumns			\
-	testtreecolumnsizing		\
-	testtreesort			\
-	testverticalcells		\
-	treestoretest			\
-	testxinerama			\
-	testgrouping			\
-	testtooltips			\
-	testexpand			\
-	testexpander			\
-	testvolumebutton		\
-	testscrolledwindow		\
-	testscrolledge			\
-	testswitch			\
-	testcellarea			\
-	testswitch			\
-	testtoplevelembed		\
-	testnoscreen			\
-	testtreepos			\
-	testsensitive			\
-	testtextview			\
-	testanimation			\
-	testpixbuf-scale		\
-	testgmenu			\
-	testlogout			\
-	teststack			\
-	testrevealer			\
-	testrevealer2			\
-	testtitlebar			\
-	testsplitheaders		\
-	teststackedheaders		\
-	testactionbar			\
-	testwindowsize			\
-	testpopover			\
-	gdkgears			\
-	listmodel			\
-	testpopup			\
-	testpopupat			\
-	testgaction 			\
-	testwidgetfocus 		\
-	testcenterbox			\
-	$(NULL)
-
-if USE_X11
-noinst_PROGRAMS += testerrors
-endif
-
-rendernode_DEPENDENCIES = $(TEST_DEPS)
-rendernode_create_tests_DEPENDENCIES = $(TEST_DEPS)
-animated_resizing_DEPENDENCIES = $(TEST_DEPS)
-animated_revealing_DEPENDENCIES = $(TEST_DEPS)
-flicker_DEPENDENCIES = $(TEST_DEPS)
-motion_compression_DEPENDENCIES = $(TEST_DEPS)
-scrolling_performance_DEPENDENCIES = $(TEST_DEPS)
-blur_performance_DEPENDENCIES = $(TEST_DEPS)
-simple_DEPENDENCIES = $(TEST_DEPS)
-print_editor_DEPENDENCIES = $(TEST_DEPS)
-video_timer_DEPENDENCIES = $(TEST_DEPS)
-testheightforwidth_DEPENDENCIES = $(TEST_DEPS)
-testicontheme_DEPENDENCIES = $(TEST_DEPS)
-testiconview_DEPENDENCIES = $(TEST_DEPS)
-testaccel_DEPENDENCIES = $(TEST_DEPS)
-testadjustsize_DEPENDENCIES = $(TEST_DEPS)
-testassistant_DEPENDENCIES = $(TEST_DEPS)
-testbaseline_DEPENDENCIES = $(TEST_DEPS)
-testbbox_DEPENDENCIES = $(TEST_DEPS)
-testbuttons_DEPENDENCIES = $(TEST_DEPS)
-testcairo_DEPENDENCIES = $(TEST_DEPS)
-testcalendar_DEPENDENCIES = $(TEST_DEPS)
-testclipboard_DEPENDENCIES = $(TEST_DEPS)
-testcolorchooser_DEPENDENCIES = $(TEST_DEPS)
-testcolorchooser2_DEPENDENCIES = $(TEST_DEPS)
-testcombo_DEPENDENCIES = $(TEST_DEPS)
-testcombochange_DEPENDENCIES = $(TEST_DEPS)
-testcellrenderertext_DEPENDENCIES = $(TEST_DEPS)
-testdnd_DEPENDENCIES = $(TEST_DEPS)
-testdnd2_DEPENDENCIES = $(TEST_DEPS)
-testellipsise_DEPENDENCIES = $(TEST_DEPS)
-testentrycompletion_DEPENDENCIES = $(TEST_DEPS)
-testentryicons_DEPENDENCIES = $(TEST_DEPS)
-testerrors_DEPENDENCIES = $(TEST_DEPS)
-testfilechooser_DEPENDENCIES = $(TEST_DEPS)
-testfilechooserbutton_DEPENDENCIES = $(TEST_DEPS)
-testflowbox_DEPENDENCIES = $(TEST_DEPS)
-testfontchooser_DEPENDENCIES = $(TEST_DEPS)
-testfontchooserdialog_DEPENDENCIES = $(TEST_DEPS)
-testfontoptions_DEPENDENCIES = $(TEST_DEPS)
-testframe_DEPENDENCIES = $(TEST_DEPS)
-testgiconpixbuf = $(TEST_DEPS)
-testgrid_DEPENDENCIES = $(TEST_DEPS)
-testgtk_DEPENDENCIES = $(TEST_DEPS)
-testheaderbar_DEPENDENCIES = $(TEST_DEPS)
-testinput_DEPENDENCIES = $(TEST_DEPS)
-testimage_DEPENDENCIES = $(TEST_DEPS)
-testkineticscrolling_DEPENDENCIES = $(TEST_DEPS)
-testlist_DEPENDENCIES = $(TEST_DEPS)
-testlist2_DEPENDENCIES = $(TEST_DEPS)
-testlevelbar_DEPENDENCIES = $(TEST_DEPS)
-testlockbutton_DEPENDENCIES = $(TEST_DEPS)
-testmenubutton_DEPENDENCIES = $(TEST_DEPS)
-testmountoperation_DEPENDENCIES = $(TEST_DEPS)
-testmultidisplay_DEPENDENCIES = $(TEST_DEPS)
-testnotebookdnd_DEPENDENCIES = $(TEST_DEPS)
-testnouiprint_DEPENDENCIES = $(TEST_DEPS)
-testappchooser_DEPENDENCIES = $(TEST_DEPS)
-testappchooserbutton_DEPENDENCIES = $(TEST_DEPS)
-testorientable_DEPENDENCIES = $(TEST_DEPS)
-testoverlay_DEPENDENCIES = $(TEST_DEPS)
-testoverlaystyleclass_DEPENDENCIES = $(TEST_DEPS)
-testprint_DEPENDENCIES = $(TEST_DEPS)
-testrecentchooser_DEPENDENCIES = $(TEST_DEPS)
-testrecentchoosermenu_DEPENDENCIES = $(TEST_DEPS)
-testrichtext_DEPENDENCIES = $(TEST_DEPS)
-testscale_DEPENDENCIES = $(TEST_DEPS)
-testselection_DEPENDENCIES = $(TEST_DEPS)
-testspinbutton_DEPENDENCIES = $(TEST_DEPS)
-testtreechanging_DEPENDENCIES =	$(DEPS)
-testtreednd_DEPENDENCIES = $(DEPS)
-testtreeedit_DEPENDENCIES = $(DEPS)
-testtreemodel_DEPENDENCIES = $(DEPS)
-testtreeview_DEPENDENCIES = $(DEPS)
-testtreefocus_DEPENDENCIES = $(DEPS)
-testtreeflow_DEPENDENCIES = $(DEPS)
-testtreecolumns_DEPENDENCIES = $(DEPS)
-testtreecolumnsizing_DEPENDENCIES = $(DEPS)
-testtreesort_DEPENDENCIES = $(DEPS)
-testverticalcells_DEPENDENCIES = $(DEPS)
-treestoretest_DEPENDENCIES = $(TEST_DEPS)
-testxinerama_DEPENDENCIES = $(TEST_DEPS)
-testgrouping_DEPENDENCIES = $(TEST_DEPS)
-testtooltips_DEPENDENCIES = $(TEST_DEPS)
-testvolumebutton_DEPENDENCIES = $(TEST_DEPS)
-testscrolledwindow_DEPENDENCIES = $(TEST_DEPS)
-testscrolledge_DEPENDENCIES = $(TEST_DEPS)
-testcellarea_DEPENDENCIES = $(TEST_DEPS)
-testexpand_DEPENDENCIES = $(TEST_DEPS)
-testexpander_DEPENDENCIES = $(TEST_DEPS)
-testswitch_DEPENDENCIES = $(TEST_DEPS)
-testtoplevelembed_DEPENDENCIES = $(TEST_DEPS)
-testnoscreen_DEPENDENCIES = $(TEST_DEPS)
-testtreepos_DEPENDENCIES = $(TEST_DEPS)
-testsensitive_DEPENDENCIES = $(TEST_DEPS)
-testtextview_DEPENDENCIES = $(TEST_DEPS)
-testanimation_DEPENDENCIES = $(TEST_DEPS)
-testpixbuf_scale_DEPENDENCIES = $(TEST_DEPS)
-testgmenu_DEPENDENCIES = $(TEST_DEPS)
-testlogout_DEPENDENCIES = $(TEST_DEPS)
-teststack_DEPENDENCIES = $(TEST_DEPS)
-testrevealer_DEPENDENCIES = $(TEST_DEPS)
-testrevealer2_DEPENDENCIES = $(TEST_DEPS)
-testtitlebar_DEPENDENCIES = $(TEST_DEPS)
-testwindowsize_DEPENDENCIES = $(TEST_DEPS)
-listmodel_DEPENDENCIES = $(TEST_DEPS)
-testwidgetfocus_DEPENDENCIES = $(TEST_DEPS)
-testcenterbox_DEPENDENCIES = $(TEST_DEPS)
-
-animated_resizing_SOURCES = 	\
-	animated-resizing.c	\
-	frame-stats.c		\
-	frame-stats.h		\
-	variable.c		\
-	variable.h
-
-animated_revealing_SOURCES = 	\
-	animated-revealing.c	\
-	frame-stats.c		\
-	frame-stats.h		\
-	variable.c		\
-	variable.h
-
-scrolling_performance_SOURCES = \
-	scrolling-performance.c	\
-	frame-stats.c		\
-	frame-stats.h		\
-	variable.c		\
-	variable.h
-
-blur_performance_SOURCES = \
-	blur-performance.c	\
-	../gsk/gskcairoblur.c
-
-video_timer_SOURCES = 	\
-	video-timer.c	\
-	variable.c	\
-	variable.h
-
-testboxcss_SOURCES =	\
-	testboxcss.c
-
-testentrycompletion_SOURCES = 	\
-	testentrycompletion.c
-
-testentryicons_SOURCES =	\
-	testentryicons.c
-
-testfilechooser_SOURCES = 	\
-	testfilechooser.c
-
-testfilechooserbutton_SOURCES =	\
-	testfilechooserbutton.c
-
-testflowbox_SOURCES = \
-	testflowbox.c
-
-testfontchooser_SOURCES = \
-	testfontchooser.c
-
-testfontchooserdialog_SOURCES = \
-	testfontchooserdialog.c
-
-testfontoptions_SOURCES = \
-	testfontoptions.c
-
-testgrid_SOURCES =	\
-	testgrid.c
-
-testgtk_SOURCES =	\
-	testgtk.c
-
-testtreechanging_SOURCES =	\
-	testtreechanging.c
-
-testtreednd_SOURCES = 	\
-	testtreednd.c
-
-testtreeedit_SOURCES = 	\
-	testtreeedit.c
-
-testtreemodel_SOURCES = \
-	testtreemodel.c
-
-testtreeview_SOURCES =	\
-	testtreeview.c
-
-testtoolbar_SOURCES =	\
-	testtoolbar.c
-
-testmenubutton_SOURCES =	\
-	testmenubutton.c
-
-testprint_SOURCES =    	\
-	testprint.c		\
-	testprintfileoperation.h \
-	testprintfileoperation.c
-
-testspinbutton_SOURCES =    	\
-	testspinbutton.c
-
-testbaseline_SOURCES = 		\
-	testbaseline.c
-
-testbbox_SOURCES = 		\
-	testbbox.c
-
-testbuttons_SOURCES = 		\
-	testbuttons.c
-
-testframe_SOURCES = 		\
-	testframe.c
-
-testgiconpixbuf_SOURCES =	\
-	testgiconpixbuf.c
-
-testiconview_SOURCES = 		\
-	testiconview.c
-
-testiconview_keynav_SOURCES = 	\
-	testiconview-keynav.c
-
-testrecentchooser_SOURCES = 	\
-	testrecentchooser.c
-
-testgrouping_SOURCES =		\
-	testgrouping.c
-
-testtooltips_SOURCES =		\
-	testtooltips.c
-
-testrecentchoosermenu_SOURCES =	\
-	testrecentchoosermenu.c
-
-testvolumebutton_SOURCES =	\
-	testvolumebutton.c
-
-testscrolledwindow_SOURCES =	\
-	testscrolledwindow.c
-
-testcellarea_SOURCES =		\
-	testcellarea.c
-
-testoverlay_SOURCES =	\
-	testoverlay.c
-
-testoverlaystyleclass_SOURCES =	\
-	testoverlaystyleclass.c
-
-testappchooser_SOURCES = \
-	testappchooser.c
-
-testappchooserbutton_SOURCES = \
-	testappchooserbutton.c
-
-testexpand_SOURCES = testexpand.c
-
-testexpander_SOURCES = testexpander.c
-
-testswitch_SOURCES = testswitch.c
-
-testtoplevelembed_SOURCES = testtoplevelembed.c
-
-testtextview_SOURCES = testtextview.c
-
-testanimation_SOURCES = testanimation.c
-
-testpixbuf_scale_SOURCES = testpixbuf-scale.c
-
-testcolorchooser_SOURCES = testcolorchooser.c
-
-testcolorchooser2_SOURCES = testcolorchooser2.c
-
-testkineticscrolling_SOURCES = testkineticscrolling.c
-
-teststack_SOURCES = teststack.c
-
-testrevealer_SOURCES = testrevealer.c
-
-testrevealer2_SOURCES = testrevealer2.c
-
-testtitlebar_SOURCES = testtitlebar.c
-
-testwindowsize_SOURCES = testwindowsize.c
-
-gdkgears_SOURCES =	\
-	gdkgears.c	\
-	gtkgears.c	\
-	gtkgears.h
-
-testglblending_SOURCES =	\
-	testglblending.c	\
-	gtkgears.c	\
-	gtkgears.h
-
-listmodel_SOURCES = listmodel.c
-
-testwidgetfocus_SOURCES = testwidgetfocus.c
-
-testcenterbox_SOURCES = testcenterbox.c
-
-EXTRA_DIST += 			\
-	gradient1.png		\
-	testgtk.1 		\
-	testgtk.css		\
-	testgtk2.css		\
-	3DRings.xpm		\
-	FilesQueue.xpm		\
-	Modeller.xpm		\
-	check-y.xpm		\
-	check-n.xpm		\
-	marble.xpm		\
-	test.xpm		\
-	check-y.xpm		\
-	check-n.xpm		\
-	test.xpm		\
-	gnome-textfile.png	\
-	testsplitheaders.ui	\
-	teststackedheaders.ui	\
-	makefile.msc		\
-	mydialog.ui		\
-	mydialog2.ui		\
-	popover.ui		\
-	selectionmode.ui
-
--include $(top_srcdir)/git.mk
diff --git a/tests/visuals/Makefile.am b/tests/visuals/Makefile.am
deleted file mode 100644
index ec29539d26..0000000000
--- a/tests/visuals/Makefile.am
+++ /dev/null
@@ -1,35 +0,0 @@
-AM_CPPFLAGS =				\
-	-I$(top_srcdir)			\
-	-I$(top_builddir)/gdk		\
-	-I$(top_srcdir)/gdk		\
-	$(GTK_DEBUG_FLAGS)		\
-	$(GTK_DEP_CFLAGS)		\
-	$(GDK_DEP_CFLAGS)
-
-AM_CXXFLAGS = $(AM_CPPFLAGS)
-
-DEPS = \
-	$(top_builddir)/gtk/libgtk-4.la
-
-LDADDS = \
-	$(top_builddir)/gtk/libgtk-4.la	\
-	$(GTK_DEP_LIBS)			\
-	-lm
-
-noinst_PROGRAMS =  visuals
-
-visuals_DEPENDENCIES = $(TEST_DEPS)
-visuals_LDADD = $(LDADDS)
-visuals_SOURCES = visuals.c
-
-EXTRA_DIST = \
-	inline-toolbar-horizontal.ui \
-	inline-toolbar-vertical.ui \
-	level-bar.ui \
-	linked-buttons-horizontal.ui \
-	linked-buttons-vertical.ui \
-	osd-toolbars.ui \
-	primary-toolbar.ui \
-	suggested-action-buttons.ui
-
--include $(top_srcdir)/git.mk
diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am
deleted file mode 100644
index 9799983343..0000000000
--- a/testsuite/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-include $(top_srcdir)/Makefile.decl
-
-SUBDIRS = gdk gsk gtk a11y css reftests tools
-
--include $(top_srcdir)/git.mk
-
diff --git a/testsuite/a11y/Makefile.am b/testsuite/a11y/Makefile.am
deleted file mode 100644
index 88cd3fdc40..0000000000
--- a/testsuite/a11y/Makefile.am
+++ /dev/null
@@ -1,125 +0,0 @@
-include $(top_srcdir)/Makefile.decl
-NULL =
-
-SUBDIRS = state
-
-check_PROGRAMS = $(TEST_PROGS)
-
-AM_CPPFLAGS =				\
-	-I$(top_srcdir)                 \
-	-I$(top_builddir)/gdk           \
-	-I$(top_srcdir)/gdk             \
-	-DGDK_DISABLE_DEPRECATED        \
-	-DGTK_DISABLE_DEPRECATED        \
-	-DGTK_VERSION=\"$(GTK_VERSION)\"\
-	$(GTK_DEBUG_FLAGS)              \
-	$(GTK_DEP_CFLAGS)
-
-LDADD = \
-	$(top_builddir)/gtk/libgtk-4.la \
-	$(GTK_DEP_LIBS)
-
-# work around random file systems showing up in the file chooser,
-# breaking the 'pickers' test
-TESTS_ENVIRONMENT = 			\
-	GIO_USE_VOLUME_MONITOR=unix 	\
-	GSETTINGS_BACKEND=memory	\
-	GTK_CSD=1			\
-	G_ENABLE_DIAGNOSTIC=0
-
-TEST_PROGS += accessibility-dump
-
-TEST_PROGS += tree-performance
-
-TEST_PROGS += text
-
-TEST_PROGS += children
-
-TEST_PROGS += derive
-
-TEST_PROGS += value
-
-TEST_PROGS += misc
-
-TEST_PROGS += tree-relationships
-
-TEST_PROGS += util
-
-noinst_PROGS = testfocus
-
-testdata = \
-	hello-world.ui hello-world.txt \
-	mnemonic.ui mnemonic.txt \
-	accessible-name.ui accessible-name.txt \
-	notebook.ui notebook.txt \
-	range.ui range.txt \
-	link.ui link.txt \
-	text.ui text.txt \
-	buttons.ui buttons.txt \
-	colorchooser.ui colorchooser.txt \
-	about.ui about.txt \
-	messagedialog.ui messagedialog.txt \
-	expander.ui expander.txt \
-	assistant.ui assistant.txt \
-	pickers.ui pickers.txt \
-	label.ui label.txt \
-	lockbutton.ui lockbutton.txt \
-	spinner.ui spinner.txt \
-	progress.ui progress.txt \
-	infobar.ui infobar.txt \
-	calendar.ui calendar.txt \
-	statusbar.ui statusbar.txt \
-	paned.ui paned.txt \
-	iconview.ui iconview.txt \
-	entries.ui entries.txt \
-	scale-drawvalue.ui scale-drawvalue.txt \
-	placeholder-text.ui placeholder-text.txt \
-	menu.ui menu.txt \
-	menubutton.ui menubutton.txt \
-	menubutton2.ui menubutton2.txt \
-	menubutton3.ui menubutton3.txt \
-	combos.ui combos.txt \
-	listbox.ui listbox.txt \
-	stack.ui stack.txt \
-	headerbar.ui headerbar.txt \
-	tree.ui tree.txt \
-	actionbar.ui actionbar.txt \
-	tooltips.ui tooltips.txt \
-	$(NULL)
-
-test_in_files = \
-	a11ytests.test.in \
-	a11ychildren.test.in \
-	a11ytree.test.in \
-	a11yvalue.test.in \
-	a11yderive.test.in \
-	a11ytext.test.in \
-	a11yutil.test.in \
-	a11ymisc.test.in \
-	$(NULL)
-
-EXTRA_DIST += $(test_in_files) $(testdata)
-
-if BUILDOPT_INSTALL_TESTS
-insttestdir=$(libexecdir)/installed-tests/$(PACKAGE)
-insttest_PROGRAMS = $(TEST_PROGS)
-
-a11ytestdir = $(insttestdir)/a11ytests
-a11ytest_DATA = $(testdata)
-
-substitutions = \
-	-e s,@libexecdir\@,$(libexecdir),g \
-	$(NULL)
-
-test_files = $(test_in_files:.test.in=.test)
-
-$(test_files): %.test: %.test.in
-	$(AM_V_GEN) sed $(substitutions) $< > $@.tmp && mv $@.tmp $@
-
-DISTCLEANFILES = $(test_files)
-
-testmetadir = $(datadir)/installed-tests/$(PACKAGE)
-testmeta_DATA = $(test_files)
-endif
-
--include $(top_srcdir)/git.mk
diff --git a/testsuite/a11y/state/Makefile.am b/testsuite/a11y/state/Makefile.am
deleted file mode 100644
index 87b69d6462..0000000000
--- a/testsuite/a11y/state/Makefile.am
+++ /dev/null
@@ -1,55 +0,0 @@
-include $(top_srcdir)/Makefile.decl
-
-check_PROGRAMS = $(TEST_PROGS)
-
-AM_CPPFLAGS =                           \
-        -I$(top_srcdir)                 \
-        -I$(top_builddir)/gdk           \
-        -I$(top_srcdir)/gdk             \
-        -DGDK_DISABLE_DEPRECATED        \
-        -DGTK_DISABLE_DEPRECATED        \
-        -DGTK_VERSION=\"$(GTK_VERSION)\"\
-        $(GTK_DEBUG_FLAGS)              \
-        $(GTK_DEP_CFLAGS)
-
-LDADD = \
-        $(top_builddir)/gtk/libgtk-4.la \
-        $(GTK_DEP_LIBS)
-
-TESTS_ENVIRONMENT =                     \
-        GIO_USE_VOLUME_MONITOR=unix     \
-        GSETTINGS_BACKEND=memory        \
-        G_ENABLE_DIAGNOSTIC=0
-
-test_programs = state-record
-
-testdata = \
-	focus1.ui focus1.in focus1.out \
-	focus2.ui focus2.in focus2.out
-
-EXTRA_DIST += $(testdata)
-
-if BUILDOPT_INSTALL_TESTS
-insttestdir = $(libexecdir)/installed-tests/$(PACKAGE)
-insttest_PROGRAMS = $(test_programs)
-
-statetestdir = $(insttestdir)/state
-statetest_DATA = $(testdata)
-
-a11ystate.test: Makefile
-	$(AM_V_GEN) (echo '[Test]' > $@.tmp; \
-	echo 'Type=session-exclusive' >> $@.tmp; \
-	echo 'Output=TAP' >> $@.tmp; \
-	echo 'Exec=env G_ENABLE_DIAGNOSTIC=0 $(insttestdir)/state-record --tap --directory $(statetestdir)' >> $@.tmp; \
-	mv $@.tmp $@)
-
-testfiles = a11ystate.test
-
-DISTCLEANFILES = \
-	$(testfiles)
-
-testmetadir = $(datadir)/installed-tests/$(PACKAGE)
-testmeta_DATA = $(testfiles)
-endif
-
--include $(top_srcdir)/git.mk
diff --git a/testsuite/css/Makefile.am b/testsuite/css/Makefile.am
deleted file mode 100644
index 3a2aecfeda..0000000000
--- a/testsuite/css/Makefile.am
+++ /dev/null
@@ -1,48 +0,0 @@
-include $(top_srcdir)/Makefile.decl
-
-NULL =
-
-SUBDIRS = parser nodes style
-
-check_PROGRAMS = $(TEST_PROGS)
-test_in_files =
-
-AM_CPPFLAGS =				\
-	-I$(top_srcdir)                 \
-	-I$(top_builddir)/gdk           \
-	-I$(top_srcdir)/gdk             \
-	-DGDK_DISABLE_DEPRECATED        \
-	-DGTK_DISABLE_DEPRECATED        \
-	-DGTK_VERSION=\"$(GTK_VERSION)\"\
-	$(GTK_DEBUG_FLAGS)              \
-	$(GTK_DEP_CFLAGS)
-
-LDADD = \
-	$(top_builddir)/gtk/libgtk-4.la \
-	$(GTK_DEP_LIBS)
-
-TEST_PROGS += api
-test_in_files += api.test.in
-
-EXTRA_DIST += $(test_in_files)
-
-if BUILDOPT_INSTALL_TESTS
-insttestdir=$(libexecdir)/installed-tests/$(PACKAGE)/css
-insttest_PROGRAMS = $(TEST_PROGS)
-
-substitutions = \
-	-e s,@libexecdir\@,$(libexecdir),g \
-	$(NULL)
-
-test_files = $(test_in_files:.test.in=.test)
-
-$(test_files): %.test: %.test.in
-	$(AM_V_GEN) sed $(substitutions) $< > $@.tmp && mv $@.tmp $@
-
-DISTCLEANFILES = $(test_files)
-
-testmetadir = $(datadir)/installed-tests/$(PACKAGE)/css
-testmeta_DATA = $(test_files)
-endif
-
--include $(top_srcdir)/git.mk
diff --git a/testsuite/css/nodes/Makefile.am b/testsuite/css/nodes/Makefile.am
deleted file mode 100644
index c65fb250d5..0000000000
--- a/testsuite/css/nodes/Makefile.am
+++ /dev/null
@@ -1,84 +0,0 @@
-include $(top_srcdir)/Makefile.decl
-
-NULL =
-
-CLEANFILES =
-
-TEST_PROGS += test-css-nodes
-test_in_files = test-css-nodes.test.in
-
-check_PROGRAMS = $(TEST_PROGS)
-
-test_css_nodes_CFLAGS = \
-	-I$(top_srcdir)                 \
-	-I$(top_builddir)/gdk           \
-	-I$(top_srcdir)/gdk             \
-	$(GTK_DEBUG_FLAGS)              \
-	$(GTK_DEP_CFLAGS)		\
-	$(NULL)
-
-test_css_nodes_LDADD = \
-	$(top_builddir)/gtk/libgtk-4.la \
-	$(GTK_DEP_LIBS)			\
-	$(NULL)
-
-test_css_nodes_SOURCES = \
-	test-css-nodes.c		\
-	$(NULL)
-
-test_data = \
-	box.ltr.ui		box.ltr.nodes			\
-	box.rtl.ui		box.rtl.nodes			\
-	box-packing.ltr.ui	box-packing.ltr.nodes		\
-	box-packing.rtl.ui	box-packing.rtl.nodes		\
-	buttons.ui 		buttons.nodes 			\
-	checkbutton.ltr.ui	checkbutton.ltr.nodes		\
-	checkbutton.rtl.ui	checkbutton.rtl.nodes		\
-	combobox.ui		combobox.nodes			\
-	entries.ui 		entries.nodes 			\
-	expander.ltr.ui		expander.ltr.nodes		\
-	expander.rtl.ui		expander.rtl.nodes		\
-	levelbar.ltr.ui 	levelbar.ltr.nodes		\
-	levelbar.rtl.ui 	levelbar.rtl.nodes		\
-	notebook-arrows.ui 	notebook-arrows.nodes 		\
-	notebook-arrows2.ui 	notebook-arrows2.nodes 		\
-	notebook.top.ltr.ui 	notebook.top.ltr.nodes 		\
-	notebook.top.rtl.ui 	notebook.top.rtl.nodes 		\
-	notebook.left.ltr.ui 	notebook.left.ltr.nodes 	\
-	notebook.left.rtl.ui 	notebook.left.rtl.nodes 	\
-	notebook.right.ltr.ui 	notebook.right.ltr.nodes 	\
-	notebook.right.rtl.ui 	notebook.right.rtl.nodes 	\
-	notebook.bottom.ltr.ui 	notebook.bottom.ltr.nodes 	\
-	notebook.bottom.rtl.ui 	notebook.bottom.rtl.nodes 	\
-	paned.ltr.ui		paned.ltr.nodes			\
-	paned.rtl.ui		paned.rtl.nodes			\
-	progressbar.ui 		progressbar.nodes 		\
-	scale.ui		scale.nodes			\
-	$(NULL)
-
-EXTRA_DIST += $(test_in_files) $(test_data)
-
-if BUILDOPT_INSTALL_TESTS
-insttestdir=$(libexecdir)/installed-tests/$(PACKAGE)/css/nodes
-insttest_PROGRAMS = $(TEST_PROGS)
-insttest_DATA = $(test_data)
-
-substitutions = \
-	-e s,@libexecdir\@,$(libexecdir),g \
-	$(NULL)
-
-test_files = $(test_in_files:.test.in=.test)
-
-$(test_files): %.test: %.test.in
-	$(AM_V_GEN) sed $(substitutions) $< > $@.tmp && mv $@.tmp $@
-
-EXTRA_DIST += $(test_files)
-
-CLEANFILES += $(test_files)
-
-testmetadir = $(datadir)/installed-tests/$(PACKAGE)/css/nodes
-testmeta_DATA = $(test_files)
-endif
-
-
--include $(top_srcdir)/git.mk
diff --git a/testsuite/css/parser/Makefile.am b/testsuite/css/parser/Makefile.am
deleted file mode 100644
index c724d21b1d..0000000000
--- a/testsuite/css/parser/Makefile.am
+++ /dev/null
@@ -1,491 +0,0 @@
-include $(top_srcdir)/Makefile.decl
-
-NULL =
-
-CLEANFILES =
-
-TEST_PROGS += test-css-parser
-test_in_files = test-css-parser.test.in
-
-check_PROGRAMS = $(TEST_PROGS)
-
-test_css_parser_CFLAGS = \
-       	-I$(top_srcdir)                 \
-       	-I$(top_builddir)/gdk           \
-       	-I$(top_srcdir)/gdk             \
-       	-DGDK_DISABLE_DEPRECATED        \
-       	-DGTK_DISABLE_DEPRECATED        \
-       	$(GTK_DEBUG_FLAGS)              \
-       	$(GTK_DEP_CFLAGS)
-
-test_css_parser_LDADD = \
-      	$(top_builddir)/gtk/libgtk-4.la \
-	$(GTK_DEP_LIBS)
-
-test_css_parser_SOURCES = \
-	test-css-parser.c
-
-clean-local:
-	rm $(builddir)/*.out.css || true
-
-test_data = \
-	animation-crash-3.12.css \
-	animation-crash-3.12.errors \
-	animation-crash-3.12.ref.css \
-	animation-shorthand-crash.css \
-	animation-shorthand-crash.ref.css \
-        animation-delay.css \
-        animation-delay.ref.css \
-        animation-direction.css \
-        animation-direction.ref.css \
-        animation-duration.css \
-        animation-duration.ref.css \
-        animation-fill-mode.css \
-        animation-fill-mode.ref.css \
-        animation-iteration-count.css \
-        animation-iteration-count.ref.css \
-        animation-name.css \
-        animation-name.ref.css \
-        animation-play-state.css \
-        animation-play-state.ref.css \
-        animation-timing-function.css \
-        animation-timing-function.ref.css \
-	at-invalid-01.css \
-	at-invalid-01.errors \
-	at-invalid-01.ref.css \
-	at-invalid-02.css \
-	at-invalid-02.errors \
-	at-invalid-02.ref.css \
-	at-invalid-03.css \
-	at-invalid-03.errors \
-	at-invalid-03.ref.css \
-	at-invalid-04.css \
-	at-invalid-04.errors \
-	at-invalid-04.ref.css \
-	at-invalid-05.css \
-	at-invalid-05.errors \
-	at-invalid-05.ref.css \
-	at-invalid-06.css \
-	at-invalid-06.errors \
-	at-invalid-06.ref.css \
-	at-invalid-07.css \
-	at-invalid-07.errors \
-	at-invalid-07.ref.css \
-	at-invalid-08.css \
-	at-invalid-08.errors \
-	at-invalid-08.ref.css \
-	at-invalid-09.css \
-	at-invalid-09.errors \
-	at-invalid-09.ref.css \
-	at-invalid-10.css \
-	at-invalid-10.errors \
-	at-invalid-10.ref.css \
-	at-invalid-11.css \
-	at-invalid-11.errors \
-	at-invalid-11.ref.css \
-	at-invalid-12.css \
-	at-invalid-12.errors \
-	at-invalid-12.ref.css \
-	at-invalid-13.css \
-	at-invalid-13.errors \
-	at-invalid-13.ref.css \
-	at-invalid-14.css \
-	at-invalid-14.errors \
-	at-invalid-14.ref.css \
-	at-invalid-15.css \
-	at-invalid-15.errors \
-	at-invalid-15.ref.css \
-	at-invalid-16.css \
-	at-invalid-16.errors \
-	at-invalid-16.ref.css \
-	at-invalid-17.css \
-	at-invalid-17.errors \
-	at-invalid-17.ref.css \
-	at-invalid-18.css \
-	at-invalid-18.errors \
-	at-invalid-18.ref.css \
-	at-invalid-19.css \
-	at-invalid-19.errors \
-	at-invalid-19.ref.css \
-	at-invalid-20.css \
-	at-invalid-20.errors \
-	at-invalid-20.ref.css \
-	at-invalid-21.css \
-	at-invalid-21.errors \
-	at-invalid-21.ref.css \
-	at-invalid-22.css \
-	at-invalid-22.errors \
-	at-invalid-22.ref.css \
-	at-invalid-23.css \
-	at-invalid-23.errors \
-	at-invalid-23.ref.css \
-	at-invalid-24.css \
-	at-invalid-24.errors \
-	at-invalid-24.ref.css \
-	at-invalid-25.css \
-	at-invalid-25.errors \
-	at-invalid-25.ref.css \
-	at-invalid-26.css \
-	at-invalid-26.errors \
-	at-invalid-26.ref.css \
-	at-invalid-27.css \
-	at-invalid-27.errors \
-	at-invalid-27.ref.css \
-	at-valid-01.css \
-	at-valid-01.ref.css \
-	at-valid-02.css \
-	at-valid-02.ref.css \
-	at-valid-03.css \
-	at-valid-03.ref.css \
-	at-valid-04.css \
-	at-valid-04.ref.css \
-	at-valid-05.css \
-	at-valid-05.ref.css \
-	at-valid-06.css \
-	at-valid-06.ref.css \
-	at-valid-07.css \
-	at-valid-08.css \
-	at-valid-08.ref.css \
-	at-valid-09.css \
-	at-valid-09.ref.css \
-	at-valid-10.css \
-	at-valid-10.ref.css \
-	at-valid-11.css \
-	at-valid-11.ref.css \
-	at-valid-12.css \
-	at-valid-12.ref.css \
-	at-valid-13.css \
-	at-valid-13.ref.css \
-	at-valid-14.css \
-	at-valid-14.ref.css \
-	at-valid-15.css \
-	at-valid-15.ref.css \
-	at-valid-16.css \
-	at-valid-16.ref.css \
-	at-valid-17.css \
-	at-valid-18.css \
-	at-valid-18.ref.css \
-	at-valid-19.css \
-	at-valid-19.errors \
-	at-valid-19.ref.css \
-	at-valid-20.css \
-	at-valid-20.errors \
-	at-valid-20.ref.css \
-	at-valid-21.css \
-	at-valid-21.errors \
-	at-valid-21.ref.css \
-        background-blend-mode.css \
-        background-blend-mode.ref.css \
-        background-clip.css \
-        background-clip.ref.css \
-        background-image.css \
-        background-image.ref.css \
-        background-origin.css \
-        background-origin.ref.css \
-	background-position.css \
-	background-position.errors \
-	background-position.ref.css \
-	background-position-errors.css \
-	background-position-errors.errors \
-	background-position-errors.ref.css \
-	background-repeat.css \
-	background-repeat.ref.css \
-	background-shorthand.css \
-	background-shorthand.ref.css \
-	background-shorthand-single.css \
-	background-shorthand-single.ref.css \
-        background-size.css \
-        background-size.ref.css \
-	background-win32-color-is-no-error.css \
-	background-win32-color-is-no-error.ref.css \
-	border.css \
-	border.errors \
-	border.ref.css \
-        border-color.css \
-        border-color.ref.css \
-	border-color-currentcolor.css \
-	border-color-currentcolor.ref.css \
-        border-image-source.css \
-        border-image-source.ref.css \
-        border-image-repeat.css \
-        border-image-repeat.ref.css \
-        border-image-slice.css \
-        border-image-slice.ref.css \
-        border-image-width.css \
-        border-image-width.ref.css \
-	border-infloop-3.12.css \
-	border-infloop-3.12.errors \
-	border-infloop-3.12.ref.css \
-        border-radius.css \
-        border-radius.ref.css \
-	border-radius-shorthand.css \
-	border-radius-shorthand.errors \
-	border-radius-shorthand.ref.css \
-	border-shorthand.css \
-	border-shorthand.ref.css \
-        border-style.css \
-        border-style.ref.css \
-        border-width.css \
-        border-width.ref.css \
-        box-shadow.css \
-        box-shadow.ref.css \
-	calc.css \
-	calc.ref.css \
-	calc-errors.css \
-	calc-errors.ref.css \
-	calc-errors.errors \
-	calc-simple.css \
-	calc-simple.ref.css \
-	close-at-end-of-file.css \
-	close-at-end-of-file.errors \
-	close-at-end-of-file.ref.css \
-        color.css \
-        color.ref.css \
-	colors-errors.css \
-	colors-errors.errors \
-	colors-errors.ref.css \
-	colors-red.css \
-	colors-red.ref.css \
-	comment-detection.css \
-	comment-detection.ref.css \
-	cross-fade-basic.css \
-	css-21-malformed-declarations.css \
-	css-21-malformed-declarations.errors \
-	css-21-malformed-declarations.ref.css \
-	css-21-malformed-statements.css \
-	css-21-malformed-statements.errors \
-	css-21-malformed-statements.ref.css \
-	currentcolor-everywhere.css \
-	declarations.css \
-	declarations.errors \
-	declarations.ref.css \
-	declarations-invalid-01.css \
-	declarations-invalid-01.errors \
-	declarations-invalid-01.ref.css \
-	declarations-invalid-02.css \
-	declarations-invalid-02.errors \
-	declarations-invalid-02.ref.css \
-	declarations-invalid-03.css \
-	declarations-invalid-03.errors \
-	declarations-invalid-03.ref.css \
-	declarations-invalid-04.css \
-	declarations-invalid-04.errors \
-	declarations-invalid-04.ref.css \
-	declarations-invalid-05.css \
-	declarations-invalid-05.errors \
-	declarations-invalid-05.ref.css \
-	declarations-invalid-06.css \
-	declarations-invalid-06.errors \
-	declarations-invalid-06.ref.css \
-	declarations-invalid-07.css \
-	declarations-invalid-07.errors \
-	declarations-invalid-07.ref.css \
-	declarations-invalid-08.css \
-	declarations-invalid-08.errors \
-	declarations-invalid-08.ref.css \
-	declarations-valid-01.css \
-	declarations-valid-01.ref.css \
-	declarations-valid-02.css \
-	declarations-valid-02.ref.css \
-	declarations-valid-03.css \
-	declarations-valid-03.ref.css \
-	declarations-valid-04.css \
-	declarations-valid-04.ref.css \
-	declarations-valid-05.css \
-	declarations-valid-05.ref.css \
-	declarations-valid-06.css \
-	declarations-valid-06.ref.css \
-	declarations-valid-07.css \
-	declarations-valid-07.ref.css \
-	declarations-valid-08.css \
-	declarations-valid-08.ref.css \
-	declarations-valid-09.css \
-	declarations-valid-09.ref.css \
-	declarations-valid-10.css \
-	declarations-valid-10.ref.css \
-	declarations-valid-11.css \
-	declarations-valid-11.ref.css \
-	declarations-valid-12.css \
-	declarations-valid-12.ref.css \
-	declarations-valid-13.css \
-	declarations-valid-13.ref.css \
-	declarations-valid-14.css \
-	declarations-valid-14.ref.css \
-	declarations-valid-15.css \
-	declarations-valid-15.ref.css \
-	declarations-valid-16.css \
-	declarations-valid-16.ref.css \
-	declarations-valid-17.css \
-	declarations-valid-17.ref.css \
-	declarations-valid-18.css \
-	declarations-valid-18.ref.css \
-	declarations-valid-22.css \
-	declarations-valid-22.ref.css \
-	declarations-valid-23.css \
-	declarations-valid-23.ref.css \
-	declarations-valid-24.css \
-	declarations-valid-24.ref.css \
-	declarations-valid-25.css \
-	declarations-valid-25.ref.css \
-	does-not-exist.css \
-	does-not-exist.errors \
-	does-not-exist.ref.css \
-	doubled.css \
-	doubled.ref.css \
-	empty.css \
-	font-family.css \
-	font-family.ref.css \
-        font-size.css \
-        font-size.ref.css \
-        font-stretch.css \
-        font-stretch.ref.css \
-        font-style.css \
-        font-style.ref.css \
-        font-variant.css \
-        font-variant.ref.css \
-        font-weight.css \
-        font-weight.ref.css \
-	freed-string-in-error-messages.css \
-	freed-string-in-error-messages.errors \
-	freed-string-in-error-messages.ref.css \
-	import-cyclic-1.css \
-	import-cyclic-1.errors \
-	import-cyclic-1.ref.css \
-	import-cyclic-2.css \
-	import-cyclic-2.errors \
-	import-cyclic-2.ref.css \
-	import-cyclic-3.css \
-	import-cyclic-3.errors \
-	import-cyclic-3.ref.css \
-	import-nonexistant.css \
-	import-nonexistant.errors \
-	import-nonexistant.ref.css \
-	import-recursive.css \
-	import-recursive.errors \
-	import-recursive.ref.css \
-	integer.css \
-	integer.errors \
-	integer.ref.css \
-	keyframes-empty.css \
-	keyframes-empty.ref.css \
-	keyframes-ordering.css \
-	keyframes-ordering.ref.css \
-        letter-spacing.css \
-        letter-spacing.ref.css \
-	linear-gradient.css \
-	linear-gradient.ref.css \
-        margin.css \
-        margin.ref.css \
-        min-height.css \
-        min-height.ref.css \
-        min-width.css \
-        min-width.ref.css \
-	no-semicolon.css \
-	no-semicolon.ref.css \
-	not.css \
-	not.ref.css \
-	nth-child.css \
-	nth-child.ref.css \
-        opacity.css \
-        opacity.ref.css \
-        outline-color.css \
-        outline-color.ref.css \
-        outline-offset.css \
-        outline-offset.ref.css \
-        outline-radius.css \
-        outline-radius.ref.css \
-        outline-style.css \
-        outline-style.ref.css \
-        outline-width.css \
-        outline-width.ref.css \
-        padding.css \
-        padding.ref.css \
-	property-name-errors.css \
-	property-name-errors.errors \
-	property-name-errors.ref.css \
-	pseudo-classes-known.css \
-	pseudo-classes-known.ref.css \
-	pseudo-classes-unknown.css \
-	pseudo-classes-unknown.errors \
-	pseudo-classes-unknown.ref.css \
-        radial.css \
-        radial.ref.css \
-	radial-background-position-error.css \
-	radial-background-position-error.errors \
-	radial-background-position-error.ref.css \
-	radial-positions.css \
-	radial-positions.errors \
-	radial-positions.ref.css \
-	selector.css \
-	selector.ref.css \
-	shadow.css \
-	shadow.ref.css \
-	shorthand.css \
-	shorthand.ref.css \
-	simple.css \
-	single-slash.css \
-	single-slash.errors\
-	single-slash.ref.css \
-	string-values.css \
-	string-values.ref.css \
-        text-decoration-color.css \
-        text-decoration-color.ref.css \
-        text-decoration-line.css \
-        text-decoration-line.ref.css \
-        text-decoration-style.css \
-        text-decoration-style.ref.css \
-	test.png \
-        text-shadow.css \
-        text-shadow.ref.css \
-	text-shadow-invalid-but-worked-in-3.12.css \
-	text-shadow-invalid-but-worked-in-3.12.errors \
-	text-shadow-invalid-but-worked-in-3.12.ref.css \
-	transition.css \
-	transition.ref.css \
-        transition-delay.css \
-        transition-delay.ref.css \
-        transition-duration.css \
-        transition-duration.ref.css \
-        transition-property.css \
-        transition-property.ref.css \
-        transition-timing-function.css \
-        transition-timing-function.ref.css \
-	value-inherit.css \
-	value-inherit.errors \
-	value-inherit-shorthand.css \
-	value-inherit-shorthand.ref.css \
-	value-initial.css \
-	value-initial.errors \
-	value-initial-shorthand.css \
-	value-initial-shorthand.ref.css \
-	value-none.css \
-	value-none.errors \
-	value-none.ref.css \
-	widget-style-property.css \
-	$(NULL)
-
-EXTRA_DIST += $(test_in_files) $(test_data)
-
-if BUILDOPT_INSTALL_TESTS
-insttestdir=$(libexecdir)/installed-tests/$(PACKAGE)/css/parser
-insttest_PROGRAMS = $(TEST_PROGS)
-insttest_DATA = $(test_data)
-
-substitutions = \
-	-e s,@libexecdir\@,$(libexecdir),g \
-	$(NULL)
-
-test_files = $(test_in_files:.test.in=.test)
-
-$(test_files): %.test: %.test.in
-	$(AM_V_GEN) sed $(substitutions) $< > $@.tmp && mv $@.tmp $@
-
-EXTRA_DIST += $(test_in_files)
-
-CLEANFILES += $(test_files)
-
-testmetadir = $(datadir)/installed-tests/$(PACKAGE)/css/parser
-testmeta_DATA = $(test_files)
-endif
- 
--include $(top_srcdir)/git.mk
diff --git a/testsuite/css/style/Makefile.am b/testsuite/css/style/Makefile.am
deleted file mode 100644
index 56868b5d74..0000000000
--- a/testsuite/css/style/Makefile.am
+++ /dev/null
@@ -1,80 +0,0 @@
-include $(top_srcdir)/Makefile.decl
-
-NULL =
-
-CLEANFILES =
-
-TEST_PROGS += test-css-style
-test_in_files = test-css-style.test.in
-
-check_PROGRAMS = $(TEST_PROGS)
-
-test_css_style_CFLAGS = \
-        -I$(top_srcdir)                 \
-        -I$(top_builddir)/gdk           \
-        -I$(top_srcdir)/gdk             \
-        $(GTK_DEBUG_FLAGS)              \
-        $(GTK_DEP_CFLAGS)		\
-	$(NULL)
-
-test_css_style_LDADD = \
-        $(top_builddir)/gtk/libgtk-4.la \
-        $(GTK_DEP_LIBS)			\
-	$(NULL)
-
-test_css_style_SOURCES = \
-        test-css-style.c		\
-	resources.c			\
-	$(NULL)
-
-test_data = \
-	adjacent-states.ui 	adjacent-states.css	adjacent-states.nodes 	\
-	colornames.ui		colornames.css		colornames.nodes	\
-        currentcolor.ui 	currentcolor.css        currentcolor.nodes      \
-	font.ui			font.css		font.nodes		\
-        gradient.ui    	 	gradient.css            gradient.nodes          \
-        inherit.ui      	inherit.css             inherit.nodes           \
-	label.ui		label.css	        label.nodes             \
-	nth-child.ui		nth-child.css	        nth-child.nodes         \
-	$(NULL)
-
-BUILT_SOURCES = resources.c
-
-resource_files = $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(builddir)/test-css-style.gresource.xml)
-
-resources.c: test-css-style.gresource.xml $(resource_files)
-	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-source $(srcdir)/test-css-style.gresource.xml
-
-EXTRA_DIST += \
-	test-css-style.gresource.xml	\
-	$(resource_files)		\
-	$(test_in_files) 		\
-	$(test_data)			\
-	$(NULL)
-
-if BUILDOPT_INSTALL_TESTS
-insttestdir=$(libexecdir)/installed-tests/$(PACKAGE)/css/style
-insttest_PROGRAMS = $(TEST_PROGS)
-insttest_DATA = $(test_data)
-
-substitutions = \
-        -e s,@libexecdir\@,$(libexecdir),g \
-        $(NULL)
-
-test_files = $(test_in_files:.test.in=.test)
-
-$(test_files): %.test: %.test.in
-	$(AM_V_GEN) sed $(substitutions) $< > $@.tmp && mv $@.tmp $@
-
-EXTRA_DIST += \
-	$(test_files) 		\
-	$(NULL)
-
-CLEANFILES += $(test_files)
-
-testmetadir = $(datadir)/installed-tests/$(PACKAGE)/css/style
-testmeta_DATA = $(test_files)
-endif
-
-
--include $(top_srcdir)/git.mk
diff --git a/testsuite/gdk/Makefile.am b/testsuite/gdk/Makefile.am
deleted file mode 100644
index 03cb577468..0000000000
--- a/testsuite/gdk/Makefile.am
+++ /dev/null
@@ -1,55 +0,0 @@
-include $(top_srcdir)/Makefile.decl
-
-NULL=
-
-noinst_PROGRAMS = $(TEST_PROGS)
-
-AM_CPPFLAGS = 				\
-	$(GTK_DEP_CFLAGS) 		\
-	-I$(top_srcdir) 		\
-	-I$(top_builddir)/gdk 		\
-	$(NULL)
-
-LDADD = 				\
-	$(GTK_DEP_LIBS) 		\
-	$(top_builddir)/gtk/libgtk-4.la \
-	$(NULL)
-
-#TEST_PROGS              += check-gdk-cairo
-
-TEST_PROGS += 				\
-	cairo				\
-	cursor				\
-	display				\
-	encoding			\
-	keysyms				\
-	rectangle			\
-	rgba				\
-	seat				\
-	$(NULL)
-
-CLEANFILES = 			\
-	cairosurface.png	\
-	gdksurface.png		\
-	$(NULL)
-
-if BUILDOPT_INSTALL_TESTS
-insttestdir=$(libexecdir)/installed-tests/$(PACKAGE)
-insttest_PROGRAMS = $(TEST_PROGS)
-
-%.test: %$(EXEEXT) Makefile
-	$(AM_V_GEN) (echo '[Test]' > $@.tmp; \
-	echo 'Type=session' >> $@.tmp; \
-	echo 'Output=TAP' >> $@.tmp; \
-	echo 'Exec=$(insttestdir)/$< --tap' >> $@.tmp; \
-	mv $@.tmp $@)
-
-test_files = $(TEST_PROGRS:=.test)
-
-DISTCLEANFILES = $(test_files)
-
-testmetadir = $(datadir)/installed-tests/$(PACKAGE)
-testmeta_DATA = $(test_files)
-endif
-
--include $(top_srcdir)/git.mk
diff --git a/testsuite/gsk/Makefile.am b/testsuite/gsk/Makefile.am
deleted file mode 100644
index c253b36aee..0000000000
--- a/testsuite/gsk/Makefile.am
+++ /dev/null
@@ -1,39 +0,0 @@
-include $(top_srcdir)/Makefile.decl
-
-NULL=
-
-noinst_PROGRAMS = $(TEST_PROGS)
-
-AM_CPPFLAGS = \
-	-I$(top_srcdir) \
-	-I$(top_builddir)/gdk \
-	-I$(top_srcdir)/gdk \
-	-I$(top_builddir)/gsk \
-	-I$(top_srcdir)/gsk \
-	$(GTK_DEBUG_FLAGS) \
-	$(GTK_DEP_CFLAGS)
-
-LDADD = $(GTK_DEP_LIBS)
-
-TEST_PROGS += \
-	$(NULL)
-
-if BUILDOPT_INSTALL_TESTS
-insttestdir=$(pkglibexecdir)/installed-tests
-insttest_PROGRAMS = $(TEST_PROGS)
-
-%.test: %$(EXEEXT) Makefile
-	$(AM_V_GEN) (echo '[Test]' > $@.tmp; \
-	echo 'Type=session' >> $@.tmp; \
-	echo 'Exec=$(insttestdir)/$<' >> $@.tmp; \
-	mv $@.tmp $@)
-
-test_files = $(TEST_PROGRS:=.test)
-
-DISTCLEANFILES = $(test_files)
-
-testmetadir = $(datadir)/installed-tests/$(PACKAGE)
-testmeta_DATA = $(test_files)
-endif
-
--include $(top_srcdir)/git.mk
diff --git a/testsuite/gtk/Makefile.am b/testsuite/gtk/Makefile.am
deleted file mode 100644
index e388c7764b..0000000000
--- a/testsuite/gtk/Makefile.am
+++ /dev/null
@@ -1,303 +0,0 @@
-include $(top_srcdir)/Makefile.decl
-
-NULL =
-
-AM_CPPFLAGS = \
-	-DGTK_LOCALEDIR=\"$(localedir)\"\
-	-I$(top_srcdir)			\
-	-I$(top_builddir)/gdk		\
-	-I$(top_srcdir)/gdk		\
-	-I$(top_builddir)/gtk		\
-	-I$(top_srcdir)/gtk		\
-	$(GTK_DEBUG_FLAGS)		\
-	$(GTK_DEP_CFLAGS)
-
-if OS_UNIX
-AM_CPPFLAGS += -DHAVE_UNIX_PRINT_WIDGETS
-endif
-
-DEPS = \
-	$(top_builddir)/gtk/libgtk-4.la
-
-LDADD = \
-	$(top_builddir)/gtk/libgtk-4.la	\
-	$(GTK_DEP_LIBS)
-
-CLEANFILES =
-BUILT_SOURCES =
-
-noinst_PROGRAMS = $(TEST_PROGS)
-
-TESTS_ENVIRONMENT = \
-	G_ENABLE_DIAGNOSTIC=0 	\
-	GIO_USE_VFS=local 	\
-	GSETTINGS_BACKEND=memory
-
-TEST_PROGS += 			\
-	accel			\
-	accessible		\
-	adjustment		\
-	bitmask			\
-	builder			\
-	builderparser		\
-	cellarea		\
-	check-icon-names	\
-	check-cursor-names	\
-	clipboard		\
-	cssprovider		\
-	defaultvalue		\
-	entry			\
-	firefox-stylecontext	\
-	floating		\
-	focus			\
-	gestures		\
-	grid			\
-	gtkmenu			\
-	icontheme		\
-	keyhash			\
-	listbox			\
-	notify			\
-	no-gtk-init		\
-	object			\
-	objects-finalize	\
-	papersize		\
-	rbtree			\
-	recentmanager		\
-	regression-tests	\
-	scrolledwindow		\
-	spinbutton		\
-	stylecontext		\
-	templates		\
-	textbuffer		\
-	textiter		\
-	treemodel		\
-	treepath		\
-	treeview		\
-	typename		\
-	window			\
-	displayclose		\
-	revealer-size \
-	widgetorder \
-	$(NULL)
-
-if OS_UNIX
-#TEST_PROGS			+= defaultvalue
-endif
-
-if HAVE_CXX
-
-AM_CXXFLAGS = $(AM_CPPFLAGS)
-
-TEST_PROGS += autotestkeywords
-
-autotestkeywords_SOURCES = autotestkeywords.cc
-autotestkeywords_CPPFLAGS = -I$(srcdir)/dummy-headers
-
-if HAVE_OBJC
-autotestkeywords_CPPFLAGS += -DHAVE_OBJC=1 -x objective-c++
-endif
-
-endif
-
-treemodel_SOURCES = 		\
-	treemodel.h 		\
-	treemodel.c 		\
-	liststore.c 		\
-	treestore.c 		\
-	filtermodel.c 		\
-	sortmodel.c 		\
-	modelrefcount.c 	\
-	gtktreemodelrefcount.h 	\
-	gtktreemodelrefcount.c	\
-	$(NULL)
-
-builder_LDFLAGS = -export-dynamic
-
-rbtree_CFLAGS  = -DGTK_COMPILATION -UG_ENABLE_DEBUG
-rbtree_LDADD = $(GTK_DEP_LIBS)
-rbtree_SOURCES = 			\
-	rbtree.c 			\
-	gtkrbtree.c			\
-	$(NULL)
-
-gtkrbtree.c: $(top_srcdir)/gtk/gtkrbtree.c
-	$(AM_V_GEN) $(LN_S) $^ $@
-
-CLEANFILES += gtkrbtree.c
-
-bitmask_CFLAGS  = -DGTK_COMPILATION -UG_ENABLE_DEBUG
-bitmask_LDADD = $(GTK_DEP_LIBS)
-bitmask_SOURCES = 			\
-	bitmask.c 			\
-	gtkallocatedbitmask.c		\
-	$(NULL)
-
-gtkallocatedbitmask.c: $(top_srcdir)/gtk/gtkallocatedbitmask.c
-	$(AM_V_GEN) $(LN_S) $^ $@
-
-CLEANFILES += gtkallocatedbitmask.c
-
-keyhash_CFLAGS =					\
-	-DGTK_COMPILATION 				\
-	-DGTK_LIBDIR=\"$(libdir)\" 			\
-	-DGTK_DATADIR=\"$(datadir)\" 			\
-	-DGTK_DATA_PREFIX=\"$(prefix)\" 		\
-	-DGTK_SYSCONFDIR=\"$(sysconfdir)\"		\
-	$(NULL)
-
-keyhash_SOURCES	=		\
-	keyhash.c 		\
-	gtkkeyhash.c 		\
-	gtkresources.c 		\
-	gtkprivate.c 		\
-	$(NULL)
-
-gtkkeyhash.c: $(top_srcdir)/gtk/gtkkeyhash.c
-	$(AM_V_GEN) $(LN_S) $^ $@
-
-gtkresources.c: $(top_builddir)/gtk/gtkresources.c
-	$(AM_V_GEN) $(LN_S) $^ $@
-
-gtkprivate.c: $(top_srcdir)/gtk/gtkprivate.c
-	$(AM_V_GEN) $(LN_S) $^ $@
-
-CLEANFILES += gtkkeyhash.c gtkresources.c gtkprivate.c
-
-test_icontheme =					\
-	icons/index.theme				\
-	icons/16x16/simple.png				\
-	icons/16x16/twosize-fixed.svg			\
-	icons/16x16s/twosize.svg			\
-	icons/32x32/only32-symbolic.svg			\
-	icons/32x32/twosize-fixed.svg			\
-	icons/32x32s/twosize.svg			\
-	icons/scalable/everything-justregular.svg	\
-	icons/scalable/everything-justrtl-rtl.svg	\
-	icons/scalable/everything-rtl.svg		\
-	icons/scalable/everything-symbolic-rtl.svg	\
-	icons/scalable/everything-justsymbolic-symbolic.svg	\
-	icons/scalable/everything.svg			\
-	icons/scalable/everything-symbolic.svg		\
-	icons/scalable/nonsquare-symbolic.svg		\
-	icons/15/size-test.png				\
-	icons/16-22/size-test.png			\
-	icons/25+/size-test.svg				\
-	icons/35+/size-test.svg				\
-	icons/scalable/one-two.svg			\
-	icons/scalable/one-two-rtl.svg			\
-	icons2/scalable/one-two-three-symbolic.svg	\
-	icons2/scalable/one-two-symbolic.svg		\
-	icons2/scalable/one-two-symbolic-rtl.svg	\
-	icons2/index.theme				\
-	$(NULL)
-
-test_ui =						\
-	ui/test1.ui ui/test1.expected			\
-	ui/test2.ui ui/test2.expected			\
-	ui/test3.ui ui/test3.expected			\
-	ui/test4.ui ui/test4.expected			\
-	ui/test5.ui ui/test5.expected			\
-	ui/test6.ui ui/test6.expected			\
-	ui/test7.ui ui/test7.expected			\
-	ui/label1.ui ui/label1.expected			\
-	ui/label2.ui ui/label2.expected			\
-	ui/label3.ui ui/label3.expected			\
-	ui/label4.ui ui/label4.expected			\
-	ui/label5.ui ui/label5.expected			\
-	ui/celllayout1.ui ui/celllayout1.expected	\
-	ui/celllayout2.ui ui/celllayout2.expected	\
-	ui/celllayout3.ui ui/celllayout3.expected	\
-	ui/celllayout4.ui ui/celllayout4.expected	\
-	ui/celllayout5.ui ui/celllayout5.expected	\
-	ui/celllayout6.ui ui/celllayout6.expected	\
-	ui/celllayout7.ui ui/celllayout7.expected	\
-	ui/container1.ui ui/container1.expected		\
-	ui/container2.ui ui/container2.expected		\
-	ui/container3.ui ui/container3.expected		\
-	ui/container4.ui ui/container4.expected		\
-	ui/container5.ui ui/container5.expected		\
-	ui/container6.ui ui/container6.expected		\
-	ui/container7.ui ui/container7.expected		\
-	ui/container8.ui ui/container8.expected		\
-	ui/scale1.ui ui/scale1.expected			\
-	ui/scale2.ui ui/scale2.expected			\
-	ui/scale3.ui ui/scale3.expected			\
-	ui/scale4.ui ui/scale4.expected			\
-	ui/scale5.ui ui/scale5.expected			\
-	ui/scale6.ui ui/scale6.expected			\
-	ui/scale7.ui ui/scale7.expected			\
-	ui/levelbar1.ui ui/levelbar1.expected 		\
-	ui/levelbar2.ui ui/levelbar2.expected 		\
-	ui/levelbar3.ui ui/levelbar3.expected 		\
-	ui/levelbar4.ui ui/levelbar4.expected 		\
-	ui/levelbar5.ui ui/levelbar5.expected 		\
-	ui/levelbar6.ui ui/levelbar6.expected 		\
-	ui/dialog1.ui ui/dialog1.expected 		\
-	ui/dialog2.ui ui/dialog2.expected 		\
-	ui/dialog3.ui ui/dialog3.expected 		\
-	ui/dialog4.ui ui/dialog4.expected 		\
-	ui/dialog5.ui ui/dialog5.expected 		\
-	ui/dialog6.ui ui/dialog6.expected 		\
-	ui/filefilter1.ui ui/filefilter1.expected	\
-	ui/filefilter2.ui ui/filefilter2.expected 	\
-	ui/filefilter3.ui ui/filefilter3.expected 	\
-	ui/filefilter4.ui ui/filefilter4.expected 	\
-	ui/filefilter5.ui ui/filefilter5.expected 	\
-	ui/filefilter6.ui ui/filefilter6.expected 	\
-	ui/filefilter7.ui ui/filefilter7.expected 	\
-	ui/filefilter8.ui ui/filefilter8.expected 	\
-	ui/filefilter9.ui ui/filefilter9.expected 	\
-	ui/filefilter10.ui ui/filefilter10.expected 	\
-	ui/infobar1.ui ui/infobar1.expected	 	\
-	ui/infobar2.ui ui/infobar2.expected	 	\
-	ui/infobar3.ui ui/infobar3.expected	 	\
-	ui/infobar4.ui ui/infobar4.expected	 	\
-	ui/infobar5.ui ui/infobar5.expected	 	\
-	ui/infobar6.ui ui/infobar6.expected	 	\
-	ui/image1.ui ui/image1.expected		 	\
-	ui/image2.ui ui/image2.expected		 	\
-	$(NULL)
-
-EXTRA_DIST +=				\
-	file-chooser-test-dir/empty     \
-	file-chooser-test-dir/text.txt	\
-	$(test_icontheme)		\
-	$(test_ui)			\
-	$(NULL)
-
-GTK_GSETTINGS_SCHEMAS = \
-	$(top_srcdir)/gtk/org.gtk.Settings.ColorChooser.gschema.xml \
-	$(top_srcdir)/gtk/org.gtk.Settings.FileChooser.gschema.xml \
-	$(NULL)
-
-BUILT_SOURCES += gschemas.compiled
-CLEANFILES += gschemas.compiled
-
-gschemas.compiled: $(GTK_GSETTINGS_SCHEMAS)
-	$(AM_V_GEN) $(GLIB_COMPILE_SCHEMAS) \
-		$(addprefix --schema-file=,$(GTK_GSETTINGS_SCHEMAS)) \
-		--targetdir=$(builddir)
-
-all-am: gschemas.compiled
-
-if BUILDOPT_INSTALL_TESTS
-insttestdir = $(libexecdir)/installed-tests/$(PACKAGE)
-insttest_PROGRAMS = $(TEST_PROGS)
-nobase_insttest_DATA = $(test_icontheme) $(test_ui)
-
-%.test: %$(EXEEXT) Makefile
-	$(AM_V_GEN) (echo '[Test]' > $@.tmp; \
-	echo 'Type=session' >> $@.tmp; \
-	echo 'Output=TAP' >> $@.tmp; \
-	echo 'Exec=env G_ENABLE_DIAGNOSTIC=0 $(insttestdir)/$< --tap' >> $@.tmp; \
-	mv $@.tmp $@)
-
-test_files = $(TEST_PROGS:=.test)
-
-DISTCLEANFILES = $(test_files)
-
-testmetadir = $(datadir)/installed-tests/$(PACKAGE)
-testmeta_DATA = $(test_files)
-endif
-
--include $(top_srcdir)/git.mk
diff --git a/testsuite/reftests/Makefile.am b/testsuite/reftests/Makefile.am
deleted file mode 100644
index 6ea565dc82..0000000000
--- a/testsuite/reftests/Makefile.am
+++ /dev/null
@@ -1,536 +0,0 @@
-include $(top_srcdir)/Makefile.decl
-NULL =
-
-TESTS_ENVIRONMENT = 				\
-	REFTEST_MODULE_DIR=$(abs_builddir)	\
-	GTK_IM_MODULE=gtk-im-context-simple 	\
-	GSETTINGS_BACKEND=memory		\
-	G_ENABLE_DIAGNOSTIC=0
-
-TEST_PROGS += gtk-reftest
-
-check_PROGRAMS = $(TEST_PROGS)
-
-gtk_reftest_CFLAGS = \
-	-I$(top_srcdir)                 \
-	-I$(top_builddir)/gdk           \
-	-I$(top_srcdir)/gdk             \
-	-DGDK_DISABLE_DEPRECATED        \
-	-DGTK_DISABLE_DEPRECATED        \
-	$(GTK_DEBUG_FLAGS)              \
-	$(GTK_DEP_CFLAGS)		\
-	$(GMODULE_CFLAGS)		\
-	$(NULL)
-
-gtk_reftest_LDADD = \
-	libgtkreftestprivate.la		\
-	$(top_builddir)/gtk/libgtk-4.la \
-	$(GTK_DEP_LIBS)			\
-	$(GMODULE_LIBS)			\
-	$(NULL)
-
-if PLATFORM_WIN32
-noinst_LTLIBRARIES =
-lib_LTLIBRARIES =		\
-	libgtkreftestprivate.la	\
-	$(NULL)
-else
-noinst_LTLIBRARIES =		\
-	libgtkreftestprivate.la	\
-	$(NULL)
-endif
-
-libgtkreftestprivate_la_CFLAGS = $(gtk_reftest_CFLAGS)
-libgtkreftestprivate_la_LDFLAGS = $(no_undefined)
-libgtkreftestprivate_la_LIBADD =	\
-	$(top_builddir)/gtk/libgtk-4.la \
-	$(GTK_DEP_LIBS)			\
-	$(GMODULE_LIBS)			\
-	$(NULL)
-
-libgtkreftestprivate_la_SOURCES =	\
-	reftest-compare.c		\
-	reftest-compare.h		\
-	reftest-module.c		\
-	reftest-module.h		\
-	reftest-snapshot.c		\
-	reftest-snapshot.h		\
-	$(NULL)
-
-gtk_reftest_SOURCES = \
-	gtk-reftest.c			\
-	gtk-reftest.h
-
-clean-local:
-	rm -rf output/ || true
-
-EXTRA_DIST += \
-	align-expand.sh \
-	$(NULL)
-
-testdata = \
-	721800-0px-dotted-border.css \
-	721800-0px-dotted-border.ref.ui \
-	721800-0px-dotted-border.ui \
-	actionbar.css \
-	actionbar.ref.ui \
-	actionbar.ui \
-	animation-direction.css \
-	animation-direction.ref.ui \
-	animation-direction.ui \
-	animation-fill-mode-iteration-count.css \
-	animation-fill-mode-iteration-count.ref.ui \
-	animation-fill-mode-iteration-count.ui \
-	background-area.css \
-	background-area.ref.ui \
-	background-area.ui \
-	background-blend-mode-clip-interaction.css \
-	background-blend-mode-clip-interaction.ref.ui \
-	background-blend-mode-clip-interaction.ui \
-	background-color-transparent.css \
-	background-color-transparent.ref.ui \
-	background-color-transparent.ui \
-	background-image-multiple.css \
-	background-image-multiple.ref.ui \
-	background-image-multiple.ui \
-	background-origin.css \
-	background-origin.ref.ui \
-	background-origin.ui \
-	background-positioning-area-empty.ref.ui \
-	background-positioning-area-empty.ui \
-	background-position.css \
-	background-position.ref.ui \
-	background-position.ui \
-	background-position-repeat.css \
-	background-position-repeat.ref.ui \
-	background-position-repeat.ui \
-	background-position-repeat-bg.png \
-	background-position-simple.css \
-	background-position-simple.ref.ui \
-	background-position-simple.ui \
-	background-size.css \
-	background-size.ref.ui \
-	background-size.ui \
-	background-size-keywords.css \
-	background-size-keywords.ref.ui \
-	background-size-keywords.ui \
-	background-size-zero.css \
-	background-size-zero.ref.ui \
-	background-size-zero.ui \
-	background-window-transparent.css \
-	background-window-transparent.ref.ui \
-	background-window-transparent.ui \
-	bad-color-names.css \
-	bad-color-names.ref.ui \
-	bad-color-names.ui \
-	reference-background-origin.png	\
-	border-color-default.css \
-	border-color-default.ref.ui \
-	border-color-default.ui \
-	border-corner-zero-width-rendering.css \
-	border-corner-zero-width-rendering.ref.ui \
-	border-corner-zero-width-rendering.ui \
-	border-half-pixel.css \
-	border-half-pixel.ref.ui \
-	border-half-pixel.ui \
-	border-image-ball-green.png \
-	border-image-ball-red.png \
-	border-image-ball-yellow.png \
-	border-image-balls.png \
-	border-image-3-balls-green.png \
-	border-image-3-balls-green-squished.png \
-	border-image-3-balls-yellow.png \
-	border-image-3-balls-yellow-squished.png \
-	border-image-excess-size.css \
-	border-image-excess-size.ref.ui \
-	border-image-excess-size.ui \
-	border-image-url-scaled.css \
-	border-image-url-scaled.ref.ui \
-	border-image-url-scaled.ui \
-	border-image-url.css \
-	border-image-url.ref.ui \
-	border-image-url.ui \
-	border-radius-clamp.css \
-	border-radius-clamp.ref.ui \
-	border-radius-clamp.ui \
-	border-rgb.png \
-	border-rgb@2.png \
-	border-style-none.css \
-	border-style-none.ref.ui \
-	border-style-none.ui \
-	border-style.css \
-	border-style.ref.ui \
-	border-style.ui \
-	box-order.css \
-	box-order.ref.ui \
-	box-order.ui \
-	box-packing.css \
-	box-packing.ref.ui \
-	box-packing.ui \
-	box-pseudo-classes.css \
-	box-pseudo-classes.ref.ui \
-	box-pseudo-classes.ui \
-	box-shadow-changes-modify-clip.css \
-	box-shadow-changes-modify-clip.ref.ui \
-	box-shadow-changes-modify-clip.ui \
-	box-shadow-spec-inset.css \
-	box-shadow-spec-inset.ref.ui \
-	box-shadow-spec-inset.ui \
-	box-shadow-spread.css \
-	box-shadow-spread.ref.ui \
-	box-shadow-spread.ui \
-	box-shadow-with-blend-mode.css \
-	box-shadow-with-blend-mode.ref.ui \
-	box-shadow-with-blend-mode.ui \
-	button-wrapping.ui \
-	button-wrapping.ref.ui \
-	color-transition.css \
-	color-transition.ref.ui \
-	color-transition.ui \
-	css-em-label-size.css \
-	css-em-label-size.ui \
-	css-em-label-size.ref.ui \
-	css-currentcolor-alpha.css \
-	css-currentcolor-alpha.ui \
-	css-currentcolor-alpha.ref.ui \
-	css-image-aspect-ratio.css \
-	css-image-aspect-ratio.ui \
-	css-image-aspect-ratio.ref.ui \
-	css-image-color-aspect-ratio.css \
-	css-image-color-aspect-ratio.ui \
-	css-image-color-aspect-ratio.ref.ui \
-	css-match-class.css \
-	css-match-class.ref.ui \
-	css-match-class.ui \
-	css-match-descendant-later.css \
-	css-match-descendant-later.ref.ui \
-	css-match-descendant-later.ui \
-	css-match-exact.css \
-	css-match-exact.ref.ui \
-	css-match-exact.ui \
-	css-match-import.css \
-	css-match-import-import.css \
-	css-match-import.ui \
-	css-match-import.ref.ui \
-	css-match-inherit.css \
-	css-match-inherit.ref.ui \
-	css-match-inherit.ui \
-	css-match-inherit-different-state.css \
-	css-match-inherit-different-state.ref.ui \
-	css-match-inherit-different-state.ui \
-	css-match-name.css \
-	css-match-name.ref.ui \
-	css-match-name.ui \
-	css-match-siblings.css \
-	css-match-siblings.ref.ui \
-	css-match-siblings.ui \
-	css-match-type.css \
-	css-match-type.ref.ui \
-	css-match-type.ui \
-	css-multi-state.css \
-	css-multi-state.ref.ui \
-	css-multi-state.ui \
-	fixed-widget-stacking.ref.ui \
-	fixed-widget-stacking.ui \
-	flipping-icons.ref.ui \
-	flipping-icons.ui \
-	font-sizes-names.css \
-	font-sizes-names.ref.ui \
-	font-sizes-names.ui \
-	gtk-image-effect-inherit.css \
-	gtk-image-effect-inherit.ref.ui \
-	gtk-image-effect-inherit.ui \
-	green-20x20.png \
-	grid-empty-with-spacing.ref.ui \
-	grid-empty-with-spacing.ui \
-	grid-expand.css \
-	grid-expand.ref.ui \
-	grid-expand.ui \
-	grid-wfh.ui \
-	grid-wfh.ref.ui \
-	grid-homogeneous.css \
-	grid-homogeneous.ref.ui \
-	grid-homogeneous.ui \
-	grid-spacing1.ref.ui \
-	grid-spacing1.ui \
-	grid-spacing2.ref.ui \
-	grid-spacing2.ui \
-	grid-spacing3.css \
-	grid-spacing3.ref.ui \
-	grid-spacing3.ui \
-	gtk-icontheme-sizing.css \
-	gtk-icontheme-sizing.ref.ui \
-	gtk-icontheme-sizing.ui \
-	icon-effect-missing.css \
-	icon-effect-missing.ref.ui \
-	icon-effect-missing.ui \
-	icon-shadow-no-transform.css \
-	icon-shadow-no-transform.ref.ui \
-	icon-shadow-no-transform.ui \
-	icon-style-basics.css \
-	icon-style-basics.ref.ui \
-	icon-style-basics.ui \
-	icon-vfuncs.css \
-	icon-vfuncs.ref.ui \
-	icon-vfuncs.ui \
-	iconview-empty.css \
-	iconview-empty.ui \
-	iconview-empty.ref.ui \
-	image-icon-name-use-fallback.ui \
-	image-icon-name-use-fallback.ref.ui \
-	image-icon-shadow-clipping.css \
-	image-icon-shadow-clipping.ref.ui \
-	image-icon-shadow-clipping.ui \
-	image-load-from-file.css \
-	image-load-from-file.ref.ui \
-	image-load-from-file.ui \
-	image-recording-surface.ref.ui \
-	image-recording-surface.ui \
-	info-bar-message-types.css \
-	info-bar-message-types.ref.ui \
-	info-bar-message-types.ui \
-	inherit-and-initial.css \
-	inherit-and-initial.ref.ui \
-	inherit-and-initial.ui \
-	label-attribute-preference.css \
-	label-attribute-preference.ref.ui \
-	label-attribute-preference.ui \
-	label-background.css \
-	label-background.ref.ui \
-	label-background.ui \
-	label-box-shadow-clip.css \
-	label-box-shadow-clip.ref.ui \
-	label-box-shadow-clip.ui \
-	label-clipping.css \
-	label-clipping.ref.ui \
-	label-clipping.ui \
-	label-ellipsize-small.ref.ui \
-	label-ellipsize-small.ui \
-	label-ellipsize-with-big.ref.ui \
-	label-ellipsize-with-big.ui \
-	label-shadows.css \
-	label-shadows.ref.ui \
-	label-shadows.ui \
-	label-sizing.css \
-	label-sizing.ref.ui \
-	label-sizing.ui \
-	label-small-ellipsized.ref.ui \
-	label-small-ellipsized.ui \
-	label-text-shadow-clipping.css \
-	label-text-shadow-clipping.ref.ui \
-	label-text-shadow-clipping.ui \
-	label-text-shadow-changes-modify-clip.css \
-	label-text-shadow-changes-modify-clip.ref.ui \
-	label-text-shadow-changes-modify-clip.ui \
-	label-width-chars-dont-shrink.ref.ui \
-	label-width-chars-dont-shrink.ui \
-	label-wrap-justify.ref.ui \
-	label-wrap-justify.ui \
-	letter-spacing.css \
-	letter-spacing.ui \
-	letter-spacing.ref.ui \
-	linear-gradient.css \
-	linear-gradient.ref.ui \
-	linear-gradient.ui \
-	linear-gradient-transition-to-other.css \
-	linear-gradient-transition-to-other.ref.ui \
-	linear-gradient-transition-to-other.ui \
-	link-coloring.css \
-	link-coloring.ref.ui \
-	link-coloring.ui \
-	marble.xpm \
-	messagedialog-secondarytext.ui \
-	messagedialog-secondarytext.ref.ui \
-	named-colors.css \
-	named-colors.ref.ui \
-	named-colors.ui \
-	no-colors.css \
-	no-colors.ref.ui \
-	no-colors.ui \
-	nonresizable-size.ref.ui \
-	nonresizable-size.ui \
-	notebook-childproperties.css \
-	notebook-childproperties.ui \
-	notebook-childproperties.ref.ui \
-	notebook-tab-position.css \
-	notebook-tab-position.ui \
-	notebook-tab-position.ref.ui \
-	nth-child.css \
-	nth-child.ref.ui \
-	nth-child.ui \
-	opacity.css \
-	opacity.ui \
-	opacity.ref.ui \
-	opacity-initial.css \
-	opacity-initial.ref.ui \
-	opacity-initial.ui \
-	overlay-no-main-widget.ref.ui \
-	overlay-no-main-widget.ui \
-	paned-undersized.css \
-	paned-undersized.ref.ui \
-	paned-undersized.ui \
-	pseudoclass-on-box.css \
-	pseudoclass-on-box.ref.ui \
-	pseudoclass-on-box.ui \
-	pseudoclass-on-parent.css \
-	pseudoclass-on-parent.ref.ui \
-	pseudoclass-on-parent.ui \
-	quit-mnemonic.css \
-	quit-mnemonic.ref.ui \
-	quit-mnemonic.ui \
-	repeating-radial-gradient-at-beginning.css \
-	repeating-radial-gradient-at-beginning.ref.ui \
-	repeating-radial-gradient-at-beginning.ui \
-	reset-to-defaults.css \
-	revealer-extra-size.ref.ui \
-	revealer-extra-size.ui \
-	revealer-wrappable-contents.ref.ui \
-	revealer-wrappable-contents.ui \
-	rotated-layout.ref.ui \
-	rotated-layout.ui \
-	separator-size.css \
-	separator-size.ref.ui \
-	separator-size.ui \
-	set-default-direction.ui \
-	set-default-direction.ref.ui \
-	shadow-clip-rounding.css \
-	shadow-clip-rounding.ref.ui \
-	shadow-clip-rounding.ui \
-	shorthand-entry-border.css \
-	shorthand-entry-border.ref.ui \
-	shorthand-entry-border.ui \
-	sibling-pseudoclasses.css \
-	sibling-pseudoclasses.ref.ui \
-	sibling-pseudoclasses.ui \
-	simple.ref.ui \
-	simple.ui \
-	sizegroups-basics.css \
-	sizegroups-basics.ui \
-	sizegroups-basics.ref.ui \
-	sizegroups-evolution-identity-page.ui \
-	sizegroups-evolution-identity-page.ref.ui \
-	sizegroups-get-preferred-null.ui \
-	sizegroups-get-preferred-null.ref.ui \
-	statusbar-remove-all.ref.ui \
-	statusbar-remove-all.ui \
-	style-context-save-inheritance.css \
-	style-context-save-inheritance.ref.ui \
-	style-context-save-inheritance.ui \
-	style-properties-nth-child.css \
-	style-properties-nth-child.ref.ui \
-	style-properties-nth-child.ui \
-	style-properties-only-child.css \
-	style-properties-only-child.ref.ui \
-	style-properties-only-child.ui \
-	symbolic-icon-translucent-color.css \
-	symbolic-icon-translucent-color.ref.ui \
-	symbolic-icon-translucent-color.ui \
-	textview-border-windows.css \
-	textview-border-windows.ref.ui \
-	textview-border-windows.ui \
-	textview-margins.css \
-	textview-margins.ref.ui \
-	textview-margins.ui \
-	textview-tags.ref.ui \
-	textview-tags.ui \
-	toplevel-vs-popup.ref.ui \
-	toplevel-vs-popup.ui \
-	treeview-crash-too-wide.ref.ui \
-	treeview-crash-too-wide.ui \
-	treeview-fixed-height.css \
-	treeview-fixed-height.ref.ui \
-	treeview-fixed-height.ui \
-	treeview-headers-hidden.ref.ui \
-	treeview-headers-hidden.ui \
-	unresolvable.css \
-	unresolvable.ref.ui \
-	unresolvable.ui \
-	window-border-width.ref.ui \
-	window-border-width.ui \
-	window-default-size.ref.ui \
-	window-default-size.ui \
-	window-height-for-width.ref.ui \
-	window-height-for-width.ui \
-	window-show-contents-on-map.ref.ui \
-	window-show-contents-on-map.ui \
-	$(NULL)
-
-EXTRA_DIST += 			\
-	$(testdata)		\
-	reftests-dark.test.in	\
-	reftests-hc.test.in	\
-	reftests-hci.test.in	\
-	reftests.test.in	\
-	$(NULL)
-
-GTK_GSETTINGS_SCHEMAS = \
-	$(top_srcdir)/gtk/org.gtk.Settings.ColorChooser.gschema.xml \
-	$(top_srcdir)/gtk/org.gtk.Settings.FileChooser.gschema.xml \
-	$(NULL)
-
-BUILT_SOURCES = gschemas.compiled
-
-CLEANFILES = gschemas.compiled
-
-gschemas.compiled: $(GTK_GSETTINGS_SCHEMAS)
-	$(AM_V_GEN) $(GLIB_COMPILE_SCHEMAS) \
-		$(addprefix --schema-file=,$(GTK_GSETTINGS_SCHEMAS)) \
-		--targetdir=$(builddir)
-
-all-am: gschemas.compiled
-
-if BUILDOPT_INSTALL_TESTS
-insttestdir=$(libexecdir)/installed-tests/$(PACKAGE)
-insttest_PROGRAMS = gtk-reftest
-
-reftestdir = $(insttestdir)/reftests
-reftest_DATA = $(testdata)
-reftest_LTLIBRARIES =			\
-	libreftest.la			\
-	$(NULL)
-
-libreftest_la_LDFLAGS = -rpath $(reftestdir)
-
-substitutions = \
-	-e s,@libexecdir\@,$(libexecdir),g \
-	$(NULL)
-
-%.test: %.test.in
-	$(AM_V_GEN) sed $(substitutions) $< > $@.tmp && mv $@.tmp $@
-
-built_tests = 			\
-	reftests.test		\
-	reftests-dark.test	\
-	reftests-hc.test	\
-	reftests-hci.test	\
-	$(NULL)
-
-DISTCLEANFILES = $(built_tests)
-
-testmetadir = $(datadir)/installed-tests/$(PACKAGE)
-testmeta_DATA = $(built_tests)
-else
-noinst_LTLIBRARIES +=			\
-	libreftest.la			\
-	$(NULL)
-
-libreftest_la_LDFLAGS = -rpath /iHaveNoIdeaWhatImDoing
-
-endif
-
-libreftest_la_LDFLAGS += -avoid-version -module $(no_undefined)
-libreftest_la_CFLAGS = $(gtk_reftest_CFLAGS)
-libreftest_la_LIBADD = $(gtk_reftest_LDADD)
-libreftest_la_SOURCES =			\
-	expand-expander.c		\
-	frame-inhibitor.c	\
-	image-recording-surface.c	\
-	letter-spacing.c		\
-	set-default-direction.c		\
-	statusbar-remove-all.c		\
-	textview-border-windows.c	\
-	textview-tags.c			\
-	animation-direction.c		\
-	$(NULL)
-
--include $(top_srcdir)/git.mk
diff --git a/testsuite/tools/Makefile.am b/testsuite/tools/Makefile.am
deleted file mode 100644
index b6bac18a99..0000000000
--- a/testsuite/tools/Makefile.am
+++ /dev/null
@@ -1,61 +0,0 @@
-include $(top_srcdir)/Makefile.decl
-
-NULL =
-
-test_simplify = \
-	simplify/test1.ui simplify/test1.expected \
-	simplify/test2.ui simplify/test2.expected \
-	simplify/test3.ui simplify/test3.expected \
-	simplify/test4.ui simplify/test4.expected \
-	simplify/test5.ui simplify/test5.expected \
-	simplify/test6.ui simplify/test6.expected \
-	simplify/test7.ui simplify/test7.expected \
-	simplify/test8.ui simplify/test8.expected \
-	$(NULL)
-
-EXTRA_DIST += \
-	$(test_simplify)	\
-	test-simplify.in	\
-	test-settings.in	\
-	$(NULL)
-
-TESTS_ENVIRONMENT = \
-	GTK_BUILDER_TOOL="$(top_builddir)/gtk/gtk-builder-tool" \
-	GTK_QUERY_SETTINGS="$(top_builddir)/gtk/gtk-query-settings" \
-	$(NULL)
-
-TEST_PROGS += \
-	test-simplify	\
-	test-settings	\
-	$(NULL)
-
-test-simplify:test-simplify.in
-	$(AM_V_GEN) cp $< $@
-
-test-settings:test-settings.in
-	$(AM_V_GEN) cp $< $@
-
-if BUILDOPT_INSTALL_TESTS
-insttestdir = $(libexecdir)/installed-tests/$(PACKAGE)
-insttest_SCRIPTS = $(TEST_PROGS)
-nobase_insttest_DATA = $(test_simplify)
-
-%.test: % Makefile
-	$(AM_V_GEN) (echo '[Test]' > $@.tmp; \
-	echo 'Type=session' >> $@.tmp; \
-	echo 'Output=TAP' >> $@.tmp; \
-	echo 'Exec=env G_ENABLE_DIAGNOSTIC=0 TEST_DATA_DIR="$(insttestdir)/simplify" $(insttestdir)/$<' >> $@.tmp; \
-	mv $@.tmp $@)
-
-test_files = $(TEST_PROGS:=.test)
-
-DISTCLEANFILES = \
-	$(TEST_PROGS)		\
-	$(test_files)		\
-	$(NULL)
-
-testmetadir = $(datadir)/installed-tests/$(PACKAGE)
-testmeta_DATA = $(test_files)
-endif
-
--include $(top_srcdir)/git.mk
diff --git a/win32/Makefile-newvs.am b/win32/Makefile-newvs.am
deleted file mode 100644
index 3a91862b6d..0000000000
--- 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 987f2d8e88..0000000000
--- a/win32/Makefile.am
+++ /dev/null
@@ -1,51 +0,0 @@
-include $(top_srcdir)/Makefile.decl
-
-GENERATED_ITEMS = gen-enums.bat
-
-if HAVE_INTROSPECTION
-GENERATED_ITEMS += \
-	introspection.body.mak	\
-	Gdk_4_0_gir_list	\
-	GdkWin32_4_0_gir_list	\
-	Gsk_4_0_gir_list	\
-	Gtk_4_0_gir_list
-
-MSVC_INTROSPECTION_INTERMEDIATE_FILES =	\
-	Gdk-4.0.gir.msvc.introspect		\
-	GdkWin32-4.0.gir.msvc.introspect	\
-	Gsk-4.0.gir.msvc.introspect		\
-	Gtk-4.0.gir.msvc.introspect
-
-introspection.body.mak: $(MSVC_INTROSPECTION_INTERMEDIATE_FILES)
-	-$(RM) introspection.body.mak
-	for F in `ls *.msvc.introspect`; do \
-		case $$F in \
-			*)	cat $(top_builddir)/win32/$$F >>introspection.body.mak \
-			;; \
-		esac; \
-	done
-	$(RM) $(MSVC_INTROSPECTION_INTERMEDIATE_FILES)
-endif
-
-DISTCLEANFILES = $(GENERATED_ITEMS)
-
-gen-enums.bat: $(srcdir)/gen-enums.batin gsk.enum.headers
-	$(CPP) -P - <$(srcdir)/gen-enums.batin >$@
-	$(RM) gsk.enum.headers
-
-SUBDIRS =	\
-	vs12	\
-	vs14	\
-	vs15
-
-EXTRA_DIST +=	\
-	detectenv-msvc.mak		\
-	introspection-msvc.mak		\
-	gtk-introspection-msvc.mak	\
-	replace.py			\
-	pc_base.py			\
-	gtkpc.py			\
-	gen-enums.batin			\
-	$(GENERATED_ITEMS)
-
--include $(top_srcdir)/git.mk
diff --git a/win32/Makefile.msvc-introspection b/win32/Makefile.msvc-introspection
deleted file mode 100644
index 28e8b50bcc..0000000000
--- a/win32/Makefile.msvc-introspection
+++ /dev/null
@@ -1,125 +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)
-#   YourLiv_1_0_gir_MSVC_EXPORT_PACKAGES = (Packages exported by this .gir)
-
-# 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))
-
-#
-# 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 '	--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 2e96e12bcf..0000000000
--- 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 61f979d4eb..0000000000
--- a/win32/detectenv-msvc.mak
+++ /dev/null
@@ -1,76 +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) < 2000
-VSVER = 14
-!else
-VSVER = 0
-!endif
-
-!if "$(VSVER)" == "0"
-MSG = ^
-This NMake Makefile set supports Visual Studio^
-9 (2008) through 14 (2015).  Your Visual Studio^
-version is not supported.
-!error $(MSG)
-!endif
-
-VALID_CFGSET = FALSE
-!if "$(CFG)" == "release" || "$(CFG)" == "debug" || "$(CFG)" == "Release" || "$(CFG)" == "Debug"
-VALID_CFGSET = TRUE
-!endif
-
-# We want debugging symbols logged for all builds,
-# using .pdb files for release builds
-CFLAGS_BASE = /Zi
-
-!if "$(CFG)" == "release" || "$(CFG)" == "Release"
-CFLAGS_ADD = /MD /O2 $(CFLAGS_BASE)
-!else
-CFLAGS_ADD = /MDd /Od $(CFLAGS_BASE)
-!endif
-
-!if "$(PLAT)" == "x64"
-LDFLAGS_ARCH = /machine:x64
-!else
-LDFLAGS_ARCH = /machine:x86
-!endif
diff --git a/win32/gen-enums.batin b/win32/gen-enums.batin
deleted file mode 100644
index a99b60a308..0000000000
--- a/win32/gen-enums.batin
+++ /dev/null
@@ -1,18 +0,0 @@
-@ECHO OFF
-
-cd ..\gsk
-
-if exist gskenumtypes.h del gskenumtypes.h
-if exist gskenumtypes.c del gskenumtypes.c
-
-for %%f in (gskenumtypes.h gskenumtypes.c) do ^
-%2\python %1\bin\glib-mkenums ^
---template %%f.template ^
-#include "gsk.enum.headers"
-&1> %%f
-
-for %%f in (gskenumtypes.h gskenumtypes.c) do ^
-if %%~zf EQU 0 perl %1\bin\glib-mkenums ^
---template %%f.template ^
-#include "gsk.enum.headers"
-&1> %%f
diff --git a/win32/gtk-introspection-msvc.mak b/win32/gtk-introspection-msvc.mak
deleted file mode 100644
index c8617d5e86..0000000000
--- a/win32/gtk-introspection-msvc.mak
+++ /dev/null
@@ -1,43 +0,0 @@
-# NMake Makefile to build Introspection Files for GTK+
-
-!include detectenv-msvc.mak
-
-APIVERSION = 4.0
-
-CHECK_PACKAGE = gdk-pixbuf-2.0 atk pangocairo gio-2.0
-
-built_install_girs = Gdk-$(APIVERSION).gir GdkWin32-$(APIVERSION).gir Gtk-$(APIVERSION).gir
-built_install_typelibs = Gdk-$(APIVERSION).typelib GdkWin32-$(APIVERSION).typelib Gtk-$(APIVERSION).typelib
-
-!include introspection-msvc.mak
-
-!if "$(BUILD_INTROSPECTION)" == "TRUE"
-
-!if "$(PLAT)" == "x64"
-AT_PLAT=x86_64
-!else
-AT_PLAT=i686
-!endif
-
-all: setgirbuildenv $(built_install_girs) $(built_install_typelibs)
-
-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 *.gir $(G_IR_INCLUDEDIR)
-	@-copy /b *.typelib $(G_IR_TYPELIBDIR)
-
-!else
-all:
-	@-echo $(ERROR_MSG)
-!endif
-
-clean:
-	@-del /f/q *.typelib
-	@-del /f/q *.gir
diff --git a/win32/gtkpc.py b/win32/gtkpc.py
deleted file mode 100644
index 96ef6dce75..0000000000
--- a/win32/gtkpc.py
+++ /dev/null
@@ -1,86 +0,0 @@
-#!/usr/bin/python
-#
-# Utility script to generate .pc files for GTK+
-# for Visual Studio builds, to be used for
-# building introspection files
-
-# Author: Fan, Chun-wei
-# Date: April 26, 2016
-
-import os
-import sys
-import argparse
-
-from replace import replace_multi, replace
-from pc_base import BasePCItems
-
-def main(argv):
-    base_pc = BasePCItems()
-
-    gdk_parser = argparse.ArgumentParser(description='Setup basic .pc file info')
-    gdk_parser.add_argument('--vulkan',
-                              action='store_const',
-                              const=1,
-                              help='GSK with Vulkan renderer')
-    gdk_parser.add_argument('--host',
-                            required=True,
-                            help='Build type')
-    base_pc.setup(argv, gdk_parser)
-
-    atk_min_ver = '2.15.1'
-    cairo_min_ver = '1.15.2'
-    gdk_pixbuf_min_ver = '2.30.0'
-    gdk_win32_sys_libs = '-lgdi32 -limm32 -lshell32 -lole32 -Wl,-luuid -lwinmm -ldwmapi'
-    glib_min_ver = '2.49.4'
-    epoxy_min_ver = '1.0'
-    graphene_min_ver = '1.2'
-
-    cairo_backends = 'cairo-win32'
-    gdk_backends = 'win32'
-    gio_package = 'gio-2.0 >= ' + glib_min_ver
-    vulkan_extra_libs = ''
-
-    gdk_args = gdk_parser.parse_args()
-    if getattr(gdk_args, 'vulkan', None) is 1:
-        # On Visual Studio, we link to zlib1.lib
-        vulkan_extra_libs = ' -lvulkan-1'
-        gdk_backends += ' vulkan'
-        cairo_backends += ' cairo'
-
-    pkg_replace_items = {'@GTK_API_VERSION@': '4.0',
-                         '@GDK_BACKENDS@': gdk_backends}
-
-    pkg_required_packages = 'gdk-pixbuf >= ' + gdk_pixbuf_min_ver + ' ' + \
-                            'cairo >= ' + cairo_min_ver + ' ' + \
-                            'cairo-gobject >= ' + cairo_min_ver
-
-    gtk_pc_replace_items = {'@host@': gdk_args.host,
-                            '@GTK_BINARY_VERSION@': '4.0.0',
-                            '@GDK_PACKAGES@': gio_package + ' ' + \
-                                              'pangowin32 pangocairo' + ' ' + \
-                                              pkg_required_packages,
-                            '@GSK_PACKAGES@': pkg_required_packages + ' ' + \
-                                              'graphene-1.0 >= ' + graphene_min_ver,
-                            '@GTK_PACKAGES@': 'atk >= ' + atk_min_ver + ' ' + \
-                                              pkg_required_packages + ' ' + \
-                                              gio_package,
-                            '@GDK_PRIVATE_PACKAGES@': gio_package + ' ' + cairo_backends,
-                            '@GSK_PRIVATE_PACKAGES@': 'epoxy >= ' + epoxy_min_ver,
-                            '@GTK_PRIVATE_PACKAGES@': 'atk',
-                            '@GDK_EXTRA_CFLAGS@': '',
-                            '@GSK_EXTRA_CFLAGS@': '',
-                            '@GTK_EXTRA_CFLAGS@': '',
-                            '@GDK_EXTRA_LIBS@': gdk_win32_sys_libs + vulkan_extra_libs,
-                            '@GSK_EXTRA_LIBS@': '',
-                            '@GTK_EXTRA_LIBS@': ''}
-
-    pkg_replace_items.update(base_pc.base_replace_items)
-    gtk_pc_replace_items.update(pkg_replace_items)
-
-    # Generate gtk+-4.0.pc
-    replace_multi(base_pc.top_srcdir + '/gtk+-4.0.pc.in',
-                  base_pc.srcdir + '/gtk+-4.0.pc',
-                  gtk_pc_replace_items)
-
-if __name__ == '__main__':
-    sys.exit(main(sys.argv))
diff --git a/win32/introspection-msvc.mak b/win32/introspection-msvc.mak
deleted file mode 100644
index 26501f5251..0000000000
--- 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 285b6cdd87..0000000000
--- 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 f215cce584..0000000000
--- 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/vs12/Makefile.am b/win32/vs12/Makefile.am
deleted file mode 100644
index 2535417f9f..0000000000
--- a/win32/vs12/Makefile.am
+++ /dev/null
@@ -1,71 +0,0 @@
-include $(top_srcdir)/Makefile.decl
-
-GENERATED_ITEMS = \
-	gdk4-win32.vcxproj			\
-	gdk4-win32.vcxproj.filters		\
-	gdk-4.vcxproj				\
-	gdk-4.vcxproj.filters			\
-	gsk-4.vcxproj				\
-	gsk-4.vcxproj.filters			\
-	gtk-4.vcxproj				\
-	gtk-4.vcxproj.filters			\
-	gtk4-demo.vcxproj			\
-	gtk4-demo.vcxproj.filters		\
-	gtk4-demo-application.vcxproj		\
-	gtk4-demo-application.vcxproj.filters	\
-	gtk4-icon-browser.vcxproj		\
-	gtk4-icon-browser.vcxproj.filters	\
-	gtk4-install.props			\
-	gtk4-version-paths.props
-
-MSVC12_HEADERS_LISTS =	\
-	gdk4-win32.vs12.headers		\
-	gdk-4.vs12.headers		\
-	gsk-4.vs12.headers		\
-	gtk-4.vs12.headers
-
-EXTRA_DIST += \
-	README.txt				\
-	gtk+-4.sln				\
-	gtk4-prebuild.vcxproj			\
-	gtk4-prebuild.vcxproj.filters		\
-	gdk4-win32.vcxprojin			\
-	gdk4-win32.vcxproj.filtersin		\
-	gdk-4.vcxprojin				\
-	gdk-4.vcxproj.filtersin			\
-	gsk-4.vcxprojin				\
-	gsk-4.vcxproj.filtersin			\
-	gtk-4.vcxprojin				\
-	gtk-4.vcxproj.filtersin			\
-	gtk4-builder-tool.vcxproj		\
-	gtk4-builder-tool.vcxproj.filters	\
-	gtk4-encode-symbolic-svg.vcxproj	\
-	gtk4-encode-symbolic-svg.vcxproj.filters	\
-	gtk4-query-settings.vcxproj		\
-	gtk4-query-settings.vcxproj.filters	\
-	gtk4-update-icon-cache.vcxproj		\
-	gtk4-update-icon-cache.vcxproj.filters	\
-	gtk4-demo.vcxprojin			\
-	gtk4-demo.vcxproj.filtersin		\
-	gtk4-demo-application.vcxprojin		\
-	gtk4-demo-application.vcxproj.filtersin	\
-	gtk4-icon-browser.vcxprojin		\
-	gtk4-icon-browser.vcxproj.filtersin	\
-	gtk4-install.vcxproj			\
-	gtk4-install.vcxproj.filters		\
-	gtk4-build-defines.props		\
-	gtk4-gen-srcs.props			\
-	gtk4-install.propsin			\
-	gtk4-version-paths.props.in		\
-	$(GENERATED_ITEMS)
-
-DISTCLEANFILES = \
-	$(GENERATED_ITEMS)
-
-gtk4-install.props: $(top_srcdir)/win32/vs12/gtk4-install.propsin $(MSVC12_HEADERS_LISTS)
-	-$(RM) $(top_builddir)/win32/vs14/gtk4-install.props
-	-$(RM) $(top_builddir)/win32/vs15/gtk4-install.props
-	$(CPP) -P - <$(top_srcdir)/win32/vs12/gtk4-install.propsin >$@
-	rm $(MSVC12_HEADERS_LISTS)
-
--include $(top_srcdir)/git.mk
diff --git a/win32/vs12/README.txt b/win32/vs12/README.txt
deleted file mode 100644
index 58cd1872e0..0000000000
--- a/win32/vs12/README.txt
+++ /dev/null
@@ -1,109 +0,0 @@
-Please do not compile this package (GTK+) in paths that contain

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

-the use of the library.

-

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

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

-

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

-

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

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

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

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

-.vcxprojin and .vcxproj.filtersin files here into corresponding actual

-.vcxproj and vcxproj.filters files.

-

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

-ATK and GLib.  External dependencies are at least Cairo

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

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

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

-

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

-which can be obtained from the official installers available from

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

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

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

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

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

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

-

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

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

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

-to different CRTs can be kept at a minimum.

-

-To build with Vulkan renderer support, use the configs that end with _Vulkan.

-You will need the LunarG Vulkan SDK installed, and its include\ directory

-and Bin\ (64-bit) or Bin32 (32-bit) need to be in your INCLUDE and LIB paths

-(or need to be set in your additional include paths and additional library paths)

-so that they can be found by the build.  To run with the Vulkan renderer, set

-GSK_RENDERER=vulkan--you will need a video adapter with driver support for Vulkan

-to support this.

-

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

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

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

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

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

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

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

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

-

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

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

-

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

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

-

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

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

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

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

-

-The recommended build order for these dependencies:

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

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

--zlib

--libpng

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

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

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

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

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

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

--GLib **

--Cairo (inclusive of Cairo-GObject)

--ATK**

--Pango**

--GDK-Pixbuf**

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

- dependencies can be built in any order)

-

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

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

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

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

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

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

-from a specific GLib source tree.

-

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

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

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

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

-

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

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

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

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

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

- Decide whether you need fontconfig support prior to building Cairo

- and Pango.

-

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

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

-

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

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

diff --git a/win32/vs12/gdk-4.vcxproj.filtersin b/win32/vs12/gdk-4.vcxproj.filtersin
deleted file mode 100644
index 1a0cec0c3e..0000000000
--- a/win32/vs12/gdk-4.vcxproj.filtersin
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="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>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-#include "gdk-4.vs12.sourcefiles.filters"
-    <ClCompile Include="..\..\gdk\gdkkeynames.c"><Filter>Source Files</Filter></ClCompile>
-  </ItemGroup>
-</Project>
diff --git a/win32/vs12/gdk-4.vcxprojin b/win32/vs12/gdk-4.vcxprojin
deleted file mode 100644
index 911f23b612..0000000000
--- a/win32/vs12/gdk-4.vcxprojin
+++ /dev/null
@@ -1,126 +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>{5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8}</ProjectGuid>
-    <RootNamespace>gdk4</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </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="gtk4-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="gtk4-build-defines.props" />
-  </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="gtk4-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="gtk4-build-defines.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\gdk;..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;G_ENABLE_DEBUG;$(GdkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\gdk;..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>$(GdkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\gdk;..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;G_ENABLE_DEBUG;$(GdkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\gdk;..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>$(GdkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-#include "gdk-4.vs12.sourcefiles"
-    <ClCompile Include="..\..\gdk\gdkkeynames.c" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/win32/vs12/gdk4-win32.vcxproj.filtersin b/win32/vs12/gdk4-win32.vcxproj.filtersin
deleted file mode 100644
index 3f36439852..0000000000
--- a/win32/vs12/gdk4-win32.vcxproj.filtersin
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="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>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-#include "gdk4-win32.vs12.sourcefiles.filters"
-  </ItemGroup>
-</Project>
diff --git a/win32/vs12/gdk4-win32.vcxprojin b/win32/vs12/gdk4-win32.vcxprojin
deleted file mode 100644
index 6546e4bd82..0000000000
--- a/win32/vs12/gdk4-win32.vcxprojin
+++ /dev/null
@@ -1,131 +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>{ABA7685A-7CBB-4626-B5E5-6EEEA5B489EF}</ProjectGuid>
-    <RootNamespace>gdk4win32</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gtk4-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="gtk4-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="gtk4-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="gtk4-build-defines.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\gdk;..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;G_ENABLE_DEBUG;$(GdkDefines);INSIDE_GDK_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\gdk;..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>$(GdkDefines);INSIDE_GDK_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\gdk;..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;G_ENABLE_DEBUG;$(GdkDefines);INSIDE_GDK_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\gdk;..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>$(GdkDefines);INSIDE_GDK_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-#include "gdk4-win32.vs12.sourcefiles"
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="gtk4-prebuild.vcxproj">
-      <Project>{b98fbe68-b03c-48e3-8f32-c3c010720d30}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/win32/vs12/gsk-4.vcxproj.filtersin b/win32/vs12/gsk-4.vcxproj.filtersin
deleted file mode 100644
index 7d6987c260..0000000000
--- a/win32/vs12/gsk-4.vcxproj.filtersin
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="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>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <CustomBuild Include="..\..\gsk\gskenumtypes.c.template"><Filter>Resource Files</Filter></CustomBuild>
-    <CustomBuild Include="..\..\gsk\gsk.gresource.xml"><Filter>Resource Files</Filter></CustomBuild>
-  </ItemGroup>
-  <ItemGroup>
-#include "gsk-4.vs12.sourcefiles.filters"
-   <ClCompile Include="..\..\gsk\gskvulkanblendpipeline.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\gsk\gskvulkanborderpipeline.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\gsk\gskvulkanboxshadowpipeline.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\gsk\gskvulkanbuffer.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\gsk\gskvulkanclip.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\gsk\gskvulkancolorpipeline.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\gsk\gskvulkancommandpool.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\gsk\gskvulkaneffectpipeline.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\gsk\gskvulkanlineargradientpipeline.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\gsk\gskvulkanimage.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\gsk\gskvulkanmemory.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\gsk\gskvulkanpipeline.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\gsk\gskvulkanpushconstants.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\gsk\gskvulkanrender.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\gsk\gskvulkanrenderer.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\gsk\gskvulkanrenderpass.c"><Filter>Source Files</Filter></ClCompile>
-   <ClCompile Include="..\..\gsk\gskvulkanshader.c"><Filter>Source Files</Filter></ClCompile>
-  </ItemGroup>
-</Project>
diff --git a/win32/vs12/gsk-4.vcxprojin b/win32/vs12/gsk-4.vcxprojin
deleted file mode 100644
index 5b12f4ab73..0000000000
--- a/win32/vs12/gsk-4.vcxprojin
+++ /dev/null
@@ -1,312 +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_Vulkan|Win32">
-      <Configuration>Debug_Vulkan</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug_Vulkan|x64">
-      <Configuration>Debug_Vulkan</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release_Vulkan|Win32">
-      <Configuration>Release_Vulkan</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release_Vulkan|x64">
-      <Configuration>Release_Vulkan</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{5AE8F5CE-9103-4951-AEDE-EB2F3B573BE8}</ProjectGuid>
-    <RootNamespace>gsk4</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Vulkan|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_Vulkan|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Vulkan|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_Vulkan|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </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="gtk4-gen-srcs.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Vulkan|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gtk4-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="gtk4-gen-srcs.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Vulkan|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gtk4-gen-srcs.props" />
-  </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="gtk4-gen-srcs.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_Vulkan|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gtk4-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="gtk4-gen-srcs.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_Vulkan|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gtk4-gen-srcs.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\gsk;..\..\gdk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;G_ENABLE_DEBUG;$(GskDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Vulkan|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\gsk;..\..\gdk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;G_ENABLE_DEBUG;$(GskDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\gsk;..\..\gdk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>$(GskDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_Vulkan|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\gsk;..\..\gdk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>$(GskDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\gsk;..\..\gdk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;G_ENABLE_DEBUG;$(GskDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Vulkan|x64'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\gsk;..\..\gdk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;G_ENABLE_DEBUG;$(GskDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\gsk;..\..\gdk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>$(GskDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_Vulkan|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\gsk;..\..\gdk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>$(GskDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <CustomBuild Include="..\..\gsk\gskenumtypes.c.template">
-      <Message Condition="'$(Platform)'=='Win32'">Generating GSK enumeration sources...</Message>
-      <Command Condition="'$(Platform)'=='Win32'">$(GenGSKEnumSrcs)</Command>
-      <Outputs Condition="'$(Platform)'=='Win32'">..\..\gsk\gskenumtypes.h;..\..\gsk\gskenumtypes.c;%(Outputs)</Outputs>
-      <Message Condition="'$(Platform)'=='x64'">Generating GSK enumeration sources...</Message>
-      <Command Condition="'$(Platform)'=='x64'">$(GenGSKEnumSrcsX64)</Command>
-      <Outputs Condition="'$(Platform)'=='x64'">..\..\gsk\gskenumtypes.h;..\..\gsk\gskenumtypes.c;%(Outputs)</Outputs>
-    </CustomBuild>
-    <CustomBuild Include="..\..\gsk\gsk.gresource.xml">
-      <Message>Generating GSK resource sources...</Message>
-      <Command>$(GenGSKRsrcSrcs)</Command>
-      <Outputs>..\..\gsk\gskresources.h;..\..\gsk\gskresources.c;..\..\gsk\gsk.gresource.xml;%(Outputs)</Outputs>
-    </CustomBuild>
-  </ItemGroup>
-  <ItemGroup>
-#include "gsk-4.vs12.sourcefiles"
-   <ClCompile Include="..\..\gsk\gskvulkanblendpipeline.c">
-     <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
-     <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
-   </ClCompile>
-   <ClCompile Include="..\..\gsk\gskvulkanborderpipeline.c">
-     <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
-     <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
-   </ClCompile>
-   <ClCompile Include="..\..\gsk\gskvulkanbuffer.c">
-     <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
-     <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
-   </ClCompile>
-   <ClCompile Include="..\..\gsk\gskvulkanboxshadowpipeline.c">
-     <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
-     <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
-   </ClCompile>
-   <ClCompile Include="..\..\gsk\gskvulkanclip.c">
-     <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
-     <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
-   </ClCompile>
-   <ClCompile Include="..\..\gsk\gskvulkancolorpipeline.c">
-     <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
-     <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
-   </ClCompile>
-   <ClCompile Include="..\..\gsk\gskvulkancommandpool.c">
-     <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
-     <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
-   </ClCompile>
-   <ClCompile Include="..\..\gsk\gskvulkaneffectpipeline.c">
-     <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
-     <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
-   </ClCompile>
-   <ClCompile Include="..\..\gsk\gskvulkanlineargradientpipeline.c">
-     <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
-     <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
-   </ClCompile>
-   <ClCompile Include="..\..\gsk\gskvulkanimage.c">
-     <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
-     <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
-   </ClCompile>
-   <ClCompile Include="..\..\gsk\gskvulkanmemory.c">
-     <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
-     <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
-   </ClCompile>
-   <ClCompile Include="..\..\gsk\gskvulkanpipeline.c">
-     <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
-     <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
-   </ClCompile>
-   <ClCompile Include="..\..\gsk\gskvulkanpushconstants.c">
-     <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
-     <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
-   </ClCompile>
-   <ClCompile Include="..\..\gsk\gskvulkanrender.c">
-     <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
-     <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
-   </ClCompile>
-   <ClCompile Include="..\..\gsk\gskvulkanrenderer.c">
-     <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
-     <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
-   </ClCompile>
-   <ClCompile Include="..\..\gsk\gskvulkanrenderpass.c">
-     <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
-     <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
-   </ClCompile>
-   <ClCompile Include="..\..\gsk\gskvulkanshader.c">
-     <ExcludedFromBuild Condition="'$(Configuration)'=='Debug'">true</ExcludedFromBuild>
-     <ExcludedFromBuild Condition="'$(Configuration)'=='Release'">true</ExcludedFromBuild>
-   </ClCompile>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/win32/vs12/gtk+-4.sln b/win32/vs12/gtk+-4.sln
deleted file mode 100644
index 1e9f3aa791..0000000000
--- a/win32/vs12/gtk+-4.sln
+++ /dev/null
@@ -1,253 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 12.00

-# Visual Studio 2013

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

-EndProject

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

-EndProject

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

-EndProject

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

-EndProject

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

-EndProject

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

-EndProject

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

-EndProject

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

-EndProject

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

-EndProject

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

-EndProject

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

-EndProject

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

-EndProject

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

-EndProject

-Global

-	GlobalSection(SolutionConfigurationPlatforms) = preSolution

-		Debug|Win32 = Debug|Win32

-		Debug_Vulkan|Win32 = Debug_Vulkan|Win32

-		Debug|x64 = Debug|x64

-		Debug_Vulkan|x64 = Debug_Vulkan|x64

-		Release|Win32 = Release|Win32

-		Release_Vulkan|Win32 = Release_Vulkan|Win32

-		Release|x64 = Release|x64

-		Release_Vulkan|x64 = Release_Vulkan|x64

-	EndGlobalSection

-	GlobalSection(ProjectConfigurationPlatforms) = postSolution

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-		{5AE8F5CE-9103-4951-AEDE-EB2F3B573BE8}.Debug_Vulkan|Win32.ActiveCfg = Debug_Vulkan|Win32

-		{5AE8F5CE-9103-4951-AEDE-EB2F3B573BE8}.Debug_Vulkan|Win32.Build.0 = Debug_Vulkan|Win32

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

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

-		{5AE8F5CE-9103-4951-AEDE-EB2F3B573BE8}.Debug_Vulkan|x64.ActiveCfg = Debug_Vulkan|x64

-		{5AE8F5CE-9103-4951-AEDE-EB2F3B573BE8}.Debug_Vulkan|x64.Build.0 = Debug_Vulkan|x64

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

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

-		{5AE8F5CE-9103-4951-AEDE-EB2F3B573BE8}.Release_Vulkan|Win32.ActiveCfg = Release_Vulkan|Win32

-		{5AE8F5CE-9103-4951-AEDE-EB2F3B573BE8}.Release_Vulkan|Win32.Build.0 = Release_Vulkan|Win32

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

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

-		{5AE8F5CE-9103-4951-AEDE-EB2F3B573BE8}.Release_Vulkan|x64.ActiveCfg = Release_Vulkan|x64

-		{5AE8F5CE-9103-4951-AEDE-EB2F3B573BE8}.Release_Vulkan|x64.Build.0 = Release_Vulkan|x64

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-	EndGlobalSection

-	GlobalSection(SolutionProperties) = preSolution

-		HideSolutionNode = FALSE

-	EndGlobalSection

-EndGlobal

diff --git a/win32/vs12/gtk-4.vcxproj.filtersin b/win32/vs12/gtk-4.vcxproj.filtersin
deleted file mode 100644
index 0696b6f146..0000000000
--- a/win32/vs12/gtk-4.vcxproj.filtersin
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <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>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="..\..\gtk\gtk-win32.rc"><Filter>Resource Files</Filter></ResourceCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <CustomBuild Include="..\..\gtk\gtkdbusinterfaces.xml"><Filter>Resource Files</Filter></CustomBuild>
-    <CustomBuild Include="..\..\gtk\gtk-win32.rc.body"><Filter>Resource Files</Filter></CustomBuild>
-    <CustomBuild Include="..\..\gtk\libgtk4.manifest.in"><Filter>Resource Files</Filter></CustomBuild>
-  </ItemGroup>
-  <ItemGroup>
-#include "gtk-4.vs12.sourcefiles.filters"
-    <ClCompile Include="..\..\modules\input\gtkimcontextime.c"><Filter>Source Files</Filter></ClCompile>
-    <ClCompile Include="..\..\modules\input\gtkimcontextmultipress.c"><Filter>Source Files</Filter></ClCompile>
-    <ClCompile Include="..\..\modules\input\gtkimcontextthai.c"><Filter>Source Files</Filter></ClCompile>
-    <ClCompile Include="..\..\modules\input\imam-et.c"><Filter>Source Files</Filter></ClCompile>
-    <ClCompile Include="..\..\modules\input\imcedilla.c"><Filter>Source Files</Filter></ClCompile>
-    <ClCompile Include="..\..\modules\input\imcyrillic-translit.c"><Filter>Source Files</Filter></ClCompile>
-    <ClCompile Include="..\..\modules\input\imime.c"><Filter>Source Files</Filter></ClCompile>
-    <ClCompile Include="..\..\modules\input\iminuktitut.c"><Filter>Source Files</Filter></ClCompile>
-    <ClCompile Include="..\..\modules\input\imipa.c"><Filter>Source Files</Filter></ClCompile>
-    <ClCompile Include="..\..\modules\input\immultipress.c"><Filter>Source Files</Filter></ClCompile>
-    <ClCompile Include="..\..\modules\input\imthai.c"><Filter>Source Files</Filter></ClCompile>
-    <ClCompile Include="..\..\modules\input\imti-er.c"><Filter>Source Files</Filter></ClCompile>
-    <ClCompile Include="..\..\modules\input\imti-et.c"><Filter>Source Files</Filter></ClCompile>
-    <ClCompile Include="..\..\modules\input\imviqr.c"><Filter>Source Files</Filter></ClCompile>
-    <ClCompile Include="..\..\modules\input\thai-charprop.c"><Filter>Source Files</Filter></ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <Manifest Include="..\..\gtk\libgtk4.manifest"><Filter>Resource Files</Filter></Manifest>
-  </ItemGroup>
-</Project>
diff --git a/win32/vs12/gtk-4.vcxprojin b/win32/vs12/gtk-4.vcxprojin
deleted file mode 100644
index 3b8f402b7a..0000000000
--- a/win32/vs12/gtk-4.vcxprojin
+++ /dev/null
@@ -1,383 +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_Vulkan|Win32">
-      <Configuration>Debug_Vulkan</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug_Vulkan|x64">
-      <Configuration>Debug_Vulkan</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-      <WholeProgramOptimization>true</WholeProgramOptimization>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release_Vulkan|Win32">
-      <Configuration>Release_Vulkan</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-      <WholeProgramOptimization>true</WholeProgramOptimization>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release_Vulkan|x64">
-      <Configuration>Release_Vulkan</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{95A4B53D-2773-4406-A2C1-8FD2840BBAD8}</ProjectGuid>
-    <RootNamespace>gtk4</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Vulkan|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Vulkan|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_Vulkan|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_Vulkan|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </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="gtk4-gen-srcs.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Vulkan|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gtk4-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="gtk4-gen-srcs.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Vulkan|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gtk4-gen-srcs.props" />
-  </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="gtk4-gen-srcs.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_Vulkan|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gtk4-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="gtk4-gen-srcs.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_Vulkan|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gtk4-gen-srcs.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <LinkIncremental Condition="'$(Configuration)'=='Debug'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)'=='Debug_Vulkan'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)'=='Release'">false</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)'=='Release_Vulkan'">false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\gtk;..\..\gdk;..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;G_ENABLE_DEBUG;$(GtkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>$(GtkAdditionalLibs);%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
-      <ImportLibrary>$(TargetDir)$(ProjectName).lib</ImportLibrary>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb</ProgramDatabaseFile>
-      <AdditionalOptions>$(GtkExportGdkWin32DisplayMgr) %(AdditionalOptions)</AdditionalOptions>
-      <SubSystem>Windows</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Vulkan|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\gtk;..\..\gdk;..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;G_ENABLE_DEBUG;$(GtkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>$(GtkAdditionalLibs);$(VulkanLibs);%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(SolutionDir)Debug\$(Platform)\bin\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
-      <ImportLibrary>$(SolutionDir)Debug\$(Platform)\bin\$(ProjectName).lib</ImportLibrary>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(SolutionDir)Debug\$(Platform)\bin\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb</ProgramDatabaseFile>
-      <AdditionalOptions>$(GtkExportGdkWin32DisplayMgr) %(AdditionalOptions)</AdditionalOptions>
-      <SubSystem>Windows</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\gtk;..\..\gdk;..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>$(GtkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>$(GtkAdditionalLibs);%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
-      <ImportLibrary>$(TargetDir)$(ProjectName).lib</ImportLibrary>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb</ProgramDatabaseFile>
-      <AdditionalOptions>$(GtkExportGdkWin32DisplayMgr) %(AdditionalOptions)</AdditionalOptions>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_Vulkan|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\gtk;..\..\gdk;..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>$(GtkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>$(GtkAdditionalLibs);$(VulkanLibs);%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(SolutionDir)Release\$(Platform)\bin\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
-      <ImportLibrary>$(SolutionDir)Release\$(Platform)\bin\$(ProjectName).lib</ImportLibrary>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(SolutionDir)Release\$(Platform)\bin\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb</ProgramDatabaseFile>
-      <AdditionalOptions>$(GtkExportGdkWin32DisplayMgr) %(AdditionalOptions)</AdditionalOptions>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\gtk;..\..\gdk;..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;G_ENABLE_DEBUG;$(GtkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>$(GtkAdditionalLibs);%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
-      <ImportLibrary>$(TargetDir)$(ProjectName).lib</ImportLibrary>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb</ProgramDatabaseFile>
-      <AdditionalOptions>$(GtkExportGdkWin32DisplayMgr) %(AdditionalOptions)</AdditionalOptions>
-      <SubSystem>Windows</SubSystem>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Vulkan|x64'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\gtk;..\..\gdk;..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;G_ENABLE_DEBUG;$(GtkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>$(GtkAdditionalLibs);$(VulkanLibs);%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(SolutionDir)Debug\$(Platform)\bin\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
-      <ImportLibrary>$(SolutionDir)Debug\$(Platform)\bin\$(ProjectName).lib</ImportLibrary>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(SolutionDir)Debug\$(Platform)\bin\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb</ProgramDatabaseFile>
-      <AdditionalOptions>$(GtkExportGdkWin32DisplayMgr) %(AdditionalOptions)</AdditionalOptions>
-      <SubSystem>Windows</SubSystem>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\gtk;..\..\gdk;..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>$(GtkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>$(GtkAdditionalLibs);%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
-      <ImportLibrary>$(TargetDir)$(ProjectName).lib</ImportLibrary>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(OutDir)$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb</ProgramDatabaseFile>
-      <AdditionalOptions>$(GtkExportGdkWin32DisplayMgr) %(AdditionalOptions)</AdditionalOptions>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_Vulkan|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\gtk;..\..\gdk;..\..\gdk\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>$(GtkDefines);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>$(GtkAdditionalLibs);$(VulkanLibs);%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(SolutionDir)Release\$(Platform)\bin\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).dll</OutputFile>
-      <ImportLibrary>$(SolutionDir)Release\$(Platform)\bin\$(ProjectName).lib</ImportLibrary>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(SolutionDir)Release\$(Platform)\bin\$(GtkDllPrefix)$(ProjectName)$(GtkDllSuffix).pdb</ProgramDatabaseFile>
-      <AdditionalOptions>$(GtkExportGdkWin32DisplayMgr) %(AdditionalOptions)</AdditionalOptions>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <CustomBuild Include="..\..\gtk\gtkdbusinterfaces.xml">
-      <Message Condition="'$(Platform)'=='Win32'">Generating GTK+ DBus Sources...</Message>
-      <Command Condition="'$(Platform)'=='Win32'">$(GenerateGtkDbusBuiltSources)</Command>
-      <Outputs Condition="'$(Platform)'=='Win32'">..\..\gtk\gtkdbusgenerated.c;..\..\gtk\gtkdbusgenerated.h;%(Outputs)</Outputs>
-      <Message Condition="'$(Platform)'=='x64'">Generating GTK+ DBus Sources...</Message>
-      <Command Condition="'$(Platform)'=='x64'">$(GenerateGtkDbusBuiltSourcesX64)</Command>
-      <Outputs Condition="'$(Platform)'=='x64'">..\..\gtk\gtkdbusgenerated.c;..\..\gtk\gtkdbusgenerated.h;%(Outputs)</Outputs>
-    </CustomBuild>
-    <CustomBuild Include="..\..\gtk\gtk-win32.rc.body">
-      <Message>Copying GTK+ Win32 Version Resource...</Message>
-      <Command>$(CopyGtkWin32RC)</Command>
-      <Outputs>..\..\gtk\gtk-win32.rc;%(Outputs)</Outputs>
-    </CustomBuild>
-    <CustomBuild Include="..\..\gtk\libgtk4.manifest.in">
-      <Message Condition="'$(Platform)'=='Win32'">Generating GTK+ Win32 Manifest...</Message>
-      <Command Condition="'$(Platform)'=='Win32'">$(GenerateGtkWin32Manifest)</Command>
-      <Outputs Condition="'$(Platform)'=='Win32'">..\..\gtk\libgtk4.manifest;%(Outputs)</Outputs>
-      <Message Condition="'$(Platform)'=='x64'">Generating GTK+ Win32 Manifest...</Message>
-      <Command Condition="'$(Platform)'=='x64'">$(GenerateGtkWin32ManifestX64)</Command>
-      <Outputs Condition="'$(Platform)'=='x64'">..\..\gtk\libgtk4.manifest;%(Outputs)</Outputs>
-    </CustomBuild>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="..\..\gtk\gtk-win32.rc">
-      <AdditionalIncludeDirectories>..\..\gdk\win32\rc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-  </ItemGroup>
-  <ItemGroup>
-#include "gtk-4.vs12.sourcefiles"
-    <ClCompile Include="..\..\modules\input\gtkimcontextime.c" />
-    <ClCompile Include="..\..\modules\input\gtkimcontextmultipress.c" />
-    <ClCompile Include="..\..\modules\input\gtkimcontextthai.c" />
-    <ClCompile Include="..\..\modules\input\imam-et.c" />
-    <ClCompile Include="..\..\modules\input\imcedilla.c" />
-    <ClCompile Include="..\..\modules\input\imcyrillic-translit.c" />
-    <ClCompile Include="..\..\modules\input\imime.c" />
-    <ClCompile Include="..\..\modules\input\iminuktitut.c" />
-    <ClCompile Include="..\..\modules\input\imipa.c" />
-    <ClCompile Include="..\..\modules\input\immultipress.c" />
-    <ClCompile Include="..\..\modules\input\imthai.c" />
-    <ClCompile Include="..\..\modules\input\imti-er.c" />
-    <ClCompile Include="..\..\modules\input\imti-et.c" />
-    <ClCompile Include="..\..\modules\input\imviqr.c" />
-    <ClCompile Include="..\..\modules\input\thai-charprop.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <Manifest Include="..\..\gtk\libgtk4.manifest" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="gdk4-win32.vcxproj">
-      <Project>{aba7685a-7cbb-4626-b5e5-6eeea5b489ef}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="gdk-4.vcxproj">
-      <Project>{5ae8f5ce-9103-4951-aede-ea2f3b573be8}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="gsk-4.vcxproj">
-      <Project>{5ae8f5ce-9103-4951-aede-eb2f3b573be8}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/win32/vs12/gtk4-build-defines.props b/win32/vs12/gtk4-build-defines.props
deleted file mode 100644
index e770e39789..0000000000
--- a/win32/vs12/gtk4-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="gtk4-version-paths.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros">
-    <GtkBinaryVersion>4.0.0</GtkBinaryVersion>
-    <GtkDummyPrefix>/dummy</GtkDummyPrefix>
-    <GtkPrefixDefine>GTK_PREFIX=\"$(GtkDummyPrefix)\"</GtkPrefixDefine>
-    <GdkDefines>GDK_COMPILATION;G_LOG_USE_STRUCTURED=1;G_LOG_DOMAIN="Gdk"</GdkDefines>
-    <GskDefines>GSK_COMPILATION;G_LOG_USE_STRUCTURED=1;G_LOG_DOMAIN="Gsk"</GskDefines>
-    <GtkIncludedImmodulesDefines>INCLUDE_IM_am_et;INCLUDE_IM_cedilla;INCLUDE_IM_cyrillic_translit;INCLUDE_IM_ime;INCLUDE_IM_inuktitut;INCLUDE_IM_ipa;INCLUDE_IM_multipress;INCLUDE_IM_thai;INCLUDE_IM_ti_er;INCLUDE_IM_ti_et;INCLUDE_IM_viqr</GtkIncludedImmodulesDefines>
-    <GtkDefines>GTK_COMPILATION;G_LOG_DOMAIN="Gtk";GTK_HOST="i686-pc-vs$(VSVer)";GTK_PRINT_BACKENDS="file";GTK_PRINT_BACKEND_ENABLE_UNSUPPORTED;$(GtkIncludedImmodulesDefines);GTK_LIBDIR="$(GtkDummyPrefix)/lib";GTK_DATADIR="$(GtkDummyPrefix)/share";GTK_DATA_PREFIX="$(GtkDummyPrefix)";GTK_SYSCONFDIR="$(GtkDummyPrefix)/etc";MULTIPRESS_CONFDIR="$(GtkDummyPrefix)/etc/gtk-$(ApiVersion)";MULTIPRESS_LOCALEDIR="$(GtkDummyPrefix)/share/locale";GTK_VERSION="$(GtkVersion)/etc";GTK_BINARY_VERSION="$(GtkBinaryVersion)/etc";GDK_DISABLE_DEPRECATED;ISOLATION_AWARE_ENABLED</GtkDefines>
-    <GtkGdkCommonLibs>imm32.lib</GtkGdkCommonLibs>
-    <GdkAdditionalLibs>winmm.lib;dwmapi.lib;setupapi.lib;$(GtkGdkCommonLibs)</GdkAdditionalLibs>
-    <VulkanLibs>vulkan-1.lib</VulkanLibs>
-    <GtkAdditionalLibs>atk-1.0.lib;pangowin32-1.0.lib;winspool.lib;comctl32.lib;$(GdkAdditionalLibs)</GtkAdditionalLibs>
-    <GtkExportGdkWin32DisplayMgr>/EXPORT:gdk_win32_display_manager_get_type</GtkExportGdkWin32DisplayMgr>
-  </PropertyGroup>
-  <PropertyGroup>
-    <_PropertySheetDisplayName>gtk4builddefinesprops</_PropertySheetDisplayName>
-    <OutDir>$(SolutionDir)$(Configuration)\$(PlatformName)\bin\</OutDir>
-    <IntDir>$(SolutionDir)$(Configuration)\$(PlatformName)\obj\$(ProjectName)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..;$(GlibEtcInstallRoot)\include\gdk-pixbuf-2.0;$(GlibEtcInstallRoot)\include\pango-1.0;$(GlibEtcInstallRoot)\include\atk-1.0;$(GlibEtcInstallRoot)\include\graphene-1.0;$(GlibEtcInstallRoot)\lib\graphene-1.0\include;$(GlibEtcInstallRoot)\include\cairo;$(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;ATK_DISABLE_SINGLE_INCLUDES;GDK_PIXBUF_DISABLE_SINGLE_INCLUDES;GTK_DISABLE_SINGLE_INCLUDES;_USE_MATH_DEFINES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ForcedIncludeFiles>msvc_recommended_pragmas.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <AdditionalOptions>/d2Zi+ %(AdditionalOptions)</AdditionalOptions>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>pangocairo-1.0.lib;cairo.lib;cairo-gobject.lib;pango-1.0.lib;gdk_pixbuf-2.0.lib;graphene-1.0.lib;gio-2.0.lib;gmodule-2.0.lib;gobject-2.0.lib;glib-2.0.lib;intl.lib;epoxy.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(GlibEtcInstallRoot)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <BuildMacro Include="GtkBinaryVersion">
-      <Value>$(GtkBinaryVersion)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GtkDummyPrefix">
-      <Value>$(GtkDummyPrefix)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GtkPrefixDefine">
-      <Value>$(GtkPrefixDefine)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GdkDefines">
-      <Value>$(GdkDefines)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GtkIncludedImmodulesDefines">
-      <Value>$(GtkIncludedImmodulesDefines)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GtkDefines">
-      <Value>$(GtkDefines)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GtkGdkCommonLibs">
-      <Value>$(GtkGdkCommonLibs)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GdkAdditionalLibs">
-      <Value>$(GdkAdditionalLibs)</Value>
-    </BuildMacro>
-    <BuildMacro Include="VulkanLibs">
-      <Value>$(VulkanLibs)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GtkAdditionalLibs">
-      <Value>$(GtkAdditionalLibs)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GtkExportGdkWin32DisplayMgr">
-      <Value>$(GtkExportGdkWin32DisplayMgr)</Value>
-    </BuildMacro>
-  </ItemGroup>
-</Project>
diff --git a/win32/vs12/gtk4-builder-tool.vcxproj b/win32/vs12/gtk4-builder-tool.vcxproj
deleted file mode 100644
index 347c385a7e..0000000000
--- a/win32/vs12/gtk4-builder-tool.vcxproj
+++ /dev/null
@@ -1,175 +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>{7D2397CF-4C25-45BC-A1BB-CB4B6E154BBD}</ProjectGuid>
-    <RootNamespace>gtk4buildertool</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gtk4-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="gtk4-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="gtk4-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="gtk4-build-defines.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <LinkIncremental Condition="'$(Configuration)'=='Debug'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)'=='Release'">false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;%(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>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>%(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'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>%(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>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\gtk\gtk-builder-tool.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="gtk-4.vcxproj">
-      <Project>{95a4b53d-2773-4406-a2c1-8fd2840bbad8}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/win32/vs12/gtk4-builder-tool.vcxproj.filters b/win32/vs12/gtk4-builder-tool.vcxproj.filters
deleted file mode 100644
index e88646b264..0000000000
--- a/win32/vs12/gtk4-builder-tool.vcxproj.filters
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Sources">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Headers">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\gtk\gtk-builder-tool.c"><Filter>Sources</Filter></ClCompile>
-  </ItemGroup>
-</Project>
diff --git a/win32/vs12/gtk4-demo-application.vcxproj.filtersin b/win32/vs12/gtk4-demo-application.vcxproj.filtersin
deleted file mode 100644
index 5d39916a0c..0000000000
--- a/win32/vs12/gtk4-demo-application.vcxproj.filtersin
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Sources">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Headers">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-#include "gtk4-demo-application.vs12.sourcefiles.filters"
-  </ItemGroup>
-</Project>
diff --git a/win32/vs12/gtk4-demo-application.vcxprojin b/win32/vs12/gtk4-demo-application.vcxprojin
deleted file mode 100644
index aa228f727f..0000000000
--- a/win32/vs12/gtk4-demo-application.vcxprojin
+++ /dev/null
@@ -1,167 +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>{BE6B4973-C6FF-4C8F-8E97-A47793C50F44}</ProjectGuid>
-    <RootNamespace>gtk4demoapplication</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gtk4-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="gtk4-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="gtk4-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="gtk4-build-defines.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <LinkIncremental Condition="'$(Configuration)'=='Debug'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)'=='Release'">false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>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>%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>false</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>false</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-#include "gtk4-demo-application.vs12.sourcefiles"
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="gtk-4.vcxproj">
-      <Project>{95a4b53d-2773-4406-a2c1-8fd2840bbad8}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/win32/vs12/gtk4-demo.vcxproj.filtersin b/win32/vs12/gtk4-demo.vcxproj.filtersin
deleted file mode 100644
index 37f1af4455..0000000000
--- a/win32/vs12/gtk4-demo.vcxproj.filtersin
+++ /dev/null
@@ -1,16 +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;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-#include "gtk4-demo.vs12.sourcefiles.filters"
-  </ItemGroup>
-</Project>
diff --git a/win32/vs12/gtk4-demo.vcxprojin b/win32/vs12/gtk4-demo.vcxprojin
deleted file mode 100644
index 3a74d29433..0000000000
--- a/win32/vs12/gtk4-demo.vcxprojin
+++ /dev/null
@@ -1,181 +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>{BDAE6DE2-6BCC-4107-94F0-DA12214A02DE}</ProjectGuid>
-    <RootNamespace>gtk4demo</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gtk4-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="gtk4-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="gtk4-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="gtk4-build-defines.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <LinkIncremental Condition="'$(Configuration)'=='Debug'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)'=='Release'">false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\gdk;..\..\gtk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;$(GtkPrefixDefine);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <CompileAs>CompileAsC</CompileAs>
-    </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>
-      <AdditionalIncludeDirectories>..\..\gdk;..\..\gtk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>$(GtkPrefixDefine);%(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>
-      <FunctionLevelLinking>false</FunctionLevelLinking>
-      <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>..\..\gdk;..\..\gtk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;$(GtkPrefixDefine);%(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>..\..\gdk;..\..\gtk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>$(GtkPrefixDefine);%(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>
-      <FunctionLevelLinking>false</FunctionLevelLinking>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-#include "gtk4-demo.vs12.sourcefiles"
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="gtk-4.vcxproj">
-      <Project>{95a4b53d-2773-4406-a2c1-8fd2840bbad8}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/win32/vs12/gtk4-encode-symbolic-svg.vcxproj b/win32/vs12/gtk4-encode-symbolic-svg.vcxproj
deleted file mode 100644
index 4e9a88b290..0000000000
--- a/win32/vs12/gtk4-encode-symbolic-svg.vcxproj
+++ /dev/null
@@ -1,175 +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>{F280BF1A-777A-4FB5-8005-DFBE04621EDB}</ProjectGuid>
-    <RootNamespace>gtk4encodesymbolicsvg</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gtk4-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="gtk4-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="gtk4-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="gtk4-build-defines.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <LinkIncremental Condition="'$(Configuration)'=='Debug'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)'=='Release'">false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\gdk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;%(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>
-      <AdditionalIncludeDirectories>..\..\gdk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>%(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'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\gdk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <AdditionalIncludeDirectories>..\..\gdk;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>%(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>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\gtk\encodesymbolic.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="gtk-4.vcxproj">
-      <Project>{95a4b53d-2773-4406-a2c1-8fd2840bbad8}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/win32/vs12/gtk4-encode-symbolic-svg.vcxproj.filters b/win32/vs12/gtk4-encode-symbolic-svg.vcxproj.filters
deleted file mode 100644
index 3377263529..0000000000
--- a/win32/vs12/gtk4-encode-symbolic-svg.vcxproj.filters
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Sources">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Headers">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\gtk\encodesymbolic.c"><Filter>Sources</Filter></ClCompile>
-  </ItemGroup>
-</Project>
diff --git a/win32/vs12/gtk4-gen-srcs.props b/win32/vs12/gtk4-gen-srcs.props
deleted file mode 100644
index 4837210044..0000000000
--- a/win32/vs12/gtk4-gen-srcs.props
+++ /dev/null
@@ -1,108 +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="gtk4-build-defines.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros">
-    <GenConfigH>copy ..\..\config.h.win32 ..\..\config.h</GenConfigH>
-    <GenGdkConfigHWin32>
-if exist ..\..\MSVC_$(Configuration) goto DONE_GDKCONFIG_H
-
-if exist ..\..\gdk\gdkconfig.h del ..\..\gdk\gdkconfig.h
-if exist ..\..\GDK_VULKAN_BUILD del ..\..\GDK_VULKAN_BUILD
-if exist ..\..\MSVC_$(Configuration)_Vulkan del ..\..\MSVC_$(Configuration)_Vulkan
-if exist $(Configuration)\$(Platform)\bin\$(GtkDllPrefix)gdk$(GtkDllSuffix).dll del $(Configuration)\$(Platform)\bin\$(GtkDllPrefix)gdk$(GtkDllSuffix).dll
-if exist $(Configuration)\$(Platform)\bin\gdk-$(ApiVersion).lib del $(Configuration)\$(Platform)\bin\gdk-$(ApiVersion).lib
-if "$(Configuration)" == "Release" del ..\..\MSVC_Debug
-if "$(Configuration)" == "Debug" del ..\..\MSVC_Release
-copy ..\..\gdk\gdkconfig.h.win32 ..\..\gdk\gdkconfig.h
-copy ..\..\gdk\gdkconfig.h.win32 ..\..\GDK_WIN32ONLY_BUILD
-echo $(Configuration) &gt; ..\..\MSVC_$(Configuration)
-
-:DONE_GDKCONFIG_H
-    </GenGdkConfigHWin32>
-    <GenGdkConfigHVulkan>
-if exist ..\..\MSVC_$(Configuration)_Vulkan goto DONE_GDKCONFIG_H
-
-if exist ..\..\gdk\gdkconfig.h del ..\..\gdk\gdkconfig.h
-if exist ..\..\GDK_WIN32ONLY_BUILD del ..\..\GDK_WIN32ONLY_BUILD
-if exist ..\..\MSVC_Release del ..\..\MSVC_Release
-if exist ..\..\MSVC_Debug del ..\..\MSVC_Debug
-
-if "$(Configuration)" == "Release_Vulkan" del ..\..\MSVC_Debug_Vulkan
-if "$(Configuration)" == "Debug_Vulkan" del ..\..\MSVC_Release_Vulkan
-
-copy ..\..\gdk\gdkconfig.h.win32_vulkan ..\..\gdk\gdkconfig.h
-copy ..\..\gdk\gdkconfig.h.win32_vulkan ..\..\GDK_VULKAN_BUILD
-echo $(Configuration) &gt; ..\..\MSVC_$(Configuration)_Vulkan
-
-:DONE_GDKCONFIG_H
-    </GenGdkConfigHVulkan>
-    <GDbusCodeGenCmd>$(GlibEtcInstallRoot)\bin\gdbus-codegen --interface-prefix org.Gtk. --c-namespace _Gtk --generate-c-code gtkdbusgenerated ./gtkdbusinterfaces.xml</GDbusCodeGenCmd>
-    <GenerateGtkDbusBuiltSources>cd ..\..\gtk &amp; $(PythonDir)\python $(GDbusCodeGenCmd) &amp; cd $(SolutionDir)</GenerateGtkDbusBuiltSources>
-    <GenerateGtkDbusBuiltSourcesX64>cd ..\..\gtk &amp; $(PythonDirX64)\python $(GDbusCodeGenCmd) &amp; cd $(SolutionDir)</GenerateGtkDbusBuiltSourcesX64>
-    <CopyGtkWin32RC>copy ..\..\gtk\gtk-win32.rc.body ..\..\gtk\gtk-win32.rc</CopyGtkWin32RC>
-    <GenerateGtkWin32Manifest>$(PythonDir)\python ..\replace.py --action=replace-var --input=..\..\gtk\libgtk4.manifest.in --output=..\..\gtk\libgtk4.manifest --var=EXE_MANIFEST_ARCHITECTURE --outstring=*</GenerateGtkWin32Manifest>
-    <GenerateGtkWin32ManifestX64>$(PythonDirX64)\python ..\replace.py --action=replace-var --input=..\..\gtk\libgtk4.manifest.in --output=..\..\gtk\libgtk4.manifest --var=EXE_MANIFEST_ARCHITECTURE --outstring=*</GenerateGtkWin32ManifestX64>
-    <CopyDemosH>copy ..\..\demos\gtk-demo\demos.h.win32 ..\..\demos\gtk-demo\demos.h</CopyDemosH>
-    <GenGSKEnumSrcs>(cd ..) &amp; (call gen-enums.bat $(GlibEtcInstallRoot) $(PythonDir)) &amp; (cd $(SolutionDir))</GenGSKEnumSrcs>
-    <GenGSKEnumSrcsX64>(cd ..) &amp; (call gen-enums.bat $(GlibEtcInstallRoot) $(PythonDirX64)) &amp; (cd $(SolutionDir))</GenGSKEnumSrcsX64>
-    <GenGSKRsrcSrcs>
-echo ^&lt;?xml version='1.0' encoding='UTF-8'?^&gt; &gt; ..\..\gsk\gsk.gresource.xml
-echo ^&lt;gresources^&gt; &gt;&gt; ..\..\gsk\gsk.gresource.xml
-echo   ^&lt;gresource prefix='/org/gtk/libgsk'^&gt; &gt;&gt; ..\..\gsk\gsk.gresource.xml
-for /f &#37;&#37;f in ('dir /b ..\..\gsk\resources\glsl\*') do echo     ^&lt;file alias='glsl/&#37;&#37;f'^&gt;resources/glsl/&#37;&#37;f^&lt;/file^&gt; &gt;&gt; ..\..\gsk\gsk.gresource.xml
-for /f &#37;&#37;f in ('dir /b ..\..\gsk\resources\vulkan\*.spv') do echo     ^&lt;file alias='vulkan/&#37;&#37;f'^&gt;resources/vulkan/&#37;&#37;f^&lt;/file^&gt; &gt;&gt; ..\..\gsk\gsk.gresource.xml
-for /f &#37;&#37;f in ('dir /b ..\..\gsk\resources\vulkan\*.glsl') do echo     ^&lt;file alias='vulkan/&#37;&#37;f'^&gt;resources/vulkan/&#37;&#37;f^&lt;/file^&gt; &gt;&gt; ..\..\gsk\gsk.gresource.xml
-echo   ^&lt;/gresource^&gt; &gt;&gt; ..\..\gsk\gsk.gresource.xml
-echo ^&lt;/gresources^&gt; &gt;&gt; ..\..\gsk\gsk.gresource.xml
-
-$(GlibEtcInstallRoot)\bin\glib-compile-resources.exe --sourcedir=..\..\gsk --c-name _gsk --generate-header --manual-register --target=..\..\gsk\gskresources.h ..\..\gsk\gsk.gresource.xml
-$(GlibEtcInstallRoot)\bin\glib-compile-resources.exe --sourcedir=..\..\gsk --c-name _gsk --generate-source --manual-register --target=..\..\gsk\gskresources.c ..\..\gsk\gsk.gresource.xml
-    </GenGSKRsrcSrcs>
-  </PropertyGroup>
-  <PropertyGroup>
-    <_PropertySheetDisplayName>gtk4gensrcsprops</_PropertySheetDisplayName>
-  </PropertyGroup>
-  <ItemGroup>
-    <BuildMacro Include="GenConfigH">
-      <Value>$(GenConfigH)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GenGdkConfigHWin32">
-      <Value>$(GenGdkConfigHWin32)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GenGdkConfigHVulkan">
-      <Value>$(GenGdkConfigHVulkan)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GDbusCodeGenCmd">
-      <Value>$(GDbusCodeGenCmd)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GenerateGtkDbusBuiltSources">
-      <Value>$(GenerateGtkDbusBuiltSources)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GenerateGtkDbusBuiltSourcesX64">
-      <Value>$(GenerateGtkDbusBuiltSourcesX64)</Value>
-    </BuildMacro>
-    <BuildMacro Include="CopyGtkWin32RC">
-      <Value>$(CopyGtkWin32RC)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GenerateGtkWin32Manifest">
-      <Value>$(GenerateGtkWin32Manifest)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GenerateGtkWin32ManifestX64">
-      <Value>$(GenerateGtkWin32ManifestX64)</Value>
-    </BuildMacro>
-    <BuildMacro Include="CopyDemosH">
-      <Value>$(CopyDemosH)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GenGSKEnumSrcs">
-      <Value>$(GenGSKEnumSrcs)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GenGSKEnumSrcsX64">
-      <Value>$(GenGSKEnumSrcsX64)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GenGSKRsrcSrcs">
-      <Value>$(GenGSKRsrcSrcs)</Value>
-    </BuildMacro>
-  </ItemGroup>
-</Project>
diff --git a/win32/vs12/gtk4-icon-browser.vcxproj.filtersin b/win32/vs12/gtk4-icon-browser.vcxproj.filtersin
deleted file mode 100644
index 3350174665..0000000000
--- a/win32/vs12/gtk4-icon-browser.vcxproj.filtersin
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Sources">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Headers">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-#include "gtk4-icon-browser.vs12.sourcefiles.filters"
-  </ItemGroup>
-</Project>
diff --git a/win32/vs12/gtk4-icon-browser.vcxprojin b/win32/vs12/gtk4-icon-browser.vcxprojin
deleted file mode 100644
index 48e9c19458..0000000000
--- a/win32/vs12/gtk4-icon-browser.vcxprojin
+++ /dev/null
@@ -1,171 +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>{343333C4-D46C-4C97-A986-959CCA6F1DE0}</ProjectGuid>
-    <RootNamespace>gtk4iconbrowser</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gtk4-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="gtk4-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="gtk4-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="gtk4-build-defines.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <LinkIncremental Condition="'$(Configuration)'=='Debug'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)'=='Release'">false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\demos\icon-browser;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;%(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>
-      <AdditionalIncludeDirectories>..\..\demos\icon-browser;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>false</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\demos\icon-browser;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <AdditionalIncludeDirectories>..\..\demos\icon-browser;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>false</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-#include "gtk4-icon-browser.vs12.sourcefiles"
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="gtk-4.vcxproj">
-      <Project>{95a4b53d-2773-4406-a2c1-8fd2840bbad8}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/win32/vs12/gtk4-install.propsin b/win32/vs12/gtk4-install.propsin
deleted file mode 100644
index ac5fbea5bb..0000000000
--- a/win32/vs12/gtk4-install.propsin
+++ /dev/null
@@ -1,143 +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="gtk4-build-defines.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros">
-    <BinDir>$(SolutionDir)$(Configuration)\$(Platform)\bin</BinDir>
-    <GtkDoInstallBin>
-mkdir $(CopyDir)\bin
-mkdir $(CopyDir)\lib\pkgconfig
-
-if "$(Configuration)" == "Release_Vulkan" goto DO_VULKAN_RELEASE
-if "$(Configuration)" == "Debug_Vulkan" goto DO_VULKAN_DEBUG
-
-copy "$(BinDir)\$(GtkDllPrefix)gtk-$(ApiVersionShort)$(GtkDllSuffix).dll" $(CopyDir)\bin
-copy "$(BinDir)\$(GtkDllPrefix)gtk-$(ApiVersionShort)$(GtkDllSuffix).pdb" $(CopyDir)\bin
-copy "$(BinDir)\gtk-$(ApiVersionShort).lib" $(CopyDir)\lib
-copy "$(BinDir)\gtk$(ApiVersionShort)-demo.exe" $(CopyDir)\bin
-copy "$(BinDir)\gtk$(ApiVersionShort)-demo.pdb" $(CopyDir)\bin
-copy "$(BinDir)\gtk$(ApiVersionShort)-demo-application.exe" $(CopyDir)\bin
-copy "$(BinDir)\gtk$(ApiVersionShort)-demo-application.pdb" $(CopyDir)\bin
-copy "$(BinDir)\gtk$(ApiVersionShort)-icon-browser.exe" $(CopyDir)\bin
-copy "$(BinDir)\gtk$(ApiVersionShort)-icon-browser.pdb" $(CopyDir)\bin
-copy "$(BinDir)\gtk$(ApiVersionShort)-encode-symbolic-svg.exe" $(CopyDir)\bin
-copy "$(BinDir)\gtk$(ApiVersionShort)-encode-symbolic-svg.pdb" $(CopyDir)\bin
-copy "$(BinDir)\gtk$(ApiVersionShort)-update-icon-cache.exe" $(CopyDir)\bin
-copy "$(BinDir)\gtk$(ApiVersionShort)-update-icon-cache.pdb" $(CopyDir)\bin
-copy "$(BinDir)\gtk$(ApiVersionShort)-query-settings.exe" $(CopyDir)\bin
-copy "$(BinDir)\gtk$(ApiVersionShort)-query-settings.pdb" $(CopyDir)\bin
-copy "$(BinDir)\gtk$(ApiVersionShort)-builder-tool.exe" $(CopyDir)\bin
-copy "$(BinDir)\gtk$(ApiVersionShort)-builder-tool.pdb" $(CopyDir)\bin
-
-:DO_VULKAN_RELEASE
-copy .\Release\$(Platform)\bin\$(GtkDllPrefix)gtk-$(ApiVersionShort)$(GtkDllSuffix).dll $(CopyDir)\bin
-copy .\Release\$(Platform)\bin\$(GtkDllPrefix)gtk-$(ApiVersionShort)$(GtkDllSuffix).pdb $(CopyDir)\bin
-copy .\Release\$(Platform)\bin\gtk-$(ApiVersionShort).lib $(CopyDir)\lib
-copy .\Release\$(Platform)\bin\gtk$(ApiVersionShort)-demo.exe $(CopyDir)\bin
-copy .\Release\$(Platform)\bin\gtk$(ApiVersionShort)-demo.pdb $(CopyDir)\bin
-copy .\Release\$(Platform)\bin\gtk$(ApiVersionShort)-demo-application.exe $(CopyDir)\bin
-copy .\Release\$(Platform)\bin\gtk$(ApiVersionShort)-demo-application.pdb $(CopyDir)\bin
-copy .\Release\$(Platform)\bin\gtk$(ApiVersionShort)-icon-browser.exe $(CopyDir)\bin
-copy .\Release\$(Platform)\bin\gtk$(ApiVersionShort)-icon-browser.pdb $(CopyDir)\bin
-copy .\Release\$(Platform)\bin\gtk$(ApiVersionShort)-encode-symbolic-svg.exe $(CopyDir)\bin
-copy .\Release\$(Platform)\bin\gtk$(ApiVersionShort)-encode-symbolic-svg.pdb $(CopyDir)\bin
-copy .\Release\$(Platform)\bin\gtk$(ApiVersionShort)-update-icon-cache.exe $(CopyDir)\bin
-copy .\Release\$(Platform)\bin\gtk$(ApiVersionShort)-update-icon-cache.pdb $(CopyDir)\bin
-copy .\Release\$(Platform)\bin\gtk$(ApiVersionShort)-query-settings.exe $(CopyDir)\bin
-copy .\Release\$(Platform)\bin\gtk$(ApiVersionShort)-query-settings.pdb $(CopyDir)\bin
-copy .\Release\$(Platform)\bin\gtk$(ApiVersionShort)-builder-tool.exe $(CopyDir)\bin
-copy .\Release\$(Platform)\bin\gtk$(ApiVersionShort)-builder-tool.pdb $(CopyDir)\bin
-
-goto DONE_BIN
-
-:DO_VULKAN_DEBUG
-copy .\Debug\$(Platform)\bin\$(GtkDllPrefix)gtk-$(ApiVersionShort)$(GtkDllSuffix).dll $(CopyDir)\bin
-copy .\Debug\$(Platform)\bin\$(GtkDllPrefix)gtk-$(ApiVersionShort)$(GtkDllSuffix).pdb $(CopyDir)\bin
-copy .\Debug\$(Platform)\bin\gtk-$(ApiVersionShort).lib $(CopyDir)\lib
-copy .\Debug\$(Platform)\bin\gtk$(ApiVersionShort)-demo.exe $(CopyDir)\bin
-copy .\Debug\$(Platform)\bin\gtk$(ApiVersionShort)-demo.pdb $(CopyDir)\bin
-copy .\Debug\$(Platform)\bin\gtk$(ApiVersionShort)-demo-application.exe $(CopyDir)\bin
-copy .\Debug\$(Platform)\bin\gtk$(ApiVersionShort)-demo-application.pdb $(CopyDir)\bin
-copy .\Debug\$(Platform)\bin\gtk$(ApiVersionShort)-icon-browser.exe $(CopyDir)\bin
-copy .\Debug\$(Platform)\bin\gtk$(ApiVersionShort)-icon-browser.pdb $(CopyDir)\bin
-copy .\Debug\$(Platform)\bin\gtk$(ApiVersionShort)-encode-symbolic-svg.exe $(CopyDir)\bin
-copy .\Debug\$(Platform)\bin\gtk$(ApiVersionShort)-encode-symbolic-svg.pdb $(CopyDir)\bin
-copy .\Debug\$(Platform)\bin\gtk$(ApiVersionShort)-update-icon-cache.exe $(CopyDir)\bin
-copy .\Debug\$(Platform)\bin\gtk$(ApiVersionShort)-update-icon-cache.pdb $(CopyDir)\bin
-copy .\Debug\$(Platform)\bin\gtk$(ApiVersionShort)-query-settings.exe $(CopyDir)\bin
-copy .\Debug\$(Platform)\bin\gtk$(ApiVersionShort)-query-settings.pdb $(CopyDir)\bin
-copy .\Debug\$(Platform)\bin\gtk$(ApiVersionShort)-builder-tool.exe $(CopyDir)\bin
-copy .\Debug\$(Platform)\bin\gtk$(ApiVersionShort)-builder-tool.pdb $(CopyDir)\bin
-
-:DONE_BIN
-
-copy "..\gtk+-$(ApiVersion).pc" $(CopyDir)\lib\pkgconfig
-copy "..\gtk+-$(ApiVersion).pc" "$(CopyDir)\lib\pkgconfig\gtk+-win32-$(ApiVersion).pc"
-    </GtkDoInstallBin>
-    <GtkDoInstall>
-echo off
-mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gdk\win32
-mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gdk\deprecated
-copy ..\..\gdk\win32\gdkwin32.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk
-#include "gdk-4.vs12.headers"
-#include "gdk4-win32.vs12.headers"
-
-mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gsk
-#include "gsk-4.vs12.headers"
-
-mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y
-mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated
-#include "gtk-4.vs12.headers"
-
-for &#37;&#37;s in (16 22 24 32 48 256) do ((mkdir $(CopyDir)\share\icons\hicolor\&#37;&#37;sx&#37;&#37;s\apps) &amp; (copy /b ..\..\demos\gtk-demo\data\&#37;&#37;sx&#37;&#37;s\gtk$(ApiVersionShort)-demo.png $(CopyDir)\share\icons\hicolor\&#37;&#37;sx&#37;&#37;s\apps))
-mkdir $(CopyDir)\share\glib-2.0\schemas
-copy ..\..\gtk\org.gtk.Settings.FileChooser.gschema.xml $(CopyDir)\share\glib-2.0\schemas
-copy ..\..\gtk\org.gtk.Settings.ColorChooser.gschema.xml $(CopyDir)\share\glib-2.0\schemas
-copy ..\..\gtk\org.gtk.Settings.Debug.gschema.xml $(CopyDir)\share\glib-2.0\schemas
-copy ..\..\demos\gtk-demo\org.gtk.Demo.gschema.xml $(CopyDir)\share\glib-2.0\schemas
-    </GtkDoInstall>
-    <GtkPostInstall>
-echo "Compiling gsettings XML Files..."
-$(GlibEtcInstallRoot)\bin\glib-compile-schemas.exe $(CopyDir)\share\glib-2.0\schemas
-
-echo "Generating icon cache..."
-$(CopyDir)\bin\gtk$(ApiVersionShort)-update-icon-cache.exe --ignore-theme-index --force "$(CopyDir)\share\icons\hicolor"
-    </GtkPostInstall>
-    <GenerateGtkPC>$(PythonDir)\python ..\gtkpc.py --prefix=$(CopyDir) --version=$(GtkVersion) --host=i686-pc-vs$(VSVer)</GenerateGtkPC>
-    <GenerateGtkPCX64>$(PythonDirX64)\python ..\gtkpc.py --prefix=$(CopyDir) --version=$(GtkVersion) --host=x86_64-pc-vs$(VSVer)</GenerateGtkPCX64>
-    <GtkPCFiles>..\gtk+-$(ApiVersion).pc</GtkPCFiles>
-  </PropertyGroup>
-  <PropertyGroup>
-    <_PropertySheetDisplayName>gtk4installsprops</_PropertySheetDisplayName>
-  </PropertyGroup>
-  <ItemGroup>
-    <BuildMacro Include="BinDir">
-      <Value>$(BinDir)</Value>
-    </BuildMacro>
-    <BuildMacro Include="InstalledDlls">
-      <Value>$(InstalledDlls)</Value>
-    </BuildMacro>
-    <BuildMacro Include="InstalledBins">
-      <Value>$(InstalledBins)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GtkDoInstallBin">
-      <Value>$(GtkDoInstallBin)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GtkDoInstall">
-      <Value>$(GtkDoInstall)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GtkPostInstall">
-      <Value>$(GtkPostInstall)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GenerateGtkPC">
-      <Value>$(GenerateGtkPC)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GenerateGtkPCX64">
-      <Value>$(GenerateGtkPCX64)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GtkPCFiles">
-      <Value>$(GtkPCFiles)</Value>
-    </BuildMacro>
-  </ItemGroup>
-</Project>
diff --git a/win32/vs12/gtk4-install.vcxproj b/win32/vs12/gtk4-install.vcxproj
deleted file mode 100644
index 8ab6e0d903..0000000000
--- a/win32/vs12/gtk4-install.vcxproj
+++ /dev/null
@@ -1,232 +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_Vulkan|Win32">
-      <Configuration>Debug_Vulkan</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug_Vulkan|x64">
-      <Configuration>Debug_Vulkan</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release_Vulkan|Win32">
-      <Configuration>Release_Vulkan</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release_Vulkan|x64">
-      <Configuration>Release_Vulkan</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{23BBF35F-78AF-4E8C-983F-7B90448CD7DF}</ProjectGuid>
-    <RootNamespace>gtk4install</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Utility</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Utility</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Utility</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Utility</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_Vulkan|Win32'" Label="Configuration">
-    <ConfigurationType>Utility</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Vulkan|Win32'" Label="Configuration">
-    <ConfigurationType>Utility</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_Vulkan|x64'" Label="Configuration">
-    <ConfigurationType>Utility</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Vulkan|x64'" Label="Configuration">
-    <ConfigurationType>Utility</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gtk4-install.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Vulkan|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gtk4-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="gtk4-install.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Vulkan|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gtk4-install.props" />
-  </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="gtk4-install.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_Vulkan|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gtk4-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="gtk4-install.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_Vulkan|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gtk4-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'" />
-    <OutDir Condition="'$(Configuration)'=='Debug_Vulkan'">$(GlibEtcInstallRoot)\</OutDir>
-    <ExtensionsToDeleteOnClean Condition="'$(Configuration)'=='Debug_Vulkan'" />
-    <OutDir Condition="'$(Configuration)'=='Release_Vulkan'">$(GlibEtcInstallRoot)\</OutDir>
-    <ExtensionsToDeleteOnClean Condition="'$(Configuration)'=='Release_Vulkan'" />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Vulkan|Win32'">
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Vulkan|x64'">
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_Vulkan|Win32'">
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_Vulkan|x64'">
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <CustomBuild Include="..\..\config.h.win32">
-      <Message Condition="'$(Configuration)'=='Debug'">Installing Build Results...</Message>
-      <AdditionalInputs Condition="'$(Configuration)'=='Debug'">$(GtkPCFiles)</AdditionalInputs>
-      <Command Condition="'$(Configuration)'=='Debug'">$(GtkDoInstallBin)$(GtkDoInstall)$(GtkPostInstall)</Command>
-      <Outputs Condition="'$(Configuration)'=='Debug'">blah;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)'=='Debug_Vulkan'">Installing Build Results...</Message>
-      <AdditionalInputs Condition="'$(Configuration)'=='Debug_Vulkan'">$(GtkPCFiles)</AdditionalInputs>
-      <Command Condition="'$(Configuration)'=='Debug_Vulkan'">$(GtkDoInstallBin)$(GtkDoInstall)$(GtkPostInstall)</Command>
-      <Outputs Condition="'$(Configuration)'=='Debug_Vulkan'">blah;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)'=='Release'">Installing Build Results...</Message>
-      <AdditionalInputs Condition="'$(Configuration)'=='Release'">$(GtkPCFiles)</AdditionalInputs>
-      <Command Condition="'$(Configuration)'=='Release'">$(GtkDoInstallBin)$(GtkDoInstall)$(GtkPostInstall)</Command>
-      <Outputs Condition="'$(Configuration)'=='Release'">blah;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)'=='Release_Vulkan'">Installing Build Results...</Message>
-      <AdditionalInputs Condition="'$(Configuration)'=='Release_Vulkan'">$(GtkPCFiles)</AdditionalInputs>
-      <Command Condition="'$(Configuration)'=='Release_Vulkan'">$(GtkDoInstallBin)$(GtkDoInstall)$(GtkPostInstall)</Command>
-      <Outputs Condition="'$(Configuration)'=='Release_Vulkan'">blah;%(Outputs)</Outputs>
-    </CustomBuild>
-    <CustomBuild Include="..\gtkpc.py">
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating .pc files...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GenerateGtkPC)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GtkPCFiles);%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug_Vulkan|Win32'">Generating .pc files...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug_Vulkan|Win32'">$(GenerateGtkPC) --vulkan</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug_Vulkan|Win32'">$(GtkPCFiles);%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Generating .pc files...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GenerateGtkPCX64)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GtkPCFiles);%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug_Vulkan|x64'">Generating .pc files...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug_Vulkan|x64'">$(GenerateGtkPCX64) --vulkan</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug_Vulkan|x64'">$(GtkPCFiles);%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Generating .pc files...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GenerateGtkPC)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GtkPCFiles);%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release_Vulkan|Win32'">Generating .pc files...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release_Vulkan|Win32'">$(GenerateGtkPC) --vulkan</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release_Vulkan|Win32'">$(GtkPCFiles);%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Generating .pc files...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GenerateGtkPCX64)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GtkPCFiles);%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release_Vulkan|x64'">Generating .pc files...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release_Vulkan|x64'">$(GenerateGtkPCX64) --vulkan</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release_Vulkan|x64'">$(GtkPCFiles);%(Outputs)</Outputs>
-    </CustomBuild>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="gtk4-demo.vcxproj">
-      <Project>{bdae6de2-6bcc-4107-94f0-da12214a02de}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="gtk-4.vcxproj">
-      <Project>{95a4b53d-2773-4406-a2c1-8fd2840bbad8}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="gtk4-demo-application.vcxproj">
-      <Project>{be6b4973-c6ff-4c8f-8e97-a47793c50f44}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="gtk4-icon-browser.vcxproj">
-      <Project>{343333c4-d46c-4c97-a986-959cca6f1de0}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="gtk4-encode-symbolic-svg.vcxproj">
-      <Project>{f280bf1a-777a-4fb5-8005-dfbe04621edb}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="gtk4-update-icon-cache.vcxproj">
-      <Project>{fc98af16-4c68-42df-906b-93a6804c198a}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="gtk4-builder-tool.vcxproj">
-      <Project>{7d2397cf-4c25-45bc-a1bb-cb4b6e154bbd}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="gtk4-query-settings.vcxproj">
-      <Project>{9f22107a-4ef7-4b52-b269-747b65307f36}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/win32/vs12/gtk4-install.vcxproj.filters b/win32/vs12/gtk4-install.vcxproj.filters
deleted file mode 100644
index 6be701aa89..0000000000
--- a/win32/vs12/gtk4-install.vcxproj.filters
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <CustomBuild Include="..\..\config.h.win32"><Filter>Resource Files</Filter></CustomBuild>
-    <CustomBuild Include="..\gtkpc.py"><Filter>Resource Files</Filter></CustomBuild>
-  </ItemGroup>
-</Project>
diff --git a/win32/vs12/gtk4-prebuild.vcxproj b/win32/vs12/gtk4-prebuild.vcxproj
deleted file mode 100644
index 0919f165cc..0000000000
--- a/win32/vs12/gtk4-prebuild.vcxproj
+++ /dev/null
@@ -1,200 +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_Vulkan|Win32">
-      <Configuration>Debug_Vulkan</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug_Vulkan|x64">
-      <Configuration>Debug_Vulkan</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release_Vulkan|Win32">
-      <Configuration>Release_Vulkan</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release_Vulkan|x64">
-      <Configuration>Release_Vulkan</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{B98FBE68-B03C-48E3-8F32-C3C010720D30}</ProjectGuid>
-    <RootNamespace>gtkprebuild</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Utility</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Utility</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Utility</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Utility</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_Vulkan|Win32'" Label="Configuration">
-    <ConfigurationType>Utility</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Vulkan|Win32'" Label="Configuration">
-    <ConfigurationType>Utility</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_Vulkan|x64'" Label="Configuration">
-    <ConfigurationType>Utility</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Vulkan|x64'" Label="Configuration">
-    <ConfigurationType>Utility</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gtk4-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="gtk4-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="gtk4-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="gtk4-gen-srcs.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_Vulkan|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gtk4-gen-srcs.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Vulkan|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gtk4-gen-srcs.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_Vulkan|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gtk4-gen-srcs.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Vulkan|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gtk4-gen-srcs.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'" />
-    <OutDir Condition="'$(Configuration)'=='Debug_Vulkan'">$(GlibEtcInstallRoot)\</OutDir>
-    <ExtensionsToDeleteOnClean Condition="'$(Configuration)'=='Debug_Vulkan'" />
-    <OutDir Condition="'$(Configuration)'=='Release_Vulkan'">$(GlibEtcInstallRoot)\</OutDir>
-    <ExtensionsToDeleteOnClean Condition="'$(Configuration)'=='Release_Vulkan'" />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Vulkan|Win32'">
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug_Vulkan|x64'">
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_Vulkan|Win32'">
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_Vulkan|x64'">
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <CustomBuild Include="..\..\config.h.win32">
-      <Message Condition="'$(Configuration)'=='Debug'">Copying config.h from config.h.win32...</Message>
-      <Command Condition="'$(Configuration)'=='Debug'">$(GenConfigH)</Command>
-      <Outputs Condition="'$(Configuration)'=='Debug'">..\..\config.h;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)'=='Debug_Vulkan'">Copying config.h from config.h.win32...</Message>
-      <Command Condition="'$(Configuration)'=='Debug_Vulkan'">$(GenConfigH)</Command>
-      <Outputs Condition="'$(Configuration)'=='Debug_Vulkan'">..\..\config.h;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)'=='Release'">Copying config.h from config.h.win32...</Message>
-      <Command Condition="'$(Configuration)'=='Release'">$(GenConfigH)</Command>
-      <Outputs Condition="'$(Configuration)'=='Release'">..\..\config.h;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)'=='Release_Vulkan'">Copying config.h from config.h.win32...</Message>
-      <Command Condition="'$(Configuration)'=='Release_Vulkan'">$(GenConfigH)</Command>
-      <Outputs Condition="'$(Configuration)'=='Release_Vulkan'">..\..\config.h;%(Outputs)</Outputs>
-    </CustomBuild>
-    <CustomBuild Include="..\..\gdk\gdkconfig.h.win32">
-      <Message Condition="'$(Configuration)'=='Debug'">Copying gdkconfig from gdkconfig.win32...</Message>
-      <Command Condition="'$(Configuration)'=='Debug'">$(GenGdkConfigHWin32)</Command>
-      <Outputs Condition="'$(Configuration)'=='Debug'">..\..\gdk\gdkconfig.h;..\..\GDK_WIN32ONLY_BUILD;..\..\MSVC_$(Configuration);%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)'=='Release'">Copying gdkconfig from gdkconfig.win32...</Message>
-      <Command Condition="'$(Configuration)'=='Release'">$(GenGdkConfigHWin32)</Command>
-      <Outputs Condition="'$(Configuration)'=='Release'">..\..\gdk\gdkconfig.h;..\..\GDK_WIN32ONLY_BUILD;..\..\MSVC_$(Configuration);%(Outputs)</Outputs>
-    </CustomBuild>
-    <CustomBuild Include="..\..\gdk\gdkconfig.h.win32_vulkan">
-      <Message Condition="'$(Configuration)'=='Debug_Vulkan'">Copying gdkconfig from gdkconfig.win32_vulkan...</Message>
-      <Command Condition="'$(Configuration)'=='Debug_Vulkan'">$(GenGdkConfigHVulkan)</Command>
-      <Outputs Condition="'$(Configuration)'=='Debug_Vulkan'">..\..\gdk\gdkconfig.h;..\..\GDK_VULKAN_BUILD;..\..\MSVC_$(Configuration)_Vulkan;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)'=='Release_Vulkan'">Copying gdkconfig from gdkconfig.win32_vulkan...</Message>
-      <Command Condition="'$(Configuration)'=='Release_Vulkan'">$(GenGdkConfigHVulkan)</Command>
-      <Outputs Condition="'$(Configuration)'=='Release_Vulkan'">..\..\gdk\gdkconfig.h;..\..\GDK_VULKAN_BUILD;..\..\MSVC_$(Configuration)_Vulkan;%(Outputs)</Outputs>
-    </CustomBuild>
-    <CustomBuild Include="..\..\demos\gtk-demo\demos.h.win32">
-      <Message Condition="'$(Configuration)'=='Debug'">Copying demos.h from demos.h.win32...</Message>
-      <Command Condition="'$(Configuration)'=='Debug'">$(CopyDemosH)</Command>
-      <Outputs Condition="'$(Configuration)'=='Debug'">..\..\demos\gtk-demo\demos.h;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)'=='Debug_Vulkan'">Copying demos.h from demos.h.win32...</Message>
-      <Command Condition="'$(Configuration)'=='Debug_Vulkan'">$(CopyDemosH)</Command>
-      <Outputs Condition="'$(Configuration)'=='Debug_Vulkan'">..\..\demos\gtk-demo\demos.h;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)'=='Release'">Copying demos.h from demos.h.win32...</Message>
-      <Command Condition="'$(Configuration)'=='Release'">$(CopyDemosH)</Command>
-      <Outputs Condition="'$(Configuration)'=='Release'">..\..\demos\gtk-demo\demos.h;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)'=='Release_Vulkan'">Copying demos.h from demos.h.win32...</Message>
-      <Command Condition="'$(Configuration)'=='Release_Vulkan'">$(CopyDemosH)</Command>
-      <Outputs Condition="'$(Configuration)'=='Release_Vulkan'">..\..\demos\gtk-demo\demos.h;%(Outputs)</Outputs>
-    </CustomBuild>
-  </ItemGroup>
-  <ItemGroup>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/win32/vs12/gtk4-prebuild.vcxproj.filters b/win32/vs12/gtk4-prebuild.vcxproj.filters
deleted file mode 100644
index a9c86e099e..0000000000
--- a/win32/vs12/gtk4-prebuild.vcxproj.filters
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <CustomBuild Include="..\..\config.h.win32"><Filter>Resource Files</Filter></CustomBuild>
-    <CustomBuild Include="..\..\gdk\gdkconfig.h.win32"><Filter>Resource Files</Filter></CustomBuild>
-    <CustomBuild Include="..\..\gdk\gdkconfig.h.win32_vulkan"><Filter>Resource Files</Filter></CustomBuild>
-    <CustomBuild Include="..\..\demos\gtk-demo\demos.h.win32"><Filter>Resource Files</Filter></CustomBuild>
-  </ItemGroup>
-</Project>
diff --git a/win32/vs12/gtk4-query-settings.vcxproj b/win32/vs12/gtk4-query-settings.vcxproj
deleted file mode 100644
index ad315b1eb0..0000000000
--- a/win32/vs12/gtk4-query-settings.vcxproj
+++ /dev/null
@@ -1,175 +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>{9F22107A-3EF7-4B52-B269-747B65307F36}</ProjectGuid>
-    <RootNamespace>gtk4querysettings</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gtk4-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="gtk4-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="gtk4-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="gtk4-build-defines.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <LinkIncremental Condition="'$(Configuration)'=='Debug'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)'=='Release'">false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;%(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>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>%(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'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>%(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>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\gtk\gtk-query-settings.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="gtk-4.vcxproj">
-      <Project>{95a4b53d-2773-4406-a2c1-8fd2840bbad8}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/win32/vs12/gtk4-query-settings.vcxproj.filters b/win32/vs12/gtk4-query-settings.vcxproj.filters
deleted file mode 100644
index 6e14aacf20..0000000000
--- a/win32/vs12/gtk4-query-settings.vcxproj.filters
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Sources">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Headers">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\gtk\gtk-query-settings.c"><Filter>Sources</Filter></ClCompile>
-  </ItemGroup>
-</Project>
diff --git a/win32/vs12/gtk4-update-icon-cache.vcxproj b/win32/vs12/gtk4-update-icon-cache.vcxproj
deleted file mode 100644
index efd4cb4837..0000000000
--- a/win32/vs12/gtk4-update-icon-cache.vcxproj
+++ /dev/null
@@ -1,175 +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>{FC98AF16-4C68-42DF-906B-93A6804C198A}</ProjectGuid>
-    <RootNamespace>gtk4updateiconcache</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gtk4-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="gtk4-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="gtk4-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="gtk4-build-defines.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <LinkIncremental Condition="'$(Configuration)'=='Debug'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)'=='Release'">false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;%(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>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>%(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'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>%(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>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\gtk\updateiconcache.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="gtk4-prebuild.vcxproj">
-      <Project>{b98fbe68-b03c-48e3-8f32-c3c010720d30}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/win32/vs12/gtk4-update-icon-cache.vcxproj.filters b/win32/vs12/gtk4-update-icon-cache.vcxproj.filters
deleted file mode 100644
index f62b142f16..0000000000
--- a/win32/vs12/gtk4-update-icon-cache.vcxproj.filters
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Sources">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Headers">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\gtk\updateiconcache.c"><Filter>Sources</Filter></ClCompile>
-  </ItemGroup>
-</Project>
diff --git a/win32/vs12/gtk4-version-paths.props.in b/win32/vs12/gtk4-version-paths.props.in
deleted file mode 100644
index d9f504b322..0000000000
--- a/win32/vs12/gtk4-version-paths.props.in
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="UserMacros">
-    <VSVer>12</VSVer>
-    <GlibEtcInstallRoot>$(SolutionDir)\..\..\..\vs$(VSVer)\$(Platform)</GlibEtcInstallRoot>
-    <CopyDir>..\..\..\vs$(VSVer)\$(Platform)</CopyDir>
-    <ApiVersionShort>4</ApiVersionShort>
-    <ApiVersion>$(ApiVersionShort).0</ApiVersion>
-    <GtkVersion>@GTK_VERSION@</GtkVersion>
-    <GtkLibtoolCompatibleDllPrefix>lib</GtkLibtoolCompatibleDllPrefix>
-    <GtkLibtoolCompatibleDllSuffix>.0-0</GtkLibtoolCompatibleDllSuffix>
-    <GtkSeparateVSDllPrefix />
-    <GtkSeparateVSDllSuffix>-vs$(VSVer)</GtkSeparateVSDllSuffix>
-    <GtkDllPrefix>$(GtkSeparateVSDllPrefix)</GtkDllPrefix>
-    <GtkDllSuffix>$(GtkSeparateVSDllSuffix)</GtkDllSuffix>
-    <PythonDir Condition="'$(VisualStudioVersion)' == '12.0'">c:\\python34</PythonDir>
-    <PythonDir Condition="'$(VisualStudioVersion)' == '14.0'">c:\\python36</PythonDir>
-    <PythonDir Condition="'$(VisualStudioVersion)' == '15.0'">c:\\python36</PythonDir>
-    <PythonDirX64>$(PythonDir).x64</PythonDirX64>
-  </PropertyGroup>
-  <PropertyGroup>
-    <_PropertySheetDisplayName>gtk4versionpathsprops</_PropertySheetDisplayName>
-  </PropertyGroup>
-  <ItemGroup>
-    <BuildMacro Include="VSVer">
-      <Value>$(VSVer)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GlibEtcInstallRoot">
-      <Value>$(GlibEtcInstallRoot)</Value>
-    </BuildMacro>
-    <BuildMacro Include="CopyDir">
-      <Value>$(CopyDir)</Value>
-    </BuildMacro>
-    <BuildMacro Include="ApiVersionShort">
-      <Value>$(ApiVersionShort)</Value>
-    </BuildMacro>
-    <BuildMacro Include="ApiVersion">
-      <Value>$(ApiVersion)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GtkVersion">
-      <Value>$(GtkVersion)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GtkLibtoolCompatibleDllPrefix">
-      <Value>$(GtkLibtoolCompatibleDllPrefix)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GtkLibtoolCompatibleDllSuffix">
-      <Value>$(GtkLibtoolCompatibleDllSuffix)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GtkSeparateVSDllPrefix">
-      <Value>$(GtkSeparateVSDllPrefix)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GtkSeparateVSDllSuffix">
-      <Value>$(GtkSeparateVSDllSuffix)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GtkDllPrefix">
-      <Value>$(GtkDllPrefix)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GtkDllSuffix">
-      <Value>$(GtkDllSuffix)</Value>
-    </BuildMacro>
-    <BuildMacro Include="PythonDir">
-      <Value>$(PythonDir)</Value>
-    </BuildMacro>
-    <BuildMacro Include="PythonDirX64">
-      <Value>$(PythonDirX64)</Value>
-    </BuildMacro>
-  </ItemGroup>
-</Project>
diff --git a/win32/vs14/Makefile.am b/win32/vs14/Makefile.am
deleted file mode 100644
index 82944b8170..0000000000
--- a/win32/vs14/Makefile.am
+++ /dev/null
@@ -1,46 +0,0 @@
-include $(top_srcdir)/Makefile.decl
-
-EXTRA_DIST +=	\
-	README.txt	\
-	gtk+-4.sln	\
-	gtk4-prebuild.vcxproj	\
-	gtk4-prebuild.vcxproj.filters	\
-	gdk4-win32.vcxproj	\
-	gdk4-win32.vcxproj.filters	\
-	gdk-4.vcxproj	\
-	gdk-4.vcxproj.filters	\
-	gsk-4.vcxproj	\
-	gsk-4.vcxproj.filters	\
-	gtk-4.vcxproj	\
-	gtk-4.vcxproj.filters	\
-	gtk4-builder-tool.vcxproj		\
-	gtk4-builder-tool.vcxproj.filters	\
-	gtk4-encode-symbolic-svg.vcxproj	\
-	gtk4-encode-symbolic-svg.vcxproj.filters	\
-	gtk4-query-settings.vcxproj		\
-	gtk4-query-settings.vcxproj.filters	\
-	gtk4-update-icon-cache.vcxproj		\
-	gtk4-update-icon-cache.vcxproj.filters	\
-	gtk4-demo.vcxproj	\
-	gtk4-demo.vcxproj.filters	\
-	gtk4-demo-application.vcxproj	\
-	gtk4-demo-application.vcxproj.filters	\
-	gtk4-icon-browser.vcxproj	\
-	gtk4-icon-browser.vcxproj.filters	\
-	gtk4-install.vcxproj	\
-	gtk4-install.vcxproj.filters	\
-	gtk4-build-defines.props	\
-	gtk4-gen-srcs.props	\
-	gtk4-install.props	\
-	gtk4-version-paths.props
-
-DISTCLEANFILES = $(EXTRA_DIST)
-
-MSVC_BASE_VER = 12
-MSVC_BASE_VER_LONG = 2013
-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 807427897c..0000000000
--- a/win32/vs15/Makefile.am
+++ /dev/null
@@ -1,47 +0,0 @@
-include $(top_srcdir)/Makefile.decl
-
-EXTRA_DIST +=	\
-	README.txt	\
-	gtk+-4.sln	\
-	gtk4-prebuild.vcxproj	\
-	gtk4-prebuild.vcxproj.filters	\
-	gdk4-win32.vcxproj	\
-	gdk4-win32.vcxproj.filters	\
-	gdk-4.vcxproj	\
-	gdk-4.vcxproj.filters	\
-	gsk-4.vcxproj	\
-	gsk-4.vcxproj.filters	\
-	gtk-4.vcxproj	\
-	gtk-4.vcxproj.filters	\
-	gtk4-builder-tool.vcxproj		\
-	gtk4-builder-tool.vcxproj.filters	\
-	gtk4-encode-symbolic-svg.vcxproj	\
-	gtk4-encode-symbolic-svg.vcxproj.filters	\
-	gtk4-query-settings.vcxproj		\
-	gtk4-query-settings.vcxproj.filters	\
-	gtk4-update-icon-cache.vcxproj		\
-	gtk4-update-icon-cache.vcxproj.filters	\
-	gtk4-demo.vcxproj	\
-	gtk4-demo.vcxproj.filters	\
-	gtk4-demo-application.vcxproj	\
-	gtk4-demo-application.vcxproj.filters	\
-	gtk4-icon-browser.vcxproj	\
-	gtk4-icon-browser.vcxproj.filters	\
-	gtk4-install.vcxproj	\
-	gtk4-install.vcxproj.filters	\
-	gtk4-build-defines.props	\
-	gtk4-gen-srcs.props	\
-	gtk4-install.props	\
-	gtk4-version-paths.props
-
-DISTCLEANFILES = $(EXTRA_DIST)
-
-MSVC_BASE_VER = 12
-MSVC_BASE_VER_LONG = 2013
-MSVC_VER = 15
-MSVC_VER_LONG = 15
-MSVC_TOOLSET = 141
-
-include $(top_srcdir)/win32/Makefile-newvs.am
-
--include $(top_srcdir)/git.mk