Index: src/bridge/NSArray+OFObject.h
==================================================================
--- src/bridge/NSArray+OFObject.h
+++ src/bridge/NSArray+OFObject.h
@@ -16,11 +16,11 @@
 
 #import <Foundation/NSArray.h>
 
 #import "NSBridging.h"
 
-OF_ASSUME_NONNULL_BEGIN
+NS_ASSUME_NONNULL_BEGIN
 
 /*!
  * @category NSArray (OFObject) \
  *	     NSArray+OFObject.h ObjFW-Bridge/NSArray+OFObject.h
  *
@@ -27,6 +27,6 @@
  * @brief Support for bridging NSArrays to OFArrays.
  */
 @interface NSArray (OFObject) <NSBridging>
 @end
 
-OF_ASSUME_NONNULL_END
+NS_ASSUME_NONNULL_END

Index: src/bridge/NSArray_OFArray.h
==================================================================
--- src/bridge/NSArray_OFArray.h
+++ src/bridge/NSArray_OFArray.h
@@ -14,22 +14,18 @@
  * file.
  */
 
 #import <Foundation/NSArray.h>
 
-#ifdef OF_BRIDGE_LOCAL_INCLUDES
-# import "OFArray.h"
-#else
-# import <ObjFW/OFArray.h>
-#endif
+@class OFArray;
 
-OF_ASSUME_NONNULL_BEGIN
+NS_ASSUME_NONNULL_BEGIN
 
 @interface NSArray_OFArray: NSArray
 {
 	OFArray *_array;
 }
 
 - initWithOFArray: (OFArray *)array;
 @end
 
-OF_ASSUME_NONNULL_END
+NS_ASSUME_NONNULL_END

Index: src/bridge/NSBridging.h
==================================================================
--- src/bridge/NSBridging.h
+++ src/bridge/NSBridging.h
@@ -12,13 +12,13 @@
  * 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 "macros.h"
+#import <Foundation/Foundation.h>
 
-OF_ASSUME_NONNULL_BEGIN
+NS_ASSUME_NONNULL_BEGIN
 
 /*!
  * @protocol NSBridging NSBridging.h ObjFW-Bridge/NSBridging.h
  *
  * @brief A protocol implemented by classes supporting bridging Foundation
@@ -34,6 +34,6 @@
  * @return The receiver as an ObjFW object
  */
 - (id)OFObject;
 @end
 
-OF_ASSUME_NONNULL_END
+NS_ASSUME_NONNULL_END

Index: src/bridge/NSDictionary+OFObject.h
==================================================================
--- src/bridge/NSDictionary+OFObject.h
+++ src/bridge/NSDictionary+OFObject.h
@@ -16,11 +16,11 @@
 
 #import <Foundation/NSDictionary.h>
 
 #import "NSBridging.h"
 
-OF_ASSUME_NONNULL_BEGIN
+NS_ASSUME_NONNULL_BEGIN
 
 /*!
  * @category NSDictionary (OFObject) \
  *	     NSDictionary+OFObject.h ObjFW-Bridge/NSDictionary+OFObject.h
  *
@@ -27,6 +27,6 @@
  * @brief Support for bridging NSDictionaries to OFDictionaries.
  */
 @interface NSDictionary (OFObject) <NSBridging>
 @end
 
-OF_ASSUME_NONNULL_END
+NS_ASSUME_NONNULL_END

Index: src/bridge/NSDictionary_OFDictionary.h
==================================================================
--- src/bridge/NSDictionary_OFDictionary.h
+++ src/bridge/NSDictionary_OFDictionary.h
@@ -14,22 +14,18 @@
  * file.
  */
 
 #import <Foundation/NSDictionary.h>
 
-#ifdef OF_BRIDGE_LOCAL_INCLUDES
-# import "OFDictionary.h"
-#else
-# import <ObjFW/OFDictionary.h>
-#endif
+@class OFDictionary;
 
-OF_ASSUME_NONNULL_BEGIN
+NS_ASSUME_NONNULL_BEGIN
 
 @interface NSDictionary_OFDictionary: NSDictionary
 {
 	OFDictionary *_dictionary;
 }
 
 - initWithOFDictionary: (OFDictionary *)dictionary;
 @end
 
-OF_ASSUME_NONNULL_END
+NS_ASSUME_NONNULL_END

Index: src/bridge/NSString+OFObject.h
==================================================================
--- src/bridge/NSString+OFObject.h
+++ src/bridge/NSString+OFObject.h
@@ -16,11 +16,11 @@
 
 #import <Foundation/NSString.h>
 
 #import "NSBridging.h"
 
-OF_ASSUME_NONNULL_BEGIN
+NS_ASSUME_NONNULL_BEGIN
 
 /*!
  * @category NSString (OFObject)
  *	     NSString+OFObject.h ObjFW-Bridge/NSString+OFObject.h
  *
@@ -31,6 +31,6 @@
  * character of OFString is 4).
  */
 @interface NSString (OFObject) <NSBridging>
 @end
 
-OF_ASSUME_NONNULL_END
+NS_ASSUME_NONNULL_END

Index: src/bridge/OFBridging.h
==================================================================
--- src/bridge/OFBridging.h
+++ src/bridge/OFBridging.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 "macros.h"
+#ifdef OF_BRIDGE_LOCAL_INCLUDES
+# import "macros.h"
+#else
+# import <ObjFW/macros.h>
+#endif
 
 OF_ASSUME_NONNULL_BEGIN
 
 /*!
  * @protocol OFBridging OFBridging.h ObjFW-Bridge/OFBridging.h