diff --git a/init/systemd-dir.c b/init/systemd-dir.c
index 815f552..5ec6dbc 100644
--- a/init/systemd-dir.c
+++ b/init/systemd-dir.c
@@ -23,8 +23,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <sys/types.h>
-
 #include <limits.h>
 
 #include "systemd.h"
diff --git a/init/systemd-file.c b/init/systemd-file.c
index a630ac3..d78e4d8 100644
--- a/init/systemd-file.c
+++ b/init/systemd-file.c
@@ -23,8 +23,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <sys/types.h>
-
 #include <unistd.h>
 #include <limits.h>
 
diff --git a/init/systemd-move.c b/init/systemd-move.c
index 905e18f..b347945 100644
--- a/init/systemd-move.c
+++ b/init/systemd-move.c
@@ -23,10 +23,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <sys/types.h>
-
 #include <string.h>
-#include <unistd.h>
 #include <limits.h>
 #include <libgen.h>
 
diff --git a/init/systemd-proc.c b/init/systemd-proc.c
index fc0446c..b0753f8 100644
--- a/init/systemd-proc.c
+++ b/init/systemd-proc.c
@@ -26,10 +26,10 @@
 #include <sys/types.h>
 #include <sys/sysctl.h>
 
+#include <errno.h>
+#include <signal.h>
 #include <stdlib.h>
 #include <string.h>
-#include <signal.h>
-#include <errno.h>
 
 #include "systemd.h"
 
diff --git a/init/systemd-rename.c b/init/systemd-rename.c
index 58c4db8..a94e42c 100644
--- a/init/systemd-rename.c
+++ b/init/systemd-rename.c
@@ -23,12 +23,8 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <sys/types.h>
-
 #include <string.h>
-#include <unistd.h>
 #include <limits.h>
-#include <libgen.h>
 
 #include "systemd.h"
 
diff --git a/init/systemd.c b/init/systemd.c
index ef67140..7f55a7a 100644
--- a/init/systemd.c
+++ b/init/systemd.c
@@ -24,9 +24,11 @@
  */
 
 #include <sys/types.h>
+#include <sys/select.h>
 #include <sys/socket.h>
 #include <sys/sysctl.h>
 #include <sys/wait.h>
+#include <sys/cdefs.h>
 
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/init/systemd.h b/init/systemd.h
index 6c0d548..f51d2d0 100644
--- a/init/systemd.h
+++ b/init/systemd.h
@@ -23,9 +23,8 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <stdarg.h>
 #include <limits.h>
-#include <err.h>
+#include <stddef.h>
 
 #ifndef SYSTEMD_LIB
 #define SYSTEMD_LIB