--- a/dwt/internal/cairo/Cairo.d	Wed Jan 09 07:07:50 2008 +0100
+++ b/dwt/internal/cairo/Cairo.d	Thu Jan 10 02:18:07 2008 +0100
@@ -20,11 +20,23 @@
  * ***** END LICENSE BLOCK ***** */
 module dwt.internal.cairo.Cairo;
 
-import  dwt.internal.gtk.c.cairo;
-import  dwt.internal.gtk.c.cairotypes;
+import  dwt.internal.c.cairo;
+import  dwt.internal.c.cairo_xlib;
+import  dwt.internal.c.Xlib;
 import  dwt.internal.Platform;
 
 import tango.core.Traits;
+
+public alias dwt.internal.c.cairo.cairo_t cairo_t;
+public alias dwt.internal.c.cairo.cairo_pattern_t cairo_pattern_t;
+public alias dwt.internal.c.cairo.cairo_surface_t cairo_surface_t;
+public alias dwt.internal.c.cairo.cairo_text_extents_t cairo_text_extents_t;
+public alias dwt.internal.c.cairo.cairo_font_extents_t cairo_font_extents_t;
+public alias dwt.internal.c.cairo.cairo_matrix_t cairo_matrix_t;
+public alias dwt.internal.c.cairo.cairo_path_t cairo_path_t;
+public alias dwt.internal.c.cairo.cairo_path_data_t cairo_path_data_t;
+
+/++++
 private extern(C) {
 cairo_surface_t *
 cairo_xlib_surface_create (void     *dpy,
@@ -33,6 +45,8 @@
                int      width,
                int      height);
 }
+++++/
+
 private int CAIRO_VERSION_ENCODE(int major, int minor, int micro) {
     return ((major) * 10000)
         + ((minor) *   100)
@@ -126,12 +140,7 @@
 	public static const int CAIRO_PATH_LINE_TO = 1;
 	public static const int CAIRO_PATH_CURVE_TO = 2;
 	public static const int CAIRO_PATH_CLOSE_PATH = 3;
-/+
-    mixin ForwardGtkCairoCFunc!(.cairo_font_extents_t_sizeof );
-    mixin ForwardGtkCairoCFunc!(.cairo_path_data_t_sizeof );
-    mixin ForwardGtkCairoCFunc!(.cairo_path_t_sizeof );
-    mixin ForwardGtkCairoCFunc!(.cairo_text_extents_t_sizeof );
-    +/
+
     mixin ForwardGtkCairoCFunc!(.CAIRO_VERSION_ENCODE);
     mixin ForwardGtkCairoCFunc!(.cairo_append_path);
     mixin ForwardGtkCairoCFunc!(.cairo_arc);
@@ -268,8 +277,8 @@
     mixin ForwardGtkCairoCFunc!(.cairo_user_to_device_distance);
     mixin ForwardGtkCairoCFunc!(.cairo_version);
     mixin ForwardGtkCairoCFunc!(.cairo_xlib_surface_create);
-    /+
+    /++/
     mixin ForwardGtkCairoCFunc!(.cairo_xlib_surface_create_for_bitmap);
     mixin ForwardGtkCairoCFunc!(.cairo_xlib_surface_set_size);
-+/
+/++/
 }