diff --git a/fixme b/fixme
index 5069be9222..72c1b57841 100644
--- a/fixme
+++ b/fixme
@@ -67,8 +67,6 @@
 
 * Ray: plymouth after/before getty? https://bugzilla.redhat.com/show_bug.cgi?id=623430
 
-* add no-tab header to .h
-
 * fix systemctl daemon-reload in part of boot
 
 External:
diff --git a/src/automount.h b/src/automount.h
index 4f879f4085..9786222d11 100644
--- a/src/automount.h
+++ b/src/automount.h
@@ -1,4 +1,4 @@
-/*-*- Mode: C; c-basic-offset: 8 -*-*/
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
 
 #ifndef fooautomounthfoo
 #define fooautomounthfoo
diff --git a/src/build.h b/src/build.h
index d2058db051..5cb69bede4 100644
--- a/src/build.h
+++ b/src/build.h
@@ -1,4 +1,4 @@
-/*-*- Mode: C; c-basic-offset: 8 -*-*/
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
 
 #ifndef foobuildhfoo
 #define foobuildhfoo
diff --git a/src/bus-errors.h b/src/bus-errors.h
index 4e3c454b12..7bff75019c 100644
--- a/src/bus-errors.h
+++ b/src/bus-errors.h
@@ -1,4 +1,4 @@
-/*-*- Mode: C; c-basic-offset: 8 -*-*/
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
 
 #ifndef foobuserrorshfoo
 #define foobuserrorshfoo
diff --git a/src/cgroup-show.h b/src/cgroup-show.h
index da794dee18..ae5b13b564 100644
--- a/src/cgroup-show.h
+++ b/src/cgroup-show.h
@@ -1,4 +1,4 @@
-/*-*- Mode: C; c-basic-offset: 8 -*-*/
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
 
 #ifndef foocgroupshowhfoo
 #define foocgroupshowhfoo
diff --git a/src/cgroup-util.h b/src/cgroup-util.h
index 8f96571243..d68ccc5f40 100644
--- a/src/cgroup-util.h
+++ b/src/cgroup-util.h
@@ -1,4 +1,4 @@
-/*-*- Mode: C; c-basic-offset: 8 -*-*/
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
 
 #ifndef foocgrouputilhfoo
 #define foocgrouputilhfoo
diff --git a/src/cgroup.h b/src/cgroup.h
index 45d043935d..90c4572d65 100644
--- a/src/cgroup.h
+++ b/src/cgroup.h
@@ -1,4 +1,4 @@
-/*-*- Mode: C; c-basic-offset: 8 -*-*/
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
 
 #ifndef foocgrouphfoo
 #define foocgrouphfoo
diff --git a/src/conf-parser.h b/src/conf-parser.h
index 43469a3f87..9ff65a9bfe 100644
--- a/src/conf-parser.h
+++ b/src/conf-parser.h
@@ -1,4 +1,4 @@
-/*-*- Mode: C; c-basic-offset: 8 -*-*/
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
 
 #ifndef fooconfparserhfoo
 #define fooconfparserhfoo
diff --git a/src/dbus-automount.h b/src/dbus-automount.h
index 77c887e89c..84b573c8d8 100644
--- a/src/dbus-automount.h
+++ b/src/dbus-automount.h
@@ -1,4 +1,4 @@
-/*-*- Mode: C; c-basic-offset: 8 -*-*/
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
 
 #ifndef foodbusautomounthfoo
 #define foodbusautomounthfoo
diff --git a/src/dbus-common.h b/src/dbus-common.h
index b28755fc79..ebcddec245 100644
--- a/src/dbus-common.h
+++ b/src/dbus-common.h
@@ -1,4 +1,4 @@
-/*-*- Mode: C; c-basic-offset: 8 -*-*/
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
 
 #ifndef foodbuscommonhfoo
 #define foodbuscommonhfoo
diff --git a/src/dbus-device.h b/src/dbus-device.h
index dc717f17c2..639255db61 100644
--- a/src/dbus-device.h
+++ b/src/dbus-device.h
@@ -1,4 +1,4 @@
-/*-*- Mode: C; c-basic-offset: 8 -*-*/
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
 
 #ifndef foodbusdevicehfoo
 #define foodbusdevicehfoo
diff --git a/src/dbus-execute.h b/src/dbus-execute.h
index cc4b803ca7..03a474ede2 100644
--- a/src/dbus-execute.h
+++ b/src/dbus-execute.h
@@ -1,4 +1,4 @@
-/*-*- Mode: C; c-basic-offset: 8 -*-*/
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
 
 #ifndef foodbusexecutehfoo
 #define foodbusexecutehfoo
diff --git a/src/dbus-job.h b/src/dbus-job.h
index 2b79423f01..801e3e6349 100644
--- a/src/dbus-job.h
+++ b/src/dbus-job.h
@@ -1,4 +1,4 @@
-/*-*- Mode: C; c-basic-offset: 8 -*-*/
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
 
 #ifndef foodbusjobhfoo
 #define foodbusjobhfoo
diff --git a/src/dbus-manager.h b/src/dbus-manager.h
index 996b680e3c..2eb2fbbed6 100644
--- a/src/dbus-manager.h
+++ b/src/dbus-manager.h
@@ -1,4 +1,4 @@
-/*-*- Mode: C; c-basic-offset: 8 -*-*/
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
 
 #ifndef foodbusmanagerhfoo
 #define foodbusmanagerhfoo
diff --git a/src/dbus-mount.h b/src/dbus-mount.h
index 53522f7062..c9ab73f410 100644
--- a/src/dbus-mount.h
+++ b/src/dbus-mount.h
@@ -1,4 +1,4 @@
-/*-*- Mode: C; c-basic-offset: 8 -*-*/
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
 
 #ifndef foodbusmounthfoo
 #define foodbusmounthfoo
diff --git a/src/dbus-path.h b/src/dbus-path.h
index 261d8451b4..f825e13f24 100644
--- a/src/dbus-path.h
+++ b/src/dbus-path.h
@@ -1,4 +1,4 @@
-/*-*- Mode: C; c-basic-offset: 8 -*-*/
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
 
 #ifndef foodbuspathhfoo
 #define foodbuspathhfoo
diff --git a/src/dbus-service.h b/src/dbus-service.h
index cfbdab388a..4f628edae3 100644
--- a/src/dbus-service.h
+++ b/src/dbus-service.h
@@ -1,4 +1,4 @@
-/*-*- Mode: C; c-basic-offset: 8 -*-*/
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
 
 #ifndef foodbusservicehfoo
 #define foodbusservicehfoo
diff --git a/src/dbus-snapshot.h b/src/dbus-snapshot.h
index 60b3720d35..0b82279f1c 100644
--- a/src/dbus-snapshot.h
+++ b/src/dbus-snapshot.h
@@ -1,4 +1,4 @@
-/*-*- Mode: C; c-basic-offset: 8 -*-*/
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
 
 #ifndef foodbussnapshothfoo
 #define foodbussnapshothfoo
diff --git a/src/dbus-socket.h b/src/dbus-socket.h
index 79a1546dff..71d5b4fa87 100644
--- a/src/dbus-socket.h
+++ b/src/dbus-socket.h
@@ -1,4 +1,4 @@
-/*-*- Mode: C; c-basic-offset: 8 -*-*/
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
 
 #ifndef foodbussockethfoo
 #define foodbussockethfoo
diff --git a/src/dbus-swap.h b/src/dbus-swap.h
index a3d418c21b..5eeb02a160 100644
--- a/src/dbus-swap.h
+++ b/src/dbus-swap.h
@@ -1,4 +1,4 @@
-/*-*- Mode: C; c-basic-offset: 8 -*-*/
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
 
 #ifndef foodbusswaphfoo
 #define foodbusswaphfoo
diff --git a/src/dbus-target.h b/src/dbus-target.h
index af2dc62bcf..13d38764a2 100644
--- a/src/dbus-target.h
+++ b/src/dbus-target.h
@@ -1,4 +1,4 @@
-/*-*- Mode: C; c-basic-offset: 8 -*-*/
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
 
 #ifndef foodbustargethfoo
 #define foodbustargethfoo
diff --git a/src/dbus-timer.h b/src/dbus-timer.h
index 562d44981e..6f35aa7219 100644
--- a/src/dbus-timer.h
+++ b/src/dbus-timer.h
@@ -1,4 +1,4 @@
-/*-*- Mode: C; c-basic-offset: 8 -*-*/
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
 
 #ifndef foodbustimerhfoo
 #define foodbustimerhfoo
diff --git a/src/dbus-unit.h b/src/dbus-unit.h
index 05892b833d..8f17bf2399 100644
--- a/src/dbus-unit.h
+++ b/src/dbus-unit.h
@@ -1,4 +1,4 @@
-/*-*- Mode: C; c-basic-offset: 8 -*-*/
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
 
 #ifndef foodbusunithfoo
 #define foodbusunithfoo
diff --git a/src/dbus.h b/src/dbus.h
index 01ab2fcb8d..f15a3f99f6 100644
--- a/src/dbus.h
+++ b/src/dbus.h
@@ -1,4 +1,4 @@
-/*-*- Mode: C; c-basic-offset: 8 -*-*/
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
 
 #ifndef foodbushfoo
 #define foodbushfoo
diff --git a/src/device.h b/src/device.h
index 515db65644..ee50cfafc6 100644
--- a/src/device.h
+++ b/src/device.h
@@ -1,4 +1,4 @@
-/*-*- Mode: C; c-basic-offset: 8 -*-*/
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
 
 #ifndef foodevicehfoo
 #define foodevicehfoo
diff --git a/src/execute.h b/src/execute.h
index 5410f83561..381893587b 100644
--- a/src/execute.h
+++ b/src/execute.h
@@ -1,4 +1,4 @@
-/*-*- Mode: C; c-basic-offset: 8 -*-*/
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
 
 #ifndef fooexecutehfoo
 #define fooexecutehfoo
diff --git a/src/fdset.h b/src/fdset.h
index 3483fc8323..044a9e6d1f 100644
--- a/src/fdset.h
+++ b/src/fdset.h
@@ -1,4 +1,4 @@
-/*-*- Mode: C; c-basic-offset: 8 -*-*/
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
 
 #ifndef foofdsethfoo
 #define foofdsethfoo
diff --git a/src/hashmap.h b/src/hashmap.h
index 8fb7f82357..9ab66c51b8 100644
--- a/src/hashmap.h
+++ b/src/hashmap.h
@@ -1,4 +1,4 @@
-/*-*- Mode: C; c-basic-offset: 8 -*-*/
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
 
 #ifndef foohashmaphfoo
 #define foohashmaphfoo
diff --git a/src/hostname-setup.h b/src/hostname-setup.h
index 18a406a1f5..ff11df945e 100644
--- a/src/hostname-setup.h
+++ b/src/hostname-setup.h
@@ -1,4 +1,4 @@
-/*-*- Mode: C; c-basic-offset: 8 -*-*/
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
 
 #ifndef foohostnamesetuphfoo
 #define foohostnamesetuphfoo
diff --git a/src/job.h b/src/job.h
index ce2bb0600b..e42c9647a8 100644
--- a/src/job.h
+++ b/src/job.h
@@ -1,4 +1,4 @@
-/*-*- Mode: C; c-basic-offset: 8 -*-*/
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
 
 #ifndef foojobhfoo
 #define foojobhfoo
diff --git a/src/kmod-setup.h b/src/kmod-setup.h
index c102b52649..496aef3e15 100644
--- a/src/kmod-setup.h
+++ b/src/kmod-setup.h
@@ -1,4 +1,4 @@
-/*-*- Mode: C; c-basic-offset: 8 -*-*/
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
 
 #ifndef fookmodsetuphfoo
 #define fookmodsetuphfoo
diff --git a/src/label.h b/src/label.h
index 5a3c9d1092..95a2829acf 100644
--- a/src/label.h
+++ b/src/label.h
@@ -1,4 +1,4 @@
-/*-*- Mode: C; c-basic-offset: 8 -*-*/
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
 
 #ifndef foolabelhfoo
 #define foolabelhfoo
diff --git a/src/list.h b/src/list.h
index 012dd12073..9380f362f1 100644
--- a/src/list.h
+++ b/src/list.h
@@ -1,4 +1,4 @@
-/*-*- Mode: C; c-basic-offset: 8 -*-*/
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
 
 #ifndef foolisthfoo
 #define foolisthfoo
diff --git a/src/load-dropin.h b/src/load-dropin.h
index b39580b7cb..cf3a799381 100644
--- a/src/load-dropin.h
+++ b/src/load-dropin.h
@@ -1,4 +1,4 @@
-/*-*- Mode: C; c-basic-offset: 8 -*-*/
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
 
 #ifndef fooloaddropinhfoo
 #define fooloaddropinhfoo
diff --git a/src/load-fragment.h b/src/load-fragment.h
index beba87cb7b..bccfb11a7f 100644
--- a/src/load-fragment.h
+++ b/src/load-fragment.h
@@ -1,4 +1,4 @@
-/*-*- Mode: C; c-basic-offset: 8 -*-*/
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
 
 #ifndef fooloadfragmenthfoo
 #define fooloadfragmenthfoo
diff --git a/src/log.h b/src/log.h
index e5ea5310ca..b052bc3c51 100644
--- a/src/log.h
+++ b/src/log.h
@@ -1,4 +1,4 @@
-/*-*- Mode: C; c-basic-offset: 8 -*-*/
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
 
 #ifndef foologhfoo
 #define foologhfoo
diff --git a/src/loopback-setup.h b/src/loopback-setup.h
index b4614fa5bd..81f4529630 100644
--- a/src/loopback-setup.h
+++ b/src/loopback-setup.h
@@ -1,4 +1,4 @@
-/*-*- Mode: C; c-basic-offset: 8 -*-*/
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
 
 #ifndef fooloopbacksetuphfoo
 #define fooloopbacksetuphfoo
diff --git a/src/macro.h b/src/macro.h
index 10a106bc19..acfc277517 100644
--- a/src/macro.h
+++ b/src/macro.h
@@ -1,4 +1,4 @@
-/*-*- Mode: C; c-basic-offset: 8 -*-*/
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
 
 #ifndef foomacrohfoo
 #define foomacrohfoo
diff --git a/src/manager.h b/src/manager.h
index ef40352d59..2b4eee933d 100644
--- a/src/manager.h
+++ b/src/manager.h
@@ -1,4 +1,4 @@
-/*-*- Mode: C; c-basic-offset: 8 -*-*/
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
 
 #ifndef foomanagerhfoo
 #define foomanagerhfoo
diff --git a/src/missing.h b/src/missing.h
index f40d36ebc4..eaeeeab19f 100644
--- a/src/missing.h
+++ b/src/missing.h
@@ -1,4 +1,4 @@
-/*-*- Mode: C; c-basic-offset: 8 -*-*/
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
 
 #ifndef foomissinghfoo
 #define foomissinghfoo
diff --git a/src/modprobe-setup.h b/src/modprobe-setup.h
index 934a9e0a82..0fd2314b0b 100644
--- a/src/modprobe-setup.h
+++ b/src/modprobe-setup.h
@@ -1,4 +1,4 @@
-/*-*- Mode: C; c-basic-offset: 8 -*-*/
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
 
 #ifndef foomodprobesetuphfoo
 #define foomodprobesetuphfoo
diff --git a/src/mount-setup.h b/src/mount-setup.h
index bb13e0184e..47d0e5bb12 100644
--- a/src/mount-setup.h
+++ b/src/mount-setup.h
@@ -1,4 +1,4 @@
-/*-*- Mode: C; c-basic-offset: 8 -*-*/
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
 
 #ifndef foomountsetuphfoo
 #define foomountsetuphfoo
diff --git a/src/mount.h b/src/mount.h
index 226a1e2f5d..920a70dfab 100644
--- a/src/mount.h
+++ b/src/mount.h
@@ -1,4 +1,4 @@
-/*-*- Mode: C; c-basic-offset: 8 -*-*/
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
 
 #ifndef foomounthfoo
 #define foomounthfoo
diff --git a/src/namespace.h b/src/namespace.h
index 6128646391..7cf1dedd32 100644
--- a/src/namespace.h
+++ b/src/namespace.h
@@ -1,4 +1,4 @@
-/*-*- Mode: C; c-basic-offset: 8 -*-*/
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
 
 #ifndef foonamespacehfoo
 #define foonamespacehfoo
diff --git a/src/path-lookup.h b/src/path-lookup.h
index e5a10925fd..f53aa214a3 100644
--- a/src/path-lookup.h
+++ b/src/path-lookup.h
@@ -1,4 +1,4 @@
-/*-*- Mode: C; c-basic-offset: 8 -*-*/
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
 
 #ifndef foopathlookuphfoo
 #define foopathlookuphfoo
diff --git a/src/path.h b/src/path.h
index 5c06de4dfe..87fa0d1732 100644
--- a/src/path.h
+++ b/src/path.h
@@ -1,4 +1,4 @@
-/*-*- Mode: C; c-basic-offset: 8 -*-*/
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
 
 #ifndef foopathhfoo
 #define foopathhfoo
diff --git a/src/ratelimit.h b/src/ratelimit.h
index e7dffb8bfa..2c77787d3c 100644
--- a/src/ratelimit.h
+++ b/src/ratelimit.h
@@ -1,4 +1,4 @@
-/*-*- Mode: C; c-basic-offset: 8 -*-*/
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
 
 #ifndef fooratelimithfoo
 #define fooratelimithfoo
diff --git a/src/sd-daemon.h b/src/sd-daemon.h
index fd6221f277..c68c96d2dd 100644
--- a/src/sd-daemon.h
+++ b/src/sd-daemon.h
@@ -1,4 +1,4 @@
-/*-*- Mode: C; c-basic-offset: 8 -*-*/
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
 
 #ifndef foosddaemonhfoo
 #define foosddaemonhfoo
diff --git a/src/service.h b/src/service.h
index 81401ac387..3a033929fb 100644
--- a/src/service.h
+++ b/src/service.h
@@ -1,4 +1,4 @@
-/*-*- Mode: C; c-basic-offset: 8 -*-*/
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
 
 #ifndef fooservicehfoo
 #define fooservicehfoo
diff --git a/src/set.h b/src/set.h
index c643a2789c..885780c4c0 100644
--- a/src/set.h
+++ b/src/set.h
@@ -1,4 +1,4 @@
-/*-*- Mode: C; c-basic-offset: 8 -*-*/
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
 
 #ifndef foosethfoo
 #define foosethfoo
diff --git a/src/snapshot.h b/src/snapshot.h
index 2b5f3c338a..9a305204b9 100644
--- a/src/snapshot.h
+++ b/src/snapshot.h
@@ -1,4 +1,4 @@
-/*-*- Mode: C; c-basic-offset: 8 -*-*/
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
 
 #ifndef foosnapshothfoo
 #define foosnapshothfoo
diff --git a/src/socket-util.h b/src/socket-util.h
index b5cb2a844d..6eb3b5c6eb 100644
--- a/src/socket-util.h
+++ b/src/socket-util.h
@@ -1,4 +1,4 @@
-/*-*- Mode: C; c-basic-offset: 8 -*-*/
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
 
 #ifndef foosocketutilhfoo
 #define foosocketutilhfoo
diff --git a/src/socket.h b/src/socket.h
index 89fa6cca71..f74f60b44a 100644
--- a/src/socket.h
+++ b/src/socket.h
@@ -1,4 +1,4 @@
-/*-*- Mode: C; c-basic-offset: 8 -*-*/
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
 
 #ifndef foosockethfoo
 #define foosockethfoo
diff --git a/src/special.h b/src/special.h
index bbc64806bf..7bf207053c 100644
--- a/src/special.h
+++ b/src/special.h
@@ -1,4 +1,4 @@
-/*-*- Mode: C; c-basic-offset: 8 -*-*/
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
 
 #ifndef foospecialhfoo
 #define foospecialhfoo
diff --git a/src/specifier.h b/src/specifier.h
index 4b3b94c857..041166c90e 100644
--- a/src/specifier.h
+++ b/src/specifier.h
@@ -1,4 +1,4 @@
-/*-*- Mode: C; c-basic-offset: 8 -*-*/
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
 
 #ifndef foospecifierhfoo
 #define foospecifierhfoo
diff --git a/src/strv.h b/src/strv.h
index 8cb35ef395..1103e194c3 100644
--- a/src/strv.h
+++ b/src/strv.h
@@ -1,4 +1,4 @@
-/*-*- Mode: C; c-basic-offset: 8 -*-*/
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
 
 #ifndef foostrvhfoo
 #define foostrvhfoo
diff --git a/src/swap.h b/src/swap.h
index 154d418d59..3c53536a83 100644
--- a/src/swap.h
+++ b/src/swap.h
@@ -1,4 +1,4 @@
-/*-*- Mode: C; c-basic-offset: 8 -*-*/
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
 
 #ifndef fooswaphfoo
 #define fooswaphfoo
diff --git a/src/target.h b/src/target.h
index 37d54d106d..b1d055f9a8 100644
--- a/src/target.h
+++ b/src/target.h
@@ -1,4 +1,4 @@
-/*-*- Mode: C; c-basic-offset: 8 -*-*/
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
 
 #ifndef footargethfoo
 #define footargethfoo
diff --git a/src/tcpwrap.h b/src/tcpwrap.h
index b47169610c..4d4553e8ae 100644
--- a/src/tcpwrap.h
+++ b/src/tcpwrap.h
@@ -1,4 +1,4 @@
-/*-*- Mode: C; c-basic-offset: 8 -*-*/
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
 
 #ifndef foolibwraphfoo
 #define foolibwraphfoo
diff --git a/src/timer.h b/src/timer.h
index fc74368e73..814d9b2037 100644
--- a/src/timer.h
+++ b/src/timer.h
@@ -1,4 +1,4 @@
-/*-*- Mode: C; c-basic-offset: 8 -*-*/
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
 
 #ifndef footimerhfoo
 #define footimerhfoo
diff --git a/src/unit-name.h b/src/unit-name.h
index b6dd2c9123..3ad25bac35 100644
--- a/src/unit-name.h
+++ b/src/unit-name.h
@@ -1,4 +1,4 @@
-/*-*- Mode: C; c-basic-offset: 8 -*-*/
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
 
 #ifndef foounitnamehfoo
 #define foounitnamehfoo
diff --git a/src/unit.h b/src/unit.h
index 8bd81a26d4..993a6cb778 100644
--- a/src/unit.h
+++ b/src/unit.h
@@ -1,4 +1,4 @@
-/*-*- Mode: C; c-basic-offset: 8 -*-*/
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
 
 #ifndef foounithfoo
 #define foounithfoo
diff --git a/src/util.h b/src/util.h
index e9126c04fa..18dfa97b8c 100644
--- a/src/util.h
+++ b/src/util.h
@@ -1,4 +1,4 @@
-/*-*- Mode: C; c-basic-offset: 8 -*-*/
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
 
 #ifndef fooutilhfoo
 #define fooutilhfoo
diff --git a/src/utmp-wtmp.h b/src/utmp-wtmp.h
index abdf28a5f9..0d608f6a5e 100644
--- a/src/utmp-wtmp.h
+++ b/src/utmp-wtmp.h
@@ -1,4 +1,4 @@
-/*-*- Mode: C; c-basic-offset: 8 -*-*/
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
 
 #ifndef fooutmpwtmphfoo
 #define fooutmpwtmphfoo