6 files changed, 16 insertions, 4 deletions
diff --git a/src/libbasic/include/basic/Makefile b/src/libbasic/include/basic/Makefile
index d442808156..b1d41dc79d 100644
--- a/src/libbasic/include/basic/Makefile
+++ b/src/libbasic/include/basic/Makefile
@@ -23,7 +23,7 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
-$(outdir)/errno-list.txt:
+$(outdir)/errno-list.txt: | $(outdir)/.deps
 	$(AM_V_GEN)$(CPP) $(sd.ALL_CPPFLAGS) -dM -include errno.h - </dev/null | $(AWK) '/^#define[ \t]+E[^ _]+[ \t]+/ { print $$2; }' >$@
 
 $(outdir)/errno-to-name.h: $(outdir)/errno-list.txt
@@ -44,8 +44,8 @@ $(outdir)/arphrd-to-name.h: $(outdir)/arphrd-list.txt
 $(outdir)/arphrd-from-name.gperf: $(outdir)/arphrd-list.txt
 	$(AM_V_GEN)$(AWK) 'BEGIN{ print "struct arphrd_name { const char* name; int id; };"; print "%null-strings"; print "%%";} { printf "%s, ARPHRD_%s\n", $$1, $$1 }' <$< >$@
 
-$(outdir)/cap-list.txt:
-	$(AM_V_GEN)$(CPP) $(sd.ALL_CPPFLAGS) -dM -include linux/capability.h -include missing.h - </dev/null | $(AWK) '/^#define[ \t]+CAP_[A-Z_]+[ \t]+/ { print $$2; }' | grep -v CAP_LAST_CAP >$@
+$(outdir)/cap-list.txt: $(srcdir)/missing.h
+	$(AM_V_GEN)$(CPP) $(sd.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 "};"}' <$< >$@
@@ -56,4 +56,6 @@ $(outdir)/cap-from-name.gperf: $(outdir)/cap-list.txt
 $(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 <$< >$@
 
+sd.CPPFLAGS += $(libbasic.CPPFLAGS)
+
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/libbasic/include/basic/btrfs-ctree.h b/src/libbasic/include/basic/btrfs-ctree.h
index 66bdf9736e..15e6d5582c 100644
--- a/src/libbasic/include/basic/btrfs-ctree.h
+++ b/src/libbasic/include/basic/btrfs-ctree.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "macro.h"
+#include "missing.h" /* for BTRFS_UUID_SIZE */
 #include "sparse-endian.h"
 
 /* Stolen from btrfs' ctree.h */
diff --git a/src/libbasic/include/basic/missing_syscall.h b/src/libbasic/include/basic/missing_syscall.h
index d502d3b9ca..2929123679 100644
--- a/src/libbasic/include/basic/missing_syscall.h
+++ b/src/libbasic/include/basic/missing_syscall.h
@@ -22,6 +22,10 @@
 
 /* Missing glibc definitions to access certain kernel APIs */
 
+#if __INCLUDE_LEVEL__ <= 1
+#error "Do not include missing_syscall.h directly; include it through missing.h."
+#endif
+
 #if !HAVE_DECL_PIVOT_ROOT
 static inline int pivot_root(const char *new_root, const char *put_old) {
         return syscall(SYS_pivot_root, new_root, put_old);
diff --git a/src/libbasic/include/basic/rm-rf.h b/src/libbasic/include/basic/rm-rf.h
index f693a5bb7c..8d315792ac 100644
--- a/src/libbasic/include/basic/rm-rf.h
+++ b/src/libbasic/include/basic/rm-rf.h
@@ -19,8 +19,11 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include <stdlib.h>
 #include <sys/stat.h>
 
+#include "macro.h"
+
 typedef enum RemoveFlags {
         REMOVE_ONLY_DIRECTORIES = 1,
         REMOVE_ROOT = 2,
diff --git a/src/libbasic/include/basic/socket-util.h b/src/libbasic/include/basic/socket-util.h
index bad1f32e09..2b717a91d4 100644
--- a/src/libbasic/include/basic/socket-util.h
+++ b/src/libbasic/include/basic/socket-util.h
@@ -27,8 +27,8 @@
 #include <sys/types.h>
 #include <sys/un.h>
 
-#include <linux/netlink.h>
 #include <linux/if_packet.h>
+#include <linux/netlink.h>
 
 #include "macro.h"
 #include "util.h"
diff --git a/src/libbasic/include/basic/time-util.h b/src/libbasic/include/basic/time-util.h
index a5e3f567ec..8324bb0dd0 100644
--- a/src/libbasic/include/basic/time-util.h
+++ b/src/libbasic/include/basic/time-util.h
@@ -26,6 +26,8 @@
 #include <stdio.h>
 #include <time.h>
 
+#include "macro.h"
+
 typedef uint64_t usec_t;
 typedef uint64_t nsec_t;