Index: src/bridge/Makefile
==================================================================
--- src/bridge/Makefile
+++ src/bridge/Makefile
@@ -39,9 +39,9 @@
 
 includesubdir = ObjFWBridge
 
 include ../../buildsys.mk
 
-CPPFLAGS += -I. -I.. -I../.. -I../exceptions -DOF_BRIDGE_LOCAL_INCLUDES
+CPPFLAGS += -I. -I.. -I../.. -I../exceptions -DOBJFWBRIDGE_LOCAL_INCLUDES
 LD = ${OBJC}
 FRAMEWORK_LIBS := -framework Foundation -F.. -framework ObjFW ${LIBS}
 LIBS := -framework Foundation -L.. -lobjfw ${LIBS}

Index: src/bridge/NSBridging.h
==================================================================
--- src/bridge/NSBridging.h
+++ src/bridge/NSBridging.h
@@ -11,11 +11,11 @@
  * 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.
  */
 
-#ifdef OF_BRIDGE_LOCAL_INCLUDES
+#ifdef OBJFWBRIDGE_LOCAL_INCLUDES
 # import "macros.h"
 #else
 # if defined(__has_feature) && __has_feature(modules)
 @import ObjFW;
 # else

Index: src/bridge/OFArray+NSObject.h
==================================================================
--- src/bridge/OFArray+NSObject.h
+++ src/bridge/OFArray+NSObject.h
@@ -11,11 +11,11 @@
  * 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.
  */
 
-#ifdef OF_BRIDGE_LOCAL_INCLUDES
+#ifdef OBJFWBRIDGE_LOCAL_INCLUDES
 # import "OFArray.h"
 #else
 # if defined(__has_feature) && __has_feature(modules)
 @import ObjFW;
 # else

Index: src/bridge/OFBridging.h
==================================================================
--- src/bridge/OFBridging.h
+++ src/bridge/OFBridging.h
@@ -11,11 +11,11 @@
  * 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.
  */
 
-#ifdef OF_BRIDGE_LOCAL_INCLUDES
+#ifdef OBJFWBRIDGE_LOCAL_INCLUDES
 # import "macros.h"
 #else
 # if defined(__has_feature) && __has_feature(modules)
 @import ObjFW;
 # else

Index: src/bridge/OFDictionary+NSObject.h
==================================================================
--- src/bridge/OFDictionary+NSObject.h
+++ src/bridge/OFDictionary+NSObject.h
@@ -11,11 +11,11 @@
  * 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.
  */
 
-#ifdef OF_BRIDGE_LOCAL_INCLUDES
+#ifdef OBJFWBRIDGE_LOCAL_INCLUDES
 # import "OFDictionary.h"
 #else
 # if defined(__has_feature) && __has_feature(modules)
 @import ObjFW;
 # else

Index: src/bridge/OFEnumerator+NSObject.h
==================================================================
--- src/bridge/OFEnumerator+NSObject.h
+++ src/bridge/OFEnumerator+NSObject.h
@@ -11,11 +11,11 @@
  * 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.
  */
 
-#ifdef OF_BRIDGE_LOCAL_INCLUDES
+#ifdef OBJFWBRIDGE_LOCAL_INCLUDES
 # import "OFEnumerator.h"
 #else
 # if defined(__has_feature) && __has_feature(modules)
 @import ObjFW;
 # else

Index: src/bridge/OFException+Swift.h
==================================================================
--- src/bridge/OFException+Swift.h
+++ src/bridge/OFException+Swift.h
@@ -11,11 +11,11 @@
  * 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.
  */
 
-#ifdef OF_BRIDGE_LOCAL_INCLUDES
+#ifdef OBJFWBRIDGE_LOCAL_INCLUDES
 # import "OFException.h"
 #else
 # if defined(__has_feature) && __has_feature(modules)
 @import ObjFW;
 # else

Index: src/bridge/OFNSArray.h
==================================================================
--- src/bridge/OFNSArray.h
+++ src/bridge/OFNSArray.h
@@ -11,11 +11,11 @@
  * 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.
  */
 
-#ifdef OF_BRIDGE_LOCAL_INCLUDES
+#ifdef OBJFWBRIDGE_LOCAL_INCLUDES
 # import "OFArray.h"
 #else
 # if defined(__has_feature) && __has_feature(modules)
 @import ObjFW;
 # else

Index: src/bridge/OFNSDictionary.h
==================================================================
--- src/bridge/OFNSDictionary.h
+++ src/bridge/OFNSDictionary.h
@@ -11,11 +11,11 @@
  * 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.
  */
 
-#ifdef OF_BRIDGE_LOCAL_INCLUDES
+#ifdef OBJFWBRIDGE_LOCAL_INCLUDES
 # import "OFDictionary.h"
 #else
 # if defined(__has_feature) && __has_feature(modules)
 @import ObjFW;
 # else

Index: src/bridge/OFNSEnumerator.h
==================================================================
--- src/bridge/OFNSEnumerator.h
+++ src/bridge/OFNSEnumerator.h
@@ -11,11 +11,11 @@
  * 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.
  */
 
-#ifdef OF_BRIDGE_LOCAL_INCLUDES
+#ifdef OBJFWBRIDGE_LOCAL_INCLUDES
 # import "OFEnumerator.h"
 #else
 # if defined(__has_feature) && __has_feature(modules)
 @import ObjFW;
 # else

Index: src/bridge/OFNSSet.h
==================================================================
--- src/bridge/OFNSSet.h
+++ src/bridge/OFNSSet.h
@@ -11,11 +11,11 @@
  * 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.
  */
 
-#ifdef OF_BRIDGE_LOCAL_INCLUDES
+#ifdef OBJFWBRIDGE_LOCAL_INCLUDES
 # import "OFSet.h"
 #else
 # if defined(__has_feature) && __has_feature(modules)
 @import ObjFW;
 # else

Index: src/bridge/OFNumber+NSObject.h
==================================================================
--- src/bridge/OFNumber+NSObject.h
+++ src/bridge/OFNumber+NSObject.h
@@ -11,11 +11,11 @@
  * 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.
  */
 
-#ifdef OF_BRIDGE_LOCAL_INCLUDES
+#ifdef OBJFWBRIDGE_LOCAL_INCLUDES
 # import "OFNumber.h"
 #else
 # if defined(__has_feature) && __has_feature(modules)
 @import ObjFW;
 # else

Index: src/bridge/OFSet+NSObject.h
==================================================================
--- src/bridge/OFSet+NSObject.h
+++ src/bridge/OFSet+NSObject.h
@@ -11,11 +11,11 @@
  * 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.
  */
 
-#ifdef OF_BRIDGE_LOCAL_INCLUDES
+#ifdef OBJFWBRIDGE_LOCAL_INCLUDES
 # import "OFSet.h"
 #else
 # if defined(__has_feature) && __has_feature(modules)
 @import ObjFW;
 # else

Index: src/bridge/OFString+NSObject.h
==================================================================
--- src/bridge/OFString+NSObject.h
+++ src/bridge/OFString+NSObject.h
@@ -11,11 +11,11 @@
  * 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.
  */
 
-#ifdef OF_BRIDGE_LOCAL_INCLUDES
+#ifdef OBJFWBRIDGE_LOCAL_INCLUDES
 # import "OFString.h"
 #else
 # if defined(__has_feature) && __has_feature(modules)
 @import ObjFW;
 # else