diff --git a/awesome-version-internal.h b/awesome-version-internal.h
index e916e50c1..173c2d3cf 100644
--- a/awesome-version-internal.h
+++ b/awesome-version-internal.h
@@ -5,3 +5,5 @@
 #define AWESOME_RELEASE             "@AWESOME_RELEASE@"
 
 #endif //_AWE_VERSION_INTERNAL_H_
+
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/build-tests/__builtin_clz.c b/build-tests/__builtin_clz.c
index 42cd15af0..b4ab53785 100644
--- a/build-tests/__builtin_clz.c
+++ b/build-tests/__builtin_clz.c
@@ -10,3 +10,5 @@ main(void)
 
 	return (__builtin_clz(42));
 }
+
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/common/buffer.c b/common/buffer.c
index 0c7757f5c..2bff36042 100644
--- a/common/buffer.c
+++ b/common/buffer.c
@@ -113,3 +113,5 @@ buffer_detach(buffer_t *buf)
     buffer_init(buf);
     return res;
 }
+
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/common/buffer.h b/common/buffer.h
index 1f42029ef..8ada17544 100644
--- a/common/buffer.h
+++ b/common/buffer.h
@@ -195,3 +195,5 @@ void buffer_addf(buffer_t *buf, const char *fmt, ...)
     __attribute__((format(printf, 2, 3)));
 
 #endif
+
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/common/lualib.c b/common/lualib.c
index a2bbcf68a..312fb2d59 100644
--- a/common/lualib.c
+++ b/common/lualib.c
@@ -61,3 +61,5 @@ void luaA_dumpstack(lua_State *L)
     }
     fprintf(stderr, "------- Lua stack dump end ------\n");
 }
+
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/common/version.h b/common/version.h
index ee368bc33..7bf3bc908 100644
--- a/common/version.h
+++ b/common/version.h
@@ -27,3 +27,5 @@ const char *awesome_version_string(void);
 const char *awesome_release_string(void);
 
 #endif
+
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/config.h b/config.h
index 46c2c31ab..94c64070a 100644
--- a/config.h
+++ b/config.h
@@ -10,3 +10,5 @@
 #cmakedefine HAS___BUILTIN_CLZ
 
 #endif //_CONFIG_H_
+
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/xkb.c b/xkb.c
index 07560c9da..95b788844 100644
--- a/xkb.c
+++ b/xkb.c
@@ -315,3 +315,5 @@ xkb_free(void)
                           0);
     xkb_free_keymap();
 }
+
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/xkb.h b/xkb.h
index c3987157a..fc91e1f99 100644
--- a/xkb.h
+++ b/xkb.h
@@ -33,5 +33,6 @@ int luaA_xkb_set_layout_group(lua_State *L);
 int luaA_xkb_get_layout_group(lua_State *L);
 int luaA_xkb_get_group_names(lua_State *L);
 
-
 #endif
+
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/xrdb.c b/xrdb.c
index 974dee756..af393145c 100644
--- a/xrdb.c
+++ b/xrdb.c
@@ -74,3 +74,5 @@ int luaA_xrdb_get_value(lua_State *L) {
     return 0;
   }
 }
+
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/xrdb.h b/xrdb.h
index 57a0083a5..3e0053516 100644
--- a/xrdb.h
+++ b/xrdb.h
@@ -26,5 +26,6 @@
 
 int luaA_xrdb_get_value(lua_State *L);
 
-
 #endif
+
+// vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80