diff --git a/classpath/java-lang.cpp b/classpath/java-lang.cpp
index 3eed916eeb..93ac9a1afd 100644
--- a/classpath/java-lang.cpp
+++ b/classpath/java-lang.cpp
@@ -43,7 +43,8 @@
 #  define SO_PREFIX "lib"
 #  ifdef __APPLE__
 #    define SO_SUFFIX ".jnilib"
-#    ifndef ARCH_arm
+#    include <TargetConditionals.h>
+#    if !TARGET_IPHONE_SIMULATOR && !TARGET_OS_IPHONE
 #      include <CoreServices/CoreServices.h>
 #    endif
 #  else