Index: src/OFArray.h ================================================================== --- src/OFArray.h +++ src/OFArray.h @@ -502,9 +502,9 @@ OF_ASSUME_NONNULL_END #import "OFMutableArray.h" -#ifndef NSINTEGER_DEFINED +#if !defined(NSINTEGER_DEFINED) && !__has_feature(modules) /* Required for array literals to work */ @compatibility_alias NSArray OFArray; #endif Index: src/OFDictionary.h ================================================================== --- src/OFDictionary.h +++ src/OFDictionary.h @@ -312,9 +312,9 @@ OF_ASSUME_NONNULL_END #import "OFMutableDictionary.h" -#ifndef NSINTEGER_DEFINED +#if !defined(NSINTEGER_DEFINED) && !__has_feature(modules) /* Required for dictionary literals to work */ @compatibility_alias NSDictionary OFDictionary; #endif Index: src/OFNumber.h ================================================================== --- src/OFNumber.h +++ src/OFNumber.h @@ -810,9 +810,9 @@ - (double)doubleValue; @end OF_ASSUME_NONNULL_END -#ifndef NSINTEGER_DEFINED +#if !defined(NSINTEGER_DEFINED) && !__has_feature(modules) /* Required for number literals to work */ @compatibility_alias NSNumber OFNumber; #endif Index: src/OFString.h ================================================================== --- src/OFString.h +++ src/OFString.h @@ -1131,11 +1131,11 @@ #import "OFString+Serialization.h" #import "OFString+URLEncoding.h" #import "OFString+XMLEscaping.h" #import "OFString+XMLUnescaping.h" -#ifndef NSINTEGER_DEFINED +#if !defined(NSINTEGER_DEFINED) && !__has_feature(modules) /* * Very *ugly* hack required for string boxing literals to work. * * This hack is needed in order to work with `@class NSString` from Apple's * objc/NSString.h - which is included when using modules - as