diff --git a/HTMLparser.c b/HTMLparser.c
index 5cbd3191..02cde5ac 100644
--- a/HTMLparser.c
+++ b/HTMLparser.c
@@ -23,7 +23,6 @@
 #include <libxml/HTMLtree.h>
 #include <libxml/entities.h>
 #include <libxml/encoding.h>
-#include <libxml/valid.h>
 #include <libxml/xmlIO.h>
 #include <libxml/uri.h>
 
diff --git a/HTMLtree.c b/HTMLtree.c
index c9cc02a5..8698f53e 100644
--- a/HTMLtree.c
+++ b/HTMLtree.c
@@ -19,7 +19,6 @@
 #include <libxml/HTMLparser.h>
 #include <libxml/HTMLtree.h>
 #include <libxml/entities.h>
-#include <libxml/valid.h>
 #include <libxml/xmlerror.h>
 #include <libxml/parserInternals.h>
 #include <libxml/uri.h>
diff --git a/SAX2.c b/SAX2.c
index 96d83de6..d687cca5 100644
--- a/SAX2.c
+++ b/SAX2.c
@@ -23,7 +23,6 @@
 #include <libxml/xmlerror.h>
 #include <libxml/debugXML.h>
 #include <libxml/xmlIO.h>
-#include <libxml/SAX.h>
 #include <libxml/uri.h>
 #include <libxml/valid.h>
 #include <libxml/HTMLtree.h>
diff --git a/debugXML.c b/debugXML.c
index b79d5995..303515ec 100644
--- a/debugXML.c
+++ b/debugXML.c
@@ -18,7 +18,6 @@
 #include <libxml/tree.h>
 #include <libxml/parser.h>
 #include <libxml/parserInternals.h>
-#include <libxml/valid.h>
 #include <libxml/debugXML.h>
 #include <libxml/HTMLtree.h>
 #include <libxml/HTMLparser.h>
diff --git a/include/libxml/SAX.h b/include/libxml/SAX.h
index ecd3211a..eea1057b 100644
--- a/include/libxml/SAX.h
+++ b/include/libxml/SAX.h
@@ -12,8 +12,6 @@
 #ifndef __XML_SAX_H__
 #define __XML_SAX_H__
 
-#include <stdio.h>
-#include <stdlib.h>
 #include <libxml/xmlversion.h>
 #include <libxml/parser.h>
 
diff --git a/include/libxml/SAX2.h b/include/libxml/SAX2.h
index 35e7a5f4..4c4ecce8 100644
--- a/include/libxml/SAX2.h
+++ b/include/libxml/SAX2.h
@@ -12,8 +12,6 @@
 #ifndef __XML_SAX2_H__
 #define __XML_SAX2_H__
 
-#include <stdio.h>
-#include <stdlib.h>
 #include <libxml/xmlversion.h>
 #include <libxml/parser.h>
 
diff --git a/parserInternals.c b/parserInternals.c
index 7156f7a6..110cd6e7 100644
--- a/parserInternals.c
+++ b/parserInternals.c
@@ -24,15 +24,12 @@
 #include <libxml/tree.h>
 #include <libxml/parser.h>
 #include <libxml/parserInternals.h>
-#include <libxml/valid.h>
 #include <libxml/entities.h>
 #include <libxml/xmlerror.h>
 #include <libxml/encoding.h>
-#include <libxml/valid.h>
 #include <libxml/xmlIO.h>
 #include <libxml/uri.h>
 #include <libxml/dict.h>
-#include <libxml/SAX.h>
 #include <libxml/xmlsave.h>
 #ifdef LIBXML_CATALOG_ENABLED
 #include <libxml/catalog.h>
diff --git a/pattern.c b/pattern.c
index 9e30040f..55ae2d3e 100644
--- a/pattern.c
+++ b/pattern.c
@@ -27,13 +27,12 @@
 #include "libxml.h"
 
 #include <string.h>
+#include <libxml/pattern.h>
 #include <libxml/xmlmemory.h>
 #include <libxml/tree.h>
-#include <libxml/hash.h>
 #include <libxml/dict.h>
 #include <libxml/xmlerror.h>
 #include <libxml/parserInternals.h>
-#include <libxml/pattern.h>
 
 #ifdef LIBXML_PATTERN_ENABLED
 
diff --git a/runsuite.c b/runsuite.c
index 8a909ea5..c1d35ad0 100644
--- a/runsuite.c
+++ b/runsuite.c
@@ -6,9 +6,8 @@
  * daniel@veillard.com
  */
 
-#include "libxml.h"
 #include <stdio.h>
-
+#include <stdlib.h>
 #include <string.h>
 #include <sys/stat.h>
 
diff --git a/runtest.c b/runtest.c
index 0750a533..58264980 100644
--- a/runtest.c
+++ b/runtest.c
@@ -11,14 +11,14 @@
  * daniel@veillard.com
  */
 
-#include "libxml.h"
+#include "config.h"
 #include <stdio.h>
-
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #elif defined (_WIN32)
 #include <io.h>
 #endif
+#include <stdlib.h>
 #include <string.h>
 #include <sys/stat.h>
 #include <fcntl.h>
@@ -69,7 +69,6 @@
 #include <libxml/threads.h>
 #include <libxml/parser.h>
 #include <libxml/catalog.h>
-#include <string.h>
 #endif
 
 /*
diff --git a/runxmlconf.c b/runxmlconf.c
index 0f827b9a..6b76c508 100644
--- a/runxmlconf.c
+++ b/runxmlconf.c
@@ -6,8 +6,8 @@
  * daniel@veillard.com
  */
 
-#include "libxml.h"
 #include <stdio.h>
+#include <libxml/xmlversion.h>
 
 #ifdef LIBXML_XPATH_ENABLED
 
@@ -592,9 +592,9 @@ main(int argc ATTRIBUTE_UNUSED, char **argv ATTRIBUTE_UNUSED) {
 }
 
 #else /* ! LIBXML_XPATH_ENABLED */
-#include <stdio.h>
 int
 main(int argc ATTRIBUTE_UNUSED, char **argv) {
     fprintf(stderr, "%s need XPath support\n", argv[0]);
+    return(0);
 }
 #endif
diff --git a/testModule.c b/testModule.c
index 45edd9f0..6aea44db 100644
--- a/testModule.c
+++ b/testModule.c
@@ -6,12 +6,12 @@
  * joelwreed@comcast.net
  */
 
-#include "libxml.h"
-#ifdef LIBXML_MODULES_ENABLED
+#include <stdio.h>
 #include <libxml/xmlversion.h>
 
+#ifdef LIBXML_MODULES_ENABLED
+
 #include <limits.h>
-#include <stdio.h>
 #include <string.h>
 #include <stdarg.h>
 
@@ -74,7 +74,6 @@ int main(int argc ATTRIBUTE_UNUSED, char **argv ATTRIBUTE_UNUSED) {
 }
 
 #else
-#include <stdio.h>
 int main(int argc ATTRIBUTE_UNUSED, char **argv ATTRIBUTE_UNUSED) {
     printf("%s : Module support not compiled in\n", argv[0]);
     return(0);
diff --git a/testOOM.c b/testOOM.c
index 3cb6b2da..95a3c8e9 100644
--- a/testOOM.c
+++ b/testOOM.c
@@ -6,8 +6,6 @@
  * hp@redhat.com
  */
 
-#include "libxml.h"
-
 #include <string.h>
 #include <stdarg.h>
 #include <stdlib.h>
diff --git a/testThreads.c b/testThreads.c
index b7bf3277..fd1f8853 100644
--- a/testThreads.c
+++ b/testThreads.c
@@ -1,5 +1,4 @@
-#include "libxml.h"
-
+#include "config.h"
 #include <stdlib.h>
 #include <stdio.h>
 
diff --git a/testapi.c b/testapi.c
index fd3fc946..76f402c4 100644
--- a/testapi.c
+++ b/testapi.c
@@ -11,9 +11,7 @@
 /* Disable deprecation warnings */
 #define XML_DEPRECATED
 
-#include "libxml.h"
 #include <stdio.h>
-
 #include <stdlib.h>
 #include <string.h>
 #include <libxml/xmlerror.h>
diff --git a/testlimits.c b/testlimits.c
index d90b06ba..de0da9d4 100644
--- a/testlimits.c
+++ b/testlimits.c
@@ -10,9 +10,8 @@
  * daniel@veillard.com
  */
 
-#include "libxml.h"
 #include <stdio.h>
-
+#include <stdlib.h>
 #include <string.h>
 #include <sys/stat.h>
 #include <time.h>
diff --git a/testrecurse.c b/testrecurse.c
index 7a023d7f..01e15b2c 100644
--- a/testrecurse.c
+++ b/testrecurse.c
@@ -10,9 +10,9 @@
  * daniel@veillard.com
  */
 
-#include "libxml.h"
 #include <stdio.h>
 
+#include <stdlib.h>
 #include <string.h>
 #include <sys/stat.h>
 
diff --git a/tree.c b/tree.c
index 292621cf..aa888185 100644
--- a/tree.c
+++ b/tree.c
@@ -33,7 +33,6 @@
 #include <libxml/parser.h>
 #include <libxml/uri.h>
 #include <libxml/entities.h>
-#include <libxml/valid.h>
 #include <libxml/xmlerror.h>
 #include <libxml/parserInternals.h>
 #ifdef LIBXML_HTML_ENABLED
diff --git a/xlink.c b/xlink.c
index ccc78434..3a77b199 100644
--- a/xlink.c
+++ b/xlink.c
@@ -19,7 +19,6 @@
 #include <libxml/xmlmemory.h>
 #include <libxml/tree.h>
 #include <libxml/parser.h>
-#include <libxml/valid.h>
 #include <libxml/xlink.h>
 
 #define XLINK_NAMESPACE (BAD_CAST "http://www.w3.org/1999/xlink/namespace/")
diff --git a/xmlschemastypes.c b/xmlschemastypes.c
index 6782aa23..de95d940 100644
--- a/xmlschemastypes.c
+++ b/xmlschemastypes.c
@@ -17,6 +17,7 @@
 
 #ifdef LIBXML_SCHEMAS_ENABLED
 
+#include <stdlib.h>
 #include <string.h>
 #include <math.h>
 #include <float.h>
@@ -25,7 +26,6 @@
 #include <libxml/parser.h>
 #include <libxml/parserInternals.h>
 #include <libxml/hash.h>
-#include <libxml/valid.h>
 #include <libxml/xpath.h>
 #include <libxml/uri.h>
 
diff --git a/xpath.c b/xpath.c
index e5a58323..32c554d8 100644
--- a/xpath.c
+++ b/xpath.c
@@ -31,7 +31,6 @@
 
 #include <libxml/xmlmemory.h>
 #include <libxml/tree.h>
-#include <libxml/valid.h>
 #include <libxml/xpath.h>
 #include <libxml/xpathInternals.h>
 #include <libxml/parserInternals.h>