diff --git a/tools/console/daemon/io.c b/tools/console/daemon/io.c
index 8dac279bbb..a43c57edad 100644
--- a/tools/console/daemon/io.c
+++ b/tools/console/daemon/io.c
@@ -1470,9 +1470,9 @@ void handle_io(void)
 
 /*
  * Local variables:
+ *  mode: C
  *  c-file-style: "linux"
  *  indent-tabs-mode: t
- *  c-indent-level: 8
  *  c-basic-offset: 8
  *  tab-width: 8
  * End:
diff --git a/tools/console/daemon/main.c b/tools/console/daemon/main.c
index 5d9d55b430..30124a1c19 100644
--- a/tools/console/daemon/main.c
+++ b/tools/console/daemon/main.c
@@ -216,9 +216,9 @@ int main(int argc, char **argv)
 
 /*
  * Local variables:
+ *  mode: C
  *  c-file-style: "linux"
  *  indent-tabs-mode: t
- *  c-indent-level: 8
  *  c-basic-offset: 8
  *  tab-width: 8
  * End:
diff --git a/tools/include/xen-sys/SunOS/evtchn.h b/tools/include/xen-sys/SunOS/evtchn.h
index abc8c60037..e9d08d9dfc 100644
--- a/tools/include/xen-sys/SunOS/evtchn.h
+++ b/tools/include/xen-sys/SunOS/evtchn.h
@@ -85,9 +85,9 @@ struct ioctl_evtchn_notify {
 
 /*
  * Local variables:
- *  c-file-style: "solaris"
+ *  mode: C
+ *  c-file-style: "linux"
  *  indent-tabs-mode: t
- *  c-indent-level: 8
  *  c-basic-offset: 8
  *  tab-width: 8
  * End:
diff --git a/tools/python/xen/lowlevel/xc/xc.c b/tools/python/xen/lowlevel/xc/xc.c
index 26b9a0fb74..44d3606141 100644
--- a/tools/python/xen/lowlevel/xc/xc.c
+++ b/tools/python/xen/lowlevel/xc/xc.c
@@ -2661,7 +2661,7 @@ PyMODINIT_FUNC initxc(void)
 
 /*
  * Local variables:
- *  c-indent-level: 4
+ *  mode: C
  *  c-basic-offset: 4
  * End:
  */
diff --git a/tools/python/xen/lowlevel/xs/xs.c b/tools/python/xen/lowlevel/xs/xs.c
index 621039d7a7..b7d4b6ef5d 100644
--- a/tools/python/xen/lowlevel/xs/xs.c
+++ b/tools/python/xen/lowlevel/xs/xs.c
@@ -1079,7 +1079,7 @@ PyMODINIT_FUNC initxs(void)
 
 /*
  * Local variables:
- *  c-indent-level: 4
+ *  mode: C
  *  c-basic-offset: 4
  * End:
  */
diff --git a/tools/xenstore/include/xenstore.h b/tools/xenstore/include/xenstore.h
index 42b2866462..254f556a0b 100644
--- a/tools/xenstore/include/xenstore.h
+++ b/tools/xenstore/include/xenstore.h
@@ -276,9 +276,9 @@ int xs_suspend_evtchn_port(int domid);
 
 /*
  * Local variables:
+ *  mode: C
  *  c-file-style: "linux"
  *  indent-tabs-mode: t
- *  c-indent-level: 8
  *  c-basic-offset: 8
  *  tab-width: 8
  * End:
diff --git a/tools/xenstore/utils.h b/tools/xenstore/utils.h
index dc3a0a0f8b..522c3594a2 100644
--- a/tools/xenstore/utils.h
+++ b/tools/xenstore/utils.h
@@ -52,9 +52,9 @@ static inline long IS_ERR(const void *ptr)
 
 /*
  * Local variables:
+ *  mode: C
  *  c-file-style: "linux"
  *  indent-tabs-mode: t
- *  c-indent-level: 8
  *  c-basic-offset: 8
  *  tab-width: 8
  * End:
diff --git a/tools/xenstore/xenstored_core.c b/tools/xenstore/xenstored_core.c
index c8e423700d..97ceabf964 100644
--- a/tools/xenstore/xenstored_core.c
+++ b/tools/xenstore/xenstored_core.c
@@ -2151,9 +2151,9 @@ int main(int argc, char *argv[])
 
 /*
  * Local variables:
+ *  mode: C
  *  c-file-style: "linux"
  *  indent-tabs-mode: t
- *  c-indent-level: 8
  *  c-basic-offset: 8
  *  tab-width: 8
  * End:
diff --git a/tools/xenstore/xenstored_core.h b/tools/xenstore/xenstored_core.h
index 3d27feb91a..56a279cfbb 100644
--- a/tools/xenstore/xenstored_core.h
+++ b/tools/xenstore/xenstored_core.h
@@ -212,9 +212,9 @@ int remember_string(struct hashtable *hash, const char *str);
 
 /*
  * Local variables:
+ *  mode: C
  *  c-file-style: "linux"
  *  indent-tabs-mode: t
- *  c-indent-level: 8
  *  c-basic-offset: 8
  *  tab-width: 8
  * End:
diff --git a/tools/xenstore/xenstored_domain.c b/tools/xenstore/xenstored_domain.c
index c793543bb4..1a83097952 100644
--- a/tools/xenstore/xenstored_domain.c
+++ b/tools/xenstore/xenstored_domain.c
@@ -979,9 +979,9 @@ void wrl_apply_debit_trans_commit(struct connection *conn)
 
 /*
  * Local variables:
+ *  mode: C
  *  c-file-style: "linux"
  *  indent-tabs-mode: t
- *  c-indent-level: 8
  *  c-basic-offset: 8
  *  tab-width: 8
  * End:
diff --git a/tools/xenstore/xenstored_transaction.c b/tools/xenstore/xenstored_transaction.c
index 75816dd2c7..2824f7b359 100644
--- a/tools/xenstore/xenstored_transaction.c
+++ b/tools/xenstore/xenstored_transaction.c
@@ -612,9 +612,9 @@ int check_transactions(struct hashtable *hash)
 
 /*
  * Local variables:
+ *  mode: C
  *  c-file-style: "linux"
  *  indent-tabs-mode: t
- *  c-indent-level: 8
  *  c-basic-offset: 8
  *  tab-width: 8
  * End:
diff --git a/tools/xenstore/xenstored_watch.c b/tools/xenstore/xenstored_watch.c
index 0dc5a40b99..7dedca60df 100644
--- a/tools/xenstore/xenstored_watch.c
+++ b/tools/xenstore/xenstored_watch.c
@@ -247,9 +247,9 @@ void conn_delete_all_watches(struct connection *conn)
 
 /*
  * Local variables:
+ *  mode: C
  *  c-file-style: "linux"
  *  indent-tabs-mode: t
- *  c-indent-level: 8
  *  c-basic-offset: 8
  *  tab-width: 8
  * End:
diff --git a/tools/xenstore/xs.c b/tools/xenstore/xs.c
index 87e43bfe87..f823abe737 100644
--- a/tools/xenstore/xs.c
+++ b/tools/xenstore/xs.c
@@ -1458,9 +1458,9 @@ void unsanitise_value(char *out, unsigned *out_len_r, const char *in)
 
 /*
  * Local variables:
+ *  mode: C
  *  c-file-style: "linux"
  *  indent-tabs-mode: t
- *  c-indent-level: 8
  *  c-basic-offset: 8
  *  tab-width: 8
  * End:
