diff --git a/include/wx/osx/private.h b/include/wx/osx/private.h
index ce2ed5c6f8..89cc04313e 100644
--- a/include/wx/osx/private.h
+++ b/include/wx/osx/private.h
@@ -1,7 +1,13 @@
-#ifdef __WXMAC_CLASSIC__
-#include "wx/osx/classic/private.h"
-#elif defined(__WXOSX_IPHONE__)
-#include "wx/osx/core/private.h"
-#else
-#include "wx/osx/carbon/private.h"
+/* common warning snippet for all osx direct includes */
+
+#ifndef wxOSX_USE_CARBON
+#error "this files should only be included after platform.h was included
+#endif
+
+#if wxOSX_USE_IPHONE
+    #include "wx/osx/iphone/private.h"
+#elif wxOSX_USE_CARBON
+    #include "wx/osx/carbon/private.h"
+#elif wxOSX_USE_COCOA
+    #include "wx/osx/cocoa/private.h"
 #endif
diff --git a/include/wx/osx/region.h b/include/wx/osx/region.h
index 8109c46c54..ea68dd8757 100644
--- a/include/wx/osx/region.h
+++ b/include/wx/osx/region.h
@@ -1,5 +1,8 @@
-#ifdef __WXMAC_CLASSIC__
-#include "wx/osx/classic/region.h"
-#else
+#if wxOSX_USE_CARBON
 #include "wx/osx/carbon/region.h"
+#else
+#define wxRegionGeneric wxRegion
+#define wxRegionIteratorGeneric wxRegionIterator
+
+#include "wx/generic/region.h"
 #endif