Index: src/bridge/NSBridging.h
==================================================================
--- src/bridge/NSBridging.h
+++ src/bridge/NSBridging.h
@@ -15,11 +15,15 @@
  */
 
 #ifdef OF_BRIDGE_LOCAL_INCLUDES
 # import "macros.h"
 #else
-# import <ObjFW/macros.h>
+# if defined(__has_feature) && __has_feature(modules)
+@import ObjFW;
+# else
+#  import <ObjFW/macros.h>
+# endif
 #endif
 
 OF_ASSUME_NONNULL_BEGIN
 
 /*!

Index: src/bridge/OFArray+NSObject.h
==================================================================
--- src/bridge/OFArray+NSObject.h
+++ src/bridge/OFArray+NSObject.h
@@ -15,11 +15,15 @@
  */
 
 #ifdef OF_BRIDGE_LOCAL_INCLUDES
 # import "OFArray.h"
 #else
-# import <ObjFW/OFArray.h>
+# if defined(__has_feature) && __has_feature(modules)
+@import ObjFW;
+# else
+#  import <ObjFW/OFArray.h>
+# endif
 #endif
 
 #import "OFBridging.h"
 
 OF_ASSUME_NONNULL_BEGIN

Index: src/bridge/OFArray_NSArray.h
==================================================================
--- src/bridge/OFArray_NSArray.h
+++ src/bridge/OFArray_NSArray.h
@@ -15,11 +15,15 @@
  */
 
 #ifdef OF_BRIDGE_LOCAL_INCLUDES
 # import "OFArray.h"
 #else
-# import <ObjFW/OFArray.h>
+# if defined(__has_feature) && __has_feature(modules)
+@import ObjFW;
+# else
+#  import <ObjFW/OFArray.h>
+# endif
 #endif
 
 OF_ASSUME_NONNULL_BEGIN
 
 @class NSArray;

Index: src/bridge/OFBridging.h
==================================================================
--- src/bridge/OFBridging.h
+++ src/bridge/OFBridging.h
@@ -15,11 +15,15 @@
  */
 
 #ifdef OF_BRIDGE_LOCAL_INCLUDES
 # import "macros.h"
 #else
-# import <ObjFW/macros.h>
+# if defined(__has_feature) && __has_feature(modules)
+@import ObjFW;
+# else
+#  import <ObjFW/macros.h>
+# endif
 #endif
 
 OF_ASSUME_NONNULL_BEGIN
 
 /*!

Index: src/bridge/OFDictionary+NSObject.h
==================================================================
--- src/bridge/OFDictionary+NSObject.h
+++ src/bridge/OFDictionary+NSObject.h
@@ -15,11 +15,15 @@
  */
 
 #ifdef OF_BRIDGE_LOCAL_INCLUDES
 # import "OFDictionary.h"
 #else
-# import <ObjFW/OFDictionary.h>
+# if defined(__has_feature) && __has_feature(modules)
+@import ObjFW;
+# else
+#  import <ObjFW/OFDictionary.h>
+# endif
 #endif
 
 #import "OFBridging.h"
 
 OF_ASSUME_NONNULL_BEGIN

Index: src/bridge/OFDictionary_NSDictionary.h
==================================================================
--- src/bridge/OFDictionary_NSDictionary.h
+++ src/bridge/OFDictionary_NSDictionary.h
@@ -15,11 +15,15 @@
  */
 
 #ifdef OF_BRIDGE_LOCAL_INCLUDES
 # import "OFDictionary.h"
 #else
-# import <ObjFW/OFDictionary.h>
+# if defined(__has_feature) && __has_feature(modules)
+@import ObjFW;
+# else
+#  import <ObjFW/OFDictionary.h>
+# endif
 #endif
 
 OF_ASSUME_NONNULL_BEGIN
 
 @class NSDictionary;

Index: src/bridge/OFString+NSObject.h
==================================================================
--- src/bridge/OFString+NSObject.h
+++ src/bridge/OFString+NSObject.h
@@ -15,11 +15,15 @@
  */
 
 #ifdef OF_BRIDGE_LOCAL_INCLUDES
 # import "OFString.h"
 #else
-# import <ObjFW/OFString.h>
+# if defined(__has_feature) && __has_feature(modules)
+@import ObjFW;
+# else
+#  import <ObjFW/OFString.h>
+# endif
 #endif
 
 #import "OFBridging.h"
 
 OF_ASSUME_NONNULL_BEGIN