16 files changed, 60 insertions, 5 deletions
diff --git a/shell/e-shell-backend.c b/shell/e-shell-backend.c
index b1dadce99d..d8af58c6b3 100644
--- a/shell/e-shell-backend.c
+++ b/shell/e-shell-backend.c
@@ -27,6 +27,10 @@
  * @include: shell/e-shell-backend.h
  **/
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-shell-backend.h"
 
 #include <errno.h>
diff --git a/shell/e-shell-common.h b/shell/e-shell-common.h
index 7ff35091aa..bb5529bd5c 100644
--- a/shell/e-shell-common.h
+++ b/shell/e-shell-common.h
@@ -22,10 +22,6 @@
 #ifndef E_SHELL_COMMON_H
 #define E_SHELL_COMMON_H
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include <gio/gio.h>
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
diff --git a/shell/e-shell-content.c b/shell/e-shell-content.c
index d32671e732..51ca37e92e 100644
--- a/shell/e-shell-content.c
+++ b/shell/e-shell-content.c
@@ -25,6 +25,10 @@
  * @include: shell/e-shell-content.h
  **/
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-shell-content.h"
 
 #include <glib/gi18n.h>
diff --git a/shell/e-shell-meego.c b/shell/e-shell-meego.c
index 2c95bef060..7bc23d5be4 100644
--- a/shell/e-shell-meego.c
+++ b/shell/e-shell-meego.c
@@ -21,6 +21,10 @@
  *	Chris Lord  <chris@linux.intel.com>
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <glib.h>
 #include <e-shell-meego.h>
 
diff --git a/shell/e-shell-migrate.c b/shell/e-shell-migrate.c
index 6874c2e304..5863e1c4a0 100644
--- a/shell/e-shell-migrate.c
+++ b/shell/e-shell-migrate.c
@@ -19,6 +19,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-shell-migrate.h"
 
 #include <errno.h>
diff --git a/shell/e-shell-searchbar.c b/shell/e-shell-searchbar.c
index cf2f6ef1ee..e0c10c656a 100644
--- a/shell/e-shell-searchbar.c
+++ b/shell/e-shell-searchbar.c
@@ -25,9 +25,12 @@
  * @include: shell/e-shell-searchbar.h
  **/
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-shell-searchbar.h"
 
-#include <config.h>
 #include <glib/gi18n-lib.h>
 
 #include "e-util/e-util.h"
diff --git a/shell/e-shell-settings.c b/shell/e-shell-settings.c
index e43139acb4..5e5f3428fe 100644
--- a/shell/e-shell-settings.c
+++ b/shell/e-shell-settings.c
@@ -25,6 +25,10 @@
  * @include: shell/e-shell-settings.h
  **/
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-shell-settings.h"
 
 #include "e-util/gconf-bridge.h"
diff --git a/shell/e-shell-sidebar.c b/shell/e-shell-sidebar.c
index b72a210300..abe37b7cbd 100644
--- a/shell/e-shell-sidebar.c
+++ b/shell/e-shell-sidebar.c
@@ -25,6 +25,10 @@
  * @include: shell/e-shell-sidebar.h
  **/
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-shell-sidebar.h"
 
 #include <e-util/e-alert-sink.h>
diff --git a/shell/e-shell-switcher.c b/shell/e-shell-switcher.c
index 594862df8a..f70697b8bc 100644
--- a/shell/e-shell-switcher.c
+++ b/shell/e-shell-switcher.c
@@ -25,6 +25,10 @@
  * @include: shell/e-shell-switcher.h
  **/
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-shell-switcher.h"
 
 #include <glib/gi18n.h>
diff --git a/shell/e-shell-taskbar.c b/shell/e-shell-taskbar.c
index 943a098dd2..1ddbd357e0 100644
--- a/shell/e-shell-taskbar.c
+++ b/shell/e-shell-taskbar.c
@@ -25,6 +25,10 @@
  * @include: shell/e-shell-taskbar.h
  **/
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-shell-taskbar.h"
 
 #include <e-shell-view.h>
diff --git a/shell/e-shell-utils.c b/shell/e-shell-utils.c
index 43ddd0562c..749eb22bd5 100644
--- a/shell/e-shell-utils.c
+++ b/shell/e-shell-utils.c
@@ -25,6 +25,10 @@
  * @include: shell/e-shell-utils.h
  **/
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-shell-utils.h"
 
 #include <glib/gi18n-lib.h>
diff --git a/shell/e-shell-view.c b/shell/e-shell-view.c
index 43d843108d..10842014d4 100644
--- a/shell/e-shell-view.c
+++ b/shell/e-shell-view.c
@@ -25,6 +25,10 @@
  * @include: shell/e-shell-view.h
  **/
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-shell-view.h"
 
 #include <string.h>
diff --git a/shell/e-shell-window-actions.c b/shell/e-shell-window-actions.c
index 60792ba5b6..cba0c52428 100644
--- a/shell/e-shell-window-actions.c
+++ b/shell/e-shell-window-actions.c
@@ -19,6 +19,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-shell-window-private.h"
 #include "e-preferences-window.h"
 
diff --git a/shell/e-shell-window-private.c b/shell/e-shell-window-private.c
index 613529419b..105e45e6a6 100644
--- a/shell/e-shell-window-private.c
+++ b/shell/e-shell-window-private.c
@@ -19,6 +19,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-shell-window-private.h"
 
 static void
diff --git a/shell/e-shell-window.c b/shell/e-shell-window.c
index 7d8e6c5f85..25dfe43660 100644
--- a/shell/e-shell-window.c
+++ b/shell/e-shell-window.c
@@ -25,6 +25,10 @@
  * @include: shell/e-shell-window.h
  **/
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-shell-window-private.h"
 
 enum {
diff --git a/shell/e-shell.c b/shell/e-shell.c
index 60f145e7d0..dbcb55b36a 100644
--- a/shell/e-shell.c
+++ b/shell/e-shell.c
@@ -25,6 +25,10 @@
  * @include: shell/e-shell.h
  **/
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "e-shell.h"
 
 #include <glib/gi18n.h>