[epiphany] Remove vestiges of public API
- From: Michael Catanzaro <mcatanzaro src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [epiphany] Remove vestiges of public API
- Date: Mon, 8 Feb 2016 13:16:28 +0000 (UTC)
commit 18dc1e1fc79a9c76c5ce13f34fc8c39cee4bf2dc
Author: Michael Catanzaro <mcatanzaro igalia com>
Date: Sun Feb 7 22:43:45 2016 -0600
Remove vestiges of public API
It's been gone for years, and it's not coming back. If we support
extensions in the future, it would be via the WebExtensions API.
This makes me less annoyed by having to maintain a meaningless
distinction between installed and non-installed header files (it's been
years since any headers were installed). It also makes me less annoyed
by having to look at meaningless direct-inclusion guards. And finally,
it makes me less annoyed because each time I see those direct-inclusion
guards, I think of how they really ought to be inside the normal include
guards, rather than outside, to avoid breaking GCC and Clang's
optimization to avoid unnecessarily reading the contents of the header
file. (WebKit gets this wrong, too.) You can thank me if this makes
Epiphany compile 0.1s or so faster for you.
There are no useful changes in this commit.
https://bugzilla.gnome.org/show_bug.cgi?id=761698
configure.ac | 2 -
embed/Makefile.am | 45 ++++++++----------
embed/ephy-download.h | 4 --
embed/ephy-embed-container.h | 4 --
embed/ephy-embed-event.h | 4 --
embed/ephy-embed-prefs.h | 4 --
embed/ephy-embed-private.h | 4 --
embed/ephy-embed-shell.h | 4 --
embed/ephy-embed-utils.h | 4 --
embed/ephy-encoding.h | 4 --
embed/ephy-encodings.h | 4 --
embed/ephy-file-monitor.h | 4 --
embed/ephy-find-toolbar.h | 4 --
embed/ephy-web-extension-proxy.h | 4 --
embed/ephy-web-view.h | 4 --
embed/web-extension/ephy-web-dom-utils.h | 5 +--
lib/Makefile.am | 63 ++++++++++--------------
lib/ephy-debug.h | 4 --
lib/ephy-dnd.h | 4 --
lib/ephy-favicon-helpers.h | 4 --
lib/ephy-file-helpers.h | 4 --
lib/ephy-gui.h | 4 --
lib/ephy-initial-state.h | 4 --
lib/ephy-langs.h | 4 --
lib/ephy-node-common.h | 4 --
lib/ephy-node-db.h | 4 --
lib/ephy-node-filter.h | 4 --
lib/ephy-node.h | 4 --
lib/ephy-prefs.h | 4 --
lib/ephy-security-levels.h | 4 --
lib/ephy-settings.h | 4 --
lib/ephy-signal-accumulator.h | 4 --
lib/ephy-string.h | 4 --
lib/ephy-time-helpers.h | 8 +--
lib/ephy-uri-helpers.h | 4 --
lib/ephy-web-app-utils.h | 4 --
lib/ephy-zoom.h | 4 --
lib/history/Makefile.am | 3 -
lib/widgets/Makefile.am | 3 -
lib/widgets/ephy-certificate-dialog.h | 4 --
lib/widgets/ephy-download-widget.h | 4 --
lib/widgets/ephy-file-chooser.h | 4 --
lib/widgets/ephy-location-entry.h | 4 --
lib/widgets/ephy-middle-clickable-button.h | 4 --
lib/widgets/ephy-node-view.h | 4 --
lib/widgets/ephy-security-popover.h | 4 --
lib/widgets/ephy-tree-model-node.h | 4 --
lib/widgets/ephy-tree-model-sort.h | 4 --
lib/widgets/ephy-zoom-action.h | 4 --
src/Makefile.am | 73 ++++++++++++++--------------
src/bookmarks/Makefile.am | 44 +++++++----------
src/bookmarks/ephy-bookmark-action-group.h | 4 --
src/bookmarks/ephy-bookmark-action.h | 4 --
src/bookmarks/ephy-bookmark-properties.h | 4 --
src/bookmarks/ephy-bookmarks-editor.h | 4 --
src/bookmarks/ephy-bookmarks-export.h | 4 --
src/bookmarks/ephy-bookmarks-import.h | 4 --
src/bookmarks/ephy-bookmarks-menu.h | 4 --
src/bookmarks/ephy-bookmarks-ui.h | 4 --
src/bookmarks/ephy-bookmarks.h | 4 --
src/bookmarks/ephy-nodes-cover.h | 4 --
src/bookmarks/ephy-open-tabs-action.h | 4 --
src/bookmarks/ephy-topic-action-group.h | 4 --
src/bookmarks/ephy-topic-action.h | 4 --
src/bookmarks/ephy-topics-entry.h | 4 --
src/bookmarks/ephy-topics-palette.h | 4 --
src/ephy-action-helper.h | 4 --
src/ephy-completion-model.h | 4 --
src/ephy-encoding-dialog.h | 4 --
src/ephy-history-window.h | 4 --
src/ephy-home-action.h | 4 --
src/ephy-link-action.h | 4 --
src/ephy-link.h | 4 --
src/ephy-location-controller.h | 4 --
src/ephy-lockdown.h | 4 --
src/ephy-navigation-history-action.h | 4 --
src/ephy-notebook.h | 4 --
src/ephy-private.h | 4 --
src/ephy-session.h | 4 --
src/ephy-shell.h | 4 --
src/ephy-toolbar.h | 4 --
src/ephy-window-action.h | 4 --
src/ephy-window.h | 4 --
src/window-commands.h | 4 --
84 files changed, 103 insertions(+), 443 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index e140eeb..e8889db 100644
--- a/configure.ac
+++ b/configure.ac
@@ -212,8 +212,6 @@ AC_DEFINE_UNQUOTED([LSB_DISTRIBUTOR],["$LSB_DISTRIBUTOR"],[Distributor name])
# Output files
# ************
-AC_DEFINE([EPIPHANY_COMPILATION],[1],[Compiling epiphany])
-
AC_CONFIG_FILES([
Makefile
data/Makefile
diff --git a/embed/Makefile.am b/embed/Makefile.am
index 2f9bd4f..8969e1b 100644
--- a/embed/Makefile.am
+++ b/embed/Makefile.am
@@ -7,26 +7,10 @@ AM_LDFLAGS = $(WARN_LDFLAGS)
noinst_LTLIBRARIES = libephyembed.la
-NOINST_H_FILES = \
- ephy-about-handler.h \
- ephy-downloads-manager.h \
- ephy-embed-private.h \
- ephy-encoding.h \
- ephy-encodings.h \
- ephy-file-monitor.h
-
-INST_H_FILES = \
+TYPES_H_FILES = \
ephy-download.h \
- ephy-embed.h \
- ephy-embed-container.h \
- ephy-embed-event.h \
- ephy-embed-prefs.h \
ephy-embed-shell.h \
- ephy-embed-utils.h \
- ephy-find-toolbar.h \
- ephy-web-view.h \
- ephy-web-extension-proxy.h
-
+ ephy-web-view.h
BUILT_SOURCES = \
ephy-embed-type-builtins.c \
@@ -34,22 +18,36 @@ BUILT_SOURCES = \
libephyembed_la_SOURCES = \
ephy-about-handler.c \
+ ephy-about-handler.h \
ephy-downloads-manager.c \
+ ephy-downloads-manager.h \
ephy-download.c \
+ ephy-download.h \
ephy-embed.c \
+ ephy-embed.h \
ephy-embed-container.c \
+ ephy-embed-container.h \
ephy-embed-event.c \
+ ephy-embed-event.h \
+ ephy-embed-prefs.h \
+ ephy-embed-private.h \
ephy-embed-shell.c \
+ ephy-embed-shell.h \
ephy-embed-utils.c \
+ ephy-embed-utils.h \
ephy-encoding.c \
+ ephy-encoding.h \
ephy-encodings.c \
+ ephy-encodings.h \
ephy-file-monitor.c \
+ ephy-file-monitor.h \
ephy-find-toolbar.c \
+ ephy-find-toolbar.h \
ephy-embed-prefs.c \
ephy-web-view.c \
+ ephy-web-view.h \
ephy-web-extension-proxy.c \
- $(INST_H_FILES) \
- $(NOINST_H_FILES)
+ ephy-web-extension-proxy.h
nodist_libephyembed_la_SOURCES = \
$(BUILT_SOURCES)
@@ -80,7 +78,7 @@ stamp_files = \
ephy-embed-type-builtins.c: stamp-ephy-embed-type-builtins.c Makefile
@true
-stamp-ephy-embed-type-builtins.c: Makefile $(INST_H_FILES)
+stamp-ephy-embed-type-builtins.c: Makefile $(TYPES_H_FILES)
$(AM_V_GEN) $(GLIB_MKENUMS) \
--fhead "#include <config.h>\n\n" \
--fhead "#include \"ephy-embed-type-builtins.h\"\n\n" \
@@ -101,11 +99,8 @@ stamp-ephy-embed-type-builtins.c: Makefile $(INST_H_FILES)
ephy-embed-type-builtins.h: stamp-ephy-embed-type-builtins.h Makefile
@true
-stamp-ephy-embed-type-builtins.h: Makefile $(INST_H_FILES)
+stamp-ephy-embed-type-builtins.h: Makefile $(TYPES_H_FILES)
$(AM_V_GEN) $(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-download.h b/embed/ephy-download.h
index 546bd63..8958d07 100644
--- a/embed/ephy-download.h
+++ b/embed/ephy-download.h
@@ -20,10 +20,6 @@
* along with Epiphany. If not, see <http://www.gnu.org/licenses/>.
*/
-#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 1a50496..596b7ae 100644
--- a/embed/ephy-embed-container.h
+++ b/embed/ephy-embed-container.h
@@ -15,10 +15,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#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-event.h b/embed/ephy-embed-event.h
index 7226408..f208102 100644
--- a/embed/ephy-embed-event.h
+++ b/embed/ephy-embed-event.h
@@ -18,10 +18,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#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-prefs.h b/embed/ephy-embed-prefs.h
index 5c31f50..500c440 100644
--- a/embed/ephy-embed-prefs.h
+++ b/embed/ephy-embed-prefs.h
@@ -23,10 +23,6 @@
#include <webkit2/webkit2.h>
-#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"
#define FAVICON_SIZE 16
diff --git a/embed/ephy-embed-private.h b/embed/ephy-embed-private.h
index aefd910..a591125 100644
--- a/embed/ephy-embed-private.h
+++ b/embed/ephy-embed-private.h
@@ -16,10 +16,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
-#error "Only <epiphany/epiphany.h> can be included directly."
-#endif
-
#include "ephy-embed-shell.h"
#include "ephy-history-types.h"
#include "ephy-web-view.h"
diff --git a/embed/ephy-embed-shell.h b/embed/ephy-embed-shell.h
index f49a1ea..1617d45 100644
--- a/embed/ephy-embed-shell.h
+++ b/embed/ephy-embed-shell.h
@@ -17,10 +17,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#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-utils.h b/embed/ephy-embed-utils.h
index 4251212..64841c3 100644
--- a/embed/ephy-embed-utils.h
+++ b/embed/ephy-embed-utils.h
@@ -19,10 +19,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#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-encoding.h b/embed/ephy-encoding.h
index 2b0c41f..728a1e4 100644
--- a/embed/ephy-encoding.h
+++ b/embed/ephy-encoding.h
@@ -16,10 +16,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
-#error "Only <epiphany/epiphany.h> can be included directly."
-#endif
-
#ifndef EPHY_ENCODING_H
#define EPHY_ENCODING_H
diff --git a/embed/ephy-encodings.h b/embed/ephy-encodings.h
index b72904a..980fc09 100644
--- a/embed/ephy-encodings.h
+++ b/embed/ephy-encodings.h
@@ -17,10 +17,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#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-file-monitor.h b/embed/ephy-file-monitor.h
index 75d77f7..b232175 100644
--- a/embed/ephy-file-monitor.h
+++ b/embed/ephy-file-monitor.h
@@ -17,10 +17,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
-#error "Only <epiphany/epiphany.h> can be included directly."
-#endif
-
#ifndef EPHY_FILE_MONITOR_H
#define EPHY_FILE_MONITOR_H
diff --git a/embed/ephy-find-toolbar.h b/embed/ephy-find-toolbar.h
index 07e06bc..3a1985e 100644
--- a/embed/ephy-find-toolbar.h
+++ b/embed/ephy-find-toolbar.h
@@ -16,10 +16,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
-#error "Only <epiphany/epiphany.h> can be included directly."
-#endif
-
#ifndef EPHY_FIND_TOOLBAR_H
#define EPHY_FIND_TOOLBAR_H
diff --git a/embed/ephy-web-extension-proxy.h b/embed/ephy-web-extension-proxy.h
index 1dac674..a80e8bf 100644
--- a/embed/ephy-web-extension-proxy.h
+++ b/embed/ephy-web-extension-proxy.h
@@ -16,10 +16,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
-#error "Only <epiphany/epiphany.h> can be included directly."
-#endif
-
#ifndef EPHY_WEB_EXTENSION_PROXY_H
#define EPHY_WEB_EXTENSION_PROXY_H
diff --git a/embed/ephy-web-view.h b/embed/ephy-web-view.h
index 26c4e04..91480d4 100644
--- a/embed/ephy-web-view.h
+++ b/embed/ephy-web-view.h
@@ -18,10 +18,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
-#error "Only <epiphany/epiphany.h> can be included directly."
-#endif
-
#ifndef EPHY_WEB_VIEW_H
#define EPHY_WEB_VIEW_H
diff --git a/embed/web-extension/ephy-web-dom-utils.h b/embed/web-extension/ephy-web-dom-utils.h
index 9339c83..3d05af1 100644
--- a/embed/web-extension/ephy-web-dom-utils.h
+++ b/embed/web-extension/ephy-web-dom-utils.h
@@ -15,10 +15,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
-#error "Only <epiphany/epiphany.h> can be included directly."
-#endif
-
#ifndef EPHY_WEB_DOM_UTILS_H
#define EPHY_WEB_DOM_UTILS_H
@@ -50,6 +46,7 @@ void ephy_web_dom_utils_get_absolute_position_for_element(WebKitDOMElement *elem
double *y);
char *ephy_web_dom_utils_get_selection_as_string (WebKitDOMDOMSelection *selection);
+
G_END_DECLS
#endif
diff --git a/lib/Makefile.am b/lib/Makefile.am
index f0dcfc5..e8e96b5 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -5,73 +5,63 @@ AM_LDFLAGS = $(WARN_LDFLAGS)
noinst_LTLIBRARIES = libephymisc.la
-NOINST_H_FILES = \
- ephy-debug.h \
- ephy-dnd.h \
- ephy-favicon-helpers.h \
- ephy-file-helpers.h \
- ephy-form-auth-data.h \
- ephy-gui.h \
- ephy-langs.h \
- ephy-node-filter.h \
- ephy-node-common.h \
- ephy-prefs.h \
- ephy-profile-utils.h \
- ephy-security-levels.h \
- ephy-signal-accumulator.h \
- ephy-smaps.h \
- ephy-sqlite.h \
- ephy-sqlite-connection.h \
- ephy-sqlite-statement.h \
- ephy-string.h \
- ephy-snapshot-service.h \
- ephy-time-helpers.h \
- ephy-uri-helpers.h \
- ephy-web-app-utils.h \
- ephy-zoom.h
-
TYPES_H_FILES = \
ephy-initial-state.h \
ephy-node.h \
ephy-security-levels.h
-INST_H_FILES = \
- ephy-initial-state.h \
- ephy-node.h \
- ephy-node-db.h \
- ephy-settings.h
-
libephymisc_la_SOURCES = \
ephy-debug.c \
+ ephy-debug.h \
ephy-dnd.c \
+ ephy-dnd.h \
ephy-favicon-helpers.c \
+ ephy-favicon-helpers.h \
ephy-file-helpers.c \
+ ephy-file-helpers.h \
ephy-form-auth-data.c \
+ ephy-form-auth-data.h \
ephy-gui.c \
+ ephy-gui.h \
ephy-initial-state.c \
+ ephy-initial-state.h \
ephy-langs.c \
+ ephy-langs.h \
ephy-node.c \
ephy-node.h \
- ephy-node-filter.c \
ephy-node-common.h \
+ ephy-node-filter.c \
+ ephy-node-filter.h \
ephy-node-db.c \
+ ephy-node-db.h \
ephy-prefs.h \
ephy-profile-utils.c \
ephy-profile-utils.h \
ephy-security-levels.c \
+ ephy-security-levels.h \
ephy-settings.c \
+ ephy-settings.h \
ephy-signal-accumulator.c \
+ ephy-signal-accumulator.h \
ephy-smaps.c \
+ ephy-smaps.h \
ephy-snapshot-service.c \
+ ephy-snapshot-service.h \
+ ephy-sqlite.h \
ephy-sqlite-connection.c \
+ ephy-sqlite-connection.h \
ephy-sqlite-statement.c \
+ ephy-sqlite-statement.h \
ephy-string.c \
+ ephy-string.h \
ephy-time-helpers.c \
+ ephy-time-helpers.h \
ephy-uri-helpers.c \
+ ephy-uri-helpers.h \
ephy-web-app-utils.c \
+ ephy-web-app-utils.h \
ephy-zoom.c \
- $(INST_H_FILES) \
- $(NOINST_H_FILES)
+ ephy-zoom.h
nodist_libephymisc_la_SOURCES = \
$(BUILT_SOURCES)
@@ -79,7 +69,7 @@ nodist_libephymisc_la_SOURCES = \
libephymisc_la_CPPFLAGS = \
-I$(top_builddir)/lib \
-I$(top_srcdir)/lib/egg \
- -DDATADIR="\"$(datadir)\"" \
+ -DDATADIR=\"$(datadir)\" \
-DSHARE_DIR=\"$(pkgdatadir)\" \
-DTOP_SRC_DATADIR=\"$(top_srcdir)/data\" \
-DABS_TOP_BUILD_DIR=\"$(abs_top_builddir)\" \
@@ -161,9 +151,6 @@ ephy-lib-type-builtins.h: stamp-ephy-lib-type-builtins.h Makefile
@true
stamp-ephy-lib-type-builtins.h: Makefile $(TYPES_H_FILES)
$(AM_V_GEN) $(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/ephy-debug.h b/lib/ephy-debug.h
index c7d96e7..4225642 100644
--- a/lib/ephy-debug.h
+++ b/lib/ephy-debug.h
@@ -15,10 +15,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#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-dnd.h b/lib/ephy-dnd.h
index b2462e7..275740a 100644
--- a/lib/ephy-dnd.h
+++ b/lib/ephy-dnd.h
@@ -15,10 +15,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#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-favicon-helpers.h b/lib/ephy-favicon-helpers.h
index 3fcee37..8ae228f 100644
--- a/lib/ephy-favicon-helpers.h
+++ b/lib/ephy-favicon-helpers.h
@@ -15,10 +15,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
-#error "Only <epiphany/epiphany.h> can be included directly."
-#endif
-
#ifndef EPHY_FAVICON_HELPERS_H
#define EPHY_FAVICON_HELPERS_H
diff --git a/lib/ephy-file-helpers.h b/lib/ephy-file-helpers.h
index f10fd3c..650ff0f 100644
--- a/lib/ephy-file-helpers.h
+++ b/lib/ephy-file-helpers.h
@@ -17,10 +17,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#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-gui.h b/lib/ephy-gui.h
index fc3466a..f10a794 100644
--- a/lib/ephy-gui.h
+++ b/lib/ephy-gui.h
@@ -15,10 +15,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#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-initial-state.h b/lib/ephy-initial-state.h
index 9ffa0af..74d7a8a 100644
--- a/lib/ephy-initial-state.h
+++ b/lib/ephy-initial-state.h
@@ -18,10 +18,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#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-langs.h b/lib/ephy-langs.h
index 56964d9..bfe82d1 100644
--- a/lib/ephy-langs.h
+++ b/lib/ephy-langs.h
@@ -16,10 +16,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#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-node-common.h b/lib/ephy-node-common.h
index 9f92d79..7c5b372 100644
--- a/lib/ephy-node-common.h
+++ b/lib/ephy-node-common.h
@@ -46,8 +46,4 @@ 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 c0c0821..88ff698 100644
--- a/lib/ephy-node-db.h
+++ b/lib/ephy-node-db.h
@@ -17,10 +17,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#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 c9703ea..67f21de 100644
--- a/lib/ephy-node-filter.h
+++ b/lib/ephy-node-filter.h
@@ -16,10 +16,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#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 254ca75..14b43ce 100644
--- a/lib/ephy-node.h
+++ b/lib/ephy-node.h
@@ -17,10 +17,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#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-prefs.h b/lib/ephy-prefs.h
index 58cc5fa..5f01c9d 100644
--- a/lib/ephy-prefs.h
+++ b/lib/ephy-prefs.h
@@ -17,10 +17,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#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-security-levels.h b/lib/ephy-security-levels.h
index f2774f2..033f330 100644
--- a/lib/ephy-security-levels.h
+++ b/lib/ephy-security-levels.h
@@ -17,10 +17,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
-#error "Only <epiphany/epiphany.h> can be included directly."
-#endif
-
#ifndef EPHY_SECURITY_LEVELS_H
#define EPHY_SECURITY_LEVELS_H
diff --git a/lib/ephy-settings.h b/lib/ephy-settings.h
index 8ecb36a..e05821e 100644
--- a/lib/ephy-settings.h
+++ b/lib/ephy-settings.h
@@ -17,10 +17,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
-#error "Only <epiphany/epiphany.h> can be included directly."
-#endif
-
#ifndef EPHY_SETTINGS_H
#define EPHY_SETTINGS_H
diff --git a/lib/ephy-signal-accumulator.h b/lib/ephy-signal-accumulator.h
index 4a01a56..68a0f50 100644
--- a/lib/ephy-signal-accumulator.h
+++ b/lib/ephy-signal-accumulator.h
@@ -15,10 +15,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#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-string.h b/lib/ephy-string.h
index 59630bc..04a5be0 100644
--- a/lib/ephy-string.h
+++ b/lib/ephy-string.h
@@ -15,10 +15,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#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 ff00c1e..19a6cac 100644
--- a/lib/ephy-time-helpers.h
+++ b/lib/ephy-time-helpers.h
@@ -19,15 +19,11 @@
/* Following code is copied from Rhythmbox rb-cut-and-paste-code.h */
-#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
+#include <time.h>
+
G_BEGIN_DECLS
char *eel_strdup_strftime (const char *format,
diff --git a/lib/ephy-uri-helpers.h b/lib/ephy-uri-helpers.h
index 6e14678..31f2aa4 100644
--- a/lib/ephy-uri-helpers.h
+++ b/lib/ephy-uri-helpers.h
@@ -16,10 +16,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
-#error "Only <epiphany/epiphany.h> can be included directly."
-#endif
-
#ifndef EPHY_URI_HELPERS_H
#define EPHY_URI_HELPERS_H
diff --git a/lib/ephy-web-app-utils.h b/lib/ephy-web-app-utils.h
index 4b1299a..8b92a24 100644
--- a/lib/ephy-web-app-utils.h
+++ b/lib/ephy-web-app-utils.h
@@ -15,10 +15,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
-#error "Only <epiphany/epiphany.h> can be included directly."
-#endif
-
#ifndef EPHY_WEB_APP_UTILS_H
#define EPHY_WEB_APP_UTILS_H
diff --git a/lib/ephy-zoom.h b/lib/ephy-zoom.h
index acfc3be..1e0afc8 100644
--- a/lib/ephy-zoom.h
+++ b/lib/ephy-zoom.h
@@ -16,10 +16,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#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/history/Makefile.am b/lib/history/Makefile.am
index cccfd27..ab4f3af 100644
--- a/lib/history/Makefile.am
+++ b/lib/history/Makefile.am
@@ -67,9 +67,6 @@ ephy-history-type-builtins.h: stamp-ephy-history-type-builtins.h Makefile
stamp-ephy-history-type-builtins.h: Makefile $(TYPES_H_FILES)
$(AM_V_GEN) $(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_HISTORY_TYPE_BUILTINS_H\n" \
--fhead "#define EPHY_HISTORY_TYPE_BUILTINS_H 1\n\n" \
--fhead "#include <glib-object.h>\n\n" \
diff --git a/lib/widgets/Makefile.am b/lib/widgets/Makefile.am
index 9d501eb..0d78f8c 100644
--- a/lib/widgets/Makefile.am
+++ b/lib/widgets/Makefile.am
@@ -43,9 +43,6 @@ ephy-widgets-type-builtins.h: stamp-ephy-widgets-type-builtins.h Makefile
stamp-ephy-widgets-type-builtins.h: Makefile $(TYPES_H_FILES)
$(AM_V_GEN) $(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_WIDGETS_TYPE_BUILTINS_H\n" \
--fhead "#define EPHY_WIDGETS_TYPE_BUILTINS_H 1\n\n" \
--fhead "#include <glib-object.h>\n\n" \
diff --git a/lib/widgets/ephy-certificate-dialog.h b/lib/widgets/ephy-certificate-dialog.h
index af55ba3..f0a31dc 100644
--- a/lib/widgets/ephy-certificate-dialog.h
+++ b/lib/widgets/ephy-certificate-dialog.h
@@ -15,10 +15,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
-#error "Only <epiphany/epiphany.h> can be included directly."
-#endif
-
#ifndef EPHY_CERTIFICATE_DIALOG_H
#define EPHY_CERTIFICATE_DIALOG_H
diff --git a/lib/widgets/ephy-download-widget.h b/lib/widgets/ephy-download-widget.h
index 372d314..bf1335b 100644
--- a/lib/widgets/ephy-download-widget.h
+++ b/lib/widgets/ephy-download-widget.h
@@ -20,10 +20,6 @@
* along with Epiphany. If not, see <http://www.gnu.org/licenses/>.
*/
-#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
-#error "Only <epiphany/epiphany.h> can be included directly."
-#endif
-
#ifndef _EPHY_DOWNLOAD_WIDGET_H
#define _EPHY_DOWNLOAD_WIDGET_H
diff --git a/lib/widgets/ephy-file-chooser.h b/lib/widgets/ephy-file-chooser.h
index 84f4ad4..e97fe3d 100644
--- a/lib/widgets/ephy-file-chooser.h
+++ b/lib/widgets/ephy-file-chooser.h
@@ -15,10 +15,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#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/widgets/ephy-location-entry.h b/lib/widgets/ephy-location-entry.h
index 22e7611..170f86e 100644
--- a/lib/widgets/ephy-location-entry.h
+++ b/lib/widgets/ephy-location-entry.h
@@ -17,10 +17,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#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-middle-clickable-button.h b/lib/widgets/ephy-middle-clickable-button.h
index e1bd5a8..88cd736 100644
--- a/lib/widgets/ephy-middle-clickable-button.h
+++ b/lib/widgets/ephy-middle-clickable-button.h
@@ -17,10 +17,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
-#error "Only <epiphany/epiphany.h> can be included directly."
-#endif
-
#ifndef __EPHY_MIDDLE_CLICKABLE_BUTTON_H__
#define __EPHY_MIDDLE_CLICKABLE_BUTTON_H__
diff --git a/lib/widgets/ephy-node-view.h b/lib/widgets/ephy-node-view.h
index 52aa136..2a0a9fa 100644
--- a/lib/widgets/ephy-node-view.h
+++ b/lib/widgets/ephy-node-view.h
@@ -143,8 +143,4 @@ gboolean ephy_node_view_get_iter_for_node (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-security-popover.h b/lib/widgets/ephy-security-popover.h
index 06e48c9..252f191 100644
--- a/lib/widgets/ephy-security-popover.h
+++ b/lib/widgets/ephy-security-popover.h
@@ -17,10 +17,6 @@
*
*/
-#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
-#error "Only <epiphany/epiphany.h> can be included directly."
-#endif
-
#ifndef EPHY_SECURITY_POPOVER_H
#define EPHY_SECURITY_POPOVER_H
diff --git a/lib/widgets/ephy-tree-model-node.h b/lib/widgets/ephy-tree-model-node.h
index 4e6d4dc..ef36d66 100644
--- a/lib/widgets/ephy-tree-model-node.h
+++ b/lib/widgets/ephy-tree-model-node.h
@@ -78,8 +78,4 @@ 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 2c9671f..72a1681 100644
--- a/lib/widgets/ephy-tree-model-sort.h
+++ b/lib/widgets/ephy-tree-model-sort.h
@@ -14,10 +14,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#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 957ef5a..ccfdc88 100644
--- a/lib/widgets/ephy-zoom-action.h
+++ b/lib/widgets/ephy-zoom-action.h
@@ -16,10 +16,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#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/src/Makefile.am b/src/Makefile.am
index 05f0f49..21f6749 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -15,67 +15,69 @@ EXTRA_DIST = \
$(RESOURCE_FILES) \
$(NULL)
-NOINST_H_FILES = \
- ephy-action-helper.h \
- ephy-combined-stop-reload-action.h \
- ephy-encoding-dialog.h \
- ephy-encoding-row.h \
- ephy-history-window.h \
- ephy-home-action.h \
- ephy-link-action.h \
- ephy-lockdown.h \
- ephy-location-controller.h \
+TYPES_H_FILES = \
+ ephy-link.h \
+ ephy-session.h \
+ ephy-shell.h \
+ ephy-window.h \
ephy-navigation-history-action.h \
- ephy-private.h \
- ephy-search-provider.h \
ephy-title-box.h \
- ephy-toolbar.h \
- ephy-window-action.h \
- languages.h \
- clear-data-dialog.h \
- cookies-dialog.h \
- passwords-dialog.h \
- popup-commands.h \
- prefs-dialog.h \
- window-commands.h
-
-INST_H_FILES = \
- ephy-link.h \
- ephy-notebook.h \
- ephy-session.h \
- ephy-shell.h \
- ephy-window.h \
$(NULL)
libephymain_la_SOURCES = \
+ clear-data-dialog.c \
+ clear-data-dialog.h \
+ cookies-dialog.c \
+ cookies-dialog.h \
ephy-action-helper.c \
+ ephy-action-helper.h \
ephy-completion-model.c \
ephy-completion-model.h \
ephy-combined-stop-reload-action.c \
+ ephy-combined-stop-reload-action.h \
ephy-encoding-dialog.c \
+ ephy-encoding-dialog.h \
ephy-encoding-row.c \
+ ephy-encoding-row.h \
ephy-home-action.c \
+ ephy-home-action.h \
ephy-history-window.c \
+ ephy-history-window.h \
ephy-link.c \
+ ephy-link.h \
ephy-link-action.c \
+ ephy-link-action.h \
ephy-location-controller.c \
+ ephy-location-controller.h \
ephy-lockdown.c \
+ ephy-lockdown.h \
ephy-navigation-history-action.c \
+ ephy-navigation-history-action.h \
ephy-notebook.c \
+ ephy-notebook.h \
+ ephy-private.h \
+ ephy-search-provider.h \
ephy-session.c \
+ ephy-session.h \
ephy-shell.c \
+ ephy-shell.h \
ephy-title-box.c \
+ ephy-title-box.h \
ephy-toolbar.c \
+ ephy-toolbar.h \
ephy-window.c \
+ ephy-window.h \
ephy-window-action.c \
- clear-data-dialog.c \
- cookies-dialog.c \
+ ephy-window-action.h \
+ languages.h \
passwords-dialog.c \
+ passwords-dialog.h \
popup-commands.c \
+ popup-commands.h \
prefs-dialog.c \
+ prefs-dialog.h \
window-commands.c \
- $(INST_H_FILES) \
- $(NOINST_H_FILES) \
+ window-commands.h \
$(NULL)
nodist_libephymain_la_SOURCES = \
@@ -217,7 +219,7 @@ stamp_files = \
ephy-type-builtins.c: stamp-ephy-type-builtins.c Makefile
@true
-stamp-ephy-type-builtins.c: Makefile $(INST_H_FILES) $(NOINST_H_FILES)
+stamp-ephy-type-builtins.c: Makefile $(TYPES_H_FILES)
$(AM_V_GEN) $(GLIB_MKENUMS) \
--fhead "#include <config.h>\n\n" \
--fhead "#include \"ephy-type-builtins.h\"\n\n" \
@@ -238,11 +240,8 @@ stamp-ephy-type-builtins.c: Makefile $(INST_H_FILES) $(NOINST_H_FILES)
ephy-type-builtins.h: stamp-ephy-type-builtins.h Makefile
@true
-stamp-ephy-type-builtins.h: Makefile $(INST_H_FILES) $(NOINST_H_FILES)
+stamp-ephy-type-builtins.h: Makefile $(TYPES_H_FILES)
$(AM_V_GEN) $(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_TYPE_BUILTINS_H\n" \
--fhead "#define EPHY_TYPE_BUILTINS_H 1\n\n" \
--fhead "#include <glib-object.h>\n\n" \
diff --git a/src/bookmarks/Makefile.am b/src/bookmarks/Makefile.am
index 46e3da8..f0f41ba 100644
--- a/src/bookmarks/Makefile.am
+++ b/src/bookmarks/Makefile.am
@@ -3,43 +3,40 @@ noinst_LTLIBRARIES = libephybookmarks.la
AM_CFLAGS = $(WARN_CFLAGS)
AM_LDFLAGS = $(WARN_LDFLAGS)
-INST_H_FILES = \
+TYPES_H_FILES = \
ephy-bookmarks.h
-NOINST_H_FILES = \
- ephy-bookmark-action.h \
- ephy-bookmarks-editor.h \
- ephy-bookmarks-export.h \
- ephy-bookmarks-import.h \
- ephy-bookmarks-ui.h \
- ephy-bookmarks-menu.h \
- ephy-bookmark-properties.h \
- ephy-topic-action.h \
- ephy-open-tabs-action.h \
- ephy-topic-action-group.h \
- ephy-bookmark-action-group.h \
- ephy-topics-entry.h \
- ephy-topics-palette.h \
- ephy-nodes-cover.h
-
libephybookmarks_la_SOURCES = \
ephy-bookmarks.c \
+ ephy-bookmarks.h \
ephy-bookmark-action.c \
+ ephy-bookmark-action.h \
ephy-bookmarks-editor.c \
+ ephy-bookmarks-editor.h \
ephy-bookmarks-export.c \
+ ephy-bookmarks-export.h \
ephy-bookmarks-import.c \
+ ephy-bookmarks-import.h \
ephy-bookmarks-ui.c \
+ ephy-bookmarks-ui.h \
ephy-bookmarks-menu.c \
+ ephy-bookmarks-menu.h \
ephy-bookmark-properties.c \
+ ephy-bookmark-properties.h \
ephy-topic-action.c \
+ ephy-topic-action.h \
ephy-open-tabs-action.c \
+ ephy-open-tabs-action.h \
ephy-topic-action-group.c \
+ ephy-topic-action-group.h \
ephy-bookmark-action-group.c \
+ ephy-bookmark-action-group.h \
ephy-topics-entry.c \
+ ephy-topics-entry.h \
ephy-topics-palette.c \
- ephy-nodes-cover.c \
- $(NOINST_H_FILES) \
- $(INST_H_FILES)
+ ephy-topics-palette.h \
+ ephy-nodes-cover.c \
+ ephy-nodes-cover.h
nodist_libephybookmarks_la_SOURCES = \
$(BUILT_SOURCES)
@@ -56,7 +53,7 @@ stamp_files = \
ephy-bookmarks-type-builtins.c: stamp-ephy-bookmarks-type-builtins.c Makefile
@true
-stamp-ephy-bookmarks-type-builtins.c: Makefile $(INST_H_FILES) $(NOINST_H_FILES)
+stamp-ephy-bookmarks-type-builtins.c: Makefile $(TYPES_H_FILES)
$(AM_V_GEN) $(GLIB_MKENUMS) \
--fhead "#include <config.h>\n\n" \
--fhead "#include \"ephy-bookmarks-type-builtins.h\"\n\n" \
@@ -77,11 +74,8 @@ stamp-ephy-bookmarks-type-builtins.c: Makefile $(INST_H_FILES) $(NOINST_H_FILES)
ephy-bookmarks-type-builtins.h: stamp-ephy-bookmarks-type-builtins.h Makefile
@true
-stamp-ephy-bookmarks-type-builtins.h: Makefile $(INST_H_FILES) $(NOINST_H_FILES)
+stamp-ephy-bookmarks-type-builtins.h: Makefile $(TYPES_H_FILES)
$(AM_V_GEN) $(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_BOOKMARKS_TYPE_BUILTINS_H\n" \
--fhead "#define EPHY_BOOKMARKS_TYPE_BUILTINS_H 1\n\n" \
--fhead "#include <glib-object.h>\n\n" \
diff --git a/src/bookmarks/ephy-bookmark-action-group.h b/src/bookmarks/ephy-bookmark-action-group.h
index 2d7444f..6ec3f1e 100644
--- a/src/bookmarks/ephy-bookmark-action-group.h
+++ b/src/bookmarks/ephy-bookmark-action-group.h
@@ -15,10 +15,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
-#error "Only <epiphany/epiphany.h> can be included directly."
-#endif
-
#ifndef EPHY_BOOKMARK_ACTION_GROUP_H
#define EPHY_BOOKMARK_ACTION_GROUP_H
diff --git a/src/bookmarks/ephy-bookmark-action.h b/src/bookmarks/ephy-bookmark-action.h
index db89ee2..5c780e6 100644
--- a/src/bookmarks/ephy-bookmark-action.h
+++ b/src/bookmarks/ephy-bookmark-action.h
@@ -16,10 +16,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
-#error "Only <epiphany/epiphany.h> can be included directly."
-#endif
-
#ifndef EPHY_BOOKMARK_ACTION_H
#define EPHY_BOOKMARK_ACTION_H
diff --git a/src/bookmarks/ephy-bookmark-properties.h b/src/bookmarks/ephy-bookmark-properties.h
index 851ec7c..68c55d0 100644
--- a/src/bookmarks/ephy-bookmark-properties.h
+++ b/src/bookmarks/ephy-bookmark-properties.h
@@ -17,10 +17,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
-#error "Only <epiphany/epiphany.h> can be included directly."
-#endif
-
#ifndef EPHY_BOOKMARK_PROPERTIES_H
#define EPHY_BOOKMARK_PROPERTIES_H
diff --git a/src/bookmarks/ephy-bookmarks-editor.h b/src/bookmarks/ephy-bookmarks-editor.h
index a86dac3..4504d88 100644
--- a/src/bookmarks/ephy-bookmarks-editor.h
+++ b/src/bookmarks/ephy-bookmarks-editor.h
@@ -15,10 +15,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
-#error "Only <epiphany/epiphany.h> can be included directly."
-#endif
-
#ifndef EPHY_BOOKMARKS_EDITOR_H
#define EPHY_BOOKMARKS_EDITOR_H
diff --git a/src/bookmarks/ephy-bookmarks-export.h b/src/bookmarks/ephy-bookmarks-export.h
index fe3a3da..469ffbd 100644
--- a/src/bookmarks/ephy-bookmarks-export.h
+++ b/src/bookmarks/ephy-bookmarks-export.h
@@ -15,10 +15,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
-#error "Only <epiphany/epiphany.h> can be included directly."
-#endif
-
#ifndef EPHY_BOOKMARKS_EXPORT_H
#define EPHY_BOOKMARKS_EXPORT_H
diff --git a/src/bookmarks/ephy-bookmarks-import.h b/src/bookmarks/ephy-bookmarks-import.h
index 1416079..a5221af 100644
--- a/src/bookmarks/ephy-bookmarks-import.h
+++ b/src/bookmarks/ephy-bookmarks-import.h
@@ -16,10 +16,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
-#error "Only <epiphany/epiphany.h> can be included directly."
-#endif
-
#ifndef EPHY_BOOKMARKS_IMPORT_H
#define EPHY_BOOKMARKS_IMPORT_H
diff --git a/src/bookmarks/ephy-bookmarks-menu.h b/src/bookmarks/ephy-bookmarks-menu.h
index c322dc2..9bf6fd2 100644
--- a/src/bookmarks/ephy-bookmarks-menu.h
+++ b/src/bookmarks/ephy-bookmarks-menu.h
@@ -17,10 +17,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
-#error "Only <epiphany/epiphany.h> can be included directly."
-#endif
-
#ifndef EPHY_BOOKMARKS_MENU_H
#define EPHY_BOOKMARKS_MENU_H
diff --git a/src/bookmarks/ephy-bookmarks-ui.h b/src/bookmarks/ephy-bookmarks-ui.h
index 691c890..df9f1e7 100644
--- a/src/bookmarks/ephy-bookmarks-ui.h
+++ b/src/bookmarks/ephy-bookmarks-ui.h
@@ -15,10 +15,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
-#error "Only <epiphany/epiphany.h> can be included directly."
-#endif
-
#ifndef EPHY_BOOKMARKS_UI_H
#define EPHY_BOOKMARKS_UI_H
diff --git a/src/bookmarks/ephy-bookmarks.h b/src/bookmarks/ephy-bookmarks.h
index 709bce2..396b567 100644
--- a/src/bookmarks/ephy-bookmarks.h
+++ b/src/bookmarks/ephy-bookmarks.h
@@ -16,10 +16,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
-#error "Only <epiphany/epiphany.h> can be included directly."
-#endif
-
#ifndef EPHY_BOOKMARKS_H
#define EPHY_BOOKMARKS_H
diff --git a/src/bookmarks/ephy-nodes-cover.h b/src/bookmarks/ephy-nodes-cover.h
index 28f5e21..4acbffb 100644
--- a/src/bookmarks/ephy-nodes-cover.h
+++ b/src/bookmarks/ephy-nodes-cover.h
@@ -15,10 +15,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
-#error "Only <epiphany/epiphany.h> can be included directly."
-#endif
-
#ifndef EPHY_NODES_COVER_H
#define EPHY_NODES_COVER_H
diff --git a/src/bookmarks/ephy-open-tabs-action.h b/src/bookmarks/ephy-open-tabs-action.h
index 9039b36..a0b42be 100644
--- a/src/bookmarks/ephy-open-tabs-action.h
+++ b/src/bookmarks/ephy-open-tabs-action.h
@@ -15,10 +15,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
-#error "Only <epiphany/epiphany.h> can be included directly."
-#endif
-
#ifndef EPHY_OPEN_TABS_ACTION_H
#define EPHY_OPEN_TABS_ACTION_H
diff --git a/src/bookmarks/ephy-topic-action-group.h b/src/bookmarks/ephy-topic-action-group.h
index feac940..c652b40 100644
--- a/src/bookmarks/ephy-topic-action-group.h
+++ b/src/bookmarks/ephy-topic-action-group.h
@@ -15,10 +15,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
-#error "Only <epiphany/epiphany.h> can be included directly."
-#endif
-
#ifndef EPHY_TOPIC_ACTION_GROUP_H
#define EPHY_TOPIC_ACTION_GROUP_H
diff --git a/src/bookmarks/ephy-topic-action.h b/src/bookmarks/ephy-topic-action.h
index 8dbac7a..5dc6615 100644
--- a/src/bookmarks/ephy-topic-action.h
+++ b/src/bookmarks/ephy-topic-action.h
@@ -16,10 +16,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
-#error "Only <epiphany/epiphany.h> can be included directly."
-#endif
-
#ifndef EPHY_TOPIC_ACTION_H
#define EPHY_TOPIC_ACTION_H
diff --git a/src/bookmarks/ephy-topics-entry.h b/src/bookmarks/ephy-topics-entry.h
index aca5a38..185cfe3 100644
--- a/src/bookmarks/ephy-topics-entry.h
+++ b/src/bookmarks/ephy-topics-entry.h
@@ -15,10 +15,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
-#error "Only <epiphany/epiphany.h> can be included directly."
-#endif
-
#ifndef EPHY_TOPICS_ENTRY_H
#define EPHY_TOPICS_ENTRY_H
diff --git a/src/bookmarks/ephy-topics-palette.h b/src/bookmarks/ephy-topics-palette.h
index 6046bcf..3880ed1 100644
--- a/src/bookmarks/ephy-topics-palette.h
+++ b/src/bookmarks/ephy-topics-palette.h
@@ -15,10 +15,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
-#error "Only <epiphany/epiphany.h> can be included directly."
-#endif
-
#ifndef EPHY_TOPICS_PALETTE_H
#define EPHY_TOPICS_PALETTE_H
diff --git a/src/ephy-action-helper.h b/src/ephy-action-helper.h
index 607ce18..82faa56 100644
--- a/src/ephy-action-helper.h
+++ b/src/ephy-action-helper.h
@@ -15,10 +15,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
-#error "Only <epiphany/epiphany.h> can be included directly."
-#endif
-
#ifndef EPHY_ACTION_HELPER_H
#define EPHY_ACTION_HELPER_H
diff --git a/src/ephy-completion-model.h b/src/ephy-completion-model.h
index e0340d8..9fcbc30 100644
--- a/src/ephy-completion-model.h
+++ b/src/ephy-completion-model.h
@@ -15,10 +15,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
-#error "Only <epiphany/epiphany.h> can be included directly."
-#endif
-
#ifndef EPHY_COMPLETION_MODEL_H
#define EPHY_COMPLETION_MODEL_H
diff --git a/src/ephy-encoding-dialog.h b/src/ephy-encoding-dialog.h
index 6cd445a..b5d9e85 100644
--- a/src/ephy-encoding-dialog.h
+++ b/src/ephy-encoding-dialog.h
@@ -16,10 +16,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
-#error "Only <epiphany/epiphany.h> can be included directly."
-#endif
-
#ifndef EPHY_ENCODING_DIALOG_H
#define EPHY_ENCODING_DIALOG_H
diff --git a/src/ephy-history-window.h b/src/ephy-history-window.h
index 610b939..8a4b2ee 100644
--- a/src/ephy-history-window.h
+++ b/src/ephy-history-window.h
@@ -15,10 +15,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
-#error "Only <epiphany/epiphany.h> can be included directly."
-#endif
-
#ifndef EPHY_HISTORY_WINDOW_H
#define EPHY_HISTORY_WINDOW_H
diff --git a/src/ephy-home-action.h b/src/ephy-home-action.h
index f0361ff..867fcaf 100644
--- a/src/ephy-home-action.h
+++ b/src/ephy-home-action.h
@@ -15,10 +15,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
-#error "Only <epiphany/epiphany.h> can be included directly."
-#endif
-
#ifndef EPHY_HOME_ACTION_H
#define EPHY_HOME_ACTION_H
diff --git a/src/ephy-link-action.h b/src/ephy-link-action.h
index 4e7e067..c75f5a3 100644
--- a/src/ephy-link-action.h
+++ b/src/ephy-link-action.h
@@ -15,10 +15,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
-#error "Only <epiphany/epiphany.h> can be included directly."
-#endif
-
#ifndef EPHY_LINK_ACTION_H
#define EPHY_LINK_ACTION_H
diff --git a/src/ephy-link.h b/src/ephy-link.h
index 927873f..d09a3cc 100644
--- a/src/ephy-link.h
+++ b/src/ephy-link.h
@@ -15,10 +15,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
-#error "Only <epiphany/epiphany.h> can be included directly."
-#endif
-
#ifndef EPHY_LINK_H
#define EPHY_LINK_H
diff --git a/src/ephy-location-controller.h b/src/ephy-location-controller.h
index 041bd8c..25ff30b 100644
--- a/src/ephy-location-controller.h
+++ b/src/ephy-location-controller.h
@@ -15,10 +15,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
-#error "Only <epiphany/epiphany.h> can be included directly."
-#endif
-
#ifndef EPHY_LOCATION_CONTROLLER_H
#define EPHY_LOCATION_CONTROLLER_H
diff --git a/src/ephy-lockdown.h b/src/ephy-lockdown.h
index 74e00cd..4a3e925 100644
--- a/src/ephy-lockdown.h
+++ b/src/ephy-lockdown.h
@@ -17,10 +17,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
-#error "Only <epiphany/epiphany.h> can be included directly."
-#endif
-
#ifndef EPHY_LOCKDOWN_H
#define EPHY_LOCKDOWN_H
diff --git a/src/ephy-navigation-history-action.h b/src/ephy-navigation-history-action.h
index 4c34b64..fa2d588 100644
--- a/src/ephy-navigation-history-action.h
+++ b/src/ephy-navigation-history-action.h
@@ -17,10 +17,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
-#error "Only <epiphany/epiphany.h> can be included directly."
-#endif
-
#ifndef EPHY_NAVIGATION_HISTORY_ACTION_H
#define EPHY_NAVIGATION_HISTORY_ACTION_H
diff --git a/src/ephy-notebook.h b/src/ephy-notebook.h
index 278320a..af8ca4d 100644
--- a/src/ephy-notebook.h
+++ b/src/ephy-notebook.h
@@ -17,10 +17,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
-#error "Only <epiphany/epiphany.h> can be included directly."
-#endif
-
#ifndef EPHY_NOTEBOOK_H
#define EPHY_NOTEBOOK_H
diff --git a/src/ephy-private.h b/src/ephy-private.h
index b71bc28..66a48a3 100644
--- a/src/ephy-private.h
+++ b/src/ephy-private.h
@@ -16,10 +16,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
-#error "Only <epiphany/epiphany.h> can be included directly."
-#endif
-
#ifndef EPHY_PRIVATE_H
#define EPHY_PRIVATE_H
diff --git a/src/ephy-session.h b/src/ephy-session.h
index 8f90d6c..051ae3a 100644
--- a/src/ephy-session.h
+++ b/src/ephy-session.h
@@ -17,10 +17,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
-#error "Only <epiphany/epiphany.h> can be included directly."
-#endif
-
#ifndef EPHY_SESSION_H
#define EPHY_SESSION_H
diff --git a/src/ephy-shell.h b/src/ephy-shell.h
index 28abd1c..2db9b2e 100644
--- a/src/ephy-shell.h
+++ b/src/ephy-shell.h
@@ -18,10 +18,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
-#error "Only <epiphany/epiphany.h> can be included directly."
-#endif
-
#ifndef EPHY_SHELL_H
#define EPHY_SHELL_H
diff --git a/src/ephy-toolbar.h b/src/ephy-toolbar.h
index 233530d..eaca83f 100644
--- a/src/ephy-toolbar.h
+++ b/src/ephy-toolbar.h
@@ -16,10 +16,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
-#error "Only <epiphany/epiphany.h> can be included directly."
-#endif
-
#ifndef EPHY_TOOLBAR_H
#define EPHY_TOOLBAR_H
diff --git a/src/ephy-window-action.h b/src/ephy-window-action.h
index e9613a0..c000950 100644
--- a/src/ephy-window-action.h
+++ b/src/ephy-window-action.h
@@ -16,10 +16,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
-#error "Only <epiphany/epiphany.h> can be included directly."
-#endif
-
#ifndef EPHY_WINDOW_ACTION_H
#define EPHY_WINDOW_ACTION_H
diff --git a/src/ephy-window.h b/src/ephy-window.h
index dda5d69..464d62f 100644
--- a/src/ephy-window.h
+++ b/src/ephy-window.h
@@ -15,10 +15,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
-#error "Only <epiphany/epiphany.h> can be included directly."
-#endif
-
#ifndef EPHY_WINDOW_H
#define EPHY_WINDOW_H
diff --git a/src/window-commands.h b/src/window-commands.h
index 9a63be5..29b6025 100644
--- a/src/window-commands.h
+++ b/src/window-commands.h
@@ -15,10 +15,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#if !defined (__EPHY_EPIPHANY_H_INSIDE__) && !defined (EPIPHANY_COMPILATION)
-#error "Only <epiphany/epiphany.h> can be included directly."
-#endif
-
#ifndef WINDOW_COMMANDS_H
#define WINDOW_COMMANDS_H
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
