Index: ObjFW.xcodeproj/project.pbxproj
==================================================================
--- ObjFW.xcodeproj/project.pbxproj
+++ ObjFW.xcodeproj/project.pbxproj
@@ -1979,69 +1979,57 @@
 		};
 		4B187E20163EA29F0049A832 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				COMBINE_HIDPI_IMAGES = YES;
-				COPY_PHASE_STRIP = NO;
 				DYLIB_COMPATIBILITY_VERSION = 7;
 				DYLIB_CURRENT_VERSION = 7;
 				FRAMEWORK_VERSION = A;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
+					OF_BRIDGE_LOCAL_INCLUDES,
 					"$(inherited)",
 				);
 				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				INFOPLIST_FILE = src/bridge/Info.plist;
-				MACOSX_DEPLOYMENT_TARGET = "";
-				ONLY_ACTIVE_ARCH = YES;
-				PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = NO;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SDKROOT = macosx;
 				WRAPPER_EXTENSION = framework;
 			};
 			name = Debug;
 		};
 		4B187E21163EA29F0049A832 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				COMBINE_HIDPI_IMAGES = YES;
-				COPY_PHASE_STRIP = YES;
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DYLIB_COMPATIBILITY_VERSION = 7;
 				DYLIB_CURRENT_VERSION = 7;
 				FRAMEWORK_VERSION = A;
 				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
+				GCC_PREPROCESSOR_DEFINITIONS = OF_BRIDGE_LOCAL_INCLUDES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				INFOPLIST_FILE = src/bridge/Info.plist;
-				MACOSX_DEPLOYMENT_TARGET = "";
-				PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = NO;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SDKROOT = macosx;
 				WRAPPER_EXTENSION = framework;
 			};
 			name = Release;
 		};
 		4B23CA8C133811610047A1D9 /* Debug */ = {

Index: src/bridge/Makefile
==================================================================
--- src/bridge/Makefile
+++ src/bridge/Makefile
@@ -23,9 +23,9 @@
 
 includesubdir = ObjFW-Bridge
 
 include ../../buildsys.mk
 
-CPPFLAGS += -I. -I.. -I../.. -I../exceptions
+CPPFLAGS += -I. -I.. -I../.. -I../exceptions -DOF_BRIDGE_LOCAL_INCLUDES
 LD = ${OBJC}
 LDFLAGS += -Wl,-flat_namespace,-undefined,suppress
 LIBS = -L.. -lobjfw -framework Foundation

Index: src/bridge/OFArray+NSObject.h
==================================================================
--- src/bridge/OFArray+NSObject.h
+++ src/bridge/OFArray+NSObject.h
@@ -12,14 +12,18 @@
  * Public License, either version 2 or 3, which can be found in the file
  * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this
  * file.
  */
 
-#import "OFArray.h"
+#ifdef OF_BRIDGE_LOCAL_INCLUDES
+# import "OFArray.h"
+#else
+# import <ObjFW/OFArray.h>
+#endif
 
 #import "OFBridging.h"
 
 /*!
  * @brief Support for bridging OFArrays to NSArrays.
  */
 @interface OFArray (NSObject) <OFBridging>
 @end

Index: src/bridge/OFArray_NSArray.h
==================================================================
--- src/bridge/OFArray_NSArray.h
+++ src/bridge/OFArray_NSArray.h
@@ -12,11 +12,15 @@
  * Public License, either version 2 or 3, which can be found in the file
  * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this
  * file.
  */
 
-#import "OFArray.h"
+#ifdef OF_BRIDGE_LOCAL_INCLUDES
+# import "OFArray.h"
+#else
+# import <ObjFW/OFArray.h>
+#endif
 
 @class NSArray;
 
 @interface OFArray_NSArray: OFArray
 {

Index: src/bridge/OFDictionary+NSObject.h
==================================================================
--- src/bridge/OFDictionary+NSObject.h
+++ src/bridge/OFDictionary+NSObject.h
@@ -12,14 +12,18 @@
  * Public License, either version 2 or 3, which can be found in the file
  * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this
  * file.
  */
 
-#import "OFDictionary.h"
+#ifdef OF_BRIDGE_LOCAL_INCLUDES
+# import "OFDictionary.h"
+#else
+# import <ObjFW/OFDictionary.h>
+#endif
 
 #import "OFBridging.h"
 
 /*!
  * @brief Support for bridging OFDictionaries to NSDictionaries.
  */
 @interface OFDictionary (NSObject) <OFBridging>
 @end

Index: src/bridge/OFDictionary_NSDictionary.h
==================================================================
--- src/bridge/OFDictionary_NSDictionary.h
+++ src/bridge/OFDictionary_NSDictionary.h
@@ -12,11 +12,15 @@
  * Public License, either version 2 or 3, which can be found in the file
  * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this
  * file.
  */
 
-#import "OFDictionary.h"
+#ifdef OF_BRIDGE_LOCAL_INCLUDES
+# import "OFDictionary.h"
+#else
+# import <ObjFW/OFDictionary.h>
+#endif
 
 @class NSDictionary;
 
 @interface OFDictionary_NSDictionary: OFDictionary
 {

Index: src/bridge/OFString+NSObject.h
==================================================================
--- src/bridge/OFString+NSObject.h
+++ src/bridge/OFString+NSObject.h
@@ -12,11 +12,16 @@
  * Public License, either version 2 or 3, which can be found in the file
  * LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this
  * file.
  */
 
-#import "OFString.h"
+#ifdef OF_BRIDGE_LOCAL_INCLUDES
+# import "OFString.h"
+#else
+# import <ObjFW/OFString.h>
+#endif
+
 #import "OFBridging.h"
 
 /*!
  * @brief Support for bridging OFStrings to NSStrings.
  *