[gimp] app,libgimp*: fix includes to follow our include policy
- From: Michael Natterer <mitch src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp] app,libgimp*: fix includes to follow our include policy
- Date: Tue, 15 Oct 2013 00:07:14 +0000 (UTC)
commit 697572ccc0f382423fea1f52a1b366ea63be8000
Author: Michael Natterer <mitch gimp org>
Date: Tue Oct 15 01:58:39 2013 +0200
app,libgimp*: fix includes to follow our include policy
- don't include <gdk-pixbuf/gdk-pixbuf.h> in headers in app/
- instead, include it in many .c files instead of <glib-object.h>,
finally acknowledging the fact that app/ depends on gdk-pixbuf almost
globally
- fix up includes as if libgimpbase depended in GIO, which it soon will
app/app.c | 1 +
app/batch.c | 1 +
app/config/Makefile.am | 2 +-
app/config/config-enums.c | 2 +-
app/config/gimpconfig-file.c | 2 +-
app/config/gimpconfig-utils.c | 2 +-
app/config/gimpgeglconfig.c | 1 +
app/config/gimpguiconfig.c | 2 +-
app/config/gimppluginconfig.c | 2 +-
app/config/gimprc-serialize.c | 2 +-
app/config/gimprc-unknown.c | 2 +-
app/config/gimprc.c | 2 +-
app/core/Makefile.am | 2 +-
app/core/core-enums.c | 2 +-
app/core/gimp-contexts.c | 3 ++-
app/core/gimp-gradients.c | 1 +
app/core/gimp-gui.c | 1 +
app/core/gimp-modules.c | 2 +-
app/core/gimp-parasites.c | 2 +-
app/core/gimp-tags.c | 1 +
app/core/gimp-templates.c | 1 +
app/core/gimp-units.c | 2 +-
app/core/gimp-user-install.c | 3 +--
app/core/gimp.c | 1 +
app/core/gimpbrush-boundary.c | 1 +
app/core/gimpbrush-load.c | 3 ++-
app/core/gimpbrush-transform.c | 1 +
app/core/gimpbrush.c | 1 +
app/core/gimpbrushclipboard.c | 1 +
app/core/gimpbrushgenerated-load.c | 3 ++-
app/core/gimpbrushgenerated-save.c | 3 ++-
app/core/gimpbrushgenerated.c | 1 +
app/core/gimpbrushpipe-load.c | 3 ++-
app/core/gimpbrushpipe.c | 1 +
app/core/gimpchannel-combine.c | 1 +
app/core/gimpchannel-select.c | 1 +
app/core/gimpchannelpropundo.c | 1 +
app/core/gimpchannelundo.c | 1 +
app/core/gimpcurve-load.c | 3 ++-
app/core/gimpcurve-map.c | 1 +
app/core/gimpcurve-save.c | 3 ++-
app/core/gimpcurve.c | 1 +
app/core/gimpdashpattern.c | 2 +-
app/core/gimpdata.c | 1 +
app/core/gimpdatafactory.c | 1 +
app/core/gimpdocumentlist.c | 1 +
app/core/gimpdrawable-combine.c | 1 +
app/core/gimpdrawable-equalize.c | 1 +
app/core/gimpdrawable-filter.c | 1 +
app/core/gimpdrawable-histogram.c | 1 +
app/core/gimpdrawable-levels.c | 1 +
app/core/gimpdrawable-operation.c | 1 +
app/core/gimpdrawable-preview.c | 1 +
app/core/gimpdrawable-shadow.c | 1 +
app/core/gimpdrawablemodundo.c | 1 +
app/core/gimpdrawablestack.c | 1 +
app/core/gimpdrawableundo.c | 1 +
app/core/gimpdynamics-load.c | 1 +
app/core/gimpdynamics-save.c | 1 +
app/core/gimpdynamics.c | 1 +
app/core/gimpdynamicsoutput.c | 1 +
app/core/gimpfilloptions.c | 1 +
app/core/gimpfilter.c | 1 +
app/core/gimpfilterstack.c | 1 +
app/core/gimpfloatingselundo.c | 1 +
app/core/gimpgradient-save.c | 3 ++-
app/core/gimpgrouplayer.c | 1 +
app/core/gimpgrouplayerundo.c | 1 +
app/core/gimpguide.c | 2 +-
app/core/gimpguideundo.c | 1 +
app/core/gimpimage-arrange.c | 1 +
app/core/gimpimage-convert-precision.c | 1 +
app/core/gimpimage-convert-type.c | 2 +-
app/core/gimpimage-crop.c | 1 +
app/core/gimpimage-duplicate.c | 1 +
app/core/gimpimage-flip.c | 1 +
app/core/gimpimage-grid.c | 1 +
app/core/gimpimage-guides.c | 1 +
app/core/gimpimage-item-list.c | 1 +
app/core/gimpimage-new.c | 1 +
app/core/gimpimage-pick-color.c | 1 +
app/core/gimpimage-pick-layer.c | 1 +
app/core/gimpimage-preview.c | 1 +
app/core/gimpimage-resize.c | 1 +
app/core/gimpimage-rotate.c | 1 +
app/core/gimpimage-sample-points.c | 1 +
app/core/gimpimage-scale.c | 1 +
app/core/gimpimage-snap.c | 1 +
app/core/gimpimage-undo-push.c | 1 +
app/core/gimpimage-undo.c | 1 +
app/core/gimpimage.c | 2 +-
app/core/gimpimagemap.c | 1 +
app/core/gimpitem-exclusive.c | 1 +
app/core/gimpitem-linked.c | 1 +
app/core/gimpitem-preview.c | 1 +
app/core/gimpitem.c | 1 +
app/core/gimpitempropundo.c | 1 +
app/core/gimpitemstack.c | 1 +
app/core/gimpitemtree.c | 1 +
app/core/gimpitemundo.c | 1 +
app/core/gimplayer-floating-sel.c | 1 +
app/core/gimplayermask.c | 1 +
app/core/gimplayermaskpropundo.c | 1 +
app/core/gimplayermaskundo.c | 1 +
app/core/gimplayerpropundo.c | 1 +
app/core/gimplayerundo.c | 1 +
app/core/gimpmaskundo.c | 1 +
app/core/gimpobject.c | 1 +
app/core/gimppaintinfo.c | 1 +
app/core/gimpparamspecs-desc.c | 2 +-
app/core/gimpparamspecs.c | 1 +
app/core/gimpparasitelist.c | 1 +
app/core/gimppattern.c | 1 +
app/core/gimppatternclipboard.c | 1 +
app/core/gimppdbprogress.c | 1 +
app/core/gimppickable-auto-shrink.c | 1 +
app/core/gimpprojectable.c | 1 +
app/core/gimpprojection.c | 1 +
app/core/gimpsamplepointundo.c | 1 +
app/core/gimpscanconvert.c | 1 +
app/core/gimpselection.c | 1 +
app/core/gimpsettings.c | 1 +
app/core/gimpstrokeoptions.c | 1 +
app/core/gimptagcache.c | 1 +
app/core/gimptemplate.c | 1 +
app/core/gimptoolinfo.c | 1 +
app/core/gimptooloptions.c | 3 ++-
app/core/gimptoolpreset-load.c | 1 +
app/core/gimptoolpreset-save.c | 1 +
app/core/gimptoolpreset.c | 1 +
app/core/gimptreehandler.c | 1 +
app/core/gimpundo.c | 1 +
app/core/gimpundostack.c | 1 +
app/core/gimpunit.c | 2 +-
app/core/gimpviewable.c | 2 +-
app/core/gimpviewable.h | 2 --
app/display/Makefile.am | 2 +-
app/display/display-enums.c | 2 +-
app/errors.c | 2 +-
app/file/file-open.c | 3 ++-
app/file/file-procedure.c | 2 +-
app/file/file-save.c | 3 ++-
app/file/file-utils.h | 3 ---
app/gegl/Makefile.am | 2 +-
app/gegl/gimp-gegl-enums.c | 2 +-
app/gegl/gimp-gegl-mask-combine.c | 1 +
app/main.c | 2 +-
app/operations/gimpbrightnesscontrastconfig.c | 1 +
app/operations/gimpcageconfig.c | 1 +
app/operations/gimpdesaturateconfig.c | 1 +
app/operations/gimphuesaturationconfig.c | 1 +
app/operations/gimpoperationcagecoefcalc.c | 1 +
app/operations/gimpoperationcurves.c | 1 +
app/operations/gimpoperationlevels.c | 1 +
app/operations/gimpoperationnormalmode.c | 4 +++-
app/operations/gimpoperationposterize.c | 1 +
app/operations/gimpoperationthreshold.c | 1 +
app/operations/gimpposterizeconfig.c | 1 +
app/operations/gimpthresholdconfig.c | 1 +
app/paint/Makefile.am | 2 +-
app/paint/gimp-paint.c | 1 +
app/paint/gimpairbrush.c | 1 +
app/paint/gimpairbrushoptions.c | 1 +
app/paint/gimpbrushcore.c | 1 +
app/paint/gimpclone.c | 1 +
app/paint/gimpcloneoptions.c | 1 +
app/paint/gimpconvolve.c | 1 +
app/paint/gimpconvolveoptions.c | 1 +
app/paint/gimpdodgeburn.c | 1 +
app/paint/gimpdodgeburnoptions.c | 1 +
app/paint/gimperaser.c | 1 +
app/paint/gimperaseroptions.c | 1 +
app/paint/gimpheal.c | 1 +
app/paint/gimpink.c | 1 +
app/paint/gimpinkoptions.c | 1 +
app/paint/gimpinkundo.c | 1 +
app/paint/gimppaintcore-stroke.c | 1 +
app/paint/gimppaintcore.c | 1 +
app/paint/gimppaintcoreundo.c | 1 +
app/paint/gimppaintoptions.c | 1 +
app/paint/gimppencil.c | 1 +
app/paint/gimppenciloptions.c | 1 +
app/paint/gimpperspectiveclone.c | 1 +
app/paint/gimpperspectivecloneoptions.c | 1 +
app/paint/gimpsmudge.c | 1 +
app/paint/gimpsmudgeoptions.c | 1 +
app/paint/gimpsourcecore.c | 1 +
app/paint/gimpsourceoptions.c | 1 +
app/paint/paint-enums.c | 2 +-
app/pdb/gimppdb-query.c | 2 +-
app/pdb/gimppdb-utils.c | 1 +
app/pdb/gimppdb.c | 3 ++-
app/pdb/gimppdbcontext.c | 1 +
app/pdb/gimpprocedure.c | 1 +
app/plug-in/Makefile.am | 2 +-
app/plug-in/gimpenvirontable.c | 2 +-
app/plug-in/gimpinterpreterdb.c | 2 +-
app/plug-in/gimpplugin-cleanup.c | 1 +
app/plug-in/gimpplugin-context.c | 1 +
app/plug-in/gimpplugin-message.c | 1 +
app/plug-in/gimpplugin-progress.c | 2 +-
app/plug-in/gimpplugin.c | 1 +
app/plug-in/gimpplugindef.c | 1 +
app/plug-in/gimppluginmanager-call.c | 1 +
app/plug-in/gimppluginmanager-file.c | 2 +-
app/plug-in/gimppluginmanager-history.c | 2 +-
app/plug-in/gimppluginmanager-locale-domain.c | 2 +-
app/plug-in/gimppluginmanager-query.c | 2 +-
app/plug-in/gimppluginmanager-restore.c | 1 +
app/plug-in/gimppluginmanager.c | 1 +
app/plug-in/gimppluginprocedure.h | 2 --
app/plug-in/gimppluginprocframe.c | 1 +
app/plug-in/gimptemporaryprocedure.c | 1 +
app/plug-in/plug-in-enums.c | 2 +-
app/plug-in/plug-in-icc-profile.c | 1 +
app/plug-in/plug-in-menu-path.c | 2 +-
app/plug-in/plug-in-rc.c | 2 +-
app/signals.c | 2 +-
app/text/Makefile.am | 2 +-
app/text/gimp-fonts.c | 2 +-
app/text/gimpfont.c | 1 +
app/text/gimpfontlist.c | 3 ++-
app/text/gimptext-vectors.c | 4 ++--
app/text/gimptext-xlfd.c | 2 +-
app/text/gimptextlayer-transform.c | 1 +
app/text/gimptextlayer-xcf.c | 1 +
app/text/gimptextundo.c | 1 +
app/text/text-enums.c | 2 +-
app/tools/Makefile.am | 2 +-
app/tools/tools-enums.c | 2 +-
app/unique.c | 2 +-
app/units.c | 2 +-
app/vectors/gimpvectors-compat.c | 1 +
app/vectors/gimpvectors-export.c | 3 ++-
app/vectors/gimpvectors-import.c | 1 +
app/vectors/gimpvectors-preview.c | 1 +
app/vectors/gimpvectors-warp.c | 1 +
app/vectors/gimpvectorsmodundo.c | 1 +
app/vectors/gimpvectorspropundo.c | 1 +
app/vectors/gimpvectorsundo.c | 1 +
app/xcf/xcf.c | 3 ++-
libgimp/Makefile.am | 2 +-
libgimp/gimpprogress.c | 2 +-
libgimp/gimptile.c | 2 +-
libgimp/gimpunitcache.c | 2 +-
libgimpbase/gimpbase-private.c | 2 +-
libgimpcolor/gimpcairo.c | 1 +
libgimpconfig/Makefile.am | 2 +-
libgimpconfig/gimpcolorconfig-enums.c | 2 +-
libgimpconfig/gimpconfig-iface.c | 2 +-
libgimpconfig/gimpconfig-path.c | 2 +-
libgimpconfig/gimpconfig-utils.c | 2 +-
libgimpconfig/gimpconfigwriter.c | 2 +-
libgimpmodule/gimpmodule.c | 2 +-
libgimpmodule/gimpmoduledb.c | 2 +-
libgimpwidgets/Makefile.am | 2 +-
libgimpwidgets/gimpwidgetsenums.c | 2 +-
tools/gimptool.c | 2 +-
258 files changed, 273 insertions(+), 94 deletions(-)
---
diff --git a/app/app.c b/app/app.c
index b75d590..5be270e 100644
--- a/app/app.c
+++ b/app/app.c
@@ -30,6 +30,7 @@
#include <unistd.h>
#endif
+#include <gio/gio.h>
#include <gegl.h>
#ifdef G_OS_WIN32
diff --git a/app/batch.c b/app/batch.c
index f536468..22a5cfb 100644
--- a/app/batch.c
+++ b/app/batch.c
@@ -20,6 +20,7 @@
#include <string.h>
#include <stdlib.h>
+#include <gio/gio.h>
#include <gegl.h>
#include "libgimpbase/gimpbase.h"
diff --git a/app/config/Makefile.am b/app/config/Makefile.am
index a16887a..cc3fe41 100644
--- a/app/config/Makefile.am
+++ b/app/config/Makefile.am
@@ -123,7 +123,7 @@ CLEANFILES += $(gen_sources)
config-enums.c: $(srcdir)/config-enums.h $(GIMP_MKENUMS)
$(GIMP_MKENUMS) \
- --fhead "#include \"config.h\"\n#include <glib-object.h>\n#include
\"libgimpbase/gimpbase.h\"\n#include \"config-enums.h\"\n#include\"gimp-intl.h\"" \
+ --fhead "#include \"config.h\"\n#include <gio/gio.h>\n#include
\"libgimpbase/gimpbase.h\"\n#include \"config-enums.h\"\n#include\"gimp-intl.h\"" \
--fprod "\n/* enumerations from \"@filename \" */" \
--vhead "GType\n enum_name@_get_type (void)\n{\n static const G Type@Value values[] =\n {" \
--vprod " { @VALUENAME@, \"@VALUENAME \", \"@valuenick \" }," \
diff --git a/app/config/config-enums.c b/app/config/config-enums.c
index 71ad6cd..ec3df01 100644
--- a/app/config/config-enums.c
+++ b/app/config/config-enums.c
@@ -2,7 +2,7 @@
/* Generated data (by gimp-mkenums) */
#include "config.h"
-#include <glib-object.h>
+#include <gio/gio.h>
#include "libgimpbase/gimpbase.h"
#include "config-enums.h"
#include"gimp-intl.h"
diff --git a/app/config/gimpconfig-file.c b/app/config/gimpconfig-file.c
index ff995ef..c6c3fe7 100644
--- a/app/config/gimpconfig-file.c
+++ b/app/config/gimpconfig-file.c
@@ -23,7 +23,7 @@
#include <errno.h>
#include <sys/types.h>
-#include <glib-object.h>
+#include <gio/gio.h>
#include <glib/gstdio.h>
#include "libgimpbase/gimpbase.h"
diff --git a/app/config/gimpconfig-utils.c b/app/config/gimpconfig-utils.c
index ace297c..5d69641 100644
--- a/app/config/gimpconfig-utils.c
+++ b/app/config/gimpconfig-utils.c
@@ -20,7 +20,7 @@
#include "config.h"
-#include <glib-object.h>
+#include <gio/gio.h>
#include "libgimpbase/gimpbase.h"
#include "libgimpconfig/gimpconfig.h"
diff --git a/app/config/gimpgeglconfig.c b/app/config/gimpgeglconfig.c
index 5d4a5c5..d5381ea 100644
--- a/app/config/gimpgeglconfig.c
+++ b/app/config/gimpgeglconfig.c
@@ -24,6 +24,7 @@
#include <unistd.h>
#endif
+#include <gio/gio.h>
#include <gegl.h>
#include "libgimpbase/gimpbase.h"
diff --git a/app/config/gimpguiconfig.c b/app/config/gimpguiconfig.c
index 2d9207b..ff5dff7 100644
--- a/app/config/gimpguiconfig.c
+++ b/app/config/gimpguiconfig.c
@@ -20,7 +20,7 @@
#include "config.h"
-#include <glib-object.h>
+#include <gio/gio.h>
#include "libgimpbase/gimpbase.h"
#include "libgimpconfig/gimpconfig.h"
diff --git a/app/config/gimppluginconfig.c b/app/config/gimppluginconfig.c
index dcb12ac..1d389f1 100644
--- a/app/config/gimppluginconfig.c
+++ b/app/config/gimppluginconfig.c
@@ -20,7 +20,7 @@
#include "config.h"
-#include <glib-object.h>
+#include <gio/gio.h>
#include "libgimpbase/gimpbase.h"
#include "libgimpconfig/gimpconfig.h"
diff --git a/app/config/gimprc-serialize.c b/app/config/gimprc-serialize.c
index 52bf900..d35ca36 100644
--- a/app/config/gimprc-serialize.c
+++ b/app/config/gimprc-serialize.c
@@ -20,7 +20,7 @@
#include "config.h"
-#include <glib-object.h>
+#include <gio/gio.h>
#include "libgimpbase/gimpbase.h"
#include "libgimpconfig/gimpconfig.h"
diff --git a/app/config/gimprc-unknown.c b/app/config/gimprc-unknown.c
index d31cdc8..7abb17d 100644
--- a/app/config/gimprc-unknown.c
+++ b/app/config/gimprc-unknown.c
@@ -22,7 +22,7 @@
#include <string.h>
-#include <glib-object.h>
+#include <gio/gio.h>
#include "libgimpbase/gimpbase.h"
#include "libgimpconfig/gimpconfig.h"
diff --git a/app/config/gimprc.c b/app/config/gimprc.c
index 1294635..3d62539 100644
--- a/app/config/gimprc.c
+++ b/app/config/gimprc.c
@@ -22,7 +22,7 @@
#include <string.h>
-#include <glib-object.h>
+#include <gio/gio.h>
#include "libgimpbase/gimpbase.h"
#include "libgimpconfig/gimpconfig.h"
diff --git a/app/core/Makefile.am b/app/core/Makefile.am
index df5435b..764a798 100644
--- a/app/core/Makefile.am
+++ b/app/core/Makefile.am
@@ -403,7 +403,7 @@ gimpmarshal.c: gimpmarshal.h
core-enums.c: $(srcdir)/core-enums.h $(GIMP_MKENUMS)
$(GIMP_MKENUMS) \
- --fhead "#include \"config.h\"\n#include <glib-object.h>\n#include
\"libgimpbase/gimpbase.h\"\n#include \"core-enums.h\"\n#include \"gimp-intl.h\"" \
+ --fhead "#include \"config.h\"\n#include <gio/gio.h>\n#include
\"libgimpbase/gimpbase.h\"\n#include \"core-enums.h\"\n#include \"gimp-intl.h\"" \
--fprod "\n/* enumerations from \"@filename \" */" \
--vhead "GType\n enum_name@_get_type (void)\n{\n static const G Type@Value values[] =\n {" \
--vprod " { @VALUENAME@, \"@VALUENAME \", \"@valuenick \" }," \
diff --git a/app/core/core-enums.c b/app/core/core-enums.c
index 491ec16..4dadaa5 100644
--- a/app/core/core-enums.c
+++ b/app/core/core-enums.c
@@ -2,7 +2,7 @@
/* Generated data (by gimp-mkenums) */
#include "config.h"
-#include <glib-object.h>
+#include <gio/gio.h>
#include "libgimpbase/gimpbase.h"
#include "core-enums.h"
#include "gimp-intl.h"
diff --git a/app/core/gimp-contexts.c b/app/core/gimp-contexts.c
index 36e1405..c2d5a90 100644
--- a/app/core/gimp-contexts.c
+++ b/app/core/gimp-contexts.c
@@ -25,8 +25,9 @@
#include <unistd.h>
#endif
-#include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <glib/gstdio.h>
+#include <gegl.h>
#include "libgimpbase/gimpbase.h"
#include "libgimpconfig/gimpconfig.h"
diff --git a/app/core/gimp-gradients.c b/app/core/gimp-gradients.c
index 620012b..77cd039 100644
--- a/app/core/gimp-gradients.c
+++ b/app/core/gimp-gradients.c
@@ -20,6 +20,7 @@
#include "config.h"
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "core-types.h"
diff --git a/app/core/gimp-gui.c b/app/core/gimp-gui.c
index 6a0a046..eb1e5b1 100644
--- a/app/core/gimp-gui.c
+++ b/app/core/gimp-gui.c
@@ -17,6 +17,7 @@
#include "config.h"
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "libgimpbase/gimpbase.h"
diff --git a/app/core/gimp-modules.c b/app/core/gimp-modules.c
index efb01ce..57de9c3 100644
--- a/app/core/gimp-modules.c
+++ b/app/core/gimp-modules.c
@@ -20,7 +20,7 @@
#include "config.h"
-#include <glib-object.h>
+#include <gio/gio.h>
#include "libgimpbase/gimpbase.h"
#include "libgimpmodule/gimpmodule.h"
diff --git a/app/core/gimp-parasites.c b/app/core/gimp-parasites.c
index 88054ac..ab1f4cc 100644
--- a/app/core/gimp-parasites.c
+++ b/app/core/gimp-parasites.c
@@ -16,7 +16,7 @@
#include "config.h"
-#include <glib-object.h>
+#include <gio/gio.h>
#include "libgimpbase/gimpbase.h"
#include "libgimpconfig/gimpconfig.h"
diff --git a/app/core/gimp-tags.c b/app/core/gimp-tags.c
index e644716..ef485b7 100644
--- a/app/core/gimp-tags.c
+++ b/app/core/gimp-tags.c
@@ -23,6 +23,7 @@
#include <stdlib.h>
#include <string.h>
+#include <gio/gio.h>
#include <gegl.h>
#include "libgimpbase/gimpbase.h"
diff --git a/app/core/gimp-templates.c b/app/core/gimp-templates.c
index 2c99630..bb44ec6 100644
--- a/app/core/gimp-templates.c
+++ b/app/core/gimp-templates.c
@@ -19,6 +19,7 @@
#include <string.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "libgimpbase/gimpbase.h"
diff --git a/app/core/gimp-units.c b/app/core/gimp-units.c
index 599dbbd..d1a2eac 100644
--- a/app/core/gimp-units.c
+++ b/app/core/gimp-units.c
@@ -24,7 +24,7 @@
#include "config.h"
-#include <glib-object.h>
+#include <gio/gio.h>
#include "libgimpbase/gimpbase.h"
#include "libgimpconfig/gimpconfig.h"
diff --git a/app/core/gimp-user-install.c b/app/core/gimp-user-install.c
index 2bca84b..3b4280c 100644
--- a/app/core/gimp-user-install.c
+++ b/app/core/gimp-user-install.c
@@ -34,10 +34,9 @@
#include <unistd.h>
#endif
+#include <gio/gio.h>
#include <glib/gstdio.h>
-#include <glib-object.h>
-
#ifdef G_OS_WIN32
#include <libgimpbase/gimpwin32-io.h>
#endif
diff --git a/app/core/gimp.c b/app/core/gimp.c
index 33c0652..fc1df27 100644
--- a/app/core/gimp.c
+++ b/app/core/gimp.c
@@ -19,6 +19,7 @@
#include <string.h> /* strlen */
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "libgimpbase/gimpbase.h"
diff --git a/app/core/gimpbrush-boundary.c b/app/core/gimpbrush-boundary.c
index 3d2e863..c1573a5 100644
--- a/app/core/gimpbrush-boundary.c
+++ b/app/core/gimpbrush-boundary.c
@@ -18,6 +18,7 @@
#include "config.h"
#include <cairo.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "core-types.h"
diff --git a/app/core/gimpbrush-load.c b/app/core/gimpbrush-load.c
index f4dfdbc..b752b0e 100644
--- a/app/core/gimpbrush-load.c
+++ b/app/core/gimpbrush-load.c
@@ -34,8 +34,9 @@
#define _O_BINARY 0
#endif
-#include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <glib/gstdio.h>
+#include <gegl.h>
#include "libgimpbase/gimpbase.h"
diff --git a/app/core/gimpbrush-transform.c b/app/core/gimpbrush-transform.c
index 97edd20..f74754b 100644
--- a/app/core/gimpbrush-transform.c
+++ b/app/core/gimpbrush-transform.c
@@ -19,6 +19,7 @@
#include "config.h"
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "libgimpmath/gimpmath.h"
diff --git a/app/core/gimpbrush.c b/app/core/gimpbrush.c
index 5de80ca..238ee3e 100644
--- a/app/core/gimpbrush.c
+++ b/app/core/gimpbrush.c
@@ -18,6 +18,7 @@
#include "config.h"
#include <cairo.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "libgimpbase/gimpbase.h"
diff --git a/app/core/gimpbrushclipboard.c b/app/core/gimpbrushclipboard.c
index 7396269..3e800cc 100644
--- a/app/core/gimpbrushclipboard.c
+++ b/app/core/gimpbrushclipboard.c
@@ -20,6 +20,7 @@
#include "config.h"
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "core-types.h"
diff --git a/app/core/gimpbrushgenerated-load.c b/app/core/gimpbrushgenerated-load.c
index 12125f0..8cc4a6b 100644
--- a/app/core/gimpbrushgenerated-load.c
+++ b/app/core/gimpbrushgenerated-load.c
@@ -27,8 +27,9 @@
#include <unistd.h>
#endif
-#include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <glib/gstdio.h>
+#include <gegl.h>
#include "libgimpbase/gimpbase.h"
diff --git a/app/core/gimpbrushgenerated-save.c b/app/core/gimpbrushgenerated-save.c
index 90f1f69..89ae977 100644
--- a/app/core/gimpbrushgenerated-save.c
+++ b/app/core/gimpbrushgenerated-save.c
@@ -27,8 +27,9 @@
#include <unistd.h>
#endif
-#include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <glib/gstdio.h>
+#include <gegl.h>
#include "libgimpbase/gimpbase.h"
diff --git a/app/core/gimpbrushgenerated.c b/app/core/gimpbrushgenerated.c
index 3fbfa9d..20cc36a 100644
--- a/app/core/gimpbrushgenerated.c
+++ b/app/core/gimpbrushgenerated.c
@@ -19,6 +19,7 @@
#include "config.h"
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "libgimpbase/gimpbase.h"
diff --git a/app/core/gimpbrushpipe-load.c b/app/core/gimpbrushpipe-load.c
index 3c0f42c..85fa54e 100644
--- a/app/core/gimpbrushpipe-load.c
+++ b/app/core/gimpbrushpipe-load.c
@@ -33,8 +33,9 @@
#define _O_BINARY 0
#endif
-#include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <glib/gstdio.h>
+#include <gegl.h>
#ifdef G_OS_WIN32
#include <io.h>
diff --git a/app/core/gimpbrushpipe.c b/app/core/gimpbrushpipe.c
index 2f80bf3..cb486be 100644
--- a/app/core/gimpbrushpipe.c
+++ b/app/core/gimpbrushpipe.c
@@ -18,6 +18,7 @@
#include "config.h"
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "libgimpmath/gimpmath.h"
diff --git a/app/core/gimpchannel-combine.c b/app/core/gimpchannel-combine.c
index 22bc93a..2c7e629 100644
--- a/app/core/gimpchannel-combine.c
+++ b/app/core/gimpchannel-combine.c
@@ -19,6 +19,7 @@
#include <string.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "libgimpbase/gimpbase.h"
diff --git a/app/core/gimpchannel-select.c b/app/core/gimpchannel-select.c
index 5dd9366..765aa52 100644
--- a/app/core/gimpchannel-select.c
+++ b/app/core/gimpchannel-select.c
@@ -20,6 +20,7 @@
#include <string.h>
#include <cairo.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "libgimpbase/gimpbase.h"
diff --git a/app/core/gimpchannelpropundo.c b/app/core/gimpchannelpropundo.c
index 0fd9469..7f8eaef 100644
--- a/app/core/gimpchannelpropundo.c
+++ b/app/core/gimpchannelpropundo.c
@@ -17,6 +17,7 @@
#include "config.h"
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "libgimpbase/gimpbase.h"
diff --git a/app/core/gimpchannelundo.c b/app/core/gimpchannelundo.c
index 9c5823b..b9fc165 100644
--- a/app/core/gimpchannelundo.c
+++ b/app/core/gimpchannelundo.c
@@ -17,6 +17,7 @@
#include "config.h"
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "core-types.h"
diff --git a/app/core/gimpcurve-load.c b/app/core/gimpcurve-load.c
index 4c2f32a..3e157d3 100644
--- a/app/core/gimpcurve-load.c
+++ b/app/core/gimpcurve-load.c
@@ -19,8 +19,9 @@
#include <errno.h>
-#include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <glib/gstdio.h>
+#include <gegl.h>
#include "libgimpbase/gimpbase.h"
diff --git a/app/core/gimpcurve-map.c b/app/core/gimpcurve-map.c
index b7cfce3..74af0a8 100644
--- a/app/core/gimpcurve-map.c
+++ b/app/core/gimpcurve-map.c
@@ -19,6 +19,7 @@
#include <string.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "libgimpmath/gimpmath.h"
diff --git a/app/core/gimpcurve-save.c b/app/core/gimpcurve-save.c
index 0390f37..37b262a 100644
--- a/app/core/gimpcurve-save.c
+++ b/app/core/gimpcurve-save.c
@@ -19,8 +19,9 @@
#include <errno.h>
-#include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <glib/gstdio.h>
+#include <gegl.h>
#include "libgimpbase/gimpbase.h"
diff --git a/app/core/gimpcurve.c b/app/core/gimpcurve.c
index 692ff50..733cf8b 100644
--- a/app/core/gimpcurve.c
+++ b/app/core/gimpcurve.c
@@ -20,6 +20,7 @@
#include <stdlib.h>
#include <string.h> /* memcmp */
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "libgimpbase/gimpbase.h"
diff --git a/app/core/gimpdashpattern.c b/app/core/gimpdashpattern.c
index 736620f..0d4d2f2 100644
--- a/app/core/gimpdashpattern.c
+++ b/app/core/gimpdashpattern.c
@@ -21,7 +21,7 @@
#include "config.h"
-#include <glib-object.h>
+#include <gio/gio.h>
#include "libgimpbase/gimpbase.h"
diff --git a/app/core/gimpdata.c b/app/core/gimpdata.c
index b43430c..ec267d1 100644
--- a/app/core/gimpdata.c
+++ b/app/core/gimpdata.c
@@ -27,6 +27,7 @@
#include <unistd.h>
#endif
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include <glib/gstdio.h>
diff --git a/app/core/gimpdatafactory.c b/app/core/gimpdatafactory.c
index c5ed93d..84ef5b1 100644
--- a/app/core/gimpdatafactory.c
+++ b/app/core/gimpdatafactory.c
@@ -23,6 +23,7 @@
#include <stdlib.h>
#include <string.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "libgimpbase/gimpbase.h"
diff --git a/app/core/gimpdocumentlist.c b/app/core/gimpdocumentlist.c
index c1da5e0..a794304 100644
--- a/app/core/gimpdocumentlist.c
+++ b/app/core/gimpdocumentlist.c
@@ -17,6 +17,7 @@
#include "config.h"
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "libgimpconfig/gimpconfig.h"
diff --git a/app/core/gimpdrawable-combine.c b/app/core/gimpdrawable-combine.c
index 1e7b1e9..6f37c2d 100644
--- a/app/core/gimpdrawable-combine.c
+++ b/app/core/gimpdrawable-combine.c
@@ -17,6 +17,7 @@
#include "config.h"
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "libgimpbase/gimpbase.h"
diff --git a/app/core/gimpdrawable-equalize.c b/app/core/gimpdrawable-equalize.c
index 0998358..01720a9 100644
--- a/app/core/gimpdrawable-equalize.c
+++ b/app/core/gimpdrawable-equalize.c
@@ -17,6 +17,7 @@
#include "config.h"
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "core-types.h"
diff --git a/app/core/gimpdrawable-filter.c b/app/core/gimpdrawable-filter.c
index 92b4cc0..eacbdc0 100644
--- a/app/core/gimpdrawable-filter.c
+++ b/app/core/gimpdrawable-filter.c
@@ -19,6 +19,7 @@
#include "config.h"
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "core-types.h"
diff --git a/app/core/gimpdrawable-histogram.c b/app/core/gimpdrawable-histogram.c
index a65ceae..6bae432 100644
--- a/app/core/gimpdrawable-histogram.c
+++ b/app/core/gimpdrawable-histogram.c
@@ -19,6 +19,7 @@
#include "config.h"
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "core-types.h"
diff --git a/app/core/gimpdrawable-levels.c b/app/core/gimpdrawable-levels.c
index 352382f..03727f6 100644
--- a/app/core/gimpdrawable-levels.c
+++ b/app/core/gimpdrawable-levels.c
@@ -17,6 +17,7 @@
#include "config.h"
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "core-types.h"
diff --git a/app/core/gimpdrawable-operation.c b/app/core/gimpdrawable-operation.c
index e3c177f..3114d57 100644
--- a/app/core/gimpdrawable-operation.c
+++ b/app/core/gimpdrawable-operation.c
@@ -22,6 +22,7 @@
#include "config.h"
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "core-types.h"
diff --git a/app/core/gimpdrawable-preview.c b/app/core/gimpdrawable-preview.c
index 305e260..2e62142 100644
--- a/app/core/gimpdrawable-preview.c
+++ b/app/core/gimpdrawable-preview.c
@@ -19,6 +19,7 @@
#include <string.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "libgimpmath/gimpmath.h"
diff --git a/app/core/gimpdrawable-shadow.c b/app/core/gimpdrawable-shadow.c
index 1528cb7..08ccab5 100644
--- a/app/core/gimpdrawable-shadow.c
+++ b/app/core/gimpdrawable-shadow.c
@@ -17,6 +17,7 @@
#include "config.h"
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "core-types.h"
diff --git a/app/core/gimpdrawablemodundo.c b/app/core/gimpdrawablemodundo.c
index cf5171a..1c8d951 100644
--- a/app/core/gimpdrawablemodundo.c
+++ b/app/core/gimpdrawablemodundo.c
@@ -17,6 +17,7 @@
#include "config.h"
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "core-types.h"
diff --git a/app/core/gimpdrawablestack.c b/app/core/gimpdrawablestack.c
index 7142cbd..521f99c 100644
--- a/app/core/gimpdrawablestack.c
+++ b/app/core/gimpdrawablestack.c
@@ -20,6 +20,7 @@
#include "config.h"
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "core-types.h"
diff --git a/app/core/gimpdrawableundo.c b/app/core/gimpdrawableundo.c
index 8f20873..b415a42 100644
--- a/app/core/gimpdrawableundo.c
+++ b/app/core/gimpdrawableundo.c
@@ -17,6 +17,7 @@
#include "config.h"
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "libgimpbase/gimpbase.h"
diff --git a/app/core/gimpdynamics-load.c b/app/core/gimpdynamics-load.c
index 4639ad9..7c66d6d 100644
--- a/app/core/gimpdynamics-load.c
+++ b/app/core/gimpdynamics-load.c
@@ -17,6 +17,7 @@
#include "config.h"
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "libgimpconfig/gimpconfig.h"
diff --git a/app/core/gimpdynamics-save.c b/app/core/gimpdynamics-save.c
index c316bab..a44640e 100644
--- a/app/core/gimpdynamics-save.c
+++ b/app/core/gimpdynamics-save.c
@@ -17,6 +17,7 @@
#include "config.h"
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "libgimpconfig/gimpconfig.h"
diff --git a/app/core/gimpdynamics.c b/app/core/gimpdynamics.c
index d575413..5fa5a8b 100644
--- a/app/core/gimpdynamics.c
+++ b/app/core/gimpdynamics.c
@@ -17,6 +17,7 @@
#include "config.h"
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "libgimpmath/gimpmath.h"
diff --git a/app/core/gimpdynamicsoutput.c b/app/core/gimpdynamicsoutput.c
index 76845d1..7e8c2ad 100644
--- a/app/core/gimpdynamicsoutput.c
+++ b/app/core/gimpdynamicsoutput.c
@@ -17,6 +17,7 @@
#include "config.h"
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "libgimpmath/gimpmath.h"
diff --git a/app/core/gimpfilloptions.c b/app/core/gimpfilloptions.c
index 6045d34..0d7a38a 100644
--- a/app/core/gimpfilloptions.c
+++ b/app/core/gimpfilloptions.c
@@ -20,6 +20,7 @@
#include "config.h"
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "libgimpbase/gimpbase.h"
diff --git a/app/core/gimpfilter.c b/app/core/gimpfilter.c
index 901f8db..6b83385 100644
--- a/app/core/gimpfilter.c
+++ b/app/core/gimpfilter.c
@@ -19,6 +19,7 @@
#include "config.h"
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "core-types.h"
diff --git a/app/core/gimpfilterstack.c b/app/core/gimpfilterstack.c
index 663b1eb..04335dc 100644
--- a/app/core/gimpfilterstack.c
+++ b/app/core/gimpfilterstack.c
@@ -20,6 +20,7 @@
#include "config.h"
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "core-types.h"
diff --git a/app/core/gimpfloatingselundo.c b/app/core/gimpfloatingselundo.c
index 72ceecb..d39ae00 100644
--- a/app/core/gimpfloatingselundo.c
+++ b/app/core/gimpfloatingselundo.c
@@ -17,6 +17,7 @@
#include "config.h"
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "core-types.h"
diff --git a/app/core/gimpgradient-save.c b/app/core/gimpgradient-save.c
index 5d07651..a7f496b 100644
--- a/app/core/gimpgradient-save.c
+++ b/app/core/gimpgradient-save.c
@@ -20,8 +20,9 @@
#include <string.h>
#include <errno.h>
-#include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <glib/gstdio.h>
+#include <gegl.h>
#include "libgimpbase/gimpbase.h"
diff --git a/app/core/gimpgrouplayer.c b/app/core/gimpgrouplayer.c
index d807b0f..d4a562b 100644
--- a/app/core/gimpgrouplayer.c
+++ b/app/core/gimpgrouplayer.c
@@ -22,6 +22,7 @@
#include <string.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "libgimpbase/gimpbase.h"
diff --git a/app/core/gimpgrouplayerundo.c b/app/core/gimpgrouplayerundo.c
index b710a45..1df9dae 100644
--- a/app/core/gimpgrouplayerundo.c
+++ b/app/core/gimpgrouplayerundo.c
@@ -17,6 +17,7 @@
#include "config.h"
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "core-types.h"
diff --git a/app/core/gimpguide.c b/app/core/gimpguide.c
index 90cee37..e6090d0 100644
--- a/app/core/gimpguide.c
+++ b/app/core/gimpguide.c
@@ -20,7 +20,7 @@
#include "config.h"
-#include <glib-object.h>
+#include <gio/gio.h>
#include "libgimpbase/gimpbase.h"
#include "libgimpconfig/gimpconfig.h"
diff --git a/app/core/gimpguideundo.c b/app/core/gimpguideundo.c
index d5e3629..06099cb 100644
--- a/app/core/gimpguideundo.c
+++ b/app/core/gimpguideundo.c
@@ -17,6 +17,7 @@
#include "config.h"
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "core-types.h"
diff --git a/app/core/gimpimage-arrange.c b/app/core/gimpimage-arrange.c
index fd51d25..523585e 100644
--- a/app/core/gimpimage-arrange.c
+++ b/app/core/gimpimage-arrange.c
@@ -17,6 +17,7 @@
#include "config.h"
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "libgimpmath/gimpmath.h"
diff --git a/app/core/gimpimage-convert-precision.c b/app/core/gimpimage-convert-precision.c
index c7defc9..c8fc19a 100644
--- a/app/core/gimpimage-convert-precision.c
+++ b/app/core/gimpimage-convert-precision.c
@@ -20,6 +20,7 @@
#include "config.h"
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "core-types.h"
diff --git a/app/core/gimpimage-convert-type.c b/app/core/gimpimage-convert-type.c
index 38de0cd..683210e 100644
--- a/app/core/gimpimage-convert-type.c
+++ b/app/core/gimpimage-convert-type.c
@@ -133,8 +133,8 @@
#include <string.h>
#include <cairo.h>
-#include <gegl.h>
#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
#include "libgimpcolor/gimpcolor.h"
#include "libgimpmath/gimpmath.h"
diff --git a/app/core/gimpimage-crop.c b/app/core/gimpimage-crop.c
index 6e32243..4c14386 100644
--- a/app/core/gimpimage-crop.c
+++ b/app/core/gimpimage-crop.c
@@ -17,6 +17,7 @@
#include "config.h"
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "core-types.h"
diff --git a/app/core/gimpimage-duplicate.c b/app/core/gimpimage-duplicate.c
index df7078e..9ea405f 100644
--- a/app/core/gimpimage-duplicate.c
+++ b/app/core/gimpimage-duplicate.c
@@ -17,6 +17,7 @@
#include "config.h"
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "core-types.h"
diff --git a/app/core/gimpimage-flip.c b/app/core/gimpimage-flip.c
index 2b7eb4d..0eefa8d 100644
--- a/app/core/gimpimage-flip.c
+++ b/app/core/gimpimage-flip.c
@@ -17,6 +17,7 @@
#include "config.h"
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "core-types.h"
diff --git a/app/core/gimpimage-grid.c b/app/core/gimpimage-grid.c
index 84236c8..8d394cf 100644
--- a/app/core/gimpimage-grid.c
+++ b/app/core/gimpimage-grid.c
@@ -20,6 +20,7 @@
#include "config.h"
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "libgimpconfig/gimpconfig.h"
diff --git a/app/core/gimpimage-guides.c b/app/core/gimpimage-guides.c
index 2a4ed74..e882466 100644
--- a/app/core/gimpimage-guides.c
+++ b/app/core/gimpimage-guides.c
@@ -17,6 +17,7 @@
#include "config.h"
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "core-types.h"
diff --git a/app/core/gimpimage-item-list.c b/app/core/gimpimage-item-list.c
index d9c8985..f322874 100644
--- a/app/core/gimpimage-item-list.c
+++ b/app/core/gimpimage-item-list.c
@@ -17,6 +17,7 @@
#include "config.h"
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "core-types.h"
diff --git a/app/core/gimpimage-new.c b/app/core/gimpimage-new.c
index ca88952..021b181 100644
--- a/app/core/gimpimage-new.c
+++ b/app/core/gimpimage-new.c
@@ -17,6 +17,7 @@
#include "config.h"
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "libgimpbase/gimpbase.h"
diff --git a/app/core/gimpimage-pick-color.c b/app/core/gimpimage-pick-color.c
index 073e0a3..78943f1 100644
--- a/app/core/gimpimage-pick-color.c
+++ b/app/core/gimpimage-pick-color.c
@@ -17,6 +17,7 @@
#include "config.h"
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "core-types.h"
diff --git a/app/core/gimpimage-pick-layer.c b/app/core/gimpimage-pick-layer.c
index 05bccbb..74c9a20 100644
--- a/app/core/gimpimage-pick-layer.c
+++ b/app/core/gimpimage-pick-layer.c
@@ -17,6 +17,7 @@
#include "config.h"
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "core-types.h"
diff --git a/app/core/gimpimage-preview.c b/app/core/gimpimage-preview.c
index 7b61e03..eec4926 100644
--- a/app/core/gimpimage-preview.c
+++ b/app/core/gimpimage-preview.c
@@ -17,6 +17,7 @@
#include "config.h"
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "core-types.h"
diff --git a/app/core/gimpimage-resize.c b/app/core/gimpimage-resize.c
index bb3581e..eb980f0 100644
--- a/app/core/gimpimage-resize.c
+++ b/app/core/gimpimage-resize.c
@@ -17,6 +17,7 @@
#include "config.h"
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "libgimpbase/gimpbase.h"
diff --git a/app/core/gimpimage-rotate.c b/app/core/gimpimage-rotate.c
index adbe95a..ba75fb2 100644
--- a/app/core/gimpimage-rotate.c
+++ b/app/core/gimpimage-rotate.c
@@ -17,6 +17,7 @@
#include "config.h"
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "core-types.h"
diff --git a/app/core/gimpimage-sample-points.c b/app/core/gimpimage-sample-points.c
index 3fef887..37492ff 100644
--- a/app/core/gimpimage-sample-points.c
+++ b/app/core/gimpimage-sample-points.c
@@ -17,6 +17,7 @@
#include "config.h"
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "libgimpmath/gimpmath.h"
diff --git a/app/core/gimpimage-scale.c b/app/core/gimpimage-scale.c
index 1a726cc..096de93 100644
--- a/app/core/gimpimage-scale.c
+++ b/app/core/gimpimage-scale.c
@@ -17,6 +17,7 @@
#include "config.h"
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "core-types.h"
diff --git a/app/core/gimpimage-snap.c b/app/core/gimpimage-snap.c
index 8c9deb9..15ae74a 100644
--- a/app/core/gimpimage-snap.c
+++ b/app/core/gimpimage-snap.c
@@ -17,6 +17,7 @@
#include "config.h"
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "libgimpmath/gimpmath.h"
diff --git a/app/core/gimpimage-undo-push.c b/app/core/gimpimage-undo-push.c
index 2440172..31970d2 100644
--- a/app/core/gimpimage-undo-push.c
+++ b/app/core/gimpimage-undo-push.c
@@ -17,6 +17,7 @@
#include "config.h"
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "libgimpbase/gimpbase.h"
diff --git a/app/core/gimpimage-undo.c b/app/core/gimpimage-undo.c
index 1b24561..79ab5e1 100644
--- a/app/core/gimpimage-undo.c
+++ b/app/core/gimpimage-undo.c
@@ -17,6 +17,7 @@
#include "config.h"
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "core-types.h"
diff --git a/app/core/gimpimage.c b/app/core/gimpimage.c
index 544cf4e..191239c 100644
--- a/app/core/gimpimage.c
+++ b/app/core/gimpimage.c
@@ -21,8 +21,8 @@
#include <time.h>
#include <cairo.h>
-#include <gegl.h>
#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
#include "libgimpcolor/gimpcolor.h"
#include "libgimpmath/gimpmath.h"
diff --git a/app/core/gimpimagemap.c b/app/core/gimpimagemap.c
index 8de42eb..ce35fc2 100644
--- a/app/core/gimpimagemap.c
+++ b/app/core/gimpimagemap.c
@@ -33,6 +33,7 @@
#include "config.h"
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "libgimpbase/gimpbase.h"
diff --git a/app/core/gimpitem-exclusive.c b/app/core/gimpitem-exclusive.c
index fa2b56c..1287005 100644
--- a/app/core/gimpitem-exclusive.c
+++ b/app/core/gimpitem-exclusive.c
@@ -20,6 +20,7 @@
#include "config.h"
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "core-types.h"
diff --git a/app/core/gimpitem-linked.c b/app/core/gimpitem-linked.c
index 4a2548f..e3db830 100644
--- a/app/core/gimpitem-linked.c
+++ b/app/core/gimpitem-linked.c
@@ -17,6 +17,7 @@
#include "config.h"
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "core-types.h"
diff --git a/app/core/gimpitem-preview.c b/app/core/gimpitem-preview.c
index 5b4f82f..cc2b48e 100644
--- a/app/core/gimpitem-preview.c
+++ b/app/core/gimpitem-preview.c
@@ -19,6 +19,7 @@
#include <string.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "libgimpmath/gimpmath.h"
diff --git a/app/core/gimpitem.c b/app/core/gimpitem.c
index 6fc2da6..7d50143 100644
--- a/app/core/gimpitem.c
+++ b/app/core/gimpitem.c
@@ -20,6 +20,7 @@
#include <stdlib.h>
#include <string.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "libgimpbase/gimpbase.h"
diff --git a/app/core/gimpitempropundo.c b/app/core/gimpitempropundo.c
index 203e08c..104bf0d 100644
--- a/app/core/gimpitempropundo.c
+++ b/app/core/gimpitempropundo.c
@@ -17,6 +17,7 @@
#include "config.h"
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "libgimpbase/gimpbase.h"
diff --git a/app/core/gimpitemstack.c b/app/core/gimpitemstack.c
index 021b642..1de9c1e 100644
--- a/app/core/gimpitemstack.c
+++ b/app/core/gimpitemstack.c
@@ -22,6 +22,7 @@
#include <string.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "core-types.h"
diff --git a/app/core/gimpitemtree.c b/app/core/gimpitemtree.c
index 17c5843..96739a8 100644
--- a/app/core/gimpitemtree.c
+++ b/app/core/gimpitemtree.c
@@ -23,6 +23,7 @@
#include <stdlib.h>
#include <string.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "core-types.h"
diff --git a/app/core/gimpitemundo.c b/app/core/gimpitemundo.c
index dfe84fd..34c9539 100644
--- a/app/core/gimpitemundo.c
+++ b/app/core/gimpitemundo.c
@@ -17,6 +17,7 @@
#include "config.h"
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "core-types.h"
diff --git a/app/core/gimplayer-floating-sel.c b/app/core/gimplayer-floating-sel.c
index 43de643..a73d1e0 100644
--- a/app/core/gimplayer-floating-sel.c
+++ b/app/core/gimplayer-floating-sel.c
@@ -17,6 +17,7 @@
#include "config.h"
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "libgimpbase/gimpbase.h"
diff --git a/app/core/gimplayermask.c b/app/core/gimplayermask.c
index 67e7114..786648b 100644
--- a/app/core/gimplayermask.c
+++ b/app/core/gimplayermask.c
@@ -20,6 +20,7 @@
#include <stdlib.h>
#include <string.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "libgimpmath/gimpmath.h"
diff --git a/app/core/gimplayermaskpropundo.c b/app/core/gimplayermaskpropundo.c
index 2f95371..0a9d685 100644
--- a/app/core/gimplayermaskpropundo.c
+++ b/app/core/gimplayermaskpropundo.c
@@ -17,6 +17,7 @@
#include "config.h"
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "core-types.h"
diff --git a/app/core/gimplayermaskundo.c b/app/core/gimplayermaskundo.c
index 2fd4ebb..1892f4c 100644
--- a/app/core/gimplayermaskundo.c
+++ b/app/core/gimplayermaskundo.c
@@ -17,6 +17,7 @@
#include "config.h"
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "core-types.h"
diff --git a/app/core/gimplayerpropundo.c b/app/core/gimplayerpropundo.c
index cb1cfab..3b4cd07 100644
--- a/app/core/gimplayerpropundo.c
+++ b/app/core/gimplayerpropundo.c
@@ -17,6 +17,7 @@
#include "config.h"
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "libgimpbase/gimpbase.h"
diff --git a/app/core/gimplayerundo.c b/app/core/gimplayerundo.c
index e997041..6ab6fd2 100644
--- a/app/core/gimplayerundo.c
+++ b/app/core/gimplayerundo.c
@@ -17,6 +17,7 @@
#include "config.h"
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "core-types.h"
diff --git a/app/core/gimpmaskundo.c b/app/core/gimpmaskundo.c
index 6c5d9af..4d4627b 100644
--- a/app/core/gimpmaskundo.c
+++ b/app/core/gimpmaskundo.c
@@ -17,6 +17,7 @@
#include "config.h"
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "core-types.h"
diff --git a/app/core/gimpobject.c b/app/core/gimpobject.c
index 7991015..7b7fd86 100644
--- a/app/core/gimpobject.c
+++ b/app/core/gimpobject.c
@@ -19,6 +19,7 @@
#include <string.h>
+#include <gio/gio.h>
#include <gegl.h>
#include "libgimpbase/gimpbase.h"
diff --git a/app/core/gimppaintinfo.c b/app/core/gimppaintinfo.c
index 1d81a1f..8bfa165 100644
--- a/app/core/gimppaintinfo.c
+++ b/app/core/gimppaintinfo.c
@@ -17,6 +17,7 @@
#include "config.h"
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "core-types.h"
diff --git a/app/core/gimpparamspecs-desc.c b/app/core/gimpparamspecs-desc.c
index b149be5..3134e09 100644
--- a/app/core/gimpparamspecs-desc.c
+++ b/app/core/gimpparamspecs-desc.c
@@ -19,7 +19,7 @@
#include <string.h>
-#include <glib-object.h>
+#include <gio/gio.h>
#include "libgimpbase/gimpbase.h"
diff --git a/app/core/gimpparamspecs.c b/app/core/gimpparamspecs.c
index ee9f48a..5dc537e 100644
--- a/app/core/gimpparamspecs.c
+++ b/app/core/gimpparamspecs.c
@@ -17,6 +17,7 @@
#include "config.h"
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "libgimpbase/gimpbase.h"
diff --git a/app/core/gimpparasitelist.c b/app/core/gimpparasitelist.c
index b6e5982..c3cb76a 100644
--- a/app/core/gimpparasitelist.c
+++ b/app/core/gimpparasitelist.c
@@ -21,6 +21,7 @@
#include <unistd.h>
#endif
+#include <gio/gio.h>
#include <gegl.h>
#ifdef G_OS_WIN32
diff --git a/app/core/gimppattern.c b/app/core/gimppattern.c
index 8cb3747..6b9e78e 100644
--- a/app/core/gimppattern.c
+++ b/app/core/gimppattern.c
@@ -19,6 +19,7 @@
#include <string.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "libgimpbase/gimpbase.h"
diff --git a/app/core/gimppatternclipboard.c b/app/core/gimppatternclipboard.c
index 11b126d..39ecef8 100644
--- a/app/core/gimppatternclipboard.c
+++ b/app/core/gimppatternclipboard.c
@@ -20,6 +20,7 @@
#include "config.h"
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "core-types.h"
diff --git a/app/core/gimppdbprogress.c b/app/core/gimppdbprogress.c
index 3cf064b..5d05b02 100644
--- a/app/core/gimppdbprogress.c
+++ b/app/core/gimppdbprogress.c
@@ -22,6 +22,7 @@
#include <string.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "libgimpbase/gimpbase.h"
diff --git a/app/core/gimppickable-auto-shrink.c b/app/core/gimppickable-auto-shrink.c
index 9832ba2..15d5af0 100644
--- a/app/core/gimppickable-auto-shrink.c
+++ b/app/core/gimppickable-auto-shrink.c
@@ -19,6 +19,7 @@
#include <string.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "core-types.h"
diff --git a/app/core/gimpprojectable.c b/app/core/gimpprojectable.c
index 03f9543..c5ae3ef 100644
--- a/app/core/gimpprojectable.c
+++ b/app/core/gimpprojectable.c
@@ -20,6 +20,7 @@
#include "config.h"
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "core-types.h"
diff --git a/app/core/gimpprojection.c b/app/core/gimpprojection.c
index 5b895cc..f22124c 100644
--- a/app/core/gimpprojection.c
+++ b/app/core/gimpprojection.c
@@ -18,6 +18,7 @@
#include "config.h"
#include <cairo.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "core-types.h"
diff --git a/app/core/gimpsamplepointundo.c b/app/core/gimpsamplepointundo.c
index e76f423..d0478bc 100644
--- a/app/core/gimpsamplepointundo.c
+++ b/app/core/gimpsamplepointundo.c
@@ -17,6 +17,7 @@
#include "config.h"
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "core-types.h"
diff --git a/app/core/gimpscanconvert.c b/app/core/gimpscanconvert.c
index f5414e5..833ed29 100644
--- a/app/core/gimpscanconvert.c
+++ b/app/core/gimpscanconvert.c
@@ -19,6 +19,7 @@
#include <string.h>
+#include <gio/gio.h>
#include <gegl.h>
#include <cairo.h>
diff --git a/app/core/gimpselection.c b/app/core/gimpselection.c
index 8d4b3b7..cfade0e 100644
--- a/app/core/gimpselection.c
+++ b/app/core/gimpselection.c
@@ -19,6 +19,7 @@
#include <string.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "core-types.h"
diff --git a/app/core/gimpsettings.c b/app/core/gimpsettings.c
index 6122011..2a58d97 100644
--- a/app/core/gimpsettings.c
+++ b/app/core/gimpsettings.c
@@ -22,6 +22,7 @@
#include <string.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "libgimpconfig/gimpconfig.h"
diff --git a/app/core/gimpstrokeoptions.c b/app/core/gimpstrokeoptions.c
index bf385c4..b1701a7 100644
--- a/app/core/gimpstrokeoptions.c
+++ b/app/core/gimpstrokeoptions.c
@@ -21,6 +21,7 @@
#include "config.h"
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "libgimpbase/gimpbase.h"
diff --git a/app/core/gimptagcache.c b/app/core/gimptagcache.c
index 6663e53..31669d5 100644
--- a/app/core/gimptagcache.c
+++ b/app/core/gimptagcache.c
@@ -23,6 +23,7 @@
#include <stdlib.h>
#include <string.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "libgimpbase/gimpbase.h"
diff --git a/app/core/gimptemplate.c b/app/core/gimptemplate.c
index a11427f..b911432 100644
--- a/app/core/gimptemplate.c
+++ b/app/core/gimptemplate.c
@@ -23,6 +23,7 @@
#include "config.h"
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "libgimpbase/gimpbase.h"
diff --git a/app/core/gimptoolinfo.c b/app/core/gimptoolinfo.c
index c144ed8..d493754 100644
--- a/app/core/gimptoolinfo.c
+++ b/app/core/gimptoolinfo.c
@@ -19,6 +19,7 @@
#include <string.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "libgimpbase/gimpbase.h"
diff --git a/app/core/gimptooloptions.c b/app/core/gimptooloptions.c
index d37b3cd..94e6b9e 100644
--- a/app/core/gimptooloptions.c
+++ b/app/core/gimptooloptions.c
@@ -23,8 +23,9 @@
#include <unistd.h>
#endif
-#include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <glib/gstdio.h>
+#include <gegl.h>
#include "libgimpbase/gimpbase.h"
#ifdef G_OS_WIN32
diff --git a/app/core/gimptoolpreset-load.c b/app/core/gimptoolpreset-load.c
index f2a5bd5..606f638 100644
--- a/app/core/gimptoolpreset-load.c
+++ b/app/core/gimptoolpreset-load.c
@@ -17,6 +17,7 @@
#include "config.h"
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "libgimpconfig/gimpconfig.h"
diff --git a/app/core/gimptoolpreset-save.c b/app/core/gimptoolpreset-save.c
index 8826ead..0e202b1 100644
--- a/app/core/gimptoolpreset-save.c
+++ b/app/core/gimptoolpreset-save.c
@@ -17,6 +17,7 @@
#include "config.h"
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "libgimpconfig/gimpconfig.h"
diff --git a/app/core/gimptoolpreset.c b/app/core/gimptoolpreset.c
index 62fb430..99109e5 100644
--- a/app/core/gimptoolpreset.c
+++ b/app/core/gimptoolpreset.c
@@ -17,6 +17,7 @@
#include "config.h"
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "libgimpmath/gimpmath.h"
diff --git a/app/core/gimptreehandler.c b/app/core/gimptreehandler.c
index 1e41b35..f8020a6 100644
--- a/app/core/gimptreehandler.c
+++ b/app/core/gimptreehandler.c
@@ -20,6 +20,7 @@
#include "config.h"
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "core-types.h"
diff --git a/app/core/gimpundo.c b/app/core/gimpundo.c
index 2d4a7ae..d433079 100644
--- a/app/core/gimpundo.c
+++ b/app/core/gimpundo.c
@@ -19,6 +19,7 @@
#include <time.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "libgimpbase/gimpbase.h"
diff --git a/app/core/gimpundostack.c b/app/core/gimpundostack.c
index 0853940..1be843e 100644
--- a/app/core/gimpundostack.c
+++ b/app/core/gimpundostack.c
@@ -17,6 +17,7 @@
#include "config.h"
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "core-types.h"
diff --git a/app/core/gimpunit.c b/app/core/gimpunit.c
index fad1c5f..b6062c4 100644
--- a/app/core/gimpunit.c
+++ b/app/core/gimpunit.c
@@ -24,7 +24,7 @@
#include "config.h"
-#include <glib-object.h>
+#include <gio/gio.h>
#include "libgimpbase/gimpbase.h"
diff --git a/app/core/gimpviewable.c b/app/core/gimpviewable.c
index a3a7e89..d55271f 100644
--- a/app/core/gimpviewable.c
+++ b/app/core/gimpviewable.c
@@ -23,8 +23,8 @@
#include <string.h>
#include <cairo.h>
-#include <gegl.h>
#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
#include "libgimpcolor/gimpcolor.h"
#include "libgimpmath/gimpmath.h"
diff --git a/app/core/gimpviewable.h b/app/core/gimpviewable.h
index 49e2922..ac6d5fb 100644
--- a/app/core/gimpviewable.h
+++ b/app/core/gimpviewable.h
@@ -24,8 +24,6 @@
#include "gimpobject.h"
-#include <gdk-pixbuf/gdk-pixbuf.h>
-
#define GIMP_VIEWABLE_MAX_PREVIEW_SIZE 2048
#define GIMP_VIEWABLE_MAX_POPUP_SIZE 256
diff --git a/app/display/Makefile.am b/app/display/Makefile.am
index f04ea1b..1e668e3 100644
--- a/app/display/Makefile.am
+++ b/app/display/Makefile.am
@@ -165,7 +165,7 @@ CLEANFILES = $(gen_sources)
display-enums.c: $(srcdir)/display-enums.h $(GIMP_MKENUMS)
$(GIMP_MKENUMS) \
- --fhead "#include \"config.h\"\n#include <glib-object.h>\n#include
\"libgimpbase/gimpbase.h\"\n#include \"display-enums.h\"\n#include\"gimp-intl.h\"" \
+ --fhead "#include \"config.h\"\n#include <gio/gio.h>\n#include
\"libgimpbase/gimpbase.h\"\n#include \"display-enums.h\"\n#include\"gimp-intl.h\"" \
--fprod "\n/* enumerations from \"@filename \" */" \
--vhead "GType\n enum_name@_get_type (void)\n{\n static const G Type@Value values[] =\n {" \
--vprod " { @VALUENAME@, \"@VALUENAME \", \"@valuenick \" }," \
diff --git a/app/display/display-enums.c b/app/display/display-enums.c
index 985068d..908ecb1 100644
--- a/app/display/display-enums.c
+++ b/app/display/display-enums.c
@@ -2,7 +2,7 @@
/* Generated data (by gimp-mkenums) */
#include "config.h"
-#include <glib-object.h>
+#include <gio/gio.h>
#include "libgimpbase/gimpbase.h"
#include "display-enums.h"
#include"gimp-intl.h"
diff --git a/app/errors.c b/app/errors.c
index d2cb329..417e1e7 100644
--- a/app/errors.c
+++ b/app/errors.c
@@ -27,7 +27,7 @@
#include <unistd.h>
#endif
-#include <glib-object.h>
+#include <gio/gio.h>
#include "libgimpbase/gimpbase.h"
diff --git a/app/file/file-open.c b/app/file/file-open.c
index 136de5a..6517b4a 100644
--- a/app/file/file-open.c
+++ b/app/file/file-open.c
@@ -32,8 +32,9 @@
#include <unistd.h>
#endif
-#include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <glib/gstdio.h>
+#include <gegl.h>
#ifdef G_OS_WIN32
#include <io.h>
diff --git a/app/file/file-procedure.c b/app/file/file-procedure.c
index c818ae3..31c4e43 100644
--- a/app/file/file-procedure.c
+++ b/app/file/file-procedure.c
@@ -34,7 +34,7 @@
#include <unistd.h>
#endif
-#include <glib-object.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <glib/gstdio.h>
#include "libgimpbase/gimpbase.h"
diff --git a/app/file/file-save.c b/app/file/file-save.c
index 360f97a..19d02f9 100644
--- a/app/file/file-save.c
+++ b/app/file/file-save.c
@@ -32,8 +32,9 @@
#include <unistd.h>
#endif
-#include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <glib/gstdio.h>
+#include <gegl.h>
#ifdef G_OS_WIN32
#include <io.h>
diff --git a/app/file/file-utils.h b/app/file/file-utils.h
index c2ef7fc..ebfab64 100644
--- a/app/file/file-utils.h
+++ b/app/file/file-utils.h
@@ -21,9 +21,6 @@
#define __FILE_UTILS_H__
-#include <gdk-pixbuf/gdk-pixbuf.h>
-
-
gboolean file_utils_filename_is_uri (const gchar *filename,
GError **error);
gchar * file_utils_filename_to_uri (Gimp *gimp,
diff --git a/app/gegl/Makefile.am b/app/gegl/Makefile.am
index 01e353d..9bf052a 100644
--- a/app/gegl/Makefile.am
+++ b/app/gegl/Makefile.am
@@ -56,7 +56,7 @@ CLEANFILES = $(gen_sources)
gimp-gegl-enums.c: $(srcdir)/gimp-gegl-enums.h $(GIMP_MKENUMS)
$(GIMP_MKENUMS) \
- --fhead "#include \"config.h\"\n#include <glib-object.h>\n#include
\"libgimpbase/gimpbase.h\"\n#include \"core/core-enums.h\"\n#include \"gimp-gegl-enums.h\"\n#include
\"gimp-intl.h\"" \
+ --fhead "#include \"config.h\"\n#include <gio/gio.h>\n#include
\"libgimpbase/gimpbase.h\"\n#include \"core/core-enums.h\"\n#include \"gimp-gegl-enums.h\"\n#include
\"gimp-intl.h\"" \
--fprod "\n/* enumerations from \"@filename \" */" \
--vhead "GType\n enum_name@_get_type (void)\n{\n static const G Type@Value values[] =\n {" \
--vprod " { @VALUENAME@, \"@VALUENAME \", \"@valuenick \" }," \
diff --git a/app/gegl/gimp-gegl-enums.c b/app/gegl/gimp-gegl-enums.c
index 1b7f76d..609d8b4 100644
--- a/app/gegl/gimp-gegl-enums.c
+++ b/app/gegl/gimp-gegl-enums.c
@@ -2,7 +2,7 @@
/* Generated data (by gimp-mkenums) */
#include "config.h"
-#include <glib-object.h>
+#include <gio/gio.h>
#include "libgimpbase/gimpbase.h"
#include "core/core-enums.h"
#include "gimp-gegl-enums.h"
diff --git a/app/gegl/gimp-gegl-mask-combine.c b/app/gegl/gimp-gegl-mask-combine.c
index 8ecb064..eda343e 100644
--- a/app/gegl/gimp-gegl-mask-combine.c
+++ b/app/gegl/gimp-gegl-mask-combine.c
@@ -19,6 +19,7 @@
#include <string.h>
+#include <gio/gio.h>
#include <gegl.h>
#include "libgimpbase/gimpbase.h"
diff --git a/app/main.c b/app/main.c
index e39b415..b199447 100644
--- a/app/main.c
+++ b/app/main.c
@@ -31,7 +31,7 @@
#include <locale.h>
-#include <glib-object.h>
+#include <gio/gio.h>
#ifdef G_OS_WIN32
#include <io.h> /* get_osfhandle */
diff --git a/app/operations/gimpbrightnesscontrastconfig.c b/app/operations/gimpbrightnesscontrastconfig.c
index b079fd4..390d612 100644
--- a/app/operations/gimpbrightnesscontrastconfig.c
+++ b/app/operations/gimpbrightnesscontrastconfig.c
@@ -20,6 +20,7 @@
#include "config.h"
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "libgimpmath/gimpmath.h"
diff --git a/app/operations/gimpcageconfig.c b/app/operations/gimpcageconfig.c
index 71d5c45..774489c 100644
--- a/app/operations/gimpcageconfig.c
+++ b/app/operations/gimpcageconfig.c
@@ -19,6 +19,7 @@
#include "config.h"
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "libgimpconfig/gimpconfig.h"
diff --git a/app/operations/gimpdesaturateconfig.c b/app/operations/gimpdesaturateconfig.c
index c2e2f5c..01f1197 100644
--- a/app/operations/gimpdesaturateconfig.c
+++ b/app/operations/gimpdesaturateconfig.c
@@ -20,6 +20,7 @@
#include "config.h"
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "libgimpconfig/gimpconfig.h"
diff --git a/app/operations/gimphuesaturationconfig.c b/app/operations/gimphuesaturationconfig.c
index 28a785e..687e7cc 100644
--- a/app/operations/gimphuesaturationconfig.c
+++ b/app/operations/gimphuesaturationconfig.c
@@ -21,6 +21,7 @@
#include "config.h"
#include <cairo.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "libgimpconfig/gimpconfig.h"
diff --git a/app/operations/gimpoperationcagecoefcalc.c b/app/operations/gimpoperationcagecoefcalc.c
index 33b4148..33fd842 100644
--- a/app/operations/gimpoperationcagecoefcalc.c
+++ b/app/operations/gimpoperationcagecoefcalc.c
@@ -19,6 +19,7 @@
#include "config.h"
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "libgimpmath/gimpmath.h"
diff --git a/app/operations/gimpoperationcurves.c b/app/operations/gimpoperationcurves.c
index 202e32c..87eed55 100644
--- a/app/operations/gimpoperationcurves.c
+++ b/app/operations/gimpoperationcurves.c
@@ -21,6 +21,7 @@
#include "config.h"
#include <cairo.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "libgimpmath/gimpmath.h"
diff --git a/app/operations/gimpoperationlevels.c b/app/operations/gimpoperationlevels.c
index 9ab9009..415a9da 100644
--- a/app/operations/gimpoperationlevels.c
+++ b/app/operations/gimpoperationlevels.c
@@ -21,6 +21,7 @@
#include "config.h"
#include <cairo.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "libgimpmath/gimpmath.h"
diff --git a/app/operations/gimpoperationnormalmode.c b/app/operations/gimpoperationnormalmode.c
index fb8af23..c3b3577 100644
--- a/app/operations/gimpoperationnormalmode.c
+++ b/app/operations/gimpoperationnormalmode.c
@@ -21,14 +21,16 @@
#include "config.h"
+#include <gio/gio.h>
#include <gegl-plugin.h>
-#include <libgimpbase/gimpbase.h>
+#include "libgimpbase/gimpbase.h"
#include "operations-types.h"
#include "gimpoperationnormalmode.h"
+
GimpLayerModeFunction gimp_operation_normal_mode_process_pixels = NULL;
diff --git a/app/operations/gimpoperationposterize.c b/app/operations/gimpoperationposterize.c
index 5c4138b..b6a2663 100644
--- a/app/operations/gimpoperationposterize.c
+++ b/app/operations/gimpoperationposterize.c
@@ -21,6 +21,7 @@
#include "config.h"
#include <cairo.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "libgimpmath/gimpmath.h"
diff --git a/app/operations/gimpoperationthreshold.c b/app/operations/gimpoperationthreshold.c
index cc5c8fe..8fee277 100644
--- a/app/operations/gimpoperationthreshold.c
+++ b/app/operations/gimpoperationthreshold.c
@@ -21,6 +21,7 @@
#include "config.h"
#include <cairo.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "operations-types.h"
diff --git a/app/operations/gimpposterizeconfig.c b/app/operations/gimpposterizeconfig.c
index 22be719..ba457f0 100644
--- a/app/operations/gimpposterizeconfig.c
+++ b/app/operations/gimpposterizeconfig.c
@@ -20,6 +20,7 @@
#include "config.h"
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "libgimpconfig/gimpconfig.h"
diff --git a/app/operations/gimpthresholdconfig.c b/app/operations/gimpthresholdconfig.c
index 88e43ce..e356b76 100644
--- a/app/operations/gimpthresholdconfig.c
+++ b/app/operations/gimpthresholdconfig.c
@@ -20,6 +20,7 @@
#include "config.h"
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "libgimpconfig/gimpconfig.h"
diff --git a/app/paint/Makefile.am b/app/paint/Makefile.am
index efc4639..b1da3e2 100644
--- a/app/paint/Makefile.am
+++ b/app/paint/Makefile.am
@@ -93,7 +93,7 @@ CLEANFILES = $(gen_sources)
paint-enums.c: $(srcdir)/paint-enums.h $(GIMP_MKENUMS)
$(GIMP_MKENUMS) \
- --fhead "#include \"config.h\"\n#include <glib-object.h>\n#include
\"libgimpbase/gimpbase.h\"\n#include \"paint-enums.h\"\n#include \"gimp-intl.h\"" \
+ --fhead "#include \"config.h\"\n#include <gio/gio.h>\n#include
\"libgimpbase/gimpbase.h\"\n#include \"paint-enums.h\"\n#include \"gimp-intl.h\"" \
--fprod "\n/* enumerations from \"@filename \" */" \
--vhead "GType\n enum_name@_get_type (void)\n{\n static const G Type@Value values[] =\n {" \
--vprod " { @VALUENAME@, \"@VALUENAME \", \"@valuenick \" }," \
diff --git a/app/paint/gimp-paint.c b/app/paint/gimp-paint.c
index ffe9334..28c721b 100644
--- a/app/paint/gimp-paint.c
+++ b/app/paint/gimp-paint.c
@@ -17,6 +17,7 @@
#include "config.h"
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "paint-types.h"
diff --git a/app/paint/gimpairbrush.c b/app/paint/gimpairbrush.c
index 45d2b9d..725b5a0 100644
--- a/app/paint/gimpairbrush.c
+++ b/app/paint/gimpairbrush.c
@@ -17,6 +17,7 @@
#include "config.h"
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "paint-types.h"
diff --git a/app/paint/gimpairbrushoptions.c b/app/paint/gimpairbrushoptions.c
index 469a0de..d9179d7 100644
--- a/app/paint/gimpairbrushoptions.c
+++ b/app/paint/gimpairbrushoptions.c
@@ -17,6 +17,7 @@
#include "config.h"
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "libgimpconfig/gimpconfig.h"
diff --git a/app/paint/gimpbrushcore.c b/app/paint/gimpbrushcore.c
index 02dbd6d..b6755da 100644
--- a/app/paint/gimpbrushcore.c
+++ b/app/paint/gimpbrushcore.c
@@ -19,6 +19,7 @@
#include <string.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "libgimpmath/gimpmath.h"
diff --git a/app/paint/gimpclone.c b/app/paint/gimpclone.c
index 49f928c..0188faf 100644
--- a/app/paint/gimpclone.c
+++ b/app/paint/gimpclone.c
@@ -20,6 +20,7 @@
#include <stdlib.h>
#include <string.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "libgimpbase/gimpbase.h"
diff --git a/app/paint/gimpcloneoptions.c b/app/paint/gimpcloneoptions.c
index 2a90ae0..9786352 100644
--- a/app/paint/gimpcloneoptions.c
+++ b/app/paint/gimpcloneoptions.c
@@ -19,6 +19,7 @@
#include <string.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "libgimpconfig/gimpconfig.h"
diff --git a/app/paint/gimpconvolve.c b/app/paint/gimpconvolve.c
index 4cb64be..4a4fe28 100644
--- a/app/paint/gimpconvolve.c
+++ b/app/paint/gimpconvolve.c
@@ -17,6 +17,7 @@
#include "config.h"
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "paint-types.h"
diff --git a/app/paint/gimpconvolveoptions.c b/app/paint/gimpconvolveoptions.c
index 3e60035..cc935b4 100644
--- a/app/paint/gimpconvolveoptions.c
+++ b/app/paint/gimpconvolveoptions.c
@@ -17,6 +17,7 @@
#include "config.h"
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "libgimpconfig/gimpconfig.h"
diff --git a/app/paint/gimpdodgeburn.c b/app/paint/gimpdodgeburn.c
index 09c4cab..dd4ac8c 100644
--- a/app/paint/gimpdodgeburn.c
+++ b/app/paint/gimpdodgeburn.c
@@ -17,6 +17,7 @@
#include "config.h"
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "libgimpbase/gimpbase.h"
diff --git a/app/paint/gimpdodgeburnoptions.c b/app/paint/gimpdodgeburnoptions.c
index e87dea3..57e8abc 100644
--- a/app/paint/gimpdodgeburnoptions.c
+++ b/app/paint/gimpdodgeburnoptions.c
@@ -17,6 +17,7 @@
#include "config.h"
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "libgimpconfig/gimpconfig.h"
diff --git a/app/paint/gimperaser.c b/app/paint/gimperaser.c
index 148f951..0e22e6b 100644
--- a/app/paint/gimperaser.c
+++ b/app/paint/gimperaser.c
@@ -17,6 +17,7 @@
#include "config.h"
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "paint-types.h"
diff --git a/app/paint/gimperaseroptions.c b/app/paint/gimperaseroptions.c
index f001717..1fbece4 100644
--- a/app/paint/gimperaseroptions.c
+++ b/app/paint/gimperaseroptions.c
@@ -17,6 +17,7 @@
#include "config.h"
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "libgimpconfig/gimpconfig.h"
diff --git a/app/paint/gimpheal.c b/app/paint/gimpheal.c
index 28acdc1..a06ccac 100644
--- a/app/paint/gimpheal.c
+++ b/app/paint/gimpheal.c
@@ -24,6 +24,7 @@
#include <stdint.h>
#include <string.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "libgimpbase/gimpbase.h"
diff --git a/app/paint/gimpink.c b/app/paint/gimpink.c
index b236645..ddcb86a 100644
--- a/app/paint/gimpink.c
+++ b/app/paint/gimpink.c
@@ -19,6 +19,7 @@
#include <string.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "libgimpmath/gimpmath.h"
diff --git a/app/paint/gimpinkoptions.c b/app/paint/gimpinkoptions.c
index 56eeaa1..d2ed2e9 100644
--- a/app/paint/gimpinkoptions.c
+++ b/app/paint/gimpinkoptions.c
@@ -17,6 +17,7 @@
#include "config.h"
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "libgimpconfig/gimpconfig.h"
diff --git a/app/paint/gimpinkundo.c b/app/paint/gimpinkundo.c
index 599a2ba..aede58f 100644
--- a/app/paint/gimpinkundo.c
+++ b/app/paint/gimpinkundo.c
@@ -19,6 +19,7 @@
#include <string.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "paint-types.h"
diff --git a/app/paint/gimppaintcore-stroke.c b/app/paint/gimppaintcore-stroke.c
index 7fba0d4..cd38627 100644
--- a/app/paint/gimppaintcore-stroke.c
+++ b/app/paint/gimppaintcore-stroke.c
@@ -17,6 +17,7 @@
#include "config.h"
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "libgimpmath/gimpmath.h"
diff --git a/app/paint/gimppaintcore.c b/app/paint/gimppaintcore.c
index 8880315..117cbf1 100644
--- a/app/paint/gimppaintcore.c
+++ b/app/paint/gimppaintcore.c
@@ -20,6 +20,7 @@
#include <string.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "libgimpbase/gimpbase.h"
diff --git a/app/paint/gimppaintcoreundo.c b/app/paint/gimppaintcoreundo.c
index 6a50793..939f5f6 100644
--- a/app/paint/gimppaintcoreundo.c
+++ b/app/paint/gimppaintcoreundo.c
@@ -17,6 +17,7 @@
#include "config.h"
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "paint-types.h"
diff --git a/app/paint/gimppaintoptions.c b/app/paint/gimppaintoptions.c
index a7c069f..61c22d6 100644
--- a/app/paint/gimppaintoptions.c
+++ b/app/paint/gimppaintoptions.c
@@ -17,6 +17,7 @@
#include "config.h"
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "libgimpbase/gimpbase.h"
diff --git a/app/paint/gimppencil.c b/app/paint/gimppencil.c
index 19f6a6f..907828c 100644
--- a/app/paint/gimppencil.c
+++ b/app/paint/gimppencil.c
@@ -17,6 +17,7 @@
#include "config.h"
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "paint-types.h"
diff --git a/app/paint/gimppenciloptions.c b/app/paint/gimppenciloptions.c
index 0262846..5894fd5 100644
--- a/app/paint/gimppenciloptions.c
+++ b/app/paint/gimppenciloptions.c
@@ -17,6 +17,7 @@
#include "config.h"
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "libgimpconfig/gimpconfig.h"
diff --git a/app/paint/gimpperspectiveclone.c b/app/paint/gimpperspectiveclone.c
index 493ff83..c2efe7f 100644
--- a/app/paint/gimpperspectiveclone.c
+++ b/app/paint/gimpperspectiveclone.c
@@ -20,6 +20,7 @@
#include <stdlib.h>
#include <string.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "libgimpbase/gimpbase.h"
diff --git a/app/paint/gimpperspectivecloneoptions.c b/app/paint/gimpperspectivecloneoptions.c
index 9b87c32..193e5ec 100644
--- a/app/paint/gimpperspectivecloneoptions.c
+++ b/app/paint/gimpperspectivecloneoptions.c
@@ -17,6 +17,7 @@
#include "config.h"
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "libgimpconfig/gimpconfig.h"
diff --git a/app/paint/gimpsmudge.c b/app/paint/gimpsmudge.c
index a93d546..99306b8 100644
--- a/app/paint/gimpsmudge.c
+++ b/app/paint/gimpsmudge.c
@@ -17,6 +17,7 @@
#include "config.h"
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "libgimpmath/gimpmath.h"
diff --git a/app/paint/gimpsmudgeoptions.c b/app/paint/gimpsmudgeoptions.c
index 7861294..306e667 100644
--- a/app/paint/gimpsmudgeoptions.c
+++ b/app/paint/gimpsmudgeoptions.c
@@ -17,6 +17,7 @@
#include "config.h"
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "libgimpconfig/gimpconfig.h"
diff --git a/app/paint/gimpsourcecore.c b/app/paint/gimpsourcecore.c
index 6a500ab..46a04fa 100644
--- a/app/paint/gimpsourcecore.c
+++ b/app/paint/gimpsourcecore.c
@@ -17,6 +17,7 @@
#include "config.h"
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "libgimpbase/gimpbase.h"
diff --git a/app/paint/gimpsourceoptions.c b/app/paint/gimpsourceoptions.c
index 16585e9..af02ed2 100644
--- a/app/paint/gimpsourceoptions.c
+++ b/app/paint/gimpsourceoptions.c
@@ -17,6 +17,7 @@
#include "config.h"
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "libgimpconfig/gimpconfig.h"
diff --git a/app/paint/paint-enums.c b/app/paint/paint-enums.c
index eacf695..0d85625 100644
--- a/app/paint/paint-enums.c
+++ b/app/paint/paint-enums.c
@@ -2,7 +2,7 @@
/* Generated data (by gimp-mkenums) */
#include "config.h"
-#include <glib-object.h>
+#include <gio/gio.h>
#include "libgimpbase/gimpbase.h"
#include "paint-enums.h"
#include "gimp-intl.h"
diff --git a/app/pdb/gimppdb-query.c b/app/pdb/gimppdb-query.c
index 32a1b25..55a28d4 100644
--- a/app/pdb/gimppdb-query.c
+++ b/app/pdb/gimppdb-query.c
@@ -21,7 +21,7 @@
#include <stdlib.h>
#include <string.h>
-#include <glib-object.h>
+#include <gio/gio.h>
#include "libgimpbase/gimpbase.h"
diff --git a/app/pdb/gimppdb-utils.c b/app/pdb/gimppdb-utils.c
index 4c553f4..4000952 100644
--- a/app/pdb/gimppdb-utils.c
+++ b/app/pdb/gimppdb-utils.c
@@ -19,6 +19,7 @@
#include <string.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "pdb-types.h"
diff --git a/app/pdb/gimppdb.c b/app/pdb/gimppdb.c
index cd648f0..fcb2ea0 100644
--- a/app/pdb/gimppdb.c
+++ b/app/pdb/gimppdb.c
@@ -21,8 +21,9 @@
#include <string.h>
#include <sys/types.h>
-#include <gegl.h>
#include <gobject/gvaluecollector.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gegl.h>
#include "libgimpbase/gimpbase.h"
diff --git a/app/pdb/gimppdbcontext.c b/app/pdb/gimppdbcontext.c
index 9f4dedb..c2c9b0e 100644
--- a/app/pdb/gimppdbcontext.c
+++ b/app/pdb/gimppdbcontext.c
@@ -19,6 +19,7 @@
#include "config.h"
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "libgimpconfig/gimpconfig.h"
diff --git a/app/pdb/gimpprocedure.c b/app/pdb/gimpprocedure.c
index 6400d3b..1b367e1 100644
--- a/app/pdb/gimpprocedure.c
+++ b/app/pdb/gimpprocedure.c
@@ -20,6 +20,7 @@
#include <stdarg.h>
#include <sys/types.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "libgimpbase/gimpbase.h"
diff --git a/app/plug-in/Makefile.am b/app/plug-in/Makefile.am
index d757efd..8e94be6 100644
--- a/app/plug-in/Makefile.am
+++ b/app/plug-in/Makefile.am
@@ -86,7 +86,7 @@ CLEANFILES = $(EXTRA_PROGRAMS) $(gen_sources)
plug-in-enums.c: $(srcdir)/plug-in-enums.h $(GIMP_MKENUMS)
$(GIMP_MKENUMS) \
- --fhead "#include \"config.h\"\n#include <glib-object.h>\n#include
\"libgimpbase/gimpbase.h\"\n#include \"plug-in-enums.h\"\n#include \"gimp-intl.h\"" \
+ --fhead "#include \"config.h\"\n#include <gio/gio.h>\n#include
\"libgimpbase/gimpbase.h\"\n#include \"plug-in-enums.h\"\n#include \"gimp-intl.h\"" \
--fprod "\n/* enumerations from \"@filename \" */" \
--vhead "GType\n enum_name@_get_type (void)\n{\n static const G Type@Value values[] =\n {" \
--vprod " { @VALUENAME@, \"@VALUENAME \", \"@valuenick \" }," \
diff --git a/app/plug-in/gimpenvirontable.c b/app/plug-in/gimpenvirontable.c
index 8eeb386..1ebf5db 100644
--- a/app/plug-in/gimpenvirontable.c
+++ b/app/plug-in/gimpenvirontable.c
@@ -23,7 +23,7 @@
#include <stdlib.h>
#include <string.h>
-#include <glib-object.h>
+#include <gio/gio.h>
#include <glib/gstdio.h>
#include "libgimpbase/gimpbase.h"
diff --git a/app/plug-in/gimpinterpreterdb.c b/app/plug-in/gimpinterpreterdb.c
index acbeb40..e05c58c 100644
--- a/app/plug-in/gimpinterpreterdb.c
+++ b/app/plug-in/gimpinterpreterdb.c
@@ -44,7 +44,7 @@
#include <fcntl.h>
-#include <glib-object.h>
+#include <gio/gio.h>
#include <glib/gstdio.h>
#ifdef G_OS_WIN32
diff --git a/app/plug-in/gimpplugin-cleanup.c b/app/plug-in/gimpplugin-cleanup.c
index 03f2190..2e99a3d 100644
--- a/app/plug-in/gimpplugin-cleanup.c
+++ b/app/plug-in/gimpplugin-cleanup.c
@@ -19,6 +19,7 @@
#include "config.h"
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "plug-in-types.h"
diff --git a/app/plug-in/gimpplugin-context.c b/app/plug-in/gimpplugin-context.c
index 434634a..af7d6a7 100644
--- a/app/plug-in/gimpplugin-context.c
+++ b/app/plug-in/gimpplugin-context.c
@@ -19,6 +19,7 @@
#include "config.h"
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "plug-in-types.h"
diff --git a/app/plug-in/gimpplugin-message.c b/app/plug-in/gimpplugin-message.c
index 10218ce..2e592db 100644
--- a/app/plug-in/gimpplugin-message.c
+++ b/app/plug-in/gimpplugin-message.c
@@ -21,6 +21,7 @@
#include <string.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "libgimpbase/gimpbase.h"
diff --git a/app/plug-in/gimpplugin-progress.c b/app/plug-in/gimpplugin-progress.c
index 420ed9d..e5bc13c 100644
--- a/app/plug-in/gimpplugin-progress.c
+++ b/app/plug-in/gimpplugin-progress.c
@@ -19,7 +19,7 @@
#include "config.h"
-#include <glib-object.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include "plug-in-types.h"
diff --git a/app/plug-in/gimpplugin.c b/app/plug-in/gimpplugin.c
index 16350fb..085d924 100644
--- a/app/plug-in/gimpplugin.c
+++ b/app/plug-in/gimpplugin.c
@@ -40,6 +40,7 @@
#include <sys/param.h>
#endif
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#if defined(G_OS_WIN32) || defined(G_WITH_CYGWIN)
diff --git a/app/plug-in/gimpplugindef.c b/app/plug-in/gimpplugindef.c
index 9162dcc..de011a9 100644
--- a/app/plug-in/gimpplugindef.c
+++ b/app/plug-in/gimpplugindef.c
@@ -19,6 +19,7 @@
#include "config.h"
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "plug-in-types.h"
diff --git a/app/plug-in/gimppluginmanager-call.c b/app/plug-in/gimppluginmanager-call.c
index c36689a..38b489a 100644
--- a/app/plug-in/gimppluginmanager-call.c
+++ b/app/plug-in/gimppluginmanager-call.c
@@ -19,6 +19,7 @@
#include "config.h"
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "libgimpbase/gimpbase.h"
diff --git a/app/plug-in/gimppluginmanager-file.c b/app/plug-in/gimppluginmanager-file.c
index 7d00a50..b131d3f 100644
--- a/app/plug-in/gimppluginmanager-file.c
+++ b/app/plug-in/gimppluginmanager-file.c
@@ -19,7 +19,7 @@
#include "config.h"
-#include <glib-object.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include "plug-in-types.h"
diff --git a/app/plug-in/gimppluginmanager-history.c b/app/plug-in/gimppluginmanager-history.c
index 1783728..edf524a 100644
--- a/app/plug-in/gimppluginmanager-history.c
+++ b/app/plug-in/gimppluginmanager-history.c
@@ -19,7 +19,7 @@
#include "config.h"
-#include <glib-object.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include "libgimpbase/gimpbase.h"
diff --git a/app/plug-in/gimppluginmanager-locale-domain.c b/app/plug-in/gimppluginmanager-locale-domain.c
index 956b688..82903c4 100644
--- a/app/plug-in/gimppluginmanager-locale-domain.c
+++ b/app/plug-in/gimppluginmanager-locale-domain.c
@@ -21,7 +21,7 @@
#include <string.h>
-#include <glib-object.h>
+#include <gio/gio.h>
#include "libgimpbase/gimpbase.h"
diff --git a/app/plug-in/gimppluginmanager-query.c b/app/plug-in/gimppluginmanager-query.c
index 0d193e4..197b1b9 100644
--- a/app/plug-in/gimppluginmanager-query.c
+++ b/app/plug-in/gimppluginmanager-query.c
@@ -21,7 +21,7 @@
#include <string.h>
-#include <glib-object.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include "libgimpbase/gimpbase.h"
diff --git a/app/plug-in/gimppluginmanager-restore.c b/app/plug-in/gimppluginmanager-restore.c
index 7282c22..d2f4b81 100644
--- a/app/plug-in/gimppluginmanager-restore.c
+++ b/app/plug-in/gimppluginmanager-restore.c
@@ -21,6 +21,7 @@
#include <string.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "libgimpbase/gimpbase.h"
diff --git a/app/plug-in/gimppluginmanager.c b/app/plug-in/gimppluginmanager.c
index ed07498..c252ade 100644
--- a/app/plug-in/gimppluginmanager.c
+++ b/app/plug-in/gimppluginmanager.c
@@ -21,6 +21,7 @@
#include <string.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "libgimpbase/gimpbase.h"
diff --git a/app/plug-in/gimppluginprocedure.h b/app/plug-in/gimppluginprocedure.h
index 62ad992..182879c 100644
--- a/app/plug-in/gimppluginprocedure.h
+++ b/app/plug-in/gimppluginprocedure.h
@@ -21,8 +21,6 @@
#define __GIMP_PLUG_IN_PROCEDURE_H__
-#include <gdk-pixbuf/gdk-pixbuf.h>
-
#include "pdb/gimpprocedure.h"
diff --git a/app/plug-in/gimppluginprocframe.c b/app/plug-in/gimppluginprocframe.c
index c7f8332..be3e723 100644
--- a/app/plug-in/gimppluginprocframe.c
+++ b/app/plug-in/gimppluginprocframe.c
@@ -21,6 +21,7 @@
#include <string.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "libgimpbase/gimpbase.h"
diff --git a/app/plug-in/gimptemporaryprocedure.c b/app/plug-in/gimptemporaryprocedure.c
index aa0d363..1e8bb0a 100644
--- a/app/plug-in/gimptemporaryprocedure.c
+++ b/app/plug-in/gimptemporaryprocedure.c
@@ -19,6 +19,7 @@
#include "config.h"
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "libgimpbase/gimpbase.h"
diff --git a/app/plug-in/plug-in-enums.c b/app/plug-in/plug-in-enums.c
index b616eca..0bc8eaa 100644
--- a/app/plug-in/plug-in-enums.c
+++ b/app/plug-in/plug-in-enums.c
@@ -2,7 +2,7 @@
/* Generated data (by gimp-mkenums) */
#include "config.h"
-#include <glib-object.h>
+#include <gio/gio.h>
#include "libgimpbase/gimpbase.h"
#include "plug-in-enums.h"
#include "gimp-intl.h"
diff --git a/app/plug-in/plug-in-icc-profile.c b/app/plug-in/plug-in-icc-profile.c
index f7446e1..59084a2 100644
--- a/app/plug-in/plug-in-icc-profile.c
+++ b/app/plug-in/plug-in-icc-profile.c
@@ -20,6 +20,7 @@
#include "config.h"
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "libgimpbase/gimpbase.h"
diff --git a/app/plug-in/plug-in-menu-path.c b/app/plug-in/plug-in-menu-path.c
index 07a493e..26a2542 100644
--- a/app/plug-in/plug-in-menu-path.c
+++ b/app/plug-in/plug-in-menu-path.c
@@ -21,7 +21,7 @@
#include <string.h>
-#include <glib-object.h>
+#include <gio/gio.h>
#include "libgimpbase/gimpbase.h"
diff --git a/app/plug-in/plug-in-rc.c b/app/plug-in/plug-in-rc.c
index c8bb944..c6414eb 100644
--- a/app/plug-in/plug-in-rc.c
+++ b/app/plug-in/plug-in-rc.c
@@ -20,7 +20,7 @@
#include "config.h"
-#include <glib-object.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include "libgimpbase/gimpbase.h"
#include "libgimpbase/gimpprotocol.h"
diff --git a/app/signals.c b/app/signals.c
index ccf5205..11fad52 100644
--- a/app/signals.c
+++ b/app/signals.c
@@ -19,7 +19,7 @@
#include <signal.h>
-#include <glib-object.h>
+#include <gio/gio.h>
#include "libgimpbase/gimpbase.h"
diff --git a/app/text/Makefile.am b/app/text/Makefile.am
index 23de44b..4e9c2e3 100644
--- a/app/text/Makefile.am
+++ b/app/text/Makefile.am
@@ -58,7 +58,7 @@ CLEANFILES = $(gen_sources)
text-enums.c: $(srcdir)/text-enums.h $(GIMP_MKENUMS)
$(GIMP_MKENUMS) \
- --fhead "#include \"config.h\"\n#include <glib-object.h>\n#include
\"libgimpbase/gimpbase.h\"\n#include \"text-enums.h\"\n#include \"gimp-intl.h\"" \
+ --fhead "#include \"config.h\"\n#include <gio/gio.h>\n#include
\"libgimpbase/gimpbase.h\"\n#include \"text-enums.h\"\n#include \"gimp-intl.h\"" \
--fprod "\n/* enumerations from \"@filename \" */" \
--vhead "GType\n enum_name@_get_type (void)\n{\n static const G Type@Value values[] =\n {" \
--vprod " { @VALUENAME@, \"@VALUENAME \", \"@valuenick \" }," \
diff --git a/app/text/gimp-fonts.c b/app/text/gimp-fonts.c
index ced8ef8..95310a2 100644
--- a/app/text/gimp-fonts.c
+++ b/app/text/gimp-fonts.c
@@ -20,7 +20,7 @@
#include "config.h"
-#include <glib-object.h>
+#include <gio/gio.h>
#include <fontconfig/fontconfig.h>
diff --git a/app/text/gimpfont.c b/app/text/gimpfont.c
index ccd443b..4045ca9 100644
--- a/app/text/gimpfont.c
+++ b/app/text/gimpfont.c
@@ -21,6 +21,7 @@
#include "config.h"
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include <pango/pangocairo.h>
diff --git a/app/text/gimpfontlist.c b/app/text/gimpfontlist.c
index b812a31..2ca6d23 100644
--- a/app/text/gimpfontlist.c
+++ b/app/text/gimpfontlist.c
@@ -24,9 +24,10 @@
#include <string.h>
-#include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <pango/pangocairo.h>
#include <pango/pangofc-fontmap.h>
+#include <gegl.h>
#include "text-types.h"
diff --git a/app/text/gimptext-vectors.c b/app/text/gimptext-vectors.c
index d47a703..e7ef488 100644
--- a/app/text/gimptext-vectors.c
+++ b/app/text/gimptext-vectors.c
@@ -20,9 +20,9 @@
#include "config.h"
-#include <gegl.h>
-
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <pango/pangocairo.h>
+#include <gegl.h>
#include "text-types.h"
diff --git a/app/text/gimptext-xlfd.c b/app/text/gimptext-xlfd.c
index 852595e..2dc632f 100644
--- a/app/text/gimptext-xlfd.c
+++ b/app/text/gimptext-xlfd.c
@@ -26,7 +26,7 @@
#include <stdlib.h>
#include <string.h>
-#include <glib-object.h>
+#include <gio/gio.h>
#include "libgimpbase/gimpbase.h"
diff --git a/app/text/gimptextlayer-transform.c b/app/text/gimptextlayer-transform.c
index a2c1a69..48f22fe 100644
--- a/app/text/gimptextlayer-transform.c
+++ b/app/text/gimptextlayer-transform.c
@@ -20,6 +20,7 @@
#include "config.h"
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "libgimpmath/gimpmath.h"
diff --git a/app/text/gimptextlayer-xcf.c b/app/text/gimptextlayer-xcf.c
index 75a14f2..3ad4696 100644
--- a/app/text/gimptextlayer-xcf.c
+++ b/app/text/gimptextlayer-xcf.c
@@ -20,6 +20,7 @@
#include "config.h"
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "libgimpbase/gimpbase.h"
diff --git a/app/text/gimptextundo.c b/app/text/gimptextundo.c
index 7fa0e4b..e855ef0 100644
--- a/app/text/gimptextundo.c
+++ b/app/text/gimptextundo.c
@@ -17,6 +17,7 @@
#include "config.h"
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "libgimpconfig/gimpconfig.h"
diff --git a/app/text/text-enums.c b/app/text/text-enums.c
index 27d1600..534aa04 100644
--- a/app/text/text-enums.c
+++ b/app/text/text-enums.c
@@ -2,7 +2,7 @@
/* Generated data (by gimp-mkenums) */
#include "config.h"
-#include <glib-object.h>
+#include <gio/gio.h>
#include "libgimpbase/gimpbase.h"
#include "text-enums.h"
#include "gimp-intl.h"
diff --git a/app/tools/Makefile.am b/app/tools/Makefile.am
index 50ec6b8..d5fcd17 100644
--- a/app/tools/Makefile.am
+++ b/app/tools/Makefile.am
@@ -222,7 +222,7 @@ CLEANFILES = $(gen_sources)
tools-enums.c: $(srcdir)/tools-enums.h $(GIMP_MKENUMS)
$(GIMP_MKENUMS) \
- --fhead "#include \"config.h\"\n#include <glib-object.h>\n#include
\"libgimpbase/gimpbase.h\"\n#include \"core/core-enums.h\"\n#include \"tools-enums.h\"\n#include
\"gimp-intl.h\"" \
+ --fhead "#include \"config.h\"\n#include <gio/gio.h>\n#include
\"libgimpbase/gimpbase.h\"\n#include \"core/core-enums.h\"\n#include \"tools-enums.h\"\n#include
\"gimp-intl.h\"" \
--fprod "\n/* enumerations from \"@filename \" */" \
--vhead "GType\n enum_name@_get_type (void)\n{\n static const G Type@Value values[] =\n {" \
--vprod " { @VALUENAME@, \"@VALUENAME \", \"@valuenick \" }," \
diff --git a/app/tools/tools-enums.c b/app/tools/tools-enums.c
index 6b0013c..d143b66 100644
--- a/app/tools/tools-enums.c
+++ b/app/tools/tools-enums.c
@@ -2,7 +2,7 @@
/* Generated data (by gimp-mkenums) */
#include "config.h"
-#include <glib-object.h>
+#include <gio/gio.h>
#include "libgimpbase/gimpbase.h"
#include "core/core-enums.h"
#include "tools-enums.h"
diff --git a/app/unique.c b/app/unique.c
index a134931..3e00c2b 100644
--- a/app/unique.c
+++ b/app/unique.c
@@ -17,7 +17,7 @@
#include "config.h"
-#include <gio/gio.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
#ifdef G_OS_WIN32
#include <windows.h>
diff --git a/app/units.c b/app/units.c
index 31da7af..4342984 100644
--- a/app/units.c
+++ b/app/units.c
@@ -17,7 +17,7 @@
#include "config.h"
-#include <glib-object.h>
+#include <gio/gio.h>
#include "libgimpbase/gimpbase.h"
#include "libgimpbase/gimpbase-private.h"
diff --git a/app/vectors/gimpvectors-compat.c b/app/vectors/gimpvectors-compat.c
index 7918ac3..f200466 100644
--- a/app/vectors/gimpvectors-compat.c
+++ b/app/vectors/gimpvectors-compat.c
@@ -20,6 +20,7 @@
#include "config.h"
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "vectors-types.h"
diff --git a/app/vectors/gimpvectors-export.c b/app/vectors/gimpvectors-export.c
index f39e9ff..2ef3009 100644
--- a/app/vectors/gimpvectors-export.c
+++ b/app/vectors/gimpvectors-export.c
@@ -20,8 +20,9 @@
#include <errno.h>
#include <string.h>
-#include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <glib/gstdio.h>
+#include <gegl.h>
#include "libgimpbase/gimpbase.h"
diff --git a/app/vectors/gimpvectors-import.c b/app/vectors/gimpvectors-import.c
index 6dd156d..4ed0375 100644
--- a/app/vectors/gimpvectors-import.c
+++ b/app/vectors/gimpvectors-import.c
@@ -33,6 +33,7 @@
#include <string.h>
#include <errno.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "libgimpbase/gimpbase.h"
diff --git a/app/vectors/gimpvectors-preview.c b/app/vectors/gimpvectors-preview.c
index 7e05e88..7e86775 100644
--- a/app/vectors/gimpvectors-preview.c
+++ b/app/vectors/gimpvectors-preview.c
@@ -19,6 +19,7 @@
#include <string.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "vectors-types.h"
diff --git a/app/vectors/gimpvectors-warp.c b/app/vectors/gimpvectors-warp.c
index dadd89f..263dda4 100644
--- a/app/vectors/gimpvectors-warp.c
+++ b/app/vectors/gimpvectors-warp.c
@@ -20,6 +20,7 @@
#include "config.h"
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "vectors-types.h"
diff --git a/app/vectors/gimpvectorsmodundo.c b/app/vectors/gimpvectorsmodundo.c
index dbd5cb8..1ae4730 100644
--- a/app/vectors/gimpvectorsmodundo.c
+++ b/app/vectors/gimpvectorsmodundo.c
@@ -17,6 +17,7 @@
#include "config.h"
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "vectors-types.h"
diff --git a/app/vectors/gimpvectorspropundo.c b/app/vectors/gimpvectorspropundo.c
index d0d9ed6..5813362 100644
--- a/app/vectors/gimpvectorspropundo.c
+++ b/app/vectors/gimpvectorspropundo.c
@@ -17,6 +17,7 @@
#include "config.h"
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "vectors-types.h"
diff --git a/app/vectors/gimpvectorsundo.c b/app/vectors/gimpvectorsundo.c
index df324a7..c279193 100644
--- a/app/vectors/gimpvectorsundo.c
+++ b/app/vectors/gimpvectorsundo.c
@@ -17,6 +17,7 @@
#include "config.h"
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gegl.h>
#include "vectors-types.h"
diff --git a/app/xcf/xcf.c b/app/xcf/xcf.c
index b758cac..71a34ad 100644
--- a/app/xcf/xcf.c
+++ b/app/xcf/xcf.c
@@ -21,8 +21,9 @@
#include <stdlib.h>
#include <string.h>
-#include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
#include <glib/gstdio.h>
+#include <gegl.h>
#include "libgimpbase/gimpbase.h"
diff --git a/libgimp/Makefile.am b/libgimp/Makefile.am
index 775ed14..bff3883 100644
--- a/libgimp/Makefile.am
+++ b/libgimp/Makefile.am
@@ -427,7 +427,7 @@ CLEANFILES = $(gen_sources)
gimpenums.c: $(srcdir)/gimpenums.h $(srcdir)/gimpenums.c.tail $(GIMP_MKENUMS)
$(GIMP_MKENUMS) \
- --fhead "#include \"config.h\"\n#include <glib-object.h>\n#undef
GIMP_DISABLE_DEPRECATED\n#include \"libgimpbase/gimpbase.h\"\n#include \"gimpenums.h\"" \
+ --fhead "#include \"config.h\"\n#include <gio/gio.h>\n#undef
GIMP_DISABLE_DEPRECATED\n#include \"libgimpbase/gimpbase.h\"\n#include \"gimpenums.h\"" \
--fprod "\n/* enumerations from \"@filename \" */" \
--vhead "GType\n enum_name@_get_type (void)\n{\n static const G Type@Value values[] =\n {" \
--vprod " { @VALUENAME@, \"@VALUENAME \", \"@valuenick \" }," \
diff --git a/libgimp/gimpprogress.c b/libgimp/gimpprogress.c
index e34647b..555d0bd 100644
--- a/libgimp/gimpprogress.c
+++ b/libgimp/gimpprogress.c
@@ -20,7 +20,7 @@
#include "config.h"
-#include <glib-object.h>
+#include <gio/gio.h>
#include "libgimpbase/gimpbase.h"
diff --git a/libgimp/gimptile.c b/libgimp/gimptile.c
index 822c924..208956a 100644
--- a/libgimp/gimptile.c
+++ b/libgimp/gimptile.c
@@ -22,7 +22,7 @@
#include <string.h>
-#include <glib-object.h>
+#include <gio/gio.h>
#define GIMP_DISABLE_DEPRECATION_WARNINGS
diff --git a/libgimp/gimpunitcache.c b/libgimp/gimpunitcache.c
index b4ed00a..acd2cdc 100644
--- a/libgimp/gimpunitcache.c
+++ b/libgimp/gimpunitcache.c
@@ -21,7 +21,7 @@
#include "config.h"
-#include <glib-object.h>
+#include <gio/gio.h>
#include "libgimpbase/gimpbase.h"
diff --git a/libgimpbase/gimpbase-private.c b/libgimpbase/gimpbase-private.c
index 60feabf..b9df767 100644
--- a/libgimpbase/gimpbase-private.c
+++ b/libgimpbase/gimpbase-private.c
@@ -21,7 +21,7 @@
#include "config.h"
-#include <glib-object.h>
+#include <gio/gio.h>
#include "libgimpbase/gimpbase.h"
diff --git a/libgimpcolor/gimpcairo.c b/libgimpcolor/gimpcairo.c
index 2792451..628fda6 100644
--- a/libgimpcolor/gimpcairo.c
+++ b/libgimpcolor/gimpcairo.c
@@ -23,6 +23,7 @@
#include "config.h"
#include <cairo.h>
+#include <gio/gio.h>
#include <gegl.h>
#include "libgimpbase/gimpbase.h"
diff --git a/libgimpconfig/Makefile.am b/libgimpconfig/Makefile.am
index 8267c7e..696ffbb 100644
--- a/libgimpconfig/Makefile.am
+++ b/libgimpconfig/Makefile.am
@@ -135,7 +135,7 @@ CLEANFILES = $(gen_sources)
$(srcdir)/gimpcolorconfig-enums.c: $(srcdir)/gimpcolorconfig-enums.h $(GIMP_MKENUMS)
$(GIMP_MKENUMS) \
- --fhead "#include \"config.h\"\n#include <glib-object.h>\n#include
\"libgimpbase/gimpbase.h\"\n#include \"gimpcolorconfig-enums.h\"\n#include \"libgimp/libgimp-intl.h\"" \
+ --fhead "#include \"config.h\"\n#include <gio/gio.h>\n#include
\"libgimpbase/gimpbase.h\"\n#include \"gimpcolorconfig-enums.h\"\n#include \"libgimp/libgimp-intl.h\"" \
--fprod "\n/* enumerations from \"@filename \" */" \
--vhead "GType\n enum_name@_get_type (void)\n{\n static const G Type@Value values[] =\n {" \
--vprod " { @VALUENAME@, \"@VALUENAME \", \"@valuenick \" }," \
diff --git a/libgimpconfig/gimpcolorconfig-enums.c b/libgimpconfig/gimpcolorconfig-enums.c
index 8fbe9da..f75e473 100644
--- a/libgimpconfig/gimpcolorconfig-enums.c
+++ b/libgimpconfig/gimpcolorconfig-enums.c
@@ -2,7 +2,7 @@
/* Generated data (by gimp-mkenums) */
#include "config.h"
-#include <glib-object.h>
+#include <gio/gio.h>
#include "libgimpbase/gimpbase.h"
#include "gimpcolorconfig-enums.h"
#include "libgimp/libgimp-intl.h"
diff --git a/libgimpconfig/gimpconfig-iface.c b/libgimpconfig/gimpconfig-iface.c
index 548e9ab..4defe87 100644
--- a/libgimpconfig/gimpconfig-iface.c
+++ b/libgimpconfig/gimpconfig-iface.c
@@ -23,7 +23,7 @@
#include <string.h>
-#include <glib-object.h>
+#include <gio/gio.h>
#include "libgimpbase/gimpbase.h"
diff --git a/libgimpconfig/gimpconfig-path.c b/libgimpconfig/gimpconfig-path.c
index 2578fe1..d6388d4 100644
--- a/libgimpconfig/gimpconfig-path.c
+++ b/libgimpconfig/gimpconfig-path.c
@@ -24,7 +24,7 @@
#include <stdio.h>
#include <string.h>
-#include <glib-object.h>
+#include <gio/gio.h>
#include "libgimpbase/gimpbase.h"
diff --git a/libgimpconfig/gimpconfig-utils.c b/libgimpconfig/gimpconfig-utils.c
index 270d22f..24209fe 100644
--- a/libgimpconfig/gimpconfig-utils.c
+++ b/libgimpconfig/gimpconfig-utils.c
@@ -21,7 +21,7 @@
#include "config.h"
-#include <glib-object.h>
+#include <gio/gio.h>
#include "libgimpbase/gimpbase.h"
diff --git a/libgimpconfig/gimpconfigwriter.c b/libgimpconfig/gimpconfigwriter.c
index b88243b..1f455be 100644
--- a/libgimpconfig/gimpconfigwriter.c
+++ b/libgimpconfig/gimpconfigwriter.c
@@ -31,7 +31,7 @@
#include <sys/types.h>
-#include <glib-object.h>
+#include <gio/gio.h>
#include <glib/gstdio.h>
#ifdef G_OS_WIN32
diff --git a/libgimpmodule/gimpmodule.c b/libgimpmodule/gimpmodule.c
index b0bc3e7..deae810 100644
--- a/libgimpmodule/gimpmodule.c
+++ b/libgimpmodule/gimpmodule.c
@@ -23,7 +23,7 @@
#include <string.h>
-#include <glib-object.h>
+#include <gio/gio.h>
#include "libgimpbase/gimpbase.h"
diff --git a/libgimpmodule/gimpmoduledb.c b/libgimpmodule/gimpmoduledb.c
index 2c32a39..e787ea6 100644
--- a/libgimpmodule/gimpmoduledb.c
+++ b/libgimpmodule/gimpmoduledb.c
@@ -20,7 +20,7 @@
#include <string.h>
-#include <glib-object.h>
+#include <gio/gio.h>
#include "libgimpbase/gimpbase.h"
diff --git a/libgimpwidgets/Makefile.am b/libgimpwidgets/Makefile.am
index 5075155..0b34bce 100644
--- a/libgimpwidgets/Makefile.am
+++ b/libgimpwidgets/Makefile.am
@@ -300,7 +300,7 @@ CLEANFILES = $(gen_sources)
gimpwidgetsenums.c: $(srcdir)/gimpwidgetsenums.h $(GIMP_MKENUMS)
$(AM_V_GEN) $(GIMP_MKENUMS) \
- --fhead "#include \"config.h\"\n#include <glib-object.h>\n#include
\"libgimpbase/gimpbase.h\"\n#include \"gimpwidgetsenums.h\"\n#include \"libgimp/libgimp-intl.h\"" \
+ --fhead "#include \"config.h\"\n#include <gio/gio.h>\n#include
\"libgimpbase/gimpbase.h\"\n#include \"gimpwidgetsenums.h\"\n#include \"libgimp/libgimp-intl.h\"" \
--fprod "\n/* enumerations from \"@filename \" */" \
--vhead "GType\n enum_name@_get_type (void)\n{\n static const G Type@Value values[] =\n {" \
--vprod " { @VALUENAME@, \"@VALUENAME \", \"@valuenick \" }," \
diff --git a/libgimpwidgets/gimpwidgetsenums.c b/libgimpwidgets/gimpwidgetsenums.c
index e5cf9ba..307f572 100644
--- a/libgimpwidgets/gimpwidgetsenums.c
+++ b/libgimpwidgets/gimpwidgetsenums.c
@@ -2,7 +2,7 @@
/* Generated data (by gimp-mkenums) */
#include "config.h"
-#include <glib-object.h>
+#include <gio/gio.h>
#include "libgimpbase/gimpbase.h"
#include "gimpwidgetsenums.h"
#include "libgimp/libgimp-intl.h"
diff --git a/tools/gimptool.c b/tools/gimptool.c
index b8ba02d..bd0ab0d 100644
--- a/tools/gimptool.c
+++ b/tools/gimptool.c
@@ -32,7 +32,7 @@
#include <sys/stat.h>
-#include <glib-object.h>
+#include <gio/gio.h>
#include "libgimpbase/gimpbase.h"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
