4 files changed, 10 insertions, 15 deletions
diff --git a/src/ephy-tab.c b/src/ephy-tab.c
index 95042b298..6095d526a 100644
--- a/src/ephy-tab.c
+++ b/src/ephy-tab.c
@@ -65,7 +65,7 @@
 
 #define CONF_LOCKDOWN_DISABLE_JAVASCRIPT_CHROME  "/apps/epiphany/lockdown/disable_javascript_chrome"
 
-struct EphyTabPrivate
+struct _EphyTabPrivate
 {
 	char *status_message;
 	char *link_message;
diff --git a/src/ephy-tab.h b/src/ephy-tab.h
index b56105510..b94ec81eb 100644
--- a/src/ephy-tab.h
+++ b/src/ephy-tab.h
@@ -35,9 +35,9 @@ G_BEGIN_DECLS
 #define EPHY_IS_TAB_CLASS(k)	(G_TYPE_CHECK_CLASS_TYPE ((k), EPHY_TYPE_TAB))
 #define EPHY_TAB_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), EPHY_TYPE_TAB, EphyTabClass))
 
-typedef struct EphyTabClass	EphyTabClass;
+typedef struct _EphyTabClass	EphyTabClass;
 typedef struct _EphyTab		EphyTab;
-typedef struct EphyTabPrivate	EphyTabPrivate;
+typedef struct _EphyTabPrivate	EphyTabPrivate;
 
 typedef enum
 {
@@ -61,14 +61,11 @@ struct _EphyTab
 	EphyTabPrivate *priv;
 };
 
-struct EphyTabClass
+struct _EphyTabClass
 {
 	GtkBinClass parent_class;
 };
 
-/* Include the header down here to resolve circular dependency */
-#include "ephy-window.h"
-
 GType			ephy_tab_get_type		(void);
 
 EphyTab	               *ephy_tab_new			(void);
diff --git a/src/ephy-window.c b/src/ephy-window.c
index 8f4daab38..ee3bb8711 100644
--- a/src/ephy-window.c
+++ b/src/ephy-window.c
@@ -331,7 +331,7 @@ static guint ephy_popups_n_entries = G_N_ELEMENTS (ephy_popups_entries);
 
 #define EPHY_WINDOW_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), EPHY_TYPE_WINDOW, EphyWindowPrivate))
 
-struct EphyWindowPrivate
+struct _EphyWindowPrivate
 {
 	GtkWidget *main_vbox;
 	GtkWidget *menu_dock;
diff --git a/src/ephy-window.h b/src/ephy-window.h
index 433b44cbb..92ddb4389 100644
--- a/src/ephy-window.h
+++ b/src/ephy-window.h
@@ -21,6 +21,7 @@
 #ifndef EPHY_WINDOW_H
 #define EPHY_WINDOW_H
 
+#include "ephy-notebook.h"
 #include "ephy-embed.h"
 #include "ephy-tab.h"
 #include "ephy-dialog.h"
@@ -38,9 +39,9 @@ G_BEGIN_DECLS
 #define EPHY_IS_WINDOW_CLASS(k)	(G_TYPE_CHECK_CLASS_TYPE ((k), EPHY_TYPE_WINDOW))
 #define EPHY_WINDOW_GET_CLASS(o)(G_TYPE_INSTANCE_GET_CLASS ((o), EPHY_TYPE_WINDOW, EphyWindowClass))
 
-typedef struct EphyWindowClass EphyWindowClass;
-typedef struct _EphyWindow EphyWindow;
-typedef struct EphyWindowPrivate EphyWindowPrivate;
+typedef struct _EphyWindowClass		EphyWindowClass;
+typedef struct _EphyWindow		EphyWindow;
+typedef struct _EphyWindowPrivate	EphyWindowPrivate;
 
 struct _EphyWindow
 {
@@ -50,14 +51,11 @@ struct _EphyWindow
         EphyWindowPrivate *priv;
 };
 
-struct EphyWindowClass
+struct _EphyWindowClass
 {
         GtkWindowClass parent_class;
 };
 
-/* Include the header down here to resolve circular dependency */
-#include "ephy-notebook.h"
-
 GType		  ephy_window_get_type		  (void);
 
 EphyWindow	 *ephy_window_new		  (void);