Index: src/OFArray.h
==================================================================
--- src/OFArray.h
+++ src/OFArray.h
@@ -414,11 +414,11 @@
  * @param options The options to use when sorting the array
  * @return A sorted copy of the array
  */
 - (OFArray OF_GENERIC(ObjectType) *)
     sortedArrayUsingFunction: (OFCompareFunction)compare
-		     context: (void *)context
+		     context: (nullable void *)context
 		     options: (OFArraySortOptions)options;
 
 #ifdef OF_HAVE_BLOCKS
 /**
  * @brief Returns a copy of the array sorted using the specified selector and

Index: src/OFMutableArray.h
==================================================================
--- src/OFMutableArray.h
+++ src/OFMutableArray.h
@@ -208,11 +208,11 @@
  * @param compare The function to use to sort the array
  * @param context Context passed to the function to compare
  * @param options The options to use when sorting the array
  */
 - (void)sortUsingFunction: (OFCompareFunction)compare
-		  context: (void *)context
+		  context: (nullable void *)context
 		  options: (OFArraySortOptions)options;
 
 #ifdef OF_HAVE_BLOCKS
 /**
  * @brief Sorts the array using the specified comparator and options.

Index: src/OFObject.h
==================================================================
--- src/OFObject.h
+++ src/OFObject.h
@@ -70,11 +70,11 @@
  * @param right The right object
  * @param context Context passed along for comparing
  * @return The order of the objects
  */
 typedef OFComparisonResult (*OFCompareFunction)(id _Nonnull left,
-    id _Nonnull right, void *context);
+    id _Nonnull right, void *_Nullable context);
 
 #ifdef OF_HAVE_BLOCKS
 /**
  * @brief A comparator to compare two objects.
  *