diff --git a/app/widgets/.gitignore b/app/widgets/.gitignore
index 1863c92fdf..4d49016db1 100644
--- a/app/widgets/.gitignore
+++ b/app/widgets/.gitignore
@@ -6,3 +6,5 @@
 /libappwidgets.a
 /libappwidgets.la
 /xgen-wec
+/gimp-tool-cursors.c
+/gimp-tool-cursors.h
diff --git a/app/widgets/Makefile.am b/app/widgets/Makefile.am
index 13a64d0870..40ba703ebe 100644
--- a/app/widgets/Makefile.am
+++ b/app/widgets/Makefile.am
@@ -456,10 +456,14 @@ libappwidgets_a_sources = \
 	gimpwindowstrategy.c		\
 	gimpwindowstrategy.h
 
-libappwidgets_a_built_sources = widgets-enums.c
+libappwidgets_a_built_sources = \
+	gimp-tool-cursors.c	\
+	gimp-tool-cursors.h	\
+	widgets-enums.c
 
 libappwidgets_a_SOURCES = \
-	$(libappwidgets_a_built_sources) $(libappwidgets_a_sources)
+	$(libappwidgets_a_built_sources)	\
+	$(libappwidgets_a_sources)
 
 
 #
@@ -492,3 +496,14 @@ $(srcdir)/widgets-enums.c: xgen-wec
 		touch $@ 2> /dev/null \
 		|| true; \
 	fi
+
+
+gimp-tool-cursors.h: $(top_builddir)/cursors/gimp-tool-cursors.gresource.xml
+	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) \
+	  --sourcedir=$(top_srcdir)/cursors --generate-header \
+	  --target=$@ $(top_builddir)/cursors/gimp-tool-cursors.gresource.xml
+
+gimp-tool-cursors.c: gimp-tool-cursors.h
+	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) \
+	  --sourcedir=$(top_srcdir)/cursors --generate-source \
+	  --target=$@ $(top_builddir)/cursors/gimp-tool-cursors.gresource.xml
diff --git a/app/widgets/gimpcursor.c b/app/widgets/gimpcursor.c
index 453b8b17f3..9e048f3862 100644
--- a/app/widgets/gimpcursor.c
+++ b/app/widgets/gimpcursor.c
@@ -23,8 +23,6 @@
 
 #include "gimpcursor.h"
 
-#include "cursors/gimp-tool-cursors.c"
-
 
 #define cursor_default_x_hot 10
 #define cursor_default_y_hot 10
diff --git a/cursors/.gitignore b/cursors/.gitignore
index 7cdea3a30d..6052760c48 100644
--- a/cursors/.gitignore
+++ b/cursors/.gitignore
@@ -1,8 +1,4 @@
 /Makefile
 /Makefile.in
-/.xvpics
-/.thumbnails
-/gimp-color-picker-cursors.c
 /gimp-color-picker-cursors.gresource.xml
-/gimp-tool-cursors.c
 /gimp-tool-cursors.gresource.xml
diff --git a/cursors/Makefile.am b/cursors/Makefile.am
index 1865769de9..dd366cee8d 100644
--- a/cursors/Makefile.am
+++ b/cursors/Makefile.am
@@ -87,10 +87,6 @@ EXTRA_DIST = \
 	$(CURSOR_IMAGES)			\
 	gimp-tool-cursors.xcf
 
-noinst_DATA = \
-	gimp-tool-cursors.c			\
-	gimp-color-picker-cursors.c
-
 CLEANFILES = \
 	$(noinst_DATA)				\
 	gimp-tool-cursors.gresource.xml		\
@@ -108,12 +104,6 @@ gimp-tool-cursors.gresource.xml: $(CURSOR_IMAGES) Makefile.am
 	  echo '  </gresource>' >> $@; \
 	  echo '</gresources>' >> $@ )
 
-gimp-tool-cursors.c: gimp-tool-cursors.gresource.xml
-	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) \
-	  --sourcedir=$(srcdir) --generate-source \
-	  --target=$@ gimp-tool-cursors.gresource.xml
-
-
 gimp-color-picker-cursors.gresource.xml: $(CURSOR_IMAGES) Makefile.am
 	$(AM_V_GEN) ( rm -f $@; \
 	  echo '<?xml version="1.0" encoding="UTF-8"?>' > $@; \
@@ -129,8 +119,3 @@ gimp-color-picker-cursors.gresource.xml: $(CURSOR_IMAGES) Makefile.am
 	  done; \
 	  echo '  </gresource>' >> $@; \
 	  echo '</gresources>' >> $@ )
-
-gimp-color-picker-cursors.c: gimp-color-picker-cursors.gresource.xml
-	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) \
-	  --sourcedir=$(srcdir) --generate-source \
-	  --target=$@ gimp-color-picker-cursors.gresource.xml
diff --git a/libgimpwidgets/.gitignore b/libgimpwidgets/.gitignore
index 8e4312fd35..ec95e47016 100644
--- a/libgimpwidgets/.gitignore
+++ b/libgimpwidgets/.gitignore
@@ -13,3 +13,5 @@
 /*.trs
 /*.log
 /xgen-wec
+/gimp-color-picker-cursors.c
+/gimp-color-picker-cursors.h
diff --git a/libgimpwidgets/Makefile.am b/libgimpwidgets/Makefile.am
index 3dd3a14ae9..0ec9d8d51d 100644
--- a/libgimpwidgets/Makefile.am
+++ b/libgimpwidgets/Makefile.am
@@ -194,8 +194,10 @@ libgimpwidgets_sources = \
 	gimpzoommodel.h
 
 libgimpwidgets_built_sources = \
-	gimpwidgetsenums.c	\
-	gimpwidgetsmarshal.c	\
+	gimp-color-picker-cursors.c	\
+	gimp-color-picker-cursors.h	\
+	gimpwidgetsenums.c		\
+	gimpwidgetsmarshal.c		\
 	gimpwidgetsmarshal.h
 
 libgimpwidgets_extra_sources = gimpwidgetsmarshal.list
@@ -345,6 +347,16 @@ gimpwidgetsmarshal.c: gimpwidgetsmarshal.h
 	&& cp xgen-wmc $(@F) \
 	&& rm -f xgen-wmc xgen-wmc~
 
+gimp-color-picker-cursors.h: $(top_builddir)/cursors/gimp-color-picker-cursors.gresource.xml
+	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) \
+	  --sourcedir=$(top_srcdir)/cursors --generate-header \
+	  --target=$@ $(top_builddir)/cursors/gimp-color-picker-cursors.gresource.xml
+
+gimp-color-picker-cursors.c: gimp-color-picker-cursors.h
+	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) \
+	  --sourcedir=$(top_srcdir)/cursors --generate-source \
+	  --target=$@ $(top_builddir)/cursors/gimp-color-picker-cursors.gresource.xml
+
 
 #
 # test programs, not installed
diff --git a/libgimpwidgets/gimppickbutton-default.c b/libgimpwidgets/gimppickbutton-default.c
index c0b487b466..454f2a2e1e 100644
--- a/libgimpwidgets/gimppickbutton-default.c
+++ b/libgimpwidgets/gimppickbutton-default.c
@@ -39,8 +39,6 @@
 #include "gimppickbutton-private.h"
 #include "gimpwidgetsutils.h"
 
-#include "cursors/gimp-color-picker-cursors.c"
-
 #include "libgimp/libgimp-intl.h"
 
 
diff --git a/libgimpwidgets/gimppickbutton-quartz.c b/libgimpwidgets/gimppickbutton-quartz.c
index afb9b1d986..2fbed2cfb5 100644
--- a/libgimpwidgets/gimppickbutton-quartz.c
+++ b/libgimpwidgets/gimppickbutton-quartz.c
@@ -27,8 +27,6 @@
 #include "gimppickbutton-private.h"
 #include "gimppickbutton-quartz.h"
 
-#include "cursors/gimp-color-picker-cursors.c"
-
 #ifdef GDK_WINDOWING_QUARTZ
 #import <AppKit/AppKit.h>
 #include <Carbon/Carbon.h>  /* For virtual key codes ... */