Index: configure.ac
==================================================================
--- configure.ac
+++ configure.ac
@@ -399,15 +399,10 @@
 
 AC_CHECK_FUNC(objc_autoreleasePoolPush, [], [
 	AC_SUBST(AUTORELEASE_M, "autorelease.m")
 ])
 
-AC_CHECK_FUNC(objc_enumerationMutation, [
-	AC_DEFINE(HAVE_OBJC_ENUMERATIONMUTATION, 1,
-		[Whether we have objc_enumerationMutation()])
-])
-
 case "$host_os" in
 	darwin*)
 		AC_SUBST(LDFLAGS_REEXPORT, ["-Wl,-reexport-lobjfw"])
 		AS_IF([test x"$objc_runtime" = x"Apple runtime"], [
 			AC_SUBST(REEXPORT_LIBOBJC, ["-Wl,-reexport-lobjc"])

Index: src/OFObject.m
==================================================================
--- src/OFObject.m
+++ src/OFObject.m
@@ -140,18 +140,10 @@
 of_method_not_found_stret(void *st, id obj, SEL sel)
 {
 	of_method_not_found(obj, sel);
 }
 
-#if !defined(OF_OBJFW_RUNTIME) && !defined(HAVE_OBJC_ENUMERATIONMUTATION)
-void
-objc_enumerationMutation(id object)
-{
-	enumerationMutationHandler(object);
-}
-#endif
-
 id
 of_alloc_object(Class class, size_t extraSize, size_t extraAlignment,
     void **extra)
 {
 	OFObject *instance;
@@ -226,13 +218,11 @@
 	objc_setForwardHandler((void*)&of_forward, (void*)&of_forward_stret);
 #else
 	objc_setForwardHandler((IMP)&of_forward, (IMP)&of_forward_stret);
 #endif
 
-#if defined(OF_OBJFW_RUNTIME) || defined(HAVE_OBJC_ENUMERATIONMUTATION)
 	objc_setEnumerationMutationHandler(enumerationMutationHandler);
-#endif
 
 	of_hash_seed = 0;
 	while (of_hash_seed == 0) {
 #if defined(HAVE_ARC4RANDOM)
 		of_hash_seed = arc4random();