diff --git a/BasiliskII/src/MacOSX/configure.in b/BasiliskII/src/MacOSX/configure.in
index deb4a036..e4ebb7bf 100644
--- a/BasiliskII/src/MacOSX/configure.in
+++ b/BasiliskII/src/MacOSX/configure.in
@@ -160,6 +160,7 @@ dnl Checks for header files.
 AC_HEADER_STDC
 AC_CHECK_HEADERS(unistd.h fcntl.h sys/types.h sys/time.h sys/mman.h mach/mach.h)
 AC_CHECK_HEADERS(readline.h history.h readline/readline.h readline/history.h)
+AC_CHECK_HEADERS(IOKit/storage/IOBlockStorageDevice.h)
 
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_C_BIGENDIAN
diff --git a/BasiliskII/src/MacOSX/sys_darwin.cpp b/BasiliskII/src/MacOSX/sys_darwin.cpp
index 0425c4cf..47f6dd4a 100644
--- a/BasiliskII/src/MacOSX/sys_darwin.cpp
+++ b/BasiliskII/src/MacOSX/sys_darwin.cpp
@@ -31,7 +31,7 @@
 #import <IOKit/serial/IOSerialKeys.h>
 #import <IOKit/storage/IOMedia.h>
 #import <IOKit/storage/IOMediaBSDClient.h>
-#ifdef MAC_OS_X_VERSION_10_2
+#ifdef HAVE_IOKIT_STORAGE_IOBLOCKSTORAGEDEVICE_H
 	#import <IOKit/storage/IOBlockStorageDevice.h>
 #endif
 #import <IOKit/storage/IOCDMedia.h>
diff --git a/BasiliskII/src/Unix/configure.ac b/BasiliskII/src/Unix/configure.ac
index 5ba4f701..da4f0446 100644
--- a/BasiliskII/src/Unix/configure.ac
+++ b/BasiliskII/src/Unix/configure.ac
@@ -292,6 +292,7 @@ AC_CHECK_HEADERS(linux/if.h linux/if_tun.h net/if.h net/if_tun.h, [], [], [
 #endif
 ])
 AC_CHECK_HEADERS(AvailabilityMacros.h)
+AC_CHECK_HEADERS(IOKit/storage/IOBlockStorageDevice.h)
 
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_C_BIGENDIAN
@@ -409,6 +410,7 @@ AC_DEFUN(AC_CHECK_FRAMEWORK, [
 dnl Check for some MacOS X frameworks
 AC_CHECK_FRAMEWORK(Carbon, [#include <Carbon/Carbon.h>])
 AC_CHECK_FRAMEWORK(IOKit, [#include <IOKit/IOKitLib.h>])
+AC_CHECK_FRAMEWORK(CoreFoundation, [#include <CoreFoundation/CoreFoundation.h>])
 
 dnl Select system-dependant source files.
 SERIALSRC=serial_unix.cpp
@@ -475,7 +477,7 @@ irix*)
   ;;
 darwin*)
   ETHERSRC=ether_unix.cpp
-  if [[ "x$ac_cv_framework_IOKit" = "xyes" ]]; then
+  if [[ "x$ac_cv_framework_IOKit" = "xyes" -a "x$ac_cv_framework_CoreFoundation" = "xyes" ]]; then
     EXTRASYSSRCS="../MacOSX/sys_darwin.cpp"
   fi
   if [[ "x$ac_cv_framework_Carbon" = "xyes" ]]; then