7 files changed, 10 insertions, 10 deletions
diff --git a/src/systemd-nspawn/Makefile b/src/systemd-nspawn/Makefile
index c0fc3bd98e..e43f5a2493 100644
--- a/src/systemd-nspawn/Makefile
+++ b/src/systemd-nspawn/Makefile
@@ -45,11 +45,7 @@ systemd_nspawn_SOURCES = \
 	src/nspawn/nspawn-stub-pid1.c \
 	src/nspawn/nspawn-stub-pid1.h \
 	src/nspawn/nspawn-patch-uid.c \
-	src/nspawn/nspawn-patch-uid.h \
-	src/core/mount-setup.c \
-	src/core/mount-setup.h \
-	src/core/loopback-setup.c \
-	src/core/loopback-setup.h
+	src/nspawn/nspawn-patch-uid.h
 
 nodist_systemd_nspawn_SOURCES = \
 	src/nspawn/nspawn-gperf.c
@@ -64,6 +60,9 @@ systemd_nspawn_CFLAGS = \
 	$(SELINUX_CFLAGS)
 
 systemd_nspawn_LDADD = \
+	libcore.la \
+	libsystemd-blkid.la \
+	libsystemd-internal.la \
 	libsystemd-shared.la \
 	$(ACL_LIBS) \
 	$(BLKID_LIBS) \
@@ -90,4 +89,7 @@ test_patch_uid_LDADD = \
 manual_tests += \
 	test-patch-uid
 
+dist_tmpfiles_DATA = \
+	tmpfiles.d/systemd-nspawn.conf
+
 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 1ecebe8e30..efdc845476 100644
--- a/src/systemd-nspawn/nspawn-expose-ports.c
+++ b/src/systemd-nspawn/nspawn-expose-ports.c
@@ -18,7 +18,6 @@
 ***/
 
 #include "sd-netlink/local-addresses.h"
-#include "sd-netlink/netlink-util.h"
 #include "systemd-basic/alloc-util.h"
 #include "systemd-basic/fd-util.h"
 #include "systemd-basic/in-addr-util.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 2e0760ec86..2fae23376c 100644
--- a/src/systemd-nspawn/nspawn-network.c
+++ b/src/systemd-nspawn/nspawn-network.c
@@ -24,7 +24,6 @@
 #include <libudev.h>
 #include <systemd/sd-id128.h>
 
-#include "sd-netlink/netlink-util.h"
 #include "systemd-basic/alloc-util.h"
 #include "systemd-basic/ether-addr-util.h"
 #include "systemd-basic/lockfile-util.h"
diff --git a/src/systemd-nspawn/nspawn-register.c b/src/systemd-nspawn/nspawn-register.c
index fc6982e55f..3889445ca5 100644
--- a/src/systemd-nspawn/nspawn-register.c
+++ b/src/systemd-nspawn/nspawn-register.c
@@ -19,7 +19,7 @@
 
 #include <systemd/sd-bus.h>
 
-#include "sd-bus/bus-error.h"
+#include "sd-bus/bus-error.h" /* for bus_error_message */
 #include "sd-bus/bus-util.h"
 #include "systemd-basic/stat-util.h"
 #include "systemd-basic/strv.h"
diff --git a/src/systemd-nspawn/nspawn-seccomp.h b/src/systemd-nspawn/nspawn-seccomp.h
index 5bde16faf9..a01e110c70 100644
--- a/src/systemd-nspawn/nspawn-seccomp.h
+++ b/src/systemd-nspawn/nspawn-seccomp.h
@@ -19,6 +19,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include <sys/types.h>
+#include <stdint.h>
 
 int setup_seccomp(uint64_t cap_list_retain);
diff --git a/src/systemd-nspawn/nspawn.c b/src/systemd-nspawn/nspawn.c
index 73548f98eb..f2cbae2ddb 100644
--- a/src/systemd-nspawn/nspawn.c
+++ b/src/systemd-nspawn/nspawn.c
@@ -46,7 +46,6 @@
 
 #include "core/loopback-setup.h"
 #include "sd-id128/id128-util.h"
-#include "sd-netlink/netlink-util.h"
 #include "systemd-basic/alloc-util.h"
 #include "systemd-basic/barrier.h"
 #include "systemd-basic/btrfs-util.h"