diff --git a/app/composite/Makefile.am b/app/composite/Makefile.am
index 3e2c07609f..f13fbb8a6f 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 590246f7ff..2251c42ec4 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 9cb75cac41..cd639de22e 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 05a78e2bea..676e705884 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 dfb11d5353..4d8be48e95 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 baa8617333..132e732bb6 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 bec0b5a72b..1d58642b60 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 0ecb6c7823..cda6b073e6 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 a33d67cce7..c065cc1de4 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 23c20edb7c..34801bb5bd 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 c43bc33955..b0afd33820 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 21a90eaa51..1c202791d9 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 fa78ccfd14..24f883058d 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 04ea972692..fc9644c8db 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 740b370259..eaf99c8954 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 05e86be318..231b36b874 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 385c289ff1..2fe026c360 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 1499b721b5..d341efc139 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 a272ec448a..d9b4e7e248 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 1f6c1615e0..6dbdf0cfb6 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 85ad9b7272..7cb8e7c641 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 9921fe8f84..68a83ec816 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 674941e58f..7ef1c67325 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 da66cc09d7..80c93994e5 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 a212445297..2d1b227eb0 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 1b4aa393d0..76252955b6 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 6f87f1b122..84513cfbc0 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 7072809384..a36a14f621 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 8ca7ecfac6..4c93924a8e 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 e10b5b17d1..72b312ccfe 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 e02d1689b1..3edbc60f2b 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 c2cd608541..2a15cd307d 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 453d857806..377eb9adc5 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 f54ca27f0d..341076c1eb 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 e4e7b0f09b..4f11eb51ad 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 6b233b6a55..6cb550cac2 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 e839e296d9..45b2be1ee9 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 36e6c1701c..2fe1ae90db 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 b87f187c54..89df1909d1 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 0cdf4c8dd7..093ead916b 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 ba5b38c64c..a37cf788e7 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 aec50dbf06..c2ba9a4ab2 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 16b38170a8..426a52760b 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 b31b598578..c4e5723413 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 0c79c3bd3d..0ed8e792d1 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 5db75e7d9e..1c0f1240ef 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 74fd8a8d27..d0f9ac88f0 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 7f7a2a0e40..0d39c670e8 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 d04380cc4a..102a7cc566 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 b96f71397c..048b262a29 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 e6089b1cfd..400250237f 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 b213ea96bc..ae435e913b 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 c83951e7e4..38cb8ad344 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 ae96c7b36a..431b10385c 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 4d8e8e01aa..5d35d53b35 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 2c62670851..f36f3e7711 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 67dec95a00..155d6343c7 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 b08413af72..777c35e1eb 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 73aa4462fd..ff048c97e9 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 e43064b339..e5d34ea1c1 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 0090c0d1b6..8e60e77e20 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 d1e4be31b6..acfa6626f8 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 6d03bdc7a6..6ed9e80db8 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 d83cf1265b..45d2b9df60 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 7aa703b1ab..ff203a0c77 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 bde634b902..bd8fd2411c 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 2e11defbaf..73c1d323a0 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 3cfc4521dd..168f2204a7 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 b4bc986ea3..a3d5d8cf05 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 515a70cf80..087c7bcf97 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 3273cf63f5..b4e0373b0e 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 9ebe48b59e..f13c424569 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 b40e418fb7..64440bd674 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 28619e1359..4ac80284cb 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 d82bd15bcd..b39a43621f 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 1de9258d5f..3c50b33bb9 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 9e895c45fa..fa852033c4 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 5ea146f083..998fc48ba8 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 41ef79fc1a..c80add1220 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 e2de020f8f..620b70bca2 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 6acaab64c1..61f973bbd2 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 0477f9a931..86b92e8920 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 a702516c49..43e691d215 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 a793c3f2e2..7e346e62ff 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 08669892d3..09f875c02a 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 c0907c28fb..4c4a4e2caf 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 1d67d82b26..f9097c286f 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 98876b4ce7..8d028abd0f 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 bc54afe850..ec5d0d72b7 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 e33184a92a..f468c4cd9c 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 ff850bdb2f..6eb123638b 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 a0b451feea..2796b3f11d 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 9f9b3acc9e..86871b56fd 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 4a2438aed9..92d0ab3bf4 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 d3bc78bb11..d35261ef62 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 def2d6902a..5cacd32a66 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 e16676c127..0a1bba5450 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 99faf157a8..5732df9ff0 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 bd3a9eedcd..8f6b1d68a8 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 80757c9830..96403a7ec0 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 ad85e27503..4b90093768 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 56292abb4d..89a46e961b 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 4f822b722b..0134e5f615 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 1a4a77eb1f..3f7f02badc 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 a3ff2f9987..7b97e59f4a 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 c69408cb5d..6c9db078ce 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 8cd1ed6f35..2aa855cc6d 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 6c2ae7736b..7fed892203 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 8fa246906c..1586dfccd3 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 6854a116d7..41c46da765 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 14b73d24fc..d29982f075 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 e3edcd78c6..807a91a700 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 8b2333fef9..60605b31f0 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 a2c519fdf7..e31976c672 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 fa1f575656..d9838a4f11 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 7f3e2a6285..251363c832 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 a566da4484..d51d490a5e 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 c4705d6458..03cc7a4aaa 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 0dbdc93421..9c48c12a51 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 bb3c419b3d..ac9baf567f 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 fa9cb6acf8..c95b852dce 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 06161e5c9a..c4dc0c81d7 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 688ecf893e..fb1d970d63 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 28c7805675..57a195a48c 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 c5b8957cf7..84bdfb9ac6 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 d39724a102..a7b0e47fe0 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 daf5d3b411..27fece1e86 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 32eb45db62..380bbc078f 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 dc0327b5b3..e23381c589 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 0000000000..9f5977fb9f
--- /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 0000000000..bad438e128
--- /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 67a7127d71..bca564dba2 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 6b73925266..1277941ef8 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 5bbc49156b..648bd2e2f8 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 3e2b003f95..9759d86b5e 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 31743d114b..b6748091f3 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 b820cac1c3..c2717e2d0f 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 7ad9297f10..12c8764d55 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 7da4b2a781..339be10089 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 913dcfda1f..f0df38900b 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 393e88f605..f7e1d71a85 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 e6eb823c26..dba49d143b 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 74331a0e5f..0c22588442 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 6c503b4247..3872d51aae 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 5f6cb0a04d..8ee6999a98 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 d9b46edef9..608b8569e7 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 0b1f8752cc..d477c253f9 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 7b48c1ba06..73b68d9800 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 896ec68751..ada9ce27b8 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 e3ac08f9a3..a74215f99a 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 9309bc4d85..d8672840ab 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 0738f01bfc..259e6194d1 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 1dd879c075..1bb28aaab1 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 369a767487..6d99d1199b 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 6aa409e2f9..72b2345551 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 7b50ac60f7..89cf983770 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 d40677c275..45d5177675 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 890ebe077c..3e55d107ff 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 fc34e0ff6a..50da893b20 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 ed09deada1..7616e9595c 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 65d7416786..667ebb7562 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 7030df9823..70c55eb3cd 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 80b547d216..952c637c74 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 0e270931b6..14417327bd 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 57a2327896..3ef4311a9c 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 fb2f000cdd..eddca41832 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 fd7911f9a9..b1438620be 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 !/^</;