diff --git a/Makefile.am b/Makefile.am
index 39bfe4c4a3..cb2f06346c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -180,6 +180,7 @@ include $(top_srcdir)/libgimpconfig/Makefile.gi
 include $(top_srcdir)/libgimpmath/Makefile.gi
 include $(top_srcdir)/libgimpmodule/Makefile.gi
 include $(top_srcdir)/libgimpthumb/Makefile.gi
+include $(top_srcdir)/libgimpwidgets/Makefile.gi
 
 INTROSPECTION_GIRS =
 INTROSPECTION_SCANNER_ARGS = --warn-all --add-include-path="$(srcdir)" --add-include-path="$(shell $(PKG_CONFIG) --define-variable=datadir="$(datadir)" --variable=girdir gobject-introspection-1.0)"
@@ -195,6 +196,7 @@ Gimp-@GIMP_API_VERSION@.gir: \
 	libgimpmath/libgimpmath-@GIMP_API_VERSION@.la		\
 	libgimpmodule/libgimpmodule-@GIMP_API_VERSION@.la	\
 	libgimpthumb/libgimpthumb-@GIMP_API_VERSION@.la		\
+	libgimpwidgets/libgimpwidgets-@GIMP_API_VERSION@.la	\
 	Makefile
 
 # The various other GObject-Introspected libraries our API references
@@ -215,6 +217,7 @@ Gimp_@GIMP_API_MAJOR_VERSION@_@GIMP_API_MINOR_VERSION@_gir_CFLAGS = \
 	-DGIMP_MATH_COMPILATION		\
 	-DGIMP_MODULE_COMPILATION	\
 	-DGIMP_THUMB_COMPILATION	\
+	-DGIMP_WIDGETS_COMPILATION	\
 	$(AM_CFLAGS)			\
 	$(AM_CPPFLAGS)			\
 	-I$(top_builddir)		\
@@ -233,7 +236,8 @@ Gimp_@GIMP_API_MAJOR_VERSION@_@GIMP_API_MINOR_VERSION@_gir_LIBS = \
 	libgimpconfig/libgimpconfig-@GIMP_API_VERSION@.la	\
 	libgimpmath/libgimpmath-@GIMP_API_VERSION@.la		\
 	libgimpmodule/libgimpmodule-@GIMP_API_VERSION@.la	\
-	libgimpthumb/libgimpthumb-@GIMP_API_VERSION@.la
+	libgimpthumb/libgimpthumb-@GIMP_API_VERSION@.la		\
+	libgimpwidgets/libgimpwidgets-@GIMP_API_VERSION@.la
 
 Gimp_@GIMP_API_MAJOR_VERSION@_@GIMP_API_MINOR_VERSION@_gir_FILES = 	\
 	$(libgimp_introspectable)					\
@@ -243,7 +247,8 @@ Gimp_@GIMP_API_MAJOR_VERSION@_@GIMP_API_MINOR_VERSION@_gir_FILES = 	\
 	$(libgimpconfig_introspectable)					\
 	$(libgimpmath_introspectable)					\
 	$(libgimpmodule_introspectable)					\
-	$(libgimpthumb_introspectable)
+	$(libgimpthumb_introspectable)					\
+	$(libgimpwidgets_introspectable)
 
 INTROSPECTION_GIRS += Gimp-@GIMP_API_VERSION@.gir
 
diff --git a/libgimpwidgets/Makefile.am b/libgimpwidgets/Makefile.am
index 2e3ee30e99..ab0fde6430 100644
--- a/libgimpwidgets/Makefile.am
+++ b/libgimpwidgets/Makefile.am
@@ -73,129 +73,25 @@ AM_LDFLAGS = \
 
 lib_LTLIBRARIES = libgimpwidgets-@GIMP_API_VERSION@.la
 
+AUTOMAKE_OPTIONS = subdir-objects
+include $(top_srcdir)/libgimpwidgets/Makefile.gi
+
 libgimpwidgets_sources = \
-	gimpbrowser.c			\
-	gimpbrowser.h			\
-	gimpbusybox.c			\
-	gimpbusybox.h			\
-	gimpbutton.c			\
-	gimpbutton.h			\
-	gimpcairo-utils.c		\
-	gimpcairo-utils.h		\
-	gimpcellrenderercolor.c		\
-	gimpcellrenderercolor.h		\
-	gimpcellrenderertoggle.c	\
-	gimpcellrenderertoggle.h	\
-	gimpchainbutton.c		\
-	gimpchainbutton.h		\
-	gimpcolorarea.c			\
-	gimpcolorarea.h			\
-	gimpcolorbutton.c		\
-	gimpcolorbutton.h		\
-	gimpcolordisplay.c		\
-	gimpcolordisplay.h		\
-	gimpcolordisplaystack.c		\
-	gimpcolordisplaystack.h		\
-	gimpcolorhexentry.c		\
-	gimpcolorhexentry.h		\
-	gimpcolornotebook.c		\
-	gimpcolornotebook.h		\
-	gimpcolorprofilechooserdialog.c	\
-	gimpcolorprofilechooserdialog.h	\
-	gimpcolorprofilecombobox.c	\
-	gimpcolorprofilecombobox.h	\
 	gimpcolorprofilestore-private.h	\
-	gimpcolorprofilestore.c		\
-	gimpcolorprofilestore.h		\
-	gimpcolorprofileview.c		\
-	gimpcolorprofileview.h		\
 	gimpcolorscale.c		\
 	gimpcolorscale.h		\
 	gimpcolorscales.c		\
 	gimpcolorscales.h		\
 	gimpcolorselect.c		\
 	gimpcolorselect.h		\
-	gimpcolorselection.c		\
-	gimpcolorselection.h		\
-	gimpcolorselector.c		\
-	gimpcolorselector.h		\
 	gimpcontroller.c		\
 	gimpcontroller.h		\
-	gimpdialog.c			\
-	gimpdialog.h			\
 	gimpeevl.c			\
 	gimpeevl.h			\
-	gimpenumcombobox.c		\
-	gimpenumcombobox.h		\
-	gimpenumlabel.c			\
-	gimpenumlabel.h			\
-	gimpenumstore.c			\
-	gimpenumstore.h			\
-	gimpenumwidgets.c		\
-	gimpenumwidgets.h		\
-	gimpfileentry.c			\
-	gimpfileentry.h			\
-	gimpframe.c			\
-	gimpframe.h			\
-	gimphelpui.c			\
-	gimphelpui.h			\
-	gimphintbox.c			\
-	gimphintbox.h			\
-	gimpicons.c			\
-	gimpicons.h			\
-	gimpintcombobox.c		\
-	gimpintcombobox.h		\
-	gimpintstore.c			\
-	gimpintstore.h			\
-	gimpmemsizeentry.c		\
-	gimpmemsizeentry.h		\
-	gimpnumberpairentry.c		\
-	gimpnumberpairentry.h		\
-	gimpoffsetarea.c		\
-	gimpoffsetarea.h		\
-	gimppageselector.c		\
-	gimppageselector.h		\
-	gimppatheditor.c		\
-	gimppatheditor.h		\
-	gimppickbutton.c		\
-	gimppickbutton.h		\
 	gimppickbutton-private.h	\
-	gimppreview.c			\
-	gimppreview.h			\
-	gimppreviewarea.c		\
-	gimppreviewarea.h		\
-	gimppropwidgets.c		\
-	gimppropwidgets.h		\
-	gimpquerybox.c			\
-	gimpquerybox.h			\
-	gimpruler.c			\
-	gimpruler.h			\
-	gimpscaleentry.c		\
-	gimpscaleentry.h		\
-	gimpscrolledpreview.c		\
-	gimpscrolledpreview.h		\
-	gimpsizeentry.c			\
-	gimpsizeentry.h			\
-	gimpspinbutton.c		\
-	gimpspinbutton.h		\
-	gimpstringcombobox.c		\
-	gimpstringcombobox.h		\
-	gimpunitcombobox.c		\
-	gimpunitcombobox.h		\
-	gimpunitstore.c			\
-	gimpunitstore.h			\
-	gimpwidgets-error.c		\
-	gimpwidgets-error.h		\
 	gimpwidgets-private.c		\
 	gimpwidgets-private.h		\
-	gimpwidgets.c			\
-	gimpwidgets.h			\
-	gimpwidgetsenums.h		\
-	gimpwidgetstypes.h		\
-	gimpwidgetsutils.c		\
-	gimpwidgetsutils.h		\
-	gimpzoommodel.c			\
-	gimpzoommodel.h
+	$(libgimpwidgets_introspectable)
 
 libgimpwidgets_built_sources = \
 	gimp-color-picker-cursors.c	\
@@ -213,65 +109,11 @@ libgimpwidgets_@GIMP_API_VERSION@_la_SOURCES = \
 	$(libgimpwidgets_sources)
 
 libgimpwidgetsinclude_HEADERS = \
-	gimpbrowser.h			\
-	gimpbusybox.h			\
-	gimpbutton.h			\
-	gimpcairo-utils.h		\
-	gimpcellrenderercolor.h		\
-	gimpcellrenderertoggle.h	\
-	gimpchainbutton.h		\
-	gimpcolorarea.h			\
-	gimpcolorbutton.h		\
-	gimpcolordisplay.h		\
-	gimpcolordisplaystack.h		\
-	gimpcolorhexentry.h		\
-	gimpcolornotebook.h		\
-	gimpcolorprofilechooserdialog.h	\
-	gimpcolorprofilecombobox.h	\
-	gimpcolorprofilestore.h		\
-	gimpcolorprofileview.h		\
 	gimpcolorscale.h		\
 	gimpcolorscales.h		\
 	gimpcolorselect.h		\
-	gimpcolorselection.h		\
-	gimpcolorselector.h		\
 	gimpcontroller.h		\
-	gimpdialog.h			\
-	gimpenumcombobox.h		\
-	gimpenumlabel.h			\
-	gimpenumstore.h			\
-	gimpenumwidgets.h		\
-	gimpfileentry.h			\
-	gimpframe.h			\
-	gimphelpui.h			\
-	gimphintbox.h			\
-	gimpicons.h			\
-	gimpintcombobox.h		\
-	gimpintstore.h			\
-	gimpmemsizeentry.h		\
-	gimpnumberpairentry.h		\
-	gimpoffsetarea.h		\
-	gimppageselector.h		\
-	gimppatheditor.h		\
-	gimppickbutton.h		\
-	gimppreview.h			\
-	gimppreviewarea.h		\
-	gimppropwidgets.h		\
-	gimpquerybox.h			\
-	gimpruler.h			\
-	gimpscaleentry.h		\
-	gimpscrolledpreview.h		\
-	gimpsizeentry.h			\
-	gimpspinbutton.h		\
-	gimpstringcombobox.h		\
-	gimpunitcombobox.h		\
-	gimpunitstore.h			\
-	gimpwidgets-error.h		\
-	gimpwidgets.h			\
-	gimpwidgetsenums.h		\
-	gimpwidgetstypes.h		\
-	gimpwidgetsutils.h		\
-	gimpzoommodel.h
+	$(libgimpwidgets_introspectable_headers)
 
 libgimpwidgets_@GIMP_API_VERSION@_la_LDFLAGS = \
 	-version-info $(LT_VERSION_INFO)	\
diff --git a/libgimpwidgets/Makefile.gi b/libgimpwidgets/Makefile.gi
new file mode 100644
index 0000000000..0c9ae7fae8
--- /dev/null
+++ b/libgimpwidgets/Makefile.gi
@@ -0,0 +1,118 @@
+libgimpwidgets_introspectable_headers =	\
+	$(top_srcdir)/libgimpwidgets/gimpbrowser.h			\
+	$(top_srcdir)/libgimpwidgets/gimpbusybox.h			\
+	$(top_srcdir)/libgimpwidgets/gimpbutton.h			\
+	$(top_srcdir)/libgimpwidgets/gimpcairo-utils.h			\
+	$(top_srcdir)/libgimpwidgets/gimpcellrenderercolor.h		\
+	$(top_srcdir)/libgimpwidgets/gimpcellrenderertoggle.h		\
+	$(top_srcdir)/libgimpwidgets/gimpchainbutton.h			\
+	$(top_srcdir)/libgimpwidgets/gimpcolorarea.h			\
+	$(top_srcdir)/libgimpwidgets/gimpcolorbutton.h			\
+	$(top_srcdir)/libgimpwidgets/gimpcolordisplay.h			\
+	$(top_srcdir)/libgimpwidgets/gimpcolordisplaystack.h		\
+	$(top_srcdir)/libgimpwidgets/gimpcolorhexentry.h		\
+	$(top_srcdir)/libgimpwidgets/gimpcolornotebook.h		\
+	$(top_srcdir)/libgimpwidgets/gimpcolorprofilechooserdialog.h	\
+	$(top_srcdir)/libgimpwidgets/gimpcolorprofilecombobox.h		\
+	$(top_srcdir)/libgimpwidgets/gimpcolorprofilestore.h   		\
+	$(top_srcdir)/libgimpwidgets/gimpcolorprofileview.h    		\
+##	$(top_srcdir)/libgimpwidgets/gimpcolorscale.h
+##	$(top_srcdir)/libgimpwidgets/gimpcolorscales.h
+##	$(top_srcdir)/libgimpwidgets/gimpcolorselect.h
+	$(top_srcdir)/libgimpwidgets/gimpcolorselection.h      		\
+	$(top_srcdir)/libgimpwidgets/gimpcolorselector.h       		\
+	$(top_srcdir)/libgimpwidgets/gimpdialog.h	       		\
+	$(top_srcdir)/libgimpwidgets/gimpenumcombobox.h	       		\
+	$(top_srcdir)/libgimpwidgets/gimpenumlabel.h	       		\
+	$(top_srcdir)/libgimpwidgets/gimpenumstore.h	       		\
+	$(top_srcdir)/libgimpwidgets/gimpenumwidgets.h	       		\
+	$(top_srcdir)/libgimpwidgets/gimpfileentry.h	       		\
+	$(top_srcdir)/libgimpwidgets/gimpframe.h	       		\
+	$(top_srcdir)/libgimpwidgets/gimphelpui.h	       		\
+	$(top_srcdir)/libgimpwidgets/gimphintbox.h	       		\
+	$(top_srcdir)/libgimpwidgets/gimpicons.h	       		\
+	$(top_srcdir)/libgimpwidgets/gimpintcombobox.h	       		\
+	$(top_srcdir)/libgimpwidgets/gimpintstore.h	       		\
+	$(top_srcdir)/libgimpwidgets/gimpmemsizeentry.h	       		\
+	$(top_srcdir)/libgimpwidgets/gimpnumberpairentry.h     		\
+	$(top_srcdir)/libgimpwidgets/gimpoffsetarea.h	       		\
+	$(top_srcdir)/libgimpwidgets/gimppageselector.h	       		\
+	$(top_srcdir)/libgimpwidgets/gimppatheditor.h	       		\
+	$(top_srcdir)/libgimpwidgets/gimppickbutton.h	       		\
+	$(top_srcdir)/libgimpwidgets/gimppreview.h	       		\
+	$(top_srcdir)/libgimpwidgets/gimppreviewarea.h	       		\
+	$(top_srcdir)/libgimpwidgets/gimppropwidgets.h	       		\
+	$(top_srcdir)/libgimpwidgets/gimpquerybox.h	       		\
+	$(top_srcdir)/libgimpwidgets/gimpruler.h	       		\
+	$(top_srcdir)/libgimpwidgets/gimpscaleentry.h	       		\
+	$(top_srcdir)/libgimpwidgets/gimpscrolledpreview.h     		\
+	$(top_srcdir)/libgimpwidgets/gimpsizeentry.h	       		\
+	$(top_srcdir)/libgimpwidgets/gimpspinbutton.h	       		\
+	$(top_srcdir)/libgimpwidgets/gimpstringcombobox.h      		\
+	$(top_srcdir)/libgimpwidgets/gimpunitcombobox.h	       		\
+	$(top_srcdir)/libgimpwidgets/gimpunitstore.h	       		\
+	$(top_srcdir)/libgimpwidgets/gimpwidgets-error.h       		\
+	$(top_srcdir)/libgimpwidgets/gimpwidgets.h	       		\
+	$(top_srcdir)/libgimpwidgets/gimpwidgetsenums.h	       		\
+	$(top_srcdir)/libgimpwidgets/gimpwidgetstypes.h	       		\
+	$(top_srcdir)/libgimpwidgets/gimpwidgetsutils.h	       		\
+	$(top_srcdir)/libgimpwidgets/gimpzoommodel.h
+
+libgimpwidgets_introspectable =	\
+	$(top_srcdir)/libgimpwidgets/gimpbrowser.c			\
+	$(top_srcdir)/libgimpwidgets/gimpbusybox.c			\
+	$(top_srcdir)/libgimpwidgets/gimpbutton.c			\
+	$(top_srcdir)/libgimpwidgets/gimpcairo-utils.c			\
+	$(top_srcdir)/libgimpwidgets/gimpcellrenderercolor.c		\
+	$(top_srcdir)/libgimpwidgets/gimpcellrenderertoggle.c		\
+	$(top_srcdir)/libgimpwidgets/gimpchainbutton.c			\
+	$(top_srcdir)/libgimpwidgets/gimpcolorarea.c			\
+	$(top_srcdir)/libgimpwidgets/gimpcolorbutton.c			\
+	$(top_srcdir)/libgimpwidgets/gimpcolordisplay.c			\
+	$(top_srcdir)/libgimpwidgets/gimpcolordisplaystack.c		\
+	$(top_srcdir)/libgimpwidgets/gimpcolorhexentry.c		\
+	$(top_srcdir)/libgimpwidgets/gimpcolornotebook.c		\
+	$(top_srcdir)/libgimpwidgets/gimpcolorprofilechooserdialog.c	\
+	$(top_srcdir)/libgimpwidgets/gimpcolorprofilecombobox.c		\
+	$(top_srcdir)/libgimpwidgets/gimpcolorprofilestore.c		\
+	$(top_srcdir)/libgimpwidgets/gimpcolorprofileview.c		\
+##	$(top_srcdir)/libgimpwidgets/gimpcolorscale.c
+##	$(top_srcdir)/libgimpwidgets/gimpcolorscales.c
+##	$(top_srcdir)/libgimpwidgets/gimpcolorselect.c
+	$(top_srcdir)/libgimpwidgets/gimpcolorselection.c		\
+	$(top_srcdir)/libgimpwidgets/gimpcolorselector.c		\
+	$(top_srcdir)/libgimpwidgets/gimpdialog.c			\
+	$(top_srcdir)/libgimpwidgets/gimpenumcombobox.c			\
+	$(top_srcdir)/libgimpwidgets/gimpenumlabel.c			\
+	$(top_srcdir)/libgimpwidgets/gimpenumstore.c			\
+	$(top_srcdir)/libgimpwidgets/gimpenumwidgets.c			\
+	$(top_srcdir)/libgimpwidgets/gimpfileentry.c			\
+	$(top_srcdir)/libgimpwidgets/gimpframe.c			\
+	$(top_srcdir)/libgimpwidgets/gimphelpui.c			\
+	$(top_srcdir)/libgimpwidgets/gimphintbox.c			\
+	$(top_srcdir)/libgimpwidgets/gimpicons.c			\
+	$(top_srcdir)/libgimpwidgets/gimpintcombobox.c			\
+	$(top_srcdir)/libgimpwidgets/gimpintstore.c			\
+	$(top_srcdir)/libgimpwidgets/gimpmemsizeentry.c			\
+	$(top_srcdir)/libgimpwidgets/gimpnumberpairentry.c		\
+	$(top_srcdir)/libgimpwidgets/gimpoffsetarea.c			\
+	$(top_srcdir)/libgimpwidgets/gimppageselector.c			\
+	$(top_srcdir)/libgimpwidgets/gimppatheditor.c			\
+	$(top_srcdir)/libgimpwidgets/gimppickbutton.c			\
+	$(top_srcdir)/libgimpwidgets/gimppreview.c			\
+	$(top_srcdir)/libgimpwidgets/gimppreviewarea.c			\
+	$(top_srcdir)/libgimpwidgets/gimppropwidgets.c			\
+	$(top_srcdir)/libgimpwidgets/gimpquerybox.c			\
+	$(top_srcdir)/libgimpwidgets/gimpruler.c			\
+	$(top_srcdir)/libgimpwidgets/gimpscaleentry.c			\
+	$(top_srcdir)/libgimpwidgets/gimpscrolledpreview.c		\
+	$(top_srcdir)/libgimpwidgets/gimpsizeentry.c			\
+	$(top_srcdir)/libgimpwidgets/gimpspinbutton.c			\
+	$(top_srcdir)/libgimpwidgets/gimpstringcombobox.c		\
+	$(top_srcdir)/libgimpwidgets/gimpunitcombobox.c			\
+	$(top_srcdir)/libgimpwidgets/gimpunitstore.c			\
+	$(top_srcdir)/libgimpwidgets/gimpwidgets-error.c		\
+	$(top_srcdir)/libgimpwidgets/gimpwidgets.c			\
+	$(top_srcdir)/libgimpwidgets/gimpwidgetsutils.c			\
+	$(top_srcdir)/libgimpwidgets/gimpzoommodel.c			\
+	$(libgimpwidgets_introspectable_headers)