Move <string.h> inclusion to compiler.h

There is absolutely no reason not to include <string.h> globally, and
with the inline function for mempcpy() we need it there anyway.

Signed-off-by: H. Peter Anvin <hpa@zytor.com>

46 files changed, 1 insertions, 45 deletions

diff --git a/asm/assemble.c b/asm/assemble.c
index 115eea22..f84b9639 100644
--- a/asm/assemble.c
+++ b/asm/assemble.c
@@ -178,7 +178,6 @@
 #include "compiler.h"
 
 #include <stdio.h>
-#include <string.h>
 #include <stdlib.h>
 
 #include "nasm.h"
diff --git a/asm/directiv.c b/asm/directiv.c
index 46079b48..94b2468f 100644
--- a/asm/directiv.c
+++ b/asm/directiv.c
@@ -38,7 +38,6 @@
 #include "compiler.h"
 
 #include <stdlib.h>
-#include <string.h>
 #include <ctype.h>
 #include <limits.h>
 
diff --git a/asm/eval.c b/asm/eval.c
index 28db3276..354d5b24 100644
--- a/asm/eval.c
+++ b/asm/eval.c
@@ -40,7 +40,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <stddef.h>
-#include <string.h>
 #include <ctype.h>
 
 #include "nasm.h"
diff --git a/asm/float.c b/asm/float.c
index 187b9e5e..71896a3a 100644
--- a/asm/float.c
+++ b/asm/float.c
@@ -40,7 +40,6 @@
 #include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 
 #include "nasm.h"
 #include "float.h"
diff --git a/asm/labels.c b/asm/labels.c
index 93eaa2de..6484624f 100644
--- a/asm/labels.c
+++ b/asm/labels.c
@@ -38,7 +38,6 @@
 #include "compiler.h"
 
 #include <stdio.h>
-#include <string.h>
 #include <stdlib.h>
 
 #include "nasm.h"
diff --git a/asm/listing.c b/asm/listing.c
index 67c07fc9..3205a0df 100644
--- a/asm/listing.c
+++ b/asm/listing.c
@@ -40,7 +40,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <stddef.h>
-#include <string.h>
 #include <ctype.h>
 
 #include "nasm.h"
diff --git a/asm/nasm.c b/asm/nasm.c
index ae5e8b91..f967fd6b 100644
--- a/asm/nasm.c
+++ b/asm/nasm.c
@@ -40,7 +40,6 @@
 #include <stdio.h>
 #include <stdarg.h>
 #include <stdlib.h>
-#include <string.h>
 #include <limits.h>
 
 #include "nasm.h"
diff --git a/asm/parser.c b/asm/parser.c
index 9349e25e..451ffa67 100644
--- a/asm/parser.c
+++ b/asm/parser.c
@@ -40,7 +40,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <stddef.h>
-#include <string.h>
 #include <ctype.h>
 
 #include "nasm.h"
diff --git a/asm/pragma.c b/asm/pragma.c
index b6878e9d..12b7ed25 100644
--- a/asm/pragma.c
+++ b/asm/pragma.c
@@ -40,7 +40,6 @@
 #include "compiler.h"
 
 #include <stdlib.h>
-#include <string.h>
 #include <ctype.h>
 #include <limits.h>
 
diff --git a/asm/preproc-nop.c b/asm/preproc-nop.c
index 3d77dd52..12b8443b 100644
--- a/asm/preproc-nop.c
+++ b/asm/preproc-nop.c
@@ -42,7 +42,6 @@
 #include <stdio.h>
 #include <stdarg.h>
 #include <stdlib.h>
-#include <string.h>
 #include <ctype.h>
 #include <limits.h>
 #include <time.h>
diff --git a/asm/preproc.c b/asm/preproc.c
index 93dcd263..2ee37ea4 100644
--- a/asm/preproc.c
+++ b/asm/preproc.c
@@ -66,7 +66,6 @@
 #include <stdarg.h>
 #include <stdlib.h>
 #include <stddef.h>
-#include <string.h>
 #include <ctype.h>
 #include <limits.h>
 
diff --git a/asm/srcfile.c b/asm/srcfile.c
index 73054853..eb456ecb 100644
--- a/asm/srcfile.c
+++ b/asm/srcfile.c
@@ -37,7 +37,6 @@
 
 #include "compiler.h"
 
-#include <string.h>
 #include <inttypes.h>
 
 #include "nasmlib.h"
diff --git a/asm/stdscan.c b/asm/stdscan.c
index 4f256fc6..27879259 100644
--- a/asm/stdscan.c
+++ b/asm/stdscan.c
@@ -35,7 +35,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 #include <ctype.h>
 
 #include "nasm.h"
diff --git a/disasm/disasm.c b/disasm/disasm.c
index fd3eb42a..7928827a 100644
--- a/disasm/disasm.c
+++ b/disasm/disasm.c
@@ -38,7 +38,6 @@
 #include "compiler.h"
 
 #include <stdio.h>
-#include <string.h>
 #include <limits.h>
 
 #include "nasm.h"
diff --git a/disasm/ndisasm.c b/disasm/ndisasm.c
index 0863309f..4497c388 100644
--- a/disasm/ndisasm.c
+++ b/disasm/ndisasm.c
@@ -40,7 +40,6 @@
 #include <stdio.h>
 #include <stdarg.h>
 #include <stdlib.h>
-#include <string.h>
 #include <ctype.h>
 #include <errno.h>
 
diff --git a/include/compiler.h b/include/compiler.h
index b390bc2d..25aeea1e 100644
--- a/include/compiler.h
+++ b/include/compiler.h
@@ -82,6 +82,7 @@
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <limits.h>
 
 #ifdef HAVE_SYS_TYPES_H
diff --git a/include/iflag.h b/include/iflag.h
index 5280703e..f3056c3d 100644
--- a/include/iflag.h
+++ b/include/iflag.h
@@ -4,7 +4,6 @@
 #include "compiler.h"
 #include "ilog2.h"
 
-#include <string.h>
 
 #include "iflaggen.h"
 
diff --git a/include/nasmlib.h b/include/nasmlib.h
index d744a7b8..e342a293 100644
--- a/include/nasmlib.h
+++ b/include/nasmlib.h
@@ -42,7 +42,6 @@
 #include "bytesex.h"
 
 #include <stdio.h>
-#include <string.h>
 #ifdef HAVE_STRINGS_H
 # include <strings.h>
 #endif
diff --git a/misc/omfdump.c b/misc/omfdump.c
index b990b68e..b27e7c90 100644
--- a/misc/omfdump.c
+++ b/misc/omfdump.c
@@ -14,7 +14,6 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <stdbool.h>
-#include <string.h>
 #include <sys/mman.h>
 #include <sys/stat.h>
 
diff --git a/misc/xcrcgen.c b/misc/xcrcgen.c
index acfd48e0..01984800 100644
--- a/misc/xcrcgen.c
+++ b/misc/xcrcgen.c
@@ -8,7 +8,6 @@
 #include <inttypes.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 #include <unistd.h>
 
 static uint8_t get_random_byte(void)
diff --git a/nasmlib/bsi.c b/nasmlib/bsi.c
index a811e45e..ae31f482 100644
--- a/nasmlib/bsi.c
+++ b/nasmlib/bsi.c
@@ -37,7 +37,6 @@
 
 #include "compiler.h"
 
-#include <string.h>
 
 #include "nasmlib.h"
 
diff --git a/nasmlib/hashtbl.c b/nasmlib/hashtbl.c
index b89b0200..3f4a957c 100644
--- a/nasmlib/hashtbl.c
+++ b/nasmlib/hashtbl.c
@@ -39,7 +39,6 @@
 
 #include "compiler.h"
 
-#include <string.h>
 #include "nasm.h"
 #include "hashtbl.h"
 
diff --git a/nasmlib/md5c.c b/nasmlib/md5c.c
index 9b061361..79cf4e09 100644
--- a/nasmlib/md5c.c
+++ b/nasmlib/md5c.c
@@ -16,7 +16,6 @@
  */
 
 #include "md5.h"
-#include <string.h>             /* for memcpy() */
 
 #ifdef WORDS_LITTLEENDIAN
 #define byteReverse(buf, len)	/* Nothing */
diff --git a/nasmlib/ver.c b/nasmlib/ver.c
index b1638b7d..d05fc2d1 100644
--- a/nasmlib/ver.c
+++ b/nasmlib/ver.c
@@ -32,7 +32,6 @@
  * ----------------------------------------------------------------------- */
 
 #include <stdlib.h>
-#include <string.h>
 
 #include "ver.h"
 #include "version.h"
diff --git a/output/outaout.c b/output/outaout.c
index 61f21119..0a011794 100644
--- a/output/outaout.c
+++ b/output/outaout.c
@@ -40,7 +40,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 #include <ctype.h>
 
 #include "nasm.h"
diff --git a/output/outas86.c b/output/outas86.c
index eed0396d..075ed05e 100644
--- a/output/outas86.c
+++ b/output/outas86.c
@@ -40,7 +40,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 #include <ctype.h>
 
 #include "nasm.h"
diff --git a/output/outbin.c b/output/outbin.c
index 73a4d8a7..3eaded0a 100644
--- a/output/outbin.c
+++ b/output/outbin.c
@@ -77,7 +77,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 #include <ctype.h>
 
 #include "nasm.h"
diff --git a/output/outcoff.c b/output/outcoff.c
index 2c8520f1..a2c427a3 100644
--- a/output/outcoff.c
+++ b/output/outcoff.c
@@ -40,7 +40,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 #include <ctype.h>
 #include <time.h>
 
diff --git a/output/outdbg.c b/output/outdbg.c
index e5f15ef7..601f8719 100644
--- a/output/outdbg.c
+++ b/output/outdbg.c
@@ -40,7 +40,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 #include <ctype.h>
 #include <errno.h>
 
diff --git a/output/outform.c b/output/outform.c
index f227be43..3353e2bb 100644
--- a/output/outform.c
+++ b/output/outform.c
@@ -41,7 +41,6 @@
 #include "compiler.h"
 
 #include <stdio.h>
-#include <string.h>
 
 #define BUILD_DRIVERS_ARRAY
 #include "outform.h"
diff --git a/output/outieee.c b/output/outieee.c
index f2f598ee..57c52450 100644
--- a/output/outieee.c
+++ b/output/outieee.c
@@ -69,7 +69,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 #include <time.h>
 #include <stdarg.h>             /* Note: we need the ANSI version of stdarg.h */
 #include <ctype.h>
diff --git a/output/outmacho.c b/output/outmacho.c
index 6482be09..841dbf0a 100644
--- a/output/outmacho.c
+++ b/output/outmacho.c
@@ -40,7 +40,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 #include <ctype.h>
 
 #include "nasm.h"
diff --git a/output/outobj.c b/output/outobj.c
index c7407cf9..dee4f97e 100644
--- a/output/outobj.c
+++ b/output/outobj.c
@@ -40,7 +40,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 #include <ctype.h>
 #include <limits.h>
 
diff --git a/output/outrdf2.c b/output/outrdf2.c
index c649a5a6..008e7f14 100644
--- a/output/outrdf2.c
+++ b/output/outrdf2.c
@@ -41,7 +41,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 #include <ctype.h>
 #include <assert.h>
 
diff --git a/rdoff/ldrdf.c b/rdoff/ldrdf.c
index 49729b4f..a78c4504 100644
--- a/rdoff/ldrdf.c
+++ b/rdoff/ldrdf.c
@@ -54,7 +54,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 
 #include "rdfutils.h"
 #include "symtab.h"
diff --git a/rdoff/rdf2bin.c b/rdoff/rdf2bin.c
index 1beb8245..2c58e606 100644
--- a/rdoff/rdf2bin.c
+++ b/rdoff/rdf2bin.c
@@ -39,7 +39,6 @@
 
 #include <stdlib.h>
 #include <stdio.h>
-#include <string.h>
 #include <ctype.h>
 #include <errno.h>
 
diff --git a/rdoff/rdfdump.c b/rdoff/rdfdump.c
index b483477b..1d57d6d7 100644
--- a/rdoff/rdfdump.c
+++ b/rdoff/rdfdump.c
@@ -39,7 +39,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 
 #include "rdfutils.h"
 
diff --git a/rdoff/rdflib.c b/rdoff/rdflib.c
index 8dbff4af..d363b3e5 100644
--- a/rdoff/rdflib.c
+++ b/rdoff/rdflib.c
@@ -62,7 +62,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <errno.h>
-#include <string.h>
 #include <time.h>
 
 /* functions supported:
diff --git a/rdoff/rdfload.c b/rdoff/rdfload.c
index 6977a707..1c24f2fc 100644
--- a/rdoff/rdfload.c
+++ b/rdoff/rdfload.c
@@ -46,7 +46,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 
 #include "rdfload.h"
 #include "symtab.h"
diff --git a/rdoff/rdlar.c b/rdoff/rdlar.c
index 419d2d0d..0922d9ec 100644
--- a/rdoff/rdlar.c
+++ b/rdoff/rdlar.c
@@ -41,7 +41,6 @@
 #include <stdlib.h>
 #include <ctype.h>
 #include <stdarg.h>
-#include <string.h>
 #include <errno.h>
 #include <time.h>
 #include <sys/types.h>
diff --git a/rdoff/rdlib.c b/rdoff/rdlib.c
index d8f2fc7a..320a1664 100644
--- a/rdoff/rdlib.c
+++ b/rdoff/rdlib.c
@@ -39,7 +39,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 
 #include "rdfutils.h"
 #include "rdlib.h"
diff --git a/rdoff/rdoff.c b/rdoff/rdoff.c
index e77c88ef..3fd2a0e9 100644
--- a/rdoff/rdoff.c
+++ b/rdoff/rdoff.c
@@ -44,7 +44,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 #include <errno.h>
 
 #include "rdfutils.h"
diff --git a/rdoff/symtab.c b/rdoff/symtab.c
index 270fb89c..d9e9a3b7 100644
--- a/rdoff/symtab.c
+++ b/rdoff/symtab.c
@@ -41,7 +41,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 
 #include "symtab.h"
 #include "hash.h"
diff --git a/stdlib/strnlen.c b/stdlib/strnlen.c
index 40eacf54..193245ed 100644
--- a/stdlib/strnlen.c
+++ b/stdlib/strnlen.c
@@ -32,7 +32,6 @@
  * ----------------------------------------------------------------------- */
 
 #include "compiler.h"
-#include <string.h>
 
 #ifndef HAVE_STRNLEN
 
diff --git a/stdlib/strrchrnul.c b/stdlib/strrchrnul.c
index d25148eb..2fc8eb62 100644
--- a/stdlib/strrchrnul.c
+++ b/stdlib/strrchrnul.c
@@ -32,7 +32,6 @@
  * ----------------------------------------------------------------------- */
 
 #include "compiler.h"
-#include <string.h>
 
 #ifndef HAVE_STRRCHRNUL
 
diff --git a/stdlib/vsnprintf.c b/stdlib/vsnprintf.c
index ea83921c..f3106d26 100644
--- a/stdlib/vsnprintf.c
+++ b/stdlib/vsnprintf.c
@@ -10,7 +10,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
-#include <string.h>
 
 #include "nasmlib.h"
 #include "error.h"