Make all structs prefixed by _.

2005-01-08  Christian Persch  <chpe@cvs.gnome.org>

	* embed/ephy-cookie-manager.h:
	* embed/ephy-download.c:
	* embed/ephy-download.h:
	* embed/ephy-embed-dialog.c:
	* embed/ephy-embed-dialog.h:
	* embed/ephy-embed-persist.c:
	* embed/ephy-embed-persist.h:
	* embed/ephy-encodings.c:
	* embed/ephy-encodings.h:
	* embed/ephy-favicon-cache.c:
	* embed/ephy-favicon-cache.h:
	* embed/ephy-history.c:
	* embed/ephy-history.h:
	* embed/ephy-password-manager.h:
	* embed/ephy-permission-manager.h:
	* lib/ephy-file-chooser.c:
	* lib/ephy-file-chooser.h:
	* lib/ephy-node-db.c:
	* lib/ephy-node-db.h:
	* lib/ephy-node-filter.c:
	* lib/ephy-node-filter.h:
	* lib/ephy-node.c:
	* lib/ephy-node.h:
	* lib/widgets/ephy-node-view.c:
	* lib/widgets/ephy-node-view.h:
	* lib/widgets/ephy-search-entry.c:
	* lib/widgets/ephy-search-entry.h:
	* lib/widgets/ephy-spinner.c:
	* lib/widgets/ephy-spinner.h:
	* lib/widgets/ephy-tree-model-node.c:
	* lib/widgets/ephy-tree-model-node.h:
	* lib/widgets/ephy-tree-model-sort.c:
	* lib/widgets/ephy-tree-model-sort.h:
	* lib/widgets/ephy-zoom-action.c:
	* lib/widgets/ephy-zoom-action.h:
	* src/bookmarks/ephy-bookmark-properties.c:
	* src/bookmarks/ephy-bookmark-properties.h:
	* src/bookmarks/ephy-bookmarks-editor.c:
	* src/bookmarks/ephy-bookmarks-editor.h:
	* src/bookmarks/ephy-bookmarks.c:
	* src/bookmarks/ephy-bookmarks.h:
	* src/bookmarks/ephy-bookmarksbar-model.c:
	* src/bookmarks/ephy-bookmarksbar-model.h:
	* src/bookmarks/ephy-bookmarksbar.c:
	* src/bookmarks/ephy-bookmarksbar.h:
	* src/bookmarks/ephy-new-bookmark.c:
	* src/bookmarks/ephy-new-bookmark.h:
	* src/bookmarks/ephy-topics-selector.c:
	* src/bookmarks/ephy-topics-selector.h:
	* src/ephy-completion-model.c:
	* src/ephy-completion-model.h:
	* src/ephy-encoding-dialog.c:
	* src/ephy-encoding-dialog.h:
	* src/ephy-history-window.c:
	* src/ephy-history-window.h:

	Make all structs prefixed by _.

56 files changed, 177 insertions, 113 deletions

diff --git a/ChangeLog b/ChangeLog
index 20ab04ca8..802fbbea9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,65 @@
 2005-01-08  Christian Persch  <chpe@cvs.gnome.org>
 
+	* embed/ephy-cookie-manager.h:
+	* embed/ephy-download.c:
+	* embed/ephy-download.h:
+	* embed/ephy-embed-dialog.c:
+	* embed/ephy-embed-dialog.h:
+	* embed/ephy-embed-persist.c:
+	* embed/ephy-embed-persist.h:
+	* embed/ephy-encodings.c:
+	* embed/ephy-encodings.h:
+	* embed/ephy-favicon-cache.c:
+	* embed/ephy-favicon-cache.h:
+	* embed/ephy-history.c:
+	* embed/ephy-history.h:
+	* embed/ephy-password-manager.h:
+	* embed/ephy-permission-manager.h:
+	* lib/ephy-file-chooser.c:
+	* lib/ephy-file-chooser.h:
+	* lib/ephy-node-db.c:
+	* lib/ephy-node-db.h:
+	* lib/ephy-node-filter.c:
+	* lib/ephy-node-filter.h:
+	* lib/ephy-node.c:
+	* lib/ephy-node.h:
+	* lib/widgets/ephy-node-view.c:
+	* lib/widgets/ephy-node-view.h:
+	* lib/widgets/ephy-search-entry.c:
+	* lib/widgets/ephy-search-entry.h:
+	* lib/widgets/ephy-spinner.c:
+	* lib/widgets/ephy-spinner.h:
+	* lib/widgets/ephy-tree-model-node.c:
+	* lib/widgets/ephy-tree-model-node.h:
+	* lib/widgets/ephy-tree-model-sort.c:
+	* lib/widgets/ephy-tree-model-sort.h:
+	* lib/widgets/ephy-zoom-action.c:
+	* lib/widgets/ephy-zoom-action.h:
+	* src/bookmarks/ephy-bookmark-properties.c:
+	* src/bookmarks/ephy-bookmark-properties.h:
+	* src/bookmarks/ephy-bookmarks-editor.c:
+	* src/bookmarks/ephy-bookmarks-editor.h:
+	* src/bookmarks/ephy-bookmarks.c:
+	* src/bookmarks/ephy-bookmarks.h:
+	* src/bookmarks/ephy-bookmarksbar-model.c:
+	* src/bookmarks/ephy-bookmarksbar-model.h:
+	* src/bookmarks/ephy-bookmarksbar.c:
+	* src/bookmarks/ephy-bookmarksbar.h:
+	* src/bookmarks/ephy-new-bookmark.c:
+	* src/bookmarks/ephy-new-bookmark.h:
+	* src/bookmarks/ephy-topics-selector.c:
+	* src/bookmarks/ephy-topics-selector.h:
+	* src/ephy-completion-model.c:
+	* src/ephy-completion-model.h:
+	* src/ephy-encoding-dialog.c:
+	* src/ephy-encoding-dialog.h:
+	* src/ephy-history-window.c:
+	* src/ephy-history-window.h:
+
+	Make all structs prefixed by _.
+
+2005-01-08  Christian Persch  <chpe@cvs.gnome.org>
+
 	* src/ephy-notebook.c:
 	* src/ephy-notebook.h:
 	* src/ephy-session.c:
diff --git a/embed/ephy-cookie-manager.h b/embed/ephy-cookie-manager.h
index 069ad0a6a..de7aed2e6 100644
--- a/embed/ephy-cookie-manager.h
+++ b/embed/ephy-cookie-manager.h
@@ -36,8 +36,8 @@ G_BEGIN_DECLS
 
 #define EPHY_TYPE_COOKIE			(ephy_cookie_get_type ())
 
-typedef struct EphyCookieManager	EphyCookieManager;
-typedef struct EphyCookieManagerIface	EphyCookieManagerIface;
+typedef struct _EphyCookieManager	EphyCookieManager;
+typedef struct _EphyCookieManagerIface	EphyCookieManagerIface;
 
 typedef enum
 {
@@ -72,7 +72,7 @@ typedef struct
 	guint p3p_policy : 3;
 } EphyCookie;
 
-struct EphyCookieManagerIface
+struct _EphyCookieManagerIface
 {
 	GTypeInterface base_iface;
 
diff --git a/embed/ephy-download.c b/embed/ephy-download.c
index 3f46ed0c5..359472d1e 100644
--- a/embed/ephy-download.c
+++ b/embed/ephy-download.c
@@ -39,7 +39,7 @@ enum
 	LAST_SIGNAL
 };
 
-struct EphyDownloadPrivate
+struct _EphyDownloadPrivate
 {
 	long remaining_time_last_update;
 	long remaining_time;
diff --git a/embed/ephy-download.h b/embed/ephy-download.h
index 64d483b2a..2614f4e8e 100644
--- a/embed/ephy-download.h
+++ b/embed/ephy-download.h
@@ -33,9 +33,9 @@ G_BEGIN_DECLS
 #define EPHY_IS_DOWNLOAD_CLASS(k)	(G_TYPE_CHECK_CLASS_TYPE ((k), EPHY_TYPE_DOWNLOAD))
 #define EPHY_DOWNLOAD_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), EPHY_TYPE_DOWNLOAD, EphyDownloadClass))
 
-typedef struct EphyDownload EphyDownload;
-typedef struct EphyDownloadClass EphyDownloadClass;
-typedef struct EphyDownloadPrivate EphyDownloadPrivate;
+typedef struct _EphyDownload EphyDownload;
+typedef struct _EphyDownloadClass EphyDownloadClass;
+typedef struct _EphyDownloadPrivate EphyDownloadPrivate;
 
 typedef enum
 {
@@ -46,7 +46,7 @@ typedef enum
 	EPHY_DOWNLOAD_FAILED
 } EphyDownloadState;
 
-struct EphyDownload
+struct _EphyDownload
 {
         GObject parent;
 
@@ -54,7 +54,7 @@ struct EphyDownload
 	EphyDownloadPrivate *priv;
 };
 
-struct EphyDownloadClass
+struct _EphyDownloadClass
 {
         GObjectClass parent_class;
 
diff --git a/embed/ephy-embed-dialog.c b/embed/ephy-embed-dialog.c
index 6a018a246..55b909ced 100644
--- a/embed/ephy-embed-dialog.c
+++ b/embed/ephy-embed-dialog.c
@@ -47,7 +47,7 @@ enum
 
 #define EPHY_EMBED_DIALOG_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), EPHY_TYPE_EMBED_DIALOG, EphyEmbedDialogPrivate))
 
-struct EphyEmbedDialogPrivate
+struct _EphyEmbedDialogPrivate
 {
 	EphyEmbed *embed;
 };
diff --git a/embed/ephy-embed-dialog.h b/embed/ephy-embed-dialog.h
index fdb2b89d2..1721b1067 100644
--- a/embed/ephy-embed-dialog.h
+++ b/embed/ephy-embed-dialog.h
@@ -37,11 +37,11 @@ G_BEGIN_DECLS
 #define EPHY_IS_EMBED_DIALOG_CLASS(k)	(G_TYPE_CHECK_CLASS_TYPE ((k), EPHY_TYPE_EMBED_DIALOG))
 #define EPHY_EMBED_DIALOG_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), EPHY_TYPE_EMBED_DIALOG, EphyEmbedDialogClass))
 
-typedef struct EphyEmbedDialogClass	EphyEmbedDialogClass;
-typedef struct EphyEmbedDialog		EphyEmbedDialog;
-typedef struct EphyEmbedDialogPrivate	EphyEmbedDialogPrivate;
+typedef struct _EphyEmbedDialogClass	EphyEmbedDialogClass;
+typedef struct _EphyEmbedDialog		EphyEmbedDialog;
+typedef struct _EphyEmbedDialogPrivate	EphyEmbedDialogPrivate;
 
-struct EphyEmbedDialog
+struct _EphyEmbedDialog
 {
         EphyDialog parent;
 
@@ -49,7 +49,7 @@ struct EphyEmbedDialog
         EphyEmbedDialogPrivate *priv;
 };
 
-struct EphyEmbedDialogClass
+struct _EphyEmbedDialogClass
 {
         EphyDialogClass parent_class;
 };
diff --git a/embed/ephy-embed-persist.c b/embed/ephy-embed-persist.c
index 71f3a0cdb..45bcc209f 100644
--- a/embed/ephy-embed-persist.c
+++ b/embed/ephy-embed-persist.c
@@ -41,7 +41,7 @@ enum
 
 #define EPHY_EMBED_PERSIST_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), EPHY_TYPE_EMBED_PERSIST, EphyEmbedPersistPrivate))
 
-struct EphyEmbedPersistPrivate
+struct _EphyEmbedPersistPrivate
 {
 	char *dest;
 	char *source;
diff --git a/embed/ephy-embed-persist.h b/embed/ephy-embed-persist.h
index 0f80c1200..d8969e341 100644
--- a/embed/ephy-embed-persist.h
+++ b/embed/ephy-embed-persist.h
@@ -38,9 +38,9 @@ G_BEGIN_DECLS
 #define EPHY_IS_EMBED_PERSIST_CLASS(k)	(G_TYPE_CHECK_CLASS_TYPE ((k), EPHY_TYPE_EMBED_PERSIST))
 #define EPHY_EMBED_PERSIST_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), EPHY_TYPE_EMBED_PERSIST, EphyEmbedPersistClass))
 
-typedef struct _EphyEmbedPersistClass EphyEmbedPersistClass;
-typedef struct _EphyEmbedPersist EphyEmbedPersist;
-typedef struct EphyEmbedPersistPrivate EphyEmbedPersistPrivate;
+typedef struct _EphyEmbedPersistClass	EphyEmbedPersistClass;
+typedef struct _EphyEmbedPersist	EphyEmbedPersist;
+typedef struct _EphyEmbedPersistPrivate	EphyEmbedPersistPrivate;
 
 typedef enum
 {
diff --git a/embed/ephy-encodings.c b/embed/ephy-encodings.c
index f5c0ebbde..d4e1168bc 100644
--- a/embed/ephy-encodings.c
+++ b/embed/ephy-encodings.c
@@ -32,7 +32,7 @@
 
 #define EPHY_ENCODINGS_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), EPHY_TYPE_ENCODINGS, EphyEncodingsPrivate))
 
-struct EphyEncodingsPrivate
+struct _EphyEncodingsPrivate
 {
 	EphyNodeDb *db;
 	EphyNode *root;
diff --git a/embed/ephy-encodings.h b/embed/ephy-encodings.h
index 46df65f58..09189a695 100644
--- a/embed/ephy-encodings.h
+++ b/embed/ephy-encodings.h
@@ -35,7 +35,9 @@ G_BEGIN_DECLS
 #define EPHY_IS_ENCODINGS_CLASS(k)	(G_TYPE_CHECK_CLASS_TYPE ((k), EPHY_TYPE_ENCODINGS))
 #define EPHY_ENCODINGS_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), EPHY_TYPE_ENCODINGS, EphyEncodingsClass))
 
-typedef struct EphyEncodingsPrivate EphyEncodingsPrivate;
+typedef struct _EphyEncodings		EphyEncodings;
+typedef struct _EphyEncodingsPrivate	EphyEncodingsPrivate;
+typedef struct _EphyEncodingsClass	EphyEncodingsClass;
 
 typedef enum
 {
@@ -75,18 +77,18 @@ enum
 	EPHY_NODE_ENCODING_PROP_IS_AUTODETECTOR = 6
 };
 
-typedef struct
+struct _EphyEncodings
 {
 	GObject parent;
 
 	/*< private >*/
 	EphyEncodingsPrivate *priv;
-} EphyEncodings;
+};
 
-typedef struct
+struct _EphyEncodingsClass
 {
 	GObjectClass parent_class;
-} EphyEncodingsClass;
+};
 
 GType		 ephy_encodings_get_type        (void);
 
diff --git a/embed/ephy-favicon-cache.c b/embed/ephy-favicon-cache.c
index 93309a841..d38425cb6 100644
--- a/embed/ephy-favicon-cache.c
+++ b/embed/ephy-favicon-cache.c
@@ -47,7 +47,7 @@ static void ephy_favicon_cache_finalize	  (GObject *object);
 
 #define EPHY_FAVICON_CACHE_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), EPHY_TYPE_FAVICON_CACHE, EphyFaviconCachePrivate))
 
-struct EphyFaviconCachePrivate
+struct _EphyFaviconCachePrivate
 {
 	char *directory;
 	char *xml_file;
diff --git a/embed/ephy-favicon-cache.h b/embed/ephy-favicon-cache.h
index c4f229ccc..a2d211821 100644
--- a/embed/ephy-favicon-cache.h
+++ b/embed/ephy-favicon-cache.h
@@ -35,11 +35,11 @@ G_BEGIN_DECLS
 #define EPHY_IS_FAVICON_CACHE_CLASS(k)	(G_TYPE_CHECK_CLASS_TYPE ((k), EPHY_TYPE_FAVICON_CACHE))
 #define EPHY_FAVICON_CACHE_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), EPHY_TYPE_FAVICON_CACHE, EphyFaviconCacheClass))
 
-typedef struct EphyFaviconCacheClass	EphyFaviconCacheClass;
-typedef struct EphyFaviconCache		EphyFaviconCache;
-typedef struct EphyFaviconCachePrivate	EphyFaviconCachePrivate;
+typedef struct _EphyFaviconCacheClass	EphyFaviconCacheClass;
+typedef struct _EphyFaviconCache	EphyFaviconCache;
+typedef struct _EphyFaviconCachePrivate	EphyFaviconCachePrivate;
 
-struct EphyFaviconCache
+struct _EphyFaviconCache
 {
 	GObject parent;
 
@@ -47,7 +47,7 @@ struct EphyFaviconCache
 	EphyFaviconCachePrivate *priv;
 };
 
-struct EphyFaviconCacheClass
+struct _EphyFaviconCacheClass
 {
 	GObjectClass parent_class;
 
diff --git a/embed/ephy-history.c b/embed/ephy-history.c
index d485616b7..6b54adaaf 100644
--- a/embed/ephy-history.c
+++ b/embed/ephy-history.c
@@ -45,7 +45,7 @@
 
 #define EPHY_HISTORY_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), EPHY_TYPE_HISTORY, EphyHistoryPrivate))
 
-struct EphyHistoryPrivate
+struct _EphyHistoryPrivate
 {
 	char *xml_file;
 	EphyNodeDb *db;
diff --git a/embed/ephy-history.h b/embed/ephy-history.h
index 7da9ff475..740440f05 100644
--- a/embed/ephy-history.h
+++ b/embed/ephy-history.h
@@ -34,9 +34,9 @@ G_BEGIN_DECLS
 #define EPHY_IS_HISTORY_CLASS(k)	(G_TYPE_CHECK_CLASS_TYPE ((k), EPHY_TYPE_HISTORY))
 #define EPHY_HISTORY_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), EPHY_TYPE_HISTORY, EphyHistoryClass))
 
-typedef struct EphyHistoryClass EphyHistoryClass;
-typedef struct EphyHistory EphyHistory;
-typedef struct EphyHistoryPrivate EphyHistoryPrivate;
+typedef struct _EphyHistoryClass	EphyHistoryClass;
+typedef struct _EphyHistory		EphyHistory;
+typedef struct _EphyHistoryPrivate	EphyHistoryPrivate;
 
 enum
 {
@@ -51,7 +51,7 @@ enum
 	EPHY_NODE_HOST_PROP_ZOOM = 10
 };
 
-struct EphyHistory
+struct _EphyHistory
 {
 	GObject parent;
 
@@ -59,7 +59,7 @@ struct EphyHistory
 	EphyHistoryPrivate *priv;
 };
 
-struct EphyHistoryClass
+struct _EphyHistoryClass
 {
         GObjectClass parent_class;
 
diff --git a/embed/ephy-password-manager.h b/embed/ephy-password-manager.h
index a9ae67f21..1b32f6ee0 100644
--- a/embed/ephy-password-manager.h
+++ b/embed/ephy-password-manager.h
@@ -36,8 +36,8 @@ G_BEGIN_DECLS
 
 #define EPHY_TYPE_PASSWORD_INFO			(ephy_password_info_get_type ())
 
-typedef struct EphyPasswordManager	EphyPasswordManager;
-typedef struct EphyPasswordManagerIface	EphyPasswordManagerIface;
+typedef struct _EphyPasswordManager		EphyPasswordManager;
+typedef struct _EphyPasswordManagerIface	EphyPasswordManagerIface;
 
 typedef struct
 {
@@ -46,7 +46,7 @@ typedef struct
 	char *password;
 } EphyPasswordInfo;
 
-struct EphyPasswordManagerIface
+struct _EphyPasswordManagerIface
 {
 	GTypeInterface base_iface;
 
diff --git a/embed/ephy-permission-manager.h b/embed/ephy-permission-manager.h
index 22e561d89..b5c3a0354 100644
--- a/embed/ephy-permission-manager.h
+++ b/embed/ephy-permission-manager.h
@@ -49,8 +49,8 @@ typedef enum
 
 typedef struct _EphyPermissionInfo		EphyPermissionInfo;
 
-typedef struct EphyPermissionManager		EphyPermissionManager;
-typedef struct EphyPermissionManagerIface	EphyPermissionManagerIface;
+typedef struct _EphyPermissionManager		EphyPermissionManager;
+typedef struct _EphyPermissionManagerIface	EphyPermissionManagerIface;
 
 struct _EphyPermissionInfo
 {
@@ -59,7 +59,7 @@ struct _EphyPermissionInfo
 	EphyPermission permission;
 };
 
-struct EphyPermissionManagerIface
+struct _EphyPermissionManagerIface
 {
 	GTypeInterface base_iface;
 
diff --git a/lib/ephy-file-chooser.c b/lib/ephy-file-chooser.c
index 1f3c80f63..ad6f2a624 100644
--- a/lib/ephy-file-chooser.c
+++ b/lib/ephy-file-chooser.c
@@ -34,7 +34,7 @@
 
 #define EPHY_FILE_CHOOSER_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), EPHY_TYPE_FILE_CHOOSER, EphyFileChooserPrivate))
 
-struct EphyFileChooserPrivate
+struct _EphyFileChooserPrivate
 {
 	char *persist_key;
 };
diff --git a/lib/ephy-file-chooser.h b/lib/ephy-file-chooser.h
index 5b576728a..81d28a5e4 100644
--- a/lib/ephy-file-chooser.h
+++ b/lib/ephy-file-chooser.h
@@ -36,7 +36,9 @@ G_BEGIN_DECLS
 #define EPHY_IS_FILE_CHOOSER_CLASS(k)	(G_TYPE_CHECK_CLASS_TYPE ((k), EPHY_TYPE_FILE_CHOOSER))
 #define EPHY_FILE_CHOOSER_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), EPHY_TYPE_FILE_CHOOSER, EphyFileChooserClass))
 
-typedef struct EphyFileChooserPrivate EphyFileChooserPrivate;
+typedef struct _EphyFileChooser		EphyFileChooser;
+typedef struct _EphyFileChooserPrivate	EphyFileChooserPrivate;
+typedef struct _EphyFileChooserClass	EphyFileChooserClass;
 
 typedef enum
 {
@@ -48,18 +50,18 @@ typedef enum
 	EPHY_FILE_FILTER_LAST = EPHY_FILE_FILTER_NONE
 } EphyFileFilterDefault;
 
-typedef struct
+struct _EphyFileChooser
 {
 	GtkFileChooserDialog parent;
 
 	/*< private >*/
 	EphyFileChooserPrivate *priv;
-} EphyFileChooser;
+};
 
-typedef struct
+struct _EphyFileChooserClass
 {
 	GtkFileChooserDialogClass parent_class;
-} EphyFileChooserClass;
+};
 
 GType		 ephy_file_chooser_get_type		(void);
 
diff --git a/lib/ephy-node-db.c b/lib/ephy-node-db.c
index 3774b63fd..591b7ec82 100644
--- a/lib/ephy-node-db.c
+++ b/lib/ephy-node-db.c
@@ -48,7 +48,7 @@ enum
 
 #define EPHY_NODE_DB_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), EPHY_TYPE_NODE_DB, EphyNodeDbPrivate))
 
-struct EphyNodeDbPrivate
+struct _EphyNodeDbPrivate
 {
 	char *name;
 	gboolean immutable;
diff --git a/lib/ephy-node-db.h b/lib/ephy-node-db.h
index e181356e8..84c3d9b8c 100644
--- a/lib/ephy-node-db.h
+++ b/lib/ephy-node-db.h
@@ -35,7 +35,7 @@ G_BEGIN_DECLS
 #define EPHY_NODE_DB_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), EPHY_TYPE_NODE_DB, EphyNodeDbClass))
 
 typedef struct _EphyNodeDb EphyNodeDb;
-typedef struct EphyNodeDbPrivate EphyNodeDbPrivate;
+typedef struct _EphyNodeDbPrivate EphyNodeDbPrivate;
 
 struct _EphyNodeDb
 {
diff --git a/lib/ephy-node-filter.c b/lib/ephy-node-filter.c
index 4cffc46c7..0457f30ca 100644
--- a/lib/ephy-node-filter.c
+++ b/lib/ephy-node-filter.c
@@ -41,12 +41,12 @@ enum
 
 #define EPHY_NODE_FILTER_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), EPHY_TYPE_NODE_FILTER, EphyNodeFilterPrivate))
 
-struct EphyNodeFilterPrivate
+struct _EphyNodeFilterPrivate
 {
 	GPtrArray *levels;
 };
 
-struct EphyNodeFilterExpression
+struct _EphyNodeFilterExpression
 {
 	EphyNodeFilterExpressionType type;
 
diff --git a/lib/ephy-node-filter.h b/lib/ephy-node-filter.h
index ee1d61097..ea0f625e2 100644
--- a/lib/ephy-node-filter.h
+++ b/lib/ephy-node-filter.h
@@ -35,7 +35,7 @@ G_BEGIN_DECLS
 #define EPHY_IS_NODE_FILTER_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), EPHY_TYPE_NODE_FILTER))
 #define EPHY_NODE_FILTER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), EPHY_TYPE_NODE_FILTER, EphyNodeFilterClass))
 
-typedef struct EphyNodeFilterPrivate EphyNodeFilterPrivate;
+typedef struct _EphyNodeFilterPrivate EphyNodeFilterPrivate;
 
 typedef struct
 {
@@ -70,7 +70,7 @@ typedef enum
 	EPHY_NODE_FILTER_EXPRESSION_INT_PROP_LESS_THAN     /* args: int prop_id, int int */
 } EphyNodeFilterExpressionType;
 
-typedef struct EphyNodeFilterExpression EphyNodeFilterExpression;
+typedef struct _EphyNodeFilterExpression EphyNodeFilterExpression;
 
 /* The filter starts iterating over all expressions at level 0,
  * if one of them is TRUE it continues to level 1, etc.
diff --git a/lib/ephy-node.c b/lib/ephy-node.c
index 1be64cb21..af264cbe6 100644
--- a/lib/ephy-node.c
+++ b/lib/ephy-node.c
@@ -54,7 +54,7 @@ typedef struct
 	guint property_id;
 } EphyNodeChange;
 
-struct EphyNode
+struct _EphyNode
 {
 	int ref_count;
 
diff --git a/lib/ephy-node.h b/lib/ephy-node.h
index 9bbe5343a..34ac0d2ec 100644
--- a/lib/ephy-node.h
+++ b/lib/ephy-node.h
@@ -32,7 +32,7 @@ G_BEGIN_DECLS
 
 #define EPHY_IS_NODE(o)	(o != NULL)
 
-typedef struct EphyNode EphyNode;
+typedef struct _EphyNode EphyNode;
 
 typedef enum
 {
diff --git a/lib/widgets/ephy-node-view.c b/lib/widgets/ephy-node-view.c
index dfa6c88bc..b72c6fcb4 100644
--- a/lib/widgets/ephy-node-view.c
+++ b/lib/widgets/ephy-node-view.c
@@ -44,7 +44,7 @@ static void ephy_node_view_finalize (GObject *object);
 
 #define EPHY_NODE_VIEW_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), EPHY_TYPE_NODE_VIEW, EphyNodeViewPrivate))
 
-struct EphyNodeViewPrivate
+struct _EphyNodeViewPrivate
 {
 	EphyNode *root;
 
diff --git a/lib/widgets/ephy-node-view.h b/lib/widgets/ephy-node-view.h
index ea0dc9f43..d5a4590eb 100644
--- a/lib/widgets/ephy-node-view.h
+++ b/lib/widgets/ephy-node-view.h
@@ -36,7 +36,7 @@ G_BEGIN_DECLS
 #define EPHY_IS_NODE_VIEW_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), EPHY_TYPE_NODE_VIEW))
 #define EPHY_NODE_VIEW_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), EPHY_TYPE_NODE_VIEW, EphyNodeViewClass))
 
-typedef struct EphyNodeViewPrivate EphyNodeViewPrivate;
+typedef struct _EphyNodeViewPrivate EphyNodeViewPrivate;
 
 typedef struct
 {
diff --git a/lib/widgets/ephy-search-entry.c b/lib/widgets/ephy-search-entry.c
index 3212ad767..a783f2ae3 100644
--- a/lib/widgets/ephy-search-entry.c
+++ b/lib/widgets/ephy-search-entry.c
@@ -31,7 +31,7 @@ static void ephy_search_entry_init (EphySearchEntry *entry);
 
 #define EPHY_SEARCH_ENTRY_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), EPHY_TYPE_SEARCH_ENTRY, EphySearchEntryPrivate))
 
-struct EphySearchEntryPrivate
+struct _EphySearchEntryPrivate
 {
 	gboolean clearing;
 
diff --git a/lib/widgets/ephy-search-entry.h b/lib/widgets/ephy-search-entry.h
index 5145b8b6c..d641ac043 100644
--- a/lib/widgets/ephy-search-entry.h
+++ b/lib/widgets/ephy-search-entry.h
@@ -32,7 +32,7 @@ G_BEGIN_DECLS
 #define EPHY_IS_SEARCH_ENTRY_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), EPHY_TYPE_SEARCH_ENTRY))
 #define EPHY_SEARCH_ENTRY_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), EPHY_TYPE_SEARCH_ENTRY, EphySearchEntryClass))
 
-typedef struct EphySearchEntryPrivate EphySearchEntryPrivate;
+typedef struct _EphySearchEntryPrivate EphySearchEntryPrivate;
 
 typedef struct
 {
diff --git a/lib/widgets/ephy-spinner.c b/lib/widgets/ephy-spinner.c
index fc0fbcc7a..7172e62ab 100644
--- a/lib/widgets/ephy-spinner.c
+++ b/lib/widgets/ephy-spinner.c
@@ -453,7 +453,7 @@ ephy_spinner_cache_ref (void)
 
 #define EPHY_SPINNER_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), EPHY_TYPE_SPINNER, EphySpinnerDetails))
 
-struct EphySpinnerDetails
+struct _EphySpinnerDetails
 {
 	GtkIconTheme *icon_theme;
 	EphySpinnerCache *cache;
diff --git a/lib/widgets/ephy-spinner.h b/lib/widgets/ephy-spinner.h
index faa0520f0..b99c12a49 100644
--- a/lib/widgets/ephy-spinner.h
+++ b/lib/widgets/ephy-spinner.h
@@ -40,11 +40,11 @@ G_BEGIN_DECLS
 #define EPHY_IS_SPINNER_CLASS(k)	(G_TYPE_CHECK_CLASS_TYPE ((k), EPHY_TYPE_SPINNER))
 #define EPHY_SPINNER_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), EPHY_TYPE_SPINNER, EphySpinnerClass))
 
-typedef struct EphySpinner		EphySpinner;
-typedef struct EphySpinnerClass		EphySpinnerClass;
-typedef struct EphySpinnerDetails	EphySpinnerDetails;
+typedef struct _EphySpinner		EphySpinner;
+typedef struct _EphySpinnerClass		EphySpinnerClass;
+typedef struct _EphySpinnerDetails	EphySpinnerDetails;
 
-struct EphySpinner
+struct _EphySpinner
 {
 	GtkEventBox parent;
 
@@ -52,7 +52,7 @@ struct EphySpinner
 	EphySpinnerDetails *details;
 };
 
-struct EphySpinnerClass
+struct _EphySpinnerClass
 {
 	GtkEventBoxClass parent_class;
 };
diff --git a/lib/widgets/ephy-tree-model-node.c b/lib/widgets/ephy-tree-model-node.c
index 487c9aa38..13ed2dbc8 100644
--- a/lib/widgets/ephy-tree-model-node.c
+++ b/lib/widgets/ephy-tree-model-node.c
@@ -36,7 +36,7 @@ static void ephy_tree_model_node_tree_model_init (GtkTreeModelIface *iface);
 
 #define EPHY_TREE_MODEL_NODE_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), EPHY_TYPE_TREE_MODEL_NODE, EphyTreeModelNodePrivate))
 
-struct EphyTreeModelNodePrivate
+struct _EphyTreeModelNodePrivate
 {
 	EphyNode *root;
 
diff --git a/lib/widgets/ephy-tree-model-node.h b/lib/widgets/ephy-tree-model-node.h
index 3e32288be..56bdd36a4 100644
--- a/lib/widgets/ephy-tree-model-node.h
+++ b/lib/widgets/ephy-tree-model-node.h
@@ -36,7 +36,7 @@ G_BEGIN_DECLS
 
 typedef void (*EphyTreeModelNodeValueFunc) (EphyNode *node, GValue *value, gpointer user_data);
 
-typedef struct EphyTreeModelNodePrivate EphyTreeModelNodePrivate;
+typedef struct _EphyTreeModelNodePrivate EphyTreeModelNodePrivate;
 
 typedef struct
 {
diff --git a/lib/widgets/ephy-tree-model-sort.c b/lib/widgets/ephy-tree-model-sort.c
index d088f524f..c20af59d0 100644
--- a/lib/widgets/ephy-tree-model-sort.c
+++ b/lib/widgets/ephy-tree-model-sort.c
@@ -45,7 +45,7 @@ static gboolean ephy_tree_model_sort_multi_drag_data_delete (EggTreeMultiDragSou
 
 #define EPHY_TREE_MODEL_SORT_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), EPHY_TYPE_TREE_MODEL_SORT, EphyTreeModelSortPrivate))
 
-struct EphyTreeModelSortPrivate
+struct _EphyTreeModelSortPrivate
 {
 	char *str_list;
 	int drag_column_id;
diff --git a/lib/widgets/ephy-tree-model-sort.h b/lib/widgets/ephy-tree-model-sort.h
index f8c27cd16..c24fc214b 100644
--- a/lib/widgets/ephy-tree-model-sort.h
+++ b/lib/widgets/ephy-tree-model-sort.h
@@ -33,7 +33,7 @@ G_BEGIN_DECLS
 #define EPHY_IS_TREE_MODEL_SORT_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), EPHY_TYPE_TREE_MODEL_SORT))
 #define EPHY_TREE_MODEL_SORT_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), EPHY_TYPE_TREE_MODEL_SORT, EphyTreeModelSortClass))
 
-typedef struct EphyTreeModelSortPrivate EphyTreeModelSortPrivate;
+typedef struct _EphyTreeModelSortPrivate EphyTreeModelSortPrivate;
 
 typedef struct
 {
diff --git a/lib/widgets/ephy-zoom-action.c b/lib/widgets/ephy-zoom-action.c
index b23a0b379..ac547ac63 100644
--- a/lib/widgets/ephy-zoom-action.c
+++ b/lib/widgets/ephy-zoom-action.c
@@ -34,7 +34,7 @@
 
 #define EPHY_ZOOM_ACTION_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), EPHY_TYPE_ZOOM_ACTION, EphyZoomActionPrivate))
 
-struct EphyZoomActionPrivate
+struct _EphyZoomActionPrivate
 {
 	float zoom;
 };
diff --git a/lib/widgets/ephy-zoom-action.h b/lib/widgets/ephy-zoom-action.h
index 52a70e3fa..77f9b4150 100644
--- a/lib/widgets/ephy-zoom-action.h
+++ b/lib/widgets/ephy-zoom-action.h
@@ -33,11 +33,11 @@ G_BEGIN_DECLS
 #define EPHY_IS_ZOOM_ACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), EPHY_TYPE_ZOOM_ACTION))
 #define EPHY_ZOOM_ACTION_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj), EPHY_TYPE_ZOOM_ACTION, EphyZoomActionClass))
 
-typedef struct EphyZoomAction		EphyZoomAction;
-typedef struct EphyZoomActionClass	EphyZoomActionClass;
-typedef struct EphyZoomActionPrivate	EphyZoomActionPrivate;
+typedef struct _EphyZoomAction		EphyZoomAction;
+typedef struct _EphyZoomActionClass	EphyZoomActionClass;
+typedef struct _EphyZoomActionPrivate	EphyZoomActionPrivate;
 
-struct EphyZoomAction
+struct _EphyZoomAction
 {
 	GtkAction parent;
 	
@@ -45,7 +45,7 @@ struct EphyZoomAction
 	EphyZoomActionPrivate *priv;
 };
 
-struct EphyZoomActionClass
+struct _EphyZoomActionClass
 {
 	GtkActionClass parent_class;
 
diff --git a/src/bookmarks/ephy-bookmark-properties.c b/src/bookmarks/ephy-bookmark-properties.c
index 59b4bec2a..1ad51c8e4 100644
--- a/src/bookmarks/ephy-bookmark-properties.c
+++ b/src/bookmarks/ephy-bookmark-properties.c
@@ -53,7 +53,7 @@ static void ephy_bookmark_properties_get_property (GObject *object,
 
 #define EPHY_BOOKMARK_PROPERTIES_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), EPHY_TYPE_BOOKMARK_PROPERTIES, EphyBookmarkPropertiesPrivate))
 
-struct EphyBookmarkPropertiesPrivate
+struct _EphyBookmarkPropertiesPrivate
 {
 	EphyBookmarks *bookmarks;
 	EphyNode *bookmark;
diff --git a/src/bookmarks/ephy-bookmark-properties.h b/src/bookmarks/ephy-bookmark-properties.h
index 97b393c51..387736501 100644
--- a/src/bookmarks/ephy-bookmark-properties.h
+++ b/src/bookmarks/ephy-bookmark-properties.h
@@ -34,7 +34,7 @@ G_BEGIN_DECLS
 #define EPHY_IS_BOOKMARK_PROPERTIES_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), EPHY_TYPE_BOOKMARK_PROPERTIES))
 #define EPHY_BOOKMARK_PROPERTIES_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), EPHY_TYPE_BOOKMARK_PROPERTIES, EphyBookmarkPropertiesClass))
 
-typedef struct EphyBookmarkPropertiesPrivate EphyBookmarkPropertiesPrivate;
+typedef struct _EphyBookmarkPropertiesPrivate EphyBookmarkPropertiesPrivate;
 
 typedef struct
 {
diff --git a/src/bookmarks/ephy-bookmarks-editor.c b/src/bookmarks/ephy-bookmarks-editor.c
index e7cfb6b38..36d7d9303 100644
--- a/src/bookmarks/ephy-bookmarks-editor.c
+++ b/src/bookmarks/ephy-bookmarks-editor.c
@@ -137,7 +137,7 @@ static void cmd_help_contents		  (GtkAction *action,
 
 #define CONF_BOOKMARKS_VIEW_DETAILS "/apps/epiphany/dialogs/bookmarks_view_details"
 
-struct EphyBookmarksEditorPrivate
+struct _EphyBookmarksEditorPrivate
 {
 	EphyBookmarks *bookmarks;
 	GtkWidget *bm_view;
diff --git a/src/bookmarks/ephy-bookmarks-editor.h b/src/bookmarks/ephy-bookmarks-editor.h
index 9fce6ad3c..15af59678 100644
--- a/src/bookmarks/ephy-bookmarks-editor.h
+++ b/src/bookmarks/ephy-bookmarks-editor.h
@@ -35,7 +35,7 @@ G_BEGIN_DECLS
 #define EPHY_IS_BOOKMARKS_EDITOR_CLASS(k)	(G_TYPE_CHECK_CLASS_TYPE ((k), EPHY_TYPE_BOOKMARKS_EDITOR))
 #define EPHY_BOOKMARKS_EDITOR_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), EPHY_TYPE_BOOKMARKS_EDITOR, EphyBookmarksEditorClass))
 
-typedef struct EphyBookmarksEditorPrivate EphyBookmarksEditorPrivate;
+typedef struct _EphyBookmarksEditorPrivate EphyBookmarksEditorPrivate;
 
 typedef struct
 {
diff --git a/src/bookmarks/ephy-bookmarks.c b/src/bookmarks/ephy-bookmarks.c
index d58bb1ebc..940e8111c 100644
--- a/src/bookmarks/ephy-bookmarks.c
+++ b/src/bookmarks/ephy-bookmarks.c
@@ -51,7 +51,7 @@
 
 #define EPHY_BOOKMARKS_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), EPHY_TYPE_BOOKMARKS, EphyBookmarksPrivate))
 
-struct EphyBookmarksPrivate
+struct _EphyBookmarksPrivate
 {
 	EphyBookmarksBarModel *toolbars_model;
 	gboolean init_defaults;
diff --git a/src/bookmarks/ephy-bookmarks.h b/src/bookmarks/ephy-bookmarks.h
index 9321f3da7..e42a6975d 100644
--- a/src/bookmarks/ephy-bookmarks.h
+++ b/src/bookmarks/ephy-bookmarks.h
@@ -36,9 +36,9 @@ G_BEGIN_DECLS
 #define EPHY_IS_BOOKMARKS_CLASS(k)	(G_TYPE_CHECK_CLASS_TYPE ((k), EPHY_TYPE_BOOKMARKS))
 #define EPHY_BOOKMARKS_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), EPHY_TYPE_BOOKMARKS, EphyBookmarksClass))
 
-typedef struct EphyBookmarksClass	EphyBookmarksClass;
-typedef struct EphyBookmarks		EphyBookmarks;
-typedef struct EphyBookmarksPrivate	EphyBookmarksPrivate;
+typedef struct _EphyBookmarksClass	EphyBookmarksClass;
+typedef struct _EphyBookmarks		EphyBookmarks;
+typedef struct _EphyBookmarksPrivate	EphyBookmarksPrivate;
 
 #define	BOOKMARKS_HIERARCHY_SEP	"->"
 
@@ -52,7 +52,7 @@ enum
 	EPHY_NODE_KEYWORD_PROP_PRIORITY	= 8
 };
 
-struct EphyBookmarks
+struct _EphyBookmarks
 {
 	GObject parent;
 
@@ -60,7 +60,7 @@ struct EphyBookmarks
 	EphyBookmarksPrivate *priv;
 };
 
-struct EphyBookmarksClass
+struct _EphyBookmarksClass
 {
 	GObjectClass parent_class;
 
diff --git a/src/bookmarks/ephy-bookmarksbar-model.c b/src/bookmarks/ephy-bookmarksbar-model.c
index e0d9bb1af..4b32a04ed 100755
--- a/src/bookmarks/ephy-bookmarksbar-model.c
+++ b/src/bookmarks/ephy-bookmarksbar-model.c
@@ -51,7 +51,7 @@ enum
 
 #define EPHY_BOOKMARKSBAR_MODEL_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), EPHY_TYPE_BOOKMARKSBAR_MODEL, EphyBookmarksBarModelPrivate))
 
-struct EphyBookmarksBarModelPrivate
+struct _EphyBookmarksBarModelPrivate
 {
 	EphyBookmarks *bookmarks;
 	char *xml_file;
diff --git a/src/bookmarks/ephy-bookmarksbar-model.h b/src/bookmarks/ephy-bookmarksbar-model.h
index 41c7efef3..1849e20c9 100755
--- a/src/bookmarks/ephy-bookmarksbar-model.h
+++ b/src/bookmarks/ephy-bookmarksbar-model.h
@@ -34,11 +34,11 @@ G_BEGIN_DECLS
 #define EPHY_IS_BOOKMARKSBAR_MODEL_CLASS(k)	(G_TYPE_CHECK_CLASS_TYPE ((k), EPHY_TYPE_BOOKMARKSBAR_MODEL))
 #define EPHY_BOOKMARKSBAR_MODEL_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), EPHY_TYPE_BOOKMARKSBAR_MODEL, EphyBookmarksBarModelClass))
 
-typedef struct EphyBookmarksBarModelClass		EphyBookmarksBarModelClass;
-typedef struct EphyBookmarksBarModel		EphyBookmarksBarModel;
-typedef struct EphyBookmarksBarModelPrivate	EphyBookmarksBarModelPrivate;
+typedef struct _EphyBookmarksBarModelClass		EphyBookmarksBarModelClass;
+typedef struct _EphyBookmarksBarModel		EphyBookmarksBarModel;
+typedef struct _EphyBookmarksBarModelPrivate	EphyBookmarksBarModelPrivate;
 
-struct EphyBookmarksBarModel
+struct _EphyBookmarksBarModel
 {
 	EggToolbarsModel parent_object;
 
@@ -46,7 +46,7 @@ struct EphyBookmarksBarModel
 	EphyBookmarksBarModelPrivate *priv;
 };
 
-struct EphyBookmarksBarModelClass
+struct _EphyBookmarksBarModelClass
 {
 	EggToolbarsModelClass parent_class;
 };
diff --git a/src/bookmarks/ephy-bookmarksbar.c b/src/bookmarks/ephy-bookmarksbar.c
index e9af82f12..81202e670 100644
--- a/src/bookmarks/ephy-bookmarksbar.c
+++ b/src/bookmarks/ephy-bookmarksbar.c
@@ -57,7 +57,7 @@ static GObjectClass *parent_class = NULL;
 
 #define EPHY_BOOKMARKSBAR_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), EPHY_TYPE_BOOKMARKSBAR, EphyBookmarksBarPrivate))
 
-struct EphyBookmarksBarPrivate
+struct _EphyBookmarksBarPrivate
 {
 	EphyWindow *window;
 	GtkActionGroup *action_group;
diff --git a/src/bookmarks/ephy-bookmarksbar.h b/src/bookmarks/ephy-bookmarksbar.h
index 2f4697fb9..b715f8ecb 100644
--- a/src/bookmarks/ephy-bookmarksbar.h
+++ b/src/bookmarks/ephy-bookmarksbar.h
@@ -38,11 +38,11 @@ G_BEGIN_DECLS
 #define EPHY_IS_BOOKMARKSBAR_CLASS(k)	(G_TYPE_CHECK_CLASS_TYPE ((k), EPHY_TYPE_BOOKMARKSBAR))
 #define EPHY_BOOKMARKSBAR_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), EPHY_TYPE_BOOKMARKSBAR, EphyBookmarksBarClass))
 
-typedef struct EphyBookmarksBar		EphyBookmarksBar;
-typedef struct EphyBookmarksBarClass	EphyBookmarksBarClass;
-typedef struct EphyBookmarksBarPrivate	EphyBookmarksBarPrivate;
+typedef struct _EphyBookmarksBar		EphyBookmarksBar;
+typedef struct _EphyBookmarksBarClass	EphyBookmarksBarClass;
+typedef struct _EphyBookmarksBarPrivate	EphyBookmarksBarPrivate;
 
-struct EphyBookmarksBar
+struct _EphyBookmarksBar
 {
 	EggEditableToolbar parent_object;
 
@@ -50,7 +50,7 @@ struct EphyBookmarksBar
 	EphyBookmarksBarPrivate *priv;
 };
 
-struct EphyBookmarksBarClass
+struct _EphyBookmarksBarClass
 {
 	EggEditableToolbarClass parent_class;
 };
diff --git a/src/bookmarks/ephy-new-bookmark.c b/src/bookmarks/ephy-new-bookmark.c
index 1ea4aae0f..55a129776 100644
--- a/src/bookmarks/ephy-new-bookmark.c
+++ b/src/bookmarks/ephy-new-bookmark.c
@@ -63,7 +63,7 @@ enum
 	RESPONSE_NEW_TOPIC
 };
 
-struct EphyNewBookmarkPrivate
+struct _EphyNewBookmarkPrivate
 {
 	EphyBookmarks *bookmarks;
 	char *location;
diff --git a/src/bookmarks/ephy-new-bookmark.h b/src/bookmarks/ephy-new-bookmark.h
index a10c31250..f79f9d553 100644
--- a/src/bookmarks/ephy-new-bookmark.h
+++ b/src/bookmarks/ephy-new-bookmark.h
@@ -34,7 +34,7 @@ G_BEGIN_DECLS
 #define EPHY_IS_NEW_BOOKMARK_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), EPHY_TYPE_NEW_BOOKMARK))
 #define EPHY_NEW_BOOKMARK_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), EPHY_TYPE_NEW_BOOKMARK, EphyNewBookmarkClass))
 
-typedef struct EphyNewBookmarkPrivate EphyNewBookmarkPrivate;
+typedef struct _EphyNewBookmarkPrivate EphyNewBookmarkPrivate;
 
 typedef struct
 {
diff --git a/src/bookmarks/ephy-topics-selector.c b/src/bookmarks/ephy-topics-selector.c
index a6fae1d99..6e16946ab 100644
--- a/src/bookmarks/ephy-topics-selector.c
+++ b/src/bookmarks/ephy-topics-selector.c
@@ -32,7 +32,7 @@ static void ephy_topics_selector_init (EphyTopicsSelector *editor);
 
 #define EPHY_TOPICS_SELECTOR_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), EPHY_TYPE_TOPICS_SELECTOR, EphyTopicsSelectorPrivate))
 
-struct EphyTopicsSelectorPrivate
+struct _EphyTopicsSelectorPrivate
 {
 	EphyBookmarks *bookmarks;
 	EphyNode *bookmark;
diff --git a/src/bookmarks/ephy-topics-selector.h b/src/bookmarks/ephy-topics-selector.h
index 733d48f41..3f532cd24 100644
--- a/src/bookmarks/ephy-topics-selector.h
+++ b/src/bookmarks/ephy-topics-selector.h
@@ -33,7 +33,7 @@ G_BEGIN_DECLS
 #define EPHY_IS_TOPICS_SELECTOR_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), EPHY_TYPE_TOPICS_SELECTOR))
 #define EPHY_TOPICS_SELECTOR_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), EPHY_TYPE_TOPICS_SELECTOR, EphyTopicsSelectorClass))
 
-typedef struct EphyTopicsSelectorPrivate EphyTopicsSelectorPrivate;
+typedef struct _EphyTopicsSelectorPrivate EphyTopicsSelectorPrivate;
 
 typedef struct
 {
diff --git a/src/ephy-completion-model.c b/src/ephy-completion-model.c
index 0e6c905fa..a78521c8c 100644
--- a/src/ephy-completion-model.c
+++ b/src/ephy-completion-model.c
@@ -31,7 +31,7 @@ static void ephy_completion_model_tree_model_init (GtkTreeModelIface *iface);
 
 #define EPHY_COMPLETION_MODEL_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), EPHY_TYPE_COMPLETION_MODEL, EphyCompletionModelPrivate))
 
-struct EphyCompletionModelPrivate
+struct _EphyCompletionModelPrivate
 {
 	EphyNode *history;
 	EphyNode *bookmarks;
diff --git a/src/ephy-completion-model.h b/src/ephy-completion-model.h
index 934672e05..48a0e0640 100644
--- a/src/ephy-completion-model.h
+++ b/src/ephy-completion-model.h
@@ -32,7 +32,7 @@ G_BEGIN_DECLS
 #define EPHY_IS_COMPLETION_MODEL_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), EPHY_TYPE_COMPLETION_MODEL))
 #define EPHY_COMPLETION_MODEL_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), EPHY_TYPE_COMPLETION_MODEL, EphyCompletionModelClass))
 
-typedef struct EphyCompletionModelPrivate EphyCompletionModelPrivate;
+typedef struct _EphyCompletionModelPrivate EphyCompletionModelPrivate;
 
 typedef enum
 {
diff --git a/src/ephy-encoding-dialog.c b/src/ephy-encoding-dialog.c
index 1afe804f5..2e3a301eb 100644
--- a/src/ephy-encoding-dialog.c
+++ b/src/ephy-encoding-dialog.c
@@ -60,7 +60,7 @@ EphyDialogProperty properties [] =
 
 #define EPHY_ENCODING_DIALOG_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), EPHY_TYPE_ENCODING_DIALOG, EphyEncodingDialogPrivate))
 
-struct EphyEncodingDialogPrivate
+struct _EphyEncodingDialogPrivate
 {
 	EphyEncodings *encodings;
 	EphyWindow *window;
diff --git a/src/ephy-encoding-dialog.h b/src/ephy-encoding-dialog.h
index 56d379d21..5e4ea08e1 100644
--- a/src/ephy-encoding-dialog.h
+++ b/src/ephy-encoding-dialog.h
@@ -37,11 +37,11 @@ G_BEGIN_DECLS
 #define EPHY_IS_ENCODING_DIALOG_CLASS(k)	(G_TYPE_CHECK_CLASS_TYPE ((k), EPHY_TYPE_ENCODING_DIALOG))
 #define EPHY_ENCODING_DIALOG_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), EPHY_TYPE_ENCODING_DIALOG, EphyEncodingDialogClass))
 
-typedef struct EphyEncodingDialog		EphyEncodingDialog;
-typedef struct EphyEncodingDialogClass		EphyEncodingDialogClass;
-typedef struct EphyEncodingDialogPrivate	EphyEncodingDialogPrivate;
+typedef struct _EphyEncodingDialog		EphyEncodingDialog;
+typedef struct _EphyEncodingDialogClass		EphyEncodingDialogClass;
+typedef struct _EphyEncodingDialogPrivate	EphyEncodingDialogPrivate;
 
-struct EphyEncodingDialog
+struct _EphyEncodingDialog
 {
 	EphyEmbedDialog parent;
 
@@ -49,7 +49,7 @@ struct EphyEncodingDialog
 	EphyEncodingDialogPrivate *priv;
 };
 
-struct EphyEncodingDialogClass
+struct _EphyEncodingDialogClass
 {
 	EphyEmbedDialogClass parent_class;
 };
diff --git a/src/ephy-history-window.c b/src/ephy-history-window.c
index 9b74d7c0b..f3b1ba696 100644
--- a/src/ephy-history-window.c
+++ b/src/ephy-history-window.c
@@ -118,7 +118,7 @@ static void cmd_help_contents		  (GtkAction *action,
 #define CONF_HISTORY_DATE_FILTER "/apps/epiphany/dialogs/history_date_filter"
 #define CONF_HISTORY_VIEW_DETAILS "/apps/epiphany/dialogs/history_view_details"
 
-struct EphyHistoryWindowPrivate
+struct _EphyHistoryWindowPrivate
 {
 	EphyHistory *history;
 	GtkWidget *sites_view;
diff --git a/src/ephy-history-window.h b/src/ephy-history-window.h
index 2a8e09530..1d0a4fa88 100644
--- a/src/ephy-history-window.h
+++ b/src/ephy-history-window.h
@@ -35,7 +35,7 @@ G_BEGIN_DECLS
 #define EPHY_IS_HISTORY_WINDOW_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), EPHY_TYPE_HISTORY_WINDOW))
 #define EPHY_HISTORY_WINDOW_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), EPHY_TYPE_HISTORY_WINDOW, EphyHistoryWindowClass))
 
-typedef struct EphyHistoryWindowPrivate EphyHistoryWindowPrivate;
+typedef struct _EphyHistoryWindowPrivate EphyHistoryWindowPrivate;
 
 typedef struct
 {