-#ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/private.h"
-#elif defined(__WXOSX_IPHONE__)
-#include "wx/mac/corefoundation/private.h"
-#else
-#include "wx/mac/carbon/private.h"
+#ifndef _WX_PRIVATE_OSX_H_
+#define _WX_PRIVATE_OSX_H_
+
+#include "wx/osx/core/private.h"
+
+#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"
+#elif wxUSE_GUI
+ #error "Must include wx/defs.h first"
+#endif
+