-#ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/private/timer.h"
-#else
-#include "wx/mac/carbon/private/timer.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 1 // revert to wxOSX_USE_COCOA_OR_IPHONE in case of problems
+ #include "wx/osx/core/private/timer.h"
+#elif wxOSX_USE_CARBON
+ #include "wx/osx/carbon/private/timer.h"