diff --git a/app/core/gimpbuffer.c b/app/core/gimpbuffer.c
index 297293c98a..2d700ac0da 100644
--- a/app/core/gimpbuffer.c
+++ b/app/core/gimpbuffer.c
@@ -28,6 +28,7 @@
 
 #include "gegl/gimp-babl.h"
 #include "gegl/gimp-gegl-loops.h"
+#include "gegl/gimp-gegl-utils.h"
 
 #include "gimp-memsize.h"
 #include "gimpbuffer.h"
@@ -390,7 +391,7 @@ gimp_buffer_new (GeglBuffer    *buffer,
                               NULL);
 
   if (copy_pixels)
-    gimp_buffer->buffer = gegl_buffer_dup (buffer);
+    gimp_buffer->buffer = gimp_gegl_buffer_dup (buffer);
   else
     gimp_buffer->buffer = g_object_ref (buffer);
 
diff --git a/app/core/gimpdrawable.c b/app/core/gimpdrawable.c
index 7243114a86..8cfb79ff20 100644
--- a/app/core/gimpdrawable.c
+++ b/app/core/gimpdrawable.c
@@ -30,6 +30,7 @@
 #include "gegl/gimp-babl.h"
 #include "gegl/gimp-gegl-apply-operation.h"
 #include "gegl/gimp-gegl-loops.h"
+#include "gegl/gimp-gegl-utils.h"
 #include "gegl/gimptilehandlerbuffer.h"
 
 #include "gimp-memsize.h"
@@ -504,7 +505,7 @@ gimp_drawable_duplicate (GimpItem *item,
       GimpDrawable  *new_drawable = GIMP_DRAWABLE (new_item);
       GeglBuffer    *new_buffer;
 
-      new_buffer = gegl_buffer_dup (gimp_drawable_get_buffer (drawable));
+      new_buffer = gimp_gegl_buffer_dup (gimp_drawable_get_buffer (drawable));
 
       gimp_drawable_set_buffer (new_drawable, FALSE, NULL, new_buffer);
       g_object_unref (new_buffer);
@@ -972,7 +973,7 @@ gimp_drawable_real_swap_pixels (GimpDrawable *drawable,
   gint        width  = gegl_buffer_get_width (buffer);
   gint        height = gegl_buffer_get_height (buffer);
 
-  tmp = gegl_buffer_dup (buffer);
+  tmp = gimp_gegl_buffer_dup (buffer);
 
   gimp_gegl_buffer_copy (gimp_drawable_get_buffer (drawable),
                          GEGL_RECTANGLE (x, y, width, height), GEGL_ABYSS_NONE,
@@ -1760,7 +1761,7 @@ gimp_drawable_start_paint (GimpDrawable *drawable)
       g_return_if_fail (drawable->private->paint_copy_region == NULL);
       g_return_if_fail (drawable->private->paint_update_region == NULL);
 
-      drawable->private->paint_buffer = gegl_buffer_dup (buffer);
+      drawable->private->paint_buffer = gimp_gegl_buffer_dup (buffer);
     }
 
   drawable->private->paint_count++;
diff --git a/app/core/gimpdrawablemodundo.c b/app/core/gimpdrawablemodundo.c
index 3c75d53142..db2c933058 100644
--- a/app/core/gimpdrawablemodundo.c
+++ b/app/core/gimpdrawablemodundo.c
@@ -108,7 +108,7 @@ gimp_drawable_mod_undo_constructed (GObject *object)
   if (drawable_mod_undo->copy_buffer)
     {
       drawable_mod_undo->buffer =
-        gegl_buffer_dup (gimp_drawable_get_buffer (drawable));
+        gimp_gegl_buffer_dup (gimp_drawable_get_buffer (drawable));
     }
   else
     {
diff --git a/app/core/gimplineart.c b/app/core/gimplineart.c
index ecd4cf18d7..22520014e9 100644
--- a/app/core/gimplineart.c
+++ b/app/core/gimplineart.c
@@ -28,6 +28,7 @@
 #include "core-types.h"
 
 #include "gegl/gimp-gegl-loops.h"
+#include "gegl/gimp-gegl-utils.h"
 
 #include "gimp-parallel.h"
 #include "gimp-priorities.h"
@@ -649,7 +650,8 @@ gimp_line_art_prepare_async (GimpLineArt *line_art,
 
   gimp_pickable_flush (line_art->priv->input);
 
-  buffer = gegl_buffer_dup (gimp_pickable_get_buffer (line_art->priv->input));
+  buffer = gimp_gegl_buffer_dup (
+    gimp_pickable_get_buffer (line_art->priv->input));
 
   data  = line_art_data_new (buffer, line_art);
 
@@ -1063,7 +1065,7 @@ gimp_line_art_close (GeglBuffer  *buffer,
             goto end3;
 
           g_object_unref (closed);
-          closed = gegl_buffer_dup (strokes);
+          closed = gimp_gegl_buffer_dup (strokes);
 
           /* Draw splines */
           while (candidates)
diff --git a/app/gegl/gimp-gegl-apply-operation.c b/app/gegl/gimp-gegl-apply-operation.c
index f09d16e91a..5acb63dd8f 100644
--- a/app/gegl/gimp-gegl-apply-operation.c
+++ b/app/gegl/gimp-gegl-apply-operation.c
@@ -133,7 +133,7 @@ gimp_gegl_apply_cached_operation (GeglBuffer          *src_buffer,
           ! (gimp_gegl_node_is_point_operation  (underlying_operation) ||
              gimp_gegl_node_is_source_operation (underlying_operation)))
         {
-          src_buffer = gegl_buffer_dup (src_buffer);
+          src_buffer = gimp_gegl_buffer_dup (src_buffer);
         }
       else
         {
diff --git a/app/paint/gimppaintcore.c b/app/paint/gimppaintcore.c
index e8138c495e..a8fc47f5e7 100644
--- a/app/paint/gimppaintcore.c
+++ b/app/paint/gimppaintcore.c
@@ -33,6 +33,7 @@
 #include "gegl/gimp-babl.h"
 #include "gegl/gimp-gegl-loops.h"
 #include "gegl/gimp-gegl-nodes.h"
+#include "gegl/gimp-gegl-utils.h"
 #include "gegl/gimpapplicator.h"
 
 #include "core/gimp.h"
@@ -391,7 +392,7 @@ gimp_paint_core_start (GimpPaintCore     *core,
   if (core->undo_buffer)
     g_object_unref (core->undo_buffer);
 
-  core->undo_buffer = gegl_buffer_dup (gimp_drawable_get_buffer (drawable));
+  core->undo_buffer = gimp_gegl_buffer_dup (gimp_drawable_get_buffer (drawable));
 
   /*  Allocate the saved proj structure  */
   g_clear_object (&core->saved_proj_buffer);
@@ -400,7 +401,7 @@ gimp_paint_core_start (GimpPaintCore     *core,
     {
       GeglBuffer *buffer = gimp_pickable_get_buffer (GIMP_PICKABLE (image));
 
-      core->saved_proj_buffer = gegl_buffer_dup (buffer);
+      core->saved_proj_buffer = gimp_gegl_buffer_dup (buffer);
     }
 
   /*  Allocate the canvas blocks structure  */
diff --git a/app/tools/gimpforegroundselecttool.c b/app/tools/gimpforegroundselecttool.c
index f59f07034c..df3bda7ead 100644
--- a/app/tools/gimpforegroundselecttool.c
+++ b/app/tools/gimpforegroundselecttool.c
@@ -37,6 +37,7 @@
 
 #include "gegl/gimp-gegl-loops.h"
 #include "gegl/gimp-gegl-mask.h"
+#include "gegl/gimp-gegl-utils.h"
 
 #include "core/gimp.h"
 #include "core/gimpchannel-select.h"
@@ -1360,7 +1361,7 @@ gimp_foreground_select_undo_pop (StrokeUndo *undo,
   GeglBuffer *buffer;
   gint        width, height;
 
-  buffer = gegl_buffer_dup (undo->saved_trimap);
+  buffer = gimp_gegl_buffer_dup (undo->saved_trimap);
 
   width  = gegl_buffer_get_width  (buffer);
   height = gegl_buffer_get_height (buffer);
diff --git a/app/tools/gimpseamlessclonetool.c b/app/tools/gimpseamlessclonetool.c
index 2444026c41..4848c702a5 100644
--- a/app/tools/gimpseamlessclonetool.c
+++ b/app/tools/gimpseamlessclonetool.c
@@ -31,6 +31,8 @@
 
 #include "config/gimpguiconfig.h" /* playground */
 
+#include "gegl/gimp-gegl-utils.h"
+
 #include "core/gimp.h"
 #include "core/gimpbuffer.h"
 #include "core/gimpdrawablefilter.h"
@@ -296,7 +298,7 @@ gimp_seamless_clone_tool_start (GimpSeamlessCloneTool *sc,
           return;
         }
 
-      sc->paste = gegl_buffer_dup (gimp_buffer_get_buffer (buffer));
+      sc->paste = gimp_gegl_buffer_dup (gimp_buffer_get_buffer (buffer));
       g_object_unref (buffer);
 
       sc->width  = gegl_buffer_get_width  (sc->paste);