diff --git a/SAX2.c b/SAX2.c
index 1b9d9d40..46daf737 100644
--- a/SAX2.c
+++ b/SAX2.c
@@ -13,6 +13,7 @@
 #include <string.h>
 #include <limits.h>
 #include <stddef.h>
+#include <libxml/SAX2.h>
 #include <libxml/xmlmemory.h>
 #include <libxml/tree.h>
 #include <libxml/parser.h>
diff --git a/doc/examples/io1.c b/doc/examples/io1.c
index 366c63cb..0db37c7c 100644
--- a/doc/examples/io1.c
+++ b/doc/examples/io1.c
@@ -12,6 +12,7 @@
  */
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <libxml/parser.h>
 #include <libxml/tree.h>
diff --git a/globals.c b/globals.c
index 632f8d38..69ae0ce8 100644
--- a/globals.c
+++ b/globals.c
@@ -20,6 +20,7 @@
 #include <libxml/xmlmemory.h>
 #include <libxml/threads.h>
 #include <libxml/SAX.h>
+#include <libxml/SAX2.h>
 
 #include "private/error.h"
 #include "private/globals.h"
diff --git a/include/libxml/globals.h b/include/libxml/globals.h
index 6cae3de2..904708e6 100644
--- a/include/libxml/globals.h
+++ b/include/libxml/globals.h
@@ -14,7 +14,6 @@
 #include <libxml/xmlversion.h>
 #include <libxml/parser.h>
 #include <libxml/xmlerror.h>
-#include <libxml/SAX2.h>
 #include <libxml/xmlmemory.h>
 
 #ifdef __cplusplus
diff --git a/include/libxml/parserInternals.h b/include/libxml/parserInternals.h
index 513981ea..017ed273 100644
--- a/include/libxml/parserInternals.h
+++ b/include/libxml/parserInternals.h
@@ -16,6 +16,7 @@
 #include <libxml/parser.h>
 #include <libxml/HTMLparser.h>
 #include <libxml/chvalid.h>
+#include <libxml/SAX2.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/parser.c b/parser.c
index cce84f27..6ba94af2 100644
--- a/parser.c
+++ b/parser.c
@@ -62,6 +62,7 @@
 #include <libxml/encoding.h>
 #include <libxml/xmlIO.h>
 #include <libxml/uri.h>
+#include <libxml/SAX2.h>
 #ifdef LIBXML_CATALOG_ENABLED
 #include <libxml/catalog.h>
 #endif
diff --git a/schematron.c b/schematron.c
index 5946986f..a8259201 100644
--- a/schematron.c
+++ b/schematron.c
@@ -25,6 +25,7 @@
 
 #ifdef LIBXML_SCHEMATRON_ENABLED
 
+#include <stdlib.h>
 #include <string.h>
 #include <libxml/parser.h>
 #include <libxml/tree.h>
diff --git a/testdict.c b/testdict.c
index 9f058489..97157b13 100644
--- a/testdict.c
+++ b/testdict.c
@@ -1,3 +1,4 @@
+#include <stdlib.h>
 #include <string.h>
 #include <libxml/parser.h>
 #include <libxml/dict.h>
diff --git a/xmlwriter.c b/xmlwriter.c
index 569830cf..ad6e00cc 100644
--- a/xmlwriter.c
+++ b/xmlwriter.c
@@ -16,6 +16,7 @@
 #include <libxml/parser.h>
 #include <libxml/uri.h>
 #include <libxml/HTMLtree.h>
+#include <libxml/SAX2.h>
 
 #ifdef LIBXML_WRITER_ENABLED