diff --git a/src/gnome-shell-plugin.c b/src/gnome-shell-plugin.c
index bf6c6a04f..011f6ff82 100644
--- a/src/gnome-shell-plugin.c
+++ b/src/gnome-shell-plugin.c
@@ -23,6 +23,8 @@
  * 02111-1307, USA.
  */
 
+#include "config.h"
+
 #define MUTTER_BUILDING_PLUGIN 1
 #include <mutter-plugin.h>
 
diff --git a/src/shell-app-system.c b/src/shell-app-system.c
index 2ec877472..0f61576d5 100644
--- a/src/shell-app-system.c
+++ b/src/shell-app-system.c
@@ -1,5 +1,7 @@
 /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
 
+#include "config.h"
+
 #include "shell-app-system.h"
 #include <string.h>
 
diff --git a/src/shell-app-usage.c b/src/shell-app-usage.c
index f02dd6503..c17c3d207 100644
--- a/src/shell-app-usage.c
+++ b/src/shell-app-usage.c
@@ -1,4 +1,7 @@
 /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
+#include "config.h"
+
 #include <string.h>
 #include <stdlib.h>
 
diff --git a/src/shell-app.c b/src/shell-app.c
index a0c56e4f9..992ad8bd8 100644
--- a/src/shell-app.c
+++ b/src/shell-app.c
@@ -1,5 +1,7 @@
 /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
 
+#include "config.h"
+
 #include "shell-app-private.h"
 #include "shell-global.h"
 
diff --git a/src/shell-arrow.c b/src/shell-arrow.c
index 1d961f3b4..380ec44ca 100644
--- a/src/shell-arrow.c
+++ b/src/shell-arrow.c
@@ -1,5 +1,7 @@
 /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
 
+#include "config.h"
+
 #include "shell-arrow.h"
 
 #include <clutter/clutter.h>
diff --git a/src/shell-drawing.c b/src/shell-drawing.c
index 78a7f54d5..21f7129af 100644
--- a/src/shell-drawing.c
+++ b/src/shell-drawing.c
@@ -1,5 +1,7 @@
 /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
 
+#include "config.h"
+
 #include "shell-drawing.h"
 #include <math.h>
 
diff --git a/src/shell-embedded-window.c b/src/shell-embedded-window.c
index 80c64fff9..a12d7d6b4 100644
--- a/src/shell-embedded-window.c
+++ b/src/shell-embedded-window.c
@@ -1,5 +1,7 @@
 /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
 
+#include "config.h"
+
 #include <gdk/gdkx.h>
 #include <clutter/x11/clutter-x11.h>
 
diff --git a/src/shell-gconf.c b/src/shell-gconf.c
index 2d065512b..7073bbdcf 100644
--- a/src/shell-gconf.c
+++ b/src/shell-gconf.c
@@ -1,5 +1,7 @@
 /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
 
+#include "config.h"
+
 #include "shell-gconf.h"
 
 #include <gconf/gconf-client.h>
diff --git a/src/shell-generic-container.c b/src/shell-generic-container.c
index db74ecb62..68b3afde2 100644
--- a/src/shell-generic-container.c
+++ b/src/shell-generic-container.c
@@ -94,6 +94,8 @@ function runTestFixedBox() {
 }
 */
 
+#include "config.h"
+
 #include "shell-generic-container.h"
 
 #include <clutter/clutter.h>
diff --git a/src/shell-global.c b/src/shell-global.c
index 5bb7e69d4..a36753e9a 100644
--- a/src/shell-global.c
+++ b/src/shell-global.c
@@ -1,5 +1,7 @@
 /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
 
+#include "config.h"
+
 #include "shell-global-private.h"
 #include "shell-wm.h"
 
@@ -19,6 +21,9 @@
 #include <math.h>
 #include <X11/extensions/Xfixes.h>
 #include <gjs/gjs.h>
+#ifdef HAVE_SYS_RESOURCE_H
+#include <sys/resource.h>
+#endif
 
 #define SHELL_DBUS_SERVICE "org.gnome.Shell"
 
diff --git a/src/shell-gtk-embed.c b/src/shell-gtk-embed.c
index 0d5f2978e..35f004bc0 100644
--- a/src/shell-gtk-embed.c
+++ b/src/shell-gtk-embed.c
@@ -1,5 +1,7 @@
 /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
 
+#include "config.h"
+
 #include "shell-embedded-window-private.h"
 
 #include <clutter/glx/clutter-glx.h>
diff --git a/src/shell-menu.c b/src/shell-menu.c
index 4fce08c5f..605a7ab74 100644
--- a/src/shell-menu.c
+++ b/src/shell-menu.c
@@ -8,6 +8,8 @@
  * popup-menu like actors.
  */
 
+#include "config.h"
+
 #include "shell-menu.h"
 
 G_DEFINE_TYPE(ShellMenu, shell_menu, BIG_TYPE_BOX);
diff --git a/src/shell-overflow-list.c b/src/shell-overflow-list.c
index a5dc8f96f..a398a854b 100644
--- a/src/shell-overflow-list.c
+++ b/src/shell-overflow-list.c
@@ -1,5 +1,7 @@
 /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
 
+#include "config.h"
+
 #include "shell-overflow-list.h"
 
 G_DEFINE_TYPE (ShellOverflowList,
diff --git a/src/shell-process.c b/src/shell-process.c
index 443c48258..afa3abdf6 100644
--- a/src/shell-process.c
+++ b/src/shell-process.c
@@ -1,5 +1,7 @@
 /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
 
+#include "config.h"
+
 #include "shell-process.h"
 
 #include <sys/types.h>
diff --git a/src/shell-recorder-src.c b/src/shell-recorder-src.c
index 21eebe44e..5fbdf7c7b 100644
--- a/src/shell-recorder-src.c
+++ b/src/shell-recorder-src.c
@@ -1,5 +1,7 @@
 /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
 
+#include "config.h"
+
 #include <gst/base/gstpushsrc.h>
 
 #include "shell-recorder-src.h"
diff --git a/src/shell-recorder.c b/src/shell-recorder.c
index 70f833eb2..4c0304e22 100644
--- a/src/shell-recorder.c
+++ b/src/shell-recorder.c
@@ -1,5 +1,7 @@
 /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
 
+#include "config.h"
+
 #include <fcntl.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/src/shell-stack.c b/src/shell-stack.c
index ea3ec2c33..f1bdf76a3 100644
--- a/src/shell-stack.c
+++ b/src/shell-stack.c
@@ -12,6 +12,8 @@
  * size, even if that would overflow the size allocated to the stack.
  */
 
+#include "config.h"
+
 #include "shell-stack.h"
 
 G_DEFINE_TYPE (ShellStack,
diff --git a/src/shell-texture-cache.c b/src/shell-texture-cache.c
index 55bdc2c63..90402eec0 100644
--- a/src/shell-texture-cache.c
+++ b/src/shell-texture-cache.c
@@ -1,5 +1,7 @@
 /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
 
+#include "config.h"
+
 #include "shell-texture-cache.h"
 #include "shell-global.h"
 #include <gtk/gtk.h>
diff --git a/src/shell-tray-manager.c b/src/shell-tray-manager.c
index 9940461a3..474c5c609 100644
--- a/src/shell-tray-manager.c
+++ b/src/shell-tray-manager.c
@@ -1,5 +1,7 @@
 /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
 
+#include "config.h"
+
 #include <clutter/clutter.h>
 #include <clutter/x11/clutter-x11.h>
 #include <gtk/gtk.h>
diff --git a/src/shell-uri-util.c b/src/shell-uri-util.c
index ccb9591d6..69937859a 100644
--- a/src/shell-uri-util.c
+++ b/src/shell-uri-util.c
@@ -1,5 +1,7 @@
 /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
 
+#include "config.h"
+
 #include "shell-uri-util.h"
 #include <glib/gi18n.h>
 #include <gconf/gconf-client.h>
diff --git a/src/shell-window-tracker.c b/src/shell-window-tracker.c
index 57226b7d5..3c9bec64c 100644
--- a/src/shell-window-tracker.c
+++ b/src/shell-window-tracker.c
@@ -1,4 +1,7 @@
 /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
+#include "config.h"
+
 #include <string.h>
 #include <stdlib.h>
 
diff --git a/src/shell-wm.c b/src/shell-wm.c
index 3b757cc0c..6ddd65560 100644
--- a/src/shell-wm.c
+++ b/src/shell-wm.c
@@ -1,5 +1,7 @@
 /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
 
+#include "config.h"
+
 #include <string.h>
 
 #include "shell-wm.h"