@@ -47,11 +47,11 @@
  * @param exception An exception which occurred while resolving or nil on
  *		    success
  */
 typedef void (^of_udp_socket_async_resolve_block_t)(OFString *host,
     uint16_t port, of_udp_socket_address_t address,
-    OFException *OF_NULLABLE exception);
+    OFException *_Nullable exception);
 
 /*!
  * @brief A block which is called when a packet has been received.
  *
  * @param socket The UDP which received a packet
@@ -62,11 +62,11 @@
  *		    success
  * @return A bool whether the same block should be used for the next receive
  */
 typedef bool (^of_udp_socket_async_receive_block_t)(OFUDPSocket *socket,
     void *buffer, size_t length, of_udp_socket_address_t sender,
-    OFException *OF_NULLABLE exception);
+    OFException *_Nullable exception);
 #endif
 
 /*!
  * @class OFUDPSocket OFUDPSocket.h ObjFW/OFUDPSocket.h
  *
@@ -155,12 +155,12 @@
  *	       the host of the host / port pair.
  * @param port A pointer to an uint16_t. If it is not NULL, the port of the
  *	       host / port pair will be written to it.
  * @param address The address for which the host and port should be retrieved
  */
-+ (void)getHost: (OFString *__autoreleasing OF_NONNULL *OF_NULLABLE)host
-	andPort: (uint16_t *OF_NULLABLE)port
++ (void)getHost: (OFString *__autoreleasing _Nonnull *_Nullable)host
+	andPort: (uint16_t *_Nullable)port
      forAddress: (of_udp_socket_address_t*)address;
 
 /*!
  * @brief Binds the socket to the specified host and port.
  *