Rationalised use of #includes to be more standards-compliant.

diff --git a/lang/cem/cpp.ansi/init.c b/lang/cem/cpp.ansi/init.c
index b3f81d3..a9cba4d 100644 (file)
--- a/lang/cem/cpp.ansi/init.c
+++ b/lang/cem/cpp.ansi/init.c
@@ -5,9 +5,11 @@
 /* $Id$ */
 /* PREPROCESSOR: INITIALIZATION ROUTINES */
 
-#include       <system.h>
-#include       <alloc.h>
-#include       <time.h>
+#include    <stdlib.h>
+#include    <string.h>
+#include       "system.h"
+#include       "alloc.h"
+#include       "time.h"
 #include       "class.h"
 #include       "macro.h"
 #include       "idf.h"

diff --git a/lang/cem/cpp.ansi/options.c b/lang/cem/cpp.ansi/options.c
index 36c0999..fb16ef8 100644 (file)
--- a/lang/cem/cpp.ansi/options.c
+++ b/lang/cem/cpp.ansi/options.c
@@ -5,7 +5,9 @@
 /* $Id$ */
 /* USER-OPTION HANDLING */
 
-#include       <alloc.h>
+#include    <stdlib.h>
+#include    <string.h>
+#include       "alloc.h"
 #include       "idfsize.h"
 #include       "class.h"
 #include       "macro.h"

diff --git a/lang/cem/cpp.ansi/replace.c b/lang/cem/cpp.ansi/replace.c
index 5f4b7f7..94bb22f 100644 (file)
--- a/lang/cem/cpp.ansi/replace.c
+++ b/lang/cem/cpp.ansi/replace.c
@@ -5,12 +5,16 @@
 /* $Id$ */
 /*  M A C R O   R E P L A C E M E N T */
 
+#include       <stdlib.h>
+#include       <stdio.h>
+#include       <string.h>
+
 #include       "pathlength.h"
 #include       "strsize.h"
 #include       "nparams.h"
 #include       "idfsize.h"
 #include       "numsize.h"
-#include       <alloc.h>
+#include       "alloc.h"
 #include       "idf.h"
 #include       "input.h"
 #include       "macro.h"
@@ -18,7 +22,7 @@
 #include       "LLlex.h"
 #include       "class.h"
 #include       "debug.h"
-#include       <assert.h>
+#include       "assert.h"
 #include       "macbuf.h"
 #include       "replace.h"
 

diff --git a/lang/m2/comp/LLlex.c b/lang/m2/comp/LLlex.c
index 03b878f..edd1664 100644 (file)
--- a/lang/m2/comp/LLlex.c
+++ b/lang/m2/comp/LLlex.c
@@ -9,15 +9,19 @@
 
 /* $Id$ */
 
+#include       <stdlib.h>
+#include       <stdio.h>
+#include       <string.h>
+
 #include       "debug.h"
 #include       "idfsize.h"
 #include       "numsize.h"
 #include       "strsize.h"
 
-#include       <alloc.h>
-#include       <em_arith.h>
-#include       <em_label.h>
-#include       <assert.h>
+#include       "alloc.h"
+#include       "em_arith.h"
+#include       "em_label.h"
+#include       "assert.h"
 
 #include       "LLlex.h"
 #include       "input.h"

diff --git a/lang/m2/comp/enter.c b/lang/m2/comp/enter.c
index 8484c6e..002caa8 100644 (file)
--- a/lang/m2/comp/enter.c
+++ b/lang/m2/comp/enter.c
@@ -9,13 +9,17 @@
 
 /* $Id$ */
 
+#include       <stdlib.h>
+#include       <stdio.h>
+#include       <string.h>
+
 #include       "debug.h"
 
-#include       <alloc.h>
-#include       <em_arith.h>
-#include       <em_label.h>
-#include       <em_code.h>
-#include       <assert.h>
+#include       "alloc.h"
+#include       "em_arith.h"
+#include       "em_label.h"
+#include       "em_code.h"
+#include       "assert.h"
 
 #include       "dbsymtab.h"
 #include       "idf.h"

diff --git a/lang/m2/comp/misc.c b/lang/m2/comp/misc.c
index 16201cc..d7a88ea 100644 (file)
--- a/lang/m2/comp/misc.c
+++ b/lang/m2/comp/misc.c
@@ -9,9 +9,13 @@
 
 /* $Id$ */
 
-#include       <alloc.h>
-#include       <em_arith.h>
-#include       <em_label.h>
+#include       <stdlib.h>
+#include       <stdio.h>
+#include       <string.h>
+
+#include       "alloc.h"
+#include       "em_arith.h"
+#include       "em_label.h"
 
 #include       "f_info.h"
 #include       "misc.h"

diff --git a/modules/src/em_code/em.c b/modules/src/em_code/em.c
index e484a3e..8a2f16e 100644 (file)
--- a/modules/src/em_code/em.c
+++ b/modules/src/em_code/em.c
@@ -11,8 +11,9 @@
 
 #include <stdlib.h>
 #include <stdio.h>
-#include <alloc.h>
-#include <em_arith.h>
+#include <string.h>
+#include "alloc.h"
+#include "em_arith.h"
 #include "insert.h"
 #include "em_private.h"
 

diff --git a/util/led/relocate.c b/util/led/relocate.c
index c618bb7..9c36956 100644 (file)
--- a/util/led/relocate.c
+++ b/util/led/relocate.c
@@ -6,7 +6,9 @@
 static char rcsid[] = "$Id$";
 #endif
 
-#include <out.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include "out.h"
 #include "const.h"
 #include "debug.h"
 #include "defs.h"

diff --git a/util/led/save.c b/util/led/save.c
index f760bc9..a311d04 100644 (file)
--- a/util/led/save.c
+++ b/util/led/save.c
@@ -10,8 +10,11 @@ static char rcsid[] = "$Id$";
  * If everything is kept in core, we must save some things for the second pass.
  */
 
-#include <arch.h>
-#include <out.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include "arch.h"
+#include "out.h"
 #include "const.h"
 #include "assert.h"
 #include "memory.h"
@@ -61,10 +64,8 @@ savechar(piece, off)
 {
        register long   len;
        register ind_t  newoff;
-       extern int      strlen();
        extern ind_t    alloc();
        extern ind_t    hard_alloc();
-       extern char     *strcpy();
 
        if (off == (ind_t)0)
                return 0;

diff --git a/util/led/scan.c b/util/led/scan.c
index c59e55c..383e0d7 100644 (file)
--- a/util/led/scan.c
+++ b/util/led/scan.c
@@ -6,13 +6,15 @@
 static char rcsid[] = "$Id$";
 #endif
 
+#include <stdlib.h>
+#include <stdio.h>
 #ifdef SYMDBUG
 #include <sys/types.h>
 #include <sys/stat.h>
 #endif /* SYMDBUG */
-#include <arch.h>
-#include <out.h>
-#include <ranlib.h>
+#include "arch.h"
+#include "out.h"
+#include "ranlib.h"
 #include "const.h"
 #include "assert.h"
 #include "memory.h"