diff --git a/app/base/Makefile.am b/app/base/Makefile.am
index 5a0cff313e..ace81463e7 100644
--- a/app/base/Makefile.am
+++ b/app/base/Makefile.am
@@ -26,8 +26,6 @@ libappbase_a_SOURCES = \
 	color-balance.h		\
 	cpercep.c		\
 	cpercep.h		\
-	gimphistogram.c		\
-	gimphistogram.h		\
 	gimplut.c		\
 	gimplut.h		\
 	hue-saturation.c	\
diff --git a/app/base/base-types.h b/app/base/base-types.h
index 6208fcc0de..881e8a37e0 100644
--- a/app/base/base-types.h
+++ b/app/base/base-types.h
@@ -47,7 +47,6 @@
 
 /* types */
 
-typedef struct _GimpHistogram       GimpHistogram;
 typedef struct _GimpLut             GimpLut;
 
 typedef struct _ColorBalance        ColorBalance;
diff --git a/app/base/lut-funcs.c b/app/base/lut-funcs.c
index ca80f8e53d..e817e83e13 100644
--- a/app/base/lut-funcs.c
+++ b/app/base/lut-funcs.c
@@ -21,9 +21,9 @@
 
 #include "libgimpmath/gimpmath.h"
 
-#include "base-types.h"
+#include "core/core-types.h"
 
-#include "gimphistogram.h"
+#include "core/gimphistogram.h"
 #include "gimplut.h"
 #include "lut-funcs.h"
 
diff --git a/app/core/Makefile.am b/app/core/Makefile.am
index 9abcb10461..81165acb92 100644
--- a/app/core/Makefile.am
+++ b/app/core/Makefile.am
@@ -195,6 +195,8 @@ libappcore_a_sources = \
 	gimpguide.h				\
 	gimpguideundo.c				\
 	gimpguideundo.h				\
+	gimphistogram.c				\
+	gimphistogram.h				\
 	gimpidtable.c				\
 	gimpidtable.h				\
 	gimpimage.c				\
diff --git a/app/core/core-types.h b/app/core/core-types.h
index 5bbee2605b..dbbb7b3f75 100644
--- a/app/core/core-types.h
+++ b/app/core/core-types.h
@@ -153,6 +153,7 @@ typedef struct _GimpUndoAccumulator   GimpUndoAccumulator;
 typedef struct _GimpBuffer          GimpBuffer;
 typedef struct _GimpEnvironTable    GimpEnvironTable;
 typedef struct _GimpGuide           GimpGuide;
+typedef struct _GimpHistogram       GimpHistogram;
 typedef struct _GimpIdTable         GimpIdTable;
 typedef struct _GimpImageMap        GimpImageMap;
 typedef struct _GimpImageMapConfig  GimpImageMapConfig;
diff --git a/app/core/gimpdrawable-equalize.c b/app/core/gimpdrawable-equalize.c
index dff164a7aa..5c473dead0 100644
--- a/app/core/gimpdrawable-equalize.c
+++ b/app/core/gimpdrawable-equalize.c
@@ -21,7 +21,6 @@
 
 #include "core-types.h"
 
-#include "base/gimphistogram.h"
 #include "base/gimplut.h"
 #include "base/lut-funcs.h"
 
@@ -29,6 +28,7 @@
 #include "gimpdrawable-equalize.h"
 #include "gimpdrawable-histogram.h"
 #include "gimpdrawable-process.h"
+#include "gimphistogram.h"
 
 #include "gimp-intl.h"
 
diff --git a/app/core/gimpdrawable-histogram.c b/app/core/gimpdrawable-histogram.c
index 95202c4168..50698fd5d3 100644
--- a/app/core/gimpdrawable-histogram.c
+++ b/app/core/gimpdrawable-histogram.c
@@ -23,11 +23,11 @@
 
 #include "core-types.h"
 
-#include "base/gimphistogram.h"
 #include "base/pixel-region.h"
 
 #include "gimpchannel.h"
 #include "gimpdrawable-histogram.h"
+#include "gimphistogram.h"
 #include "gimpimage.h"
 
 
diff --git a/app/core/gimpdrawable-levels.c b/app/core/gimpdrawable-levels.c
index 42e795ff44..56045d06bb 100644
--- a/app/core/gimpdrawable-levels.c
+++ b/app/core/gimpdrawable-levels.c
@@ -21,8 +21,6 @@
 
 #include "core-types.h"
 
-#include "base/gimphistogram.h"
-
 #include "gegl/gimplevelsconfig.h"
 
 #include "gimpdrawable.h"
@@ -30,6 +28,7 @@
 #include "gimpdrawable-levels.h"
 #include "gimpdrawable-operation.h"
 #include "gimpdrawable-process.h"
+#include "gimphistogram.h"
 #include "gimpprogress.h"
 
 #include "gimp-intl.h"
diff --git a/app/base/gimphistogram.c b/app/core/gimphistogram.c
similarity index 99%
rename from app/base/gimphistogram.c
rename to app/core/gimphistogram.c
index 0bb6cc9fdf..da5c913ff8 100644
--- a/app/base/gimphistogram.c
+++ b/app/core/gimphistogram.c
@@ -26,11 +26,12 @@
 
 #include "libgimpmath/gimpmath.h"
 
-#include "base-types.h"
+#include "core-types.h"
+
+#include "base/pixel-processor.h"
+#include "base/pixel-region.h"
 
 #include "gimphistogram.h"
-#include "pixel-processor.h"
-#include "pixel-region.h"
 
 
 #ifdef ENABLE_MP
diff --git a/app/base/gimphistogram.h b/app/core/gimphistogram.h
similarity index 100%
rename from app/base/gimphistogram.h
rename to app/core/gimphistogram.h
diff --git a/app/gegl/gimpcurvesconfig.c b/app/gegl/gimpcurvesconfig.c
index c5a0663268..b31b598578 100644
--- a/app/gegl/gimpcurvesconfig.c
+++ b/app/gegl/gimpcurvesconfig.c
@@ -32,9 +32,8 @@
 
 #include "gimp-gegl-types.h"
 
-#include "base/gimphistogram.h"
-
 #include "core/gimpcurve.h"
+#include "core/gimphistogram.h"
 
 #include "gimpcurvesconfig.h"
 
diff --git a/app/gegl/gimplevelsconfig.c b/app/gegl/gimplevelsconfig.c
index 89ee3a7812..0c79c3bd3d 100644
--- a/app/gegl/gimplevelsconfig.c
+++ b/app/gegl/gimplevelsconfig.c
@@ -33,9 +33,8 @@
 
 #include "gimp-gegl-types.h"
 
-#include "base/gimphistogram.h"
-
 #include "core/gimpcurve.h"
+#include "core/gimphistogram.h"
 
 #include "gimpcurvesconfig.h"
 #include "gimplevelsconfig.h"
diff --git a/app/pdb/color-cmds.c b/app/pdb/color-cmds.c
index e66fbecd04..994dc96f80 100644
--- a/app/pdb/color-cmds.c
+++ b/app/pdb/color-cmds.c
@@ -23,7 +23,6 @@
 
 #include "pdb-types.h"
 
-#include "base/gimphistogram.h"
 #include "core/gimpdrawable-color-balance.h"
 #include "core/gimpdrawable-equalize.h"
 #include "core/gimpdrawable-histogram.h"
@@ -31,6 +30,7 @@
 #include "core/gimpdrawable-levels.h"
 #include "core/gimpdrawable-operation.h"
 #include "core/gimpdrawable.h"
+#include "core/gimphistogram.h"
 #include "core/gimpparamspecs.h"
 #include "gegl/gimpbrightnesscontrastconfig.h"
 #include "gegl/gimpcolorizeconfig.h"
diff --git a/app/tools/gimpcurvestool.c b/app/tools/gimpcurvestool.c
index a53457bbf2..8e056cbb4d 100644
--- a/app/tools/gimpcurvestool.c
+++ b/app/tools/gimpcurvestool.c
@@ -30,8 +30,6 @@
 
 #include "tools-types.h"
 
-#include "base/gimphistogram.h"
-
 #include "gegl/gimpcurvesconfig.h"
 #include "gegl/gimpoperationcurves.h"
 
@@ -41,6 +39,7 @@
 #include "core/gimpdrawable.h"
 #include "core/gimpdrawable-histogram.h"
 #include "core/gimperror.h"
+#include "core/gimphistogram.h"
 #include "core/gimpimage.h"
 
 #include "widgets/gimpcolorbar.h"
diff --git a/app/tools/gimplevelstool.c b/app/tools/gimplevelstool.c
index 6e5e774f14..51c4c70836 100644
--- a/app/tools/gimplevelstool.c
+++ b/app/tools/gimplevelstool.c
@@ -30,14 +30,13 @@
 
 #include "tools-types.h"
 
-#include "base/gimphistogram.h"
-
 #include "gegl/gimplevelsconfig.h"
 #include "gegl/gimpoperationlevels.h"
 
 #include "core/gimpdrawable.h"
 #include "core/gimpdrawable-histogram.h"
 #include "core/gimperror.h"
+#include "core/gimphistogram.h"
 #include "core/gimpimage.h"
 
 #include "widgets/gimpcolorbar.h"
diff --git a/app/tools/gimpthresholdtool.c b/app/tools/gimpthresholdtool.c
index 143a692ef3..3d5f6602d8 100644
--- a/app/tools/gimpthresholdtool.c
+++ b/app/tools/gimpthresholdtool.c
@@ -25,13 +25,12 @@
 
 #include "tools-types.h"
 
-#include "base/gimphistogram.h"
-
 #include "gegl/gimpthresholdconfig.h"
 
 #include "core/gimpdrawable.h"
 #include "core/gimpdrawable-histogram.h"
 #include "core/gimperror.h"
+#include "core/gimphistogram.h"
 #include "core/gimpimage.h"
 
 #include "widgets/gimphelp-ids.h"
diff --git a/app/widgets/gimphistogrambox.c b/app/widgets/gimphistogrambox.c
index f6a7f11e50..e090cae6f5 100644
--- a/app/widgets/gimphistogrambox.c
+++ b/app/widgets/gimphistogrambox.c
@@ -26,7 +26,7 @@
 
 #include "widgets-types.h"
 
-#include "base/gimphistogram.h"
+#include "core/gimphistogram.h"
 
 #include "gimpcolorbar.h"
 #include "gimphandlebar.h"
diff --git a/app/widgets/gimphistogrameditor.c b/app/widgets/gimphistogrameditor.c
index 4edd65ba03..1ab9deed94 100644
--- a/app/widgets/gimphistogrameditor.c
+++ b/app/widgets/gimphistogrameditor.c
@@ -24,11 +24,10 @@
 
 #include "widgets-types.h"
 
-#include "base/gimphistogram.h"
-
 #include "core/gimp.h"
 #include "core/gimpdrawable.h"
 #include "core/gimpdrawable-histogram.h"
+#include "core/gimphistogram.h"
 #include "core/gimpimage.h"
 
 #include "gimpdocked.h"
diff --git a/app/widgets/gimphistogramview.c b/app/widgets/gimphistogramview.c
index f3e8df1849..700594e177 100644
--- a/app/widgets/gimphistogramview.c
+++ b/app/widgets/gimphistogramview.c
@@ -23,8 +23,7 @@
 
 #include "widgets-types.h"
 
-#include "base/gimphistogram.h"
-
+#include "core/gimphistogram.h"
 #include "core/gimpmarshal.h"
 
 #include "gimphistogramview.h"
diff --git a/tools/pdbgen/pdb/color.pdb b/tools/pdbgen/pdb/color.pdb
index ccb324353b..70b15608a7 100644
--- a/tools/pdbgen/pdb/color.pdb
+++ b/tools/pdbgen/pdb/color.pdb
@@ -655,8 +655,8 @@ HELP
     );
 
     %invoke = (
-	headers => [ qw("base/gimphistogram.h"
-                        "core/gimpdrawable-histogram.h") ],
+	headers => [ qw("core/gimpdrawable-histogram.h"
+                        "core/gimphistogram.h") ],
 	code => <<'CODE'
 {
   if (! gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL, FALSE, error) ||