From 0bbd4ff9aa6be56a592e7d266b878f66e27b1afc Mon Sep 17 00:00:00 2001
From: Pascal Stumpf <Pascal.Stumpf@cubes.de>
Date: Sun, 12 Aug 2012 16:41:42 +0200
Subject: [PATCH] Get rid of malloc.h.

This is a non-POSIX/ISO-C header.  It is ok to include this on Linux, but it
is obsolete on BSD; FreeBSD even throws an error if you include it with
__STDC__ defined.  Every system should nowadays have malloc() defined in
stdlib.h.

Diff is largely mechanical, replacing malloc.h with stdlib.h where it is not
yet included anyway.
---
 cde/lib/DtHelp/GifUtils.c                             | 2 +-
 cde/lib/DtHelp/Graphics.c                             | 1 -
 cde/lib/DtHelp/JpegUtils.c                            | 2 +-
 cde/lib/DtHelp/il/ilhplrotation.c                     | 3 +--
 cde/lib/DtSvc/DtUtil1/DbReader.c                      | 2 +-
 cde/lib/DtSvc/DtUtil1/MMDb.c                          | 1 -
 cde/lib/DtSvc/DtUtil1/intarray.c                      | 2 +-
 cde/lib/DtSvc/DtUtil1/inttab.c                        | 1 -
 cde/lib/DtSvc/include/codelibs/stringx.h              | 2 +-
 cde/lib/csa/convert2-4.c                              | 1 -
 cde/lib/csa/convert3-4.c                              | 1 -
 cde/lib/csa/convert4-2.c                              | 1 -
 cde/lib/csa/convert4-3.c                              | 1 -
 cde/lib/pam/libpam/pam_framework.c                    | 2 +-
 cde/lib/pam/libpam/pam_framework_utils.c              | 2 +-
 cde/lib/tt/bin/tt_type_comp/frozen.mp_types_gram.C    | 1 -
 cde/lib/tt/demo/CoEd/libCoEd/CoEdFile.C               | 1 -
 cde/lib/tt/demo/CoEd/libCoEd/CoEdSiteID.C             | 2 +-
 cde/lib/tt/demo/CoEd/libCoEd/CoEdTextChange.C         | 1 -
 cde/lib/tt/demo/CoEd/libCoEd/SiteChange.C             | 2 +-
 cde/lib/tt/lib/api/c/api_storage.h                    | 1 -
 cde/lib/tt/lib/api/c/api_xdr.C                        | 5 +----
 cde/lib/tt/lib/api/dnd/ttdnd.c                        | 2 +-
 cde/lib/tt/lib/mp/mp_desktop.C                        | 2 +-
 cde/lib/tt/lib/mp/mp_mp.C                             | 2 +-
 cde/lib/tt/lib/util/frozen.tt_trace_gram.c            | 2 +-
 cde/lib/tt/lib/util/tt_new.C                          | 1 -
 cde/lib/tt/mini_isam/isalloc.c                        | 2 +-
 cde/programs/dtappbuilder/src/libAButil/abio.c        | 1 -
 cde/programs/dtcalc/calctool.c                        | 1 -
 cde/programs/dtcm/dtcm/props.c                        | 1 -
 cde/programs/dtcm/dtcm/props_pu.c                     | 1 -
 cde/programs/dtcm/libDtCmP/dtfns.c                    | 2 +-
 cde/programs/dtfile/HelpCB.c                          | 1 -
 cde/programs/dtfile/Main.c                            | 2 +-
 cde/programs/dtfile/SharedMsgs.c                      | 1 -
 cde/programs/dthelp/parser.ccdf/helpcomp/helpcomp.c   | 2 +-
 cde/programs/dthelp/parser.ccdf/htag/build/build.c    | 2 +-
 cde/programs/dthelp/parser.ccdf/htag/build/buildutl.c | 2 +-
 cde/programs/dthelp/parser.ccdf/htag/build/eltree.c   | 2 +-
 cde/programs/dthelp/parser.ccdf/htag/build/fsa.c      | 2 +-
 cde/programs/dthelp/parser.ccdf/htag/build/out.c      | 2 +-
 cde/programs/dthelp/parser.ccdf/htag/build/param.c    | 2 +-
 cde/programs/dthelp/parser.ccdf/htag/build/sref.c     | 2 +-
 cde/programs/dthelp/parser.ccdf/htag/build/tree.c     | 2 +-
 cde/programs/dthelp/parser.ccdf/htag/eltdef/eltdef.c  | 2 +-
 cde/programs/dthelp/parser.ccdf/htag/eltdef/eltutil.c | 2 +-
 cde/programs/dthelp/parser.ccdf/htag/eltdef/entity.c  | 2 +-
 cde/programs/dthelp/parser.ccdf/htag/helptag/global.h | 5 ++---
 cde/programs/dthelp/parser.ccdf/htag/parser/actutil.c | 2 +-
 cde/programs/dthelp/parser.ccdf/htag/parser/delfree.c | 2 +-
 cde/programs/dthelp/parser.ccdf/htag/parser/entity.c  | 2 +-
 cde/programs/dthelp/parser.ccdf/htag/parser/error.c   | 2 +-
 cde/programs/dthelp/parser.ccdf/htag/parser/param.c   | 2 +-
 cde/programs/dthelp/parser.ccdf/htag/parser/parser.c  | 2 +-
 cde/programs/dthelp/parser.ccdf/htag/parser/parutil.c | 2 +-
 cde/programs/dthelp/parser.ccdf/htag/parser/scan.c    | 2 +-
 cde/programs/dthelp/parser.ccdf/htag/parser/struct.c  | 2 +-
 cde/programs/dthelp/parser.ccdf/htag/util/context.c   | 2 +-
 cde/programs/dthelp/parser.ccdf/htag/util/conutil.c   | 2 +-
 cde/programs/dthelp/parser.ccdf/htag/util/fclndir.c   | 2 +-
 cde/programs/dthelp/parser.ccdf/htag/util/malloc.c    | 2 +-
 cde/programs/dthelp/parser/canon1/build/build.c       | 2 +-
 cde/programs/dthelp/parser/canon1/build/buildutl.c    | 2 +-
 cde/programs/dthelp/parser/canon1/build/eltree.c      | 2 +-
 cde/programs/dthelp/parser/canon1/build/fsa.c         | 2 +-
 cde/programs/dthelp/parser/canon1/build/out.c         | 2 +-
 cde/programs/dthelp/parser/canon1/build/param.c       | 2 +-
 cde/programs/dthelp/parser/canon1/build/sref.c        | 2 +-
 cde/programs/dthelp/parser/canon1/build/tree.c        | 2 +-
 cde/programs/dthelp/parser/canon1/eltdef/eltdef.c     | 2 +-
 cde/programs/dthelp/parser/canon1/eltdef/eltutil.c    | 2 +-
 cde/programs/dthelp/parser/canon1/eltdef/entity.c     | 2 +-
 cde/programs/dthelp/parser/canon1/helptag/global.h    | 3 +--
 cde/programs/dthelp/parser/canon1/parser/actutil.c    | 2 +-
 cde/programs/dthelp/parser/canon1/parser/delfree.c    | 2 +-
 cde/programs/dthelp/parser/canon1/parser/entity.c     | 2 +-
 cde/programs/dthelp/parser/canon1/parser/error.c      | 2 +-
 cde/programs/dthelp/parser/canon1/parser/param.c      | 2 +-
 cde/programs/dthelp/parser/canon1/parser/parser.c     | 2 +-
 cde/programs/dthelp/parser/canon1/parser/parutil.c    | 2 +-
 cde/programs/dthelp/parser/canon1/parser/scan.c       | 2 +-
 cde/programs/dthelp/parser/canon1/parser/struct.c     | 2 +-
 cde/programs/dthelp/parser/canon1/util/context.c      | 2 +-
 cde/programs/dthelp/parser/canon1/util/conutil.c      | 2 +-
 cde/programs/dthelp/parser/canon1/util/fclndir.c      | 2 +-
 cde/programs/dthelp/parser/canon1/util/malloc.c       | 2 +-
 cde/programs/dthelp/parser/pass1/build/build.c        | 2 +-
 cde/programs/dthelp/parser/pass1/build/buildutl.c     | 2 +-
 cde/programs/dthelp/parser/pass1/build/eltree.c       | 2 +-
 cde/programs/dthelp/parser/pass1/build/fsa.c          | 2 +-
 cde/programs/dthelp/parser/pass1/build/out.c          | 2 +-
 cde/programs/dthelp/parser/pass1/build/param.c        | 2 +-
 cde/programs/dthelp/parser/pass1/build/sref.c         | 2 +-
 cde/programs/dthelp/parser/pass1/build/tree.c         | 2 +-
 cde/programs/dthelp/parser/pass1/eltdef/eltdef.c      | 2 +-
 cde/programs/dthelp/parser/pass1/eltdef/eltutil.c     | 2 +-
 cde/programs/dthelp/parser/pass1/eltdef/entity.c      | 2 +-
 cde/programs/dthelp/parser/pass1/helptag/global.h     | 3 +--
 cde/programs/dthelp/parser/pass1/parser/actutil.c     | 2 +-
 cde/programs/dthelp/parser/pass1/parser/delfree.c     | 2 +-
 cde/programs/dthelp/parser/pass1/parser/entity.c      | 2 +-
 cde/programs/dthelp/parser/pass1/parser/error.c       | 2 +-
 cde/programs/dthelp/parser/pass1/parser/param.c       | 2 +-
 cde/programs/dthelp/parser/pass1/parser/parser.c      | 2 +-
 cde/programs/dthelp/parser/pass1/parser/parutil.c     | 2 +-
 cde/programs/dthelp/parser/pass1/parser/scan.c        | 2 +-
 cde/programs/dthelp/parser/pass1/parser/struct.c      | 2 +-
 cde/programs/dthelp/parser/pass1/util/context.c       | 2 +-
 cde/programs/dthelp/parser/pass1/util/conutil.c       | 2 +-
 cde/programs/dthelp/parser/pass1/util/fclndir.c       | 2 +-
 cde/programs/dthelp/parser/pass1/util/malloc.c        | 2 +-
 cde/programs/dthelp/parser/pass2/build/build.c        | 2 +-
 cde/programs/dthelp/parser/pass2/build/buildutl.c     | 2 +-
 cde/programs/dthelp/parser/pass2/build/eltree.c       | 2 +-
 cde/programs/dthelp/parser/pass2/build/fsa.c          | 2 +-
 cde/programs/dthelp/parser/pass2/build/out.c          | 2 +-
 cde/programs/dthelp/parser/pass2/build/param.c        | 2 +-
 cde/programs/dthelp/parser/pass2/build/sref.c         | 2 +-
 cde/programs/dthelp/parser/pass2/build/tree.c         | 2 +-
 cde/programs/dthelp/parser/pass2/eltdef/eltdef.c      | 2 +-
 cde/programs/dthelp/parser/pass2/eltdef/eltutil.c     | 2 +-
 cde/programs/dthelp/parser/pass2/eltdef/entity.c      | 2 +-
 cde/programs/dthelp/parser/pass2/htag2/global.h       | 3 +--
 cde/programs/dthelp/parser/pass2/parser/actutil.c     | 2 +-
 cde/programs/dthelp/parser/pass2/parser/delfree.c     | 2 +-
 cde/programs/dthelp/parser/pass2/parser/entity.c      | 2 +-
 cde/programs/dthelp/parser/pass2/parser/error.c       | 2 +-
 cde/programs/dthelp/parser/pass2/parser/param.c       | 2 +-
 cde/programs/dthelp/parser/pass2/parser/parser.c      | 2 +-
 cde/programs/dthelp/parser/pass2/parser/parutil.c     | 2 +-
 cde/programs/dthelp/parser/pass2/parser/scan.c        | 2 +-
 cde/programs/dthelp/parser/pass2/parser/struct.c      | 2 +-
 cde/programs/dthelp/parser/pass2/util/context.c       | 2 +-
 cde/programs/dthelp/parser/pass2/util/conutil.c       | 2 +-
 cde/programs/dthelp/parser/pass2/util/fclndir.c       | 2 +-
 cde/programs/dthelp/parser/pass2/util/malloc.c        | 2 +-
 cde/programs/dtinfo/DtMmdb/dti_excs/Exceptions.hh     | 1 -
 cde/programs/dtinfo/dtinfo/src/Basic/ParseTree.C      | 2 +-
 cde/programs/dtinfo/dtinfo/src/cgm/cgm.h              | 2 +-
 cde/programs/dtinfo/dtinfo/src/external-api/comm.c    | 1 -
 cde/programs/dtksh/dtksh.c                            | 1 -
 cde/programs/dtksh/xmcmds.c                           | 2 +-
 cde/programs/dtmail/dtmail/MsgHndArray.hh             | 1 -
 cde/programs/dtmail/libDtMail/Common/Buffer.C         | 1 -
 cde/programs/dtmail/libDtMail/Common/Session.C        | 2 --
 146 files changed, 123 insertions(+), 156 deletions(-)

diff --git a/cde/lib/DtHelp/GifUtils.c b/cde/lib/DtHelp/GifUtils.c
index 4badc9a00..f0a78c44b 100644
--- a/cde/lib/DtHelp/GifUtils.c
+++ b/cde/lib/DtHelp/GifUtils.c
@@ -67,7 +67,7 @@
 /* include files */
 #include <stdio.h>
 #include <stdarg.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <string.h>
 #include <math.h>
 #include <assert.h>
diff --git a/cde/lib/DtHelp/Graphics.c b/cde/lib/DtHelp/Graphics.c
index 7f54109d5..7631c7669 100644
--- a/cde/lib/DtHelp/Graphics.c
+++ b/cde/lib/DtHelp/Graphics.c
@@ -85,7 +85,6 @@ static char rcs_id[]="$XConsortium: Graphics.c /main/23 1996/12/06 11:12:54 cde-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <malloc.h>
 #include <errno.h>
 #include <sys/stat.h>
 #include <X11/Xlib.h>
diff --git a/cde/lib/DtHelp/JpegUtils.c b/cde/lib/DtHelp/JpegUtils.c
index 9fd96c3d7..59ef9daef 100644
--- a/cde/lib/DtHelp/JpegUtils.c
+++ b/cde/lib/DtHelp/JpegUtils.c
@@ -42,7 +42,7 @@
 */
 
 #include <stdio.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <string.h>
 #include <math.h>
 #include <setjmp.h>
diff --git a/cde/lib/DtHelp/il/ilhplrotation.c b/cde/lib/DtHelp/il/ilhplrotation.c
index 05d5e87fb..c05024c8e 100644
--- a/cde/lib/DtHelp/il/ilhplrotation.c
+++ b/cde/lib/DtHelp/il/ilhplrotation.c
@@ -41,8 +41,7 @@ static char version[] = "$XConsortium: ilhplrotation.c /main/3 1995/10/23 15:48:
 static char vdate[] = "$XConsortium: ilhplrotation.c /main/3 1995/10/23 15:48:35 rswiston $";
 
 # include <stdio.h>
-# include <malloc.h>
-/*# include <stdlib.h> */
+# include <stdlib.h>
 # include <math.h>
 # include <limits.h>        /* Get definition of */
 # include <float.h>         /*     FLX_MAX       */
diff --git a/cde/lib/DtSvc/DtUtil1/DbReader.c b/cde/lib/DtSvc/DtUtil1/DbReader.c
index 5916da644..e6ac28ee4 100644
--- a/cde/lib/DtSvc/DtUtil1/DbReader.c
+++ b/cde/lib/DtSvc/DtUtil1/DbReader.c
@@ -34,7 +34,7 @@
 
 #include <stdio.h>
 #include <ctype.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <limits.h>
 #include <string.h>
 #include <X11/X.h>
diff --git a/cde/lib/DtSvc/DtUtil1/MMDb.c b/cde/lib/DtSvc/DtUtil1/MMDb.c
index c5b70b6d3..50ffc5913 100644
--- a/cde/lib/DtSvc/DtUtil1/MMDb.c
+++ b/cde/lib/DtSvc/DtUtil1/MMDb.c
@@ -32,7 +32,6 @@
 #include <sys/types.h>
 
 #include <unistd.h>
-#include <malloc.h>
 #include <sys/utsname.h>
 #include <stdlib.h>
 
diff --git a/cde/lib/DtSvc/DtUtil1/intarray.c b/cde/lib/DtSvc/DtUtil1/intarray.c
index 044c62524..f4e31c10b 100644
--- a/cde/lib/DtSvc/DtUtil1/intarray.c
+++ b/cde/lib/DtSvc/DtUtil1/intarray.c
@@ -26,7 +26,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/mman.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <string.h>
 #include "DtHash.h"
 #include "DtShmDb.h"
diff --git a/cde/lib/DtSvc/DtUtil1/inttab.c b/cde/lib/DtSvc/DtUtil1/inttab.c
index 53a7ac596..98e43668b 100644
--- a/cde/lib/DtSvc/DtUtil1/inttab.c
+++ b/cde/lib/DtSvc/DtUtil1/inttab.c
@@ -37,7 +37,6 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/mman.h>
-#include <malloc.h>
 #include <string.h>
 #include "DtHash.h"
 #include "DtShmDb.h"
diff --git a/cde/lib/DtSvc/include/codelibs/stringx.h b/cde/lib/DtSvc/include/codelibs/stringx.h
index 0d878b67f..346f38455 100644
--- a/cde/lib/DtSvc/include/codelibs/stringx.h
+++ b/cde/lib/DtSvc/include/codelibs/stringx.h
@@ -125,7 +125,7 @@ extern size_t     nl_strlen();		/* __OBSOLETE */
 #if defined(__cplusplus)
 }
 
-#if defined(apollo) || defined(__aix) || defined(USL) || defined(__uxp__) || defined(__osf__)
+#if defined(apollo) || defined(__aix) || defined(USL) || defined(__uxp__) || defined(__osf__) || defined(linux) || defined(CSRG_BASED)
 #include <stdlib.h>
 #else
 #include <malloc.h>
diff --git a/cde/lib/csa/convert2-4.c b/cde/lib/csa/convert2-4.c
index ad7dfc26c..9d321521c 100644
--- a/cde/lib/csa/convert2-4.c
+++ b/cde/lib/csa/convert2-4.c
@@ -29,7 +29,6 @@
  */
 
 #include <EUSCompat.h>
-#include <malloc.h>
 #include <string.h>
 #include <stdlib.h>
 #include "rtable2.h"
diff --git a/cde/lib/csa/convert3-4.c b/cde/lib/csa/convert3-4.c
index 44e45e750..7bc5c80a8 100644
--- a/cde/lib/csa/convert3-4.c
+++ b/cde/lib/csa/convert3-4.c
@@ -29,7 +29,6 @@
  */
 
 #include <EUSCompat.h>
-#include <malloc.h>
 #include <string.h>
 #include <stdlib.h>
 #include "rtable3.h"
diff --git a/cde/lib/csa/convert4-2.c b/cde/lib/csa/convert4-2.c
index 40a6e9733..782db834c 100644
--- a/cde/lib/csa/convert4-2.c
+++ b/cde/lib/csa/convert4-2.c
@@ -29,7 +29,6 @@
  */
 
 #include <EUSCompat.h>
-#include <malloc.h>
 #include <string.h>
 #include <stdlib.h>
 #include "rtable2.h"
diff --git a/cde/lib/csa/convert4-3.c b/cde/lib/csa/convert4-3.c
index 5009b5b60..881fb0822 100644
--- a/cde/lib/csa/convert4-3.c
+++ b/cde/lib/csa/convert4-3.c
@@ -29,7 +29,6 @@
  */
 
 #include <EUSCompat.h>
-#include <malloc.h>
 #include <string.h>
 #include <stdlib.h>
 #include "rtable3.h"
diff --git a/cde/lib/pam/libpam/pam_framework.c b/cde/lib/pam/libpam/pam_framework.c
index 16737c464..8824a67d2 100644
--- a/cde/lib/pam/libpam/pam_framework.c
+++ b/cde/lib/pam/libpam/pam_framework.c
@@ -44,7 +44,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <string.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <unistd.h>
 
 #include <security/pam_appl.h>
diff --git a/cde/lib/pam/libpam/pam_framework_utils.c b/cde/lib/pam/libpam/pam_framework_utils.c
index 7e69c7685..4e3ff770b 100644
--- a/cde/lib/pam/libpam/pam_framework_utils.c
+++ b/cde/lib/pam/libpam/pam_framework_utils.c
@@ -34,7 +34,7 @@
 #include <sys/stat.h>
 #include <utmpx.h>
 #include <string.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <unistd.h>
 #include <libintl.h>
 #include <synch.h>
diff --git a/cde/lib/tt/bin/tt_type_comp/frozen.mp_types_gram.C b/cde/lib/tt/bin/tt_type_comp/frozen.mp_types_gram.C
index cbd4ec74a..dcacf1450 100644
--- a/cde/lib/tt/bin/tt_type_comp/frozen.mp_types_gram.C
+++ b/cde/lib/tt/bin/tt_type_comp/frozen.mp_types_gram.C
@@ -82,7 +82,6 @@ typedef union
 # define TT_STRING 290
 # define TT_NUMBER 291
 
-#include <malloc.h>
 #include <memory.h>
 
 #if defined (__hpux)
diff --git a/cde/lib/tt/demo/CoEd/libCoEd/CoEdFile.C b/cde/lib/tt/demo/CoEd/libCoEd/CoEdFile.C
index c0936d361..bce054153 100644
--- a/cde/lib/tt/demo/CoEd/libCoEd/CoEdFile.C
+++ b/cde/lib/tt/demo/CoEd/libCoEd/CoEdFile.C
@@ -54,7 +54,6 @@
 
 #include <stdio.h>
 #include <string.h>
-#include <malloc.h>
 #include <sys/param.h>
 #include <stdlib.h>
 #include <poll.h>
diff --git a/cde/lib/tt/demo/CoEd/libCoEd/CoEdSiteID.C b/cde/lib/tt/demo/CoEd/libCoEd/CoEdSiteID.C
index 4b47d7903..b661a805c 100644
--- a/cde/lib/tt/demo/CoEd/libCoEd/CoEdSiteID.C
+++ b/cde/lib/tt/demo/CoEd/libCoEd/CoEdSiteID.C
@@ -53,7 +53,7 @@
  */
 
 #include <string.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include "CoEdSiteID.h"
 
 CoEdSiteID::
diff --git a/cde/lib/tt/demo/CoEd/libCoEd/CoEdTextChange.C b/cde/lib/tt/demo/CoEd/libCoEd/CoEdTextChange.C
index d90cb5d4b..11d7667ba 100644
--- a/cde/lib/tt/demo/CoEd/libCoEd/CoEdTextChange.C
+++ b/cde/lib/tt/demo/CoEd/libCoEd/CoEdTextChange.C
@@ -55,7 +55,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <malloc.h>
 #include <limits.h>
 #include "CoEdTextVersion.h"
 #include "CoEdTextChange.h"
diff --git a/cde/lib/tt/demo/CoEd/libCoEd/SiteChange.C b/cde/lib/tt/demo/CoEd/libCoEd/SiteChange.C
index c8315585e..1af780ace 100644
--- a/cde/lib/tt/demo/CoEd/libCoEd/SiteChange.C
+++ b/cde/lib/tt/demo/CoEd/libCoEd/SiteChange.C
@@ -52,7 +52,7 @@
  * connection with the use or performance of this software.
  */
 
-#include <malloc.h>
+#include <stdlib.h>
 #include <rpc/types.h>
 #include <rpc/xdr.h>
 #include <memory.h>
diff --git a/cde/lib/tt/lib/api/c/api_storage.h b/cde/lib/tt/lib/api/c/api_storage.h
index dbc03d211..88e222d20 100644
--- a/cde/lib/tt/lib/api/c/api_storage.h
+++ b/cde/lib/tt/lib/api/c/api_storage.h
@@ -37,7 +37,6 @@
 #define _API_STORAGE_H
 
 #include <stdlib.h>
-#include <malloc.h>
 #include "util/tt_object.h"
 #include "util/tt_list.h"
 
diff --git a/cde/lib/tt/lib/api/c/api_xdr.C b/cde/lib/tt/lib/api/c/api_xdr.C
index 3d0be8228..244ed9f5a 100644
--- a/cde/lib/tt/lib/api/c/api_xdr.C
+++ b/cde/lib/tt/lib/api/c/api_xdr.C
@@ -35,13 +35,10 @@
  */
 
 #include "tt_options.h"
-#if defined(OPT_BUG_SUNOS_4) && defined(__GNUG__)
-#	include <stdlib.h>
-#endif
+#include <stdlib.h>
 #include <rpc/rpc.h>
 #include "api/c/api_xdr.h"
 #include <mp/mp_xdr_functions.h>
-#include <malloc.h>
 
 bool_t
 _tt_xdr_cstring_list(XDR *xdrs, char ***ar)
diff --git a/cde/lib/tt/lib/api/dnd/ttdnd.c b/cde/lib/tt/lib/api/dnd/ttdnd.c
index 378cba9df..256acb4f1 100644
--- a/cde/lib/tt/lib/api/dnd/ttdnd.c
+++ b/cde/lib/tt/lib/api/dnd/ttdnd.c
@@ -33,7 +33,7 @@
  */
 #include <stdio.h>
 #include <string.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include "api/c/tt_c.h"
 #include "ttdnd.h"
 
diff --git a/cde/lib/tt/lib/mp/mp_desktop.C b/cde/lib/tt/lib/mp/mp_desktop.C
index 41198f8d0..cf5a075a2 100644
--- a/cde/lib/tt/lib/mp/mp_desktop.C
+++ b/cde/lib/tt/lib/mp/mp_desktop.C
@@ -58,7 +58,7 @@ extern "C" {  extern int ioctl 	(int, int, ...) ; };
 #include "mp/mp_desktop.h"
 #include "mp/mp_mp.h"
 #include <unistd.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include "util/tt_gettext.h"
 
 static int parse_Xdisplay_string(_Tt_string display,
diff --git a/cde/lib/tt/lib/mp/mp_mp.C b/cde/lib/tt/lib/mp/mp_mp.C
index 92b9ba8e9..9c07114a9 100644
--- a/cde/lib/tt/lib/mp/mp_mp.C
+++ b/cde/lib/tt/lib/mp/mp_mp.C
@@ -46,7 +46,7 @@
 #include "api/c/api_error.h"
 #include <errno.h>
 #include <sys/resource.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include "tt_options.h"
 
 #if defined(_AIX)
diff --git a/cde/lib/tt/lib/util/frozen.tt_trace_gram.c b/cde/lib/tt/lib/util/frozen.tt_trace_gram.c
index 73ffe26f9..a0887f88b 100644
--- a/cde/lib/tt/lib/util/frozen.tt_trace_gram.c
+++ b/cde/lib/tt/lib/util/frozen.tt_trace_gram.c
@@ -101,7 +101,7 @@ typedef union
 # define _TT_TRACE_LINETERM 280
 # define _TT_TRACE_PARSE_EOF 281
 
-#include <malloc.h>
+#include <stdlib.h>
 #include <memory.h>
 #include <values.h>
 
diff --git a/cde/lib/tt/lib/util/tt_new.C b/cde/lib/tt/lib/util/tt_new.C
index c1fd0080d..bf7f60017 100644
--- a/cde/lib/tt/lib/util/tt_new.C
+++ b/cde/lib/tt/lib/util/tt_new.C
@@ -37,7 +37,6 @@
 
 #include <stdlib.h>
 #include <stdio.h>
-#include <malloc.h>
 #include <string.h>
 #include <errno.h>
 #include "util/tt_new.h"
diff --git a/cde/lib/tt/mini_isam/isalloc.c b/cde/lib/tt/mini_isam/isalloc.c
index 2b0bf9ec5..a4d8f2686 100644
--- a/cde/lib/tt/mini_isam/isalloc.c
+++ b/cde/lib/tt/mini_isam/isalloc.c
@@ -41,7 +41,7 @@ static char sccsid[] = "@(#)isalloc.c 1.3 89/07/17 Copyr 1988 Sun Micro";
  */
 
 #include "isam_impl.h"
-#include <malloc.h>
+#include <stdlib.h>
 
 /* strdup is not defined in Ultrix' string.h, so it is implemented in a separate
  * file named strdup.ultrix.c
diff --git a/cde/programs/dtappbuilder/src/libAButil/abio.c b/cde/programs/dtappbuilder/src/libAButil/abio.c
index 0d4564574..a1486f6eb 100644
--- a/cde/programs/dtappbuilder/src/libAButil/abio.c
+++ b/cde/programs/dtappbuilder/src/libAButil/abio.c
@@ -69,7 +69,6 @@
 #include <sys/stat.h>
 #include <errno.h>
 #include <string.h>
-#include <malloc.h>
 #include <assert.h>
 #include <ab_private/util.h>
 #include <ab_private/abio.h>
diff --git a/cde/programs/dtcalc/calctool.c b/cde/programs/dtcalc/calctool.c
index b0d2ce9a8..063f09c4b 100644
--- a/cde/programs/dtcalc/calctool.c
+++ b/cde/programs/dtcalc/calctool.c
@@ -37,7 +37,6 @@
 #include <string.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include <malloc.h>
 #include <sys/types.h>
 #include <sys/file.h>
 #include <sys/param.h>
diff --git a/cde/programs/dtcm/dtcm/props.c b/cde/programs/dtcm/dtcm/props.c
index 01cc908ac..4f84a7dec 100644
--- a/cde/programs/dtcm/dtcm/props.c
+++ b/cde/programs/dtcm/dtcm/props.c
@@ -29,7 +29,6 @@
  */
 
 #include <stdlib.h>
-#include <malloc.h>
 #include <Xm/Xm.h>
 #include <Xm/Form.h>
 #include <Xm/LabelG.h>
diff --git a/cde/programs/dtcm/dtcm/props_pu.c b/cde/programs/dtcm/dtcm/props_pu.c
index 5e84f3641..747ca9c7d 100644
--- a/cde/programs/dtcm/dtcm/props_pu.c
+++ b/cde/programs/dtcm/dtcm/props_pu.c
@@ -30,7 +30,6 @@
 
 #include <EUSCompat.h>
 #include <stdlib.h>
-#include <malloc.h>
 #include <ctype.h>
 #include <sys/param.h>
 #include <Xm/Xm.h>
diff --git a/cde/programs/dtcm/libDtCmP/dtfns.c b/cde/programs/dtcm/libDtCmP/dtfns.c
index 3b853542a..74eb79212 100644
--- a/cde/programs/dtcm/libDtCmP/dtfns.c
+++ b/cde/programs/dtcm/libDtCmP/dtfns.c
@@ -72,7 +72,7 @@ static 	char sccsid[] = "@(#)dtfns.c 1.3 94/11/07 Copyr 1993 Sun Microsystems, I
 #include <rpcsvc/nislib.h>
 #include <rpcsvc/ypclnt.h>
 #include <dlfcn.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
 #include <fns/fns.h>
diff --git a/cde/programs/dtfile/HelpCB.c b/cde/programs/dtfile/HelpCB.c
index 0dd9e2e67..6e2f63409 100644
--- a/cde/programs/dtfile/HelpCB.c
+++ b/cde/programs/dtfile/HelpCB.c
@@ -58,7 +58,6 @@
 #include <stdlib.h>
 #include <limits.h>
 #include <errno.h>
-#include <malloc.h>
 #include <nl_types.h>
 
 #include <Xm/XmP.h>
diff --git a/cde/programs/dtfile/Main.c b/cde/programs/dtfile/Main.c
index caf0fc373..95c9722fe 100644
--- a/cde/programs/dtfile/Main.c
+++ b/cde/programs/dtfile/Main.c
@@ -121,7 +121,7 @@
 
 #include <errno.h>
 #include <pwd.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <ctype.h>
 
 #ifndef sun /* don't need the nl_types.h file */
diff --git a/cde/programs/dtfile/SharedMsgs.c b/cde/programs/dtfile/SharedMsgs.c
index 975d891f2..2813bcbb4 100644
--- a/cde/programs/dtfile/SharedMsgs.c
+++ b/cde/programs/dtfile/SharedMsgs.c
@@ -51,7 +51,6 @@
 #include <signal.h>
 #include <errno.h>
 #include <pwd.h>
-#include <malloc.h>
 #include <time.h>
 #ifndef sun /* don't need the nl_types.h file */
 #include <nl_types.h>
diff --git a/cde/programs/dthelp/parser.ccdf/helpcomp/helpcomp.c b/cde/programs/dthelp/parser.ccdf/helpcomp/helpcomp.c
index 1d3340433..980f88524 100644
--- a/cde/programs/dthelp/parser.ccdf/helpcomp/helpcomp.c
+++ b/cde/programs/dthelp/parser.ccdf/helpcomp/helpcomp.c
@@ -27,7 +27,7 @@ static char *version = "$XConsortium: helpcomp.c /main/3 1995/11/08 11:10:34 rsw
 #include <string.h>
 #include <fcntl.h>
 #include <errno.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <dirent.h>
 #include <sys/stat.h>
 
diff --git a/cde/programs/dthelp/parser.ccdf/htag/build/build.c b/cde/programs/dthelp/parser.ccdf/htag/build/build.c
index a90d8afc4..5b763728b 100644
--- a/cde/programs/dthelp/parser.ccdf/htag/build/build.c
+++ b/cde/programs/dthelp/parser.ccdf/htag/build/build.c
@@ -30,7 +30,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 /* Build.c contains the main procedure for program BUILD */
 
 #include <string.h>
-#include <malloc.h>
+#include <stdlib.h>
 #if defined(MSDOS)
 #include <process.h>
 #endif
diff --git a/cde/programs/dthelp/parser.ccdf/htag/build/buildutl.c b/cde/programs/dthelp/parser.ccdf/htag/build/buildutl.c
index 6fbf36f11..c2e88dda7 100644
--- a/cde/programs/dthelp/parser.ccdf/htag/build/buildutl.c
+++ b/cde/programs/dthelp/parser.ccdf/htag/build/buildutl.c
@@ -29,7 +29,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 
 /* Buildult.c contains the main supporting utilities for program BUILD */
 
-#include <malloc.h>
+#include <stdlib.h>
 #include "context.h"
 #include "build.h"
 #include "delim.h"
diff --git a/cde/programs/dthelp/parser.ccdf/htag/build/eltree.c b/cde/programs/dthelp/parser.ccdf/htag/build/eltree.c
index e55be9204..9f6038d3b 100644
--- a/cde/programs/dthelp/parser.ccdf/htag/build/eltree.c
+++ b/cde/programs/dthelp/parser.ccdf/htag/build/eltree.c
@@ -30,7 +30,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 /* Eltree.c contains procedures that manipulate element names */
 
 #include <string.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include "build.h"
 
 /* Enters an element name into the element name tree */
diff --git a/cde/programs/dthelp/parser.ccdf/htag/build/fsa.c b/cde/programs/dthelp/parser.ccdf/htag/build/fsa.c
index 8da3c8089..00c99e6de 100644
--- a/cde/programs/dthelp/parser.ccdf/htag/build/fsa.c
+++ b/cde/programs/dthelp/parser.ccdf/htag/build/fsa.c
@@ -30,7 +30,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 /* Fsa.c contains the procedures used by program BUILD to convert a tree
    representation of a content model to an FSA */
 
-#include <malloc.h>
+#include <stdlib.h>
 #include "build.h"
 #include "context.h"
 #include "delim.h"
diff --git a/cde/programs/dthelp/parser.ccdf/htag/build/out.c b/cde/programs/dthelp/parser.ccdf/htag/build/out.c
index 2695fffd0..63eb0dbc9 100644
--- a/cde/programs/dthelp/parser.ccdf/htag/build/out.c
+++ b/cde/programs/dthelp/parser.ccdf/htag/build/out.c
@@ -30,7 +30,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 /* Out.c contains the procedures used by program BUILD to output results */
 
 #include <string.h>
-#include <malloc.h>
+#include <stdlib.h>
 #if defined(MSDOS)
 #include <process.h>
 #endif
diff --git a/cde/programs/dthelp/parser.ccdf/htag/build/param.c b/cde/programs/dthelp/parser.ccdf/htag/build/param.c
index 3329a1539..f78f4e008 100644
--- a/cde/programs/dthelp/parser.ccdf/htag/build/param.c
+++ b/cde/programs/dthelp/parser.ccdf/htag/build/param.c
@@ -29,7 +29,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 
 /* Param.c contains procedures related to parameters for program BUILD */
 
-#include <malloc.h>
+#include <stdlib.h>
 #include <string.h>
 #include "build.h"
 #include "context.h"
diff --git a/cde/programs/dthelp/parser.ccdf/htag/build/sref.c b/cde/programs/dthelp/parser.ccdf/htag/build/sref.c
index b6bc6b197..22d45e439 100644
--- a/cde/programs/dthelp/parser.ccdf/htag/build/sref.c
+++ b/cde/programs/dthelp/parser.ccdf/htag/build/sref.c
@@ -26,7 +26,7 @@
 /* Sref.c contains procedures related to short reference map declarations */
 
 #include <string.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include "build.h"
 #include "sref.h"
 #include "entdef.h"
diff --git a/cde/programs/dthelp/parser.ccdf/htag/build/tree.c b/cde/programs/dthelp/parser.ccdf/htag/build/tree.c
index 4372f95f5..903c06e8b 100644
--- a/cde/programs/dthelp/parser.ccdf/htag/build/tree.c
+++ b/cde/programs/dthelp/parser.ccdf/htag/build/tree.c
@@ -30,7 +30,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 /* Tree.c has procedures used by BUILD to construct the tree representation
    of a content model */
 
-#include <malloc.h>
+#include <stdlib.h>
 #include "build.h"
 #include "context.h"
 
diff --git a/cde/programs/dthelp/parser.ccdf/htag/eltdef/eltdef.c b/cde/programs/dthelp/parser.ccdf/htag/eltdef/eltdef.c
index 0c75441b0..12daa2a46 100644
--- a/cde/programs/dthelp/parser.ccdf/htag/eltdef/eltdef.c
+++ b/cde/programs/dthelp/parser.ccdf/htag/eltdef/eltdef.c
@@ -31,7 +31,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 
 #include <stdio.h>
 #include <string.h>
-#include <malloc.h>
+#include <stdlib.h>
 #if defined(MSDOS)
 #include <process.h>
 #endif
diff --git a/cde/programs/dthelp/parser.ccdf/htag/eltdef/eltutil.c b/cde/programs/dthelp/parser.ccdf/htag/eltdef/eltutil.c
index 2aa3189ba..504bc37dc 100644
--- a/cde/programs/dthelp/parser.ccdf/htag/eltdef/eltutil.c
+++ b/cde/programs/dthelp/parser.ccdf/htag/eltdef/eltutil.c
@@ -31,7 +31,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 
 #include <stdio.h>
 #include <string.h>
-#include <malloc.h>
+#include <stdlib.h>
 #if defined(MSDOS)
 #include <process.h>
 #endif
diff --git a/cde/programs/dthelp/parser.ccdf/htag/eltdef/entity.c b/cde/programs/dthelp/parser.ccdf/htag/eltdef/entity.c
index 9b82f905e..b6e232fde 100644
--- a/cde/programs/dthelp/parser.ccdf/htag/eltdef/entity.c
+++ b/cde/programs/dthelp/parser.ccdf/htag/eltdef/entity.c
@@ -27,7 +27,7 @@
 
 #include <stdio.h>
 #include <string.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include "basic.h"
 #include "trie.h"
 #include "dtdext.h"
diff --git a/cde/programs/dthelp/parser.ccdf/htag/helptag/global.h b/cde/programs/dthelp/parser.ccdf/htag/helptag/global.h
index 1714dc162..a44756b1b 100644
--- a/cde/programs/dthelp/parser.ccdf/htag/helptag/global.h
+++ b/cde/programs/dthelp/parser.ccdf/htag/helptag/global.h
@@ -33,17 +33,16 @@
 #define INIT(a)
 #endif
 
-#include <malloc.h>
+#include <stdlib.h>
 #include <string.h>
 #if defined(MSDOS)
 #include <io.h>
-#include <stdlib.h>
 #include <process.h>
 #include <direct.h>
 #endif
 #include <ctype.h>
 
-#if defined(hpux) || defined(_AIX) || defined(sun) || defined(USL) || defined(__uxp__) || defined(linux)
+#if defined(hpux) || defined(_AIX) || defined(sun) || defined(USL) || defined(__uxp__) || defined(linux) || defined(CSRG_BASED)
 #include <unistd.h>
 #include <locale.h>
 #endif
diff --git a/cde/programs/dthelp/parser.ccdf/htag/parser/actutil.c b/cde/programs/dthelp/parser.ccdf/htag/parser/actutil.c
index 07db2f916..054c641ce 100644
--- a/cde/programs/dthelp/parser.ccdf/htag/parser/actutil.c
+++ b/cde/programs/dthelp/parser.ccdf/htag/parser/actutil.c
@@ -31,7 +31,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 in the interface definition.*/
 
 #include <stdio.h>
-#include <malloc.h>
+#include <stdlib.h>
 #if defined(MSDOS)
 #include <process.h>
 #endif
diff --git a/cde/programs/dthelp/parser.ccdf/htag/parser/delfree.c b/cde/programs/dthelp/parser.ccdf/htag/parser/delfree.c
index 9073b91c8..3e6b21c63 100644
--- a/cde/programs/dthelp/parser.ccdf/htag/parser/delfree.c
+++ b/cde/programs/dthelp/parser.ccdf/htag/parser/delfree.c
@@ -26,7 +26,7 @@
 /* Versions of m_free and m_malloc for debugging. */
 
 /**/
-#include <malloc.h>
+#include <stdlib.h>
 #include <stdio.h>
 #include "basic.h"
 #include "trie.h"
diff --git a/cde/programs/dthelp/parser.ccdf/htag/parser/entity.c b/cde/programs/dthelp/parser.ccdf/htag/parser/entity.c
index 8d36779ee..3e73f9c6b 100644
--- a/cde/programs/dthelp/parser.ccdf/htag/parser/entity.c
+++ b/cde/programs/dthelp/parser.ccdf/htag/parser/entity.c
@@ -30,7 +30,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 /* Entity.c contains procedures pertaining to entities */
 
 #include <stdio.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <string.h>
 #if defined(MSDOS)
 #include <process.h>
diff --git a/cde/programs/dthelp/parser.ccdf/htag/parser/error.c b/cde/programs/dthelp/parser.ccdf/htag/parser/error.c
index 3b9e67179..9fc9b535e 100644
--- a/cde/programs/dthelp/parser.ccdf/htag/parser/error.c
+++ b/cde/programs/dthelp/parser.ccdf/htag/parser/error.c
@@ -30,7 +30,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 /* Util.c contains general utilities for program PARSER */
 
 #include <stdio.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <string.h>
 #if defined(MSDOS)
 #include <process.h>
diff --git a/cde/programs/dthelp/parser.ccdf/htag/parser/param.c b/cde/programs/dthelp/parser.ccdf/htag/parser/param.c
index 11a0a56f8..8a838dfb7 100644
--- a/cde/programs/dthelp/parser.ccdf/htag/parser/param.c
+++ b/cde/programs/dthelp/parser.ccdf/htag/parser/param.c
@@ -31,7 +31,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 
 #include <string.h>
 #include <stdio.h>
-#include <malloc.h>
+#include <stdlib.h>
 #if defined(MSDOS)
 #include <process.h>
 #endif
diff --git a/cde/programs/dthelp/parser.ccdf/htag/parser/parser.c b/cde/programs/dthelp/parser.ccdf/htag/parser/parser.c
index d47e5b16c..0d499ea03 100644
--- a/cde/programs/dthelp/parser.ccdf/htag/parser/parser.c
+++ b/cde/programs/dthelp/parser.ccdf/htag/parser/parser.c
@@ -31,7 +31,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 
 #include <string.h>
 #include <stdio.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include "basic.h"
 #include "trie.h"
 #include "dtdext.h"
diff --git a/cde/programs/dthelp/parser.ccdf/htag/parser/parutil.c b/cde/programs/dthelp/parser.ccdf/htag/parser/parutil.c
index 9356b540b..de08887d3 100644
--- a/cde/programs/dthelp/parser.ccdf/htag/parser/parutil.c
+++ b/cde/programs/dthelp/parser.ccdf/htag/parser/parutil.c
@@ -31,7 +31,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 
 #include <string.h>
 #include <stdio.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <locale.h>
 #if defined(MSDOS)
 #include <process.h>
diff --git a/cde/programs/dthelp/parser.ccdf/htag/parser/scan.c b/cde/programs/dthelp/parser.ccdf/htag/parser/scan.c
index ec78c241d..c7d9a42ea 100644
--- a/cde/programs/dthelp/parser.ccdf/htag/parser/scan.c
+++ b/cde/programs/dthelp/parser.ccdf/htag/parser/scan.c
@@ -30,7 +30,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 /* Scan.c is the scanner for program PARSER */
 
 #include <string.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <stdio.h>
 #if defined(MSDOS)
 #include <process.h>
diff --git a/cde/programs/dthelp/parser.ccdf/htag/parser/struct.c b/cde/programs/dthelp/parser.ccdf/htag/parser/struct.c
index 6f53b0919..5c246e4ec 100644
--- a/cde/programs/dthelp/parser.ccdf/htag/parser/struct.c
+++ b/cde/programs/dthelp/parser.ccdf/htag/parser/struct.c
@@ -32,7 +32,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 
 #include <string.h>
 #include <stdio.h>
-#include <malloc.h>
+#include <stdlib.h>
 #if defined(MSDOS)
 #include <process.h>
 #endif
diff --git a/cde/programs/dthelp/parser.ccdf/htag/util/context.c b/cde/programs/dthelp/parser.ccdf/htag/util/context.c
index 05583ab4c..7423afde5 100644
--- a/cde/programs/dthelp/parser.ccdf/htag/util/context.c
+++ b/cde/programs/dthelp/parser.ccdf/htag/util/context.c
@@ -156,7 +156,7 @@ delim.h.
 */
 
 #include <stdio.h>
-#include <malloc.h>
+#include <stdlib.h>
 #if defined(MSDOS)
 #include <process.h>
 #endif
diff --git a/cde/programs/dthelp/parser.ccdf/htag/util/conutil.c b/cde/programs/dthelp/parser.ccdf/htag/util/conutil.c
index c87b8a54d..1119dbadc 100644
--- a/cde/programs/dthelp/parser.ccdf/htag/util/conutil.c
+++ b/cde/programs/dthelp/parser.ccdf/htag/util/conutil.c
@@ -30,7 +30,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 /* Conutil has utility procedures for program CONTEXT. */
 #include <stdio.h>
 #include <string.h>
-#include <malloc.h>
+#include <stdlib.h>
 #if defined(MSDOS)
 #include <process.h>
 #endif
diff --git a/cde/programs/dthelp/parser.ccdf/htag/util/fclndir.c b/cde/programs/dthelp/parser.ccdf/htag/util/fclndir.c
index 020333f01..a5caae496 100644
--- a/cde/programs/dthelp/parser.ccdf/htag/util/fclndir.c
+++ b/cde/programs/dthelp/parser.ccdf/htag/util/fclndir.c
@@ -35,7 +35,7 @@ with an error code of 0 if the files are the same, 1 if they differ, and
 */
 
 #include <stdio.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <string.h>
 #if defined(MSDOS)
 #include <process.h>
diff --git a/cde/programs/dthelp/parser.ccdf/htag/util/malloc.c b/cde/programs/dthelp/parser.ccdf/htag/util/malloc.c
index 6a81b8e39..820128288 100644
--- a/cde/programs/dthelp/parser.ccdf/htag/util/malloc.c
+++ b/cde/programs/dthelp/parser.ccdf/htag/util/malloc.c
@@ -26,7 +26,7 @@
 /* Interfaces to free and malloc with optional debugging traces */
 
 /**/
-#include <malloc.h>
+#include <stdlib.h>
 #include <stdio.h>
 #if defined(MSDOS)
 #include <process.h>
diff --git a/cde/programs/dthelp/parser/canon1/build/build.c b/cde/programs/dthelp/parser/canon1/build/build.c
index 72581b40a..b3b1cdf50 100644
--- a/cde/programs/dthelp/parser/canon1/build/build.c
+++ b/cde/programs/dthelp/parser/canon1/build/build.c
@@ -30,7 +30,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 /* Build.c contains the main procedure for program BUILD */
 
 #include <string.h>
-#include <malloc.h>
+#include <stdlib.h>
 #if defined(MSDOS)
 #include <process.h>
 #endif
diff --git a/cde/programs/dthelp/parser/canon1/build/buildutl.c b/cde/programs/dthelp/parser/canon1/build/buildutl.c
index 6e38bea17..5be8b7866 100644
--- a/cde/programs/dthelp/parser/canon1/build/buildutl.c
+++ b/cde/programs/dthelp/parser/canon1/build/buildutl.c
@@ -29,7 +29,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 
 /* Buildult.c contains the main supporting utilities for program BUILD */
 
-#include <malloc.h>
+#include <stdlib.h>
 #include "context.h"
 #include "build.h"
 #include "delim.h"
diff --git a/cde/programs/dthelp/parser/canon1/build/eltree.c b/cde/programs/dthelp/parser/canon1/build/eltree.c
index 0938a44ef..c060204dc 100644
--- a/cde/programs/dthelp/parser/canon1/build/eltree.c
+++ b/cde/programs/dthelp/parser/canon1/build/eltree.c
@@ -30,7 +30,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 /* Eltree.c contains procedures that manipulate element names */
 
 #include <string.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include "build.h"
 
 /* Enters an element name into the element name tree */
diff --git a/cde/programs/dthelp/parser/canon1/build/fsa.c b/cde/programs/dthelp/parser/canon1/build/fsa.c
index bec424074..f687c132e 100644
--- a/cde/programs/dthelp/parser/canon1/build/fsa.c
+++ b/cde/programs/dthelp/parser/canon1/build/fsa.c
@@ -30,7 +30,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 /* Fsa.c contains the procedures used by program BUILD to convert a tree
    representation of a content model to an FSA */
 
-#include <malloc.h>
+#include <stdlib.h>
 #include "build.h"
 #include "context.h"
 #include "delim.h"
diff --git a/cde/programs/dthelp/parser/canon1/build/out.c b/cde/programs/dthelp/parser/canon1/build/out.c
index 8290bce8a..97414f331 100644
--- a/cde/programs/dthelp/parser/canon1/build/out.c
+++ b/cde/programs/dthelp/parser/canon1/build/out.c
@@ -30,7 +30,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 /* Out.c contains the procedures used by program BUILD to output results */
 
 #include <string.h>
-#include <malloc.h>
+#include <stdlib.h>
 #if defined(MSDOS)
 #include <process.h>
 #endif
diff --git a/cde/programs/dthelp/parser/canon1/build/param.c b/cde/programs/dthelp/parser/canon1/build/param.c
index cca95c600..72dcd7eef 100644
--- a/cde/programs/dthelp/parser/canon1/build/param.c
+++ b/cde/programs/dthelp/parser/canon1/build/param.c
@@ -29,7 +29,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 
 /* Param.c contains procedures related to parameters for program BUILD */
 
-#include <malloc.h>
+#include <stdlib.h>
 #include <string.h>
 #include "build.h"
 #include "context.h"
diff --git a/cde/programs/dthelp/parser/canon1/build/sref.c b/cde/programs/dthelp/parser/canon1/build/sref.c
index ceb8d1598..caca76dde 100644
--- a/cde/programs/dthelp/parser/canon1/build/sref.c
+++ b/cde/programs/dthelp/parser/canon1/build/sref.c
@@ -26,7 +26,7 @@
 /* Sref.c contains procedures related to short reference map declarations */
 
 #include <string.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include "build.h"
 #include "sref.h"
 #include "entdef.h"
diff --git a/cde/programs/dthelp/parser/canon1/build/tree.c b/cde/programs/dthelp/parser/canon1/build/tree.c
index 3ec5dadf1..8c9e00162 100644
--- a/cde/programs/dthelp/parser/canon1/build/tree.c
+++ b/cde/programs/dthelp/parser/canon1/build/tree.c
@@ -30,7 +30,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 /* Tree.c has procedures used by BUILD to construct the tree representation
    of a content model */
 
-#include <malloc.h>
+#include <stdlib.h>
 #include "build.h"
 #include "context.h"
 
diff --git a/cde/programs/dthelp/parser/canon1/eltdef/eltdef.c b/cde/programs/dthelp/parser/canon1/eltdef/eltdef.c
index 89eaba53d..94e79122e 100644
--- a/cde/programs/dthelp/parser/canon1/eltdef/eltdef.c
+++ b/cde/programs/dthelp/parser/canon1/eltdef/eltdef.c
@@ -31,7 +31,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 
 #include <stdio.h>
 #include <string.h>
-#include <malloc.h>
+#include <stdlib.h>
 #if defined(MSDOS)
 #include <process.h>
 #endif
diff --git a/cde/programs/dthelp/parser/canon1/eltdef/eltutil.c b/cde/programs/dthelp/parser/canon1/eltdef/eltutil.c
index 88d4a6a3c..5b5a4d9d3 100644
--- a/cde/programs/dthelp/parser/canon1/eltdef/eltutil.c
+++ b/cde/programs/dthelp/parser/canon1/eltdef/eltutil.c
@@ -31,7 +31,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 
 #include <stdio.h>
 #include <string.h>
-#include <malloc.h>
+#include <stdlib.h>
 #if defined(MSDOS)
 #include <process.h>
 #endif
diff --git a/cde/programs/dthelp/parser/canon1/eltdef/entity.c b/cde/programs/dthelp/parser/canon1/eltdef/entity.c
index bfe785c8d..4aa5cd1f1 100644
--- a/cde/programs/dthelp/parser/canon1/eltdef/entity.c
+++ b/cde/programs/dthelp/parser/canon1/eltdef/entity.c
@@ -27,7 +27,7 @@
 
 #include <stdio.h>
 #include <string.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include "basic.h"
 #include "trie.h"
 #include "dtdext.h"
diff --git a/cde/programs/dthelp/parser/canon1/helptag/global.h b/cde/programs/dthelp/parser/canon1/helptag/global.h
index 2e9e26749..fa71c5f80 100644
--- a/cde/programs/dthelp/parser/canon1/helptag/global.h
+++ b/cde/programs/dthelp/parser/canon1/helptag/global.h
@@ -33,12 +33,11 @@
 #define INIT(a)
 #endif
 
-#include <malloc.h>
+#include <stdlib.h>
 #include <string.h>
 #include <time.h>
 #if defined(MSDOS)
 #include <io.h>
-#include <stdlib.h>
 #include <process.h>
 #include <direct.h>
 #endif
diff --git a/cde/programs/dthelp/parser/canon1/parser/actutil.c b/cde/programs/dthelp/parser/canon1/parser/actutil.c
index b937ec4b1..f632f82f1 100644
--- a/cde/programs/dthelp/parser/canon1/parser/actutil.c
+++ b/cde/programs/dthelp/parser/canon1/parser/actutil.c
@@ -31,7 +31,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 in the interface definition.*/
 
 #include <stdio.h>
-#include <malloc.h>
+#include <stdlib.h>
 #if defined(MSDOS)
 #include <process.h>
 #endif
diff --git a/cde/programs/dthelp/parser/canon1/parser/delfree.c b/cde/programs/dthelp/parser/canon1/parser/delfree.c
index 2dcf609d3..34aca5f19 100644
--- a/cde/programs/dthelp/parser/canon1/parser/delfree.c
+++ b/cde/programs/dthelp/parser/canon1/parser/delfree.c
@@ -26,7 +26,7 @@
 /* Versions of m_free and m_malloc for debugging. */
 
 /**/
-#include <malloc.h>
+#include <stdlib.h>
 #include <stdio.h>
 #include "basic.h"
 #include "trie.h"
diff --git a/cde/programs/dthelp/parser/canon1/parser/entity.c b/cde/programs/dthelp/parser/canon1/parser/entity.c
index 087fa9bbe..cbe876aed 100644
--- a/cde/programs/dthelp/parser/canon1/parser/entity.c
+++ b/cde/programs/dthelp/parser/canon1/parser/entity.c
@@ -30,7 +30,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 /* Entity.c contains procedures pertaining to entities */
 
 #include <stdio.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <string.h>
 #if defined(MSDOS)
 #include <process.h>
diff --git a/cde/programs/dthelp/parser/canon1/parser/error.c b/cde/programs/dthelp/parser/canon1/parser/error.c
index 9f7c0f9ef..80374aac5 100644
--- a/cde/programs/dthelp/parser/canon1/parser/error.c
+++ b/cde/programs/dthelp/parser/canon1/parser/error.c
@@ -30,7 +30,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 /* Util.c contains general utilities for program PARSER */
 
 #include <stdio.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <string.h>
 #if defined(MSDOS)
 #include <process.h>
diff --git a/cde/programs/dthelp/parser/canon1/parser/param.c b/cde/programs/dthelp/parser/canon1/parser/param.c
index 573af6027..28488aa33 100644
--- a/cde/programs/dthelp/parser/canon1/parser/param.c
+++ b/cde/programs/dthelp/parser/canon1/parser/param.c
@@ -31,7 +31,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 
 #include <string.h>
 #include <stdio.h>
-#include <malloc.h>
+#include <stdlib.h>
 #if defined(MSDOS)
 #include <process.h>
 #endif
diff --git a/cde/programs/dthelp/parser/canon1/parser/parser.c b/cde/programs/dthelp/parser/canon1/parser/parser.c
index 743385d8d..8cecb2cee 100644
--- a/cde/programs/dthelp/parser/canon1/parser/parser.c
+++ b/cde/programs/dthelp/parser/canon1/parser/parser.c
@@ -25,7 +25,7 @@
 
 #include <string.h>
 #include <stdio.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include "basic.h"
 #include "trie.h"
 #include "dtdext.h"
diff --git a/cde/programs/dthelp/parser/canon1/parser/parutil.c b/cde/programs/dthelp/parser/canon1/parser/parutil.c
index 3d4ddd05e..b2a609bf0 100644
--- a/cde/programs/dthelp/parser/canon1/parser/parutil.c
+++ b/cde/programs/dthelp/parser/canon1/parser/parutil.c
@@ -31,7 +31,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 
 #include <string.h>
 #include <stdio.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <locale.h>
 #if defined(MSDOS)
 #include <process.h>
diff --git a/cde/programs/dthelp/parser/canon1/parser/scan.c b/cde/programs/dthelp/parser/canon1/parser/scan.c
index 51c9a8f14..24e5c9ddc 100644
--- a/cde/programs/dthelp/parser/canon1/parser/scan.c
+++ b/cde/programs/dthelp/parser/canon1/parser/scan.c
@@ -30,7 +30,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 /* Scan.c is the scanner for program PARSER */
 
 #include <string.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <stdio.h>
 #if defined(MSDOS)
 #include <process.h>
diff --git a/cde/programs/dthelp/parser/canon1/parser/struct.c b/cde/programs/dthelp/parser/canon1/parser/struct.c
index 20761d920..c16a9c005 100644
--- a/cde/programs/dthelp/parser/canon1/parser/struct.c
+++ b/cde/programs/dthelp/parser/canon1/parser/struct.c
@@ -32,7 +32,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 
 #include <string.h>
 #include <stdio.h>
-#include <malloc.h>
+#include <stdlib.h>
 #if defined(MSDOS)
 #include <process.h>
 #endif
diff --git a/cde/programs/dthelp/parser/canon1/util/context.c b/cde/programs/dthelp/parser/canon1/util/context.c
index 4fa39796e..ea8dd6f38 100644
--- a/cde/programs/dthelp/parser/canon1/util/context.c
+++ b/cde/programs/dthelp/parser/canon1/util/context.c
@@ -156,7 +156,7 @@ delim.h.
 */
 
 #include <stdio.h>
-#include <malloc.h>
+#include <stdlib.h>
 #if defined(MSDOS)
 #include <process.h>
 #endif
diff --git a/cde/programs/dthelp/parser/canon1/util/conutil.c b/cde/programs/dthelp/parser/canon1/util/conutil.c
index e0d71c326..947cab5fb 100644
--- a/cde/programs/dthelp/parser/canon1/util/conutil.c
+++ b/cde/programs/dthelp/parser/canon1/util/conutil.c
@@ -30,7 +30,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 /* Conutil has utility procedures for program CONTEXT. */
 #include <stdio.h>
 #include <string.h>
-#include <malloc.h>
+#include <stdlib.h>
 #if defined(MSDOS)
 #include <process.h>
 #endif
diff --git a/cde/programs/dthelp/parser/canon1/util/fclndir.c b/cde/programs/dthelp/parser/canon1/util/fclndir.c
index 66a216285..ea7b99b4b 100644
--- a/cde/programs/dthelp/parser/canon1/util/fclndir.c
+++ b/cde/programs/dthelp/parser/canon1/util/fclndir.c
@@ -35,7 +35,7 @@ with an error code of 0 if the files are the same, 1 if they differ, and
 */
 
 #include <stdio.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <string.h>
 #if defined(MSDOS)
 #include <process.h>
diff --git a/cde/programs/dthelp/parser/canon1/util/malloc.c b/cde/programs/dthelp/parser/canon1/util/malloc.c
index 6b02080ac..c633fa0bb 100644
--- a/cde/programs/dthelp/parser/canon1/util/malloc.c
+++ b/cde/programs/dthelp/parser/canon1/util/malloc.c
@@ -26,7 +26,7 @@
 /* Interfaces to free and malloc with optional debugging traces */
 
 /**/
-#include <malloc.h>
+#include <stdlib.h>
 #include <stdio.h>
 #if defined(MSDOS)
 #include <process.h>
diff --git a/cde/programs/dthelp/parser/pass1/build/build.c b/cde/programs/dthelp/parser/pass1/build/build.c
index b42a8f9d1..5c2239b25 100644
--- a/cde/programs/dthelp/parser/pass1/build/build.c
+++ b/cde/programs/dthelp/parser/pass1/build/build.c
@@ -30,7 +30,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 /* Build.c contains the main procedure for program BUILD */
 
 #include <string.h>
-#include <malloc.h>
+#include <stdlib.h>
 #if defined(MSDOS)
 #include <process.h>
 #endif
diff --git a/cde/programs/dthelp/parser/pass1/build/buildutl.c b/cde/programs/dthelp/parser/pass1/build/buildutl.c
index e330a434a..cd071e2e9 100644
--- a/cde/programs/dthelp/parser/pass1/build/buildutl.c
+++ b/cde/programs/dthelp/parser/pass1/build/buildutl.c
@@ -29,7 +29,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 
 /* Buildult.c contains the main supporting utilities for program BUILD */
 
-#include <malloc.h>
+#include <stdlib.h>
 #include "context.h"
 #include "build.h"
 #include "delim.h"
diff --git a/cde/programs/dthelp/parser/pass1/build/eltree.c b/cde/programs/dthelp/parser/pass1/build/eltree.c
index 039f1ff16..b5c9dba22 100644
--- a/cde/programs/dthelp/parser/pass1/build/eltree.c
+++ b/cde/programs/dthelp/parser/pass1/build/eltree.c
@@ -30,7 +30,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 /* Eltree.c contains procedures that manipulate element names */
 
 #include <string.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include "build.h"
 
 /* Enters an element name into the element name tree */
diff --git a/cde/programs/dthelp/parser/pass1/build/fsa.c b/cde/programs/dthelp/parser/pass1/build/fsa.c
index e8e45eb3a..0e9b519e8 100644
--- a/cde/programs/dthelp/parser/pass1/build/fsa.c
+++ b/cde/programs/dthelp/parser/pass1/build/fsa.c
@@ -30,7 +30,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 /* Fsa.c contains the procedures used by program BUILD to convert a tree
    representation of a content model to an FSA */
 
-#include <malloc.h>
+#include <stdlib.h>
 #include "build.h"
 #include "context.h"
 #include "delim.h"
diff --git a/cde/programs/dthelp/parser/pass1/build/out.c b/cde/programs/dthelp/parser/pass1/build/out.c
index 84c1ba00d..7b4b3ebcd 100644
--- a/cde/programs/dthelp/parser/pass1/build/out.c
+++ b/cde/programs/dthelp/parser/pass1/build/out.c
@@ -30,7 +30,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 /* Out.c contains the procedures used by program BUILD to output results */
 
 #include <string.h>
-#include <malloc.h>
+#include <stdlib.h>
 #if defined(MSDOS)
 #include <process.h>
 #endif
diff --git a/cde/programs/dthelp/parser/pass1/build/param.c b/cde/programs/dthelp/parser/pass1/build/param.c
index 1867dcae0..f7250f3e3 100644
--- a/cde/programs/dthelp/parser/pass1/build/param.c
+++ b/cde/programs/dthelp/parser/pass1/build/param.c
@@ -29,7 +29,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 
 /* Param.c contains procedures related to parameters for program BUILD */
 
-#include <malloc.h>
+#include <stdlib.h>
 #include <string.h>
 #include "build.h"
 #include "context.h"
diff --git a/cde/programs/dthelp/parser/pass1/build/sref.c b/cde/programs/dthelp/parser/pass1/build/sref.c
index 9a37fed82..1e7a67797 100644
--- a/cde/programs/dthelp/parser/pass1/build/sref.c
+++ b/cde/programs/dthelp/parser/pass1/build/sref.c
@@ -26,7 +26,7 @@
 /* Sref.c contains procedures related to short reference map declarations */
 
 #include <string.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include "build.h"
 #include "sref.h"
 #include "entdef.h"
diff --git a/cde/programs/dthelp/parser/pass1/build/tree.c b/cde/programs/dthelp/parser/pass1/build/tree.c
index ecda8c95f..42db89b89 100644
--- a/cde/programs/dthelp/parser/pass1/build/tree.c
+++ b/cde/programs/dthelp/parser/pass1/build/tree.c
@@ -30,7 +30,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 /* Tree.c has procedures used by BUILD to construct the tree representation
    of a content model */
 
-#include <malloc.h>
+#include <stdlib.h>
 #include "build.h"
 #include "context.h"
 
diff --git a/cde/programs/dthelp/parser/pass1/eltdef/eltdef.c b/cde/programs/dthelp/parser/pass1/eltdef/eltdef.c
index 0ede426a8..a4358423e 100644
--- a/cde/programs/dthelp/parser/pass1/eltdef/eltdef.c
+++ b/cde/programs/dthelp/parser/pass1/eltdef/eltdef.c
@@ -31,7 +31,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 
 #include <stdio.h>
 #include <string.h>
-#include <malloc.h>
+#include <stdlib.h>
 #if defined(MSDOS)
 #include <process.h>
 #endif
diff --git a/cde/programs/dthelp/parser/pass1/eltdef/eltutil.c b/cde/programs/dthelp/parser/pass1/eltdef/eltutil.c
index e178935c4..4dfd87f80 100644
--- a/cde/programs/dthelp/parser/pass1/eltdef/eltutil.c
+++ b/cde/programs/dthelp/parser/pass1/eltdef/eltutil.c
@@ -31,7 +31,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 
 #include <stdio.h>
 #include <string.h>
-#include <malloc.h>
+#include <stdlib.h>
 #if defined(MSDOS)
 #include <process.h>
 #endif
diff --git a/cde/programs/dthelp/parser/pass1/eltdef/entity.c b/cde/programs/dthelp/parser/pass1/eltdef/entity.c
index 0fc7c5b4d..4d43047dc 100644
--- a/cde/programs/dthelp/parser/pass1/eltdef/entity.c
+++ b/cde/programs/dthelp/parser/pass1/eltdef/entity.c
@@ -27,7 +27,7 @@
 
 #include <stdio.h>
 #include <string.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include "basic.h"
 #include "trie.h"
 #include "dtdext.h"
diff --git a/cde/programs/dthelp/parser/pass1/helptag/global.h b/cde/programs/dthelp/parser/pass1/helptag/global.h
index c2b8c8325..79947b3e8 100644
--- a/cde/programs/dthelp/parser/pass1/helptag/global.h
+++ b/cde/programs/dthelp/parser/pass1/helptag/global.h
@@ -33,12 +33,11 @@
 #define INIT(a)
 #endif
 
-#include <malloc.h>
+#include <stdlib.h>
 #include <string.h>
 #include <time.h>
 #if defined(MSDOS)
 #include <io.h>
-#include <stdlib.h>
 #include <process.h>
 #include <direct.h>
 #endif
diff --git a/cde/programs/dthelp/parser/pass1/parser/actutil.c b/cde/programs/dthelp/parser/pass1/parser/actutil.c
index 042b54c5d..4e04cd9c4 100644
--- a/cde/programs/dthelp/parser/pass1/parser/actutil.c
+++ b/cde/programs/dthelp/parser/pass1/parser/actutil.c
@@ -31,7 +31,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 in the interface definition.*/
 
 #include <stdio.h>
-#include <malloc.h>
+#include <stdlib.h>
 #if defined(MSDOS)
 #include <process.h>
 #endif
diff --git a/cde/programs/dthelp/parser/pass1/parser/delfree.c b/cde/programs/dthelp/parser/pass1/parser/delfree.c
index 08c419d53..75927304d 100644
--- a/cde/programs/dthelp/parser/pass1/parser/delfree.c
+++ b/cde/programs/dthelp/parser/pass1/parser/delfree.c
@@ -26,7 +26,7 @@
 /* Versions of m_free and m_malloc for debugging. */
 
 /**/
-#include <malloc.h>
+#include <stdlib.h>
 #include <stdio.h>
 #include "basic.h"
 #include "trie.h"
diff --git a/cde/programs/dthelp/parser/pass1/parser/entity.c b/cde/programs/dthelp/parser/pass1/parser/entity.c
index ac38cc4be..49810952f 100644
--- a/cde/programs/dthelp/parser/pass1/parser/entity.c
+++ b/cde/programs/dthelp/parser/pass1/parser/entity.c
@@ -30,7 +30,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 /* Entity.c contains procedures pertaining to entities */
 
 #include <stdio.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <string.h>
 #if defined(MSDOS)
 #include <process.h>
diff --git a/cde/programs/dthelp/parser/pass1/parser/error.c b/cde/programs/dthelp/parser/pass1/parser/error.c
index 97b977da0..4eba76b5d 100644
--- a/cde/programs/dthelp/parser/pass1/parser/error.c
+++ b/cde/programs/dthelp/parser/pass1/parser/error.c
@@ -30,7 +30,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 /* Util.c contains general utilities for program PARSER */
 
 #include <stdio.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <string.h>
 #if defined(MSDOS)
 #include <process.h>
diff --git a/cde/programs/dthelp/parser/pass1/parser/param.c b/cde/programs/dthelp/parser/pass1/parser/param.c
index 629c32236..7e9367d23 100644
--- a/cde/programs/dthelp/parser/pass1/parser/param.c
+++ b/cde/programs/dthelp/parser/pass1/parser/param.c
@@ -31,7 +31,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 
 #include <string.h>
 #include <stdio.h>
-#include <malloc.h>
+#include <stdlib.h>
 #if defined(MSDOS)
 #include <process.h>
 #endif
diff --git a/cde/programs/dthelp/parser/pass1/parser/parser.c b/cde/programs/dthelp/parser/pass1/parser/parser.c
index f7ac25a9d..d5e801dc8 100644
--- a/cde/programs/dthelp/parser/pass1/parser/parser.c
+++ b/cde/programs/dthelp/parser/pass1/parser/parser.c
@@ -25,7 +25,7 @@
 
 #include <string.h>
 #include <stdio.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include "basic.h"
 #include "trie.h"
 #include "dtdext.h"
diff --git a/cde/programs/dthelp/parser/pass1/parser/parutil.c b/cde/programs/dthelp/parser/pass1/parser/parutil.c
index 32587c320..8a725a8f7 100644
--- a/cde/programs/dthelp/parser/pass1/parser/parutil.c
+++ b/cde/programs/dthelp/parser/pass1/parser/parutil.c
@@ -31,7 +31,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 
 #include <string.h>
 #include <stdio.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <locale.h>
 #if defined(MSDOS)
 #include <process.h>
diff --git a/cde/programs/dthelp/parser/pass1/parser/scan.c b/cde/programs/dthelp/parser/pass1/parser/scan.c
index 934118bec..971193d9f 100644
--- a/cde/programs/dthelp/parser/pass1/parser/scan.c
+++ b/cde/programs/dthelp/parser/pass1/parser/scan.c
@@ -30,7 +30,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 /* Scan.c is the scanner for program PARSER */
 
 #include <string.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <stdio.h>
 #if defined(MSDOS)
 #include <process.h>
diff --git a/cde/programs/dthelp/parser/pass1/parser/struct.c b/cde/programs/dthelp/parser/pass1/parser/struct.c
index 497b2a211..5ceeda6e5 100644
--- a/cde/programs/dthelp/parser/pass1/parser/struct.c
+++ b/cde/programs/dthelp/parser/pass1/parser/struct.c
@@ -32,7 +32,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 
 #include <string.h>
 #include <stdio.h>
-#include <malloc.h>
+#include <stdlib.h>
 #if defined(MSDOS)
 #include <process.h>
 #endif
diff --git a/cde/programs/dthelp/parser/pass1/util/context.c b/cde/programs/dthelp/parser/pass1/util/context.c
index fe35848d5..03ea57240 100644
--- a/cde/programs/dthelp/parser/pass1/util/context.c
+++ b/cde/programs/dthelp/parser/pass1/util/context.c
@@ -156,7 +156,7 @@ delim.h.
 */
 
 #include <stdio.h>
-#include <malloc.h>
+#include <stdlib.h>
 #if defined(MSDOS)
 #include <process.h>
 #endif
diff --git a/cde/programs/dthelp/parser/pass1/util/conutil.c b/cde/programs/dthelp/parser/pass1/util/conutil.c
index 52e854025..154a0dcb2 100644
--- a/cde/programs/dthelp/parser/pass1/util/conutil.c
+++ b/cde/programs/dthelp/parser/pass1/util/conutil.c
@@ -30,7 +30,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 /* Conutil has utility procedures for program CONTEXT. */
 #include <stdio.h>
 #include <string.h>
-#include <malloc.h>
+#include <stdlib.h>
 #if defined(MSDOS)
 #include <process.h>
 #endif
diff --git a/cde/programs/dthelp/parser/pass1/util/fclndir.c b/cde/programs/dthelp/parser/pass1/util/fclndir.c
index d5733814c..2aa2b9a9a 100644
--- a/cde/programs/dthelp/parser/pass1/util/fclndir.c
+++ b/cde/programs/dthelp/parser/pass1/util/fclndir.c
@@ -35,7 +35,7 @@ with an error code of 0 if the files are the same, 1 if they differ, and
 */
 
 #include <stdio.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <string.h>
 #if defined(MSDOS)
 #include <process.h>
diff --git a/cde/programs/dthelp/parser/pass1/util/malloc.c b/cde/programs/dthelp/parser/pass1/util/malloc.c
index 8e90eb65d..c8690b8fd 100644
--- a/cde/programs/dthelp/parser/pass1/util/malloc.c
+++ b/cde/programs/dthelp/parser/pass1/util/malloc.c
@@ -26,7 +26,7 @@
 /* Interfaces to free and malloc with optional debugging traces */
 
 /**/
-#include <malloc.h>
+#include <stdlib.h>
 #include <stdio.h>
 #if defined(MSDOS)
 #include <process.h>
diff --git a/cde/programs/dthelp/parser/pass2/build/build.c b/cde/programs/dthelp/parser/pass2/build/build.c
index ea67e8748..5b3d30cc1 100644
--- a/cde/programs/dthelp/parser/pass2/build/build.c
+++ b/cde/programs/dthelp/parser/pass2/build/build.c
@@ -30,7 +30,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 /* Build.c contains the main procedure for program BUILD */
 
 #include <string.h>
-#include <malloc.h>
+#include <stdlib.h>
 #if defined(MSDOS)
 #include <process.h>
 #endif
diff --git a/cde/programs/dthelp/parser/pass2/build/buildutl.c b/cde/programs/dthelp/parser/pass2/build/buildutl.c
index dac19e7e2..a2f89913d 100644
--- a/cde/programs/dthelp/parser/pass2/build/buildutl.c
+++ b/cde/programs/dthelp/parser/pass2/build/buildutl.c
@@ -29,7 +29,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 
 /* Buildult.c contains the main supporting utilities for program BUILD */
 
-#include <malloc.h>
+#include <stdlib.h>
 #include "context.h"
 #include "build.h"
 #include "delim.h"
diff --git a/cde/programs/dthelp/parser/pass2/build/eltree.c b/cde/programs/dthelp/parser/pass2/build/eltree.c
index 245c37347..4ad7f2870 100644
--- a/cde/programs/dthelp/parser/pass2/build/eltree.c
+++ b/cde/programs/dthelp/parser/pass2/build/eltree.c
@@ -30,7 +30,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 /* Eltree.c contains procedures that manipulate element names */
 
 #include <string.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include "build.h"
 
 /* Enters an element name into the element name tree */
diff --git a/cde/programs/dthelp/parser/pass2/build/fsa.c b/cde/programs/dthelp/parser/pass2/build/fsa.c
index 63ec0e746..b87b8a260 100644
--- a/cde/programs/dthelp/parser/pass2/build/fsa.c
+++ b/cde/programs/dthelp/parser/pass2/build/fsa.c
@@ -30,7 +30,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 /* Fsa.c contains the procedures used by program BUILD to convert a tree
    representation of a content model to an FSA */
 
-#include <malloc.h>
+#include <stdlib.h>
 #include "build.h"
 #include "context.h"
 #include "delim.h"
diff --git a/cde/programs/dthelp/parser/pass2/build/out.c b/cde/programs/dthelp/parser/pass2/build/out.c
index 1137d9900..673277d75 100644
--- a/cde/programs/dthelp/parser/pass2/build/out.c
+++ b/cde/programs/dthelp/parser/pass2/build/out.c
@@ -30,7 +30,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 /* Out.c contains the procedures used by program BUILD to output results */
 
 #include <string.h>
-#include <malloc.h>
+#include <stdlib.h>
 #if defined(MSDOS)
 #include <process.h>
 #endif
diff --git a/cde/programs/dthelp/parser/pass2/build/param.c b/cde/programs/dthelp/parser/pass2/build/param.c
index d9d4dbbf6..1bcbd9de4 100644
--- a/cde/programs/dthelp/parser/pass2/build/param.c
+++ b/cde/programs/dthelp/parser/pass2/build/param.c
@@ -29,7 +29,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 
 /* Param.c contains procedures related to parameters for program BUILD */
 
-#include <malloc.h>
+#include <stdlib.h>
 #include <string.h>
 #include "build.h"
 #include "context.h"
diff --git a/cde/programs/dthelp/parser/pass2/build/sref.c b/cde/programs/dthelp/parser/pass2/build/sref.c
index 8c7e67a01..76ca9e32f 100644
--- a/cde/programs/dthelp/parser/pass2/build/sref.c
+++ b/cde/programs/dthelp/parser/pass2/build/sref.c
@@ -26,7 +26,7 @@
 /* Sref.c contains procedures related to short reference map declarations */
 
 #include <string.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include "build.h"
 #include "sref.h"
 #include "entdef.h"
diff --git a/cde/programs/dthelp/parser/pass2/build/tree.c b/cde/programs/dthelp/parser/pass2/build/tree.c
index f14816a54..1d4e381fb 100644
--- a/cde/programs/dthelp/parser/pass2/build/tree.c
+++ b/cde/programs/dthelp/parser/pass2/build/tree.c
@@ -30,7 +30,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 /* Tree.c has procedures used by BUILD to construct the tree representation
    of a content model */
 
-#include <malloc.h>
+#include <stdlib.h>
 #include "build.h"
 #include "context.h"
 
diff --git a/cde/programs/dthelp/parser/pass2/eltdef/eltdef.c b/cde/programs/dthelp/parser/pass2/eltdef/eltdef.c
index cfe42abdb..5fdb8c262 100644
--- a/cde/programs/dthelp/parser/pass2/eltdef/eltdef.c
+++ b/cde/programs/dthelp/parser/pass2/eltdef/eltdef.c
@@ -31,7 +31,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 
 #include <stdio.h>
 #include <string.h>
-#include <malloc.h>
+#include <stdlib.h>
 #if defined(MSDOS)
 #include <process.h>
 #endif
diff --git a/cde/programs/dthelp/parser/pass2/eltdef/eltutil.c b/cde/programs/dthelp/parser/pass2/eltdef/eltutil.c
index 7c693bf57..fc052f8dc 100644
--- a/cde/programs/dthelp/parser/pass2/eltdef/eltutil.c
+++ b/cde/programs/dthelp/parser/pass2/eltdef/eltutil.c
@@ -31,7 +31,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 
 #include <stdio.h>
 #include <string.h>
-#include <malloc.h>
+#include <stdlib.h>
 #if defined(MSDOS)
 #include <process.h>
 #endif
diff --git a/cde/programs/dthelp/parser/pass2/eltdef/entity.c b/cde/programs/dthelp/parser/pass2/eltdef/entity.c
index a37855e05..f1bee6e2a 100644
--- a/cde/programs/dthelp/parser/pass2/eltdef/entity.c
+++ b/cde/programs/dthelp/parser/pass2/eltdef/entity.c
@@ -27,7 +27,7 @@
 
 #include <stdio.h>
 #include <string.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include "basic.h"
 #include "trie.h"
 #include "dtdext.h"
diff --git a/cde/programs/dthelp/parser/pass2/htag2/global.h b/cde/programs/dthelp/parser/pass2/htag2/global.h
index 5ff444a3d..3dd0417fe 100644
--- a/cde/programs/dthelp/parser/pass2/htag2/global.h
+++ b/cde/programs/dthelp/parser/pass2/htag2/global.h
@@ -33,12 +33,11 @@
 #define INIT(a)
 #endif
 
-#include <malloc.h>
+#include <stdlib.h>
 #include <string.h>
 #include <time.h>
 #if defined(MSDOS)
 #include <io.h>
-#include <stdlib.h>
 #include <process.h>
 #include <direct.h>
 #endif
diff --git a/cde/programs/dthelp/parser/pass2/parser/actutil.c b/cde/programs/dthelp/parser/pass2/parser/actutil.c
index ed1f42b48..a9adcfc32 100644
--- a/cde/programs/dthelp/parser/pass2/parser/actutil.c
+++ b/cde/programs/dthelp/parser/pass2/parser/actutil.c
@@ -31,7 +31,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 in the interface definition.*/
 
 #include <stdio.h>
-#include <malloc.h>
+#include <stdlib.h>
 #if defined(MSDOS)
 #include <process.h>
 #endif
diff --git a/cde/programs/dthelp/parser/pass2/parser/delfree.c b/cde/programs/dthelp/parser/pass2/parser/delfree.c
index 6c07544b7..4bb49c8ef 100644
--- a/cde/programs/dthelp/parser/pass2/parser/delfree.c
+++ b/cde/programs/dthelp/parser/pass2/parser/delfree.c
@@ -26,7 +26,7 @@
 /* Versions of m_free and m_malloc for debugging. */
 
 /**/
-#include <malloc.h>
+#include <stdlib.h>
 #include <stdio.h>
 #include "basic.h"
 #include "trie.h"
diff --git a/cde/programs/dthelp/parser/pass2/parser/entity.c b/cde/programs/dthelp/parser/pass2/parser/entity.c
index 3497a94bd..79544ea9f 100644
--- a/cde/programs/dthelp/parser/pass2/parser/entity.c
+++ b/cde/programs/dthelp/parser/pass2/parser/entity.c
@@ -30,7 +30,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 /* Entity.c contains procedures pertaining to entities */
 
 #include <stdio.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <string.h>
 #if defined(MSDOS)
 #include <process.h>
diff --git a/cde/programs/dthelp/parser/pass2/parser/error.c b/cde/programs/dthelp/parser/pass2/parser/error.c
index fb213125a..e689f745e 100644
--- a/cde/programs/dthelp/parser/pass2/parser/error.c
+++ b/cde/programs/dthelp/parser/pass2/parser/error.c
@@ -30,7 +30,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 /* Util.c contains general utilities for program PARSER */
 
 #include <stdio.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <string.h>
 #if defined(MSDOS)
 #include <process.h>
diff --git a/cde/programs/dthelp/parser/pass2/parser/param.c b/cde/programs/dthelp/parser/pass2/parser/param.c
index b97845655..b312070ff 100644
--- a/cde/programs/dthelp/parser/pass2/parser/param.c
+++ b/cde/programs/dthelp/parser/pass2/parser/param.c
@@ -31,7 +31,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 
 #include <string.h>
 #include <stdio.h>
-#include <malloc.h>
+#include <stdlib.h>
 #if defined(MSDOS)
 #include <process.h>
 #endif
diff --git a/cde/programs/dthelp/parser/pass2/parser/parser.c b/cde/programs/dthelp/parser/pass2/parser/parser.c
index 4cdccbb80..914954d0c 100644
--- a/cde/programs/dthelp/parser/pass2/parser/parser.c
+++ b/cde/programs/dthelp/parser/pass2/parser/parser.c
@@ -25,7 +25,7 @@
 
 #include <string.h>
 #include <stdio.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include "basic.h"
 #include "trie.h"
 #include "dtdext.h"
diff --git a/cde/programs/dthelp/parser/pass2/parser/parutil.c b/cde/programs/dthelp/parser/pass2/parser/parutil.c
index 65276f423..f2339ce69 100644
--- a/cde/programs/dthelp/parser/pass2/parser/parutil.c
+++ b/cde/programs/dthelp/parser/pass2/parser/parutil.c
@@ -31,7 +31,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 
 #include <string.h>
 #include <stdio.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <locale.h>
 #if defined(MSDOS)
 #include <process.h>
diff --git a/cde/programs/dthelp/parser/pass2/parser/scan.c b/cde/programs/dthelp/parser/pass2/parser/scan.c
index f2cf30de1..95743f553 100644
--- a/cde/programs/dthelp/parser/pass2/parser/scan.c
+++ b/cde/programs/dthelp/parser/pass2/parser/scan.c
@@ -30,7 +30,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 /* Scan.c is the scanner for program PARSER */
 
 #include <string.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <stdio.h>
 #if defined(MSDOS)
 #include <process.h>
diff --git a/cde/programs/dthelp/parser/pass2/parser/struct.c b/cde/programs/dthelp/parser/pass2/parser/struct.c
index aff0f12a5..0c940bd76 100644
--- a/cde/programs/dthelp/parser/pass2/parser/struct.c
+++ b/cde/programs/dthelp/parser/pass2/parser/struct.c
@@ -32,7 +32,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 
 #include <string.h>
 #include <stdio.h>
-#include <malloc.h>
+#include <stdlib.h>
 #if defined(MSDOS)
 #include <process.h>
 #endif
diff --git a/cde/programs/dthelp/parser/pass2/util/context.c b/cde/programs/dthelp/parser/pass2/util/context.c
index 9417aefc1..a59f93bed 100644
--- a/cde/programs/dthelp/parser/pass2/util/context.c
+++ b/cde/programs/dthelp/parser/pass2/util/context.c
@@ -156,7 +156,7 @@ delim.h.
 */
 
 #include <stdio.h>
-#include <malloc.h>
+#include <stdlib.h>
 #if defined(MSDOS)
 #include <process.h>
 #endif
diff --git a/cde/programs/dthelp/parser/pass2/util/conutil.c b/cde/programs/dthelp/parser/pass2/util/conutil.c
index 9ebc96af7..842eadb00 100644
--- a/cde/programs/dthelp/parser/pass2/util/conutil.c
+++ b/cde/programs/dthelp/parser/pass2/util/conutil.c
@@ -30,7 +30,7 @@ This product and information is proprietary of Tandem Computers Incorporated.
 /* Conutil has utility procedures for program CONTEXT. */
 #include <stdio.h>
 #include <string.h>
-#include <malloc.h>
+#include <stdlib.h>
 #if defined(MSDOS)
 #include <process.h>
 #endif
diff --git a/cde/programs/dthelp/parser/pass2/util/fclndir.c b/cde/programs/dthelp/parser/pass2/util/fclndir.c
index 28d4759ba..fd715f563 100644
--- a/cde/programs/dthelp/parser/pass2/util/fclndir.c
+++ b/cde/programs/dthelp/parser/pass2/util/fclndir.c
@@ -35,7 +35,7 @@ with an error code of 0 if the files are the same, 1 if they differ, and
 */
 
 #include <stdio.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <string.h>
 #if defined(MSDOS)
 #include <process.h>
diff --git a/cde/programs/dthelp/parser/pass2/util/malloc.c b/cde/programs/dthelp/parser/pass2/util/malloc.c
index ce47d8e73..a7be15503 100644
--- a/cde/programs/dthelp/parser/pass2/util/malloc.c
+++ b/cde/programs/dthelp/parser/pass2/util/malloc.c
@@ -26,7 +26,7 @@
 /* Interfaces to free and malloc with optional debugging traces */
 
 /**/
-#include <malloc.h>
+#include <stdlib.h>
 #include <stdio.h>
 #if defined(MSDOS)
 #include <process.h>
diff --git a/cde/programs/dtinfo/DtMmdb/dti_excs/Exceptions.hh b/cde/programs/dtinfo/DtMmdb/dti_excs/Exceptions.hh
index 8ff310af0..754b3427e 100644
--- a/cde/programs/dtinfo/DtMmdb/dti_excs/Exceptions.hh
+++ b/cde/programs/dtinfo/DtMmdb/dti_excs/Exceptions.hh
@@ -10,7 +10,6 @@ extern "C" {
 #include <setjmp.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <malloc.h>
 }
 
 #ifdef EXC_DEBUG
diff --git a/cde/programs/dtinfo/dtinfo/src/Basic/ParseTree.C b/cde/programs/dtinfo/dtinfo/src/Basic/ParseTree.C
index ae54b534c..656d5fe22 100644
--- a/cde/programs/dtinfo/dtinfo/src/Basic/ParseTree.C
+++ b/cde/programs/dtinfo/dtinfo/src/Basic/ParseTree.C
@@ -46,7 +46,7 @@
 
 #include "../Prelude.h"
 #include <string.h>
-#include <malloc.h>
+#include <stdlib.h>
 
 #ifdef SUN_CPP
 #define InitBase(T) \
diff --git a/cde/programs/dtinfo/dtinfo/src/cgm/cgm.h b/cde/programs/dtinfo/dtinfo/src/cgm/cgm.h
index fd01d2565..03ea10b50 100644
--- a/cde/programs/dtinfo/dtinfo/src/cgm/cgm.h
+++ b/cde/programs/dtinfo/dtinfo/src/cgm/cgm.h
@@ -24,7 +24,7 @@
 /* This is the module containing common definitions for all modules of */
 /* the CGM Pixmap generator */
 #include <stdio.h>		/* standard I/O package */
-#include <malloc.h>
+#include <stdlib.h>
 #include <X11/Xlib.h>     /* XLib stuff */
 #include <X11/Intrinsic.h>     /* Xt toolkit */
 #include "GraphicsP.h"
diff --git a/cde/programs/dtinfo/dtinfo/src/external-api/comm.c b/cde/programs/dtinfo/dtinfo/src/external-api/comm.c
index c9bd69b7e..5223de315 100644
--- a/cde/programs/dtinfo/dtinfo/src/external-api/comm.c
+++ b/cde/programs/dtinfo/dtinfo/src/external-api/comm.c
@@ -46,7 +46,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <malloc.h>
 #include <errno.h>
 #include <sys/types.h>
 #include <sys/time.h>
diff --git a/cde/programs/dtksh/dtksh.c b/cde/programs/dtksh/dtksh.c
index 454a6d747..fdda16e4f 100644
--- a/cde/programs/dtksh/dtksh.c
+++ b/cde/programs/dtksh/dtksh.c
@@ -34,7 +34,6 @@
 #include <sys/stat.h>
 #include <string.h>
 #include <stdlib.h>
-#include <malloc.h>
 
 #define CONSTCHAR (const char *)
 #define TRUE 1
diff --git a/cde/programs/dtksh/xmcmds.c b/cde/programs/dtksh/xmcmds.c
index 1f989db27..1a8282863 100644
--- a/cde/programs/dtksh/xmcmds.c
+++ b/cde/programs/dtksh/xmcmds.c
@@ -31,7 +31,7 @@
 
 #include	"shell.h" 
 #include <signal.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <fcntl.h>
 #include <nl_types.h>
 #include <X11/X.h>
diff --git a/cde/programs/dtmail/dtmail/MsgHndArray.hh b/cde/programs/dtmail/dtmail/MsgHndArray.hh
index a486dd625..726ac99ea 100644
--- a/cde/programs/dtmail/dtmail/MsgHndArray.hh
+++ b/cde/programs/dtmail/dtmail/MsgHndArray.hh
@@ -26,7 +26,6 @@
 #if defined(USL) && (OSMAJORVERSION == 2)
 extern "C" {
 #endif
-#include <malloc.h>
 #if defined(USL) && (OSMAJORVERSION == 2)
 };
 #endif
diff --git a/cde/programs/dtmail/libDtMail/Common/Buffer.C b/cde/programs/dtmail/libDtMail/Common/Buffer.C
index d5f5dd605..13fec632f 100644
--- a/cde/programs/dtmail/libDtMail/Common/Buffer.C
+++ b/cde/programs/dtmail/libDtMail/Common/Buffer.C
@@ -50,7 +50,6 @@
 #if defined(USL) && (OSMAJORVERSION == 2)
 extern "C" {
 #endif
-#include <malloc.h>
 #if defined(USL) && (OSMAJORVERSION == 2)
 };
 #endif
diff --git a/cde/programs/dtmail/libDtMail/Common/Session.C b/cde/programs/dtmail/libDtMail/Common/Session.C
index 12da10157..d81434c5a 100644
--- a/cde/programs/dtmail/libDtMail/Common/Session.C
+++ b/cde/programs/dtmail/libDtMail/Common/Session.C
@@ -60,7 +60,6 @@
 #include <ctype.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include <malloc.h>
 #include <string.h>
 #include <pwd.h>
 #include <sys/socket.h>
@@ -90,7 +89,6 @@
 #if defined(USL) && (OSMAJORVERSION == 2)
 extern "C" {
 #endif
-#include <malloc.h>
 #if defined(USL) && (OSMAJORVERSION == 2)
 };
 #endif