diff --git a/inc/version.h b/inc/version.h
index 2905050..b051107 100755
--- a/inc/version.h
+++ b/inc/version.h
@@ -396,6 +396,30 @@ typedef signed char s_char;
 
 
 
+/********************************************************/
+/*							*/
+/********************************************************/
+#ifdef MACOSX
+/* MACOSX, mostly POSIX-compliant Unix */
+#define NOETHER 1
+#define XWINDOWS 1
+/* JDS trial 12/22/01 #define USETIMEFN 1 */
+
+#undef REGISTER
+#define REGISTER
+
+typedef signed char s_char;
+
+#undef UNALIGNED_FETCH_OK
+
+#define MAXNAMLEN NAME_MAX
+
+#endif /* MACOSX */
+
+
+
+
+
 
 	/********************************************************/
 	/*							*/
diff --git a/src/bbtsub.c b/src/bbtsub.c
index 6d27ac9..a15cb24 100755
--- a/src/bbtsub.c
+++ b/src/bbtsub.c
@@ -84,7 +84,7 @@ extern IOPAGE *IOPage68K;
 
 #ifdef AIX
 #include <sys/types.h>
-#ifndef LINUX					/* LINUX has no macros.h */
+#if !defined(LINUX) && !defined(MACOSX)					/* LINUX and MACOSX have no macros.h */
 #include <macros.h>
 #endif /* LINUX */
 #endif /* AIX */
diff --git a/src/common.c b/src/common.c
index 851638b..c8e7d8d 100755
--- a/src/common.c
+++ b/src/common.c
@@ -21,6 +21,7 @@ static char *id = "$Id: common.c,v 1.2 1999/01/03 02:06:52 sybalsky Exp $ Copyri
 #include	<stdio.h>
 #include  <setjmp.h>
 #include  <fcntl.h>
+#include <string.h> /* for memset */
 #include "lispemul.h"
 #include "lispmap.h"
 #include "adr68k.h"
diff --git a/src/dsk.c b/src/dsk.c
index f8705a9..042edae 100755
--- a/src/dsk.c
+++ b/src/dsk.c
@@ -111,7 +111,7 @@ static char *id = "$Id: dsk.c,v 1.4 2001/12/24 01:09:01 sybalsky Exp $ Copyright
 #include	"osmsg.h"
 #include	"dbprint.h"
 
-#ifdef ULTRIX 
+#if defined(ULTRIX) || defined(MACOSX) 
 #include	<sys/mount.h>
 #elif OSF1
 #include	<sys/mount.h>
diff --git a/src/ejlisp.c b/src/ejlisp.c
index ad1b411..6a1cf22 100755
--- a/src/ejlisp.c
+++ b/src/ejlisp.c
@@ -772,7 +772,7 @@ int	dic_no_array[TABLE_MAX];
 			printf("dic_no_array = %d,dic_name_len_array = %d,dic_name_array = %s\n",dic_no_array[i],dic_name_len_array[i],&dic_name_array[i][0]);
 		}
 	}
-	printf("wnn_errorno = %d,wnn_errorno);
+	printf("wnn_errorno = %d", wnn_errorno);
 #endif
 
 	return (wnn_errorno) ;
diff --git a/src/gcmain3.c b/src/gcmain3.c
index a46c86a..66bae0c 100755
--- a/src/gcmain3.c
+++ b/src/gcmain3.c
@@ -44,6 +44,7 @@ static char *id = "$Id: gcmain3.c,v 1.4 1999/05/31 23:35:31 sybalsky Exp $ Copyr
 /*                                                               \Tomtom */
 /*************************************************************************/
 
+#include <stdio.h>  /* for sprintf */
 #include "lispemul.h"
 #include "lispmap.h"
 #include "lsptypes.h"
diff --git a/src/inet.c b/src/inet.c
index 46807f3..cf43510 100755
--- a/src/inet.c
+++ b/src/inet.c
@@ -22,6 +22,7 @@ static char *id = "$Id: inet.c,v 1.3 2001/12/24 01:09:03 sybalsky Exp $ Copyrigh
 
 #include <stdio.h>
 #include <ctype.h>
+#include <string.h> /* for mem... fns */
 #ifndef DOS
 #include <sys/types.h>
 #include <sys/file.h>
diff --git a/src/initdsp.c b/src/initdsp.c
index 779fe73..389ae8e 100755
--- a/src/initdsp.c
+++ b/src/initdsp.c
@@ -168,7 +168,7 @@ int Win_security_p;
 /*  Now takes 68k address, function renamed for safety  */
 
 init_display2(display_addr, display_max)
-  int   display_addr, display_max;
+  INT   display_addr, display_max;
   {
     int mmapstat;
     int fbgattr_result;
diff --git a/src/initsout.c b/src/initsout.c
index a6e54c9..ee10832 100755
--- a/src/initsout.c
+++ b/src/initsout.c
@@ -27,7 +27,11 @@ static char *id = "$Id: initsout.c,v 1.3 1999/05/31 23:35:34 sybalsky Exp $ Copy
 
 #include <stdio.h>
 #include <string.h>
+#ifdef MACOSX
+#include <stdlib.h>
+#else
 #include <malloc.h>
+#endif
 #ifndef DOS
 #include <pwd.h>
 #else
@@ -167,7 +171,12 @@ init_ifpage(int sysout_size)
     {struct passwd *pwd;
      char *s = (char*)Addr68k_from_LADDR(0155001);
 	/* try getpwuid first; use cuserid if it fails */
-	if((pwd = getpwuid(getuid())) == NULL) cuserid(s+1);
+	if((pwd = getpwuid(getuid())) == NULL)
+#ifdef MACOSX
+        ;
+#else
+        cuserid(s+1);
+#endif
 	else strcpy(s+1, pwd->pw_name);
 	*s = (char)strlen(s+1);
     }
diff --git a/src/llstk.c b/src/llstk.c
index ef40df3..d2414e5 100755
--- a/src/llstk.c
+++ b/src/llstk.c
@@ -31,6 +31,7 @@ static char *id = "$Id: llstk.c,v 1.5 2001/12/26 22:17:03 sybalsky Exp $ Copyrig
 
 */
 /******************************************************************/
+#include <stdio.h>  /* for printf */
 #include "lispemul.h"
 #include "lispmap.h"
 #include "adr68k.h"
diff --git a/src/perrno.c b/src/perrno.c
index d7de6e4..36b0aba 100755
--- a/src/perrno.c
+++ b/src/perrno.c
@@ -24,6 +24,7 @@ static char *id = "$Id: perrno.c,v 1.4 2001/12/26 22:17:04 sybalsky Exp $ Copyri
 
 	
 #include	<stdio.h>
+#include	<errno.h>
 #include	"osmsg.h"
 
 
@@ -37,10 +38,15 @@ static char *id = "$Id: perrno.c,v 1.4 2001/12/26 22:17:04 sybalsky Exp $ Copyri
 /************************************************************************/
 
 extern int errno;
+#ifdef MACOSX
+extern const char * const sys_errlist[];
+extern const int sys_nerr;
+#else
 int sys_nerr;
 #ifndef LINUX
 extern char *sys_errlist[];
 #endif /* LINUX */
+#endif
 
 perrorn(char *s, int n)
 {
diff --git a/src/storage.c b/src/storage.c
index 7424455..c9f9d0b 100755
--- a/src/storage.c
+++ b/src/storage.c
@@ -26,7 +26,7 @@ static char *id = "$Id: storage.c,v 1.5 2001/12/26 22:17:04 sybalsky Exp $ Copyr
 
 */
 /*****************************************************************/
-
+#include <stdio.h>  /* for printf */
 #include "hdw_conf.h"
 #include "lispemul.h"
 #include "address.h"
diff --git a/src/unixcomm.c b/src/unixcomm.c
index abd2c23..9cb8c57 100755
--- a/src/unixcomm.c
+++ b/src/unixcomm.c
@@ -42,12 +42,15 @@ Unix Interface Communications
 #include <setjmp.h>
 #include "timeout.h"
 #include <stdio.h>
+#include <string.h> /* for strcpy etc. */
 #ifdef OS4
 #include <sys/termios.h>
 #elif APOLLO
 #include </sys5/usr/include/termios.h>
 #elif LINUX
 #include <termio.h>
+#elif MACOSX
+#include <termios.h>
 #else
 #include <sys/termio.h>
 #endif /* OS4 */
diff --git a/src/unixfork.c b/src/unixfork.c
index 63db261..02b30ee 100755
--- a/src/unixfork.c
+++ b/src/unixfork.c
@@ -48,7 +48,7 @@ static char *id = "$Id: unixfork.c,v 1.6 2001/12/26 22:17:05 sybalsky Exp $ Copy
 #ifndef USETERMIOS
 #include <sys/ioctl.h>
 #else
-#ifdef INDIGO
+#if defined(INDIGO) || defined(MACOSX)
 #include <termios.h>
 #else
 #include <sys/termios.h>
@@ -676,13 +676,21 @@ ForkUnixShell(slot, ltr, numb, termtype, shellarg)
 	   kill processing, echo, backspace to erase, echo ctrl
 	   chars as ^x, kill line by backspacing */
 
+#ifdef MACOSX
+	tcgetattr(SlaveFD, &tio);
+#else
 	ioctl(SlaveFD, TCGETS, (char *)&tio);
+#endif
 #ifdef INDIGO
 	tio.c_lflag |= ICANON | ECHO | ECHOE;
 #else
 	tio.c_lflag |= ICANON | ECHO | ECHOE | ECHOCTL | ECHOKE;
 #endif /* INDIGO */
+#ifdef MACOSX
+	tcsetattr(SlaveFD, TCSANOW, &tio);
+#else
 	ioctl(SlaveFD, TCSETS, (char *)&tio);
+#endif
 #endif /* USETERMIOS */
 
 	(void) dup2(SlaveFD, 0);
diff --git a/src/xcursor.c b/src/xcursor.c
index b7dd117..94c930d 100755
--- a/src/xcursor.c
+++ b/src/xcursor.c
@@ -21,7 +21,11 @@ static char *id = "$Id: xcursor.c,v 1.4 2001/12/26 22:17:06 sybalsky Exp $ Copyr
 
 
 #include <stdio.h>
+#ifdef MACOSX
+#include <stdlib.h>
+#else
 #include <malloc.h>
+#endif
 
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
diff --git a/src/xinit.c b/src/xinit.c
index f78b566..f7cb983 100755
--- a/src/xinit.c
+++ b/src/xinit.c
@@ -46,7 +46,9 @@ static char *id = "$Id: xinit.c,v 1.5 2001/12/26 22:17:06 sybalsky Exp $ Copyrig
 #ifndef HPUX
 #ifndef ULTRIX
 #ifndef LINUX
+#ifndef MACOSX
 #include <stropts.h>
+#endif /* MACOSX */
 #endif /* LINUX */
 #endif /* ULTRIX */
 #endif /* HPUX */