Index: trunk/src_plugins/hid_gtk2_gdk/gtkhid-gdk.c
===================================================================
--- trunk/src_plugins/hid_gtk2_gdk/gtkhid-gdk.c	(revision 8997)
+++ trunk/src_plugins/hid_gtk2_gdk/gtkhid-gdk.c	(revision 8998)
@@ -1204,7 +1204,7 @@
 	show_crosshair(TRUE);
 }
 
-static gboolean ghid_gdk_drawing_area_expose_cb(GtkWidget * widget, /*GdkEventExpose*/void * p, void *vport)
+static gboolean ghid_gdk_drawing_area_expose_cb(GtkWidget * widget, pcb_gtk_expose_t * p, void *vport)
 {
 	GHidPort *port = vport;
 	render_priv_t *priv = port->render_priv;
Index: trunk/src_plugins/hid_gtk2_gl/gtkhid-gl.c
===================================================================
--- trunk/src_plugins/hid_gtk2_gl/gtkhid-gl.c	(revision 8997)
+++ trunk/src_plugins/hid_gtk2_gl/gtkhid-gl.c	(revision 8998)
@@ -860,7 +860,7 @@
 }
 
 #define Z_NEAR 3.0
-gboolean ghid_gl_drawing_area_expose_cb(GtkWidget * widget, /*GdkEventExpose*/void * p, void *vport)
+gboolean ghid_gl_drawing_area_expose_cb(GtkWidget * widget, pcb_gtk_expose_t * p, void *vport)
 {
 	GHidPort * port = vport;
 	render_priv_t *priv = port->render_priv;
Index: trunk/src_plugins/hid_gtk3_cairo/gtkhid-cairo.c
===================================================================
--- trunk/src_plugins/hid_gtk3_cairo/gtkhid-cairo.c	(revision 8997)
+++ trunk/src_plugins/hid_gtk3_cairo/gtkhid-cairo.c	(revision 8998)
@@ -1319,7 +1319,7 @@
 }
 
 /* GtkDrawingArea -> GtkWidget "draw" signal Call-Back function */
-static gboolean ghid_cairo_drawing_area_expose_cb(GtkWidget * widget, /*GdkEventExpose*/void * p, void *vport)
+static gboolean ghid_cairo_drawing_area_expose_cb(GtkWidget * widget, pcb_gtk_expose_t * p, void *vport)
 {
 	GHidPort *port = vport;
 	render_priv_t *priv = port->render_priv;
Index: trunk/src_plugins/lib_gtk_common/compat.h
===================================================================
--- trunk/src_plugins/lib_gtk_common/compat.h	(revision 8997)
+++ trunk/src_plugins/lib_gtk_common/compat.h	(revision 8998)
@@ -72,7 +72,7 @@
 }
 
 #define PCB_GTK_EXPOSE_EVENT(x) (x->draw)
-#define PCB_GTK_EXPOSE_STRUCT cairo_t
+typedef struct cairo_t pcb_gtk_expose_t;
 #define PCB_GTK_DRAW_SIGNAL_NAME "draw"
 
 static inline void pcb_gtk_set_selected(GtkWidget *widget, int set)
@@ -151,7 +151,7 @@
 }
 
 #define PCB_GTK_EXPOSE_EVENT(x) (x->expose_event)
-#define PCB_GTK_EXPOSE_STRUCT GdkEventExpose
+typedef struct GdkEventExpose pcb_gtk_expose_t;
 #define PCB_GTK_DRAW_SIGNAL_NAME "expose_event"
 
 static inline void pcb_gtk_set_selected(GtkWidget *widget, int set)
Index: trunk/src_plugins/lib_gtk_common/glue.h
===================================================================
--- trunk/src_plugins/lib_gtk_common/glue.h	(revision 8997)
+++ trunk/src_plugins/lib_gtk_common/glue.h	(revision 8998)
@@ -5,6 +5,8 @@
 #include "hid.h"
 #include "conf.h"
 
+#include "compat.h"
+
 /** The HID using pcb_gtk_common needs to fill in this struct and pass it
     on to most of the calls. This is the only legal way pcb_gtk_common can
     back reference to the HID. This lets multiple HIDs use gtk_common code
@@ -16,7 +18,7 @@
 	/* rendering */
 	void *(*render_pixmap)(int cx, int cy, double zoom, int width, int height, int depth);
 	void (*drawing_realize)(GtkWidget *w, void *gport);
-	gboolean (*drawing_area_expose)(GtkWidget *w, /*GdkEventExpose*/void *p, void *gport);
+	gboolean (*drawing_area_expose)(GtkWidget *w, pcb_gtk_expose_t *p, void *gport);
 	void (*drawing_area_configure_hook)(void *);
 
 	void (*init_drawing_widget)(GtkWidget *widget, void *gport);