- 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/xpath.c b/xpath.c
index bccf54b..9d18ee7 100644
--- a/xpath.c
+++ b/xpath.c
@@ -555,7 +555,7 @@
 	xmlXPathDebugDumpObject(output, cur->locTab[i], depth + 1);
     }
 }
-#endif
+#endif /* LIBXML_XPTR_ENABLED */
 
 /**
  * xmlXPathDebugDumpObject:
@@ -863,7 +863,7 @@
     i = comp->last;
     xmlXPathDebugDumpStepOp(output, comp, &comp->steps[i], depth + 1);
 }
-#endif
+#endif /* LIBXML_DEBUG_ENABLED */
 
 /************************************************************************
  *									*