diff --git a/asm/assemble.c b/asm/assemble.c
index f84b9639a..fc216a8f0 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 8be5e2c5a..943e532fe 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 2e927a647..ef3fd9884 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 73d42223c..d8fe34ae9 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 3d3894478..3ae59f0e7 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 84099dea1..7527156d6 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 57f3758fd..b356a3d2d 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 644712c4e..6a0a8b006 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 cfaff93d7..9f38844f1 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 363e593c6..88f8ae73c 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 63fa3c1e8..575896edc 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 7eb783433..833a3d47c 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 75a937264..7dd242919 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 eb456ecb4..0f35c5aff 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 e3bae3e66..8f6a3c61f 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 165437acc..186924cd7 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 7928827aa..e1b5ebc3b 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 924eb5682..6b4ca49dc 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 7116b229b..b9b866ea8 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 239f61048..4c6cd5e37 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 3a828be8f..bba45955b 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 c2a805629..6ff37aec8 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 e342a2935..fb14c73ba 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 ee4bae8e7..a2c5e4ffa 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 4069ec64c..399e31903 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 d93dc15f9..c31003e37 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 03fee590b..870d573f4 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 a0fdc6747..53a5611cf 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 00c575840..fc283f4ae 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 be395d7a8..148a1fdfe 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 4fc3f7756..da563ca39 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 1b77d487e..2bf176cba 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 366e52de9..bfbb5a8b8 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 3353e2bb4..d299d04ac 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 b5ea2a418..4cc0f0f51 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 342c6c18d..8d730bf50 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 1bf7e8d7c..a59362791 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 e92906cd0..d020d91ed 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 95bfc3147..e4a1c0b50 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 f3106d26d..284cc1942 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"