diff --git a/coreutils/ln.c b/coreutils/ln.c
index beaa58fac..3c45dee33 100644
--- a/coreutils/ln.c
+++ b/coreutils/ln.c
@@ -52,7 +52,7 @@ static int followLinks = TRUE;
 
 extern int ln_main(int argc, char **argv)
 {
-	char *linkName, *dirName;
+	char *linkName, *dirName=NULL;
 	int linkIntoDirFlag;
 	int stopIt = FALSE;
 
diff --git a/dmesg.c b/dmesg.c
index e88f549ca..b6c990d99 100644
--- a/dmesg.c
+++ b/dmesg.c
@@ -23,7 +23,7 @@
 
 #ifndef __alpha__
 # define __NR_klogctl __NR_syslog
-#include <linux/unistd.h>
+#include <sys/syscall.h>
 static inline _syscall3(int, klogctl, int, type, char *, b, int, len);
 #else							/* __alpha__ */
 #define klogctl syslog
diff --git a/init.c b/init.c
index 52440ef85..e0b465126 100644
--- a/init.c
+++ b/init.c
@@ -110,7 +110,7 @@ struct serial_struct {
 #if defined(__GLIBC__)
 #include <sys/kdaemon.h>
 #else
-#include <linux/unistd.h>		/* for _syscall() macro */
+#include <sys/syscall.h>		/* for _syscall() macro */
 static _syscall2(int, bdflush, int, func, int, data);
 #endif							/* __GLIBC__ */
 
diff --git a/init/init.c b/init/init.c
index 52440ef85..e0b465126 100644
--- a/init/init.c
+++ b/init/init.c
@@ -110,7 +110,7 @@ struct serial_struct {
 #if defined(__GLIBC__)
 #include <sys/kdaemon.h>
 #else
-#include <linux/unistd.h>		/* for _syscall() macro */
+#include <sys/syscall.h>		/* for _syscall() macro */
 static _syscall2(int, bdflush, int, func, int, data);
 #endif							/* __GLIBC__ */
 
diff --git a/insmod.c b/insmod.c
index 79732b017..469d056d3 100644
--- a/insmod.c
+++ b/insmod.c
@@ -41,7 +41,6 @@
 #include <getopt.h>
 #include <sys/utsname.h>
 #include <sys/syscall.h>
-#include <linux/unistd.h>
 
 //----------------------------------------------------------------------------
 //--------modutils module.h, lines 45-242
@@ -72,7 +71,7 @@
 #ifndef MODUTILS_MODULE_H
 #define MODUTILS_MODULE_H 1
 
-#ident "$Id: insmod.c,v 1.13 2000/07/09 06:59:58 andersen Exp $"
+#ident "$Id: insmod.c,v 1.14 2000/07/10 20:08:44 andersen Exp $"
 
 /* This file contains the structures used by the 2.0 and 2.1 kernels.
    We do not use the kernel headers directly because we do not wish
@@ -278,7 +277,7 @@ int delete_module(const char *);
 #ifndef MODUTILS_OBJ_H
 #define MODUTILS_OBJ_H 1
 
-#ident "$Id: insmod.c,v 1.13 2000/07/09 06:59:58 andersen Exp $"
+#ident "$Id: insmod.c,v 1.14 2000/07/10 20:08:44 andersen Exp $"
 
 /* The relocatable object is manipulated using elfin types.  */
 
diff --git a/ln.c b/ln.c
index beaa58fac..3c45dee33 100644
--- a/ln.c
+++ b/ln.c
@@ -52,7 +52,7 @@ static int followLinks = TRUE;
 
 extern int ln_main(int argc, char **argv)
 {
-	char *linkName, *dirName;
+	char *linkName, *dirName=NULL;
 	int linkIntoDirFlag;
 	int stopIt = FALSE;
 
diff --git a/miscutils/update.c b/miscutils/update.c
index b86d84e06..1fdf04a89 100644
--- a/miscutils/update.c
+++ b/miscutils/update.c
@@ -24,7 +24,7 @@
  */
 
 #include "internal.h"
-#include <linux/unistd.h>
+#include <sys/syscall.h>
 #include <sys/param.h>
 #include <sys/syslog.h>
 
diff --git a/modutils/insmod.c b/modutils/insmod.c
index 79732b017..469d056d3 100644
--- a/modutils/insmod.c
+++ b/modutils/insmod.c
@@ -41,7 +41,6 @@
 #include <getopt.h>
 #include <sys/utsname.h>
 #include <sys/syscall.h>
-#include <linux/unistd.h>
 
 //----------------------------------------------------------------------------
 //--------modutils module.h, lines 45-242
@@ -72,7 +71,7 @@
 #ifndef MODUTILS_MODULE_H
 #define MODUTILS_MODULE_H 1
 
-#ident "$Id: insmod.c,v 1.13 2000/07/09 06:59:58 andersen Exp $"
+#ident "$Id: insmod.c,v 1.14 2000/07/10 20:08:44 andersen Exp $"
 
 /* This file contains the structures used by the 2.0 and 2.1 kernels.
    We do not use the kernel headers directly because we do not wish
@@ -278,7 +277,7 @@ int delete_module(const char *);
 #ifndef MODUTILS_OBJ_H
 #define MODUTILS_OBJ_H 1
 
-#ident "$Id: insmod.c,v 1.13 2000/07/09 06:59:58 andersen Exp $"
+#ident "$Id: insmod.c,v 1.14 2000/07/10 20:08:44 andersen Exp $"
 
 /* The relocatable object is manipulated using elfin types.  */
 
diff --git a/swaponoff.c b/swaponoff.c
index 223436c29..bb8395fa4 100644
--- a/swaponoff.c
+++ b/swaponoff.c
@@ -28,7 +28,7 @@
 #include <mntent.h>
 #include <dirent.h>
 #include <errno.h>
-#include <linux/unistd.h>
+#include <sys/syscall.h>
 
 _syscall2(int, swapon, const char *, path, int, flags);
 _syscall1(int, swapoff, const char *, path);
diff --git a/sysklogd/syslogd.c b/sysklogd/syslogd.c
index aa1218f3f..a185a4cc3 100644
--- a/sysklogd/syslogd.c
+++ b/sysklogd/syslogd.c
@@ -40,7 +40,7 @@
 #include <sys/types.h>
 #include <sys/un.h>
 #include <sys/param.h>
-#include <linux/unistd.h>
+#include <sys/syscall.h>
 
 #if ! defined __GLIBC__ && ! defined __UCLIBC__
 
diff --git a/syslogd.c b/syslogd.c
index aa1218f3f..a185a4cc3 100644
--- a/syslogd.c
+++ b/syslogd.c
@@ -40,7 +40,7 @@
 #include <sys/types.h>
 #include <sys/un.h>
 #include <sys/param.h>
-#include <linux/unistd.h>
+#include <sys/syscall.h>
 
 #if ! defined __GLIBC__ && ! defined __UCLIBC__
 
diff --git a/update.c b/update.c
index b86d84e06..1fdf04a89 100644
--- a/update.c
+++ b/update.c
@@ -24,7 +24,7 @@
  */
 
 #include "internal.h"
-#include <linux/unistd.h>
+#include <sys/syscall.h>
 #include <sys/param.h>
 #include <sys/syslog.h>
 
diff --git a/util-linux/dmesg.c b/util-linux/dmesg.c
index e88f549ca..b6c990d99 100644
--- a/util-linux/dmesg.c
+++ b/util-linux/dmesg.c
@@ -23,7 +23,7 @@
 
 #ifndef __alpha__
 # define __NR_klogctl __NR_syslog
-#include <linux/unistd.h>
+#include <sys/syscall.h>
 static inline _syscall3(int, klogctl, int, type, char *, b, int, len);
 #else							/* __alpha__ */
 #define klogctl syslog
diff --git a/util-linux/swaponoff.c b/util-linux/swaponoff.c
index 223436c29..bb8395fa4 100644
--- a/util-linux/swaponoff.c
+++ b/util-linux/swaponoff.c
@@ -28,7 +28,7 @@
 #include <mntent.h>
 #include <dirent.h>
 #include <errno.h>
-#include <linux/unistd.h>
+#include <sys/syscall.h>
 
 _syscall2(int, swapon, const char *, path, int, flags);
 _syscall1(int, swapoff, const char *, path);
diff --git a/utility.c b/utility.c
index 97e0366ad..b4e0434d9 100644
--- a/utility.c
+++ b/utility.c
@@ -134,13 +134,11 @@ extern int get_kernel_revision(void)
 
 #if defined BB_FREE || defined BB_INIT || defined BB_UNAME || defined BB_UPTIME
 #include <sys/syscall.h>
-#include <linux/unistd.h>
 _syscall1(int, sysinfo, struct sysinfo *, info);
 #endif                                                 /* BB_INIT */
 
 #if defined BB_MOUNT || defined BB_UMOUNT
 #include <sys/syscall.h>
-#include <linux/unistd.h>
 
 #ifndef __NR_umount2
 #define __NR_umount2           52