diff --git a/include/internal/catch_debugger.cpp b/include/internal/catch_debugger.cpp
index c7d66375..4d05c85a 100644
--- a/include/internal/catch_debugger.cpp
+++ b/include/internal/catch_debugger.cpp
@@ -10,6 +10,7 @@
 #include "catch_debugger.h"
 #include "catch_errno_guard.h"
 #include "catch_stream.h"
+#include "catch_platform.h"
 
 #ifdef CATCH_PLATFORM_MAC
 
diff --git a/include/internal/catch_platform.h b/include/internal/catch_platform.h
index 09b91bfb..87250c60 100644
--- a/include/internal/catch_platform.h
+++ b/include/internal/catch_platform.h
@@ -9,12 +9,17 @@
 #ifndef TWOBLUECUBES_CATCH_PLATFORM_H_INCLUDED
 #define TWOBLUECUBES_CATCH_PLATFORM_H_INCLUDED
 
-#if defined(__MAC_OS_X_VERSION_MIN_REQUIRED)
+#ifdef __APPLE__
+# include <TargetConditionals.h>
+# if TARGET_OS_MAC == 1
 #  define CATCH_PLATFORM_MAC
-#elif  defined(__IPHONE_OS_VERSION_MIN_REQUIRED)
+# elif TARGET_OS_IPHONE == 1
 #  define CATCH_PLATFORM_IPHONE
+# endif
+
 #elif defined(linux) || defined(__linux) || defined(__linux__)
 #  define CATCH_PLATFORM_LINUX
+
 #elif defined(WIN32) || defined(__WIN32__) || defined(_WIN32) || defined(_MSC_VER)
 #  define CATCH_PLATFORM_WINDOWS
 #  if !defined(NOMINMAX) && !defined(CATCH_CONFIG_NO_NOMINMAX)