@@ -36,11 +36,11 @@
 
 #ifdef OF_HAVE_BLOCKS
 typedef void (^of_dictionary_enumeration_block_t)(id key, id object,
      bool *stop);
 typedef bool (^of_dictionary_filter_block_t)(id key, id object);
-typedef id OF_NONNULL (^of_dictionary_map_block_t)(id key, id object);
+typedef id _Nonnull (^of_dictionary_map_block_t)(id key, id object);
 #endif
 
 /*!
  * @class OFDictionary OFDictionary.h ObjFW/OFDictionary.h
  *
@@ -106,12 +106,12 @@
  * @param objects An array of objects
  * @param count The number of objects in the arrays
  * @return A new autoreleased OFDictionary
  */
 + (instancetype)
-    dictionaryWithObjects: (ObjectType const OF_NONNULL *OF_NONNULL)objects
-		  forKeys: (KeyType const OF_NONNULL *OF_NONNULL)keys
+    dictionaryWithObjects: (ObjectType const _Nonnull *_Nonnull)objects
+		  forKeys: (KeyType const _Nonnull *_Nonnull)keys
 		    count: (size_t)count;
 
 /*!
  * @brief Creates a new OFDictionary with the specified keys objects.
  *
@@ -159,12 +159,12 @@
  * @param keys An array of keys
  * @param objects An array of objects
  * @param count The number of objects in the arrays
  * @return An initialized OFDictionary
  */
-- initWithObjects: (ObjectType const OF_NONNULL *OF_NONNULL)objects
-	  forKeys: (KeyType const OF_NONNULL *OF_NONNULL)keys
+- initWithObjects: (ObjectType const _Nonnull *_Nonnull)objects
+	  forKeys: (KeyType const _Nonnull *_Nonnull)keys
 	    count: (size_t)count;
 
 /*!
  * @brief Initializes an already allocated OFDictionary with the specified keys
  *	  and objects.