diff --git a/include/wx/accel.h b/include/wx/accel.h
index fe1ec1a6fa..0d3593cc28 100644
--- a/include/wx/accel.h
+++ b/include/wx/accel.h
@@ -157,7 +157,7 @@ private:
 #elif defined(__WXGTK__)
     #include "wx/gtk1/accel.h"
 #elif defined(__WXMAC__)
-    #include "wx/mac/accel.h"
+    #include "wx/osx/accel.h"
 #elif defined(__WXCOCOA__)
     #include "wx/generic/accel.h"
 #elif defined(__WXPM__)
diff --git a/include/wx/app.h b/include/wx/app.h
index 553a29aa5c..5f4d622bae 100644
--- a/include/wx/app.h
+++ b/include/wx/app.h
@@ -596,7 +596,7 @@ protected:
 #elif defined(__WXX11__)
     #include "wx/x11/app.h"
 #elif defined(__WXMAC__)
-    #include "wx/mac/app.h"
+    #include "wx/osx/app.h"
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/app.h"
 #elif defined(__WXPM__)
diff --git a/include/wx/bitmap.h b/include/wx/bitmap.h
index 42f48524f9..37419c7e80 100644
--- a/include/wx/bitmap.h
+++ b/include/wx/bitmap.h
@@ -243,7 +243,7 @@ protected:
 #elif defined(__WXDFB__)
     #include "wx/dfb/bitmap.h"
 #elif defined(__WXMAC__)
-    #include "wx/mac/bitmap.h"
+    #include "wx/osx/bitmap.h"
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/bitmap.h"
 #elif defined(__WXPM__)
diff --git a/include/wx/bmpbuttn.h b/include/wx/bmpbuttn.h
index 21412bf425..4ebb839dfd 100644
--- a/include/wx/bmpbuttn.h
+++ b/include/wx/bmpbuttn.h
@@ -110,7 +110,7 @@ inline void wxBitmapButtonBase::SetLabel(const wxBitmap& bitmap)
 #elif defined(__WXGTK__)
     #include "wx/gtk1/bmpbuttn.h"
 #elif defined(__WXMAC__)
-    #include "wx/mac/bmpbuttn.h"
+    #include "wx/osx/bmpbuttn.h"
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/bmpbuttn.h"
 #elif defined(__WXPM__)
diff --git a/include/wx/brush.h b/include/wx/brush.h
index acddcd314c..fa0103cf4d 100644
--- a/include/wx/brush.h
+++ b/include/wx/brush.h
@@ -77,7 +77,7 @@ public:
 #elif defined(__WXDFB__)
     #include "wx/dfb/brush.h"
 #elif defined(__WXMAC__)
-    #include "wx/mac/brush.h"
+    #include "wx/osx/brush.h"
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/brush.h"
 #elif defined(__WXPM__)
diff --git a/include/wx/button.h b/include/wx/button.h
index 250f53129c..519d0b7ffe 100644
--- a/include/wx/button.h
+++ b/include/wx/button.h
@@ -95,7 +95,7 @@ protected:
 #elif defined(__WXGTK__)
     #include "wx/gtk1/button.h"
 #elif defined(__WXMAC__)
-    #include "wx/mac/button.h"
+    #include "wx/osx/button.h"
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/button.h"
 #elif defined(__WXPM__)
diff --git a/include/wx/checkbox.h b/include/wx/checkbox.h
index 96e7c8679d..e471358b21 100644
--- a/include/wx/checkbox.h
+++ b/include/wx/checkbox.h
@@ -144,7 +144,7 @@ private:
 #elif defined(__WXGTK__)
     #include "wx/gtk1/checkbox.h"
 #elif defined(__WXMAC__)
-    #include "wx/mac/checkbox.h"
+    #include "wx/osx/checkbox.h"
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/checkbox.h"
 #elif defined(__WXPM__)
diff --git a/include/wx/checklst.h b/include/wx/checklst.h
index 1d886ba4b0..f7ec1a8762 100644
--- a/include/wx/checklst.h
+++ b/include/wx/checklst.h
@@ -51,7 +51,7 @@ public:
 #elif defined(__WXGTK__)
     #include "wx/gtk1/checklst.h"
 #elif defined(__WXMAC__)
-    #include "wx/mac/checklst.h"
+    #include "wx/osx/checklst.h"
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/checklst.h"
 #elif defined(__WXPM__)
diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h
index 9fb5dbbf08..36095513db 100644
--- a/include/wx/chkconf.h
+++ b/include/wx/chkconf.h
@@ -1023,7 +1023,7 @@
 #elif defined(__WXGTK__)
 #  include "wx/gtk/chkconf.h"
 #elif defined(__WXMAC__)
-#  include "wx/mac/chkconf.h"
+#  include "wx/osx/chkconf.h"
 #elif defined(__OS2__)
 #  include "wx/os2/chkconf.h"
 #elif defined(__WXMGL__)
diff --git a/include/wx/choice.h b/include/wx/choice.h
index e6e85a2241..18d31d2c12 100644
--- a/include/wx/choice.h
+++ b/include/wx/choice.h
@@ -79,7 +79,7 @@ private:
 #elif defined(__WXGTK__)
     #include "wx/gtk1/choice.h"
 #elif defined(__WXMAC__)
-    #include "wx/mac/choice.h"
+    #include "wx/osx/choice.h"
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/choice.h"
 #elif defined(__WXPM__)
diff --git a/include/wx/clipbrd.h b/include/wx/clipbrd.h
index 9977256a31..738343ac4d 100644
--- a/include/wx/clipbrd.h
+++ b/include/wx/clipbrd.h
@@ -118,7 +118,7 @@ public:
 #elif defined(__WXMGL__)
     #include "wx/mgl/clipbrd.h"
 #elif defined(__WXMAC__)
-    #include "wx/mac/clipbrd.h"
+    #include "wx/osx/clipbrd.h"
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/clipbrd.h"
 #elif defined(__WXPM__)
diff --git a/include/wx/cocoa/ObjcRef.h b/include/wx/cocoa/ObjcRef.h
index ccb3d3156f..f08c6435dd 100644
--- a/include/wx/cocoa/ObjcRef.h
+++ b/include/wx/cocoa/ObjcRef.h
@@ -13,7 +13,7 @@
 #define _WX_COCOA_OBJCREF_H__
 
 // Reuse wxCFRef-related code (e.g. wxCFRetain/wxCFRelease)
-#include "wx/mac/corefoundation/cfref.h"
+#include "wx/osx/core/cfref.h"
 
 // NOTE WELL: We can only know whether or not GC can be used when compiling Objective-C.
 // Therefore we cannot implement these functions except when compiling Objective-C.
diff --git a/include/wx/cocoa/app.h b/include/wx/cocoa/app.h
index 36c8e57805..bed4a07c7f 100644
--- a/include/wx/cocoa/app.h
+++ b/include/wx/cocoa/app.h
@@ -15,7 +15,7 @@
 typedef struct __CFRunLoopObserver * CFRunLoopObserverRef;
 typedef const struct __CFString * CFStringRef;
 
-#include "wx/mac/corefoundation/cfref.h"
+#include "wx/osx/core/cfref.h"
 
 // ========================================================================
 // wxApp
diff --git a/include/wx/cocoa/colour.h b/include/wx/cocoa/colour.h
index ddec620a9f..3209d94f0c 100644
--- a/include/wx/cocoa/colour.h
+++ b/include/wx/cocoa/colour.h
@@ -38,6 +38,7 @@ public:
     // accessors
     virtual bool IsOk() const { return m_cocoaNSColor; }
     WX_NSColor GetNSColor() { return m_cocoaNSColor; }
+    WX_NSColor GetNSColor() const { return m_cocoaNSColor; }
 
     unsigned char Red() const { return m_red; }
     unsigned char Green() const { return m_green; }
diff --git a/include/wx/colordlg.h b/include/wx/colordlg.h
index d0aac1af88..7c36c2b1a7 100644
--- a/include/wx/colordlg.h
+++ b/include/wx/colordlg.h
@@ -19,7 +19,7 @@
 #if defined(__WXMSW__) && !defined(__WXUNIVERSAL__)
     #include "wx/msw/colordlg.h"
 #elif defined(__WXMAC__) && !defined(__WXUNIVERSAL__)
-    #include "wx/mac/colordlg.h"
+    #include "wx/osx/colordlg.h"
 #elif defined(__WXGTK20__) && !defined(__WXUNIVERSAL__)
     #include "wx/gtk/colordlg.h"
 #elif defined(__WXPALMOS__)
diff --git a/include/wx/colour.h b/include/wx/colour.h
index 9c2fc423b7..68f6845787 100644
--- a/include/wx/colour.h
+++ b/include/wx/colour.h
@@ -189,7 +189,7 @@ WXDLLIMPEXP_CORE bool wxFromString(const wxString& str, wxColourBase* col);
 #elif defined(__WXX11__)
     #include "wx/x11/colour.h"
 #elif defined(__WXMAC__)
-    #include "wx/mac/colour.h"
+    #include "wx/osx/colour.h"
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/colour.h"
 #elif defined(__WXPM__)
diff --git a/include/wx/combobox.h b/include/wx/combobox.h
index ce7ba61aee..58d5344e22 100644
--- a/include/wx/combobox.h
+++ b/include/wx/combobox.h
@@ -68,7 +68,7 @@ public:
 #elif defined(__WXGTK__)
     #include "wx/gtk1/combobox.h"
 #elif defined(__WXMAC__)
-    #include "wx/mac/combobox.h"
+    #include "wx/osx/combobox.h"
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/combobox.h"
 #elif defined(__WXPM__)
diff --git a/include/wx/control.h b/include/wx/control.h
index 2a91838078..ecc897525c 100644
--- a/include/wx/control.h
+++ b/include/wx/control.h
@@ -131,7 +131,7 @@ protected:
 #elif defined(__WXGTK__)
     #include "wx/gtk1/control.h"
 #elif defined(__WXMAC__)
-    #include "wx/mac/control.h"
+    #include "wx/osx/control.h"
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/control.h"
 #elif defined(__WXPM__)
diff --git a/include/wx/cursor.h b/include/wx/cursor.h
index f77ecc2a4e..893f9fe575 100644
--- a/include/wx/cursor.h
+++ b/include/wx/cursor.h
@@ -31,7 +31,7 @@
 #elif defined(__WXDFB__)
     #include "wx/dfb/cursor.h"
 #elif defined(__WXMAC__)
-    #include "wx/mac/cursor.h"
+    #include "wx/osx/cursor.h"
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/cursor.h"
 #elif defined(__WXPM__)
diff --git a/include/wx/dataobj.h b/include/wx/dataobj.h
index f7923c0b65..8966541e4e 100644
--- a/include/wx/dataobj.h
+++ b/include/wx/dataobj.h
@@ -83,7 +83,7 @@ public:
 #elif defined(__WXX11__)
     #include "wx/x11/dataform.h"
 #elif defined(__WXMAC__)
-    #include "wx/mac/dataform.h"
+    #include "wx/osx/dataform.h"
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/dataform.h"
 #elif defined(__WXPM__)
@@ -171,7 +171,7 @@ public:
 #elif defined(__WXGTK__)
     #include "wx/gtk1/dataobj.h"
 #elif defined(__WXMAC__)
-    #include "wx/mac/dataobj.h"
+    #include "wx/osx/dataobj.h"
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/dataobj.h"
 #elif defined(__WXPM__)
@@ -515,7 +515,7 @@ private:
     #elif defined(__WXMOTIF__)
         #include "wx/motif/dataobj2.h"
     #elif defined(__WXMAC__)
-        #include "wx/mac/dataobj2.h"
+        #include "wx/osx/dataobj2.h"
     #elif defined(__WXCOCOA__)
         #include "wx/cocoa/dataobj2.h"
     #elif defined(__WXPM__)
diff --git a/include/wx/dataview.h b/include/wx/dataview.h
index 39ab01c92f..6f3d54db18 100644
--- a/include/wx/dataview.h
+++ b/include/wx/dataview.h
@@ -861,7 +861,7 @@ typedef void (wxEvtHandler::*wxDataViewEventFunction)(wxDataViewEvent&);
 #elif defined(__WXGTK20__)
     #include "wx/gtk/dataview.h"
 #elif defined(__WXMAC__)
-    #include "wx/mac/dataview.h"
+    #include "wx/osx/dataview.h"
 #else
     #include "wx/generic/dataview.h"
 #endif
diff --git a/include/wx/dialog.h b/include/wx/dialog.h
index 9eee12da29..a8160033fd 100644
--- a/include/wx/dialog.h
+++ b/include/wx/dialog.h
@@ -314,7 +314,7 @@ public:
     #elif defined(__WXGTK__)
         #include "wx/gtk1/dialog.h"
     #elif defined(__WXMAC__)
-        #include "wx/mac/dialog.h"
+        #include "wx/osx/dialog.h"
     #elif defined(__WXCOCOA__)
         #include "wx/cocoa/dialog.h"
     #elif defined(__WXPM__)
diff --git a/include/wx/dirdlg.h b/include/wx/dirdlg.h
index b7f0b8e890..fc86e19527 100644
--- a/include/wx/dirdlg.h
+++ b/include/wx/dirdlg.h
@@ -111,7 +111,7 @@ protected:
     #include "wx/generic/dirdlgg.h"
     #define wxDirDialog wxGenericDirDialog
 #elif defined(__WXMAC__)
-    #include "wx/mac/dirdlg.h"      // Native Mac
+    #include "wx/osx/dirdlg.h"      // Native Mac
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/dirdlg.h"    // Native Cocoa
 #elif defined(__WXMOTIF__) || \
diff --git a/include/wx/dnd.h b/include/wx/dnd.h
index 43c418f6ce..d1cde3e9cd 100644
--- a/include/wx/dnd.h
+++ b/include/wx/dnd.h
@@ -222,7 +222,7 @@ protected:
 #elif defined(__WXGTK__)
     #include "wx/gtk1/dnd.h"
 #elif defined(__WXMAC__)
-    #include "wx/mac/dnd.h"
+    #include "wx/osx/dnd.h"
 #elif defined(__WXPM__)
     #include "wx/os2/dnd.h"
 #endif
diff --git a/include/wx/evtloop.h b/include/wx/evtloop.h
index 5528d8be31..0be2ab6dc7 100644
--- a/include/wx/evtloop.h
+++ b/include/wx/evtloop.h
@@ -116,7 +116,7 @@ protected:
 #elif defined(__WXMSW__)
     #include "wx/msw/evtloop.h"
 #elif defined(__WXMAC__)
-    #include "wx/mac/evtloop.h"
+    #include "wx/osx/evtloop.h"
 #elif defined(__WXDFB__)
     #include "wx/dfb/evtloop.h"
 #else // other platform
diff --git a/include/wx/filedlg.h b/include/wx/filedlg.h
index e939c82d5e..1f9b24715a 100644
--- a/include/wx/filedlg.h
+++ b/include/wx/filedlg.h
@@ -218,7 +218,7 @@ wxSaveFileSelector(const wxString& what,
 #elif defined(__WXGTK__)
     #include "wx/gtk1/filedlg.h"
 #elif defined(__WXMAC__)
-    #include "wx/mac/filedlg.h"
+    #include "wx/osx/filedlg.h"
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/filedlg.h"
 #elif defined(__WXPM__)
diff --git a/include/wx/font.h b/include/wx/font.h
index c97ea06194..e1bb654093 100644
--- a/include/wx/font.h
+++ b/include/wx/font.h
@@ -243,7 +243,7 @@ WXDLLIMPEXP_CORE bool wxFromString(const wxString& str, wxFontBase* font);
 #elif defined(__WXDFB__)
     #include "wx/dfb/font.h"
 #elif defined(__WXMAC__)
-    #include "wx/mac/font.h"
+    #include "wx/osx/font.h"
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/font.h"
 #elif defined(__WXPM__)
diff --git a/include/wx/fontdlg.h b/include/wx/fontdlg.h
index 8a90823726..2d845d5e3a 100644
--- a/include/wx/fontdlg.h
+++ b/include/wx/fontdlg.h
@@ -99,7 +99,7 @@ inline bool wxFontDialogBase::Create(wxWindow *parent, const wxFontData *data)
 #elif defined(__WXPM__)
     #include "wx/os2/fontdlg.h"
 #elif defined(__WXMAC__)
-    #include "wx/mac/fontdlg.h"
+    #include "wx/osx/fontdlg.h"
 #endif
 
 // ----------------------------------------------------------------------------
diff --git a/include/wx/frame.h b/include/wx/frame.h
index a84dbcd302..fe718971b7 100644
--- a/include/wx/frame.h
+++ b/include/wx/frame.h
@@ -263,7 +263,7 @@ protected:
     #elif defined(__WXMOTIF__)
         #include "wx/motif/frame.h"
     #elif defined(__WXMAC__)
-        #include "wx/mac/frame.h"
+        #include "wx/osx/frame.h"
     #elif defined(__WXCOCOA__)
         #include "wx/cocoa/frame.h"
     #elif defined(__WXPM__)
diff --git a/include/wx/gauge.h b/include/wx/gauge.h
index bfb9f70eb2..1e2bd61ca8 100644
--- a/include/wx/gauge.h
+++ b/include/wx/gauge.h
@@ -114,7 +114,7 @@ protected:
 #elif defined(__WXGTK__)
     #include "wx/gtk1/gauge.h"
 #elif defined(__WXMAC__)
-    #include "wx/mac/gauge.h"
+    #include "wx/osx/gauge.h"
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/gauge.h"
 #elif defined(__WXPM__)
diff --git a/include/wx/glcanvas.h b/include/wx/glcanvas.h
index 1d02f86652..4722a99a94 100644
--- a/include/wx/glcanvas.h
+++ b/include/wx/glcanvas.h
@@ -191,7 +191,7 @@ public:
 #elif defined(__WXGTK__)
     #include "wx/gtk1/glcanvas.h"
 #elif defined(__WXMAC__)
-    #include "wx/mac/glcanvas.h"
+    #include "wx/osx/glcanvas.h"
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/glcanvas.h"
 #else
diff --git a/include/wx/icon.h b/include/wx/icon.h
index 6696e9d2ce..7d5b946ca5 100644
--- a/include/wx/icon.h
+++ b/include/wx/icon.h
@@ -32,7 +32,7 @@
 #elif defined(__WXDFB__)
   #include "wx/generic/icon.h"
 #elif defined(__WXMAC__)
-  #include "wx/mac/icon.h"
+  #include "wx/osx/icon.h"
 #elif defined(__WXCOCOA__)
   #include "wx/cocoa/icon.h"
 #elif defined(__WXPM__)
diff --git a/include/wx/imaglist.h b/include/wx/imaglist.h
index 2779e3f1e5..8832ab7668 100644
--- a/include/wx/imaglist.h
+++ b/include/wx/imaglist.h
@@ -49,7 +49,7 @@ enum
 #elif defined(__WXMSW__)
     #include "wx/msw/imaglist.h"
 #elif defined(__WXMAC__)
-    #include "wx/mac/imaglist.h"
+    #include "wx/osx/imaglist.h"
 #elif defined(__WXPALMOS__)
     #include "wx/palmos/imaglist.h"
 #endif
diff --git a/include/wx/joystick.h b/include/wx/joystick.h
index 1fe2e6d55e..d29ba50b25 100644
--- a/include/wx/joystick.h
+++ b/include/wx/joystick.h
@@ -25,9 +25,9 @@
 #elif defined(__WXX11__)
 #include "wx/unix/joystick.h"
 #elif defined(__DARWIN__)
-#include "wx/mac/corefoundation/joystick.h"
+#include "wx/osx/core/joystick.h"
 #elif defined(__WXMAC__)
-#include "wx/mac/joystick.h"
+#include "wx/osx/joystick.h"
 #elif defined(__WXPM__)
 #include "wx/os2/joystick.h"
 #endif
diff --git a/include/wx/listbox.h b/include/wx/listbox.h
index b009bf3575..50d409c189 100644
--- a/include/wx/listbox.h
+++ b/include/wx/listbox.h
@@ -127,7 +127,7 @@ private:
 #elif defined(__WXGTK__)
   #include "wx/gtk1/listbox.h"
 #elif defined(__WXMAC__)
-    #include "wx/mac/listbox.h"
+    #include "wx/osx/listbox.h"
 #elif defined(__WXPM__)
     #include "wx/os2/listbox.h"
 #elif defined(__WXCOCOA__)
diff --git a/include/wx/listctrl.h b/include/wx/listctrl.h
index 8bb9adcabc..19c9cd1383 100644
--- a/include/wx/listctrl.h
+++ b/include/wx/listctrl.h
@@ -31,7 +31,7 @@ extern WXDLLIMPEXP_DATA_CORE(const char) wxListCtrlNameStr[];
 #if defined(__WIN32__) && !defined(__WXUNIVERSAL__)
     #include "wx/msw/listctrl.h"
 #elif defined(__WXMAC__) && !defined(__WXUNIVERSAL__)
-    #include "wx/mac/carbon/listctrl.h"
+    #include "wx/osx/carbon/listctrl.h"
 #else
     #include "wx/generic/listctrl.h"
 #endif
diff --git a/include/wx/mdi.h b/include/wx/mdi.h
index 29c861e101..0c12f3d871 100644
--- a/include/wx/mdi.h
+++ b/include/wx/mdi.h
@@ -27,7 +27,7 @@
 #elif defined(__WXGTK__)
     #include "wx/gtk1/mdi.h"
 #elif defined(__WXMAC__)
-    #include "wx/mac/mdi.h"
+    #include "wx/osx/mdi.h"
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/mdi.h"
 #elif defined(__WXPM__)
diff --git a/include/wx/menu.h b/include/wx/menu.h
index 8cae2e1255..c3d000a50b 100644
--- a/include/wx/menu.h
+++ b/include/wx/menu.h
@@ -532,7 +532,7 @@ protected:
 #elif defined(__WXGTK__)
     #include "wx/gtk1/menu.h"
 #elif defined(__WXMAC__)
-    #include "wx/mac/menu.h"
+    #include "wx/osx/menu.h"
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/menu.h"
 #elif defined(__WXPM__)
diff --git a/include/wx/menuitem.h b/include/wx/menuitem.h
index 1da5f65211..1f98a5d1ee 100644
--- a/include/wx/menuitem.h
+++ b/include/wx/menuitem.h
@@ -200,7 +200,7 @@ inline void wxMenuItemBase::SetText(const wxString& text) { SetItemLabel(text);
 #elif defined(__WXGTK__)
     #include "wx/gtk1/menuitem.h"
 #elif defined(__WXMAC__)
-    #include "wx/mac/menuitem.h"
+    #include "wx/osx/menuitem.h"
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/menuitem.h"
 #elif defined(__WXPM__)
diff --git a/include/wx/metafile.h b/include/wx/metafile.h
index 5005c42c3a..4d226c272c 100644
--- a/include/wx/metafile.h
+++ b/include/wx/metafile.h
@@ -54,7 +54,7 @@
 #elif defined(__WXPM__)
     #include "wx/os2/metafile.h"
 #elif defined(__WXMAC__)
-    #include "wx/mac/metafile.h"
+    #include "wx/osx/metafile.h"
 #endif
 
 #endif // wxUSE_METAFILE
diff --git a/include/wx/minifram.h b/include/wx/minifram.h
index 6c8fd679f1..3dfe581429 100644
--- a/include/wx/minifram.h
+++ b/include/wx/minifram.h
@@ -29,7 +29,7 @@
 #elif defined(__WXX11__)
 #include "wx/x11/minifram.h"
 #elif defined(__WXMAC__)
-#include "wx/mac/minifram.h"
+#include "wx/osx/minifram.h"
 #elif defined(__WXPM__)
 #include "wx/os2/minifram.h"
 #else
diff --git a/include/wx/msgdlg.h b/include/wx/msgdlg.h
index b2701d28f7..3a0174e8fb 100644
--- a/include/wx/msgdlg.h
+++ b/include/wx/msgdlg.h
@@ -126,7 +126,7 @@ protected:
 #elif defined(__WXGTK20__)
     #include "wx/gtk/msgdlg.h"
 #elif defined(__WXMAC__)
-    #include "wx/mac/msgdlg.h"
+    #include "wx/osx/msgdlg.h"
 #elif defined(__WXPM__)
     #include "wx/os2/msgdlg.h"
 #endif
diff --git a/include/wx/nonownedwnd.h b/include/wx/nonownedwnd.h
index f89c6048ee..45cb0bea41 100644
--- a/include/wx/nonownedwnd.h
+++ b/include/wx/nonownedwnd.h
@@ -15,7 +15,7 @@
 #if defined(__WXDFB__)
     #include "wx/dfb/nonownedwnd.h"
 #elif defined(__WXMAC__)
-    #include "wx/mac/nonownedwnd.h"
+    #include "wx/osx/nonownedwnd.h"
 #else
     // other ports can derive both wxTLW and wxPopupWindow directly
     // from wxWindow:
diff --git a/include/wx/notebook.h b/include/wx/notebook.h
index 3522f9f3e2..5350a11b26 100644
--- a/include/wx/notebook.h
+++ b/include/wx/notebook.h
@@ -167,7 +167,7 @@ typedef void (wxEvtHandler::*wxNotebookEventFunction)(wxNotebookEvent&);
 #elif defined(__WXGTK__)
     #include  "wx/gtk1/notebook.h"
 #elif defined(__WXMAC__)
-    #include  "wx/mac/notebook.h"
+    #include  "wx/osx/notebook.h"
 #elif defined(__WXCOCOA__)
     #include  "wx/cocoa/notebook.h"
 #elif defined(__WXPM__)
diff --git a/include/wx/osx/accel.h b/include/wx/osx/accel.h
index dcccf61a60..85996dc7a0 100644
--- a/include/wx/osx/accel.h
+++ b/include/wx/osx/accel.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/accel.h"
+#include "wx/osx/classic/accel.h"
 #else
-#include "wx/mac/carbon/accel.h"
+#include "wx/osx/carbon/accel.h"
 #endif
diff --git a/include/wx/osx/app.h b/include/wx/osx/app.h
index 9c011306b9..127c195927 100644
--- a/include/wx/osx/app.h
+++ b/include/wx/osx/app.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/app.h"
+#include "wx/osx/classic/app.h"
 #else
-#include "wx/mac/carbon/app.h"
+#include "wx/osx/carbon/app.h"
 #endif
diff --git a/include/wx/osx/bitmap.h b/include/wx/osx/bitmap.h
index 297b4b51d5..8f27f20128 100644
--- a/include/wx/osx/bitmap.h
+++ b/include/wx/osx/bitmap.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/bitmap.h"
+#include "wx/osx/classic/bitmap.h"
 #else
-#include "wx/mac/carbon/bitmap.h"
+#include "wx/osx/carbon/bitmap.h"
 #endif
diff --git a/include/wx/osx/bmpbuttn.h b/include/wx/osx/bmpbuttn.h
index 216f13de50..50a7fca286 100644
--- a/include/wx/osx/bmpbuttn.h
+++ b/include/wx/osx/bmpbuttn.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/bmpbuttn.h"
+#include "wx/osx/classic/bmpbuttn.h"
 #else
-#include "wx/mac/carbon/bmpbuttn.h"
+#include "wx/osx/carbon/bmpbuttn.h"
 #endif
diff --git a/include/wx/osx/brush.h b/include/wx/osx/brush.h
index e910b1fac7..cfc6b6afba 100644
--- a/include/wx/osx/brush.h
+++ b/include/wx/osx/brush.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/brush.h"
+#include "wx/osx/classic/brush.h"
 #else
-#include "wx/mac/carbon/brush.h"
+#include "wx/osx/carbon/brush.h"
 #endif
diff --git a/include/wx/osx/button.h b/include/wx/osx/button.h
index c6b02cfc91..0fcd3e030b 100644
--- a/include/wx/osx/button.h
+++ b/include/wx/osx/button.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/button.h"
+#include "wx/osx/classic/button.h"
 #else
-#include "wx/mac/carbon/button.h"
+#include "wx/osx/carbon/button.h"
 #endif
diff --git a/include/wx/osx/carbon/clipbrd.h b/include/wx/osx/carbon/clipbrd.h
index 973530ad29..db74c5ba46 100644
--- a/include/wx/osx/carbon/clipbrd.h
+++ b/include/wx/osx/carbon/clipbrd.h
@@ -21,7 +21,7 @@
 #include "wx/module.h"
 #include "wx/dataobj.h"     // for wxDataFormat
 
-#include "wx/mac/corefoundation/cfref.h"
+#include "wx/osx/core/cfref.h"
 
 //-----------------------------------------------------------------------------
 // wxClipboard
diff --git a/include/wx/osx/carbon/colour.h b/include/wx/osx/carbon/colour.h
index 9b1d6129d5..1406e609df 100644
--- a/include/wx/osx/carbon/colour.h
+++ b/include/wx/osx/carbon/colour.h
@@ -15,7 +15,7 @@
 #include "wx/object.h"
 #include "wx/string.h"
 
-#include "wx/mac/corefoundation/cfref.h"
+#include "wx/osx/core/cfref.h"
 
 struct RGBColor;
 
diff --git a/include/wx/osx/carbon/databrow.h b/include/wx/osx/carbon/databrow.h
index 487388b4df..6da631570e 100644
--- a/include/wx/osx/carbon/databrow.h
+++ b/include/wx/osx/carbon/databrow.h
@@ -16,7 +16,7 @@
 
 #if wxUSE_GUI
 
-#include "wx/mac/private.h"
+#include "wx/osx/private.h"
 
 WX_DEFINE_ARRAY_SIZE_T(size_t,wxArrayDataBrowserItemID);
 
diff --git a/include/wx/osx/carbon/dcmemory.h b/include/wx/osx/carbon/dcmemory.h
index c42c6544e7..7c69b01f79 100644
--- a/include/wx/osx/carbon/dcmemory.h
+++ b/include/wx/osx/carbon/dcmemory.h
@@ -12,7 +12,7 @@
 #ifndef _WX_DCMEMORY_H_
 #define _WX_DCMEMORY_H_
 
-#include "wx/mac/carbon/dcclient.h"
+#include "wx/osx/carbon/dcclient.h"
 
 class WXDLLIMPEXP_CORE wxMemoryDCImpl: public wxPaintDCImpl
 {
diff --git a/include/wx/osx/carbon/dcscreen.h b/include/wx/osx/carbon/dcscreen.h
index a97d66554e..76f1f54176 100644
--- a/include/wx/osx/carbon/dcscreen.h
+++ b/include/wx/osx/carbon/dcscreen.h
@@ -13,7 +13,7 @@
 #define _WX_DCSCREEN_H_
 
 #include "wx/dcclient.h"
-#include "wx/mac/carbon/dcclient.h"
+#include "wx/osx/carbon/dcclient.h"
 
 class WXDLLIMPEXP_CORE wxScreenDCImpl: public wxWindowDCImpl
 {
diff --git a/include/wx/osx/carbon/metafile.h b/include/wx/osx/carbon/metafile.h
index da4c864150..4421a565bf 100644
--- a/include/wx/osx/carbon/metafile.h
+++ b/include/wx/osx/carbon/metafile.h
@@ -22,7 +22,7 @@
 #include "wx/dataobj.h"
 #endif
 
-#include "wx/mac/carbon/dcclient.h"
+#include "wx/osx/carbon/dcclient.h"
 
 /*
  * Metafile and metafile device context classes
diff --git a/include/wx/osx/carbon/private.h b/include/wx/osx/carbon/private.h
index 2b9a27e04d..fbbcb3c5cd 100644
--- a/include/wx/osx/carbon/private.h
+++ b/include/wx/osx/carbon/private.h
@@ -18,8 +18,8 @@
 
 #include <Carbon/Carbon.h>
 
-#include "wx/mac/corefoundation/cfstring.h"
-#include "wx/mac/corefoundation/cfdataref.h"
+#include "wx/osx/core/cfstring.h"
+#include "wx/osx/core/cfdataref.h"
 
 #if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_5
 typedef UInt32 URefCon;
@@ -29,9 +29,9 @@ typedef SInt32 SRefCon;
 #if wxUSE_GUI
 
 #include "wx/listbox.h"
-#include "wx/mac/carbon/dc.h"
-#include "wx/mac/carbon/dcclient.h"
-#include "wx/mac/carbon/dcmemory.h"
+#include "wx/osx/carbon/dc.h"
+#include "wx/osx/carbon/dcclient.h"
+#include "wx/osx/carbon/dcmemory.h"
 
 class WXDLLIMPEXP_CORE wxMacCGContextStateSaver
 {
diff --git a/include/wx/osx/carbon/private/mactext.h b/include/wx/osx/carbon/private/mactext.h
index 2ef0cbcaed..72c7f9d2e6 100644
--- a/include/wx/osx/carbon/private/mactext.h
+++ b/include/wx/osx/carbon/private/mactext.h
@@ -12,7 +12,7 @@
 #ifndef _WX_MAC_PRIVATE_MACTEXT_H_
 #define _WX_MAC_PRIVATE_MACTEXT_H_
 
-#include "wx/mac/private.h"
+#include "wx/osx/private.h"
 
 // common interface for all implementations
 class wxMacTextControl : public wxMacControl
diff --git a/include/wx/osx/carbon/private/overlay.h b/include/wx/osx/carbon/private/overlay.h
index 002da9a338..b3b7608b03 100644
--- a/include/wx/osx/carbon/private/overlay.h
+++ b/include/wx/osx/carbon/private/overlay.h
@@ -12,7 +12,7 @@
 #ifndef _WX_MAC_CARBON_PRIVATE_OVERLAY_H_
 #define _WX_MAC_CARBON_PRIVATE_OVERLAY_H_
 
-#include "wx/mac/private.h"
+#include "wx/osx/private.h"
 #include "wx/toplevel.h"
 #include "wx/graphics.h"
 
diff --git a/include/wx/osx/carbon/uma.h b/include/wx/osx/carbon/uma.h
index 78a34d3fa3..2dbb8777c2 100644
--- a/include/wx/osx/carbon/uma.h
+++ b/include/wx/osx/carbon/uma.h
@@ -12,7 +12,7 @@
 #ifndef H_UMA
 #define H_UMA
 
-#include "wx/mac/private.h"
+#include "wx/osx/private.h"
 
 void UMAInitToolbox( UInt16 inMoreMastersCalls, bool isEmbedded) ;
 long UMAGetSystemVersion() ;
diff --git a/include/wx/osx/checkbox.h b/include/wx/osx/checkbox.h
index f7f7bf2de1..d578f6da22 100644
--- a/include/wx/osx/checkbox.h
+++ b/include/wx/osx/checkbox.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/checkbox.h"
+#include "wx/osx/classic/checkbox.h"
 #else
-#include "wx/mac/carbon/checkbox.h"
+#include "wx/osx/carbon/checkbox.h"
 #endif
diff --git a/include/wx/osx/checklst.h b/include/wx/osx/checklst.h
index 098262d5fe..81ef6c6d4b 100644
--- a/include/wx/osx/checklst.h
+++ b/include/wx/osx/checklst.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/checklst.h"
+#include "wx/osx/classic/checklst.h"
 #else
-#include "wx/mac/carbon/checklst.h"
+#include "wx/osx/carbon/checklst.h"
 #endif
diff --git a/include/wx/osx/chkconf.h b/include/wx/osx/chkconf.h
index 916c162574..94069d247f 100644
--- a/include/wx/osx/chkconf.h
+++ b/include/wx/osx/chkconf.h
@@ -28,7 +28,7 @@
 #endif /* wxUSE_STACKWALKER */
 
 #ifdef __WXMAC_CLASSIC__
-#   include "wx/mac/classic/chkconf.h"
+#   include "wx/osx/classic/chkconf.h"
 #else
-#   include "wx/mac/carbon/chkconf.h"
+#   include "wx/osx/carbon/chkconf.h"
 #endif
diff --git a/include/wx/osx/choice.h b/include/wx/osx/choice.h
index c1dc2abdda..011827b7e0 100644
--- a/include/wx/osx/choice.h
+++ b/include/wx/osx/choice.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/choice.h"
+#include "wx/osx/classic/choice.h"
 #else
-#include "wx/mac/carbon/choice.h"
+#include "wx/osx/carbon/choice.h"
 #endif
diff --git a/include/wx/osx/clipbrd.h b/include/wx/osx/clipbrd.h
index 5ee122ba68..b16d3418b1 100644
--- a/include/wx/osx/clipbrd.h
+++ b/include/wx/osx/clipbrd.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/clipbrd.h"
+#include "wx/osx/classic/clipbrd.h"
 #else
-#include "wx/mac/carbon/clipbrd.h"
+#include "wx/osx/carbon/clipbrd.h"
 #endif
diff --git a/include/wx/osx/colordlg.h b/include/wx/osx/colordlg.h
index c6a3ac6447..89f32c2195 100644
--- a/include/wx/osx/colordlg.h
+++ b/include/wx/osx/colordlg.h
@@ -1,6 +1,6 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/colordlg.h"
+#include "wx/osx/classic/colordlg.h"
 #else
-#include "wx/mac/carbon/colordlg.h"
+#include "wx/osx/carbon/colordlg.h"
 #endif
 
diff --git a/include/wx/osx/colour.h b/include/wx/osx/colour.h
index 6f42a76fa0..0a0d1c4d57 100644
--- a/include/wx/osx/colour.h
+++ b/include/wx/osx/colour.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/colour.h"
+#include "wx/osx/classic/colour.h"
 #else
-#include "wx/mac/carbon/colour.h"
+#include "wx/osx/carbon/colour.h"
 #endif
diff --git a/include/wx/osx/combobox.h b/include/wx/osx/combobox.h
index f4d0125ef4..8525d8008d 100644
--- a/include/wx/osx/combobox.h
+++ b/include/wx/osx/combobox.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/combobox.h"
+#include "wx/osx/classic/combobox.h"
 #else
-#include "wx/mac/carbon/combobox.h"
+#include "wx/osx/carbon/combobox.h"
 #endif
diff --git a/include/wx/osx/control.h b/include/wx/osx/control.h
index e98814a856..73ddfa3b65 100644
--- a/include/wx/osx/control.h
+++ b/include/wx/osx/control.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/control.h"
+#include "wx/osx/classic/control.h"
 #else
-#include "wx/mac/carbon/control.h"
+#include "wx/osx/carbon/control.h"
 #endif
diff --git a/include/wx/osx/core/cfdataref.h b/include/wx/osx/core/cfdataref.h
index 19a44d71a8..8a9d7e8c81 100644
--- a/include/wx/osx/core/cfdataref.h
+++ b/include/wx/osx/core/cfdataref.h
@@ -16,7 +16,7 @@
 #ifndef _WX_MAC_COREFOUNDATION_CFDATAREF_H__
 #define _WX_MAC_COREFOUNDATION_CFDATAREF_H__
 
-#include "wx/mac/corefoundation/cfref.h"
+#include "wx/osx/core/cfref.h"
 
 #include <CoreFoundation/CFData.h>
 
diff --git a/include/wx/osx/core/cfstring.h b/include/wx/osx/core/cfstring.h
index c4b1719c4d..523b5f3462 100644
--- a/include/wx/osx/core/cfstring.h
+++ b/include/wx/osx/core/cfstring.h
@@ -17,7 +17,7 @@
 
 #include "wx/dlimpexp.h"
 #include "wx/fontenc.h"
-#include "wx/mac/corefoundation/cfref.h"
+#include "wx/osx/core/cfref.h"
 
 class WXDLLIMPEXP_FWD_BASE wxString;
 
diff --git a/include/wx/osx/core/private.h b/include/wx/osx/core/private.h
index 9d70b22c7a..ba28408ad2 100644
--- a/include/wx/osx/core/private.h
+++ b/include/wx/osx/core/private.h
@@ -18,8 +18,8 @@
 
 #include <CoreFoundation/CoreFoundation.h>
 
-#include "wx/mac/corefoundation/cfstring.h"
-#include "wx/mac/corefoundation/cfdataref.h"
+#include "wx/osx/core/cfstring.h"
+#include "wx/osx/core/cfdataref.h"
 
 #if wxUSE_GUI
 
diff --git a/include/wx/osx/cursor.h b/include/wx/osx/cursor.h
index b0d7d2a260..157d7e20ac 100644
--- a/include/wx/osx/cursor.h
+++ b/include/wx/osx/cursor.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/cursor.h"
+#include "wx/osx/classic/cursor.h"
 #else
-#include "wx/mac/carbon/cursor.h"
+#include "wx/osx/carbon/cursor.h"
 #endif
diff --git a/include/wx/osx/dataform.h b/include/wx/osx/dataform.h
index e4a953d14a..b0c0bd7ba2 100644
--- a/include/wx/osx/dataform.h
+++ b/include/wx/osx/dataform.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/dataform.h"
+#include "wx/osx/classic/dataform.h"
 #else
-#include "wx/mac/carbon/dataform.h"
+#include "wx/osx/carbon/dataform.h"
 #endif
diff --git a/include/wx/osx/dataobj.h b/include/wx/osx/dataobj.h
index 463e151b6c..28b137f957 100644
--- a/include/wx/osx/dataobj.h
+++ b/include/wx/osx/dataobj.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/dataobj.h"
+#include "wx/osx/classic/dataobj.h"
 #else
-#include "wx/mac/carbon/dataobj.h"
+#include "wx/osx/carbon/dataobj.h"
 #endif
diff --git a/include/wx/osx/dataobj2.h b/include/wx/osx/dataobj2.h
index c03578a2ed..546577a211 100644
--- a/include/wx/osx/dataobj2.h
+++ b/include/wx/osx/dataobj2.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/dataobj2.h"
+#include "wx/osx/classic/dataobj2.h"
 #else
-#include "wx/mac/carbon/dataobj2.h"
+#include "wx/osx/carbon/dataobj2.h"
 #endif
diff --git a/include/wx/osx/dataview.h b/include/wx/osx/dataview.h
index ffae4f69ea..8c7fbf5410 100644
--- a/include/wx/osx/dataview.h
+++ b/include/wx/osx/dataview.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
 #  error "Native wxDataViewCtrl for classic environment not defined. Please use generic control."
 #else
-#  include "wx/mac/carbon/dataview.h"
+#  include "wx/osx/carbon/dataview.h"
 #endif
diff --git a/include/wx/osx/dc.h b/include/wx/osx/dc.h
index ac1e66b22e..fd1b3f8f97 100644
--- a/include/wx/osx/dc.h
+++ b/include/wx/osx/dc.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/dc.h"
+#include "wx/osx/classic/dc.h"
 #else
-#include "wx/mac/carbon/dc.h"
+#include "wx/osx/carbon/dc.h"
 #endif
diff --git a/include/wx/osx/dcclient.h b/include/wx/osx/dcclient.h
index 8f824811b2..280167a2cb 100644
--- a/include/wx/osx/dcclient.h
+++ b/include/wx/osx/dcclient.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/dcclient.h"
+#include "wx/osx/classic/dcclient.h"
 #else
-#include "wx/mac/carbon/dcclient.h"
+#include "wx/osx/carbon/dcclient.h"
 #endif
diff --git a/include/wx/osx/dcmemory.h b/include/wx/osx/dcmemory.h
index 5ae0e64a28..2b9003b3c6 100644
--- a/include/wx/osx/dcmemory.h
+++ b/include/wx/osx/dcmemory.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/dcmemory.h"
+#include "wx/osx/classic/dcmemory.h"
 #else
-#include "wx/mac/carbon/dcmemory.h"
+#include "wx/osx/carbon/dcmemory.h"
 #endif
diff --git a/include/wx/osx/dcprint.h b/include/wx/osx/dcprint.h
index 74537d6392..51b22c6c08 100644
--- a/include/wx/osx/dcprint.h
+++ b/include/wx/osx/dcprint.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/dcprint.h"
+#include "wx/osx/classic/dcprint.h"
 #else
-#include "wx/mac/carbon/dcprint.h"
+#include "wx/osx/carbon/dcprint.h"
 #endif
diff --git a/include/wx/osx/dcscreen.h b/include/wx/osx/dcscreen.h
index 8e710bed4b..13b7afb7d9 100644
--- a/include/wx/osx/dcscreen.h
+++ b/include/wx/osx/dcscreen.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/dcscreen.h"
+#include "wx/osx/classic/dcscreen.h"
 #else
-#include "wx/mac/carbon/dcscreen.h"
+#include "wx/osx/carbon/dcscreen.h"
 #endif
diff --git a/include/wx/osx/dialog.h b/include/wx/osx/dialog.h
index abc6c003ed..2ab090bbbd 100644
--- a/include/wx/osx/dialog.h
+++ b/include/wx/osx/dialog.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/dialog.h"
+#include "wx/osx/classic/dialog.h"
 #else
-#include "wx/mac/carbon/dialog.h"
+#include "wx/osx/carbon/dialog.h"
 #endif
diff --git a/include/wx/osx/dirdlg.h b/include/wx/osx/dirdlg.h
index 1861746529..689d2adf62 100644
--- a/include/wx/osx/dirdlg.h
+++ b/include/wx/osx/dirdlg.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/dirdlg.h"
+#include "wx/osx/classic/dirdlg.h"
 #else
-#include "wx/mac/carbon/dirdlg.h"
+#include "wx/osx/carbon/dirdlg.h"
 #endif
diff --git a/include/wx/osx/dnd.h b/include/wx/osx/dnd.h
index 496aa76383..7f54a209e7 100644
--- a/include/wx/osx/dnd.h
+++ b/include/wx/osx/dnd.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/dnd.h"
+#include "wx/osx/classic/dnd.h"
 #else
-#include "wx/mac/carbon/dnd.h"
+#include "wx/osx/carbon/dnd.h"
 #endif
diff --git a/include/wx/osx/evtloop.h b/include/wx/osx/evtloop.h
index 86509da311..19410d62d8 100644
--- a/include/wx/osx/evtloop.h
+++ b/include/wx/osx/evtloop.h
@@ -13,6 +13,6 @@
 #ifdef __WXMAC_CLASSIC__
     #error "wxEventLoop is not implemented for Classic build."
 #else
-    #include "wx/mac/carbon/evtloop.h"
+    #include "wx/osx/carbon/evtloop.h"
 #endif
 
diff --git a/include/wx/osx/filedlg.h b/include/wx/osx/filedlg.h
index 8ed7194bdf..7d9813366c 100644
--- a/include/wx/osx/filedlg.h
+++ b/include/wx/osx/filedlg.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/filedlg.h"
+#include "wx/osx/classic/filedlg.h"
 #else
-#include "wx/mac/carbon/filedlg.h"
+#include "wx/osx/carbon/filedlg.h"
 #endif
diff --git a/include/wx/osx/font.h b/include/wx/osx/font.h
index ae2770d072..2114906bef 100644
--- a/include/wx/osx/font.h
+++ b/include/wx/osx/font.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/font.h"
+#include "wx/osx/classic/font.h"
 #else
-#include "wx/mac/carbon/font.h"
+#include "wx/osx/carbon/font.h"
 #endif
diff --git a/include/wx/osx/fontdlg.h b/include/wx/osx/fontdlg.h
index ab9fba13ca..1c35ddb1d3 100644
--- a/include/wx/osx/fontdlg.h
+++ b/include/wx/osx/fontdlg.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/fontdlg.h"
+#include "wx/osx/classic/fontdlg.h"
 #else
-#include "wx/mac/carbon/fontdlg.h"
+#include "wx/osx/carbon/fontdlg.h"
 #endif
diff --git a/include/wx/osx/frame.h b/include/wx/osx/frame.h
index fceb903d24..2952bf36dc 100644
--- a/include/wx/osx/frame.h
+++ b/include/wx/osx/frame.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/frame.h"
+#include "wx/osx/classic/frame.h"
 #else
-#include "wx/mac/carbon/frame.h"
+#include "wx/osx/carbon/frame.h"
 #endif
diff --git a/include/wx/osx/gauge.h b/include/wx/osx/gauge.h
index cac67868fa..568eca5b75 100644
--- a/include/wx/osx/gauge.h
+++ b/include/wx/osx/gauge.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/gauge.h"
+#include "wx/osx/classic/gauge.h"
 #else
-#include "wx/mac/carbon/gauge.h"
+#include "wx/osx/carbon/gauge.h"
 #endif
diff --git a/include/wx/osx/glcanvas.h b/include/wx/osx/glcanvas.h
index 3dfff78fa3..3e63b7bf79 100644
--- a/include/wx/osx/glcanvas.h
+++ b/include/wx/osx/glcanvas.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/glcanvas.h"
+#include "wx/osx/classic/glcanvas.h"
 #else
-#include "wx/mac/carbon/glcanvas.h"
+#include "wx/osx/carbon/glcanvas.h"
 #endif
\ No newline at end of file
diff --git a/include/wx/osx/helpxxxx.h b/include/wx/osx/helpxxxx.h
index aaea7f2871..5a6a67ff63 100644
--- a/include/wx/osx/helpxxxx.h
+++ b/include/wx/osx/helpxxxx.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/helpxxxx.h"
+#include "wx/osx/classic/helpxxxx.h"
 #else
-#include "wx/mac/carbon/helpxxxx.h"
+#include "wx/osx/carbon/helpxxxx.h"
 #endif
\ No newline at end of file
diff --git a/include/wx/osx/icon.h b/include/wx/osx/icon.h
index e2be1b3f1f..8ef62dac14 100644
--- a/include/wx/osx/icon.h
+++ b/include/wx/osx/icon.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/icon.h"
+#include "wx/osx/classic/icon.h"
 #else
-#include "wx/mac/carbon/icon.h"
+#include "wx/osx/carbon/icon.h"
 #endif
diff --git a/include/wx/osx/imaglist.h b/include/wx/osx/imaglist.h
index 3dd3d032ad..2e64503699 100644
--- a/include/wx/osx/imaglist.h
+++ b/include/wx/osx/imaglist.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/imaglist.h"
+#include "wx/osx/classic/imaglist.h"
 #else
-#include "wx/mac/carbon/imaglist.h"
+#include "wx/osx/carbon/imaglist.h"
 #endif
diff --git a/include/wx/osx/joystick.h b/include/wx/osx/joystick.h
index 7614c25668..969cac9626 100644
--- a/include/wx/osx/joystick.h
+++ b/include/wx/osx/joystick.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/joystick.h"
+#include "wx/osx/classic/joystick.h"
 #else
-#include "wx/mac/carbon/joystick.h"
+#include "wx/osx/carbon/joystick.h"
 #endif
diff --git a/include/wx/osx/listbox.h b/include/wx/osx/listbox.h
index a51668a188..078ca2a4ec 100644
--- a/include/wx/osx/listbox.h
+++ b/include/wx/osx/listbox.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/listbox.h"
+#include "wx/osx/classic/listbox.h"
 #else
-#include "wx/mac/carbon/listbox.h"
+#include "wx/osx/carbon/listbox.h"
 #endif
diff --git a/include/wx/osx/listctrl.h b/include/wx/osx/listctrl.h
index be9ffdfed1..373d2e57ab 100644
--- a/include/wx/osx/listctrl.h
+++ b/include/wx/osx/listctrl.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/listctrl.h"
+#include "wx/osx/classic/listctrl.h"
 #else
-#include "wx/mac/carbon/listctrl.h"
+#include "wx/osx/carbon/listctrl.h"
 #endif
\ No newline at end of file
diff --git a/include/wx/osx/mdi.h b/include/wx/osx/mdi.h
index d8c57f9acf..1e0c1fed86 100644
--- a/include/wx/osx/mdi.h
+++ b/include/wx/osx/mdi.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/mdi.h"
+#include "wx/osx/classic/mdi.h"
 #else
-#include "wx/mac/carbon/mdi.h"
+#include "wx/osx/carbon/mdi.h"
 #endif
diff --git a/include/wx/osx/menu.h b/include/wx/osx/menu.h
index 70c1e12792..ea9cae7133 100644
--- a/include/wx/osx/menu.h
+++ b/include/wx/osx/menu.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/menu.h"
+#include "wx/osx/classic/menu.h"
 #else
-#include "wx/mac/carbon/menu.h"
+#include "wx/osx/carbon/menu.h"
 #endif
diff --git a/include/wx/osx/menuitem.h b/include/wx/osx/menuitem.h
index 3c3748cb29..5bf0c78974 100644
--- a/include/wx/osx/menuitem.h
+++ b/include/wx/osx/menuitem.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/menuitem.h"
+#include "wx/osx/classic/menuitem.h"
 #else
-#include "wx/mac/carbon/menuitem.h"
+#include "wx/osx/carbon/menuitem.h"
 #endif
diff --git a/include/wx/osx/metafile.h b/include/wx/osx/metafile.h
index fe7274d9fb..3b8d5335a2 100644
--- a/include/wx/osx/metafile.h
+++ b/include/wx/osx/metafile.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/metafile.h"
+#include "wx/osx/classic/metafile.h"
 #else
-#include "wx/mac/carbon/metafile.h"
+#include "wx/osx/carbon/metafile.h"
 #endif
diff --git a/include/wx/osx/mimetype.h b/include/wx/osx/mimetype.h
index 7195dcc61c..c45adc576b 100644
--- a/include/wx/osx/mimetype.h
+++ b/include/wx/osx/mimetype.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/mimetype.h"
+#include "wx/osx/classic/mimetype.h"
 #else
-#include "wx/mac/carbon/mimetype.h"
+#include "wx/osx/carbon/mimetype.h"
 #endif
diff --git a/include/wx/osx/minifram.h b/include/wx/osx/minifram.h
index d0035febba..3b6a719f0a 100644
--- a/include/wx/osx/minifram.h
+++ b/include/wx/osx/minifram.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/minifram.h"
+#include "wx/osx/classic/minifram.h"
 #else
-#include "wx/mac/carbon/minifram.h"
+#include "wx/osx/carbon/minifram.h"
 #endif
diff --git a/include/wx/osx/msgdlg.h b/include/wx/osx/msgdlg.h
index d3c1e31de5..2fdecde696 100644
--- a/include/wx/osx/msgdlg.h
+++ b/include/wx/osx/msgdlg.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/msgdlg.h"
+#include "wx/osx/classic/msgdlg.h"
 #else
-#include "wx/mac/carbon/msgdlg.h"
+#include "wx/osx/carbon/msgdlg.h"
 #endif
diff --git a/include/wx/osx/nonownedwnd.h b/include/wx/osx/nonownedwnd.h
index 15c53efc27..126299df5d 100644
--- a/include/wx/osx/nonownedwnd.h
+++ b/include/wx/osx/nonownedwnd.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
 #error "no implementation"
 #else
-#include "wx/mac/carbon/nonownedwnd.h"
+#include "wx/osx/carbon/nonownedwnd.h"
 #endif
\ No newline at end of file
diff --git a/include/wx/osx/notebook.h b/include/wx/osx/notebook.h
index a47ba1b171..12655a9f0c 100644
--- a/include/wx/osx/notebook.h
+++ b/include/wx/osx/notebook.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/notebook.h"
+#include "wx/osx/classic/notebook.h"
 #else
-#include "wx/mac/carbon/notebook.h"
+#include "wx/osx/carbon/notebook.h"
 #endif
diff --git a/include/wx/osx/palette.h b/include/wx/osx/palette.h
index 57e1f2ff5e..8eb1cd199e 100644
--- a/include/wx/osx/palette.h
+++ b/include/wx/osx/palette.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/palette.h"
+#include "wx/osx/classic/palette.h"
 #else
-#include "wx/mac/carbon/palette.h"
+#include "wx/osx/carbon/palette.h"
 #endif
diff --git a/include/wx/osx/pen.h b/include/wx/osx/pen.h
index 3803315a61..0307ce4a33 100644
--- a/include/wx/osx/pen.h
+++ b/include/wx/osx/pen.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/pen.h"
+#include "wx/osx/classic/pen.h"
 #else
-#include "wx/mac/carbon/pen.h"
+#include "wx/osx/carbon/pen.h"
 #endif
diff --git a/include/wx/osx/pnghand.h b/include/wx/osx/pnghand.h
index bd6e57aab9..3d02b61176 100644
--- a/include/wx/osx/pnghand.h
+++ b/include/wx/osx/pnghand.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/pnghand.h"
+#include "wx/osx/classic/pnghand.h"
 #else
-#include "wx/mac/carbon/pnghand.h"
+#include "wx/osx/carbon/pnghand.h"
 #endif
diff --git a/include/wx/osx/pngread.h b/include/wx/osx/pngread.h
index cbd51857c9..7481e1d0d2 100644
--- a/include/wx/osx/pngread.h
+++ b/include/wx/osx/pngread.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/pngread.h"
+#include "wx/osx/classic/pngread.h"
 #else
-#include "wx/mac/carbon/pngread.h"
+#include "wx/osx/carbon/pngread.h"
 #endif
diff --git a/include/wx/osx/popupwin.h b/include/wx/osx/popupwin.h
index e230fccf5f..8c7eed39a8 100644
--- a/include/wx/osx/popupwin.h
+++ b/include/wx/osx/popupwin.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
 #error "wxPopupWindow is not supported under this platform."
 #else
-#include "wx/mac/carbon/popupwin.h"
+#include "wx/osx/carbon/popupwin.h"
 #endif
diff --git a/include/wx/osx/printdlg.h b/include/wx/osx/printdlg.h
index b3ff46f8ca..cbe2742dda 100644
--- a/include/wx/osx/printdlg.h
+++ b/include/wx/osx/printdlg.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/printdlg.h"
+#include "wx/osx/classic/printdlg.h"
 #else
-#include "wx/mac/carbon/printdlg.h"
+#include "wx/osx/carbon/printdlg.h"
 #endif
diff --git a/include/wx/osx/printmac.h b/include/wx/osx/printmac.h
index b267cd33cf..32c598a854 100644
--- a/include/wx/osx/printmac.h
+++ b/include/wx/osx/printmac.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/printmac.h"
+#include "wx/osx/classic/printmac.h"
 #else
-#include "wx/mac/carbon/printmac.h"
+#include "wx/osx/carbon/printmac.h"
 #endif
diff --git a/include/wx/osx/private.h b/include/wx/osx/private.h
index 75cf558a22..ce2ed5c6f8 100644
--- a/include/wx/osx/private.h
+++ b/include/wx/osx/private.h
@@ -1,7 +1,7 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/private.h"
+#include "wx/osx/classic/private.h"
 #elif defined(__WXOSX_IPHONE__)
-#include "wx/mac/corefoundation/private.h"
+#include "wx/osx/core/private.h"
 #else
-#include "wx/mac/carbon/private.h"
+#include "wx/osx/carbon/private.h"
 #endif
diff --git a/include/wx/osx/private/print.h b/include/wx/osx/private/print.h
index 99e4aad109..6f33d3ba17 100644
--- a/include/wx/osx/private/print.h
+++ b/include/wx/osx/private/print.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/private/print.h"
+#include "wx/osx/classic/private/print.h"
 #else
-#include "wx/mac/carbon/private/print.h"
+#include "wx/osx/carbon/private/print.h"
 #endif
diff --git a/include/wx/osx/private/timer.h b/include/wx/osx/private/timer.h
index 4532e42f54..024f6d88ee 100644
--- a/include/wx/osx/private/timer.h
+++ b/include/wx/osx/private/timer.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/private/timer.h"
+#include "wx/osx/classic/private/timer.h"
 #else
-#include "wx/mac/carbon/private/timer.h"
+#include "wx/osx/carbon/private/timer.h"
 #endif
diff --git a/include/wx/osx/radiobox.h b/include/wx/osx/radiobox.h
index 752554dff0..3378811c57 100644
--- a/include/wx/osx/radiobox.h
+++ b/include/wx/osx/radiobox.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/radiobox.h"
+#include "wx/osx/classic/radiobox.h"
 #else
-#include "wx/mac/carbon/radiobox.h"
+#include "wx/osx/carbon/radiobox.h"
 #endif
diff --git a/include/wx/osx/radiobut.h b/include/wx/osx/radiobut.h
index 14ec77d4db..ff66c40e65 100644
--- a/include/wx/osx/radiobut.h
+++ b/include/wx/osx/radiobut.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/radiobut.h"
+#include "wx/osx/classic/radiobut.h"
 #else
-#include "wx/mac/carbon/radiobut.h"
+#include "wx/osx/carbon/radiobut.h"
 #endif
diff --git a/include/wx/osx/region.h b/include/wx/osx/region.h
index 2bdcd52252..8109c46c54 100644
--- a/include/wx/osx/region.h
+++ b/include/wx/osx/region.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/region.h"
+#include "wx/osx/classic/region.h"
 #else
-#include "wx/mac/carbon/region.h"
+#include "wx/osx/carbon/region.h"
 #endif
diff --git a/include/wx/osx/scrolbar.h b/include/wx/osx/scrolbar.h
index 90bf27701e..135678af82 100644
--- a/include/wx/osx/scrolbar.h
+++ b/include/wx/osx/scrolbar.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/scrolbar.h"
+#include "wx/osx/classic/scrolbar.h"
 #else
-#include "wx/mac/carbon/scrolbar.h"
+#include "wx/osx/carbon/scrolbar.h"
 #endif
diff --git a/include/wx/osx/slider.h b/include/wx/osx/slider.h
index 679c7db5de..6409c36fef 100644
--- a/include/wx/osx/slider.h
+++ b/include/wx/osx/slider.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/slider.h"
+#include "wx/osx/classic/slider.h"
 #else
-#include "wx/mac/carbon/slider.h"
+#include "wx/osx/carbon/slider.h"
 #endif
diff --git a/include/wx/osx/sound.h b/include/wx/osx/sound.h
index b282748a9a..9288010a41 100644
--- a/include/wx/osx/sound.h
+++ b/include/wx/osx/sound.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/sound.h"
+#include "wx/osx/classic/sound.h"
 #else
-#include "wx/mac/carbon/sound.h"
+#include "wx/osx/carbon/sound.h"
 #endif
diff --git a/include/wx/osx/spinbutt.h b/include/wx/osx/spinbutt.h
index af5d5ef1a6..395b540c4d 100644
--- a/include/wx/osx/spinbutt.h
+++ b/include/wx/osx/spinbutt.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/spinbutt.h"
+#include "wx/osx/classic/spinbutt.h"
 #else
-#include "wx/mac/carbon/spinbutt.h"
+#include "wx/osx/carbon/spinbutt.h"
 #endif
diff --git a/include/wx/osx/spinctrl.h b/include/wx/osx/spinctrl.h
index 77da03667c..11d6944b79 100644
--- a/include/wx/osx/spinctrl.h
+++ b/include/wx/osx/spinctrl.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/spinctrl.h"
+#include "wx/osx/classic/spinctrl.h"
 #else
-#include "wx/mac/carbon/spinctrl.h"
+#include "wx/osx/carbon/spinctrl.h"
 #endif
diff --git a/include/wx/osx/srchctrl.h b/include/wx/osx/srchctrl.h
index 91f957a521..90b98e03b4 100644
--- a/include/wx/osx/srchctrl.h
+++ b/include/wx/osx/srchctrl.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
 #include "wx/generic/srchctlg.h"
 #else
-#include "wx/mac/carbon/srchctrl.h"
+#include "wx/osx/carbon/srchctrl.h"
 #endif
diff --git a/include/wx/osx/statbmp.h b/include/wx/osx/statbmp.h
index 6db8aa80ae..01cb68184b 100644
--- a/include/wx/osx/statbmp.h
+++ b/include/wx/osx/statbmp.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/statbmp.h"
+#include "wx/osx/classic/statbmp.h"
 #else
-#include "wx/mac/carbon/statbmp.h"
+#include "wx/osx/carbon/statbmp.h"
 #endif
diff --git a/include/wx/osx/statbox.h b/include/wx/osx/statbox.h
index b0cbc8774c..93b0313f7f 100644
--- a/include/wx/osx/statbox.h
+++ b/include/wx/osx/statbox.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/statbox.h"
+#include "wx/osx/classic/statbox.h"
 #else
-#include "wx/mac/carbon/statbox.h"
+#include "wx/osx/carbon/statbox.h"
 #endif
diff --git a/include/wx/osx/statline.h b/include/wx/osx/statline.h
index 68324363ed..416ee24a1c 100644
--- a/include/wx/osx/statline.h
+++ b/include/wx/osx/statline.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/statline.h"
+#include "wx/osx/classic/statline.h"
 #else
-#include "wx/mac/carbon/statline.h"
+#include "wx/osx/carbon/statline.h"
 #endif
diff --git a/include/wx/osx/stattext.h b/include/wx/osx/stattext.h
index 4e57c31441..9588f24832 100644
--- a/include/wx/osx/stattext.h
+++ b/include/wx/osx/stattext.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/stattext.h"
+#include "wx/osx/classic/stattext.h"
 #else
-#include "wx/mac/carbon/stattext.h"
+#include "wx/osx/carbon/stattext.h"
 #endif
diff --git a/include/wx/osx/statusbr.h b/include/wx/osx/statusbr.h
index 01e17c5667..8d04cca4f6 100644
--- a/include/wx/osx/statusbr.h
+++ b/include/wx/osx/statusbr.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/statusbr.h"
+#include "wx/osx/classic/statusbr.h"
 #else
-#include "wx/mac/carbon/statusbr.h"
+#include "wx/osx/carbon/statusbr.h"
 #endif
diff --git a/include/wx/osx/tabctrl.h b/include/wx/osx/tabctrl.h
index 356b4a9e46..47742c1677 100644
--- a/include/wx/osx/tabctrl.h
+++ b/include/wx/osx/tabctrl.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/tabctrl.h"
+#include "wx/osx/classic/tabctrl.h"
 #else
-#include "wx/mac/carbon/tabctrl.h"
+#include "wx/osx/carbon/tabctrl.h"
 #endif
diff --git a/include/wx/osx/taskbarosx.h b/include/wx/osx/taskbarosx.h
index 07815224cb..4e893ad54f 100644
--- a/include/wx/osx/taskbarosx.h
+++ b/include/wx/osx/taskbarosx.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/taskbarosx.h"
+#include "wx/osx/classic/taskbarosx.h"
 #else
-#include "wx/mac/carbon/taskbarosx.h"
+#include "wx/osx/carbon/taskbarosx.h"
 #endif
diff --git a/include/wx/osx/textctrl.h b/include/wx/osx/textctrl.h
index fe1bd4caea..3edbf1504c 100644
--- a/include/wx/osx/textctrl.h
+++ b/include/wx/osx/textctrl.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/textctrl.h"
+#include "wx/osx/classic/textctrl.h"
 #else
-#include "wx/mac/carbon/textctrl.h"
+#include "wx/osx/carbon/textctrl.h"
 #endif
diff --git a/include/wx/osx/tglbtn.h b/include/wx/osx/tglbtn.h
index c7104ac928..17f082b5d2 100644
--- a/include/wx/osx/tglbtn.h
+++ b/include/wx/osx/tglbtn.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/tglbtn.h"
+#include "wx/osx/classic/tglbtn.h"
 #else
-#include "wx/mac/carbon/tglbtn.h"
+#include "wx/osx/carbon/tglbtn.h"
 #endif
\ No newline at end of file
diff --git a/include/wx/osx/toolbar.h b/include/wx/osx/toolbar.h
index 8f553dbdb3..018be6a424 100644
--- a/include/wx/osx/toolbar.h
+++ b/include/wx/osx/toolbar.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/toolbar.h"
+#include "wx/osx/classic/toolbar.h"
 #else
-#include "wx/mac/carbon/toolbar.h"
+#include "wx/osx/carbon/toolbar.h"
 #endif
diff --git a/include/wx/osx/tooltip.h b/include/wx/osx/tooltip.h
index 46a0bf8180..0e46d17005 100644
--- a/include/wx/osx/tooltip.h
+++ b/include/wx/osx/tooltip.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/tooltip.h"
+#include "wx/osx/classic/tooltip.h"
 #else
-#include "wx/mac/carbon/tooltip.h"
+#include "wx/osx/carbon/tooltip.h"
 #endif
diff --git a/include/wx/osx/toplevel.h b/include/wx/osx/toplevel.h
index fbc25b5623..108a842c30 100644
--- a/include/wx/osx/toplevel.h
+++ b/include/wx/osx/toplevel.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/toplevel.h"
+#include "wx/osx/classic/toplevel.h"
 #else
-#include "wx/mac/carbon/toplevel.h"
+#include "wx/osx/carbon/toplevel.h"
 #endif
diff --git a/include/wx/osx/treectrl.h b/include/wx/osx/treectrl.h
index 09a33f0dae..431a17775c 100644
--- a/include/wx/osx/treectrl.h
+++ b/include/wx/osx/treectrl.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/treectl.h"
+#include "wx/osx/classic/treectl.h"
 #else
-#include "wx/mac/carbon/treectrl.h"
+#include "wx/osx/carbon/treectrl.h"
 #endif
\ No newline at end of file
diff --git a/include/wx/osx/uma.h b/include/wx/osx/uma.h
index 16995b9c47..46ded9e42b 100644
--- a/include/wx/osx/uma.h
+++ b/include/wx/osx/uma.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/uma.h"
+#include "wx/osx/classic/uma.h"
 #else
-#include "wx/mac/carbon/uma.h"
+#include "wx/osx/carbon/uma.h"
 #endif
diff --git a/include/wx/osx/window.h b/include/wx/osx/window.h
index 14b131e37b..ccd9b71b61 100644
--- a/include/wx/osx/window.h
+++ b/include/wx/osx/window.h
@@ -1,5 +1,5 @@
 #ifdef __WXMAC_CLASSIC__
-#include "wx/mac/classic/window.h"
+#include "wx/osx/classic/window.h"
 #else
-#include "wx/mac/carbon/window.h"
+#include "wx/osx/carbon/window.h"
 #endif
diff --git a/include/wx/palette.h b/include/wx/palette.h
index 8f9183cdfb..02edb405b5 100644
--- a/include/wx/palette.h
+++ b/include/wx/palette.h
@@ -39,7 +39,7 @@ public:
 #elif defined(__WXMGL__)
     #include "wx/mgl/palette.h"
 #elif defined(__WXMAC__)
-    #include "wx/mac/palette.h"
+    #include "wx/osx/palette.h"
 #elif defined(__WXPM__)
     #include "wx/os2/palette.h"
 #endif
diff --git a/include/wx/pen.h b/include/wx/pen.h
index 36c2bd1f7a..53069c51e5 100644
--- a/include/wx/pen.h
+++ b/include/wx/pen.h
@@ -106,7 +106,7 @@ public:
 #elif defined(__WXDFB__)
 #include "wx/dfb/pen.h"
 #elif defined(__WXMAC__)
-#include "wx/mac/pen.h"
+#include "wx/osx/pen.h"
 #elif defined(__WXCOCOA__)
 #include "wx/cocoa/pen.h"
 #elif defined(__WXPM__)
diff --git a/include/wx/platform.h b/include/wx/platform.h
index f64a2d2f67..8c7faf3b32 100644
--- a/include/wx/platform.h
+++ b/include/wx/platform.h
@@ -41,7 +41,9 @@
 
 #ifdef __WXOSX__
 /* for backwards compatibility of code (including our own) define __WXMAC__ */
+#ifndef __WXMAC__
 #define __WXMAC__
+#endif
 /* setup precise defines according to sdk used */
 #   include <TargetConditionals.h>
 #   if defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE
@@ -100,7 +102,7 @@
 #        include <unistd.h>
 #        include <TargetConditionals.h>
 #        include <AvailabilityMacros.h>
-#        include "wx/mac/config_xcode.h"
+#        include "wx/osx/config_xcode.h"
 #    endif
 #endif
 /*
diff --git a/include/wx/popupwin.h b/include/wx/popupwin.h
index 6e10cc2c36..372bf523d4 100644
--- a/include/wx/popupwin.h
+++ b/include/wx/popupwin.h
@@ -69,7 +69,7 @@ public:
 #elif defined(__WXMGL__)
     #include "wx/mgl/popupwin.h"
 #elif defined(__WXMAC__)
-    #include "wx/mac/popupwin.h"
+    #include "wx/osx/popupwin.h"
 #else
     #error "wxPopupWindow is not supported under this platform."
 #endif
diff --git a/include/wx/print.h b/include/wx/print.h
index ef851dde8c..12160a8e1a 100644
--- a/include/wx/print.h
+++ b/include/wx/print.h
@@ -22,7 +22,7 @@
 
 #elif defined(__WXMAC__)
 
-#include "wx/mac/printmac.h"
+#include "wx/osx/printmac.h"
 
 #elif defined(__WXPM__)
 
diff --git a/include/wx/private/overlay.h b/include/wx/private/overlay.h
index 2f04ec6157..fa6b3dbe07 100644
--- a/include/wx/private/overlay.h
+++ b/include/wx/private/overlay.h
@@ -17,7 +17,7 @@
 #ifdef wxHAS_NATIVE_OVERLAY
 
 #if defined(__WXMAC__)
-    #include "wx/mac/carbon/private/overlay.h"
+    #include "wx/osx/carbon/private/overlay.h"
 #elif defined(__WXDFB__)
     #include "wx/dfb/private/overlay.h"
 #else
diff --git a/include/wx/radiobox.h b/include/wx/radiobox.h
index 153927aec8..f8d1a6ef48 100644
--- a/include/wx/radiobox.h
+++ b/include/wx/radiobox.h
@@ -160,7 +160,7 @@ private:
 #elif defined(__WXGTK__)
     #include "wx/gtk1/radiobox.h"
 #elif defined(__WXMAC__)
-    #include "wx/mac/radiobox.h"
+    #include "wx/osx/radiobox.h"
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/radiobox.h"
 #elif defined(__WXPM__)
diff --git a/include/wx/radiobut.h b/include/wx/radiobut.h
index 33b04ef936..44e24d0234 100644
--- a/include/wx/radiobut.h
+++ b/include/wx/radiobut.h
@@ -46,7 +46,7 @@ extern WXDLLIMPEXP_DATA_CORE(const char) wxRadioButtonNameStr[];
 #elif defined(__WXGTK__)
     #include "wx/gtk1/radiobut.h"
 #elif defined(__WXMAC__)
-    #include "wx/mac/radiobut.h"
+    #include "wx/osx/radiobut.h"
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/radiobut.h"
 #elif defined(__WXPM__)
diff --git a/include/wx/region.h b/include/wx/region.h
index 1b1f627953..a4cf196b07 100644
--- a/include/wx/region.h
+++ b/include/wx/region.h
@@ -228,7 +228,7 @@ protected:
 #elif defined(__WXDFB__)
     #include "wx/dfb/region.h"
 #elif defined(__WXMAC__)
-    #include "wx/mac/region.h"
+    #include "wx/osx/region.h"
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/region.h"
 #elif defined(__WXPM__)
diff --git a/include/wx/scrolbar.h b/include/wx/scrolbar.h
index 868c0ff593..4fd9e3d064 100644
--- a/include/wx/scrolbar.h
+++ b/include/wx/scrolbar.h
@@ -70,7 +70,7 @@ private:
 #elif defined(__WXGTK__)
     #include "wx/gtk1/scrolbar.h"
 #elif defined(__WXMAC__)
-    #include "wx/mac/scrolbar.h"
+    #include "wx/osx/scrolbar.h"
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/scrolbar.h"
 #elif defined(__WXPM__)
diff --git a/include/wx/slider.h b/include/wx/slider.h
index 6294fabc1a..7a92223486 100644
--- a/include/wx/slider.h
+++ b/include/wx/slider.h
@@ -136,7 +136,7 @@ private:
 #elif defined(__WXGTK__)
     #include "wx/gtk1/slider.h"
 #elif defined(__WXMAC__)
-    #include "wx/mac/slider.h"
+    #include "wx/osx/slider.h"
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/slider.h"
 #elif defined(__WXPM__)
diff --git a/include/wx/sound.h b/include/wx/sound.h
index a0c780488f..380baf2f1d 100644
--- a/include/wx/sound.h
+++ b/include/wx/sound.h
@@ -60,7 +60,7 @@ protected:
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/sound.h"
 #elif defined(__WXMAC__)
-    #include "wx/mac/sound.h"
+    #include "wx/osx/sound.h"
 #elif defined(__WXPM__)
     #include "wx/os2/sound.h"
 #elif defined(__UNIX__)
diff --git a/include/wx/spinbutt.h b/include/wx/spinbutt.h
index 820e8c33b4..feec6b791c 100644
--- a/include/wx/spinbutt.h
+++ b/include/wx/spinbutt.h
@@ -83,7 +83,7 @@ protected:
 #elif defined(__WXGTK__)
     #include "wx/gtk1/spinbutt.h"
 #elif defined(__WXMAC__)
-    #include "wx/mac/spinbutt.h"
+    #include "wx/osx/spinbutt.h"
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/spinbutt.h"
 #elif defined(__WXPM__)
diff --git a/include/wx/spinctrl.h b/include/wx/spinctrl.h
index 5c00f53410..76c4a3f552 100644
--- a/include/wx/spinctrl.h
+++ b/include/wx/spinctrl.h
@@ -126,7 +126,7 @@ typedef void (wxEvtHandler::*wxSpinDoubleEventFunction)(wxSpinDoubleEvent&);
     #include "wx/gtk1/spinctrl.h"
 #elif defined(__WXMAC__)
     #define wxHAS_NATIVE_SPINCTRL
-    #include "wx/mac/spinctrl.h"
+    #include "wx/osx/spinctrl.h"
 #endif // platform
 
 #if !defined(wxHAS_NATIVE_SPINCTRL) || !defined(wxHAS_NATIVE_SPINCTRLDOUBLE)
diff --git a/include/wx/srchctrl.h b/include/wx/srchctrl.h
index 32cc614d95..17e18884dc 100644
--- a/include/wx/srchctrl.h
+++ b/include/wx/srchctrl.h
@@ -70,7 +70,7 @@ public:
 // include the platform-dependent class implementation
 #if wxUSE_NATIVE_SEARCH_CONTROL
     #if defined(__WXMAC__)
-        #include "wx/mac/srchctrl.h"
+        #include "wx/osx/srchctrl.h"
     #endif
 #else
     #include "wx/generic/srchctlg.h"
diff --git a/include/wx/statbmp.h b/include/wx/statbmp.h
index 72934c25e6..9278aa0974 100644
--- a/include/wx/statbmp.h
+++ b/include/wx/statbmp.h
@@ -64,7 +64,7 @@ protected:
 #elif defined(__WXGTK__)
     #include "wx/gtk1/statbmp.h"
 #elif defined(__WXMAC__)
-    #include "wx/mac/statbmp.h"
+    #include "wx/osx/statbmp.h"
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/statbmp.h"
 #elif defined(__WXPM__)
diff --git a/include/wx/statbox.h b/include/wx/statbox.h
index e8f48c3eb3..203790654a 100644
--- a/include/wx/statbox.h
+++ b/include/wx/statbox.h
@@ -64,7 +64,7 @@ protected:
 #elif defined(__WXGTK__)
     #include "wx/gtk1/statbox.h"
 #elif defined(__WXMAC__)
-    #include "wx/mac/statbox.h"
+    #include "wx/osx/statbox.h"
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/statbox.h"
 #elif defined(__WXPM__)
diff --git a/include/wx/statline.h b/include/wx/statline.h
index 8b36eb4c8c..9cdd7ffd2e 100644
--- a/include/wx/statline.h
+++ b/include/wx/statline.h
@@ -94,7 +94,7 @@ protected:
 #elif defined(__WXPM__)
     #include "wx/os2/statline.h"
 #elif defined(__WXMAC__)
-    #include "wx/mac/statline.h"
+    #include "wx/osx/statline.h"
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/statline.h"
 #else // use generic implementation for all other platforms
diff --git a/include/wx/stattext.h b/include/wx/stattext.h
index e6e38f1da4..d23d88d4c1 100644
--- a/include/wx/stattext.h
+++ b/include/wx/stattext.h
@@ -111,7 +111,7 @@ private:
 #elif defined(__WXGTK__)
     #include "wx/gtk1/stattext.h"
 #elif defined(__WXMAC__)
-    #include "wx/mac/stattext.h"
+    #include "wx/osx/stattext.h"
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/stattext.h"
 #elif defined(__WXPM__)
diff --git a/include/wx/statusbr.h b/include/wx/statusbr.h
index f75d053720..bccef6f403 100644
--- a/include/wx/statusbr.h
+++ b/include/wx/statusbr.h
@@ -163,7 +163,7 @@ protected:
     #define wxStatusBarMac wxStatusBar
 
     #include "wx/generic/statusbr.h"
-    #include "wx/mac/statusbr.h"
+    #include "wx/osx/statusbr.h"
 #else
     #define wxStatusBarGeneric wxStatusBar
 
diff --git a/include/wx/stdpaths.h b/include/wx/stdpaths.h
index 999720d3ac..f32d6ee958 100644
--- a/include/wx/stdpaths.h
+++ b/include/wx/stdpaths.h
@@ -169,7 +169,7 @@ protected:
         #define wxHAS_NATIVE_STDPATHS
     // We want CoreFoundation paths on both CarbonLib and Darwin (for all ports)
     #elif defined(__WXMAC__) || defined(__DARWIN__)
-        #include "wx/mac/corefoundation/stdpaths.h"
+        #include "wx/osx/core/stdpaths.h"
         #define wxHAS_NATIVE_STDPATHS
     #elif defined(__OS2__)
         #include "wx/os2/stdpaths.h"
diff --git a/include/wx/tabctrl.h b/include/wx/tabctrl.h
index 4337e4eb8f..4bbf65eaf2 100644
--- a/include/wx/tabctrl.h
+++ b/include/wx/tabctrl.h
@@ -22,7 +22,7 @@ extern WXDLLIMPEXP_CORE const wxEventType wxEVT_COMMAND_TAB_SEL_CHANGING;
 #if defined(__WXMSW__)
     #include "wx/msw/tabctrl.h"
 #elif defined(__WXMAC__)
-    #include "wx/mac/tabctrl.h"
+    #include "wx/osx/tabctrl.h"
 #elif defined(__WXPM__)
     #include "wx/os2/tabctrl.h"
 #endif
diff --git a/include/wx/taskbar.h b/include/wx/taskbar.h
index 96eef52049..f3dedd4b6e 100644
--- a/include/wx/taskbar.h
+++ b/include/wx/taskbar.h
@@ -62,7 +62,7 @@ private:
 #elif defined(__WXGTK__) || defined(__WXX11__) || defined(__WXMOTIF__)
     #include "wx/unix/taskbarx11.h"
 #elif defined (__WXMAC__)
-    #include "wx/mac/taskbarosx.h"
+    #include "wx/osx/taskbarosx.h"
 #elif defined (__WXCOCOA__)
     #include "wx/cocoa/taskbar.h"
 #endif
diff --git a/include/wx/textctrl.h b/include/wx/textctrl.h
index 952862d44e..0aae25a479 100644
--- a/include/wx/textctrl.h
+++ b/include/wx/textctrl.h
@@ -688,7 +688,7 @@ protected:
 #elif defined(__WXGTK__)
     #include "wx/gtk1/textctrl.h"
 #elif defined(__WXMAC__)
-    #include "wx/mac/textctrl.h"
+    #include "wx/osx/textctrl.h"
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/textctrl.h"
 #elif defined(__WXPM__)
diff --git a/include/wx/tglbtn.h b/include/wx/tglbtn.h
index e4ab3394dc..ccb80dce96 100644
--- a/include/wx/tglbtn.h
+++ b/include/wx/tglbtn.h
@@ -83,7 +83,7 @@ protected:
 # elif defined(__WXMOTIF__)
     #include "wx/motif/tglbtn.h"
 #elif defined(__WXMAC__)
-    #include "wx/mac/tglbtn.h"
+    #include "wx/osx/tglbtn.h"
 #elif defined(__WXPALMOS__)
     #include "wx/palmos/tglbtn.h"
 #elif defined(__WXPM__)
diff --git a/include/wx/toolbar.h b/include/wx/toolbar.h
index cb1c66eb45..0fec2feea7 100644
--- a/include/wx/toolbar.h
+++ b/include/wx/toolbar.h
@@ -81,7 +81,7 @@ enum
     #elif defined(__WXGTK__)
         #include "wx/gtk1/tbargtk.h"
     #elif defined(__WXMAC__)
-       #include "wx/mac/toolbar.h"
+       #include "wx/osx/toolbar.h"
     #elif defined(__WXCOCOA__)
        #include "wx/cocoa/toolbar.h"
     #elif defined(__WXPM__)
diff --git a/include/wx/tooltip.h b/include/wx/tooltip.h
index 0e4ed84c8b..4f9af4be4b 100644
--- a/include/wx/tooltip.h
+++ b/include/wx/tooltip.h
@@ -25,7 +25,7 @@
 #elif defined(__WXGTK__)
 #include "wx/gtk1/tooltip.h"
 #elif defined(__WXMAC__)
-#include "wx/mac/tooltip.h"
+#include "wx/osx/tooltip.h"
 #elif defined(__WXCOCOA__)
 #include "wx/cocoa/tooltip.h"
 #elif defined(__WXPM__)
diff --git a/include/wx/toplevel.h b/include/wx/toplevel.h
index 3a63759cbc..2421a6eb23 100644
--- a/include/wx/toplevel.h
+++ b/include/wx/toplevel.h
@@ -328,7 +328,7 @@ protected:
     #include "wx/dfb/toplevel.h"
     #define wxTopLevelWindowNative wxTopLevelWindowDFB
 #elif defined(__WXMAC__)
-    #include "wx/mac/toplevel.h"
+    #include "wx/osx/toplevel.h"
     #define wxTopLevelWindowNative wxTopLevelWindowMac
 #elif defined(__WXCOCOA__)
     #include "wx/cocoa/toplevel.h"
diff --git a/include/wx/window.h b/include/wx/window.h
index ae6b8d1661..fc3f46dbc0 100644
--- a/include/wx/window.h
+++ b/include/wx/window.h
@@ -1709,7 +1709,7 @@ inline void wxWindowBase::SetInitialBestSize(const wxSize& size)
     #else // !wxUniv
         #define wxWindowMac wxWindow
     #endif // wxUniv
-    #include "wx/mac/window.h"
+    #include "wx/osx/window.h"
 #elif defined(__WXCOCOA__)
     #ifdef __WXUNIVERSAL__
         #define wxWindowNative wxWindowCocoa