[gimp/metadata-browser] app: move all GEGL operations to new directory app/operations/

[Roman Joost <romanofski src gnome org>]

commit 233f0ac59cb59bad0598f71da552e5141cca14bc
Author: Michael Natterer <mitch gimp org>
Date:   Thu May 10 21:22:44 2012 +0200

    app: move all GEGL operations to new directory app/operations/

 app/Makefile.am                                    |    5 +-
 app/core/gimpdrawable-levels.c                     |    2 +-
 app/gegl/Makefile.am                               |  162 +++-----------------
 app/gegl/gimp-gegl.c                               |  104 +------------
 app/operations/.gitignore                          |    5 +
 app/operations/Makefile.am                         |  144 +++++++++++++++++
 app/operations/gimp-operations.c                   |  137 +++++++++++++++++
 app/operations/gimp-operations.h                   |   27 ++++
 .../gimpbrightnesscontrastconfig.c                 |    2 +-
 .../gimpbrightnesscontrastconfig.h                 |    0
 app/{gegl => operations}/gimpcageconfig.c          |    2 +-
 app/{gegl => operations}/gimpcageconfig.h          |    0
 app/{gegl => operations}/gimpcolorbalanceconfig.c  |    2 +-
 app/{gegl => operations}/gimpcolorbalanceconfig.h  |    0
 app/{gegl => operations}/gimpcolorizeconfig.c      |    2 +-
 app/{gegl => operations}/gimpcolorizeconfig.h      |    0
 app/{gegl => operations}/gimpcurvesconfig.c        |    2 +-
 app/{gegl => operations}/gimpcurvesconfig.h        |    0
 app/{gegl => operations}/gimpdesaturateconfig.c    |    2 +-
 app/{gegl => operations}/gimpdesaturateconfig.h    |    0
 app/{gegl => operations}/gimphuesaturationconfig.c |    2 +-
 app/{gegl => operations}/gimphuesaturationconfig.h |    0
 app/{gegl => operations}/gimplevelsconfig.c        |    2 +-
 app/{gegl => operations}/gimplevelsconfig.h        |    0
 .../gimpoperationadditionmode.c                    |    2 +-
 .../gimpoperationadditionmode.h                    |    0
 .../gimpoperationantierasemode.c                   |    2 +-
 .../gimpoperationantierasemode.h                   |    0
 app/{gegl => operations}/gimpoperationbehindmode.c |    2 +-
 app/{gegl => operations}/gimpoperationbehindmode.h |    0
 app/{gegl => operations}/gimpoperationborder.c     |    3 +-
 app/{gegl => operations}/gimpoperationborder.h     |    0
 .../gimpoperationbrightnesscontrast.c              |    2 +-
 .../gimpoperationbrightnesscontrast.h              |    0
 app/{gegl => operations}/gimpoperationburnmode.c   |    2 +-
 app/{gegl => operations}/gimpoperationburnmode.h   |    0
 .../gimpoperationcagecoefcalc.c                    |    2 +-
 .../gimpoperationcagecoefcalc.h                    |    0
 .../gimpoperationcagetransform.c                   |    2 +-
 .../gimpoperationcagetransform.h                   |    0
 .../gimpoperationcolorbalance.c                    |    2 +-
 .../gimpoperationcolorbalance.h                    |    0
 .../gimpoperationcolorerasemode.c                  |    2 +-
 .../gimpoperationcolorerasemode.h                  |    0
 app/{gegl => operations}/gimpoperationcolorize.c   |    2 +-
 app/{gegl => operations}/gimpoperationcolorize.h   |    0
 app/{gegl => operations}/gimpoperationcolormode.c  |    2 +-
 app/{gegl => operations}/gimpoperationcolormode.h  |    0
 app/{gegl => operations}/gimpoperationcurves.c     |    2 +-
 app/{gegl => operations}/gimpoperationcurves.h     |    0
 .../gimpoperationdarkenonlymode.c                  |    2 +-
 .../gimpoperationdarkenonlymode.h                  |    0
 app/{gegl => operations}/gimpoperationdesaturate.c |    2 +-
 app/{gegl => operations}/gimpoperationdesaturate.h |    0
 .../gimpoperationdifferencemode.c                  |    2 +-
 .../gimpoperationdifferencemode.h                  |    0
 .../gimpoperationdissolvemode.c                    |    2 +-
 .../gimpoperationdissolvemode.h                    |    0
 app/{gegl => operations}/gimpoperationdividemode.c |    2 +-
 app/{gegl => operations}/gimpoperationdividemode.h |    0
 app/{gegl => operations}/gimpoperationdodgemode.c  |    2 +-
 app/{gegl => operations}/gimpoperationdodgemode.h  |    0
 app/{gegl => operations}/gimpoperationequalize.c   |    2 +-
 app/{gegl => operations}/gimpoperationequalize.h   |    0
 app/{gegl => operations}/gimpoperationerasemode.c  |    2 +-
 app/{gegl => operations}/gimpoperationerasemode.h  |    0
 .../gimpoperationgrainextractmode.c                |    2 +-
 .../gimpoperationgrainextractmode.h                |    0
 .../gimpoperationgrainmergemode.c                  |    2 +-
 .../gimpoperationgrainmergemode.h                  |    0
 app/{gegl => operations}/gimpoperationgrow.c       |    3 +-
 app/{gegl => operations}/gimpoperationgrow.h       |    0
 .../gimpoperationhardlightmode.c                   |    2 +-
 .../gimpoperationhardlightmode.h                   |    0
 .../gimpoperationhistogramsink.c                   |    2 +-
 .../gimpoperationhistogramsink.h                   |    0
 app/{gegl => operations}/gimpoperationhuemode.c    |    2 +-
 app/{gegl => operations}/gimpoperationhuemode.h    |    0
 .../gimpoperationhuesaturation.c                   |    2 +-
 .../gimpoperationhuesaturation.h                   |    0
 app/{gegl => operations}/gimpoperationlevels.c     |    2 +-
 app/{gegl => operations}/gimpoperationlevels.h     |    0
 .../gimpoperationlightenonlymode.c                 |    2 +-
 .../gimpoperationlightenonlymode.h                 |    0
 .../gimpoperationmaskcomponents.c                  |    2 +-
 .../gimpoperationmaskcomponents.h                  |    0
 .../gimpoperationmultiplymode.c                    |    2 +-
 .../gimpoperationmultiplymode.h                    |    0
 app/{gegl => operations}/gimpoperationnormalmode.c |    2 +-
 app/{gegl => operations}/gimpoperationnormalmode.h |    0
 .../gimpoperationoverlaymode.c                     |    2 +-
 .../gimpoperationoverlaymode.h                     |    0
 .../gimpoperationpointfilter.c                     |    2 +-
 .../gimpoperationpointfilter.h                     |    0
 .../gimpoperationpointlayermode.c                  |    2 +-
 .../gimpoperationpointlayermode.h                  |    0
 app/{gegl => operations}/gimpoperationposterize.c  |    2 +-
 app/{gegl => operations}/gimpoperationposterize.h  |    0
 .../gimpoperationreplacemode.c                     |    2 +-
 .../gimpoperationreplacemode.h                     |    0
 .../gimpoperationsaturationmode.c                  |    2 +-
 .../gimpoperationsaturationmode.h                  |    0
 app/{gegl => operations}/gimpoperationscreenmode.c |    2 +-
 app/{gegl => operations}/gimpoperationscreenmode.h |    0
 .../gimpoperationsemiflatten.c                     |    2 +-
 .../gimpoperationsemiflatten.h                     |    0
 app/{gegl => operations}/gimpoperationsetalpha.c   |    2 +-
 app/{gegl => operations}/gimpoperationsetalpha.h   |    0
 app/{gegl => operations}/gimpoperationshapeburst.c |    3 +-
 app/{gegl => operations}/gimpoperationshapeburst.h |    0
 app/{gegl => operations}/gimpoperationshrink.c     |    3 +-
 app/{gegl => operations}/gimpoperationshrink.h     |    0
 .../gimpoperationsoftlightmode.c                   |    2 +-
 .../gimpoperationsoftlightmode.h                   |    0
 .../gimpoperationsubtractmode.c                    |    2 +-
 .../gimpoperationsubtractmode.h                    |    0
 app/{gegl => operations}/gimpoperationthreshold.c  |    2 +-
 app/{gegl => operations}/gimpoperationthreshold.h  |    0
 .../gimpoperationthresholdalpha.c                  |    2 +-
 .../gimpoperationthresholdalpha.h                  |    0
 app/{gegl => operations}/gimpoperationvaluemode.c  |    2 +-
 app/{gegl => operations}/gimpoperationvaluemode.h  |    0
 app/{gegl => operations}/gimpposterizeconfig.c     |    2 +-
 app/{gegl => operations}/gimpposterizeconfig.h     |    0
 app/{gegl => operations}/gimpthresholdconfig.c     |    2 +-
 app/{gegl => operations}/gimpthresholdconfig.h     |    0
 app/operations/operations-types.h                  |   52 +++++++
 app/pdb/color-cmds.c                               |   18 +-
 app/tools/gimpbrightnesscontrasttool.c             |    2 +-
 app/tools/gimpcagetool.c                           |    7 +-
 app/tools/gimpcolorbalancetool.c                   |    2 +-
 app/tools/gimpcolorizetool.c                       |    2 +-
 app/tools/gimpcurvestool.c                         |    4 +-
 app/tools/gimpdesaturatetool.c                     |    2 +-
 app/tools/gimphuesaturationtool.c                  |    4 +-
 app/tools/gimplevelstool.c                         |    5 +-
 app/tools/gimpposterizetool.c                      |    2 +-
 app/tools/gimpthresholdtool.c                      |    2 +-
 configure.ac                                       |    1 +
 tools/pdbgen/pdb/color.pdb                         |   22 ++--
 140 files changed, 490 insertions(+), 343 deletions(-)
---
diff --git a/app/Makefile.am b/app/Makefile.am
index ed714bf..2793107 100644
--- a/app/Makefile.am
+++ b/app/Makefile.am
@@ -17,6 +17,7 @@ SUBDIRS = \
 	config		\
 	composite	\
 	core		\
+	operations	\
 	gegl		\
 	text		\
 	vectors		\
@@ -139,7 +140,8 @@ calm_down_linker = \
 	-u $(SYMPREFIX)gimp_vectors_mod_undo_get_type		\
 	-u $(SYMPREFIX)gimp_vectors_prop_undo_get_type		\
 	-u $(SYMPREFIX)gimp_curve_map_pixels			\
-	-u $(SYMPREFIX)gimp_param_spec_duplicate
+	-u $(SYMPREFIX)gimp_param_spec_duplicate		\
+	-u $(SYNPREFIX)gimp_operations_init
 
 AM_LDFLAGS = \
 	$(munix)					\
@@ -161,6 +163,7 @@ gimpconsoleldadd = \
 	text/libapptext.a		\
 	paint/libapppaint.a		\
 	composite/libappcomposite.a	\
+	operations/libappoperations.a	\
 	gegl/libappgegl.a		\
 	config/libappconfig.a		\
 	paint-funcs/libapppaint-funcs.a	\
diff --git a/app/core/gimpdrawable-levels.c b/app/core/gimpdrawable-levels.c
index 4b5d262..0b9d3fe 100644
--- a/app/core/gimpdrawable-levels.c
+++ b/app/core/gimpdrawable-levels.c
@@ -21,7 +21,7 @@
 
 #include "core-types.h"
 
-#include "gegl/gimplevelsconfig.h"
+#include "operations/gimplevelsconfig.h"
 
 #include "gimpdrawable.h"
 #include "gimpdrawable-histogram.h"
diff --git a/app/gegl/Makefile.am b/app/gegl/Makefile.am
index b8ff03a..329bae9 100644
--- a/app/gegl/Makefile.am
+++ b/app/gegl/Makefile.am
@@ -16,148 +16,26 @@ INCLUDES = \
 noinst_LIBRARIES = libappgegl.a
 
 libappgegl_a_sources = \
-	gimp-gegl-enums.h			\
-	gimp-gegl-types.h			\
-	gimp-babl.c				\
-	gimp-babl.h				\
-	gimp-babl-compat.c			\
-	gimp-babl-compat.h			\
-	gimp-gegl.c				\
-	gimp-gegl.h				\
-	gimp-gegl-config-proxy.c		\
-	gimp-gegl-config-proxy.h		\
-	gimp-gegl-loops.c			\
-	gimp-gegl-loops.h			\
-	gimp-gegl-nodes.c			\
-	gimp-gegl-nodes.h			\
-	gimp-gegl-tile-compat.c			\
-	gimp-gegl-tile-compat.h			\
-	gimp-gegl-utils.c			\
-	gimp-gegl-utils.h			\
-	gimptilebackendtilemanager.c		\
-	gimptilebackendtilemanager.h		\
-	\
-	gimpbrightnesscontrastconfig.c		\
-	gimpbrightnesscontrastconfig.h		\
-	gimpcageconfig.c			\
-	gimpcageconfig.h			\
-	gimpcolorbalanceconfig.c		\
-	gimpcolorbalanceconfig.h		\
-	gimpcolorizeconfig.c			\
-	gimpcolorizeconfig.h			\
-	gimpcurvesconfig.c			\
-	gimpcurvesconfig.h			\
-	gimpdesaturateconfig.c			\
-	gimpdesaturateconfig.h			\
-	gimphuesaturationconfig.c		\
-	gimphuesaturationconfig.h		\
-	gimplevelsconfig.c			\
-	gimplevelsconfig.h			\
-	gimpposterizeconfig.c			\
-	gimpposterizeconfig.h			\
-	gimpthresholdconfig.c			\
-	gimpthresholdconfig.h			\
-	\
-	gimpoperationborder.c			\
-	gimpoperationborder.h			\
-	gimpoperationcagecoefcalc.c		\
-	gimpoperationcagecoefcalc.h		\
-	gimpoperationcagetransform.c		\
-	gimpoperationcagetransform.h		\
-	gimpoperationequalize.c			\
-	gimpoperationequalize.h			\
-	gimpoperationgrow.c			\
-	gimpoperationgrow.h			\
-	gimpoperationhistogramsink.c		\
-	gimpoperationhistogramsink.h		\
-	gimpoperationmaskcomponents.c		\
-	gimpoperationmaskcomponents.h		\
-	gimpoperationsemiflatten.c		\
-	gimpoperationsemiflatten.h		\
-	gimpoperationsetalpha.c			\
-	gimpoperationsetalpha.h			\
-	gimpoperationshapeburst.c		\
-	gimpoperationshapeburst.h		\
-	gimpoperationshrink.c			\
-	gimpoperationshrink.h			\
-	gimpoperationthresholdalpha.c		\
-	gimpoperationthresholdalpha.h		\
-	\
-	gimpoperationpointfilter.c		\
-	gimpoperationpointfilter.h		\
-	gimpoperationbrightnesscontrast.c	\
-	gimpoperationbrightnesscontrast.h	\
-	gimpoperationcolorbalance.c		\
-	gimpoperationcolorbalance.h		\
-	gimpoperationcolorize.c			\
-	gimpoperationcolorize.h			\
-	gimpoperationcurves.c			\
-	gimpoperationcurves.h			\
-	gimpoperationdesaturate.c		\
-	gimpoperationdesaturate.h		\
-	gimpoperationhuesaturation.c		\
-	gimpoperationhuesaturation.h		\
-	gimpoperationlevels.c			\
-	gimpoperationlevels.h			\
-	gimpoperationposterize.c		\
-	gimpoperationposterize.h		\
-	gimpoperationthreshold.c		\
-	gimpoperationthreshold.h		\
-	\
-	gimpoperationpointlayermode.c		\
-	gimpoperationpointlayermode.h		\
-	gimpoperationnormalmode.c		\
-	gimpoperationnormalmode.h		\
-	gimpoperationdissolvemode.c     	\
-	gimpoperationdissolvemode.h     	\
-	gimpoperationbehindmode.c       	\
-	gimpoperationbehindmode.h       	\
-	gimpoperationmultiplymode.c     	\
-	gimpoperationmultiplymode.h     	\
-	gimpoperationscreenmode.c       	\
-	gimpoperationscreenmode.h       	\
-	gimpoperationoverlaymode.c      	\
-	gimpoperationoverlaymode.h      	\
-	gimpoperationdifferencemode.c   	\
-	gimpoperationdifferencemode.h   	\
-	gimpoperationadditionmode.c     	\
-	gimpoperationadditionmode.h     	\
-	gimpoperationsubtractmode.c     	\
-	gimpoperationsubtractmode.h     	\
-	gimpoperationdarkenonlymode.c   	\
-	gimpoperationdarkenonlymode.h   	\
-	gimpoperationlightenonlymode.c  	\
-	gimpoperationlightenonlymode.h  	\
-	gimpoperationhuemode.c          	\
-	gimpoperationhuemode.h          	\
-	gimpoperationsaturationmode.c   	\
-	gimpoperationsaturationmode.h   	\
-	gimpoperationcolormode.c        	\
-	gimpoperationcolormode.h        	\
-	gimpoperationvaluemode.c        	\
-	gimpoperationvaluemode.h        	\
-	gimpoperationdividemode.c       	\
-	gimpoperationdividemode.h       	\
-	gimpoperationdodgemode.c        	\
-	gimpoperationdodgemode.h        	\
-	gimpoperationburnmode.c         	\
-	gimpoperationburnmode.h         	\
-	gimpoperationhardlightmode.c    	\
-	gimpoperationhardlightmode.h    	\
-	gimpoperationsoftlightmode.c    	\
-	gimpoperationsoftlightmode.h    	\
-	gimpoperationgrainextractmode.c 	\
-	gimpoperationgrainextractmode.h 	\
-	gimpoperationgrainmergemode.c   	\
-	gimpoperationgrainmergemode.h   	\
-	gimpoperationcolorerasemode.c   	\
-	gimpoperationcolorerasemode.h   	\
-	gimpoperationerasemode.c        	\
-	gimpoperationerasemode.h        	\
-	gimpoperationreplacemode.c      	\
-	gimpoperationreplacemode.h      	\
-	gimpoperationantierasemode.c    	\
-	gimpoperationantierasemode.h
+	gimp-gegl-enums.h		\
+	gimp-gegl-types.h		\
+	gimp-babl.c			\
+	gimp-babl.h			\
+	gimp-babl-compat.c		\
+	gimp-babl-compat.h		\
+	gimp-gegl.c			\
+	gimp-gegl.h			\
+	gimp-gegl-config-proxy.c	\
+	gimp-gegl-config-proxy.h	\
+	gimp-gegl-loops.c		\
+	gimp-gegl-loops.h		\
+	gimp-gegl-nodes.c		\
+	gimp-gegl-nodes.h		\
+	gimp-gegl-tile-compat.c		\
+	gimp-gegl-tile-compat.h		\
+	gimp-gegl-utils.c		\
+	gimp-gegl-utils.h		\
+	gimptilebackendtilemanager.c	\
+	gimptilebackendtilemanager.h
 
 libappgegl_a_built_sources = gimp-gegl-enums.c
 
diff --git a/app/gegl/gimp-gegl.c b/app/gegl/gimp-gegl.c
index f77477e..0eaaccc 100644
--- a/app/gegl/gimp-gegl.c
+++ b/app/gegl/gimp-gegl.c
@@ -28,62 +28,13 @@
 
 #include "config/gimpbaseconfig.h"
 
+#include "operations/gimp-operations.h"
+
 #include "core/gimp.h"
 
 #include "gimp-babl.h"
 #include "gimp-gegl.h"
 
-#include "gimpoperationborder.h"
-#include "gimpoperationcagecoefcalc.h"
-#include "gimpoperationcagetransform.h"
-#include "gimpoperationequalize.h"
-#include "gimpoperationgrow.h"
-#include "gimpoperationhistogramsink.h"
-#include "gimpoperationmaskcomponents.h"
-#include "gimpoperationsemiflatten.h"
-#include "gimpoperationsetalpha.h"
-#include "gimpoperationshapeburst.h"
-#include "gimpoperationshrink.h"
-#include "gimpoperationthresholdalpha.h"
-
-#include "gimpoperationbrightnesscontrast.h"
-#include "gimpoperationcolorbalance.h"
-#include "gimpoperationcolorize.h"
-#include "gimpoperationcurves.h"
-#include "gimpoperationdesaturate.h"
-#include "gimpoperationhuesaturation.h"
-#include "gimpoperationlevels.h"
-#include "gimpoperationposterize.h"
-#include "gimpoperationthreshold.h"
-
-#include "gimpoperationpointlayermode.h"
-#include "gimpoperationnormalmode.h"
-#include "gimpoperationdissolvemode.h"
-#include "gimpoperationbehindmode.h"
-#include "gimpoperationmultiplymode.h"
-#include "gimpoperationscreenmode.h"
-#include "gimpoperationoverlaymode.h"
-#include "gimpoperationdifferencemode.h"
-#include "gimpoperationadditionmode.h"
-#include "gimpoperationsubtractmode.h"
-#include "gimpoperationdarkenonlymode.h"
-#include "gimpoperationlightenonlymode.h"
-#include "gimpoperationhuemode.h"
-#include "gimpoperationsaturationmode.h"
-#include "gimpoperationcolormode.h"
-#include "gimpoperationvaluemode.h"
-#include "gimpoperationdividemode.h"
-#include "gimpoperationdodgemode.h"
-#include "gimpoperationburnmode.h"
-#include "gimpoperationhardlightmode.h"
-#include "gimpoperationsoftlightmode.h"
-#include "gimpoperationgrainextractmode.h"
-#include "gimpoperationgrainmergemode.h"
-#include "gimpoperationcolorerasemode.h"
-#include "gimpoperationerasemode.h"
-#include "gimpoperationreplacemode.h"
-#include "gimpoperationantierasemode.h"
-
 
 static void  gimp_gegl_notify_tile_cache_size (GimpBaseConfig *config);
 
@@ -117,56 +68,7 @@ gimp_gegl_init (Gimp *gimp)
 
   gimp_babl_init ();
 
-  g_type_class_ref (GIMP_TYPE_OPERATION_BORDER);
-  g_type_class_ref (GIMP_TYPE_OPERATION_CAGE_COEF_CALC);
-  g_type_class_ref (GIMP_TYPE_OPERATION_CAGE_TRANSFORM);
-  g_type_class_ref (GIMP_TYPE_OPERATION_EQUALIZE);
-  g_type_class_ref (GIMP_TYPE_OPERATION_GROW);
-  g_type_class_ref (GIMP_TYPE_OPERATION_HISTOGRAM_SINK);
-  g_type_class_ref (GIMP_TYPE_OPERATION_MASK_COMPONENTS);
-  g_type_class_ref (GIMP_TYPE_OPERATION_SEMI_FLATTEN);
-  g_type_class_ref (GIMP_TYPE_OPERATION_SET_ALPHA);
-  g_type_class_ref (GIMP_TYPE_OPERATION_SHAPEBURST);
-  g_type_class_ref (GIMP_TYPE_OPERATION_SHRINK);
-  g_type_class_ref (GIMP_TYPE_OPERATION_THRESHOLD_ALPHA);
-
-  g_type_class_ref (GIMP_TYPE_OPERATION_BRIGHTNESS_CONTRAST);
-  g_type_class_ref (GIMP_TYPE_OPERATION_COLOR_BALANCE);
-  g_type_class_ref (GIMP_TYPE_OPERATION_COLORIZE);
-  g_type_class_ref (GIMP_TYPE_OPERATION_CURVES);
-  g_type_class_ref (GIMP_TYPE_OPERATION_DESATURATE);
-  g_type_class_ref (GIMP_TYPE_OPERATION_HUE_SATURATION);
-  g_type_class_ref (GIMP_TYPE_OPERATION_LEVELS);
-  g_type_class_ref (GIMP_TYPE_OPERATION_POSTERIZE);
-  g_type_class_ref (GIMP_TYPE_OPERATION_THRESHOLD);
-
-  g_type_class_ref (GIMP_TYPE_OPERATION_POINT_LAYER_MODE);
-  g_type_class_ref (GIMP_TYPE_OPERATION_NORMAL_MODE);
-  g_type_class_ref (GIMP_TYPE_OPERATION_DISSOLVE_MODE);
-  g_type_class_ref (GIMP_TYPE_OPERATION_BEHIND_MODE);
-  g_type_class_ref (GIMP_TYPE_OPERATION_MULTIPLY_MODE);
-  g_type_class_ref (GIMP_TYPE_OPERATION_SCREEN_MODE);
-  g_type_class_ref (GIMP_TYPE_OPERATION_OVERLAY_MODE);
-  g_type_class_ref (GIMP_TYPE_OPERATION_DIFFERENCE_MODE);
-  g_type_class_ref (GIMP_TYPE_OPERATION_ADDITION_MODE);
-  g_type_class_ref (GIMP_TYPE_OPERATION_SUBTRACT_MODE);
-  g_type_class_ref (GIMP_TYPE_OPERATION_DARKEN_ONLY_MODE);
-  g_type_class_ref (GIMP_TYPE_OPERATION_LIGHTEN_ONLY_MODE);
-  g_type_class_ref (GIMP_TYPE_OPERATION_HUE_MODE);
-  g_type_class_ref (GIMP_TYPE_OPERATION_SATURATION_MODE);
-  g_type_class_ref (GIMP_TYPE_OPERATION_COLOR_MODE);
-  g_type_class_ref (GIMP_TYPE_OPERATION_VALUE_MODE);
-  g_type_class_ref (GIMP_TYPE_OPERATION_DIVIDE_MODE);
-  g_type_class_ref (GIMP_TYPE_OPERATION_DODGE_MODE);
-  g_type_class_ref (GIMP_TYPE_OPERATION_BURN_MODE);
-  g_type_class_ref (GIMP_TYPE_OPERATION_HARDLIGHT_MODE);
-  g_type_class_ref (GIMP_TYPE_OPERATION_SOFTLIGHT_MODE);
-  g_type_class_ref (GIMP_TYPE_OPERATION_GRAIN_EXTRACT_MODE);
-  g_type_class_ref (GIMP_TYPE_OPERATION_GRAIN_MERGE_MODE);
-  g_type_class_ref (GIMP_TYPE_OPERATION_COLOR_ERASE_MODE);
-  g_type_class_ref (GIMP_TYPE_OPERATION_ERASE_MODE);
-  g_type_class_ref (GIMP_TYPE_OPERATION_REPLACE_MODE);
-  g_type_class_ref (GIMP_TYPE_OPERATION_ANTI_ERASE_MODE);
+  gimp_operations_init (gimp);
 }
 
 static void
diff --git a/app/operations/.gitignore b/app/operations/.gitignore
new file mode 100644
index 0000000..5d7ce9e
--- /dev/null
+++ b/app/operations/.gitignore
@@ -0,0 +1,5 @@
+/Makefile
+/Makefile.in
+/.deps
+/.libs
+/libappoperations.a
diff --git a/app/operations/Makefile.am b/app/operations/Makefile.am
new file mode 100644
index 0000000..c469126
--- /dev/null
+++ b/app/operations/Makefile.am
@@ -0,0 +1,144 @@
+## Process this file with automake to produce Makefile.in
+
+AM_CPPFLAGS = \
+	-DG_LOG_DOMAIN=\"Gimp-Operations\"
+
+INCLUDES = \
+	-I$(top_builddir)	\
+	-I$(top_srcdir)		\
+	-I$(top_builddir)/app	\
+	-I$(top_srcdir)/app	\
+	$(CAIRO_CFLAGS)		\
+	$(GEGL_CFLAGS)		\
+	$(GDK_PIXBUF_CFLAGS)	\
+	-I$(includedir)
+
+noinst_LIBRARIES = libappoperations.a
+
+libappoperations_a_sources = \
+	gimp-operations.c			\
+	gimp-operations.h			\
+	\
+	gimpbrightnesscontrastconfig.c		\
+	gimpbrightnesscontrastconfig.h		\
+	gimpcageconfig.c			\
+	gimpcageconfig.h			\
+	gimpcolorbalanceconfig.c		\
+	gimpcolorbalanceconfig.h		\
+	gimpcolorizeconfig.c			\
+	gimpcolorizeconfig.h			\
+	gimpcurvesconfig.c			\
+	gimpcurvesconfig.h			\
+	gimpdesaturateconfig.c			\
+	gimpdesaturateconfig.h			\
+	gimphuesaturationconfig.c		\
+	gimphuesaturationconfig.h		\
+	gimplevelsconfig.c			\
+	gimplevelsconfig.h			\
+	gimpposterizeconfig.c			\
+	gimpposterizeconfig.h			\
+	gimpthresholdconfig.c			\
+	gimpthresholdconfig.h			\
+	\
+	gimpoperationborder.c			\
+	gimpoperationborder.h			\
+	gimpoperationcagecoefcalc.c		\
+	gimpoperationcagecoefcalc.h		\
+	gimpoperationcagetransform.c		\
+	gimpoperationcagetransform.h		\
+	gimpoperationequalize.c			\
+	gimpoperationequalize.h			\
+	gimpoperationgrow.c			\
+	gimpoperationgrow.h			\
+	gimpoperationhistogramsink.c		\
+	gimpoperationhistogramsink.h		\
+	gimpoperationmaskcomponents.c		\
+	gimpoperationmaskcomponents.h		\
+	gimpoperationsemiflatten.c		\
+	gimpoperationsemiflatten.h		\
+	gimpoperationsetalpha.c			\
+	gimpoperationsetalpha.h			\
+	gimpoperationshapeburst.c		\
+	gimpoperationshapeburst.h		\
+	gimpoperationshrink.c			\
+	gimpoperationshrink.h			\
+	gimpoperationthresholdalpha.c		\
+	gimpoperationthresholdalpha.h		\
+	\
+	gimpoperationpointfilter.c		\
+	gimpoperationpointfilter.h		\
+	gimpoperationbrightnesscontrast.c	\
+	gimpoperationbrightnesscontrast.h	\
+	gimpoperationcolorbalance.c		\
+	gimpoperationcolorbalance.h		\
+	gimpoperationcolorize.c			\
+	gimpoperationcolorize.h			\
+	gimpoperationcurves.c			\
+	gimpoperationcurves.h			\
+	gimpoperationdesaturate.c		\
+	gimpoperationdesaturate.h		\
+	gimpoperationhuesaturation.c		\
+	gimpoperationhuesaturation.h		\
+	gimpoperationlevels.c			\
+	gimpoperationlevels.h			\
+	gimpoperationposterize.c		\
+	gimpoperationposterize.h		\
+	gimpoperationthreshold.c		\
+	gimpoperationthreshold.h		\
+	\
+	gimpoperationpointlayermode.c		\
+	gimpoperationpointlayermode.h		\
+	gimpoperationnormalmode.c		\
+	gimpoperationnormalmode.h		\
+	gimpoperationdissolvemode.c     	\
+	gimpoperationdissolvemode.h     	\
+	gimpoperationbehindmode.c       	\
+	gimpoperationbehindmode.h       	\
+	gimpoperationmultiplymode.c     	\
+	gimpoperationmultiplymode.h     	\
+	gimpoperationscreenmode.c       	\
+	gimpoperationscreenmode.h       	\
+	gimpoperationoverlaymode.c      	\
+	gimpoperationoverlaymode.h      	\
+	gimpoperationdifferencemode.c   	\
+	gimpoperationdifferencemode.h   	\
+	gimpoperationadditionmode.c     	\
+	gimpoperationadditionmode.h     	\
+	gimpoperationsubtractmode.c     	\
+	gimpoperationsubtractmode.h     	\
+	gimpoperationdarkenonlymode.c   	\
+	gimpoperationdarkenonlymode.h   	\
+	gimpoperationlightenonlymode.c  	\
+	gimpoperationlightenonlymode.h  	\
+	gimpoperationhuemode.c          	\
+	gimpoperationhuemode.h          	\
+	gimpoperationsaturationmode.c   	\
+	gimpoperationsaturationmode.h   	\
+	gimpoperationcolormode.c        	\
+	gimpoperationcolormode.h        	\
+	gimpoperationvaluemode.c        	\
+	gimpoperationvaluemode.h        	\
+	gimpoperationdividemode.c       	\
+	gimpoperationdividemode.h       	\
+	gimpoperationdodgemode.c        	\
+	gimpoperationdodgemode.h        	\
+	gimpoperationburnmode.c         	\
+	gimpoperationburnmode.h         	\
+	gimpoperationhardlightmode.c    	\
+	gimpoperationhardlightmode.h    	\
+	gimpoperationsoftlightmode.c    	\
+	gimpoperationsoftlightmode.h    	\
+	gimpoperationgrainextractmode.c 	\
+	gimpoperationgrainextractmode.h 	\
+	gimpoperationgrainmergemode.c   	\
+	gimpoperationgrainmergemode.h   	\
+	gimpoperationcolorerasemode.c   	\
+	gimpoperationcolorerasemode.h   	\
+	gimpoperationerasemode.c        	\
+	gimpoperationerasemode.h        	\
+	gimpoperationreplacemode.c      	\
+	gimpoperationreplacemode.h      	\
+	gimpoperationantierasemode.c    	\
+	gimpoperationantierasemode.h
+
+libappoperations_a_SOURCES = $(libappoperations_a_sources)
diff --git a/app/operations/gimp-operations.c b/app/operations/gimp-operations.c
new file mode 100644
index 0000000..384d690
--- /dev/null
+++ b/app/operations/gimp-operations.c
@@ -0,0 +1,137 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimp-operations.c
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gegl.h>
+
+#include "operations-types.h"
+
+#include "core/gimp.h"
+
+#include "gimp-operations.h"
+
+#include "gimpoperationborder.h"
+#include "gimpoperationcagecoefcalc.h"
+#include "gimpoperationcagetransform.h"
+#include "gimpoperationequalize.h"
+#include "gimpoperationgrow.h"
+#include "gimpoperationhistogramsink.h"
+#include "gimpoperationmaskcomponents.h"
+#include "gimpoperationsemiflatten.h"
+#include "gimpoperationsetalpha.h"
+#include "gimpoperationshapeburst.h"
+#include "gimpoperationshrink.h"
+#include "gimpoperationthresholdalpha.h"
+
+#include "gimpoperationbrightnesscontrast.h"
+#include "gimpoperationcolorbalance.h"
+#include "gimpoperationcolorize.h"
+#include "gimpoperationcurves.h"
+#include "gimpoperationdesaturate.h"
+#include "gimpoperationhuesaturation.h"
+#include "gimpoperationlevels.h"
+#include "gimpoperationposterize.h"
+#include "gimpoperationthreshold.h"
+
+#include "gimpoperationpointlayermode.h"
+#include "gimpoperationnormalmode.h"
+#include "gimpoperationdissolvemode.h"
+#include "gimpoperationbehindmode.h"
+#include "gimpoperationmultiplymode.h"
+#include "gimpoperationscreenmode.h"
+#include "gimpoperationoverlaymode.h"
+#include "gimpoperationdifferencemode.h"
+#include "gimpoperationadditionmode.h"
+#include "gimpoperationsubtractmode.h"
+#include "gimpoperationdarkenonlymode.h"
+#include "gimpoperationlightenonlymode.h"
+#include "gimpoperationhuemode.h"
+#include "gimpoperationsaturationmode.h"
+#include "gimpoperationcolormode.h"
+#include "gimpoperationvaluemode.h"
+#include "gimpoperationdividemode.h"
+#include "gimpoperationdodgemode.h"
+#include "gimpoperationburnmode.h"
+#include "gimpoperationhardlightmode.h"
+#include "gimpoperationsoftlightmode.h"
+#include "gimpoperationgrainextractmode.h"
+#include "gimpoperationgrainmergemode.h"
+#include "gimpoperationcolorerasemode.h"
+#include "gimpoperationerasemode.h"
+#include "gimpoperationreplacemode.h"
+#include "gimpoperationantierasemode.h"
+
+
+void
+gimp_operations_init (Gimp *gimp)
+{
+  g_return_if_fail (GIMP_IS_GIMP (gimp));
+
+  g_type_class_ref (GIMP_TYPE_OPERATION_BORDER);
+  g_type_class_ref (GIMP_TYPE_OPERATION_CAGE_COEF_CALC);
+  g_type_class_ref (GIMP_TYPE_OPERATION_CAGE_TRANSFORM);
+  g_type_class_ref (GIMP_TYPE_OPERATION_EQUALIZE);
+  g_type_class_ref (GIMP_TYPE_OPERATION_GROW);
+  g_type_class_ref (GIMP_TYPE_OPERATION_HISTOGRAM_SINK);
+  g_type_class_ref (GIMP_TYPE_OPERATION_MASK_COMPONENTS);
+  g_type_class_ref (GIMP_TYPE_OPERATION_SEMI_FLATTEN);
+  g_type_class_ref (GIMP_TYPE_OPERATION_SET_ALPHA);
+  g_type_class_ref (GIMP_TYPE_OPERATION_SHAPEBURST);
+  g_type_class_ref (GIMP_TYPE_OPERATION_SHRINK);
+  g_type_class_ref (GIMP_TYPE_OPERATION_THRESHOLD_ALPHA);
+
+  g_type_class_ref (GIMP_TYPE_OPERATION_BRIGHTNESS_CONTRAST);
+  g_type_class_ref (GIMP_TYPE_OPERATION_COLOR_BALANCE);
+  g_type_class_ref (GIMP_TYPE_OPERATION_COLORIZE);
+  g_type_class_ref (GIMP_TYPE_OPERATION_CURVES);
+  g_type_class_ref (GIMP_TYPE_OPERATION_DESATURATE);
+  g_type_class_ref (GIMP_TYPE_OPERATION_HUE_SATURATION);
+  g_type_class_ref (GIMP_TYPE_OPERATION_LEVELS);
+  g_type_class_ref (GIMP_TYPE_OPERATION_POSTERIZE);
+  g_type_class_ref (GIMP_TYPE_OPERATION_THRESHOLD);
+
+  g_type_class_ref (GIMP_TYPE_OPERATION_POINT_LAYER_MODE);
+  g_type_class_ref (GIMP_TYPE_OPERATION_NORMAL_MODE);
+  g_type_class_ref (GIMP_TYPE_OPERATION_DISSOLVE_MODE);
+  g_type_class_ref (GIMP_TYPE_OPERATION_BEHIND_MODE);
+  g_type_class_ref (GIMP_TYPE_OPERATION_MULTIPLY_MODE);
+  g_type_class_ref (GIMP_TYPE_OPERATION_SCREEN_MODE);
+  g_type_class_ref (GIMP_TYPE_OPERATION_OVERLAY_MODE);
+  g_type_class_ref (GIMP_TYPE_OPERATION_DIFFERENCE_MODE);
+  g_type_class_ref (GIMP_TYPE_OPERATION_ADDITION_MODE);
+  g_type_class_ref (GIMP_TYPE_OPERATION_SUBTRACT_MODE);
+  g_type_class_ref (GIMP_TYPE_OPERATION_DARKEN_ONLY_MODE);
+  g_type_class_ref (GIMP_TYPE_OPERATION_LIGHTEN_ONLY_MODE);
+  g_type_class_ref (GIMP_TYPE_OPERATION_HUE_MODE);
+  g_type_class_ref (GIMP_TYPE_OPERATION_SATURATION_MODE);
+  g_type_class_ref (GIMP_TYPE_OPERATION_COLOR_MODE);
+  g_type_class_ref (GIMP_TYPE_OPERATION_VALUE_MODE);
+  g_type_class_ref (GIMP_TYPE_OPERATION_DIVIDE_MODE);
+  g_type_class_ref (GIMP_TYPE_OPERATION_DODGE_MODE);
+  g_type_class_ref (GIMP_TYPE_OPERATION_BURN_MODE);
+  g_type_class_ref (GIMP_TYPE_OPERATION_HARDLIGHT_MODE);
+  g_type_class_ref (GIMP_TYPE_OPERATION_SOFTLIGHT_MODE);
+  g_type_class_ref (GIMP_TYPE_OPERATION_GRAIN_EXTRACT_MODE);
+  g_type_class_ref (GIMP_TYPE_OPERATION_GRAIN_MERGE_MODE);
+  g_type_class_ref (GIMP_TYPE_OPERATION_COLOR_ERASE_MODE);
+  g_type_class_ref (GIMP_TYPE_OPERATION_ERASE_MODE);
+  g_type_class_ref (GIMP_TYPE_OPERATION_REPLACE_MODE);
+  g_type_class_ref (GIMP_TYPE_OPERATION_ANTI_ERASE_MODE);
+}
diff --git a/app/operations/gimp-operations.h b/app/operations/gimp-operations.h
new file mode 100644
index 0000000..8f11626
--- /dev/null
+++ b/app/operations/gimp-operations.h
@@ -0,0 +1,27 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimp-operations.h
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GIMP_OPERATIONS_H__
+#define __GIMP_OPERATIONS_H__
+
+
+void   gimp_operations_init (Gimp *gimp);
+
+
+#endif /* __GIMP_OPERATIONS_H__ */
diff --git a/app/gegl/gimpbrightnesscontrastconfig.c b/app/operations/gimpbrightnesscontrastconfig.c
similarity index 99%
rename from app/gegl/gimpbrightnesscontrastconfig.c
rename to app/operations/gimpbrightnesscontrastconfig.c
index 7354420..3cd3d46 100644
--- a/app/gegl/gimpbrightnesscontrastconfig.c
+++ b/app/operations/gimpbrightnesscontrastconfig.c
@@ -25,7 +25,7 @@
 #include "libgimpmath/gimpmath.h"
 #include "libgimpconfig/gimpconfig.h"
 
-#include "gimp-gegl-types.h"
+#include "operations-types.h"
 
 #include "gimpbrightnesscontrastconfig.h"
 #include "gimplevelsconfig.h"
diff --git a/app/gegl/gimpbrightnesscontrastconfig.h b/app/operations/gimpbrightnesscontrastconfig.h
similarity index 100%
rename from app/gegl/gimpbrightnesscontrastconfig.h
rename to app/operations/gimpbrightnesscontrastconfig.h
diff --git a/app/gegl/gimpcageconfig.c b/app/operations/gimpcageconfig.c
similarity index 99%
rename from app/gegl/gimpcageconfig.c
rename to app/operations/gimpcageconfig.c
index 12952af..070083f 100644
--- a/app/gegl/gimpcageconfig.c
+++ b/app/operations/gimpcageconfig.c
@@ -25,7 +25,7 @@
 #include "libgimpmath/gimpmath.h"
 #include "libgimpbase/gimpbase.h"
 
-#include "gimp-gegl-types.h"
+#include "operations-types.h"
 
 #include "gimpcageconfig.h"
 
diff --git a/app/gegl/gimpcageconfig.h b/app/operations/gimpcageconfig.h
similarity index 100%
rename from app/gegl/gimpcageconfig.h
rename to app/operations/gimpcageconfig.h
diff --git a/app/gegl/gimpcolorbalanceconfig.c b/app/operations/gimpcolorbalanceconfig.c
similarity index 99%
rename from app/gegl/gimpcolorbalanceconfig.c
rename to app/operations/gimpcolorbalanceconfig.c
index 426a527..42bb655 100644
--- a/app/gegl/gimpcolorbalanceconfig.c
+++ b/app/operations/gimpcolorbalanceconfig.c
@@ -28,7 +28,7 @@
 #include "libgimpmath/gimpmath.h"
 #include "libgimpconfig/gimpconfig.h"
 
-#include "gimp-gegl-types.h"
+#include "operations-types.h"
 
 #include "gimpcolorbalanceconfig.h"
 
diff --git a/app/gegl/gimpcolorbalanceconfig.h b/app/operations/gimpcolorbalanceconfig.h
similarity index 100%
rename from app/gegl/gimpcolorbalanceconfig.h
rename to app/operations/gimpcolorbalanceconfig.h
diff --git a/app/gegl/gimpcolorizeconfig.c b/app/operations/gimpcolorizeconfig.c
similarity index 99%
rename from app/gegl/gimpcolorizeconfig.c
rename to app/operations/gimpcolorizeconfig.c
index 7c6c97d..c7378a9 100644
--- a/app/gegl/gimpcolorizeconfig.c
+++ b/app/operations/gimpcolorizeconfig.c
@@ -27,7 +27,7 @@
 #include "libgimpcolor/gimpcolor.h"
 #include "libgimpconfig/gimpconfig.h"
 
-#include "gimp-gegl-types.h"
+#include "operations-types.h"
 
 #include "gimpcolorizeconfig.h"
 
diff --git a/app/gegl/gimpcolorizeconfig.h b/app/operations/gimpcolorizeconfig.h
similarity index 100%
rename from app/gegl/gimpcolorizeconfig.h
rename to app/operations/gimpcolorizeconfig.h
diff --git a/app/gegl/gimpcurvesconfig.c b/app/operations/gimpcurvesconfig.c
similarity index 99%
rename from app/gegl/gimpcurvesconfig.c
rename to app/operations/gimpcurvesconfig.c
index c4e5723..0fa0983 100644
--- a/app/gegl/gimpcurvesconfig.c
+++ b/app/operations/gimpcurvesconfig.c
@@ -31,7 +31,7 @@
 #include "libgimpmath/gimpmath.h"
 #include "libgimpconfig/gimpconfig.h"
 
-#include "gimp-gegl-types.h"
+#include "operations-types.h"
 
 #include "core/gimpcurve.h"
 #include "core/gimphistogram.h"
diff --git a/app/gegl/gimpcurvesconfig.h b/app/operations/gimpcurvesconfig.h
similarity index 100%
rename from app/gegl/gimpcurvesconfig.h
rename to app/operations/gimpcurvesconfig.h
diff --git a/app/gegl/gimpdesaturateconfig.c b/app/operations/gimpdesaturateconfig.c
similarity index 99%
rename from app/gegl/gimpdesaturateconfig.c
rename to app/operations/gimpdesaturateconfig.c
index 3f9dc85..03d8442 100644
--- a/app/gegl/gimpdesaturateconfig.c
+++ b/app/operations/gimpdesaturateconfig.c
@@ -24,7 +24,7 @@
 
 #include "libgimpconfig/gimpconfig.h"
 
-#include "gimp-gegl-types.h"
+#include "operations-types.h"
 
 #include "gimpdesaturateconfig.h"
 
diff --git a/app/gegl/gimpdesaturateconfig.h b/app/operations/gimpdesaturateconfig.h
similarity index 100%
rename from app/gegl/gimpdesaturateconfig.h
rename to app/operations/gimpdesaturateconfig.h
diff --git a/app/gegl/gimphuesaturationconfig.c b/app/operations/gimphuesaturationconfig.c
similarity index 99%
rename from app/gegl/gimphuesaturationconfig.c
rename to app/operations/gimphuesaturationconfig.c
index 1b3bb0b..200d469 100644
--- a/app/gegl/gimphuesaturationconfig.c
+++ b/app/operations/gimphuesaturationconfig.c
@@ -25,7 +25,7 @@
 
 #include "libgimpconfig/gimpconfig.h"
 
-#include "gimp-gegl-types.h"
+#include "operations-types.h"
 
 #include "gimphuesaturationconfig.h"
 
diff --git a/app/gegl/gimphuesaturationconfig.h b/app/operations/gimphuesaturationconfig.h
similarity index 100%
rename from app/gegl/gimphuesaturationconfig.h
rename to app/operations/gimphuesaturationconfig.h
diff --git a/app/gegl/gimplevelsconfig.c b/app/operations/gimplevelsconfig.c
similarity index 99%
rename from app/gegl/gimplevelsconfig.c
rename to app/operations/gimplevelsconfig.c
index 0ed8e79..a6678a7 100644
--- a/app/gegl/gimplevelsconfig.c
+++ b/app/operations/gimplevelsconfig.c
@@ -32,7 +32,7 @@
 #include "libgimpmath/gimpmath.h"
 #include "libgimpconfig/gimpconfig.h"
 
-#include "gimp-gegl-types.h"
+#include "operations-types.h"
 
 #include "core/gimpcurve.h"
 #include "core/gimphistogram.h"
diff --git a/app/gegl/gimplevelsconfig.h b/app/operations/gimplevelsconfig.h
similarity index 100%
rename from app/gegl/gimplevelsconfig.h
rename to app/operations/gimplevelsconfig.h
diff --git a/app/gegl/gimpoperationadditionmode.c b/app/operations/gimpoperationadditionmode.c
similarity index 99%
rename from app/gegl/gimpoperationadditionmode.c
rename to app/operations/gimpoperationadditionmode.c
index 3b51580..ce606e5 100644
--- a/app/gegl/gimpoperationadditionmode.c
+++ b/app/operations/gimpoperationadditionmode.c
@@ -24,7 +24,7 @@
 
 #include <gegl-plugin.h>
 
-#include "gimp-gegl-types.h"
+#include "operations-types.h"
 
 #include "gimpoperationadditionmode.h"
 
diff --git a/app/gegl/gimpoperationadditionmode.h b/app/operations/gimpoperationadditionmode.h
similarity index 100%
rename from app/gegl/gimpoperationadditionmode.h
rename to app/operations/gimpoperationadditionmode.h
diff --git a/app/gegl/gimpoperationantierasemode.c b/app/operations/gimpoperationantierasemode.c
similarity index 99%
rename from app/gegl/gimpoperationantierasemode.c
rename to app/operations/gimpoperationantierasemode.c
index c4cbf9c..4116ef5 100644
--- a/app/gegl/gimpoperationantierasemode.c
+++ b/app/operations/gimpoperationantierasemode.c
@@ -23,7 +23,7 @@
 
 #include <gegl-plugin.h>
 
-#include "gimp-gegl-types.h"
+#include "operations-types.h"
 
 #include "gimpoperationantierasemode.h"
 
diff --git a/app/gegl/gimpoperationantierasemode.h b/app/operations/gimpoperationantierasemode.h
similarity index 100%
rename from app/gegl/gimpoperationantierasemode.h
rename to app/operations/gimpoperationantierasemode.h
diff --git a/app/gegl/gimpoperationbehindmode.c b/app/operations/gimpoperationbehindmode.c
similarity index 99%
rename from app/gegl/gimpoperationbehindmode.c
rename to app/operations/gimpoperationbehindmode.c
index cb2fa0d..ffb7d73 100644
--- a/app/gegl/gimpoperationbehindmode.c
+++ b/app/operations/gimpoperationbehindmode.c
@@ -23,7 +23,7 @@
 
 #include <gegl-plugin.h>
 
-#include "gimp-gegl-types.h"
+#include "operations-types.h"
 
 #include "gimpoperationbehindmode.h"
 
diff --git a/app/gegl/gimpoperationbehindmode.h b/app/operations/gimpoperationbehindmode.h
similarity index 100%
rename from app/gegl/gimpoperationbehindmode.h
rename to app/operations/gimpoperationbehindmode.h
diff --git a/app/gegl/gimpoperationborder.c b/app/operations/gimpoperationborder.c
similarity index 99%
rename from app/gegl/gimpoperationborder.c
rename to app/operations/gimpoperationborder.c
index 1c0f124..7b25851 100644
--- a/app/gegl/gimpoperationborder.c
+++ b/app/operations/gimpoperationborder.c
@@ -27,9 +27,8 @@
 #include "libgimpcolor/gimpcolor.h"
 #include "libgimpmath/gimpmath.h"
 
-#include "gimp-gegl-types.h"
+#include "operations-types.h"
 
-#include "gimp-gegl-utils.h"
 #include "gimpoperationborder.h"
 
 
diff --git a/app/gegl/gimpoperationborder.h b/app/operations/gimpoperationborder.h
similarity index 100%
rename from app/gegl/gimpoperationborder.h
rename to app/operations/gimpoperationborder.h
diff --git a/app/gegl/gimpoperationbrightnesscontrast.c b/app/operations/gimpoperationbrightnesscontrast.c
similarity index 99%
rename from app/gegl/gimpoperationbrightnesscontrast.c
rename to app/operations/gimpoperationbrightnesscontrast.c
index d0f9ac8..df8dd52 100644
--- a/app/gegl/gimpoperationbrightnesscontrast.c
+++ b/app/operations/gimpoperationbrightnesscontrast.c
@@ -27,7 +27,7 @@
 #include "libgimpcolor/gimpcolor.h"
 #include "libgimpmath/gimpmath.h"
 
-#include "gimp-gegl-types.h"
+#include "operations-types.h"
 
 #include "gimpbrightnesscontrastconfig.h"
 #include "gimpoperationbrightnesscontrast.h"
diff --git a/app/gegl/gimpoperationbrightnesscontrast.h b/app/operations/gimpoperationbrightnesscontrast.h
similarity index 100%
rename from app/gegl/gimpoperationbrightnesscontrast.h
rename to app/operations/gimpoperationbrightnesscontrast.h
diff --git a/app/gegl/gimpoperationburnmode.c b/app/operations/gimpoperationburnmode.c
similarity index 99%
rename from app/gegl/gimpoperationburnmode.c
rename to app/operations/gimpoperationburnmode.c
index fca8f77..3c8147f 100644
--- a/app/gegl/gimpoperationburnmode.c
+++ b/app/operations/gimpoperationburnmode.c
@@ -24,7 +24,7 @@
 
 #include <gegl-plugin.h>
 
-#include "gimp-gegl-types.h"
+#include "operations-types.h"
 
 #include "gimpoperationburnmode.h"
 
diff --git a/app/gegl/gimpoperationburnmode.h b/app/operations/gimpoperationburnmode.h
similarity index 100%
rename from app/gegl/gimpoperationburnmode.h
rename to app/operations/gimpoperationburnmode.h
diff --git a/app/gegl/gimpoperationcagecoefcalc.c b/app/operations/gimpoperationcagecoefcalc.c
similarity index 99%
rename from app/gegl/gimpoperationcagecoefcalc.c
rename to app/operations/gimpoperationcagecoefcalc.c
index 1172145..4a164f8 100644
--- a/app/gegl/gimpoperationcagecoefcalc.c
+++ b/app/operations/gimpoperationcagecoefcalc.c
@@ -23,7 +23,7 @@
 
 #include "libgimpmath/gimpmath.h"
 
-#include "gimp-gegl-types.h"
+#include "operations-types.h"
 
 #include "gimpoperationcagecoefcalc.h"
 #include "gimpcageconfig.h"
diff --git a/app/gegl/gimpoperationcagecoefcalc.h b/app/operations/gimpoperationcagecoefcalc.h
similarity index 100%
rename from app/gegl/gimpoperationcagecoefcalc.h
rename to app/operations/gimpoperationcagecoefcalc.h
diff --git a/app/gegl/gimpoperationcagetransform.c b/app/operations/gimpoperationcagetransform.c
similarity index 99%
rename from app/gegl/gimpoperationcagetransform.c
rename to app/operations/gimpoperationcagetransform.c
index 0d39c67..3f419c7 100644
--- a/app/gegl/gimpoperationcagetransform.c
+++ b/app/operations/gimpoperationcagetransform.c
@@ -26,7 +26,7 @@
 #include "libgimpcolor/gimpcolor.h"
 #include "libgimpmath/gimpmath.h"
 
-#include "gimp-gegl-types.h"
+#include "operations-types.h"
 
 #include "gimpoperationcagetransform.h"
 #include "gimpcageconfig.h"
diff --git a/app/gegl/gimpoperationcagetransform.h b/app/operations/gimpoperationcagetransform.h
similarity index 100%
rename from app/gegl/gimpoperationcagetransform.h
rename to app/operations/gimpoperationcagetransform.h
diff --git a/app/gegl/gimpoperationcolorbalance.c b/app/operations/gimpoperationcolorbalance.c
similarity index 99%
rename from app/gegl/gimpoperationcolorbalance.c
rename to app/operations/gimpoperationcolorbalance.c
index 102a7cc..1f61b85 100644
--- a/app/gegl/gimpoperationcolorbalance.c
+++ b/app/operations/gimpoperationcolorbalance.c
@@ -27,7 +27,7 @@
 #include "libgimpcolor/gimpcolor.h"
 #include "libgimpmath/gimpmath.h"
 
-#include "gimp-gegl-types.h"
+#include "operations-types.h"
 
 #include "gimpcolorbalanceconfig.h"
 #include "gimpoperationcolorbalance.h"
diff --git a/app/gegl/gimpoperationcolorbalance.h b/app/operations/gimpoperationcolorbalance.h
similarity index 100%
rename from app/gegl/gimpoperationcolorbalance.h
rename to app/operations/gimpoperationcolorbalance.h
diff --git a/app/gegl/gimpoperationcolorerasemode.c b/app/operations/gimpoperationcolorerasemode.c
similarity index 99%
rename from app/gegl/gimpoperationcolorerasemode.c
rename to app/operations/gimpoperationcolorerasemode.c
index cc8addf..4c8cf4c 100644
--- a/app/gegl/gimpoperationcolorerasemode.c
+++ b/app/operations/gimpoperationcolorerasemode.c
@@ -23,7 +23,7 @@
 
 #include <gegl-plugin.h>
 
-#include "gimp-gegl-types.h"
+#include "operations-types.h"
 
 #include "gimpoperationcolorerasemode.h"
 
diff --git a/app/gegl/gimpoperationcolorerasemode.h b/app/operations/gimpoperationcolorerasemode.h
similarity index 100%
rename from app/gegl/gimpoperationcolorerasemode.h
rename to app/operations/gimpoperationcolorerasemode.h
diff --git a/app/gegl/gimpoperationcolorize.c b/app/operations/gimpoperationcolorize.c
similarity index 99%
rename from app/gegl/gimpoperationcolorize.c
rename to app/operations/gimpoperationcolorize.c
index 048b262..38c86c5 100644
--- a/app/gegl/gimpoperationcolorize.c
+++ b/app/operations/gimpoperationcolorize.c
@@ -26,7 +26,7 @@
 
 #include "libgimpcolor/gimpcolor.h"
 
-#include "gimp-gegl-types.h"
+#include "operations-types.h"
 
 #include "gimpcolorizeconfig.h"
 #include "gimpoperationcolorize.h"
diff --git a/app/gegl/gimpoperationcolorize.h b/app/operations/gimpoperationcolorize.h
similarity index 100%
rename from app/gegl/gimpoperationcolorize.h
rename to app/operations/gimpoperationcolorize.h
diff --git a/app/gegl/gimpoperationcolormode.c b/app/operations/gimpoperationcolormode.c
similarity index 99%
rename from app/gegl/gimpoperationcolormode.c
rename to app/operations/gimpoperationcolormode.c
index 59a7f02..84d2a5c 100644
--- a/app/gegl/gimpoperationcolormode.c
+++ b/app/operations/gimpoperationcolormode.c
@@ -23,7 +23,7 @@
 
 #include <gegl-plugin.h>
 
-#include "gimp-gegl-types.h"
+#include "operations-types.h"
 
 #include "gimpoperationcolormode.h"
 
diff --git a/app/gegl/gimpoperationcolormode.h b/app/operations/gimpoperationcolormode.h
similarity index 100%
rename from app/gegl/gimpoperationcolormode.h
rename to app/operations/gimpoperationcolormode.h
diff --git a/app/gegl/gimpoperationcurves.c b/app/operations/gimpoperationcurves.c
similarity index 99%
rename from app/gegl/gimpoperationcurves.c
rename to app/operations/gimpoperationcurves.c
index 4002502..202e32c 100644
--- a/app/gegl/gimpoperationcurves.c
+++ b/app/operations/gimpoperationcurves.c
@@ -25,7 +25,7 @@
 
 #include "libgimpmath/gimpmath.h"
 
-#include "gimp-gegl-types.h"
+#include "operations-types.h"
 
 #include "core/gimpcurve.h"
 #include "core/gimpcurve-map.h"
diff --git a/app/gegl/gimpoperationcurves.h b/app/operations/gimpoperationcurves.h
similarity index 100%
rename from app/gegl/gimpoperationcurves.h
rename to app/operations/gimpoperationcurves.h
diff --git a/app/gegl/gimpoperationdarkenonlymode.c b/app/operations/gimpoperationdarkenonlymode.c
similarity index 99%
rename from app/gegl/gimpoperationdarkenonlymode.c
rename to app/operations/gimpoperationdarkenonlymode.c
index ba8ecf6..5f82bdf 100644
--- a/app/gegl/gimpoperationdarkenonlymode.c
+++ b/app/operations/gimpoperationdarkenonlymode.c
@@ -24,7 +24,7 @@
 
 #include <gegl-plugin.h>
 
-#include "gimp-gegl-types.h"
+#include "operations-types.h"
 
 #include "gimpoperationdarkenonlymode.h"
 
diff --git a/app/gegl/gimpoperationdarkenonlymode.h b/app/operations/gimpoperationdarkenonlymode.h
similarity index 100%
rename from app/gegl/gimpoperationdarkenonlymode.h
rename to app/operations/gimpoperationdarkenonlymode.h
diff --git a/app/gegl/gimpoperationdesaturate.c b/app/operations/gimpoperationdesaturate.c
similarity index 99%
rename from app/gegl/gimpoperationdesaturate.c
rename to app/operations/gimpoperationdesaturate.c
index ae435e9..fac1760 100644
--- a/app/gegl/gimpoperationdesaturate.c
+++ b/app/operations/gimpoperationdesaturate.c
@@ -26,7 +26,7 @@
 
 #include "libgimpcolor/gimpcolor.h"
 
-#include "gimp-gegl-types.h"
+#include "operations-types.h"
 
 #include "gimpoperationdesaturate.h"
 #include "gimpdesaturateconfig.h"
diff --git a/app/gegl/gimpoperationdesaturate.h b/app/operations/gimpoperationdesaturate.h
similarity index 100%
rename from app/gegl/gimpoperationdesaturate.h
rename to app/operations/gimpoperationdesaturate.h
diff --git a/app/gegl/gimpoperationdifferencemode.c b/app/operations/gimpoperationdifferencemode.c
similarity index 99%
rename from app/gegl/gimpoperationdifferencemode.c
rename to app/operations/gimpoperationdifferencemode.c
index 65bfce5..143188b 100644
--- a/app/gegl/gimpoperationdifferencemode.c
+++ b/app/operations/gimpoperationdifferencemode.c
@@ -24,7 +24,7 @@
 
 #include <gegl-plugin.h>
 
-#include "gimp-gegl-types.h"
+#include "operations-types.h"
 
 #include "gimpoperationdifferencemode.h"
 
diff --git a/app/gegl/gimpoperationdifferencemode.h b/app/operations/gimpoperationdifferencemode.h
similarity index 100%
rename from app/gegl/gimpoperationdifferencemode.h
rename to app/operations/gimpoperationdifferencemode.h
diff --git a/app/gegl/gimpoperationdissolvemode.c b/app/operations/gimpoperationdissolvemode.c
similarity index 99%
rename from app/gegl/gimpoperationdissolvemode.c
rename to app/operations/gimpoperationdissolvemode.c
index c32c573..f3de692 100644
--- a/app/gegl/gimpoperationdissolvemode.c
+++ b/app/operations/gimpoperationdissolvemode.c
@@ -25,7 +25,7 @@
 
 #include <gegl-plugin.h>
 
-#include "gimp-gegl-types.h"
+#include "operations-types.h"
 
 #include "gimpoperationdissolvemode.h"
 
diff --git a/app/gegl/gimpoperationdissolvemode.h b/app/operations/gimpoperationdissolvemode.h
similarity index 100%
rename from app/gegl/gimpoperationdissolvemode.h
rename to app/operations/gimpoperationdissolvemode.h
diff --git a/app/gegl/gimpoperationdividemode.c b/app/operations/gimpoperationdividemode.c
similarity index 99%
rename from app/gegl/gimpoperationdividemode.c
rename to app/operations/gimpoperationdividemode.c
index 5da9fe1..1d4a27a 100644
--- a/app/gegl/gimpoperationdividemode.c
+++ b/app/operations/gimpoperationdividemode.c
@@ -24,7 +24,7 @@
 
 #include <gegl-plugin.h>
 
-#include "gimp-gegl-types.h"
+#include "operations-types.h"
 
 #include "gimpoperationdividemode.h"
 
diff --git a/app/gegl/gimpoperationdividemode.h b/app/operations/gimpoperationdividemode.h
similarity index 100%
rename from app/gegl/gimpoperationdividemode.h
rename to app/operations/gimpoperationdividemode.h
diff --git a/app/gegl/gimpoperationdodgemode.c b/app/operations/gimpoperationdodgemode.c
similarity index 99%
rename from app/gegl/gimpoperationdodgemode.c
rename to app/operations/gimpoperationdodgemode.c
index 308cc4a..8f28928 100644
--- a/app/gegl/gimpoperationdodgemode.c
+++ b/app/operations/gimpoperationdodgemode.c
@@ -24,7 +24,7 @@
 
 #include <gegl-plugin.h>
 
-#include "gimp-gegl-types.h"
+#include "operations-types.h"
 
 #include "gimpoperationdodgemode.h"
 
diff --git a/app/gegl/gimpoperationdodgemode.h b/app/operations/gimpoperationdodgemode.h
similarity index 100%
rename from app/gegl/gimpoperationdodgemode.h
rename to app/operations/gimpoperationdodgemode.h
diff --git a/app/gegl/gimpoperationequalize.c b/app/operations/gimpoperationequalize.c
similarity index 99%
rename from app/gegl/gimpoperationequalize.c
rename to app/operations/gimpoperationequalize.c
index 38cb8ad..375d0d4 100644
--- a/app/gegl/gimpoperationequalize.c
+++ b/app/operations/gimpoperationequalize.c
@@ -27,7 +27,7 @@
 #include "libgimpcolor/gimpcolor.h"
 #include "libgimpmath/gimpmath.h"
 
-#include "gimp-gegl-types.h"
+#include "operations-types.h"
 
 #include "core/gimphistogram.h"
 
diff --git a/app/gegl/gimpoperationequalize.h b/app/operations/gimpoperationequalize.h
similarity index 100%
rename from app/gegl/gimpoperationequalize.h
rename to app/operations/gimpoperationequalize.h
diff --git a/app/gegl/gimpoperationerasemode.c b/app/operations/gimpoperationerasemode.c
similarity index 99%
rename from app/gegl/gimpoperationerasemode.c
rename to app/operations/gimpoperationerasemode.c
index 48a9e1a..8ded88b 100644
--- a/app/gegl/gimpoperationerasemode.c
+++ b/app/operations/gimpoperationerasemode.c
@@ -24,7 +24,7 @@
 
 #include <gegl-plugin.h>
 
-#include "gimp-gegl-types.h"
+#include "operations-types.h"
 
 #include "gimpoperationerasemode.h"
 
diff --git a/app/gegl/gimpoperationerasemode.h b/app/operations/gimpoperationerasemode.h
similarity index 100%
rename from app/gegl/gimpoperationerasemode.h
rename to app/operations/gimpoperationerasemode.h
diff --git a/app/gegl/gimpoperationgrainextractmode.c b/app/operations/gimpoperationgrainextractmode.c
similarity index 99%
rename from app/gegl/gimpoperationgrainextractmode.c
rename to app/operations/gimpoperationgrainextractmode.c
index f240b44..3acccae 100644
--- a/app/gegl/gimpoperationgrainextractmode.c
+++ b/app/operations/gimpoperationgrainextractmode.c
@@ -24,7 +24,7 @@
 
 #include <gegl-plugin.h>
 
-#include "gimp-gegl-types.h"
+#include "operations-types.h"
 
 #include "gimpoperationgrainextractmode.h"
 
diff --git a/app/gegl/gimpoperationgrainextractmode.h b/app/operations/gimpoperationgrainextractmode.h
similarity index 100%
rename from app/gegl/gimpoperationgrainextractmode.h
rename to app/operations/gimpoperationgrainextractmode.h
diff --git a/app/gegl/gimpoperationgrainmergemode.c b/app/operations/gimpoperationgrainmergemode.c
similarity index 99%
rename from app/gegl/gimpoperationgrainmergemode.c
rename to app/operations/gimpoperationgrainmergemode.c
index aac5b7a..fe9903c 100644
--- a/app/gegl/gimpoperationgrainmergemode.c
+++ b/app/operations/gimpoperationgrainmergemode.c
@@ -24,7 +24,7 @@
 
 #include <gegl-plugin.h>
 
-#include "gimp-gegl-types.h"
+#include "operations-types.h"
 
 #include "gimpoperationgrainmergemode.h"
 
diff --git a/app/gegl/gimpoperationgrainmergemode.h b/app/operations/gimpoperationgrainmergemode.h
similarity index 100%
rename from app/gegl/gimpoperationgrainmergemode.h
rename to app/operations/gimpoperationgrainmergemode.h
diff --git a/app/gegl/gimpoperationgrow.c b/app/operations/gimpoperationgrow.c
similarity index 99%
rename from app/gegl/gimpoperationgrow.c
rename to app/operations/gimpoperationgrow.c
index 431b103..48d1f6b 100644
--- a/app/gegl/gimpoperationgrow.c
+++ b/app/operations/gimpoperationgrow.c
@@ -27,9 +27,8 @@
 #include "libgimpcolor/gimpcolor.h"
 #include "libgimpmath/gimpmath.h"
 
-#include "gimp-gegl-types.h"
+#include "operations-types.h"
 
-#include "gimp-gegl-utils.h"
 #include "gimpoperationgrow.h"
 
 
diff --git a/app/gegl/gimpoperationgrow.h b/app/operations/gimpoperationgrow.h
similarity index 100%
rename from app/gegl/gimpoperationgrow.h
rename to app/operations/gimpoperationgrow.h
diff --git a/app/gegl/gimpoperationhardlightmode.c b/app/operations/gimpoperationhardlightmode.c
similarity index 99%
rename from app/gegl/gimpoperationhardlightmode.c
rename to app/operations/gimpoperationhardlightmode.c
index 3339ea7..2706ea4 100644
--- a/app/gegl/gimpoperationhardlightmode.c
+++ b/app/operations/gimpoperationhardlightmode.c
@@ -24,7 +24,7 @@
 
 #include <gegl-plugin.h>
 
-#include "gimp-gegl-types.h"
+#include "operations-types.h"
 
 #include "gimpoperationhardlightmode.h"
 
diff --git a/app/gegl/gimpoperationhardlightmode.h b/app/operations/gimpoperationhardlightmode.h
similarity index 100%
rename from app/gegl/gimpoperationhardlightmode.h
rename to app/operations/gimpoperationhardlightmode.h
diff --git a/app/gegl/gimpoperationhistogramsink.c b/app/operations/gimpoperationhistogramsink.c
similarity index 99%
rename from app/gegl/gimpoperationhistogramsink.c
rename to app/operations/gimpoperationhistogramsink.c
index 22adeb6..57f5474 100644
--- a/app/gegl/gimpoperationhistogramsink.c
+++ b/app/operations/gimpoperationhistogramsink.c
@@ -22,7 +22,7 @@
 
 #include <gegl.h>
 
-#include "gimp-gegl-types.h"
+#include "operations-types.h"
 
 #include "core/gimphistogram.h"
 
diff --git a/app/gegl/gimpoperationhistogramsink.h b/app/operations/gimpoperationhistogramsink.h
similarity index 100%
rename from app/gegl/gimpoperationhistogramsink.h
rename to app/operations/gimpoperationhistogramsink.h
diff --git a/app/gegl/gimpoperationhuemode.c b/app/operations/gimpoperationhuemode.c
similarity index 99%
rename from app/gegl/gimpoperationhuemode.c
rename to app/operations/gimpoperationhuemode.c
index a0e261f..ebf853e 100644
--- a/app/gegl/gimpoperationhuemode.c
+++ b/app/operations/gimpoperationhuemode.c
@@ -28,7 +28,7 @@
 
 #include "libgimpcolor/gimpcolor.h"
 
-#include "gimp-gegl-types.h"
+#include "operations-types.h"
 
 #include "gimpoperationhuemode.h"
 
diff --git a/app/gegl/gimpoperationhuemode.h b/app/operations/gimpoperationhuemode.h
similarity index 100%
rename from app/gegl/gimpoperationhuemode.h
rename to app/operations/gimpoperationhuemode.h
diff --git a/app/gegl/gimpoperationhuesaturation.c b/app/operations/gimpoperationhuesaturation.c
similarity index 99%
rename from app/gegl/gimpoperationhuesaturation.c
rename to app/operations/gimpoperationhuesaturation.c
index 5d35d53..c812787 100644
--- a/app/gegl/gimpoperationhuesaturation.c
+++ b/app/operations/gimpoperationhuesaturation.c
@@ -27,7 +27,7 @@
 #include "libgimpcolor/gimpcolor.h"
 #include "libgimpmath/gimpmath.h"
 
-#include "gimp-gegl-types.h"
+#include "operations-types.h"
 
 #include "gimphuesaturationconfig.h"
 #include "gimpoperationhuesaturation.h"
diff --git a/app/gegl/gimpoperationhuesaturation.h b/app/operations/gimpoperationhuesaturation.h
similarity index 100%
rename from app/gegl/gimpoperationhuesaturation.h
rename to app/operations/gimpoperationhuesaturation.h
diff --git a/app/gegl/gimpoperationlevels.c b/app/operations/gimpoperationlevels.c
similarity index 99%
rename from app/gegl/gimpoperationlevels.c
rename to app/operations/gimpoperationlevels.c
index 7bd25f9..8863d59 100644
--- a/app/gegl/gimpoperationlevels.c
+++ b/app/operations/gimpoperationlevels.c
@@ -25,7 +25,7 @@
 
 #include "libgimpmath/gimpmath.h"
 
-#include "gimp-gegl-types.h"
+#include "operations-types.h"
 
 #include "gimplevelsconfig.h"
 #include "gimpoperationlevels.h"
diff --git a/app/gegl/gimpoperationlevels.h b/app/operations/gimpoperationlevels.h
similarity index 100%
rename from app/gegl/gimpoperationlevels.h
rename to app/operations/gimpoperationlevels.h
diff --git a/app/gegl/gimpoperationlightenonlymode.c b/app/operations/gimpoperationlightenonlymode.c
similarity index 99%
rename from app/gegl/gimpoperationlightenonlymode.c
rename to app/operations/gimpoperationlightenonlymode.c
index 63e93f1..6cca8a1 100644
--- a/app/gegl/gimpoperationlightenonlymode.c
+++ b/app/operations/gimpoperationlightenonlymode.c
@@ -24,7 +24,7 @@
 
 #include <gegl-plugin.h>
 
-#include "gimp-gegl-types.h"
+#include "operations-types.h"
 
 #include "gimpoperationlightenonlymode.h"
 
diff --git a/app/gegl/gimpoperationlightenonlymode.h b/app/operations/gimpoperationlightenonlymode.h
similarity index 100%
rename from app/gegl/gimpoperationlightenonlymode.h
rename to app/operations/gimpoperationlightenonlymode.h
diff --git a/app/gegl/gimpoperationmaskcomponents.c b/app/operations/gimpoperationmaskcomponents.c
similarity index 99%
rename from app/gegl/gimpoperationmaskcomponents.c
rename to app/operations/gimpoperationmaskcomponents.c
index 703e19d..f74912f 100644
--- a/app/gegl/gimpoperationmaskcomponents.c
+++ b/app/operations/gimpoperationmaskcomponents.c
@@ -22,7 +22,7 @@
 
 #include <gegl.h>
 
-#include "gimp-gegl-types.h"
+#include "operations-types.h"
 
 #include "gimpoperationmaskcomponents.h"
 
diff --git a/app/gegl/gimpoperationmaskcomponents.h b/app/operations/gimpoperationmaskcomponents.h
similarity index 100%
rename from app/gegl/gimpoperationmaskcomponents.h
rename to app/operations/gimpoperationmaskcomponents.h
diff --git a/app/gegl/gimpoperationmultiplymode.c b/app/operations/gimpoperationmultiplymode.c
similarity index 99%
rename from app/gegl/gimpoperationmultiplymode.c
rename to app/operations/gimpoperationmultiplymode.c
index 8eb7c6d..6fba66e 100644
--- a/app/gegl/gimpoperationmultiplymode.c
+++ b/app/operations/gimpoperationmultiplymode.c
@@ -24,7 +24,7 @@
 
 #include <gegl-plugin.h>
 
-#include "gimp-gegl-types.h"
+#include "operations-types.h"
 
 #include "gimpoperationmultiplymode.h"
 
diff --git a/app/gegl/gimpoperationmultiplymode.h b/app/operations/gimpoperationmultiplymode.h
similarity index 100%
rename from app/gegl/gimpoperationmultiplymode.h
rename to app/operations/gimpoperationmultiplymode.h
diff --git a/app/gegl/gimpoperationnormalmode.c b/app/operations/gimpoperationnormalmode.c
similarity index 99%
rename from app/gegl/gimpoperationnormalmode.c
rename to app/operations/gimpoperationnormalmode.c
index 96be5a4..d503738 100644
--- a/app/gegl/gimpoperationnormalmode.c
+++ b/app/operations/gimpoperationnormalmode.c
@@ -23,7 +23,7 @@
 
 #include <gegl-plugin.h>
 
-#include "gimp-gegl-types.h"
+#include "operations-types.h"
 
 #include "gimpoperationnormalmode.h"
 
diff --git a/app/gegl/gimpoperationnormalmode.h b/app/operations/gimpoperationnormalmode.h
similarity index 100%
rename from app/gegl/gimpoperationnormalmode.h
rename to app/operations/gimpoperationnormalmode.h
diff --git a/app/gegl/gimpoperationoverlaymode.c b/app/operations/gimpoperationoverlaymode.c
similarity index 99%
rename from app/gegl/gimpoperationoverlaymode.c
rename to app/operations/gimpoperationoverlaymode.c
index f5e0fde..49f068a 100644
--- a/app/gegl/gimpoperationoverlaymode.c
+++ b/app/operations/gimpoperationoverlaymode.c
@@ -24,7 +24,7 @@
 
 #include <gegl-plugin.h>
 
-#include "gimp-gegl-types.h"
+#include "operations-types.h"
 
 #include "gimpoperationoverlaymode.h"
 
diff --git a/app/gegl/gimpoperationoverlaymode.h b/app/operations/gimpoperationoverlaymode.h
similarity index 100%
rename from app/gegl/gimpoperationoverlaymode.h
rename to app/operations/gimpoperationoverlaymode.h
diff --git a/app/gegl/gimpoperationpointfilter.c b/app/operations/gimpoperationpointfilter.c
similarity index 99%
rename from app/gegl/gimpoperationpointfilter.c
rename to app/operations/gimpoperationpointfilter.c
index 2ef2f52..234c183 100644
--- a/app/gegl/gimpoperationpointfilter.c
+++ b/app/operations/gimpoperationpointfilter.c
@@ -22,7 +22,7 @@
 
 #include <gegl.h>
 
-#include "gimp-gegl-types.h"
+#include "operations-types.h"
 
 #include "gimpoperationpointfilter.h"
 
diff --git a/app/gegl/gimpoperationpointfilter.h b/app/operations/gimpoperationpointfilter.h
similarity index 100%
rename from app/gegl/gimpoperationpointfilter.h
rename to app/operations/gimpoperationpointfilter.h
diff --git a/app/gegl/gimpoperationpointlayermode.c b/app/operations/gimpoperationpointlayermode.c
similarity index 99%
rename from app/gegl/gimpoperationpointlayermode.c
rename to app/operations/gimpoperationpointlayermode.c
index 155d634..3b100c1 100644
--- a/app/gegl/gimpoperationpointlayermode.c
+++ b/app/operations/gimpoperationpointlayermode.c
@@ -27,7 +27,7 @@
 
 #include "libgimpcolor/gimpcolor.h"
 
-#include "gimp-gegl-types.h"
+#include "operations-types.h"
 
 #include "paint-funcs/paint-funcs.h"
 
diff --git a/app/gegl/gimpoperationpointlayermode.h b/app/operations/gimpoperationpointlayermode.h
similarity index 100%
rename from app/gegl/gimpoperationpointlayermode.h
rename to app/operations/gimpoperationpointlayermode.h
diff --git a/app/gegl/gimpoperationposterize.c b/app/operations/gimpoperationposterize.c
similarity index 99%
rename from app/gegl/gimpoperationposterize.c
rename to app/operations/gimpoperationposterize.c
index 777c35e..5c4138b 100644
--- a/app/gegl/gimpoperationposterize.c
+++ b/app/operations/gimpoperationposterize.c
@@ -25,7 +25,7 @@
 
 #include "libgimpmath/gimpmath.h"
 
-#include "gimp-gegl-types.h"
+#include "operations-types.h"
 
 #include "gimpoperationposterize.h"
 #include "gimpposterizeconfig.h"
diff --git a/app/gegl/gimpoperationposterize.h b/app/operations/gimpoperationposterize.h
similarity index 100%
rename from app/gegl/gimpoperationposterize.h
rename to app/operations/gimpoperationposterize.h
diff --git a/app/gegl/gimpoperationreplacemode.c b/app/operations/gimpoperationreplacemode.c
similarity index 99%
rename from app/gegl/gimpoperationreplacemode.c
rename to app/operations/gimpoperationreplacemode.c
index 1ab480d..30c64c1 100644
--- a/app/gegl/gimpoperationreplacemode.c
+++ b/app/operations/gimpoperationreplacemode.c
@@ -23,7 +23,7 @@
 
 #include <gegl-plugin.h>
 
-#include "gimp-gegl-types.h"
+#include "operations-types.h"
 
 #include "gimpoperationreplacemode.h"
 
diff --git a/app/gegl/gimpoperationreplacemode.h b/app/operations/gimpoperationreplacemode.h
similarity index 100%
rename from app/gegl/gimpoperationreplacemode.h
rename to app/operations/gimpoperationreplacemode.h
diff --git a/app/gegl/gimpoperationsaturationmode.c b/app/operations/gimpoperationsaturationmode.c
similarity index 99%
rename from app/gegl/gimpoperationsaturationmode.c
rename to app/operations/gimpoperationsaturationmode.c
index bd16ada..d80afb8 100644
--- a/app/gegl/gimpoperationsaturationmode.c
+++ b/app/operations/gimpoperationsaturationmode.c
@@ -23,7 +23,7 @@
 
 #include <gegl-plugin.h>
 
-#include "gimp-gegl-types.h"
+#include "operations-types.h"
 
 #include "gimpoperationsaturationmode.h"
 
diff --git a/app/gegl/gimpoperationsaturationmode.h b/app/operations/gimpoperationsaturationmode.h
similarity index 100%
rename from app/gegl/gimpoperationsaturationmode.h
rename to app/operations/gimpoperationsaturationmode.h
diff --git a/app/gegl/gimpoperationscreenmode.c b/app/operations/gimpoperationscreenmode.c
similarity index 99%
rename from app/gegl/gimpoperationscreenmode.c
rename to app/operations/gimpoperationscreenmode.c
index 7826289..975d0d2 100644
--- a/app/gegl/gimpoperationscreenmode.c
+++ b/app/operations/gimpoperationscreenmode.c
@@ -24,7 +24,7 @@
 
 #include <gegl-plugin.h>
 
-#include "gimp-gegl-types.h"
+#include "operations-types.h"
 
 #include "gimpoperationscreenmode.h"
 
diff --git a/app/gegl/gimpoperationscreenmode.h b/app/operations/gimpoperationscreenmode.h
similarity index 100%
rename from app/gegl/gimpoperationscreenmode.h
rename to app/operations/gimpoperationscreenmode.h
diff --git a/app/gegl/gimpoperationsemiflatten.c b/app/operations/gimpoperationsemiflatten.c
similarity index 99%
rename from app/gegl/gimpoperationsemiflatten.c
rename to app/operations/gimpoperationsemiflatten.c
index 80466d5..2aa7590 100644
--- a/app/gegl/gimpoperationsemiflatten.c
+++ b/app/operations/gimpoperationsemiflatten.c
@@ -29,7 +29,7 @@
 
 #include "libgimpcolor/gimpcolor.h"
 
-#include "gimp-gegl-types.h"
+#include "operations-types.h"
 
 #include "gimpoperationsemiflatten.h"
 
diff --git a/app/gegl/gimpoperationsemiflatten.h b/app/operations/gimpoperationsemiflatten.h
similarity index 100%
rename from app/gegl/gimpoperationsemiflatten.h
rename to app/operations/gimpoperationsemiflatten.h
diff --git a/app/gegl/gimpoperationsetalpha.c b/app/operations/gimpoperationsetalpha.c
similarity index 99%
rename from app/gegl/gimpoperationsetalpha.c
rename to app/operations/gimpoperationsetalpha.c
index 1756d86..15ad8d8 100644
--- a/app/gegl/gimpoperationsetalpha.c
+++ b/app/operations/gimpoperationsetalpha.c
@@ -22,7 +22,7 @@
 
 #include <gegl.h>
 
-#include "gimp-gegl-types.h"
+#include "operations-types.h"
 
 #include "gimpoperationsetalpha.h"
 
diff --git a/app/gegl/gimpoperationsetalpha.h b/app/operations/gimpoperationsetalpha.h
similarity index 100%
rename from app/gegl/gimpoperationsetalpha.h
rename to app/operations/gimpoperationsetalpha.h
diff --git a/app/gegl/gimpoperationshapeburst.c b/app/operations/gimpoperationshapeburst.c
similarity index 99%
rename from app/gegl/gimpoperationshapeburst.c
rename to app/operations/gimpoperationshapeburst.c
index ff048c9..14a311a 100644
--- a/app/gegl/gimpoperationshapeburst.c
+++ b/app/operations/gimpoperationshapeburst.c
@@ -27,9 +27,8 @@
 #include "libgimpcolor/gimpcolor.h"
 #include "libgimpmath/gimpmath.h"
 
-#include "gimp-gegl-types.h"
+#include "operations-types.h"
 
-#include "gimp-gegl-utils.h"
 #include "gimpoperationshapeburst.h"
 
 
diff --git a/app/gegl/gimpoperationshapeburst.h b/app/operations/gimpoperationshapeburst.h
similarity index 100%
rename from app/gegl/gimpoperationshapeburst.h
rename to app/operations/gimpoperationshapeburst.h
diff --git a/app/gegl/gimpoperationshrink.c b/app/operations/gimpoperationshrink.c
similarity index 99%
rename from app/gegl/gimpoperationshrink.c
rename to app/operations/gimpoperationshrink.c
index e5d34ea..e6df86a 100644
--- a/app/gegl/gimpoperationshrink.c
+++ b/app/operations/gimpoperationshrink.c
@@ -27,9 +27,8 @@
 #include "libgimpcolor/gimpcolor.h"
 #include "libgimpmath/gimpmath.h"
 
-#include "gimp-gegl-types.h"
+#include "operations-types.h"
 
-#include "gimp-gegl-utils.h"
 #include "gimpoperationshrink.h"
 
 
diff --git a/app/gegl/gimpoperationshrink.h b/app/operations/gimpoperationshrink.h
similarity index 100%
rename from app/gegl/gimpoperationshrink.h
rename to app/operations/gimpoperationshrink.h
diff --git a/app/gegl/gimpoperationsoftlightmode.c b/app/operations/gimpoperationsoftlightmode.c
similarity index 99%
rename from app/gegl/gimpoperationsoftlightmode.c
rename to app/operations/gimpoperationsoftlightmode.c
index 1bbcbff..e9c1b82 100644
--- a/app/gegl/gimpoperationsoftlightmode.c
+++ b/app/operations/gimpoperationsoftlightmode.c
@@ -24,7 +24,7 @@
 
 #include <gegl-plugin.h>
 
-#include "gimp-gegl-types.h"
+#include "operations-types.h"
 
 #include "gimpoperationsoftlightmode.h"
 
diff --git a/app/gegl/gimpoperationsoftlightmode.h b/app/operations/gimpoperationsoftlightmode.h
similarity index 100%
rename from app/gegl/gimpoperationsoftlightmode.h
rename to app/operations/gimpoperationsoftlightmode.h
diff --git a/app/gegl/gimpoperationsubtractmode.c b/app/operations/gimpoperationsubtractmode.c
similarity index 99%
rename from app/gegl/gimpoperationsubtractmode.c
rename to app/operations/gimpoperationsubtractmode.c
index 0a0fabd..3c22d08 100644
--- a/app/gegl/gimpoperationsubtractmode.c
+++ b/app/operations/gimpoperationsubtractmode.c
@@ -24,7 +24,7 @@
 
 #include <gegl-plugin.h>
 
-#include "gimp-gegl-types.h"
+#include "operations-types.h"
 
 #include "gimpoperationsubtractmode.h"
 
diff --git a/app/gegl/gimpoperationsubtractmode.h b/app/operations/gimpoperationsubtractmode.h
similarity index 100%
rename from app/gegl/gimpoperationsubtractmode.h
rename to app/operations/gimpoperationsubtractmode.h
diff --git a/app/gegl/gimpoperationthreshold.c b/app/operations/gimpoperationthreshold.c
similarity index 99%
rename from app/gegl/gimpoperationthreshold.c
rename to app/operations/gimpoperationthreshold.c
index 8e60e77..cc5c8fe 100644
--- a/app/gegl/gimpoperationthreshold.c
+++ b/app/operations/gimpoperationthreshold.c
@@ -23,7 +23,7 @@
 #include <cairo.h>
 #include <gegl.h>
 
-#include "gimp-gegl-types.h"
+#include "operations-types.h"
 
 #include "gimpoperationthreshold.h"
 #include "gimpthresholdconfig.h"
diff --git a/app/gegl/gimpoperationthreshold.h b/app/operations/gimpoperationthreshold.h
similarity index 100%
rename from app/gegl/gimpoperationthreshold.h
rename to app/operations/gimpoperationthreshold.h
diff --git a/app/gegl/gimpoperationthresholdalpha.c b/app/operations/gimpoperationthresholdalpha.c
similarity index 99%
rename from app/gegl/gimpoperationthresholdalpha.c
rename to app/operations/gimpoperationthresholdalpha.c
index 7a530bb..ddf77c7 100644
--- a/app/gegl/gimpoperationthresholdalpha.c
+++ b/app/operations/gimpoperationthresholdalpha.c
@@ -25,7 +25,7 @@
 
 #include <gegl.h>
 
-#include "gimp-gegl-types.h"
+#include "operations-types.h"
 
 #include "gimpoperationthresholdalpha.h"
 
diff --git a/app/gegl/gimpoperationthresholdalpha.h b/app/operations/gimpoperationthresholdalpha.h
similarity index 100%
rename from app/gegl/gimpoperationthresholdalpha.h
rename to app/operations/gimpoperationthresholdalpha.h
diff --git a/app/gegl/gimpoperationvaluemode.c b/app/operations/gimpoperationvaluemode.c
similarity index 99%
rename from app/gegl/gimpoperationvaluemode.c
rename to app/operations/gimpoperationvaluemode.c
index dc92805..0bd80aa 100644
--- a/app/gegl/gimpoperationvaluemode.c
+++ b/app/operations/gimpoperationvaluemode.c
@@ -23,7 +23,7 @@
 
 #include <gegl-plugin.h>
 
-#include "gimp-gegl-types.h"
+#include "operations-types.h"
 
 #include "gimpoperationvaluemode.h"
 
diff --git a/app/gegl/gimpoperationvaluemode.h b/app/operations/gimpoperationvaluemode.h
similarity index 100%
rename from app/gegl/gimpoperationvaluemode.h
rename to app/operations/gimpoperationvaluemode.h
diff --git a/app/gegl/gimpposterizeconfig.c b/app/operations/gimpposterizeconfig.c
similarity index 99%
rename from app/gegl/gimpposterizeconfig.c
rename to app/operations/gimpposterizeconfig.c
index 5bf9fda..e8922c3 100644
--- a/app/gegl/gimpposterizeconfig.c
+++ b/app/operations/gimpposterizeconfig.c
@@ -24,7 +24,7 @@
 
 #include "libgimpconfig/gimpconfig.h"
 
-#include "gimp-gegl-types.h"
+#include "operations-types.h"
 
 #include "gimpposterizeconfig.h"
 
diff --git a/app/gegl/gimpposterizeconfig.h b/app/operations/gimpposterizeconfig.h
similarity index 100%
rename from app/gegl/gimpposterizeconfig.h
rename to app/operations/gimpposterizeconfig.h
diff --git a/app/gegl/gimpthresholdconfig.c b/app/operations/gimpthresholdconfig.c
similarity index 99%
rename from app/gegl/gimpthresholdconfig.c
rename to app/operations/gimpthresholdconfig.c
index cff90b3..89523c4 100644
--- a/app/gegl/gimpthresholdconfig.c
+++ b/app/operations/gimpthresholdconfig.c
@@ -24,7 +24,7 @@
 
 #include "libgimpconfig/gimpconfig.h"
 
-#include "gimp-gegl-types.h"
+#include "operations-types.h"
 
 #include "gimpthresholdconfig.h"
 
diff --git a/app/gegl/gimpthresholdconfig.h b/app/operations/gimpthresholdconfig.h
similarity index 100%
rename from app/gegl/gimpthresholdconfig.h
rename to app/operations/gimpthresholdconfig.h
diff --git a/app/operations/operations-types.h b/app/operations/operations-types.h
new file mode 100644
index 0000000..89f9045
--- /dev/null
+++ b/app/operations/operations-types.h
@@ -0,0 +1,52 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * operations-types.h
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __OPERATIONS_TYPES_H__
+#define __OPERATIONS_TYPES_H__
+
+
+#include "gegl/gimp-gegl-types.h"
+
+
+/*  operations  */
+
+typedef struct _GimpOperationPointFilter        GimpOperationPointFilter;
+typedef struct _GimpOperationPointLayerMode     GimpOperationPointLayerMode;
+
+
+/*  operation config objects  */
+
+typedef struct _GimpBrightnessContrastConfig    GimpBrightnessContrastConfig;
+typedef struct _GimpCageConfig                  GimpCageConfig;
+typedef struct _GimpColorBalanceConfig          GimpColorBalanceConfig;
+typedef struct _GimpColorizeConfig              GimpColorizeConfig;
+typedef struct _GimpCurvesConfig                GimpCurvesConfig;
+typedef struct _GimpDesaturateConfig            GimpDesaturateConfig;
+typedef struct _GimpHueSaturationConfig         GimpHueSaturationConfig;
+typedef struct _GimpLevelsConfig                GimpLevelsConfig;
+typedef struct _GimpPosterizeConfig             GimpPosterizeConfig;
+typedef struct _GimpThresholdConfig             GimpThresholdConfig;
+
+
+/*  non-object types  */
+
+typedef struct _GimpCagePoint                   GimpCagePoint;
+
+
+#endif /* __OPERATIONS_TYPES_H__ */
diff --git a/app/pdb/color-cmds.c b/app/pdb/color-cmds.c
index 186f1a3..51d3cfe 100644
--- a/app/pdb/color-cmds.c
+++ b/app/pdb/color-cmds.c
@@ -34,15 +34,15 @@
 #include "core/gimpdrawable.h"
 #include "core/gimphistogram.h"
 #include "core/gimpparamspecs.h"
-#include "gegl/gimpbrightnesscontrastconfig.h"
-#include "gegl/gimpcolorbalanceconfig.h"
-#include "gegl/gimpcolorizeconfig.h"
-#include "gegl/gimpcurvesconfig.h"
-#include "gegl/gimpdesaturateconfig.h"
-#include "gegl/gimphuesaturationconfig.h"
-#include "gegl/gimplevelsconfig.h"
-#include "gegl/gimpposterizeconfig.h"
-#include "gegl/gimpthresholdconfig.h"
+#include "operations/gimpbrightnesscontrastconfig.h"
+#include "operations/gimpcolorbalanceconfig.h"
+#include "operations/gimpcolorizeconfig.h"
+#include "operations/gimpcurvesconfig.h"
+#include "operations/gimpdesaturateconfig.h"
+#include "operations/gimphuesaturationconfig.h"
+#include "operations/gimplevelsconfig.h"
+#include "operations/gimpposterizeconfig.h"
+#include "operations/gimpthresholdconfig.h"
 
 #include "gimppdb.h"
 #include "gimppdb-utils.h"
diff --git a/app/tools/gimpbrightnesscontrasttool.c b/app/tools/gimpbrightnesscontrasttool.c
index a431162..ab4d7ee 100644
--- a/app/tools/gimpbrightnesscontrasttool.c
+++ b/app/tools/gimpbrightnesscontrasttool.c
@@ -27,7 +27,7 @@
 
 #include "tools-types.h"
 
-#include "gegl/gimpbrightnesscontrastconfig.h"
+#include "operations/gimpbrightnesscontrastconfig.h"
 
 #include "core/gimpdrawable.h"
 #include "core/gimperror.h"
diff --git a/app/tools/gimpcagetool.c b/app/tools/gimpcagetool.c
index 93274ce..2967fca 100644
--- a/app/tools/gimpcagetool.c
+++ b/app/tools/gimpcagetool.c
@@ -32,6 +32,10 @@
 
 #include "tools-types.h"
 
+#include "gegl/gimp-gegl-utils.h"
+
+#include "operations/gimpcageconfig.h"
+
 #include "core/gimp.h"
 #include "core/gimpchannel.h"
 #include "core/gimpdrawable-shadow.h"
@@ -41,9 +45,6 @@
 #include "core/gimpprogress.h"
 #include "core/gimpprojection.h"
 
-#include "gegl/gimp-gegl-utils.h"
-#include "gegl/gimpcageconfig.h"
-
 #include "widgets/gimphelp-ids.h"
 
 #include "display/gimpdisplay.h"
diff --git a/app/tools/gimpcolorbalancetool.c b/app/tools/gimpcolorbalancetool.c
index 5351842..a9668d0 100644
--- a/app/tools/gimpcolorbalancetool.c
+++ b/app/tools/gimpcolorbalancetool.c
@@ -27,7 +27,7 @@
 
 #include "tools-types.h"
 
-#include "gegl/gimpcolorbalanceconfig.h"
+#include "operations/gimpcolorbalanceconfig.h"
 
 #include "core/gimpdrawable.h"
 #include "core/gimperror.h"
diff --git a/app/tools/gimpcolorizetool.c b/app/tools/gimpcolorizetool.c
index f7dab51..70e0a0f 100644
--- a/app/tools/gimpcolorizetool.c
+++ b/app/tools/gimpcolorizetool.c
@@ -27,7 +27,7 @@
 
 #include "tools-types.h"
 
-#include "gegl/gimpcolorizeconfig.h"
+#include "operations/gimpcolorizeconfig.h"
 
 #include "core/gimpdrawable.h"
 #include "core/gimperror.h"
diff --git a/app/tools/gimpcurvestool.c b/app/tools/gimpcurvestool.c
index 3e52b55..95e0017 100644
--- a/app/tools/gimpcurvestool.c
+++ b/app/tools/gimpcurvestool.c
@@ -30,8 +30,8 @@
 
 #include "tools-types.h"
 
-#include "gegl/gimpcurvesconfig.h"
-#include "gegl/gimpoperationcurves.h"
+#include "operations/gimpcurvesconfig.h"
+#include "operations/gimpoperationcurves.h"
 
 #include "core/gimp.h"
 #include "core/gimpcurve.h"
diff --git a/app/tools/gimpdesaturatetool.c b/app/tools/gimpdesaturatetool.c
index de82eb7..e574d5b 100644
--- a/app/tools/gimpdesaturatetool.c
+++ b/app/tools/gimpdesaturatetool.c
@@ -26,7 +26,7 @@
 
 #include "tools-types.h"
 
-#include "gegl/gimpdesaturateconfig.h"
+#include "operations/gimpdesaturateconfig.h"
 
 #include "core/gimpdrawable.h"
 #include "core/gimperror.h"
diff --git a/app/tools/gimphuesaturationtool.c b/app/tools/gimphuesaturationtool.c
index 96c0314..c3c5ae1 100644
--- a/app/tools/gimphuesaturationtool.c
+++ b/app/tools/gimphuesaturationtool.c
@@ -27,8 +27,8 @@
 
 #include "tools-types.h"
 
-#include "gegl/gimphuesaturationconfig.h"
-#include "gegl/gimpoperationhuesaturation.h"
+#include "operations/gimphuesaturationconfig.h"
+#include "operations/gimpoperationhuesaturation.h"
 
 #include "core/gimpdrawable.h"
 #include "core/gimperror.h"
diff --git a/app/tools/gimplevelstool.c b/app/tools/gimplevelstool.c
index 7db2c36..1b9d17d 100644
--- a/app/tools/gimplevelstool.c
+++ b/app/tools/gimplevelstool.c
@@ -31,8 +31,9 @@
 #include "tools-types.h"
 
 #include "gegl/gimp-babl.h"
-#include "gegl/gimplevelsconfig.h"
-#include "gegl/gimpoperationlevels.h"
+
+#include "operations/gimplevelsconfig.h"
+#include "operations/gimpoperationlevels.h"
 
 #include "core/gimpdrawable.h"
 #include "core/gimpdrawable-histogram.h"
diff --git a/app/tools/gimpposterizetool.c b/app/tools/gimpposterizetool.c
index d7e2f90..8937599 100644
--- a/app/tools/gimpposterizetool.c
+++ b/app/tools/gimpposterizetool.c
@@ -26,7 +26,7 @@
 
 #include "tools-types.h"
 
-#include "gegl/gimpposterizeconfig.h"
+#include "operations/gimpposterizeconfig.h"
 
 #include "core/gimpdrawable.h"
 #include "core/gimperror.h"
diff --git a/app/tools/gimpthresholdtool.c b/app/tools/gimpthresholdtool.c
index 3d5f660..a284aac 100644
--- a/app/tools/gimpthresholdtool.c
+++ b/app/tools/gimpthresholdtool.c
@@ -25,7 +25,7 @@
 
 #include "tools-types.h"
 
-#include "gegl/gimpthresholdconfig.h"
+#include "operations/gimpthresholdconfig.h"
 
 #include "core/gimpdrawable.h"
 #include "core/gimpdrawable-histogram.h"
diff --git a/configure.ac b/configure.ac
index 0e50612..fdf12fd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2154,6 +2154,7 @@ app/actions/Makefile
 app/base/Makefile
 app/config/Makefile
 app/core/Makefile
+app/operations/Makefile
 app/gegl/Makefile
 app/dialogs/Makefile
 app/display/Makefile
diff --git a/tools/pdbgen/pdb/color.pdb b/tools/pdbgen/pdb/color.pdb
index 8a575c2..b6fe419 100644
--- a/tools/pdbgen/pdb/color.pdb
+++ b/tools/pdbgen/pdb/color.pdb
@@ -38,7 +38,7 @@ HELP
     );
 
     %invoke = (
-        headers => [ qw("gegl/gimpbrightnesscontrastconfig.h") ],
+        headers => [ qw("operations/gimpbrightnesscontrastconfig.h") ],
 	code => <<'CODE'
 {
   if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL, TRUE, error) &&
@@ -98,7 +98,7 @@ HELP
     );
 
     %invoke = (
-	headers => [ qw("gegl/gimplevelsconfig.h") ],
+	headers => [ qw("operations/gimplevelsconfig.h") ],
 	code => <<'CODE'
 {
   if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL, TRUE, error) &&
@@ -208,7 +208,7 @@ HELP
     );
 
     %invoke = (
-        headers => [ qw("gegl/gimpposterizeconfig.h") ],
+        headers => [ qw("operations/gimpposterizeconfig.h") ],
 	code => <<'CODE'
 {
   if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL, TRUE, error) &&
@@ -247,7 +247,7 @@ HELP
     );
 
     %invoke = (
-	headers => [ qw("gegl/gimpdesaturateconfig.h") ],
+	headers => [ qw("operations/gimpdesaturateconfig.h") ],
 	code => <<'CODE'
 {
   if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL, TRUE, error) &&
@@ -294,7 +294,7 @@ HELP
     );
 
     %invoke = (
-	headers => [ qw("gegl/gimpdesaturateconfig.h") ],
+	headers => [ qw("operations/gimpdesaturateconfig.h") ],
 	code => <<'CODE'
 {
   if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL, TRUE, error) &&
@@ -417,7 +417,7 @@ HELP
     );
 
     %invoke = (
-	headers => [ qw("gegl/gimpcurvesconfig.h") ],
+	headers => [ qw("operations/gimpcurvesconfig.h") ],
 	code => <<'CODE'
 {
   if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL, TRUE, error) &&
@@ -471,7 +471,7 @@ HELP
     );
 
     %invoke = (
-	headers => [ qw("gegl/gimpcurvesconfig.h") ],
+	headers => [ qw("operations/gimpcurvesconfig.h") ],
 	code => <<'CODE'
 {
   if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL, TRUE, error) &&
@@ -530,7 +530,7 @@ HELP
     );
 
     %invoke = (
-	headers => [ qw("gegl/gimpcolorbalanceconfig.h") ],
+	headers => [ qw("operations/gimpcolorbalanceconfig.h") ],
 	code => <<'CODE'
 {
   if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL, TRUE, error)  &&
@@ -582,7 +582,7 @@ HELP
     );
 
     %invoke = (
-	headers => [ qw("gegl/gimpcolorizeconfig.h") ],
+	headers => [ qw("operations/gimpcolorizeconfig.h") ],
 	code => <<'CODE'
 {
   if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL, TRUE, error) &&
@@ -720,7 +720,7 @@ HELP
     );
 
     %invoke = (
-	headers => [ qw("gegl/gimphuesaturationconfig.h") ],
+	headers => [ qw("operations/gimphuesaturationconfig.h") ],
 	code => <<'CODE'
 {
   if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL, TRUE, error) &&
@@ -771,7 +771,7 @@ HELP
     );
 
     %invoke = (
-	headers => [ qw("gegl/gimpthresholdconfig.h") ],
+	headers => [ qw("operations/gimpthresholdconfig.h") ],
 	code => <<'CODE'
 {
   if (gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL, TRUE, error) &&