Index: src/OFArray.h
==================================================================
--- src/OFArray.h
+++ src/OFArray.h
@@ -442,7 +442,7 @@
 
 #import "OFMutableArray.h"
 
 #ifndef NSINTEGER_DEFINED
 /* Required for array literals to work */
-# define NSArray OFArray
+@compatibility_alias NSArray OFArray;
 #endif

Index: src/OFDictionary.h
==================================================================
--- src/OFDictionary.h
+++ src/OFDictionary.h
@@ -246,7 +246,7 @@
 
 #import "OFMutableDictionary.h"
 
 #ifndef NSINTEGER_DEFINED
 /* Required for dictionary literals to work */
-# define NSDictionary OFDictionary
+@compatibility_alias NSDictionary OFDictionary;
 #endif

Index: src/OFNumber.h
==================================================================
--- src/OFNumber.h
+++ src/OFNumber.h
@@ -912,7 +912,7 @@
 - (OFNumber*)remainderOfDivisionWithNumber: (OFNumber*)num;
 @end
 
 #ifndef NSINTEGER_DEFINED
 /* Required for number literals to work */
-# define NSNumber OFNumber
+@compatibility_alias NSNumber OFNumber;
 #endif

Index: src/OFString.h
==================================================================
--- src/OFString.h
+++ src/OFString.h
@@ -1111,11 +1111,11 @@
 #import "OFString+XMLEscaping.h"
 #import "OFString+XMLUnescaping.h"
 
 #ifndef NSINTEGER_DEFINED
 /* Required for string boxing literals to work */
-# define NSString OFString
+@compatibility_alias NSString OFString;
 #endif
 
 #ifdef __cplusplus
 extern "C" {
 #endif