6 files changed, 7 insertions, 16 deletions
diff --git a/src/systemd-nspawn/Makefile b/src/systemd-nspawn/Makefile
index a173fd204a..6f02aa5f1e 100644
--- a/src/systemd-nspawn/Makefile
+++ b/src/systemd-nspawn/Makefile
@@ -90,4 +90,9 @@ test_patch_uid_LDADD = \
 manual_tests += \
 	test-patch-uid
 
+dist_tmpfiles_DATA = \
+	tmpfiles.d/systemd-nspawn.conf
+
+sd.CPPFLAGS += -I$(topsrcdir)/src/libudev/src
+
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/systemd-nspawn/nspawn-expose-ports.c b/src/systemd-nspawn/nspawn-expose-ports.c
index 6c9dbf4508..a00e7600aa 100644
--- a/src/systemd-nspawn/nspawn-expose-ports.c
+++ b/src/systemd-nspawn/nspawn-expose-ports.c
@@ -26,7 +26,6 @@
 #include "basic/util.h"
 #include "firewall-util.h"
 #include "sd-netlink/local-addresses.h"
-#include "sd-netlink/netlink-util.h"
 #include "sd-netlink/sd-netlink.h"
 
 #include "nspawn-expose-ports.h"
diff --git a/src/systemd-nspawn/nspawn-mount.h b/src/systemd-nspawn/nspawn-mount.h
index 0daf145412..0b3f3fbefa 100644
--- a/src/systemd-nspawn/nspawn-mount.h
+++ b/src/systemd-nspawn/nspawn-mount.h
@@ -20,6 +20,7 @@
 ***/
 
 #include <stdbool.h>
+#include <sys/types.h>
 
 typedef enum VolatileMode {
         VOLATILE_NO,
diff --git a/src/systemd-nspawn/nspawn-network.c b/src/systemd-nspawn/nspawn-network.c
index 14865734c8..b188491000 100644
--- a/src/systemd-nspawn/nspawn-network.c
+++ b/src/systemd-nspawn/nspawn-network.c
@@ -32,7 +32,6 @@
 #include "basic/stat-util.h"
 #include "basic/string-util.h"
 #include "basic/util.h"
-#include "sd-netlink/netlink-util.h"
 #include "sd-netlink/sd-netlink.h"
 #include "shared/udev-util.h"
 
diff --git a/src/systemd-nspawn/nspawn-register.c b/src/systemd-nspawn/nspawn-register.c
index 9660ced5b9..12e29153f9 100644
--- a/src/systemd-nspawn/nspawn-register.c
+++ b/src/systemd-nspawn/nspawn-register.c
@@ -22,7 +22,7 @@
 #include "basic/stat-util.h"
 #include "basic/strv.h"
 #include "basic/util.h"
-#include "sd-bus/bus-error.h"
+#include "sd-bus/bus-error.h" /* for bus_error_message */
 #include "shared/bus-unit-util.h"
 #include "shared/bus-util.h"
 
diff --git a/src/systemd-nspawn/nspawn.c b/src/systemd-nspawn/nspawn.c
index f921967487..fb25ec7afa 100644
--- a/src/systemd-nspawn/nspawn.c
+++ b/src/systemd-nspawn/nspawn.c
@@ -69,19 +69,6 @@
 #include "basic/random-util.h"
 #include "basic/raw-clone.h"
 #include "basic/rm-rf.h"
-#include "basic/selinux-util.h"
-#include "basic/signal-util.h"
-#include "basic/socket-util.h"
-#include "basic/stat-util.h"
-#include "basic/stdio-util.h"
-#include "basic/string-util.h"
-#include "basic/strv.h"
-#include "basic/terminal-util.h"
-#include "basic/umask-util.h"
-#include "basic/user-util.h"
-#include "basic/util.h"
-#include "sd-id128/id128-util.h"
-#include "sd-netlink/netlink-util.h"
 #include "shared/base-filesystem.h"
 #include "shared/dev-setup.h"
 #include "shared/fdset.h"