Index: src/OFHTTPCookie.h
==================================================================
--- src/OFHTTPCookie.h
+++ src/OFHTTPCookie.h
@@ -39,31 +39,31 @@
 }
 
 /*!
  * The name of the cookie.
  */
-@property (nonatomic, copy) OFString *name;
+@property (copy, nonatomic) OFString *name;
 
 /*!
  * The value of the cookie.
  */
-@property (nonatomic, copy) OFString *value;
+@property (copy, nonatomic) OFString *value;
 
 /*!
  * The domain for the cookie.
  */
-@property (nonatomic, copy) OFString *domain;
+@property (copy, nonatomic) OFString *domain;
 
 /*!
  * The path for the cookie.
  */
-@property (nonatomic, copy) OFString *path;
+@property (copy, nonatomic) OFString *path;
 
 /*!
  * The date when the cookie expires.
  */
-@property OF_NULLABLE_PROPERTY (nonatomic, copy) OFDate *expires;
+@property OF_NULLABLE_PROPERTY (copy, nonatomic) OFDate *expires;
 
 /*!
  * Whether the cookie is only to be used with HTTPS.
  */
 @property (nonatomic, getter=isSecure) bool secure;

Index: src/OFHTTPRequest.h
==================================================================
--- src/OFHTTPRequest.h
+++ src/OFHTTPRequest.h
@@ -77,32 +77,32 @@
 }
 
 /*!
  * The URL of the HTTP request.
  */
-@property (nonatomic, copy) OFURL *URL;
+@property (copy, nonatomic) OFURL *URL;
 
 /*!
  * The request method of the HTTP request.
  */
 @property (nonatomic) of_http_request_method_t method;
 
 /*!
  * The headers for the HTTP request.
  */
-@property OF_NULLABLE_PROPERTY (nonatomic, copy)
+@property OF_NULLABLE_PROPERTY (copy, nonatomic)
     OFDictionary OF_GENERIC(OFString *, OFString *) *headers;
 
 /*!
  * The entity body of the HTTP request.
  */
-@property OF_NULLABLE_PROPERTY (nonatomic, copy) OFData *body;
+@property OF_NULLABLE_PROPERTY (copy, nonatomic) OFData *body;
 
 /*!
  * The remote address from which the request originates.
  */
-@property OF_NULLABLE_PROPERTY (nonatomic, copy) OFString *remoteAddress;
+@property OF_NULLABLE_PROPERTY (copy, nonatomic) OFString *remoteAddress;
 
 /*!
  * @brief Creates a new OFHTTPRequest.
  *
  * @return A new, autoreleased OFHTTPRequest

Index: src/OFHTTPResponse.h
==================================================================
--- src/OFHTTPResponse.h
+++ src/OFHTTPResponse.h
@@ -40,11 +40,11 @@
 @property (nonatomic) short statusCode;
 
 /*!
  * The headers of the reply to the HTTP request.
  */
-@property OF_NULLABLE_PROPERTY (nonatomic, copy)
+@property OF_NULLABLE_PROPERTY (copy, nonatomic)
     OFDictionary OF_GENERIC(OFString *, OFString *) *headers;
 
 /*!
  * @brief Sets the protocol version of the HTTP request reply.
  *

Index: src/OFHTTPServer.h
==================================================================
--- src/OFHTTPServer.h
+++ src/OFHTTPServer.h
@@ -96,11 +96,11 @@
 }
 
 /*!
  * The host on which the HTTP server will listen.
  */
-@property OF_NULLABLE_PROPERTY (nonatomic, copy) OFString *host;
+@property OF_NULLABLE_PROPERTY (copy, nonatomic) OFString *host;
 
 /*!
  * The port on which the HTTP server will listen.
  */
 @property (nonatomic) uint16_t port;
@@ -115,11 +115,11 @@
  * The server name the server presents to clients.
  *
  * Setting it to `nil` means no `Server` header will be sent, unless one is
  * specified in the response headers.
  */
-@property OF_NULLABLE_PROPERTY (nonatomic, copy) OFString *name;
+@property OF_NULLABLE_PROPERTY (copy, nonatomic) OFString *name;
 
 /*!
  * @brief Creates a new HTTP server.
  *
  * @return A new HTTP server

Index: src/OFINICategory.h
==================================================================
--- src/OFINICategory.h
+++ src/OFINICategory.h
@@ -34,11 +34,11 @@
 }
 
 /*!
  * The name of the INI category
  */
-@property (nonatomic, copy) OFString *name;
+@property (copy, nonatomic) OFString *name;
 
 - init OF_UNAVAILABLE;
 
 /*!
  * @brief Returns the string value for the specified key, or `nil` if it does

Index: src/OFLocking.h
==================================================================
--- src/OFLocking.h
+++ src/OFLocking.h
@@ -25,11 +25,11 @@
  */
 @protocol OFLocking <OFObject>
 /*!
  * The name of the lock.
  */
-@property OF_NULLABLE_PROPERTY (nonatomic, copy) OFString *name;
+@property OF_NULLABLE_PROPERTY (copy, nonatomic) OFString *name;
 
 /*!
  * @brief Locks the lock.
  */
 - (void)lock;

Index: src/OFMutableTarArchiveEntry.h
==================================================================
--- src/OFMutableTarArchiveEntry.h
+++ src/OFMutableTarArchiveEntry.h
@@ -27,11 +27,11 @@
 @interface OFMutableTarArchiveEntry: OFTarArchiveEntry
 
 /*!
  * The file name of the entry.
  */
-@property (readwrite, nonatomic, copy) OFString *fileName;
+@property (readwrite, copy, nonatomic) OFString *fileName;
 
 /*!
  * The mode of the entry.
  */
 @property (readwrite, nonatomic) uint16_t mode;
@@ -52,11 +52,11 @@
 @property (readwrite, nonatomic) uint64_t size;
 
 /*!
  * The date of the last modification of the file.
  */
-@property (readwrite, nonatomic, retain) OFDate *modificationDate;
+@property (readwrite, retain, nonatomic) OFDate *modificationDate;
 
 /*!
  * The type of the archive entry.
  *
  * See @ref of_tar_archive_entry_type_t.
@@ -64,22 +64,22 @@
 @property (readwrite, nonatomic) of_tar_archive_entry_type_t type;
 
 /*!
  * The file name of the target (for a hard link or symbolic link).
  */
-@property OF_NULLABLE_PROPERTY (readwrite, nonatomic, copy)
+@property OF_NULLABLE_PROPERTY (readwrite, copy, nonatomic)
     OFString *targetFileName;
 
 /*!
  * The owner of the file.
  */
-@property OF_NULLABLE_PROPERTY (readwrite, nonatomic, copy) OFString *owner;
+@property OF_NULLABLE_PROPERTY (readwrite, copy, nonatomic) OFString *owner;
 
 /*!
  * The group of the file.
  */
-@property OF_NULLABLE_PROPERTY (readwrite, nonatomic, copy) OFString *group;
+@property OF_NULLABLE_PROPERTY (readwrite, copy, nonatomic) OFString *group;
 
 /*!
  * The device major (if the file is a device).
  */
 @property (readwrite, nonatomic) uint32_t deviceMajor;

Index: src/OFMutableURL.h
==================================================================
--- src/OFMutableURL.h
+++ src/OFMutableURL.h
@@ -25,52 +25,52 @@
  */
 @interface OFMutableURL: OFURL
 /*!
  * The scheme part of the URL.
  */
-@property (readwrite, nonatomic, copy) OFString *scheme;
+@property (readwrite, copy, nonatomic) OFString *scheme;
 
 /*!
  * The host part of the URL.
  */
-@property (readwrite, nonatomic, copy) OFString *host;
+@property (readwrite, copy, nonatomic) OFString *host;
 
 /*!
  * The port part of the URL.
  */
 @property (readwrite, nonatomic) uint16_t port;
 
 /*!
  * The user part of the URL.
  */
-@property OF_NULLABLE_PROPERTY (readwrite, nonatomic, copy) OFString *user;
+@property OF_NULLABLE_PROPERTY (readwrite, copy, nonatomic) OFString *user;
 
 /*!
  * The password part of the URL.
  */
-@property OF_NULLABLE_PROPERTY (readwrite, nonatomic, copy) OFString *password;
+@property OF_NULLABLE_PROPERTY (readwrite, copy, nonatomic) OFString *password;
 
 /*!
  * The path part of the URL.
  */
-@property (readwrite, nonatomic, copy) OFString *path;
+@property (readwrite, copy, nonatomic) OFString *path;
 
 /*!
  * The parameters part of the URL.
  */
-@property OF_NULLABLE_PROPERTY (readwrite, nonatomic, copy)
+@property OF_NULLABLE_PROPERTY (readwrite, copy, nonatomic)
     OFString *parameters;
 
 /*!
  * The query part of the URL.
  */
-@property OF_NULLABLE_PROPERTY (readwrite, nonatomic, copy) OFString *query;
+@property OF_NULLABLE_PROPERTY (readwrite, copy, nonatomic) OFString *query;
 
 /*!
  * The fragment part of the URL.
  */
-@property OF_NULLABLE_PROPERTY (readwrite, nonatomic, copy) OFString *fragment;
+@property OF_NULLABLE_PROPERTY (readwrite, copy, nonatomic) OFString *fragment;
 
 /*!
  * @brief Creates a new mutable URL.
  *
  * @return A new, autoreleased OFMutableURL

Index: src/OFMutableZIPArchiveEntry.h
==================================================================
--- src/OFMutableZIPArchiveEntry.h
+++ src/OFMutableZIPArchiveEntry.h
@@ -28,24 +28,24 @@
 @interface OFMutableZIPArchiveEntry: OFZIPArchiveEntry
 
 /*!
  * The file name of the entry.
  */
-@property (readwrite, nonatomic, copy) OFString *fileName;
+@property (readwrite, copy, nonatomic) OFString *fileName;
 
 /*!
  * The comment of the entry's file.
  */
-@property OF_NULLABLE_PROPERTY (readwrite, nonatomic, copy)
+@property OF_NULLABLE_PROPERTY (readwrite, copy, nonatomic)
     OFString *fileComment;
 
 /*!
  * The extra field of the entry.
  *
  * The item size *must* be 1!
  */
-@property OF_NULLABLE_PROPERTY (readwrite, nonatomic, copy) OFData *extraField;
+@property OF_NULLABLE_PROPERTY (readwrite, copy, nonatomic) OFData *extraField;
 
 /*!
  * The version which made the entry.
  *
  * The lower 8 bits are the ZIP specification version.@n
@@ -66,11 +66,11 @@
 /*!
  * The last modification date of the entry's file.
  *
  * @note Due to limitations of the ZIP format, this has only 2 second precision.
  */
-@property (readwrite, nonatomic, retain) OFDate *modificationDate;
+@property (readwrite, retain, nonatomic) OFDate *modificationDate;
 
 /*!
  * The compression method of the entry.
  *
  * Supported values are:

Index: src/OFTCPSocket.h
==================================================================
--- src/OFTCPSocket.h
+++ src/OFTCPSocket.h
@@ -71,11 +71,11 @@
 }
 
 /*!
  * The host to use as a SOCKS5 proxy.
  */
-@property OF_NULLABLE_PROPERTY (nonatomic, copy) OFString *SOCKS5Host;
+@property OF_NULLABLE_PROPERTY (copy, nonatomic) OFString *SOCKS5Host;
 
 /*!
  * The port to use on the SOCKS5 proxy.
  */
 @property (nonatomic) uint16_t SOCKS5Port;

Index: src/OFTLSSocket.h
==================================================================
--- src/OFTLSSocket.h
+++ src/OFTLSSocket.h
@@ -61,16 +61,16 @@
     id <OFTLSSocketDelegate> delegate;
 
 /*!
  * The path to the X.509 certificate file to use.
  */
-@property OF_NULLABLE_PROPERTY (nonatomic, copy) OFString *certificateFile;
+@property OF_NULLABLE_PROPERTY (copy, nonatomic) OFString *certificateFile;
 
 /*!
  * The path to the PKCS#8 private key file to use.
  */
-@property OF_NULLABLE_PROPERTY (nonatomic, copy) OFString *privateKeyFile;
+@property OF_NULLABLE_PROPERTY (copy, nonatomic) OFString *privateKeyFile;
 
 /*!
  * The passphrase to decrypt the PKCS#8 private key file.
  *
  * @warning You have to ensure that this is in secure memory protected from

Index: src/OFTarArchiveEntry.h
==================================================================
--- src/OFTarArchiveEntry.h
+++ src/OFTarArchiveEntry.h
@@ -61,11 +61,11 @@
 }
 
 /*!
  * The file name of the entry.
  */
-@property (readonly, nonatomic, copy) OFString *fileName;
+@property (readonly, copy, nonatomic) OFString *fileName;
 
 /*!
  * The mode of the entry.
  */
 @property (readonly, nonatomic) uint16_t mode;
@@ -86,11 +86,11 @@
 @property (readonly, nonatomic) uint64_t size;
 
 /*!
  * The date of the last modification of the file.
  */
-@property (readonly, nonatomic, retain) OFDate *modificationDate;
+@property (readonly, retain, nonatomic) OFDate *modificationDate;
 
 /*!
  * The type of the archive entry.
  *
  * See @ref of_tar_archive_entry_type_t.
@@ -98,22 +98,22 @@
 @property (readonly, nonatomic) of_tar_archive_entry_type_t type;
 
 /*!
  * The file name of the target (for a hard link or symbolic link).
  */
-@property OF_NULLABLE_PROPERTY (readonly, nonatomic, copy)
+@property OF_NULLABLE_PROPERTY (readonly, copy, nonatomic)
     OFString *targetFileName;
 
 /*!
  * The owner of the file.
  */
-@property OF_NULLABLE_PROPERTY (readonly, nonatomic, copy) OFString *owner;
+@property OF_NULLABLE_PROPERTY (readonly, copy, nonatomic) OFString *owner;
 
 /*!
  * The group of the file.
  */
-@property OF_NULLABLE_PROPERTY (readonly, nonatomic, copy) OFString *group;
+@property OF_NULLABLE_PROPERTY (readonly, copy, nonatomic) OFString *group;
 
 /*!
  * The device major (if the file is a device).
  */
 @property (readonly, nonatomic) uint32_t deviceMajor;

Index: src/OFTimer+Private.h
==================================================================
--- src/OFTimer+Private.h
+++ src/OFTimer+Private.h
@@ -17,10 +17,10 @@
 #import "OFTimer.h"
 
 OF_ASSUME_NONNULL_BEGIN
 
 @interface OFTimer ()
-@property OF_NULLABLE_PROPERTY (nonatomic, retain, setter=of_setInRunLoop:)
+@property OF_NULLABLE_PROPERTY (retain, nonatomic, setter=of_setInRunLoop:)
     OFRunLoop *of_inRunLoop;
 @end
 
 OF_ASSUME_NONNULL_END

Index: src/OFURL.h
==================================================================
--- src/OFURL.h
+++ src/OFURL.h
@@ -34,51 +34,51 @@
 }
 
 /*!
  * The scheme part of the URL.
  */
-@property (readonly, nonatomic, copy) OFString *scheme;
+@property (readonly, copy, nonatomic) OFString *scheme;
 
 /*!
  * The host part of the URL.
  */
-@property (readonly, nonatomic, copy) OFString *host;
+@property (readonly, copy, nonatomic) OFString *host;
 
 /*!
  * The port part of the URL.
  */
 @property (readonly, nonatomic) uint16_t port;
 
 /*!
  * The user part of the URL.
  */
-@property OF_NULLABLE_PROPERTY (readonly, nonatomic, copy) OFString *user;
+@property OF_NULLABLE_PROPERTY (readonly, copy, nonatomic) OFString *user;
 
 /*!
  * The password part of the URL.
  */
-@property OF_NULLABLE_PROPERTY (readonly, nonatomic, copy) OFString *password;
+@property OF_NULLABLE_PROPERTY (readonly, copy, nonatomic) OFString *password;
 
 /*!
  * The path part of the URL.
  */
-@property (readonly, nonatomic, copy) OFString *path;
+@property (readonly, copy, nonatomic) OFString *path;
 
 /*!
  * The parameters part of the URL.
  */
-@property OF_NULLABLE_PROPERTY (readonly, nonatomic, copy) OFString *parameters;
+@property OF_NULLABLE_PROPERTY (readonly, copy, nonatomic) OFString *parameters;
 
 /*!
  * The query part of the URL.
  */
-@property OF_NULLABLE_PROPERTY (readonly, nonatomic, copy) OFString *query;
+@property OF_NULLABLE_PROPERTY (readonly, copy, nonatomic) OFString *query;
 
 /*!
  * The fragment part of the URL.
  */
-@property OF_NULLABLE_PROPERTY (readonly, nonatomic, copy) OFString *fragment;
+@property OF_NULLABLE_PROPERTY (readonly, copy, nonatomic) OFString *fragment;
 
 /*!
  * @brief Creates a new URL with the specified string.
  *
  * @param string A string describing a URL

Index: src/OFXMLElement.h
==================================================================
--- src/OFXMLElement.h
+++ src/OFXMLElement.h
@@ -39,26 +39,26 @@
 }
 
 /*!
  * The name of the element.
  */
-@property (nonatomic, copy) OFString *name;
+@property (copy, nonatomic) OFString *name;
 
 /*!
  * The namespace of the element.
  */
 #ifndef __cplusplus
-@property OF_NULLABLE_PROPERTY (nonatomic, copy) OFString *namespace;
+@property OF_NULLABLE_PROPERTY (copy, nonatomic) OFString *namespace;
 #else
-@property OF_NULLABLE_PROPERTY (nonatomic, copy,
+@property OF_NULLABLE_PROPERTY (copy, nonatomic,
     getter=namespace, setter=setNamespace:) OFString *namespace_;
 #endif
 
 /*!
  * The default namespace for the element to be used if there is no parent.
  */
-@property OF_NULLABLE_PROPERTY (nonatomic, copy) OFString *defaultNamespace;
+@property OF_NULLABLE_PROPERTY (copy, nonatomic) OFString *defaultNamespace;
 
 /*!
  * @brief Creates a new XML element with the specified name.
  *
  * @param name The name for the element

Index: src/OFZIPArchive.h
==================================================================
--- src/OFZIPArchive.h
+++ src/OFZIPArchive.h
@@ -51,11 +51,11 @@
 }
 
 /*!
  * The archive comment.
  */
-@property OF_NULLABLE_PROPERTY (nonatomic, copy) OFString *archiveComment;
+@property OF_NULLABLE_PROPERTY (copy, nonatomic) OFString *archiveComment;
 
 /*!
  * @brief Creates a new OFZIPArchive object with the specified stream.
  *
  * @param stream A stream from which the ZIP archive will be read.

Index: src/OFZIPArchiveEntry.h
==================================================================
--- src/OFZIPArchiveEntry.h
+++ src/OFZIPArchiveEntry.h
@@ -104,24 +104,24 @@
 }
 
 /*!
  * The file name of the entry.
  */
-@property (readonly, nonatomic, copy) OFString *fileName;
+@property (readonly, copy, nonatomic) OFString *fileName;
 
 /*!
  * The comment of the entry's file.
  */
-@property OF_NULLABLE_PROPERTY (readonly, nonatomic, copy)
+@property OF_NULLABLE_PROPERTY (readonly, copy, nonatomic)
     OFString *fileComment;
 
 /*!
  * The extra field of the entry.
  *
  * The item size *must* be 1!
  */
-@property OF_NULLABLE_PROPERTY (readonly, nonatomic, copy) OFData *extraField;
+@property OF_NULLABLE_PROPERTY (readonly, copy, nonatomic) OFData *extraField;
 
 /*!
  * The version which made the entry.
  *
  * The lower 8 bits are the ZIP specification version.@n
@@ -142,11 +142,11 @@
 /*!
  * The last modification date of the entry's file.
  *
  * @note Due to limitations of the ZIP format, this has only 2 second precision.
  */
-@property (readonly, nonatomic, retain) OFDate *modificationDate;
+@property (readonly, retain, nonatomic) OFDate *modificationDate;
 
 /*!
  * The compression method of the entry.
  *
  * Supported values are: