Index: src/OFNumber.h
==================================================================
--- src/OFNumber.h
+++ src/OFNumber.h
@@ -818,5 +818,10 @@
  * \param num The number to divide by
  * \return The remainder of a division by the specified number
  */
 - (OFNumber*)remainderOfDivisionWithNumber: (OFNumber*)num;
 @end
+
+#ifndef NSINTEGER_DEFINED
+/* Required for number literals to work */
+@compatibility_alias NSNumber OFNumber;
+#endif

Index: src/OFString.h
==================================================================
--- src/OFString.h
+++ src/OFString.h
@@ -856,5 +856,10 @@
 #import "OFString+JSONValue.h"
 #import "OFString+Serialization.h"
 #import "OFString+URLEncoding.h"
 #import "OFString+XMLEscaping.h"
 #import "OFString+XMLUnescaping.h"
+
+#ifndef NSINTEGER_DEFINED
+/* Required for string boxing literals to work */
+@compatibility_alias NSString OFString;
+#endif