@@ -14,10 +14,12 @@
  * file.
  */
 
 #import "OFArray.h"
 
+OF_ASSUME_NONNULL_BEGIN
+
 /*! @file */
 
 #ifdef OF_HAVE_BLOCKS
 /*!
  * @brief A block for replacing values in an OFMutableArray.
@@ -24,11 +26,11 @@
  *
  * @param object The object to replace
  * @param index The index of the object to replace
  * @return The object to replace the object with
  */
-typedef id (^of_array_replace_block_t)(id object, size_t index);
+typedef __nonnull id (^of_array_replace_block_t)(id object, size_t index);
 #endif
 
 /*!
  * @class OFMutableArray OFArray.h ObjFW/OFArray.h
  *
@@ -208,5 +210,7 @@
 - (void)makeImmutable;
 @end
 #if !defined(OF_HAVE_GENERICS) && !defined(DOXYGEN)
 # undef ObjectType
 #endif
+
+OF_ASSUME_NONNULL_END