app: move GimpTempBuf from base/ to core/

and forget about include policy in base/, it's scheduled for removal
anyway.

app/base/Makefile.am

@@ -30,8 +30,6 @@ libappbase_a_SOURCES = \
 	pixel-region.h		\
 	siox.c			\
 	siox.h			\
-	temp-buf.c		\
-	temp-buf.h		\
 	tile.c			\
 	tile.h			\
 	tile-private.h		\

app/base/base-types.h

@@ -53,8 +53,6 @@ typedef struct _PixelRegionHolder   PixelRegionHolder;
 
 typedef struct _SioxState           SioxState;
 
-typedef struct _GimpTempBuf         GimpTempBuf;
-
 typedef struct _Tile                Tile;
 typedef struct _TileManager         TileManager;
 typedef struct _TilePyramid         TilePyramid;

app/base/pixel-processor.c

@@ -25,7 +25,7 @@
 
 #include <glib-object.h>
 
-#include "base-types.h"
+#include "core/core-types.h" /* eek, but this file will die anyway */
 
 #include "config/gimpbaseconfig.h"
 

app/base/pixel-region.c

@@ -22,10 +22,11 @@
 
 #include <gegl.h>
 
-#include "base-types.h"
+#include "core/core-types.h" /* eek, but this file will die anyway */
+
+#include "core/gimptempbuf.h"
 
 #include "pixel-region.h"
-#include "temp-buf.h"
 #include "tile-manager.h"
 #include "tile.h"
 

app/base/siox.c

@@ -40,7 +40,7 @@
 #include "libgimpbase/gimpbase.h"
 #include "libgimpmath/gimpmath.h"
 
-#include "base-types.h"
+#include "core/core-types.h" /* eek, but this file will die anyway */
 
 #include "paint-funcs/paint-funcs.h"
 

app/base/tile-manager-preview.c

@@ -25,8 +25,9 @@
 
 #include "gegl/gimp-gegl-utils.h"
 
+#include "core/gimptempbuf.h"
+
 #include "pixel-region.h"
-#include "temp-buf.h"
 #include "tile-manager.h"
 #include "tile-manager-preview.h"
 

app/core/Makefile.am

@@ -347,6 +347,8 @@ libappcore_a_sources = \
 	gimptagged.h				\
 	gimptaggedcontainer.c			\
 	gimptaggedcontainer.h			\
+	gimptempbuf.c				\
+	gimptempbuf.h				\
 	gimptemplate.c				\
 	gimptemplate.h				\
 	gimptoolinfo.c				\

app/core/core-types.h

@@ -184,6 +184,7 @@ typedef struct _GimpGradientSegment GimpGradientSegment;
 typedef struct _GimpPaletteEntry    GimpPaletteEntry;
 typedef struct _GimpSamplePoint     GimpSamplePoint;
 typedef struct _GimpScanConvert     GimpScanConvert;
+typedef struct _GimpTempBuf         GimpTempBuf;
 typedef         guint32             GimpTattoo;
 
 /* The following hack is made so that we can reuse the definition

app/core/gimp-edit.c

@@ -27,8 +27,6 @@
 
 #include "core-types.h"
 
-#include "base/temp-buf.h"
-
 #include "gegl/gimp-gegl-utils.h"
 
 #include "gimp.h"
@@ -45,6 +43,7 @@
 #include "gimppattern.h"
 #include "gimppickable.h"
 #include "gimpselection.h"
+#include "gimptempbuf.h"
 
 #include "gimp-intl.h"
 

app/core/gimpbrush-boundary.c

@@ -22,12 +22,11 @@
 
 #include "core-types.h"
 
-#include "base/temp-buf.h"
-
 #include "gimpbezierdesc.h"
 #include "gimpboundary.h"
 #include "gimpbrush.h"
 #include "gimpbrush-boundary.h"
+#include "gimptempbuf.h"
 
 
 static GimpBezierDesc *

app/core/gimpbrush-load.c

@@ -45,11 +45,10 @@
 
 #include "core-types.h"
 
-#include "base/temp-buf.h"
-
 #include "gimpbrush.h"
 #include "gimpbrush-header.h"
 #include "gimpbrush-load.h"
+#include "gimptempbuf.h"
 
 #include "gimp-intl.h"
 

app/core/gimpbrush-transform.c

@@ -25,13 +25,12 @@
 
 #include "core-types.h"
 
-#include "base/temp-buf.h"
-
 #include "gegl/gimp-gegl-loops.h"
 #include "gegl/gimp-gegl-utils.h"
 
 #include "gimpbrush.h"
 #include "gimpbrush-transform.h"
+#include "gimptempbuf.h"
 
 
 #define MAX_BLUR_KERNEL 15

app/core/gimpbrush.c

@@ -25,8 +25,6 @@
 
 #include "core-types.h"
 
-#include "base/temp-buf.h"
-
 #include "gimpbezierdesc.h"
 #include "gimpbrush.h"
 #include "gimpbrush-boundary.h"
@@ -36,6 +34,7 @@
 #include "gimpbrushgenerated.h"
 #include "gimpmarshal.h"
 #include "gimptagged.h"
+#include "gimptempbuf.h"
 
 #include "gimp-intl.h"
 

app/core/gimpbrushclipboard.c

@@ -24,14 +24,13 @@
 
 #include "core-types.h"
 
-#include "base/temp-buf.h"
-
 #include "gegl/gimp-gegl-utils.h"
 
 #include "gimp.h"
 #include "gimpbuffer.h"
 #include "gimpbrushclipboard.h"
 #include "gimpimage.h"
+#include "gimptempbuf.h"
 
 #include "gimp-intl.h"
 

app/core/gimpbrushgenerated-load.c

@@ -34,8 +34,6 @@
 
 #include "core-types.h"
 
-#include "base/temp-buf.h"
-
 #include "gimpbrushgenerated.h"
 #include "gimpbrushgenerated-load.h"
 

app/core/gimpbrushgenerated-save.c

@@ -34,8 +34,6 @@
 
 #include "core-types.h"
 
-#include "base/temp-buf.h"
-
 #include "gimpbrushgenerated.h"
 #include "gimpbrushgenerated-save.h"
 

app/core/gimpbrushgenerated.c

@@ -26,11 +26,10 @@
 
 #include "core-types.h"
 
-#include "base/temp-buf.h"
-
 #include "gimpbrushgenerated.h"
 #include "gimpbrushgenerated-load.h"
 #include "gimpbrushgenerated-save.h"
+#include "gimptempbuf.h"
 
 #include "gimp-intl.h"
 

app/core/gimpbrushpipe-load.c

@@ -45,8 +45,6 @@
 
 #include "core-types.h"
 
-#include "base/temp-buf.h"
-
 #include "gimpbrush-load.h"
 #include "gimpbrushpipe.h"
 #include "gimpbrushpipe-load.h"

app/core/gimpbrushpipe.c

@@ -24,8 +24,6 @@
 
 #include "core-types.h"
 
-#include "base/temp-buf.h"
-
 #include "gimpbrushpipe.h"
 #include "gimpbrushpipe-load.h"
 

app/core/gimpbuffer.c

@@ -22,13 +22,12 @@
 
 #include "core-types.h"
 
-#include "base/temp-buf.h"
-
 #include "gegl/gimp-gegl-utils.h"
 
 #include "gimp-utils.h"
 #include "gimpbuffer.h"
 #include "gimpimage.h"
+#include "gimptempbuf.h"
 
 
 static void          gimp_buffer_finalize         (GObject       *object);

app/core/gimpdrawable-preview.c

@@ -26,7 +26,6 @@
 #include "core-types.h"
 
 #include "base/pixel-region.h"
-#include "base/temp-buf.h"
 #include "base/tile-manager-preview.h"
 
 #include "paint-funcs/subsample-region.h"
@@ -42,6 +41,7 @@
 #include "gimpdrawable-private.h"
 #include "gimplayer.h"
 #include "gimppreviewcache.h"
+#include "gimptempbuf.h"
 
 
 /*  local function prototypes  */

app/core/gimpgradient.c

@@ -27,13 +27,12 @@
 
 #include "core-types.h"
 
-#include "base/temp-buf.h"
-
 #include "gimpcontext.h"
 #include "gimpgradient.h"
 #include "gimpgradient-load.h"
 #include "gimpgradient-save.h"
 #include "gimptagged.h"
+#include "gimptempbuf.h"
 
 
 #define EPSILON 1e-10

app/core/gimpimage-merge.c

@@ -27,7 +27,6 @@
 #include "core-types.h"
 
 #include "base/pixel-region.h"
-#include "base/temp-buf.h"
 #include "base/tile-manager.h"
 
 #include "paint-funcs/paint-funcs.h"

app/core/gimpimage-preview.c

@@ -21,13 +21,13 @@
 
 #include "core-types.h"
 
-#include "base/temp-buf.h"
 #include "base/tile-manager-preview.h"
 
 #include "gimpimage.h"
 #include "gimpimage-preview.h"
 #include "gimpimage-private.h"
 #include "gimpprojection.h"
+#include "gimptempbuf.h"
 
 
 void

app/core/gimpimage.c

@@ -30,8 +30,6 @@
 
 #include "core-types.h"
 
-#include "base/temp-buf.h"
-
 #include "config/gimpcoreconfig.h"
 
 #include "gegl/gimp-gegl-utils.h"
@@ -65,6 +63,7 @@
 #include "gimpprojection.h"
 #include "gimpsamplepoint.h"
 #include "gimpselection.h"
+#include "gimptempbuf.h"
 #include "gimptemplate.h"
 #include "gimpundostack.h"
 

app/core/gimppalette.c

@@ -27,13 +27,12 @@
 
 #include "core-types.h"
 
-#include "base/temp-buf.h"
-
 #include "gimp-utils.h"
 #include "gimppalette.h"
 #include "gimppalette-load.h"
 #include "gimppalette-save.h"
 #include "gimptagged.h"
+#include "gimptempbuf.h"
 
 #include "gimp-intl.h"
 

app/core/gimppattern-load.c

@@ -47,13 +47,12 @@
 
 #include "core-types.h"
 
-#include "base/temp-buf.h"
-
 #include "gegl/gimp-gegl-utils.h"
 
 #include "gimppattern.h"
 #include "gimppattern-header.h"
 #include "gimppattern-load.h"
+#include "gimptempbuf.h"
 
 #include "gimp-intl.h"
 

app/core/gimppattern.c

@@ -25,13 +25,12 @@
 
 #include "core-types.h"
 
-#include "base/temp-buf.h"
-
 #include "gegl/gimp-gegl-utils.h"
 
 #include "gimppattern.h"
 #include "gimppattern-load.h"
 #include "gimptagged.h"
+#include "gimptempbuf.h"
 
 #include "gimp-intl.h"
 

app/core/gimppatternclipboard.c

@@ -24,8 +24,6 @@
 
 #include "core-types.h"
 
-#include "base/temp-buf.h"
-
 #include "gegl/gimp-gegl-utils.h"
 
 #include "gimp.h"
@@ -33,6 +31,7 @@
 #include "gimppatternclipboard.h"
 #include "gimpimage.h"
 #include "gimppickable.h"
+#include "gimptempbuf.h"
 
 #include "gimp-intl.h"
 

app/core/gimppreviewcache.c

@@ -21,9 +21,8 @@
 
 #include "core-types.h"
 
-#include "base/temp-buf.h"
-
 #include "gimppreviewcache.h"
+#include "gimptempbuf.h"
 
 
 #define MAX_CACHE_PREVIEWS 5

app/core/gimptempbuf.c

@@ -17,19 +17,15 @@
 
 #include "config.h"
 
-#include <fcntl.h>
 #include <string.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <unistd.h>
 
 #include <cairo.h>
 #include <gegl.h>
 #include <glib/gstdio.h>
 
-#include "base-types.h"
+#include "core-types.h"
 
-#include "temp-buf.h"
+#include "gimptempbuf.h"
 
 
 GimpTempBuf *

app/core/gimptoolinfo.c

@@ -26,8 +26,6 @@
 
 #include "core-types.h"
 
-#include "base/temp-buf.h"
-
 #include "gimp.h"
 #include "gimpdatafactory.h"
 #include "gimpfilteredcontainer.h"

app/core/gimpundo.c

@@ -25,8 +25,6 @@
 
 #include "core-types.h"
 
-#include "base/temp-buf.h"
-
 #include "config/gimpcoreconfig.h"
 
 #include "gimp.h"
@@ -34,6 +32,7 @@
 #include "gimpimage.h"
 #include "gimpimage-undo.h"
 #include "gimpmarshal.h"
+#include "gimptempbuf.h"
 #include "gimpundo.h"
 #include "gimpundostack.h"
 

app/core/gimpviewable.c

@@ -29,13 +29,12 @@
 
 #include "core-types.h"
 
-#include "base/temp-buf.h"
-
 #include "gegl/gimp-gegl-utils.h"
 
 #include "gimp-utils.h"
 #include "gimpcontext.h"
 #include "gimpmarshal.h"
+#include "gimptempbuf.h"
 #include "gimpviewable.h"
 
 #include "themes/Default/images/gimp-core-pixbufs.h"

app/paint-funcs/paint-funcs.c

@@ -25,11 +25,12 @@
 #include "libgimpcolor/gimpcolor.h"
 #include "libgimpmath/gimpmath.h"
 
-#include "paint-funcs-types.h"
+#include "core/core-types.h" /* eek, but this file will die anyway */
+
+#include "core/gimptempbuf.h"
 
 #include "base/pixel-processor.h"
 #include "base/pixel-region.h"
-#include "base/temp-buf.h"
 #include "base/tile-manager.h"
 #include "base/tile-rowhints.h"
 #include "base/tile.h"

app/paint-funcs/subsample-region.c

@@ -21,7 +21,7 @@
 
 #include <glib-object.h>
 
-#include "paint-funcs-types.h"
+#include "core/core-types.h" /* eek, but this file will die anyway */
 
 #include "base/pixel-region.h"
 

app/paint/gimpbrushcore.c

@@ -26,7 +26,6 @@
 #include "paint-types.h"
 
 #include "base/pixel-region.h"
-#include "base/temp-buf.h"
 
 #include "gegl/gimp-gegl-utils.h"
 
@@ -37,6 +36,7 @@
 #include "core/gimperror.h"
 #include "core/gimpimage.h"
 #include "core/gimpmarshal.h"
+#include "core/gimptempbuf.h"
 
 #include "gimpbrushcore.h"
 #include "gimpbrushcore-kernels.h"

app/paint/gimpclone.c

@@ -26,8 +26,6 @@
 
 #include "paint-types.h"
 
-#include "base/temp-buf.h"
-
 #include "gegl/gimp-gegl-utils.h"
 
 #include "core/gimp.h"

app/paint/gimpconvolve.c

@@ -21,8 +21,6 @@
 
 #include "paint-types.h"
 
-#include "base/temp-buf.h"
-
 #include "gegl/gimp-gegl-loops.h"
 #include "gegl/gimp-gegl-utils.h"
 
@@ -33,6 +31,7 @@
 #include "core/gimpdynamicsoutput.h"
 #include "core/gimpimage.h"
 #include "core/gimppickable.h"
+#include "core/gimptempbuf.h"
 
 #include "gimpconvolve.h"
 #include "gimpconvolveoptions.h"

app/paint/gimpheal.c

@@ -26,8 +26,6 @@
 
 #include "paint-types.h"
 
-#include "base/temp-buf.h"
-
 #include "gegl/gimp-gegl-utils.h"
 
 #include "core/gimpbrush.h"
@@ -37,6 +35,7 @@
 #include "core/gimperror.h"
 #include "core/gimpimage.h"
 #include "core/gimppickable.h"
+#include "core/gimptempbuf.h"
 
 #include "gimpheal.h"
 #include "gimpsourceoptions.h"

app/paint/gimpink.c

@@ -25,13 +25,12 @@
 
 #include "paint-types.h"
 
-#include "base/temp-buf.h"
-
 #include "gegl/gimp-gegl-utils.h"
 
 #include "core/gimpdrawable.h"
 #include "core/gimpimage.h"
 #include "core/gimpimage-undo.h"
+#include "core/gimptempbuf.h"
 
 #include "gimpinkoptions.h"
 #include "gimpink.h"

app/paint/gimppaintcore.c

@@ -27,7 +27,6 @@
 #include "paint-types.h"
 
 #include "base/pixel-region.h"
-#include "base/temp-buf.h"
 
 #include "paint-funcs/paint-funcs.h"
 

app/paint/gimpperspectiveclone.c

@@ -27,18 +27,16 @@
 
 #include "paint-types.h"
 
-#include "base/temp-buf.h"
-
 #include "gegl/gimp-gegl-nodes.h"
 #include "gegl/gimp-gegl-utils.h"
 
 #include "core/gimp.h"
+#include "core/gimp-utils.h"
 #include "core/gimp-apply-operation.h"
 #include "core/gimpdrawable.h"
 #include "core/gimperror.h"
 #include "core/gimpimage.h"
 #include "core/gimppickable.h"
-#include "core/gimp-utils.h"
 
 #include "gimpperspectiveclone.h"
 #include "gimpperspectivecloneoptions.h"

app/paint/gimpsmudge.c

@@ -24,7 +24,6 @@
 #include "paint-types.h"
 
 #include "base/pixel-region.h"
-#include "base/temp-buf.h"
 
 #include "paint-funcs/paint-funcs.h"
 
@@ -37,6 +36,7 @@
 #include "core/gimpdynamicsoutput.h"
 #include "core/gimpimage.h"
 #include "core/gimppickable.h"
+#include "core/gimptempbuf.h"
 
 #include "gimpsmudge.h"
 #include "gimpsmudgeoptions.h"

app/paint/gimpsourcecore.c

@@ -23,8 +23,6 @@
 
 #include "paint-types.h"
 
-#include "base/temp-buf.h"
-
 #include "gegl/gimp-gegl-utils.h"
 
 #include "core/gimp.h"

app/pdb/brush-cmds.c

@@ -25,13 +25,13 @@
 
 #include "pdb-types.h"
 
-#include "base/temp-buf.h"
 #include "core/gimp.h"
 #include "core/gimpbrush.h"
 #include "core/gimpbrushgenerated.h"
 #include "core/gimpcontext.h"
 #include "core/gimpdatafactory.h"
 #include "core/gimpparamspecs.h"
+#include "core/gimptempbuf.h"
 
 #include "gimppdb.h"
 #include "gimppdb-utils.h"

app/pdb/brushes-cmds.c

@@ -25,13 +25,13 @@
 
 #include "pdb-types.h"
 
-#include "base/temp-buf.h"
 #include "core/gimp.h"
 #include "core/gimpbrush.h"
 #include "core/gimpcontainer-filter.h"
 #include "core/gimpcontext.h"
 #include "core/gimpdatafactory.h"
 #include "core/gimpparamspecs.h"
+#include "core/gimptempbuf.h"
 
 #include "gimppdb.h"
 #include "gimppdb-utils.h"

app/pdb/context-cmds.c

@@ -28,12 +28,12 @@
 
 #include "pdb-types.h"
 
-#include "base/temp-buf.h"
 #include "core/gimp.h"
 #include "core/gimpbrush.h"
 #include "core/gimpcontainer.h"
 #include "core/gimpdatafactory.h"
 #include "core/gimpparamspecs.h"
+#include "core/gimptempbuf.h"
 #include "plug-in/gimpplugin-context.h"
 #include "plug-in/gimpplugin.h"
 #include "plug-in/gimppluginmanager.h"

app/pdb/drawable-cmds.c

@@ -23,7 +23,6 @@
 
 #include "pdb-types.h"
 
-#include "base/temp-buf.h"
 #include "config/gimpcoreconfig.h"
 #include "core/gimp.h"
 #include "core/gimpdrawable-foreground-extract.h"
@@ -33,6 +32,7 @@
 #include "core/gimpdrawable.h"
 #include "core/gimpimage.h"
 #include "core/gimpparamspecs.h"
+#include "core/gimptempbuf.h"
 #include "gegl/gimp-gegl-utils.h"
 #include "plug-in/gimpplugin-cleanup.h"
 #include "plug-in/gimpplugin.h"

app/pdb/image-cmds.c

@@ -29,7 +29,6 @@
 
 #include "pdb-types.h"
 
-#include "base/temp-buf.h"
 #include "core/gimp.h"
 #include "core/gimpchannel.h"
 #include "core/gimpcontainer.h"
@@ -52,6 +51,7 @@
 #include "core/gimppickable.h"
 #include "core/gimpprogress.h"
 #include "core/gimpselection.h"
+#include "core/gimptempbuf.h"
 #include "core/gimpunit.h"
 #include "vectors/gimpvectors.h"
 

app/pdb/pattern-cmds.c

@@ -25,11 +25,11 @@
 
 #include "pdb-types.h"
 
-#include "base/temp-buf.h"
 #include "core/gimpcontext.h"
 #include "core/gimpdatafactory.h"
 #include "core/gimpparamspecs.h"
 #include "core/gimppattern.h"
+#include "core/gimptempbuf.h"
 
 #include "gimppdb.h"
 #include "gimppdb-utils.h"

app/pdb/patterns-cmds.c

@@ -25,13 +25,13 @@
 
 #include "pdb-types.h"
 
-#include "base/temp-buf.h"
 #include "core/gimp.h"
 #include "core/gimpcontainer-filter.h"
 #include "core/gimpcontext.h"
 #include "core/gimpdatafactory.h"
 #include "core/gimpparamspecs.h"
 #include "core/gimppattern.h"
+#include "core/gimptempbuf.h"
 
 #include "gimppdb.h"
 #include "gimppdb-utils.h"

app/text/gimpfont.c

@@ -31,7 +31,7 @@
 
 #include "text-types.h"
 
-#include "base/temp-buf.h"
+#include "core/gimptempbuf.h"
 
 #include "gimpfont.h"
 

app/tools/gimpiscissorstool.c

@@ -57,7 +57,6 @@
 #include "tools-types.h"
 
 #include "base/pixel-region.h"
-#include "base/temp-buf.h"
 #include "base/tile-manager.h"
 #include "base/tile.h"
 
@@ -68,6 +67,7 @@
 #include "core/gimpimage.h"
 #include "core/gimppickable.h"
 #include "core/gimpscanconvert.h"
+#include "core/gimptempbuf.h"
 #include "core/gimptoolinfo.h"
 
 #include "widgets/gimphelp-ids.h"

app/tools/gimppaintoptions-gui.c

@@ -24,9 +24,8 @@
 
 #include "tools-types.h"
 
-#include "base/temp-buf.h"
-
 #include "core/gimpbrush.h"
+#include "core/gimptempbuf.h"
 #include "core/gimptoolinfo.h"
 
 #include "paint/gimppaintoptions.h"

app/vectors/gimpvectors-preview.c

@@ -25,9 +25,8 @@
 
 #include "libgimpmath/gimpmath.h"
 
-#include "base/temp-buf.h"
-
 #include "core/gimpimage.h"
+#include "core/gimptempbuf.h"
 
 #include "gimpstroke.h"
 #include "gimpvectors.h"

app/widgets/gimpbrushselect.c

@@ -27,12 +27,11 @@
 
 #include "widgets-types.h"
 
-#include "base/temp-buf.h"
-
 #include "core/gimp.h"
 #include "core/gimpcontext.h"
 #include "core/gimpbrush.h"
 #include "core/gimpparamspecs.h"
+#include "core/gimptempbuf.h"
 
 #include "pdb/gimppdb.h"
 

app/widgets/gimppatternselect.c

@@ -27,12 +27,11 @@
 
 #include "widgets-types.h"
 
-#include "base/temp-buf.h"
-
 #include "core/gimp.h"
 #include "core/gimpcontext.h"
 #include "core/gimpparamspecs.h"
 #include "core/gimppattern.h"
+#include "core/gimptempbuf.h"
 
 #include "pdb/gimppdb.h"
 

app/widgets/gimpviewrenderer.c

@@ -33,10 +33,9 @@
 
 #include "widgets-types.h"
 
-#include "base/temp-buf.h"
-
 #include "core/gimpcontext.h"
 #include "core/gimpmarshal.h"
+#include "core/gimptempbuf.h"
 #include "core/gimpviewable.h"
 
 #include "gimprender.h"

app/widgets/gimpviewrendererbrush.c

@@ -25,10 +25,9 @@
 
 #include "widgets-types.h"
 
-#include "base/temp-buf.h"
-
 #include "core/gimpbrushpipe.h"
 #include "core/gimpbrushgenerated.h"
+#include "core/gimptempbuf.h"
 
 #include "gimpviewrendererbrush.h"
 

app/widgets/gimpviewrendererbuffer.c

@@ -27,8 +27,7 @@
 
 #include "widgets-types.h"
 
-#include "base/temp-buf.h"
-
+#include "core/gimptempbuf.h"
 #include "core/gimpviewable.h"
 
 #include "gimpviewrendererbuffer.h"

app/widgets/gimpviewrendererdrawable.c

@@ -28,13 +28,12 @@
 
 #include "widgets-types.h"
 
-#include "base/temp-buf.h"
-
 #include "gegl/gimp-gegl-utils.h"
 
 #include "core/gimpdrawable.h"
 #include "core/gimpdrawable-preview.h"
 #include "core/gimpimage.h"
+#include "core/gimptempbuf.h"
 
 #include "gimpviewrendererdrawable.h"
 

app/widgets/gimpviewrendererimage.c

@@ -27,9 +27,8 @@
 
 #include "widgets-types.h"
 
-#include "base/temp-buf.h"
-
 #include "core/gimpimage.h"
+#include "core/gimptempbuf.h"
 
 #include "gimpviewrendererimage.h"
 

tools/pdbgen/pdb/brush.pdb

@@ -837,12 +837,12 @@ CODE
 
 
 @headers = qw(<string.h>
-              "base/temp-buf.h"
               "core/gimp.h"
               "core/gimpbrush.h"
               "core/gimpbrushgenerated.h"
               "core/gimpcontext.h" 
               "core/gimpdatafactory.h"
+              "core/gimptempbuf.h"
               "gimppdb-utils.h");
 
 @procs = qw(brush_new

tools/pdbgen/pdb/brushes.pdb

@@ -198,11 +198,11 @@ CODE
 
 
 @headers = qw(<string.h>
-              "base/temp-buf.h"
               "core/gimp.h"
               "core/gimpbrush.h"
               "core/gimpcontext.h"
               "core/gimpdatafactory.h"
+              "core/gimptempbuf.h"
               "gimppdb-utils.h");
 
 @procs = qw(brushes_refresh

tools/pdbgen/pdb/context.pdb

@@ -2195,11 +2195,11 @@ CODE
     );
 }
 
-@headers = qw("base/temp-buf.h"
-              "core/gimp.h"
+@headers = qw("core/gimp.h"
               "core/gimpbrush.h"
               "core/gimpcontainer.h"
               "core/gimpdatafactory.h"
+              "core/gimptempbuf.h"
               "libgimpconfig/gimpconfig.h"
               "plug-in/gimpplugin.h"
               "plug-in/gimpplugin-context.h"

tools/pdbgen/pdb/drawable.pdb

@@ -908,11 +908,11 @@ CODE
 }
 
 
-@headers = qw("base/temp-buf.h"
-              "config/gimpcoreconfig.h"
+@headers = qw("config/gimpcoreconfig.h"
               "gegl/gimp-gegl-utils.h"
               "core/gimp.h"
               "core/gimpdrawable-offset.h"
+              "core/gimptempbuf.h"
               "gimppdb-utils.h"
               "gimp-intl.h");
 

tools/pdbgen/pdb/image.pdb

@@ -2891,10 +2891,10 @@ CODE
 
 @headers = qw("libgimpmath/gimpmath.h"
               "libgimpbase/gimpbase.h"
-              "base/temp-buf.h"
               "core/gimp.h"
               "core/gimpcontainer.h"
               "core/gimpprogress.h"
+              "core/gimptempbuf.h"
               "core/gimpunit.h"
               "gimppdbcontext.h"
               "gimppdberror.h"

tools/pdbgen/pdb/pattern.pdb

@@ -111,10 +111,10 @@ CODE
 
 
 @headers = qw(<string.h>
-              "base/temp-buf.h"
               "core/gimpcontext.h"
               "core/gimpdatafactory.h"
               "core/gimppattern.h"
+              "core/gimptempbuf.h"
               "gimppdb-utils.h");
 
 @procs = qw(pattern_get_info

tools/pdbgen/pdb/patterns.pdb

@@ -149,11 +149,11 @@ CODE
 
 
 @headers = qw(<string.h>
-              "base/temp-buf.h"
               "core/gimp.h"
               "core/gimpcontext.h"
               "core/gimpdatafactory.h"
               "core/gimppattern.h"
+              "core/gimptempbuf.h"
               "gimppdb-utils.h");
 
 @procs = qw(patterns_refresh