633 files changed, 690 insertions, 10323 deletions

diff --git a/build-aux/Makefile.each.head/.gitignore b/build-aux/Makefile.each.head/.gitignore
deleted file mode 100644
index e69de29bb2..0000000000
--- a/build-aux/Makefile.each.head/.gitignore
+++ /dev/null
diff --git a/build-aux/Makefile.each.tail/.gitignore b/build-aux/Makefile.each.tail/.gitignore
deleted file mode 100644
index e69de29bb2..0000000000
--- a/build-aux/Makefile.each.tail/.gitignore
+++ /dev/null
diff --git a/build-aux/Makefile.each.tail/20-systemd.mk b/build-aux/Makefile.each.tail/20-systemd.mk
deleted file mode 100644
index 72dbec6714..0000000000
--- a/build-aux/Makefile.each.tail/20-systemd.mk
+++ /dev/null
@@ -1,49 +0,0 @@
-#  -*- 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
-
-%-from-name.gperf: %-list.txt
-	$(AM_V_at)$(MKDIR_P) $(dir $@)
-	$(AM_V_GEN)$(AWK) 'BEGIN{ print "struct $(notdir $*)_name { const char* name; int id; };"; print "%null-strings"; print "%%";} { printf "%s, %s\n", $$1, $$1 }' <$< >$@
-
-%-from-name.h: %-from-name.gperf
-	$(AM_V_at)$(MKDIR_P) $(dir $@)
-	$(AM_V_GPERF)$(GPERF) -L ANSI-C -t --ignore-case -N lookup_$(notdir $*) -H hash_$(notdir $*)_name -p -C <$< >$@
-
-$(outdir)/%: sysctl.d/%.in
-	$(SED_PROCESS)
-
-%.sh: %.sh.in
-	$(SED_PROCESS)
-	$(AM_V_GEN)chmod +x $@
-
-$(outdir)/%.c: src/%.gperf
-	$(AM_V_at)$(MKDIR_P) $(dir $@)
-	$(AM_V_GPERF)$(GPERF) < $< > $@
-
-$(outdir)/%: src/%.m4 $(top_builddir)/config.status
-	$(AM_V_at)$(MKDIR_P) $(dir $@)
-	$(AM_V_M4)$(M4) -P $(M4_DEFINES) < $< > $@
-
-include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/build-aux/Makefile.once.head/.gitignore b/build-aux/Makefile.once.head/.gitignore
deleted file mode 100644
index e69de29bb2..0000000000
--- a/build-aux/Makefile.once.head/.gitignore
+++ /dev/null
diff --git a/build-aux/Makefile.once.head/20-systemd.mk b/build-aux/Makefile.once.head/20-systemd.mk
deleted file mode 100644
index 3f55d88234..0000000000
--- a/build-aux/Makefile.once.head/20-systemd.mk
+++ /dev/null
@@ -1,186 +0,0 @@
-#  -*- 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
-
-ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
-AM_MAKEFLAGS = --no-print-directory
-AUTOMAKE_OPTIONS = color-tests parallel-tests
-
-GCC_COLORS ?= 'ooh, shiny!'
-export GCC_COLORS
-
-SUBDIRS = . po
-
-# remove targets if the command fails
-.DELETE_ON_ERROR:
-
-# keep intermediate files
-.SECONDARY:
-
-# Keep the test-suite.log
-.PRECIOUS: $(TEST_SUITE_LOG) Makefile
-
-V ?=
-
-AM_V_M4 = $(AM_V_M4_$(V))
-AM_V_M4_ = $(AM_V_M4_$(AM_DEFAULT_VERBOSITY))
-AM_V_M4_0 = @echo "  M4      " $@;
-AM_V_M4_1 =
-
-AM_V_XSLT = $(AM_V_XSLT_$(V))
-AM_V_XSLT_ = $(AM_V_XSLT_$(AM_DEFAULT_VERBOSITY))
-AM_V_XSLT_0 = @echo "  XSLT    " $@;
-AM_V_XSLT_1 =
-
-AM_V_GPERF = $(AM_V_GPERF_$(V))
-AM_V_GPERF_ = $(AM_V_GPERF_$(AM_DEFAULT_VERBOSITY))
-AM_V_GPERF_0 = @echo "  GPERF   " $@;
-AM_V_GPERF_1 =
-
-AM_V_LN = $(AM_V_LN_$(V))
-AM_V_LN_ = $(AM_V_LN_$(AM_DEFAULT_VERBOSITY))
-AM_V_LN_0 = @echo "  LN      " $@;
-AM_V_LN_1 =
-
-AM_V_RM = $(AM_V_RM_$(V))
-AM_V_RM_ = $(AM_V_RM_$(AM_DEFAULT_VERBOSITY))
-AM_V_RM_0 = @echo "  RM      " $@;
-AM_V_RM_1 =
-
-AM_V_CC = $(AM_V_CC_$(V))
-AM_V_CC_ = $(AM_V_CC_$(AM_DEFAULT_VERBOSITY))
-AM_V_CC_0 = @echo "  CC      " $@;
-AM_V_CC_1 =
-
-AM_V_CCLD = $(AM_V_CCLD_$(V))
-AM_V_CCLD_ = $(AM_V_CCLD_$(AM_DEFAULT_VERBOSITY))
-AM_V_CCLD_0 = @echo "  CCLD    " $@;
-AM_V_CCLD_1 =
-
-AM_V_P = $(AM_V_P_$(V))
-AM_V_P_ = $(AM_V_P_$(AM_DEFAULT_VERBOSITY))
-AM_V_P_0 = false
-AM_V_P_1 = :
-
-AM_V_GEN = $(AM_V_GEN_$(V))
-AM_V_GEN_ = $(AM_V_GEN_$(AM_DEFAULT_VERBOSITY))
-AM_V_GEN_0 = @echo "  GEN     " $@;
-AM_V_GEN_1 =
-
-AM_V_at = $(AM_V_at_$(V))
-AM_V_at_ = $(AM_V_at_$(AM_DEFAULT_VERBOSITY))
-AM_V_at_0 = @
-AM_V_at_1 =
-
-AM_V_lt = $(AM_V_lt_$(V))
-AM_V_lt_ = $(AM_V_lt_$(AM_DEFAULT_VERBOSITY))
-AM_V_lt_0 = --silent
-AM_V_lt_1 =
-
-INTLTOOL_V_MERGE = $(INTLTOOL_V_MERGE_$(V))
-INTLTOOL_V_MERGE_OPTIONS = $(intltool_v_merge_options_$(V))
-INTLTOOL_V_MERGE_ = $(INTLTOOL_V_MERGE_$(AM_DEFAULT_VERBOSITY))
-INTLTOOL_V_MERGE_0 = @echo "  ITMRG " $@;
-INTLTOOL_V_MERGE_1 =
-
-substitutions = \
-       '|rootlibexecdir=$(rootlibexecdir)|' \
-       '|rootbindir=$(rootbindir)|' \
-       '|bindir=$(bindir)|' \
-       '|SYSTEMCTL=$(rootbindir)/systemctl|' \
-       '|SYSTEMD_NOTIFY=$(rootbindir)/systemd-notify|' \
-       '|pkgsysconfdir=$(pkgsysconfdir)|' \
-       '|SYSTEM_CONFIG_UNIT_PATH=$(pkgsysconfdir)/system|' \
-       '|USER_CONFIG_UNIT_PATH=$(pkgsysconfdir)/user|' \
-       '|pkgdatadir=$(pkgdatadir)|' \
-       '|systemunitdir=$(systemunitdir)|' \
-       '|userunitdir=$(userunitdir)|' \
-       '|systempresetdir=$(systempresetdir)|' \
-       '|userpresetdir=$(userpresetdir)|' \
-       '|udevhwdbdir=$(udevhwdbdir)|' \
-       '|udevrulesdir=$(udevrulesdir)|' \
-       '|catalogdir=$(catalogdir)|' \
-       '|tmpfilesdir=$(tmpfilesdir)|' \
-       '|sysusersdir=$(sysusersdir)|' \
-       '|sysctldir=$(sysctldir)|' \
-       '|systemgeneratordir=$(systemgeneratordir)|' \
-       '|usergeneratordir=$(usergeneratordir)|' \
-       '|CERTIFICATEROOT=$(CERTIFICATEROOT)|' \
-       '|PACKAGE_VERSION=$(PACKAGE_VERSION)|' \
-       '|PACKAGE_NAME=$(PACKAGE_NAME)|' \
-       '|PACKAGE_URL=$(PACKAGE_URL)|' \
-       '|RANDOM_SEED_DIR=$(localstatedir)/lib/systemd/|' \
-       '|RANDOM_SEED=$(localstatedir)/lib/systemd/random-seed|' \
-       '|prefix=$(prefix)|' \
-       '|exec_prefix=$(exec_prefix)|' \
-       '|libdir=$(libdir)|' \
-       '|includedir=$(includedir)|' \
-       '|VERSION=$(VERSION)|' \
-       '|rootprefix=$(rootprefix)|' \
-       '|udevlibexecdir=$(udevlibexecdir)|' \
-       '|SUSHELL=$(SUSHELL)|' \
-       '|SULOGIN=$(SULOGIN)|' \
-       '|DEBUGTTY=$(DEBUGTTY)|' \
-       '|KILL=$(KILL)|' \
-       '|KMOD=$(KMOD)|' \
-       '|MOUNT_PATH=$(MOUNT_PATH)|' \
-       '|UMOUNT_PATH=$(UMOUNT_PATH)|' \
-       '|MKDIR_P=$(MKDIR_P)|' \
-       '|QUOTAON=$(QUOTAON)|' \
-       '|QUOTACHECK=$(QUOTACHECK)|' \
-       '|SYSTEM_SYSVINIT_PATH=$(sysvinitdir)|' \
-       '|VARLOGDIR=$(varlogdir)|' \
-       '|RC_LOCAL_SCRIPT_PATH_START=$(RC_LOCAL_SCRIPT_PATH_START)|' \
-       '|RC_LOCAL_SCRIPT_PATH_STOP=$(RC_LOCAL_SCRIPT_PATH_STOP)|' \
-       '|PYTHON=$(PYTHON)|' \
-       '|NTP_SERVERS=$(NTP_SERVERS)|' \
-       '|DNS_SERVERS=$(DNS_SERVERS)|' \
-       '|DEFAULT_DNSSEC_MODE=$(DEFAULT_DNSSEC_MODE)|' \
-       '|KILL_USER_PROCESSES=$(KILL_USER_PROCESSES)|' \
-       '|systemuidmax=$(SYSTEM_UID_MAX)|' \
-       '|systemgidmax=$(SYSTEM_GID_MAX)|' \
-       '|TTY_GID=$(TTY_GID)|' \
-       '|systemsleepdir=$(systemsleepdir)|' \
-       '|systemshutdowndir=$(systemshutdowndir)|' \
-       '|binfmtdir=$(binfmtdir)|' \
-       '|modulesloaddir=$(modulesloaddir)|'
-
-SED_PROCESS = \
-	$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
-	$(SED) $(subst '|,-e 's|@,$(subst =,\@|,$(subst |',|g',$(substitutions)))) \
-		< $< > $@
-
-# Stupid test that everything purported to be exported really is
-define generate-sym-test
-	$(AM_V_at)$(MKDIR_P) $(dir $@)
-	$(AM_V_at)printf '#include <stdio.h>\n' > $@
-	$(AM_V_at)printf '#include "%s"\n' $(notdir $(filter %.h, $^)) >> $@
-	$(AM_V_at)printf 'void* functions[] = {\n' >> $@
-	$(AM_V_GEN)sed -r -n 's/^ +([a-zA-Z0-9_]+);/\1,/p' $< >> $@
-	$(AM_V_at)printf '};\nint main(void) {\n' >> $@
-	$(AM_V_at)printf 'unsigned i; for (i=0;i<sizeof(functions)/sizeof(void*);i++) printf("%%p\\n", functions[i]);\n' >> $@
-	$(AM_V_at)printf 'return 0; }\n' >> $@
-endef
-
-include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/build-aux/Makefile.once.tail/.gitignore b/build-aux/Makefile.once.tail/.gitignore
deleted file mode 100644
index e69de29bb2..0000000000
--- a/build-aux/Makefile.once.tail/.gitignore
+++ /dev/null
diff --git a/build-aux/Makefile.once.tail/20-systemd.mk b/build-aux/Makefile.once.tail/20-systemd.mk
deleted file mode 100644
index 7455244e3c..0000000000
--- a/build-aux/Makefile.once.tail/20-systemd.mk
+++ /dev/null
@@ -1,97 +0,0 @@
-#  -*- 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
-
-# Let's run all tests of the test suite, but under valgrind. Let's
-# exclude perl/python/shell scripts we have in there
-.PHONY: valgrind-tests
-valgrind-tests: $(TESTS)
-	$(AM_V_GEN)for f in $(filter-out %.pl %.py, $^); do \
-		if file $$f | grep -q shell; then \
-		echo -e "$${x}Skipping non-binary $$f"; else \
-		echo -e "$${x}Running $$f"; \
-		$(LIBTOOL) --mode=execute valgrind -q --leak-check=full --max-stackframe=5242880 --error-exitcode=55 $(builddir)/$$f ; fi; \
-		x="\n\n"; \
-	done
-
-exported-%: %
-	$(AM_V_GEN)$(NM) -g --defined-only $(builddir)/.libs/$(<:.la=.so) 2>&1 /dev/null | grep " T " | cut -d" " -f3 > $@
-
-exported: $(addprefix exported-, $(lib_LTLIBRARIES))
-	$(AM_V_GEN)sort -u $^ > $@
-
-.PHONY: check-api-docs
-check-api-docs: exported man
-	$(AM_V_GEN)for symbol in `cat exported` ; do \
-		if test -f $(builddir)/man/$$symbol.html ; then \
-			echo "  Symbol $$symbol() is documented." ; \
-		else \
-			echo "‣ Symbol $$symbol() lacks documentation." ; \
-		fi ; \
-	done
-
-OBJECT_VARIABLES:=$(filter %_OBJECTS,$(.VARIABLES))
-ALL_OBJECTS:=$(foreach v,$(OBJECT_VARIABLES),$($(v)))
-
-undefined defined: $(ALL_OBJECTS)
-	$(AM_V_GEN)for f in $(ALL_OBJECTS) ; do \
-		$(NM) -g --$@-only `echo $(builddir)/"$$f" | sed -e 's,\([^/]*\).lo$$,.libs/\1.o,'` ; \
-	done | cut -c 20- | cut -d @ -f 1 | sort -u > $@
-
-CLEANFILES += \
-	defined \
-	undefined
-
-.PHONY: check-api-unused
-check-api-unused: defined undefined exported
-	( cat exported undefined ) | sort -u  | diff -u - defined | grep ^+ | grep -v ^+++ | cut -c2-
-
-.PHONY: check-includes
-check-includes: $(top_srcdir)/tools/check-includes.pl
-	$(AM_V_GEN) find * -name '*.[hcS]' -type f -print | sort -u \
-		| xargs $(top_srcdir)/tools/check-includes.pl
-
-EXTRA_DIST += \
-	$(top_srcdir)/tools/check-includes.pl
-
-.PHONY: cppcheck
-cppcheck:
-	cppcheck --enable=all -q $(top_srcdir)
-
-# Used to extract compile flags for YCM.
-print-%:
-	@echo $($*)
-
-git-contrib:
-	@git shortlog -s `git describe --abbrev=0`.. | cut -c8- | awk '{ print $$0 "," }' | sort -u
-
-EXTRA_DIST += \
-        tools/gdb-sd_dump_hashmaps.py
-
-list-keys:
-	gpg --verbose --no-options --no-default-keyring --no-auto-key-locate --batch --trust-model=always --keyring=$(srcdir)/src/import/import-pubring.gpg --list-keys
-
-add-key:
-	gpg --verbose --no-options --no-default-keyring --no-auto-key-locate --batch --trust-model=always --keyring=$(srcdir)/src/import/import-pubring.gpg --import -
-include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/config.mk.in b/config.mk.in
deleted file mode 100644
index de6b9dad89..0000000000
--- a/config.mk.in
+++ /dev/null
@@ -1,77 +0,0 @@
-#  -*- 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
-
-# Dirs of external packages
-dbuspolicydir=@dbuspolicydir@
-dbussessionservicedir=@dbussessionservicedir@
-dbussystemservicedir=@dbussystemservicedir@
-pamlibdir=@pamlibdir@
-pamconfdir=@pamconfdir@
-pkgconfigdatadir=$(datadir)/pkgconfig
-pkgconfiglibdir=$(libdir)/pkgconfig
-polkitpolicydir=$(datadir)/polkit-1/actions
-bashcompletiondir=@bashcompletiondir@
-zshcompletiondir=@zshcompletiondir@
-rpmmacrosdir=$(prefix)/lib/rpm/macros.d
-sysvinitdir=$(SYSTEM_SYSVINIT_PATH)
-sysvrcnddir=$(SYSTEM_SYSVRCND_PATH)
-varlogdir=$(localstatedir)/log
-systemdstatedir=$(localstatedir)/lib/systemd
-catalogstatedir=$(systemdstatedir)/catalog
-xinitrcdir=$(sysconfdir)/X11/xinit/xinitrc.d
-
-# Our own, non-special dirs
-pkgsysconfdir=$(sysconfdir)/systemd
-userunitdir=$(prefix)/lib/systemd/user
-userpresetdir=$(prefix)/lib/systemd/user-preset
-tmpfilesdir=$(prefix)/lib/tmpfiles.d
-sysusersdir=$(prefix)/lib/sysusers.d
-sysctldir=$(prefix)/lib/sysctl.d
-binfmtdir=$(prefix)/lib/binfmt.d
-modulesloaddir=$(prefix)/lib/modules-load.d
-networkdir=$(rootprefix)/lib/systemd/network
-pkgincludedir=$(includedir)/systemd
-systemgeneratordir=$(rootlibexecdir)/system-generators
-usergeneratordir=$(prefix)/lib/systemd/user-generators
-systemshutdowndir=$(rootlibexecdir)/system-shutdown
-systemsleepdir=$(rootlibexecdir)/system-sleep
-systemunitdir=$(rootprefix)/lib/systemd/system
-systempresetdir=$(rootprefix)/lib/systemd/system-preset
-udevlibexecdir=$(rootprefix)/lib/udev
-udevhomedir=$(udevlibexecdir)
-udevrulesdir=$(udevlibexecdir)/rules.d
-udevhwdbdir=$(udevlibexecdir)/hwdb.d
-catalogdir=$(prefix)/lib/systemd/catalog
-kernelinstalldir = $(prefix)/lib/kernel/install.d
-factory_etcdir = $(datadir)/factory/etc
-factory_pamdir = $(datadir)/factory/etc/pam.d
-bootlibdir = $(prefix)/lib/systemd/boot/efi
-
-# And these are the special ones for /
-rootprefix=@rootprefix@
-rootbindir=$(rootprefix)/bin
-rootlibexecdir=$(rootprefix)/lib/systemd
-
-include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/discard.mk b/discard.mk
deleted file mode 100644
index 42759a0d3b..0000000000
--- a/discard.mk
+++ /dev/null
@@ -1,1144 +0,0 @@
-#  -*- 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
-
-EXTRA_DIST =
-BUILT_SOURCES =
-INSTALL_EXEC_HOOKS =
-UNINSTALL_EXEC_HOOKS =
-INSTALL_DATA_HOOKS =
-UNINSTALL_DATA_HOOKS =
-DISTCLEAN_LOCAL_HOOKS =
-CLEAN_LOCAL_HOOKS =
-pkginclude_HEADERS =
-noinst_LTLIBRARIES =
-lib_LTLIBRARIES =
-include_HEADERS =
-noinst_DATA =
-pkgconfigdata_DATA =
-pkgconfiglib_DATA =
-polkitpolicy_in_in_files =
-polkitpolicy_in_files =
-polkitpolicy_files =
-dist_udevrules_DATA =
-nodist_udevrules_DATA =
-dist_pkgsysconf_DATA =
-nodist_pkgsysconf_DATA =
-dist_dbuspolicy_DATA =
-dist_dbussystemservice_DATA =
-dist_systemunit_DATA_busnames =
-dist_sysusers_DATA =
-check_PROGRAMS =
-check_DATA =
-tests=
-manual_tests =
-TEST_EXTENSIONS = .py
-PY_LOG_COMPILER = $(PYTHON)
-DISABLE_HARD_ERRORS = yes
-ifneq ($(ENABLE_TESTS),)
-noinst_PROGRAMS = $(manual_tests) $(tests) $(unsafe_tests)
-TESTS = $(tests)
-ifneq ($(ENABLE_UNSAFE_TESTS),)
-TESTS += \
-	$(unsafe_tests)
-endif
-else
-noinst_PROGRAMS =
-TESTS =
-endif # ENABLE_TESTS
-ifneq ($(ENABLE_BASH_COMPLETION),)
-dist_bashcompletion_DATA = $(dist_bashcompletion_data)
-nodist_bashcompletion_DATA = $(nodist_bashcompletion_data)
-endif # ENABLE_BASH_COMPLETION
-ifneq ($(ENABLE_ZSH_COMPLETION),)
-dist_zshcompletion_DATA = $(dist_zshcompletion_data)
-nodist_zshcompletion_DATA = $(nodist_zshcompletion_data)
-endif # ENABLE_ZSH_COMPLETION
-udevlibexec_PROGRAMS =
-gperf_gperf_sources =
-
-in_files = $(filter %.in,$(EXTRA_DIST))
-in_in_files = $(filter %.in.in, $(in_files))
-m4_files = $(filter %.m4,$(EXTRA_DIST) $(in_files:.m4.in=.m4))
-
-CLEANFILES = $(BUILT_SOURCES) \
-	$(pkgconfigdata_DATA) \
-	$(pkgconfiglib_DATA) \
-	$(nodist_bashcompletion_data) \
-	$(nodist_zshcompletion_data) \
-	$(in_files:.in=) $(in_in_files:.in.in=) \
-	$(m4_files:.m4=)
-
-.PHONY: $(INSTALL_EXEC_HOOKS) $(UNINSTALL_EXEC_HOOKS) \
-	$(INSTALL_DATA_HOOKS) $(UNINSTALL_DATA_HOOKS) \
-	$(DISTCLEAN_LOCAL_HOOKS) $(CLEAN_LOCAL_HOOKS)
-
-AM_CPPFLAGS = \
-	-include $(top_builddir)/config.h \
-	-DPKGSYSCONFDIR=\"$(pkgsysconfdir)\" \
-	-DSYSTEM_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/system\" \
-	-DSYSTEM_DATA_UNIT_PATH=\"$(systemunitdir)\" \
-	-DSYSTEM_SYSVINIT_PATH=\"$(SYSTEM_SYSVINIT_PATH)\" \
-	-DSYSTEM_SYSVRCND_PATH=\"$(SYSTEM_SYSVRCND_PATH)\" \
-	-DUSER_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/user\" \
-	-DUSER_DATA_UNIT_PATH=\"$(userunitdir)\" \
-	-DCERTIFICATE_ROOT=\"$(CERTIFICATEROOT)\" \
-	-DCATALOG_DATABASE=\"$(catalogstatedir)/database\" \
-	-DSYSTEMD_CGROUP_AGENT_PATH=\"$(rootlibexecdir)/systemd-cgroups-agent\" \
-	-DSYSTEMD_BINARY_PATH=\"$(rootlibexecdir)/systemd\" \
-	-DSYSTEMD_FSCK_PATH=\"$(rootlibexecdir)/systemd-fsck\" \
-	-DSYSTEMD_SHUTDOWN_BINARY_PATH=\"$(rootlibexecdir)/systemd-shutdown\" \
-	-DSYSTEMD_SLEEP_BINARY_PATH=\"$(rootlibexecdir)/systemd-sleep\" \
-	-DSYSTEMCTL_BINARY_PATH=\"$(rootbindir)/systemctl\" \
-	-DSYSTEMD_TTY_ASK_PASSWORD_AGENT_BINARY_PATH=\"$(rootbindir)/systemd-tty-ask-password-agent\" \
-	-DSYSTEMD_STDIO_BRIDGE_BINARY_PATH=\"$(bindir)/systemd-stdio-bridge\" \
-	-DROOTPREFIX=\"$(rootprefix)\" \
-	-DRANDOM_SEED_DIR=\"$(localstatedir)/lib/systemd/\" \
-	-DRANDOM_SEED=\"$(localstatedir)/lib/systemd/random-seed\" \
-	-DSYSTEMD_CRYPTSETUP_PATH=\"$(rootlibexecdir)/systemd-cryptsetup\" \
-	-DSYSTEM_GENERATOR_PATH=\"$(systemgeneratordir)\" \
-	-DUSER_GENERATOR_PATH=\"$(usergeneratordir)\" \
-	-DSYSTEM_SHUTDOWN_PATH=\"$(systemshutdowndir)\" \
-	-DSYSTEM_SLEEP_PATH=\"$(systemsleepdir)\" \
-	-DSYSTEMD_KBD_MODEL_MAP=\"$(pkgdatadir)/kbd-model-map\" \
-	-DSYSTEMD_LANGUAGE_FALLBACK_MAP=\"$(pkgdatadir)/language-fallback-map\" \
-	-DUDEVLIBEXECDIR=\"$(udevlibexecdir)\" \
-	-DPOLKIT_AGENT_BINARY_PATH=\"$(bindir)/pkttyagent\" \
-	-DQUOTACHECK=\"$(QUOTACHECK)\" \
-	-DKEXEC=\"$(KEXEC)\" \
-	-DMOUNT_PATH=\"$(MOUNT_PATH)\" \
-	-DUMOUNT_PATH=\"$(UMOUNT_PATH)\" \
-	-DLIBDIR=\"$(libdir)\" \
-	-DROOTLIBDIR=\"$(rootlibdir)\" \
-	-DROOTLIBEXECDIR=\"$(rootlibexecdir)\" \
-	-DTEST_DIR=\"$(abs_top_srcdir)/test\" \
-	-I $(top_srcdir)/src \
-	-I $(top_builddir)/src/basic \
-	-I $(top_srcdir)/src/basic \
-	-I $(top_srcdir)/src/shared \
-	-I $(top_builddir)/src/shared \
-	-I $(top_srcdir)/src/network \
-	-I $(top_srcdir)/src/login \
-	-I $(top_srcdir)/src/journal \
-	-I $(top_builddir)/src/journal \
-	-I $(top_srcdir)/src/timedate \
-	-I $(top_srcdir)/src/timesync \
-	-I $(top_srcdir)/src/nspawn \
-	-I $(top_srcdir)/src/resolve \
-	-I $(top_builddir)/src/resolve \
-	-I $(top_srcdir)/src/systemd \
-	-I $(top_builddir)/src/core \
-	-I $(top_srcdir)/src/core \
-	-I $(top_srcdir)/src/libudev \
-	-I $(top_srcdir)/src/udev \
-	-I $(top_srcdir)/src/udev/net \
-	-I $(top_builddir)/src/udev \
-	-I $(top_srcdir)/src/libsystemd/sd-bus \
-	-I $(top_srcdir)/src/libsystemd/sd-event \
-	-I $(top_srcdir)/src/libsystemd/sd-login \
-	-I $(top_srcdir)/src/libsystemd/sd-netlink \
-	-I $(top_srcdir)/src/libsystemd/sd-network \
-	-I $(top_srcdir)/src/libsystemd/sd-hwdb \
-	-I $(top_srcdir)/src/libsystemd/sd-device \
-	-I $(top_srcdir)/src/libsystemd-network \
-	$(OUR_CPPFLAGS)
-
-AM_CFLAGS = $(OUR_CFLAGS)
-AM_LDFLAGS = $(OUR_LDFLAGS)
-
-# ------------------------------------------------------------------------------
-define move-to-rootlibdir
-	if test "$(libdir)" != "$(rootlibdir)"; then \
-		$(MKDIR_P) $(DESTDIR)$(rootlibdir) && \
-		so_img_name=$$(readlink $(DESTDIR)$(libdir)/$$libname) && \
-		rm -f $(DESTDIR)$(libdir)/$$libname && \
-		$(LN_S) --relative -f $(DESTDIR)$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/$$libname && \
-		mv $(DESTDIR)$(libdir)/$$libname.* $(DESTDIR)$(rootlibdir); \
-	fi
-endef
-
-INSTALL_DIRS =
-
-SHUTDOWN_TARGET_WANTS =
-LOCAL_FS_TARGET_WANTS =
-MULTI_USER_TARGET_WANTS =
-GRAPHICAL_TARGET_WANTS =
-RESCUE_TARGET_WANTS =
-SYSINIT_TARGET_WANTS =
-SOCKETS_TARGET_WANTS =
-BUSNAMES_TARGET_WANTS =
-TIMERS_TARGET_WANTS =
-USER_SOCKETS_TARGET_WANTS =
-USER_DEFAULT_TARGET_WANTS =
-USER_BUSNAMES_TARGET_WANTS =
-
-SYSTEM_UNIT_ALIASES =
-USER_UNIT_ALIASES =
-GENERAL_ALIASES =
-
-install-target-wants-hook:
-	what="$(SHUTDOWN_TARGET_WANTS)" && wants=shutdown.target && dir=$(systemunitdir) && $(add-wants)
-	what="$(LOCAL_FS_TARGET_WANTS)" && wants=local-fs.target && dir=$(systemunitdir) && $(add-wants)
-	what="$(MULTI_USER_TARGET_WANTS)" && wants=multi-user.target && dir=$(systemunitdir) && $(add-wants)
-	what="$(GRAPHICAL_TARGET_WANTS)" && wants=graphical.target && dir=$(systemunitdir) && $(add-wants)
-	what="$(RESCUE_TARGET_WANTS)" && wants=rescue.target && dir=$(systemunitdir) && $(add-wants)
-	what="$(SYSINIT_TARGET_WANTS)" && wants=sysinit.target && dir=$(systemunitdir) && $(add-wants)
-	what="$(SOCKETS_TARGET_WANTS)" && wants=sockets.target && dir=$(systemunitdir) && $(add-wants)
-	what="$(TIMERS_TARGET_WANTS)" && wants=timers.target && dir=$(systemunitdir) && $(add-wants)
-	what="$(SLICES_TARGET_WANTS)" && wants=slices.target && dir=$(systemunitdir) && $(add-wants)
-	what="$(USER_SOCKETS_TARGET_WANTS)" && wants=sockets.target && dir=$(userunitdir) && $(add-wants)
-	what="$(USER_DEFAULT_TARGET_WANTS)" && wants=default.target && dir=$(userunitdir) && $(add-wants)
-
-install-busnames-target-wants-hook:
-	what="$(BUSNAMES_TARGET_WANTS)" && wants=busnames.target && dir=$(systemunitdir) && $(add-wants)
-	what="$(USER_BUSNAMES_TARGET_WANTS)" && wants=busnames.target && dir=$(userunitdir) && $(add-wants)
-
-define add-wants
-	[ -z "$$what" ] || ( \
-	  dir=$(DESTDIR)$$dir/$$wants.wants && \
-	  $(MKDIR_P) -m 0755 $$dir && \
-	  cd $$dir && \
-	  rm -f $$what && \
-	  for i in $$what; do $(LN_S) ../$$i . || exit $$? ; done )
-endef
-
-install-directories-hook:
-	$(MKDIR_P) $(addprefix $(DESTDIR),$(INSTALL_DIRS))
-
-install-aliases-hook:
-	set -- $(SYSTEM_UNIT_ALIASES) && \
-		dir=$(systemunitdir) && $(install-aliases)
-	set -- $(USER_UNIT_ALIASES) && \
-		dir=$(userunitdir) && $(install-relative-aliases)
-	set -- $(GENERAL_ALIASES) && \
-		dir= && $(install-relative-aliases)
-
-define install-aliases
-	while [ -n "$$1" ]; do \
-		$(MKDIR_P) `dirname $(DESTDIR)$$dir/$$2` && \
-		rm -f $(DESTDIR)$$dir/$$2 && \
-		$(LN_S) $$1 $(DESTDIR)$$dir/$$2 && \
-		shift 2 || exit $$?; \
-	done
-endef
-
-define install-relative-aliases
-	while [ -n "$$1" ]; do \
-		$(MKDIR_P) `dirname $(DESTDIR)$$dir/$$2` && \
-		rm -f $(DESTDIR)$$dir/$$2 && \
-		$(LN_S) --relative $(DESTDIR)$$1 $(DESTDIR)$$dir/$$2 && \
-		shift 2 || exit $$?; \
-	done
-endef
-
-install-touch-usr-hook:
-	touch -c $(DESTDIR)/$(prefix)
-
-INSTALL_EXEC_HOOKS += \
-	install-target-wants-hook \
-	install-directories-hook \
-	install-aliases-hook \
-	install-touch-usr-hook
-
-INSTALL_EXEC_HOOKS += \
-	install-busnames-target-wants-hook
-
-dist_bashcompletion_data = \
-	shell-completion/bash/busctl \
-	shell-completion/bash/journalctl \
-	shell-completion/bash/systemd-analyze \
-	shell-completion/bash/systemd-cat \
-	shell-completion/bash/systemd-cgls \
-	shell-completion/bash/systemd-cgtop \
-	shell-completion/bash/systemd-delta \
-	shell-completion/bash/systemd-detect-virt \
-	shell-completion/bash/systemd-nspawn \
-	shell-completion/bash/systemd-path \
-	shell-completion/bash/systemd-run \
-	shell-completion/bash/udevadm \
-	shell-completion/bash/kernel-install
-
-nodist_bashcompletion_data = \
-	shell-completion/bash/systemctl
-
-dist_zshcompletion_data = \
-	shell-completion/zsh/_busctl \
-	shell-completion/zsh/_journalctl \
-	shell-completion/zsh/_udevadm \
-	shell-completion/zsh/_kernel-install \
-	shell-completion/zsh/_systemd-nspawn \
-	shell-completion/zsh/_systemd-analyze \
-	shell-completion/zsh/_systemd-run \
-	shell-completion/zsh/_sd_hosts_or_user_at_host \
-	shell-completion/zsh/_sd_outputmodes \
-	shell-completion/zsh/_sd_unit_files \
-	shell-completion/zsh/_systemd-delta \
-	shell-completion/zsh/_systemd
-
-nodist_zshcompletion_data = \
-	shell-completion/zsh/_systemctl
-
-EXTRA_DIST += \
-	shell-completion/bash/systemctl.in \
-	shell-completion/zsh/_systemctl.in
-
-dist_sysctl_DATA = \
-	sysctl.d/50-default.conf
-
-dist_systemunit_DATA = \
-	units/graphical.target \
-	units/multi-user.target \
-	units/emergency.target \
-	units/sysinit.target \
-	units/basic.target \
-	units/getty.target \
-	units/halt.target \
-	units/kexec.target \
-	units/exit.target \
-	units/local-fs.target \
-	units/local-fs-pre.target \
-	units/initrd.target \
-	units/initrd-fs.target \
-	units/initrd-root-device.target \
-	units/initrd-root-fs.target \
-	units/remote-fs.target \
-	units/remote-fs-pre.target \
-	units/network.target \
-	units/network-pre.target \
-	units/network-online.target \
-	units/nss-lookup.target \
-	units/nss-user-lookup.target \
-	units/poweroff.target \
-	units/reboot.target \
-	units/rescue.target \
-	units/rpcbind.target \
-	units/time-sync.target \
-	units/shutdown.target \
-	units/final.target \
-	units/umount.target \
-	units/sigpwr.target \
-	units/sleep.target \
-	units/sockets.target \
-	units/timers.target \
-	units/paths.target \
-	units/suspend.target \
-	units/swap.target \
-	units/slices.target \
-	units/system.slice \
-	units/x-.slice \
-	units/systemd-initctl.socket \
-	units/syslog.socket \
-	units/dev-hugepages.mount \
-	units/dev-mqueue.mount \
-	units/sys-kernel-config.mount \
-	units/sys-kernel-debug.mount \
-	units/sys-fs-fuse-connections.mount \
-	units/tmp.mount \
-	units/var-lib-machines.mount \
-	units/printer.target \
-	units/sound.target \
-	units/bluetooth.target \
-	units/smartcard.target \
-	units/systemd-ask-password-wall.path \
-	units/systemd-ask-password-console.path \
-	units/systemd-udevd-control.socket \
-	units/systemd-udevd-kernel.socket \
-	units/system-update.target \
-	units/initrd-switch-root.target \
-	units/machines.target
-
-dist_systemunit_DATA += \
-	$(dist_systemunit_DATA_busnames)
-
-dist_systemunit_DATA_busnames += \
-	units/busnames.target
-
-nodist_systemunit_DATA = \
-	units/getty@.service \
-	units/serial-getty@.service \
-	units/console-shell.service \
-	units/console-getty.service \
-	units/container-getty@.service \
-	units/systemd-initctl.service \
-	units/systemd-remount-fs.service \
-	units/systemd-ask-password-wall.service \
-	units/systemd-ask-password-console.service \
-	units/systemd-sysctl.service \
-	units/emergency.service \
-	units/rescue.service \
-	units/user@.service \
-	units/systemd-suspend.service \
-	units/systemd-halt.service \
-	units/systemd-poweroff.service \
-	units/systemd-reboot.service \
-	units/systemd-kexec.service \
-	units/systemd-exit.service \
-	units/systemd-fsck@.service \
-	units/systemd-fsck-root.service \
-	units/systemd-machine-id-commit.service \
-	units/systemd-udevd.service \
-	units/systemd-udev-trigger.service \
-	units/systemd-udev-settle.service \
-	units/systemd-hwdb-update.service \
-	units/debug-shell.service \
-	units/initrd-parse-etc.service \
-	units/initrd-cleanup.service \
-	units/initrd-udevadm-cleanup-db.service \
-	units/initrd-switch-root.service \
-	units/systemd-nspawn@.service \
-	units/systemd-update-done.service
-
-ifneq ($(HAVE_UTMP),)
-nodist_systemunit_DATA += \
-	units/systemd-update-utmp.service \
-	units/systemd-update-utmp-runlevel.service
-endif # HAVE_UTMP
-
-dist_userunit_DATA = \
-	units/user/basic.target \
-	units/user/default.target \
-	units/user/exit.target
-
-nodist_userunit_DATA = \
-	units/user/systemd-exit.service
-
-dist_systempreset_DATA = \
-	system-preset/90-systemd.preset
-
-EXTRA_DIST += \
-	units/getty@.service.m4 \
-	units/serial-getty@.service.m4 \
-	units/console-shell.service.m4.in \
-	units/console-getty.service.m4.in \
-	units/container-getty@.service.m4.in \
-	units/rescue.service.in \
-	units/systemd-initctl.service.in \
-	units/systemd-remount-fs.service.in \
-	units/systemd-update-utmp.service.in \
-	units/systemd-update-utmp-runlevel.service.in \
-	units/systemd-ask-password-wall.service.in \
-	units/systemd-ask-password-console.service.in \
-	units/systemd-sysctl.service.in \
-	units/emergency.service.in \
-	units/systemd-halt.service.in \
-	units/systemd-poweroff.service.in \
-	units/systemd-reboot.service.in \
-	units/systemd-kexec.service.in \
-	units/systemd-exit.service.in \
-	units/user/systemd-exit.service.in \
-	units/systemd-fsck@.service.in \
-	units/systemd-fsck-root.service.in \
-	units/systemd-machine-id-commit.service.in \
-	units/user@.service.m4.in \
-	units/debug-shell.service.in \
-	units/systemd-suspend.service.in \
-	units/quotaon.service.in \
-	units/initrd-parse-etc.service.in \
-	units/initrd-cleanup.service.in \
-	units/initrd-udevadm-cleanup-db.service.in \
-	units/initrd-switch-root.service.in \
-	units/systemd-nspawn@.service.in \
-	units/systemd-update-done.service.in \
-    units/tmp.mount.m4
-
-ifneq ($(HAVE_SYSV_COMPAT),)
-nodist_systemunit_DATA += \
-	units/rc-local.service \
-	units/halt-local.service
-
-systemgenerator_PROGRAMS += \
-	systemd-sysv-generator \
-	systemd-rc-local-generator
-endif # HAVE_SYSV_COMPAT
-
-EXTRA_DIST += \
-	src/systemctl/systemd-sysv-install.SKELETON \
-	units/rc-local.service.in \
-	units/halt-local.service.in
-
-# automake is broken and can't handle files with a dash in front
-# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=14728#8
-units-install-hook:
-	mv $(DESTDIR)$(systemunitdir)/x-.slice $(DESTDIR)/$(systemunitdir)/-.slice
-
-units-uninstall-hook:
-	rm -f $(DESTDIR)/$(systemunitdir)/-.slice
-
-INSTALL_DATA_HOOKS += units-install-hook
-UNINSTALL_DATA_HOOKS += units-uninstall-hook
-
-dist_doc_DATA = \
-	README \
-	NEWS \
-	CODING_STYLE \
-	LICENSE.LGPL2.1 \
-	LICENSE.GPL2 \
-	DISTRO_PORTING \
-	src/libsystemd/sd-bus/PORTING-DBUS1 \
-	src/libsystemd/sd-bus/DIFFERENCES \
-	src/libsystemd/sd-bus/GVARIANT-SERIALIZATION
-
-EXTRA_DIST += \
-	README.md \
-	autogen.sh \
-	.dir-locals.el \
-	.editorconfig \
-	.vimrc \
-	.ycm_extra_conf.py \
-	.travis.yml \
-	.mailmap
-
-@INTLTOOL_POLICY_RULE@
-
-# ------------------------------------------------------------------------------
-
-MANPAGES =
-MANPAGES_ALIAS =
-
-include Makefile-man.am
-
-.PHONY: man update-man-list
-man: $(MANPAGES) $(MANPAGES_ALIAS) $(HTML_FILES) $(HTML_ALIAS)
-
-XML_FILES = \
-	${patsubst %.1,%.xml,${patsubst %.3,%.xml,${patsubst %.5,%.xml,${patsubst %.7,%.xml,${patsubst %.8,%.xml,$(MANPAGES)}}}}}
-HTML_FILES = \
-	${XML_FILES:.xml=.html}
-HTML_ALIAS = \
-	${patsubst %.1,%.html,${patsubst %.3,%.html,${patsubst %.5,%.html,${patsubst %.7,%.html,${patsubst %.8,%.html,$(MANPAGES_ALIAS)}}}}}
-
-ifneq ($(ENABLE_MANPAGES),)
-man_MANS = \
-	$(MANPAGES) \
-	$(MANPAGES_ALIAS)
-
-noinst_DATA += \
-	$(HTML_FILES) \
-	$(HTML_ALIAS) \
-	docs/html/man
-endif # ENABLE_MANPAGES
-
-CLEANFILES += \
-	$(man_MANS) \
-	$(HTML_FILES) \
-	$(HTML_ALIAS) \
-	docs/html/man
-
-$(outdir)/man:
-	$(AM_V_at)$(MKDIR_P) $(dir $@)
-	$(AM_V_LN)$(LN_S) -f ../../man $@
-
-$(outdir)/index.html: man/systemd.index.html
-	$(AM_V_LN)$(LN_S) -f systemd.index.html $@
-
-ifneq ($(HAVE_PYTHON),)
-noinst_DATA += \
-	man/index.html
-endif # HAVE_PYTHON
-
-CLEANFILES += \
-	man/index.html
-
-XML_GLOB = $(wildcard $(top_srcdir)/man/*.xml)
-NON_INDEX_XML_FILES = $(filter-out man/systemd.index.xml,$(XML_FILES))
-SOURCE_XML_FILES = ${patsubst %,$(top_srcdir)/%,$(filter-out man/systemd.directives.xml,$(NON_INDEX_XML_FILES))}
-
-# This target should only be run manually. It recreates Makefile-man.am
-# file in the source directory based on all man/*.xml files. Run it after
-# adding, removing, or changing the conditional in a man page.
-update-man-list: $(top_srcdir)/tools/make-man-rules.py $(XML_GLOB) man/custom-entities.ent
-	$(AM_V_GEN)$(PYTHON) $< $(XML_GLOB) > $(top_srcdir)/Makefile-man.tmp
-	$(AM_V_at)mv $(top_srcdir)/Makefile-man.tmp $(top_srcdir)/Makefile-man.am
-	@echo "Makefile-man.am has been regenerated"
-
-$(outdir)/systemd.index.xml: $(top_srcdir)/tools/make-man-index.py $(NON_INDEX_XML_FILES)
-	$(AM_V_at)$(MKDIR_P) $(dir $@)
-	$(AM_V_GEN)$(PYTHON) $< $@ $(filter-out $<,$^)
-
-$(outdir)/systemd.directives.xml: $(top_srcdir)/tools/make-directive-index.py man/custom-entities.ent $(SOURCE_XML_FILES)
-	$(AM_V_at)$(MKDIR_P) $(dir $@)
-	$(AM_V_GEN)$(PYTHON) $< $@ $(SOURCE_XML_FILES)
-
-CLEANFILES += \
-	man/systemd.index.xml \
-	man/systemd.directives.xml
-
-EXTRA_DIST += \
-	$(filter-out man/systemd.directives.xml man/systemd.index.xml,$(XML_FILES)) \
-	tools/make-man-index.py \
-	tools/make-man-rules.py \
-	tools/make-directive-index.py \
-	tools/xml_helper.py \
-	man/glib-event-glue.c
-
-ifneq ($(ENABLE_LDCONFIG),)
-dist_systemunit_DATA += \
-	units/ldconfig.service
-
-SYSINIT_TARGET_WANTS += \
-	ldconfig.service
-endif # ENABLE_LDCONFIG
-
-gperf_gperf_m4_sources = \
-	src/core/load-fragment-gperf.gperf.m4
-
-gperf_txt_sources = \
-	src/basic/errno-list.txt \
-	src/basic/af-list.txt \
-	src/basic/arphrd-list.txt \
-	src/basic/cap-list.txt
-
-BUILT_SOURCES += \
-	$(gperf_gperf_m4_sources:-gperf.gperf.m4=-gperf.c) \
-	$(gperf_gperf_m4_sources:-gperf.gperf.m4=-gperf-nulstr.c) \
-	$(gperf_gperf_sources:-gperf.gperf=-gperf.c) \
-	$(gperf_txt_sources:-list.txt=-from-name.h) \
-	$(filter-out %keyboard-keys-to-name.h,$(gperf_txt_sources:-list.txt=-to-name.h))
-
-CLEANFILES += \
-	$(gperf_txt_sources:-list.txt=-from-name.gperf)
-DISTCLEANFILES = \
-	$(gperf_txt_sources)
-
-EXTRA_DIST += \
-	$(gperf_gperf_m4_sources) \
-	$(gperf_gperf_sources)
-
-CLEANFILES += \
-	$(gperf_txt_sources)
-
-## .PHONY so it always rebuilds it
-.PHONY: coverage lcov-run lcov-report coverage-sync
-
-# run lcov from scratch, always
-coverage: all
-	$(MAKE) lcov-run
-	$(MAKE) lcov-report
-
-coverage_dir = coverage
-coverage_opts = --base-directory $(srcdir) --directory $(builddir) --rc 'geninfo_adjust_src_path=$(abspath $(srcdir))=>$(abspath $(builddir))'
-
-ifneq ($(ENABLE_COVERAGE),)
-# reset run coverage tests
-lcov-run:
-	@rm -rf $(coverage_dir)
-	lcov $(coverage_opts) --zerocounters
-	-$(MAKE) check
-
-# generate report based on current coverage data
-lcov-report:
-	$(MKDIR_P) $(coverage_dir)
-	lcov $(coverage_opts) --compat-libtool --capture --no-external \
-		| sed 's|$(abspath $(builddir))|$(abspath $(srcdir))|' > $(coverage_dir)/.lcov.info
-	lcov --remove $(coverage_dir)/.lcov.info --output-file $(coverage_dir)/.lcov-clean.info 'test-*'
-	genhtml -t "systemd test coverage" -o $(coverage_dir) $(coverage_dir)/.lcov-clean.info
-	@echo "Coverage report generated in $(abs_builddir)/$(coverage_dir)/index.html"
-
-# lcov doesn't work properly with vpath builds, make sure that bad
-# output is not uploaded by mistake.
-coverage-sync: coverage
-	test "$(builddir)" = "$(srcdir)"
-	rsync -rlv --delete --omit-dir-times coverage/ $(www_target)/coverage
-
-else
-lcov-run lcov-report:
-	echo "Need to reconfigure with --enable-coverage"
-endif # ENABLE_COVERAGE
-
-dist_factory_etc_DATA = \
-	factory/etc/nsswitch.conf
-
-ifneq ($(HAVE_PAM),)
-dist_factory_pam_DATA = \
-	factory/etc/pam.d/system-auth \
-	factory/etc/pam.d/other
-endif # HAVE_PAM
-
-libsystemd-install-hook:
-	libname=libsystemd.so && $(move-to-rootlibdir)
-
-libsystemd-uninstall-hook:
-	rm -f $(DESTDIR)$(rootlibdir)/libsystemd.so*
-
-INSTALL_EXEC_HOOKS += libsystemd-install-hook
-UNINSTALL_EXEC_HOOKS += libsystemd-uninstall-hook
-
-# move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
-libudev-install-hook:
-	libname=libudev.so && $(move-to-rootlibdir)
-
-libudev-uninstall-hook:
-	rm -f $(DESTDIR)$(rootlibdir)/libudev.so*
-
-INSTALL_EXEC_HOOKS += libudev-install-hook
-UNINSTALL_EXEC_HOOKS += libudev-uninstall-hook
-
-ifneq ($(ENABLE_TESTS),)
-TESTS += \
-	test/udev-test.pl
-
-ifneq ($(HAVE_PYTHON),)
-TESTS += \
-	test/rule-syntax-check.py
-
-ifneq ($(HAVE_SYSV_COMPAT),)
-TESTS += \
-	test/sysv-generator-test.py
-endif # HAVE_SYSV_COMPAT
-endif # HAVE_PYTHON
-endif # ENABLE_TESTS
-
-tests += \
-	test-libudev
-
-manual_tests += \
-	test-udev
-
-test_libudev_SOURCES = \
-	src/test/test-libudev.c
-
-test_libudev_LDADD = \
-	libshared.la
-
-test_udev_SOURCES = \
-	src/test/test-udev.c
-
-test_udev_LDADD = \
-	libudev-core.la  \
-	$(BLKID_LIBS) \
-	$(KMOD_LIBS)
-
-ifneq ($(ENABLE_TESTS),)
-check_DATA += \
-	test/sys
-endif # ENABLE_TESTS
-
-# packed sysfs test tree
-$(outdir)/sys: test/sys.tar.xz
-	-rm -rf test/sys
-	$(AM_V_at)$(MKDIR_P) $(dir $@)
-	$(AM_V_GEN)tar -C test/ -xJf $(top_srcdir)/test/sys.tar.xz
-	-touch test/sys
-
-test-sys-distclean:
-	-rm -rf test/sys
-DISTCLEAN_LOCAL_HOOKS += test-sys-distclean
-
-EXTRA_DIST += \
-	test/sys.tar.xz \
-	test/udev-test.pl \
-	test/rule-syntax-check.py \
-	test/sysv-generator-test.py \
-	test/mocks/fsck
-
-test_nss_SOURCES = \
-	src/test/test-nss.c
-
-test_nss_LDADD = \
-	libsystemd-internal.la \
-	-ldl
-
-manual_tests += \
-	test-nss
-
-EXTRA_DIST += \
-	test/Makefile \
-	test/README.testsuite \
-	test/TEST-01-BASIC \
-	test/TEST-01-BASIC/Makefile \
-	test/TEST-01-BASIC/test.sh \
-	test/TEST-02-CRYPTSETUP \
-	test/TEST-02-CRYPTSETUP/Makefile \
-	test/TEST-02-CRYPTSETUP/test.sh \
-	test/TEST-03-JOBS \
-	test/TEST-03-JOBS/Makefile \
-	test/TEST-03-JOBS/test-jobs.sh \
-	test/TEST-03-JOBS/test.sh \
-	test/TEST-04-JOURNAL/Makefile \
-	test/TEST-04-JOURNAL/test-journal.sh \
-	test/TEST-04-JOURNAL/test.sh \
-	test/TEST-05-RLIMITS/Makefile \
-	test/TEST-05-RLIMITS/test-rlimits.sh \
-	test/TEST-05-RLIMITS/test.sh \
-	test/TEST-06-SELINUX/Makefile \
-	test/TEST-06-SELINUX/test-selinux-checks.sh \
-	test/TEST-06-SELINUX/test.sh \
-	test/TEST-06-SELINUX/systemd_test.te \
-	test/TEST-06-SELINUX/systemd_test.if \
-	test/TEST-07-ISSUE-1981/Makefile \
-	test/TEST-07-ISSUE-1981/test-segfault.sh \
-	test/TEST-07-ISSUE-1981/test.sh \
-	test/TEST-08-ISSUE-2730/Makefile \
-	test/TEST-08-ISSUE-2730/test.sh \
-	test/TEST-09-ISSUE-2691/Makefile \
-	test/TEST-09-ISSUE-2691/test.sh \
-	test/TEST-10-ISSUE-2467/Makefile \
-	test/TEST-10-ISSUE-2467/test.sh \
-	test/TEST-11-ISSUE-3166/Makefile \
-	test/TEST-11-ISSUE-3166/test.sh \
-	test/TEST-12-ISSUE-3171/Makefile \
-	test/TEST-12-ISSUE-3171/test.sh \
-	test/test-functions
-
-EXTRA_DIST += \
-	test/loopy2.service \
-	test/loopy3.service \
-	test/loopy4.service \
-	test/loopy.service \
-	test/loopy.service.d \
-	test/loopy.service.d/compat.conf
-
-$(outdir)/%: units/%.in
-	$(SED_PROCESS)
-
-$(outdir)/%: man/%.in
-	$(SED_PROCESS)
-
-%.pc: %.pc.in
-	$(SED_PROCESS)
-
-%.conf: %.conf.in
-	$(SED_PROCESS)
-
-$(outdir)/%.systemd: src/core/%.systemd.in
-	$(SED_PROCESS)
-
-$(outdir)/%.policy.in: src/%.policy.in.in
-	$(SED_PROCESS)
-
-$(outdir)/%: shell-completion/%.in
-	$(SED_PROCESS)
-
-%.rules: %.rules.in
-	$(SED_PROCESS)
-
-%.conf: %.conf.in
-	$(SED_PROCESS)
-
-$(outdir)/%: sysusers.d/%.m4 $(top_builddir)/config.status
-	$(AM_V_at)$(MKDIR_P) $(dir $@)
-	$(AM_V_M4)$(M4) -P $(M4_DEFINES) < $< > $@
-
-$(outdir)/%: tmpfiles.d/%.m4 $(top_builddir)/config.status
-	$(AM_V_at)$(MKDIR_P) $(dir $@)
-	$(AM_V_M4)$(M4) -P $(M4_DEFINES) < $< > $@
-
-
-$(outdir)/%: units/%.m4 $(top_builddir)/config.status
-	$(AM_V_at)$(MKDIR_P) $(dir $@)
-	$(AM_V_M4)$(M4) -P $(M4_DEFINES) -DFOR_SYSTEM=1 < $< > $@
-
-$(outdir)/%: units/user/%.m4 $(top_builddir)/config.status
-	$(AM_V_at)$(MKDIR_P) $(dir $@)
-	$(AM_V_M4)$(M4) -P $(M4_DEFINES) -DFOR_USER=1 < $< > $@
-
-ifneq ($(ENABLE_POLKIT),)
-nodist_polkitpolicy_DATA = \
-	$(polkitpolicy_files) \
-	$(polkitpolicy_in_in_files:.policy.in.in=.policy)
-endif # ENABLE_POLKIT
-
-EXTRA_DIST += \
-	$(polkitpolicy_in_files) \
-	$(polkitpolicy_in_in_files)
-
-# ------------------------------------------------------------------------------
-$(outdir)/custom-entities.ent: configure.ac
-	$(AM_V_GEN)$(MKDIR_P) $(dir $@)
-	$(AM_V_GEN)(echo '<?xml version="1.0" encoding="utf-8" ?>' && \
-	 printf '$(subst '|,<!ENTITY ,$(subst =, ",$(subst |',">\n,$(substitutions))))') \
-	 > $@ # '
-
-CLEANFILES += \
-	man/custom-entities.ent
-
-XSLTPROC_FLAGS = \
-	--nonet \
-	--xinclude \
-	--stringparam man.output.quietly 1 \
-	--stringparam funcsynopsis.style ansi \
-	--stringparam man.authors.section.enabled 0 \
-	--stringparam man.copyright.section.enabled 0 \
-	--stringparam systemd.version $(VERSION) \
-	--path '$(builddir)/man:$(srcdir)/man'
-
-XSLT = $(if $(XSLTPROC), $(XSLTPROC), xsltproc)
-XSLTPROC_PROCESS_MAN = \
-	$(AM_V_XSLT)$(XSLT) -o $@ $(XSLTPROC_FLAGS) $(srcdir)/man/custom-man.xsl $<
-
-XSLTPROC_PROCESS_HTML = \
-	$(AM_V_XSLT)$(XSLT) -o $@ $(XSLTPROC_FLAGS) $(srcdir)/man/custom-html.xsl $<
-
-$(outdir)/%.1: man/%.xml man/custom-man.xsl man/custom-entities.ent
-	$(XSLTPROC_PROCESS_MAN)
-
-$(outdir)/%.3: man/%.xml man/custom-man.xsl man/custom-entities.ent
-	$(XSLTPROC_PROCESS_MAN)
-
-$(outdir)/%.5: man/%.xml man/custom-man.xsl man/custom-entities.ent
-	$(XSLTPROC_PROCESS_MAN)
-
-$(outdir)/%.7: man/%.xml man/custom-man.xsl man/custom-entities.ent
-	$(XSLTPROC_PROCESS_MAN)
-
-$(outdir)/%.8: man/%.xml man/custom-man.xsl man/custom-entities.ent
-	$(XSLTPROC_PROCESS_MAN)
-
-$(outdir)/%.html: man/%.xml man/custom-html.xsl man/custom-entities.ent
-	$(XSLTPROC_PROCESS_HTML)
-
-define html-alias
-	$(AM_V_LN)$(LN_S) -f $(notdir $<) $@
-endef
-
-EXTRA_DIST += \
-	man/custom-html.xsl \
-	man/custom-man.xsl
-
-# ------------------------------------------------------------------------------
-ifneq ($(HAVE_SYSV_COMPAT),)
-sysvinit_DATA = \
-	docs/sysvinit/README
-
-varlog_DATA = \
-	docs/var-log/README
-
-$(outdir)/README: docs/sysvinit/README.in
-	$(SED_PROCESS)
-
-$(outdir)/README: docs/var-log/README.in
-	$(SED_PROCESS)
-
-CLEANFILES += \
-	docs/sysvinit/README \
-	docs/var-log/README
-endif # HAVE_SYSV_COMPAT
-
-EXTRA_DIST += \
-	docs/sysvinit/README.in \
-	docs/var-log/README.in
-
-SOCKETS_TARGET_WANTS += \
-	systemd-initctl.socket
-
-ifneq ($(HAVE_UTMP),)
-ifneq ($(HAVE_SYSV_COMPAT),)
-MULTI_USER_TARGET_WANTS += \
-	systemd-update-utmp-runlevel.service
-GRAPHICAL_TARGET_WANTS += \
-	systemd-update-utmp-runlevel.service
-RESCUE_TARGET_WANTS += \
-	systemd-update-utmp-runlevel.service
-endif # HAVE_SYSV_COMPAT
-
-SYSINIT_TARGET_WANTS += \
-	systemd-update-utmp.service
-endif # HAVE_UTMP
-
-SYSINIT_TARGET_WANTS += \
-	systemd-update-done.service
-
-LOCAL_FS_TARGET_WANTS += \
-	systemd-remount-fs.service \
-	tmp.mount \
-	var-lib-machines.mount
-
-MULTI_USER_TARGET_WANTS += \
-	getty.target \
-	systemd-ask-password-wall.path
-
-SYSINIT_TARGET_WANTS += \
-	dev-hugepages.mount \
-	dev-mqueue.mount \
-	sys-kernel-config.mount \
-	sys-kernel-debug.mount \
-	sys-fs-fuse-connections.mount \
-	systemd-sysctl.service \
-	systemd-ask-password-console.path
-
-ifneq ($(HAVE_SYSV_COMPAT),)
-SYSTEM_UNIT_ALIASES += \
-	poweroff.target runlevel0.target \
-	rescue.target runlevel1.target \
-	multi-user.target runlevel2.target \
-	multi-user.target runlevel3.target \
-	multi-user.target runlevel4.target \
-	graphical.target runlevel5.target \
-	reboot.target runlevel6.target
-endif # HAVE_SYSV_COMPAT
-
-SYSTEM_UNIT_ALIASES += \
-	graphical.target default.target \
-	reboot.target ctrl-alt-del.target \
-	getty@.service autovt@.service
-
-USER_UNIT_ALIASES += \
-	$(systemunitdir)/shutdown.target shutdown.target \
-	$(systemunitdir)/sockets.target sockets.target \
-	$(systemunitdir)/timers.target timers.target \
-	$(systemunitdir)/paths.target paths.target \
-	$(systemunitdir)/bluetooth.target bluetooth.target \
-	$(systemunitdir)/printer.target printer.target \
-	$(systemunitdir)/sound.target sound.target \
-	$(systemunitdir)/smartcard.target smartcard.target
-
-USER_UNIT_ALIASES += \
-	$(systemunitdir)/busnames.target busnames.target
-
-GENERAL_ALIASES += \
-	$(systemunitdir)/remote-fs.target $(pkgsysconfdir)/system/multi-user.target.wants/remote-fs.target \
-	$(systemunitdir)/getty@.service $(pkgsysconfdir)/system/getty.target.wants/getty@tty1.service \
-	$(pkgsysconfdir)/user $(sysconfdir)/xdg/systemd/user \
-	$(dbussystemservicedir)/org.freedesktop.systemd1.service $(dbussessionservicedir)/org.freedesktop.systemd1.service
-
-ifneq ($(HAVE_SYSV_COMPAT),)
-INSTALL_DIRS += \
-	$(systemunitdir)/runlevel1.target.wants \
-	$(systemunitdir)/runlevel2.target.wants \
-	$(systemunitdir)/runlevel3.target.wants \
-	$(systemunitdir)/runlevel4.target.wants \
-	$(systemunitdir)/runlevel5.target.wants
-endif # HAVE_SYSV_COMPAT
-
-INSTALL_DIRS += \
-	$(prefix)/lib/modules-load.d \
-	$(sysconfdir)/modules-load.d \
-	$(prefix)/lib/systemd/network \
-	$(sysconfdir)/systemd/network \
-	$(prefix)/lib/sysctl.d \
-	$(sysconfdir)/sysctl.d \
-	$(prefix)/lib/kernel/install.d \
-	$(sysconfdir)/kernel/install.d \
-	$(systemshutdowndir) \
-	$(systemsleepdir) \
-	$(systemgeneratordir) \
-	$(usergeneratordir) \
-	\
-	$(userunitdir) \
-	$(pkgsysconfdir)/system \
-	$(pkgsysconfdir)/system/multi-user.target.wants \
-	$(pkgsysconfdir)/system/getty.target.wants \
-	$(pkgsysconfdir)/user \
-	$(dbussessionservicedir) \
-	$(sysconfdir)/xdg/systemd
-
-install-exec-hook: $(INSTALL_EXEC_HOOKS)
-
-uninstall-hook: $(UNINSTALL_DATA_HOOKS) $(UNINSTALL_EXEC_HOOKS)
-
-install-data-hook: $(INSTALL_DATA_HOOKS)
-
-distclean-local: $(DISTCLEAN_LOCAL_HOOKS)
-
-clean-local: $(CLEAN_LOCAL_HOOKS)
-	rm -rf $(abs_srcdir)/install-tree
-	rm -f $(abs_srcdir)/hwdb/usb.ids $(abs_srcdir)/hwdb/pci.ids $(abs_srcdir)/hwdb/oui.txt \
-	      $(abs_srcdir)/hwdb/iab.txt
-
-DISTCHECK_CONFIGURE_FLAGS = \
-	--with-dbuspolicydir=$$dc_install_base/$(dbuspolicydir) \
-	--with-dbussessionservicedir=$$dc_install_base/$(dbussessionservicedir) \
-	--with-dbussystemservicedir=$$dc_install_base/$(dbussystemservicedir) \
-	--with-bashcompletiondir=$$dc_install_base/$(bashcompletiondir) \
-	--with-zshcompletiondir=$$dc_install_base/$(zshcompletiondir) \
-	--with-pamlibdir=$$dc_install_base/$(pamlibdir) \
-	--with-pamconfdir=$$dc_install_base/$(pamconfdir) \
-	--with-rootprefix=$$dc_install_base \
-	--enable-compat-libs
-
-ifneq ($(HAVE_SYSV_COMPAT),)
-DISTCHECK_CONFIGURE_FLAGS += \
-	--with-sysvinit-path=$$dc_install_base/$(sysvinitdir) \
-	--with-sysvrcnd-path=$$dc_install_base/$(sysvrcnddir)
-else
-DISTCHECK_CONFIGURE_FLAGS += \
-	--with-sysvinit-path= \
-	--with-sysvrcnd-path=
-endif # HAVE_SYSV_COMPAT
-
-ifneq ($(ENABLE_SPLIT_USR),)
-DISTCHECK_CONFIGURE_FLAGS += \
-	--enable-split-usr
-else
-DISTCHECK_CONFIGURE_FLAGS += \
-	--disable-split-usr
-endif # ENABLE_SPLIT_USR
-
-.PHONY: dist-check-help
-dist-check-help: $(rootbin_PROGRAMS) $(bin_PROGRAMS)
-	for i in $(abspath $^); do                                             \
-            if $$i  --help | grep -v 'default:' | grep -E -q '.{80}.' ; then   \
-		echo "$(basename $$i) --help output is too wide:";             \
-	        $$i  --help | awk 'length > 80' | grep -E --color=yes '.{80}'; \
-	        exit 1;                                                        \
-            fi; done
-
-include_compilers = "$(CC)" "$(CC) -ansi" "$(CC) -std=iso9899:1990"
-public_headers = $(filter-out src/systemd/_sd-common.h, $(pkginclude_HEADERS) $(include_HEADERS))
-.PHONY: dist-check-includes
-dist-check-includes: $(public_headers)
-	@res=0;                                                        	        \
-	for i in $(abspath $^); do	                                        \
-	    for cc in $(include_compilers); do                                  \
-	        echo "$$cc -o/dev/null -c -x c -include "$$i" - </dev/null";    \
-	        $$cc -o/dev/null -c -x c -include "$$i" - </dev/null || res=1;  \
-	    done;                                                               \
-	done; exit $$res
-
-.PHONY: built-sources
-built-sources: $(BUILT_SOURCES)
-
-.PHONY: git-tag
-git-tag:
-	git tag -s "v$(VERSION)" -m "systemd $(VERSION)"
-
-.PHONY: git-tar
-git-tar:
-	git archive --format=tar --prefix=systemd-$(VERSION)/ HEAD | gzip > systemd-$(VERSION).tar.gz
-
-www_target = www.freedesktop.org:/srv/www.freedesktop.org/www/software/systemd
-
-.PHONY: doc-sync
-doc-sync: all
-	rsync -rlv --delete-excluded --include="*.html" --exclude="*" --omit-dir-times man/ $(www_target)/man/
-
-.PHONY: install-tree
-install-tree: all
-	rm -rf $(abs_srcdir)/install-tree
-	$(MAKE) install DESTDIR=$(abs_srcdir)/install-tree
-	tree $(abs_srcdir)/install-tree
-
-BUILT_SOURCES += \
-	test-libsystemd-sym.c \
-	test-libudev-sym.c
-
-CLEANFILES += \
-	test-libsystemd-sym.c \
-	test-libudev-sym.c
-
-tests += \
-	test-libsystemd-sym \
-	test-libudev-sym
-
-include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/hwdb/Makefile b/hwdb/Makefile
deleted file mode 100644
index 3f89c1ed8f..0000000000
--- a/hwdb/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-#  -*- 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
-
-.PHONY: hwdb-update
-hwdb-update:
-	( cd $(top_srcdir)/hwdb && \
-	wget -O usb.ids 'http://www.linux-usb.org/usb.ids' && \
-	wget -O pci.ids 'http://pci-ids.ucw.cz/v2.2/pci.ids' && \
-	wget -O ma-large.txt 'http://standards.ieee.org/develop/regauth/oui/oui.txt' && \
-	wget -O ma-medium.txt 'http://standards.ieee.org/develop/regauth/oui28/mam.txt' && \
-	wget -O ma-small.txt 'http://standards.ieee.org/develop/regauth/oui36/oui36.txt' && \
-	./ids-update.pl )
-
-include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/move.sh b/move.sh
deleted file mode 100755
index 4b55c869ec..0000000000
--- a/move.sh
+++ /dev/null
@@ -1,382 +0,0 @@
-#!/usr/bin/env bash
-
-in_array() {
-	local needle=$1; shift
-	local item
-	for item in "$@"; do
-		[[ $item = $needle ]] && return 0 # Found
-	done
-	return 1 # Not Found
-}
-
-move_files() (
-	for d in libsystemd libudev; do
-		mkdir src/$d-new
-		mv -T src/$d src/$d-new/src
-		mv -T src/$d-new src/$d
-	done
-
-	for d in basic core shared; do
-		mv -T src/{,lib}$d
-	done
-
-	mkdir src/libbasic/src
-	mv src/libbasic/*.c src/libbasic/src/
-	mkdir src/libbasic/include
-	mkdir src/libbasic/include/basic
-	mv src/libbasic/.gitignore src/libbasic/*.h src/libbasic/include/basic/
-
-	mv -T src/lib{shared,core}/linux
-
-	mkdir src/libfirewall
-	mv -T src/lib{shared,firewall}/firewall-util.c
-	mv -T src/lib{shared,firewall}/firewall-util.h
-
-	mkdir src/libshared/src
-	mv src/libshared/*.c src/libshared/src/
-	mkdir src/libshared/include
-	mkdir src/libshared/include/shared
-	mv src/libshared/*.h src/libshared/include/shared/
-
-	mkdir src/libsystemd-network/test
-	mv src/libsystemd-network/test-* src/libsystemd-network/test
-	mkdir src/libsystemd-network/src
-	mv src/libsystemd-network/*.c src/libsystemd-network/src/
-	mkdir src/libsystemd-network/include
-	mkdir src/libsystemd-network/include/systemd-network
-	mv src/libsystemd-network/*.h src/libsystemd-network/include/systemd-network/
-
-	pfix=(
-		dbus1-generator
-		debug-generator
-		fstab-generator
-		getty-generator
-		gpt-auto-generator
-		rc-local-generator
-		system-update-generator
-		sysv-generator
-
-		ac-power
-		activate
-		analyze
-		ask-password
-		backlight
-		binfmt
-		cgls
-		cgroups-agent
-		cgtop
-		coredump
-		cryptsetup
-		delta
-		detect-virt
-		escape
-		firstboot
-		fsck
-		hibernate-resume
-		hwdb
-		initctl
-		machine-id-setup
-		modules-load
-		notify
-		nspawn
-		path
-		quotacheck
-		random-seed
-		remount-fs
-		reply-password
-		rfkill
-		run
-		sleep
-		socket-proxy
-		stdio-bridge
-		sysctl
-		sysusers
-		timesync
-		tmpfiles
-		tty-ask-password-agent
-		update-done
-		update-utmp
-		user-sessions
-	)
-	for d in "${pfix[@]}"; do
-		mv -T src/{,systemd-}$d
-	done
-	mv -T src/vconsole src/systemd-vconsole-setup
-
-	dmon=(
-		systemd-socket-proxy
-		systemd-timesync
-	)
-	for d in "${dmon[@]}"; do
-		mv -T "src/$d"{,d}
-	done
-
-	mv -T {shell-completion/bash/,src/kernel-install/bash-completion_}kernel-install
-	mv -T {shell-completion/zsh/_,src/kernel-install/zsh-completion_}kernel-install
-	mv -T {man,src/kernel-install}/kernel-install.xml
-
-	mkdir src/libsystemd/include
-	mv -T src/{,libsystemd/include}/systemd
-
-	mkdir src/grp-machine
-	mv -T src/machine src/grp-machine/libmachine-core
-	mkdir src/grp-machine/systemd-machined
-	mv -T src/grp-machine/{libmachine-core,systemd-machined}/machined.c
-	mkdir src/grp-machine/machinectl
-	mv -T src/grp-machine/{libmachine-core,machinectl}/machinectl.c
-	mv -T src/{,grp-machine}/nss-mymachines
-
-	mkdir src/grp-resolve
-	mv -T src/{resolve,grp-resolve/systemd-resolved}
-	mv -T src/{,grp-resolve}/nss-resolve
-
-	mkdir src/grp-system
-	mv -T src/{,grp-system}/systemctl
-
-	mkdir src/grp-system/systemd
-	mv -T src/{libcore,grp-system/systemd}/main.c
-	mv -T src/{libcore,grp-system/systemd}/macros.systemd.in
-	mv -T src/{libcore,grp-system/systemd}/org.freedesktop.systemd1.conf
-	mv -T src/{libcore,grp-system/systemd}/org.freedesktop.systemd1.policy.in.in
-	mv -T src/{libcore,grp-system/systemd}/org.freedesktop.systemd1.service
-	mv -T src/{libcore,grp-system/systemd}/system.conf
-	mv -T src/{libcore,grp-system/systemd}/systemd.pc.in
-	mv -T src/{libcore,grp-system/systemd}/triggers.systemd.in
-	mv -T src/{libcore,grp-system/systemd}/user.conf
-
-	mkdir src/libudev/include
-	mv -T src/libudev/{src,include}/libudev.h
-
-	mv -T src/libsystemd/{src,}/libsystemd.pc.in
-	mv -T src/libsystemd/{src,}/libsystemd.sym
-	mv -T src/libsystemd/{src,}/.gitignore
-
-	mkdir src/systemd-shutdown
-
-	mkdir src/grp-coredump
-	mv -T src/{,grp-coredump}/systemd-coredump
-	mkdir src/grp-coredump/coredumpctl
-	mv -T src/grp-coredump/{systemd-coredump,coredumpctl}/coredumpctl.c
-
-	mkdir src/grp-boot
-	mv -T src/boot/efi src/grp-boot/systemd-boot
-	mv -T src/boot src/grp-boot/bootctl
-	mv -T {test,src/grp-boot/systemd-boot}/test-efi-create-disk.sh
-
-	mkdir build-aux
-	mkdir build-aux/Makefile.{once,each}.{head,tail}
-	touch build-aux/Makefile.{once,each}.{head,tail}/.gitignore
-
-	mkdir src/libsystemd/src/sd-journal
-
-	libsystemd_journal_files=(
-		audit-type.c
-		audit-type.h
-		catalog.c
-		catalog.h
-		compress.c
-		compress.h
-		fsprg.c
-		fsprg.h
-		journal-authenticate.c
-		journal-authenticate.h
-		journal-def.h
-		journal-file.c
-		journal-file.h
-		journal-internal.h
-		journal-send.c
-		journal-vacuum.c
-		journal-vacuum.h
-		journal-verify.c
-		journal-verify.h
-		lookup3.c
-		lookup3.h
-		mmap-cache.c
-		mmap-cache.h
-		sd-journal.c
-	)
-	for file in "${libsystemd_journal_files[@]}"; do
-		mv -T src/{journal,libsystemd/src/sd-journal}/$file
-	done
-
-	mkdir src/busctl
-	mv src/libsystemd/src/sd-bus/busctl* src/busctl
-
-	mv -T src/{udev,libudev/src}/udev.h
-
-	mkdir src/grp-timedate
-	mv -T src/timedate src/grp-timedate/systemd-timedated
-	mkdir src/grp-timedate/timedatectl
-	mv -T src/grp-timedate/{systemd-timedated,timedatectl}/timedatectl.c
-
-	mv -T src/{journal,grp-journal}
-	mv -T {,src/grp-journal/}catalog
-	mkdir src/grp-journal/{systemd-journald,journalctl,libjournal-core}
-	mv -T src/grp-journal/{,systemd-journald}/journald.c
-	mv -T src/grp-journal/{,journalctl}/journalctl.c
-	mv    src/grp-journal/*.* src/grp-journal/libjournal-core/
-
-	mv -T src/{,grp-}journal-remote
-	local suffix
-	for suffix in gatewayd remote upload; do
-		mkdir src/grp-journal-remote/systemd-journal-$suffix
-		mv src/grp-journal-remote/journal-$suffix* src/grp-journal-remote/systemd-journal-$suffix/
-	done
-
-	mv -T src/{,grp-}hostname
-	mv -T src/{,grp-}locale
-	mv -T src/{,grp-}udev
-
-	mv -T src/{,grp-}import
-	mkdir src/grp-import/systemd-importd
-	mv src/grp-import/{,systemd-importd}/importd.c
-	mkdir src/grp-import/systemd-pull
-	mv src/grp-import/pull* src/grp-import/systemd-pull
-	mkdir src/grp-import/systemd-import
-	mv src/grp-import/import* src/grp-import/systemd-import
-	mkdir src/grp-import/systemd-export
-	mv src/grp-import/export* src/grp-import/systemd-export
-	
-	mv -T src/{,grp-}network
-	mkdir src/grp-network/systemd-networkd
-	mv src/grp-network/{,systemd-networkd}/networkd.c
-	mkdir src/grp-network/systemd-networkd-wait-online
-	mv src/grp-network/networkd-wait-online* src/grp-network/systemd-networkd-wait-online
-	mkdir src/grp-network/networkctl
-	mv src/grp-network/{,networkctl}/networkctl.c
-	mkdir src/grp-network/libnetworkd-core
-	mv src/grp-network/networkd* src/grp-network/libnetworkd-core
-
-	mv -T src/{,grp-}login
-	mkdir src/grp-login/systemd-logind
-	mv -T src/grp-login/{,systemd-logind}/logind.c
-	mv -T src/grp-login/{,systemd-logind}/logind.h
-	mkdir src/grp-login/liblogind-core
-	mv src/grp-login/logind-* src/grp-login/liblogind-core
-	mkdir src/grp-login/loginctl
-	mv -T src/grp-login/{,loginctl}/loginctl.c
-	mv -T src/grp-login/{,loginctl}/sysfs-show.h
-	mv -T src/grp-login/{,loginctl}/sysfs-show.c
-	mkdir src/grp-login/systemd-inhibit
-	mv -T src/grp-login/{,systemd-inhibit}/inhibit.c
-	mkdir src/grp-login/pam_systemd
-	mv -T src/grp-login/{,pam_systemd}/pam_systemd.c
-	mv -T src/grp-login/{,pam_systemd}/pam_systemd.sym
-
-	mkdir src/grp-udev/d-udevadm
-	mv src/grp-udev/udevadm* src/grp-udev/d-udevadm/
-	mkdir src/grp-udev/systemd-udevd
-	mv -T src/grp-udev/{,systemd-udevd}/udevd.c
-	mkdir src/grp-udev/libudev-core
-	mv src/grp-udev/udev* src/grp-udev/libudev-core/
-	mv -T src/grp-udev/{,libudev-core}/net
-	mv -T src/grp-udev/{d-,}udevadm
-
-	mv -T src/{libcore,systemd-shutdown}/shutdown.c
-	mv -T src/{libcore,systemd-shutdown}/umount.c
-	mv -T src/{libcore,systemd-shutdown}/umount.h
-
-	mkdir src/grp-helperunits
-	helperunits=(
-		backlight
-		binfmt
-		detect-virt
-		quotacheck
-		random-seed
-		rfkill
-		sleep
-		vconsole-setup
-		user-sessions
-	)
-	for hu in "${helperunits[@]}"; do
-		mv -T src/systemd-"$hu" src/grp-helperunits/systemd-"$hu"
-	done
-)
-
-breakup_makefile() (
-        find . \( -name Makefile -o -name '*.mk' \) -delete
-
-        touch .tmp.move.all
-        files=(.tmp.move.all)
-        file=/dev/null
-        IFS=''
-        while read -r line; do
-                if [[ $line = '#@'* ]]; then
-                        file="${line#'#@'}"
-                        file="${file%% *}"
-                elif [[ $file = all ]]; then
-                        printf '%s\n' "$line" | tee -a "${files[@]}" >/dev/null
-                else
-			if ! in_array "$file" "${files[@]}"; then
-				cat .tmp.move.all > "$file"
-				files+=("$file")
-			fi
-                        printf '%s\n' "$line" >> "$file"
-                fi
-        done < <(fixup_makefile <Makefile.am)
-        rm .tmp.move.all
-)
-
-fixup_includes() (
-	find src \( -name '*.h' -o -name '*.c' \) \
-	     -exec grep '#include ["<]sd-' -l -- {} + |
-	    xargs -d $'\n' sed -ri \
-		  -e 's|#include "(sd-[^"]*)"|#include <systemd/\1>|' \
-		  -e 's|#include <(sd-[^>]*)>|#include <systemd/\1>|'
-)
-
-fixup_makefile() {
-	sed -r \
-	    -e '/^[^#	]*:/ { s|^(\s*)\S+/|\1$(outdir)/| }' \
-	    -e 's|^if (.*)|ifneq ($(\1),)|' \
-	    -e 's|--version-script=.*/([^/]+)\.sym|--version-script=$(srcdir)/\1.sym|g'
-}
-
-fixup_makefiles() (
-	sed -ri \
-	    -e '/^	\$\(AM_V_at\)\$\(MKDIR_P\) \$\(dir \$@\)/d' \
-	    -e 's/ \$\(CFLAGS\) / /g' \
-	    -e 's/ \$\(CPPFLAGS\) / /g' \
-	    -e 's/ \$\(AM_CPPFLAGS\) / $(ALL_CPPFLAGS) /g' \
-	    -e '/^[^#	]*:/ { s|\S+/|$(outdir)/|g }' \
-	    src/libbasic/include/basic/Makefile \
-	    src/libsystemd/src/Makefile \
-	    src/libsystemd/src/sd-journal/Makefile \
-	    src/grp-udev/libudev-core/Makefile
-	find -type f -name Makefile|while read -r filename; do
-		sed -r -i "s|(/\.\.)*/config.mk|/$(realpath -ms --relative-to="${filename%/*}" config.mk)|" "$filename"
-	done
-)
-
-move() (
-	>&2 echo ' => move_files'
-	move_files
-	>&2 echo ' => breakup_makefile'
-	breakup_makefile
-	>&2 echo ' => fixup_includes'
-	fixup_includes
-	>&2 echo ' => fixup_makefiles'
-	fixup_makefiles
-)
-
-main() {
-	set -e
-
-	if [[ -n "$(git status -s)" ]] || [[ -n "$(git clean -xdn)" ]]; then
-		echo 'There are changes in the current directory.' >&2
-		exit 1
-	fi
-
-	git checkout -b postmove
-
-	move
-
-	git add .
-	git commit -m './move.sh'
-	git merge -s ours lukeshu/postmove
-	git checkout lukeshu/postmove
-	git merge postmove
-	git branch -d postmove
-}
-
-main "$@"
diff --git a/reset.sh b/reset.sh
deleted file mode 100755
index 66b629c217..0000000000
--- a/reset.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-set -e
-git checkout lukeshu/premove
-git branch -D postmove || true
-git checkout .
-git clean -xdf
diff --git a/src/kernel-install/bash-completion_kernel-install b/shell-completion/bash/kernel-install
index 7cd2494cf7..7cd2494cf7 100644
--- a/src/kernel-install/bash-completion_kernel-install
+++ b/shell-completion/bash/kernel-install
diff --git a/src/kernel-install/zsh-completion_kernel-install b/shell-completion/zsh/_kernel-install
index 4fdd3a4ae7..4fdd3a4ae7 100644
--- a/src/kernel-install/zsh-completion_kernel-install
+++ b/shell-completion/zsh/_kernel-install
diff --git a/shell-completion/zsh/_systemd b/shell-completion/zsh/_systemd
deleted file mode 100644
index 62114ff095..0000000000
--- a/shell-completion/zsh/_systemd
+++ /dev/null
@@ -1,82 +0,0 @@
-#compdef systemd-cat systemd-ask-password systemd-cgls systemd-cgtop systemd-detect-virt systemd-machine-id-setup systemd-notify systemd-tty-ask-password-agent
-
-local curcontext="$curcontext" state lstate line
-case "$service" in
-    systemd-ask-password)
-        _arguments \
-            {-h,--help}'[Show this help]' \
-            '--icon=[Icon name]:icon name:' \
-            '--timeout=[Timeout in sec]:timeout (seconds):' \
-            '--no-tty[Ask question via agent even on TTY]' \
-            '--accept-cached[Accept cached passwords]' \
-            '--multiple[List multiple passwords if available]'
-    ;;
-    systemd-cat)
-        _arguments \
-            {-h,--help}'[Show this help]' \
-            '--version[Show package version.]' \
-            {-t+,--identifier=}'[Set syslog identifier.]:syslog identifier:' \
-            {-p+,--priority=}'[Set priority value.]:value:({0..7})' \
-            '--level-prefix=[Control whether level prefix shall be parsed.]:boolean:(1 0)' \
-            ':Message'
-    ;;
-    systemd-cgls)
-        _arguments \
-            {-h,--help}'[Show this help]' \
-            '--version[Show package version]' \
-            '--no-pager[Do not pipe output into a pager]' \
-            {-a,--all}'[Show all groups, including empty]' \
-            '-k[Include kernel threads in output]' \
-            ':cgroups:(cpuset cpu cpuacct memory devices freezer blkio)'
-    ;;
-    systemd-cgtop)
-        _arguments \
-            {-h,--help}'[Show this help]' \
-            '--version[Print version and exit]' \
-            '(-c -m -i -t)-p[Order by path]' \
-            '(-c -p -m -i)-t[Order by number of tasks]' \
-            '(-m -p -i -t)-c[Order by CPU load]' \
-            '(-c -p -i -t)-m[Order by memory load]' \
-            '(-c -m -p -t)-i[Order by IO load]' \
-            {-d+,--delay=}'[Specify delay]:delay:' \
-            {-n+,--iterations=}'[Run for N iterations before exiting]:number of iterations:' \
-            {-b,--batch}'[Run in batch mode, accepting no input]' \
-            '--depth=[Maximum traversal depth]:maximum depth:'
-    ;;
-    systemd-detect-virt)
-        _arguments \
-            {-h,--help}'[Show this help]' \
-            '--version[Show package version]' \
-            {-c,--container}'[Only detect whether we are run in a container]' \
-            {-v,--vm}'[Only detect whether we are run in a VM]' \
-            {-q,--quiet}"[Don't output anything, just set return value]"
-    ;;
-    systemd-machine-id-setup)
-        _arguments \
-            {-h,--help}'[Show this help]' \
-            '--version[Show package version]'
-    ;;
-    systemd-notify)
-        _arguments \
-            {-h,--help}'[Show this help]' \
-            '--version[Show package version]' \
-            '--ready[Inform the init system about service start-up completion.]' \
-            '--pid=[Inform the init system about the main PID of the daemon]:daemon main PID:_pids' \
-            '--status=[Send a free-form status string for the daemon to the init systemd]:status string:' \
-            '--booted[Returns 0 if the system was booted up with systemd]'
-    ;;
-    systemd-tty-ask-password-agent)
-        _arguments \
-            {-h,--help}'[Prints a short help text and exits.]' \
-            '--version[Prints a short version string and exits.]' \
-            '--list[Lists all currently pending system password requests.]' \
-            '--query[Process all currently pending system password requests by querying the user on the calling TTY.]' \
-            '--watch[Continuously process password requests.]' \
-            '--wall[Forward password requests to wall(1).]' \
-            '--plymouth[Ask question with plymouth(8).]' \
-            '--console[Ask question on /dev/console.]'
-    ;;
-    *) _message 'eh?' ;;
-esac
-
-#vim: set ft=zsh sw=4 ts=4 et
diff --git a/shell-completion/zsh/_systemd-ask-password b/shell-completion/zsh/_systemd-ask-password
new file mode 100644
index 0000000000..fa68159256
--- /dev/null
+++ b/shell-completion/zsh/_systemd-ask-password
@@ -0,0 +1,12 @@
+#compdef systemd-ask-password
+
+local curcontext="$curcontext" state lstate line
+_arguments \
+    {-h,--help}'[Show this help]' \
+    '--icon=[Icon name]:icon name:' \
+    '--timeout=[Timeout in sec]:timeout (seconds):' \
+    '--no-tty[Ask question via agent even on TTY]' \
+    '--accept-cached[Accept cached passwords]' \
+    '--multiple[List multiple passwords if available]'
+
+#vim: set ft=zsh sw=4 ts=4 et
diff --git a/shell-completion/zsh/_systemd-cat b/shell-completion/zsh/_systemd-cat
new file mode 100644
index 0000000000..7487b00ee8
--- /dev/null
+++ b/shell-completion/zsh/_systemd-cat
@@ -0,0 +1,12 @@
+#compdef systemd-cat
+
+local curcontext="$curcontext" state lstate line
+_arguments \
+    {-h,--help}'[Show this help]' \
+    '--version[Show package version.]' \
+    {-t+,--identifier=}'[Set syslog identifier.]:syslog identifier:' \
+    {-p+,--priority=}'[Set priority value.]:value:({0..7})' \
+    '--level-prefix=[Control whether level prefix shall be parsed.]:boolean:(1 0)' \
+    ':Message'
+
+#vim: set ft=zsh sw=4 ts=4 et
diff --git a/shell-completion/zsh/_systemd-cgls b/shell-completion/zsh/_systemd-cgls
new file mode 100644
index 0000000000..c8f93fa732
--- /dev/null
+++ b/shell-completion/zsh/_systemd-cgls
@@ -0,0 +1,12 @@
+#compdef systemd-cgls
+
+local curcontext="$curcontext" state lstate line
+_arguments \
+    {-h,--help}'[Show this help]' \
+    '--version[Show package version]' \
+    '--no-pager[Do not pipe output into a pager]' \
+    {-a,--all}'[Show all groups, including empty]' \
+    '-k[Include kernel threads in output]' \
+    ':cgroups:(cpuset cpu cpuacct memory devices freezer blkio)'
+
+#vim: set ft=zsh sw=4 ts=4 et
diff --git a/shell-completion/zsh/_systemd-cgtop b/shell-completion/zsh/_systemd-cgtop
new file mode 100644
index 0000000000..f6e1b2422a
--- /dev/null
+++ b/shell-completion/zsh/_systemd-cgtop
@@ -0,0 +1,17 @@
+#compdef systemd-cgtop
+
+local curcontext="$curcontext" state lstate line
+_arguments \
+    {-h,--help}'[Show this help]' \
+    '--version[Print version and exit]' \
+    '(-c -m -i -t)-p[Order by path]' \
+    '(-c -p -m -i)-t[Order by number of tasks]' \
+    '(-m -p -i -t)-c[Order by CPU load]' \
+    '(-c -p -i -t)-m[Order by memory load]' \
+    '(-c -m -p -t)-i[Order by IO load]' \
+    {-d+,--delay=}'[Specify delay]:delay:' \
+    {-n+,--iterations=}'[Run for N iterations before exiting]:number of iterations:' \
+    {-b,--batch}'[Run in batch mode, accepting no input]' \
+    '--depth=[Maximum traversal depth]:maximum depth:'
+
+#vim: set ft=zsh sw=4 ts=4 et
diff --git a/shell-completion/zsh/_systemd-detect-virt b/shell-completion/zsh/_systemd-detect-virt
new file mode 100644
index 0000000000..a0c7df727c
--- /dev/null
+++ b/shell-completion/zsh/_systemd-detect-virt
@@ -0,0 +1,11 @@
+#compdef systemd-detect-virt
+
+local curcontext="$curcontext" state lstate line
+_arguments \
+    {-h,--help}'[Show this help]' \
+    '--version[Show package version]' \
+    {-c,--container}'[Only detect whether we are run in a container]' \
+    {-v,--vm}'[Only detect whether we are run in a VM]' \
+    {-q,--quiet}"[Don't output anything, just set return value]"
+
+#vim: set ft=zsh sw=4 ts=4 et
diff --git a/shell-completion/zsh/_systemd-machine-id-setup b/shell-completion/zsh/_systemd-machine-id-setup
new file mode 100644
index 0000000000..d575649394
--- /dev/null
+++ b/shell-completion/zsh/_systemd-machine-id-setup
@@ -0,0 +1,8 @@
+#compdef systemd-machine-id-setup
+
+local curcontext="$curcontext" state lstate line
+_arguments \
+    {-h,--help}'[Show this help]' \
+    '--version[Show package version]'
+
+#vim: set ft=zsh sw=4 ts=4 et
diff --git a/shell-completion/zsh/_systemd-notify b/shell-completion/zsh/_systemd-notify
new file mode 100644
index 0000000000..910ddfa34c
--- /dev/null
+++ b/shell-completion/zsh/_systemd-notify
@@ -0,0 +1,12 @@
+#compdef systemd-notify
+
+local curcontext="$curcontext" state lstate line
+_arguments \
+    {-h,--help}'[Show this help]' \
+    '--version[Show package version]' \
+    '--ready[Inform the init system about service start-up completion.]' \
+    '--pid=[Inform the init system about the main PID of the daemon]:daemon main PID:_pids' \
+    '--status=[Send a free-form status string for the daemon to the init systemd]:status string:' \
+    '--booted[Returns 0 if the system was booted up with systemd]'
+
+#vim: set ft=zsh sw=4 ts=4 et
diff --git a/shell-completion/zsh/_systemd-tty-ask-password-agent b/shell-completion/zsh/_systemd-tty-ask-password-agent
new file mode 100644
index 0000000000..e7c0684996
--- /dev/null
+++ b/shell-completion/zsh/_systemd-tty-ask-password-agent
@@ -0,0 +1,14 @@
+#compdef systemd-tty-ask-password-agent
+
+local curcontext="$curcontext" state lstate line
+_arguments \
+    {-h,--help}'[Prints a short help text and exits.]' \
+    '--version[Prints a short version string and exits.]' \
+    '--list[Lists all currently pending system password requests.]' \
+    '--query[Process all currently pending system password requests by querying the user on the calling TTY.]' \
+    '--watch[Continuously process password requests.]' \
+    '--wall[Forward password requests to wall(1).]' \
+    '--plymouth[Ask question with plymouth(8).]' \
+    '--console[Ask question on /dev/console.]'
+
+#vim: set ft=zsh sw=4 ts=4 et
diff --git a/src/Makefile b/src/Makefile
deleted file mode 100644
index b84e6076a0..0000000000
--- a/src/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-#  -*- 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
-
-
-include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/busctl/Makefile b/src/busctl/Makefile
deleted file mode 100644
index e7ef92824c..0000000000
--- a/src/busctl/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-#  -*- 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
-
-bin_PROGRAMS += \
-	busctl
-
-busctl_SOURCES = \
-	src/libsystemd/sd-bus/busctl.c \
-	src/libsystemd/sd-bus/busctl-introspect.c \
-	src/libsystemd/sd-bus/busctl-introspect.h
-
-busctl_LDADD = \
-	libshared.la
-
-include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/man/busctl.xml b/src/busctl/busctl.xml
index b71a174634..b71a174634 100644
--- a/man/busctl.xml
+++ b/src/busctl/busctl.xml
diff --git a/src/grp-udev/collect/collect.c b/src/collect/collect.c
index 349585b634..349585b634 100644
--- a/src/grp-udev/collect/collect.c
+++ b/src/collect/collect.c
diff --git a/src/grp-boot/Makefile b/src/grp-boot/Makefile
deleted file mode 100644
index 922d8a32d3..0000000000
--- a/src/grp-boot/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-#  -*- 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 += bootctl systemd-boot
-
-include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-boot/bootctl/Makefile b/src/grp-boot/bootctl/Makefile
deleted file mode 100644
index 84253d2387..0000000000
--- a/src/grp-boot/bootctl/Makefile
+++ /dev/null
@@ -1,54 +0,0 @@
-#  -*- 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
-
-ifneq ($(ENABLE_EFI),)
-ifneq ($(HAVE_BLKID),)
-bootctl_SOURCES = \
-	src/boot/bootctl.c
-
-bootctl_CPPFLAGS = \
-	$(AM_CPPFLAGS) \
-	-DEFI_MACHINE_TYPE_NAME=\"$(EFI_MACHINE_TYPE_NAME)\" \
-	-DBOOTLIBDIR=\"$(bootlibdir)\"
-
-bootctl_CFLAGS = \
-	$(AM_CFLAGS) \
-	$(BLKID_CFLAGS)
-
-bootctl_LDADD = \
-	libshared.la \
-	$(BLKID_LIBS)
-
-bin_PROGRAMS += \
-	bootctl
-
-dist_bashcompletion_data += \
-	shell-completion/bash/bootctl
-
-dist_zshcompletion_data += \
-	shell-completion/zsh/_bootctl
-endif # HAVE_BLKID
-endif # ENABLE_EFI
-include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/man/bootctl.xml b/src/grp-boot/bootctl/bootctl.xml
index ebd58750d3..ebd58750d3 100644
--- a/man/bootctl.xml
+++ b/src/grp-boot/bootctl/bootctl.xml
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/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/grp-boot/systemd-boot/Makefile b/src/grp-boot/systemd-boot/Makefile
deleted file mode 100644
index 5b53fdc7e4..0000000000
--- a/src/grp-boot/systemd-boot/Makefile
+++ /dev/null
@@ -1,194 +0,0 @@
-#  -*- 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
-
-ifneq ($(ENABLE_EFI),)
-ifneq ($(HAVE_GNUEFI),)
-efi_cppflags = \
-	$(EFI_CPPFLAGS) \
-	-I$(top_builddir) -include config.h \
-	-I$(EFI_INC_DIR)/efi \
-	-I$(EFI_INC_DIR)/efi/$(EFI_ARCH) \
-	-DEFI_MACHINE_TYPE_NAME=\"$(EFI_MACHINE_TYPE_NAME)\"
-
-efi_cflags = \
-	$(EFI_CFLAGS) \
-	-Wall \
-	-Wextra \
-	-std=gnu90 \
-	-nostdinc \
-	-ggdb -O0 \
-	-fpic \
-	-fshort-wchar \
-	-nostdinc \
-	-ffreestanding \
-	-fno-strict-aliasing \
-	-fno-stack-protector \
-	-Wsign-compare \
-	-Wno-missing-field-initializers
-
-ifneq ($(ARCH_X86_64),)
-efi_cflags += \
-	-mno-red-zone \
-	-mno-sse \
-	-mno-mmx \
-	-DEFI_FUNCTION_WRAPPER \
-	-DGNU_EFI_USE_MS_ABI
-endif # ARCH_X86_64
-
-ifneq ($(ARCH_IA32),)
-efi_cflags += \
-	-mno-sse \
-	-mno-mmx
-endif # ARCH_IA32
-
-efi_ldflags = \
-	$(EFI_LDFLAGS) \
-	-T $(EFI_LDS_DIR)/elf_$(EFI_ARCH)_efi.lds \
-	-shared \
-	-Bsymbolic \
-	-nostdlib \
-	-znocombreloc \
-	-L $(EFI_LIB_DIR) \
-	$(EFI_LDS_DIR)/crt0-efi-$(EFI_ARCH).o
-
-# Aarch64 and ARM32 don't have an EFI capable objcopy. Use 'binary' instead,
-# and add required symbols manually.
-ifneq ($(ARCH_AARCH64),)
-efi_ldflags += --defsym=EFI_SUBSYSTEM=0xa
-EFI_FORMAT = -O binary
-else
-EFI_FORMAT = --target=efi-app-$(EFI_ARCH)
-endif # ARCH_AARCH64
-endif # HAVE_GNUEFI
-endif # ENABLE_EFI
-
-# ------------------------------------------------------------------------------
-systemd_boot_headers = \
-	src/boot/efi/util.h \
-	src/boot/efi/console.h \
-	src/boot/efi/graphics.h \
-	src/boot/efi/pefile.h \
-	src/boot/efi/measure.h \
-	src/boot/efi/disk.h
-
-systemd_boot_sources = \
-	src/boot/efi/util.c \
-	src/boot/efi/console.c \
-	src/boot/efi/graphics.c \
-	src/boot/efi/pefile.c \
-	src/boot/efi/disk.c \
-	src/boot/efi/measure.c \
-	src/boot/efi/boot.c
-
-EXTRA_DIST += $(systemd_boot_sources) $(systemd_boot_headers)
-
-systemd_boot_objects = $(addprefix $(top_builddir)/,$(systemd_boot_sources:.c=.o))
-systemd_boot_solib = $(top_builddir)/src/boot/efi/systemd_boot.so
-systemd_boot = systemd-boot$(EFI_MACHINE_TYPE_NAME).efi
-
-ifneq ($(ENABLE_EFI),)
-ifneq ($(HAVE_GNUEFI),)
-bootlib_DATA = $(systemd_boot)
-
-$(outdir)/%.o: $(top_srcdir)/src/boot/efi/%.c $(addprefix $(top_srcdir)/,$(systemd_boot_headers))
-	@$(MKDIR_P) $(top_builddir)/src/boot/efi/
-	$(AM_V_CC)$(EFI_CC) $(efi_cppflags) $(efi_cflags) -c $< -o $@
-
-$(systemd_boot_solib): $(systemd_boot_objects)
-	$(AM_V_CCLD)$(LD) $(efi_ldflags) $(systemd_boot_objects) \
-		-o $@ -lefi -lgnuefi $(shell $(CC) -print-libgcc-file-name); \
-	nm -D -u $@ | grep ' U ' && exit 1 || :
-
-$(systemd_boot): $(systemd_boot_solib)
-	$(AM_V_GEN)$(OBJCOPY) -j .text -j .sdata -j .data -j .dynamic \
-	  -j .dynsym -j .rel -j .rela -j .reloc $(EFI_FORMAT) $< $@
-endif # HAVE_GNUEFI
-endif # ENABLE_EFI
-
-CLEANFILES += $(systemd_boot_objects) $(systemd_boot_solib) $(systemd_boot)
-
-# ------------------------------------------------------------------------------
-stub_headers = \
-	src/boot/efi/util.h \
-	src/boot/efi/pefile.h \
-	src/boot/efi/disk.h \
-	src/boot/efi/graphics.h \
-	src/boot/efi/splash.h \
-	src/boot/efi/measure.h \
-	src/boot/efi/linux.h
-
-stub_sources = \
-	src/boot/efi/util.c \
-	src/boot/efi/pefile.c \
-	src/boot/efi/disk.c \
-	src/boot/efi/graphics.c \
-	src/boot/efi/splash.c \
-	src/boot/efi/linux.c \
-	src/boot/efi/measure.c \
-	src/boot/efi/stub.c
-
-EXTRA_DIST += \
-	$(stub_sources) \
-	$(stub_headers) \
-	test/splash.bmp
-
-stub_objects = $(addprefix $(top_builddir)/,$(stub_sources:.c=.o))
-stub_solib = $(top_builddir)/src/boot/efi/stub.so
-stub = linux$(EFI_MACHINE_TYPE_NAME).efi.stub
-
-ifneq ($(ENABLE_EFI),)
-ifneq ($(HAVE_GNUEFI),)
-bootlib_DATA += $(stub)
-
-$(outdir)/%.o: $(top_srcdir)/src/boot/efi/%.c $(addprefix $(top_srcdir)/,$(stub_headers))
-	@$(MKDIR_P) $(top_builddir)/src/boot/efi/
-	$(AM_V_CC)$(EFI_CC) $(efi_cppflags) $(efi_cflags) -c $< -o $@
-
-$(stub_solib): $(stub_objects)
-	$(AM_V_CCLD)$(LD) $(efi_ldflags) $(stub_objects) \
-		-o $@ -lefi -lgnuefi $(shell $(CC) -print-libgcc-file-name); \
-	nm -D -u $@ | grep ' U ' && exit 1 || :
-
-$(stub): $(stub_solib)
-	$(AM_V_GEN)$(OBJCOPY) -j .text -j .sdata -j .data -j .dynamic \
-	  -j .dynsym -j .rel -j .rela -j .reloc $(EFI_FORMAT) $< $@
-endif # HAVE_GNUEFI
-endif # ENABLE_EFI
-
-CLEANFILES += $(stub_objects) $(stub_solib) $(stub)
-
-
-# ------------------------------------------------------------------------------
-CLEANFILES += test-efi-disk.img
-
-test-efi-disk.img: $(systemd_boot) $(stub) test/test-efi-create-disk.sh
-	$(AM_V_GEN)test/test-efi-create-disk.sh
-
-test-efi: test-efi-disk.img
-	$(QEMU) -machine accel=kvm -m 1024 -bios $(QEMU_BIOS) -snapshot test-efi-disk.img
-
-EXTRA_DIST += test/test-efi-create-disk.sh
-
-include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-coredump/Makefile b/src/grp-coredump/Makefile
deleted file mode 100644
index 2e604d7b86..0000000000
--- a/src/grp-coredump/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-#  -*- 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 += coredumpctl systemd-coredump
-
-include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-coredump/coredumpctl/Makefile b/src/grp-coredump/coredumpctl/Makefile
deleted file mode 100644
index 47a4397fa4..0000000000
--- a/src/grp-coredump/coredumpctl/Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
-#  -*- 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
-
-coredumpctl_SOURCES = \
-	src/coredump/coredumpctl.c
-
-coredumpctl_LDADD = \
-	libshared.la
-
-bin_PROGRAMS += \
-	coredumpctl
-
-dist_bashcompletion_data += \
-	shell-completion/bash/coredumpctl
-
-dist_zshcompletion_data += \
-	shell-completion/zsh/_coredumpctl
-
-include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/man/coredumpctl.xml b/src/grp-coredump/coredumpctl/coredumpctl.xml
index abc245be5e..abc245be5e 100644
--- a/man/coredumpctl.xml
+++ b/src/grp-coredump/coredumpctl/coredumpctl.xml
diff --git a/src/grp-coredump/systemd-coredump/Makefile b/src/grp-coredump/systemd-coredump/Makefile
deleted file mode 100644
index bc71db120e..0000000000
--- a/src/grp-coredump/systemd-coredump/Makefile
+++ /dev/null
@@ -1,81 +0,0 @@
-#  -*- 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
-
-ifneq ($(ENABLE_COREDUMP),)
-systemd_coredump_SOURCES = \
-	src/coredump/coredump.c \
-	src/coredump/coredump-vacuum.c \
-	src/coredump/coredump-vacuum.h
-
-systemd_coredump_LDADD = \
-	libshared.la
-
-ifneq ($(HAVE_ELFUTILS),)
-systemd_coredump_SOURCES += \
-	src/coredump/stacktrace.c \
-	src/coredump/stacktrace.h
-
-systemd_coredump_LDADD += \
-	$(ELFUTILS_LIBS)
-endif # HAVE_ELFUTILS
-
-nodist_systemunit_DATA += \
-	units/systemd-coredump@.service
-
-dist_systemunit_DATA += \
-	units/systemd-coredump.socket
-
-SOCKETS_TARGET_WANTS += \
-	systemd-coredump.socket
-
-rootlibexec_PROGRAMS += \
-	systemd-coredump
-
-dist_pkgsysconf_DATA += \
-	src/coredump/coredump.conf
-
-manual_tests += \
-	test-coredump-vacuum
-
-test_coredump_vacuum_SOURCES = \
-	src/coredump/test-coredump-vacuum.c  \
-	src/coredump/coredump-vacuum.c \
-	src/coredump/coredump-vacuum.h
-
-test_coredump_vacuum_LDADD = \
-	libshared.la
-
-nodist_sysctl_DATA = \
-	sysctl.d/50-coredump.conf
-
-CLEANFILES += \
-	sysctl.d/50-coredump.conf
-endif # ENABLE_COREDUMP
-
-EXTRA_DIST += \
-	sysctl.d/50-coredump.conf.in \
-	units/systemd-coredump@.service.in
-
-include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/units/systemd-coredump.socket b/src/grp-coredump/systemd-coredump/systemd-coredump.socket
index 4cb2460471..4cb2460471 100644
--- a/units/systemd-coredump.socket
+++ b/src/grp-coredump/systemd-coredump/systemd-coredump.socket
diff --git a/man/systemd-coredump.xml b/src/grp-coredump/systemd-coredump/systemd-coredump.xml
index a28dc62e5a..a28dc62e5a 100644
--- a/man/systemd-coredump.xml
+++ b/src/grp-coredump/systemd-coredump/systemd-coredump.xml
diff --git a/units/systemd-coredump@.service.in b/src/grp-coredump/systemd-coredump/systemd-coredump@.service.in
index 588c8d629c..588c8d629c 100644
--- a/units/systemd-coredump@.service.in
+++ b/src/grp-coredump/systemd-coredump/systemd-coredump@.service.in
diff --git a/src/grp-helperunits/systemd-backlight/Makefile b/src/grp-helperunits/systemd-backlight/Makefile
deleted file mode 100644
index cf55ac4db9..0000000000
--- a/src/grp-helperunits/systemd-backlight/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-#  -*- 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
-
-ifneq ($(ENABLE_BACKLIGHT),)
-rootlibexec_PROGRAMS += \
-	systemd-backlight
-
-nodist_systemunit_DATA += \
-	units/systemd-backlight@.service
-
-systemd_backlight_SOURCES = \
-	src/backlight/backlight.c
-
-systemd_backlight_LDADD = \
-	libshared.la
-endif # ENABLE_BACKLIGHT
-
-EXTRA_DIST += \
-	units/systemd-backlight@.service.in
-
-include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-helperunits/systemd-binfmt/Makefile b/src/grp-helperunits/systemd-binfmt/Makefile
deleted file mode 100644
index 3e5c1ac270..0000000000
--- a/src/grp-helperunits/systemd-binfmt/Makefile
+++ /dev/null
@@ -1,56 +0,0 @@
-#  -*- 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
-
-ifneq ($(ENABLE_BINFMT),)
-systemd_binfmt_SOURCES = \
-	src/binfmt/binfmt.c
-
-systemd_binfmt_LDADD = \
-	libshared.la
-
-rootlibexec_PROGRAMS += \
-	systemd-binfmt
-
-dist_systemunit_DATA += \
-	units/proc-sys-fs-binfmt_misc.automount \
-	units/proc-sys-fs-binfmt_misc.mount
-
-nodist_systemunit_DATA += \
-	units/systemd-binfmt.service
-
-INSTALL_DIRS += \
-	$(prefix)/lib/binfmt.d \
-	$(sysconfdir)/binfmt.d
-
-SYSINIT_TARGET_WANTS += \
-	systemd-binfmt.service \
-	proc-sys-fs-binfmt_misc.automount
-
-endif # ENABLE_BINFMT
-
-EXTRA_DIST += \
-	units/systemd-binfmt.service.in
-
-include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-helperunits/systemd-detect-virt/Makefile b/src/grp-helperunits/systemd-detect-virt/Makefile
deleted file mode 100644
index 7b9b9f667b..0000000000
--- a/src/grp-helperunits/systemd-detect-virt/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-#  -*- 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
-
-bin_PROGRAMS += systemd-detect-virt
-systemd_detect_virt_SOURCES = \
-	src/detect-virt/detect-virt.c
-
-systemd_detect_virt_LDADD = \
-	libshared.la
-
-INSTALL_EXEC_HOOKS += \
-	systemd-detect-virt-install-hook
-
-include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-helperunits/systemd-quotacheck/Makefile b/src/grp-helperunits/systemd-quotacheck/Makefile
deleted file mode 100644
index 4220946f39..0000000000
--- a/src/grp-helperunits/systemd-quotacheck/Makefile
+++ /dev/null
@@ -1,46 +0,0 @@
-#  -*- 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
-
-ifneq ($(ENABLE_QUOTACHECK),)
-rootlibexec_PROGRAMS += \
-	systemd-quotacheck
-
-nodist_systemunit_DATA += \
-	units/systemd-quotacheck.service
-
-systemd_quotacheck_SOURCES = \
-	src/quotacheck/quotacheck.c
-
-systemd_quotacheck_LDADD = \
-	libshared.la
-endif # ENABLE_QUOTACHECK
-
-EXTRA_DIST += \
-	units/systemd-quotacheck.service.in
-
-nodist_systemunit_DATA += \
-	units/quotaon.service
-
-include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-helperunits/systemd-random-seed/Makefile b/src/grp-helperunits/systemd-random-seed/Makefile
deleted file mode 100644
index 56d1af7431..0000000000
--- a/src/grp-helperunits/systemd-random-seed/Makefile
+++ /dev/null
@@ -1,47 +0,0 @@
-#  -*- 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
-
-ifneq ($(ENABLE_RANDOMSEED),)
-rootlibexec_PROGRAMS += \
-	systemd-random-seed
-
-nodist_systemunit_DATA += \
-	units/systemd-random-seed.service
-
-systemd_random_seed_SOURCES = \
-	src/random-seed/random-seed.c
-
-systemd_random_seed_LDADD = \
-	libshared.la
-
-SYSINIT_TARGET_WANTS += \
-	systemd-random-seed.service
-
-endif # ENABLE_RANDOMSEED
-
-EXTRA_DIST += \
-	units/systemd-random-seed.service.in
-
-include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-helperunits/systemd-rfkill/Makefile b/src/grp-helperunits/systemd-rfkill/Makefile
deleted file mode 100644
index 2b4430b712..0000000000
--- a/src/grp-helperunits/systemd-rfkill/Makefile
+++ /dev/null
@@ -1,46 +0,0 @@
-#  -*- 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
-
-ifneq ($(ENABLE_RFKILL),)
-rootlibexec_PROGRAMS += \
-	systemd-rfkill
-
-nodist_systemunit_DATA += \
-	units/systemd-rfkill.service
-
-dist_systemunit_DATA += \
-	units/systemd-rfkill.socket
-
-systemd_rfkill_SOURCES = \
-	src/rfkill/rfkill.c
-
-systemd_rfkill_LDADD = \
-	libshared.la
-endif # ENABLE_RFKILL
-
-EXTRA_DIST += \
-	units/systemd-rfkill.service.in
-
-include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-helperunits/systemd-sleep/Makefile b/src/grp-helperunits/systemd-sleep/Makefile
deleted file mode 100644
index 3c9106638f..0000000000
--- a/src/grp-helperunits/systemd-sleep/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-#  -*- 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
-
-rootlibexec_PROGRAMS += systemd-sleep
-systemd_sleep_SOURCES = \
-	src/sleep/sleep.c
-
-systemd_sleep_LDADD = \
-	libshared.la
-
-include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-helperunits/systemd-user-sessions/Makefile b/src/grp-helperunits/systemd-user-sessions/Makefile
deleted file mode 100644
index 66fa3b7059..0000000000
--- a/src/grp-helperunits/systemd-user-sessions/Makefile
+++ /dev/null
@@ -1,48 +0,0 @@
-#  -*- 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
-
-ifneq ($(HAVE_PAM),)
-
-systemd_user_sessions_SOURCES = \
-	src/user-sessions/user-sessions.c
-
-systemd_user_sessions_LDADD = \
-	libshared.la
-
-rootlibexec_PROGRAMS += \
-	systemd-user-sessions
-
-nodist_systemunit_DATA += \
-	units/systemd-user-sessions.service
-
-MULTI_USER_TARGET_WANTS += \
-	systemd-user-sessions.service
-
-endif # HAVE_PAM
-
-EXTRA_DIST += \
-	units/systemd-user-sessions.service.in
-
-include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-helperunits/systemd-vconsole-setup/Makefile b/src/grp-helperunits/systemd-vconsole-setup/Makefile
deleted file mode 100644
index 99b369967e..0000000000
--- a/src/grp-helperunits/systemd-vconsole-setup/Makefile
+++ /dev/null
@@ -1,50 +0,0 @@
-#  -*- 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
-
-ifneq ($(ENABLE_VCONSOLE),)
-systemd_vconsole_setup_SOURCES = \
-	src/vconsole/vconsole-setup.c
-
-systemd_vconsole_setup_LDADD = \
-	libshared.la
-
-rootlibexec_PROGRAMS += \
-	systemd-vconsole-setup
-
-nodist_udevrules_DATA += \
-	src/vconsole/90-vconsole.rules
-
-nodist_systemunit_DATA += \
-	units/systemd-vconsole-setup.service
-
-SYSINIT_TARGET_WANTS += \
-	systemd-vconsole-setup.service
-endif # ENABLE_VCONSOLE
-
-EXTRA_DIST += \
-	src/vconsole/90-vconsole.rules.in \
-	units/systemd-vconsole-setup.service.in
-
-include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-hostname/Makefile b/src/grp-hostname/Makefile
deleted file mode 100644
index 911188454c..0000000000
--- a/src/grp-hostname/Makefile
+++ /dev/null
@@ -1,79 +0,0 @@
-#  -*- 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
-
-ifneq ($(ENABLE_HOSTNAMED),)
-systemd_hostnamed_SOURCES = \
-	src/hostname/hostnamed.c
-
-systemd_hostnamed_LDADD = \
-	libshared.la
-
-rootlibexec_PROGRAMS += \
-	systemd-hostnamed
-
-nodist_systemunit_DATA += \
-	units/systemd-hostnamed.service
-
-dist_systemunit_DATA_busnames += \
-	units/org.freedesktop.hostname1.busname
-
-dist_dbuspolicy_DATA += \
-	src/hostname/org.freedesktop.hostname1.conf
-
-dist_dbussystemservice_DATA += \
-	src/hostname/org.freedesktop.hostname1.service
-
-polkitpolicy_files += \
-	src/hostname/org.freedesktop.hostname1.policy
-
-SYSTEM_UNIT_ALIASES += \
-	systemd-hostnamed.service dbus-org.freedesktop.hostname1.service
-
-BUSNAMES_TARGET_WANTS += \
-	org.freedesktop.hostname1.busname
-
-hostnamectl_SOURCES = \
-	src/hostname/hostnamectl.c
-
-hostnamectl_LDADD = \
-	libshared.la
-
-bin_PROGRAMS += \
-	hostnamectl
-
-dist_bashcompletion_data += \
-	shell-completion/bash/hostnamectl
-
-dist_zshcompletion_data += \
-	shell-completion/zsh/_hostnamectl
-endif # ENABLE_HOSTNAMED
-
-polkitpolicy_in_files += \
-	src/hostname/org.freedesktop.hostname1.policy.in
-
-EXTRA_DIST += \
-	units/systemd-hostnamed.service.in
-
-include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-hostname/hostnamectl.c b/src/grp-hostname/hostnamectl/hostnamectl.c
index aabc3b30c0..aabc3b30c0 100644
--- a/src/grp-hostname/hostnamectl.c
+++ b/src/grp-hostname/hostnamectl/hostnamectl.c
diff --git a/man/hostnamectl.xml b/src/grp-hostname/hostnamectl/hostnamectl.xml
index 60004e9d04..60004e9d04 100644
--- a/man/hostnamectl.xml
+++ b/src/grp-hostname/hostnamectl/hostnamectl.xml
diff --git a/src/grp-hostname/.gitignore b/src/grp-hostname/systemd-hostnamed/.gitignore
index 1ff281b231..1ff281b231 100644
--- a/src/grp-hostname/.gitignore
+++ b/src/grp-hostname/systemd-hostnamed/.gitignore
diff --git a/src/grp-hostname/hostnamed.c b/src/grp-hostname/systemd-hostnamed/hostnamed.c
index d11756e615..d11756e615 100644
--- a/src/grp-hostname/hostnamed.c
+++ b/src/grp-hostname/systemd-hostnamed/hostnamed.c
diff --git a/src/grp-hostname/org.freedesktop.hostname1.conf b/src/grp-hostname/systemd-hostnamed/org.freedesktop.hostname1.conf
index 46b4aadc83..46b4aadc83 100644
--- a/src/grp-hostname/org.freedesktop.hostname1.conf
+++ b/src/grp-hostname/systemd-hostnamed/org.freedesktop.hostname1.conf
diff --git a/src/grp-hostname/org.freedesktop.hostname1.policy.in b/src/grp-hostname/systemd-hostnamed/org.freedesktop.hostname1.policy.in
index c32c1d4fda..c32c1d4fda 100644
--- a/src/grp-hostname/org.freedesktop.hostname1.policy.in
+++ b/src/grp-hostname/systemd-hostnamed/org.freedesktop.hostname1.policy.in
diff --git a/src/grp-hostname/org.freedesktop.hostname1.service b/src/grp-hostname/systemd-hostnamed/org.freedesktop.hostname1.service
index 6041ed60ca..6041ed60ca 100644
--- a/src/grp-hostname/org.freedesktop.hostname1.service
+++ b/src/grp-hostname/systemd-hostnamed/org.freedesktop.hostname1.service
diff --git a/units/systemd-hostnamed.service.in b/src/grp-hostname/systemd-hostnamed/systemd-hostnamed.service.in
index b7079e4a7c..b7079e4a7c 100644
--- a/units/systemd-hostnamed.service.in
+++ b/src/grp-hostname/systemd-hostnamed/systemd-hostnamed.service.in
diff --git a/src/grp-import/Makefile b/src/grp-import/Makefile
deleted file mode 100644
index 46be93c42f..0000000000
--- a/src/grp-import/Makefile
+++ /dev/null
@@ -1,89 +0,0 @@
-#  -*- 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
-
-ifneq ($(ENABLE_IMPORTD),)
-
-ifneq ($(HAVE_LIBCURL),)
-ifneq ($(HAVE_XZ),)
-ifneq ($(HAVE_ZLIB),)
-ifneq ($(HAVE_BZIP2),)
-ifneq ($(HAVE_GCRYPT),)
-
-dist_rootlibexec_DATA = \
-	src/import/import-pubring.gpg
-
-nodist_systemunit_DATA += \
-	units/systemd-importd.service
-
-dist_systemunit_DATA_busnames += \
-	units/org.freedesktop.import1.busname
-
-BUSNAMES_TARGET_WANTS += \
-	org.freedesktop.import1.busname
-
-SYSTEM_UNIT_ALIASES += \
-	systemd-importd.service dbus-org.freedesktop.import1.service
-
-dist_dbussystemservice_DATA += \
-	src/import/org.freedesktop.import1.service
-
-dist_dbuspolicy_DATA += \
-	src/import/org.freedesktop.import1.conf
-
-polkitpolicy_files += \
-	src/import/org.freedesktop.import1.policy
-
-manual_tests += \
-	test-qcow2
-
-test_qcow2_SOURCES = \
-	src/import/test-qcow2.c \
-	src/import/qcow2-util.c \
-	src/import/qcow2-util.h
-
-test_qcow2_CFLAGS = \
-	$(AM_CFLAGS) \
-	$(ZLIB_CFLAGS)
-
-test_qcow2_LDADD = \
-	libshared.la \
-	$(ZLIB_LIBS)
-
-endif # HAVE_GCRYPT
-endif # HAVE_BZIP2
-endif # HAVE_ZLIB
-endif # HAVE_XZ
-endif # HAVE_LIBCURL
-
-endif # ENABLE_IMPORTD
-
-polkitpolicy_in_files += \
-	src/import/org.freedesktop.import1.policy.in
-
-EXTRA_DIST += \
-	units/systemd-importd.service.in
-
-
-include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-import/systemd-export/Makefile b/src/grp-import/systemd-export/Makefile
deleted file mode 100644
index d0e8781faf..0000000000
--- a/src/grp-import/systemd-export/Makefile
+++ /dev/null
@@ -1,51 +0,0 @@
-#  -*- 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
-
-rootlibexec_PROGRAMS += systemd-export
-
-systemd_export_SOURCES = \
-	src/import/export.c \
-	src/import/export-tar.c \
-	src/import/export-tar.h \
-	src/import/export-raw.c \
-	src/import/export-raw.h \
-	src/import/import-common.c \
-	src/import/import-common.h \
-	src/import/import-compress.c \
-	src/import/import-compress.h
-
-systemd_export_CFLAGS = \
-	$(AM_CFLAGS) \
-	$(XZ_CFLAGS) \
-	$(ZLIB_CFLAGS) \
-	$(BZIP2_CFLAGS)
-
-systemd_export_LDADD = \
-	libshared.la \
-	$(XZ_LIBS) \
-	$(ZLIB_LIBS) \
-	$(BZIP2_LIBS)
-
-include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-import/systemd-import/Makefile b/src/grp-import/systemd-import/Makefile
deleted file mode 100644
index 301556ffd5..0000000000
--- a/src/grp-import/systemd-import/Makefile
+++ /dev/null
@@ -1,52 +0,0 @@
-#  -*- 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
-
-rootlibexec_PROGRAMS += systemd-import
-systemd_import_SOURCES = \
-	src/import/import.c \
-	src/import/import-raw.c \
-	src/import/import-raw.h \
-	src/import/import-tar.c \
-	src/import/import-tar.h \
-	src/import/import-common.c \
-	src/import/import-common.h \
-	src/import/import-compress.c \
-	src/import/import-compress.h \
-	src/import/qcow2-util.c \
-	src/import/qcow2-util.h
-
-systemd_import_CFLAGS = \
-	$(AM_CFLAGS) \
-	$(XZ_CFLAGS) \
-	$(ZLIB_CFLAGS) \
-	$(BZIP2_CFLAGS)
-
-systemd_import_LDADD = \
-	libshared.la \
-	$(XZ_LIBS) \
-	$(ZLIB_LIBS) \
-	$(BZIP2_LIBS)
-
-include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-import/systemd-importd/Makefile b/src/grp-import/systemd-importd/Makefile
deleted file mode 100644
index 7911bfce82..0000000000
--- a/src/grp-import/systemd-importd/Makefile
+++ /dev/null
@@ -1,39 +0,0 @@
-#  -*- 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
-
-rootlibexec_PROGRAMS += systemd-importd
-systemd_importd_SOURCES = \
-	src/import/importd.c
-
-systemd_importd_CFLAGS = \
-	$(AM_CFLAGS) \
-	-D SYSTEMD_PULL_PATH=\"$(rootlibexecdir)/systemd-pull\" \
-	-D SYSTEMD_IMPORT_PATH=\"$(rootlibexecdir)/systemd-import\" \
-	-D SYSTEMD_EXPORT_PATH=\"$(rootlibexecdir)/systemd-export\"
-
-systemd_importd_LDADD = \
-	libshared.la
-
-include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-import/systemd-pull/Makefile b/src/grp-import/systemd-pull/Makefile
deleted file mode 100644
index 36505edb5b..0000000000
--- a/src/grp-import/systemd-pull/Makefile
+++ /dev/null
@@ -1,64 +0,0 @@
-#  -*- 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
-
-rootlibexec_PROGRAMS += systemd-pull
-systemd_pull_SOURCES = \
-	src/import/pull.c \
-	src/import/pull-raw.c \
-	src/import/pull-raw.h \
-	src/import/pull-tar.c \
-	src/import/pull-tar.h \
-	src/import/pull-job.c \
-	src/import/pull-job.h \
-	src/import/pull-common.c \
-	src/import/pull-common.h \
-	src/import/import-common.c \
-	src/import/import-common.h \
-	src/import/import-compress.c \
-	src/import/import-compress.h \
-	src/import/curl-util.c \
-	src/import/curl-util.h \
-	src/import/qcow2-util.c \
-	src/import/qcow2-util.h
-
-systemd_pull_CFLAGS = \
-	$(AM_CFLAGS) \
-	$(LIBCURL_CFLAGS) \
-	$(XZ_CFLAGS) \
-	$(ZLIB_CFLAGS) \
-	$(BZIP2_CFLAGS) \
-	$(GCRYPT_CFLAGS) \
-	-D VENDOR_KEYRING_PATH=\"$(rootlibexecdir)/import-pubring.gpg\" \
-	-D USER_KEYRING_PATH=\"$(pkgsysconfdir)/import-pubring.gpg\"
-
-systemd_pull_LDADD = \
-	libshared.la \
-	$(LIBCURL_LIBS) \
-	$(XZ_LIBS) \
-	$(ZLIB_LIBS) \
-	$(BZIP2_LIBS) \
-	$(GCRYPT_LIBS)
-
-include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/systemd-hibernate-resume/hibernate-resume-generator.c b/src/grp-initprogs/grp-sleep/systemd-hibernate-resume-generator/hibernate-resume-generator.c
index d7ee80d58f..d7ee80d58f 100644
--- a/src/systemd-hibernate-resume/hibernate-resume-generator.c
+++ b/src/grp-initprogs/grp-sleep/systemd-hibernate-resume-generator/hibernate-resume-generator.c
diff --git a/man/systemd-hibernate-resume-generator.xml b/src/grp-initprogs/grp-sleep/systemd-hibernate-resume-generator/systemd-hibernate-resume-generator.xml
index d811b9b551..d811b9b551 100644
--- a/man/systemd-hibernate-resume-generator.xml
+++ b/src/grp-initprogs/grp-sleep/systemd-hibernate-resume-generator/systemd-hibernate-resume-generator.xml
diff --git a/src/systemd-hibernate-resume/hibernate-resume.c b/src/grp-initprogs/grp-sleep/systemd-hibernate-resume/hibernate-resume.c
index 21df3c4461..21df3c4461 100644
--- a/src/systemd-hibernate-resume/hibernate-resume.c
+++ b/src/grp-initprogs/grp-sleep/systemd-hibernate-resume/hibernate-resume.c
diff --git a/units/systemd-hibernate-resume@.service.in b/src/grp-initprogs/grp-sleep/systemd-hibernate-resume/systemd-hibernate-resume@.service.in
index 65e8eb83f1..65e8eb83f1 100644
--- a/units/systemd-hibernate-resume@.service.in
+++ b/src/grp-initprogs/grp-sleep/systemd-hibernate-resume/systemd-hibernate-resume@.service.in
diff --git a/src/grp-helperunits/systemd-sleep/sleep.c b/src/grp-initprogs/grp-sleep/systemd-sleep/sleep.c
index 7f8a95728d..7f8a95728d 100644
--- a/src/grp-helperunits/systemd-sleep/sleep.c
+++ b/src/grp-initprogs/grp-sleep/systemd-sleep/sleep.c
diff --git a/src/grp-helperunits/systemd-backlight/backlight.c b/src/grp-initprogs/systemd-backlight/backlight.c
index 45be135a23..45be135a23 100644
--- a/src/grp-helperunits/systemd-backlight/backlight.c
+++ b/src/grp-initprogs/systemd-backlight/backlight.c
diff --git a/units/systemd-backlight@.service.in b/src/grp-initprogs/systemd-backlight/systemd-backlight@.service.in
index 5e6706c11c..5e6706c11c 100644
--- a/units/systemd-backlight@.service.in
+++ b/src/grp-initprogs/systemd-backlight/systemd-backlight@.service.in
diff --git a/src/grp-helperunits/systemd-binfmt/binfmt.c b/src/grp-initprogs/systemd-binfmt/binfmt.c
index eeef04fb1c..eeef04fb1c 100644
--- a/src/grp-helperunits/systemd-binfmt/binfmt.c
+++ b/src/grp-initprogs/systemd-binfmt/binfmt.c
diff --git a/units/systemd-binfmt.service.in b/src/grp-initprogs/systemd-binfmt/systemd-binfmt.service.in
index d53073ee61..d53073ee61 100644
--- a/units/systemd-binfmt.service.in
+++ b/src/grp-initprogs/systemd-binfmt/systemd-binfmt.service.in
diff --git a/src/grp-helperunits/systemd-detect-virt/detect-virt.c b/src/grp-initprogs/systemd-detect-virt/detect-virt.c
index 5d51589a31..5d51589a31 100644
--- a/src/grp-helperunits/systemd-detect-virt/detect-virt.c
+++ b/src/grp-initprogs/systemd-detect-virt/detect-virt.c
diff --git a/man/systemd-detect-virt.xml b/src/grp-initprogs/systemd-detect-virt/systemd-detect-virt.xml
index 2b7f4e69ab..2b7f4e69ab 100644
--- a/man/systemd-detect-virt.xml
+++ b/src/grp-initprogs/systemd-detect-virt/systemd-detect-virt.xml
diff --git a/src/systemd-firstboot/firstboot.c b/src/grp-initprogs/systemd-firstboot/firstboot.c
index 1e1a592b7c..1e1a592b7c 100644
--- a/src/systemd-firstboot/firstboot.c
+++ b/src/grp-initprogs/systemd-firstboot/firstboot.c
diff --git a/units/systemd-firstboot.service.in b/src/grp-initprogs/systemd-firstboot/systemd-firstboot.service.in
index 405c6f3fd2..405c6f3fd2 100644
--- a/units/systemd-firstboot.service.in
+++ b/src/grp-initprogs/systemd-firstboot/systemd-firstboot.service.in
diff --git a/man/systemd-firstboot.xml b/src/grp-initprogs/systemd-firstboot/systemd-firstboot.xml
index b269e48113..b269e48113 100644
--- a/man/systemd-firstboot.xml
+++ b/src/grp-initprogs/systemd-firstboot/systemd-firstboot.xml
diff --git a/src/systemd-fsck/fsck.c b/src/grp-initprogs/systemd-fsck/fsck.c
index d7f0829ffc..d7f0829ffc 100644
--- a/src/systemd-fsck/fsck.c
+++ b/src/grp-initprogs/systemd-fsck/fsck.c
diff --git a/units/systemd-fsck@.service.in b/src/grp-initprogs/systemd-fsck/systemd-fsck@.service.in
index 6ca6b07e9e..6ca6b07e9e 100644
--- a/units/systemd-fsck@.service.in
+++ b/src/grp-initprogs/systemd-fsck/systemd-fsck@.service.in
diff --git a/src/systemd-modules-load/modules-load.c b/src/grp-initprogs/systemd-modules-load/modules-load.c
index f75015d8c3..f75015d8c3 100644
--- a/src/systemd-modules-load/modules-load.c
+++ b/src/grp-initprogs/systemd-modules-load/modules-load.c
diff --git a/units/systemd-modules-load.service.in b/src/grp-initprogs/systemd-modules-load/systemd-modules-load.service.in
index 9de6d31349..9de6d31349 100644
--- a/units/systemd-modules-load.service.in
+++ b/src/grp-initprogs/systemd-modules-load/systemd-modules-load.service.in
diff --git a/src/grp-helperunits/systemd-quotacheck/quotacheck.c b/src/grp-initprogs/systemd-quotacheck/quotacheck.c
index 6d8c05f046..6d8c05f046 100644
--- a/src/grp-helperunits/systemd-quotacheck/quotacheck.c
+++ b/src/grp-initprogs/systemd-quotacheck/quotacheck.c
diff --git a/units/systemd-quotacheck.service.in b/src/grp-initprogs/systemd-quotacheck/systemd-quotacheck.service.in
index 5cb9bc3bc9..5cb9bc3bc9 100644
--- a/units/systemd-quotacheck.service.in
+++ b/src/grp-initprogs/systemd-quotacheck/systemd-quotacheck.service.in
diff --git a/src/grp-helperunits/systemd-random-seed/random-seed.c b/src/grp-initprogs/systemd-random-seed/random-seed.c
index 6748bb9dd3..6748bb9dd3 100644
--- a/src/grp-helperunits/systemd-random-seed/random-seed.c
+++ b/src/grp-initprogs/systemd-random-seed/random-seed.c
diff --git a/units/systemd-random-seed.service.in b/src/grp-initprogs/systemd-random-seed/systemd-random-seed.service.in
index 115233268d..115233268d 100644
--- a/units/systemd-random-seed.service.in
+++ b/src/grp-initprogs/systemd-random-seed/systemd-random-seed.service.in
diff --git a/src/grp-helperunits/systemd-rfkill/rfkill.c b/src/grp-initprogs/systemd-rfkill/rfkill.c
index f0b0ad9275..f0b0ad9275 100644
--- a/src/grp-helperunits/systemd-rfkill/rfkill.c
+++ b/src/grp-initprogs/systemd-rfkill/rfkill.c
diff --git a/units/systemd-rfkill.service.in b/src/grp-initprogs/systemd-rfkill/systemd-rfkill.service.in
index 780a19b996..780a19b996 100644
--- a/units/systemd-rfkill.service.in
+++ b/src/grp-initprogs/systemd-rfkill/systemd-rfkill.service.in
diff --git a/units/systemd-rfkill.socket b/src/grp-initprogs/systemd-rfkill/systemd-rfkill.socket
index 20ae2f8adb..20ae2f8adb 100644
--- a/units/systemd-rfkill.socket
+++ b/src/grp-initprogs/systemd-rfkill/systemd-rfkill.socket
diff --git a/src/systemd-sysctl/sysctl.c b/src/grp-initprogs/systemd-sysctl/sysctl.c
index ce7c26e7d3..ce7c26e7d3 100644
--- a/src/systemd-sysctl/sysctl.c
+++ b/src/grp-initprogs/systemd-sysctl/sysctl.c
diff --git a/units/systemd-sysctl.service.in b/src/grp-initprogs/systemd-sysctl/systemd-sysctl.service.in
index d784c6426d..d784c6426d 100644
--- a/units/systemd-sysctl.service.in
+++ b/src/grp-initprogs/systemd-sysctl/systemd-sysctl.service.in
diff --git a/units/systemd-sysusers.service.in b/src/grp-initprogs/systemd-sysusers/systemd-sysusers.service.in
index 4d8309ab6b..4d8309ab6b 100644
--- a/units/systemd-sysusers.service.in
+++ b/src/grp-initprogs/systemd-sysusers/systemd-sysusers.service.in
diff --git a/man/systemd-sysusers.xml b/src/grp-initprogs/systemd-sysusers/systemd-sysusers.xml
index 4892caad12..4892caad12 100644
--- a/man/systemd-sysusers.xml
+++ b/src/grp-initprogs/systemd-sysusers/systemd-sysusers.xml
diff --git a/src/systemd-sysusers/sysusers.c b/src/grp-initprogs/systemd-sysusers/sysusers.c
index 4377f1b910..4377f1b910 100644
--- a/src/systemd-sysusers/sysusers.c
+++ b/src/grp-initprogs/systemd-sysusers/sysusers.c
diff --git a/man/systemd-tmpfiles.xml b/src/grp-initprogs/systemd-tmpfiles/systemd-tmpfiles.xml
index c1aab51551..c1aab51551 100644
--- a/man/systemd-tmpfiles.xml
+++ b/src/grp-initprogs/systemd-tmpfiles/systemd-tmpfiles.xml
diff --git a/src/systemd-tmpfiles/tmpfiles.c b/src/grp-initprogs/systemd-tmpfiles/tmpfiles.c
index 2053d35a67..2053d35a67 100644
--- a/src/systemd-tmpfiles/tmpfiles.c
+++ b/src/grp-initprogs/systemd-tmpfiles/tmpfiles.c
diff --git a/units/systemd-update-done.service.in b/src/grp-initprogs/systemd-update-done/systemd-update-done.service.in
index ec7d906392..ec7d906392 100644
--- a/units/systemd-update-done.service.in
+++ b/src/grp-initprogs/systemd-update-done/systemd-update-done.service.in
diff --git a/src/systemd-update-done/update-done.c b/src/grp-initprogs/systemd-update-done/update-done.c
index da306a4444..da306a4444 100644
--- a/src/systemd-update-done/update-done.c
+++ b/src/grp-initprogs/systemd-update-done/update-done.c
diff --git a/units/systemd-update-utmp.service.in b/src/grp-initprogs/systemd-update-utmp/systemd-update-utmp.service.in
index 163eccd91f..163eccd91f 100644
--- a/units/systemd-update-utmp.service.in
+++ b/src/grp-initprogs/systemd-update-utmp/systemd-update-utmp.service.in
diff --git a/src/systemd-update-utmp/update-utmp.c b/src/grp-initprogs/systemd-update-utmp/update-utmp.c
index fedcaef91c..fedcaef91c 100644
--- a/src/systemd-update-utmp/update-utmp.c
+++ b/src/grp-initprogs/systemd-update-utmp/update-utmp.c
diff --git a/units/systemd-user-sessions.service.in b/src/grp-initprogs/systemd-user-sessions/systemd-user-sessions.service.in
index b4ea5a134b..b4ea5a134b 100644
--- a/units/systemd-user-sessions.service.in
+++ b/src/grp-initprogs/systemd-user-sessions/systemd-user-sessions.service.in
diff --git a/src/grp-helperunits/systemd-user-sessions/user-sessions.c b/src/grp-initprogs/systemd-user-sessions/user-sessions.c
index 9b29b5ba1d..9b29b5ba1d 100644
--- a/src/grp-helperunits/systemd-user-sessions/user-sessions.c
+++ b/src/grp-initprogs/systemd-user-sessions/user-sessions.c
diff --git a/src/grp-helperunits/systemd-vconsole-setup/.gitignore b/src/grp-initprogs/systemd-vconsole-setup/.gitignore
index 82741b2fb3..82741b2fb3 100644
--- a/src/grp-helperunits/systemd-vconsole-setup/.gitignore
+++ b/src/grp-initprogs/systemd-vconsole-setup/.gitignore
diff --git a/src/grp-helperunits/systemd-vconsole-setup/90-vconsole.rules.in b/src/grp-initprogs/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-initprogs/systemd-vconsole-setup/90-vconsole.rules.in
diff --git a/units/systemd-vconsole-setup.service.in b/src/grp-initprogs/systemd-vconsole-setup/systemd-vconsole-setup.service.in
index 6160361871..6160361871 100644
--- a/units/systemd-vconsole-setup.service.in
+++ b/src/grp-initprogs/systemd-vconsole-setup/systemd-vconsole-setup.service.in
diff --git a/src/grp-helperunits/systemd-vconsole-setup/vconsole-setup.c b/src/grp-initprogs/systemd-vconsole-setup/vconsole-setup.c
index 1118118450..1118118450 100644
--- a/src/grp-helperunits/systemd-vconsole-setup/vconsole-setup.c
+++ b/src/grp-initprogs/systemd-vconsole-setup/vconsole-setup.c
diff --git a/src/grp-journal-remote/Makefile b/src/grp-journal-remote/Makefile
deleted file mode 100644
index 7885bea0fc..0000000000
--- a/src/grp-journal-remote/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-#  -*- 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-journa-gatewayd
-at.subdirs += systemd-journa-remote
-at.subdirs += systemd-journa-upload
-
-include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-journal-remote/systemd-journal-gatewayd/Makefile b/src/grp-journal-remote/systemd-journal-gatewayd/Makefile
deleted file mode 100644
index 05df34a71d..0000000000
--- a/src/grp-journal-remote/systemd-journal-gatewayd/Makefile
+++ /dev/null
@@ -1,68 +0,0 @@
-#  -*- 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
-
-ifneq ($(HAVE_MICROHTTPD),)
-gatewayddocumentrootdir=$(pkgdatadir)/gatewayd
-
-rootlibexec_PROGRAMS += \
-	systemd-journal-gatewayd
-
-systemd_journal_gatewayd_SOURCES = \
-	src/journal-remote/journal-gatewayd.c \
-	src/journal-remote/microhttpd-util.h \
-	src/journal-remote/microhttpd-util.c
-
-systemd_journal_gatewayd_LDADD = \
-	libshared.la \
-	$(MICROHTTPD_LIBS)
-
-ifneq ($(HAVE_GNUTLS),)
-systemd_journal_gatewayd_LDADD += \
-	$(GNUTLS_LIBS)
-endif # HAVE_GNUTLS
-
-systemd_journal_gatewayd_CFLAGS = \
-	$(AM_CFLAGS) \
-	$(MICROHTTPD_CFLAGS)
-
-systemd_journal_gatewayd_CPPFLAGS = \
-	$(AM_CPPFLAGS) \
-	-DDOCUMENT_ROOT=\"$(gatewayddocumentrootdir)\"
-
-dist_systemunit_DATA += \
-	units/systemd-journal-gatewayd.socket
-
-nodist_systemunit_DATA += \
-	units/systemd-journal-gatewayd.service
-
-dist_gatewayddocumentroot_DATA = \
-	src/journal-remote/browse.html
-
-endif # HAVE_MICROHTTPD
-
-EXTRA_DIST += \
-	units/systemd-journal-gatewayd.service.in
-
-include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-journal-remote/systemd-journal-remote/Makefile b/src/grp-journal-remote/systemd-journal-remote/Makefile
deleted file mode 100644
index 05af76afc2..0000000000
--- a/src/grp-journal-remote/systemd-journal-remote/Makefile
+++ /dev/null
@@ -1,85 +0,0 @@
-#  -*- 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
-
-ifneq ($(HAVE_MICROHTTPD),)
-rootlibexec_PROGRAMS += \
-	systemd-journal-remote
-
-systemd_journal_remote_SOURCES = \
-	src/journal-remote/journal-remote-parse.h \
-	src/journal-remote/journal-remote-parse.c \
-	src/journal-remote/journal-remote-write.h \
-	src/journal-remote/journal-remote-write.c \
-	src/journal-remote/journal-remote.h \
-	src/journal-remote/journal-remote.c
-
-systemd_journal_remote_LDADD = \
-	libjournal-core.la
-
-systemd_journal_remote_SOURCES += \
-	src/journal-remote/microhttpd-util.h \
-	src/journal-remote/microhttpd-util.c
-
-systemd_journal_remote_CFLAGS = \
-	$(AM_CFLAGS) \
-	$(MICROHTTPD_CFLAGS)
-
-systemd_journal_remote_LDADD += \
-	$(MICROHTTPD_LIBS)
-
-ifneq ($(ENABLE_TMPFILES),)
-dist_tmpfiles_DATA += \
-	tmpfiles.d/systemd-remote.conf
-endif # ENABLE_TMPFILES
-
-ifneq ($(HAVE_GNUTLS),)
-systemd_journal_remote_LDADD += \
-	$(GNUTLS_LIBS)
-endif # HAVE_GNUTLS
-
-# systemd-journal-remote make sense mostly with full crypto stack
-dist_systemunit_DATA += \
-	units/systemd-journal-remote.socket
-
-nodist_systemunit_DATA += \
-	units/systemd-journal-remote.service
-
-journal-remote-install-hook: journal-install-hook
-	-$(MKDIR_P) $(DESTDIR)/var/log/journal/remote
-	-chown 0:0 $(DESTDIR)/var/log/journal/remote
-	-chmod 755 $(DESTDIR)/var/log/journal/remote
-
-INSTALL_EXEC_HOOKS += journal-remote-install-hook
-
-nodist_pkgsysconf_DATA += \
-	src/journal-remote/journal-remote.conf
-
-EXTRA_DIST += \
-	units/systemd-journal-remote.service.in \
-	src/journal-remote/journal-remote.conf.in \
-	src/journal-remote/log-generator.py
-endif # HAVE_MICROHTTPD
-
-include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-journal-remote/systemd-journal-upload/Makefile b/src/grp-journal-remote/systemd-journal-upload/Makefile
deleted file mode 100644
index c47fcf0128..0000000000
--- a/src/grp-journal-remote/systemd-journal-upload/Makefile
+++ /dev/null
@@ -1,54 +0,0 @@
-#  -*- 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
-
-ifneq ($(HAVE_LIBCURL),)
-rootlibexec_PROGRAMS += \
-        systemd-journal-upload
-
-systemd_journal_upload_SOURCES = \
-        src/journal-remote/journal-upload.h \
-        src/journal-remote/journal-upload.c \
-        src/journal-remote/journal-upload-journal.c
-
-systemd_journal_upload_CFLAGS = \
-        $(AM_CFLAGS) \
-        $(LIBCURL_CFLAGS)
-
-systemd_journal_upload_LDADD = \
-        libshared.la \
-        $(LIBCURL_LIBS)
-
-nodist_systemunit_DATA += \
-        units/systemd-journal-upload.service
-
-nodist_pkgsysconf_DATA += \
-        src/journal-remote/journal-upload.conf
-endif
-
-EXTRA_DIST += \
-        units/systemd-journal-upload.service.in \
-        src/journal-remote/journal-upload.conf.in
-
-include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-journal/Makefile b/src/grp-journal/Makefile
deleted file mode 100644
index fcefb81581..0000000000
--- a/src/grp-journal/Makefile
+++ /dev/null
@@ -1,170 +0,0 @@
-#  -*- 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
-
-test_journal_SOURCES = \
-	src/journal/test-journal.c
-
-test_journal_LDADD = \
-	libjournal-core.la
-
-test_journal_send_SOURCES = \
-	src/journal/test-journal-send.c
-
-test_journal_send_LDADD = \
-	libjournal-core.la
-
-test_journal_syslog_SOURCES = \
-	src/journal/test-journal-syslog.c
-
-test_journal_syslog_LDADD = \
-	libjournal-core.la
-
-test_journal_match_SOURCES = \
-	src/journal/test-journal-match.c
-
-test_journal_match_LDADD = \
-	libjournal-core.la
-
-test_journal_enum_SOURCES = \
-	src/journal/test-journal-enum.c
-
-test_journal_enum_LDADD = \
-	libjournal-core.la
-
-test_journal_stream_SOURCES = \
-	src/journal/test-journal-stream.c
-
-test_journal_stream_LDADD = \
-	libjournal-core.la
-
-test_journal_flush_SOURCES = \
-	src/journal/test-journal-flush.c
-
-test_journal_flush_LDADD = \
-	libjournal-core.la
-
-test_journal_init_SOURCES = \
-	src/journal/test-journal-init.c
-
-test_journal_init_LDADD = \
-	libjournal-core.la
-
-test_journal_verify_SOURCES = \
-	src/journal/test-journal-verify.c
-
-test_journal_verify_LDADD = \
-	libjournal-core.la
-
-test_journal_interleaving_SOURCES = \
-	src/journal/test-journal-interleaving.c
-
-test_journal_interleaving_LDADD = \
-	libjournal-core.la
-
-test_mmap_cache_SOURCES = \
-	src/journal/test-mmap-cache.c
-
-test_mmap_cache_LDADD = \
-	libjournal-core.la
-
-test_catalog_SOURCES = \
-	src/journal/test-catalog.c
-
-test_catalog_CPPFLAGS = \
-	$(AM_CPPFLAGS) \
-	-DCATALOG_DIR=\"$(abs_top_srcdir)/catalog\"
-
-test_catalog_LDADD = \
-	libjournal-core.la
-
-test_compress_SOURCES = \
-	src/journal/test-compress.c
-
-test_compress_LDADD = \
-	libshared.la
-
-test_compress_benchmark_SOURCES = \
-	src/journal/test-compress-benchmark.c
-
-test_compress_benchmark_LDADD = \
-	libshared.la
-
-test_audit_type_SOURCES = \
-	src/journal/test-audit-type.c
-
-test_audit_type_LDADD = \
-	libjournal-core.la
-
-journal-install-hook:
-	-$(MKDIR_P) $(DESTDIR)/var/log/journal
-	-chown 0:0 $(DESTDIR)/var/log/journal
-	-chmod 755 $(DESTDIR)/var/log/journal
-	-setfacl -nm g:adm:rx,d:g:adm:rx $(DESTDIR)/var/log/journal/
-	-setfacl -nm g:wheel:rx,d:g:wheel:rx $(DESTDIR)/var/log/journal/
-
-journal-uninstall-hook:
-	-rmdir $(DESTDIR)/var/log/journal/remote
-	-rmdir $(DESTDIR)/var/log/journal/
-
-INSTALL_EXEC_HOOKS += journal-install-hook
-UNINSTALL_EXEC_HOOKS += journal-uninstall-hook
-
-# ------------------------------------------------------------------------------
-# Update catalog on installation. Do not bother if installing
-# in DESTDIR, since this is likely for packaging purposes.
-catalog-update-hook:
-	-test -n "$(DESTDIR)" || $(rootbindir)/journalctl --update-catalog
-
-INSTALL_DATA_HOOKS += \
-	catalog-update-hook
-
-catalog-remove-hook:
-	-test -n "$(DESTDIR)" || rm -f $(catalogstatedir)/database
-
-UNINSTALL_DATA_HOOKS += \
-	catalog-remove-hook
-
-tests += \
-	test-journal \
-	test-journal-enum \
-	test-journal-send \
-	test-journal-syslog \
-	test-journal-match \
-	test-journal-stream \
-	test-journal-init \
-	test-journal-verify \
-	test-journal-interleaving \
-	test-journal-flush \
-	test-mmap-cache \
-	test-catalog \
-	test-audit-type
-
-ifneq ($(HAVE_COMPRESSION),)
-tests += \
-	test-compress \
-	test-compress-benchmark
-endif # HAVE_COMPRESSION
-
-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/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 c65c43186f..c65c43186f 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 ea160f212b..ea160f212b 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/journal-gatewayd.c b/src/grp-journal/grp-remote/systemd-journal-gatewayd/journal-gatewayd.c
index 1cfb5e2c9c..1cfb5e2c9c 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/units/systemd-journal-gatewayd.service.in b/src/grp-journal/grp-remote/systemd-journal-gatewayd/systemd-journal-gatewayd.service.in
index f4f845841d..f4f845841d 100644
--- a/units/systemd-journal-gatewayd.service.in
+++ b/src/grp-journal/grp-remote/systemd-journal-gatewayd/systemd-journal-gatewayd.service.in
diff --git a/units/systemd-journal-gatewayd.socket b/src/grp-journal/grp-remote/systemd-journal-gatewayd/systemd-journal-gatewayd.socket
index 79d9b04210..79d9b04210 100644
--- a/units/systemd-journal-gatewayd.socket
+++ b/src/grp-journal/grp-remote/systemd-journal-gatewayd/systemd-journal-gatewayd.socket
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 9ba9ee3fc0..9ba9ee3fc0 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 7bba52566e..7bba52566e 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 9b4d12d336..9b4d12d336 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 58487e498a..58487e498a 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/units/systemd-journal-remote.service.in b/src/grp-journal/grp-remote/systemd-journal-remote/systemd-journal-remote.service.in
index fdf3da4b64..fdf3da4b64 100644
--- a/units/systemd-journal-remote.service.in
+++ b/src/grp-journal/grp-remote/systemd-journal-remote/systemd-journal-remote.service.in
diff --git a/units/systemd-journal-remote.socket b/src/grp-journal/grp-remote/systemd-journal-remote/systemd-journal-remote.socket
index 076dcae8a3..076dcae8a3 100644
--- a/units/systemd-journal-remote.socket
+++ b/src/grp-journal/grp-remote/systemd-journal-remote/systemd-journal-remote.socket
diff --git a/man/systemd-journal-remote.xml b/src/grp-journal/grp-remote/systemd-journal-remote/systemd-journal-remote.xml
index 3899f175d4..3899f175d4 100644
--- a/man/systemd-journal-remote.xml
+++ b/src/grp-journal/grp-remote/systemd-journal-remote/systemd-journal-remote.xml
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 aef095c8c9..aef095c8c9 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 e622f6c1e1..e622f6c1e1 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 4a521bf78f..4a521bf78f 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/units/systemd-journal-upload.service.in b/src/grp-journal/grp-remote/systemd-journal-upload/systemd-journal-upload.service.in
index 1f488ff425..1f488ff425 100644
--- a/units/systemd-journal-upload.service.in
+++ b/src/grp-journal/grp-remote/systemd-journal-upload/systemd-journal-upload.service.in
diff --git a/man/systemd-journal-upload.xml b/src/grp-journal/grp-remote/systemd-journal-upload/systemd-journal-upload.xml
index f9723dea89..f9723dea89 100644
--- a/man/systemd-journal-upload.xml
+++ b/src/grp-journal/grp-remote/systemd-journal-upload/systemd-journal-upload.xml
diff --git a/src/grp-journal/journalctl/Makefile b/src/grp-journal/journalctl/Makefile
deleted file mode 100644
index c3cdb6b27a..0000000000
--- a/src/grp-journal/journalctl/Makefile
+++ /dev/null
@@ -1,49 +0,0 @@
-#  -*- 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
-
-# using _CFLAGS = in the conditional below would suppress AM_CFLAGS
-journalctl_CFLAGS = \
-	$(AM_CFLAGS)
-
-journalctl_SOURCES = \
-	src/journal/journalctl.c
-
-journalctl_LDADD = \
-	libshared.la \
-	libudev-core.la
-
-ifneq ($(HAVE_QRENCODE),)
-journalctl_SOURCES += \
-	src/journal/journal-qrcode.c \
-	src/journal/journal-qrcode.h
-
-journalctl_CFLAGS += \
-	$(QRENCODE_CFLAGS)
-
-journalctl_LDADD += \
-	$(QRENCODE_LIBS)
-endif # HAVE_QRENCODE
-
-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/man/journalctl.xml b/src/grp-journal/journalctl/journalctl.xml
index 3efe6ef62a..3efe6ef62a 100644
--- a/man/journalctl.xml
+++ b/src/grp-journal/journalctl/journalctl.xml
diff --git a/src/grp-journal/.gitignore b/src/grp-journal/libjournal-core/.gitignore
index 04d5852547..04d5852547 100644
--- a/src/grp-journal/.gitignore
+++ b/src/grp-journal/libjournal-core/.gitignore
diff --git a/src/grp-journal/libjournal-core/Makefile b/src/grp-journal/libjournal-core/Makefile
deleted file mode 100644
index d55aebfb49..0000000000
--- a/src/grp-journal/libjournal-core/Makefile
+++ /dev/null
@@ -1,56 +0,0 @@
-#  -*- 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
-
-libjournal_core_la_SOURCES = \
-	src/journal/journald-kmsg.c \
-	src/journal/journald-kmsg.h \
-	src/journal/journald-syslog.c \
-	src/journal/journald-syslog.h \
-	src/journal/journald-stream.c \
-	src/journal/journald-stream.h \
-	src/journal/journald-server.c \
-	src/journal/journald-server.h \
-	src/journal/journald-console.c \
-	src/journal/journald-console.h \
-	src/journal/journald-wall.c \
-	src/journal/journald-wall.h \
-	src/journal/journald-native.c \
-	src/journal/journald-native.h \
-	src/journal/journald-audit.c \
-	src/journal/journald-audit.h \
-	src/journal/journald-rate-limit.c \
-	src/journal/journald-rate-limit.h \
-	src/journal/journal-internal.h
-
-nodist_libjournal_core_la_SOURCES = \
-	src/journal/journald-gperf.c
-
-libjournal_core_la_LIBADD = \
-	libshared.la
-
-noinst_LTLIBRARIES += \
-	libjournal-core.la
-
-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 93ab6e7f96..93ab6e7f96 100644
--- a/src/grp-journal/libjournal-core/cat.c
+++ b/src/grp-journal/systemd-cat/cat.c
diff --git a/man/systemd-cat.xml b/src/grp-journal/systemd-cat/systemd-cat.xml
index 160db9fb5c..160db9fb5c 100644
--- a/man/systemd-cat.xml
+++ b/src/grp-journal/systemd-cat/systemd-cat.xml
diff --git a/src/grp-journal/systemd-journald/Makefile b/src/grp-journal/systemd-journald/Makefile
deleted file mode 100644
index 755e2d2c36..0000000000
--- a/src/grp-journal/systemd-journald/Makefile
+++ /dev/null
@@ -1,94 +0,0 @@
-#  -*- 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_journald_SOURCES = \
-	src/journal/journald.c \
-	src/journal/journald-server.h
-
-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 \
-	units/systemd-journald-audit.socket
-
-nodist_systemunit_DATA += \
-	units/systemd-journald.service \
-	units/systemd-journal-flush.service \
-	units/systemd-journal-catalog-update.service
-
-dist_pkgsysconf_DATA += \
-	src/journal/journald.conf
-
-dist_catalog_DATA = \
-	catalog/systemd.bg.catalog \
-	catalog/systemd.be.catalog \
-	catalog/systemd.be@latin.catalog \
-	catalog/systemd.fr.catalog \
-	catalog/systemd.it.catalog \
-	catalog/systemd.pl.catalog \
-	catalog/systemd.pt_BR.catalog \
-	catalog/systemd.ru.catalog \
-	catalog/systemd.zh_CN.catalog \
-	catalog/systemd.zh_TW.catalog \
-	catalog/systemd.catalog
-
-SOCKETS_TARGET_WANTS += \
-	systemd-journald.socket \
-	systemd-journald-dev-log.socket \
-	systemd-journald-audit.socket
-
-SYSINIT_TARGET_WANTS += \
-	systemd-journald.service \
-	systemd-journal-flush.service \
-	systemd-journal-catalog-update.service
-
-EXTRA_DIST += \
-	units/systemd-journald.service.in \
-	units/systemd-journal-flush.service.in \
-	units/systemd-journal-catalog-update.service.in
-
-gperf_gperf_sources += \
-	src/journal/journald-gperf.gperf
-
-include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-journal/libjournal-core/journald.conf b/src/grp-journal/systemd-journald/journald.conf
index 2541b949be..2541b949be 100644
--- a/src/grp-journal/libjournal-core/journald.conf
+++ b/src/grp-journal/systemd-journald/journald.conf
diff --git a/units/systemd-journald.service.in b/src/grp-journal/systemd-journald/systemd-journald.service.in
index 41bfde5be3..41bfde5be3 100644
--- a/units/systemd-journald.service.in
+++ b/src/grp-journal/systemd-journald/systemd-journald.service.in
diff --git a/units/systemd-journald.socket b/src/grp-journal/systemd-journald/systemd-journald.socket
index 71737014ca..71737014ca 100644
--- a/units/systemd-journald.socket
+++ b/src/grp-journal/systemd-journald/systemd-journald.socket
diff --git a/src/grp-locale/Makefile b/src/grp-locale/Makefile
deleted file mode 100644
index b34c066ec2..0000000000
--- a/src/grp-locale/Makefile
+++ /dev/null
@@ -1,90 +0,0 @@
-#  -*- 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
-
-ifneq ($(ENABLE_LOCALED),)
-systemd_localed_SOURCES = \
-	src/locale/localed.c
-
-systemd_localed_LDADD = \
-	libshared.la \
-	-ldl
-
-systemd_localed_CFLAGS = \
-	$(AM_CFLAGS) \
-	$(XKBCOMMON_CFLAGS)
-
-nodist_systemunit_DATA += \
-	units/systemd-localed.service
-
-dist_systemunit_DATA_busnames += \
-	units/org.freedesktop.locale1.busname
-
-rootlibexec_PROGRAMS += \
-	systemd-localed
-
-dist_dbuspolicy_DATA += \
-	src/locale/org.freedesktop.locale1.conf
-
-dist_dbussystemservice_DATA += \
-	src/locale/org.freedesktop.locale1.service
-
-polkitpolicy_files += \
-	src/locale/org.freedesktop.locale1.policy
-
-SYSTEM_UNIT_ALIASES += \
-	systemd-localed.service dbus-org.freedesktop.locale1.service
-
-BUSNAMES_TARGET_WANTS += \
-	org.freedesktop.locale1.busname
-
-dist_pkgdata_DATA = \
-	src/locale/kbd-model-map \
-	src/locale/language-fallback-map
-
-localectl_SOURCES = \
-	src/locale/localectl.c
-
-localectl_LDADD = \
-	libshared.la
-
-bin_PROGRAMS += \
-	localectl
-
-dist_bashcompletion_data += \
-	shell-completion/bash/localectl
-
-dist_zshcompletion_data += \
-	shell-completion/zsh/_localectl
-endif # ENABLE_LOCALED
-
-.PHONY: update-kbd-model-map
-
-polkitpolicy_in_files += \
-	src/locale/org.freedesktop.locale1.policy.in
-
-EXTRA_DIST += \
-	units/systemd-localed.service.in
-
-include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-locale/localectl.c b/src/grp-locale/localectl/localectl.c
index c1b0a56346..c1b0a56346 100644
--- a/src/grp-locale/localectl.c
+++ b/src/grp-locale/localectl/localectl.c
diff --git a/man/localectl.xml b/src/grp-locale/localectl/localectl.xml
index 7def047f62..7def047f62 100644
--- a/man/localectl.xml
+++ b/src/grp-locale/localectl/localectl.xml
diff --git a/src/grp-locale/.gitignore b/src/grp-locale/systemd-localed/.gitignore
index b1e0ba755e..b1e0ba755e 100644
--- a/src/grp-locale/.gitignore
+++ b/src/grp-locale/systemd-localed/.gitignore
diff --git a/src/grp-locale/kbd-model-map b/src/grp-locale/systemd-localed/kbd-model-map
index 8fa984f83b..8fa984f83b 100644
--- a/src/grp-locale/kbd-model-map
+++ b/src/grp-locale/systemd-localed/kbd-model-map
diff --git a/src/grp-locale/language-fallback-map b/src/grp-locale/systemd-localed/language-fallback-map
index d0b02a6b98..d0b02a6b98 100644
--- a/src/grp-locale/language-fallback-map
+++ b/src/grp-locale/systemd-localed/language-fallback-map
diff --git a/src/grp-locale/localed.c b/src/grp-locale/systemd-localed/localed.c
index 7b4cbadfd0..7b4cbadfd0 100644
--- a/src/grp-locale/localed.c
+++ b/src/grp-locale/systemd-localed/localed.c
diff --git a/src/grp-locale/org.freedesktop.locale1.conf b/src/grp-locale/systemd-localed/org.freedesktop.locale1.conf
index 79d0ecd2bb..79d0ecd2bb 100644
--- a/src/grp-locale/org.freedesktop.locale1.conf
+++ b/src/grp-locale/systemd-localed/org.freedesktop.locale1.conf
diff --git a/src/grp-locale/org.freedesktop.locale1.policy.in b/src/grp-locale/systemd-localed/org.freedesktop.locale1.policy.in
index df63845e9b..df63845e9b 100644
--- a/src/grp-locale/org.freedesktop.locale1.policy.in
+++ b/src/grp-locale/systemd-localed/org.freedesktop.locale1.policy.in
diff --git a/src/grp-locale/org.freedesktop.locale1.service b/src/grp-locale/systemd-localed/org.freedesktop.locale1.service
index 025f9a0fc2..025f9a0fc2 100644
--- a/src/grp-locale/org.freedesktop.locale1.service
+++ b/src/grp-locale/systemd-localed/org.freedesktop.locale1.service
diff --git a/units/systemd-localed.service.in b/src/grp-locale/systemd-localed/systemd-localed.service.in
index 9b13f901a3..9b13f901a3 100644
--- a/units/systemd-localed.service.in
+++ b/src/grp-locale/systemd-localed/systemd-localed.service.in
diff --git a/src/grp-login/Makefile b/src/grp-login/Makefile
deleted file mode 100644
index 381d653166..0000000000
--- a/src/grp-login/Makefile
+++ /dev/null
@@ -1,115 +0,0 @@
-#  -*- 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
-
-ifneq ($(ENABLE_LOGIND),)
-test_login_SOURCES = \
-	src/libsystemd/sd-login/test-login.c
-
-test_login_LDADD = \
-	libshared.la
-
-test_login_shared_SOURCES = \
-	src/login/test-login-shared.c
-
-test_login_shared_LDADD = \
-	libshared.la
-
-test_inhibit_SOURCES = \
-	src/login/test-inhibit.c
-
-test_inhibit_LDADD = \
-	libshared.la
-
-test_login_tables_SOURCES = \
-	src/login/test-login-tables.c
-
-test_login_tables_LDADD = \
-	liblogind-core.la
-
-manual_tests += \
-	test-login \
-	test-inhibit
-
-tests += \
-	test-login-tables \
-	test-login-shared
-
-
-nodist_systemunit_DATA += \
-	units/systemd-logind.service
-
-dist_systemunit_DATA += \
-	units/user.slice
-
-dist_systemunit_DATA_busnames += \
-	units/org.freedesktop.login1.busname
-
-dist_dbussystemservice_DATA += \
-	src/login/org.freedesktop.login1.service
-
-dist_dbuspolicy_DATA += \
-	src/login/org.freedesktop.login1.conf
-
-nodist_pkgsysconf_DATA += \
-	src/login/logind.conf
-
-polkitpolicy_files += \
-	src/login/org.freedesktop.login1.policy
-
-INSTALL_DIRS += \
-	$(systemdstatedir)
-
-MULTI_USER_TARGET_WANTS += \
-	systemd-logind.service
-
-SYSTEM_UNIT_ALIASES += \
-	systemd-logind.service dbus-org.freedesktop.login1.service
-
-BUSNAMES_TARGET_WANTS += \
-	org.freedesktop.login1.busname
-
-dist_udevrules_DATA += \
-	src/login/70-uaccess.rules \
-	src/login/70-power-switch.rules
-
-nodist_udevrules_DATA += \
-	src/login/71-seat.rules \
-	src/login/73-seat-late.rules
-
-endif # ENABLE_LOGIND
-
-polkitpolicy_in_files += \
-	src/login/org.freedesktop.login1.policy.in
-
-gperf_gperf_sources += \
-	src/login/logind-gperf.gperf
-
-EXTRA_DIST += \
-	src/login/71-seat.rules.in \
-	src/login/73-seat-late.rules.in \
-	units/systemd-logind.service.in \
-	src/login/logind.conf.in
-
-include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-login/liblogind-core/Makefile b/src/grp-login/liblogind-core/Makefile
deleted file mode 100644
index 1575518aec..0000000000
--- a/src/grp-login/liblogind-core/Makefile
+++ /dev/null
@@ -1,62 +0,0 @@
-#  -*- 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
-
-liblogind_core_la_SOURCES = \
-	src/login/logind-core.c \
-	src/login/logind-device.c \
-	src/login/logind-device.h \
-	src/login/logind-button.c \
-	src/login/logind-button.h \
-	src/login/logind-action.c \
-	src/login/logind-action.h \
-	src/login/logind-seat.c \
-	src/login/logind-seat.h \
-	src/login/logind-session.c \
-	src/login/logind-session.h \
-	src/login/logind-session-device.c \
-	src/login/logind-session-device.h \
-	src/login/logind-user.c \
-	src/login/logind-user.h \
-	src/login/logind-inhibit.c \
-	src/login/logind-inhibit.h \
-	src/login/logind-dbus.c \
-	src/login/logind-session-dbus.c \
-	src/login/logind-seat-dbus.c \
-	src/login/logind-user-dbus.c \
-	src/login/logind-utmp.c \
-	src/login/logind-acl.h
-
-liblogind_core_la_LIBADD = \
-	libshared.la
-
-ifneq ($(HAVE_ACL),)
-liblogind_core_la_SOURCES += \
-	src/login/logind-acl.c
-endif # HAVE_ACL
-
-noinst_LTLIBRARIES += \
-	liblogind-core.la
-
-include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-login/loginctl/Makefile b/src/grp-login/loginctl/Makefile
deleted file mode 100644
index 7c8c3d91a0..0000000000
--- a/src/grp-login/loginctl/Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
-#  -*- 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
-
-loginctl_SOURCES = \
-	src/login/loginctl.c \
-	src/login/sysfs-show.h \
-	src/login/sysfs-show.c
-
-loginctl_LDADD = \
-	libshared.la
-
-rootbin_PROGRAMS += \
-	loginctl
-
-dist_bashcompletion_data += \
-	shell-completion/bash/loginctl
-
-dist_zshcompletion_data += shell-completion/zsh/_loginctl
-include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/man/loginctl.xml b/src/grp-login/loginctl/loginctl.xml
index fb51740503..fb51740503 100644
--- a/man/loginctl.xml
+++ b/src/grp-login/loginctl/loginctl.xml
diff --git a/src/grp-login/pam_systemd/Makefile b/src/grp-login/pam_systemd/Makefile
deleted file mode 100644
index 8c87421bb0..0000000000
--- a/src/grp-login/pam_systemd/Makefile
+++ /dev/null
@@ -1,56 +0,0 @@
-#  -*- 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
-
-ifneq ($(HAVE_PAM),)
-pam_systemd_la_SOURCES = \
-	src/login/pam_systemd.sym \
-	src/login/pam_systemd.c
-
-pam_systemd_la_CFLAGS = \
-	$(AM_CFLAGS) \
-	$(PAM_CFLAGS)
-
-pam_systemd_la_LDFLAGS = \
-	$(AM_LDFLAGS) \
-	-module \
-	-export-dynamic \
-	-avoid-version \
-	-shared \
-	-Wl,--version-script=$(srcdir)/pam_systemd.sym
-
-pam_systemd_la_LIBADD = \
-	libshared.la \
-	$(PAM_LIBS)
-
-pamlib_LTLIBRARIES = \
-	pam_systemd.la
-
-dist_pamconf_DATA = \
-	src/login/systemd-user
-
-EXTRA_DIST += \
-	src/login/systemd-user.m4
-endif # HAVE_PAM
-include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/man/pam_systemd.xml b/src/grp-login/pam_systemd/pam_systemd.xml
index ddda81bc90..ddda81bc90 100644
--- a/man/pam_systemd.xml
+++ b/src/grp-login/pam_systemd/pam_systemd.xml
diff --git a/src/grp-login/systemd-inhibit/Makefile b/src/grp-login/systemd-inhibit/Makefile
deleted file mode 100644
index 93440da575..0000000000
--- a/src/grp-login/systemd-inhibit/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-#  -*- 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
-
-dist_zshcompletion_data += shell-completion/zsh/_systemd-inhibit
-
-systemd_inhibit_SOURCES = \
-	src/login/inhibit.c
-
-systemd_inhibit_LDADD = \
-	libshared.la
-
-rootbin_PROGRAMS += \
-	systemd-inhibit
-
-include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/man/systemd-inhibit.xml b/src/grp-login/systemd-inhibit/systemd-inhibit.xml
index 9d85908f97..9d85908f97 100644
--- a/man/systemd-inhibit.xml
+++ b/src/grp-login/systemd-inhibit/systemd-inhibit.xml
diff --git a/src/grp-login/70-power-switch.rules b/src/grp-login/systemd-logind/70-power-switch.rules
index e2855b50f7..e2855b50f7 100644
--- a/src/grp-login/70-power-switch.rules
+++ b/src/grp-login/systemd-logind/70-power-switch.rules
diff --git a/src/grp-login/70-uaccess.rules b/src/grp-login/systemd-logind/70-uaccess.rules
index 50dcd2e275..50dcd2e275 100644
--- a/src/grp-login/70-uaccess.rules
+++ b/src/grp-login/systemd-logind/70-uaccess.rules
diff --git a/src/grp-login/71-seat.rules.in b/src/grp-login/systemd-logind/71-seat.rules.in
index de55c9a4ec..de55c9a4ec 100644
--- a/src/grp-login/71-seat.rules.in
+++ b/src/grp-login/systemd-logind/71-seat.rules.in
diff --git a/src/grp-login/73-seat-late.rules.in b/src/grp-login/systemd-logind/73-seat-late.rules.in
index 901df750fd..901df750fd 100644
--- a/src/grp-login/73-seat-late.rules.in
+++ b/src/grp-login/systemd-logind/73-seat-late.rules.in
diff --git a/src/grp-login/systemd-logind/Makefile b/src/grp-login/systemd-logind/Makefile
deleted file mode 100644
index 9dd5855e88..0000000000
--- a/src/grp-login/systemd-logind/Makefile
+++ /dev/null
@@ -1,39 +0,0 @@
-#  -*- 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_logind_SOURCES = \
-	src/login/logind.c \
-	src/login/logind.h
-
-nodist_systemd_logind_SOURCES = \
-	src/login/logind-gperf.c
-
-systemd_logind_LDADD = \
-	liblogind-core.la
-
-rootlibexec_PROGRAMS += \
-	systemd-logind
-
-include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-login/liblogind-core/logind-acl.c b/src/grp-login/systemd-logind/logind-acl.c
index 0cef88a82d..0cef88a82d 100644
--- a/src/grp-login/liblogind-core/logind-acl.c
+++ b/src/grp-login/systemd-logind/logind-acl.c
diff --git a/src/grp-login/liblogind-core/logind-acl.h b/src/grp-login/systemd-logind/logind-acl.h
index 1286c6a3cd..1286c6a3cd 100644
--- a/src/grp-login/liblogind-core/logind-acl.h
+++ b/src/grp-login/systemd-logind/logind-acl.h
diff --git a/src/grp-login/liblogind-core/logind-action.c b/src/grp-login/systemd-logind/logind-action.c
index 9a8089f97c..9a8089f97c 100644
--- a/src/grp-login/liblogind-core/logind-action.c
+++ b/src/grp-login/systemd-logind/logind-action.c
diff --git a/src/grp-login/liblogind-core/logind-action.h b/src/grp-login/systemd-logind/logind-action.h
index fb40ae48d2..fb40ae48d2 100644
--- a/src/grp-login/liblogind-core/logind-action.h
+++ b/src/grp-login/systemd-logind/logind-action.h
diff --git a/src/grp-login/liblogind-core/logind-button.c b/src/grp-login/systemd-logind/logind-button.c
index acf7504a2e..acf7504a2e 100644
--- a/src/grp-login/liblogind-core/logind-button.c
+++ b/src/grp-login/systemd-logind/logind-button.c
diff --git a/src/grp-login/liblogind-core/logind-button.h b/src/grp-login/systemd-logind/logind-button.h
index f30cba2959..f30cba2959 100644
--- a/src/grp-login/liblogind-core/logind-button.h
+++ b/src/grp-login/systemd-logind/logind-button.h
diff --git a/src/grp-login/liblogind-core/logind-core.c b/src/grp-login/systemd-logind/logind-core.c
index cbf8d757fe..cbf8d757fe 100644
--- a/src/grp-login/liblogind-core/logind-core.c
+++ b/src/grp-login/systemd-logind/logind-core.c
diff --git a/src/grp-login/liblogind-core/logind-dbus.c b/src/grp-login/systemd-logind/logind-dbus.c
index 90dcd94710..90dcd94710 100644
--- a/src/grp-login/liblogind-core/logind-dbus.c
+++ b/src/grp-login/systemd-logind/logind-dbus.c
diff --git a/src/grp-login/liblogind-core/logind-device.c b/src/grp-login/systemd-logind/logind-device.c
index eb5edd1cd5..eb5edd1cd5 100644
--- a/src/grp-login/liblogind-core/logind-device.c
+++ b/src/grp-login/systemd-logind/logind-device.c
diff --git a/src/grp-login/liblogind-core/logind-device.h b/src/grp-login/systemd-logind/logind-device.h
index 927068e00a..927068e00a 100644
--- a/src/grp-login/liblogind-core/logind-device.h
+++ b/src/grp-login/systemd-logind/logind-device.h
diff --git a/src/grp-login/liblogind-core/logind-gperf.gperf b/src/grp-login/systemd-logind/logind-gperf.gperf
index 6bd08adc05..6bd08adc05 100644
--- a/src/grp-login/liblogind-core/logind-gperf.gperf
+++ b/src/grp-login/systemd-logind/logind-gperf.gperf
diff --git a/src/grp-login/liblogind-core/logind-inhibit.c b/src/grp-login/systemd-logind/logind-inhibit.c
index 6c78e0dddc..6c78e0dddc 100644
--- a/src/grp-login/liblogind-core/logind-inhibit.c
+++ b/src/grp-login/systemd-logind/logind-inhibit.c
diff --git a/src/grp-login/liblogind-core/logind-inhibit.h b/src/grp-login/systemd-logind/logind-inhibit.h
index 70de199c60..70de199c60 100644
--- a/src/grp-login/liblogind-core/logind-inhibit.h
+++ b/src/grp-login/systemd-logind/logind-inhibit.h
diff --git a/src/grp-login/liblogind-core/logind-seat-dbus.c b/src/grp-login/systemd-logind/logind-seat-dbus.c
index f934a5326a..f934a5326a 100644
--- a/src/grp-login/liblogind-core/logind-seat-dbus.c
+++ b/src/grp-login/systemd-logind/logind-seat-dbus.c
diff --git a/src/grp-login/liblogind-core/logind-seat.c b/src/grp-login/systemd-logind/logind-seat.c
index aec67718a1..aec67718a1 100644
--- a/src/grp-login/liblogind-core/logind-seat.c
+++ b/src/grp-login/systemd-logind/logind-seat.c
diff --git a/src/grp-login/liblogind-core/logind-seat.h b/src/grp-login/systemd-logind/logind-seat.h
index 9a4fbc5bc5..9a4fbc5bc5 100644
--- a/src/grp-login/liblogind-core/logind-seat.h
+++ b/src/grp-login/systemd-logind/logind-seat.h
diff --git a/src/grp-login/liblogind-core/logind-session-dbus.c b/src/grp-login/systemd-logind/logind-session-dbus.c
index 22dea5db1f..22dea5db1f 100644
--- a/src/grp-login/liblogind-core/logind-session-dbus.c
+++ b/src/grp-login/systemd-logind/logind-session-dbus.c
diff --git a/src/grp-login/liblogind-core/logind-session-device.c b/src/grp-login/systemd-logind/logind-session-device.c
index 4055a23277..4055a23277 100644
--- a/src/grp-login/liblogind-core/logind-session-device.c
+++ b/src/grp-login/systemd-logind/logind-session-device.c
diff --git a/src/grp-login/liblogind-core/logind-session-device.h b/src/grp-login/systemd-logind/logind-session-device.h
index 7c8503583f..7c8503583f 100644
--- a/src/grp-login/liblogind-core/logind-session-device.h
+++ b/src/grp-login/systemd-logind/logind-session-device.h
diff --git a/src/grp-login/liblogind-core/logind-session.c b/src/grp-login/systemd-logind/logind-session.c
index 11a83106b1..11a83106b1 100644
--- a/src/grp-login/liblogind-core/logind-session.c
+++ b/src/grp-login/systemd-logind/logind-session.c
diff --git a/src/grp-login/liblogind-core/logind-session.h b/src/grp-login/systemd-logind/logind-session.h
index ffb7cd2d41..ffb7cd2d41 100644
--- a/src/grp-login/liblogind-core/logind-session.h
+++ b/src/grp-login/systemd-logind/logind-session.h
diff --git a/src/grp-login/liblogind-core/logind-user-dbus.c b/src/grp-login/systemd-logind/logind-user-dbus.c
index af6392e025..af6392e025 100644
--- a/src/grp-login/liblogind-core/logind-user-dbus.c
+++ b/src/grp-login/systemd-logind/logind-user-dbus.c
diff --git a/src/grp-login/liblogind-core/logind-user.c b/src/grp-login/systemd-logind/logind-user.c
index a826321bf0..a826321bf0 100644
--- a/src/grp-login/liblogind-core/logind-user.c
+++ b/src/grp-login/systemd-logind/logind-user.c
diff --git a/src/grp-login/liblogind-core/logind-user.h b/src/grp-login/systemd-logind/logind-user.h
index 4f0966dc77..4f0966dc77 100644
--- a/src/grp-login/liblogind-core/logind-user.h
+++ b/src/grp-login/systemd-logind/logind-user.h
diff --git a/src/grp-login/liblogind-core/logind-utmp.c b/src/grp-login/systemd-logind/logind-utmp.c
index 47599fd466..47599fd466 100644
--- a/src/grp-login/liblogind-core/logind-utmp.c
+++ b/src/grp-login/systemd-logind/logind-utmp.c
diff --git a/src/grp-login/logind.conf.in b/src/grp-login/systemd-logind/logind.conf.in
index 32c0844cb6..32c0844cb6 100644
--- a/src/grp-login/logind.conf.in
+++ b/src/grp-login/systemd-logind/logind.conf.in
diff --git a/src/grp-login/org.freedesktop.login1.conf b/src/grp-login/systemd-logind/org.freedesktop.login1.conf
index c89e40457e..c89e40457e 100644
--- a/src/grp-login/org.freedesktop.login1.conf
+++ b/src/grp-login/systemd-logind/org.freedesktop.login1.conf
diff --git a/src/grp-login/org.freedesktop.login1.policy.in b/src/grp-login/systemd-logind/org.freedesktop.login1.policy.in
index 1fa6441629..1fa6441629 100644
--- a/src/grp-login/org.freedesktop.login1.policy.in
+++ b/src/grp-login/systemd-logind/org.freedesktop.login1.policy.in
diff --git a/src/grp-login/org.freedesktop.login1.service b/src/grp-login/systemd-logind/org.freedesktop.login1.service
index 762dae2bb3..762dae2bb3 100644
--- a/src/grp-login/org.freedesktop.login1.service
+++ b/src/grp-login/systemd-logind/org.freedesktop.login1.service
diff --git a/units/systemd-logind.service.in b/src/grp-login/systemd-logind/systemd-logind.service.in
index ff049134ee..ff049134ee 100644
--- a/units/systemd-logind.service.in
+++ b/src/grp-login/systemd-logind/systemd-logind.service.in
diff --git a/src/grp-login/systemd-user.m4 b/src/grp-login/systemd-logind/systemd-user.pam.m4
index f188a8e548..f188a8e548 100644
--- a/src/grp-login/systemd-user.m4
+++ b/src/grp-login/systemd-logind/systemd-user.pam.m4
diff --git a/src/grp-machine/Makefile b/src/grp-machine/Makefile
deleted file mode 100644
index 7412341233..0000000000
--- a/src/grp-machine/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-#  -*- 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 += machinectl systemd-machined
-at.subdirs += nss-mymachines
-
-include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-import/systemd-import/import-common.c b/src/grp-machine/grp-import/libimport/import-common.c
index 287a3382a1..287a3382a1 100644
--- a/src/grp-import/systemd-import/import-common.c
+++ b/src/grp-machine/grp-import/libimport/import-common.c
diff --git a/src/grp-import/systemd-import/import-common.h b/src/grp-machine/grp-import/libimport/import-common.h
index 07d3250e71..07d3250e71 100644
--- a/src/grp-import/systemd-import/import-common.h
+++ b/src/grp-machine/grp-import/libimport/import-common.h
diff --git a/src/grp-import/systemd-import/import-compress.c b/src/grp-machine/grp-import/libimport/import-compress.c
index f1766bbe3b..f1766bbe3b 100644
--- a/src/grp-import/systemd-import/import-compress.c
+++ b/src/grp-machine/grp-import/libimport/import-compress.c
diff --git a/src/grp-import/systemd-import/import-compress.h b/src/grp-machine/grp-import/libimport/import-compress.h
index 6b59d0724b..6b59d0724b 100644
--- a/src/grp-import/systemd-import/import-compress.h
+++ b/src/grp-machine/grp-import/libimport/import-compress.h
diff --git a/src/grp-import/qcow2-util.c b/src/grp-machine/grp-import/libimport/qcow2-util.c
index ee2121cc36..ee2121cc36 100644
--- a/src/grp-import/qcow2-util.c
+++ b/src/grp-machine/grp-import/libimport/qcow2-util.c
diff --git a/src/grp-import/qcow2-util.h b/src/grp-machine/grp-import/libimport/qcow2-util.h
index 6dddac8cdf..6dddac8cdf 100644
--- a/src/grp-import/qcow2-util.h
+++ b/src/grp-machine/grp-import/libimport/qcow2-util.h
diff --git a/src/grp-import/test-qcow2.c b/src/grp-machine/grp-import/libimport/test-qcow2.c
index b820253d71..b820253d71 100644
--- a/src/grp-import/test-qcow2.c
+++ b/src/grp-machine/grp-import/libimport/test-qcow2.c
diff --git a/src/grp-import/systemd-export/export-raw.c b/src/grp-machine/grp-import/systemd-export/export-raw.c
index 658f835132..658f835132 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 c7ac134603..c7ac134603 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 9c511984c1..9c511984c1 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 50206cabb3..50206cabb3 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 0a5efe5476..0a5efe5476 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/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 ce37392707..ce37392707 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 f0a315c088..f0a315c088 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 016d05e77d..016d05e77d 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 b66b00ddfd..b66b00ddfd 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 338847dbc2..338847dbc2 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/.gitignore b/src/grp-machine/grp-import/systemd-importd/.gitignore
index 01106e2e68..01106e2e68 100644
--- a/src/grp-import/.gitignore
+++ b/src/grp-machine/grp-import/systemd-importd/.gitignore
diff --git a/src/grp-import/systemd-importd/importd.c b/src/grp-machine/grp-import/systemd-importd/importd.c
index e30dfdf805..e30dfdf805 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/org.freedesktop.import1.conf b/src/grp-machine/grp-import/systemd-importd/org.freedesktop.import1.conf
index ed2539a03b..ed2539a03b 100644
--- a/src/grp-import/org.freedesktop.import1.conf
+++ b/src/grp-machine/grp-import/systemd-importd/org.freedesktop.import1.conf
diff --git a/src/grp-import/org.freedesktop.import1.policy.in b/src/grp-machine/grp-import/systemd-importd/org.freedesktop.import1.policy.in
index 85924ed743..85924ed743 100644
--- a/src/grp-import/org.freedesktop.import1.policy.in
+++ b/src/grp-machine/grp-import/systemd-importd/org.freedesktop.import1.policy.in
diff --git a/src/grp-import/org.freedesktop.import1.service b/src/grp-machine/grp-import/systemd-importd/org.freedesktop.import1.service
index 8fc4c47881..8fc4c47881 100644
--- a/src/grp-import/org.freedesktop.import1.service
+++ b/src/grp-machine/grp-import/systemd-importd/org.freedesktop.import1.service
diff --git a/units/systemd-importd.service.in b/src/grp-machine/grp-import/systemd-importd/systemd-importd.service.in
index b74ad72cdc..b74ad72cdc 100644
--- a/units/systemd-importd.service.in
+++ b/src/grp-machine/grp-import/systemd-importd/systemd-importd.service.in
diff --git a/src/grp-import/curl-util.c b/src/grp-machine/grp-import/systemd-pull/curl-util.c
index 6990c47f48..6990c47f48 100644
--- a/src/grp-import/curl-util.c
+++ b/src/grp-machine/grp-import/systemd-pull/curl-util.c
diff --git a/src/grp-import/curl-util.h b/src/grp-machine/grp-import/systemd-pull/curl-util.h
index 2e71bd3b5d..2e71bd3b5d 100644
--- a/src/grp-import/curl-util.h
+++ b/src/grp-machine/grp-import/systemd-pull/curl-util.h
diff --git a/src/grp-import/systemd-pull/pull-common.c b/src/grp-machine/grp-import/systemd-pull/pull-common.c
index dc4e4667a9..dc4e4667a9 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 929a131c88..929a131c88 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 6bcf35ef4e..6bcf35ef4e 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 3a152a50e3..3a152a50e3 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 19155cc53a..19155cc53a 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 6bafa6dafd..6bafa6dafd 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 e0205c3841..e0205c3841 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 9ff5bd5953..9ff5bd5953 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 74df24f993..74df24f993 100644
--- a/src/grp-import/systemd-pull/pull.c
+++ b/src/grp-machine/grp-import/systemd-pull/pull.c
diff --git a/src/grp-machine/libmachine-core/Makefile b/src/grp-machine/libmachine-core/Makefile
deleted file mode 100644
index 3881224746..0000000000
--- a/src/grp-machine/libmachine-core/Makefile
+++ /dev/null
@@ -1,52 +0,0 @@
-#  -*- 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
-
-libmachine_core_la_SOURCES = \
-	src/machine/machine.c \
-	src/machine/machine.h \
-	src/machine/machined-dbus.c \
-	src/machine/machine-dbus.c \
-	src/machine/machine-dbus.h \
-	src/machine/image-dbus.c \
-	src/machine/image-dbus.h \
-	src/machine/operation.c \
-	src/machine/operation.h
-
-libmachine_core_la_LIBADD = \
-	libshared.la
-
-noinst_LTLIBRARIES += \
-	libmachine-core.la
-
-test_machine_tables_SOURCES = \
-	src/machine/test-machine-tables.c
-
-test_machine_tables_LDADD = \
-	libmachine-core.la
-
-tests += \
-	test-machine-tables
-
-include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-machine/machinectl/Makefile b/src/grp-machine/machinectl/Makefile
deleted file mode 100644
index a3ad40e59c..0000000000
--- a/src/grp-machine/machinectl/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-#  -*- 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
-
-machinectl_SOURCES = \
-	src/machine/machinectl.c
-
-machinectl_LDADD = \
-	libshared.la
-
-rootbin_PROGRAMS += \
-	machinectl
-
-dist_bashcompletion_data += \
-	shell-completion/bash/machinectl
-
-dist_zshcompletion_data += \
-	shell-completion/zsh/_machinectl \
-	shell-completion/zsh/_sd_machines
-
-include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/man/machinectl.xml b/src/grp-machine/machinectl/machinectl.xml
index 4b7f9a0391..4b7f9a0391 100644
--- a/man/machinectl.xml
+++ b/src/grp-machine/machinectl/machinectl.xml
diff --git a/src/grp-machine/nss-mymachines/Makefile b/src/grp-machine/nss-mymachines/Makefile
deleted file mode 100644
index c7c0d76907..0000000000
--- a/src/grp-machine/nss-mymachines/Makefile
+++ /dev/null
@@ -1,46 +0,0 @@
-#  -*- 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
-
-
-libnss_mymachines_la_SOURCES = \
-	src/nss-mymachines/nss-mymachines.sym \
-	src/nss-mymachines/nss-mymachines.c
-
-libnss_mymachines_la_LDFLAGS = \
-	$(AM_LDFLAGS) \
-	-module \
-	-export-dynamic \
-	-avoid-version \
-	-shared \
-	-shrext .so.2 \
-	-Wl,--version-script=$(srcdir)/nss-mymachines.sym
-
-libnss_mymachines_la_LIBADD = \
-	libsystemd-internal.la
-
-lib_LTLIBRARIES += \
-	libnss_mymachines.la
-
-include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/man/nss-mymachines.xml b/src/grp-machine/nss-mymachines/nss-mymachines.xml
index ec047449bf..ec047449bf 100644
--- a/man/nss-mymachines.xml
+++ b/src/grp-machine/nss-mymachines/nss-mymachines.xml
diff --git a/src/grp-machine/libmachine-core/.gitignore b/src/grp-machine/systemd-machined/.gitignore
index e1065b5894..e1065b5894 100644
--- a/src/grp-machine/libmachine-core/.gitignore
+++ b/src/grp-machine/systemd-machined/.gitignore
diff --git a/src/grp-machine/systemd-machined/Makefile b/src/grp-machine/systemd-machined/Makefile
deleted file mode 100644
index 8aac7b0f4f..0000000000
--- a/src/grp-machine/systemd-machined/Makefile
+++ /dev/null
@@ -1,67 +0,0 @@
-#  -*- 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_machined_SOURCES = \
-	src/machine/machined.c \
-	src/machine/machined.h
-
-systemd_machined_LDADD = \
-	libmachine-core.la
-
-rootlibexec_PROGRAMS += \
-	systemd-machined
-
-nodist_systemunit_DATA += \
-	units/systemd-machined.service
-
-dist_systemunit_DATA += \
-	units/machine.slice
-
-dist_systemunit_DATA_busnames += \
-	units/org.freedesktop.machine1.busname
-
-dist_dbussystemservice_DATA += \
-	src/machine/org.freedesktop.machine1.service
-
-dist_dbuspolicy_DATA += \
-	src/machine/org.freedesktop.machine1.conf
-
-polkitpolicy_files += \
-	src/machine/org.freedesktop.machine1.policy
-
-SYSTEM_UNIT_ALIASES += \
-	systemd-machined.service dbus-org.freedesktop.machine1.service
-
-BUSNAMES_TARGET_WANTS += \
-	org.freedesktop.machine1.busname
-
-
-polkitpolicy_in_files += \
-	src/machine/org.freedesktop.machine1.policy.in
-
-EXTRA_DIST += \
-	units/systemd-machined.service.in
-
-include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-machine/libmachine-core/image-dbus.c b/src/grp-machine/systemd-machined/image-dbus.c
index 0eed9b81bb..0eed9b81bb 100644
--- a/src/grp-machine/libmachine-core/image-dbus.c
+++ b/src/grp-machine/systemd-machined/image-dbus.c
diff --git a/src/grp-machine/libmachine-core/image-dbus.h b/src/grp-machine/systemd-machined/image-dbus.h
index b62da996c6..b62da996c6 100644
--- a/src/grp-machine/libmachine-core/image-dbus.h
+++ b/src/grp-machine/systemd-machined/image-dbus.h
diff --git a/src/grp-machine/libmachine-core/machine-dbus.c b/src/grp-machine/systemd-machined/machine-dbus.c
index 7b9aa66d63..7b9aa66d63 100644
--- a/src/grp-machine/libmachine-core/machine-dbus.c
+++ b/src/grp-machine/systemd-machined/machine-dbus.c
diff --git a/src/grp-machine/libmachine-core/machine-dbus.h b/src/grp-machine/systemd-machined/machine-dbus.h
index d3faf5cb07..d3faf5cb07 100644
--- a/src/grp-machine/libmachine-core/machine-dbus.h
+++ b/src/grp-machine/systemd-machined/machine-dbus.h
diff --git a/src/grp-machine/libmachine-core/machine.c b/src/grp-machine/systemd-machined/machine.c
index 135f47dafc..135f47dafc 100644
--- a/src/grp-machine/libmachine-core/machine.c
+++ b/src/grp-machine/systemd-machined/machine.c
diff --git a/src/grp-machine/libmachine-core/machine.h b/src/grp-machine/systemd-machined/machine.h
index e5d75361a9..e5d75361a9 100644
--- a/src/grp-machine/libmachine-core/machine.h
+++ b/src/grp-machine/systemd-machined/machine.h
diff --git a/src/grp-machine/libmachine-core/machined-dbus.c b/src/grp-machine/systemd-machined/machined-dbus.c
index 41f138882b..41f138882b 100644
--- a/src/grp-machine/libmachine-core/machined-dbus.c
+++ b/src/grp-machine/systemd-machined/machined-dbus.c
diff --git a/src/grp-machine/libmachine-core/machined.h b/src/grp-machine/systemd-machined/machined.h
index 777571ebc0..777571ebc0 100644
--- a/src/grp-machine/libmachine-core/machined.h
+++ b/src/grp-machine/systemd-machined/machined.h
diff --git a/src/grp-machine/libmachine-core/operation.c b/src/grp-machine/systemd-machined/operation.c
index e6ddc41a55..e6ddc41a55 100644
--- a/src/grp-machine/libmachine-core/operation.c
+++ b/src/grp-machine/systemd-machined/operation.c
diff --git a/src/grp-machine/libmachine-core/operation.h b/src/grp-machine/systemd-machined/operation.h
index 9397cd5f6d..9397cd5f6d 100644
--- a/src/grp-machine/libmachine-core/operation.h
+++ b/src/grp-machine/systemd-machined/operation.h
diff --git a/src/grp-machine/libmachine-core/org.freedesktop.machine1.conf b/src/grp-machine/systemd-machined/org.freedesktop.machine1.conf
index 9d40b90151..9d40b90151 100644
--- a/src/grp-machine/libmachine-core/org.freedesktop.machine1.conf
+++ b/src/grp-machine/systemd-machined/org.freedesktop.machine1.conf
diff --git a/src/grp-machine/libmachine-core/org.freedesktop.machine1.policy.in b/src/grp-machine/systemd-machined/org.freedesktop.machine1.policy.in
index 69f78a5c25..69f78a5c25 100644
--- a/src/grp-machine/libmachine-core/org.freedesktop.machine1.policy.in
+++ b/src/grp-machine/systemd-machined/org.freedesktop.machine1.policy.in
diff --git a/src/grp-machine/libmachine-core/org.freedesktop.machine1.service b/src/grp-machine/systemd-machined/org.freedesktop.machine1.service
index d3dc99852b..d3dc99852b 100644
--- a/src/grp-machine/libmachine-core/org.freedesktop.machine1.service
+++ b/src/grp-machine/systemd-machined/org.freedesktop.machine1.service
diff --git a/units/systemd-machined.service.in b/src/grp-machine/systemd-machined/systemd-machined.service.in
index 685baab21d..685baab21d 100644
--- a/units/systemd-machined.service.in
+++ b/src/grp-machine/systemd-machined/systemd-machined.service.in
diff --git a/src/grp-machine/libmachine-core/test-machine-tables.c b/src/grp-machine/systemd-machined/test-machine-tables.c
index f851a4d37d..f851a4d37d 100644
--- a/src/grp-machine/libmachine-core/test-machine-tables.c
+++ b/src/grp-machine/systemd-machined/test-machine-tables.c
diff --git a/src/grp-network/Makefile b/src/grp-network/Makefile
deleted file mode 100644
index 7cbd9142d0..0000000000
--- a/src/grp-network/Makefile
+++ /dev/null
@@ -1,107 +0,0 @@
-#  -*- 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
-
-dist_network_DATA = \
-	network/99-default.link \
-	network/80-container-host0.network \
-	network/80-container-ve.network \
-	network/80-container-vz.network
-
-ifneq ($(ENABLE_NETWORKD),)
-test_networkd_conf_SOURCES = \
-	src/network/test-networkd-conf.c
-
-test_networkd_conf_LDADD = \
-	libnetworkd-core.la
-
-test_network_SOURCES = \
-	src/network/test-network.c
-
-test_network_LDADD = \
-	libnetworkd-core.la
-
-ifneq ($(HAVE_LIBIPTC),)
-test_network_LDADD += \
-	libfirewall.la
-endif # HAVE_LIBIPTC
-
-test_network_tables_SOURCES = \
-	src/network/test-network-tables.c \
-	src/shared/test-tables.h
-
-test_network_tables_LDADD = \
-	libnetworkd-core.la \
-	libudev-core.la
-
-ifneq ($(HAVE_LIBIPTC),)
-test_network_tables_LDADD += \
-	libfirewall.la
-endif # HAVE_LIBIPTC
-
-tests += \
-	test-networkd-conf \
-	test-network \
-	test-network-tables
-
-dist_systemunit_DATA += \
-	units/systemd-networkd.socket
-
-nodist_systemunit_DATA += \
-	units/systemd-networkd.service \
-	units/systemd-networkd-wait-online.service
-
-dist_systemunit_DATA_busnames += \
-	units/org.freedesktop.network1.busname
-
-dist_dbussystemservice_DATA += \
-	src/network/org.freedesktop.network1.service
-
-dist_dbuspolicy_DATA += \
-	src/network/org.freedesktop.network1.conf
-
-GENERAL_ALIASES += \
-	$(systemunitdir)/systemd-networkd.socket $(pkgsysconfdir)/system/sockets.target.wants/systemd-networkd.socket \
-	$(systemunitdir)/systemd-networkd.service $(pkgsysconfdir)/system/multi-user.target.wants/systemd-networkd.service \
-	$(systemunitdir)/systemd-networkd-wait-online.service $(pkgsysconfdir)/system/network-online.target.wants/systemd-networkd-wait-online.service
-
-SYSTEM_UNIT_ALIASES += \
-	systemd-networkd.service dbus-org.freedesktop.network1.service
-
-BUSNAMES_TARGET_WANTS += \
-	org.freedesktop.network1.busname
-
-endif # ENABLE_NETWORKD
-
-gperf_gperf_sources += \
-	src/network/networkd-gperf.gperf \
-	src/network/networkd-network-gperf.gperf \
-	src/network/networkd-netdev-gperf.gperf
-
-EXTRA_DIST += \
-	units/systemd-networkd.service.m4.in \
-	units/systemd-networkd-wait-online.service.in \
-	test/networkd-test.py
-
-include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-network/.gitignore b/src/grp-network/libnetworkd-core/.gitignore
index aca55206b7..aca55206b7 100644
--- a/src/grp-network/.gitignore
+++ b/src/grp-network/libnetworkd-core/.gitignore
diff --git a/src/grp-network/libnetworkd-core/Makefile b/src/grp-network/libnetworkd-core/Makefile
deleted file mode 100644
index 53d65460f2..0000000000
--- a/src/grp-network/libnetworkd-core/Makefile
+++ /dev/null
@@ -1,93 +0,0 @@
-#  -*- 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
-
-noinst_LTLIBRARIES += \
-	libnetworkd-core.la
-
-libnetworkd_core_la_CFLAGS = \
-	$(AM_CFLAGS)
-
-libnetworkd_core_la_SOURCES = \
-	src/libsystemd-network/network-internal.h \
-	src/network/networkd.h \
-	src/network/networkd-conf.h \
-	src/network/networkd-conf.c \
-	src/network/networkd-link.h \
-	src/network/networkd-link.c \
-	src/network/networkd-netdev.h \
-	src/network/networkd-netdev.c \
-	src/network/networkd-netdev-tunnel.h \
-	src/network/networkd-netdev-tunnel.c \
-	src/network/networkd-netdev-veth.h \
-	src/network/networkd-netdev-veth.c \
-	src/network/networkd-netdev-vxlan.h \
-	src/network/networkd-netdev-vxlan.c \
-	src/network/networkd-netdev-vlan.h \
-	src/network/networkd-netdev-vlan.c \
-	src/network/networkd-netdev-macvlan.h \
-	src/network/networkd-netdev-macvlan.c \
-	src/network/networkd-netdev-ipvlan.h \
-	src/network/networkd-netdev-ipvlan.c \
-	src/network/networkd-netdev-dummy.h \
-	src/network/networkd-netdev-dummy.c \
-	src/network/networkd-netdev-tuntap.h \
-	src/network/networkd-netdev-tuntap.c \
-	src/network/networkd-netdev-bond.h \
-	src/network/networkd-netdev-bond.c \
-	src/network/networkd-netdev-bridge.h \
-	src/network/networkd-netdev-bridge.c \
-	src/network/networkd-link-bus.c \
-	src/network/networkd-ipv4ll.c \
-	src/network/networkd-dhcp4.c \
-	src/network/networkd-dhcp6.c \
-	src/network/networkd-ndisc.c \
-	src/network/networkd-network.h \
-	src/network/networkd-network.c \
-	src/network/networkd-network-bus.c \
-	src/network/networkd-address.h \
-	src/network/networkd-address.c \
-	src/network/networkd-route.h \
-	src/network/networkd-route.c \
-	src/network/networkd-manager.c \
-	src/network/networkd-manager-bus.c \
-	src/network/networkd-fdb.h \
-	src/network/networkd-fdb.c \
-	src/network/networkd-address-pool.h \
-	src/network/networkd-address-pool.c \
-	src/network/networkd-util.h \
-	src/network/networkd-util.c \
-	src/network/networkd-lldp-tx.h \
-	src/network/networkd-lldp-tx.c
-
-nodist_libnetworkd_core_la_SOURCES = \
-	src/network/networkd-gperf.c \
-	src/network/networkd-network-gperf.c \
-	src/network/networkd-netdev-gperf.c
-
-libnetworkd_core_la_LIBADD = \
-	libsystemd-network.la \
-	libshared.la
-
-include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/network/80-container-host0.network b/src/grp-network/network/80-container-host0.network
index b012cf98cb..b012cf98cb 100644
--- a/network/80-container-host0.network
+++ b/src/grp-network/network/80-container-host0.network
diff --git a/network/80-container-ve.network b/src/grp-network/network/80-container-ve.network
index ac796bfb07..ac796bfb07 100644
--- a/network/80-container-ve.network
+++ b/src/grp-network/network/80-container-ve.network
diff --git a/network/80-container-vz.network b/src/grp-network/network/80-container-vz.network
index 3d532d6f60..3d532d6f60 100644
--- a/network/80-container-vz.network
+++ b/src/grp-network/network/80-container-vz.network
diff --git a/network/99-default.link b/src/grp-network/network/99-default.link
index 79538f9b29..79538f9b29 100644
--- a/network/99-default.link
+++ b/src/grp-network/network/99-default.link
diff --git a/src/grp-network/networkctl/Makefile b/src/grp-network/networkctl/Makefile
deleted file mode 100644
index f92d402f78..0000000000
--- a/src/grp-network/networkctl/Makefile
+++ /dev/null
@@ -1,39 +0,0 @@
-#  -*- 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
-
-rootbin_PROGRAMS += \
-	networkctl
-
-networkctl_SOURCES = \
-	src/network/networkctl.c
-
-networkctl_LDADD = \
-	libshared.la \
-	libsystemd-network.la
-
-dist_bashcompletion_data += \
-	shell-completion/bash/networkctl
-
-include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/man/networkctl.xml b/src/grp-network/networkctl/networkctl.xml
index 24e1de6986..24e1de6986 100644
--- a/man/networkctl.xml
+++ b/src/grp-network/networkctl/networkctl.xml
diff --git a/src/grp-network/systemd-networkd-wait-online/Makefile b/src/grp-network/systemd-networkd-wait-online/Makefile
deleted file mode 100644
index 12aa13c48f..0000000000
--- a/src/grp-network/systemd-networkd-wait-online/Makefile
+++ /dev/null
@@ -1,44 +0,0 @@
-#  -*- 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
-
-rootlibexec_PROGRAMS += \
-	systemd-networkd-wait-online
-
-systemd_networkd_wait_online_CFLAGS = \
-	$(AM_CFLAGS)
-
-systemd_networkd_wait_online_SOURCES = \
-	src/libsystemd-network/network-internal.h \
-	src/network/networkd-wait-online.h \
-	src/network/networkd-wait-online-link.h \
-	src/network/networkd-wait-online.c \
-	src/network/networkd-wait-online-manager.c \
-	src/network/networkd-wait-online-link.c
-
-systemd_networkd_wait_online_LDADD = \
-	libsystemd-network.la \
-	libshared.la
-
-include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/units/systemd-networkd-wait-online.service.in b/src/grp-network/systemd-networkd-wait-online/systemd-networkd-wait-online.service.in
index a9bad7aa8f..a9bad7aa8f 100644
--- a/units/systemd-networkd-wait-online.service.in
+++ b/src/grp-network/systemd-networkd-wait-online/systemd-networkd-wait-online.service.in
diff --git a/src/grp-network/systemd-networkd/Makefile b/src/grp-network/systemd-networkd/Makefile
deleted file mode 100644
index 8b7e44062b..0000000000
--- a/src/grp-network/systemd-networkd/Makefile
+++ /dev/null
@@ -1,40 +0,0 @@
-#  -*- 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
-
-rootlibexec_PROGRAMS += \
-	systemd-networkd
-
-systemd_networkd_SOURCES = \
-	src/network/networkd.c
-
-systemd_networkd_LDADD = \
-	libnetworkd-core.la
-
-ifneq ($(HAVE_LIBIPTC),)
-systemd_networkd_LDADD += \
-	libfirewall.la
-endif # HAVE_LIBIPTC
-
-include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-network/libnetworkd-core/networkd.h b/src/grp-network/systemd-networkd/networkd.h
index b61e03920e..b61e03920e 100644
--- a/src/grp-network/libnetworkd-core/networkd.h
+++ b/src/grp-network/systemd-networkd/networkd.h
diff --git a/src/grp-network/org.freedesktop.network1.conf b/src/grp-network/systemd-networkd/org.freedesktop.network1.conf
index 52dad33668..52dad33668 100644
--- a/src/grp-network/org.freedesktop.network1.conf
+++ b/src/grp-network/systemd-networkd/org.freedesktop.network1.conf
diff --git a/src/grp-network/org.freedesktop.network1.service b/src/grp-network/systemd-networkd/org.freedesktop.network1.service
index bea885fe53..bea885fe53 100644
--- a/src/grp-network/org.freedesktop.network1.service
+++ b/src/grp-network/systemd-networkd/org.freedesktop.network1.service
diff --git a/units/systemd-networkd.service.m4.in b/src/grp-network/systemd-networkd/systemd-networkd.service.m4.in
index 27d4d58962..27d4d58962 100644
--- a/units/systemd-networkd.service.m4.in
+++ b/src/grp-network/systemd-networkd/systemd-networkd.service.m4.in
diff --git a/units/systemd-networkd.socket b/src/grp-network/systemd-networkd/systemd-networkd.socket
index 9e4e9dd338..9e4e9dd338 100644
--- a/units/systemd-networkd.socket
+++ b/src/grp-network/systemd-networkd/systemd-networkd.socket
diff --git a/src/grp-resolve/Makefile b/src/grp-resolve/Makefile
deleted file mode 100644
index ae0c5a2466..0000000000
--- a/src/grp-resolve/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-#  -*- 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-resolved nss-resolve
-
-include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-resolve/systemd-resolved/dns-type.c b/src/grp-resolve/libbasic-dns/dns-type.c
index 78d9d5733f..78d9d5733f 100644
--- a/src/grp-resolve/systemd-resolved/dns-type.c
+++ b/src/grp-resolve/libbasic-dns/dns-type.c
diff --git a/src/grp-resolve/systemd-resolved/dns-type.h b/src/grp-resolve/libbasic-dns/dns-type.h
index 7b79d29d7e..7b79d29d7e 100644
--- a/src/grp-resolve/systemd-resolved/dns-type.h
+++ b/src/grp-resolve/libbasic-dns/dns-type.h
diff --git a/src/grp-resolve/systemd-resolved/resolved-dns-answer.c b/src/grp-resolve/libbasic-dns/resolved-dns-answer.c
index 0dadf8b1dd..0dadf8b1dd 100644
--- a/src/grp-resolve/systemd-resolved/resolved-dns-answer.c
+++ b/src/grp-resolve/libbasic-dns/resolved-dns-answer.c
diff --git a/src/grp-resolve/systemd-resolved/resolved-dns-answer.h b/src/grp-resolve/libbasic-dns/resolved-dns-answer.h
index 0679c610f5..0679c610f5 100644
--- a/src/grp-resolve/systemd-resolved/resolved-dns-answer.h
+++ b/src/grp-resolve/libbasic-dns/resolved-dns-answer.h
diff --git a/src/grp-resolve/systemd-resolved/resolved-dns-dnssec.c b/src/grp-resolve/libbasic-dns/resolved-dns-dnssec.c
index a54aed3a63..a54aed3a63 100644
--- a/src/grp-resolve/systemd-resolved/resolved-dns-dnssec.c
+++ b/src/grp-resolve/libbasic-dns/resolved-dns-dnssec.c
diff --git a/src/grp-resolve/systemd-resolved/resolved-dns-dnssec.h b/src/grp-resolve/libbasic-dns/resolved-dns-dnssec.h
index 77bd4d71bf..77bd4d71bf 100644
--- a/src/grp-resolve/systemd-resolved/resolved-dns-dnssec.h
+++ b/src/grp-resolve/libbasic-dns/resolved-dns-dnssec.h
diff --git a/src/grp-resolve/systemd-resolved/resolved-dns-packet.c b/src/grp-resolve/libbasic-dns/resolved-dns-packet.c
index b7907bb511..b7907bb511 100644
--- a/src/grp-resolve/systemd-resolved/resolved-dns-packet.c
+++ b/src/grp-resolve/libbasic-dns/resolved-dns-packet.c
diff --git a/src/grp-resolve/systemd-resolved/resolved-dns-packet.h b/src/grp-resolve/libbasic-dns/resolved-dns-packet.h
index 416335d0a2..416335d0a2 100644
--- a/src/grp-resolve/systemd-resolved/resolved-dns-packet.h
+++ b/src/grp-resolve/libbasic-dns/resolved-dns-packet.h
diff --git a/src/grp-resolve/systemd-resolved/resolved-dns-question.c b/src/grp-resolve/libbasic-dns/resolved-dns-question.c
index c8b502d1cd..c8b502d1cd 100644
--- a/src/grp-resolve/systemd-resolved/resolved-dns-question.c
+++ b/src/grp-resolve/libbasic-dns/resolved-dns-question.c
diff --git a/src/grp-resolve/systemd-resolved/resolved-dns-question.h b/src/grp-resolve/libbasic-dns/resolved-dns-question.h
index ea41478975..ea41478975 100644
--- a/src/grp-resolve/systemd-resolved/resolved-dns-question.h
+++ b/src/grp-resolve/libbasic-dns/resolved-dns-question.h
diff --git a/src/grp-resolve/systemd-resolved/resolved-dns-rr.c b/src/grp-resolve/libbasic-dns/resolved-dns-rr.c
index 6a29a93a26..6a29a93a26 100644
--- a/src/grp-resolve/systemd-resolved/resolved-dns-rr.c
+++ b/src/grp-resolve/libbasic-dns/resolved-dns-rr.c
diff --git a/src/grp-resolve/systemd-resolved/resolved-dns-rr.h b/src/grp-resolve/libbasic-dns/resolved-dns-rr.h
index 020a2abd77..020a2abd77 100644
--- a/src/grp-resolve/systemd-resolved/resolved-dns-rr.h
+++ b/src/grp-resolve/libbasic-dns/resolved-dns-rr.h
diff --git a/src/grp-resolve/systemd-resolved/test-data/_443._tcp.fedoraproject.org.pkts b/src/grp-resolve/libbasic-dns/test-data/_443._tcp.fedoraproject.org.pkts
index a383c6286d..a383c6286d 100644
--- a/src/grp-resolve/systemd-resolved/test-data/_443._tcp.fedoraproject.org.pkts
+++ b/src/grp-resolve/libbasic-dns/test-data/_443._tcp.fedoraproject.org.pkts
diff --git a/src/grp-resolve/systemd-resolved/test-data/_openpgpkey.fedoraproject.org.pkts b/src/grp-resolve/libbasic-dns/test-data/_openpgpkey.fedoraproject.org.pkts
index 15de02e997..15de02e997 100644
--- a/src/grp-resolve/systemd-resolved/test-data/_openpgpkey.fedoraproject.org.pkts
+++ b/src/grp-resolve/libbasic-dns/test-data/_openpgpkey.fedoraproject.org.pkts
diff --git a/src/grp-resolve/systemd-resolved/test-data/fake-caa.pkts b/src/grp-resolve/libbasic-dns/test-data/fake-caa.pkts
index 1c3ecc5491..1c3ecc5491 100644
--- a/src/grp-resolve/systemd-resolved/test-data/fake-caa.pkts
+++ b/src/grp-resolve/libbasic-dns/test-data/fake-caa.pkts
diff --git a/src/grp-resolve/systemd-resolved/test-data/fedoraproject.org.pkts b/src/grp-resolve/libbasic-dns/test-data/fedoraproject.org.pkts
index 17874844d9..17874844d9 100644
--- a/src/grp-resolve/systemd-resolved/test-data/fedoraproject.org.pkts
+++ b/src/grp-resolve/libbasic-dns/test-data/fedoraproject.org.pkts
diff --git a/src/grp-resolve/systemd-resolved/test-data/gandi.net.pkts b/src/grp-resolve/libbasic-dns/test-data/gandi.net.pkts
index 5ef51e0c8e..5ef51e0c8e 100644
--- a/src/grp-resolve/systemd-resolved/test-data/gandi.net.pkts
+++ b/src/grp-resolve/libbasic-dns/test-data/gandi.net.pkts
diff --git a/src/grp-resolve/systemd-resolved/test-data/google.com.pkts b/src/grp-resolve/libbasic-dns/test-data/google.com.pkts
index f98c4cd855..f98c4cd855 100644
--- a/src/grp-resolve/systemd-resolved/test-data/google.com.pkts
+++ b/src/grp-resolve/libbasic-dns/test-data/google.com.pkts
diff --git a/src/grp-resolve/systemd-resolved/test-data/kyhwana.org.pkts b/src/grp-resolve/libbasic-dns/test-data/kyhwana.org.pkts
index e28a725c9a..e28a725c9a 100644
--- a/src/grp-resolve/systemd-resolved/test-data/kyhwana.org.pkts
+++ b/src/grp-resolve/libbasic-dns/test-data/kyhwana.org.pkts
diff --git a/src/grp-resolve/systemd-resolved/test-data/root.pkts b/src/grp-resolve/libbasic-dns/test-data/root.pkts
index 54ba668c75..54ba668c75 100644
--- a/src/grp-resolve/systemd-resolved/test-data/root.pkts
+++ b/src/grp-resolve/libbasic-dns/test-data/root.pkts
diff --git a/src/grp-resolve/systemd-resolved/test-data/sw1a1aa-sw1a2aa-sw1a2ab-sw1a2ac.find.me.uk.pkts b/src/grp-resolve/libbasic-dns/test-data/sw1a1aa-sw1a2aa-sw1a2ab-sw1a2ac.find.me.uk.pkts
index a854249532..a854249532 100644
--- a/src/grp-resolve/systemd-resolved/test-data/sw1a1aa-sw1a2aa-sw1a2ab-sw1a2ac.find.me.uk.pkts
+++ b/src/grp-resolve/libbasic-dns/test-data/sw1a1aa-sw1a2aa-sw1a2ab-sw1a2ac.find.me.uk.pkts
diff --git a/src/grp-resolve/systemd-resolved/test-data/teamits.com.pkts b/src/grp-resolve/libbasic-dns/test-data/teamits.com.pkts
index 11deb39677..11deb39677 100644
--- a/src/grp-resolve/systemd-resolved/test-data/teamits.com.pkts
+++ b/src/grp-resolve/libbasic-dns/test-data/teamits.com.pkts
diff --git a/src/grp-resolve/systemd-resolved/test-data/zbyszek@fedoraproject.org.pkts b/src/grp-resolve/libbasic-dns/test-data/zbyszek@fedoraproject.org.pkts
index f0a6f982df..f0a6f982df 100644
--- a/src/grp-resolve/systemd-resolved/test-data/zbyszek@fedoraproject.org.pkts
+++ b/src/grp-resolve/libbasic-dns/test-data/zbyszek@fedoraproject.org.pkts
diff --git a/src/grp-resolve/systemd-resolved/test-dns-packet.c b/src/grp-resolve/libbasic-dns/test-dns-packet.c
index c232a69ce1..c232a69ce1 100644
--- a/src/grp-resolve/systemd-resolved/test-dns-packet.c
+++ b/src/grp-resolve/libbasic-dns/test-dns-packet.c
diff --git a/src/grp-resolve/systemd-resolved/test-dnssec-complex.c b/src/grp-resolve/libbasic-dns/test-dnssec-complex.c
index 568400ac77..568400ac77 100644
--- a/src/grp-resolve/systemd-resolved/test-dnssec-complex.c
+++ b/src/grp-resolve/libbasic-dns/test-dnssec-complex.c
diff --git a/src/grp-resolve/systemd-resolved/test-dnssec.c b/src/grp-resolve/libbasic-dns/test-dnssec.c
index b3018e8239..b3018e8239 100644
--- a/src/grp-resolve/systemd-resolved/test-dnssec.c
+++ b/src/grp-resolve/libbasic-dns/test-dnssec.c
diff --git a/src/grp-resolve/systemd-resolved/test-resolve-tables.c b/src/grp-resolve/libbasic-dns/test-resolve-tables.c
index 2d615130e1..2d615130e1 100644
--- a/src/grp-resolve/systemd-resolved/test-resolve-tables.c
+++ b/src/grp-resolve/libbasic-dns/test-resolve-tables.c
diff --git a/src/grp-resolve/nss-resolve/Makefile b/src/grp-resolve/nss-resolve/Makefile
deleted file mode 100644
index acfbe831ae..0000000000
--- a/src/grp-resolve/nss-resolve/Makefile
+++ /dev/null
@@ -1,46 +0,0 @@
-#  -*- 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
-
-libnss_resolve_la_SOURCES = \
-	src/nss-resolve/nss-resolve.sym \
-	src/nss-resolve/nss-resolve.c
-
-libnss_resolve_la_LDFLAGS = \
-	$(AM_LDFLAGS) \
-	-module \
-	-export-dynamic \
-	-avoid-version \
-	-shared \
-	-shrext .so.2 \
-	-Wl,--version-script=$(srcdir)/nss-resolve.sym
-
-libnss_resolve_la_LIBADD = \
-	libsystemd-internal.la \
-        -ldl
-
-lib_LTLIBRARIES += \
-	libnss_resolve.la
-
-include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/man/nss-resolve.xml b/src/grp-resolve/nss-resolve/nss-resolve.xml
index d9e56453e8..d9e56453e8 100644
--- a/man/nss-resolve.xml
+++ b/src/grp-resolve/nss-resolve/nss-resolve.xml
diff --git a/src/grp-resolve/systemd-resolved/resolve-tool.c b/src/grp-resolve/systemd-resolve/resolve-tool.c
index fbf7b0e4f6..fbf7b0e4f6 100644
--- a/src/grp-resolve/systemd-resolved/resolve-tool.c
+++ b/src/grp-resolve/systemd-resolve/resolve-tool.c
diff --git a/man/systemd-resolve.xml b/src/grp-resolve/systemd-resolve/systemd-resolve.xml
index 4b66f836a2..4b66f836a2 100644
--- a/man/systemd-resolve.xml
+++ b/src/grp-resolve/systemd-resolve/systemd-resolve.xml
diff --git a/src/grp-resolve/systemd-resolved/Makefile b/src/grp-resolve/systemd-resolved/Makefile
deleted file mode 100644
index e18b1b3d90..0000000000
--- a/src/grp-resolve/systemd-resolved/Makefile
+++ /dev/null
@@ -1,227 +0,0 @@
-#  -*- 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
-
-
-$(outdir)/dns_type-list.txt: src/resolve/dns-type.h
-	$(AM_V_at)$(MKDIR_P) $(dir $@)
-	$(AM_V_GEN)$(SED) -n -r 's/.* DNS_TYPE_(\w+).*/\1/p' <$< >$@
-
-$(outdir)/dns_type-to-name.h: src/resolve/dns_type-list.txt
-	$(AM_V_at)$(MKDIR_P) $(dir $@)
-	$(AM_V_GEN)$(AWK) 'BEGIN{ print "const char *dns_type_to_string(int type) {\n\tswitch(type) {" } {printf "        case DNS_TYPE_%s: return ", $$1; sub(/_/, "-"); printf "\"%s\";\n", $$1 } END{ print "        default: return NULL;\n\t}\n}\n" }' <$< >$@
-
-$(outdir)/dns_type-from-name.gperf: src/resolve/dns_type-list.txt
-	$(AM_V_at)$(MKDIR_P) $(dir $@)
-	$(AM_V_GEN)$(AWK) 'BEGIN{ print "struct dns_type_name { const char* name; int id; };"; print "%null-strings"; print "%%";} { s=$$1; sub(/_/, "-", s); printf "%s, ", $$s; printf "DNS_TYPE_%s\n", $$1 }' <$< >$@
-
-ifneq ($(ENABLE_RESOLVED),)
-
-basic_dns_sources = \
-	src/resolve/resolved-dns-dnssec.c \
-	src/resolve/resolved-dns-dnssec.h \
-	src/resolve/resolved-dns-packet.c \
-	src/resolve/resolved-dns-packet.h \
-	src/resolve/resolved-dns-rr.c \
-	src/resolve/resolved-dns-rr.h \
-	src/resolve/resolved-dns-answer.c \
-	src/resolve/resolved-dns-answer.h \
-	src/resolve/resolved-dns-question.c \
-	src/resolve/resolved-dns-question.h \
-	src/resolve/dns-type.c \
-	src/resolve/dns-type.h
-
-systemd_resolved_SOURCES = \
-	src/resolve/resolved.c \
-	src/resolve/resolved-manager.c \
-	src/resolve/resolved-manager.h \
-	src/resolve/resolved-conf.c \
-	src/resolve/resolved-conf.h \
-	src/resolve/resolved-resolv-conf.c \
-	src/resolve/resolved-resolv-conf.h \
-	src/resolve/resolved-bus.c \
-	src/resolve/resolved-bus.h \
-	src/resolve/resolved-link.h \
-	src/resolve/resolved-link.c \
-	src/resolve/resolved-link-bus.c \
-	src/resolve/resolved-link-bus.h \
-	src/resolve/resolved-llmnr.h \
-	src/resolve/resolved-llmnr.c \
-	src/resolve/resolved-mdns.h \
-	src/resolve/resolved-mdns.c \
-	src/resolve/resolved-def.h \
-	$(basic_dns_sources) \
-	src/resolve/resolved-dns-query.h \
-	src/resolve/resolved-dns-query.c \
-	src/resolve/resolved-dns-synthesize.h \
-	src/resolve/resolved-dns-synthesize.c \
-	src/resolve/resolved-dns-transaction.h \
-	src/resolve/resolved-dns-transaction.c \
-	src/resolve/resolved-dns-scope.h \
-	src/resolve/resolved-dns-scope.c \
-	src/resolve/resolved-dns-server.h \
-	src/resolve/resolved-dns-server.c \
-	src/resolve/resolved-dns-search-domain.h \
-	src/resolve/resolved-dns-search-domain.c \
-	src/resolve/resolved-dns-cache.h \
-	src/resolve/resolved-dns-cache.c \
-	src/resolve/resolved-dns-zone.h \
-	src/resolve/resolved-dns-zone.c \
-	src/resolve/resolved-dns-stream.h \
-	src/resolve/resolved-dns-stream.c \
-	src/resolve/resolved-dns-trust-anchor.h \
-	src/resolve/resolved-dns-trust-anchor.c \
-	src/resolve/resolved-etc-hosts.h \
-	src/resolve/resolved-etc-hosts.c \
-	src/shared/gcrypt-util.c \
-	src/shared/gcrypt-util.h
-
-nodist_systemd_resolved_SOURCES = \
-	src/resolve/dns_type-from-name.h \
-	src/resolve/dns_type-to-name.h \
-	src/resolve/resolved-gperf.c
-
-systemd_resolved_LDADD = \
-	libsystemd-network.la \
-	libshared.la
-
-rootlibexec_PROGRAMS += \
-	systemd-resolved
-
-nodist_systemunit_DATA += \
-	units/systemd-resolved.service
-
-dist_systemunit_DATA_busnames += \
-	units/org.freedesktop.resolve1.busname
-
-dist_dbuspolicy_DATA += \
-	src/resolve/org.freedesktop.resolve1.conf
-
-dist_dbussystemservice_DATA += \
-	src/resolve/org.freedesktop.resolve1.service
-
-SYSTEM_UNIT_ALIASES += \
-	systemd-resolved.service dbus-org.freedesktop.resolve1.service
-
-BUSNAMES_TARGET_WANTS += \
-	org.freedesktop.resolve1.busname
-
-GENERAL_ALIASES += \
-	$(systemunitdir)/systemd-resolved.service $(pkgsysconfdir)/system/multi-user.target.wants/systemd-resolved.service
-
-nodist_pkgsysconf_DATA += \
-	src/resolve/resolved.conf
-
-systemd_resolve_SOURCES = \
-	src/resolve/resolve-tool.c \
-	$(basic_dns_sources) \
-	src/shared/gcrypt-util.c \
-	src/shared/gcrypt-util.h
-
-nodist_systemd_resolve_SOURCES = \
-	src/resolve/dns_type-from-name.h \
-	src/resolve/dns_type-to-name.h
-
-systemd_resolve_LDADD = \
-	libshared.la
-
-bin_PROGRAMS += \
-	systemd-resolve
-
-dist_bashcompletion_data += \
-	shell-completion/bash/systemd-resolve
-
-dist_zshcompletion_data += \
-	shell-completion/zsh/_systemd-resolve
-
-tests += \
-	test-dns-packet \
-	test-resolve-tables \
-	test-dnssec
-
-manual_tests += \
-	test-dnssec-complex
-
-test_resolve_tables_SOURCES = \
-	src/resolve/test-resolve-tables.c \
-	src/resolve/dns_type-from-name.h \
-	src/resolve/dns_type-to-name.h \
-	$(basic_dns_sources) \
-	src/shared/test-tables.h
-
-test_resolve_tables_LDADD = \
-	libshared.la
-
-test_dns_packet_SOURCES = \
-	src/resolve/test-dns-packet.c \
-	$(basic_dns_sources)
-
-test_dns_packet_CPPFLAGS = \
-	$(AM_CPPFLAGS) \
-	-DRESOLVE_TEST_DIR=\"$(abs_top_srcdir)/src/resolve/test-data\"
-
-test_dns_packet_LDADD = \
-	libshared.la
-
-EXTRA_DIST += \
-	src/resolve/test-data/_openpgpkey.fedoraproject.org.pkts \
-	src/resolve/test-data/fedoraproject.org.pkts \
-	src/resolve/test-data/gandi.net.pkts \
-	src/resolve/test-data/google.com.pkts \
-	src/resolve/test-data/root.pkts \
-	src/resolve/test-data/sw1a1aa-sw1a2aa-sw1a2ab-sw1a2ac.find.me.uk.pkts \
-	src/resolve/test-data/teamits.com.pkts \
-	src/resolve/test-data/zbyszek@fedoraproject.org.pkts \
-	src/resolve/test-data/_443._tcp.fedoraproject.org.pkts \
-	src/resolve/test-data/kyhwana.org.pkts \
-	src/resolve/test-data/fake-caa.pkts
-
-test_dnssec_SOURCES = \
-	src/resolve/test-dnssec.c \
-	$(basic_dns_sources)
-
-test_dnssec_LDADD = \
-	libshared.la
-
-test_dnssec_complex_SOURCES = \
-	src/resolve/test-dnssec-complex.c \
-	src/resolve/dns-type.c \
-	src/resolve/dns-type.h
-
-test_dnssec_complex_LDADD = \
-	libshared.la
-
-endif # ENABLE_RESOLVED
-
-gperf_txt_sources += \
-	src/resolve/dns_type-list.txt
-
-gperf_gperf_sources += \
-	src/resolve/resolved-gperf.gperf
-
-EXTRA_DIST += \
-	units/systemd-resolved.service.m4.in \
-	src/resolve/resolved.conf.in
-
-include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/units/systemd-resolved.service.m4.in b/src/grp-resolve/systemd-resolved/systemd-resolved.service.m4.in
index 8e1c1dea79..8e1c1dea79 100644
--- a/units/systemd-resolved.service.m4.in
+++ b/src/grp-resolve/systemd-resolved/systemd-resolved.service.m4.in
diff --git a/src/grp-system/Makefile b/src/grp-system/Makefile
deleted file mode 100644
index ea8b031596..0000000000
--- a/src/grp-system/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-#  -*- 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 += systemctl systemd
-
-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/analyze-verify.c b/src/grp-system/grp-utils/systemd-analyze/analyze-verify.c
index 5fd3ee49eb..5fd3ee49eb 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 d8204dc69c..d8204dc69c 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 0e1eee16ec..0e1eee16ec 100644
--- a/src/systemd-analyze/analyze.c
+++ b/src/grp-system/grp-utils/systemd-analyze/analyze.c
diff --git a/man/systemd-analyze.xml b/src/grp-system/grp-utils/systemd-analyze/systemd-analyze.xml
index bc37765dff..bc37765dff 100644
--- a/man/systemd-analyze.xml
+++ b/src/grp-system/grp-utils/systemd-analyze/systemd-analyze.xml
diff --git a/src/systemd-delta/delta.c b/src/grp-system/grp-utils/systemd-delta/delta.c
index f32744def2..f32744def2 100644
--- a/src/systemd-delta/delta.c
+++ b/src/grp-system/grp-utils/systemd-delta/delta.c
diff --git a/man/systemd-delta.xml b/src/grp-system/grp-utils/systemd-delta/systemd-delta.xml
index 99709604aa..99709604aa 100644
--- a/man/systemd-delta.xml
+++ b/src/grp-system/grp-utils/systemd-delta/systemd-delta.xml
diff --git a/src/systemd-fstab-generator/fstab-generator.c b/src/grp-system/grp-utils/systemd-fstab-generator/fstab-generator.c
index 108522873e..108522873e 100644
--- a/src/systemd-fstab-generator/fstab-generator.c
+++ b/src/grp-system/grp-utils/systemd-fstab-generator/fstab-generator.c
diff --git a/man/systemd-fstab-generator.xml b/src/grp-system/grp-utils/systemd-fstab-generator/systemd-fstab-generator.xml
index a971cb3675..a971cb3675 100644
--- a/man/systemd-fstab-generator.xml
+++ b/src/grp-system/grp-utils/systemd-fstab-generator/systemd-fstab-generator.xml
diff --git a/src/systemd-run/run.c b/src/grp-system/grp-utils/systemd-run/run.c
index 29b5131f70..29b5131f70 100644
--- a/src/systemd-run/run.c
+++ b/src/grp-system/grp-utils/systemd-run/run.c
diff --git a/man/systemd-run.xml b/src/grp-system/grp-utils/systemd-run/systemd-run.xml
index 9c1a29218e..9c1a29218e 100644
--- a/man/systemd-run.xml
+++ b/src/grp-system/grp-utils/systemd-run/systemd-run.xml
diff --git a/man/systemd-sysv-generator.xml b/src/grp-system/grp-utils/systemd-sysv-generator/systemd-sysv-generator.xml
index 2353eb3efe..2353eb3efe 100644
--- a/man/systemd-sysv-generator.xml
+++ b/src/grp-system/grp-utils/systemd-sysv-generator/systemd-sysv-generator.xml
diff --git a/src/systemd-sysv-generator/sysv-generator.c b/src/grp-system/grp-utils/systemd-sysv-generator/sysv-generator.c
index fe4bbeeb75..fe4bbeeb75 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/audit-fd.c b/src/grp-system/libcore/audit-fd.c
index 76afe3fe15..76afe3fe15 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 f06d837e30..f06d837e30 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 4907c268e8..4907c268e8 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 5b2c4d5953..5b2c4d5953 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 f03a95c24e..f03a95c24e 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 0fb63b1bd1..0fb63b1bd1 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 2b1edbafc4..2b1edbafc4 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 b2806ad86f..b2806ad86f 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 cf816ba15b..cf816ba15b 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 eef1c47c14..eef1c47c14 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 06943c6365..06943c6365 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 1d739787bb..1d739787bb 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 0f54c6b84b..0f54c6b84b 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 86722e1162..86722e1162 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 935db7c48b..935db7c48b 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 1e153e503f..1e153e503f 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 34ee9a8fa9..34ee9a8fa9 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 03eecca911..03eecca911 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 961340608d..961340608d 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 292f8738c6..292f8738c6 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 a0e61b023e..a0e61b023e 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 dcd8db0898..dcd8db0898 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 1b217da303..1b217da303 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 16e56efcc3..16e56efcc3 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 b58fb80be2..b58fb80be2 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 41148bcea2..41148bcea2 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 ddae46190f..ddae46190f 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 1adac4ad5c..1adac4ad5c 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 68be52856b..68be52856b 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 d1b0ce76ef..d1b0ce76ef 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 42fdcb988a..42fdcb988a 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 68c2089b91..68c2089b91 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 6854587d54..6854587d54 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 b3d2056cb0..b3d2056cb0 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 09378f7085..09378f7085 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 3503db52ed..3503db52ed 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 f83fa09301..f83fa09301 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 942d26724e..942d26724e 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 8193418980..8193418980 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 86b4fb071b..86b4fb071b 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 ccf61d29fb..ccf61d29fb 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 d56bbfa6fc..d56bbfa6fc 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 812e4b038c..812e4b038c 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 831fdbaabf..831fdbaabf 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 70d79ce549..70d79ce549 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 40fc548b42..40fc548b42 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 7db9d1325b..7db9d1325b 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 203d122810..203d122810 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 b54b7b47d6..b54b7b47d6 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 0dd0d375d8..0dd0d375d8 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 238f63a729..238f63a729 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 2c04fb0a8f..2c04fb0a8f 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 cbf33ef6c4..cbf33ef6c4 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 4072df58e6..4072df58e6 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 7ebabca5d6..7ebabca5d6 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 4af3d40439..4af3d40439 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 59ebdc7219..59ebdc7219 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 9a29e72645..9a29e72645 100644
--- a/src/libcore/show-status.h
+++ b/src/grp-system/libcore/show-status.h
diff --git a/src/systemd-shutdown/shutdown.c b/src/grp-system/libcore/shutdown.c
index e14755d84e..e14755d84e 100644
--- a/src/systemd-shutdown/shutdown.c
+++ b/src/grp-system/libcore/shutdown.c
diff --git a/src/libcore/slice.c b/src/grp-system/libcore/slice.c
index c7700b8857..c7700b8857 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 5a6d11cfa1..5a6d11cfa1 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 f6204d04bf..f6204d04bf 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 0f1ac69c6f..0f1ac69c6f 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 a532b15be8..a532b15be8 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/grp-system/systemd/systemd.pc.in b/src/grp-system/libcore/systemd.pc.in
index ac52b30dd3..ac52b30dd3 100644
--- a/src/grp-system/systemd/systemd.pc.in
+++ b/src/grp-system/libcore/systemd.pc.in
diff --git a/src/libcore/target.c b/src/grp-system/libcore/target.c
index 61a91aad07..61a91aad07 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 3206296f09..3206296f09 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 9c4b64f898..9c4b64f898 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 e06a48a2f1..e06a48a2f1 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 6a3f927b0f..6a3f927b0f 100644
--- a/src/libcore/transaction.h
+++ b/src/grp-system/libcore/transaction.h
diff --git a/src/grp-system/systemd/triggers.systemd.in b/src/grp-system/libcore/triggers.systemd.in
index 0d8c303136..0d8c303136 100644
--- a/src/grp-system/systemd/triggers.systemd.in
+++ b/src/grp-system/libcore/triggers.systemd.in
diff --git a/src/systemd-shutdown/umount.c b/src/grp-system/libcore/umount.c
index c21a2be54e..c21a2be54e 100644
--- a/src/systemd-shutdown/umount.c
+++ b/src/grp-system/libcore/umount.c
diff --git a/src/systemd-shutdown/umount.h b/src/grp-system/libcore/umount.h
index 4e2215a47d..4e2215a47d 100644
--- a/src/systemd-shutdown/umount.h
+++ b/src/grp-system/libcore/umount.h
diff --git a/src/libcore/unit-printf.c b/src/grp-system/libcore/unit-printf.c
index f11df42af3..f11df42af3 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 8bd39f87f9..8bd39f87f9 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 08a927962d..08a927962d 100644
--- a/src/libcore/unit.h
+++ b/src/grp-system/libcore/unit.h
diff --git a/src/grp-system/systemd/user.conf b/src/grp-system/libcore/user.conf
index b427f1ef6d..b427f1ef6d 100644
--- a/src/grp-system/systemd/user.conf
+++ b/src/grp-system/libcore/user.conf
diff --git a/src/grp-system/systemctl/Makefile b/src/grp-system/systemctl/Makefile
deleted file mode 100644
index 24585cc12b..0000000000
--- a/src/grp-system/systemctl/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-#  -*- 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
-
-rootbin_PROGRAMS += systemctl
-systemctl_SOURCES = \
-	src/systemctl/systemctl.c
-
-systemctl_LDADD = \
-	libshared.la
-
-include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/man/systemctl.xml b/src/grp-system/systemctl/systemctl.xml
index 991e9bafaf..991e9bafaf 100644
--- a/man/systemctl.xml
+++ b/src/grp-system/systemctl/systemctl.xml
diff --git a/src/grp-system/systemd/Makefile b/src/grp-system/systemd/Makefile
deleted file mode 100644
index cfef258c6d..0000000000
--- a/src/grp-system/systemd/Makefile
+++ /dev/null
@@ -1,71 +0,0 @@
-#  -*- 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
-
-rootlibexec_PROGRAMS += systemd
-systemd_SOURCES = \
-	src/core/main.c
-
-systemd_CFLAGS = \
-	$(AM_CFLAGS) \
-	$(SECCOMP_CFLAGS) \
-	$(MOUNT_CFLAGS)
-
-systemd_LDADD = \
-	libcore.la
-
-dist_pkgsysconf_DATA += \
-	src/core/system.conf \
-	src/core/user.conf
-
-dist_dbuspolicy_DATA += \
-	src/core/org.freedesktop.systemd1.conf
-
-dist_dbussystemservice_DATA += \
-	src/core/org.freedesktop.systemd1.service
-
-polkitpolicy_in_in_files += \
-	src/core/org.freedesktop.systemd1.policy.in.in
-
-pkgconfigdata_DATA += \
-	src/core/systemd.pc
-
-nodist_rpmmacros_DATA = \
-	src/core/macros.systemd
-
-BUILT_SOURCES += \
-	src/core/triggers.systemd
-
-EXTRA_DIST += \
-	src/core/systemd.pc.in \
-	src/core/macros.systemd.in \
-	src/core/triggers.systemd.in
-
-dist_systemunit_DATA_busnames += \
-	units/org.freedesktop.systemd1.busname
-
-BUSNAMES_TARGET_WANTS += \
-	org.freedesktop.systemd1.busname
-
-include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/man/systemd.xml b/src/grp-system/systemd/systemd.xml
index e05a9d6e29..e05a9d6e29 100644
--- a/man/systemd.xml
+++ b/src/grp-system/systemd/systemd.xml
diff --git a/src/grp-timedate/Makefile b/src/grp-timedate/Makefile
deleted file mode 100644
index bb8be753da..0000000000
--- a/src/grp-timedate/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-#  -*- 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 += timedatectl systemd-timedated
-
-include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-timedate/systemd-timedated/Makefile b/src/grp-timedate/systemd-timedated/Makefile
deleted file mode 100644
index 798e3ba5a4..0000000000
--- a/src/grp-timedate/systemd-timedated/Makefile
+++ /dev/null
@@ -1,65 +0,0 @@
-#  -*- 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
-
-ifneq ($(ENABLE_TIMEDATED),)
-systemd_timedated_SOURCES = \
-	src/timedate/timedated.c
-
-systemd_timedated_LDADD = \
-	libshared.la
-
-rootlibexec_PROGRAMS += \
-	systemd-timedated
-
-dist_dbussystemservice_DATA += \
-	src/timedate/org.freedesktop.timedate1.service
-
-dist_dbuspolicy_DATA += \
-	src/timedate/org.freedesktop.timedate1.conf
-
-nodist_systemunit_DATA += \
-	units/systemd-timedated.service
-
-dist_systemunit_DATA_busnames += \
-	units/org.freedesktop.timedate1.busname
-
-polkitpolicy_files += \
-	src/timedate/org.freedesktop.timedate1.policy
-
-SYSTEM_UNIT_ALIASES += \
-	systemd-timedated.service dbus-org.freedesktop.timedate1.service
-
-BUSNAMES_TARGET_WANTS += \
-	org.freedesktop.timedate1.busname
-
-endif # ENABLE_TIMEDATED
-
-polkitpolicy_in_files += \
-	src/timedate/org.freedesktop.timedate1.policy.in
-
-EXTRA_DIST += \
-	units/systemd-timedated.service.in
-
-include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/units/systemd-timedated.service.in b/src/grp-timedate/systemd-timedated/systemd-timedated.service.in
index 0c9599db20..0c9599db20 100644
--- a/units/systemd-timedated.service.in
+++ b/src/grp-timedate/systemd-timedated/systemd-timedated.service.in
diff --git a/src/grp-timedate/timedatectl/Makefile b/src/grp-timedate/timedatectl/Makefile
deleted file mode 100644
index c1be945443..0000000000
--- a/src/grp-timedate/timedatectl/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-#  -*- 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
-
-ifneq ($(ENABLE_TIMEDATED),)
-timedatectl_SOURCES = \
-	src/timedate/timedatectl.c
-
-timedatectl_LDADD = \
-	libshared.la
-
-bin_PROGRAMS += \
-	timedatectl
-
-dist_bashcompletion_data += \
-	shell-completion/bash/timedatectl
-
-dist_zshcompletion_data += \
-	shell-completion/zsh/_timedatectl
-endif # ENABLE_TIMEDATED
-include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/man/timedatectl.xml b/src/grp-timedate/timedatectl/timedatectl.xml
index 415e2c799a..415e2c799a 100644
--- a/man/timedatectl.xml
+++ b/src/grp-timedate/timedatectl/timedatectl.xml
diff --git a/src/grp-udev/Makefile b/src/grp-udev/Makefile
deleted file mode 100644
index cc85f0317f..0000000000
--- a/src/grp-udev/Makefile
+++ /dev/null
@@ -1,72 +0,0 @@
-#  -*- 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
-
-INSTALL_DIRS += \
-	$(sysconfdir)/udev/rules.d
-
-dist_udevrules_DATA += \
-	rules/50-udev-default.rules \
-	rules/60-block.rules \
-	rules/60-drm.rules \
-	rules/60-evdev.rules \
-	rules/60-persistent-storage-tape.rules \
-	rules/60-persistent-input.rules \
-	rules/60-persistent-alsa.rules \
-	rules/60-persistent-storage.rules \
-	rules/60-serial.rules \
-	rules/64-btrfs.rules \
-	rules/70-mouse.rules \
-	rules/75-net-description.rules \
-	rules/78-sound-card.rules \
-	rules/80-net-setup-link.rules
-
-nodist_udevrules_DATA += \
-	rules/99-systemd.rules
-
-udevconfdir = $(sysconfdir)/udev
-dist_udevconf_DATA = \
-	src/udev/udev.conf
-
-pkgconfigdata_DATA += \
-	src/udev/udev.pc
-
-EXTRA_DIST += \
-	rules/99-systemd.rules.in \
-	src/udev/udev.pc.in
-
-EXTRA_DIST += \
-	units/systemd-udevd.service.in \
-	units/systemd-udev-trigger.service.in \
-	units/systemd-udev-settle.service.in
-
-SOCKETS_TARGET_WANTS += \
-	systemd-udevd-control.socket \
-	systemd-udevd-kernel.socket
-
-SYSINIT_TARGET_WANTS += \
-	systemd-udevd.service \
-	systemd-udev-trigger.service
-
-include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-udev/ata_id/Makefile b/src/grp-udev/ata_id/Makefile
deleted file mode 100644
index 00a8c37ac2..0000000000
--- a/src/grp-udev/ata_id/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-#  -*- 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
-
-ata_id_SOURCES = \
-	src/udev/ata_id/ata_id.c
-
-ata_id_LDADD = \
-	libshared.la
-
-udevlibexec_PROGRAMS += \
-	ata_id
-
-include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-udev/cdrom_id/Makefile b/src/grp-udev/cdrom_id/Makefile
deleted file mode 100644
index a9297413d3..0000000000
--- a/src/grp-udev/cdrom_id/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-#  -*- 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
-
-cdrom_id_SOURCES = \
-	src/udev/cdrom_id/cdrom_id.c
-
-cdrom_id_LDADD = \
-	libshared.la
-
-udevlibexec_PROGRAMS += \
-	cdrom_id
-
-dist_udevrules_DATA += \
-	rules/60-cdrom_id.rules
-
-include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-udev/collect/Makefile b/src/grp-udev/collect/Makefile
deleted file mode 100644
index 60af3b7627..0000000000
--- a/src/grp-udev/collect/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-#  -*- 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
-
-collect_SOURCES = \
-	src/udev/collect/collect.c
-
-collect_LDADD = \
-	libshared.la
-
-udevlibexec_PROGRAMS += \
-	collect
-
-include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-udev/libudev-core/Makefile b/src/grp-udev/libudev-core/Makefile
deleted file mode 100644
index e95d53120a..0000000000
--- a/src/grp-udev/libudev-core/Makefile
+++ /dev/null
@@ -1,101 +0,0 @@
-#  -*- 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
-
-noinst_LTLIBRARIES += \
-	libudev-core.la
-
-$(outdir)/keyboard-keys-list.txt:
-	$(AM_V_GEN)$(CPP) $(ALL_CPPFLAGS) -dM -include linux/input.h - < /dev/null | $(AWK) '/^#define[ \t]+KEY_[^ ]+[ \t]+[0-9K]/ { if ($$2 != "KEY_MAX") { print $$2 } }' > $@
-
-$(outdir)/keyboard-keys-from-name.gperf: $(outdir)/keyboard-keys-list.txt
-	$(AM_V_GEN)$(AWK) 'BEGIN{ print "struct key { const char* name; unsigned short id; };"; print "%null-strings"; print "%%";} { print tolower(substr($$1 ,5)) ", " $$1 }' < $< > $@
-
-$(outdir)/keyboard-keys-from-name.h: $(outdir)/keyboard-keys-from-name.gperf
-	$(AM_V_GPERF)$(GPERF) -L ANSI-C -t -N keyboard_lookup_key -H hash_key_name -p -C < $< > $@
-
-gperf_txt_sources += \
-	src/udev/keyboard-keys-list.txt
-
-libudev_core_la_SOURCES = \
-	src/udev/udev.h \
-	src/udev/udev-event.c \
-	src/udev/udev-watch.c \
-	src/udev/udev-node.c \
-	src/udev/udev-rules.c \
-	src/udev/udev-ctrl.c \
-	src/udev/udev-builtin.c \
-	src/udev/udev-builtin-btrfs.c \
-	src/udev/udev-builtin-hwdb.c \
-	src/udev/udev-builtin-input_id.c \
-	src/udev/udev-builtin-keyboard.c \
-	src/udev/udev-builtin-net_id.c \
-	src/udev/udev-builtin-net_setup_link.c \
-	src/udev/udev-builtin-path_id.c \
-	src/udev/udev-builtin-usb_id.c \
-	src/udev/net/link-config.h \
-	src/udev/net/link-config.c \
-	src/udev/net/ethtool-util.h \
-	src/udev/net/ethtool-util.c
-
-nodist_libudev_core_la_SOURCES = \
-	src/udev/keyboard-keys-from-name.h \
-	src/udev/net/link-config-gperf.c
-
-gperf_gperf_sources += \
-	src/udev/net/link-config-gperf.gperf
-
-libudev_core_la_CFLAGS = \
-	$(AM_CFLAGS) \
-	$(BLKID_CFLAGS) \
-	$(KMOD_CFLAGS)
-
-libudev_core_la_LIBADD = \
-	libsystemd-network.la \
-	libshared.la \
-	$(BLKID_LIBS) \
-	$(KMOD_LIBS)
-
-ifneq ($(HAVE_KMOD),)
-libudev_core_la_SOURCES += \
-	src/udev/udev-builtin-kmod.c
-
-dist_udevrules_DATA += \
-	rules/80-drivers.rules
-endif # HAVE_KMOD
-
-ifneq ($(HAVE_BLKID),)
-libudev_core_la_SOURCES += \
-	src/udev/udev-builtin-blkid.c
-endif # HAVE_BLKID
-
-ifneq ($(HAVE_ACL),)
-libudev_core_la_SOURCES += \
-	src/udev/udev-builtin-uaccess.c \
-	src/login/logind-acl.c \
-	src/libsystemd/sd-login/sd-login.c \
-	src/systemd/sd-login.h
-endif # HAVE_ACL
-
-include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-udev/mtd_probe/Makefile b/src/grp-udev/mtd_probe/Makefile
deleted file mode 100644
index d7392a8a3b..0000000000
--- a/src/grp-udev/mtd_probe/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-#  -*- 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
-
-mtd_probe_SOURCES =  \
-	src/udev/mtd_probe/mtd_probe.c \
-	src/udev/mtd_probe/mtd_probe.h \
-	src/udev/mtd_probe/probe_smartmedia.c
-
-dist_udevrules_DATA += \
-	rules/75-probe_mtd.rules
-
-udevlibexec_PROGRAMS += \
-	mtd_probe
-
-include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/rules/.gitignore b/src/grp-udev/rules/.gitignore
index 93a50ddd80..93a50ddd80 100644
--- a/rules/.gitignore
+++ b/src/grp-udev/rules/.gitignore
diff --git a/rules/50-udev-default.rules b/src/grp-udev/rules/50-udev-default.rules
index e9eeb8518e..e9eeb8518e 100644
--- a/rules/50-udev-default.rules
+++ b/src/grp-udev/rules/50-udev-default.rules
diff --git a/rules/60-block.rules b/src/grp-udev/rules/60-block.rules
index c74caca49f..c74caca49f 100644
--- a/rules/60-block.rules
+++ b/src/grp-udev/rules/60-block.rules
diff --git a/rules/60-cdrom_id.rules b/src/grp-udev/rules/60-cdrom_id.rules
index 5c3b52ebb9..5c3b52ebb9 100644
--- a/rules/60-cdrom_id.rules
+++ b/src/grp-udev/rules/60-cdrom_id.rules
diff --git a/rules/60-drm.rules b/src/grp-udev/rules/60-drm.rules
index 1ed3e445f2..1ed3e445f2 100644
--- a/rules/60-drm.rules
+++ b/src/grp-udev/rules/60-drm.rules
diff --git a/rules/60-evdev.rules b/src/grp-udev/rules/60-evdev.rules
index ade7e7f646..ade7e7f646 100644
--- a/rules/60-evdev.rules
+++ b/src/grp-udev/rules/60-evdev.rules
diff --git a/rules/60-persistent-alsa.rules b/src/grp-udev/rules/60-persistent-alsa.rules
index 8154e2dbb5..8154e2dbb5 100644
--- a/rules/60-persistent-alsa.rules
+++ b/src/grp-udev/rules/60-persistent-alsa.rules
diff --git a/rules/60-persistent-input.rules b/src/grp-udev/rules/60-persistent-input.rules
index 0e33e68384..0e33e68384 100644
--- a/rules/60-persistent-input.rules
+++ b/src/grp-udev/rules/60-persistent-input.rules
diff --git a/rules/60-persistent-storage-tape.rules b/src/grp-udev/rules/60-persistent-storage-tape.rules
index f2eabd92a8..f2eabd92a8 100644
--- a/rules/60-persistent-storage-tape.rules
+++ b/src/grp-udev/rules/60-persistent-storage-tape.rules
diff --git a/rules/60-persistent-storage.rules b/src/grp-udev/rules/60-persistent-storage.rules
index 408733915c..408733915c 100644
--- a/rules/60-persistent-storage.rules
+++ b/src/grp-udev/rules/60-persistent-storage.rules
diff --git a/rules/60-persistent-v4l.rules b/src/grp-udev/rules/60-persistent-v4l.rules
index 93c5ee8c27..93c5ee8c27 100644
--- a/rules/60-persistent-v4l.rules
+++ b/src/grp-udev/rules/60-persistent-v4l.rules
diff --git a/rules/60-serial.rules b/src/grp-udev/rules/60-serial.rules
index f303e27fd5..f303e27fd5 100644
--- a/rules/60-serial.rules
+++ b/src/grp-udev/rules/60-serial.rules
diff --git a/rules/64-btrfs.rules b/src/grp-udev/rules/64-btrfs.rules
index fe0100131e..fe0100131e 100644
--- a/rules/64-btrfs.rules
+++ b/src/grp-udev/rules/64-btrfs.rules
diff --git a/rules/70-mouse.rules b/src/grp-udev/rules/70-mouse.rules
index 3ea743aff9..3ea743aff9 100644
--- a/rules/70-mouse.rules
+++ b/src/grp-udev/rules/70-mouse.rules
diff --git a/rules/75-net-description.rules b/src/grp-udev/rules/75-net-description.rules
index 7e62f8b26b..7e62f8b26b 100644
--- a/rules/75-net-description.rules
+++ b/src/grp-udev/rules/75-net-description.rules
diff --git a/rules/75-probe_mtd.rules b/src/grp-udev/rules/75-probe_mtd.rules
index 8848aeeaed..8848aeeaed 100644
--- a/rules/75-probe_mtd.rules
+++ b/src/grp-udev/rules/75-probe_mtd.rules
diff --git a/rules/78-sound-card.rules b/src/grp-udev/rules/78-sound-card.rules
index 04740e8b97..04740e8b97 100644
--- a/rules/78-sound-card.rules
+++ b/src/grp-udev/rules/78-sound-card.rules
diff --git a/rules/80-drivers.rules b/src/grp-udev/rules/80-drivers.rules
index 8551f47a4b..8551f47a4b 100644
--- a/rules/80-drivers.rules
+++ b/src/grp-udev/rules/80-drivers.rules
diff --git a/rules/80-net-setup-link.rules b/src/grp-udev/rules/80-net-setup-link.rules
index 6e411a91f0..6e411a91f0 100644
--- a/rules/80-net-setup-link.rules
+++ b/src/grp-udev/rules/80-net-setup-link.rules
diff --git a/rules/99-systemd.rules.in b/src/grp-udev/rules/99-systemd.rules.in
index fb4517606d..fb4517606d 100644
--- a/rules/99-systemd.rules.in
+++ b/src/grp-udev/rules/99-systemd.rules.in
diff --git a/src/grp-udev/scsi_id/Makefile b/src/grp-udev/scsi_id/Makefile
deleted file mode 100644
index 7064a864f7..0000000000
--- a/src/grp-udev/scsi_id/Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
-#  -*- 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
-
-scsi_id_SOURCES =\
-	src/udev/scsi_id/scsi_id.c \
-	src/udev/scsi_id/scsi_serial.c \
-	src/udev/scsi_id/scsi.h \
-	src/udev/scsi_id/scsi_id.h
-
-scsi_id_LDADD = \
-	libshared.la
-
-udevlibexec_PROGRAMS += \
-	scsi_id
-
-EXTRA_DIST += \
-	src/udev/scsi_id/README
-
-include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/systemd-hwdb/hwdb.c b/src/grp-udev/systemd-hwdb/hwdb.c
index 1160dacdf1..1160dacdf1 100644
--- a/src/systemd-hwdb/hwdb.c
+++ b/src/grp-udev/systemd-hwdb/hwdb.c
diff --git a/man/systemd-hwdb.xml b/src/grp-udev/systemd-hwdb/systemd-hwdb.xml
index 2b363c77f2..2b363c77f2 100644
--- a/man/systemd-hwdb.xml
+++ b/src/grp-udev/systemd-hwdb/systemd-hwdb.xml
diff --git a/src/grp-udev/systemd-udevd/Makefile b/src/grp-udev/systemd-udevd/Makefile
deleted file mode 100644
index 5bbc548cfe..0000000000
--- a/src/grp-udev/systemd-udevd/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-#  -*- 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
-
-rootlibexec_PROGRAMS += \
-	systemd-udevd
-
-systemd_udevd_SOURCES = \
-	src/udev/udevd.c
-
-systemd_udevd_LDADD = \
-	libudev-core.la
-
-include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/units/systemd-udevd.service.in b/src/grp-udev/systemd-udevd/systemd-udevd.service.in
index 79f28c87c6..79f28c87c6 100644
--- a/units/systemd-udevd.service.in
+++ b/src/grp-udev/systemd-udevd/systemd-udevd.service.in
diff --git a/src/grp-udev/udevadm/Makefile b/src/grp-udev/udevadm/Makefile
deleted file mode 100644
index ba3b466935..0000000000
--- a/src/grp-udev/udevadm/Makefile
+++ /dev/null
@@ -1,45 +0,0 @@
-#  -*- 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
-
-rootbin_PROGRAMS += \
-	udevadm
-
-udevadm_SOURCES = \
-	src/udev/udevadm.c \
-	src/udev/udevadm-info.c \
-	src/udev/udevadm-control.c \
-	src/udev/udevadm-monitor.c \
-	src/udev/udevadm-hwdb.c \
-	src/udev/udevadm-settle.c \
-	src/udev/udevadm-trigger.c \
-	src/udev/udevadm-test.c \
-	src/udev/udevadm-test-builtin.c \
-	src/udev/udevadm-util.c \
-	src/udev/udevadm-util.h
-
-udevadm_LDADD = \
-	libudev-core.la
-
-include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/man/udevadm.xml b/src/grp-udev/udevadm/udevadm.xml
index 8c1abd2770..8c1abd2770 100644
--- a/man/udevadm.xml
+++ b/src/grp-udev/udevadm/udevadm.xml
diff --git a/src/grp-udev/v4l_id/Makefile b/src/grp-udev/v4l_id/Makefile
deleted file mode 100644
index 0641af8065..0000000000
--- a/src/grp-udev/v4l_id/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-#  -*- 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
-
-v4l_id_SOURCES = \
-	src/udev/v4l_id/v4l_id.c
-
-v4l_id_LDADD = \
-	libshared.la
-
-udevlibexec_PROGRAMS += \
-	v4l_id
-
-dist_udevrules_DATA += \
-	rules/60-persistent-v4l.rules
-
-include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/systemd-ac-power/ac-power.c b/src/grp-utils/systemd-ac-power/ac-power.c
index c5277884a8..c5277884a8 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/escape.c b/src/grp-utils/systemd-escape/escape.c
index 9f39049577..9f39049577 100644
--- a/src/systemd-escape/escape.c
+++ b/src/grp-utils/systemd-escape/escape.c
diff --git a/man/systemd-escape.xml b/src/grp-utils/systemd-escape/systemd-escape.xml
index dbb3869a24..dbb3869a24 100644
--- a/man/systemd-escape.xml
+++ b/src/grp-utils/systemd-escape/systemd-escape.xml
diff --git a/src/systemd-notify/notify.c b/src/grp-utils/systemd-notify/notify.c
index b18fb5938f..b18fb5938f 100644
--- a/src/systemd-notify/notify.c
+++ b/src/grp-utils/systemd-notify/notify.c
diff --git a/man/systemd-notify.xml b/src/grp-utils/systemd-notify/systemd-notify.xml
index a5f4077166..a5f4077166 100644
--- a/man/systemd-notify.xml
+++ b/src/grp-utils/systemd-notify/systemd-notify.xml
diff --git a/src/systemd-path/path.c b/src/grp-utils/systemd-path/path.c
index 80268ed874..80268ed874 100644
--- a/src/systemd-path/path.c
+++ b/src/grp-utils/systemd-path/path.c
diff --git a/man/systemd-path.xml b/src/grp-utils/systemd-path/systemd-path.xml
index e2b23eec51..e2b23eec51 100644
--- a/man/systemd-path.xml
+++ b/src/grp-utils/systemd-path/systemd-path.xml
diff --git a/src/systemd-activate/activate.c b/src/grp-utils/systemd-socket-activate/activate.c
index 89cc1ee813..89cc1ee813 100644
--- a/src/systemd-activate/activate.c
+++ b/src/grp-utils/systemd-socket-activate/activate.c
diff --git a/man/systemd-socket-activate.xml b/src/grp-utils/systemd-socket-activate/systemd-socket-activate.xml
index 5d7f157c72..5d7f157c72 100644
--- a/man/systemd-socket-activate.xml
+++ b/src/grp-utils/systemd-socket-activate/systemd-socket-activate.xml
diff --git a/src/kernel-install/Makefile b/src/kernel-install/Makefile
deleted file mode 100644
index d50b684d01..0000000000
--- a/src/kernel-install/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-#  -*- 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
-
-dist_bin_SCRIPTS = \
-	src/kernel-install/kernel-install
-
-dist_kernelinstall_SCRIPTS = \
-	src/kernel-install/50-depmod.install \
-	src/kernel-install/90-loaderentry.install
-
-include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/libbasic/include/basic/.gitignore b/src/libbasic/.gitignore
index e22411e484..e22411e484 100644
--- a/src/libbasic/include/basic/.gitignore
+++ b/src/libbasic/.gitignore
diff --git a/src/libbasic/Makefile b/src/libbasic/Makefile
deleted file mode 100644
index 45d408fa19..0000000000
--- a/src/libbasic/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-#  -*- 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 += src include
-include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/libbasic/include/Makefile b/src/libbasic/include/Makefile
deleted file mode 100644
index 0aa8325a7e..0000000000
--- a/src/libbasic/include/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-#  -*- 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 += basic
-include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/libbasic/include/basic/Makefile b/src/libbasic/include/basic/Makefile
deleted file mode 100644
index 1bfc55a1e2..0000000000
--- a/src/libbasic/include/basic/Makefile
+++ /dev/null
@@ -1,62 +0,0 @@
-#  -*- 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
-
-$(outdir)/errno-list.txt:
-	$(AM_V_GEN)$(CPP) $(ALL_CPPFLAGS) -dM -include errno.h - </dev/null | $(AWK) '/^#define[ \t]+E[^ _]+[ \t]+/ { print $$2; }' >$@
-
-$(outdir)/errno-to-name.h: $(outdir)/errno-list.txt
-	$(AM_V_GEN)$(AWK) 'BEGIN{ print "static const char* const errno_names[] = { "} !/EDEADLOCK/ && !/EWOULDBLOCK/ && !/ENOTSUP/ { printf "[%s] = \"%s\",\n", $$1, $$1 } END{print "};"}' <$< >$@
-
-
-$(outdir)/af-list.txt:
-	$(AM_V_GEN)$(CPP) $(ALL_CPPFLAGS) -dM -include sys/socket.h - </dev/null | grep -v AF_UNSPEC | grep -v AF_MAX | $(AWK) '/^#define[ \t]+AF_[^ \t]+[ \t]+PF_[^ \t]/ { print $$2; }' >$@
-
-$(outdir)/af-to-name.h: $(outdir)/af-list.txt
-	$(AM_V_GEN)$(AWK) 'BEGIN{ print "static const char* const af_names[] = { "} !/AF_FILE/ && !/AF_ROUTE/ && !/AF_LOCAL/ { printf "[%s] = \"%s\",\n", $$1, $$1 } END{print "};"}' <$< >$@
-
-
-$(outdir)/arphrd-list.txt:
-	$(AM_V_GEN)$(CPP) $(ALL_CPPFLAGS) -dM -include net/if_arp.h - </dev/null | $(AWK) '/^#define[ \t]+ARPHRD_[^ \t]+[ \t]+[^ \t]/ { print $$2; }' | sed -e 's/ARPHRD_//' >$@
-
-$(outdir)/arphrd-to-name.h: $(outdir)/arphrd-list.txt
-	$(AM_V_GEN)$(AWK) 'BEGIN{ print "static const char* const arphrd_names[] = { "} !/CISCO/ { printf "[ARPHRD_%s] = \"%s\",\n", $$1, $$1 } END{print "};"}' <$< >$@
-
-$(outdir)/arphrd-from-name.gperf: $(outdir)/arphrd-list.txt
-	$(AM_V_GEN)$(AWK) 'BEGIN{ print "struct arphrd_name { const char* name; int id; };"; print "%null-strings"; print "%%";} { printf "%s, ARPHRD_%s\n", $$1, $$1 }' <$< >$@
-
-
-$(outdir)/cap-list.txt:
-	$(AM_V_GEN)$(CPP) $(ALL_CPPFLAGS) -dM -include linux/capability.h -include missing.h - </dev/null | $(AWK) '/^#define[ \t]+CAP_[A-Z_]+[ \t]+/ { print $$2; }' | grep -v CAP_LAST_CAP >$@
-
-$(outdir)/cap-to-name.h: $(outdir)/cap-list.txt
-	$(AM_V_GEN)$(AWK) 'BEGIN{ print "static const char* const capability_names[] = { "} { printf "[%s] = \"%s\",\n", $$1, tolower($$1) } END{print "};"}' <$< >$@
-
-$(outdir)/cap-from-name.gperf: $(outdir)/cap-list.txt
-	$(AM_V_GEN)$(AWK) 'BEGIN{ print "struct capability_name { const char* name; int id; };"; print "%null-strings"; print "%%";} { printf "%s, %s\n", $$1, $$1 }' <$< >$@
-
-$(outdir)/cap-from-name.h: $(outdir)/cap-from-name.gperf
-	$(AM_V_GPERF)$(GPERF) -L ANSI-C -t --ignore-case -N lookup_capability -H hash_capability_name -p -C <$< >$@
-
-include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/libbasic/src/Makefile b/src/libbasic/src/Makefile
deleted file mode 100644
index 2fc52e91f5..0000000000
--- a/src/libbasic/src/Makefile
+++ /dev/null
@@ -1,243 +0,0 @@
-#  -*- 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
-
-noinst_LTLIBRARIES += \
-	libbasic.la
-
-libbasic_la_SOURCES = \
-	src/basic/missing.h \
-	src/basic/missing_syscall.h \
-	src/basic/capability-util.c \
-	src/basic/capability-util.h \
-	src/basic/conf-files.c \
-	src/basic/conf-files.h \
-	src/basic/stdio-util.h \
-	src/basic/hostname-util.h \
-	src/basic/hostname-util.c \
-	src/basic/unit-name.c \
-	src/basic/unit-name.h \
-	src/basic/ioprio.h \
-	src/basic/securebits.h \
-	src/basic/special.h \
-	src/basic/list.h \
-	src/basic/unaligned.h \
-	src/basic/macro.h \
-	src/basic/def.h \
-	src/basic/sparse-endian.h \
-	src/basic/refcnt.h \
-	src/basic/util.c \
-	src/basic/util.h \
-	src/basic/io-util.c \
-	src/basic/io-util.h \
-	src/basic/string-util.c \
-	src/basic/string-util.h \
-	src/basic/fd-util.c \
-	src/basic/fd-util.h \
-	src/basic/parse-util.c \
-	src/basic/parse-util.h \
-	src/basic/user-util.c \
-	src/basic/user-util.h \
-	src/basic/rlimit-util.c \
-	src/basic/rlimit-util.h \
-	src/basic/dirent-util.c \
-	src/basic/dirent-util.h \
-	src/basic/xattr-util.c \
-	src/basic/xattr-util.h \
-	src/basic/chattr-util.c \
-	src/basic/chattr-util.h \
-	src/basic/proc-cmdline.c \
-	src/basic/proc-cmdline.h \
-	src/basic/fs-util.c \
-	src/basic/fs-util.h \
-	src/basic/syslog-util.c \
-	src/basic/syslog-util.h \
-	src/basic/stat-util.c \
-	src/basic/stat-util.h \
-	src/basic/mount-util.c \
-	src/basic/mount-util.h \
-	src/basic/hexdecoct.c \
-	src/basic/hexdecoct.h \
-	src/basic/glob-util.h \
-	src/basic/glob-util.c \
-	src/basic/extract-word.c \
-	src/basic/extract-word.h \
-	src/basic/escape.c \
-	src/basic/escape.h \
-	src/basic/cpu-set-util.c \
-	src/basic/cpu-set-util.h \
-	src/basic/lockfile-util.c \
-	src/basic/lockfile-util.h \
-	src/basic/path-util.c \
-	src/basic/path-util.h \
-	src/basic/time-util.c \
-	src/basic/time-util.h \
-	src/basic/locale-util.c \
-	src/basic/locale-util.h \
-	src/basic/umask-util.h \
-	src/basic/signal-util.c \
-	src/basic/signal-util.h \
-	src/basic/string-table.c \
-	src/basic/string-table.h \
-	src/basic/mempool.c \
-	src/basic/mempool.h \
-	src/basic/hashmap.c \
-	src/basic/hashmap.h \
-	src/basic/hash-funcs.c \
-	src/basic/hash-funcs.h \
-	src/basic/siphash24.c \
-	src/basic/siphash24.h \
-	src/basic/set.h \
-	src/basic/ordered-set.h \
-	src/basic/ordered-set.c \
-	src/basic/bitmap.c \
-	src/basic/bitmap.h \
-	src/basic/fdset.c \
-	src/basic/fdset.h \
-	src/basic/prioq.c \
-	src/basic/prioq.h \
-	src/basic/web-util.c \
-	src/basic/web-util.h \
-	src/basic/strv.c \
-	src/basic/strv.h \
-	src/basic/env-util.c \
-	src/basic/env-util.h \
-	src/basic/strbuf.c \
-	src/basic/strbuf.h \
-	src/basic/strxcpyx.c \
-	src/basic/strxcpyx.h \
-	src/basic/log.c \
-	src/basic/log.h \
-	src/basic/bus-label.c \
-	src/basic/bus-label.h \
-	src/basic/ratelimit.h \
-	src/basic/ratelimit.c \
-	src/basic/exit-status.c \
-	src/basic/exit-status.h \
-	src/basic/virt.c \
-	src/basic/virt.h \
-	src/basic/architecture.c \
-	src/basic/architecture.h \
-	src/basic/smack-util.c \
-	src/basic/smack-util.h \
-	src/basic/device-nodes.c \
-	src/basic/device-nodes.h \
-	src/basic/utf8.c \
-	src/basic/utf8.h \
-	src/basic/gunicode.c \
-	src/basic/gunicode.h \
-	src/basic/socket-util.c \
-	src/basic/socket-util.h \
-	src/basic/in-addr-util.c \
-	src/basic/in-addr-util.h \
-	src/basic/ether-addr-util.h \
-	src/basic/ether-addr-util.c \
-	src/basic/replace-var.c \
-	src/basic/replace-var.h \
-	src/basic/clock-util.c \
-	src/basic/clock-util.h \
-	src/basic/calendarspec.c \
-	src/basic/calendarspec.h \
-	src/basic/fileio.c \
-	src/basic/fileio.h \
-	src/basic/MurmurHash2.c \
-	src/basic/MurmurHash2.h \
-	src/basic/mkdir.c \
-	src/basic/mkdir.h \
-	src/basic/cgroup-util.c \
-	src/basic/cgroup-util.h \
-	src/basic/errno-list.c \
-	src/basic/errno-list.h \
-	src/basic/af-list.c \
-	src/basic/af-list.h \
-	src/basic/arphrd-list.c \
-	src/basic/arphrd-list.h \
-	src/basic/terminal-util.c \
-	src/basic/terminal-util.h \
-	src/basic/login-util.h \
-	src/basic/login-util.c \
-	src/basic/cap-list.c \
-	src/basic/cap-list.h \
-	src/basic/audit-util.c \
-	src/basic/audit-util.h \
-	src/basic/xml.c \
-	src/basic/xml.h \
-	src/basic/barrier.c \
-	src/basic/barrier.h \
-	src/basic/async.c \
-	src/basic/async.h \
-	src/basic/memfd-util.c \
-	src/basic/memfd-util.h \
-	src/basic/process-util.c \
-	src/basic/process-util.h \
-	src/basic/random-util.c \
-	src/basic/random-util.h \
-	src/basic/verbs.c \
-	src/basic/verbs.h \
-	src/basic/sigbus.c \
-	src/basic/sigbus.h \
-	src/basic/build.h \
-	src/basic/socket-label.c \
-	src/basic/label.c \
-	src/basic/label.h \
-	src/basic/btrfs-util.c \
-	src/basic/btrfs-util.h \
-	src/basic/btrfs-ctree.h \
-	src/basic/selinux-util.c \
-	src/basic/selinux-util.h \
-	src/basic/mkdir-label.c \
-	src/basic/fileio-label.c \
-	src/basic/fileio-label.h \
-	src/basic/rm-rf.c \
-	src/basic/rm-rf.h \
-	src/basic/copy.c \
-	src/basic/copy.h \
-	src/basic/alloc-util.h \
-	src/basic/alloc-util.c \
-	src/basic/formats-util.h \
-	src/basic/nss-util.h
-
-nodist_libbasic_la_SOURCES = \
-	src/basic/errno-from-name.h \
-	src/basic/errno-to-name.h \
-	src/basic/af-from-name.h \
-	src/basic/af-to-name.h \
-	src/basic/arphrd-from-name.h \
-	src/basic/arphrd-to-name.h \
-	src/basic/cap-from-name.h \
-	src/basic/cap-to-name.h
-
-libbasic_la_CFLAGS = \
-	$(AM_CFLAGS) \
-	$(SELINUX_CFLAGS) \
-	$(CAP_CFLAGS) \
-	-pthread
-
-libbasic_la_LIBADD = \
-	$(SELINUX_LIBS) \
-	$(CAP_LIBS) \
-	-lrt \
-	-lm
-
-include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/libcore/Makefile b/src/libcore/Makefile
deleted file mode 100644
index f40a115042..0000000000
--- a/src/libcore/Makefile
+++ /dev/null
@@ -1,170 +0,0 @@
-#  -*- 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
-
-noinst_LTLIBRARIES += \
-	libcore.la
-
-libcore_la_SOURCES = \
-	src/core/unit.c \
-	src/core/unit.h \
-	src/core/unit-printf.c \
-	src/core/unit-printf.h \
-	src/core/job.c \
-	src/core/job.h \
-	src/core/manager.c \
-	src/core/manager.h \
-	src/core/transaction.c \
-	src/core/transaction.h \
-	src/core/load-fragment.c \
-	src/core/load-fragment.h \
-	src/core/service.c \
-	src/core/service.h \
-	src/core/socket.c \
-	src/core/socket.h \
-	src/core/busname.c \
-	src/core/busname.h \
-	src/core/bus-policy.c \
-	src/core/bus-policy.h \
-	src/core/target.c \
-	src/core/target.h \
-	src/core/device.c \
-	src/core/device.h \
-	src/core/mount.c \
-	src/core/mount.h \
-	src/core/automount.c \
-	src/core/automount.h \
-	src/core/swap.c \
-	src/core/swap.h \
-	src/core/timer.c \
-	src/core/timer.h \
-	src/core/path.c \
-	src/core/path.h \
-	src/core/slice.c \
-	src/core/slice.h \
-	src/core/scope.c \
-	src/core/scope.h \
-	src/core/load-dropin.c \
-	src/core/load-dropin.h \
-	src/core/execute.c \
-	src/core/execute.h \
-	src/core/kill.c \
-	src/core/kill.h \
-	src/core/dbus.c \
-	src/core/dbus.h \
-	src/core/dbus-manager.c \
-	src/core/dbus-manager.h \
-	src/core/dbus-unit.c \
-	src/core/dbus-unit.h \
-	src/core/dbus-job.c \
-	src/core/dbus-job.h \
-	src/core/dbus-service.c \
-	src/core/dbus-service.h \
-	src/core/dbus-socket.c \
-	src/core/dbus-socket.h \
-	src/core/dbus-busname.c \
-	src/core/dbus-busname.h \
-	src/core/dbus-target.c \
-	src/core/dbus-target.h \
-	src/core/dbus-device.c \
-	src/core/dbus-device.h \
-	src/core/dbus-mount.c \
-	src/core/dbus-mount.h \
-	src/core/dbus-automount.c \
-	src/core/dbus-automount.h \
-	src/core/dbus-swap.c \
-	src/core/dbus-swap.h \
-	src/core/dbus-timer.c \
-	src/core/dbus-timer.h \
-	src/core/dbus-path.c \
-	src/core/dbus-path.h \
-	src/core/dbus-slice.c \
-	src/core/dbus-slice.h \
-	src/core/dbus-scope.c \
-	src/core/dbus-scope.h \
-	src/core/dbus-execute.c \
-	src/core/dbus-execute.h \
-	src/core/dbus-kill.c \
-	src/core/dbus-kill.h \
-	src/core/dbus-cgroup.c \
-	src/core/dbus-cgroup.h \
-	src/core/cgroup.c \
-	src/core/cgroup.h \
-	src/core/selinux-access.c \
-	src/core/selinux-access.h \
-	src/core/selinux-setup.c \
-	src/core/selinux-setup.h \
-	src/core/smack-setup.c \
-	src/core/smack-setup.h \
-	src/core/ima-setup.c \
-	src/core/ima-setup.h \
-	src/core/locale-setup.h \
-	src/core/locale-setup.c \
-	src/core/hostname-setup.c \
-	src/core/hostname-setup.h \
-	src/core/machine-id-setup.c \
-	src/core/machine-id-setup.h \
-	src/core/mount-setup.c \
-	src/core/mount-setup.h \
-	src/core/kmod-setup.c \
-	src/core/kmod-setup.h \
-	src/core/loopback-setup.h \
-	src/core/loopback-setup.c \
-	src/core/namespace.c \
-	src/core/namespace.h \
-	src/core/killall.h \
-	src/core/killall.c \
-	src/core/audit-fd.c \
-	src/core/audit-fd.h \
-	src/core/show-status.c \
-	src/core/show-status.h \
-	src/core/failure-action.c \
-	src/core/failure-action.h
-
-nodist_libcore_la_SOURCES = \
-	src/core/load-fragment-gperf.c \
-	src/core/load-fragment-gperf-nulstr.c
-
-libcore_la_CFLAGS = \
-	$(AM_CFLAGS) \
-	$(PAM_CFLAGS) \
-	$(AUDIT_CFLAGS) \
-	$(KMOD_CFLAGS) \
-	$(APPARMOR_CFLAGS) \
-	$(MOUNT_CFLAGS) \
-	$(SECCOMP_CFLAGS)
-
-libcore_la_LIBADD = \
-	libshared.la \
-	$(PAM_LIBS) \
-	$(AUDIT_LIBS) \
-	$(KMOD_LIBS) \
-	$(APPARMOR_LIBS) \
-	$(MOUNT_LIBS)
-
-$(outdir)/load-fragment-gperf-nulstr.c: src/core/load-fragment-gperf.gperf
-	$(AM_V_at)$(MKDIR_P) $(dir $@)
-	$(AM_V_GEN)$(AWK) 'BEGIN{ keywords=0 ; FS="," ; print "extern const char load_fragment_gperf_nulstr[];" ; print "const char load_fragment_gperf_nulstr[] ="} ; keyword==1 { print "\"" $$1 "\\0\"" } ; /%%/ { keyword=1} ; END { print ";" }' < $< > $@
-
-include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/libfirewall/Makefile b/src/libfirewall/Makefile
deleted file mode 100644
index ced0f7e476..0000000000
--- a/src/libfirewall/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-#  -*- 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
-
-ifneq ($(HAVE_LIBIPTC),)
-noinst_LTLIBRARIES += \
-	libfirewall.la
-
-libfirewall_la_SOURCES = \
-	src/shared/firewall-util.h \
-	src/shared/firewall-util.c
-
-libfirewall_la_CFLAGS = \
-	$(AM_CFLAGS) \
-	$(LIBIPTC_CFLAGS)
-
-libfirewall_la_LIBADD = \
-	$(LIBIPTC_LIBS)
-endif # HAVE_LIBIPTC
-
-include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/libshared/Makefile b/src/libshared/Makefile
deleted file mode 100644
index 7ed2706100..0000000000
--- a/src/libshared/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-#  -*- 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 += src
-include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/libshared/src/Makefile b/src/libshared/src/Makefile
deleted file mode 100644
index d808b55361..0000000000
--- a/src/libshared/src/Makefile
+++ /dev/null
@@ -1,143 +0,0 @@
-#  -*- 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
-
-noinst_LTLIBRARIES += \
-	libshared.la
-
-libshared_la_SOURCES = \
-	src/shared/output-mode.h \
-	src/shared/output-mode.c \
-	src/shared/gpt.h \
-	src/shared/udev-util.h \
-	src/shared/linux/auto_dev-ioctl.h \
-	src/shared/initreq.h \
-	src/shared/dns-domain.c \
-	src/shared/dns-domain.h \
-	src/shared/efivars.c \
-	src/shared/efivars.h \
-	src/shared/fstab-util.c \
-	src/shared/fstab-util.h \
-	src/shared/sleep-config.c \
-	src/shared/sleep-config.h \
-	src/shared/conf-parser.c \
-	src/shared/conf-parser.h \
-	src/shared/pager.c \
-	src/shared/pager.h \
-	src/shared/spawn-polkit-agent.c \
-	src/shared/spawn-polkit-agent.h \
-	src/shared/apparmor-util.c \
-	src/shared/apparmor-util.h \
-	src/shared/ima-util.c \
-	src/shared/ima-util.h \
-	src/shared/ptyfwd.c \
-	src/shared/ptyfwd.h \
-	src/shared/base-filesystem.c \
-	src/shared/base-filesystem.h \
-	src/shared/uid-range.c \
-	src/shared/uid-range.h \
-	src/shared/install.c \
-	src/shared/install.h \
-	src/shared/install-printf.c \
-	src/shared/install-printf.h \
-	src/shared/path-lookup.c \
-	src/shared/path-lookup.h \
-	src/shared/specifier.c \
-	src/shared/specifier.h \
-	src/shared/dev-setup.c \
-	src/shared/dev-setup.h \
-	src/shared/dropin.c \
-	src/shared/dropin.h \
-	src/shared/condition.c \
-	src/shared/condition.h \
-	src/shared/clean-ipc.c \
-	src/shared/clean-ipc.h \
-	src/shared/generator.h \
-	src/shared/generator.c \
-	src/shared/acpi-fpdt.h \
-	src/shared/acpi-fpdt.c \
-	src/shared/boot-timestamps.h \
-	src/shared/boot-timestamps.c \
-	src/shared/cgroup-show.c \
-	src/shared/cgroup-show.h \
-	src/shared/utmp-wtmp.h \
-	src/shared/watchdog.c \
-	src/shared/watchdog.h \
-	src/shared/spawn-ask-password-agent.c \
-	src/shared/spawn-ask-password-agent.h \
-	src/shared/ask-password-api.c \
-	src/shared/ask-password-api.h \
-	src/shared/switch-root.h \
-	src/shared/switch-root.c \
-	src/shared/import-util.c \
-	src/shared/import-util.h \
-	src/shared/sysctl-util.c \
-	src/shared/sysctl-util.h \
-	src/shared/bus-util.c \
-	src/shared/bus-util.h \
-	src/shared/logs-show.c \
-	src/shared/logs-show.h \
-	src/shared/machine-image.c \
-	src/shared/machine-image.h \
-	src/shared/machine-pool.c \
-	src/shared/machine-pool.h \
-	src/shared/resolve-util.c \
-	src/shared/resolve-util.h \
-	src/shared/bus-unit-util.c \
-	src/shared/bus-unit-util.h \
-	src/shared/tests.h \
-	src/shared/tests.c
-
-ifneq ($(HAVE_UTMP),)
-libshared_la_SOURCES += \
-	src/shared/utmp-wtmp.c
-endif # HAVE_UTMP
-
-ifneq ($(HAVE_SECCOMP),)
-libshared_la_SOURCES += \
-	src/shared/seccomp-util.h \
-	src/shared/seccomp-util.c
-endif # HAVE_SECCOMP
-
-ifneq ($(HAVE_ACL),)
-libshared_la_SOURCES += \
-	src/shared/acl-util.c \
-	src/shared/acl-util.h
-endif # HAVE_ACL
-
-libshared_la_CFLAGS = \
-	$(AM_CFLAGS) \
-	$(ACL_CFLAGS) \
-	$(LIBIDN_CFLAGS) \
-	$(SECCOMP_CFLAGS)
-
-libshared_la_LIBADD = \
-	libsystemd-internal.la \
-	libsystemd-journal-internal.la \
-	libudev-internal.la \
-	$(ACL_LIBS) \
-	$(LIBIDN_LIBS) \
-	$(SECCOMP_LIBS)
-
-include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/libshared/include/shared/test-tables.h b/src/libshared/test/test-tables.h
index 228e510104..228e510104 100644
--- a/src/libshared/include/shared/test-tables.h
+++ b/src/libshared/test/test-tables.h
diff --git a/src/libsystemd-network/Makefile b/src/libsystemd-network/Makefile
deleted file mode 100644
index 96f14f58f2..0000000000
--- a/src/libsystemd-network/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-#  -*- 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 += src test
-include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/libsystemd-network/src/Makefile b/src/libsystemd-network/src/Makefile
deleted file mode 100644
index 69a415c2bb..0000000000
--- a/src/libsystemd-network/src/Makefile
+++ /dev/null
@@ -1,81 +0,0 @@
-#  -*- 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
-
-noinst_LTLIBRARIES += \
-	libsystemd-network.la
-
-libsystemd_network_la_CFLAGS = \
-	$(AM_CFLAGS) \
-	$(KMOD_CFLAGS)
-
-libsystemd_network_la_SOURCES = \
-	src/systemd/sd-dhcp-client.h \
-	src/systemd/sd-dhcp-server.h \
-	src/systemd/sd-dhcp-lease.h \
-	src/systemd/sd-ipv4ll.h \
-	src/systemd/sd-ipv4acd.h \
-	src/systemd/sd-ndisc.h \
-	src/systemd/sd-dhcp6-client.h \
-	src/systemd/sd-dhcp6-lease.h \
-	src/systemd/sd-lldp.h \
-	src/libsystemd-network/sd-dhcp-client.c \
-	src/libsystemd-network/sd-dhcp-server.c \
-	src/libsystemd-network/dhcp-network.c \
-	src/libsystemd-network/dhcp-option.c \
-	src/libsystemd-network/dhcp-packet.c \
-	src/libsystemd-network/dhcp-internal.h \
-	src/libsystemd-network/dhcp-server-internal.h \
-	src/libsystemd-network/dhcp-protocol.h \
-	src/libsystemd-network/dhcp-lease-internal.h \
-	src/libsystemd-network/sd-dhcp-lease.c \
-	src/libsystemd-network/sd-ipv4ll.c \
-	src/libsystemd-network/sd-ipv4acd.c \
-	src/libsystemd-network/arp-util.h \
-	src/libsystemd-network/arp-util.c \
-	src/libsystemd-network/network-internal.c \
-	src/libsystemd-network/network-internal.h \
-	src/libsystemd-network/sd-ndisc.c \
-	src/libsystemd-network/icmp6-util.h \
-	src/libsystemd-network/icmp6-util.c \
-	src/libsystemd-network/sd-dhcp6-client.c \
-	src/libsystemd-network/dhcp6-internal.h \
-	src/libsystemd-network/dhcp6-protocol.h \
-	src/libsystemd-network/dhcp6-network.c \
-	src/libsystemd-network/dhcp6-option.c \
-	src/libsystemd-network/dhcp6-lease-internal.h \
-	src/libsystemd-network/sd-dhcp6-lease.c \
-	src/libsystemd-network/dhcp-identifier.h \
-	src/libsystemd-network/dhcp-identifier.c \
-	src/libsystemd-network/lldp-internal.h \
-	src/libsystemd-network/lldp-network.h \
-	src/libsystemd-network/lldp-network.c \
-	src/libsystemd-network/lldp-neighbor.h \
-	src/libsystemd-network/lldp-neighbor.c \
-	src/libsystemd-network/sd-lldp.c
-
-libsystemd_network_la_LIBADD = \
-	$(KMOD_LIBS)
-
-include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/libsystemd-network/test/Makefile b/src/libsystemd-network/test/Makefile
deleted file mode 100644
index dab8ee0beb..0000000000
--- a/src/libsystemd-network/test/Makefile
+++ /dev/null
@@ -1,118 +0,0 @@
-#  -*- 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
-
-test_dhcp_option_SOURCES = \
-	src/libsystemd-network/dhcp-protocol.h \
-	src/libsystemd-network/dhcp-internal.h \
-	src/libsystemd-network/test-dhcp-option.c
-
-test_dhcp_option_LDADD = \
-	libsystemd-network.la \
-	libshared.la
-
-test_dhcp_client_SOURCES = \
-	src/systemd/sd-dhcp-client.h \
-	src/libsystemd-network/dhcp-protocol.h \
-	src/libsystemd-network/dhcp-internal.h \
-	src/libsystemd-network/test-dhcp-client.c
-
-test_dhcp_client_LDADD = \
-	libsystemd-network.la \
-	libshared.la
-
-test_dhcp_server_SOURCES = \
-	src/libsystemd-network/test-dhcp-server.c
-
-test_dhcp_server_LDADD = \
-	libsystemd-network.la \
-	libshared.la
-
-test_ipv4ll_SOURCES = \
-	src/systemd/sd-ipv4ll.h \
-	src/libsystemd-network/arp-util.h \
-	src/libsystemd-network/test-ipv4ll.c
-
-test_ipv4ll_LDADD = \
-	libsystemd-network.la \
-	libshared.la
-
-test_ipv4ll_manual_SOURCES = \
-	src/systemd/sd-ipv4ll.h \
-	src/libsystemd-network/test-ipv4ll-manual.c
-
-test_ipv4ll_manual_LDADD = \
-	libsystemd-network.la \
-	libshared.la
-
-test_acd_SOURCES = \
-	src/systemd/sd-ipv4acd.h \
-	src/libsystemd-network/test-acd.c
-
-test_acd_LDADD = \
-	libsystemd-network.la \
-	libshared.la
-
-test_ndisc_rs_SOURCES = \
-	src/systemd/sd-dhcp6-client.h \
-	src/systemd/sd-ndisc.h \
-	src/libsystemd-network/icmp6-util.h \
-	src/libsystemd-network/test-ndisc-rs.c \
-	src/libsystemd-network/dhcp-identifier.h \
-	src/libsystemd-network/dhcp-identifier.c
-
-test_ndisc_rs_LDADD = \
-	libsystemd-network.la \
-	libudev.la \
-	libshared.la
-
-test_dhcp6_client_SOURCES = \
-	src/systemd/sd-dhcp6-client.h \
-	src/libsystemd-network/dhcp6-internal.h \
-	src/libsystemd-network/test-dhcp6-client.c \
-	src/libsystemd-network/dhcp-identifier.h \
-	src/libsystemd-network/dhcp-identifier.c
-
-test_dhcp6_client_LDADD = \
-	libsystemd-network.la \
-	libudev.la \
-	libshared.la
-
-test_lldp_SOURCES = \
-	src/libsystemd-network/test-lldp.c
-
-test_lldp_LDADD = \
-	libsystemd-network.la \
-	libshared.la
-
-tests += \
-	test-dhcp-option \
-	test-dhcp-client \
-	test-dhcp-server \
-	test-ipv4ll \
-	test-ndisc-rs \
-	test-dhcp6-client \
-	test-lldp
-
-include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/libsystemd/Makefile b/src/libsystemd/Makefile
deleted file mode 100644
index 2c6505918b..0000000000
--- a/src/libsystemd/Makefile
+++ /dev/null
@@ -1,110 +0,0 @@
-#  -*- 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
-
-LIBSYSTEMD_CURRENT=15
-LIBSYSTEMD_REVISION=0
-LIBSYSTEMD_AGE=15
-
-EXTRA_DIST += \
-	src/libsystemd/libsystemd.pc.in \
-	src/libsystemd/sd-bus/DIFFERENCES \
-	src/libsystemd/sd-bus/GVARIANT-SERIALIZATION
-
-libsystemd_la_SOURCES = \
-	$(libsystemd_internal_la_SOURCES) \
-	$(libsystemd_journal_internal_la_SOURCES)
-
-nodist_libsystemd_la_SOURCES = \
-	$(nodist_libsystemd_internal_la_SOURCES)
-
-libsystemd_la_CFLAGS = \
-	$(libsystemd_internal_la_CFLAGS) \
-	$(libsystemd_journal_internal_la_CFLAGS)
-
-libsystemd_la_LDFLAGS = \
-	$(AM_LDFLAGS) \
-	-version-info $(LIBSYSTEMD_CURRENT):$(LIBSYSTEMD_REVISION):$(LIBSYSTEMD_AGE) \
-	-Wl,--version-script=$(srcdir)/libsystemd.sym
-
-libsystemd_la_LIBADD = \
-	$(libsystemd_internal_la_LIBADD) \
-	$(libsystemd_journal_internal_la_LIBADD)
-
-pkgconfiglib_DATA += \
-	src/libsystemd/libsystemd.pc
-
-pkginclude_HEADERS += \
-	src/systemd/sd-bus.h \
-	src/systemd/sd-bus-protocol.h \
-	src/systemd/sd-bus-vtable.h \
-	src/systemd/sd-event.h \
-	src/systemd/sd-login.h \
-	src/systemd/sd-id128.h \
-	src/systemd/sd-daemon.h
-
-lib_LTLIBRARIES += \
-	libsystemd.la
-
-# ------------------------------------------------------------------------------
-
-tests += \
-	test-bus-marshal \
-	test-bus-signature \
-	test-bus-benchmark \
-	test-bus-chat \
-	test-bus-cleanup \
-	test-bus-server \
-	test-bus-match \
-	test-bus-kernel \
-	test-bus-kernel-bloom \
-	test-bus-zero-copy \
-	test-bus-introspect \
-	test-bus-objects \
-	test-bus-error \
-	test-bus-creds \
-	test-bus-gvariant \
-	test-event \
-	test-netlink \
-	test-local-addresses \
-	test-resolve
-
-test-libsystemd-sym.c: \
-		$(top_builddir)/src/libsystemd/libsystemd.sym \
-		src/systemd/sd-journal.h \
-		src/systemd/sd-daemon.h \
-		src/systemd/sd-login.h \
-		src/systemd/sd-bus.h \
-		src/systemd/sd-utf8.h \
-		src/systemd/sd-resolve.h \
-		src/systemd/sd-path.h \
-		src/systemd/sd-event.h
-	$(generate-sym-test)
-
-nodist_test_libsystemd_sym_SOURCES = \
-	test-libsystemd-sym.c
-test_libsystemd_sym_LDADD = \
-	libsystemd.la
-
-include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/libsystemd/src/Makefile b/src/libsystemd/src/Makefile
deleted file mode 100644
index dceadf81da..0000000000
--- a/src/libsystemd/src/Makefile
+++ /dev/null
@@ -1,329 +0,0 @@
-#  -*- 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
-
-libsystemd_internal_la_SOURCES = \
-	src/systemd/sd-bus.h \
-	src/systemd/sd-bus-protocol.h \
-	src/systemd/sd-bus-vtable.h \
-	src/systemd/sd-utf8.h \
-	src/systemd/sd-event.h \
-	src/systemd/sd-netlink.h \
-	src/systemd/sd-resolve.h \
-	src/systemd/sd-login.h \
-	src/systemd/sd-id128.h \
-	src/systemd/sd-daemon.h \
-	src/systemd/sd-path.h \
-	src/systemd/sd-network.h \
-	src/systemd/sd-hwdb.h \
-	src/systemd/sd-device.h \
-	src/libsystemd/libsystemd.sym \
-	src/libsystemd/sd-bus/sd-bus.c \
-	src/libsystemd/sd-bus/bus-control.c \
-	src/libsystemd/sd-bus/bus-control.h \
-	src/libsystemd/sd-bus/bus-error.c \
-	src/libsystemd/sd-bus/bus-error.h \
-	src/libsystemd/sd-bus/bus-common-errors.h \
-	src/libsystemd/sd-bus/bus-common-errors.c \
-	src/libsystemd/sd-bus/bus-internal.c \
-	src/libsystemd/sd-bus/bus-internal.h \
-	src/libsystemd/sd-bus/bus-socket.c \
-	src/libsystemd/sd-bus/bus-socket.h \
-	src/libsystemd/sd-bus/bus-kernel.c \
-	src/libsystemd/sd-bus/bus-kernel.h \
-	src/libsystemd/sd-bus/bus-container.c \
-	src/libsystemd/sd-bus/bus-container.h \
-	src/libsystemd/sd-bus/bus-message.c \
-	src/libsystemd/sd-bus/bus-message.h \
-	src/libsystemd/sd-bus/bus-creds.c \
-	src/libsystemd/sd-bus/bus-creds.h \
-	src/libsystemd/sd-bus/bus-signature.c \
-	src/libsystemd/sd-bus/bus-signature.h \
-	src/libsystemd/sd-bus/bus-type.c \
-	src/libsystemd/sd-bus/bus-type.h \
-	src/libsystemd/sd-bus/bus-match.c \
-	src/libsystemd/sd-bus/bus-match.h \
-	src/libsystemd/sd-bus/bus-bloom.c \
-	src/libsystemd/sd-bus/bus-bloom.h \
-	src/libsystemd/sd-bus/bus-introspect.c \
-	src/libsystemd/sd-bus/bus-introspect.h \
-	src/libsystemd/sd-bus/bus-objects.c \
-	src/libsystemd/sd-bus/bus-objects.h \
-	src/libsystemd/sd-bus/bus-gvariant.c \
-	src/libsystemd/sd-bus/bus-gvariant.h \
-	src/libsystemd/sd-bus/bus-convenience.c \
-	src/libsystemd/sd-bus/bus-track.c \
-	src/libsystemd/sd-bus/bus-track.h \
-	src/libsystemd/sd-bus/bus-slot.c \
-	src/libsystemd/sd-bus/bus-slot.h \
-	src/libsystemd/sd-bus/bus-protocol.h \
-	src/libsystemd/sd-bus/kdbus.h \
-	src/libsystemd/sd-bus/bus-dump.c \
-	src/libsystemd/sd-bus/bus-dump.h \
-	src/libsystemd/sd-utf8/sd-utf8.c \
-	src/libsystemd/sd-event/sd-event.c \
-	src/libsystemd/sd-netlink/sd-netlink.c \
-	src/libsystemd/sd-netlink/netlink-internal.h \
-	src/libsystemd/sd-netlink/netlink-message.c \
-	src/libsystemd/sd-netlink/netlink-socket.c \
-	src/libsystemd/sd-netlink/rtnl-message.c \
-	src/libsystemd/sd-netlink/netlink-types.h \
-	src/libsystemd/sd-netlink/netlink-types.c \
-	src/libsystemd/sd-netlink/netlink-util.h \
-	src/libsystemd/sd-netlink/netlink-util.c \
-	src/libsystemd/sd-netlink/local-addresses.h \
-	src/libsystemd/sd-netlink/local-addresses.c \
-	src/libsystemd/sd-id128/sd-id128.c \
-	src/libsystemd/sd-daemon/sd-daemon.c \
-	src/libsystemd/sd-login/sd-login.c \
-	src/libsystemd/sd-path/sd-path.c \
-	src/libsystemd/sd-network/sd-network.c \
-	src/libsystemd/sd-network/network-util.h \
-	src/libsystemd/sd-network/network-util.c \
-	src/libsystemd/sd-hwdb/sd-hwdb.c \
-	src/libsystemd/sd-hwdb/hwdb-util.h \
-	src/libsystemd/sd-hwdb/hwdb-internal.h \
-	src/libsystemd/sd-device/device-internal.h \
-	src/libsystemd/sd-device/device-util.h \
-	src/libsystemd/sd-device/device-enumerator.c \
-	src/libsystemd/sd-device/device-enumerator-private.h \
-	src/libsystemd/sd-device/sd-device.c \
-	src/libsystemd/sd-device/device-private.c \
-	src/libsystemd/sd-device/device-private.h \
-	src/libsystemd/sd-resolve/sd-resolve.c
-
-libsystemd_internal_la_LIBADD = \
-	libbasic.la \
-	-lresolv
-
-noinst_LTLIBRARIES += \
-	libsystemd-internal.la
-
-test_bus_marshal_SOURCES = \
-	src/libsystemd/sd-bus/test-bus-marshal.c
-
-test_bus_marshal_LDADD = \
-	libshared.la \
-	$(GLIB_LIBS) \
-	$(DBUS_LIBS)
-
-test_bus_marshal_CFLAGS = \
-	$(AM_CFLAGS) \
-	$(GLIB_CFLAGS) \
-	$(DBUS_CFLAGS)
-
-test_bus_signature_SOURCES = \
-	src/libsystemd/sd-bus/test-bus-signature.c
-
-test_bus_signature_LDADD = \
-	libshared.la
-
-test_bus_chat_SOURCES = \
-	src/libsystemd/sd-bus/test-bus-chat.c
-
-test_bus_chat_LDADD = \
-	libshared.la
-
-test_bus_cleanup_SOURCES = \
-	src/libsystemd/sd-bus/test-bus-cleanup.c
-
-test_bus_cleanup_CFLAGS = \
-	$(AM_CFLAGS) \
-	$(SECCOMP_CFLAGS)
-
-test_bus_cleanup_LDADD = \
-	libshared.la
-
-test_bus_server_SOURCES = \
-	src/libsystemd/sd-bus/test-bus-server.c
-
-test_bus_server_LDADD = \
-	libshared.la
-
-test_bus_objects_SOURCES = \
-	src/libsystemd/sd-bus/test-bus-objects.c
-
-test_bus_objects_LDADD = \
-	libshared.la
-
-test_bus_error_SOURCES = \
-	src/libsystemd/sd-bus/test-bus-error.c
-
-test_bus_error_LDADD = \
-	libshared.la
-
-test_bus_gvariant_SOURCES = \
-	src/libsystemd/sd-bus/test-bus-gvariant.c
-
-test_bus_gvariant_LDADD = \
-	libshared.la \
-	$(GLIB_LIBS)
-
-test_bus_gvariant_CFLAGS = \
-	$(AM_CFLAGS) \
-	$(GLIB_CFLAGS)
-
-test_bus_creds_SOURCES = \
-	src/libsystemd/sd-bus/test-bus-creds.c
-
-test_bus_creds_LDADD = \
-	libshared.la
-
-test_bus_match_SOURCES = \
-	src/libsystemd/sd-bus/test-bus-match.c
-
-test_bus_match_LDADD = \
-	libshared.la
-
-test_bus_kernel_SOURCES = \
-	src/libsystemd/sd-bus/test-bus-kernel.c
-
-test_bus_kernel_LDADD = \
-	libshared.la
-
-test_bus_kernel_bloom_SOURCES = \
-	src/libsystemd/sd-bus/test-bus-kernel-bloom.c
-
-test_bus_kernel_bloom_LDADD = \
-	libshared.la
-
-test_bus_benchmark_SOURCES = \
-	src/libsystemd/sd-bus/test-bus-benchmark.c
-
-test_bus_benchmark_LDADD = \
-	libshared.la
-
-test_bus_zero_copy_SOURCES = \
-	src/libsystemd/sd-bus/test-bus-zero-copy.c
-
-test_bus_zero_copy_LDADD = \
-	libshared.la
-
-test_bus_introspect_SOURCES = \
-	src/libsystemd/sd-bus/test-bus-introspect.c
-
-test_bus_introspect_LDADD = \
-	libshared.la
-
-test_event_SOURCES = \
-	src/libsystemd/sd-event/test-event.c
-
-test_event_LDADD = \
-	libshared.la
-
-test_netlink_SOURCES = \
-	src/libsystemd/sd-netlink/test-netlink.c
-
-test_netlink_LDADD = \
-	libshared.la
-
-test_local_addresses_SOURCES = \
-	src/libsystemd/sd-netlink/test-local-addresses.c
-
-test_local_addresses_LDADD = \
-	libshared.la
-
-test_resolve_SOURCES = \
-	src/libsystemd/sd-resolve/test-resolve.c
-
-test_resolve_LDADD = \
-	libshared.la
-
-pkginclude_HEADERS += \
-	src/systemd/sd-journal.h \
-	src/systemd/sd-messages.h \
-	src/systemd/_sd-common.h
-
-libsystemd_journal_internal_la_SOURCES = \
-	src/journal/sd-journal.c \
-	src/systemd/sd-journal.h \
-	src/systemd/_sd-common.h \
-	src/journal/journal-file.c \
-	src/journal/journal-file.h \
-	src/journal/journal-vacuum.c \
-	src/journal/journal-vacuum.h \
-	src/journal/journal-verify.c \
-	src/journal/journal-verify.h \
-	src/journal/lookup3.c \
-	src/journal/lookup3.h \
-	src/journal/journal-send.c \
-	src/journal/journal-def.h \
-	src/journal/compress.h \
-	src/journal/catalog.c \
-	src/journal/catalog.h \
-	src/journal/mmap-cache.c \
-	src/journal/mmap-cache.h \
-	src/journal/compress.c \
-	src/journal/audit-type.h \
-	src/journal/audit-type.c \
-	src/shared/gcrypt-util.h \
-	src/shared/gcrypt-util.c
-
-nodist_libsystemd_journal_internal_la_SOURCES = \
-	src/journal/audit_type-to-name.h
-
-gperf_txt_sources += \
-	src/journal/audit_type-list.txt
-
-# using _CFLAGS = in the conditional below would suppress AM_CFLAGS
-libsystemd_journal_internal_la_CFLAGS = \
-	$(AM_CFLAGS)
-
-libsystemd_journal_internal_la_LIBADD =
-
-ifneq ($(HAVE_XZ),)
-libsystemd_journal_internal_la_CFLAGS += \
-	$(XZ_CFLAGS)
-
-libsystemd_journal_internal_la_LIBADD += \
-	$(XZ_LIBS)
-endif # HAVE_XZ
-
-ifneq ($(HAVE_LZ4),)
-libsystemd_journal_internal_la_CFLAGS += \
-	$(LZ4_CFLAGS)
-
-libsystemd_journal_internal_la_LIBADD += \
-	$(LZ4_LIBS)
-endif # HAVE_LZ4
-
-ifneq ($(HAVE_GCRYPT),)
-libsystemd_journal_internal_la_SOURCES += \
-	src/journal/journal-authenticate.c \
-	src/journal/journal-authenticate.h \
-	src/journal/fsprg.c \
-	src/journal/fsprg.h
-
-libsystemd_journal_internal_la_LIBADD += \
-	$(GCRYPT_LIBS)
-
-# fsprg.c is a drop-in file using void pointer arithmetic
-libsystemd_journal_internal_la_CFLAGS += \
-	$(GCRYPT_CFLAGS) \
-	-Wno-pointer-arith
-endif # HAVE_GCRYPT
-
-noinst_LTLIBRARIES += \
-	libsystemd-journal-internal.la
-include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/libsystemd/src/sd-journal/Makefile b/src/libsystemd/src/sd-journal/Makefile
deleted file mode 100644
index 4a237512be..0000000000
--- a/src/libsystemd/src/sd-journal/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-#  -*- 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
-
-audit_list_includes = -include linux/audit.h -include missing.h
-ifneq ($(HAVE_AUDIT),)
-audit_list_includes += -include libaudit.h
-endif # HAVE_AUDIT
-
-$(outdir)/audit_type-list.txt:
-	$(AM_V_GEN)$(CPP) $(ALL_CPPFLAGS) -dM $(audit_list_includes) - </dev/null | grep -vE 'AUDIT_.*(FIRST|LAST)_' | $(SED) -r -n 's/^#define\s+AUDIT_(\w+)\s+([0-9]{4})\s*$$/\1\t\2/p' | sort -k2 >$@
-
-$(outdir)/audit_type-to-name.h: $(outdir)/audit_type-list.txt
-	$(AM_V_GEN)$(AWK) 'BEGIN{ print "const char *audit_type_to_string(int type) {\n\tswitch(type) {" } {printf "        case AUDIT_%s: return \"%s\";\n", $$1, $$1 } END{ print "        default: return NULL;\n\t}\n}\n" }' <$< >$@
-
-include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/libsystemd/src/subdir.mk b/src/libsystemd/src/subdir.mk
deleted file mode 100644
index 35def00fdc..0000000000
--- a/src/libsystemd/src/subdir.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-#  -*- 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.CPPFLAGS += -DLIBDIR=\"$(libdir)\"
-systemd.CPPFLAGS += -DUDEVLIBEXECDIR=\"$(udevlibexecdir)\"
-
-include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-udev/libudev-core/udev-builtin-blkid.c b/src/libudev-core/udev-builtin-blkid.c
index 62cd93264b..62cd93264b 100644
--- a/src/grp-udev/libudev-core/udev-builtin-blkid.c
+++ b/src/libudev-core/udev-builtin-blkid.c
diff --git a/src/grp-udev/libudev-core/udev-builtin-btrfs.c b/src/libudev-core/udev-builtin-btrfs.c
index cfaa463804..cfaa463804 100644
--- a/src/grp-udev/libudev-core/udev-builtin-btrfs.c
+++ b/src/libudev-core/udev-builtin-btrfs.c
diff --git a/src/grp-udev/libudev-core/udev-builtin-hwdb.c b/src/libudev-core/udev-builtin-hwdb.c
index b96f39ba20..b96f39ba20 100644
--- a/src/grp-udev/libudev-core/udev-builtin-hwdb.c
+++ b/src/libudev-core/udev-builtin-hwdb.c
diff --git a/src/grp-udev/libudev-core/udev-builtin-input_id.c b/src/libudev-core/udev-builtin-input_id.c
index 51a55cdbc4..51a55cdbc4 100644
--- a/src/grp-udev/libudev-core/udev-builtin-input_id.c
+++ b/src/libudev-core/udev-builtin-input_id.c
diff --git a/src/grp-udev/libudev-core/udev-builtin-keyboard.c b/src/libudev-core/udev-builtin-keyboard.c
index aa10beafb0..aa10beafb0 100644
--- a/src/grp-udev/libudev-core/udev-builtin-keyboard.c
+++ b/src/libudev-core/udev-builtin-keyboard.c
diff --git a/src/grp-udev/libudev-core/udev-builtin-kmod.c b/src/libudev-core/udev-builtin-kmod.c
index 9665f678fd..9665f678fd 100644
--- a/src/grp-udev/libudev-core/udev-builtin-kmod.c
+++ b/src/libudev-core/udev-builtin-kmod.c
diff --git a/src/grp-udev/libudev-core/udev-builtin-net_id.c b/src/libudev-core/udev-builtin-net_id.c
index a7be2a4eed..a7be2a4eed 100644
--- a/src/grp-udev/libudev-core/udev-builtin-net_id.c
+++ b/src/libudev-core/udev-builtin-net_id.c
diff --git a/src/grp-udev/libudev-core/udev-builtin-net_setup_link.c b/src/libudev-core/udev-builtin-net_setup_link.c
index 8e47775135..8e47775135 100644
--- a/src/grp-udev/libudev-core/udev-builtin-net_setup_link.c
+++ b/src/libudev-core/udev-builtin-net_setup_link.c
diff --git a/src/grp-udev/libudev-core/udev-builtin-path_id.c b/src/libudev-core/udev-builtin-path_id.c
index 6e9adc6e96..6e9adc6e96 100644
--- a/src/grp-udev/libudev-core/udev-builtin-path_id.c
+++ b/src/libudev-core/udev-builtin-path_id.c
diff --git a/src/grp-udev/libudev-core/udev-builtin-uaccess.c b/src/libudev-core/udev-builtin-uaccess.c
index 2c27116ae9..2c27116ae9 100644
--- a/src/grp-udev/libudev-core/udev-builtin-uaccess.c
+++ b/src/libudev-core/udev-builtin-uaccess.c
diff --git a/src/grp-udev/libudev-core/udev-builtin-usb_id.c b/src/libudev-core/udev-builtin-usb_id.c
index 587649eff0..587649eff0 100644
--- a/src/grp-udev/libudev-core/udev-builtin-usb_id.c
+++ b/src/libudev-core/udev-builtin-usb_id.c
diff --git a/src/grp-udev/libudev-core/udev-builtin.c b/src/libudev-core/udev-builtin.c
index e6b36f124f..e6b36f124f 100644
--- a/src/grp-udev/libudev-core/udev-builtin.c
+++ b/src/libudev-core/udev-builtin.c
diff --git a/src/grp-udev/libudev-core/udev-ctrl.c b/src/libudev-core/udev-ctrl.c
index f68a09d7a8..f68a09d7a8 100644
--- a/src/grp-udev/libudev-core/udev-ctrl.c
+++ b/src/libudev-core/udev-ctrl.c
diff --git a/src/grp-udev/libudev-core/udev-event.c b/src/libudev-core/udev-event.c
index 8d601c9c2c..8d601c9c2c 100644
--- a/src/grp-udev/libudev-core/udev-event.c
+++ b/src/libudev-core/udev-event.c
diff --git a/src/grp-udev/libudev-core/udev-node.c b/src/libudev-core/udev-node.c
index 5d2997fd8f..5d2997fd8f 100644
--- a/src/grp-udev/libudev-core/udev-node.c
+++ b/src/libudev-core/udev-node.c
diff --git a/src/grp-udev/libudev-core/udev-rules.c b/src/libudev-core/udev-rules.c
index 26fa52cf6c..26fa52cf6c 100644
--- a/src/grp-udev/libudev-core/udev-rules.c
+++ b/src/libudev-core/udev-rules.c
diff --git a/src/grp-udev/libudev-core/udev-watch.c b/src/libudev-core/udev-watch.c
index 9ce5e975de..9ce5e975de 100644
--- a/src/grp-udev/libudev-core/udev-watch.c
+++ b/src/libudev-core/udev-watch.c
diff --git a/src/libudev/src/.gitignore b/src/libudev/.gitignore
index 0c8a5d5231..0c8a5d5231 100644
--- a/src/libudev/src/.gitignore
+++ b/src/libudev/.gitignore
diff --git a/src/libudev/Makefile b/src/libudev/Makefile
deleted file mode 100644
index 8d9fecb1fb..0000000000
--- a/src/libudev/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-#  -*- 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 += src
-
-include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/libudev/src/libudev-device-internal.h b/src/libudev/libudev-device-internal.h
index f76da09407..f76da09407 100644
--- a/src/libudev/src/libudev-device-internal.h
+++ b/src/libudev/libudev-device-internal.h
diff --git a/src/libudev/src/libudev-device-private.c b/src/libudev/libudev-device-private.c
index 2aae0726c1..2aae0726c1 100644
--- a/src/libudev/src/libudev-device-private.c
+++ b/src/libudev/libudev-device-private.c
diff --git a/src/libudev/src/libudev-device.c b/src/libudev/libudev-device.c
index 6536f4cfbb..6536f4cfbb 100644
--- a/src/libudev/src/libudev-device.c
+++ b/src/libudev/libudev-device.c
diff --git a/src/libudev/src/libudev-enumerate.c b/src/libudev/libudev-enumerate.c
index 9910cea957..9910cea957 100644
--- a/src/libudev/src/libudev-enumerate.c
+++ b/src/libudev/libudev-enumerate.c
diff --git a/src/libudev/src/libudev-hwdb.c b/src/libudev/libudev-hwdb.c
index 8c4b488086..8c4b488086 100644
--- a/src/libudev/src/libudev-hwdb.c
+++ b/src/libudev/libudev-hwdb.c
diff --git a/src/libudev/src/libudev-list.c b/src/libudev/libudev-list.c
index da496ed456..da496ed456 100644
--- a/src/libudev/src/libudev-list.c
+++ b/src/libudev/libudev-list.c
diff --git a/src/libudev/src/libudev-monitor.c b/src/libudev/libudev-monitor.c
index f870eba9eb..f870eba9eb 100644
--- a/src/libudev/src/libudev-monitor.c
+++ b/src/libudev/libudev-monitor.c
diff --git a/src/libudev/src/libudev-private.h b/src/libudev/libudev-private.h
index 52c5075110..52c5075110 100644
--- a/src/libudev/src/libudev-private.h
+++ b/src/libudev/libudev-private.h
diff --git a/src/libudev/src/libudev-queue.c b/src/libudev/libudev-queue.c
index e3dffa6925..e3dffa6925 100644
--- a/src/libudev/src/libudev-queue.c
+++ b/src/libudev/libudev-queue.c
diff --git a/src/libudev/src/libudev-util.c b/src/libudev/libudev-util.c
index 574cfeac85..574cfeac85 100644
--- a/src/libudev/src/libudev-util.c
+++ b/src/libudev/libudev-util.c
diff --git a/src/libudev/src/libudev.c b/src/libudev/libudev.c
index 63fb05547d..63fb05547d 100644
--- a/src/libudev/src/libudev.c
+++ b/src/libudev/libudev.c
diff --git a/src/libudev/include/libudev.h b/src/libudev/libudev.h
index 3f6d0ed16c..3f6d0ed16c 100644
--- a/src/libudev/include/libudev.h
+++ b/src/libudev/libudev.h
diff --git a/src/libudev/src/libudev.pc.in b/src/libudev/libudev.pc.in
index a0f3f524e0..a0f3f524e0 100644
--- a/src/libudev/src/libudev.pc.in
+++ b/src/libudev/libudev.pc.in
diff --git a/src/libudev/src/libudev.sym b/src/libudev/libudev.sym
index 76726fca77..76726fca77 100644
--- a/src/libudev/src/libudev.sym
+++ b/src/libudev/libudev.sym
diff --git a/man/libudev.xml b/src/libudev/libudev.xml
index 7ef978463c..7ef978463c 100644
--- a/man/libudev.xml
+++ b/src/libudev/libudev.xml
diff --git a/src/libudev/src/Makefile b/src/libudev/src/Makefile
deleted file mode 100644
index ed606315e1..0000000000
--- a/src/libudev/src/Makefile
+++ /dev/null
@@ -1,83 +0,0 @@
-#  -*- 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
-
-LIBUDEV_CURRENT=7
-LIBUDEV_REVISION=4
-LIBUDEV_AGE=6
-
-include_HEADERS += \
-	src/libudev/libudev.h
-
-lib_LTLIBRARIES += \
-	libudev.la
-
-libudev_la_SOURCES =\
-	src/libudev/libudev.sym \
-	src/libudev/libudev-private.h \
-	src/libudev/libudev-device-internal.h \
-	src/libudev/libudev.c \
-	src/libudev/libudev-list.c \
-	src/libudev/libudev-util.c \
-	src/libudev/libudev-device.c \
-	src/libudev/libudev-device-private.c \
-	src/libudev/libudev-enumerate.c \
-	src/libudev/libudev-monitor.c \
-	src/libudev/libudev-queue.c \
-	src/libudev/libudev-hwdb.c
-
-libudev_la_LDFLAGS = \
-	$(AM_LDFLAGS) \
-	-version-info $(LIBUDEV_CURRENT):$(LIBUDEV_REVISION):$(LIBUDEV_AGE) \
-	-Wl,--version-script=$(srcdir)/libudev.sym
-
-libudev_la_LIBADD = \
-	libsystemd-internal.la
-
-pkgconfiglib_DATA += \
-	src/libudev/libudev.pc
-
-EXTRA_DIST += \
-	src/libudev/libudev.pc.in
-
-noinst_LTLIBRARIES += \
-	libudev-internal.la
-
-libudev_internal_la_SOURCES =\
-	$(libudev_la_SOURCES)
-
-test-libudev-sym.c: \
-		src/libudev/libudev.sym \
-		src/udev/udev.h
-	$(generate-sym-test)
-
-nodist_test_libudev_sym_SOURCES = \
-	test-libudev-sym.c
-test_libudev_sym_CFLAGS = \
-	$(AM_CFLAGS) \
-	-Wno-deprecated-declarations
-test_libudev_sym_LDADD = \
-	libudev.la
-
-include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/libudev/src/udev.h b/src/libudev/udev.h
index 00de88972a..00de88972a 100644
--- a/src/libudev/src/udev.h
+++ b/src/libudev/udev.h
diff --git a/src/nss-myhostname/Makefile b/src/nss-myhostname/Makefile
deleted file mode 100644
index b5f6ff62aa..0000000000
--- a/src/nss-myhostname/Makefile
+++ /dev/null
@@ -1,47 +0,0 @@
-#  -*- 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
-
-ifneq ($(HAVE_MYHOSTNAME),)
-libnss_myhostname_la_SOURCES = \
-	src/nss-myhostname/nss-myhostname.sym \
-	src/nss-myhostname/nss-myhostname.c
-
-libnss_myhostname_la_LDFLAGS = \
-	$(AM_LDFLAGS) \
-	-module \
-	-export-dynamic \
-	-avoid-version \
-	-shared \
-	-shrext .so.2 \
-	-Wl,--version-script=$(srcdir)/nss-myhostname.sym
-
-libnss_myhostname_la_LIBADD = \
-	libsystemd-internal.la
-
-lib_LTLIBRARIES += \
-	libnss_myhostname.la
-endif # HAVE_MYHOSTNAME
-
-include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/man/nss-myhostname.xml b/src/nss-myhostname/nss-myhostname.xml
index a920ec334f..a920ec334f 100644
--- a/man/nss-myhostname.xml
+++ b/src/nss-myhostname/nss-myhostname.xml
diff --git a/src/systemd-ac-power/Makefile b/src/systemd-ac-power/Makefile
deleted file mode 100644
index aa8912d711..0000000000
--- a/src/systemd-ac-power/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-#  -*- 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
-
-rootlibexec_PROGRAMS += systemd-ac-power
-systemd_ac_power_SOURCES = \
-	src/ac-power/ac-power.c
-
-systemd_ac_power_LDADD = \
-	libshared.la
-
-include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/systemd-activate/Makefile b/src/systemd-activate/Makefile
deleted file mode 100644
index 5e2299f00e..0000000000
--- a/src/systemd-activate/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-#  -*- 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
-
-
-bin_PROGRAMS += \
-	systemd-socket-activate
-
-systemd_socket_activate_SOURCES = \
-	src/activate/activate.c
-
-systemd_socket_activate_LDADD = \
-	libshared.la
-
-include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/systemd-analyze/Makefile b/src/systemd-analyze/Makefile
deleted file mode 100644
index 2e4e7c0bb1..0000000000
--- a/src/systemd-analyze/Makefile
+++ /dev/null
@@ -1,40 +0,0 @@
-#  -*- 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
-
-bin_PROGRAMS += systemd-analyze
-systemd_analyze_SOURCES = \
-	src/analyze/analyze.c \
-	src/analyze/analyze-verify.c \
-	src/analyze/analyze-verify.h
-
-systemd_analyze_CFLAGS = \
-	$(AM_CFLAGS) \
-	$(SECCOMP_CFLAGS) \
-	$(MOUNT_CFLAGS)
-
-systemd_analyze_LDADD = \
-	libcore.la
-
-include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/systemd-ask-password/Makefile b/src/systemd-ask-password/Makefile
deleted file mode 100644
index 4a79cd838a..0000000000
--- a/src/systemd-ask-password/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-#  -*- 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
-
-rootbin_PROGRAMS += systemd-ask-password
-systemd_ask_password_SOURCES = \
-	src/ask-password/ask-password.c
-
-systemd_ask_password_LDADD = \
-	libshared.la
-
-include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/man/systemd-ask-password.xml b/src/systemd-ask-password/systemd-ask-password.xml
index 2b6fb5a82f..2b6fb5a82f 100644
--- a/man/systemd-ask-password.xml
+++ b/src/systemd-ask-password/systemd-ask-password.xml
diff --git a/src/systemd-cgls/Makefile b/src/systemd-cgls/Makefile
deleted file mode 100644
index 40a7811632..0000000000
--- a/src/systemd-cgls/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-#  -*- 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
-
-bin_PROGRAMS += systemd-cgls
-systemd_cgls_SOURCES = \
-	src/cgls/cgls.c
-
-systemd_cgls_LDADD = \
-	libshared.la
-
-include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/man/systemd-cgls.xml b/src/systemd-cgls/systemd-cgls.xml
index e8f0368f48..e8f0368f48 100644
--- a/man/systemd-cgls.xml
+++ b/src/systemd-cgls/systemd-cgls.xml
diff --git a/src/systemd-cgroups-agent/Makefile b/src/systemd-cgroups-agent/Makefile
deleted file mode 100644
index 05ff1f6b49..0000000000
--- a/src/systemd-cgroups-agent/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-#  -*- 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
-
-rootlibexec_PROGRAMS += systemd-cgroups-agent
-systemd_cgroups_agent_SOURCES = \
-	src/cgroups-agent/cgroups-agent.c
-
-systemd_cgroups_agent_LDADD = \
-	libshared.la
-
-include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/systemd-cgtop/Makefile b/src/systemd-cgtop/Makefile
deleted file mode 100644
index 4980eed15b..0000000000
--- a/src/systemd-cgtop/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-#  -*- 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
-
-bin_PROGRAMS += systemd-cgtop
-systemd_cgtop_SOURCES = \
-	src/cgtop/cgtop.c
-
-systemd_cgtop_LDADD = \
-	libshared.la
-
-include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/man/systemd-cgtop.xml b/src/systemd-cgtop/systemd-cgtop.xml
index c76f646984..c76f646984 100644
--- a/man/systemd-cgtop.xml
+++ b/src/systemd-cgtop/systemd-cgtop.xml
diff --git a/src/systemd-cryptsetup/Makefile b/src/systemd-cryptsetup/Makefile
deleted file mode 100644
index 73a46bf6da..0000000000
--- a/src/systemd-cryptsetup/Makefile
+++ /dev/null
@@ -1,59 +0,0 @@
-#  -*- 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
-
-ifneq ($(HAVE_LIBCRYPTSETUP),)
-rootlibexec_PROGRAMS += \
-	systemd-cryptsetup
-
-systemgenerator_PROGRAMS += \
-	systemd-cryptsetup-generator
-
-dist_systemunit_DATA += \
-	units/cryptsetup.target \
-	units/cryptsetup-pre.target
-
-systemd_cryptsetup_SOURCES = \
-	src/cryptsetup/cryptsetup.c
-
-systemd_cryptsetup_CFLAGS = \
-	$(AM_CFLAGS) \
-	$(LIBCRYPTSETUP_CFLAGS)
-
-systemd_cryptsetup_LDADD = \
-	libshared.la \
-	$(LIBCRYPTSETUP_LIBS)
-
-systemd_cryptsetup_generator_SOURCES = \
-	src/cryptsetup/cryptsetup-generator.c
-
-systemd_cryptsetup_generator_LDADD = \
-	libshared.la
-
-SYSINIT_TARGET_WANTS += \
-	cryptsetup.target
-
-endif # HAVE_LIBCRYPTSETUP
-
-include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/systemd-dbus1-generator/Makefile b/src/systemd-dbus1-generator/Makefile
deleted file mode 100644
index 1d7f0d1a81..0000000000
--- a/src/systemd-dbus1-generator/Makefile
+++ /dev/null
@@ -1,49 +0,0 @@
-#  -*- 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
-
-systemgenerator_PROGRAMS +=  \
-	systemd-dbus1-generator
-
-systemd_dbus1_generator_SOURCES = \
-	src/dbus1-generator/dbus1-generator.c
-
-systemd_dbus1_generator_LDADD = \
-	libshared.la
-
-dbus1-generator-install-hook:
-	$(AM_V_at)$(MKDIR_P) $(DESTDIR)$(usergeneratordir)
-	$(AM_V_RM)rm -f $(DESTDIR)$(usergeneratordir)/systemd-dbus1-generator
-	$(AM_V_LN)$(LN_S) --relative -f $(DESTDIR)$(systemgeneratordir)/systemd-dbus1-generator $(DESTDIR)$(usergeneratordir)/systemd-dbus1-generator
-
-dbus1-generator-uninstall-hook:
-	rm -f $(DESTDIR)$(usergeneratordir)/systemd-dbus1-generator
-
-dist_xinitrc_SCRIPTS = \
-	xorg/50-systemd-user.sh
-
-INSTALL_EXEC_HOOKS += dbus1-generator-install-hook
-UNINSTALL_EXEC_HOOKS += dbus1-generator-uninstall-hook
-
-include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/systemd-debug-generator/Makefile b/src/systemd-debug-generator/Makefile
deleted file mode 100644
index bba46c2905..0000000000
--- a/src/systemd-debug-generator/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-#  -*- 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
-
-systemgenerator_PROGRAMS += systemd-debug-generator
-
-systemd_debug_generator_SOURCES = \
-	src/debug-generator/debug-generator.c
-
-systemd_debug_generator_LDADD = \
-	libshared.la
-
-include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/man/systemd-debug-generator.xml b/src/systemd-debug-generator/systemd-debug-generator.xml
index 5c5e9fc4a1..5c5e9fc4a1 100644
--- a/man/systemd-debug-generator.xml
+++ b/src/systemd-debug-generator/systemd-debug-generator.xml
diff --git a/src/systemd-delta/Makefile b/src/systemd-delta/Makefile
deleted file mode 100644
index 62c18cd8d4..0000000000
--- a/src/systemd-delta/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-#  -*- 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
-
-bin_PROGRAMS += systemd-delta
-systemd_delta_SOURCES = \
-	src/delta/delta.c
-
-systemd_delta_LDADD = \
-	libshared.la
-
-include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/systemd-escape/Makefile b/src/systemd-escape/Makefile
deleted file mode 100644
index f094a7e2a0..0000000000
--- a/src/systemd-escape/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-#  -*- 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
-
-rootbin_PROGRAMS += systemd-escape
-
-systemd_escape_SOURCES = \
-	src/escape/escape.c
-
-systemd_escape_LDADD = \
-	libshared.la
-
-include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/systemd-firstboot/Makefile b/src/systemd-firstboot/Makefile
deleted file mode 100644
index 09d9ebb1d7..0000000000
--- a/src/systemd-firstboot/Makefile
+++ /dev/null
@@ -1,47 +0,0 @@
-#  -*- 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
-
-ifneq ($(ENABLE_FIRSTBOOT),)
-systemd_firstboot_SOURCES = \
-	src/firstboot/firstboot.c
-
-systemd_firstboot_LDADD = \
-	libshared.la \
-	-lcrypt
-
-rootbin_PROGRAMS += \
-	systemd-firstboot
-
-nodist_systemunit_DATA += \
-	units/systemd-firstboot.service
-
-SYSINIT_TARGET_WANTS += \
-	systemd-firstboot.service
-endif # ENABLE_FIRSTBOOT
-
-EXTRA_DIST += \
-	units/systemd-firstboot.service.in
-
-include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/systemd-fsck/Makefile b/src/systemd-fsck/Makefile
deleted file mode 100644
index cc4e21055c..0000000000
--- a/src/systemd-fsck/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-#  -*- 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
-
-rootlibexec_PROGRAMS += systemd-fsck
-systemd_fsck_SOURCES = \
-	src/fsck/fsck.c
-
-systemd_fsck_LDADD = \
-	libshared.la
-
-include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/systemd-fstab-generator/Makefile b/src/systemd-fstab-generator/Makefile
deleted file mode 100644
index 0bfc70e464..0000000000
--- a/src/systemd-fstab-generator/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-#  -*- 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
-
-systemgenerator_PROGRAMS += systemd-fstab-generator
-systemd_fstab_generator_SOURCES = \
-	src/fstab-generator/fstab-generator.c \
-	src/core/mount-setup.c
-
-systemd_fstab_generator_LDADD = \
-	libshared.la
-
-include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/systemd-getty-generator/Makefile b/src/systemd-getty-generator/Makefile
deleted file mode 100644
index 14f7d02a86..0000000000
--- a/src/systemd-getty-generator/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-#  -*- 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
-
-systemgenerator_PROGRAMS += systemd-getty-generator
-systemd_getty_generator_SOURCES = \
-	src/getty-generator/getty-generator.c
-
-systemd_getty_generator_LDADD = \
-	libshared.la
-
-include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/man/systemd-getty-generator.xml b/src/systemd-getty-generator/systemd-getty-generator.xml
index 338925964d..338925964d 100644
--- a/man/systemd-getty-generator.xml
+++ b/src/systemd-getty-generator/systemd-getty-generator.xml
diff --git a/src/systemd-gpt-auto-generator/Makefile b/src/systemd-gpt-auto-generator/Makefile
deleted file mode 100644
index 177db8da7c..0000000000
--- a/src/systemd-gpt-auto-generator/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-#  -*- 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
-
-ifneq ($(HAVE_BLKID),)
-systemgenerator_PROGRAMS +=  \
-	systemd-gpt-auto-generator
-
-systemd_gpt_auto_generator_SOURCES = \
-	src/gpt-auto-generator/gpt-auto-generator.c \
-	src/basic/blkid-util.h
-
-systemd_gpt_auto_generator_LDADD = \
-	libshared.la \
-	$(BLKID_LIBS)
-
-systemd_gpt_auto_generator_CFLAGS = \
-	$(AM_CFLAGS) \
-	$(BLKID_CFLAGS)
-endif # HAVE_BLKID
-
-include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/man/systemd-gpt-auto-generator.xml b/src/systemd-gpt-auto-generator/systemd-gpt-auto-generator.xml
index e890c4dce2..e890c4dce2 100644
--- a/man/systemd-gpt-auto-generator.xml
+++ b/src/systemd-gpt-auto-generator/systemd-gpt-auto-generator.xml
diff --git a/src/systemd-hibernate-resume/Makefile b/src/systemd-hibernate-resume/Makefile
deleted file mode 100644
index 386f372f78..0000000000
--- a/src/systemd-hibernate-resume/Makefile
+++ /dev/null
@@ -1,60 +0,0 @@
-#  -*- 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
-
-ifneq ($(ENABLE_HIBERNATE),)
-systemgenerator_PROGRAMS += \
-	systemd-hibernate-resume-generator
-
-rootlibexec_PROGRAMS += \
-	systemd-hibernate-resume
-
-systemd_hibernate_resume_SOURCES = \
-	src/hibernate-resume/hibernate-resume.c
-
-systemd_hibernate_resume_LDADD = \
-	libshared.la
-
-systemd_hibernate_resume_generator_SOURCES = \
-	src/hibernate-resume/hibernate-resume-generator.c
-
-systemd_hibernate_resume_generator_LDADD = \
-	libshared.la
-
-dist_systemunit_DATA += \
-	units/hibernate.target \
-	units/hybrid-sleep.target
-
-nodist_systemunit_DATA += \
-	units/systemd-hibernate.service \
-	units/systemd-hibernate-resume@.service \
-	units/systemd-hybrid-sleep.service
-endif # ENABLE_HIBERNATE
-
-EXTRA_DIST += \
-	units/systemd-hibernate.service.in \
-	units/systemd-hibernate-resume@.service.in \
-	units/systemd-hybrid-sleep.service.in
-
-include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/systemd-hwdb/Makefile b/src/systemd-hwdb/Makefile
deleted file mode 100644
index ce10c46e99..0000000000
--- a/src/systemd-hwdb/Makefile
+++ /dev/null
@@ -1,76 +0,0 @@
-#  -*- 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
-
-ifneq ($(ENABLE_HWDB),)
-INSTALL_DIRS += \
-	$(sysconfdir)/udev/hwdb.d
-
-systemd_hwdb_SOURCES = \
-	src/libsystemd/sd-hwdb/hwdb-internal.h \
-	src/hwdb/hwdb.c
-
-systemd_hwdb_LDADD = \
-	libshared.la
-
-rootbin_PROGRAMS += \
-	systemd-hwdb
-
-dist_udevhwdb_DATA = \
-	hwdb/20-pci-vendor-model.hwdb \
-	hwdb/20-pci-classes.hwdb \
-	hwdb/20-usb-vendor-model.hwdb \
-	hwdb/20-usb-classes.hwdb \
-	hwdb/20-sdio-vendor-model.hwdb \
-	hwdb/20-sdio-classes.hwdb \
-	hwdb/20-bluetooth-vendor-product.hwdb \
-	hwdb/20-acpi-vendor.hwdb \
-	hwdb/20-OUI.hwdb \
-	hwdb/20-net-ifname.hwdb \
-	hwdb/60-evdev.hwdb \
-	hwdb/60-keyboard.hwdb \
-	hwdb/70-mouse.hwdb \
-	hwdb/70-pointingstick.hwdb
-
-SYSINIT_TARGET_WANTS += \
-	systemd-hwdb-update.service
-
-# Update hwdb on installation. Do not bother if installing
-# in DESTDIR, since this is likely for packaging purposes.
-hwdb-update-hook:
-	-test -n "$(DESTDIR)" || $(rootbindir)/systemd-hwdb update
-
-INSTALL_DATA_HOOKS += \
-	hwdb-update-hook
-
-hwdb-remove-hook:
-	-test -n "$(DESTDIR)" || rm -f /etc/udev/hwdb.bin
-endif # ENABLE_HWDB
-
-EXTRA_DIST += \
-	units/systemd-hwdb-update.service.in \
-	hwdb/ids-update.pl \
-	hwdb/sdio.ids
-
-include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/systemd-initctl/Makefile b/src/systemd-initctl/Makefile
deleted file mode 100644
index bd19b4a090..0000000000
--- a/src/systemd-initctl/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-#  -*- 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
-
-rootlibexec_PROGRAMS += systemd-initctl
-systemd_initctl_SOURCES = \
-	src/initctl/initctl.c
-
-systemd_initctl_LDADD = \
-	libshared.la
-
-include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/units/systemd-initctl.service.in b/src/systemd-initctl/systemd-initctl.service.in
index 27e663c8dc..27e663c8dc 100644
--- a/units/systemd-initctl.service.in
+++ b/src/systemd-initctl/systemd-initctl.service.in
diff --git a/units/systemd-initctl.socket b/src/systemd-initctl/systemd-initctl.socket
index f628c2e867..f628c2e867 100644
--- a/units/systemd-initctl.socket
+++ b/src/systemd-initctl/systemd-initctl.socket
diff --git a/src/systemd-machine-id-setup/Makefile b/src/systemd-machine-id-setup/Makefile
deleted file mode 100644
index 8f210b3cdf..0000000000
--- a/src/systemd-machine-id-setup/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-#  -*- 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
-
-rootbin_PROGRAMS += systemd-machine-id-setup
-systemd_machine_id_setup_SOURCES = \
-	src/machine-id-setup/machine-id-setup-main.c \
-	src/core/machine-id-setup.c \
-	src/core/machine-id-setup.h
-
-systemd_machine_id_setup_LDADD = \
-	libshared.la
-
-SYSINIT_TARGET_WANTS += \
-	systemd-machine-id-commit.service
-
-include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/man/systemd-machine-id-setup.xml b/src/systemd-machine-id-setup/systemd-machine-id-setup.xml
index bfcd74f436..bfcd74f436 100644
--- a/man/systemd-machine-id-setup.xml
+++ b/src/systemd-machine-id-setup/systemd-machine-id-setup.xml
diff --git a/src/systemd-modules-load/Makefile b/src/systemd-modules-load/Makefile
deleted file mode 100644
index 1c51b134ad..0000000000
--- a/src/systemd-modules-load/Makefile
+++ /dev/null
@@ -1,60 +0,0 @@
-#  -*- 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
-
-ifneq ($(HAVE_KMOD),)
-systemd_modules_load_SOURCES = \
-	src/modules-load/modules-load.c
-
-systemd_modules_load_CFLAGS = \
-	$(AM_CFLAGS) \
-	$(KMOD_CFLAGS)
-
-systemd_modules_load_LDADD = \
-	libshared.la \
-	$(KMOD_LIBS)
-
-rootlibexec_PROGRAMS += \
-	systemd-modules-load
-
-nodist_systemunit_DATA += \
-	units/systemd-modules-load.service
-
-SYSINIT_TARGET_WANTS += \
-	systemd-modules-load.service
-
-ifneq ($(ENABLE_TMPFILES),)
-nodist_systemunit_DATA += \
-	units/kmod-static-nodes.service
-
-SYSINIT_TARGET_WANTS += \
-	kmod-static-nodes.service
-endif # ENABLE_TMPFILES
-endif # HAVE_KMOD
-
-EXTRA_DIST += \
-	units/systemd-modules-load.service.in \
-	units/kmod-static-nodes.service.in
-
-include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/systemd-notify/Makefile b/src/systemd-notify/Makefile
deleted file mode 100644
index 06a6604e5b..0000000000
--- a/src/systemd-notify/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-#  -*- 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
-
-rootbin_PROGRAMS += systemd-notify
-systemd_notify_SOURCES = \
-	src/notify/notify.c
-
-systemd_notify_LDADD = \
-	libshared.la
-
-include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/systemd-nspawn/Makefile b/src/systemd-nspawn/Makefile
deleted file mode 100644
index d6f928ebd6..0000000000
--- a/src/systemd-nspawn/Makefile
+++ /dev/null
@@ -1,85 +0,0 @@
-#  -*- 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
-
-bin_PROGRAMS += systemd-nspawn
-systemd_nspawn_SOURCES = \
-	src/nspawn/nspawn.c \
-	src/nspawn/nspawn-settings.c \
-	src/nspawn/nspawn-settings.h \
-	src/nspawn/nspawn-mount.c \
-	src/nspawn/nspawn-mount.h \
-	src/nspawn/nspawn-network.c \
-	src/nspawn/nspawn-network.h \
-	src/nspawn/nspawn-expose-ports.c \
-	src/nspawn/nspawn-expose-ports.h \
-	src/nspawn/nspawn-cgroup.c \
-	src/nspawn/nspawn-cgroup.h \
-	src/nspawn/nspawn-register.c \
-	src/nspawn/nspawn-register.h \
-	src/nspawn/nspawn-setuid.c \
-	src/nspawn/nspawn-setuid.h \
-	src/nspawn/nspawn-stub-pid1.c \
-	src/nspawn/nspawn-stub-pid1.h \
-	src/nspawn/nspawn-patch-uid.c \
-	src/nspawn/nspawn-patch-uid.h \
-	src/core/mount-setup.c \
-	src/core/mount-setup.h \
-	src/core/loopback-setup.c \
-	src/core/loopback-setup.h \
-	src/core/machine-id-setup.c \
-	src/core/machine-id-setup.h
-
-nodist_systemd_nspawn_SOURCES = \
-	src/nspawn/nspawn-gperf.c
-
-gperf_gperf_sources += \
-	src/nspawn/nspawn-gperf.gperf
-
-systemd_nspawn_CFLAGS = \
-	$(AM_CFLAGS) \
-	$(BLKID_CFLAGS) \
-	$(SECCOMP_CFLAGS)
-
-systemd_nspawn_LDADD = \
-	libshared.la \
-	$(BLKID_LIBS)
-
-ifneq ($(HAVE_LIBIPTC),)
-systemd_nspawn_LDADD += \
-	libfirewall.la
-endif # HAVE_LIBIPTC
-
-test_patch_uid_SOURCES = \
-	src/nspawn/nspawn-patch-uid.c \
-	src/nspawn/nspawn-patch-uid.h \
-	src/nspawn/test-patch-uid.c
-
-test_patch_uid_LDADD = \
-	libshared.la
-
-manual_tests += \
-	test-patch-uid
-
-include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/man/systemd-nspawn.xml b/src/systemd-nspawn/systemd-nspawn.xml
index 476cc2932f..476cc2932f 100644
--- a/man/systemd-nspawn.xml
+++ b/src/systemd-nspawn/systemd-nspawn.xml
diff --git a/units/systemd-nspawn@.service.in b/src/systemd-nspawn/systemd-nspawn@.service.in
index ea28941507..ea28941507 100644
--- a/units/systemd-nspawn@.service.in
+++ b/src/systemd-nspawn/systemd-nspawn@.service.in
diff --git a/src/systemd-path/Makefile b/src/systemd-path/Makefile
deleted file mode 100644
index eb609cb1b9..0000000000
--- a/src/systemd-path/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-#  -*- 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
-
-bin_PROGRAMS += systemd-path
-
-systemd_path_SOURCES = \
-	src/path/path.c
-
-systemd_path_LDADD = \
-	libshared.la
-
-include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/systemd-rc-local-generator/Makefile b/src/systemd-rc-local-generator/Makefile
deleted file mode 100644
index 2e9b3e7a64..0000000000
--- a/src/systemd-rc-local-generator/Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-#  -*- 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_rc_local_generator_SOURCES = \
-	src/rc-local-generator/rc-local-generator.c
-
-systemd_rc_local_generator_LDADD = \
-	libshared.la
-
-include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/systemd-remount-fs/Makefile b/src/systemd-remount-fs/Makefile
deleted file mode 100644
index 49b10a879a..0000000000
--- a/src/systemd-remount-fs/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-#  -*- 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
-
-rootlibexec_PROGRAMS += systemd-remount-fs
-systemd_remount_fs_SOURCES = \
-	src/remount-fs/remount-fs.c \
-	src/core/mount-setup.c \
-	src/core/mount-setup.h
-
-systemd_remount_fs_LDADD = \
-	libshared.la
-
-include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/units/systemd-remount-fs.service.in b/src/systemd-remount-fs/systemd-remount-fs.service.in
index 8d9daacaa5..8d9daacaa5 100644
--- a/units/systemd-remount-fs.service.in
+++ b/src/systemd-remount-fs/systemd-remount-fs.service.in
diff --git a/src/systemd-reply-password/Makefile b/src/systemd-reply-password/Makefile
deleted file mode 100644
index b5c4698fd8..0000000000
--- a/src/systemd-reply-password/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-#  -*- 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
-
-rootlibexec_PROGRAMS += systemd-reply-password
-systemd_reply_password_SOURCES = \
-	src/reply-password/reply-password.c
-
-systemd_reply_password_LDADD = \
-	libshared.la
-
-include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/systemd-run/Makefile b/src/systemd-run/Makefile
deleted file mode 100644
index a8edcf66c1..0000000000
--- a/src/systemd-run/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-#  -*- 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
-
-bin_PROGRAMS += systemd-run
-systemd_run_SOURCES = \
-	src/run/run.c
-
-systemd_run_LDADD = \
-	libshared.la
-
-include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/systemd-shutdown/Makefile b/src/systemd-shutdown/Makefile
deleted file mode 100644
index 72047133ce..0000000000
--- a/src/systemd-shutdown/Makefile
+++ /dev/null
@@ -1,39 +0,0 @@
-#  -*- 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
-
-rootlibexec_PROGRAMS += systemd-shutdown
-systemd_shutdown_SOURCES = \
-	src/core/umount.c \
-	src/core/umount.h \
-	src/core/shutdown.c \
-	src/core/mount-setup.c \
-	src/core/mount-setup.h \
-	src/core/killall.h \
-	src/core/killall.c
-
-systemd_shutdown_LDADD = \
-	libshared.la
-
-include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/systemd-socket-proxyd/Makefile b/src/systemd-socket-proxyd/Makefile
deleted file mode 100644
index e3d354bd30..0000000000
--- a/src/systemd-socket-proxyd/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-#  -*- 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
-
-rootlibexec_PROGRAMS += systemd-socket-proxyd
-
-systemd_socket_proxyd_SOURCES = \
-	src/socket-proxy/socket-proxyd.c
-
-systemd_socket_proxyd_LDADD = \
-	libshared.la
-
-include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/man/systemd-socket-proxyd.xml b/src/systemd-socket-proxyd/systemd-socket-proxyd.xml
index ae4217b910..ae4217b910 100644
--- a/man/systemd-socket-proxyd.xml
+++ b/src/systemd-socket-proxyd/systemd-socket-proxyd.xml
diff --git a/src/systemd-stdio-bridge/Makefile b/src/systemd-stdio-bridge/Makefile
deleted file mode 100644
index 8aeb20b41a..0000000000
--- a/src/systemd-stdio-bridge/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-#  -*- 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
-
-bin_PROGRAMS += systemd-stdio-bridge
-systemd_stdio_bridge_SOURCES = \
-	src/stdio-bridge/stdio-bridge.c
-
-systemd_stdio_bridge_LDADD = \
-	libshared.la
-
-include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/systemd-sysctl/Makefile b/src/systemd-sysctl/Makefile
deleted file mode 100644
index 39ce08d5e3..0000000000
--- a/src/systemd-sysctl/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-#  -*- 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
-
-rootlibexec_PROGRAMS += systemd-sysctl
-systemd_sysctl_SOURCES = \
-	src/sysctl/sysctl.c
-
-systemd_sysctl_LDADD = \
-	libshared.la
-
-include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/systemd-system-update-generator/Makefile b/src/systemd-system-update-generator/Makefile
deleted file mode 100644
index fd44aef359..0000000000
--- a/src/systemd-system-update-generator/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-#  -*- 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
-
-systemgenerator_PROGRAMS += systemd-system-update-generator
-systemd_system_update_generator_SOURCES = \
-	src/system-update-generator/system-update-generator.c
-
-systemd_system_update_generator_LDADD = \
-	libshared.la
-
-include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/man/systemd-system-update-generator.xml b/src/systemd-system-update-generator/systemd-system-update-generator.xml
index e7fc95c742..e7fc95c742 100644
--- a/man/systemd-system-update-generator.xml
+++ b/src/systemd-system-update-generator/systemd-system-update-generator.xml
diff --git a/src/systemd-sysusers/Makefile b/src/systemd-sysusers/Makefile
deleted file mode 100644
index d18e41b1d5..0000000000
--- a/src/systemd-sysusers/Makefile
+++ /dev/null
@@ -1,61 +0,0 @@
-#  -*- 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
-
-ifneq ($(ENABLE_SYSUSERS),)
-systemd_sysusers_SOURCES = \
-	src/sysusers/sysusers.c
-
-systemd_sysusers_LDADD = \
-	libshared.la
-
-rootbin_PROGRAMS += \
-	systemd-sysusers
-
-nodist_systemunit_DATA += \
-	units/systemd-sysusers.service
-
-SYSINIT_TARGET_WANTS += \
-	systemd-sysusers.service
-
-nodist_sysusers_DATA = \
-	sysusers.d/systemd.conf \
-	sysusers.d/basic.conf
-
-ifneq ($(HAVE_REMOTE),)
-nodist_sysusers_DATA += \
-	sysusers.d/systemd-remote.conf
-endif # HAVE_REMOTE
-
-INSTALL_DIRS += \
-	$(sysusersdir)
-endif # ENABLE_SYSUSERS
-
-EXTRA_DIST += \
-	units/systemd-sysusers.service.in \
-	sysusers.d/systemd.conf.m4 \
-	sysusers.d/systemd-remote.conf.m4 \
-	sysusers.d/basic.conf.in
-
-include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/systemd-sysv-generator/Makefile b/src/systemd-sysv-generator/Makefile
deleted file mode 100644
index f6de146408..0000000000
--- a/src/systemd-sysv-generator/Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-#  -*- 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_sysv_generator_SOURCES = \
-	src/sysv-generator/sysv-generator.c
-
-systemd_sysv_generator_LDADD = \
-	libcore.la
-
-include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/systemd-timesyncd/Makefile b/src/systemd-timesyncd/Makefile
deleted file mode 100644
index c9289846c4..0000000000
--- a/src/systemd-timesyncd/Makefile
+++ /dev/null
@@ -1,64 +0,0 @@
-#  -*- 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
-
-ifneq ($(ENABLE_TIMESYNCD),)
-systemd_timesyncd_SOURCES = \
-	src/timesync/timesyncd.c \
-	src/timesync/timesyncd-manager.c \
-	src/timesync/timesyncd-manager.h \
-	src/timesync/timesyncd-conf.c \
-	src/timesync/timesyncd-conf.h \
-	src/timesync/timesyncd-server.c \
-	src/timesync/timesyncd-server.h
-
-nodist_systemd_timesyncd_SOURCES = \
-	src/timesync/timesyncd-gperf.c
-
-systemd_timesyncd_LDADD = \
-	libsystemd-network.la \
-	libshared.la
-
-rootlibexec_PROGRAMS += \
-	systemd-timesyncd
-
-nodist_systemunit_DATA += \
-	units/systemd-timesyncd.service
-
-GENERAL_ALIASES += \
-	$(systemunitdir)/systemd-timesyncd.service $(pkgsysconfdir)/system/sysinit.target.wants/systemd-timesyncd.service
-
-nodist_pkgsysconf_DATA += \
-	src/timesync/timesyncd.conf
-
-endif # ENABLE_TIMESYNCD
-
-gperf_gperf_sources += \
-	src/timesync/timesyncd-gperf.gperf
-
-EXTRA_DIST += \
-	units/systemd-timesyncd.service.in \
-	src/timesync/timesyncd.conf.in
-
-include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/units/systemd-timesyncd.service.in b/src/systemd-timesyncd/systemd-timesyncd.service.in
index a856dad709..a856dad709 100644
--- a/units/systemd-timesyncd.service.in
+++ b/src/systemd-timesyncd/systemd-timesyncd.service.in
diff --git a/src/systemd-tmpfiles/Makefile b/src/systemd-tmpfiles/Makefile
deleted file mode 100644
index 1e72e31215..0000000000
--- a/src/systemd-tmpfiles/Makefile
+++ /dev/null
@@ -1,84 +0,0 @@
-#  -*- 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
-
-ifneq ($(ENABLE_TMPFILES),)
-systemd_tmpfiles_SOURCES = \
-	src/tmpfiles/tmpfiles.c
-
-systemd_tmpfiles_LDADD = \
-	libshared.la
-
-rootbin_PROGRAMS += \
-	systemd-tmpfiles
-
-dist_systemunit_DATA += \
-	units/systemd-tmpfiles-clean.timer
-
-nodist_systemunit_DATA += \
-	units/systemd-tmpfiles-setup-dev.service \
-	units/systemd-tmpfiles-setup.service \
-	units/systemd-tmpfiles-clean.service
-
-nodist_tmpfiles_DATA = \
-	tmpfiles.d/systemd.conf \
-	tmpfiles.d/etc.conf
-
-dist_tmpfiles_DATA = \
-	tmpfiles.d/systemd-nologin.conf \
-	tmpfiles.d/tmp.conf \
-	tmpfiles.d/x11.conf \
-	tmpfiles.d/var.conf \
-	tmpfiles.d/home.conf \
-	tmpfiles.d/systemd-nspawn.conf \
-	tmpfiles.d/journal-nocow.conf
-
-ifneq ($(HAVE_SYSV_COMPAT),)
-dist_tmpfiles_DATA += \
-	tmpfiles.d/legacy.conf
-endif # HAVE_SYSV_COMPAT
-
-SYSINIT_TARGET_WANTS += \
-	systemd-tmpfiles-setup-dev.service \
-	systemd-tmpfiles-setup.service
-
-dist_zshcompletion_data += \
-	shell-completion/zsh/_systemd-tmpfiles
-
-TIMERS_TARGET_WANTS += \
-	systemd-tmpfiles-clean.timer
-
-INSTALL_DIRS += \
-	$(tmpfilesdir) \
-	$(sysconfdir)/tmpfiles.d
-endif # ENABLE_TMPFILES
-
-EXTRA_DIST += \
-	tmpfiles.d/systemd.conf.m4 \
-	tmpfiles.d/etc.conf.m4 \
-	units/systemd-tmpfiles-setup-dev.service.in \
-	units/systemd-tmpfiles-setup.service.in \
-	units/systemd-tmpfiles-clean.service.in
-
-include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/systemd-tty-ask-password-agent/Makefile b/src/systemd-tty-ask-password-agent/Makefile
deleted file mode 100644
index b5119b5066..0000000000
--- a/src/systemd-tty-ask-password-agent/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-#  -*- 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
-
-rootbin_PROGRAMS += systemd-tty-ask-password-agent
-systemd_tty_ask_password_agent_SOURCES = \
-	src/tty-ask-password-agent/tty-ask-password-agent.c
-
-systemd_tty_ask_password_agent_LDADD = \
-	libshared.la
-
-include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/man/systemd-tty-ask-password-agent.xml b/src/systemd-tty-ask-password-agent/systemd-tty-ask-password-agent.xml
index 2876fab644..2876fab644 100644
--- a/man/systemd-tty-ask-password-agent.xml
+++ b/src/systemd-tty-ask-password-agent/systemd-tty-ask-password-agent.xml
diff --git a/src/systemd-update-done/Makefile b/src/systemd-update-done/Makefile
deleted file mode 100644
index 5045982316..0000000000
--- a/src/systemd-update-done/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-#  -*- 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
-
-rootlibexec_PROGRAMS += systemd-update-done
-
-systemd_update_done_SOURCES = \
-	src/update-done/update-done.c
-
-systemd_update_done_LDADD = \
-	libshared.la
-
-include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/systemd-update-utmp/Makefile b/src/systemd-update-utmp/Makefile
deleted file mode 100644
index 56f8d1f4b5..0000000000
--- a/src/systemd-update-utmp/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-#  -*- 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
-
-ifneq ($(HAVE_UTMP),)
-rootlibexec_PROGRAMS += \
-	systemd-update-utmp
-endif # HAVE_UTMP
-
-systemd_update_utmp_SOURCES = \
-	src/update-utmp/update-utmp.c
-
-systemd_update_utmp_CFLAGS = \
-	$(AM_CFLAGS) \
-	$(AUDIT_CFLAGS)
-
-systemd_update_utmp_LDADD = \
-	libshared.la \
-	$(AUDIT_LIBS)
-
-include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/test/Makefile b/src/test/Makefile
deleted file mode 100644
index f416b4aadf..0000000000
--- a/src/test/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-#  -*- 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
-
-test_id128_SOURCES = \
-	src/test/test-id128.c
-
-test_id128_LDADD = \
-	libshared.la
-
-tests += \
-	test-id128
-
-include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-udev/.gitignore b/src/udev/.gitignore
index f5d8be3dc1..f5d8be3dc1 100644
--- a/src/grp-udev/.gitignore
+++ b/src/udev/.gitignore
diff --git a/src/grp-udev/.vimrc b/src/udev/.vimrc
index 366fbdca4b..366fbdca4b 100644
--- a/src/grp-udev/.vimrc
+++ b/src/udev/.vimrc
diff --git a/src/grp-udev/mtd_probe/mtd_probe.c b/src/udev/mtd_probe/mtd_probe.c
index 462fab7623..462fab7623 100644
--- a/src/grp-udev/mtd_probe/mtd_probe.c
+++ b/src/udev/mtd_probe/mtd_probe.c
diff --git a/src/grp-udev/mtd_probe/mtd_probe.h b/src/udev/mtd_probe/mtd_probe.h
index 68e4954537..68e4954537 100644
--- a/src/grp-udev/mtd_probe/mtd_probe.h
+++ b/src/udev/mtd_probe/mtd_probe.h
diff --git a/src/grp-udev/mtd_probe/probe_smartmedia.c b/src/udev/mtd_probe/probe_smartmedia.c
index 2a7ba17637..2a7ba17637 100644
--- a/src/grp-udev/mtd_probe/probe_smartmedia.c
+++ b/src/udev/mtd_probe/probe_smartmedia.c
diff --git a/src/grp-udev/libudev-core/net/.gitignore b/src/udev/net/.gitignore
index 9ca85bacc9..9ca85bacc9 100644
--- a/src/grp-udev/libudev-core/net/.gitignore
+++ b/src/udev/net/.gitignore
diff --git a/src/grp-udev/libudev-core/net/ethtool-util.c b/src/udev/net/ethtool-util.c
index c00ff79123..c00ff79123 100644
--- a/src/grp-udev/libudev-core/net/ethtool-util.c
+++ b/src/udev/net/ethtool-util.c
diff --git a/src/grp-udev/libudev-core/net/ethtool-util.h b/src/udev/net/ethtool-util.h
index 7716516e76..7716516e76 100644
--- a/src/grp-udev/libudev-core/net/ethtool-util.h
+++ b/src/udev/net/ethtool-util.h
diff --git a/src/grp-udev/libudev-core/net/link-config-gperf.gperf b/src/udev/net/link-config-gperf.gperf
index b25e4b3344..b25e4b3344 100644
--- a/src/grp-udev/libudev-core/net/link-config-gperf.gperf
+++ b/src/udev/net/link-config-gperf.gperf
diff --git a/src/grp-udev/libudev-core/net/link-config.c b/src/udev/net/link-config.c
index 350cd24e9c..350cd24e9c 100644
--- a/src/grp-udev/libudev-core/net/link-config.c
+++ b/src/udev/net/link-config.c
diff --git a/src/grp-udev/libudev-core/net/link-config.h b/src/udev/net/link-config.h
index 9df5529d05..9df5529d05 100644
--- a/src/grp-udev/libudev-core/net/link-config.h
+++ b/src/udev/net/link-config.h
diff --git a/src/grp-udev/libudev-core/udev.conf b/src/udev/udev.conf
index 47d1433002..47d1433002 100644
--- a/src/grp-udev/libudev-core/udev.conf
+++ b/src/udev/udev.conf
diff --git a/src/grp-udev/libudev-core/udev.pc.in b/src/udev/udev.pc.in
index a0c2e82d47..a0c2e82d47 100644
--- a/src/grp-udev/libudev-core/udev.pc.in
+++ b/src/udev/udev.pc.in
diff --git a/man/udev.xml b/src/udev/udev.xml
index dd5563605c..dd5563605c 100644
--- a/man/udev.xml
+++ b/src/udev/udev.xml
diff --git a/test/Makefile b/test/Makefile
deleted file mode 100644
index bc794e0d6c..0000000000
--- a/test/Makefile
+++ /dev/null
@@ -1,933 +0,0 @@
-#  -*- 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
-
-
-manual_tests += \
-	test-ns \
-	test-cgroup \
-	test-install \
-	test-btrfs \
-	test-acd \
-	test-ipv4ll-manual \
-	test-ask-password-api
-
-unsafe_tests = \
-	test-hostname \
-	test-ipcrm
-
-ifneq ($(HAVE_LIBIPTC),)
-manual_tests += \
-	test-firewall-util
-endif # HAVE_LIBIPTC
-
-ifneq ($(HAVE_KMOD),)
-manual_tests += \
-	test-netlink-manual
-endif # HAVE_KMOD
-
-tests += \
-	test-daemon \
-	test-log \
-	test-loopback \
-	test-engine \
-	test-watchdog \
-	test-cgroup-mask \
-	test-job-type \
-	test-env-util \
-	test-strbuf \
-	test-strv \
-	test-path \
-	test-path-util \
-	test-strxcpyx \
-	test-siphash24 \
-	test-unit-name \
-	test-unit-file \
-	test-utf8 \
-	test-ellipsize \
-	test-util \
-	test-cpu-set-util \
-	test-hexdecoct \
-	test-escape \
-	test-alloc-util \
-	test-proc-cmdline \
-	test-io-util \
-	test-glob-util \
-	test-xattr-util \
-	test-fs-util \
-	test-web-util \
-	test-stat-util \
-	test-fd-util \
-	test-string-util \
-	test-extract-word \
-	test-parse-util \
-	test-user-util \
-	test-hostname-util \
-	test-process-util \
-	test-terminal-util \
-	test-path-lookup \
-	test-barrier \
-	test-tmpfiles \
-	test-namespace \
-	test-date \
-	test-sleep \
-	test-replace-var \
-	test-sched-prio \
-	test-calendarspec \
-	test-strip-tab-ansi \
-	test-cgroup-util \
-	test-fstab-util \
-	test-prioq \
-	test-fileio \
-	test-time \
-	test-clock \
-	test-hashmap \
-	test-set \
-	test-bitmap \
-	test-list \
-	test-unaligned \
-	test-tables \
-	test-device-nodes \
-	test-xml \
-	test-architecture \
-	test-socket-util \
-	test-fdset \
-	test-conf-files \
-	test-conf-parser \
-	test-capability \
-	test-async \
-	test-ratelimit \
-	test-condition \
-	test-uid-range \
-	test-locale-util \
-	test-execute \
-	test-copy \
-	test-cap-list \
-	test-sigbus \
-	test-verbs \
-	test-af-list \
-	test-arphrd-list \
-	test-dns-domain \
-	test-install-root \
-	test-rlimit-util \
-	test-signal-util \
-	test-selinux \
-	test-sizeof
-
-ifneq ($(HAVE_ACL),)
-tests += \
-	test-acl-util
-endif # HAVE_ACL
-
-EXTRA_DIST += \
-	test/a.service \
-	test/basic.target \
-	test/b.service \
-	test/c.service \
-	test/daughter.service \
-	test/d.service \
-	test/end.service \
-	test/e.service \
-	test/f.service \
-	test/grandchild.service \
-	test/g.service \
-	test/hello-after-sleep.target \
-	test/hello.service \
-	test/h.service \
-	test/parent-deep.slice \
-	test/parent.slice \
-	test/sched_idle_bad.service \
-	test/sched_idle_ok.service \
-	test/sched_rr_bad.service \
-	test/sched_rr_change.service \
-	test/sched_rr_ok.service \
-	test/shutdown.target \
-	test/sleep.service \
-	test/sockets.target \
-	test/son.service \
-	test/sysinit.target \
-	test/testsuite.target \
-	test/timers.target \
-	test/unstoppable.service \
-	test/test-path/paths.target \
-	test/test-path/basic.target \
-	test/test-path/sysinit.target \
-	test/test-path/path-changed.service \
-	test/test-path/path-directorynotempty.service \
-	test/test-path/path-existsglob.service \
-	test/test-path/path-exists.service \
-	test/test-path/path-makedirectory.service \
-	test/test-path/path-modified.service \
-	test/test-path/path-mycustomunit.service \
-	test/test-path/path-service.service \
-	test/test-path/path-changed.path \
-	test/test-path/path-directorynotempty.path \
-	test/test-path/path-existsglob.path \
-	test/test-path/path-exists.path \
-	test/test-path/path-makedirectory.path \
-	test/test-path/path-modified.path \
-	test/test-path/path-unit.path \
-	test/test-execute/exec-environment-empty.service \
-	test/test-execute/exec-environment-multiple.service \
-	test/test-execute/exec-environment.service \
-	test/test-execute/exec-passenvironment-absent.service \
-	test/test-execute/exec-passenvironment-empty.service \
-	test/test-execute/exec-passenvironment-repeated.service \
-	test/test-execute/exec-passenvironment.service \
-	test/test-execute/exec-group.service \
-	test/test-execute/exec-group-nfsnobody.service \
-	test/test-execute/exec-ignoresigpipe-no.service \
-	test/test-execute/exec-ignoresigpipe-yes.service \
-	test/test-execute/exec-personality-x86-64.service \
-	test/test-execute/exec-personality-x86.service \
-	test/test-execute/exec-personality-s390.service \
-	test/test-execute/exec-privatedevices-no.service \
-	test/test-execute/exec-privatedevices-yes.service \
-	test/test-execute/exec-privatetmp-no.service \
-	test/test-execute/exec-privatetmp-yes.service \
-	test/test-execute/exec-spec-interpolation.service \
-	test/test-execute/exec-systemcallerrornumber.service \
-	test/test-execute/exec-systemcallfilter-failing2.service \
-	test/test-execute/exec-systemcallfilter-failing.service \
-	test/test-execute/exec-systemcallfilter-not-failing2.service \
-	test/test-execute/exec-systemcallfilter-not-failing.service \
-	test/test-execute/exec-systemcallfilter-system-user.service \
-	test/test-execute/exec-systemcallfilter-system-user-nfsnobody.service \
-	test/test-execute/exec-user.service \
-	test/test-execute/exec-user-nfsnobody.service \
-	test/test-execute/exec-workingdirectory.service \
-	test/test-execute/exec-umask-0177.service \
-	test/test-execute/exec-umask-default.service \
-	test/test-execute/exec-privatenetwork-yes.service \
-	test/test-execute/exec-environmentfile.service \
-	test/test-execute/exec-oomscoreadjust-positive.service \
-	test/test-execute/exec-oomscoreadjust-negative.service \
-	test/test-execute/exec-ioschedulingclass-best-effort.service \
-	test/test-execute/exec-ioschedulingclass-idle.service \
-	test/test-execute/exec-ioschedulingclass-none.service \
-	test/test-execute/exec-ioschedulingclass-realtime.service \
-	test/test-execute/exec-capabilityboundingset-invert.service \
-	test/test-execute/exec-capabilityboundingset-merge.service \
-	test/test-execute/exec-capabilityboundingset-reset.service \
-	test/test-execute/exec-capabilityboundingset-simple.service \
-	test/test-execute/exec-capabilityambientset.service \
-	test/test-execute/exec-capabilityambientset-nfsnobody.service \
-	test/test-execute/exec-capabilityambientset-merge.service \
-	test/test-execute/exec-capabilityambientset-merge-nfsnobody.service \
-	test/test-execute/exec-runtimedirectory.service \
-	test/test-execute/exec-runtimedirectory-mode.service \
-	test/test-execute/exec-runtimedirectory-owner.service \
-	test/test-execute/exec-runtimedirectory-owner-nfsnobody.service \
-	test/bus-policy/hello.conf \
-	test/bus-policy/methods.conf \
-	test/bus-policy/ownerships.conf \
-	test/bus-policy/signals.conf \
-	test/bus-policy/check-own-rules.conf \
-	test/bus-policy/many-rules.conf \
-	test/bus-policy/test.conf
-
-
-EXTRA_DIST += \
-	src/test/test-helper.h
-
-test_device_nodes_SOURCES = \
-	src/test/test-device-nodes.c
-
-test_device_nodes_LDADD = \
-	libshared.la
-
-test_engine_SOURCES = \
-	src/test/test-engine.c
-
-test_engine_CFLAGS = \
-	$(AM_CFLAGS) \
-	$(SECCOMP_CFLAGS) \
-	$(MOUNT_CFLAGS)
-
-test_engine_LDADD = \
-	libcore.la
-
-test_job_type_SOURCES = \
-	src/test/test-job-type.c
-
-test_job_type_CFLAGS = \
-	$(AM_CFLAGS) \
-	$(SECCOMP_CFLAGS) \
-	$(MOUNT_CFLAGS)
-
-test_job_type_LDADD = \
-	libcore.la
-
-test_ns_SOURCES = \
-	src/test/test-ns.c
-
-test_ns_CFLAGS = \
-	$(AM_CFLAGS) \
-	$(SECCOMP_CFLAGS)
-
-test_ns_LDADD = \
-	libcore.la
-
-test_loopback_SOURCES = \
-	src/test/test-loopback.c
-
-test_loopback_LDADD = \
-	libcore.la
-
-test_hostname_SOURCES = \
-	src/test/test-hostname.c
-
-test_hostname_LDADD = \
-	libcore.la
-
-test_dns_domain_SOURCES = \
-	src/test/test-dns-domain.c
-
-test_dns_domain_LDADD = \
-	libsystemd-network.la \
-	libshared.la
-
-
-ifneq ($(ENABLE_EFI),)
-tests += \
-	test-boot-timestamps
-
-test_boot_timestamps_SOURCES = \
-	src/test/test-boot-timestamps.c
-
-test_boot_timestamps_LDADD = \
-	libshared.la
-endif # ENABLE_EFI
-
-test_unit_name_SOURCES = \
-	src/test/test-unit-name.c
-
-test_unit_name_CFLAGS = \
-	$(AM_CFLAGS) \
-	$(SECCOMP_CFLAGS) \
-	$(MOUNT_CFLAGS)
-
-test_unit_name_LDADD = \
-	libcore.la
-
-test_unit_file_SOURCES = \
-	src/test/test-unit-file.c
-
-test_unit_file_CFLAGS = \
-	$(AM_CFLAGS) \
-	$(SECCOMP_CFLAGS) \
-	$(MOUNT_CFLAGS)
-
-test_unit_file_LDADD = \
-	libcore.la
-
-test_utf8_SOURCES = \
-	src/test/test-utf8.c
-
-test_utf8_LDADD = \
-	libshared.la
-
-test_capability_SOURCES = \
-	src/test/test-capability.c
-
-test_capability_LDADD = \
-	libshared.la
-
-test_async_SOURCES = \
-	src/test/test-async.c
-
-test_async_LDADD = \
-	libshared.la
-
-test_locale_util_SOURCES = \
-	src/test/test-locale-util.c
-
-test_locale_util_LDADD = \
-	libshared.la
-
-test_copy_SOURCES = \
-	src/test/test-copy.c
-
-test_copy_LDADD = \
-	libshared.la
-
-test_sigbus_SOURCES = \
-	src/test/test-sigbus.c
-
-test_sigbus_LDADD = \
-	libshared.la
-
-test_condition_SOURCES = \
-	src/test/test-condition.c
-
-test_condition_LDADD = \
-	libshared.la
-
-test_fdset_SOURCES = \
-	src/test/test-fdset.c
-
-test_fdset_LDADD = \
-	libshared.la
-
-test_fstab_util_SOURCES = \
-	src/test/test-fstab-util.c
-
-test_fstab_util_LDADD = \
-	libshared.la
-
-test_ratelimit_SOURCES = \
-	src/test/test-ratelimit.c
-
-test_ratelimit_LDADD = \
-	libshared.la
-
-test_util_SOURCES = \
-	src/test/test-util.c
-
-test_util_LDADD = \
-	libshared.la
-
-test_hexdecoct_SOURCES = \
-	src/test/test-hexdecoct.c
-
-test_hexdecoct_LDADD = \
-	libbasic.la
-
-test_alloc_util_SOURCES = \
-	src/test/test-alloc-util.c
-
-test_alloc_util_LDADD = \
-	libbasic.la
-
-test_xattr_util_SOURCES = \
-	src/test/test-xattr-util.c
-
-test_xattr_util_LDADD = \
-	libbasic.la
-
-test_io_util_SOURCES = \
-	src/test/test-io-util.c
-
-test_io_util_LDADD = \
-	libbasic.la
-
-test_glob_util_SOURCES = \
-	src/test/test-glob-util.c
-
-test_glob_util_LDADD = \
-	libbasic.la
-
-test_fs_util_SOURCES = \
-	src/test/test-fs-util.c
-
-test_fs_util_LDADD = \
-	libbasic.la
-
-test_proc_cmdline_SOURCES = \
-	src/test/test-proc-cmdline.c
-
-test_proc_cmdline_LDADD = \
-	libbasic.la
-
-test_fd_util_SOURCES = \
-	src/test/test-fd-util.c
-
-test_fd_util_LDADD = \
-	libbasic.la
-
-test_web_util_SOURCES = \
-	src/test/test-web-util.c
-
-test_web_util_LDADD = \
-	libbasic.la
-
-test_cpu_set_util_SOURCES = \
-	src/test/test-cpu-set-util.c
-
-test_cpu_set_util_LDADD = \
-	libbasic.la
-
-test_stat_util_SOURCES = \
-	src/test/test-stat-util.c
-
-test_stat_util_LDADD = \
-	libbasic.la
-
-test_escape_SOURCES = \
-	src/test/test-escape.c
-
-test_escape_LDADD = \
-	libbasic.la
-
-test_string_util_SOURCES = \
-	src/test/test-string-util.c
-
-test_string_util_LDADD = \
-	libshared.la
-
-test_extract_word_SOURCES = \
-	src/test/test-extract-word.c
-
-test_extract_word_LDADD = \
-	libshared.la
-
-test_parse_util_SOURCES = \
-	src/test/test-parse-util.c
-
-test_parse_util_LDADD = \
-	libshared.la
-
-test_user_util_SOURCES = \
-	src/test/test-user-util.c
-
-test_user_util_LDADD = \
-	libshared.la
-
-test_hostname_util_SOURCES = \
-	src/test/test-hostname-util.c
-
-test_hostname_util_LDADD = \
-	libshared.la
-
-test_process_util_SOURCES = \
-	src/test/test-process-util.c
-
-test_process_util_LDADD = \
-	libshared.la
-
-test_terminal_util_SOURCES = \
-	src/test/test-terminal-util.c
-
-test_terminal_util_LDADD = \
-	libshared.la
-
-test_path_lookup_SOURCES = \
-	src/test/test-path-lookup.c
-
-test_path_lookup_LDADD = \
-	libshared.la
-
-test_uid_range_SOURCES = \
-	src/test/test-uid-range.c
-
-test_uid_range_LDADD = \
-	libshared.la
-
-test_cap_list_SOURCES = \
-	src/test/test-cap-list.c
-
-test_cap_list_LDADD = \
-	libshared.la
-
-test_socket_util_SOURCES = \
-	src/test/test-socket-util.c
-
-test_socket_util_LDADD = \
-	libshared.la
-
-test_barrier_SOURCES = \
-	src/test/test-barrier.c
-
-test_barrier_LDADD = \
-	libshared.la
-
-test_tmpfiles_SOURCES = \
-	src/test/test-tmpfiles.c
-
-test_tmpfiles_LDADD = \
-	libshared.la
-
-test_namespace_SOURCES = \
-	src/test/test-namespace.c
-
-test_verbs_SOURCES = \
-	src/test/test-verbs.c
-
-test_verbs_LDADD = \
-	libshared.la
-
-test_install_root_SOURCES = \
-	src/test/test-install-root.c
-
-test_install_root_LDADD = \
-	libshared.la
-
-test_acl_util_SOURCES = \
-	src/test/test-acl-util.c
-
-test_acl_util_LDADD = \
-	libshared.la
-
-test_namespace_LDADD = \
-	libcore.la
-
-test_rlimit_util_SOURCES = \
-	src/test/test-rlimit-util.c
-
-test_rlimit_util_LDADD = \
-	libshared.la
-
-test_ask_password_api_SOURCES = \
-	src/test/test-ask-password-api.c
-
-test_ask_password_api_LDADD = \
-	libshared.la
-
-test_signal_util_SOURCES = \
-	src/test/test-signal-util.c
-
-test_signal_util_LDADD = \
-	libshared.la
-
-test_selinux_SOURCES = \
-	src/test/test-selinux.c
-
-test_selinux_LDADD = \
-	libshared.la
-
-test_sizeof_SOURCES = \
-	src/test/test-sizeof.c
-
-test_sizeof_LDADD = \
-	libshared.la
-
-BUILT_SOURCES += \
-	src/test/test-hashmap-ordered.c
-
-$(outdir)/test-hashmap-ordered.c: src/test/test-hashmap-plain.c
-	$(AM_V_at)$(MKDIR_P) $(dir $@)
-	$(AM_V_GEN)$(AWK) 'BEGIN { print "/* GENERATED FILE */\n#define ORDERED" } \
-	                   { if (!match($$0, "^#include"))          \
-	                         gsub(/hashmap/, "ordered_hashmap"); \
-	                     gsub(/HASHMAP/, "ORDERED_HASHMAP");     \
-	                     gsub(/Hashmap/, "OrderedHashmap");      \
-	                     print }' <$< >$@
-
-nodist_test_hashmap_SOURCES = \
-	src/test/test-hashmap-ordered.c
-
-test_hashmap_SOURCES = \
-	src/test/test-hashmap.c \
-	src/test/test-hashmap-plain.c
-
-test_hashmap_LDADD = \
-	libshared.la
-
-test_set_SOURCES = \
-	src/test/test-set.c
-
-test_set_LDADD = \
-	libshared.la
-
-test_bitmap_SOURCES = \
-	src/test/test-bitmap.c
-
-test_bitmap_LDADD = \
-	libshared.la
-
-test_xml_SOURCES = \
-	src/test/test-xml.c
-
-test_xml_LDADD = \
-	libshared.la
-
-test_list_SOURCES = \
-	src/test/test-list.c
-
-test_list_LDADD = \
-	libshared.la
-
-test_unaligned_LDADD = \
-	libshared.la
-
-test_unaligned_SOURCES = \
-	src/test/test-unaligned.c
-
-test_tables_SOURCES = \
-	src/test/test-tables.c \
-	src/shared/test-tables.h \
-	src/journal/journald-server.c \
-	src/journal/journald-server.h
-
-test_tables_CPPFLAGS = \
-	$(AM_CPPFLAGS)
-
-test_tables_CFLAGS = \
-	$(AM_CFLAGS) \
-	$(SECCOMP_CFLAGS) \
-	$(MOUNT_CFLAGS)
-
-test_tables_LDADD = \
-	libjournal-core.la \
-	libcore.la \
-	libudev-core.la
-
-test_prioq_SOURCES = \
-	src/test/test-prioq.c
-
-test_prioq_LDADD = \
-	libshared.la
-
-test_fileio_SOURCES = \
-	src/test/test-fileio.c
-
-test_fileio_LDADD = \
-	libshared.la
-
-test_time_SOURCES = \
-	src/test/test-time.c
-
-test_time_LDADD = \
-	libshared.la
-
-test_clock_SOURCES = \
-	src/test/test-clock.c
-
-test_clock_LDADD = \
-	libshared.la
-
-test_architecture_SOURCES = \
-	src/test/test-architecture.c
-
-test_architecture_LDADD = \
-	libshared.la
-
-test_log_SOURCES = \
-	src/test/test-log.c
-
-test_log_LDADD = \
-	libshared.la
-
-test_ipcrm_SOURCES = \
-	src/test/test-ipcrm.c
-
-test_ipcrm_LDADD = \
-	libshared.la
-
-test_btrfs_SOURCES = \
-	src/test/test-btrfs.c
-
-test_btrfs_LDADD = \
-	libshared.la
-
-ifneq ($(HAVE_LIBIPTC),)
-test_firewall_util_SOURCES = \
-	src/test/test-firewall-util.c
-
-test_firewall_util_CFLAGS = \
-	$(AM_CFLAGS) \
-	$(LIBIPTC_CFLAGS)
-
-test_firewall_util_LDADD = \
-	libfirewall.la \
-	libshared.la \
-	$(LIBIPTC_LIBS)
-endif # HAVE_LIBIPTC
-
-test_netlink_manual_SOURCES = \
-	src/test/test-netlink-manual.c
-
-test_netlink_manual_CFLAGS = \
-	$(AM_CFLAGS) \
-	$(KMOD_CFLAGS)
-
-test_netlink_manual_LDADD = \
-	libshared.la \
-	$(KMOD_LIBS)
-
-test_ellipsize_SOURCES = \
-	src/test/test-ellipsize.c
-
-test_ellipsize_LDADD = \
-	libshared.la
-
-test_date_SOURCES = \
-	src/test/test-date.c
-
-test_date_LDADD = \
-	libshared.la
-
-test_sleep_SOURCES = \
-	src/test/test-sleep.c
-
-test_sleep_LDADD = \
-	libcore.la
-
-test_replace_var_SOURCES = \
-	src/test/test-replace-var.c
-
-test_replace_var_LDADD = \
-	libshared.la
-
-test_calendarspec_SOURCES = \
-	src/test/test-calendarspec.c
-
-test_calendarspec_LDADD = \
-	libshared.la
-
-test_strip_tab_ansi_SOURCES = \
-	src/test/test-strip-tab-ansi.c
-
-test_strip_tab_ansi_LDADD = \
-	libshared.la
-
-test_daemon_SOURCES = \
-	src/test/test-daemon.c
-
-test_daemon_LDADD = \
-	libshared.la
-
-test_cgroup_SOURCES = \
-	src/test/test-cgroup.c
-
-test_cgroup_LDADD = \
-	libshared.la
-
-test_cgroup_mask_SOURCES = \
-	src/test/test-cgroup-mask.c
-
-test_cgroup_mask_CPPFLAGS = \
-	$(AM_CPPFLAGS) \
-	$(MOUNT_CFLAGS)
-
-test_cgroup_mask_CFLAGS = \
-	$(AM_CFLAGS) \
-	$(SECCOMP_CFLAGS)
-
-test_cgroup_mask_LDADD = \
-	libcore.la
-
-test_cgroup_util_SOURCES = \
-	src/test/test-cgroup-util.c
-
-test_cgroup_util_LDADD = \
-	libshared.la
-
-test_env_util_SOURCES = \
-	src/test/test-env-util.c
-
-test_env_util_LDADD = \
-	libshared.la
-
-test_strbuf_SOURCES = \
-	src/test/test-strbuf.c
-
-test_strbuf_LDADD = \
-	libshared.la
-
-test_strv_SOURCES = \
-	src/test/test-strv.c
-
-test_strv_LDADD = \
-	libshared.la
-
-test_path_util_SOURCES = \
-	src/test/test-path-util.c
-
-test_path_util_LDADD = \
-	libshared.la
-
-test_path_SOURCES = \
-	src/test/test-path.c
-
-test_path_CFLAGS = \
-	$(AM_CFLAGS) \
-	$(MOUNT_CFLAGS)
-
-test_path_LDADD = \
-	libcore.la
-
-test_execute_SOURCES = \
-	src/test/test-execute.c
-
-test_execute_CFLAGS = \
-	$(AM_CFLAGS) \
-	$(MOUNT_CFLAGS)
-
-test_execute_LDADD = \
-	libcore.la
-
-test_siphash24_SOURCES = \
-	src/test/test-siphash24.c
-
-test_siphash24_LDADD = \
-	libshared.la
-
-test_strxcpyx_SOURCES = \
-	src/test/test-strxcpyx.c
-
-test_strxcpyx_LDADD = \
-	libshared.la
-
-test_install_SOURCES = \
-	src/test/test-install.c
-
-test_install_LDADD = \
-	libshared.la
-
-test_watchdog_SOURCES = \
-	src/test/test-watchdog.c
-
-test_watchdog_LDADD = \
-	libshared.la
-
-test_sched_prio_SOURCES = \
-	src/test/test-sched-prio.c
-
-test_sched_prio_CPPFLAGS = \
-	$(AM_CPPFLAGS) \
-	$(MOUNT_CFLAGS)
-
-test_sched_prio_CFLAGS = \
-	$(AM_CFLAGS) \
-	$(SECCOMP_CFLAGS)
-
-test_sched_prio_LDADD = \
-	libcore.la
-
-test_conf_files_SOURCES = \
-	src/test/test-conf-files.c
-
-test_conf_files_LDADD = \
-	libshared.la
-
-test_conf_parser_SOURCES = \
-	src/test/test-conf-parser.c
-
-test_conf_parser_LDADD = \
-	libshared.la
-
-test_af_list_SOURCES = \
-	src/test/test-af-list.c
-
-test_af_list_LDADD = \
-	libbasic.la
-
-test_arphrd_list_SOURCES = \
-	src/test/test-arphrd-list.c
-
-test_arphrd_list_LDADD = \
-	libbasic.la
-
-include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-boot/systemd-boot/test-efi-create-disk.sh b/test/test-efi-create-disk.sh
index 56dd09abd7..56dd09abd7 100755
--- a/src/grp-boot/systemd-boot/test-efi-create-disk.sh
+++ b/test/test-efi-create-disk.sh
diff --git a/tools/move.sh b/tools/move.sh
new file mode 100755
index 0000000000..c129c598b0
--- /dev/null
+++ b/tools/move.sh
@@ -0,0 +1,586 @@
+#!/usr/bin/env bash
+
+in_array() {
+	local needle=$1; shift
+	local item
+	for item in "$@"; do
+		[[ $item = $needle ]] && return 0 # Found
+	done
+	return 1 # Not Found
+}
+
+split_lib() {
+	local d=$1
+
+	local t=("$d"/test-*)
+	if [[ -f ${t[0]} ]]; then
+		mkdir "$d/test"
+		mv "$d"/test-* -t "$d/test"
+	fi
+
+	mkdir "$d/src"
+	mv "$d"/*.c -t "$d/src"
+
+	local h=${d##*/lib}
+	mkdir "$d/include"
+	mkdir "$d/include/$h"
+	mv "$d"/*.h -t "$d/include/$h"
+}
+
+grp() {
+	local grp=$1
+	shift
+	if [[ -d "${grp}.d" ]]; then
+		mv -T "${grp}.d" "$grp"
+	else
+		mkdir "$grp"
+	fi
+	mv "$@" -t "$grp"
+}
+
+move_files() (
+	# first focus on getting directories to the right names.
+	mv -T src/{,systemd-}dbus1-generator
+	mv -T src/{,systemd-}debug-generator
+	mv -T src/{,systemd-}fstab-generator
+	mv -T src/{,systemd-}getty-generator
+	mv -T src/{,systemd-}gpt-auto-generator
+	mv -T src/{,systemd-}rc-local-generator
+	mv -T src/{,systemd-}system-update-generator
+	mv -T src/{,systemd-}sysv-generator
+
+	mv -T src/{,systemd-}ac-power
+	mv -T src/{,systemd-}analyze
+	mv -T src/{,systemd-}ask-password
+	mv -T src/{,systemd-}backlight
+	mv -T src/{,systemd-}binfmt
+	mv -T src/{,systemd-}cgls
+	mv -T src/{,systemd-}cgroups-agent
+	mv -T src/{,systemd-}cgtop
+	mv -T src/{,systemd-}cryptsetup
+	mv -T src/{,systemd-}delta
+	mv -T src/{,systemd-}detect-virt
+	mv -T src/{,systemd-}escape
+	mv -T src/{,systemd-}firstboot
+	mv -T src/{,systemd-}fsck
+	mv -T src/{,systemd-}hibernate-resume
+	mv -T src/{,systemd-}hwdb
+	mv -T src/{,systemd-}initctl
+	mv -T src/{,systemd-}machine-id-setup
+	mv -T src/{,systemd-}modules-load
+	mv -T src/{,systemd-}notify
+	mv -T src/{,systemd-}nspawn
+	mv -T src/{,systemd-}path
+	mv -T src/{,systemd-}quotacheck
+	mv -T src/{,systemd-}random-seed
+	mv -T src/{,systemd-}remount-fs
+	mv -T src/{,systemd-}reply-password
+	mv -T src/{,systemd-}rfkill
+	mv -T src/{,systemd-}run
+	mv -T src/{,systemd-}sleep
+	mv -T src/{,systemd-}stdio-bridge
+	mv -T src/{,systemd-}sysctl
+	mv -T src/{,systemd-}sysusers
+	mv -T src/{,systemd-}tmpfiles
+	mv -T src/{,systemd-}tty-ask-password-agent
+	mv -T src/{,systemd-}update-done
+	mv -T src/{,systemd-}update-utmp
+	mv -T src/{,systemd-}user-sessions
+	mv -T src/vconsole     src/systemd-vconsole-setup
+	mv -T src/socket-proxy src/systemd-socket-proxyd
+	mv -T src/timesync     src/systemd-timesyncd
+	mv -T src/activate     src/systemd-socket-activate
+
+	mv src/udev/*_id    -t src
+	mv src/udev/collect -t src
+
+	mv -T src/boot/efi src/systemd-boot
+	mv -T src/boot     src/bootctl
+
+	mkdir src/libsystemd/src
+	mv -t src/libsystemd/src src/libsystemd/sd-*
+	mkdir src/libsystemd/include
+	mv -T src/systemd src/libsystemd/include/systemd
+
+	mkdir src/busctl
+	mv src/libsystemd/src/sd-bus/busctl* -t src/busctl
+
+	mkdir src/systemd
+	mv -t src/systemd \
+	   src/core/main* \
+	   src/core/macros.systemd.in \
+	   src/core/system.conf \
+	   src/core/org.*
+
+	mv -T src/{,lib}basic
+	mv -T src/{,lib}core
+	mv -T src/{,lib}shared
+
+	mv -T src/lib{shared,core}/linux
+
+	mkdir src/libfirewall
+	mv -T src/lib{shared,firewall}/firewall-util.c
+	mv -T src/lib{shared,firewall}/firewall-util.h
+
+	split_lib src/libbasic
+	split_lib src/libshared
+	split_lib src/libsystemd-network
+
+	mkdir src/systemd-hibernate-resume-generator
+	mv -t src/systemd-hibernate-resume-generator \
+	   src/systemd-hibernate-resume/*generator*
+
+	# src/resolve => src/{libbasic-dns,resolve,resolved}
+	mkdir src/libbasic-dns
+	mv -t src/libbasic-dns \
+	   src/resolve/dns-type.{c,h} \
+	   src/resolve/resolved-dns-{answer,dnssec,packet,question,rr}.{c,h} \
+	   src/resolve/test-*
+	mkdir src/systemd-resolve
+	mv -t src/systemd-resolve \
+	   src/resolve/resolve-tool.c
+	mkdir src/systemd-resolved
+	mv -t src/systemd-resolved \
+	   src/resolve/.gitignore \
+	   src/resolve/*
+	rmdir src/resolve
+
+	# src/import => src/{libimport,systemd-{export,importd,import}}
+	mkdir src/libimport
+	mv -t src/libimport \
+	   src/import/import-common.{c,h} \
+	   src/import/import-compress.{c,h} \
+	   src/import/qcow2-util.{c,h} \
+	   src/import/test-qcow2.c
+	mkdir src/systemd-export
+	mv -t src/systemd-export \
+	   src/import/export*
+	mkdir src/systemd-importd
+	mv -t src/systemd-importd \
+	   src/import/.gitignore \
+	   src/import/importd.c \
+	   src/import/org.*
+	mkdir src/systemd-import
+	mv -t src/systemd-import \
+	   src/import/import*
+	mkdir src/systemd-pull
+	mv -t src/systemd-pull \
+	   src/import/pull* \
+	   src/import/curl-util*
+	rmdir src/import
+
+	# src/journal => src/..
+	mkdir src/libjournal-core
+	mv -t src/libjournal-core \
+	   src/journal/.gitignore \
+	   src/journal/journald-* \
+	   src/journal/test-*
+	mkdir src/systemd-cat
+	mv -t src/systemd-cat \
+	   src/journal/cat.c
+	mkdir src/journalctl
+	mv -t src/journalctl \
+	   src/journal/journal-qrcode.{c,h} \
+	   src/journal/journalctl.c
+	mkdir src/systemd-journald
+	mv -t src/systemd-journald \
+	   src/journal/journald.*
+	mkdir src/libsystemd/src/sd-journal
+	mv -t src/libsystemd/src/sd-journal \
+	   src/journal/audit-type.c \
+	   src/journal/audit-type.h \
+	   src/journal/catalog.c \
+	   src/journal/catalog.h \
+	   src/journal/compress.c \
+	   src/journal/compress.h \
+	   src/journal/fsprg.c \
+	   src/journal/fsprg.h \
+	   src/journal/journal-authenticate.c \
+	   src/journal/journal-authenticate.h \
+	   src/journal/journal-def.h \
+	   src/journal/journal-file.c \
+	   src/journal/journal-file.h \
+	   src/journal/journal-internal.h \
+	   src/journal/journal-send.c \
+	   src/journal/journal-vacuum.c \
+	   src/journal/journal-vacuum.h \
+	   src/journal/journal-verify.c \
+	   src/journal/journal-verify.h \
+	   src/journal/lookup3.c \
+	   src/journal/lookup3.h \
+	   src/journal/mmap-cache.c \
+	   src/journal/mmap-cache.h \
+	   src/journal/sd-journal.c
+	rmdir src/journal
+
+	# src/network => src/...
+	mkdir src/systemd-networkd-wait-online
+	mv -t src/systemd-networkd-wait-online \
+	   src/network/networkd-wait-online*
+	mkdir src/libnetworkd-core
+	mv -t src/libnetworkd-core \
+	   src/network/.gitignore \
+	   src/network/networkd-*
+	mkdir src/networkctl
+	mv -t src/networkctl \
+	   src/network/networkctl.c
+	mkdir src/systemd-networkd
+	mv -t src/systemd-networkd \
+	   src/network/networkd* \
+	   src/network/org.*
+	mkdir src/grp-network.d
+	mv -t src/grp-network.d \
+	   src/network/test-*
+	rmdir src/network
+
+	# src/machine => src/{machinectl,systemd-machined}
+	mkdir src/machinectl
+	mv -t src/machinectl \
+	   src/machine/machinectl*
+	mkdir src/systemd-machined
+	mv -t src/systemd-machined \
+	   src/machine/.gitignore \
+	   src/machine/*
+	rmdir src/machine
+
+	# src/coredump => src/{coredumpctl,systemd-coredump}
+	mkdir src/coredumpctl
+	mv -t src/coredumpctl \
+	   src/coredump/coredumpctl*
+	mkdir src/systemd-coredump
+	mv -t src/systemd-coredump \
+	   src/coredump/*
+	rmdir src/coredump
+
+	# src/hostname => src/{hostnamectl,systemd-hostnamed}
+	mkdir src/hostnamectl
+	mv -t src/hostnamectl \
+	   src/hostname/hostnamectl*
+	mkdir src/systemd-hostnamed
+	mv -t src/systemd-hostnamed \
+	   src/hostname/.gitignore \
+	   src/hostname/*
+	rmdir src/hostname
+
+	# src/journal-remote => src/...
+	mkdir src/systemd-journal-gatewayd
+	mv -t src/systemd-journal-gatewayd \
+	   src/journal-remote/journal-gateway*
+	mkdir src/systemd-journal-remote
+	mv -t src/systemd-journal-remote \
+	   src/journal-remote/journal-remote*
+	mkdir src/systemd-journal-upload
+	mv -t src/systemd-journal-upload \
+	   src/journal-remote/journal-upload*
+	mkdir src/grp-remote.d
+	mv -t src/grp-remote.d \
+	   src/journal-remote/.gitignore \
+	   src/journal-remote/browse.html \
+	   src/journal-remote/log-generator.py \
+	   src/journal-remote/microhttpd*
+	rmdir src/journal-remote
+
+	# src/locale => src/...
+	mkdir src/localectl
+	mv -t src/localectl \
+	   src/locale/localectl*
+	mkdir src/systemd-localed
+	mv -t src/systemd-localed \
+	   src/locale/.gitignore \
+	   src/locale/*
+	rmdir src/locale
+
+	# src/login => src/...
+	mkdir src/grp-login.d
+	mv -t src/grp-login.d \
+	   src/login/.gitignore \
+	   src/login/test-*
+	mkdir src/loginctl
+	mv -t src/loginctl \
+	   src/login/loginctl* \
+	   src/login/sysfs-show*
+	mkdir src/pam_systemd
+	mv -t src/pam_systemd \
+	   src/login/pam*
+	mkdir src/systemd-inhibit
+	mv -t src/systemd-inhibit \
+	   src/login/inhibit*
+	mkdir src/systemd-logind
+	mv -t src/systemd-logind \
+	   src/login/logind* \
+	   src/login/*.rules \
+	   src/login/*.rules.in \
+	   src/login/org.*
+	mv -T src/login/systemd-user.m4 src/systemd-logind/systemd-user.pam.m4
+	rmdir src/login
+
+	# src/timedate => src/...
+	mkdir src/timedatectl
+	mv -t src/timedatectl \
+	   src/timedate/timedatectl*
+	mkdir src/systemd-timedated
+	mv -t src/systemd-timedated \
+	   src/timedate/.gitignore \
+	   src/timedate/timedated* \
+	   src/timedate/org.*
+	rmdir src/timedate
+
+	# src/udev => src/...
+	mv -T src/udev/udev.h src/libudev/udev.h
+	mkdir src/udevadm
+	mv -t src/udevadm \
+	   src/udev/udevadm*
+	mkdir src/libudev-core
+	mv -t src/libudev-core \
+	   src/udev/udev-*
+	mkdir src/systemd-udevd
+	mv -t src/systemd-udevd \
+	   src/udev/udevd*
+
+	# auto-distribute the stuff
+	(
+		cd man
+		for file in *.xml; do
+			if [[ -d ../src/"${file%.xml}" ]]; then
+				mv "$file" -t ../src/"${file%.xml}"
+			fi
+		done
+	)
+	(
+		cd units
+		for file in *; do
+			if [[ -d ../src/"${file%%.*}" ]]; then
+				mv "$file" -t ../src/"${file%%.*}"
+			elif [[ -d ../src/"${file%%@*}" ]]; then
+				mv "$file" -t ../src/"${file%%@*}"
+			fi
+		done
+	)
+	(
+		cd shell-completion/bash
+		for file in *; do
+			if [[ -d ../src/"$file" ]]; then
+				mv -T "$file" "../src/$file/$file.completion.bash"
+			fi
+		done
+	)
+	(
+		cd shell-completion/zsh
+		for file in _*; do
+			if [[ -d ../src/"${file#_}" ]]; then
+				mv -T "$file" "../src/${file#_}/${file#_}.completion.zsh"
+			fi
+		done
+	)
+	
+	# categorize
+	grp src/grp-boot \
+	    src/bootctl \
+	    src/kernel-install \
+	    src/systemd-boot
+	grp src/grp-coredump \
+	    src/coredumpctl \
+	    src/systemd-coredump
+	grp src/grp-hostname \
+	    src/hostnamectl \
+	    src/systemd-hostnamed
+	grp src/grp-initprogs \
+	    src/systemd-backlight \
+	    src/systemd-binfmt \
+	    src/systemd-detect-virt \
+	    src/systemd-firstboot \
+	    src/systemd-fsck \
+	    src/systemd-modules-load \
+	    src/systemd-quotacheck \
+	    src/systemd-random-seed \
+	    src/systemd-rfkill \
+	    src/systemd-sysctl \
+	    src/systemd-sysusers \
+	    src/systemd-tmpfiles \
+	    src/systemd-update-done \
+	    src/systemd-update-utmp \
+	    src/systemd-user-sessions \
+	    src/systemd-vconsole-setup
+	grp src/grp-initprogs/grp-sleep \
+	    src/systemd-hibernate-resume \
+	    src/systemd-hibernate-resume-generator \
+	    src/systemd-sleep
+	grp src/grp-remote \
+	    src/systemd-journal-gatewayd \
+	    src/systemd-journal-remote \
+	    src/systemd-journal-upload
+	grp src/grp-journal \
+	    catalog \
+	    src/grp-remote \
+	    src/journalctl \
+	    src/libjournal-core \
+	    src/systemd-cat \
+	    src/systemd-journald
+	grp src/grp-locale \
+	    src/localectl \
+	    src/systemd-localed
+	grp src/grp-login \
+	    src/loginctl \
+	    src/pam_systemd \
+	    src/systemd-inhibit \
+	    src/systemd-logind
+	grp src/grp-machine \
+	    src/machinectl \
+	    src/nss-mymachines \
+	    src/systemd-machined
+	grp src/grp-machine/grp-import \
+	    src/libimport \
+	    src/systemd-export \
+	    src/systemd-import \
+	    src/systemd-importd \
+	    src/systemd-pull
+	grp src/grp-network \
+	    network \
+	    src/libnetworkd-core \
+	    src/networkctl \
+	    src/systemd-networkd \
+	    src/systemd-networkd-wait-online
+	grp src/grp-resolve \
+	    src/libbasic-dns \
+	    src/nss-resolve \
+	    src/systemd-resolve \
+	    src/systemd-resolved
+	grp src/grp-system \
+	    src/libcore \
+	    src/systemctl \
+	    src/systemd
+	grp src/grp-system/grp-utils \
+	    src/systemd-analyze \
+	    src/systemd-delta \
+	    src/systemd-fstab-generator \
+	    src/systemd-run \
+	    src/systemd-sysv-generator
+	grp src/grp-timedate \
+	    src/systemd-timedated \
+	    src/timedatectl
+	grp src/grp-udev \
+	    rules \
+	    src/*_id \
+	    src/systemd-hwdb \
+	    src/systemd-udevd \
+	    src/udevadm
+	grp src/grp-utils \
+	    src/systemd-ac-power \
+	    src/systemd-escape \
+	    src/systemd-notify \
+	    src/systemd-path \
+	    src/systemd-socket-activate
+)
+
+breakup_makefile() (
+        touch .tmp.move.all
+        files=(.tmp.move.all)
+        file=/dev/null
+        IFS=''
+        while read -r line; do
+                if [[ $line = '#@'* ]]; then
+                        file="${line#'#@'}"
+                        file="${file%% *}"
+                elif [[ $file = all ]]; then
+                        printf '%s\n' "$line" | tee -a "${files[@]}" >/dev/null
+                else
+			if ! in_array "$file" "${files[@]}"; then
+				cat .tmp.move.all > "$file"
+				files+=("$file")
+			fi
+                        printf '%s\n' "$line" >> "$file"
+                fi
+        done < <(fixup_makefile <Makefile.am)
+        rm .tmp.move.all
+)
+
+fixup_includes() (
+	find src \( -name '*.h' -o -name '*.c' \) \
+	     -exec grep '#include ["<]sd-' -l -- {} + |
+	    xargs -d $'\n' sed -ri \
+		  -e 's|#include "(sd-[^"]*)"|#include <systemd/\1>|' \
+		  -e 's|#include <(sd-[^>]*)>|#include <systemd/\1>|'
+)
+
+fixup_makefile() {
+	sed -r \
+	    -e '/^[^#	]*:/ { s|^(\s*)\S+/|\1$(outdir)/| }' \
+	    -e 's|^if (.*)|ifneq ($(\1),)|' \
+	    -e 's|--version-script=.*/([^/]+)\.sym|--version-script=$(srcdir)/\1.sym|g'
+}
+
+fixup_makefiles() (
+	sed -ri \
+	    -e '/^	\$\(AM_V_at\)\$\(MKDIR_P\) \$\(dir \$@\)/d' \
+	    -e 's/ \$\(CFLAGS\) / /g' \
+	    -e 's/ \$\(CPPFLAGS\) / /g' \
+	    -e 's/ \$\(AM_CPPFLAGS\) / $(sd.ALL_CPPFLAGS) /g' \
+	    -e '/^[^#	]*:/ { s|\S+/|$(outdir)/|g }' \
+	    src/libbasic/include/basic/Makefile \
+	    src/libsystemd/src/Makefile \
+	    src/libsystemd/src/sd-journal/Makefile \
+	    src/grp-udev/libudev-core/Makefile
+	find -type f -name Makefile|while read -r filename; do
+		sed -r -i "s|(/\.\.)*/config.mk|/$(realpath -ms --relative-to="${filename%/*}" config.mk)|" "$filename"
+	done
+)
+
+breakup_zshcompletion() (
+	sed_expr='
+		1 {
+			i #compdef %s
+			d
+		}
+		/^case/,/^esac/ {
+			/^    %s)/,/^    ;;/ {
+				s/^        //p
+			}
+			d
+		}
+	'
+
+	cd shell-completion/zsh
+	read -r _ cmds < _systemd
+	for cmd in $cmds; do
+		printf -v cmd_sed_expr "$sed_expr" $cmd $cmd
+		sed -e "$cmd_sed_expr" < _systemd > _$cmd
+	done
+	rm _systemd
+)
+
+move() (
+        find . \( -name Makefile -o -name '*.mk' \) -delete
+
+	>&2 echo ' => breakup_zshcompletion'
+	breakup_zshcompletion
+	>&2 echo ' => move_files'
+	move_files
+	>&2 echo ' => breakup_makefile'
+	#breakup_makefile
+	>&2 echo ' => fixup_includes'
+	fixup_includes
+	>&2 echo ' => fixup_makefiles'
+	#fixup_makefiles
+)
+
+main() {
+	set -e
+
+	if [[ -n "$(git status -s)" ]] || [[ -n "$(git clean -xdn)" ]]; then
+		echo 'There are changes in the current directory.' >&2
+		exit 1
+	fi
+
+	git checkout -b tmp/postmove
+
+	move
+
+	git add .
+	git commit -m './move.sh'
+	git merge -s ours notsystemd/postmove
+	git checkout notsystemd/postmove
+	git merge tmp/postmove
+	git branch -d tmp/postmove
+}
+
+main "$@"
diff --git a/tools/reset.sh b/tools/reset.sh
new file mode 100755
index 0000000000..d7141587fa
--- /dev/null
+++ b/tools/reset.sh
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+set -e
+git checkout notsystemd/premove
+git branch -D tmp/postmove || true
+git checkout .
+git clean -xdf