diff -r ca7213d6230e -r ca7b5d9eef9b src/rcldb/rcldb.cpp
--- a/src/rcldb/rcldb.cpp	Tue May 04 15:40:13 2010 +0200
+++ b/src/rcldb/rcldb.cpp	Tue May 04 15:40:40 2010 +0200
@@ -33,7 +33,7 @@
 using namespace std;
 #endif /* NO_NAMESPACES */
 
-#include "xapian/version.h"
+#include "xapian.h"
 
 #include "rclconfig.h"
 #include "rcldb.h"
diff -r ca7213d6230e -r ca7b5d9eef9b src/rcldb/rclquery.cpp
--- a/src/rcldb/rclquery.cpp	Tue May 04 15:40:13 2010 +0200
+++ b/src/rcldb/rclquery.cpp	Tue May 04 15:40:40 2010 +0200
@@ -8,7 +8,7 @@
 #include <list>
 #include <vector>
 
-#include "xapian/sorter.h"
+#include "xapian.h"
 
 #include "rcldb.h"
 #include "rcldb_p.h"
diff -r ca7213d6230e -r ca7b5d9eef9b src/rcldb/stemdb.cpp
--- a/src/rcldb/stemdb.cpp	Tue May 04 15:40:13 2010 +0200
+++ b/src/rcldb/stemdb.cpp	Tue May 04 15:40:40 2010 +0200
@@ -12,7 +12,6 @@
 #include <map>
 
 #include <xapian.h>
-#include <xapian/stem.h>
 
 #include "stemdb.h"
 #include "wipedir.h"