Browse Source

No more public headers for iOS (for archiving)

It's not possible to archive an iOS app for distribution with public headers. Instead, the headers are all on the project level and Xcode is told where to find them.
Pascal Pfiffner 9 years ago
parent
commit
7258742543
3 changed files with 107 additions and 81 deletions
  1. 38 12
      README.md
  2. 68 68
      Redland.xcodeproj/project.pbxproj
  3. 1 1
      Redland_Prefix.pch

+ 38 - 12
README.md

@@ -1,7 +1,8 @@
 Redland Objective-C RDF Wrapper
 ===============================
 
-This projects is a resurrection of Rene Puls' Objective-C wrapper for the [Redland C libraries][librdf] for **Mac**, with the addition of a static library target suitable for **iOS**. The code now requires **Automatic Reference Counting** (ARC) to be enabled.
+This projects is a resurrection of Rene Puls' Objective-C wrapper for the [Redland C libraries][librdf] for **Mac**, with the addition of a static library
+target suitable for **iOS**. The code now requires **Automatic Reference Counting** (ARC) to be enabled.
 
 [git]: http://git-scm.com
 
@@ -29,25 +30,32 @@ Now whenever there has been an update to the framework and you want to get the l
 Building the C libraries
 ------------------------
 
-> **Note:** When building the C libraries with Xcode, the progress bar will appear stalled while saying _Running 1 of 1 custom shell scripts_, which can take some minutes. Just be patient, the compilation will go through or abort with an error.
+> **Note:** When building the C libraries with Xcode, the progress bar will appear stalled while saying _Running 1 of 1 custom shell scripts_, which can take
+some minutes. Just be patient, the compilation will go through or abort with an error.
 
-The first time you build the framework, the C libraries will automatically be built, so you need not worry about this. Compiling requires `pkg-config` which you can most easily install via [Homebrew]:
+The first time you build the framework, the C libraries will automatically be built, so you need not worry about this. Compiling requires `pkg-config` which
+you can most easily install via [Homebrew]:
 
     $ brew install pkg-config
 
 
 ### How cross compiling works
 
-There is a Python-script that downloads and (cross-)compiles libxml2, [raptor2], [rasqal] and [librdf], the components you need. The script needs you to have Xcode 4.5 and the iOS SDK 5.1 or later installed. Make sure you have installed the command line tools, you do that from within Xcode » Preferences » Downloads » Components.
+There is a Python-script that downloads and (cross-)compiles libxml2, [raptor2], [rasqal] and [librdf], the components you need. The script needs you to have
+Xcode 4.5 and the iOS SDK 5.1 or later installed. Make sure you have installed the command line tools, you do that from within Xcode » Preferences » Downloads
+» Components.
 
 Just choose the **Redland C Library** target and hit **Run**. Alternatively, open the Terminal and execute the script manually:
 
     $ cd Redland-ObjC/Redland-source
     $ ./cross-compile.py
 
-This will build libraries for `armv7`, `armv7s`, `i386` and `x86_64`. You can change this in the file `cross-compile-config.py` if you dare. The script will only build the missing C libraries, if you want to force a new build run the target **Redland PURGE C Library** or run the script `Redland-source/start-over.sh`.
+This will build libraries for `armv7`, `armv7s`, `i386` and `x86_64`. You can change this in the file `cross-compile-config.py` if you dare. The script will
+only build the missing C libraries, if you want to force a new build run the target **Redland PURGE C Library** or run the script
+`Redland-source/start-over.sh`.
 
-The process will also download and build **libxml2** version 2.7.8 despite it being included in OS X. This is done because pkg-config and the system-supplied lxml don't play together very well. We can't use version libxml 2.9.0 because that version contains a bug and is not compile-able on OS X.
+The process will also download and build **libxml2** version 2.7.8 despite it being included in OS X. This is done because pkg-config and the system-supplied
+lxml don't play together very well. We can't use version libxml 2.9.0 because that version contains a bug and is not compile-able on OS X.
 
 [raptor2]: http://librdf.org/raptor/
 [rasqal]: http://librdf.org/rasqal/
@@ -58,7 +66,8 @@ The process will also download and build **libxml2** version 2.7.8 despite it be
 Using the Framework
 -------------------
 
-The framework is intended to be added to your Xcode workspace and linked into your app. Add the project file `Redland.xcodeproj` to your own project workspace by dragging it to the file area in Xcode.
+The framework is intended to be added to your Xcode workspace and linked into your app. Add the project file `Redland.xcodeproj` to your own project workspace
+by dragging it to the file area in Xcode.
 
 Then, in your app's **Build Settings**, you need to adjust a few things:
 
@@ -68,7 +77,11 @@ In your app's **Build Phases** under **Link Binary with Libraries**, add these l
 
 * `libredland-ios.a`
   
-  > After you've added this lib and build your app, Xcode will automatically build the Redland-ObjC project first. As noted above, this will take a few minutes the first time it happens because Xcode cross-compiles the redland C libraries for the first time.
+  > **Note:** After you've added this lib and build your app, Xcode will automatically build the Redland-ObjC project first. As noted above, this will take a
+  > few minutes the first time it happens because Xcode cross-compiles the redland C libraries for the first time.
+  
+  > **Note:** Xcode seems to have issues when header files get added during a build process, which is what happens on the first cross compile. If your app
+  > build fails because of missing headers, simply close and reopen the project again.
 
 * `libxml2.dylib`
 * `libsqlite3.dylib` (if you use storage)
@@ -85,7 +98,17 @@ Now you need to give Xcode some more hints so it can compile your app
 
 `-ObjC`  
 
-> This makes sure categories used in the framework are being correctly loaded. If you forget this flag, your app will crash as soon as you try to use a class method on a Redland object.
+> This makes sure categories used in the framework are being correctly loaded. If you forget this flag, your app will crash as soon as you try to use a class
+> method on a Redland object.
+
+### A Note on Header Files ###
+
+What you would usually do with static libraries is have public header files. This however prevents Xcode from building an executable app when archiving since
+it also archives the public headers to a usr/include folder in the archive.
+
+For this reason all iOS header files in the framework are on project level only. This is why you must tell Xcode to go look for your header files in the
+project directory instead, as instructed above.
+
 
 
 Using Redland Objects
@@ -149,13 +172,15 @@ NSString *creator = [rslt.object literalValue];
 NSLog(@"Creator: %@", creator);
 ```
 
-I've made a [simple demo app for iOS](https://github.com/p2/RedlandDemo) if you want to see it in action. The demo app contains the framework as a submodule, so just clone the demo repository and hit `Run`.
+I've made a [simple demo app for iOS](https://github.com/p2/RedlandDemo) if you want to see it in action. The demo app contains the framework as a submodule,
+so just clone the demo repository and hit `Run`.
 
 
 Building the Documentation
 --------------------------
 
-The code is documented using [appledoc]. This allows you to integrate the documentation right into Xcode, meaning you can then `ALT` - click Redland classes and methods to see what they do.  
+The code is documented using [appledoc]. This allows you to integrate the documentation right into Xcode, meaning you can then `ALT` - click Redland classes
+and methods to see what they do.  
 If you want to compile the documentation, it's best if you grab appledoc from GitHub directly:
 
     $ git clone git://github.com/tomaz/appledoc.git
@@ -166,6 +191,7 @@ Afterwards just select the **Redland Documentation** target in Xcode and hit `CM
 
 > NOTE: appledoc currently does not support the `///<` token, so some property documentations are shifted and thus off!
 
-Note that this assumes that you have write permissions for `/usr/local`, if not you may need to issue this command as root with `sudo`. The documentation is now available from within Xcode.
+Note that this assumes that you have write permissions for `/usr/local`, if not you may need to issue this command as root with `sudo`. The documentation is
+now available from within Xcode.
 
 [appledoc]: http://gentlebytes.com/appledoc/

+ 68 - 68
Redland.xcodeproj/project.pbxproj

@@ -58,15 +58,15 @@
 		8DC2EF510486A6940098B216 /* Redland_Prefix.pch in Headers */ = {isa = PBXBuildFile; fileRef = 32DBCF5E0370ADEE00C91783 /* Redland_Prefix.pch */; };
 		8DC2EF530486A6940098B216 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C1666FE841158C02AAC07 /* InfoPlist.strings */; };
 		8DC2EF570486A6940098B216 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7B1FEA5585E11CA2CBB /* Cocoa.framework */; };
-		ED11265E069DD654006F17FD /* RedlandException.h in Headers */ = {isa = PBXBuildFile; fileRef = ED11265C069DD654006F17FD /* RedlandException.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		ED11265E069DD654006F17FD /* RedlandException.h in Headers */ = {isa = PBXBuildFile; fileRef = ED11265C069DD654006F17FD /* RedlandException.h */; settings = {ATTRIBUTES = (); }; };
 		ED11265F069DD654006F17FD /* RedlandException.m in Sources */ = {isa = PBXBuildFile; fileRef = ED11265D069DD654006F17FD /* RedlandException.m */; };
-		ED3B0A6806E621FC001E4C72 /* RedlandModel-Convenience.h in Headers */ = {isa = PBXBuildFile; fileRef = ED3B0A6606E621FC001E4C72 /* RedlandModel-Convenience.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		ED3B0A6806E621FC001E4C72 /* RedlandModel-Convenience.h in Headers */ = {isa = PBXBuildFile; fileRef = ED3B0A6606E621FC001E4C72 /* RedlandModel-Convenience.h */; settings = {ATTRIBUTES = (); }; };
 		ED3B0A6906E621FC001E4C72 /* RedlandModel-Convenience.m in Sources */ = {isa = PBXBuildFile; fileRef = ED3B0A6706E621FC001E4C72 /* RedlandModel-Convenience.m */; };
-		ED486C9506DA6F7900AA6058 /* RedlandQuery.h in Headers */ = {isa = PBXBuildFile; fileRef = ED486C9306DA6F7900AA6058 /* RedlandQuery.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		ED486C9506DA6F7900AA6058 /* RedlandQuery.h in Headers */ = {isa = PBXBuildFile; fileRef = ED486C9306DA6F7900AA6058 /* RedlandQuery.h */; settings = {ATTRIBUTES = (); }; };
 		ED486C9606DA6F7900AA6058 /* RedlandQuery.m in Sources */ = {isa = PBXBuildFile; fileRef = ED486C9406DA6F7900AA6058 /* RedlandQuery.m */; };
-		ED486CEC06DA72DF00AA6058 /* RedlandQueryResults.h in Headers */ = {isa = PBXBuildFile; fileRef = ED486CEA06DA72DF00AA6058 /* RedlandQueryResults.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		ED486CEC06DA72DF00AA6058 /* RedlandQueryResults.h in Headers */ = {isa = PBXBuildFile; fileRef = ED486CEA06DA72DF00AA6058 /* RedlandQueryResults.h */; settings = {ATTRIBUTES = (); }; };
 		ED486CED06DA72DF00AA6058 /* RedlandQueryResults.m in Sources */ = {isa = PBXBuildFile; fileRef = ED486CEB06DA72DF00AA6058 /* RedlandQueryResults.m */; };
-		ED486DF606DA80D500AA6058 /* RedlandQueryResultsEnumerator.h in Headers */ = {isa = PBXBuildFile; fileRef = ED486DF406DA80D500AA6058 /* RedlandQueryResultsEnumerator.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		ED486DF606DA80D500AA6058 /* RedlandQueryResultsEnumerator.h in Headers */ = {isa = PBXBuildFile; fileRef = ED486DF406DA80D500AA6058 /* RedlandQueryResultsEnumerator.h */; settings = {ATTRIBUTES = (); }; };
 		ED486DF706DA80D500AA6058 /* RedlandQueryResultsEnumerator.m in Sources */ = {isa = PBXBuildFile; fileRef = ED486DF506DA80D500AA6058 /* RedlandQueryResultsEnumerator.m */; };
 		ED48EB5E08BB565500ACF14F /* WorldTests.m in Sources */ = {isa = PBXBuildFile; fileRef = ED69A43B06F9E54B00A624F7 /* WorldTests.m */; };
 		ED48EB7908BB590600ACF14F /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0867D69BFE84028FC02AAC07 /* Foundation.framework */; };
@@ -88,40 +88,40 @@
 		ED48EC2708BB774E00ACF14F /* rdf-syntax.rdf in Resources */ = {isa = PBXBuildFile; fileRef = ED98642206FAEE3C009186B3 /* rdf-syntax.rdf */; };
 		ED48EC2808BB776B00ACF14F /* SerializerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = ED98643906FAF064009186B3 /* SerializerTests.m */; };
 		ED48EC3108BB789700ACF14F /* QueryTests.m in Sources */ = {isa = PBXBuildFile; fileRef = ED98651B06FB12E6009186B3 /* QueryTests.m */; };
-		ED699ED106F9D3D600A624F7 /* RedlandWrappedObject.h in Headers */ = {isa = PBXBuildFile; fileRef = ED699ECF06F9D3D600A624F7 /* RedlandWrappedObject.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		ED699ED106F9D3D600A624F7 /* RedlandWrappedObject.h in Headers */ = {isa = PBXBuildFile; fileRef = ED699ECF06F9D3D600A624F7 /* RedlandWrappedObject.h */; settings = {ATTRIBUTES = (); }; };
 		ED699ED206F9D3D600A624F7 /* RedlandWrappedObject.m in Sources */ = {isa = PBXBuildFile; fileRef = ED699ED006F9D3D600A624F7 /* RedlandWrappedObject.m */; };
-		ED8D24920688A22D0039DA12 /* RedlandWorld.h in Headers */ = {isa = PBXBuildFile; fileRef = ED8D24900688A22D0039DA12 /* RedlandWorld.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		ED8D24920688A22D0039DA12 /* RedlandWorld.h in Headers */ = {isa = PBXBuildFile; fileRef = ED8D24900688A22D0039DA12 /* RedlandWorld.h */; settings = {ATTRIBUTES = (); }; };
 		ED8D24930688A22D0039DA12 /* RedlandWorld.m in Sources */ = {isa = PBXBuildFile; fileRef = ED8D24910688A22D0039DA12 /* RedlandWorld.m */; };
-		ED8D25520688A6350039DA12 /* RedlandStorage.h in Headers */ = {isa = PBXBuildFile; fileRef = ED8D25500688A6350039DA12 /* RedlandStorage.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		ED8D25520688A6350039DA12 /* RedlandStorage.h in Headers */ = {isa = PBXBuildFile; fileRef = ED8D25500688A6350039DA12 /* RedlandStorage.h */; settings = {ATTRIBUTES = (); }; };
 		ED8D25530688A6350039DA12 /* RedlandStorage.m in Sources */ = {isa = PBXBuildFile; fileRef = ED8D25510688A6350039DA12 /* RedlandStorage.m */; };
-		ED8D25B50688A75B0039DA12 /* RedlandParser.h in Headers */ = {isa = PBXBuildFile; fileRef = ED8D25B30688A75B0039DA12 /* RedlandParser.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		ED8D25B50688A75B0039DA12 /* RedlandParser.h in Headers */ = {isa = PBXBuildFile; fileRef = ED8D25B30688A75B0039DA12 /* RedlandParser.h */; settings = {ATTRIBUTES = (); }; };
 		ED8D25B60688A75B0039DA12 /* RedlandParser.m in Sources */ = {isa = PBXBuildFile; fileRef = ED8D25B40688A75B0039DA12 /* RedlandParser.m */; };
-		ED8D25D30688A7DF0039DA12 /* RedlandModel.h in Headers */ = {isa = PBXBuildFile; fileRef = ED8D25D10688A7DF0039DA12 /* RedlandModel.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		ED8D25D30688A7DF0039DA12 /* RedlandModel.h in Headers */ = {isa = PBXBuildFile; fileRef = ED8D25D10688A7DF0039DA12 /* RedlandModel.h */; settings = {ATTRIBUTES = (); }; };
 		ED8D25D40688A7DF0039DA12 /* RedlandModel.m in Sources */ = {isa = PBXBuildFile; fileRef = ED8D25D20688A7DF0039DA12 /* RedlandModel.m */; };
-		ED8D25F70688A8E80039DA12 /* RedlandStream.h in Headers */ = {isa = PBXBuildFile; fileRef = ED8D25F50688A8E80039DA12 /* RedlandStream.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		ED8D25F70688A8E80039DA12 /* RedlandStream.h in Headers */ = {isa = PBXBuildFile; fileRef = ED8D25F50688A8E80039DA12 /* RedlandStream.h */; settings = {ATTRIBUTES = (); }; };
 		ED8D25F80688A8E80039DA12 /* RedlandStream.m in Sources */ = {isa = PBXBuildFile; fileRef = ED8D25F60688A8E80039DA12 /* RedlandStream.m */; };
-		ED8D26850688AC490039DA12 /* RedlandNode.h in Headers */ = {isa = PBXBuildFile; fileRef = ED8D26830688AC490039DA12 /* RedlandNode.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		ED8D26850688AC490039DA12 /* RedlandNode.h in Headers */ = {isa = PBXBuildFile; fileRef = ED8D26830688AC490039DA12 /* RedlandNode.h */; settings = {ATTRIBUTES = (); }; };
 		ED8D26860688AC490039DA12 /* RedlandNode.m in Sources */ = {isa = PBXBuildFile; fileRef = ED8D26840688AC490039DA12 /* RedlandNode.m */; };
-		ED8D26A80688ACA20039DA12 /* RedlandStatement.h in Headers */ = {isa = PBXBuildFile; fileRef = ED8D26A60688ACA20039DA12 /* RedlandStatement.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		ED8D26A80688ACA20039DA12 /* RedlandStatement.h in Headers */ = {isa = PBXBuildFile; fileRef = ED8D26A60688ACA20039DA12 /* RedlandStatement.h */; settings = {ATTRIBUTES = (); }; };
 		ED8D26A90688ACA20039DA12 /* RedlandStatement.m in Sources */ = {isa = PBXBuildFile; fileRef = ED8D26A70688ACA20039DA12 /* RedlandStatement.m */; };
-		ED8D26C90688AD1F0039DA12 /* RedlandURI.h in Headers */ = {isa = PBXBuildFile; fileRef = ED8D26C70688AD1F0039DA12 /* RedlandURI.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		ED8D26C90688AD1F0039DA12 /* RedlandURI.h in Headers */ = {isa = PBXBuildFile; fileRef = ED8D26C70688AD1F0039DA12 /* RedlandURI.h */; settings = {ATTRIBUTES = (); }; };
 		ED8D26CA0688AD1F0039DA12 /* RedlandURI.m in Sources */ = {isa = PBXBuildFile; fileRef = ED8D26C80688AD1F0039DA12 /* RedlandURI.m */; };
-		ED8D271B0688AEEE0039DA12 /* Redland-ObjC.h in Headers */ = {isa = PBXBuildFile; fileRef = ED8D271A0688AEEE0039DA12 /* Redland-ObjC.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		ED8D28350688B6CF0039DA12 /* RedlandSerializer.h in Headers */ = {isa = PBXBuildFile; fileRef = ED8D28330688B6CF0039DA12 /* RedlandSerializer.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		ED8D271B0688AEEE0039DA12 /* Redland-ObjC.h in Headers */ = {isa = PBXBuildFile; fileRef = ED8D271A0688AEEE0039DA12 /* Redland-ObjC.h */; settings = {ATTRIBUTES = (); }; };
+		ED8D28350688B6CF0039DA12 /* RedlandSerializer.h in Headers */ = {isa = PBXBuildFile; fileRef = ED8D28330688B6CF0039DA12 /* RedlandSerializer.h */; settings = {ATTRIBUTES = (); }; };
 		ED8D28360688B6CF0039DA12 /* RedlandSerializer.m in Sources */ = {isa = PBXBuildFile; fileRef = ED8D28340688B6CF0039DA12 /* RedlandSerializer.m */; };
-		ED9863A706FAE6AB009186B3 /* RedlandNode-Convenience.h in Headers */ = {isa = PBXBuildFile; fileRef = ED69A49906F9EB8200A624F7 /* RedlandNode-Convenience.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		ED9863A706FAE6AB009186B3 /* RedlandNode-Convenience.h in Headers */ = {isa = PBXBuildFile; fileRef = ED69A49906F9EB8200A624F7 /* RedlandNode-Convenience.h */; settings = {ATTRIBUTES = (); }; };
 		ED9863A806FAE6AB009186B3 /* RedlandNode-Convenience.m in Sources */ = {isa = PBXBuildFile; fileRef = ED69A49A06F9EB8200A624F7 /* RedlandNode-Convenience.m */; };
-		EDAC616606943C75007A085A /* RedlandStreamEnumerator.h in Headers */ = {isa = PBXBuildFile; fileRef = EDAC616406943C75007A085A /* RedlandStreamEnumerator.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		EDAC616606943C75007A085A /* RedlandStreamEnumerator.h in Headers */ = {isa = PBXBuildFile; fileRef = EDAC616406943C75007A085A /* RedlandStreamEnumerator.h */; settings = {ATTRIBUTES = (); }; };
 		EDAC616706943C75007A085A /* RedlandStreamEnumerator.m in Sources */ = {isa = PBXBuildFile; fileRef = EDAC616506943C75007A085A /* RedlandStreamEnumerator.m */; };
-		EDAC63830694506E007A085A /* RedlandNamespace.h in Headers */ = {isa = PBXBuildFile; fileRef = EDAC63810694506E007A085A /* RedlandNamespace.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		EDAC63830694506E007A085A /* RedlandNamespace.h in Headers */ = {isa = PBXBuildFile; fileRef = EDAC63810694506E007A085A /* RedlandNamespace.h */; settings = {ATTRIBUTES = (); }; };
 		EDAC63840694506E007A085A /* RedlandNamespace.m in Sources */ = {isa = PBXBuildFile; fileRef = EDAC63820694506E007A085A /* RedlandNamespace.m */; };
-		EDB09CA10688CF300071464A /* RedlandIterator.h in Headers */ = {isa = PBXBuildFile; fileRef = EDB09C9F0688CF300071464A /* RedlandIterator.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		EDB09CA10688CF300071464A /* RedlandIterator.h in Headers */ = {isa = PBXBuildFile; fileRef = EDB09C9F0688CF300071464A /* RedlandIterator.h */; settings = {ATTRIBUTES = (); }; };
 		EDB09CA20688CF300071464A /* RedlandIterator.m in Sources */ = {isa = PBXBuildFile; fileRef = EDB09CA00688CF300071464A /* RedlandIterator.m */; };
-		EDB09D2C0688D50F0071464A /* RedlandIteratorEnumerator.h in Headers */ = {isa = PBXBuildFile; fileRef = EDB09D2A0688D50F0071464A /* RedlandIteratorEnumerator.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		EDB09D2C0688D50F0071464A /* RedlandIteratorEnumerator.h in Headers */ = {isa = PBXBuildFile; fileRef = EDB09D2A0688D50F0071464A /* RedlandIteratorEnumerator.h */; settings = {ATTRIBUTES = (); }; };
 		EDB09D2D0688D50F0071464A /* RedlandIteratorEnumerator.m in Sources */ = {isa = PBXBuildFile; fileRef = EDB09D2B0688D50F0071464A /* RedlandIteratorEnumerator.m */; };
 		EDBA0E4907379BDD00610CB1 /* NOTICE.txt in Resources */ = {isa = PBXBuildFile; fileRef = EDBA0E4807379BDD00610CB1 /* NOTICE.txt */; };
 		EDBA0EB20737A89A00610CB1 /* LICENSE.txt in Resources */ = {isa = PBXBuildFile; fileRef = ED98645906FAF0D8009186B3 /* LICENSE.txt */; };
-		EE0CB64315BE4BF3004BB6C9 /* redland.h in Headers */ = {isa = PBXBuildFile; fileRef = EE0CB63A15BE4AF7004BB6C9 /* redland.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		EE0CB64315BE4BF3004BB6C9 /* redland.h in Headers */ = {isa = PBXBuildFile; fileRef = EE0CB63A15BE4AF7004BB6C9 /* redland.h */; settings = {ATTRIBUTES = (); }; };
 		EE205F241602910A0020752E /* WorldTests.m in Sources */ = {isa = PBXBuildFile; fileRef = ED69A43B06F9E54B00A624F7 /* WorldTests.m */; };
 		EE205F251602910A0020752E /* URITests.m in Sources */ = {isa = PBXBuildFile; fileRef = ED69A3C106F9DCBA00A624F7 /* URITests.m */; };
 		EE205F261602910A0020752E /* NodeTests.m in Sources */ = {isa = PBXBuildFile; fileRef = ED69A49406F9EAF700A624F7 /* NodeTests.m */; };
@@ -133,31 +133,31 @@
 		EE205F2C1602910A0020752E /* QueryTests.m in Sources */ = {isa = PBXBuildFile; fileRef = ED98651B06FB12E6009186B3 /* QueryTests.m */; };
 		EE205F2D1602910A0020752E /* NamespaceTests.m in Sources */ = {isa = PBXBuildFile; fileRef = ED69A52B06F9F35E00A624F7 /* NamespaceTests.m */; };
 		EE205F2E1602917C0020752E /* libredland-ios.a in Frameworks */ = {isa = PBXBuildFile; fileRef = EEE7B44E15C84978004D5A68 /* libredland-ios.a */; };
-		EE5144EE15DAEF1400DA9BA2 /* RedlandModel.h in Headers */ = {isa = PBXBuildFile; fileRef = ED8D25D10688A7DF0039DA12 /* RedlandModel.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		EE5144F015DAEFD400DA9BA2 /* RedlandWrappedObject.h in Headers */ = {isa = PBXBuildFile; fileRef = ED699ECF06F9D3D600A624F7 /* RedlandWrappedObject.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		EE5144F115DAEFD400DA9BA2 /* RedlandWorld.h in Headers */ = {isa = PBXBuildFile; fileRef = ED8D24900688A22D0039DA12 /* RedlandWorld.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		EE5144F215DAEFD400DA9BA2 /* RedlandURI.h in Headers */ = {isa = PBXBuildFile; fileRef = ED8D26C70688AD1F0039DA12 /* RedlandURI.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		EE5144F315DAEFD400DA9BA2 /* RedlandNode.h in Headers */ = {isa = PBXBuildFile; fileRef = ED8D26830688AC490039DA12 /* RedlandNode.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		EE5144F415DAEFD400DA9BA2 /* RedlandStatement.h in Headers */ = {isa = PBXBuildFile; fileRef = ED8D26A60688ACA20039DA12 /* RedlandStatement.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		EE5144F515DAEFD400DA9BA2 /* RedlandIterator.h in Headers */ = {isa = PBXBuildFile; fileRef = EDB09C9F0688CF300071464A /* RedlandIterator.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		EE5144F615DAEFD400DA9BA2 /* RedlandStream.h in Headers */ = {isa = PBXBuildFile; fileRef = ED8D25F50688A8E80039DA12 /* RedlandStream.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		EE5144F715DAEFD400DA9BA2 /* RedlandStorage.h in Headers */ = {isa = PBXBuildFile; fileRef = ED8D25500688A6350039DA12 /* RedlandStorage.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		EE5144F815DAEFD400DA9BA2 /* RedlandParser.h in Headers */ = {isa = PBXBuildFile; fileRef = ED8D25B30688A75B0039DA12 /* RedlandParser.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		EE5144F915DAEFD400DA9BA2 /* RedlandSerializer.h in Headers */ = {isa = PBXBuildFile; fileRef = ED8D28330688B6CF0039DA12 /* RedlandSerializer.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		EE5144FA15DAEFD400DA9BA2 /* RedlandQuery.h in Headers */ = {isa = PBXBuildFile; fileRef = ED486C9306DA6F7900AA6058 /* RedlandQuery.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		EE5144FB15DAEFD400DA9BA2 /* RedlandQueryResults.h in Headers */ = {isa = PBXBuildFile; fileRef = ED486CEA06DA72DF00AA6058 /* RedlandQueryResults.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		EE5144EE15DAEF1400DA9BA2 /* RedlandModel.h in Headers */ = {isa = PBXBuildFile; fileRef = ED8D25D10688A7DF0039DA12 /* RedlandModel.h */; settings = {ATTRIBUTES = (); }; };
+		EE5144F015DAEFD400DA9BA2 /* RedlandWrappedObject.h in Headers */ = {isa = PBXBuildFile; fileRef = ED699ECF06F9D3D600A624F7 /* RedlandWrappedObject.h */; settings = {ATTRIBUTES = (); }; };
+		EE5144F115DAEFD400DA9BA2 /* RedlandWorld.h in Headers */ = {isa = PBXBuildFile; fileRef = ED8D24900688A22D0039DA12 /* RedlandWorld.h */; settings = {ATTRIBUTES = (); }; };
+		EE5144F215DAEFD400DA9BA2 /* RedlandURI.h in Headers */ = {isa = PBXBuildFile; fileRef = ED8D26C70688AD1F0039DA12 /* RedlandURI.h */; settings = {ATTRIBUTES = (); }; };
+		EE5144F315DAEFD400DA9BA2 /* RedlandNode.h in Headers */ = {isa = PBXBuildFile; fileRef = ED8D26830688AC490039DA12 /* RedlandNode.h */; settings = {ATTRIBUTES = (); }; };
+		EE5144F415DAEFD400DA9BA2 /* RedlandStatement.h in Headers */ = {isa = PBXBuildFile; fileRef = ED8D26A60688ACA20039DA12 /* RedlandStatement.h */; settings = {ATTRIBUTES = (); }; };
+		EE5144F515DAEFD400DA9BA2 /* RedlandIterator.h in Headers */ = {isa = PBXBuildFile; fileRef = EDB09C9F0688CF300071464A /* RedlandIterator.h */; settings = {ATTRIBUTES = (); }; };
+		EE5144F615DAEFD400DA9BA2 /* RedlandStream.h in Headers */ = {isa = PBXBuildFile; fileRef = ED8D25F50688A8E80039DA12 /* RedlandStream.h */; settings = {ATTRIBUTES = (); }; };
+		EE5144F715DAEFD400DA9BA2 /* RedlandStorage.h in Headers */ = {isa = PBXBuildFile; fileRef = ED8D25500688A6350039DA12 /* RedlandStorage.h */; settings = {ATTRIBUTES = (); }; };
+		EE5144F815DAEFD400DA9BA2 /* RedlandParser.h in Headers */ = {isa = PBXBuildFile; fileRef = ED8D25B30688A75B0039DA12 /* RedlandParser.h */; settings = {ATTRIBUTES = (); }; };
+		EE5144F915DAEFD400DA9BA2 /* RedlandSerializer.h in Headers */ = {isa = PBXBuildFile; fileRef = ED8D28330688B6CF0039DA12 /* RedlandSerializer.h */; settings = {ATTRIBUTES = (); }; };
+		EE5144FA15DAEFD400DA9BA2 /* RedlandQuery.h in Headers */ = {isa = PBXBuildFile; fileRef = ED486C9306DA6F7900AA6058 /* RedlandQuery.h */; settings = {ATTRIBUTES = (); }; };
+		EE5144FB15DAEFD400DA9BA2 /* RedlandQueryResults.h in Headers */ = {isa = PBXBuildFile; fileRef = ED486CEA06DA72DF00AA6058 /* RedlandQueryResults.h */; settings = {ATTRIBUTES = (); }; };
 		EE555EDB15C86B5700F26A1A /* libxml2.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = ED2B3E9D06EDD9BA00CE81BB /* libxml2.dylib */; };
 		EE555EDC15C86B5900F26A1A /* libxslt.1.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = ED48EB7D08BB593800ACF14F /* libxslt.1.dylib */; };
 		EE555EE315C873B000F26A1A /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = EE555EE215C873B000F26A1A /* libz.dylib */; };
 		EE555EE415C873E300F26A1A /* rdf-syntax.rdf in Resources */ = {isa = PBXBuildFile; fileRef = ED98642206FAEE3C009186B3 /* rdf-syntax.rdf */; };
 		EE555EE515C873E600F26A1A /* rdf-schema.rdf in Resources */ = {isa = PBXBuildFile; fileRef = ED98662B06FB3D05009186B3 /* rdf-schema.rdf */; };
-		EE555EEE15C8EFF100F26A1A /* RedlandException.h in Headers */ = {isa = PBXBuildFile; fileRef = ED11265C069DD654006F17FD /* RedlandException.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		EE555EEF15C8EFF500F26A1A /* RedlandModel-Convenience.h in Headers */ = {isa = PBXBuildFile; fileRef = ED3B0A6606E621FC001E4C72 /* RedlandModel-Convenience.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		EE555EF015C8EFFA00F26A1A /* RedlandNode-Convenience.h in Headers */ = {isa = PBXBuildFile; fileRef = ED69A49906F9EB8200A624F7 /* RedlandNode-Convenience.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		EE555EF115C8EFFE00F26A1A /* RedlandStreamEnumerator.h in Headers */ = {isa = PBXBuildFile; fileRef = EDAC616406943C75007A085A /* RedlandStreamEnumerator.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		EE555EF215C8F00200F26A1A /* RedlandIteratorEnumerator.h in Headers */ = {isa = PBXBuildFile; fileRef = EDB09D2A0688D50F0071464A /* RedlandIteratorEnumerator.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		EE555EF315C8F00600F26A1A /* RedlandQueryResultsEnumerator.h in Headers */ = {isa = PBXBuildFile; fileRef = ED486DF406DA80D500AA6058 /* RedlandQueryResultsEnumerator.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		EE555EF415C8F00D00F26A1A /* RedlandNamespace.h in Headers */ = {isa = PBXBuildFile; fileRef = EDAC63810694506E007A085A /* RedlandNamespace.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		EE555EEE15C8EFF100F26A1A /* RedlandException.h in Headers */ = {isa = PBXBuildFile; fileRef = ED11265C069DD654006F17FD /* RedlandException.h */; settings = {ATTRIBUTES = (); }; };
+		EE555EEF15C8EFF500F26A1A /* RedlandModel-Convenience.h in Headers */ = {isa = PBXBuildFile; fileRef = ED3B0A6606E621FC001E4C72 /* RedlandModel-Convenience.h */; settings = {ATTRIBUTES = (); }; };
+		EE555EF015C8EFFA00F26A1A /* RedlandNode-Convenience.h in Headers */ = {isa = PBXBuildFile; fileRef = ED69A49906F9EB8200A624F7 /* RedlandNode-Convenience.h */; settings = {ATTRIBUTES = (); }; };
+		EE555EF115C8EFFE00F26A1A /* RedlandStreamEnumerator.h in Headers */ = {isa = PBXBuildFile; fileRef = EDAC616406943C75007A085A /* RedlandStreamEnumerator.h */; settings = {ATTRIBUTES = (); }; };
+		EE555EF215C8F00200F26A1A /* RedlandIteratorEnumerator.h in Headers */ = {isa = PBXBuildFile; fileRef = EDB09D2A0688D50F0071464A /* RedlandIteratorEnumerator.h */; settings = {ATTRIBUTES = (); }; };
+		EE555EF315C8F00600F26A1A /* RedlandQueryResultsEnumerator.h in Headers */ = {isa = PBXBuildFile; fileRef = ED486DF406DA80D500AA6058 /* RedlandQueryResultsEnumerator.h */; settings = {ATTRIBUTES = (); }; };
+		EE555EF415C8F00D00F26A1A /* RedlandNamespace.h in Headers */ = {isa = PBXBuildFile; fileRef = EDAC63810694506E007A085A /* RedlandNamespace.h */; settings = {ATTRIBUTES = (); }; };
 		EE555EF515C8F26000F26A1A /* RedlandNode-Convenience.m in Sources */ = {isa = PBXBuildFile; fileRef = ED69A49A06F9EB8200A624F7 /* RedlandNode-Convenience.m */; };
 		EE74748715B902E7004A456E /* (null) in Headers */ = {isa = PBXBuildFile; };
 		EE74748815B902E7004A456E /* (null) in Headers */ = {isa = PBXBuildFile; };
@@ -195,7 +195,7 @@
 		EEB65C7E166BB18C00ADFF79 /* librdf.a in Frameworks */ = {isa = PBXBuildFile; fileRef = EE0CB64915BE5CB4004BB6C9 /* librdf.a */; };
 		EEBFED8C15C0A9B600E352C7 /* Redland.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8DC2EF5B0486A6940098B216 /* Redland.framework */; };
 		EEBFED9015C0ADBD00E352C7 /* Redland.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 8DC2EF5B0486A6940098B216 /* Redland.framework */; };
-		EEDD45FA162E14EF00ECA308 /* Redland-ObjC.h in Headers */ = {isa = PBXBuildFile; fileRef = ED8D271A0688AEEE0039DA12 /* Redland-ObjC.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		EEDD45FA162E14EF00ECA308 /* Redland-ObjC.h in Headers */ = {isa = PBXBuildFile; fileRef = ED8D271A0688AEEE0039DA12 /* Redland-ObjC.h */; settings = {ATTRIBUTES = (); }; };
 		EEDE81C715BF4D9D00AC2B64 /* libraptor2.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = EEDE81B715BF375F00AC2B64 /* libraptor2.dylib */; };
 		EEDE81C815BF4D9F00AC2B64 /* librasqal.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = EEDE81B815BF375F00AC2B64 /* librasqal.dylib */; };
 		EEDE81C915BF4DA100AC2B64 /* librdf.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = EEDE81B915BF375F00AC2B64 /* librdf.dylib */; };
@@ -218,30 +218,30 @@
 		EEE7B48A15C849B3004D5A68 /* RedlandIteratorEnumerator.m in Sources */ = {isa = PBXBuildFile; fileRef = EDB09D2B0688D50F0071464A /* RedlandIteratorEnumerator.m */; };
 		EEE7B48B15C849B3004D5A68 /* RedlandQueryResultsEnumerator.m in Sources */ = {isa = PBXBuildFile; fileRef = ED486DF506DA80D500AA6058 /* RedlandQueryResultsEnumerator.m */; };
 		EEE7B48C15C849B3004D5A68 /* RedlandNamespace.m in Sources */ = {isa = PBXBuildFile; fileRef = EDAC63820694506E007A085A /* RedlandNamespace.m */; };
-		EEE7B49D15C84F61004D5A68 /* redland.h in Headers */ = {isa = PBXBuildFile; fileRef = EE0CB66315BE5CC1004BB6C9 /* redland.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		EEE7B49E15C84F63004D5A68 /* librdf.h in Headers */ = {isa = PBXBuildFile; fileRef = EE0CB64A15BE5CC1004BB6C9 /* librdf.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		EEE7B49F15C84F6A004D5A68 /* raptor.h in Headers */ = {isa = PBXBuildFile; fileRef = EE0CB64C15BE5CC1004BB6C9 /* raptor.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		EEE7B4A015C84F6D004D5A68 /* raptor2.h in Headers */ = {isa = PBXBuildFile; fileRef = EE0CB64D15BE5CC1004BB6C9 /* raptor2.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		EEE7B4A115C84F73004D5A68 /* rasqal.h in Headers */ = {isa = PBXBuildFile; fileRef = EE0CB64F15BE5CC1004BB6C9 /* rasqal.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		EEE7B4A215C84F7D004D5A68 /* rdf_concepts.h in Headers */ = {isa = PBXBuildFile; fileRef = EE0CB65015BE5CC1004BB6C9 /* rdf_concepts.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		EEE7B4A315C84F86004D5A68 /* rdf_digest.h in Headers */ = {isa = PBXBuildFile; fileRef = EE0CB65115BE5CC1004BB6C9 /* rdf_digest.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		EEE7B4A415C84F86004D5A68 /* rdf_hash.h in Headers */ = {isa = PBXBuildFile; fileRef = EE0CB65215BE5CC1004BB6C9 /* rdf_hash.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		EEE7B4A515C84F86004D5A68 /* rdf_init.h in Headers */ = {isa = PBXBuildFile; fileRef = EE0CB65315BE5CC1004BB6C9 /* rdf_init.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		EEE7B4A615C84F86004D5A68 /* rdf_iterator.h in Headers */ = {isa = PBXBuildFile; fileRef = EE0CB65415BE5CC1004BB6C9 /* rdf_iterator.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		EEE7B4A715C84F86004D5A68 /* rdf_list.h in Headers */ = {isa = PBXBuildFile; fileRef = EE0CB65515BE5CC1004BB6C9 /* rdf_list.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		EEE7B4A815C84F86004D5A68 /* rdf_log.h in Headers */ = {isa = PBXBuildFile; fileRef = EE0CB65615BE5CC1004BB6C9 /* rdf_log.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		EEE7B4A915C84F86004D5A68 /* rdf_model.h in Headers */ = {isa = PBXBuildFile; fileRef = EE0CB65715BE5CC1004BB6C9 /* rdf_model.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		EEE7B4AA15C84F86004D5A68 /* rdf_node.h in Headers */ = {isa = PBXBuildFile; fileRef = EE0CB65815BE5CC1004BB6C9 /* rdf_node.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		EEE7B4AB15C84F86004D5A68 /* rdf_parser.h in Headers */ = {isa = PBXBuildFile; fileRef = EE0CB65915BE5CC1004BB6C9 /* rdf_parser.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		EEE7B4AC15C84F86004D5A68 /* rdf_query.h in Headers */ = {isa = PBXBuildFile; fileRef = EE0CB65A15BE5CC1004BB6C9 /* rdf_query.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		EEE7B4AD15C84F86004D5A68 /* rdf_raptor.h in Headers */ = {isa = PBXBuildFile; fileRef = EE0CB65B15BE5CC1004BB6C9 /* rdf_raptor.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		EEE7B4AE15C84F86004D5A68 /* rdf_serializer.h in Headers */ = {isa = PBXBuildFile; fileRef = EE0CB65C15BE5CC1004BB6C9 /* rdf_serializer.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		EEE7B4AF15C84F86004D5A68 /* rdf_statement.h in Headers */ = {isa = PBXBuildFile; fileRef = EE0CB65D15BE5CC1004BB6C9 /* rdf_statement.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		EEE7B4B015C84F86004D5A68 /* rdf_storage_module.h in Headers */ = {isa = PBXBuildFile; fileRef = EE0CB65E15BE5CC1004BB6C9 /* rdf_storage_module.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		EEE7B4B115C84F86004D5A68 /* rdf_storage.h in Headers */ = {isa = PBXBuildFile; fileRef = EE0CB65F15BE5CC1004BB6C9 /* rdf_storage.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		EEE7B4B215C84F86004D5A68 /* rdf_stream.h in Headers */ = {isa = PBXBuildFile; fileRef = EE0CB66015BE5CC1004BB6C9 /* rdf_stream.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		EEE7B4B315C84F86004D5A68 /* rdf_uri.h in Headers */ = {isa = PBXBuildFile; fileRef = EE0CB66115BE5CC1004BB6C9 /* rdf_uri.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		EEE7B4B415C84F86004D5A68 /* rdf_utf8.h in Headers */ = {isa = PBXBuildFile; fileRef = EE0CB66215BE5CC1004BB6C9 /* rdf_utf8.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		EEE7B49D15C84F61004D5A68 /* redland.h in Headers */ = {isa = PBXBuildFile; fileRef = EE0CB66315BE5CC1004BB6C9 /* redland.h */; settings = {ATTRIBUTES = (); }; };
+		EEE7B49E15C84F63004D5A68 /* librdf.h in Headers */ = {isa = PBXBuildFile; fileRef = EE0CB64A15BE5CC1004BB6C9 /* librdf.h */; settings = {ATTRIBUTES = (); }; };
+		EEE7B49F15C84F6A004D5A68 /* raptor.h in Headers */ = {isa = PBXBuildFile; fileRef = EE0CB64C15BE5CC1004BB6C9 /* raptor.h */; settings = {ATTRIBUTES = (); }; };
+		EEE7B4A015C84F6D004D5A68 /* raptor2.h in Headers */ = {isa = PBXBuildFile; fileRef = EE0CB64D15BE5CC1004BB6C9 /* raptor2.h */; settings = {ATTRIBUTES = (); }; };
+		EEE7B4A115C84F73004D5A68 /* rasqal.h in Headers */ = {isa = PBXBuildFile; fileRef = EE0CB64F15BE5CC1004BB6C9 /* rasqal.h */; settings = {ATTRIBUTES = (); }; };
+		EEE7B4A215C84F7D004D5A68 /* rdf_concepts.h in Headers */ = {isa = PBXBuildFile; fileRef = EE0CB65015BE5CC1004BB6C9 /* rdf_concepts.h */; settings = {ATTRIBUTES = (); }; };
+		EEE7B4A315C84F86004D5A68 /* rdf_digest.h in Headers */ = {isa = PBXBuildFile; fileRef = EE0CB65115BE5CC1004BB6C9 /* rdf_digest.h */; settings = {ATTRIBUTES = (); }; };
+		EEE7B4A415C84F86004D5A68 /* rdf_hash.h in Headers */ = {isa = PBXBuildFile; fileRef = EE0CB65215BE5CC1004BB6C9 /* rdf_hash.h */; settings = {ATTRIBUTES = (); }; };
+		EEE7B4A515C84F86004D5A68 /* rdf_init.h in Headers */ = {isa = PBXBuildFile; fileRef = EE0CB65315BE5CC1004BB6C9 /* rdf_init.h */; settings = {ATTRIBUTES = (); }; };
+		EEE7B4A615C84F86004D5A68 /* rdf_iterator.h in Headers */ = {isa = PBXBuildFile; fileRef = EE0CB65415BE5CC1004BB6C9 /* rdf_iterator.h */; settings = {ATTRIBUTES = (); }; };
+		EEE7B4A715C84F86004D5A68 /* rdf_list.h in Headers */ = {isa = PBXBuildFile; fileRef = EE0CB65515BE5CC1004BB6C9 /* rdf_list.h */; settings = {ATTRIBUTES = (); }; };
+		EEE7B4A815C84F86004D5A68 /* rdf_log.h in Headers */ = {isa = PBXBuildFile; fileRef = EE0CB65615BE5CC1004BB6C9 /* rdf_log.h */; settings = {ATTRIBUTES = (); }; };
+		EEE7B4A915C84F86004D5A68 /* rdf_model.h in Headers */ = {isa = PBXBuildFile; fileRef = EE0CB65715BE5CC1004BB6C9 /* rdf_model.h */; settings = {ATTRIBUTES = (); }; };
+		EEE7B4AA15C84F86004D5A68 /* rdf_node.h in Headers */ = {isa = PBXBuildFile; fileRef = EE0CB65815BE5CC1004BB6C9 /* rdf_node.h */; settings = {ATTRIBUTES = (); }; };
+		EEE7B4AB15C84F86004D5A68 /* rdf_parser.h in Headers */ = {isa = PBXBuildFile; fileRef = EE0CB65915BE5CC1004BB6C9 /* rdf_parser.h */; settings = {ATTRIBUTES = (); }; };
+		EEE7B4AC15C84F86004D5A68 /* rdf_query.h in Headers */ = {isa = PBXBuildFile; fileRef = EE0CB65A15BE5CC1004BB6C9 /* rdf_query.h */; settings = {ATTRIBUTES = (); }; };
+		EEE7B4AD15C84F86004D5A68 /* rdf_raptor.h in Headers */ = {isa = PBXBuildFile; fileRef = EE0CB65B15BE5CC1004BB6C9 /* rdf_raptor.h */; settings = {ATTRIBUTES = (); }; };
+		EEE7B4AE15C84F86004D5A68 /* rdf_serializer.h in Headers */ = {isa = PBXBuildFile; fileRef = EE0CB65C15BE5CC1004BB6C9 /* rdf_serializer.h */; settings = {ATTRIBUTES = (); }; };
+		EEE7B4AF15C84F86004D5A68 /* rdf_statement.h in Headers */ = {isa = PBXBuildFile; fileRef = EE0CB65D15BE5CC1004BB6C9 /* rdf_statement.h */; settings = {ATTRIBUTES = (); }; };
+		EEE7B4B015C84F86004D5A68 /* rdf_storage_module.h in Headers */ = {isa = PBXBuildFile; fileRef = EE0CB65E15BE5CC1004BB6C9 /* rdf_storage_module.h */; settings = {ATTRIBUTES = (); }; };
+		EEE7B4B115C84F86004D5A68 /* rdf_storage.h in Headers */ = {isa = PBXBuildFile; fileRef = EE0CB65F15BE5CC1004BB6C9 /* rdf_storage.h */; settings = {ATTRIBUTES = (); }; };
+		EEE7B4B215C84F86004D5A68 /* rdf_stream.h in Headers */ = {isa = PBXBuildFile; fileRef = EE0CB66015BE5CC1004BB6C9 /* rdf_stream.h */; settings = {ATTRIBUTES = (); }; };
+		EEE7B4B315C84F86004D5A68 /* rdf_uri.h in Headers */ = {isa = PBXBuildFile; fileRef = EE0CB66115BE5CC1004BB6C9 /* rdf_uri.h */; settings = {ATTRIBUTES = (); }; };
+		EEE7B4B415C84F86004D5A68 /* rdf_utf8.h in Headers */ = {isa = PBXBuildFile; fileRef = EE0CB66215BE5CC1004BB6C9 /* rdf_utf8.h */; settings = {ATTRIBUTES = (); }; };
 		EEE7B4B615C85A2E004D5A68 /* SenTestingKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ED48EB8108BB596300ACF14F /* SenTestingKit.framework */; };
 /* End PBXBuildFile section */
 
@@ -863,6 +863,7 @@
 				ED3B0A6806E621FC001E4C72 /* RedlandModel-Convenience.h in Headers */,
 				ED699ED106F9D3D600A624F7 /* RedlandWrappedObject.h in Headers */,
 				ED9863A706FAE6AB009186B3 /* RedlandNode-Convenience.h in Headers */,
+				EE0CB64315BE4BF3004BB6C9 /* redland.h in Headers */,
 				EE74748715B902E7004A456E /* (null) in Headers */,
 				EE74748815B902E7004A456E /* (null) in Headers */,
 				EE74748915B902E7004A456E /* (null) in Headers */,
@@ -887,7 +888,6 @@
 				EE74749E15B905B7004A456E /* (null) in Headers */,
 				EE74749F15B905B7004A456E /* (null) in Headers */,
 				EE7474A115B905CC004A456E /* (null) in Headers */,
-				EE0CB64315BE4BF3004BB6C9 /* redland.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

+ 1 - 1
Redland_Prefix.pch

@@ -4,7 +4,7 @@
 
 #ifdef __OBJC__
 #	import <Foundation/Foundation.h>
-#	import <Redland/redland.h>
+#	import <redland.h>
 #endif