Index: src/OFObject.m
==================================================================
--- src/OFObject.m
+++ src/OFObject.m
@@ -285,15 +285,11 @@
 	return NO;
 }
 
 + (IMP)instanceMethodForSelector: (SEL)selector
 {
-#if defined(OF_OBJFW_RUNTIME)
-	return objc_get_instance_method(self, selector);
-#else
 	return class_getMethodImplementation(self, selector);
-#endif
 }
 
 + (const char*)typeEncodingForInstanceSelector: (SEL)selector
 {
 #if defined(OF_OBJFW_RUNTIME)
@@ -517,15 +513,11 @@
 	return [isa conformsToProtocol: protocol];
 }
 
 - (IMP)methodForSelector: (SEL)selector
 {
-#if defined(OF_OBJFW_RUNTIME)
-	return objc_msg_lookup(self, selector);
-#else
 	return class_getMethodImplementation(isa, selector);
-#endif
 }
 
 - (id)performSelector: (SEL)selector
 {
 	id (*imp)(id, SEL) = (id(*)(id, SEL))[self methodForSelector: selector];

Index: src/runtime/class.m
==================================================================
--- src/runtime/class.m
+++ src/runtime/class.m
@@ -278,17 +278,11 @@
 {
 	return cls->instance_size;
 }
 
 IMP
-objc_get_class_method(Class cls, SEL sel)
-{
-	return objc_sparsearray_get(cls->isa->dtable, (uint32_t)sel->uid);
-}
-
-IMP
-objc_get_instance_method(Class cls, SEL sel)
+class_getMethodImplementation(Class cls, SEL sel)
 {
 	return objc_sparsearray_get(cls->dtable, (uint32_t)sel->uid);
 }
 
 const char*

Index: src/runtime/runtime.h
==================================================================
--- src/runtime/runtime.h
+++ src/runtime/runtime.h
@@ -106,14 +106,13 @@
 extern Class class_getSuperclass(Class);
 extern BOOL class_isKindOfClass(Class, Class);
 extern unsigned long class_getInstanceSize(Class);
 extern BOOL class_respondsToSelector(Class, SEL);
 extern BOOL class_conformsToProtocol(Class, Protocol*);
-extern IMP objc_get_class_method(Class, SEL);
-extern IMP objc_get_instance_method(Class, SEL);
+extern IMP class_getMethodImplementation(Class, SEL);
 extern IMP class_replaceMethod(Class, SEL, IMP, const char*);
 extern const char* objc_get_type_encoding(Class, SEL);
 extern IMP objc_msg_lookup(id, SEL);
 extern void objc_thread_add(void);
 extern void objc_thread_remove(void);
 extern void objc_exit(void);
 #endif