--- a/dwt/internal/gtk/OS.d	Thu Jan 10 08:21:49 2008 +0100
+++ b/dwt/internal/gtk/OS.d	Fri Jan 11 05:07:22 2008 +0100
@@ -26,7 +26,6 @@
         dwt.internal.c.gdk,
         dwt.internal.c.gdkx,
         dwt.internal.c.atk,
-        dwt.internal.c.glib,
         dwt.internal.c.cairo,
         dwt.internal.c.pango,
         dwt.internal.c.pangocairo,
@@ -45,6 +44,10 @@
 public alias dwt.internal.c.glib_object.GClosureNotify GClosureNotify;
 public alias dwt.internal.c.glib_object.GPollFunc GPollFunc;
 public alias dwt.internal.c.glib_object.GTypeInstance GTypeInstance;
+public alias dwt.internal.c.glib_object.GObjectClass GObjectClass;
+public alias dwt.internal.c.glib_object.GTypeClass GTypeClass;
+public alias dwt.internal.c.glib_object.GInterfaceInfo GInterfaceInfo;
+public alias dwt.internal.c.glib_object.GTypeQuery GTypeQuery;
 
 public alias dwt.internal.c.gdk.GdkColor GdkColor;
 public alias dwt.internal.c.gdk.GdkRegion GdkRegion;
@@ -146,6 +149,22 @@
     g_object_get( obj, firstPropertyName, res, null );
 }
 
+private void g_signal_emit_by_name0( void* instance, char* detailed_signal ){
+    g_signal_emit_by_name( instance, detailed_signal );
+}
+
+private void g_signal_emit_by_name1( void* instance, char* detailed_signal, int value ){
+    g_signal_emit_by_name( instance, detailed_signal, value );
+}
+
+private void g_signal_emit_by_name2( void* instance, char* detailed_signal, int value1, int value2 ){
+    g_signal_emit_by_name( instance, detailed_signal, value1, value2 );
+}
+
+private void g_signal_emit_by_name3( void* instance, char* detailed_signal, int value1, int value2, int value3 ){
+    g_signal_emit_by_name( instance, detailed_signal, value1, value2, value3 );
+}
+
 // for linux always true, the other possibility would be GDK_WINDOWING_WIN32
 private bool GDK_WINDOWING_X11(){
     return true;
@@ -886,10 +905,10 @@
     mixin ForwardGtkOsCFunc!(.g_signal_connect_closure);
     mixin ForwardGtkOsCFunc!(.g_signal_connect_closure_by_id);
 //    mixin ForwardGtkOsCFunc!(.g_signal_connect_after);
-    mixin ForwardGtkOsCFunc!(.g_signal_emit_by_name);
-    mixin ForwardGtkOsCFunc!(.g_signal_emit_by_name);
-    mixin ForwardGtkOsCFunc!(.g_signal_emit_by_name);
-    mixin ForwardGtkOsCFunc!(.g_signal_emit_by_name);
+    mixin ForwardGtkOsCFunc!(.g_signal_emit_by_name0);
+    mixin ForwardGtkOsCFunc!(.g_signal_emit_by_name1);
+    mixin ForwardGtkOsCFunc!(.g_signal_emit_by_name2);
+    mixin ForwardGtkOsCFunc!(.g_signal_emit_by_name3);
     mixin ForwardGtkOsCFunc!(.g_signal_handler_disconnect);
     mixin ForwardGtkOsCFunc!(.g_signal_handlers_block_matched);
     mixin ForwardGtkOsCFunc!(.g_signal_handlers_disconnect_matched);
@@ -2235,13 +2254,12 @@
         return (cast(GObjectClass*) g_type_check_class_cast ( arg0, cast(GType) (20 << 2) ) ) ;
     }
 
-    // Compile prob: GTypeClass has no member g_class
-   /+ static GObjectClass* G_OBJECT_GET_CLASS( GTypeClass* arg0 )
+    static GObjectClass* G_OBJECT_GET_CLASS( GTypeInstance* arg0 )
     {
         lock.lock();
         scope(exit) lock.unlock();
         return (cast(GObjectClass*) arg0.g_class) ;
-    }+/
+    }
 
     static gchar* G_OBJECT_TYPE_NAME( GTypeInstance* arg0 )
     {