--- a/dwt/internal/gtk/c/gobjecttypes.d	Sat Jan 05 15:13:44 2008 -0800
+++ b/dwt/internal/gtk/c/gobjecttypes.d	Sun Jan 06 13:35:33 2008 -0800
@@ -237,13 +237,20 @@
 /**
  * An opaque structure used as the base of all type instances.
  */
-public struct GTypeInstance{}
-
+public struct GTypeInstance
+{
+  /*< private >*/
+  GTypeClass *g_class;
+}
 
 /**
  * An opaque structure used as the base of all classes.
  */
-public struct GTypeClass{}
+public struct GTypeClass
+{
+  /*< private >*/
+  GType g_type;
+}
 
 
 /**
@@ -456,59 +463,45 @@
  * static GObject*
  * my_singleton_constructor (GType type,
  */
-public struct GObjectClass{}
-// GTypeClass gTypeClass;
-// gobject-The-Base-Object-Type.html
-// /+* seldomly overidden +/
-// gobject-The-Base-Object-Type.html
-// GObject* (*constructor) (GType type,
-// gobject-The-Base-Object-Type.html
-// uint nConstructProperties,
-// gobject-The-Base-Object-Type.html
-// GObjectConstructParam *constructProperties);
-// gobject-The-Base-Object-Type.html
-// /+* overridable methods +/
-// gobject-The-Base-Object-Type.html
-// void (*setProperty) (GObject *object,
-// gobject-The-Base-Object-Type.html
-// uint propertyId,
-// gobject-The-Base-Object-Type.html
-// GValue *value,
-// gobject-The-Base-Object-Type.html
-// GParamSpec *pspec);
-// gobject-The-Base-Object-Type.html
-// void (*getProperty) (GObject *object,
-// gobject-The-Base-Object-Type.html
-// uint propertyId,
-// gobject-The-Base-Object-Type.html
-// GValue *value,
-// gobject-The-Base-Object-Type.html
-// GParamSpec *pspec);
-// gobject-The-Base-Object-Type.html
-// void (*dispose) (GObject *object);
-// gobject-The-Base-Object-Type.html
-// void (*finalize) (GObject *object);
-// gobject-The-Base-Object-Type.html
-// /+* seldomly overidden +/
-// gobject-The-Base-Object-Type.html
-// void (*dispatchPropertiesChanged) (GObject *object,
-// gobject-The-Base-Object-Type.html
-// uint nPspecs,
-// gobject-The-Base-Object-Type.html
-// GParamSpec **pspecs);
-// gobject-The-Base-Object-Type.html
-// /+* signals +/
-// gobject-The-Base-Object-Type.html
-// void (*notify) (GObject *object,
-// gobject-The-Base-Object-Type.html
-// GParamSpec *pspec);
-// gobject-The-Base-Object-Type.html
-// /+* called when done constructing +/
-// gobject-The-Base-Object-Type.html
-// void (*constructed) (GObject *object);
-// gobject-The-Base-Object-Type.html
+
+public struct  GObjectClass
+{
+  GTypeClass   g_type_class;
+
+  /*< private >*/
+  GSList      *construct_properties;
 
+  /*< public >*/
+  /* seldomly overidden */
+  GObject*   (*constructor)     (GType                  type,
+                                 guint                  n_construct_properties,
+                                 GObjectConstructParam *construct_properties);
+  /* overridable methods */
+  void       (*set_property)        (GObject        *object,
+                                         guint           property_id,
+                                         GValue   *value,
+                                         GParamSpec     *pspec);
+  void       (*get_property)        (GObject        *object,
+                                         guint           property_id,
+                                         GValue         *value,
+                                         GParamSpec     *pspec);
+  void       (*dispose)         (GObject        *object);
+  void       (*finalize)        (GObject        *object);
+  /* seldomly overidden */
+  void       (*dispatch_properties_changed) (GObject      *object,
+                         guint     n_pspecs,
+                         GParamSpec  **pspecs);
+  /* signals */
+  void       (*notify)          (GObject    *object,
+                     GParamSpec *pspec);
 
+  /* called when done constructing */
+  void       (*constructed)     (GObject    *object);
+
+  /*< private >*/
+  /* padding */
+  gpointer  pdummy[7];
+}
 /**
  * The GObjectConstructParam struct is an auxiliary
  * structure used to hand GParamSpec/GValue pairs to the constructor of
@@ -551,7 +544,7 @@
 /**
  * The class structure for the GInitiallyUnowned type.
  */
-public struct GInitiallyUnownedClass{}
+alias GObjectClass GInitiallyUnownedClass;
 
 
 /**