Index: src/OFHTTPCookie.h
==================================================================
--- src/OFHTTPCookie.h
+++ src/OFHTTPCookie.h
@@ -17,10 +17,12 @@
 #import "OFObject.h"
 #import "OFString.h"
 #import "OFDate.h"
 #import "OFArray.h"
 
+OF_ASSUME_NONNULL_BEGIN
+
 /*!
  * @class OFHTTPCookie OFHTTPCookie.h ObjFW/OFHTTPCookie.h
  *
  * @brief A class for storing and manipulating HTTP cookies.
  */
@@ -103,5 +105,7 @@
  * @return An initialized OFHTTPCookie
  */
 - initWithName: (OFString *)name
 	 value: (OFString *)value OF_DESIGNATED_INITIALIZER;
 @end
+
+OF_ASSUME_NONNULL_END

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

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

Index: src/bridge/NSBridging.h
==================================================================
--- src/bridge/NSBridging.h
+++ src/bridge/NSBridging.h
@@ -12,10 +12,14 @@
  * 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"
+
+OF_ASSUME_NONNULL_BEGIN
+
 /*!
  * @protocol NSBridging NSBridging.h ObjFW-Bridge/NSBridging.h
  *
  * @brief A protocol implemented by classes supporting bridging Foundation
  *	  objects to ObjFW objects.
@@ -29,5 +33,7 @@
  *
  * @return The receiver as an ObjFW object
  */
 - (id)OFObject;
 @end
+
+OF_ASSUME_NONNULL_END

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

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

Index: src/bridge/NSString+OFObject.h
==================================================================
--- src/bridge/NSString+OFObject.h
+++ src/bridge/NSString+OFObject.h
@@ -16,10 +16,12 @@
 
 #import <Foundation/NSString.h>
 
 #import "NSBridging.h"
 
+OF_ASSUME_NONNULL_BEGIN
+
 /*!
  * @category NSString (OFObject)
  *	     NSString+OFObject.h ObjFW-Bridge/NSString+OFObject.h
  *
  * @brief Support for bridging NSStrings to OFStrings.
@@ -28,5 +30,7 @@
  * handling UCS-4 properly (a character of NSString is only 2 bytes, while a
  * character of OFString is 4).
  */
 @interface NSString (OFObject) <NSBridging>
 @end
+
+OF_ASSUME_NONNULL_END

Index: src/bridge/OFArray+NSObject.h
==================================================================
--- src/bridge/OFArray+NSObject.h
+++ src/bridge/OFArray+NSObject.h
@@ -20,12 +20,16 @@
 # import <ObjFW/OFArray.h>
 #endif
 
 #import "OFBridging.h"
 
+OF_ASSUME_NONNULL_BEGIN
+
 /*!
  * @category OFArray (NSObject) \
  *	     OFArray+NSObject.h ObjFW-Bridge/OFArray+NSObject.h
  * @brief Support for bridging OFArrays to NSArrays.
  */
 @interface OFArray (NSObject) <OFBridging>
 @end
+
+OF_ASSUME_NONNULL_END

Index: src/bridge/OFArray_NSArray.h
==================================================================
--- src/bridge/OFArray_NSArray.h
+++ src/bridge/OFArray_NSArray.h
@@ -18,14 +18,18 @@
 # import "OFArray.h"
 #else
 # import <ObjFW/OFArray.h>
 #endif
 
+OF_ASSUME_NONNULL_BEGIN
+
 @class NSArray;
 
 @interface OFArray_NSArray: OFArray
 {
 	NSArray *_array;
 }
 
 - initWithNSArray: (NSArray *)array;
 @end
+
+OF_ASSUME_NONNULL_END

Index: src/bridge/OFBridging.h
==================================================================
--- src/bridge/OFBridging.h
+++ src/bridge/OFBridging.h
@@ -12,10 +12,14 @@
  * 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"
+
+OF_ASSUME_NONNULL_BEGIN
+
 /*!
  * @protocol OFBridging OFBridging.h ObjFW-Bridge/OFBridging.h
  *
  * @brief A protocol implemented by classes supporting bridging ObjFW objects
  *	  to Foundation objects.
@@ -30,5 +34,7 @@
  *
  * @return The receiver as Foundation object
  */
 - (id)NSObject;
 @end
+
+OF_ASSUME_NONNULL_END

Index: src/bridge/OFDictionary+NSObject.h
==================================================================
--- src/bridge/OFDictionary+NSObject.h
+++ src/bridge/OFDictionary+NSObject.h
@@ -20,13 +20,17 @@
 # import <ObjFW/OFDictionary.h>
 #endif
 
 #import "OFBridging.h"
 
+OF_ASSUME_NONNULL_BEGIN
+
 /*!
  * @category OFDictionary (NSObject) \
  *	     OFDictionary+NSObject.h ObjFW-Bridge/OFDictionary+NSObject.h
  *
  * @brief Support for bridging OFDictionaries to NSDictionaries.
  */
 @interface OFDictionary (NSObject) <OFBridging>
 @end
+
+OF_ASSUME_NONNULL_END

Index: src/bridge/OFDictionary_NSDictionary.h
==================================================================
--- src/bridge/OFDictionary_NSDictionary.h
+++ src/bridge/OFDictionary_NSDictionary.h
@@ -18,14 +18,18 @@
 # import "OFDictionary.h"
 #else
 # import <ObjFW/OFDictionary.h>
 #endif
 
+OF_ASSUME_NONNULL_BEGIN
+
 @class NSDictionary;
 
 @interface OFDictionary_NSDictionary: OFDictionary
 {
 	NSDictionary *_dictionary;
 }
 
 - initWithNSDictionary: (NSDictionary *)dictionary;
 @end
+
+OF_ASSUME_NONNULL_END

Index: src/bridge/OFString+NSObject.h
==================================================================
--- src/bridge/OFString+NSObject.h
+++ src/bridge/OFString+NSObject.h
@@ -20,10 +20,12 @@
 # import <ObjFW/OFString.h>
 #endif
 
 #import "OFBridging.h"
 
+OF_ASSUME_NONNULL_BEGIN
+
 /*!
  * @category OFString (NSObject) \
  *	     OFString+NSObject.h ObjFW-Bridge/OFString+NSObject.h
  *
  * @brief Support for bridging OFStrings to NSStrings.
@@ -32,5 +34,7 @@
  * handling UCS-4 properly (a character of NSString is only 2 bytes, while a
  * character of OFString is 4).
  */
 @interface OFString (NSObject) <OFBridging>
 @end
+
+OF_ASSUME_NONNULL_END