134 files changed, 567 insertions, 456 deletions

diff --git a/am-pat-rules.mk b/am-pat-rules.mk
index fe44940103..14ec302ae4 100644
--- a/am-pat-rules.mk
+++ b/am-pat-rules.mk
@@ -1,15 +1,11 @@
 $(outdir)/%.o: $(srcdir)/%.c | $(outdir)/.deps
-	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
-	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-	$(am__mv) $$depbase.Tpo $$depbase.Po
+	$(AM_V_CC)$(COMPILE)   -c -o $@ $<
 
 $(outdir)/%.lo: $(srcdir)/%.c | $(outdir)/.deps
-	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
-	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-	$(am__mv) $$depbase.Tpo $$depbase.Plo
+	$(AM_V_CC)$(LTCOMPILE) -c -o $@ $<
 
 $(outdir)/.deps:
 	$(AM_V_at)$(MKDIR_P) $@
 
 $(outdir)/%.la:
-	$(AM_V_CCLD)$(LINK) $^
+	$(AM_V_CCLD)$(LINK) $(filter-out .var%,$^)
diff --git a/am-pretty.mk b/am-pretty.mk
index 9f67d48838..104a4806c0 100644
--- a/am-pretty.mk
+++ b/am-pretty.mk
@@ -20,6 +20,8 @@
 #
 #  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 ?= 
+
 AM_V_M4 = $(AM_V_M4_$(V))
 AM_V_M4_ = $(AM_V_M4_$(AM_DEFAULT_VERBOSITY))
 AM_V_M4_0 = @echo "  M4      " $@;
diff --git a/am-tools.mk b/am-tools.mk
index d012b69cae..35fe16482b 100644
--- a/am-tools.mk
+++ b/am-tools.mk
@@ -1,11 +1,6 @@
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CFLAGS) $(CFLAGS)
-
 CCLD = $(CC)
-LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_CPPFLAGS += -MT $@ -MD -MP -MF $(@D)/$(DEPDIR)/$(basename $(@F)).P$(patsubst .%,%,$(suffix $(@F)))
+
+COMPILE   = $(CC) $(ALL_CPPFLAGS) $(ALL_CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(ALL_LIBTOOLFLAGS) --mode=compile $(CC) $(ALL_CPPFLAGS) $(ALL_CFLAGS)
+LINK      = $(LIBTOOL) $(AM_V_lt) --tag=CC $(ALL_LIBTOOLFLAGS) --mode=link $(CCLD) $(ALL_CFLAGS) $(ALL_LDFLAGS) -o $@
diff --git a/autogen.sh b/autogen.sh
index bf08658f1a..607a9682dd 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -28,7 +28,7 @@ if [ -f .git/hooks/pre-commit.sample ] && [ ! -f .git/hooks/pre-commit ]; then
         echo "Activated pre-commit hook." || :
 fi
 
-intltoolize --force
+intltoolize --force --automake
 autoreconf --force --install --symlink
 
 libdir() {
diff --git a/automake.tail.mk b/automake.tail.mk
index a24820b71c..ba31935793 100644
--- a/automake.tail.mk
+++ b/automake.tail.mk
@@ -56,8 +56,9 @@ _am_phony = build install uninstall mostlyclean clean distclean maintainer-clean
 .PHONY: $(addprefix $(outdir)/,$(_am_phony))
 
 $(addprefix $(outdir)/,uninstall mostlyclean clean distclean maintainer-clean)::
-	$(RM) -- $(sort $(_am_$(@F)/$(@D)))
-	$(RMDIRS) $(sort $(dir $(_am_$(@F)/$(@D)))) 2>/dev/null || $(TRUE)
+	$(RM)    -- $(filter-out %/,$(sort $(_am_$(@F)/$(@D))))
+	$(RM) -r -- $(filter     %/,$(sort $(_am_$(@F)/$(@D))))
+	$(RMDIRS) $(sort $(dir $(patsubst %/,%,$(_am_$(@F)/$(@D))))) 2>/dev/null || $(TRUE)
 
 # 'build' and 'install' must be defined later, because the
 # am_*_files/* variables might not be complete yet.
diff --git a/common.each.tail.mk b/common.each.tail.mk
index d9f9e4f35c..871225a99e 100644
--- a/common.each.tail.mk
+++ b/common.each.tail.mk
@@ -1 +1,3 @@
+-include $(outdir)/$(DEPDIR)/*.P*
+am_clean_files += *.o *.lo .deps/ .libs/
 include $(topsrcdir)/am-pat-rules.mk
diff --git a/common.once.head.mk b/common.once.head.mk
index 7aff19a067..9412d3cb9c 100644
--- a/common.once.head.mk
+++ b/common.once.head.mk
@@ -20,16 +20,20 @@
 #
 #  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
+AM_CPPFLAGS     = @OUR_CPPFLAGS@
+AM_CFLAGS       = @OUR_CFLAGS@
+AM_LDFLAGS      = @OUR_LDFLAGS@
+AM_LIBTOOLFLAGS = 
 
-GCC_COLORS ?= 'ooh, shiny!'
-export GCC_COLORS
+ALL_CPPFLAGS     = $(CPPFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS/$(@D))
+ALL_CFLAGS       = $(CFLAGS) $(AM_CFLAGS) $(CFLAGS/$(@D))
+ALL_LDFLAGS      = $(LDFLAGS) $(AM_LDFLAGS) $(LDFLAGS/$(@D))
+ALL_LIBTOOLFLAGS = $(LIBTOOLFLAGS) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS/$(@D))
 
-SUBDIRS = . po
+AM_CPPFLAGS += -include $(topoutdir)/config.h
 
-CPPFLAGS += -include $(topoutdir)/config.h
+GCC_COLORS ?= 'ooh, shiny!'
+export GCC_COLORS
 
 # remove targets if the command fails
 .DELETE_ON_ERROR:
@@ -60,14 +64,25 @@ define generate-sym-test
 	$(AM_V_at)printf 'return 0; }\n' >> $@
 endef
 
-# from GNU automake
 
-DEFAULT_INCLUDES = -I.
-depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
-am__depfiles_maybe = depfiles
-DEPDIR = .deps
+lib_LTLIBRARIES
+pkginclude_HEADERS
+
+o = $(if $(filter lib%,$(notdir $2)),lo,o)
+m = $(subst -,_,$(subst .,_,$2))
+define amtarget2dir
+am_out_files += $(notdir $2)
+LDFLAGS/$(outdir) += $($m_LDFLAGS)
+CFLAGS/$(outdir) += $($m_CFLAGS)
+LDFLAGS/$(outdir) += $($m_LDFLAGS)
+$(outdir)/$(notdir $2): $(filter %.$o,$(patsubst $(addsuffix /%.c,$1),%.$o,$($m_SOURCES))) $($m_LIBADD)
+
+am_out_files += $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES)
+am_sys_files += $(addprefix $(libdir)/,$(lib_LTLIBRARIES))
+endef
 
-am__mv = mv -f
+$(topoutdir)/config.mk: $(topoutdir)/config.status $(topsrcdir)/config.mk.in
+	cd $(topoutdir) && ./config.status
 
 include $(topsrcdir)/am-pretty.mk
 include $(topsrcdir)/am-tools.mk
diff --git a/config.mk.in b/config.mk.in
index 814dec346a..e6fc618bda 100644
--- a/config.mk.in
+++ b/config.mk.in
@@ -22,10 +22,34 @@
 #  along with systemd; If not, see <http://www.gnu.org/licenses/>.
 
 ifeq ($(topsrcdir),)
+
 MAKEFLAGS += --no-builtin-rules --no-builtin-variables --warn-undefined-variables
+.LIBPATTERNS = lib%.so lib%.a
+
 topoutdir := $(patsubst %/,%,$(dir $(lastword $(MAKEFILE_LIST))))
 abs_topsrcdir := @abs_top_srcdir@
-topsrcdir = $(if $(am_path),$(call am_path,$(abs_topsrcdir)),$(abs_topsrcdir))
+topsrcdir = $(if $(value am_path),$(call am_path,$(abs_topsrcdir)),$(abs_topsrcdir))
+
+# Standard package directories
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+
+datarootdir = @datarootdir@
+datadir = @datadir@
+sysconfdir = @sysconfdir@
+sharedstatedir = @sharedstatedir@
+localstatedir = @localstatedir@
+runstatedir = @runstatedir@
+
+includedir = @includedir@
+docdir = @docdir@
+libdir = @libdir@
+localedir = @localedir@
+mandir = @mandir@
 
 # Dirs of external packages
 dbuspolicydir=@dbuspolicydir@
@@ -80,13 +104,19 @@ rootlibexecdir=$(rootprefix)/lib/systemd
 
 # Libraries we depend on
 libbasic.CPPFLAGS      = -I$(topsrcdir)/src/libbasic -I$(topoutdir)/src/libbasic
-libbasic.DEPENDS       = $(topoutdir)/src/libbasic/libbasic.la
+libbasic.DEPENDS       =   $(topoutdir)/src/libbasic/libbasic.la
 libshared.CPPFLAGS     = -I$(topsrcdir)/src/libshared -I$(topoutdir)/src/libshared
-libshared.DEPENDS      = $(topoutdir)/src/libshared/libshared.la
+libshared.DEPENDS      =   $(topoutdir)/src/libshared/libshared.la
 libfirewall.CPPFLAGS   = -I$(topsrcdir)/src/libfirewall -I$(topoutdir)/src/libfirewall
-libfirewall.DEPENDS    = $(topoutdir)/src/libfirewall/libfirewall.la
-libsystemd.CPPFLAGS    = -I$(topsrcdir)/src/libsystemd/include -I$(topoutdir)/src/libsystemd/include
-libsystemd.DEPENDS     = $(topoutdir)/src/libsystemd/src/libsystemd.la
+libfirewall.DEPENDS    =   $(topoutdir)/src/libfirewall/libfirewall.la
+libsystemd.CPPFLAGS    = -I$(topsrcdir)/src/libsystemd/libsystemd/include -I$(topoutdir)/src/libsystemd/libsystemd/include
+libsystemd.DEPENDS     =   $(topoutdir)/src/libsystemd/libsystemd/libsystemd.la
+libsystemd-internal.CPPFLAGS = -I$(topsrcdir)/src/libsystemd/libsystemd-internal/include
+libsystemd-internal.DEPENDS  =   $(topoutdir)/src/libsystemd/libsystemd-internal/libsystemd-internal.la
+libsystemd-journal.CPPFLAGS  = -I$(topsrcdir)/src/libsystemd/libsystemd-journal/include
+libsystemd-journal.DEPENDS   =   $(topoutdir)/src/libsystemd/libsystemd-journal/libsystemd-journal.la
+libsystemd.CPPFLAGS          = -I$(topsrcdir)/src/libsystemd/libsystemd-journal/include
+libsystemd.DEPENDS           =   $(topoutdir)/src/libsystemd/libsystemd/libsystemd.la
 libacl.CPPFLAGS        = 
 libacl.DEPENDS         = @ACL_LIBS@
 libapparmor.CPPFLAGS   = $(shell $(PKG_CONFIG) --cflags libapparmor)
@@ -138,108 +168,163 @@ libz.DEPENDS           = $(shell $(PKG_CONFIG) --libs   zlib)
 
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 
-AR = gcc-ar
-ACLOCAL = ${SHELL} /home/luke/src/3rd-party/systemd/build-aux/missing aclocal-1.15
-AUTOCONF = ${SHELL} /home/luke/src/3rd-party/systemd/build-aux/missing autoconf
-AUTOHEADER = ${SHELL} /home/luke/src/3rd-party/systemd/build-aux/missing autoheader
-AUTOMAKE = ${SHELL} /home/luke/src/3rd-party/systemd/build-aux/missing automake-1.15
-AWK = gawk
-CC = gcc
-CPP = gcc -E
-EGREP = /usr/bin/grep -E
-FGREP = /usr/bin/grep -F
-GREP = /usr/bin/grep
-INSTALL = /usr/bin/install -c
-INSTALL_DATA = ${INSTALL} -m 644
-INSTALL_PROGRAM = ${INSTALL}
-INSTALL_SCRIPT = ${INSTALL}
-INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
-INTLTOOL_EXTRACT = /usr/bin/intltool-extract
-INTLTOOL_MERGE = /usr/bin/intltool-merge
-INTLTOOL_PERL = /usr/bin/perl
-INTLTOOL_UPDATE = /usr/bin/intltool-update
-GPERF = gperf
-GMSGFMT = /usr/bin/msgfmt
-KBD_LOADKEYS = /usr/bin/loadkeys
-KBD_SETFONT = /usr/bin/setfont
-KEXEC = /usr/sbin/kexec
-KILL = /usr/bin/kill
-KMOD = /usr/bin/kmod
-KMOD_CFLAGS = 
-KMOD_LIBS = -lkmod
-LD = /usr/bin/ld -m elf_x86_64
-LIBTOOL = $(SHELL) $(topoutdir)/libtool
-M4 = /usr/bin/m4
-MAKEINFO = ${SHELL} /home/luke/src/3rd-party/systemd/build-aux/missing makeinfo
-MANIFEST_TOOL = :
-MKDIR_P = /usr/bin/mkdir -p
-MSGFMT = /usr/bin/msgfmt
-MSGMERGE = /usr/bin/msgmerge
-NM = gcc-nm
-OBJCOPY = objcopy
-OBJDUMP = objdump
-PKG_CONFIG = /usr/bin/pkg-config
-PYTHON = /usr/bin/python
-QEMU = /usr/bin/qemu-system-x86_64
-QUOTACHECK = /usr/bin/quotacheck
-QUOTAON = /usr/bin/quotaon
-RANLIB = gcc-ranlib
-SED = /usr/bin/sed
-SETCAP = /usr/bin/setcap
-SHELL = /bin/sh
-STRINGS = strings
-STRIP = strip
-SULOGIN = /usr/bin/sulogin
-SUSHELL = /bin/sh
-UMOUNT_PATH = /usr/bin/umount
-XSLTPROC = /usr/bin/xsltproc
+ARCH_AARCH64 = @ARCH_AARCH64_TRUE@1
+ARCH_IA32 = @ARCH_IA32_TRUE@1
+ARCH_X86_64 = @ARCH_X86_64_TRUE@1
+
+ENABLE_BACKLIGHT = @ENABLE_BACKLIGHT_TRUE@1
+ENABLE_BASH_COMPLETION = @ENABLE_BASH_COMPLETION_TRUE@1
+ENABLE_BINFMT = @ENABLE_BINFMT_TRUE@1
+ENABLE_BOOTCHART = @ENABLE_BOOTCHART_TRUE@1
+ENABLE_COMPAT_LIBS = @ENABLE_COMPAT_LIBS_TRUE@1
+ENABLE_COREDUMP = @ENABLE_COREDUMP_TRUE@1
+ENABLE_COVERAGE = @ENABLE_COVERAGE_TRUE@1
+ENABLE_EFI = @ENABLE_EFI_TRUE@1
+ENABLE_FIRSTBOOT = @ENABLE_FIRSTBOOT_TRUE@1
+ENABLE_HIBERNATE = @ENABLE_HIBERNATE_TRUE@1
+ENABLE_HOSTNAMED = @ENABLE_HOSTNAMED_TRUE@1
+ENABLE_HWDB = @ENABLE_HWDB_TRUE@1
+ENABLE_IMPORTD = @ENABLE_IMPORTD_TRUE@1
+ENABLE_LDCONFIG = @ENABLE_LDCONFIG_TRUE@1
+ENABLE_LOCALED = @ENABLE_LOCALED_TRUE@1
+ENABLE_LOGIND = @ENABLE_LOGIND_TRUE@1
+ENABLE_MACHINED = @ENABLE_MACHINED_TRUE@1
+ENABLE_MANPAGES = @ENABLE_MANPAGES_TRUE@1
+ENABLE_NETWORKD = @ENABLE_NETWORKD_TRUE@1
+ENABLE_POLKIT = @ENABLE_POLKIT_TRUE@1
+ENABLE_QUOTACHECK = @ENABLE_QUOTACHECK_TRUE@1
+ENABLE_RANDOMSEED = @ENABLE_RANDOMSEED_TRUE@1
+ENABLE_RESOLVED = @ENABLE_RESOLVED_TRUE@1
+ENABLE_RFKILL = @ENABLE_RFKILL_TRUE@1
+ENABLE_SPLIT_USR = @ENABLE_SPLIT_USR_TRUE@1
+ENABLE_SYSUSERS = @ENABLE_SYSUSERS_TRUE@1
+ENABLE_TESTS = @ENABLE_TESTS_TRUE@1
+ENABLE_TIMEDATED = @ENABLE_TIMEDATED_TRUE@1
+ENABLE_TIMESYNCD = @ENABLE_TIMESYNCD_TRUE@1
+ENABLE_TMPFILES = @ENABLE_TMPFILES_TRUE@1
+ENABLE_VCONSOLE = @ENABLE_VCONSOLE_TRUE@1
+ENABLE_ZSH_COMPLETION = @ENABLE_ZSH_COMPLETION_TRUE@1
+
+HAVE_ACL = @HAVE_ACL_TRUE@1
+HAVE_AUDIT = @HAVE_AUDIT_TRUE@1
+HAVE_BLKID = @HAVE_BLKID_TRUE@1
+HAVE_BZIP2 = @HAVE_BZIP2_TRUE@1
+HAVE_COMPRESSION = @HAVE_COMPRESSION_TRUE@1
+HAVE_ELFUTILS = @HAVE_ELFUTILS_TRUE@1
+HAVE_GCRYPT = @HAVE_GCRYPT_TRUE@1
+HAVE_GNUEFI = @HAVE_GNUEFI_TRUE@1
+HAVE_GNUTLS = @HAVE_GNUTLS_TRUE@1
+HAVE_KMOD = @HAVE_KMOD_TRUE@1
+HAVE_LIBCRYPTSETUP = @HAVE_LIBCRYPTSETUP_TRUE@1
+HAVE_LIBCURL = @HAVE_LIBCURL_TRUE@1
+HAVE_LIBIPTC = @HAVE_LIBIPTC_TRUE@1
+HAVE_LZ4 = @HAVE_LZ4_TRUE@1
+HAVE_MICROHTTPD = @HAVE_MICROHTTPD_TRUE@1
+HAVE_MYHOSTNAME = @HAVE_MYHOSTNAME_TRUE@1
+HAVE_PAM = @HAVE_PAM_TRUE@1
+HAVE_PYTHON = @HAVE_PYTHON_TRUE@1
+HAVE_QRENCODE = @HAVE_QRENCODE_TRUE@1
+HAVE_REMOTE = @HAVE_REMOTE_TRUE@1
+HAVE_SECCOMP = @HAVE_SECCOMP_TRUE@1
+HAVE_SMACK = @HAVE_SMACK_TRUE@1
+HAVE_SYSV_COMPAT = @HAVE_SYSV_COMPAT_TRUE@1
+HAVE_UTMP = @HAVE_UTMP_TRUE@1
+HAVE_XZ = @HAVE_XZ_TRUE@1
+HAVE_ZLIB = @HAVE_ZLIB_TRUE@1
+
+LIBTOOLFLAGS = 
+
+AR = @AR@
+ACLOCAL = @ACLOCAL@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CPP = @CPP@
+EGREP = @EGREP@
+FGREP = @FGREP@
+GREP = @GREP@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+GPERF = @GPERF@
+GMSGFMT = @GMSGFMT@
+KBD_LOADKEYS = @KBD_LOADKEYS@
+KBD_SETFONT = @KBD_SETFONT@
+KEXEC = @KEXEC@
+KILL = @KILL@
+KMOD = @KMOD@
+LD = @LD@
+LIBTOOL = @LIBTOOL@
+M4 = @M4@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MKDIR_P = @MKDIR_P@
+MSGFMT = @MSGFMT@
+MSGMERGE = @MSGMERGE@
+NM = @NM@
+OBJCOPY = @OBJCOPY@
+OBJDUMP = @OBJDUMP@
+PKG_CONFIG = @PKG_CONFIG@
+PYTHON = @PYTHON@
+QEMU = @QEMU@
+QUOTACHECK = @QUOTACHECK@
+QUOTAON = @QUOTAON@
+RANLIB = @RANLIB@
+SED = @SED@
+SETCAP = @SETCAP@
+SHELL = @SHELL@
+STRINGS = @STRINGS@
+STRIP = @STRIP@
+SULOGIN = @SULOGIN@
+SUSHELL = @SUSHELL@
+UMOUNT_PATH = @UMOUNT_PATH@
+XSLTPROC = @XSLTPROC@
 
-CFLAGS = -g -O2
-CPPFLAGS = 
-LDFLAGS = 
+CFLAGS = @CFLAGS@
+CPPFLAGS = @CPPFLAGS@
+LDFLAGS = @LDFLAGS@
 
-GZIP_ENV = --best
-DIST_ARCHIVES = $(distdir).tar.xz
-DIST_TARGETS = dist-xz
-distuninstallcheck_listfiles = find . -type f -print
-am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
-  | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
-AMTAR = $${TAR-tar}
-CCDEPMODE = depmode=gcc3
-CERTIFICATEROOT = /etc/ssl
-DEBUGTTY = /dev/tty9
-DEFS = -DHAVE_CONFIG_H
-DEPDIR = .deps
-DNS_SERVERS = 8.8.8.8 8.8.4.4 2001:4860:4860::8888 2001:4860:4860::8844
-DSYMUTIL = 
-DUMPBIN = 
-ECHO_C = 
-ECHO_N = -n
-ECHO_T = 
-EFI_ARCH = x86_64
-EFI_CC = gcc
-EFI_INC_DIR = /usr/include
-EFI_LDS_DIR = /usr/lib
-EFI_LIB_DIR = /usr/lib
-EFI_MACHINE_TYPE_NAME = x64
-EXEEXT = 
-GETTEXT_PACKAGE = systemd
-LIBOBJS = 
-LIBS = 
-LIPO = 
-LN_S = ln -s
-LTLIBOBJS = 
-LT_SYS_LIBRARY_PATH = 
-M4_DEFINES =  -DHAVE_SECCOMP -DHAVE_PAM -DHAVE_ACL -DHAVE_SMACK -DHAVE_MICROHTTPD -DHAVE_LIBCURL -DHAVE_LIBIDN -DHAVE_LIBIPTC -DENABLE_TIMESYNCD -DENABLE_COREDUMP -DENABLE_RESOLVED -DENABLE_NETWORKD -DENABLE_KDBUS
-MAINT = 
-NMEDIT = 
-NTP_SERVERS = 0.arch.pool.ntp.org 1.arch.pool.ntp.org 2.arch.pool.ntp.org 3.arch.pool.ntp.org
-OBJEXT = o
-OTOOL = 
-OTOOL64 = 
-OUR_CFLAGS =  -pipe -Wall -Wextra -Wundef -Wformat=2 -Wformat-security -Wformat-nonliteral -Wlogical-op -Wmissing-include-dirs -Wold-style-definition -Wpointer-arith -Winit-self -Wdeclaration-after-statement -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=implicit-function-declaration -Werror=missing-declarations -Werror=return-type -Wstrict-prototypes -Wredundant-decls -Wmissing-noreturn -Wshadow -Wendif-labels -Wstrict-aliasing=2 -Wwrite-strings -Wno-unused-parameter -Wno-missing-field-initializers -Wno-unused-result -Wno-format-signedness -Werror=overflow -Wdate-time -Wnested-externs -ffast-math -fno-common -fdiagnostics-show-option -fno-strict-aliasing -fvisibility=hidden -fstack-protector -fstack-protector-strong -fPIE --param=ssp-buffer-size=4 -Werror=shadow -flto -ffunction-sections -fdata-sections  
-OUR_CPPFLAGS =  -Wp,-D_FORTIFY_SOURCE=2  
-OUR_LDFLAGS =  -Wl,--gc-sections -Wl,--as-needed -Wl,--no-undefined -Wl,-z,relro -Wl,-z,now -pie -Wl,-fuse-ld=gold  
+AMTAR = @AMTAR@
+CCDEPMODE = @CCDEPMODE@
+CERTIFICATEROOT = @CERTIFICATEROOT@
+DEBUGTTY = @DEBUGTTY@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DNS_SERVERS = @DNS_SERVERS@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EFI_ARCH = @EFI_ARCH@
+EFI_CC = @EFI_CC@
+EFI_INC_DIR = @EFI_INC_DIR@
+EFI_LDS_DIR = @EFI_LDS_DIR@
+EFI_LIB_DIR = @EFI_LIB_DIR@
+EFI_MACHINE_TYPE_NAME = @EFI_MACHINE_TYPE_NAME@
+EXEEXT = @EXEEXT@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+M4_DEFINES = @M4_DEFINES@
+MAINT = @MAINT@
+NMEDIT = @NMEDIT@
+NTP_SERVERS = @NTP_SERVERS@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = systemd
 PACKAGE_BUGREPORT = http://github.com/systemd/systemd/issues
 PACKAGE_NAME = systemd
diff --git a/src/journal/Makefile b/src/journal/Makefile
index 1d843f1524..dc58b8c1a6 100644
--- a/src/journal/Makefile
+++ b/src/journal/Makefile
@@ -259,78 +259,6 @@ tests += \
 	test-compress-benchmark
 endif
 
-pkginclude_HEADERS += \
-	src/systemd/sd-journal.h \
-	src/systemd/sd-messages.h \
-	src/systemd/_sd-common.h
-
-libsystemd_journal_internal_la_SOURCES = \
-	src/journal/sd-journal.c \
-	src/systemd/sd-journal.h \
-	src/systemd/_sd-common.h \
-	src/journal/journal-file.c \
-	src/journal/journal-file.h \
-	src/journal/journal-vacuum.c \
-	src/journal/journal-vacuum.h \
-	src/journal/journal-verify.c \
-	src/journal/journal-verify.h \
-	src/journal/lookup3.c \
-	src/journal/lookup3.h \
-	src/journal/journal-send.c \
-	src/journal/journal-def.h \
-	src/journal/compress.h \
-	src/journal/catalog.c \
-	src/journal/catalog.h \
-	src/journal/mmap-cache.c \
-	src/journal/mmap-cache.h \
-	src/journal/compress.c \
-	src/journal/audit-type.h \
-	src/journal/audit-type.c
-
-nodist_libsystemd_journal_internal_la_SOURCES = \
-	src/journal/audit_type-to-name.h
-
-gperf_txt_sources += \
-	src/journal/audit_type-list.txt
-
-# using _CFLAGS = in the conditional below would suppress AM_CFLAGS
-libsystemd_journal_internal_la_CFLAGS = \
-	$(AM_CFLAGS)
-
-libsystemd_journal_internal_la_LIBADD =
-
-ifneq ($(HAVE_XZ),)
-libsystemd_journal_internal_la_CFLAGS += \
-	$(XZ_CFLAGS)
-
-libsystemd_journal_internal_la_LIBADD += \
-	$(XZ_LIBS)
-endif
-
-ifneq ($(HAVE_LZ4),)
-libsystemd_journal_internal_la_LIBADD += \
-	-llz4
-endif
-
-ifneq ($(HAVE_GCRYPT),)
-libsystemd_journal_internal_la_SOURCES += \
-	src/journal/journal-authenticate.c \
-	src/journal/journal-authenticate.h \
-	src/journal/fsprg.c \
-	src/journal/fsprg.h
-
-libsystemd_journal_internal_la_LIBADD += \
-	$(GCRYPT_LIBS)
-
-# fsprg.c is a drop-in file using void pointer arithmetic
-libsystemd_journal_internal_la_CFLAGS += \
-	$(GCRYPT_CFLAGS) \
-	-Wno-pointer-arith
-endif
-
-noinst_LTLIBRARIES += \
-	libsystemd-journal-internal.la
-
 rootlibexec_PROGRAMS += \
 	systemd-journald
 
diff --git a/src/libbasic/Makefile b/src/libbasic/Makefile
index c115b2fe8e..de5da89a24 100644
--- a/src/libbasic/Makefile
+++ b/src/libbasic/Makefile
@@ -23,9 +23,6 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
 include $(topsrcdir)/automake.head.mk
 
-noinst_LTLIBRARIES += \
-	libbasic.la
-
 libbasic_la_SOURCES = \
 	src/basic/missing.h \
 	src/basic/capability-util.c \
@@ -219,34 +216,14 @@ libbasic_la_SOURCES = \
 	src/basic/formats-util.h \
 	src/basic/nss-util.h
 
-nodist_libbasic_la_SOURCES = \
-	src/basic/errno-from-name.h \
-	src/basic/errno-to-name.h \
-	src/basic/af-from-name.h \
-	src/basic/af-to-name.h \
-	src/basic/arphrd-from-name.h \
-	src/basic/arphrd-to-name.h \
-	src/basic/cap-from-name.h \
-	src/basic/cap-to-name.h
-
-libbasic_la_CFLAGS = \
-	$(AM_CFLAGS) \
-	$(SELINUX_CFLAGS) \
-	$(CAP_CFLAGS) \
-	-pthread
-
-libbasic_la_LIBADD = \
-	$(SELINUX_LIBS) \
-	$(CAP_LIBS) \
-	-lrt \
-	-lm
-
 am_out_files = libbasic.la
-CFLAGS += $(libbasic_la_CFLAGS)
-CPPFLAGS += -I$(topsrcdir)/src/libsystemd/include
-CPPFLAGS += -I$(topoutdir)/src/libsystemd/include
-CPPFLAGS += -include $(topoutdir)/config.h
-$(outdir)/libbasic.la: $(patsubst src/basic/%.c,$(outdir)/%.lo,$(filter %.c,$(libbasic_la_SOURCES))) $(libbasic_la_LIBADD)
+CFLAGS += -pthread
+CPPFLAGS += $(libsystemd.CPPFLAGS) $(libselinux.CPPFLAGS) $(libcap.CPPFLAGS)
+$(outdir)/libbasic.la: \
+	$(patsubst src/basic/%.c,$(outdir)/%.lo,$(filter %.c,$(libbasic_la_SOURCES))) \
+	$(libselinux.DEPENDS) $(libcap.DEPENDS) -lrt -lm
+
+am_clean_files += *-to-name.h *-from-name.h *-from-name.gperf *-list.txt
 
 $(outdir)/af-list.lo: $(outdir)/af-from-name.h $(outdir)/af-to-name.h
 $(outdir)/arphrd-list.lo: $(outdir)/arphrd-from-name.h $(outdir)/arphrd-to-name.h
@@ -254,21 +231,21 @@ $(outdir)/cap-list.lo: $(outdir)/cap-from-name.h $(outdir)/cap-to-name.h
 $(outdir)/errno-list.lo: $(outdir)/errno-from-name.h $(outdir)/errno-to-name.h
 
 $(outdir)/errno-list.txt:
-	$(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include errno.h - </dev/null | $(AWK) '/^#define[ \t]+E[^ _]+[ \t]+/ { print $$2; }' >$@
+	$(AM_V_GEN)$(CPP) $(CFLAGS) $(CPPFLAGS) -dM -include errno.h - </dev/null | $(AWK) '/^#define[ \t]+E[^ _]+[ \t]+/ { print $$2; }' >$@
 
 $(outdir)/errno-to-name.h: $(outdir)/errno-list.txt
 	$(AM_V_GEN)$(AWK) 'BEGIN{ print "static const char* const errno_names[] = { "} !/EDEADLOCK/ && !/EWOULDBLOCK/ && !/ENOTSUP/ { printf "[%s] = \"%s\",\n", $$1, $$1 } END{print "};"}' <$< >$@
 
 
 $(outdir)/af-list.txt:
-	$(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include sys/socket.h - </dev/null | grep -v AF_UNSPEC | grep -v AF_MAX | $(AWK) '/^#define[ \t]+AF_[^ \t]+[ \t]+PF_[^ \t]/ { print $$2; }' >$@
+	$(AM_V_GEN)$(CPP) $(CFLAGS) $(CPPFLAGS) -dM -include sys/socket.h - </dev/null | grep -v AF_UNSPEC | grep -v AF_MAX | $(AWK) '/^#define[ \t]+AF_[^ \t]+[ \t]+PF_[^ \t]/ { print $$2; }' >$@
 
 $(outdir)/af-to-name.h: $(outdir)/af-list.txt
 	$(AM_V_GEN)$(AWK) 'BEGIN{ print "static const char* const af_names[] = { "} !/AF_FILE/ && !/AF_ROUTE/ && !/AF_LOCAL/ { printf "[%s] = \"%s\",\n", $$1, $$1 } END{print "};"}' <$< >$@
 
 
 $(outdir)/arphrd-list.txt:
-	$(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include net/if_arp.h - </dev/null | $(AWK) '/^#define[ \t]+ARPHRD_[^ \t]+[ \t]+[^ \t]/ { print $$2; }' | sed -e 's/ARPHRD_//' >$@
+	$(AM_V_GEN)$(CPP) $(CFLAGS) $(CPPFLAGS) -dM -include net/if_arp.h - </dev/null | $(AWK) '/^#define[ \t]+ARPHRD_[^ \t]+[ \t]+[^ \t]/ { print $$2; }' | sed -e 's/ARPHRD_//' >$@
 
 $(outdir)/arphrd-to-name.h: $(outdir)/arphrd-list.txt
 	$(AM_V_at)$(MKDIR_P) $(dir $@)
@@ -279,7 +256,7 @@ $(outdir)/arphrd-from-name.gperf: $(outdir)/arphrd-list.txt
 
 
 $(outdir)/cap-list.txt:
-	$(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include linux/capability.h -include missing.h - </dev/null | $(AWK) '/^#define[ \t]+CAP_[A-Z_]+[ \t]+/ { print $$2; }' | grep -v CAP_LAST_CAP >$@
+	$(AM_V_GEN)$(CPP) $(CFLAGS) $(CPPFLAGS) -dM -include linux/capability.h -include missing.h - </dev/null | $(AWK) '/^#define[ \t]+CAP_[A-Z_]+[ \t]+/ { print $$2; }' | grep -v CAP_LAST_CAP >$@
 
 $(outdir)/cap-to-name.h: $(outdir)/cap-list.txt
 	$(AM_V_GEN)$(AWK) 'BEGIN{ print "static const char* const capability_names[] = { "} { printf "[%s] = \"%s\",\n", $$1, tolower($$1) } END{print "};"}' <$< >$@
diff --git a/src/libfirewall/Makefile b/src/libfirewall/Makefile
index f0697f1513..c6519157c6 100644
--- a/src/libfirewall/Makefile
+++ b/src/libfirewall/Makefile
@@ -20,20 +20,11 @@
 #
 #  You should have received a copy of the GNU Lesser General Public License
 #  along with systemd; If not, see <http://www.gnu.org/licenses/>.
-ifneq ($(HAVE_LIBIPTC),)
-noinst_LTLIBRARIES += \
-	libfirewall.la
+include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
+include $(topsrcdir)/automake.head.mk
 
-libfirewall_la_SOURCES = \
-	src/shared/firewall-util.h \
-	src/shared/firewall-util.c
-
-libfirewall_la_CFLAGS = \
-	$(AM_CFLAGS) \
-	$(LIBIPTC_CFLAGS)
-
-libfirewall_la_LIBADD = \
-	$(LIBIPTC_LIBS)
-endif
+am_out_files = libfirewall.la
+CPPFLAGS += $(libbasic.CPPFLAGS) $(libiptc.CPPFLAGS)
+$(outdir)/libfirewall.la: $(outdir)/firewall-util.lo $(libiptc.DEPENDS)
 
 include $(topsrcdir)/automake.tail.mk
diff --git a/src/libshared/Makefile b/src/libshared/Makefile
index ebaa1a2e33..b2aaf58b2c 100644
--- a/src/libshared/Makefile
+++ b/src/libshared/Makefile
@@ -147,4 +147,6 @@ CPPFLAGS += -DPOLKIT_AGENT_BINARY_PATH=\"$(bindir)/pkttyagent\" \
 $(outdir)/libshared.la: \
 	$(patsubst src/shared/%.c,$(outdir)/%.lo,$(filter %.c,$(libshared_la_SOURCES)))
 
+$(call amtarget2dir,src/shared,libshared.la)
+
 include $(topsrcdir)/automake.tail.mk
diff --git a/src/libsystemd/src/.gitignore b/src/libsystemd/.gitignore
index 50a1692374..50a1692374 100644
--- a/src/libsystemd/src/.gitignore
+++ b/src/libsystemd/.gitignore
diff --git a/src/libsystemd/src/Makefile b/src/libsystemd/Makefile
index cf72f9ea95..0c3796b262 100644
--- a/src/libsystemd/src/Makefile
+++ b/src/libsystemd/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)/automake.head.mk
+
 LIBSYSTEMD_CURRENT=14
 LIBSYSTEMD_REVISION=0
 LIBSYSTEMD_AGE=14
@@ -42,103 +45,6 @@ LIBSYSTEMD_JOURNAL_CURRENT=11
 LIBSYSTEMD_JOURNAL_REVISION=5
 LIBSYSTEMD_JOURNAL_AGE=11
 
-libsystemd_internal_la_SOURCES = \
-	src/systemd/sd-bus.h \
-	src/systemd/sd-bus-protocol.h \
-	src/systemd/sd-bus-vtable.h \
-	src/systemd/sd-utf8.h \
-	src/systemd/sd-event.h \
-	src/systemd/sd-netlink.h \
-	src/systemd/sd-resolve.h \
-	src/systemd/sd-login.h \
-	src/systemd/sd-id128.h \
-	src/systemd/sd-daemon.h \
-	src/systemd/sd-path.h \
-	src/systemd/sd-network.h \
-	src/systemd/sd-hwdb.h \
-	src/systemd/sd-device.h \
-	src/libsystemd/libsystemd.sym \
-	src/libsystemd/sd-bus/sd-bus.c \
-	src/libsystemd/sd-bus/bus-control.c \
-	src/libsystemd/sd-bus/bus-control.h \
-	src/libsystemd/sd-bus/bus-error.c \
-	src/libsystemd/sd-bus/bus-error.h \
-	src/libsystemd/sd-bus/bus-common-errors.h \
-	src/libsystemd/sd-bus/bus-common-errors.c \
-	src/libsystemd/sd-bus/bus-internal.c \
-	src/libsystemd/sd-bus/bus-internal.h \
-	src/libsystemd/sd-bus/bus-socket.c \
-	src/libsystemd/sd-bus/bus-socket.h \
-	src/libsystemd/sd-bus/bus-kernel.c \
-	src/libsystemd/sd-bus/bus-kernel.h \
-	src/libsystemd/sd-bus/bus-container.c \
-	src/libsystemd/sd-bus/bus-container.h \
-	src/libsystemd/sd-bus/bus-message.c \
-	src/libsystemd/sd-bus/bus-message.h \
-	src/libsystemd/sd-bus/bus-creds.c \
-	src/libsystemd/sd-bus/bus-creds.h \
-	src/libsystemd/sd-bus/bus-signature.c \
-	src/libsystemd/sd-bus/bus-signature.h \
-	src/libsystemd/sd-bus/bus-type.c \
-	src/libsystemd/sd-bus/bus-type.h \
-	src/libsystemd/sd-bus/bus-match.c \
-	src/libsystemd/sd-bus/bus-match.h \
-	src/libsystemd/sd-bus/bus-bloom.c \
-	src/libsystemd/sd-bus/bus-bloom.h \
-	src/libsystemd/sd-bus/bus-introspect.c \
-	src/libsystemd/sd-bus/bus-introspect.h \
-	src/libsystemd/sd-bus/bus-objects.c \
-	src/libsystemd/sd-bus/bus-objects.h \
-	src/libsystemd/sd-bus/bus-gvariant.c \
-	src/libsystemd/sd-bus/bus-gvariant.h \
-	src/libsystemd/sd-bus/bus-convenience.c \
-	src/libsystemd/sd-bus/bus-track.c \
-	src/libsystemd/sd-bus/bus-track.h \
-	src/libsystemd/sd-bus/bus-slot.c \
-	src/libsystemd/sd-bus/bus-slot.h \
-	src/libsystemd/sd-bus/bus-protocol.h \
-	src/libsystemd/sd-bus/kdbus.h \
-	src/libsystemd/sd-bus/bus-dump.c \
-	src/libsystemd/sd-bus/bus-dump.h \
-	src/libsystemd/sd-utf8/sd-utf8.c \
-	src/libsystemd/sd-event/sd-event.c \
-	src/libsystemd/sd-netlink/sd-netlink.c \
-	src/libsystemd/sd-netlink/netlink-internal.h \
-	src/libsystemd/sd-netlink/netlink-message.c \
-	src/libsystemd/sd-netlink/netlink-socket.c \
-	src/libsystemd/sd-netlink/rtnl-message.c \
-	src/libsystemd/sd-netlink/netlink-types.h \
-	src/libsystemd/sd-netlink/netlink-types.c \
-	src/libsystemd/sd-netlink/netlink-util.h \
-	src/libsystemd/sd-netlink/netlink-util.c \
-	src/libsystemd/sd-netlink/local-addresses.h \
-	src/libsystemd/sd-netlink/local-addresses.c \
-	src/libsystemd/sd-id128/sd-id128.c \
-	src/libsystemd/sd-daemon/sd-daemon.c \
-	src/libsystemd/sd-login/sd-login.c \
-	src/libsystemd/sd-path/sd-path.c \
-	src/libsystemd/sd-network/sd-network.c \
-	src/libsystemd/sd-network/network-util.h \
-	src/libsystemd/sd-network/network-util.c \
-	src/libsystemd/sd-hwdb/sd-hwdb.c \
-	src/libsystemd/sd-hwdb/hwdb-util.h \
-	src/libsystemd/sd-hwdb/hwdb-internal.h \
-	src/libsystemd/sd-device/device-internal.h \
-	src/libsystemd/sd-device/device-util.h \
-	src/libsystemd/sd-device/device-enumerator.c \
-	src/libsystemd/sd-device/device-enumerator-private.h \
-	src/libsystemd/sd-device/sd-device.c \
-	src/libsystemd/sd-device/device-private.c \
-	src/libsystemd/sd-device/device-private.h \
-	src/libsystemd/sd-resolve/sd-resolve.c
-
-libsystemd_internal_la_LIBADD = \
-	libbasic.la \
-	-lresolv
-
-noinst_LTLIBRARIES += \
-	libsystemd-internal.la
-
 EXTRA_DIST += \
 	src/libsystemd/libsystemd.pc.in \
 	src/libsystemd/sd-bus/DIFFERENCES \
@@ -188,6 +94,8 @@ pkginclude_HEADERS += \
 lib_LTLIBRARIES += \
 	libsystemd.la
 
+# ------------------------------------------------------------------------------
+
 tests += \
 	test-bus-marshal \
 	test-bus-signature \
@@ -374,3 +282,4 @@ nodist_test_libsystemd_sym_SOURCES = \
 test_libsystemd_sym_LDADD = \
 	libsystemd.la
 
+include $(topsrcdir)/automake.tail.mk
diff --git a/src/libsystemd/libsystemd-internal/Makefile b/src/libsystemd/libsystemd-internal/Makefile
new file mode 100644
index 0000000000..9874139a9f
--- /dev/null
+++ b/src/libsystemd/libsystemd-internal/Makefile
@@ -0,0 +1,131 @@
+#  -*- 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)/automake.head.mk
+
+libsystemd_internal_la_SOURCES = \
+	src/systemd/sd-bus.h \
+	src/systemd/sd-bus-protocol.h \
+	src/systemd/sd-bus-vtable.h \
+	src/systemd/sd-utf8.h \
+	src/systemd/sd-event.h \
+	src/systemd/sd-netlink.h \
+	src/systemd/sd-resolve.h \
+	src/systemd/sd-login.h \
+	src/systemd/sd-id128.h \
+	src/systemd/sd-daemon.h \
+	src/systemd/sd-path.h \
+	src/systemd/sd-network.h \
+	src/systemd/sd-hwdb.h \
+	src/systemd/sd-device.h \
+	src/libsystemd/libsystemd.sym \
+	src/libsystemd/sd-bus/sd-bus.c \
+	src/libsystemd/sd-bus/bus-control.c \
+	src/libsystemd/sd-bus/bus-control.h \
+	src/libsystemd/sd-bus/bus-error.c \
+	src/libsystemd/sd-bus/bus-error.h \
+	src/libsystemd/sd-bus/bus-common-errors.h \
+	src/libsystemd/sd-bus/bus-common-errors.c \
+	src/libsystemd/sd-bus/bus-internal.c \
+	src/libsystemd/sd-bus/bus-internal.h \
+	src/libsystemd/sd-bus/bus-socket.c \
+	src/libsystemd/sd-bus/bus-socket.h \
+	src/libsystemd/sd-bus/bus-kernel.c \
+	src/libsystemd/sd-bus/bus-kernel.h \
+	src/libsystemd/sd-bus/bus-container.c \
+	src/libsystemd/sd-bus/bus-container.h \
+	src/libsystemd/sd-bus/bus-message.c \
+	src/libsystemd/sd-bus/bus-message.h \
+	src/libsystemd/sd-bus/bus-creds.c \
+	src/libsystemd/sd-bus/bus-creds.h \
+	src/libsystemd/sd-bus/bus-signature.c \
+	src/libsystemd/sd-bus/bus-signature.h \
+	src/libsystemd/sd-bus/bus-type.c \
+	src/libsystemd/sd-bus/bus-type.h \
+	src/libsystemd/sd-bus/bus-match.c \
+	src/libsystemd/sd-bus/bus-match.h \
+	src/libsystemd/sd-bus/bus-bloom.c \
+	src/libsystemd/sd-bus/bus-bloom.h \
+	src/libsystemd/sd-bus/bus-introspect.c \
+	src/libsystemd/sd-bus/bus-introspect.h \
+	src/libsystemd/sd-bus/bus-objects.c \
+	src/libsystemd/sd-bus/bus-objects.h \
+	src/libsystemd/sd-bus/bus-gvariant.c \
+	src/libsystemd/sd-bus/bus-gvariant.h \
+	src/libsystemd/sd-bus/bus-convenience.c \
+	src/libsystemd/sd-bus/bus-track.c \
+	src/libsystemd/sd-bus/bus-track.h \
+	src/libsystemd/sd-bus/bus-slot.c \
+	src/libsystemd/sd-bus/bus-slot.h \
+	src/libsystemd/sd-bus/bus-protocol.h \
+	src/libsystemd/sd-bus/kdbus.h \
+	src/libsystemd/sd-bus/bus-dump.c \
+	src/libsystemd/sd-bus/bus-dump.h \
+	src/libsystemd/sd-utf8/sd-utf8.c \
+	src/libsystemd/sd-event/sd-event.c \
+	src/libsystemd/sd-netlink/sd-netlink.c \
+	src/libsystemd/sd-netlink/netlink-internal.h \
+	src/libsystemd/sd-netlink/netlink-message.c \
+	src/libsystemd/sd-netlink/netlink-socket.c \
+	src/libsystemd/sd-netlink/rtnl-message.c \
+	src/libsystemd/sd-netlink/netlink-types.h \
+	src/libsystemd/sd-netlink/netlink-types.c \
+	src/libsystemd/sd-netlink/netlink-util.h \
+	src/libsystemd/sd-netlink/netlink-util.c \
+	src/libsystemd/sd-netlink/local-addresses.h \
+	src/libsystemd/sd-netlink/local-addresses.c \
+	src/libsystemd/sd-id128/sd-id128.c \
+	src/libsystemd/sd-daemon/sd-daemon.c \
+	src/libsystemd/sd-login/sd-login.c \
+	src/libsystemd/sd-path/sd-path.c \
+	src/libsystemd/sd-network/sd-network.c \
+	src/libsystemd/sd-network/network-util.h \
+	src/libsystemd/sd-network/network-util.c \
+	src/libsystemd/sd-hwdb/sd-hwdb.c \
+	src/libsystemd/sd-hwdb/hwdb-util.h \
+	src/libsystemd/sd-hwdb/hwdb-internal.h \
+	src/libsystemd/sd-device/device-internal.h \
+	src/libsystemd/sd-device/device-util.h \
+	src/libsystemd/sd-device/device-enumerator.c \
+	src/libsystemd/sd-device/device-enumerator-private.h \
+	src/libsystemd/sd-device/sd-device.c \
+	src/libsystemd/sd-device/device-private.c \
+	src/libsystemd/sd-device/device-private.h \
+	src/libsystemd/sd-resolve/sd-resolve.c
+
+libsystemd_internal_la_LIBADD = \
+	libbasic.la \
+	-lresolv
+
+noinst_LTLIBRARIES += \
+	libsystemd-internal.la
+
+am_out_files += libsystemd-internal.la
+CPPFLAGS += $(libsystemd.CPPFLAGS) $(libbasic.CPPFLAGS) $(libshared.CPPFLAGS)
+CPPFLAGS += -DLIBDIR=\"$(libdir)\" -DUDEVLIBEXECDIR=\"$(udevlibexecdir)\"
+am_subdirs += $(dir $(patsubst src/libsystemd/%.c,$(outdir)/%.lo,$(filter %.c,$(libsystemd_internal_la_SOURCES))))
+$(outdir)/libsystemd-internal.la: \
+	$(patsubst src/libsystemd/%.c,$(outdir)/%.lo,$(filter %.c,$(libsystemd_internal_la_SOURCES))) \
+	$(libbasic.DEPENDS) -lresolv
+
+include $(topsrcdir)/automake.tail.mk
diff --git a/src/libsystemd/src/sd-bus/DIFFERENCES b/src/libsystemd/libsystemd-internal/sd-bus/DIFFERENCES
index db269675a7..db269675a7 100644
--- a/src/libsystemd/src/sd-bus/DIFFERENCES
+++ b/src/libsystemd/libsystemd-internal/sd-bus/DIFFERENCES
diff --git a/src/libsystemd/src/sd-bus/GVARIANT-SERIALIZATION b/src/libsystemd/libsystemd-internal/sd-bus/GVARIANT-SERIALIZATION
index 6aeb11364a..6aeb11364a 100644
--- a/src/libsystemd/src/sd-bus/GVARIANT-SERIALIZATION
+++ b/src/libsystemd/libsystemd-internal/sd-bus/GVARIANT-SERIALIZATION
diff --git a/src/libsystemd/libsystemd-internal/sd-bus/Makefile b/src/libsystemd/libsystemd-internal/sd-bus/Makefile
new file mode 120000
index 0000000000..71a1159ce0
--- /dev/null
+++ b/src/libsystemd/libsystemd-internal/sd-bus/Makefile
@@ -0,0 +1 @@
+../subdir.mk
\ No newline at end of file
diff --git a/src/libsystemd/src/sd-bus/PORTING-DBUS1 b/src/libsystemd/libsystemd-internal/sd-bus/PORTING-DBUS1
index 2dedb28bcf..2dedb28bcf 100644
--- a/src/libsystemd/src/sd-bus/PORTING-DBUS1
+++ b/src/libsystemd/libsystemd-internal/sd-bus/PORTING-DBUS1
diff --git a/src/libsystemd/src/sd-bus/bus-bloom.c b/src/libsystemd/libsystemd-internal/sd-bus/bus-bloom.c
index 112769fcb6..112769fcb6 100644
--- a/src/libsystemd/src/sd-bus/bus-bloom.c
+++ b/src/libsystemd/libsystemd-internal/sd-bus/bus-bloom.c
diff --git a/src/libsystemd/src/sd-bus/bus-bloom.h b/src/libsystemd/libsystemd-internal/sd-bus/bus-bloom.h
index c824622b95..c824622b95 100644
--- a/src/libsystemd/src/sd-bus/bus-bloom.h
+++ b/src/libsystemd/libsystemd-internal/sd-bus/bus-bloom.h
diff --git a/src/libsystemd/src/sd-bus/bus-common-errors.c b/src/libsystemd/libsystemd-internal/sd-bus/bus-common-errors.c
index 3c19f2b108..2d8ca47987 100644
--- a/src/libsystemd/src/sd-bus/bus-common-errors.c
+++ b/src/libsystemd/libsystemd-internal/sd-bus/bus-common-errors.c
@@ -19,7 +19,7 @@
 
 #include <errno.h>
 
-#include "sd-bus.h"
+#include <systemd/sd-bus.h>
 
 #include "bus-common-errors.h"
 #include "bus-error.h"
diff --git a/src/libsystemd/src/sd-bus/bus-common-errors.h b/src/libsystemd/libsystemd-internal/sd-bus/bus-common-errors.h
index fab8748f46..fab8748f46 100644
--- a/src/libsystemd/src/sd-bus/bus-common-errors.h
+++ b/src/libsystemd/libsystemd-internal/sd-bus/bus-common-errors.h
diff --git a/src/libsystemd/src/sd-bus/bus-container.c b/src/libsystemd/libsystemd-internal/sd-bus/bus-container.c
index 3191d27ded..3191d27ded 100644
--- a/src/libsystemd/src/sd-bus/bus-container.c
+++ b/src/libsystemd/libsystemd-internal/sd-bus/bus-container.c
diff --git a/src/libsystemd/src/sd-bus/bus-container.h b/src/libsystemd/libsystemd-internal/sd-bus/bus-container.h
index 509ef45624..5cd6d15ede 100644
--- a/src/libsystemd/src/sd-bus/bus-container.h
+++ b/src/libsystemd/libsystemd-internal/sd-bus/bus-container.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>
 
 int bus_container_connect_socket(sd_bus *b);
 int bus_container_connect_kernel(sd_bus *b);
diff --git a/src/libsystemd/src/sd-bus/bus-control.c b/src/libsystemd/libsystemd-internal/sd-bus/bus-control.c
index 05222b8d30..9a975baa24 100644
--- a/src/libsystemd/src/sd-bus/bus-control.c
+++ b/src/libsystemd/libsystemd-internal/sd-bus/bus-control.c
@@ -24,7 +24,7 @@
 #include <errno.h>
 #include <stddef.h>
 
-#include "sd-bus.h"
+#include <systemd/sd-bus.h>
 
 #include "alloc-util.h"
 #include "bus-bloom.h"
diff --git a/src/libsystemd/src/sd-bus/bus-control.h b/src/libsystemd/libsystemd-internal/sd-bus/bus-control.h
index c181aa7959..229c95efb0 100644
--- a/src/libsystemd/src/sd-bus/bus-control.h
+++ b/src/libsystemd/libsystemd-internal/sd-bus/bus-control.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-match.h"
 
diff --git a/src/libsystemd/src/sd-bus/bus-convenience.c b/src/libsystemd/libsystemd-internal/sd-bus/bus-convenience.c
index 2d06bf541f..2d06bf541f 100644
--- a/src/libsystemd/src/sd-bus/bus-convenience.c
+++ b/src/libsystemd/libsystemd-internal/sd-bus/bus-convenience.c
diff --git a/src/libsystemd/src/sd-bus/bus-creds.c b/src/libsystemd/libsystemd-internal/sd-bus/bus-creds.c
index c4f693dee9..c4f693dee9 100644
--- a/src/libsystemd/src/sd-bus/bus-creds.c
+++ b/src/libsystemd/libsystemd-internal/sd-bus/bus-creds.c
diff --git a/src/libsystemd/src/sd-bus/bus-creds.h b/src/libsystemd/libsystemd-internal/sd-bus/bus-creds.h
index df8a1f1005..3e2311f91d 100644
--- a/src/libsystemd/src/sd-bus/bus-creds.h
+++ b/src/libsystemd/libsystemd-internal/sd-bus/bus-creds.h
@@ -21,7 +21,7 @@
 
 #include <stdbool.h>
 
-#include "sd-bus.h"
+#include <systemd/sd-bus.h>
 
 struct sd_bus_creds {
         bool allocated;
diff --git a/src/libsystemd/src/sd-bus/bus-dump.c b/src/libsystemd/libsystemd-internal/sd-bus/bus-dump.c
index 7c81e7a25d..7c81e7a25d 100644
--- a/src/libsystemd/src/sd-bus/bus-dump.c
+++ b/src/libsystemd/libsystemd-internal/sd-bus/bus-dump.c
diff --git a/src/libsystemd/src/sd-bus/bus-dump.h b/src/libsystemd/libsystemd-internal/sd-bus/bus-dump.h
index 874e86d09c..68fa043786 100644
--- a/src/libsystemd/src/sd-bus/bus-dump.h
+++ b/src/libsystemd/libsystemd-internal/sd-bus/bus-dump.h
@@ -22,7 +22,7 @@
 #include <stdbool.h>
 #include <stdio.h>
 
-#include "sd-bus.h"
+#include <systemd/sd-bus.h>
 
 enum {
         BUS_MESSAGE_DUMP_WITH_HEADER = 1,
diff --git a/src/libsystemd/src/sd-bus/bus-error.c b/src/libsystemd/libsystemd-internal/sd-bus/bus-error.c
index 26219bdeed..b6bb0c4a83 100644
--- a/src/libsystemd/src/sd-bus/bus-error.c
+++ b/src/libsystemd/libsystemd-internal/sd-bus/bus-error.c
@@ -24,7 +24,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "sd-bus.h"
+#include <systemd/sd-bus.h>
 
 #include "alloc-util.h"
 #include "bus-error.h"
diff --git a/src/libsystemd/src/sd-bus/bus-error.h b/src/libsystemd/libsystemd-internal/sd-bus/bus-error.h
index e2c4cf4b3f..b7aedf406d 100644
--- a/src/libsystemd/src/sd-bus/bus-error.h
+++ b/src/libsystemd/libsystemd-internal/sd-bus/bus-error.h
@@ -21,7 +21,7 @@
 
 #include <stdbool.h>
 
-#include "sd-bus.h"
+#include <systemd/sd-bus.h>
 
 #include "macro.h"
 
diff --git a/src/libsystemd/src/sd-bus/bus-gvariant.c b/src/libsystemd/libsystemd-internal/sd-bus/bus-gvariant.c
index 58782767fa..58782767fa 100644
--- a/src/libsystemd/src/sd-bus/bus-gvariant.c
+++ b/src/libsystemd/libsystemd-internal/sd-bus/bus-gvariant.c
diff --git a/src/libsystemd/src/sd-bus/bus-gvariant.h b/src/libsystemd/libsystemd-internal/sd-bus/bus-gvariant.h
index 6da637fb05..6da637fb05 100644
--- a/src/libsystemd/src/sd-bus/bus-gvariant.h
+++ b/src/libsystemd/libsystemd-internal/sd-bus/bus-gvariant.h
diff --git a/src/libsystemd/src/sd-bus/bus-internal.c b/src/libsystemd/libsystemd-internal/sd-bus/bus-internal.c
index caca679086..caca679086 100644
--- a/src/libsystemd/src/sd-bus/bus-internal.c
+++ b/src/libsystemd/libsystemd-internal/sd-bus/bus-internal.c
diff --git a/src/libsystemd/src/sd-bus/bus-internal.h b/src/libsystemd/libsystemd-internal/sd-bus/bus-internal.h
index 216d9f62bc..8c4c6fa772 100644
--- a/src/libsystemd/src/sd-bus/bus-internal.h
+++ b/src/libsystemd/libsystemd-internal/sd-bus/bus-internal.h
@@ -22,7 +22,7 @@
 #include <pthread.h>
 #include <sys/socket.h>
 
-#include "sd-bus.h"
+#include <systemd/sd-bus.h>
 
 #include "bus-error.h"
 #include "bus-kernel.h"
diff --git a/src/libsystemd/src/sd-bus/bus-introspect.c b/src/libsystemd/libsystemd-internal/sd-bus/bus-introspect.c
index 8f93edb8da..8f93edb8da 100644
--- a/src/libsystemd/src/sd-bus/bus-introspect.c
+++ b/src/libsystemd/libsystemd-internal/sd-bus/bus-introspect.c
diff --git a/src/libsystemd/src/sd-bus/bus-introspect.h b/src/libsystemd/libsystemd-internal/sd-bus/bus-introspect.h
index 8e2f3800ca..87ac03b26a 100644
--- a/src/libsystemd/src/sd-bus/bus-introspect.h
+++ b/src/libsystemd/libsystemd-internal/sd-bus/bus-introspect.h
@@ -21,7 +21,7 @@
 
 #include <stdio.h>
 
-#include "sd-bus.h"
+#include <systemd/sd-bus.h>
 
 #include "set.h"
 
diff --git a/src/libsystemd/src/sd-bus/bus-kernel.c b/src/libsystemd/libsystemd-internal/sd-bus/bus-kernel.c
index 0896eeb177..0896eeb177 100644
--- a/src/libsystemd/src/sd-bus/bus-kernel.c
+++ b/src/libsystemd/libsystemd-internal/sd-bus/bus-kernel.c
diff --git a/src/libsystemd/src/sd-bus/bus-kernel.h b/src/libsystemd/libsystemd-internal/sd-bus/bus-kernel.h
index 53ba3bdcf3..2927ba26a5 100644
--- a/src/libsystemd/src/sd-bus/bus-kernel.h
+++ b/src/libsystemd/libsystemd-internal/sd-bus/bus-kernel.h
@@ -21,7 +21,7 @@
 
 #include <stdbool.h>
 
-#include "sd-bus.h"
+#include <systemd/sd-bus.h>
 
 #define KDBUS_ITEM_NEXT(item) \
         (typeof(item))(((uint8_t *)item) + ALIGN8((item)->size))
diff --git a/src/libsystemd/src/sd-bus/bus-match.c b/src/libsystemd/libsystemd-internal/sd-bus/bus-match.c
index 397baf6f33..397baf6f33 100644
--- a/src/libsystemd/src/sd-bus/bus-match.c
+++ b/src/libsystemd/libsystemd-internal/sd-bus/bus-match.c
diff --git a/src/libsystemd/src/sd-bus/bus-match.h b/src/libsystemd/libsystemd-internal/sd-bus/bus-match.h
index 8cbbb63b11..3f71720185 100644
--- a/src/libsystemd/src/sd-bus/bus-match.h
+++ b/src/libsystemd/libsystemd-internal/sd-bus/bus-match.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 "hashmap.h"
 
diff --git a/src/libsystemd/src/sd-bus/bus-message.c b/src/libsystemd/libsystemd-internal/sd-bus/bus-message.c
index 7be28c509b..6a9e87c2d8 100644
--- a/src/libsystemd/src/sd-bus/bus-message.c
+++ b/src/libsystemd/libsystemd-internal/sd-bus/bus-message.c
@@ -21,7 +21,7 @@
 #include <fcntl.h>
 #include <sys/mman.h>
 
-#include "sd-bus.h"
+#include <systemd/sd-bus.h>
 
 #include "alloc-util.h"
 #include "bus-gvariant.h"
diff --git a/src/libsystemd/src/sd-bus/bus-message.h b/src/libsystemd/libsystemd-internal/sd-bus/bus-message.h
index 4710c106b9..6a2c2d533c 100644
--- a/src/libsystemd/src/sd-bus/bus-message.h
+++ b/src/libsystemd/libsystemd-internal/sd-bus/bus-message.h
@@ -23,7 +23,7 @@
 #include <stdbool.h>
 #include <sys/socket.h>
 
-#include "sd-bus.h"
+#include <systemd/sd-bus.h>
 
 #include "bus-creds.h"
 #include "bus-protocol.h"
diff --git a/src/libsystemd/src/sd-bus/bus-objects.c b/src/libsystemd/libsystemd-internal/sd-bus/bus-objects.c
index 1f285ae8a6..1f285ae8a6 100644
--- a/src/libsystemd/src/sd-bus/bus-objects.c
+++ b/src/libsystemd/libsystemd-internal/sd-bus/bus-objects.c
diff --git a/src/libsystemd/src/sd-bus/bus-objects.h b/src/libsystemd/libsystemd-internal/sd-bus/bus-objects.h
index e0b8c534ed..e0b8c534ed 100644
--- a/src/libsystemd/src/sd-bus/bus-objects.h
+++ b/src/libsystemd/libsystemd-internal/sd-bus/bus-objects.h
diff --git a/src/libsystemd/src/sd-bus/bus-protocol.h b/src/libsystemd/libsystemd-internal/sd-bus/bus-protocol.h
index 9d180cb284..9d180cb284 100644
--- a/src/libsystemd/src/sd-bus/bus-protocol.h
+++ b/src/libsystemd/libsystemd-internal/sd-bus/bus-protocol.h
diff --git a/src/libsystemd/src/sd-bus/bus-signature.c b/src/libsystemd/libsystemd-internal/sd-bus/bus-signature.c
index 7bc243494a..7bc243494a 100644
--- a/src/libsystemd/src/sd-bus/bus-signature.c
+++ b/src/libsystemd/libsystemd-internal/sd-bus/bus-signature.c
diff --git a/src/libsystemd/src/sd-bus/bus-signature.h b/src/libsystemd/libsystemd-internal/sd-bus/bus-signature.h
index 1e0cd7f587..1e0cd7f587 100644
--- a/src/libsystemd/src/sd-bus/bus-signature.h
+++ b/src/libsystemd/libsystemd-internal/sd-bus/bus-signature.h
diff --git a/src/libsystemd/src/sd-bus/bus-slot.c b/src/libsystemd/libsystemd-internal/sd-bus/bus-slot.c
index a8c74011bf..b1783cd4a9 100644
--- a/src/libsystemd/src/sd-bus/bus-slot.c
+++ b/src/libsystemd/libsystemd-internal/sd-bus/bus-slot.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-control.h"
diff --git a/src/libsystemd/src/sd-bus/bus-slot.h b/src/libsystemd/libsystemd-internal/sd-bus/bus-slot.h
index 3b8b94dc6b..b862799d1c 100644
--- a/src/libsystemd/src/sd-bus/bus-slot.h
+++ b/src/libsystemd/libsystemd-internal/sd-bus/bus-slot.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-internal.h"
 
diff --git a/src/libsystemd/src/sd-bus/bus-socket.c b/src/libsystemd/libsystemd-internal/sd-bus/bus-socket.c
index a2fb391239..a0008190c5 100644
--- a/src/libsystemd/src/sd-bus/bus-socket.c
+++ b/src/libsystemd/libsystemd-internal/sd-bus/bus-socket.c
@@ -22,8 +22,8 @@
 #include <stdlib.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/libsystemd/src/sd-bus/bus-socket.h b/src/libsystemd/libsystemd-internal/sd-bus/bus-socket.h
index 684feead74..6e1d32e6a7 100644
--- a/src/libsystemd/src/sd-bus/bus-socket.h
+++ b/src/libsystemd/libsystemd-internal/sd-bus/bus-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>
 
 void bus_socket_setup(sd_bus *b);
 
diff --git a/src/libsystemd/src/sd-bus/bus-track.c b/src/libsystemd/libsystemd-internal/sd-bus/bus-track.c
index bdbf7d4a85..5d08b0a37b 100644
--- a/src/libsystemd/src/sd-bus/bus-track.c
+++ b/src/libsystemd/libsystemd-internal/sd-bus/bus-track.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-internal.h"
diff --git a/src/libsystemd/src/sd-bus/bus-track.h b/src/libsystemd/libsystemd-internal/sd-bus/bus-track.h
index 7d93a727d6..7d93a727d6 100644
--- a/src/libsystemd/src/sd-bus/bus-track.h
+++ b/src/libsystemd/libsystemd-internal/sd-bus/bus-track.h
diff --git a/src/libsystemd/src/sd-bus/bus-type.c b/src/libsystemd/libsystemd-internal/sd-bus/bus-type.c
index c692afc580..c692afc580 100644
--- a/src/libsystemd/src/sd-bus/bus-type.c
+++ b/src/libsystemd/libsystemd-internal/sd-bus/bus-type.c
diff --git a/src/libsystemd/src/sd-bus/bus-type.h b/src/libsystemd/libsystemd-internal/sd-bus/bus-type.h
index 5c87eb5f08..7169b0f765 100644
--- a/src/libsystemd/src/sd-bus/bus-type.h
+++ b/src/libsystemd/libsystemd-internal/sd-bus/bus-type.h
@@ -21,7 +21,7 @@
 
 #include <stdbool.h>
 
-#include "sd-bus.h"
+#include <systemd/sd-bus.h>
 
 #include "macro.h"
 
diff --git a/src/libsystemd/src/sd-bus/busctl-introspect.c b/src/libsystemd/libsystemd-internal/sd-bus/busctl-introspect.c
index b09509f8e1..3c49ad5c57 100644
--- a/src/libsystemd/src/sd-bus/busctl-introspect.c
+++ b/src/libsystemd/libsystemd-internal/sd-bus/busctl-introspect.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 "busctl-introspect.h"
diff --git a/src/libsystemd/src/sd-bus/busctl-introspect.h b/src/libsystemd/libsystemd-internal/sd-bus/busctl-introspect.h
index d922e352db..d922e352db 100644
--- a/src/libsystemd/src/sd-bus/busctl-introspect.h
+++ b/src/libsystemd/libsystemd-internal/sd-bus/busctl-introspect.h
diff --git a/src/libsystemd/src/sd-bus/busctl.c b/src/libsystemd/libsystemd-internal/sd-bus/busctl.c
index 35fabf038c..fd3b241aad 100644
--- a/src/libsystemd/src/sd-bus/busctl.c
+++ b/src/libsystemd/libsystemd-internal/sd-bus/busctl.c
@@ -19,7 +19,7 @@
 
 #include <getopt.h>
 
-#include "sd-bus.h"
+#include <systemd/sd-bus.h>
 
 #include "alloc-util.h"
 #include "bus-dump.h"
diff --git a/src/libsystemd/src/sd-bus/kdbus.h b/src/libsystemd/libsystemd-internal/sd-bus/kdbus.h
index ecffc6b13c..ecffc6b13c 100644
--- a/src/libsystemd/src/sd-bus/kdbus.h
+++ b/src/libsystemd/libsystemd-internal/sd-bus/kdbus.h
diff --git a/src/libsystemd/src/sd-bus/sd-bus.c b/src/libsystemd/libsystemd-internal/sd-bus/sd-bus.c
index c6f626d8aa..850949fa25 100644
--- a/src/libsystemd/src/sd-bus/sd-bus.c
+++ b/src/libsystemd/libsystemd-internal/sd-bus/sd-bus.c
@@ -25,7 +25,7 @@
 #include <sys/mman.h>
 #include <unistd.h>
 
-#include "sd-bus.h"
+#include <systemd/sd-bus.h>
 
 #include "alloc-util.h"
 #include "bus-container.h"
diff --git a/src/libsystemd/src/sd-bus/test-bus-benchmark.c b/src/libsystemd/libsystemd-internal/sd-bus/test-bus-benchmark.c
index 56ac2ab3dd..a222d36bb4 100644
--- a/src/libsystemd/src/sd-bus/test-bus-benchmark.c
+++ b/src/libsystemd/libsystemd-internal/sd-bus/test-bus-benchmark.c
@@ -19,7 +19,7 @@
 
 #include <sys/wait.h>
 
-#include "sd-bus.h"
+#include <systemd/sd-bus.h>
 
 #include "alloc-util.h"
 #include "bus-internal.h"
diff --git a/src/libsystemd/src/sd-bus/test-bus-chat.c b/src/libsystemd/libsystemd-internal/sd-bus/test-bus-chat.c
index 048c0d19e2..1f028d2b23 100644
--- a/src/libsystemd/src/sd-bus/test-bus-chat.c
+++ b/src/libsystemd/libsystemd-internal/sd-bus/test-bus-chat.c
@@ -22,7 +22,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/libsystemd/src/sd-bus/test-bus-cleanup.c b/src/libsystemd/libsystemd-internal/sd-bus/test-bus-cleanup.c
index 250a5b2908..bd4a3fbf34 100644
--- a/src/libsystemd/src/sd-bus/test-bus-cleanup.c
+++ b/src/libsystemd/libsystemd-internal/sd-bus/test-bus-cleanup.c
@@ -19,7 +19,7 @@
 
 #include <stdio.h>
 
-#include "sd-bus.h"
+#include <systemd/sd-bus.h>
 
 #include "bus-internal.h"
 #include "bus-message.h"
diff --git a/src/libsystemd/src/sd-bus/test-bus-creds.c b/src/libsystemd/libsystemd-internal/sd-bus/test-bus-creds.c
index e9ef483bdd..c58b76c258 100644
--- a/src/libsystemd/src/sd-bus/test-bus-creds.c
+++ b/src/libsystemd/libsystemd-internal/sd-bus/test-bus-creds.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 "bus-dump.h"
 #include "bus-util.h"
diff --git a/src/libsystemd/src/sd-bus/test-bus-error.c b/src/libsystemd/libsystemd-internal/sd-bus/test-bus-error.c
index 46d18abd29..b9ceda7a8b 100644
--- a/src/libsystemd/src/sd-bus/test-bus-error.c
+++ b/src/libsystemd/libsystemd-internal/sd-bus/test-bus-error.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 "bus-common-errors.h"
 #include "bus-error.h"
diff --git a/src/libsystemd/src/sd-bus/test-bus-gvariant.c b/src/libsystemd/libsystemd-internal/sd-bus/test-bus-gvariant.c
index 83f114a0fe..3c9ec9fef0 100644
--- a/src/libsystemd/src/sd-bus/test-bus-gvariant.c
+++ b/src/libsystemd/libsystemd-internal/sd-bus/test-bus-gvariant.c
@@ -21,7 +21,7 @@
 #include <glib.h>
 #endif
 
-#include "sd-bus.h"
+#include <systemd/sd-bus.h>
 
 #include "alloc-util.h"
 #include "bus-dump.h"
diff --git a/src/libsystemd/src/sd-bus/test-bus-introspect.c b/src/libsystemd/libsystemd-internal/sd-bus/test-bus-introspect.c
index 4425cfae26..4425cfae26 100644
--- a/src/libsystemd/src/sd-bus/test-bus-introspect.c
+++ b/src/libsystemd/libsystemd-internal/sd-bus/test-bus-introspect.c
diff --git a/src/libsystemd/src/sd-bus/test-bus-kernel-bloom.c b/src/libsystemd/libsystemd-internal/sd-bus/test-bus-kernel-bloom.c
index eb6179d7d2..f16e14a310 100644
--- a/src/libsystemd/src/sd-bus/test-bus-kernel-bloom.c
+++ b/src/libsystemd/libsystemd-internal/sd-bus/test-bus-kernel-bloom.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-kernel.h"
diff --git a/src/libsystemd/src/sd-bus/test-bus-kernel.c b/src/libsystemd/libsystemd-internal/sd-bus/test-bus-kernel.c
index 2214817312..2a5ba60cc9 100644
--- a/src/libsystemd/src/sd-bus/test-bus-kernel.c
+++ b/src/libsystemd/libsystemd-internal/sd-bus/test-bus-kernel.c
@@ -19,7 +19,7 @@
 
 #include <fcntl.h>
 
-#include "sd-bus.h"
+#include <systemd/sd-bus.h>
 
 #include "alloc-util.h"
 #include "bus-dump.h"
diff --git a/src/libsystemd/src/sd-bus/test-bus-marshal.c b/src/libsystemd/libsystemd-internal/sd-bus/test-bus-marshal.c
index a28cc5b79e..45db4764a0 100644
--- a/src/libsystemd/src/sd-bus/test-bus-marshal.c
+++ b/src/libsystemd/libsystemd-internal/sd-bus/test-bus-marshal.c
@@ -28,7 +28,7 @@
 #include <dbus/dbus.h>
 #endif
 
-#include "sd-bus.h"
+#include <systemd/sd-bus.h>
 
 #include "alloc-util.h"
 #include "bus-dump.h"
diff --git a/src/libsystemd/src/sd-bus/test-bus-match.c b/src/libsystemd/libsystemd-internal/sd-bus/test-bus-match.c
index 29c4529f95..29c4529f95 100644
--- a/src/libsystemd/src/sd-bus/test-bus-match.c
+++ b/src/libsystemd/libsystemd-internal/sd-bus/test-bus-match.c
diff --git a/src/libsystemd/src/sd-bus/test-bus-objects.c b/src/libsystemd/libsystemd-internal/sd-bus/test-bus-objects.c
index f11cafd888..e9bb655665 100644
--- a/src/libsystemd/src/sd-bus/test-bus-objects.c
+++ b/src/libsystemd/libsystemd-internal/sd-bus/test-bus-objects.c
@@ -20,7 +20,7 @@
 #include <pthread.h>
 #include <stdlib.h>
 
-#include "sd-bus.h"
+#include <systemd/sd-bus.h>
 
 #include "alloc-util.h"
 #include "bus-dump.h"
diff --git a/src/libsystemd/src/sd-bus/test-bus-proxy.c b/src/libsystemd/libsystemd-internal/sd-bus/test-bus-proxy.c
index 45d0a5ffce..a9fe44e66c 100644
--- a/src/libsystemd/src/sd-bus/test-bus-proxy.c
+++ b/src/libsystemd/libsystemd-internal/sd-bus/test-bus-proxy.c
@@ -21,7 +21,7 @@
 #include <fcntl.h>
 #include <stdlib.h>
 
-#include "sd-bus.h"
+#include <systemd/sd-bus.h>
 
 #include "alloc-util.h"
 #include "bus-dump.h"
diff --git a/src/libsystemd/src/sd-bus/test-bus-server.c b/src/libsystemd/libsystemd-internal/sd-bus/test-bus-server.c
index b6272efc30..190410674b 100644
--- a/src/libsystemd/src/sd-bus/test-bus-server.c
+++ b/src/libsystemd/libsystemd-internal/sd-bus/test-bus-server.c
@@ -20,7 +20,7 @@
 #include <pthread.h>
 #include <stdlib.h>
 
-#include "sd-bus.h"
+#include <systemd/sd-bus.h>
 
 #include "bus-internal.h"
 #include "bus-util.h"
diff --git a/src/libsystemd/src/sd-bus/test-bus-signature.c b/src/libsystemd/libsystemd-internal/sd-bus/test-bus-signature.c
index 4f4fd093bf..4f4fd093bf 100644
--- a/src/libsystemd/src/sd-bus/test-bus-signature.c
+++ b/src/libsystemd/libsystemd-internal/sd-bus/test-bus-signature.c
diff --git a/src/libsystemd/src/sd-bus/test-bus-zero-copy.c b/src/libsystemd/libsystemd-internal/sd-bus/test-bus-zero-copy.c
index 3380e8500a..9e20d67670 100644
--- a/src/libsystemd/src/sd-bus/test-bus-zero-copy.c
+++ b/src/libsystemd/libsystemd-internal/sd-bus/test-bus-zero-copy.c
@@ -19,7 +19,7 @@
 
 #include <sys/mman.h>
 
-#include "sd-bus.h"
+#include <systemd/sd-bus.h>
 
 #include "alloc-util.h"
 #include "bus-dump.h"
diff --git a/src/libsystemd/libsystemd-internal/sd-daemon/Makefile b/src/libsystemd/libsystemd-internal/sd-daemon/Makefile
new file mode 120000
index 0000000000..71a1159ce0
--- /dev/null
+++ b/src/libsystemd/libsystemd-internal/sd-daemon/Makefile
@@ -0,0 +1 @@
+../subdir.mk
\ No newline at end of file
diff --git a/src/libsystemd/src/sd-daemon/sd-daemon.c b/src/libsystemd/libsystemd-internal/sd-daemon/sd-daemon.c
index 4e50b61979..7c79a938b9 100644
--- a/src/libsystemd/src/sd-daemon/sd-daemon.c
+++ b/src/libsystemd/libsystemd-internal/sd-daemon/sd-daemon.c
@@ -31,7 +31,7 @@
 #include <sys/un.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/libsystemd/libsystemd-internal/sd-device/Makefile b/src/libsystemd/libsystemd-internal/sd-device/Makefile
new file mode 120000
index 0000000000..71a1159ce0
--- /dev/null
+++ b/src/libsystemd/libsystemd-internal/sd-device/Makefile
@@ -0,0 +1 @@
+../subdir.mk
\ No newline at end of file
diff --git a/src/libsystemd/src/sd-device/device-enumerator-private.h b/src/libsystemd/libsystemd-internal/sd-device/device-enumerator-private.h
index eb06f9542d..d46e26b56e 100644
--- a/src/libsystemd/src/sd-device/device-enumerator-private.h
+++ b/src/libsystemd/libsystemd-internal/sd-device/device-enumerator-private.h
@@ -19,7 +19,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "sd-device.h"
+#include <systemd/sd-device.h>
 
 int device_enumerator_scan_devices(sd_device_enumerator *enumeartor);
 int device_enumerator_scan_subsystems(sd_device_enumerator *enumeartor);
diff --git a/src/libsystemd/src/sd-device/device-enumerator.c b/src/libsystemd/libsystemd-internal/sd-device/device-enumerator.c
index 4a7a8b1f9e..796728ee0e 100644
--- a/src/libsystemd/src/sd-device/device-enumerator.c
+++ b/src/libsystemd/libsystemd-internal/sd-device/device-enumerator.c
@@ -18,7 +18,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "sd-device.h"
+#include <systemd/sd-device.h>
 
 #include "alloc-util.h"
 #include "device-enumerator-private.h"
diff --git a/src/libsystemd/src/sd-device/device-internal.h b/src/libsystemd/libsystemd-internal/sd-device/device-internal.h
index b96441de56..b96441de56 100644
--- a/src/libsystemd/src/sd-device/device-internal.h
+++ b/src/libsystemd/libsystemd-internal/sd-device/device-internal.h
diff --git a/src/libsystemd/src/sd-device/device-private.c b/src/libsystemd/libsystemd-internal/sd-device/device-private.c
index f2af3ab3ae..bf7d3c6f9f 100644
--- a/src/libsystemd/src/sd-device/device-private.c
+++ b/src/libsystemd/libsystemd-internal/sd-device/device-private.c
@@ -22,7 +22,7 @@
 #include <net/if.h>
 #include <sys/types.h>
 
-#include "sd-device.h"
+#include <systemd/sd-device.h>
 
 #include "alloc-util.h"
 #include "device-internal.h"
diff --git a/src/libsystemd/src/sd-device/device-private.h b/src/libsystemd/libsystemd-internal/sd-device/device-private.h
index 29b3e155fb..d6add2f7b2 100644
--- a/src/libsystemd/src/sd-device/device-private.h
+++ b/src/libsystemd/libsystemd-internal/sd-device/device-private.h
@@ -23,7 +23,7 @@
 #include <stdbool.h>
 #include <sys/types.h>
 
-#include "sd-device.h"
+#include <systemd/sd-device.h>
 
 int device_new_from_nulstr(sd_device **ret, uint8_t *nulstr, size_t len);
 int device_new_from_strv(sd_device **ret, char **strv);
diff --git a/src/libsystemd/src/sd-device/device-util.h b/src/libsystemd/libsystemd-internal/sd-device/device-util.h
index 5b42e11de6..5b42e11de6 100644
--- a/src/libsystemd/src/sd-device/device-util.h
+++ b/src/libsystemd/libsystemd-internal/sd-device/device-util.h
diff --git a/src/libsystemd/src/sd-device/sd-device.c b/src/libsystemd/libsystemd-internal/sd-device/sd-device.c
index 9633e46ce0..895002499c 100644
--- a/src/libsystemd/src/sd-device/sd-device.c
+++ b/src/libsystemd/libsystemd-internal/sd-device/sd-device.c
@@ -22,7 +22,7 @@
 #include <net/if.h>
 #include <sys/types.h>
 
-#include "sd-device.h"
+#include <systemd/sd-device.h>
 
 #include "alloc-util.h"
 #include "device-internal.h"
diff --git a/src/libsystemd/libsystemd-internal/sd-event/Makefile b/src/libsystemd/libsystemd-internal/sd-event/Makefile
new file mode 120000
index 0000000000..71a1159ce0
--- /dev/null
+++ b/src/libsystemd/libsystemd-internal/sd-event/Makefile
@@ -0,0 +1 @@
+../subdir.mk
\ No newline at end of file
diff --git a/src/libsystemd/src/sd-event/sd-event.c b/src/libsystemd/libsystemd-internal/sd-event/sd-event.c
index deef6ba9d3..0fec8d71b2 100644
--- a/src/libsystemd/src/sd-event/sd-event.c
+++ b/src/libsystemd/libsystemd-internal/sd-event/sd-event.c
@@ -21,9 +21,9 @@
 #include <sys/timerfd.h>
 #include <sys/wait.h>
 
-#include "sd-daemon.h"
-#include "sd-event.h"
-#include "sd-id128.h"
+#include <systemd/sd-daemon.h>
+#include <systemd/sd-event.h>
+#include <systemd/sd-id128.h>
 
 #include "alloc-util.h"
 #include "fd-util.h"
diff --git a/src/libsystemd/src/sd-event/test-event.c b/src/libsystemd/libsystemd-internal/sd-event/test-event.c
index daea4126f8..6beb1b08cd 100644
--- a/src/libsystemd/src/sd-event/test-event.c
+++ b/src/libsystemd/libsystemd-internal/sd-event/test-event.c
@@ -17,7 +17,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "sd-event.h"
+#include <systemd/sd-event.h>
 
 #include "fd-util.h"
 #include "log.h"
diff --git a/src/libsystemd/libsystemd-internal/sd-hwdb/Makefile b/src/libsystemd/libsystemd-internal/sd-hwdb/Makefile
new file mode 120000
index 0000000000..71a1159ce0
--- /dev/null
+++ b/src/libsystemd/libsystemd-internal/sd-hwdb/Makefile
@@ -0,0 +1 @@
+../subdir.mk
\ No newline at end of file
diff --git a/src/libsystemd/src/sd-hwdb/hwdb-internal.h b/src/libsystemd/libsystemd-internal/sd-hwdb/hwdb-internal.h
index 13fddfc8ad..13fddfc8ad 100644
--- a/src/libsystemd/src/sd-hwdb/hwdb-internal.h
+++ b/src/libsystemd/libsystemd-internal/sd-hwdb/hwdb-internal.h
diff --git a/src/libsystemd/src/sd-hwdb/hwdb-util.h b/src/libsystemd/libsystemd-internal/sd-hwdb/hwdb-util.h
index 5e21e5008b..05dc47962b 100644
--- a/src/libsystemd/src/sd-hwdb/hwdb-util.h
+++ b/src/libsystemd/libsystemd-internal/sd-hwdb/hwdb-util.h
@@ -19,7 +19,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "sd-hwdb.h"
+#include <systemd/sd-hwdb.h>
 
 #include "util.h"
 
diff --git a/src/libsystemd/src/sd-hwdb/sd-hwdb.c b/src/libsystemd/libsystemd-internal/sd-hwdb/sd-hwdb.c
index 062fa97b17..7dcfe95b87 100644
--- a/src/libsystemd/src/sd-hwdb/sd-hwdb.c
+++ b/src/libsystemd/libsystemd-internal/sd-hwdb/sd-hwdb.c
@@ -27,7 +27,7 @@
 #include <string.h>
 #include <sys/mman.h>
 
-#include "sd-hwdb.h"
+#include <systemd/sd-hwdb.h>
 
 #include "alloc-util.h"
 #include "fd-util.h"
diff --git a/src/libsystemd/libsystemd-internal/sd-id128/Makefile b/src/libsystemd/libsystemd-internal/sd-id128/Makefile
new file mode 120000
index 0000000000..71a1159ce0
--- /dev/null
+++ b/src/libsystemd/libsystemd-internal/sd-id128/Makefile
@@ -0,0 +1 @@
+../subdir.mk
\ No newline at end of file
diff --git a/src/libsystemd/src/sd-id128/sd-id128.c b/src/libsystemd/libsystemd-internal/sd-id128/sd-id128.c
index d9c0116f60..cda3e9f0df 100644
--- a/src/libsystemd/src/sd-id128/sd-id128.c
+++ b/src/libsystemd/libsystemd-internal/sd-id128/sd-id128.c
@@ -21,7 +21,7 @@
 #include <fcntl.h>
 #include <unistd.h>
 
-#include "sd-id128.h"
+#include <systemd/sd-id128.h>
 
 #include "fd-util.h"
 #include "hexdecoct.h"
diff --git a/src/libsystemd/libsystemd-internal/sd-login/Makefile b/src/libsystemd/libsystemd-internal/sd-login/Makefile
new file mode 120000
index 0000000000..71a1159ce0
--- /dev/null
+++ b/src/libsystemd/libsystemd-internal/sd-login/Makefile
@@ -0,0 +1 @@
+../subdir.mk
\ No newline at end of file
diff --git a/src/libsystemd/src/sd-login/sd-login.c b/src/libsystemd/libsystemd-internal/sd-login/sd-login.c
index 9d4f187502..84831d5e95 100644
--- a/src/libsystemd/src/sd-login/sd-login.c
+++ b/src/libsystemd/libsystemd-internal/sd-login/sd-login.c
@@ -23,7 +23,7 @@
 #include <sys/inotify.h>
 #include <unistd.h>
 
-#include "sd-login.h"
+#include <systemd/sd-login.h>
 
 #include "alloc-util.h"
 #include "cgroup-util.h"
diff --git a/src/libsystemd/src/sd-login/test-login.c b/src/libsystemd/libsystemd-internal/sd-login/test-login.c
index c1fd7dd33e..994c76df4a 100644
--- a/src/libsystemd/src/sd-login/test-login.c
+++ b/src/libsystemd/libsystemd-internal/sd-login/test-login.c
@@ -20,7 +20,7 @@
 #include <poll.h>
 #include <string.h>
 
-#include "sd-login.h"
+#include <systemd/sd-login.h>
 
 #include "alloc-util.h"
 #include "fd-util.h"
diff --git a/src/libsystemd/libsystemd-internal/sd-netlink/Makefile b/src/libsystemd/libsystemd-internal/sd-netlink/Makefile
new file mode 120000
index 0000000000..71a1159ce0
--- /dev/null
+++ b/src/libsystemd/libsystemd-internal/sd-netlink/Makefile
@@ -0,0 +1 @@
+../subdir.mk
\ No newline at end of file
diff --git a/src/libsystemd/src/sd-netlink/local-addresses.c b/src/libsystemd/libsystemd-internal/sd-netlink/local-addresses.c
index 6abd8fd0cc..e6feb859cd 100644
--- a/src/libsystemd/src/sd-netlink/local-addresses.c
+++ b/src/libsystemd/libsystemd-internal/sd-netlink/local-addresses.c
@@ -18,7 +18,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "sd-netlink.h"
+#include <systemd/sd-netlink.h>
 
 #include "alloc-util.h"
 #include "local-addresses.h"
diff --git a/src/libsystemd/src/sd-netlink/local-addresses.h b/src/libsystemd/libsystemd-internal/sd-netlink/local-addresses.h
index 18d71e797e..1ddc50ace5 100644
--- a/src/libsystemd/src/sd-netlink/local-addresses.h
+++ b/src/libsystemd/libsystemd-internal/sd-netlink/local-addresses.h
@@ -20,7 +20,7 @@
 ***/
 
 
-#include "sd-netlink.h"
+#include <systemd/sd-netlink.h>
 
 #include "in-addr-util.h"
 
diff --git a/src/libsystemd/src/sd-netlink/netlink-internal.h b/src/libsystemd/libsystemd-internal/sd-netlink/netlink-internal.h
index dcfb080ad3..1d29c3a369 100644
--- a/src/libsystemd/src/sd-netlink/netlink-internal.h
+++ b/src/libsystemd/libsystemd-internal/sd-netlink/netlink-internal.h
@@ -21,7 +21,7 @@
 
 #include <linux/netlink.h>
 
-#include "sd-netlink.h"
+#include <systemd/sd-netlink.h>
 
 #include "list.h"
 #include "netlink-types.h"
diff --git a/src/libsystemd/src/sd-netlink/netlink-message.c b/src/libsystemd/libsystemd-internal/sd-netlink/netlink-message.c
index 3a866fdafe..0c307661f1 100644
--- a/src/libsystemd/src/sd-netlink/netlink-message.c
+++ b/src/libsystemd/libsystemd-internal/sd-netlink/netlink-message.c
@@ -21,7 +21,7 @@
 #include <stdbool.h>
 #include <unistd.h>
 
-#include "sd-netlink.h"
+#include <systemd/sd-netlink.h>
 
 #include "alloc-util.h"
 #include "formats-util.h"
diff --git a/src/libsystemd/src/sd-netlink/netlink-socket.c b/src/libsystemd/libsystemd-internal/sd-netlink/netlink-socket.c
index 590fc53fc7..25b7509217 100644
--- a/src/libsystemd/src/sd-netlink/netlink-socket.c
+++ b/src/libsystemd/libsystemd-internal/sd-netlink/netlink-socket.c
@@ -21,7 +21,7 @@
 #include <stdbool.h>
 #include <unistd.h>
 
-#include "sd-netlink.h"
+#include <systemd/sd-netlink.h>
 
 #include "alloc-util.h"
 #include "formats-util.h"
diff --git a/src/libsystemd/src/sd-netlink/netlink-types.c b/src/libsystemd/libsystemd-internal/sd-netlink/netlink-types.c
index a5758bb516..a5758bb516 100644
--- a/src/libsystemd/src/sd-netlink/netlink-types.c
+++ b/src/libsystemd/libsystemd-internal/sd-netlink/netlink-types.c
diff --git a/src/libsystemd/src/sd-netlink/netlink-types.h b/src/libsystemd/libsystemd-internal/sd-netlink/netlink-types.h
index ecb20bfcdc..ecb20bfcdc 100644
--- a/src/libsystemd/src/sd-netlink/netlink-types.h
+++ b/src/libsystemd/libsystemd-internal/sd-netlink/netlink-types.h
diff --git a/src/libsystemd/src/sd-netlink/netlink-util.c b/src/libsystemd/libsystemd-internal/sd-netlink/netlink-util.c
index 73b9ac0258..828ae7db7f 100644
--- a/src/libsystemd/src/sd-netlink/netlink-util.c
+++ b/src/libsystemd/libsystemd-internal/sd-netlink/netlink-util.c
@@ -17,7 +17,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "sd-netlink.h"
+#include <systemd/sd-netlink.h>
 
 #include "netlink-internal.h"
 #include "netlink-util.h"
diff --git a/src/libsystemd/src/sd-netlink/netlink-util.h b/src/libsystemd/libsystemd-internal/sd-netlink/netlink-util.h
index f49bf4eaa6..e8f932549f 100644
--- a/src/libsystemd/src/sd-netlink/netlink-util.h
+++ b/src/libsystemd/libsystemd-internal/sd-netlink/netlink-util.h
@@ -19,7 +19,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "sd-netlink.h"
+#include <systemd/sd-netlink.h>
 
 #include "util.h"
 
diff --git a/src/libsystemd/src/sd-netlink/rtnl-message.c b/src/libsystemd/libsystemd-internal/sd-netlink/rtnl-message.c
index 090552f576..2f1254295a 100644
--- a/src/libsystemd/src/sd-netlink/rtnl-message.c
+++ b/src/libsystemd/libsystemd-internal/sd-netlink/rtnl-message.c
@@ -21,7 +21,7 @@
 #include <stdbool.h>
 #include <unistd.h>
 
-#include "sd-netlink.h"
+#include <systemd/sd-netlink.h>
 
 #include "formats-util.h"
 #include "missing.h"
diff --git a/src/libsystemd/src/sd-netlink/sd-netlink.c b/src/libsystemd/libsystemd-internal/sd-netlink/sd-netlink.c
index 4833815b43..c536364a24 100644
--- a/src/libsystemd/src/sd-netlink/sd-netlink.c
+++ b/src/libsystemd/libsystemd-internal/sd-netlink/sd-netlink.c
@@ -20,7 +20,7 @@
 #include <poll.h>
 #include <sys/socket.h>
 
-#include "sd-netlink.h"
+#include <systemd/sd-netlink.h>
 
 #include "alloc-util.h"
 #include "fd-util.h"
diff --git a/src/libsystemd/src/sd-netlink/test-local-addresses.c b/src/libsystemd/libsystemd-internal/sd-netlink/test-local-addresses.c
index e0e28cc0cc..e0e28cc0cc 100644
--- a/src/libsystemd/src/sd-netlink/test-local-addresses.c
+++ b/src/libsystemd/libsystemd-internal/sd-netlink/test-local-addresses.c
diff --git a/src/libsystemd/src/sd-netlink/test-netlink.c b/src/libsystemd/libsystemd-internal/sd-netlink/test-netlink.c
index de5e0ffc8f..e16c35144d 100644
--- a/src/libsystemd/src/sd-netlink/test-netlink.c
+++ b/src/libsystemd/libsystemd-internal/sd-netlink/test-netlink.c
@@ -20,7 +20,7 @@
 #include <net/if.h>
 #include <netinet/ether.h>
 
-#include "sd-netlink.h"
+#include <systemd/sd-netlink.h>
 
 #include "ether-addr-util.h"
 #include "macro.h"
diff --git a/src/libsystemd/libsystemd-internal/sd-network/Makefile b/src/libsystemd/libsystemd-internal/sd-network/Makefile
new file mode 120000
index 0000000000..71a1159ce0
--- /dev/null
+++ b/src/libsystemd/libsystemd-internal/sd-network/Makefile
@@ -0,0 +1 @@
+../subdir.mk
\ No newline at end of file
diff --git a/src/libsystemd/src/sd-network/network-util.c b/src/libsystemd/libsystemd-internal/sd-network/network-util.c
index a0d9b5f1a4..a0d9b5f1a4 100644
--- a/src/libsystemd/src/sd-network/network-util.c
+++ b/src/libsystemd/libsystemd-internal/sd-network/network-util.c
diff --git a/src/libsystemd/src/sd-network/network-util.h b/src/libsystemd/libsystemd-internal/sd-network/network-util.h
index 26780dce28..8c4dbc68b1 100644
--- a/src/libsystemd/src/sd-network/network-util.h
+++ b/src/libsystemd/libsystemd-internal/sd-network/network-util.h
@@ -19,6 +19,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "sd-network.h"
+#include <systemd/sd-network.h>
 
 bool network_is_online(void);
diff --git a/src/libsystemd/src/sd-network/sd-network.c b/src/libsystemd/libsystemd-internal/sd-network/sd-network.c
index 62051992ef..5ebe7de7af 100644
--- a/src/libsystemd/src/sd-network/sd-network.c
+++ b/src/libsystemd/libsystemd-internal/sd-network/sd-network.c
@@ -23,7 +23,7 @@
 #include <string.h>
 #include <sys/inotify.h>
 
-#include "sd-network.h"
+#include <systemd/sd-network.h>
 
 #include "alloc-util.h"
 #include "fd-util.h"
diff --git a/src/libsystemd/libsystemd-internal/sd-path/Makefile b/src/libsystemd/libsystemd-internal/sd-path/Makefile
new file mode 120000
index 0000000000..71a1159ce0
--- /dev/null
+++ b/src/libsystemd/libsystemd-internal/sd-path/Makefile
@@ -0,0 +1 @@
+../subdir.mk
\ No newline at end of file
diff --git a/src/libsystemd/src/sd-path/sd-path.c b/src/libsystemd/libsystemd-internal/sd-path/sd-path.c
index 480f1ad065..61a8b092da 100644
--- a/src/libsystemd/src/sd-path/sd-path.c
+++ b/src/libsystemd/libsystemd-internal/sd-path/sd-path.c
@@ -17,7 +17,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "sd-path.h"
+#include <systemd/sd-path.h>
 
 #include "alloc-util.h"
 #include "architecture.h"
diff --git a/src/libsystemd/libsystemd-internal/sd-resolve/Makefile b/src/libsystemd/libsystemd-internal/sd-resolve/Makefile
new file mode 120000
index 0000000000..71a1159ce0
--- /dev/null
+++ b/src/libsystemd/libsystemd-internal/sd-resolve/Makefile
@@ -0,0 +1 @@
+../subdir.mk
\ No newline at end of file
diff --git a/src/libsystemd/src/sd-resolve/sd-resolve.c b/src/libsystemd/libsystemd-internal/sd-resolve/sd-resolve.c
index 653dbfbe57..30176d7283 100644
--- a/src/libsystemd/src/sd-resolve/sd-resolve.c
+++ b/src/libsystemd/libsystemd-internal/sd-resolve/sd-resolve.c
@@ -29,7 +29,7 @@
 #include <sys/prctl.h>
 #include <unistd.h>
 
-#include "sd-resolve.h"
+#include <systemd/sd-resolve.h>
 
 #include "alloc-util.h"
 #include "fd-util.h"
diff --git a/src/libsystemd/src/sd-resolve/test-resolve.c b/src/libsystemd/libsystemd-internal/sd-resolve/test-resolve.c
index 33ef6fc0f7..9e3ac16597 100644
--- a/src/libsystemd/src/sd-resolve/test-resolve.c
+++ b/src/libsystemd/libsystemd-internal/sd-resolve/test-resolve.c
@@ -26,7 +26,7 @@
 #include <string.h>
 #include <sys/socket.h>
 
-#include "sd-resolve.h"
+#include <systemd/sd-resolve.h>
 
 #include "alloc-util.h"
 #include "macro.h"
diff --git a/src/libsystemd/libsystemd-internal/sd-utf8/Makefile b/src/libsystemd/libsystemd-internal/sd-utf8/Makefile
new file mode 120000
index 0000000000..71a1159ce0
--- /dev/null
+++ b/src/libsystemd/libsystemd-internal/sd-utf8/Makefile
@@ -0,0 +1 @@
+../subdir.mk
\ No newline at end of file
diff --git a/src/libsystemd/src/sd-utf8/sd-utf8.c b/src/libsystemd/libsystemd-internal/sd-utf8/sd-utf8.c
index 33a5a04ea1..77be8e1996 100644
--- a/src/libsystemd/src/sd-utf8/sd-utf8.c
+++ b/src/libsystemd/libsystemd-internal/sd-utf8/sd-utf8.c
@@ -17,7 +17,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "sd-utf8.h"
+#include <systemd/sd-utf8.h>
 
 #include "utf8.h"
 #include "util.h"
diff --git a/src/libsystemd/libsystemd-internal/subdir.mk b/src/libsystemd/libsystemd-internal/subdir.mk
new file mode 100644
index 0000000000..69eb85a4d7
--- /dev/null
+++ b/src/libsystemd/libsystemd-internal/subdir.mk
@@ -0,0 +1,7 @@
+include $(dir $(lastword $(MAKEFILE_LIST)))/../../../../config.mk
+include $(topsrcdir)/automake.head.mk
+
+#CPPFLAGS += $(libsystemd.CPPFLAGS) $(libbasic.CPPFLAGS) $(libshared.CPPFLAGS)
+#CPPFLAGS += -DLIBDIR=\"$(libdir)\" -DUDEVLIBEXECDIR=\"$(udevlibexecdir)\"
+
+include $(topsrcdir)/automake.tail.mk
diff --git a/src/libsystemd/libsystemd-journal-internal/Makefile b/src/libsystemd/libsystemd-journal-internal/Makefile
new file mode 100644
index 0000000000..210ca07d5d
--- /dev/null
+++ b/src/libsystemd/libsystemd-journal-internal/Makefile
@@ -0,0 +1,71 @@
+pkginclude_HEADERS += \
+	src/systemd/sd-journal.h \
+	src/systemd/sd-messages.h \
+	src/systemd/_sd-common.h
+
+libsystemd_journal_internal_la_SOURCES = \
+	src/journal/sd-journal.c \
+	src/systemd/sd-journal.h \
+	src/systemd/_sd-common.h \
+	src/journal/journal-file.c \
+	src/journal/journal-file.h \
+	src/journal/journal-vacuum.c \
+	src/journal/journal-vacuum.h \
+	src/journal/journal-verify.c \
+	src/journal/journal-verify.h \
+	src/journal/lookup3.c \
+	src/journal/lookup3.h \
+	src/journal/journal-send.c \
+	src/journal/journal-def.h \
+	src/journal/compress.h \
+	src/journal/catalog.c \
+	src/journal/catalog.h \
+	src/journal/mmap-cache.c \
+	src/journal/mmap-cache.h \
+	src/journal/compress.c \
+	src/journal/audit-type.h \
+	src/journal/audit-type.c
+
+nodist_libsystemd_journal_internal_la_SOURCES = \
+	src/journal/audit_type-to-name.h
+
+gperf_txt_sources += \
+	src/journal/audit_type-list.txt
+
+# using _CFLAGS = in the conditional below would suppress AM_CFLAGS
+libsystemd_journal_internal_la_CFLAGS = \
+	$(AM_CFLAGS)
+
+libsystemd_journal_internal_la_LIBADD =
+
+ifneq ($(HAVE_XZ),)
+libsystemd_journal_internal_la_CFLAGS += \
+	$(XZ_CFLAGS)
+
+libsystemd_journal_internal_la_LIBADD += \
+	$(XZ_LIBS)
+endif
+
+ifneq ($(HAVE_LZ4),)
+libsystemd_journal_internal_la_LIBADD += \
+	-llz4
+endif
+
+ifneq ($(HAVE_GCRYPT),)
+libsystemd_journal_internal_la_SOURCES += \
+	src/journal/journal-authenticate.c \
+	src/journal/journal-authenticate.h \
+	src/journal/fsprg.c \
+	src/journal/fsprg.h
+
+libsystemd_journal_internal_la_LIBADD += \
+	$(GCRYPT_LIBS)
+
+# fsprg.c is a drop-in file using void pointer arithmetic
+libsystemd_journal_internal_la_CFLAGS += \
+	$(GCRYPT_CFLAGS) \
+	-Wno-pointer-arith
+endif
+
+noinst_LTLIBRARIES += \
+	libsystemd-journal-internal.la
diff --git a/src/libsystemd/src/libsystemd.pc.in b/src/libsystemd/libsystemd.pc.in
index e8f79507ea..e8f79507ea 100644
--- a/src/libsystemd/src/libsystemd.pc.in
+++ b/src/libsystemd/libsystemd.pc.in
diff --git a/src/libsystemd/src/libsystemd.sym b/src/libsystemd/libsystemd.sym
index 4ab637b686..4ab637b686 100644
--- a/src/libsystemd/src/libsystemd.sym
+++ b/src/libsystemd/libsystemd.sym
diff --git a/src/systemd-nspawn/Makefile b/src/systemd-nspawn/Makefile
index e485cac514..9adc4a0dea 100644
--- a/src/systemd-nspawn/Makefile
+++ b/src/systemd-nspawn/Makefile
@@ -46,15 +46,19 @@ systemd_nspawn_SOURCES = \
 	src/core/loopback-setup.c \
 	src/core/loopback-setup.h
 
+nodist_systemd_nspawn_SOURCES = \
+	src/nspawn/nspawn-gperf.c
+
+gperf_gperf_sources += \
+	src/nspawn/nspawn-gperf.gperf
+
 am_out_files = systemd-nspawn
-CPPFLAGS += -I$(topsrcdir)/src/libbasic
-CPPFLAGS += -I$(topoutdir)/src/libbasic
-CPPFLAGS += -I$(topsrcdir)/src/libshared
-CPPFLAGS += -I$(topoutdir)/src/libshared
-CPPFLAGS += -I$(topsrcdir)/src/libsystemd/include
-CPPFLAGS += -I$(topoutdir)/src/libsystemd/include
-CPPFLAGS += -I$(topsrcdir)/src/libudev/include
-CPPFLAGS += -I$(topoutdir)/src/libudev/include
+CPPFLAGS += $(libbasic.CPPFLAGS) $(libshared.CPPFLAGS) $(libsystemd.CPPFLAGS) $(libudev.CPPFLAGS) $(libblkid.CPPFLAGS)
+CPPFLAGS += -I$(topsrcdir)/src/libsystemd/src/sd-netlink -I$(topsrcdir)/src/libsystemd/src/sd-bus -I$(topsrcdir)/src/udev -I$(topsrcdir)/src/libudev/src
+CPPFLAGS += $(libblkid.CPPFLAGS) $(libseccomp.CPPFLAGS)
+ifneq ($(HAVE_LIBIPTC),)
+CPPFLAGS += $(libfirewall.CPPFLAGS)
+endif
 $(outdir)/systemd-nspawn: \
 	$(outdir)/nspawn.o \
 	$(outdir)/nspawn-settings.o \
@@ -67,7 +71,10 @@ $(outdir)/systemd-nspawn: \
 	$(outdir)/nspawn-stub-pid1.o \
 	$(outdir)/mount-setup.o \
 	$(outdir)/loopback-setup.o \
-	$(topsrcdir)/libshared/libshared.la $(BLKID_LIBS)
+	$(libshared.DEPENDS) $(libblkid.DEPENDS)
+ifneq ($(HAVE_LIBIPTC),)
+$(outdir)/systemd-nspawn: $(libfirewall.DEPENDS)
+endif
 
 $(outdir)/mount-setup.c: $(topsrcdir)/src/libcore/mount-setup.c; $(CP) $< $@
 $(outdir)/mount-setup.h: $(topsrcdir)/src/libcore/mount-setup.h; $(CP) $< $@
@@ -76,24 +83,4 @@ $(outdir)/loopback-setup.h: $(topsrcdir)/src/libcore/loopback-setup.h; $(CP) $<
 
 $(outdir)/nspawn.o: $(outdir)/loopback-setup.h
 
-nodist_systemd_nspawn_SOURCES = \
-	src/nspawn/nspawn-gperf.c
-
-gperf_gperf_sources += \
-	src/nspawn/nspawn-gperf.gperf
-
-systemd_nspawn_CFLAGS = \
-	$(AM_CFLAGS) \
-	$(BLKID_CFLAGS) \
-	$(SECCOMP_CFLAGS)
-
-systemd_nspawn_LDADD = \
-	libshared.la \
-	$(BLKID_LIBS)
-
-ifneq ($(HAVE_LIBIPTC),)
-systemd_nspawn_LDADD += \
-	libfirewall.la
-endif
-
 include $(topsrcdir)/automake.tail.mk
diff --git a/src/systemd-nspawn/nspawn-expose-ports.c b/src/systemd-nspawn/nspawn-expose-ports.c
index 8122a14f7b..d82e495fa8 100644
--- a/src/systemd-nspawn/nspawn-expose-ports.c
+++ b/src/systemd-nspawn/nspawn-expose-ports.c
@@ -21,7 +21,7 @@
 
 #include "alloc-util.h"
 #include "fd-util.h"
-#include "firewall-util.h"
+#include <firewall-util.h>
 #include "in-addr-util.h"
 #include "local-addresses.h"
 #include "netlink-util.h"
diff --git a/src/udev/udev.h b/src/udev/udev.h
index 1f9c8120c0..3aace1532f 100644
--- a/src/udev/udev.h
+++ b/src/udev/udev.h
@@ -21,8 +21,8 @@
 #include <sys/param.h>
 #include <sys/types.h>
 
-#include "libudev.h"
-#include "sd-netlink.h"
+#include <libudev.h>
+#include <systemd/sd-netlink.h>
 
 #include "label.h"
 #include "libudev-private.h"