diff --git a/app/gegl/gimp-gegl-types.h b/app/gegl/gimp-gegl-types.h
index dc6e708cae..c9316207c8 100644
--- a/app/gegl/gimp-gegl-types.h
+++ b/app/gegl/gimp-gegl-types.h
@@ -27,55 +27,8 @@
 
 /*  operations  */
 
-typedef struct _GimpOperationBorder             GimpOperationBorder;
-typedef struct _GimpOperationCageCoefCalc       GimpOperationCageCoefCalc;
-typedef struct _GimpOperationCageTransform      GimpOperationCageTransform;
-typedef struct _GimpOperationEqualize           GimpOperationEqualize;
-typedef struct _GimpOperationGrow               GimpOperationGrow;
-typedef struct _GimpOperationHistogramSink      GimpOperationHistogramSink;
-typedef struct _GimpOperationMaskComponents     GimpOperationMaskComponents;
-typedef struct _GimpOperationSetAlpha           GimpOperationSetAlpha;
-typedef struct _GimpOperationShapeburst         GimpOperationShapeburst;
-typedef struct _GimpOperationShrink             GimpOperationShrink;
-
 typedef struct _GimpOperationPointFilter        GimpOperationPointFilter;
-typedef struct _GimpOperationBrightnessContrast GimpOperationBrightnessContrast;
-typedef struct _GimpOperationColorBalance       GimpOperationColorBalance;
-typedef struct _GimpOperationColorize           GimpOperationColorize;
-typedef struct _GimpOperationCurves             GimpOperationCurves;
-typedef struct _GimpOperationDesaturate         GimpOperationDesaturate;
-typedef struct _GimpOperationHueSaturation      GimpOperationHueSaturation;
-typedef struct _GimpOperationLevels             GimpOperationLevels;
-typedef struct _GimpOperationPosterize          GimpOperationPosterize;
-typedef struct _GimpOperationThreshold          GimpOperationThreshold;
-
 typedef struct _GimpOperationPointLayerMode     GimpOperationPointLayerMode;
-typedef struct _GimpOperationNormalMode         GimpOperationNormalMode;
-typedef struct _GimpOperationDissolveMode       GimpOperationDissolveMode;
-typedef struct _GimpOperationBehindMode         GimpOperationBehindMode;
-typedef struct _GimpOperationMultiplyMode       GimpOperationMultiplyMode;
-typedef struct _GimpOperationScreenMode         GimpOperationScreenMode;
-typedef struct _GimpOperationOverlayMode        GimpOperationOverlayMode;
-typedef struct _GimpOperationDifferenceMode     GimpOperationDifferenceMode;
-typedef struct _GimpOperationAdditionMode       GimpOperationAdditionMode;
-typedef struct _GimpOperationSubtractMode       GimpOperationSubtractMode;
-typedef struct _GimpOperationDarkenOnlyMode     GimpOperationDarkenOnlyMode;
-typedef struct _GimpOperationLightenOnlyMode    GimpOperationLightenOnlyMode;
-typedef struct _GimpOperationHueMode            GimpOperationHueMode;
-typedef struct _GimpOperationSaturationMode     GimpOperationSaturationMode;
-typedef struct _GimpOperationColorMode          GimpOperationColorMode;
-typedef struct _GimpOperationValueMode          GimpOperationValueMode;
-typedef struct _GimpOperationDivideMode         GimpOperationDivideMode;
-typedef struct _GimpOperationDodgeMode          GimpOperationDodgeMode;
-typedef struct _GimpOperationBurnMode           GimpOperationBurnMode;
-typedef struct _GimpOperationHardlightMode      GimpOperationHardlightMode;
-typedef struct _GimpOperationSoftlightMode      GimpOperationSoftlightMode;
-typedef struct _GimpOperationGrainExtractMode   GimpOperationGrainExtractMode;
-typedef struct _GimpOperationGrainMergeMode     GimpOperationGrainMergeMode;
-typedef struct _GimpOperationColorEraseMode     GimpOperationColorEraseMode;
-typedef struct _GimpOperationEraseMode          GimpOperationEraseMode;
-typedef struct _GimpOperationReplaceMode        GimpOperationReplaceMode;
-typedef struct _GimpOperationAntiEraseMode      GimpOperationAntiEraseMode;
 
 
 /*  operation config objects  */
diff --git a/app/gegl/gimpoperationadditionmode.h b/app/gegl/gimpoperationadditionmode.h
index 34b8dbb040..c1c32086c6 100644
--- a/app/gegl/gimpoperationadditionmode.h
+++ b/app/gegl/gimpoperationadditionmode.h
@@ -34,6 +34,7 @@
 #define GIMP_OPERATION_ADDITION_MODE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  GIMP_TYPE_OPERATION_ADDITION_MODE, GimpOperationAdditionModeClass))
 
 
+typedef struct _GimpOperationAdditionMode      GimpOperationAdditionMode;
 typedef struct _GimpOperationAdditionModeClass GimpOperationAdditionModeClass;
 
 struct _GimpOperationAdditionMode
diff --git a/app/gegl/gimpoperationantierasemode.h b/app/gegl/gimpoperationantierasemode.h
index fafdff7819..fe5022cba9 100644
--- a/app/gegl/gimpoperationantierasemode.h
+++ b/app/gegl/gimpoperationantierasemode.h
@@ -1,7 +1,7 @@
 /* GIMP - The GNU Image Manipulation Program
  * Copyright (C) 1995 Spencer Kimball and Peter Mattis
  *
- * gimpoperationanti_erasemode.h
+ * gimpoperationantierasemode.h
  * Copyright (C) 2008 Michael Natterer <mitch@gimp.org>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -34,6 +34,7 @@
 #define GIMP_OPERATION_ANTI_ERASE_MODE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  GIMP_TYPE_OPERATION_ANTI_ERASE_MODE, GimpOperationAntiEraseModeClass))
 
 
+typedef struct _GimpOperationAntiEraseMode      GimpOperationAntiEraseMode;
 typedef struct _GimpOperationAntiEraseModeClass GimpOperationAntiEraseModeClass;
 
 struct _GimpOperationAntiEraseMode
diff --git a/app/gegl/gimpoperationbehindmode.h b/app/gegl/gimpoperationbehindmode.h
index a039bb8901..87dc380938 100644
--- a/app/gegl/gimpoperationbehindmode.h
+++ b/app/gegl/gimpoperationbehindmode.h
@@ -34,6 +34,7 @@
 #define GIMP_OPERATION_BEHIND_MODE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  GIMP_TYPE_OPERATION_BEHIND_MODE, GimpOperationBehindModeClass))
 
 
+typedef struct _GimpOperationBehindMode      GimpOperationBehindMode;
 typedef struct _GimpOperationBehindModeClass GimpOperationBehindModeClass;
 
 struct _GimpOperationBehindMode
diff --git a/app/gegl/gimpoperationborder.h b/app/gegl/gimpoperationborder.h
index 72e3b1378a..bfd8d84255 100644
--- a/app/gegl/gimpoperationborder.h
+++ b/app/gegl/gimpoperationborder.h
@@ -33,6 +33,7 @@
 #define GIMP_OPERATION_BORDER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  GIMP_TYPE_OPERATION_BORDER, GimpOperationBorderClass))
 
 
+typedef struct _GimpOperationBorder      GimpOperationBorder;
 typedef struct _GimpOperationBorderClass GimpOperationBorderClass;
 
 struct _GimpOperationBorder
diff --git a/app/gegl/gimpoperationbrightnesscontrast.h b/app/gegl/gimpoperationbrightnesscontrast.h
index bc09c64a37..f441e0f27e 100644
--- a/app/gegl/gimpoperationbrightnesscontrast.h
+++ b/app/gegl/gimpoperationbrightnesscontrast.h
@@ -33,6 +33,7 @@
 #define GIMP_OPERATION_BRIGHTNESS_CONTRAST_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  GIMP_TYPE_OPERATION_BRIGHTNESS_CONTRAST, GimpOperationBrightnessContrastClass))
 
 
+typedef struct _GimpOperationBrightnessContrast      GimpOperationBrightnessContrast;
 typedef struct _GimpOperationBrightnessContrastClass GimpOperationBrightnessContrastClass;
 
 struct _GimpOperationBrightnessContrast
diff --git a/app/gegl/gimpoperationburnmode.h b/app/gegl/gimpoperationburnmode.h
index c9c845aa78..a4cf7fa3dc 100644
--- a/app/gegl/gimpoperationburnmode.h
+++ b/app/gegl/gimpoperationburnmode.h
@@ -34,6 +34,7 @@
 #define GIMP_OPERATION_BURN_MODE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  GIMP_TYPE_OPERATION_BURN_MODE, GimpOperationBurnModeClass))
 
 
+typedef struct _GimpOperationBurnMode      GimpOperationBurnMode;
 typedef struct _GimpOperationBurnModeClass GimpOperationBurnModeClass;
 
 struct _GimpOperationBurnMode
diff --git a/app/gegl/gimpoperationcagecoefcalc.h b/app/gegl/gimpoperationcagecoefcalc.h
index 70f3a8cd0b..5f0ae08b55 100644
--- a/app/gegl/gimpoperationcagecoefcalc.h
+++ b/app/gegl/gimpoperationcagecoefcalc.h
@@ -40,6 +40,7 @@ enum
 #define GIMP_OPERATION_CAGE_COEF_CALC_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  GIMP_TYPE_OPERATION_CAGE_COEF_CALC, GimpOperationCageCoefCalcClass))
 
 
+typedef struct _GimpOperationCageCoefCalc      GimpOperationCageCoefCalc;
 typedef struct _GimpOperationCageCoefCalcClass GimpOperationCageCoefCalcClass;
 
 struct _GimpOperationCageCoefCalc
diff --git a/app/gegl/gimpoperationcagetransform.h b/app/gegl/gimpoperationcagetransform.h
index b844baae17..2b2ac45211 100644
--- a/app/gegl/gimpoperationcagetransform.h
+++ b/app/gegl/gimpoperationcagetransform.h
@@ -33,6 +33,7 @@
 #define GIMP_OPERATION_CAGE_TRANSFORM_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  GIMP_TYPE_OPERATION_CAGE_TRANSFORM, GimpOperationCageTransformClass))
 
 
+typedef struct _GimpOperationCageTransform      GimpOperationCageTransform;
 typedef struct _GimpOperationCageTransformClass GimpOperationCageTransformClass;
 
 struct _GimpOperationCageTransform
diff --git a/app/gegl/gimpoperationcolorbalance.h b/app/gegl/gimpoperationcolorbalance.h
index 577c3ea602..b56ee51831 100644
--- a/app/gegl/gimpoperationcolorbalance.h
+++ b/app/gegl/gimpoperationcolorbalance.h
@@ -33,6 +33,7 @@
 #define GIMP_OPERATION_COLOR_BALANCE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  GIMP_TYPE_OPERATION_COLOR_BALANCE, GimpOperationColorBalanceClass))
 
 
+typedef struct _GimpOperationColorBalance      GimpOperationColorBalance;
 typedef struct _GimpOperationColorBalanceClass GimpOperationColorBalanceClass;
 
 struct _GimpOperationColorBalance
diff --git a/app/gegl/gimpoperationcolorerasemode.h b/app/gegl/gimpoperationcolorerasemode.h
index 887eca36ea..5c16dc2d1f 100644
--- a/app/gegl/gimpoperationcolorerasemode.h
+++ b/app/gegl/gimpoperationcolorerasemode.h
@@ -34,6 +34,7 @@
 #define GIMP_OPERATION_COLOR_ERASE_MODE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  GIMP_TYPE_OPERATION_COLOR_ERASE_MODE, GimpOperationColorEraseModeClass))
 
 
+typedef struct _GimpOperationColorEraseMode      GimpOperationColorEraseMode;
 typedef struct _GimpOperationColorEraseModeClass GimpOperationColorEraseModeClass;
 
 struct _GimpOperationColorEraseMode
diff --git a/app/gegl/gimpoperationcolorize.h b/app/gegl/gimpoperationcolorize.h
index ee83ae9f64..1ad3c57a14 100644
--- a/app/gegl/gimpoperationcolorize.h
+++ b/app/gegl/gimpoperationcolorize.h
@@ -33,6 +33,7 @@
 #define GIMP_OPERATION_COLORIZE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  GIMP_TYPE_OPERATION_COLORIZE, GimpOperationColorizeClass))
 
 
+typedef struct _GimpOperationColorize      GimpOperationColorize;
 typedef struct _GimpOperationColorizeClass GimpOperationColorizeClass;
 
 struct _GimpOperationColorize
diff --git a/app/gegl/gimpoperationcolormode.h b/app/gegl/gimpoperationcolormode.h
index 4c29c2aab9..2ee7d8c160 100644
--- a/app/gegl/gimpoperationcolormode.h
+++ b/app/gegl/gimpoperationcolormode.h
@@ -34,6 +34,7 @@
 #define GIMP_OPERATION_COLOR_MODE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  GIMP_TYPE_OPERATION_COLOR_MODE, GimpOperationColorModeClass))
 
 
+typedef struct _GimpOperationColorMode      GimpOperationColorMode;
 typedef struct _GimpOperationColorModeClass GimpOperationColorModeClass;
 
 struct _GimpOperationColorMode
diff --git a/app/gegl/gimpoperationcurves.h b/app/gegl/gimpoperationcurves.h
index 110df3594a..20eb848ca3 100644
--- a/app/gegl/gimpoperationcurves.h
+++ b/app/gegl/gimpoperationcurves.h
@@ -33,6 +33,7 @@
 #define GIMP_OPERATION_CURVES_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  GIMP_TYPE_OPERATION_CURVES, GimpOperationCurvesClass))
 
 
+typedef struct _GimpOperationCurves      GimpOperationCurves;
 typedef struct _GimpOperationCurvesClass GimpOperationCurvesClass;
 
 struct _GimpOperationCurves
diff --git a/app/gegl/gimpoperationdarkenonlymode.h b/app/gegl/gimpoperationdarkenonlymode.h
index 54a982c261..37c08c2ca2 100644
--- a/app/gegl/gimpoperationdarkenonlymode.h
+++ b/app/gegl/gimpoperationdarkenonlymode.h
@@ -34,6 +34,7 @@
 #define GIMP_OPERATION_DARKEN_ONLY_MODE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  GIMP_TYPE_OPERATION_DARKEN_ONLY_MODE, GimpOperationDarkenOnlyModeClass))
 
 
+typedef struct _GimpOperationDarkenOnlyMode      GimpOperationDarkenOnlyMode;
 typedef struct _GimpOperationDarkenOnlyModeClass GimpOperationDarkenOnlyModeClass;
 
 struct _GimpOperationDarkenOnlyMode
diff --git a/app/gegl/gimpoperationdesaturate.h b/app/gegl/gimpoperationdesaturate.h
index 3d7dbf641c..fb4507cd95 100644
--- a/app/gegl/gimpoperationdesaturate.h
+++ b/app/gegl/gimpoperationdesaturate.h
@@ -33,6 +33,7 @@
 #define GIMP_OPERATION_DESATURATE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  GIMP_TYPE_OPERATION_DESATURATE, GimpOperationDesaturateClass))
 
 
+typedef struct _GimpOperationDesaturate      GimpOperationDesaturate;
 typedef struct _GimpOperationDesaturateClass GimpOperationDesaturateClass;
 
 struct _GimpOperationDesaturate
diff --git a/app/gegl/gimpoperationdifferencemode.h b/app/gegl/gimpoperationdifferencemode.h
index f6af20d897..9ff0f99c65 100644
--- a/app/gegl/gimpoperationdifferencemode.h
+++ b/app/gegl/gimpoperationdifferencemode.h
@@ -34,6 +34,7 @@
 #define GIMP_OPERATION_DIFFERENCE_MODE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  GIMP_TYPE_OPERATION_DIFFERENCE_MODE, GimpOperationDifferenceModeClass))
 
 
+typedef struct _GimpOperationDifferenceMode      GimpOperationDifferenceMode;
 typedef struct _GimpOperationDifferenceModeClass GimpOperationDifferenceModeClass;
 
 struct _GimpOperationDifferenceMode
diff --git a/app/gegl/gimpoperationdissolvemode.h b/app/gegl/gimpoperationdissolvemode.h
index ad9dbf5c27..c14cf71835 100644
--- a/app/gegl/gimpoperationdissolvemode.h
+++ b/app/gegl/gimpoperationdissolvemode.h
@@ -22,6 +22,10 @@
 #ifndef __GIMP_OPERATION_DISSOLVE_MODE_H__
 #define __GIMP_OPERATION_DISSOLVE_MODE_H__
 
+
+#include "gimpoperationpointlayermode.h"
+
+
 #define GIMP_TYPE_OPERATION_DISSOLVE_MODE            (gimp_operation_dissolve_mode_get_type ())
 #define GIMP_OPERATION_DISSOLVE_MODE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_OPERATION_DISSOLVE_MODE, GimpOperationDissolveMode))
 #define GIMP_OPERATION_DISSOLVE_MODE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  GIMP_TYPE_OPERATION_DISSOLVE_MODE, GimpOperationDissolveModeClass))
@@ -29,8 +33,8 @@
 #define GIMP_IS_OPERATION_DISSOLVE_MODE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  GIMP_TYPE_OPERATION_DISSOLVE_MODE))
 #define GIMP_OPERATION_DISSOLVE_MODE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  GIMP_TYPE_OPERATION_DISSOLVE_MODE, GimpOperationDissolveModeClass))
 
-#include "gimpoperationpointlayermode.h"
 
+typedef struct _GimpOperationDissolveMode      GimpOperationDissolveMode;
 typedef struct _GimpOperationDissolveModeClass GimpOperationDissolveModeClass;
 
 struct _GimpOperationDissolveModeClass
diff --git a/app/gegl/gimpoperationdividemode.h b/app/gegl/gimpoperationdividemode.h
index f1c23fd4c6..b752c55aca 100644
--- a/app/gegl/gimpoperationdividemode.h
+++ b/app/gegl/gimpoperationdividemode.h
@@ -34,6 +34,7 @@
 #define GIMP_OPERATION_DIVIDE_MODE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  GIMP_TYPE_OPERATION_DIVIDE_MODE, GimpOperationDivideModeClass))
 
 
+typedef struct _GimpOperationDivideMode      GimpOperationDivideMode;
 typedef struct _GimpOperationDivideModeClass GimpOperationDivideModeClass;
 
 struct _GimpOperationDivideMode
diff --git a/app/gegl/gimpoperationdodgemode.h b/app/gegl/gimpoperationdodgemode.h
index 0ffa35ffe2..1f2802ef16 100644
--- a/app/gegl/gimpoperationdodgemode.h
+++ b/app/gegl/gimpoperationdodgemode.h
@@ -34,6 +34,7 @@
 #define GIMP_OPERATION_DODGE_MODE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  GIMP_TYPE_OPERATION_DODGE_MODE, GimpOperationDodgeModeClass))
 
 
+typedef struct _GimpOperationDodgeMode      GimpOperationDodgeMode;
 typedef struct _GimpOperationDodgeModeClass GimpOperationDodgeModeClass;
 
 struct _GimpOperationDodgeMode
diff --git a/app/gegl/gimpoperationequalize.h b/app/gegl/gimpoperationequalize.h
index 38d120b097..30348a812e 100644
--- a/app/gegl/gimpoperationequalize.h
+++ b/app/gegl/gimpoperationequalize.h
@@ -33,6 +33,7 @@
 #define GIMP_OPERATION_EQUALIZE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  GIMP_TYPE_OPERATION_EQUALIZE, GimpOperationEqualizeClass))
 
 
+typedef struct _GimpOperationEqualize      GimpOperationEqualize;
 typedef struct _GimpOperationEqualizeClass GimpOperationEqualizeClass;
 
 struct _GimpOperationEqualize
diff --git a/app/gegl/gimpoperationerasemode.h b/app/gegl/gimpoperationerasemode.h
index a851acea35..aa0bd83f0c 100644
--- a/app/gegl/gimpoperationerasemode.h
+++ b/app/gegl/gimpoperationerasemode.h
@@ -34,6 +34,7 @@
 #define GIMP_OPERATION_ERASE_MODE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  GIMP_TYPE_OPERATION_ERASE_MODE, GimpOperationEraseModeClass))
 
 
+typedef struct _GimpOperationEraseMode      GimpOperationEraseMode;
 typedef struct _GimpOperationEraseModeClass GimpOperationEraseModeClass;
 
 struct _GimpOperationEraseMode
diff --git a/app/gegl/gimpoperationgrainextractmode.h b/app/gegl/gimpoperationgrainextractmode.h
index 5ad1fea201..c868e1b9e0 100644
--- a/app/gegl/gimpoperationgrainextractmode.h
+++ b/app/gegl/gimpoperationgrainextractmode.h
@@ -34,6 +34,7 @@
 #define GIMP_OPERATION_GRAIN_EXTRACT_MODE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  GIMP_TYPE_OPERATION_GRAIN_EXTRACT_MODE, GimpOperationGrainExtractModeClass))
 
 
+typedef struct _GimpOperationGrainExtractMode      GimpOperationGrainExtractMode;
 typedef struct _GimpOperationGrainExtractModeClass GimpOperationGrainExtractModeClass;
 
 struct _GimpOperationGrainExtractMode
diff --git a/app/gegl/gimpoperationgrainmergemode.h b/app/gegl/gimpoperationgrainmergemode.h
index e77c72cd4d..faad7270c9 100644
--- a/app/gegl/gimpoperationgrainmergemode.h
+++ b/app/gegl/gimpoperationgrainmergemode.h
@@ -34,6 +34,7 @@
 #define GIMP_OPERATION_GRAIN_MERGE_MODE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  GIMP_TYPE_OPERATION_GRAIN_MERGE_MODE, GimpOperationGrainMergeModeClass))
 
 
+typedef struct _GimpOperationGrainMergeMode      GimpOperationGrainMergeMode;
 typedef struct _GimpOperationGrainMergeModeClass GimpOperationGrainMergeModeClass;
 
 struct _GimpOperationGrainMergeMode
diff --git a/app/gegl/gimpoperationgrow.h b/app/gegl/gimpoperationgrow.h
index a1dca077ff..7ff273a613 100644
--- a/app/gegl/gimpoperationgrow.h
+++ b/app/gegl/gimpoperationgrow.h
@@ -33,6 +33,7 @@
 #define GIMP_OPERATION_GROW_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  GIMP_TYPE_OPERATION_GROW, GimpOperationGrowClass))
 
 
+typedef struct _GimpOperationGrow      GimpOperationGrow;
 typedef struct _GimpOperationGrowClass GimpOperationGrowClass;
 
 struct _GimpOperationGrow
diff --git a/app/gegl/gimpoperationhardlightmode.h b/app/gegl/gimpoperationhardlightmode.h
index ca09c108f3..36757844cf 100644
--- a/app/gegl/gimpoperationhardlightmode.h
+++ b/app/gegl/gimpoperationhardlightmode.h
@@ -34,6 +34,7 @@
 #define GIMP_OPERATION_HARDLIGHT_MODE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  GIMP_TYPE_OPERATION_HARDLIGHT_MODE, GimpOperationHardlightModeClass))
 
 
+typedef struct _GimpOperationHardlightMode      GimpOperationHardlightMode;
 typedef struct _GimpOperationHardlightModeClass GimpOperationHardlightModeClass;
 
 struct _GimpOperationHardlightMode
diff --git a/app/gegl/gimpoperationhistogramsink.h b/app/gegl/gimpoperationhistogramsink.h
index 4d0a5ffe3f..afc0eda756 100644
--- a/app/gegl/gimpoperationhistogramsink.h
+++ b/app/gegl/gimpoperationhistogramsink.h
@@ -34,6 +34,7 @@
 #define GIMP_OPERATION_HISTOGRAM_SINK_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  GIMP_TYPE_OPERATION_HISTOGRAM_SINK, GimpOperationHistogramSinkClass))
 
 
+typedef struct _GimpOperationHistogramSink      GimpOperationHistogramSink;
 typedef struct _GimpOperationHistogramSinkClass GimpOperationHistogramSinkClass;
 
 struct _GimpOperationHistogramSink
diff --git a/app/gegl/gimpoperationhuemode.h b/app/gegl/gimpoperationhuemode.h
index d775aa6f7e..7381f88516 100644
--- a/app/gegl/gimpoperationhuemode.h
+++ b/app/gegl/gimpoperationhuemode.h
@@ -34,6 +34,7 @@
 #define GIMP_OPERATION_HUE_MODE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  GIMP_TYPE_OPERATION_HUE_MODE, GimpOperationHueModeClass))
 
 
+typedef struct _GimpOperationHueMode      GimpOperationHueMode;
 typedef struct _GimpOperationHueModeClass GimpOperationHueModeClass;
 
 struct _GimpOperationHueMode
diff --git a/app/gegl/gimpoperationhuesaturation.h b/app/gegl/gimpoperationhuesaturation.h
index f2dd3dda78..b9021541ef 100644
--- a/app/gegl/gimpoperationhuesaturation.h
+++ b/app/gegl/gimpoperationhuesaturation.h
@@ -33,6 +33,7 @@
 #define GIMP_OPERATION_HUE_SATURATION_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  GIMP_TYPE_OPERATION_HUE_SATURATION, GimpOperationHueSaturationClass))
 
 
+typedef struct _GimpOperationHueSaturation      GimpOperationHueSaturation;
 typedef struct _GimpOperationHueSaturationClass GimpOperationHueSaturationClass;
 
 struct _GimpOperationHueSaturation
diff --git a/app/gegl/gimpoperationlevels.h b/app/gegl/gimpoperationlevels.h
index 1f1a64b297..215b2198ea 100644
--- a/app/gegl/gimpoperationlevels.h
+++ b/app/gegl/gimpoperationlevels.h
@@ -33,6 +33,7 @@
 #define GIMP_OPERATION_LEVELS_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  GIMP_TYPE_OPERATION_LEVELS, GimpOperationLevelsClass))
 
 
+typedef struct _GimpOperationLevels      GimpOperationLevels;
 typedef struct _GimpOperationLevelsClass GimpOperationLevelsClass;
 
 struct _GimpOperationLevels
diff --git a/app/gegl/gimpoperationlightenonlymode.h b/app/gegl/gimpoperationlightenonlymode.h
index 4bbb99086f..17c108cabd 100644
--- a/app/gegl/gimpoperationlightenonlymode.h
+++ b/app/gegl/gimpoperationlightenonlymode.h
@@ -34,6 +34,7 @@
 #define GIMP_OPERATION_LIGHTEN_ONLY_MODE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  GIMP_TYPE_OPERATION_LIGHTEN_ONLY_MODE, GimpOperationLightenOnlyModeClass))
 
 
+typedef struct _GimpOperationLightenOnlyMode      GimpOperationLightenOnlyMode;
 typedef struct _GimpOperationLightenOnlyModeClass GimpOperationLightenOnlyModeClass;
 
 struct _GimpOperationLightenOnlyMode
diff --git a/app/gegl/gimpoperationmaskcomponents.h b/app/gegl/gimpoperationmaskcomponents.h
index e0d1bc690a..89cc1b678e 100644
--- a/app/gegl/gimpoperationmaskcomponents.h
+++ b/app/gegl/gimpoperationmaskcomponents.h
@@ -32,6 +32,7 @@
 #define GIMP_OPERATION_MASK_COMPONENTS_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  GIMP_TYPE_OPERATION_MASK_COMPONENTS, GimpOperationMaskComponentsClass))
 
 
+typedef struct _GimpOperationMaskComponents      GimpOperationMaskComponents;
 typedef struct _GimpOperationMaskComponentsClass GimpOperationMaskComponentsClass;
 
 struct _GimpOperationMaskComponents
diff --git a/app/gegl/gimpoperationmultiplymode.h b/app/gegl/gimpoperationmultiplymode.h
index 0901ac8a31..478b84d204 100644
--- a/app/gegl/gimpoperationmultiplymode.h
+++ b/app/gegl/gimpoperationmultiplymode.h
@@ -34,6 +34,7 @@
 #define GIMP_OPERATION_MULTIPLY_MODE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  GIMP_TYPE_OPERATION_MULTIPLY_MODE, GimpOperationMultiplyModeClass))
 
 
+typedef struct _GimpOperationMultiplyMode      GimpOperationMultiplyMode;
 typedef struct _GimpOperationMultiplyModeClass GimpOperationMultiplyModeClass;
 
 struct _GimpOperationMultiplyMode
diff --git a/app/gegl/gimpoperationnormalmode.h b/app/gegl/gimpoperationnormalmode.h
index b5eadda4c0..b508e20e41 100644
--- a/app/gegl/gimpoperationnormalmode.h
+++ b/app/gegl/gimpoperationnormalmode.h
@@ -34,6 +34,7 @@
 #define GIMP_OPERATION_NORMAL_MODE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  GIMP_TYPE_OPERATION_NORMAL_MODE, GimpOperationNormalModeClass))
 
 
+typedef struct _GimpOperationNormalMode      GimpOperationNormalMode;
 typedef struct _GimpOperationNormalModeClass GimpOperationNormalModeClass;
 
 struct _GimpOperationNormalMode
diff --git a/app/gegl/gimpoperationoverlaymode.h b/app/gegl/gimpoperationoverlaymode.h
index 831e6c141d..ad10448566 100644
--- a/app/gegl/gimpoperationoverlaymode.h
+++ b/app/gegl/gimpoperationoverlaymode.h
@@ -34,6 +34,7 @@
 #define GIMP_OPERATION_OVERLAY_MODE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  GIMP_TYPE_OPERATION_OVERLAY_MODE, GimpOperationOverlayModeClass))
 
 
+typedef struct _GimpOperationOverlayMode      GimpOperationOverlayMode;
 typedef struct _GimpOperationOverlayModeClass GimpOperationOverlayModeClass;
 
 struct _GimpOperationOverlayMode
diff --git a/app/gegl/gimpoperationposterize.h b/app/gegl/gimpoperationposterize.h
index 6cd0e823e2..b023a9d9de 100644
--- a/app/gegl/gimpoperationposterize.h
+++ b/app/gegl/gimpoperationposterize.h
@@ -33,6 +33,7 @@
 #define GIMP_OPERATION_POSTERIZE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  GIMP_TYPE_OPERATION_POSTERIZE, GimpOperationPosterizeClass))
 
 
+typedef struct _GimpOperationPosterize      GimpOperationPosterize;
 typedef struct _GimpOperationPosterizeClass GimpOperationPosterizeClass;
 
 struct _GimpOperationPosterize
diff --git a/app/gegl/gimpoperationreplacemode.h b/app/gegl/gimpoperationreplacemode.h
index 25baedf0ed..3d09c34591 100644
--- a/app/gegl/gimpoperationreplacemode.h
+++ b/app/gegl/gimpoperationreplacemode.h
@@ -31,6 +31,7 @@
 #define GIMP_OPERATION_REPLACE_MODE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  GIMP_TYPE_OPERATION_REPLACE_MODE, GimpOperationReplaceModeClass))
 
 
+typedef struct _GimpOperationReplaceMode      GimpOperationReplaceMode;
 typedef struct _GimpOperationReplaceModeClass GimpOperationReplaceModeClass;
 
 struct _GimpOperationReplaceMode
diff --git a/app/gegl/gimpoperationsaturationmode.h b/app/gegl/gimpoperationsaturationmode.h
index cd28664382..acba0d0736 100644
--- a/app/gegl/gimpoperationsaturationmode.h
+++ b/app/gegl/gimpoperationsaturationmode.h
@@ -34,6 +34,7 @@
 #define GIMP_OPERATION_SATURATION_MODE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  GIMP_TYPE_OPERATION_SATURATION_MODE, GimpOperationSaturationModeClass))
 
 
+typedef struct _GimpOperationSaturationMode      GimpOperationSaturationMode;
 typedef struct _GimpOperationSaturationModeClass GimpOperationSaturationModeClass;
 
 struct _GimpOperationSaturationMode
diff --git a/app/gegl/gimpoperationscreenmode.h b/app/gegl/gimpoperationscreenmode.h
index 6b918bf5c6..7708a0cb94 100644
--- a/app/gegl/gimpoperationscreenmode.h
+++ b/app/gegl/gimpoperationscreenmode.h
@@ -34,6 +34,7 @@
 #define GIMP_OPERATION_SCREEN_MODE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  GIMP_TYPE_OPERATION_SCREEN_MODE, GimpOperationScreenModeClass))
 
 
+typedef struct _GimpOperationScreenMode      GimpOperationScreenMode;
 typedef struct _GimpOperationScreenModeClass GimpOperationScreenModeClass;
 
 struct _GimpOperationScreenMode
diff --git a/app/gegl/gimpoperationsetalpha.h b/app/gegl/gimpoperationsetalpha.h
index 53f6538ece..c56f85bf56 100644
--- a/app/gegl/gimpoperationsetalpha.h
+++ b/app/gegl/gimpoperationsetalpha.h
@@ -34,6 +34,7 @@
 #define GIMP_OPERATION_SET_ALPHA_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  GIMP_TYPE_OPERATION_SET_ALPHA, GimpOperationSetAlphaClass))
 
 
+typedef struct _GimpOperationSetAlpha      GimpOperationSetAlpha;
 typedef struct _GimpOperationSetAlphaClass GimpOperationSetAlphaClass;
 
 struct _GimpOperationSetAlpha
diff --git a/app/gegl/gimpoperationshapeburst.h b/app/gegl/gimpoperationshapeburst.h
index f5cef9d2e4..362b15951d 100644
--- a/app/gegl/gimpoperationshapeburst.h
+++ b/app/gegl/gimpoperationshapeburst.h
@@ -33,6 +33,7 @@
 #define GIMP_OPERATION_SHAPEBURST_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  GIMP_TYPE_OPERATION_SHAPEBURST, GimpOperationShapeburstClass))
 
 
+typedef struct _GimpOperationShapeburst      GimpOperationShapeburst;
 typedef struct _GimpOperationShapeburstClass GimpOperationShapeburstClass;
 
 struct _GimpOperationShapeburst
diff --git a/app/gegl/gimpoperationshrink.h b/app/gegl/gimpoperationshrink.h
index b7ccfac0ca..efa3ef9ea5 100644
--- a/app/gegl/gimpoperationshrink.h
+++ b/app/gegl/gimpoperationshrink.h
@@ -33,6 +33,7 @@
 #define GIMP_OPERATION_SHRINK_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  GIMP_TYPE_OPERATION_SHRINK, GimpOperationShrinkClass))
 
 
+typedef struct _GimpOperationShrink      GimpOperationShrink;
 typedef struct _GimpOperationShrinkClass GimpOperationShrinkClass;
 
 struct _GimpOperationShrink
diff --git a/app/gegl/gimpoperationsoftlightmode.h b/app/gegl/gimpoperationsoftlightmode.h
index 4e409f63a8..2cf6f23172 100644
--- a/app/gegl/gimpoperationsoftlightmode.h
+++ b/app/gegl/gimpoperationsoftlightmode.h
@@ -34,6 +34,7 @@
 #define GIMP_OPERATION_SOFTLIGHT_MODE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  GIMP_TYPE_OPERATION_SOFTLIGHT_MODE, GimpOperationSoftlightModeClass))
 
 
+typedef struct _GimpOperationSoftlightMode      GimpOperationSoftlightMode;
 typedef struct _GimpOperationSoftlightModeClass GimpOperationSoftlightModeClass;
 
 struct _GimpOperationSoftlightMode
diff --git a/app/gegl/gimpoperationsubtractmode.h b/app/gegl/gimpoperationsubtractmode.h
index 42d38ad099..25648b9325 100644
--- a/app/gegl/gimpoperationsubtractmode.h
+++ b/app/gegl/gimpoperationsubtractmode.h
@@ -34,6 +34,7 @@
 #define GIMP_OPERATION_SUBTRACT_MODE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  GIMP_TYPE_OPERATION_SUBTRACT_MODE, GimpOperationSubtractModeClass))
 
 
+typedef struct _GimpOperationSubtractMode      GimpOperationSubtractMode;
 typedef struct _GimpOperationSubtractModeClass GimpOperationSubtractModeClass;
 
 struct _GimpOperationSubtractMode
diff --git a/app/gegl/gimpoperationthreshold.h b/app/gegl/gimpoperationthreshold.h
index 0e14c3fea2..877c0f89a1 100644
--- a/app/gegl/gimpoperationthreshold.h
+++ b/app/gegl/gimpoperationthreshold.h
@@ -33,6 +33,7 @@
 #define GIMP_OPERATION_THRESHOLD_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  GIMP_TYPE_OPERATION_THRESHOLD, GimpOperationThresholdClass))
 
 
+typedef struct _GimpOperationThreshold      GimpOperationThreshold;
 typedef struct _GimpOperationThresholdClass GimpOperationThresholdClass;
 
 struct _GimpOperationThreshold
diff --git a/app/gegl/gimpoperationvaluemode.h b/app/gegl/gimpoperationvaluemode.h
index c81ae8775b..1fee802992 100644
--- a/app/gegl/gimpoperationvaluemode.h
+++ b/app/gegl/gimpoperationvaluemode.h
@@ -34,6 +34,7 @@
 #define GIMP_OPERATION_VALUE_MODE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  GIMP_TYPE_OPERATION_VALUE_MODE, GimpOperationValueModeClass))
 
 
+typedef struct _GimpOperationValueMode      GimpOperationValueMode;
 typedef struct _GimpOperationValueModeClass GimpOperationValueModeClass;
 
 struct _GimpOperationValueMode