diff --git a/demos/gtk-demo/Makefile.am b/demos/gtk-demo/Makefile.am
index 9aa106257a..06167986ef 100644
--- a/demos/gtk-demo/Makefile.am
+++ b/demos/gtk-demo/Makefile.am
@@ -61,22 +61,21 @@ demos.h: $(demos) geninclude.pl
 demos.h.win32: $(demos_base) geninclude.pl
 	 $(AM_V_GEN) (here=`pwd` ; cd $(srcdir) && $(PERL) $$here/geninclude.pl $(demos_base)) > demos.h.win32
 
-nodist_gtk3_demo_SOURCES = demos.h
+nodist_gtk3_demo_SOURCES = demos.h demo_resources.c
 
 gtk3_demo_SOURCES = 		\
 	$(demos)		\
 	gtkfishbowl.c		\
 	gtkfishbowl.h		\
-	demo_resources.c	\
 	main.c
 
 gtk3_demo_DEPENDENCIES = $(DEPS)
 gtk3_demo_LDADD = $(LDADDS)
 gtk3_demo_LDFLAGS = -export-dynamic
 
-gtk3_demo_application_SOURCES = \
-	application.c 		\
-	demo_resources.c
+nodist_gtk3_demo_application_SOURCES = demo_resources.c
+
+gtk3_demo_application_SOURCES = application.c
 
 gtk3_demo_application_LDADD = $(LDADDS)
 
@@ -130,6 +129,6 @@ dist-hook: \
 	$(top_builddir)/win32/vs9/gtk3-demo.vcproj	\
 	$(top_builddir)/win32/vs9/gtk3-demo-application.vcproj
 
-DISTCLEANFILES = demos.h demos.h.win32
+DISTCLEANFILES = demos.h demos.h.win32 demo_resources.c
 
 -include $(top_srcdir)/git.mk
diff --git a/demos/icon-browser/Makefile.am b/demos/icon-browser/Makefile.am
index bf8425c86d..9183b0170c 100644
--- a/demos/icon-browser/Makefile.am
+++ b/demos/icon-browser/Makefile.am
@@ -16,16 +16,19 @@ bin_PROGRAMS = gtk3-icon-browser
 desktopdir = $(datadir)/applications
 dist_desktop_DATA = gtk3-icon-browser.desktop
 
+nodist_gtk3_icon_browser_SOURCES = resources.c
+
 gtk3_icon_browser_SOURCES = \
 	main.c \
 	iconbrowserapp.c iconbrowserapp.h \
 	iconbrowserwin.c iconbrowserwin.h \
-	iconstore.c iconstore.h \
-	resources.c
+	iconstore.c iconstore.h
 
 BUILT_SOURCES = \
 	resources.c
 
+DISTCLEANFILES = resources.c
+
 resources.c: iconbrowser.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/iconbrowser.gresource.xml)
 	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $(srcdir)/iconbrowser.gresource.xml \
 		--target=$@ --sourcedir=$(srcdir) --generate-source
diff --git a/demos/widget-factory/Makefile.am b/demos/widget-factory/Makefile.am
index c33a6d0a95..5faacb00fd 100644
--- a/demos/widget-factory/Makefile.am
+++ b/demos/widget-factory/Makefile.am
@@ -5,9 +5,9 @@ bin_PROGRAMS = gtk3-widget-factory
 desktopdir = $(datadir)/applications
 dist_desktop_DATA = gtk3-widget-factory.desktop
 
-gtk3_widget_factory_SOURCES = 		\
-	widget-factory.c		\
-	widget_factory_resources.c
+nodist_gtk3_widget_factory_SOURCES = widget_factory_resources.c
+
+gtk3_widget_factory_SOURCES = widget-factory.c
 
 BUILT_SOURCES = 			\
 	widget_factory_resources.c
@@ -69,4 +69,6 @@ EXTRA_DIST += 				\
 	data/symbolic-source.svg	\
 	meson.build
 
+DISTCLEANFILES = widget_factory_resources.c
+
 -include $(top_srcdir)/git.mk
diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index e5eb5e43a6..9874a6d5c4 100644
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -203,7 +203,6 @@ lib_LTLIBRARIES = libgdk-3.la
 
 MAINTAINERCLEANFILES = $(gdk_built_sources) stamp-gdkenumtypes.h
 EXTRA_DIST += \
-	$(gdk_built_sources)	\
 	fallback-c89.c
 
 install-exec-hook:
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 7474ed0d2b..946e72febc 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -255,7 +255,9 @@ DISTCLEANFILES += gtk-win32.rc
 endif
 
 EXTRA_DIST += $(gtk_all_private_h_sources) $(gtk_extra_sources)
-EXTRA_DIST += $(gtk_built_sources)
+
+# We need to dist this for `make distcheck`, apparently...
+EXTRA_DIST += gtk.gresource.xml
 
 
 pkgdatadir = $(datadir)/gtk-$(GTK_API_VERSION)
diff --git a/win32/generate-msvc.mak b/win32/generate-msvc.mak
index fe1523019c..e32c1571a9 100644
--- a/win32/generate-msvc.mak
+++ b/win32/generate-msvc.mak
@@ -271,7 +271,7 @@ regenerate-demos-h-win32: ..\demos\gtk-demo\geninclude.py $(demo_actual_sources)
 	@cd ..\..\win32
 	@echo Regenerating gtk3-demo VS project files...
 	@-del vs9\$(DEMO_VS9_PROJ) vs10\$(DEMO_VS10_PROJ) vs10\$(DEMO_VS10_PROJ_FILTERS)
-	@for %%s in ($(demo_sources) gtkfishbowl.c demo_resources.c main.c) do	\
+	@for %%s in ($(demo_sources) gtkfishbowl.c main.c) do	\
 	@echo.   ^<File RelativePath^="..\..\demos\gtk-demo\%%s" /^>>>gtk3-demo.sourcefiles & \
 	@echo.   ^<ClCompile Include^="..\..\demos\gtk-demo\%%s" /^>>>gtk3-demo.vs10.sourcefiles & \
 	@echo.   ^<ClCompile Include^="..\..\demos\gtk-demo\%%s"^>^<Filter^>Source Files^</Filter^>^</ClCompile^>>>gtk3-demo.vs10.sourcefiles.filters
diff --git a/win32/vs10/gtk3-demo-application.vcxproj.filtersin b/win32/vs10/gtk3-demo-application.vcxproj.filtersin
index 5b356ef76b..b6dc6bdd9d 100644
--- a/win32/vs10/gtk3-demo-application.vcxproj.filtersin
+++ b/win32/vs10/gtk3-demo-application.vcxproj.filtersin
@@ -16,5 +16,6 @@
   </ItemGroup>
   <ItemGroup>
 #include "gtk3-demo-application.vs10.sourcefiles.filters"
+    <ClCompile Include="..\..\demos\gtk-demo\demo_resources.c"><Filter>Source Files</Filter></ClCompile>
   </ItemGroup>
 </Project>
diff --git a/win32/vs10/gtk3-demo-application.vcxprojin b/win32/vs10/gtk3-demo-application.vcxprojin
index a0f78dc980..d4dae5b14b 100644
--- a/win32/vs10/gtk3-demo-application.vcxprojin
+++ b/win32/vs10/gtk3-demo-application.vcxprojin
@@ -79,6 +79,7 @@
   </ItemDefinitionGroup>
   <ItemGroup>
 #include "gtk3-demo-application.vs10.sourcefiles"
+    <ClCompile Include="..\..\demos\gtk-demo\demo_resources.c" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="gdk-3.vcxproj">
diff --git a/win32/vs10/gtk3-demo.vcxproj.filtersin b/win32/vs10/gtk3-demo.vcxproj.filtersin
index a8fa97ddc6..b67f402acb 100644
--- a/win32/vs10/gtk3-demo.vcxproj.filtersin
+++ b/win32/vs10/gtk3-demo.vcxproj.filtersin
@@ -12,5 +12,6 @@
   </ItemGroup>
   <ItemGroup>
 #include "gtk3-demo.vs10.sourcefiles.filters"
+    <ClCompile Include="..\..\demos\gtk-demo\demo_resources.c"><Filter>Source Files</Filter></ClCompile>
   </ItemGroup>
 </Project>
diff --git a/win32/vs10/gtk3-demo.vcxprojin b/win32/vs10/gtk3-demo.vcxprojin
index 0848a45bb4..4d00d11f2d 100644
--- a/win32/vs10/gtk3-demo.vcxprojin
+++ b/win32/vs10/gtk3-demo.vcxprojin
@@ -80,6 +80,7 @@
   </ItemDefinitionGroup>
   <ItemGroup>
 #include "gtk3-demo.vs10.sourcefiles"
+    <ClCompile Include="..\..\demos\gtk-demo\demo_resources.c" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="gdk-3.vcxproj">
diff --git a/win32/vs10/gtk3-icon-browser.vcxproj.filtersin b/win32/vs10/gtk3-icon-browser.vcxproj.filtersin
index 2063a07e95..1822eb1e0a 100644
--- a/win32/vs10/gtk3-icon-browser.vcxproj.filtersin
+++ b/win32/vs10/gtk3-icon-browser.vcxproj.filtersin
@@ -16,5 +16,6 @@
   </ItemGroup>
   <ItemGroup>
 #include "gtk3-icon-browser.vs10.sourcefiles.filters"
+    <ClCompile Include="..\..\demos\icon-browser\resources.c"><Filter>Source Files</Filter></ClCompile>
   </ItemGroup>
 </Project>
diff --git a/win32/vs10/gtk3-icon-browser.vcxprojin b/win32/vs10/gtk3-icon-browser.vcxprojin
index 0fc1738254..098d566e4a 100644
--- a/win32/vs10/gtk3-icon-browser.vcxprojin
+++ b/win32/vs10/gtk3-icon-browser.vcxprojin
@@ -82,6 +82,7 @@
   </ItemDefinitionGroup>
   <ItemGroup>
 #include "gtk3-icon-browser.vs10.sourcefiles"
+    <ClCompile Include="..\..\demos\icon-browser\resources.c" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="gdk-3.vcxproj">
diff --git a/win32/vs9/gtk3-demo-application.vcprojin b/win32/vs9/gtk3-demo-application.vcprojin
index 41a2d3367b..b9eb1577e7 100644
--- a/win32/vs9/gtk3-demo-application.vcprojin
+++ b/win32/vs9/gtk3-demo-application.vcprojin
@@ -153,6 +153,7 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 #include "gtk3-demo-application.sourcefiles"
+			<File RelativePath="..\..\demos\gtk-demo\demo_resources.c" />
 		</Filter>
 		<Filter
 			Name="Headers"
diff --git a/win32/vs9/gtk3-demo.vcprojin b/win32/vs9/gtk3-demo.vcprojin
index 48e1f9f60a..50d279c442 100644
--- a/win32/vs9/gtk3-demo.vcprojin
+++ b/win32/vs9/gtk3-demo.vcprojin
@@ -157,6 +157,7 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 #include "gtk3-demo.sourcefiles"
+			<File RelativePath="..\..\demos\gtk-demo\demo_resources.c" />
 		</Filter>
 		<Filter
 			Name="Header Files"
diff --git a/win32/vs9/gtk3-icon-browser.vcprojin b/win32/vs9/gtk3-icon-browser.vcprojin
index 971235aff8..cc2c8b7782 100644
--- a/win32/vs9/gtk3-icon-browser.vcprojin
+++ b/win32/vs9/gtk3-icon-browser.vcprojin
@@ -157,6 +157,7 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 #include "gtk3-icon-browser.sourcefiles"
+			<File RelativePath="..\..\demos\icon-browser\resources.c" />
 		</Filter>
 		<Filter
 			Name="Headers"