diff --git a/src/shell-app-system.h b/src/shell-app-system.h
index 7b8ec482a..3e3bee111 100644
--- a/src/shell-app-system.h
+++ b/src/shell-app-system.h
@@ -1,3 +1,4 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
 #ifndef __SHELL_APP_SYSTEM_H__
 #define __SHELL_APP_SYSTEM_H__
 
diff --git a/src/shell-arrow.h b/src/shell-arrow.h
index 500d201ed..3a18a1677 100644
--- a/src/shell-arrow.h
+++ b/src/shell-arrow.h
@@ -1,3 +1,4 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
 #ifndef __SHELL_ARROW_H__
 #define __SHELL_ARROW_H__
 
diff --git a/src/shell-button-box.h b/src/shell-button-box.h
index 4bd756ad3..3ebe8d772 100644
--- a/src/shell-button-box.h
+++ b/src/shell-button-box.h
@@ -1,3 +1,4 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
 #ifndef __SHELL_BUTTON_BOX_H__
 #define __SHELL_BUTTON_BOX_H__
 
diff --git a/src/shell-drawing-area.h b/src/shell-drawing-area.h
index 7a4eef918..9cc0f8b71 100644
--- a/src/shell-drawing-area.h
+++ b/src/shell-drawing-area.h
@@ -1,3 +1,4 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
 #ifndef __SHELL_DRAWING_AREA_H__
 #define __SHELL_DRAWING_AREA_H__
 
diff --git a/src/shell-embedded-window-private.h b/src/shell-embedded-window-private.h
index 44b00c206..1c696db00 100644
--- a/src/shell-embedded-window-private.h
+++ b/src/shell-embedded-window-private.h
@@ -1,3 +1,4 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
 #ifndef __SHELL_EMBEDDED_WINDOW_PRIVATE_H__
 #define __SHELL_EMBEDDED_WINDOW_PRIVATE_H__
 
diff --git a/src/shell-embedded-window.h b/src/shell-embedded-window.h
index 98572ac86..91923a657 100644
--- a/src/shell-embedded-window.h
+++ b/src/shell-embedded-window.h
@@ -1,3 +1,4 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
 #ifndef __SHELL_EMBEDDED_WINDOW_H__
 #define __SHELL_EMBEDDED_WINDOW_H__
 
diff --git a/src/shell-generic-container.h b/src/shell-generic-container.h
index 0740a5644..53e0907d5 100644
--- a/src/shell-generic-container.h
+++ b/src/shell-generic-container.h
@@ -1,3 +1,4 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
 #ifndef __SHELL_GENERIC_CONTAINER_H__
 #define __SHELL_GENERIC_CONTAINER_H__
 
diff --git a/src/shell-global.h b/src/shell-global.h
index d081cffba..db2e0691e 100644
--- a/src/shell-global.h
+++ b/src/shell-global.h
@@ -1,3 +1,4 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
 #ifndef __SHELL_GLOBAL_H__
 #define __SHELL_GLOBAL_H__
 
diff --git a/src/shell-gtk-embed.h b/src/shell-gtk-embed.h
index a6b014f6c..d8f4e1dad 100644
--- a/src/shell-gtk-embed.h
+++ b/src/shell-gtk-embed.h
@@ -1,3 +1,4 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
 #ifndef __SHELL_GTK_EMBED_H__
 #define __SHELL_GTK_EMBED_H__
 
diff --git a/src/shell-menu.h b/src/shell-menu.h
index bfe909adc..6507988d9 100644
--- a/src/shell-menu.h
+++ b/src/shell-menu.h
@@ -1,3 +1,4 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
 #ifndef __SHELL_MENU_H__
 #define __SHELL_MENU_H__
 
diff --git a/src/shell-process.c b/src/shell-process.c
index cec76e9b7..443c48258 100644
--- a/src/shell-process.c
+++ b/src/shell-process.c
@@ -1,3 +1,5 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
 #include "shell-process.h"
 
 #include <sys/types.h>
diff --git a/src/shell-process.h b/src/shell-process.h
index c3c1991b8..ef6b2a878 100644
--- a/src/shell-process.h
+++ b/src/shell-process.h
@@ -1,3 +1,4 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
 #ifndef __SHELL_PROCESS_H__
 #define __SHELL_PROCESS_H__
 
diff --git a/src/shell-recorder-src.c b/src/shell-recorder-src.c
index 9bce4d746..21eebe44e 100644
--- a/src/shell-recorder-src.c
+++ b/src/shell-recorder-src.c
@@ -1,3 +1,5 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
 #include <gst/base/gstpushsrc.h>
 
 #include "shell-recorder-src.h"
diff --git a/src/shell-recorder-src.h b/src/shell-recorder-src.h
index d4782202d..6f99c55da 100644
--- a/src/shell-recorder-src.h
+++ b/src/shell-recorder-src.h
@@ -1,3 +1,4 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
 #ifndef __SHELL_RECORDER_SRC_H__
 #define __SHELL_RECORDER_SRC_H__
 
diff --git a/src/shell-recorder.h b/src/shell-recorder.h
index 359e5288b..26b76ec04 100644
--- a/src/shell-recorder.h
+++ b/src/shell-recorder.h
@@ -1,3 +1,4 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
 #ifndef __SHELL_RECORDER_H__
 #define __SHELL_RECORDER_H__
 
diff --git a/src/shell-stack.h b/src/shell-stack.h
index ade255cbc..dccbd7386 100644
--- a/src/shell-stack.h
+++ b/src/shell-stack.h
@@ -1,3 +1,4 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
 #ifndef __SHELL_STACK_H__
 #define __SHELL_STACK_H__
 
diff --git a/src/shell-texture-cache.c b/src/shell-texture-cache.c
index bb51f297f..55bdc2c63 100644
--- a/src/shell-texture-cache.c
+++ b/src/shell-texture-cache.c
@@ -1,3 +1,5 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
 #include "shell-texture-cache.h"
 #include "shell-global.h"
 #include <gtk/gtk.h>
diff --git a/src/shell-texture-cache.h b/src/shell-texture-cache.h
index 057eae353..21dc7d74b 100644
--- a/src/shell-texture-cache.h
+++ b/src/shell-texture-cache.h
@@ -1,3 +1,4 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
 #ifndef __SHELL_TEXTURE_CACHE_H__
 #define __SHELL_TEXTURE_CACHE_H__
 
diff --git a/src/shell-uri-util.h b/src/shell-uri-util.h
index a3ee2ffa3..eef415a47 100644
--- a/src/shell-uri-util.h
+++ b/src/shell-uri-util.h
@@ -1,5 +1,7 @@
-#ifndef __SHELL_UTIL_H__
-#define __SHELL_UTIL_H__
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
+#ifndef __SHELL_URI_UTIL_H__
+#define __SHELL_URI_UTIL_H__
 
 #include <gio/gio.h>
 
@@ -10,4 +12,4 @@ GIcon *shell_util_get_icon_for_uri (const char *text_uri);
 
 G_END_DECLS
 
-#endif /* __SHELL_UTIL_H__ */
+#endif /* __SHELL_URI_UTIL_H__ */
diff --git a/src/shell-wm.h b/src/shell-wm.h
index aa8e13195..30eb19351 100644
--- a/src/shell-wm.h
+++ b/src/shell-wm.h
@@ -1,3 +1,4 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
 #ifndef __SHELL_WM_H__
 #define __SHELL_WM_H__
 
diff --git a/src/st/st-table-private.h b/src/st/st-table-private.h
index ebf59344c..6115cdf60 100644
--- a/src/st/st-table-private.h
+++ b/src/st/st-table-private.h
@@ -1,3 +1,4 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
 /*
  * st-private-private.h: Private declarations for StTable
  *
diff --git a/src/test-recorder.c b/src/test-recorder.c
index d8da9c506..9b3f7b5fd 100644
--- a/src/test-recorder.c
+++ b/src/test-recorder.c
@@ -1,3 +1,5 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
 #include "shell-recorder.h"
 #include <clutter/clutter.h>
 #include <gst/gst.h>