// headers
// ----------------------------------------------------------------------------
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
#pragma interface "layout.h"
#endif
-#include "wx/defs.h"
+#include "wx/object.h"
// X stupidly defines these in X.h
#ifdef Above