aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Persch <chpe@cvs.gnome.org>2004-11-03 04:57:34 +0800
committerChristian Persch <chpe@src.gnome.org>2004-11-03 04:57:34 +0800
commit65df5f0299d4e158169d7d858c078d12fe62d31c (patch)
tree65d811d229ce706352f2e28ff0df85bb6bb437e6
parent7febd6005ba749c190f47bc2fd8cf962b3b0ade3 (diff)
downloadgsoc2013-epiphany-65df5f0299d4e158169d7d858c078d12fe62d31c.tar
gsoc2013-epiphany-65df5f0299d4e158169d7d858c078d12fe62d31c.tar.gz
gsoc2013-epiphany-65df5f0299d4e158169d7d858c078d12fe62d31c.tar.bz2
gsoc2013-epiphany-65df5f0299d4e158169d7d858c078d12fe62d31c.tar.lz
gsoc2013-epiphany-65df5f0299d4e158169d7d858c078d12fe62d31c.tar.xz
gsoc2013-epiphany-65df5f0299d4e158169d7d858c078d12fe62d31c.tar.zst
gsoc2013-epiphany-65df5f0299d4e158169d7d858c078d12fe62d31c.zip
We always have config.h, no need to guard its inclusion.
2004-11-02 Christian Persch <chpe@cvs.gnome.org> * embed/downloader-view.c: * embed/ephy-command-manager.c: * embed/ephy-cookie-manager.c: * embed/ephy-download.c: * embed/ephy-embed-dialog.c: * embed/ephy-embed-event.c: * embed/ephy-embed-factory.c: * embed/ephy-embed-persist.c: * embed/ephy-embed-shell.c: * embed/ephy-embed-single.c: * embed/ephy-embed.c: * embed/ephy-encodings.c: * embed/ephy-favicon-cache.c: * embed/ephy-history.c: * embed/ephy-password-manager.c: * embed/ephy-permission-manager.c: * embed/find-dialog.c: * embed/mozilla/ContentHandler.cpp: * embed/mozilla/ContentHandler.h: * embed/mozilla/EphyAboutRedirector.cpp: * embed/mozilla/EphyBrowser.cpp: * embed/mozilla/EphyBrowser.h: * embed/mozilla/EphyContentPolicy.cpp: * embed/mozilla/EphyHeaderSniffer.cpp: * embed/mozilla/EphySingle.cpp: * embed/mozilla/EphyUtils.cpp: * embed/mozilla/EventContext.cpp: * embed/mozilla/FilePicker.cpp: * embed/mozilla/GlobalHistory.cpp: * embed/mozilla/GtkNSSClientAuthDialogs.cpp: * embed/mozilla/GtkNSSDialogs.cpp: * embed/mozilla/GtkNSSKeyPairDialogs.cpp: * embed/mozilla/MozDownload.cpp: * embed/mozilla/MozDownload.h: * embed/mozilla/MozRegisterComponents.cpp: * embed/mozilla/PrintingPromptService.cpp: * embed/mozilla/mozilla-download.cpp: * embed/mozilla/mozilla-embed-event.cpp: * embed/mozilla/mozilla-embed-persist.cpp: * embed/mozilla/mozilla-embed-single.cpp: * embed/mozilla/mozilla-embed.cpp: * embed/mozilla/mozilla-notifiers.cpp: * embed/print-dialog.c: * lib/eel-gconf-extensions.c: * lib/egg/egg-editable-toolbar.c: * lib/egg/egg-toolbars-model.c: * lib/ephy-debug.c: * lib/ephy-debug.h: * lib/ephy-dialog.c: * lib/ephy-dnd.c: * lib/ephy-file-chooser.c: * lib/ephy-file-helpers.c: * lib/ephy-glade.c: * lib/ephy-gui.c: * lib/ephy-langs.c: * lib/ephy-loader.c: * lib/ephy-module.c: * lib/ephy-node-db.c: * lib/ephy-node-filter.c: * lib/ephy-node.c: * lib/ephy-shlib-loader.c: * lib/ephy-state.c: * lib/ephy-stock-icons.c: * lib/ephy-string.c: * lib/ephy-zoom.c: * lib/widgets/ephy-location-entry.c: * lib/widgets/ephy-node-view.c: * lib/widgets/ephy-search-entry.c: * lib/widgets/ephy-spinner.c: * lib/widgets/ephy-tree-model-node.c: * lib/widgets/ephy-tree-model-sort.c: * lib/widgets/ephy-zoom-action.c: * lib/widgets/ephy-zoom-control.c: * src/bookmarks/ephy-bookmark-action.c: * src/bookmarks/ephy-bookmark-properties.c: * src/bookmarks/ephy-bookmarks-editor.c: * src/bookmarks/ephy-bookmarks-export.c: * src/bookmarks/ephy-bookmarks-import.c: * src/bookmarks/ephy-bookmarks-menu.c: * src/bookmarks/ephy-bookmarks.c: * src/bookmarks/ephy-bookmarksbar-model.c: * src/bookmarks/ephy-bookmarksbar.c: * src/bookmarks/ephy-favorites-menu.c: * src/bookmarks/ephy-new-bookmark.c: * src/bookmarks/ephy-topic-action.c: * src/bookmarks/ephy-topics-selector.c: * src/ephy-automation.c: * src/ephy-completion-model.c: * src/ephy-encoding-dialog.c: * src/ephy-encoding-menu.c: * src/ephy-extension.c: * src/ephy-extensions-manager.c: * src/ephy-favicon-action.c: * src/ephy-go-action.c: * src/ephy-history-window.c: * src/ephy-location-action.c: * src/ephy-main.c: * src/ephy-navigation-action.c: * src/ephy-notebook.c: * src/ephy-session.c: * src/ephy-shell.c: * src/ephy-statusbar.c: * src/ephy-tab.c: * src/ephy-tabs-menu.c: * src/ephy-toolbars-model.c: * src/ephy-window.c: * src/pdm-dialog.c: * src/popup-commands.c: * src/ppview-toolbar.c: * src/prefs-dialog.c: * src/toolbar.c: * src/window-commands.c: We always have config.h, no need to guard its inclusion.
-rw-r--r--ChangeLog117
-rw-r--r--embed/downloader-view.c2
-rw-r--r--embed/ephy-command-manager.c2
-rw-r--r--embed/ephy-cookie-manager.c2
-rw-r--r--embed/ephy-download.c2
-rw-r--r--embed/ephy-embed-dialog.c2
-rw-r--r--embed/ephy-embed-event.c2
-rw-r--r--embed/ephy-embed-factory.c2
-rw-r--r--embed/ephy-embed-persist.c2
-rw-r--r--embed/ephy-embed-shell.c2
-rw-r--r--embed/ephy-embed-single.c2
-rw-r--r--embed/ephy-embed.c2
-rw-r--r--embed/ephy-encodings.c2
-rw-r--r--embed/ephy-favicon-cache.c2
-rw-r--r--embed/ephy-history.c2
-rw-r--r--embed/ephy-password-manager.c2
-rw-r--r--embed/ephy-permission-manager.c2
-rwxr-xr-xembed/find-dialog.c2
-rw-r--r--embed/mozilla/ContentHandler.cpp2
-rw-r--r--embed/mozilla/ContentHandler.h2
-rw-r--r--embed/mozilla/EphyAboutRedirector.cpp2
-rw-r--r--embed/mozilla/EphyBrowser.cpp2
-rw-r--r--embed/mozilla/EphyBrowser.h2
-rw-r--r--embed/mozilla/EphyContentPolicy.cpp2
-rw-r--r--embed/mozilla/EphyHeaderSniffer.cpp2
-rw-r--r--embed/mozilla/EphySingle.cpp2
-rw-r--r--embed/mozilla/EphyUtils.cpp2
-rw-r--r--embed/mozilla/EventContext.cpp2
-rw-r--r--embed/mozilla/FilePicker.cpp2
-rw-r--r--embed/mozilla/GlobalHistory.cpp2
-rw-r--r--embed/mozilla/GtkNSSClientAuthDialogs.cpp2
-rw-r--r--embed/mozilla/GtkNSSDialogs.cpp2
-rw-r--r--embed/mozilla/GtkNSSKeyPairDialogs.cpp2
-rw-r--r--embed/mozilla/MozDownload.cpp2
-rw-r--r--embed/mozilla/MozDownload.h2
-rw-r--r--embed/mozilla/MozRegisterComponents.cpp2
-rw-r--r--embed/mozilla/PrintingPromptService.cpp2
-rw-r--r--embed/mozilla/mozilla-download.cpp2
-rw-r--r--embed/mozilla/mozilla-embed-event.cpp2
-rw-r--r--embed/mozilla/mozilla-embed-persist.cpp2
-rw-r--r--embed/mozilla/mozilla-embed-single.cpp2
-rw-r--r--embed/mozilla/mozilla-embed.cpp2
-rw-r--r--embed/mozilla/mozilla-notifiers.cpp2
-rwxr-xr-xembed/print-dialog.c2
-rw-r--r--lib/eel-gconf-extensions.c2
-rwxr-xr-xlib/egg/egg-editable-toolbar.c2
-rwxr-xr-xlib/egg/egg-toolbars-model.c2
-rw-r--r--lib/ephy-debug.c2
-rw-r--r--lib/ephy-debug.h2
-rw-r--r--lib/ephy-dialog.c2
-rw-r--r--lib/ephy-dnd.c2
-rw-r--r--lib/ephy-file-chooser.c2
-rw-r--r--lib/ephy-file-helpers.c2
-rw-r--r--lib/ephy-glade.c2
-rw-r--r--lib/ephy-gui.c2
-rw-r--r--lib/ephy-langs.c2
-rw-r--r--lib/ephy-loader.c2
-rw-r--r--lib/ephy-module.c2
-rw-r--r--lib/ephy-node-db.c2
-rw-r--r--lib/ephy-node-filter.c2
-rw-r--r--lib/ephy-node.c2
-rw-r--r--lib/ephy-shlib-loader.c2
-rw-r--r--lib/ephy-state.c2
-rw-r--r--lib/ephy-stock-icons.c2
-rw-r--r--lib/ephy-string.c2
-rw-r--r--lib/ephy-zoom.c2
-rw-r--r--lib/widgets/ephy-location-entry.c2
-rw-r--r--lib/widgets/ephy-node-view.c2
-rw-r--r--lib/widgets/ephy-search-entry.c2
-rw-r--r--lib/widgets/ephy-spinner.c2
-rw-r--r--lib/widgets/ephy-tree-model-node.c2
-rw-r--r--lib/widgets/ephy-tree-model-sort.c2
-rw-r--r--lib/widgets/ephy-zoom-action.c2
-rw-r--r--lib/widgets/ephy-zoom-control.c2
-rw-r--r--src/bookmarks/ephy-bookmark-action.c2
-rw-r--r--src/bookmarks/ephy-bookmark-properties.c2
-rw-r--r--src/bookmarks/ephy-bookmarks-editor.c2
-rw-r--r--src/bookmarks/ephy-bookmarks-export.c2
-rw-r--r--src/bookmarks/ephy-bookmarks-import.c2
-rw-r--r--src/bookmarks/ephy-bookmarks-menu.c2
-rw-r--r--src/bookmarks/ephy-bookmarks.c2
-rwxr-xr-xsrc/bookmarks/ephy-bookmarksbar-model.c2
-rw-r--r--src/bookmarks/ephy-bookmarksbar.c2
-rw-r--r--src/bookmarks/ephy-favorites-menu.c2
-rw-r--r--src/bookmarks/ephy-new-bookmark.c2
-rw-r--r--src/bookmarks/ephy-topic-action.c2
-rw-r--r--src/bookmarks/ephy-topics-selector.c2
-rw-r--r--src/ephy-automation.c2
-rw-r--r--src/ephy-completion-model.c2
-rw-r--r--src/ephy-encoding-dialog.c2
-rw-r--r--src/ephy-encoding-menu.c2
-rw-r--r--src/ephy-extension.c2
-rw-r--r--src/ephy-extensions-manager.c2
-rw-r--r--src/ephy-favicon-action.c2
-rw-r--r--src/ephy-go-action.c2
-rw-r--r--src/ephy-history-window.c2
-rw-r--r--src/ephy-location-action.c2
-rw-r--r--src/ephy-main.c2
-rw-r--r--src/ephy-navigation-action.c2
-rw-r--r--src/ephy-notebook.c2
-rw-r--r--src/ephy-session.c2
-rw-r--r--src/ephy-shell.c2
-rwxr-xr-xsrc/ephy-statusbar.c2
-rw-r--r--src/ephy-tab.c2
-rw-r--r--src/ephy-tabs-menu.c2
-rwxr-xr-xsrc/ephy-toolbars-model.c2
-rw-r--r--src/ephy-window.c2
-rwxr-xr-xsrc/pdm-dialog.c2
-rw-r--r--src/popup-commands.c2
-rwxr-xr-xsrc/ppview-toolbar.c2
-rw-r--r--src/prefs-dialog.c2
-rwxr-xr-xsrc/toolbar.c2
-rw-r--r--src/window-commands.c2
113 files changed, 117 insertions, 224 deletions
diff --git a/ChangeLog b/ChangeLog
index 71210ee62..cd9032564 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,120 @@
+2004-11-02 Christian Persch <chpe@cvs.gnome.org>
+
+ * embed/downloader-view.c:
+ * embed/ephy-command-manager.c:
+ * embed/ephy-cookie-manager.c:
+ * embed/ephy-download.c:
+ * embed/ephy-embed-dialog.c:
+ * embed/ephy-embed-event.c:
+ * embed/ephy-embed-factory.c:
+ * embed/ephy-embed-persist.c:
+ * embed/ephy-embed-shell.c:
+ * embed/ephy-embed-single.c:
+ * embed/ephy-embed.c:
+ * embed/ephy-encodings.c:
+ * embed/ephy-favicon-cache.c:
+ * embed/ephy-history.c:
+ * embed/ephy-password-manager.c:
+ * embed/ephy-permission-manager.c:
+ * embed/find-dialog.c:
+ * embed/mozilla/ContentHandler.cpp:
+ * embed/mozilla/ContentHandler.h:
+ * embed/mozilla/EphyAboutRedirector.cpp:
+ * embed/mozilla/EphyBrowser.cpp:
+ * embed/mozilla/EphyBrowser.h:
+ * embed/mozilla/EphyContentPolicy.cpp:
+ * embed/mozilla/EphyHeaderSniffer.cpp:
+ * embed/mozilla/EphySingle.cpp:
+ * embed/mozilla/EphyUtils.cpp:
+ * embed/mozilla/EventContext.cpp:
+ * embed/mozilla/FilePicker.cpp:
+ * embed/mozilla/GlobalHistory.cpp:
+ * embed/mozilla/GtkNSSClientAuthDialogs.cpp:
+ * embed/mozilla/GtkNSSDialogs.cpp:
+ * embed/mozilla/GtkNSSKeyPairDialogs.cpp:
+ * embed/mozilla/MozDownload.cpp:
+ * embed/mozilla/MozDownload.h:
+ * embed/mozilla/MozRegisterComponents.cpp:
+ * embed/mozilla/PrintingPromptService.cpp:
+ * embed/mozilla/mozilla-download.cpp:
+ * embed/mozilla/mozilla-embed-event.cpp:
+ * embed/mozilla/mozilla-embed-persist.cpp:
+ * embed/mozilla/mozilla-embed-single.cpp:
+ * embed/mozilla/mozilla-embed.cpp:
+ * embed/mozilla/mozilla-notifiers.cpp:
+ * embed/print-dialog.c:
+ * lib/eel-gconf-extensions.c:
+ * lib/egg/egg-editable-toolbar.c:
+ * lib/egg/egg-toolbars-model.c:
+ * lib/ephy-debug.c:
+ * lib/ephy-debug.h:
+ * lib/ephy-dialog.c:
+ * lib/ephy-dnd.c:
+ * lib/ephy-file-chooser.c:
+ * lib/ephy-file-helpers.c:
+ * lib/ephy-glade.c:
+ * lib/ephy-gui.c:
+ * lib/ephy-langs.c:
+ * lib/ephy-loader.c:
+ * lib/ephy-module.c:
+ * lib/ephy-node-db.c:
+ * lib/ephy-node-filter.c:
+ * lib/ephy-node.c:
+ * lib/ephy-shlib-loader.c:
+ * lib/ephy-state.c:
+ * lib/ephy-stock-icons.c:
+ * lib/ephy-string.c:
+ * lib/ephy-zoom.c:
+ * lib/widgets/ephy-location-entry.c:
+ * lib/widgets/ephy-node-view.c:
+ * lib/widgets/ephy-search-entry.c:
+ * lib/widgets/ephy-spinner.c:
+ * lib/widgets/ephy-tree-model-node.c:
+ * lib/widgets/ephy-tree-model-sort.c:
+ * lib/widgets/ephy-zoom-action.c:
+ * lib/widgets/ephy-zoom-control.c:
+ * src/bookmarks/ephy-bookmark-action.c:
+ * src/bookmarks/ephy-bookmark-properties.c:
+ * src/bookmarks/ephy-bookmarks-editor.c:
+ * src/bookmarks/ephy-bookmarks-export.c:
+ * src/bookmarks/ephy-bookmarks-import.c:
+ * src/bookmarks/ephy-bookmarks-menu.c:
+ * src/bookmarks/ephy-bookmarks.c:
+ * src/bookmarks/ephy-bookmarksbar-model.c:
+ * src/bookmarks/ephy-bookmarksbar.c:
+ * src/bookmarks/ephy-favorites-menu.c:
+ * src/bookmarks/ephy-new-bookmark.c:
+ * src/bookmarks/ephy-topic-action.c:
+ * src/bookmarks/ephy-topics-selector.c:
+ * src/ephy-automation.c:
+ * src/ephy-completion-model.c:
+ * src/ephy-encoding-dialog.c:
+ * src/ephy-encoding-menu.c:
+ * src/ephy-extension.c:
+ * src/ephy-extensions-manager.c:
+ * src/ephy-favicon-action.c:
+ * src/ephy-go-action.c:
+ * src/ephy-history-window.c:
+ * src/ephy-location-action.c:
+ * src/ephy-main.c:
+ * src/ephy-navigation-action.c:
+ * src/ephy-notebook.c:
+ * src/ephy-session.c:
+ * src/ephy-shell.c:
+ * src/ephy-statusbar.c:
+ * src/ephy-tab.c:
+ * src/ephy-tabs-menu.c:
+ * src/ephy-toolbars-model.c:
+ * src/ephy-window.c:
+ * src/pdm-dialog.c:
+ * src/popup-commands.c:
+ * src/ppview-toolbar.c:
+ * src/prefs-dialog.c:
+ * src/toolbar.c:
+ * src/window-commands.c:
+
+ We always have config.h, no need to guard its inclusion.
+
2004-11-01 Christian Persch <chpe@cvs.gnome.org>
* lib/widgets/ephy-zoom-control.c: (ephy_zoom_control_init),
diff --git a/embed/downloader-view.c b/embed/downloader-view.c
index 1b47227c7..2847e287b 100644
--- a/embed/downloader-view.c
+++ b/embed/downloader-view.c
@@ -19,9 +19,7 @@
* $Id$
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include "downloader-view.h"
#include "ephy-file-helpers.h"
diff --git a/embed/ephy-command-manager.c b/embed/ephy-command-manager.c
index d2142710f..a164500b4 100644
--- a/embed/ephy-command-manager.c
+++ b/embed/ephy-command-manager.c
@@ -18,9 +18,7 @@
* $Id$
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include "ephy-command-manager.h"
diff --git a/embed/ephy-cookie-manager.c b/embed/ephy-cookie-manager.c
index ca2f093cf..94e0a3071 100644
--- a/embed/ephy-cookie-manager.c
+++ b/embed/ephy-cookie-manager.c
@@ -19,9 +19,7 @@
* $Id$
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include "ephy-cookie-manager.h"
diff --git a/embed/ephy-download.c b/embed/ephy-download.c
index 612a506a4..3f46ed0c5 100644
--- a/embed/ephy-download.c
+++ b/embed/ephy-download.c
@@ -18,9 +18,7 @@
* $Id$
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include "ephy-download.h"
diff --git a/embed/ephy-embed-dialog.c b/embed/ephy-embed-dialog.c
index 938b8e950..6a018a246 100644
--- a/embed/ephy-embed-dialog.c
+++ b/embed/ephy-embed-dialog.c
@@ -18,9 +18,7 @@
* $Id$
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include "ephy-embed-dialog.h"
diff --git a/embed/ephy-embed-event.c b/embed/ephy-embed-event.c
index cde54eb84..00f92b6c5 100644
--- a/embed/ephy-embed-event.c
+++ b/embed/ephy-embed-event.c
@@ -18,9 +18,7 @@
* $Id$
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include "ephy-embed-event.h"
diff --git a/embed/ephy-embed-factory.c b/embed/ephy-embed-factory.c
index ef382c9eb..ebbc9a22e 100644
--- a/embed/ephy-embed-factory.c
+++ b/embed/ephy-embed-factory.c
@@ -18,9 +18,7 @@
* $Id$
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include "ephy-embed-factory.h"
#include "mozilla-embed.h"
diff --git a/embed/ephy-embed-persist.c b/embed/ephy-embed-persist.c
index ed9d03df3..27f48026d 100644
--- a/embed/ephy-embed-persist.c
+++ b/embed/ephy-embed-persist.c
@@ -19,9 +19,7 @@
* $Id$
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include "ephy-embed-persist.h"
#include "mozilla-embed-persist.h"
diff --git a/embed/ephy-embed-shell.c b/embed/ephy-embed-shell.c
index bdba397d6..0051be195 100644
--- a/embed/ephy-embed-shell.c
+++ b/embed/ephy-embed-shell.c
@@ -18,9 +18,7 @@
* $Id$
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include "ephy-embed-shell.h"
#include "ephy-embed-single.h"
diff --git a/embed/ephy-embed-single.c b/embed/ephy-embed-single.c
index 75defacb8..9f07d7aa7 100644
--- a/embed/ephy-embed-single.c
+++ b/embed/ephy-embed-single.c
@@ -18,9 +18,7 @@
* $Id$
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include "ephy-embed-single.h"
#include "ephy-marshal.h"
diff --git a/embed/ephy-embed.c b/embed/ephy-embed.c
index cd6027b0f..472d6f718 100644
--- a/embed/ephy-embed.c
+++ b/embed/ephy-embed.c
@@ -18,9 +18,7 @@
* $Id$
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include "ephy-embed.h"
diff --git a/embed/ephy-encodings.c b/embed/ephy-encodings.c
index bfe640417..92557957b 100644
--- a/embed/ephy-encodings.c
+++ b/embed/ephy-encodings.c
@@ -19,9 +19,7 @@
* $Id$
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include "ephy-encodings.h"
#include "ephy-string.h"
diff --git a/embed/ephy-favicon-cache.c b/embed/ephy-favicon-cache.c
index d381afae8..efa3fc14b 100644
--- a/embed/ephy-favicon-cache.c
+++ b/embed/ephy-favicon-cache.c
@@ -20,9 +20,7 @@
* $Id$
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include "ephy-favicon-cache.h"
diff --git a/embed/ephy-history.c b/embed/ephy-history.c
index 9a28af8e3..4fc3e9f56 100644
--- a/embed/ephy-history.c
+++ b/embed/ephy-history.c
@@ -18,9 +18,7 @@
* $Id$
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include "ephy-history.h"
#include "ephy-file-helpers.h"
diff --git a/embed/ephy-password-manager.c b/embed/ephy-password-manager.c
index 6a8c3e34e..4a1023c8e 100644
--- a/embed/ephy-password-manager.c
+++ b/embed/ephy-password-manager.c
@@ -19,9 +19,7 @@
* $Id$
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include "ephy-password-manager.h"
#include "ephy-marshal.h"
diff --git a/embed/ephy-permission-manager.c b/embed/ephy-permission-manager.c
index c06f11107..a3e68eb93 100644
--- a/embed/ephy-permission-manager.c
+++ b/embed/ephy-permission-manager.c
@@ -19,9 +19,7 @@
* $Id$
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include "ephy-permission-manager.h"
#include "ephy-marshal.h"
diff --git a/embed/find-dialog.c b/embed/find-dialog.c
index 08b941a1b..752d05012 100755
--- a/embed/find-dialog.c
+++ b/embed/find-dialog.c
@@ -20,9 +20,7 @@
* $Id$
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include "find-dialog.h"
#include "ephy-file-helpers.h"
diff --git a/embed/mozilla/ContentHandler.cpp b/embed/mozilla/ContentHandler.cpp
index 48ba7951e..993bd885c 100644
--- a/embed/mozilla/ContentHandler.cpp
+++ b/embed/mozilla/ContentHandler.cpp
@@ -23,9 +23,7 @@
#include "mozilla-config.h"
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include <gtk/gtkimage.h>
#include <gtk/gtkhbox.h>
diff --git a/embed/mozilla/ContentHandler.h b/embed/mozilla/ContentHandler.h
index a4d561a6e..f2126ecab 100644
--- a/embed/mozilla/ContentHandler.h
+++ b/embed/mozilla/ContentHandler.h
@@ -21,9 +21,7 @@
#ifndef __ContentHandler_h
#define __ContentHandler_h
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include "ephy-embed-shell.h"
diff --git a/embed/mozilla/EphyAboutRedirector.cpp b/embed/mozilla/EphyAboutRedirector.cpp
index e07c069a2..ee863f9f9 100644
--- a/embed/mozilla/EphyAboutRedirector.cpp
+++ b/embed/mozilla/EphyAboutRedirector.cpp
@@ -41,9 +41,7 @@
#include "mozilla-config.h"
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include "EphyAboutRedirector.h"
diff --git a/embed/mozilla/EphyBrowser.cpp b/embed/mozilla/EphyBrowser.cpp
index 58826f5f0..ac39d2f86 100644
--- a/embed/mozilla/EphyBrowser.cpp
+++ b/embed/mozilla/EphyBrowser.cpp
@@ -20,9 +20,7 @@
#include "mozilla-config.h"
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include "EphyBrowser.h"
#include "EphyUtils.h"
diff --git a/embed/mozilla/EphyBrowser.h b/embed/mozilla/EphyBrowser.h
index deb96b15a..b163db0c5 100644
--- a/embed/mozilla/EphyBrowser.h
+++ b/embed/mozilla/EphyBrowser.h
@@ -21,9 +21,7 @@
#ifndef EPHY_BROWSER_H
#define EPHY_BROWSER_H
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include "ephy-encodings.h"
#include "ephy-embed.h"
diff --git a/embed/mozilla/EphyContentPolicy.cpp b/embed/mozilla/EphyContentPolicy.cpp
index 35485ea7a..b024cee4d 100644
--- a/embed/mozilla/EphyContentPolicy.cpp
+++ b/embed/mozilla/EphyContentPolicy.cpp
@@ -21,9 +21,7 @@
#include "mozilla-config.h"
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include "EphyContentPolicy.h"
diff --git a/embed/mozilla/EphyHeaderSniffer.cpp b/embed/mozilla/EphyHeaderSniffer.cpp
index 95636f98d..d65e13901 100644
--- a/embed/mozilla/EphyHeaderSniffer.cpp
+++ b/embed/mozilla/EphyHeaderSniffer.cpp
@@ -41,9 +41,7 @@
#include "mozilla-config.h"
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include "MozDownload.h"
#include "EphyHeaderSniffer.h"
diff --git a/embed/mozilla/EphySingle.cpp b/embed/mozilla/EphySingle.cpp
index bd7f0a718..eada250ee 100644
--- a/embed/mozilla/EphySingle.cpp
+++ b/embed/mozilla/EphySingle.cpp
@@ -21,9 +21,7 @@
#include "mozilla-config.h"
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include "EphySingle.h"
diff --git a/embed/mozilla/EphyUtils.cpp b/embed/mozilla/EphyUtils.cpp
index c5e0bf666..545910e8f 100644
--- a/embed/mozilla/EphyUtils.cpp
+++ b/embed/mozilla/EphyUtils.cpp
@@ -20,9 +20,7 @@
#include "mozilla-config.h"
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include "EphyUtils.h"
#include "ephy-embed-shell.h"
diff --git a/embed/mozilla/EventContext.cpp b/embed/mozilla/EventContext.cpp
index dbe89959b..1424a0670 100644
--- a/embed/mozilla/EventContext.cpp
+++ b/embed/mozilla/EventContext.cpp
@@ -22,9 +22,7 @@
#include "mozilla-config.h"
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include "EventContext.h"
#include "EphyUtils.h"
diff --git a/embed/mozilla/FilePicker.cpp b/embed/mozilla/FilePicker.cpp
index 2a4c39ce5..2fa055d49 100644
--- a/embed/mozilla/FilePicker.cpp
+++ b/embed/mozilla/FilePicker.cpp
@@ -21,9 +21,7 @@
#include "mozilla-config.h"
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include "FilePicker.h"
#include "EphyUtils.h"
diff --git a/embed/mozilla/GlobalHistory.cpp b/embed/mozilla/GlobalHistory.cpp
index e46af14cd..47bc68987 100644
--- a/embed/mozilla/GlobalHistory.cpp
+++ b/embed/mozilla/GlobalHistory.cpp
@@ -21,9 +21,7 @@
#include "mozilla-config.h"
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include "ephy-embed-shell.h"
diff --git a/embed/mozilla/GtkNSSClientAuthDialogs.cpp b/embed/mozilla/GtkNSSClientAuthDialogs.cpp
index ec4481c12..657f35474 100644
--- a/embed/mozilla/GtkNSSClientAuthDialogs.cpp
+++ b/embed/mozilla/GtkNSSClientAuthDialogs.cpp
@@ -22,9 +22,7 @@
#include "mozilla-config.h"
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#ifdef HAVE_MOZILLA_PSM
diff --git a/embed/mozilla/GtkNSSDialogs.cpp b/embed/mozilla/GtkNSSDialogs.cpp
index f2031714c..07dc6baa3 100644
--- a/embed/mozilla/GtkNSSDialogs.cpp
+++ b/embed/mozilla/GtkNSSDialogs.cpp
@@ -28,9 +28,7 @@
#include "mozilla-config.h"
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#ifdef HAVE_MOZILLA_PSM
diff --git a/embed/mozilla/GtkNSSKeyPairDialogs.cpp b/embed/mozilla/GtkNSSKeyPairDialogs.cpp
index b0ff1cf0b..0588e94b8 100644
--- a/embed/mozilla/GtkNSSKeyPairDialogs.cpp
+++ b/embed/mozilla/GtkNSSKeyPairDialogs.cpp
@@ -37,9 +37,7 @@
#include "mozilla-config.h"
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#ifdef HAVE_MOZILLA_PSM
diff --git a/embed/mozilla/MozDownload.cpp b/embed/mozilla/MozDownload.cpp
index a70daf0c8..1160bfa2b 100644
--- a/embed/mozilla/MozDownload.cpp
+++ b/embed/mozilla/MozDownload.cpp
@@ -43,9 +43,7 @@
#include "mozilla-config.h"
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include "mozilla-download.h"
#include "eel-gconf-extensions.h"
diff --git a/embed/mozilla/MozDownload.h b/embed/mozilla/MozDownload.h
index ed01d248e..9addcadb1 100644
--- a/embed/mozilla/MozDownload.h
+++ b/embed/mozilla/MozDownload.h
@@ -42,9 +42,7 @@
#ifndef MozDownload_h__
#define MozDownload_h__
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include "mozilla-embed-persist.h"
#include "downloader-view.h"
diff --git a/embed/mozilla/MozRegisterComponents.cpp b/embed/mozilla/MozRegisterComponents.cpp
index fdb2ae96f..fba9f2ffc 100644
--- a/embed/mozilla/MozRegisterComponents.cpp
+++ b/embed/mozilla/MozRegisterComponents.cpp
@@ -21,9 +21,7 @@
#include "mozilla-config.h"
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include "ContentHandler.h"
#include "FilePicker.h"
diff --git a/embed/mozilla/PrintingPromptService.cpp b/embed/mozilla/PrintingPromptService.cpp
index 05138e86d..dd97c9de6 100644
--- a/embed/mozilla/PrintingPromptService.cpp
+++ b/embed/mozilla/PrintingPromptService.cpp
@@ -21,9 +21,7 @@
#include "mozilla-config.h"
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include <gtk/gtkdialog.h>
diff --git a/embed/mozilla/mozilla-download.cpp b/embed/mozilla/mozilla-download.cpp
index 48d05ecb2..d6c5b1a0d 100644
--- a/embed/mozilla/mozilla-download.cpp
+++ b/embed/mozilla/mozilla-download.cpp
@@ -20,9 +20,7 @@
#include "mozilla-config.h"
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include "mozilla-download.h"
diff --git a/embed/mozilla/mozilla-embed-event.cpp b/embed/mozilla/mozilla-embed-event.cpp
index d7a4b685c..3eda0aa45 100644
--- a/embed/mozilla/mozilla-embed-event.cpp
+++ b/embed/mozilla/mozilla-embed-event.cpp
@@ -21,9 +21,7 @@
#include "mozilla-config.h"
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include "mozilla-embed-event.h"
diff --git a/embed/mozilla/mozilla-embed-persist.cpp b/embed/mozilla/mozilla-embed-persist.cpp
index ac3940d6b..4e6b08efd 100644
--- a/embed/mozilla/mozilla-embed-persist.cpp
+++ b/embed/mozilla/mozilla-embed-persist.cpp
@@ -20,9 +20,7 @@
#include "mozilla-config.h"
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include "mozilla-embed-persist.h"
#include "mozilla-embed.h"
diff --git a/embed/mozilla/mozilla-embed-single.cpp b/embed/mozilla/mozilla-embed-single.cpp
index 3a51db7bb..db8c57438 100644
--- a/embed/mozilla/mozilla-embed-single.cpp
+++ b/embed/mozilla/mozilla-embed-single.cpp
@@ -21,9 +21,7 @@
#include "mozilla-config.h"
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include "mozilla-embed-single.h"
diff --git a/embed/mozilla/mozilla-embed.cpp b/embed/mozilla/mozilla-embed.cpp
index f5652be5c..7422c2325 100644
--- a/embed/mozilla/mozilla-embed.cpp
+++ b/embed/mozilla/mozilla-embed.cpp
@@ -21,9 +21,7 @@
#include "mozilla-config.h"
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include "mozilla-embed.h"
#include "mozilla-embed-event.h"
diff --git a/embed/mozilla/mozilla-notifiers.cpp b/embed/mozilla/mozilla-notifiers.cpp
index 1ddfdc69f..f8c324f2d 100644
--- a/embed/mozilla/mozilla-notifiers.cpp
+++ b/embed/mozilla/mozilla-notifiers.cpp
@@ -21,9 +21,7 @@
#include "mozilla-config.h"
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include "ephy-embed-single.h"
#include "ephy-embed-shell.h"
diff --git a/embed/print-dialog.c b/embed/print-dialog.c
index 962e93122..4b11890e8 100755
--- a/embed/print-dialog.c
+++ b/embed/print-dialog.c
@@ -19,9 +19,7 @@
* $Id$
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include "print-dialog.h"
#include "ephy-embed-single.h"
diff --git a/lib/eel-gconf-extensions.c b/lib/eel-gconf-extensions.c
index b3dc0ac63..c3c489702 100644
--- a/lib/eel-gconf-extensions.c
+++ b/lib/eel-gconf-extensions.c
@@ -24,9 +24,7 @@
$Id$
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include "eel-gconf-extensions.h"
diff --git a/lib/egg/egg-editable-toolbar.c b/lib/egg/egg-editable-toolbar.c
index 0e7bc7d5e..381ed8670 100755
--- a/lib/egg/egg-editable-toolbar.c
+++ b/lib/egg/egg-editable-toolbar.c
@@ -19,9 +19,7 @@
* $Id$
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include "egg-editable-toolbar.h"
#include "egg-toolbars-model.h"
diff --git a/lib/egg/egg-toolbars-model.c b/lib/egg/egg-toolbars-model.c
index 0d91878e7..c4c30880f 100755
--- a/lib/egg/egg-toolbars-model.c
+++ b/lib/egg/egg-toolbars-model.c
@@ -19,9 +19,7 @@
* $Id$
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include "egg-toolbars-model.h"
#include "eggmarshalers.h"
diff --git a/lib/ephy-debug.c b/lib/ephy-debug.c
index b2a4c5a4b..6ec0565c2 100644
--- a/lib/ephy-debug.c
+++ b/lib/ephy-debug.c
@@ -18,9 +18,7 @@
* $Id$
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include "ephy-debug.h"
diff --git a/lib/ephy-debug.h b/lib/ephy-debug.h
index 0be7f73bc..f2311e49b 100644
--- a/lib/ephy-debug.h
+++ b/lib/ephy-debug.h
@@ -21,9 +21,7 @@
#ifndef EPHY_DEBUG_H
#define EPHY_DEBUG_H
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include <glib.h>
diff --git a/lib/ephy-dialog.c b/lib/ephy-dialog.c
index bf76ba069..dd13715ff 100644
--- a/lib/ephy-dialog.c
+++ b/lib/ephy-dialog.c
@@ -19,9 +19,7 @@
* $Id$
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include "ephy-dialog.h"
#include "ephy-glade.h"
diff --git a/lib/ephy-dnd.c b/lib/ephy-dnd.c
index fa2a7cf78..6ff9cff16 100644
--- a/lib/ephy-dnd.c
+++ b/lib/ephy-dnd.c
@@ -18,9 +18,7 @@
* $Id$
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include "ephy-dnd.h"
#include "ephy-string.h"
diff --git a/lib/ephy-file-chooser.c b/lib/ephy-file-chooser.c
index 7c933a3a5..b9bccc588 100644
--- a/lib/ephy-file-chooser.c
+++ b/lib/ephy-file-chooser.c
@@ -19,9 +19,7 @@
* $Id$
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include "ephy-file-chooser.h"
#include "ephy-file-helpers.h"
diff --git a/lib/ephy-file-helpers.c b/lib/ephy-file-helpers.c
index 49f4c487d..fb6e3ac1f 100644
--- a/lib/ephy-file-helpers.c
+++ b/lib/ephy-file-helpers.c
@@ -18,9 +18,7 @@
* $Id$
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include <string.h>
#include <stdlib.h>
diff --git a/lib/ephy-glade.c b/lib/ephy-glade.c
index 5cd521a77..ce91c9954 100644
--- a/lib/ephy-glade.c
+++ b/lib/ephy-glade.c
@@ -18,9 +18,7 @@
* $Id$
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include "ephy-glade.h"
diff --git a/lib/ephy-gui.c b/lib/ephy-gui.c
index 39f72b9d3..de4d3abdc 100644
--- a/lib/ephy-gui.c
+++ b/lib/ephy-gui.c
@@ -18,9 +18,7 @@
* $Id$
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include "ephy-gui.h"
#include "eel-gconf-extensions.h"
diff --git a/lib/ephy-langs.c b/lib/ephy-langs.c
index b2282472a..ff05c34e1 100644
--- a/lib/ephy-langs.c
+++ b/lib/ephy-langs.c
@@ -18,9 +18,7 @@
* $Id$
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include "ephy-langs.h"
diff --git a/lib/ephy-loader.c b/lib/ephy-loader.c
index d4b1a0375..9d682caa9 100644
--- a/lib/ephy-loader.c
+++ b/lib/ephy-loader.c
@@ -19,9 +19,7 @@
* $Id$
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include "ephy-loader.h"
diff --git a/lib/ephy-module.c b/lib/ephy-module.c
index 95f9a587e..fe31e39c6 100644
--- a/lib/ephy-module.c
+++ b/lib/ephy-module.c
@@ -19,9 +19,7 @@
* $Id$
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include "ephy-module.h"
#include "ephy-file-helpers.h"
diff --git a/lib/ephy-node-db.c b/lib/ephy-node-db.c
index 09c6272c4..3774b63fd 100644
--- a/lib/ephy-node-db.c
+++ b/lib/ephy-node-db.c
@@ -20,9 +20,7 @@
* $Id$
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include "ephy-node-db.h"
#include "ephy-file-helpers.h"
diff --git a/lib/ephy-node-filter.c b/lib/ephy-node-filter.c
index fd270b636..6e87a471e 100644
--- a/lib/ephy-node-filter.c
+++ b/lib/ephy-node-filter.c
@@ -19,9 +19,7 @@
* $Id$
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include <stdlib.h>
#include <string.h>
diff --git a/lib/ephy-node.c b/lib/ephy-node.c
index 3a6ec2480..1a8e53292 100644
--- a/lib/ephy-node.c
+++ b/lib/ephy-node.c
@@ -20,9 +20,7 @@
* $Id$
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include <glib.h>
#include <glib/gi18n.h>
diff --git a/lib/ephy-shlib-loader.c b/lib/ephy-shlib-loader.c
index 5877ee341..f5b759b64 100644
--- a/lib/ephy-shlib-loader.c
+++ b/lib/ephy-shlib-loader.c
@@ -19,9 +19,7 @@
* $Id$
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include "ephy-shlib-loader.h"
#include "ephy-loader.h"
diff --git a/lib/ephy-state.c b/lib/ephy-state.c
index 04fa76d83..452d56b7b 100644
--- a/lib/ephy-state.c
+++ b/lib/ephy-state.c
@@ -20,9 +20,7 @@
* $Id$
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include "ephy-state.h"
#include "ephy-file-helpers.h"
diff --git a/lib/ephy-stock-icons.c b/lib/ephy-stock-icons.c
index 566c2e37c..8665aa1ec 100644
--- a/lib/ephy-stock-icons.c
+++ b/lib/ephy-stock-icons.c
@@ -18,9 +18,7 @@
* $Id$
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include <gtk/gtk.h>
#include <glib.h>
diff --git a/lib/ephy-string.c b/lib/ephy-string.c
index dbda76275..e3095c376 100644
--- a/lib/ephy-string.c
+++ b/lib/ephy-string.c
@@ -18,9 +18,7 @@
* $Id$
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include "ephy-string.h"
diff --git a/lib/ephy-zoom.c b/lib/ephy-zoom.c
index 2e3a15a4a..b6cf8c68b 100644
--- a/lib/ephy-zoom.c
+++ b/lib/ephy-zoom.c
@@ -18,9 +18,7 @@
* $Id$
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include "ephy-zoom.h"
diff --git a/lib/widgets/ephy-location-entry.c b/lib/widgets/ephy-location-entry.c
index 451efb507..100af8f58 100644
--- a/lib/widgets/ephy-location-entry.c
+++ b/lib/widgets/ephy-location-entry.c
@@ -21,9 +21,7 @@
* $Id$
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include "ephy-tree-model-node.h"
#include "ephy-location-entry.h"
diff --git a/lib/widgets/ephy-node-view.c b/lib/widgets/ephy-node-view.c
index 2ef02b648..2a0ec2d6f 100644
--- a/lib/widgets/ephy-node-view.c
+++ b/lib/widgets/ephy-node-view.c
@@ -18,9 +18,7 @@
* $Id$
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include <gtk/gtktreeselection.h>
#include <gtk/gtktreeviewcolumn.h>
diff --git a/lib/widgets/ephy-search-entry.c b/lib/widgets/ephy-search-entry.c
index 0c4469e32..3212ad767 100644
--- a/lib/widgets/ephy-search-entry.c
+++ b/lib/widgets/ephy-search-entry.c
@@ -18,9 +18,7 @@
* $Id$
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include <gtk/gtklabel.h>
#include <glib/gi18n.h>
diff --git a/lib/widgets/ephy-spinner.c b/lib/widgets/ephy-spinner.c
index 13a9d80d7..fc0fbcc7a 100644
--- a/lib/widgets/ephy-spinner.c
+++ b/lib/widgets/ephy-spinner.c
@@ -28,9 +28,7 @@
* $Id$
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include "ephy-spinner.h"
#include "ephy-debug.h"
diff --git a/lib/widgets/ephy-tree-model-node.c b/lib/widgets/ephy-tree-model-node.c
index 60355eaf7..487c9aa38 100644
--- a/lib/widgets/ephy-tree-model-node.c
+++ b/lib/widgets/ephy-tree-model-node.c
@@ -18,9 +18,7 @@
* $Id$
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include <gdk-pixbuf/gdk-pixbuf.h>
#include <time.h>
diff --git a/lib/widgets/ephy-tree-model-sort.c b/lib/widgets/ephy-tree-model-sort.c
index df5f9533c..d088f524f 100644
--- a/lib/widgets/ephy-tree-model-sort.c
+++ b/lib/widgets/ephy-tree-model-sort.c
@@ -18,9 +18,7 @@
* $Id$
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include <gtk/gtkmarshal.h>
#include <gtk/gtktreednd.h>
diff --git a/lib/widgets/ephy-zoom-action.c b/lib/widgets/ephy-zoom-action.c
index 20e360e89..b23a0b379 100644
--- a/lib/widgets/ephy-zoom-action.c
+++ b/lib/widgets/ephy-zoom-action.c
@@ -19,9 +19,7 @@
* $Id$
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include "ephy-zoom-action.h"
#include "ephy-zoom-control.h"
diff --git a/lib/widgets/ephy-zoom-control.c b/lib/widgets/ephy-zoom-control.c
index 644401ea0..c201a4da0 100644
--- a/lib/widgets/ephy-zoom-control.c
+++ b/lib/widgets/ephy-zoom-control.c
@@ -18,9 +18,7 @@
* $Id$
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include "ephy-zoom-control.h"
#include "ephy-marshal.h"
diff --git a/src/bookmarks/ephy-bookmark-action.c b/src/bookmarks/ephy-bookmark-action.c
index 582a22fd8..a1e12f15b 100644
--- a/src/bookmarks/ephy-bookmark-action.c
+++ b/src/bookmarks/ephy-bookmark-action.c
@@ -19,9 +19,7 @@
* $Id$
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include <glib/gi18n.h>
#include <libgnomevfs/gnome-vfs-uri.h>
diff --git a/src/bookmarks/ephy-bookmark-properties.c b/src/bookmarks/ephy-bookmark-properties.c
index 878faa8e1..59b4bec2a 100644
--- a/src/bookmarks/ephy-bookmark-properties.c
+++ b/src/bookmarks/ephy-bookmark-properties.c
@@ -18,9 +18,7 @@
* $Id$
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include "ephy-bookmarksbar-model.h"
#include "ephy-bookmark-properties.h"
diff --git a/src/bookmarks/ephy-bookmarks-editor.c b/src/bookmarks/ephy-bookmarks-editor.c
index ed1903cd8..be2b5e715 100644
--- a/src/bookmarks/ephy-bookmarks-editor.c
+++ b/src/bookmarks/ephy-bookmarks-editor.c
@@ -18,9 +18,7 @@
* $Id$
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include <gtk/gtktable.h>
#include <gtk/gtklabel.h>
diff --git a/src/bookmarks/ephy-bookmarks-export.c b/src/bookmarks/ephy-bookmarks-export.c
index a1fc2ac06..72f5f05ae 100644
--- a/src/bookmarks/ephy-bookmarks-export.c
+++ b/src/bookmarks/ephy-bookmarks-export.c
@@ -19,9 +19,7 @@
* $Id$
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include "ephy-bookmarks-export.h"
#include "ephy-node-common.h"
diff --git a/src/bookmarks/ephy-bookmarks-import.c b/src/bookmarks/ephy-bookmarks-import.c
index 391d4c2e9..52fb3386d 100644
--- a/src/bookmarks/ephy-bookmarks-import.c
+++ b/src/bookmarks/ephy-bookmarks-import.c
@@ -20,9 +20,7 @@
* $Id$
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include <glib.h>
#include <libxml/HTMLtree.h>
diff --git a/src/bookmarks/ephy-bookmarks-menu.c b/src/bookmarks/ephy-bookmarks-menu.c
index 75566ccdc..dfb3aea22 100644
--- a/src/bookmarks/ephy-bookmarks-menu.c
+++ b/src/bookmarks/ephy-bookmarks-menu.c
@@ -19,9 +19,7 @@
* $Id$
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include "ephy-bookmarks-menu.h"
#include "ephy-bookmark-action.h"
diff --git a/src/bookmarks/ephy-bookmarks.c b/src/bookmarks/ephy-bookmarks.c
index ef4e37e47..198d29a9b 100644
--- a/src/bookmarks/ephy-bookmarks.c
+++ b/src/bookmarks/ephy-bookmarks.c
@@ -19,9 +19,7 @@
* $Id$
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include "ephy-bookmarks.h"
#include "ephy-file-helpers.h"
diff --git a/src/bookmarks/ephy-bookmarksbar-model.c b/src/bookmarks/ephy-bookmarksbar-model.c
index abe7dd16f..b1d49d981 100755
--- a/src/bookmarks/ephy-bookmarksbar-model.c
+++ b/src/bookmarks/ephy-bookmarksbar-model.c
@@ -19,9 +19,7 @@
* $Id$
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include "ephy-bookmarksbar-model.h"
#include "ephy-bookmarks.h"
diff --git a/src/bookmarks/ephy-bookmarksbar.c b/src/bookmarks/ephy-bookmarksbar.c
index c143e6bc9..dce1a15be 100644
--- a/src/bookmarks/ephy-bookmarksbar.c
+++ b/src/bookmarks/ephy-bookmarksbar.c
@@ -20,9 +20,7 @@
* $Id$
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include "ephy-bookmarksbar.h"
#include "ephy-bookmarksbar-model.h"
diff --git a/src/bookmarks/ephy-favorites-menu.c b/src/bookmarks/ephy-favorites-menu.c
index f3d79e43b..dce6e5561 100644
--- a/src/bookmarks/ephy-favorites-menu.c
+++ b/src/bookmarks/ephy-favorites-menu.c
@@ -19,9 +19,7 @@
* $Id$
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include "ephy-favorites-menu.h"
#include "ephy-bookmark-action.h"
diff --git a/src/bookmarks/ephy-new-bookmark.c b/src/bookmarks/ephy-new-bookmark.c
index 82cb28dfd..d2813895c 100644
--- a/src/bookmarks/ephy-new-bookmark.c
+++ b/src/bookmarks/ephy-new-bookmark.c
@@ -18,9 +18,7 @@
* $Id$
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include "ephy-new-bookmark.h"
#include "ephy-state.h"
diff --git a/src/bookmarks/ephy-topic-action.c b/src/bookmarks/ephy-topic-action.c
index 540bca442..17004b0b5 100644
--- a/src/bookmarks/ephy-topic-action.c
+++ b/src/bookmarks/ephy-topic-action.c
@@ -18,9 +18,7 @@
* $Id$
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include <gtk/gtktoolitem.h>
#include <glib/gi18n.h>
diff --git a/src/bookmarks/ephy-topics-selector.c b/src/bookmarks/ephy-topics-selector.c
index b6d268c3a..2e2102c59 100644
--- a/src/bookmarks/ephy-topics-selector.c
+++ b/src/bookmarks/ephy-topics-selector.c
@@ -18,9 +18,7 @@
* $Id$
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include "ephy-topics-selector.h"
#include "ephy-debug.h"
diff --git a/src/ephy-automation.c b/src/ephy-automation.c
index aac78e81b..d87ad1372 100644
--- a/src/ephy-automation.c
+++ b/src/ephy-automation.c
@@ -19,9 +19,7 @@
* $Id$
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include "ephy-automation.h"
diff --git a/src/ephy-completion-model.c b/src/ephy-completion-model.c
index 6a0966ba6..0e6c905fa 100644
--- a/src/ephy-completion-model.c
+++ b/src/ephy-completion-model.c
@@ -18,9 +18,7 @@
* $Id$
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include "ephy-completion-model.h"
#include "ephy-node.h"
diff --git a/src/ephy-encoding-dialog.c b/src/ephy-encoding-dialog.c
index bf5d16bb1..1afe804f5 100644
--- a/src/ephy-encoding-dialog.c
+++ b/src/ephy-encoding-dialog.c
@@ -19,9 +19,7 @@
* $Id$
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include "ephy-encoding-dialog.h"
#include "ephy-encodings.h"
diff --git a/src/ephy-encoding-menu.c b/src/ephy-encoding-menu.c
index 1e48e795b..2f5ab540e 100644
--- a/src/ephy-encoding-menu.c
+++ b/src/ephy-encoding-menu.c
@@ -20,9 +20,7 @@
* $Id$
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include "ephy-encoding-menu.h"
#include "ephy-encoding-dialog.h"
diff --git a/src/ephy-extension.c b/src/ephy-extension.c
index 15f27d5cf..6b90876c4 100644
--- a/src/ephy-extension.c
+++ b/src/ephy-extension.c
@@ -19,9 +19,7 @@
* $Id$
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include "ephy-extension.h"
diff --git a/src/ephy-extensions-manager.c b/src/ephy-extensions-manager.c
index 524a24496..b27502527 100644
--- a/src/ephy-extensions-manager.c
+++ b/src/ephy-extensions-manager.c
@@ -20,9 +20,7 @@
* $Id$
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include "ephy-extensions-manager.h"
diff --git a/src/ephy-favicon-action.c b/src/ephy-favicon-action.c
index 95f14edb9..b8fdab189 100644
--- a/src/ephy-favicon-action.c
+++ b/src/ephy-favicon-action.c
@@ -18,9 +18,7 @@
* $Id$
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include "ephy-favicon-action.h"
#include "ephy-window.h"
diff --git a/src/ephy-go-action.c b/src/ephy-go-action.c
index 74fc2fdb5..9eaa5ed1d 100644
--- a/src/ephy-go-action.c
+++ b/src/ephy-go-action.c
@@ -19,9 +19,7 @@
* $Id$
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include "ephy-go-action.h"
#include "ephy-debug.h"
diff --git a/src/ephy-history-window.c b/src/ephy-history-window.c
index 303ebc3a7..cdd9793a3 100644
--- a/src/ephy-history-window.c
+++ b/src/ephy-history-window.c
@@ -18,9 +18,7 @@
* $Id$
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include <gtk/gtktable.h>
#include <gtk/gtklabel.h>
diff --git a/src/ephy-location-action.c b/src/ephy-location-action.c
index 505a82b7e..b34ac0de7 100644
--- a/src/ephy-location-action.c
+++ b/src/ephy-location-action.c
@@ -19,9 +19,7 @@
* $Id$
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include "ephy-location-action.h"
#include "ephy-location-entry.h"
diff --git a/src/ephy-main.c b/src/ephy-main.c
index 0f73fb266..7f8dc617b 100644
--- a/src/ephy-main.c
+++ b/src/ephy-main.c
@@ -18,9 +18,7 @@
* $Id$
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include "ephy-shell.h"
#include "ephy-file-helpers.h"
diff --git a/src/ephy-navigation-action.c b/src/ephy-navigation-action.c
index c49e4b78b..5f826d9bc 100644
--- a/src/ephy-navigation-action.c
+++ b/src/ephy-navigation-action.c
@@ -18,9 +18,7 @@
* $Id$
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include "ephy-navigation-action.h"
#include "ephy-window.h"
diff --git a/src/ephy-notebook.c b/src/ephy-notebook.c
index d4fafb810..e8e9b4541 100644
--- a/src/ephy-notebook.c
+++ b/src/ephy-notebook.c
@@ -20,9 +20,7 @@
* $Id$
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include "ephy-notebook.h"
#include "ephy-stock-icons.h"
diff --git a/src/ephy-session.c b/src/ephy-session.c
index 0dc040070..cbe8e6190 100644
--- a/src/ephy-session.c
+++ b/src/ephy-session.c
@@ -20,9 +20,7 @@
* $Id$
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include "ephy-session.h"
diff --git a/src/ephy-shell.c b/src/ephy-shell.c
index 78ad65c59..49befe177 100644
--- a/src/ephy-shell.c
+++ b/src/ephy-shell.c
@@ -19,9 +19,7 @@
* $Id$
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include "ephy-shell.h"
#include "ephy-embed-shell.h"
diff --git a/src/ephy-statusbar.c b/src/ephy-statusbar.c
index 2ff4a5e30..96117be26 100755
--- a/src/ephy-statusbar.c
+++ b/src/ephy-statusbar.c
@@ -20,9 +20,7 @@
* $Id$
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include "ephy-statusbar.h"
#include "ephy-stock-icons.h"
diff --git a/src/ephy-tab.c b/src/ephy-tab.c
index f63e94ccd..94ce6cbfa 100644
--- a/src/ephy-tab.c
+++ b/src/ephy-tab.c
@@ -21,9 +21,7 @@
* $Id$
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include "ephy-tab.h"
#include "eel-gconf-extensions.h"
diff --git a/src/ephy-tabs-menu.c b/src/ephy-tabs-menu.c
index 2ba5115dc..c207f4c95 100644
--- a/src/ephy-tabs-menu.c
+++ b/src/ephy-tabs-menu.c
@@ -19,9 +19,7 @@
* $Id$
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include "ephy-tabs-menu.h"
#include "ephy-string.h"
diff --git a/src/ephy-toolbars-model.c b/src/ephy-toolbars-model.c
index 48561fc2d..d8a5115b3 100755
--- a/src/ephy-toolbars-model.c
+++ b/src/ephy-toolbars-model.c
@@ -19,9 +19,7 @@
* $Id$
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include "ephy-toolbars-model.h"
#include "ephy-file-helpers.h"
diff --git a/src/ephy-window.c b/src/ephy-window.c
index bb5f7ad33..69016360e 100644
--- a/src/ephy-window.c
+++ b/src/ephy-window.c
@@ -20,9 +20,7 @@
* $Id$
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include "ephy-window.h"
#include "ephy-command-manager.h"
diff --git a/src/pdm-dialog.c b/src/pdm-dialog.c
index 97b3bd2f0..a6dfa8c77 100755
--- a/src/pdm-dialog.c
+++ b/src/pdm-dialog.c
@@ -20,9 +20,7 @@
* $Id$
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include "pdm-dialog.h"
#include "ephy-shell.h"
diff --git a/src/popup-commands.c b/src/popup-commands.c
index 1e7f9e09c..953abea36 100644
--- a/src/popup-commands.c
+++ b/src/popup-commands.c
@@ -18,9 +18,7 @@
* $Id$
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include "popup-commands.h"
#include "ephy-shell.h"
diff --git a/src/ppview-toolbar.c b/src/ppview-toolbar.c
index fee8e5e4e..2474205f8 100755
--- a/src/ppview-toolbar.c
+++ b/src/ppview-toolbar.c
@@ -18,9 +18,7 @@
* $Id$
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include "ppview-toolbar.h"
#include "ephy-window.h"
diff --git a/src/prefs-dialog.c b/src/prefs-dialog.c
index 56f1369c7..06d3cb1f0 100644
--- a/src/prefs-dialog.c
+++ b/src/prefs-dialog.c
@@ -19,9 +19,7 @@
* $Id$
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include "prefs-dialog.h"
#include "ephy-dialog.h"
diff --git a/src/toolbar.c b/src/toolbar.c
index 2b8ffd3b7..9a7718b16 100755
--- a/src/toolbar.c
+++ b/src/toolbar.c
@@ -20,9 +20,7 @@
* $Id$
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include "toolbar.h"
#include "ephy-favicon-action.h"
diff --git a/src/window-commands.c b/src/window-commands.c
index e26969c0d..6f88248f5 100644
--- a/src/window-commands.c
+++ b/src/window-commands.c
@@ -18,9 +18,7 @@
* $Id$
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include "ephy-embed-shell.h"
#include "ephy-embed-single.h"