*** vfs/local.c.orig	Thu Jun 19 23:25:13 1997
--- vfs/local.c	Thu Jun 19 23:25:53 1997
***************
*** 1,7 ****
  #include <config.h>
  #include <errno.h>
  #include <sys/types.h>
! #include <malloc.h>
  #include <unistd.h>
  #include <stdio.h>
  #include <string.h>
--- 1,7 ----
  #include <config.h>
  #include <errno.h>
  #include <sys/types.h>
! #include <stdlib.h>
  #include <unistd.h>
  #include <stdio.h>
  #include <string.h>
*** vfs/vfs.c.orig	Thu Jun 19 23:25:45 1997
--- vfs/vfs.c	Thu Jun 19 23:27:37 1997
***************
*** 25,31 ****
  #include <string.h>
  #include <errno.h>
  #include <sys/types.h>
! #include <malloc.h>
  #include <fcntl.h>
  #include <signal.h>
  #ifdef SCO_FLAVOR
--- 25,31 ----
  #include <string.h>
  #include <errno.h>
  #include <sys/types.h>
! /* #include <malloc.h> */
  #include <fcntl.h>
  #include <signal.h>
  #ifdef SCO_FLAVOR
*** vfs/tcputil.c.orig	Thu Jun 19 23:25:27 1997
--- vfs/tcputil.c	Thu Jun 19 23:26:31 1997
***************
*** 28,34 ****
  #include <sys/socket.h>
  #include <netinet/in.h>
  #include <arpa/inet.h>
! #include <malloc.h>
  
  #ifdef HAVE_PMAP_SET
  #include <rpc/rpc.h>
--- 28,34 ----
  #include <sys/socket.h>
  #include <netinet/in.h>
  #include <arpa/inet.h>
! /* #include <malloc.h> */
  
  #ifdef HAVE_PMAP_SET
  #include <rpc/rpc.h>
*** vfs/utilvfs.c.orig	Thu Jun 19 23:29:28 1997
--- vfs/utilvfs.c	Thu Jun 19 23:27:22 1997
***************
*** 32,38 ****
  #include <sys/socket.h>
  #include <netinet/in.h>
  #include <arpa/inet.h>
! #include <malloc.h>
  #ifdef USE_TERMNET
  #include <termnet.h>
  #endif
--- 32,38 ----
  #include <sys/socket.h>
  #include <netinet/in.h>
  #include <arpa/inet.h>
! /* #include <malloc.h> */
  #ifdef USE_TERMNET
  #include <termnet.h>
  #endif
*** src/key.c.orig	Thu Jun 19 23:31:27 1997
--- src/key.c	Thu Jun 19 23:36:48 1997
***************
*** 38,44 ****
  #include "tty.h"
  #include <ctype.h>
  #include <errno.h>
! #include <malloc.h> 
  #include "util.h"		/* For xmalloc prototype */
  #include "mad.h"		/* The memory debugger */
  #include "global.h"
--- 38,44 ----
  #include "tty.h"
  #include <ctype.h>
  #include <errno.h>
! #include <stdlib.h> 
  #include "util.h"		/* For xmalloc prototype */
  #include "mad.h"		/* The memory debugger */
  #include "global.h"
*** src/menu.c.orig	Thu Jun 19 23:31:33 1997
--- src/menu.c	Thu Jun 19 23:37:01 1997
***************
*** 21,27 ****
  #include <stdarg.h>
  #include <sys/types.h>
  #include <ctype.h>
! #include <malloc.h>
  #include "mad.h"
  #include "util.h"
  #include "menu.h"
--- 21,27 ----
  #include <stdarg.h>
  #include <sys/types.h>
  #include <ctype.h>
! #include <stdlib.h>
  #include "mad.h"
  #include "util.h"
  #include "menu.h"
*** src/file.c.orig	Thu Jun 19 23:31:06 1997
--- src/file.c	Thu Jun 19 23:35:43 1997
***************
*** 68,74 ****
  #include <errno.h>
  #include "tty.h"
  #include <ctype.h>
! #include <malloc.h>
  #include <string.h>
  #ifdef HAVE_UNISTD_H
  #   include <unistd.h>
--- 68,74 ----
  #include <errno.h>
  #include "tty.h"
  #include <ctype.h>
! #include <stdlib.h>
  #include <string.h>
  #ifdef HAVE_UNISTD_H
  #   include <unistd.h>
*** src/help.c.orig	Thu Jun 19 23:31:18 1997
--- src/help.c	Thu Jun 19 23:36:21 1997
***************
*** 41,47 ****
  #include <stdio.h>
  #include <sys/types.h>
  #include <sys/stat.h>
! #include <malloc.h>
  #include <errno.h>
  #include "mad.h"
  #include "color.h"
--- 41,47 ----
  #include <stdio.h>
  #include <sys/types.h>
  #include <sys/stat.h>
! #include <stdlib.h>
  #include <errno.h>
  #include "mad.h"
  #include "color.h"
*** src/find.c.orig	Thu Jun 19 23:31:11 1997
--- src/find.c	Thu Jun 19 23:36:05 1997
***************
*** 27,33 ****
  #    include <direct.h>
  #endif
  
! #include <malloc.h>	/* For free() */
  #include <sys/types.h>
  #ifdef HAVE_UNISTD_H
  #   include <unistd.h>
--- 27,33 ----
  #    include <direct.h>
  #endif
  
! #include <stdlib.h>	/* For free() */
  #include <sys/types.h>
  #ifdef HAVE_UNISTD_H
  #   include <unistd.h>
*** src/view.c.orig	Thu Jun 19 23:31:42 1997
--- src/view.c	Thu Jun 19 23:37:30 1997
***************
*** 42,48 ****
  #include <unistd.h>
  #include <ctype.h>	/* For toupper() */
  #include <stdlib.h>	/* atoi() */
! #include <malloc.h>
  #include <errno.h>
  #include <limits.h>
  #include <sys/param.h>
--- 42,48 ----
  #include <unistd.h>
  #include <ctype.h>	/* For toupper() */
  #include <stdlib.h>	/* atoi() */
! /* #include <malloc.h> */
  #include <errno.h>
  #include <limits.h>
  #include <sys/param.h>
*** src/ext.c.orig	Thu Jun 19 23:31:01 1997
--- src/ext.c	Thu Jun 19 23:34:41 1997
***************
*** 29,35 ****
  #include <unistd.h>
  #endif
  #include <fcntl.h>
! #include <malloc.h>
  #include <string.h>
  #include <errno.h>
  #include "mad.h"
--- 29,35 ----
  #include <unistd.h>
  #endif
  #include <fcntl.h>
! #include <stdlib.h>
  #include <string.h>
  #include <errno.h>
  #include "mad.h"
*** src/mouse.c.orig	Thu Jun 19 23:31:38 1997
--- src/mouse.c	Thu Jun 19 23:37:14 1997
***************
*** 30,36 ****
  #if (!defined(__IBMC__) && !defined(__IBMCPP__))
  #    include <termios.h>
  #endif
! #include <malloc.h>
  #include <stdio.h>
  
  #include "mad.h"
--- 30,36 ----
  #if (!defined(__IBMC__) && !defined(__IBMCPP__))
  #    include <termios.h>
  #endif
! #include <stdlib.h>
  #include <stdio.h>
  
  #include "mad.h"
*** src/widget.c.orig	Thu Jun 19 23:31:50 1997
--- src/widget.c	Thu Jun 19 23:37:42 1997
***************
*** 27,33 ****
  #include <config.h>
  #include <string.h>
  #include <stdio.h>
! #include <malloc.h>
  #include "tty.h"
  #include <ctype.h>
  #include "mad.h"
--- 27,33 ----
  #include <config.h>
  #include <string.h>
  #include <stdio.h>
! #include <stdlib.h>
  #include "tty.h"
  #include <ctype.h>
  #include "mad.h"
*** src/wtools.c.orig	Thu Jun 19 23:31:57 1997
--- src/wtools.c	Thu Jun 19 23:37:53 1997
***************
*** 34,40 ****
  #include <config.h>
  #include <string.h>
  #include <stdio.h>
! #include <malloc.h>
  #include "tty.h"
  #include <stdarg.h>
  #include "mad.h"
--- 34,40 ----
  #include <config.h>
  #include <string.h>
  #include <stdio.h>
! #include <stdlib.h>
  #include "tty.h"
  #include <stdarg.h>
  #include "mad.h"
*** src/info.c.orig	Thu Jun 19 23:31:21 1997
--- src/info.c	Thu Jun 19 23:36:33 1997
***************
*** 21,27 ****
  #include <sys/types.h>
  #include <sys/stat.h>
  #include <sys/param.h>
! #include <malloc.h>
  #include "mad.h"
  #include "util.h"		/* statfs calls */
  #include "mouse.h"		/* Gpm_Event */
--- 21,27 ----
  #include <sys/types.h>
  #include <sys/stat.h>
  #include <sys/param.h>
! #include <stdlib.h>
  #include "mad.h"
  #include "util.h"		/* statfs calls */
  #include "mouse.h"		/* Gpm_Event */
*** src/boxes.c.orig	Thu Jun 19 23:30:20 1997
--- src/boxes.c	Thu Jun 19 23:32:23 1997
***************
*** 26,32 ****
  #include <sys/types.h>
  #include <sys/stat.h>
  #include <sys/param.h>
! #include <malloc.h>
  #include <signal.h>
  #include "global.h"
  #include "mad.h"		/* The great mad */
--- 26,32 ----
  #include <sys/types.h>
  #include <sys/stat.h>
  #include <sys/param.h>
! #include <stdlib.h>
  #include <signal.h>
  #include "global.h"
  #include "mad.h"		/* The great mad */
*** src/complete.c.orig	Thu Jun 19 23:30:35 1997
--- src/complete.c	Thu Jun 19 23:33:43 1997
***************
*** 24,30 ****
  #include <stdio.h>
  #include <stdlib.h>
  #include <string.h>
! #include <malloc.h>
  #ifdef HAVE_UNISTD_H
  #   include <unistd.h>
  #endif
--- 24,30 ----
  #include <stdio.h>
  #include <stdlib.h>
  #include <string.h>
! /* #include <malloc.h> */
  #ifdef HAVE_UNISTD_H
  #   include <unistd.h>
  #endif
*** src/command.c.orig	Thu Jun 19 23:30:26 1997
--- src/command.c	Thu Jun 19 23:33:30 1997
***************
*** 25,31 ****
  #include <errno.h>
  #include "tty.h"
  #include "fs.h"
! #include <malloc.h>
  #include <string.h>
  #include <stdlib.h>
  #include "mad.h"
--- 25,31 ----
  #include <errno.h>
  #include "tty.h"
  #include "fs.h"
! /* #include <malloc.h> */
  #include <string.h>
  #include <stdlib.h>
  #include "mad.h"
*** src/cmd.c.orig	Thu Jun 19 23:32:40 1997
--- src/cmd.c	Thu Jun 19 23:33:08 1997
***************
*** 34,40 ****
  #include <sys/param.h>
  #include <sys/stat.h>
  #include <sys/time.h>
! #include <malloc.h>
  #include <string.h>
  #include <fcntl.h>		/* open, O_RDWR */
  #include <errno.h>
--- 34,40 ----
  #include <sys/param.h>
  #include <sys/stat.h>
  #include <sys/time.h>
! /* #include <malloc.h> */
  #include <string.h>
  #include <fcntl.h>		/* open, O_RDWR */
  #include <errno.h>