diff --git a/src/openrc-shutdown/broadcast.c b/src/openrc-shutdown/broadcast.c
index 05672ee0..232f4ab7 100644
--- a/src/openrc-shutdown/broadcast.c
+++ b/src/openrc-shutdown/broadcast.c
@@ -12,24 +12,23 @@
  * This file may not be copied, modified, propagated, or distributed
  *    except according to the terms contained in the LICENSE file.
  */
-#include <ctype.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/sysmacros.h>
-#include <limits.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <utmp.h>
-#include <utmpx.h>
-#include <pwd.h>
+
+
 #include <fcntl.h>
+#include <paths.h>
+#include <pwd.h>
 #include <signal.h>
 #include <setjmp.h>
-#include <paths.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/stat.h>
+#include <sys/sysmacros.h>
+#include <sys/types.h>
 #include <sys/utsname.h>
+#include <time.h>
+#include <unistd.h>
+#include <utmpx.h>
 
 #include "broadcast.h"
 #include "helpers.h"
diff --git a/src/openrc-shutdown/openrc-shutdown.c b/src/openrc-shutdown/openrc-shutdown.c
index a2fae5f5..c73d8e6d 100644
--- a/src/openrc-shutdown/openrc-shutdown.c
+++ b/src/openrc-shutdown/openrc-shutdown.c
@@ -19,6 +19,7 @@
  *    except according to the terms contained in the LICENSE file.
  */
 
+#include <errno.h>
 #include <getopt.h>
 #include <signal.h>
 #include <stdbool.h>
@@ -26,9 +27,11 @@
 #include <stdlib.h>
 #include <string.h>
 #include <syslog.h>
-#include <unistd.h>
 #include <sys/types.h>
-#include <sys/utsname.h>
+#include <strings.h>
+#include <unistd.h>
+#include <time.h>
+#include <utmp.h>
 
 #include "broadcast.h"
 #include "einfo.h"
diff --git a/src/openrc-shutdown/sysvinit.c b/src/openrc-shutdown/sysvinit.c
index 84fc9ec2..bd5d5be0 100644
--- a/src/openrc-shutdown/sysvinit.c
+++ b/src/openrc-shutdown/sysvinit.c
@@ -17,11 +17,10 @@
 
 #include <errno.h>
 #include <fcntl.h>
-#include <stdlib.h>
+#include <stddef.h>
 #include <string.h>
-#include <unistd.h>
 #include <sys/stat.h>
-#include <sys/types.h>
+#include <unistd.h>
 
 #include "einfo.h"
 #include "sysvinit.h"