Work done on the plane, ready to release libxml2-2.0.0, Daniel
diff --git a/xpath.c b/xpath.c
index 398972f..c370077 100644
--- a/xpath.c
+++ b/xpath.c
@@ -19,6 +19,9 @@
 #include "config.h"
 #endif
 
+#include "xmlversion.h"
+#ifdef LIBXML_XPATH_ENABLED
+
 #include <stdio.h>
 #include <string.h>
 
@@ -41,11 +44,11 @@
 #include <ctype.h>
 #endif
 
-#include "xmlmemory.h"
-#include "tree.h"
-#include "valid.h"
-#include "xpath.h"
-#include "parserInternals.h"
+#include <libxml/xmlmemory.h>
+#include <libxml/tree.h>
+#include <libxml/valid.h>
+#include <libxml/xpath.h>
+#include <libxml/parserInternals.h>
 
 /* #define DEBUG */
 /* #define DEBUG_STEP */
@@ -4579,3 +4582,4 @@
     return(res);
 }
 
+#endif /* LIBXML_XPATH_ENABLED */