diff --git a/build/Makefile.am b/build/Makefile.am
index 931735b4fa..1e6b82587d 100644
--- a/build/Makefile.am
+++ b/build/Makefile.am
@@ -8,6 +8,7 @@ EXTRA_DIST += \
gen-file-list-gtk.py \
detectenv_msvc.mak \
introspection-msvc.mak \
+ gtk-introspection-msvc.mak.in \
gtk-introspection-msvc.mak
-include $(top_srcdir)/git.mk
diff --git a/build/gtk-introspection-msvc.mak b/build/gtk-introspection-msvc.mak.in
similarity index 98%
rename from build/gtk-introspection-msvc.mak
rename to build/gtk-introspection-msvc.mak.in
index fe1fa3fd66..97130232d3 100644
--- a/build/gtk-introspection-msvc.mak
+++ b/build/gtk-introspection-msvc.mak.in
@@ -74,7 +74,7 @@ Gtk-$(APIVERSION).gir: gtk_list
--pkg-export gtk+-3.0 --warn-all --c-include="gtk/gtkx.h" \
-DG_LOG_DOMAIN=\"Gtk\" -DGTK_LIBDIR=\"/dummy/lib\" \
$(TIME_T_DEFINE) -DGTK_DATADIR=\"/dummy/share\" -DGTK_DATA_PREFIX=\"/dummy\" \
- -DGTK_SYSCONFDIR=\"/dummy/etc\" -DGTK_VERSION=\"3.12.0\" \
+ -DGTK_SYSCONFDIR=\"/dummy/etc\" -DGTK_VERSION=\"@GTK_VERSION@\" \
-DGTK_BINARY_VERSION=\"3.0.0\" -DGTK_HOST=\"i686-pc-vs$(VSVER)\" \
-DGTK_COMPILATION -DGTK_PRINT_BACKENDS=\"file\" \
-DGTK_PRINT_PREVIEW_COMMAND=\"undefined-gtk-print-preview-command\" \
diff --git a/build/win32/vs10/Makefile.am b/build/win32/vs10/Makefile.am
index ba9b0aab9c..74767fb43e 100644
--- a/build/win32/vs10/Makefile.am
+++ b/build/win32/vs10/Makefile.am
@@ -36,6 +36,7 @@ EXTRA_DIST += \
gtk-gen-srcs.props \
gtk-ignore-broadway.props \
gtk-install.props \
+ gtk-version-paths.props.in \
gtk-version-paths.props
-include $(top_srcdir)/git.mk
diff --git a/build/win32/vs10/gtk-version-paths.props b/build/win32/vs10/gtk-version-paths.props.in
similarity index 94%
rename from build/win32/vs10/gtk-version-paths.props
rename to build/win32/vs10/gtk-version-paths.props.in
index f23f373635..ea2a1dc3e5 100644
--- a/build/win32/vs10/gtk-version-paths.props
+++ b/build/win32/vs10/gtk-version-paths.props.in
@@ -5,6 +5,7 @@
$(SolutionDir)\..\..\..\..\vs$(VSVer)\$(Platform)
..\..\..\..\vs$(VSVer)\$(Platform)
3.0
+ @GTK_VERSION@
lib
-$(ApiVersion)-0
@@ -29,6 +30,9 @@
$(ApiVersion)
+
+ $(GtkVersion)
+
$(GtkLibtoolCompatibleDllPrefix)
diff --git a/build/win32/vs9/Makefile.am b/build/win32/vs9/Makefile.am
index f5d6f21f4e..18e3fe38dd 100644
--- a/build/win32/vs9/Makefile.am
+++ b/build/win32/vs9/Makefile.am
@@ -23,6 +23,7 @@ EXTRA_DIST += \
gtk-gen-srcs.vsprops \
gtk-ignore-broadway.vsprops \
gtk-install.vsprops \
+ gtk-version-paths.vsprops.in \
gtk-version-paths.vsprops
-include $(top_srcdir)/git.mk
diff --git a/build/win32/vs9/gtk-version-paths.vsprops b/build/win32/vs9/gtk-version-paths.vsprops.in
similarity index 94%
rename from build/win32/vs9/gtk-version-paths.vsprops
rename to build/win32/vs9/gtk-version-paths.vsprops.in
index c12a839c1f..7f2d1026c2 100644
--- a/build/win32/vs9/gtk-version-paths.vsprops
+++ b/build/win32/vs9/gtk-version-paths.vsprops.in
@@ -20,6 +20,10 @@
Name="ApiVersion"
Value="3.0"
/>
+