diff --git a/ChangeLog b/ChangeLog
index 3b1dcd8ba3..1d193ae095 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2004-07-19  Michael Natterer  <mitch@gimp.org>
+
+	* app/config/config-types.h: removed GimpConfigInterface typedef,
+	added comments to typedefs which don't belong here.
+
+	* app/config/gimpconfig.h: added GimpConfigInterface typedef.
+
+	* app/core/core-types.h
+	* app/display/display-types.h: added commented out typedefs for
+	types that live in config-types.h for obscure reasons.
+
+	* app/core/core-types.h: reordered stuff to match the order in the
+	API docs (makes keeping stuff in sync much easier).
+
 2004-07-17  Shlomi Fish  <shlomif@iglu.org.il>
 
 	* plug-ins/gimpressionist/repaint.c: replaced a few if's+destructors
diff --git a/app/config/config-types.h b/app/config/config-types.h
index e719bd0dd1..2204f51a44 100644
--- a/app/config/config-types.h
+++ b/app/config/config-types.h
@@ -24,7 +24,6 @@
 
 
 typedef struct _GimpConfig           GimpConfig; /* dummy typedef */
-typedef struct _GimpConfigInterface  GimpConfigInterface;
 
 typedef struct _GimpBaseConfig       GimpBaseConfig;
 typedef struct _GimpCoreConfig       GimpCoreConfig;
@@ -36,7 +35,10 @@ typedef struct _GimpRc               GimpRc;
 typedef struct _GimpConfigWriter     GimpConfigWriter;
 typedef struct _GimpXmlParser        GimpXmlParser;
 
+/* should be in display/display-types.h */
 typedef struct _GimpDisplayOptions   GimpDisplayOptions;
+
+/* should be in core/core-types.h */
 typedef struct _GimpGrid             GimpGrid;
 typedef struct _GimpTemplate         GimpTemplate;
 
diff --git a/app/config/gimpconfig.h b/app/config/gimpconfig.h
index d0a4212b21..d43526cd5d 100644
--- a/app/config/gimpconfig.h
+++ b/app/config/gimpconfig.h
@@ -29,6 +29,8 @@
 #define GIMP_CONFIG_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), GIMP_TYPE_CONFIG, GimpConfigInterface))
 
 
+typedef struct _GimpConfigInterface GimpConfigInterface;
+
 struct _GimpConfigInterface
 {
   GTypeInterface base_iface;
diff --git a/app/core/core-types.h b/app/core/core-types.h
index 8744dd19ee..0de1a1ff23 100644
--- a/app/core/core-types.h
+++ b/app/core/core-types.h
@@ -47,51 +47,57 @@
 #define GIMP_COORDS_DEFAULT_WHEEL     0.5
 
 
-/*  base objects  */
+/*  base classes  */
 
 typedef struct _GimpObject          GimpObject;
-
-typedef struct _Gimp                Gimp;
-
-typedef struct _GimpContainer       GimpContainer;
-typedef struct _GimpList            GimpList;
-
-typedef struct _GimpContext         GimpContext;
-
 typedef struct _GimpViewable        GimpViewable;
 typedef struct _GimpItem            GimpItem;
 
+typedef struct _Gimp                Gimp;
 typedef struct _GimpImage           GimpImage;
 
 
-/*  item objects  */
+/*  containers  */
 
-typedef struct _GimpDrawable        GimpDrawable;
+typedef struct _GimpContainer       GimpContainer;
+typedef struct _GimpList            GimpList;
+typedef struct _GimpDocumentList    GimpDocumentList;
 
-typedef struct _GimpChannel         GimpChannel;
-typedef struct _GimpSelection       GimpSelection;
 
-typedef struct _GimpLayer           GimpLayer;
-typedef struct _GimpLayerMask       GimpLayerMask;
+/*  context objects  */
+
+typedef struct _GimpContext         GimpContext;
+typedef struct _GimpStrokeOptions   GimpStrokeOptions;
+typedef struct _GimpToolOptions     GimpToolOptions;
+
+
+/*  info objects  */
+
+typedef struct _GimpPaintInfo       GimpPaintInfo;
+typedef struct _GimpToolInfo        GimpToolInfo;
 
 
 /*  data objects  */
 
 typedef struct _GimpDataFactory     GimpDataFactory;
-
 typedef struct _GimpData            GimpData;
-
 typedef struct _GimpBrush	    GimpBrush;
 typedef struct _GimpBrushGenerated  GimpBrushGenerated;
 typedef struct _GimpBrushPipe       GimpBrushPipe;
-
 typedef struct _GimpGradient        GimpGradient;
-
 typedef struct _GimpPattern         GimpPattern;
-
 typedef struct _GimpPalette         GimpPalette;
 
 
+/*  drawable objects  */
+
+typedef struct _GimpDrawable        GimpDrawable;
+typedef struct _GimpChannel         GimpChannel;
+typedef struct _GimpSelection       GimpSelection;
+typedef struct _GimpLayer           GimpLayer;
+typedef struct _GimpLayerMask       GimpLayerMask;
+
+
 /*  undo objects  */
 
 typedef struct _GimpUndo            GimpUndo;
@@ -100,24 +106,16 @@ typedef struct _GimpUndoStack       GimpUndoStack;
 typedef struct _GimpUndoAccumulator GimpUndoAccumulator;
 
 
-/*  info & option objects  */
-
-typedef struct _GimpPaintInfo       GimpPaintInfo;
-typedef struct _GimpToolInfo        GimpToolInfo;
-
-typedef struct _GimpStrokeOptions   GimpStrokeOptions;
-typedef struct _GimpToolOptions     GimpToolOptions;
-
-
 /*  misc objects  */
 
 typedef struct _GimpBuffer          GimpBuffer;
+typedef struct _GimpEnvironTable    GimpEnvironTable;
+/* typedef struct _GimpGrid         GimpGrid; in config-types.h */
 typedef struct _GimpImagefile       GimpImagefile;
 typedef struct _GimpImageMap        GimpImageMap;
-typedef struct _GimpDocumentList    GimpDocumentList;
-typedef struct _GimpEnvironTable    GimpEnvironTable;
 typedef struct _GimpParasiteList    GimpParasiteList;
 typedef struct _GimpProjection      GimpProjection;
+/* typedef struct _GimpTemplate     GimpTemplate; in config-types.h */
 
 
 /*  interfaces  */
diff --git a/app/display/display-types.h b/app/display/display-types.h
index 3c9aecf389..01fc3fd131 100644
--- a/app/display/display-types.h
+++ b/app/display/display-types.h
@@ -25,16 +25,17 @@
 #include "display/display-enums.h"
 
 
-typedef struct _GimpCanvas         GimpCanvas;
+typedef struct _GimpCanvas            GimpCanvas;
 
-typedef struct _GimpDisplay        GimpDisplay;
-typedef struct _GimpDisplayShell   GimpDisplayShell;
+typedef struct _GimpDisplay           GimpDisplay;
+typedef struct _GimpDisplayShell      GimpDisplayShell;
+/* typedef struct _GimpDisplayOptions GimpDisplayOptions; in config-types.h */
 
-typedef struct _GimpNavigationView GimpNavigationView;
-typedef struct _GimpScaleComboBox  GimpScaleComboBox;
-typedef struct _GimpStatusbar      GimpStatusbar;
+typedef struct _GimpNavigationView    GimpNavigationView;
+typedef struct _GimpScaleComboBox     GimpScaleComboBox;
+typedef struct _GimpStatusbar         GimpStatusbar;
 
-typedef struct _Selection          Selection;
+typedef struct _Selection             Selection;
 
 
 #endif /* __DISPLAY_TYPES_H__ */
diff --git a/libgimpconfig/gimpconfig-iface.h b/libgimpconfig/gimpconfig-iface.h
index d0a4212b21..d43526cd5d 100644
--- a/libgimpconfig/gimpconfig-iface.h
+++ b/libgimpconfig/gimpconfig-iface.h
@@ -29,6 +29,8 @@
 #define GIMP_CONFIG_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), GIMP_TYPE_CONFIG, GimpConfigInterface))
 
 
+typedef struct _GimpConfigInterface GimpConfigInterface;
+
 struct _GimpConfigInterface
 {
   GTypeInterface base_iface;