remove unused includes

This patch removes includes that are not used. The removals were found with
include-what-you-use which checks if any of the symbols from a header is
in use.

diff --git a/src/activate/activate.c b/src/activate/activate.c
index 2689934c409356274cab242ebcf3c79878e44d24..d345e285679f397c6814e89a30a70d3e49f69b19 100644 (file)
--- a/src/activate/activate.c
+++ b/src/activate/activate.c
@@ -20,7 +20,6 @@
 ***/
 
 #include <unistd.h>
 ***/
 
 #include <unistd.h>

-#include <fcntl.h>

 #include <sys/epoll.h>
 #include <sys/prctl.h>
 #include <sys/socket.h>
 #include <sys/epoll.h>
 #include <sys/prctl.h>
 #include <sys/socket.h>

diff --git a/src/analyze/analyze-verify.c b/src/analyze/analyze-verify.c
index f56910926808ae5cd79c0ecb78388a91d321e5a6..bfc71e3f38ce5ed24699924c5985df4c49e73561 100644 (file)
--- a/src/analyze/analyze-verify.c
+++ b/src/analyze/analyze-verify.c
@@ -20,13 +20,11 @@
 ***/
 
 #include <stdlib.h>
 ***/
 
 #include <stdlib.h>

-#include <getopt.h>

 
 #include "manager.h"
 #include "bus-util.h"
 #include "log.h"
 #include "strv.h"
 
 #include "manager.h"
 #include "bus-util.h"
 #include "log.h"
 #include "strv.h"

-#include "build.h"

 #include "pager.h"
 #include "analyze-verify.h"
 
 #include "pager.h"
 #include "analyze-verify.h"
 

diff --git a/src/analyze/analyze.c b/src/analyze/analyze.c
index 591b4ab14e74a73a1681f9ce4ae681f0b9811cba..7abe969bef8006175ea7e0ef9ec2799439738da1 100644 (file)
--- a/src/analyze/analyze.c
+++ b/src/analyze/analyze.c
@@ -24,17 +24,14 @@
 #include <stdlib.h>
 #include <getopt.h>
 #include <locale.h>
 #include <stdlib.h>
 #include <getopt.h>
 #include <locale.h>

-#include <sys/utsname.h>

 
 #include "sd-bus.h"
 #include "bus-util.h"
 #include "bus-error.h"
 
 #include "sd-bus.h"
 #include "bus-util.h"
 #include "bus-error.h"

-#include "install.h"

 #include "log.h"
 #include "build.h"
 #include "util.h"
 #include "strxcpyx.h"
 #include "log.h"
 #include "build.h"
 #include "util.h"
 #include "strxcpyx.h"

-#include "fileio.h"

 #include "strv.h"
 #include "unit-name.h"
 #include "special.h"
 #include "strv.h"
 #include "unit-name.h"
 #include "special.h"

diff --git a/src/ask-password/ask-password.c b/src/ask-password/ask-password.c
index ad8ad659d2db36c2e10fc88e355c3bc196da5217..2cbed293ba65a9ff1dbc69e96f345b1550522ae6 100644 (file)
--- a/src/ask-password/ask-password.c
+++ b/src/ask-password/ask-password.c
@@ -19,25 +19,13 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include <sys/socket.h>
-#include <poll.h>
-#include <sys/types.h>
-#include <assert.h>
-#include <string.h>

 #include <errno.h>
 #include <unistd.h>
 #include <errno.h>
 #include <unistd.h>

-#include <fcntl.h>
-#include <sys/un.h>
-#include <sys/stat.h>
-#include <sys/signalfd.h>

 #include <getopt.h>
 #include <getopt.h>

-#include <termios.h>
-#include <limits.h>

 #include <stddef.h>
 
 #include "log.h"
 #include "macro.h"
 #include <stddef.h>
 
 #include "log.h"
 #include "macro.h"

-#include "util.h"

 #include "strv.h"
 #include "ask-password-api.h"
 #include "def.h"
 #include "strv.h"
 #include "ask-password-api.h"
 #include "def.h"

diff --git a/src/binfmt/binfmt.c b/src/binfmt/binfmt.c
index 089b7754a431b6cc4e9cff611b7ad0f06fa80b9e..6028ed68c04b31e66ed85fcad69648e799682111 100644 (file)
--- a/src/binfmt/binfmt.c
+++ b/src/binfmt/binfmt.c
@@ -25,11 +25,9 @@
 #include <string.h>
 #include <stdio.h>
 #include <limits.h>
 #include <string.h>
 #include <stdio.h>
 #include <limits.h>

-#include <stdarg.h>

 #include <getopt.h>
 
 #include "log.h"
 #include <getopt.h>
 
 #include "log.h"

-#include "hashmap.h"

 #include "strv.h"
 #include "util.h"
 #include "conf-files.h"
 #include "strv.h"
 #include "util.h"
 #include "conf-files.h"

diff --git a/src/boot/bootctl.c b/src/boot/bootctl.c
index 73450e283d4be98a0a7a1b358b9785f9104d6e63..96637f12c64bd5ce812b8bdf25963b609cca776d 100644 (file)
--- a/src/boot/bootctl.c
+++ b/src/boot/bootctl.c
@@ -41,7 +41,6 @@
 #include "efivars.h"
 #include "build.h"
 #include "util.h"
 #include "efivars.h"
 #include "build.h"
 #include "util.h"

-#include "utf8.h"

 
 static int verify_esp(const char *p, uint32_t *part, uint64_t *pstart, uint64_t *psize, sd_id128_t *uuid) {
         struct statfs sfs;
 
 static int verify_esp(const char *p, uint32_t *part, uint64_t *pstart, uint64_t *psize, sd_id128_t *uuid) {
         struct statfs sfs;

diff --git a/src/bootchart/bootchart.c b/src/bootchart/bootchart.c
index 64a384bacfa6a3ccce7a173fa1e4d558776d1e0a..2fac30039d5d61cbad47d8c43e23e5d07cbce7ba 100644 (file)
--- a/src/bootchart/bootchart.c
+++ b/src/bootchart/bootchart.c
@@ -33,10 +33,7 @@
 
  ***/
 
 
  ***/
 

-#include <sys/time.h>
-#include <sys/types.h>

 #include <sys/resource.h>
 #include <sys/resource.h>

-#include <sys/stat.h>

 #include <stdio.h>
 #include <signal.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <signal.h>
 #include <stdlib.h>

diff --git a/src/bootchart/bootchart.h b/src/bootchart/bootchart.h
index 26de0dd9f8fd3ae8817d1c6d3244df00049eabef..e4dbdd921d5b75da03e340a9f0c8082ded1d6ce2 100644 (file)
--- a/src/bootchart/bootchart.h
+++ b/src/bootchart/bootchart.h
@@ -24,7 +24,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include <dirent.h>

 #include <stdbool.h>
 #include "list.h"
 
 #include <stdbool.h>
 #include "list.h"
 

diff --git a/src/bootchart/store.c b/src/bootchart/store.c
index a66387c304bd18cabe749ee7b7d8324a71d90a63..607cc5e74b2c5a86697290a8e72aca0bd4bfeebd 100644 (file)
--- a/src/bootchart/store.c
+++ b/src/bootchart/store.c
@@ -25,8 +25,6 @@
 #include <unistd.h>
 #include <stdlib.h>
 #include <limits.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <limits.h>

-#include <sys/types.h>
-#include <sys/stat.h>

 #include <stdio.h>
 #include <string.h>
 #include <dirent.h>
 #include <stdio.h>
 #include <string.h>
 #include <dirent.h>

diff --git a/src/bootchart/svg.c b/src/bootchart/svg.c
index e111fa9cce57faa612e9957f5b61d675320be160..93b4764ee736fc28b9b7fe30b06acf0f03d83bff 100644 (file)
--- a/src/bootchart/svg.c
+++ b/src/bootchart/svg.c
@@ -23,14 +23,11 @@
  ***/
 
 #include <stdio.h>
  ***/
 
 #include <stdio.h>

-#include <stdarg.h>
-#include <stdlib.h>

 #include <string.h>
 #include <time.h>
 #include <limits.h>
 #include <unistd.h>
 #include <sys/utsname.h>
 #include <string.h>
 #include <time.h>
 #include <limits.h>
 #include <unistd.h>
 #include <sys/utsname.h>

-#include <sys/stat.h>

 #include <fcntl.h>
 
 #include "util.h"
 #include <fcntl.h>
 
 #include "util.h"

diff --git a/src/bus-proxyd/bus-proxyd.c b/src/bus-proxyd/bus-proxyd.c
index b6b0056362f8f071af4092e67b2261b910f0dc65..9645c504f538230906f5e145ed7d29f9aaeb9b8a 100644 (file)
--- a/src/bus-proxyd/bus-proxyd.c
+++ b/src/bus-proxyd/bus-proxyd.c
@@ -23,13 +23,9 @@
 ***/
 
 #include <sys/socket.h>
 ***/
 
 #include <sys/socket.h>

-#include <sys/un.h>
-#include <sys/types.h>
-#include <fcntl.h>

 #include <unistd.h>
 #include <string.h>
 #include <errno.h>
 #include <unistd.h>
 #include <string.h>
 #include <errno.h>

-#include <poll.h>

 #include <sys/prctl.h>
 #include <stddef.h>
 #include <getopt.h>
 #include <sys/prctl.h>
 #include <stddef.h>
 #include <getopt.h>


@@ -37,24 +33,14 @@
 
 #include "log.h"
 #include "util.h"
 
 #include "log.h"
 #include "util.h"

-#include "hashmap.h"
-#include "socket-util.h"

 #include "sd-daemon.h"
 #include "sd-daemon.h"

-#include "sd-bus.h"

 #include "bus-internal.h"
 #include "bus-internal.h"

-#include "bus-message.h"
-#include "bus-util.h"

 #include "build.h"
 #include "strv.h"
 #include "def.h"
 #include "capability.h"
 #include "build.h"
 #include "strv.h"
 #include "def.h"
 #include "capability.h"

-#include "bus-control.h"
-#include "smack-util.h"
-#include "set.h"

 #include "bus-xml-policy.h"
 #include "bus-xml-policy.h"

-#include "driver.h"

 #include "proxy.h"
 #include "proxy.h"

-#include "synthesize.h"

 
 static char *arg_address = NULL;
 static char **arg_configuration = NULL;
 
 static char *arg_address = NULL;
 static char **arg_configuration = NULL;

diff --git a/src/bus-proxyd/bus-xml-policy.c b/src/bus-proxyd/bus-xml-policy.c
index f6ac0c009355f1fb8362d6e08faa8d01de769992..497bce7b5699805d1b87968cb9a8c88040d1fb89 100644 (file)
--- a/src/bus-proxyd/bus-xml-policy.c
+++ b/src/bus-proxyd/bus-xml-policy.c
@@ -25,7 +25,6 @@
 #include "set.h"
 #include "conf-files.h"
 #include "bus-internal.h"
 #include "set.h"
 #include "conf-files.h"
 #include "bus-internal.h"

-#include "bus-message.h"

 #include "bus-xml-policy.h"
 #include "sd-login.h"
 
 #include "bus-xml-policy.h"
 #include "sd-login.h"
 

diff --git a/src/bus-proxyd/bus-xml-policy.h b/src/bus-proxyd/bus-xml-policy.h
index f2ec1bbea40a9c43917b06be87758d6d9955ef12..8f0ab8f17ff08434f2dd30c8c012eef1b22e7119 100644 (file)
--- a/src/bus-proxyd/bus-xml-policy.h
+++ b/src/bus-proxyd/bus-xml-policy.h
@@ -21,12 +21,10 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include <inttypes.h>

 #include <pthread.h>
 
 #include "list.h"
 #include "hashmap.h"
 #include <pthread.h>
 
 #include "list.h"
 #include "hashmap.h"

-#include "set.h"

 
 typedef enum PolicyItemType {
         _POLICY_ITEM_TYPE_UNSET = 0,
 
 typedef enum PolicyItemType {
         _POLICY_ITEM_TYPE_UNSET = 0,

diff --git a/src/bus-proxyd/driver.c b/src/bus-proxyd/driver.c
index bc2c0c86f33b5c22d7a2d098aed826b4ea5018aa..3c613e415795b270ab1e19108819c53fe04bbaa3 100644 (file)
--- a/src/bus-proxyd/driver.c
+++ b/src/bus-proxyd/driver.c
@@ -21,23 +21,16 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include <sys/types.h>
-#include <unistd.h>

 #include <string.h>
 #include <errno.h>
 #include <stddef.h>
 
 #include <string.h>
 #include <errno.h>
 #include <stddef.h>
 

-#include "log.h"

 #include "util.h"
 #include "sd-bus.h"
 #include "bus-internal.h"
 #include "bus-message.h"
 #include "bus-util.h"
 #include "util.h"
 #include "sd-bus.h"
 #include "bus-internal.h"
 #include "bus-message.h"
 #include "bus-util.h"

-#include "build.h"

 #include "strv.h"
 #include "strv.h"

-#include "def.h"
-#include "capability.h"
-#include "bus-control.h"

 #include "set.h"
 #include "driver.h"
 #include "synthesize.h"
 #include "set.h"
 #include "driver.h"
 #include "synthesize.h"

diff --git a/src/bus-proxyd/proxy.c b/src/bus-proxyd/proxy.c
index 3dea908f5bd44cef79d2c81e2c0fa5c565e0b8ec..0c851f93c14fb4cf4bb4b8bd334a9d7d38ff6531 100644 (file)
--- a/src/bus-proxyd/proxy.c
+++ b/src/bus-proxyd/proxy.c
@@ -23,30 +23,20 @@
 ***/
 
 #include <sys/socket.h>
 ***/
 
 #include <sys/socket.h>

-#include <sys/un.h>

 #include <sys/types.h>
 #include <sys/types.h>

-#include <fcntl.h>
-#include <unistd.h>

 #include <string.h>
 #include <errno.h>
 #include <poll.h>
 #include <string.h>
 #include <errno.h>
 #include <poll.h>

-#include <stddef.h>
-#include <getopt.h>

 
 #include "log.h"
 #include "util.h"
 
 #include "log.h"
 #include "util.h"

-#include "socket-util.h"

 #include "sd-daemon.h"
 #include "sd-bus.h"
 #include "bus-internal.h"
 #include "bus-message.h"
 #include "bus-util.h"
 #include "sd-daemon.h"
 #include "sd-bus.h"
 #include "bus-internal.h"
 #include "bus-message.h"
 #include "bus-util.h"

-#include "build.h"

 #include "strv.h"
 #include "strv.h"

-#include "def.h"
-#include "capability.h"

 #include "bus-control.h"
 #include "bus-control.h"

-#include "smack-util.h"

 #include "set.h"
 #include "bus-xml-policy.h"
 #include "driver.h"
 #include "set.h"
 #include "bus-xml-policy.h"
 #include "driver.h"

diff --git a/src/bus-proxyd/proxy.h b/src/bus-proxyd/proxy.h
index 913d47071baa71d83bd2bd9ed760d635e50e1c45..172bc7f569b7363421ee011b169b325c5eb8c150 100644 (file)
--- a/src/bus-proxyd/proxy.h
+++ b/src/bus-proxyd/proxy.h
@@ -21,10 +21,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include <stdlib.h>

 #include "sd-bus.h"
 #include "bus-xml-policy.h"
 #include "sd-bus.h"
 #include "bus-xml-policy.h"

-#include "util.h"

 
 typedef struct Proxy Proxy;
 
 
 typedef struct Proxy Proxy;
 

diff --git a/src/bus-proxyd/stdio-bridge.c b/src/bus-proxyd/stdio-bridge.c
index 9fb3e9fc49db3f55c64fbffae54aec3f9d951731..35e69a5c01276fb801a43a05a7c4f3393d344fc1 100644 (file)
--- a/src/bus-proxyd/stdio-bridge.c
+++ b/src/bus-proxyd/stdio-bridge.c
@@ -21,36 +21,22 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include <sys/socket.h>
-#include <sys/un.h>
-#include <sys/types.h>
-#include <fcntl.h>

 #include <unistd.h>
 #include <string.h>
 #include <errno.h>
 #include <unistd.h>
 #include <string.h>
 #include <errno.h>

-#include <poll.h>

 #include <stddef.h>
 #include <getopt.h>
 
 #include "log.h"
 #include "util.h"
 #include <stddef.h>
 #include <getopt.h>
 
 #include "log.h"
 #include "util.h"

-#include "socket-util.h"

 #include "sd-daemon.h"
 #include "sd-bus.h"
 #include "bus-internal.h"
 #include "sd-daemon.h"
 #include "sd-bus.h"
 #include "bus-internal.h"

-#include "bus-message.h"

 #include "bus-util.h"
 #include "build.h"
 #include "strv.h"
 #include "def.h"
 #include "bus-util.h"
 #include "build.h"
 #include "strv.h"
 #include "def.h"

-#include "capability.h"
-#include "bus-control.h"
-#include "smack-util.h"
-#include "set.h"
-#include "bus-xml-policy.h"
-#include "driver.h"

 #include "proxy.h"
 #include "proxy.h"

-#include "synthesize.h"

 
 static char *arg_address = NULL;
 static char *arg_command_line_buffer = NULL;
 
 static char *arg_address = NULL;
 static char *arg_command_line_buffer = NULL;

diff --git a/src/bus-proxyd/synthesize.c b/src/bus-proxyd/synthesize.c
index e1b0fd35354b3fccb94fac59d1e846134069088c..542166f68a1f54c6287bfe697a6a5937eb9ee388 100644 (file)
--- a/src/bus-proxyd/synthesize.c
+++ b/src/bus-proxyd/synthesize.c
@@ -21,21 +21,13 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include <sys/types.h>
-#include <unistd.h>
-#include <string.h>
-#include <errno.h>

 #include <stddef.h>
 
 #include <stddef.h>
 

-#include "log.h"

 #include "util.h"
 #include "sd-bus.h"
 #include "bus-internal.h"
 #include "bus-message.h"
 #include "bus-util.h"
 #include "util.h"
 #include "sd-bus.h"
 #include "bus-internal.h"
 #include "bus-message.h"
 #include "bus-util.h"

-#include "strv.h"
-#include "def.h"
-#include "bus-control.h"

 #include "synthesize.h"
 
 static int synthetic_driver_send(sd_bus *b, sd_bus_message *m) {
 #include "synthesize.h"
 
 static int synthetic_driver_send(sd_bus *b, sd_bus_message *m) {

diff --git a/src/bus-proxyd/test-bus-xml-policy.c b/src/bus-proxyd/test-bus-xml-policy.c
index 421487e03869e81607a6480601bf84c020cb3b75..d19d0e1b606ca2650ce0a3491b2d30d0fac1f453 100644 (file)
--- a/src/bus-proxyd/test-bus-xml-policy.c
+++ b/src/bus-proxyd/test-bus-xml-policy.c
@@ -19,27 +19,14 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include <sys/socket.h>
-#include <sys/un.h>
-#include <sys/types.h>
-#include <fcntl.h>

 #include <unistd.h>
 #include <unistd.h>

-#include <string.h>

 #include <errno.h>
 #include <errno.h>

-#include <poll.h>

 #include <stddef.h>
 #include <stddef.h>

-#include <getopt.h>

 
 #include "log.h"
 #include "util.h"
 #include "sd-bus.h"
 
 #include "log.h"
 #include "util.h"
 #include "sd-bus.h"

-#include "bus-internal.h"
-#include "bus-message.h"
-#include "bus-util.h"
-#include "build.h"

 #include "strv.h"
 #include "strv.h"

-#include "def.h"
-#include "capability.h"

 #include "bus-xml-policy.h"
 
 static int test_policy_load(Policy *p, const char *name) {
 #include "bus-xml-policy.h"
 
 static int test_policy_load(Policy *p, const char *name) {

diff --git a/src/cgls/cgls.c b/src/cgls/cgls.c
index 579e06de5be0c23f3b3ca61352f022508dd91303..c6f5485716962fc08390880508eb4e2e3c5e922e 100644 (file)
--- a/src/cgls/cgls.c
+++ b/src/cgls/cgls.c
@@ -19,7 +19,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include <limits.h>

 #include <stdio.h>
 #include <unistd.h>
 #include <errno.h>
 #include <stdio.h>
 #include <unistd.h>
 #include <errno.h>

diff --git a/src/console/consoled-display.c b/src/console/consoled-display.c
index a30a2f1022973aae2e5d00e2128746d9f7ede110..569c011dc04881b8bee4abe1d83e64425d84b992 100644 (file)
--- a/src/console/consoled-display.c
+++ b/src/console/consoled-display.c
@@ -20,7 +20,6 @@
 ***/
 
 #include <errno.h>
 ***/
 
 #include <errno.h>

-#include <inttypes.h>

 #include <stdlib.h>
 #include "consoled.h"
 #include "grdev.h"
 #include <stdlib.h>
 #include "consoled.h"
 #include "grdev.h"

diff --git a/src/console/consoled-manager.c b/src/console/consoled-manager.c
index 9dd62f04a09d83c4b741ba0350805f09882195c9..f82f211d4217fbaefcfb87dd10ff46cf42340ea9 100644 (file)
--- a/src/console/consoled-manager.c
+++ b/src/console/consoled-manager.c
@@ -20,15 +20,12 @@
 ***/
 
 #include <errno.h>
 ***/
 
 #include <errno.h>

-#include <libudev.h>

 #include <stdlib.h>
 #include <stdlib.h>

-#include <string.h>

 #include "consoled.h"
 #include "grdev.h"
 #include "idev.h"
 #include "log.h"
 #include "sd-bus.h"
 #include "consoled.h"
 #include "grdev.h"
 #include "idev.h"
 #include "log.h"
 #include "sd-bus.h"

-#include "sd-daemon.h"

 #include "sd-event.h"
 #include "sd-login.h"
 #include "sysview.h"
 #include "sd-event.h"
 #include "sd-login.h"
 #include "sysview.h"

diff --git a/src/console/consoled-session.c b/src/console/consoled-session.c
index 927965e02ca4e457a90489cab2bfaf46a220e8d4..264a4d009a12ade1345a0b04bdffdad4b64d935a 100644 (file)
--- a/src/console/consoled-session.c
+++ b/src/console/consoled-session.c
@@ -20,16 +20,12 @@
 ***/
 
 #include <errno.h>
 ***/
 
 #include <errno.h>

-#include <inttypes.h>
-#include <libudev.h>

 #include <stdlib.h>
 #include "consoled.h"
 #include "grdev.h"
 #include <stdlib.h>
 #include "consoled.h"
 #include "grdev.h"

-#include "hashmap.h"

 #include "idev.h"
 #include "list.h"
 #include "macro.h"
 #include "idev.h"
 #include "list.h"
 #include "macro.h"

-#include "sd-bus.h"

 #include "sd-event.h"
 #include "sysview.h"
 #include "util.h"
 #include "sd-event.h"
 #include "sysview.h"
 #include "util.h"

diff --git a/src/console/consoled-terminal.c b/src/console/consoled-terminal.c
index 19d14016ad85f8730bf9abda9037768bdb22428e..3657dca398ff6a354659583b604635eb9f773cf9 100644 (file)
--- a/src/console/consoled-terminal.c
+++ b/src/console/consoled-terminal.c
@@ -20,7 +20,6 @@
 ***/
 
 #include <errno.h>
 ***/
 
 #include <errno.h>

-#include <inttypes.h>

 #include <stdlib.h>
 #include "consoled.h"
 #include "list.h"
 #include <stdlib.h>
 #include "consoled.h"
 #include "list.h"

diff --git a/src/console/consoled-workspace.c b/src/console/consoled-workspace.c
index 56344ef2cf1fff7962e4e4d895476aa7472890d9..5e9e5c7c4994873adc2c30dcaed004dffd25c251 100644 (file)
--- a/src/console/consoled-workspace.c
+++ b/src/console/consoled-workspace.c
@@ -20,7 +20,6 @@
 ***/
 
 #include <errno.h>
 ***/
 
 #include <errno.h>

-#include <inttypes.h>

 #include <stdlib.h>
 #include "consoled.h"
 #include "grdev.h"
 #include <stdlib.h>
 #include "consoled.h"
 #include "grdev.h"

diff --git a/src/console/consoled.c b/src/console/consoled.c
index 6f65dcdcb9a80c27c07baccabd207cd245d81759..26dd068f5c9a7c0e1b3e6587a4d8b2bc3d3f9df7 100644 (file)
--- a/src/console/consoled.c
+++ b/src/console/consoled.c
@@ -21,11 +21,9 @@
 
 #include <errno.h>
 #include <stdlib.h>
 
 #include <errno.h>
 #include <stdlib.h>

-#include <string.h>

 #include "consoled.h"
 #include "log.h"
 #include "sd-daemon.h"
 #include "consoled.h"
 #include "log.h"
 #include "sd-daemon.h"

-#include "util.h"

 
 int main(int argc, char *argv[]) {
         _cleanup_(manager_freep) Manager *m = NULL;
 
 int main(int argc, char *argv[]) {
         _cleanup_(manager_freep) Manager *m = NULL;

diff --git a/src/console/consoled.h b/src/console/consoled.h
index b0db610400bd28f892a0f3180c42dcf35b090008..f85c1a07917e07c2d5c1cfdbc110140fcd326b54 100644 (file)
--- a/src/console/consoled.h
+++ b/src/console/consoled.h
@@ -21,10 +21,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include <errno.h>
-#include <inttypes.h>
-#include <libudev.h>
-#include <stdlib.h>

 #include "grdev.h"
 #include "idev.h"
 #include "list.h"
 #include "grdev.h"
 #include "idev.h"
 #include "list.h"

diff --git a/src/core/automount.c b/src/core/automount.c
index 9f6bd84b219920dcc193302860c78c5b1616594c..4a509efaf4895fd38ccfa47a1218014f8f8258de 100644 (file)
--- a/src/core/automount.c
+++ b/src/core/automount.c
@@ -32,8 +32,6 @@
 #include "unit.h"
 #include "automount.h"
 #include "mount.h"
 #include "unit.h"
 #include "automount.h"
 #include "mount.h"

-#include "load-fragment.h"
-#include "load-dropin.h"

 #include "unit-name.h"
 #include "special.h"
 #include "label.h"
 #include "unit-name.h"
 #include "special.h"
 #include "label.h"

diff --git a/src/core/busname.h b/src/core/busname.h
index 775822d8defd380fc998dee914d161906425e5bb..69528a2aef097fa2df82aedb618889355889890e 100644 (file)
--- a/src/core/busname.h
+++ b/src/core/busname.h
@@ -24,7 +24,6 @@
 typedef struct BusName BusName;
 typedef struct BusNamePolicy BusNamePolicy;
 
 typedef struct BusName BusName;
 typedef struct BusNamePolicy BusNamePolicy;
 

-#include "unit.h"

 
 typedef enum BusNameState {
         BUSNAME_DEAD,
 
 typedef enum BusNameState {
         BUSNAME_DEAD,

diff --git a/src/core/cgroup.h b/src/core/cgroup.h
index 8fa851de329310557c784fd5eaf3b91004586453..993aa9db7d6c7f7341ba4a1acb108a7138dbcfea 100644 (file)
--- a/src/core/cgroup.h
+++ b/src/core/cgroup.h
@@ -91,7 +91,6 @@ struct CGroupContext {
 };
 
 #include "unit.h"
 };
 
 #include "unit.h"

-#include "manager.h"

 #include "cgroup-util.h"
 
 void cgroup_context_init(CGroupContext *c);
 #include "cgroup-util.h"
 
 void cgroup_context_init(CGroupContext *c);

diff --git a/src/core/dbus-automount.c b/src/core/dbus-automount.c
index b2a510ad0905651ed4468c819204641bce21a0e3..38acbd0c2625e68d6da5fd7c87a376886941332b 100644 (file)
--- a/src/core/dbus-automount.c
+++ b/src/core/dbus-automount.c
@@ -19,9 +19,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include "unit.h"

 #include "automount.h"
 #include "automount.h"

-#include "dbus-unit.h"

 #include "dbus-automount.h"
 #include "bus-util.h"
 
 #include "dbus-automount.h"
 #include "bus-util.h"
 

diff --git a/src/core/dbus-automount.h b/src/core/dbus-automount.h
index 1bec95378801bd2b1c02dd97d5c4c435056b334b..a2b124d756ed2898248114e600d7f8507772003b 100644 (file)
--- a/src/core/dbus-automount.h
+++ b/src/core/dbus-automount.h
@@ -21,6 +21,5 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include "sd-bus.h"

 
 extern const sd_bus_vtable bus_automount_vtable[];
 
 extern const sd_bus_vtable bus_automount_vtable[];

diff --git a/src/core/dbus-busname.c b/src/core/dbus-busname.c
index 28f192403b09694fe0da5db043717e4e8ae6a769..b1ceb05b1a2c1c5588efcbea352e20c961df62c3 100644 (file)
--- a/src/core/dbus-busname.c
+++ b/src/core/dbus-busname.c
@@ -21,7 +21,6 @@
 
 #include "unit.h"
 #include "busname.h"
 
 #include "unit.h"
 #include "busname.h"

-#include "dbus-unit.h"

 #include "dbus-busname.h"
 #include "bus-util.h"
 
 #include "dbus-busname.h"
 #include "bus-util.h"
 

diff --git a/src/core/dbus-busname.h b/src/core/dbus-busname.h
index b5eed37d58ad8820408ba6b1c6dd273bced2737f..ea55b6c8c9c2407d0bf302f4a82d887ad1abbb40 100644 (file)
--- a/src/core/dbus-busname.h
+++ b/src/core/dbus-busname.h
@@ -21,7 +21,5 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include "sd-bus.h"
-#include "unit.h"

 
 extern const sd_bus_vtable bus_busname_vtable[];
 
 extern const sd_bus_vtable bus_busname_vtable[];

diff --git a/src/core/dbus-device.c b/src/core/dbus-device.c
index f556536f33b0c4f05ea5dd70b47083eb94eccad1..cb156fd37ca280003e0b1e7f405d5a03c39d072a 100644 (file)
--- a/src/core/dbus-device.c
+++ b/src/core/dbus-device.c
@@ -21,7 +21,6 @@
 
 #include "unit.h"
 #include "device.h"
 
 #include "unit.h"
 #include "device.h"

-#include "dbus-unit.h"

 #include "dbus-device.h"
 
 const sd_bus_vtable bus_device_vtable[] = {
 #include "dbus-device.h"
 
 const sd_bus_vtable bus_device_vtable[] = {

diff --git a/src/core/dbus-device.h b/src/core/dbus-device.h
index 4aff226ab26c806e6c790dca8faa9a92411484bb..10e945e40214cc71d49abbc6c471cb1c16b301ce 100644 (file)
--- a/src/core/dbus-device.h
+++ b/src/core/dbus-device.h
@@ -21,7 +21,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include "sd-bus.h"

 #include "unit.h"
 
 extern const sd_bus_vtable bus_device_vtable[];
 #include "unit.h"
 
 extern const sd_bus_vtable bus_device_vtable[];

diff --git a/src/core/dbus-manager.h b/src/core/dbus-manager.h
index e1903fa16a307db3b769c53c813199dc9ec0646e..3730deb576a2deb1d8512c6234145c6eef6be573 100644 (file)
--- a/src/core/dbus-manager.h
+++ b/src/core/dbus-manager.h
@@ -21,7 +21,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include "sd-bus.h"

 #include "manager.h"
 
 extern const sd_bus_vtable bus_manager_vtable[];
 #include "manager.h"
 
 extern const sd_bus_vtable bus_manager_vtable[];

diff --git a/src/core/dbus-mount.c b/src/core/dbus-mount.c
index 53fe4edc34d998437263a736cbdf8031c49f3037..24813c6d20a77947db6ba0be45171ac3c2b6d516 100644 (file)
--- a/src/core/dbus-mount.c
+++ b/src/core/dbus-mount.c
@@ -21,7 +21,6 @@
 
 #include "unit.h"
 #include "mount.h"
 
 #include "unit.h"
 #include "mount.h"

-#include "dbus-unit.h"

 #include "dbus-execute.h"
 #include "dbus-kill.h"
 #include "dbus-cgroup.h"
 #include "dbus-execute.h"
 #include "dbus-kill.h"
 #include "dbus-cgroup.h"

diff --git a/src/core/dbus-path.c b/src/core/dbus-path.c
index b5e894101daeb943a092f089093ce9b976f8250e..683561999bd646aa8d3ee400bb926410f80aefac 100644 (file)
--- a/src/core/dbus-path.c
+++ b/src/core/dbus-path.c
@@ -21,7 +21,6 @@
 
 #include "unit.h"
 #include "path.h"
 
 #include "unit.h"
 #include "path.h"

-#include "dbus-unit.h"

 #include "dbus-path.h"
 #include "bus-util.h"
 
 #include "dbus-path.h"
 #include "bus-util.h"
 

diff --git a/src/core/dbus-path.h b/src/core/dbus-path.h
index 667da052234cbe0c400b8f86e81e99445489f783..389b0d7f9b8a3cb850076b20ed5165dc563d59d4 100644 (file)
--- a/src/core/dbus-path.h
+++ b/src/core/dbus-path.h
@@ -22,6 +22,5 @@
 ***/
 
 
 ***/
 
 

-#include "sd-bus.h"

 
 extern const sd_bus_vtable bus_path_vtable[];
 
 extern const sd_bus_vtable bus_path_vtable[];

diff --git a/src/core/dbus-service.c b/src/core/dbus-service.c
index 6d4713babc0884e4124f8d5ce9a64b041d0a49e2..e1f3d5649558f26f7a07cad9e00577550b322570 100644 (file)
--- a/src/core/dbus-service.c
+++ b/src/core/dbus-service.c
@@ -23,7 +23,6 @@
 #include "path-util.h"
 #include "unit.h"
 #include "service.h"
 #include "path-util.h"
 #include "unit.h"
 #include "service.h"

-#include "dbus-unit.h"

 #include "dbus-execute.h"
 #include "dbus-kill.h"
 #include "dbus-cgroup.h"
 #include "dbus-execute.h"
 #include "dbus-kill.h"
 #include "dbus-cgroup.h"

diff --git a/src/core/dbus-slice.c b/src/core/dbus-slice.c
index 8bc90b1dad567255d85203d419317b9d239efd38..09e78d1f33bfa307e5c2f3a9db43065e87d06aa0 100644 (file)
--- a/src/core/dbus-slice.c
+++ b/src/core/dbus-slice.c
@@ -21,7 +21,6 @@
 
 #include "unit.h"
 #include "slice.h"
 
 #include "unit.h"
 #include "slice.h"

-#include "dbus-unit.h"

 #include "dbus-cgroup.h"
 #include "dbus-slice.h"
 
 #include "dbus-cgroup.h"
 #include "dbus-slice.h"
 

diff --git a/src/core/dbus-snapshot.c b/src/core/dbus-snapshot.c
index a1959defce9fdb0912e7c39e5481907ff12cd32a..0be46c288efe80b3602d66fcf53d369dcbe220c2 100644 (file)
--- a/src/core/dbus-snapshot.c
+++ b/src/core/dbus-snapshot.c
@@ -23,7 +23,6 @@
 #include "unit.h"
 #include "dbus.h"
 #include "snapshot.h"
 #include "unit.h"
 #include "dbus.h"
 #include "snapshot.h"

-#include "dbus-unit.h"

 #include "dbus-snapshot.h"
 
 int bus_snapshot_method_remove(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error) {
 #include "dbus-snapshot.h"
 
 int bus_snapshot_method_remove(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error) {

diff --git a/src/core/dbus-socket.c b/src/core/dbus-socket.c
index 50b16744274febfac1328a97d8e5f57f555bd2b9..02599a9e55e5cee8acca71a997215760e4991f3a 100644 (file)
--- a/src/core/dbus-socket.c
+++ b/src/core/dbus-socket.c
@@ -21,9 +21,7 @@
 
 #include "unit.h"
 #include "socket.h"
 
 #include "unit.h"
 #include "socket.h"

-#include "dbus-unit.h"

 #include "dbus-execute.h"
 #include "dbus-execute.h"

-#include "dbus-kill.h"

 #include "dbus-cgroup.h"
 #include "dbus-socket.h"
 #include "bus-util.h"
 #include "dbus-cgroup.h"
 #include "dbus-socket.h"
 #include "bus-util.h"

diff --git a/src/core/dbus-swap.c b/src/core/dbus-swap.c
index 1e7f66d0537c12d7490b03d03414fc4dd537252f..00933713060375257ea63b723ea55d94d221ac5d 100644 (file)
--- a/src/core/dbus-swap.c
+++ b/src/core/dbus-swap.c
@@ -22,9 +22,7 @@
 
 #include "unit.h"
 #include "swap.h"
 
 #include "unit.h"
 #include "swap.h"

-#include "dbus-unit.h"

 #include "dbus-execute.h"
 #include "dbus-execute.h"

-#include "dbus-kill.h"

 #include "dbus-cgroup.h"
 #include "dbus-swap.h"
 #include "bus-util.h"
 #include "dbus-cgroup.h"
 #include "dbus-swap.h"
 #include "bus-util.h"

diff --git a/src/core/dbus-target.c b/src/core/dbus-target.c
index 205d1c4a88a383c41207be70aac54999532f5984..350f5c3ed2248a09716dfb640d8de5d9777ce882 100644 (file)
--- a/src/core/dbus-target.c
+++ b/src/core/dbus-target.c
@@ -20,8 +20,6 @@
 ***/
 
 #include "unit.h"
 ***/
 
 #include "unit.h"

-#include "target.h"
-#include "dbus-unit.h"

 #include "dbus-target.h"
 
 const sd_bus_vtable bus_target_vtable[] = {
 #include "dbus-target.h"
 
 const sd_bus_vtable bus_target_vtable[] = {

diff --git a/src/core/dbus-target.h b/src/core/dbus-target.h
index 6be9c9f7084d0c4c976d14950070962e629f4bda..4c4297bc9e68a63f2eeb1645f7219e2dbd2e4246 100644 (file)
--- a/src/core/dbus-target.h
+++ b/src/core/dbus-target.h
@@ -21,6 +21,5 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include "sd-bus.h"

 
 extern const sd_bus_vtable bus_target_vtable[];
 
 extern const sd_bus_vtable bus_target_vtable[];

diff --git a/src/core/dbus-timer.c b/src/core/dbus-timer.c
index 43e785246cd9c053fd50f2cadc7c76273429eb73..74a9914358e8e2974437316dcb01d2021ba74ea3 100644 (file)
--- a/src/core/dbus-timer.c
+++ b/src/core/dbus-timer.c
@@ -21,10 +21,8 @@
 
 #include "unit.h"
 #include "timer.h"
 
 #include "unit.h"
 #include "timer.h"

-#include "dbus-unit.h"

 #include "dbus-timer.h"
 #include "bus-util.h"
 #include "dbus-timer.h"
 #include "bus-util.h"

-#include "errno-list.h"

 #include "strv.h"
 
 static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_result, timer_result, TimerResult);
 #include "strv.h"
 
 static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_result, timer_result, TimerResult);

diff --git a/src/core/dbus-unit.c b/src/core/dbus-unit.c
index fba3f7cc7057d9ff8fda8fd0cf8c46dab81f045f..0ff9a01e1138f8599566146db86083e0fd7a94c3 100644 (file)
--- a/src/core/dbus-unit.c
+++ b/src/core/dbus-unit.c
@@ -24,11 +24,8 @@
 #include "selinux-access.h"
 #include "cgroup-util.h"
 #include "strv.h"
 #include "selinux-access.h"
 #include "cgroup-util.h"
 #include "strv.h"

-#include "path-util.h"
-#include "fileio.h"

 #include "bus-common-errors.h"
 #include "dbus.h"
 #include "bus-common-errors.h"
 #include "dbus.h"

-#include "dbus-manager.h"

 #include "dbus-unit.h"
 
 static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_load_state, unit_load_state, UnitLoadState);
 #include "dbus-unit.h"
 
 static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_load_state, unit_load_state, UnitLoadState);

diff --git a/src/core/dbus.c b/src/core/dbus.c
index e7cf93dc6c3eecb6fc0b666b7a24cbb3d8b50b58..5dcb0d1c985e9cff54135b02a3b52fdf8ddd65a8 100644 (file)
--- a/src/core/dbus.c
+++ b/src/core/dbus.c
@@ -20,7 +20,6 @@
 ***/
 
 #include <sys/epoll.h>
 ***/
 
 #include <sys/epoll.h>

-#include <sys/timerfd.h>

 #include <errno.h>
 #include <unistd.h>
 
 #include <errno.h>
 #include <unistd.h>
 

diff --git a/src/core/device.c b/src/core/device.c
index d3deac393649667a89a676d2f1c570bfa45f34b2..2d983cc565f382cf37cb760583744feb60d18fc4 100644 (file)
--- a/src/core/device.c
+++ b/src/core/device.c
@@ -23,11 +23,9 @@
 #include <sys/epoll.h>
 #include <libudev.h>
 
 #include <sys/epoll.h>
 #include <libudev.h>
 

-#include "strv.h"

 #include "log.h"
 #include "unit-name.h"
 #include "dbus-device.h"
 #include "log.h"
 #include "unit-name.h"
 #include "dbus-device.h"

-#include "def.h"

 #include "path-util.h"
 #include "udev-util.h"
 #include "unit.h"
 #include "path-util.h"
 #include "udev-util.h"
 #include "unit.h"

diff --git a/src/core/device.h b/src/core/device.h
index bb7ae0783499cfcb60ce8e908c279acfeef2773d..906508530d285f59143089613354d5900aa08be1 100644 (file)
--- a/src/core/device.h
+++ b/src/core/device.h
@@ -23,7 +23,6 @@
 
 typedef struct Device Device;
 
 
 typedef struct Device Device;
 

-#include "unit.h"

 
 /* We simply watch devices, we cannot plug/unplug them. That
  * simplifies the state engine greatly */
 
 /* We simply watch devices, we cannot plug/unplug them. That
  * simplifies the state engine greatly */

diff --git a/src/core/execute.c b/src/core/execute.c
index 1815e3de2d371645d204569d2bdffd77dc3ef6e6..39ec5adbbe44f2783691945a7816c0dd0f393424 100644 (file)
--- a/src/core/execute.c
+++ b/src/core/execute.c
@@ -19,8 +19,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include <assert.h>
-#include <dirent.h>

 #include <errno.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <unistd.h>


@@ -29,14 +27,8 @@
 #include <sys/socket.h>
 #include <sys/un.h>
 #include <sys/prctl.h>
 #include <sys/socket.h>
 #include <sys/un.h>
 #include <sys/prctl.h>

-#include <linux/sched.h>
-#include <sys/types.h>

 #include <sys/stat.h>
 #include <grp.h>
 #include <sys/stat.h>
 #include <grp.h>

-#include <pwd.h>
-#include <sys/mount.h>
-#include <linux/fs.h>
-#include <linux/oom.h>

 #include <poll.h>
 #include <glob.h>
 #include <sys/personality.h>
 #include <poll.h>
 #include <glob.h>
 #include <sys/personality.h>


@@ -80,12 +72,14 @@
 #include "errno-list.h"
 #include "af-list.h"
 #include "mkdir.h"
 #include "errno-list.h"
 #include "af-list.h"
 #include "mkdir.h"

-#include "apparmor-util.h"

 #include "smack-util.h"
 #include "bus-endpoint.h"
 #include "smack-util.h"
 #include "bus-endpoint.h"

-#include "label.h"

 #include "cap-list.h"
 
 #include "cap-list.h"
 

+#ifdef HAVE_APPARMOR
+#include "apparmor-util.h"
+#endif
+

 #ifdef HAVE_SECCOMP
 #include "seccomp-util.h"
 #endif
 #ifdef HAVE_SECCOMP
 #include "seccomp-util.h"
 #endif

diff --git a/src/core/execute.h b/src/core/execute.h
index 6e0c9faa75cb3dc2bdb225f6b4a7ab330dcf1456..1a43ac77b0212e8fdc51f59331ecc3b66b03b17f 100644 (file)
--- a/src/core/execute.h
+++ b/src/core/execute.h
@@ -27,17 +27,12 @@ typedef struct ExecContext ExecContext;
 typedef struct ExecRuntime ExecRuntime;
 typedef struct ExecParameters ExecParameters;
 
 typedef struct ExecRuntime ExecRuntime;
 typedef struct ExecParameters ExecParameters;
 

-#include <linux/types.h>
-#include <sys/time.h>
-#include <sys/resource.h>

 #include <sys/capability.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <sched.h>
 
 #include "list.h"
 #include <sys/capability.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <sched.h>
 
 #include "list.h"

-#include "util.h"
-#include "set.h"

 #include "fdset.h"
 #include "missing.h"
 #include "namespace.h"
 #include "fdset.h"
 #include "missing.h"
 #include "namespace.h"

diff --git a/src/core/failure-action.c b/src/core/failure-action.c
index ce522a4e4fee33244a80004c8b333f39f1da1594..ffeb5cd31b595d7f0e2644ebf8af2583b494ab3e 100644 (file)
--- a/src/core/failure-action.c
+++ b/src/core/failure-action.c
@@ -22,7 +22,6 @@
 
 #include <sys/reboot.h>
 #include <linux/reboot.h>
 
 #include <sys/reboot.h>
 #include <linux/reboot.h>

-#include <sys/syscall.h>

 
 #include "bus-util.h"
 #include "bus-error.h"
 
 #include "bus-util.h"
 #include "bus-error.h"

diff --git a/src/core/hostname-setup.c b/src/core/hostname-setup.c
index 6664e8952c2b30de430f4b241d0d307f78e30a87..03b0ce3b4dad805d94b2cb7de2afd3c9bb549e89 100644 (file)
--- a/src/core/hostname-setup.c
+++ b/src/core/hostname-setup.c
@@ -19,10 +19,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include <unistd.h>

 #include <stdio.h>
 #include <errno.h>
 #include <stdio.h>
 #include <errno.h>

-#include <string.h>

 #include <stdlib.h>
 
 #include "hostname-setup.h"
 #include <stdlib.h>
 
 #include "hostname-setup.h"

diff --git a/src/core/ima-setup.c b/src/core/ima-setup.c
index 0e0d16a7c98c6d2a16e0d61281be7a437bb86257..7721b3ecaf66fc56066550708b27236e581c87b9 100644 (file)
--- a/src/core/ima-setup.c
+++ b/src/core/ima-setup.c
@@ -22,10 +22,7 @@
 ***/
 
 #include <unistd.h>
 ***/
 
 #include <unistd.h>

-#include <stdio.h>

 #include <errno.h>
 #include <errno.h>

-#include <sys/types.h>
-#include <sys/stat.h>

 #include <fcntl.h>
 
 #include "ima-setup.h"
 #include <fcntl.h>
 
 #include "ima-setup.h"

diff --git a/src/core/job.c b/src/core/job.c
index 4740ff18cb54c165a9fc7fba45c483f27032476d..db7ebae6b174dc75660a38167639d9873170602f 100644 (file)
--- a/src/core/job.c
+++ b/src/core/job.c
@@ -19,10 +19,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include <assert.h>

 #include <errno.h>
 #include <errno.h>

-#include <sys/timerfd.h>
-#include <sys/epoll.h>

 
 #include "sd-id128.h"
 #include "sd-messages.h"
 
 #include "sd-id128.h"
 #include "sd-messages.h"


@@ -30,8 +27,6 @@
 #include "unit.h"
 #include "macro.h"
 #include "strv.h"
 #include "unit.h"
 #include "macro.h"
 #include "strv.h"

-#include "load-fragment.h"
-#include "load-dropin.h"

 #include "log.h"
 #include "dbus-job.h"
 #include "special.h"
 #include "log.h"
 #include "dbus-job.h"
 #include "special.h"

diff --git a/src/core/job.h b/src/core/job.h
index d967b68a3fd84cbf16c7d4ff7544ddb6965f508e..9119e4834a1ed2203d2e2191b4e724972d884a60 100644 (file)
--- a/src/core/job.h
+++ b/src/core/job.h
@@ -22,8 +22,6 @@
 ***/
 
 #include <stdbool.h>
 ***/
 
 #include <stdbool.h>

-#include <inttypes.h>
-#include <errno.h>

 
 typedef struct Job Job;
 typedef struct JobDependency JobDependency;
 
 typedef struct Job Job;
 typedef struct JobDependency JobDependency;


@@ -108,9 +106,7 @@ enum JobResult {
 };
 
 #include "sd-event.h"
 };
 
 #include "sd-event.h"

-#include "manager.h"

 #include "unit.h"
 #include "unit.h"

-#include "hashmap.h"

 #include "list.h"
 
 struct JobDependency {
 #include "list.h"
 
 struct JobDependency {

diff --git a/src/core/kill.c b/src/core/kill.c
index 4271346511ecfa8d010a51e508f4e71323494da4..60a510eae6241af2e5d25a85bb5ffdb551e94a2d 100644 (file)
--- a/src/core/kill.c
+++ b/src/core/kill.c
@@ -19,7 +19,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include <string.h>

 
 #include "kill.h"
 #include "util.h"
 
 #include "kill.h"
 #include "util.h"

diff --git a/src/core/killall.c b/src/core/killall.c
index 5a50ae6f045e5d024ec8434ee047a689abc97e03..c6f1ddfec867fbb80a621e18faf6a7a4faf0cf81 100644 (file)
--- a/src/core/killall.c
+++ b/src/core/killall.c
@@ -25,7 +25,6 @@
 #include <unistd.h>
 
 #include "util.h"
 #include <unistd.h>
 
 #include "util.h"

-#include "def.h"

 #include "killall.h"
 #include "set.h"
 
 #include "killall.h"
 #include "set.h"
 

diff --git a/src/core/kmod-setup.c b/src/core/kmod-setup.c
index c0a05b97aac87b7bf74fed1993d2517b82fe40bf..efbdf31688cd56d8dd52abdcd899c39b4eb898e4 100644 (file)
--- a/src/core/kmod-setup.c
+++ b/src/core/kmod-setup.c
@@ -19,17 +19,14 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include <sys/wait.h>

 #include <unistd.h>
 #include <string.h>
 #include <unistd.h>
 #include <string.h>

-#include <errno.h>

 
 #ifdef HAVE_KMOD
 #include <libkmod.h>
 #endif
 
 #include "macro.h"
 
 #ifdef HAVE_KMOD
 #include <libkmod.h>
 #endif
 
 #include "macro.h"

-#include "execute.h"

 #include "capability.h"
 #include "kmod-setup.h"
 
 #include "capability.h"
 #include "kmod-setup.h"
 

diff --git a/src/core/load-dropin.c b/src/core/load-dropin.c
index 8be190040e22666e0ae5cb3ac614036b55f92ee0..11566af51b62241ab04e37ec3eee3055232a388f 100644 (file)
--- a/src/core/load-dropin.c
+++ b/src/core/load-dropin.c
@@ -19,8 +19,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include <dirent.h>
-#include <errno.h>

 
 #include "unit.h"
 #include "load-dropin.h"
 
 #include "unit.h"
 #include "load-dropin.h"


@@ -29,7 +27,6 @@
 #include "unit-name.h"
 #include "conf-parser.h"
 #include "load-fragment.h"
 #include "unit-name.h"
 #include "conf-parser.h"
 #include "load-fragment.h"

-#include "conf-files.h"

 
 static int add_dependency_consumer(
                 UnitDependency dependency,
 
 static int add_dependency_consumer(
                 UnitDependency dependency,

diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c
index 90bf5634c8cea21f5fad15236e9a4932f8297dfb..6d0192fc725d70c9c1edcc84c346b699aeaf658f 100644 (file)
--- a/src/core/load-fragment.c
+++ b/src/core/load-fragment.c
@@ -21,26 +21,18 @@
 ***/
 
 #include <linux/oom.h>
 ***/
 
 #include <linux/oom.h>

-#include <assert.h>

 #include <errno.h>
 #include <string.h>
 #include <errno.h>
 #include <string.h>

-#include <unistd.h>

 #include <fcntl.h>
 #include <sched.h>
 #include <fcntl.h>
 #include <sched.h>

-#include <sys/prctl.h>
-#include <sys/mount.h>

 #include <linux/fs.h>
 #include <sys/stat.h>
 #include <linux/fs.h>
 #include <sys/stat.h>

-#include <sys/time.h>

 #include <sys/resource.h>
 #include <sys/resource.h>

-#include <sys/types.h>
-#include <grp.h>

 
 #ifdef HAVE_SECCOMP
 #include <seccomp.h>
 #endif
 
 
 #ifdef HAVE_SECCOMP
 #include <seccomp.h>
 #endif
 

-#include "sd-messages.h"

 #include "unit.h"
 #include "strv.h"
 #include "conf-parser.h"
 #include "unit.h"
 #include "strv.h"
 #include "conf-parser.h"

diff --git a/src/core/locale-setup.c b/src/core/locale-setup.c
index e993c573219c17888bb522e8f37359c397066b2c..108072ca9fb45b04aca2a2133ccb47ad1de3bc9a 100644 (file)
--- a/src/core/locale-setup.c
+++ b/src/core/locale-setup.c
@@ -19,13 +19,11 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include <string.h>

 #include <stdlib.h>
 #include <errno.h>
 
 #include "locale-setup.h"
 #include "util.h"
 #include <stdlib.h>
 #include <errno.h>
 
 #include "locale-setup.h"
 #include "util.h"

-#include "macro.h"

 #include "virt.h"
 #include "fileio.h"
 #include "strv.h"
 #include "virt.h"
 #include "fileio.h"
 #include "strv.h"

diff --git a/src/core/loopback-setup.c b/src/core/loopback-setup.c
index 67ce160c1982f9cb7084cc3e9b7898cc6d4c7c64..63b15c12009e345ee9343151841ca2a2dd1c8f22 100644 (file)
--- a/src/core/loopback-setup.c
+++ b/src/core/loopback-setup.c
@@ -19,18 +19,10 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include <sys/socket.h>

 #include <net/if.h>
 #include <net/if.h>

-#include <asm/types.h>
-#include <netinet/in.h>
-#include <string.h>

 #include <stdlib.h>
 #include <stdlib.h>

-#include <unistd.h>

 
 #include "sd-rtnl.h"
 
 #include "sd-rtnl.h"

-#include "util.h"
-#include "macro.h"
-#include "socket-util.h"

 #include "rtnl-util.h"
 #include "missing.h"
 #include "loopback-setup.h"
 #include "rtnl-util.h"
 #include "missing.h"
 #include "loopback-setup.h"

diff --git a/src/core/machine-id-setup.c b/src/core/machine-id-setup.c
index d00a53246f6a3ab025995b53ede9b076daec8d24..063f705ede8477f533204ca4cf3fdd2273fc491e 100644 (file)
--- a/src/core/machine-id-setup.c
+++ b/src/core/machine-id-setup.c
@@ -23,7 +23,6 @@
 #include <stdio.h>
 #include <errno.h>
 #include <string.h>
 #include <stdio.h>
 #include <errno.h>
 #include <string.h>

-#include <stdlib.h>

 #include <fcntl.h>
 #include <sys/mount.h>
 
 #include <fcntl.h>
 #include <sys/mount.h>
 

diff --git a/src/core/main.c b/src/core/main.c
index 08f46f569a56c26bea2a59883776973bbbd82881..d68e73769a69322b9554cffed01c79d27c16f533 100644 (file)
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -23,11 +23,9 @@
 #include <errno.h>
 #include <string.h>
 #include <unistd.h>
 #include <errno.h>
 #include <string.h>
 #include <unistd.h>

-#include <sys/types.h>

 #include <sys/stat.h>
 #include <getopt.h>
 #include <signal.h>
 #include <sys/stat.h>
 #include <getopt.h>
 #include <signal.h>

-#include <sys/wait.h>

 #include <fcntl.h>
 #include <sys/prctl.h>
 #include <sys/mount.h>
 #include <fcntl.h>
 #include <sys/prctl.h>
 #include <sys/mount.h>


@@ -40,14 +38,12 @@
 #endif
 
 #include "sd-daemon.h"
 #endif
 
 #include "sd-daemon.h"

-#include "sd-messages.h"

 #include "sd-bus.h"
 #include "log.h"
 #include "fdset.h"
 #include "special.h"
 #include "conf-parser.h"
 #include "missing.h"
 #include "sd-bus.h"
 #include "log.h"
 #include "fdset.h"
 #include "special.h"
 #include "conf-parser.h"
 #include "missing.h"

-#include "label.h"

 #include "pager.h"
 #include "build.h"
 #include "strv.h"
 #include "pager.h"
 #include "build.h"
 #include "strv.h"


@@ -55,7 +51,6 @@
 #include "virt.h"
 #include "architecture.h"
 #include "watchdog.h"
 #include "virt.h"
 #include "architecture.h"
 #include "watchdog.h"

-#include "path-util.h"

 #include "switch-root.h"
 #include "capability.h"
 #include "killall.h"
 #include "switch-root.h"
 #include "capability.h"
 #include "killall.h"

diff --git a/src/core/manager.c b/src/core/manager.c
index 4775219e4a514649164063f1f145d3883d998354..79a9d549542b970157197cd50a31974baa60d918 100644 (file)
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -19,7 +19,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include <assert.h>

 #include <errno.h>
 #include <string.h>
 #include <signal.h>
 #include <errno.h>
 #include <string.h>
 #include <signal.h>


@@ -27,14 +26,10 @@
 #include <unistd.h>
 #include <sys/inotify.h>
 #include <sys/epoll.h>
 #include <unistd.h>
 #include <sys/inotify.h>
 #include <sys/epoll.h>

-#include <poll.h>

 #include <sys/reboot.h>
 #include <sys/ioctl.h>
 #include <linux/kd.h>
 #include <sys/reboot.h>
 #include <sys/ioctl.h>
 #include <linux/kd.h>

-#include <termios.h>

 #include <fcntl.h>
 #include <fcntl.h>

-#include <sys/types.h>
-#include <sys/stat.h>

 #include <dirent.h>
 #include <sys/timerfd.h>
 
 #include <dirent.h>
 #include <sys/timerfd.h>
 


@@ -43,7 +38,6 @@
 #endif
 
 #include "sd-daemon.h"
 #endif
 
 #include "sd-daemon.h"

-#include "sd-id128.h"

 #include "sd-messages.h"
 
 #include "manager.h"
 #include "sd-messages.h"
 
 #include "manager.h"


@@ -56,7 +50,6 @@
 #include "mkdir.h"
 #include "ratelimit.h"
 #include "locale-setup.h"
 #include "mkdir.h"
 #include "ratelimit.h"
 #include "locale-setup.h"

-#include "mount-setup.h"

 #include "unit-name.h"
 #include "missing.h"
 #include "path-lookup.h"
 #include "unit-name.h"
 #include "missing.h"
 #include "path-lookup.h"


@@ -64,7 +57,6 @@
 #include "exit-status.h"
 #include "virt.h"
 #include "watchdog.h"
 #include "exit-status.h"
 #include "virt.h"
 #include "watchdog.h"

-#include "cgroup-util.h"

 #include "path-util.h"
 #include "audit-fd.h"
 #include "boot-timestamps.h"
 #include "path-util.h"
 #include "audit-fd.h"
 #include "boot-timestamps.h"

diff --git a/src/core/manager.h b/src/core/manager.h
index d3971f16845225fd860fac96a1e2f5df1c91fc63..4e33ba63f4dac77fbb36f558a895ad5fe438e3f7 100644 (file)
--- a/src/core/manager.h
+++ b/src/core/manager.h
@@ -22,7 +22,6 @@
 ***/
 
 #include <stdbool.h>
 ***/
 
 #include <stdbool.h>

-#include <inttypes.h>

 #include <stdio.h>
 
 #include "sd-bus.h"
 #include <stdio.h>
 
 #include "sd-bus.h"


@@ -31,7 +30,6 @@
 #include "cgroup-util.h"
 #include "hashmap.h"
 #include "list.h"
 #include "cgroup-util.h"
 #include "hashmap.h"
 #include "list.h"

-#include "set.h"

 #include "ratelimit.h"
 
 /* Enforce upper limit how many names we allow */
 #include "ratelimit.h"
 
 /* Enforce upper limit how many names we allow */


@@ -70,14 +68,11 @@ typedef enum StatusType {
         STATUS_TYPE_EMERGENCY,
 } StatusType;
 
         STATUS_TYPE_EMERGENCY,
 } StatusType;
 

-#include "unit.h"

 #include "job.h"
 #include "path-lookup.h"
 #include "execute.h"
 #include "unit-name.h"
 #include "job.h"
 #include "path-lookup.h"
 #include "execute.h"
 #include "unit-name.h"

-#include "exit-status.h"

 #include "show-status.h"
 #include "show-status.h"

-#include "failure-action.h"

 
 struct Manager {
         /* Note that the set of units we know of is allowed to be
 
 struct Manager {
         /* Note that the set of units we know of is allowed to be

diff --git a/src/core/mount-setup.c b/src/core/mount-setup.c
index 521545e5ce04f7dc554e5338904b132c2ca360bd..343ff066a97d987622266ec72d9a4849e5964324 100644 (file)
--- a/src/core/mount-setup.c
+++ b/src/core/mount-setup.c
@@ -21,10 +21,7 @@
 
 #include <sys/mount.h>
 #include <errno.h>
 
 #include <sys/mount.h>
 #include <errno.h>

-#include <sys/stat.h>

 #include <stdlib.h>
 #include <stdlib.h>

-#include <string.h>
-#include <assert.h>

 #include <unistd.h>
 #include <ftw.h>
 
 #include <unistd.h>
 #include <ftw.h>
 


@@ -42,7 +39,6 @@
 #include "virt.h"
 #include "efivars.h"
 #include "smack-util.h"
 #include "virt.h"
 #include "efivars.h"
 #include "smack-util.h"

-#include "def.h"

 #include "cgroup-util.h"
 
 typedef enum MountMode {
 #include "cgroup-util.h"
 
 typedef enum MountMode {

diff --git a/src/core/mount.c b/src/core/mount.c
index f3977e62de3e7f3479c8ca587a88b7b54b426f13..40037e7866e01d16893e9908c73f2c9252976ffc 100644 (file)
--- a/src/core/mount.c
+++ b/src/core/mount.c
@@ -21,7 +21,6 @@
 
 #include <errno.h>
 #include <stdio.h>
 
 #include <errno.h>
 #include <stdio.h>

-#include <mntent.h>

 #include <sys/epoll.h>
 #include <signal.h>
 #include <libmount.h>
 #include <sys/epoll.h>
 #include <signal.h>
 #include <libmount.h>


@@ -30,8 +29,6 @@
 #include "manager.h"
 #include "unit.h"
 #include "mount.h"
 #include "manager.h"
 #include "unit.h"
 #include "mount.h"

-#include "load-fragment.h"
-#include "load-dropin.h"

 #include "log.h"
 #include "sd-messages.h"
 #include "strv.h"
 #include "log.h"
 #include "sd-messages.h"
 #include "strv.h"


@@ -41,9 +38,7 @@
 #include "unit-name.h"
 #include "dbus-mount.h"
 #include "special.h"
 #include "unit-name.h"
 #include "dbus-mount.h"
 #include "special.h"

-#include "bus-common-errors.h"

 #include "exit-status.h"
 #include "exit-status.h"

-#include "def.h"

 #include "fstab-util.h"
 
 #define RETRY_UMOUNT_MAX 32
 #include "fstab-util.h"
 
 #define RETRY_UMOUNT_MAX 32

diff --git a/src/core/mount.h b/src/core/mount.h
index d6987e6fa199b34832e53a9ab04775dab679f6ec..76771ab7a92fe1542f83b06044a726e2f20bf159 100644 (file)
--- a/src/core/mount.h
+++ b/src/core/mount.h
@@ -23,10 +23,8 @@
 
 typedef struct Mount Mount;
 
 
 typedef struct Mount Mount;
 

-#include "unit.h"

 #include "kill.h"
 #include "execute.h"
 #include "kill.h"
 #include "execute.h"

-#include "cgroup.h"

 
 typedef enum MountState {
         MOUNT_DEAD,
 
 typedef enum MountState {
         MOUNT_DEAD,

diff --git a/src/core/namespace.c b/src/core/namespace.c
index 4fecd32363a6baaf9d302e839ee30c157b78691a..6a6d119314d4c07b9e3c8f93c916edb78146b519 100644 (file)
--- a/src/core/namespace.c
+++ b/src/core/namespace.c
@@ -25,23 +25,15 @@
 #include <stdio.h>
 #include <unistd.h>
 #include <sys/stat.h>
 #include <stdio.h>
 #include <unistd.h>
 #include <sys/stat.h>

-#include <sys/types.h>

 #include <sched.h>
 #include <sched.h>

-#include <sys/syscall.h>
-#include <limits.h>

 #include <linux/fs.h>
 #include <linux/fs.h>

-#include <sys/file.h>

 
 #include "strv.h"
 #include "util.h"
 #include "path-util.h"
 #include "missing.h"
 
 #include "strv.h"
 #include "util.h"
 #include "path-util.h"
 #include "missing.h"

-#include "execute.h"

 #include "loopback-setup.h"
 #include "loopback-setup.h"

-#include "mkdir.h"

 #include "dev-setup.h"
 #include "dev-setup.h"

-#include "def.h"
-#include "label.h"

 #include "selinux-util.h"
 #include "namespace.h"
 
 #include "selinux-util.h"
 #include "namespace.h"
 

diff --git a/src/core/path.c b/src/core/path.c
index e5ea79fec7c9bf074c781a8e2fc3a55ebf843de9..fbb695d87ff8283897a3f24c71b9f5e060facc71 100644 (file)
--- a/src/core/path.c
+++ b/src/core/path.c
@@ -21,7 +21,6 @@
 
 #include <sys/inotify.h>
 #include <sys/epoll.h>
 
 #include <sys/inotify.h>
 #include <sys/epoll.h>

-#include <sys/ioctl.h>

 #include <errno.h>
 #include <unistd.h>
 
 #include <errno.h>
 #include <unistd.h>
 


@@ -31,7 +30,6 @@
 #include "mkdir.h"
 #include "dbus-path.h"
 #include "special.h"
 #include "mkdir.h"
 #include "dbus-path.h"
 #include "special.h"

-#include "path-util.h"

 #include "macro.h"
 #include "bus-util.h"
 #include "bus-error.h"
 #include "macro.h"
 #include "bus-util.h"
 #include "bus-error.h"

diff --git a/src/core/path.h b/src/core/path.h
index 0d36aab960f694bc2717a9ae0aac791f3c52bd48..dec39333e4c9e61efb88e87628e6409f3f7f7295 100644 (file)
--- a/src/core/path.h
+++ b/src/core/path.h
@@ -25,7 +25,6 @@ typedef struct Path Path;
 typedef struct PathSpec PathSpec;
 
 #include "unit.h"
 typedef struct PathSpec PathSpec;
 
 #include "unit.h"

-#include "mount.h"

 
 typedef enum PathState {
         PATH_DEAD,
 
 typedef enum PathState {
         PATH_DEAD,

diff --git a/src/core/scope.c b/src/core/scope.c
index b41db7872c4ef5a2811aacc7ff2ffe2249f79911..a0e473253349e252a169dd60f24b5117145a96c0 100644 (file)
--- a/src/core/scope.c
+++ b/src/core/scope.c
@@ -20,12 +20,10 @@
 ***/
 
 #include <errno.h>
 ***/
 
 #include <errno.h>

-#include <signal.h>

 #include <unistd.h>
 
 #include "unit.h"
 #include "scope.h"
 #include <unistd.h>
 
 #include "unit.h"
 #include "scope.h"

-#include "load-fragment.h"

 #include "log.h"
 #include "dbus-scope.h"
 #include "special.h"
 #include "log.h"
 #include "dbus-scope.h"
 #include "special.h"

diff --git a/src/core/scope.h b/src/core/scope.h
index 6c591264226c6bf2448b2eca6bec1617552f2c05..4452fe2c94a1b6da342af35197fdb262483dec35 100644 (file)
--- a/src/core/scope.h
+++ b/src/core/scope.h
@@ -23,7 +23,6 @@
 
 typedef struct Scope Scope;
 
 
 typedef struct Scope Scope;
 

-#include "unit.h"

 #include "kill.h"
 
 typedef enum ScopeState {
 #include "kill.h"
 
 typedef enum ScopeState {

diff --git a/src/core/selinux-access.c b/src/core/selinux-access.c
index 18888747f2c413eb302ca158dd79560cedc50980..a8c9a4b888f6e8a268e089d053741f0cf133b3a2 100644 (file)
--- a/src/core/selinux-access.c
+++ b/src/core/selinux-access.c
@@ -24,12 +24,9 @@
 #ifdef HAVE_SELINUX
 
 #include <stdio.h>
 #ifdef HAVE_SELINUX
 
 #include <stdio.h>

-#include <string.h>

 #include <errno.h>
 #include <errno.h>

-#include <limits.h>

 #include <selinux/selinux.h>
 #include <selinux/avc.h>
 #include <selinux/selinux.h>
 #include <selinux/avc.h>

-#include <sys/socket.h>

 #ifdef HAVE_AUDIT
 #include <libaudit.h>
 #endif
 #ifdef HAVE_AUDIT
 #include <libaudit.h>
 #endif


@@ -38,7 +35,6 @@
 #include "bus-util.h"
 #include "util.h"
 #include "log.h"
 #include "bus-util.h"
 #include "util.h"
 #include "log.h"

-#include "audit.h"

 #include "selinux-util.h"
 #include "audit-fd.h"
 #include "strv.h"
 #include "selinux-util.h"
 #include "audit-fd.h"
 #include "strv.h"

diff --git a/src/core/selinux-access.h b/src/core/selinux-access.h
index dd1e8bb9d033b4ccbd94ee82e666ac43a91a473f..b5758e2e42ae1e6b0bacc8fedfba46edcdf0e1f3 100644 (file)
--- a/src/core/selinux-access.h
+++ b/src/core/selinux-access.h
@@ -22,7 +22,6 @@
 ***/
 
 #include "sd-bus.h"
 ***/
 
 #include "sd-bus.h"

-#include "bus-error.h"

 #include "bus-util.h"
 #include "manager.h"
 
 #include "bus-util.h"
 #include "manager.h"
 

diff --git a/src/core/selinux-setup.c b/src/core/selinux-setup.c
index fba915d7da012b4c963998fa6407f78ff2bee656..a4678500e6b9c414866fa9c5d1f46efe02cdce42 100644 (file)
--- a/src/core/selinux-setup.c
+++ b/src/core/selinux-setup.c
@@ -22,8 +22,6 @@
 #include <unistd.h>
 #include <stdio.h>
 #include <errno.h>
 #include <unistd.h>
 #include <stdio.h>
 #include <errno.h>

-#include <string.h>
-#include <stdlib.h>

 
 #ifdef HAVE_SELINUX
 #include <selinux/selinux.h>
 
 #ifdef HAVE_SELINUX
 #include <selinux/selinux.h>


@@ -31,8 +29,6 @@
 
 #include "selinux-setup.h"
 #include "selinux-util.h"
 
 #include "selinux-setup.h"
 #include "selinux-util.h"

-#include "label.h"
-#include "mount-setup.h"

 #include "macro.h"
 #include "util.h"
 #include "log.h"
 #include "macro.h"
 #include "util.h"
 #include "log.h"

diff --git a/src/core/service.c b/src/core/service.c
index 15e29be14910ee43cdb2a2f0daff3b1c42e5935c..c7b35050bd2f61d9b8181559f9270c0dda830100 100644 (file)
--- a/src/core/service.c
+++ b/src/core/service.c
@@ -21,7 +21,6 @@
 
 #include <errno.h>
 #include <signal.h>
 
 #include <errno.h>
 #include <signal.h>

-#include <dirent.h>

 #include <unistd.h>
 
 #include "async.h"
 #include <unistd.h>
 
 #include "async.h"

diff --git a/src/core/service.h b/src/core/service.h
index dfeee6a68c6d96a15b42c9a9223c0a64e72e2dfb..fe5afef46b16a3c02f975e8376a4cbd70420b108 100644 (file)
--- a/src/core/service.h
+++ b/src/core/service.h
@@ -24,12 +24,10 @@
 typedef struct Service Service;
 typedef struct ServiceFDStore ServiceFDStore;
 
 typedef struct Service Service;
 typedef struct ServiceFDStore ServiceFDStore;
 

-#include "unit.h"

 #include "path.h"
 #include "ratelimit.h"
 #include "kill.h"
 #include "exit-status.h"
 #include "path.h"
 #include "ratelimit.h"
 #include "kill.h"
 #include "exit-status.h"

-#include "failure-action.h"

 
 typedef enum ServiceState {
         SERVICE_DEAD,
 
 typedef enum ServiceState {
         SERVICE_DEAD,

diff --git a/src/core/shutdown.c b/src/core/shutdown.c
index 71f001ac13f7118f326048c4bd5e003336d44818..70a461e38c79bc08097dc79ad4882c4b714f3c0c 100644 (file)
--- a/src/core/shutdown.c
+++ b/src/core/shutdown.c
@@ -20,21 +20,15 @@
 ***/
 
 #include <sys/mman.h>
 ***/
 
 #include <sys/mman.h>

-#include <sys/types.h>

 #include <sys/reboot.h>
 #include <linux/reboot.h>
 #include <sys/reboot.h>
 #include <linux/reboot.h>

-#include <sys/wait.h>

 #include <sys/stat.h>
 #include <sys/mount.h>
 #include <sys/stat.h>
 #include <sys/mount.h>

-#include <sys/syscall.h>
-#include <fcntl.h>
-#include <dirent.h>

 #include <errno.h>
 #include <unistd.h>
 #include <signal.h>
 #include <stdbool.h>
 #include <stdlib.h>
 #include <errno.h>
 #include <unistd.h>
 #include <signal.h>
 #include <stdbool.h>
 #include <stdlib.h>

-#include <string.h>

 #include <getopt.h>
 
 #include "missing.h"
 #include <getopt.h>
 
 #include "missing.h"


@@ -42,14 +36,12 @@
 #include "fileio.h"
 #include "umount.h"
 #include "util.h"
 #include "fileio.h"
 #include "umount.h"
 #include "util.h"

-#include "mkdir.h"

 #include "virt.h"
 #include "watchdog.h"
 #include "killall.h"
 #include "cgroup-util.h"
 #include "def.h"
 #include "switch-root.h"
 #include "virt.h"
 #include "watchdog.h"
 #include "killall.h"
 #include "cgroup-util.h"
 #include "def.h"
 #include "switch-root.h"

-#include "strv.h"

 
 #define FINALIZE_ATTEMPTS 50
 
 
 #define FINALIZE_ATTEMPTS 50
 

diff --git a/src/core/slice.c b/src/core/slice.c
index ae9819d015fefa8bbd1eec53e1cfd20da914d20f..4d2eaf7ed64b8729cb1da52a475db8c40be38f99 100644 (file)
--- a/src/core/slice.c
+++ b/src/core/slice.c
@@ -20,12 +20,9 @@
 ***/
 
 #include <errno.h>
 ***/
 
 #include <errno.h>

-#include <signal.h>
-#include <unistd.h>

 
 #include "unit.h"
 #include "slice.h"
 
 #include "unit.h"
 #include "slice.h"

-#include "load-fragment.h"

 #include "log.h"
 #include "dbus-slice.h"
 #include "special.h"
 #include "log.h"
 #include "dbus-slice.h"
 #include "special.h"

diff --git a/src/core/slice.h b/src/core/slice.h
index ad0c63902b0ffd835420c6d15bc124015d0f8e09..ac648e56f82d226f6683ee928ef64686f8904103 100644 (file)
--- a/src/core/slice.h
+++ b/src/core/slice.h
@@ -23,7 +23,6 @@
 
 typedef struct Slice Slice;
 
 
 typedef struct Slice Slice;
 

-#include "unit.h"

 
 typedef enum SliceState {
         SLICE_DEAD,
 
 typedef enum SliceState {
         SLICE_DEAD,

diff --git a/src/core/smack-setup.c b/src/core/smack-setup.c
index 59f6832bc21feae660a365f8fd9c0907d56683dd..ff2a02004d78307919a1cfc7092384cfd8e6b7f6 100644 (file)
--- a/src/core/smack-setup.c
+++ b/src/core/smack-setup.c
@@ -24,21 +24,15 @@
 #include <stdio.h>
 #include <errno.h>
 #include <string.h>
 #include <stdio.h>
 #include <errno.h>
 #include <string.h>

-#include <unistd.h>

 #include <stdlib.h>
 #include <stdlib.h>

-#include <sys/vfs.h>

 #include <fcntl.h>
 #include <fcntl.h>

-#include <sys/types.h>

 #include <dirent.h>
 #include <dirent.h>

-#include <sys/mount.h>
-#include <stdint.h>

 
 #include "macro.h"
 #include "smack-setup.h"
 #include "util.h"
 #include "fileio.h"
 #include "log.h"
 
 #include "macro.h"
 #include "smack-setup.h"
 #include "util.h"
 #include "fileio.h"
 #include "log.h"

-#include "label.h"

 
 #define SMACK_CONFIG "/etc/smack/accesses.d/"
 #define CIPSO_CONFIG "/etc/smack/cipso.d/"
 
 #define SMACK_CONFIG "/etc/smack/accesses.d/"
 #define CIPSO_CONFIG "/etc/smack/cipso.d/"

diff --git a/src/core/snapshot.h b/src/core/snapshot.h
index e6dc661060664d859bdf22683b4d82ffbfc3ab0a..f2451b11934d477215946b61a31c11ed53133964 100644 (file)
--- a/src/core/snapshot.h
+++ b/src/core/snapshot.h
@@ -23,7 +23,6 @@
 
 typedef struct Snapshot Snapshot;
 
 
 typedef struct Snapshot Snapshot;
 

-#include "unit.h"

 
 typedef enum SnapshotState {
         SNAPSHOT_DEAD,
 
 typedef enum SnapshotState {
         SNAPSHOT_DEAD,

diff --git a/src/core/socket.c b/src/core/socket.c
index 88aae4815b30da05723d05c91a49e961d0706bfa..7d052f2ef97808ae2d8e4e1b6757f64207860788 100644 (file)
--- a/src/core/socket.c
+++ b/src/core/socket.c
@@ -19,7 +19,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include <sys/types.h>

 #include <sys/stat.h>
 #include <unistd.h>
 #include <errno.h>
 #include <sys/stat.h>
 #include <unistd.h>
 #include <errno.h>


@@ -29,12 +28,9 @@
 #include <arpa/inet.h>
 #include <netinet/tcp.h>
 #include <mqueue.h>
 #include <arpa/inet.h>
 #include <netinet/tcp.h>
 #include <mqueue.h>

-#include <sys/xattr.h>

 
 #include "sd-event.h"
 #include "log.h"
 
 #include "sd-event.h"
 #include "log.h"

-#include "load-dropin.h"
-#include "load-fragment.h"

 #include "strv.h"
 #include "mkdir.h"
 #include "path-util.h"
 #include "strv.h"
 #include "mkdir.h"
 #include "path-util.h"

diff --git a/src/core/socket.h b/src/core/socket.h
index a2e08998c0a730b2248d966c0157ec6bbaca5539..5acf214e1c73ca9202c1c188ec1ab92e85a8591d 100644 (file)
--- a/src/core/socket.h
+++ b/src/core/socket.h
@@ -23,8 +23,6 @@
 
 typedef struct Socket Socket;
 
 
 typedef struct Socket Socket;
 

-#include "manager.h"
-#include "unit.h"

 #include "socket-util.h"
 #include "mount.h"
 #include "service.h"
 #include "socket-util.h"
 #include "mount.h"
 #include "service.h"

diff --git a/src/core/swap.c b/src/core/swap.c
index 6997921fde64abf84ad504322aede2ecfffa45cb..f73a8e6debb2de0657a2e4f60b79a75a38775996 100644 (file)
--- a/src/core/swap.c
+++ b/src/core/swap.c
@@ -20,24 +20,17 @@
 ***/
 
 #include <errno.h>
 ***/
 
 #include <errno.h>

-#include <limits.h>

 #include <unistd.h>
 #include <unistd.h>

-#include <fcntl.h>

 #include <sys/epoll.h>
 #include <sys/stat.h>
 #include <sys/epoll.h>
 #include <sys/stat.h>

-#include <sys/swap.h>

 #include <libudev.h>
 
 #include "unit.h"
 #include "swap.h"
 #include <libudev.h>
 
 #include "unit.h"
 #include "swap.h"

-#include "load-fragment.h"
-#include "load-dropin.h"

 #include "unit-name.h"
 #include "dbus-swap.h"
 #include "special.h"
 #include "unit-name.h"
 #include "dbus-swap.h"
 #include "special.h"

-#include "bus-common-errors.h"

 #include "exit-status.h"
 #include "exit-status.h"

-#include "def.h"

 #include "path-util.h"
 #include "virt.h"
 #include "udev-util.h"
 #include "path-util.h"
 #include "virt.h"
 #include "udev-util.h"

diff --git a/src/core/swap.h b/src/core/swap.h
index 73e64d87a44ced16565fdd5dea48cb2b8df643df..c36c6f2ce9190a80dba838adf2064ffc2f61edd4 100644 (file)
--- a/src/core/swap.h
+++ b/src/core/swap.h
@@ -26,7 +26,6 @@
 
 typedef struct Swap Swap;
 
 
 typedef struct Swap Swap;
 

-#include "unit.h"

 
 typedef enum SwapState {
         SWAP_DEAD,
 
 typedef enum SwapState {
         SWAP_DEAD,

diff --git a/src/core/target.c b/src/core/target.c
index 33fb66bc3fe4800617d521d53bac86c55bde964d..8817ef21c4c61a3daba8d24b717e9a3c19f83406 100644 (file)
--- a/src/core/target.c
+++ b/src/core/target.c
@@ -19,13 +19,9 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include <errno.h>
-#include <signal.h>
-#include <unistd.h>

 
 #include "unit.h"
 #include "target.h"
 
 #include "unit.h"
 #include "target.h"

-#include "load-fragment.h"

 #include "log.h"
 #include "dbus-target.h"
 #include "special.h"
 #include "log.h"
 #include "dbus-target.h"
 #include "special.h"

diff --git a/src/core/target.h b/src/core/target.h
index a5398d9e9828278c9085ececdec6e3217fcc21bc..0a25ef469ac336a949457e1568f1d75a15517649 100644 (file)
--- a/src/core/target.h
+++ b/src/core/target.h
@@ -23,7 +23,6 @@
 
 typedef struct Target Target;
 
 
 typedef struct Target Target;
 

-#include "unit.h"

 
 typedef enum TargetState {
         TARGET_DEAD,
 
 typedef enum TargetState {
         TARGET_DEAD,

diff --git a/src/core/timer.c b/src/core/timer.c
index 45744c7de57f64ac685c8d9d7d5fecac6039bef4..940550194b15e238b2045d3519e2d65ecd2a873a 100644 (file)
--- a/src/core/timer.c
+++ b/src/core/timer.c
@@ -28,7 +28,6 @@
 #include "special.h"
 #include "bus-util.h"
 #include "bus-error.h"
 #include "special.h"
 #include "bus-util.h"
 #include "bus-error.h"

-#include "mkdir.h"

 
 static const UnitActiveState state_translation_table[_TIMER_STATE_MAX] = {
         [TIMER_DEAD] = UNIT_INACTIVE,
 
 static const UnitActiveState state_translation_table[_TIMER_STATE_MAX] = {
         [TIMER_DEAD] = UNIT_INACTIVE,

diff --git a/src/core/timer.h b/src/core/timer.h
index de412a043ec65ceff6c3e7fc9229d00dfa97f5f6..9d919e4d3ea85090f6d7da35a4c079a6cd0d21c5 100644 (file)
--- a/src/core/timer.h
+++ b/src/core/timer.h
@@ -23,7 +23,6 @@
 
 typedef struct Timer Timer;
 
 
 typedef struct Timer Timer;
 

-#include "unit.h"

 #include "calendarspec.h"
 
 typedef enum TimerState {
 #include "calendarspec.h"
 
 typedef enum TimerState {

diff --git a/src/core/transaction.c b/src/core/transaction.c
index b0b3d6bd60e4d4b5c87204e1e0191041a36d1cf1..64c2af5a1c37373da92a6d1f877c9354ae328f8d 100644 (file)
--- a/src/core/transaction.c
+++ b/src/core/transaction.c
@@ -23,7 +23,6 @@
 #include <fcntl.h>
 
 #include "bus-common-errors.h"
 #include <fcntl.h>
 
 #include "bus-common-errors.h"

-#include "bus-util.h"

 #include "bus-error.h"
 #include "transaction.h"
 
 #include "bus-error.h"
 #include "transaction.h"
 

diff --git a/src/core/umount.c b/src/core/umount.c
index dd7df194de7e45a19babec0b36fa36130ee64c02..ceee70fbea6ebe46b1442fc894125275737bf5ec 100644 (file)
--- a/src/core/umount.c
+++ b/src/core/umount.c
@@ -24,7 +24,6 @@
 #include <string.h>
 #include <sys/mount.h>
 #include <sys/swap.h>
 #include <string.h>
 #include <sys/mount.h>
 #include <sys/swap.h>

-#include <unistd.h>

 #include <linux/loop.h>
 #include <linux/dm-ioctl.h>
 
 #include <linux/loop.h>
 #include <linux/dm-ioctl.h>
 

diff --git a/src/core/unit-printf.c b/src/core/unit-printf.c
index 97135db551aa2f1e7cc7f42c99f4562e2ac79a55..7736899a35ae9f0b8e49c232233ea98534d6dd2d 100644 (file)
--- a/src/core/unit-printf.c
+++ b/src/core/unit-printf.c
@@ -19,16 +19,13 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include "sd-id128.h"

 #include "unit.h"
 #include "specifier.h"
 #include "unit.h"
 #include "specifier.h"

-#include "path-util.h"

 #include "strv.h"
 #include "unit-name.h"
 #include "unit-printf.h"
 #include "macro.h"
 #include "cgroup-util.h"
 #include "strv.h"
 #include "unit-name.h"
 #include "unit-printf.h"
 #include "macro.h"
 #include "cgroup-util.h"

-#include "special.h"

 
 static int specifier_prefix_and_instance(char specifier, void *data, void *userdata, char **ret) {
         Unit *u = userdata;
 
 static int specifier_prefix_and_instance(char specifier, void *data, void *userdata, char **ret) {
         Unit *u = userdata;

diff --git a/src/core/unit.c b/src/core/unit.c
index ee8e607c27bf30f300883ebfa25f7973184c1569..ad5348b57bc64b7c262985b699275d360a354031 100644 (file)
--- a/src/core/unit.c
+++ b/src/core/unit.c
@@ -19,12 +19,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include <assert.h>

 #include <errno.h>
 #include <string.h>
 #include <errno.h>
 #include <string.h>

-#include <sys/epoll.h>
-#include <sys/timerfd.h>
-#include <poll.h>

 #include <stdlib.h>
 #include <unistd.h>
 #include <sys/stat.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <sys/stat.h>


@@ -45,12 +41,10 @@
 #include "cgroup-util.h"
 #include "missing.h"
 #include "mkdir.h"
 #include "cgroup-util.h"
 #include "missing.h"
 #include "mkdir.h"

-#include "label.h"

 #include "fileio-label.h"
 #include "bus-common-errors.h"
 #include "dbus.h"
 #include "execute.h"
 #include "fileio-label.h"
 #include "bus-common-errors.h"
 #include "dbus.h"
 #include "execute.h"

-#include "virt.h"

 #include "dropin.h"
 
 const UnitVTable * const unit_vtable[_UNIT_TYPE_MAX] = {
 #include "dropin.h"
 
 const UnitVTable * const unit_vtable[_UNIT_TYPE_MAX] = {

diff --git a/src/core/unit.h b/src/core/unit.h
index 291bc77a7618fec7d45207195065a21970120f0a..b3775d4d897849e25a40aa58712f36271c7042c5 100644 (file)
--- a/src/core/unit.h
+++ b/src/core/unit.h
@@ -31,13 +31,7 @@ typedef enum UnitActiveState UnitActiveState;
 typedef struct UnitRef UnitRef;
 typedef struct UnitStatusMessageFormats UnitStatusMessageFormats;
 
 typedef struct UnitRef UnitRef;
 typedef struct UnitStatusMessageFormats UnitStatusMessageFormats;
 

-#include "sd-event.h"
-#include "set.h"
-#include "util.h"

 #include "list.h"
 #include "list.h"

-#include "socket-util.h"
-#include "execute.h"
-#include "cgroup.h"

 #include "condition.h"
 #include "install.h"
 #include "unit-name.h"
 #include "condition.h"
 #include "install.h"
 #include "unit-name.h"


@@ -76,7 +70,6 @@ static inline bool UNIT_IS_INACTIVE_OR_FAILED(UnitActiveState t) {
         return t == UNIT_INACTIVE || t == UNIT_FAILED;
 }
 
         return t == UNIT_INACTIVE || t == UNIT_FAILED;
 }
 

-#include "manager.h"

 #include "job.h"
 
 struct UnitRef {
 #include "job.h"
 
 struct UnitRef {


@@ -249,13 +242,11 @@ typedef enum UnitSetPropertiesMode {
         UNIT_PERSISTENT = 2,
 } UnitSetPropertiesMode;
 
         UNIT_PERSISTENT = 2,
 } UnitSetPropertiesMode;
 

-#include "service.h"

 #include "socket.h"
 #include "busname.h"
 #include "target.h"
 #include "snapshot.h"
 #include "device.h"
 #include "socket.h"
 #include "busname.h"
 #include "target.h"
 #include "snapshot.h"
 #include "device.h"

-#include "mount.h"

 #include "automount.h"
 #include "swap.h"
 #include "timer.h"
 #include "automount.h"
 #include "swap.h"
 #include "timer.h"

diff --git a/src/cryptsetup/cryptsetup-generator.c b/src/cryptsetup/cryptsetup-generator.c
index 05061c0704fe5593759ea56dbb415bf096a2e2c0..5a0611afbbb4ad7650f1c35d534504c3dd8d87ad 100644 (file)
--- a/src/cryptsetup/cryptsetup-generator.c
+++ b/src/cryptsetup/cryptsetup-generator.c
@@ -20,11 +20,8 @@
 ***/
 
 #include <errno.h>
 ***/
 
 #include <errno.h>

-#include <string.h>
-#include <unistd.h>

 
 #include "dropin.h"
 
 #include "dropin.h"

-#include "fileio.h"

 #include "generator.h"
 #include "hashmap.h"
 #include "log.h"
 #include "generator.h"
 #include "hashmap.h"
 #include "log.h"

diff --git a/src/cryptsetup/cryptsetup.c b/src/cryptsetup/cryptsetup.c
index 3f613d9b6572aa0056eb9c66563cdc4524b6a250..9e0fef7c6a740dddaf0ed593b789a5ada2d159c6 100644 (file)
--- a/src/cryptsetup/cryptsetup.c
+++ b/src/cryptsetup/cryptsetup.c
@@ -32,7 +32,6 @@
 #include "path-util.h"
 #include "strv.h"
 #include "ask-password-api.h"
 #include "path-util.h"
 #include "strv.h"
 #include "ask-password-api.h"

-#include "def.h"

 #include "libudev.h"
 #include "udev-util.h"
 
 #include "libudev.h"
 #include "udev-util.h"
 

diff --git a/src/delta/delta.c b/src/delta/delta.c
index de963f70099a104fa8b972e47ad7f72f48079d46..9f1f8f333b545d798382ebcf034424445e33c2bf 100644 (file)
--- a/src/delta/delta.c
+++ b/src/delta/delta.c
@@ -21,7 +21,6 @@
 ***/
 
 #include <errno.h>
 ***/
 
 #include <errno.h>

-#include <assert.h>

 #include <string.h>
 #include <unistd.h>
 #include <getopt.h>
 #include <string.h>
 #include <unistd.h>
 #include <getopt.h>

diff --git a/src/detect-virt/detect-virt.c b/src/detect-virt/detect-virt.c
index 9a924117db64f5f8a8463318bcc181de329c5bf1..606d073cbcf7b0a68ed5db069f3784744422a7ca 100644 (file)
--- a/src/detect-virt/detect-virt.c
+++ b/src/detect-virt/detect-virt.c
@@ -22,7 +22,6 @@
 #include <stdlib.h>
 #include <stdbool.h>
 #include <errno.h>
 #include <stdlib.h>
 #include <stdbool.h>
 #include <errno.h>

-#include <string.h>

 #include <getopt.h>
 
 #include "util.h"
 #include <getopt.h>
 
 #include "util.h"

diff --git a/src/efi-boot-generator/efi-boot-generator.c b/src/efi-boot-generator/efi-boot-generator.c
index b3ff3a8b788ba492131b495df50e92a360c094d7..58c4cc278a2da38d0a5af5e1b5bdc3f283ffc7ea 100644 (file)
--- a/src/efi-boot-generator/efi-boot-generator.c
+++ b/src/efi-boot-generator/efi-boot-generator.c
@@ -26,7 +26,6 @@
 #include "path-util.h"
 #include "util.h"
 #include "mkdir.h"
 #include "path-util.h"
 #include "util.h"
 #include "mkdir.h"

-#include "unit-name.h"

 #include "virt.h"
 #include "generator.h"
 #include "special.h"
 #include "virt.h"
 #include "generator.h"
 #include "special.h"

diff --git a/src/fsck/fsck.c b/src/fsck/fsck.c
index e7185342d7b740415a8a6596f0f1b7b9a08c7a35..cf4d37571728324415e711a7db6aa20d49a0f380 100644 (file)
--- a/src/fsck/fsck.c
+++ b/src/fsck/fsck.c
@@ -22,7 +22,6 @@
 
 #include <stdio.h>
 #include <stdbool.h>
 
 #include <stdio.h>
 #include <stdbool.h>

-#include <string.h>

 #include <errno.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <errno.h>
 #include <unistd.h>
 #include <fcntl.h>


@@ -37,7 +36,6 @@
 #include "bus-util.h"
 #include "bus-error.h"
 #include "bus-common-errors.h"
 #include "bus-util.h"
 #include "bus-error.h"
 #include "bus-common-errors.h"

-#include "fileio.h"

 #include "udev-util.h"
 #include "path-util.h"
 #include "socket-util.h"
 #include "udev-util.h"
 #include "path-util.h"
 #include "socket-util.h"

diff --git a/src/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c
index 5662b5fde124b34f40c4b20f9176adc4b147fc71..ccc7c6e26e5898d6076a2288a06627fce2625852 100644 (file)
--- a/src/fstab-generator/fstab-generator.c
+++ b/src/fstab-generator/fstab-generator.c
@@ -33,7 +33,6 @@
 #include "mount-setup.h"
 #include "special.h"
 #include "mkdir.h"
 #include "mount-setup.h"
 #include "special.h"
 #include "mkdir.h"

-#include "fileio.h"

 #include "generator.h"
 #include "strv.h"
 #include "virt.h"
 #include "generator.h"
 #include "strv.h"
 #include "virt.h"

diff --git a/src/gpt-auto-generator/gpt-auto-generator.c b/src/gpt-auto-generator/gpt-auto-generator.c
index 5c58b58f8a35c3144ba7d59234b48efcb6df7407..07ee2cc79332883d98992418630af8a726c254b7 100644 (file)
--- a/src/gpt-auto-generator/gpt-auto-generator.c
+++ b/src/gpt-auto-generator/gpt-auto-generator.c
@@ -21,8 +21,6 @@
 
 #include <unistd.h>
 #include <stdlib.h>
 
 #include <unistd.h>
 #include <stdlib.h>

-#include <fcntl.h>
-#include <sys/ioctl.h>

 #include <sys/statfs.h>
 #include <blkid/blkid.h>
 
 #include <sys/statfs.h>
 #include <blkid/blkid.h>
 

diff --git a/src/gudev/gudevclient.c b/src/gudev/gudevclient.c
index 1eec758935633dd89e652e49560c886531c05284..8b9516cba87e0b7fe564153dcb89dad66363191d 100644 (file)
--- a/src/gudev/gudevclient.c
+++ b/src/gudev/gudevclient.c
@@ -23,6 +23,7 @@
 
 #include <stdlib.h>
 #include <string.h>
 
 #include <stdlib.h>
 #include <string.h>

+#include <sys/stat.h>

 
 #include "gudevclient.h"
 #include "gudevdevice.h"
 
 #include "gudevclient.h"
 #include "gudevdevice.h"

diff --git a/src/gudev/gudevdevice.c b/src/gudev/gudevdevice.c
index 7106719111d3c0557282399255c9f70f4d7dfb91..5530d2c421a582f8829d05937530e022a941e042 100644 (file)
--- a/src/gudev/gudevdevice.c
+++ b/src/gudev/gudevdevice.c
@@ -23,6 +23,7 @@
 
 #include <stdlib.h>
 #include <string.h>
 
 #include <stdlib.h>
 #include <string.h>

+#include <sys/stat.h>

 
 #include "gudevdevice.h"
 #include "gudevprivate.h"
 
 #include "gudevdevice.h"
 #include "gudevprivate.h"

diff --git a/src/hibernate-resume/hibernate-resume.c b/src/hibernate-resume/hibernate-resume.c
index f28eabbe37dd6d2982196ef5b17b7403959d2be5..43aac616b6261dc1189d037ec9da6ca84a867ee2 100644 (file)
--- a/src/hibernate-resume/hibernate-resume.c
+++ b/src/hibernate-resume/hibernate-resume.c
@@ -21,9 +21,7 @@
 
 #include <stdio.h>
 #include <errno.h>
 
 #include <stdio.h>
 #include <errno.h>

-#include <sys/types.h>

 #include <sys/stat.h>
 #include <sys/stat.h>

-#include <unistd.h>

 
 #include "log.h"
 #include "util.h"
 
 #include "log.h"
 #include "util.h"

diff --git a/src/hostname/hostnamectl.c b/src/hostname/hostnamectl.c
index de4ce7ede6a84967e034eab8f3eba28d3b2406fc..5218b41b41595047a879fcb7e6324e4377248dc5 100644 (file)
--- a/src/hostname/hostnamectl.c
+++ b/src/hostname/hostnamectl.c
@@ -21,12 +21,9 @@
 
 #include <stdlib.h>
 #include <stdbool.h>
 
 #include <stdlib.h>
 #include <stdbool.h>

-#include <unistd.h>

 #include <getopt.h>
 #include <locale.h>
 #include <string.h>
 #include <getopt.h>
 #include <locale.h>
 #include <string.h>

-#include <sys/timex.h>
-#include <sys/utsname.h>

 
 #include "sd-bus.h"
 
 
 #include "sd-bus.h"
 


@@ -35,12 +32,8 @@
 #include "util.h"
 #include "spawn-polkit-agent.h"
 #include "build.h"
 #include "util.h"
 #include "spawn-polkit-agent.h"
 #include "build.h"

-#include "clock-util.h"
-#include "strv.h"

 #include "sd-id128.h"
 #include "sd-id128.h"

-#include "virt.h"

 #include "architecture.h"
 #include "architecture.h"

-#include "fileio.h"

 
 static bool arg_ask_password = true;
 static BusTransport arg_transport = BUS_TRANSPORT_LOCAL;
 
 static bool arg_ask_password = true;
 static BusTransport arg_transport = BUS_TRANSPORT_LOCAL;

diff --git a/src/hostname/hostnamed.c b/src/hostname/hostnamed.c
index ede818578817b08b782eee60684092d292fb1819..77b776fea634f2137b2534bd5a9982955588ce07 100644 (file)
--- a/src/hostname/hostnamed.c
+++ b/src/hostname/hostnamed.c
@@ -30,7 +30,6 @@
 #include "virt.h"
 #include "env-util.h"
 #include "fileio-label.h"
 #include "virt.h"
 #include "env-util.h"
 #include "fileio-label.h"

-#include "label.h"

 #include "bus-util.h"
 #include "event-util.h"
 #include "selinux-util.h"
 #include "bus-util.h"
 #include "event-util.h"
 #include "selinux-util.h"

diff --git a/src/hwdb/hwdb.c b/src/hwdb/hwdb.c
index 4539673eadb2437bb163fc18f52e96e893fb00cb..446de3a2fc330f4f10d52fec816e5d376ee719ea 100644 (file)
--- a/src/hwdb/hwdb.c
+++ b/src/hwdb/hwdb.c
@@ -18,7 +18,6 @@
 ***/
 
 #include <stdlib.h>
 ***/
 
 #include <stdlib.h>

-#include <unistd.h>

 #include <getopt.h>
 #include <string.h>
 #include <ctype.h>
 #include <getopt.h>
 #include <string.h>
 #include <ctype.h>


@@ -28,7 +27,6 @@
 #include "conf-files.h"
 #include "strv.h"
 #include "mkdir.h"
 #include "conf-files.h"
 #include "strv.h"
 #include "mkdir.h"

-#include "fileio.h"

 #include "verbs.h"
 #include "build.h"
 
 #include "verbs.h"
 #include "build.h"
 

diff --git a/src/initctl/initctl.c b/src/initctl/initctl.c
index 8b632e88aeaf64870c92f9614f8c557c157431a2..ecec7a16a75c1aa81b38187cc96f2a0f0575ee96 100644 (file)
--- a/src/initctl/initctl.c
+++ b/src/initctl/initctl.c
@@ -19,18 +19,10 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include <sys/socket.h>
-#include <sys/types.h>
-#include <assert.h>
-#include <time.h>
-#include <string.h>

 #include <stdio.h>
 #include <errno.h>
 #include <unistd.h>
 #include <stdio.h>
 #include <errno.h>
 #include <unistd.h>

-#include <poll.h>

 #include <sys/epoll.h>
 #include <sys/epoll.h>

-#include <sys/un.h>
-#include <fcntl.h>

 #include <ctype.h>
 
 #include "sd-daemon.h"
 #include <ctype.h>
 
 #include "sd-daemon.h"

diff --git a/src/journal-remote/journal-remote-write.h b/src/journal-remote/journal-remote-write.h
index aa381c661ee32ec7cb027bc544a60d949c629fd4..7f47f8b014b076b6fcb56c196cd079e76a15190b 100644 (file)
--- a/src/journal-remote/journal-remote-write.h
+++ b/src/journal-remote/journal-remote-write.h
@@ -21,7 +21,6 @@
 
 #pragma once
 
 
 #pragma once
 

-#include <stdlib.h>

 
 #include "journal-file.h"
 
 
 #include "journal-file.h"
 

diff --git a/src/journal-remote/journal-remote.c b/src/journal-remote/journal-remote.c
index 8f32a9a988e94d65896b89393f06c18d5db69c1d..ba811e0333749e2466889aa330daf163f16158ee 100644 (file)
--- a/src/journal-remote/journal-remote.c
+++ b/src/journal-remote/journal-remote.c
@@ -26,8 +26,6 @@
 #include <string.h>
 #include <sys/prctl.h>
 #include <sys/socket.h>
 #include <string.h>
 #include <sys/prctl.h>
 #include <sys/socket.h>

-#include <sys/stat.h>
-#include <sys/types.h>

 #include <unistd.h>
 #include <getopt.h>
 
 #include <unistd.h>
 #include <getopt.h>
 


@@ -35,13 +33,11 @@
 #include "journal-file.h"
 #include "journald-native.h"
 #include "socket-util.h"
 #include "journal-file.h"
 #include "journald-native.h"
 #include "socket-util.h"

-#include "mkdir.h"

 #include "build.h"
 #include "macro.h"
 #include "strv.h"
 #include "fileio.h"
 #include "conf-parser.h"
 #include "build.h"
 #include "macro.h"
 #include "strv.h"
 #include "fileio.h"
 #include "conf-parser.h"

-#include "siphash24.h"

 
 #ifdef HAVE_GNUTLS
 #include <gnutls/gnutls.h>
 
 #ifdef HAVE_GNUTLS
 #include <gnutls/gnutls.h>

diff --git a/src/journal-remote/journal-remote.h b/src/journal-remote/journal-remote.h
index 1cf22f63835de123dd8d4c3f0cbd2f77b7ebd1c6..6c2ccb9735cb6cdf31ffd085457302fab49efb11 100644 (file)
--- a/src/journal-remote/journal-remote.h
+++ b/src/journal-remote/journal-remote.h
@@ -21,7 +21,6 @@
 
 #pragma once
 
 
 #pragma once
 

-#include <inttypes.h>

 
 #include "sd-event.h"
 #include "hashmap.h"
 
 #include "sd-event.h"
 #include "hashmap.h"

diff --git a/src/journal/cat.c b/src/journal/cat.c
index 79706b692dd48ed3840ceab74e9ee81565fad1af..2e236f0004cfc14d7998a0cb90cd649e9c340532 100644 (file)
--- a/src/journal/cat.c
+++ b/src/journal/cat.c
@@ -21,7 +21,6 @@
 
 #include <stdio.h>
 #include <getopt.h>
 
 #include <stdio.h>
 #include <getopt.h>

-#include <assert.h>

 #include <unistd.h>
 #include <stdlib.h>
 #include <errno.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <errno.h>

diff --git a/src/journal/catalog.c b/src/journal/catalog.c
index f1702328419dfa52033b450d2dba054438a6f7a5..e505a05305fe241e49069e7e99b31a312ddf4f10 100644 (file)
--- a/src/journal/catalog.c
+++ b/src/journal/catalog.c
@@ -34,7 +34,6 @@
 #include "hashmap.h"
 #include "strv.h"
 #include "strbuf.h"
 #include "hashmap.h"
 #include "strv.h"
 #include "strbuf.h"

-#include "strxcpyx.h"

 #include "conf-files.h"
 #include "mkdir.h"
 #include "catalog.h"
 #include "conf-files.h"
 #include "mkdir.h"
 #include "catalog.h"

diff --git a/src/journal/compress.c b/src/journal/compress.c
index 6923753f894a0aac25755e5dedf6d478d70fa041..4232206f445cb0702468240da6d4137072456c93 100644 (file)
--- a/src/journal/compress.c
+++ b/src/journal/compress.c
@@ -19,7 +19,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include <assert.h>

 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>

diff --git a/src/journal/compress.h b/src/journal/compress.h
index 136dda6d390c3411701e92d5bd8aecc450e86134..6294f16faad8a099f25cf107ba92f18fec46b739 100644 (file)
--- a/src/journal/compress.h
+++ b/src/journal/compress.h
@@ -21,8 +21,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include <inttypes.h>
-#include <stdbool.h>

 #include <unistd.h>
 
 #include "journal-def.h"
 #include <unistd.h>
 
 #include "journal-def.h"

diff --git a/src/journal/coredump.c b/src/journal/coredump.c
index f7ba0191e1e8c6d048fd6bf28457ed1d284da305..6357d3e277295b3fde0f95ea24f9984cd386c152 100644 (file)
--- a/src/journal/coredump.c
+++ b/src/journal/coredump.c
@@ -23,7 +23,6 @@
 #include <unistd.h>
 #include <stdio.h>
 #include <sys/prctl.h>
 #include <unistd.h>
 #include <stdio.h>
 #include <sys/prctl.h>

-#include <sys/types.h>

 #include <sys/xattr.h>
 
 #ifdef HAVE_ELFUTILS
 #include <sys/xattr.h>
 
 #ifdef HAVE_ELFUTILS


@@ -44,7 +43,6 @@
 #include "conf-parser.h"
 #include "copy.h"
 #include "stacktrace.h"
 #include "conf-parser.h"
 #include "copy.h"
 #include "stacktrace.h"

-#include "path-util.h"

 #include "compress.h"
 #include "acl-util.h"
 #include "capability.h"
 #include "compress.h"
 #include "acl-util.h"
 #include "capability.h"

diff --git a/src/journal/coredumpctl.c b/src/journal/coredumpctl.c
index afb39ad035cb871e67b99e9f423821542bd59c2d..62983a73e4d19bf212a9adb42a24ec852c27d3e4 100644 (file)
--- a/src/journal/coredumpctl.c
+++ b/src/journal/coredumpctl.c
@@ -35,7 +35,6 @@
 #include "pager.h"
 #include "macro.h"
 #include "journal-internal.h"
 #include "pager.h"
 #include "macro.h"
 #include "journal-internal.h"

-#include "copy.h"

 #include "compress.h"
 #include "sigbus.h"
 
 #include "compress.h"
 #include "sigbus.h"
 

diff --git a/src/journal/fsprg.c b/src/journal/fsprg.c
index 5c8d6d6febf0444557bd2142757a7fb8f0943327..a9f564c249f1940ba19e812766cbd522a80c5ad2 100644 (file)
--- a/src/journal/fsprg.c
+++ b/src/journal/fsprg.c
@@ -30,7 +30,6 @@
 
 #include <gcrypt.h>
 #include <string.h>
 
 #include <gcrypt.h>
 #include <string.h>

-#include <assert.h>

 
 #include "fsprg.h"
 
 
 #include "fsprg.h"
 

diff --git a/src/journal/journal-authenticate.h b/src/journal/journal-authenticate.h
index 565fe8432c7ff2369fa5ed833c090f4f6c6ca7d5..118bb1367b7b467915ffafc67395f224f46638a0 100644 (file)
--- a/src/journal/journal-authenticate.h
+++ b/src/journal/journal-authenticate.h
@@ -22,7 +22,6 @@
 ***/
 
 #include <stdbool.h>
 ***/
 
 #include <stdbool.h>

-#include <inttypes.h>

 
 #include "journal-file.h"
 
 
 #include "journal-file.h"
 

diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c
index 2845e05ce0adcb7333e71c3c85cd5433a6727d12..9b4967fb3216b739bde0a9ab6b9c5984885716eb 100644 (file)
--- a/src/journal/journal-file.c
+++ b/src/journal/journal-file.c
@@ -34,7 +34,6 @@
 #include "journal-authenticate.h"
 #include "lookup3.h"
 #include "compress.h"
 #include "journal-authenticate.h"
 #include "lookup3.h"
 #include "compress.h"

-#include "fsprg.h"

 
 #define DEFAULT_DATA_HASH_TABLE_SIZE (2047ULL*sizeof(HashItem))
 #define DEFAULT_FIELD_HASH_TABLE_SIZE (333ULL*sizeof(HashItem))
 
 #define DEFAULT_DATA_HASH_TABLE_SIZE (2047ULL*sizeof(HashItem))
 #define DEFAULT_FIELD_HASH_TABLE_SIZE (333ULL*sizeof(HashItem))

diff --git a/src/journal/journal-qrcode.h b/src/journal/journal-qrcode.h
index c527e6555353c018fb57191853ea6b3f795590a7..3ff6a3ad4aee2291dfb8eba76bbd0d832322995e 100644 (file)
--- a/src/journal/journal-qrcode.h
+++ b/src/journal/journal-qrcode.h
@@ -21,8 +21,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include <inttypes.h>
-#include <sys/types.h>

 #include <stdio.h>
 
 #include "systemd/sd-id128.h"
 #include <stdio.h>
 
 #include "systemd/sd-id128.h"

diff --git a/src/journal/journal-vacuum.c b/src/journal/journal-vacuum.c
index 832c327b3101d3e3b56740a48ab17396628e2083..a367dc1bb9e2d30877af8c751784f287503165e5 100644 (file)
--- a/src/journal/journal-vacuum.c
+++ b/src/journal/journal-vacuum.c
@@ -19,12 +19,9 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include <sys/types.h>

 #include <fcntl.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <sys/stat.h>

-#include <sys/statvfs.h>

 #include <unistd.h>
 #include <unistd.h>

-#include <sys/xattr.h>

 
 #include "journal-def.h"
 #include "journal-file.h"
 
 #include "journal-def.h"
 #include "journal-file.h"

diff --git a/src/journal/journal-vacuum.h b/src/journal/journal-vacuum.h
index a7fb6f0f0d6a8f0aa3bd58c8e27423f8c09674e4..c45cc31d0e38222e29863395a0dc6a62207a4b5d 100644 (file)
--- a/src/journal/journal-vacuum.h
+++ b/src/journal/journal-vacuum.h
@@ -21,6 +21,5 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include <inttypes.h>

 
 int journal_directory_vacuum(const char *directory, uint64_t max_use, usec_t max_retention_usec, usec_t *oldest_usec, bool vacuum);
 
 int journal_directory_vacuum(const char *directory, uint64_t max_use, usec_t max_retention_usec, usec_t *oldest_usec, bool vacuum);

diff --git a/src/journal/journal-verify.c b/src/journal/journal-verify.c
index b03335ef31c98faab8783c28d37d7004d4f6675e..35c270cb3400df609a5bf25aa5d7f95f77bfac89 100644 (file)
--- a/src/journal/journal-verify.c
+++ b/src/journal/journal-verify.c
@@ -32,7 +32,6 @@
 #include "journal-verify.h"
 #include "lookup3.h"
 #include "compress.h"
 #include "journal-verify.h"
 #include "lookup3.h"
 #include "compress.h"

-#include "fsprg.h"

 
 static void draw_progress(uint64_t p, usec_t *last_usec) {
         unsigned n, i, j, k;
 
 static void draw_progress(uint64_t p, usec_t *last_usec) {
         unsigned n, i, j, k;

diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
index 55c7786331f70d7033486c584c76066101d226ec..56435ff7b4467455879ab41f7c08356fdc58d8b3 100644 (file)
--- a/src/journal/journalctl.c
+++ b/src/journal/journalctl.c
@@ -28,12 +28,10 @@
 #include <stdio.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <unistd.h>
 #include <stdlib.h>

-#include <time.h>

 #include <getopt.h>
 #include <signal.h>
 #include <poll.h>
 #include <sys/stat.h>
 #include <getopt.h>
 #include <signal.h>
 #include <poll.h>
 #include <sys/stat.h>

-#include <sys/ioctl.h>

 #include <sys/inotify.h>
 #include <linux/fs.h>
 
 #include <sys/inotify.h>
 #include <linux/fs.h>
 


@@ -54,7 +52,6 @@
 #include "journal-internal.h"
 #include "journal-def.h"
 #include "journal-verify.h"
 #include "journal-internal.h"
 #include "journal-def.h"
 #include "journal-verify.h"

-#include "journal-authenticate.h"

 #include "journal-qrcode.h"
 #include "journal-vacuum.h"
 #include "fsprg.h"
 #include "journal-qrcode.h"
 #include "journal-vacuum.h"
 #include "fsprg.h"

diff --git a/src/journal/journald-console.c b/src/journal/journald-console.c
index 5363aaa4ffa1d86e984998f4372c2d08dec6e733..f7ea779f0b8e2b50b9bfd2646e9e7b9d436698e9 100644 (file)
--- a/src/journal/journald-console.c
+++ b/src/journal/journald-console.c
@@ -21,7 +21,6 @@
 
 #include <time.h>
 #include <fcntl.h>
 
 #include <time.h>
 #include <fcntl.h>

-#include <unistd.h>

 #include <sys/socket.h>
 
 #include "fileio.h"
 #include <sys/socket.h>
 
 #include "fileio.h"

diff --git a/src/journal/journald-rate-limit.h b/src/journal/journald-rate-limit.h
index 648ab22786ad611408d6805e48f613d3555014b8..466239d3c6807d2e03cf728ec7a1e0dd2621c220 100644 (file)
--- a/src/journal/journald-rate-limit.h
+++ b/src/journal/journald-rate-limit.h
@@ -21,7 +21,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include "macro.h"

 #include "util.h"
 
 typedef struct JournalRateLimit JournalRateLimit;
 #include "util.h"
 
 typedef struct JournalRateLimit JournalRateLimit;

diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c
index 7ee8174ea235d3a65da7afdcf7fde7b94a8541cb..2488884634dcbe7bc7541a46edd465326fc64877 100644 (file)
--- a/src/journal/journald-server.c
+++ b/src/journal/journald-server.c
@@ -24,20 +24,17 @@
 #include <linux/sockios.h>
 #include <sys/statvfs.h>
 #include <sys/mman.h>
 #include <linux/sockios.h>
 #include <sys/statvfs.h>
 #include <sys/mman.h>

-#include <sys/timerfd.h>

 
 #include <libudev.h>
 
 #include "sd-journal.h"
 #include "sd-messages.h"
 #include "sd-daemon.h"
 
 #include <libudev.h>
 
 #include "sd-journal.h"
 #include "sd-messages.h"
 #include "sd-daemon.h"

-#include "fileio.h"

 #include "mkdir.h"
 #include "hashmap.h"
 #include "journal-file.h"
 #include "socket-util.h"
 #include "cgroup-util.h"
 #include "mkdir.h"
 #include "hashmap.h"
 #include "journal-file.h"
 #include "socket-util.h"
 #include "cgroup-util.h"

-#include "list.h"

 #include "missing.h"
 #include "conf-parser.h"
 #include "selinux-util.h"
 #include "missing.h"
 #include "conf-parser.h"
 #include "selinux-util.h"


@@ -48,7 +45,6 @@
 #include "journald-kmsg.h"
 #include "journald-syslog.h"
 #include "journald-stream.h"
 #include "journald-kmsg.h"
 #include "journald-syslog.h"
 #include "journald-stream.h"

-#include "journald-console.h"

 #include "journald-native.h"
 #include "journald-audit.h"
 #include "journald-server.h"
 #include "journald-native.h"
 #include "journald-audit.h"
 #include "journald-server.h"

diff --git a/src/journal/journald-server.h b/src/journal/journald-server.h
index c96877c50812bbcca1e49f76520269b310957d14..559d10013199f4ddb845620656f875a4ca3f0ab3 100644 (file)
--- a/src/journal/journald-server.h
+++ b/src/journal/journald-server.h
@@ -21,16 +21,12 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include <inttypes.h>

 #include <stdbool.h>
 #include <stdbool.h>

-#include <sys/epoll.h>

 #include <sys/types.h>
 #include <sys/types.h>

-#include <sys/socket.h>

 
 #include "sd-event.h"
 #include "journal-file.h"
 #include "hashmap.h"
 
 #include "sd-event.h"
 #include "journal-file.h"
 #include "hashmap.h"

-#include "util.h"

 #include "audit.h"
 #include "journald-rate-limit.h"
 #include "list.h"
 #include "audit.h"
 #include "journald-rate-limit.h"
 #include "list.h"

diff --git a/src/journal/journald-stream.c b/src/journal/journald-stream.c
index 942a857803264322bb0bd47be9b61f9ed68556ae..bc5b26d1185fa595838dd692256ed6202875ec24 100644 (file)
--- a/src/journal/journald-stream.c
+++ b/src/journal/journald-stream.c
@@ -19,7 +19,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include <fcntl.h>

 #include <unistd.h>
 #include <stddef.h>
 
 #include <unistd.h>
 #include <stddef.h>
 

diff --git a/src/journal/journald.c b/src/journal/journald.c
index 80f4634f6746ec32ae219ba95e10dec6259e6735..28a423326e4b0cb6006795829879565822e44aa7 100644 (file)
--- a/src/journal/journald.c
+++ b/src/journal/journald.c
@@ -19,12 +19,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include <sys/epoll.h>
-#include <sys/socket.h>
-#include <errno.h>

 #include <unistd.h>
 
 #include <unistd.h>
 

-#include "systemd/sd-journal.h"

 #include "systemd/sd-messages.h"
 #include "systemd/sd-daemon.h"
 
 #include "systemd/sd-messages.h"
 #include "systemd/sd-daemon.h"
 

diff --git a/src/journal/mmap-cache.c b/src/journal/mmap-cache.c
index ab21cdc28873e36ac88465336252caa44cef4a4d..22f75540b83f948d0d7e3604b4317c22ed809baa 100644 (file)
--- a/src/journal/mmap-cache.c
+++ b/src/journal/mmap-cache.c
@@ -22,7 +22,6 @@
 #include <errno.h>
 #include <stdlib.h>
 #include <sys/mman.h>
 #include <errno.h>
 #include <stdlib.h>
 #include <sys/mman.h>

-#include <string.h>

 
 #include "hashmap.h"
 #include "list.h"
 
 #include "hashmap.h"
 #include "list.h"

diff --git a/src/journal/mmap-cache.h b/src/journal/mmap-cache.h
index a85c2b6063b4f0887501389eb026d1eaef30dfbe..37ea7b4a9c839b604f63e09d8e395b34730dd54b 100644 (file)
--- a/src/journal/mmap-cache.h
+++ b/src/journal/mmap-cache.h
@@ -21,7 +21,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include <inttypes.h>

 #include <stdbool.h>
 #include <sys/stat.h>
 
 #include <stdbool.h>
 #include <sys/stat.h>
 

diff --git a/src/journal/test-catalog.c b/src/journal/test-catalog.c
index c605ee0e70963f5c7400cd3622a067310827a545..dbfdea609dc7751a8f0522e9496d4eed652e7a85 100644 (file)
--- a/src/journal/test-catalog.c
+++ b/src/journal/test-catalog.c
@@ -21,7 +21,6 @@
 ***/
 
 #include <locale.h>
 ***/
 
 #include <locale.h>

-#include <stdlib.h>

 #include <unistd.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <errno.h>
 #include <fcntl.h>

diff --git a/src/journal/test-journal-enum.c b/src/journal/test-journal-enum.c
index 980244e0163ecb471f52b0a5b33526e60c3fe726..cde2025ae951e6ea0ae85fb7479a4b2fce55302d 100644 (file)
--- a/src/journal/test-journal-enum.c
+++ b/src/journal/test-journal-enum.c
@@ -24,7 +24,6 @@
 #include "log.h"
 #include "sd-journal.h"
 #include "macro.h"
 #include "log.h"
 #include "sd-journal.h"
 #include "macro.h"

-#include "util.h"

 #include "journal-internal.h"
 
 int main(int argc, char *argv[]) {
 #include "journal-internal.h"
 
 int main(int argc, char *argv[]) {

diff --git a/src/journal/test-journal-interleaving.c b/src/journal/test-journal-interleaving.c
index 3c706018e93bd7ea921b0a0a04f1cf0dcbe3b33f..3e6141771c6d0a0e7c7b596ed4484827aae673cb 100644 (file)
--- a/src/journal/test-journal-interleaving.c
+++ b/src/journal/test-journal-interleaving.c
@@ -26,7 +26,6 @@
 #include "systemd/sd-journal.h"
 
 #include "journal-file.h"
 #include "systemd/sd-journal.h"
 
 #include "journal-file.h"

-#include "journal-internal.h"

 #include "journal-vacuum.h"
 #include "util.h"
 #include "log.h"
 #include "journal-vacuum.h"
 #include "util.h"
 #include "log.h"

diff --git a/src/journal/test-journal-verify.c b/src/journal/test-journal-verify.c
index 9da120c0bb0add35639c30feb47668ef4ddfd8ff..de9cd9c8b8c8c35e50dadbe4f582089bdf53a416 100644 (file)
--- a/src/journal/test-journal-verify.c
+++ b/src/journal/test-journal-verify.c
@@ -27,7 +27,6 @@
 #include "log.h"
 #include "journal-file.h"
 #include "journal-verify.h"
 #include "log.h"
 #include "journal-file.h"
 #include "journal-verify.h"

-#include "journal-authenticate.h"

 
 #define N_ENTRIES 6000
 #define RANDOM_RANGE 77
 
 #define N_ENTRIES 6000
 #define RANDOM_RANGE 77

diff --git a/src/journal/test-journal.c b/src/journal/test-journal.c
index 230d26596aa99a33a2e246646eb3207025ddd391..f7cc75b3d5d948fd8803234a310e39448ace8a37 100644 (file)
--- a/src/journal/test-journal.c
+++ b/src/journal/test-journal.c
@@ -22,7 +22,6 @@
 #include <fcntl.h>
 #include <unistd.h>
 
 #include <fcntl.h>
 #include <unistd.h>
 

-#include "systemd/sd-journal.h"

 
 #include "log.h"
 #include "journal-file.h"
 
 #include "log.h"
 #include "journal-file.h"

diff --git a/src/journal/test-mmap-cache.c b/src/journal/test-mmap-cache.c
index 3fcd77475d99f442101b6be4cd2ff2ddbe69ef12..3258b227022a719e671f40e366814219726fea9b 100644 (file)
--- a/src/journal/test-mmap-cache.c
+++ b/src/journal/test-mmap-cache.c
@@ -24,7 +24,6 @@
 #include <unistd.h>
 #include <fcntl.h>
 
 #include <unistd.h>
 #include <fcntl.h>
 

-#include "log.h"

 #include "macro.h"
 #include "util.h"
 #include "mmap-cache.h"
 #include "macro.h"
 #include "util.h"
 #include "mmap-cache.h"

diff --git a/src/libsystemd-network/dhcp-identifier.c b/src/libsystemd-network/dhcp-identifier.c
index 419a450436e21d016484ddb3ea5d6a1a57767db8..f7a1492363435d1e62b81f117dcc9295cf36fe70 100644 (file)
--- a/src/libsystemd-network/dhcp-identifier.c
+++ b/src/libsystemd-network/dhcp-identifier.c
@@ -19,7 +19,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include <net/ethernet.h>

 
 #include "sd-id128.h"
 #include "libudev.h"
 
 #include "sd-id128.h"
 #include "libudev.h"


@@ -28,7 +27,6 @@
 #include "virt.h"
 #include "sparse-endian.h"
 #include "siphash24.h"
 #include "virt.h"
 #include "sparse-endian.h"
 #include "siphash24.h"

-#include "util.h"

 
 #include "dhcp6-protocol.h"
 #include "dhcp-identifier.h"
 
 #include "dhcp6-protocol.h"
 #include "dhcp-identifier.h"

diff --git a/src/libsystemd-network/dhcp-identifier.h b/src/libsystemd-network/dhcp-identifier.h
index 7f44d2549938592045544a916cc552c5ce1a7ab0..643d4970d5023098d60c61b215b7a0b2c8637b31 100644 (file)
--- a/src/libsystemd-network/dhcp-identifier.h
+++ b/src/libsystemd-network/dhcp-identifier.h
@@ -21,7 +21,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include <net/ethernet.h>

 
 #include "macro.h"
 #include "sparse-endian.h"
 
 #include "macro.h"
 #include "sparse-endian.h"

diff --git a/src/libsystemd-network/dhcp-network.c b/src/libsystemd-network/dhcp-network.c
index 5f2d2cfbfd1d1482db6a1103dd3671c4f0dd6fd3..7f10838de147aa46b70059828060de95d3486e25 100644 (file)
--- a/src/libsystemd-network/dhcp-network.c
+++ b/src/libsystemd-network/dhcp-network.c
@@ -18,7 +18,6 @@
 ***/
 
 #include <errno.h>
 ***/
 
 #include <errno.h>

-#include <sys/types.h>

 #include <sys/socket.h>
 #include <string.h>
 #include <linux/if_packet.h>
 #include <sys/socket.h>
 #include <string.h>
 #include <linux/if_packet.h>


@@ -26,7 +25,6 @@
 #include <net/ethernet.h>
 #include <net/if_arp.h>
 #include <stdio.h>
 #include <net/ethernet.h>
 #include <net/if_arp.h>
 #include <stdio.h>

-#include <unistd.h>

 #include <linux/filter.h>
 
 #include "socket-util.h"
 #include <linux/filter.h>
 
 #include "socket-util.h"

diff --git a/src/libsystemd-network/dhcp-packet.c b/src/libsystemd-network/dhcp-packet.c
index 7581daeeeb355ae4c53b46fca85e77b2dd837abd..cd7f5095ca9d0d1311afcd12fee869eeac91078a 100644 (file)
--- a/src/libsystemd-network/dhcp-packet.c
+++ b/src/libsystemd-network/dhcp-packet.c
@@ -18,22 +18,14 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include <stdlib.h>

 #include <errno.h>
 #include <string.h>
 #include <errno.h>
 #include <string.h>

-#include <stdio.h>

 #include <net/ethernet.h>
 #include <net/if_arp.h>
 #include <net/ethernet.h>
 #include <net/if_arp.h>

-#include <sys/param.h>

 
 

-#include "util.h"
-#include "list.h"

 
 #include "dhcp-protocol.h"
 
 #include "dhcp-protocol.h"

-#include "dhcp-lease-internal.h"

 #include "dhcp-internal.h"
 #include "dhcp-internal.h"

-#include "sd-dhcp-lease.h"
-#include "sd-dhcp-client.h"

 
 #define DHCP_CLIENT_MIN_OPTIONS_SIZE            312
 
 
 #define DHCP_CLIENT_MIN_OPTIONS_SIZE            312
 

diff --git a/src/libsystemd-network/lldp-network.c b/src/libsystemd-network/lldp-network.c
index a2bc7d5518b826a0273d279b453b3f459d1975e0..664d2f7867dabe0f19eba90a21f554409987e734 100644 (file)
--- a/src/libsystemd-network/lldp-network.c
+++ b/src/libsystemd-network/lldp-network.c
@@ -27,7 +27,6 @@
 #include "lldp-tlv.h"
 #include "lldp-network.h"
 #include "lldp-internal.h"
 #include "lldp-tlv.h"
 #include "lldp-network.h"
 #include "lldp-internal.h"

-#include "sd-lldp.h"

 
 int lldp_network_bind_raw_socket(int ifindex) {
         typedef struct LLDPFrame {
 
 int lldp_network_bind_raw_socket(int ifindex) {
         typedef struct LLDPFrame {

diff --git a/src/libsystemd-network/network-internal.c b/src/libsystemd-network/network-internal.c
index b8e4e21716f596fa43116560ca7ccb5588c4c89f..d579755cc81b15d17d58f76ee71c526366d9a50b 100644 (file)
--- a/src/libsystemd-network/network-internal.c
+++ b/src/libsystemd-network/network-internal.c
@@ -25,7 +25,6 @@
 
 #include "strv.h"
 #include "siphash24.h"
 
 #include "strv.h"
 #include "siphash24.h"

-#include "libudev-private.h"

 #include "dhcp-lease-internal.h"
 #include "log.h"
 #include "utf8.h"
 #include "dhcp-lease-internal.h"
 #include "log.h"
 #include "utf8.h"

diff --git a/src/libsystemd-network/network-internal.h b/src/libsystemd-network/network-internal.h
index e51717e91963a4cd91b3ed1c3297149b41e1c03b..06aba893ceba9fa62f2bc755ec4432bd0fe09f42 100644 (file)
--- a/src/libsystemd-network/network-internal.h
+++ b/src/libsystemd-network/network-internal.h
@@ -21,8 +21,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include <netinet/ether.h>
-#include <netinet/in.h>

 #include <stdbool.h>
 
 #include "udev.h"
 #include <stdbool.h>
 
 #include "udev.h"

diff --git a/src/libsystemd-network/sd-dhcp-client.c b/src/libsystemd-network/sd-dhcp-client.c
index 5f90617b9e3b2833e8515392ff25c63ea2b1b757..4224e0197cdfa6729dfcb57ba21e8bb95c82a4a5 100644 (file)
--- a/src/libsystemd-network/sd-dhcp-client.c
+++ b/src/libsystemd-network/sd-dhcp-client.c
@@ -24,12 +24,9 @@
 #include <net/ethernet.h>
 #include <net/if_arp.h>
 #include <linux/if_infiniband.h>
 #include <net/ethernet.h>
 #include <net/if_arp.h>
 #include <linux/if_infiniband.h>

-#include <netinet/ether.h>
-#include <sys/param.h>

 #include <sys/ioctl.h>
 
 #include "util.h"
 #include <sys/ioctl.h>
 
 #include "util.h"

-#include "list.h"

 #include "refcnt.h"
 #include "async.h"
 
 #include "refcnt.h"
 #include "async.h"
 

diff --git a/src/libsystemd-network/sd-dhcp-lease.c b/src/libsystemd-network/sd-dhcp-lease.c
index 34aa36c6e6629c9331d6230ae8fccb57804194b6..fa1fa112b12b848534e3133830d393e8727b1ed5 100644 (file)
--- a/src/libsystemd-network/sd-dhcp-lease.c
+++ b/src/libsystemd-network/sd-dhcp-lease.c
@@ -22,22 +22,15 @@
 #include <errno.h>
 #include <string.h>
 #include <stdio.h>
 #include <errno.h>
 #include <string.h>
 #include <stdio.h>

-#include <net/ethernet.h>

 #include <arpa/inet.h>
 #include <arpa/inet.h>

-#include <sys/param.h>

 
 

-#include "util.h"
-#include "list.h"
-#include "mkdir.h"

 #include "fileio.h"
 #include "unaligned.h"
 #include "in-addr-util.h"
 
 #include "dhcp-protocol.h"
 #include "fileio.h"
 #include "unaligned.h"
 #include "in-addr-util.h"
 
 #include "dhcp-protocol.h"

-#include "dhcp-internal.h"

 #include "dhcp-lease-internal.h"
 #include "sd-dhcp-lease.h"
 #include "dhcp-lease-internal.h"
 #include "sd-dhcp-lease.h"

-#include "sd-dhcp-client.h"

 #include "network-internal.h"
 
 int sd_dhcp_lease_get_address(sd_dhcp_lease *lease, struct in_addr *addr) {
 #include "network-internal.h"
 
 int sd_dhcp_lease_get_address(sd_dhcp_lease *lease, struct in_addr *addr) {

diff --git a/src/libsystemd-network/sd-dhcp-server.c b/src/libsystemd-network/sd-dhcp-server.c
index 3f89f344d74905c2ebe87a8f10697f01b1515ed5..2634a730d65552fa96f7c009246664d71f19f1dd 100644 (file)
--- a/src/libsystemd-network/sd-dhcp-server.c
+++ b/src/libsystemd-network/sd-dhcp-server.c
@@ -21,7 +21,6 @@
 ***/
 
 #include <sys/ioctl.h>
 ***/
 
 #include <sys/ioctl.h>

-#include <netinet/if_ether.h>

 
 #include "siphash24.h"
 
 
 #include "siphash24.h"
 

diff --git a/src/libsystemd-network/sd-lldp.c b/src/libsystemd-network/sd-lldp.c
index 19ef2ccdbda76466d665e340d1645e1cb6f129e3..0821730330d8dfd23338a862955b3a5d1bfa95d5 100644 (file)
--- a/src/libsystemd-network/sd-lldp.c
+++ b/src/libsystemd-network/sd-lldp.c
@@ -24,16 +24,13 @@
 
 #include "siphash24.h"
 #include "hashmap.h"
 
 #include "siphash24.h"
 #include "hashmap.h"

-#include "event-util.h"

 
 #include "lldp-tlv.h"
 #include "lldp-port.h"
 #include "sd-lldp.h"
 #include "prioq.h"
 
 #include "lldp-tlv.h"
 #include "lldp-port.h"
 #include "sd-lldp.h"
 #include "prioq.h"

-#include "strv.h"

 #include "lldp-internal.h"
 #include "lldp-util.h"
 #include "lldp-internal.h"
 #include "lldp-util.h"

-#include "ether-addr-util.h"

 
 typedef enum LLDPAgentRXState {
         LLDP_AGENT_RX_WAIT_PORT_OPERATIONAL = 4,
 
 typedef enum LLDPAgentRXState {
         LLDP_AGENT_RX_WAIT_PORT_OPERATIONAL = 4,

diff --git a/src/libsystemd-network/sd-pppoe.c b/src/libsystemd-network/sd-pppoe.c
index 4f49b799ec3b4920006ab85123b036511fbd48b4..67a2cc6e979985a8358ec4d429337d8b64a73755 100644 (file)
--- a/src/libsystemd-network/sd-pppoe.c
+++ b/src/libsystemd-network/sd-pppoe.c
@@ -22,7 +22,6 @@
 /* See RFC 2516 */
 
 #include <sys/ioctl.h>
 /* See RFC 2516 */
 
 #include <sys/ioctl.h>

-#include <linux/ppp_defs.h>

 #include <linux/ppp-ioctl.h>
 #include <net/if.h>
 #include <netinet/in.h>
 #include <linux/ppp-ioctl.h>
 #include <net/if.h>
 #include <netinet/in.h>


@@ -36,7 +35,6 @@
 #include "socket-util.h"
 #include "async.h"
 #include "refcnt.h"
 #include "socket-util.h"
 #include "async.h"
 #include "refcnt.h"

-#include "unaligned.h"

 #include "utf8.h"
 
 #define PPPOE_MAX_PACKET_SIZE 1484
 #include "utf8.h"
 
 #define PPPOE_MAX_PACKET_SIZE 1484

diff --git a/src/libsystemd-network/test-dhcp-client.c b/src/libsystemd-network/test-dhcp-client.c
index 8e88641430389404e8a647196a1c9db9cf12a2ea..d341210887c43f6d7e99cbef26e4cca392a5a95a 100644 (file)
--- a/src/libsystemd-network/test-dhcp-client.c
+++ b/src/libsystemd-network/test-dhcp-client.c
@@ -19,16 +19,12 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include <stdlib.h>
-#include <assert.h>

 #include <errno.h>
 #include <stdio.h>
 #include <errno.h>
 #include <stdio.h>

-#include <sys/types.h>

 #include <sys/socket.h>
 #include <unistd.h>
 
 #include "util.h"
 #include <sys/socket.h>
 #include <unistd.h>
 
 #include "util.h"

-#include "socket-util.h"

 #include "sd-event.h"
 #include "event-util.h"
 
 #include "sd-event.h"
 #include "event-util.h"
 

diff --git a/src/libsystemd-network/test-dhcp-option.c b/src/libsystemd-network/test-dhcp-option.c
index 46c8c2706148dd7357ee6418b797443a6e9b13b2..6062a37dabc376631cdb984f8b61e6efd39e730b 100644 (file)
--- a/src/libsystemd-network/test-dhcp-option.c
+++ b/src/libsystemd-network/test-dhcp-option.c
@@ -3,7 +3,6 @@
 #include <stdbool.h>
 #include <errno.h>
 #include <string.h>
 #include <stdbool.h>
 #include <errno.h>
 #include <string.h>

-#include <assert.h>

 
 #include "util.h"
 #include "macro.h"
 
 #include "util.h"
 #include "macro.h"

diff --git a/src/libsystemd-network/test-dhcp-server.c b/src/libsystemd-network/test-dhcp-server.c
index 3e68f310f3248ac59b0f555c559e0858319f4ab7..9f60ab761e56f9193f8e980a87aae7103e19c6d0 100644 (file)
--- a/src/libsystemd-network/test-dhcp-server.c
+++ b/src/libsystemd-network/test-dhcp-server.c
@@ -20,8 +20,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include <netinet/if_ether.h>
-#include <assert.h>

 #include <errno.h>
 
 #include "sd-event.h"
 #include <errno.h>
 
 #include "sd-event.h"

diff --git a/src/libsystemd-network/test-lldp.c b/src/libsystemd-network/test-lldp.c
index ee74ebd418951fe5b566ecf782451ba2f412caed..06545aee59e56cae67c9aaafe77e04a2c1d4d202 100644 (file)
--- a/src/libsystemd-network/test-lldp.c
+++ b/src/libsystemd-network/test-lldp.c
@@ -21,13 +21,8 @@
 ***/
 
 #include <stdio.h>
 ***/
 
 #include <stdio.h>

-#include <stdlib.h>

 #include <string.h>
 #include <string.h>

-#include <sys/socket.h>
-#include <linux/if.h>
-#include <linux/if_ether.h>

 #include <net/ethernet.h>
 #include <net/ethernet.h>

-#include <sys/types.h>

 #include <arpa/inet.h>
 
 #include "macro.h"
 #include <arpa/inet.h>
 
 #include "macro.h"

diff --git a/src/libsystemd-network/test-pppoe.c b/src/libsystemd-network/test-pppoe.c
index dff83eaf6e43796dda0586901cc6570d36aa6456..40d04fdb217d3ea624298027d3c51118c7c1e6bd 100644 (file)
--- a/src/libsystemd-network/test-pppoe.c
+++ b/src/libsystemd-network/test-pppoe.c
@@ -20,22 +20,16 @@
 ***/
 
 #include <stdlib.h>
 ***/
 
 #include <stdlib.h>

-#include <assert.h>

 #include <errno.h>
 #include <errno.h>

-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/socket.h>

 #include <unistd.h>
 
 #include <linux/veth.h>
 #include <net/if.h>
 
 #include "util.h"
 #include <unistd.h>
 
 #include <linux/veth.h>
 #include <net/if.h>
 
 #include "util.h"

-#include "socket-util.h"

 #include "sd-event.h"
 #include "event-util.h"
 #include "sd-rtnl.h"
 #include "sd-event.h"
 #include "event-util.h"
 #include "sd-rtnl.h"

-#include "rtnl-util.h"

 #include "sd-pppoe.h"
 
 static void pppoe_handler(sd_pppoe *ppp, int event, void *userdata) {
 #include "sd-pppoe.h"
 
 static void pppoe_handler(sd_pppoe *ppp, int event, void *userdata) {

diff --git a/src/libsystemd-terminal/evcat.c b/src/libsystemd-terminal/evcat.c
index f4c25b555658e8b84bbf9c7ea3ea53b252422c9c..d274225ed04a5d8e275e322ada888a01b057f397 100644 (file)
--- a/src/libsystemd-terminal/evcat.c
+++ b/src/libsystemd-terminal/evcat.c
@@ -26,17 +26,13 @@
  * problems.
  */
 
  * problems.
  */
 

-#include <assert.h>

 #include <errno.h>
 #include <getopt.h>
 #include <libevdev/libevdev.h>
 #include <linux/kd.h>
 #include <errno.h>
 #include <getopt.h>
 #include <libevdev/libevdev.h>
 #include <linux/kd.h>

-#include <linux/vt.h>
-#include <stdarg.h>

 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>

-#include <string.h>

 #include <sys/ioctl.h>
 #include <sys/stat.h>
 #include <systemd/sd-bus.h>
 #include <sys/ioctl.h>
 #include <sys/stat.h>
 #include <systemd/sd-bus.h>


@@ -46,7 +42,6 @@
 #include <unistd.h>
 #include <xkbcommon/xkbcommon.h>
 #include "build.h"
 #include <unistd.h>
 #include <xkbcommon/xkbcommon.h>
 #include "build.h"

-#include "bus-util.h"

 #include "event-util.h"
 #include "idev.h"
 #include "macro.h"
 #include "event-util.h"
 #include "idev.h"
 #include "macro.h"

diff --git a/src/libsystemd-terminal/grdev-drm.c b/src/libsystemd-terminal/grdev-drm.c
index bc4d4c9e76d4d769108cd85321c576536ad0cb16..066a4d8b100bff982f2fc5259d307d3cc11c02f4 100644 (file)
--- a/src/libsystemd-terminal/grdev-drm.c
+++ b/src/libsystemd-terminal/grdev-drm.c
@@ -42,7 +42,6 @@
 #include "grdev.h"
 #include "grdev-internal.h"
 #include "macro.h"
 #include "grdev.h"
 #include "grdev-internal.h"
 #include "macro.h"

-#include "udev-util.h"

 #include "util.h"
 
 #define GRDRM_MAX_TRIES (16)
 #include "util.h"
 
 #define GRDRM_MAX_TRIES (16)

diff --git a/src/libsystemd-terminal/grdev.c b/src/libsystemd-terminal/grdev.c
index 3b3cf2737bbf59a6538c218cd2627722912037be..feed579295e17206ee00889c7265559e3905772d 100644 (file)
--- a/src/libsystemd-terminal/grdev.c
+++ b/src/libsystemd-terminal/grdev.c
@@ -19,19 +19,16 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include <inttypes.h>

 #include <libudev.h>
 #include <stdbool.h>
 #include <stdlib.h>
 #include <systemd/sd-bus.h>
 #include <systemd/sd-event.h>
 #include <libudev.h>
 #include <stdbool.h>
 #include <stdlib.h>
 #include <systemd/sd-bus.h>
 #include <systemd/sd-event.h>

-#include <systemd/sd-login.h>

 #include "grdev.h"
 #include "grdev-internal.h"
 #include "hashmap.h"
 #include "login-shared.h"
 #include "macro.h"
 #include "grdev.h"
 #include "grdev-internal.h"
 #include "hashmap.h"
 #include "login-shared.h"
 #include "macro.h"

-#include "udev-util.h"

 #include "util.h"
 
 static void pipe_enable(grdev_pipe *pipe);
 #include "util.h"
 
 static void pipe_enable(grdev_pipe *pipe);

diff --git a/src/libsystemd-terminal/grdev.h b/src/libsystemd-terminal/grdev.h
index 35d6eb2abf1346bc28e6c9e87e55dabe87a5bfb0..db2a508fd8e61f60afbcd9b7e732265d945a2693 100644 (file)
--- a/src/libsystemd-terminal/grdev.h
+++ b/src/libsystemd-terminal/grdev.h
@@ -53,8 +53,6 @@
 
 #pragma once
 
 
 #pragma once
 

-#include <drm_fourcc.h>
-#include <inttypes.h>

 #include <libudev.h>
 #include <stdbool.h>
 #include <stdlib.h>
 #include <libudev.h>
 #include <stdbool.h>
 #include <stdlib.h>

diff --git a/src/libsystemd-terminal/idev-evdev.c b/src/libsystemd-terminal/idev-evdev.c
index dfbb2d197f4d8c56b5d948f388877a1cccb1c56a..91ae507d91485e10baefc848992ed7e03c17e929 100644 (file)
--- a/src/libsystemd-terminal/idev-evdev.c
+++ b/src/libsystemd-terminal/idev-evdev.c
@@ -20,20 +20,16 @@
 ***/
 
 #include <fcntl.h>
 ***/
 
 #include <fcntl.h>

-#include <inttypes.h>

 #include <libevdev/libevdev.h>
 #include <libudev.h>
 #include <stdbool.h>
 #include <stdlib.h>
 #include <systemd/sd-bus.h>
 #include <systemd/sd-event.h>
 #include <libevdev/libevdev.h>
 #include <libudev.h>
 #include <stdbool.h>
 #include <stdlib.h>
 #include <systemd/sd-bus.h>
 #include <systemd/sd-event.h>

-#include <unistd.h>

 #include "bus-util.h"
 #include "bus-util.h"

-#include "hashmap.h"

 #include "idev.h"
 #include "idev-internal.h"
 #include "macro.h"
 #include "idev.h"
 #include "idev-internal.h"
 #include "macro.h"

-#include "udev-util.h"

 #include "util.h"
 
 typedef struct idev_evdev idev_evdev;
 #include "util.h"
 
 typedef struct idev_evdev idev_evdev;

diff --git a/src/libsystemd-terminal/idev-keyboard.c b/src/libsystemd-terminal/idev-keyboard.c
index 6ee3d8150c22aaf49a752173c00faa9e0e2acdf8..1ee13ffd156bd1831d2dd6a49549ed144fdec449 100644 (file)
--- a/src/libsystemd-terminal/idev-keyboard.c
+++ b/src/libsystemd-terminal/idev-keyboard.c
@@ -19,7 +19,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include <inttypes.h>

 #include <stdbool.h>
 #include <stdlib.h>
 #include <systemd/sd-bus.h>
 #include <stdbool.h>
 #include <stdlib.h>
 #include <systemd/sd-bus.h>

diff --git a/src/libsystemd-terminal/idev.c b/src/libsystemd-terminal/idev.c
index 989683f39a62cc2053928b547cc09a1aa65560d5..44be7c30d2c1919fa87aa182f7814e5cee597b71 100644 (file)
--- a/src/libsystemd-terminal/idev.c
+++ b/src/libsystemd-terminal/idev.c
@@ -19,21 +19,16 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include <inttypes.h>

 #include <libudev.h>
 #include <libudev.h>

-#include <linux/input.h>

 #include <stdbool.h>
 #include <stdlib.h>
 #include <systemd/sd-bus.h>
 #include <systemd/sd-event.h>
 #include <stdbool.h>
 #include <stdlib.h>
 #include <systemd/sd-bus.h>
 #include <systemd/sd-event.h>

-#include <systemd/sd-login.h>
-#include <xkbcommon/xkbcommon.h>

 #include "hashmap.h"
 #include "idev.h"
 #include "idev-internal.h"
 #include "login-shared.h"
 #include "macro.h"
 #include "hashmap.h"
 #include "idev.h"
 #include "idev-internal.h"
 #include "login-shared.h"
 #include "macro.h"

-#include "udev-util.h"

 #include "util.h"
 
 static void element_open(idev_element *e);
 #include "util.h"
 
 static void element_open(idev_element *e);

diff --git a/src/libsystemd-terminal/idev.h b/src/libsystemd-terminal/idev.h
index c8c03f3d41be9937182fb184252f46e0f0fda544..0e846179e6093c061cb9cde2b7ca0704cbdf4901 100644 (file)
--- a/src/libsystemd-terminal/idev.h
+++ b/src/libsystemd-terminal/idev.h
@@ -25,15 +25,12 @@
 
 #pragma once
 
 
 #pragma once
 

-#include <inttypes.h>

 #include <libudev.h>
 #include <linux/input.h>
 #include <stdbool.h>
 #include <libudev.h>
 #include <linux/input.h>
 #include <stdbool.h>

-#include <stdlib.h>

 #include <systemd/sd-bus.h>
 #include <systemd/sd-event.h>
 #include <xkbcommon/xkbcommon.h>
 #include <systemd/sd-bus.h>
 #include <systemd/sd-event.h>
 #include <xkbcommon/xkbcommon.h>

-#include "util.h"

 
 typedef struct idev_data                idev_data;
 typedef struct idev_data_evdev          idev_data_evdev;
 
 typedef struct idev_data                idev_data;
 typedef struct idev_data_evdev          idev_data_evdev;

diff --git a/src/libsystemd-terminal/modeset.c b/src/libsystemd-terminal/modeset.c
index 6e13432d688fb7709a86d48590f6e512ce0157b6..cccaabaa0622037de627e1795861872c5abb2271 100644 (file)
--- a/src/libsystemd-terminal/modeset.c
+++ b/src/libsystemd-terminal/modeset.c
@@ -30,11 +30,9 @@
 #include <errno.h>
 #include <getopt.h>
 #include <linux/kd.h>
 #include <errno.h>
 #include <getopt.h>
 #include <linux/kd.h>

-#include <linux/vt.h>

 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>

-#include <string.h>

 #include <sys/ioctl.h>
 #include <sys/stat.h>
 #include <systemd/sd-bus.h>
 #include <sys/ioctl.h>
 #include <sys/stat.h>
 #include <systemd/sd-bus.h>


@@ -43,10 +41,7 @@
 #include <termios.h>
 #include <unistd.h>
 #include "build.h"
 #include <termios.h>
 #include <unistd.h>
 #include "build.h"

-#include "bus-util.h"
-#include "event-util.h"

 #include "grdev.h"
 #include "grdev.h"

-#include "grdev-internal.h"

 #include "macro.h"
 #include "sysview.h"
 #include "util.h"
 #include "macro.h"
 #include "sysview.h"
 #include "util.h"

diff --git a/src/libsystemd-terminal/subterm.c b/src/libsystemd-terminal/subterm.c
index 63cd2a5ad689d6ee07f3ddc6011e3f8a7c51f9a9..983a2a14abd74bacbb232396597b1a6eff2b2ea0 100644 (file)
--- a/src/libsystemd-terminal/subterm.c
+++ b/src/libsystemd-terminal/subterm.c
@@ -26,7 +26,6 @@
  * parent TTY. Think of this like what "GNU-screen" does.
  */
 
  * parent TTY. Think of this like what "GNU-screen" does.
  */
 

-#include <assert.h>

 #include <errno.h>
 #include <stdarg.h>
 #include <stdbool.h>
 #include <errno.h>
 #include <stdarg.h>
 #include <stdbool.h>

diff --git a/src/libsystemd-terminal/sysview.c b/src/libsystemd-terminal/sysview.c
index 9ee32db1bc2ab08f07f7fbb0f8a90664454d0030..cd61ea44e7b89f3cb873d1a6a7a699421cdc9bd5 100644 (file)
--- a/src/libsystemd-terminal/sysview.c
+++ b/src/libsystemd-terminal/sysview.c
@@ -27,9 +27,7 @@
 #include <systemd/sd-event.h>
 #include <systemd/sd-login.h>
 #include "bus-util.h"
 #include <systemd/sd-event.h>
 #include <systemd/sd-login.h>
 #include "bus-util.h"

-#include "event-util.h"

 #include "macro.h"
 #include "macro.h"

-#include "set.h"

 #include "sysview.h"
 #include "sysview-internal.h"
 #include "udev-util.h"
 #include "sysview.h"
 #include "sysview-internal.h"
 #include "udev-util.h"

diff --git a/src/libsystemd-terminal/sysview.h b/src/libsystemd-terminal/sysview.h
index cad603d59fe7740d5e955fb3374c30135072a916..aa5527ff324ad17fae4541e61c6e5fe155a1784b 100644 (file)
--- a/src/libsystemd-terminal/sysview.h
+++ b/src/libsystemd-terminal/sysview.h
@@ -36,13 +36,9 @@
 
 #pragma once
 
 
 #pragma once
 

-#include <inttypes.h>
-#include <libudev.h>

 #include <stdbool.h>
 #include <stdbool.h>

-#include <stdlib.h>

 #include <systemd/sd-bus.h>
 #include <systemd/sd-event.h>
 #include <systemd/sd-bus.h>
 #include <systemd/sd-event.h>

-#include "util.h"

 
 typedef struct sysview_event            sysview_event;
 typedef struct sysview_device           sysview_device;
 
 typedef struct sysview_event            sysview_event;
 typedef struct sysview_device           sysview_device;

diff --git a/src/libsystemd-terminal/term-charset.c b/src/libsystemd-terminal/term-charset.c
index a00a1912daf78000eeafc3ad058bed3bffe5a71e..9db178861ca956fa297ff772be83e0fa26bf0c4e 100644 (file)
--- a/src/libsystemd-terminal/term-charset.c
+++ b/src/libsystemd-terminal/term-charset.c
@@ -60,9 +60,6 @@
  * include them. The mapper has to take care not to use them in GL.
  */
 
  * include them. The mapper has to take care not to use them in GL.
  */
 

-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>

 #include "term-internal.h"
 
 /*
 #include "term-internal.h"
 
 /*

diff --git a/src/libsystemd-terminal/term-page.c b/src/libsystemd-terminal/term-page.c
index ae73cdf62763f50c062c276c56b909dc6f8285d1..cbd80067347a536eadfc3c84f7d81530ebc39f39 100644 (file)
--- a/src/libsystemd-terminal/term-page.c
+++ b/src/libsystemd-terminal/term-page.c
@@ -75,7 +75,6 @@
 #include <stdbool.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <stdbool.h>
 #include <stdint.h>
 #include <stdlib.h>

-#include <wchar.h>

 #include "macro.h"
 #include "term-internal.h"
 #include "util.h"
 #include "macro.h"
 #include "term-internal.h"
 #include "util.h"

diff --git a/src/libsystemd-terminal/term-wcwidth.c b/src/libsystemd-terminal/term-wcwidth.c
index df20a40451e2af24be2f2c3837f55bde2e3f6805..833a099bd7eac3d804387d1b4aa4c5d2b3a5e281 100644 (file)
--- a/src/libsystemd-terminal/term-wcwidth.c
+++ b/src/libsystemd-terminal/term-wcwidth.c
@@ -62,7 +62,6 @@
  * Latest version: http://www.cl.cam.ac.uk/~mgk25/ucs/wcwidth.c
  */
 
  * Latest version: http://www.cl.cam.ac.uk/~mgk25/ucs/wcwidth.c
  */
 

-#include <wchar.h>

 #include "term-internal.h"
 
 struct interval {
 #include "term-internal.h"
 
 struct interval {

diff --git a/src/libsystemd-terminal/test-term-page.c b/src/libsystemd-terminal/test-term-page.c
index 9e338776e88c609430220539081a84184a5eab77..d59139b62d731da4e749d9b578dd28061cbe62e5 100644 (file)
--- a/src/libsystemd-terminal/test-term-page.c
+++ b/src/libsystemd-terminal/test-term-page.c
@@ -25,14 +25,10 @@
  * those internals are changed. They should be fairly obvious, though.
  */
 
  * those internals are changed. They should be fairly obvious, though.
  */
 

-#include <assert.h>
-#include <errno.h>

 #include <stdio.h>
 #include <stdio.h>

-#include <stdlib.h>

 #include <string.h>
 #include "macro.h"
 #include "term-internal.h"
 #include <string.h>
 #include "macro.h"
 #include "term-internal.h"

-#include "util.h"

 
 #define MY_ASSERT_VALS __FILE__, __LINE__, __PRETTY_FUNCTION__
 #define MY_ASSERT_FORW _FILE, _LINE, _FUNC
 
 #define MY_ASSERT_VALS __FILE__, __LINE__, __PRETTY_FUNCTION__
 #define MY_ASSERT_FORW _FILE, _LINE, _FUNC

diff --git a/src/libsystemd-terminal/test-term-parser.c b/src/libsystemd-terminal/test-term-parser.c
index e22614d06dd2e521081297c78826f25d7b9e0a31..e40b267b1cf4dd6a3316a7588b7f4f27283c39f3 100644 (file)
--- a/src/libsystemd-terminal/test-term-parser.c
+++ b/src/libsystemd-terminal/test-term-parser.c
@@ -22,14 +22,10 @@
  * Terminal Parser Tests
  */
 
  * Terminal Parser Tests
  */
 

-#include <assert.h>
-#include <errno.h>

 #include <stdio.h>
 #include <stdio.h>

-#include <stdlib.h>

 #include <string.h>
 #include "macro.h"
 #include "term-internal.h"
 #include <string.h>
 #include "macro.h"
 #include "term-internal.h"

-#include "util.h"

 #include "utf8.h"
 
 static void test_term_utf8_invalid(void) {
 #include "utf8.h"
 
 static void test_term_utf8_invalid(void) {

diff --git a/src/libsystemd-terminal/test-unifont.c b/src/libsystemd-terminal/test-unifont.c
index cfeef61a4712389dd686b9ff0784f3e31eb188d8..2366d385742e3b7d781cb9dbc22e800b3c637dc8 100644 (file)
--- a/src/libsystemd-terminal/test-unifont.c
+++ b/src/libsystemd-terminal/test-unifont.c
@@ -24,14 +24,11 @@
  * The glyphs are then compared to hard-coded glyphs.
  */
 
  * The glyphs are then compared to hard-coded glyphs.
  */
 

-#include <errno.h>

 #include <stdio.h>
 #include <stdio.h>

-#include <stdlib.h>

 #include <string.h>
 #include "macro.h"
 #include "unifont-def.h"
 #include "unifont.h"
 #include <string.h>
 #include "macro.h"
 #include "unifont-def.h"
 #include "unifont.h"

-#include "util.h"

 
 static void render(char *w, const unifont_glyph *g) {
         unsigned int i, j;
 
 static void render(char *w, const unifont_glyph *g) {
         unsigned int i, j;

diff --git a/src/libsystemd-terminal/unifont.c b/src/libsystemd-terminal/unifont.c
index 2acfa9821ab2520e19f2604b25d025adaaba2c2f..0da81e8ff2dcd46822991f3ee9039a11ddef8501 100644 (file)
--- a/src/libsystemd-terminal/unifont.c
+++ b/src/libsystemd-terminal/unifont.c
@@ -28,13 +28,10 @@
 
 #include <endian.h>
 #include <fcntl.h>
 
 #include <endian.h>
 #include <fcntl.h>

-#include <stdbool.h>

 #include <stdint.h>
 #include <stdlib.h>
 #include <sys/mman.h>
 #include <sys/stat.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <sys/mman.h>
 #include <sys/stat.h>

-#include <sys/types.h>
-#include <unistd.h>

 #include "macro.h"
 #include "unifont-def.h"
 #include "unifont.h"
 #include "macro.h"
 #include "unifont-def.h"
 #include "unifont.h"

diff --git a/src/libsystemd-terminal/unifont.h b/src/libsystemd-terminal/unifont.h
index 30527cb3fa1aaada578dd8e732ed5b5d5ac5a71d..74ee5ecb3cec6d03746092e071ad751f05974aa2 100644 (file)
--- a/src/libsystemd-terminal/unifont.h
+++ b/src/libsystemd-terminal/unifont.h
@@ -21,10 +21,7 @@
 
 #pragma once
 
 
 #pragma once
 

-#include <stdbool.h>

 #include <stdint.h>
 #include <stdint.h>

-#include <stdlib.h>
-#include "util.h"

 
 typedef struct unifont unifont;
 typedef struct unifont_glyph unifont_glyph;
 
 typedef struct unifont unifont;
 typedef struct unifont_glyph unifont_glyph;

diff --git a/src/libsystemd/sd-bus/bus-bloom.h b/src/libsystemd/sd-bus/bus-bloom.h
index 96c82d7e8fc3e944399cac31e9cc8bd1583f2e0a..a9350d7f51ca2c7085a9efc265ee3a83afd1ea73 100644 (file)
--- a/src/libsystemd/sd-bus/bus-bloom.h
+++ b/src/libsystemd/sd-bus/bus-bloom.h
@@ -23,7 +23,6 @@
 
 #include <stdbool.h>
 #include <stdint.h>
 
 #include <stdbool.h>
 #include <stdint.h>

-#include <sys/types.h>

 
 /*
  * Our default bloom filter has the following parameters:
 
 /*
  * Our default bloom filter has the following parameters:

diff --git a/src/libsystemd/sd-bus/bus-common-errors.h b/src/libsystemd/sd-bus/bus-common-errors.h
index e935833bc325f4065194e72b6bbadb3425efef7d..b17b62ac934fe3ea898140137cf2c387d6e408b8 100644 (file)
--- a/src/libsystemd/sd-bus/bus-common-errors.h
+++ b/src/libsystemd/sd-bus/bus-common-errors.h
@@ -21,7 +21,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include "sd-bus.h"

 #include "bus-error.h"
 
 #define BUS_ERROR_NO_SUCH_UNIT "org.freedesktop.systemd1.NoSuchUnit"
 #include "bus-error.h"
 
 #define BUS_ERROR_NO_SUCH_UNIT "org.freedesktop.systemd1.NoSuchUnit"

diff --git a/src/libsystemd/sd-bus/bus-container.c b/src/libsystemd/sd-bus/bus-container.c
index d29b98a26941941e4fb0c5ee49c69287d9f44f1a..3b3a5d357f755cd211da24ff44f8163bc703cc18 100644 (file)
--- a/src/libsystemd/sd-bus/bus-container.c
+++ b/src/libsystemd/sd-bus/bus-container.c
@@ -23,7 +23,6 @@
 #include <fcntl.h>
 
 #include "util.h"
 #include <fcntl.h>
 
 #include "util.h"

-#include "fileio.h"

 #include "bus-internal.h"
 #include "bus-socket.h"
 #include "bus-container.h"
 #include "bus-internal.h"
 #include "bus-socket.h"
 #include "bus-container.h"

diff --git a/src/libsystemd/sd-bus/bus-control.c b/src/libsystemd/sd-bus/bus-control.c
index bd439a95ddf625919be37ef48f6391f0e370783a..19aa4bd4f04ad37d2abd5b049bb45b922102591c 100644 (file)
--- a/src/libsystemd/sd-bus/bus-control.c
+++ b/src/libsystemd/sd-bus/bus-control.c
@@ -34,7 +34,6 @@
 #include "bus-bloom.h"
 #include "bus-util.h"
 #include "capability.h"
 #include "bus-bloom.h"
 #include "bus-util.h"
 #include "capability.h"

-#include "cgroup-util.h"

 
 _public_ int sd_bus_get_unique_name(sd_bus *bus, const char **unique) {
         int r;
 
 _public_ int sd_bus_get_unique_name(sd_bus *bus, const char **unique) {
         int r;

diff --git a/src/libsystemd/sd-bus/bus-creds.c b/src/libsystemd/sd-bus/bus-creds.c
index ea8a619c5acc19a9ab9abe2c754fbbac1bcbcdcb..a08391bfc2ae2e47b23743d9e13d8cd1f57a8448 100644 (file)
--- a/src/libsystemd/sd-bus/bus-creds.c
+++ b/src/libsystemd/sd-bus/bus-creds.c
@@ -29,7 +29,6 @@
 #include "audit.h"
 #include "bus-message.h"
 #include "bus-util.h"
 #include "audit.h"
 #include "bus-message.h"
 #include "bus-util.h"

-#include "time-util.h"

 #include "strv.h"
 #include "bus-creds.h"
 #include "bus-label.h"
 #include "strv.h"
 #include "bus-creds.h"
 #include "bus-label.h"

diff --git a/src/libsystemd/sd-bus/bus-creds.h b/src/libsystemd/sd-bus/bus-creds.h
index 3b337efa3235c0b6ae746eed5482f406f2daf968..5430e535f00f2b8a74770773de608ddd02e1ef94 100644 (file)
--- a/src/libsystemd/sd-bus/bus-creds.h
+++ b/src/libsystemd/sd-bus/bus-creds.h
@@ -24,7 +24,6 @@
 #include <stdbool.h>
 
 #include "sd-bus.h"
 #include <stdbool.h>
 
 #include "sd-bus.h"

-#include "time-util.h"

 
 struct sd_bus_creds {
         bool allocated;
 
 struct sd_bus_creds {
         bool allocated;

diff --git a/src/libsystemd/sd-bus/bus-dump.c b/src/libsystemd/sd-bus/bus-dump.c
index 718163964537a46ef3fda1aafaea4d533868766a..4bc896549a464eded5e0035baa5f3d94b34aff8c 100644 (file)
--- a/src/libsystemd/sd-bus/bus-dump.c
+++ b/src/libsystemd/sd-bus/bus-dump.c
@@ -22,7 +22,6 @@
 #include "util.h"
 #include "capability.h"
 #include "strv.h"
 #include "util.h"
 #include "capability.h"
 #include "strv.h"

-#include "audit.h"

 #include "macro.h"
 #include "cap-list.h"
 
 #include "macro.h"
 #include "cap-list.h"
 

diff --git a/src/libsystemd/sd-bus/bus-gvariant.c b/src/libsystemd/sd-bus/bus-gvariant.c
index 02b95cd1364be07955a9ec3ff3a69cbdb137a1ef..2d18a4e6c19706b8ad296e97f0958be33facce0d 100644 (file)
--- a/src/libsystemd/sd-bus/bus-gvariant.c
+++ b/src/libsystemd/sd-bus/bus-gvariant.c
@@ -19,7 +19,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include "util.h"

 #include "bus-type.h"
 #include "bus-gvariant.h"
 #include "bus-signature.h"
 #include "bus-type.h"
 #include "bus-gvariant.h"
 #include "bus-signature.h"

diff --git a/src/libsystemd/sd-bus/bus-internal.h b/src/libsystemd/sd-bus/bus-internal.h
index bebb2c2fac37ec2aee4c96b8605d1a1381670959..1351938c80e7f0294831b441329a4fcd7311b1de 100644 (file)
--- a/src/libsystemd/sd-bus/bus-internal.h
+++ b/src/libsystemd/sd-bus/bus-internal.h
@@ -22,8 +22,6 @@
 ***/
 
 #include <sys/socket.h>
 ***/
 
 #include <sys/socket.h>

-#include <sys/un.h>
-#include <netinet/in.h>

 #include <pthread.h>
 
 #include "hashmap.h"
 #include <pthread.h>
 
 #include "hashmap.h"

diff --git a/src/libsystemd/sd-bus/bus-introspect.c b/src/libsystemd/sd-bus/bus-introspect.c
index d528ab2a04b1fe826dc71a15c7b2d15578a19c4b..e2f4550c7ec942e6879df7c664068b73885244a3 100644 (file)
--- a/src/libsystemd/sd-bus/bus-introspect.c
+++ b/src/libsystemd/sd-bus/bus-introspect.c
@@ -20,7 +20,6 @@
 ***/
 
 #include "util.h"
 ***/
 
 #include "util.h"

-#include "sd-bus-protocol.h"

 #include "bus-introspect.h"
 #include "bus-signature.h"
 #include "bus-internal.h"
 #include "bus-introspect.h"
 #include "bus-signature.h"
 #include "bus-internal.h"

diff --git a/src/libsystemd/sd-bus/bus-introspect.h b/src/libsystemd/sd-bus/bus-introspect.h
index 98312d123b2b1ed553a2fd75587de343e7348865..1914e6cb8b35c04c509147f0a35eb3e39d1495b0 100644 (file)
--- a/src/libsystemd/sd-bus/bus-introspect.h
+++ b/src/libsystemd/sd-bus/bus-introspect.h
@@ -21,7 +21,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include <sys/types.h>

 #include <stdio.h>
 
 #include "sd-bus.h"
 #include <stdio.h>
 
 #include "sd-bus.h"

diff --git a/src/libsystemd/sd-bus/bus-kernel.c b/src/libsystemd/sd-bus/bus-kernel.c
index df772036ee44b03020fe9cdb0755bbc02abc5b6f..4333445f2a87e7dc288c2096f5eee4177b88ad9d 100644 (file)
--- a/src/libsystemd/sd-bus/bus-kernel.c
+++ b/src/libsystemd/sd-bus/bus-kernel.c
@@ -38,7 +38,6 @@
 #include "strv.h"
 #include "memfd-util.h"
 #include "capability.h"
 #include "strv.h"
 #include "memfd-util.h"
 #include "capability.h"

-#include "cgroup-util.h"

 #include "fileio.h"
 
 #include "bus-internal.h"
 #include "fileio.h"
 
 #include "bus-internal.h"

diff --git a/src/libsystemd/sd-bus/bus-match.c b/src/libsystemd/sd-bus/bus-match.c
index 162f0ab608b1b6066e9792ed65db1d539a0768ca..a9e944c94bff707fe4cf2739d0e7915ad582977c 100644 (file)
--- a/src/libsystemd/sd-bus/bus-match.c
+++ b/src/libsystemd/sd-bus/bus-match.c
@@ -22,7 +22,6 @@
 #include "bus-internal.h"
 #include "bus-message.h"
 #include "bus-match.h"
 #include "bus-internal.h"
 #include "bus-message.h"
 #include "bus-match.h"

-#include "bus-error.h"

 #include "bus-util.h"
 #include "strv.h"
 
 #include "bus-util.h"
 #include "strv.h"
 

diff --git a/src/libsystemd/sd-bus/bus-message.c b/src/libsystemd/sd-bus/bus-message.c
index 076b85f3b92d02f85612ffb6a6e457ec9924a346..77216a6f491fb8452426fbe47446785297cd6a14 100644 (file)
--- a/src/libsystemd/sd-bus/bus-message.c
+++ b/src/libsystemd/sd-bus/bus-message.c
@@ -27,7 +27,6 @@
 #include "utf8.h"
 #include "strv.h"
 #include "time-util.h"
 #include "utf8.h"
 #include "strv.h"
 #include "time-util.h"

-#include "cgroup-util.h"

 #include "memfd-util.h"
 
 #include "sd-bus.h"
 #include "memfd-util.h"
 
 #include "sd-bus.h"

diff --git a/src/libsystemd/sd-bus/bus-message.h b/src/libsystemd/sd-bus/bus-message.h
index 32955329b42e68aef9c2ae148bd81095c5362766..a68dee42b7395af204d93287310d4e5f23de8c3e 100644 (file)
--- a/src/libsystemd/sd-bus/bus-message.h
+++ b/src/libsystemd/sd-bus/bus-message.h
@@ -23,11 +23,9 @@
 
 #include <stdbool.h>
 #include <byteswap.h>
 
 #include <stdbool.h>
 #include <byteswap.h>

-#include <sys/socket.h>

 
 #include "macro.h"
 #include "sd-bus.h"
 
 #include "macro.h"
 #include "sd-bus.h"

-#include "kdbus.h"

 #include "time-util.h"
 #include "bus-creds.h"
 #include "bus-protocol.h"
 #include "time-util.h"
 #include "bus-creds.h"
 #include "bus-protocol.h"

diff --git a/src/libsystemd/sd-bus/bus-signature.h b/src/libsystemd/sd-bus/bus-signature.h
index 2e06e30548437bfa2122de4ab1def36c25f68ffe..c4fed0b53dcde510740b61ad073e3298ba7a3fef 100644 (file)
--- a/src/libsystemd/sd-bus/bus-signature.h
+++ b/src/libsystemd/sd-bus/bus-signature.h
@@ -22,7 +22,6 @@
 ***/
 
 #include <stdbool.h>
 ***/
 
 #include <stdbool.h>

-#include <sys/types.h>

 
 bool signature_is_single(const char *s, bool allow_dict_entry);
 bool signature_is_pair(const char *s);
 
 bool signature_is_single(const char *s, bool allow_dict_entry);
 bool signature_is_pair(const char *s);

diff --git a/src/libsystemd/sd-bus/bus-socket.c b/src/libsystemd/sd-bus/bus-socket.c
index 52883fa8cde2d7ee34a1a7a83c0f19ac8af3eb3b..c15929c2bbb0755360368d57ef3835b6ddfaed27 100644 (file)
--- a/src/libsystemd/sd-bus/bus-socket.c
+++ b/src/libsystemd/sd-bus/bus-socket.c
@@ -20,16 +20,13 @@
 ***/
 
 #include <endian.h>
 ***/
 
 #include <endian.h>

-#include <assert.h>

 #include <stdlib.h>
 #include <unistd.h>
 #include <poll.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <poll.h>

-#include <byteswap.h>

 
 #include "util.h"
 #include "macro.h"
 #include "missing.h"
 
 #include "util.h"
 #include "macro.h"
 #include "missing.h"

-#include "strv.h"

 #include "utf8.h"
 #include "sd-daemon.h"
 
 #include "utf8.h"
 #include "sd-daemon.h"
 

diff --git a/src/libsystemd/sd-bus/bus-track.c b/src/libsystemd/sd-bus/bus-track.c
index 6be8310bbe02655b65cb0c022816032747f10c6a..048178550b5fb5a50cff72ae16842cea31bd6929 100644 (file)
--- a/src/libsystemd/sd-bus/bus-track.c
+++ b/src/libsystemd/sd-bus/bus-track.c
@@ -20,7 +20,6 @@
 ***/
 
 #include "sd-bus.h"
 ***/
 
 #include "sd-bus.h"

-#include "set.h"

 #include "bus-util.h"
 #include "bus-internal.h"
 #include "bus-track.h"
 #include "bus-util.h"
 #include "bus-internal.h"
 #include "bus-track.h"

diff --git a/src/libsystemd/sd-bus/bus-type.c b/src/libsystemd/sd-bus/bus-type.c
index b7914d15d3b7b7f6da787c47cf10ce6aacc27401..6bc7b880a624f2cd23d1a6bd5d361512c19244d4 100644 (file)
--- a/src/libsystemd/sd-bus/bus-type.c
+++ b/src/libsystemd/sd-bus/bus-type.c
@@ -19,7 +19,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include "util.h"

 #include "bus-type.h"
 
 bool bus_type_is_valid(char c) {
 #include "bus-type.h"
 
 bool bus_type_is_valid(char c) {

diff --git a/src/libsystemd/sd-bus/bus-type.h b/src/libsystemd/sd-bus/bus-type.h
index 0e507839ca07fbeea8f69d8be8e70fa85611d630..581574ab73183b98344814d9cbcbe5f05ddb7bd4 100644 (file)
--- a/src/libsystemd/sd-bus/bus-type.h
+++ b/src/libsystemd/sd-bus/bus-type.h
@@ -25,7 +25,6 @@
 
 #include "macro.h"
 #include "sd-bus.h"
 
 #include "macro.h"
 #include "sd-bus.h"

-#include "sd-bus-protocol.h"

 
 bool bus_type_is_valid(char c) _const_;
 bool bus_type_is_valid_in_signature(char c) _const_;
 
 bool bus_type_is_valid(char c) _const_;
 bool bus_type_is_valid_in_signature(char c) _const_;

diff --git a/src/libsystemd/sd-bus/bus-util.h b/src/libsystemd/sd-bus/bus-util.h
index e9efa3597cbf7366218e62d9467b3316ad2beba9..9f048711deb8f3e3eb37208b93aaaccde9cc4740 100644 (file)
--- a/src/libsystemd/sd-bus/bus-util.h
+++ b/src/libsystemd/sd-bus/bus-util.h
@@ -25,7 +25,6 @@
 #include "sd-bus.h"
 #include "hashmap.h"
 #include "time-util.h"
 #include "sd-bus.h"
 #include "hashmap.h"
 #include "time-util.h"

-#include "util.h"

 
 typedef enum BusTransport {
         BUS_TRANSPORT_LOCAL,
 
 typedef enum BusTransport {
         BUS_TRANSPORT_LOCAL,

diff --git a/src/libsystemd/sd-bus/busctl-introspect.h b/src/libsystemd/sd-bus/busctl-introspect.h
index d6b4cf05a74d81211d1370da6851b8a1f3774498..ea807d5973753d49da3b66fb15282e6ed7f0d2fc 100644 (file)
--- a/src/libsystemd/sd-bus/busctl-introspect.h
+++ b/src/libsystemd/sd-bus/busctl-introspect.h
@@ -21,7 +21,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include <inttypes.h>

 #include <stdbool.h>
 
 typedef struct XMLIntrospectOps {
 #include <stdbool.h>
 
 typedef struct XMLIntrospectOps {

diff --git a/src/libsystemd/sd-bus/busctl.c b/src/libsystemd/sd-bus/busctl.c
index d3c1772019c901eed3f7dbf61b028bce2b9923cb..d52dbdfd81bde3d14119399dae248c7a0391e1d3 100644 (file)
--- a/src/libsystemd/sd-bus/busctl.c
+++ b/src/libsystemd/sd-bus/busctl.c
@@ -26,12 +26,10 @@
 #include "log.h"
 #include "build.h"
 #include "pager.h"
 #include "log.h"
 #include "build.h"
 #include "pager.h"

-#include "xml.h"

 #include "path-util.h"
 #include "set.h"
 
 #include "sd-bus.h"
 #include "path-util.h"
 #include "set.h"
 
 #include "sd-bus.h"

-#include "bus-message.h"

 #include "bus-internal.h"
 #include "bus-util.h"
 #include "bus-dump.h"
 #include "bus-internal.h"
 #include "bus-util.h"
 #include "bus-dump.h"

diff --git a/src/libsystemd/sd-bus/sd-bus.c b/src/libsystemd/sd-bus/sd-bus.c
index 6a7f9c04ac2625cabade7012a6eb09c76cef035c..58a625feddec53ce65496cbe1388cbc3f3c2b3b1 100644 (file)
--- a/src/libsystemd/sd-bus/sd-bus.c
+++ b/src/libsystemd/sd-bus/sd-bus.c
@@ -20,19 +20,16 @@
 ***/
 
 #include <endian.h>
 ***/
 
 #include <endian.h>

-#include <assert.h>

 #include <stdlib.h>
 #include <unistd.h>
 #include <netdb.h>
 #include <poll.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <netdb.h>
 #include <poll.h>

-#include <byteswap.h>

 #include <sys/mman.h>
 #include <pthread.h>
 
 #include "util.h"
 #include "macro.h"
 #include "strv.h"
 #include <sys/mman.h>
 #include <pthread.h>
 
 #include "util.h"
 #include "macro.h"
 #include "strv.h"

-#include "set.h"

 #include "missing.h"
 #include "def.h"
 #include "cgroup-util.h"
 #include "missing.h"
 #include "def.h"
 #include "cgroup-util.h"


@@ -45,8 +42,6 @@
 #include "bus-socket.h"
 #include "bus-kernel.h"
 #include "bus-control.h"
 #include "bus-socket.h"
 #include "bus-kernel.h"
 #include "bus-control.h"

-#include "bus-introspect.h"
-#include "bus-signature.h"

 #include "bus-objects.h"
 #include "bus-util.h"
 #include "bus-container.h"
 #include "bus-objects.h"
 #include "bus-util.h"
 #include "bus-container.h"

diff --git a/src/libsystemd/sd-bus/test-bus-chat.c b/src/libsystemd/sd-bus/test-bus-chat.c
index 8625ee6d89bee867291bd637bb7b1a10b6a0c816..7f49fe90fab2a255be6fb86d6246857df77eb874 100644 (file)
--- a/src/libsystemd/sd-bus/test-bus-chat.c
+++ b/src/libsystemd/sd-bus/test-bus-chat.c
@@ -29,7 +29,6 @@
 #include "macro.h"
 
 #include "sd-bus.h"
 #include "macro.h"
 
 #include "sd-bus.h"

-#include "bus-message.h"

 #include "bus-error.h"
 #include "bus-match.h"
 #include "bus-internal.h"
 #include "bus-error.h"
 #include "bus-match.h"
 #include "bus-internal.h"

diff --git a/src/libsystemd/sd-bus/test-bus-creds.c b/src/libsystemd/sd-bus/test-bus-creds.c
index ff2602ba34682a5b9c15a158c7522d8a2e2e80be..edd5033db212d4023733ebf3193202fe5b0421c5 100644 (file)
--- a/src/libsystemd/sd-bus/test-bus-creds.c
+++ b/src/libsystemd/sd-bus/test-bus-creds.c
@@ -22,7 +22,6 @@
 #include "sd-bus.h"
 #include "bus-dump.h"
 #include "bus-util.h"
 #include "sd-bus.h"
 #include "bus-dump.h"
 #include "bus-util.h"

-#include "util.h"

 
 int main(int argc, char *argv[]) {
         _cleanup_bus_creds_unref_ sd_bus_creds *creds = NULL;
 
 int main(int argc, char *argv[]) {
         _cleanup_bus_creds_unref_ sd_bus_creds *creds = NULL;

diff --git a/src/libsystemd/sd-bus/test-bus-introspect.c b/src/libsystemd/sd-bus/test-bus-introspect.c
index 67b6461f30e5f9423df9a22265a0da47dd432990..b2caa028703ad7780cd8cbf3e3728f823898b07a 100644 (file)
--- a/src/libsystemd/sd-bus/test-bus-introspect.c
+++ b/src/libsystemd/sd-bus/test-bus-introspect.c
@@ -19,7 +19,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include "util.h"

 #include "log.h"
 #include "bus-introspect.h"
 
 #include "log.h"
 #include "bus-introspect.h"
 

diff --git a/src/libsystemd/sd-bus/test-bus-kernel-benchmark.c b/src/libsystemd/sd-bus/test-bus-kernel-benchmark.c
index 35f87e91bd9c927f7420dc91eb1dcc7ebeb9adaa..1cacb95df3c0c021958bdb4d28705a91549297d3 100644 (file)
--- a/src/libsystemd/sd-bus/test-bus-kernel-benchmark.c
+++ b/src/libsystemd/sd-bus/test-bus-kernel-benchmark.c
@@ -19,16 +19,12 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include <ctype.h>

 #include <sys/wait.h>
 
 #include "util.h"
 #include <sys/wait.h>
 
 #include "util.h"

-#include "log.h"

 #include "time-util.h"
 
 #include "sd-bus.h"
 #include "time-util.h"
 
 #include "sd-bus.h"

-#include "bus-message.h"
-#include "bus-error.h"

 #include "bus-kernel.h"
 #include "bus-internal.h"
 #include "bus-util.h"
 #include "bus-kernel.h"
 #include "bus-internal.h"
 #include "bus-util.h"

diff --git a/src/libsystemd/sd-bus/test-bus-kernel-bloom.c b/src/libsystemd/sd-bus/test-bus-kernel-bloom.c
index 071b7e0cf98ba2b415b5f0f192414c7277517a6e..b11c43bd7b0fa0c010d4ea82d5833b278ab7a8c7 100644 (file)
--- a/src/libsystemd/sd-bus/test-bus-kernel-bloom.c
+++ b/src/libsystemd/sd-bus/test-bus-kernel-bloom.c
@@ -23,8 +23,6 @@
 #include "log.h"
 
 #include "sd-bus.h"
 #include "log.h"
 
 #include "sd-bus.h"

-#include "bus-message.h"
-#include "bus-error.h"

 #include "bus-kernel.h"
 #include "bus-util.h"
 
 #include "bus-kernel.h"
 #include "bus-util.h"
 

diff --git a/src/libsystemd/sd-bus/test-bus-kernel.c b/src/libsystemd/sd-bus/test-bus-kernel.c
index c396eac2d24128dce731b39fc5815350bb83b8c5..8f4f60b65f1837513c816191f4e0bbe82da341a0 100644 (file)
--- a/src/libsystemd/sd-bus/test-bus-kernel.c
+++ b/src/libsystemd/sd-bus/test-bus-kernel.c
@@ -25,8 +25,6 @@
 #include "log.h"
 
 #include "sd-bus.h"
 #include "log.h"
 
 #include "sd-bus.h"

-#include "bus-message.h"
-#include "bus-error.h"

 #include "bus-kernel.h"
 #include "bus-util.h"
 #include "bus-dump.h"
 #include "bus-kernel.h"
 #include "bus-util.h"
 #include "bus-dump.h"

diff --git a/src/libsystemd/sd-bus/test-bus-marshal.c b/src/libsystemd/sd-bus/test-bus-marshal.c
index d95a03c221a1d1bfec846c07f1fc610f0a3e770d..7569ff98be4f56645652e4edf868f7f5d0accf66 100644 (file)
--- a/src/libsystemd/sd-bus/test-bus-marshal.c
+++ b/src/libsystemd/sd-bus/test-bus-marshal.c
@@ -19,9 +19,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include <assert.h>

 #include <stdlib.h>
 #include <stdlib.h>

-#include <byteswap.h>

 #include <math.h>
 
 #ifdef HAVE_GLIB
 #include <math.h>
 
 #ifdef HAVE_GLIB

diff --git a/src/libsystemd/sd-bus/test-bus-match.c b/src/libsystemd/sd-bus/test-bus-match.c
index 76ca0b6bf34fc4505d3cce78165befe49bb5274a..051969f9c759c3c5ba956f855873572414b54e59 100644 (file)
--- a/src/libsystemd/sd-bus/test-bus-match.c
+++ b/src/libsystemd/sd-bus/test-bus-match.c
@@ -20,7 +20,6 @@
 ***/
 
 #include "log.h"
 ***/
 
 #include "log.h"

-#include "util.h"

 #include "macro.h"
 
 #include "bus-match.h"
 #include "macro.h"
 
 #include "bus-match.h"

diff --git a/src/libsystemd/sd-bus/test-bus-objects.c b/src/libsystemd/sd-bus/test-bus-objects.c
index acf67a52b32f6da994146da3ed27c43fc8a28dbc..895eda4eaa4df0f15ab1a059bfecb8c99e539cec 100644 (file)
--- a/src/libsystemd/sd-bus/test-bus-objects.c
+++ b/src/libsystemd/sd-bus/test-bus-objects.c
@@ -19,11 +19,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include <assert.h>

 #include <stdlib.h>
 #include <pthread.h>
 #include <stdlib.h>
 #include <pthread.h>

-#include <unistd.h>
-#include <fcntl.h>

 
 #include "log.h"
 #include "util.h"
 
 #include "log.h"
 #include "util.h"

diff --git a/src/libsystemd/sd-bus/test-bus-server.c b/src/libsystemd/sd-bus/test-bus-server.c
index 5f807c3b1e11f25826040614087f359e37815cbb..080d8eddb76ddc2fa4c939c13050cf6a5a3eefa7 100644 (file)
--- a/src/libsystemd/sd-bus/test-bus-server.c
+++ b/src/libsystemd/sd-bus/test-bus-server.c
@@ -19,11 +19,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include <assert.h>

 #include <stdlib.h>
 #include <pthread.h>
 #include <stdlib.h>
 #include <pthread.h>

-#include <unistd.h>
-#include <fcntl.h>

 
 #include "log.h"
 #include "util.h"
 
 #include "log.h"
 #include "util.h"


@@ -31,7 +28,6 @@
 
 #include "sd-bus.h"
 #include "bus-internal.h"
 
 #include "sd-bus.h"
 #include "bus-internal.h"

-#include "bus-message.h"

 #include "bus-util.h"
 
 struct context {
 #include "bus-util.h"
 
 struct context {

diff --git a/src/libsystemd/sd-bus/test-bus-signature.c b/src/libsystemd/sd-bus/test-bus-signature.c
index 3fc565c6208a6ca17364787f07f72f006ffdb504..4165c9273a1fe0a042ac58e477effa915e2a2b46 100644 (file)
--- a/src/libsystemd/sd-bus/test-bus-signature.c
+++ b/src/libsystemd/sd-bus/test-bus-signature.c
@@ -19,8 +19,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include <assert.h>
-#include <stdlib.h>

 
 #include "log.h"
 #include "bus-signature.h"
 
 #include "log.h"
 #include "bus-signature.h"

diff --git a/src/libsystemd/sd-bus/test-bus-zero-copy.c b/src/libsystemd/sd-bus/test-bus-zero-copy.c
index 4ea9f9fc3530ae895846a910f7f7aa577ee888de..2d062fc9b5009eb61ee96360ea8be68ecf059c1a 100644 (file)
--- a/src/libsystemd/sd-bus/test-bus-zero-copy.c
+++ b/src/libsystemd/sd-bus/test-bus-zero-copy.c
@@ -19,7 +19,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include <fcntl.h>

 #include <sys/mman.h>
 
 #include "util.h"
 #include <sys/mman.h>
 
 #include "util.h"


@@ -28,7 +27,6 @@
 
 #include "sd-bus.h"
 #include "bus-message.h"
 
 #include "sd-bus.h"
 #include "bus-message.h"

-#include "bus-error.h"

 #include "bus-kernel.h"
 #include "bus-dump.h"
 
 #include "bus-kernel.h"
 #include "bus-dump.h"
 

diff --git a/src/libsystemd/sd-daemon/sd-daemon.c b/src/libsystemd/sd-daemon/sd-daemon.c
index 028c2a7a5b4cceb881207ee23fa2bff511196933..c9e2f2dba83f4590a831134f276125df90d70f9b 100644 (file)
--- a/src/libsystemd/sd-daemon/sd-daemon.c
+++ b/src/libsystemd/sd-daemon/sd-daemon.c
@@ -19,11 +19,9 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include <sys/types.h>

 #include <sys/stat.h>
 #include <sys/socket.h>
 #include <sys/un.h>
 #include <sys/stat.h>
 #include <sys/socket.h>
 #include <sys/un.h>

-#include <fcntl.h>

 #include <netinet/in.h>
 #include <stdlib.h>
 #include <errno.h>
 #include <netinet/in.h>
 #include <stdlib.h>
 #include <errno.h>

diff --git a/src/libsystemd/sd-event/sd-event.c b/src/libsystemd/sd-event/sd-event.c
index 25089a03350129cece6cef0b42b497d7b2f7f2d9..0c4e5179e3dfd36347cc3153a4c4bb76d8f584d5 100644 (file)
--- a/src/libsystemd/sd-event/sd-event.c
+++ b/src/libsystemd/sd-event/sd-event.c
@@ -22,7 +22,6 @@
 #include <sys/epoll.h>
 #include <sys/timerfd.h>
 #include <sys/wait.h>
 #include <sys/epoll.h>
 #include <sys/timerfd.h>
 #include <sys/wait.h>

-#include <pthread.h>

 
 #include "sd-id128.h"
 #include "sd-daemon.h"
 
 #include "sd-id128.h"
 #include "sd-daemon.h"

diff --git a/src/libsystemd/sd-hwdb/sd-hwdb.c b/src/libsystemd/sd-hwdb/sd-hwdb.c
index 61c7b446b3b92fd5d66766f2624a71e64bd2edcf..3bbf02896b846bded9fda499fe5c41e5c315ea49 100644 (file)
--- a/src/libsystemd/sd-hwdb/sd-hwdb.c
+++ b/src/libsystemd/sd-hwdb/sd-hwdb.c
@@ -23,10 +23,8 @@
 #include <errno.h>
 #include <string.h>
 #include <inttypes.h>
 #include <errno.h>
 #include <string.h>
 #include <inttypes.h>

-#include <ctype.h>

 #include <stdlib.h>
 #include <fnmatch.h>
 #include <stdlib.h>
 #include <fnmatch.h>

-#include <getopt.h>

 #include <sys/mman.h>
 
 #include "sd-hwdb.h"
 #include <sys/mman.h>
 
 #include "sd-hwdb.h"

diff --git a/src/libsystemd/sd-network/network-util.h b/src/libsystemd/sd-network/network-util.h
index 02bd54552690cd563b2fb51c61bdbea1d40ac279..11a0012348bf55b96014528d0c345242f290943a 100644 (file)
--- a/src/libsystemd/sd-network/network-util.h
+++ b/src/libsystemd/sd-network/network-util.h
@@ -21,7 +21,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include "util.h"

 #include "sd-network.h"
 
 DEFINE_TRIVIAL_CLEANUP_FUNC(sd_network_monitor*, sd_network_monitor_unref);
 #include "sd-network.h"
 
 DEFINE_TRIVIAL_CLEANUP_FUNC(sd_network_monitor*, sd_network_monitor_unref);

diff --git a/src/libsystemd/sd-network/sd-network.c b/src/libsystemd/sd-network/sd-network.c
index c4713feb5d97f3ac47df14baa5e7136e0d7e9e61..297fdac80da17c187fe8fe1f074007a71a5ad2b1 100644 (file)
--- a/src/libsystemd/sd-network/sd-network.c
+++ b/src/libsystemd/sd-network/sd-network.c
@@ -20,19 +20,16 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include <unistd.h>

 #include <string.h>
 #include <errno.h>
 #include <sys/inotify.h>
 #include <poll.h>
 #include <string.h>
 #include <errno.h>
 #include <sys/inotify.h>
 #include <poll.h>

-#include <net/if.h>

 
 #include "util.h"
 #include "macro.h"
 #include "strv.h"
 #include "fileio.h"
 #include "sd-network.h"
 
 #include "util.h"
 #include "macro.h"
 #include "strv.h"
 #include "fileio.h"
 #include "sd-network.h"

-#include "network-internal.h"

 
 _public_ int sd_network_get_operational_state(char **state) {
         _cleanup_free_ char *s = NULL;
 
 _public_ int sd_network_get_operational_state(char **state) {
         _cleanup_free_ char *s = NULL;

diff --git a/src/libsystemd/sd-resolve/sd-resolve.c b/src/libsystemd/sd-resolve/sd-resolve.c
index 6448280c4f84cc7e839fd9495cdafab50700539b..ca517861d9a09eaea7c4255b1f1ce462e98d7506 100644 (file)
--- a/src/libsystemd/sd-resolve/sd-resolve.c
+++ b/src/libsystemd/sd-resolve/sd-resolve.c
@@ -19,24 +19,13 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include <assert.h>
-#include <fcntl.h>

 #include <signal.h>
 #include <unistd.h>
 #include <signal.h>
 #include <unistd.h>

-#include <sys/select.h>

 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
 #include <errno.h>
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
 #include <errno.h>

-#include <sys/wait.h>
-#include <sys/types.h>
-#include <pwd.h>
-#include <netinet/in.h>
-#include <arpa/nameser.h>

 #include <resolv.h>
 #include <resolv.h>

-#include <dirent.h>
-#include <sys/time.h>
-#include <sys/resource.h>

 #include <stdint.h>
 #include <pthread.h>
 #include <sys/prctl.h>
 #include <stdint.h>
 #include <pthread.h>
 #include <sys/prctl.h>

diff --git a/src/libsystemd/sd-resolve/test-resolve.c b/src/libsystemd/sd-resolve/test-resolve.c
index d08e1b5a05bdf2bb5be47bda937548931f93892f..3187ce9b8ad45902fbe45a1f21baef2b5d800271 100644 (file)
--- a/src/libsystemd/sd-resolve/test-resolve.c
+++ b/src/libsystemd/sd-resolve/test-resolve.c
@@ -21,14 +21,11 @@
 ***/
 
 #include <string.h>
 ***/
 
 #include <string.h>

-#include <sys/types.h>

 #include <sys/socket.h>
 #include <arpa/inet.h>
 #include <stdio.h>
 #include <netinet/in.h>
 #include <sys/socket.h>
 #include <arpa/inet.h>
 #include <stdio.h>
 #include <netinet/in.h>

-#include <arpa/nameser.h>

 #include <resolv.h>
 #include <resolv.h>

-#include <signal.h>

 #include <errno.h>
 
 #include "socket-util.h"
 #include <errno.h>
 
 #include "socket-util.h"

diff --git a/src/libsystemd/sd-rtnl/local-addresses.h b/src/libsystemd/sd-rtnl/local-addresses.h
index ef7def530db50d5d52b81c3228a6143ca46fc8da..bdc28d35102c12674a6b8596468f70198939df7f 100644 (file)
--- a/src/libsystemd/sd-rtnl/local-addresses.h
+++ b/src/libsystemd/sd-rtnl/local-addresses.h
@@ -21,10 +21,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include <inttypes.h>
-#include <sys/types.h>
-#include <assert.h>
-#include <sys/socket.h>

 
 #include "sd-rtnl.h"
 #include "in-addr-util.h"
 
 #include "sd-rtnl.h"
 #include "in-addr-util.h"

diff --git a/src/libsystemd/sd-rtnl/rtnl-message.c b/src/libsystemd/sd-rtnl/rtnl-message.c
index 276591f31b9e2d029985e6912a37b1445f3fcd6e..8f7d50abbb433ef67aa2bcb2cb2a46f89806e64e 100644 (file)
--- a/src/libsystemd/sd-rtnl/rtnl-message.c
+++ b/src/libsystemd/sd-rtnl/rtnl-message.c
@@ -20,7 +20,6 @@
 ***/
 
 #include <netinet/in.h>
 ***/
 
 #include <netinet/in.h>

-#include <netinet/ether.h>

 #include <stdbool.h>
 #include <unistd.h>
 
 #include <stdbool.h>
 #include <unistd.h>
 

diff --git a/src/libsystemd/sd-rtnl/rtnl-types.c b/src/libsystemd/sd-rtnl/rtnl-types.c
index a4c71f37853817ea24534f20f1f1a8c1ff054700..3f4ba2e0f0eb9bea4524d09821c4c09968c63fef 100644 (file)
--- a/src/libsystemd/sd-rtnl/rtnl-types.c
+++ b/src/libsystemd/sd-rtnl/rtnl-types.c
@@ -19,12 +19,10 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include <stddef.h>

 #include <stdint.h>
 #include <sys/socket.h>
 #include <linux/netlink.h>
 #include <linux/rtnetlink.h>
 #include <stdint.h>
 #include <sys/socket.h>
 #include <linux/netlink.h>
 #include <linux/rtnetlink.h>

-#include <linux/in6.h>

 #include <linux/veth.h>
 #include <linux/if_bridge.h>
 #include <linux/if_addr.h>
 #include <linux/veth.h>
 #include <linux/if_bridge.h>
 #include <linux/if_addr.h>

diff --git a/src/libsystemd/sd-rtnl/rtnl-util.c b/src/libsystemd/sd-rtnl/rtnl-util.c
index 5666ea44cb385bb42a5398a5ed25dcc50564a964..9ddf074c24a6bb5d0e4a27330442fe27d36adb5a 100644 (file)
--- a/src/libsystemd/sd-rtnl/rtnl-util.c
+++ b/src/libsystemd/sd-rtnl/rtnl-util.c
@@ -19,7 +19,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include <netinet/ether.h>

 
 #include "sd-rtnl.h"
 
 
 #include "sd-rtnl.h"
 

diff --git a/src/libsystemd/sd-rtnl/rtnl-util.h b/src/libsystemd/sd-rtnl/rtnl-util.h
index ca9fbd4f41128f308c230d54d642991c186431dc..9e4bdb867ee1374916052afa8ecc858b4273a2ee 100644 (file)
--- a/src/libsystemd/sd-rtnl/rtnl-util.h
+++ b/src/libsystemd/sd-rtnl/rtnl-util.h
@@ -21,7 +21,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include <netinet/ether.h>

 
 #include "util.h"
 #include "sd-rtnl.h"
 
 #include "util.h"
 #include "sd-rtnl.h"

diff --git a/src/libsystemd/sd-rtnl/test-rtnl.c b/src/libsystemd/sd-rtnl/test-rtnl.c
index 02f7a8e38aaa61f747a8b7c32df14b8e999a6e47..47cce64816aa438e1880a7937ca61843d3fd0685 100644 (file)
--- a/src/libsystemd/sd-rtnl/test-rtnl.c
+++ b/src/libsystemd/sd-rtnl/test-rtnl.c
@@ -29,7 +29,6 @@
 #include "rtnl-util.h"
 #include "event-util.h"
 #include "missing.h"
 #include "rtnl-util.h"
 #include "event-util.h"
 #include "missing.h"

-#include "rtnl-internal.h"

 
 static void test_message_link_bridge(sd_rtnl *rtnl) {
         _cleanup_rtnl_message_unref_ sd_rtnl_message *message = NULL;
 
 static void test_message_link_bridge(sd_rtnl *rtnl) {
         _cleanup_rtnl_message_unref_ sd_rtnl_message *message = NULL;

diff --git a/src/libudev/libudev-device-private.c b/src/libudev/libudev-device-private.c
index fb4c6e2940af511710ba1f023f39ed00047ab39e..15d3b231c3ae918fcc7acd22e2e546a22d20559c 100644 (file)
--- a/src/libudev/libudev-device-private.c
+++ b/src/libudev/libudev-device-private.c
@@ -17,7 +17,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include <stdlib.h>

 #include <stdio.h>
 #include <string.h>
 #include <stddef.h>
 #include <stdio.h>
 #include <string.h>
 #include <stddef.h>

diff --git a/src/libudev/libudev-enumerate.c b/src/libudev/libudev-enumerate.c
index 1a880c2a342848a81d45dbb912368123417e6958..4e6e47cdeb237a3629f8b1188ed19404dcbc6f69 100644 (file)
--- a/src/libudev/libudev-enumerate.c
+++ b/src/libudev/libudev-enumerate.c
@@ -20,14 +20,12 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <stddef.h>

-#include <unistd.h>

 #include <errno.h>
 #include <string.h>
 #include <dirent.h>
 #include <fnmatch.h>
 #include <stdbool.h>
 #include <sys/stat.h>
 #include <errno.h>
 #include <string.h>
 #include <dirent.h>
 #include <fnmatch.h>
 #include <stdbool.h>
 #include <sys/stat.h>

-#include <sys/param.h>

 
 #include "libudev.h"
 #include "libudev-private.h"
 
 #include "libudev.h"
 #include "libudev-private.h"

diff --git a/src/libudev/libudev-list.c b/src/libudev/libudev-list.c
index 42fcb853c7bf3286208096e7cb821ef305bde822..044ee3a0cbe0b89b10e96356d7ddebc439d4dc7c 100644 (file)
--- a/src/libudev/libudev-list.c
+++ b/src/libudev/libudev-list.c
@@ -17,14 +17,11 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include <stdio.h>

 #include <stdlib.h>
 #include <stddef.h>
 #include <stdlib.h>
 #include <stddef.h>

-#include <unistd.h>

 #include <errno.h>
 #include <string.h>
 
 #include <errno.h>
 #include <string.h>
 

-#include "libudev.h"

 #include "libudev-private.h"
 
 /**
 #include "libudev-private.h"
 
 /**

diff --git a/src/libudev/libudev-monitor.c b/src/libudev/libudev-monitor.c
index 3f1fee7f7eb0c03c1a7587deb462b6f0556caabc..eb7b6f87b24e001e84db381a515ad60cf353eb16 100644 (file)
--- a/src/libudev/libudev-monitor.c
+++ b/src/libudev/libudev-monitor.c
@@ -23,12 +23,8 @@
 #include <unistd.h>
 #include <errno.h>
 #include <string.h>
 #include <unistd.h>
 #include <errno.h>
 #include <string.h>

-#include <dirent.h>

 #include <poll.h>
 #include <poll.h>

-#include <sys/stat.h>

 #include <sys/socket.h>
 #include <sys/socket.h>

-#include <sys/un.h>
-#include <arpa/inet.h>

 #include <linux/netlink.h>
 #include <linux/filter.h>
 
 #include <linux/netlink.h>
 #include <linux/filter.h>
 

diff --git a/src/libudev/libudev-queue.c b/src/libudev/libudev-queue.c
index 8ef1f3d4b05e0bac3515f8609dacd2f1807fa421..11e15d13e62806014c494e97dfb57b5055c3bd3d 100644 (file)
--- a/src/libudev/libudev-queue.c
+++ b/src/libudev/libudev-queue.c
@@ -18,17 +18,12 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include <stdio.h>

 #include <stdlib.h>
 #include <stddef.h>
 #include <unistd.h>
 #include <errno.h>
 #include <stdlib.h>
 #include <stddef.h>
 #include <unistd.h>
 #include <errno.h>

-#include <string.h>
-#include <limits.h>
-#include <sys/stat.h>

 #include <sys/inotify.h>
 
 #include <sys/inotify.h>
 

-#include "libudev.h"

 #include "libudev-private.h"
 
 /**
 #include "libudev-private.h"
 
 /**

diff --git a/src/libudev/libudev-util.c b/src/libudev/libudev-util.c
index 291829e6d89ce7ea8d7856b1a8b37f898586c2d5..0f8f634ca3ff19e7f6053d6ccceb3e4c6d9987d7 100644 (file)
--- a/src/libudev/libudev-util.c
+++ b/src/libudev/libudev-util.c
@@ -17,20 +17,12 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include <stdio.h>

 #include <stdlib.h>
 #include <stddef.h>
 #include <unistd.h>
 #include <errno.h>
 #include <string.h>
 #include <stdlib.h>
 #include <stddef.h>
 #include <unistd.h>
 #include <errno.h>
 #include <string.h>

-#include <dirent.h>

 #include <ctype.h>
 #include <ctype.h>

-#include <fcntl.h>
-#include <time.h>
-#include <pwd.h>
-#include <grp.h>
-#include <sys/stat.h>
-#include <sys/param.h>

 
 #include "device-nodes.h"
 #include "libudev.h"
 
 #include "device-nodes.h"
 #include "libudev.h"

diff --git a/src/libudev/libudev.c b/src/libudev/libudev.c
index 8785f22071f2b5203e5b22578088830dbab6a305..ec15d2576b71e27a67ffb508f85a485e22dc631d 100644 (file)
--- a/src/libudev/libudev.c
+++ b/src/libudev/libudev.c
@@ -21,11 +21,8 @@
 #include <stdlib.h>
 #include <stddef.h>
 #include <stdarg.h>
 #include <stdlib.h>
 #include <stddef.h>
 #include <stdarg.h>

-#include <unistd.h>
-#include <errno.h>

 #include <string.h>
 #include <ctype.h>
 #include <string.h>
 #include <ctype.h>

-#include <time.h>

 
 #include "libudev.h"
 #include "libudev-private.h"
 
 #include "libudev.h"
 #include "libudev-private.h"

diff --git a/src/libudev/libudev.h b/src/libudev/libudev.h
index a94505c09ea291c6b1ed3ab18ca8aa1ddad7dad3..eb58740d26db35505a646923770c0ef9d9ad57f6 100644 (file)
--- a/src/libudev/libudev.h
+++ b/src/libudev/libudev.h
@@ -22,7 +22,6 @@
 
 #include <stdarg.h>
 #include <sys/types.h>
 
 #include <stdarg.h>
 #include <sys/types.h>

-#include <sys/stat.h>

 
 #ifdef __cplusplus
 extern "C" {
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/src/locale/localectl.c b/src/locale/localectl.c
index 41a88a828c2cbdd81d04b3f923beb996ea09ccf8..515fca540aa3a3f465624c1b57854728c96d9875 100644 (file)
--- a/src/locale/localectl.c
+++ b/src/locale/localectl.c
@@ -23,25 +23,19 @@
 #include <locale.h>
 #include <stdlib.h>
 #include <stdbool.h>
 #include <locale.h>
 #include <stdlib.h>
 #include <stdbool.h>

-#include <unistd.h>

 #include <getopt.h>
 #include <string.h>
 #include <ftw.h>
 #include <getopt.h>
 #include <string.h>
 #include <ftw.h>

-#include <sys/mman.h>
-#include <fcntl.h>

 
 #include "sd-bus.h"
 #include "bus-util.h"
 #include "bus-error.h"
 
 #include "sd-bus.h"
 #include "bus-util.h"
 #include "bus-error.h"

-#include "bus-message.h"

 #include "util.h"
 #include "spawn-polkit-agent.h"
 #include "build.h"
 #include "strv.h"
 #include "pager.h"
 #include "set.h"
 #include "util.h"
 #include "spawn-polkit-agent.h"
 #include "build.h"
 #include "strv.h"
 #include "pager.h"
 #include "set.h"

-#include "path-util.h"
-#include "utf8.h"

 #include "def.h"
 #include "virt.h"
 #include "fileio.h"
 #include "def.h"
 #include "virt.h"
 #include "fileio.h"

diff --git a/src/locale/localed.c b/src/locale/localed.c
index 5119fcd9b6d83fa726d4cc7c33905ad46b5dc80e..1fb8cdc3410e6e147fd258731a29b207024b01d0 100644 (file)
--- a/src/locale/localed.c
+++ b/src/locale/localed.c
@@ -33,7 +33,6 @@
 #include "env-util.h"
 #include "fileio.h"
 #include "fileio-label.h"
 #include "env-util.h"
 #include "fileio.h"
 #include "fileio-label.h"

-#include "label.h"

 #include "bus-util.h"
 #include "bus-error.h"
 #include "bus-message.h"
 #include "bus-util.h"
 #include "bus-error.h"
 #include "bus-message.h"

diff --git a/src/login/inhibit.c b/src/login/inhibit.c
index 44bda34aff5654b63e36c01fa4c2b8490bc80da3..fcc8d722359c00cde4d1199791dcb5f989f847dc 100644 (file)
--- a/src/login/inhibit.c
+++ b/src/login/inhibit.c
@@ -20,7 +20,6 @@
 ***/
 
 #include <getopt.h>
 ***/
 
 #include <getopt.h>

-#include <assert.h>

 #include <stdlib.h>
 #include <stdio.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <unistd.h>

diff --git a/src/login/loginctl.c b/src/login/loginctl.c
index 13b81024833032101c98bd45df04660f1d4154e8..ec102ae4c7c7e62e0d9ab2f82ceecf2d2250ef08 100644 (file)
--- a/src/login/loginctl.c
+++ b/src/login/loginctl.c
@@ -23,7 +23,6 @@
 #include <errno.h>
 #include <string.h>
 #include <getopt.h>
 #include <errno.h>
 #include <string.h>
 #include <getopt.h>

-#include <pwd.h>

 #include <locale.h>
 
 #include "sd-bus.h"
 #include <locale.h>
 
 #include "sd-bus.h"

diff --git a/src/login/logind-acl.c b/src/login/logind-acl.c
index 5856f9079ddf27f46ac37990310eca55a8a9ab11..941fd724a56e8a43c799884d4f9d2e65fa0c6613 100644 (file)
--- a/src/login/logind-acl.c
+++ b/src/login/logind-acl.c
@@ -19,7 +19,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include <assert.h>

 #include <errno.h>
 #include <string.h>
 
 #include <errno.h>
 #include <string.h>
 

diff --git a/src/login/logind-action.c b/src/login/logind-action.c
index 0844df20a9762ec3b0197c9346dec28d54617989..20c1c89eee7e1128e505ded71a49af8211d1b68f 100644 (file)
--- a/src/login/logind-action.c
+++ b/src/login/logind-action.c
@@ -21,7 +21,6 @@
 
 #include <unistd.h>
 
 
 #include <unistd.h>
 

-#include "sd-messages.h"

 #include "conf-parser.h"
 #include "special.h"
 #include "sleep-config.h"
 #include "conf-parser.h"
 #include "special.h"
 #include "sleep-config.h"

diff --git a/src/login/logind-action.h b/src/login/logind-action.h
index e9b424b5f64b949bb93bea032af863b8c76e02c7..ff98065371c5c996caf199eb19d67ade4cb72561 100644 (file)
--- a/src/login/logind-action.h
+++ b/src/login/logind-action.h
@@ -36,7 +36,6 @@ typedef enum HandleAction {
 } HandleAction;
 
 #include "logind.h"
 } HandleAction;
 
 #include "logind.h"

-#include "logind-inhibit.h"

 
 int manager_handle_action(
                 Manager *m,
 
 int manager_handle_action(
                 Manager *m,

diff --git a/src/login/logind-button.c b/src/login/logind-button.c
index d7211e66ce4d70829790636d1c895669a0b35ac6..610adc513e0c6c5f5960bb03baf31d8793907bf3 100644 (file)
--- a/src/login/logind-button.c
+++ b/src/login/logind-button.c
@@ -19,7 +19,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include <assert.h>

 #include <string.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <string.h>
 #include <errno.h>
 #include <fcntl.h>


@@ -28,9 +27,7 @@
 #include <linux/input.h>
 
 #include "sd-messages.h"
 #include <linux/input.h>
 
 #include "sd-messages.h"

-#include "conf-parser.h"

 #include "util.h"
 #include "util.h"

-#include "special.h"

 #include "logind-button.h"
 
 Button* button_new(Manager *m, const char *name) {
 #include "logind-button.h"
 
 Button* button_new(Manager *m, const char *name) {

diff --git a/src/login/logind-button.h b/src/login/logind-button.h
index 72a612e9148acedf6d71607dd1756074333c4ab5..80d93c7e6bdf691d4ffafbe803524ee7cd9d6479 100644 (file)
--- a/src/login/logind-button.h
+++ b/src/login/logind-button.h
@@ -23,8 +23,6 @@
 
 typedef struct Button Button;
 
 
 typedef struct Button Button;
 

-#include "list.h"
-#include "util.h"

 #include "logind.h"
 
 struct Button {
 #include "logind.h"
 
 struct Button {

diff --git a/src/login/logind-core.c b/src/login/logind-core.c
index a6ff5add95910000709460b82b779a2299e394fc..e8da59a18252861127bd548b0d152588ddea5919 100644 (file)
--- a/src/login/logind-core.c
+++ b/src/login/logind-core.c
@@ -20,16 +20,13 @@
 ***/
 
 #include <sys/types.h>
 ***/
 
 #include <sys/types.h>

-#include <sys/stat.h>

 #include <sys/ioctl.h>
 #include <fcntl.h>
 #include <pwd.h>
 #include <sys/ioctl.h>
 #include <fcntl.h>
 #include <pwd.h>

-#include <unistd.h>

 #include <linux/vt.h>
 
 #include "strv.h"
 #include "cgroup-util.h"
 #include <linux/vt.h>
 
 #include "strv.h"
 #include "cgroup-util.h"

-#include "audit.h"

 #include "bus-util.h"
 #include "bus-error.h"
 #include "udev-util.h"
 #include "bus-util.h"
 #include "bus-error.h"
 #include "udev-util.h"

diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c
index 5d61edbd463fc6fcfb067f5b27b1d9f5ee26aefe..3322d66aa9e889ad0f41d50cc437609b3e6fdf4b 100644 (file)
--- a/src/login/logind-dbus.c
+++ b/src/login/logind-dbus.c
@@ -24,7 +24,6 @@
 #include <unistd.h>
 #include <pwd.h>
 
 #include <unistd.h>
 #include <pwd.h>
 

-#include "sd-id128.h"

 #include "sd-messages.h"
 #include "strv.h"
 #include "mkdir.h"
 #include "sd-messages.h"
 #include "strv.h"
 #include "mkdir.h"


@@ -32,10 +31,7 @@
 #include "special.h"
 #include "sleep-config.h"
 #include "fileio-label.h"
 #include "special.h"
 #include "sleep-config.h"
 #include "fileio-label.h"

-#include "label.h"
-#include "utf8.h"

 #include "unit-name.h"
 #include "unit-name.h"

-#include "virt.h"

 #include "audit.h"
 #include "bus-util.h"
 #include "bus-error.h"
 #include "audit.h"
 #include "bus-util.h"
 #include "bus-error.h"

diff --git a/src/login/logind-device.c b/src/login/logind-device.c
index 76c5a5c88f0a630fda94658f5c09a209a333f836..ee4c45fb8dd9125d76d0bc0d366981a67c31f5c4 100644 (file)
--- a/src/login/logind-device.c
+++ b/src/login/logind-device.c
@@ -19,7 +19,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include <assert.h>

 #include <string.h>
 
 #include "util.h"
 #include <string.h>
 
 #include "util.h"

diff --git a/src/login/logind-device.h b/src/login/logind-device.h
index c273d2bfa05e1cb2a24cde634e1b717666613427..6b2728586cf4d48d9cedf9d096cc581b0976d9a3 100644 (file)
--- a/src/login/logind-device.h
+++ b/src/login/logind-device.h
@@ -24,8 +24,6 @@
 typedef struct Device Device;
 
 #include "list.h"
 typedef struct Device Device;
 
 #include "list.h"

-#include "util.h"
-#include "logind.h"

 #include "logind-seat.h"
 #include "logind-session-device.h"
 
 #include "logind-seat.h"
 #include "logind-session-device.h"
 

diff --git a/src/login/logind-inhibit.c b/src/login/logind-inhibit.c
index 84fee0e773b47d3ae3e772750d4ceb2d53f1ccc4..5d81693e6c0bdbd4e2b03f66ca3ac05f06553fec 100644 (file)
--- a/src/login/logind-inhibit.c
+++ b/src/login/logind-inhibit.c
@@ -26,7 +26,6 @@
 
 #include "util.h"
 #include "mkdir.h"
 
 #include "util.h"
 #include "mkdir.h"

-#include "path-util.h"

 #include "logind-inhibit.h"
 #include "fileio.h"
 
 #include "logind-inhibit.h"
 #include "fileio.h"
 

diff --git a/src/login/logind-inhibit.h b/src/login/logind-inhibit.h
index f767876a4c8d72abe203a7487ae2d7ace9cfcd97..1b77fc1e9ef9f8d02756d43643199ba8c240b1be 100644 (file)
--- a/src/login/logind-inhibit.h
+++ b/src/login/logind-inhibit.h
@@ -23,8 +23,6 @@
 
 typedef struct Inhibitor Inhibitor;
 
 
 typedef struct Inhibitor Inhibitor;
 

-#include "list.h"
-#include "util.h"

 
 typedef enum InhibitWhat {
         INHIBIT_SHUTDOWN = 1,
 
 typedef enum InhibitWhat {
         INHIBIT_SHUTDOWN = 1,


@@ -46,7 +44,6 @@ typedef enum InhibitMode {
 } InhibitMode;
 
 #include "logind.h"
 } InhibitMode;
 
 #include "logind.h"

-#include "logind-seat.h"

 
 struct Inhibitor {
         Manager *manager;
 
 struct Inhibitor {
         Manager *manager;

diff --git a/src/login/logind-seat.c b/src/login/logind-seat.c
index 126c5b84cc5b4f4ade8dddfb53174c635ddb6754..49808c928b0db389126e7365206ae18a0c6a6936 100644 (file)
--- a/src/login/logind-seat.c
+++ b/src/login/logind-seat.c
@@ -19,21 +19,16 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include <assert.h>

 #include <errno.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <errno.h>
 #include <unistd.h>
 #include <fcntl.h>

-#include <sys/ioctl.h>
-#include <linux/vt.h>

 #include <string.h>
 
 #include <string.h>
 

-#include "sd-id128.h"

 #include "sd-messages.h"
 #include "logind-seat.h"
 #include "logind-acl.h"
 #include "util.h"
 #include "mkdir.h"
 #include "sd-messages.h"
 #include "logind-seat.h"
 #include "logind-acl.h"
 #include "util.h"
 #include "mkdir.h"

-#include "path-util.h"

 
 Seat *seat_new(Manager *m, const char *id) {
         Seat *s;
 
 Seat *seat_new(Manager *m, const char *id) {
         Seat *s;

diff --git a/src/login/logind-seat.h b/src/login/logind-seat.h
index 15f11b85ab354f1eb757c408aab4fe693255c004..2a0f574be61c50d5a01b9518adfde2a777cbb12d 100644 (file)
--- a/src/login/logind-seat.h
+++ b/src/login/logind-seat.h
@@ -24,9 +24,6 @@
 typedef struct Seat Seat;
 
 #include "list.h"
 typedef struct Seat Seat;
 
 #include "list.h"

-#include "util.h"
-#include "logind.h"
-#include "logind-device.h"

 #include "logind-session.h"
 
 struct Seat {
 #include "logind-session.h"
 
 struct Seat {

diff --git a/src/login/logind-session-device.c b/src/login/logind-session-device.c
index c2de862250ef696c9a963bb5d403974bda7cf368..656f268dba4eae34440005ec6a870359e7fb2608 100644 (file)
--- a/src/login/logind-session-device.c
+++ b/src/login/logind-session-device.c
@@ -19,16 +19,12 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include <assert.h>

 #include <fcntl.h>
 #include <libudev.h>
 #include <linux/input.h>
 #include <fcntl.h>
 #include <libudev.h>
 #include <linux/input.h>

-#include <linux/ioctl.h>

 #include <string.h>
 #include <sys/ioctl.h>
 #include <string.h>
 #include <sys/ioctl.h>

-#include <sys/stat.h>

 #include <sys/types.h>
 #include <sys/types.h>

-#include <unistd.h>

 
 #include "util.h"
 #include "missing.h"
 
 #include "util.h"
 #include "missing.h"

diff --git a/src/login/logind-session-device.h b/src/login/logind-session-device.h
index 61a843d09ddb7684aa043d62d2a6c0360e01ef7b..1c9f998371589ad0f53d7a187a67c00861d73f82 100644 (file)
--- a/src/login/logind-session-device.h
+++ b/src/login/logind-session-device.h
@@ -25,11 +25,7 @@ typedef enum DeviceType DeviceType;
 typedef struct SessionDevice SessionDevice;
 
 #include "list.h"
 typedef struct SessionDevice SessionDevice;
 
 #include "list.h"

-#include "util.h"

 #include "logind.h"
 #include "logind.h"

-#include "logind-device.h"
-#include "logind-seat.h"
-#include "logind-session.h"

 
 enum DeviceType {
         DEVICE_TYPE_UNKNOWN,
 
 enum DeviceType {
         DEVICE_TYPE_UNKNOWN,

diff --git a/src/login/logind-session.c b/src/login/logind-session.c
index a02a537f7ca00666a2316ec357408d84d2323c32..ce5dbb4d5ccfa0a62d5da46c7cff8b7ac64df5f7 100644 (file)
--- a/src/login/logind-session.c
+++ b/src/login/logind-session.c
@@ -28,9 +28,7 @@
 #include <sys/ioctl.h>
 #include <unistd.h>
 
 #include <sys/ioctl.h>
 #include <unistd.h>
 

-#include "sd-id128.h"

 #include "sd-messages.h"
 #include "sd-messages.h"

-#include "strv.h"

 #include "util.h"
 #include "mkdir.h"
 #include "path-util.h"
 #include "util.h"
 #include "mkdir.h"
 #include "path-util.h"

diff --git a/src/login/logind-session.h b/src/login/logind-session.h
index 3ec9d84f96e07f213465f3b7f27c9b8ce845b899..0505f7f0bdfd62bc32d018c9398816616565b34c 100644 (file)
--- a/src/login/logind-session.h
+++ b/src/login/logind-session.h
@@ -25,10 +25,6 @@ typedef struct Session Session;
 typedef enum KillWho KillWho;
 
 #include "list.h"
 typedef enum KillWho KillWho;
 
 #include "list.h"

-#include "util.h"
-#include "logind.h"
-#include "logind-seat.h"
-#include "logind-session-device.h"

 #include "logind-user.h"
 #include "login-shared.h"
 
 #include "logind-user.h"
 #include "login-shared.h"
 

diff --git a/src/login/logind-user.c b/src/login/logind-user.c
index f4c4490e8f943c4a140d11a16a4e0273aa72f220..294c1e799cdcbf9f00fb1acf2d2dc9be0a0c02cb 100644 (file)
--- a/src/login/logind-user.c
+++ b/src/login/logind-user.c
@@ -27,7 +27,6 @@
 #include "util.h"
 #include "mkdir.h"
 #include "hashmap.h"
 #include "util.h"
 #include "mkdir.h"
 #include "hashmap.h"

-#include "strv.h"

 #include "fileio.h"
 #include "path-util.h"
 #include "special.h"
 #include "fileio.h"
 #include "path-util.h"
 #include "special.h"

diff --git a/src/login/logind-user.h b/src/login/logind-user.h
index 2cb57e16751a0246cbd407df04af819d59d83bdb..be5b56883c7cf741b0a61594b1589385b697353f 100644 (file)
--- a/src/login/logind-user.h
+++ b/src/login/logind-user.h
@@ -24,9 +24,7 @@
 typedef struct User User;
 
 #include "list.h"
 typedef struct User User;
 
 #include "list.h"

-#include "util.h"

 #include "logind.h"
 #include "logind.h"

-#include "logind-session.h"

 
 typedef enum UserState {
         USER_OFFLINE,    /* Not logged in at all */
 
 typedef enum UserState {
         USER_OFFLINE,    /* Not logged in at all */

diff --git a/src/login/logind.c b/src/login/logind.c
index b44f37642719dc809db077e729879d3b69abcbf8..08a7cbc08a2afe7f18a0985aff7fde31fe96f187 100644 (file)
--- a/src/login/logind.c
+++ b/src/login/logind.c
@@ -24,13 +24,10 @@
 #include <fcntl.h>
 #include <string.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <string.h>
 #include <unistd.h>

-#include <linux/vt.h>
-#include <sys/timerfd.h>

 
 #include "sd-daemon.h"
 #include "strv.h"
 #include "conf-parser.h"
 
 #include "sd-daemon.h"
 #include "strv.h"
 #include "conf-parser.h"

-#include "mkdir.h"

 #include "bus-util.h"
 #include "bus-error.h"
 #include "logind.h"
 #include "bus-util.h"
 #include "bus-error.h"
 #include "logind.h"

diff --git a/src/login/logind.h b/src/login/logind.h
index e0cb7d02382c61015779adf67891d8978bfcc744..48e647ae821ad0e9627012687d7fe5dad9afc923 100644 (file)
--- a/src/login/logind.h
+++ b/src/login/logind.h
@@ -22,12 +22,10 @@
 ***/
 
 #include <stdbool.h>
 ***/
 
 #include <stdbool.h>

-#include <inttypes.h>

 #include <libudev.h>
 
 #include "sd-event.h"
 #include "sd-bus.h"
 #include <libudev.h>
 
 #include "sd-event.h"
 #include "sd-bus.h"

-#include "util.h"

 #include "list.h"
 #include "hashmap.h"
 #include "set.h"
 #include "list.h"
 #include "hashmap.h"
 #include "set.h"


@@ -35,9 +33,6 @@
 typedef struct Manager Manager;
 
 #include "logind-device.h"
 typedef struct Manager Manager;
 
 #include "logind-device.h"

-#include "logind-seat.h"
-#include "logind-session.h"
-#include "logind-user.h"

 #include "logind-inhibit.h"
 #include "logind-button.h"
 #include "logind-action.h"
 #include "logind-inhibit.h"
 #include "logind-button.h"
 #include "logind-action.h"

diff --git a/src/login/test-inhibit.c b/src/login/test-inhibit.c
index 274687d20f38abf22edf6b153d8c6d98db096c4e..03516de916b02bd57afc9673bef0d7e463aa9bdc 100644 (file)
--- a/src/login/test-inhibit.c
+++ b/src/login/test-inhibit.c
@@ -25,7 +25,6 @@
 #include "util.h"
 #include "sd-bus.h"
 #include "bus-util.h"
 #include "util.h"
 #include "sd-bus.h"
 #include "bus-util.h"

-#include "bus-error.h"

 
 static int inhibit(sd_bus *bus, const char *what) {
         _cleanup_bus_message_unref_ sd_bus_message *reply = NULL;
 
 static int inhibit(sd_bus *bus, const char *what) {
         _cleanup_bus_message_unref_ sd_bus_message *reply = NULL;

diff --git a/src/login/user-sessions.c b/src/login/user-sessions.c
index 6edb823e8c5775f8871c94335d8e4808ecc22a71..1c31769fde9b447904987a7fef476589ff21e113 100644 (file)
--- a/src/login/user-sessions.c
+++ b/src/login/user-sessions.c
@@ -19,7 +19,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include <string.h>

 #include <unistd.h>
 #include <errno.h>
 
 #include <unistd.h>
 #include <errno.h>
 

diff --git a/src/machine-id-commit/machine-id-commit.c b/src/machine-id-commit/machine-id-commit.c
index c7e4de8889323cb62feaa0c63faa54a25d280967..d9c1b7c7a9bcd324cbf1ca330cff5469ff6abef8 100644 (file)
--- a/src/machine-id-commit/machine-id-commit.c
+++ b/src/machine-id-commit/machine-id-commit.c
@@ -19,7 +19,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include <unistd.h>

 #include <stdlib.h>
 #include <stdio.h>
 #include <getopt.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <getopt.h>

diff --git a/src/machine-id-setup/machine-id-setup-main.c b/src/machine-id-setup/machine-id-setup-main.c
index 85bbfc42991cd1bda21feef04a7237d019ecdf46..20cb60b804592f4896eb70cfe35e6708617222ef 100644 (file)
--- a/src/machine-id-setup/machine-id-setup-main.c
+++ b/src/machine-id-setup/machine-id-setup-main.c
@@ -19,7 +19,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include <unistd.h>

 #include <stdlib.h>
 #include <stdio.h>
 #include <getopt.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <getopt.h>

diff --git a/src/machine/image-dbus.c b/src/machine/image-dbus.c
index ef1914e2b93403ebe48c2532a14274347f961183..9061017eefce7a8396d92aebe6f71a0827ad93be 100644 (file)
--- a/src/machine/image-dbus.c
+++ b/src/machine/image-dbus.c
@@ -20,7 +20,6 @@
 ***/
 
 #include "bus-label.h"
 ***/
 
 #include "bus-label.h"

-#include "bus-common-errors.h"

 #include "strv.h"
 #include "bus-util.h"
 #include "machine-image.h"
 #include "strv.h"
 #include "bus-util.h"
 #include "machine-image.h"

diff --git a/src/machine/machine-dbus.c b/src/machine/machine-dbus.c
index 116e711a78f68403d22e758cd394225076c46fbb..334abbdeb5e371ad7cff8ae11044a044a3987a25 100644 (file)
--- a/src/machine/machine-dbus.c
+++ b/src/machine/machine-dbus.c
@@ -21,7 +21,6 @@
 
 #include <errno.h>
 #include <string.h>
 
 #include <errno.h>
 #include <string.h>

-#include <arpa/inet.h>

 #include <sys/mount.h>
 
 /* When we include libgen.h because we need dirname() we immediately
 #include <sys/mount.h>
 
 /* When we include libgen.h because we need dirname() we immediately

diff --git a/src/machine/machine-dbus.h b/src/machine/machine-dbus.h
index dc9115d39a4601c22a8a07d95c4ad5655b478df3..4eb24f9a1fde825b1424517ba6ab2b27e0313054 100644 (file)
--- a/src/machine/machine-dbus.h
+++ b/src/machine/machine-dbus.h
@@ -22,7 +22,6 @@
 ***/
 
 #include "sd-bus.h"
 ***/
 
 #include "sd-bus.h"

-#include "machine.h"

 
 extern const sd_bus_vtable machine_vtable[];
 
 
 extern const sd_bus_vtable machine_vtable[];
 

diff --git a/src/machine/machine.c b/src/machine/machine.c
index edd244f30daee3f9c8484c2c8f3040053343c8e9..182430d78547c36de15ad429dfb7f534937c97e6 100644 (file)
--- a/src/machine/machine.c
+++ b/src/machine/machine.c
@@ -28,7 +28,6 @@
 #include "util.h"
 #include "mkdir.h"
 #include "hashmap.h"
 #include "util.h"
 #include "mkdir.h"
 #include "hashmap.h"

-#include "strv.h"

 #include "fileio.h"
 #include "special.h"
 #include "unit-name.h"
 #include "fileio.h"
 #include "special.h"
 #include "unit-name.h"

diff --git a/src/machine/machine.h b/src/machine/machine.h
index 94dbac016064fa4bc5f69d3eb3f3cbd7fd5c2ab2..7b27aa27e0ec53e2e880be2f4146eef56349642b 100644 (file)
--- a/src/machine/machine.h
+++ b/src/machine/machine.h
@@ -26,7 +26,6 @@ typedef struct MachineOperation MachineOperation;
 typedef enum KillWho KillWho;
 
 #include "list.h"
 typedef enum KillWho KillWho;
 
 #include "list.h"

-#include "util.h"

 #include "machined.h"
 
 typedef enum MachineState {
 #include "machined.h"
 
 typedef enum MachineState {

diff --git a/src/machine/machinectl.c b/src/machine/machinectl.c
index 55cd85428976ed2e4864a10f9b7d748f4be66835..61183a6bf852701546733ade0d20251235e1e698 100644 (file)
--- a/src/machine/machinectl.c
+++ b/src/machine/machinectl.c
@@ -24,7 +24,6 @@
 #include <errno.h>
 #include <string.h>
 #include <getopt.h>
 #include <errno.h>
 #include <string.h>
 #include <getopt.h>

-#include <pwd.h>

 #include <locale.h>
 #include <fcntl.h>
 #include <netinet/in.h>
 #include <locale.h>
 #include <fcntl.h>
 #include <netinet/in.h>

diff --git a/src/machine/machined-dbus.c b/src/machine/machined-dbus.c
index 7a9ac2f3499705a794b4f8901819f20ba248878b..0e5a494f8c5d50e356e3d56f89e5610a0bad3f1b 100644 (file)
--- a/src/machine/machined-dbus.c
+++ b/src/machine/machined-dbus.c
@@ -22,21 +22,12 @@
 #include <errno.h>
 #include <string.h>
 #include <unistd.h>
 #include <errno.h>
 #include <string.h>
 #include <unistd.h>

-#include <pwd.h>

 
 #include "sd-id128.h"
 
 #include "sd-id128.h"

-#include "sd-messages.h"
-#include "strv.h"
-#include "mkdir.h"

 #include "path-util.h"
 #include "path-util.h"

-#include "special.h"
-#include "fileio-label.h"
-#include "label.h"
-#include "utf8.h"

 #include "unit-name.h"
 #include "bus-util.h"
 #include "bus-common-errors.h"
 #include "unit-name.h"
 #include "bus-util.h"
 #include "bus-common-errors.h"

-#include "time-util.h"

 #include "cgroup-util.h"
 #include "machine-image.h"
 #include "image-dbus.h"
 #include "cgroup-util.h"
 #include "machine-image.h"
 #include "image-dbus.h"

diff --git a/src/machine/machined.c b/src/machine/machined.c
index 1373362e9d761fdbc5d4d5d6bf0e3f88c939e1aa..f91f0671356b19f8acf4d5d5d6c23fdcc5a50581 100644 (file)
--- a/src/machine/machined.c
+++ b/src/machine/machined.c
@@ -20,17 +20,11 @@
 ***/
 
 #include <errno.h>
 ***/
 
 #include <errno.h>

-#include <pwd.h>
-#include <fcntl.h>

 #include <string.h>
 #include <unistd.h>
 #include <string.h>
 #include <unistd.h>

-#include <sys/epoll.h>

 
 #include "sd-daemon.h"
 
 #include "sd-daemon.h"

-#include "strv.h"
-#include "conf-parser.h"

 #include "cgroup-util.h"
 #include "cgroup-util.h"

-#include "mkdir.h"

 #include "bus-util.h"
 #include "bus-error.h"
 #include "label.h"
 #include "bus-util.h"
 #include "bus-error.h"
 #include "label.h"

diff --git a/src/machine/machined.h b/src/machine/machined.h
index df0cb82f8d78cbf13ff5c49f8757579e46e102bf..0f3df17d7f2fbcfa08b50a3e0c9297592a00af55 100644 (file)
--- a/src/machine/machined.h
+++ b/src/machine/machined.h
@@ -22,9 +22,7 @@
 ***/
 
 #include <stdbool.h>
 ***/
 
 #include <stdbool.h>

-#include <inttypes.h>

 
 

-#include "util.h"

 #include "list.h"
 #include "hashmap.h"
 #include "sd-event.h"
 #include "list.h"
 #include "hashmap.h"
 #include "sd-event.h"

diff --git a/src/modules-load/modules-load.c b/src/modules-load/modules-load.c
index 5f678789ce0024185c1bc25c491cd3185742f9e3..76e940336103eec835d6289e1f8316ff849c59d8 100644 (file)
--- a/src/modules-load/modules-load.c
+++ b/src/modules-load/modules-load.c
@@ -19,13 +19,10 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include <unistd.h>
-#include <fcntl.h>

 #include <errno.h>
 #include <string.h>
 #include <sys/stat.h>
 #include <limits.h>
 #include <errno.h>
 #include <string.h>
 #include <sys/stat.h>
 #include <limits.h>

-#include <dirent.h>

 #include <getopt.h>
 #include <libkmod.h>
 
 #include <getopt.h>
 #include <libkmod.h>
 


@@ -33,7 +30,6 @@
 #include "util.h"
 #include "strv.h"
 #include "conf-files.h"
 #include "util.h"
 #include "strv.h"
 #include "conf-files.h"

-#include "fileio.h"

 #include "build.h"
 
 static char **arg_proc_cmdline_modules = NULL;
 #include "build.h"
 
 static char **arg_proc_cmdline_modules = NULL;

diff --git a/src/network/networkd-address-pool.c b/src/network/networkd-address-pool.c
index 7ad11c617799dc8c8e36103e273ab0ab3f38a4e1..584a956a7e9d68ca4d8accae82390b3d813d62b1 100644 (file)
--- a/src/network/networkd-address-pool.c
+++ b/src/network/networkd-address-pool.c
@@ -19,7 +19,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include <arpa/inet.h>

 
 #include "networkd.h"
 #include "networkd-link.h"
 
 #include "networkd.h"
 #include "networkd-link.h"

diff --git a/src/network/networkd-address.c b/src/network/networkd-address.c
index 47033acde4e1fab18fcb32e764d13a53707fcf12..255ff7702247ee81d5b1c8646c57e286d1f2e8e0 100644 (file)
--- a/src/network/networkd-address.c
+++ b/src/network/networkd-address.c
@@ -25,7 +25,6 @@
 #include "util.h"
 #include "conf-parser.h"
 #include "fw-util.h"
 #include "util.h"
 #include "conf-parser.h"
 #include "fw-util.h"

-#include "network-internal.h"

 #include "networkd.h"
 #include "networkd-link.h"
 
 #include "networkd.h"
 #include "networkd-link.h"
 

diff --git a/src/network/networkd-fdb.c b/src/network/networkd-fdb.c
index feab8d421e59ab46c4a5d19fdb0a0e4e05502b10..b6b8327b23fdcff3d0b0743bcd6150883213fc75 100644 (file)
--- a/src/network/networkd-fdb.c
+++ b/src/network/networkd-fdb.c
@@ -19,16 +19,11 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include <ctype.h>

 #include <net/if.h>
 #include <net/ethernet.h>
 
 #include "networkd.h"
 #include <net/if.h>
 #include <net/ethernet.h>
 
 #include "networkd.h"

-#include "networkd-netdev.h"

 #include "networkd-link.h"
 #include "networkd-link.h"

-#include "network-internal.h"
-#include "path-util.h"
-#include "conf-files.h"

 #include "conf-parser.h"
 #include "util.h"
 
 #include "conf-parser.h"
 #include "util.h"
 

diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
index f716e8231a111d90e5a7f03a392d985dbcb1a17b..0665e1fcfa4aa1661b8c15d04990129a4f7a3fac 100644 (file)
--- a/src/network/networkd-link.c
+++ b/src/network/networkd-link.c
@@ -28,12 +28,9 @@
 #include "fileio.h"
 #include "bus-util.h"
 #include "udev-util.h"
 #include "fileio.h"
 #include "bus-util.h"
 #include "udev-util.h"

-#include "libudev-private.h"

 #include "network-internal.h"
 #include "networkd-link.h"
 #include "networkd-netdev.h"
 #include "network-internal.h"
 #include "networkd-link.h"
 #include "networkd-netdev.h"

-#include "conf-parser.h"
-#include "dhcp-lease-internal.h"

 
 bool link_dhcp6_enabled(Link *link) {
         if (link->flags & IFF_LOOPBACK)
 
 bool link_dhcp6_enabled(Link *link) {
         if (link->flags & IFF_LOOPBACK)

diff --git a/src/network/networkd-manager.c b/src/network/networkd-manager.c
index ce97ac0778ca7e6a25698bd364ed301dd11ab9e5..cffae835f5daf63efc221050b4b9e3b4786b3645 100644 (file)
--- a/src/network/networkd-manager.c
+++ b/src/network/networkd-manager.c
@@ -27,13 +27,11 @@
 #include "networkd.h"
 #include "networkd-netdev.h"
 #include "networkd-link.h"
 #include "networkd.h"
 #include "networkd-netdev.h"
 #include "networkd-link.h"

-#include "network-internal.h"

 #include "libudev-private.h"
 #include "udev-util.h"
 #include "rtnl-util.h"
 #include "bus-util.h"
 #include "def.h"
 #include "libudev-private.h"
 #include "udev-util.h"
 #include "rtnl-util.h"
 #include "bus-util.h"
 #include "def.h"

-#include "mkdir.h"

 #include "virt.h"
 
 #include "sd-rtnl.h"
 #include "virt.h"
 
 #include "sd-rtnl.h"

diff --git a/src/network/networkd-netdev-bond.c b/src/network/networkd-netdev-bond.c
index 88321ef84c8eca3db21a289044799714c3ce3969..c9115516fdfb0bdce3d55434026b20e2d3ee4125 100644 (file)
--- a/src/network/networkd-netdev-bond.c
+++ b/src/network/networkd-netdev-bond.c
@@ -21,7 +21,6 @@
 ***/
 
 #include <netinet/ether.h>
 ***/
 
 #include <netinet/ether.h>

-#include <arpa/inet.h>

 #include <linux/if_bonding.h>
 
 #include "conf-parser.h"
 #include <linux/if_bonding.h>
 
 #include "conf-parser.h"

diff --git a/src/network/networkd-netdev-bridge.c b/src/network/networkd-netdev-bridge.c
index 91b7051a06014902495353d889962eec2a742f2c..fd6af7e99b7f39a854bcfbd58a25f94add67270c 100644 (file)
--- a/src/network/networkd-netdev-bridge.c
+++ b/src/network/networkd-netdev-bridge.c
@@ -20,11 +20,7 @@
     along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
     along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include <netinet/ether.h>
-#include <arpa/inet.h>
-#include <net/if.h>

 
 

-#include "sd-rtnl.h"

 #include "networkd-netdev-bridge.h"
 #include "missing.h"
 
 #include "networkd-netdev-bridge.h"
 #include "missing.h"
 

diff --git a/src/network/networkd-netdev-dummy.c b/src/network/networkd-netdev-dummy.c
index 01c10a2d73b0ca37d387b5af392e45523421cce0..bb246a2be07bc5499cfbcb9118004d5f8bd55c92 100644 (file)
--- a/src/network/networkd-netdev-dummy.c
+++ b/src/network/networkd-netdev-dummy.c
@@ -20,12 +20,7 @@
     along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
     along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include <netinet/ether.h>
-#include <arpa/inet.h>
-#include <net/if.h>
-#include <linux/veth.h>

 
 

-#include "sd-rtnl.h"

 #include "networkd-netdev-dummy.h"
 
 const NetDevVTable dummy_vtable = {
 #include "networkd-netdev-dummy.h"
 
 const NetDevVTable dummy_vtable = {

diff --git a/src/network/networkd-netdev-ipvlan.c b/src/network/networkd-netdev-ipvlan.c
index 9a7c280c6b4c2af034d13c7a72470e2c6b199308..5189000c1fe543363c954d89050a7fda6561b371 100644 (file)
--- a/src/network/networkd-netdev-ipvlan.c
+++ b/src/network/networkd-netdev-ipvlan.c
@@ -20,12 +20,9 @@
 ***/
 
 #include <net/if.h>
 ***/
 
 #include <net/if.h>

-#include <linux/if_link.h>

 
 #include "networkd-netdev-ipvlan.h"
 
 #include "networkd-netdev-ipvlan.h"

-#include "network-internal.h"

 #include "conf-parser.h"
 #include "conf-parser.h"

-#include "list.h"

 
 static const char* const ipvlan_mode_table[_NETDEV_IPVLAN_MODE_MAX] = {
         [NETDEV_IPVLAN_MODE_L2] = "L2",
 
 static const char* const ipvlan_mode_table[_NETDEV_IPVLAN_MODE_MAX] = {
         [NETDEV_IPVLAN_MODE_L2] = "L2",

diff --git a/src/network/networkd-netdev-macvlan.c b/src/network/networkd-netdev-macvlan.c
index 198fb575ee3dfc853c366f0947af9e4e14ff6dfc..5f41f1c8658d9492a928a09ab1745aded9299fae 100644 (file)
--- a/src/network/networkd-netdev-macvlan.c
+++ b/src/network/networkd-netdev-macvlan.c
@@ -22,9 +22,7 @@
 #include <net/if.h>
 
 #include "networkd-netdev-macvlan.h"
 #include <net/if.h>
 
 #include "networkd-netdev-macvlan.h"

-#include "network-internal.h"

 #include "conf-parser.h"
 #include "conf-parser.h"

-#include "list.h"

 
 static const char* const macvlan_mode_table[_NETDEV_MACVLAN_MODE_MAX] = {
         [NETDEV_MACVLAN_MODE_PRIVATE] = "private",
 
 static const char* const macvlan_mode_table[_NETDEV_MACVLAN_MODE_MAX] = {
         [NETDEV_MACVLAN_MODE_PRIVATE] = "private",

diff --git a/src/network/networkd-netdev-tunnel.c b/src/network/networkd-netdev-tunnel.c
index e95082d119e6e169841c05deaa52d75b14944a7f..89ad3ee04865ae2bc1e2c57e54e49721366a936c 100644 (file)
--- a/src/network/networkd-netdev-tunnel.c
+++ b/src/network/networkd-netdev-tunnel.c
@@ -19,7 +19,6 @@
     along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
     along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include <netinet/ether.h>

 #include <arpa/inet.h>
 #include <net/if.h>
 #include <linux/ip.h>
 #include <arpa/inet.h>
 #include <net/if.h>
 #include <linux/ip.h>


@@ -29,7 +28,6 @@
 #include "sd-rtnl.h"
 #include "networkd-netdev-tunnel.h"
 #include "networkd-link.h"
 #include "sd-rtnl.h"
 #include "networkd-netdev-tunnel.h"
 #include "networkd-link.h"

-#include "network-internal.h"

 #include "util.h"
 #include "missing.h"
 #include "conf-parser.h"
 #include "util.h"
 #include "missing.h"
 #include "conf-parser.h"

diff --git a/src/network/networkd-netdev-veth.c b/src/network/networkd-netdev-veth.c
index 251cf92aec6b19e57c83ecec67940eddb5465e8c..9e9e1225e75bebb4776362bf1143f0751aeac48d 100644 (file)
--- a/src/network/networkd-netdev-veth.c
+++ b/src/network/networkd-netdev-veth.c
@@ -19,8 +19,6 @@
     along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
     along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include <netinet/ether.h>
-#include <arpa/inet.h>

 #include <net/if.h>
 #include <linux/veth.h>
 
 #include <net/if.h>
 #include <linux/veth.h>
 

diff --git a/src/network/networkd-netdev-vlan.c b/src/network/networkd-netdev-vlan.c
index 665559f89558ab305a79aa8baa6f28b1db1dbc8a..0ed024b41d444205e345715c8a5adbf987d2c1b9 100644 (file)
--- a/src/network/networkd-netdev-vlan.c
+++ b/src/network/networkd-netdev-vlan.c
@@ -22,8 +22,6 @@
 #include <net/if.h>
 
 #include "networkd-netdev-vlan.h"
 #include <net/if.h>
 
 #include "networkd-netdev-vlan.h"

-#include "network-internal.h"
-#include "list.h"

 
 static int netdev_vlan_fill_message_create(NetDev *netdev, Link *link, sd_rtnl_message *req) {
         VLan *v = VLAN(netdev);
 
 static int netdev_vlan_fill_message_create(NetDev *netdev, Link *link, sd_rtnl_message *req) {
         VLan *v = VLAN(netdev);

diff --git a/src/network/networkd-netdev-vxlan.c b/src/network/networkd-netdev-vxlan.c
index d5128cb7c02a5667500109c719921825f0267ee6..4a3a51104f1a7ec79e995b81bf0542f9ca19d8e6 100644 (file)
--- a/src/network/networkd-netdev-vxlan.c
+++ b/src/network/networkd-netdev-vxlan.c
@@ -19,8 +19,6 @@
     along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
     along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include <netinet/ether.h>
-#include <arpa/inet.h>

 #include <net/if.h>
 
 #include "sd-rtnl.h"
 #include <net/if.h>
 
 #include "sd-rtnl.h"

diff --git a/src/network/networkd-netdev.c b/src/network/networkd-netdev.c
index 8119205dde710236e1b0cd73b648902634580239..3d7cc734513bdf2dbbfaf2f07e3d7b98bdc5622a 100644 (file)
--- a/src/network/networkd-netdev.c
+++ b/src/network/networkd-netdev.c
@@ -24,7 +24,6 @@
 #include "networkd-netdev.h"
 #include "networkd-link.h"
 #include "network-internal.h"
 #include "networkd-netdev.h"
 #include "networkd-link.h"
 #include "network-internal.h"

-#include "path-util.h"

 #include "conf-files.h"
 #include "conf-parser.h"
 #include "list.h"
 #include "conf-files.h"
 #include "conf-parser.h"
 #include "list.h"

diff --git a/src/network/networkd-netdev.h b/src/network/networkd-netdev.h
index 3756b1e5a7821e4d7bd5f8496049a6ea1c853ffa..7fd83964a57a84d7c4d98a2653a29e08f96f49e0 100644 (file)
--- a/src/network/networkd-netdev.h
+++ b/src/network/networkd-netdev.h
@@ -22,10 +22,7 @@
 #pragma once
 
 #include "networkd.h"
 #pragma once
 
 #include "networkd.h"

-#include "hashmap.h"

 #include "list.h"
 #include "list.h"

-#include "set.h"
-#include "in-addr-util.h"

 
 typedef struct NetDevVTable NetDevVTable;
 
 
 typedef struct NetDevVTable NetDevVTable;
 

diff --git a/src/network/networkd-network-bus.c b/src/network/networkd-network-bus.c
index 36b40d32b93927cd0d2af07b5bfa7823e369fc42..b5f8f5cfb2c36d977d3108d89e1dddc747a646a5 100644 (file)
--- a/src/network/networkd-network-bus.c
+++ b/src/network/networkd-network-bus.c
@@ -19,8 +19,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include "bus-util.h"
-#include "bus-label.h"

 #include "strv.h"
 
 #include "networkd.h"
 #include "strv.h"
 
 #include "networkd.h"

diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c
index 35ac064cf6bddd0ef141062fd41b440736d80a29..c6cf00a5e5f63fe0a03641a0dc0392a2516f26f5 100644 (file)
--- a/src/network/networkd-network.c
+++ b/src/network/networkd-network.c
@@ -22,7 +22,6 @@
 #include <ctype.h>
 #include <net/if.h>
 
 #include <ctype.h>
 #include <net/if.h>
 

-#include "path-util.h"

 #include "conf-files.h"
 #include "conf-parser.h"
 #include "util.h"
 #include "conf-files.h"
 #include "conf-parser.h"
 #include "util.h"

diff --git a/src/network/networkd-route.c b/src/network/networkd-route.c
index c2d1ffca25444383ac1a42421406746673792de2..7f110a5217f1cdf7cca923b735ca8a3728f3fcad 100644 (file)
--- a/src/network/networkd-route.c
+++ b/src/network/networkd-route.c
@@ -19,15 +19,12 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include <net/if.h>

 
 #include "networkd.h"
 #include "networkd-link.h"
 
 
 #include "networkd.h"
 #include "networkd-link.h"
 

-#include "utf8.h"

 #include "util.h"
 #include "conf-parser.h"
 #include "util.h"
 #include "conf-parser.h"

-#include "network-internal.h"

 
 int route_new_static(Network *network, unsigned section, Route **ret) {
         _cleanup_route_free_ Route *route = NULL;
 
 int route_new_static(Network *network, unsigned section, Route **ret) {
         _cleanup_route_free_ Route *route = NULL;

diff --git a/src/network/networkd-wait-online-link.c b/src/network/networkd-wait-online-link.c
index e091b20ed9b3469cd1f0b8f722bd9efe8e7dd7b3..341bcae3fb7a14dd188af94ed0bd83e1d63f69a9 100644 (file)
--- a/src/network/networkd-wait-online-link.c
+++ b/src/network/networkd-wait-online-link.c
@@ -20,10 +20,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include <net/if.h>

 
 #include "sd-network.h"
 
 #include "sd-network.h"

-#include "strv.h"

 
 #include "networkd-wait-online-link.h"
 
 
 #include "networkd-wait-online-link.h"
 

diff --git a/src/network/networkd-wait-online-manager.c b/src/network/networkd-wait-online-manager.c
index cafe110e50dabdb305f8881c9c70eb4fda746ce6..1c997a50a4b3f4c9790fb06d93f0ff67ca2b4201 100644 (file)
--- a/src/network/networkd-wait-online-manager.c
+++ b/src/network/networkd-wait-online-manager.c
@@ -25,7 +25,6 @@
 
 #include "rtnl-util.h"
 
 
 #include "rtnl-util.h"
 

-#include "network-util.h"

 #include "network-internal.h"
 #include "networkd-wait-online-link.h"
 #include "networkd-wait-online.h"
 #include "network-internal.h"
 #include "networkd-wait-online-link.h"
 #include "networkd-wait-online.h"

diff --git a/src/network/networkd-wait-online.h b/src/network/networkd-wait-online.h
index 66b865cfe2bf127bf617933ec1d3f309447df332..73d129699df00af5f1d8650475d1d170b7dbf7e9 100644 (file)
--- a/src/network/networkd-wait-online.h
+++ b/src/network/networkd-wait-online.h
@@ -25,7 +25,6 @@
 #include "sd-rtnl.h"
 #include "sd-network.h"
 
 #include "sd-rtnl.h"
 #include "sd-network.h"
 

-#include "util.h"

 #include "hashmap.h"
 
 typedef struct Manager Manager;
 #include "hashmap.h"
 
 typedef struct Manager Manager;

diff --git a/src/network/networkd.c b/src/network/networkd.c
index 7319276c536890bc16a523063d1aff51f08d04b9..723d10547cd4c57713393cea08f582333d738b58 100644 (file)
--- a/src/network/networkd.c
+++ b/src/network/networkd.c
@@ -20,7 +20,6 @@
 ***/
 
 #include "capability.h"
 ***/
 
 #include "capability.h"

-#include "sd-event.h"

 #include "sd-daemon.h"
 
 #include "networkd.h"
 #include "sd-daemon.h"
 
 #include "networkd.h"

diff --git a/src/network/test-network-tables.c b/src/network/test-network-tables.c
index 6709ab0957b4e0361bce39be452facca04462261..67fcca2ac0094f1dfb53d55ec99f21175d2203ce 100644 (file)
--- a/src/network/test-network-tables.c
+++ b/src/network/test-network-tables.c
@@ -1,5 +1,4 @@
 #include "networkd.h"
 #include "networkd.h"

-#include "networkd-link.h"

 #include "networkd-netdev-bond.h"
 #include "networkd-netdev-macvlan.h"
 #include "dhcp6-internal.h"
 #include "networkd-netdev-bond.h"
 #include "networkd-netdev-macvlan.h"
 #include "dhcp6-internal.h"

diff --git a/src/notify/notify.c b/src/notify/notify.c
index f98075d5130c3c3d08151bdc861abc8c69d7d8ca..a8ffbe9c8cb26475e385b9e230781c7ea2a2990e 100644 (file)
--- a/src/notify/notify.c
+++ b/src/notify/notify.c
@@ -24,7 +24,6 @@
 #include <errno.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <errno.h>
 #include <unistd.h>
 #include <stdlib.h>

-#include <string.h>

 
 #include "systemd/sd-daemon.h"
 
 
 #include "systemd/sd-daemon.h"
 

diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index a9b9a3e062f7a6d0abd78660ab5c3e22bd3996b6..08bfdcf4ed3a62f383594e0619def26c6326730a 100644 (file)
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -23,27 +23,21 @@
 #include <sched.h>
 #include <unistd.h>
 #include <sys/types.h>
 #include <sched.h>
 #include <unistd.h>
 #include <sys/types.h>

-#include <sys/syscall.h>

 #include <sys/mount.h>
 #include <sys/mount.h>

-#include <sys/wait.h>

 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 #include <errno.h>
 #include <sys/prctl.h>
 #include <getopt.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 #include <errno.h>
 #include <sys/prctl.h>
 #include <getopt.h>

-#include <termios.h>
-#include <sys/signalfd.h>

 #include <grp.h>
 #include <linux/fs.h>
 #include <grp.h>
 #include <linux/fs.h>

-#include <sys/un.h>

 #include <sys/socket.h>
 #include <linux/netlink.h>
 #include <net/if.h>
 #include <linux/veth.h>
 #include <sys/personality.h>
 #include <linux/loop.h>
 #include <sys/socket.h>
 #include <linux/netlink.h>
 #include <net/if.h>
 #include <linux/veth.h>
 #include <sys/personality.h>
 #include <linux/loop.h>

-#include <poll.h>

 #include <sys/file.h>
 
 #ifdef HAVE_SELINUX
 #include <sys/file.h>
 
 #ifdef HAVE_SELINUX


@@ -66,7 +60,6 @@
 #include "util.h"
 #include "mkdir.h"
 #include "macro.h"
 #include "util.h"
 #include "mkdir.h"
 #include "macro.h"

-#include "audit.h"

 #include "missing.h"
 #include "cgroup-util.h"
 #include "strv.h"
 #include "missing.h"
 #include "cgroup-util.h"
 #include "strv.h"


@@ -79,9 +72,7 @@
 #include "bus-util.h"
 #include "bus-error.h"
 #include "ptyfwd.h"
 #include "bus-util.h"
 #include "bus-error.h"
 #include "ptyfwd.h"

-#include "bus-kernel.h"

 #include "env-util.h"
 #include "env-util.h"

-#include "def.h"

 #include "rtnl-util.h"
 #include "udev-util.h"
 #include "blkid-util.h"
 #include "rtnl-util.h"
 #include "udev-util.h"
 #include "blkid-util.h"

diff --git a/src/nss-myhostname/nss-myhostname.c b/src/nss-myhostname/nss-myhostname.c
index a939bb267cbe1c2f8a2c10d53b101db7adc45829..fed76c62e72f1ce2e915c556e4ff60991d9782bd 100644 (file)
--- a/src/nss-myhostname/nss-myhostname.c
+++ b/src/nss-myhostname/nss-myhostname.c
@@ -19,16 +19,12 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include <limits.h>

 #include <nss.h>
 #include <nss.h>

-#include <sys/types.h>

 #include <netdb.h>
 #include <errno.h>
 #include <string.h>
 #include <netdb.h>
 #include <errno.h>
 #include <string.h>

-#include <unistd.h>

 #include <net/if.h>
 #include <stdlib.h>
 #include <net/if.h>
 #include <stdlib.h>

-#include <arpa/inet.h>

 
 #include "local-addresses.h"
 #include "macro.h"
 
 #include "local-addresses.h"
 #include "macro.h"

diff --git a/src/nss-resolve/nss-resolve.c b/src/nss-resolve/nss-resolve.c
index 3f32ed06507df81eb72a7aa0c975b27cf5cba52e..bc6c5dc2a0f5c395c5a36f9d046a3d666eced3fe 100644 (file)
--- a/src/nss-resolve/nss-resolve.c
+++ b/src/nss-resolve/nss-resolve.c
@@ -19,16 +19,11 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include <limits.h>

 #include <nss.h>
 #include <nss.h>

-#include <sys/types.h>

 #include <netdb.h>
 #include <errno.h>
 #include <string.h>
 #include <netdb.h>
 #include <errno.h>
 #include <string.h>

-#include <unistd.h>
-#include <net/if.h>

 #include <stdlib.h>
 #include <stdlib.h>

-#include <arpa/inet.h>

 #include <dlfcn.h>
 
 #include "sd-bus.h"
 #include <dlfcn.h>
 
 #include "sd-bus.h"

diff --git a/src/path/path.c b/src/path/path.c
index 2f0148f074b12167a0ddefe0dcfdae9d797a52a3..99a4f2f3c0058482340545325924a1151fcd21d3 100644 (file)
--- a/src/path/path.c
+++ b/src/path/path.c
@@ -22,9 +22,7 @@
 #include <stdio.h>
 #include <getopt.h>
 #include <errno.h>
 #include <stdio.h>
 #include <getopt.h>
 #include <errno.h>

-#include <unistd.h>

 #include <stdlib.h>
 #include <stdlib.h>

-#include <string.h>

 
 #include "sd-path.h"
 #include "build.h"
 
 #include "sd-path.h"
 #include "build.h"

diff --git a/src/quotacheck/quotacheck.c b/src/quotacheck/quotacheck.c
index 9ae3abd99075e4312a87b847ef2e3150ce39bc50..819706a72f6b825d07c32e6756f3c8bf92643bdb 100644 (file)
--- a/src/quotacheck/quotacheck.c
+++ b/src/quotacheck/quotacheck.c
@@ -21,12 +21,10 @@
 
 #include <stdio.h>
 #include <stdbool.h>
 
 #include <stdio.h>
 #include <stdbool.h>

-#include <string.h>

 #include <errno.h>
 #include <unistd.h>
 
 #include "util.h"
 #include <errno.h>
 #include <unistd.h>
 
 #include "util.h"

-#include "fileio.h"

 
 static bool arg_skip = false;
 static bool arg_force = false;
 
 static bool arg_skip = false;
 static bool arg_force = false;

diff --git a/src/remount-fs/remount-fs.c b/src/remount-fs/remount-fs.c
index 57b47021e4431526ec32c4b34c806d330f0d722a..70dacfafc16509a0d41b4b29b36d0cfe85938de5 100644 (file)
--- a/src/remount-fs/remount-fs.c
+++ b/src/remount-fs/remount-fs.c
@@ -20,7 +20,6 @@
 ***/
 
 #include <unistd.h>
 ***/
 
 #include <unistd.h>

-#include <fcntl.h>

 #include <errno.h>
 #include <string.h>
 #include <sys/stat.h>
 #include <errno.h>
 #include <string.h>
 #include <sys/stat.h>


@@ -30,7 +29,6 @@
 #include "log.h"
 #include "util.h"
 #include "path-util.h"
 #include "log.h"
 #include "util.h"
 #include "path-util.h"

-#include "set.h"

 #include "mount-setup.h"
 #include "exit-status.h"
 
 #include "mount-setup.h"
 #include "exit-status.h"
 

diff --git a/src/reply-password/reply-password.c b/src/reply-password/reply-password.c
index abf5f525dd9c0e603f21ecba7cff470b3c10be31..d0d61b98ed3102e1d1b670ab0e9f051e8acdc005 100644 (file)
--- a/src/reply-password/reply-password.c
+++ b/src/reply-password/reply-password.c
@@ -20,17 +20,9 @@
 ***/
 
 #include <sys/socket.h>
 ***/
 
 #include <sys/socket.h>

-#include <poll.h>
-#include <sys/types.h>
-#include <assert.h>

 #include <string.h>
 #include <errno.h>
 #include <string.h>
 #include <errno.h>

-#include <unistd.h>
-#include <fcntl.h>

 #include <sys/un.h>
 #include <sys/un.h>

-#include <sys/stat.h>
-#include <sys/signalfd.h>
-#include <getopt.h>

 #include <stddef.h>
 
 #include "log.h"
 #include <stddef.h>
 
 #include "log.h"

diff --git a/src/resolve-host/resolve-host.c b/src/resolve-host/resolve-host.c
index 43ecf81ef62b8e46244b6a21d017aebee98869a6..068756cab1ea55c61cffa0a777e2de4ae4388093 100644 (file)
--- a/src/resolve-host/resolve-host.c
+++ b/src/resolve-host/resolve-host.c
@@ -19,14 +19,12 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include <arpa/inet.h>

 #include <net/if.h>
 #include <getopt.h>
 
 #include "sd-bus.h"
 #include "bus-util.h"
 #include "bus-error.h"
 #include <net/if.h>
 #include <getopt.h>
 
 #include "sd-bus.h"
 #include "bus-util.h"
 #include "bus-error.h"

-#include "bus-common-errors.h"

 #include "in-addr-util.h"
 #include "af-list.h"
 #include "build.h"
 #include "in-addr-util.h"
 #include "af-list.h"
 #include "build.h"

diff --git a/src/resolve/resolved-dns-cache.h b/src/resolve/resolved-dns-cache.h
index e92280c31957b19e3f3645a1b36c3111e67fac4f..8a9b3d459dc2ec1becd66b877e004d852e7f0107 100644 (file)
--- a/src/resolve/resolved-dns-cache.h
+++ b/src/resolve/resolved-dns-cache.h
@@ -21,7 +21,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include <sys/types.h>

 
 #include "hashmap.h"
 #include "prioq.h"
 
 #include "hashmap.h"
 #include "prioq.h"

diff --git a/src/resolve/resolved-dns-domain.h b/src/resolve/resolved-dns-domain.h
index 36f27ea031ed9557eb5a37f6386d6c399b4278b7..516d244f7a3962a7c17352c2fc4e9f1d72612814 100644 (file)
--- a/src/resolve/resolved-dns-domain.h
+++ b/src/resolve/resolved-dns-domain.h
@@ -21,7 +21,6 @@
 
 #pragma once
 
 
 #pragma once
 

-#include <sys/types.h>

 
 #include "hashmap.h"
 #include "in-addr-util.h"
 
 #include "hashmap.h"
 #include "in-addr-util.h"

diff --git a/src/resolve/resolved-dns-packet.h b/src/resolve/resolved-dns-packet.h
index 561dd3adfa72fd57187216126a2c9d605ac6ea88..c5867386c67fa9f1dbd4f597a29b99e0ca0241df 100644 (file)
--- a/src/resolve/resolved-dns-packet.h
+++ b/src/resolve/resolved-dns-packet.h
@@ -21,7 +21,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
  ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
  ***/
 

-#include <inttypes.h>

 
 #include "macro.h"
 #include "sparse-endian.h"
 
 #include "macro.h"
 #include "sparse-endian.h"

diff --git a/src/resolve/resolved-dns-query.c b/src/resolve/resolved-dns-query.c
index f0483c98069f357b72f60a161842527ba8e369a2..d619fae725ba5b1516bee1cff1b9be34c8b5687b 100644 (file)
--- a/src/resolve/resolved-dns-query.c
+++ b/src/resolve/resolved-dns-query.c
@@ -19,10 +19,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include "af-list.h"

 
 #include "resolved-dns-query.h"
 
 #include "resolved-dns-query.h"

-#include "resolved-dns-domain.h"

 
 /* How long to wait for the query in total */
 #define QUERY_TIMEOUT_USEC (30 * USEC_PER_SEC)
 
 /* How long to wait for the query in total */
 #define QUERY_TIMEOUT_USEC (30 * USEC_PER_SEC)

diff --git a/src/resolve/resolved-dns-query.h b/src/resolve/resolved-dns-query.h
index 13b3ee4f818187107c3ecb88c435d6862b6e6b4f..788992e679ea31192bd629065312b0bd11b055f0 100644 (file)
--- a/src/resolve/resolved-dns-query.h
+++ b/src/resolve/resolved-dns-query.h
@@ -21,21 +21,15 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include <inttypes.h>

 
 #include "sd-bus.h"
 
 #include "sd-bus.h"

-#include "util.h"

 #include "set.h"
 
 typedef struct DnsQuery DnsQuery;
 
 #include "set.h"
 
 typedef struct DnsQuery DnsQuery;
 

-#include "resolved-dns-scope.h"
-#include "resolved-dns-rr.h"

 #include "resolved-dns-question.h"
 #include "resolved-dns-answer.h"
 #include "resolved-dns-stream.h"
 #include "resolved-dns-question.h"
 #include "resolved-dns-answer.h"
 #include "resolved-dns-stream.h"

-#include "resolved-dns-transaction.h"
-#include "resolved-manager.h"

 
 struct DnsQuery {
         Manager *manager;
 
 struct DnsQuery {
         Manager *manager;

diff --git a/src/resolve/resolved-dns-rr.h b/src/resolve/resolved-dns-rr.h
index 9d9a89d38343880f89cb872bb689ce1868d2cb76..26796c842b9b7cb7102c646f54f9407772c7448d 100644 (file)
--- a/src/resolve/resolved-dns-rr.h
+++ b/src/resolve/resolved-dns-rr.h
@@ -21,10 +21,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
  ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
  ***/
 

-#include <inttypes.h>

 #include <netinet/in.h>
 
 #include <netinet/in.h>
 

-#include "util.h"

 #include "hashmap.h"
 #include "in-addr-util.h"
 #include "dns-type.h"
 #include "hashmap.h"
 #include "in-addr-util.h"
 #include "dns-type.h"

diff --git a/src/resolve/resolved-dns-scope.h b/src/resolve/resolved-dns-scope.h
index f05648e5a5c1dfbda2b967110a6d207dca2cbc38..cfbde1343f49641234e6aa6764d5750f2409fb2b 100644 (file)
--- a/src/resolve/resolved-dns-scope.h
+++ b/src/resolve/resolved-dns-scope.h
@@ -27,11 +27,8 @@ typedef struct DnsScope DnsScope;
 
 #include "resolved-dns-server.h"
 #include "resolved-dns-packet.h"
 
 #include "resolved-dns-server.h"
 #include "resolved-dns-packet.h"

-#include "resolved-dns-query.h"

 #include "resolved-dns-cache.h"
 #include "resolved-dns-zone.h"
 #include "resolved-dns-cache.h"
 #include "resolved-dns-zone.h"

-#include "resolved-dns-stream.h"
-#include "resolved-manager.h"

 #include "resolved-link.h"
 
 typedef enum DnsScopeMatch {
 #include "resolved-link.h"
 
 typedef enum DnsScopeMatch {

diff --git a/src/resolve/resolved-dns-server.h b/src/resolve/resolved-dns-server.h
index a438a27763b38bc16dc28c5717bd5d54386a9d40..70ff35b08fb8efc7a1c90a792c133b49253e935f 100644 (file)
--- a/src/resolve/resolved-dns-server.h
+++ b/src/resolve/resolved-dns-server.h
@@ -32,7 +32,6 @@ typedef enum DnsServerType {
         DNS_SERVER_LINK,
 } DnsServerType;
 
         DNS_SERVER_LINK,
 } DnsServerType;
 

-#include "resolved-manager.h"

 #include "resolved-link.h"
 
 struct DnsServer {
 #include "resolved-link.h"
 
 struct DnsServer {

diff --git a/src/resolve/resolved-dns-stream.h b/src/resolve/resolved-dns-stream.h
index 46eae31c60b86eddd8c311f42072750a88f385d7..fb81e9f1ac5919b5d17daf5acacb104e489f9a61 100644 (file)
--- a/src/resolve/resolved-dns-stream.h
+++ b/src/resolve/resolved-dns-stream.h
@@ -27,7 +27,6 @@ typedef struct DnsStream DnsStream;
 
 #include "resolved-dns-packet.h"
 #include "resolved-dns-transaction.h"
 
 #include "resolved-dns-packet.h"
 #include "resolved-dns-transaction.h"

-#include "resolved-manager.h"

 
 struct DnsStream {
         Manager *manager;
 
 struct DnsStream {
         Manager *manager;

diff --git a/src/resolve/resolved-dns-transaction.h b/src/resolve/resolved-dns-transaction.h
index 182fb7714c5cb60a3e449b583bad61f5228dc554..f6d539d315165787b86cc7ef684177a57a95b25e 100644 (file)
--- a/src/resolve/resolved-dns-transaction.h
+++ b/src/resolve/resolved-dns-transaction.h
@@ -40,11 +40,9 @@ enum DnsTransactionState {
 };
 
 #include "resolved-dns-scope.h"
 };
 
 #include "resolved-dns-scope.h"

-#include "resolved-dns-rr.h"

 #include "resolved-dns-packet.h"
 #include "resolved-dns-question.h"
 #include "resolved-dns-answer.h"
 #include "resolved-dns-packet.h"
 #include "resolved-dns-question.h"
 #include "resolved-dns-answer.h"

-#include "resolved-dns-stream.h"

 
 struct DnsTransaction {
         DnsScope *scope;
 
 struct DnsTransaction {
         DnsScope *scope;

diff --git a/src/resolve/resolved-link.h b/src/resolve/resolved-link.h
index 4f0702e872b7ca318a66b68dd6ebb49dc7990449..eee18461085e9b60ed71384d25b22cb2276c55cd 100644 (file)
--- a/src/resolve/resolved-link.h
+++ b/src/resolve/resolved-link.h
@@ -29,8 +29,6 @@
 typedef struct Link Link;
 typedef struct LinkAddress LinkAddress;
 
 typedef struct Link Link;
 typedef struct LinkAddress LinkAddress;
 

-#include "resolved-dns-server.h"
-#include "resolved-dns-scope.h"

 #include "resolved-dns-rr.h"
 #include "resolved-manager.h"
 
 #include "resolved-dns-rr.h"
 #include "resolved-manager.h"
 

diff --git a/src/resolve/resolved-manager.c b/src/resolve/resolved-manager.c
index b5ad70161194edeca27cbdc9e9570bd782e25020..167bea39b372849c07ea76666134f87c32b87b9d 100644 (file)
--- a/src/resolve/resolved-manager.c
+++ b/src/resolve/resolved-manager.c
@@ -19,18 +19,13 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
  ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
  ***/
 

-#include <arpa/inet.h>

 #include <resolv.h>
 #include <resolv.h>

-#include <net/if.h>

 #include <sys/ioctl.h>
 #include <poll.h>
 #include <netinet/in.h>
 
 #include "rtnl-util.h"
 #include <sys/ioctl.h>
 #include <poll.h>
 #include <netinet/in.h>
 
 #include "rtnl-util.h"

-#include "event-util.h"
-#include "network-util.h"

 #include "network-internal.h"
 #include "network-internal.h"

-#include "conf-parser.h"

 #include "socket-util.h"
 #include "af-list.h"
 #include "utf8.h"
 #include "socket-util.h"
 #include "af-list.h"
 #include "utf8.h"

diff --git a/src/resolve/resolved-manager.h b/src/resolve/resolved-manager.h
index 1151029d29fdec7cdf0ace882ba6e4bd38418d8f..5a581cc13ad071071a59ff862dabd0b757ca4cca 100644 (file)
--- a/src/resolve/resolved-manager.h
+++ b/src/resolve/resolved-manager.h
@@ -24,9 +24,7 @@
 #include "sd-event.h"
 #include "sd-network.h"
 #include "sd-rtnl.h"
 #include "sd-event.h"
 #include "sd-network.h"
 #include "sd-rtnl.h"

-#include "util.h"

 #include "list.h"
 #include "list.h"

-#include "in-addr-util.h"

 #include "hashmap.h"
 
 typedef struct Manager Manager;
 #include "hashmap.h"
 
 typedef struct Manager Manager;


@@ -41,8 +39,6 @@ enum Support {
 };
 
 #include "resolved-dns-query.h"
 };
 
 #include "resolved-dns-query.h"

-#include "resolved-dns-server.h"
-#include "resolved-dns-scope.h"

 #include "resolved-dns-stream.h"
 #include "resolved-link.h"
 
 #include "resolved-dns-stream.h"
 #include "resolved-link.h"
 

diff --git a/src/resolve/resolved.c b/src/resolve/resolved.c
index ce15a8011d551601f133cdcb25def20d6f06b908..271247ca3fca7ab5874993e54237dfea91c880bd 100644 (file)
--- a/src/resolve/resolved.c
+++ b/src/resolve/resolved.c
@@ -22,7 +22,6 @@
 #include "sd-event.h"
 #include "sd-daemon.h"
 #include "mkdir.h"
 #include "sd-event.h"
 #include "sd-daemon.h"
 #include "mkdir.h"

-#include "label.h"

 #include "capability.h"
 #include "selinux-util.h"
 
 #include "capability.h"
 #include "selinux-util.h"
 

diff --git a/src/resolve/test-dns-domain.c b/src/resolve/test-dns-domain.c
index ebc8d98fcefc9635f2f6eaf137f9757c2bf74a68..2f3edaf783d6443e8d8bda3d86971719b644a0a4 100644 (file)
--- a/src/resolve/test-dns-domain.c
+++ b/src/resolve/test-dns-domain.c
@@ -19,7 +19,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
  ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
  ***/
 

-#include "log.h"

 #include "macro.h"
 #include "resolved-dns-domain.h"
 
 #include "macro.h"
 #include "resolved-dns-domain.h"
 

diff --git a/src/shared/acl-util.c b/src/shared/acl-util.c
index a4ff1ab878e12aa3d2bff6dfc0cdbe22c5b47619..34707e6b3d87983049a11337cf522a3bf6c45fcb 100644 (file)
--- a/src/shared/acl-util.c
+++ b/src/shared/acl-util.c
@@ -19,7 +19,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include <assert.h>

 #include <errno.h>
 #include <stdbool.h>
 
 #include <errno.h>
 #include <stdbool.h>
 

diff --git a/src/shared/acpi-fpdt.c b/src/shared/acpi-fpdt.c
index 390c3236e097ce8bba1e4ee2a3e4f56d66414bf7..64e50401b9d0a586a390cbdba8e11fa9af9d3044 100644 (file)
--- a/src/shared/acpi-fpdt.c
+++ b/src/shared/acpi-fpdt.c
@@ -19,13 +19,11 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include <stdlib.h>

 #include <stdio.h>
 #include <stdint.h>
 #include <string.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <stdio.h>
 #include <stdint.h>
 #include <string.h>
 #include <unistd.h>
 #include <fcntl.h>

-#include <sys/types.h>

 
 #include <util.h>
 #include <fileio.h>
 
 #include <util.h>
 #include <fileio.h>

diff --git a/src/shared/apparmor-util.c b/src/shared/apparmor-util.c
index c14843da49b74c43439f1815574493df34f0cd65..c2bbd330bdd212051bbe5418d1f0ec7987b80a01 100644 (file)
--- a/src/shared/apparmor-util.c
+++ b/src/shared/apparmor-util.c
@@ -19,7 +19,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include <unistd.h>

 
 #include "util.h"
 #include "fileio.h"
 
 #include "util.h"
 #include "fileio.h"

diff --git a/src/shared/arphrd-list.c b/src/shared/arphrd-list.c
index 6e113eff7a183c54282dc74830fdfe9de2432b86..284043cd900198c0d386186d869ac5887f2d88d7 100644 (file)
--- a/src/shared/arphrd-list.c
+++ b/src/shared/arphrd-list.c
@@ -20,7 +20,6 @@
 ***/
 
 #include <net/if_arp.h>
 ***/
 
 #include <net/if_arp.h>

-#include <sys/socket.h>

 #include <string.h>
 
 #include "util.h"
 #include <string.h>
 
 #include "util.h"

diff --git a/src/shared/ask-password-api.h b/src/shared/ask-password-api.h
index 704ee6e1b443522a84fdabc6ba92a0237dbc2a17..0954e072be47d75b61f571fde48513867863e5d2 100644 (file)
--- a/src/shared/ask-password-api.h
+++ b/src/shared/ask-password-api.h
@@ -21,7 +21,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include "util.h"

 
 int ask_password_tty(const char *message, usec_t until, bool echo, const char *flag_file, char **_passphrase);
 
 
 int ask_password_tty(const char *message, usec_t until, bool echo, const char *flag_file, char **_passphrase);
 

diff --git a/src/shared/audit.c b/src/shared/audit.c
index 4701c0a8de856548d1eb7b8e0d31dd9304636872..4c1496f601c5cf5bffa42e991eb11560712454f5 100644 (file)
--- a/src/shared/audit.c
+++ b/src/shared/audit.c
@@ -19,20 +19,13 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include <assert.h>
-#include <string.h>
-#include <unistd.h>

 #include <errno.h>
 #include <errno.h>

-#include <stdlib.h>

 #include <stdio.h>
 #include <stdio.h>

-#include <ctype.h>

 
 #include "macro.h"
 #include "audit.h"
 #include "util.h"
 
 #include "macro.h"
 #include "audit.h"
 #include "util.h"

-#include "log.h"

 #include "fileio.h"
 #include "fileio.h"

-#include "virt.h"

 
 int audit_session_from_pid(pid_t pid, uint32_t *id) {
         _cleanup_free_ char *s = NULL;
 
 int audit_session_from_pid(pid_t pid, uint32_t *id) {
         _cleanup_free_ char *s = NULL;

diff --git a/src/shared/audit.h b/src/shared/audit.h
index b4aecffb3057cd245926cec68500d11dbd1c9f69..7e9c929ac6c652c6d94345fb38e353cf4ae5e926 100644 (file)
--- a/src/shared/audit.h
+++ b/src/shared/audit.h
@@ -23,7 +23,6 @@
 
 #include <sys/types.h>
 
 
 #include <sys/types.h>
 

-#include "capability.h"

 
 int audit_session_from_pid(pid_t pid, uint32_t *id);
 int audit_loginuid_from_pid(pid_t pid, uid_t *uid);
 
 int audit_session_from_pid(pid_t pid, uint32_t *id);
 int audit_loginuid_from_pid(pid_t pid, uid_t *uid);

diff --git a/src/shared/barrier.c b/src/shared/barrier.c
index f65363a67b11ab9bc625a21b47aeb5caa182f6c5..ec121d74035d3a8a2d7f802e7c1d8514842f61db 100644 (file)
--- a/src/shared/barrier.c
+++ b/src/shared/barrier.c
@@ -21,13 +21,10 @@
 
 #include <errno.h>
 #include <fcntl.h>
 
 #include <errno.h>
 #include <fcntl.h>

-#include <limits.h>

 #include <poll.h>
 #include <stdbool.h>
 #include <stdint.h>
 #include <poll.h>
 #include <stdbool.h>
 #include <stdint.h>

-#include <stdio.h>

 #include <stdlib.h>
 #include <stdlib.h>

-#include <string.h>

 #include <sys/eventfd.h>
 #include <sys/types.h>
 #include <unistd.h>
 #include <sys/eventfd.h>
 #include <sys/types.h>
 #include <unistd.h>

diff --git a/src/shared/barrier.h b/src/shared/barrier.h
index d4ad2a419b6d0efd76e2ded4036b34a5e57f01d7..7816fae576bc6221874c9b1a40dcd693c3cb6466 100644 (file)
--- a/src/shared/barrier.h
+++ b/src/shared/barrier.h
@@ -21,14 +21,9 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include <errno.h>
-#include <inttypes.h>
-#include <stdlib.h>
-#include <string.h>

 #include <sys/types.h>
 
 #include "macro.h"
 #include <sys/types.h>
 
 #include "macro.h"

-#include "util.h"

 
 /* See source file for an API description. */
 
 
 /* See source file for an API description. */
 

diff --git a/src/shared/base-filesystem.c b/src/shared/base-filesystem.c
index 73907c6354776bc28a18a680d2af6d11b722d5cb..6bd317f354d40def56cf0a5349502e11eabe4623 100644 (file)
--- a/src/shared/base-filesystem.c
+++ b/src/shared/base-filesystem.c
@@ -22,17 +22,12 @@
 #include <errno.h>
 #include <sys/stat.h>
 #include <stdlib.h>
 #include <errno.h>
 #include <sys/stat.h>
 #include <stdlib.h>

-#include <string.h>
-#include <assert.h>

 #include <unistd.h>
 
 #include "base-filesystem.h"
 #include "log.h"
 #include "macro.h"
 #include <unistd.h>
 
 #include "base-filesystem.h"
 #include "log.h"
 #include "macro.h"

-#include "strv.h"

 #include "util.h"
 #include "util.h"

-#include "label.h"
-#include "mkdir.h"

 
 typedef struct BaseFilesystem {
         const char *dir;
 
 typedef struct BaseFilesystem {
         const char *dir;

diff --git a/src/shared/boot-timestamps.c b/src/shared/boot-timestamps.c
index 54e0537a212b999f6ecee922aa863b080d31a38a..68419595fbbf3b379a6ed44fbc02854d0b8c2766 100644 (file)
--- a/src/shared/boot-timestamps.c
+++ b/src/shared/boot-timestamps.c
@@ -19,7 +19,6 @@
   You should have received a copy of the GNU Lesser General Public License
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
   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 <unistd.h>

 
 #include "boot-timestamps.h"
 #include "acpi-fpdt.h"
 
 #include "boot-timestamps.h"
 #include "acpi-fpdt.h"

diff --git a/src/shared/btrfs-util.c b/src/shared/btrfs-util.c
index b34ac8b15a80260c13cef09701bf1673d79d84df..2a70dfea451a4bf2ee6ece3d3c1d05cfcac4b1c7 100644 (file)
--- a/src/shared/btrfs-util.c
+++ b/src/shared/btrfs-util.c
@@ -31,7 +31,6 @@
 #include "util.h"
 #include "path-util.h"
 #include "macro.h"
 #include "util.h"
 #include "path-util.h"
 #include "macro.h"

-#include "strv.h"

 #include "copy.h"
 #include "selinux-util.h"
 #include "smack-util.h"
 #include "copy.h"
 #include "selinux-util.h"
 #include "smack-util.h"

diff --git a/src/shared/bus-label.c b/src/shared/bus-label.c
index 61eb75bca28490decd8c9d924fa265525eac7934..9e9eaf4003de2bbef07695b0ba51b032c69a8a6c 100644 (file)
--- a/src/shared/bus-label.c
+++ b/src/shared/bus-label.c
@@ -19,13 +19,10 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include <assert.h>

 #include <stdlib.h>
 #include <stdlib.h>

-#include <unistd.h>

 
 #include "util.h"
 #include "macro.h"
 
 #include "util.h"
 #include "macro.h"

-#include "def.h"

 
 #include "bus-label.h"
 
 
 #include "bus-label.h"
 

diff --git a/src/shared/cap-list.c b/src/shared/cap-list.c
index 8033e8c7b2781d8a9a88e367581313bdbbc77595..bd5bffbfa519479a207a4a2ef5744aab80c75e3a 100644 (file)
--- a/src/shared/cap-list.c
+++ b/src/shared/cap-list.c
@@ -19,7 +19,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include <linux/capability.h>

 #include <string.h>
 
 #include "util.h"
 #include <string.h>
 
 #include "util.h"

diff --git a/src/shared/capability.c b/src/shared/capability.c
index 915ceb9d9b1a4749206bebb638a971f7dcac156c..4840c3ebf4149fc7658e7f3f2c204fb6219f8235 100644 (file)
--- a/src/shared/capability.c
+++ b/src/shared/capability.c
@@ -19,14 +19,9 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include <assert.h>
-#include <string.h>

 #include <unistd.h>
 #include <errno.h>
 #include <stdio.h>
 #include <unistd.h>
 #include <errno.h>
 #include <stdio.h>

-#include <sys/types.h>
-#include <stdarg.h>
-#include <ctype.h>

 #include <sys/capability.h>
 #include <sys/prctl.h>
 #include "grp.h"
 #include <sys/capability.h>
 #include <sys/prctl.h>
 #include "grp.h"

diff --git a/src/shared/capability.h b/src/shared/capability.h
index 6f2f6f997d247b29647587444031deba76d8028c..8260ae1a810d050d7dbd9305d3a60b17b3081bb3 100644 (file)
--- a/src/shared/capability.h
+++ b/src/shared/capability.h
@@ -21,7 +21,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include <inttypes.h>

 #include <stdbool.h>
 #include <sys/capability.h>
 
 #include <stdbool.h>
 #include <sys/capability.h>
 

diff --git a/src/shared/cgroup-show.h b/src/shared/cgroup-show.h
index 3146f56cad247b50e10e73a1157ab32c9da2c05d..aa832454b5c4d5a6b95bf37e9e859b5056f21e84 100644 (file)
--- a/src/shared/cgroup-show.h
+++ b/src/shared/cgroup-show.h
@@ -23,7 +23,6 @@
 
 #include <stdbool.h>
 #include <sys/types.h>
 
 #include <stdbool.h>
 #include <sys/types.h>

-#include "util.h"

 #include "logs-show.h"
 
 int show_cgroup_by_path(const char *path, const char *prefix, unsigned columns, bool kernel_threads, OutputFlags flags);
 #include "logs-show.h"
 
 int show_cgroup_by_path(const char *path, const char *prefix, unsigned columns, bool kernel_threads, OutputFlags flags);

diff --git a/src/shared/cgroup-util.c b/src/shared/cgroup-util.c
index dfd8689b72a88a5e58ce6049d8c9ee09abd564d1..05c3125aec79ca0ba2fafb2c27eb94ec65ccc085 100644 (file)
--- a/src/shared/cgroup-util.c
+++ b/src/shared/cgroup-util.c
@@ -30,12 +30,10 @@
 #include <ftw.h>
 
 #include "cgroup-util.h"
 #include <ftw.h>
 
 #include "cgroup-util.h"

-#include "log.h"

 #include "set.h"
 #include "macro.h"
 #include "util.h"
 #include "path-util.h"
 #include "set.h"
 #include "macro.h"
 #include "util.h"
 #include "path-util.h"

-#include "strv.h"

 #include "unit-name.h"
 #include "fileio.h"
 #include "special.h"
 #include "unit-name.h"
 #include "fileio.h"
 #include "special.h"

diff --git a/src/shared/clean-ipc.c b/src/shared/clean-ipc.c
index 39ab645133f8df33237ab34c875edfbd0dc19555..ea781f5dea716b2ddcb296c1d33aa3be2a328f36 100644 (file)
--- a/src/shared/clean-ipc.c
+++ b/src/shared/clean-ipc.c
@@ -24,7 +24,6 @@
 #include <sys/sem.h>
 #include <sys/msg.h>
 #include <sys/stat.h>
 #include <sys/sem.h>
 #include <sys/msg.h>
 #include <sys/stat.h>

-#include <sys/mman.h>

 #include <fcntl.h>
 #include <dirent.h>
 #include <mqueue.h>
 #include <fcntl.h>
 #include <dirent.h>
 #include <mqueue.h>

diff --git a/src/shared/clock-util.c b/src/shared/clock-util.c
index 96684681a40760392255ba01ff370c54debae1b8..e4e03df1e47d196f1457e8c2ea00689de0780afb 100644 (file)
--- a/src/shared/clock-util.c
+++ b/src/shared/clock-util.c
@@ -19,29 +19,16 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include <assert.h>
-#include <string.h>
-#include <unistd.h>

 #include <errno.h>
 #include <errno.h>

-#include <stdlib.h>
-#include <signal.h>

 #include <stdio.h>
 #include <stdio.h>

-#include <sys/types.h>
-#include <sys/stat.h>

 #include <fcntl.h>
 #include <sys/ioctl.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>

-#include <stdarg.h>
-#include <ctype.h>
-#include <sys/prctl.h>

 #include <sys/time.h>
 #include <linux/rtc.h>
 
 #include "macro.h"
 #include "util.h"
 #include <sys/time.h>
 #include <linux/rtc.h>
 
 #include "macro.h"
 #include "util.h"

-#include "log.h"
-#include "strv.h"

 #include "clock-util.h"
 #include "clock-util.h"

-#include "fileio.h"

 
 int clock_get_hwclock(struct tm *tm) {
         _cleanup_close_ int fd = -1;
 
 int clock_get_hwclock(struct tm *tm) {
         _cleanup_close_ int fd = -1;

diff --git a/src/shared/clock-util.h b/src/shared/clock-util.h
index 198a7b275309985efcb2d95db3383c7d7f760782..8c2d2354302fc7771bf3e4f71d124f415db84325 100644 (file)
--- a/src/shared/clock-util.h
+++ b/src/shared/clock-util.h
@@ -21,7 +21,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include "util.h"

 
 int clock_is_localtime(void);
 int clock_set_timezone(int *min);
 
 int clock_is_localtime(void);
 int clock_set_timezone(int *min);

diff --git a/src/shared/condition.c b/src/shared/condition.c
index da7560f05fb616f2176f7c2a389bb61b8a2591e1..f34b45f2a9cff97ec2e32bbf80e263ed2381242c 100644 (file)
--- a/src/shared/condition.c
+++ b/src/shared/condition.c
@@ -23,14 +23,12 @@
 #include <errno.h>
 #include <string.h>
 #include <unistd.h>
 #include <errno.h>
 #include <string.h>
 #include <unistd.h>

-#include <sys/statvfs.h>

 #include <fnmatch.h>
 
 #include "sd-id128.h"
 #include "util.h"
 #include "virt.h"
 #include "path-util.h"
 #include <fnmatch.h>
 
 #include "sd-id128.h"
 #include "util.h"
 #include "virt.h"
 #include "path-util.h"

-#include "fileio.h"

 #include "architecture.h"
 #include "smack-util.h"
 #include "apparmor-util.h"
 #include "architecture.h"
 #include "smack-util.h"
 #include "apparmor-util.h"

diff --git a/src/shared/conf-files.c b/src/shared/conf-files.c
index db4937db8898f341cfeff1094cd1d0c5925b581f..9ab08355e35cff0819462d4b2494d995643ff5d5 100644 (file)
--- a/src/shared/conf-files.c
+++ b/src/shared/conf-files.c
@@ -19,13 +19,10 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include <assert.h>

 #include <string.h>
 #include <string.h>

-#include <unistd.h>

 #include <errno.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <errno.h>
 #include <stdlib.h>
 #include <stdio.h>

-#include <sys/stat.h>

 #include <dirent.h>
 
 #include "macro.h"
 #include <dirent.h>
 
 #include "macro.h"

diff --git a/src/shared/conf-files.h b/src/shared/conf-files.h
index 368c112eb313c38fc7e5f889103220d8cccc2a63..3169a907f116d9ac05fa1e15654bbe24f3361204 100644 (file)
--- a/src/shared/conf-files.h
+++ b/src/shared/conf-files.h
@@ -22,7 +22,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include "macro.h"

 
 int conf_files_list(char ***strv, const char *suffix, const char *root, const char *dir, ...);
 int conf_files_list_strv(char ***strv, const char *suffix, const char *root, const char* const* dirs);
 
 int conf_files_list(char ***strv, const char *suffix, const char *root, const char *dir, ...);
 int conf_files_list_strv(char ***strv, const char *suffix, const char *root, const char* const* dirs);

diff --git a/src/shared/conf-parser.c b/src/shared/conf-parser.c
index 0b1af6c577f6d65ca0a918a9f3b46a81247cb4c3..2148a30c66c1791e8dd233372a38d82b6d38736f 100644 (file)
--- a/src/shared/conf-parser.c
+++ b/src/shared/conf-parser.c
@@ -22,9 +22,7 @@
 #include <string.h>
 #include <stdio.h>
 #include <errno.h>
 #include <string.h>
 #include <stdio.h>
 #include <errno.h>

-#include <assert.h>

 #include <stdlib.h>
 #include <stdlib.h>

-#include <netinet/ether.h>

 
 #include "conf-parser.h"
 #include "conf-files.h"
 
 #include "conf-parser.h"
 #include "conf-files.h"


@@ -34,8 +32,6 @@
 #include "log.h"
 #include "utf8.h"
 #include "path-util.h"
 #include "log.h"
 #include "utf8.h"
 #include "path-util.h"

-#include "set.h"
-#include "exit-status.h"

 #include "sd-messages.h"
 
 int log_syntax_internal(
 #include "sd-messages.h"
 
 int log_syntax_internal(

diff --git a/src/shared/dev-setup.c b/src/shared/dev-setup.c
index e8b0810d231ddf879339197b7fa8e42830abb873..cb15da8a5d0bb5f415866c60ef6a130680b9e4c7 100644 (file)
--- a/src/shared/dev-setup.c
+++ b/src/shared/dev-setup.c
@@ -20,15 +20,10 @@
 ***/
 
 #include <errno.h>
 ***/
 
 #include <errno.h>

-#include <sys/stat.h>

 #include <stdlib.h>
 #include <stdlib.h>

-#include <string.h>
-#include <assert.h>

 #include <unistd.h>
 
 #include "dev-setup.h"
 #include <unistd.h>
 
 #include "dev-setup.h"

-#include "log.h"
-#include "macro.h"

 #include "util.h"
 #include "label.h"
 
 #include "util.h"
 #include "label.h"
 

diff --git a/src/shared/device-nodes.c b/src/shared/device-nodes.c
index 73e9edd29dc91f7a5b8822abe40961afacd9c26c..8751797f547b23ec986a2ee89c50227b8f0c3b08 100644 (file)
--- a/src/shared/device-nodes.c
+++ b/src/shared/device-nodes.c
@@ -19,10 +19,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include <stdlib.h>

 #include <stdio.h>
 #include <stdio.h>

-#include <stdint.h>
-#include <sys/types.h>

 
 #include "device-nodes.h"
 #include "utf8.h"
 
 #include "device-nodes.h"
 #include "utf8.h"

diff --git a/src/shared/efivars.c b/src/shared/efivars.c
index 5b3c5f09c836b230daab8f032e7dcbd1746c8ccc..4f8a81dcdbe2da504bed9d3e52e2df3f024e9707 100644 (file)
--- a/src/shared/efivars.c
+++ b/src/shared/efivars.c
@@ -22,9 +22,7 @@
 #include <unistd.h>
 #include <string.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <string.h>
 #include <fcntl.h>

-#include <ctype.h>

 
 

-#include "acpi-fpdt.h"

 #include "util.h"
 #include "utf8.h"
 #include "efivars.h"
 #include "util.h"
 #include "utf8.h"
 #include "efivars.h"

diff --git a/src/shared/efivars.h b/src/shared/efivars.h
index 82364565bac4bbb2937d9661dd610dcf197cda51..2492893718ee964b292e80872fe4290c3d4c40b8 100644 (file)
--- a/src/shared/efivars.h
+++ b/src/shared/efivars.h
@@ -21,8 +21,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include <sys/types.h>
-#include <inttypes.h>

 #include <stdbool.h>
 
 #include "sd-id128.h"
 #include <stdbool.h>
 
 #include "sd-id128.h"

diff --git a/src/shared/env-util.c b/src/shared/env-util.c
index 038246d21b7cd134fa34997be73d036d9ac036b2..00c2cdd8c45e16719a2c38819b9798f09e37a31f 100644 (file)
--- a/src/shared/env-util.c
+++ b/src/shared/env-util.c
@@ -20,7 +20,6 @@
 ***/
 
 #include <limits.h>
 ***/
 
 #include <limits.h>

-#include <sys/param.h>

 #include <unistd.h>
 
 #include "strv.h"
 #include <unistd.h>
 
 #include "strv.h"

diff --git a/src/shared/env-util.h b/src/shared/env-util.h
index 618441a655f248f3f9818d9add07d7d8f0e5e6c7..9de3621714789892b435df2fde1fb9bdcc3b5a0b 100644 (file)
--- a/src/shared/env-util.h
+++ b/src/shared/env-util.h
@@ -22,7 +22,6 @@
 ***/
 
 #include <stdbool.h>
 ***/
 
 #include <stdbool.h>

-#include <sys/types.h>

 
 #include "macro.h"
 
 
 #include "macro.h"
 

diff --git a/src/shared/errno-list.c b/src/shared/errno-list.c
index c63296f2922eb0d37e64e11092e19f76eaa93849..34d1331486bec218f066efb33a8f0c384dbce023 100644 (file)
--- a/src/shared/errno-list.c
+++ b/src/shared/errno-list.c
@@ -19,7 +19,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include <errno.h>

 #include <string.h>
 
 #include "util.h"
 #include <string.h>
 
 #include "util.h"

diff --git a/src/shared/exit-status.c b/src/shared/exit-status.c
index 5c73b4d3c0d1384c27e6edf748d8fa2cf162d357..57022c5b8aebd2b523df640f801683548acad59e 100644 (file)
--- a/src/shared/exit-status.c
+++ b/src/shared/exit-status.c
@@ -20,7 +20,6 @@
 ***/
 
 #include <stdlib.h>
 ***/
 
 #include <stdlib.h>

-#include <sys/wait.h>

 
 #include "exit-status.h"
 #include "set.h"
 
 #include "exit-status.h"
 #include "set.h"

diff --git a/src/shared/fdset.c b/src/shared/fdset.c
index 9e35ce5cecc55b00e36093c26d26f0b587230dc4..31849272bd314e165d9937354c3cba97e84978bf 100644 (file)
--- a/src/shared/fdset.c
+++ b/src/shared/fdset.c
@@ -22,7 +22,6 @@
 #include <errno.h>
 #include <dirent.h>
 #include <fcntl.h>
 #include <errno.h>
 #include <dirent.h>
 #include <fcntl.h>

-#include <unistd.h>

 
 #include "set.h"
 #include "util.h"
 
 #include "set.h"
 #include "util.h"

diff --git a/src/shared/fdset.h b/src/shared/fdset.h
index c3c5e5228697e1ae128f1bb497dee744e00a0ebc..340438d7c401ce9cc4565242e46f11b34801a7dd 100644 (file)
--- a/src/shared/fdset.h
+++ b/src/shared/fdset.h
@@ -22,7 +22,6 @@
 ***/
 
 #include "set.h"
 ***/
 
 #include "set.h"

-#include "util.h"

 
 typedef struct FDSet FDSet;
 
 
 typedef struct FDSet FDSet;
 

diff --git a/src/shared/fileio-label.c b/src/shared/fileio-label.c
index 5fd69e05805c40f734e098246ed332b59b721851..bec988ca7872c143bf794872c4612068e6c0f958 100644 (file)
--- a/src/shared/fileio-label.c
+++ b/src/shared/fileio-label.c
@@ -19,13 +19,9 @@
   You should have received a copy of the GNU Lesser General Public License
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
   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 <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>

 
 #include "util.h"
 #include "selinux-util.h"
 
 #include "util.h"
 #include "selinux-util.h"

-#include "label.h"

 #include "fileio-label.h"
 
 int write_string_file_atomic_label(const char *fn, const char *line) {
 #include "fileio-label.h"
 
 int write_string_file_atomic_label(const char *fn, const char *line) {

diff --git a/src/shared/generator.c b/src/shared/generator.c
index 7f16d5cbef900de9a133f083adcbc1e84e4a3455..569b25bb7c882ded2e3863ec6b7fd4a0d2826f98 100644 (file)
--- a/src/shared/generator.c
+++ b/src/shared/generator.c
@@ -19,7 +19,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include <string.h>

 #include <unistd.h>
 
 #include "util.h"
 #include <unistd.h>
 
 #include "util.h"

diff --git a/src/shared/hashmap.c b/src/shared/hashmap.c
index e63ba4bb5aa84d7eebe7770c0bcbb0daae538daa..48d75023918afadc54df0bf7597a9d38d79f485f 100644 (file)
--- a/src/shared/hashmap.c
+++ b/src/shared/hashmap.c
@@ -20,9 +20,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include <assert.h>

 #include <stdlib.h>
 #include <stdlib.h>

-#include <string.h>

 #include <errno.h>
 
 #include "util.h"
 #include <errno.h>
 
 #include "util.h"


@@ -31,9 +29,12 @@
 #include "macro.h"
 #include "siphash24.h"
 #include "strv.h"
 #include "macro.h"
 #include "siphash24.h"
 #include "strv.h"

-#include "list.h"

 #include "mempool.h"
 
 #include "mempool.h"
 

+#ifdef ENABLE_DEBUG_HASHMAP
+#include "list.h"
+#endif
+

 /*
  * Implementation of hashmaps.
  * Addressing: open
 /*
  * Implementation of hashmaps.
  * Addressing: open

diff --git a/src/shared/install-printf.c b/src/shared/install-printf.c
index d853f17772332568efd15bec973346868530422d..f62a0321e65c922db75e68ac64c9271607907cb8 100644 (file)
--- a/src/shared/install-printf.c
+++ b/src/shared/install-printf.c
@@ -19,7 +19,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include <assert.h>

 #include <stdlib.h>
 
 #include "specifier.h"
 #include <stdlib.h>
 
 #include "specifier.h"

diff --git a/src/shared/install.c b/src/shared/install.c
index 65f1c245c698422535bd2a8930f9af2f6d29402f..95ba7185595dde55b08f9531dc51fc3d4fe15ce1 100644 (file)
--- a/src/shared/install.c
+++ b/src/shared/install.c
@@ -36,7 +36,6 @@
 #include "install.h"
 #include "conf-parser.h"
 #include "conf-files.h"
 #include "install.h"
 #include "conf-parser.h"
 #include "conf-files.h"

-#include "specifier.h"

 #include "install-printf.h"
 #include "special.h"
 
 #include "install-printf.h"
 #include "special.h"
 

diff --git a/src/shared/json.c b/src/shared/json.c
index bb3d26f0e5eabf69bdb043fed1106b7f9bfcbfd0..45c8ecedb31e3107df24cecf5432c139ee489d9c 100644 (file)
--- a/src/shared/json.c
+++ b/src/shared/json.c
@@ -23,7 +23,6 @@
 #include <math.h>
 
 #include "macro.h"
 #include <math.h>
 
 #include "macro.h"

-#include "log.h"

 #include "util.h"
 #include "utf8.h"
 #include "json.h"
 #include "util.h"
 #include "utf8.h"
 #include "json.h"

diff --git a/src/shared/json.h b/src/shared/json.h
index a8457132e75ab067b9ffb7665dc96ff3f5533748..55976d513be8e21884a618a6608baafb82f377d2 100644 (file)
--- a/src/shared/json.h
+++ b/src/shared/json.h
@@ -22,7 +22,6 @@
 ***/
 
 #include <stdbool.h>
 ***/
 
 #include <stdbool.h>

-#include <inttypes.h>

 
 enum {
         JSON_END,
 
 enum {
         JSON_END,

diff --git a/src/shared/log.h b/src/shared/log.h
index b323b2f7d42bc8b011afae24073b8d3f9709e9ac..2dedfa3fd1d64caff7f87ee62e4dc48af94b5a4a 100644 (file)
--- a/src/shared/log.h
+++ b/src/shared/log.h
@@ -25,8 +25,6 @@
 #include <stdarg.h>
 #include <syslog.h>
 #include <sys/signalfd.h>
 #include <stdarg.h>
 #include <syslog.h>
 #include <sys/signalfd.h>

-#include <sys/types.h>
-#include <unistd.h>

 #include <errno.h>
 
 #include "macro.h"
 #include <errno.h>
 
 #include "macro.h"

diff --git a/src/shared/logs-show.c b/src/shared/logs-show.c
index c2495056d77005f809557b0e6d7cf9949d9ce7f1..944d6856cd8315a785d39817a093a13d8c71c4cf 100644 (file)
--- a/src/shared/logs-show.c
+++ b/src/shared/logs-show.c
@@ -20,9 +20,7 @@
 ***/
 
 #include <time.h>
 ***/
 
 #include <time.h>

-#include <assert.h>

 #include <errno.h>
 #include <errno.h>

-#include <poll.h>

 #include <sys/socket.h>
 #include <string.h>
 #include <fcntl.h>
 #include <sys/socket.h>
 #include <string.h>
 #include <fcntl.h>


@@ -32,7 +30,6 @@
 #include "util.h"
 #include "utf8.h"
 #include "hashmap.h"
 #include "util.h"
 #include "utf8.h"
 #include "hashmap.h"

-#include "fileio.h"

 #include "journal-internal.h"
 
 /* up to three lines (each up to 100 characters),
 #include "journal-internal.h"
 
 /* up to three lines (each up to 100 characters),

diff --git a/src/shared/logs-show.h b/src/shared/logs-show.h
index 8d9641e8acb94569e4c0f2295e64fcd0fcc0669f..569e1faa55acea78237ee278179f09e472c197dc 100644 (file)
--- a/src/shared/logs-show.h
+++ b/src/shared/logs-show.h
@@ -22,7 +22,6 @@
 ***/
 
 #include <stdbool.h>
 ***/
 
 #include <stdbool.h>

-#include <unistd.h>

 #include <sys/types.h>
 
 #include "sd-journal.h"
 #include <sys/types.h>
 
 #include "sd-journal.h"

diff --git a/src/shared/machine-image.c b/src/shared/machine-image.c
index 8d61507e8494c55ed1257de34c07690456085302..c734f148aec6d5f96d0742a8242052f680946955 100644 (file)
--- a/src/shared/machine-image.c
+++ b/src/shared/machine-image.c
@@ -23,7 +23,6 @@
 #include <linux/fs.h>
 #include <fcntl.h>
 
 #include <linux/fs.h>
 #include <fcntl.h>
 

-#include "strv.h"

 #include "utf8.h"
 #include "btrfs-util.h"
 #include "path-util.h"
 #include "utf8.h"
 #include "btrfs-util.h"
 #include "path-util.h"

diff --git a/src/shared/memfd-util.c b/src/shared/memfd-util.c
index 6624c5e7dbd8cc242e69bd03d388db7a7e2c8508..e99a738e1f88a79af71c8ad899c556da5fdd2b9c 100644 (file)
--- a/src/shared/memfd-util.c
+++ b/src/shared/memfd-util.c
@@ -21,7 +21,6 @@
 
 #include <stdio.h>
 #include <fcntl.h>
 
 #include <stdio.h>
 #include <fcntl.h>

-#include <sys/ioctl.h>

 #include <sys/mman.h>
 #include <sys/prctl.h>
 
 #include <sys/mman.h>
 #include <sys/prctl.h>
 


@@ -30,7 +29,6 @@
 #endif
 
 #include "util.h"
 #endif
 
 #include "util.h"

-#include "bus-label.h"

 #include "memfd-util.h"
 #include "utf8.h"
 #include "missing.h"
 #include "memfd-util.h"
 #include "utf8.h"
 #include "missing.h"

diff --git a/src/shared/memfd-util.h b/src/shared/memfd-util.h
index cf588fe02f4fcf29ecaa707a19239fca739b2bdf..3ed551fb372874971d7815f8505cc23e76877527 100644 (file)
--- a/src/shared/memfd-util.h
+++ b/src/shared/memfd-util.h
@@ -21,12 +21,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include <inttypes.h>
-#include <sys/types.h>
-#include <stdio.h>

 
 

-#include "macro.h"
-#include "util.h"

 
 int memfd_new(const char *name);
 int memfd_new_and_map(const char *name, size_t sz, void **p);
 
 int memfd_new(const char *name);
 int memfd_new_and_map(const char *name, size_t sz, void **p);

diff --git a/src/shared/mkdir-label.c b/src/shared/mkdir-label.c
index ee11ac06ff6b88c4289ccc415dee64b32c27865d..76bbc1edda11b9e4eef6040fb6a56f1a389a19a1 100644 (file)
--- a/src/shared/mkdir-label.c
+++ b/src/shared/mkdir-label.c
@@ -20,16 +20,10 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include <assert.h>
-#include <string.h>

 #include <unistd.h>
 #include <unistd.h>

-#include <errno.h>
-#include <stdlib.h>

 #include <stdio.h>
 
 #include "label.h"
 #include <stdio.h>
 
 #include "label.h"

-#include "util.h"
-#include "path-util.h"

 #include "mkdir.h"
 
 int mkdir_safe_label(const char *path, mode_t mode, uid_t uid, gid_t gid) {
 #include "mkdir.h"
 
 int mkdir_safe_label(const char *path, mode_t mode, uid_t uid, gid_t gid) {

diff --git a/src/shared/mkdir.c b/src/shared/mkdir.c
index beefd1052a53cd08cea9caae9c3cd09ec1587163..b280618a977bbdbab9551459b9ff8c2e370382b7 100644 (file)
--- a/src/shared/mkdir.c
+++ b/src/shared/mkdir.c
@@ -19,14 +19,9 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include <assert.h>

 #include <string.h>
 #include <string.h>

-#include <unistd.h>

 #include <errno.h>
 #include <errno.h>

-#include <stdlib.h>
-#include <stdio.h>

 
 

-#include "label.h"

 #include "util.h"
 #include "path-util.h"
 #include "mkdir.h"
 #include "util.h"
 #include "path-util.h"
 #include "mkdir.h"

diff --git a/src/shared/mkdir.h b/src/shared/mkdir.h
index e317df300eeb7cccaaf38058e93207bb7250491a..2392d1fd1b39fe4e05589a0822802195dfb4a46a 100644 (file)
--- a/src/shared/mkdir.h
+++ b/src/shared/mkdir.h
@@ -22,7 +22,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include <stdbool.h>

 #include <sys/types.h>
 
 int mkdir_safe(const char *path, mode_t mode, uid_t uid, gid_t gid);
 #include <sys/types.h>
 
 int mkdir_safe(const char *path, mode_t mode, uid_t uid, gid_t gid);

diff --git a/src/shared/pager.c b/src/shared/pager.c
index 8635d9a600dd15ac345e2cdd1c033b10610c4ea9..f12bfb3287f0cdca2a762b41d22ceb0a18444037 100644 (file)
--- a/src/shared/pager.c
+++ b/src/shared/pager.c
@@ -19,7 +19,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include <sys/types.h>

 #include <fcntl.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <stdlib.h>
 #include <unistd.h>

diff --git a/src/shared/path-lookup.c b/src/shared/path-lookup.c
index 291a2f4054e1a084242f3ba1d053eecd35f31542..fbf46cd40690acee9cd336a508701d69dc2a8075 100644 (file)
--- a/src/shared/path-lookup.c
+++ b/src/shared/path-lookup.c
@@ -19,15 +19,12 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include <assert.h>

 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>

-#include <unistd.h>

 #include <errno.h>
 
 #include "util.h"
 #include <errno.h>
 
 #include "util.h"

-#include "mkdir.h"

 #include "strv.h"
 #include "path-util.h"
 #include "path-lookup.h"
 #include "strv.h"
 #include "path-util.h"
 #include "path-lookup.h"

diff --git a/src/shared/path-util.c b/src/shared/path-util.c
index 70bc1caa2a53ce44092a7c6297f7f3ff4d0e4ab7..12d1ec321f174619183f1423cbdf5f83c2389e90 100644 (file)
--- a/src/shared/path-util.c
+++ b/src/shared/path-util.c
@@ -19,15 +19,12 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include <assert.h>

 #include <string.h>
 #include <unistd.h>
 #include <errno.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <errno.h>
 #include <stdlib.h>

-#include <signal.h>

 #include <stdio.h>
 #include <fcntl.h>
 #include <stdio.h>
 #include <fcntl.h>

-#include <dirent.h>

 #include <sys/statvfs.h>
 
 #include "macro.h"
 #include <sys/statvfs.h>
 
 #include "macro.h"

diff --git a/src/shared/pty.c b/src/shared/pty.c
index fbe6295ea599f57ddf0d9cbe64dd2c3d82b62b70..0f80f4863b0e1f4bde990f777bd1290331ebe91c 100644 (file)
--- a/src/shared/pty.c
+++ b/src/shared/pty.c
@@ -44,18 +44,12 @@
 
 #include <errno.h>
 #include <fcntl.h>
 
 #include <errno.h>
 #include <fcntl.h>

-#include <limits.h>
-#include <linux/ioctl.h>

 #include <signal.h>
 #include <stdbool.h>
 #include <stdint.h>
 #include <signal.h>
 #include <stdbool.h>
 #include <stdint.h>

-#include <stdio.h>

 #include <stdlib.h>
 #include <stdlib.h>

-#include <string.h>

 #include <sys/epoll.h>
 #include <sys/epoll.h>

-#include <sys/eventfd.h>

 #include <sys/ioctl.h>
 #include <sys/ioctl.h>

-#include <sys/types.h>

 #include <sys/uio.h>
 #include <sys/wait.h>
 #include <termios.h>
 #include <sys/uio.h>
 #include <sys/wait.h>
 #include <termios.h>

diff --git a/src/shared/pty.h b/src/shared/pty.h
index a87ceb58ca347fa12917faef22c14ac3bfd71011..63c7db2833d09b931e8eba3a9ab017a65f36d8ef 100644 (file)
--- a/src/shared/pty.h
+++ b/src/shared/pty.h
@@ -21,17 +21,12 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include <errno.h>

 #include <stdbool.h>
 #include <stdbool.h>

-#include <stdint.h>
-#include <stdlib.h>
-#include <string.h>

 #include <unistd.h>
 
 #include "barrier.h"
 #include "macro.h"
 #include "sd-event.h"
 #include <unistd.h>
 
 #include "barrier.h"
 #include "macro.h"
 #include "sd-event.h"

-#include "util.h"

 
 typedef struct Pty Pty;
 
 
 typedef struct Pty Pty;
 

diff --git a/src/shared/ptyfwd.c b/src/shared/ptyfwd.c
index 164c9b6ff37dbbe1bf61b55ab84afc1cdff35980..9d4d61cef5dfd02fec5a9412a9d4159dec64bdb3 100644 (file)
--- a/src/shared/ptyfwd.c
+++ b/src/shared/ptyfwd.c
@@ -20,7 +20,6 @@
 ***/
 
 #include <sys/epoll.h>
 ***/
 
 #include <sys/epoll.h>

-#include <sys/signalfd.h>

 #include <sys/ioctl.h>
 #include <limits.h>
 #include <termios.h>
 #include <sys/ioctl.h>
 #include <limits.h>
 #include <termios.h>

diff --git a/src/shared/ptyfwd.h b/src/shared/ptyfwd.h
index 6208a543db971ffc02a7ff2d39be5759cc222023..6f84e4036a7e67881f8a88d11650a736aa7099bc 100644 (file)
--- a/src/shared/ptyfwd.h
+++ b/src/shared/ptyfwd.h
@@ -21,11 +21,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include <sys/types.h>
-#include <signal.h>

 #include <stdbool.h>
 
 #include <stdbool.h>
 

-#include "util.h"

 #include "sd-event.h"
 
 typedef struct PTYForward PTYForward;
 #include "sd-event.h"
 
 typedef struct PTYForward PTYForward;

diff --git a/src/shared/ratelimit.c b/src/shared/ratelimit.c
index 01b62b7b384e25799b1d90a697290039e2a3cbd9..81fc9c19ff6c30eff6d1be1c5f9df48fc7a7e90d 100644 (file)
--- a/src/shared/ratelimit.c
+++ b/src/shared/ratelimit.c
@@ -19,10 +19,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include <assert.h>

 
 #include "ratelimit.h"
 
 #include "ratelimit.h"

-#include "log.h"

 
 /* Modelled after Linux' lib/ratelimit.c by Dave Young
  * <hidave.darkstar@gmail.com>, which is licensed GPLv2. */
 
 /* Modelled after Linux' lib/ratelimit.c by Dave Young
  * <hidave.darkstar@gmail.com>, which is licensed GPLv2. */

diff --git a/src/shared/ring.c b/src/shared/ring.c
index 309075e348e53ef21dd59c9f959cac73098237ca..68149184649fd68e6a952b2bbcd8d22c8204258b 100644 (file)
--- a/src/shared/ring.c
+++ b/src/shared/ring.c
@@ -20,7 +20,6 @@
 ***/
 
 #include <errno.h>
 ***/
 
 #include <errno.h>

-#include <inttypes.h>

 #include <stdlib.h>
 #include <string.h>
 #include <sys/uio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/uio.h>

diff --git a/src/shared/ring.h b/src/shared/ring.h
index 1210aabdf68762a2431844358f888573e71a9126..a7c44d1b56fd505a6dc2af5e908f367ee4a77543 100644 (file)
--- a/src/shared/ring.h
+++ b/src/shared/ring.h
@@ -21,11 +21,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include <errno.h>
-#include <inttypes.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/uio.h>

 
 typedef struct Ring Ring;
 
 
 typedef struct Ring Ring;
 

diff --git a/src/shared/selinux-util.c b/src/shared/selinux-util.c
index a2233e0cfb75e5c259fd42131e5930af2fc96841..82c6924e36a85345f48a156f2b21fe3d83b12818 100644 (file)
--- a/src/shared/selinux-util.c
+++ b/src/shared/selinux-util.c
@@ -20,7 +20,6 @@
 ***/
 
 #include <errno.h>
 ***/
 
 #include <errno.h>

-#include <unistd.h>

 #include <malloc.h>
 #include <sys/un.h>
 
 #include <malloc.h>
 #include <sys/un.h>
 

diff --git a/src/shared/selinux-util.h b/src/shared/selinux-util.h
index a694441000b8bb9ce21cd16ae6b0d7ba85a0c72d..846718529181e27c2a3f50e410ed4312d8cf3a60 100644 (file)
--- a/src/shared/selinux-util.h
+++ b/src/shared/selinux-util.h
@@ -22,7 +22,6 @@
 ***/
 
 #include <sys/socket.h>
 ***/
 
 #include <sys/socket.h>

-#include <stdio.h>

 #include <stdbool.h>
 
 bool mac_selinux_use(void);
 #include <stdbool.h>
 
 bool mac_selinux_use(void);

diff --git a/src/shared/socket-label.c b/src/shared/socket-label.c
index 6806c51158d0a17ee21f90085f064baadb41a376..dfb8a1a43137a9554bfcf5f58519bc959e871bed 100644 (file)
--- a/src/shared/socket-label.c
+++ b/src/shared/socket-label.c
@@ -19,24 +19,16 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include <assert.h>

 #include <string.h>
 #include <unistd.h>
 #include <errno.h>
 #include <string.h>
 #include <unistd.h>
 #include <errno.h>

-#include <stdlib.h>
-#include <arpa/inet.h>
-#include <stdio.h>
-#include <net/if.h>
-#include <sys/types.h>

 #include <sys/stat.h>
 #include <stddef.h>
 #include <sys/stat.h>
 #include <stddef.h>

-#include <sys/ioctl.h>

 
 #include "macro.h"
 #include "util.h"
 #include "mkdir.h"
 #include "missing.h"
 
 #include "macro.h"
 #include "util.h"
 #include "mkdir.h"
 #include "missing.h"

-#include "label.h"

 #include "selinux-util.h"
 #include "socket-util.h"
 
 #include "selinux-util.h"
 #include "socket-util.h"
 

diff --git a/src/shared/socket-util.c b/src/shared/socket-util.c
index a4e26b1d8c0065525cac4943a6a8a680621a6a54..74d90fa2a9716df237aecc02f8098ccb4242f318 100644 (file)
--- a/src/shared/socket-util.c
+++ b/src/shared/socket-util.c
@@ -19,24 +19,19 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include <assert.h>

 #include <string.h>
 #include <unistd.h>
 #include <errno.h>
 #include <string.h>
 #include <unistd.h>
 #include <errno.h>

-#include <stdlib.h>

 #include <arpa/inet.h>
 #include <stdio.h>
 #include <net/if.h>
 #include <sys/types.h>
 #include <arpa/inet.h>
 #include <stdio.h>
 #include <net/if.h>
 #include <sys/types.h>

-#include <sys/stat.h>

 #include <stddef.h>
 #include <stddef.h>

-#include <sys/ioctl.h>

 #include <netdb.h>
 
 #include "macro.h"
 #include <netdb.h>
 
 #include "macro.h"

-#include "util.h"
-#include "mkdir.h"

 #include "path-util.h"
 #include "path-util.h"

+#include "util.h"

 #include "socket-util.h"
 #include "missing.h"
 #include "fileio.h"
 #include "socket-util.h"
 #include "missing.h"
 #include "fileio.h"

diff --git a/src/shared/socket-util.h b/src/shared/socket-util.h
index 07d0aff72b3a95d7776781abc9c28d281fd3f998..2d2b9023699a142de534de50048beb46f65f6209 100644 (file)
--- a/src/shared/socket-util.h
+++ b/src/shared/socket-util.h
@@ -25,7 +25,6 @@
 #include <netinet/in.h>
 #include <netinet/ether.h>
 #include <sys/un.h>
 #include <netinet/in.h>
 #include <netinet/ether.h>
 #include <sys/un.h>

-#include <asm/types.h>

 #include <linux/netlink.h>
 #include <linux/if_packet.h>
 
 #include <linux/netlink.h>
 #include <linux/if_packet.h>
 

diff --git a/src/shared/spawn-ask-password-agent.c b/src/shared/spawn-ask-password-agent.c
index ee267833e64afee60afc9277a8fc1123416d8d5e..0d7458806dc3e7ef7a9decbf5f45719c722be93d 100644 (file)
--- a/src/shared/spawn-ask-password-agent.c
+++ b/src/shared/spawn-ask-password-agent.c
@@ -19,13 +19,9 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include <sys/types.h>

 #include <stdlib.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <unistd.h>

-#include <string.h>
-#include <sys/prctl.h>

 #include <signal.h>
 #include <signal.h>

-#include <fcntl.h>

 
 #include "log.h"
 #include "util.h"
 
 #include "log.h"
 #include "util.h"

diff --git a/src/shared/spawn-polkit-agent.c b/src/shared/spawn-polkit-agent.c
index 8f259a8f39c5254a3fb3fc61bbd679bf79bd9bbf..bc1810da985de88b26f4356a75dd0cffb4ade618 100644 (file)
--- a/src/shared/spawn-polkit-agent.c
+++ b/src/shared/spawn-polkit-agent.c
@@ -19,13 +19,9 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include <sys/types.h>

 #include <stdlib.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <unistd.h>

-#include <string.h>
-#include <sys/prctl.h>

 #include <signal.h>
 #include <signal.h>

-#include <fcntl.h>

 #include <errno.h>
 #include <poll.h>
 
 #include <errno.h>
 #include <poll.h>
 

diff --git a/src/shared/strbuf.h b/src/shared/strbuf.h
index 2347fd4328dfbe5fde249a641e9973c37630655b..fbc4e5f2a1d6c30780c8450e39f94731a0080843 100644 (file)
--- a/src/shared/strbuf.h
+++ b/src/shared/strbuf.h
@@ -21,9 +21,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include <stdarg.h>

 #include <stdint.h>
 #include <stdint.h>

-#include <stdbool.h>

 
 struct strbuf {
         char *buf;
 
 struct strbuf {
         char *buf;

diff --git a/src/shared/strv.c b/src/shared/strv.c
index e27ac68151dd01a5966ab48c90db34420fcd2510..ee45ad1d0f3bb434044462696f675432e28c3ed4 100644 (file)
--- a/src/shared/strv.c
+++ b/src/shared/strv.c
@@ -19,7 +19,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include <assert.h>

 #include <stdlib.h>
 #include <stdarg.h>
 #include <string.h>
 #include <stdlib.h>
 #include <stdarg.h>
 #include <string.h>

diff --git a/src/shared/strxcpyx.h b/src/shared/strxcpyx.h
index 7be246d570da9b85e67c833f810453c02c1df103..ccc7e52f3757a4afb5ebbbdff6752476027cd6d0 100644 (file)
--- a/src/shared/strxcpyx.h
+++ b/src/shared/strxcpyx.h
@@ -21,8 +21,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include <stdarg.h>
-#include <stdbool.h>

 
 #include "macro.h"
 
 
 #include "macro.h"
 

diff --git a/src/shared/time-dst.c b/src/shared/time-dst.c
index 1ce6f721b7c895a5260d5b01b4faa92905d6f501..2797d1a7968a2b548fa73e3118bbadbeed0f01fe 100644 (file)
--- a/src/shared/time-dst.c
+++ b/src/shared/time-dst.c
@@ -21,18 +21,12 @@
   You should have received a copy of the GNU Lesser General Public License
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
   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 <ctype.h>

 #include <errno.h>
 #include <stddef.h>
 #include <stdio.h>
 #include <errno.h>
 #include <stddef.h>
 #include <stdio.h>

-#include <stdlib.h>

 #include <string.h>
 #include <time.h>
 #include <endian.h>
 #include <string.h>
 #include <time.h>
 #include <endian.h>

-#include <byteswap.h>
-#include <assert.h>
-#include <limits.h>
-#include <unistd.h>

 #include <stdint.h>
 #include <stdbool.h>
 #include <sys/stat.h>
 #include <stdint.h>
 #include <stdbool.h>
 #include <sys/stat.h>

diff --git a/src/shared/unit-name.c b/src/shared/unit-name.c
index 21b66913c9d1dae539f17db31dc2a8bd3f83a99e..0cc06f4f89cd9d1791651aebb6b7d7aaee00b519 100644 (file)
--- a/src/shared/unit-name.c
+++ b/src/shared/unit-name.c
@@ -21,7 +21,6 @@
 
 #include <errno.h>
 #include <string.h>
 
 #include <errno.h>
 #include <string.h>

-#include <assert.h>

 
 #include "path-util.h"
 #include "bus-label.h"
 
 #include "path-util.h"
 #include "bus-label.h"

diff --git a/src/shared/util.c b/src/shared/util.c
index dc6528013bb0a7fded44e17a9e84e3eb5473b9f8..241e7520b9d35fd4d763868aa5557baa2eacc370 100644 (file)
--- a/src/shared/util.c
+++ b/src/shared/util.c
@@ -19,7 +19,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include <assert.h>

 #include <string.h>
 #include <unistd.h>
 #include <errno.h>
 #include <string.h>
 #include <unistd.h>
 #include <errno.h>


@@ -48,7 +47,6 @@
 #include <pwd.h>
 #include <netinet/ip.h>
 #include <linux/kd.h>
 #include <pwd.h>
 #include <netinet/ip.h>
 #include <linux/kd.h>

-#include <dlfcn.h>

 #include <sys/wait.h>
 #include <sys/time.h>
 #include <glob.h>
 #include <sys/wait.h>
 #include <sys/time.h>
 #include <glob.h>


@@ -83,7 +81,6 @@
 #include "missing.h"
 #include "log.h"
 #include "strv.h"
 #include "missing.h"
 #include "log.h"
 #include "strv.h"

-#include "label.h"

 #include "mkdir.h"
 #include "path-util.h"
 #include "exit-status.h"
 #include "mkdir.h"
 #include "path-util.h"
 #include "exit-status.h"

diff --git a/src/shared/util.h b/src/shared/util.h
index 759d053c25c7d9a69cb32fe48c5a5e0194006354..a9235536bfc9762fbf7c4218593d528ee71cced4 100644 (file)
--- a/src/shared/util.h
+++ b/src/shared/util.h
@@ -25,7 +25,6 @@
 #include <fcntl.h>
 #include <inttypes.h>
 #include <time.h>
 #include <fcntl.h>
 #include <inttypes.h>
 #include <time.h>

-#include <sys/time.h>

 #include <stdarg.h>
 #include <stdbool.h>
 #include <stdlib.h>
 #include <stdarg.h>
 #include <stdbool.h>
 #include <stdlib.h>


@@ -36,12 +35,10 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <dirent.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <dirent.h>

-#include <sys/resource.h>

 #include <stddef.h>
 #include <unistd.h>
 #include <locale.h>
 #include <mntent.h>
 #include <stddef.h>
 #include <unistd.h>
 #include <locale.h>
 #include <mntent.h>

-#include <sys/socket.h>

 #include <sys/inotify.h>
 
 #if SIZEOF_PID_T == 4
 #include <sys/inotify.h>
 
 #if SIZEOF_PID_T == 4

diff --git a/src/shared/utmp-wtmp.c b/src/shared/utmp-wtmp.c
index bdb962af3497d9a901450b85be009dd4386dcfca..7fb6fe3a6751602718039b2a8da55772cbaca2e7 100644 (file)
--- a/src/shared/utmp-wtmp.c
+++ b/src/shared/utmp-wtmp.c
@@ -21,7 +21,6 @@
 
 #include <utmpx.h>
 #include <errno.h>
 
 #include <utmpx.h>
 #include <errno.h>

-#include <assert.h>

 #include <string.h>
 #include <sys/utsname.h>
 #include <fcntl.h>
 #include <string.h>
 #include <sys/utsname.h>
 #include <fcntl.h>

diff --git a/src/shutdownd/shutdownd.c b/src/shutdownd/shutdownd.c
index 60a646878e501725459aa1fbe971dba37f9b3084..6e4511ecea718e7a97a274e8039210891ffe12c5 100644 (file)
--- a/src/shutdownd/shutdownd.c
+++ b/src/shutdownd/shutdownd.c
@@ -21,13 +21,9 @@
 
 #include <sys/socket.h>
 #include <poll.h>
 
 #include <sys/socket.h>
 #include <poll.h>

-#include <sys/types.h>

 #include <sys/timerfd.h>
 #include <sys/timerfd.h>

-#include <assert.h>
-#include <string.h>

 #include <errno.h>
 #include <unistd.h>
 #include <errno.h>
 #include <unistd.h>

-#include <fcntl.h>

 #include <stddef.h>
 
 #include "systemd/sd-daemon.h"
 #include <stddef.h>
 
 #include "systemd/sd-daemon.h"

diff --git a/src/sleep/sleep.c b/src/sleep/sleep.c
index cc1ffa63f1efeb28f7e00b2e69bbed848e2e5198..eee6bc89829ab9a8f2d24255e28d5ecc804451b6 100644 (file)
--- a/src/sleep/sleep.c
+++ b/src/sleep/sleep.c
@@ -22,10 +22,8 @@
 
 #include <stdio.h>
 #include <errno.h>
 
 #include <stdio.h>
 #include <errno.h>

-#include <string.h>

 #include <getopt.h>
 
 #include <getopt.h>
 

-#include "sd-id128.h"

 #include "sd-messages.h"
 #include "log.h"
 #include "util.h"
 #include "sd-messages.h"
 #include "log.h"
 #include "util.h"

diff --git a/src/socket-proxy/socket-proxyd.c b/src/socket-proxy/socket-proxyd.c
index a3c3c87f11794c404c8f1996248aa44d05088d0e..715f440cb1e4895624fc5a5005ecb9a7539e5330 100644 (file)
--- a/src/socket-proxy/socket-proxyd.c
+++ b/src/socket-proxy/socket-proxyd.c
@@ -19,7 +19,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
  ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
  ***/
 

-#include <arpa/inet.h>

 #include <errno.h>
 #include <getopt.h>
 #include <stdio.h>
 #include <errno.h>
 #include <getopt.h>
 #include <stdio.h>


@@ -37,7 +36,6 @@
 #include "log.h"
 #include "socket-util.h"
 #include "util.h"
 #include "log.h"
 #include "socket-util.h"
 #include "util.h"

-#include "event-util.h"

 #include "build.h"
 #include "set.h"
 #include "path-util.h"
 #include "build.h"
 #include "set.h"
 #include "path-util.h"

diff --git a/src/system-update-generator/system-update-generator.c b/src/system-update-generator/system-update-generator.c
index ad34ef1366a0bf90ab607da95460aadc3691bd19..00045150f61b30c333c1c13da2e563911357b861 100644 (file)
--- a/src/system-update-generator/system-update-generator.c
+++ b/src/system-update-generator/system-update-generator.c
@@ -24,8 +24,6 @@
 
 #include "log.h"
 #include "util.h"
 
 #include "log.h"
 #include "util.h"

-#include "unit-name.h"
-#include "path-util.h"

 
 /*
  * Implements the logic described in
 
 /*
  * Implements the logic described in

diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
index 9b083131df193b54c6ed3883ecc2683084637211..4e90f68622069fa211a0efc74a4a1ea118437e56 100644 (file)
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -22,21 +22,16 @@
 
 #include <sys/reboot.h>
 #include <linux/reboot.h>
 
 #include <sys/reboot.h>
 #include <linux/reboot.h>

-#include <sys/syscall.h>

 #include <stdio.h>
 #include <getopt.h>
 #include <locale.h>
 #include <stdbool.h>
 #include <string.h>
 #include <errno.h>
 #include <stdio.h>
 #include <getopt.h>
 #include <locale.h>
 #include <stdbool.h>
 #include <string.h>
 #include <errno.h>

-#include <sys/ioctl.h>
-#include <termios.h>

 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/socket.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/socket.h>

-#include <sys/stat.h>

 #include <stddef.h>
 #include <stddef.h>

-#include <sys/prctl.h>

 
 #include "sd-daemon.h"
 #include "sd-shutdown.h"
 
 #include "sd-daemon.h"
 #include "sd-shutdown.h"


@@ -55,7 +50,6 @@
 #include "cgroup-util.h"
 #include "list.h"
 #include "path-lookup.h"
 #include "cgroup-util.h"
 #include "list.h"
 #include "path-lookup.h"

-#include "conf-parser.h"

 #include "exit-status.h"
 #include "build.h"
 #include "unit-name.h"
 #include "exit-status.h"
 #include "build.h"
 #include "unit-name.h"

diff --git a/src/sysusers/sysusers.c b/src/sysusers/sysusers.c
index e47bcb4dca53853d68f55124e72ecfb7705302cf..0b5668a338493d65f7daf252d68689c6bd875ecc 100644 (file)
--- a/src/sysusers/sysusers.c
+++ b/src/sysusers/sysusers.c
@@ -19,7 +19,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include <sys/types.h>

 #include <pwd.h>
 #include <grp.h>
 #include <shadow.h>
 #include <pwd.h>
 #include <grp.h>
 #include <shadow.h>


@@ -36,7 +35,6 @@
 #include "conf-files.h"
 #include "copy.h"
 #include "utf8.h"
 #include "conf-files.h"
 #include "copy.h"
 #include "utf8.h"

-#include "label.h"

 #include "fileio-label.h"
 #include "uid-range.h"
 #include "selinux-util.h"
 #include "fileio-label.h"
 #include "uid-range.h"
 #include "selinux-util.h"

diff --git a/src/sysv-generator/sysv-generator.c b/src/sysv-generator/sysv-generator.c
index bd67f321f6cf416633b4d941f897c7876a5e5dae..25b10c1a49bb5c3cb731b17f3cc926f17243d160 100644 (file)
--- a/src/sysv-generator/sysv-generator.c
+++ b/src/sysv-generator/sysv-generator.c
@@ -34,10 +34,6 @@
 #include "unit.h"
 #include "unit-name.h"
 #include "special.h"
 #include "unit.h"
 #include "unit-name.h"
 #include "special.h"

-#include "exit-status.h"
-#include "def.h"
-#include "env-util.h"
-#include "fileio.h"

 #include "hashmap.h"
 
 typedef enum RunlevelType {
 #include "hashmap.h"
 
 typedef enum RunlevelType {

diff --git a/src/test/test-barrier.c b/src/test/test-barrier.c
index cb75f7314d98d6d700c3c1a4b559ba64e63a3eeb..2d109a30e7f8ecf9ec3d6b3bb0ccfa2e0161c45b 100644 (file)
--- a/src/test/test-barrier.c
+++ b/src/test/test-barrier.c
@@ -28,15 +28,12 @@
  * increase it at the slightly cost of lengthen test-duration on other machines.
  */
 
  * increase it at the slightly cost of lengthen test-duration on other machines.
  */
 

-#include <errno.h>

 #include <stdio.h>
 #include <stdio.h>

-#include <string.h>

 #include <sys/time.h>
 #include <sys/wait.h>
 #include <unistd.h>
 
 #include "barrier.h"
 #include <sys/time.h>
 #include <sys/wait.h>
 #include <unistd.h>
 
 #include "barrier.h"

-#include "def.h"

 #include "util.h"
 
 /* 20ms to test deadlocks; All timings use multiples of this constant as
 #include "util.h"
 
 /* 20ms to test deadlocks; All timings use multiples of this constant as

diff --git a/src/test/test-btrfs.c b/src/test/test-btrfs.c
index 150a32ad6fff076dae5b5b34055204d3495ff02d..c49b83217963f9f66e021d9174ad05277bf1e45d 100644 (file)
--- a/src/test/test-btrfs.c
+++ b/src/test/test-btrfs.c
@@ -19,7 +19,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include <stdlib.h>

 #include <fcntl.h>
 
 #include "log.h"
 #include <fcntl.h>
 
 #include "log.h"

diff --git a/src/test/test-cap-list.c b/src/test/test-cap-list.c
index 632d62ff8f95612a095366b1e7cae56c6a7fba32..43a2d35b80346c8d65f8bf598711a97ec1fa5a12 100644 (file)
--- a/src/test/test-cap-list.c
+++ b/src/test/test-cap-list.c
@@ -20,7 +20,6 @@
 ***/
 
 #include "util.h"
 ***/
 
 #include "util.h"

-#include "log.h"

 #include "fileio.h"
 #include "cap-list.h"
 #include "capability.h"
 #include "fileio.h"
 #include "cap-list.h"
 #include "capability.h"

diff --git a/src/test/test-capability.c b/src/test/test-capability.c
index 43769923b0a7701949a52b95e5839043175e2e6c..f47452ce72502eb620c719d18b8f1b660c485e66 100644 (file)
--- a/src/test/test-capability.c
+++ b/src/test/test-capability.c
@@ -17,7 +17,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include <sys/types.h>

 #include <sys/wait.h>
 #include <sys/capability.h>
 #include <sys/socket.h>
 #include <sys/wait.h>
 #include <sys/capability.h>
 #include <sys/socket.h>

diff --git a/src/test/test-cgroup-mask.c b/src/test/test-cgroup-mask.c
index 9e9de23e0eec3c887134a8bf8f28e1100fe07ab3..d14a07e1f4584e6031b24e0ad9d12584a3a8c9b3 100644 (file)
--- a/src/test/test-cgroup-mask.c
+++ b/src/test/test-cgroup-mask.c
@@ -20,14 +20,9 @@
 ***/
 
 #include <stdio.h>
 ***/
 
 #include <stdio.h>

-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
-#include <pwd.h>

 
 #include "manager.h"
 #include "unit.h"
 
 #include "manager.h"
 #include "unit.h"

-#include "util.h"

 #include "macro.h"
 #include "test-helper.h"
 
 #include "macro.h"
 #include "test-helper.h"
 

diff --git a/src/test/test-cgroup-util.c b/src/test/test-cgroup-util.c
index 67eeeb56b787373516c52428ca248d9ae1417a6a..9834a6a1302c2e84ec8ed36a311bdef1878598f8 100644 (file)
--- a/src/test/test-cgroup-util.c
+++ b/src/test/test-cgroup-util.c
@@ -19,7 +19,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include <assert.h>

 
 #include "util.h"
 #include "cgroup-util.h"
 
 #include "util.h"
 #include "cgroup-util.h"

diff --git a/src/test/test-cgroup.c b/src/test/test-cgroup.c
index 46642f92fe89635054035557a12b0c5b884f01fd..4be69a408d8d9930e49bf15c7b8cc1bbc665d71a 100644 (file)
--- a/src/test/test-cgroup.c
+++ b/src/test/test-cgroup.c
@@ -25,7 +25,6 @@
 #include "cgroup-util.h"
 #include "path-util.h"
 #include "util.h"
 #include "cgroup-util.h"
 #include "path-util.h"
 #include "util.h"

-#include "log.h"

 
 int main(int argc, char*argv[]) {
         char *path;
 
 int main(int argc, char*argv[]) {
         char *path;

diff --git a/src/test/test-ellipsize.c b/src/test/test-ellipsize.c
index f97c78ebd6144f493dd7941fc4b1062c6c2e6521..6a2f9aa943048e76116387a14e7762b3a23e0ff1 100644 (file)
--- a/src/test/test-ellipsize.c
+++ b/src/test/test-ellipsize.c
@@ -22,7 +22,6 @@
 #include <stdio.h>
 
 #include "util.h"
 #include <stdio.h>
 
 #include "util.h"

-#include "utf8.h"

 #include "def.h"
 
 static void test_one(const char *p) {
 #include "def.h"
 
 static void test_one(const char *p) {

diff --git a/src/test/test-engine.c b/src/test/test-engine.c
index 456999ca40ba7bf41726b3bdd359b12b553f6d3c..c8d0a147a76b24144a1b3194cf5cc51b052d103b 100644 (file)
--- a/src/test/test-engine.c
+++ b/src/test/test-engine.c
@@ -22,7 +22,6 @@
 #include <stdio.h>
 #include <errno.h>
 #include <string.h>
 #include <stdio.h>
 #include <errno.h>
 #include <string.h>

-#include <unistd.h>

 
 #include "manager.h"
 #include "bus-util.h"
 
 #include "manager.h"
 #include "bus-util.h"

diff --git a/src/test/test-env-replace.c b/src/test/test-env-replace.c
index 0274e97618a71dd9d4064a7b51a1e4aa4a7cf954..8f1fcd992ca1bb9468f4a368614c86b56acc93cc 100644 (file)
--- a/src/test/test-env-replace.c
+++ b/src/test/test-env-replace.c
@@ -19,7 +19,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include <unistd.h>

 #include <string.h>
 
 #include "util.h"
 #include <string.h>
 
 #include "util.h"

diff --git a/src/test/test-execute.c b/src/test/test-execute.c
index 91ccaf72b849e57f70a635912619ad2da5fd4d3c..428fd3260035cf59b102af2d4f0545a0ec0932d7 100644 (file)
--- a/src/test/test-execute.c
+++ b/src/test/test-execute.c
@@ -23,7 +23,6 @@
 #include "manager.h"
 #include "util.h"
 #include "macro.h"
 #include "manager.h"
 #include "util.h"
 #include "macro.h"

-#include "strv.h"

 #include "mkdir.h"
 
 typedef void (*test_function_t)(Manager *m);
 #include "mkdir.h"
 
 typedef void (*test_function_t)(Manager *m);

diff --git a/src/test/test-hashmap.c b/src/test/test-hashmap.c
index 6900da9e89b2bd64712e3f00bf2e4b53e079d7fa..40be084ffb9e506ddc52ee72c0809abc8d932462 100644 (file)
--- a/src/test/test-hashmap.c
+++ b/src/test/test-hashmap.c
@@ -17,8 +17,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include <inttypes.h>
-#include "strv.h"

 #include "util.h"
 #include "hashmap.h"
 
 #include "util.h"
 #include "hashmap.h"
 

diff --git a/src/test/test-hostname.c b/src/test/test-hostname.c
index 86efa1a3f78d3a1c50076ef52433109b77b3d5c7..c7e5de896b3a314984263f59020d7a91941d96cd 100644 (file)
--- a/src/test/test-hostname.c
+++ b/src/test/test-hostname.c
@@ -19,10 +19,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include <errno.h>
-#include <string.h>
-#include <stdio.h>
-#include <fcntl.h>

 
 #include "hostname-setup.h"
 #include "util.h"
 
 #include "hostname-setup.h"
 #include "util.h"

diff --git a/src/test/test-install.c b/src/test/test-install.c
index 467970b0075729228ba3b71bf969dc4813b7ef62..5ee52e64cb5ac0a271429d7523c6cc12e96c9b3a 100644 (file)
--- a/src/test/test-install.c
+++ b/src/test/test-install.c
@@ -19,13 +19,9 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include <errno.h>

 #include <string.h>
 #include <stdio.h>
 #include <string.h>
 #include <stdio.h>

-#include <fcntl.h>

 
 

-#include "util.h"
-#include "path-util.h"

 #include "install.h"
 
 static void dump_changes(UnitFileChange *c, unsigned n) {
 #include "install.h"
 
 static void dump_changes(UnitFileChange *c, unsigned n) {

diff --git a/src/test/test-job-type.c b/src/test/test-job-type.c
index 1d9d49b2283a02165c23f95c7e8457a4196fc15f..af0d76e8947463a9176605981aad523085d33774 100644 (file)
--- a/src/test/test-job-type.c
+++ b/src/test/test-job-type.c
@@ -20,9 +20,6 @@
 ***/
 
 #include <stdio.h>
 ***/
 
 #include <stdio.h>

-#include <errno.h>
-#include <string.h>
-#include <unistd.h>

 
 #include "job.h"
 #include "unit.h"
 
 #include "job.h"
 #include "unit.h"

diff --git a/src/test/test-json.c b/src/test/test-json.c
index b09131891cf581e24f460e9d03ace596c728210e..24dc7003bc64292c109b2012da008d73b8ec9106 100644 (file)
--- a/src/test/test-json.c
+++ b/src/test/test-json.c
@@ -21,7 +21,6 @@
 
 #include <math.h>
 
 
 #include <math.h>
 

-#include "log.h"

 #include "util.h"
 #include "json.h"
 
 #include "util.h"
 #include "json.h"
 

diff --git a/src/test/test-libudev.c b/src/test/test-libudev.c
index 293c151d425e066030c3fe02c65cfd4274b1ce90..2b004fdfb10d7192041de3584c0c65334b7fac2f 100644 (file)
--- a/src/test/test-libudev.c
+++ b/src/test/test-libudev.c
@@ -19,13 +19,8 @@
 ***/
 
 #include <stdio.h>
 ***/
 
 #include <stdio.h>

-#include <stdarg.h>
-#include <stdlib.h>

 #include <unistd.h>
 #include <unistd.h>

-#include <errno.h>
-#include <string.h>

 #include <getopt.h>
 #include <getopt.h>

-#include <fcntl.h>

 #include <sys/epoll.h>
 
 #include "libudev.h"
 #include <sys/epoll.h>
 
 #include "libudev.h"

diff --git a/src/test/test-locale-util.c b/src/test/test-locale-util.c
index 1398a3a0b9fd18f9d00017b6de67c76c646bc8a7..97650753657da5eeef7f35b6c5fa30311a461386 100644 (file)
--- a/src/test/test-locale-util.c
+++ b/src/test/test-locale-util.c
@@ -17,7 +17,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include <unistd.h>

 
 #include "locale-util.h"
 #include "strv.h"
 
 #include "locale-util.h"
 #include "strv.h"

diff --git a/src/test/test-loopback.c b/src/test/test-loopback.c
index 75fe053b63ddb4f8f9b9c5a094b4abe1c364680e..c03bda43829ec91b1af66bb6bb48e5cc6e2a9c01 100644 (file)
--- a/src/test/test-loopback.c
+++ b/src/test/test-loopback.c
@@ -19,14 +19,11 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include <errno.h>

 #include <string.h>
 #include <stdio.h>
 #include <string.h>
 #include <stdio.h>

-#include <fcntl.h>

 
 #include "loopback-setup.h"
 #include "log.h"
 
 #include "loopback-setup.h"
 #include "log.h"

-#include "util.h"

 
 int main(int argc, char* argv[]) {
         int r;
 
 int main(int argc, char* argv[]) {
         int r;

diff --git a/src/test/test-ns.c b/src/test/test-ns.c
index 7cd7b77153f484e580e032ed999526e03825eff5..76b131c284449b6c95d1e2a3165f7f1a62b5c8f8 100644 (file)
--- a/src/test/test-ns.c
+++ b/src/test/test-ns.c
@@ -20,13 +20,9 @@
 ***/
 
 #include <stdlib.h>
 ***/
 
 #include <stdlib.h>

-#include <string.h>

 #include <unistd.h>
 #include <unistd.h>

-#include <sys/mount.h>
-#include <linux/fs.h>

 
 #include "namespace.h"
 
 #include "namespace.h"

-#include "execute.h"

 #include "log.h"
 
 int main(int argc, char *argv[]) {
 #include "log.h"
 
 int main(int argc, char *argv[]) {

diff --git a/src/test/test-path-lookup.c b/src/test/test-path-lookup.c
index 38e5c93df6c3804ec1df425e2f20d4d3edc26022..a951b01b9753764c91d0e21826dd833893947581 100644 (file)
--- a/src/test/test-path-lookup.c
+++ b/src/test/test-path-lookup.c
@@ -20,7 +20,6 @@
 ***/
 
 #include <sys/stat.h>
 ***/
 
 #include <sys/stat.h>

-#include <sys/types.h>

 
 #include "path-lookup.h"
 #include "log.h"
 
 #include "path-lookup.h"
 #include "log.h"

diff --git a/src/test/test-pty.c b/src/test/test-pty.c
index cab569a9da78280c02612be3f599124529cade07..eadecb99a06d6b6aef4ab2664ff80667ec872ed9 100644 (file)
--- a/src/test/test-pty.c
+++ b/src/test/test-pty.c
@@ -20,13 +20,11 @@
 ***/
 
 #include <errno.h>
 ***/
 
 #include <errno.h>

-#include <fcntl.h>

 #include <locale.h>
 #include <string.h>
 #include <sys/wait.h>
 #include <unistd.h>
 
 #include <locale.h>
 #include <string.h>
 #include <sys/wait.h>
 #include <unistd.h>
 

-#include "def.h"

 #include "pty.h"
 #include "util.h"
 
 #include "pty.h"
 #include "util.h"
 

diff --git a/src/test/test-ring.c b/src/test/test-ring.c
index a9dd01ca01b722291c578a8b84d9f18722f0fa7d..cb8a5d4e9e7fa6cebcd83f4b7738f5237395ab23 100644 (file)
--- a/src/test/test-ring.c
+++ b/src/test/test-ring.c
@@ -20,14 +20,9 @@
 ***/
 
 #include <string.h>
 ***/
 
 #include <string.h>

-#include <unistd.h>
-#include <fcntl.h>
-#include <locale.h>
-#include <errno.h>

 
 #include "def.h"
 #include "ring.h"
 
 #include "def.h"
 #include "ring.h"

-#include "util.h"

 
 static void test_ring(void) {
         static const char buf[8192];
 
 static void test_ring(void) {
         static const char buf[8192];

diff --git a/src/test/test-rtnl-manual.c b/src/test/test-rtnl-manual.c
index c8133dbad7d69a35f140b6e3b3bc7ba98150041a..c406454f77020ef7d51e0ab0b6933d0910fcdd58 100644 (file)
--- a/src/test/test-rtnl-manual.c
+++ b/src/test/test-rtnl-manual.c
@@ -19,7 +19,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include <netinet/ether.h>

 #include <arpa/inet.h>
 #include <net/if.h>
 #include <linux/ip.h>
 #include <arpa/inet.h>
 #include <net/if.h>
 #include <linux/ip.h>


@@ -29,10 +28,6 @@
 #include "util.h"
 #include "macro.h"
 #include "sd-rtnl.h"
 #include "util.h"
 #include "macro.h"
 #include "sd-rtnl.h"

-#include "socket-util.h"
-#include "rtnl-util.h"
-#include "event-util.h"
-#include "rtnl-internal.h"

 
 static int load_module(const char *mod_name) {
         struct kmod_ctx *ctx;
 
 static int load_module(const char *mod_name) {
         struct kmod_ctx *ctx;

diff --git a/src/test/test-set.c b/src/test/test-set.c
index e280c8952d76d8f0439b71f8d3aa5be22d5284a6..ac292ed680451af402af39c156cbf4ea0136808f 100644 (file)
--- a/src/test/test-set.c
+++ b/src/test/test-set.c
@@ -17,7 +17,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include "util.h"

 #include "set.h"
 
 static void test_set_steal_first(void) {
 #include "set.h"
 
 static void test_set_steal_first(void) {

diff --git a/src/test/test-sleep.c b/src/test/test-sleep.c
index a1020ad14c1faf6fdcdfb4f1dc2193a8f39757c5..1d75d05a883aa9516522c4bd9520cf80d68791ec 100644 (file)
--- a/src/test/test-sleep.c
+++ b/src/test/test-sleep.c
@@ -19,10 +19,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include <errno.h>
-#include <string.h>

 #include <stdio.h>
 #include <stdio.h>

-#include <fcntl.h>

 
 #include "util.h"
 #include "log.h"
 
 #include "util.h"
 #include "log.h"

diff --git a/src/test/test-strxcpyx.c b/src/test/test-strxcpyx.c
index a7c8e1267d20513c72e171c6e73d385d6b73b4d6..858a4081da84c5dd4f0d1ea0562dff74b17fff72 100644 (file)
--- a/src/test/test-strxcpyx.c
+++ b/src/test/test-strxcpyx.c
@@ -22,7 +22,6 @@
 #include <string.h>
 
 #include "util.h"
 #include <string.h>
 
 #include "util.h"

-#include "strv.h"

 #include "strxcpyx.h"
 
 static void test_strpcpy(void) {
 #include "strxcpyx.h"
 
 static void test_strpcpy(void) {

diff --git a/src/test/test-tables.c b/src/test/test-tables.c
index bda224bec673e138d4a2d44692fda1803cc0327b..0e5ab1645fb85a8c2badc93ce2faf6495f92eff9 100644 (file)
--- a/src/test/test-tables.c
+++ b/src/test/test-tables.c
@@ -23,14 +23,12 @@
 #include "condition.h"
 #include "device.h"
 #include "execute.h"
 #include "condition.h"
 #include "device.h"
 #include "execute.h"

-#include "exit-status.h"

 #include "install.h"
 #include "job.h"
 #include "kill.h"
 #include "log.h"
 #include "logs-show.h"
 #include "mount.h"
 #include "install.h"
 #include "job.h"
 #include "kill.h"
 #include "log.h"
 #include "logs-show.h"
 #include "mount.h"

-#include "path-lookup.h"

 #include "path.h"
 #include "scope.h"
 #include "service.h"
 #include "path.h"
 #include "scope.h"
 #include "service.h"

diff --git a/src/test/test-tmpfiles.c b/src/test/test-tmpfiles.c
index 4b72c4a8faaaa361726b714bf7e2ccdfd2343f48..90e49d454233b393be27cb95e144a4de8969face 100644 (file)
--- a/src/test/test-tmpfiles.c
+++ b/src/test/test-tmpfiles.c
@@ -19,8 +19,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include <sys/types.h>
-#include <sys/stat.h>

 #include <fcntl.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <stdlib.h>

diff --git a/src/test/test-udev.c b/src/test/test-udev.c
index b57d275efa26314e4ed06b5f60fd4ea1a3c4ecf2..4403624c5a5a785ed74730109a4ba519dd384ad6 100644 (file)
--- a/src/test/test-udev.c
+++ b/src/test/test-udev.c
@@ -19,14 +19,9 @@
 ***/
 
 #include <stdio.h>
 ***/
 
 #include <stdio.h>

-#include <stddef.h>

 #include <stdlib.h>
 #include <stdlib.h>

-#include <string.h>
-#include <fcntl.h>
-#include <ctype.h>

 #include <errno.h>
 #include <unistd.h>
 #include <errno.h>
 #include <unistd.h>

-#include <grp.h>

 #include <sched.h>
 #include <sys/mount.h>
 #include <sys/signalfd.h>
 #include <sched.h>
 #include <sys/mount.h>
 #include <sys/signalfd.h>

diff --git a/src/test/test-unit-file.c b/src/test/test-unit-file.c
index e517f571d6901c7799b91327801976279644bb08..22ac76de564b15ae49e0a989ba143a81031ee2ff 100644 (file)
--- a/src/test/test-unit-file.c
+++ b/src/test/test-unit-file.c
@@ -20,7 +20,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include <assert.h>

 #include <stdio.h>
 #include <stddef.h>
 #include <string.h>
 #include <stdio.h>
 #include <stddef.h>
 #include <string.h>

diff --git a/src/test/test-unit-name.c b/src/test/test-unit-name.c
index 5c7f8b40f73f4f33d749450efaf668e3d9d72e77..7d882aebd6e17316e262dc3c833060f3badfc5c4 100644 (file)
--- a/src/test/test-unit-name.c
+++ b/src/test/test-unit-name.c
@@ -24,14 +24,12 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

-#include <sys/types.h>

 #include <pwd.h>
 
 #include "manager.h"
 #include "unit.h"
 #include "unit-name.h"
 #include "unit-printf.h"
 #include <pwd.h>
 
 #include "manager.h"
 #include "unit.h"
 #include "unit-name.h"
 #include "unit-printf.h"

-#include "install.h"

 #include "specifier.h"
 #include "util.h"
 #include "macro.h"
 #include "specifier.h"
 #include "util.h"
 #include "macro.h"

diff --git a/src/test/test-watchdog.c b/src/test/test-watchdog.c
index f6bb045c3cbd7984a372e8d5b0a5728220d0c708..2e5d0c3aaebfb633784a1504fba8893979f75a30 100644 (file)
--- a/src/test/test-watchdog.c
+++ b/src/test/test-watchdog.c
@@ -20,7 +20,6 @@
 ***/
 
 #include <unistd.h>
 ***/
 
 #include <unistd.h>

-#include <string.h>

 
 #include "watchdog.h"
 #include "log.h"
 
 #include "watchdog.h"
 #include "log.h"

diff --git a/src/timedate/timedatectl.c b/src/timedate/timedatectl.c
index 4d898867362da47d33d8b843c9d025e348e14b0c..9e04f8f7bf6ff64adcf22167d7ad900cec0e8002 100644 (file)
--- a/src/timedate/timedatectl.c
+++ b/src/timedate/timedatectl.c
@@ -22,11 +22,8 @@
 
 #include <stdlib.h>
 #include <stdbool.h>
 
 #include <stdlib.h>
 #include <stdbool.h>

-#include <unistd.h>

 #include <getopt.h>
 #include <locale.h>
 #include <getopt.h>
 #include <locale.h>

-#include <string.h>
-#include <sys/timex.h>

 
 #include "sd-bus.h"
 #include "bus-util.h"
 
 #include "sd-bus.h"
 #include "bus-util.h"

diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c
index 23efe832a74acb8a4cbb41e100a062fe71a73342..18dcd18b00d71a8c4e0cbced82ff996c207f3b69 100644 (file)
--- a/src/timedate/timedated.c
+++ b/src/timedate/timedated.c
@@ -23,7 +23,6 @@
 #include <string.h>
 #include <unistd.h>
 
 #include <string.h>
 #include <unistd.h>
 

-#include "sd-id128.h"

 #include "sd-messages.h"
 #include "sd-event.h"
 #include "sd-bus.h"
 #include "sd-messages.h"
 #include "sd-event.h"
 #include "sd-bus.h"


@@ -32,10 +31,8 @@
 #include "strv.h"
 #include "def.h"
 #include "clock-util.h"
 #include "strv.h"
 #include "def.h"
 #include "clock-util.h"

-#include "conf-files.h"

 #include "path-util.h"
 #include "fileio-label.h"
 #include "path-util.h"
 #include "fileio-label.h"

-#include "label.h"

 #include "bus-util.h"
 #include "bus-error.h"
 #include "bus-common-errors.h"
 #include "bus-util.h"
 #include "bus-error.h"
 #include "bus-common-errors.h"

diff --git a/src/timesync/timesyncd-conf.c b/src/timesync/timesyncd-conf.c
index be1f4bb1510fc28114513b144b356c006a45f9bf..df4d89a62048c94a69a04657aa448066d036b815 100644 (file)
--- a/src/timesync/timesyncd-conf.c
+++ b/src/timesync/timesyncd-conf.c
@@ -19,7 +19,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include "in-addr-util.h"

 
 #include "timesyncd-manager.h"
 #include "timesyncd-server.h"
 
 #include "timesyncd-manager.h"
 #include "timesyncd-server.h"

diff --git a/src/timesync/timesyncd-manager.c b/src/timesync/timesyncd-manager.c
index 73ac7eecbf919954e401638fd2d5a0ed8993c41b..a9e91c4d60645fa6d1e59fab2b68fb9db15f7b68 100644 (file)
--- a/src/timesync/timesyncd-manager.c
+++ b/src/timesync/timesyncd-manager.c
@@ -21,21 +21,15 @@
 
 #include <stdlib.h>
 #include <errno.h>
 
 #include <stdlib.h>
 #include <errno.h>

-#include <fcntl.h>
-#include <unistd.h>
-#include <string.h>

 #include <time.h>
 #include <math.h>
 #include <time.h>
 #include <math.h>

-#include <arpa/inet.h>

 #include <netinet/in.h>
 #include <netinet/ip.h>
 #include <sys/timerfd.h>
 #include <sys/timex.h>
 #include <sys/socket.h>
 #include <resolv.h>
 #include <netinet/in.h>
 #include <netinet/ip.h>
 #include <sys/timerfd.h>
 #include <sys/timex.h>
 #include <sys/socket.h>
 #include <resolv.h>

-#include <sys/prctl.h>

 #include <sys/types.h>
 #include <sys/types.h>

-#include <grp.h>

 
 #include "missing.h"
 #include "util.h"
 
 #include "missing.h"
 #include "util.h"


@@ -45,13 +39,8 @@
 #include "list.h"
 #include "ratelimit.h"
 #include "strv.h"
 #include "list.h"
 #include "ratelimit.h"
 #include "strv.h"

-#include "conf-parser.h"

 #include "sd-daemon.h"
 #include "sd-daemon.h"

-#include "event-util.h"

 #include "network-util.h"
 #include "network-util.h"

-#include "clock-util.h"
-#include "capability.h"
-#include "mkdir.h"

 #include "timesyncd-conf.h"
 #include "timesyncd-manager.h"
 #include "time-util.h"
 #include "timesyncd-conf.h"
 #include "timesyncd-manager.h"
 #include "time-util.h"

diff --git a/src/timesync/timesyncd-manager.h b/src/timesync/timesyncd-manager.h
index c7efdc5dfb65209c5175ab5a78e0279c4e5e49aa..b1a844ba76455ae0b262de21cb510ddb00db4720 100644 (file)
--- a/src/timesync/timesyncd-manager.h
+++ b/src/timesync/timesyncd-manager.h
@@ -25,7 +25,6 @@
 #include "sd-resolve.h"
 #include "sd-network.h"
 #include "list.h"
 #include "sd-resolve.h"
 #include "sd-network.h"
 #include "list.h"

-#include "socket-util.h"

 #include "ratelimit.h"
 
 typedef struct Manager Manager;
 #include "ratelimit.h"
 
 typedef struct Manager Manager;

diff --git a/src/timesync/timesyncd.c b/src/timesync/timesyncd.c
index 2a73dac033c8fe1570febd1ac2fb16a3e1fdb26c..735668bedec960a64315676aa9df3f56248911e6 100644 (file)
--- a/src/timesync/timesyncd.c
+++ b/src/timesync/timesyncd.c
@@ -21,7 +21,6 @@
 
 #include "sd-event.h"
 #include "sd-daemon.h"
 
 #include "sd-event.h"
 #include "sd-daemon.h"

-#include "mkdir.h"

 #include "capability.h"
 #include "clock-util.h"
 #include "network-util.h"
 #include "capability.h"
 #include "clock-util.h"
 #include "network-util.h"

diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
index 88ba7e46a28139b4fd6e5da5a262ca80b7ad2241..2642934147aaa89699e6d7fb8d2425d398c3f970 100644 (file)
--- a/src/tmpfiles/tmpfiles.c
+++ b/src/tmpfiles/tmpfiles.c
@@ -26,8 +26,6 @@
 #include <string.h>
 #include <limits.h>
 #include <dirent.h>
 #include <string.h>
 #include <limits.h>
 #include <dirent.h>

-#include <grp.h>
-#include <pwd.h>

 #include <stdio.h>
 #include <stdlib.h>
 #include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <stddef.h>


@@ -37,8 +35,6 @@
 #include <glob.h>
 #include <fnmatch.h>
 #include <sys/stat.h>
 #include <glob.h>
 #include <fnmatch.h>
 #include <sys/stat.h>

-#include <sys/types.h>
-#include <sys/param.h>

 #include <sys/xattr.h>
 
 #include "log.h"
 #include <sys/xattr.h>
 
 #include "log.h"

diff --git a/src/udev/accelerometer/accelerometer.c b/src/udev/accelerometer/accelerometer.c
index 0f1b3c6ec362f1d82a28ffd566c39685d4aff95f..9e2c590c15397e7d712fe065aded050bd31bdf37 100644 (file)
--- a/src/udev/accelerometer/accelerometer.c
+++ b/src/udev/accelerometer/accelerometer.c
@@ -46,16 +46,10 @@
 
 #include <stdio.h>
 #include <string.h>
 
 #include <stdio.h>
 #include <string.h>

-#include <stdbool.h>

 #include <math.h>
 #include <math.h>

-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>

 #include <stdlib.h>
 #include <stdlib.h>

-#include <unistd.h>

 #include <getopt.h>
 #include <limits.h>
 #include <getopt.h>
 #include <limits.h>

-#include <linux/limits.h>

 #include <linux/input.h>
 
 #include "libudev.h"
 #include <linux/input.h>
 
 #include "libudev.h"

diff --git a/src/udev/collect/collect.c b/src/udev/collect/collect.c
index 4bb6edbef11da04c35b3099b2a664e6e8f3fb4a3..6cf41c67bb322f6adef1ddb2190b52340fd6e99f 100644 (file)
--- a/src/udev/collect/collect.c
+++ b/src/udev/collect/collect.c
@@ -20,18 +20,10 @@
  */
 
 #include <stdio.h>
  */
 
 #include <stdio.h>

-#include <stdlib.h>

 #include <stddef.h>
 #include <stddef.h>

-#include <unistd.h>
-#include <signal.h>
-#include <fcntl.h>

 #include <errno.h>
 #include <errno.h>

-#include <string.h>

 #include <getopt.h>
 #include <getopt.h>

-#include <sys/types.h>
-#include <sys/stat.h>

 
 

-#include "libudev.h"

 #include "libudev-private.h"
 #include "macro.h"
 
 #include "libudev-private.h"
 #include "macro.h"
 

diff --git a/src/udev/net/link-config.c b/src/udev/net/link-config.c
index 8b3dc45d4e00b83bdeaf166dccd77f395c1c249a..810a88153c2264fdf2a986bf10219743c09d8252 100644 (file)
--- a/src/udev/net/link-config.c
+++ b/src/udev/net/link-config.c
@@ -22,7 +22,6 @@
 #include <netinet/ether.h>
 #include <linux/netdevice.h>
 
 #include <netinet/ether.h>
 #include <linux/netdevice.h>
 

-#include "sd-id128.h"

 
 #include "missing.h"
 #include "link-config.h"
 
 #include "missing.h"
 #include "link-config.h"


@@ -36,11 +35,8 @@
 #include "path-util.h"
 #include "conf-parser.h"
 #include "conf-files.h"
 #include "path-util.h"
 #include "conf-parser.h"
 #include "conf-files.h"

-#include "fileio.h"
-#include "hashmap.h"

 #include "rtnl-util.h"
 #include "network-internal.h"
 #include "rtnl-util.h"
 #include "network-internal.h"

-#include "siphash24.h"

 
 struct link_config_ctx {
         LIST_HEAD(link_config, links);
 
 struct link_config_ctx {
         LIST_HEAD(link_config, links);

diff --git a/src/udev/net/link-config.h b/src/udev/net/link-config.h
index cb434d1aee620c9573cd1bd115281e968877b82c..34facdeb5de6239aa712f3f769ab5449358a5794 100644 (file)
--- a/src/udev/net/link-config.h
+++ b/src/udev/net/link-config.h
@@ -23,7 +23,6 @@
 
 #include "ethtool-util.h"
 #include "condition.h"
 
 #include "ethtool-util.h"
 #include "condition.h"

-#include "util.h"

 #include "list.h"
 #include "libudev.h"
 
 #include "list.h"
 #include "libudev.h"
 

diff --git a/src/udev/udev-builtin-blkid.c b/src/udev/udev-builtin-blkid.c
index 03e3dc2867bd814de876e8e142da1b80e469cc53..f4f6900d145bf2e6aa38a7ef70964bd92d4fe616 100644 (file)
--- a/src/udev/udev-builtin-blkid.c
+++ b/src/udev/udev-builtin-blkid.c
@@ -20,8 +20,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
 
 #include <stdio.h>
 #include <stdlib.h>

-#include <stdarg.h>
-#include <unistd.h>

 #include <string.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <string.h>
 #include <errno.h>
 #include <fcntl.h>

diff --git a/src/udev/udev-builtin-btrfs.c b/src/udev/udev-builtin-btrfs.c
index 3643596a70220518ff2b026fcba7594dd8494bd7..3352821567e405723ab6287bd0dbf4decca48bb3 100644 (file)
--- a/src/udev/udev-builtin-btrfs.c
+++ b/src/udev/udev-builtin-btrfs.c
@@ -17,12 +17,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include <unistd.h>

 #include <stdlib.h>
 #include <stdlib.h>

-#include <string.h>
-#include <stdio.h>

 #include <fcntl.h>
 #include <fcntl.h>

-#include <errno.h>

 #include <sys/ioctl.h>
 
 #ifdef HAVE_LINUX_BTRFS_H
 #include <sys/ioctl.h>
 
 #ifdef HAVE_LINUX_BTRFS_H

diff --git a/src/udev/udev-builtin-hwdb.c b/src/udev/udev-builtin-hwdb.c
index 95476648f99cd0ec4e5bda72a69a693e387e7774..5e0e7ebb11f47a3280b29bfe146aac7138be6df5 100644 (file)
--- a/src/udev/udev-builtin-hwdb.c
+++ b/src/udev/udev-builtin-hwdb.c
@@ -18,10 +18,6 @@
 ***/
 
 #include <stdio.h>
 ***/
 
 #include <stdio.h>

-#include <errno.h>
-#include <string.h>
-#include <inttypes.h>
-#include <ctype.h>

 #include <stdlib.h>
 #include <fnmatch.h>
 #include <getopt.h>
 #include <stdlib.h>
 #include <fnmatch.h>
 #include <getopt.h>

diff --git a/src/udev/udev-builtin-keyboard.c b/src/udev/udev-builtin-keyboard.c
index d8ee4cbb61adc97194a6740900fd9c846701b47d..8ab1be89eef5316dcfa9ec9da6cefed022455c0d 100644 (file)
--- a/src/udev/udev-builtin-keyboard.c
+++ b/src/udev/udev-builtin-keyboard.c
@@ -18,19 +18,15 @@
 ***/
 
 #include <stdio.h>
 ***/
 
 #include <stdio.h>

-#include <errno.h>

 #include <string.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdlib.h>

-#include <fcntl.h>

 #include <sys/ioctl.h>
 #include <sys/ioctl.h>

-#include <linux/limits.h>

 #include <linux/input.h>
 
 #include "udev.h"
 
 static const struct key *keyboard_lookup_key(const char *str, unsigned len);
 #include "keyboard-keys-from-name.h"
 #include <linux/input.h>
 
 #include "udev.h"
 
 static const struct key *keyboard_lookup_key(const char *str, unsigned len);
 #include "keyboard-keys-from-name.h"

-#include "keyboard-keys-to-name.h"

 
 static int install_force_release(struct udev_device *dev, const unsigned *release, unsigned release_count) {
         struct udev_device *atkbd;
 
 static int install_force_release(struct udev_device *dev, const unsigned *release, unsigned release_count) {
         struct udev_device *atkbd;

diff --git a/src/udev/udev-builtin-kmod.c b/src/udev/udev-builtin-kmod.c
index ad2829e5000263cec6e37e21d957f9d03c7366d8..81e78a8aa30e93ed99595b6a718371757b867246 100644 (file)
--- a/src/udev/udev-builtin-kmod.c
+++ b/src/udev/udev-builtin-kmod.c
@@ -21,12 +21,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>

-#include <unistd.h>
-#include <string.h>

 #include <errno.h>
 #include <errno.h>

-#include <fcntl.h>
-#include <sys/stat.h>
-#include <sys/wait.h>

 #include <libkmod.h>
 
 #include "udev.h"
 #include <libkmod.h>
 
 #include "udev.h"

diff --git a/src/udev/udev-builtin-uaccess.c b/src/udev/udev-builtin-uaccess.c
index b78c09b9108a44d312309ce0dcca717965ca76d2..99bb91ae57cacafd9e1739ca453b99ca397ad3f7 100644 (file)
--- a/src/udev/udev-builtin-uaccess.c
+++ b/src/udev/udev-builtin-uaccess.c
@@ -20,14 +20,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
 
 #include <stdio.h>
 #include <stdlib.h>

-#include <stdarg.h>
-#include <unistd.h>
-#include <string.h>
-#include <ctype.h>
-#include <fcntl.h>

 #include <errno.h>
 #include <errno.h>

-#include <dirent.h>
-#include <getopt.h>

 
 #include "systemd/sd-login.h"
 #include "logind-acl.h"
 
 #include "systemd/sd-login.h"
 #include "logind-acl.h"

diff --git a/src/udev/udev-builtin.c b/src/udev/udev-builtin.c
index 1950ec23a1fb22a287f82e12875a83befc662221..d2aec1b200b7d41fed9c428c50064f8bfd346e7c 100644 (file)
--- a/src/udev/udev-builtin.c
+++ b/src/udev/udev-builtin.c
@@ -17,12 +17,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include <unistd.h>

 #include <stdio.h>
 #include <stdio.h>

-#include <stdlib.h>
-#include <stddef.h>

 #include <string.h>
 #include <string.h>

-#include <errno.h>

 #include <getopt.h>
 
 #include "udev.h"
 #include <getopt.h>
 
 #include "udev.h"

diff --git a/src/udev/udev-ctrl.c b/src/udev/udev-ctrl.c
index 59a3eceaadea7cc2959f4c8a52b7d87b3bec774e..c0c5981db8c5a3a1e9619bdaa770d8afeaa9973c 100644 (file)
--- a/src/udev/udev-ctrl.c
+++ b/src/udev/udev-ctrl.c
@@ -10,12 +10,10 @@
  */
 
 #include <errno.h>
  */
 
 #include <errno.h>

-#include <stdio.h>

 #include <stdlib.h>
 #include <stddef.h>
 #include <string.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <stddef.h>
 #include <string.h>
 #include <unistd.h>

-#include <sys/types.h>

 #include <poll.h>
 #include <sys/socket.h>
 #include <sys/un.h>
 #include <poll.h>
 #include <sys/socket.h>
 #include <sys/un.h>

diff --git a/src/udev/udev-event.c b/src/udev/udev-event.c
index bc115f112d7c56c01ab59b7e11f25f353d400bc8..1c5d5e9a49f0296d3778b9de16a84a84ac8f7096 100644 (file)
--- a/src/udev/udev-event.c
+++ b/src/udev/udev-event.c
@@ -23,7 +23,6 @@
 #include <errno.h>
 #include <ctype.h>
 #include <string.h>
 #include <errno.h>
 #include <ctype.h>
 #include <string.h>

-#include <time.h>

 #include <net/if.h>
 #include <sys/prctl.h>
 #include <poll.h>
 #include <net/if.h>
 #include <sys/prctl.h>
 #include <poll.h>

diff --git a/src/udev/udev-node.c b/src/udev/udev-node.c
index 793b48469d693fb35851bfe689aed510763b2cd5..debf9ea88bd610177823bd1c5524f2049ad63cc3 100644 (file)
--- a/src/udev/udev-node.c
+++ b/src/udev/udev-node.c
@@ -15,7 +15,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 

-#include <stdlib.h>

 #include <string.h>
 #include <stdio.h>
 #include <stddef.h>
 #include <string.h>
 #include <stdio.h>
 #include <stddef.h>


@@ -23,11 +22,8 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <errno.h>

-#include <grp.h>

 #include <dirent.h>
 #include <dirent.h>

-#include <sys/time.h>

 #include <sys/stat.h>
 #include <sys/stat.h>

-#include <sys/types.h>

 
 #include "udev.h"
 #include "smack-util.h"
 
 #include "udev.h"
 #include "smack-util.h"

diff --git a/src/udev/udev-watch.c b/src/udev/udev-watch.c
index 6ba8674d771f4b6820c479c386e3e7742209327e..15b76dd6ab4fb8f3cb0f0a07b04c6bf0668b8226 100644 (file)
--- a/src/udev/udev-watch.c
+++ b/src/udev/udev-watch.c
@@ -17,14 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 

-#include <sys/types.h>

 #include <errno.h>
 #include <errno.h>

-#include <fcntl.h>

 #include <stdio.h>
 #include <dirent.h>
 #include <stddef.h>
 #include <stdio.h>
 #include <dirent.h>
 #include <stddef.h>

-#include <stdlib.h>
-#include <string.h>

 #include <unistd.h>
 #include <sys/inotify.h>
 
 #include <unistd.h>
 #include <sys/inotify.h>
 

diff --git a/src/udev/udevadm-control.c b/src/udev/udevadm-control.c
index 6af7163d479622be0958e98ddd6da8149afe165b..78170463b6536d1f926bf772565af7ca07c180ad 100644 (file)
--- a/src/udev/udevadm-control.c
+++ b/src/udev/udevadm-control.c
@@ -12,7 +12,6 @@
  * GNU General Public License for more details.
  */
 
  * GNU General Public License for more details.
  */
 

-#include <time.h>

 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>


@@ -20,10 +19,6 @@
 #include <string.h>
 #include <unistd.h>
 #include <getopt.h>
 #include <string.h>
 #include <unistd.h>
 #include <getopt.h>

-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/wait.h>
-#include <sys/un.h>

 
 #include "udev.h"
 #include "udev-util.h"
 
 #include "udev.h"
 #include "udev-util.h"

diff --git a/src/udev/udevadm-hwdb.c b/src/udev/udevadm-hwdb.c
index d65e40c011ec8cdfcfe45a31c72130cf9c2c232d..00609e31b52202d4af5ef76d5c32a07fc1c473de 100644 (file)
--- a/src/udev/udevadm-hwdb.c
+++ b/src/udev/udevadm-hwdb.c
@@ -18,7 +18,6 @@
 ***/
 
 #include <stdlib.h>
 ***/
 
 #include <stdlib.h>

-#include <unistd.h>

 #include <getopt.h>
 #include <string.h>
 #include <ctype.h>
 #include <getopt.h>
 #include <string.h>
 #include <ctype.h>

diff --git a/src/udev/udevadm-info.c b/src/udev/udevadm-info.c
index 0bab01a234be2b002ca265756f4877f0f8611291..352e024a7c65f09d7690db98f29d915157a202a9 100644 (file)
--- a/src/udev/udevadm-info.c
+++ b/src/udev/udevadm-info.c
@@ -15,19 +15,16 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 

-#include <stdlib.h>

 #include <string.h>
 #include <stdio.h>
 #include <stddef.h>
 #include <ctype.h>
 #include <string.h>
 #include <stdio.h>
 #include <stddef.h>
 #include <ctype.h>

-#include <stdarg.h>

 #include <unistd.h>
 #include <dirent.h>
 #include <errno.h>
 #include <getopt.h>
 #include <fcntl.h>
 #include <sys/stat.h>
 #include <unistd.h>
 #include <dirent.h>
 #include <errno.h>
 #include <getopt.h>
 #include <fcntl.h>
 #include <sys/stat.h>

-#include <sys/types.h>

 
 #include "udev.h"
 #include "udev-util.h"
 
 #include "udev.h"
 #include "udev-util.h"

diff --git a/src/udev/udevadm-monitor.c b/src/udev/udevadm-monitor.c
index 15ded093390776020e27c4b577183af8ebef6ef8..7ef2e68233deaf0f75731017e7d9685af3235b65 100644 (file)
--- a/src/udev/udevadm-monitor.c
+++ b/src/udev/udevadm-monitor.c
@@ -15,22 +15,15 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 

-#include <unistd.h>

 #include <stdio.h>
 #include <stdio.h>

-#include <stdlib.h>

 #include <stddef.h>
 #include <string.h>
 #include <stddef.h>
 #include <string.h>

-#include <fcntl.h>

 #include <errno.h>
 #include <signal.h>
 #include <getopt.h>
 #include <time.h>
 #include <sys/time.h>
 #include <errno.h>
 #include <signal.h>
 #include <getopt.h>
 #include <time.h>
 #include <sys/time.h>

-#include <sys/socket.h>
-#include <sys/un.h>

 #include <sys/epoll.h>
 #include <sys/epoll.h>

-#include <linux/types.h>
-#include <linux/netlink.h>

 
 #include "udev.h"
 #include "udev-util.h"
 
 #include "udev.h"
 #include "udev-util.h"

diff --git a/src/udev/udevadm-settle.c b/src/udev/udevadm-settle.c
index fff5de7a8b42679f2f0084f63e419486c83c1597..0d3025ed16c809a3bfa6c3eafc8ff8d7c48fbb9b 100644 (file)
--- a/src/udev/udevadm-settle.c
+++ b/src/udev/udevadm-settle.c
@@ -23,17 +23,10 @@
 #include <stdio.h>
 #include <unistd.h>
 #include <errno.h>
 #include <stdio.h>
 #include <unistd.h>
 #include <errno.h>

-#include <dirent.h>
-#include <fcntl.h>

 #include <getopt.h>
 #include <getopt.h>

-#include <signal.h>
-#include <time.h>

 #include <poll.h>
 #include <poll.h>

-#include <sys/stat.h>
-#include <sys/types.h>

 
 #include "udev.h"
 
 #include "udev.h"

-#include "udev-util.h"

 #include "util.h"
 
 static void help(void) {
 #include "util.h"
 
 static void help(void) {

diff --git a/src/udev/udevadm-test-builtin.c b/src/udev/udevadm-test-builtin.c
index baaeca935275d9273993bdf6b31515baaab9fd26..35a73494391f68f4209daaf3e26b9cb1dda70a65 100644 (file)
--- a/src/udev/udevadm-test-builtin.c
+++ b/src/udev/udevadm-test-builtin.c
@@ -17,19 +17,9 @@
 
 #include <stdlib.h>
 #include <stddef.h>
 
 #include <stdlib.h>
 #include <stddef.h>

-#include <string.h>

 #include <stdio.h>
 #include <stdio.h>

-#include <unistd.h>

 #include <errno.h>
 #include <errno.h>

-#include <dirent.h>
-#include <fcntl.h>

 #include <getopt.h>
 #include <getopt.h>

-#include <signal.h>
-#include <time.h>
-#include <sys/inotify.h>
-#include <poll.h>
-#include <sys/stat.h>
-#include <sys/types.h>

 
 #include "udev.h"
 
 
 #include "udev.h"
 

diff --git a/src/udev/udevadm-test.c b/src/udev/udevadm-test.c
index 4922b5b6acef92969195141cbc5b7e73a01d18a0..542c56eb1a2cd3f9aac13f58103428a1dd0f1563 100644 (file)
--- a/src/udev/udevadm-test.c
+++ b/src/udev/udevadm-test.c
@@ -17,13 +17,10 @@
  */
 
 #include <stdlib.h>
  */
 
 #include <stdlib.h>

-#include <string.h>

 #include <stdio.h>
 #include <stddef.h>
 #include <unistd.h>
 #include <errno.h>
 #include <stdio.h>
 #include <stddef.h>
 #include <unistd.h>
 #include <errno.h>

-#include <ctype.h>
-#include <fcntl.h>

 #include <signal.h>
 #include <getopt.h>
 #include <sys/signalfd.h>
 #include <signal.h>
 #include <getopt.h>
 #include <sys/signalfd.h>

diff --git a/src/udev/udevadm-trigger.c b/src/udev/udevadm-trigger.c
index 4dc756a28b55f522303082b33ac8d00ba5a64228..11e83f355ffe32f76f56104f0937dcb2e08a9095 100644 (file)
--- a/src/udev/udevadm-trigger.c
+++ b/src/udev/udevadm-trigger.c
@@ -15,20 +15,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 

-#include <stdlib.h>

 #include <stddef.h>
 #include <string.h>
 #include <stdio.h>
 #include <unistd.h>
 #include <getopt.h>
 #include <errno.h>
 #include <stddef.h>
 #include <string.h>
 #include <stdio.h>
 #include <unistd.h>
 #include <getopt.h>
 #include <errno.h>

-#include <dirent.h>

 #include <fcntl.h>
 #include <fcntl.h>

-#include <fnmatch.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/un.h>

 
 #include "udev.h"
 #include "udev-util.h"
 
 #include "udev.h"
 #include "udev-util.h"

diff --git a/src/udev/udevadm.c b/src/udev/udevadm.c
index 56cd0cd4ec542b572f583402cf4d20c27a2380e4..b86d8921f36a68c7a6865ce38cc2bab374d6a6c3 100644 (file)
--- a/src/udev/udevadm.c
+++ b/src/udev/udevadm.c
@@ -16,11 +16,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 

-#include <unistd.h>

 #include <stdio.h>
 #include <stdio.h>

-#include <stdlib.h>

 #include <stddef.h>
 #include <stddef.h>

-#include <string.h>

 #include <errno.h>
 #include <getopt.h>
 
 #include <errno.h>
 #include <getopt.h>
 

diff --git a/src/udev/udevd.c b/src/udev/udevd.c
index 99d4c8983a5564bef80b3da0cb3e80e760047b35..0556356f658dc4bf6b13c374c945de982101db2e 100644 (file)
--- a/src/udev/udevd.c
+++ b/src/udev/udevd.c
@@ -26,25 +26,19 @@
 #include <stdlib.h>
 #include <stdbool.h>
 #include <string.h>
 #include <stdlib.h>
 #include <stdbool.h>
 #include <string.h>

-#include <ctype.h>

 #include <fcntl.h>
 #include <fcntl.h>

-#include <time.h>

 #include <getopt.h>
 #include <getopt.h>

-#include <dirent.h>

 #include <sys/file.h>
 #include <sys/time.h>
 #include <sys/prctl.h>
 #include <sys/socket.h>
 #include <sys/file.h>
 #include <sys/time.h>
 #include <sys/prctl.h>
 #include <sys/socket.h>

-#include <sys/un.h>

 #include <sys/signalfd.h>
 #include <sys/epoll.h>
 #include <sys/mount.h>
 #include <sys/signalfd.h>
 #include <sys/epoll.h>
 #include <sys/mount.h>

-#include <poll.h>

 #include <sys/wait.h>
 #include <sys/stat.h>
 #include <sys/ioctl.h>
 #include <sys/inotify.h>
 #include <sys/wait.h>
 #include <sys/stat.h>
 #include <sys/ioctl.h>
 #include <sys/inotify.h>

-#include <sys/utsname.h>

 
 #include "sd-daemon.h"
 #include "rtnl-util.h"
 
 #include "sd-daemon.h"
 #include "rtnl-util.h"

diff --git a/src/update-done/update-done.c b/src/update-done/update-done.c
index 561963e5ebd9d534f8b05a952bacdd05cd1eec11..44caf84faf347f2072f2f3bf944f6f7f8202d542 100644 (file)
--- a/src/update-done/update-done.c
+++ b/src/update-done/update-done.c
@@ -20,7 +20,6 @@
 ***/
 
 #include "util.h"
 ***/
 
 #include "util.h"

-#include "label.h"

 #include "selinux-util.h"
 
 #define MESSAGE                                                         \
 #include "selinux-util.h"
 
 #define MESSAGE                                                         \

diff --git a/src/update-utmp/update-utmp.c b/src/update-utmp/update-utmp.c
index 5e7498c9e2927c0633eb915876dfa93b18bdad3b..33535ebd7ff98b7d416827f9ad76ab96b4680f51 100644 (file)
--- a/src/update-utmp/update-utmp.c
+++ b/src/update-utmp/update-utmp.c
@@ -19,10 +19,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#include <assert.h>

 #include <errno.h>
 #include <string.h>
 #include <errno.h>
 #include <string.h>

-#include <sys/types.h>

 #include <unistd.h>
 
 #ifdef HAVE_AUDIT
 #include <unistd.h>
 
 #ifdef HAVE_AUDIT

diff --git a/src/vconsole/vconsole-setup.c b/src/vconsole/vconsole-setup.c
index 28371711b6badd2404dd1d6221d0bdfda4027538..bf681d9f3ab5aee5f302a32aca6bc68ca564e739 100644 (file)
--- a/src/vconsole/vconsole-setup.c
+++ b/src/vconsole/vconsole-setup.c
@@ -23,21 +23,16 @@
 #include <unistd.h>
 #include <stdlib.h>
 #include <errno.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <errno.h>

-#include <string.h>

 #include <fcntl.h>
 #include <fcntl.h>

-#include <ctype.h>

 #include <stdbool.h>
 #include <stdbool.h>

-#include <stdarg.h>

 #include <limits.h>
 #include <sys/ioctl.h>
 #include <limits.h>
 #include <sys/ioctl.h>

-#include <sys/wait.h>

 #include <linux/tiocl.h>
 #include <linux/kd.h>
 #include <linux/vt.h>
 
 #include "util.h"
 #include "log.h"
 #include <linux/tiocl.h>
 #include <linux/kd.h>
 #include <linux/vt.h>
 
 #include "util.h"
 #include "log.h"

-#include "macro.h"

 #include "virt.h"
 #include "fileio.h"
 
 #include "virt.h"
 #include "fileio.h"