Merge branch 'lukeshu/postmove' into lukeshu/master

# Conflicts:
#	src/libbasic/Makefile

195 files changed, 313 insertions, 258 deletions

diff --git a/src/libbasic/Makefile b/src/libbasic/Makefile
index ded8e4de8b..45d408fa19 100644
--- a/src/libbasic/Makefile
+++ b/src/libbasic/Makefile
@@ -23,262 +23,5 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
-noinst_LTLIBRARIES += \
-	libbasic.la
-
-libbasic_la_SOURCES = \
-	src/basic/missing.h \
-	src/basic/missing_syscall.h \
-	src/basic/capability-util.c \
-	src/basic/capability-util.h \
-	src/basic/conf-files.c \
-	src/basic/conf-files.h \
-	src/basic/stdio-util.h \
-	src/basic/hostname-util.h \
-	src/basic/hostname-util.c \
-	src/basic/unit-name.c \
-	src/basic/unit-name.h \
-	src/basic/ioprio.h \
-	src/basic/securebits.h \
-	src/basic/special.h \
-	src/basic/list.h \
-	src/basic/unaligned.h \
-	src/basic/macro.h \
-	src/basic/def.h \
-	src/basic/sparse-endian.h \
-	src/basic/refcnt.h \
-	src/basic/util.c \
-	src/basic/util.h \
-	src/basic/io-util.c \
-	src/basic/io-util.h \
-	src/basic/string-util.c \
-	src/basic/string-util.h \
-	src/basic/fd-util.c \
-	src/basic/fd-util.h \
-	src/basic/parse-util.c \
-	src/basic/parse-util.h \
-	src/basic/user-util.c \
-	src/basic/user-util.h \
-	src/basic/rlimit-util.c \
-	src/basic/rlimit-util.h \
-	src/basic/dirent-util.c \
-	src/basic/dirent-util.h \
-	src/basic/xattr-util.c \
-	src/basic/xattr-util.h \
-	src/basic/chattr-util.c \
-	src/basic/chattr-util.h \
-	src/basic/proc-cmdline.c \
-	src/basic/proc-cmdline.h \
-	src/basic/fs-util.c \
-	src/basic/fs-util.h \
-	src/basic/syslog-util.c \
-	src/basic/syslog-util.h \
-	src/basic/stat-util.c \
-	src/basic/stat-util.h \
-	src/basic/mount-util.c \
-	src/basic/mount-util.h \
-	src/basic/hexdecoct.c \
-	src/basic/hexdecoct.h \
-	src/basic/glob-util.h \
-	src/basic/glob-util.c \
-	src/basic/extract-word.c \
-	src/basic/extract-word.h \
-	src/basic/escape.c \
-	src/basic/escape.h \
-	src/basic/cpu-set-util.c \
-	src/basic/cpu-set-util.h \
-	src/basic/lockfile-util.c \
-	src/basic/lockfile-util.h \
-	src/basic/path-util.c \
-	src/basic/path-util.h \
-	src/basic/time-util.c \
-	src/basic/time-util.h \
-	src/basic/locale-util.c \
-	src/basic/locale-util.h \
-	src/basic/umask-util.h \
-	src/basic/signal-util.c \
-	src/basic/signal-util.h \
-	src/basic/string-table.c \
-	src/basic/string-table.h \
-	src/basic/mempool.c \
-	src/basic/mempool.h \
-	src/basic/hashmap.c \
-	src/basic/hashmap.h \
-	src/basic/hash-funcs.c \
-	src/basic/hash-funcs.h \
-	src/basic/siphash24.c \
-	src/basic/siphash24.h \
-	src/basic/set.h \
-	src/basic/ordered-set.h \
-	src/basic/ordered-set.c \
-	src/basic/bitmap.c \
-	src/basic/bitmap.h \
-	src/basic/fdset.c \
-	src/basic/fdset.h \
-	src/basic/prioq.c \
-	src/basic/prioq.h \
-	src/basic/web-util.c \
-	src/basic/web-util.h \
-	src/basic/strv.c \
-	src/basic/strv.h \
-	src/basic/env-util.c \
-	src/basic/env-util.h \
-	src/basic/strbuf.c \
-	src/basic/strbuf.h \
-	src/basic/strxcpyx.c \
-	src/basic/strxcpyx.h \
-	src/basic/log.c \
-	src/basic/log.h \
-	src/basic/bus-label.c \
-	src/basic/bus-label.h \
-	src/basic/ratelimit.h \
-	src/basic/ratelimit.c \
-	src/basic/exit-status.c \
-	src/basic/exit-status.h \
-	src/basic/virt.c \
-	src/basic/virt.h \
-	src/basic/architecture.c \
-	src/basic/architecture.h \
-	src/basic/smack-util.c \
-	src/basic/smack-util.h \
-	src/basic/device-nodes.c \
-	src/basic/device-nodes.h \
-	src/basic/utf8.c \
-	src/basic/utf8.h \
-	src/basic/gunicode.c \
-	src/basic/gunicode.h \
-	src/basic/socket-util.c \
-	src/basic/socket-util.h \
-	src/basic/in-addr-util.c \
-	src/basic/in-addr-util.h \
-	src/basic/ether-addr-util.h \
-	src/basic/ether-addr-util.c \
-	src/basic/replace-var.c \
-	src/basic/replace-var.h \
-	src/basic/clock-util.c \
-	src/basic/clock-util.h \
-	src/basic/calendarspec.c \
-	src/basic/calendarspec.h \
-	src/basic/fileio.c \
-	src/basic/fileio.h \
-	src/basic/MurmurHash2.c \
-	src/basic/MurmurHash2.h \
-	src/basic/mkdir.c \
-	src/basic/mkdir.h \
-	src/basic/cgroup-util.c \
-	src/basic/cgroup-util.h \
-	src/basic/errno-list.c \
-	src/basic/errno-list.h \
-	src/basic/af-list.c \
-	src/basic/af-list.h \
-	src/basic/arphrd-list.c \
-	src/basic/arphrd-list.h \
-	src/basic/terminal-util.c \
-	src/basic/terminal-util.h \
-	src/basic/login-util.h \
-	src/basic/login-util.c \
-	src/basic/cap-list.c \
-	src/basic/cap-list.h \
-	src/basic/audit-util.c \
-	src/basic/audit-util.h \
-	src/basic/xml.c \
-	src/basic/xml.h \
-	src/basic/barrier.c \
-	src/basic/barrier.h \
-	src/basic/async.c \
-	src/basic/async.h \
-	src/basic/memfd-util.c \
-	src/basic/memfd-util.h \
-	src/basic/process-util.c \
-	src/basic/process-util.h \
-	src/basic/random-util.c \
-	src/basic/random-util.h \
-	src/basic/verbs.c \
-	src/basic/verbs.h \
-	src/basic/sigbus.c \
-	src/basic/sigbus.h \
-	src/basic/build.h \
-	src/basic/socket-label.c \
-	src/basic/label.c \
-	src/basic/label.h \
-	src/basic/btrfs-util.c \
-	src/basic/btrfs-util.h \
-	src/basic/btrfs-ctree.h \
-	src/basic/selinux-util.c \
-	src/basic/selinux-util.h \
-	src/basic/mkdir-label.c \
-	src/basic/fileio-label.c \
-	src/basic/fileio-label.h \
-	src/basic/rm-rf.c \
-	src/basic/rm-rf.h \
-	src/basic/copy.c \
-	src/basic/copy.h \
-	src/basic/alloc-util.h \
-	src/basic/alloc-util.c \
-	src/basic/formats-util.h \
-	src/basic/nss-util.h
-
-nodist_libbasic_la_SOURCES = \
-	src/basic/errno-from-name.h \
-	src/basic/errno-to-name.h \
-	src/basic/af-from-name.h \
-	src/basic/af-to-name.h \
-	src/basic/arphrd-from-name.h \
-	src/basic/arphrd-to-name.h \
-	src/basic/cap-from-name.h \
-	src/basic/cap-to-name.h
-
-libbasic_la_CFLAGS = \
-	$(AM_CFLAGS) \
-	$(SELINUX_CFLAGS) \
-	$(CAP_CFLAGS) \
-	-pthread
-
-libbasic_la_LIBADD = \
-	$(SELINUX_LIBS) \
-	$(CAP_LIBS) \
-	-lrt \
-	-lm
-
-$(outdir)/errno-list.txt:
-	$(AM_V_GEN)$(CPP) $(ALL_CPPFLAGS) -dM -include errno.h - </dev/null | $(AWK) '/^#define[ \t]+E[^ _]+[ \t]+/ { print $$2; }' >$@
-
-$(outdir)/errno-to-name.h: $(outdir)/errno-list.txt
-	$(AM_V_GEN)$(AWK) 'BEGIN{ print "static const char* const errno_names[] = { "} !/EDEADLOCK/ && !/EWOULDBLOCK/ && !/ENOTSUP/ { printf "[%s] = \"%s\",\n", $$1, $$1 } END{print "};"}' <$< >$@
-
-
-$(outdir)/af-list.txt:
-	$(AM_V_GEN)$(CPP) $(ALL_CPPFLAGS) -dM -include sys/socket.h - </dev/null | grep -v AF_UNSPEC | grep -v AF_MAX | $(AWK) '/^#define[ \t]+AF_[^ \t]+[ \t]+PF_[^ \t]/ { print $$2; }' >$@
-
-$(outdir)/af-to-name.h: $(outdir)/af-list.txt
-	$(AM_V_GEN)$(AWK) 'BEGIN{ print "static const char* const af_names[] = { "} !/AF_FILE/ && !/AF_ROUTE/ && !/AF_LOCAL/ { printf "[%s] = \"%s\",\n", $$1, $$1 } END{print "};"}' <$< >$@
-
-
-$(outdir)/arphrd-list.txt:
-	$(AM_V_GEN)$(CPP) $(ALL_CPPFLAGS) -dM -include net/if_arp.h - </dev/null | $(AWK) '/^#define[ \t]+ARPHRD_[^ \t]+[ \t]+[^ \t]/ { print $$2; }' | sed -e 's/ARPHRD_//' >$@
-
-$(outdir)/arphrd-to-name.h: $(outdir)/arphrd-list.txt
-	$(AM_V_GEN)$(AWK) 'BEGIN{ print "static const char* const arphrd_names[] = { "} !/CISCO/ { printf "[ARPHRD_%s] = \"%s\",\n", $$1, $$1 } END{print "};"}' <$< >$@
-
-$(outdir)/arphrd-from-name.gperf: $(outdir)/arphrd-list.txt
-	$(AM_V_GEN)$(AWK) 'BEGIN{ print "struct arphrd_name { const char* name; int id; };"; print "%null-strings"; print "%%";} { printf "%s, ARPHRD_%s\n", $$1, $$1 }' <$< >$@
-
-
-$(outdir)/cap-list.txt: $(srcdir)/missing.h
-	$(AM_V_GEN)$(CPP) $(ALL_CPPFLAGS) -dM -include linux/capability.h -include $< - </dev/null | $(AWK) '/^#define[ \t]+CAP_[A-Z_]+[ \t]+/ { print $$2; }' | grep -v CAP_LAST_CAP >$@
-
-$(outdir)/cap-to-name.h: $(outdir)/cap-list.txt
-	$(AM_V_GEN)$(AWK) 'BEGIN{ print "static const char* const capability_names[] = { "} { printf "[%s] = \"%s\",\n", $$1, tolower($$1) } END{print "};"}' <$< >$@
-
-$(outdir)/cap-from-name.gperf: $(outdir)/cap-list.txt
-	$(AM_V_GEN)$(AWK) 'BEGIN{ print "struct capability_name { const char* name; int id; };"; print "%null-strings"; print "%%";} { printf "%s, %s\n", $$1, $$1 }' <$< >$@
-
-$(outdir)/cap-from-name.h: $(outdir)/cap-from-name.gperf
-	$(AM_V_GPERF)$(GPERF) -L ANSI-C -t --ignore-case -N lookup_capability -H hash_capability_name -p -C <$< >$@
-
-$(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
-$(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
-
+at.subdirs += src include
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/libbasic/.gitignore b/src/libbasic/include/basic/.gitignore
index e22411e484..e22411e484 100644
--- a/src/libbasic/.gitignore
+++ b/src/libbasic/include/basic/.gitignore
diff --git a/src/libbasic/include/basic/Makefile b/src/libbasic/include/basic/Makefile
new file mode 100644
index 0000000000..e4ea32cb9a
--- /dev/null
+++ b/src/libbasic/include/basic/Makefile
@@ -0,0 +1,63 @@
+#  -*- Mode: makefile; indent-tabs-mode: t -*-
+#
+#  This file is part of systemd.
+#
+#  Copyright 2010-2012 Lennart Poettering
+#  Copyright 2010-2012 Kay Sievers
+#  Copyright 2013 Zbigniew Jędrzejewski-Szmek
+#  Copyright 2013 David Strauss
+#  Copyright 2016 Luke Shumaker
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
+#
+#  systemd is distributed in the hope that it will be useful, but
+#  WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+#  Lesser General Public License for more details.
+#
+#  You should have received a copy of the GNU Lesser General Public License
+#  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+include $(dir $(lastword $(MAKEFILE_LIST)))/../../../../config.mk
+include $(topsrcdir)/build-aux/Makefile.head.mk
+
+at.subdirs += basic
+$(outdir)/errno-list.txt:
+	$(AM_V_GEN)$(CPP) $(ALL_CPPFLAGS) -dM -include errno.h - </dev/null | $(AWK) '/^#define[ \t]+E[^ _]+[ \t]+/ { print $$2; }' >$@
+
+$(outdir)/errno-to-name.h: $(outdir)/errno-list.txt
+	$(AM_V_GEN)$(AWK) 'BEGIN{ print "static const char* const errno_names[] = { "} !/EDEADLOCK/ && !/EWOULDBLOCK/ && !/ENOTSUP/ { printf "[%s] = \"%s\",\n", $$1, $$1 } END{print "};"}' <$< >$@
+
+
+$(outdir)/af-list.txt:
+	$(AM_V_GEN)$(CPP) $(ALL_CPPFLAGS) -dM -include sys/socket.h - </dev/null | grep -v AF_UNSPEC | grep -v AF_MAX | $(AWK) '/^#define[ \t]+AF_[^ \t]+[ \t]+PF_[^ \t]/ { print $$2; }' >$@
+
+$(outdir)/af-to-name.h: $(outdir)/af-list.txt
+	$(AM_V_GEN)$(AWK) 'BEGIN{ print "static const char* const af_names[] = { "} !/AF_FILE/ && !/AF_ROUTE/ && !/AF_LOCAL/ { printf "[%s] = \"%s\",\n", $$1, $$1 } END{print "};"}' <$< >$@
+
+
+$(outdir)/arphrd-list.txt:
+	$(AM_V_GEN)$(CPP) $(ALL_CPPFLAGS) -dM -include net/if_arp.h - </dev/null | $(AWK) '/^#define[ \t]+ARPHRD_[^ \t]+[ \t]+[^ \t]/ { print $$2; }' | sed -e 's/ARPHRD_//' >$@
+
+$(outdir)/arphrd-to-name.h: $(outdir)/arphrd-list.txt
+	$(AM_V_GEN)$(AWK) 'BEGIN{ print "static const char* const arphrd_names[] = { "} !/CISCO/ { printf "[ARPHRD_%s] = \"%s\",\n", $$1, $$1 } END{print "};"}' <$< >$@
+
+$(outdir)/arphrd-from-name.gperf: $(outdir)/arphrd-list.txt
+	$(AM_V_GEN)$(AWK) 'BEGIN{ print "struct arphrd_name { const char* name; int id; };"; print "%null-strings"; print "%%";} { printf "%s, ARPHRD_%s\n", $$1, $$1 }' <$< >$@
+
+
+$(outdir)/cap-list.txt: $(srcdir)/missing.h
+	$(AM_V_GEN)$(CPP) $(ALL_CPPFLAGS) -dM -include linux/capability.h -include $< - </dev/null | $(AWK) '/^#define[ \t]+CAP_[A-Z_]+[ \t]+/ { print $$2; }' | grep -v CAP_LAST_CAP >$@
+
+$(outdir)/cap-to-name.h: $(outdir)/cap-list.txt
+	$(AM_V_GEN)$(AWK) 'BEGIN{ print "static const char* const capability_names[] = { "} { printf "[%s] = \"%s\",\n", $$1, tolower($$1) } END{print "};"}' <$< >$@
+
+$(outdir)/cap-from-name.gperf: $(outdir)/cap-list.txt
+	$(AM_V_GEN)$(AWK) 'BEGIN{ print "struct capability_name { const char* name; int id; };"; print "%null-strings"; print "%%";} { printf "%s, %s\n", $$1, $$1 }' <$< >$@
+
+$(outdir)/cap-from-name.h: $(outdir)/cap-from-name.gperf
+	$(AM_V_GPERF)$(GPERF) -L ANSI-C -t --ignore-case -N lookup_capability -H hash_capability_name -p -C <$< >$@
+
+include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/libbasic/MurmurHash2.h b/src/libbasic/include/basic/MurmurHash2.h
index 93362dd485..93362dd485 100644
--- a/src/libbasic/MurmurHash2.h
+++ b/src/libbasic/include/basic/MurmurHash2.h
diff --git a/src/libbasic/af-list.h b/src/libbasic/include/basic/af-list.h
index 6a4cc03839..6a4cc03839 100644
--- a/src/libbasic/af-list.h
+++ b/src/libbasic/include/basic/af-list.h
diff --git a/src/libbasic/alloc-util.h b/src/libbasic/include/basic/alloc-util.h
index ceeee519b7..ceeee519b7 100644
--- a/src/libbasic/alloc-util.h
+++ b/src/libbasic/include/basic/alloc-util.h
diff --git a/src/libbasic/architecture.h b/src/libbasic/include/basic/architecture.h
index b3e4d85906..b3e4d85906 100644
--- a/src/libbasic/architecture.h
+++ b/src/libbasic/include/basic/architecture.h
diff --git a/src/libbasic/arphrd-list.h b/src/libbasic/include/basic/arphrd-list.h
index c0f8758dbe..c0f8758dbe 100644
--- a/src/libbasic/arphrd-list.h
+++ b/src/libbasic/include/basic/arphrd-list.h
diff --git a/src/libbasic/async.h b/src/libbasic/include/basic/async.h
index 9bd13ff6e0..9bd13ff6e0 100644
--- a/src/libbasic/async.h
+++ b/src/libbasic/include/basic/async.h
diff --git a/src/libbasic/audit-util.h b/src/libbasic/include/basic/audit-util.h
index e048503991..e048503991 100644
--- a/src/libbasic/audit-util.h
+++ b/src/libbasic/include/basic/audit-util.h
diff --git a/src/libbasic/barrier.h b/src/libbasic/include/basic/barrier.h
index 6347fddc4d..6347fddc4d 100644
--- a/src/libbasic/barrier.h
+++ b/src/libbasic/include/basic/barrier.h
diff --git a/src/libbasic/bitmap.h b/src/libbasic/include/basic/bitmap.h
index f5f8f2f018..f5f8f2f018 100644
--- a/src/libbasic/bitmap.h
+++ b/src/libbasic/include/basic/bitmap.h
diff --git a/src/libbasic/blkid-util.h b/src/libbasic/include/basic/blkid-util.h
index 7aa75eb091..7aa75eb091 100644
--- a/src/libbasic/blkid-util.h
+++ b/src/libbasic/include/basic/blkid-util.h
diff --git a/src/libbasic/btrfs-ctree.h b/src/libbasic/include/basic/btrfs-ctree.h
index 66bdf9736e..66bdf9736e 100644
--- a/src/libbasic/btrfs-ctree.h
+++ b/src/libbasic/include/basic/btrfs-ctree.h
diff --git a/src/libbasic/btrfs-util.h b/src/libbasic/include/basic/btrfs-util.h
index db431f5b74..db431f5b74 100644
--- a/src/libbasic/btrfs-util.h
+++ b/src/libbasic/include/basic/btrfs-util.h
diff --git a/src/libbasic/build.h b/src/libbasic/include/basic/build.h
index 633c2aaccb..633c2aaccb 100644
--- a/src/libbasic/build.h
+++ b/src/libbasic/include/basic/build.h
diff --git a/src/libbasic/bus-label.h b/src/libbasic/include/basic/bus-label.h
index 62fb2c450c..62fb2c450c 100644
--- a/src/libbasic/bus-label.h
+++ b/src/libbasic/include/basic/bus-label.h
diff --git a/src/libbasic/calendarspec.h b/src/libbasic/include/basic/calendarspec.h
index f6472c1244..f6472c1244 100644
--- a/src/libbasic/calendarspec.h
+++ b/src/libbasic/include/basic/calendarspec.h
diff --git a/src/libbasic/cap-list.h b/src/libbasic/include/basic/cap-list.h
index c1f6b94ad3..c1f6b94ad3 100644
--- a/src/libbasic/cap-list.h
+++ b/src/libbasic/include/basic/cap-list.h
diff --git a/src/libbasic/capability-util.h b/src/libbasic/include/basic/capability-util.h
index 35a896e229..35a896e229 100644
--- a/src/libbasic/capability-util.h
+++ b/src/libbasic/include/basic/capability-util.h
diff --git a/src/libbasic/cgroup-util.h b/src/libbasic/include/basic/cgroup-util.h
index 4bb5291296..4bb5291296 100644
--- a/src/libbasic/cgroup-util.h
+++ b/src/libbasic/include/basic/cgroup-util.h
diff --git a/src/libbasic/chattr-util.h b/src/libbasic/include/basic/chattr-util.h
index 960cf6d5b3..960cf6d5b3 100644
--- a/src/libbasic/chattr-util.h
+++ b/src/libbasic/include/basic/chattr-util.h
diff --git a/src/libbasic/clock-util.h b/src/libbasic/include/basic/clock-util.h
index 8830cd2f38..8830cd2f38 100644
--- a/src/libbasic/clock-util.h
+++ b/src/libbasic/include/basic/clock-util.h
diff --git a/src/libbasic/conf-files.h b/src/libbasic/include/basic/conf-files.h
index e00e0e81fb..e00e0e81fb 100644
--- a/src/libbasic/conf-files.h
+++ b/src/libbasic/include/basic/conf-files.h
diff --git a/src/libbasic/copy.h b/src/libbasic/include/basic/copy.h
index b5d08ebafe..b5d08ebafe 100644
--- a/src/libbasic/copy.h
+++ b/src/libbasic/include/basic/copy.h
diff --git a/src/libbasic/cpu-set-util.h b/src/libbasic/include/basic/cpu-set-util.h
index 6f49d9afb0..6f49d9afb0 100644
--- a/src/libbasic/cpu-set-util.h
+++ b/src/libbasic/include/basic/cpu-set-util.h
diff --git a/src/libbasic/def.h b/src/libbasic/include/basic/def.h
index 1a7a0f4928..1a7a0f4928 100644
--- a/src/libbasic/def.h
+++ b/src/libbasic/include/basic/def.h
diff --git a/src/libbasic/device-nodes.h b/src/libbasic/include/basic/device-nodes.h
index 94f385abcb..94f385abcb 100644
--- a/src/libbasic/device-nodes.h
+++ b/src/libbasic/include/basic/device-nodes.h
diff --git a/src/libbasic/dirent-util.h b/src/libbasic/include/basic/dirent-util.h
index b91d04908f..b91d04908f 100644
--- a/src/libbasic/dirent-util.h
+++ b/src/libbasic/include/basic/dirent-util.h
diff --git a/src/libbasic/env-util.h b/src/libbasic/include/basic/env-util.h
index b1fef704c2..b1fef704c2 100644
--- a/src/libbasic/env-util.h
+++ b/src/libbasic/include/basic/env-util.h
diff --git a/src/libbasic/errno-list.h b/src/libbasic/include/basic/errno-list.h
index 4eec0cc786..4eec0cc786 100644
--- a/src/libbasic/errno-list.h
+++ b/src/libbasic/include/basic/errno-list.h
diff --git a/src/libbasic/escape.h b/src/libbasic/include/basic/escape.h
index deaa4def28..deaa4def28 100644
--- a/src/libbasic/escape.h
+++ b/src/libbasic/include/basic/escape.h
diff --git a/src/libbasic/ether-addr-util.h b/src/libbasic/include/basic/ether-addr-util.h
index 74e125a95f..74e125a95f 100644
--- a/src/libbasic/ether-addr-util.h
+++ b/src/libbasic/include/basic/ether-addr-util.h
diff --git a/src/libbasic/exit-status.h b/src/libbasic/include/basic/exit-status.h
index 1208c8feed..1208c8feed 100644
--- a/src/libbasic/exit-status.h
+++ b/src/libbasic/include/basic/exit-status.h
diff --git a/src/libbasic/extract-word.h b/src/libbasic/include/basic/extract-word.h
index 21db5ef33f..21db5ef33f 100644
--- a/src/libbasic/extract-word.h
+++ b/src/libbasic/include/basic/extract-word.h
diff --git a/src/libbasic/fd-util.h b/src/libbasic/include/basic/fd-util.h
index b86e41698a..b86e41698a 100644
--- a/src/libbasic/fd-util.h
+++ b/src/libbasic/include/basic/fd-util.h
diff --git a/src/libbasic/fdset.h b/src/libbasic/include/basic/fdset.h
index 16efe5bdf2..16efe5bdf2 100644
--- a/src/libbasic/fdset.h
+++ b/src/libbasic/include/basic/fdset.h
diff --git a/src/libbasic/fileio-label.h b/src/libbasic/include/basic/fileio-label.h
index fe7543013d..fe7543013d 100644
--- a/src/libbasic/fileio-label.h
+++ b/src/libbasic/include/basic/fileio-label.h
diff --git a/src/libbasic/fileio.h b/src/libbasic/include/basic/fileio.h
index 58dbc80c24..58dbc80c24 100644
--- a/src/libbasic/fileio.h
+++ b/src/libbasic/include/basic/fileio.h
diff --git a/src/libbasic/formats-util.h b/src/libbasic/include/basic/formats-util.h
index 9b4e8e98fa..9b4e8e98fa 100644
--- a/src/libbasic/formats-util.h
+++ b/src/libbasic/include/basic/formats-util.h
diff --git a/src/libbasic/fs-util.h b/src/libbasic/include/basic/fs-util.h
index 517b599d6f..517b599d6f 100644
--- a/src/libbasic/fs-util.h
+++ b/src/libbasic/include/basic/fs-util.h
diff --git a/src/libbasic/glob-util.h b/src/libbasic/include/basic/glob-util.h
index 5d8fb47a26..5d8fb47a26 100644
--- a/src/libbasic/glob-util.h
+++ b/src/libbasic/include/basic/glob-util.h
diff --git a/src/libbasic/gunicode.h b/src/libbasic/include/basic/gunicode.h
index 5975bc8fc9..5975bc8fc9 100644
--- a/src/libbasic/gunicode.h
+++ b/src/libbasic/include/basic/gunicode.h
diff --git a/src/libbasic/hash-funcs.h b/src/libbasic/include/basic/hash-funcs.h
index 299189d143..299189d143 100644
--- a/src/libbasic/hash-funcs.h
+++ b/src/libbasic/include/basic/hash-funcs.h
diff --git a/src/libbasic/hashmap.h b/src/libbasic/include/basic/hashmap.h
index 6d1ae48b21..6d1ae48b21 100644
--- a/src/libbasic/hashmap.h
+++ b/src/libbasic/include/basic/hashmap.h
diff --git a/src/libbasic/hexdecoct.h b/src/libbasic/include/basic/hexdecoct.h
index 1ba2f69ebd..1ba2f69ebd 100644
--- a/src/libbasic/hexdecoct.h
+++ b/src/libbasic/include/basic/hexdecoct.h
diff --git a/src/libbasic/hostname-util.h b/src/libbasic/include/basic/hostname-util.h
index 7af4e6c7ec..7af4e6c7ec 100644
--- a/src/libbasic/hostname-util.h
+++ b/src/libbasic/include/basic/hostname-util.h
diff --git a/src/libbasic/in-addr-util.h b/src/libbasic/include/basic/in-addr-util.h
index 17798ce816..17798ce816 100644
--- a/src/libbasic/in-addr-util.h
+++ b/src/libbasic/include/basic/in-addr-util.h
diff --git a/src/libbasic/io-util.h b/src/libbasic/include/basic/io-util.h
index 4684ed3bfc..4684ed3bfc 100644
--- a/src/libbasic/io-util.h
+++ b/src/libbasic/include/basic/io-util.h
diff --git a/src/libbasic/ioprio.h b/src/libbasic/include/basic/ioprio.h
index d8bb6eb497..d8bb6eb497 100644
--- a/src/libbasic/ioprio.h
+++ b/src/libbasic/include/basic/ioprio.h
diff --git a/src/libbasic/label.h b/src/libbasic/include/basic/label.h
index 3e9251aa71..3e9251aa71 100644
--- a/src/libbasic/label.h
+++ b/src/libbasic/include/basic/label.h
diff --git a/src/libbasic/list.h b/src/libbasic/include/basic/list.h
index 5962aa4211..5962aa4211 100644
--- a/src/libbasic/list.h
+++ b/src/libbasic/include/basic/list.h
diff --git a/src/libbasic/locale-util.h b/src/libbasic/include/basic/locale-util.h
index 0630a034ab..0630a034ab 100644
--- a/src/libbasic/locale-util.h
+++ b/src/libbasic/include/basic/locale-util.h
diff --git a/src/libbasic/lockfile-util.h b/src/libbasic/include/basic/lockfile-util.h
index 22491ee8e1..22491ee8e1 100644
--- a/src/libbasic/lockfile-util.h
+++ b/src/libbasic/include/basic/lockfile-util.h
diff --git a/src/libbasic/log.h b/src/libbasic/include/basic/log.h
index d2a22b5829..d2a22b5829 100644
--- a/src/libbasic/log.h
+++ b/src/libbasic/include/basic/log.h
diff --git a/src/libbasic/login-util.h b/src/libbasic/include/basic/login-util.h
index b01ee25c88..b01ee25c88 100644
--- a/src/libbasic/login-util.h
+++ b/src/libbasic/include/basic/login-util.h
diff --git a/src/libbasic/macro.h b/src/libbasic/include/basic/macro.h
index e41aa4260f..e41aa4260f 100644
--- a/src/libbasic/macro.h
+++ b/src/libbasic/include/basic/macro.h
diff --git a/src/libbasic/memfd-util.h b/src/libbasic/include/basic/memfd-util.h
index 46d4989e4c..46d4989e4c 100644
--- a/src/libbasic/memfd-util.h
+++ b/src/libbasic/include/basic/memfd-util.h
diff --git a/src/libbasic/mempool.h b/src/libbasic/include/basic/mempool.h
index 0618b8dd22..0618b8dd22 100644
--- a/src/libbasic/mempool.h
+++ b/src/libbasic/include/basic/mempool.h
diff --git a/src/libbasic/missing.h b/src/libbasic/include/basic/missing.h
index 651e414395..651e414395 100644
--- a/src/libbasic/missing.h
+++ b/src/libbasic/include/basic/missing.h
diff --git a/src/libbasic/missing_syscall.h b/src/libbasic/include/basic/missing_syscall.h
index d502d3b9ca..d502d3b9ca 100644
--- a/src/libbasic/missing_syscall.h
+++ b/src/libbasic/include/basic/missing_syscall.h
diff --git a/src/libbasic/mkdir.h b/src/libbasic/include/basic/mkdir.h
index d564a3547f..d564a3547f 100644
--- a/src/libbasic/mkdir.h
+++ b/src/libbasic/include/basic/mkdir.h
diff --git a/src/libbasic/mount-util.h b/src/libbasic/include/basic/mount-util.h
index bdb525d6b0..bdb525d6b0 100644
--- a/src/libbasic/mount-util.h
+++ b/src/libbasic/include/basic/mount-util.h
diff --git a/src/libbasic/nss-util.h b/src/libbasic/include/basic/nss-util.h
index bf7c4854fc..bf7c4854fc 100644
--- a/src/libbasic/nss-util.h
+++ b/src/libbasic/include/basic/nss-util.h
diff --git a/src/libbasic/ordered-set.h b/src/libbasic/include/basic/ordered-set.h
index e1dfc86380..e1dfc86380 100644
--- a/src/libbasic/ordered-set.h
+++ b/src/libbasic/include/basic/ordered-set.h
diff --git a/src/libbasic/parse-util.h b/src/libbasic/include/basic/parse-util.h
index 7dc579a159..7dc579a159 100644
--- a/src/libbasic/parse-util.h
+++ b/src/libbasic/include/basic/parse-util.h
diff --git a/src/libbasic/path-util.h b/src/libbasic/include/basic/path-util.h
index a27c13fcc3..a27c13fcc3 100644
--- a/src/libbasic/path-util.h
+++ b/src/libbasic/include/basic/path-util.h
diff --git a/src/libbasic/prioq.h b/src/libbasic/include/basic/prioq.h
index 113c73d040..113c73d040 100644
--- a/src/libbasic/prioq.h
+++ b/src/libbasic/include/basic/prioq.h
diff --git a/src/libbasic/proc-cmdline.h b/src/libbasic/include/basic/proc-cmdline.h
index 452642a2f5..452642a2f5 100644
--- a/src/libbasic/proc-cmdline.h
+++ b/src/libbasic/include/basic/proc-cmdline.h
diff --git a/src/libbasic/process-util.h b/src/libbasic/include/basic/process-util.h
index 9f75088796..9f75088796 100644
--- a/src/libbasic/process-util.h
+++ b/src/libbasic/include/basic/process-util.h
diff --git a/src/libbasic/random-util.h b/src/libbasic/include/basic/random-util.h
index 3cee4c5014..3cee4c5014 100644
--- a/src/libbasic/random-util.h
+++ b/src/libbasic/include/basic/random-util.h
diff --git a/src/libbasic/ratelimit.h b/src/libbasic/include/basic/ratelimit.h
index 9c8dddf5ad..9c8dddf5ad 100644
--- a/src/libbasic/ratelimit.h
+++ b/src/libbasic/include/basic/ratelimit.h
diff --git a/src/libbasic/refcnt.h b/src/libbasic/include/basic/refcnt.h
index 1d77a6445a..1d77a6445a 100644
--- a/src/libbasic/refcnt.h
+++ b/src/libbasic/include/basic/refcnt.h
diff --git a/src/libbasic/replace-var.h b/src/libbasic/include/basic/replace-var.h
index 78412910b2..78412910b2 100644
--- a/src/libbasic/replace-var.h
+++ b/src/libbasic/include/basic/replace-var.h
diff --git a/src/libbasic/rlimit-util.h b/src/libbasic/include/basic/rlimit-util.h
index d4594eccd6..d4594eccd6 100644
--- a/src/libbasic/rlimit-util.h
+++ b/src/libbasic/include/basic/rlimit-util.h
diff --git a/src/libbasic/rm-rf.h b/src/libbasic/include/basic/rm-rf.h
index f693a5bb7c..f693a5bb7c 100644
--- a/src/libbasic/rm-rf.h
+++ b/src/libbasic/include/basic/rm-rf.h
diff --git a/src/libbasic/securebits.h b/src/libbasic/include/basic/securebits.h
index 98fbe0d433..98fbe0d433 100644
--- a/src/libbasic/securebits.h
+++ b/src/libbasic/include/basic/securebits.h
diff --git a/src/libbasic/selinux-util.h b/src/libbasic/include/basic/selinux-util.h
index ce6bc8e44c..ce6bc8e44c 100644
--- a/src/libbasic/selinux-util.h
+++ b/src/libbasic/include/basic/selinux-util.h
diff --git a/src/libbasic/set.h b/src/libbasic/include/basic/set.h
index e0d9dd001c..e0d9dd001c 100644
--- a/src/libbasic/set.h
+++ b/src/libbasic/include/basic/set.h
diff --git a/src/libbasic/sigbus.h b/src/libbasic/include/basic/sigbus.h
index 980243d9ce..980243d9ce 100644
--- a/src/libbasic/sigbus.h
+++ b/src/libbasic/include/basic/sigbus.h
diff --git a/src/libbasic/signal-util.h b/src/libbasic/include/basic/signal-util.h
index dfd6eb564d..dfd6eb564d 100644
--- a/src/libbasic/signal-util.h
+++ b/src/libbasic/include/basic/signal-util.h
diff --git a/src/libbasic/siphash24.h b/src/libbasic/include/basic/siphash24.h
index 54e2420cc6..54e2420cc6 100644
--- a/src/libbasic/siphash24.h
+++ b/src/libbasic/include/basic/siphash24.h
diff --git a/src/libbasic/smack-util.h b/src/libbasic/include/basic/smack-util.h
index f90ba0a027..f90ba0a027 100644
--- a/src/libbasic/smack-util.h
+++ b/src/libbasic/include/basic/smack-util.h
diff --git a/src/libbasic/socket-util.h b/src/libbasic/include/basic/socket-util.h
index e9230e4a9f..e9230e4a9f 100644
--- a/src/libbasic/socket-util.h
+++ b/src/libbasic/include/basic/socket-util.h
diff --git a/src/libbasic/sparse-endian.h b/src/libbasic/include/basic/sparse-endian.h
index c913fda8c5..c913fda8c5 100644
--- a/src/libbasic/sparse-endian.h
+++ b/src/libbasic/include/basic/sparse-endian.h
diff --git a/src/libbasic/special.h b/src/libbasic/include/basic/special.h
index 084d3dfa23..084d3dfa23 100644
--- a/src/libbasic/special.h
+++ b/src/libbasic/include/basic/special.h
diff --git a/src/libbasic/stat-util.h b/src/libbasic/include/basic/stat-util.h
index 56d28f791e..56d28f791e 100644
--- a/src/libbasic/stat-util.h
+++ b/src/libbasic/include/basic/stat-util.h
diff --git a/src/libbasic/stdio-util.h b/src/libbasic/include/basic/stdio-util.h
index bd1144b4c9..bd1144b4c9 100644
--- a/src/libbasic/stdio-util.h
+++ b/src/libbasic/include/basic/stdio-util.h
diff --git a/src/libbasic/strbuf.h b/src/libbasic/include/basic/strbuf.h
index a1632da0e8..a1632da0e8 100644
--- a/src/libbasic/strbuf.h
+++ b/src/libbasic/include/basic/strbuf.h
diff --git a/src/libbasic/string-table.h b/src/libbasic/include/basic/string-table.h
index d88625fca7..d88625fca7 100644
--- a/src/libbasic/string-table.h
+++ b/src/libbasic/include/basic/string-table.h
diff --git a/src/libbasic/string-util.h b/src/libbasic/include/basic/string-util.h
index 139cc8c91b..139cc8c91b 100644
--- a/src/libbasic/string-util.h
+++ b/src/libbasic/include/basic/string-util.h
diff --git a/src/libbasic/strv.h b/src/libbasic/include/basic/strv.h
index f61bbb5386..f61bbb5386 100644
--- a/src/libbasic/strv.h
+++ b/src/libbasic/include/basic/strv.h
diff --git a/src/libbasic/strxcpyx.h b/src/libbasic/include/basic/strxcpyx.h
index 80ff58726b..80ff58726b 100644
--- a/src/libbasic/strxcpyx.h
+++ b/src/libbasic/include/basic/strxcpyx.h
diff --git a/src/libbasic/syslog-util.h b/src/libbasic/include/basic/syslog-util.h
index 5cb606a1bf..5cb606a1bf 100644
--- a/src/libbasic/syslog-util.h
+++ b/src/libbasic/include/basic/syslog-util.h
diff --git a/src/libbasic/terminal-util.h b/src/libbasic/include/basic/terminal-util.h
index a7c96a77cb..a7c96a77cb 100644
--- a/src/libbasic/terminal-util.h
+++ b/src/libbasic/include/basic/terminal-util.h
diff --git a/src/libbasic/time-util.h b/src/libbasic/include/basic/time-util.h
index a5e3f567ec..a5e3f567ec 100644
--- a/src/libbasic/time-util.h
+++ b/src/libbasic/include/basic/time-util.h
diff --git a/src/libbasic/umask-util.h b/src/libbasic/include/basic/umask-util.h
index 359d87d27c..359d87d27c 100644
--- a/src/libbasic/umask-util.h
+++ b/src/libbasic/include/basic/umask-util.h
diff --git a/src/libbasic/unaligned.h b/src/libbasic/include/basic/unaligned.h
index 79be645bed..79be645bed 100644
--- a/src/libbasic/unaligned.h
+++ b/src/libbasic/include/basic/unaligned.h
diff --git a/src/libbasic/unit-name.h b/src/libbasic/include/basic/unit-name.h
index f209a84634..f209a84634 100644
--- a/src/libbasic/unit-name.h
+++ b/src/libbasic/include/basic/unit-name.h
diff --git a/src/libbasic/user-util.h b/src/libbasic/include/basic/user-util.h
index 8026eca3f4..8026eca3f4 100644
--- a/src/libbasic/user-util.h
+++ b/src/libbasic/include/basic/user-util.h
diff --git a/src/libbasic/utf8.h b/src/libbasic/include/basic/utf8.h
index f9b9c9468b..f9b9c9468b 100644
--- a/src/libbasic/utf8.h
+++ b/src/libbasic/include/basic/utf8.h
diff --git a/src/libbasic/util.h b/src/libbasic/include/basic/util.h
index 1c032c15c9..1c032c15c9 100644
--- a/src/libbasic/util.h
+++ b/src/libbasic/include/basic/util.h
diff --git a/src/libbasic/verbs.h b/src/libbasic/include/basic/verbs.h
index 7b5e18510f..7b5e18510f 100644
--- a/src/libbasic/verbs.h
+++ b/src/libbasic/include/basic/verbs.h
diff --git a/src/libbasic/virt.h b/src/libbasic/include/basic/virt.h
index a538f07f6b..a538f07f6b 100644
--- a/src/libbasic/virt.h
+++ b/src/libbasic/include/basic/virt.h
diff --git a/src/libbasic/web-util.h b/src/libbasic/include/basic/web-util.h
index e6bb6b53f5..e6bb6b53f5 100644
--- a/src/libbasic/web-util.h
+++ b/src/libbasic/include/basic/web-util.h
diff --git a/src/libbasic/xattr-util.h b/src/libbasic/include/basic/xattr-util.h
index 6fa097bf7e..6fa097bf7e 100644
--- a/src/libbasic/xattr-util.h
+++ b/src/libbasic/include/basic/xattr-util.h
diff --git a/src/libbasic/xml.h b/src/libbasic/include/basic/xml.h
index 41cb69f0dc..41cb69f0dc 100644
--- a/src/libbasic/xml.h
+++ b/src/libbasic/include/basic/xml.h
diff --git a/src/libbasic/src/Makefile b/src/libbasic/src/Makefile
new file mode 100644
index 0000000000..f3c3cc8508
--- /dev/null
+++ b/src/libbasic/src/Makefile
@@ -0,0 +1,249 @@
+#  -*- Mode: makefile; indent-tabs-mode: t -*-
+#
+#  This file is part of systemd.
+#
+#  Copyright 2010-2012 Lennart Poettering
+#  Copyright 2010-2012 Kay Sievers
+#  Copyright 2013 Zbigniew Jędrzejewski-Szmek
+#  Copyright 2013 David Strauss
+#  Copyright 2016 Luke Shumaker
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
+#
+#  systemd is distributed in the hope that it will be useful, but
+#  WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+#  Lesser General Public License for more details.
+#
+#  You should have received a copy of the GNU Lesser General Public License
+#  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk
+include $(topsrcdir)/build-aux/Makefile.head.mk
+
+noinst_LTLIBRARIES += \
+	libbasic.la
+
+libbasic_la_SOURCES = \
+	src/basic/missing.h \
+	src/basic/missing_syscall.h \
+	src/basic/capability-util.c \
+	src/basic/capability-util.h \
+	src/basic/conf-files.c \
+	src/basic/conf-files.h \
+	src/basic/stdio-util.h \
+	src/basic/hostname-util.h \
+	src/basic/hostname-util.c \
+	src/basic/unit-name.c \
+	src/basic/unit-name.h \
+	src/basic/ioprio.h \
+	src/basic/securebits.h \
+	src/basic/special.h \
+	src/basic/list.h \
+	src/basic/unaligned.h \
+	src/basic/macro.h \
+	src/basic/def.h \
+	src/basic/sparse-endian.h \
+	src/basic/refcnt.h \
+	src/basic/util.c \
+	src/basic/util.h \
+	src/basic/io-util.c \
+	src/basic/io-util.h \
+	src/basic/string-util.c \
+	src/basic/string-util.h \
+	src/basic/fd-util.c \
+	src/basic/fd-util.h \
+	src/basic/parse-util.c \
+	src/basic/parse-util.h \
+	src/basic/user-util.c \
+	src/basic/user-util.h \
+	src/basic/rlimit-util.c \
+	src/basic/rlimit-util.h \
+	src/basic/dirent-util.c \
+	src/basic/dirent-util.h \
+	src/basic/xattr-util.c \
+	src/basic/xattr-util.h \
+	src/basic/chattr-util.c \
+	src/basic/chattr-util.h \
+	src/basic/proc-cmdline.c \
+	src/basic/proc-cmdline.h \
+	src/basic/fs-util.c \
+	src/basic/fs-util.h \
+	src/basic/syslog-util.c \
+	src/basic/syslog-util.h \
+	src/basic/stat-util.c \
+	src/basic/stat-util.h \
+	src/basic/mount-util.c \
+	src/basic/mount-util.h \
+	src/basic/hexdecoct.c \
+	src/basic/hexdecoct.h \
+	src/basic/glob-util.h \
+	src/basic/glob-util.c \
+	src/basic/extract-word.c \
+	src/basic/extract-word.h \
+	src/basic/escape.c \
+	src/basic/escape.h \
+	src/basic/cpu-set-util.c \
+	src/basic/cpu-set-util.h \
+	src/basic/lockfile-util.c \
+	src/basic/lockfile-util.h \
+	src/basic/path-util.c \
+	src/basic/path-util.h \
+	src/basic/time-util.c \
+	src/basic/time-util.h \
+	src/basic/locale-util.c \
+	src/basic/locale-util.h \
+	src/basic/umask-util.h \
+	src/basic/signal-util.c \
+	src/basic/signal-util.h \
+	src/basic/string-table.c \
+	src/basic/string-table.h \
+	src/basic/mempool.c \
+	src/basic/mempool.h \
+	src/basic/hashmap.c \
+	src/basic/hashmap.h \
+	src/basic/hash-funcs.c \
+	src/basic/hash-funcs.h \
+	src/basic/siphash24.c \
+	src/basic/siphash24.h \
+	src/basic/set.h \
+	src/basic/ordered-set.h \
+	src/basic/ordered-set.c \
+	src/basic/bitmap.c \
+	src/basic/bitmap.h \
+	src/basic/fdset.c \
+	src/basic/fdset.h \
+	src/basic/prioq.c \
+	src/basic/prioq.h \
+	src/basic/web-util.c \
+	src/basic/web-util.h \
+	src/basic/strv.c \
+	src/basic/strv.h \
+	src/basic/env-util.c \
+	src/basic/env-util.h \
+	src/basic/strbuf.c \
+	src/basic/strbuf.h \
+	src/basic/strxcpyx.c \
+	src/basic/strxcpyx.h \
+	src/basic/log.c \
+	src/basic/log.h \
+	src/basic/bus-label.c \
+	src/basic/bus-label.h \
+	src/basic/ratelimit.h \
+	src/basic/ratelimit.c \
+	src/basic/exit-status.c \
+	src/basic/exit-status.h \
+	src/basic/virt.c \
+	src/basic/virt.h \
+	src/basic/architecture.c \
+	src/basic/architecture.h \
+	src/basic/smack-util.c \
+	src/basic/smack-util.h \
+	src/basic/device-nodes.c \
+	src/basic/device-nodes.h \
+	src/basic/utf8.c \
+	src/basic/utf8.h \
+	src/basic/gunicode.c \
+	src/basic/gunicode.h \
+	src/basic/socket-util.c \
+	src/basic/socket-util.h \
+	src/basic/in-addr-util.c \
+	src/basic/in-addr-util.h \
+	src/basic/ether-addr-util.h \
+	src/basic/ether-addr-util.c \
+	src/basic/replace-var.c \
+	src/basic/replace-var.h \
+	src/basic/clock-util.c \
+	src/basic/clock-util.h \
+	src/basic/calendarspec.c \
+	src/basic/calendarspec.h \
+	src/basic/fileio.c \
+	src/basic/fileio.h \
+	src/basic/MurmurHash2.c \
+	src/basic/MurmurHash2.h \
+	src/basic/mkdir.c \
+	src/basic/mkdir.h \
+	src/basic/cgroup-util.c \
+	src/basic/cgroup-util.h \
+	src/basic/errno-list.c \
+	src/basic/errno-list.h \
+	src/basic/af-list.c \
+	src/basic/af-list.h \
+	src/basic/arphrd-list.c \
+	src/basic/arphrd-list.h \
+	src/basic/terminal-util.c \
+	src/basic/terminal-util.h \
+	src/basic/login-util.h \
+	src/basic/login-util.c \
+	src/basic/cap-list.c \
+	src/basic/cap-list.h \
+	src/basic/audit-util.c \
+	src/basic/audit-util.h \
+	src/basic/xml.c \
+	src/basic/xml.h \
+	src/basic/barrier.c \
+	src/basic/barrier.h \
+	src/basic/async.c \
+	src/basic/async.h \
+	src/basic/memfd-util.c \
+	src/basic/memfd-util.h \
+	src/basic/process-util.c \
+	src/basic/process-util.h \
+	src/basic/random-util.c \
+	src/basic/random-util.h \
+	src/basic/verbs.c \
+	src/basic/verbs.h \
+	src/basic/sigbus.c \
+	src/basic/sigbus.h \
+	src/basic/build.h \
+	src/basic/socket-label.c \
+	src/basic/label.c \
+	src/basic/label.h \
+	src/basic/btrfs-util.c \
+	src/basic/btrfs-util.h \
+	src/basic/btrfs-ctree.h \
+	src/basic/selinux-util.c \
+	src/basic/selinux-util.h \
+	src/basic/mkdir-label.c \
+	src/basic/fileio-label.c \
+	src/basic/fileio-label.h \
+	src/basic/rm-rf.c \
+	src/basic/rm-rf.h \
+	src/basic/copy.c \
+	src/basic/copy.h \
+	src/basic/alloc-util.h \
+	src/basic/alloc-util.c \
+	src/basic/formats-util.h \
+	src/basic/nss-util.h
+
+nodist_libbasic_la_SOURCES = \
+	src/basic/errno-from-name.h \
+	src/basic/errno-to-name.h \
+	src/basic/af-from-name.h \
+	src/basic/af-to-name.h \
+	src/basic/arphrd-from-name.h \
+	src/basic/arphrd-to-name.h \
+	src/basic/cap-from-name.h \
+	src/basic/cap-to-name.h
+
+libbasic_la_CFLAGS = \
+	$(AM_CFLAGS) \
+	$(SELINUX_CFLAGS) \
+	$(CAP_CFLAGS) \
+	-pthread
+
+libbasic_la_LIBADD = \
+	$(SELINUX_LIBS) \
+	$(CAP_LIBS) \
+	-lrt \
+	-lm
+
+_inc = $(call at.path,$(addprefix $(outdir)/../include/basic/,$1))
+$(outdir)/af-list.lo: $(call _inc,af-from-name.h af-to-name.h)
+$(outdir)/arphrd-list.lo: $(call _inc,arphrd-from-name.h arphrd-to-name.h)
+$(outdir)/cap-list.lo: $(call _inc,cap-from-name.h cap-to-name.h)
+$(outdir)/errno-list.lo: $(call _inc,errno-from-name.h errno-to-name.h)
+
+include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/libbasic/MurmurHash2.c b/src/libbasic/src/MurmurHash2.c
index 9020793930..9020793930 100644
--- a/src/libbasic/MurmurHash2.c
+++ b/src/libbasic/src/MurmurHash2.c
diff --git a/src/libbasic/af-list.c b/src/libbasic/src/af-list.c
index 3fac9c508b..3fac9c508b 100644
--- a/src/libbasic/af-list.c
+++ b/src/libbasic/src/af-list.c
diff --git a/src/libbasic/alloc-util.c b/src/libbasic/src/alloc-util.c
index b540dcddf5..b540dcddf5 100644
--- a/src/libbasic/alloc-util.c
+++ b/src/libbasic/src/alloc-util.c
diff --git a/src/libbasic/architecture.c b/src/libbasic/src/architecture.c
index b1c8e91f50..b1c8e91f50 100644
--- a/src/libbasic/architecture.c
+++ b/src/libbasic/src/architecture.c
diff --git a/src/libbasic/arphrd-list.c b/src/libbasic/src/arphrd-list.c
index 6792d1ee3f..6792d1ee3f 100644
--- a/src/libbasic/arphrd-list.c
+++ b/src/libbasic/src/arphrd-list.c
diff --git a/src/libbasic/async.c b/src/libbasic/src/async.c
index a1f163f27b..a1f163f27b 100644
--- a/src/libbasic/async.c
+++ b/src/libbasic/src/async.c
diff --git a/src/libbasic/audit-util.c b/src/libbasic/src/audit-util.c
index 5741fecdd6..5741fecdd6 100644
--- a/src/libbasic/audit-util.c
+++ b/src/libbasic/src/audit-util.c
diff --git a/src/libbasic/barrier.c b/src/libbasic/src/barrier.c
index 2da633b311..2da633b311 100644
--- a/src/libbasic/barrier.c
+++ b/src/libbasic/src/barrier.c
diff --git a/src/libbasic/bitmap.c b/src/libbasic/src/bitmap.c
index ad1fda0198..ad1fda0198 100644
--- a/src/libbasic/bitmap.c
+++ b/src/libbasic/src/bitmap.c
diff --git a/src/libbasic/btrfs-util.c b/src/libbasic/src/btrfs-util.c
index 359d85f2e8..359d85f2e8 100644
--- a/src/libbasic/btrfs-util.c
+++ b/src/libbasic/src/btrfs-util.c
diff --git a/src/libbasic/bus-label.c b/src/libbasic/src/bus-label.c
index d4531c7947..d4531c7947 100644
--- a/src/libbasic/bus-label.c
+++ b/src/libbasic/src/bus-label.c
diff --git a/src/libbasic/calendarspec.c b/src/libbasic/src/calendarspec.c
index 6e0bab9b94..6e0bab9b94 100644
--- a/src/libbasic/calendarspec.c
+++ b/src/libbasic/src/calendarspec.c
diff --git a/src/libbasic/cap-list.c b/src/libbasic/src/cap-list.c
index 3e773a06f5..3e773a06f5 100644
--- a/src/libbasic/cap-list.c
+++ b/src/libbasic/src/cap-list.c
diff --git a/src/libbasic/capability-util.c b/src/libbasic/src/capability-util.c
index d4c5bd6937..d4c5bd6937 100644
--- a/src/libbasic/capability-util.c
+++ b/src/libbasic/src/capability-util.c
diff --git a/src/libbasic/cgroup-util.c b/src/libbasic/src/cgroup-util.c
index 7cdc97ee3c..7cdc97ee3c 100644
--- a/src/libbasic/cgroup-util.c
+++ b/src/libbasic/src/cgroup-util.c
diff --git a/src/libbasic/chattr-util.c b/src/libbasic/src/chattr-util.c
index 2896a729af..2896a729af 100644
--- a/src/libbasic/chattr-util.c
+++ b/src/libbasic/src/chattr-util.c
diff --git a/src/libbasic/clock-util.c b/src/libbasic/src/clock-util.c
index 7fe8d35ea5..7fe8d35ea5 100644
--- a/src/libbasic/clock-util.c
+++ b/src/libbasic/src/clock-util.c
diff --git a/src/libbasic/conf-files.c b/src/libbasic/src/conf-files.c
index c781610e14..c781610e14 100644
--- a/src/libbasic/conf-files.c
+++ b/src/libbasic/src/conf-files.c
diff --git a/src/libbasic/copy.c b/src/libbasic/src/copy.c
index c3586728d0..c3586728d0 100644
--- a/src/libbasic/copy.c
+++ b/src/libbasic/src/copy.c
diff --git a/src/libbasic/cpu-set-util.c b/src/libbasic/src/cpu-set-util.c
index 95ed6928ff..95ed6928ff 100644
--- a/src/libbasic/cpu-set-util.c
+++ b/src/libbasic/src/cpu-set-util.c
diff --git a/src/libbasic/device-nodes.c b/src/libbasic/src/device-nodes.c
index 38c0628a90..38c0628a90 100644
--- a/src/libbasic/device-nodes.c
+++ b/src/libbasic/src/device-nodes.c
diff --git a/src/libbasic/dirent-util.c b/src/libbasic/src/dirent-util.c
index 59067121b7..59067121b7 100644
--- a/src/libbasic/dirent-util.c
+++ b/src/libbasic/src/dirent-util.c
diff --git a/src/libbasic/env-util.c b/src/libbasic/src/env-util.c
index 7f5fddb700..7f5fddb700 100644
--- a/src/libbasic/env-util.c
+++ b/src/libbasic/src/env-util.c
diff --git a/src/libbasic/errno-list.c b/src/libbasic/src/errno-list.c
index 31b66bad5e..31b66bad5e 100644
--- a/src/libbasic/errno-list.c
+++ b/src/libbasic/src/errno-list.c
diff --git a/src/libbasic/escape.c b/src/libbasic/src/escape.c
index 01daf11ce7..01daf11ce7 100644
--- a/src/libbasic/escape.c
+++ b/src/libbasic/src/escape.c
diff --git a/src/libbasic/ether-addr-util.c b/src/libbasic/src/ether-addr-util.c
index 5697e8d132..5697e8d132 100644
--- a/src/libbasic/ether-addr-util.c
+++ b/src/libbasic/src/ether-addr-util.c
diff --git a/src/libbasic/exit-status.c b/src/libbasic/src/exit-status.c
index 92fa5ace61..92fa5ace61 100644
--- a/src/libbasic/exit-status.c
+++ b/src/libbasic/src/exit-status.c
diff --git a/src/libbasic/extract-word.c b/src/libbasic/src/extract-word.c
index d6c1228463..d6c1228463 100644
--- a/src/libbasic/extract-word.c
+++ b/src/libbasic/src/extract-word.c
diff --git a/src/libbasic/fd-util.c b/src/libbasic/src/fd-util.c
index 8b466cff15..8b466cff15 100644
--- a/src/libbasic/fd-util.c
+++ b/src/libbasic/src/fd-util.c
diff --git a/src/libbasic/fdset.c b/src/libbasic/src/fdset.c
index b52bf1ad05..b52bf1ad05 100644
--- a/src/libbasic/fdset.c
+++ b/src/libbasic/src/fdset.c
diff --git a/src/libbasic/fileio-label.c b/src/libbasic/src/fileio-label.c
index 66dbc0fe1e..66dbc0fe1e 100644
--- a/src/libbasic/fileio-label.c
+++ b/src/libbasic/src/fileio-label.c
diff --git a/src/libbasic/fileio.c b/src/libbasic/src/fileio.c
index 29f5374222..29f5374222 100644
--- a/src/libbasic/fileio.c
+++ b/src/libbasic/src/fileio.c
diff --git a/src/libbasic/fs-util.c b/src/libbasic/src/fs-util.c
index e24e7036f7..e24e7036f7 100644
--- a/src/libbasic/fs-util.c
+++ b/src/libbasic/src/fs-util.c
diff --git a/src/libbasic/glob-util.c b/src/libbasic/src/glob-util.c
index 007198c269..007198c269 100644
--- a/src/libbasic/glob-util.c
+++ b/src/libbasic/src/glob-util.c
diff --git a/src/libbasic/gunicode.c b/src/libbasic/src/gunicode.c
index 542110503f..542110503f 100644
--- a/src/libbasic/gunicode.c
+++ b/src/libbasic/src/gunicode.c
diff --git a/src/libbasic/hash-funcs.c b/src/libbasic/src/hash-funcs.c
index c3a4a011b5..c3a4a011b5 100644
--- a/src/libbasic/hash-funcs.c
+++ b/src/libbasic/src/hash-funcs.c
diff --git a/src/libbasic/hashmap.c b/src/libbasic/src/hashmap.c
index 49a0479592..49a0479592 100644
--- a/src/libbasic/hashmap.c
+++ b/src/libbasic/src/hashmap.c
diff --git a/src/libbasic/hexdecoct.c b/src/libbasic/src/hexdecoct.c
index c5bda6c4d6..c5bda6c4d6 100644
--- a/src/libbasic/hexdecoct.c
+++ b/src/libbasic/src/hexdecoct.c
diff --git a/src/libbasic/hostname-util.c b/src/libbasic/src/hostname-util.c
index 13c3bb6446..13c3bb6446 100644
--- a/src/libbasic/hostname-util.c
+++ b/src/libbasic/src/hostname-util.c
diff --git a/src/libbasic/in-addr-util.c b/src/libbasic/src/in-addr-util.c
index 245107ebb8..245107ebb8 100644
--- a/src/libbasic/in-addr-util.c
+++ b/src/libbasic/src/in-addr-util.c
diff --git a/src/libbasic/io-util.c b/src/libbasic/src/io-util.c
index cc6dfa8c1b..cc6dfa8c1b 100644
--- a/src/libbasic/io-util.c
+++ b/src/libbasic/src/io-util.c
diff --git a/src/libbasic/label.c b/src/libbasic/src/label.c
index f5ab855d32..f5ab855d32 100644
--- a/src/libbasic/label.c
+++ b/src/libbasic/src/label.c
diff --git a/src/libbasic/locale-util.c b/src/libbasic/src/locale-util.c
index ada0a28cd8..ada0a28cd8 100644
--- a/src/libbasic/locale-util.c
+++ b/src/libbasic/src/locale-util.c
diff --git a/src/libbasic/lockfile-util.c b/src/libbasic/src/lockfile-util.c
index 3ee4191e4d..3ee4191e4d 100644
--- a/src/libbasic/lockfile-util.c
+++ b/src/libbasic/src/lockfile-util.c
diff --git a/src/libbasic/log.c b/src/libbasic/src/log.c
index 05c4896f55..05c4896f55 100644
--- a/src/libbasic/log.c
+++ b/src/libbasic/src/log.c
diff --git a/src/libbasic/login-util.c b/src/libbasic/src/login-util.c
index 339e94f12d..339e94f12d 100644
--- a/src/libbasic/login-util.c
+++ b/src/libbasic/src/login-util.c
diff --git a/src/libbasic/memfd-util.c b/src/libbasic/src/memfd-util.c
index 8c8cc78ebf..8c8cc78ebf 100644
--- a/src/libbasic/memfd-util.c
+++ b/src/libbasic/src/memfd-util.c
diff --git a/src/libbasic/mempool.c b/src/libbasic/src/mempool.c
index f95e2beb0f..f95e2beb0f 100644
--- a/src/libbasic/mempool.c
+++ b/src/libbasic/src/mempool.c
diff --git a/src/libbasic/mkdir-label.c b/src/libbasic/src/mkdir-label.c
index aa6878cdf0..aa6878cdf0 100644
--- a/src/libbasic/mkdir-label.c
+++ b/src/libbasic/src/mkdir-label.c
diff --git a/src/libbasic/mkdir.c b/src/libbasic/src/mkdir.c
index 6b1a98402c..6b1a98402c 100644
--- a/src/libbasic/mkdir.c
+++ b/src/libbasic/src/mkdir.c
diff --git a/src/libbasic/mount-util.c b/src/libbasic/src/mount-util.c
index ba698959b7..ba698959b7 100644
--- a/src/libbasic/mount-util.c
+++ b/src/libbasic/src/mount-util.c
diff --git a/src/libbasic/ordered-set.c b/src/libbasic/src/ordered-set.c
index 2e0bdf6488..2e0bdf6488 100644
--- a/src/libbasic/ordered-set.c
+++ b/src/libbasic/src/ordered-set.c
diff --git a/src/libbasic/parse-util.c b/src/libbasic/src/parse-util.c
index 6c11b605a9..6c11b605a9 100644
--- a/src/libbasic/parse-util.c
+++ b/src/libbasic/src/parse-util.c
diff --git a/src/libbasic/path-util.c b/src/libbasic/src/path-util.c
index b2fa81a294..b2fa81a294 100644
--- a/src/libbasic/path-util.c
+++ b/src/libbasic/src/path-util.c
diff --git a/src/libbasic/prioq.c b/src/libbasic/src/prioq.c
index d2ec516d29..d2ec516d29 100644
--- a/src/libbasic/prioq.c
+++ b/src/libbasic/src/prioq.c
diff --git a/src/libbasic/proc-cmdline.c b/src/libbasic/src/proc-cmdline.c
index 3505fa9c9a..3505fa9c9a 100644
--- a/src/libbasic/proc-cmdline.c
+++ b/src/libbasic/src/proc-cmdline.c
diff --git a/src/libbasic/process-util.c b/src/libbasic/src/process-util.c
index 1ad8816206..1ad8816206 100644
--- a/src/libbasic/process-util.c
+++ b/src/libbasic/src/process-util.c
diff --git a/src/libbasic/random-util.c b/src/libbasic/src/random-util.c
index 2f468db770..2f468db770 100644
--- a/src/libbasic/random-util.c
+++ b/src/libbasic/src/random-util.c
diff --git a/src/libbasic/ratelimit.c b/src/libbasic/src/ratelimit.c
index 3ca5625e4d..3ca5625e4d 100644
--- a/src/libbasic/ratelimit.c
+++ b/src/libbasic/src/ratelimit.c
diff --git a/src/libbasic/replace-var.c b/src/libbasic/src/replace-var.c
index 6a204b9ec3..6a204b9ec3 100644
--- a/src/libbasic/replace-var.c
+++ b/src/libbasic/src/replace-var.c
diff --git a/src/libbasic/rlimit-util.c b/src/libbasic/src/rlimit-util.c
index ee063720ed..ee063720ed 100644
--- a/src/libbasic/rlimit-util.c
+++ b/src/libbasic/src/rlimit-util.c
diff --git a/src/libbasic/rm-rf.c b/src/libbasic/src/rm-rf.c
index 43816fd1bb..43816fd1bb 100644
--- a/src/libbasic/rm-rf.c
+++ b/src/libbasic/src/rm-rf.c
diff --git a/src/libbasic/selinux-util.c b/src/libbasic/src/selinux-util.c
index 10c2f39369..10c2f39369 100644
--- a/src/libbasic/selinux-util.c
+++ b/src/libbasic/src/selinux-util.c
diff --git a/src/libbasic/sigbus.c b/src/libbasic/src/sigbus.c
index 0ce4f75684..0ce4f75684 100644
--- a/src/libbasic/sigbus.c
+++ b/src/libbasic/src/sigbus.c
diff --git a/src/libbasic/signal-util.c b/src/libbasic/src/signal-util.c
index 280b5c3251..280b5c3251 100644
--- a/src/libbasic/signal-util.c
+++ b/src/libbasic/src/signal-util.c
diff --git a/src/libbasic/siphash24.c b/src/libbasic/src/siphash24.c
index 060e8ba387..060e8ba387 100644
--- a/src/libbasic/siphash24.c
+++ b/src/libbasic/src/siphash24.c
diff --git a/src/libbasic/smack-util.c b/src/libbasic/src/smack-util.c
index 3a3df987df..3a3df987df 100644
--- a/src/libbasic/smack-util.c
+++ b/src/libbasic/src/smack-util.c
diff --git a/src/libbasic/socket-label.c b/src/libbasic/src/socket-label.c
index 6d1dc83874..6d1dc83874 100644
--- a/src/libbasic/socket-label.c
+++ b/src/libbasic/src/socket-label.c
diff --git a/src/libbasic/socket-util.c b/src/libbasic/src/socket-util.c
index c8769a54f4..c8769a54f4 100644
--- a/src/libbasic/socket-util.c
+++ b/src/libbasic/src/socket-util.c
diff --git a/src/libbasic/stat-util.c b/src/libbasic/src/stat-util.c
index 309e84b93d..309e84b93d 100644
--- a/src/libbasic/stat-util.c
+++ b/src/libbasic/src/stat-util.c
diff --git a/src/libbasic/strbuf.c b/src/libbasic/src/strbuf.c
index 4bef87d3c2..4bef87d3c2 100644
--- a/src/libbasic/strbuf.c
+++ b/src/libbasic/src/strbuf.c
diff --git a/src/libbasic/string-table.c b/src/libbasic/src/string-table.c
index a1499ab126..a1499ab126 100644
--- a/src/libbasic/string-table.c
+++ b/src/libbasic/src/string-table.c
diff --git a/src/libbasic/string-util.c b/src/libbasic/src/string-util.c
index 293a15f9c0..293a15f9c0 100644
--- a/src/libbasic/string-util.c
+++ b/src/libbasic/src/string-util.c
diff --git a/src/libbasic/strv.c b/src/libbasic/src/strv.c
index 97a96e5762..97a96e5762 100644
--- a/src/libbasic/strv.c
+++ b/src/libbasic/src/strv.c
diff --git a/src/libbasic/strxcpyx.c b/src/libbasic/src/strxcpyx.c
index aaf11d21f6..aaf11d21f6 100644
--- a/src/libbasic/strxcpyx.c
+++ b/src/libbasic/src/strxcpyx.c
diff --git a/src/libbasic/syslog-util.c b/src/libbasic/src/syslog-util.c
index db3405154e..db3405154e 100644
--- a/src/libbasic/syslog-util.c
+++ b/src/libbasic/src/syslog-util.c
diff --git a/src/libbasic/terminal-util.c b/src/libbasic/src/terminal-util.c
index 9521b79daa..9521b79daa 100644
--- a/src/libbasic/terminal-util.c
+++ b/src/libbasic/src/terminal-util.c
diff --git a/src/libbasic/time-util.c b/src/libbasic/src/time-util.c
index edd9179cb8..edd9179cb8 100644
--- a/src/libbasic/time-util.c
+++ b/src/libbasic/src/time-util.c
diff --git a/src/libbasic/unit-name.c b/src/libbasic/src/unit-name.c
index fe883b95c7..fe883b95c7 100644
--- a/src/libbasic/unit-name.c
+++ b/src/libbasic/src/unit-name.c
diff --git a/src/libbasic/user-util.c b/src/libbasic/src/user-util.c
index f65ca3edaa..f65ca3edaa 100644
--- a/src/libbasic/user-util.c
+++ b/src/libbasic/src/user-util.c
diff --git a/src/libbasic/utf8.c b/src/libbasic/src/utf8.c
index 6eae2b983d..6eae2b983d 100644
--- a/src/libbasic/utf8.c
+++ b/src/libbasic/src/utf8.c
diff --git a/src/libbasic/util.c b/src/libbasic/src/util.c
index 756c663be4..756c663be4 100644
--- a/src/libbasic/util.c
+++ b/src/libbasic/src/util.c
diff --git a/src/libbasic/verbs.c b/src/libbasic/src/verbs.c
index d9cdb38d65..d9cdb38d65 100644
--- a/src/libbasic/verbs.c
+++ b/src/libbasic/src/verbs.c
diff --git a/src/libbasic/virt.c b/src/libbasic/src/virt.c
index dace1f4328..dace1f4328 100644
--- a/src/libbasic/virt.c
+++ b/src/libbasic/src/virt.c
diff --git a/src/libbasic/web-util.c b/src/libbasic/src/web-util.c
index 595688ed93..595688ed93 100644
--- a/src/libbasic/web-util.c
+++ b/src/libbasic/src/web-util.c
diff --git a/src/libbasic/xattr-util.c b/src/libbasic/src/xattr-util.c
index 8256899eda..8256899eda 100644
--- a/src/libbasic/xattr-util.c
+++ b/src/libbasic/src/xattr-util.c
diff --git a/src/libbasic/xml.c b/src/libbasic/src/xml.c
index 1dbeac7324..1dbeac7324 100644
--- a/src/libbasic/xml.c
+++ b/src/libbasic/src/xml.c