diff -ur a/src/rasqal.h.in b/src/rasqal.h.in
--- a/src/rasqal.h.in	2011-07-19 15:40:55.000000000 -0700
+++ b/src/rasqal.h.in	2011-07-19 18:06:13.000000000 -0700
@@ -107,7 +107,7 @@
 
 
 #ifndef LIBRDF_OBJC_FRAMEWORK
-#include <raptor.h>
+#include <raptor2/raptor2.h>
 #else
 #include <Redland/raptor.h>
 #endif
diff -ur a/src/rasqal_engine.c b/src/rasqal_engine.c
--- a/src/rasqal_engine.c	2011-07-19 15:40:55.000000000 -0700
+++ b/src/rasqal_engine.c	2011-07-19 18:06:12.000000000 -0700
@@ -32,7 +32,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <raptor.h>
+#include <raptor2/raptor2.h>
 
 #include "rasqal.h"
 #include "rasqal_internal.h"
diff -ur a/src/rasqal_format_html.c b/src/rasqal_format_html.c
--- a/src/rasqal_format_html.c	2011-07-19 15:40:55.000000000 -0700
+++ b/src/rasqal_format_html.c	2011-07-19 18:06:12.000000000 -0700
@@ -34,7 +34,7 @@
 #include <stdlib.h>
 #endif
 
-#include <raptor.h>
+#include <raptor2/raptor2.h>
 
 /* Rasqal includes */
 #include <rasqal.h>
diff -ur a/src/rasqal_format_rdf.c b/src/rasqal_format_rdf.c
--- a/src/rasqal_format_rdf.c	2011-07-19 15:40:55.000000000 -0700
+++ b/src/rasqal_format_rdf.c	2011-07-19 18:06:12.000000000 -0700
@@ -37,7 +37,7 @@
 #endif
 
 
-#include <raptor.h>
+#include <raptor2/raptor2.h>
 
 /* Rasqal includes */
 #include <rasqal.h>
diff -ur a/src/rasqal_format_sparql_xml.c b/src/rasqal_format_sparql_xml.c
--- a/src/rasqal_format_sparql_xml.c	2011-07-19 15:40:55.000000000 -0700
+++ b/src/rasqal_format_sparql_xml.c	2011-07-19 18:06:12.000000000 -0700
@@ -37,7 +37,7 @@
 #endif
 
 
-#include <raptor.h>
+#include <raptor2/raptor2.h>
 
 /* Rasqal includes */
 #include <rasqal.h>
diff -ur a/src/rasqal_format_table.c b/src/rasqal_format_table.c
--- a/src/rasqal_format_table.c	2011-07-19 15:40:55.000000000 -0700
+++ b/src/rasqal_format_table.c	2011-07-19 18:06:12.000000000 -0700
@@ -37,7 +37,7 @@
 #endif
 
 
-#include <raptor.h>
+#include <raptor2/raptor2.h>
 
 /* Rasqal includes */
 #include <rasqal.h>
diff -ur a/src/rasqal_rowsource.c b/src/rasqal_rowsource.c
--- a/src/rasqal_rowsource.c	2011-07-19 15:40:55.000000000 -0700
+++ b/src/rasqal_rowsource.c	2011-07-19 18:06:12.000000000 -0700
@@ -36,7 +36,7 @@
 #endif
 #include <stdarg.h>
 
-#include <raptor.h>
+#include <raptor2/raptor2.h>
 
 #include "rasqal.h"
 #include "rasqal_internal.h"
diff -ur a/src/rasqal_rowsource_aggregation.c b/src/rasqal_rowsource_aggregation.c
--- a/src/rasqal_rowsource_aggregation.c	2011-07-19 15:40:55.000000000 -0700
+++ b/src/rasqal_rowsource_aggregation.c	2011-07-19 18:06:12.000000000 -0700
@@ -38,7 +38,7 @@
 #include <stdlib.h>
 #endif
 
-#include <raptor.h>
+#include <raptor2/raptor2.h>
 
 #include "rasqal.h"
 #include "rasqal_internal.h"
diff -ur a/src/rasqal_rowsource_assignment.c b/src/rasqal_rowsource_assignment.c
--- a/src/rasqal_rowsource_assignment.c	2011-07-19 15:40:55.000000000 -0700
+++ b/src/rasqal_rowsource_assignment.c	2011-07-19 18:06:12.000000000 -0700
@@ -35,7 +35,7 @@
 #include <stdlib.h>
 #endif
 
-#include <raptor.h>
+#include <raptor2/raptor2.h>
 
 #include "rasqal.h"
 #include "rasqal_internal.h"
diff -ur a/src/rasqal_rowsource_distinct.c b/src/rasqal_rowsource_distinct.c
--- a/src/rasqal_rowsource_distinct.c	2011-07-19 15:40:55.000000000 -0700
+++ b/src/rasqal_rowsource_distinct.c	2011-07-19 18:06:11.000000000 -0700
@@ -35,7 +35,7 @@
 #include <stdlib.h>
 #endif
 
-#include <raptor.h>
+#include <raptor2/raptor2.h>
 
 #include "rasqal.h"
 #include "rasqal_internal.h"
diff -ur a/src/rasqal_rowsource_empty.c b/src/rasqal_rowsource_empty.c
--- a/src/rasqal_rowsource_empty.c	2011-07-19 15:40:55.000000000 -0700
+++ b/src/rasqal_rowsource_empty.c	2011-07-19 18:06:11.000000000 -0700
@@ -35,7 +35,7 @@
 #include <stdlib.h>
 #endif
 
-#include <raptor.h>
+#include <raptor2/raptor2.h>
 
 #include "rasqal.h"
 #include "rasqal_internal.h"
diff -ur a/src/rasqal_rowsource_filter.c b/src/rasqal_rowsource_filter.c
--- a/src/rasqal_rowsource_filter.c	2011-07-19 15:40:55.000000000 -0700
+++ b/src/rasqal_rowsource_filter.c	2011-07-19 18:06:11.000000000 -0700
@@ -35,7 +35,7 @@
 #include <stdlib.h>
 #endif
 
-#include <raptor.h>
+#include <raptor2/raptor2.h>
 
 #include "rasqal.h"
 #include "rasqal_internal.h"
diff -ur a/src/rasqal_rowsource_graph.c b/src/rasqal_rowsource_graph.c
--- a/src/rasqal_rowsource_graph.c	2011-07-19 15:40:55.000000000 -0700
+++ b/src/rasqal_rowsource_graph.c	2011-07-19 18:06:11.000000000 -0700
@@ -35,7 +35,7 @@
 #include <stdlib.h>
 #endif
 
-#include <raptor.h>
+#include <raptor2/raptor2.h>
 
 #include "rasqal.h"
 #include "rasqal_internal.h"
diff -ur a/src/rasqal_rowsource_groupby.c b/src/rasqal_rowsource_groupby.c
--- a/src/rasqal_rowsource_groupby.c	2011-07-19 15:40:55.000000000 -0700
+++ b/src/rasqal_rowsource_groupby.c	2011-07-19 18:06:11.000000000 -0700
@@ -35,7 +35,7 @@
 #include <stdlib.h>
 #endif
 
-#include <raptor.h>
+#include <raptor2/raptor2.h>
 
 #include "rasqal.h"
 #include "rasqal_internal.h"
diff -ur a/src/rasqal_rowsource_having.c b/src/rasqal_rowsource_having.c
--- a/src/rasqal_rowsource_having.c	2011-07-19 15:40:55.000000000 -0700
+++ b/src/rasqal_rowsource_having.c	2011-07-19 18:06:11.000000000 -0700
@@ -35,7 +35,7 @@
 #include <stdlib.h>
 #endif
 
-#include <raptor.h>
+#include <raptor2/raptor2.h>
 
 #include "rasqal.h"
 #include "rasqal_internal.h"
diff -ur a/src/rasqal_rowsource_join.c b/src/rasqal_rowsource_join.c
--- a/src/rasqal_rowsource_join.c	2011-07-19 15:40:55.000000000 -0700
+++ b/src/rasqal_rowsource_join.c	2011-07-19 18:06:11.000000000 -0700
@@ -35,7 +35,7 @@
 #include <stdlib.h>
 #endif
 
-#include <raptor.h>
+#include <raptor2/raptor2.h>
 
 #include "rasqal.h"
 #include "rasqal_internal.h"
diff -ur a/src/rasqal_rowsource_project.c b/src/rasqal_rowsource_project.c
--- a/src/rasqal_rowsource_project.c	2011-07-19 15:40:55.000000000 -0700
+++ b/src/rasqal_rowsource_project.c	2011-07-19 18:06:11.000000000 -0700
@@ -35,7 +35,7 @@
 #include <stdlib.h>
 #endif
 
-#include <raptor.h>
+#include <raptor2/raptor2.h>
 
 #include "rasqal.h"
 #include "rasqal_internal.h"
diff -ur a/src/rasqal_rowsource_rowsequence.c b/src/rasqal_rowsource_rowsequence.c
--- a/src/rasqal_rowsource_rowsequence.c	2011-07-19 15:40:55.000000000 -0700
+++ b/src/rasqal_rowsource_rowsequence.c	2011-07-19 18:06:11.000000000 -0700
@@ -35,7 +35,7 @@
 #include <stdlib.h>
 #endif
 
-#include <raptor.h>
+#include <raptor2/raptor2.h>
 
 #include "rasqal.h"
 #include "rasqal_internal.h"
diff -ur a/src/rasqal_rowsource_sort.c b/src/rasqal_rowsource_sort.c
--- a/src/rasqal_rowsource_sort.c	2011-07-19 15:40:55.000000000 -0700
+++ b/src/rasqal_rowsource_sort.c	2011-07-19 18:06:11.000000000 -0700
@@ -35,7 +35,7 @@
 #include <stdlib.h>
 #endif
 
-#include <raptor.h>
+#include <raptor2/raptor2.h>
 
 #include "rasqal.h"
 #include "rasqal_internal.h"
diff -ur a/src/rasqal_rowsource_triples.c b/src/rasqal_rowsource_triples.c
--- a/src/rasqal_rowsource_triples.c	2011-07-19 15:40:55.000000000 -0700
+++ b/src/rasqal_rowsource_triples.c	2011-07-19 18:06:11.000000000 -0700
@@ -35,7 +35,7 @@
 #include <stdlib.h>
 #endif
 
-#include <raptor.h>
+#include <raptor2/raptor2.h>
 
 #include "rasqal.h"
 #include "rasqal_internal.h"
diff -ur a/src/rasqal_rowsource_union.c b/src/rasqal_rowsource_union.c
--- a/src/rasqal_rowsource_union.c	2011-07-19 15:40:55.000000000 -0700
+++ b/src/rasqal_rowsource_union.c	2011-07-19 18:06:10.000000000 -0700
@@ -35,7 +35,7 @@
 #include <stdlib.h>
 #endif
 
-#include <raptor.h>
+#include <raptor2/raptor2.h>
 
 #include "rasqal.h"
 #include "rasqal_internal.h"
diff -ur a/utils/srxread.c b/utils/srxread.c
--- a/utils/srxread.c	2011-07-19 15:40:56.000000000 -0700
+++ b/utils/srxread.c	2011-07-19 18:06:10.000000000 -0700
@@ -40,7 +40,7 @@
 #endif
 
 
-#include <raptor.h>
+#include <raptor2/raptor2.h>
 
 /* Rasqal includes */
 #include <rasqal.h>
diff -ur a/utils/srxwrite.c b/utils/srxwrite.c
--- a/utils/srxwrite.c	2011-07-19 15:40:56.000000000 -0700
+++ b/utils/srxwrite.c	2011-07-19 18:06:10.000000000 -0700
@@ -40,7 +40,7 @@
 #endif
 
 
-#include <raptor.h>
+#include <raptor2/raptor2.h>
 
 /* Rasqal includes */
 #include <rasqal.h>