[gimp/metadata-browser] libgimpcolor: add GdkPixbuf <-> GeglBuffer utility functions

[Roman Joost <romanofski src gnome org>]

commit 7bf2bc323a8e8139ad0f9694f10e41b54678608b
Author: Michael Natterer <mitch gimp org>
Date:   Thu May 3 03:36:22 2012 +0200

    libgimpcolor: add GdkPixbuf <-> GeglBuffer utility functions
    
    and update tons of includes in libgimp and app.

 app/composite/Makefile.am                  |    4 +-
 app/composite/gimp-composite-generic.c     |    4 +-
 app/config/gimpconfig-dump.c               |    4 +-
 app/config/gimpcoreconfig.c                |    4 +-
 app/config/gimpdisplayconfig.c             |    4 +-
 app/config/gimpdisplayoptions.c            |    4 +-
 app/config/gimprc-deserialize.c            |    4 +-
 app/core/gimp-cairo.c                      |    1 +
 app/core/gimp-edit.c                       |    1 +
 app/core/gimp-utils.c                      |    1 +
 app/core/gimpbuffer.c                      |    6 +-
 app/core/gimpchannel-project.c             |    1 +
 app/core/gimpchannel.c                     |    1 +
 app/core/gimpcontext.c                     |    1 +
 app/core/gimpdrawable-blend.c              |    1 +
 app/core/gimpdrawable-bucket-fill.c        |    1 +
 app/core/gimpdrawable-offset.c             |    1 +
 app/core/gimpdrawable-stroke.c             |    1 +
 app/core/gimpdrawable-transform.c          |    1 +
 app/core/gimpdrawable.c                    |    1 +
 app/core/gimpgradient-load.c               |    1 +
 app/core/gimpgradient.c                    |    1 +
 app/core/gimpgrid.c                        |    1 +
 app/core/gimpimage-colormap.c              |    1 +
 app/core/gimpimage-contiguous-region.c     |    1 +
 app/core/gimpimage-convert.c               |    1 +
 app/core/gimpimage-merge.c                 |    1 +
 app/core/gimpimage-quick-mask.c            |    1 +
 app/core/gimpimage.c                       |    1 +
 app/core/gimpimageundo.c                   |    1 +
 app/core/gimplayer.c                       |    1 +
 app/core/gimppalette-import.c              |    1 +
 app/core/gimppalette-load.c                |    1 +
 app/core/gimppalette-save.c                |    1 +
 app/core/gimppalette.c                     |    1 +
 app/core/gimpparamspecs-duplicate.c        |    1 +
 app/core/gimppattern-load.c                |    7 +-
 app/core/gimppickable.c                    |    1 +
 app/core/gimpviewable.c                    |    5 +-
 app/gegl/gimp-gegl-config-proxy.c          |    1 +
 app/gegl/gimp-gegl-utils.c                 |   35 -----------
 app/gegl/gimp-gegl-utils.h                 |    4 -
 app/gegl/gimpcolorbalanceconfig.c          |    1 +
 app/gegl/gimpcurvesconfig.c                |    1 +
 app/gegl/gimplevelsconfig.c                |    1 +
 app/gegl/gimpoperationborder.c             |    1 +
 app/gegl/gimpoperationbrightnesscontrast.c |    1 +
 app/gegl/gimpoperationcagetransform.c      |    1 +
 app/gegl/gimpoperationcolorbalance.c       |    1 +
 app/gegl/gimpoperationcolorize.c           |    1 +
 app/gegl/gimpoperationcurves.c             |    1 -
 app/gegl/gimpoperationdesaturate.c         |    1 +
 app/gegl/gimpoperationequalize.c           |    1 +
 app/gegl/gimpoperationgrow.c               |    1 +
 app/gegl/gimpoperationhuesaturation.c      |    1 +
 app/gegl/gimpoperationlevels.c             |    1 -
 app/gegl/gimpoperationpointlayermode.c     |    1 +
 app/gegl/gimpoperationposterize.c          |    1 -
 app/gegl/gimpoperationshapeburst.c         |    1 +
 app/gegl/gimpoperationshrink.c             |    1 +
 app/gegl/gimpoperationthreshold.c          |    2 -
 app/paint-funcs/Makefile.am                |    2 +-
 app/paint-funcs/paint-funcs.c              |    1 +
 app/paint/gimpairbrush.c                   |    3 -
 app/paint/gimppaintbrush.c                 |    1 +
 app/pdb/brush-cmds.c                       |    2 +
 app/pdb/brush-select-cmds.c                |    2 +
 app/pdb/brushes-cmds.c                     |    2 +
 app/pdb/buffer-cmds.c                      |    2 +
 app/pdb/channel-cmds.c                     |    2 +
 app/pdb/color-cmds.c                       |    2 +
 app/pdb/context-cmds.c                     |    2 +
 app/pdb/convert-cmds.c                     |    2 +
 app/pdb/display-cmds.c                     |    2 +
 app/pdb/drawable-cmds.c                    |    2 +
 app/pdb/drawable-transform-cmds.c          |    2 +
 app/pdb/dynamics-cmds.c                    |    2 +
 app/pdb/edit-cmds.c                        |    2 +
 app/pdb/fileops-cmds.c                     |    2 +
 app/pdb/floating-sel-cmds.c                |    2 +
 app/pdb/font-select-cmds.c                 |    2 +
 app/pdb/fonts-cmds.c                       |    2 +
 app/pdb/gimp-cmds.c                        |    2 +
 app/pdb/gimp-pdb-compat.c                  |    1 +
 app/pdb/gimprc-cmds.c                      |    2 +
 app/pdb/gradient-cmds.c                    |    2 +
 app/pdb/gradient-select-cmds.c             |    2 +
 app/pdb/gradients-cmds.c                   |    2 +
 app/pdb/grid-cmds.c                        |    2 +
 app/pdb/guides-cmds.c                      |    2 +
 app/pdb/help-cmds.c                        |    2 +
 app/pdb/image-cmds.c                       |    2 +
 app/pdb/image-select-cmds.c                |    2 +
 app/pdb/item-cmds.c                        |    2 +
 app/pdb/item-transform-cmds.c              |    2 +
 app/pdb/layer-cmds.c                       |    2 +
 app/pdb/message-cmds.c                     |    2 +
 app/pdb/paint-tools-cmds.c                 |    2 +
 app/pdb/palette-cmds.c                     |    2 +
 app/pdb/palette-select-cmds.c              |    2 +
 app/pdb/palettes-cmds.c                    |    2 +
 app/pdb/paths-cmds.c                       |    2 +
 app/pdb/pattern-cmds.c                     |    2 +
 app/pdb/pattern-select-cmds.c              |    2 +
 app/pdb/patterns-cmds.c                    |    2 +
 app/pdb/plug-in-cmds.c                     |    2 +
 app/pdb/plug-in-compat-cmds.c              |    2 +
 app/pdb/procedural-db-cmds.c               |    2 +
 app/pdb/progress-cmds.c                    |    2 +
 app/pdb/selection-cmds.c                   |    2 +
 app/pdb/selection-tools-cmds.c             |    2 +
 app/pdb/text-layer-cmds.c                  |    2 +
 app/pdb/text-tool-cmds.c                   |    2 +
 app/pdb/transform-tools-cmds.c             |    2 +
 app/pdb/undo-cmds.c                        |    2 +
 app/pdb/unit-cmds.c                        |    2 +
 app/pdb/vectors-cmds.c                     |    2 +
 app/plug-in/plug-in-params.c               |    1 +
 app/text/gimptext-compat.c                 |    1 +
 app/text/gimptext-parasite.c               |    1 +
 app/text/gimptext.c                        |    1 +
 app/text/gimptextlayout.c                  |    1 +
 app/vectors/gimpvectors.c                  |    3 +-
 app/xcf/xcf-load.c                         |    1 +
 app/xcf/xcf-save.c                         |    1 +
 libgimp/gimppixbuf.h                       |    6 +-
 libgimpcolor/Makefile.am                   |   17 +++--
 libgimpcolor/gimpcolor.def                 |    2 +
 libgimpcolor/gimpcolor.h                   |    1 +
 libgimpcolor/gimppixbuf.c                  |   87 ++++++++++++++++++++++++++++
 libgimpcolor/gimppixbuf.h                  |   40 +++++++++++++
 libgimpconfig/Makefile.am                  |   12 ++--
 libgimpconfig/gimpcolorconfig.c            |    4 +-
 libgimpconfig/gimpconfig-deserialize.c     |    4 +-
 libgimpconfig/gimpconfig-serialize.c       |    4 +-
 libgimpconfig/gimpscanner.c                |    4 +-
 libgimpwidgets/Makefile.am                 |    4 +-
 libgimpwidgets/gimpcairo-utils.c           |    2 +-
 libgimpwidgets/gimpcellrenderercolor.c     |    2 +-
 libgimpwidgets/gimpcolorarea.c             |    2 +-
 libgimpwidgets/gimpcolorbutton.c           |    2 +-
 libgimpwidgets/gimpcolordisplay.c          |    2 +-
 libgimpwidgets/gimpcolordisplaystack.c     |    2 +-
 libgimpwidgets/gimpcolorhexentry.c         |    2 +-
 libgimpwidgets/gimpcolornotebook.c         |    2 +-
 libgimpwidgets/gimpcolorscale.c            |    2 +-
 libgimpwidgets/gimpcolorscales.c           |    2 +-
 libgimpwidgets/gimpcolorselect.c           |    2 +-
 libgimpwidgets/gimpcolorselection.c        |    2 +-
 libgimpwidgets/gimpcolorselector.c         |    2 +-
 libgimpwidgets/gimpcontroller.c            |    2 +-
 libgimpwidgets/gimppickbutton.c            |    2 +-
 libgimpwidgets/gimppropwidgets.c           |    2 +-
 libgimpwidgets/gimpscaleentry.c            |    2 +-
 libgimpwidgets/gimpwidgets.c               |    2 +-
 modules/Makefile.am                        |    2 +-
 modules/color-selector-cmyk-lcms.c         |    2 +-
 modules/color-selector-cmyk.c              |    2 +-
 modules/color-selector-water.c             |    2 +-
 modules/color-selector-wheel.c             |    2 +-
 modules/display-filter-color-blind.c       |    2 +-
 modules/display-filter-gamma.c             |    2 +-
 modules/display-filter-high-contrast.c     |    2 +-
 modules/display-filter-lcms.c              |    2 +-
 modules/display-filter-proof.c             |    2 +-
 plug-ins/pygimp/pygimpcolor.h              |    6 +--
 tools/pdbgen/app.pl                        |    1 +
 167 files changed, 374 insertions(+), 129 deletions(-)
---
diff --git a/app/composite/Makefile.am b/app/composite/Makefile.am
index 3e2c076..f13fbb8 100644
--- a/app/composite/Makefile.am
+++ b/app/composite/Makefile.am
@@ -11,9 +11,9 @@ INCLUDES = \
 	-I$(top_srcdir)		\
 	-I$(top_builddir)/app	\
 	-I$(top_srcdir)/app	\
-	$(BABL_CFLAGS)		\
+	$(GEGL_CFLAGS)		\
 	$(CAIRO_CFLAGS)		\
-	$(GLIB_CFLAGS)		\
+	$(GDK_PIXBUF_CFLAGS)	\
 	-I$(includedir)
 
 composite_libraries = \
diff --git a/app/composite/gimp-composite-generic.c b/app/composite/gimp-composite-generic.c
index 590246f..2251c42 100644
--- a/app/composite/gimp-composite-generic.c
+++ b/app/composite/gimp-composite-generic.c
@@ -26,9 +26,9 @@
 #include <string.h>
 #include <stdio.h>
 
-#include <babl/babl.h>
 #include <cairo.h>
-#include <glib-object.h>
+#include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
 
 #include "libgimpcolor/gimpcolor.h"
 
diff --git a/app/config/gimpconfig-dump.c b/app/config/gimpconfig-dump.c
index 9cb75ca..cd639de 100644
--- a/app/config/gimpconfig-dump.c
+++ b/app/config/gimpconfig-dump.c
@@ -27,9 +27,9 @@
 #include <unistd.h>
 #endif
 
-#include <babl/babl.h>
 #include <cairo.h>
-#include <glib-object.h>
+#include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
 
 #include "libgimpbase/gimpbase.h"
 #include "libgimpcolor/gimpcolor.h"
diff --git a/app/config/gimpcoreconfig.c b/app/config/gimpcoreconfig.c
index 05a78e2..676e705 100644
--- a/app/config/gimpcoreconfig.c
+++ b/app/config/gimpcoreconfig.c
@@ -20,9 +20,9 @@
 
 #include "config.h"
 
-#include <babl/babl.h>
 #include <cairo.h>
-#include <glib-object.h>
+#include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
 
 #include "libgimpbase/gimpbase.h"
 #include "libgimpcolor/gimpcolor.h"
diff --git a/app/config/gimpdisplayconfig.c b/app/config/gimpdisplayconfig.c
index dfb11d5..4d8be48 100644
--- a/app/config/gimpdisplayconfig.c
+++ b/app/config/gimpdisplayconfig.c
@@ -20,9 +20,9 @@
 
 #include "config.h"
 
-#include <babl/babl.h>
 #include <cairo.h>
-#include <glib-object.h>
+#include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
 
 #include "libgimpbase/gimpbase.h"
 #include "libgimpcolor/gimpcolor.h"
diff --git a/app/config/gimpdisplayoptions.c b/app/config/gimpdisplayoptions.c
index baa8617..132e732 100644
--- a/app/config/gimpdisplayoptions.c
+++ b/app/config/gimpdisplayoptions.c
@@ -20,9 +20,9 @@
 
 #include "config.h"
 
-#include <babl/babl.h>
 #include <cairo.h>
-#include <glib-object.h>
+#include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
 
 #include "libgimpbase/gimpbase.h"
 #include "libgimpmath/gimpmath.h"
diff --git a/app/config/gimprc-deserialize.c b/app/config/gimprc-deserialize.c
index bec0b5a..1d58642 100644
--- a/app/config/gimprc-deserialize.c
+++ b/app/config/gimprc-deserialize.c
@@ -20,9 +20,9 @@
 
 #include "config.h"
 
-#include <babl/babl.h>
 #include <cairo.h>
-#include <glib-object.h>
+#include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
 
 #include "libgimpcolor/gimpcolor.h"
 #include "libgimpmath/gimpmath.h"
diff --git a/app/core/gimp-cairo.c b/app/core/gimp-cairo.c
index 0ecb6c7..cda6b07 100644
--- a/app/core/gimp-cairo.c
+++ b/app/core/gimp-cairo.c
@@ -25,6 +25,7 @@
 
 #include <cairo.h>
 #include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
 
 #include "libgimpcolor/gimpcolor.h"
 
diff --git a/app/core/gimp-edit.c b/app/core/gimp-edit.c
index a33d67c..c065cc1 100644
--- a/app/core/gimp-edit.c
+++ b/app/core/gimp-edit.c
@@ -21,6 +21,7 @@
 
 #include <cairo.h>
 #include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
 
 #include "libgimpbase/gimpbase.h"
 #include "libgimpcolor/gimpcolor.h"
diff --git a/app/core/gimp-utils.c b/app/core/gimp-utils.c
index 23c20ed..34801bb 100644
--- a/app/core/gimp-utils.c
+++ b/app/core/gimp-utils.c
@@ -48,6 +48,7 @@
 #include <cairo.h>
 #include <gegl.h>
 #include <gobject/gvaluecollector.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
 
 #include "libgimpbase/gimpbase.h"
 #include "libgimpmath/gimpmath.h"
diff --git a/app/core/gimpbuffer.c b/app/core/gimpbuffer.c
index c43bc33..b0afd33 100644
--- a/app/core/gimpbuffer.c
+++ b/app/core/gimpbuffer.c
@@ -17,13 +17,15 @@
 
 #include "config.h"
 
+#include <cairo.h>
 #include <gegl.h>
-#include <glib-object.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "libgimpcolor/gimpcolor.h"
 
 #include "core-types.h"
 
 #include "gegl/gimp-babl.h"
-#include "gegl/gimp-gegl-utils.h"
 
 #include "gimp-utils.h"
 #include "gimpbuffer.h"
diff --git a/app/core/gimpchannel-project.c b/app/core/gimpchannel-project.c
index 21a90ea..1c20279 100644
--- a/app/core/gimpchannel-project.c
+++ b/app/core/gimpchannel-project.c
@@ -21,6 +21,7 @@
 
 #include <cairo.h>
 #include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
 
 #include "libgimpcolor/gimpcolor.h"
 
diff --git a/app/core/gimpchannel.c b/app/core/gimpchannel.c
index fa78ccf..24f8830 100644
--- a/app/core/gimpchannel.c
+++ b/app/core/gimpchannel.c
@@ -21,6 +21,7 @@
 
 #include <cairo.h>
 #include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
 
 #include "libgimpcolor/gimpcolor.h"
 
diff --git a/app/core/gimpcontext.c b/app/core/gimpcontext.c
index 04ea972..fc9644c 100644
--- a/app/core/gimpcontext.c
+++ b/app/core/gimpcontext.c
@@ -22,6 +22,7 @@
 
 #include <cairo.h>
 #include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
 
 #include "libgimpbase/gimpbase.h"
 #include "libgimpcolor/gimpcolor.h"
diff --git a/app/core/gimpdrawable-blend.c b/app/core/gimpdrawable-blend.c
index 740b370..eaf99c8 100644
--- a/app/core/gimpdrawable-blend.c
+++ b/app/core/gimpdrawable-blend.c
@@ -22,6 +22,7 @@
 
 #include <cairo.h>
 #include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
 
 #include "libgimpbase/gimpbase.h"
 #include "libgimpmath/gimpmath.h"
diff --git a/app/core/gimpdrawable-bucket-fill.c b/app/core/gimpdrawable-bucket-fill.c
index 05e86be..231b36b 100644
--- a/app/core/gimpdrawable-bucket-fill.c
+++ b/app/core/gimpdrawable-bucket-fill.c
@@ -21,6 +21,7 @@
 
 #include <cairo.h>
 #include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
 
 #include "libgimpcolor/gimpcolor.h"
 
diff --git a/app/core/gimpdrawable-offset.c b/app/core/gimpdrawable-offset.c
index 385c289..2fe026c 100644
--- a/app/core/gimpdrawable-offset.c
+++ b/app/core/gimpdrawable-offset.c
@@ -21,6 +21,7 @@
 
 #include <cairo.h>
 #include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
 
 #include "libgimpcolor/gimpcolor.h"
 #include "libgimpmath/gimpmath.h"
diff --git a/app/core/gimpdrawable-stroke.c b/app/core/gimpdrawable-stroke.c
index 1499b72..d341efc 100644
--- a/app/core/gimpdrawable-stroke.c
+++ b/app/core/gimpdrawable-stroke.c
@@ -22,6 +22,7 @@
 
 #include <cairo.h>
 #include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
 
 #include "libgimpbase/gimpbase.h"
 #include "libgimpmath/gimpmath.h"
diff --git a/app/core/gimpdrawable-transform.c b/app/core/gimpdrawable-transform.c
index a272ec4..d9b4e7e 100644
--- a/app/core/gimpdrawable-transform.c
+++ b/app/core/gimpdrawable-transform.c
@@ -22,6 +22,7 @@
 
 #include <cairo.h>
 #include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
 
 #include "libgimpbase/gimpbase.h"
 #include "libgimpcolor/gimpcolor.h"
diff --git a/app/core/gimpdrawable.c b/app/core/gimpdrawable.c
index 1f6c161..6dbdf0c 100644
--- a/app/core/gimpdrawable.c
+++ b/app/core/gimpdrawable.c
@@ -20,6 +20,7 @@
 #include <cairo.h>
 #include <gegl.h>
 #include <gegl-plugin.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
 
 #include "libgimpbase/gimpbase.h"
 #include "libgimpcolor/gimpcolor.h"
diff --git a/app/core/gimpgradient-load.c b/app/core/gimpgradient-load.c
index 85ad9b7..7cb8e7c 100644
--- a/app/core/gimpgradient-load.c
+++ b/app/core/gimpgradient-load.c
@@ -24,6 +24,7 @@
 #include <cairo.h>
 #include <gegl.h>
 #include <glib/gstdio.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
 
 #include "libgimpbase/gimpbase.h"
 #include "libgimpcolor/gimpcolor.h"
diff --git a/app/core/gimpgradient.c b/app/core/gimpgradient.c
index 9921fe8..68a83ec 100644
--- a/app/core/gimpgradient.c
+++ b/app/core/gimpgradient.c
@@ -21,6 +21,7 @@
 
 #include <cairo.h>
 #include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
 
 #include "libgimpcolor/gimpcolor.h"
 #include "libgimpmath/gimpmath.h"
diff --git a/app/core/gimpgrid.c b/app/core/gimpgrid.c
index 674941e..7ef1c67 100644
--- a/app/core/gimpgrid.c
+++ b/app/core/gimpgrid.c
@@ -24,6 +24,7 @@
 
 #include <cairo.h>
 #include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
 
 #include "libgimpbase/gimpbase.h"
 #include "libgimpconfig/gimpconfig.h"
diff --git a/app/core/gimpimage-colormap.c b/app/core/gimpimage-colormap.c
index da66cc0..80c9399 100644
--- a/app/core/gimpimage-colormap.c
+++ b/app/core/gimpimage-colormap.c
@@ -21,6 +21,7 @@
 
 #include <cairo.h>
 #include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
 
 #include "libgimpcolor/gimpcolor.h"
 
diff --git a/app/core/gimpimage-contiguous-region.c b/app/core/gimpimage-contiguous-region.c
index a212445..2d1b227 100644
--- a/app/core/gimpimage-contiguous-region.c
+++ b/app/core/gimpimage-contiguous-region.c
@@ -21,6 +21,7 @@
 
 #include <cairo.h>
 #include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
 
 #include "libgimpcolor/gimpcolor.h"
 #include "libgimpmath/gimpmath.h"
diff --git a/app/core/gimpimage-convert.c b/app/core/gimpimage-convert.c
index 1b4aa39..7625295 100644
--- a/app/core/gimpimage-convert.c
+++ b/app/core/gimpimage-convert.c
@@ -134,6 +134,7 @@
 
 #include <cairo.h>
 #include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
 
 #include "libgimpcolor/gimpcolor.h"
 #include "libgimpmath/gimpmath.h"
diff --git a/app/core/gimpimage-merge.c b/app/core/gimpimage-merge.c
index 6f87f1b..84513cf 100644
--- a/app/core/gimpimage-merge.c
+++ b/app/core/gimpimage-merge.c
@@ -19,6 +19,7 @@
 
 #include <cairo.h>
 #include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
 
 #include "libgimpcolor/gimpcolor.h"
 #include "libgimpmath/gimpmath.h"
diff --git a/app/core/gimpimage-quick-mask.c b/app/core/gimpimage-quick-mask.c
index 7072809..a36a14f 100644
--- a/app/core/gimpimage-quick-mask.c
+++ b/app/core/gimpimage-quick-mask.c
@@ -19,6 +19,7 @@
 
 #include <cairo.h>
 #include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
 
 #include "libgimpcolor/gimpcolor.h"
 
diff --git a/app/core/gimpimage.c b/app/core/gimpimage.c
index 8ca7ecf..4c93924 100644
--- a/app/core/gimpimage.c
+++ b/app/core/gimpimage.c
@@ -22,6 +22,7 @@
 
 #include <cairo.h>
 #include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
 
 #include "libgimpcolor/gimpcolor.h"
 #include "libgimpmath/gimpmath.h"
diff --git a/app/core/gimpimageundo.c b/app/core/gimpimageundo.c
index e10b5b1..72b312c 100644
--- a/app/core/gimpimageundo.c
+++ b/app/core/gimpimageundo.c
@@ -21,6 +21,7 @@
 
 #include <cairo.h>
 #include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
 
 #include "libgimpbase/gimpbase.h"
 #include "libgimpcolor/gimpcolor.h"
diff --git a/app/core/gimplayer.c b/app/core/gimplayer.c
index e02d168..3edbc60 100644
--- a/app/core/gimplayer.c
+++ b/app/core/gimplayer.c
@@ -22,6 +22,7 @@
 
 #include <cairo.h>
 #include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
 
 #include "libgimpbase/gimpbase.h"
 #include "libgimpcolor/gimpcolor.h"
diff --git a/app/core/gimppalette-import.c b/app/core/gimppalette-import.c
index c2cd608..2a15cd3 100644
--- a/app/core/gimppalette-import.c
+++ b/app/core/gimppalette-import.c
@@ -21,6 +21,7 @@
 
 #include <cairo.h>
 #include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
 
 #include "libgimpbase/gimpbase.h"
 #include "libgimpcolor/gimpcolor.h"
diff --git a/app/core/gimppalette-load.c b/app/core/gimppalette-load.c
index 453d857..377eb9a 100644
--- a/app/core/gimppalette-load.c
+++ b/app/core/gimppalette-load.c
@@ -33,6 +33,7 @@
 
 #include <cairo.h>
 #include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
 #include <glib/gstdio.h>
 
 #ifdef G_OS_WIN32
diff --git a/app/core/gimppalette-save.c b/app/core/gimppalette-save.c
index f54ca27..341076c 100644
--- a/app/core/gimppalette-save.c
+++ b/app/core/gimppalette-save.c
@@ -27,6 +27,7 @@
 
 #include <cairo.h>
 #include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
 #include <glib/gstdio.h>
 
 #include "libgimpbase/gimpbase.h"
diff --git a/app/core/gimppalette.c b/app/core/gimppalette.c
index e4e7b0f..4f11eb5 100644
--- a/app/core/gimppalette.c
+++ b/app/core/gimppalette.c
@@ -21,6 +21,7 @@
 
 #include <cairo.h>
 #include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
 
 #include "libgimpbase/gimpbase.h"
 #include "libgimpcolor/gimpcolor.h"
diff --git a/app/core/gimpparamspecs-duplicate.c b/app/core/gimpparamspecs-duplicate.c
index 6b233b6..6cb550c 100644
--- a/app/core/gimpparamspecs-duplicate.c
+++ b/app/core/gimpparamspecs-duplicate.c
@@ -23,6 +23,7 @@
 #include <cairo.h>
 #include <gegl.h>
 #include <gegl-paramspecs.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
 
 #include "libgimpcolor/gimpcolor.h"
 #include "libgimpconfig/gimpconfig.h"
diff --git a/app/core/gimppattern-load.c b/app/core/gimppattern-load.c
index e839e29..45b2be1 100644
--- a/app/core/gimppattern-load.c
+++ b/app/core/gimppattern-load.c
@@ -30,7 +30,7 @@
 
 #include <fcntl.h>
 
-#include <gegl.h>
+#include <glib.h>
 #include <glib/gstdio.h>
 
 #ifdef G_OS_WIN32
@@ -41,14 +41,15 @@
 #define _O_BINARY 0
 #endif
 
+#include <cairo.h>
 #include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
 
 #include "libgimpbase/gimpbase.h"
+#include "libgimpcolor/gimpcolor.h"
 
 #include "core-types.h"
 
-#include "gegl/gimp-gegl-utils.h"
-
 #include "gimppattern.h"
 #include "gimppattern-header.h"
 #include "gimppattern-load.h"
diff --git a/app/core/gimppickable.c b/app/core/gimppickable.c
index 36e6c17..2fe1ae9 100644
--- a/app/core/gimppickable.c
+++ b/app/core/gimppickable.c
@@ -28,6 +28,7 @@
 
 #include <cairo.h>
 #include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
 
 #include "libgimpcolor/gimpcolor.h"
 
diff --git a/app/core/gimpviewable.c b/app/core/gimpviewable.c
index b87f187..89df190 100644
--- a/app/core/gimpviewable.c
+++ b/app/core/gimpviewable.c
@@ -22,15 +22,16 @@
 
 #include <string.h>
 
+#include <cairo.h>
 #include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
 
+#include "libgimpcolor/gimpcolor.h"
 #include "libgimpmath/gimpmath.h"
 #include "libgimpconfig/gimpconfig.h"
 
 #include "core-types.h"
 
-#include "gegl/gimp-gegl-utils.h"
-
 #include "gimp-utils.h"
 #include "gimpcontext.h"
 #include "gimpmarshal.h"
diff --git a/app/gegl/gimp-gegl-config-proxy.c b/app/gegl/gimp-gegl-config-proxy.c
index 0cdf4c8..093ead9 100644
--- a/app/gegl/gimp-gegl-config-proxy.c
+++ b/app/gegl/gimp-gegl-config-proxy.c
@@ -21,6 +21,7 @@
 
 #include <cairo.h>
 #include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
 
 #include "libgimpcolor/gimpcolor.h"
 #include "libgimpconfig/gimpconfig.h"
diff --git a/app/gegl/gimp-gegl-utils.c b/app/gegl/gimp-gegl-utils.c
index ba5b38c..a37cf78 100644
--- a/app/gegl/gimp-gegl-utils.c
+++ b/app/gegl/gimp-gegl-utils.c
@@ -48,41 +48,6 @@ gimp_interpolation_to_gegl_filter (GimpInterpolationType interpolation)
   return "nearest";
 }
 
-const Babl *
-gimp_pixbuf_get_format (GdkPixbuf *pixbuf)
-{
-  g_return_val_if_fail (GDK_IS_PIXBUF (pixbuf), NULL);
-
-  switch (gdk_pixbuf_get_n_channels (pixbuf))
-    {
-    case 3: return babl_format ("R'G'B' u8");
-    case 4: return babl_format ("R'G'B'A u8");
-    }
-
-  g_return_val_if_reached (NULL);
-}
-
-GeglBuffer *
-gimp_pixbuf_create_buffer (GdkPixbuf *pixbuf)
-{
-  gint width;
-  gint height;
-  gint rowstride;
-
-  g_return_val_if_fail (GDK_IS_PIXBUF (pixbuf), NULL);
-
-  width     = gdk_pixbuf_get_width (pixbuf);
-  height    = gdk_pixbuf_get_height (pixbuf);
-  rowstride = gdk_pixbuf_get_rowstride (pixbuf);
-
-  return gegl_buffer_linear_new_from_data (gdk_pixbuf_get_pixels (pixbuf),
-                                           gimp_pixbuf_get_format (pixbuf),
-                                           GEGL_RECTANGLE (0, 0, width, height),
-                                           rowstride,
-                                           (GDestroyNotify) g_object_unref,
-                                           g_object_ref (pixbuf));
-}
-
 GeglBuffer *
 gimp_gegl_buffer_new (const GeglRectangle *rect,
                       const Babl          *format)
diff --git a/app/gegl/gimp-gegl-utils.h b/app/gegl/gimp-gegl-utils.h
index aec50db..c2ba9a4 100644
--- a/app/gegl/gimp-gegl-utils.h
+++ b/app/gegl/gimp-gegl-utils.h
@@ -34,10 +34,6 @@ GeglBuffer  * gimp_gegl_buffer_dup               (GeglBuffer            *buffer)
 GeglBuffer  * gimp_tile_manager_create_buffer    (TileManager           *tm,
                                                   const Babl            *format);
 TileManager * gimp_gegl_buffer_get_tiles         (GeglBuffer            *buffer);
-
-const Babl  * gimp_pixbuf_get_format             (GdkPixbuf             *pixbuf);
-GeglBuffer  * gimp_pixbuf_create_buffer          (GdkPixbuf             *pixbuf);
-
 void          gimp_gegl_buffer_refetch_tiles     (GeglBuffer            *buffer);
 
 GeglColor   * gimp_gegl_color_new                (const GimpRGB         *rgb);
diff --git a/app/gegl/gimpcolorbalanceconfig.c b/app/gegl/gimpcolorbalanceconfig.c
index 16b3817..426a527 100644
--- a/app/gegl/gimpcolorbalanceconfig.c
+++ b/app/gegl/gimpcolorbalanceconfig.c
@@ -22,6 +22,7 @@
 
 #include <cairo.h>
 #include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
 
 #include "libgimpcolor/gimpcolor.h"
 #include "libgimpmath/gimpmath.h"
diff --git a/app/gegl/gimpcurvesconfig.c b/app/gegl/gimpcurvesconfig.c
index b31b598..c4e5723 100644
--- a/app/gegl/gimpcurvesconfig.c
+++ b/app/gegl/gimpcurvesconfig.c
@@ -24,6 +24,7 @@
 
 #include <cairo.h>
 #include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
 #include <glib/gstdio.h>
 
 #include "libgimpcolor/gimpcolor.h"
diff --git a/app/gegl/gimplevelsconfig.c b/app/gegl/gimplevelsconfig.c
index 0c79c3b..0ed8e79 100644
--- a/app/gegl/gimplevelsconfig.c
+++ b/app/gegl/gimplevelsconfig.c
@@ -25,6 +25,7 @@
 
 #include <cairo.h>
 #include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
 #include <glib/gstdio.h>
 
 #include "libgimpcolor/gimpcolor.h"
diff --git a/app/gegl/gimpoperationborder.c b/app/gegl/gimpoperationborder.c
index 5db75e7..1c0f124 100644
--- a/app/gegl/gimpoperationborder.c
+++ b/app/gegl/gimpoperationborder.c
@@ -22,6 +22,7 @@
 
 #include <cairo.h>
 #include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
 
 #include "libgimpcolor/gimpcolor.h"
 #include "libgimpmath/gimpmath.h"
diff --git a/app/gegl/gimpoperationbrightnesscontrast.c b/app/gegl/gimpoperationbrightnesscontrast.c
index 74fd8a8..d0f9ac8 100644
--- a/app/gegl/gimpoperationbrightnesscontrast.c
+++ b/app/gegl/gimpoperationbrightnesscontrast.c
@@ -22,6 +22,7 @@
 
 #include <cairo.h>
 #include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
 
 #include "libgimpcolor/gimpcolor.h"
 #include "libgimpmath/gimpmath.h"
diff --git a/app/gegl/gimpoperationcagetransform.c b/app/gegl/gimpoperationcagetransform.c
index 7f7a2a0..0d39c67 100644
--- a/app/gegl/gimpoperationcagetransform.c
+++ b/app/gegl/gimpoperationcagetransform.c
@@ -21,6 +21,7 @@
 
 #include <cairo.h>
 #include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
 
 #include "libgimpcolor/gimpcolor.h"
 #include "libgimpmath/gimpmath.h"
diff --git a/app/gegl/gimpoperationcolorbalance.c b/app/gegl/gimpoperationcolorbalance.c
index d04380c..102a7cc 100644
--- a/app/gegl/gimpoperationcolorbalance.c
+++ b/app/gegl/gimpoperationcolorbalance.c
@@ -22,6 +22,7 @@
 
 #include <cairo.h>
 #include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
 
 #include "libgimpcolor/gimpcolor.h"
 #include "libgimpmath/gimpmath.h"
diff --git a/app/gegl/gimpoperationcolorize.c b/app/gegl/gimpoperationcolorize.c
index b96f713..048b262 100644
--- a/app/gegl/gimpoperationcolorize.c
+++ b/app/gegl/gimpoperationcolorize.c
@@ -22,6 +22,7 @@
 
 #include <cairo.h>
 #include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
 
 #include "libgimpcolor/gimpcolor.h"
 
diff --git a/app/gegl/gimpoperationcurves.c b/app/gegl/gimpoperationcurves.c
index e6089b1..4002502 100644
--- a/app/gegl/gimpoperationcurves.c
+++ b/app/gegl/gimpoperationcurves.c
@@ -23,7 +23,6 @@
 #include <cairo.h>
 #include <gegl.h>
 
-#include "libgimpcolor/gimpcolor.h"
 #include "libgimpmath/gimpmath.h"
 
 #include "gimp-gegl-types.h"
diff --git a/app/gegl/gimpoperationdesaturate.c b/app/gegl/gimpoperationdesaturate.c
index b213ea9..ae435e9 100644
--- a/app/gegl/gimpoperationdesaturate.c
+++ b/app/gegl/gimpoperationdesaturate.c
@@ -22,6 +22,7 @@
 
 #include <cairo.h>
 #include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
 
 #include "libgimpcolor/gimpcolor.h"
 
diff --git a/app/gegl/gimpoperationequalize.c b/app/gegl/gimpoperationequalize.c
index c83951e..38cb8ad 100644
--- a/app/gegl/gimpoperationequalize.c
+++ b/app/gegl/gimpoperationequalize.c
@@ -22,6 +22,7 @@
 
 #include <cairo.h>
 #include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
 
 #include "libgimpcolor/gimpcolor.h"
 #include "libgimpmath/gimpmath.h"
diff --git a/app/gegl/gimpoperationgrow.c b/app/gegl/gimpoperationgrow.c
index ae96c7b..431b103 100644
--- a/app/gegl/gimpoperationgrow.c
+++ b/app/gegl/gimpoperationgrow.c
@@ -22,6 +22,7 @@
 
 #include <cairo.h>
 #include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
 
 #include "libgimpcolor/gimpcolor.h"
 #include "libgimpmath/gimpmath.h"
diff --git a/app/gegl/gimpoperationhuesaturation.c b/app/gegl/gimpoperationhuesaturation.c
index 4d8e8e0..5d35d53 100644
--- a/app/gegl/gimpoperationhuesaturation.c
+++ b/app/gegl/gimpoperationhuesaturation.c
@@ -22,6 +22,7 @@
 
 #include <cairo.h>
 #include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
 
 #include "libgimpcolor/gimpcolor.h"
 #include "libgimpmath/gimpmath.h"
diff --git a/app/gegl/gimpoperationlevels.c b/app/gegl/gimpoperationlevels.c
index 2c62670..f36f3e77 100644
--- a/app/gegl/gimpoperationlevels.c
+++ b/app/gegl/gimpoperationlevels.c
@@ -23,7 +23,6 @@
 #include <cairo.h>
 #include <gegl.h>
 
-#include "libgimpcolor/gimpcolor.h"
 #include "libgimpmath/gimpmath.h"
 
 #include "gimp-gegl-types.h"
diff --git a/app/gegl/gimpoperationpointlayermode.c b/app/gegl/gimpoperationpointlayermode.c
index 67dec95..155d634 100644
--- a/app/gegl/gimpoperationpointlayermode.c
+++ b/app/gegl/gimpoperationpointlayermode.c
@@ -23,6 +23,7 @@
 
 #include <cairo.h>
 #include <gegl-plugin.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
 
 #include "libgimpcolor/gimpcolor.h"
 
diff --git a/app/gegl/gimpoperationposterize.c b/app/gegl/gimpoperationposterize.c
index b08413a..777c35e 100644
--- a/app/gegl/gimpoperationposterize.c
+++ b/app/gegl/gimpoperationposterize.c
@@ -23,7 +23,6 @@
 #include <cairo.h>
 #include <gegl.h>
 
-#include "libgimpcolor/gimpcolor.h"
 #include "libgimpmath/gimpmath.h"
 
 #include "gimp-gegl-types.h"
diff --git a/app/gegl/gimpoperationshapeburst.c b/app/gegl/gimpoperationshapeburst.c
index 73aa446..ff048c9 100644
--- a/app/gegl/gimpoperationshapeburst.c
+++ b/app/gegl/gimpoperationshapeburst.c
@@ -22,6 +22,7 @@
 
 #include <cairo.h>
 #include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
 
 #include "libgimpcolor/gimpcolor.h"
 #include "libgimpmath/gimpmath.h"
diff --git a/app/gegl/gimpoperationshrink.c b/app/gegl/gimpoperationshrink.c
index e43064b..e5d34ea 100644
--- a/app/gegl/gimpoperationshrink.c
+++ b/app/gegl/gimpoperationshrink.c
@@ -22,6 +22,7 @@
 
 #include <cairo.h>
 #include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
 
 #include "libgimpcolor/gimpcolor.h"
 #include "libgimpmath/gimpmath.h"
diff --git a/app/gegl/gimpoperationthreshold.c b/app/gegl/gimpoperationthreshold.c
index 0090c0d..8e60e77 100644
--- a/app/gegl/gimpoperationthreshold.c
+++ b/app/gegl/gimpoperationthreshold.c
@@ -23,8 +23,6 @@
 #include <cairo.h>
 #include <gegl.h>
 
-#include "libgimpcolor/gimpcolor.h"
-
 #include "gimp-gegl-types.h"
 
 #include "gimpoperationthreshold.h"
diff --git a/app/paint-funcs/Makefile.am b/app/paint-funcs/Makefile.am
index d1e4be3..acfa662 100644
--- a/app/paint-funcs/Makefile.am
+++ b/app/paint-funcs/Makefile.am
@@ -13,9 +13,9 @@ INCLUDES = \
 	-I$(top_srcdir)		\
 	-I$(top_builddir)/app	\
 	-I$(top_srcdir)/app	\
-	$(BABL_CFLAGS)		\
 	$(CAIRO_CFLAGS)		\
 	$(GEGL_CFLAGS)		\
+	$(GDK_PIXBUF_CFLAGS)	\
 	-I$(includedir)
 
 noinst_LIBRARIES = libapppaint-funcs.a
diff --git a/app/paint-funcs/paint-funcs.c b/app/paint-funcs/paint-funcs.c
index 6d03bdc..6ed9e80 100644
--- a/app/paint-funcs/paint-funcs.c
+++ b/app/paint-funcs/paint-funcs.c
@@ -21,6 +21,7 @@
 
 #include <cairo.h>
 #include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
 
 #include "libgimpcolor/gimpcolor.h"
 #include "libgimpmath/gimpmath.h"
diff --git a/app/paint/gimpairbrush.c b/app/paint/gimpairbrush.c
index d83cf12..45d2b9d 100644
--- a/app/paint/gimpairbrush.c
+++ b/app/paint/gimpairbrush.c
@@ -17,11 +17,8 @@
 
 #include "config.h"
 
-#include <cairo.h>
 #include <gegl.h>
 
-#include "libgimpcolor/gimpcolor.h"
-
 #include "paint-types.h"
 
 #include "core/gimp.h"
diff --git a/app/paint/gimppaintbrush.c b/app/paint/gimppaintbrush.c
index 7aa703b..ff203a0 100644
--- a/app/paint/gimppaintbrush.c
+++ b/app/paint/gimppaintbrush.c
@@ -19,6 +19,7 @@
 
 #include <cairo.h>
 #include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
 
 #include "libgimpcolor/gimpcolor.h"
 #include "libgimpmath/gimpmath.h"
diff --git a/app/pdb/brush-cmds.c b/app/pdb/brush-cmds.c
index bde634b..bd8fd24 100644
--- a/app/pdb/brush-cmds.c
+++ b/app/pdb/brush-cmds.c
@@ -23,6 +23,8 @@
 
 #include <gegl.h>
 
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
 #include "pdb-types.h"
 
 #include "core/gimp.h"
diff --git a/app/pdb/brush-select-cmds.c b/app/pdb/brush-select-cmds.c
index 2e11def..73c1d32 100644
--- a/app/pdb/brush-select-cmds.c
+++ b/app/pdb/brush-select-cmds.c
@@ -21,6 +21,8 @@
 
 #include <gegl.h>
 
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
 #include "pdb-types.h"
 
 #include "core/gimp.h"
diff --git a/app/pdb/brushes-cmds.c b/app/pdb/brushes-cmds.c
index 3cfc452..168f220 100644
--- a/app/pdb/brushes-cmds.c
+++ b/app/pdb/brushes-cmds.c
@@ -23,6 +23,8 @@
 
 #include <gegl.h>
 
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
 #include "pdb-types.h"
 
 #include "core/gimp.h"
diff --git a/app/pdb/buffer-cmds.c b/app/pdb/buffer-cmds.c
index b4bc986..a3d5d8c 100644
--- a/app/pdb/buffer-cmds.c
+++ b/app/pdb/buffer-cmds.c
@@ -23,6 +23,8 @@
 
 #include <gegl.h>
 
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
 #include "pdb-types.h"
 
 #include "core/gimp.h"
diff --git a/app/pdb/channel-cmds.c b/app/pdb/channel-cmds.c
index 515a70c..087c7bc 100644
--- a/app/pdb/channel-cmds.c
+++ b/app/pdb/channel-cmds.c
@@ -23,6 +23,8 @@
 
 #include <gegl.h>
 
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
 #include "libgimpbase/gimpbase.h"
 #include "libgimpcolor/gimpcolor.h"
 
diff --git a/app/pdb/color-cmds.c b/app/pdb/color-cmds.c
index 3273cf6..b4e0373 100644
--- a/app/pdb/color-cmds.c
+++ b/app/pdb/color-cmds.c
@@ -21,6 +21,8 @@
 
 #include <gegl.h>
 
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
 #include "pdb-types.h"
 
 #include "core/gimpdrawable-equalize.h"
diff --git a/app/pdb/context-cmds.c b/app/pdb/context-cmds.c
index 9ebe48b..f13c424 100644
--- a/app/pdb/context-cmds.c
+++ b/app/pdb/context-cmds.c
@@ -23,6 +23,8 @@
 
 #include <gegl.h>
 
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
 #include "libgimpcolor/gimpcolor.h"
 #include "libgimpconfig/gimpconfig.h"
 
diff --git a/app/pdb/convert-cmds.c b/app/pdb/convert-cmds.c
index b40e418..64440bd 100644
--- a/app/pdb/convert-cmds.c
+++ b/app/pdb/convert-cmds.c
@@ -21,6 +21,8 @@
 
 #include <gegl.h>
 
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
 #include "pdb-types.h"
 
 #include "core/gimp.h"
diff --git a/app/pdb/display-cmds.c b/app/pdb/display-cmds.c
index 28619e1..4ac8028 100644
--- a/app/pdb/display-cmds.c
+++ b/app/pdb/display-cmds.c
@@ -21,6 +21,8 @@
 
 #include <gegl.h>
 
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
 #include "pdb-types.h"
 
 #include "core/gimp.h"
diff --git a/app/pdb/drawable-cmds.c b/app/pdb/drawable-cmds.c
index d82bd15..b39a436 100644
--- a/app/pdb/drawable-cmds.c
+++ b/app/pdb/drawable-cmds.c
@@ -21,6 +21,8 @@
 
 #include <gegl.h>
 
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
 #include "pdb-types.h"
 
 #include "config/gimpcoreconfig.h"
diff --git a/app/pdb/drawable-transform-cmds.c b/app/pdb/drawable-transform-cmds.c
index 1de9258..3c50b33 100644
--- a/app/pdb/drawable-transform-cmds.c
+++ b/app/pdb/drawable-transform-cmds.c
@@ -21,6 +21,8 @@
 
 #include <gegl.h>
 
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
 #include "libgimpmath/gimpmath.h"
 
 #include "pdb-types.h"
diff --git a/app/pdb/dynamics-cmds.c b/app/pdb/dynamics-cmds.c
index 9e895c4..fa85203 100644
--- a/app/pdb/dynamics-cmds.c
+++ b/app/pdb/dynamics-cmds.c
@@ -21,6 +21,8 @@
 
 #include <gegl.h>
 
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
 #include "pdb-types.h"
 
 #include "core/gimp.h"
diff --git a/app/pdb/edit-cmds.c b/app/pdb/edit-cmds.c
index 5ea146f..998fc48 100644
--- a/app/pdb/edit-cmds.c
+++ b/app/pdb/edit-cmds.c
@@ -23,6 +23,8 @@
 
 #include <gegl.h>
 
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
 #include "pdb-types.h"
 
 #include "core/gimp-edit.h"
diff --git a/app/pdb/fileops-cmds.c b/app/pdb/fileops-cmds.c
index 41ef79f..c80add1 100644
--- a/app/pdb/fileops-cmds.c
+++ b/app/pdb/fileops-cmds.c
@@ -23,6 +23,8 @@
 
 #include <gegl.h>
 
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
 #include "libgimpbase/gimpbase.h"
 #include "libgimpconfig/gimpconfig.h"
 
diff --git a/app/pdb/floating-sel-cmds.c b/app/pdb/floating-sel-cmds.c
index e2de020..620b70b 100644
--- a/app/pdb/floating-sel-cmds.c
+++ b/app/pdb/floating-sel-cmds.c
@@ -21,6 +21,8 @@
 
 #include <gegl.h>
 
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
 #include "pdb-types.h"
 
 #include "core/gimpdrawable.h"
diff --git a/app/pdb/font-select-cmds.c b/app/pdb/font-select-cmds.c
index 6acaab6..61f973b 100644
--- a/app/pdb/font-select-cmds.c
+++ b/app/pdb/font-select-cmds.c
@@ -21,6 +21,8 @@
 
 #include <gegl.h>
 
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
 #include "pdb-types.h"
 
 #include "core/gimp.h"
diff --git a/app/pdb/fonts-cmds.c b/app/pdb/fonts-cmds.c
index 0477f9a..86b92e8 100644
--- a/app/pdb/fonts-cmds.c
+++ b/app/pdb/fonts-cmds.c
@@ -21,6 +21,8 @@
 
 #include <gegl.h>
 
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
 #include "pdb-types.h"
 
 #include "core/gimp.h"
diff --git a/app/pdb/gimp-cmds.c b/app/pdb/gimp-cmds.c
index a702516..43e691d 100644
--- a/app/pdb/gimp-cmds.c
+++ b/app/pdb/gimp-cmds.c
@@ -21,6 +21,8 @@
 
 #include <gegl.h>
 
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
 #include "libgimpbase/gimpbase.h"
 
 #include "pdb-types.h"
diff --git a/app/pdb/gimp-pdb-compat.c b/app/pdb/gimp-pdb-compat.c
index a793c3f..7e346e6 100644
--- a/app/pdb/gimp-pdb-compat.c
+++ b/app/pdb/gimp-pdb-compat.c
@@ -19,6 +19,7 @@
 
 #include <cairo.h>
 #include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
 
 #include "libgimpbase/gimpbase.h"
 #include "libgimpcolor/gimpcolor.h"
diff --git a/app/pdb/gimprc-cmds.c b/app/pdb/gimprc-cmds.c
index 0866989..09f875c 100644
--- a/app/pdb/gimprc-cmds.c
+++ b/app/pdb/gimprc-cmds.c
@@ -23,6 +23,8 @@
 
 #include <gegl.h>
 
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
 #include "libgimpbase/gimpbase.h"
 #include "libgimpconfig/gimpconfig.h"
 #include "libgimpmodule/gimpmodule.h"
diff --git a/app/pdb/gradient-cmds.c b/app/pdb/gradient-cmds.c
index c0907c2..4c4a4e2 100644
--- a/app/pdb/gradient-cmds.c
+++ b/app/pdb/gradient-cmds.c
@@ -24,6 +24,8 @@
 
 #include <gegl.h>
 
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
 #include "libgimpcolor/gimpcolor.h"
 
 #include "pdb-types.h"
diff --git a/app/pdb/gradient-select-cmds.c b/app/pdb/gradient-select-cmds.c
index 1d67d82..f9097c2 100644
--- a/app/pdb/gradient-select-cmds.c
+++ b/app/pdb/gradient-select-cmds.c
@@ -21,6 +21,8 @@
 
 #include <gegl.h>
 
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
 #include "pdb-types.h"
 
 #include "core/gimp.h"
diff --git a/app/pdb/gradients-cmds.c b/app/pdb/gradients-cmds.c
index 98876b4..8d028ab 100644
--- a/app/pdb/gradients-cmds.c
+++ b/app/pdb/gradients-cmds.c
@@ -23,6 +23,8 @@
 
 #include <gegl.h>
 
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
 #include "pdb-types.h"
 
 #include "core/gimp.h"
diff --git a/app/pdb/grid-cmds.c b/app/pdb/grid-cmds.c
index bc54afe..ec5d0d7 100644
--- a/app/pdb/grid-cmds.c
+++ b/app/pdb/grid-cmds.c
@@ -23,6 +23,8 @@
 
 #include <gegl.h>
 
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
 #include "libgimpbase/gimpbaseenums.h"
 #include "libgimpcolor/gimpcolor.h"
 
diff --git a/app/pdb/guides-cmds.c b/app/pdb/guides-cmds.c
index e33184a..f468c4c 100644
--- a/app/pdb/guides-cmds.c
+++ b/app/pdb/guides-cmds.c
@@ -21,6 +21,8 @@
 
 #include <gegl.h>
 
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
 #include "pdb-types.h"
 
 #include "core/gimpguide.h"
diff --git a/app/pdb/help-cmds.c b/app/pdb/help-cmds.c
index ff850bd..6eb1236 100644
--- a/app/pdb/help-cmds.c
+++ b/app/pdb/help-cmds.c
@@ -21,6 +21,8 @@
 
 #include <gegl.h>
 
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
 #include "pdb-types.h"
 
 #include "core/gimp.h"
diff --git a/app/pdb/image-cmds.c b/app/pdb/image-cmds.c
index a0b451f..2796b3f 100644
--- a/app/pdb/image-cmds.c
+++ b/app/pdb/image-cmds.c
@@ -23,6 +23,8 @@
 
 #include <gegl.h>
 
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
 #include "libgimpbase/gimpbase.h"
 #include "libgimpcolor/gimpcolor.h"
 #include "libgimpmath/gimpmath.h"
diff --git a/app/pdb/image-select-cmds.c b/app/pdb/image-select-cmds.c
index 9f9b3ac..86871b5 100644
--- a/app/pdb/image-select-cmds.c
+++ b/app/pdb/image-select-cmds.c
@@ -23,6 +23,8 @@
 
 #include <gegl.h>
 
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
 #include "libgimpbase/gimpbase.h"
 #include "libgimpcolor/gimpcolor.h"
 
diff --git a/app/pdb/item-cmds.c b/app/pdb/item-cmds.c
index 4a2438a..92d0ab3 100644
--- a/app/pdb/item-cmds.c
+++ b/app/pdb/item-cmds.c
@@ -21,6 +21,8 @@
 
 #include <gegl.h>
 
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
 #include "libgimpbase/gimpbase.h"
 
 #include "pdb-types.h"
diff --git a/app/pdb/item-transform-cmds.c b/app/pdb/item-transform-cmds.c
index d3bc78b..d35261e 100644
--- a/app/pdb/item-transform-cmds.c
+++ b/app/pdb/item-transform-cmds.c
@@ -21,6 +21,8 @@
 
 #include <gegl.h>
 
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
 #include "libgimpmath/gimpmath.h"
 
 #include "pdb-types.h"
diff --git a/app/pdb/layer-cmds.c b/app/pdb/layer-cmds.c
index def2d69..5cacd32 100644
--- a/app/pdb/layer-cmds.c
+++ b/app/pdb/layer-cmds.c
@@ -21,6 +21,8 @@
 
 #include <gegl.h>
 
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
 #include "libgimpbase/gimpbase.h"
 
 #include "pdb-types.h"
diff --git a/app/pdb/message-cmds.c b/app/pdb/message-cmds.c
index e16676c..0a1bba5 100644
--- a/app/pdb/message-cmds.c
+++ b/app/pdb/message-cmds.c
@@ -23,6 +23,8 @@
 
 #include <gegl.h>
 
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
 #include "pdb-types.h"
 
 #include "core/gimp.h"
diff --git a/app/pdb/paint-tools-cmds.c b/app/pdb/paint-tools-cmds.c
index 99faf15..5732df9 100644
--- a/app/pdb/paint-tools-cmds.c
+++ b/app/pdb/paint-tools-cmds.c
@@ -21,6 +21,8 @@
 
 #include <gegl.h>
 
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
 #include "libgimpconfig/gimpconfig.h"
 #include "libgimpmath/gimpmath.h"
 
diff --git a/app/pdb/palette-cmds.c b/app/pdb/palette-cmds.c
index bd3a9ee..8f6b1d6 100644
--- a/app/pdb/palette-cmds.c
+++ b/app/pdb/palette-cmds.c
@@ -24,6 +24,8 @@
 
 #include <gegl.h>
 
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
 #include "libgimpcolor/gimpcolor.h"
 
 #include "pdb-types.h"
diff --git a/app/pdb/palette-select-cmds.c b/app/pdb/palette-select-cmds.c
index 80757c9..96403a7 100644
--- a/app/pdb/palette-select-cmds.c
+++ b/app/pdb/palette-select-cmds.c
@@ -21,6 +21,8 @@
 
 #include <gegl.h>
 
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
 #include "pdb-types.h"
 
 #include "core/gimp.h"
diff --git a/app/pdb/palettes-cmds.c b/app/pdb/palettes-cmds.c
index ad85e27..4b90093 100644
--- a/app/pdb/palettes-cmds.c
+++ b/app/pdb/palettes-cmds.c
@@ -24,6 +24,8 @@
 
 #include <gegl.h>
 
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
 #include "libgimpcolor/gimpcolor.h"
 
 #include "pdb-types.h"
diff --git a/app/pdb/paths-cmds.c b/app/pdb/paths-cmds.c
index 56292ab..89a46e9 100644
--- a/app/pdb/paths-cmds.c
+++ b/app/pdb/paths-cmds.c
@@ -23,6 +23,8 @@
 
 #include <gegl.h>
 
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
 #include "libgimpmath/gimpmath.h"
 
 #include "pdb-types.h"
diff --git a/app/pdb/pattern-cmds.c b/app/pdb/pattern-cmds.c
index 4f822b7..0134e5f 100644
--- a/app/pdb/pattern-cmds.c
+++ b/app/pdb/pattern-cmds.c
@@ -23,6 +23,8 @@
 
 #include <gegl.h>
 
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
 #include "pdb-types.h"
 
 #include "core/gimpcontext.h"
diff --git a/app/pdb/pattern-select-cmds.c b/app/pdb/pattern-select-cmds.c
index 1a4a77e..3f7f02b 100644
--- a/app/pdb/pattern-select-cmds.c
+++ b/app/pdb/pattern-select-cmds.c
@@ -21,6 +21,8 @@
 
 #include <gegl.h>
 
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
 #include "pdb-types.h"
 
 #include "core/gimp.h"
diff --git a/app/pdb/patterns-cmds.c b/app/pdb/patterns-cmds.c
index a3ff2f9..7b97e59 100644
--- a/app/pdb/patterns-cmds.c
+++ b/app/pdb/patterns-cmds.c
@@ -23,6 +23,8 @@
 
 #include <gegl.h>
 
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
 #include "pdb-types.h"
 
 #include "core/gimp.h"
diff --git a/app/pdb/plug-in-cmds.c b/app/pdb/plug-in-cmds.c
index c69408c..6c9db07 100644
--- a/app/pdb/plug-in-cmds.c
+++ b/app/pdb/plug-in-cmds.c
@@ -24,6 +24,8 @@
 
 #include <gegl.h>
 
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
 #include "libgimpbase/gimpbase.h"
 
 #include "pdb-types.h"
diff --git a/app/pdb/plug-in-compat-cmds.c b/app/pdb/plug-in-compat-cmds.c
index 8cd1ed6..2aa855c 100644
--- a/app/pdb/plug-in-compat-cmds.c
+++ b/app/pdb/plug-in-compat-cmds.c
@@ -23,6 +23,8 @@
 
 #include <gegl.h>
 
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
 #include "libgimpbase/gimpbase.h"
 #include "libgimpcolor/gimpcolor.h"
 
diff --git a/app/pdb/procedural-db-cmds.c b/app/pdb/procedural-db-cmds.c
index 6c2ae77..7fed892 100644
--- a/app/pdb/procedural-db-cmds.c
+++ b/app/pdb/procedural-db-cmds.c
@@ -21,6 +21,8 @@
 
 #include <gegl.h>
 
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
 #include "libgimpbase/gimpbase.h"
 
 #include "pdb-types.h"
diff --git a/app/pdb/progress-cmds.c b/app/pdb/progress-cmds.c
index 8fa2469..1586dfc 100644
--- a/app/pdb/progress-cmds.c
+++ b/app/pdb/progress-cmds.c
@@ -21,6 +21,8 @@
 
 #include <gegl.h>
 
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
 #include "pdb-types.h"
 
 #include "core/gimp.h"
diff --git a/app/pdb/selection-cmds.c b/app/pdb/selection-cmds.c
index 6854a11..41c46da 100644
--- a/app/pdb/selection-cmds.c
+++ b/app/pdb/selection-cmds.c
@@ -21,6 +21,8 @@
 
 #include <gegl.h>
 
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
 #include "libgimpmath/gimpmath.h"
 
 #include "pdb-types.h"
diff --git a/app/pdb/selection-tools-cmds.c b/app/pdb/selection-tools-cmds.c
index 14b73d2..d29982f 100644
--- a/app/pdb/selection-tools-cmds.c
+++ b/app/pdb/selection-tools-cmds.c
@@ -23,6 +23,8 @@
 
 #include <gegl.h>
 
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
 #include "libgimpbase/gimpbase.h"
 #include "libgimpcolor/gimpcolor.h"
 
diff --git a/app/pdb/text-layer-cmds.c b/app/pdb/text-layer-cmds.c
index e3edcd7..807a91a 100644
--- a/app/pdb/text-layer-cmds.c
+++ b/app/pdb/text-layer-cmds.c
@@ -23,6 +23,8 @@
 
 #include <gegl.h>
 
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
 #include "libgimpbase/gimpbase.h"
 #include "libgimpcolor/gimpcolor.h"
 
diff --git a/app/pdb/text-tool-cmds.c b/app/pdb/text-tool-cmds.c
index 8b2333f..60605b3 100644
--- a/app/pdb/text-tool-cmds.c
+++ b/app/pdb/text-tool-cmds.c
@@ -21,6 +21,8 @@
 
 #include <gegl.h>
 
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
 #include "libgimpbase/gimpbase.h"
 
 #include "pdb-types.h"
diff --git a/app/pdb/transform-tools-cmds.c b/app/pdb/transform-tools-cmds.c
index a2c519f..e31976c 100644
--- a/app/pdb/transform-tools-cmds.c
+++ b/app/pdb/transform-tools-cmds.c
@@ -21,6 +21,8 @@
 
 #include <gegl.h>
 
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
 #include "libgimpmath/gimpmath.h"
 
 #include "pdb-types.h"
diff --git a/app/pdb/undo-cmds.c b/app/pdb/undo-cmds.c
index fa1f575..d9838a4 100644
--- a/app/pdb/undo-cmds.c
+++ b/app/pdb/undo-cmds.c
@@ -21,6 +21,8 @@
 
 #include <gegl.h>
 
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
 #include "pdb-types.h"
 
 #include "core/gimp.h"
diff --git a/app/pdb/unit-cmds.c b/app/pdb/unit-cmds.c
index 7f3e2a6..251363c 100644
--- a/app/pdb/unit-cmds.c
+++ b/app/pdb/unit-cmds.c
@@ -21,6 +21,8 @@
 
 #include <gegl.h>
 
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
 #include "libgimpbase/gimpbase.h"
 
 #include "pdb-types.h"
diff --git a/app/pdb/vectors-cmds.c b/app/pdb/vectors-cmds.c
index a566da4..d51d490 100644
--- a/app/pdb/vectors-cmds.c
+++ b/app/pdb/vectors-cmds.c
@@ -23,6 +23,8 @@
 
 #include <gegl.h>
 
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
 #include "pdb-types.h"
 
 #include "core/gimpimage-undo-push.h"
diff --git a/app/plug-in/plug-in-params.c b/app/plug-in/plug-in-params.c
index c4705d6..03cc7a4 100644
--- a/app/plug-in/plug-in-params.c
+++ b/app/plug-in/plug-in-params.c
@@ -19,6 +19,7 @@
 
 #include <cairo.h>
 #include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
 
 #include "libgimpbase/gimpbase.h"
 #include "libgimpbase/gimpprotocol.h"
diff --git a/app/text/gimptext-compat.c b/app/text/gimptext-compat.c
index 0dbdc93..9c48c12 100644
--- a/app/text/gimptext-compat.c
+++ b/app/text/gimptext-compat.c
@@ -21,6 +21,7 @@
 #include "config.h"
 
 #include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
 #include <pango/pangocairo.h>
 
 #include "libgimpcolor/gimpcolor.h"
diff --git a/app/text/gimptext-parasite.c b/app/text/gimptext-parasite.c
index bb3c419..ac9baf5 100644
--- a/app/text/gimptext-parasite.c
+++ b/app/text/gimptext-parasite.c
@@ -25,6 +25,7 @@
 
 #include <cairo.h>
 #include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
 
 #include "libgimpbase/gimpbase.h"
 #include "libgimpcolor/gimpcolor.h"
diff --git a/app/text/gimptext.c b/app/text/gimptext.c
index fa9cb6a..c95b852 100644
--- a/app/text/gimptext.c
+++ b/app/text/gimptext.c
@@ -24,6 +24,7 @@
 
 #include <cairo.h>
 #include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
 #include <pango/pango.h>
 
 #include "libgimpbase/gimpbase.h"
diff --git a/app/text/gimptextlayout.c b/app/text/gimptextlayout.c
index 06161e5..c4dc0c8 100644
--- a/app/text/gimptextlayout.c
+++ b/app/text/gimptextlayout.c
@@ -23,6 +23,7 @@
 #include <string.h>
 
 #include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
 #include <pango/pangocairo.h>
 
 #include "libgimpbase/gimpbase.h"
diff --git a/app/vectors/gimpvectors.c b/app/vectors/gimpvectors.c
index 688ecf8..fb1d970 100644
--- a/app/vectors/gimpvectors.c
+++ b/app/vectors/gimpvectors.c
@@ -20,8 +20,9 @@
 
 #include "config.h"
 
-#include <gegl.h>
 #include <cairo.h>
+#include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
 
 #include "libgimpcolor/gimpcolor.h"
 #include "libgimpmath/gimpmath.h"
diff --git a/app/xcf/xcf-load.c b/app/xcf/xcf-load.c
index 28c7805..57a195a 100644
--- a/app/xcf/xcf-load.c
+++ b/app/xcf/xcf-load.c
@@ -22,6 +22,7 @@
 
 #include <cairo.h>
 #include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
 
 #include "libgimpbase/gimpbase.h"
 #include "libgimpcolor/gimpcolor.h"
diff --git a/app/xcf/xcf-save.c b/app/xcf/xcf-save.c
index c5b8957..84bdfb9 100644
--- a/app/xcf/xcf-save.c
+++ b/app/xcf/xcf-save.c
@@ -22,6 +22,7 @@
 
 #include <cairo.h>
 #include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
 
 #include "libgimpbase/gimpbase.h"
 #include "libgimpcolor/gimpcolor.h"
diff --git a/libgimp/gimppixbuf.h b/libgimp/gimppixbuf.h
index d39724a..a7b0e47 100644
--- a/libgimp/gimppixbuf.h
+++ b/libgimp/gimppixbuf.h
@@ -23,8 +23,8 @@
 #error "Only <libgimp/gimp.h> can be included directly."
 #endif
 
-#ifndef __GIMP_PIXBUF_H__
-#define __GIMP_PIXBUF_H__
+#ifndef __LIBGIMP_GIMP_PIXBUF_H__
+#define __LIBGIMP_GIMP_PIXBUF_H__
 
 G_BEGIN_DECLS
 
@@ -58,4 +58,4 @@ GdkPixbuf * gimp_drawable_get_sub_thumbnail (gint32                  drawable_ID
 
 G_END_DECLS
 
-#endif /* __GIMP_PIXBUF_H__ */
+#endif /* __LIBGIMP_GIMP_PIXBUF_H__ */
diff --git a/libgimpcolor/Makefile.am b/libgimpcolor/Makefile.am
index daf5d3b..27fece1 100644
--- a/libgimpcolor/Makefile.am
+++ b/libgimpcolor/Makefile.am
@@ -51,10 +51,10 @@ AM_CPPFLAGS = \
 	-DGIMP_COLOR_COMPILATION
 
 INCLUDES = \
-	-I$(top_srcdir)	\
-	$(GEGL_CFLAGS)	\
-	$(CAIRO_CFLAGS)	\
-	$(GLIB_CFLAGS)	\
+	-I$(top_srcdir)		\
+	$(GEGL_CFLAGS)		\
+	$(CAIRO_CFLAGS)		\
+	$(GDK_PIXBUF_CFLAGS)	\
 	-I$(includedir)
 
 EXTRA_DIST = \
@@ -81,6 +81,8 @@ libgimpcolor_2_0_la_SOURCES = \
 	gimphsl.h			\
 	gimphsv.c			\
 	gimphsv.h			\
+	gimppixbuf.c			\
+	gimppixbuf.h			\
 	gimprgb.c			\
 	gimprgb.h			\
 	gimprgb-parse.c
@@ -96,6 +98,7 @@ libgimpcolorinclude_HEADERS = \
 	gimpcolorspace.h		\
 	gimphsl.h			\
 	gimphsv.h			\
+	gimppixbuf.h			\
 	gimprgb.h
 
 libgimpcolor_2_0_la_LDFLAGS = \
@@ -108,9 +111,9 @@ libgimpcolor_2_0_la_DEPENDENCIES = \
 	$(libgimpbase)
 
 libgimpcolor_2_0_la_LIBADD = \
-	$(BABL_LIBS)	\
-	$(CAIRO_LIBS)	\
-	$(GLIB_LIBS)	\
+	$(GEGL_LIBS)		\
+	$(CAIRO_LIBS)		\
+	$(GDK_PIXBUF_LIBS)	\
 	$(libm)
 
 
diff --git a/libgimpcolor/gimpcolor.def b/libgimpcolor/gimpcolor.def
index 32eb45d..380bbc0 100644
--- a/libgimpcolor/gimpcolor.def
+++ b/libgimpcolor/gimpcolor.def
@@ -37,6 +37,8 @@ EXPORTS
 	gimp_param_rgb_get_type
 	gimp_param_spec_rgb
 	gimp_param_spec_rgb_has_alpha
+	gimp_pixbuf_create_buffer
+	gimp_pixbuf_get_format
 	gimp_rgb_add
 	gimp_rgb_clamp
 	gimp_rgb_composite
diff --git a/libgimpcolor/gimpcolor.h b/libgimpcolor/gimpcolor.h
index dc0327b..e23381c 100644
--- a/libgimpcolor/gimpcolor.h
+++ b/libgimpcolor/gimpcolor.h
@@ -31,6 +31,7 @@
 #include <libgimpcolor/gimpcmyk.h>
 #include <libgimpcolor/gimphsl.h>
 #include <libgimpcolor/gimphsv.h>
+#include <libgimpcolor/gimppixbuf.h>
 #include <libgimpcolor/gimprgb.h>
 
 #undef __GIMP_COLOR_H_INSIDE__
diff --git a/libgimpcolor/gimppixbuf.c b/libgimpcolor/gimppixbuf.c
new file mode 100644
index 0000000..9f5977f
--- /dev/null
+++ b/libgimpcolor/gimppixbuf.c
@@ -0,0 +1,87 @@
+/* LIBGIMP - The GIMP Library
+ * Copyright (C) 1995-1997 Spencer Kimball and Peter Mattis
+ *
+ * gimppixbuf.c
+ * Copyright (C) 2012  Michael Natterer <mitch gimp org>
+ *
+ * This library is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library.  If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
+#include "gimpcolortypes.h"
+
+#include "gimppixbuf.h"
+
+
+/**
+ * gimp_pixbuf_get_format:
+ * @pixbuf: a #GdkPixbuf
+ *
+ * Returns the Babl format that corresponds to the @pixbuf's pixel format.
+ *
+ * Return value: the @pixbuf's pixel format
+ *
+ * Since: GIMP 2.10
+ **/
+const Babl *
+gimp_pixbuf_get_format (GdkPixbuf *pixbuf)
+{
+  g_return_val_if_fail (GDK_IS_PIXBUF (pixbuf), NULL);
+
+  switch (gdk_pixbuf_get_n_channels (pixbuf))
+    {
+    case 3: return babl_format ("R'G'B' u8");
+    case 4: return babl_format ("R'G'B'A u8");
+    }
+
+  g_return_val_if_reached (NULL);
+}
+
+/**
+ * gimp_pixbuf_create_buffer:
+ * @pixbuf: a #GdkPixbuf
+ *
+ * Returns a #GeglBuffer that's backed by the @pixbuf's pixels, without
+ * copying them. This function refs the pixbuf, so it will be kept
+ * around for as long as te buffer exists.
+ *
+ * Return value: a new #GeglBuffer as a wrapper around @pixbuf.
+ *
+ * Since: GIMP 2.10
+ **/
+GeglBuffer *
+gimp_pixbuf_create_buffer (GdkPixbuf *pixbuf)
+{
+  gint width;
+  gint height;
+  gint rowstride;
+
+  g_return_val_if_fail (GDK_IS_PIXBUF (pixbuf), NULL);
+
+  width     = gdk_pixbuf_get_width (pixbuf);
+  height    = gdk_pixbuf_get_height (pixbuf);
+  rowstride = gdk_pixbuf_get_rowstride (pixbuf);
+
+  return gegl_buffer_linear_new_from_data (gdk_pixbuf_get_pixels (pixbuf),
+                                           gimp_pixbuf_get_format (pixbuf),
+                                           GEGL_RECTANGLE (0, 0, width, height),
+                                           rowstride,
+                                           (GDestroyNotify) g_object_unref,
+                                           g_object_ref (pixbuf));
+}
diff --git a/libgimpcolor/gimppixbuf.h b/libgimpcolor/gimppixbuf.h
new file mode 100644
index 0000000..bad438e
--- /dev/null
+++ b/libgimpcolor/gimppixbuf.h
@@ -0,0 +1,40 @@
+/* LIBGIMP - The GIMP Library
+ * Copyright (C) 1995-1997 Spencer Kimball and Peter Mattis
+ *
+ * gimppixbuf.h
+ * Copyright (C) 2012  Michael Natterer <mitch gimp org>
+ *
+ * This library is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library.  If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+#if !defined (__GIMP_COLOR_H_INSIDE__) && !defined (GIMP_COLOR_COMPILATION)
+#error "Only <libgimpcolor/gimpcolor.h> can be included directly."
+#endif
+
+#ifndef __GIMP_PIXBUF_H__
+#define __GIMP_PIXBUF_H__
+
+G_BEGIN_DECLS
+
+/* For information look into the C source or the html documentation */
+
+
+const Babl * gimp_pixbuf_get_format    (GdkPixbuf *pixbuf);
+GeglBuffer * gimp_pixbuf_create_buffer (GdkPixbuf *pixbuf);
+
+
+G_END_DECLS
+
+#endif  /* __GIMP_PIXBUF_H__ */
diff --git a/libgimpconfig/Makefile.am b/libgimpconfig/Makefile.am
index 67a7127..bca564d 100644
--- a/libgimpconfig/Makefile.am
+++ b/libgimpconfig/Makefile.am
@@ -48,10 +48,10 @@ AM_CPPFLAGS = \
 	-DGIMP_CONFIG_COMPILATION
 
 INCLUDES = \
-	-I$(top_srcdir)	\
-	$(BABL_CFLAGS)	\
-	$(CAIRO_CFLAGS)	\
-	$(GLIB_CFLAGS)	\
+	-I$(top_srcdir)		\
+	$(GEGL_CFLAGS)		\
+	$(CAIRO_CFLAGS)		\
+	$(GDK_PIXBUF_CFLAGS)	\
 	-I$(includedir)
 
 EXTRA_DIST = \
@@ -117,9 +117,9 @@ libgimpconfig_2_0_la_LIBADD = \
 	$(libgimpbase)	\
 	$(libgimpcolor)	\
 	$(libgimpmath)	\
-	$(BABL_LIBS)	\
+	$(GEGL_LIBS)	\
 	$(CAIRO_LIBS)	\
-	$(GLIB_LIBS)
+	$(GDK_PIXBUF_LIBS)
 
 
 install-data-local: install-ms-lib install-libtool-import-lib
diff --git a/libgimpconfig/gimpcolorconfig.c b/libgimpconfig/gimpcolorconfig.c
index 6b73925..1277941 100644
--- a/libgimpconfig/gimpcolorconfig.c
+++ b/libgimpconfig/gimpcolorconfig.c
@@ -21,9 +21,9 @@
 
 #include "config.h"
 
-#include <babl/babl.h>
 #include <cairo.h>
-#include <glib-object.h>
+#include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
 
 #include "libgimpbase/gimpbase.h"
 #include "libgimpcolor/gimpcolor.h"
diff --git a/libgimpconfig/gimpconfig-deserialize.c b/libgimpconfig/gimpconfig-deserialize.c
index 5bbc491..648bd2e 100644
--- a/libgimpconfig/gimpconfig-deserialize.c
+++ b/libgimpconfig/gimpconfig-deserialize.c
@@ -21,9 +21,9 @@
 
 #include "config.h"
 
-#include <babl/babl.h>
 #include <cairo.h>
-#include <glib-object.h>
+#include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
 
 #include "libgimpbase/gimpbase.h"
 #include "libgimpcolor/gimpcolor.h"
diff --git a/libgimpconfig/gimpconfig-serialize.c b/libgimpconfig/gimpconfig-serialize.c
index 3e2b003..9759d86 100644
--- a/libgimpconfig/gimpconfig-serialize.c
+++ b/libgimpconfig/gimpconfig-serialize.c
@@ -21,9 +21,9 @@
 
 #include "config.h"
 
-#include <babl/babl.h>
 #include <cairo.h>
-#include <glib-object.h>
+#include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
 
 #include "libgimpbase/gimpbase.h"
 #include "libgimpmath/gimpmath.h"
diff --git a/libgimpconfig/gimpscanner.c b/libgimpconfig/gimpscanner.c
index 31743d1..b674809 100644
--- a/libgimpconfig/gimpscanner.c
+++ b/libgimpconfig/gimpscanner.c
@@ -25,9 +25,9 @@
 #include <string.h>
 #include <errno.h>
 
-#include <babl/babl.h>
 #include <cairo.h>
-#include <glib-object.h>
+#include <gegl.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
 
 #include "libgimpbase/gimpbase.h"
 #include "libgimpcolor/gimpcolor.h"
diff --git a/libgimpwidgets/Makefile.am b/libgimpwidgets/Makefile.am
index b820cac..c2717e2 100644
--- a/libgimpwidgets/Makefile.am
+++ b/libgimpwidgets/Makefile.am
@@ -54,7 +54,7 @@ AM_CPPFLAGS = \
 
 INCLUDES = \
 	-I$(top_srcdir)	\
-	$(BABL_CFLAGS)	\
+	$(GEGL_CFLAGS)	\
 	$(GTK_CFLAGS)	\
 	-I$(includedir)
 
@@ -262,7 +262,7 @@ libgimpwidgets_2_0_la_LIBADD = \
 	$(libgimpcolor)		\
 	$(libgimpconfig)	\
 	$(libgimpbase)		\
-	$(BABL_LIBS)		\
+	$(GEGL_LIBS)		\
 	$(GTK_LIBS)		\
 	$(libm)
 
diff --git a/libgimpwidgets/gimpcairo-utils.c b/libgimpwidgets/gimpcairo-utils.c
index 7ad9297..12c8764 100644
--- a/libgimpwidgets/gimpcairo-utils.c
+++ b/libgimpwidgets/gimpcairo-utils.c
@@ -23,7 +23,7 @@
 
 #include <string.h>
 
-#include <babl/babl.h>
+#include <gegl.h>
 #include <gtk/gtk.h>
 
 #include "libgimpbase/gimpbase.h"
diff --git a/libgimpwidgets/gimpcellrenderercolor.c b/libgimpwidgets/gimpcellrenderercolor.c
index 7da4b2a..339be10 100644
--- a/libgimpwidgets/gimpcellrenderercolor.c
+++ b/libgimpwidgets/gimpcellrenderercolor.c
@@ -21,7 +21,7 @@
 
 #include "config.h"
 
-#include <babl/babl.h>
+#include <gegl.h>
 #include <gtk/gtk.h>
 
 #include "libgimpbase/gimpbase.h"
diff --git a/libgimpwidgets/gimpcolorarea.c b/libgimpwidgets/gimpcolorarea.c
index 913dcfd..f0df389 100644
--- a/libgimpwidgets/gimpcolorarea.c
+++ b/libgimpwidgets/gimpcolorarea.c
@@ -21,7 +21,7 @@
 
 #include "config.h"
 
-#include <babl/babl.h>
+#include <gegl.h>
 #include <gtk/gtk.h>
 
 #include "libgimpcolor/gimpcolor.h"
diff --git a/libgimpwidgets/gimpcolorbutton.c b/libgimpwidgets/gimpcolorbutton.c
index 393e88f..f7e1d71 100644
--- a/libgimpwidgets/gimpcolorbutton.c
+++ b/libgimpwidgets/gimpcolorbutton.c
@@ -23,7 +23,7 @@
 
 #include <string.h>
 
-#include <babl/babl.h>
+#include <gegl.h>
 #include <gtk/gtk.h>
 
 #include "libgimpcolor/gimpcolor.h"
diff --git a/libgimpwidgets/gimpcolordisplay.c b/libgimpwidgets/gimpcolordisplay.c
index e6eb823..dba49d1 100644
--- a/libgimpwidgets/gimpcolordisplay.c
+++ b/libgimpwidgets/gimpcolordisplay.c
@@ -23,7 +23,7 @@
 
 #include <string.h>
 
-#include <babl/babl.h>
+#include <gegl.h>
 #include <gtk/gtk.h>
 
 #include "libgimpbase/gimpbase.h"
diff --git a/libgimpwidgets/gimpcolordisplaystack.c b/libgimpwidgets/gimpcolordisplaystack.c
index 74331a0..0c22588 100644
--- a/libgimpwidgets/gimpcolordisplaystack.c
+++ b/libgimpwidgets/gimpcolordisplaystack.c
@@ -21,7 +21,7 @@
 
 #include "config.h"
 
-#include <babl/babl.h>
+#include <gegl.h>
 #include <gtk/gtk.h>
 
 #include "libgimpcolor/gimpcolor.h"
diff --git a/libgimpwidgets/gimpcolorhexentry.c b/libgimpwidgets/gimpcolorhexentry.c
index 6c503b4..3872d51 100644
--- a/libgimpwidgets/gimpcolorhexentry.c
+++ b/libgimpwidgets/gimpcolorhexentry.c
@@ -23,7 +23,7 @@
 
 #include <string.h>
 
-#include <babl/babl.h>
+#include <gegl.h>
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 
diff --git a/libgimpwidgets/gimpcolornotebook.c b/libgimpwidgets/gimpcolornotebook.c
index 5f6cb0a..8ee6999 100644
--- a/libgimpwidgets/gimpcolornotebook.c
+++ b/libgimpwidgets/gimpcolornotebook.c
@@ -24,7 +24,7 @@
 
 #include "config.h"
 
-#include <babl/babl.h>
+#include <gegl.h>
 #include <gtk/gtk.h>
 
 #include "libgimpcolor/gimpcolor.h"
diff --git a/libgimpwidgets/gimpcolorscale.c b/libgimpwidgets/gimpcolorscale.c
index d9b46ed..608b856 100644
--- a/libgimpwidgets/gimpcolorscale.c
+++ b/libgimpwidgets/gimpcolorscale.c
@@ -24,7 +24,7 @@
 
 #include <string.h>
 
-#include <babl/babl.h>
+#include <gegl.h>
 #include <gtk/gtk.h>
 
 #include "libgimpcolor/gimpcolor.h"
diff --git a/libgimpwidgets/gimpcolorscales.c b/libgimpwidgets/gimpcolorscales.c
index 0b1f875..d477c25 100644
--- a/libgimpwidgets/gimpcolorscales.c
+++ b/libgimpwidgets/gimpcolorscales.c
@@ -26,7 +26,7 @@
 
 #include <string.h>
 
-#include <babl/babl.h>
+#include <gegl.h>
 #include <gtk/gtk.h>
 
 #include "libgimpbase/gimpbase.h"
diff --git a/libgimpwidgets/gimpcolorselect.c b/libgimpwidgets/gimpcolorselect.c
index 7b48c1b..73b68d9 100644
--- a/libgimpwidgets/gimpcolorselect.c
+++ b/libgimpwidgets/gimpcolorselect.c
@@ -24,7 +24,7 @@
 
 #include "config.h"
 
-#include <babl/babl.h>
+#include <gegl.h>
 #include <gtk/gtk.h>
 
 #include "libgimpbase/gimpbase.h"
diff --git a/libgimpwidgets/gimpcolorselection.c b/libgimpwidgets/gimpcolorselection.c
index 896ec68..ada9ce2 100644
--- a/libgimpwidgets/gimpcolorselection.c
+++ b/libgimpwidgets/gimpcolorselection.c
@@ -21,7 +21,7 @@
 
 #include "config.h"
 
-#include <babl/babl.h>
+#include <gegl.h>
 #include <gtk/gtk.h>
 
 #include "libgimpcolor/gimpcolor.h"
diff --git a/libgimpwidgets/gimpcolorselector.c b/libgimpwidgets/gimpcolorselector.c
index e3ac08f..a74215f 100644
--- a/libgimpwidgets/gimpcolorselector.c
+++ b/libgimpwidgets/gimpcolorselector.c
@@ -25,7 +25,7 @@
 
 #include "config.h"
 
-#include <babl/babl.h>
+#include <gegl.h>
 #include <gtk/gtk.h>
 
 #include "libgimpcolor/gimpcolor.h"
diff --git a/libgimpwidgets/gimpcontroller.c b/libgimpwidgets/gimpcontroller.c
index 9309bc4..d867284 100644
--- a/libgimpwidgets/gimpcontroller.c
+++ b/libgimpwidgets/gimpcontroller.c
@@ -21,7 +21,7 @@
 
 #include "config.h"
 
-#include <babl/babl.h>
+#include <gegl.h>
 #include <gtk/gtk.h>
 
 #include "libgimpcolor/gimpcolor.h"
diff --git a/libgimpwidgets/gimppickbutton.c b/libgimpwidgets/gimppickbutton.c
index 0738f01..259e619 100644
--- a/libgimpwidgets/gimppickbutton.c
+++ b/libgimpwidgets/gimppickbutton.c
@@ -18,7 +18,7 @@
 
 #include "config.h"
 
-#include <babl/babl.h>
+#include <gegl.h>
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 
diff --git a/libgimpwidgets/gimppropwidgets.c b/libgimpwidgets/gimppropwidgets.c
index 1dd879c..1bb28aa 100644
--- a/libgimpwidgets/gimppropwidgets.c
+++ b/libgimpwidgets/gimppropwidgets.c
@@ -19,7 +19,7 @@
 
 #include <string.h>
 
-#include <babl/babl.h>
+#include <gegl.h>
 /* FIXME: #undef GTK_DISABLE_DEPRECATED */
 #undef GTK_DISABLE_DEPRECATED
 #include <gtk/gtk.h>
diff --git a/libgimpwidgets/gimpscaleentry.c b/libgimpwidgets/gimpscaleentry.c
index 369a767..6d99d11 100644
--- a/libgimpwidgets/gimpscaleentry.c
+++ b/libgimpwidgets/gimpscaleentry.c
@@ -21,7 +21,7 @@
 
 #include "config.h"
 
-#include <babl/babl.h>
+#include <gegl.h>
 #include <gtk/gtk.h>
 
 #include "libgimpcolor/gimpcolor.h"
diff --git a/libgimpwidgets/gimpwidgets.c b/libgimpwidgets/gimpwidgets.c
index 6aa409e..72b2345 100644
--- a/libgimpwidgets/gimpwidgets.c
+++ b/libgimpwidgets/gimpwidgets.c
@@ -21,7 +21,7 @@
 
 #include "config.h"
 
-#include <babl/babl.h>
+#include <gegl.h>
 #include <gtk/gtk.h>
 
 #include "libgimpcolor/gimpcolor.h"
diff --git a/modules/Makefile.am b/modules/Makefile.am
index 7b50ac6..89cf983 100644
--- a/modules/Makefile.am
+++ b/modules/Makefile.am
@@ -14,7 +14,7 @@ libdir = $(gimpplugindir)/modules
 
 INCLUDES = \
         -I$(top_srcdir)	\
-	$(BABL_CFLAGS)	\
+	$(GEGL_CFLAGS)	\
         $(GTK_CFLAGS)	\
         -I$(includedir)
 
diff --git a/modules/color-selector-cmyk-lcms.c b/modules/color-selector-cmyk-lcms.c
index d40677c..45d5177 100644
--- a/modules/color-selector-cmyk-lcms.c
+++ b/modules/color-selector-cmyk-lcms.c
@@ -21,7 +21,7 @@
 
 #include <lcms.h>
 
-#include <babl/babl.h>
+#include <gegl.h>
 #include <gtk/gtk.h>
 
 #include "libgimpcolor/gimpcolor.h"
diff --git a/modules/color-selector-cmyk.c b/modules/color-selector-cmyk.c
index 890ebe0..3e55d10 100644
--- a/modules/color-selector-cmyk.c
+++ b/modules/color-selector-cmyk.c
@@ -17,7 +17,7 @@
 
 #include "config.h"
 
-#include <babl/babl.h>
+#include <gegl.h>
 #include <gtk/gtk.h>
 
 #include "libgimpcolor/gimpcolor.h"
diff --git a/modules/color-selector-water.c b/modules/color-selector-water.c
index fc34e0f..50da893 100644
--- a/modules/color-selector-water.c
+++ b/modules/color-selector-water.c
@@ -21,7 +21,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 
-#include <babl/babl.h>
+#include <gegl.h>
 #include <gtk/gtk.h>
 
 #include "libgimpcolor/gimpcolor.h"
diff --git a/modules/color-selector-wheel.c b/modules/color-selector-wheel.c
index ed09dea..7616e95 100644
--- a/modules/color-selector-wheel.c
+++ b/modules/color-selector-wheel.c
@@ -20,7 +20,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <babl/babl.h>
+#include <gegl.h>
 #include <gtk/gtk.h>
 
 #include "libgimpcolor/gimpcolor.h"
diff --git a/modules/display-filter-color-blind.c b/modules/display-filter-color-blind.c
index 65d7416..667ebb7 100644
--- a/modules/display-filter-color-blind.c
+++ b/modules/display-filter-color-blind.c
@@ -29,7 +29,7 @@
 
 #include <string.h>
 
-#include <babl/babl.h>
+#include <gegl.h>
 #include <gtk/gtk.h>
 
 #include "libgimpcolor/gimpcolor.h"
diff --git a/modules/display-filter-gamma.c b/modules/display-filter-gamma.c
index 7030df9..70c55eb 100644
--- a/modules/display-filter-gamma.c
+++ b/modules/display-filter-gamma.c
@@ -17,7 +17,7 @@
 
 #include "config.h"
 
-#include <babl/babl.h>
+#include <gegl.h>
 #include <gtk/gtk.h>
 
 #include "libgimpcolor/gimpcolor.h"
diff --git a/modules/display-filter-high-contrast.c b/modules/display-filter-high-contrast.c
index 80b547d..952c637 100644
--- a/modules/display-filter-high-contrast.c
+++ b/modules/display-filter-high-contrast.c
@@ -17,7 +17,7 @@
 
 #include "config.h"
 
-#include <babl/babl.h>
+#include <gegl.h>
 #include <gtk/gtk.h>
 
 #include "libgimpcolor/gimpcolor.h"
diff --git a/modules/display-filter-lcms.c b/modules/display-filter-lcms.c
index 0e27093..1441732 100644
--- a/modules/display-filter-lcms.c
+++ b/modules/display-filter-lcms.c
@@ -27,7 +27,7 @@
 
 #include <lcms.h>
 
-#include <babl/babl.h>
+#include <gegl.h>
 #include <gtk/gtk.h>
 
 #ifdef GDK_WINDOWING_QUARTZ
diff --git a/modules/display-filter-proof.c b/modules/display-filter-proof.c
index 57a2327..3ef4311 100644
--- a/modules/display-filter-proof.c
+++ b/modules/display-filter-proof.c
@@ -21,7 +21,7 @@
 
 #include <lcms.h>
 
-#include <babl/babl.h>
+#include <gegl.h>
 #include <gtk/gtk.h>
 
 #include "libgimpbase/gimpbase.h"
diff --git a/plug-ins/pygimp/pygimpcolor.h b/plug-ins/pygimp/pygimpcolor.h
index fb2f000..eddca41 100644
--- a/plug-ins/pygimp/pygimpcolor.h
+++ b/plug-ins/pygimp/pygimpcolor.h
@@ -21,13 +21,9 @@
 
 #include <Python.h>
 
-#include <babl/babl.h>
-#include <cairo.h>
-#include <glib-object.h>
-
 #include <pygobject.h>
 
-#include <libgimpcolor/gimpcolor.h>
+#include <libgimp/gimp.h>
 
 G_BEGIN_DECLS
 
diff --git a/tools/pdbgen/app.pl b/tools/pdbgen/app.pl
index fd7911f..b143862 100644
--- a/tools/pdbgen/app.pl
+++ b/tools/pdbgen/app.pl
@@ -772,6 +772,7 @@ GPL
 		$sys = 1;
 		$headers .= "\n" if $seen;
 		$headers .= "#include <gegl.h>\n\n";
+		$headers .= "#include <gdk-pixbuf/gdk-pixbuf.h>\n\n";
 	    }
 
 	    $seen = 0 if !/^</;