Index: src/OFBlock.m
==================================================================
--- src/OFBlock.m
+++ src/OFBlock.m
@@ -475,11 +475,11 @@
 {
 	if ([self isMemberOfClass: (Class)&_NSConcreteMallocBlock])
 		return ((struct Block *)self)->flags &
 		    OF_BLOCK_REFCOUNT_MASK;
 
-	return OF_RETAIN_COUNT_MAX;
+	return OFMaxRetainCount;
 }
 
 - (void)release
 {
 	if ([self isMemberOfClass: (Class)&_NSConcreteMallocBlock])

Index: src/OFCharacterSet.m
==================================================================
--- src/OFCharacterSet.m
+++ src/OFCharacterSet.m
@@ -165,11 +165,11 @@
 {
 }
 
 - (unsigned int)retainCount
 {
-	return OF_RETAIN_COUNT_MAX;
+	return OFMaxRetainCount;
 }
 
 - (bool)characterIsMember: (OFUnichar)character
 {
 	switch (character) {

Index: src/OFConstantString.m
==================================================================
--- src/OFConstantString.m
+++ src/OFConstantString.m
@@ -62,11 +62,11 @@
 	return self;
 }
 
 - (unsigned int)retainCount
 {
-	return OF_RETAIN_COUNT_MAX;
+	return OFMaxRetainCount;
 }
 
 - (void)release
 {
 }
@@ -145,11 +145,11 @@
 	return self;
 }
 
 - (unsigned int)retainCount
 {
-	return OF_RETAIN_COUNT_MAX;
+	return OFMaxRetainCount;
 }
 
 - (void)release
 {
 }

Index: src/OFDate.m
==================================================================
--- src/OFDate.m
+++ src/OFDate.m
@@ -274,11 +274,11 @@
 {
 }
 
 - (unsigned int)retainCount
 {
-	return OF_RETAIN_COUNT_MAX;
+	return OFMaxRetainCount;
 }
 @end
 
 @implementation OFDatePlaceholder
 #ifdef __clang__

Index: src/OFDictionary.m
==================================================================
--- src/OFDictionary.m
+++ src/OFDictionary.m
@@ -170,11 +170,11 @@
 {
 }
 
 - (unsigned int)retainCount
 {
-	return OF_RETAIN_COUNT_MAX;
+	return OFMaxRetainCount;
 }
 
 - (bool)characterIsMember: (OFUnichar)character
 {
 	if (character < CHAR_MAX && OFASCIIIsAlnum(character))

Index: src/OFFileManager.m
==================================================================
--- src/OFFileManager.m
+++ src/OFFileManager.m
@@ -892,11 +892,11 @@
 {
 }
 
 - (unsigned int)retainCount
 {
-	return OF_RETAIN_COUNT_MAX;
+	return OFMaxRetainCount;
 }
 @end
 
 @implementation OFDictionary (FileAttributes)
 - (unsigned long long)fileSize

Index: src/OFNull.m
==================================================================
--- src/OFNull.m
+++ src/OFNull.m
@@ -121,13 +121,13 @@
 {
 }
 
 - (unsigned int)retainCount
 {
-	return OF_RETAIN_COUNT_MAX;
+	return OFMaxRetainCount;
 }
 
 - (void)dealloc
 {
 	OF_DEALLOC_UNSUPPORTED
 }
 @end

Index: src/OFNumber.m
==================================================================
--- src/OFNumber.m
+++ src/OFNumber.m
@@ -402,11 +402,11 @@
 {
 }
 
 - (unsigned int)retainCount
 {
-	return OF_RETAIN_COUNT_MAX;
+	return OFMaxRetainCount;
 }
 @end
 
 #ifdef OF_OBJFW_RUNTIME
 @implementation OFTaggedPointerNumber

Index: src/OFObject.m
==================================================================
--- src/OFObject.m
+++ src/OFObject.m
@@ -1235,11 +1235,11 @@
 	return self;
 }
 
 + (unsigned int)retainCount
 {
-	return OF_RETAIN_COUNT_MAX;
+	return OFMaxRetainCount;
 }
 
 + (void)release
 {
 }

Index: src/OFStdIOStream.m
==================================================================
--- src/OFStdIOStream.m
+++ src/OFStdIOStream.m
@@ -381,11 +381,11 @@
 {
 }
 
 - (unsigned int)retainCount
 {
-	return OF_RETAIN_COUNT_MAX;
+	return OFMaxRetainCount;
 }
 
 - (bool)hasTerminal
 {
 #ifdef HAVE_ISATTY

Index: src/OFURL.m
==================================================================
--- src/OFURL.m
+++ src/OFURL.m
@@ -142,11 +142,11 @@
 {
 }
 
 - (unsigned int)retainCount
 {
-	return OF_RETAIN_COUNT_MAX;
+	return OFMaxRetainCount;
 }
 @end
 
 @implementation OFURLAllowedCharacterSet
 - (bool)characterIsMember: (OFUnichar)character

Index: src/exceptions/OFAllocFailedException.m
==================================================================
--- src/exceptions/OFAllocFailedException.m
+++ src/exceptions/OFAllocFailedException.m
@@ -44,11 +44,11 @@
 	return self;
 }
 
 - (unsigned int)retainCount
 {
-	return OF_RETAIN_COUNT_MAX;
+	return OFMaxRetainCount;
 }
 
 - (void)release
 {
 }

Index: src/macros.h
==================================================================
--- src/macros.h
+++ src/macros.h
@@ -347,11 +347,11 @@
 #   endif
 #  endif
 # endif
 #endif
 
-#define OF_RETAIN_COUNT_MAX UINT_MAX
+#define OFMaxRetainCount UINT_MAX
 
 #ifdef OBJC_COMPILING_RUNTIME
 # define OFEnsure(cond)							\
 	do {								\
 		if OF_UNLIKELY (!(cond))				\