5 files changed, 10 insertions, 9 deletions
diff --git a/calendar/pcs/cal-backend.h b/calendar/pcs/cal-backend.h
index e1122f4d1c..cfc4cb8a99 100644
--- a/calendar/pcs/cal-backend.h
+++ b/calendar/pcs/cal-backend.h
@@ -49,9 +49,6 @@ typedef enum {
 
 struct _CalBackend {
 	GtkObject object;
-
-	/* Private data */
-	gpointer priv;
 };
 
 struct _CalBackendClass {
diff --git a/calendar/pcs/cal-factory.c b/calendar/pcs/cal-factory.c
index ab19ccb8b3..a89f2fe9f4 100644
--- a/calendar/pcs/cal-factory.c
+++ b/calendar/pcs/cal-factory.c
@@ -31,13 +31,13 @@
 
 
 /* Private part of the CalFactory structure */
-typedef struct {
+struct _CalFactoryPrivate {
 	/* Hash table from URI method strings to GtkType * for backend class types */
 	GHashTable *methods;
 
 	/* Hash table from GnomeVFSURI structures to CalBackend objects */
 	GHashTable *backends;
-} CalFactoryPrivate;
+};
 
 
 
diff --git a/calendar/pcs/cal-factory.h b/calendar/pcs/cal-factory.h
index f96ba4ba92..9405a05ef8 100644
--- a/calendar/pcs/cal-factory.h
+++ b/calendar/pcs/cal-factory.h
@@ -41,11 +41,13 @@ BEGIN_GNOME_DECLS
 typedef struct _CalFactory CalFactory;
 typedef struct _CalFactoryClass CalFactoryClass;
 
+typedef struct _CalFactoryPrivate CalFactoryPrivate;
+
 struct _CalFactory {
 	BonoboObject object;
 
 	/* Private data */
-	gpointer priv;
+	CalFactoryPrivate *priv;
 };
 
 struct _CalFactoryClass {
diff --git a/calendar/pcs/cal.c b/calendar/pcs/cal.c
index fdb7682e7c..64eb29b023 100644
--- a/calendar/pcs/cal.c
+++ b/calendar/pcs/cal.c
@@ -26,13 +26,13 @@
 
 
 /* Private part of the Cal structure */
-typedef struct {
+struct _CalPrivate {
 	/* Our backend */
 	CalBackend *backend;
 
 	/* Listener on the client we notify */
 	Evolution_Calendar_Listener listener;
-} CalPrivate;
+};
 
 
 
diff --git a/calendar/pcs/cal.h b/calendar/pcs/cal.h
index a11cedebbb..2b17278573 100644
--- a/calendar/pcs/cal.h
+++ b/calendar/pcs/cal.h
@@ -37,11 +37,13 @@ BEGIN_GNOME_DECLS
 #define IS_CAL(obj)         (GTK_CHECK_TYPE ((obj), CAL_TYPE))
 #define IS_CAL_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), CAL_TYPE))
 
+typedef struct _CalPrivate CalPrivate;
+
 struct _Cal {
 	BonoboObject object;
 
 	/* Private data */
-	gpointer priv;
+	CalPrivate *priv;
 };
 
 struct _CalClass {