Index: src/OFBlock.m
==================================================================
--- src/OFBlock.m
+++ src/OFBlock.m
@@ -93,11 +93,10 @@
 	long abi_version;
 	void *ivar_offsets, *properties;
 };
 
 #ifndef OF_OBJFW_RUNTIME
-/* ObjFW-RT already defines those */
 enum objc_abi_class_info {
 	OBJC_CLASS_INFO_CLASS	  = 0x01,
 	OBJC_CLASS_INFO_METACLASS = 0x02
 };
 #endif

Index: src/OFObject.h
==================================================================
--- src/OFObject.h
+++ src/OFObject.h
@@ -26,11 +26,11 @@
 #include <stddef.h>
 #include <stdint.h>
 #include <limits.h>
 
 #ifdef OF_OBJFW_RUNTIME
-# import <objfw-rt.h>
+# import "runtime.h"
 #else
 # import <objc/objc.h>
 #endif
 
 #define OF_RETAIN_COUNT_MAX UINT_MAX

Index: src/OFObject.m
==================================================================
--- src/OFObject.m
+++ src/OFObject.m
@@ -41,11 +41,11 @@
 #import "macros.h"
 
 #if (defined(OF_APPLE_RUNTIME) && __OBJC2__) || defined(OF_GNU_RUNTIME)
 # import <objc/objc-exception.h>
 #elif defined(OF_OBJFW_RUNTIME)
-# import <objfw-rt.h>
+# import "runtime.h"
 #elif defined(OF_OLD_GNU_RUNTIME)
 # import <objc/Protocol.h>
 #endif
 
 #ifdef _WIN32

Index: src/base64.h
==================================================================
--- src/base64.h
+++ src/base64.h
@@ -22,11 +22,11 @@
 #ifndef __STDC_CONSTANT_MACROS
 # define __STDC_CONSTANT_MACROS
 #endif
 
 #ifdef OF_OBJFW_RUNTIME
-# import <objfw-rt.h>
+# import "runtime.h"
 #else
 # import <objc/objc.h>
 #endif
 
 @class OFString;

Index: src/objc_sync.m
==================================================================
--- src/objc_sync.m
+++ src/objc_sync.m
@@ -21,11 +21,11 @@
 #include <assert.h>
 
 #include <sys/types.h>
 
 #ifdef OF_OBJFW_RUNTIME
-# import <objfw-rt.h>
+# import "runtime.h"
 #else
 # import <objc/objc.h>
 #endif
 
 #import "threading.h"