From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Thu, 6 Dec 2018 06:30:35 +0000 (+0100)
Subject: lockfile: drop unnecessary headers from lockfile-util.h
X-Git-Tag: v240~126^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=204f52e32d347d4d14d2f3febd2bce54ed13247c;p=thirdparty%2Fsystemd.git

lockfile: drop unnecessary headers from lockfile-util.h
---

diff --git a/src/machine/image-dbus.c b/src/machine/image-dbus.c
index a311ed9077d..33a181e5941 100644
--- a/src/machine/image-dbus.c
+++ b/src/machine/image-dbus.c
@@ -15,6 +15,7 @@
 #include "io-util.h"
 #include "loop-util.h"
 #include "machine-image.h"
+#include "missing_capability.h"
 #include "mount-util.h"
 #include "process-util.h"
 #include "raw-clone.h"
diff --git a/src/machine/machined-dbus.c b/src/machine/machined-dbus.c
index bbcfc626a1d..d613414fded 100644
--- a/src/machine/machined-dbus.c
+++ b/src/machine/machined-dbus.c
@@ -21,6 +21,7 @@
 #include "machine-image.h"
 #include "machine-pool.h"
 #include "machined.h"
+#include "missing_capability.h"
 #include "path-util.h"
 #include "process-util.h"
 #include "stdio-util.h"
diff --git a/src/nspawn/nspawn-network.c b/src/nspawn/nspawn-network.c
index 214fa40804c..9d0f8a9956b 100644
--- a/src/nspawn/nspawn-network.c
+++ b/src/nspawn/nspawn-network.c
@@ -11,6 +11,7 @@
 #include "alloc-util.h"
 #include "ether-addr-util.h"
 #include "lockfile-util.h"
+#include "missing_network.h"
 #include "netlink-util.h"
 #include "nspawn-network.h"
 #include "siphash24.h"
diff --git a/src/portable/portabled-bus.c b/src/portable/portabled-bus.c
index ec938385381..3cbdb0b0cc2 100644
--- a/src/portable/portabled-bus.c
+++ b/src/portable/portabled-bus.c
@@ -7,6 +7,7 @@
 #include "fd-util.h"
 #include "io-util.h"
 #include "machine-image.h"
+#include "missing_capability.h"
 #include "portable.h"
 #include "portabled-bus.h"
 #include "portabled-image-bus.h"
diff --git a/src/portable/portabled-image-bus.c b/src/portable/portabled-image-bus.c
index 77eb2df1180..1e618175c72 100644
--- a/src/portable/portabled-image-bus.c
+++ b/src/portable/portabled-image-bus.c
@@ -8,6 +8,7 @@
 #include "fileio.h"
 #include "io-util.h"
 #include "machine-image.h"
+#include "missing_capability.h"
 #include "portable.h"
 #include "portabled-bus.h"
 #include "portabled-image-bus.h"
diff --git a/src/shared/lockfile-util.h b/src/shared/lockfile-util.h
index c2abd9956f2..e0eef34cdc6 100644
--- a/src/shared/lockfile-util.h
+++ b/src/shared/lockfile-util.h
@@ -1,11 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
-#include <stddef.h>
-
-#include "macro.h"
-#include "missing.h"
-
 typedef struct LockFile {
         char *path;
         int fd;
diff --git a/src/shared/machine-image.c b/src/shared/machine-image.c
index b39ff42b840..af06ab22e88 100644
--- a/src/shared/machine-image.c
+++ b/src/shared/machine-image.c
@@ -7,6 +7,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <sys/file.h>
+#include <sys/ioctl.h>
 #include <sys/stat.h>
 #include <unistd.h>
 #include <linux/fs.h>