- Makefile.am: cleanup when --without-debug is specified
- xinclude.c xpath.c xpathInternals.h xpointer.c: cleanup
  w.r.t. --without-debug and other include points
- catalog.h testCatalog.c: a bit of cleanup and prepare for XML
  Catalogs
- configure.in entities.h tree.h HTMLparser.c: removed
  --without-corba, made the _private field mandatory
Daniel
diff --git a/xinclude.c b/xinclude.c
index b659b44..89d74a3 100644
--- a/xinclude.c
+++ b/xinclude.c
@@ -23,9 +23,6 @@
 #include <libxml/uri.h>
 #include <libxml/xpointer.h>
 #include <libxml/parserInternals.h>
-#ifdef LIBXML_DEBUG_ENABLED
-#include <libxml/debugXML.h>
-#endif
 #include <libxml/xmlerror.h>
 
 #ifdef LIBXML_XINCLUDE_ENABLED
@@ -39,6 +36,11 @@
 #define XINCLUDE_PARSE_TEXT (const xmlChar *) "text"
 
 /* #define DEBUG_XINCLUDE  */
+#ifdef DEBUG_XINCLUDE
+#ifdef LIBXML_DEBUG_ENABLED
+#include <libxml/debugXML.h>
+#endif
+#endif
 
 /************************************************************************
  *									*