310 files changed, 498 insertions, 184 deletions
diff --git a/build-aux/Makefile.once.head/30-automake2autothing.mk b/build-aux/Makefile.once.head/30-automake2autothing.mk
index 529cc97326..d02e41f401 100644
--- a/build-aux/Makefile.once.head/30-automake2autothing.mk
+++ b/build-aux/Makefile.once.head/30-automake2autothing.mk
@@ -7,5 +7,5 @@ automake_name = $(subst -,_,$(subst .,_,$1))
 automake_sources = $(addprefix $(outdir)/,$(notdir $($(automake_name)_SOURCES) $(nodist_$(automake_name)_SOURCES)))
 automake_lo = $(patsubst %.c,%.lo,$(filter %.c,$(automake_sources)))
 automake_o = $(patsubst %.c,%.o,$(filter %.c,$(automake_sources)))
-automake_lib = $(foreach l,$($(automake_name)_$2),$(if $(filter lib%.la,$l), $($(l:.la=).DEPENDS)  , $l ))
-automake_cpp = $(foreach l,$($(automake_name)_$2),$(if $(filter lib%.la,$l), $($(l:.la=).CPPFLAGS) ,    ))
+automake_lib = $(foreach l,   $($(automake_name)_$2),$(if $(filter lib%.la,$l), $($(l:.la=).DEPENDS)  , $l ))
+automake_cpp = $(foreach l,$1 $($(automake_name)_$2),$(if $(filter lib%.la,$l), $($(l:.la=).CPPFLAGS) ,    ))
diff --git a/config.mk.in b/config.mk.in
index 5df28ae83b..728e7b5706 100644
--- a/config.mk.in
+++ b/config.mk.in
@@ -103,8 +103,6 @@ rootlibdir=@rootlibdir@
 # Libraries we provide
 libbasic.CPPFLAGS                    = -I$(topsrcdir)/src/libbasic/include -I$(topoutdir)/src/libbasic/include
 libbasic.DEPENDS                     =   $(topoutdir)/src/libbasic/src/libbasic.la
-libcore.CPPFLAGS                     = -I$(topsrcdir)/src/libcore $(libshared.CPPFLAGS)
-libcore.DEPENDS                      =   $(topoutdir)/src/libcore/libcore.la
 libfirewall.CPPFLAGS                 = -I$(topsrcdir)/src/libfirewall
 libfirewall.DEPENDS                  =   $(topoutdir)/src/libfirewall/libfirewall.la
 libshared.CPPFLAGS                   = -I$(topsrcdir)/src/libshared/include $(libsystemd-internal.CPPFLAGS) -I$(topsrcdir)/src/libudev/src
@@ -122,10 +120,12 @@ libudev.DEPENDS                      =   $(topoutdir)/src/libudev/src/libudev.la
 libudev-internal.CPPFLAGS            = $(libudev.CPPFLAGS) $(libbasic.CPPFLAGS)
 libudev-internal.DEPENDS             =   $(topoutdir)/src/libudev/src/libudev-internal.la
 # -core libs
+libcore.CPPFLAGS                     = -I$(topsrcdir)/src/grp-system/libcore $(libshared.CPPFLAGS)
+libcore.DEPENDS                      =   $(topoutdir)/src/grp-system/libcore/libcore.la
 #libbus-proxy-core.CPPFLAGS =
 #libbus-proxy-core.DEPENDS  =
-#libjournal-core.CPPFLAGS   =
-#libjournal-core.DEPENDS    =
+libjournal-core.CPPFLAGS   = -I$(topsrcdir)/src/grp-journal/libjournal-core $(libsystemd-internal.CPPFLAGS) $(libbasic.CPPFLAGS)
+libjournal-core.DEPENDS    =   $(topoutdir)/src/grp-journal/libjournal-core/libjournal-core.la
 #liblogind-core.CPPFLAGS    =
 #liblogind-core.DEPENDS     =
 #libmachine-core.CPPFLAGS   =
@@ -135,12 +135,12 @@ libudev-internal.DEPENDS             =   $(topoutdir)/src/libudev/src/libudev-in
 libudev-core.CPPFLAGS      = -I$(topoutdir)/src/grp-udev/libudev-core $(libsystemd-network.CPPFLAGS) $(libshared.CPPFLAGS)
 libudev-core.DEPENDS       =   $(topoutdir)/src/grp-udev/libudev-core/libudev-core.la
 # NSS modules
-#libnss_myhostname.CPPFLAGS =
-#libnss_myhostname.DEPENDS  =
-#libnss_mymachines.CPPFLAGS =
-#libnss_mymachines.DEPENDS  =
-#libnss_resolve.CPPFLAGS    =
-#libnss_resolve.DEPENDS     =
+libnss_myhostname.CPPFLAGS =
+libnss_myhostname.DEPENDS  =
+libnss_mymachines.CPPFLAGS =
+libnss_mymachines.DEPENDS  =
+libnss_resolve.CPPFLAGS    =
+libnss_resolve.DEPENDS     =
 
 # Libraries we use
 HAVE_ACL        = @HAVE_ACL_TRUE@1
diff --git a/src/Makefile b/src/Makefile
index 5da6a48833..6ce1db256f 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -26,30 +26,25 @@ include $(topsrcdir)/build-aux/Makefile.head.mk
 at.subdirs += busctl
 at.subdirs += grp-boot
 at.subdirs += grp-coredump
-#at.subdirs += grp-hostname
-#at.subdirs += grp-import
-#at.subdirs += grp-journal
-#at.subdirs += grp-journal-remote
-#at.subdirs += grp-locale
-#at.subdirs += grp-login
+at.subdirs += grp-hostname
+at.subdirs += grp-initutils
+at.subdirs += grp-journal
+at.subdirs += grp-locale
+at.subdirs += grp-login
 #at.subdirs += grp-machine
-#at.subdirs += grp-network
+at.subdirs += grp-network
 at.subdirs += grp-resolve
-#at.subdirs += grp-system
+at.subdirs += grp-system
 at.subdirs += grp-timedate
 at.subdirs += grp-udev
-at.subdirs += kernel-install
+at.subdirs += grp-utils
 at.subdirs += libbasic
-at.subdirs += libcore
 at.subdirs += libfirewall
 at.subdirs += libshared
 at.subdirs += libsystemd
 at.subdirs += libsystemd-network
 at.subdirs += libudev
 at.subdirs += nss-myhostname
-at.subdirs += systemd-activate
-at.subdirs += systemd-ac-power
-at.subdirs += systemd-analyze
 at.subdirs += systemd-ask-password
 at.subdirs += systemd-cgls
 at.subdirs += systemd-cgroups-agent
@@ -57,36 +52,21 @@ at.subdirs += systemd-cgtop
 at.subdirs += systemd-cryptsetup
 at.subdirs += systemd-dbus1-generator
 at.subdirs += systemd-debug-generator
-at.subdirs += systemd-delta
-at.subdirs += systemd-escape
-at.subdirs += systemd-firstboot
-at.subdirs += systemd-fsck
-at.subdirs += systemd-fstab-generator
 at.subdirs += systemd-getty-generator
 at.subdirs += systemd-gpt-auto-generator
 at.subdirs += systemd-hibernate-resume
-at.subdirs += systemd-hwdb
 at.subdirs += systemd-initctl
 at.subdirs += systemd-machine-id-setup
 at.subdirs += systemd-modules-load
-at.subdirs += systemd-notify
 at.subdirs += systemd-nspawn
-at.subdirs += systemd-path
 at.subdirs += systemd-rc-local-generator
 at.subdirs += systemd-remount-fs
 at.subdirs += systemd-reply-password
-at.subdirs += systemd-run
 at.subdirs += systemd-shutdown
 at.subdirs += systemd-socket-proxyd
 at.subdirs += systemd-stdio-bridge
-at.subdirs += systemd-sysctl
-at.subdirs += systemd-sysusers
 at.subdirs += systemd-system-update-generator
-at.subdirs += systemd-sysv-generator
 at.subdirs += systemd-timesyncd
-at.subdirs += systemd-tmpfiles
 at.subdirs += systemd-tty-ask-password-agent
-at.subdirs += systemd-update-done
-at.subdirs += systemd-update-utmp
 
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-boot/Makefile b/src/grp-boot/Makefile
index 922d8a32d3..771b80b448 100644
--- a/src/grp-boot/Makefile
+++ b/src/grp-boot/Makefile
@@ -23,6 +23,6 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
-at.subdirs += bootctl systemd-boot
+at.subdirs += bootctl systemd-boot kernel-install
 
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-boot/bootctl/bootctl.c b/src/grp-boot/bootctl/bootctl.c
index 487ad429e0..3ea43e0624 100644
--- a/src/grp-boot/bootctl/bootctl.c
+++ b/src/grp-boot/bootctl/bootctl.c
@@ -38,13 +38,13 @@
 #include "basic/alloc-util.h"
 #include "basic/blkid-util.h"
 #include "basic/dirent-util.h"
-#include "shared/efivars.h"
 #include "basic/fd-util.h"
 #include "basic/fileio.h"
 #include "basic/locale-util.h"
 #include "basic/rm-rf.h"
 #include "basic/string-util.h"
 #include "basic/util.h"
+#include "shared/efivars.h"
 
 static int verify_esp(const char *p, uint32_t *part, uint64_t *pstart, uint64_t *psize, sd_id128_t *uuid) {
         struct statfs sfs;
diff --git a/src/kernel-install/50-depmod.install b/src/grp-boot/kernel-install/50-depmod.install
index 68c24bed7a..68c24bed7a 100644
--- a/src/kernel-install/50-depmod.install
+++ b/src/grp-boot/kernel-install/50-depmod.install
diff --git a/src/kernel-install/90-loaderentry.install b/src/grp-boot/kernel-install/90-loaderentry.install
index 6e94e12f94..6e94e12f94 100644
--- a/src/kernel-install/90-loaderentry.install
+++ b/src/grp-boot/kernel-install/90-loaderentry.install
diff --git a/src/kernel-install/Makefile b/src/grp-boot/kernel-install/Makefile
index d50b684d01..6a937f516c 100644
--- a/src/kernel-install/Makefile
+++ b/src/grp-boot/kernel-install/Makefile
@@ -20,7 +20,7 @@
 #
 #  You should have received a copy of the GNU Lesser General Public License
 #  along with systemd; If not, see <http://www.gnu.org/licenses/>.
-include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
+include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
 dist_bin_SCRIPTS = \
diff --git a/src/kernel-install/bash-completion_kernel-install b/src/grp-boot/kernel-install/bash-completion_kernel-install
index 7cd2494cf7..7cd2494cf7 100644
--- a/src/kernel-install/bash-completion_kernel-install
+++ b/src/grp-boot/kernel-install/bash-completion_kernel-install
diff --git a/src/kernel-install/kernel-install b/src/grp-boot/kernel-install/kernel-install
index 3ae1d77e33..3ae1d77e33 100644
--- a/src/kernel-install/kernel-install
+++ b/src/grp-boot/kernel-install/kernel-install
diff --git a/src/kernel-install/kernel-install.xml b/src/grp-boot/kernel-install/kernel-install.xml
index eb519188a6..eb519188a6 100644
--- a/src/kernel-install/kernel-install.xml
+++ b/src/grp-boot/kernel-install/kernel-install.xml
diff --git a/src/kernel-install/zsh-completion_kernel-install b/src/grp-boot/kernel-install/zsh-completion_kernel-install
index 4fdd3a4ae7..4fdd3a4ae7 100644
--- a/src/kernel-install/zsh-completion_kernel-install
+++ b/src/grp-boot/kernel-install/zsh-completion_kernel-install
diff --git a/src/grp-hostname/hostnamectl.c b/src/grp-hostname/hostnamectl.c
index 30f0f06d89..8a24813934 100644
--- a/src/grp-hostname/hostnamectl.c
+++ b/src/grp-hostname/hostnamectl.c
@@ -28,11 +28,11 @@
 
 #include "basic/alloc-util.h"
 #include "basic/architecture.h"
-#include "bus-error.h"
-#include "shared/bus-util.h"
 #include "basic/hostname-util.h"
-#include "shared/spawn-polkit-agent.h"
 #include "basic/util.h"
+#include "sd-bus/bus-error.h"
+#include "shared/bus-util.h"
+#include "shared/spawn-polkit-agent.h"
 
 static bool arg_ask_password = true;
 static BusTransport arg_transport = BUS_TRANSPORT_LOCAL;
diff --git a/src/grp-initutils/Makefile b/src/grp-initutils/Makefile
new file mode 100644
index 0000000000..8760b1cd32
--- /dev/null
+++ b/src/grp-initutils/Makefile
@@ -0,0 +1,43 @@
+#  -*- Mode: makefile; indent-tabs-mode: t -*-
+#
+#  This file is part of systemd.
+#
+#  Copyright 2010-2012 Lennart Poettering
+#  Copyright 2010-2012 Kay Sievers
+#  Copyright 2013 Zbigniew Jędrzejewski-Szmek
+#  Copyright 2013 David Strauss
+#  Copyright 2016 Luke Shumaker
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
+#
+#  systemd is distributed in the hope that it will be useful, but
+#  WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+#  Lesser General Public License for more details.
+#
+#  You should have received a copy of the GNU Lesser General Public License
+#  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
+include $(topsrcdir)/build-aux/Makefile.head.mk
+
+at.subdirs += systemd-backlight
+at.subdirs += systemd-binfmt
+at.subdirs += systemd-detect-virt
+at.subdirs += systemd-firstboot
+at.subdirs += systemd-fsck
+at.subdirs += systemd-quotacheck
+at.subdirs += systemd-random-seed
+at.subdirs += systemd-rfkill
+at.subdirs += systemd-sleep
+at.subdirs += systemd-sysctl
+at.subdirs += systemd-sysusers
+at.subdirs += systemd-tmpfiles
+at.subdirs += systemd-update-done
+at.subdirs += systemd-update-utmp
+at.subdirs += systemd-user-sessions
+at.subdirs += systemd-vconsole-setup
+
+include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-helperunits/systemd-backlight/Makefile b/src/grp-initutils/systemd-backlight/Makefile
index cf55ac4db9..cf55ac4db9 100644
--- a/src/grp-helperunits/systemd-backlight/Makefile
+++ b/src/grp-initutils/systemd-backlight/Makefile
diff --git a/src/grp-helperunits/systemd-backlight/backlight.c b/src/grp-initutils/systemd-backlight/backlight.c
index c7931ac584..c7931ac584 100644
--- a/src/grp-helperunits/systemd-backlight/backlight.c
+++ b/src/grp-initutils/systemd-backlight/backlight.c
diff --git a/src/grp-helperunits/systemd-binfmt/Makefile b/src/grp-initutils/systemd-binfmt/Makefile
index 3e5c1ac270..3e5c1ac270 100644
--- a/src/grp-helperunits/systemd-binfmt/Makefile
+++ b/src/grp-initutils/systemd-binfmt/Makefile
diff --git a/src/grp-helperunits/systemd-binfmt/binfmt.c b/src/grp-initutils/systemd-binfmt/binfmt.c
index 39bbdb5335..39bbdb5335 100644
--- a/src/grp-helperunits/systemd-binfmt/binfmt.c
+++ b/src/grp-initutils/systemd-binfmt/binfmt.c
diff --git a/src/grp-helperunits/systemd-detect-virt/Makefile b/src/grp-initutils/systemd-detect-virt/Makefile
index 7b9b9f667b..7b9b9f667b 100644
--- a/src/grp-helperunits/systemd-detect-virt/Makefile
+++ b/src/grp-initutils/systemd-detect-virt/Makefile
diff --git a/src/grp-helperunits/systemd-detect-virt/detect-virt.c b/src/grp-initutils/systemd-detect-virt/detect-virt.c
index 06cdab5297..06cdab5297 100644
--- a/src/grp-helperunits/systemd-detect-virt/detect-virt.c
+++ b/src/grp-initutils/systemd-detect-virt/detect-virt.c
diff --git a/src/systemd-firstboot/Makefile b/src/grp-initutils/systemd-firstboot/Makefile
index 09d9ebb1d7..b94b344bb9 100644
--- a/src/systemd-firstboot/Makefile
+++ b/src/grp-initutils/systemd-firstboot/Makefile
@@ -20,7 +20,7 @@
 #
 #  You should have received a copy of the GNU Lesser General Public License
 #  along with systemd; If not, see <http://www.gnu.org/licenses/>.
-include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
+include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
 ifneq ($(ENABLE_FIRSTBOOT),)
diff --git a/src/systemd-firstboot/firstboot.c b/src/grp-initutils/systemd-firstboot/firstboot.c
index 46e82a2a7b..d2059a943f 100644
--- a/src/systemd-firstboot/firstboot.c
+++ b/src/grp-initutils/systemd-firstboot/firstboot.c
@@ -23,7 +23,6 @@
 #include <unistd.h>
 
 #include "basic/alloc-util.h"
-#include "shared/ask-password-api.h"
 #include "basic/copy.h"
 #include "basic/fd-util.h"
 #include "basic/fileio.h"
@@ -40,6 +39,7 @@
 #include "basic/time-util.h"
 #include "basic/umask-util.h"
 #include "basic/user-util.h"
+#include "shared/ask-password-api.h"
 
 static char *arg_root = NULL;
 static char *arg_locale = NULL;  /* $LANG */
diff --git a/src/systemd-fsck/Makefile b/src/grp-initutils/systemd-fsck/Makefile
index cc4e21055c..f29fba4d20 100644
--- a/src/systemd-fsck/Makefile
+++ b/src/grp-initutils/systemd-fsck/Makefile
@@ -20,7 +20,7 @@
 #
 #  You should have received a copy of the GNU Lesser General Public License
 #  along with systemd; If not, see <http://www.gnu.org/licenses/>.
-include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
+include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
 rootlibexec_PROGRAMS += systemd-fsck
diff --git a/src/systemd-fsck/fsck.c b/src/grp-initutils/systemd-fsck/fsck.c
index 4ca018763f..4ca018763f 100644
--- a/src/systemd-fsck/fsck.c
+++ b/src/grp-initutils/systemd-fsck/fsck.c
diff --git a/src/grp-helperunits/systemd-quotacheck/Makefile b/src/grp-initutils/systemd-quotacheck/Makefile
index 979ae07c9e..979ae07c9e 100644
--- a/src/grp-helperunits/systemd-quotacheck/Makefile
+++ b/src/grp-initutils/systemd-quotacheck/Makefile
diff --git a/src/grp-helperunits/systemd-quotacheck/quotacheck.c b/src/grp-initutils/systemd-quotacheck/quotacheck.c
index 3c2292b0c4..3c2292b0c4 100644
--- a/src/grp-helperunits/systemd-quotacheck/quotacheck.c
+++ b/src/grp-initutils/systemd-quotacheck/quotacheck.c
diff --git a/src/grp-helperunits/systemd-random-seed/Makefile b/src/grp-initutils/systemd-random-seed/Makefile
index 65ae60828b..65ae60828b 100644
--- a/src/grp-helperunits/systemd-random-seed/Makefile
+++ b/src/grp-initutils/systemd-random-seed/Makefile
diff --git a/src/grp-helperunits/systemd-random-seed/random-seed.c b/src/grp-initutils/systemd-random-seed/random-seed.c
index 7fea6069f3..7fea6069f3 100644
--- a/src/grp-helperunits/systemd-random-seed/random-seed.c
+++ b/src/grp-initutils/systemd-random-seed/random-seed.c
diff --git a/src/grp-helperunits/systemd-rfkill/Makefile b/src/grp-initutils/systemd-rfkill/Makefile
index 2b4430b712..2b4430b712 100644
--- a/src/grp-helperunits/systemd-rfkill/Makefile
+++ b/src/grp-initutils/systemd-rfkill/Makefile
diff --git a/src/grp-helperunits/systemd-rfkill/rfkill.c b/src/grp-initutils/systemd-rfkill/rfkill.c
index d3dd2ef18d..d3dd2ef18d 100644
--- a/src/grp-helperunits/systemd-rfkill/rfkill.c
+++ b/src/grp-initutils/systemd-rfkill/rfkill.c
diff --git a/src/grp-helperunits/systemd-sleep/Makefile b/src/grp-initutils/systemd-sleep/Makefile
index 9ac849f817..9ac849f817 100644
--- a/src/grp-helperunits/systemd-sleep/Makefile
+++ b/src/grp-initutils/systemd-sleep/Makefile
diff --git a/src/grp-helperunits/systemd-sleep/sleep.c b/src/grp-initutils/systemd-sleep/sleep.c
index 100066d4c1..100066d4c1 100644
--- a/src/grp-helperunits/systemd-sleep/sleep.c
+++ b/src/grp-initutils/systemd-sleep/sleep.c
diff --git a/src/systemd-sysctl/Makefile b/src/grp-initutils/systemd-sysctl/Makefile
index 39ce08d5e3..3af80e7bef 100644
--- a/src/systemd-sysctl/Makefile
+++ b/src/grp-initutils/systemd-sysctl/Makefile
@@ -20,7 +20,7 @@
 #
 #  You should have received a copy of the GNU Lesser General Public License
 #  along with systemd; If not, see <http://www.gnu.org/licenses/>.
-include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
+include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
 rootlibexec_PROGRAMS += systemd-sysctl
diff --git a/src/systemd-sysctl/sysctl.c b/src/grp-initutils/systemd-sysctl/sysctl.c
index 132420d95d..132420d95d 100644
--- a/src/systemd-sysctl/sysctl.c
+++ b/src/grp-initutils/systemd-sysctl/sysctl.c
diff --git a/src/systemd-sysusers/Makefile b/src/grp-initutils/systemd-sysusers/Makefile
index d18e41b1d5..4753ca75d0 100644
--- a/src/systemd-sysusers/Makefile
+++ b/src/grp-initutils/systemd-sysusers/Makefile
@@ -20,7 +20,7 @@
 #
 #  You should have received a copy of the GNU Lesser General Public License
 #  along with systemd; If not, see <http://www.gnu.org/licenses/>.
-include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
+include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
 ifneq ($(ENABLE_SYSUSERS),)
diff --git a/src/systemd-sysusers/sysusers.c b/src/grp-initutils/systemd-sysusers/sysusers.c
index 83e526c5ff..83e526c5ff 100644
--- a/src/systemd-sysusers/sysusers.c
+++ b/src/grp-initutils/systemd-sysusers/sysusers.c
diff --git a/src/systemd-tmpfiles/Makefile b/src/grp-initutils/systemd-tmpfiles/Makefile
index 1e72e31215..d12c910883 100644
--- a/src/systemd-tmpfiles/Makefile
+++ b/src/grp-initutils/systemd-tmpfiles/Makefile
@@ -20,7 +20,7 @@
 #
 #  You should have received a copy of the GNU Lesser General Public License
 #  along with systemd; If not, see <http://www.gnu.org/licenses/>.
-include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
+include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
 ifneq ($(ENABLE_TMPFILES),)
diff --git a/src/systemd-tmpfiles/tmpfiles.c b/src/grp-initutils/systemd-tmpfiles/tmpfiles.c
index 58dd7c0f8c..58dd7c0f8c 100644
--- a/src/systemd-tmpfiles/tmpfiles.c
+++ b/src/grp-initutils/systemd-tmpfiles/tmpfiles.c
diff --git a/src/systemd-update-done/Makefile b/src/grp-initutils/systemd-update-done/Makefile
index 5045982316..90cb440874 100644
--- a/src/systemd-update-done/Makefile
+++ b/src/grp-initutils/systemd-update-done/Makefile
@@ -20,7 +20,7 @@
 #
 #  You should have received a copy of the GNU Lesser General Public License
 #  along with systemd; If not, see <http://www.gnu.org/licenses/>.
-include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
+include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
 rootlibexec_PROGRAMS += systemd-update-done
diff --git a/src/systemd-update-done/update-done.c b/src/grp-initutils/systemd-update-done/update-done.c
index 39d19ec048..39d19ec048 100644
--- a/src/systemd-update-done/update-done.c
+++ b/src/grp-initutils/systemd-update-done/update-done.c
diff --git a/src/systemd-update-utmp/Makefile b/src/grp-initutils/systemd-update-utmp/Makefile
index 56f8d1f4b5..0107808281 100644
--- a/src/systemd-update-utmp/Makefile
+++ b/src/grp-initutils/systemd-update-utmp/Makefile
@@ -20,7 +20,7 @@
 #
 #  You should have received a copy of the GNU Lesser General Public License
 #  along with systemd; If not, see <http://www.gnu.org/licenses/>.
-include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
+include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
 ifneq ($(HAVE_UTMP),)
diff --git a/src/systemd-update-utmp/update-utmp.c b/src/grp-initutils/systemd-update-utmp/update-utmp.c
index 69264c3a26..69264c3a26 100644
--- a/src/systemd-update-utmp/update-utmp.c
+++ b/src/grp-initutils/systemd-update-utmp/update-utmp.c
diff --git a/src/grp-helperunits/systemd-user-sessions/Makefile b/src/grp-initutils/systemd-user-sessions/Makefile
index 66fa3b7059..66fa3b7059 100644
--- a/src/grp-helperunits/systemd-user-sessions/Makefile
+++ b/src/grp-initutils/systemd-user-sessions/Makefile
diff --git a/src/grp-helperunits/systemd-user-sessions/user-sessions.c b/src/grp-initutils/systemd-user-sessions/user-sessions.c
index 4cec29c39e..4cec29c39e 100644
--- a/src/grp-helperunits/systemd-user-sessions/user-sessions.c
+++ b/src/grp-initutils/systemd-user-sessions/user-sessions.c
diff --git a/src/grp-helperunits/systemd-vconsole-setup/.gitignore b/src/grp-initutils/systemd-vconsole-setup/.gitignore
index 82741b2fb3..82741b2fb3 100644
--- a/src/grp-helperunits/systemd-vconsole-setup/.gitignore
+++ b/src/grp-initutils/systemd-vconsole-setup/.gitignore
diff --git a/src/grp-helperunits/systemd-vconsole-setup/90-vconsole.rules.in b/src/grp-initutils/systemd-vconsole-setup/90-vconsole.rules.in
index 35b9ad5151..35b9ad5151 100644
--- a/src/grp-helperunits/systemd-vconsole-setup/90-vconsole.rules.in
+++ b/src/grp-initutils/systemd-vconsole-setup/90-vconsole.rules.in
diff --git a/src/grp-helperunits/systemd-vconsole-setup/Makefile b/src/grp-initutils/systemd-vconsole-setup/Makefile
index 99b369967e..99b369967e 100644
--- a/src/grp-helperunits/systemd-vconsole-setup/Makefile
+++ b/src/grp-initutils/systemd-vconsole-setup/Makefile
diff --git a/src/grp-helperunits/systemd-vconsole-setup/vconsole-setup.c b/src/grp-initutils/systemd-vconsole-setup/vconsole-setup.c
index dd05231982..dd05231982 100644
--- a/src/grp-helperunits/systemd-vconsole-setup/vconsole-setup.c
+++ b/src/grp-initutils/systemd-vconsole-setup/vconsole-setup.c
diff --git a/src/grp-journal/Makefile b/src/grp-journal/Makefile
index fcefb81581..046d93521f 100644
--- a/src/grp-journal/Makefile
+++ b/src/grp-journal/Makefile
@@ -167,4 +167,8 @@ tests += \
 	test-compress-benchmark
 endif # HAVE_COMPRESSION
 
+at.subdirs += journalctl systemd-journald libjournal-core
+at.subdirs += systemd-cat
+#at.subdirs += grp-remote
+
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-journal-remote/.gitignore b/src/grp-journal/grp-remote/.gitignore
index 06847b65d4..06847b65d4 100644
--- a/src/grp-journal-remote/.gitignore
+++ b/src/grp-journal/grp-remote/.gitignore
diff --git a/src/grp-journal-remote/Makefile b/src/grp-journal/grp-remote/Makefile
index 7885bea0fc..689341d6ae 100644
--- a/src/grp-journal-remote/Makefile
+++ b/src/grp-journal/grp-remote/Makefile
@@ -23,8 +23,8 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
-at.subdirs += systemd-journa-gatewayd
-at.subdirs += systemd-journa-remote
-at.subdirs += systemd-journa-upload
+at.subdirs += systemd-journal-gatewayd
+at.subdirs += systemd-journal-remote
+at.subdirs += systemd-journal-upload
 
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-journal-remote/browse.html b/src/grp-journal/grp-remote/browse.html
index 32848c7673..32848c7673 100644
--- a/src/grp-journal-remote/browse.html
+++ b/src/grp-journal/grp-remote/browse.html
diff --git a/src/grp-journal-remote/log-generator.py b/src/grp-journal/grp-remote/log-generator.py
index fd6964e758..fd6964e758 100755
--- a/src/grp-journal-remote/log-generator.py
+++ b/src/grp-journal/grp-remote/log-generator.py
diff --git a/src/grp-journal-remote/microhttpd-util.c b/src/grp-journal/grp-remote/microhttpd-util.c
index 99d6f32a2a..99d6f32a2a 100644
--- a/src/grp-journal-remote/microhttpd-util.c
+++ b/src/grp-journal/grp-remote/microhttpd-util.c
diff --git a/src/grp-journal-remote/microhttpd-util.h b/src/grp-journal/grp-remote/microhttpd-util.h
index 178e78f892..178e78f892 100644
--- a/src/grp-journal-remote/microhttpd-util.h
+++ b/src/grp-journal/grp-remote/microhttpd-util.h
diff --git a/src/grp-journal-remote/systemd-journal-gatewayd/Makefile b/src/grp-journal/grp-remote/systemd-journal-gatewayd/Makefile
index 05df34a71d..05df34a71d 100644
--- a/src/grp-journal-remote/systemd-journal-gatewayd/Makefile
+++ b/src/grp-journal/grp-remote/systemd-journal-gatewayd/Makefile
diff --git a/src/grp-journal-remote/systemd-journal-gatewayd/journal-gatewayd.c b/src/grp-journal/grp-remote/systemd-journal-gatewayd/journal-gatewayd.c
index 2e21f9ecb7..2e21f9ecb7 100644
--- a/src/grp-journal-remote/systemd-journal-gatewayd/journal-gatewayd.c
+++ b/src/grp-journal/grp-remote/systemd-journal-gatewayd/journal-gatewayd.c
diff --git a/src/grp-journal-remote/systemd-journal-remote/Makefile b/src/grp-journal/grp-remote/systemd-journal-remote/Makefile
index 05af76afc2..05af76afc2 100644
--- a/src/grp-journal-remote/systemd-journal-remote/Makefile
+++ b/src/grp-journal/grp-remote/systemd-journal-remote/Makefile
diff --git a/src/grp-journal-remote/systemd-journal-remote/journal-remote-parse.c b/src/grp-journal/grp-remote/systemd-journal-remote/journal-remote-parse.c
index ec5358fb97..ec5358fb97 100644
--- a/src/grp-journal-remote/systemd-journal-remote/journal-remote-parse.c
+++ b/src/grp-journal/grp-remote/systemd-journal-remote/journal-remote-parse.c
diff --git a/src/grp-journal-remote/systemd-journal-remote/journal-remote-parse.h b/src/grp-journal/grp-remote/systemd-journal-remote/journal-remote-parse.h
index 4f47ea89d6..4f47ea89d6 100644
--- a/src/grp-journal-remote/systemd-journal-remote/journal-remote-parse.h
+++ b/src/grp-journal/grp-remote/systemd-journal-remote/journal-remote-parse.h
diff --git a/src/grp-journal-remote/systemd-journal-remote/journal-remote-write.c b/src/grp-journal/grp-remote/systemd-journal-remote/journal-remote-write.c
index 82292fd240..82292fd240 100644
--- a/src/grp-journal-remote/systemd-journal-remote/journal-remote-write.c
+++ b/src/grp-journal/grp-remote/systemd-journal-remote/journal-remote-write.c
diff --git a/src/grp-journal-remote/systemd-journal-remote/journal-remote-write.h b/src/grp-journal/grp-remote/systemd-journal-remote/journal-remote-write.h
index 53ba45fc04..53ba45fc04 100644
--- a/src/grp-journal-remote/systemd-journal-remote/journal-remote-write.h
+++ b/src/grp-journal/grp-remote/systemd-journal-remote/journal-remote-write.h
diff --git a/src/grp-journal-remote/systemd-journal-remote/journal-remote.c b/src/grp-journal/grp-remote/systemd-journal-remote/journal-remote.c
index 6ea7adabb0..6ea7adabb0 100644
--- a/src/grp-journal-remote/systemd-journal-remote/journal-remote.c
+++ b/src/grp-journal/grp-remote/systemd-journal-remote/journal-remote.c
diff --git a/src/grp-journal-remote/systemd-journal-remote/journal-remote.conf.in b/src/grp-journal/grp-remote/systemd-journal-remote/journal-remote.conf.in
index 7122d63362..7122d63362 100644
--- a/src/grp-journal-remote/systemd-journal-remote/journal-remote.conf.in
+++ b/src/grp-journal/grp-remote/systemd-journal-remote/journal-remote.conf.in
diff --git a/src/grp-journal-remote/systemd-journal-remote/journal-remote.h b/src/grp-journal/grp-remote/systemd-journal-remote/journal-remote.h
index 2e8d5999b0..2e8d5999b0 100644
--- a/src/grp-journal-remote/systemd-journal-remote/journal-remote.h
+++ b/src/grp-journal/grp-remote/systemd-journal-remote/journal-remote.h
diff --git a/src/grp-journal-remote/systemd-journal-upload/Makefile b/src/grp-journal/grp-remote/systemd-journal-upload/Makefile
index c47fcf0128..c47fcf0128 100644
--- a/src/grp-journal-remote/systemd-journal-upload/Makefile
+++ b/src/grp-journal/grp-remote/systemd-journal-upload/Makefile
diff --git a/src/grp-journal-remote/systemd-journal-upload/journal-upload-journal.c b/src/grp-journal/grp-remote/systemd-journal-upload/journal-upload-journal.c
index eddfc384fa..eddfc384fa 100644
--- a/src/grp-journal-remote/systemd-journal-upload/journal-upload-journal.c
+++ b/src/grp-journal/grp-remote/systemd-journal-upload/journal-upload-journal.c
diff --git a/src/grp-journal-remote/systemd-journal-upload/journal-upload.c b/src/grp-journal/grp-remote/systemd-journal-upload/journal-upload.c
index 643f44cd86..643f44cd86 100644
--- a/src/grp-journal-remote/systemd-journal-upload/journal-upload.c
+++ b/src/grp-journal/grp-remote/systemd-journal-upload/journal-upload.c
diff --git a/src/grp-journal-remote/systemd-journal-upload/journal-upload.conf.in b/src/grp-journal/grp-remote/systemd-journal-upload/journal-upload.conf.in
index c5670682e8..c5670682e8 100644
--- a/src/grp-journal-remote/systemd-journal-upload/journal-upload.conf.in
+++ b/src/grp-journal/grp-remote/systemd-journal-upload/journal-upload.conf.in
diff --git a/src/grp-journal-remote/systemd-journal-upload/journal-upload.h b/src/grp-journal/grp-remote/systemd-journal-upload/journal-upload.h
index 0b0336c84b..0b0336c84b 100644
--- a/src/grp-journal-remote/systemd-journal-upload/journal-upload.h
+++ b/src/grp-journal/grp-remote/systemd-journal-upload/journal-upload.h
diff --git a/src/grp-journal/journalctl/Makefile b/src/grp-journal/journalctl/Makefile
index c3cdb6b27a..7fc5e64143 100644
--- a/src/grp-journal/journalctl/Makefile
+++ b/src/grp-journal/journalctl/Makefile
@@ -23,6 +23,9 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
+rootbin_PROGRAMS += \
+	journalctl
+
 # using _CFLAGS = in the conditional below would suppress AM_CFLAGS
 journalctl_CFLAGS = \
 	$(AM_CFLAGS)
@@ -46,4 +49,6 @@ journalctl_LDADD += \
 	$(QRENCODE_LIBS)
 endif # HAVE_QRENCODE
 
+systemd.CPPFLAGS += -DCATALOG_DATABASE=\"$(catalogstatedir)/database\"
+
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-journal/libjournal-core/journal-qrcode.c b/src/grp-journal/journalctl/journal-qrcode.c
index e38730d65c..e38730d65c 100644
--- a/src/grp-journal/libjournal-core/journal-qrcode.c
+++ b/src/grp-journal/journalctl/journal-qrcode.c
diff --git a/src/grp-journal/libjournal-core/journal-qrcode.h b/src/grp-journal/journalctl/journal-qrcode.h
index 34a779d5be..34a779d5be 100644
--- a/src/grp-journal/libjournal-core/journal-qrcode.h
+++ b/src/grp-journal/journalctl/journal-qrcode.h
diff --git a/src/grp-journal/journalctl/journalctl.c b/src/grp-journal/journalctl/journalctl.c
index c673fbf78a..85a934e978 100644
--- a/src/grp-journal/journalctl/journalctl.c
+++ b/src/grp-journal/journalctl/journalctl.c
@@ -36,29 +36,17 @@
 #include <systemd/sd-bus.h>
 #include <systemd/sd-journal.h>
 
-#include "shared/acl-util.h"
 #include "basic/alloc-util.h"
-#include "bus-error.h"
-#include "shared/bus-util.h"
-#include "catalog.h"
 #include "basic/chattr-util.h"
 #include "basic/fd-util.h"
 #include "basic/fileio.h"
 #include "basic/fs-util.h"
-#include "fsprg.h"
 #include "basic/glob-util.h"
 #include "basic/hostname-util.h"
 #include "basic/io-util.h"
-#include "journal-def.h"
-#include "journal-internal.h"
-#include "journal-qrcode.h"
-#include "journal-vacuum.h"
-#include "journal-verify.h"
 #include "basic/locale-util.h"
 #include "basic/log.h"
-#include "shared/logs-show.h"
 #include "basic/mkdir.h"
-#include "shared/pager.h"
 #include "basic/parse-util.h"
 #include "basic/path-util.h"
 #include "basic/rlimit-util.h"
@@ -67,10 +55,23 @@
 #include "basic/strv.h"
 #include "basic/syslog-util.h"
 #include "basic/terminal-util.h"
-#include "udev.h"
-#include "shared/udev-util.h"
 #include "basic/unit-name.h"
 #include "basic/user-util.h"
+#include "sd-bus/bus-error.h"
+#include "sd-journal/catalog.h"
+#include "sd-journal/fsprg.h"
+#include "sd-journal/journal-def.h"
+#include "sd-journal/journal-internal.h"
+#include "sd-journal/journal-vacuum.h"
+#include "sd-journal/journal-verify.h"
+#include "shared/acl-util.h"
+#include "shared/bus-util.h"
+#include "shared/logs-show.h"
+#include "shared/pager.h"
+#include "shared/udev-util.h"
+#include "udev.h"
+
+#include "journal-qrcode.h"
 
 #define DEFAULT_FSS_INTERVAL_USEC (15*USEC_PER_MINUTE)
 
diff --git a/src/grp-journal/libjournal-core/Makefile b/src/grp-journal/libjournal-core/Makefile
index d55aebfb49..bcbfd0f8cb 100644
--- a/src/grp-journal/libjournal-core/Makefile
+++ b/src/grp-journal/libjournal-core/Makefile
@@ -53,4 +53,6 @@ libjournal_core_la_LIBADD = \
 noinst_LTLIBRARIES += \
 	libjournal-core.la
 
+systemd.CPPFLAGS += -DPKGSYSCONFDIR=\"$(pkgsysconfdir)\"
+
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-journal/libjournal-core/journald-audit.c b/src/grp-journal/libjournal-core/journald-audit.c
index 7abd2f819e..d76a460257 100644
--- a/src/grp-journal/libjournal-core/journald-audit.c
+++ b/src/grp-journal/libjournal-core/journald-audit.c
@@ -18,7 +18,7 @@
 ***/
 
 #include "basic/alloc-util.h"
-#include "audit-type.h"
+#include "sd-journal/audit-type.h"
 #include "basic/fd-util.h"
 #include "basic/hexdecoct.h"
 #include "basic/io-util.h"
diff --git a/src/grp-journal/libjournal-core/journald-gperf.c b/src/grp-journal/libjournal-core/journald-gperf.c
new file mode 100644
index 0000000000..d8483a3303
--- /dev/null
+++ b/src/grp-journal/libjournal-core/journald-gperf.c
@@ -0,0 +1,173 @@
+/* ANSI-C code produced by gperf version 3.0.4 */
+/* Command-line: gperf  */
+/* Computed positions: -k'9,18' */
+
+#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
+      && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
+      && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \
+      && ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \
+      && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \
+      && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \
+      && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \
+      && ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \
+      && ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \
+      && ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \
+      && ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \
+      && ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \
+      && ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \
+      && ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \
+      && ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \
+      && ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \
+      && ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \
+      && ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \
+      && ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \
+      && ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \
+      && ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \
+      && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \
+      && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126))
+/* The character set is not based on ISO-646.  */
+#error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
+#endif
+
+
+#include <stddef.h>
+#include <sys/socket.h>
+#include "shared/conf-parser.h"
+#include "journald-server.h"
+#include <string.h>
+
+#define TOTAL_KEYWORDS 28
+#define MIN_WORD_LENGTH 12
+#define MAX_WORD_LENGTH 28
+#define MIN_HASH_VALUE 12
+#define MAX_HASH_VALUE 53
+/* maximum key range = 42, duplicates = 0 */
+
+#ifdef __GNUC__
+__inline
+#else
+#ifdef __cplusplus
+inline
+#endif
+#endif
+static unsigned int
+journald_gperf_hash (register const char *str, register unsigned int len)
+{
+  static const unsigned char asso_values[] =
+    {
+      54, 54, 54, 54, 54, 54, 54, 54, 54, 54,
+      54, 54, 54, 54, 54, 54, 54, 54, 54, 54,
+      54, 54, 54, 54, 54, 54, 54, 54, 54, 54,
+      54, 54, 54, 54, 54, 54, 54, 54, 54, 54,
+      54, 54, 54, 54, 54, 54, 54, 54, 54, 54,
+      54, 54, 54, 54, 54, 54, 54, 54, 54, 54,
+      54, 54, 54, 54, 54, 54, 10,  0, 54, 54,
+       0, 54, 54,  0, 54, 20, 54,  0, 54, 54,
+      54, 54,  5,  0, 30, 20, 54, 15, 54, 54,
+      54, 54, 54, 54, 54, 54, 54, 15, 54,  0,
+      54, 25, 54, 54, 54, 25, 54, 54, 54, 54,
+      54, 20, 10, 54, 54, 54,  0, 54, 15, 54,
+       0,  5, 54, 54, 54, 54, 54, 54, 54, 54,
+      54, 54, 54, 54, 54, 54, 54, 54, 54, 54,
+      54, 54, 54, 54, 54, 54, 54, 54, 54, 54,
+      54, 54, 54, 54, 54, 54, 54, 54, 54, 54,
+      54, 54, 54, 54, 54, 54, 54, 54, 54, 54,
+      54, 54, 54, 54, 54, 54, 54, 54, 54, 54,
+      54, 54, 54, 54, 54, 54, 54, 54, 54, 54,
+      54, 54, 54, 54, 54, 54, 54, 54, 54, 54,
+      54, 54, 54, 54, 54, 54, 54, 54, 54, 54,
+      54, 54, 54, 54, 54, 54, 54, 54, 54, 54,
+      54, 54, 54, 54, 54, 54, 54, 54, 54, 54,
+      54, 54, 54, 54, 54, 54, 54, 54, 54, 54,
+      54, 54, 54, 54, 54, 54, 54, 54, 54, 54,
+      54, 54, 54, 54, 54, 54
+    };
+  register int hval = len;
+
+  switch (hval)
+    {
+      default:
+        hval += asso_values[(unsigned char)str[17]];
+      /*FALLTHROUGH*/
+      case 17:
+      case 16:
+      case 15:
+      case 14:
+      case 13:
+      case 12:
+      case 11:
+      case 10:
+      case 9:
+        hval += asso_values[(unsigned char)str[8]];
+        break;
+    }
+  return hval;
+}
+
+#ifdef __GNUC__
+__inline
+#if defined __GNUC_STDC_INLINE__ || defined __GNUC_GNU_INLINE__
+__attribute__ ((__gnu_inline__))
+#endif
+#endif
+const struct ConfigPerfItem *
+journald_gperf_lookup (register const char *str, register unsigned int len)
+{
+  static const struct ConfigPerfItem wordlist[] =
+    {
+      {(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
+      {(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
+      {(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
+      {"Journal.Seal",               config_parse_bool,       0, offsetof(Server, seal)},
+      {(char*)0}, {(char*)0},
+      {"Journal.Storage",            config_parse_storage,    0, offsetof(Server, storage)},
+      {"Journal.Compress",           config_parse_bool,       0, offsetof(Server, compress)},
+      {"Journal.SplitMode",          config_parse_split_mode, 0, offsetof(Server, split_mode)},
+      {"Journal.MaxFileSec",         config_parse_sec,        0, offsetof(Server, max_file_usec)},
+      {(char*)0},
+      {"Journal.MaxLevelKMsg",       config_parse_log_level,  0, offsetof(Server, max_level_kmsg)},
+      {"Journal.MaxLevelStore",      config_parse_log_level,  0, offsetof(Server, max_level_store)},
+      {"Journal.SystemMaxFiles",     config_parse_uint64,     0, offsetof(Server, system_metrics.n_max_files)},
+      {"Journal.ForwardToSyslog",    config_parse_bool,       0, offsetof(Server, forward_to_syslog)},
+      {"Journal.ForwardToConsole",   config_parse_bool,       0, offsetof(Server, forward_to_console)},
+      {"Journal.SystemMaxFileSize",  config_parse_iec_uint64, 0, offsetof(Server, system_metrics.max_size)},
+      {"Journal.RuntimeMaxUse",      config_parse_iec_uint64, 0, offsetof(Server, runtime_metrics.max_use)},
+      {"Journal.MaxLevelSyslog",     config_parse_log_level,  0, offsetof(Server, max_level_syslog)},
+      {"Journal.RuntimeMaxFiles",    config_parse_uint64,     0, offsetof(Server, runtime_metrics.n_max_files)},
+      {(char*)0},
+      {"Journal.RateLimitInterval",  config_parse_sec,        0, offsetof(Server, rate_limit_interval)},
+      {"Journal.RuntimeMaxFileSize", config_parse_iec_uint64, 0, offsetof(Server, runtime_metrics.max_size)},
+      {"Journal.SystemKeepFree",     config_parse_iec_uint64, 0, offsetof(Server, system_metrics.keep_free)},
+      {"Journal.RateLimitIntervalSec",config_parse_sec,       0, offsetof(Server, rate_limit_interval)},
+      {(char*)0},
+      {"Journal.MaxLevelWall",       config_parse_log_level,  0, offsetof(Server, max_level_wall)},
+      {"Journal.ForwardToWall",      config_parse_bool,       0, offsetof(Server, forward_to_wall)},
+      {"Journal.RateLimitBurst",     config_parse_unsigned,   0, offsetof(Server, rate_limit_burst)},
+      {"Journal.SyncIntervalSec",    config_parse_sec,        0, offsetof(Server, sync_interval_usec)},
+      {(char*)0},
+      {"Journal.SystemMaxUse",       config_parse_iec_uint64, 0, offsetof(Server, system_metrics.max_use)},
+      {"Journal.ForwardToKMsg",      config_parse_bool,       0, offsetof(Server, forward_to_kmsg)},
+      {(char*)0},
+      {"Journal.MaxLevelConsole",    config_parse_log_level,  0, offsetof(Server, max_level_console)},
+      {(char*)0},
+      {"Journal.TTYPath",            config_parse_path,       0, offsetof(Server, tty_path)},
+      {(char*)0}, {(char*)0},
+      {"Journal.MaxRetentionSec",    config_parse_sec,        0, offsetof(Server, max_retention_usec)},
+      {(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
+      {"Journal.RuntimeKeepFree",    config_parse_iec_uint64, 0, offsetof(Server, runtime_metrics.keep_free)}
+    };
+
+  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
+    {
+      register int key = journald_gperf_hash (str, len);
+
+      if (key <= MAX_HASH_VALUE && key >= 0)
+        {
+          register const char *s = wordlist[key].section_and_lvalue;
+
+          if (s && *str == *s && !strcmp (str + 1, s + 1))
+            return &wordlist[key];
+        }
+    }
+  return 0;
+}
diff --git a/src/grp-journal/libjournal-core/journald-server.c b/src/grp-journal/libjournal-core/journald-server.c
index 24b873abeb..4dca4b02b3 100644
--- a/src/grp-journal/libjournal-core/journald-server.c
+++ b/src/grp-journal/libjournal-core/journald-server.c
@@ -26,16 +26,14 @@
 #include <sys/statvfs.h>
 #include <linux/sockios.h>
 
-#include "libudev.h"
+#include <libudev.h>
 #include <systemd/sd-daemon.h>
 #include <systemd/sd-journal.h>
 #include <systemd/sd-messages.h>
 
-#include "shared/acl-util.h"
 #include "basic/alloc-util.h"
 #include "basic/audit-util.h"
 #include "basic/cgroup-util.h"
-#include "shared/conf-parser.h"
 #include "basic/dirent-util.h"
 #include "basic/extract-word.h"
 #include "basic/fd-util.h"
@@ -45,17 +43,7 @@
 #include "basic/hashmap.h"
 #include "basic/hostname-util.h"
 #include "basic/io-util.h"
-#include "journal-authenticate.h"
-#include "journal-file.h"
-#include "journal-internal.h"
-#include "journal-vacuum.h"
-#include "journald-audit.h"
-#include "journald-kmsg.h"
-#include "journald-native.h"
-#include "journald-rate-limit.h"
-#include "journald-server.h"
-#include "journald-stream.h"
-#include "journald-syslog.h"
+#include "basic/log.h"
 #include "basic/missing.h"
 #include "basic/mkdir.h"
 #include "basic/parse-util.h"
@@ -69,7 +57,20 @@
 #include "basic/string-table.h"
 #include "basic/string-util.h"
 #include "basic/user-util.h"
-#include "basic/log.h"
+#include "sd-journal/journal-authenticate.h"
+#include "sd-journal/journal-file.h"
+#include "sd-journal/journal-internal.h"
+#include "sd-journal/journal-vacuum.h"
+#include "shared/acl-util.h"
+#include "shared/conf-parser.h"
+
+#include "journald-audit.h"
+#include "journald-kmsg.h"
+#include "journald-native.h"
+#include "journald-rate-limit.h"
+#include "journald-server.h"
+#include "journald-stream.h"
+#include "journald-syslog.h"
 
 #define USER_JOURNALS_MAX 1024
 
diff --git a/src/grp-journal/systemd-cat/Makefile b/src/grp-journal/systemd-cat/Makefile
new file mode 100644
index 0000000000..a6d7eee6ea
--- /dev/null
+++ b/src/grp-journal/systemd-cat/Makefile
@@ -0,0 +1,36 @@
+#  -*- Mode: makefile; indent-tabs-mode: t -*-
+#
+#  This file is part of systemd.
+#
+#  Copyright 2010-2012 Lennart Poettering
+#  Copyright 2010-2012 Kay Sievers
+#  Copyright 2013 Zbigniew Jędrzejewski-Szmek
+#  Copyright 2013 David Strauss
+#  Copyright 2016 Luke Shumaker
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
+#
+#  systemd is distributed in the hope that it will be useful, but
+#  WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+#  Lesser General Public License for more details.
+#
+#  You should have received a copy of the GNU Lesser General Public License
+#  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk
+include $(topsrcdir)/build-aux/Makefile.head.mk
+
+systemd_cat_SOURCES = \
+	src/journal/cat.c
+
+systemd_cat_LDADD = \
+	libjournal-core.la
+
+
+bin_PROGRAMS += \
+	systemd-cat
+
+include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-journal/libjournal-core/cat.c b/src/grp-journal/systemd-cat/cat.c
index 8ab4febd53..8ab4febd53 100644
--- a/src/grp-journal/libjournal-core/cat.c
+++ b/src/grp-journal/systemd-cat/cat.c
diff --git a/src/grp-journal/systemd-journald/Makefile b/src/grp-journal/systemd-journald/Makefile
index 755e2d2c36..640528bae4 100644
--- a/src/grp-journal/systemd-journald/Makefile
+++ b/src/grp-journal/systemd-journald/Makefile
@@ -31,22 +31,9 @@ systemd_journald_LDADD = \
 	libjournal-core.la \
 	libshared.la
 
-systemd_cat_SOURCES = \
-	src/journal/cat.c
-
-systemd_cat_LDADD = \
-	libjournal-core.la
-
-
 rootlibexec_PROGRAMS += \
 	systemd-journald
 
-rootbin_PROGRAMS += \
-	journalctl
-
-bin_PROGRAMS += \
-	systemd-cat
-
 dist_systemunit_DATA += \
 	units/systemd-journald.socket \
 	units/systemd-journald-dev-log.socket \
diff --git a/src/grp-journal/systemd-journald/journald.c b/src/grp-journal/systemd-journald/journald.c
index 9b4a5d3735..cfeb9ea48e 100644
--- a/src/grp-journal/systemd-journald/journald.c
+++ b/src/grp-journal/systemd-journald/journald.c
@@ -23,11 +23,12 @@
 #include <systemd/sd-messages.h>
 
 #include "basic/formats-util.h"
-#include "journal-authenticate.h"
+#include "basic/sigbus.h"
+#include "sd-journal/journal-authenticate.h"
+
 #include "journald-kmsg.h"
 #include "journald-server.h"
 #include "journald-syslog.h"
-#include "basic/sigbus.h"
 
 int main(int argc, char *argv[]) {
         Server server;
diff --git a/src/grp-locale/Makefile b/src/grp-locale/Makefile
index b34c066ec2..e6ab4a7f48 100644
--- a/src/grp-locale/Makefile
+++ b/src/grp-locale/Makefile
@@ -87,4 +87,7 @@ polkitpolicy_in_files += \
 EXTRA_DIST += \
 	units/systemd-localed.service.in
 
+systemd.CPPFLAGS += -DSYSTEMD_KBD_MODEL_MAP=\"$(pkgdatadir)/kbd-model-map\"
+systemd.CPPFLAGS += -DSYSTEMD_LANGUAGE_FALLBACK_MAP=\"$(pkgdatadir)/language-fallback-map\"
+
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-locale/localectl.c b/src/grp-locale/localectl.c
index a159f8ed2e..72ac1c0303 100644
--- a/src/grp-locale/localectl.c
+++ b/src/grp-locale/localectl.c
@@ -27,18 +27,18 @@
 
 #include <systemd/sd-bus.h>
 
-#include "bus-error.h"
-#include "shared/bus-util.h"
 #include "basic/def.h"
 #include "basic/fd-util.h"
 #include "basic/fileio.h"
 #include "basic/locale-util.h"
-#include "shared/pager.h"
 #include "basic/set.h"
-#include "shared/spawn-polkit-agent.h"
 #include "basic/strv.h"
 #include "basic/util.h"
 #include "basic/virt.h"
+#include "sd-bus/bus-error.h"
+#include "shared/bus-util.h"
+#include "shared/pager.h"
+#include "shared/spawn-polkit-agent.h"
 
 static bool arg_no_pager = false;
 static bool arg_ask_password = true;
diff --git a/src/grp-locale/localed.c b/src/grp-locale/localed.c
index 513413e2b5..7bb7f1cf34 100644
--- a/src/grp-locale/localed.c
+++ b/src/grp-locale/localed.c
@@ -30,9 +30,6 @@
 #include <systemd/sd-bus.h>
 
 #include "basic/alloc-util.h"
-#include "bus-error.h"
-#include "bus-message.h"
-#include "shared/bus-util.h"
 #include "basic/def.h"
 #include "basic/env-util.h"
 #include "basic/fd-util.h"
@@ -45,6 +42,9 @@
 #include "basic/strv.h"
 #include "basic/user-util.h"
 #include "basic/util.h"
+#include "sd-bus/bus-error.h"
+#include "sd-bus/bus-message.h"
+#include "shared/bus-util.h"
 
 enum {
         /* We don't list LC_ALL here on purpose. People should be
diff --git a/src/grp-machine/Makefile b/src/grp-machine/Makefile
index 59142f78bd..15bd8360d0 100644
--- a/src/grp-machine/Makefile
+++ b/src/grp-machine/Makefile
@@ -26,5 +26,6 @@ include $(topsrcdir)/build-aux/Makefile.head.mk
 at.subdirs += machinectl systemd-machined
 at.subdirs += libmachine-core
 at.subdirs += nss-mymachines
+at.subdirs += grp-import
 
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-import/.gitignore b/src/grp-machine/grp-import/.gitignore
index 01106e2e68..01106e2e68 100644
--- a/src/grp-import/.gitignore
+++ b/src/grp-machine/grp-import/.gitignore
diff --git a/src/grp-import/Makefile b/src/grp-machine/grp-import/Makefile
index 46be93c42f..46be93c42f 100644
--- a/src/grp-import/Makefile
+++ b/src/grp-machine/grp-import/Makefile
diff --git a/src/grp-import/curl-util.c b/src/grp-machine/grp-import/curl-util.c
index d6570a3656..d6570a3656 100644
--- a/src/grp-import/curl-util.c
+++ b/src/grp-machine/grp-import/curl-util.c
diff --git a/src/grp-import/curl-util.h b/src/grp-machine/grp-import/curl-util.h
index 296b35d09c..296b35d09c 100644
--- a/src/grp-import/curl-util.h
+++ b/src/grp-machine/grp-import/curl-util.h
diff --git a/src/grp-import/org.freedesktop.import1.conf b/src/grp-machine/grp-import/org.freedesktop.import1.conf
index ed2539a03b..ed2539a03b 100644
--- a/src/grp-import/org.freedesktop.import1.conf
+++ b/src/grp-machine/grp-import/org.freedesktop.import1.conf
diff --git a/src/grp-import/org.freedesktop.import1.policy.in b/src/grp-machine/grp-import/org.freedesktop.import1.policy.in
index 85924ed743..85924ed743 100644
--- a/src/grp-import/org.freedesktop.import1.policy.in
+++ b/src/grp-machine/grp-import/org.freedesktop.import1.policy.in
diff --git a/src/grp-import/org.freedesktop.import1.service b/src/grp-machine/grp-import/org.freedesktop.import1.service
index 8fc4c47881..8fc4c47881 100644
--- a/src/grp-import/org.freedesktop.import1.service
+++ b/src/grp-machine/grp-import/org.freedesktop.import1.service
diff --git a/src/grp-import/qcow2-util.c b/src/grp-machine/grp-import/qcow2-util.c
index fa272088d3..fa272088d3 100644
--- a/src/grp-import/qcow2-util.c
+++ b/src/grp-machine/grp-import/qcow2-util.c
diff --git a/src/grp-import/qcow2-util.h b/src/grp-machine/grp-import/qcow2-util.h
index 6dddac8cdf..6dddac8cdf 100644
--- a/src/grp-import/qcow2-util.h
+++ b/src/grp-machine/grp-import/qcow2-util.h
diff --git a/src/grp-import/systemd-export/Makefile b/src/grp-machine/grp-import/systemd-export/Makefile
index d0e8781faf..d0e8781faf 100644
--- a/src/grp-import/systemd-export/Makefile
+++ b/src/grp-machine/grp-import/systemd-export/Makefile
diff --git a/src/grp-import/systemd-export/export-raw.c b/src/grp-machine/grp-import/systemd-export/export-raw.c
index 1e3f6e034e..1e3f6e034e 100644
--- a/src/grp-import/systemd-export/export-raw.c
+++ b/src/grp-machine/grp-import/systemd-export/export-raw.c
diff --git a/src/grp-import/systemd-export/export-raw.h b/src/grp-machine/grp-import/systemd-export/export-raw.h
index 13d7809b9d..13d7809b9d 100644
--- a/src/grp-import/systemd-export/export-raw.h
+++ b/src/grp-machine/grp-import/systemd-export/export-raw.h
diff --git a/src/grp-import/systemd-export/export-tar.c b/src/grp-machine/grp-import/systemd-export/export-tar.c
index 9a8d48dc2e..9a8d48dc2e 100644
--- a/src/grp-import/systemd-export/export-tar.c
+++ b/src/grp-machine/grp-import/systemd-export/export-tar.c
diff --git a/src/grp-import/systemd-export/export-tar.h b/src/grp-machine/grp-import/systemd-export/export-tar.h
index 0a59033d5b..0a59033d5b 100644
--- a/src/grp-import/systemd-export/export-tar.h
+++ b/src/grp-machine/grp-import/systemd-export/export-tar.h
diff --git a/src/grp-import/systemd-export/export.c b/src/grp-machine/grp-import/systemd-export/export.c
index a64b79bba0..a64b79bba0 100644
--- a/src/grp-import/systemd-export/export.c
+++ b/src/grp-machine/grp-import/systemd-export/export.c
diff --git a/src/grp-import/systemd-import/Makefile b/src/grp-machine/grp-import/systemd-import/Makefile
index 301556ffd5..301556ffd5 100644
--- a/src/grp-import/systemd-import/Makefile
+++ b/src/grp-machine/grp-import/systemd-import/Makefile
diff --git a/src/grp-import/systemd-import/import-common.c b/src/grp-machine/grp-import/systemd-import/import-common.c
index c2baef83f8..c2baef83f8 100644
--- a/src/grp-import/systemd-import/import-common.c
+++ b/src/grp-machine/grp-import/systemd-import/import-common.c
diff --git a/src/grp-import/systemd-import/import-common.h b/src/grp-machine/grp-import/systemd-import/import-common.h
index 07d3250e71..07d3250e71 100644
--- a/src/grp-import/systemd-import/import-common.h
+++ b/src/grp-machine/grp-import/systemd-import/import-common.h
diff --git a/src/grp-import/systemd-import/import-compress.c b/src/grp-machine/grp-import/systemd-import/import-compress.c
index 05643cfbaf..05643cfbaf 100644
--- a/src/grp-import/systemd-import/import-compress.c
+++ b/src/grp-machine/grp-import/systemd-import/import-compress.c
diff --git a/src/grp-import/systemd-import/import-compress.h b/src/grp-machine/grp-import/systemd-import/import-compress.h
index 130afb4cd0..130afb4cd0 100644
--- a/src/grp-import/systemd-import/import-compress.h
+++ b/src/grp-machine/grp-import/systemd-import/import-compress.h
diff --git a/src/grp-import/systemd-import/import-pubring.gpg b/src/grp-machine/grp-import/systemd-import/import-pubring.gpg
index be27776896..be27776896 100644
--- a/src/grp-import/systemd-import/import-pubring.gpg
+++ b/src/grp-machine/grp-import/systemd-import/import-pubring.gpg
diff --git a/src/grp-import/systemd-import/import-raw.c b/src/grp-machine/grp-import/systemd-import/import-raw.c
index 0bbae2aa8a..0bbae2aa8a 100644
--- a/src/grp-import/systemd-import/import-raw.c
+++ b/src/grp-machine/grp-import/systemd-import/import-raw.c
diff --git a/src/grp-import/systemd-import/import-raw.h b/src/grp-machine/grp-import/systemd-import/import-raw.h
index a3bc532d37..a3bc532d37 100644
--- a/src/grp-import/systemd-import/import-raw.h
+++ b/src/grp-machine/grp-import/systemd-import/import-raw.h
diff --git a/src/grp-import/systemd-import/import-tar.c b/src/grp-machine/grp-import/systemd-import/import-tar.c
index 8848beb11b..8848beb11b 100644
--- a/src/grp-import/systemd-import/import-tar.c
+++ b/src/grp-machine/grp-import/systemd-import/import-tar.c
diff --git a/src/grp-import/systemd-import/import-tar.h b/src/grp-machine/grp-import/systemd-import/import-tar.h
index 90ab082f1a..90ab082f1a 100644
--- a/src/grp-import/systemd-import/import-tar.h
+++ b/src/grp-machine/grp-import/systemd-import/import-tar.h
diff --git a/src/grp-import/systemd-import/import.c b/src/grp-machine/grp-import/systemd-import/import.c
index 6c76c639c3..6c76c639c3 100644
--- a/src/grp-import/systemd-import/import.c
+++ b/src/grp-machine/grp-import/systemd-import/import.c
diff --git a/src/grp-import/systemd-importd/Makefile b/src/grp-machine/grp-import/systemd-importd/Makefile
index 7911bfce82..7911bfce82 100644
--- a/src/grp-import/systemd-importd/Makefile
+++ b/src/grp-machine/grp-import/systemd-importd/Makefile
diff --git a/src/grp-import/systemd-importd/importd.c b/src/grp-machine/grp-import/systemd-importd/importd.c
index f9fe1038cd..f9fe1038cd 100644
--- a/src/grp-import/systemd-importd/importd.c
+++ b/src/grp-machine/grp-import/systemd-importd/importd.c
diff --git a/src/grp-import/systemd-pull/Makefile b/src/grp-machine/grp-import/systemd-pull/Makefile
index 36505edb5b..36505edb5b 100644
--- a/src/grp-import/systemd-pull/Makefile
+++ b/src/grp-machine/grp-import/systemd-pull/Makefile
diff --git a/src/grp-import/systemd-pull/pull-common.c b/src/grp-machine/grp-import/systemd-pull/pull-common.c
index fb167fd93c..fb167fd93c 100644
--- a/src/grp-import/systemd-pull/pull-common.c
+++ b/src/grp-machine/grp-import/systemd-pull/pull-common.c
diff --git a/src/grp-import/systemd-pull/pull-common.h b/src/grp-machine/grp-import/systemd-pull/pull-common.h
index d9cfb6b3c1..d9cfb6b3c1 100644
--- a/src/grp-import/systemd-pull/pull-common.h
+++ b/src/grp-machine/grp-import/systemd-pull/pull-common.h
diff --git a/src/grp-import/systemd-pull/pull-job.c b/src/grp-machine/grp-import/systemd-pull/pull-job.c
index fce08f65d9..fce08f65d9 100644
--- a/src/grp-import/systemd-pull/pull-job.c
+++ b/src/grp-machine/grp-import/systemd-pull/pull-job.c
diff --git a/src/grp-import/systemd-pull/pull-job.h b/src/grp-machine/grp-import/systemd-pull/pull-job.h
index 80d7370ff1..80d7370ff1 100644
--- a/src/grp-import/systemd-pull/pull-job.h
+++ b/src/grp-machine/grp-import/systemd-pull/pull-job.h
diff --git a/src/grp-import/systemd-pull/pull-raw.c b/src/grp-machine/grp-import/systemd-pull/pull-raw.c
index a9777a5838..a9777a5838 100644
--- a/src/grp-import/systemd-pull/pull-raw.c
+++ b/src/grp-machine/grp-import/systemd-pull/pull-raw.c
diff --git a/src/grp-import/systemd-pull/pull-raw.h b/src/grp-machine/grp-import/systemd-pull/pull-raw.h
index 84cd146647..84cd146647 100644
--- a/src/grp-import/systemd-pull/pull-raw.h
+++ b/src/grp-machine/grp-import/systemd-pull/pull-raw.h
diff --git a/src/grp-import/systemd-pull/pull-tar.c b/src/grp-machine/grp-import/systemd-pull/pull-tar.c
index 576bda5a3d..576bda5a3d 100644
--- a/src/grp-import/systemd-pull/pull-tar.c
+++ b/src/grp-machine/grp-import/systemd-pull/pull-tar.c
diff --git a/src/grp-import/systemd-pull/pull-tar.h b/src/grp-machine/grp-import/systemd-pull/pull-tar.h
index addd1f861c..addd1f861c 100644
--- a/src/grp-import/systemd-pull/pull-tar.h
+++ b/src/grp-machine/grp-import/systemd-pull/pull-tar.h
diff --git a/src/grp-import/systemd-pull/pull.c b/src/grp-machine/grp-import/systemd-pull/pull.c
index fa2af2fc02..fa2af2fc02 100644
--- a/src/grp-import/systemd-pull/pull.c
+++ b/src/grp-machine/grp-import/systemd-pull/pull.c
diff --git a/src/grp-import/test-qcow2.c b/src/grp-machine/grp-import/test-qcow2.c
index 0a256d7f41..0a256d7f41 100644
--- a/src/grp-import/test-qcow2.c
+++ b/src/grp-machine/grp-import/test-qcow2.c
diff --git a/src/grp-system/Makefile b/src/grp-system/Makefile
index ea8b031596..3ef4fd8c0e 100644
--- a/src/grp-system/Makefile
+++ b/src/grp-system/Makefile
@@ -23,6 +23,7 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
-at.subdirs += systemctl systemd
+at.subdirs += systemctl systemd libcore
+at.subdirs += grp-utils
 
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-system/grp-utils/Makefile b/src/grp-system/grp-utils/Makefile
new file mode 100644
index 0000000000..9573b5750c
--- /dev/null
+++ b/src/grp-system/grp-utils/Makefile
@@ -0,0 +1,32 @@
+#  -*- Mode: makefile; indent-tabs-mode: t -*-
+#
+#  This file is part of systemd.
+#
+#  Copyright 2010-2012 Lennart Poettering
+#  Copyright 2010-2012 Kay Sievers
+#  Copyright 2013 Zbigniew Jędrzejewski-Szmek
+#  Copyright 2013 David Strauss
+#  Copyright 2016 Luke Shumaker
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
+#
+#  systemd is distributed in the hope that it will be useful, but
+#  WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+#  Lesser General Public License for more details.
+#
+#  You should have received a copy of the GNU Lesser General Public License
+#  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk
+include $(topsrcdir)/build-aux/Makefile.head.mk
+
+at.subdirs += systemd-analyze
+at.subdirs += systemd-delta
+at.subdirs += systemd-fstab-generator
+at.subdirs += systemd-run
+at.subdirs += systemd-sysv-generator
+
+include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/systemd-analyze/.gitignore b/src/grp-system/grp-utils/systemd-analyze/.gitignore
index 752ea236c8..752ea236c8 100644
--- a/src/systemd-analyze/.gitignore
+++ b/src/grp-system/grp-utils/systemd-analyze/.gitignore
diff --git a/src/systemd-analyze/Makefile b/src/grp-system/grp-utils/systemd-analyze/Makefile
index 2e4e7c0bb1..9d647e5a52 100644
--- a/src/systemd-analyze/Makefile
+++ b/src/grp-system/grp-utils/systemd-analyze/Makefile
@@ -20,7 +20,7 @@
 #
 #  You should have received a copy of the GNU Lesser General Public License
 #  along with systemd; If not, see <http://www.gnu.org/licenses/>.
-include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
+include $(dir $(lastword $(MAKEFILE_LIST)))/../../../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
 bin_PROGRAMS += systemd-analyze
diff --git a/src/systemd-analyze/analyze-verify.c b/src/grp-system/grp-utils/systemd-analyze/analyze-verify.c
index 7553574f53..7553574f53 100644
--- a/src/systemd-analyze/analyze-verify.c
+++ b/src/grp-system/grp-utils/systemd-analyze/analyze-verify.c
diff --git a/src/systemd-analyze/analyze-verify.h b/src/grp-system/grp-utils/systemd-analyze/analyze-verify.h
index 7b89007fd0..7b89007fd0 100644
--- a/src/systemd-analyze/analyze-verify.h
+++ b/src/grp-system/grp-utils/systemd-analyze/analyze-verify.h
diff --git a/src/systemd-analyze/analyze.c b/src/grp-system/grp-utils/systemd-analyze/analyze.c
index 1ce700ccba..1ce700ccba 100644
--- a/src/systemd-analyze/analyze.c
+++ b/src/grp-system/grp-utils/systemd-analyze/analyze.c
diff --git a/src/systemd-delta/Makefile b/src/grp-system/grp-utils/systemd-delta/Makefile
index 62c18cd8d4..4f5610d27a 100644
--- a/src/systemd-delta/Makefile
+++ b/src/grp-system/grp-utils/systemd-delta/Makefile
@@ -20,7 +20,7 @@
 #
 #  You should have received a copy of the GNU Lesser General Public License
 #  along with systemd; If not, see <http://www.gnu.org/licenses/>.
-include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
+include $(dir $(lastword $(MAKEFILE_LIST)))/../../../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
 bin_PROGRAMS += systemd-delta
diff --git a/src/systemd-delta/delta.c b/src/grp-system/grp-utils/systemd-delta/delta.c
index dd571e7195..dd571e7195 100644
--- a/src/systemd-delta/delta.c
+++ b/src/grp-system/grp-utils/systemd-delta/delta.c
diff --git a/src/systemd-fstab-generator/Makefile b/src/grp-system/grp-utils/systemd-fstab-generator/Makefile
index 0bfc70e464..4f19808477 100644
--- a/src/systemd-fstab-generator/Makefile
+++ b/src/grp-system/grp-utils/systemd-fstab-generator/Makefile
@@ -20,7 +20,7 @@
 #
 #  You should have received a copy of the GNU Lesser General Public License
 #  along with systemd; If not, see <http://www.gnu.org/licenses/>.
-include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
+include $(dir $(lastword $(MAKEFILE_LIST)))/../../../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
 systemgenerator_PROGRAMS += systemd-fstab-generator
diff --git a/src/systemd-fstab-generator/fstab-generator.c b/src/grp-system/grp-utils/systemd-fstab-generator/fstab-generator.c
index bedf469f93..bedf469f93 100644
--- a/src/systemd-fstab-generator/fstab-generator.c
+++ b/src/grp-system/grp-utils/systemd-fstab-generator/fstab-generator.c
diff --git a/src/grp-system/grp-utils/systemd-fstab-generator/mount-setup.c b/src/grp-system/grp-utils/systemd-fstab-generator/mount-setup.c
new file mode 120000
index 0000000000..7f7ff15b46
--- /dev/null
+++ b/src/grp-system/grp-utils/systemd-fstab-generator/mount-setup.c
@@ -0,0 +1 @@
+../../libcore/mount-setup.c
+\ No newline at end of file
diff --git a/src/grp-system/grp-utils/systemd-fstab-generator/mount-setup.h b/src/grp-system/grp-utils/systemd-fstab-generator/mount-setup.h
new file mode 120000
index 0000000000..50721d8bfc
--- /dev/null
+++ b/src/grp-system/grp-utils/systemd-fstab-generator/mount-setup.h
@@ -0,0 +1 @@
+../../libcore/mount-setup.h
+\ No newline at end of file
diff --git a/src/systemd-run/Makefile b/src/grp-system/grp-utils/systemd-run/Makefile
index a8edcf66c1..17d21167bc 100644
--- a/src/systemd-run/Makefile
+++ b/src/grp-system/grp-utils/systemd-run/Makefile
@@ -20,7 +20,7 @@
 #
 #  You should have received a copy of the GNU Lesser General Public License
 #  along with systemd; If not, see <http://www.gnu.org/licenses/>.
-include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
+include $(dir $(lastword $(MAKEFILE_LIST)))/../../../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
 bin_PROGRAMS += systemd-run
diff --git a/src/systemd-run/run.c b/src/grp-system/grp-utils/systemd-run/run.c
index 9ff2ba8003..9ff2ba8003 100644
--- a/src/systemd-run/run.c
+++ b/src/grp-system/grp-utils/systemd-run/run.c
diff --git a/src/systemd-sysv-generator/Makefile b/src/grp-system/grp-utils/systemd-sysv-generator/Makefile
index f6de146408..10dd75abc6 100644
--- a/src/systemd-sysv-generator/Makefile
+++ b/src/grp-system/grp-utils/systemd-sysv-generator/Makefile
@@ -20,7 +20,7 @@
 #
 #  You should have received a copy of the GNU Lesser General Public License
 #  along with systemd; If not, see <http://www.gnu.org/licenses/>.
-include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
+include $(dir $(lastword $(MAKEFILE_LIST)))/../../../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
 systemd_sysv_generator_SOURCES = \
diff --git a/src/systemd-sysv-generator/sysv-generator.c b/src/grp-system/grp-utils/systemd-sysv-generator/sysv-generator.c
index 183f93e9e7..183f93e9e7 100644
--- a/src/systemd-sysv-generator/sysv-generator.c
+++ b/src/grp-system/grp-utils/systemd-sysv-generator/sysv-generator.c
diff --git a/src/libcore/.gitignore b/src/grp-system/libcore/.gitignore
index 465b4fcc20..465b4fcc20 100644
--- a/src/libcore/.gitignore
+++ b/src/grp-system/libcore/.gitignore
diff --git a/src/libcore/Makefile b/src/grp-system/libcore/Makefile
index 23032ea6f7..a93e1e5be0 100644
--- a/src/libcore/Makefile
+++ b/src/grp-system/libcore/Makefile
@@ -20,7 +20,7 @@
 #
 #  You should have received a copy of the GNU Lesser General Public License
 #  along with systemd; If not, see <http://www.gnu.org/licenses/>.
-include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
+include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
 noinst_LTLIBRARIES += \
diff --git a/src/libcore/audit-fd.c b/src/grp-system/libcore/audit-fd.c
index 8ea525eda3..8ea525eda3 100644
--- a/src/libcore/audit-fd.c
+++ b/src/grp-system/libcore/audit-fd.c
diff --git a/src/libcore/audit-fd.h b/src/grp-system/libcore/audit-fd.h
index 0eccb59210..0eccb59210 100644
--- a/src/libcore/audit-fd.h
+++ b/src/grp-system/libcore/audit-fd.h
diff --git a/src/libcore/automount.c b/src/grp-system/libcore/automount.c
index 145ed5ab5d..145ed5ab5d 100644
--- a/src/libcore/automount.c
+++ b/src/grp-system/libcore/automount.c
diff --git a/src/libcore/automount.h b/src/grp-system/libcore/automount.h
index 76a201178e..76a201178e 100644
--- a/src/libcore/automount.h
+++ b/src/grp-system/libcore/automount.h
diff --git a/src/libcore/bus-policy.c b/src/grp-system/libcore/bus-policy.c
index cc228bc42f..cc228bc42f 100644
--- a/src/libcore/bus-policy.c
+++ b/src/grp-system/libcore/bus-policy.c
diff --git a/src/libcore/bus-policy.h b/src/grp-system/libcore/bus-policy.h
index a6d19c1e9a..a6d19c1e9a 100644
--- a/src/libcore/bus-policy.h
+++ b/src/grp-system/libcore/bus-policy.h
diff --git a/src/libcore/busname.c b/src/grp-system/libcore/busname.c
index 765fd7a442..765fd7a442 100644
--- a/src/libcore/busname.c
+++ b/src/grp-system/libcore/busname.c
diff --git a/src/libcore/busname.h b/src/grp-system/libcore/busname.h
index a8562db458..a8562db458 100644
--- a/src/libcore/busname.h
+++ b/src/grp-system/libcore/busname.h
diff --git a/src/libcore/cgroup.c b/src/grp-system/libcore/cgroup.c
index 43d494cee7..43d494cee7 100644
--- a/src/libcore/cgroup.c
+++ b/src/grp-system/libcore/cgroup.c
diff --git a/src/libcore/cgroup.h b/src/grp-system/libcore/cgroup.h
index 69ff9832bf..69ff9832bf 100644
--- a/src/libcore/cgroup.h
+++ b/src/grp-system/libcore/cgroup.h
diff --git a/src/libcore/dbus-automount.c b/src/grp-system/libcore/dbus-automount.c
index bc44dc1c0a..bc44dc1c0a 100644
--- a/src/libcore/dbus-automount.c
+++ b/src/grp-system/libcore/dbus-automount.c
diff --git a/src/libcore/dbus-automount.h b/src/grp-system/libcore/dbus-automount.h
index 7b51eb973a..7b51eb973a 100644
--- a/src/libcore/dbus-automount.h
+++ b/src/grp-system/libcore/dbus-automount.h
diff --git a/src/libcore/dbus-busname.c b/src/grp-system/libcore/dbus-busname.c
index 80e7484f46..80e7484f46 100644
--- a/src/libcore/dbus-busname.c
+++ b/src/grp-system/libcore/dbus-busname.c
diff --git a/src/libcore/dbus-busname.h b/src/grp-system/libcore/dbus-busname.h
index 8643d1a404..8643d1a404 100644
--- a/src/libcore/dbus-busname.h
+++ b/src/grp-system/libcore/dbus-busname.h
diff --git a/src/libcore/dbus-cgroup.c b/src/grp-system/libcore/dbus-cgroup.c
index 86f7c626c4..86f7c626c4 100644
--- a/src/libcore/dbus-cgroup.c
+++ b/src/grp-system/libcore/dbus-cgroup.c
diff --git a/src/libcore/dbus-cgroup.h b/src/grp-system/libcore/dbus-cgroup.h
index 84d0f1ba04..84d0f1ba04 100644
--- a/src/libcore/dbus-cgroup.h
+++ b/src/grp-system/libcore/dbus-cgroup.h
diff --git a/src/libcore/dbus-device.c b/src/grp-system/libcore/dbus-device.c
index e1a12224d3..e1a12224d3 100644
--- a/src/libcore/dbus-device.c
+++ b/src/grp-system/libcore/dbus-device.c
diff --git a/src/libcore/dbus-device.h b/src/grp-system/libcore/dbus-device.h
index eb1d8c3278..eb1d8c3278 100644
--- a/src/libcore/dbus-device.h
+++ b/src/grp-system/libcore/dbus-device.h
diff --git a/src/libcore/dbus-execute.c b/src/grp-system/libcore/dbus-execute.c
index b5530d945e..b5530d945e 100644
--- a/src/libcore/dbus-execute.c
+++ b/src/grp-system/libcore/dbus-execute.c
diff --git a/src/libcore/dbus-execute.h b/src/grp-system/libcore/dbus-execute.h
index bdfef41db4..bdfef41db4 100644
--- a/src/libcore/dbus-execute.h
+++ b/src/grp-system/libcore/dbus-execute.h
diff --git a/src/libcore/dbus-job.c b/src/grp-system/libcore/dbus-job.c
index dde6aa28ef..dde6aa28ef 100644
--- a/src/libcore/dbus-job.c
+++ b/src/grp-system/libcore/dbus-job.c
diff --git a/src/libcore/dbus-job.h b/src/grp-system/libcore/dbus-job.h
index 95664cb90c..95664cb90c 100644
--- a/src/libcore/dbus-job.h
+++ b/src/grp-system/libcore/dbus-job.h
diff --git a/src/libcore/dbus-kill.c b/src/grp-system/libcore/dbus-kill.c
index cd76682298..cd76682298 100644
--- a/src/libcore/dbus-kill.c
+++ b/src/grp-system/libcore/dbus-kill.c
diff --git a/src/libcore/dbus-kill.h b/src/grp-system/libcore/dbus-kill.h
index b32ce9d223..b32ce9d223 100644
--- a/src/libcore/dbus-kill.h
+++ b/src/grp-system/libcore/dbus-kill.h
diff --git a/src/libcore/dbus-manager.c b/src/grp-system/libcore/dbus-manager.c
index 59f8a7908a..59f8a7908a 100644
--- a/src/libcore/dbus-manager.c
+++ b/src/grp-system/libcore/dbus-manager.c
diff --git a/src/libcore/dbus-manager.h b/src/grp-system/libcore/dbus-manager.h
index 36a2e9481b..36a2e9481b 100644
--- a/src/libcore/dbus-manager.h
+++ b/src/grp-system/libcore/dbus-manager.h
diff --git a/src/libcore/dbus-mount.c b/src/grp-system/libcore/dbus-mount.c
index e6e824b6b9..e6e824b6b9 100644
--- a/src/libcore/dbus-mount.c
+++ b/src/grp-system/libcore/dbus-mount.c
diff --git a/src/libcore/dbus-mount.h b/src/grp-system/libcore/dbus-mount.h
index f9844e449d..f9844e449d 100644
--- a/src/libcore/dbus-mount.h
+++ b/src/grp-system/libcore/dbus-mount.h
diff --git a/src/libcore/dbus-path.c b/src/grp-system/libcore/dbus-path.c
index 2f2a65d4c1..2f2a65d4c1 100644
--- a/src/libcore/dbus-path.c
+++ b/src/grp-system/libcore/dbus-path.c
diff --git a/src/libcore/dbus-path.h b/src/grp-system/libcore/dbus-path.h
index d3c19e0c2b..d3c19e0c2b 100644
--- a/src/libcore/dbus-path.h
+++ b/src/grp-system/libcore/dbus-path.h
diff --git a/src/libcore/dbus-scope.c b/src/grp-system/libcore/dbus-scope.c
index 3a9c3b98ec..3a9c3b98ec 100644
--- a/src/libcore/dbus-scope.c
+++ b/src/grp-system/libcore/dbus-scope.c
diff --git a/src/libcore/dbus-scope.h b/src/grp-system/libcore/dbus-scope.h
index f96ddef0cf..f96ddef0cf 100644
--- a/src/libcore/dbus-scope.h
+++ b/src/grp-system/libcore/dbus-scope.h
diff --git a/src/libcore/dbus-service.c b/src/grp-system/libcore/dbus-service.c
index 463d9da4e1..463d9da4e1 100644
--- a/src/libcore/dbus-service.c
+++ b/src/grp-system/libcore/dbus-service.c
diff --git a/src/libcore/dbus-service.h b/src/grp-system/libcore/dbus-service.h
index 291959325c..291959325c 100644
--- a/src/libcore/dbus-service.h
+++ b/src/grp-system/libcore/dbus-service.h
diff --git a/src/libcore/dbus-slice.c b/src/grp-system/libcore/dbus-slice.c
index e37f50b283..e37f50b283 100644
--- a/src/libcore/dbus-slice.c
+++ b/src/grp-system/libcore/dbus-slice.c
diff --git a/src/libcore/dbus-slice.h b/src/grp-system/libcore/dbus-slice.h
index 8e4cabbf8a..8e4cabbf8a 100644
--- a/src/libcore/dbus-slice.h
+++ b/src/grp-system/libcore/dbus-slice.h
diff --git a/src/libcore/dbus-socket.c b/src/grp-system/libcore/dbus-socket.c
index 53c9911991..53c9911991 100644
--- a/src/libcore/dbus-socket.c
+++ b/src/grp-system/libcore/dbus-socket.c
diff --git a/src/libcore/dbus-socket.h b/src/grp-system/libcore/dbus-socket.h
index a31906feea..a31906feea 100644
--- a/src/libcore/dbus-socket.h
+++ b/src/grp-system/libcore/dbus-socket.h
diff --git a/src/libcore/dbus-swap.c b/src/grp-system/libcore/dbus-swap.c
index 2cfc8bd496..2cfc8bd496 100644
--- a/src/libcore/dbus-swap.c
+++ b/src/grp-system/libcore/dbus-swap.c
diff --git a/src/libcore/dbus-swap.h b/src/grp-system/libcore/dbus-swap.h
index 19151fb771..19151fb771 100644
--- a/src/libcore/dbus-swap.h
+++ b/src/grp-system/libcore/dbus-swap.h
diff --git a/src/libcore/dbus-target.c b/src/grp-system/libcore/dbus-target.c
index 6858b1ce72..6858b1ce72 100644
--- a/src/libcore/dbus-target.c
+++ b/src/grp-system/libcore/dbus-target.c
diff --git a/src/libcore/dbus-target.h b/src/grp-system/libcore/dbus-target.h
index c97a9d626e..c97a9d626e 100644
--- a/src/libcore/dbus-target.h
+++ b/src/grp-system/libcore/dbus-target.h
diff --git a/src/libcore/dbus-timer.c b/src/grp-system/libcore/dbus-timer.c
index be84522036..be84522036 100644
--- a/src/libcore/dbus-timer.c
+++ b/src/grp-system/libcore/dbus-timer.c
diff --git a/src/libcore/dbus-timer.h b/src/grp-system/libcore/dbus-timer.h
index 505fb5df72..505fb5df72 100644
--- a/src/libcore/dbus-timer.h
+++ b/src/grp-system/libcore/dbus-timer.h
diff --git a/src/libcore/dbus-unit.c b/src/grp-system/libcore/dbus-unit.c
index dd5d6e4c5e..dd5d6e4c5e 100644
--- a/src/libcore/dbus-unit.c
+++ b/src/grp-system/libcore/dbus-unit.c
diff --git a/src/libcore/dbus-unit.h b/src/grp-system/libcore/dbus-unit.h
index 758045a47c..758045a47c 100644
--- a/src/libcore/dbus-unit.h
+++ b/src/grp-system/libcore/dbus-unit.h
diff --git a/src/libcore/dbus.c b/src/grp-system/libcore/dbus.c
index d1d6248041..d1d6248041 100644
--- a/src/libcore/dbus.c
+++ b/src/grp-system/libcore/dbus.c
diff --git a/src/libcore/dbus.h b/src/grp-system/libcore/dbus.h
index 6baaffbd75..6baaffbd75 100644
--- a/src/libcore/dbus.h
+++ b/src/grp-system/libcore/dbus.h
diff --git a/src/libcore/device.c b/src/grp-system/libcore/device.c
index 10e9e9ae76..10e9e9ae76 100644
--- a/src/libcore/device.c
+++ b/src/grp-system/libcore/device.c
diff --git a/src/libcore/device.h b/src/grp-system/libcore/device.h
index 184a1a349b..184a1a349b 100644
--- a/src/libcore/device.h
+++ b/src/grp-system/libcore/device.h
diff --git a/src/libcore/execute.c b/src/grp-system/libcore/execute.c
index e7628bceb3..e7628bceb3 100644
--- a/src/libcore/execute.c
+++ b/src/grp-system/libcore/execute.c
diff --git a/src/libcore/execute.h b/src/grp-system/libcore/execute.h
index 190a56f443..190a56f443 100644
--- a/src/libcore/execute.h
+++ b/src/grp-system/libcore/execute.h
diff --git a/src/libcore/failure-action.c b/src/grp-system/libcore/failure-action.c
index be76c15a37..be76c15a37 100644
--- a/src/libcore/failure-action.c
+++ b/src/grp-system/libcore/failure-action.c
diff --git a/src/libcore/failure-action.h b/src/grp-system/libcore/failure-action.h
index 96c6b51cb2..96c6b51cb2 100644
--- a/src/libcore/failure-action.h
+++ b/src/grp-system/libcore/failure-action.h
diff --git a/src/libcore/hostname-setup.c b/src/grp-system/libcore/hostname-setup.c
index 0085c0d405..0085c0d405 100644
--- a/src/libcore/hostname-setup.c
+++ b/src/grp-system/libcore/hostname-setup.c
diff --git a/src/libcore/hostname-setup.h b/src/grp-system/libcore/hostname-setup.h
index 73e8c75c71..73e8c75c71 100644
--- a/src/libcore/hostname-setup.h
+++ b/src/grp-system/libcore/hostname-setup.h
diff --git a/src/libcore/ima-setup.c b/src/grp-system/libcore/ima-setup.c
index c6eb358c9d..c6eb358c9d 100644
--- a/src/libcore/ima-setup.c
+++ b/src/grp-system/libcore/ima-setup.c
diff --git a/src/libcore/ima-setup.h b/src/grp-system/libcore/ima-setup.h
index 472b58cb00..472b58cb00 100644
--- a/src/libcore/ima-setup.h
+++ b/src/grp-system/libcore/ima-setup.h
diff --git a/src/libcore/job.c b/src/grp-system/libcore/job.c
index 1a24a7f152..1a24a7f152 100644
--- a/src/libcore/job.c
+++ b/src/grp-system/libcore/job.c
diff --git a/src/libcore/job.h b/src/grp-system/libcore/job.h
index f88e5a0782..f88e5a0782 100644
--- a/src/libcore/job.h
+++ b/src/grp-system/libcore/job.h
diff --git a/src/libcore/kill.c b/src/grp-system/libcore/kill.c
index 22e5bdb4fe..22e5bdb4fe 100644
--- a/src/libcore/kill.c
+++ b/src/grp-system/libcore/kill.c
diff --git a/src/libcore/kill.h b/src/grp-system/libcore/kill.h
index 529e4c5377..529e4c5377 100644
--- a/src/libcore/kill.h
+++ b/src/grp-system/libcore/kill.h
diff --git a/src/libcore/killall.c b/src/grp-system/libcore/killall.c
index 03bed30704..03bed30704 100644
--- a/src/libcore/killall.c
+++ b/src/grp-system/libcore/killall.c
diff --git a/src/libcore/killall.h b/src/grp-system/libcore/killall.h
index acc2439f00..acc2439f00 100644
--- a/src/libcore/killall.h
+++ b/src/grp-system/libcore/killall.h
diff --git a/src/libcore/kmod-setup.c b/src/grp-system/libcore/kmod-setup.c
index 6ddf1137ec..6ddf1137ec 100644
--- a/src/libcore/kmod-setup.c
+++ b/src/grp-system/libcore/kmod-setup.c
diff --git a/src/libcore/kmod-setup.h b/src/grp-system/libcore/kmod-setup.h
index 685f4df301..685f4df301 100644
--- a/src/libcore/kmod-setup.h
+++ b/src/grp-system/libcore/kmod-setup.h
diff --git a/src/libcore/linux/auto_dev-ioctl.h b/src/grp-system/libcore/linux/auto_dev-ioctl.h
index aeaeb3ea7a..aeaeb3ea7a 100644
--- a/src/libcore/linux/auto_dev-ioctl.h
+++ b/src/grp-system/libcore/linux/auto_dev-ioctl.h
diff --git a/src/libcore/load-dropin.c b/src/grp-system/libcore/load-dropin.c
index bb6cf0f989..bb6cf0f989 100644
--- a/src/libcore/load-dropin.c
+++ b/src/grp-system/libcore/load-dropin.c
diff --git a/src/libcore/load-dropin.h b/src/grp-system/libcore/load-dropin.h
index 067661b1ff..067661b1ff 100644
--- a/src/libcore/load-dropin.h
+++ b/src/grp-system/libcore/load-dropin.h
diff --git a/src/libcore/load-fragment-gperf.gperf.m4 b/src/grp-system/libcore/load-fragment-gperf.gperf.m4
index c9f6e6acf7..c9f6e6acf7 100644
--- a/src/libcore/load-fragment-gperf.gperf.m4
+++ b/src/grp-system/libcore/load-fragment-gperf.gperf.m4
diff --git a/src/libcore/load-fragment.c b/src/grp-system/libcore/load-fragment.c
index 6d9100b189..6d9100b189 100644
--- a/src/libcore/load-fragment.c
+++ b/src/grp-system/libcore/load-fragment.c
diff --git a/src/libcore/load-fragment.h b/src/grp-system/libcore/load-fragment.h
index b36a2e3a02..b36a2e3a02 100644
--- a/src/libcore/load-fragment.h
+++ b/src/grp-system/libcore/load-fragment.h
diff --git a/src/libcore/locale-setup.c b/src/grp-system/libcore/locale-setup.c
index 1c9660cdf4..1c9660cdf4 100644
--- a/src/libcore/locale-setup.c
+++ b/src/grp-system/libcore/locale-setup.c
diff --git a/src/libcore/locale-setup.h b/src/grp-system/libcore/locale-setup.h
index 3b97497afe..3b97497afe 100644
--- a/src/libcore/locale-setup.h
+++ b/src/grp-system/libcore/locale-setup.h
diff --git a/src/libcore/loopback-setup.c b/src/grp-system/libcore/loopback-setup.c
index f92e346f8c..f92e346f8c 100644
--- a/src/libcore/loopback-setup.c
+++ b/src/grp-system/libcore/loopback-setup.c
diff --git a/src/libcore/loopback-setup.h b/src/grp-system/libcore/loopback-setup.h
index e7547b8a26..e7547b8a26 100644
--- a/src/libcore/loopback-setup.h
+++ b/src/grp-system/libcore/loopback-setup.h
diff --git a/src/libcore/machine-id-setup.c b/src/grp-system/libcore/machine-id-setup.c
index 702cc90e89..702cc90e89 100644
--- a/src/libcore/machine-id-setup.c
+++ b/src/grp-system/libcore/machine-id-setup.c
diff --git a/src/libcore/machine-id-setup.h b/src/grp-system/libcore/machine-id-setup.h
index a7e7678ed9..a7e7678ed9 100644
--- a/src/libcore/machine-id-setup.h
+++ b/src/grp-system/libcore/machine-id-setup.h
diff --git a/src/libcore/manager.c b/src/grp-system/libcore/manager.c
index 9019967300..9019967300 100644
--- a/src/libcore/manager.c
+++ b/src/grp-system/libcore/manager.c
diff --git a/src/libcore/manager.h b/src/grp-system/libcore/manager.h
index 87186b6e40..87186b6e40 100644
--- a/src/libcore/manager.h
+++ b/src/grp-system/libcore/manager.h
diff --git a/src/libcore/mount-setup.c b/src/grp-system/libcore/mount-setup.c
index 09df45c567..09df45c567 100644
--- a/src/libcore/mount-setup.c
+++ b/src/grp-system/libcore/mount-setup.c
diff --git a/src/libcore/mount-setup.h b/src/grp-system/libcore/mount-setup.h
index 647bd770ae..647bd770ae 100644
--- a/src/libcore/mount-setup.h
+++ b/src/grp-system/libcore/mount-setup.h
diff --git a/src/libcore/mount.c b/src/grp-system/libcore/mount.c
index ab6efd4a9c..ab6efd4a9c 100644
--- a/src/libcore/mount.c
+++ b/src/grp-system/libcore/mount.c
diff --git a/src/libcore/mount.h b/src/grp-system/libcore/mount.h
index da529c44f4..da529c44f4 100644
--- a/src/libcore/mount.h
+++ b/src/grp-system/libcore/mount.h
diff --git a/src/libcore/namespace.c b/src/grp-system/libcore/namespace.c
index f7c5364437..f7c5364437 100644
--- a/src/libcore/namespace.c
+++ b/src/grp-system/libcore/namespace.c
diff --git a/src/libcore/namespace.h b/src/grp-system/libcore/namespace.h
index 03097327dd..03097327dd 100644
--- a/src/libcore/namespace.h
+++ b/src/grp-system/libcore/namespace.h
diff --git a/src/libcore/path.c b/src/grp-system/libcore/path.c
index 782e085174..782e085174 100644
--- a/src/libcore/path.c
+++ b/src/grp-system/libcore/path.c
diff --git a/src/libcore/path.h b/src/grp-system/libcore/path.h
index 4230c8fb99..4230c8fb99 100644
--- a/src/libcore/path.h
+++ b/src/grp-system/libcore/path.h
diff --git a/src/libcore/scope.c b/src/grp-system/libcore/scope.c
index baf1051375..baf1051375 100644
--- a/src/libcore/scope.c
+++ b/src/grp-system/libcore/scope.c
diff --git a/src/libcore/scope.h b/src/grp-system/libcore/scope.h
index 2dc86325c5..2dc86325c5 100644
--- a/src/libcore/scope.h
+++ b/src/grp-system/libcore/scope.h
diff --git a/src/libcore/selinux-access.c b/src/grp-system/libcore/selinux-access.c
index a259e128c1..a259e128c1 100644
--- a/src/libcore/selinux-access.c
+++ b/src/grp-system/libcore/selinux-access.c
diff --git a/src/libcore/selinux-access.h b/src/grp-system/libcore/selinux-access.h
index 1b1a8418ec..1b1a8418ec 100644
--- a/src/libcore/selinux-access.h
+++ b/src/grp-system/libcore/selinux-access.h
diff --git a/src/libcore/selinux-setup.c b/src/grp-system/libcore/selinux-setup.c
index 37a143bce4..37a143bce4 100644
--- a/src/libcore/selinux-setup.c
+++ b/src/grp-system/libcore/selinux-setup.c
diff --git a/src/libcore/selinux-setup.h b/src/grp-system/libcore/selinux-setup.h
index 7b613249b0..7b613249b0 100644
--- a/src/libcore/selinux-setup.h
+++ b/src/grp-system/libcore/selinux-setup.h
diff --git a/src/libcore/service.c b/src/grp-system/libcore/service.c
index 2845a841c3..2845a841c3 100644
--- a/src/libcore/service.c
+++ b/src/grp-system/libcore/service.c
diff --git a/src/libcore/service.h b/src/grp-system/libcore/service.h
index 66e2c387fe..66e2c387fe 100644
--- a/src/libcore/service.h
+++ b/src/grp-system/libcore/service.h
diff --git a/src/libcore/show-status.c b/src/grp-system/libcore/show-status.c
index 03a3117f53..03a3117f53 100644
--- a/src/libcore/show-status.c
+++ b/src/grp-system/libcore/show-status.c
diff --git a/src/libcore/show-status.h b/src/grp-system/libcore/show-status.h
index 56c56eb358..56c56eb358 100644
--- a/src/libcore/show-status.h
+++ b/src/grp-system/libcore/show-status.h
diff --git a/src/libcore/slice.c b/src/grp-system/libcore/slice.c
index d9b3fa9525..d9b3fa9525 100644
--- a/src/libcore/slice.c
+++ b/src/grp-system/libcore/slice.c
diff --git a/src/libcore/slice.h b/src/grp-system/libcore/slice.h
index c9f3f61067..c9f3f61067 100644
--- a/src/libcore/slice.h
+++ b/src/grp-system/libcore/slice.h
diff --git a/src/libcore/smack-setup.c b/src/grp-system/libcore/smack-setup.c
index 16eb234202..16eb234202 100644
--- a/src/libcore/smack-setup.c
+++ b/src/grp-system/libcore/smack-setup.c
diff --git a/src/libcore/smack-setup.h b/src/grp-system/libcore/smack-setup.h
index 78164c85e6..78164c85e6 100644
--- a/src/libcore/smack-setup.h
+++ b/src/grp-system/libcore/smack-setup.h
diff --git a/src/libcore/socket.c b/src/grp-system/libcore/socket.c
index 7ee5edfef8..7ee5edfef8 100644
--- a/src/libcore/socket.c
+++ b/src/grp-system/libcore/socket.c
diff --git a/src/libcore/socket.h b/src/grp-system/libcore/socket.h
index 4f25eabd5d..4f25eabd5d 100644
--- a/src/libcore/socket.h
+++ b/src/grp-system/libcore/socket.h
diff --git a/src/libcore/swap.c b/src/grp-system/libcore/swap.c
index c08057a9fe..c08057a9fe 100644
--- a/src/libcore/swap.c
+++ b/src/grp-system/libcore/swap.c
diff --git a/src/libcore/swap.h b/src/grp-system/libcore/swap.h
index fbf66debdc..fbf66debdc 100644
--- a/src/libcore/swap.h
+++ b/src/grp-system/libcore/swap.h
diff --git a/src/libcore/target.c b/src/grp-system/libcore/target.c
index 25630b80e5..25630b80e5 100644
--- a/src/libcore/target.c
+++ b/src/grp-system/libcore/target.c
diff --git a/src/libcore/target.h b/src/grp-system/libcore/target.h
index 339aea154e..339aea154e 100644
--- a/src/libcore/target.h
+++ b/src/grp-system/libcore/target.h
diff --git a/src/libcore/timer.c b/src/grp-system/libcore/timer.c
index 45eec02dee..45eec02dee 100644
--- a/src/libcore/timer.c
+++ b/src/grp-system/libcore/timer.c
diff --git a/src/libcore/timer.h b/src/grp-system/libcore/timer.h
index 3773ec47e1..3773ec47e1 100644
--- a/src/libcore/timer.h
+++ b/src/grp-system/libcore/timer.h
diff --git a/src/libcore/transaction.c b/src/grp-system/libcore/transaction.c
index a0ff69e2dc..a0ff69e2dc 100644
--- a/src/libcore/transaction.c
+++ b/src/grp-system/libcore/transaction.c
diff --git a/src/libcore/transaction.h b/src/grp-system/libcore/transaction.h
index 73489af0e6..73489af0e6 100644
--- a/src/libcore/transaction.h
+++ b/src/grp-system/libcore/transaction.h
diff --git a/src/libcore/unit-printf.c b/src/grp-system/libcore/unit-printf.c
index c64d45e251..c64d45e251 100644
--- a/src/libcore/unit-printf.c
+++ b/src/grp-system/libcore/unit-printf.c
diff --git a/src/libcore/unit-printf.h b/src/grp-system/libcore/unit-printf.h
index 4fc8531228..4fc8531228 100644
--- a/src/libcore/unit-printf.h
+++ b/src/grp-system/libcore/unit-printf.h
diff --git a/src/libcore/unit.c b/src/grp-system/libcore/unit.c
index 3caa8baa26..3caa8baa26 100644
--- a/src/libcore/unit.c
+++ b/src/grp-system/libcore/unit.c
diff --git a/src/libcore/unit.h b/src/grp-system/libcore/unit.h
index df1174b837..df1174b837 100644
--- a/src/libcore/unit.h
+++ b/src/grp-system/libcore/unit.h
diff --git a/src/grp-system/systemctl/Makefile b/src/grp-system/systemctl/Makefile
index 24585cc12b..43269c66c7 100644
--- a/src/grp-system/systemctl/Makefile
+++ b/src/grp-system/systemctl/Makefile
@@ -30,4 +30,8 @@ systemctl_SOURCES = \
 systemctl_LDADD = \
 	libshared.la
 
+systemd.CPPFLAGS += -DROOTLIBEXECDIR=\"$(rootlibexecdir)\"
+systemd.CPPFLAGS += -DSYSTEM_SYSVINIT_PATH=\"$(SYSTEM_SYSVINIT_PATH)\"
+systemd.CPPFLAGS += -DSYSTEMD_BINARY_PATH=\"$(rootlibexecdir)/systemd\"
+
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-system/systemctl/systemctl.c b/src/grp-system/systemctl/systemctl.c
index b9b1c8400b..0808ecafe3 100644
--- a/src/grp-system/systemctl/systemctl.c
+++ b/src/grp-system/systemctl/systemctl.c
@@ -36,16 +36,8 @@
 #include <systemd/sd-login.h>
 
 #include "basic/alloc-util.h"
-#include "bus-common-errors.h"
-#include "bus-error.h"
-#include "bus-message.h"
-#include "shared/bus-unit-util.h"
-#include "shared/bus-util.h"
-#include "shared/cgroup-show.h"
 #include "basic/cgroup-util.h"
 #include "basic/copy.h"
-#include "shared/dropin.h"
-#include "shared/efivars.h"
 #include "basic/env-util.h"
 #include "basic/exit-status.h"
 #include "basic/fd-util.h"
@@ -54,26 +46,19 @@
 #include "basic/fs-util.h"
 #include "basic/glob-util.h"
 #include "basic/hostname-util.h"
-#include "shared/initreq.h"
-#include "shared/install.h"
 #include "basic/io-util.h"
 #include "basic/list.h"
 #include "basic/locale-util.h"
 #include "basic/log.h"
-#include "shared/logs-show.h"
 #include "basic/macro.h"
 #include "basic/mkdir.h"
-#include "shared/pager.h"
 #include "basic/parse-util.h"
-#include "shared/path-lookup.h"
 #include "basic/path-util.h"
 #include "basic/process-util.h"
 #include "basic/rlimit-util.h"
 #include "basic/set.h"
 #include "basic/signal-util.h"
 #include "basic/socket-util.h"
-#include "shared/spawn-ask-password-agent.h"
-#include "shared/spawn-polkit-agent.h"
 #include "basic/special.h"
 #include "basic/stat-util.h"
 #include "basic/strv.h"
@@ -81,9 +66,24 @@
 #include "basic/unit-name.h"
 #include "basic/user-util.h"
 #include "basic/util.h"
-#include "shared/utmp-wtmp.h"
 #include "basic/verbs.h"
 #include "basic/virt.h"
+#include "sd-bus/bus-common-errors.h"
+#include "sd-bus/bus-error.h"
+#include "sd-bus/bus-message.h"
+#include "shared/bus-unit-util.h"
+#include "shared/bus-util.h"
+#include "shared/cgroup-show.h"
+#include "shared/dropin.h"
+#include "shared/efivars.h"
+#include "shared/initreq.h"
+#include "shared/install.h"
+#include "shared/logs-show.h"
+#include "shared/pager.h"
+#include "shared/path-lookup.h"
+#include "shared/spawn-ask-password-agent.h"
+#include "shared/spawn-polkit-agent.h"
+#include "shared/utmp-wtmp.h"
 
 static char **arg_types = NULL;
 static char **arg_states = NULL;
diff --git a/src/grp-system/systemd/Makefile b/src/grp-system/systemd/Makefile
index cfef258c6d..8184c85da8 100644
--- a/src/grp-system/systemd/Makefile
+++ b/src/grp-system/systemd/Makefile
@@ -68,4 +68,10 @@ dist_systemunit_DATA_busnames += \
 BUSNAMES_TARGET_WANTS += \
 	org.freedesktop.systemd1.busname
 
+systemd.CPPFLAGS += -DPKGSYSCONFDIR=\"$(pkgsysconfdir)\"
+
+systemd.CPPFLAGS += -DSYSTEMD_BINARY_PATH=\"$(rootlibexecdir)/systemd\"
+systemd.CPPFLAGS += -DSYSTEMD_SHUTDOWN_BINARY_PATH=\"$(rootlibexecdir)/systemd-shutdown\"
+systemd.CPPFLAGS += -DSYSTEMCTL_BINARY_PATH=\"$(rootbindir)/systemctl\"
+
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-system/systemd/main.c b/src/grp-system/systemd/main.c
index 31206f21dc..aa7c126fcf 100644
--- a/src/grp-system/systemd/main.c
+++ b/src/grp-system/systemd/main.c
@@ -41,13 +41,9 @@
 #include "basic/alloc-util.h"
 #include "basic/architecture.h"
 #include "basic/build.h"
-#include "bus-error.h"
-#include "shared/bus-util.h"
 #include "basic/capability-util.h"
 #include "basic/clock-util.h"
-#include "shared/conf-parser.h"
 #include "basic/cpu-set-util.h"
-#include "dbus-manager.h"
 #include "basic/def.h"
 #include "basic/env-util.h"
 #include "basic/fd-util.h"
@@ -55,36 +51,40 @@
 #include "basic/fileio.h"
 #include "basic/formats-util.h"
 #include "basic/fs-util.h"
-#include "hostname-setup.h"
-#include "ima-setup.h"
-#include "killall.h"
-#include "kmod-setup.h"
-#include "load-fragment.h"
 #include "basic/log.h"
-#include "loopback-setup.h"
-#include "machine-id-setup.h"
-#include "manager.h"
 #include "basic/missing.h"
-#include "mount-setup.h"
-#include "shared/pager.h"
 #include "basic/parse-util.h"
 #include "basic/proc-cmdline.h"
 #include "basic/process-util.h"
 #include "basic/rlimit-util.h"
-#include "selinux-setup.h"
 #include "basic/selinux-util.h"
 #include "basic/signal-util.h"
-#include "smack-setup.h"
 #include "basic/special.h"
 #include "basic/stat-util.h"
 #include "basic/stdio-util.h"
 #include "basic/strv.h"
-#include "shared/switch-root.h"
 #include "basic/terminal-util.h"
 #include "basic/umask-util.h"
 #include "basic/user-util.h"
 #include "basic/virt.h"
+#include "dbus-manager.h"
+#include "hostname-setup.h"
+#include "ima-setup.h"
+#include "killall.h"
+#include "kmod-setup.h"
+#include "load-fragment.h"
+#include "loopback-setup.h"
+#include "machine-id-setup.h"
+#include "manager.h"
+#include "mount-setup.h"
+#include "sd-bus/bus-error.h"
+#include "selinux-setup.h"
+#include "shared/bus-util.h"
+#include "shared/conf-parser.h"
+#include "shared/pager.h"
+#include "shared/switch-root.h"
 #include "shared/watchdog.h"
+#include "smack-setup.h"
 
 static enum {
         ACTION_RUN,
diff --git a/src/systemd-hwdb/Makefile b/src/grp-udev/systemd-hwdb/Makefile
index bf14199ffe..bf14199ffe 100644
--- a/src/systemd-hwdb/Makefile
+++ b/src/grp-udev/systemd-hwdb/Makefile
diff --git a/src/systemd-hwdb/hwdb.c b/src/grp-udev/systemd-hwdb/hwdb.c
index 0e96716b0f..0e96716b0f 100644
--- a/src/systemd-hwdb/hwdb.c
+++ b/src/grp-udev/systemd-hwdb/hwdb.c
diff --git a/src/grp-utils/Makefile b/src/grp-utils/Makefile
new file mode 100644
index 0000000000..eda1a32f4b
--- /dev/null
+++ b/src/grp-utils/Makefile
@@ -0,0 +1,32 @@
+#  -*- Mode: makefile; indent-tabs-mode: t -*-
+#
+#  This file is part of systemd.
+#
+#  Copyright 2010-2012 Lennart Poettering
+#  Copyright 2010-2012 Kay Sievers
+#  Copyright 2013 Zbigniew Jędrzejewski-Szmek
+#  Copyright 2013 David Strauss
+#  Copyright 2016 Luke Shumaker
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
+#
+#  systemd is distributed in the hope that it will be useful, but
+#  WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+#  Lesser General Public License for more details.
+#
+#  You should have received a copy of the GNU Lesser General Public License
+#  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
+include $(topsrcdir)/build-aux/Makefile.head.mk
+
+at.subdirs += systemd-ac-power
+at.subdirs += systemd-escape
+at.subdirs += systemd-notify
+at.subdirs += systemd-path
+at.subdirs += systemd-socket-activate
+
+include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/systemd-ac-power/Makefile b/src/grp-utils/systemd-ac-power/Makefile
index aa8912d711..ec35048162 100644
--- a/src/systemd-ac-power/Makefile
+++ b/src/grp-utils/systemd-ac-power/Makefile
@@ -20,7 +20,7 @@
 #
 #  You should have received a copy of the GNU Lesser General Public License
 #  along with systemd; If not, see <http://www.gnu.org/licenses/>.
-include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
+include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
 rootlibexec_PROGRAMS += systemd-ac-power
diff --git a/src/systemd-ac-power/ac-power.c b/src/grp-utils/systemd-ac-power/ac-power.c
index 945c318f66..945c318f66 100644
--- a/src/systemd-ac-power/ac-power.c
+++ b/src/grp-utils/systemd-ac-power/ac-power.c
diff --git a/src/systemd-escape/Makefile b/src/grp-utils/systemd-escape/Makefile
index f094a7e2a0..4eb2fe356a 100644
--- a/src/systemd-escape/Makefile
+++ b/src/grp-utils/systemd-escape/Makefile
@@ -20,7 +20,7 @@
 #
 #  You should have received a copy of the GNU Lesser General Public License
 #  along with systemd; If not, see <http://www.gnu.org/licenses/>.
-include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
+include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
 rootbin_PROGRAMS += systemd-escape
diff --git a/src/systemd-escape/escape.c b/src/grp-utils/systemd-escape/escape.c
index 479ea0e87c..479ea0e87c 100644
--- a/src/systemd-escape/escape.c
+++ b/src/grp-utils/systemd-escape/escape.c
diff --git a/src/systemd-notify/Makefile b/src/grp-utils/systemd-notify/Makefile
index 06a6604e5b..60e1336e72 100644
--- a/src/systemd-notify/Makefile
+++ b/src/grp-utils/systemd-notify/Makefile
@@ -20,7 +20,7 @@
 #
 #  You should have received a copy of the GNU Lesser General Public License
 #  along with systemd; If not, see <http://www.gnu.org/licenses/>.
-include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
+include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
 rootbin_PROGRAMS += systemd-notify
diff --git a/src/systemd-notify/notify.c b/src/grp-utils/systemd-notify/notify.c
index 4db49508b3..4db49508b3 100644
--- a/src/systemd-notify/notify.c
+++ b/src/grp-utils/systemd-notify/notify.c
diff --git a/src/systemd-path/Makefile b/src/grp-utils/systemd-path/Makefile
index 4835742fd6..f1a5ccd8bb 100644
--- a/src/systemd-path/Makefile
+++ b/src/grp-utils/systemd-path/Makefile
@@ -20,7 +20,7 @@
 #
 #  You should have received a copy of the GNU Lesser General Public License
 #  along with systemd; If not, see <http://www.gnu.org/licenses/>.
-include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
+include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
 bin_PROGRAMS += systemd-path
diff --git a/src/grp-utils/systemd-path/_sd-common.h b/src/grp-utils/systemd-path/_sd-common.h
new file mode 120000
index 0000000000..d2b5d6f4e4
--- /dev/null
+++ b/src/grp-utils/systemd-path/_sd-common.h
@@ -0,0 +1 @@
+../../libsystemd/include/systemd/_sd-common.h
+\ No newline at end of file
diff --git a/src/systemd-path/path.c b/src/grp-utils/systemd-path/path.c
index aa63884365..aa63884365 100644
--- a/src/systemd-path/path.c
+++ b/src/grp-utils/systemd-path/path.c
diff --git a/src/systemd-path/sd-path.c b/src/grp-utils/systemd-path/sd-path.c
index b904b56c01..b904b56c01 100644
--- a/src/systemd-path/sd-path.c
+++ b/src/grp-utils/systemd-path/sd-path.c
diff --git a/src/systemd-path/sd-path.h b/src/grp-utils/systemd-path/sd-path.h
index be6abdcd03..be6abdcd03 100644
--- a/src/systemd-path/sd-path.h
+++ b/src/grp-utils/systemd-path/sd-path.h
diff --git a/src/systemd-activate/Makefile b/src/grp-utils/systemd-socket-activate/Makefile
index 5e2299f00e..7d69a80d36 100644
--- a/src/systemd-activate/Makefile
+++ b/src/grp-utils/systemd-socket-activate/Makefile
@@ -20,7 +20,7 @@
 #
 #  You should have received a copy of the GNU Lesser General Public License
 #  along with systemd; If not, see <http://www.gnu.org/licenses/>.
-include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
+include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
 
diff --git a/src/systemd-activate/activate.c b/src/grp-utils/systemd-socket-activate/activate.c
index 2ad205af17..2ad205af17 100644
--- a/src/systemd-activate/activate.c
+++ b/src/grp-utils/systemd-socket-activate/activate.c
diff --git a/src/libsystemd-network/include/systemd-network/_sd-common.h b/src/libsystemd-network/include/systemd-network/_sd-common.h
new file mode 120000
index 0000000000..653327c267
--- /dev/null
+++ b/src/libsystemd-network/include/systemd-network/_sd-common.h
@@ -0,0 +1 @@
+../../../libsystemd/include/systemd/_sd-common.h
+\ No newline at end of file
diff --git a/src/libsystemd-network/include/systemd-network/sd-dhcp-client.h b/src/libsystemd-network/include/systemd-network/sd-dhcp-client.h
index ca254e5f9c..cc51933b1b 100644
--- a/src/libsystemd-network/include/systemd-network/sd-dhcp-client.h
+++ b/src/libsystemd-network/include/systemd-network/sd-dhcp-client.h
@@ -28,7 +28,7 @@
 #include "systemd-network/sd-dhcp-lease.h"
 #include <systemd/sd-event.h>
 
-#include <systemd/_sd-common.h>
+#include "_sd-common.h"
 
 _SD_BEGIN_DECLARATIONS;
 
diff --git a/src/libsystemd-network/include/systemd-network/sd-dhcp-lease.h b/src/libsystemd-network/include/systemd-network/sd-dhcp-lease.h
index 014288b8c1..2f565ca825 100644
--- a/src/libsystemd-network/include/systemd-network/sd-dhcp-lease.h
+++ b/src/libsystemd-network/include/systemd-network/sd-dhcp-lease.h
@@ -26,7 +26,7 @@
 #include <netinet/in.h>
 #include <sys/types.h>
 
-#include <systemd/_sd-common.h>
+#include "_sd-common.h"
 
 _SD_BEGIN_DECLARATIONS;
 
diff --git a/src/libsystemd-network/include/systemd-network/sd-dhcp-server.h b/src/libsystemd-network/include/systemd-network/sd-dhcp-server.h
index e433d8562e..bbb2bb203c 100644
--- a/src/libsystemd-network/include/systemd-network/sd-dhcp-server.h
+++ b/src/libsystemd-network/include/systemd-network/sd-dhcp-server.h
@@ -26,7 +26,7 @@
 
 #include <systemd/sd-event.h>
 
-#include <systemd/_sd-common.h>
+#include "_sd-common.h"
 
 _SD_BEGIN_DECLARATIONS;
 
diff --git a/src/libsystemd-network/include/systemd-network/sd-dhcp6-client.h b/src/libsystemd-network/include/systemd-network/sd-dhcp6-client.h
index 37243ef707..dd6cb32aae 100644
--- a/src/libsystemd-network/include/systemd-network/sd-dhcp6-client.h
+++ b/src/libsystemd-network/include/systemd-network/sd-dhcp6-client.h
@@ -27,7 +27,7 @@
 #include "systemd-network/sd-dhcp6-lease.h"
 #include <systemd/sd-event.h>
 
-#include <systemd/_sd-common.h>
+#include "_sd-common.h"
 
 _SD_BEGIN_DECLARATIONS;
 
diff --git a/src/libsystemd-network/include/systemd-network/sd-dhcp6-lease.h b/src/libsystemd-network/include/systemd-network/sd-dhcp6-lease.h
index 3e633548d0..184fbb8e0d 100644
--- a/src/libsystemd-network/include/systemd-network/sd-dhcp6-lease.h
+++ b/src/libsystemd-network/include/systemd-network/sd-dhcp6-lease.h
@@ -24,7 +24,7 @@
 #include <inttypes.h>
 #include <netinet/in.h>
 
-#include <systemd/_sd-common.h>
+#include "_sd-common.h"
 
 _SD_BEGIN_DECLARATIONS;
 
diff --git a/src/libsystemd-network/include/systemd-network/sd-ipv4acd.h b/src/libsystemd-network/include/systemd-network/sd-ipv4acd.h
index 8246b5b267..93db7a4a6c 100644
--- a/src/libsystemd-network/include/systemd-network/sd-ipv4acd.h
+++ b/src/libsystemd-network/include/systemd-network/sd-ipv4acd.h
@@ -26,7 +26,7 @@
 
 #include <systemd/sd-event.h>
 
-#include <systemd/_sd-common.h>
+#include "_sd-common.h"
 
 _SD_BEGIN_DECLARATIONS;
 
diff --git a/src/libsystemd-network/include/systemd-network/sd-ipv4ll.h b/src/libsystemd-network/include/systemd-network/sd-ipv4ll.h
index ab7233a856..9167623167 100644
--- a/src/libsystemd-network/include/systemd-network/sd-ipv4ll.h
+++ b/src/libsystemd-network/include/systemd-network/sd-ipv4ll.h
@@ -25,7 +25,7 @@
 
 #include <systemd/sd-event.h>
 
-#include <systemd/_sd-common.h>
+#include "_sd-common.h"
 
 _SD_BEGIN_DECLARATIONS;
 
diff --git a/src/libsystemd-network/include/systemd-network/sd-lldp.h b/src/libsystemd-network/include/systemd-network/sd-lldp.h
index b611fdd37c..391e7c2a2e 100644
--- a/src/libsystemd-network/include/systemd-network/sd-lldp.h
+++ b/src/libsystemd-network/include/systemd-network/sd-lldp.h
@@ -26,7 +26,7 @@
 
 #include <systemd/sd-event.h>
 
-#include <systemd/_sd-common.h>
+#include "_sd-common.h"
 
 _SD_BEGIN_DECLARATIONS;
 
diff --git a/src/libsystemd-network/include/systemd-network/sd-ndisc.h b/src/libsystemd-network/include/systemd-network/sd-ndisc.h
index 42ef961dac..c77a435d17 100644
--- a/src/libsystemd-network/include/systemd-network/sd-ndisc.h
+++ b/src/libsystemd-network/include/systemd-network/sd-ndisc.h
@@ -25,7 +25,7 @@
 
 #include <systemd/sd-event.h>
 
-#include <systemd/_sd-common.h>
+#include "_sd-common.h"
 
 _SD_BEGIN_DECLARATIONS;
 
diff --git a/src/libsystemd/Makefile b/src/libsystemd/Makefile
index a193f4592d..05d928f493 100644
--- a/src/libsystemd/Makefile
+++ b/src/libsystemd/Makefile
@@ -64,7 +64,7 @@ pkginclude_HEADERS += \
 	src/systemd/sd-id128.h \
 	src/systemd/sd-daemon.h
 
-lib_LTLIBRARIES += \
+rootlib_LTLIBRARIES += \
 	libsystemd.la
 
 # ------------------------------------------------------------------------------
diff --git a/src/libudev/src/Makefile b/src/libudev/src/Makefile
index 77fc1fe6aa..2bc5227cfb 100644
--- a/src/libudev/src/Makefile
+++ b/src/libudev/src/Makefile
@@ -30,7 +30,7 @@ LIBUDEV_AGE=6
 include_HEADERS += \
 	src/libudev/libudev.h
 
-lib_LTLIBRARIES += \
+rootlib_LTLIBRARIES += \
 	libudev.la
 
 libudev_la_SOURCES =\
diff --git a/src/systemd-fstab-generator/mount-setup.c b/src/systemd-fstab-generator/mount-setup.c
deleted file mode 120000
index a4ab487157..0000000000
--- a/src/systemd-fstab-generator/mount-setup.c
+++ /dev/null
@@ -1 +0,0 @@
-../libcore/mount-setup.c
-\ No newline at end of file
diff --git a/src/systemd-fstab-generator/mount-setup.h b/src/systemd-fstab-generator/mount-setup.h
deleted file mode 120000
index 1f984851f8..0000000000
--- a/src/systemd-fstab-generator/mount-setup.h
+++ /dev/null
@@ -1 +0,0 @@
-../libcore/mount-setup.h
-\ No newline at end of file
diff --git a/src/systemd-machine-id-setup/machine-id-setup.c b/src/systemd-machine-id-setup/machine-id-setup.c
index 2f0f2d8cf1..78f80e2b73 120000
--- a/src/systemd-machine-id-setup/machine-id-setup.c
+++ b/src/systemd-machine-id-setup/machine-id-setup.c
@@ -1 +1 @@
-../libcore/machine-id-setup.c
-\ No newline at end of file
+../grp-system/libcore/machine-id-setup.c
+\ No newline at end of file
diff --git a/src/systemd-machine-id-setup/machine-id-setup.h b/src/systemd-machine-id-setup/machine-id-setup.h
index 6b34cb74f4..d2659724ce 120000
--- a/src/systemd-machine-id-setup/machine-id-setup.h
+++ b/src/systemd-machine-id-setup/machine-id-setup.h
@@ -1 +1 @@
-../libcore/machine-id-setup.h
-\ No newline at end of file
+../grp-system/libcore/machine-id-setup.h
+\ No newline at end of file
diff --git a/src/systemd-nspawn/loopback-setup.c b/src/systemd-nspawn/loopback-setup.c
index 1078ace0bf..da633f4936 120000
--- a/src/systemd-nspawn/loopback-setup.c
+++ b/src/systemd-nspawn/loopback-setup.c
@@ -1 +1 @@
-../libcore/loopback-setup.c
-\ No newline at end of file
+../grp-system/libcore/loopback-setup.c
+\ No newline at end of file
diff --git a/src/systemd-nspawn/loopback-setup.h b/src/systemd-nspawn/loopback-setup.h
index 18fc7663a2..dc051ab1bd 120000
--- a/src/systemd-nspawn/loopback-setup.h
+++ b/src/systemd-nspawn/loopback-setup.h
@@ -1 +1 @@
-../libcore/loopback-setup.h
-\ No newline at end of file
+../grp-system/libcore/loopback-setup.h
+\ No newline at end of file
diff --git a/src/systemd-nspawn/machine-id-setup.c b/src/systemd-nspawn/machine-id-setup.c
index 2f0f2d8cf1..78f80e2b73 120000
--- a/src/systemd-nspawn/machine-id-setup.c
+++ b/src/systemd-nspawn/machine-id-setup.c
@@ -1 +1 @@
-../libcore/machine-id-setup.c
-\ No newline at end of file
+../grp-system/libcore/machine-id-setup.c
+\ No newline at end of file
diff --git a/src/systemd-nspawn/machine-id-setup.h b/src/systemd-nspawn/machine-id-setup.h
index 6b34cb74f4..d2659724ce 120000
--- a/src/systemd-nspawn/machine-id-setup.h
+++ b/src/systemd-nspawn/machine-id-setup.h
@@ -1 +1 @@
-../libcore/machine-id-setup.h
-\ No newline at end of file
+../grp-system/libcore/machine-id-setup.h
+\ No newline at end of file
diff --git a/src/systemd-nspawn/mount-setup.c b/src/systemd-nspawn/mount-setup.c
index a4ab487157..67cb74c218 120000
--- a/src/systemd-nspawn/mount-setup.c
+++ b/src/systemd-nspawn/mount-setup.c
@@ -1 +1 @@
-../libcore/mount-setup.c
-\ No newline at end of file
+../grp-system/libcore/mount-setup.c
+\ No newline at end of file
diff --git a/src/systemd-nspawn/mount-setup.h b/src/systemd-nspawn/mount-setup.h
index 1f984851f8..bae54ba700 120000
--- a/src/systemd-nspawn/mount-setup.h
+++ b/src/systemd-nspawn/mount-setup.h
@@ -1 +1 @@
-../libcore/mount-setup.h
-\ No newline at end of file
+../grp-system/libcore/mount-setup.h
+\ No newline at end of file
diff --git a/src/systemd-path/_sd-common.h b/src/systemd-path/_sd-common.h
deleted file mode 120000
index 89aca2e4a7..0000000000
--- a/src/systemd-path/_sd-common.h
+++ /dev/null
@@ -1 +0,0 @@
-../libsystemd/include/systemd/_sd-common.h
-\ No newline at end of file
diff --git a/src/systemd-remount-fs/mount-setup.c b/src/systemd-remount-fs/mount-setup.c
index a4ab487157..67cb74c218 120000
--- a/src/systemd-remount-fs/mount-setup.c
+++ b/src/systemd-remount-fs/mount-setup.c
@@ -1 +1 @@
-../libcore/mount-setup.c
-\ No newline at end of file
+../grp-system/libcore/mount-setup.c
+\ No newline at end of file
diff --git a/src/systemd-remount-fs/mount-setup.h b/src/systemd-remount-fs/mount-setup.h
index 1f984851f8..bae54ba700 120000
--- a/src/systemd-remount-fs/mount-setup.h
+++ b/src/systemd-remount-fs/mount-setup.h
@@ -1 +1 @@
-../libcore/mount-setup.h
-\ No newline at end of file
+../grp-system/libcore/mount-setup.h
+\ No newline at end of file
diff --git a/src/systemd-shutdown/killall.c b/src/systemd-shutdown/killall.c
index 5ddb36306b..84c06d47ee 120000
--- a/src/systemd-shutdown/killall.c
+++ b/src/systemd-shutdown/killall.c
@@ -1 +1 @@
-../libcore/killall.c
-\ No newline at end of file
+../grp-system/libcore/killall.c
+\ No newline at end of file
diff --git a/src/systemd-shutdown/killall.h b/src/systemd-shutdown/killall.h
index 60b334fe91..10ac8c905d 120000
--- a/src/systemd-shutdown/killall.h
+++ b/src/systemd-shutdown/killall.h
@@ -1 +1 @@
-../libcore/killall.h
-\ No newline at end of file
+../grp-system/libcore/killall.h
+\ No newline at end of file
diff --git a/src/systemd-shutdown/mount-setup.c b/src/systemd-shutdown/mount-setup.c
index a4ab487157..67cb74c218 120000
--- a/src/systemd-shutdown/mount-setup.c
+++ b/src/systemd-shutdown/mount-setup.c
@@ -1 +1 @@
-../libcore/mount-setup.c
-\ No newline at end of file
+../grp-system/libcore/mount-setup.c
+\ No newline at end of file
diff --git a/src/systemd-shutdown/mount-setup.h b/src/systemd-shutdown/mount-setup.h
index 1f984851f8..bae54ba700 120000
--- a/src/systemd-shutdown/mount-setup.h
+++ b/src/systemd-shutdown/mount-setup.h
@@ -1 +1 @@
-../libcore/mount-setup.h
-\ No newline at end of file
+../grp-system/libcore/mount-setup.h
+\ No newline at end of file
diff --git a/src/systemd-timesyncd/timesyncd.c b/src/systemd-timesyncd/timesyncd.c
index 0a3a08b46c..7a357c2296 100644
--- a/src/systemd-timesyncd/timesyncd.c
+++ b/src/systemd-timesyncd/timesyncd.c
@@ -24,11 +24,12 @@
 #include "basic/clock-util.h"
 #include "basic/fd-util.h"
 #include "basic/fs-util.h"
-#include "sd-network/network-util.h"
 #include "basic/signal-util.h"
+#include "basic/user-util.h"
+#include "sd-network/network-util.h"
+
 #include "timesyncd-conf.h"
 #include "timesyncd-manager.h"
-#include "basic/user-util.h"
 
 static int load_clock_timestamp(uid_t uid, gid_t gid) {
         _cleanup_close_ int fd = -1;