diff --git a/src/chardev.c b/src/chardev.c
index 08ad377..3b09d0c 100644
--- a/src/chardev.c
+++ b/src/chardev.c
@@ -19,32 +19,24 @@ static char *id = "$Id: chardev.c,v 1.2 1999/01/03 02:06:50 sybalsky Exp $ Copyr
 /*                                                                      */
 /************************************************************************/
 
+#include <errno.h>
+#include <fcntl.h>
+#include <setjmp.h>
+#include <signal.h>
+#include <string.h>
+#include <unistd.h>
+
 #ifndef DOS
+#include <dirent.h>
 #include <stdio.h>
 #include <sys/types.h>
 #include <sys/file.h>
 #include <sys/stat.h>
 #include <sys/param.h>
 #include <sys/time.h>
-#ifndef OS5
-#ifndef FREEBSD
-#include <sys/dir.h>
-#endif /* FREEBSD */
-#endif /* OS5 */
-#ifndef OS5
-#include <strings.h>
-#endif /* OS5 */
 #include <sys/ioctl.h>
-#else /* DOS */
-#include <string.h>
 #endif /* DOS */
 
-#include <unistd.h>
-#include <setjmp.h>
-#include <signal.h>
-#include <errno.h>
-#include <fcntl.h>
-
 #include "lispemul.h"
 #include "lispmap.h"
 #include "adr68k.h"
@@ -60,9 +52,6 @@ static char *id = "$Id: chardev.c,v 1.2 1999/01/03 02:06:50 sybalsky Exp $ Copyr
 #include "commondefs.h"
 #include "perrnodefs.h"
 
-#if defined(FREEBSD)
-#include <dirent.h>
-#endif
 
 extern int *Lisp_errno;
 extern int Dummy_errno;
diff --git a/src/dir.c b/src/dir.c
index 0b21404..0707b91 100644
--- a/src/dir.c
+++ b/src/dir.c
@@ -10,36 +10,23 @@ static char *id = "$Id: dir.c,v 1.4 2001/12/26 22:17:01 sybalsky Exp $ Copyright
 
 #include "version.h"
 
-#include <sys/types.h>
+#include <errno.h>
 #include <setjmp.h>
-#ifndef DOS
-#include <sys/param.h>
-#ifndef OS5
-#ifndef FREEBSD
-#include <sys/dir.h>
-#endif /* FREEBSD */
-#endif /* OS5 */
-#include <sys/stat.h>
-#include <setjmp.h>
-#include <pwd.h>
-
-#ifndef SYSVONLY
-#include <strings.h>
-/*  #else  */
-/*  #include <string.h> */
-#endif /* SYSVONLY */
-
-#if defined(LINUX) || defined(MACOSX) || defined(FREEBSD) || defined(OS5)
-#include <string.h>
-#endif /* LINUX */
-
-#else /* DOS, now */
-#include <dos.h>
-#include <string.h>
-#include <unistd.h>
-#include <sys/stat.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <unistd.h>
+
+#ifndef DOS
+#include <dirent.h>
+#include <pwd.h>
+#include <sys/param.h>
+// TODO: Remove the need for this.
+#define direct dirent
+#else /* DOS, now */
+#include <dos.h>
 #define index strchr
 #define rindex strrchr
 #define MAXPATHLEN _MAX_PATH
@@ -47,17 +34,6 @@ static char *id = "$Id: dir.c,v 1.4 2001/12/26 22:17:01 sybalsky Exp $ Copyright
 #define alarm(x) 1
 #endif /* DOS */
 
-#if defined(SYSVONLY) || defined(MACOSX) || defined(FREEBSD) || defined(LINUX)
-#include <unistd.h>
-#endif /* SYSVONLY */
-
-#if defined(OS5) || defined(FREEBSD)
-#include <dirent.h>
-#define direct dirent
-#endif
-
-#include <stdio.h>
-#include <errno.h>
 #include "lispemul.h"
 #include "lispmap.h"
 #include "adr68k.h"
diff --git a/src/dsk.c b/src/dsk.c
index d4a272d..ea286df 100644
--- a/src/dsk.c
+++ b/src/dsk.c
@@ -10,39 +10,36 @@ static char *id = "$Id: dsk.c,v 1.4 2001/12/24 01:09:01 sybalsky Exp $ Copyright
 
 #include "version.h"
 
-#if defined(MACOSX) || defined(FREEBSD) || defined(LINUX) || defined(OS5)
+#include <errno.h>
+#include <fcntl.h>
+#include <setjmp.h>
+#include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
-#endif
-
 #include <sys/types.h>
-#ifndef DOS
-#include <sys/param.h>
-#include <sys/file.h>
-#ifndef OS5
-#include <strings.h>
-#endif /* OS5  Solaris doesn't need strings.h */
-#ifndef SYSVONLY
-#ifndef MACOSX
-#ifndef FREEBSD
-#ifndef OS5
-#include <sys/dir.h>
-#endif /* OS5 */
-#endif /* FREEBSD */
-#endif /* MACOSX */
-#endif /* SYSVONLY */
+#include <unistd.h>
 
+#ifndef DOS
+#include <dirent.h>
+#include <pwd.h>
+#include <sys/param.h>
 #include <sys/stat.h>
 #include <sys/time.h>
 #ifdef sun
 #include <sys/vfs.h>
 #endif /* sun */
 
+// We should be using the POSIX definitions in this file.
+#define direct dirent
+#define d_namlen d_reclen
+#define d_fileno d_ino
+#ifndef LINUX
+#define L_SET SEEK_SET
+#endif
+
 #else /* DOS */
 
-#include <string.h>
 #include <direct.h>
-#include <stdlib.h>
-#include <unistd.h> /* get R_OK, F_OK symbols */
 #include <dos.h>
 #include <sys/stat.h>
 #include <time.h>
@@ -55,30 +52,6 @@ static char *id = "$Id: dsk.c,v 1.4 2001/12/24 01:09:01 sybalsky Exp $ Copyright
 #define alarm(x) 0
 #endif /* DOS */
 
-#ifdef OS5
-#define index strchr
-#define rindex strrchr
-#define L_SET SEEK_SET
-#endif /* OS5 */
-
-#if defined(SYSVONLY) || defined(MACOSX) || defined(FREEBSD) || defined(OS5)
-#include <dirent.h>
-#include <unistd.h>
-#define direct dirent
-#define d_namlen d_reclen
-#define d_fileno d_ino
-#ifndef LINUX
-#define L_SET SEEK_SET
-#endif
-#endif /* SYSVONLY */
-
-#ifndef DOS
-#include <pwd.h>
-#endif /* DOS */
-#include <setjmp.h>
-#include <fcntl.h>
-#include <stdio.h>
-#include <errno.h>
 #include "lispemul.h"
 #include "lispmap.h"
 #include "adr68k.h"
diff --git a/src/gcarray.c b/src/gcarray.c
index e1674eb..e905bd4 100644
--- a/src/gcarray.c
+++ b/src/gcarray.c
@@ -43,6 +43,9 @@ static char *id = "$Id: gcarray.c,v 1.3 1999/05/31 23:35:30 sybalsky Exp $ Copyr
 /*                                                               \Tomtom */
 /*************************************************************************/
 
+#include <stdio.h>
+#include <string.h>
+
 #include "lispemul.h"
 #include "lsptypes.h"
 #include "address.h"
@@ -55,10 +58,6 @@ static char *id = "$Id: gcarray.c,v 1.3 1999/05/31 23:35:30 sybalsky Exp $ Copyr
 #include "array.h"
 #include "debug.h"
 #include "lispmap.h"
-#include <stdio.h>
-#if defined(MACOSX) || defined(FREEBSD)
-#include <string.h>
-#endif
 
 #include "gcarraydefs.h"
 #include "car-cdrdefs.h"
diff --git a/src/inet.c b/src/inet.c
index 30a169b..fe884df 100644
--- a/src/inet.c
+++ b/src/inet.c
@@ -10,27 +10,25 @@ static char *id = "$Id: inet.c,v 1.3 2001/12/24 01:09:03 sybalsky Exp $ Copyrigh
 
 #include "version.h"
 
-#include <stdio.h>
 #include <ctype.h>
+#include <fcntl.h>
+#include <stdio.h>
 #include <string.h> /* for mem... fns */
+
 #ifndef DOS
-#include <sys/types.h>
-#include <sys/file.h>
-#include <signal.h>
-#include <sys/select.h> /* for FD_ fns */
-
-#ifdef OS5
-#include <sys/fcntl.h>
-#endif /* OS5 */
-
-#include <sys/time.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#include <sys/ioctl.h>
 #include <errno.h>
+#include <netdb.h>
+#include <netinet/in.h>
+#include <signal.h>
+#include <sys/file.h>
+#include <sys/ioctl.h>
+#include <sys/select.h> /* for FD_ fns */
+#include <sys/socket.h>
+#include <sys/time.h>
+#include <sys/types.h>
 #include <unistd.h>
 #endif /* DOS */
+
 #include "lispemul.h"
 #include "lispmap.h"
 #include "lsptypes.h"
diff --git a/src/initsout.c b/src/initsout.c
index 14d9507..e714949 100644
--- a/src/initsout.c
+++ b/src/initsout.c
@@ -19,18 +19,16 @@ static char *id = "$Id: initsout.c,v 1.3 1999/05/31 23:35:34 sybalsky Exp $ Copy
 #include "version.h"
 
 #include <stdio.h>
-#include <unistd.h>
-#include <string.h>
-#if defined(MACOSX) || defined(FREEBSD)
 #include <stdlib.h>
-#else
-#include <malloc.h>
-#endif
+#include <string.h>
+#include <unistd.h>
+
 #ifndef DOS
 #include <pwd.h>
 #else
 #undef HAS_GETHOSTID
 #endif /* DOS */
+
 #include "hdw_conf.h"
 #include "lispemul.h"
 #include "lspglob.h"
diff --git a/src/ldeboot.c b/src/ldeboot.c
index bb6bb59..47269ac 100644
--- a/src/ldeboot.c
+++ b/src/ldeboot.c
@@ -11,16 +11,21 @@ static char *id = "$Id: ldeboot.c,v 1.3 1999/01/03 02:07:13 sybalsky Exp $ Copyr
 
 #include "version.h"
 
+#include <ctype.h>
+#include <fcntl.h>
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/ioctl.h>
+#include <unistd.h>
+
 #if defined(sun) && !defined(OS5)
 #define USESUNSCREEN
 #else
 #undef USESUNSCREEN
 #endif
 
-#include <stdio.h>
-#include <ctype.h>
-
-#include <sys/ioctl.h>
 #ifdef USESUNSCREEN
 #ifdef OS5
 #include <sys/fbio.h>
@@ -29,19 +34,9 @@ static char *id = "$Id: ldeboot.c,v 1.3 1999/01/03 02:07:13 sybalsky Exp $ Copyr
 #endif /* OS5 */
 #endif /* USESUNSCREEN */
 
-#include <fcntl.h>
-#include <errno.h>
-#include <string.h>
-#include <stdlib.h>
-#include <unistd.h>
-
 #include "unixfork.h"
 
 #ifdef XWINDOW
-#ifndef SYSVONLY
-#include <strings.h>
-#endif /* SYSVONLY */
-
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #include "XVersion.h"
diff --git a/src/ldsout.c b/src/ldsout.c
index 5d1026c..5c87920 100644
--- a/src/ldsout.c
+++ b/src/ldsout.c
@@ -12,24 +12,13 @@ static char *id = "$Id: ldsout.c,v 1.4 2001/12/26 22:17:02 sybalsky Exp $ Copyri
 
 #include "version.h"
 
+#include <errno.h>
+#include <fcntl.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <unistd.h>
 #include <string.h>
-#include <sys/types.h>
-#ifndef DOS
-#include <sys/file.h>
-#endif /* DOS */
 #include <sys/stat.h>
-#include <errno.h>
-
-#if defined(SYSVONLY) || defined(OS5)
-#include <sys/fcntl.h>
-#endif /* SYSVONLY || OS5 */
-
-#ifdef DOS
-#include <fcntl.h>
-#endif /* DOS */
+#include <unistd.h>
 
 #include "adr68k.h"
 #include "lispemul.h"
diff --git a/src/lpmain.c b/src/lpmain.c
index 3709643..e57132f 100644
--- a/src/lpmain.c
+++ b/src/lpmain.c
@@ -12,17 +12,18 @@ static char *id = "$Id: lpmain.c,v 1.2 1999/01/03 02:07:19 sybalsky Exp $ Copyri
 
 #include "version.h"
 
-#include <signal.h>
-#include "lpkit.h"
-#include "lpglob.h"
-#include "lppatch.h"
 #include <setjmp.h>
-#include <malloc.h>
+#include <signal.h>
+#include <stdlib.h>
 
 #ifdef OS4
 #include <sys/types.h>
 #endif /* OS4 */
 
+#include "lpkit.h"
+#include "lpglob.h"
+#include "lppatch.h"
+
 #include "lispemul.h"
 #include "lspglob.h"
 #include "lispmap.h"
diff --git a/src/main.c b/src/main.c
index e9f60f1..13bb314 100644
--- a/src/main.c
+++ b/src/main.c
@@ -19,56 +19,30 @@ static char *id = "$Id: main.c,v 1.4 2001/12/26 22:17:03 sybalsky Exp $ Copyrigh
 #include "dbprint.h"
 #include "unixfork.h"
 
+#include <errno.h>
+#include <setjmp.h>
+#include <stdio.h>
+#include <string.h>
 #include <sys/types.h>
+#include <time.h>
+
 #ifndef DOS
+#include <pwd.h>
 #include <sys/param.h>
-#include <sys/time.h>
 #include <unistd.h>
 #else /* DOS */
+#include <i32.h>
 #define MAXPATHLEN 128
 #define R_OK 04
 #define index strchr
 #define rindex strrchr
-#include <time.h>
-#include <string.h>
-#include <i32.h>
 #endif /* DOS */
-#ifdef LINUX
-#include <time.h>
-#endif
 
 #ifndef NOETHER
 #ifndef USE_DLPI
 #include <net/nit.h> /* needed for Ethernet stuff below */
 #endif               /* USE_DLPI */
 #endif               /* NOETHER */
-#include <stdio.h>
-
-#ifndef SYSVONLY
-#ifndef DOS
-#include <strings.h>
-#endif /* DOS */
-#else  /* SYSVONLY -IS- ON */
-#include <string.h>
-#include <unistd.h>
-#endif /* SYSVONLY */
-
-#ifndef DOS
-#include <sys/file.h>
-#include <sys/select.h>
-#endif /* DOS */
-
-#include <setjmp.h>
-#ifndef DOS
-#include <pwd.h>
-#endif /* DOS */
-
-#if defined(MACOSX) || defined(FREEBSD)
-#include <string.h>
-#include <unistd.h>
-#endif
-
-#include <errno.h>
 
 #include "emlglob.h"
 #include "address.h"
diff --git a/src/osmsg.c b/src/osmsg.c
index 147907b..f6ff8fb 100644
--- a/src/osmsg.c
+++ b/src/osmsg.c
@@ -22,12 +22,11 @@ static char *id = "$Id: osmsg.c,v 1.2 1999/01/03 02:07:29 sybalsky Exp $ Copyrig
 
 #ifndef DOS
 #include <pwd.h>
-
-#include <sys/types.h>
-#include <sys/select.h>
-#include <unistd.h>
 #include <sys/file.h>
+#include <sys/select.h>
 #include <sys/stat.h>
+#include <sys/types.h>
+#include <unistd.h>
 #ifndef AIX
 #include <sys/ioctl.h>
 #endif /* AIX */
@@ -39,9 +38,6 @@ static char *id = "$Id: osmsg.c,v 1.2 1999/01/03 02:07:29 sybalsky Exp $ Copyrig
 #endif /* FREEBSD */
 #endif /* MACOSX */
 #endif /* AIX */
-#ifndef SYSVONLY
-#include <strings.h>
-#endif /* SYSVONLY */
 #endif /* DOS */
 
 #include <setjmp.h>
diff --git a/src/ufs.c b/src/ufs.c
index fa5d21b..4c835c7 100644
--- a/src/ufs.c
+++ b/src/ufs.c
@@ -10,47 +10,24 @@ static char *id = "$Id: ufs.c,v 1.2 1999/01/03 02:07:41 sybalsky Exp $ Copyright
 
 #include "version.h"
 
-#include <sys/types.h>
-#ifndef DOS
-#include <sys/param.h>
-#if defined(SYSVONLY) || defined(MACOSX) || defined(FREEBSD)
-#include <string.h>
-#else
-#include <strings.h>
-#endif /* SYSVONLY */
-
-#include <sys/file.h>
-#ifndef OS5
-#ifndef FREEBSD
-#include <sys/dir.h>
-#endif
-#endif
-
-#include <sys/stat.h>
-#include <sys/time.h>
-#ifndef AIX
-#ifndef MACOSX
-#ifndef FREEBSD
-#include <sys/vfs.h>
-#endif /* FREEBSD */
-#endif /* MACOSX */
-#endif /* AIX */
-
-#if defined(SYSVONLY) || defined(FREEBSD) || defined(OS5)
-#include <dirent.h>
-#include <unistd.h>
-#endif /* SYSVONLY | FREEBSD */
-
-#include <pwd.h>
-#else /* DOS */
-#include <sys/stat.h>
-#include <unistd.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <setjmp.h>
+#include <stdio.h>
 #include <stdlib.h>
-#include <dos.h>
 #include <string.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <unistd.h>
 
+#ifndef DOS
+#include <dirent.h>
+#include <pwd.h>
+#include <sys/param.h>
+#include <sys/time.h>
+#else /* DOS */
+#include <dos.h>
 #include <i32.h> /* "#pragma interrupt" & '_chain_intr'*/
-#include <sys\types.h>
 #include <io.h>
 #include <stk.h> /* _XSTACK struct definition          */
 
@@ -61,11 +38,6 @@ static char *id = "$Id: ufs.c,v 1.2 1999/01/03 02:07:41 sybalsky Exp $ Copyright
 #define alarm(x) 1
 #endif /* DOS */
 
-#include <setjmp.h>
-#include <fcntl.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <errno.h>
 #include "lispemul.h"
 #include "lispmap.h"
 #include "adr68k.h"
diff --git a/src/unixcomm.c b/src/unixcomm.c
index 753d5a0..def34e6 100644
--- a/src/unixcomm.c
+++ b/src/unixcomm.c
@@ -7,6 +7,9 @@ Unix Interface Communications
 
 */
 
+// Don't compile this at all under DOS.
+#ifndef DOS
+
 /************************************************************************/
 /*									*/
 /*	(C) Copyright 1989-1995 by Venue. All Rights Reserved.		*/
@@ -17,47 +20,36 @@ Unix Interface Communications
 #include "version.h"
 
 #include "lispemul.h"
-#ifndef DOS
+
 
 /* FULLSLAVENAME => use a full file name for slave PTY */
 #ifdef OS5
 #define FULLSLAVENAME
 #endif /* OS5 */
 
-/* JRB - timeout.h needs setjmp.h */
-#include <sys/ioctl.h>
-#include <setjmp.h>
-#include "timeout.h"
+#include <errno.h>
+#include <fcntl.h>
+#include <setjmp.h> /* JRB - timeout.h needs setjmp.h */
+#include <signal.h>
 #include <stdio.h>
-#include <string.h> /* for strcpy etc. */
+#include <string.h>
+#include <sys/file.h>
+#include <sys/ioctl.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/un.h>
+#include <sys/wait.h>
+#include <unistd.h>
+
+
 #ifdef OS4
 #include <sys/termios.h>
-#elif LINUX
-#include <termios.h>
-/* this was called termio in the past, but no longer
- * see https://man7.org/linux/man-pages/man7/termio.7.html
- */
-#elif MACOSX
-#include <termios.h>
-#elif FREEBSD
-#include <termios.h>
-#else
+#elif OS5
 #include <sys/termio.h>
+#else
+#include <termios.h>
 #endif /* OS4 */
 
-#include <sys/types.h>
-#include <sys/file.h>
-#include <signal.h>
-#include <sys/wait.h>
-#include <errno.h>
-#include <sys/socket.h>
-#include <fcntl.h>
-#include <sys/un.h>
-
-#if defined(SYSVONLY) || defined(FREEBSD) || defined(OS5) || defined(MACOSX)
-#include <unistd.h>
-#endif
-
 #ifdef sun
 /* to get S_IFIFO defn for creating fifos */
 #include <sys/stat.h>
@@ -73,6 +65,7 @@ Unix Interface Communications
 #include "stack.h"
 #include "arith.h"
 #include "dbprint.h"
+#include "timeout.h"
 
 #include "unixcommdefs.h"
 #include "byteswapdefs.h"
diff --git a/src/uraid.c b/src/uraid.c
index a224efb..8d6e191 100644
--- a/src/uraid.c
+++ b/src/uraid.c
@@ -20,11 +20,13 @@ static char *id = "@(#) uraid.c 1.52 4/23/92            (Venue & Fuji Xerox)";
 /************************************************************************/
 /************************************************************************/
 
+#include <fcntl.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
+#include <sys/types.h>
 #include <unistd.h>
 
-#include <sys/types.h>
 #ifndef DOS
 #include <sys/file.h>
 #include <sys/param.h>
@@ -32,7 +34,7 @@ static char *id = "@(#) uraid.c 1.52 4/23/92            (Venue & Fuji Xerox)";
 #include <sys/wait.h>
 #include <sys/select.h>
 #endif /* DOS */
-#include <fcntl.h>
+
 #ifndef XWINDOW
 #ifdef SUNDISPLAY
 #include <sundev/kbd.h>
@@ -56,9 +58,8 @@ extern int Win_security_p;
 #ifdef OS5
 #include <stropts.h>
 #endif /* OS5 */
+
 #if defined(FREEBSD) || defined(MACOSX) || defined(OS5)
-/* for memset */
-#include <string.h>
 /* vfork is deprecated */
 #define vfork fork
 #endif
diff --git a/src/uutils.c b/src/uutils.c
index 11de73f..e3ee3a1 100644
--- a/src/uutils.c
+++ b/src/uutils.c
@@ -19,19 +19,16 @@ static char *id = "$Id: uutils.c,v 1.3 1999/05/31 23:35:47 sybalsky Exp $ Copyri
 /*									*/
 /************************************************************************/
 
+#include <signal.h>
+#include <stdio.h>
+#include <string.h>
+#include <time.h>
+#include <unistd.h>
+
 #ifndef DOS
 #include <pwd.h>
 #endif
-#include <signal.h>
-#ifdef DOS
-#include <time.h>
-#else
-#include <sys/time.h>
-#endif
 
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
 #include "lispemul.h"
 #include "adr68k.h"
 #include "lsptypes.h"
diff --git a/src/vmemsave.c b/src/vmemsave.c
index d60be53..dceefbb 100644
--- a/src/vmemsave.c
+++ b/src/vmemsave.c
@@ -17,43 +17,26 @@ static char *id = "$Id: vmemsave.c,v 1.2 1999/01/03 02:07:45 sybalsky Exp $ Copy
 *
 */
 
-#include <stdio.h>
-#include <sys/types.h>
-#ifndef DOS
-#include <sys/file.h>
-#endif /* DOS */
-#include <sys/stat.h>
-#ifndef DOS
-#include <sys/param.h>
-#ifndef AIX
-#ifndef MACOSX
-#ifndef FREEBSD
-#include <sys/vfs.h>
-#endif /* FREEBSD */
-#endif /* MACOSX */
-#endif /* AIX */
-
-#include <pwd.h>
-#endif /* DOS */
 #include <errno.h>
-#include <signal.h>
-#include <setjmp.h>
-
-#if defined(SYSVONLY) || defined(MACOSX) || defined(FREEBSD) || defined(OS5)
-#include <sys/fcntl.h>
-#include <dirent.h>
-#include <unistd.h>
-#include <string.h>
-#elif DOS
-#include <direct.h>
 #include <fcntl.h>
+#include <setjmp.h>
+#include <signal.h>
+#include <stdio.h>
+
+#ifndef DOS
+#include <dirent.h>
+#include <string.h>
+#include <sys/param.h>
+#include <sys/stat.h>
+#include <pwd.h>
+#include <unistd.h>
+#else
+#include <direct.h>
 #include <stdlib.h>
 #define MAXPATHLEN _MAX_PATH
 #define MAXNAMLEN _MAX_PATH
 #define alarm(x) 1
-#else
-#include <sys/dir.h>
-#endif /* SYSVONLY, DOS */
+#endif /* DOS */
 
 #ifndef NOPIXRECT
 #include <sunwindow/win_cursor.h>
diff --git a/src/xc.c b/src/xc.c
index 0d1ac4e..e25a45c 100644
--- a/src/xc.c
+++ b/src/xc.c
@@ -21,7 +21,9 @@ static char *id = "$Id: xc.c,v 1.4 2001/12/26 22:17:06 sybalsky Exp $ Copyright
 /*									*/
 /************************************************************************/
 
+#include <stdio.h>
 #include <sys/types.h>
+
 #ifdef DOS
 #include <i32.h> /* Defines "#pragma interrupt"  */
 #include <stk.h> /* _XSTACK struct definition    */
@@ -29,7 +31,6 @@ static char *id = "$Id: xc.c,v 1.4 2001/12/26 22:17:06 sybalsky Exp $ Copyright
 #else            /* DOS */
 #include <sys/time.h>
 #endif /* DOS */
-#include <stdio.h>
 
 #include "lispemul.h"
 #include "emlglob.h"
diff --git a/src/xcursor.c b/src/xcursor.c
index 04e3739..4938fae 100644
--- a/src/xcursor.c
+++ b/src/xcursor.c
@@ -13,11 +13,7 @@ static char *id = "$Id: xcursor.c,v 1.4 2001/12/26 22:17:06 sybalsky Exp $ Copyr
 #include "version.h"
 
 #include <stdio.h>
-#if defined(MACOSX) || defined(FREEBSD)
 #include <stdlib.h>
-#else
-#include <malloc.h>
-#endif
 
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>