diff --git a/doc/libxml2-api.xml b/doc/libxml2-api.xml
index 4b7b0ee8..1a7631c9 100644
--- a/doc/libxml2-api.xml
+++ b/doc/libxml2-api.xml
@@ -410,7 +410,6 @@
      <summary>interface for the XML entities handling</summary>
      <description>this module provides some of the entity API needed for the parser and applications. </description>
      <author>Daniel Veillard </author>
-     <exports symbol='XML_TREE_INTERNALS' type='macro'/>
      <exports symbol='XML_EXTERNAL_GENERAL_PARSED_ENTITY' type='enum'/>
      <exports symbol='XML_EXTERNAL_GENERAL_UNPARSED_ENTITY' type='enum'/>
      <exports symbol='XML_EXTERNAL_PARAMETER_ENTITY' type='enum'/>
@@ -560,7 +559,6 @@
      <author>Daniel Veillard </author>
      <exports symbol='XML_DEFAULT_VERSION' type='macro'/>
      <exports symbol='XML_SAX2_MAGIC' type='macro'/>
-     <exports symbol='XML_TREE_INTERNALS' type='macro'/>
      <exports symbol='XML_PARSER_ATTRIBUTE_VALUE' type='enum'/>
      <exports symbol='XML_PARSER_CDATA_SECTION' type='enum'/>
      <exports symbol='XML_PARSER_COMMENT' type='enum'/>
@@ -1679,7 +1677,6 @@
      <summary>The DTD validation</summary>
      <description>API for the DTD handling and the validity checking </description>
      <author>Daniel Veillard </author>
-     <exports symbol='XML_TREE_INTERNALS' type='macro'/>
      <exports symbol='xmlAttributeTable' type='typedef'/>
      <exports symbol='xmlAttributeTablePtr' type='typedef'/>
      <exports symbol='xmlElementTable' type='typedef'/>
@@ -1837,7 +1834,6 @@
      <summary>interface for the I/O interfaces used by the parser</summary>
      <description>interface for the I/O interfaces used by the parser </description>
      <author>Daniel Veillard </author>
-     <exports symbol='XML_TREE_INTERNALS' type='macro'/>
      <exports symbol='_xmlOutputBuffer' type='struct'/>
      <exports symbol='_xmlParserInputBuffer' type='struct'/>
      <exports symbol='xmlAllocOutputBuffer' type='function'/>
@@ -4292,8 +4288,6 @@
     <macro name='XML_SUBSTITUTE_REF' file='parserInternals'>
       <info>Whether general entities need to be substituted.</info>
     </macro>
-    <macro name='XML_TREE_INTERNALS' file='valid'>
-    </macro>
     <macro name='XML_XML_ID' file='tree'>
       <info>This is the name for the special xml:id attribute</info>
     </macro>
diff --git a/include/libxml/entities.h b/include/libxml/entities.h
index d40de269..2d5e6b97 100644
--- a/include/libxml/entities.h
+++ b/include/libxml/entities.h
@@ -11,10 +11,12 @@
 #ifndef __XML_ENTITIES_H__
 #define __XML_ENTITIES_H__
 
+/** DOC_DISABLE */
 #include <libxml/xmlversion.h>
 #define XML_TREE_INTERNALS
 #include <libxml/tree.h>
 #undef XML_TREE_INTERNALS
+/** DOC_ENABLE */
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/libxml/parser.h b/include/libxml/parser.h
index 0231fd7e..eb6a5fe7 100644
--- a/include/libxml/parser.h
+++ b/include/libxml/parser.h
@@ -10,6 +10,7 @@
 #ifndef __XML_PARSER_H__
 #define __XML_PARSER_H__
 
+/** DOC_DISABLE */
 #include <libxml/xmlversion.h>
 #define XML_TREE_INTERNALS
 #include <libxml/tree.h>
@@ -26,6 +27,7 @@
 /* for compatibility */
 #include <libxml/SAX2.h>
 #include <libxml/threads.h>
+/** DOC_ENABLE */
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/libxml/valid.h b/include/libxml/valid.h
index 75789b14..7345ca57 100644
--- a/include/libxml/valid.h
+++ b/include/libxml/valid.h
@@ -11,6 +11,7 @@
 #ifndef __XML_VALID_H__
 #define __XML_VALID_H__
 
+/** DOC_DISABLE */
 #include <libxml/xmlversion.h>
 #include <libxml/xmlerror.h>
 #define XML_TREE_INTERNALS
@@ -19,6 +20,7 @@
 #include <libxml/list.h>
 #include <libxml/xmlautomata.h>
 #include <libxml/xmlregexp.h>
+/** DOC_ENABLE */
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/libxml/xmlIO.h b/include/libxml/xmlIO.h
index eeefd13a..3397a095 100644
--- a/include/libxml/xmlIO.h
+++ b/include/libxml/xmlIO.h
@@ -10,12 +10,14 @@
 #ifndef __XML_IO_H__
 #define __XML_IO_H__
 
+/** DOC_DISABLE */
 #include <stdio.h>
 #include <libxml/xmlversion.h>
 #include <libxml/encoding.h>
 #define XML_TREE_INTERNALS
 #include <libxml/tree.h>
 #undef XML_TREE_INTERNALS
+/** DOC_ENABLE */
 
 #ifdef __cplusplus
 extern "C" {