94 files changed, 134 insertions, 131 deletions

diff --git a/Makefile.am b/Makefile.am
index 07b30ebd1e..4ed1f12dcc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -126,6 +126,7 @@ AM_CPPFLAGS = \
 	-I $(top_srcdir)/src/login \
 	-I $(top_srcdir)/src/journal \
 	-I $(top_srcdir)/src/systemd \
+	-I $(top_srcdir)/src/core \
 	-I $(top_srcdir)/src/udev
 
 AM_CFLAGS = $(WARNINGFLAGS)
@@ -647,128 +648,124 @@ noinst_LTLIBRARIES += \
 	libsystemd-core.la
 
 libsystemd_core_la_SOURCES = \
-	src/unit.c \
-	src/unit.h \
-	src/job.c \
-	src/job.h \
-	src/manager.c \
-	src/manager.h \
-	src/path-lookup.c \
-	src/path-lookup.h \
-	src/load-fragment.c \
-	src/load-fragment.h \
-	src/service.c \
-	src/service.h \
-	src/automount.c \
-	src/automount.h \
-	src/mount.c \
-	src/mount.h \
-	src/swap.c \
-	src/swap.h \
-	src/device.c \
-	src/device.h \
-	src/target.c \
-	src/target.h \
-	src/snapshot.c \
-	src/snapshot.h \
-	src/socket.c \
-	src/socket.h \
-	src/timer.c \
-	src/timer.h \
-	src/path.c \
-	src/path.h \
-	src/load-dropin.c \
-	src/load-dropin.h \
-	src/execute.c \
-	src/execute.h \
-	src/utmp-wtmp.c \
-	src/utmp-wtmp.h \
-	src/dbus.c \
-	src/dbus.h \
-	src/dbus-manager.c \
-	src/dbus-manager.h \
-	src/dbus-unit.c \
-	src/dbus-unit.h \
-	src/dbus-job.c \
-	src/dbus-job.h \
-	src/dbus-service.c \
-	src/dbus-service.h \
-	src/dbus-socket.c \
-	src/dbus-socket.h \
-	src/dbus-timer.c \
-	src/dbus-timer.h \
-	src/dbus-target.c \
-	src/dbus-target.h \
-	src/dbus-mount.c \
-	src/dbus-mount.h \
-	src/dbus-automount.c \
-	src/dbus-automount.h \
-	src/dbus-swap.c \
-	src/dbus-swap.h \
-	src/dbus-snapshot.c \
-	src/dbus-snapshot.h \
-	src/dbus-device.c \
-	src/dbus-device.h \
-	src/dbus-execute.c \
-	src/dbus-execute.h \
-	src/dbus-path.c \
-	src/dbus-path.h \
-	src/cgroup.c \
-	src/cgroup.h \
-	src/mount-setup.c \
-	src/mount-setup.h \
-	src/hostname-setup.c \
-	src/hostname-setup.h \
-	src/selinux-setup.c \
-	src/selinux-setup.h \
-	src/ima-setup.c \
-	src/ima-setup.h \
-	src/loopback-setup.h \
-	src/loopback-setup.c \
-	src/kmod-setup.c \
-	src/kmod-setup.h \
-	src/locale-setup.h \
-	src/locale-setup.c \
-	src/machine-id-setup.c \
-	src/machine-id-setup.h \
-	src/fdset.c \
-	src/fdset.h \
-	src/condition.c \
-	src/condition.h \
+	src/def.h \
+	src/missing.h \
 	src/dbus-common.c \
 	src/dbus-common.h \
-	src/install.c \
-	src/install.h \
+	src/watchdog.c \
+	src/watchdog.h \
+	src/loopback-setup.h \
+	src/loopback-setup.c \
+	src/hostname-setup.c \
+	src/hostname-setup.h \
 	src/specifier.c \
 	src/specifier.h \
-	src/namespace.c \
-	src/namespace.h \
+	src/install.c \
+	src/install.h \
+	src/path-lookup.c \
+	src/path-lookup.h \
 	src/unit-name.c \
 	src/unit-name.h \
-	src/tcpwrap.c \
-	src/tcpwrap.h \
-	src/cgroup-attr.c \
-	src/cgroup-attr.h \
-	src/watchdog.c \
-	src/watchdog.h \
-	src/def.h \
-	src/missing.h \
-	src/securebits.h \
+	src/utmp-wtmp.c \
+	src/utmp-wtmp.h \
+	src/machine-id-setup.c \
+	src/machine-id-setup.h \
+	src/mount-setup.c \
+	src/mount-setup.h \
 	src/linux/auto_dev-ioctl.h \
 	src/linux/fanotify.h \
-	src/initreq.h \
-	src/special.h \
-	src/dbus-common.h \
-	src/bus-errors.h \
-	src/cgroup-show.h \
-	src/build.h \
-	src/umount.h \
-	src/ask-password-api.h \
-	src/sysfs-show.h \
-	src/polkit.h \
-	src/dbus-loop.h \
-	src/spawn-agent.h \
-	src/logs-show.h
+	src/core/unit.c \
+	src/core/unit.h \
+	src/core/job.c \
+	src/core/job.h \
+	src/core/manager.c \
+	src/core/manager.h \
+	src/core/load-fragment.c \
+	src/core/load-fragment.h \
+	src/core/service.c \
+	src/core/service.h \
+	src/core/automount.c \
+	src/core/automount.h \
+	src/core/mount.c \
+	src/core/mount.h \
+	src/core/swap.c \
+	src/core/swap.h \
+	src/core/device.c \
+	src/core/device.h \
+	src/core/target.c \
+	src/core/target.h \
+	src/core/snapshot.c \
+	src/core/snapshot.h \
+	src/core/socket.c \
+	src/core/socket.h \
+	src/core/timer.c \
+	src/core/timer.h \
+	src/core/path.c \
+	src/core/path.h \
+	src/core/load-dropin.c \
+	src/core/load-dropin.h \
+	src/core/execute.c \
+	src/core/execute.h \
+	src/core/dbus.c \
+	src/core/dbus.h \
+	src/core/dbus-manager.c \
+	src/core/dbus-manager.h \
+	src/core/dbus-unit.c \
+	src/core/dbus-unit.h \
+	src/core/dbus-job.c \
+	src/core/dbus-job.h \
+	src/core/dbus-service.c \
+	src/core/dbus-service.h \
+	src/core/dbus-socket.c \
+	src/core/dbus-socket.h \
+	src/core/dbus-timer.c \
+	src/core/dbus-timer.h \
+	src/core/dbus-target.c \
+	src/core/dbus-target.h \
+	src/core/dbus-mount.c \
+	src/core/dbus-mount.h \
+	src/core/dbus-automount.c \
+	src/core/dbus-automount.h \
+	src/core/dbus-swap.c \
+	src/core/dbus-swap.h \
+	src/core/dbus-snapshot.c \
+	src/core/dbus-snapshot.h \
+	src/core/dbus-device.c \
+	src/core/dbus-device.h \
+	src/core/dbus-execute.c \
+	src/core/dbus-execute.h \
+	src/core/dbus-path.c \
+	src/core/dbus-path.h \
+	src/core/cgroup.c \
+	src/core/cgroup.h \
+	src/core/selinux-setup.c \
+	src/core/selinux-setup.h \
+	src/core/ima-setup.c \
+	src/core/ima-setup.h \
+	src/core/kmod-setup.c \
+	src/core/kmod-setup.h \
+	src/core/locale-setup.h \
+	src/core/locale-setup.c \
+	src/core/fdset.c \
+	src/core/fdset.h \
+	src/core/condition.c \
+	src/core/condition.h \
+	src/core/namespace.c \
+	src/core/namespace.h \
+	src/core/tcpwrap.c \
+	src/core/tcpwrap.h \
+	src/core/cgroup-attr.c \
+	src/core/cgroup-attr.h \
+	src/core/securebits.h \
+	src/core/initreq.h \
+	src/core/special.h \
+	src/core/bus-errors.h \
+	src/core/build.h \
+	src/core/ask-password-api.h \
+	src/core/sysfs-show.h \
+	src/core/polkit.h \
+	src/core/dbus-loop.h \
+	src/core/spawn-agent.h
 
 nodist_libsystemd_core_la_SOURCES = \
 	src/load-fragment-gperf.c \
@@ -948,6 +945,7 @@ pkginclude_HEADERS += \
 systemd_shutdown_SOURCES = \
 	src/mount-setup.c \
 	src/umount.c \
+	src/umount.h \
 	src/shutdown.c \
 	src/watchdog.c \
 	src/watchdog.h
@@ -1075,10 +1073,12 @@ systemctl_SOURCES = \
 	src/dbus-common.c \
 	src/path-lookup.c \
 	src/cgroup-show.c \
+	src/cgroup-show.h \
 	src/unit-name.c \
 	src/install.c \
 	src/spawn-agent.c \
-	src/logs-show.c
+	src/logs-show.c \
+	src/logs-show.h
 
 systemctl_CFLAGS = \
 	$(AM_CFLAGS) \
@@ -1120,7 +1120,8 @@ systemd_reply_password_LDADD = \
 # ------------------------------------------------------------------------------
 systemd_cgls_SOURCES = \
 	src/cgls.c \
-	src/cgroup-show.c
+	src/cgroup-show.c \
+	src/cgroup-show.h
 
 systemd_cgls_LDADD = \
 	libsystemd-shared.la
@@ -1971,7 +1972,8 @@ systemd_cat_LDADD = \
 
 journalctl_SOURCES = \
 	src/journal/journalctl.c \
-	src/logs-show.c
+	src/logs-show.c \
+	src/logs-show.h
 
 journalctl_LDADD = \
 	libsystemd-shared.la \
@@ -2585,7 +2587,8 @@ loginctl_SOURCES = \
 	src/login/loginctl.c \
 	src/login/sysfs-show.c \
 	src/dbus-common.c \
-	src/cgroup-show.c
+	src/cgroup-show.c \
+	src/cgroup-show.h
 
 loginctl_CFLAGS = \
 	$(AM_CFLAGS) \
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 5a5d027493..2acacbb58b 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -1,16 +1,16 @@
-src/dbus-automount.c
-src/dbus-device.c
-src/dbus-job.c
-src/dbus-manager.c
-src/dbus-mount.c
-src/dbus-path.c
-src/dbus-service.c
-src/dbus-snapshot.c
-src/dbus-socket.c
-src/dbus-swap.c
-src/dbus-target.c
-src/dbus-timer.c
-src/dbus-unit.c
+src/core/dbus-automount.c
+src/core/dbus-device.c
+src/core/dbus-job.c
+src/core/dbus-manager.c
+src/core/dbus-mount.c
+src/core/dbus-path.c
+src/core/dbus-service.c
+src/core/dbus-snapshot.c
+src/core/dbus-socket.c
+src/core/dbus-swap.c
+src/core/dbus-target.c
+src/core/dbus-timer.c
+src/core/dbus-unit.c
 src/hostname/hostnamed.c
 src/locale/localed.c
 src/org.freedesktop.systemd1.policy.in.in
diff --git a/src/ask-password-api.h b/src/core/ask-password-api.h
index fec8625a0f..fec8625a0f 100644
--- a/src/ask-password-api.h
+++ b/src/core/ask-password-api.h
diff --git a/src/automount.c b/src/core/automount.c
index 6857a6fd76..6857a6fd76 100644
--- a/src/automount.c
+++ b/src/core/automount.c
diff --git a/src/automount.h b/src/core/automount.h
index 19baee208b..19baee208b 100644
--- a/src/automount.h
+++ b/src/core/automount.h
diff --git a/src/build.h b/src/core/build.h
index 0619013141..0619013141 100644
--- a/src/build.h
+++ b/src/core/build.h
diff --git a/src/bus-errors.h b/src/core/bus-errors.h
index 82d4e99eef..82d4e99eef 100644
--- a/src/bus-errors.h
+++ b/src/core/bus-errors.h
diff --git a/src/cgroup-attr.c b/src/core/cgroup-attr.c
index 474a6865c4..474a6865c4 100644
--- a/src/cgroup-attr.c
+++ b/src/core/cgroup-attr.c
diff --git a/src/cgroup-attr.h b/src/core/cgroup-attr.h
index 63a73b8101..63a73b8101 100644
--- a/src/cgroup-attr.h
+++ b/src/core/cgroup-attr.h
diff --git a/src/cgroup.c b/src/core/cgroup.c
index 1f6139e25f..1f6139e25f 100644
--- a/src/cgroup.c
+++ b/src/core/cgroup.c
diff --git a/src/cgroup.h b/src/core/cgroup.h
index 5faa7dc0f7..5faa7dc0f7 100644
--- a/src/cgroup.h
+++ b/src/core/cgroup.h
diff --git a/src/condition.c b/src/core/condition.c
index 2b51a16f17..2b51a16f17 100644
--- a/src/condition.c
+++ b/src/core/condition.c
diff --git a/src/condition.h b/src/core/condition.h
index 71b1c6761e..71b1c6761e 100644
--- a/src/condition.h
+++ b/src/core/condition.h
diff --git a/src/dbus-automount.c b/src/core/dbus-automount.c
index 8e45f81fcf..8e45f81fcf 100644
--- a/src/dbus-automount.c
+++ b/src/core/dbus-automount.c
diff --git a/src/dbus-automount.h b/src/core/dbus-automount.h
index 2fc8345048..2fc8345048 100644
--- a/src/dbus-automount.h
+++ b/src/core/dbus-automount.h
diff --git a/src/dbus-device.c b/src/core/dbus-device.c
index b39fb9d381..b39fb9d381 100644
--- a/src/dbus-device.c
+++ b/src/core/dbus-device.c
diff --git a/src/dbus-device.h b/src/core/dbus-device.h
index fba270b4e6..fba270b4e6 100644
--- a/src/dbus-device.h
+++ b/src/core/dbus-device.h
diff --git a/src/dbus-execute.c b/src/core/dbus-execute.c
index 1fd2b21336..1fd2b21336 100644
--- a/src/dbus-execute.c
+++ b/src/core/dbus-execute.c
diff --git a/src/dbus-execute.h b/src/core/dbus-execute.h
index 03cd69d126..03cd69d126 100644
--- a/src/dbus-execute.h
+++ b/src/core/dbus-execute.h
diff --git a/src/dbus-job.c b/src/core/dbus-job.c
index ab6d610243..ab6d610243 100644
--- a/src/dbus-job.c
+++ b/src/core/dbus-job.c
diff --git a/src/dbus-job.h b/src/core/dbus-job.h
index 103c2ff3ec..103c2ff3ec 100644
--- a/src/dbus-job.h
+++ b/src/core/dbus-job.h
diff --git a/src/dbus-loop.h b/src/core/dbus-loop.h
index 0bbdfe5925..0bbdfe5925 100644
--- a/src/dbus-loop.h
+++ b/src/core/dbus-loop.h
diff --git a/src/dbus-manager.c b/src/core/dbus-manager.c
index 3bf0c07b88..3bf0c07b88 100644
--- a/src/dbus-manager.c
+++ b/src/core/dbus-manager.c
diff --git a/src/dbus-manager.h b/src/core/dbus-manager.h
index 2eb2fbbed6..2eb2fbbed6 100644
--- a/src/dbus-manager.h
+++ b/src/core/dbus-manager.h
diff --git a/src/dbus-mount.c b/src/core/dbus-mount.c
index 35d6ea7a1d..35d6ea7a1d 100644
--- a/src/dbus-mount.c
+++ b/src/core/dbus-mount.c
diff --git a/src/dbus-mount.h b/src/core/dbus-mount.h
index b5613fa7b6..b5613fa7b6 100644
--- a/src/dbus-mount.h
+++ b/src/core/dbus-mount.h
diff --git a/src/dbus-path.c b/src/core/dbus-path.c
index 5506784c38..5506784c38 100644
--- a/src/dbus-path.c
+++ b/src/core/dbus-path.c
diff --git a/src/dbus-path.h b/src/core/dbus-path.h
index 2888400a13..2888400a13 100644
--- a/src/dbus-path.h
+++ b/src/core/dbus-path.h
diff --git a/src/dbus-service.c b/src/core/dbus-service.c
index d840415417..d840415417 100644
--- a/src/dbus-service.c
+++ b/src/core/dbus-service.c
diff --git a/src/dbus-service.h b/src/core/dbus-service.h
index d6eab65c52..d6eab65c52 100644
--- a/src/dbus-service.h
+++ b/src/core/dbus-service.h
diff --git a/src/dbus-snapshot.c b/src/core/dbus-snapshot.c
index e69388a524..e69388a524 100644
--- a/src/dbus-snapshot.c
+++ b/src/core/dbus-snapshot.c
diff --git a/src/dbus-snapshot.h b/src/core/dbus-snapshot.h
index 0b82279f1c..0b82279f1c 100644
--- a/src/dbus-snapshot.h
+++ b/src/core/dbus-snapshot.h
diff --git a/src/dbus-socket.c b/src/core/dbus-socket.c
index 2e3342cb55..2e3342cb55 100644
--- a/src/dbus-socket.c
+++ b/src/core/dbus-socket.c
diff --git a/src/dbus-socket.h b/src/core/dbus-socket.h
index 069a2f5df0..069a2f5df0 100644
--- a/src/dbus-socket.h
+++ b/src/core/dbus-socket.h
diff --git a/src/dbus-swap.c b/src/core/dbus-swap.c
index 09cd1e8b9c..09cd1e8b9c 100644
--- a/src/dbus-swap.c
+++ b/src/core/dbus-swap.c
diff --git a/src/dbus-swap.h b/src/core/dbus-swap.h
index 15b914726b..15b914726b 100644
--- a/src/dbus-swap.h
+++ b/src/core/dbus-swap.h
diff --git a/src/dbus-target.c b/src/core/dbus-target.c
index 55cf862de0..55cf862de0 100644
--- a/src/dbus-target.c
+++ b/src/core/dbus-target.c
diff --git a/src/dbus-target.h b/src/core/dbus-target.h
index 13d38764a2..13d38764a2 100644
--- a/src/dbus-target.h
+++ b/src/core/dbus-target.h
diff --git a/src/dbus-timer.c b/src/core/dbus-timer.c
index b396aed047..b396aed047 100644
--- a/src/dbus-timer.c
+++ b/src/core/dbus-timer.c
diff --git a/src/dbus-timer.h b/src/core/dbus-timer.h
index e692e12fcb..e692e12fcb 100644
--- a/src/dbus-timer.h
+++ b/src/core/dbus-timer.h
diff --git a/src/dbus-unit.c b/src/core/dbus-unit.c
index c7532c7255..c7532c7255 100644
--- a/src/dbus-unit.c
+++ b/src/core/dbus-unit.c
diff --git a/src/dbus-unit.h b/src/core/dbus-unit.h
index 4f19a808bf..4f19a808bf 100644
--- a/src/dbus-unit.h
+++ b/src/core/dbus-unit.h
diff --git a/src/dbus.c b/src/core/dbus.c
index ddf91f225a..ddf91f225a 100644
--- a/src/dbus.c
+++ b/src/core/dbus.c
diff --git a/src/dbus.h b/src/core/dbus.h
index bd539d0e72..bd539d0e72 100644
--- a/src/dbus.h
+++ b/src/core/dbus.h
diff --git a/src/device.c b/src/core/device.c
index 0575379d80..0575379d80 100644
--- a/src/device.c
+++ b/src/core/device.c
diff --git a/src/device.h b/src/core/device.h
index a05c3d37b0..a05c3d37b0 100644
--- a/src/device.h
+++ b/src/core/device.h
diff --git a/src/execute.c b/src/core/execute.c
index 179ca7e55c..179ca7e55c 100644
--- a/src/execute.c
+++ b/src/core/execute.c
diff --git a/src/execute.h b/src/core/execute.h
index 0d7e7dd65d..0d7e7dd65d 100644
--- a/src/execute.h
+++ b/src/core/execute.h
diff --git a/src/fdset.c b/src/core/fdset.c
index e67fe6fabf..e67fe6fabf 100644
--- a/src/fdset.c
+++ b/src/core/fdset.c
diff --git a/src/fdset.h b/src/core/fdset.h
index 044a9e6d1f..044a9e6d1f 100644
--- a/src/fdset.h
+++ b/src/core/fdset.h
diff --git a/src/ima-setup.c b/src/core/ima-setup.c
index 03e43dcf16..03e43dcf16 100644
--- a/src/ima-setup.c
+++ b/src/core/ima-setup.c
diff --git a/src/ima-setup.h b/src/core/ima-setup.h
index 7d677cf852..7d677cf852 100644
--- a/src/ima-setup.h
+++ b/src/core/ima-setup.h
diff --git a/src/initreq.h b/src/core/initreq.h
index 859042ce42..859042ce42 100644
--- a/src/initreq.h
+++ b/src/core/initreq.h
diff --git a/src/job.c b/src/core/job.c
index bae6ab9f32..bae6ab9f32 100644
--- a/src/job.c
+++ b/src/core/job.c
diff --git a/src/job.h b/src/core/job.h
index 60a43e074d..60a43e074d 100644
--- a/src/job.h
+++ b/src/core/job.h
diff --git a/src/kmod-setup.c b/src/core/kmod-setup.c
index debf87130d..debf87130d 100644
--- a/src/kmod-setup.c
+++ b/src/core/kmod-setup.c
diff --git a/src/kmod-setup.h b/src/core/kmod-setup.h
index 496aef3e15..496aef3e15 100644
--- a/src/kmod-setup.h
+++ b/src/core/kmod-setup.h
diff --git a/src/load-dropin.c b/src/core/load-dropin.c
index d869ee0c76..d869ee0c76 100644
--- a/src/load-dropin.c
+++ b/src/core/load-dropin.c
diff --git a/src/load-dropin.h b/src/core/load-dropin.h
index cf3a799381..cf3a799381 100644
--- a/src/load-dropin.h
+++ b/src/core/load-dropin.h
diff --git a/src/load-fragment.c b/src/core/load-fragment.c
index 637c82b427..637c82b427 100644
--- a/src/load-fragment.c
+++ b/src/core/load-fragment.c
diff --git a/src/load-fragment.h b/src/core/load-fragment.h
index 79fc76da92..79fc76da92 100644
--- a/src/load-fragment.h
+++ b/src/core/load-fragment.h
diff --git a/src/locale-setup.c b/src/core/locale-setup.c
index 7f692e9c5d..7f692e9c5d 100644
--- a/src/locale-setup.c
+++ b/src/core/locale-setup.c
diff --git a/src/locale-setup.h b/src/core/locale-setup.h
index 09a6bc682d..09a6bc682d 100644
--- a/src/locale-setup.h
+++ b/src/core/locale-setup.h
diff --git a/src/manager.c b/src/core/manager.c
index 312527aa9c..312527aa9c 100644
--- a/src/manager.c
+++ b/src/core/manager.c
diff --git a/src/manager.h b/src/core/manager.h
index 9ecc926cbf..9ecc926cbf 100644
--- a/src/manager.h
+++ b/src/core/manager.h
diff --git a/src/mount.c b/src/core/mount.c
index 7dbeaf9cf0..7dbeaf9cf0 100644
--- a/src/mount.c
+++ b/src/core/mount.c
diff --git a/src/mount.h b/src/core/mount.h
index 9318444249..9318444249 100644
--- a/src/mount.h
+++ b/src/core/mount.h
diff --git a/src/namespace.c b/src/core/namespace.c
index 09bc82909f..09bc82909f 100644
--- a/src/namespace.c
+++ b/src/core/namespace.c
diff --git a/src/namespace.h b/src/core/namespace.h
index 7cf1dedd32..7cf1dedd32 100644
--- a/src/namespace.h
+++ b/src/core/namespace.h
diff --git a/src/path.c b/src/core/path.c
index 1d50885ed4..1d50885ed4 100644
--- a/src/path.c
+++ b/src/core/path.c
diff --git a/src/path.h b/src/core/path.h
index efb6b5eb44..efb6b5eb44 100644
--- a/src/path.h
+++ b/src/core/path.h
diff --git a/src/polkit.h b/src/core/polkit.h
index 0d08194b26..0d08194b26 100644
--- a/src/polkit.h
+++ b/src/core/polkit.h
diff --git a/src/securebits.h b/src/core/securebits.h
index ba0bba5353..ba0bba5353 100644
--- a/src/securebits.h
+++ b/src/core/securebits.h
diff --git a/src/selinux-setup.c b/src/core/selinux-setup.c
index a7e1fa4007..a7e1fa4007 100644
--- a/src/selinux-setup.c
+++ b/src/core/selinux-setup.c
diff --git a/src/selinux-setup.h b/src/core/selinux-setup.h
index 6b8fe00b7d..6b8fe00b7d 100644
--- a/src/selinux-setup.h
+++ b/src/core/selinux-setup.h
diff --git a/src/service.c b/src/core/service.c
index bf2e0a9d98..bf2e0a9d98 100644
--- a/src/service.c
+++ b/src/core/service.c
diff --git a/src/service.h b/src/core/service.h
index 60b10516eb..60b10516eb 100644
--- a/src/service.h
+++ b/src/core/service.h
diff --git a/src/snapshot.c b/src/core/snapshot.c
index 82ec5104db..82ec5104db 100644
--- a/src/snapshot.c
+++ b/src/core/snapshot.c
diff --git a/src/snapshot.h b/src/core/snapshot.h
index bf92e99a8b..bf92e99a8b 100644
--- a/src/snapshot.h
+++ b/src/core/snapshot.h
diff --git a/src/socket.c b/src/core/socket.c
index 5b24b3422b..5b24b3422b 100644
--- a/src/socket.c
+++ b/src/core/socket.c
diff --git a/src/socket.h b/src/core/socket.h
index 6470d8b63e..6470d8b63e 100644
--- a/src/socket.h
+++ b/src/core/socket.h
diff --git a/src/spawn-agent.h b/src/core/spawn-agent.h
index fd0a9109b8..fd0a9109b8 100644
--- a/src/spawn-agent.h
+++ b/src/core/spawn-agent.h
diff --git a/src/special.h b/src/core/special.h
index 43e2e6f6d7..43e2e6f6d7 100644
--- a/src/special.h
+++ b/src/core/special.h
diff --git a/src/swap.c b/src/core/swap.c
index 9c72732b94..9c72732b94 100644
--- a/src/swap.c
+++ b/src/core/swap.c
diff --git a/src/swap.h b/src/core/swap.h
index 62d08da30b..62d08da30b 100644
--- a/src/swap.h
+++ b/src/core/swap.h
diff --git a/src/sysfs-show.h b/src/core/sysfs-show.h
index 9939e8b069..9939e8b069 100644
--- a/src/sysfs-show.h
+++ b/src/core/sysfs-show.h
diff --git a/src/target.c b/src/core/target.c
index 6c1e0c368a..6c1e0c368a 100644
--- a/src/target.c
+++ b/src/core/target.c
diff --git a/src/target.h b/src/core/target.h
index 5b97c86fbf..5b97c86fbf 100644
--- a/src/target.h
+++ b/src/core/target.h
diff --git a/src/tcpwrap.c b/src/core/tcpwrap.c
index 0aab1427dd..0aab1427dd 100644
--- a/src/tcpwrap.c
+++ b/src/core/tcpwrap.c
diff --git a/src/tcpwrap.h b/src/core/tcpwrap.h
index 4d4553e8ae..4d4553e8ae 100644
--- a/src/tcpwrap.h
+++ b/src/core/tcpwrap.h
diff --git a/src/timer.c b/src/core/timer.c
index e318fee201..e318fee201 100644
--- a/src/timer.c
+++ b/src/core/timer.c
diff --git a/src/timer.h b/src/core/timer.h
index f5c5c64f25..f5c5c64f25 100644
--- a/src/timer.h
+++ b/src/core/timer.h
diff --git a/src/unit.c b/src/core/unit.c
index 9e33701c8f..9e33701c8f 100644
--- a/src/unit.c
+++ b/src/core/unit.c
diff --git a/src/unit.h b/src/core/unit.h
index 756f465da3..756f465da3 100644
--- a/src/unit.h
+++ b/src/core/unit.h