Merge branch 'lukeshu/postmove' into lukeshu/master

# Conflicts: # am-pretty.mk # config.mk.in # src/journal/Makefile # src/kernel-install/Makefile # src/libbasic/Makefile # src/libfirewall/Makefile # src/libshared/Makefile # src/libsystemd/Makefile # src/libsystemd/libsystemd-internal/Makefile # src/libsystemd/libsystemd-journal-internal/Makefile # src/libsystemd/src/Makefile # src/systemd-nspawn/Makefile # src/systemd-nspawn/nspawn-network.c # src/udev/udev.h
author: Luke Shumaker <lukeshu@sbcglobal.net> 2016-06-01 14:50:48 -0400
committer: Luke Shumaker <lukeshu@sbcglobal.net> 2016-06-01 14:50:48 -0400
commit: 8ab6d6ae4a1fbefe7c772a8513e5d5a38f49a302 (patch)
tree: 20000a90a738370fff9e44c5e8fbaccea08e949c
parent: 7308e9ffd1933c71e6134e1b9632683977a12f47 (diff)
parent: db51244983a38d901fefd5e2a090f0e66343d98d (diff)
313 files changed, 767 insertions, 356 deletions
diff --git a/Makefile.am b/Makefile.am
index b4fad0ff39..9b072e8434 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,7 +21,10 @@
 #
 #  You should have received a copy of the GNU Lesser General Public License
 #  along with systemd; If not, see <http://www.gnu.org/licenses/>.
-#@common.once.head.mk
+include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
+include $(topsrcdir)/build-aux/Makefile.head.mk
+
+#@build-aux/Makefile.once.head/20-systemd.mk
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 AM_MAKEFLAGS = --no-print-directory
 AUTOMAKE_OPTIONS = color-tests parallel-tests
@@ -45,7 +48,7 @@ LIBUDEV_CURRENT=7
 LIBUDEV_REVISION=4
 LIBUDEV_AGE=6
 
-#@src/libsystemd/src/Makefile
+#@src/libsystemd/Makefile
 LIBSYSTEMD_CURRENT=14
 LIBSYSTEMD_REVISION=0
 LIBSYSTEMD_AGE=14
@@ -359,40 +362,42 @@ INSTALL_EXEC_HOOKS += \
 	install-busnames-target-wants-hook
 
 #@am-pretty.mk -----------------------------------------------------------------
+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_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_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_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_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_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_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_CCLD_1 =
 
 AM_V_P = $(AM_V_P_$(V))
 AM_V_P_ = $(AM_V_P_$(AM_DEFAULT_VERBOSITY))
@@ -402,17 +407,23 @@ 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_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_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 = 
+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 =
 
 #@discard.mk -------------------------------------------------------------------
 rootbin_PROGRAMS = \
@@ -1332,7 +1343,7 @@ EXTRA_DIST += \
 CLEANFILES += \
 	$(gperf_txt_sources)
 
-#@common.once.head.mk
+#@build-aux/Makefile.once.head/20-systemd.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 }' <$< >$@
@@ -3084,7 +3095,7 @@ systemd_tty_ask_password_agent_SOURCES = \
 systemd_tty_ask_password_agent_LDADD = \
 	libshared.la
 
-#@src/libsystemd/src/Makefile --------------------------------------------------
+#@src/libsystemd/libsystemd-internal/Makefile ----------------------------------
 libsystemd_internal_la_SOURCES = \
 	src/systemd/sd-bus.h \
 	src/systemd/sd-bus-protocol.h \
@@ -4267,6 +4278,7 @@ tests += \
 	test-compress-benchmark
 endif
 
+#@src/libsystemd/libsystemd-journal-internal/Makefile
 pkginclude_HEADERS += \
 	src/systemd/sd-journal.h \
 	src/systemd/sd-messages.h \
@@ -6358,7 +6370,7 @@ install-tree: all
 	$(MAKE) install DESTDIR=$(abs_srcdir)/install-tree
 	tree $(abs_srcdir)/install-tree
 
-#@common.once.tail.mk
+#@build-aux/Makefile.once.tail/20-systemd.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
@@ -6411,7 +6423,7 @@ check-includes: $(top_srcdir)/tools/check-includes.pl
 EXTRA_DIST += \
 	$(top_srcdir)/tools/check-includes.pl
 
-#@common.once.head.mk
+#@build-aux/Makefile.once.head/20-systemd.mk
 # Stupid test that everything purported to be exported really is
 define generate-sym-test
 	$(AM_V_at)$(MKDIR_P) $(dir $@)
@@ -6424,7 +6436,7 @@ define generate-sym-test
 	$(AM_V_at)printf 'return 0; }\n' >> $@
 endef
 
-#@src/libsystemd/src/Makefile
+#@src/libsystemd/Makefile
 test-libsystemd-sym.c: \
 		$(top_builddir)/src/libsystemd/libsystemd.sym \
 		src/systemd/sd-journal.h \
@@ -6437,19 +6449,19 @@ test-libsystemd-sym.c: \
 		src/systemd/sd-event.h
 	$(generate-sym-test)
 
-#@src/libudev/src/Makefile
+#@src/libudev/Makefile
 test-libudev-sym.c: \
 		src/libudev/libudev.sym \
 		src/udev/udev.h
 	$(generate-sym-test)
 
-#@src/libsystemd/src/Makefile
+#@src/libsystemd/Makefile
 nodist_test_libsystemd_sym_SOURCES = \
 	test-libsystemd-sym.c
 test_libsystemd_sym_LDADD = \
 	libsystemd.la
 
-#@src/libudev/src/Makefile
+#@src/libudev/Makefile
 nodist_test_libudev_sym_SOURCES = \
 	test-libudev-sym.c
 test_libudev_sym_CFLAGS = \
@@ -6471,7 +6483,7 @@ tests += \
 	test-libsystemd-sym \
 	test-libudev-sym
 
-#@common.once.tail.mk
+#@build-aux/Makefile.once.tail/20-systemd.mk
 .PHONY: cppcheck
 cppcheck:
 	cppcheck --enable=all -q $(top_srcdir)
@@ -6491,3 +6503,5 @@ 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 -
+#@all
+include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/am-pretty.mk b/am-pretty.mk
index 104a4806c0..1651f3b079 100644
--- a/am-pretty.mk
+++ b/am-pretty.mk
@@ -20,42 +20,43 @@
 #
 #  You should have received a copy of the GNU Lesser General Public License
 #  along with systemd; If not, see <http://www.gnu.org/licenses/>.
-V ?= 
+
+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_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_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_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_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_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_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_CCLD_1 =
 
 AM_V_P = $(AM_V_P_$(V))
 AM_V_P_ = $(AM_V_P_$(AM_DEFAULT_VERBOSITY))
@@ -65,20 +66,20 @@ 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_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_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 = 
+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 = 
+INTLTOOL_V_MERGE_1 =
diff --git a/build-aux/Makefile.once.head/20-systemd.mk b/build-aux/Makefile.once.head/20-systemd.mk
index 0f07c88147..1c082c2483 100644
--- a/build-aux/Makefile.once.head/20-systemd.mk
+++ b/build-aux/Makefile.once.head/20-systemd.mk
@@ -20,6 +20,7 @@
 #
 #  You should have received a copy of the GNU Lesser General Public License
 #  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 AM_MAKEFLAGS = --no-print-directory
 AUTOMAKE_OPTIONS = color-tests parallel-tests
@@ -57,4 +58,3 @@ define generate-sym-test
 	$(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
-
diff --git a/build-aux/Makefile.once.tail/20-systemd.mk b/build-aux/Makefile.once.tail/20-systemd.mk
index d58c892243..9b70688fad 100644
--- a/build-aux/Makefile.once.tail/20-systemd.mk
+++ b/build-aux/Makefile.once.tail/20-systemd.mk
@@ -20,6 +20,7 @@
 #
 #  You should have received a copy of the GNU Lesser General Public License
 #  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+
 # 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
diff --git a/discard.mk b/discard.mk
index 032fbf22e8..9f4fd5578a 100644
--- a/discard.mk
+++ b/discard.mk
@@ -20,6 +20,9 @@
 #
 #  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 =
@@ -1187,3 +1190,4 @@ tests += \
 	test-libsystemd-sym \
 	test-libudev-sym
 
+include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/hwdb/Makefile b/hwdb/Makefile
index 565f62eb96..b0cd4ba300 100644
--- a/hwdb/Makefile
+++ b/hwdb/Makefile
@@ -20,6 +20,9 @@
 #
 #  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 && \
@@ -30,3 +33,4 @@ hwdb-update:
 	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
index 384aad65a0..5fe8126170 100755
--- a/move.sh
+++ b/move.sh
@@ -96,7 +96,18 @@ set -e
 
 	mv -T {man,src/systemd-activate}/systemd-activate.xml
 
+	mv -T src/libsystemd/{src,}/libsystemd.pc.in
+	mv -T src/libsystemd/{src,}/libsystemd.sym
+	mv -T src/libsystemd/{src,}/.gitignore
+	mv -T src/libsystemd/{src,libsystemd-internal}
+
 	mkdir src/systemd-shutdown
+
+	mkdir build-aux
+	mkdir build-aux/Makefile.{once,each}.{head,tail}
+	touch build-aux/Makefile.{once,each}.{head,tail}/.gitignore
+
+	mkdir src/libsystemd/libsystemd-journal-internal
 )
 
 (
@@ -122,3 +133,9 @@ set -e
         done < <(sed -r 's|^if (.*)|ifneq ($(\1),)|' <Makefile.am)
         rm .tmp.move.all
 )
+
+(
+	find src \( -name '*.h' -o -name '*.c' \) \
+	     -exec grep '#include "sd-' -l -- {} + |
+	    xargs -d $'\n' sed -ri 's|#include "(sd-[^"]*)"|#include <systemd/\1>|'
+)
diff --git a/src/ac-power/Makefile b/src/ac-power/Makefile
index 63587cffa3..b06af09332 100644
--- a/src/ac-power/Makefile
+++ b/src/ac-power/Makefile
@@ -20,9 +20,13 @@
 #
 #  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_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/boot/Makefile b/src/boot/Makefile
index 1936c6cea7..cce11f7208 100644
--- a/src/boot/Makefile
+++ b/src/boot/Makefile
@@ -20,6 +20,9 @@
 #
 #  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 = \
@@ -48,3 +51,4 @@ dist_zshcompletion_data += \
 	shell-completion/zsh/_bootctl
 endif
 
+include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/boot/efi/Makefile b/src/boot/efi/Makefile
index 747bf6925c..220a4d2175 100644
--- a/src/boot/efi/Makefile
+++ b/src/boot/efi/Makefile
@@ -20,6 +20,9 @@
 #
 #  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_boot_headers = \
 	src/boot/efi/util.h \
 	src/boot/efi/console.h \
@@ -122,3 +125,4 @@ test-efi: test-efi-disk.img
 
 EXTRA_DIST += test/test-efi-create-disk.sh
 
+include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/bus-proxyd/Makefile b/src/bus-proxyd/Makefile
index 1809ced197..fb8e2826f6 100644
--- a/src/bus-proxyd/Makefile
+++ b/src/bus-proxyd/Makefile
@@ -20,6 +20,9 @@
 #
 #  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 += \
 	libbus-proxy-core.la
 
@@ -73,3 +76,4 @@ bus-proxyd-set-cap-hook:
 INSTALL_EXEC_HOOKS += bus-proxyd-set-cap-hook
 endif
 
+include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/bus-proxyd/bus-proxyd.c b/src/bus-proxyd/bus-proxyd.c
index b6bd6eb390..17b80c3e9a 100644
--- a/src/bus-proxyd/bus-proxyd.c
+++ b/src/bus-proxyd/bus-proxyd.c
@@ -29,7 +29,7 @@
 #include <sys/socket.h>
 #include <unistd.h>
 
-#include "sd-daemon.h"
+#include <systemd/sd-daemon.h>
 
 #include "alloc-util.h"
 #include "bus-internal.h"
diff --git a/src/bus-proxyd/bus-xml-policy.c b/src/bus-proxyd/bus-xml-policy.c
index 8943e0dc12..86a8362142 100644
--- a/src/bus-proxyd/bus-xml-policy.c
+++ b/src/bus-proxyd/bus-xml-policy.c
@@ -17,7 +17,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "sd-login.h"
+#include <systemd/sd-login.h>
 
 #include "alloc-util.h"
 #include "bus-internal.h"
diff --git a/src/bus-proxyd/driver.c b/src/bus-proxyd/driver.c
index 1af5c310ea..133b2e0f39 100644
--- a/src/bus-proxyd/driver.c
+++ b/src/bus-proxyd/driver.c
@@ -23,7 +23,7 @@
 #include <stddef.h>
 #include <string.h>
 
-#include "sd-bus.h"
+#include <systemd/sd-bus.h>
 
 #include "alloc-util.h"
 #include "bus-internal.h"
diff --git a/src/bus-proxyd/driver.h b/src/bus-proxyd/driver.h
index 1630cdc7b9..cad7aa7851 100644
--- a/src/bus-proxyd/driver.h
+++ b/src/bus-proxyd/driver.h
@@ -19,7 +19,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "sd-bus.h"
+#include <systemd/sd-bus.h>
 
 #include "bus-xml-policy.h"
 #include "proxy.h"
diff --git a/src/bus-proxyd/proxy.c b/src/bus-proxyd/proxy.c
index 907d93d4c7..bcfbab0dad 100644
--- a/src/bus-proxyd/proxy.c
+++ b/src/bus-proxyd/proxy.c
@@ -26,8 +26,8 @@
 #include <sys/socket.h>
 #include <sys/types.h>
 
-#include "sd-bus.h"
-#include "sd-daemon.h"
+#include <systemd/sd-bus.h>
+#include <systemd/sd-daemon.h>
 
 #include "alloc-util.h"
 #include "bus-control.h"
diff --git a/src/bus-proxyd/proxy.h b/src/bus-proxyd/proxy.h
index d9e75cf73b..0e3ed8a87a 100644
--- a/src/bus-proxyd/proxy.h
+++ b/src/bus-proxyd/proxy.h
@@ -19,7 +19,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "sd-bus.h"
+#include <systemd/sd-bus.h>
 
 #include "bus-xml-policy.h"
 
diff --git a/src/bus-proxyd/stdio-bridge.c b/src/bus-proxyd/stdio-bridge.c
index 291c1b09e3..60c4a08325 100644
--- a/src/bus-proxyd/stdio-bridge.c
+++ b/src/bus-proxyd/stdio-bridge.c
@@ -25,8 +25,8 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "sd-bus.h"
-#include "sd-daemon.h"
+#include <systemd/sd-bus.h>
+#include <systemd/sd-daemon.h>
 
 #include "alloc-util.h"
 #include "bus-internal.h"
diff --git a/src/bus-proxyd/synthesize.c b/src/bus-proxyd/synthesize.c
index 8eea7dc5b9..7562f29ecb 100644
--- a/src/bus-proxyd/synthesize.c
+++ b/src/bus-proxyd/synthesize.c
@@ -21,7 +21,7 @@
 
 #include <stddef.h>
 
-#include "sd-bus.h"
+#include <systemd/sd-bus.h>
 
 #include "bus-internal.h"
 #include "bus-match.h"
diff --git a/src/bus-proxyd/synthesize.h b/src/bus-proxyd/synthesize.h
index 1b7197f8ec..cb8c21cdb7 100644
--- a/src/bus-proxyd/synthesize.h
+++ b/src/bus-proxyd/synthesize.h
@@ -19,7 +19,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "sd-bus.h"
+#include <systemd/sd-bus.h>
 
 #include "proxy.h"
 
diff --git a/src/bus-proxyd/test-bus-xml-policy.c b/src/bus-proxyd/test-bus-xml-policy.c
index af7c9128a2..6f32c09789 100644
--- a/src/bus-proxyd/test-bus-xml-policy.c
+++ b/src/bus-proxyd/test-bus-xml-policy.c
@@ -21,7 +21,7 @@
 #include <stddef.h>
 #include <unistd.h>
 
-#include "sd-bus.h"
+#include <systemd/sd-bus.h>
 
 #include "alloc-util.h"
 #include "bus-xml-policy.h"
diff --git a/src/coredump/Makefile b/src/coredump/Makefile
index 2773dcee91..5d7cd67de0 100644
--- a/src/coredump/Makefile
+++ b/src/coredump/Makefile
@@ -20,6 +20,9 @@
 #
 #  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 \
@@ -90,3 +93,4 @@ EXTRA_DIST += \
 	sysctl.d/50-coredump.conf.in \
 	units/systemd-coredump@.service.in
 
+include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/coredump/coredump.c b/src/coredump/coredump.c
index 085909c20c..64ce54d97f 100644
--- a/src/coredump/coredump.c
+++ b/src/coredump/coredump.c
@@ -28,9 +28,9 @@
 #include <elfutils/libdwfl.h>
 #endif
 
-#include "sd-journal.h"
-#include "sd-login.h"
-#include "sd-daemon.h"
+#include <systemd/sd-journal.h>
+#include <systemd/sd-login.h>
+#include <systemd/sd-daemon.h>
 
 #include "acl-util.h"
 #include "alloc-util.h"
diff --git a/src/coredump/coredumpctl.c b/src/coredump/coredumpctl.c
index 0034a1a0ac..5f4f710a0c 100644
--- a/src/coredump/coredumpctl.c
+++ b/src/coredump/coredumpctl.c
@@ -24,7 +24,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "sd-journal.h"
+#include <systemd/sd-journal.h>
 
 #include "alloc-util.h"
 #include "compress.h"
diff --git a/src/dbus1-generator/Makefile b/src/dbus1-generator/Makefile
index ff376241c5..1d7f0d1a81 100644
--- a/src/dbus1-generator/Makefile
+++ b/src/dbus1-generator/Makefile
@@ -20,6 +20,9 @@
 #
 #  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
 
@@ -43,3 +46,4 @@ dist_xinitrc_SCRIPTS = \
 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/debug-generator/Makefile b/src/debug-generator/Makefile
index 0789b10ae0..79684a8a7a 100644
--- a/src/debug-generator/Makefile
+++ b/src/debug-generator/Makefile
@@ -20,9 +20,13 @@
 #
 #  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_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/src/detect-virt/Makefile b/src/detect-virt/Makefile
index a3734fc193..529a3a2561 100644
--- a/src/detect-virt/Makefile
+++ b/src/detect-virt/Makefile
@@ -20,6 +20,9 @@
 #
 #  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_detect_virt_SOURCES = \
 	src/detect-virt/detect-virt.c
 
@@ -29,3 +32,4 @@ systemd_detect_virt_LDADD = \
 INSTALL_EXEC_HOOKS += \
 	systemd-detect-virt-install-hook
 
+include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/firstboot/Makefile b/src/firstboot/Makefile
index 766692e288..97f06890c5 100644
--- a/src/firstboot/Makefile
+++ b/src/firstboot/Makefile
@@ -20,6 +20,9 @@
 #
 #  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
@@ -41,3 +44,4 @@ endif
 EXTRA_DIST += \
 	units/systemd-firstboot.service.in
 
+include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/fsck/Makefile b/src/fsck/Makefile
index 3b16fa05e9..9c981837f5 100644
--- a/src/fsck/Makefile
+++ b/src/fsck/Makefile
@@ -20,9 +20,13 @@
 #
 #  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_fsck_SOURCES = \
 	src/fsck/fsck.c
 
 systemd_fsck_LDADD = \
 	libshared.la
 
+include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/fsck/fsck.c b/src/fsck/fsck.c
index 6f56066da8..f21433c0ad 100644
--- a/src/fsck/fsck.c
+++ b/src/fsck/fsck.c
@@ -27,8 +27,8 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include "sd-bus.h"
-#include "sd-device.h"
+#include <systemd/sd-bus.h>
+#include <systemd/sd-device.h>
 
 #include "alloc-util.h"
 #include "bus-common-errors.h"
diff --git a/src/fstab-generator/Makefile b/src/fstab-generator/Makefile
index 9d54f5c74d..4d201612b8 100644
--- a/src/fstab-generator/Makefile
+++ b/src/fstab-generator/Makefile
@@ -20,6 +20,9 @@
 #
 #  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_fstab_generator_SOURCES = \
 	src/fstab-generator/fstab-generator.c \
 	src/core/mount-setup.c
@@ -27,3 +30,4 @@ systemd_fstab_generator_SOURCES = \
 systemd_fstab_generator_LDADD = \
 	libshared.la
 
+include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/getty-generator/Makefile b/src/getty-generator/Makefile
index 30a2f214c9..a070f1c424 100644
--- a/src/getty-generator/Makefile
+++ b/src/getty-generator/Makefile
@@ -20,9 +20,13 @@
 #
 #  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_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/src/gpt-auto-generator/Makefile b/src/gpt-auto-generator/Makefile
index 524989e9f2..1c82e8fae8 100644
--- a/src/gpt-auto-generator/Makefile
+++ b/src/gpt-auto-generator/Makefile
@@ -20,6 +20,9 @@
 #
 #  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
@@ -37,3 +40,4 @@ systemd_gpt_auto_generator_CFLAGS = \
 	$(BLKID_CFLAGS)
 endif
 
+include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/gpt-auto-generator/gpt-auto-generator.c b/src/gpt-auto-generator/gpt-auto-generator.c
index af96adec06..a8149b8756 100644
--- a/src/gpt-auto-generator/gpt-auto-generator.c
+++ b/src/gpt-auto-generator/gpt-auto-generator.c
@@ -23,7 +23,7 @@
 #include <unistd.h>
 
 #include "libudev.h"
-#include "sd-id128.h"
+#include <systemd/sd-id128.h>
 
 #include "alloc-util.h"
 #include "blkid-util.h"
diff --git a/src/hibernate-resume/Makefile b/src/hibernate-resume/Makefile
index 73c73896a7..70f7ec7cca 100644
--- a/src/hibernate-resume/Makefile
+++ b/src/hibernate-resume/Makefile
@@ -20,6 +20,9 @@
 #
 #  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
@@ -54,3 +57,4 @@ EXTRA_DIST += \
 	units/systemd-hibernate-resume@.service.in \
 	units/systemd-hybrid-sleep.service.in
 
+include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/hostname/Makefile b/src/hostname/Makefile
index 9ea51ffc02..12b0628cb4 100644
--- a/src/hostname/Makefile
+++ b/src/hostname/Makefile
@@ -20,6 +20,9 @@
 #
 #  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
@@ -73,3 +76,4 @@ polkitpolicy_in_files += \
 EXTRA_DIST += \
 	units/systemd-hostnamed.service.in
 
+include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/hostname/hostnamectl.c b/src/hostname/hostnamectl.c
index c16a324232..aabc3b30c0 100644
--- a/src/hostname/hostnamectl.c
+++ b/src/hostname/hostnamectl.c
@@ -23,8 +23,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "sd-bus.h"
-#include "sd-id128.h"
+#include <systemd/sd-bus.h>
+#include <systemd/sd-id128.h>
 
 #include "alloc-util.h"
 #include "architecture.h"
diff --git a/src/import/Makefile b/src/import/Makefile
index 03de5589aa..aefe6d615b 100644
--- a/src/import/Makefile
+++ b/src/import/Makefile
@@ -20,6 +20,9 @@
 #
 #  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),)
@@ -185,3 +188,4 @@ EXTRA_DIST += \
 	units/systemd-importd.service.in
 
 
+include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/import/curl-util.h b/src/import/curl-util.h
index a758cc5640..2e71bd3b5d 100644
--- a/src/import/curl-util.h
+++ b/src/import/curl-util.h
@@ -22,7 +22,7 @@
 #include <curl/curl.h>
 #include <sys/types.h>
 
-#include "sd-event.h"
+#include <systemd/sd-event.h>
 
 #include "hashmap.h"
 
diff --git a/src/import/export-raw.c b/src/import/export-raw.c
index db06e11b87..658f835132 100644
--- a/src/import/export-raw.c
+++ b/src/import/export-raw.c
@@ -25,7 +25,7 @@
 #include <libgen.h>
 #undef basename
 
-#include "sd-daemon.h"
+#include <systemd/sd-daemon.h>
 
 #include "alloc-util.h"
 #include "btrfs-util.h"
diff --git a/src/import/export-raw.h b/src/import/export-raw.h
index 8e723d4908..c7ac134603 100644
--- a/src/import/export-raw.h
+++ b/src/import/export-raw.h
@@ -19,7 +19,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "sd-event.h"
+#include <systemd/sd-event.h>
 
 #include "import-compress.h"
 #include "macro.h"
diff --git a/src/import/export-tar.c b/src/import/export-tar.c
index d79c27f2d0..9c511984c1 100644
--- a/src/import/export-tar.c
+++ b/src/import/export-tar.c
@@ -17,7 +17,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "sd-daemon.h"
+#include <systemd/sd-daemon.h>
 
 #include "alloc-util.h"
 #include "btrfs-util.h"
diff --git a/src/import/export-tar.h b/src/import/export-tar.h
index 1e3c8bb80c..50206cabb3 100644
--- a/src/import/export-tar.h
+++ b/src/import/export-tar.h
@@ -19,7 +19,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "sd-event.h"
+#include <systemd/sd-event.h>
 
 #include "import-compress.h"
 #include "macro.h"
diff --git a/src/import/export.c b/src/import/export.c
index cc98c33ef6..0a5efe5476 100644
--- a/src/import/export.c
+++ b/src/import/export.c
@@ -19,7 +19,7 @@
 
 #include <getopt.h>
 
-#include "sd-event.h"
+#include <systemd/sd-event.h>
 
 #include "alloc-util.h"
 #include "export-raw.h"
diff --git a/src/import/import-raw.c b/src/import/import-raw.c
index fd6b9f7703..ce37392707 100644
--- a/src/import/import-raw.c
+++ b/src/import/import-raw.c
@@ -19,8 +19,8 @@
 
 #include <linux/fs.h>
 
-#include "sd-daemon.h"
-#include "sd-event.h"
+#include <systemd/sd-daemon.h>
+#include <systemd/sd-event.h>
 
 #include "alloc-util.h"
 #include "btrfs-util.h"
diff --git a/src/import/import-raw.h b/src/import/import-raw.h
index 4f543e0883..f0a315c088 100644
--- a/src/import/import-raw.h
+++ b/src/import/import-raw.h
@@ -19,7 +19,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "sd-event.h"
+#include <systemd/sd-event.h>
 
 #include "import-util.h"
 #include "macro.h"
diff --git a/src/import/import-tar.c b/src/import/import-tar.c
index 8b81324fde..016d05e77d 100644
--- a/src/import/import-tar.c
+++ b/src/import/import-tar.c
@@ -19,8 +19,8 @@
 
 #include <linux/fs.h>
 
-#include "sd-daemon.h"
-#include "sd-event.h"
+#include <systemd/sd-daemon.h>
+#include <systemd/sd-event.h>
 
 #include "alloc-util.h"
 #include "btrfs-util.h"
diff --git a/src/import/import-tar.h b/src/import/import-tar.h
index 24abe06c8f..b66b00ddfd 100644
--- a/src/import/import-tar.h
+++ b/src/import/import-tar.h
@@ -19,7 +19,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "sd-event.h"
+#include <systemd/sd-event.h>
 
 #include "import-util.h"
 #include "macro.h"
diff --git a/src/import/import.c b/src/import/import.c
index 4e442ee84a..338847dbc2 100644
--- a/src/import/import.c
+++ b/src/import/import.c
@@ -19,7 +19,7 @@
 
 #include <getopt.h>
 
-#include "sd-event.h"
+#include <systemd/sd-event.h>
 
 #include "alloc-util.h"
 #include "fd-util.h"
diff --git a/src/import/importd.c b/src/import/importd.c
index d2a5867a6e..b44d0525ae 100644
--- a/src/import/importd.c
+++ b/src/import/importd.c
@@ -19,7 +19,7 @@
 
 #include <sys/prctl.h>
 
-#include "sd-bus.h"
+#include <systemd/sd-bus.h>
 
 #include "alloc-util.h"
 #include "bus-common-errors.h"
diff --git a/src/import/pull-raw.c b/src/import/pull-raw.c
index 8a16602c3e..ca49f0c7d7 100644
--- a/src/import/pull-raw.c
+++ b/src/import/pull-raw.c
@@ -21,7 +21,7 @@
 #include <linux/fs.h>
 #include <sys/xattr.h>
 
-#include "sd-daemon.h"
+#include <systemd/sd-daemon.h>
 
 #include "alloc-util.h"
 #include "btrfs-util.h"
diff --git a/src/import/pull-raw.h b/src/import/pull-raw.h
index 8f6d16eb3a..6bafa6dafd 100644
--- a/src/import/pull-raw.h
+++ b/src/import/pull-raw.h
@@ -19,7 +19,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "sd-event.h"
+#include <systemd/sd-event.h>
 
 #include "import-util.h"
 #include "macro.h"
diff --git a/src/import/pull-tar.c b/src/import/pull-tar.c
index afb13366f0..1fed468b7e 100644
--- a/src/import/pull-tar.c
+++ b/src/import/pull-tar.c
@@ -20,7 +20,7 @@
 #include <curl/curl.h>
 #include <sys/prctl.h>
 
-#include "sd-daemon.h"
+#include <systemd/sd-daemon.h>
 
 #include "alloc-util.h"
 #include "btrfs-util.h"
diff --git a/src/import/pull-tar.h b/src/import/pull-tar.h
index 7e63e496d8..9ff5bd5953 100644
--- a/src/import/pull-tar.h
+++ b/src/import/pull-tar.h
@@ -19,7 +19,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "sd-event.h"
+#include <systemd/sd-event.h>
 
 #include "import-util.h"
 #include "macro.h"
diff --git a/src/import/pull.c b/src/import/pull.c
index 72604a6a74..74df24f993 100644
--- a/src/import/pull.c
+++ b/src/import/pull.c
@@ -19,7 +19,7 @@
 
 #include <getopt.h>
 
-#include "sd-event.h"
+#include <systemd/sd-event.h>
 
 #include "alloc-util.h"
 #include "hostname-util.h"
diff --git a/src/initctl/Makefile b/src/initctl/Makefile
index 5dc22983e0..b63a2e47d9 100644
--- a/src/initctl/Makefile
+++ b/src/initctl/Makefile
@@ -20,9 +20,13 @@
 #
 #  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_initctl_SOURCES = \
 	src/initctl/initctl.c
 
 systemd_initctl_LDADD = \
 	libshared.la
 
+include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/initctl/initctl.c b/src/initctl/initctl.c
index 3e57afb997..27f1fd04a1 100644
--- a/src/initctl/initctl.c
+++ b/src/initctl/initctl.c
@@ -23,8 +23,8 @@
 #include <sys/epoll.h>
 #include <unistd.h>
 
-#include "sd-bus.h"
-#include "sd-daemon.h"
+#include <systemd/sd-bus.h>
+#include <systemd/sd-daemon.h>
 
 #include "alloc-util.h"
 #include "bus-error.h"
diff --git a/src/journal-remote/Makefile b/src/journal-remote/Makefile
index df233886df..302f326303 100644
--- a/src/journal-remote/Makefile
+++ b/src/journal-remote/Makefile
@@ -20,6 +20,9 @@
 #
 #  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
@@ -107,3 +110,4 @@ 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/journal-remote/journal-gatewayd.c b/src/journal-remote/journal-gatewayd.c
index 3b9adb53e1..0e27a80cf2 100644
--- a/src/journal-remote/journal-gatewayd.c
+++ b/src/journal-remote/journal-gatewayd.c
@@ -27,9 +27,9 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "sd-bus.h"
-#include "sd-daemon.h"
-#include "sd-journal.h"
+#include <systemd/sd-bus.h>
+#include <systemd/sd-daemon.h>
+#include <systemd/sd-journal.h>
 
 #include "alloc-util.h"
 #include "bus-util.h"
diff --git a/src/journal-remote/journal-remote-parse.h b/src/journal-remote/journal-remote-parse.h
index 0b8b6af736..91c5650798 100644
--- a/src/journal-remote/journal-remote-parse.h
+++ b/src/journal-remote/journal-remote-parse.h
@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include "sd-event.h"
+#include <systemd/sd-event.h>
 
 #include "journal-remote-write.h"
 
diff --git a/src/journal-remote/journal-remote.c b/src/journal-remote/journal-remote.c
index 3ce6fe27b3..db8772d3e6 100644
--- a/src/journal-remote/journal-remote.c
+++ b/src/journal-remote/journal-remote.c
@@ -31,7 +31,7 @@
 #include <gnutls/gnutls.h>
 #endif
 
-#include "sd-daemon.h"
+#include <systemd/sd-daemon.h>
 
 #include "alloc-util.h"
 #include "conf-parser.h"
diff --git a/src/journal-remote/journal-remote.h b/src/journal-remote/journal-remote.h
index 6466a1c101..de83388eef 100644
--- a/src/journal-remote/journal-remote.h
+++ b/src/journal-remote/journal-remote.h
@@ -20,7 +20,7 @@
 #pragma once
 
 
-#include "sd-event.h"
+#include <systemd/sd-event.h>
 
 #include "hashmap.h"
 #include "journal-remote-parse.h"
diff --git a/src/journal-remote/journal-upload.c b/src/journal-remote/journal-upload.c
index 440563e7d3..be3012209c 100644
--- a/src/journal-remote/journal-upload.c
+++ b/src/journal-remote/journal-upload.c
@@ -23,7 +23,7 @@
 #include <stdio.h>
 #include <sys/stat.h>
 
-#include "sd-daemon.h"
+#include <systemd/sd-daemon.h>
 
 #include "alloc-util.h"
 #include "conf-parser.h"
diff --git a/src/journal-remote/journal-upload.h b/src/journal-remote/journal-upload.h
index b8cd04d527..40f64dfc60 100644
--- a/src/journal-remote/journal-upload.h
+++ b/src/journal-remote/journal-upload.h
@@ -2,8 +2,8 @@
 
 #include <inttypes.h>
 
-#include "sd-event.h"
-#include "sd-journal.h"
+#include <systemd/sd-event.h>
+#include <systemd/sd-journal.h>
 
 typedef enum {
         ENTRY_CURSOR = 0,           /* Nothing actually written yet. */
diff --git a/src/journal/Makefile b/src/journal/Makefile
index dc58b8c1a6..1334a155d3 100644
--- a/src/journal/Makefile
+++ b/src/journal/Makefile
@@ -20,6 +20,9 @@
 #
 #  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
@@ -354,3 +357,4 @@ endif
 EXTRA_DIST += \
 	units/systemd-journal-gatewayd.service.in
 
+include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/journal/cat.c b/src/journal/cat.c
index 08c844d44f..93ab6e7f96 100644
--- a/src/journal/cat.c
+++ b/src/journal/cat.c
@@ -24,7 +24,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 
-#include "sd-journal.h"
+#include <systemd/sd-journal.h>
 
 #include "fd-util.h"
 #include "parse-util.h"
diff --git a/src/journal/catalog.c b/src/journal/catalog.c
index 164a3a15f2..962ca238b9 100644
--- a/src/journal/catalog.c
+++ b/src/journal/catalog.c
@@ -25,7 +25,7 @@
 #include <sys/mman.h>
 #include <unistd.h>
 
-#include "sd-id128.h"
+#include <systemd/sd-id128.h>
 
 #include "alloc-util.h"
 #include "catalog.h"
diff --git a/src/journal/catalog.h b/src/journal/catalog.h
index 1b1014b335..b621de3068 100644
--- a/src/journal/catalog.h
+++ b/src/journal/catalog.h
@@ -21,7 +21,7 @@
 
 #include <stdbool.h>
 
-#include "sd-id128.h"
+#include <systemd/sd-id128.h>
 
 #include "hashmap.h"
 #include "strbuf.h"
diff --git a/src/journal/journal-def.h b/src/journal/journal-def.h
index 67edb43960..a0a052ce4f 100644
--- a/src/journal/journal-def.h
+++ b/src/journal/journal-def.h
@@ -19,7 +19,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "sd-id128.h"
+#include <systemd/sd-id128.h>
 
 #include "macro.h"
 #include "sparse-endian.h"
diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c
index 912eb94d0a..4ea7013a53 100644
--- a/src/journal/journal-file.c
+++ b/src/journal/journal-file.c
@@ -37,7 +37,7 @@
 #include "lookup3.h"
 #include "parse-util.h"
 #include "random-util.h"
-#include "sd-event.h"
+#include <systemd/sd-event.h>
 #include "string-util.h"
 #include "xattr-util.h"
 
diff --git a/src/journal/journal-file.h b/src/journal/journal-file.h
index 07b9561b8a..0414117d98 100644
--- a/src/journal/journal-file.h
+++ b/src/journal/journal-file.h
@@ -25,13 +25,13 @@
 #include <gcrypt.h>
 #endif
 
-#include "sd-id128.h"
+#include <systemd/sd-id128.h>
 
 #include "hashmap.h"
 #include "journal-def.h"
 #include "macro.h"
 #include "mmap-cache.h"
-#include "sd-event.h"
+#include <systemd/sd-event.h>
 #include "sparse-endian.h"
 
 typedef struct JournalMetrics {
diff --git a/src/journal/journal-internal.h b/src/journal/journal-internal.h
index 7639325acf..8f21544ae1 100644
--- a/src/journal/journal-internal.h
+++ b/src/journal/journal-internal.h
@@ -23,8 +23,8 @@
 #include <stdbool.h>
 #include <sys/types.h>
 
-#include "sd-id128.h"
-#include "sd-journal.h"
+#include <systemd/sd-id128.h>
+#include <systemd/sd-journal.h>
 
 #include "hashmap.h"
 #include "journal-def.h"
diff --git a/src/journal/journal-qrcode.h b/src/journal/journal-qrcode.h
index ef39085561..34a779d5be 100644
--- a/src/journal/journal-qrcode.h
+++ b/src/journal/journal-qrcode.h
@@ -22,6 +22,6 @@
 #include <inttypes.h>
 #include <stdio.h>
 
-#include "sd-id128.h"
+#include <systemd/sd-id128.h>
 
 int print_qr_code(FILE *f, const void *seed, size_t seed_size, uint64_t start, uint64_t interval, const char *hn, sd_id128_t machine);
diff --git a/src/journal/journal-send.c b/src/journal/journal-send.c
index c7d670f4ff..b85d9d3c61 100644
--- a/src/journal/journal-send.c
+++ b/src/journal/journal-send.c
@@ -27,7 +27,7 @@
 
 #define SD_JOURNAL_SUPPRESS_LOCATION
 
-#include "sd-journal.h"
+#include <systemd/sd-journal.h>
 
 #include "alloc-util.h"
 #include "fd-util.h"
diff --git a/src/journal/journal-vacuum.c b/src/journal/journal-vacuum.c
index 05e97620ae..3650ab3865 100644
--- a/src/journal/journal-vacuum.c
+++ b/src/journal/journal-vacuum.c
@@ -21,7 +21,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include "sd-id128.h"
+#include <systemd/sd-id128.h>
 
 #include "alloc-util.h"
 #include "dirent-util.h"
diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
index 273242bea6..1670978466 100644
--- a/src/journal/journalctl.c
+++ b/src/journal/journalctl.c
@@ -33,8 +33,8 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include "sd-bus.h"
-#include "sd-journal.h"
+#include <systemd/sd-bus.h>
+#include <systemd/sd-journal.h>
 
 #include "acl-util.h"
 #include "alloc-util.h"
diff --git a/src/journal/journald-kmsg.c b/src/journal/journald-kmsg.c
index eb1ac90e98..1ac57bb361 100644
--- a/src/journal/journald-kmsg.c
+++ b/src/journal/journald-kmsg.c
@@ -24,7 +24,7 @@
 #include <unistd.h>
 
 #include "libudev.h"
-#include "sd-messages.h"
+#include <systemd/sd-messages.h>
 
 #include "escape.h"
 #include "fd-util.h"
diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c
index ee2db8d29f..4f53bf01c3 100644
--- a/src/journal/journald-server.c
+++ b/src/journal/journald-server.c
@@ -27,9 +27,9 @@
 #include <linux/sockios.h>
 
 #include "libudev.h"
-#include "sd-daemon.h"
-#include "sd-journal.h"
-#include "sd-messages.h"
+#include <systemd/sd-daemon.h>
+#include <systemd/sd-journal.h>
+#include <systemd/sd-messages.h>
 
 #include "acl-util.h"
 #include "alloc-util.h"
diff --git a/src/journal/journald-server.h b/src/journal/journald-server.h
index b9551dda1b..cb8a5bbe9b 100644
--- a/src/journal/journald-server.h
+++ b/src/journal/journald-server.h
@@ -22,7 +22,7 @@
 #include <stdbool.h>
 #include <sys/types.h>
 
-#include "sd-event.h"
+#include <systemd/sd-event.h>
 
 typedef struct Server Server;
 
diff --git a/src/journal/journald-stream.c b/src/journal/journald-stream.c
index 6e8b405b53..583b1305ae 100644
--- a/src/journal/journald-stream.c
+++ b/src/journal/journald-stream.c
@@ -24,8 +24,8 @@
 #include <selinux/selinux.h>
 #endif
 
-#include "sd-daemon.h"
-#include "sd-event.h"
+#include <systemd/sd-daemon.h>
+#include <systemd/sd-event.h>
 
 #include "alloc-util.h"
 #include "dirent-util.h"
diff --git a/src/journal/journald-syslog.c b/src/journal/journald-syslog.c
index 5153fd0cce..480a1cc405 100644
--- a/src/journal/journald-syslog.c
+++ b/src/journal/journald-syslog.c
@@ -21,7 +21,7 @@
 #include <sys/epoll.h>
 #include <unistd.h>
 
-#include "sd-messages.h"
+#include <systemd/sd-messages.h>
 
 #include "alloc-util.h"
 #include "fd-util.h"
diff --git a/src/journal/journald.c b/src/journal/journald.c
index 272acb71c4..1afe44fa8e 100644
--- a/src/journal/journald.c
+++ b/src/journal/journald.c
@@ -19,8 +19,8 @@
 
 #include <unistd.h>
 
-#include "sd-daemon.h"
-#include "sd-messages.h"
+#include <systemd/sd-daemon.h>
+#include <systemd/sd-messages.h>
 
 #include "formats-util.h"
 #include "journal-authenticate.h"
diff --git a/src/journal/sd-journal.c b/src/journal/sd-journal.c
index 5a2a28a8d4..1493f0348d 100644
--- a/src/journal/sd-journal.c
+++ b/src/journal/sd-journal.c
@@ -26,7 +26,7 @@
 #include <sys/vfs.h>
 #include <unistd.h>
 
-#include "sd-journal.h"
+#include <systemd/sd-journal.h>
 
 #include "alloc-util.h"
 #include "catalog.h"
diff --git a/src/journal/test-catalog.c b/src/journal/test-catalog.c
index da6fcbca4d..6f2f9f5561 100644
--- a/src/journal/test-catalog.c
+++ b/src/journal/test-catalog.c
@@ -23,7 +23,7 @@
 #include <locale.h>
 #include <unistd.h>
 
-#include "sd-messages.h"
+#include <systemd/sd-messages.h>
 
 #include "alloc-util.h"
 #include "catalog.h"
diff --git a/src/journal/test-journal-enum.c b/src/journal/test-journal-enum.c
index e5e9d9dcb3..ffdc317e1d 100644
--- a/src/journal/test-journal-enum.c
+++ b/src/journal/test-journal-enum.c
@@ -19,7 +19,7 @@
 
 #include <stdio.h>
 
-#include "sd-journal.h"
+#include <systemd/sd-journal.h>
 
 #include "journal-internal.h"
 #include "log.h"
diff --git a/src/journal/test-journal-flush.c b/src/journal/test-journal-flush.c
index 7bd9c40366..3dee462e74 100644
--- a/src/journal/test-journal-flush.c
+++ b/src/journal/test-journal-flush.c
@@ -19,7 +19,7 @@
 
 #include <fcntl.h>
 
-#include "sd-journal.h"
+#include <systemd/sd-journal.h>
 
 #include "alloc-util.h"
 #include "journal-file.h"
diff --git a/src/journal/test-journal-init.c b/src/journal/test-journal-init.c
index ef21e2d05f..e6713034dd 100644
--- a/src/journal/test-journal-init.c
+++ b/src/journal/test-journal-init.c
@@ -17,7 +17,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "sd-journal.h"
+#include <systemd/sd-journal.h>
 
 #include "log.h"
 #include "parse-util.h"
diff --git a/src/journal/test-journal-interleaving.c b/src/journal/test-journal-interleaving.c
index 7f94990888..b47182dbfd 100644
--- a/src/journal/test-journal-interleaving.c
+++ b/src/journal/test-journal-interleaving.c
@@ -21,7 +21,7 @@
 #include <fcntl.h>
 #include <unistd.h>
 
-#include "sd-journal.h"
+#include <systemd/sd-journal.h>
 
 #include "alloc-util.h"
 #include "journal-file.h"
diff --git a/src/journal/test-journal-match.c b/src/journal/test-journal-match.c
index 3ab554b9b0..5ee2adb827 100644
--- a/src/journal/test-journal-match.c
+++ b/src/journal/test-journal-match.c
@@ -19,7 +19,7 @@
 
 #include <stdio.h>
 
-#include "sd-journal.h"
+#include <systemd/sd-journal.h>
 
 #include "alloc-util.h"
 #include "journal-internal.h"
diff --git a/src/journal/test-journal-send.c b/src/journal/test-journal-send.c
index d70f0b0bc8..169082f9a4 100644
--- a/src/journal/test-journal-send.c
+++ b/src/journal/test-journal-send.c
@@ -21,7 +21,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 
-#include "sd-journal.h"
+#include <systemd/sd-journal.h>
 
 #include "macro.h"
 
diff --git a/src/journal/test-journal-stream.c b/src/journal/test-journal-stream.c
index 4e6f8c0f7b..57c6c0872d 100644
--- a/src/journal/test-journal-stream.c
+++ b/src/journal/test-journal-stream.c
@@ -20,7 +20,7 @@
 #include <fcntl.h>
 #include <unistd.h>
 
-#include "sd-journal.h"
+#include <systemd/sd-journal.h>
 
 #include "alloc-util.h"
 #include "journal-file.h"
diff --git a/src/kernel-install/Makefile b/src/kernel-install/Makefile
index 9518ba1283..d50b684d01 100644
--- a/src/kernel-install/Makefile
+++ b/src/kernel-install/Makefile
@@ -21,7 +21,7 @@
 #  You should have received a copy of the GNU Lesser General Public License
 #  along with systemd; If not, see <http://www.gnu.org/licenses/>.
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
-include $(topsrcdir)/automake.head.mk
+include $(topsrcdir)/build-aux/Makefile.head.mk
 
 dist_bin_SCRIPTS = \
 	src/kernel-install/kernel-install
@@ -30,4 +30,4 @@ dist_kernelinstall_SCRIPTS = \
 	src/kernel-install/50-depmod.install \
 	src/kernel-install/90-loaderentry.install
 
-include $(topsrcdir)/automake.tail.mk
+include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/libbasic/Makefile b/src/libbasic/Makefile
index 51ee19aad4..278b061cb2 100644
--- a/src/libbasic/Makefile
+++ b/src/libbasic/Makefile
@@ -23,6 +23,9 @@
 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/capability-util.c \
diff --git a/src/libcore/Makefile b/src/libcore/Makefile
index 90241bfba2..935c0c968c 100644
--- a/src/libcore/Makefile
+++ b/src/libcore/Makefile
@@ -20,6 +20,9 @@
 #
 #  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
 
@@ -166,3 +169,4 @@ src/core/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/libcore/dbus-cgroup.h b/src/libcore/dbus-cgroup.h
index b2212fe44e..84d0f1ba04 100644
--- a/src/libcore/dbus-cgroup.h
+++ b/src/libcore/dbus-cgroup.h
@@ -19,7 +19,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "sd-bus.h"
+#include <systemd/sd-bus.h>
 
 #include "cgroup.h"
 
diff --git a/src/libcore/dbus-execute.h b/src/libcore/dbus-execute.h
index d0aa8e1dd5..bdfef41db4 100644
--- a/src/libcore/dbus-execute.h
+++ b/src/libcore/dbus-execute.h
@@ -19,7 +19,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "sd-bus.h"
+#include <systemd/sd-bus.h>
 
 #include "execute.h"
 
diff --git a/src/libcore/dbus-job.c b/src/libcore/dbus-job.c
index 97a93fb2f1..337cef8a4f 100644
--- a/src/libcore/dbus-job.c
+++ b/src/libcore/dbus-job.c
@@ -17,7 +17,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "sd-bus.h"
+#include <systemd/sd-bus.h>
 
 #include "alloc-util.h"
 #include "dbus-job.h"
diff --git a/src/libcore/dbus-job.h b/src/libcore/dbus-job.h
index 024d06719e..95664cb90c 100644
--- a/src/libcore/dbus-job.h
+++ b/src/libcore/dbus-job.h
@@ -19,7 +19,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "sd-bus.h"
+#include <systemd/sd-bus.h>
 
 #include "job.h"
 
diff --git a/src/libcore/dbus-kill.h b/src/libcore/dbus-kill.h
index b9b18811e3..b32ce9d223 100644
--- a/src/libcore/dbus-kill.h
+++ b/src/libcore/dbus-kill.h
@@ -19,7 +19,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "sd-bus.h"
+#include <systemd/sd-bus.h>
 
 #include "kill.h"
 #include "unit.h"
diff --git a/src/libcore/dbus-mount.h b/src/libcore/dbus-mount.h
index ec16166d36..f9844e449d 100644
--- a/src/libcore/dbus-mount.h
+++ b/src/libcore/dbus-mount.h
@@ -19,7 +19,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "sd-bus.h"
+#include <systemd/sd-bus.h>
 
 #include "unit.h"
 
diff --git a/src/libcore/dbus-scope.h b/src/libcore/dbus-scope.h
index 270306f508..f96ddef0cf 100644
--- a/src/libcore/dbus-scope.h
+++ b/src/libcore/dbus-scope.h
@@ -19,7 +19,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "sd-bus.h"
+#include <systemd/sd-bus.h>
 
 #include "unit.h"
 
diff --git a/src/libcore/dbus-service.h b/src/libcore/dbus-service.h
index 769a53769e..291959325c 100644
--- a/src/libcore/dbus-service.h
+++ b/src/libcore/dbus-service.h
@@ -19,7 +19,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "sd-bus.h"
+#include <systemd/sd-bus.h>
 
 #include "unit.h"
 
diff --git a/src/libcore/dbus-slice.h b/src/libcore/dbus-slice.h
index 52ceebb135..8e4cabbf8a 100644
--- a/src/libcore/dbus-slice.h
+++ b/src/libcore/dbus-slice.h
@@ -19,7 +19,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "sd-bus.h"
+#include <systemd/sd-bus.h>
 
 #include "unit.h"
 
diff --git a/src/libcore/dbus-socket.h b/src/libcore/dbus-socket.h
index 7a792c7a89..a31906feea 100644
--- a/src/libcore/dbus-socket.h
+++ b/src/libcore/dbus-socket.h
@@ -19,7 +19,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "sd-bus.h"
+#include <systemd/sd-bus.h>
 
 #include "unit.h"
 
diff --git a/src/libcore/dbus-swap.h b/src/libcore/dbus-swap.h
index 5238471f98..19151fb771 100644
--- a/src/libcore/dbus-swap.h
+++ b/src/libcore/dbus-swap.h
@@ -20,7 +20,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "sd-bus.h"
+#include <systemd/sd-bus.h>
 
 #include "unit.h"
 
diff --git a/src/libcore/dbus-target.h b/src/libcore/dbus-target.h
index 9be5ce06b7..c97a9d626e 100644
--- a/src/libcore/dbus-target.h
+++ b/src/libcore/dbus-target.h
@@ -19,6 +19,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "sd-bus.h"
+#include <systemd/sd-bus.h>
 
 extern const sd_bus_vtable bus_target_vtable[];
diff --git a/src/libcore/dbus-timer.h b/src/libcore/dbus-timer.h
index 39053dc4a2..505fb5df72 100644
--- a/src/libcore/dbus-timer.h
+++ b/src/libcore/dbus-timer.h
@@ -19,7 +19,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "sd-bus.h"
+#include <systemd/sd-bus.h>
 
 #include "unit.h"
 
diff --git a/src/libcore/dbus-unit.c b/src/libcore/dbus-unit.c
index b351f6a2c2..9a09f59fc2 100644
--- a/src/libcore/dbus-unit.c
+++ b/src/libcore/dbus-unit.c
@@ -17,7 +17,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "sd-bus.h"
+#include <systemd/sd-bus.h>
 
 #include "alloc-util.h"
 #include "bus-common-errors.h"
diff --git a/src/libcore/dbus-unit.h b/src/libcore/dbus-unit.h
index 07948b9cd0..1a0070fce6 100644
--- a/src/libcore/dbus-unit.h
+++ b/src/libcore/dbus-unit.h
@@ -19,7 +19,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "sd-bus.h"
+#include <systemd/sd-bus.h>
 
 #include "unit.h"
 
diff --git a/src/libcore/dbus.c b/src/libcore/dbus.c
index 413489373f..dc939b023a 100644
--- a/src/libcore/dbus.c
+++ b/src/libcore/dbus.c
@@ -21,7 +21,7 @@
 #include <sys/epoll.h>
 #include <unistd.h>
 
-#include "sd-bus.h"
+#include <systemd/sd-bus.h>
 
 #include "alloc-util.h"
 #include "bus-common-errors.h"
diff --git a/src/libcore/execute.c b/src/libcore/execute.c
index 1e4630182d..6fd35c8350 100644
--- a/src/libcore/execute.c
+++ b/src/libcore/execute.c
@@ -48,7 +48,7 @@
 #include <sys/apparmor.h>
 #endif
 
-#include "sd-messages.h"
+#include <systemd/sd-messages.h>
 
 #include "af-list.h"
 #include "alloc-util.h"
diff --git a/src/libcore/job.c b/src/libcore/job.c
index 97304c4d05..1e2f12bba0 100644
--- a/src/libcore/job.c
+++ b/src/libcore/job.c
@@ -19,8 +19,8 @@
 
 #include <errno.h>
 
-#include "sd-id128.h"
-#include "sd-messages.h"
+#include <systemd/sd-id128.h>
+#include <systemd/sd-messages.h>
 
 #include "alloc-util.h"
 #include "async.h"
diff --git a/src/libcore/job.h b/src/libcore/job.h
index 856b0ce829..de130303d2 100644
--- a/src/libcore/job.h
+++ b/src/libcore/job.h
@@ -21,7 +21,7 @@
 
 #include <stdbool.h>
 
-#include "sd-event.h"
+#include <systemd/sd-event.h>
 
 #include "list.h"
 #include "unit-name.h"
diff --git a/src/libcore/machine-id-setup.c b/src/libcore/machine-id-setup.c
index 9e6b3d3292..30f27ffc67 100644
--- a/src/libcore/machine-id-setup.c
+++ b/src/libcore/machine-id-setup.c
@@ -25,7 +25,7 @@
 #include <sys/mount.h>
 #include <unistd.h>
 
-#include "sd-id128.h"
+#include <systemd/sd-id128.h>
 
 #include "alloc-util.h"
 #include "fd-util.h"
diff --git a/src/libcore/manager.c b/src/libcore/manager.c
index f36cf5e320..9a34742cf6 100644
--- a/src/libcore/manager.c
+++ b/src/libcore/manager.c
@@ -35,8 +35,8 @@
 #include <libaudit.h>
 #endif
 
-#include "sd-daemon.h"
-#include "sd-messages.h"
+#include <systemd/sd-daemon.h>
+#include <systemd/sd-messages.h>
 
 #include "alloc-util.h"
 #include "audit-fd.h"
diff --git a/src/libcore/manager.h b/src/libcore/manager.h
index 9803f73129..d6c97d8f3b 100644
--- a/src/libcore/manager.h
+++ b/src/libcore/manager.h
@@ -23,8 +23,8 @@
 #include <stdbool.h>
 #include <stdio.h>
 
-#include "sd-bus.h"
-#include "sd-event.h"
+#include <systemd/sd-bus.h>
+#include <systemd/sd-event.h>
 
 #include "cgroup-util.h"
 #include "fdset.h"
diff --git a/src/libcore/mount.c b/src/libcore/mount.c
index de1075d3a0..d573e92759 100644
--- a/src/libcore/mount.c
+++ b/src/libcore/mount.c
@@ -22,7 +22,7 @@
 #include <stdio.h>
 #include <sys/epoll.h>
 
-#include "sd-messages.h"
+#include <systemd/sd-messages.h>
 
 #include "alloc-util.h"
 #include "dbus-mount.h"
diff --git a/src/libcore/selinux-access.c b/src/libcore/selinux-access.c
index 2cdfcf7b5d..76fcc9a6be 100644
--- a/src/libcore/selinux-access.c
+++ b/src/libcore/selinux-access.c
@@ -29,7 +29,7 @@
 #include <libaudit.h>
 #endif
 
-#include "sd-bus.h"
+#include <systemd/sd-bus.h>
 
 #include "alloc-util.h"
 #include "audit-fd.h"
diff --git a/src/libcore/selinux-access.h b/src/libcore/selinux-access.h
index 8f1f058a32..cbf33ef6c4 100644
--- a/src/libcore/selinux-access.h
+++ b/src/libcore/selinux-access.h
@@ -19,7 +19,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "sd-bus.h"
+#include <systemd/sd-bus.h>
 
 #include "bus-util.h"
 #include "manager.h"
diff --git a/src/libcore/socket.c b/src/libcore/socket.c
index 976687af41..f36e312f7b 100644
--- a/src/libcore/socket.c
+++ b/src/libcore/socket.c
@@ -28,7 +28,7 @@
 #include <unistd.h>
 #include <linux/sctp.h>
 
-#include "sd-event.h"
+#include <systemd/sd-event.h>
 #include "alloc-util.h"
 #include "bus-error.h"
 #include "bus-util.h"
diff --git a/src/libcore/unit.c b/src/libcore/unit.c
index d39e3dcaeb..4f7c0e2449 100644
--- a/src/libcore/unit.c
+++ b/src/libcore/unit.c
@@ -23,8 +23,8 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include "sd-id128.h"
-#include "sd-messages.h"
+#include <systemd/sd-id128.h>
+#include <systemd/sd-messages.h>
 
 #include "alloc-util.h"
 #include "bus-common-errors.h"
diff --git a/src/libfirewall/Makefile b/src/libfirewall/Makefile
index a6a4bc9ebc..aeeb191c33 100644
--- a/src/libfirewall/Makefile
+++ b/src/libfirewall/Makefile
@@ -21,10 +21,16 @@
 #  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)/automake.head.mk
+include $(topsrcdir)/build-aux/Makefile.head.mk
+
+ifneq ($(HAVE_LIBIPTC),)
+noinst_LTLIBRARIES += \
+	libfirewall.la
 
 std.out_files = libfirewall.la
 CPPFLAGS += $(libbasic.CPPFLAGS) $(libiptc.CPPFLAGS)
 $(outdir)/libfirewall.la: $(outdir)/firewall-util.lo $(libiptc.DEPENDS)
 
-include $(topsrcdir)/automake.tail.mk
+endif
+
+include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/libshared/Makefile b/src/libshared/Makefile
index 66a38ea7f8..3c260f5ae6 100644
--- a/src/libshared/Makefile
+++ b/src/libshared/Makefile
@@ -21,7 +21,7 @@
 #  You should have received a copy of the GNU Lesser General Public License
 #  along with systemd; If not, see <http://www.gnu.org/licenses/>.
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
-include $(topsrcdir)/automake.head.mk
+include $(topsrcdir)/build-aux/Makefile.head.mk
 
 noinst_LTLIBRARIES += \
 	libshared.la
@@ -149,4 +149,4 @@ $(outdir)/libshared.la: \
 
 $(call amtarget2dir,src/shared,libshared.la)
 
-include $(topsrcdir)/automake.tail.mk
+include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/libshared/bus-util.c b/src/libshared/bus-util.c
index 38557f0b8d..a874bb84cc 100644
--- a/src/libshared/bus-util.c
+++ b/src/libshared/bus-util.c
@@ -28,11 +28,11 @@
 #include <sys/socket.h>
 #include <unistd.h>
 
-#include "sd-bus-protocol.h"
-#include "sd-bus.h"
-#include "sd-daemon.h"
-#include "sd-event.h"
-#include "sd-id128.h"
+#include <systemd/sd-bus-protocol.h>
+#include <systemd/sd-bus.h>
+#include <systemd/sd-daemon.h>
+#include <systemd/sd-event.h>
+#include <systemd/sd-id128.h>
 
 #include "alloc-util.h"
 #include "bus-internal.h"
diff --git a/src/libshared/condition.c b/src/libshared/condition.c
index f93785865e..1719a4c7a6 100644
--- a/src/libshared/condition.c
+++ b/src/libshared/condition.c
@@ -27,7 +27,7 @@
 #include <time.h>
 #include <unistd.h>
 
-#include "sd-id128.h"
+#include <systemd/sd-id128.h>
 
 #include "alloc-util.h"
 #include "apparmor-util.h"
diff --git a/src/libshared/logs-show.c b/src/libshared/logs-show.c
index 5eb3bd35c7..7ac6d49549 100644
--- a/src/libshared/logs-show.c
+++ b/src/libshared/logs-show.c
@@ -28,8 +28,8 @@
 #include <time.h>
 #include <unistd.h>
 
-#include "sd-id128.h"
-#include "sd-journal.h"
+#include <systemd/sd-id128.h>
+#include <systemd/sd-journal.h>
 
 #include "alloc-util.h"
 #include "fd-util.h"
diff --git a/src/libshared/logs-show.h b/src/libshared/logs-show.h
index 9765a24ff2..682a4adc7b 100644
--- a/src/libshared/logs-show.h
+++ b/src/libshared/logs-show.h
@@ -24,7 +24,7 @@
 #include <stdio.h>
 #include <sys/types.h>
 
-#include "sd-journal.h"
+#include <systemd/sd-journal.h>
 
 #include "macro.h"
 #include "output-mode.h"
diff --git a/src/libshared/machine-pool.c b/src/libshared/machine-pool.c
index e5674e4137..056b5bfae5 100644
--- a/src/libshared/machine-pool.c
+++ b/src/libshared/machine-pool.c
@@ -32,8 +32,8 @@
 #include <sys/statvfs.h>
 #include <unistd.h>
 
-#include "sd-bus-protocol.h"
-#include "sd-bus.h"
+#include <systemd/sd-bus-protocol.h>
+#include <systemd/sd-bus.h>
 
 #include "alloc-util.h"
 #include "btrfs-util.h"
diff --git a/src/libshared/machine-pool.h b/src/libshared/machine-pool.h
index 40fe5ecb3a..fe99b7e0ae 100644
--- a/src/libshared/machine-pool.h
+++ b/src/libshared/machine-pool.h
@@ -21,7 +21,7 @@
 
 #include <stdint.h>
 
-#include "sd-bus.h"
+#include <systemd/sd-bus.h>
 
 /* Grow the /var/lib/machines directory after each 10MiB written */
 #define GROW_INTERVAL_BYTES (UINT64_C(10) * UINT64_C(1024) * UINT64_C(1024))
diff --git a/src/libshared/ptyfwd.c b/src/libshared/ptyfwd.c
index 061d31f4de..a97e0d5143 100644
--- a/src/libshared/ptyfwd.c
+++ b/src/libshared/ptyfwd.c
@@ -30,7 +30,7 @@
 #include <termios.h>
 #include <unistd.h>
 
-#include "sd-event.h"
+#include <systemd/sd-event.h>
 
 #include "alloc-util.h"
 #include "fd-util.h"
diff --git a/src/libshared/specifier.c b/src/libshared/specifier.c
index 1c17eb5251..303ddf0401 100644
--- a/src/libshared/specifier.c
+++ b/src/libshared/specifier.c
@@ -24,7 +24,7 @@
 #include <string.h>
 #include <sys/utsname.h>
 
-#include "sd-id128.h"
+#include <systemd/sd-id128.h>
 
 #include "alloc-util.h"
 #include "hostname-util.h"
diff --git a/src/libsystemd-network/Makefile b/src/libsystemd-network/Makefile
index 68af0c58ef..45f782b184 100644
--- a/src/libsystemd-network/Makefile
+++ b/src/libsystemd-network/Makefile
@@ -20,6 +20,9 @@
 #
 #  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
 
@@ -174,3 +177,4 @@ tests += \
 	test-dhcp6-client \
 	test-lldp
 
+include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/libsystemd-network/dhcp-identifier.c b/src/libsystemd-network/dhcp-identifier.c
index 1d9ec7be82..d58f9029cc 100644
--- a/src/libsystemd-network/dhcp-identifier.c
+++ b/src/libsystemd-network/dhcp-identifier.c
@@ -18,7 +18,7 @@
 ***/
 
 #include "libudev.h"
-#include "sd-id128.h"
+#include <systemd/sd-id128.h>
 
 #include "dhcp-identifier.h"
 #include "dhcp6-protocol.h"
diff --git a/src/libsystemd-network/dhcp-identifier.h b/src/libsystemd-network/dhcp-identifier.h
index 93f06f5938..31f461abd1 100644
--- a/src/libsystemd-network/dhcp-identifier.h
+++ b/src/libsystemd-network/dhcp-identifier.h
@@ -19,7 +19,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "sd-id128.h"
+#include <systemd/sd-id128.h>
 
 #include "macro.h"
 #include "sparse-endian.h"
diff --git a/src/libsystemd-network/dhcp-internal.h b/src/libsystemd-network/dhcp-internal.h
index a3b842cda3..51cb193847 100644
--- a/src/libsystemd-network/dhcp-internal.h
+++ b/src/libsystemd-network/dhcp-internal.h
@@ -25,7 +25,7 @@
 #include <net/if_arp.h>
 #include <stdint.h>
 
-#include "sd-dhcp-client.h"
+#include <systemd/sd-dhcp-client.h>
 
 #include "dhcp-protocol.h"
 #include "socket-util.h"
diff --git a/src/libsystemd-network/dhcp-lease-internal.h b/src/libsystemd-network/dhcp-lease-internal.h
index 82cae2300a..646e612cee 100644
--- a/src/libsystemd-network/dhcp-lease-internal.h
+++ b/src/libsystemd-network/dhcp-lease-internal.h
@@ -23,7 +23,7 @@
 #include <stdint.h>
 #include <linux/if_packet.h>
 
-#include "sd-dhcp-client.h"
+#include <systemd/sd-dhcp-client.h>
 
 #include "dhcp-protocol.h"
 #include "list.h"
diff --git a/src/libsystemd-network/dhcp-server-internal.h b/src/libsystemd-network/dhcp-server-internal.h
index bf123f1439..a5306b2907 100644
--- a/src/libsystemd-network/dhcp-server-internal.h
+++ b/src/libsystemd-network/dhcp-server-internal.h
@@ -20,8 +20,8 @@
 
 #pragma once
 
-#include "sd-dhcp-server.h"
-#include "sd-event.h"
+#include <systemd/sd-dhcp-server.h>
+#include <systemd/sd-event.h>
 
 #include "dhcp-internal.h"
 #include "hashmap.h"
diff --git a/src/libsystemd-network/dhcp6-internal.h b/src/libsystemd-network/dhcp6-internal.h
index 749086d33a..228feb49d8 100644
--- a/src/libsystemd-network/dhcp6-internal.h
+++ b/src/libsystemd-network/dhcp6-internal.h
@@ -22,7 +22,7 @@
 #include <net/ethernet.h>
 #include <netinet/in.h>
 
-#include "sd-event.h"
+#include <systemd/sd-event.h>
 
 #include "list.h"
 #include "macro.h"
diff --git a/src/libsystemd-network/dhcp6-lease-internal.h b/src/libsystemd-network/dhcp6-lease-internal.h
index 14e708ef63..8e9a6f8e8c 100644
--- a/src/libsystemd-network/dhcp6-lease-internal.h
+++ b/src/libsystemd-network/dhcp6-lease-internal.h
@@ -22,7 +22,7 @@
 
 #include <stdint.h>
 
-#include "sd-dhcp6-lease.h"
+#include <systemd/sd-dhcp6-lease.h>
 
 #include "dhcp6-internal.h"
 
diff --git a/src/libsystemd-network/dhcp6-option.c b/src/libsystemd-network/dhcp6-option.c
index b073906660..91d7f8a7da 100644
--- a/src/libsystemd-network/dhcp6-option.c
+++ b/src/libsystemd-network/dhcp6-option.c
@@ -21,7 +21,7 @@
 #include <netinet/in.h>
 #include <string.h>
 
-#include "sd-dhcp6-client.h"
+#include <systemd/sd-dhcp6-client.h>
 
 #include "alloc-util.h"
 #include "dhcp6-internal.h"
diff --git a/src/libsystemd-network/lldp-internal.c b/src/libsystemd-network/lldp-internal.c
index c8740ce5f0..902a262f39 100644
--- a/src/libsystemd-network/lldp-internal.c
+++ b/src/libsystemd-network/lldp-internal.c
@@ -18,7 +18,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "sd-lldp.h"
+#include <systemd/sd-lldp.h>
 
 #include "alloc-util.h"
 #include "lldp-internal.h"
diff --git a/src/libsystemd-network/lldp-internal.h b/src/libsystemd-network/lldp-internal.h
index 15b4a11b15..565149fbcf 100644
--- a/src/libsystemd-network/lldp-internal.h
+++ b/src/libsystemd-network/lldp-internal.h
@@ -20,7 +20,7 @@
 
 #pragma once
 
-#include "sd-event.h"
+#include <systemd/sd-event.h>
 
 #include "list.h"
 #include "lldp-tlv.h"
diff --git a/src/libsystemd-network/lldp-network.h b/src/libsystemd-network/lldp-network.h
index dcf31faa95..3eb03a102d 100644
--- a/src/libsystemd-network/lldp-network.h
+++ b/src/libsystemd-network/lldp-network.h
@@ -20,6 +20,6 @@
 
 #pragma once
 
-#include "sd-event.h"
+#include <systemd/sd-event.h>
 
 int lldp_network_bind_raw_socket(int ifindex);
diff --git a/src/libsystemd-network/lldp-port.h b/src/libsystemd-network/lldp-port.h
index 96092f8df9..36e1edc17c 100644
--- a/src/libsystemd-network/lldp-port.h
+++ b/src/libsystemd-network/lldp-port.h
@@ -22,8 +22,8 @@
 
 #include <net/ethernet.h>
 
-#include "sd-event.h"
-#include "sd-lldp.h"
+#include <systemd/sd-event.h>
+#include <systemd/sd-lldp.h>
 
 #include "util.h"
 
diff --git a/src/libsystemd-network/lldp-tlv.h b/src/libsystemd-network/lldp-tlv.h
index 8e7706c612..4362b2ace6 100644
--- a/src/libsystemd-network/lldp-tlv.h
+++ b/src/libsystemd-network/lldp-tlv.h
@@ -22,7 +22,7 @@
 
 #include <net/ethernet.h>
 
-#include "sd-lldp.h"
+#include <systemd/sd-lldp.h>
 
 #include "list.h"
 #include "lldp.h"
diff --git a/src/libsystemd-network/network-internal.c b/src/libsystemd-network/network-internal.c
index fdafcd84d8..35860cf11a 100644
--- a/src/libsystemd-network/network-internal.c
+++ b/src/libsystemd-network/network-internal.c
@@ -21,7 +21,7 @@
 #include <linux/if.h>
 #include <netinet/ether.h>
 
-#include "sd-ndisc.h"
+#include <systemd/sd-ndisc.h>
 
 #include "alloc-util.h"
 #include "condition.h"
diff --git a/src/libsystemd-network/network-internal.h b/src/libsystemd-network/network-internal.h
index c8a531ab0f..2549d1420e 100644
--- a/src/libsystemd-network/network-internal.h
+++ b/src/libsystemd-network/network-internal.h
@@ -21,7 +21,7 @@
 
 #include <stdbool.h>
 
-#include "sd-dhcp-lease.h"
+#include <systemd/sd-dhcp-lease.h>
 
 #include "condition.h"
 #include "udev.h"
diff --git a/src/libsystemd-network/sd-dhcp-client.c b/src/libsystemd-network/sd-dhcp-client.c
index 729ef880ce..bd5ec76fc5 100644
--- a/src/libsystemd-network/sd-dhcp-client.c
+++ b/src/libsystemd-network/sd-dhcp-client.c
@@ -26,7 +26,7 @@
 #include <sys/ioctl.h>
 #include <linux/if_infiniband.h>
 
-#include "sd-dhcp-client.h"
+#include <systemd/sd-dhcp-client.h>
 
 #include "alloc-util.h"
 #include "async.h"
diff --git a/src/libsystemd-network/sd-dhcp-lease.c b/src/libsystemd-network/sd-dhcp-lease.c
index 7a119fd488..d8d6f446ee 100644
--- a/src/libsystemd-network/sd-dhcp-lease.c
+++ b/src/libsystemd-network/sd-dhcp-lease.c
@@ -24,7 +24,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "sd-dhcp-lease.h"
+#include <systemd/sd-dhcp-lease.h>
 
 #include "alloc-util.h"
 #include "dhcp-lease-internal.h"
diff --git a/src/libsystemd-network/sd-dhcp-server.c b/src/libsystemd-network/sd-dhcp-server.c
index 54ff1a3f28..e11462e6ac 100644
--- a/src/libsystemd-network/sd-dhcp-server.c
+++ b/src/libsystemd-network/sd-dhcp-server.c
@@ -20,7 +20,7 @@
 
 #include <sys/ioctl.h>
 
-#include "sd-dhcp-server.h"
+#include <systemd/sd-dhcp-server.h>
 
 #include "alloc-util.h"
 #include "dhcp-internal.h"
diff --git a/src/libsystemd-network/sd-dhcp6-client.c b/src/libsystemd-network/sd-dhcp6-client.c
index 7d56d4cc60..494036cb54 100644
--- a/src/libsystemd-network/sd-dhcp6-client.c
+++ b/src/libsystemd-network/sd-dhcp6-client.c
@@ -22,7 +22,7 @@
 #include <sys/ioctl.h>
 #include <linux/if_infiniband.h>
 
-#include "sd-dhcp6-client.h"
+#include <systemd/sd-dhcp6-client.h>
 
 #include "alloc-util.h"
 #include "dhcp-identifier.h"
diff --git a/src/libsystemd-network/sd-ipv4acd.c b/src/libsystemd-network/sd-ipv4acd.c
index f7880a891c..f97fc0bf47 100644
--- a/src/libsystemd-network/sd-ipv4acd.c
+++ b/src/libsystemd-network/sd-ipv4acd.c
@@ -24,7 +24,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "sd-ipv4acd.h"
+#include <systemd/sd-ipv4acd.h>
 
 #include "alloc-util.h"
 #include "arp-util.h"
diff --git a/src/libsystemd-network/sd-ipv4ll.c b/src/libsystemd-network/sd-ipv4ll.c
index db6cf22aaa..7725b67548 100644
--- a/src/libsystemd-network/sd-ipv4ll.c
+++ b/src/libsystemd-network/sd-ipv4ll.c
@@ -24,8 +24,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "sd-ipv4acd.h"
-#include "sd-ipv4ll.h"
+#include <systemd/sd-ipv4acd.h>
+#include <systemd/sd-ipv4ll.h>
 
 #include "alloc-util.h"
 #include "in-addr-util.h"
diff --git a/src/libsystemd-network/sd-lldp.c b/src/libsystemd-network/sd-lldp.c
index 885ca62425..6bb2c7797b 100644
--- a/src/libsystemd-network/sd-lldp.c
+++ b/src/libsystemd-network/sd-lldp.c
@@ -20,7 +20,7 @@
 
 #include <arpa/inet.h>
 
-#include "sd-lldp.h"
+#include <systemd/sd-lldp.h>
 
 #include "alloc-util.h"
 #include "fd-util.h"
diff --git a/src/libsystemd-network/sd-ndisc.c b/src/libsystemd-network/sd-ndisc.c
index bae6a49fe6..cd07fc1b3f 100644
--- a/src/libsystemd-network/sd-ndisc.c
+++ b/src/libsystemd-network/sd-ndisc.c
@@ -24,7 +24,7 @@
 #include <string.h>
 #include <sys/ioctl.h>
 
-#include "sd-ndisc.h"
+#include <systemd/sd-ndisc.h>
 
 #include "alloc-util.h"
 #include "async.h"
diff --git a/src/libsystemd-network/test-acd.c b/src/libsystemd-network/test-acd.c
index 75564615b9..53ddfc3b62 100644
--- a/src/libsystemd-network/test-acd.c
+++ b/src/libsystemd-network/test-acd.c
@@ -24,9 +24,9 @@
 #include <linux/veth.h>
 #include <net/if.h>
 
-#include "sd-event.h"
-#include "sd-ipv4acd.h"
-#include "sd-netlink.h"
+#include <systemd/sd-event.h>
+#include <systemd/sd-ipv4acd.h>
+#include <systemd/sd-netlink.h>
 
 #include "in-addr-util.h"
 #include "netlink-util.h"
diff --git a/src/libsystemd-network/test-dhcp-client.c b/src/libsystemd-network/test-dhcp-client.c
index c3c08fef5e..478b370c4c 100644
--- a/src/libsystemd-network/test-dhcp-client.c
+++ b/src/libsystemd-network/test-dhcp-client.c
@@ -22,8 +22,8 @@
 #include <sys/socket.h>
 #include <unistd.h>
 
-#include "sd-dhcp-client.h"
-#include "sd-event.h"
+#include <systemd/sd-dhcp-client.h>
+#include <systemd/sd-event.h>
 
 #include "alloc-util.h"
 #include "dhcp-identifier.h"
diff --git a/src/libsystemd-network/test-dhcp-server.c b/src/libsystemd-network/test-dhcp-server.c
index e81c508c7f..7dc315c07f 100644
--- a/src/libsystemd-network/test-dhcp-server.c
+++ b/src/libsystemd-network/test-dhcp-server.c
@@ -20,8 +20,8 @@
 
 #include <errno.h>
 
-#include "sd-dhcp-server.h"
-#include "sd-event.h"
+#include <systemd/sd-dhcp-server.h>
+#include <systemd/sd-event.h>
 
 #include "dhcp-server-internal.h"
 
diff --git a/src/libsystemd-network/test-dhcp6-client.c b/src/libsystemd-network/test-dhcp6-client.c
index e74c8c72db..0548e8381e 100644
--- a/src/libsystemd-network/test-dhcp6-client.c
+++ b/src/libsystemd-network/test-dhcp6-client.c
@@ -24,8 +24,8 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include "sd-dhcp6-client.h"
-#include "sd-event.h"
+#include <systemd/sd-dhcp6-client.h>
+#include <systemd/sd-event.h>
 
 #include "dhcp6-internal.h"
 #include "dhcp6-lease-internal.h"
diff --git a/src/libsystemd-network/test-ipv4ll-manual.c b/src/libsystemd-network/test-ipv4ll-manual.c
index 85dd61470d..caa315b210 100644
--- a/src/libsystemd-network/test-ipv4ll-manual.c
+++ b/src/libsystemd-network/test-ipv4ll-manual.c
@@ -23,9 +23,9 @@
 #include <unistd.h>
 #include <linux/veth.h>
 
-#include "sd-event.h"
-#include "sd-ipv4ll.h"
-#include "sd-netlink.h"
+#include <systemd/sd-event.h>
+#include <systemd/sd-ipv4ll.h>
+#include <systemd/sd-netlink.h>
 
 #include "alloc-util.h"
 #include "in-addr-util.h"
diff --git a/src/libsystemd-network/test-ipv4ll.c b/src/libsystemd-network/test-ipv4ll.c
index a233e0378c..b7278834f2 100644
--- a/src/libsystemd-network/test-ipv4ll.c
+++ b/src/libsystemd-network/test-ipv4ll.c
@@ -25,7 +25,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include "sd-ipv4ll.h"
+#include <systemd/sd-ipv4ll.h>
 
 #include "arp-util.h"
 #include "fd-util.h"
diff --git a/src/libsystemd-network/test-lldp.c b/src/libsystemd-network/test-lldp.c
index b8490073dd..0243bc132b 100644
--- a/src/libsystemd-network/test-lldp.c
+++ b/src/libsystemd-network/test-lldp.c
@@ -23,8 +23,8 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "sd-event.h"
-#include "sd-lldp.h"
+#include <systemd/sd-event.h>
+#include <systemd/sd-lldp.h>
 
 #include "alloc-util.h"
 #include "fd-util.h"
diff --git a/src/libsystemd-network/test-ndisc-rs.c b/src/libsystemd-network/test-ndisc-rs.c
index f7b2eb8050..863a76637c 100644
--- a/src/libsystemd-network/test-ndisc-rs.c
+++ b/src/libsystemd-network/test-ndisc-rs.c
@@ -19,7 +19,7 @@
 
 #include <netinet/icmp6.h>
 
-#include "sd-ndisc.h"
+#include <systemd/sd-ndisc.h>
 
 #include "icmp6-util.h"
 #include "socket-util.h"
diff --git a/src/libsystemd/Makefile b/src/libsystemd/Makefile
index 0c3796b262..50de17357f 100644
--- a/src/libsystemd/Makefile
+++ b/src/libsystemd/Makefile
@@ -21,7 +21,7 @@
 #  You should have received a copy of the GNU Lesser General Public License
 #  along with systemd; If not, see <http://www.gnu.org/licenses/>.
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
-include $(topsrcdir)/automake.head.mk
+include $(topsrcdir)/build-aux/Makefile.head.mk
 
 LIBSYSTEMD_CURRENT=14
 LIBSYSTEMD_REVISION=0
@@ -282,4 +282,4 @@ nodist_test_libsystemd_sym_SOURCES = \
 test_libsystemd_sym_LDADD = \
 	libsystemd.la
 
-include $(topsrcdir)/automake.tail.mk
+include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/libsystemd/compat-libs/Makefile b/src/libsystemd/compat-libs/Makefile
index 166044e755..9ac9d1b560 100644
--- a/src/libsystemd/compat-libs/Makefile
+++ b/src/libsystemd/compat-libs/Makefile
@@ -20,6 +20,9 @@
 #
 #  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_COMPAT_LIBS),)
 libsystemd-%.c: src/compat-libs/libsystemd-%.sym
 	$(AM_V_at)$(MKDIR_P) $(dir $@)
@@ -140,3 +143,4 @@ EXTRA_DIST += \
 	src/compat-libs/libsystemd-id128.pc.in \
 	src/compat-libs/libsystemd-daemon.pc.in
 
+include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/libsystemd/include/systemd/sd-bus-vtable.h b/src/libsystemd/include/systemd/sd-bus-vtable.h
index 6ad6d51979..9363f5425a 100644
--- a/src/libsystemd/include/systemd/sd-bus-vtable.h
+++ b/src/libsystemd/include/systemd/sd-bus-vtable.h
@@ -26,7 +26,7 @@ _SD_BEGIN_DECLARATIONS;
 
 typedef struct sd_bus_vtable sd_bus_vtable;
 
-#include "sd-bus.h"
+#include <systemd/sd-bus.h>
 
 enum {
         _SD_BUS_VTABLE_START             = '<',
diff --git a/src/libsystemd/include/systemd/sd-bus.h b/src/libsystemd/include/systemd/sd-bus.h
index 2a2ef0eb98..2ded47c2b6 100644
--- a/src/libsystemd/include/systemd/sd-bus.h
+++ b/src/libsystemd/include/systemd/sd-bus.h
@@ -25,8 +25,8 @@
 #include <sys/types.h>
 #include <sys/uio.h>
 
-#include "sd-event.h"
-#include "sd-id128.h"
+#include <systemd/sd-event.h>
+#include <systemd/sd-id128.h>
 
 #include "_sd-common.h"
 
@@ -107,8 +107,8 @@ typedef int (*sd_bus_object_find_t) (sd_bus *bus, const char *path, const char *
 typedef int (*sd_bus_node_enumerator_t) (sd_bus *bus, const char *prefix, void *userdata, char ***ret_nodes, sd_bus_error *ret_error);
 typedef int (*sd_bus_track_handler_t) (sd_bus_track *track, void *userdata);
 
-#include "sd-bus-protocol.h"
-#include "sd-bus-vtable.h"
+#include <systemd/sd-bus-protocol.h>
+#include <systemd/sd-bus-vtable.h>
 
 /* Connections */
 
diff --git a/src/libsystemd/include/systemd/sd-dhcp-client.h b/src/libsystemd/include/systemd/sd-dhcp-client.h
index 2b865a80e1..897a6b0223 100644
--- a/src/libsystemd/include/systemd/sd-dhcp-client.h
+++ b/src/libsystemd/include/systemd/sd-dhcp-client.h
@@ -25,8 +25,8 @@
 #include <netinet/in.h>
 #include <sys/types.h>
 
-#include "sd-dhcp-lease.h"
-#include "sd-event.h"
+#include <systemd/sd-dhcp-lease.h>
+#include <systemd/sd-event.h>
 
 #include "_sd-common.h"
 
diff --git a/src/libsystemd/include/systemd/sd-dhcp-server.h b/src/libsystemd/include/systemd/sd-dhcp-server.h
index 8658197e80..ede8f18533 100644
--- a/src/libsystemd/include/systemd/sd-dhcp-server.h
+++ b/src/libsystemd/include/systemd/sd-dhcp-server.h
@@ -24,7 +24,7 @@
 #include <inttypes.h>
 #include <netinet/in.h>
 
-#include "sd-event.h"
+#include <systemd/sd-event.h>
 
 #include "_sd-common.h"
 
diff --git a/src/libsystemd/include/systemd/sd-dhcp6-client.h b/src/libsystemd/include/systemd/sd-dhcp6-client.h
index 9608060830..9c05336ab9 100644
--- a/src/libsystemd/include/systemd/sd-dhcp6-client.h
+++ b/src/libsystemd/include/systemd/sd-dhcp6-client.h
@@ -24,8 +24,8 @@
 #include <net/ethernet.h>
 #include <sys/types.h>
 
-#include "sd-dhcp6-lease.h"
-#include "sd-event.h"
+#include <systemd/sd-dhcp6-lease.h>
+#include <systemd/sd-event.h>
 
 #include "_sd-common.h"
 
diff --git a/src/libsystemd/include/systemd/sd-ipv4acd.h b/src/libsystemd/include/systemd/sd-ipv4acd.h
index 3a2219c82c..0fb52b33f9 100644
--- a/src/libsystemd/include/systemd/sd-ipv4acd.h
+++ b/src/libsystemd/include/systemd/sd-ipv4acd.h
@@ -24,7 +24,7 @@
 #include <net/ethernet.h>
 #include <netinet/in.h>
 
-#include "sd-event.h"
+#include <systemd/sd-event.h>
 
 #include "_sd-common.h"
 
diff --git a/src/libsystemd/include/systemd/sd-ipv4ll.h b/src/libsystemd/include/systemd/sd-ipv4ll.h
index 67c566fe0d..2d1d51a473 100644
--- a/src/libsystemd/include/systemd/sd-ipv4ll.h
+++ b/src/libsystemd/include/systemd/sd-ipv4ll.h
@@ -23,7 +23,7 @@
 #include <net/ethernet.h>
 #include <netinet/in.h>
 
-#include "sd-event.h"
+#include <systemd/sd-event.h>
 
 #include "_sd-common.h"
 
diff --git a/src/libsystemd/include/systemd/sd-journal.h b/src/libsystemd/include/systemd/sd-journal.h
index abb9eca576..559a8fa929 100644
--- a/src/libsystemd/include/systemd/sd-journal.h
+++ b/src/libsystemd/include/systemd/sd-journal.h
@@ -26,7 +26,7 @@
 #include <sys/uio.h>
 #include <syslog.h>
 
-#include "sd-id128.h"
+#include <systemd/sd-id128.h>
 
 #include "_sd-common.h"
 
diff --git a/src/libsystemd/include/systemd/sd-lldp.h b/src/libsystemd/include/systemd/sd-lldp.h
index ea952ef187..45d8a36697 100644
--- a/src/libsystemd/include/systemd/sd-lldp.h
+++ b/src/libsystemd/include/systemd/sd-lldp.h
@@ -24,7 +24,7 @@
 #include <inttypes.h>
 #include <net/ethernet.h>
 
-#include "sd-event.h"
+#include <systemd/sd-event.h>
 
 #include "_sd-common.h"
 
diff --git a/src/libsystemd/include/systemd/sd-messages.h b/src/libsystemd/include/systemd/sd-messages.h
index 8a72576ec8..1aeac17851 100644
--- a/src/libsystemd/include/systemd/sd-messages.h
+++ b/src/libsystemd/include/systemd/sd-messages.h
@@ -20,7 +20,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "sd-id128.h"
+#include <systemd/sd-id128.h>
 
 #include "_sd-common.h"
 
diff --git a/src/libsystemd/include/systemd/sd-ndisc.h b/src/libsystemd/include/systemd/sd-ndisc.h
index 762947531d..734701bca3 100644
--- a/src/libsystemd/include/systemd/sd-ndisc.h
+++ b/src/libsystemd/include/systemd/sd-ndisc.h
@@ -23,7 +23,7 @@
 #include <inttypes.h>
 #include <net/ethernet.h>
 
-#include "sd-event.h"
+#include <systemd/sd-event.h>
 
 #include "_sd-common.h"
 
diff --git a/src/libsystemd/include/systemd/sd-netlink.h b/src/libsystemd/include/systemd/sd-netlink.h
index b4798d2476..333df4676f 100644
--- a/src/libsystemd/include/systemd/sd-netlink.h
+++ b/src/libsystemd/include/systemd/sd-netlink.h
@@ -26,7 +26,7 @@
 #include <linux/rtnetlink.h>
 #include <linux/neighbour.h>
 
-#include "sd-event.h"
+#include <systemd/sd-event.h>
 
 #include "_sd-common.h"
 
diff --git a/src/libsystemd/include/systemd/sd-resolve.h b/src/libsystemd/include/systemd/sd-resolve.h
index 903b917f70..9c3b0ee70f 100644
--- a/src/libsystemd/include/systemd/sd-resolve.h
+++ b/src/libsystemd/include/systemd/sd-resolve.h
@@ -25,7 +25,7 @@
 #include <sys/socket.h>
 #include <sys/types.h>
 
-#include "sd-event.h"
+#include <systemd/sd-event.h>
 
 #include "_sd-common.h"
 
diff --git a/src/libsystemd/libsystemd-internal/Makefile b/src/libsystemd/libsystemd-internal/Makefile
index 995eff1659..c85835a94d 100644
--- a/src/libsystemd/libsystemd-internal/Makefile
+++ b/src/libsystemd/libsystemd-internal/Makefile
@@ -21,7 +21,7 @@
 #  You should have received a copy of the GNU Lesser General Public License
 #  along with systemd; If not, see <http://www.gnu.org/licenses/>.
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk
-include $(topsrcdir)/automake.head.mk
+include $(topsrcdir)/build-aux/Makefile.head.mk
 
 libsystemd_internal_la_SOURCES = \
 	src/systemd/sd-bus.h \
@@ -128,4 +128,4 @@ $(outdir)/libsystemd-internal.la: \
 	$(patsubst src/libsystemd/%.c,$(outdir)/%.lo,$(filter %.c,$(libsystemd_internal_la_SOURCES))) \
 	$(libbasic.DEPENDS) -lresolv
 
-include $(topsrcdir)/automake.tail.mk
+include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/libsystemd/libsystemd-journal-internal/Makefile b/src/libsystemd/libsystemd-journal-internal/Makefile
index 210ca07d5d..306d6db7f3 100644
--- a/src/libsystemd/libsystemd-journal-internal/Makefile
+++ b/src/libsystemd/libsystemd-journal-internal/Makefile
@@ -1,3 +1,28 @@
+#  -*- 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
+
 pkginclude_HEADERS += \
 	src/systemd/sd-journal.h \
 	src/systemd/sd-messages.h \
@@ -69,3 +94,5 @@ endif
 
 noinst_LTLIBRARIES += \
 	libsystemd-journal-internal.la
+
+include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/libudev/Makefile b/src/libudev/Makefile
new file mode 100644
index 0000000000..eb08762ae5
--- /dev/null
+++ b/src/libudev/Makefile
@@ -0,0 +1,39 @@
+#  -*- 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-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/Makefile b/src/libudev/src/Makefile
index 3f1540b14a..42e6357e35 100644
--- a/src/libudev/src/Makefile
+++ b/src/libudev/src/Makefile
@@ -20,6 +20,9 @@
 #
 #  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
@@ -75,16 +78,4 @@ noinst_LTLIBRARIES += \
 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/libudev-device-internal.h b/src/libudev/src/libudev-device-internal.h
index 40d59201cf..de6f680819 100644
--- a/src/libudev/src/libudev-device-internal.h
+++ b/src/libudev/src/libudev-device-internal.h
@@ -21,7 +21,7 @@
 #pragma once
 
 #include "libudev.h"
-#include "sd-device.h"
+#include <systemd/sd-device.h>
 
 #include "libudev-private.h"
 
diff --git a/src/libudev/src/libudev-device.c b/src/libudev/src/libudev-device.c
index 814e016800..6536f4cfbb 100644
--- a/src/libudev/src/libudev-device.c
+++ b/src/libudev/src/libudev-device.c
@@ -35,7 +35,7 @@
 #include <unistd.h>
 
 #include "libudev.h"
-#include "sd-device.h"
+#include <systemd/sd-device.h>
 
 #include "alloc-util.h"
 #include "device-private.h"
diff --git a/src/libudev/src/libudev-enumerate.c b/src/libudev/src/libudev-enumerate.c
index e416e178b4..c784da5715 100644
--- a/src/libudev/src/libudev-enumerate.c
+++ b/src/libudev/src/libudev-enumerate.c
@@ -29,7 +29,7 @@
 #include <sys/stat.h>
 
 #include "libudev.h"
-#include "sd-device.h"
+#include <systemd/sd-device.h>
 
 #include "alloc-util.h"
 #include "device-enumerator-private.h"
diff --git a/src/libudev/src/libudev-hwdb.c b/src/libudev/src/libudev-hwdb.c
index a53f000015..8c4b488086 100644
--- a/src/libudev/src/libudev-hwdb.c
+++ b/src/libudev/src/libudev-hwdb.c
@@ -17,7 +17,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "sd-hwdb.h"
+#include <systemd/sd-hwdb.h>
 
 #include "alloc-util.h"
 #include "hwdb-util.h"
diff --git a/src/locale/Makefile b/src/locale/Makefile
index bf12de39c9..0e6746dbdb 100644
--- a/src/locale/Makefile
+++ b/src/locale/Makefile
@@ -20,6 +20,9 @@
 #
 #  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
@@ -84,3 +87,4 @@ polkitpolicy_in_files += \
 EXTRA_DIST += \
 	units/systemd-localed.service.in
 
+include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/locale/localectl.c b/src/locale/localectl.c
index 365c79aa51..c684ff7d90 100644
--- a/src/locale/localectl.c
+++ b/src/locale/localectl.c
@@ -25,7 +25,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "sd-bus.h"
+#include <systemd/sd-bus.h>
 
 #include "bus-error.h"
 #include "bus-util.h"
diff --git a/src/locale/localed.c b/src/locale/localed.c
index f0fe59cc67..eb6c0565f0 100644
--- a/src/locale/localed.c
+++ b/src/locale/localed.c
@@ -26,7 +26,7 @@
 #include <xkbcommon/xkbcommon.h>
 #endif
 
-#include "sd-bus.h"
+#include <systemd/sd-bus.h>
 
 #include "alloc-util.h"
 #include "bus-error.h"
diff --git a/src/login/Makefile b/src/login/Makefile
index d9cf23ed64..5923401112 100644
--- a/src/login/Makefile
+++ b/src/login/Makefile
@@ -20,6 +20,9 @@
 #
 #  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),)
 systemd_logind_SOURCES = \
 	src/login/logind.c \
@@ -237,3 +240,4 @@ endif
 EXTRA_DIST += \
 	units/systemd-user-sessions.service.in
 
+include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/login/inhibit.c b/src/login/inhibit.c
index f2c37a8623..905e757a32 100644
--- a/src/login/inhibit.c
+++ b/src/login/inhibit.c
@@ -23,7 +23,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 
-#include "sd-bus.h"
+#include <systemd/sd-bus.h>
 
 #include "alloc-util.h"
 #include "bus-error.h"
diff --git a/src/login/loginctl.c b/src/login/loginctl.c
index 6ad3d089bd..fd8dcdc22c 100644
--- a/src/login/loginctl.c
+++ b/src/login/loginctl.c
@@ -23,7 +23,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "sd-bus.h"
+#include <systemd/sd-bus.h>
 
 #include "alloc-util.h"
 #include "bus-error.h"
diff --git a/src/login/logind-button.c b/src/login/logind-button.c
index baa6b7113c..acf7504a2e 100644
--- a/src/login/logind-button.c
+++ b/src/login/logind-button.c
@@ -24,7 +24,7 @@
 #include <unistd.h>
 #include <linux/input.h>
 
-#include "sd-messages.h"
+#include <systemd/sd-messages.h>
 
 #include "alloc-util.h"
 #include "fd-util.h"
diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c
index 1d3133ee25..efcc386dce 100644
--- a/src/login/logind-dbus.c
+++ b/src/login/logind-dbus.c
@@ -22,7 +22,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "sd-messages.h"
+#include <systemd/sd-messages.h>
 
 #include "alloc-util.h"
 #include "audit-util.h"
diff --git a/src/login/logind-seat.c b/src/login/logind-seat.c
index b5192320e4..aec67718a1 100644
--- a/src/login/logind-seat.c
+++ b/src/login/logind-seat.c
@@ -22,7 +22,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "sd-messages.h"
+#include <systemd/sd-messages.h>
 
 #include "alloc-util.h"
 #include "fd-util.h"
diff --git a/src/login/logind-session.c b/src/login/logind-session.c
index 417b7f5d98..b22420deea 100644
--- a/src/login/logind-session.c
+++ b/src/login/logind-session.c
@@ -26,7 +26,7 @@
 #include <sys/ioctl.h>
 #include <unistd.h>
 
-#include "sd-messages.h"
+#include <systemd/sd-messages.h>
 
 #include "alloc-util.h"
 #include "audit-util.h"
diff --git a/src/login/logind-utmp.c b/src/login/logind-utmp.c
index 11a91c3947..5106821645 100644
--- a/src/login/logind-utmp.c
+++ b/src/login/logind-utmp.c
@@ -22,7 +22,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "sd-messages.h"
+#include <systemd/sd-messages.h>
 
 #include "alloc-util.h"
 #include "audit-util.h"
diff --git a/src/login/logind.c b/src/login/logind.c
index 933602eb08..34d0c04a2a 100644
--- a/src/login/logind.c
+++ b/src/login/logind.c
@@ -23,7 +23,7 @@
 #include <unistd.h>
 
 #include "libudev.h"
-#include "sd-daemon.h"
+#include <systemd/sd-daemon.h>
 
 #include "alloc-util.h"
 #include "bus-error.h"
diff --git a/src/login/logind.h b/src/login/logind.h
index 6748af3c07..c642d56413 100644
--- a/src/login/logind.h
+++ b/src/login/logind.h
@@ -22,8 +22,8 @@
 #include <stdbool.h>
 
 #include "libudev.h"
-#include "sd-bus.h"
-#include "sd-event.h"
+#include <systemd/sd-bus.h>
+#include <systemd/sd-event.h>
 
 #include "hashmap.h"
 #include "list.h"
diff --git a/src/login/test-inhibit.c b/src/login/test-inhibit.c
index a3cf9d293b..be7145b4bc 100644
--- a/src/login/test-inhibit.c
+++ b/src/login/test-inhibit.c
@@ -19,7 +19,7 @@
 
 #include <unistd.h>
 
-#include "sd-bus.h"
+#include <systemd/sd-bus.h>
 
 #include "bus-util.h"
 #include "fd-util.h"
diff --git a/src/machine-id-setup/Makefile b/src/machine-id-setup/Makefile
index 13e12d5376..125471d17a 100644
--- a/src/machine-id-setup/Makefile
+++ b/src/machine-id-setup/Makefile
@@ -20,6 +20,9 @@
 #
 #  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_machine_id_setup_SOURCES = \
 	src/machine-id-setup/machine-id-setup-main.c \
 	src/core/machine-id-setup.c \
@@ -31,3 +34,4 @@ systemd_machine_id_setup_LDADD = \
 SYSINIT_TARGET_WANTS += \
 	systemd-machine-id-commit.service
 
+include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/machine/nss-mymachines/nss-mymachines.c b/src/machine/nss-mymachines/nss-mymachines.c
index 1582d702f8..9d401b39dd 100644
--- a/src/machine/nss-mymachines/nss-mymachines.c
+++ b/src/machine/nss-mymachines/nss-mymachines.c
@@ -20,8 +20,8 @@
 #include <netdb.h>
 #include <nss.h>
 
-#include "sd-bus.h"
-#include "sd-login.h"
+#include <systemd/sd-bus.h>
+#include <systemd/sd-login.h>
 
 #include "alloc-util.h"
 #include "bus-common-errors.h"
diff --git a/src/machine/src/Makefile b/src/machine/src/Makefile
index 096d95fcf4..43a799440d 100644
--- a/src/machine/src/Makefile
+++ b/src/machine/src/Makefile
@@ -20,6 +20,9 @@
 #
 #  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_MACHINED),)
 systemd_machined_SOURCES = \
 	src/machine/machined.c \
@@ -122,3 +125,4 @@ polkitpolicy_in_files += \
 EXTRA_DIST += \
 	units/systemd-machined.service.in
 
+include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/machine/src/machine-dbus.h b/src/machine/src/machine-dbus.h
index 3a8162b171..224f36529f 100644
--- a/src/machine/src/machine-dbus.h
+++ b/src/machine/src/machine-dbus.h
@@ -19,7 +19,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "sd-bus.h"
+#include <systemd/sd-bus.h>
 
 #include "machine.h"
 
diff --git a/src/machine/src/machine.c b/src/machine/src/machine.c
index 406d5a4b85..468fc1fecf 100644
--- a/src/machine/src/machine.c
+++ b/src/machine/src/machine.c
@@ -21,7 +21,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "sd-messages.h"
+#include <systemd/sd-messages.h>
 
 #include "alloc-util.h"
 #include "bus-error.h"
diff --git a/src/machine/src/machinectl.c b/src/machine/src/machinectl.c
index 4853139321..fb743ab6cb 100644
--- a/src/machine/src/machinectl.c
+++ b/src/machine/src/machinectl.c
@@ -29,7 +29,7 @@
 #include <sys/socket.h>
 #include <unistd.h>
 
-#include "sd-bus.h"
+#include <systemd/sd-bus.h>
 
 #include "alloc-util.h"
 #include "bus-error.h"
diff --git a/src/machine/src/machined-dbus.c b/src/machine/src/machined-dbus.c
index b933099330..96f2c4769e 100644
--- a/src/machine/src/machined-dbus.c
+++ b/src/machine/src/machined-dbus.c
@@ -21,7 +21,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "sd-id128.h"
+#include <systemd/sd-id128.h>
 
 #include "alloc-util.h"
 #include "btrfs-util.h"
diff --git a/src/machine/src/machined.c b/src/machine/src/machined.c
index f2c1966a6b..6ada8671f8 100644
--- a/src/machine/src/machined.c
+++ b/src/machine/src/machined.c
@@ -21,7 +21,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "sd-daemon.h"
+#include <systemd/sd-daemon.h>
 
 #include "alloc-util.h"
 #include "bus-error.h"
diff --git a/src/machine/src/machined.h b/src/machine/src/machined.h
index e7d7dfdceb..0fe50aaa66 100644
--- a/src/machine/src/machined.h
+++ b/src/machine/src/machined.h
@@ -21,8 +21,8 @@
 
 #include <stdbool.h>
 
-#include "sd-bus.h"
-#include "sd-event.h"
+#include <systemd/sd-bus.h>
+#include <systemd/sd-event.h>
 
 #include "hashmap.h"
 #include "list.h"
diff --git a/src/modules-load/Makefile b/src/modules-load/Makefile
index 61ecea1130..f3860d89af 100644
--- a/src/modules-load/Makefile
+++ b/src/modules-load/Makefile
@@ -20,6 +20,9 @@
 #
 #  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
@@ -54,3 +57,4 @@ 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/network/Makefile b/src/network/Makefile
index 42af40ebbd..3baa0d22b4 100644
--- a/src/network/Makefile
+++ b/src/network/Makefile
@@ -20,6 +20,9 @@
 #
 #  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_NETWORKD),)
 rootlibexec_PROGRAMS += \
 	systemd-networkd
@@ -194,3 +197,4 @@ EXTRA_DIST += \
 	units/systemd-networkd-wait-online.service.in \
 	test/networkd-test.py
 
+include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/network/networkctl.c b/src/network/networkctl.c
index 60724fce80..6e436d2043 100644
--- a/src/network/networkctl.c
+++ b/src/network/networkctl.c
@@ -21,10 +21,10 @@
 #include <net/if.h>
 #include <stdbool.h>
 
-#include "sd-device.h"
-#include "sd-hwdb.h"
-#include "sd-netlink.h"
-#include "sd-network.h"
+#include <systemd/sd-device.h>
+#include <systemd/sd-hwdb.h>
+#include <systemd/sd-netlink.h>
+#include <systemd/sd-network.h>
 
 #include "alloc-util.h"
 #include "arphrd-list.h"
diff --git a/src/network/networkd-dhcp6.c b/src/network/networkd-dhcp6.c
index 5f7a005c36..bf8e826368 100644
--- a/src/network/networkd-dhcp6.c
+++ b/src/network/networkd-dhcp6.c
@@ -20,7 +20,7 @@
 #include <netinet/ether.h>
 #include <linux/if.h>
 
-#include "sd-dhcp6-client.h"
+#include <systemd/sd-dhcp6-client.h>
 
 #include "network-internal.h"
 #include "networkd-link.h"
diff --git a/src/network/networkd-link.h b/src/network/networkd-link.h
index 0e6a7b6f21..30f01faf2a 100644
--- a/src/network/networkd-link.h
+++ b/src/network/networkd-link.h
@@ -21,12 +21,12 @@
 
 #include <endian.h>
 
-#include "sd-dhcp-client.h"
-#include "sd-dhcp-server.h"
-#include "sd-dhcp6-client.h"
-#include "sd-ipv4ll.h"
-#include "sd-lldp.h"
-#include "sd-ndisc.h"
+#include <systemd/sd-dhcp-client.h>
+#include <systemd/sd-dhcp-server.h>
+#include <systemd/sd-dhcp6-client.h>
+#include <systemd/sd-ipv4ll.h>
+#include <systemd/sd-lldp.h>
+#include <systemd/sd-ndisc.h>
 
 typedef struct Link Link;
 
diff --git a/src/network/networkd-manager.c b/src/network/networkd-manager.c
index b527191a5a..c73d313c85 100644
--- a/src/network/networkd-manager.c
+++ b/src/network/networkd-manager.c
@@ -20,8 +20,8 @@
 #include <sys/socket.h>
 #include <linux/if.h>
 
-#include "sd-daemon.h"
-#include "sd-netlink.h"
+#include <systemd/sd-daemon.h>
+#include <systemd/sd-netlink.h>
 
 #include "alloc-util.h"
 #include "bus-util.h"
diff --git a/src/network/networkd-ndisc.c b/src/network/networkd-ndisc.c
index f2287be20a..ae647b0293 100644
--- a/src/network/networkd-ndisc.c
+++ b/src/network/networkd-ndisc.c
@@ -21,7 +21,7 @@
 #include <netinet/icmp6.h>
 #include <linux/if.h>
 
-#include "sd-ndisc.h"
+#include <systemd/sd-ndisc.h>
 
 #include "networkd-link.h"
 
diff --git a/src/network/networkd-netdev-bond.c b/src/network/networkd-netdev-bond.c
index 106f15fabc..e04e78f870 100644
--- a/src/network/networkd-netdev-bond.c
+++ b/src/network/networkd-netdev-bond.c
@@ -21,7 +21,7 @@
 #include <netinet/ether.h>
 #include <linux/if_bonding.h>
 
-#include "sd-netlink.h"
+#include <systemd/sd-netlink.h>
 
 #include "alloc-util.h"
 #include "conf-parser.h"
diff --git a/src/network/networkd-netdev-tunnel.c b/src/network/networkd-netdev-tunnel.c
index 46ff2974f4..408ceaf55e 100644
--- a/src/network/networkd-netdev-tunnel.c
+++ b/src/network/networkd-netdev-tunnel.c
@@ -23,7 +23,7 @@
 #include <linux/if_tunnel.h>
 #include <linux/ip6_tunnel.h>
 
-#include "sd-netlink.h"
+#include <systemd/sd-netlink.h>
 
 #include "conf-parser.h"
 #include "missing.h"
diff --git a/src/network/networkd-netdev-veth.c b/src/network/networkd-netdev-veth.c
index b122a06c25..185b441c5a 100644
--- a/src/network/networkd-netdev-veth.c
+++ b/src/network/networkd-netdev-veth.c
@@ -20,7 +20,7 @@
 #include <net/if.h>
 #include <linux/veth.h>
 
-#include "sd-netlink.h"
+#include <systemd/sd-netlink.h>
 
 #include "networkd-netdev-veth.h"
 
diff --git a/src/network/networkd-netdev-vxlan.c b/src/network/networkd-netdev-vxlan.c
index eb9a2c06b3..223d60f4db 100644
--- a/src/network/networkd-netdev-vxlan.c
+++ b/src/network/networkd-netdev-vxlan.c
@@ -19,7 +19,7 @@
 
 #include <net/if.h>
 
-#include "sd-netlink.h"
+#include <systemd/sd-netlink.h>
 
 #include "conf-parser.h"
 #include "alloc-util.h"
diff --git a/src/network/networkd-wait-online-link.c b/src/network/networkd-wait-online-link.c
index 5727422e3d..971545296f 100644
--- a/src/network/networkd-wait-online-link.c
+++ b/src/network/networkd-wait-online-link.c
@@ -18,7 +18,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "sd-network.h"
+#include <systemd/sd-network.h>
 
 #include "alloc-util.h"
 #include "networkd-wait-online-link.h"
diff --git a/src/network/networkd-wait-online.c b/src/network/networkd-wait-online.c
index 3220c4b7ef..a08272463e 100644
--- a/src/network/networkd-wait-online.c
+++ b/src/network/networkd-wait-online.c
@@ -20,7 +20,7 @@
 
 #include <getopt.h>
 
-#include "sd-daemon.h"
+#include <systemd/sd-daemon.h>
 
 #include "networkd-wait-online.h"
 #include "signal-util.h"
diff --git a/src/network/networkd-wait-online.h b/src/network/networkd-wait-online.h
index 421c2bdf44..f1ea4a6494 100644
--- a/src/network/networkd-wait-online.h
+++ b/src/network/networkd-wait-online.h
@@ -19,9 +19,9 @@
 
 #pragma once
 
-#include "sd-event.h"
-#include "sd-netlink.h"
-#include "sd-network.h"
+#include <systemd/sd-event.h>
+#include <systemd/sd-netlink.h>
+#include <systemd/sd-network.h>
 
 #include "hashmap.h"
 
diff --git a/src/network/networkd.c b/src/network/networkd.c
index 3a2615e6fd..6cf396e478 100644
--- a/src/network/networkd.c
+++ b/src/network/networkd.c
@@ -17,7 +17,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "sd-daemon.h"
+#include <systemd/sd-daemon.h>
 
 #include "capability-util.h"
 #include "networkd.h"
diff --git a/src/network/networkd.h b/src/network/networkd.h
index 7ee922621a..efe70970c3 100644
--- a/src/network/networkd.h
+++ b/src/network/networkd.h
@@ -21,9 +21,9 @@
 
 #include <arpa/inet.h>
 
-#include "sd-bus.h"
-#include "sd-event.h"
-#include "sd-netlink.h"
+#include <systemd/sd-bus.h>
+#include <systemd/sd-event.h>
+#include <systemd/sd-netlink.h>
 
 #include "hashmap.h"
 #include "list.h"
diff --git a/src/nss-myhostname/Makefile b/src/nss-myhostname/Makefile
index d012e98b6e..57860590c6 100644
--- a/src/nss-myhostname/Makefile
+++ b/src/nss-myhostname/Makefile
@@ -20,6 +20,9 @@
 #
 #  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 \
@@ -41,3 +44,4 @@ lib_LTLIBRARIES += \
 	libnss_myhostname.la
 endif
 
+include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/rc-local-generator/Makefile b/src/rc-local-generator/Makefile
index 26be093454..2e9b3e7a64 100644
--- a/src/rc-local-generator/Makefile
+++ b/src/rc-local-generator/Makefile
@@ -20,9 +20,13 @@
 #
 #  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/resolve/nss-resolve/nss-resolve.c b/src/resolve/nss-resolve/nss-resolve.c
index 69c0d9bdc1..d369f1b0c8 100644
--- a/src/resolve/nss-resolve/nss-resolve.c
+++ b/src/resolve/nss-resolve/nss-resolve.c
@@ -24,7 +24,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "sd-bus.h"
+#include <systemd/sd-bus.h>
 
 #include "bus-common-errors.h"
 #include "in-addr-util.h"
diff --git a/src/resolve/src/Makefile b/src/resolve/src/Makefile
index fafe8ab930..6f62e7b086 100644
--- a/src/resolve/src/Makefile
+++ b/src/resolve/src/Makefile
@@ -20,6 +20,9 @@
 #
 #  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_RESOLVED),)
 
 systemd_resolved_SOURCES = \
@@ -202,3 +205,4 @@ EXTRA_DIST += \
 	units/systemd-resolved.service.m4.in \
 	src/resolve/resolved.conf.in
 
+include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/resolve/src/resolve-tool.c b/src/resolve/src/resolve-tool.c
index 824cb267b5..3f1b6e32f1 100644
--- a/src/resolve/src/resolve-tool.c
+++ b/src/resolve/src/resolve-tool.c
@@ -20,7 +20,7 @@
 #include <getopt.h>
 #include <net/if.h>
 
-#include "sd-bus.h"
+#include <systemd/sd-bus.h>
 
 #include "af-list.h"
 #include "alloc-util.h"
diff --git a/src/resolve/src/resolved-dns-query.h b/src/resolve/src/resolved-dns-query.h
index c2ac02f68b..7f7c76ff20 100644
--- a/src/resolve/src/resolved-dns-query.h
+++ b/src/resolve/src/resolved-dns-query.h
@@ -20,7 +20,7 @@
 ***/
 
 
-#include "sd-bus.h"
+#include <systemd/sd-bus.h>
 
 #include "set.h"
 
diff --git a/src/resolve/src/resolved-link-bus.h b/src/resolve/src/resolved-link-bus.h
index 31e6cd2b45..5a8ee08ec7 100644
--- a/src/resolve/src/resolved-link-bus.h
+++ b/src/resolve/src/resolved-link-bus.h
@@ -19,7 +19,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "sd-bus.h"
+#include <systemd/sd-bus.h>
 
 #include "resolved-link.h"
 
diff --git a/src/resolve/src/resolved-link.c b/src/resolve/src/resolved-link.c
index c5863b3aa2..65df95bb1f 100644
--- a/src/resolve/src/resolved-link.c
+++ b/src/resolve/src/resolved-link.c
@@ -19,7 +19,7 @@
 
 #include <net/if.h>
 
-#include "sd-network.h"
+#include <systemd/sd-network.h>
 
 #include "alloc-util.h"
 #include "missing.h"
diff --git a/src/resolve/src/resolved-manager.h b/src/resolve/src/resolved-manager.h
index e82a824f29..8bef2d2b28 100644
--- a/src/resolve/src/resolved-manager.h
+++ b/src/resolve/src/resolved-manager.h
@@ -19,9 +19,9 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "sd-event.h"
-#include "sd-netlink.h"
-#include "sd-network.h"
+#include <systemd/sd-event.h>
+#include <systemd/sd-netlink.h>
+#include <systemd/sd-network.h>
 
 #include "hashmap.h"
 #include "list.h"
diff --git a/src/resolve/src/resolved.c b/src/resolve/src/resolved.c
index c7e2ab14d6..07e6bfb54a 100644
--- a/src/resolve/src/resolved.c
+++ b/src/resolve/src/resolved.c
@@ -17,8 +17,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "sd-daemon.h"
-#include "sd-event.h"
+#include <systemd/sd-daemon.h>
+#include <systemd/sd-event.h>
 
 #include "capability-util.h"
 #include "mkdir.h"
diff --git a/src/resolve/src/test-dnssec-complex.c b/src/resolve/src/test-dnssec-complex.c
index 58c089eb40..568400ac77 100644
--- a/src/resolve/src/test-dnssec-complex.c
+++ b/src/resolve/src/test-dnssec-complex.c
@@ -19,7 +19,7 @@
 
 #include <netinet/ip.h>
 
-#include "sd-bus.h"
+#include <systemd/sd-bus.h>
 
 #include "af-list.h"
 #include "alloc-util.h"
diff --git a/src/sleep/Makefile b/src/sleep/Makefile
index dc09085acd..2d8854bbf9 100644
--- a/src/sleep/Makefile
+++ b/src/sleep/Makefile
@@ -20,9 +20,13 @@
 #
 #  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_sleep_SOURCES = \
 	src/sleep/sleep.c
 
 systemd_sleep_LDADD = \
 	libshared.la
 
+include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/sleep/sleep.c b/src/sleep/sleep.c
index c8f0742183..7f8a95728d 100644
--- a/src/sleep/sleep.c
+++ b/src/sleep/sleep.c
@@ -22,7 +22,7 @@
 #include <getopt.h>
 #include <stdio.h>
 
-#include "sd-messages.h"
+#include <systemd/sd-messages.h>
 
 #include "def.h"
 #include "fd-util.h"
diff --git a/src/socket-proxy/Makefile b/src/socket-proxy/Makefile
index 27edeb2d95..cead4f37a9 100644
--- a/src/socket-proxy/Makefile
+++ b/src/socket-proxy/Makefile
@@ -20,6 +20,9 @@
 #
 #  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_socket_proxyd_SOURCES = \
 	src/socket-proxy/socket-proxyd.c
@@ -27,3 +30,4 @@ systemd_socket_proxyd_SOURCES = \
 systemd_socket_proxyd_LDADD = \
 	libshared.la
 
+include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/socket-proxy/socket-proxyd.c b/src/socket-proxy/socket-proxyd.c
index 99d4b62139..4be8d0507f 100644
--- a/src/socket-proxy/socket-proxyd.c
+++ b/src/socket-proxy/socket-proxyd.c
@@ -28,9 +28,9 @@
 #include <sys/un.h>
 #include <unistd.h>
 
-#include "sd-daemon.h"
-#include "sd-event.h"
-#include "sd-resolve.h"
+#include <systemd/sd-daemon.h>
+#include <systemd/sd-event.h>
+#include <systemd/sd-resolve.h>
 
 #include "alloc-util.h"
 #include "fd-util.h"
diff --git a/src/sysctl/Makefile b/src/sysctl/Makefile
index 8f7e611bc8..31d38d9104 100644
--- a/src/sysctl/Makefile
+++ b/src/sysctl/Makefile
@@ -20,9 +20,13 @@
 #
 #  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_sysctl_SOURCES = \
 	src/sysctl/sysctl.c
 
 systemd_sysctl_LDADD = \
 	libshared.la
 
+include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/system-update-generator/Makefile b/src/system-update-generator/Makefile
index 7239d533b0..62f750c182 100644
--- a/src/system-update-generator/Makefile
+++ b/src/system-update-generator/Makefile
@@ -20,9 +20,13 @@
 #
 #  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_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/src/system/systemctl/Makefile b/src/system/systemctl/Makefile
index c907fa8e07..5cb8c922d9 100644
--- a/src/system/systemctl/Makefile
+++ b/src/system/systemctl/Makefile
@@ -20,9 +20,13 @@
 #
 #  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
+
 systemctl_SOURCES = \
 	src/systemctl/systemctl.c
 
 systemctl_LDADD = \
 	libshared.la
 
+include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/system/systemctl/systemctl.c b/src/system/systemctl/systemctl.c
index 908ccabf8a..c03fca06c8 100644
--- a/src/system/systemctl/systemctl.c
+++ b/src/system/systemctl/systemctl.c
@@ -31,9 +31,9 @@
 #include <sys/socket.h>
 #include <unistd.h>
 
-#include "sd-bus.h"
-#include "sd-daemon.h"
-#include "sd-login.h"
+#include <systemd/sd-bus.h>
+#include <systemd/sd-daemon.h>
+#include <systemd/sd-login.h>
 
 #include "alloc-util.h"
 #include "bus-common-errors.h"
diff --git a/src/system/systemd/Makefile b/src/system/systemd/Makefile
index 16e2681222..8abfa2bf9d 100644
--- a/src/system/systemd/Makefile
+++ b/src/system/systemd/Makefile
@@ -20,6 +20,9 @@
 #
 #  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_SOURCES = \
 	src/core/main.c
 
@@ -61,3 +64,4 @@ dist_systemunit_DATA_busnames += \
 BUSNAMES_TARGET_WANTS += \
 	org.freedesktop.systemd1.busname
 
+include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/system/systemd/main.c b/src/system/systemd/main.c
index 5346392d73..bc151cde85 100644
--- a/src/system/systemd/main.c
+++ b/src/system/systemd/main.c
@@ -35,8 +35,8 @@
 #include <valgrind/valgrind.h>
 #endif
 
-#include "sd-bus.h"
-#include "sd-daemon.h"
+#include <systemd/sd-bus.h>
+#include <systemd/sd-daemon.h>
 
 #include "alloc-util.h"
 #include "architecture.h"
diff --git a/src/systemd-activate/Makefile b/src/systemd-activate/Makefile
index 113d71fb8b..133622ffb0 100644
--- a/src/systemd-activate/Makefile
+++ b/src/systemd-activate/Makefile
@@ -20,6 +20,9 @@
 #
 #  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-activate
@@ -30,3 +33,4 @@ systemd_activate_SOURCES = \
 systemd_activate_LDADD = \
 	libshared.la
 
+include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/systemd-activate/activate.c b/src/systemd-activate/activate.c
index 0db4967edb..94f99028e5 100644
--- a/src/systemd-activate/activate.c
+++ b/src/systemd-activate/activate.c
@@ -24,7 +24,7 @@
 #include <sys/wait.h>
 #include <unistd.h>
 
-#include "sd-daemon.h"
+#include <systemd/sd-daemon.h>
 
 #include "alloc-util.h"
 #include "fd-util.h"
diff --git a/src/systemd-analyze/Makefile b/src/systemd-analyze/Makefile
index 5b2f58d7e4..c8a3d805fd 100644
--- a/src/systemd-analyze/Makefile
+++ b/src/systemd-analyze/Makefile
@@ -20,6 +20,9 @@
 #
 #  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_analyze_SOURCES = \
 	src/analyze/analyze.c \
 	src/analyze/analyze-verify.c \
@@ -33,3 +36,4 @@ systemd_analyze_CFLAGS = \
 systemd_analyze_LDADD = \
 	libcore.la
 
+include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/systemd-analyze/analyze.c b/src/systemd-analyze/analyze.c
index 1a28093b07..13bcc8ebdd 100644
--- a/src/systemd-analyze/analyze.c
+++ b/src/systemd-analyze/analyze.c
@@ -23,7 +23,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "sd-bus.h"
+#include <systemd/sd-bus.h>
 
 #include "alloc-util.h"
 #include "analyze-verify.h"
diff --git a/src/systemd-ask-password/Makefile b/src/systemd-ask-password/Makefile
index d4fa8ac203..11f3c8038a 100644
--- a/src/systemd-ask-password/Makefile
+++ b/src/systemd-ask-password/Makefile
@@ -20,9 +20,13 @@
 #
 #  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_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/src/systemd-backlight/Makefile b/src/systemd-backlight/Makefile
index 6c736f11d8..7ed3b0a64c 100644
--- a/src/systemd-backlight/Makefile
+++ b/src/systemd-backlight/Makefile
@@ -20,6 +20,9 @@
 #
 #  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
@@ -37,3 +40,4 @@ endif
 EXTRA_DIST += \
 	units/systemd-backlight@.service.in
 
+include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/systemd-binfmt/Makefile b/src/systemd-binfmt/Makefile
index 233df7c7a7..45a3d5056d 100644
--- a/src/systemd-binfmt/Makefile
+++ b/src/systemd-binfmt/Makefile
@@ -20,6 +20,9 @@
 #
 #  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
@@ -50,3 +53,4 @@ endif
 EXTRA_DIST += \
 	units/systemd-binfmt.service.in
 
+include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/systemd-bootchart/Makefile b/src/systemd-bootchart/Makefile
index 217b00d7e3..91a06ed1a2 100644
--- a/src/systemd-bootchart/Makefile
+++ b/src/systemd-bootchart/Makefile
@@ -20,6 +20,9 @@
 #
 #  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_BOOTCHART),)
 systemd_bootchart_SOURCES = \
 	src/bootchart/bootchart.c \
@@ -45,3 +48,4 @@ endif
 EXTRA_DIST += \
 	units/systemd-bootchart.service.in
 
+include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/systemd-bootchart/bootchart.c b/src/systemd-bootchart/bootchart.c
index 77d158f5f9..8755b2d884 100644
--- a/src/systemd-bootchart/bootchart.c
+++ b/src/systemd-bootchart/bootchart.c
@@ -44,7 +44,7 @@
 #include <time.h>
 #include <unistd.h>
 
-#include "sd-journal.h"
+#include <systemd/sd-journal.h>
 
 #include "alloc-util.h"
 #include "bootchart.h"
diff --git a/src/systemd-cgls/Makefile b/src/systemd-cgls/Makefile
index 3235760784..72f43638b1 100644
--- a/src/systemd-cgls/Makefile
+++ b/src/systemd-cgls/Makefile
@@ -20,9 +20,13 @@
 #
 #  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_cgls_SOURCES = \
 	src/cgls/cgls.c
 
 systemd_cgls_LDADD = \
 	libshared.la
 
+include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/systemd-cgls/cgls.c b/src/systemd-cgls/cgls.c
index b839fadd04..5862cdb282 100644
--- a/src/systemd-cgls/cgls.c
+++ b/src/systemd-cgls/cgls.c
@@ -23,7 +23,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "sd-bus.h"
+#include <systemd/sd-bus.h>
 
 #include "alloc-util.h"
 #include "bus-error.h"
diff --git a/src/systemd-cgroups-agent/Makefile b/src/systemd-cgroups-agent/Makefile
index 6ca248605f..5c7d9d03ab 100644
--- a/src/systemd-cgroups-agent/Makefile
+++ b/src/systemd-cgroups-agent/Makefile
@@ -20,9 +20,13 @@
 #
 #  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_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-cgroups-agent/cgroups-agent.c b/src/systemd-cgroups-agent/cgroups-agent.c
index aadfba0707..79098b5f2c 100644
--- a/src/systemd-cgroups-agent/cgroups-agent.c
+++ b/src/systemd-cgroups-agent/cgroups-agent.c
@@ -19,7 +19,7 @@
 
 #include <stdlib.h>
 
-#include "sd-bus.h"
+#include <systemd/sd-bus.h>
 
 #include "bus-util.h"
 #include "log.h"
diff --git a/src/systemd-cgtop/Makefile b/src/systemd-cgtop/Makefile
index e1fd455170..5e379895a8 100644
--- a/src/systemd-cgtop/Makefile
+++ b/src/systemd-cgtop/Makefile
@@ -20,9 +20,13 @@
 #
 #  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_cgtop_SOURCES = \
 	src/cgtop/cgtop.c
 
 systemd_cgtop_LDADD = \
 	libshared.la
 
+include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/systemd-cgtop/cgtop.c b/src/systemd-cgtop/cgtop.c
index 60d6da3246..5d021e5ef4 100644
--- a/src/systemd-cgtop/cgtop.c
+++ b/src/systemd-cgtop/cgtop.c
@@ -26,7 +26,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "sd-bus.h"
+#include <systemd/sd-bus.h>
 
 #include "alloc-util.h"
 #include "bus-error.h"
diff --git a/src/systemd-cryptsetup/Makefile b/src/systemd-cryptsetup/Makefile
index 23e43a6999..c97df5f959 100644
--- a/src/systemd-cryptsetup/Makefile
+++ b/src/systemd-cryptsetup/Makefile
@@ -20,6 +20,9 @@
 #
 #  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
@@ -53,3 +56,4 @@ SYSINIT_TARGET_WANTS += \
 
 endif
 
+include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/systemd-cryptsetup/cryptsetup.c b/src/systemd-cryptsetup/cryptsetup.c
index 2ef966257a..9d8156697d 100644
--- a/src/systemd-cryptsetup/cryptsetup.c
+++ b/src/systemd-cryptsetup/cryptsetup.c
@@ -23,7 +23,7 @@
 #include <string.h>
 #include <sys/mman.h>
 
-#include "sd-device.h"
+#include <systemd/sd-device.h>
 
 #include "alloc-util.h"
 #include "ask-password-api.h"
diff --git a/src/systemd-delta/Makefile b/src/systemd-delta/Makefile
index 626f444643..b9124f86ea 100644
--- a/src/systemd-delta/Makefile
+++ b/src/systemd-delta/Makefile
@@ -20,9 +20,13 @@
 #
 #  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_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
index 99672a8578..6589e06525 100644
--- a/src/systemd-escape/Makefile
+++ b/src/systemd-escape/Makefile
@@ -20,9 +20,13 @@
 #
 #  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_escape_SOURCES = \
 	src/escape/escape.c
 
 systemd_escape_LDADD = \
 	libshared.la
 
+include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/systemd-notify/Makefile b/src/systemd-notify/Makefile
index 1ad00ad96c..c5402385b9 100644
--- a/src/systemd-notify/Makefile
+++ b/src/systemd-notify/Makefile
@@ -20,9 +20,13 @@
 #
 #  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_notify_SOURCES = \
 	src/notify/notify.c
 
 systemd_notify_LDADD = \
 	libshared.la
 
+include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/systemd-notify/notify.c b/src/systemd-notify/notify.c
index 49f97c61d9..b18fb5938f 100644
--- a/src/systemd-notify/notify.c
+++ b/src/systemd-notify/notify.c
@@ -23,7 +23,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 
-#include "sd-daemon.h"
+#include <systemd/sd-daemon.h>
 
 #include "alloc-util.h"
 #include "env-util.h"
diff --git a/src/systemd-nspawn/Makefile b/src/systemd-nspawn/Makefile
index 0bcc238b72..12b002c868 100644
--- a/src/systemd-nspawn/Makefile
+++ b/src/systemd-nspawn/Makefile
@@ -21,7 +21,7 @@
 #  You should have received a copy of the GNU Lesser General Public License
 #  along with systemd; If not, see <http://www.gnu.org/licenses/>.
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
-include $(topsrcdir)/automake.head.mk
+include $(topsrcdir)/build-aux/Makefile.head.mk
 
 systemd_nspawn_SOURCES = \
 	src/nspawn/nspawn.c \
@@ -83,4 +83,4 @@ $(outdir)/loopback-setup.h: $(topsrcdir)/src/libcore/loopback-setup.h; $(CP) $<
 
 $(outdir)/nspawn.o: $(outdir)/loopback-setup.h
 
-include $(topsrcdir)/automake.tail.mk
+include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/systemd-path/Makefile b/src/systemd-path/Makefile
index 5e8dbb76a8..19eb6bd10a 100644
--- a/src/systemd-path/Makefile
+++ b/src/systemd-path/Makefile
@@ -20,9 +20,13 @@
 #
 #  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_path_SOURCES = \
 	src/path/path.c
 
 systemd_path_LDADD = \
 	libshared.la
 
+include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/systemd-path/path.c b/src/systemd-path/path.c
index 61d877fcf8..80268ed874 100644
--- a/src/systemd-path/path.c
+++ b/src/systemd-path/path.c
@@ -22,7 +22,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "sd-path.h"
+#include <systemd/sd-path.h>
 
 #include "alloc-util.h"
 #include "log.h"
diff --git a/src/systemd-quotacheck/Makefile b/src/systemd-quotacheck/Makefile
index a3fb56525e..3b90e6efab 100644
--- a/src/systemd-quotacheck/Makefile
+++ b/src/systemd-quotacheck/Makefile
@@ -20,6 +20,9 @@
 #
 #  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
@@ -40,3 +43,4 @@ EXTRA_DIST += \
 nodist_systemunit_DATA += \
 	units/quotaon.service
 
+include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/systemd-random-seed/Makefile b/src/systemd-random-seed/Makefile
index d245918018..d4695c8fb4 100644
--- a/src/systemd-random-seed/Makefile
+++ b/src/systemd-random-seed/Makefile
@@ -20,6 +20,9 @@
 #
 #  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
@@ -41,3 +44,4 @@ endif
 EXTRA_DIST += \
 	units/systemd-random-seed.service.in
 
+include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/systemd-remount-fs/Makefile b/src/systemd-remount-fs/Makefile
index 6878b4703f..91baa27bf1 100644
--- a/src/systemd-remount-fs/Makefile
+++ b/src/systemd-remount-fs/Makefile
@@ -20,6 +20,9 @@
 #
 #  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_remount_fs_SOURCES = \
 	src/remount-fs/remount-fs.c \
 	src/core/mount-setup.c \
@@ -28,3 +31,4 @@ systemd_remount_fs_SOURCES = \
 systemd_remount_fs_LDADD = \
 	libshared.la
 
+include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/systemd-reply-password/Makefile b/src/systemd-reply-password/Makefile
index 1ff173bce2..30283141aa 100644
--- a/src/systemd-reply-password/Makefile
+++ b/src/systemd-reply-password/Makefile
@@ -20,9 +20,13 @@
 #
 #  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_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-rfkill/Makefile b/src/systemd-rfkill/Makefile
index 2ec5e136e0..331ecb7130 100644
--- a/src/systemd-rfkill/Makefile
+++ b/src/systemd-rfkill/Makefile
@@ -20,6 +20,9 @@
 #
 #  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
@@ -40,3 +43,4 @@ endif
 EXTRA_DIST += \
 	units/systemd-rfkill.service.in
 
+include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/systemd-rfkill/rfkill.c b/src/systemd-rfkill/rfkill.c
index 0acdf229ed..f0b0ad9275 100644
--- a/src/systemd-rfkill/rfkill.c
+++ b/src/systemd-rfkill/rfkill.c
@@ -21,7 +21,7 @@
 #include <poll.h>
 
 #include "libudev.h"
-#include "sd-daemon.h"
+#include <systemd/sd-daemon.h>
 
 #include "alloc-util.h"
 #include "escape.h"
diff --git a/src/systemd-run/Makefile b/src/systemd-run/Makefile
index 8b1bed6f6f..afa2d0f34c 100644
--- a/src/systemd-run/Makefile
+++ b/src/systemd-run/Makefile
@@ -20,9 +20,13 @@
 #
 #  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_run_SOURCES = \
 	src/run/run.c
 
 systemd_run_LDADD = \
 	libshared.la
 
+include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/systemd-run/run.c b/src/systemd-run/run.c
index e7f4c21f73..67706f84a0 100644
--- a/src/systemd-run/run.c
+++ b/src/systemd-run/run.c
@@ -20,8 +20,8 @@
 #include <getopt.h>
 #include <stdio.h>
 
-#include "sd-bus.h"
-#include "sd-event.h"
+#include <systemd/sd-bus.h>
+#include <systemd/sd-event.h>
 
 #include "alloc-util.h"
 #include "bus-error.h"
diff --git a/src/systemd-shutdown/Makefile b/src/systemd-shutdown/Makefile
index 1c5d529ca7..0695f3927d 100644
--- a/src/systemd-shutdown/Makefile
+++ b/src/systemd-shutdown/Makefile
@@ -20,6 +20,9 @@
 #
 #  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_shutdown_SOURCES = \
 	src/core/umount.c \
 	src/core/umount.h \
@@ -32,3 +35,4 @@ systemd_shutdown_SOURCES = \
 systemd_shutdown_LDADD = \
 	libshared.la
 
+include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/systemd-timedate/Makefile b/src/systemd-timedate/Makefile
index c86c12b650..ea9b36efbc 100644
--- a/src/systemd-timedate/Makefile
+++ b/src/systemd-timedate/Makefile
@@ -20,6 +20,9 @@
 #
 #  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
@@ -73,3 +76,4 @@ polkitpolicy_in_files += \
 EXTRA_DIST += \
 	units/systemd-timedated.service.in
 
+include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/systemd-timedate/timedatectl.c b/src/systemd-timedate/timedatectl.c
index 097963b41b..28546a0ad1 100644
--- a/src/systemd-timedate/timedatectl.c
+++ b/src/systemd-timedate/timedatectl.c
@@ -23,7 +23,7 @@
 #include <stdbool.h>
 #include <stdlib.h>
 
-#include "sd-bus.h"
+#include <systemd/sd-bus.h>
 
 #include "bus-error.h"
 #include "bus-util.h"
diff --git a/src/systemd-timedate/timedated.c b/src/systemd-timedate/timedated.c
index 2a10135fba..f5ca319640 100644
--- a/src/systemd-timedate/timedated.c
+++ b/src/systemd-timedate/timedated.c
@@ -21,9 +21,9 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "sd-bus.h"
-#include "sd-event.h"
-#include "sd-messages.h"
+#include <systemd/sd-bus.h>
+#include <systemd/sd-event.h>
+#include <systemd/sd-messages.h>
 
 #include "alloc-util.h"
 #include "bus-common-errors.h"
diff --git a/src/systemd-timesync/Makefile b/src/systemd-timesync/Makefile
index 9bed9c694e..a6ad358562 100644
--- a/src/systemd-timesync/Makefile
+++ b/src/systemd-timesync/Makefile
@@ -20,6 +20,9 @@
 #
 #  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 \
@@ -58,3 +61,4 @@ EXTRA_DIST += \
 	units/systemd-timesyncd.service.in \
 	src/timesync/timesyncd.conf.in
 
+include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/systemd-timesync/timesyncd-manager.c b/src/systemd-timesync/timesyncd-manager.c
index d5e16db3a0..6a4b52af69 100644
--- a/src/systemd-timesync/timesyncd-manager.c
+++ b/src/systemd-timesync/timesyncd-manager.c
@@ -29,7 +29,7 @@
 #include <sys/types.h>
 #include <time.h>
 
-#include "sd-daemon.h"
+#include <systemd/sd-daemon.h>
 
 #include "alloc-util.h"
 #include "fd-util.h"
diff --git a/src/systemd-timesync/timesyncd-manager.h b/src/systemd-timesync/timesyncd-manager.h
index efe3e60d3e..fd25647725 100644
--- a/src/systemd-timesync/timesyncd-manager.h
+++ b/src/systemd-timesync/timesyncd-manager.h
@@ -19,9 +19,9 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "sd-event.h"
-#include "sd-network.h"
-#include "sd-resolve.h"
+#include <systemd/sd-event.h>
+#include <systemd/sd-network.h>
+#include <systemd/sd-resolve.h>
 
 #include "list.h"
 #include "ratelimit.h"
diff --git a/src/systemd-timesync/timesyncd.c b/src/systemd-timesync/timesyncd.c
index 23e19159e0..388eefac48 100644
--- a/src/systemd-timesync/timesyncd.c
+++ b/src/systemd-timesync/timesyncd.c
@@ -17,8 +17,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "sd-daemon.h"
-#include "sd-event.h"
+#include <systemd/sd-daemon.h>
+#include <systemd/sd-event.h>
 
 #include "capability-util.h"
 #include "clock-util.h"
diff --git a/src/systemd-tmpfiles/Makefile b/src/systemd-tmpfiles/Makefile
index 1e3664b0b4..ffb01ae3d8 100644
--- a/src/systemd-tmpfiles/Makefile
+++ b/src/systemd-tmpfiles/Makefile
@@ -20,6 +20,9 @@
 #
 #  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
@@ -78,3 +81,4 @@ EXTRA_DIST += \
 	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
index f70a195b44..37b51da33b 100644
--- a/src/systemd-tty-ask-password-agent/Makefile
+++ b/src/systemd-tty-ask-password-agent/Makefile
@@ -20,9 +20,13 @@
 #
 #  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_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/src/systemd-update-done/Makefile b/src/systemd-update-done/Makefile
index e1c4905bc3..ae592db650 100644
--- a/src/systemd-update-done/Makefile
+++ b/src/systemd-update-done/Makefile
@@ -20,9 +20,13 @@
 #
 #  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_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
index 5f96d09c9c..182c7534e7 100644
--- a/src/systemd-update-utmp/Makefile
+++ b/src/systemd-update-utmp/Makefile
@@ -20,6 +20,9 @@
 #
 #  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_update_utmp_SOURCES = \
 	src/update-utmp/update-utmp.c
 
@@ -31,3 +34,4 @@ systemd_update_utmp_LDADD = \
 	libshared.la \
 	$(AUDIT_LIBS)
 
+include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/systemd-update-utmp/update-utmp.c b/src/systemd-update-utmp/update-utmp.c
index 8ae4a8a833..fedcaef91c 100644
--- a/src/systemd-update-utmp/update-utmp.c
+++ b/src/systemd-update-utmp/update-utmp.c
@@ -25,7 +25,7 @@
 #include <libaudit.h>
 #endif
 
-#include "sd-bus.h"
+#include <systemd/sd-bus.h>
 
 #include "alloc-util.h"
 #include "bus-error.h"
diff --git a/src/systemd-vconsole/Makefile b/src/systemd-vconsole/Makefile
index a53d0009fa..987745d298 100644
--- a/src/systemd-vconsole/Makefile
+++ b/src/systemd-vconsole/Makefile
@@ -20,6 +20,9 @@
 #
 #  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
@@ -44,3 +47,4 @@ 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/sysusers/Makefile b/src/sysusers/Makefile
index 7d62d07c57..648100e5de 100644
--- a/src/sysusers/Makefile
+++ b/src/sysusers/Makefile
@@ -20,6 +20,9 @@
 #
 #  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
@@ -55,3 +58,4 @@ EXTRA_DIST += \
 	sysusers.d/systemd-remote.conf.m4 \
 	sysusers.d/basic.conf.in
 
+include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/sysv-generator/Makefile b/src/sysv-generator/Makefile
index 4c29f93cba..f6de146408 100644
--- a/src/sysv-generator/Makefile
+++ b/src/sysv-generator/Makefile
@@ -20,9 +20,13 @@
 #
 #  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/test/Makefile b/src/test/Makefile
index 36fc448226..f416b4aadf 100644
--- a/src/test/Makefile
+++ b/src/test/Makefile
@@ -20,6 +20,9 @@
 #
 #  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
 
@@ -29,3 +32,4 @@ test_id128_LDADD = \
 tests += \
 	test-id128
 
+include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/test/test-condition.c b/src/test/test-condition.c
index 8903d10db7..c4ff41dd0e 100644
--- a/src/test/test-condition.c
+++ b/src/test/test-condition.c
@@ -17,7 +17,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "sd-id128.h"
+#include <systemd/sd-id128.h>
 
 #include "alloc-util.h"
 #include "apparmor-util.h"
diff --git a/src/test/test-daemon.c b/src/test/test-daemon.c
index 4ce00f4b1f..d181bee214 100644
--- a/src/test/test-daemon.c
+++ b/src/test/test-daemon.c
@@ -19,7 +19,7 @@
 
 #include <unistd.h>
 
-#include "sd-daemon.h"
+#include <systemd/sd-daemon.h>
 
 #include "strv.h"
 
diff --git a/src/test/test-helper.h b/src/test/test-helper.h
index ddb10f88fd..01068da347 100644
--- a/src/test/test-helper.h
+++ b/src/test/test-helper.h
@@ -19,7 +19,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "sd-daemon.h"
+#include <systemd/sd-daemon.h>
 
 #include "macro.h"
 
diff --git a/src/test/test-id128.c b/src/test/test-id128.c
index 96aa008c06..90c4860e2a 100644
--- a/src/test/test-id128.c
+++ b/src/test/test-id128.c
@@ -19,8 +19,8 @@
 
 #include <string.h>
 
-#include "sd-daemon.h"
-#include "sd-id128.h"
+#include <systemd/sd-daemon.h>
+#include <systemd/sd-id128.h>
 
 #include "alloc-util.h"
 #include "macro.h"
diff --git a/src/test/test-netlink-manual.c b/src/test/test-netlink-manual.c
index 79ff6ae74d..fe15a56aba 100644
--- a/src/test/test-netlink-manual.c
+++ b/src/test/test-netlink-manual.c
@@ -23,7 +23,7 @@
 #include <net/if.h>
 #include <linux/if_tunnel.h>
 
-#include "sd-netlink.h"
+#include <systemd/sd-netlink.h>
 
 #include "macro.h"
 #include "util.h"
diff --git a/src/udev/Makefile b/src/udev/Makefile
index e599d05a73..8058082c05 100644
--- a/src/udev/Makefile
+++ b/src/udev/Makefile
@@ -20,6 +20,9 @@
 #
 #  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
 
@@ -281,3 +284,4 @@ EXTRA_DIST += \
 	test/sysv-generator-test.py \
 	test/mocks/fsck
 
+include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/udev/ata_id/Makefile b/src/udev/ata_id/Makefile
index 5a0ffb44c9..e70e2573bd 100644
--- a/src/udev/ata_id/Makefile
+++ b/src/udev/ata_id/Makefile
@@ -20,6 +20,9 @@
 #
 #  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
 
@@ -29,3 +32,4 @@ ata_id_LDADD = \
 udevlibexec_PROGRAMS += \
 	ata_id
 
+include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/udev/cdrom_id/Makefile b/src/udev/cdrom_id/Makefile
index ad1c13a19d..f7583cfb70 100644
--- a/src/udev/cdrom_id/Makefile
+++ b/src/udev/cdrom_id/Makefile
@@ -20,6 +20,9 @@
 #
 #  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
 
@@ -32,3 +35,4 @@ udevlibexec_PROGRAMS += \
 dist_udevrules_DATA += \
 	rules/60-cdrom_id.rules
 
+include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/udev/collect/Makefile b/src/udev/collect/Makefile
index 2572f7a8eb..88dbaa1d82 100644
--- a/src/udev/collect/Makefile
+++ b/src/udev/collect/Makefile
@@ -20,6 +20,9 @@
 #
 #  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
 
@@ -29,3 +32,4 @@ collect_LDADD = \
 udevlibexec_PROGRAMS += \
 	collect
 
+include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/udev/mtd_probe/Makefile b/src/udev/mtd_probe/Makefile
index 6629c8c04d..719993ed0f 100644
--- a/src/udev/mtd_probe/Makefile
+++ b/src/udev/mtd_probe/Makefile
@@ -20,6 +20,9 @@
 #
 #  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 \
@@ -31,3 +34,4 @@ dist_udevrules_DATA += \
 udevlibexec_PROGRAMS += \
 	mtd_probe
 
+include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/udev/net/link-config.c b/src/udev/net/link-config.c
index 15145fc5eb..e712d2ce73 100644
--- a/src/udev/net/link-config.c
+++ b/src/udev/net/link-config.c
@@ -20,7 +20,7 @@
 #include <netinet/ether.h>
 #include <linux/netdevice.h>
 
-#include "sd-netlink.h"
+#include <systemd/sd-netlink.h>
 
 #include "alloc-util.h"
 #include "conf-files.h"
diff --git a/src/udev/scsi_id/Makefile b/src/udev/scsi_id/Makefile
index 8f1ac56ba0..eaf5a51734 100644
--- a/src/udev/scsi_id/Makefile
+++ b/src/udev/scsi_id/Makefile
@@ -20,6 +20,9 @@
 #
 #  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 \
@@ -35,3 +38,4 @@ udevlibexec_PROGRAMS += \
 EXTRA_DIST += \
 	src/udev/scsi_id/README
 
+include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/udev/udev-builtin-blkid.c b/src/udev/udev-builtin-blkid.c
index ed0ea5ce5f..62cd93264b 100644
--- a/src/udev/udev-builtin-blkid.c
+++ b/src/udev/udev-builtin-blkid.c
@@ -27,7 +27,7 @@
 #include <string.h>
 #include <sys/stat.h>
 
-#include "sd-id128.h"
+#include <systemd/sd-id128.h>
 
 #include "alloc-util.h"
 #include "efivars.h"
diff --git a/src/udev/udev-builtin-hwdb.c b/src/udev/udev-builtin-hwdb.c
index f4a065a97d..b96f39ba20 100644
--- a/src/udev/udev-builtin-hwdb.c
+++ b/src/udev/udev-builtin-hwdb.c
@@ -22,7 +22,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "sd-hwdb.h"
+#include <systemd/sd-hwdb.h>
 
 #include "alloc-util.h"
 #include "hwdb-util.h"
diff --git a/src/udev/udev-builtin-uaccess.c b/src/udev/udev-builtin-uaccess.c
index 3ebe36f043..2c27116ae9 100644
--- a/src/udev/udev-builtin-uaccess.c
+++ b/src/udev/udev-builtin-uaccess.c
@@ -22,7 +22,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "sd-login.h"
+#include <systemd/sd-login.h>
 
 #include "login-util.h"
 #include "logind-acl.h"
diff --git a/src/udev/udevd.c b/src/udev/udevd.c
index bb92f16352..37489c6ce7 100644
--- a/src/udev/udevd.c
+++ b/src/udev/udevd.c
@@ -40,8 +40,8 @@
 #include <sys/wait.h>
 #include <unistd.h>
 
-#include "sd-daemon.h"
-#include "sd-event.h"
+#include <systemd/sd-daemon.h>
+#include <systemd/sd-event.h>
 
 #include "alloc-util.h"
 #include "cgroup-util.h"
diff --git a/src/udev/v4l_id/Makefile b/src/udev/v4l_id/Makefile
index 475b00bf21..c2815b6809 100644
--- a/src/udev/v4l_id/Makefile
+++ b/src/udev/v4l_id/Makefile
@@ -20,6 +20,9 @@
 #
 #  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
 
@@ -32,3 +35,4 @@ udevlibexec_PROGRAMS += \
 dist_udevrules_DATA += \
 	rules/60-persistent-v4l.rules
 
+include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/test/Makefile b/test/Makefile
index 7114c25c95..1d826c0bcd 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -20,6 +20,9 @@
 #
 #  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 \
@@ -843,3 +846,4 @@ test_arphrd_list_SOURCES = \
 test_arphrd_list_LDADD = \
 	libbasic.la
 
+include $(topsrcdir)/build-aux/Makefile.tail.mk
author	Luke Shumaker <lukeshu@sbcglobal.net>	2016-06-01 14:50:48 -0400
committer	Luke Shumaker <lukeshu@sbcglobal.net>	2016-06-01 14:50:48 -0400
commit	8ab6d6ae4a1fbefe7c772a8513e5d5a38f49a302 (patch)
tree	20000a90a738370fff9e44c5e8fbaccea08e949c
parent	7308e9ffd1933c71e6134e1b9632683977a12f47 (diff)
parent	db51244983a38d901fefd5e2a090f0e66343d98d (diff)