No circular dependencies anymore.

2004-10-08  Christian Persch  <chpe@cvs.gnome.org>

	* src/ephy-tab.c:
	* src/ephy-tab.h:
	* src/ephy-window.c:
	* src/ephy-window.h:

	No circular dependencies anymore.

1 files changed, 3 insertions, 6 deletions

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);