Index: src/OFSHA224Or256Hash.m
==================================================================
--- src/OFSHA224Or256Hash.m
+++ src/OFSHA224Or256Hash.m
@@ -26,11 +26,10 @@
 #import "OFHashAlreadyCalculatedException.h"
 #import "OFOutOfRangeException.h"
 
 #define BLOCK_SIZE 64
 
-OF_DIRECT_MEMBERS
 @interface OFSHA224Or256Hash ()
 - (void)of_resetState;
 @end
 
 static const uint32_t table[] = {

Index: src/OFSHA384Or512Hash.m
==================================================================
--- src/OFSHA384Or512Hash.m
+++ src/OFSHA384Or512Hash.m
@@ -26,11 +26,10 @@
 #import "OFHashAlreadyCalculatedException.h"
 #import "OFOutOfRangeException.h"
 
 #define BLOCK_SIZE 128
 
-OF_DIRECT_MEMBERS
 @interface OFSHA384Or512Hash ()
 - (void)of_resetState;
 @end
 
 static const uint64_t table[] = {

Index: src/OFString.m
==================================================================
--- src/OFString.m
+++ src/OFString.m
@@ -82,18 +82,17 @@
 
 #if defined(HAVE_STRTOF_L) || defined(HAVE_STRTOD_L)
 static locale_t cLocale;
 #endif
 
-OF_DIRECT_MEMBERS
 @interface OFString ()
 - (size_t)of_getCString: (char *)cString
 	      maxLength: (size_t)maxLength
 	       encoding: (of_string_encoding_t)encoding
-		  lossy: (bool)lossy;
+		  lossy: (bool)lossy OF_DIRECT;
 - (const char *)of_cStringWithEncoding: (of_string_encoding_t)encoding
-				 lossy: (bool)lossy;
+				 lossy: (bool)lossy OF_DIRECT;
 - (OFString *)of_JSONRepresentationWithOptions: (int)options
 					 depth: (size_t)depth;
 @end
 
 @interface OFStringPlaceholder: OFString