Add epiphany.h. Only allow including epiphany.h; all other headers are private

svn path=/trunk/; revision=8211

68 files changed, 333 insertions, 24 deletions

diff --git a/configure.ac b/configure.ac
index 9ff92971b..c671eeafd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -530,6 +530,8 @@ AC_SUBST([SVN_BRANCH],[epiphany_branch])
 # Output files
 # ************
 
+AC_DEFINE([EPIPHANY_COMPILATION],[1],[Compiling epiphany])
+
 AC_CONFIG_FILES([
 Makefile
 data/Makefile
@@ -549,7 +551,7 @@ embed/Makefile
 embed/webkit/Makefile
 src/Makefile
 src/bookmarks/Makefile
-src/ephy-version.h
+src/epiphany.h
 help/Makefile
 po/Makefile.in
 ],
diff --git a/doc/reference/Makefile.am b/doc/reference/Makefile.am
index 06bd39607..1314c1c6b 100644
--- a/doc/reference/Makefile.am
+++ b/doc/reference/Makefile.am
@@ -119,7 +119,8 @@ extra_files =
 
 # CFLAGS and LDFLAGS for compiling scan program. Only needed
 # if $(DOC_MODULE).types is non-empty.
-GTKDOC_CFLAGS = -I$(top_srcdir)/src \
+GTKDOC_CFLAGS = -DEPIPHANY_COMPILATION \
+		-I$(top_srcdir)/src \
 		-I$(top_srcdir)/lib \
 		-I$(top_builddir)/lib \
 		-I$(top_srcdir)/lib/widgets \
@@ -144,6 +145,7 @@ GTKDOC_LIBS = \
 	$(top_builddir)/lib/libephymisc.la \
 	$(top_builddir)/lib/egg/libegg.la \
         $(DEPENDENCIES_LIBS) \
+        $(WEBKIT_LIBS) \
 	$(DBUS_LIBS) \
 	$(LIBINTL)
 
diff --git a/doc/reference/tmpl/EphyContentPolicy.sgml b/doc/reference/tmpl/EphyContentPolicy.sgml
index c6afaef59..5cd2d4f61 100644
--- a/doc/reference/tmpl/EphyContentPolicy.sgml
+++ b/doc/reference/tmpl/EphyContentPolicy.sgml
@@ -17,24 +17,3 @@ EphyContentPolicy
 <!-- ##### SECTION Stability_Level ##### -->
 
 
-<!-- ##### MACRO EPHY_CONTENT_POLICY_CONTRACTID ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO EPHY_CONTENT_POLICY_CLASSNAME ##### -->
-<para>
-
-</para>
-
-
-
-<!-- ##### MACRO EPHY_CONTENT_POLICY_CID ##### -->
-<para>
-
-</para>
-
-
-
diff --git a/doc/reference/tmpl/ephy-embed.sgml b/doc/reference/tmpl/ephy-embed.sgml
index 681861a6d..653669e34 100644
--- a/doc/reference/tmpl/ephy-embed.sgml
+++ b/doc/reference/tmpl/ephy-embed.sgml
@@ -263,7 +263,6 @@ be done by casting).
 @: 
 @: 
 @: 
-@: 
 @:
 @Param2: 
 
diff --git a/doc/reference/tmpl/epiphany-unused.sgml b/doc/reference/tmpl/epiphany-unused.sgml
index c493cdc0c..5845cba32 100644
--- a/doc/reference/tmpl/epiphany-unused.sgml
+++ b/doc/reference/tmpl/epiphany-unused.sgml
@@ -1,3 +1,27 @@
+<!-- ##### SECTION ./tmpl/EphySingle.sgml:Long_Description ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION ./tmpl/EphySingle.sgml:See_Also ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### SECTION ./tmpl/EphySingle.sgml:Short_Description ##### -->
+
+
+
+<!-- ##### SECTION ./tmpl/EphySingle.sgml:Stability_Level ##### -->
+
+
+
+<!-- ##### SECTION ./tmpl/EphySingle.sgml:Title ##### -->
+EphySingle
+
+
 <!-- ##### SECTION ./tmpl/ephy-tab.sgml:Long_Description ##### -->
 <para>
 Each #EphyWindow contains a #GtkNotebook which holds one or more #EphyTab:s.
@@ -50,6 +74,31 @@ EphyTab
 mozilla-embed-event
 
 
+<!-- ##### FUNCTION Detach ##### -->
+<para>
+
+</para>
+
+@Returns: 
+
+<!-- ##### MACRO EPHY_CONTENT_POLICY_CID ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### MACRO EPHY_CONTENT_POLICY_CLASSNAME ##### -->
+<para>
+
+</para>
+
+
+<!-- ##### MACRO EPHY_CONTENT_POLICY_CONTRACTID ##### -->
+<para>
+
+</para>
+
+
 <!-- ##### MACRO EPHY_EMBED_SINGLE_IFACE ##### -->
 <para>
 
@@ -156,6 +205,15 @@ Represents the state of an #EphyEmbed with regards to networking negotiations.
 @aSubject: 
 @Returns: 
 
+<!-- ##### FUNCTION EmitPermissionNotification ##### -->
+<para>
+
+</para>
+
+@name: 
+@aSubject: 
+@Returns: 
+
 <!-- ##### ENUM EphyCookieP3PPolicy ##### -->
 <para>
 
@@ -428,6 +486,14 @@ Represents the state of an #EphyEmbed with regards to networking negotiations.
 </para>
 
 
+<!-- ##### FUNCTION Init ##### -->
+<para>
+
+</para>
+
+@aHistory: 
+@Returns: 
+
 <!-- ##### FUNCTION ephy_embed_activate ##### -->
 <para>
 
@@ -869,6 +935,14 @@ Represents the state of an #EphyEmbed with regards to networking negotiations.
 @window: 
 @enabled: 
 
+<!-- ##### FUNCTION mozilla_cookie_to_ephy_cookie ##### -->
+<para>
+
+</para>
+
+@cookie: 
+@Returns: 
+
 <!-- ##### FUNCTION mozilla_embed_event_new ##### -->
 <para>
 
@@ -886,3 +960,11 @@ Represents the state of an #EphyEmbed with regards to networking negotiations.
 @name: 
 @value: 
 
+<!-- ##### FUNCTION mozilla_permission_to_ephy_permission ##### -->
+<para>
+
+</para>
+
+@perm: 
+@Returns: 
+
diff --git a/embed/Makefile.am b/embed/Makefile.am
index b472219bf..1640334d8 100644
--- a/embed/Makefile.am
+++ b/embed/Makefile.am
@@ -107,6 +107,7 @@ ephy-embed-type-builtins.c: stamp-ephy-embed-type-builtins.c Makefile
 	@true
 stamp-ephy-embed-type-builtins.c: Makefile $(INST_H_FILES)
 	$(GLIB_MKENUMS) \
+		--fhead "#include <config.h>\n\n" \
 		--fhead "#include \"ephy-embed-type-builtins.h\"\n\n" \
 		--fprod "\n/* enumerations from \"@filename@\" */" \
 		--fprod "\n#include \"@filename@\"" \
@@ -127,6 +128,9 @@ ephy-embed-type-builtins.h: stamp-ephy-embed-type-builtins.h Makefile
 	@true
 stamp-ephy-embed-type-builtins.h: Makefile $(INST_H_FILES)
 	$(GLIB_MKENUMS) \
+		--fhead "#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)\n" \
+		--fhead "#error Only <epiphany/epiphany.h> can be included directly.\n" \
+		--fhead "#endif\n\n" \
 		--fhead "#ifndef EPHY_EMBED_TYPE_BUILTINS_H\n" \
 		--fhead "#define EPHY_EMBED_TYPE_BUILTINS_H 1\n\n" \
 		--fhead "#include <glib-object.h>\n\n" \
diff --git a/embed/ephy-adblock-manager.h b/embed/ephy-adblock-manager.h
index d6687fa2f..e13b51890 100644
--- a/embed/ephy-adblock-manager.h
+++ b/embed/ephy-adblock-manager.h
@@ -20,6 +20,10 @@
  *  $Id$
  */
 
+#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
+#error "Only <epiphany/epiphany.h> can be included directly."
+#endif
+
 #ifndef EPHY_ADBLOCK_MANAGER_H
 #define EPHY_ADBLOCK_MANAGER_H
 
diff --git a/embed/ephy-adblock.h b/embed/ephy-adblock.h
index 4ecadd25e..4df48e605 100644
--- a/embed/ephy-adblock.h
+++ b/embed/ephy-adblock.h
@@ -20,6 +20,10 @@
  *  $Id$
  */
 
+#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
+#error "Only <epiphany/epiphany.h> can be included directly."
+#endif
+
 #ifndef EPHY_ADBLOCK_H
 #define EPHY_ADBLOCK_H
 
diff --git a/embed/ephy-base-embed.h b/embed/ephy-base-embed.h
index 1f439afff..d2043a8b9 100644
--- a/embed/ephy-base-embed.h
+++ b/embed/ephy-base-embed.h
@@ -81,4 +81,8 @@ void  ephy_base_embed_set_visibility (EphyBaseEmbed *embed,
 
 G_END_DECLS
 
+#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
+#error "Only <epiphany/epiphany.h> can be included directly."
+#endif
+
 #endif /* __EPHY_BASE_EMBED_H__ */
diff --git a/embed/ephy-command-manager.h b/embed/ephy-command-manager.h
index 0e34c9567..c2b55e138 100644
--- a/embed/ephy-command-manager.h
+++ b/embed/ephy-command-manager.h
@@ -18,6 +18,10 @@
  *  $Id$
  */
 
+#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
+#error "Only <epiphany/epiphany.h> can be included directly."
+#endif
+
 #ifndef EPHY_COMMAND_MANAGER_H
 #define EPHY_COMMAND_MANAGER_H
 
diff --git a/embed/ephy-cookie-manager.h b/embed/ephy-cookie-manager.h
index bc8069ed3..58d8788bd 100644
--- a/embed/ephy-cookie-manager.h
+++ b/embed/ephy-cookie-manager.h
@@ -19,6 +19,10 @@
  *  $Id$
  */
 
+#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
+#error "Only <epiphany/epiphany.h> can be included directly."
+#endif
+
 #ifndef EPHY_COOKIE_MANAGER_H
 #define EPHY_COOKIE_MANAGER_H
 
diff --git a/embed/ephy-download.h b/embed/ephy-download.h
index c89f2f9a3..53fec9dc6 100644
--- a/embed/ephy-download.h
+++ b/embed/ephy-download.h
@@ -18,6 +18,10 @@
  *  $Id$
  */
 
+#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
+#error "Only <epiphany/epiphany.h> can be included directly."
+#endif
+
 #ifndef EPHY_DOWNLOAD_H
 #define EPHY_DOWNLOAD_H
 
diff --git a/embed/ephy-embed-container.h b/embed/ephy-embed-container.h
index 1cb5565b1..8a502fdd0 100644
--- a/embed/ephy-embed-container.h
+++ b/embed/ephy-embed-container.h
@@ -17,6 +17,10 @@
  *
  */
 
+#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
+#error "Only <epiphany/epiphany.h> can be included directly."
+#endif
+
 #ifndef EPHY_EMBED_CONTAINER_H
 #define EPHY_EMBED_CONTAINER_H
 
diff --git a/embed/ephy-embed-dialog.h b/embed/ephy-embed-dialog.h
index 292b82698..2efb2be15 100644
--- a/embed/ephy-embed-dialog.h
+++ b/embed/ephy-embed-dialog.h
@@ -18,6 +18,10 @@
  *  $Id$
  */
 
+#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
+#error "Only <epiphany/epiphany.h> can be included directly."
+#endif
+
 #ifndef EPHY_EMBED_DIALOG_H
 #define EPHY_EMBED_DIALOG_H
 
diff --git a/embed/ephy-embed-event.h b/embed/ephy-embed-event.h
index f6e4bf177..c66dc5248 100644
--- a/embed/ephy-embed-event.h
+++ b/embed/ephy-embed-event.h
@@ -19,6 +19,10 @@
  *  $Id$
  */
 
+#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
+#error "Only <epiphany/epiphany.h> can be included directly."
+#endif
+
 #ifndef EPHY_EMBED_EVENT_H
 #define EPHY_EMBED_EVENT_H
 
diff --git a/embed/ephy-embed-factory.h b/embed/ephy-embed-factory.h
index fe0ed8f86..02bbc28cc 100644
--- a/embed/ephy-embed-factory.h
+++ b/embed/ephy-embed-factory.h
@@ -19,6 +19,10 @@
  *  $Id$
  */
 
+#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
+#error "Only <epiphany/epiphany.h> can be included directly."
+#endif
+
 #ifndef EPHY_EMBED_FACTORY_H
 #define EPHY_EMBED_FACTORY_H
 
diff --git a/embed/ephy-embed-find.h b/embed/ephy-embed-find.h
index 5d2536f96..7179e8abc 100644
--- a/embed/ephy-embed-find.h
+++ b/embed/ephy-embed-find.h
@@ -18,6 +18,10 @@
  *  $Id$
  */
 
+#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
+#error "Only <epiphany/epiphany.h> can be included directly."
+#endif
+
 #ifndef EPHY_EMBED_FIND_H
 #define EPHY_EMBED_FIND_H
 
diff --git a/embed/ephy-embed-persist.h b/embed/ephy-embed-persist.h
index b078a236a..a5f7a82f3 100644
--- a/embed/ephy-embed-persist.h
+++ b/embed/ephy-embed-persist.h
@@ -19,6 +19,10 @@
  *  $Id$
  */
 
+#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
+#error "Only <epiphany/epiphany.h> can be included directly."
+#endif
+
 #ifndef EPHY_EMBED_PERSIST_H
 #define EPHY_EMBED_PERSIST_H
 
diff --git a/embed/ephy-embed-prefs.h b/embed/ephy-embed-prefs.h
index fce0ed04d..0222c96cb 100644
--- a/embed/ephy-embed-prefs.h
+++ b/embed/ephy-embed-prefs.h
@@ -39,4 +39,8 @@
 #define CONF_RENDERING_FONT_MIN_SIZE_OLD "/apps/epiphany/web/font_min_size"
 #define CONF_RENDERING_FONT_TYPE_OLD "/apps/epiphany/web/default_font_type"
 
+#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
+#error "Only <epiphany/epiphany.h> can be included directly."
+#endif
+
 #define USER_STYLESHEET_FILENAME	"user-stylesheet.css"
diff --git a/embed/ephy-embed-shell.h b/embed/ephy-embed-shell.h
index 163f4f267..116116e4c 100644
--- a/embed/ephy-embed-shell.h
+++ b/embed/ephy-embed-shell.h
@@ -18,6 +18,10 @@
  *  $Id$
  */
 
+#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
+#error "Only <epiphany/epiphany.h> can be included directly."
+#endif
+
 #ifndef EPHY_EMBED_SHELL_H
 #define EPHY_EMBED_SHELL_H
 
diff --git a/embed/ephy-embed-single.h b/embed/ephy-embed-single.h
index 8ce865737..fb97d1d2f 100644
--- a/embed/ephy-embed-single.h
+++ b/embed/ephy-embed-single.h
@@ -18,6 +18,10 @@
  *  $Id$
  */
 
+#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
+#error "Only <epiphany/epiphany.h> can be included directly."
+#endif
+
 #ifndef EPHY_EMBED_SINGLE_H
 #define EPHY_EMBED_SINGLE_H
 
diff --git a/embed/ephy-embed-utils.h b/embed/ephy-embed-utils.h
index cb36073e6..7de058f53 100644
--- a/embed/ephy-embed-utils.h
+++ b/embed/ephy-embed-utils.h
@@ -22,6 +22,10 @@
  *  $Id: 
  */
 
+#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
+#error "Only <epiphany/epiphany.h> can be included directly."
+#endif
+
 #ifndef EPHY_EMBED_UTILS_H
 #define EPHY_EMBED_UTILS_H
 
diff --git a/embed/ephy-embed.h b/embed/ephy-embed.h
index ed3934c8f..55bf0821f 100644
--- a/embed/ephy-embed.h
+++ b/embed/ephy-embed.h
@@ -18,6 +18,10 @@
  *  $Id$
  */
 
+#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
+#error "Only <epiphany/epiphany.h> can be included directly."
+#endif
+
 #ifndef EPHY_EMBED_H
 #define EPHY_EMBED_H
 
diff --git a/embed/ephy-encodings.h b/embed/ephy-encodings.h
index 435b48b21..feb553127 100644
--- a/embed/ephy-encodings.h
+++ b/embed/ephy-encodings.h
@@ -18,6 +18,10 @@
  *  $Id$
  */
 
+#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
+#error "Only <epiphany/epiphany.h> can be included directly."
+#endif
+
 #ifndef EPHY_ENCODINGS_H
 #define EPHY_ENCODINGS_H
 
diff --git a/embed/ephy-favicon-cache.h b/embed/ephy-favicon-cache.h
index 9a6c0264f..d225e9b27 100644
--- a/embed/ephy-favicon-cache.h
+++ b/embed/ephy-favicon-cache.h
@@ -20,6 +20,10 @@
  *  $Id$
  */
 
+#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
+#error "Only <epiphany/epiphany.h> can be included directly."
+#endif
+
 #ifndef EPHY_FAVICON_CACHE_H
 #define EPHY_FAVICON_CACHE_H
 
diff --git a/embed/ephy-history-item.h b/embed/ephy-history-item.h
index 7ec7871d5..ec53a4b99 100644
--- a/embed/ephy-history-item.h
+++ b/embed/ephy-history-item.h
@@ -50,4 +50,8 @@ char*       ephy_history_item_get_title (EphyHistoryItem *item);
 
 G_END_DECLS
 
+#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
+#error "Only <epiphany/epiphany.h> can be included directly."
+#endif
+
 #endif /* __EPHY_HISTORY_ITEM_H__ */
diff --git a/embed/ephy-history.h b/embed/ephy-history.h
index feafefb7a..3bc7ad752 100644
--- a/embed/ephy-history.h
+++ b/embed/ephy-history.h
@@ -18,6 +18,10 @@
  *  $Id$
  */
 
+#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
+#error "Only <epiphany/epiphany.h> can be included directly."
+#endif
+
 #ifndef EPHY_HISTORY_H
 #define EPHY_HISTORY_H
 
diff --git a/embed/ephy-password-manager.h b/embed/ephy-password-manager.h
index 499ccc9cf..90dd90508 100644
--- a/embed/ephy-password-manager.h
+++ b/embed/ephy-password-manager.h
@@ -19,6 +19,10 @@
  *  $Id$
  */
 
+#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
+#error "Only <epiphany/epiphany.h> can be included directly."
+#endif
+
 #ifndef EPHY_PASSWORD_MANAGER_H
 #define EPHY_PASSWORD_MANAGER_H
 
diff --git a/embed/ephy-permission-manager.h b/embed/ephy-permission-manager.h
index 4457bcad5..884fbfcab 100644
--- a/embed/ephy-permission-manager.h
+++ b/embed/ephy-permission-manager.h
@@ -19,6 +19,10 @@
  *  $Id$
  */
 
+#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
+#error "Only <epiphany/epiphany.h> can be included directly."
+#endif
+
 #ifndef EPHY_PERMISSION_MANAGER_H
 #define EPHY_PERMISSION_MANAGER_H
 
diff --git a/embed/webkit/webkit-embed-persist.c b/embed/webkit/webkit-embed-persist.c
index 24b467d42..3298293af 100644
--- a/embed/webkit/webkit-embed-persist.c
+++ b/embed/webkit/webkit-embed-persist.c
@@ -18,6 +18,8 @@
  *
  */
 
+#include <config.h>
+
 #include "webkit-embed-persist.h"
 
 static void     webkit_embed_persist_class_init (WebKitEmbedPersistClass *klass);
diff --git a/embed/webkit/webkit-embed-prefs.c b/embed/webkit/webkit-embed-prefs.c
index f9e2a7efd..978be49fb 100644
--- a/embed/webkit/webkit-embed-prefs.c
+++ b/embed/webkit/webkit-embed-prefs.c
@@ -17,6 +17,8 @@
  *
  */
 
+#include <config.h>
+
 #include <glib.h>
 #include <webkit/webkit.h>
 
diff --git a/lib/Makefile.am b/lib/Makefile.am
index c3cd5a16d..eab56e942 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -133,6 +133,7 @@ ephy-lib-type-builtins.c: stamp-ephy-lib-type-builtins.c Makefile
 	@true
 stamp-ephy-lib-type-builtins.c: Makefile $(TYPES_H_FILES)
 	$(GLIB_MKENUMS) \
+		--fhead "#include <config.h>\n\n" \
 		--fhead "#include \"ephy-lib-type-builtins.h\"\n\n" \
 		--fprod "\n/* enumerations from \"@filename@\" */" \
 		--fprod "\n#include \"@filename@\"" \
@@ -153,6 +154,9 @@ ephy-lib-type-builtins.h: stamp-ephy-lib-type-builtins.h Makefile
 	@true
 stamp-ephy-lib-type-builtins.h: Makefile $(TYPES_H_FILES)
 	$(GLIB_MKENUMS) \
+		--fhead "#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)\n" \
+		--fhead "#error Only <epiphany/epiphany.h> can be included directly.\n" \
+		--fhead "#endif\n\n" \
 		--fhead "#ifndef EPHY_LIB_TYPE_BUILTINS_H\n" \
 		--fhead "#define EPHY_LIB_TYPE_BUILTINS_H 1\n\n" \
 		--fhead "#include <glib-object.h>\n\n" \
diff --git a/lib/egg/Makefile.am b/lib/egg/Makefile.am
index 206aa0184..9a7275373 100644
--- a/lib/egg/Makefile.am
+++ b/lib/egg/Makefile.am
@@ -62,6 +62,7 @@ eggtypebuiltins.c: stamp-eggtypebuiltins.c Makefile
 	@true
 stamp-eggtypebuiltins.c: Makefile $(EGGHEADERS)
 	$(GLIB_MKENUMS) \
+		--fhead "#include <config.h>\n\n" \
 		--fhead "#include \"eggtypebuiltins.h\"\n\n" \
 		--fprod "\n/* enumerations from \"@filename@\" */" \
 		--fprod "\n#include \"@filename@\"" \
diff --git a/lib/ephy-debug.h b/lib/ephy-debug.h
index 2257c11e1..7339339f9 100644
--- a/lib/ephy-debug.h
+++ b/lib/ephy-debug.h
@@ -18,6 +18,10 @@
  *  $Id$
  */
 
+#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
+#error "Only <epiphany/epiphany.h> can be included directly."
+#endif
+
 #ifndef EPHY_DEBUG_H
 #define EPHY_DEBUG_H
 
diff --git a/lib/ephy-dialog.h b/lib/ephy-dialog.h
index a9867d156..8abc6bb33 100644
--- a/lib/ephy-dialog.h
+++ b/lib/ephy-dialog.h
@@ -19,6 +19,10 @@
  *  $Id$
  */
 
+#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
+#error "Only <epiphany/epiphany.h> can be included directly."
+#endif
+
 #ifndef EPHY_DIALOG_H
 #define EPHY_DIALOG_H
 
diff --git a/lib/ephy-dnd.h b/lib/ephy-dnd.h
index fa2152d43..62e79823e 100644
--- a/lib/ephy-dnd.h
+++ b/lib/ephy-dnd.h
@@ -18,6 +18,10 @@
  *  $Id$
  */
 
+#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
+#error "Only <epiphany/epiphany.h> can be included directly."
+#endif
+
 #ifndef EPHY_DND_H
 #define EPHY_DND_H
 
diff --git a/lib/ephy-file-chooser.h b/lib/ephy-file-chooser.h
index 4bcd66f9a..e50f0817b 100644
--- a/lib/ephy-file-chooser.h
+++ b/lib/ephy-file-chooser.h
@@ -18,6 +18,10 @@
  *  $Id$
  */
 
+#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
+#error "Only <epiphany/epiphany.h> can be included directly."
+#endif
+
 #ifndef EPHY_FILE_CHOOSER_H
 #define EPHY_FILE_CHOOSER_H
 
diff --git a/lib/ephy-file-helpers.h b/lib/ephy-file-helpers.h
index 4bb9e3f59..362d232c2 100644
--- a/lib/ephy-file-helpers.h
+++ b/lib/ephy-file-helpers.h
@@ -20,6 +20,10 @@
  *  $Id$
  */
 
+#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
+#error "Only <epiphany/epiphany.h> can be included directly."
+#endif
+
 #ifndef EPHY_FILE_HELPERS_H
 #define EPHY_FILE_HELPERS_H
 
diff --git a/lib/ephy-glib-compat.h b/lib/ephy-glib-compat.h
index 7b966b2bd..9b445f029 100644
--- a/lib/ephy-glib-compat.h
+++ b/lib/ephy-glib-compat.h
@@ -18,6 +18,10 @@
  *  $Id: ephy-node-db.h 6588 2006-09-13 11:34:25Z chpe $
  */
 
+#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
+#error "Only <epiphany/epiphany.h> can be included directly."
+#endif
+
 #ifndef EPHY_GLIB_COMPAT_H
 #define EPHY_GLIB_COMPAT_H
 
diff --git a/lib/ephy-gui.h b/lib/ephy-gui.h
index ccf55a637..cd33d1cd6 100644
--- a/lib/ephy-gui.h
+++ b/lib/ephy-gui.h
@@ -18,6 +18,10 @@
  *  $Id$
  */
 
+#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
+#error "Only <epiphany/epiphany.h> can be included directly."
+#endif
+
 #ifndef EPHY_GUI_H
 #define EPHY_GUI_H
 
diff --git a/lib/ephy-langs.h b/lib/ephy-langs.h
index 4d9ad33bc..1b4ced268 100644
--- a/lib/ephy-langs.h
+++ b/lib/ephy-langs.h
@@ -19,6 +19,10 @@
  *  $Id$
  */
 
+#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
+#error "Only <epiphany/epiphany.h> can be included directly."
+#endif
+
 #ifndef EPHY_LANGS_H
 #define EPHY_LANGS_H
 
diff --git a/lib/ephy-loader.h b/lib/ephy-loader.h
index a424d0e4b..ca51085f2 100644
--- a/lib/ephy-loader.h
+++ b/lib/ephy-loader.h
@@ -19,6 +19,10 @@
  *  $Id$
  */
 
+#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
+#error "Only <epiphany/epiphany.h> can be included directly."
+#endif
+
 #ifndef EPHY_LOADER_H
 #define EPHY_LOADER_H
 
diff --git a/lib/ephy-module.h b/lib/ephy-module.h
index ef47007f3..985622bd3 100644
--- a/lib/ephy-module.h
+++ b/lib/ephy-module.h
@@ -19,6 +19,10 @@
  *  $Id$
  */
 
+#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
+#error "Only <epiphany/epiphany.h> can be included directly."
+#endif
+
 #ifndef EPHY_MODULE_H
 #define EPHY_MODULE_H
 
diff --git a/lib/ephy-node-common.h b/lib/ephy-node-common.h
index fe71bccf0..2434752f6 100644
--- a/lib/ephy-node-common.h
+++ b/lib/ephy-node-common.h
@@ -49,4 +49,8 @@ typedef enum
 	EPHY_NODE_NORMAL_PRIORITY
 } EphyNodePriority;
 
+#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
+#error "Only <epiphany/epiphany.h> can be included directly."
+#endif
+
 #endif /* EPHY_NODE_COMMON_H */
diff --git a/lib/ephy-node-db.h b/lib/ephy-node-db.h
index 352df05a2..7b4be83cb 100644
--- a/lib/ephy-node-db.h
+++ b/lib/ephy-node-db.h
@@ -20,6 +20,10 @@
  *  $Id$
  */
 
+#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
+#error "Only <epiphany/epiphany.h> can be included directly."
+#endif
+
 #ifndef EPHY_NODE_DB_H
 #define EPHY_NODE_DB_H
 
diff --git a/lib/ephy-node-filter.h b/lib/ephy-node-filter.h
index b9df6a444..39d0e7b4b 100644
--- a/lib/ephy-node-filter.h
+++ b/lib/ephy-node-filter.h
@@ -19,6 +19,10 @@
  *  $Id$
  */
 
+#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
+#error "Only <epiphany/epiphany.h> can be included directly."
+#endif
+
 #ifndef EPHY_NODE_FILTER_H
 #define EPHY_NODE_FILTER_H
 
diff --git a/lib/ephy-node.h b/lib/ephy-node.h
index d8e664a01..5e5cf04ed 100644
--- a/lib/ephy-node.h
+++ b/lib/ephy-node.h
@@ -20,6 +20,10 @@
  *  $Id$
  */
 
+#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
+#error "Only <epiphany/epiphany.h> can be included directly."
+#endif
+
 #ifndef EPHY_NODE_H
 #define EPHY_NODE_H
 
diff --git a/lib/ephy-object-helpers.h b/lib/ephy-object-helpers.h
index 3e0be968f..3774485a9 100644
--- a/lib/ephy-object-helpers.h
+++ b/lib/ephy-object-helpers.h
@@ -18,6 +18,10 @@
  *  $Id$
  */
 
+#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
+#error "Only <epiphany/epiphany.h> can be included directly."
+#endif
+
 #ifndef EPHY_OBJECT_HELPERS_H
 #define EPHY_OBJECT_HELPERS_H
 
diff --git a/lib/ephy-password-dialog.h b/lib/ephy-password-dialog.h
index 9c84a52ab..c69778d07 100644
--- a/lib/ephy-password-dialog.h
+++ b/lib/ephy-password-dialog.h
@@ -18,6 +18,10 @@
  *  $Id$
  */
 
+#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
+#error "Only <epiphany/epiphany.h> can be included directly."
+#endif
+
 #ifndef EPHY_PASSWORD_DIALOG_H
 #define EPHY_PASSWORD_DIALOG_H
 
diff --git a/lib/ephy-prefs.h b/lib/ephy-prefs.h
index f75336d9f..aa911af0c 100644
--- a/lib/ephy-prefs.h
+++ b/lib/ephy-prefs.h
@@ -18,6 +18,10 @@
  *  $Id$
  */
 
+#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
+#error "Only <epiphany/epiphany.h> can be included directly."
+#endif
+
 #ifndef EPHY_PREFS_H
 #define EPHY_PREFS_H
 
diff --git a/lib/ephy-print-utils.h b/lib/ephy-print-utils.h
index 551a0a968..2e21268f1 100644
--- a/lib/ephy-print-utils.h
+++ b/lib/ephy-print-utils.h
@@ -18,6 +18,10 @@
  *  $Id$
  */
 
+#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
+#error "Only <epiphany/epiphany.h> can be included directly."
+#endif
+
 #ifndef EPHY_PRINT_UTILS_H
 #define EPHY_PRINT_UTILS_H
 
diff --git a/lib/ephy-shlib-loader.h b/lib/ephy-shlib-loader.h
index 7def4cf53..d6612eae2 100644
--- a/lib/ephy-shlib-loader.h
+++ b/lib/ephy-shlib-loader.h
@@ -19,6 +19,10 @@
  *  $Id$
  */
 
+#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
+#error "Only <epiphany/epiphany.h> can be included directly."
+#endif
+
 #ifndef EPHY_SHLIB_LOADER_H
 #define EPHY_SHLIB_LOADER_H
 
diff --git a/lib/ephy-signal-accumulator.h b/lib/ephy-signal-accumulator.h
index fb8a2be91..33c378fb3 100644
--- a/lib/ephy-signal-accumulator.h
+++ b/lib/ephy-signal-accumulator.h
@@ -18,6 +18,10 @@
  *  $Id$
  */
 
+#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
+#error "Only <epiphany/epiphany.h> can be included directly."
+#endif
+
 #ifndef EPHY_SIGNAL_ACCUMULATORS_H
 #define EPHY_SIGNAL_ACCUMULATORS_H
 
diff --git a/lib/ephy-spell-check.h b/lib/ephy-spell-check.h
index e46e1bac3..792ead687 100644
--- a/lib/ephy-spell-check.h
+++ b/lib/ephy-spell-check.h
@@ -18,6 +18,10 @@
  *  $Id$
  */
 
+#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
+#error "Only <epiphany/epiphany.h> can be included directly."
+#endif
+
 #ifndef EPHY_SPELL_CHECK_H
 #define EPHY_SPELL_CHECK_H
 
diff --git a/lib/ephy-state.h b/lib/ephy-state.h
index b576d190e..26155ad9a 100644
--- a/lib/ephy-state.h
+++ b/lib/ephy-state.h
@@ -20,6 +20,10 @@
  *  $Id$
  */
 
+#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
+#error "Only <epiphany/epiphany.h> can be included directly."
+#endif
+
 #ifndef EPHY_STATE_H
 #define EPHY_STATE_H
 
diff --git a/lib/ephy-stock-icons.h b/lib/ephy-stock-icons.h
index f6220d9c9..9f8b86e0a 100644
--- a/lib/ephy-stock-icons.h
+++ b/lib/ephy-stock-icons.h
@@ -18,6 +18,10 @@
  *  $Id$
  */
 
+#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
+#error "Only <epiphany/epiphany.h> can be included directly."
+#endif
+
 #ifndef EPHY_STOCK_ICONS_H
 #define EPHY_STOCK_ICONS_H
 
diff --git a/lib/ephy-string.h b/lib/ephy-string.h
index de7ebe292..78ee97a09 100644
--- a/lib/ephy-string.h
+++ b/lib/ephy-string.h
@@ -18,6 +18,10 @@
  *  $Id$
  */
 
+#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
+#error "Only <epiphany/epiphany.h> can be included directly."
+#endif
+
 #ifndef EPHY_STRING_H
 #define EPHY_STRING_H
 
diff --git a/lib/ephy-time-helpers.h b/lib/ephy-time-helpers.h
index a91788479..8d6eddd98 100644
--- a/lib/ephy-time-helpers.h
+++ b/lib/ephy-time-helpers.h
@@ -23,6 +23,10 @@
 
 #include <time.h>
 
+#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
+#error "Only <epiphany/epiphany.h> can be included directly."
+#endif
+
 #ifndef EPHY_TIME_HELPERS_H
 #define EPHY_TIME_HELPERS_H
 
diff --git a/lib/ephy-zoom.h b/lib/ephy-zoom.h
index 4a007b6d6..1008d98ac 100644
--- a/lib/ephy-zoom.h
+++ b/lib/ephy-zoom.h
@@ -18,6 +18,10 @@
  *  $Id$
  */
 
+#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
+#error "Only <epiphany/epiphany.h> can be included directly."
+#endif
+
 #ifndef EPHY_ZOOM_H
 #define EPHY_ZOOM_H
 
diff --git a/lib/widgets/ephy-icon-entry.h b/lib/widgets/ephy-icon-entry.h
index d51671457..5e8008b76 100644
--- a/lib/widgets/ephy-icon-entry.h
+++ b/lib/widgets/ephy-icon-entry.h
@@ -27,6 +27,10 @@
  *  $Id$
  */
 
+#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
+#error "Only <epiphany/epiphany.h> can be included directly."
+#endif
+
 #ifndef EPHY_ICON_ENTRY_H
 #define EPHY_ICON_ENTRY_H
 
diff --git a/lib/widgets/ephy-location-entry.h b/lib/widgets/ephy-location-entry.h
index de6d35e57..73b7b8498 100644
--- a/lib/widgets/ephy-location-entry.h
+++ b/lib/widgets/ephy-location-entry.h
@@ -20,6 +20,10 @@
  *  $Id$
  */
 
+#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
+#error "Only <epiphany/epiphany.h> can be included directly."
+#endif
+
 #ifndef EPHY_LOCATION_ENTRY_H
 #define EPHY_LOCATION_ENTRY_H
 
diff --git a/lib/widgets/ephy-node-view.h b/lib/widgets/ephy-node-view.h
index 1d27a5e19..5a5453890 100644
--- a/lib/widgets/ephy-node-view.h
+++ b/lib/widgets/ephy-node-view.h
@@ -133,4 +133,8 @@ void	   ephy_node_view_popup		      (EphyNodeView *view,
 
 G_END_DECLS
 
+#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
+#error "Only <epiphany/epiphany.h> can be included directly."
+#endif
+
 #endif /* EPHY_NODE_VIEW_H */
diff --git a/lib/widgets/ephy-search-entry.h b/lib/widgets/ephy-search-entry.h
index abb90cc47..72ae570bd 100644
--- a/lib/widgets/ephy-search-entry.h
+++ b/lib/widgets/ephy-search-entry.h
@@ -18,6 +18,10 @@
  *  $Id$
  */
 
+#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
+#error "Only <epiphany/epiphany.h> can be included directly."
+#endif
+
 #ifndef EPHY_SEARCH_ENTRY_H
 #define EPHY_SEARCH_ENTRY_H
 
diff --git a/lib/widgets/ephy-spinner.h b/lib/widgets/ephy-spinner.h
index 87fad63c5..d04e00d85 100644
--- a/lib/widgets/ephy-spinner.h
+++ b/lib/widgets/ephy-spinner.h
@@ -22,6 +22,10 @@
  * $Id$
  */
 
+#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
+#error "Only <epiphany/epiphany.h> can be included directly."
+#endif
+
 #ifndef EPHY_SPINNER_H
 #define EPHY_SPINNER_H
 
diff --git a/lib/widgets/ephy-tree-model-node.h b/lib/widgets/ephy-tree-model-node.h
index 476301bef..a2567a3ef 100644
--- a/lib/widgets/ephy-tree-model-node.h
+++ b/lib/widgets/ephy-tree-model-node.h
@@ -73,4 +73,8 @@ void               ephy_tree_model_node_iter_from_node   (EphyTreeModelNode *mod
 
 G_END_DECLS
 
+#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
+#error "Only <epiphany/epiphany.h> can be included directly."
+#endif
+
 #endif /* EPHY_TREE_MODEL_NODE_H */
diff --git a/lib/widgets/ephy-tree-model-sort.h b/lib/widgets/ephy-tree-model-sort.h
index 103c36fa6..5260d9f87 100644
--- a/lib/widgets/ephy-tree-model-sort.h
+++ b/lib/widgets/ephy-tree-model-sort.h
@@ -17,6 +17,10 @@
  *  $Id$
  */
 
+#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
+#error "Only <epiphany/epiphany.h> can be included directly."
+#endif
+
 #ifndef EPHY_TREE_MODEL_SORT_H
 #define EPHY_TREE_MODEL_SORT_H
 
diff --git a/lib/widgets/ephy-zoom-action.h b/lib/widgets/ephy-zoom-action.h
index 169c1e48d..2c91c7c59 100644
--- a/lib/widgets/ephy-zoom-action.h
+++ b/lib/widgets/ephy-zoom-action.h
@@ -19,6 +19,10 @@
  *  $Id$
  */
 
+#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
+#error "Only <epiphany/epiphany.h> can be included directly."
+#endif
+
 #ifndef EPHY_ZOOM_ACTION_H
 #define EPHY_ZOOM_ACTION_H
 
diff --git a/lib/widgets/ephy-zoom-control.h b/lib/widgets/ephy-zoom-control.h
index 0b7163258..381d8a7aa 100644
--- a/lib/widgets/ephy-zoom-control.h
+++ b/lib/widgets/ephy-zoom-control.h
@@ -18,6 +18,10 @@
  *  $Id$
  */
 
+#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
+#error "Only <epiphany/epiphany.h> can be included directly."
+#endif
+
 #ifndef EPHY_ZOOM_CONTROL_H
 #define EPHY_ZOOM_CONTROL_H