From 45b4fef7d6f0411c7ccbe8a32b386a7aa61a2477 Mon Sep 17 00:00:00 2001
From: dtrg <none@none>
Date: Sun, 30 Jul 2006 23:40:35 +0000
Subject: [PATCH] Rationalised use of #includes to be more standards-compliant.

---
 lang/cem/cpp.ansi/init.c    |  8 +++++---
 lang/cem/cpp.ansi/options.c |  4 +++-
 lang/cem/cpp.ansi/replace.c |  8 ++++++--
 lang/m2/comp/LLlex.c        | 12 ++++++++----
 lang/m2/comp/enter.c        | 14 +++++++++-----
 lang/m2/comp/misc.c         | 10 +++++++---
 modules/src/em_code/em.c    |  5 +++--
 util/led/relocate.c         |  4 +++-
 util/led/save.c             |  9 +++++----
 util/led/scan.c             |  8 +++++---
 10 files changed, 54 insertions(+), 28 deletions(-)

diff --git a/lang/cem/cpp.ansi/init.c b/lang/cem/cpp.ansi/init.c
index b3f81d312..a9cba4dba 100644
--- 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 36c0999cf..fb16ef8fb 100644
--- 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 5f4b7f77b..94bb22f3a 100644
--- 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 03b878f71..edd166490 100644
--- 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 8484c6e78..002caa838 100644
--- 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 16201cc19..d7a88ea5a 100644
--- 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 e484a3ec9..8a2f16e42 100644
--- 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 c618bb7b0..9c369560e 100644
--- 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 f760bc99c..a311d0413 100644
--- 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 c59e55c26..383e0d70f 100644
--- 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"