diff --git a/src/klogd.c b/src/klogd.c
index 384da91..0eb701a 100644
--- a/src/klogd.c
+++ b/src/klogd.c
@@ -260,11 +260,12 @@
 #include <unistd.h>
 #include <signal.h>
 #include <errno.h>
-#include <sys/fcntl.h>
+#ifdef SYSV
+#include <fcntl.h>
+#else
+#include <sys/msgbuf.h>
+#endif
 #include <sys/stat.h>
-#if !defined(__GLIBC__)
-#include <linux/time.h>
-#endif /* __GLIBC__ */
 #include <stdarg.h>
 #include <paths.h>
 #include <stdlib.h>
@@ -277,13 +278,8 @@
 
 #define __LIBRARY__
 #include <linux/unistd.h>
-#if !defined(__GLIBC__)
-# define __NR_ksyslog __NR_syslog
-_syscall3(int,ksyslog,int, type, char *, buf, int, len);
-#else
 #include <sys/klog.h>
 #define ksyslog klogctl
-#endif
 
 #define LOG_BUFFER_SIZE 4096
 #define LOG_LINE_LENGTH 1000
diff --git a/src/ksym_mod.c b/src/ksym_mod.c
index 1a45c85..4551510 100644
--- a/src/ksym_mod.c
+++ b/src/ksym_mod.c
@@ -113,12 +113,13 @@
 #include <unistd.h>
 #include <signal.h>
 #include <errno.h>
-#include <sys/fcntl.h>
+#ifdef SYSV
+#include <fcntl.h>
+#else
+#include <sys/msgbuf.h>
+#endif
 #include <sys/stat.h>
 #include "module.h"
-#if !defined(__GLIBC__)
-#include <linux/time.h>
-#endif /* __GLIBC__ */
 #include <stdarg.h>
 #include <paths.h>
 #include <linux/version.h>
diff --git a/src/pidfile.c b/src/pidfile.c
index cf53b49..5b09625 100644
--- a/src/pidfile.c
+++ b/src/pidfile.c
@@ -31,6 +31,7 @@
 #include <string.h>
 #include <errno.h>
 #include <signal.h>
+#include <fcntl.h>
 
 /* read_pid
  *
diff --git a/src/syslog.c b/src/syslog.c
index bdb3ff2..99b968d 100644
--- a/src/syslog.c
+++ b/src/syslog.c
@@ -55,13 +55,7 @@ static char sccsid[] = "@(#)syslog.c	5.28 (Berkeley) 6/27/90";
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/file.h>
-#include <sys/signal.h>
 #include <sys/syslog.h>
-#if 0
-#include "syslog.h"
-#include "pathnames.h"
-#endif
-
 #include <sys/uio.h>
 #include <sys/wait.h>
 #include <netdb.h>
@@ -72,6 +66,7 @@ static char sccsid[] = "@(#)syslog.c	5.28 (Berkeley) 6/27/90";
 #include <stdarg.h>
 #include <paths.h>
 #include <stdio.h>
+#include <fcntl.h>
 
 #define	_PATH_LOGNAME	"/dev/log"
 
diff --git a/src/syslogd.c b/src/syslogd.c
index 6b16614..6357022 100644
--- a/src/syslogd.c
+++ b/src/syslogd.c
@@ -524,9 +524,7 @@ static char sccsid[] = "@(#)syslogd.c	5.27 (Berkeley) 10/10/88";
 #include <unistd.h>
 #include <stdlib.h>
 #include <stdio.h>
-#ifdef SYSV
 #include <sys/types.h>
-#endif
 #include <utmp.h>
 #include <ctype.h>
 #include <string.h>
@@ -537,17 +535,13 @@ static char sccsid[] = "@(#)syslogd.c	5.27 (Berkeley) 10/10/88";
 #define SYSLOG_NAMES
 #include <sys/syslog.h>
 #include <sys/param.h>
-#include <sys/errno.h>
+#include <errno.h>
 #include <sys/ioctl.h>
 #include <sys/stat.h>
 #include <sys/wait.h>
 #include <sys/socket.h>
 #include <sys/file.h>
-#ifdef SYSV
 #include <fcntl.h>
-#else
-#include <sys/msgbuf.h>
-#endif
 #include <sys/uio.h>
 #include <sys/un.h>
 #include <sys/time.h>