Remove repeated includes

In pty.c there was both an include of our pty.h and the system installed pty.h.
The latter contains only two functions openpty and forkpty. We use neither so
I assume it was a typo and removed it. We still compile and pass all tests.

diff --git a/src/bus-proxyd/bus-proxyd.c b/src/bus-proxyd/bus-proxyd.c
index 6a0fc7edfba435d2359bda5c99b691d18e241431..5d58cd2af4d33b44a0f208918898e03a7a89b3e3 100644 (file)
--- a/src/bus-proxyd/bus-proxyd.c
+++ b/src/bus-proxyd/bus-proxyd.c
@@ -40,7 +40,6 @@
 #include "bus-internal.h"
 #include "bus-message.h"
 #include "bus-util.h"
-#include "bus-internal.h"
 #include "build.h"
 #include "strv.h"
 #include "def.h"

diff --git a/src/bus-proxyd/test-bus-policy.c b/src/bus-proxyd/test-bus-policy.c
index 7bcebef905cc73ca5f3c22cd00512de6f3e7b1be..5267788b704d145e3b2241b9eed81901b601f4b6 100644 (file)
--- a/src/bus-proxyd/test-bus-policy.c
+++ b/src/bus-proxyd/test-bus-policy.c
@@ -36,7 +36,6 @@
 #include "bus-internal.h"
 #include "bus-message.h"
 #include "bus-util.h"
-#include "bus-internal.h"
 #include "build.h"
 #include "strv.h"
 #include "def.h"

diff --git a/src/shared/locale-util.c b/src/shared/locale-util.c
index d5eaff3d9e14f75cb8d0c6a9eeef413c1f3f4e88..9addb05f0947534edd1ee058eedd546de06513b0 100644 (file)
--- a/src/shared/locale-util.c
+++ b/src/shared/locale-util.c
@@ -25,7 +25,6 @@
 #include "util.h"
 #include "utf8.h"
 #include "strv.h"
-#include "util.h"
 
 #include "locale-util.h"
 

diff --git a/src/shared/missing.h b/src/shared/missing.h
index b441149945ec32c0a8bb55da59186f9c34cab1e2..031fe2d1ce2fd00fe91ef24731f192d0ddada53d 100644 (file)
--- a/src/shared/missing.h
+++ b/src/shared/missing.h
@@ -33,7 +33,6 @@
 #include <linux/input.h>
 #include <linux/if_link.h>
 #include <linux/loop.h>
-#include <linux/if_link.h>
 
 #ifdef HAVE_AUDIT
 #include <libaudit.h>

diff --git a/src/shared/pty.c b/src/shared/pty.c
index 31123e5af20636e71476ae52043327af5e99ba5b..adcb32d0be733af138ceb7bec97821065d6cb016 100644 (file)
--- a/src/shared/pty.c
+++ b/src/shared/pty.c
@@ -46,7 +46,6 @@
 #include <fcntl.h>
 #include <limits.h>
 #include <linux/ioctl.h>
-#include <pty.h>
 #include <signal.h>
 #include <stdbool.h>
 #include <stdint.h>

diff --git a/src/sysv-generator/sysv-generator.c b/src/sysv-generator/sysv-generator.c
index 43bcaa862fb5c15df767bb7e67461f47754451a9..6e4cdd694e5a877957d8e7bb980e531eea861ab0 100644 (file)
--- a/src/sysv-generator/sysv-generator.c
+++ b/src/sysv-generator/sysv-generator.c
@@ -31,7 +31,6 @@
 #include "path-util.h"
 #include "path-lookup.h"
 #include "log.h"
-#include "strv.h"
 #include "unit.h"
 #include "unit-name.h"
 #include "special.h"