2 files changed, 6 insertions, 20 deletions
diff --git a/camel/camel-folder.h b/camel/camel-folder.h
index 96847eb05c..03ed2a6f88 100644
--- a/camel/camel-folder.h
+++ b/camel/camel-folder.h
@@ -32,6 +32,9 @@ extern "C" {
 #endif /* __cplusplus }*/
 
 #include <gtk/gtk.h>
+
+typedef struct _CamelFolder CamelFolder;
+
 #include "camel-store.h"
 
 #define CAMEL_FOLDER_TYPE     (camel_folder_get_type ())
@@ -50,17 +53,6 @@ typedef enum {
 	FOLDER_OPEN_READ_WRITE /* folder is read/write        */ 
 } CamelFolderOpenMode;
 
-#ifndef CAMEL_FOLDER_DEF
-#define CAMEL_FOLDER_DEF 1
-typedef struct _CamelFolder CamelFolder;
-#endif /* CAMEL_FOLDER_DEF */
-
-#ifndef CAMEL_STORE_DEF
-#define CAMEL_STORE_DEF 1
-typedef struct _CamelStore CamelStore;
-#endif /* CAMEL_STORE_DEF */
-
-
 
 
 struct _CamelFolder
diff --git a/camel/camel-store.h b/camel/camel-store.h
index d2180b89be..90288261e4 100644
--- a/camel/camel-store.h
+++ b/camel/camel-store.h
@@ -32,6 +32,9 @@ extern "C" {
 #endif /* __cplusplus }*/
 
 #include <gtk/gtk.h>
+
+typedef struct _CamelStore CamelStore;
+
 #include "camel-folder.h"
 #include "camel-service.h"
 
@@ -40,15 +43,6 @@ extern "C" {
 #define CAMEL_STORE_CLASS(k) (GTK_CHECK_CLASS_CAST ((k), CAMEL_STORE_TYPE, CamelStoreClass))
 #define IS_CAMEL_STORE(o)    (GTK_CHECK_TYPE((o), CAMEL_STORE_TYPE))
 
-#ifndef CAMEL_FOLDER_DEF
-#define CAMEL_FOLDER_DEF 1
-typedef struct _CamelFolder CamelFolder;
-#endif /* CAMEL_FOLDER_DEF */
-
-#ifndef CAMEL_STORE_DEF
-#define CAMEL_STORE_DEF 1
-typedef struct _CamelStore CamelStore;
-#endif /* CAMEL_STORE_DEF */
 
 struct _CamelStore
 {