@@ -39,11 +39,11 @@
 			OBJC_ERROR("Failed to initialize spinlocks!")
 }
 #endif
 
 id
-objc_getProperty(id self, SEL _cmd, ptrdiff_t offset, BOOL atomic)
+objc_getProperty(id self, SEL _cmd, ptrdiff_t offset, bool atomic)
 {
 	if (atomic) {
 		id *ptr = (id *)(void *)((char *)self + offset);
 #ifdef OF_HAVE_THREADS
 		unsigned hash = SPINLOCK_HASH(ptr);
@@ -61,11 +61,11 @@
 
 	return *(id *)(void *)((char *)self + offset);
 }
 
 void
-objc_setProperty(id self, SEL _cmd, ptrdiff_t offset, id value, BOOL atomic,
+objc_setProperty(id self, SEL _cmd, ptrdiff_t offset, id value, bool atomic,
     signed char copy)
 {
 	if (atomic) {
 		id *ptr = (id *)(void *)((char *)self + offset);
 #ifdef OF_HAVE_THREADS
@@ -114,12 +114,12 @@
 	[old release];
 }
 
 /* The following methods are only required for GCC >= 4.6 */
 void
-objc_getPropertyStruct(void *dest, const void *src, ptrdiff_t size, BOOL atomic,
-    BOOL strong)
+objc_getPropertyStruct(void *dest, const void *src, ptrdiff_t size, bool atomic,
+    bool strong)
 {
 	if (atomic) {
 #ifdef OF_HAVE_THREADS
 		unsigned hash = SPINLOCK_HASH(src);
 
@@ -135,12 +135,12 @@
 
 	memcpy(dest, src, size);
 }
 
 void
-objc_setPropertyStruct(void *dest, const void *src, ptrdiff_t size, BOOL atomic,
-    BOOL strong)
+objc_setPropertyStruct(void *dest, const void *src, ptrdiff_t size, bool atomic,
+    bool strong)
 {
 	if (atomic) {
 #ifdef OF_HAVE_THREADS
 		unsigned hash = SPINLOCK_HASH(src);