Remove #includes already provided by "compiler.h"

"compiler.h" already includes a bunch of common include files. There
is absolutely no reason to duplicate them in individual files, and in
fact it robs us of central control of how these files are used.

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

40 files changed, 0 insertions, 87 deletions

diff --git a/asm/assemble.c b/asm/assemble.c
index f84b9639..fc216a8f 100644
--- a/asm/assemble.c
+++ b/asm/assemble.c
@@ -177,8 +177,6 @@
 
 #include "compiler.h"
 
-#include <stdio.h>
-#include <stdlib.h>
 
 #include "nasm.h"
 #include "nasmlib.h"
diff --git a/asm/directiv.c b/asm/directiv.c
index 8be5e2c5..943e532f 100644
--- a/asm/directiv.c
+++ b/asm/directiv.c
@@ -37,9 +37,7 @@
 
 #include "compiler.h"
 
-#include <stdlib.h>
 #include "nctype.h"
-#include <limits.h>
 
 #include "nasm.h"
 #include "nasmlib.h"
diff --git a/asm/error.c b/asm/error.c
index 2e927a64..ef3fd988 100644
--- a/asm/error.c
+++ b/asm/error.c
@@ -37,7 +37,6 @@
 
 #include "compiler.h"
 
-#include <stdlib.h>
 
 #include "nasmlib.h"
 #include "error.h"
diff --git a/asm/eval.c b/asm/eval.c
index 73d42223..d8fe34ae 100644
--- a/asm/eval.c
+++ b/asm/eval.c
@@ -37,9 +37,6 @@
 
 #include "compiler.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <stddef.h>
 #include "nctype.h"
 
 #include "nasm.h"
diff --git a/asm/float.c b/asm/float.c
index 3d389447..3ae59f0e 100644
--- a/asm/float.c
+++ b/asm/float.c
@@ -38,8 +38,6 @@
 #include "compiler.h"
 
 #include "nctype.h"
-#include <stdio.h>
-#include <stdlib.h>
 
 #include "nasm.h"
 #include "float.h"
diff --git a/asm/labels.c b/asm/labels.c
index 84099dea..7527156d 100644
--- a/asm/labels.c
+++ b/asm/labels.c
@@ -37,8 +37,6 @@
 
 #include "compiler.h"
 
-#include <stdio.h>
-#include <stdlib.h>
 
 #include "nasm.h"
 #include "nasmlib.h"
diff --git a/asm/listing.c b/asm/listing.c
index 57f3758f..b356a3d2 100644
--- a/asm/listing.c
+++ b/asm/listing.c
@@ -37,9 +37,6 @@
 
 #include "compiler.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <stddef.h>
 #include "nctype.h"
 
 #include "nasm.h"
diff --git a/asm/nasm.c b/asm/nasm.c
index 644712c4..6a0a8b00 100644
--- a/asm/nasm.c
+++ b/asm/nasm.c
@@ -37,10 +37,6 @@
 
 #include "compiler.h"
 
-#include <stdio.h>
-#include <stdarg.h>
-#include <stdlib.h>
-#include <limits.h>
 
 #include "nasm.h"
 #include "nasmlib.h"
diff --git a/asm/parser.c b/asm/parser.c
index cfaff93d..9f38844f 100644
--- a/asm/parser.c
+++ b/asm/parser.c
@@ -37,9 +37,6 @@
 
 #include "compiler.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <stddef.h>
 #include "nctype.h"
 
 #include "nasm.h"
diff --git a/asm/pragma.c b/asm/pragma.c
index 363e593c..88f8ae73 100644
--- a/asm/pragma.c
+++ b/asm/pragma.c
@@ -39,9 +39,7 @@
 
 #include "compiler.h"
 
-#include <stdlib.h>
 #include "nctype.h"
-#include <limits.h>
 
 #include "nasm.h"
 #include "nasmlib.h"
diff --git a/asm/preproc-nop.c b/asm/preproc-nop.c
index 63fa3c1e..575896ed 100644
--- a/asm/preproc-nop.c
+++ b/asm/preproc-nop.c
@@ -39,11 +39,7 @@
 
 #include "compiler.h"
 
-#include <stdio.h>
-#include <stdarg.h>
-#include <stdlib.h>
 #include "nctype.h"
-#include <limits.h>
 #include <time.h>
 
 #include "nasm.h"
diff --git a/asm/preproc.c b/asm/preproc.c
index 7eb78343..833a3d47 100644
--- a/asm/preproc.c
+++ b/asm/preproc.c
@@ -62,12 +62,7 @@
 
 #include "compiler.h"
 
-#include <stdio.h>
-#include <stdarg.h>
-#include <stdlib.h>
-#include <stddef.h>
 #include "nctype.h"
-#include <limits.h>
 
 #include "nasm.h"
 #include "nasmlib.h"
diff --git a/asm/quote.c b/asm/quote.c
index 75a93726..7dd24291 100644
--- a/asm/quote.c
+++ b/asm/quote.c
@@ -37,7 +37,6 @@
 
 #include "compiler.h"
 
-#include <stdlib.h>
 
 #include "nasmlib.h"
 #include "quote.h"
diff --git a/asm/srcfile.c b/asm/srcfile.c
index eb456ecb..0f35c5af 100644
--- a/asm/srcfile.c
+++ b/asm/srcfile.c
@@ -37,7 +37,6 @@
 
 #include "compiler.h"
 
-#include <inttypes.h>
 
 #include "nasmlib.h"
 #include "hashtbl.h"
diff --git a/asm/stdscan.c b/asm/stdscan.c
index e3bae3e6..8f6a3c61 100644
--- a/asm/stdscan.c
+++ b/asm/stdscan.c
@@ -33,8 +33,6 @@
 
 #include "compiler.h"
 
-#include <stdio.h>
-#include <stdlib.h>
 #include "nctype.h"
 
 #include "nasm.h"
diff --git a/asm/tokhash.pl b/asm/tokhash.pl
index 165437ac..186924cd 100755
--- a/asm/tokhash.pl
+++ b/asm/tokhash.pl
@@ -207,7 +207,6 @@ if ($output eq 'h') {
     print "\n";
 
     print "#include \"compiler.h\"\n";
-    print "#include <string.h>\n";
     print "#include \"nasm.h\"\n";
     print "#include \"hashtbl.h\"\n";
     print "#include \"insns.h\"\n";
diff --git a/disasm/disasm.c b/disasm/disasm.c
index 7928827a..e1b5ebc3 100644
--- a/disasm/disasm.c
+++ b/disasm/disasm.c
@@ -37,8 +37,6 @@
 
 #include "compiler.h"
 
-#include <stdio.h>
-#include <limits.h>
 
 #include "nasm.h"
 #include "disasm.h"
diff --git a/disasm/ndisasm.c b/disasm/ndisasm.c
index 924eb568..6b4ca49d 100644
--- a/disasm/ndisasm.c
+++ b/disasm/ndisasm.c
@@ -37,9 +37,6 @@
 
 #include "compiler.h"
 
-#include <stdio.h>
-#include <stdarg.h>
-#include <stdlib.h>
 #include "nctype.h"
 #include <errno.h>
 
diff --git a/disasm/sync.c b/disasm/sync.c
index 7116b229..b9b866ea 100644
--- a/disasm/sync.c
+++ b/disasm/sync.c
@@ -37,9 +37,6 @@
 
 #include "compiler.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <limits.h>
 
 #include "nasmlib.h"
 #include "sync.h"
diff --git a/include/hashtbl.h b/include/hashtbl.h
index 239f6104..4c6cd5e3 100644
--- a/include/hashtbl.h
+++ b/include/hashtbl.h
@@ -40,7 +40,6 @@
 #ifndef NASM_HASHTBL_H
 #define NASM_HASHTBL_H
 
-#include <stddef.h>
 #include "nasmlib.h"
 
 struct hash_node {
diff --git a/include/ilog2.h b/include/ilog2.h
index 3a828be8..bba45955 100644
--- a/include/ilog2.h
+++ b/include/ilog2.h
@@ -35,7 +35,6 @@
 #define ILOG2_H
 
 #include "compiler.h"
-#include <limits.h>
 
 #ifdef ILOG2_C                  /* For generating the out-of-line functions */
 # undef extern_inline
diff --git a/include/nasm.h b/include/nasm.h
index c2a80562..6ff37aec 100644
--- a/include/nasm.h
+++ b/include/nasm.h
@@ -40,7 +40,6 @@
 
 #include "compiler.h"
 
-#include <stdio.h>
 #include <time.h>
 
 #include "nasmlib.h"
diff --git a/include/nasmlib.h b/include/nasmlib.h
index e342a293..fb14c73b 100644
--- a/include/nasmlib.h
+++ b/include/nasmlib.h
@@ -41,7 +41,6 @@
 #include "compiler.h"
 #include "bytesex.h"
 
-#include <stdio.h>
 #ifdef HAVE_STRINGS_H
 # include <strings.h>
 #endif
diff --git a/nasmlib/errfile.c b/nasmlib/errfile.c
index ee4bae8e..a2c5e4ff 100644
--- a/nasmlib/errfile.c
+++ b/nasmlib/errfile.c
@@ -1,5 +1,4 @@
 #include "compiler.h"
-#include <stdio.h>
 
 FILE *error_file;
 
diff --git a/nasmlib/file.h b/nasmlib/file.h
index 4069ec64..399e3190 100644
--- a/nasmlib/file.h
+++ b/nasmlib/file.h
@@ -44,7 +44,6 @@
 # include <fcntl.h>
 #endif
 #ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
 #endif
 #ifdef HAVE_SYS_STAT_H
 # include <sys/stat.h>
diff --git a/nasmlib/realpath.c b/nasmlib/realpath.c
index d93dc15f..c31003e3 100644
--- a/nasmlib/realpath.c
+++ b/nasmlib/realpath.c
@@ -37,9 +37,7 @@
 
 #include "compiler.h"
 
-#include <stdlib.h>
 #include <errno.h>
-#include <limits.h>
 #ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif
diff --git a/output/codeview.c b/output/codeview.c
index 03fee590..870d573f 100644
--- a/output/codeview.c
+++ b/output/codeview.c
@@ -38,9 +38,6 @@
 #include "version.h"
 #include "compiler.h"
 
-#include <stdio.h>
-#include <stddef.h>
-#include <stdlib.h>
 
 #include "nasm.h"
 #include "nasmlib.h"
diff --git a/output/outaout.c b/output/outaout.c
index a0fdc674..53a5611c 100644
--- a/output/outaout.c
+++ b/output/outaout.c
@@ -38,8 +38,6 @@
 
 #include "compiler.h"
 
-#include <stdio.h>
-#include <stdlib.h>
 #include "nctype.h"
 
 #include "nasm.h"
diff --git a/output/outas86.c b/output/outas86.c
index 00c57584..fc283f4a 100644
--- a/output/outas86.c
+++ b/output/outas86.c
@@ -38,8 +38,6 @@
 
 #include "compiler.h"
 
-#include <stdio.h>
-#include <stdlib.h>
 #include "nctype.h"
 
 #include "nasm.h"
diff --git a/output/outbin.c b/output/outbin.c
index be395d7a..148a1fdf 100644
--- a/output/outbin.c
+++ b/output/outbin.c
@@ -75,8 +75,6 @@
 
 #include "compiler.h"
 
-#include <stdio.h>
-#include <stdlib.h>
 #include "nctype.h"
 
 #include "nasm.h"
diff --git a/output/outcoff.c b/output/outcoff.c
index 4fc3f775..da563ca3 100644
--- a/output/outcoff.c
+++ b/output/outcoff.c
@@ -38,8 +38,6 @@
 
 #include "compiler.h"
 
-#include <stdio.h>
-#include <stdlib.h>
 #include "nctype.h"
 #include <time.h>
 
diff --git a/output/outdbg.c b/output/outdbg.c
index 1b77d487..2bf176cb 100644
--- a/output/outdbg.c
+++ b/output/outdbg.c
@@ -38,8 +38,6 @@
 
 #include "compiler.h"
 
-#include <stdio.h>
-#include <stdlib.h>
 #include "nctype.h"
 #include <errno.h>
 
diff --git a/output/outelf.c b/output/outelf.c
index 366e52de..bfbb5a8b 100644
--- a/output/outelf.c
+++ b/output/outelf.c
@@ -37,8 +37,6 @@
 
 #include "compiler.h"
 
-#include <stdio.h>
-#include <stdlib.h>
 
 #include "nasm.h"
 #include "nasmlib.h"
diff --git a/output/outform.c b/output/outform.c
index 3353e2bb..d299d04a 100644
--- a/output/outform.c
+++ b/output/outform.c
@@ -40,7 +40,6 @@
 
 #include "compiler.h"
 
-#include <stdio.h>
 
 #define BUILD_DRIVERS_ARRAY
 #include "outform.h"
diff --git a/output/outieee.c b/output/outieee.c
index b5ea2a41..4cc0f0f5 100644
--- a/output/outieee.c
+++ b/output/outieee.c
@@ -67,10 +67,7 @@
  */
 #include "compiler.h"
 
-#include <stdio.h>
-#include <stdlib.h>
 #include <time.h>
-#include <stdarg.h>             /* Note: we need the ANSI version of stdarg.h */
 #include <ctype.h>              /* For toupper() */
 #include "nctype.h"
 
diff --git a/output/outmacho.c b/output/outmacho.c
index 342c6c18..8d730bf5 100644
--- a/output/outmacho.c
+++ b/output/outmacho.c
@@ -38,8 +38,6 @@
 
 #include "compiler.h"
 
-#include <stdio.h>
-#include <stdlib.h>
 #include "nctype.h"
 
 #include "nasm.h"
diff --git a/output/outobj.c b/output/outobj.c
index 1bf7e8d7..a5936279 100644
--- a/output/outobj.c
+++ b/output/outobj.c
@@ -38,11 +38,8 @@
 
 #include "compiler.h"
 
-#include <stdio.h>
-#include <stdlib.h>
 #include <ctype.h>              /* For toupper() */
 #include "nctype.h"
-#include <limits.h>
 
 #include "nasm.h"
 #include "nasmlib.h"
diff --git a/output/outrdf2.c b/output/outrdf2.c
index e92906cd..d020d91e 100644
--- a/output/outrdf2.c
+++ b/output/outrdf2.c
@@ -39,10 +39,7 @@
 
 #include "compiler.h"
 
-#include <stdio.h>
-#include <stdlib.h>
 #include "nctype.h"
-#include <assert.h>
 
 #include "nasm.h"
 #include "nasmlib.h"
diff --git a/stdlib/snprintf.c b/stdlib/snprintf.c
index 95bfc314..e4a1c0b5 100644
--- a/stdlib/snprintf.c
+++ b/stdlib/snprintf.c
@@ -6,9 +6,6 @@
 
 #include "compiler.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdarg.h>
 
 #include "nasmlib.h"
 
diff --git a/stdlib/vsnprintf.c b/stdlib/vsnprintf.c
index f3106d26..284cc194 100644
--- a/stdlib/vsnprintf.c
+++ b/stdlib/vsnprintf.c
@@ -7,9 +7,6 @@
 
 #include "compiler.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdarg.h>
 
 #include "nasmlib.h"
 #include "error.h"