[gimp] libgimbase: merge gimpparam.h into gimpparamspecs.h



commit 63695b4b21418e338e7004fb979c0c294af920dc
Author: Michael Natterer <mitch gimp org>
Date:   Wed Jul 31 10:16:21 2019 +0200

    libgimbase: merge gimpparam.h into gimpparamspecs.h
    
    which means that it's now included normally via gimpbase.h
    and not any longer via gimpbasetypes.h which we only did out
    of lazyness. A *lot* of files in libgimp* and app/ now need to

 app/core/gimpasyncset.c                   |  2 +
 app/core/gimpauxitem.c                    |  4 +-
 app/core/gimpauxitemundo.c                |  2 +
 app/core/gimpbrushcache.c                 |  3 ++
 app/core/gimpbrushclipboard.c             |  2 +
 app/core/gimpchannelundo.c                |  2 +
 app/core/gimpcontainer.c                  |  1 +
 app/core/gimpdrawablemodundo.c            |  2 +
 app/core/gimpdynamics.c                   |  1 +
 app/core/gimpdynamicsoutput.c             |  1 +
 app/core/gimpextension.c                  |  2 +
 app/core/gimpfilloptions.c                |  1 +
 app/core/gimpfilter.c                     |  2 +
 app/core/gimpfilteredcontainer.c          |  4 +-
 app/core/gimphistogram.c                  |  1 +
 app/core/gimpitemtree.c                   |  2 +
 app/core/gimpitemundo.c                   |  2 +
 app/core/gimplayermaskundo.c              |  2 +
 app/core/gimplayerundo.c                  |  2 +
 app/core/gimplineart.c                    |  1 +
 app/core/gimplist.c                       |  4 +-
 app/core/gimpmaskundo.c                   |  2 +
 app/core/gimppatternclipboard.c           |  2 +
 app/core/gimppickable.c                   |  1 +
 app/core/gimpsymmetry-mandala.c           |  1 +
 app/core/gimpsymmetry-mirror.c            |  1 +
 app/core/gimpsymmetry-tiling.c            |  1 +
 app/core/gimptoolpreset.c                 |  1 +
 app/core/gimpviewable.c                   |  1 +
 app/display/gimpcanvas.c                  |  1 +
 app/display/gimpcanvasitem.c              |  1 +
 app/display/gimpcanvaspassepartout.c      |  2 +
 app/display/gimpdisplay.c                 |  1 +
 app/display/gimpimagewindow.c             |  1 +
 app/display/gimptoolgyroscope.c           |  1 +
 app/display/gimptoolwidget.c              |  2 +
 app/gegl/gimptilehandlervalidate.c        |  3 ++
 app/gui/gimpuiconfigurer.c                |  1 +
 app/operations/gimpoperationdesaturate.c  |  1 +
 app/operations/gimpoperationposterize.c   |  1 +
 app/operations/gimpoperationthreshold.c   |  1 +
 app/paint/gimpairbrushoptions.c           |  1 +
 app/paint/gimpcloneoptions.c              |  1 +
 app/paint/gimpconvolveoptions.c           |  1 +
 app/paint/gimpdodgeburnoptions.c          |  1 +
 app/paint/gimperaseroptions.c             |  1 +
 app/paint/gimpinkoptions.c                |  1 +
 app/paint/gimpmybrushoptions.c            |  1 +
 app/paint/gimppaintcoreundo.c             |  2 +
 app/paint/gimppenciloptions.c             |  1 +
 app/paint/gimpperspectivecloneoptions.c   |  1 +
 app/paint/gimpsmudgeoptions.c             |  1 +
 app/paint/gimpsourceoptions.c             |  1 +
 app/pdb/gimppdbcontext.c                  |  1 +
 app/text/gimpfont.c                       |  2 +
 app/text/gimptextundo.c                   |  1 +
 app/tools/gimpbucketfilloptions.c         |  1 +
 app/tools/gimpcageoptions.c               |  1 +
 app/tools/gimpcoloroptions.c              |  1 +
 app/tools/gimpcolorpickeroptions.c        |  1 +
 app/tools/gimpcropoptions.c               |  1 +
 app/tools/gimpfilteroptions.c             |  1 +
 app/tools/gimpflipoptions.c               |  1 +
 app/tools/gimpforegroundselectoptions.c   |  1 +
 app/tools/gimpgradientoptions.c           |  1 +
 app/tools/gimphandletransformoptions.c    |  1 +
 app/tools/gimphistogramoptions.c          |  1 +
 app/tools/gimpiscissorsoptions.c          |  1 +
 app/tools/gimpmagnifyoptions.c            |  1 +
 app/tools/gimpmeasureoptions.c            |  1 +
 app/tools/gimpmoveoptions.c               |  1 +
 app/tools/gimpnpointdeformationoptions.c  |  1 +
 app/tools/gimprectangleselectoptions.c    |  1 +
 app/tools/gimpregionselectoptions.c       |  1 +
 app/tools/gimpseamlesscloneoptions.c      |  1 +
 app/tools/gimpselectionoptions.c          |  1 +
 app/tools/gimptilehandleriscissors.c      |  1 +
 app/tools/gimptool.c                      |  1 +
 app/tools/gimptransformgridoptions.c      |  1 +
 app/tools/gimptransformgridtoolundo.c     |  2 +
 app/tools/gimptransformoptions.c          |  1 +
 app/tools/gimpvectoroptions.c             |  1 +
 app/tools/gimpwarpoptions.c               |  1 +
 app/vectors/gimpvectorsundo.c             |  2 +
 app/widgets/gimpblobeditor.c              |  1 +
 app/widgets/gimpbuffersourcebox.c         |  1 +
 app/widgets/gimpcellrendererdashes.c      |  2 +
 app/widgets/gimpcellrendererviewable.c    |  2 +
 app/widgets/gimpcircle.c                  |  1 +
 app/widgets/gimpcolorbar.c                |  1 +
 app/widgets/gimpcolordialog.c             |  1 +
 app/widgets/gimpcoloreditor.c             |  1 +
 app/widgets/gimpcolorframe.c              |  1 +
 app/widgets/gimpcolorhistory.c            |  1 +
 app/widgets/gimpcolormapselection.c       |  1 +
 app/widgets/gimpcontainercombobox.c       |  2 +
 app/widgets/gimpcontainereditor.c         |  1 +
 app/widgets/gimpcontainertreestore.c      |  2 +
 app/widgets/gimpcontainerview.c           |  1 +
 app/widgets/gimpcontrollereditor.c        |  1 +
 app/widgets/gimpcontrollerinfo.c          |  1 +
 app/widgets/gimpcontrollerlist.c          |  1 +
 app/widgets/gimpcurveview.c               |  1 +
 app/widgets/gimpdasheditor.c              |  1 +
 app/widgets/gimpdataeditor.c              |  1 +
 app/widgets/gimpdatafactoryview.c         |  1 +
 app/widgets/gimpdeviceeditor.c            |  1 +
 app/widgets/gimpdeviceinfoeditor.c        |  1 +
 app/widgets/gimpdevicemanager.c           |  2 +
 app/widgets/gimpdevicestatus.c            |  1 +
 app/widgets/gimpdial.c                    |  1 +
 app/widgets/gimpdockable.c                |  1 +
 app/widgets/gimpdockbook.c                |  1 +
 app/widgets/gimpdockcolumns.c             |  2 +
 app/widgets/gimpdockwindow.c              |  1 +
 app/widgets/gimpeditor.c                  |  1 +
 app/widgets/gimpenumaction.c              |  2 +
 app/widgets/gimpfgbgeditor.c              |  1 +
 app/widgets/gimpfgbgview.c                |  1 +
 app/widgets/gimphandlebar.c               |  1 +
 app/widgets/gimphistogrameditor.c         |  1 +
 app/widgets/gimphistogramview.c           |  1 +
 app/widgets/gimpiconpicker.c              |  1 +
 app/widgets/gimplanguageentry.c           |  2 +
 app/widgets/gimpmeter.c                   |  1 +
 app/widgets/gimpoverlaydialog.c           |  1 +
 app/widgets/gimppickablebutton.c          |  1 +
 app/widgets/gimppickablepopup.c           |  1 +
 app/widgets/gimppolar.c                   |  1 +
 app/widgets/gimpprocedureaction.c         |  2 +
 app/widgets/gimpsamplepointeditor.c       |  1 +
 app/widgets/gimpsettingsbox.c             |  1 +
 app/widgets/gimpspinscale.c               |  1 +
 app/widgets/gimpstringaction.c            |  2 +
 app/widgets/gimptagpopup.c                |  1 +
 app/widgets/gimptooloptionseditor.c       |  1 +
 app/widgets/gimptoolpalette.c             |  1 +
 app/widgets/gimpundoeditor.c              |  1 +
 app/widgets/gimpviewablebutton.c          |  1 +
 app/widgets/gimpviewabledialog.c          |  1 +
 libgimpbase/Makefile.am                   |  1 -
 libgimpbase/Makefile.gi                   |  1 -
 libgimpbase/gimpbasetypes.h               |  1 -
 libgimpbase/gimpparam.h                   | 66 -------------------------------
 libgimpbase/gimpparamspecs.h              | 39 ++++++++++++++++++
 libgimpthumb/gimpthumbnail.c              |  2 +-
 libgimpwidgets/gimpbusybox.c              |  2 +
 libgimpwidgets/gimpcellrenderertoggle.c   |  2 +
 libgimpwidgets/gimpchainbutton.c          |  2 +
 libgimpwidgets/gimpcolorbutton.c          |  1 +
 libgimpwidgets/gimpcolorprofilecombobox.c |  1 +
 libgimpwidgets/gimpcontroller.c           |  1 +
 libgimpwidgets/gimpdialog.c               |  2 +
 libgimpwidgets/gimpenumcombobox.c         |  2 +
 libgimpwidgets/gimphintbox.c              |  2 +
 libgimpwidgets/gimpintcombobox.c          |  2 +
 libgimpwidgets/gimpintstore.c             |  2 +
 libgimpwidgets/gimpnumberpairentry.c      |  1 +
 libgimpwidgets/gimppageselector.c         |  2 +
 libgimpwidgets/gimppreview.c              |  1 +
 libgimpwidgets/gimpstringcombobox.c       |  2 +
 modules/display-filter-clip-warning.c     |  1 +
 162 files changed, 245 insertions(+), 73 deletions(-)
---
diff --git a/app/core/gimpasyncset.c b/app/core/gimpasyncset.c
index f1b611e6ee..0ef646208c 100644
--- a/app/core/gimpasyncset.c
+++ b/app/core/gimpasyncset.c
@@ -23,6 +23,8 @@
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gegl.h>
 
+#include "libgimpbase/gimpbase.h"
+
 #include "core-types.h"
 
 #include "gimpasync.h"
diff --git a/app/core/gimpauxitem.c b/app/core/gimpauxitem.c
index cc9614934b..f35f8cf13b 100644
--- a/app/core/gimpauxitem.c
+++ b/app/core/gimpauxitem.c
@@ -17,7 +17,9 @@
 
 #include "config.h"
 
-#include <glib-object.h>
+#include <gio/gio.h>
+
+#include "libgimpbase/gimpbase.h"
 
 #include "core-types.h"
 
diff --git a/app/core/gimpauxitemundo.c b/app/core/gimpauxitemundo.c
index e0253ab3c7..a50e46cd21 100644
--- a/app/core/gimpauxitemundo.c
+++ b/app/core/gimpauxitemundo.c
@@ -20,6 +20,8 @@
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gegl.h>
 
+#include "libgimpbase/gimpbase.h"
+
 #include "core-types.h"
 
 #include "gimpauxitem.h"
diff --git a/app/core/gimpbrushcache.c b/app/core/gimpbrushcache.c
index 07ad0082b4..871bdfad1f 100644
--- a/app/core/gimpbrushcache.c
+++ b/app/core/gimpbrushcache.c
@@ -20,8 +20,11 @@
 
 #include "config.h"
 
+#include <gio/gio.h>
 #include <gegl.h>
 
+#include "libgimpbase/gimpbase.h"
+
 #include "core-types.h"
 
 #include "gimpbrushcache.h"
diff --git a/app/core/gimpbrushclipboard.c b/app/core/gimpbrushclipboard.c
index 2d4a5e1e0b..9b164d1a8e 100644
--- a/app/core/gimpbrushclipboard.c
+++ b/app/core/gimpbrushclipboard.c
@@ -23,6 +23,8 @@
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gegl.h>
 
+#include "libgimpbase/gimpbase.h"
+
 #include "core-types.h"
 
 #include "gimp.h"
diff --git a/app/core/gimpchannelundo.c b/app/core/gimpchannelundo.c
index 1892ced1e3..c4ca9aa0b1 100644
--- a/app/core/gimpchannelundo.c
+++ b/app/core/gimpchannelundo.c
@@ -20,6 +20,8 @@
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gegl.h>
 
+#include "libgimpbase/gimpbase.h"
+
 #include "core-types.h"
 
 #include "gimpimage.h"
diff --git a/app/core/gimpcontainer.c b/app/core/gimpcontainer.c
index 3c2be3d440..6fda1fb1fc 100644
--- a/app/core/gimpcontainer.c
+++ b/app/core/gimpcontainer.c
@@ -23,6 +23,7 @@
 #include <gio/gio.h>
 #include <gegl.h>
 
+#include "libgimpbase/gimpbase.h"
 #include "libgimpconfig/gimpconfig.h"
 
 #include "core-types.h"
diff --git a/app/core/gimpdrawablemodundo.c b/app/core/gimpdrawablemodundo.c
index db2c933058..3c005abf3a 100644
--- a/app/core/gimpdrawablemodundo.c
+++ b/app/core/gimpdrawablemodundo.c
@@ -20,6 +20,8 @@
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gegl.h>
 
+#include "libgimpbase/gimpbase.h"
+
 #include "core-types.h"
 
 #include "gegl/gimp-gegl-utils.h"
diff --git a/app/core/gimpdynamics.c b/app/core/gimpdynamics.c
index a1fb0efc2c..7c2b0ce05a 100644
--- a/app/core/gimpdynamics.c
+++ b/app/core/gimpdynamics.c
@@ -20,6 +20,7 @@
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gegl.h>
 
+#include "libgimpbase/gimpbase.h"
 #include "libgimpmath/gimpmath.h"
 #include "libgimpconfig/gimpconfig.h"
 
diff --git a/app/core/gimpdynamicsoutput.c b/app/core/gimpdynamicsoutput.c
index 7a4f309a7e..75a89ae2d7 100644
--- a/app/core/gimpdynamicsoutput.c
+++ b/app/core/gimpdynamicsoutput.c
@@ -20,6 +20,7 @@
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gegl.h>
 
+#include "libgimpbase/gimpbase.h"
 #include "libgimpmath/gimpmath.h"
 #include "libgimpconfig/gimpconfig.h"
 
diff --git a/app/core/gimpextension.c b/app/core/gimpextension.c
index 6bb3a1f25e..1e958644d0 100644
--- a/app/core/gimpextension.c
+++ b/app/core/gimpextension.c
@@ -23,6 +23,8 @@
 #include <appstream-glib.h>
 #include <gegl.h>
 
+#include "libgimpbase/gimpbase.h"
+
 #include "core-types.h"
 
 #include "config/gimpxmlparser.h"
diff --git a/app/core/gimpfilloptions.c b/app/core/gimpfilloptions.c
index d10b6e4572..3cedd587a5 100644
--- a/app/core/gimpfilloptions.c
+++ b/app/core/gimpfilloptions.c
@@ -24,6 +24,7 @@
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gegl.h>
 
+#include "libgimpbase/gimpbase.h"
 #include "libgimpcolor/gimpcolor.h"
 #include "libgimpconfig/gimpconfig.h"
 
diff --git a/app/core/gimpfilter.c b/app/core/gimpfilter.c
index f565d499a0..e776cd8f6a 100644
--- a/app/core/gimpfilter.c
+++ b/app/core/gimpfilter.c
@@ -22,6 +22,8 @@
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gegl.h>
 
+#include "libgimpbase/gimpbase.h"
+
 #include "core-types.h"
 
 #include "gimp.h"
diff --git a/app/core/gimpfilteredcontainer.c b/app/core/gimpfilteredcontainer.c
index ec5659331e..1d4b562fd0 100644
--- a/app/core/gimpfilteredcontainer.c
+++ b/app/core/gimpfilteredcontainer.c
@@ -21,7 +21,9 @@
 
 #include "config.h"
 
-#include <glib-object.h>
+#include <gio/gio.h>
+
+#include "libgimpbase/gimpbase.h"
 
 #include "core-types.h"
 
diff --git a/app/core/gimphistogram.c b/app/core/gimphistogram.c
index 0b3e8f9bff..868f995d6e 100644
--- a/app/core/gimphistogram.c
+++ b/app/core/gimphistogram.c
@@ -24,6 +24,7 @@
 #include <gegl.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 
+#include "libgimpbase/gimpbase.h"
 #include "libgimpmath/gimpmath.h"
 #include "libgimpcolor/gimpcolor.h"
 
diff --git a/app/core/gimpitemtree.c b/app/core/gimpitemtree.c
index 7746afa08c..1e7f569caf 100644
--- a/app/core/gimpitemtree.c
+++ b/app/core/gimpitemtree.c
@@ -26,6 +26,8 @@
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gegl.h>
 
+#include "libgimpbase/gimpbase.h"
+
 #include "core-types.h"
 
 #include "gimpimage.h"
diff --git a/app/core/gimpitemundo.c b/app/core/gimpitemundo.c
index 0a50d43047..3f99789a2a 100644
--- a/app/core/gimpitemundo.c
+++ b/app/core/gimpitemundo.c
@@ -20,6 +20,8 @@
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gegl.h>
 
+#include "libgimpbase/gimpbase.h"
+
 #include "core-types.h"
 
 #include "gimpimage.h"
diff --git a/app/core/gimplayermaskundo.c b/app/core/gimplayermaskundo.c
index cc49eb75e3..96527a12f5 100644
--- a/app/core/gimplayermaskundo.c
+++ b/app/core/gimplayermaskundo.c
@@ -20,6 +20,8 @@
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gegl.h>
 
+#include "libgimpbase/gimpbase.h"
+
 #include "core-types.h"
 
 #include "gimpimage.h"
diff --git a/app/core/gimplayerundo.c b/app/core/gimplayerundo.c
index 64a1de306f..66abf8b208 100644
--- a/app/core/gimplayerundo.c
+++ b/app/core/gimplayerundo.c
@@ -20,6 +20,8 @@
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gegl.h>
 
+#include "libgimpbase/gimpbase.h"
+
 #include "core-types.h"
 
 #include "gimpimage.h"
diff --git a/app/core/gimplineart.c b/app/core/gimplineart.c
index 22520014e9..93448e47e0 100644
--- a/app/core/gimplineart.c
+++ b/app/core/gimplineart.c
@@ -23,6 +23,7 @@
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gegl.h>
 
+#include "libgimpbase/gimpbase.h"
 #include "libgimpmath/gimpmath.h"
 
 #include "core-types.h"
diff --git a/app/core/gimplist.c b/app/core/gimplist.c
index f67cc9bd79..0f8aa7be14 100644
--- a/app/core/gimplist.c
+++ b/app/core/gimplist.c
@@ -23,7 +23,9 @@
 #include <stdlib.h>
 #include <string.h> /* strcmp */
 
-#include <glib-object.h>
+#include <gio/gio.h>
+
+#include "libgimpbase/gimpbase.h"
 
 #include "core-types.h"
 
diff --git a/app/core/gimpmaskundo.c b/app/core/gimpmaskundo.c
index d388ee5f36..65e3bf061a 100644
--- a/app/core/gimpmaskundo.c
+++ b/app/core/gimpmaskundo.c
@@ -20,6 +20,8 @@
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gegl.h>
 
+#include "libgimpbase/gimpbase.h"
+
 #include "core-types.h"
 
 #include "gegl/gimp-gegl-loops.h"
diff --git a/app/core/gimppatternclipboard.c b/app/core/gimppatternclipboard.c
index 9dd6a1f3ee..8ad7cb3ffb 100644
--- a/app/core/gimppatternclipboard.c
+++ b/app/core/gimppatternclipboard.c
@@ -23,6 +23,8 @@
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gegl.h>
 
+#include "libgimpbase/gimpbase.h"
+
 #include "core-types.h"
 
 #include "gimp.h"
diff --git a/app/core/gimppickable.c b/app/core/gimppickable.c
index e47b37e486..d04a21dbcb 100644
--- a/app/core/gimppickable.c
+++ b/app/core/gimppickable.c
@@ -32,6 +32,7 @@
 #include <gegl.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 
+#include "libgimpbase/gimpbase.h"
 #include "libgimpcolor/gimpcolor.h"
 #include "libgimpmath/gimpmath.h"
 
diff --git a/app/core/gimpsymmetry-mandala.c b/app/core/gimpsymmetry-mandala.c
index c8c4b0e2ea..7ca469d857 100644
--- a/app/core/gimpsymmetry-mandala.c
+++ b/app/core/gimpsymmetry-mandala.c
@@ -26,6 +26,7 @@
 #include <gegl.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 
+#include "libgimpbase/gimpbase.h"
 #include "libgimpconfig/gimpconfig.h"
 #include "libgimpmath/gimpmath.h"
 
diff --git a/app/core/gimpsymmetry-mirror.c b/app/core/gimpsymmetry-mirror.c
index 7f92301292..7f8f8a59d6 100644
--- a/app/core/gimpsymmetry-mirror.c
+++ b/app/core/gimpsymmetry-mirror.c
@@ -26,6 +26,7 @@
 #include <gegl.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 
+#include "libgimpbase/gimpbase.h"
 #include "libgimpconfig/gimpconfig.h"
 
 #include "core-types.h"
diff --git a/app/core/gimpsymmetry-tiling.c b/app/core/gimpsymmetry-tiling.c
index 555f58480c..762bca0d92 100644
--- a/app/core/gimpsymmetry-tiling.c
+++ b/app/core/gimpsymmetry-tiling.c
@@ -26,6 +26,7 @@
 #include <gegl.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 
+#include "libgimpbase/gimpbase.h"
 #include "libgimpconfig/gimpconfig.h"
 
 #include "core-types.h"
diff --git a/app/core/gimptoolpreset.c b/app/core/gimptoolpreset.c
index 607f6b4cd3..1da6cef230 100644
--- a/app/core/gimptoolpreset.c
+++ b/app/core/gimptoolpreset.c
@@ -20,6 +20,7 @@
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gegl.h>
 
+#include "libgimpbase/gimpbase.h"
 #include "libgimpmath/gimpmath.h"
 #include "libgimpconfig/gimpconfig.h"
 
diff --git a/app/core/gimpviewable.c b/app/core/gimpviewable.c
index a4bf46ded3..1f031672db 100644
--- a/app/core/gimpviewable.c
+++ b/app/core/gimpviewable.c
@@ -26,6 +26,7 @@
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gegl.h>
 
+#include "libgimpbase/gimpbase.h"
 #include "libgimpcolor/gimpcolor.h"
 #include "libgimpmath/gimpmath.h"
 #include "libgimpconfig/gimpconfig.h"
diff --git a/app/display/gimpcanvas.c b/app/display/gimpcanvas.c
index 6254f875ec..c741e143d1 100644
--- a/app/display/gimpcanvas.c
+++ b/app/display/gimpcanvas.c
@@ -20,6 +20,7 @@
 #include <gegl.h>
 #include <gtk/gtk.h>
 
+#include "libgimpbase/gimpbase.h"
 #include "libgimpcolor/gimpcolor.h"
 #include "libgimpwidgets/gimpwidgets.h"
 
diff --git a/app/display/gimpcanvasitem.c b/app/display/gimpcanvasitem.c
index 3c90237183..454d9a58c7 100644
--- a/app/display/gimpcanvasitem.c
+++ b/app/display/gimpcanvasitem.c
@@ -23,6 +23,7 @@
 #include <gegl.h>
 #include <gtk/gtk.h>
 
+#include "libgimpbase/gimpbase.h"
 #include "libgimpmath/gimpmath.h"
 
 #include "display-types.h"
diff --git a/app/display/gimpcanvaspassepartout.c b/app/display/gimpcanvaspassepartout.c
index cadf22cc82..4ea4d2ec21 100644
--- a/app/display/gimpcanvaspassepartout.c
+++ b/app/display/gimpcanvaspassepartout.c
@@ -23,6 +23,8 @@
 #include <gegl.h>
 #include <gtk/gtk.h>
 
+#include "libgimpbase/gimpbase.h"
+
 #include "display-types.h"
 
 #include "gimpcanvas-style.h"
diff --git a/app/display/gimpdisplay.c b/app/display/gimpdisplay.c
index 1c2914c343..8e8c94da39 100644
--- a/app/display/gimpdisplay.c
+++ b/app/display/gimpdisplay.c
@@ -20,6 +20,7 @@
 #include <gegl.h>
 #include <gtk/gtk.h>
 
+#include "libgimpbase/gimpbase.h"
 #include "libgimpmath/gimpmath.h"
 
 #include "display-types.h"
diff --git a/app/display/gimpimagewindow.c b/app/display/gimpimagewindow.c
index 4e5932c8ae..d20b0f8d63 100644
--- a/app/display/gimpimagewindow.c
+++ b/app/display/gimpimagewindow.c
@@ -33,6 +33,7 @@
 #include <gdk/gdkquartz.h>
 #endif /* !GDK_WINDOWING_QUARTZ */
 
+#include "libgimpbase/gimpbase.h"
 #include "libgimpmath/gimpmath.h"
 #include "libgimpcolor/gimpcolor.h"
 #include "libgimpwidgets/gimpwidgets.h"
diff --git a/app/display/gimptoolgyroscope.c b/app/display/gimptoolgyroscope.c
index 4d6b1759c7..e8e6176db2 100644
--- a/app/display/gimptoolgyroscope.c
+++ b/app/display/gimptoolgyroscope.c
@@ -24,6 +24,7 @@
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 
+#include "libgimpbase/gimpbase.h"
 #include "libgimpmath/gimpmath.h"
 
 #include "display-types.h"
diff --git a/app/display/gimptoolwidget.c b/app/display/gimptoolwidget.c
index d62cfe2505..95e8e3b50f 100644
--- a/app/display/gimptoolwidget.c
+++ b/app/display/gimptoolwidget.c
@@ -26,6 +26,8 @@
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 
+#include "libgimpbase/gimpbase.h"
+
 #include "display-types.h"
 
 #include "core/gimpmarshal.h"
diff --git a/app/gegl/gimptilehandlervalidate.c b/app/gegl/gimptilehandlervalidate.c
index 2e7e3b6657..fea37c4b6f 100644
--- a/app/gegl/gimptilehandlervalidate.c
+++ b/app/gegl/gimptilehandlervalidate.c
@@ -18,8 +18,11 @@
 #include "config.h"
 
 #include <cairo.h>
+#include <gio/gio.h>
 #include <gegl.h>
 
+#include "libgimpbase/gimpbase.h"
+
 #include "gimp-gegl-types.h"
 
 #include "gimp-gegl-loops.h"
diff --git a/app/gui/gimpuiconfigurer.c b/app/gui/gimpuiconfigurer.c
index 651b1d11d7..288e24594d 100644
--- a/app/gui/gimpuiconfigurer.c
+++ b/app/gui/gimpuiconfigurer.c
@@ -23,6 +23,7 @@
 #include <gegl.h>
 #include <gtk/gtk.h>
 
+#include "libgimpbase/gimpbase.h"
 #include "libgimpwidgets/gimpwidgets.h"
 
 #include "gui-types.h"
diff --git a/app/operations/gimpoperationdesaturate.c b/app/operations/gimpoperationdesaturate.c
index b9353e6c54..2a13c32924 100644
--- a/app/operations/gimpoperationdesaturate.c
+++ b/app/operations/gimpoperationdesaturate.c
@@ -24,6 +24,7 @@
 #include <gegl.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 
+#include "libgimpbase/gimpbase.h"
 #include "libgimpcolor/gimpcolor.h"
 #include "libgimpconfig/gimpconfig.h"
 
diff --git a/app/operations/gimpoperationposterize.c b/app/operations/gimpoperationposterize.c
index 88f5d26fbe..62bb901739 100644
--- a/app/operations/gimpoperationposterize.c
+++ b/app/operations/gimpoperationposterize.c
@@ -24,6 +24,7 @@
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gegl.h>
 
+#include "libgimpbase/gimpbase.h"
 #include "libgimpconfig/gimpconfig.h"
 #include "libgimpmath/gimpmath.h"
 
diff --git a/app/operations/gimpoperationthreshold.c b/app/operations/gimpoperationthreshold.c
index e33a9ec40a..709dd1dc56 100644
--- a/app/operations/gimpoperationthreshold.c
+++ b/app/operations/gimpoperationthreshold.c
@@ -24,6 +24,7 @@
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gegl.h>
 
+#include "libgimpbase/gimpbase.h"
 #include "libgimpcolor/gimpcolor.h"
 #include "libgimpconfig/gimpconfig.h"
 
diff --git a/app/paint/gimpairbrushoptions.c b/app/paint/gimpairbrushoptions.c
index 1922eb0db9..59bb0c8327 100644
--- a/app/paint/gimpairbrushoptions.c
+++ b/app/paint/gimpairbrushoptions.c
@@ -20,6 +20,7 @@
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gegl.h>
 
+#include "libgimpbase/gimpbase.h"
 #include "libgimpconfig/gimpconfig.h"
 
 #include "paint-types.h"
diff --git a/app/paint/gimpcloneoptions.c b/app/paint/gimpcloneoptions.c
index 4f398d66bc..6c8061e36d 100644
--- a/app/paint/gimpcloneoptions.c
+++ b/app/paint/gimpcloneoptions.c
@@ -22,6 +22,7 @@
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gegl.h>
 
+#include "libgimpbase/gimpbase.h"
 #include "libgimpconfig/gimpconfig.h"
 
 #include "paint-types.h"
diff --git a/app/paint/gimpconvolveoptions.c b/app/paint/gimpconvolveoptions.c
index dffec6856d..3f8ecd9d72 100644
--- a/app/paint/gimpconvolveoptions.c
+++ b/app/paint/gimpconvolveoptions.c
@@ -20,6 +20,7 @@
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gegl.h>
 
+#include "libgimpbase/gimpbase.h"
 #include "libgimpconfig/gimpconfig.h"
 
 #include "paint-types.h"
diff --git a/app/paint/gimpdodgeburnoptions.c b/app/paint/gimpdodgeburnoptions.c
index b897b7eb62..2993b5a1d9 100644
--- a/app/paint/gimpdodgeburnoptions.c
+++ b/app/paint/gimpdodgeburnoptions.c
@@ -20,6 +20,7 @@
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gegl.h>
 
+#include "libgimpbase/gimpbase.h"
 #include "libgimpconfig/gimpconfig.h"
 
 #include "paint-types.h"
diff --git a/app/paint/gimperaseroptions.c b/app/paint/gimperaseroptions.c
index 0b5a3fcb8d..91a1c76b71 100644
--- a/app/paint/gimperaseroptions.c
+++ b/app/paint/gimperaseroptions.c
@@ -20,6 +20,7 @@
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gegl.h>
 
+#include "libgimpbase/gimpbase.h"
 #include "libgimpconfig/gimpconfig.h"
 
 #include "paint-types.h"
diff --git a/app/paint/gimpinkoptions.c b/app/paint/gimpinkoptions.c
index d660179056..207703240d 100644
--- a/app/paint/gimpinkoptions.c
+++ b/app/paint/gimpinkoptions.c
@@ -20,6 +20,7 @@
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gegl.h>
 
+#include "libgimpbase/gimpbase.h"
 #include "libgimpconfig/gimpconfig.h"
 
 #include "paint-types.h"
diff --git a/app/paint/gimpmybrushoptions.c b/app/paint/gimpmybrushoptions.c
index 40fa517cd8..4d515491a8 100644
--- a/app/paint/gimpmybrushoptions.c
+++ b/app/paint/gimpmybrushoptions.c
@@ -20,6 +20,7 @@
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gegl.h>
 
+#include "libgimpbase/gimpbase.h"
 #include "libgimpconfig/gimpconfig.h"
 
 #include "paint-types.h"
diff --git a/app/paint/gimppaintcoreundo.c b/app/paint/gimppaintcoreundo.c
index 861642f61f..fe7fc63357 100644
--- a/app/paint/gimppaintcoreundo.c
+++ b/app/paint/gimppaintcoreundo.c
@@ -20,6 +20,8 @@
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gegl.h>
 
+#include "libgimpbase/gimpbase.h"
+
 #include "paint-types.h"
 
 #include "gimppaintcore.h"
diff --git a/app/paint/gimppenciloptions.c b/app/paint/gimppenciloptions.c
index 804e99fff7..39a54a28b7 100644
--- a/app/paint/gimppenciloptions.c
+++ b/app/paint/gimppenciloptions.c
@@ -20,6 +20,7 @@
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gegl.h>
 
+#include "libgimpbase/gimpbase.h"
 #include "libgimpconfig/gimpconfig.h"
 
 #include "paint-types.h"
diff --git a/app/paint/gimpperspectivecloneoptions.c b/app/paint/gimpperspectivecloneoptions.c
index cdd0f32d12..721382ea9f 100644
--- a/app/paint/gimpperspectivecloneoptions.c
+++ b/app/paint/gimpperspectivecloneoptions.c
@@ -20,6 +20,7 @@
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gegl.h>
 
+#include "libgimpbase/gimpbase.h"
 #include "libgimpconfig/gimpconfig.h"
 
 #include "paint-types.h"
diff --git a/app/paint/gimpsmudgeoptions.c b/app/paint/gimpsmudgeoptions.c
index cdf6f0b2a1..c6780aeabe 100644
--- a/app/paint/gimpsmudgeoptions.c
+++ b/app/paint/gimpsmudgeoptions.c
@@ -20,6 +20,7 @@
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gegl.h>
 
+#include "libgimpbase/gimpbase.h"
 #include "libgimpconfig/gimpconfig.h"
 
 #include "paint-types.h"
diff --git a/app/paint/gimpsourceoptions.c b/app/paint/gimpsourceoptions.c
index 7190d1c62d..ba6323491a 100644
--- a/app/paint/gimpsourceoptions.c
+++ b/app/paint/gimpsourceoptions.c
@@ -20,6 +20,7 @@
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gegl.h>
 
+#include "libgimpbase/gimpbase.h"
 #include "libgimpconfig/gimpconfig.h"
 
 #include "paint-types.h"
diff --git a/app/pdb/gimppdbcontext.c b/app/pdb/gimppdbcontext.c
index ca49599606..5004c48908 100644
--- a/app/pdb/gimppdbcontext.c
+++ b/app/pdb/gimppdbcontext.c
@@ -22,6 +22,7 @@
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gegl.h>
 
+#include "libgimpbase/gimpbase.h"
 #include "libgimpconfig/gimpconfig.h"
 
 #include "pdb-types.h"
diff --git a/app/text/gimpfont.c b/app/text/gimpfont.c
index 23d3a60cfa..5d39391bd4 100644
--- a/app/text/gimpfont.c
+++ b/app/text/gimpfont.c
@@ -36,6 +36,8 @@
 #include <ft2build.h>
 #include FT_TRUETYPE_TABLES_H
 
+#include "libgimpbase/gimpbase.h"
+
 #include "text-types.h"
 
 #include "core/gimptempbuf.h"
diff --git a/app/text/gimptextundo.c b/app/text/gimptextundo.c
index 0fb07ac32b..3d720b8a2e 100644
--- a/app/text/gimptextundo.c
+++ b/app/text/gimptextundo.c
@@ -20,6 +20,7 @@
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gegl.h>
 
+#include "libgimpbase/gimpbase.h"
 #include "libgimpconfig/gimpconfig.h"
 
 #include "text-types.h"
diff --git a/app/tools/gimpbucketfilloptions.c b/app/tools/gimpbucketfilloptions.c
index f5615c23fd..ed0994e38c 100644
--- a/app/tools/gimpbucketfilloptions.c
+++ b/app/tools/gimpbucketfilloptions.c
@@ -20,6 +20,7 @@
 #include <gegl.h>
 #include <gtk/gtk.h>
 
+#include "libgimpbase/gimpbase.h"
 #include "libgimpconfig/gimpconfig.h"
 #include "libgimpwidgets/gimpwidgets.h"
 
diff --git a/app/tools/gimpcageoptions.c b/app/tools/gimpcageoptions.c
index 0b1aecc05e..a55b10425a 100644
--- a/app/tools/gimpcageoptions.c
+++ b/app/tools/gimpcageoptions.c
@@ -22,6 +22,7 @@
 #include <gegl.h>
 #include <gtk/gtk.h>
 
+#include "libgimpbase/gimpbase.h"
 #include "libgimpconfig/gimpconfig.h"
 #include "libgimpwidgets/gimpwidgets.h"
 
diff --git a/app/tools/gimpcoloroptions.c b/app/tools/gimpcoloroptions.c
index 8aeb6d0a28..34b375e945 100644
--- a/app/tools/gimpcoloroptions.c
+++ b/app/tools/gimpcoloroptions.c
@@ -20,6 +20,7 @@
 #include <gegl.h>
 #include <gtk/gtk.h>
 
+#include "libgimpbase/gimpbase.h"
 #include "libgimpconfig/gimpconfig.h"
 #include "libgimpwidgets/gimpwidgets.h"
 
diff --git a/app/tools/gimpcolorpickeroptions.c b/app/tools/gimpcolorpickeroptions.c
index 5305304dd9..d5a6eef454 100644
--- a/app/tools/gimpcolorpickeroptions.c
+++ b/app/tools/gimpcolorpickeroptions.c
@@ -20,6 +20,7 @@
 #include <gegl.h>
 #include <gtk/gtk.h>
 
+#include "libgimpbase/gimpbase.h"
 #include "libgimpconfig/gimpconfig.h"
 #include "libgimpwidgets/gimpwidgets.h"
 
diff --git a/app/tools/gimpcropoptions.c b/app/tools/gimpcropoptions.c
index 9fb7a99c9f..20d8239dde 100644
--- a/app/tools/gimpcropoptions.c
+++ b/app/tools/gimpcropoptions.c
@@ -20,6 +20,7 @@
 #include <gegl.h>
 #include <gtk/gtk.h>
 
+#include "libgimpbase/gimpbase.h"
 #include "libgimpconfig/gimpconfig.h"
 #include "libgimpwidgets/gimpwidgets.h"
 
diff --git a/app/tools/gimpfilteroptions.c b/app/tools/gimpfilteroptions.c
index 327ace201b..fd1d4ca8c8 100644
--- a/app/tools/gimpfilteroptions.c
+++ b/app/tools/gimpfilteroptions.c
@@ -20,6 +20,7 @@
 #include <gegl.h>
 #include <gtk/gtk.h>
 
+#include "libgimpbase/gimpbase.h"
 #include "libgimpconfig/gimpconfig.h"
 
 #include "tools-types.h"
diff --git a/app/tools/gimpflipoptions.c b/app/tools/gimpflipoptions.c
index 6b9eb2d635..3dd8b034cb 100644
--- a/app/tools/gimpflipoptions.c
+++ b/app/tools/gimpflipoptions.c
@@ -20,6 +20,7 @@
 #include <gegl.h>
 #include <gtk/gtk.h>
 
+#include "libgimpbase/gimpbase.h"
 #include "libgimpconfig/gimpconfig.h"
 #include "libgimpwidgets/gimpwidgets.h"
 
diff --git a/app/tools/gimpforegroundselectoptions.c b/app/tools/gimpforegroundselectoptions.c
index d88a1f36ca..40fe4e7abf 100644
--- a/app/tools/gimpforegroundselectoptions.c
+++ b/app/tools/gimpforegroundselectoptions.c
@@ -20,6 +20,7 @@
 #include <gegl.h>
 #include <gtk/gtk.h>
 
+#include "libgimpbase/gimpbase.h"
 #include "libgimpcolor/gimpcolor.h"
 #include "libgimpconfig/gimpconfig.h"
 #include "libgimpwidgets/gimpwidgets.h"
diff --git a/app/tools/gimpgradientoptions.c b/app/tools/gimpgradientoptions.c
index 86fdd25730..368eef34d4 100644
--- a/app/tools/gimpgradientoptions.c
+++ b/app/tools/gimpgradientoptions.c
@@ -20,6 +20,7 @@
 #include <gegl.h>
 #include <gtk/gtk.h>
 
+#include "libgimpbase/gimpbase.h"
 #include "libgimpconfig/gimpconfig.h"
 #include "libgimpwidgets/gimpwidgets.h"
 
diff --git a/app/tools/gimphandletransformoptions.c b/app/tools/gimphandletransformoptions.c
index bf24419703..8f5d664182 100644
--- a/app/tools/gimphandletransformoptions.c
+++ b/app/tools/gimphandletransformoptions.c
@@ -20,6 +20,7 @@
 #include <gegl.h>
 #include <gtk/gtk.h>
 
+#include "libgimpbase/gimpbase.h"
 #include "libgimpconfig/gimpconfig.h"
 #include "libgimpwidgets/gimpwidgets.h"
 
diff --git a/app/tools/gimphistogramoptions.c b/app/tools/gimphistogramoptions.c
index e70ca216fc..c526e8e309 100644
--- a/app/tools/gimphistogramoptions.c
+++ b/app/tools/gimphistogramoptions.c
@@ -20,6 +20,7 @@
 #include <gegl.h>
 #include <gtk/gtk.h>
 
+#include "libgimpbase/gimpbase.h"
 #include "libgimpconfig/gimpconfig.h"
 
 #include "tools-types.h"
diff --git a/app/tools/gimpiscissorsoptions.c b/app/tools/gimpiscissorsoptions.c
index bad0155e71..c7e469a2fb 100644
--- a/app/tools/gimpiscissorsoptions.c
+++ b/app/tools/gimpiscissorsoptions.c
@@ -20,6 +20,7 @@
 #include <gegl.h>
 #include <gtk/gtk.h>
 
+#include "libgimpbase/gimpbase.h"
 #include "libgimpconfig/gimpconfig.h"
 #include "libgimpwidgets/gimpwidgets.h"
 
diff --git a/app/tools/gimpmagnifyoptions.c b/app/tools/gimpmagnifyoptions.c
index 0ec7074831..a7b8b13b6c 100644
--- a/app/tools/gimpmagnifyoptions.c
+++ b/app/tools/gimpmagnifyoptions.c
@@ -20,6 +20,7 @@
 #include <gegl.h>
 #include <gtk/gtk.h>
 
+#include "libgimpbase/gimpbase.h"
 #include "libgimpconfig/gimpconfig.h"
 #include "libgimpwidgets/gimpwidgets.h"
 
diff --git a/app/tools/gimpmeasureoptions.c b/app/tools/gimpmeasureoptions.c
index 4e106a0504..b7f41ccc63 100644
--- a/app/tools/gimpmeasureoptions.c
+++ b/app/tools/gimpmeasureoptions.c
@@ -23,6 +23,7 @@
 #include <gegl.h>
 #include <gtk/gtk.h>
 
+#include "libgimpbase/gimpbase.h"
 #include "libgimpconfig/gimpconfig.h"
 #include "libgimpwidgets/gimpwidgets.h"
 
diff --git a/app/tools/gimpmoveoptions.c b/app/tools/gimpmoveoptions.c
index 7f76463ca4..30c9ee47da 100644
--- a/app/tools/gimpmoveoptions.c
+++ b/app/tools/gimpmoveoptions.c
@@ -20,6 +20,7 @@
 #include <gegl.h>
 #include <gtk/gtk.h>
 
+#include "libgimpbase/gimpbase.h"
 #include "libgimpconfig/gimpconfig.h"
 #include "libgimpwidgets/gimpwidgets.h"
 
diff --git a/app/tools/gimpnpointdeformationoptions.c b/app/tools/gimpnpointdeformationoptions.c
index 9098eb0b89..f3870cdcb0 100644
--- a/app/tools/gimpnpointdeformationoptions.c
+++ b/app/tools/gimpnpointdeformationoptions.c
@@ -22,6 +22,7 @@
 #include <gegl.h>
 #include <gtk/gtk.h>
 
+#include "libgimpbase/gimpbase.h"
 #include "libgimpconfig/gimpconfig.h"
 #include "libgimpwidgets/gimpwidgets.h"
 
diff --git a/app/tools/gimprectangleselectoptions.c b/app/tools/gimprectangleselectoptions.c
index ea8f0dae97..138a7b9024 100644
--- a/app/tools/gimprectangleselectoptions.c
+++ b/app/tools/gimprectangleselectoptions.c
@@ -20,6 +20,7 @@
 #include <gegl.h>
 #include <gtk/gtk.h>
 
+#include "libgimpbase/gimpbase.h"
 #include "libgimpconfig/gimpconfig.h"
 #include "libgimpwidgets/gimpwidgets.h"
 
diff --git a/app/tools/gimpregionselectoptions.c b/app/tools/gimpregionselectoptions.c
index 351c08ff75..d6b81328cd 100644
--- a/app/tools/gimpregionselectoptions.c
+++ b/app/tools/gimpregionselectoptions.c
@@ -20,6 +20,7 @@
 #include <gegl.h>
 #include <gtk/gtk.h>
 
+#include "libgimpbase/gimpbase.h"
 #include "libgimpconfig/gimpconfig.h"
 #include "libgimpwidgets/gimpwidgets.h"
 
diff --git a/app/tools/gimpseamlesscloneoptions.c b/app/tools/gimpseamlesscloneoptions.c
index cb2c557b65..63b6655a43 100644
--- a/app/tools/gimpseamlesscloneoptions.c
+++ b/app/tools/gimpseamlesscloneoptions.c
@@ -22,6 +22,7 @@
 #include <gegl.h>
 #include <gtk/gtk.h>
 
+#include "libgimpbase/gimpbase.h"
 #include "libgimpconfig/gimpconfig.h"
 #include "libgimpwidgets/gimpwidgets.h"
 
diff --git a/app/tools/gimpselectionoptions.c b/app/tools/gimpselectionoptions.c
index 45993864a5..5574136b80 100644
--- a/app/tools/gimpselectionoptions.c
+++ b/app/tools/gimpselectionoptions.c
@@ -20,6 +20,7 @@
 #include <gegl.h>
 #include <gtk/gtk.h>
 
+#include "libgimpbase/gimpbase.h"
 #include "libgimpconfig/gimpconfig.h"
 #include "libgimpwidgets/gimpwidgets.h"
 
diff --git a/app/tools/gimptilehandleriscissors.c b/app/tools/gimptilehandleriscissors.c
index 63e434a551..fe53adcaa9 100644
--- a/app/tools/gimptilehandleriscissors.c
+++ b/app/tools/gimptilehandleriscissors.c
@@ -22,6 +22,7 @@
 #include <gegl.h>
 #include <gtk/gtk.h>
 
+#include "libgimpbase/gimpbase.h"
 #include "libgimpmath/gimpmath.h"
 
 #include "tools-types.h"
diff --git a/app/tools/gimptool.c b/app/tools/gimptool.c
index 53981c1aaa..99842ce542 100644
--- a/app/tools/gimptool.c
+++ b/app/tools/gimptool.c
@@ -20,6 +20,7 @@
 #include <gegl.h>
 #include <gtk/gtk.h>
 
+#include "libgimpbase/gimpbase.h"
 #include "libgimpmath/gimpmath.h"
 
 #include "tools-types.h"
diff --git a/app/tools/gimptransformgridoptions.c b/app/tools/gimptransformgridoptions.c
index ee8dddb109..7aed02502b 100644
--- a/app/tools/gimptransformgridoptions.c
+++ b/app/tools/gimptransformgridoptions.c
@@ -20,6 +20,7 @@
 #include <gegl.h>
 #include <gtk/gtk.h>
 
+#include "libgimpbase/gimpbase.h"
 #include "libgimpconfig/gimpconfig.h"
 #include "libgimpwidgets/gimpwidgets.h"
 
diff --git a/app/tools/gimptransformgridtoolundo.c b/app/tools/gimptransformgridtoolundo.c
index 035d9e51ed..bc131e30ae 100644
--- a/app/tools/gimptransformgridtoolundo.c
+++ b/app/tools/gimptransformgridtoolundo.c
@@ -20,6 +20,8 @@
 #include <gegl.h>
 #include <gtk/gtk.h>
 
+#include "libgimpbase/gimpbase.h"
+
 #include "tools-types.h"
 
 #include "gimptoolcontrol.h"
diff --git a/app/tools/gimptransformoptions.c b/app/tools/gimptransformoptions.c
index d1c75e649c..f731c302fd 100644
--- a/app/tools/gimptransformoptions.c
+++ b/app/tools/gimptransformoptions.c
@@ -20,6 +20,7 @@
 #include <gegl.h>
 #include <gtk/gtk.h>
 
+#include "libgimpbase/gimpbase.h"
 #include "libgimpconfig/gimpconfig.h"
 #include "libgimpwidgets/gimpwidgets.h"
 
diff --git a/app/tools/gimpvectoroptions.c b/app/tools/gimpvectoroptions.c
index c6abb2c27e..c9517ed3c7 100644
--- a/app/tools/gimpvectoroptions.c
+++ b/app/tools/gimpvectoroptions.c
@@ -23,6 +23,7 @@
 #include <gegl.h>
 #include <gtk/gtk.h>
 
+#include "libgimpbase/gimpbase.h"
 #include "libgimpconfig/gimpconfig.h"
 #include "libgimpwidgets/gimpwidgets.h"
 
diff --git a/app/tools/gimpwarpoptions.c b/app/tools/gimpwarpoptions.c
index 2c2d3d961f..991ebb265b 100644
--- a/app/tools/gimpwarpoptions.c
+++ b/app/tools/gimpwarpoptions.c
@@ -22,6 +22,7 @@
 #include <gegl.h>
 #include <gtk/gtk.h>
 
+#include "libgimpbase/gimpbase.h"
 #include "libgimpconfig/gimpconfig.h"
 #include "libgimpwidgets/gimpwidgets.h"
 
diff --git a/app/vectors/gimpvectorsundo.c b/app/vectors/gimpvectorsundo.c
index 646869fdba..39857ecf60 100644
--- a/app/vectors/gimpvectorsundo.c
+++ b/app/vectors/gimpvectorsundo.c
@@ -22,6 +22,8 @@
 
 #include "vectors-types.h"
 
+#include "libgimpbase/gimpbase.h"
+
 #include "core/gimpimage.h"
 
 #include "gimpvectors.h"
diff --git a/app/widgets/gimpblobeditor.c b/app/widgets/gimpblobeditor.c
index d902c061eb..37c1cb6c45 100644
--- a/app/widgets/gimpblobeditor.c
+++ b/app/widgets/gimpblobeditor.c
@@ -21,6 +21,7 @@
 
 #include "widgets-types.h"
 
+#include "libgimpbase/gimpbase.h"
 #include "libgimpmath/gimpmath.h"
 
 #include "paint/gimpink-blob.h"
diff --git a/app/widgets/gimpbuffersourcebox.c b/app/widgets/gimpbuffersourcebox.c
index e40b4a6aa3..eedd20625d 100644
--- a/app/widgets/gimpbuffersourcebox.c
+++ b/app/widgets/gimpbuffersourcebox.c
@@ -25,6 +25,7 @@
 #include <gegl.h>
 #include <gtk/gtk.h>
 
+#include "libgimpbase/gimpbase.h"
 #include "libgimpwidgets/gimpwidgets.h"
 
 #include "widgets-types.h"
diff --git a/app/widgets/gimpcellrendererdashes.c b/app/widgets/gimpcellrendererdashes.c
index 0ad348ab74..e8385e8ed0 100644
--- a/app/widgets/gimpcellrendererdashes.c
+++ b/app/widgets/gimpcellrendererdashes.c
@@ -24,6 +24,8 @@
 
 #include "widgets-types.h"
 
+#include "libgimpbase/gimpbase.h"
+
 #include "core/gimpdashpattern.h"
 
 #include "gimpcellrendererdashes.h"
diff --git a/app/widgets/gimpcellrendererviewable.c b/app/widgets/gimpcellrendererviewable.c
index 4872addc36..6e9408dd78 100644
--- a/app/widgets/gimpcellrendererviewable.c
+++ b/app/widgets/gimpcellrendererviewable.c
@@ -25,6 +25,8 @@
 
 #include "widgets-types.h"
 
+#include "libgimpbase/gimpbase.h"
+
 #include "core/gimpmarshal.h"
 #include "core/gimpviewable.h"
 
diff --git a/app/widgets/gimpcircle.c b/app/widgets/gimpcircle.c
index 75c1f9f39d..e3b53bebce 100644
--- a/app/widgets/gimpcircle.c
+++ b/app/widgets/gimpcircle.c
@@ -27,6 +27,7 @@
 #include <gegl.h>
 #include <gtk/gtk.h>
 
+#include "libgimpbase/gimpbase.h"
 #include "libgimpmath/gimpmath.h"
 #include "libgimpcolor/gimpcolor.h"
 #include "libgimpwidgets/gimpwidgets.h"
diff --git a/app/widgets/gimpcolorbar.c b/app/widgets/gimpcolorbar.c
index d33119730e..5c4bc96091 100644
--- a/app/widgets/gimpcolorbar.c
+++ b/app/widgets/gimpcolorbar.c
@@ -22,6 +22,7 @@
 #include <gegl.h>
 #include <gtk/gtk.h>
 
+#include "libgimpbase/gimpbase.h"
 #include "libgimpwidgets/gimpwidgets.h"
 
 #include "libgimpmath/gimpmath.h"
diff --git a/app/widgets/gimpcolordialog.c b/app/widgets/gimpcolordialog.c
index 5c12f65549..7aa9b1f8d1 100644
--- a/app/widgets/gimpcolordialog.c
+++ b/app/widgets/gimpcolordialog.c
@@ -22,6 +22,7 @@
 #include <gegl.h>
 #include <gtk/gtk.h>
 
+#include "libgimpbase/gimpbase.h"
 #include "libgimpcolor/gimpcolor.h"
 #include "libgimpwidgets/gimpwidgets.h"
 
diff --git a/app/widgets/gimpcoloreditor.c b/app/widgets/gimpcoloreditor.c
index 4e28fd6744..7d7f692f33 100644
--- a/app/widgets/gimpcoloreditor.c
+++ b/app/widgets/gimpcoloreditor.c
@@ -25,6 +25,7 @@
 #include <gegl.h>
 #include <gtk/gtk.h>
 
+#include "libgimpbase/gimpbase.h"
 #include "libgimpcolor/gimpcolor.h"
 #include "libgimpwidgets/gimpwidgets.h"
 
diff --git a/app/widgets/gimpcolorframe.c b/app/widgets/gimpcolorframe.c
index eaddd54306..617515e09d 100644
--- a/app/widgets/gimpcolorframe.c
+++ b/app/widgets/gimpcolorframe.c
@@ -20,6 +20,7 @@
 #include <gegl.h>
 #include <gtk/gtk.h>
 
+#include "libgimpbase/gimpbase.h"
 #include "libgimpmath/gimpmath.h"
 #include "libgimpcolor/gimpcolor.h"
 #include "libgimpconfig/gimpconfig.h"
diff --git a/app/widgets/gimpcolorhistory.c b/app/widgets/gimpcolorhistory.c
index 8d9ec7282a..2a9df5f899 100644
--- a/app/widgets/gimpcolorhistory.c
+++ b/app/widgets/gimpcolorhistory.c
@@ -23,6 +23,7 @@
 #include <gegl.h>
 #include <gtk/gtk.h>
 
+#include "libgimpbase/gimpbase.h"
 #include "libgimpwidgets/gimpwidgets.h"
 
 #include "widgets-types.h"
diff --git a/app/widgets/gimpcolormapselection.c b/app/widgets/gimpcolormapselection.c
index 1eb82eec16..aa3a4dc946 100644
--- a/app/widgets/gimpcolormapselection.c
+++ b/app/widgets/gimpcolormapselection.c
@@ -20,6 +20,7 @@
 #include <gegl.h>
 #include <gtk/gtk.h>
 
+#include "libgimpbase/gimpbase.h"
 #include "libgimpcolor/gimpcolor.h"
 #include "libgimpmath/gimpmath.h"
 #include "libgimpwidgets/gimpwidgets.h"
diff --git a/app/widgets/gimpcontainercombobox.c b/app/widgets/gimpcontainercombobox.c
index 87e2af8eac..d559890b12 100644
--- a/app/widgets/gimpcontainercombobox.c
+++ b/app/widgets/gimpcontainercombobox.c
@@ -25,6 +25,8 @@
 #include <gegl.h>
 #include <gtk/gtk.h>
 
+#include "libgimpbase/gimpbase.h"
+
 #include "widgets-types.h"
 
 #include "core/gimpcontainer.h"
diff --git a/app/widgets/gimpcontainereditor.c b/app/widgets/gimpcontainereditor.c
index f21bcfbe49..e402bc8c1a 100644
--- a/app/widgets/gimpcontainereditor.c
+++ b/app/widgets/gimpcontainereditor.c
@@ -23,6 +23,7 @@
 #include <gegl.h>
 #include <gtk/gtk.h>
 
+#include "libgimpbase/gimpbase.h"
 #include "libgimpwidgets/gimpwidgets.h"
 
 #include "widgets-types.h"
diff --git a/app/widgets/gimpcontainertreestore.c b/app/widgets/gimpcontainertreestore.c
index 643368df2d..e7972b55e1 100644
--- a/app/widgets/gimpcontainertreestore.c
+++ b/app/widgets/gimpcontainertreestore.c
@@ -27,6 +27,8 @@
 
 #include "widgets-types.h"
 
+#include "libgimpbase/gimpbase.h"
+
 #include "core/gimpcontainer.h"
 #include "core/gimpviewable.h"
 
diff --git a/app/widgets/gimpcontainerview.c b/app/widgets/gimpcontainerview.c
index 0a9d4eafcc..52316b0e2b 100644
--- a/app/widgets/gimpcontainerview.c
+++ b/app/widgets/gimpcontainerview.c
@@ -25,6 +25,7 @@
 #include <gegl.h>
 #include <gtk/gtk.h>
 
+#include "libgimpbase/gimpbase.h"
 #include "libgimpwidgets/gimpwidgets.h"
 
 #include "widgets-types.h"
diff --git a/app/widgets/gimpcontrollereditor.c b/app/widgets/gimpcontrollereditor.c
index 27363276af..df37850b99 100644
--- a/app/widgets/gimpcontrollereditor.c
+++ b/app/widgets/gimpcontrollereditor.c
@@ -25,6 +25,7 @@
 #include <gegl.h>
 #include <gtk/gtk.h>
 
+#include "libgimpbase/gimpbase.h"
 #include "libgimpwidgets/gimpwidgets.h"
 
 #define GIMP_ENABLE_CONTROLLER_UNDER_CONSTRUCTION
diff --git a/app/widgets/gimpcontrollerinfo.c b/app/widgets/gimpcontrollerinfo.c
index a67203dbab..2da006a482 100644
--- a/app/widgets/gimpcontrollerinfo.c
+++ b/app/widgets/gimpcontrollerinfo.c
@@ -25,6 +25,7 @@
 #include <gegl.h>
 #include <gtk/gtk.h>
 
+#include "libgimpbase/gimpbase.h"
 #include "libgimpconfig/gimpconfig.h"
 #include "libgimpwidgets/gimpwidgets.h"
 
diff --git a/app/widgets/gimpcontrollerlist.c b/app/widgets/gimpcontrollerlist.c
index 424a96b7ea..0b85e641d7 100644
--- a/app/widgets/gimpcontrollerlist.c
+++ b/app/widgets/gimpcontrollerlist.c
@@ -25,6 +25,7 @@
 #include <gegl.h>
 #include <gtk/gtk.h>
 
+#include "libgimpbase/gimpbase.h"
 #include "libgimpwidgets/gimpwidgets.h"
 
 #define GIMP_ENABLE_CONTROLLER_UNDER_CONSTRUCTION
diff --git a/app/widgets/gimpcurveview.c b/app/widgets/gimpcurveview.c
index 057e80ad72..3cdc2ce22a 100644
--- a/app/widgets/gimpcurveview.c
+++ b/app/widgets/gimpcurveview.c
@@ -23,6 +23,7 @@
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 
+#include "libgimpbase/gimpbase.h"
 #include "libgimpmath/gimpmath.h"
 #include "libgimpcolor/gimpcolor.h"
 #include "libgimpconfig/gimpconfig.h"
diff --git a/app/widgets/gimpdasheditor.c b/app/widgets/gimpdasheditor.c
index e0b2af0692..20da4cc8ec 100644
--- a/app/widgets/gimpdasheditor.c
+++ b/app/widgets/gimpdasheditor.c
@@ -23,6 +23,7 @@
 #include <gegl.h>
 #include <gtk/gtk.h>
 
+#include "libgimpbase/gimpbase.h"
 #include "libgimpmath/gimpmath.h"
 #include "libgimpconfig/gimpconfig.h"
 
diff --git a/app/widgets/gimpdataeditor.c b/app/widgets/gimpdataeditor.c
index ad162bf0b7..ab49030b95 100644
--- a/app/widgets/gimpdataeditor.c
+++ b/app/widgets/gimpdataeditor.c
@@ -26,6 +26,7 @@
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 
+#include "libgimpbase/gimpbase.h"
 #include "libgimpwidgets/gimpwidgets.h"
 
 #include "widgets-types.h"
diff --git a/app/widgets/gimpdatafactoryview.c b/app/widgets/gimpdatafactoryview.c
index 35c8eb1ce0..e85298ffd7 100644
--- a/app/widgets/gimpdatafactoryview.c
+++ b/app/widgets/gimpdatafactoryview.c
@@ -25,6 +25,7 @@
 #include <gegl.h>
 #include <gtk/gtk.h>
 
+#include "libgimpbase/gimpbase.h"
 #include "libgimpwidgets/gimpwidgets.h"
 
 #include "widgets-types.h"
diff --git a/app/widgets/gimpdeviceeditor.c b/app/widgets/gimpdeviceeditor.c
index b4ad11f717..aaf04b8971 100644
--- a/app/widgets/gimpdeviceeditor.c
+++ b/app/widgets/gimpdeviceeditor.c
@@ -23,6 +23,7 @@
 #include <gegl.h>
 #include <gtk/gtk.h>
 
+#include "libgimpbase/gimpbase.h"
 #include "libgimpwidgets/gimpwidgets.h"
 
 #include "widgets-types.h"
diff --git a/app/widgets/gimpdeviceinfoeditor.c b/app/widgets/gimpdeviceinfoeditor.c
index 0422192533..e1500b669d 100644
--- a/app/widgets/gimpdeviceinfoeditor.c
+++ b/app/widgets/gimpdeviceinfoeditor.c
@@ -23,6 +23,7 @@
 #include <gegl.h>
 #include <gtk/gtk.h>
 
+#include "libgimpbase/gimpbase.h"
 #include "libgimpwidgets/gimpwidgets.h"
 
 #include "widgets-types.h"
diff --git a/app/widgets/gimpdevicemanager.c b/app/widgets/gimpdevicemanager.c
index 7eb0d0ff54..e98b18fea5 100644
--- a/app/widgets/gimpdevicemanager.c
+++ b/app/widgets/gimpdevicemanager.c
@@ -25,6 +25,8 @@
 
 #include "widgets-types.h"
 
+#include "libgimpbase/gimpbase.h"
+
 #include "config/gimpconfig-utils.h"
 #include "config/gimpguiconfig.h"
 
diff --git a/app/widgets/gimpdevicestatus.c b/app/widgets/gimpdevicestatus.c
index 18a10d656b..ce8b1a69bf 100644
--- a/app/widgets/gimpdevicestatus.c
+++ b/app/widgets/gimpdevicestatus.c
@@ -23,6 +23,7 @@
 #include <gegl.h>
 #include <gtk/gtk.h>
 
+#include "libgimpbase/gimpbase.h"
 #include "libgimpcolor/gimpcolor.h"
 #include "libgimpwidgets/gimpwidgets.h"
 
diff --git a/app/widgets/gimpdial.c b/app/widgets/gimpdial.c
index b147c39fa8..7d13436f10 100644
--- a/app/widgets/gimpdial.c
+++ b/app/widgets/gimpdial.c
@@ -27,6 +27,7 @@
 #include <gegl.h>
 #include <gtk/gtk.h>
 
+#include "libgimpbase/gimpbase.h"
 #include "libgimpmath/gimpmath.h"
 #include "libgimpcolor/gimpcolor.h"
 #include "libgimpwidgets/gimpwidgets.h"
diff --git a/app/widgets/gimpdockable.c b/app/widgets/gimpdockable.c
index 2b55440582..8127843a2f 100644
--- a/app/widgets/gimpdockable.c
+++ b/app/widgets/gimpdockable.c
@@ -25,6 +25,7 @@
 #include <gegl.h>
 #include <gtk/gtk.h>
 
+#include "libgimpbase/gimpbase.h"
 #include "libgimpwidgets/gimpwidgets.h"
 
 #include "widgets-types.h"
diff --git a/app/widgets/gimpdockbook.c b/app/widgets/gimpdockbook.c
index e3f49746a4..476f754c03 100644
--- a/app/widgets/gimpdockbook.c
+++ b/app/widgets/gimpdockbook.c
@@ -26,6 +26,7 @@
 #undef GTK_DISABLE_DEPRECATED
 #include <gtk/gtk.h>
 
+#include "libgimpbase/gimpbase.h"
 #include "libgimpwidgets/gimpwidgets.h"
 
 #include "widgets-types.h"
diff --git a/app/widgets/gimpdockcolumns.c b/app/widgets/gimpdockcolumns.c
index 1b9cadad41..c86d3e32f1 100644
--- a/app/widgets/gimpdockcolumns.c
+++ b/app/widgets/gimpdockcolumns.c
@@ -23,6 +23,8 @@
 #include <gegl.h>
 #include <gtk/gtk.h>
 
+#include "libgimpbase/gimpbase.h"
+
 #include "widgets-types.h"
 
 #include "core/gimp.h"
diff --git a/app/widgets/gimpdockwindow.c b/app/widgets/gimpdockwindow.c
index 0a54dfe515..b602549630 100644
--- a/app/widgets/gimpdockwindow.c
+++ b/app/widgets/gimpdockwindow.c
@@ -25,6 +25,7 @@
 
 #include <gtk/gtk.h>
 
+#include "libgimpbase/gimpbase.h"
 #include "libgimpwidgets/gimpwidgets.h"
 
 #include "widgets-types.h"
diff --git a/app/widgets/gimpeditor.c b/app/widgets/gimpeditor.c
index 3a5d841906..a5a6845b7b 100644
--- a/app/widgets/gimpeditor.c
+++ b/app/widgets/gimpeditor.c
@@ -23,6 +23,7 @@
 #include <gegl.h>
 #include <gtk/gtk.h>
 
+#include "libgimpbase/gimpbase.h"
 #include "libgimpwidgets/gimpwidgets.h"
 
 #include "widgets-types.h"
diff --git a/app/widgets/gimpenumaction.c b/app/widgets/gimpenumaction.c
index a66933fc61..598d7e10b9 100644
--- a/app/widgets/gimpenumaction.c
+++ b/app/widgets/gimpenumaction.c
@@ -22,6 +22,8 @@
 
 #include <gtk/gtk.h>
 
+#include "libgimpbase/gimpbase.h"
+
 #include "widgets-types.h"
 
 #include "core/gimpmarshal.h"
diff --git a/app/widgets/gimpfgbgeditor.c b/app/widgets/gimpfgbgeditor.c
index be9468eecf..ebf4d14f93 100644
--- a/app/widgets/gimpfgbgeditor.c
+++ b/app/widgets/gimpfgbgeditor.c
@@ -25,6 +25,7 @@
 #include <gegl.h>
 #include <gtk/gtk.h>
 
+#include "libgimpbase/gimpbase.h"
 #include "libgimpcolor/gimpcolor.h"
 #include "libgimpconfig/gimpconfig.h"
 #include "libgimpwidgets/gimpwidgets.h"
diff --git a/app/widgets/gimpfgbgview.c b/app/widgets/gimpfgbgview.c
index 04eaf61105..845e2d26e6 100644
--- a/app/widgets/gimpfgbgview.c
+++ b/app/widgets/gimpfgbgview.c
@@ -25,6 +25,7 @@
 #include <gegl.h>
 #include <gtk/gtk.h>
 
+#include "libgimpbase/gimpbase.h"
 #include "libgimpcolor/gimpcolor.h"
 #include "libgimpwidgets/gimpwidgets.h"
 
diff --git a/app/widgets/gimphandlebar.c b/app/widgets/gimphandlebar.c
index a86d8fd34d..8331ee78e8 100644
--- a/app/widgets/gimphandlebar.c
+++ b/app/widgets/gimphandlebar.c
@@ -19,6 +19,7 @@
 
 #include <gtk/gtk.h>
 
+#include "libgimpbase/gimpbase.h"
 #include "libgimpmath/gimpmath.h"
 
 #include "widgets-types.h"
diff --git a/app/widgets/gimphistogrameditor.c b/app/widgets/gimphistogrameditor.c
index 7ffd28933a..d298610e6d 100644
--- a/app/widgets/gimphistogrameditor.c
+++ b/app/widgets/gimphistogrameditor.c
@@ -20,6 +20,7 @@
 #include <gegl.h>
 #include <gtk/gtk.h>
 
+#include "libgimpbase/gimpbase.h"
 #include "libgimpwidgets/gimpwidgets.h"
 
 #include "widgets-types.h"
diff --git a/app/widgets/gimphistogramview.c b/app/widgets/gimphistogramview.c
index e878caf927..e84726fa65 100644
--- a/app/widgets/gimphistogramview.c
+++ b/app/widgets/gimphistogramview.c
@@ -22,6 +22,7 @@
 #include <gegl.h>
 #include <gtk/gtk.h>
 
+#include "libgimpbase/gimpbase.h"
 #include "libgimpmath/gimpmath.h"
 
 #include "widgets-types.h"
diff --git a/app/widgets/gimpiconpicker.c b/app/widgets/gimpiconpicker.c
index 730360c752..1a3a18dc5a 100644
--- a/app/widgets/gimpiconpicker.c
+++ b/app/widgets/gimpiconpicker.c
@@ -24,6 +24,7 @@
 #include <gegl.h>
 #include <gtk/gtk.h>
 
+#include "libgimpbase/gimpbase.h"
 #include "libgimpwidgets/gimpwidgets.h"
 
 #include "widgets-types.h"
diff --git a/app/widgets/gimplanguageentry.c b/app/widgets/gimplanguageentry.c
index 389651898c..c37df80d94 100644
--- a/app/widgets/gimplanguageentry.c
+++ b/app/widgets/gimplanguageentry.c
@@ -29,6 +29,8 @@
 
 #include <gtk/gtk.h>
 
+#include "libgimpbase/gimpbase.h"
+
 #include "widgets-types.h"
 
 #include "gimplanguageentry.h"
diff --git a/app/widgets/gimpmeter.c b/app/widgets/gimpmeter.c
index 0fd90c0182..02894e2850 100644
--- a/app/widgets/gimpmeter.c
+++ b/app/widgets/gimpmeter.c
@@ -25,6 +25,7 @@
 #include <gegl.h>
 #include <gtk/gtk.h>
 
+#include "libgimpbase/gimpbase.h"
 #include "libgimpmath/gimpmath.h"
 #include "libgimpcolor/gimpcolor.h"
 #include "libgimpwidgets/gimpwidgets.h"
diff --git a/app/widgets/gimpoverlaydialog.c b/app/widgets/gimpoverlaydialog.c
index af7e918321..7c0dce088b 100644
--- a/app/widgets/gimpoverlaydialog.c
+++ b/app/widgets/gimpoverlaydialog.c
@@ -24,6 +24,7 @@
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 
+#include "libgimpbase/gimpbase.h"
 #include "libgimpwidgets/gimpwidgets.h"
 
 #include "widgets-types.h"
diff --git a/app/widgets/gimppickablebutton.c b/app/widgets/gimppickablebutton.c
index e8454c2729..364e3cc158 100644
--- a/app/widgets/gimppickablebutton.c
+++ b/app/widgets/gimppickablebutton.c
@@ -23,6 +23,7 @@
 #include <gegl.h>
 #include <gtk/gtk.h>
 
+#include "libgimpbase/gimpbase.h"
 #include "libgimpwidgets/gimpwidgets.h"
 
 #include "widgets-types.h"
diff --git a/app/widgets/gimppickablepopup.c b/app/widgets/gimppickablepopup.c
index c0e0161af5..809d0b4642 100644
--- a/app/widgets/gimppickablepopup.c
+++ b/app/widgets/gimppickablepopup.c
@@ -24,6 +24,7 @@
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 
+#include "libgimpbase/gimpbase.h"
 #include "libgimpwidgets/gimpwidgets.h"
 
 #include "widgets-types.h"
diff --git a/app/widgets/gimppolar.c b/app/widgets/gimppolar.c
index 20578f2a45..06484c0de5 100644
--- a/app/widgets/gimppolar.c
+++ b/app/widgets/gimppolar.c
@@ -27,6 +27,7 @@
 #include <gegl.h>
 #include <gtk/gtk.h>
 
+#include "libgimpbase/gimpbase.h"
 #include "libgimpmath/gimpmath.h"
 #include "libgimpcolor/gimpcolor.h"
 #include "libgimpwidgets/gimpwidgets.h"
diff --git a/app/widgets/gimpprocedureaction.c b/app/widgets/gimpprocedureaction.c
index 4fb6459b06..4b147e685f 100644
--- a/app/widgets/gimpprocedureaction.c
+++ b/app/widgets/gimpprocedureaction.c
@@ -25,6 +25,8 @@
 
 #include "widgets-types.h"
 
+#include "libgimpbase/gimpbase.h"
+
 #include "pdb/gimpprocedure.h"
 
 #include "gimpaction.h"
diff --git a/app/widgets/gimpsamplepointeditor.c b/app/widgets/gimpsamplepointeditor.c
index 06d98d0bd4..31cd04b476 100644
--- a/app/widgets/gimpsamplepointeditor.c
+++ b/app/widgets/gimpsamplepointeditor.c
@@ -23,6 +23,7 @@
 #include <gegl.h>
 #include <gtk/gtk.h>
 
+#include "libgimpbase/gimpbase.h"
 #include "libgimpwidgets/gimpwidgets.h"
 
 #include "widgets-types.h"
diff --git a/app/widgets/gimpsettingsbox.c b/app/widgets/gimpsettingsbox.c
index 2cc59192b2..08a8d6418f 100644
--- a/app/widgets/gimpsettingsbox.c
+++ b/app/widgets/gimpsettingsbox.c
@@ -23,6 +23,7 @@
 #include <gegl.h>
 #include <gtk/gtk.h>
 
+#include "libgimpbase/gimpbase.h"
 #include "libgimpconfig/gimpconfig.h"
 #include "libgimpwidgets/gimpwidgets.h"
 
diff --git a/app/widgets/gimpspinscale.c b/app/widgets/gimpspinscale.c
index 93a2a9bc93..14010677f8 100644
--- a/app/widgets/gimpspinscale.c
+++ b/app/widgets/gimpspinscale.c
@@ -25,6 +25,7 @@
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 
+#include "libgimpbase/gimpbase.h"
 #include "libgimpwidgets/gimpwidgets.h"
 #include "libgimpmath/gimpmath.h"
 
diff --git a/app/widgets/gimpstringaction.c b/app/widgets/gimpstringaction.c
index a2db7ca3f8..eebfaea10f 100644
--- a/app/widgets/gimpstringaction.c
+++ b/app/widgets/gimpstringaction.c
@@ -22,6 +22,8 @@
 
 #include <gtk/gtk.h>
 
+#include "libgimpbase/gimpbase.h"
+
 #include "widgets-types.h"
 
 #include "gimpaction.h"
diff --git a/app/widgets/gimptagpopup.c b/app/widgets/gimptagpopup.c
index a7c1b7d758..5325555e53 100644
--- a/app/widgets/gimptagpopup.c
+++ b/app/widgets/gimptagpopup.c
@@ -26,6 +26,7 @@
 #include <gegl.h>
 #include <gtk/gtk.h>
 
+#include "libgimpbase/gimpbase.h"
 #include "libgimpwidgets/gimpwidgets.h"
 
 #include "widgets-types.h"
diff --git a/app/widgets/gimptooloptionseditor.c b/app/widgets/gimptooloptionseditor.c
index 2d2a419f58..206674e746 100644
--- a/app/widgets/gimptooloptionseditor.c
+++ b/app/widgets/gimptooloptionseditor.c
@@ -23,6 +23,7 @@
 #include <gegl.h>
 #include <gtk/gtk.h>
 
+#include "libgimpbase/gimpbase.h"
 #include "libgimpwidgets/gimpwidgets.h"
 
 #include "widgets-types.h"
diff --git a/app/widgets/gimptoolpalette.c b/app/widgets/gimptoolpalette.c
index 45b2d55684..3c083d9c73 100644
--- a/app/widgets/gimptoolpalette.c
+++ b/app/widgets/gimptoolpalette.c
@@ -23,6 +23,7 @@
 #include <gegl.h>
 #include <gtk/gtk.h>
 
+#include "libgimpbase/gimpbase.h"
 #include "libgimpwidgets/gimpwidgets.h"
 
 #include "widgets-types.h"
diff --git a/app/widgets/gimpundoeditor.c b/app/widgets/gimpundoeditor.c
index 62bee16816..585d967437 100644
--- a/app/widgets/gimpundoeditor.c
+++ b/app/widgets/gimpundoeditor.c
@@ -20,6 +20,7 @@
 #include <gegl.h>
 #include <gtk/gtk.h>
 
+#include "libgimpbase/gimpbase.h"
 #include "libgimpwidgets/gimpwidgets.h"
 
 #include "widgets-types.h"
diff --git a/app/widgets/gimpviewablebutton.c b/app/widgets/gimpviewablebutton.c
index db4e4ad2d5..c161c7b973 100644
--- a/app/widgets/gimpviewablebutton.c
+++ b/app/widgets/gimpviewablebutton.c
@@ -23,6 +23,7 @@
 #include <gegl.h>
 #include <gtk/gtk.h>
 
+#include "libgimpbase/gimpbase.h"
 #include "libgimpwidgets/gimpwidgets.h"
 
 #include "widgets-types.h"
diff --git a/app/widgets/gimpviewabledialog.c b/app/widgets/gimpviewabledialog.c
index 8cbe7234e0..295b8637fe 100644
--- a/app/widgets/gimpviewabledialog.c
+++ b/app/widgets/gimpviewabledialog.c
@@ -23,6 +23,7 @@
 #include <gegl.h>
 #include <gtk/gtk.h>
 
+#include "libgimpbase/gimpbase.h"
 #include "libgimpwidgets/gimpwidgets.h"
 
 #include "widgets-types.h"
diff --git a/libgimpbase/Makefile.am b/libgimpbase/Makefile.am
index 4395f5e506..79b480bcdb 100644
--- a/libgimpbase/Makefile.am
+++ b/libgimpbase/Makefile.am
@@ -124,7 +124,6 @@ libgimpbaseinclude_HEADERS = \
        gimpbasetypes.h         \
        gimpcpuaccel.h          \
        gimplimits.h            \
-       gimpparam.h             \
        gimpparamspecs.h        \
        gimpversion.h           \
        \
diff --git a/libgimpbase/Makefile.gi b/libgimpbase/Makefile.gi
index f8aeb34c45..58dda0d660 100644
--- a/libgimpbase/Makefile.gi
+++ b/libgimpbase/Makefile.gi
@@ -5,7 +5,6 @@ libgimpbase_introspectable = \
        $(top_srcdir)/libgimpbase/gimpbasetypes.h               \
        $(top_srcdir)/libgimpbase/gimpbasetypes.c               \
        $(top_srcdir)/libgimpbase/gimplimits.h                  \
-       $(top_srcdir)/libgimpbase/gimpparam.h                   \
        $(top_builddir)/libgimpbase/gimpversion.h               \
        \
        $(top_srcdir)/libgimpbase/gimpchecks.c                  \
diff --git a/libgimpbase/gimpbasetypes.h b/libgimpbase/gimpbasetypes.h
index d77a71eaa8..3dc3409a95 100644
--- a/libgimpbase/gimpbasetypes.h
+++ b/libgimpbase/gimpbasetypes.h
@@ -24,7 +24,6 @@
 #include <libgimpmath/gimpmathtypes.h>
 
 #include <libgimpbase/gimpbaseenums.h>
-#include <libgimpbase/gimpparam.h>
 
 
 G_BEGIN_DECLS
diff --git a/libgimpbase/gimpparamspecs.h b/libgimpbase/gimpparamspecs.h
index 6cb8da15c9..182bcdb77b 100644
--- a/libgimpbase/gimpparamspecs.h
+++ b/libgimpbase/gimpparamspecs.h
@@ -29,11 +29,50 @@ G_BEGIN_DECLS
 
 /* For information look into the C source or the html documentation */
 
+
+/**
+ * GIMP_PARAM_NO_VALIDATE:
+ *
+ * Since 3.0
+ */
 /*
  * Keep in sync with libgimpconfig/gimpconfig-params.h
  */
 #define GIMP_PARAM_NO_VALIDATE (1 << (6 + G_PARAM_USER_SHIFT))
 
+/**
+ * GIMP_PARAM_STATIC_STRINGS:
+ *
+ * Since: 2.4
+ **/
+#define GIMP_PARAM_STATIC_STRINGS (G_PARAM_STATIC_NAME | \
+                                   G_PARAM_STATIC_NICK | \
+                                   G_PARAM_STATIC_BLURB)
+
+/**
+ * GIMP_PARAM_READABLE:
+ *
+ * Since: 2.4
+ **/
+#define GIMP_PARAM_READABLE       (G_PARAM_READABLE    | \
+                                   GIMP_PARAM_STATIC_STRINGS)
+
+/**
+ * GIMP_PARAM_WRITABLE:
+ *
+ * Since: 2.4
+ **/
+#define GIMP_PARAM_WRITABLE       (G_PARAM_WRITABLE    | \
+                                   GIMP_PARAM_STATIC_STRINGS)
+
+/**
+ * GIMP_PARAM_READWRITE:
+ *
+ * Since: 2.4
+ **/
+#define GIMP_PARAM_READWRITE      (G_PARAM_READWRITE   | \
+                                   GIMP_PARAM_STATIC_STRINGS)
+
 
 /*
  * GIMP_TYPE_INT32
diff --git a/libgimpthumb/gimpthumbnail.c b/libgimpthumb/gimpthumbnail.c
index e7f9d3d618..c153f6d1bb 100644
--- a/libgimpthumb/gimpthumbnail.c
+++ b/libgimpthumb/gimpthumbnail.c
@@ -35,7 +35,7 @@
 #include <glib/gstdio.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 
-#include "libgimpbase/gimpparam.h"
+#include "libgimpbase/gimpbase.h"
 
 #ifdef G_OS_WIN32
 #include "libgimpbase/gimpwin32-io.h"
diff --git a/libgimpwidgets/gimpbusybox.c b/libgimpwidgets/gimpbusybox.c
index a6dfaddd66..fd07311a10 100644
--- a/libgimpwidgets/gimpbusybox.c
+++ b/libgimpwidgets/gimpbusybox.c
@@ -24,6 +24,8 @@
 #include <gegl.h>
 #include <gtk/gtk.h>
 
+#include "libgimpbase/gimpbase.h"
+
 #include "gimpwidgetstypes.h"
 
 #include "gimpbusybox.h"
diff --git a/libgimpwidgets/gimpcellrenderertoggle.c b/libgimpwidgets/gimpcellrenderertoggle.c
index 21032adeca..9e288329b3 100644
--- a/libgimpwidgets/gimpcellrenderertoggle.c
+++ b/libgimpwidgets/gimpcellrenderertoggle.c
@@ -23,6 +23,8 @@
 
 #include <gtk/gtk.h>
 
+#include "libgimpbase/gimpbase.h"
+
 #include "gimpwidgetstypes.h"
 
 #include "gimpwidgetsmarshal.h"
diff --git a/libgimpwidgets/gimpchainbutton.c b/libgimpwidgets/gimpchainbutton.c
index dade24787e..631b42a584 100644
--- a/libgimpwidgets/gimpchainbutton.c
+++ b/libgimpwidgets/gimpchainbutton.c
@@ -23,6 +23,8 @@
 
 #include <gtk/gtk.h>
 
+#include "libgimpbase/gimpbase.h"
+
 #include "gimpwidgetstypes.h"
 
 #include "gimpchainbutton.h"
diff --git a/libgimpwidgets/gimpcolorbutton.c b/libgimpwidgets/gimpcolorbutton.c
index db546a81d8..6657f8777c 100644
--- a/libgimpwidgets/gimpcolorbutton.c
+++ b/libgimpwidgets/gimpcolorbutton.c
@@ -26,6 +26,7 @@
 #include <gegl.h>
 #include <gtk/gtk.h>
 
+#include "libgimpbase/gimpbase.h"
 #include "libgimpcolor/gimpcolor.h"
 #include "libgimpconfig/gimpconfig.h"
 
diff --git a/libgimpwidgets/gimpcolorprofilecombobox.c b/libgimpwidgets/gimpcolorprofilecombobox.c
index fa6de162f8..edfe5238e8 100644
--- a/libgimpwidgets/gimpcolorprofilecombobox.c
+++ b/libgimpwidgets/gimpcolorprofilecombobox.c
@@ -24,6 +24,7 @@
 #include <gegl.h>
 #include <gtk/gtk.h>
 
+#include "libgimpbase/gimpbase.h"
 #include "libgimpcolor/gimpcolor.h"
 
 #include "gimpwidgetstypes.h"
diff --git a/libgimpwidgets/gimpcontroller.c b/libgimpwidgets/gimpcontroller.c
index 72199df2f8..8dbf9d1d23 100644
--- a/libgimpwidgets/gimpcontroller.c
+++ b/libgimpwidgets/gimpcontroller.c
@@ -24,6 +24,7 @@
 #include <gegl.h>
 #include <gtk/gtk.h>
 
+#include "libgimpbase/gimpbase.h"
 #include "libgimpcolor/gimpcolor.h"
 #include "libgimpconfig/gimpconfig.h"
 
diff --git a/libgimpwidgets/gimpdialog.c b/libgimpwidgets/gimpdialog.c
index 1b2dc4c12a..8be9fc0863 100644
--- a/libgimpwidgets/gimpdialog.c
+++ b/libgimpwidgets/gimpdialog.c
@@ -23,6 +23,8 @@
 
 #include <gtk/gtk.h>
 
+#include "libgimpbase/gimpbase.h"
+
 #include "gimpwidgetstypes.h"
 
 #include "gimpdialog.h"
diff --git a/libgimpwidgets/gimpenumcombobox.c b/libgimpwidgets/gimpenumcombobox.c
index eabac9545e..bd6b28255b 100644
--- a/libgimpwidgets/gimpenumcombobox.c
+++ b/libgimpwidgets/gimpenumcombobox.c
@@ -23,6 +23,8 @@
 
 #include <gtk/gtk.h>
 
+#include "libgimpbase/gimpbase.h"
+
 #include "gimpwidgetstypes.h"
 
 #include "gimpenumcombobox.h"
diff --git a/libgimpwidgets/gimphintbox.c b/libgimpwidgets/gimphintbox.c
index 046c6bbc6e..0cb6fb1aa7 100644
--- a/libgimpwidgets/gimphintbox.c
+++ b/libgimpwidgets/gimphintbox.c
@@ -24,6 +24,8 @@
 #include <gegl.h>
 #include <gtk/gtk.h>
 
+#include "libgimpbase/gimpbase.h"
+
 #include "gimpwidgets.h"
 
 
diff --git a/libgimpwidgets/gimpintcombobox.c b/libgimpwidgets/gimpintcombobox.c
index ec80b6be38..768d36cdff 100644
--- a/libgimpwidgets/gimpintcombobox.c
+++ b/libgimpwidgets/gimpintcombobox.c
@@ -25,6 +25,8 @@
 
 #include <gtk/gtk.h>
 
+#include "libgimpbase/gimpbase.h"
+
 #include "gimpwidgetstypes.h"
 
 #include "gimpintcombobox.h"
diff --git a/libgimpwidgets/gimpintstore.c b/libgimpwidgets/gimpintstore.c
index 090296592f..d65f6a9b71 100644
--- a/libgimpwidgets/gimpintstore.c
+++ b/libgimpwidgets/gimpintstore.c
@@ -25,6 +25,8 @@
 
 #include <gtk/gtk.h>
 
+#include "libgimpbase/gimpbase.h"
+
 #include "gimpwidgetstypes.h"
 
 #include "gimpintstore.h"
diff --git a/libgimpwidgets/gimpnumberpairentry.c b/libgimpwidgets/gimpnumberpairentry.c
index 5a1a428764..3bbb4132c1 100644
--- a/libgimpwidgets/gimpnumberpairentry.c
+++ b/libgimpwidgets/gimpnumberpairentry.c
@@ -29,6 +29,7 @@
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 
+#include "libgimpbase/gimpbase.h"
 #include "libgimpmath/gimpmath.h"
 
 #include "gimpwidgetstypes.h"
diff --git a/libgimpwidgets/gimppageselector.c b/libgimpwidgets/gimppageselector.c
index 37f2ceab07..da528c6bfd 100644
--- a/libgimpwidgets/gimppageselector.c
+++ b/libgimpwidgets/gimppageselector.c
@@ -27,6 +27,8 @@
 #include <gegl.h>
 #include <gtk/gtk.h>
 
+#include "libgimpbase/gimpbase.h"
+
 #include "gimpwidgetstypes.h"
 
 #include "gimpicons.h"
diff --git a/libgimpwidgets/gimppreview.c b/libgimpwidgets/gimppreview.c
index c722525ec8..9aed07ec13 100644
--- a/libgimpwidgets/gimppreview.c
+++ b/libgimpwidgets/gimppreview.c
@@ -23,6 +23,7 @@
 #include <gegl.h>
 #include <gtk/gtk.h>
 
+#include "libgimpbase/gimpbase.h"
 #include "libgimpmath/gimpmath.h"
 
 #include "gimpwidgets.h"
diff --git a/libgimpwidgets/gimpstringcombobox.c b/libgimpwidgets/gimpstringcombobox.c
index a25bc194dc..d2bbfba403 100644
--- a/libgimpwidgets/gimpstringcombobox.c
+++ b/libgimpwidgets/gimpstringcombobox.c
@@ -25,6 +25,8 @@
 
 #include <gtk/gtk.h>
 
+#include "libgimpbase/gimpbase.h"
+
 #include "gimpwidgetstypes.h"
 
 #include "gimpstringcombobox.h"
diff --git a/modules/display-filter-clip-warning.c b/modules/display-filter-clip-warning.c
index 89d290dadb..3ea83ff8a1 100644
--- a/modules/display-filter-clip-warning.c
+++ b/modules/display-filter-clip-warning.c
@@ -23,6 +23,7 @@
 #include <gegl.h>
 #include <gtk/gtk.h>
 
+#include "libgimpbase/gimpbase.h"
 #include "libgimpcolor/gimpcolor.h"
 #include "libgimpconfig/gimpconfig.h"
 #include "libgimpmath/gimpmath.h"


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]