Merge branch 'nmake'

44 files changed, 880 insertions, 1991 deletions

diff --git a/Makefile.am b/Makefile.am
index 17929e24..9480af35 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,19 +11,10 @@ if HAVE_GTK_3
 bin_PROGRAMS += rsvg-view-3
 endif
 
-headers =			\
-	librsvg/rsvg.h		\
-	librsvg/rsvg-cairo.h
+include rsvg-c-srcs.mk
 
 librsvg_@RSVG_API_MAJOR_VERSION@_la_SOURCES =	\
-	librsvg/librsvg-features.c 		\
-	librsvg/librsvg-features.h 		\
-	librsvg/rsvg-base.c			\
-	librsvg/rsvg-cairo.h			\
-	librsvg/rsvg-css.h 			\
-	librsvg/rsvg-handle.c			\
-	librsvg/rsvg-pixbuf.c			\
-	librsvg/rsvg.h				\
+	$(librsvg_c_srcs)			\
 	$(NULL)
 
 librsvg_internals_la_SOURCES =		\
@@ -223,12 +214,12 @@ librsvg_@RSVG_API_MAJOR_VERSION@_la_LIBADD = \
 librsvgincdir = $(includedir)/librsvg-$(RSVG_API_VERSION)/librsvg
 librsvginc_HEADERS =			\
 	$(headers)			\
-	librsvg/librsvg-features.h
+	$(extra_inc_headers)
 
 dist_man_MANS = rsvg-convert.1
 
 rsvg_convert_SOURCES =			\
-	rsvg-convert.c			\
+	$(rsvg_convert_srcs)		\
 	$(NULL)
 
 rsvg_convert_CPPFLAGS = \
@@ -250,7 +241,7 @@ rsvg_convert_LDADD = \
 	$(LIBM)
 
 rsvg_view_3_SOURCES =			\
-	rsvg-view.c
+	$(rsvg_view_srcs)
 
 rsvg_view_3_CPPFLAGS = \
 	-I$(top_srcdir) 			\
@@ -294,8 +285,6 @@ EXTRA_DIST =				\
 	gtk-doc.make			\
 	Rsvg-2.0-custom.vala		\
 	Rsvg-2.0.metadata		\
-	config.h.win32.in		\
-	config.h.win32			\
 	rsvg.symbols			\
 	glib-tap.mk			\
 	tap-driver.sh			\
@@ -366,49 +355,3 @@ CLEANFILES += $(VAPIGEN_VAPIS)
 endif # ENABLE_VAPIGEN
 
 endif # HAVE_INTROSPECTION
-
-# ------------------- MSVC Build Items ----------------
-
-MSVCPROJS = rsvg rsvg-convert
-
-rsvg_FILES = $(librsvg_@RSVG_API_MAJOR_VERSION@_la_SOURCES)
-rsvg_EXCLUDES = dummy
-rsvg_HEADERS_DIR = $(includedir)/librsvg-$(RSVG_API_VERSION)
-rsvg_HEADERS_INST = $(librsvginc_HEADERS)
-
-rsvg_HEADERS_EXCLUDES = dummy
-
-rsvg_convert_FILES = $(rsvg_convert_SOURCES)
-rsvg_convert_EXCLUDES = dummy
-
-include $(top_srcdir)/win32/Makefile.msvcproj
-
-# autotools: Why must we do this instead of dist-hook?
-MSVCPROJ_GENERATED = \
-	$(top_builddir)/win32/vs12/rsvg.vcxproj		\
-	$(top_builddir)/win32/vs12/rsvg-convert.vcxproj
-
-if HAVE_INTROSPECTION
-
-MSVC_INTROSPECT_GIRS = $(INTROSPECTION_GIRS)
-
-INTROSPECTION_INTERMEDIATE_ITEMS = \
-	$(top_builddir)/win32/Rsvg-@RSVG_API_VERSION@.gir.msvc.introspect		\
-	$(top_builddir)/win32/Rsvg_@RSVG_API_VERSION_U@_gir_list
-
-Rsvg_@RSVG_API_VERSION_U@_gir_MSVC_FILES = $(Rsvg_@RSVG_API_VERSION_U@_gir_FILES)
-Rsvg_@RSVG_API_VERSION_U@_gir_MSVC_PACKAGES = $(Rsvg_@RSVG_API_VERSION_U@_gir_PACKAGES)
-Rsvg_@RSVG_API_VERSION_U@_gir_MSVC_EXPORT_PACKAGES = $(Rsvg_@RSVG_API_VERSION_U@_gir_EXPORT_PACKAGES)
-Rsvg_@RSVG_API_VERSION_U@_gir_MSVC_INCLUDE_GIRS = $(Rsvg_@RSVG_API_VERSION_U@_gir_INCLUDES)
-Rsvg_@RSVG_API_VERSION_U@_gir_MSVC_LIBS = rsvg-@RSVG_API_VERSION@
-Rsvg_@RSVG_API_VERSION_U@_gir_MSVC_CFLAGS = -I.. -DRSVG_COMPILATION
-Rsvg_@RSVG_API_VERSION_U@_gir_MSVC_SCANNERFLAGS = $(Rsvg_@RSVG_API_VERSION_U@_gir_SCANNERFLAGS)
-
-MSVCPROJ_GENERATED += $(INTROSPECTION_INTERMEDIATE_ITEMS)
-
-include $(top_srcdir)/win32/Makefile.msvc-introspection
-endif # HAVE_INTROSPECTION
-
-$(MSVCPROJ_GENERATED): $(top_builddir)/win32/vs12/rsvg.vs12.headers
-
-EXTRA_DIST += $(MSVCPROJ_GENERATED)
diff --git a/configure.ac b/configure.ac
index 93dc2bd2..3605aaf5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -396,12 +396,9 @@ tests/Makefile
 tools/Makefile
 doc/Makefile
 doc/version.xml
-config.h.win32
 win32/Makefile
-win32/vs12/Makefile
-win32/vs12/rsvg-version-paths.props
-win32/vs14/Makefile
-win32/vs15/Makefile
+win32/config.h.win32
+win32/config-msvc.mak
 po/Makefile.in
 ])
 
diff --git a/rsvg-c-srcs.mk b/rsvg-c-srcs.mk
new file mode 100644
index 00000000..f36efa0a
--- /dev/null
+++ b/rsvg-c-srcs.mk
@@ -0,0 +1,20 @@
+headers =			\

+	librsvg/rsvg.h		\

+	librsvg/rsvg-cairo.h

+

+extra_inc_headers =	\

+	librsvg/librsvg-features.h

+

+librsvg_c_srcs =	\

+	librsvg/librsvg-features.c 		\

+	librsvg/librsvg-features.h 		\

+	librsvg/rsvg-base.c			\

+	librsvg/rsvg-cairo.h			\

+	librsvg/rsvg-css.h 			\

+	librsvg/rsvg-handle.c			\

+	librsvg/rsvg-pixbuf.c			\

+	librsvg/rsvg.h				\

+	$(NULL)

+

+rsvg_convert_srcs = rsvg-convert.c

+rsvg_view_srcs = rsvg-view.c
\ No newline at end of file
diff --git a/rsvg.symbols b/rsvg.symbols
index e0ed2c1d..70f79802 100644
--- a/rsvg.symbols
+++ b/rsvg.symbols
@@ -5,11 +5,14 @@ rsvg_handle_close
 rsvg_handle_get_base_uri
 rsvg_handle_get_dimensions
 rsvg_handle_get_dimensions_sub
+rsvg_handle_get_geometry_for_element
+rsvg_handle_get_intrinsic_dimensions
 rsvg_handle_get_position_sub
 rsvg_handle_get_pixbuf
 rsvg_handle_get_pixbuf_sub
 rsvg_handle_get_type
 rsvg_handle_has_sub
+rsvg_handle_internal_set_testing
 rsvg_handle_new
 rsvg_handle_new_from_data
 rsvg_handle_new_from_file
diff --git a/win32/Makefile-newvs.am b/win32/Makefile-newvs.am
deleted file mode 100644
index 3a91862b..00000000
--- 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
index fb64889c..c3067577 100644
--- a/win32/Makefile.am
+++ b/win32/Makefile.am
@@ -1,34 +1,19 @@
-SUBDIRS = vs12 vs14 vs15
-
-if HAVE_INTROSPECTION
-GENERATED_ITEMS = \
-	introspection.body.mak	\
-	Rsvg_@RSVG_API_VERSION_U@_gir_list
-
-MSVC_INTROSPECTION_INTERMEDIATE_FILES = Rsvg-@RSVG_API_VERSION@.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)
-
-DISTCLEANFILES = $(GENERATED_ITEMS)
-
-else
-GENERATED_ITEMS =
-endif
-
 EXTRA_DIST = \
-	rsvg-introspection-msvc.mak	\
-	introspection-msvc.mak	\
+	build-rules-msvc.mak	\
+	config.h.win32.in	\
+	config.h.win32		\
+	config-msvc.mak		\
+	config-msvc.mak.in	\
+	create-lists.bat	\
+	create-lists-msvc.mak	\
 	detectenv-msvc.mak	\
+	generate-msvc.mak	\
+	info-msvc.mak		\
+	install-msvc.mak	\
+	introspection-msvc.mak	\
+	Makefile.vc		\
+	README.txt		\
 	rsvg-rust.mak		\
 	pc_base.py		\
 	replace.py		\
-	rsvgpc.py		\
-	$(GENERATED_ITEMS)
+	rsvgpc.py
diff --git a/win32/Makefile.msvc-introspection b/win32/Makefile.msvc-introspection
deleted file mode 100644
index 1a244e0d..00000000
--- a/win32/Makefile.msvc-introspection
+++ /dev/null
@@ -1,129 +0,0 @@
-# Author: Fan, Chun-wei
-# Common autotools file for constructing the g-ir-scanner and
-# g-ir-compiler command lines for Visual Studio builds.
-
-# This is copied from $(srcroot)/win32 from the gobject-introspection
-# project, which may be included in projects that support both
-# Visual Studio builds and introspection.
-
-# * Input variables:
-#
-#   MSVC_INTROSPECT_GIRS - List of .gir's that should be built
-#                          in the NMake Makefiles
-#
-# * Simple tutorial
-#
-# Add this to Makefile.am where your library/program is built:
-#   (Either YourLib_1_0_gir_MSVC_LIBS or YourLib_1_0_gir_MSVC_PROGRAM
-#    is required unless --headers-only is specified in
-#    YourLib_1_0_gir__MSVC_SCANNERFLAGS)
-#
-#   include <this Makefile.msvc-introspection>
-#   MSVC_INTROSPECT_GIRS = YourLib-1.0.gir
-#   YourLib_1_0_gir_NAMESPACE = YourLib # This is optional
-#   YourLib_1_0_gir_VERSION = 1.0 # This is optional
-#   YourLib_1_0_gir_MSVC_LIBS = yourlib-1.0
-#   YourLib_1_0_gir_MSVC_FILES = $(libyourlib_1_0_SOURCES)
-#   YourLib_1_0_gir_MSVC_PROGRAM = YourProgram
-#   YourLib_1_0_gir_MSVC_PACKAGES = (Dependent .pc files)
-#   YourLib_1_0_gir_MSVC_INCLUDE_GIRS = (Dependent external .gir's)
-#   YourLib_1_0_gir_MSVC_EXPORT_PACKAGES = (Packages exported by this .gir)
-#   YourLib_1_0_gir_MSVC_C_INCLUDES = (List of public C headers which need to be included by
-#                                      consumers at compile time to make use of the API)
-
-# Private functions
-
-## Transform the MSVC project filename (no filename extensions) to something which can reference through a variable
-## without automake/make complaining, eg Gtk-2.0 -> Gtk_2_0
-_gir_name=$(subst /,_,$(subst -,_,$(subst .,_,$(1))))
-
-# Namespace and Version is either fetched from the gir filename
-# or the _NAMESPACE/_VERSION variable combo
-_gir_namespace_msvc = $(or $($(_gir_name)_NAMESPACE),$(firstword $(subst -, ,$(notdir $(1)))))
-_gir_version_msvc = $(or $($(_gir_name)_VERSION),$(lastword $(subst -, ,$(1:.gir=))))
-_typelib_basename_msvc = $(_gir_namespace_msvc)'-'$(_gir_version_msvc)
-
-# _PROGRAM is an optional variable which needs its own --program argument
-_gir_program_msvc = $(if $($(_gir_name)_MSVC_PROGRAM),--program=$($(_gir_name)_MSVC_PROGRAM))
-
-# Deduce the sub-folder from $(srcroot) where the sources reside in
-_gir_source_path_raw_msvc:=$(subst $(abs_top_srcdir),,$(abs_srcdir))
-_gir_source_path_msvc=$(subst /,\\,$(_gir_source_path_raw_msvc))
-_gir_source_subdir_int_msvc=$(subst \\\\,\\,\\$(_gir_source_path_msvc)\\)
-_gir_source_subdir_msvc=$(subst \\.\\,\\,$(_gir_source_subdir_int_msvc))
-
-_gir_files_raw_msvc=$(subst /,\\,$($(_gir_name)_MSVC_FILES))
-_gir_files_msvc=$(subst $(srcdir)\\,,$(subst $(builddir)\\,,$(subst $(top_builddir)\\$(_gir_source_path_msvc)\\,\\,$(_gir_files_raw_msvc))))
-
-# Create a list of items for:
-# - Libraries
-# - Packages
-# - GIRs to include
-# - packages to export
-
-_gir_libraries_msvc = $(foreach lib,$($(_gir_name)_MSVC_LIBS),--library=$(lib))
-_gir_packages_msvc = $(foreach pkg,$($(_gir_name)_MSVC_PACKAGES),--pkg=$(pkg))
-_gir_includes_msvc = $(foreach include,$($(_gir_name)_MSVC_INCLUDE_GIRS),--include=$(include))
-_gir_export_packages_msvc = $(foreach pkg,$($(_gir_name)_MSVC_EXPORT_PACKAGES),--pkg-export=$(pkg))
-_gir_c_includes_msvc = $(foreach include,$($(_gir_name)_MSVC_C_INCLUDES),--c-include=$(include))
-
-#
-# Create NMake Makefile Sections for Building Introspection files
-# from autotools files
-# $(1) - File Name of the .gir that is to be generated
-#
-
-define gir-nmake-builder
-
-# Basic sanity check, to make sure required variables are set
-$(if $($(_gir_name)_MSVC_FILES),,$(error Need to define $(_gir_name)_MSVC_FILES))
-$(if $(or $(findstring --header-only,$($(_gir_name)_MSVC_SCANNERFLAGS)),
-          $($(_gir_name)_MSVC_LIBS),
-          $($(_gir_name)_MSVC_PROGRAM)),,
-    $(error Need to define $(_gir_name)_MSVC_LIBS or $(_gir_name)_MSVC_PROGRAM))
-
-$(top_builddir)/win32/$(_gir_name)_list:
-	for F in $(_gir_files_msvc); do \
-		case $$$$F in \
-		*.c|*.cpp|*.cc|*.cxx|*.h|*.hpp|*.hh|*.hxx) \
-			echo '..'$(_gir_source_subdir_msvc)$$$$F >>$(top_builddir)/win32/$(_gir_name)_list \
-			;; \
-		esac; \
-	done
-
-$(top_builddir)/win32/$(1).msvc.introspect:
-	-$(RM) $(top_builddir)/win32/$(1).msvc.introspect
-
-# Assemble the Command to Run g-ir-scanner
-	echo $(1)': '$(_gir_name)'_list '$($(_gir_name)_MSVC_GIR_DEPS)>>$(top_builddir)/win32/$(1).msvc.introspect
-	echo '	@-echo Generating $$$$@...'>>$(top_builddir)/win32/$(1).msvc.introspect
-	echo '	$$$$(PYTHON) $$$$(G_IR_SCANNER)	\'>>$(top_builddir)/win32/$(1).msvc.introspect
-	echo '	--verbose -no-libtool	\'>>$(top_builddir)/win32/$(1).msvc.introspect
-	echo '	--namespace='$(_gir_namespace_msvc)'	\'>>$(top_builddir)/win32/$(1).msvc.introspect
-	echo '	--nsversion='$(_gir_version_msvc)'	\'>>$(top_builddir)/win32/$(1).msvc.introspect
-	echo '	'$(_gir_packages_msvc)'	\'>>$(top_builddir)/win32/$(1).msvc.introspect
-	echo '	'$(_gir_libraries_msvc)'	\'>>$(top_builddir)/win32/$(1).msvc.introspect
-	echo '	'$(_gir_program_msvc)'	\'>>$(top_builddir)/win32/$(1).msvc.introspect
-	echo '	--add-include-path=$$$$(G_IR_INCLUDEDIR)	\'>>$(top_builddir)/win32/$(1).msvc.introspect
-	echo '	'$(_gir_includes_msvc)'	\'>>$(top_builddir)/win32/$(1).msvc.introspect
-	echo '	'$(_gir_export_packages_msvc)'	\'>>$(top_builddir)/win32/$(1).msvc.introspect
-	echo '  '$(_gir_c_includes_msvc)'	\'>>$(top_builddir)/win32/$(1).msvc.introspect
-	echo '	--cflags-begin	\'>>$(top_builddir)/win32/$(1).msvc.introspect
-	echo '	'$($(_gir_name)_MSVC_CFLAGS)'	\'>>$(top_builddir)/win32/$(1).msvc.introspect
-	echo '	--cflags-end	\'>>$(top_builddir)/win32/$(1).msvc.introspect
-	echo '	'$($(_gir_name)_MSVC_SCANNERFLAGS)'	\'>>$(top_builddir)/win32/$(1).msvc.introspect
-	echo '	--filelist='$(_gir_name)'_list	\'>>$(top_builddir)/win32/$(1).msvc.introspect
-	echo '	-o $$$$@'>>$(top_builddir)/win32/$(1).msvc.introspect
-	echo '' >>$(top_builddir)/win32/$(1).msvc.introspect
-
-# Finally Assemble the Command to Compile the generated .gir
-	echo '$(_typelib_basename_msvc).typelib: '$(_typelib_basename_msvc)'.gir'>>$(top_builddir)/win32/$(1).msvc.introspect
-	echo '	@-echo Compiling $$$$@...'>>$(top_builddir)/win32/$(1).msvc.introspect
-	echo '	$$$$(G_IR_COMPILER)	\'>>$(top_builddir)/win32/$(1).msvc.introspect
-	echo '	--includedir=. --debug --verbose	\'>>$(top_builddir)/win32/$(1).msvc.introspect
-	echo '	'$(1)'	\'>>$(top_builddir)/win32/$(1).msvc.introspect
-	echo '	-o $$$$@'>>$(top_builddir)/win32/$(1).msvc.introspect
-	echo '' >>$(top_builddir)/win32/$(1).msvc.introspect
-endef
-
-$(foreach gir,$(MSVC_INTROSPECT_GIRS),$(eval $(call gir-nmake-builder,$(gir))))
diff --git a/win32/Makefile.msvcproj b/win32/Makefile.msvcproj
deleted file mode 100644
index 2e96e12b..00000000
--- 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/Makefile.vc b/win32/Makefile.vc
new file mode 100644
index 00000000..a2bc5c6c
--- /dev/null
+++ b/win32/Makefile.vc
@@ -0,0 +1,70 @@
+# NMake Makefile for building librsvg on Windows
+
+# The items below this line should not be changed, unless one is maintaining
+# the NMake Makefiles.  Customizations can be done in the following NMake Makefile
+# portions (please see comments in the these files to see what can be customized):
+#
+# detectenv-msvc.mak
+# config-msvc.mak
+!include detectenv-msvc.mak
+
+# Include the Makefile portions with the source listings
+!include ..\rsvg-c-srcs.mk
+
+# Include the Makefile portion that enables features based on user input
+!include config-msvc.mak
+
+!ifdef INTROSPECTION
+!include introspection-msvc.mak
+!endif
+
+!if "$(VALID_CFGSET)" == "TRUE"
+
+# We need Visual Studio 2013 or later
+!if $(VCVERSION) < 1800
+VALID_MSC = FALSE
+!else
+VALID_MSC = TRUE
+!endif
+
+!if "$(VALID_MSC)" == "TRUE"
+
+# Include the Makefile portion to convert the source and header lists
+# into the lists we need for compilation and introspection
+
+all: $(RSVG_TOOLS) $(RSVG_EXTRA_TOOLS) $(EXTRA_TARGETS) build-info-librsvg
+
+# Include the build rules for Rust builds, sources, DLLs and executables
+!include rsvg-rust.mak
+!include create-lists-msvc.mak
+!include build-rules-msvc.mak
+
+tests: all $(rsvg_tests)
+	@set PATH=$(BINDIR);$(PATH)
+	set G_TEST_SRCDIR=$(MAKEDIR)\..\tests
+	@for %%x in ($(rsvg_tests)) do %%x
+
+# Include the rules for build directory creation and code generation
+!include generate-msvc.mak
+
+# Generate the introspection files
+
+!if "$(INTROSPECTION)" == "1"
+# Include the rules for building the introspection files
+!include introspection-msvc.mak
+!endif
+
+!include install-msvc.mak
+
+!else # "$(VALID_MSC)" == "TRUE"
+all:
+	@echo You need Visual Studio 2013 or later.
+
+!endif # "$(VALID_MSC)" == "TRUE"
+
+!else # "$(VALID_CFGSET)" == "TRUE"
+all: help
+	@echo You need to specify a valid configuration, via CFG=release or CFG=debug
+!endif # "$(VALID_CFGSET)" == "TRUE"
+
+!include info-msvc.mak
diff --git a/win32/README.txt b/win32/README.txt
new file mode 100644
index 00000000..cc31bba5
--- /dev/null
+++ b/win32/README.txt
@@ -0,0 +1,107 @@
+Please do not compile librsvg in a path with spaces to avoid potential

+problems during the build and/or during the usage of the librsvg

+library.

+

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

+instructions on building librsvg and its dependencies with Visual C++:

+

+https://live.gnome.org/GTK%2B/Win32/MSVCCompilationOfGTKStack

+

+This set of NMake Makefiles is intended to be used in a librsvg source tree

+unpacked from a tarball.  For building, you will need the following libraries

+(headers, .lib's, DLLs, EXEs and scripts), with all of their dependencies:

+

+-libxml2

+-GLib

+-Cairo (The included cairo-gobject integration library is also needed)

+-libcroco

+-Pango

+-Gdk-Pixbuf

+-GTK+3.x (optional, for building rsvg-view-3.exe)

+-GObject-Introspection (optional, for building/using introspection files)

+

+

+You will also need the following tools:

+-Visual Studio 2013 or later, with C/C++ compilation support (MSVC).

+-The Rust Compiler and tools with the msvc toolchain(s) installed, that

+ matches the architecture that is being built.  It is recommended to use the

+ 'rustup' tool from https://www.rust-lang.org/ to install and configure

+ Rust, which will install Rust in %HOMEPATH%\.cargo by default.

+-Python (optional, recommended, to generate the pkg-config files and

+ build the introspection files; if building the introspection files, the

+ Python installation must match the version, architecture and configuration

+ of the Python installation that was used to build your copy of

+ GObject-Introspection).

+-For introspection builds, the pkg-config (or compatible) tool is also needed

+ and the introspection files and pkg-config files for the dependent libraries

+ (if applicable) are also needed.  You will need to set PKG_CONFIG_PATH

+ if the pkg-config files cannot be found from the default locations that

+ pkg-config will look for.

+

+It is recommended that the dependent libraries are built with the same version

+of Visual Studio that is being used to build librsvg, as far as possible.

+

+If building from a git checkout is desired, you will need to open the following

+*.in files, and replace any items that are surrounded by the '@' characters,

+and save those files without the .in file extension:

+

+(open file)                           -> (save as file)

+===========                              ==============

+config-msvc.mak.in                    -> config-msvc.mak

+config.h.win32.in                     -> config.h.win32

+$(srcroot)\librsvg\rsvg-features.h.in -> $(srcroot)\librsvg\rsvg-features.h

+

+From this directory in a Visual Studio command prompt, run the following:

+

+ nmake /f Makefile.vc CFG=<CFG> <target> <path_options> <other_options>

+

+Where:

+<CFG> is the build configuration, i.e. release or debug.  This is mandatory

+for all targets.

+

+<target> is as follows:

+-(not specified): builds the librsvg DLL and tools and GDK-Pixbuf SVG loader.

+                  If `NO_GTK=1` is not specified, this will build the rsvg-view-3.exe

+                  tool; and if `INTROSPECTION=1` is specified, this will also build

+                  the introspection files (.gir/.typelib) for librsvg.

+-all: see (not specified).

+-tests: Same as (not specified) but also builds the test programs in $(srcroot)\tests

+-clean: Removes all build files

+-install: Same as (not specified) and also copies the built DLLs, .lib's, headers,

+          tools and possibly introspection files to appropriate locations under

+          $(PREFIX).  This will also create and copy the librsvg-2.0.pc pkg-config

+          file if Python can be found.

+

+<path_options> is as follows:

+-PREFIX: Root directory where built files will be copied to with the 'install' target.

+         This also determines the root directory from which the dependent headers,

+         .lib's and DLLs/.typelib's/.gir's are looked for, if INCLUDEDIR, LIBDIR and/or

+         BINDIR are not respectively specified.  Default is

+         $(srcroot)\..\vs<vs_short_ver>\<arch>, where vs_short_ver is 12 for Visual

+         Studio 2013, 14 for VS 2015, 15 for VS 2017 and 16 for VS 2019.

+-INCLUDEDIR: Base directory where headers are looked for, which is PREFIX\include by

+             default.  Note that GLib headers are looked for in INCLUDEDIR\glib-2.0

+             and LIBDIR\glib-2.0\include.

+-LIBDIR: Base directory where .lib's and arch-dependent headers are looked for, which

+         is PREFIX\lib by default.

+-BINDIR: Base directory where dependent DLLs and tools (.exe's and scripts) are looked

+         for, which is PREFIX\bin by default.  Note that for introspection builds,

+         this means the introspection Python scripts and modules are in

+         BINDIR\..\lib\gobject-introspection and the dependent introspection files are

+         looked for in BINDIR\..\share\gir-1.0 and BINDIR\..\lib\girepository-1.0

+         respectively for .gir files and .typelib files.

+-PYTHON: Path to your Python interpreter executable, if not already in your %PATH% or

+         using a different installation of Python is desired.  Please see note above

+         on Python usage.  If Python cannot be found, you will not be able to build

+         introspection files and the librsvg-2.0.pc pkg-config file will not be

+         generated using the 'install' build target.

+-PKG_CONFIG: Path to your pkg-config (or compatible) tool, if not already in your

+             %PATH%.  This is required for introspection builds.

+

+<other_options> is as follows, activate the options using <option>=1:

+-INTROSPECTION: Build the introspection files.  Please see notes above.

+-NO_GTK: Do not build the rsvg-view-3 tool.  This removes the need for GTK+3.x.

+-USE_PANGOFT2: Build the test programs with PangoFT2 support, which will enable

+               more features to be tested.  This will additionally require Pango

+               built with FreeType support, meaning that HarfBuzz, FontConfig and

+               FreeType will also be required for the test programs to run.

diff --git a/win32/build-rules-msvc.mak b/win32/build-rules-msvc.mak
new file mode 100644
index 00000000..8c110fe3
--- /dev/null
+++ b/win32/build-rules-msvc.mak
@@ -0,0 +1,169 @@
+# NMake Makefile portion for compilation rules
+# Items in here should not need to be edited unless
+# one is maintaining the NMake build files.  The format
+# of NMake Makefiles here are different from the GNU
+# Makefiles.  Please see the comments about these formats.
+
+# Inference rules for compiling the .obj files.
+# Used for libs and programs with more than a single source file.
+# Format is as follows
+# (all dirs must have a trailing '\'):
+#
+# {$(srcdir)}.$(srcext){$(destdir)}.obj::
+# 	$(CC)|$(CXX) $(cflags) /Fo$(destdir) /c @<<
+# $<
+# <<
+{..\librsvg\}.c{$(OUTDIR)\librsvg\}.obj:
+	@if not exist $(@D) $(MAKE) /f Makefile.vc CFG=$(CFG) $(@D)
+	$(CC) $(LIBRSVG_CFLAGS) $(LIBRSVG_INCLUDES) /Fo$(@D)\ /Fd$(@D)\ /c @<<
+$<
+<<
+
+{..\gdk-pixbuf-loader\}.c{$(OUTDIR)\rsvg-gdk-pixbuf-loader\}.obj:
+	@if not exist $(@D) $(MAKE) /f Makefile.vc CFG=$(CFG) $(@D)
+	$(CC) $(RSVG_PIXBUF_LOADER_CFLAGS) $(TOOLS_DEP_INCLUDES) /Fo$(@D)\ /Fd$(@D)\ /c @<<
+$<
+<<
+
+{..\}.c{$(OUTDIR)\rsvg-tools\}.obj:
+	@if not exist $(@D) $(MAKE) /f Makefile.vc CFG=$(CFG) $(@D)
+	$(CC) $(BASE_CFLAGS) $(TOOLS_DEP_INCLUDES) /Fo$(@D)\ /Fd$(@D)\ /c @<<
+$<
+<<
+
+{..\tools\}.c{$(OUTDIR)\rsvg-tools\}.obj:
+	@if not exist $(@D) $(MAKE) /f Makefile.vc CFG=$(CFG) $(@D)
+	$(CC) $(BASE_CFLAGS) $(LIBRSVG_LOG_DOMAIN) $(TOOLS_DEP_INCLUDES) /Fo$(@D)\ /Fd$(@D)\ /c @<<
+$<
+<<
+
+{..\tests\}.c{$(OUTDIR)\rsvg-tests\}.obj:
+	@if not exist $(@D) $(MAKE) /f Makefile.vc CFG=$(CFG) $(@D)
+	$(CC) $(TEST_CFLAGS) $(LIBRSVG_LOG_DOMAIN) $(TOOLS_DEP_INCLUDES) /Fo$(@D)\ /Fd$(@D)\ /c @<<
+$<
+<<
+
+# Rules for building .lib files
+$(LIBRSVG_LIB): $(LIBRSVG_DLL)
+
+# Rules for linking DLLs
+# Format is as follows (the mt command is needed for MSVC 2005/2008 builds):
+# $(dll_name_with_path): $(dependent_libs_files_objects_and_items)
+#	link /DLL [$(linker_flags)] [$(dependent_libs)] [/def:$(def_file_if_used)] [/implib:$(lib_name_if_needed)] -out:$@ @<<
+# $(dependent_objects)
+# <<
+# 	@-if exist $@.manifest mt /manifest $@.manifest /outputresource:$@;2
+$(LIBRSVG_DLL):	\
+$(RSVG_INTERNAL_LIB)		\
+$(OUTDIR)\librsvg\rsvg.def	\
+$(OUTDIR)\librsvg\config.h	\
+$(librsvg_OBJS)
+	link /DLL $(LDFLAGS) 	\
+	$(LIBRSVG_DEP_LIBS)	\
+	/def:$(OUTDIR)\librsvg\rsvg.def	\
+	/implib:$(LIBRSVG_LIB)	\
+	-out:$@ @<<
+$(librsvg_OBJS)
+<<
+	@-if exist $@.manifest mt /manifest $@.manifest /outputresource:$@;2
+
+$(GDK_PIXBUF_SVG_LOADER): $(LIBRSVG_LIB) $(OUTDIR)\rsvg-gdk-pixbuf-loader\io-svg.obj
+	link /DLL $(LDFLAGS) $** $(BASE_DEP_LIBS) /out:$@
+	@-if exist $@.manifest mt /manifest $@.manifest /outputresource:$@;2
+
+# Rules for linking Executables
+# Format is as follows (the mt command is needed for MSVC 2005/2008 builds):
+# $(dll_name_with_path): $(dependent_libs_files_objects_and_items)
+#	link [$(linker_flags)] [$(dependent_libs)] -out:$@ @<<
+# $(dependent_objects)
+# <<
+# 	@-if exist $@.manifest mt /manifest $@.manifest /outputresource:$@;1
+$(OUTDIR)\rsvg-convert.exe: $(LIBRSVG_LIB) $(OUTDIR)\rsvg-tools\rsvg-convert.obj
+$(OUTDIR)\rsvg-view-3.exe: $(LIBRSVG_LIB) $(OUTDIR)\rsvg-tools\rsvg-view.obj
+
+$(OUTDIR)\rsvg-dimensions.exe:	\
+	$(LIBRSVG_LIB)	\
+	$(OUTDIR)\rsvg-tools\rsvg-dimensions.obj	\
+	$(OUTDIR)\rsvg-tools\rsvg-tools-main.obj
+
+$(OUTDIR)\test-performance.exe:	\
+	$(LIBRSVG_LIB)	\
+	$(OUTDIR)\rsvg-tools\test-performance.obj	\
+	$(OUTDIR)\rsvg-tools\rsvg-tools-main.obj
+
+$(OUTDIR)\rsvg-convert.exe	\
+$(OUTDIR)\rsvg-view-3.exe	\
+$(OUTDIR)\rsvg-dimensions.exe	\
+$(OUTDIR)\test-performance.exe:
+	link $(LDFLAGS) $** $(TOOLS_DEP_LIBS) /out:$@
+	@-if exist $@.manifest mt /manifest $@.manifest /outputresource:$@;1
+
+# Include the rules for the test programs
+!include rsvg_tests_rules.mak
+
+!if [del /f /q rsvg_tests_rules.mak]
+!endif
+
+$(rsvg_tests):
+	link $(LDFLAGS) $** $(TEST_DEP_LIBS) /out:$@
+	@-if exist $@.manifest mt /manifest $@.manifest /outputresource:$@;1
+
+!ifdef INTROSPECTION
+$(OUTDIR)\Rsvg-$(RSVG_API_VER).gir: $(LIBRSVG_LIB) $(OUTDIR)\librsvg\Rsvg_2_0_gir_list
+	@-echo Generating $@...
+	@set PATH=$(BINDIR);$(PATH)
+	$(PYTHON) $(G_IR_SCANNER)	\
+	--verbose -no-libtool	\
+	--namespace=Rsvg	\
+	--nsversion=2.0	\
+	--pkg=pango --extra-library=libxml2	\
+	--library=rsvg-2.0	\
+	--add-include-path=$(G_IR_INCLUDEDIR)	\
+	--include=GLib-2.0 --include=GObject-2.0	\
+	--include=Gio-2.0 --include=cairo-1.0	\
+	--include=GdkPixbuf-2.0	\
+	--pkg-export=librsvg-2.0	\
+	--cflags-begin	\
+	$(LIBRSVG_INCLUDES:/I=-I) -DRSVG_COMPILATION	\
+	$(EXTRA_BASE_CFLAGS:/=-)	\
+	--cflags-end	\
+	--c-include=librsvg/rsvg.h	\
+	--filelist=$(OUTDIR)\librsvg\Rsvg_2_0_gir_list	\
+	-L.\$(OUTDIR) -L$(LIBDIR) -L$(BINDIR)	\
+	-o $@
+
+$(OUTDIR)\Rsvg-2.0.typelib: $(OUTDIR)\Rsvg-2.0.gir
+	@-echo Compiling $@...
+	$(G_IR_COMPILER)	\
+	--includedir=. --includedir=$(G_IR_TYPELIBDIR) --debug --verbose	\
+	$(@D:\=/)/$(@B).gir	\
+	-o $@
+!endif
+
+clean:
+	@if exist $(OUTDIR)\Rsvg-$(RSVG_API_VER).typelib del /f /q $(OUTDIR)\Rsvg-$(RSVG_API_VER).typelib
+	@if exist $(OUTDIR)\Rsvg-$(RSVG_API_VER).gir del /f /q $(OUTDIR)\Rsvg-$(RSVG_API_VER).gir
+	@-del /f /q $(OUTDIR)\*.dll
+	@-del /f /q $(OUTDIR)\*.exe
+	@-del /f /q $(OUTDIR)\*.dll
+	@-del /f /q $(OUTDIR)\*.pdb
+	@-del /f /q $(OUTDIR)\*.ilk
+	@-del /f /q $(OUTDIR)\*.exp
+	@-del /f /q $(OUTDIR)\*.lib
+	@-del /s /q $(OUTDIR)\rsvg-tests\*.obj
+	@-del /s /q $(OUTDIR)\rsvg-tests\*.pdb
+	@-del /s /q $(OUTDIR)\rsvg-tools\*.obj
+	@-del /s /q $(OUTDIR)\rsvg-tools\*.pdb
+	@-del /s /q $(OUTDIR)\rsvg-gdk-pixbuf-loader\*.obj
+	@-del /s /q $(OUTDIR)\rsvg-gdk-pixbuf-loader\*.pdb
+	@-del /s /q $(OUTDIR)\rsvg-tools\*.pdb
+	@-del /s /q $(OUTDIR)\librsvg\Rsvg_2_0_gir_list
+	@-del /s /q $(OUTDIR)\librsvg\*.obj
+	@-del /s /q $(OUTDIR)\librsvg\*.pdb
+	@-rmdir /s /q $(OUTDIR)\output
+	@-rmdir /s /q $(OUTDIR)\rsvg-tests
+	@-rmdir /s /q $(OUTDIR)\rsvg-tools
+	@-rmdir /s /q $(OUTDIR)\rsvg-gdk-pixbuf-loader
+	@-rmdir /s /q $(OUTDIR)\librsvg
+	$(MAKE) /f rsvg-rust.mak CFG=$(CFG) cargo-clean
+	@-rmdir /s /q $(OUTDIR)\obj
diff --git a/win32/config-msvc.mak.in b/win32/config-msvc.mak.in
new file mode 100644
index 00000000..54d11d63
--- /dev/null
+++ b/win32/config-msvc.mak.in
@@ -0,0 +1,156 @@
+# NMake Makefile portion for enabling features for Windows builds
+
+# Please do not change anything beneath this line unless maintaining the NMake Makefiles
+OUTDIR = vs$(VSVER)\$(CFG)\$(PLAT)
+RSVG_VER = 2
+RSVG_API_VER = $(RSVG_VER).0
+CHECK_GIR_PACKAGE = gdk-pixbuf-2.0
+RSVG_PKG_VERSION = @LIBRSVG_MAJOR_VERSION@.@LIBRSVG_MINOR_VERSION@.@LIBRSVG_MICRO_VERSION@
+
+
+# Make bin, include and library directories of configurable
+!ifndef BINDIR
+BINDIR=$(PREFIX)\bin
+!endif
+
+!ifndef LIBDIR
+LIBDIR=$(PREFIX)\lib
+!endif
+
+!ifndef INCLUDEDIR
+INCLUDEDIR=$(PREFIX)\include
+!endif
+
+LDFLAGS = $(LDFLAGS) /libpath:$(LIBDIR)
+
+# These are the base minimum libraries required for building librsvg.
+
+# Visual Studio 2015 and later supports the /utf-8 compiler flag
+# that prevents C4819 warnings/errors on non-Western locales
+!if $(VSVER) > 12
+EXTRA_BASE_CFLAGS = /utf-8
+!else
+EXTRA_BASE_CFLAGS =
+!endif
+
+BASE_CFLAGS =				\
+	$(CFLAGS_ADD)			\
+	/DHAVE_CONFIG_H			\
+	/FImsvc_recommended_pragmas.h	\
+	$(EXTRA_BASE_CFLAGS)
+
+BASE_DEP_INCLUDES =			\
+	/I$(INCLUDEDIR)\gdk-pixbuf-2.0	\
+	/I$(INCLUDEDIR)\gio-win32-2.0	\
+	/I$(INCLUDEDIR)\glib-2.0	\
+	/I$(LIBDIR)\glib-2.0\include	\
+	/I$(INCLUDEDIR)
+
+BASE_DEP_LIBS =			\
+	gdk_pixbuf-2.0.lib	\
+	gio-2.0.lib		\
+	gobject-2.0.lib		\
+	glib-2.0.lib		\
+	cairo.lib		\
+	intl.lib
+
+LIBRSVG_LOG_DOMAIN = /DG_LOG_DOMAIN=\"librsvg\"
+
+LIBRSVG_CFLAGS =				\
+	$(BASE_CFLAGS)				\
+	$(LIBRSVG_LOG_DOMAIN)			\
+	/DRSVG_DISABLE_DEPRECATION_WARNINGS	\
+	/DRSVG_COMPILATION
+
+LIBRSVG_INCLUDES =			\
+	/I..				\
+	/I.\$(OUTDIR)\librsvg		\
+	/I$(INCLUDEDIR)\pango-1.0	\
+	/I$(INCLUDEDIR)\libcroco-0.6	\
+	$(BASE_DEP_INCLUDES)		\
+	/I$(INCLUDEDIR)\libxml2
+
+TEST_CFLAGS = $(BASE_CFLAGS)
+TEST_DEP_LIBS = $(TOOLS_DEP_LIBS)
+
+# Use PangoFT2 (for tests only)
+!ifdef USE_PANGOFT2
+TEST_CFLAGS =		\
+	$(TEST_CFLAGS)	\
+	/DHAVE_PANGOFT2
+
+TEST_DEP_LIBS =	\
+	$(TEST_DEP_LIBS)	\
+	pangoft2-1.0.lib	\
+	fontconfig.lib
+!endif
+
+RSVG_INTERNAL_LIB = $(OUTDIR)\obj\rsvg_internals\$(RUST_TARGET)-pc-windows-msvc\$(CFG)\rsvg_internals.lib
+
+LIBRSVG_DEP_LIBS =			\
+	$(RSVG_INTERNAL_LIB)		\
+	pangocairo-1.0.lib		\
+	$(LIBRSVG_EXTRA_DEP_LIBS)	\
+	pango-1.0.lib			\
+	cairo-gobject.lib		\
+	croco-0.6.lib			\
+	$(BASE_DEP_LIBS)		\
+	libxml2.lib			\
+	advapi32.lib			\
+	userenv.lib			\
+	ws2_32.lib
+
+RSVG_PIXBUF_LOADER_CFLAGS =			\
+	$(BASE_CFLAGS)				\
+	/DGDK_PIXBUF_ENABLE_BACKEND		\
+	/DG_LOG_DOMAIN=\"libpixbufloader-svg\"
+
+!if "$(LIBTOOL_DLL_NAME)" == "1"
+LIBRSVG_DLL_FILENAME = $(OUTDIR)\librsvg-$(RSVG_API_VER)-0
+!else
+LIBRSVG_DLL_FILENAME = $(OUTDIR)\rsvg-$(RSVG_API_VER)-vs$(VSVER)
+!endif
+
+LIBRSVG_DLL = $(LIBRSVG_DLL_FILENAME).dll
+LIBRSVG_LIB = $(OUTDIR)\rsvg-$(RSVG_API_VER).lib
+
+GDK_PIXBUF_SVG_LOADER = $(OUTDIR)\libpixbufloader-svg.dll
+
+TOOLS_DEP_INCLUDES =		\
+	/I..			\
+	/I.\$(OUTDIR)\librsvg	\
+	$(BASE_DEP_INCLUDES)
+
+TOOLS_DEP_LIBS = $(BASE_DEP_LIBS)
+
+RSVG_TOOLS = $(OUTDIR)\rsvg-convert.exe
+
+RSVG_EXTRA_TOOLS =			\
+	$(OUTDIR)\rsvg-dimensions.exe	\
+	$(OUTDIR)\test-performance.exe
+
+# Build rsvg-view-3, which requires GTK
+!ifndef NO_GTK
+RSVG_TOOLS =				\
+	$(RSVG_TOOLS)			\
+	$(OUTDIR)\rsvg-view-3.exe
+
+TOOLS_DEP_INCLUDES =			\
+	/I$(INCLUDEDIR)\gtk-3.0		\
+	/I$(INCLUDEDIR)\pango-1.0	\
+	/I$(INCLUDEDIR)\atk-1.0		\
+	$(TOOLS_DEP_INCLUDES)
+
+TOOLS_DEP_LIBS =		\
+	gtk-3.0.lib		\
+	gdk-3.0.lib		\
+	$(TOOLS_DEP_LIBS)
+!endif
+
+# Build Introspection if requested
+EXTRA_TARGETS = $(GDK_PIXBUF_SVG_LOADER)
+!ifdef INTROSPECTION
+EXTRA_TARGETS =				\
+	$(EXTRA_TARGETS)		\
+	$(OUTDIR)\Rsvg-2.0.typelib
+!endif
diff --git a/config.h.win32.in b/win32/config.h.win32.in
index 2dce7ddd..2dce7ddd 100644
--- a/config.h.win32.in
+++ b/win32/config.h.win32.in
diff --git a/win32/create-lists-msvc.mak b/win32/create-lists-msvc.mak
new file mode 100644
index 00000000..06541a84
--- /dev/null
+++ b/win32/create-lists-msvc.mak
@@ -0,0 +1,89 @@
+# Convert the source listing to object (.obj) listing in
+# another NMake Makefile module, include it, and clean it up.
+# This is a "fact-of-life" regarding NMake Makefiles...
+# This file does not need to be changed unless one is maintaining the NMake Makefiles
+
+# For those wanting to add things here:
+# To add a list, do the following:
+# # $(description_of_list)
+# if [call create-lists.bat header $(makefile_snippet_file) $(variable_name)]
+# endif
+#
+# if [call create-lists.bat file $(makefile_snippet_file) $(file_name)]
+# endif
+#
+# if [call create-lists.bat footer $(makefile_snippet_file)]
+# endif
+# ... (repeat the if [call ...] lines in the above order if needed)
+# !include $(makefile_snippet_file)
+#
+# (add the following after checking the entries in $(makefile_snippet_file) is correct)
+# (the batch script appends to $(makefile_snippet_file), you will need to clear the file unless the following line is added)
+#!if [del /f /q $(makefile_snippet_file)]
+#!endif
+
+# In order to obtain the .obj filename that is needed for NMake Makefiles to build DLLs/static LIBs or EXEs, do the following
+# instead when doing 'if [call create-lists.bat file $(makefile_snippet_file) $(file_name)]'
+# (repeat if there are multiple $(srcext)'s in $(source_list), ignore any headers):
+# !if [for %c in ($(source_list)) do @if "%~xc" == ".$(srcext)" @call create-lists.bat file $(makefile_snippet_file) $(intdir)\%~nc.obj]
+#
+# $(intdir)\%~nc.obj needs to correspond to the rules added in build-rules-msvc.mak
+# %~xc gives the file extension of a given file, %c in this case, so if %c is a.cc, %~xc means .cc
+# %~nc gives the file name of a given file without extension, %c in this case, so if %c is a.cc, %~nc means a
+
+NULL=
+
+# For librsvg
+
+!if [call create-lists.bat header rsvg_objs.mak librsvg_real_SRCS]
+!endif
+
+!if [for %s in ($(librsvg_c_srcs:/=\)) do @call create-lists.bat file rsvg_objs.mak ..\%s]
+!endif
+
+!if [call create-lists.bat footer rsvg_objs.mak]
+!endif
+
+!if [call create-lists.bat header rsvg_objs.mak librsvg_real_pub_HDRS]
+!endif
+
+!if [for %s in ($(headers:/=\)) do @call create-lists.bat file rsvg_objs.mak ..\%s]
+!endif
+
+!if [call create-lists.bat footer rsvg_objs.mak]
+!endif
+
+!if [call create-lists.bat header rsvg_objs.mak librsvg_real_extra_pub_HDRS]
+!endif
+
+!if [for %s in ($(extra_inc_headers:/=\)) do @call create-lists.bat file rsvg_objs.mak ..\%s]
+!endif
+
+!if [call create-lists.bat footer rsvg_objs.mak]
+!endif
+
+!if [call create-lists.bat header rsvg_objs.mak librsvg_OBJS]
+!endif
+
+!if [for %c in ($(librsvg_c_srcs:/=\)) do @if "%~xc" == ".c" @call create-lists.bat file rsvg_objs.mak ^$(OUTDIR)\librsvg\%~nc.obj]
+!endif
+
+!if [call create-lists.bat footer rsvg_objs.mak]
+!endif
+
+!if [call create-lists.bat header rsvg_objs.mak rsvg_tests]
+!endif
+
+!if [for %c in (..\tests\*.c) do @if not "%~nxc" == "test-utils.c" call create-lists.bat file rsvg_objs.mak ^$(OUTDIR)\%~nc.exe]
+!endif
+
+!if [call create-lists.bat footer rsvg_objs.mak]
+!endif
+
+!if [for %c in (..\tests\*.c) do @if not "%~nxc" == "test-utils.c" @echo ^$(OUTDIR)\%~nc.exe: ^$(LIBRSVG_LIB) ^$(OUTDIR)\rsvg-tests\%~nc.obj ^$(OUTDIR)\rsvg-tests\test-utils.obj >>rsvg_tests_rules.mak]
+!endif
+
+!include rsvg_objs.mak
+
+!if [del /f /q rsvg_objs.mak]
+!endif
\ No newline at end of file
diff --git a/win32/create-lists.bat b/win32/create-lists.bat
new file mode 100644
index 00000000..ef60d5ce
--- /dev/null
+++ b/win32/create-lists.bat
@@ -0,0 +1,42 @@
+@echo off
+rem Simple .bat script for creating the NMake Makefile snippets.
+
+if not "%1" == "header" if not "%1" == "file" if not "%1" == "footer" goto :error_cmd
+if "%2" == "" goto error_no_destfile
+
+if "%1" == "header" goto :header
+if "%1" == "file" goto :addfile
+if "%1" == "footer" goto :footer
+
+:header
+if "%3" == "" goto error_var
+echo %3 =	\>>%2
+goto done
+
+:addfile
+if "%3" == "" goto error_file
+echo.	%3	\>>%2
+goto done
+
+:footer
+echo.	$(NULL)>>%2
+echo.>>%2
+goto done
+
+:error_cmd
+echo Specified command '%1' was invalid.  Valid commands are: header file footer.
+goto done
+
+:error_no_destfile
+echo Destination NMake snippet file must be specified
+goto done
+
+:error_var
+echo A name must be specified for using '%1'.
+goto done
+
+:error_file
+echo A file must be specified for using '%1'.
+goto done
+
+:done
\ No newline at end of file
diff --git a/win32/detectenv-msvc.mak b/win32/detectenv-msvc.mak
index 6fd96ccc..75462e2e 100644
--- a/win32/detectenv-msvc.mak
+++ b/win32/detectenv-msvc.mak
@@ -42,8 +42,10 @@ VSVER = 11
 VSVER = 12
 !elseif $(VCVERSION) > 1899 && $(VCVERSION) < 1910
 VSVER = 14
-!elseif $(VCVERSION) > 1909 && $(VCVERSION) < 2000
+!elseif $(VCVERSION) > 1909 && $(VCVERSION) < 1920
 VSVER = 15
+!elseif $(VCVERSION) > 1919 && $(VCVERSION) < 2000
+VSVER = 16
 !else
 VSVER = 0
 !endif
@@ -51,11 +53,15 @@ VSVER = 0
 !if "$(VSVER)" == "0"
 MSG = ^
 This NMake Makefile set supports Visual Studio^
-9 (2008) through 14 (2015).  Your Visual Studio^
+9 (2008) through 16 (2019).  Your Visual Studio^
 version is not supported.
 !error $(MSG)
 !endif
 
+!ifndef PREFIX
+PREFIX=..\..\vs$(VSVER)\$(PLAT)
+!endif
+
 VALID_CFGSET = FALSE
 !if "$(CFG)" == "release" || "$(CFG)" == "debug" || "$(CFG)" == "Release" || "$(CFG)" == "Debug"
 VALID_CFGSET = TRUE
@@ -63,16 +69,20 @@ VALID_CFGSET = TRUE
 
 # 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
+CFLAGS_BASE = /W3 /Zi
 
 !if "$(PLAT)" == "x64"
 LDFLAGS_ARCH = /machine:x64
 !else
 LDFLAGS_ARCH = /machine:x86
 !endif
+
+LDFLAGS_BASE = $(LDFLAGS_ARCH) /DEBUG
+
+!if "$(CFG)" == "release" || "$(CFG)" == "Release"
+CFLAGS_ADD = /MD /O2 /GL /MP /d2Zi+ $(CFLAGS_BASE)
+LDFLAGS = $(LDFLAGS_BASE) /LTCG /opt:ref
+!else
+CFLAGS_ADD = /MDd /Od $(CFLAGS_BASE)
+LDFLAGS = $(LDFLAGS_BASE)
+!endif
diff --git a/win32/generate-msvc.mak b/win32/generate-msvc.mak
new file mode 100644
index 00000000..b010e1df
--- /dev/null
+++ b/win32/generate-msvc.mak
@@ -0,0 +1,31 @@
+# NMake Makefile portion for code generation and
+# intermediate build directory creation
+# Items in here should not need to be edited unless
+# one is maintaining the NMake build files.
+
+# Copy the pre-defined config.h.win32
+$(OUTDIR)\librsvg\config.h: config.h.win32
+	@if not exist $(@D) $(MAKE) /f Makefile.vc CFG=$(CFG) $(@D)
+	@-copy $** $@
+
+# Create the build directories
+$(OUTDIR)\librsvg			\
+$(OUTDIR)\rsvg-gdk-pixbuf-loader	\
+$(OUTDIR)\rsvg-tools			\
+$(OUTDIR)\rsvg-tests:
+	@-mkdir $@
+
+# Generate the .def file
+$(OUTDIR)\librsvg\rsvg.def: ..\rsvg.symbols
+	@if not exist $(@D) $(MAKE) /f Makefile.vc CFG=$(CFG) $(@D)
+	@echo EXPORTS > $@
+	$(CPP) /EP $** >> $@
+
+# Generate listing file for introspection
+$(OUTDIR)\librsvg\Rsvg_2_0_gir_list:	\
+$(librsvg_real_pub_HDRS)		\
+$(librsvg_real_extra_pub_HDRS)		\
+$(librsvg_real_SRCS)
+	@if exist $@ del $@
+	@for %%s in ($(librsvg_real_pub_HDRS) $(librsvg_real_extra_pub_HDRS)) do echo %%s >> $@
+	@for %%s in ($(librsvg_real_SRCS)) do @if "%%~xs" == ".c" echo %%s >> $@
diff --git a/win32/info-msvc.mak b/win32/info-msvc.mak
new file mode 100644
index 00000000..59df98ad
--- /dev/null
+++ b/win32/info-msvc.mak
@@ -0,0 +1,104 @@
+# NMake Makefile portion for displaying config info
+
+!ifdef INTROSPECTION
+BUILD_INTROSPECTION = yes
+!else
+BUILD_INTROSPECTION = no
+!endif
+
+!if "$(CFG)" == "release" || "$(CFG)" == "Release"
+BUILD_TYPE = release
+!else
+BUILD_TYPE = debug
+!endif
+
+build-info-librsvg:
+	@echo.
+	@echo =========================
+	@echo Configuration for librsvg
+	@echo =========================
+	@echo Build Type: $(BUILD_TYPE)
+	@echo.
+	@echo Built Tools:
+	@for %%t in ($(RSVG_TOOLS:.exe=) $(RSVG_EXTRA_TOOLS:.exe=)) do @echo %%~nt
+	@echo.
+	@echo Introspection: $(BUILD_INTROSPECTION)
+
+help:
+	@echo.
+	@echo ============================
+	@echo Building librsvg Using NMake
+	@echo ============================
+	@echo nmake /f Makefile.vc CFG=[release^|debug] ^<PREFIX=PATH^> ... OPTION=1 ...
+	@echo.
+	@echo Where:
+	@echo ------
+	@echo CFG: Required, use CFG=release for an optimized build and CFG=debug
+	@echo for a debug build.  PDB files are generated for all builds.
+	@echo.
+	@echo PREFIX: Optional, the path where dependent libraries and tools may be
+	@echo found, default is ^$(srcrootdir)\..\vs^$(short_vs_ver)\^$(platform),
+	@echo where ^$(short_vs_ver) is 12 for VS 2013, 14 for VS 2015 and so on; and
+	@echo ^$(platform) is Win32 for 32-bit builds and x64 for x64 builds.
+	@echo.
+	@echo BINDIR: Optional, the path where dependent external DLL and executables
+	@echo may be found, default is ^$(PREFIX)\bin.  Note that for introspection
+	@echo builds, dependent .gir and .typelib files are searched first in
+	@echo $(BINDIR)\..\share\gir-1.0 and $(BINDIR)\..\lib\girepository-1.0.
+	@echo.
+	@echo LIBDIR: Optional, the path where dependent external .lib's may be found,
+	@echo default is ^$(PREFIX)\lib.  Note that for introspection builds, this
+	@echo influences that $(LIBDIR)\pkgconfig will be searched first for pkg-config
+	@echo files.
+	@echo.
+	@echo INCLUDEDIR: Optional, the base path where dependent external headers may
+	@echo be found, default is ^$(PREFIX)\include.  Note that headers for GLib, etc,
+	@echo will be searched for in ^$(INCLUDEDIR)\glib-2.0 and
+	@echo ^$(LIBDIR)\glib-2.0\include.
+	@echo.
+	@echo PKG_CONFIG_PATH: Full path to pkg-config.exe.  Required if building
+	@echo introspection files and if pkg-config.exe is not in your PATH or it
+	@echo is called something other than pkg-config.
+	@echo.
+	@echo PYTHON: Full path to your Python interpreter executable.  Required
+	@echo if building introspection files and if python.exe is not in your PATH.
+	@echo Note that it must be of the same configuration (x86/x64 and Debug/Release)
+	@echo and Python release series that was used to build GObject-Introspection
+	@echo if building introspection files is desired.  If using
+	@echo GObject-Introspection built with Meson, consult the shebang line in
+	@echo ^$(BINDIR)\g-ir-scanner for determining the correct Python interpreter.
+	@echo.
+	@echo OPTION: Optional, may be any of the following, use OPTION=1 to enable;
+	@echo multiple OPTION's may be used.  If no OPTION is specified, a default
+	@echo librsvg with the rsvg-view-3 utility program is built, without the
+	@echo introspection files.
+	@echo ======
+	@echo.
+	@echo NO_GTK:
+	@echo Disable GTK support, which will prevent rsvg-view-3.exe from being built.
+	@echo.
+	@echo INTROSPECTION:
+	@echo Enable the build of introspection files requires the GNOME
+	@echo gobject-introspection libraries and tools.  Please see the PYTHON section
+	@echo above for more details.
+	@echo.
+	@echo USE_PANGOFT2:
+	@echo Build the test programs with PangoFT2 support, requires Pango built with
+	@echo FreeType support, which also requires the FontConfig, HarfBuzz and
+	@echo FreeType DLLs and .lib's.
+	@echo.
+	@echo LIBTOOL_DLL_NAME:
+	@echo Use a libtool-style DLL name to mimic the DLL file naming generated by
+	@echo MinGW/autotools builds.  Please note that this does not enable one to use
+	@echo this build with MinGW builds.
+	@echo ======
+	@echo A 'clean' target is supported to remove all generated files, intermediate
+	@echo object files and binaries for the specified configuration.
+	@echo.
+	@echo A 'tests' target is supported to build and runthe test programs.
+	@echo.
+	@echo An 'install' target is supported to copy the build (DLLs, utility programs,
+	@echo LIBs, along with the introspection files if applicable) to appropriate
+	@echo locations under ^$(PREFIX).
+	@echo ======
+	@echo.
diff --git a/win32/install-msvc.mak b/win32/install-msvc.mak
new file mode 100644
index 00000000..06252de0
--- /dev/null
+++ b/win32/install-msvc.mak
@@ -0,0 +1,26 @@
+# NMake Makefile snippet for copying the built libraries, utilities and headers to
+# a path under $(PREFIX).
+
+install: all
+	@if not exist $(PREFIX)\bin\ mkdir $(PREFIX)\bin
+	@if not exist $(PREFIX)\lib\gdk-pixbuf-2.0\2.10.0\loaders\ mkdir $(PREFIX)\lib\gdk-pixbuf-2.0\2.10.0\loaders
+	@if not exist $(PREFIX)\include\librsvg-$(RSVG_API_VER)\librsvg @mkdir $(PREFIX)\include\librsvg-$(RSVG_API_VER)\librsvg
+	@for %%x in (dll pdb) do @copy /b $(LIBRSVG_DLL_FILENAME).%%x $(PREFIX)\bin
+	@copy /b $(LIBRSVG_LIB) $(PREFIX)\lib
+	@for %%x in (dll pdb) do @copy /b $(OUTDIR)\libpixbufloader-svg.%%x $(PREFIX)\lib\gdk-pixbuf-2.0\2.10.0\loaders
+	@for %%f in ($(RSVG_TOOLS)) do @(for %%x in (exe pdb) do @copy %%~dpnf.%%x $(PREFIX)\bin)
+	@for %%h in ($(librsvg_real_pub_HDRS) $(librsvg_real_extra_pub_HDRS)) do @copy %%h $(PREFIX)\include\librsvg-$(RSVG_API_VER)\librsvg\%%h
+	@set PATH=$(PREFIX)\bin;$(BINDIR);$(PATH)
+	@-gdk-pixbuf-query-loaders > loaders.cache
+	@for %%f in (loaders.cache) do @if %%~zf equ 0 echo *** GDK-Pixbuf loaders cache is not generated.  Run `gdk-pixbuf-query-loaders` in your ^$(PREFIX)\bin to generate it.
+	@for %%f in (loaders.cache) do @if %%~zf equ 0 del loaders.cache
+	@if exist loaders.cache move loaders.cache $(PREFIX)\lib\gdk-pixbuf-2.0\2.10.0
+	@rem Copy the generated introspection files, if built
+	@if exist $(OUTDIR)\Rsvg-$(RSVG_API_VER).gir if not exist $(PREFIX)\share\gir-1.0\ mkdir $(PREFIX)\share\gir-1.0
+	@if exist $(OUTDIR)\Rsvg-$(RSVG_API_VER).gir copy $(OUTDIR)\Rsvg-$(RSVG_API_VER).gir $(PREFIX)\share\gir-1.0
+	@if exist $(OUTDIR)\Rsvg-$(RSVG_API_VER).typelib if not exist $(PREFIX)\lib\girepository-1.0\ mkdir $(PREFIX)\lib\girepository-1.0
+	@if exist $(OUTDIR)\Rsvg-$(RSVG_API_VER).typelib copy /b $(OUTDIR)\Rsvg-$(RSVG_API_VER).typelib $(PREFIX)\lib\girepository-1.0
+	@-$(PYTHON) rsvgpc.py --version=$(RSVG_PKG_VERSION) --prefix=$(PREFIX)
+	@if not exist librsvg-2.0.pc echo *** librsvg-2.0.pc is not generated!  Generate it later using ^$(PYTHON) --version=$(RSVG_PKG_VERSION) --prefix=^$(PREFIX)
+	@if exist librsvg-2.0.pc if not exist $(PREFIX)\lib\pkgconfig mkdir $(PREFIX)\lib\pkgconfig
+	@if exist librsvg-2.0.pc move librsvg-2.0.pc $(PREFIX)\lib\pkgconfig
diff --git a/win32/introspection-msvc.mak b/win32/introspection-msvc.mak
index e7cb10c5..e395a2de 100644
--- a/win32/introspection-msvc.mak
+++ b/win32/introspection-msvc.mak
@@ -7,20 +7,16 @@
 # 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]
+    ![set PFX_LIB=$(LIBDIR)\lib]	&& \
+    ![for %P in (%PFX_LIB%) do @echo PREFIX_LIB_FULL=%~dpnfP > pfx.x]
 !endif
 !include pfx.x
 
 !if "$(PKG_CONFIG_PATH)" == ""
-PKG_CONFIG_PATH=$(PREFIX_FULL)\lib\pkgconfig
+PKG_CONFIG_PATH=$(PREFIX_LIB_FULL)\pkgconfig
 !else
-PKG_CONFIG_PATH=$(PREFIX_FULL)\lib\pkgconfig;$(PKG_CONFIG_PATH)
+PKG_CONFIG_PATH=$(PREFIX_LIB_FULL)\pkgconfig;$(PKG_CONFIG_PATH)
 !endif
 
 !if ![del $(ERRNUL) /q/f pfx.x]
@@ -46,10 +42,10 @@ PKG_CONFIG=pkg-config
 
 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)
+G_IR_SCANNER = $(BINDIR)\g-ir-scanner
+G_IR_COMPILER = $(BINDIR)\g-ir-compiler.exe
+G_IR_INCLUDEDIR = $(BINDIR)\..\$(GIR_SUBDIR)
+G_IR_TYPELIBDIR = $(BINDIR)\..\$(GIR_TYPELIBDIR)
 
 VALID_PKG_CONFIG_PATH = FALSE
 
@@ -61,7 +57,7 @@ ERROR_MSG =
 BUILD_INTROSPECTION = TRUE
 
 !if ![set PKG_CONFIG_PATH=$(PKG_CONFIG_PATH)]	\
-	&& ![$(PKG_CONFIG) --print-errors --errors-to-stdout $(CHECK_PACKAGE) > pkgconfig.x]	\
+	&& ![$(PKG_CONFIG) --print-errors --errors-to-stdout $(CHECK_GIR_PACKAGE) > pkgconfig.x]	\
 	&& ![setlocal]	\
 	&& ![set file="pkgconfig.x"]	\
 	&& ![FOR %A IN (%file%) DO @echo PKG_CHECK_SIZE=%~zA > pkgconfig.chksize]	\
diff --git a/win32/pc_base.py b/win32/pc_base.py
index f7976e8d..a65955d8 100644
--- a/win32/pc_base.py
+++ b/win32/pc_base.py
@@ -23,7 +23,7 @@ class BasePCItems:
         self.libdir = ''
         self.prefix = ''
         self.srcdir = os.path.dirname(__file__)
-        self.top_srcdir = self.srcdir + '\\..'
+        self.top_srcdir = self.srcdir + os.sep + '..'
         self.version = ''
 
     def setup(self, argv, parser=None):
diff --git a/win32/rsvg-introspection-msvc.mak b/win32/rsvg-introspection-msvc.mak
deleted file mode 100644
index 1083f3d2..00000000
--- a/win32/rsvg-introspection-msvc.mak
+++ /dev/null
@@ -1,35 +0,0 @@
-# NMake Makefile to build Introspection Files for GDK-Pixbuf
-
-!include detectenv-msvc.mak
-
-APIVERSION = 2.0
-
-CHECK_PACKAGE = gdk-pixbuf-2.0
-
-!include introspection-msvc.mak
-
-!if "$(BUILD_INTROSPECTION)" == "TRUE"
-all: setgirbuildenv Rsvg-$(APIVERSION).gir Rsvg-$(APIVERSION).typelib
-
-setgirbuildenv:
-	@-set PYTHONPATH=$(PREFIX)\lib\gobject-introspection
-	@-set PATH=vs$(VSVER)\$(CFG)\$(PLAT)\bin;$(PREFIX)\bin;$(PATH)
-	@-set PKG_CONFIG_PATH=$(PKG_CONFIG_PATH)
-	@-set LIB=vs$(VSVER)\$(CFG)\$(PLAT)\bin;$(LIB)
-
-!include introspection.body.mak
-
-install-introspection: all
-	@-copy Rsvg-$(APIVERSION).gir $(G_IR_INCLUDEDIR)
-	@-copy /b Rsvg-$(APIVERSION).typelib $(G_IR_TYPELIBDIR)
-
-!else
-all:
-	@-echo $(ERROR_MSG)
-
-install-introspection: all
-!endif
-
-clean:
-	@-del /f/q Rsvg-$(APIVERSION).typelib
-	@-del /f/q Rsvg-$(APIVERSION).gir
diff --git a/win32/rsvg-rust.mak b/win32/rsvg-rust.mak
index 65e80aef..22ff8c74 100644
--- a/win32/rsvg-rust.mak
+++ b/win32/rsvg-rust.mak
@@ -1,4 +1,9 @@
+!ifndef VCVER
 !include detectenv-msvc.mak
+!ifndef LIBDIR
+LIBDIR=$(PREFIX)\lib
+!endif
+!endif
 
 !if "$(CARGO)" == ""
 CARGO = cargo
@@ -32,23 +37,23 @@ CARGO_CMD = $(CARGO) build $(CARGO_TARGET) --release
 CARGO_CMD = $(CARGO) build $(CARGO_TARGET)
 !endif
 
-all: vs$(VSVER)\$(CFG)\$(PLAT)\obj\rsvg_internals\$(RUST_TARGET)-pc-windows-msvc\$(CFG)\rsvg_internals.lib
-
 vs$(VSVER)\$(CFG)\$(PLAT)\obj\rsvg_internals\$(RUST_TARGET)-pc-windows-msvc\$(CFG)\rsvg_internals.lib:
+	@set PATH=%PATH%;%HOMEPATH%\.cargo\bin
 	@set CARGO_TARGET_DIR=..\win32\vs$(VSVER)\$(CFG)\$(PLAT)\obj\rsvg_internals
-	@set GTK_LIB_DIR=..\..\vs$(VSVER)\$(PLAT)\lib;$(LIB)
+	@set GTK_LIB_DIR=$(LIBDIR);$(LIB)
 	$(RUSTUP_CMD)
 	@cd ..\rsvg_internals
 	$(CARGO_CMD) --verbose
-	@cd ..\win32\vs$(VSVER)
+	@cd ..\win32
 	@set GTK_LIB_DIR=
 	@set CARGO_TARGET_DIR=
 
-clean:
+cargo-clean:
+	@set PATH=%PATH%;%HOMEPATH%\.cargo\bin
 	@set CARGO_TARGET_DIR=..\win32\vs$(VSVER)\$(CFG)\$(PLAT)\obj\rsvg_internals
 	@cd ..\rsvg_internals
 	@$(CARGO) clean
-	@cd ..\win32\vs$(VSVER)
+	@cd ..\win32
 	@set CARGO_TARGET_DIR=
 	
 !else
diff --git a/win32/rsvgpc.py b/win32/rsvgpc.py
index d72616b8..d913352e 100644
--- a/win32/rsvgpc.py
+++ b/win32/rsvgpc.py
@@ -20,7 +20,8 @@ def main(argv):
     base_pc.setup(argv)
     pkg_replace_items = {'@RSVG_API_MAJOR_VERSION@': rsvg_api_ver,
                          '@RSVG_API_VERSION@': rsvg_api_ver,
-                         ' -lm': ''}
+                         ' cairo': '',
+                         '-lm': '-lcairo'}
 
     pkg_replace_items.update(base_pc.base_replace_items)
 
diff --git a/win32/vs12/Makefile.am b/win32/vs12/Makefile.am
deleted file mode 100644
index 188aab2a..00000000
--- a/win32/vs12/Makefile.am
+++ /dev/null
@@ -1,36 +0,0 @@
-GENERATED_ITEMS =			\
-	rsvg.vcxproj			\
-	rsvg.vcxproj.filters		\
-	rsvg-convert.vcxproj		\
-	rsvg-convert.vcxproj.filters	\
-	rsvg-install.props
-
-EXTRA_DIST =	\
-	librsvg.sln				\
-	rsvg-build-defines.props		\
-	rsvg-gen-srcs.props			\
-	rsvg-install.propsin			\
-	rsvg-version-paths.props		\
-	libpixbufloader-svg.vcxproj		\
-	libpixbufloader-svg.vcxproj.filters	\
-	rsvg.vcxprojin				\
-	rsvg.vcxproj.filtersin			\
-	rsvg-convert.vcxprojin			\
-	rsvg-convert.vcxproj.filtersin		\
-	rsvg-install.vcxproj			\
-	rsvg-install.vcxproj.filters		\
-	rsvg-rust.vcxproj			\
-	rsvg-view-3.vcxproj			\
-	rsvg-view-3.vcxproj.filters		\
-	README.txt				\
-	$(GENERATED_ITEMS)
-
-rsvg-install.props: $(top_srcdir)/win32/vs12/rsvg-install.propsin rsvg.vs12.headers
-	-$(RM) $(top_builddir)/win32/vs14/rsvg-install.props
-	-$(RM) $(top_builddir)/win32/vs15/rsvg-install.props
-	$(CPP) -P - <$(top_srcdir)/win32/vs12/rsvg-install.propsin >$@
-	rm rsvg.vs12.headers
-
-DISTCLEANFILES = $(GENERATED_ITEMS)
-
--include $(top_srcdir)/git.mk
diff --git a/win32/vs12/README.txt b/win32/vs12/README.txt
deleted file mode 100644
index c40eb0e3..00000000
--- a/win32/vs12/README.txt
+++ /dev/null
@@ -1,86 +0,0 @@
-Note that all this is rather experimental.
-
-Please do not compile librsvg in a path with spaces to avoid potential
-problems during the build and/or during the usage of the librsvg
-library.
-
-Please refer to the following GNOME Live! page for more detailed
-instructions on building librsvg and its dependencies with Visual C++:
-
-https://live.gnome.org/GTK%2B/Win32/MSVCCompilationOfGTKStack
-
-This VS12 solution and the projects it includes are intented to be used
-in a librsvg source tree unpacked from a tarball. In a git checkout you
-first need to use some Unix-like environment or manual work to expand
-files as needed, for instance the .vcprojin files here into .vcproj
-files.
-
-It is recommended that GLib, libxml2, libcroco, Cairo, Pango is compiled
-with VS12 to compile librsvg.
-
-External dependencies are at least Cairo, GLib, libxml2, libcroco, GDK-Pixbuf
-Please see the build\win32\vs12\README.txt file in glib for details where to
-unpack them.
-
-You will also need the Rust compiler package (https://www.rust-lang.org/), where
-binary MSI packages are available.  Note that there are two packages for Windows
-for each of the 32-bit and 64-bit variants--you *will* need to use the MSVC ABI
-(*not* GNU ABI) package that corresponds to your build configuration (Win32/32-bit
-and x64/64-bit).  Do note that the .msi installers will put the path where the
-rustc.exe/cargo.exe are installed in your PATH, so it is recommended that you
-remove the path(s) from your system's PATH settings and setup your IDE to look
-for your 32-bit rustc.exe/cargo.exe for Win32/32-bit configs, and to look for
-your 64-bit rustc.exe/cargo.exe for x64/64-bit configs, or append
-" CARGO=<full_path_to_cargo.exe>" after the the items in the NMake command lines
-in the rsvg-rust project settings.
-
-It is recommended that one builds the dependencies with VS12 as far as
-possible, especially those from and using the GTK+ stack (i.e. GDK-Pixbuf,
-Pango, GLib and Cairo), so that crashes caused by mixing calls to different
-CRTs can be kept at a minimum.
-
-libxml2 and Cairo do contain support for compiling under VS12
-using VS project files and/or makefiles at this time of writing.
-For GDK-Pixbuf, Pango, libcroco and GLib, VS12 project files are
-available under $(srcroot)\build\vs12.
-
-Set up the source tree as follows under some arbitrary top folder
-<root>:
-
-<root>\<this-librsvg-source-tree>
-<root>\vs12\<PlatformName>
-
-Note: put the resulting Cairo and libxml2 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:
--libxml2
--(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 (put the sources in <root>\<GLib-Source-Tree>, and build it from
-       there with VS12)
--libcroco
--Cairo
--Pango
--Gdk-Pixbuf
--ATK and GTK (Version 3.10+, if building the GTK+ viewer program)
-
-*this* file you are now reading is thus located at
-<root>\<this-librsvg-source-tree>\build\win32\vs12\README.txt.
-
-<PlatformName> is either Win32 or x64, as in VS12 project files.
-
-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 headers into
-<root>\vs12\<PlatformName>\include\librsvg-2.0. This is then from where
-project files higher in the stack are supposed to look for them, not
-from a specific librsvg source tree like this one. It is important to
-keep separate the concept of a "source tree", where also non-public
-headers are present, and an "install tree" where only public headers
-are present.
-
---Updated by Fan, Chun-wei <fanc999@yahoo.com.tw>
diff --git a/win32/vs12/libpixbufloader-svg.vcxproj b/win32/vs12/libpixbufloader-svg.vcxproj
deleted file mode 100644
index a015a7d7..00000000
--- a/win32/vs12/libpixbufloader-svg.vcxproj
+++ /dev/null
@@ -1,169 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.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>{F0CCC693-1721-4DBD-9A64-591201A22740}</ProjectGuid>
-    <RootNamespace>libpixbufloadersvg</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v120</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v120</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v120</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v120</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </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="rsvg-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="rsvg-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="rsvg-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="rsvg-build-defines.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)'=='Debug'"><LinkIncremental>true</LinkIncremental></PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)'=='Release'"><LinkIncremental>false</LinkIncremental></PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;$(RsvgPixbufLoaderCFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader />
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>$(RsvgPixbufLoaderCFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader />
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;$(RsvgPixbufLoaderCFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader />
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>$(RsvgPixbufLoaderCFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader />
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\gdk-pixbuf-loader\io-svg.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="rsvg.vcxproj">
-      <Project>{3d7ef762-d969-4ac0-ab52-3cc86fa4620b}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/win32/vs12/libpixbufloader-svg.vcxproj.filters b/win32/vs12/libpixbufloader-svg.vcxproj.filters
deleted file mode 100644
index df7432ae..00000000
--- a/win32/vs12/libpixbufloader-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="..\..\gdk-pixbuf-loader\io-svg.c"><Filter>Sources</Filter></ClCompile>
-  </ItemGroup>
-</Project>
diff --git a/win32/vs12/librsvg.sln b/win32/vs12/librsvg.sln
deleted file mode 100644
index 182facb3..00000000
--- a/win32/vs12/librsvg.sln
+++ /dev/null
@@ -1,76 +0,0 @@
-

-Microsoft Visual Studio Solution File, Format Version 12.00

-# Visual Studio 2013

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rsvg-rust", "rsvg-rust.vcxproj", "{03D45804-0FBA-466D-A079-E19755471C3F}"

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rsvg", "rsvg.vcxproj", "{3D7EF762-D969-4AC0-AB52-3CC86FA4620B}"

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rsvg-convert", "rsvg-convert.vcxproj", "{039282C3-B73E-4D08-9B65-2034CF9EB4B7}"

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rsvg-view-3", "rsvg-view-3.vcxproj", "{2C4FC5FD-1CF0-47F9-83FC-A129EE313C1E}"

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpixbufloader-svg", "libpixbufloader-svg.vcxproj", "{F0CCC693-1721-4DBD-9A64-591201A22740}"

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rsvg-install", "rsvg-install.vcxproj", "{C416ED91-E000-49D3-9617-CCC473E08EAE}"

-EndProject

-Global

-	GlobalSection(SolutionConfigurationPlatforms) = preSolution

-		Debug|Win32 = Debug|Win32

-		Debug|x64 = Debug|x64

-		Release|Win32 = Release|Win32

-		Release|x64 = Release|x64

-	EndGlobalSection

-	GlobalSection(ProjectConfigurationPlatforms) = postSolution

-		{03D45804-0FBA-466D-A079-E19755471C3F}.Debug|Win32.ActiveCfg = Debug|Win32

-		{03D45804-0FBA-466D-A079-E19755471C3F}.Debug|Win32.Build.0 = Debug|Win32

-		{03D45804-0FBA-466D-A079-E19755471C3F}.Debug|x64.ActiveCfg = Debug|x64

-		{03D45804-0FBA-466D-A079-E19755471C3F}.Debug|x64.Build.0 = Debug|x64

-		{03D45804-0FBA-466D-A079-E19755471C3F}.Release|Win32.ActiveCfg = Release|Win32

-		{03D45804-0FBA-466D-A079-E19755471C3F}.Release|Win32.Build.0 = Release|Win32

-		{03D45804-0FBA-466D-A079-E19755471C3F}.Release|x64.ActiveCfg = Release|x64

-		{03D45804-0FBA-466D-A079-E19755471C3F}.Release|x64.Build.0 = Release|x64

-		{3D7EF762-D969-4AC0-AB52-3CC86FA4620B}.Debug|Win32.ActiveCfg = Debug|Win32

-		{3D7EF762-D969-4AC0-AB52-3CC86FA4620B}.Debug|Win32.Build.0 = Debug|Win32

-		{3D7EF762-D969-4AC0-AB52-3CC86FA4620B}.Debug|x64.ActiveCfg = Debug|x64

-		{3D7EF762-D969-4AC0-AB52-3CC86FA4620B}.Debug|x64.Build.0 = Debug|x64

-		{3D7EF762-D969-4AC0-AB52-3CC86FA4620B}.Release|Win32.ActiveCfg = Release|Win32

-		{3D7EF762-D969-4AC0-AB52-3CC86FA4620B}.Release|Win32.Build.0 = Release|Win32

-		{3D7EF762-D969-4AC0-AB52-3CC86FA4620B}.Release|x64.ActiveCfg = Release|x64

-		{3D7EF762-D969-4AC0-AB52-3CC86FA4620B}.Release|x64.Build.0 = Release|x64

-		{039282C3-B73E-4D08-9B65-2034CF9EB4B7}.Debug|Win32.ActiveCfg = Debug|Win32

-		{039282C3-B73E-4D08-9B65-2034CF9EB4B7}.Debug|Win32.Build.0 = Debug|Win32

-		{039282C3-B73E-4D08-9B65-2034CF9EB4B7}.Debug|x64.ActiveCfg = Debug|x64

-		{039282C3-B73E-4D08-9B65-2034CF9EB4B7}.Debug|x64.Build.0 = Debug|x64

-		{039282C3-B73E-4D08-9B65-2034CF9EB4B7}.Release|Win32.ActiveCfg = Release|Win32

-		{039282C3-B73E-4D08-9B65-2034CF9EB4B7}.Release|Win32.Build.0 = Release|Win32

-		{039282C3-B73E-4D08-9B65-2034CF9EB4B7}.Release|x64.ActiveCfg = Release|x64

-		{039282C3-B73E-4D08-9B65-2034CF9EB4B7}.Release|x64.Build.0 = Release|x64

-		{2C4FC5FD-1CF0-47F9-83FC-A129EE313C1E}.Debug|Win32.ActiveCfg = Debug|Win32

-		{2C4FC5FD-1CF0-47F9-83FC-A129EE313C1E}.Debug|Win32.Build.0 = Debug|Win32

-		{2C4FC5FD-1CF0-47F9-83FC-A129EE313C1E}.Debug|x64.ActiveCfg = Debug|x64

-		{2C4FC5FD-1CF0-47F9-83FC-A129EE313C1E}.Debug|x64.Build.0 = Debug|x64

-		{2C4FC5FD-1CF0-47F9-83FC-A129EE313C1E}.Release|Win32.ActiveCfg = Release|Win32

-		{2C4FC5FD-1CF0-47F9-83FC-A129EE313C1E}.Release|Win32.Build.0 = Release|Win32

-		{2C4FC5FD-1CF0-47F9-83FC-A129EE313C1E}.Release|x64.ActiveCfg = Release|x64

-		{2C4FC5FD-1CF0-47F9-83FC-A129EE313C1E}.Release|x64.Build.0 = Release|x64

-		{F0CCC693-1721-4DBD-9A64-591201A22740}.Debug|Win32.ActiveCfg = Debug|Win32

-		{F0CCC693-1721-4DBD-9A64-591201A22740}.Debug|Win32.Build.0 = Debug|Win32

-		{F0CCC693-1721-4DBD-9A64-591201A22740}.Debug|x64.ActiveCfg = Debug|x64

-		{F0CCC693-1721-4DBD-9A64-591201A22740}.Debug|x64.Build.0 = Debug|x64

-		{F0CCC693-1721-4DBD-9A64-591201A22740}.Release|Win32.ActiveCfg = Release|Win32

-		{F0CCC693-1721-4DBD-9A64-591201A22740}.Release|Win32.Build.0 = Release|Win32

-		{F0CCC693-1721-4DBD-9A64-591201A22740}.Release|x64.ActiveCfg = Release|x64

-		{F0CCC693-1721-4DBD-9A64-591201A22740}.Release|x64.Build.0 = Release|x64

-		{C416ED91-E000-49D3-9617-CCC473E08EAE}.Debug|Win32.ActiveCfg = Debug|Win32

-		{C416ED91-E000-49D3-9617-CCC473E08EAE}.Debug|Win32.Build.0 = Debug|Win32

-		{C416ED91-E000-49D3-9617-CCC473E08EAE}.Debug|x64.ActiveCfg = Debug|x64

-		{C416ED91-E000-49D3-9617-CCC473E08EAE}.Debug|x64.Build.0 = Debug|x64

-		{C416ED91-E000-49D3-9617-CCC473E08EAE}.Release|Win32.ActiveCfg = Release|Win32

-		{C416ED91-E000-49D3-9617-CCC473E08EAE}.Release|Win32.Build.0 = Release|Win32

-		{C416ED91-E000-49D3-9617-CCC473E08EAE}.Release|x64.ActiveCfg = Release|x64

-		{C416ED91-E000-49D3-9617-CCC473E08EAE}.Release|x64.Build.0 = Release|x64

-	EndGlobalSection

-	GlobalSection(SolutionProperties) = preSolution

-		HideSolutionNode = FALSE

-	EndGlobalSection

-EndGlobal

diff --git a/win32/vs12/rsvg-build-defines.props b/win32/vs12/rsvg-build-defines.props
deleted file mode 100644
index 46d558fc..00000000
--- a/win32/vs12/rsvg-build-defines.props
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ImportGroup Label="PropertySheets">
-    <Import Project="rsvg-version-paths.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros">
-    <LibRsvgCFlags>G_LOG_DOMAIN="librsvg";RSVG_DISABLE_DEPRECATION_WARNINGS;RSVG_COMPILATION;SRCDIR="../../../../.."</LibRsvgCFlags>
-    <LibRsvgIncPath>$(GlibEtcInstallRoot)\include\pango-1.0;$(GlibEtcInstallRoot)\include\libcroco-0.6;$(GlibEtcInstallRoot)\include\libxml2</LibRsvgIncPath>
-    <LibRsvgLibs>pangocairo-1.0.lib;pango-1.0.lib;croco-0.6.lib;cairo-gobject.lib;libxml2.lib;userenv.lib;ws2_32.lib</LibRsvgLibs>
-    <PangoFT2Libs>pangoft2-1.0.lib;fontconfig.lib</PangoFT2Libs>
-    <IntlLib>intl.lib</IntlLib>
-    <Gtk3IncPath>$(GlibEtcInstallRoot)\include\gtk-3.0;$(GlibEtcInstallRoot)\include\atk-1.0;$(LibRsvgIncPath)</Gtk3IncPath>
-    <Gtk3Libs>gtk-3.0.lib;gdk-3.0.lib</Gtk3Libs>
-    <RsvgPixbufLoaderCFlags>GDK_PIXBUF_ENABLE_BACKEND;G_LOG_DOMAIN="libpixbufloader-svg"</RsvgPixbufLoaderCFlags>
-    <RustTargetArch Condition="'$(Platform)' == 'x64'">x86_64</RustTargetArch>
-    <RustTargetArch Condition="'$(Platform)' == 'Win32'">i686</RustTargetArch>
-    <RsvgRustNMakeCmd>
-cd ..
-set VCInstallDir=$(VCInstallDir)
-nmake -f rsvg-rust.mak CFG=$(Configuration)</RsvgRustNMakeCmd>
-  </PropertyGroup>
-  <PropertyGroup>
-    <_PropertySheetDisplayName>rsvgbuilddefinesprops</_PropertySheetDisplayName>
-    <OutDir>$(SolutionDir)$(Configuration)\$(Platform)\bin\</OutDir>
-    <IntDir>$(SolutionDir)$(Configuration)\$(Platform)\obj\$(ProjectName)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..;$(GlibEtcInstallRoot)\include\gdk-pixbuf-2.0;$(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;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ForcedIncludeFiles>msvc_recommended_pragmas.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <AdditionalOptions>/d2Zi+ %(AdditionalOptions)</AdditionalOptions>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>gdk_pixbuf-2.0.lib;gio-2.0.lib;gobject-2.0.lib;glib-2.0.lib;cairo.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(GlibEtcInstallRoot)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalOptions Condition="'$(Platform)'=='x64'">/HIGHENTROPYVA %(AdditionalOptions)</AdditionalOptions>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <BuildMacro Include="LibRsvgCFlags">
-      <Value>$(LibRsvgCFlags)</Value>
-    </BuildMacro>
-    <BuildMacro Include="LibRsvgIncPath">
-      <Value>$(LibRsvgIncPath)</Value>
-    </BuildMacro>
-    <BuildMacro Include="LibRsvgLibs">
-      <Value>$(LibRsvgLibs)</Value>
-    </BuildMacro>
-    <BuildMacro Include="PangoFT2Libs">
-      <Value>$(PangoFT2Libs)</Value>
-    </BuildMacro>
-    <BuildMacro Include="IntlLib">
-      <Value>$(IntlLib)</Value>
-    </BuildMacro>
-    <BuildMacro Include="Gtk3Libs">
-      <Value>$(Gtk3Libs)</Value>
-    </BuildMacro>
-    <BuildMacro Include="RsvgPixbufLoaderCFlags">
-      <Value>$(RsvgPixbufLoaderCFlags)</Value>
-    </BuildMacro>
-    <BuildMacro Include="RsvgRustNMakeCmd">
-      <Value>$(RsvgRustNMakeCmd)</Value>
-    </BuildMacro>
-    <BuildMacro Include="RustTargetArch">
-      <Value>$(RustTargetArch)</Value>
-    </BuildMacro>
-  </ItemGroup>
-</Project>
diff --git a/win32/vs12/rsvg-convert.vcxproj.filtersin b/win32/vs12/rsvg-convert.vcxproj.filtersin
deleted file mode 100644
index 24f77357..00000000
--- a/win32/vs12/rsvg-convert.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 "rsvg-convert.vs12.sourcefiles.filters"
-  </ItemGroup>
-</Project>
diff --git a/win32/vs12/rsvg-convert.vcxprojin b/win32/vs12/rsvg-convert.vcxprojin
deleted file mode 100644
index b59471d8..00000000
--- a/win32/vs12/rsvg-convert.vcxprojin
+++ /dev/null
@@ -1,164 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.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>{039282C3-B73E-4D08-9B65-2034CF9EB4B7}</ProjectGuid>
-    <RootNamespace>rsvgconvert</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v120</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v120</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v120</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v120</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </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="rsvg-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="rsvg-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="rsvg-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="rsvg-build-defines.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)'=='Debug'"><LinkIncremental>true</LinkIncremental></PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)'=='Release'"><LinkIncremental>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 />
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>$(IntlLib);%(AdditionalDependencies)</AdditionalDependencies>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader />
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>$(IntlLib);%(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>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader />
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>$(IntlLib);%(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>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader />
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>$(IntlLib);%(AdditionalDependencies)</AdditionalDependencies>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-
-#include "rsvg-convert.vs12.sourcefiles"
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="rsvg.vcxproj">
-      <Project>{3d7ef762-d969-4ac0-ab52-3cc86fa4620b}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/win32/vs12/rsvg-gen-srcs.props b/win32/vs12/rsvg-gen-srcs.props
deleted file mode 100644
index fd2c20f5..00000000
--- a/win32/vs12/rsvg-gen-srcs.props
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ImportGroup Label="PropertySheets">
-    <Import Project="rsvg-build-defines.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros">
-    <CopyConfigH>copy ..\..\config.h.win32 ..\..\config.h</CopyConfigH>
-    <GenerateRsvgDef>
-echo EXPORTS &gt; $(DefDir)\rsvg.def
-cl  /EP ..\..\rsvg.symbols &gt;&gt; $(DefDir)\rsvg.def
-     </GenerateRsvgDef>
-  </PropertyGroup>
-  <PropertyGroup>
-    <_PropertySheetDisplayName>rsvggensrcsprops</_PropertySheetDisplayName>
-  </PropertyGroup>
-  <ItemDefinitionGroup />
-  <ItemGroup>
-    <BuildMacro Include="CopyConfigH">
-      <Value>$(CopyConfigH)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GenerateRsvgDef">
-      <Value>$(GenerateRsvgDef)</Value>
-    </BuildMacro>
-  </ItemGroup>
-</Project>
diff --git a/win32/vs12/rsvg-install.propsin b/win32/vs12/rsvg-install.propsin
deleted file mode 100644
index c09182b1..00000000
--- a/win32/vs12/rsvg-install.propsin
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ImportGroup Label="PropertySheets">
-    <Import Project="rsvg-build-defines.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros">
-    <RsvgDoInstall>
-mkdir $(CopyDir)
-mkdir $(CopyDir)\bin
-
-copy $(SolutionDir)$(Configuration)\$(Platform)\bin\$(RsvgDllPrefix)rsvg$(RsvgDllSuffix).dll $(CopyDir)\bin
-copy $(SolutionDir)$(Configuration)\$(Platform)\bin\$(RsvgDllPrefix)rsvg$(RsvgDllSuffix).pdb $(CopyDir)\bin
-copy $(SolutionDir)$(Configuration)\$(Platform)\bin\rsvg-convert.exe $(CopyDir)\bin
-copy $(SolutionDir)$(Configuration)\$(Platform)\bin\rsvg-convert.pdb $(CopyDir)\bin
-copy $(SolutionDir)$(Configuration)\$(Platform)\bin\rsvg-view-3.exe $(CopyDir)\bin
-copy $(SolutionDir)$(Configuration)\$(Platform)\bin\rsvg-view-3.pdb $(CopyDir)\bin
-
-mkdir $(CopyDir)\include\librsvg-$(ApiVersion)\librsvg
-#include "rsvg.vs12.headers"
-
-mkdir $(CopyDir)\lib\gdk-pixbuf-2.0\2.10.0\loaders
-copy $(SolutionDir)$(Configuration)\$(Platform)\bin\rsvg-$(ApiVersion).lib $(CopyDir)\lib
-copy $(SolutionDir)$(Configuration)\$(Platform)\bin\libpixbufloader-svg.dll $(CopyDir)\lib\gdk-pixbuf-2.0\2.10.0\loaders
-copy $(SolutionDir)$(Configuration)\$(Platform)\bin\libpixbufloader-svg.pdb $(CopyDir)\lib\gdk-pixbuf-2.0\2.10.0\loaders
-
-if exist ..\librsvg-2.0.pc copy ..\librsvg-2.0.pc $(CopyDir)\lib\pkgconfig
-    </RsvgDoInstall>
-    <RsvgPostInstall>$(GlibEtcInstallRoot)\bin\gdk-pixbuf-query-loaders.exe &gt; $(CopyDir)\lib\gdk-pixbuf-2.0\2.10.0\loaders.cache</RsvgPostInstall>
-    <RsvgPCFiles>..\librsvg-2.0.pc</RsvgPCFiles>
-    <RsvgGenPC>(if not exist $(CopyDir) mkdir $(CopyDir)) &amp; (if exist $(PythonPath)\python.exe $(PythonPath)\python.exe ..\rsvgpc.py --prefix=$(CopyDir) --version=$(RsvgMajorVersion).$(RsvgMinorVersion).$(RsvgMicroVersion))</RsvgGenPC>
-  </PropertyGroup>
-  <PropertyGroup>
-    <_PropertySheetDisplayName>rsvginstallprops</_PropertySheetDisplayName>
-  </PropertyGroup>
-  <ItemDefinitionGroup />
-  <ItemGroup>
-    <BuildMacro Include="RsvgDoInstall">
-      <Value>$(RsvgDoInstall)</Value>
-    </BuildMacro>
-    <BuildMacro Include="RsvgPostInstall">
-      <Value>$(RsvgPostInstall)</Value>
-    </BuildMacro>
-    <BuildMacro Include="RsvgPCFiles">
-      <Value>$(RsvgPCFiles)</Value>
-    </BuildMacro>
-    <BuildMacro Include="RsvgGenPC">
-      <Value>$(RsvgGenPC)</Value>
-    </BuildMacro>
-  </ItemGroup>
-</Project>
diff --git a/win32/vs12/rsvg-install.vcxproj b/win32/vs12/rsvg-install.vcxproj
deleted file mode 100644
index 979caa9c..00000000
--- a/win32/vs12/rsvg-install.vcxproj
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.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>{C416ED91-E000-49D3-9617-CCC473E08EAE}</ProjectGuid>
-    <RootNamespace>rsvginstall</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Utility</ConfigurationType>
-    <PlatformToolset>v120</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Utility</ConfigurationType>
-    <PlatformToolset>v120</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Utility</ConfigurationType>
-    <PlatformToolset>v120</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Utility</ConfigurationType>
-    <PlatformToolset>v120</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </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="rsvg-install.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="rsvg-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="rsvg-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="rsvg-install.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <CustomBuild Include="placeholder">
-      <Message Condition="'$(Configuration)'=='Debug'">Copying Build Results...</Message>
-      <AdditionalInputs Condition="'$(Configuration)'=='Debug'">$(RsvgPCFiles)</AdditionalInputs>
-      <Command Condition="'$(Configuration)'=='Debug'">$(RsvgDoInstall)$(RsvgPostInstall)</Command>
-      <Outputs Condition="'$(Configuration)'=='Debug'">install_placeholder;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)'=='Release'">Copying Build Results...</Message>
-      <AdditionalInputs Condition="'$(Configuration)'=='Release'">$(RsvgPCFiles)</AdditionalInputs>
-      <Command Condition="'$(Configuration)'=='Release'">$(RsvgDoInstall)$(RsvgPostInstall)</Command>
-      <Outputs Condition="'$(Configuration)'=='Release'">install_placeholder;%(Outputs)</Outputs>
-    </CustomBuild>
-    <CustomBuild Include="..\..\librsvg.pc.in">
-      <Message Condition="'$(Configuration)'=='Debug'">Generating .pc file...</Message>
-      <Command Condition="'$(Configuration)'=='Debug'">$(RsvgGenPC)</Command>
-      <Outputs Condition="'$(Configuration)'=='Debug'">$(RsvgPCFiles);%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)'=='Release'">Generating .pc file...</Message>
-      <Command Condition="'$(Configuration)'=='Release'">$(RsvgGenPC)</Command>
-      <Outputs Condition="'$(Configuration)'=='Release'">$(RsvgPCFiles);%(Outputs)</Outputs>
-    </CustomBuild>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="libpixbufloader-svg.vcxproj">
-      <Project>{f0ccc693-1721-4dbd-9a64-591201a22740}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="rsvg-convert.vcxproj">
-      <Project>{039282c3-b73e-4d08-9b65-2034cf9eb4b7}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="rsvg-view-3.vcxproj">
-      <Project>{2c4fc5fd-1cf0-47f9-83fc-a129ee313c1e}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="rsvg.vcxproj">
-      <Project>{3d7ef762-d969-4ac0-ab52-3cc86fa4620b}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/win32/vs12/rsvg-install.vcxproj.filters b/win32/vs12/rsvg-install.vcxproj.filters
deleted file mode 100644
index 44d77e6e..00000000
--- a/win32/vs12/rsvg-install.vcxproj.filters
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Sources">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Headers">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-   <CustomBuild Include="placeholder"><Filter>Resource Files</Filter></CustomBuild>
-   <CustomBuild Include="..\..\librsvg.pc.in"><Filter>Resource Files</Filter></CustomBuild>
-  </ItemGroup>
-</Project>
diff --git a/win32/vs12/rsvg-rust.vcxproj b/win32/vs12/rsvg-rust.vcxproj
deleted file mode 100644
index 4ee2891f..00000000
--- a/win32/vs12/rsvg-rust.vcxproj
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <ItemGroup Label="ProjectConfigurations">

-    <ProjectConfiguration Include="Debug|Win32">

-      <Configuration>Debug</Configuration>

-      <Platform>Win32</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="Release|Win32">

-      <Configuration>Release</Configuration>

-      <Platform>Win32</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="Debug|x64">

-      <Configuration>Debug</Configuration>

-      <Platform>x64</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="Release|x64">

-      <Configuration>Release</Configuration>

-      <Platform>x64</Platform>

-    </ProjectConfiguration>

-  </ItemGroup>

-  <PropertyGroup Label="Globals">

-    <ProjectGuid>{03D45804-0FBA-466D-A079-E19755471C3F}</ProjectGuid>

-    <RootNamespace>rsvgrust</RootNamespace>

-  </PropertyGroup>

-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

-    <ConfigurationType>Makefile</ConfigurationType>

-    <UseDebugLibraries>true</UseDebugLibraries>

-    <CharacterSet>MultiByte</CharacterSet>

-    <PlatformToolset>v120</PlatformToolset>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

-    <ConfigurationType>Makefile</ConfigurationType>

-    <UseDebugLibraries>false</UseDebugLibraries>

-    <WholeProgramOptimization>true</WholeProgramOptimization>

-    <CharacterSet>MultiByte</CharacterSet>

-    <PlatformToolset>v120</PlatformToolset>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">

-    <ConfigurationType>Makefile</ConfigurationType>

-    <CharacterSet>MultiByte</CharacterSet>

-    <PlatformToolset>v120</PlatformToolset>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">

-    <ConfigurationType>Makefile</ConfigurationType>

-    <CharacterSet>MultiByte</CharacterSet>

-    <WholeProgramOptimization>true</WholeProgramOptimization>

-    <PlatformToolset>v120</PlatformToolset>

-  </PropertyGroup>

-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

-  <ImportGroup Label="ExtensionSettings">

-  </ImportGroup>

-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-    <Import Project="rsvg-build-defines.props" />

-  </ImportGroup>

-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-    <Import Project="rsvg-build-defines.props" />

-  </ImportGroup>

-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-    <Import Project="rsvg-build-defines.props" />

-  </ImportGroup>

-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-    <Import Project="rsvg-build-defines.props" />

-  </ImportGroup>

-  <PropertyGroup Label="UserMacros" />

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

-    <NMakeBuildCommandLine>$(RsvgRustNMakeCmd)</NMakeBuildCommandLine>

-    <NMakeReBuildCommandLine>$(RsvgRustNMakeCmd) clean all</NMakeReBuildCommandLine>

-    <NMakeCleanCommandLine>$(RsvgRustNMakeCmd) clean</NMakeCleanCommandLine>

-    <NMakeOutput>$(SolutionDir)\$(Configuration)\$(Platform)\obj\rsvg_internals\$(RustTargetArch)-pc-windows-msvc\$(Configuration)\rsvg_internals.lib</NMakeOutput>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

-    <NMakeBuildCommandLine>$(RsvgRustNMakeCmd)</NMakeBuildCommandLine>

-    <NMakeReBuildCommandLine>$(RsvgRustNMakeCmd) clean all</NMakeReBuildCommandLine>

-    <NMakeCleanCommandLine>$(RsvgRustNMakeCmd) clean</NMakeCleanCommandLine>

-    <NMakeOutput>$(SolutionDir)\$(Configuration)\$(Platform)\obj\rsvg_internals\$(RustTargetArch)-pc-windows-msvc\$(Configuration)\rsvg_internals.lib</NMakeOutput>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

-    <NMakeBuildCommandLine>$(RsvgRustNMakeCmd)</NMakeBuildCommandLine>

-    <NMakeReBuildCommandLine>$(RsvgRustNMakeCmd) clean all</NMakeReBuildCommandLine>

-    <NMakeCleanCommandLine>$(RsvgRustNMakeCmd) clean</NMakeCleanCommandLine>

-    <NMakeOutput>$(SolutionDir)\$(Configuration)\$(Platform)\obj\rsvg_internals\$(RustTargetArch)-pc-windows-msvc\$(Configuration)\rsvg_internals.lib</NMakeOutput>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

-    <NMakeBuildCommandLine>$(RsvgRustNMakeCmd)</NMakeBuildCommandLine>

-    <NMakeReBuildCommandLine>$(RsvgRustNMakeCmd) clean all</NMakeReBuildCommandLine>

-    <NMakeCleanCommandLine>$(RsvgRustNMakeCmd) clean</NMakeCleanCommandLine>

-    <NMakeOutput>$(SolutionDir)\$(Configuration)\$(Platform)\obj\rsvg_internals\$(RustTargetArch)-pc-windows-msvc\$(Configuration)\rsvg_internals.lib</NMakeOutput>

-  </PropertyGroup>

-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

-  <ImportGroup Label="ExtensionTargets">

-  </ImportGroup>

-</Project>
\ No newline at end of file
diff --git a/win32/vs12/rsvg-version-paths.props.in b/win32/vs12/rsvg-version-paths.props.in
deleted file mode 100644
index a1ea96a5..00000000
--- a/win32/vs12/rsvg-version-paths.props.in
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ImportGroup Label="PropertySheets">
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros">
-    <RsvgMajorVersion>@LIBRSVG_MAJOR_VERSION@</RsvgMajorVersion>
-    <RsvgMinorVersion>@LIBRSVG_MINOR_VERSION@</RsvgMinorVersion>
-    <RsvgMicroVersion>@LIBRSVG_MICRO_VERSION@</RsvgMicroVersion>
-    <ApiVersion>2.0</ApiVersion>
-    <VSVer>12</VSVer>
-    <GlibEtcInstallRoot>$(SolutionDir)\..\..\..\vs$(VSVer)\$(Platform)</GlibEtcInstallRoot>
-    <CopyDir>$(GlibEtcInstallRoot)</CopyDir>
-    <DefDir>$(SolutionDir)$(Configuration)\$(Platform)\obj\$(ProjectName)</DefDir>
-    <RsvgLibtoolCompatibleDllPrefix>lib</RsvgLibtoolCompatibleDllPrefix>
-    <RsvgLibtoolCompatibleDllSuffix>-$(ApiVersion)-0</RsvgLibtoolCompatibleDllSuffix>
-    <RsvgSeparateVSDllPrefix />
-    <RsvgSeparateVSDllSuffix>-$(ApiVersion)-vs$(VSVer)</RsvgSeparateVSDllSuffix>
-    <RsvgDllPrefix>$(RsvgSeparateVSDllPrefix)</RsvgDllPrefix>
-    <RsvgDllSuffix>$(RsvgSeparateVSDllSuffix)</RsvgDllSuffix>
-    <PythonPath>c:\python34</PythonPath>
-  </PropertyGroup>
-  <PropertyGroup>
-    <_PropertySheetDisplayName>rsvgversionpathsprops</_PropertySheetDisplayName>
-  </PropertyGroup>
-  <ItemDefinitionGroup />
-  <ItemGroup>
-    <BuildMacro Include="RsvgMajorVersion">
-      <Value>$(RsvgMajorVersion)</Value>
-    </BuildMacro>
-    <BuildMacro Include="RsvgMinorVersion">
-      <Value>$(RsvgMinorVersion)</Value>
-    </BuildMacro>
-    <BuildMacro Include="RsvgMicroVersion">
-      <Value>$(RsvgMicroVersion)</Value>
-    </BuildMacro>
-    <BuildMacro Include="ApiVersion">
-      <Value>$(ApiVersion)</Value>
-    </BuildMacro>
-    <BuildMacro Include="VSVer">
-      <Value>$(VSVer)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GlibEtcInstallRoot">
-      <Value>$(GlibEtcInstallRoot)</Value>
-    </BuildMacro>
-    <BuildMacro Include="CopyDir">
-      <Value>$(CopyDir)</Value>
-    </BuildMacro>
-    <BuildMacro Include="DefDir">
-      <Value>$(DefDir)</Value>
-    </BuildMacro>
-    <BuildMacro Include="RsvgLibtoolCompatibleDllPrefix">
-      <Value>$(RsvgLibtoolCompatibleDllPrefix)</Value>
-    </BuildMacro>
-    <BuildMacro Include="RsvgLibtoolCompatibleDllSuffix">
-      <Value>$(RsvgLibtoolCompatibleDllSuffix)</Value>
-    </BuildMacro>
-    <BuildMacro Include="RsvgSeparateVSDllPrefix">
-      <Value>$(RsvgSeparateVSDllPrefix)</Value>
-    </BuildMacro>
-    <BuildMacro Include="RsvgSeparateVSDllSuffix">
-      <Value>$(RsvgSeparateVSDllSuffix)</Value>
-    </BuildMacro>
-    <BuildMacro Include="RsvgDllPrefix">
-      <Value>$(RsvgDllPrefix)</Value>
-    </BuildMacro>
-    <BuildMacro Include="RsvgDllSuffix">
-      <Value>$(RsvgDllSuffix)</Value>
-    </BuildMacro>
-    <BuildMacro Include="PythonPath">
-      <Value>$(PythonPath)</Value>
-    </BuildMacro>
-  </ItemGroup>
-</Project>
diff --git a/win32/vs12/rsvg-view-3.vcxproj b/win32/vs12/rsvg-view-3.vcxproj
deleted file mode 100644
index de5ebcde..00000000
--- a/win32/vs12/rsvg-view-3.vcxproj
+++ /dev/null
@@ -1,167 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.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>{2C4FC5FD-1CF0-47F9-83FC-A129EE313C1E}</ProjectGuid>
-    <RootNamespace>rsvgview3</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v120</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v120</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v120</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v120</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </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="rsvg-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="rsvg-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="rsvg-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="rsvg-build-defines.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)'=='Debug'"><LinkIncremental>true</LinkIncremental></PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)'=='Release'"><LinkIncremental>false</LinkIncremental></PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(Gtk3IncPath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader />
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>$(Gtk3Libs);$(IntlLib);%(AdditionalDependencies)</AdditionalDependencies>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(Gtk3IncPath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader />
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>$(Gtk3Libs);$(IntlLib);%(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>$(Gtk3IncPath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader />
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>$(Gtk3Libs);$(IntlLib);%(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>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(Gtk3IncPath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader />
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>$(Gtk3Libs);$(IntlLib);%(AdditionalDependencies)</AdditionalDependencies>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\rsvg-view.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="rsvg.vcxproj">
-      <Project>{3d7ef762-d969-4ac0-ab52-3cc86fa4620b}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/win32/vs12/rsvg-view-3.vcxproj.filters b/win32/vs12/rsvg-view-3.vcxproj.filters
deleted file mode 100644
index 003da321..00000000
--- a/win32/vs12/rsvg-view-3.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="..\..\rsvg-view.c"><Filter>Sources</Filter></ClCompile>
-  </ItemGroup>
-</Project>
diff --git a/win32/vs12/rsvg.vcxproj.filtersin b/win32/vs12/rsvg.vcxproj.filtersin
deleted file mode 100644
index 7d777f18..00000000
--- a/win32/vs12/rsvg.vcxproj.filtersin
+++ /dev/null
@@ -1,24 +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 "rsvg.vs12.sourcefiles.filters"
-  </ItemGroup>
-  <ItemGroup>
-    <CustomBuild Include="..\..\config.h.win32"><Filter>Resource Files</Filter></CustomBuild>
-    <CustomBuild Include="..\..\rsvg.symbols"><Filter>Resource Files</Filter></CustomBuild>
-  </ItemGroup>
-</Project>
diff --git a/win32/vs12/rsvg.vcxprojin b/win32/vs12/rsvg.vcxprojin
deleted file mode 100644
index 2c11f463..00000000
--- a/win32/vs12/rsvg.vcxprojin
+++ /dev/null
@@ -1,203 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.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>{3D7EF762-D969-4AC0-AB52-3CC86FA4620B}</ProjectGuid>
-    <RootNamespace>rsvg</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v120</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v120</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v120</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v120</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </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="rsvg-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="rsvg-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="rsvg-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="rsvg-gen-srcs.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)'=='Debug'"><LinkIncremental>true</LinkIncremental></PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)'=='Release'"><LinkIncremental>false</LinkIncremental></PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(LibRsvgIncPath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;$(LibRsvgCFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader />
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>$(LibRsvgLibs);%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(RsvgDllPrefix)$(ProjectName)$(RsvgDllSuffix).dll</OutputFile>
-      <ModuleDefinitionFile>$(IntDir)$(ProjectName).def</ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(TargetDir)$(RsvgDllPrefix)$(ProjectName)$(RsvgDllSuffix).pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(LibRsvgIncPath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>$(LibRsvgCFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader />
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>$(LibRsvgLibs);%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(RsvgDllPrefix)$(ProjectName)$(RsvgDllSuffix).dll</OutputFile>
-      <ModuleDefinitionFile>$(IntDir)$(ProjectName).def</ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(TargetDir)$(RsvgDllPrefix)$(ProjectName)$(RsvgDllSuffix).pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(LibRsvgIncPath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_DEBUG;$(LibRsvgCFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader />
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>$(LibRsvgLibs);%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(RsvgDllPrefix)$(ProjectName)$(RsvgDllSuffix).dll</OutputFile>
-      <ModuleDefinitionFile>$(IntDir)$(ProjectName).def</ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(TargetDir)$(RsvgDllPrefix)$(ProjectName)$(RsvgDllSuffix).pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>$(LibRsvgIncPath);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>$(LibRsvgCFlags);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader />
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>$(LibRsvgLibs);%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)$(RsvgDllPrefix)$(ProjectName)$(RsvgDllSuffix).dll</OutputFile>
-      <ModuleDefinitionFile>$(IntDir)$(ProjectName).def</ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(TargetDir)$(RsvgDllPrefix)$(ProjectName)$(RsvgDllSuffix).pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <ImportLibrary>$(TargetDir)$(ProjectName)-$(ApiVersion).lib</ImportLibrary>
-      <TargetMachine>MachineX64</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-#include "rsvg.vs12.sourcefiles"
-  </ItemGroup>
-  <ItemGroup>
-    <CustomBuild Include="..\..\config.h.win32">
-      <Message Condition="'$(Configuration)'=='Debug'">Copying config.h...</Message>
-      <Command Condition="'$(Configuration)'=='Debug'">$(CopyConfigH)</Command>
-      <Outputs Condition="'$(Configuration)'=='Debug'">..\..\config.h;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)'=='Release'">Copying config.h...</Message>
-      <Command Condition="'$(Configuration)'=='Release'">$(CopyConfigH)</Command>
-      <Outputs Condition="'$(Configuration)'=='Release'">..\..\config.h;%(Outputs)</Outputs>
-    </CustomBuild>
-    <CustomBuild Include="..\..\rsvg.symbols">
-      <Message Condition="'$(Configuration)'=='Debug'">Generating $(ProjectName).def...</Message>
-      <Command Condition="'$(Configuration)'=='Debug'">$(GenerateRsvgDef)</Command>
-      <Outputs Condition="'$(Configuration)'=='Debug'">$(IntDir)$(ProjectName).def;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)'=='Release'">Generating $(ProjectName).def...</Message>
-      <Command Condition="'$(Configuration)'=='Release'">$(GenerateRsvgDef)</Command>
-      <Outputs Condition="'$(Configuration)'=='Release'">$(IntDir)$(ProjectName).def;%(Outputs)</Outputs>
-    </CustomBuild>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="rsvg-rust.vcxproj">
-      <Project>{03d45804-0fba-466d-a079-e19755471c3f}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/win32/vs14/Makefile.am b/win32/vs14/Makefile.am
deleted file mode 100644
index 4008ef14..00000000
--- a/win32/vs14/Makefile.am
+++ /dev/null
@@ -1,27 +0,0 @@
-EXTRA_DIST =    \
-	librsvg.sln				\
-	rsvg-build-defines.props		\
-	rsvg-gen-srcs.props			\
-	rsvg-install.props			\
-	rsvg-version-paths.props		\
-	libpixbufloader-svg.vcxproj		\
-	libpixbufloader-svg.vcxproj.filters	\
-	rsvg.vcxproj				\
-	rsvg.vcxproj.filters			\
-	rsvg-convert.vcxproj			\
-	rsvg-convert.vcxproj.filters		\
-	rsvg-rust.vcxproj			\
-	rsvg-install.vcxproj			\
-	rsvg-install.vcxproj.filters		\
-	rsvg-view-3.vcxproj			\
-	rsvg-view-3.vcxproj.filters		\
-	README.txt
-
-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
diff --git a/win32/vs15/Makefile.am b/win32/vs15/Makefile.am
deleted file mode 100644
index 6ab5e421..00000000
--- a/win32/vs15/Makefile.am
+++ /dev/null
@@ -1,28 +0,0 @@
-EXTRA_DIST =    \
-	librsvg.sln				\
-	rsvg-build-defines.props		\
-	rsvg-gen-srcs.props			\
-	rsvg-install.props			\
-	rsvg-version-paths.props		\
-	libpixbufloader-svg.vcxproj		\
-	libpixbufloader-svg.vcxproj.filters	\
-	rsvg.vcxproj				\
-	rsvg.vcxproj.filters			\
-	rsvg-convert.vcxproj			\
-	rsvg-convert.vcxproj.filters		\
-	rsvg-rust.vcxproj			\
-	rsvg-install.vcxproj			\
-	rsvg-install.vcxproj.filters		\
-	rsvg-view-3.vcxproj			\
-	rsvg-view-3.vcxproj.filters		\
-	README.txt
-
-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