--- faces/compface/uncmain.c.misc-fixes	1991-10-23 22:28:07.000000000 -0400
+++ faces/compface/uncmain.c	2002-11-15 15:20:42.000000000 -0500
@@ -16,6 +16,7 @@
  */
 
 #include <fcntl.h>
+#include <unistd.h>
 #include "compface.h"
 
 /* the buffer is longer than needed to handle sparse input formats */
--- faces/compface/compface.h.misc-fixes	1991-09-05 01:24:42.000000000 -0400
+++ faces/compface/compface.h	2002-11-15 15:20:15.000000000 -0500
@@ -13,7 +13,7 @@
  *  to me, then an attempt will be made to fix them.
  */
 
-#if defined(SYSV32) || defined(hpux)
+#if defined(SYSV32) || defined(hpux) || defined(__STDC__)
 #include <string.h>
 #else
 #include <strings.h>
--- faces/compface/cmain.c.misc-fixes	1991-10-23 22:28:07.000000000 -0400
+++ faces/compface/cmain.c	2002-11-15 15:21:21.000000000 -0500
@@ -16,6 +16,7 @@
  */
 
 #include <fcntl.h>
+#include <unistd.h>
 #include "compface.h"
 
 /* the buffer is longer than needed to handle sparse input formats */
--- faces/filters/rs2icon.c.misc-fixes	1991-04-14 23:40:03.000000000 -0400
+++ faces/filters/rs2icon.c	2002-11-15 15:12:54.000000000 -0500
@@ -21,11 +21,8 @@
  */
 
 #include <stdio.h>
-#ifdef SYSV32 || hpux
+#include <stdlib.h>
 #include <string.h>
-#else
-#include <strings.h>
-#endif /* SYSV32 || hpux */
 
 #define  PATCHLEVEL  2
 
@@ -55,20 +52,25 @@ char progname[MAXLINE] ;          /* The
 int x ;                           /* X displacement for start of extraction. */
 int y ;                           /* Y displacement for start of extraction. */
 
-main(argc, argv)
-int argc ;
-char *argv[] ;
+void get_options(int argc, char *argv[]);
+void read_raster(void);
+void make_icon(void);
+
+int
+main(int argc, char **argv)
 {
   STRCPY(progname, argv[0]) ;    /* Save program name for later use. */
   get_options(argc, argv) ;      /* Extract command line options. */
   read_raster() ;                /* Read rasterfile to internal buffer. */
   make_icon() ;                  /* Turn rasterfile portion into an icon. */
+  return 0;
 }
 
 
-get_options(argc, argv)          /* Extract command line options. */
-int argc ;
-char *argv[] ;
+void
+get_options(int argc, char **argv)          /* Extract command line options. */
+          
+              
 {
   x = 0 ;                        /* Default is no x displacement. */
   y = 0 ;                        /* Default is no y displacement. */
@@ -98,8 +100,8 @@ char *argv[] ;
     }
 }
 
-
-make_icon()        /* Create icon from rasterfile on standard output. */
+void
+make_icon(void)        /* Create icon from rasterfile on standard output. */
 {
   unsigned char line[8] ;   /* 64 bits of the current line of the rasterfile. */
   int i, j, k, n, val ;
@@ -123,7 +125,8 @@ make_icon()        /* Create icon from r
     }
 }
 
-read_raster()                    /* Read rasterfile into internal buffer. */
+void
+read_raster(void)                    /* Read rasterfile into internal buffer. */
 {
   int i, j ;
   int height, len ;
--- faces/filters/ikon2icon.c.misc-fixes	1991-04-14 23:40:02.000000000 -0400
+++ faces/filters/ikon2icon.c	2002-11-15 15:18:31.000000000 -0500
@@ -15,6 +15,7 @@
  */
 
 #include <stdio.h>
+#include <string.h>
 
 #define  PATCHLEVEL  1
 
@@ -30,17 +31,20 @@
 #define  BLITHEIGHT  48       /* Maximum number of lines in a blit icon. */
 #define  MAXLINE     80       /* Maximum length for character strings. */
 
-char *index() ;
+void read_blit(void);
+void make_icon(void);
 unsigned char buf[6][48] ;    /* Buffer for blit icon info. */
 
-main()
+int
+main(void)
 {
   read_blit() ;      /* Read blit info to internal buffer. */
   make_icon() ;      /* Turn into Sun icon format. */
+  return 0;
 }
 
-
-make_icon()        /* Create Sun icon on standard output. */
+void
+make_icon(void)        /* Create Sun icon on standard output. */
 {
   int i, j ;
 
@@ -58,7 +62,8 @@ make_icon()        /* Create Sun icon on
     PRINTF("\t0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,\n") ;
 }
 
-read_blit()                         /* Read rasterfile into internal buffer. */
+void
+read_blit(void)                         /* Read rasterfile into internal buffer. */
 {
   char nextline[MAXLINE], *ptr ;    /* Next line from blit icon file. */
   int i, j, v0, v1 ;
--- faces/filters/icon2ikon.c.misc-fixes	1991-10-23 22:26:15.000000000 -0400
+++ faces/filters/icon2ikon.c	2002-11-15 15:18:21.000000000 -0500
@@ -17,11 +17,7 @@
  */
 
 #include <stdio.h>
-#if defined(SYSV32) || defined(hpux)
 #include <string.h>
-#else
-#include <strings.h>
-#endif /* SYSV32 || hpux */
 
 #define  PATCHLEVEL  2
 
@@ -36,8 +32,11 @@
 char progname[MAXLINE] ;    /* The name of this program. */
 unsigned short buf[256] ;   /* Buffer for Sun icon info. */
 
+int get_sun_icon(unsigned short buf[]);
+void make_blit_ikon(void);
 
 /*ARGSUSED*/
+int
 main(argc, argv)
 int argc ;
 char *argv[] ;
@@ -45,9 +44,10 @@ char *argv[] ;
   STRCPY(progname, argv[0]) ;   /* Save for later use. */
   if (!get_sun_icon(buf))       /* Read Sun icon into internal buffer. */
     make_blit_ikon() ;          /* Turn into Blit ikon format. */
+  return 0;
 }
 
-
+int
 get_sun_icon(buf)     /* Load Sun icon file. */
 unsigned short buf[256] ;
 {
@@ -113,7 +113,7 @@ unsigned short buf[256] ;
   return(0) ;
 }
 
-
+void
 make_blit_ikon()        /* Create Blit ikon on standard output. */
 {
   int i ;
--- faces/get.c.misc-fixes	1991-11-18 23:00:46.000000000 -0500
+++ faces/get.c	2002-11-15 15:28:49.000000000 -0500
@@ -15,11 +15,13 @@
  */
 
 #include <stdio.h>
-#if SYSV32 || hpux
+#include <stdlib.h>
+#if SYSV32 || hpux || __STDC__
 #include <string.h>
 #else
 #include <strings.h>
 #endif /* SYSV32 || hpux */
+#include <unistd.h>
 #include <pwd.h>
 #include <ctype.h>
 #include <sys/param.h>
@@ -637,7 +639,7 @@ write_cmdline()
 {
   char line[MAXPATHLEN] ;
 
-  line[0] = NULL ;
+  line[0] = '\0' ;
 
 #ifdef AUDIO_SUPPORT
   cmdbool(do_audio,  line, " -A ") ;           /* Enable audio support. */
--- faces/main.c.misc-fixes	2002-11-15 14:53:37.000000000 -0500
+++ faces/main.c	2002-11-15 15:31:42.000000000 -0500
@@ -17,7 +17,9 @@
  */
 
 #include <stdio.h>
-#if SYSV32 || hpux
+#include <stdlib.h>
+#include <unistd.h>
+#if SYSV32 || hpux || __STDC__
 #include <string.h>
 #else
 #include <strings.h>
@@ -806,7 +808,7 @@ char *b, *facepath[MAXPATHS+1], *communi
   STRCAT(strcat(t, "/"), user) ;
   for (id = 0; !i && facepath[id] != NULL; id++)
     {
-      char *temp[MAXPATHLEN] ;
+      char temp[MAXPATHLEN] ;
 
       STRCAT(strcpy(temp, facepath[id]), b) ;
       IF_DEBUG( FPRINTF(stderr, "\ttrying %s\n", temp) ; )
--- faces/mon.c.misc-fixes	1991-11-18 23:00:48.000000000 -0500
+++ faces/mon.c	2002-11-15 15:23:41.000000000 -0500
@@ -16,7 +16,7 @@
 
 #include <stdio.h>
 #include <ctype.h>
-#if SYSV32 || hpux
+#if SYSV32 || hpux || __STDC__
 #include <string.h>
 #else
 #include <strings.h>
--- faces/parsefrom.c.misc-fixes	1991-06-30 21:25:49.000000000 -0400
+++ faces/parsefrom.c	2002-11-15 15:23:52.000000000 -0500
@@ -15,7 +15,7 @@
  */
 
 #include <stdio.h>
-#if SYSV32 || hpux
+#if SYSV32 || hpux || __STDC__
 #include <string.h>
 #else
 #include <strings.h>
--- faces/rec.c.misc-fixes	1991-10-23 22:24:19.000000000 -0400
+++ faces/rec.c	2002-11-15 15:24:13.000000000 -0500
@@ -15,7 +15,7 @@
  */
 
 #include <stdio.h>
-#if defined(SYSV32) || defined(hpux)
+#if defined(SYSV32) || defined(hpux) || defined(__STDC__)
 #include <string.h>
 #else
 #include <strings.h>
--- faces/addr.h.misc-fixes	1991-06-30 21:25:44.000000000 -0400
+++ faces/addr.h	2002-11-15 15:26:41.000000000 -0500
@@ -58,9 +58,6 @@ extern Dom	*newDom();		/* Create a new d
 extern Addr	*adrlist;
 extern Addr	*errlist;
 static char	*Amalloc();
-extern char	*strcpy();
-extern char	*strncpy();
-extern char	*strcat();
 
 /* SHUT UP! */
 #define Strcpy		(void)strcpy
--- faces/x11.c.misc-fixes	1991-11-18 23:00:50.000000000 -0500
+++ faces/x11.c	2002-11-15 15:36:30.000000000 -0500
@@ -17,6 +17,9 @@
  */
  
 #include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
 #include <ctype.h>
 #if ( !defined(mips) && !defined(TOPIX) ) || defined(ultrix)
 #include <sys/types.h>