Re-organize OS X and iOS code in vcl a bit

Now with the ATSUI code gone is a good time for some
re-organisation. Get rid of "aqua" in file names and the separate
"coretext" folders. CoreText is all we use now for OS X (and has
always been so for iOS), so no need for a "coretext" folder, we can
keep the CoreText-using code under "quartz". Keep OS X -specific code
in "osx". Ditto for headers.

Keep "Aqua" as part of class names for now, though.

This is also preparation for planned further unification between OS X
and iOS code.

Change-Id: Ic60bd73fea4ab98183e7c8a09c7d3f66b9a34223

215 files changed, 532 insertions, 529 deletions

diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox
index 3463a05fde14..3d916e67d8ae 100644
--- a/include/sal/log-areas.dox
+++ b/include/sal/log-areas.dox
@@ -346,6 +346,7 @@ certain functionality.
 @li @c vcl.kde4 - KDE4
 @li @c vcl.layout - Widget layout
 @li @c vcl.plugadapt - the Unix/X11 backend plugin mechanism
+@li @c vcl.osx.print
 @li @c vcl.scrollbar - Scroll Bars
 @li @c vcl.sm - Session Manager
 @li @c vcl.unity
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index fb7816f79070..72d665a72920 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -341,9 +341,9 @@ vcl_quartz_code= \
     vcl/quartz/utils \
 
 vcl_coretext_code= \
-    vcl/coretext/ctfonts \
-    vcl/coretext/ctlayout \
-    vcl/coretext/salgdi \
+    vcl/quartz/ctfonts \
+    vcl/quartz/ctlayout \
+    vcl/quartz/salgdi \
 
 # GUIBASE specific stuff
 
@@ -366,68 +366,68 @@ $(eval $(call gb_Library_use_system_darwin_frameworks,vcl,\
 ))
 
 $(eval $(call gb_Library_add_objcxxobjects,vcl,\
-    vcl/aqua/source/a11y/aqua11yactionwrapper \
-    vcl/aqua/source/a11y/aqua11ycomponentwrapper \
-    vcl/aqua/source/a11y/aqua11yfactory \
-    vcl/aqua/source/a11y/aqua11yrolehelper \
-    vcl/aqua/source/a11y/aqua11yselectionwrapper \
-    vcl/aqua/source/a11y/aqua11ytablewrapper \
-    vcl/aqua/source/a11y/aqua11ytextattributeswrapper \
-    vcl/aqua/source/a11y/aqua11ytextwrapper \
-    vcl/aqua/source/a11y/aqua11yutil \
-    vcl/aqua/source/a11y/aqua11yvaluewrapper \
-    vcl/aqua/source/a11y/aqua11ywrapper \
-    vcl/aqua/source/a11y/aqua11ywrapperbutton \
-    vcl/aqua/source/a11y/aqua11ywrappercheckbox \
-    vcl/aqua/source/a11y/aqua11ywrappercombobox \
-    vcl/aqua/source/a11y/aqua11ywrappergroup \
-    vcl/aqua/source/a11y/aqua11ywrapperlist \
-    vcl/aqua/source/a11y/aqua11ywrapperradiobutton \
-    vcl/aqua/source/a11y/aqua11ywrapperradiogroup \
-    vcl/aqua/source/a11y/aqua11ywrapperrow \
-    vcl/aqua/source/a11y/aqua11ywrapperscrollarea \
-    vcl/aqua/source/a11y/aqua11ywrapperscrollbar \
-    vcl/aqua/source/a11y/aqua11ywrappersplitter \
-    vcl/aqua/source/a11y/aqua11ywrapperstatictext \
-    vcl/aqua/source/a11y/aqua11ywrappertabgroup \
-    vcl/aqua/source/a11y/aqua11ywrappertextarea \
-    vcl/aqua/source/a11y/aqua11ywrappertoolbar \
-    vcl/aqua/source/app/salnstimer \
-    vcl/aqua/source/app/vclnsapp \
-    vcl/aqua/source/gdi/aquaprintaccessoryview \
-    vcl/aqua/source/gdi/aquaprintview \
-    vcl/aqua/source/window/salframeview \
-    vcl/aqua/source/window/salnsmenu \
+    vcl/osx/a11yactionwrapper \
+    vcl/osx/a11ycomponentwrapper \
+    vcl/osx/a11yfactory \
+    vcl/osx/a11yrolehelper \
+    vcl/osx/a11yselectionwrapper \
+    vcl/osx/a11ytablewrapper \
+    vcl/osx/a11ytextattributeswrapper \
+    vcl/osx/a11ytextwrapper \
+    vcl/osx/a11yutil \
+    vcl/osx/a11yvaluewrapper \
+    vcl/osx/a11ywrapper \
+    vcl/osx/a11ywrapperbutton \
+    vcl/osx/a11ywrappercheckbox \
+    vcl/osx/a11ywrappercombobox \
+    vcl/osx/a11ywrappergroup \
+    vcl/osx/a11ywrapperlist \
+    vcl/osx/a11ywrapperradiobutton \
+    vcl/osx/a11ywrapperradiogroup \
+    vcl/osx/a11ywrapperrow \
+    vcl/osx/a11ywrapperscrollarea \
+    vcl/osx/a11ywrapperscrollbar \
+    vcl/osx/a11ywrappersplitter \
+    vcl/osx/a11ywrapperstatictext \
+    vcl/osx/a11ywrappertabgroup \
+    vcl/osx/a11ywrappertextarea \
+    vcl/osx/a11ywrappertoolbar \
+    vcl/osx/salnstimer \
+    vcl/osx/vclnsapp \
+    vcl/osx/printaccessoryview \
+    vcl/osx/printview \
+    vcl/osx/salframeview \
+    vcl/osx/salnsmenu \
 ))
 $(eval $(call gb_Library_add_exception_objects,vcl,\
-    vcl/aqua/source/a11y/aqua11yfocuslistener \
-    vcl/aqua/source/a11y/aqua11yfocustracker \
-    vcl/aqua/source/a11y/aqua11ylistener \
-    vcl/aqua/source/a11y/documentfocuslistener \
-    vcl/aqua/source/app/saldata \
-    vcl/aqua/source/app/salinst \
-    vcl/aqua/source/app/salsys \
-    vcl/aqua/source/app/saltimer \
-    vcl/aqua/source/dtrans/DataFlavorMapping \
-    vcl/aqua/source/dtrans/DragActionConversion \
-    vcl/aqua/source/dtrans/DragSource \
-    vcl/aqua/source/dtrans/DragSourceContext \
-    vcl/aqua/source/dtrans/DropTarget \
-    vcl/aqua/source/dtrans/HtmlFmtFlt \
-    vcl/aqua/source/dtrans/OSXTransferable \
-    vcl/aqua/source/dtrans/PictToBmpFlt \
-    vcl/aqua/source/dtrans/aqua_clipboard \
-    vcl/aqua/source/dtrans/service_entry \
+    vcl/osx/a11yfocuslistener \
+    vcl/osx/a11yfocustracker \
+    vcl/osx/a11ylistener \
+    vcl/osx/documentfocuslistener \
+    vcl/osx/saldata \
+    vcl/osx/salinst \
+    vcl/osx/salsys \
+    vcl/osx/saltimer \
+    vcl/osx/DataFlavorMapping \
+    vcl/osx/DragActionConversion \
+    vcl/osx/DragSource \
+    vcl/osx/DragSourceContext \
+    vcl/osx/DropTarget \
+    vcl/osx/HtmlFmtFlt \
+    vcl/osx/OSXTransferable \
+    vcl/osx/PictToBmpFlt \
+    vcl/osx/clipboard \
+    vcl/osx/service_entry \
     $(vcl_quartz_code) \
-    vcl/aqua/source/gdi/salgdicommon \
-    vcl/aqua/source/gdi/salgdiutils \
-    vcl/aqua/source/gdi/salmathutils \
-    vcl/aqua/source/gdi/salnativewidgets \
-    vcl/aqua/source/gdi/salprn \
-    vcl/aqua/source/gdi/salvd \
-    vcl/aqua/source/window/salframe \
-    vcl/aqua/source/window/salmenu \
-    vcl/aqua/source/window/salobj \
+    vcl/quartz/salgdicommon \
+    vcl/quartz/salgdiutils \
+    vcl/quartz/salmathutils \
+    vcl/osx/salnativewidgets \
+    vcl/osx/salprn \
+    vcl/osx/salvd \
+    vcl/osx/salframe \
+    vcl/osx/salmenu \
+    vcl/osx/salobj \
 ))
 $(eval $(call gb_Library_use_system_darwin_frameworks,vcl,\
     $(if $(filter X86_64,$(CPUNAME)),,QuickTime) \
diff --git a/vcl/Package_osxres.mk b/vcl/Package_osxres.mk
index bc669eec5f50..224853f25993 100644
--- a/vcl/Package_osxres.mk
+++ b/vcl/Package_osxres.mk
@@ -7,7 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_Package_Package,vcl_osxres,$(SRCDIR)/vcl/aqua/source/res))
+$(eval $(call gb_Package_Package,vcl_osxres,$(SRCDIR)/vcl/osx/res))
 
 $(eval $(call gb_Package_add_files_with_dir,vcl_osxres,Resources,\
     MainMenu.nib/classes.nib \
diff --git a/vcl/README b/vcl/README
index e386843b076b..5d3a7602e5fd 100644
--- a/vcl/README
+++ b/vcl/README
@@ -17,14 +17,16 @@ headless/
 	+ a backend renderer that draws to bitmaps
 
 android/
-	+ Android backend (work in progress, does work to some extent)
+	+ Android backend
 
-aqua/
+osx/
 	+ OS X backend
 
 ios/
-	+ iOS backend (work in progres, does not work, needs re-think
-	and re-write)
+	+ iOS backend
+
+quartz/
+	+ code common to OS X and iOS
 
 win/
 	+ Windows backend
diff --git a/vcl/aqua/source/a11y/readme.txt b/vcl/aqua/source/a11y/readme.txt
deleted file mode 100644
index 19e80ab1a162..000000000000
--- a/vcl/aqua/source/a11y/readme.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-Naming scheme:
-
-aqua11yXYZhelper:           Helper class providing static methods
-
-aqua11yXYZwrapper:          Wrapper around one (or two) UNO-interfaces
-
-aqua11ywrapperXYZ:          Subclass of aqua11ywrapper for a specific AXRole
-
diff --git a/vcl/inc/headless/svpframe.hxx b/vcl/inc/headless/svpframe.hxx
index f5fe6dd55dcd..34bf77b87f0d 100644
--- a/vcl/inc/headless/svpframe.hxx
+++ b/vcl/inc/headless/svpframe.hxx
@@ -18,6 +18,7 @@
  */
 
 #ifndef INCLUDED_VCL_INC_HEADLESS_SVPFRAME_HXX
+#define INCLUDED_VCL_INC_HEADLESS_SVPFRAME_HXX
 
 #include <vcl/sysdata.hxx>
 #include <basegfx/range/b2ibox.hxx>
@@ -135,6 +136,7 @@ public:
     static SvpSalFrame*         GetFocusFrame() { return s_pFocusFrame; }
 
 };
+
 #endif // INCLUDED_VCL_INC_HEADLESS_SVPFRAME_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/headless/svpgdi.hxx b/vcl/inc/headless/svpgdi.hxx
index fc0e3c5c6e0e..d04f020eeaf5 100644
--- a/vcl/inc/headless/svpgdi.hxx
+++ b/vcl/inc/headless/svpgdi.hxx
@@ -27,7 +27,7 @@
 #include "sallayout.hxx"
 
 #ifdef IOS
-#include "coretext/salgdi.h"
+#include "quartz/salgdi.h"
 #include <premac.h>
 #include <CoreGraphics/CoreGraphics.h>
 #include <postmac.h>
diff --git a/vcl/inc/aqua/aqua11yfactory.h b/vcl/inc/osx/a11yfactory.h
index 2a4a7dc49467..c739f3ef6b48 100644
--- a/vcl/inc/aqua/aqua11yfactory.h
+++ b/vcl/inc/osx/a11yfactory.h
@@ -17,11 +17,11 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_VCL_INC_AQUA_AQUA11YFACTORY_H
-#define INCLUDED_VCL_INC_AQUA_AQUA11YFACTORY_H
+#ifndef INCLUDED_VCL_INC_OSX_A11YFACTORY_H
+#define INCLUDED_VCL_INC_OSX_A11YFACTORY_H
 
-#include "aquavcltypes.h"
-#include "aqua11ywrapper.h"
+#include "osxvcltypes.h"
+#include "a11ywrapper.h"
 #include <com/sun/star/accessibility/XAccessibleContext.hpp>
 
 @interface AquaA11yFactory : NSObject
@@ -36,6 +36,7 @@
 +(void)registerView: (NSView *) theView;
 +(void)revokeView: (NSView *) theViewt;
 @end
-#endif // INCLUDED_VCL_INC_AQUA_AQUA11YFACTORY_H
+
+#endif // INCLUDED_VCL_INC_OSX_A11YFACTORY_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/aqua/aqua11yfocustracker.hxx b/vcl/inc/osx/a11yfocustracker.hxx
index 22896c2a8b1d..22b37d2b64ce 100644
--- a/vcl/inc/aqua/aqua11yfocustracker.hxx
+++ b/vcl/inc/osx/a11yfocustracker.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_VCL_INC_AQUA_AQUA11YFOCUSTRACKER_HXX
-#define INCLUDED_VCL_INC_AQUA_AQUA11YFOCUSTRACKER_HXX
+#ifndef INCLUDED_VCL_INC_OSX_A11YFOCUSTRACKER_HXX
+#define INCLUDED_VCL_INC_OSX_A11YFOCUSTRACKER_HXX
 
 #include <com/sun/star/accessibility/XAccessible.hpp>
 
@@ -95,6 +95,6 @@ private:
     const ::com::sun::star::uno::Reference< DocumentFocusListener > m_xDocumentFocusListener;
 };
 
-#endif // INCLUDED_VCL_INC_AQUA_AQUA11YFOCUSTRACKER_HXX
+#endif // INCLUDED_VCL_INC_OSX_A11YFOCUSTRACKER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/aqua/aqua11ylistener.hxx b/vcl/inc/osx/a11ylistener.hxx
index 97c71ef447ee..8f7176d0766a 100644
--- a/vcl/inc/aqua/aqua11ylistener.hxx
+++ b/vcl/inc/osx/a11ylistener.hxx
@@ -17,14 +17,14 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_VCL_INC_AQUA_AQUA11YLISTENER_HXX
-#define INCLUDED_VCL_INC_AQUA_AQUA11YLISTENER_HXX
+#ifndef INCLUDED_VCL_INC_OSX_A11YLISTENER_HXX
+#define INCLUDED_VCL_INC_OSX_A11YLISTENER_HXX
 
 #include <com/sun/star/accessibility/XAccessibleEventListener.hpp>
 #include <cppuhelper/implbase1.hxx>
 
-#include "aqua11yfocustracker.hxx"
-#include "aquavcltypes.h"
+#include "a11yfocustracker.hxx"
+#include "osxvcltypes.h"
 #include <set>
 #include <com/sun/star/awt/Rectangle.hpp>
 
@@ -54,5 +54,5 @@ private:
     ::com::sun::star::awt::Rectangle m_oldBounds;
 };
 
-#endif // INCLUDED_VCL_INC_AQUA_AQUA11YLISTENER_HXX
+#endif // INCLUDED_VCL_INC_OSX_A11YLISTENER_HXX
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/aqua/aqua11ywrapper.h b/vcl/inc/osx/a11ywrapper.h
index 95edcae2e040..7f291b45ab71 100644
--- a/vcl/inc/aqua/aqua11ywrapper.h
+++ b/vcl/inc/osx/a11ywrapper.h
@@ -17,10 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_VCL_INC_AQUA_AQUA11YWRAPPER_H
-#define INCLUDED_VCL_INC_AQUA_AQUA11YWRAPPER_H
+#ifndef INCLUDED_VCL_INC_OSX_A11YWRAPPER_H
+#define INCLUDED_VCL_INC_OSX_A11YWRAPPER_H
 
-#include "aquavcltypes.h"
+#include "osxvcltypes.h"
 #include <com/sun/star/accessibility/XAccessibleAction.hpp>
 #include <com/sun/star/accessibility/XAccessibleContext.hpp>
 #include <com/sun/star/accessibility/XAccessibleComponent.hpp>
@@ -105,6 +105,6 @@ struct ReferenceWrapper
 -(::com::sun::star::accessibility::XAccessibleTextMarkup *)accessibleTextMarkup;
 @end
 
-#endif // INCLUDED_VCL_INC_AQUA_AQUA11YWRAPPER_H
+#endif // INCLUDED_VCL_INC_OSX_A11YWRAPPER_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/aqua/keyboardfocuslistener.hxx b/vcl/inc/osx/keyboardfocuslistener.hxx
index 45979e28a374..3c13f77e5e58 100644
--- a/vcl/inc/aqua/keyboardfocuslistener.hxx
+++ b/vcl/inc/osx/keyboardfocuslistener.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_VCL_INC_AQUA_KEYBOARDFOCUSLISTENER_HXX
-#define INCLUDED_VCL_INC_AQUA_KEYBOARDFOCUSLISTENER_HXX
+#ifndef INCLUDED_VCL_INC_OSX_KEYBOARDFOCUSLISTENER_HXX
+#define INCLUDED_VCL_INC_OSX_KEYBOARDFOCUSLISTENER_HXX
 
 #include <com/sun/star/accessibility/XAccessible.hpp>
 
@@ -34,5 +34,6 @@ public:
     virtual void SAL_CALL focusedObjectChanged(const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& xAccessible) = 0;
 };
 
-#endif // INCLUDED_VCL_INC_AQUA_KEYBOARDFOCUSLISTENER_HXX
+#endif // INCLUDED_VCL_INC_OSX_KEYBOARDFOCUSLISTENER_HXX
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/aqua/aquavcltypes.h b/vcl/inc/osx/osxvcltypes.h
index 5101a5a2615e..f1659c4fc622 100644
--- a/vcl/inc/aqua/aquavcltypes.h
+++ b/vcl/inc/osx/osxvcltypes.h
@@ -17,14 +17,14 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_VCL_INC_AQUA_AQUAVCLTYPES_H
-#define INCLUDED_VCL_INC_AQUA_AQUAVCLTYPES_H
+#ifndef INCLUDED_VCL_INC_OSX_OSXVCLTYPES_H
+#define INCLUDED_VCL_INC_OSX_OSXVCLTYPES_H
 
 #include "premac.h"
 #import <Cocoa/Cocoa.h>
 #import <AppKit/NSEvent.h>
 #include "postmac.h"
 
-#endif // INCLUDED_VCL_INC_AQUA_AQUAVCLTYPES_H
+#endif // INCLUDED_VCL_INC_OSX_OSXVCLTYPES_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/aqua/aquaprintview.h b/vcl/inc/osx/printview.h
index fbd8077ea96b..e396bd83775a 100644
--- a/vcl/inc/aqua/aquaprintview.h
+++ b/vcl/inc/osx/printview.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_VCL_INC_AQUA_AQUAPRINTVIEW_H
-#define INCLUDED_VCL_INC_AQUA_AQUAPRINTVIEW_H
+#ifndef INCLUDED_VCL_INC_OSX_PRINTVIEW_H
+#define INCLUDED_VCL_INC_OSX_PRINTVIEW_H
 
 #include "premac.h"
 #include <Cocoa/Cocoa.h>
@@ -55,7 +55,6 @@ struct PrintAccessoryViewState
 +(NSObject*)setupPrinterPanel: (NSPrintOperation*)pOp withController: (vcl::PrinterController*)pController withState: (PrintAccessoryViewState*)pState;
 @end
 
-
-#endif
+#endif // INCLUDED_VCL_INC_OSX_PRINTVIEW_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/aqua/saldata.hxx b/vcl/inc/osx/saldata.hxx
index 74e10f5e44db..c9c44bf0fee4 100644
--- a/vcl/inc/aqua/saldata.hxx
+++ b/vcl/inc/osx/saldata.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_VCL_INC_AQUA_SALDATA_HXX
-#define INCLUDED_VCL_INC_AQUA_SALDATA_HXX
+#ifndef INCLUDED_VCL_INC_OSX_SALDATA_HXX
+#define INCLUDED_VCL_INC_OSX_SALDATA_HXX
 
 #include <config_features.h>
 
@@ -115,6 +115,6 @@ sal_Bool ImplSalYieldMutexTryToAcquire();
 void ImplSalYieldMutexAcquire();
 void ImplSalYieldMutexRelease();
 
-#endif // INCLUDED_VCL_INC_AQUA_SALDATA_HXX
+#endif // INCLUDED_VCL_INC_OSX_SALDATA_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/aqua/salframe.h b/vcl/inc/osx/salframe.h
index 06a82702221c..464a54aaf1e9 100644
--- a/vcl/inc/aqua/salframe.h
+++ b/vcl/inc/osx/salframe.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_VCL_INC_AQUA_SALFRAME_H
-#define INCLUDED_VCL_INC_AQUA_SALFRAME_H
+#ifndef INCLUDED_VCL_INC_OSX_SALFRAME_H
+#define INCLUDED_VCL_INC_OSX_SALFRAME_H
 
 #include <premac.h>
 #include <IOKit/pwr_mgt/IOPMLib.h>
@@ -26,9 +26,9 @@
 
 #include "vcl/sysdata.hxx"
 
-#include "aqua/salmenu.h"
-#include "aqua/saldata.hxx"
-#include "aqua/aquavcltypes.h"
+#include "osx/salmenu.h"
+#include "osx/saldata.hxx"
+#include "osx/osxvcltypes.h"
 
 #include "salframe.hxx"
 
@@ -212,6 +212,6 @@ public:
     AquaSalFrame& operator=(const AquaSalFrame&);
 };
 
-#endif // INCLUDED_VCL_INC_AQUA_SALFRAME_H
+#endif // INCLUDED_VCL_INC_OSX_SALFRAME_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/aqua/salframeview.h b/vcl/inc/osx/salframeview.h
index 4be71b3b7e5c..3217499b8881 100644
--- a/vcl/inc/aqua/salframeview.h
+++ b/vcl/inc/osx/salframeview.h
@@ -17,10 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_VCL_INC_AQUA_SALFRAMEVIEW_H
-#define INCLUDED_VCL_INC_AQUA_SALFRAMEVIEW_H
+#ifndef INCLUDED_VCL_INC_OSX_SALFRAMEVIEW_H
+#define INCLUDED_VCL_INC_OSX_SALFRAMEVIEW_H
 
-#include "aqua/aqua11ywrapper.h"
+#include "osx/a11ywrapper.h"
 
 @interface SalFrameWindow : NSWindow
 {
@@ -203,6 +203,6 @@
 
 @end
 
-#endif
+#endif // INCLUDED_VCL_INC_OSX_SALFRAMEVIEW_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/aqua/salinst.h b/vcl/inc/osx/salinst.h
index 2e6045b11767..62b7f855a111 100644
--- a/vcl/inc/aqua/salinst.h
+++ b/vcl/inc/osx/salinst.h
@@ -17,15 +17,15 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_VCL_INC_AQUA_SALINST_H
-#define INCLUDED_VCL_INC_AQUA_SALINST_H
+#ifndef INCLUDED_VCL_INC_OSX_SALINST_H
+#define INCLUDED_VCL_INC_OSX_SALINST_H
 
 #include "comphelper/solarmutex.hxx"
 #include "osl/thread.hxx"
 #include "osl/conditn.h"
 #include <vcl/solarmutex.hxx>
 
-#include "aqua/aquavcltypes.h"
+#include "osx/osxvcltypes.h"
 
 #include "salinst.hxx"
 
@@ -170,6 +170,6 @@ class YieldMutexReleaser
 CGImageRef CreateCGImage( const Image& );
 NSImage*   CreateNSImage( const Image& );
 
-#endif // INCLUDED_VCL_INC_AQUA_SALINST_H
+#endif // INCLUDED_VCL_INC_OSX_SALINST_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/aqua/salmenu.h b/vcl/inc/osx/salmenu.h
index 4be94eaf04e7..925a339f7fa5 100644
--- a/vcl/inc/aqua/salmenu.h
+++ b/vcl/inc/osx/salmenu.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_VCL_INC_AQUA_SALMENU_H
-#define INCLUDED_VCL_INC_AQUA_SALMENU_H
+#ifndef INCLUDED_VCL_INC_OSX_SALMENU_H
+#define INCLUDED_VCL_INC_OSX_SALMENU_H
 
 #include "premac.h"
 #include <Cocoa/Cocoa.h>
@@ -109,6 +109,6 @@ public:
     NSMenuItem*         mpMenuItem;           // The NSMenuItem
 };
 
-#endif // INCLUDED_VCL_INC_AQUA_SALMENU_H
+#endif // INCLUDED_VCL_INC_OSX_SALMENU_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/aqua/salnativewidgets.h b/vcl/inc/osx/salnativewidgets.h
index 5c67a825962c..2a987627e82a 100644
--- a/vcl/inc/aqua/salnativewidgets.h
+++ b/vcl/inc/osx/salnativewidgets.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_VCL_INC_AQUA_SALNATIVEWIDGETS_H
-#define INCLUDED_VCL_INC_AQUA_SALNATIVEWIDGETS_H
+#ifndef INCLUDED_VCL_INC_OSX_SALNATIVEWIDGETS_H
+#define INCLUDED_VCL_INC_OSX_SALNATIVEWIDGETS_H
 
 // since 10.4 ... no metrics are returned, and we have to fix the values
 #define BUTTON_WIDTH 16
@@ -59,6 +59,6 @@
 
 #define CLIP_FUZZ 1
 
-#endif // INCLUDED_VCL_INC_AQUA_SALNATIVEWIDGETS_H
+#endif // INCLUDED_VCL_INC_OSX_SALNATIVEWIDGETS_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/aqua/salnsmenu.h b/vcl/inc/osx/salnsmenu.h
index 585961280c3f..47c410b6a35e 100644
--- a/vcl/inc/aqua/salnsmenu.h
+++ b/vcl/inc/osx/salnsmenu.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_VCL_INC_AQUA_SALNSMENU_H
-#define INCLUDED_VCL_INC_AQUA_SALNSMENU_H
+#ifndef INCLUDED_VCL_INC_OSX_SALNSMENU_H
+#define INCLUDED_VCL_INC_OSX_SALNSMENU_H
 
 class AquaSalMenu;
 class AquaSalMenuItem;
@@ -56,7 +56,6 @@ class AquaSalMenuItem;
 -(void)menuItemTriggered: (id)aSender;
 @end
 
-
-#endif
+#endif // INCLUDED_VCL_INC_OSX_SALNSMENU_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/aqua/salnstimer.h b/vcl/inc/osx/salnstimer.h
index 3d05fc8fc247..cce2746c1535 100644
--- a/vcl/inc/aqua/salnstimer.h
+++ b/vcl/inc/osx/salnstimer.h
@@ -16,8 +16,9 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef INCLUDED_VCL_INC_AQUA_SALNSTIMER_H
-#define INCLUDED_VCL_INC_AQUA_SALNSTIMER_H
+
+#ifndef INCLUDED_VCL_INC_OSX_SALNSTIMER_H
+#define INCLUDED_VCL_INC_OSX_SALNSTIMER_H
 
 #include "premac.h"
 #include "Cocoa/Cocoa.h"
@@ -29,6 +30,6 @@
 -(void)timerElapsed:(NSTimer*)pTimer;
 @end
 
-#endif
+#endif // INCLUDED_VCL_INC_OSX_SALNSTIMER_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/aqua/salobj.h b/vcl/inc/osx/salobj.h
index 0bd82821ab1e..397299c15c9d 100644
--- a/vcl/inc/aqua/salobj.h
+++ b/vcl/inc/osx/salobj.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_VCL_INC_AQUA_SALOBJ_H
-#define INCLUDED_VCL_INC_AQUA_SALOBJ_H
+#ifndef INCLUDED_VCL_INC_OSX_SALOBJ_H
+#define INCLUDED_VCL_INC_OSX_SALOBJ_H
 
 #include "vcl/sysdata.hxx"
 #include "salobj.hxx"
@@ -70,6 +70,6 @@ public:
     virtual const SystemEnvData*    GetSystemData() const;
 };
 
-#endif // INCLUDED_VCL_INC_AQUA_SALOBJ_H
+#endif // INCLUDED_VCL_INC_OSX_SALOBJ_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/aqua/salprn.h b/vcl/inc/osx/salprn.h
index cd8c32651b18..906a61dcdfc1 100644
--- a/vcl/inc/aqua/salprn.h
+++ b/vcl/inc/osx/salprn.h
@@ -17,10 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_VCL_INC_AQUA_SALPRN_H
-#define INCLUDED_VCL_INC_AQUA_SALPRN_H
+#ifndef INCLUDED_VCL_INC_OSX_SALPRN_H
+#define INCLUDED_VCL_INC_OSX_SALPRN_H
 
-#include "aqua/aquavcltypes.h"
+#include "osx/osxvcltypes.h"
 
 #include "salprn.hxx"
 
@@ -160,6 +160,6 @@ inline double TenMuToPt( double nUnits ) { return floor(((nUnits)/fPtTo100thMM)+
 
 
 
-#endif // INCLUDED_VCL_INC_AQUA_SALPRN_H
+#endif // INCLUDED_VCL_INC_OSX_SALPRN_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/aqua/salsys.h b/vcl/inc/osx/salsys.h
index e68bdbb0b346..816cffc47ae9 100644
--- a/vcl/inc/aqua/salsys.h
+++ b/vcl/inc/osx/salsys.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_VCL_INC_AQUA_SALSYS_H
-#define INCLUDED_VCL_INC_AQUA_SALSYS_H
+#ifndef INCLUDED_VCL_INC_OSX_SALSYS_H
+#define INCLUDED_VCL_INC_OSX_SALSYS_H
 
 #include "salsys.hxx"
 
@@ -46,6 +46,6 @@ public:
 };
 
 
-#endif // INCLUDED_VCL_INC_AQUA_SALSYS_H
+#endif // INCLUDED_VCL_INC_OSX_SALSYS_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/aqua/saltimer.h b/vcl/inc/osx/saltimer.h
index e51740ff4ba1..993a2efe0c57 100644
--- a/vcl/inc/aqua/saltimer.h
+++ b/vcl/inc/osx/saltimer.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_VCL_INC_AQUA_SALTIMER_H
-#define INCLUDED_VCL_INC_AQUA_SALTIMER_H
+#ifndef INCLUDED_VCL_INC_OSX_SALTIMER_H
+#define INCLUDED_VCL_INC_OSX_SALTIMER_H
 
 #include "premac.h"
 #include <Cocoa/Cocoa.h>
@@ -43,6 +43,6 @@ class AquaSalTimer : public SalTimer
     static bool bDispatchTimer;
 };
 
-#endif
+#endif // INCLUDED_VCL_INC_OSX_SALTIMER_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/aqua/salvd.h b/vcl/inc/osx/salvd.h
index 09e2a01c1897..1c32ad412379 100644
--- a/vcl/inc/aqua/salvd.h
+++ b/vcl/inc/osx/salvd.h
@@ -17,14 +17,14 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_VCL_INC_AQUA_SALVD_H
-#define INCLUDED_VCL_INC_AQUA_SALVD_H
+#ifndef INCLUDED_VCL_INC_OSX_SALVD_H
+#define INCLUDED_VCL_INC_OSX_SALVD_H
 
 #include "premac.h"
 #include <ApplicationServices/ApplicationServices.h>
 #include "postmac.h"
 
-#include "coretext/salgdi.h"
+#include "quartz/salgdi.h"
 
 #include "salvd.hxx"
 
@@ -80,6 +80,6 @@ public:
 
 // =======================================================================
 
-#endif // INCLUDED_VCL_INC_AQUA_SALVD_H
+#endif // INCLUDED_VCL_INC_OSX_SALVD_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/aqua/svsys.h b/vcl/inc/osx/svsys.h
index 89bb7dce2016..7c5451c33f2b 100644
--- a/vcl/inc/aqua/svsys.h
+++ b/vcl/inc/osx/svsys.h
@@ -17,13 +17,13 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_VCL_INC_AQUA_SVSYS_H
-#define INCLUDED_VCL_INC_AQUA_SVSYS_H
+#ifndef INCLUDED_VCL_INC_OSX_SVSYS_H
+#define INCLUDED_VCL_INC_OSX_SVSYS_H
 
 #include "premac.h"
 #include "Cocoa/Cocoa.h"
 #include "postmac.h"
 
-#endif // INCLUDED_VCL_INC_AQUA_SVSYS_H
+#endif // INCLUDED_VCL_INC_OSX_SVSYS_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/aqua/vclnsapp.h b/vcl/inc/osx/vclnsapp.h
index 7413361114db..38ad251e8bf2 100644
--- a/vcl/inc/aqua/vclnsapp.h
+++ b/vcl/inc/osx/vclnsapp.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_VCL_INC_AQUA_VCLNSAPP_H
-#define INCLUDED_VCL_INC_AQUA_VCLNSAPP_H
+#ifndef INCLUDED_VCL_INC_OSX_VCLNSAPP_H
+#define INCLUDED_VCL_INC_OSX_VCLNSAPP_H
 
 #include <config_features.h>
 
@@ -63,6 +63,6 @@ class AquaSalFrame;
 -(void)cycleFrameBackward: (AquaSalFrame*)pCurFrame;
 @end
 
-#endif
+#endif // INCLUDED_VCL_INC_OSX_VCLNSAPP_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/coretext/common.h b/vcl/inc/quartz/common.h
index 1f1211b05c12..2d9b717b5dc6 100644
--- a/vcl/inc/coretext/common.h
+++ b/vcl/inc/quartz/common.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_VCL_INC_CORETEXT_COMMON_H
-#define INCLUDED_VCL_INC_CORETEXT_COMMON_H
+#ifndef INCLUDED_VCL_INC_QUARTZ_COMMON_H
+#define INCLUDED_VCL_INC_QUARTZ_COMMON_H
 
 #include <iostream>
 
@@ -48,6 +48,6 @@
 
 std::ostream &operator <<(std::ostream& s, CTFontRef pFont);
 
-#endif // INCLUDED_VCL_INC_CORETEXT_COMMON_H
+#endif // INCLUDED_VCL_INC_QUARTZ_COMMON_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/quartz/salbmp.h b/vcl/inc/quartz/salbmp.h
index f7d8d634c0f2..a645999bbbcd 100644
--- a/vcl/inc/quartz/salbmp.h
+++ b/vcl/inc/quartz/salbmp.h
@@ -27,7 +27,7 @@
 #include "vcl/salbtype.hxx"
 
 #ifdef MACOSX
-#include "coretext/salgdi.h"
+#include "quartz/salgdi.h"
 #else
 #include "headless/svpgdi.hxx"
 #endif
diff --git a/vcl/inc/coretext/salgdi.h b/vcl/inc/quartz/salgdi.h
index d6f8682dba03..49140faf5451 100644
--- a/vcl/inc/coretext/salgdi.h
+++ b/vcl/inc/quartz/salgdi.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_VCL_INC_CORETEXT_SALGDI_H
-#define INCLUDED_VCL_INC_CORETEXT_SALGDI_H
+#ifndef INCLUDED_VCL_INC_QUARTZ_SALGDI_H
+#define INCLUDED_VCL_INC_QUARTZ_SALGDI_H
 
 #include <vector>
 
@@ -27,8 +27,8 @@
 #include "premac.h"
 #ifdef MACOSX
 #include <ApplicationServices/ApplicationServices.h>
-#include "aqua/aquavcltypes.h"
-#include "aqua/salframe.h"
+#include "osx/osxvcltypes.h"
+#include "osx/salframe.h"
 #else
 #include <CoreGraphics/CoreGraphics.h>
 #include <CoreText/CoreText.h>
@@ -428,6 +428,6 @@ inline void AquaSalGraphics::RefreshRect( const NSRect& rRect )
 
 #endif
 
-#endif // INCLUDED_VCL_INC_CORETEXT_SALGDI_H
+#endif // INCLUDED_VCL_INC_QUARTZ_SALGDI_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/aqua/salmathutils.hxx b/vcl/inc/quartz/salmathutils.hxx
index e3c223ee3f26..5c6641b94a9f 100644
--- a/vcl/inc/aqua/salmathutils.hxx
+++ b/vcl/inc/quartz/salmathutils.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_VCL_INC_AQUA_SALMATHUTILS_HXX
-#define INCLUDED_VCL_INC_AQUA_SALMATHUTILS_HXX
+#ifndef INCLUDED_VCL_INC_QUARTZ_SALMATHUTILS_HXX
+#define INCLUDED_VCL_INC_QUARTZ_SALMATHUTILS_HXX
 
 #ifdef __cplusplus
 extern "C" {
@@ -76,6 +76,6 @@ unsigned long  Euclidian2Norm ( const LRectCoorVector  pVec );
 }
 #endif
 
-#endif // INCLUDED_VCL_INC_AQUA_SALMATHUTILS_HXX
+#endif // INCLUDED_VCL_INC_QUARTZ_SALMATHUTILS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/saldatabasic.hxx b/vcl/inc/saldatabasic.hxx
index 4ec1a9f25b21..3d2d2c097af7 100644
--- a/vcl/inc/saldatabasic.hxx
+++ b/vcl/inc/saldatabasic.hxx
@@ -27,7 +27,7 @@
 #include "vcl/dllapi.h"
 
 #ifdef IOS
-#include "coretext/salgdi.h"
+#include "quartz/salgdi.h"
 #endif
 
 namespace psp
diff --git a/vcl/inc/svsys.h b/vcl/inc/svsys.h
index 997b3fb1da0d..9add1a92fc6e 100644
--- a/vcl/inc/svsys.h
+++ b/vcl/inc/svsys.h
@@ -23,7 +23,7 @@
 #ifdef WNT
 #include "win/svsys.h"
 #elif defined MACOSX
-#include "aqua/svsys.h"
+#include "osx/svsys.h"
 #elif defined IOS
 #include "ios/svsys.h"
 #elif defined ANDROID
diff --git a/vcl/aqua/source/dtrans/DataFlavorMapping.cxx b/vcl/osx/DataFlavorMapping.cxx
index c5a79b368990..c5a79b368990 100644
--- a/vcl/aqua/source/dtrans/DataFlavorMapping.cxx
+++ b/vcl/osx/DataFlavorMapping.cxx
diff --git a/vcl/aqua/source/dtrans/DataFlavorMapping.hxx b/vcl/osx/DataFlavorMapping.hxx
index f5c579ef8965..70f7736b248e 100644
--- a/vcl/aqua/source/dtrans/DataFlavorMapping.hxx
+++ b/vcl/osx/DataFlavorMapping.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_VCL_AQUA_SOURCE_DTRANS_DATAFLAVORMAPPING_HXX
-#define INCLUDED_VCL_AQUA_SOURCE_DTRANS_DATAFLAVORMAPPING_HXX
+#ifndef INCLUDED_VCL_OSX_DATAFLAVORMAPPING_HXX
+#define INCLUDED_VCL_OSX_DATAFLAVORMAPPING_HXX
 
 #include <com/sun/star/datatransfer/DataFlavor.hpp>
 #include <com/sun/star/datatransfer/XMimeContentTypeFactory.hpp>
@@ -136,6 +136,6 @@ private:
 
 typedef boost::shared_ptr<DataFlavorMapper> DataFlavorMapperPtr_t;
 
-#endif
+#endif // INCLUDED_VCL_OSX_DATAFLAVORMAPPING_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/dtrans/DragActionConversion.cxx b/vcl/osx/DragActionConversion.cxx
index d4bb9e5c3c86..d4bb9e5c3c86 100644
--- a/vcl/aqua/source/dtrans/DragActionConversion.cxx
+++ b/vcl/osx/DragActionConversion.cxx
diff --git a/vcl/aqua/source/dtrans/DragActionConversion.hxx b/vcl/osx/DragActionConversion.hxx
index 8c9b057bff0f..8c9b057bff0f 100644
--- a/vcl/aqua/source/dtrans/DragActionConversion.hxx
+++ b/vcl/osx/DragActionConversion.hxx
diff --git a/vcl/aqua/source/dtrans/DragSource.cxx b/vcl/osx/DragSource.cxx
index 57862241ce21..720292854707 100644
--- a/vcl/aqua/source/dtrans/DragSource.cxx
+++ b/vcl/osx/DragSource.cxx
@@ -28,10 +28,10 @@
 
 #include "DragSource.hxx"
 #include "DragSourceContext.hxx"
-#include "aqua_clipboard.hxx"
+#include "clipboard.hxx"
 #include "DragActionConversion.hxx"
 
-#include "aqua/salframe.h"
+#include "osx/salframe.h"
 
 #include <memory>
 
diff --git a/vcl/aqua/source/dtrans/DragSource.hxx b/vcl/osx/DragSource.hxx
index be4443a5e191..625388e87a69 100644
--- a/vcl/aqua/source/dtrans/DragSource.hxx
+++ b/vcl/osx/DragSource.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_VCL_AQUA_SOURCE_DTRANS_DRAGSOURCE_HXX
-#define INCLUDED_VCL_AQUA_SOURCE_DTRANS_DRAGSOURCE_HXX
+#ifndef INCLUDED_VCL_OSX_DRAGSOURCE_HXX
+#define INCLUDED_VCL_OSX_DRAGSOURCE_HXX
 
 #include <com/sun/star/datatransfer/dnd/XDragSource.hpp>
 #include <com/sun/star/datatransfer/dnd/XDragSourceContext.hpp>
@@ -41,7 +41,7 @@ class DragSource;
 class AquaSalFrame;
 
 /* The functions declared in this protocol are actually
-   declared in vcl/aqua/inc/salframe.h. Because we want
+   declared in vcl/inc/osx/salframe.h. Because we want
    to avoid importing VCL headers in UNO services and
    on the other hand want to avoid warnings caused by
    gcc complaining about unknowness of these functions
@@ -130,7 +130,6 @@ public:
 
 };
 
-
-#endif
+#endif // INCLUDED_VCL_OSX_DRAGSOURCE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/dtrans/DragSourceContext.cxx b/vcl/osx/DragSourceContext.cxx
index 1eb4fe3ac78e..1eb4fe3ac78e 100644
--- a/vcl/aqua/source/dtrans/DragSourceContext.cxx
+++ b/vcl/osx/DragSourceContext.cxx
diff --git a/vcl/aqua/source/dtrans/DragSourceContext.hxx b/vcl/osx/DragSourceContext.hxx
index 6d8d0d9bac18..f27518ee2756 100644
--- a/vcl/aqua/source/dtrans/DragSourceContext.hxx
+++ b/vcl/osx/DragSourceContext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_VCL_AQUA_SOURCE_DTRANS_DRAGSOURCECONTEXT_HXX
-#define INCLUDED_VCL_AQUA_SOURCE_DTRANS_DRAGSOURCECONTEXT_HXX
+#ifndef INCLUDED_VCL_OSX_DRAGSOURCECONTEXT_HXX
+#define INCLUDED_VCL_OSX_DRAGSOURCECONTEXT_HXX
 
 #include <cppuhelper/implbase1.hxx>
 #include <com/sun/star/datatransfer/dnd/XDragSourceContext.hpp>
@@ -54,8 +54,6 @@ public:
     throw( com::sun::star::uno::RuntimeException);
 };
 
-
-
-#endif
+#endif // INCLUDED_VCL_OSX_DRAGSOURCECONTEXT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/dtrans/DropTarget.cxx b/vcl/osx/DropTarget.cxx
index fd762a9744c0..e4d3a6bc72a4 100644
--- a/vcl/aqua/source/dtrans/DropTarget.cxx
+++ b/vcl/osx/DropTarget.cxx
@@ -24,7 +24,7 @@
 #include "comphelper/makesequence.hxx"
 #include <cppuhelper/interfacecontainer.hxx>
 
-#include "aqua_clipboard.hxx"
+#include "clipboard.hxx"
 #include "DropTarget.hxx"
 #include "DragActionConversion.hxx"
 
@@ -37,8 +37,8 @@
 #include <Carbon/Carbon.h>
 #include <postmac.h>
 
-#include <aqua/salframe.h>
-#include <aqua/salframeview.h>
+#include <osx/salframe.h>
+#include <osx/salframeview.h>
 
 using namespace cppu;
 using namespace osl;
diff --git a/vcl/aqua/source/dtrans/DropTarget.hxx b/vcl/osx/DropTarget.hxx
index 9318d80b9b46..0eea030db18b 100644
--- a/vcl/aqua/source/dtrans/DropTarget.hxx
+++ b/vcl/osx/DropTarget.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_VCL_AQUA_SOURCE_DTRANS_DROPTARGET_HXX
-#define INCLUDED_VCL_AQUA_SOURCE_DTRANS_DROPTARGET_HXX
+#ifndef INCLUDED_VCL_OSX_DROPTARGET_HXX
+#define INCLUDED_VCL_OSX_DROPTARGET_HXX
 
 #include "DataFlavorMapping.hxx"
 #include <cppuhelper/compbase5.hxx>
@@ -44,7 +44,7 @@ class DropTarget;
 class AquaSalFrame;
 
 /* The functions declared in this protocol are actually
-   declared in vcl/aqua/inc/salframe.h. Because we want
+   declared in vcl/inc/osx/salframe.h. Because we want
    to avoid importing VCL headers in UNO services and
    on the other hand want to avoid warnings caused by
    gcc complaining about unknowness of these functions
@@ -158,6 +158,6 @@ private:
   sal_Int8 mDefaultActions;
 };
 
-#endif
+#endif // INCLUDED_VCL_OSX_DROPTARGET_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/dtrans/HtmlFmtFlt.cxx b/vcl/osx/HtmlFmtFlt.cxx
index e629f11e982e..e629f11e982e 100644
--- a/vcl/aqua/source/dtrans/HtmlFmtFlt.cxx
+++ b/vcl/osx/HtmlFmtFlt.cxx
diff --git a/vcl/aqua/source/dtrans/HtmlFmtFlt.hxx b/vcl/osx/HtmlFmtFlt.hxx
index 393aed89fb72..77a92493bad6 100644
--- a/vcl/aqua/source/dtrans/HtmlFmtFlt.hxx
+++ b/vcl/osx/HtmlFmtFlt.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_VCL_AQUA_SOURCE_DTRANS_HTMLFMTFLT_HXX
-#define INCLUDED_VCL_AQUA_SOURCE_DTRANS_HTMLFMTFLT_HXX
+#ifndef INCLUDED_VCL_OSX_HTMLFMTFLT_HXX
+#define INCLUDED_VCL_OSX_HTMLFMTFLT_HXX
 
 #include <com/sun/star/uno/Sequence.hxx>
 
@@ -36,6 +36,6 @@ com::sun::star::uno::Sequence<sal_Int8> HTMLFormatToTextHtml(const com::sun::sta
  */
 bool isHTMLFormat (const com::sun::star::uno::Sequence<sal_Int8>& aHtmlSequence);
 
-#endif
+#endif // INCLUDED_VCL_OSX_HTMLFMTFLT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/dtrans/OSXTransferable.cxx b/vcl/osx/OSXTransferable.cxx
index 7cfffcd4d7c5..7cfffcd4d7c5 100644
--- a/vcl/aqua/source/dtrans/OSXTransferable.cxx
+++ b/vcl/osx/OSXTransferable.cxx
diff --git a/vcl/aqua/source/dtrans/OSXTransferable.hxx b/vcl/osx/OSXTransferable.hxx
index 27885effd03f..27885effd03f 100644
--- a/vcl/aqua/source/dtrans/OSXTransferable.hxx
+++ b/vcl/osx/OSXTransferable.hxx
diff --git a/vcl/aqua/source/dtrans/PictToBmpFlt.cxx b/vcl/osx/PictToBmpFlt.cxx
index 91ed2bc5f177..91ed2bc5f177 100644
--- a/vcl/aqua/source/dtrans/PictToBmpFlt.cxx
+++ b/vcl/osx/PictToBmpFlt.cxx
diff --git a/vcl/aqua/source/dtrans/PictToBmpFlt.hxx b/vcl/osx/PictToBmpFlt.hxx
index 65a7771caf1d..59f1f2d3fa99 100644
--- a/vcl/aqua/source/dtrans/PictToBmpFlt.hxx
+++ b/vcl/osx/PictToBmpFlt.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_VCL_AQUA_SOURCE_DTRANS_PICTTOBMPFLT_HXX
-#define INCLUDED_VCL_AQUA_SOURCE_DTRANS_PICTTOBMPFLT_HXX
+#ifndef INCLUDED_VCL_OSX_PICTTOBMPFLT_HXX
+#define INCLUDED_VCL_OSX_PICTTOBMPFLT_HXX
 
 #include <com/sun/star/uno/Sequence.hxx>
 
@@ -34,6 +34,6 @@ bool PNGToImage( com::sun::star::uno::Sequence<sal_Int8>& rPngData,
                  com::sun::star::uno::Sequence<sal_Int8>& rImgData,
                  NSBitmapImageFileType eOutFormat);
 
-#endif
+#endif // INCLUDED_VCL_OSX_PICTTOBMPFLT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/osx/README.a11y b/vcl/osx/README.a11y
new file mode 100644
index 000000000000..4422713bc4fa
--- /dev/null
+++ b/vcl/osx/README.a11y
@@ -0,0 +1,7 @@
+Naming scheme:
+
+a11yXYZhelper:           Helper class providing static methods
+
+a11yXYZwrapper:          Wrapper around one (or two) UNO-interfaces
+
+a11ywrapperXYZ:          Subclass of a11ywrapper for a specific AXRole
diff --git a/vcl/aqua/source/a11y/aqua11yactionwrapper.h b/vcl/osx/a11yactionwrapper.h
index c92473ccb080..0fda9a32ae21 100644
--- a/vcl/aqua/source/a11y/aqua11yactionwrapper.h
+++ b/vcl/osx/a11yactionwrapper.h
@@ -17,11 +17,11 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YACTIONWRAPPER_H
-#define INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YACTIONWRAPPER_H
+#ifndef INCLUDED_VCL_OSX_A11YACTIONWRAPPER_H
+#define INCLUDED_VCL_OSX_A11YACTIONWRAPPER_H
 
-#include "aqua/aquavcltypes.h"
-#include "aqua/aqua11ywrapper.h"
+#include "osx/osxvcltypes.h"
+#include "osx/a11ywrapper.h"
 
 @interface AquaA11yActionWrapper : NSObject
 {
@@ -30,6 +30,6 @@
 +(void)doAction:(NSString *)action ofElement:(AquaA11yWrapper *)wrapper;
 @end
 
-#endif // INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YACTIONWRAPPER_H
+#endif // INCLUDED_VCL_OSX_A11YACTIONWRAPPER_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11yactionwrapper.mm b/vcl/osx/a11yactionwrapper.mm
index d9842a81e526..31dc39527ecd 100644
--- a/vcl/aqua/source/a11y/aqua11yactionwrapper.mm
+++ b/vcl/osx/a11yactionwrapper.mm
@@ -18,10 +18,10 @@
  */
 
 
-#include "aqua/salinst.h"
+#include "osx/salinst.h"
 #include "quartz/utils.h"
 
-#include "aqua11yactionwrapper.h"
+#include "a11yactionwrapper.h"
 
 // Wrapper for XAccessibleAction
 
diff --git a/vcl/aqua/source/a11y/aqua11ycomponentwrapper.h b/vcl/osx/a11ycomponentwrapper.h
index 74d804e74d91..450f0688155e 100644
--- a/vcl/aqua/source/a11y/aqua11ycomponentwrapper.h
+++ b/vcl/osx/a11ycomponentwrapper.h
@@ -17,11 +17,11 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YCOMPONENTWRAPPER_H
-#define INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YCOMPONENTWRAPPER_H
+#ifndef INCLUDED_VCL_OSX_A11YCOMPONENTWRAPPER_H
+#define INCLUDED_VCL_OSX_A11YCOMPONENTWRAPPER_H
 
-#include "aqua/aquavcltypes.h"
-#include "aqua/aqua11ywrapper.h"
+#include "osx/osxvcltypes.h"
+#include "osx/a11ywrapper.h"
 
 @interface AquaA11yComponentWrapper : NSObject
 {
@@ -34,6 +34,6 @@
 +(void)setFocusedAttributeForElement:(AquaA11yWrapper *)wrapper to:(id)value;
 @end
 
-#endif // INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YCOMPONENTWRAPPER_H
+#endif // INCLUDED_VCL_OSX_A11YCOMPONENTWRAPPER_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11ycomponentwrapper.mm b/vcl/osx/a11ycomponentwrapper.mm
index 41df52bf10e0..b91029d6aca8 100644
--- a/vcl/aqua/source/a11y/aqua11ycomponentwrapper.mm
+++ b/vcl/osx/a11ycomponentwrapper.mm
@@ -18,8 +18,8 @@
  */
 
 #include "quartz/utils.h"
-#include "aqua11ycomponentwrapper.h"
-#include "aqua11yrolehelper.h"
+#include "a11ycomponentwrapper.h"
+#include "a11yrolehelper.h"
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
 
 using namespace ::com::sun::star::accessibility;
diff --git a/vcl/aqua/source/a11y/aqua11yfactory.mm b/vcl/osx/a11yfactory.mm
index 64f178314a38..30437a837936 100644
--- a/vcl/aqua/source/a11y/aqua11yfactory.mm
+++ b/vcl/osx/a11yfactory.mm
@@ -18,28 +18,28 @@
  */
 
 
-#include "aqua/salinst.h"
-#include "aqua/aqua11yfactory.h"
-#include "aqua/aqua11yfocustracker.hxx"
-
-#include "aqua11yfocuslistener.hxx"
-#include "aqua11yrolehelper.h"
-#include "aqua11ywrapperbutton.h"
-#include "aqua11ywrapperstatictext.h"
-#include "aqua11ywrappertextarea.h"
-#include "aqua11ywrappercheckbox.h"
-#include "aqua11ywrappercombobox.h"
-#include "aqua11ywrappergroup.h"
-#include "aqua11ywrapperlist.h"
-#include "aqua11ywrapperradiobutton.h"
-#include "aqua11ywrapperradiogroup.h"
-#include "aqua11ywrapperrow.h"
-#include "aqua11ywrapperscrollarea.h"
-#include "aqua11ywrapperscrollbar.h"
-#include "aqua11ywrappersplitter.h"
-#include "aqua11ywrappertabgroup.h"
-#include "aqua11ywrappertoolbar.h"
-#include "aqua11ytablewrapper.h"
+#include "osx/salinst.h"
+#include "osx/a11yfactory.h"
+#include "osx/a11yfocustracker.hxx"
+
+#include "a11yfocuslistener.hxx"
+#include "a11yrolehelper.h"
+#include "a11ywrapperbutton.h"
+#include "a11ywrapperstatictext.h"
+#include "a11ywrappertextarea.h"
+#include "a11ywrappercheckbox.h"
+#include "a11ywrappercombobox.h"
+#include "a11ywrappergroup.h"
+#include "a11ywrapperlist.h"
+#include "a11ywrapperradiobutton.h"
+#include "a11ywrapperradiogroup.h"
+#include "a11ywrapperrow.h"
+#include "a11ywrapperscrollarea.h"
+#include "a11ywrapperscrollbar.h"
+#include "a11ywrappersplitter.h"
+#include "a11ywrappertabgroup.h"
+#include "a11ywrappertoolbar.h"
+#include "a11ytablewrapper.h"
 
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
 
diff --git a/vcl/aqua/source/a11y/aqua11yfocuslistener.cxx b/vcl/osx/a11yfocuslistener.cxx
index 5a0c339af27b..c4e296072868 100644
--- a/vcl/aqua/source/a11y/aqua11yfocuslistener.cxx
+++ b/vcl/osx/a11yfocuslistener.cxx
@@ -20,10 +20,10 @@
 
 #include <salhelper/refobj.hxx>
 
-#include "aqua/aqua11yfocustracker.hxx"
-#include "aqua/aqua11yfactory.h"
+#include "osx/a11yfocustracker.hxx"
+#include "osx/a11yfactory.h"
 
-#include "aqua11yfocuslistener.hxx"
+#include "a11yfocuslistener.hxx"
 
 using namespace ::com::sun::star::accessibility;
 using namespace ::com::sun::star::uno;
diff --git a/vcl/aqua/source/a11y/aqua11yfocuslistener.hxx b/vcl/osx/a11yfocuslistener.hxx
index a889683a4304..42d5c358b4cd 100644
--- a/vcl/aqua/source/a11y/aqua11yfocuslistener.hxx
+++ b/vcl/osx/a11yfocuslistener.hxx
@@ -17,13 +17,13 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YFOCUSLISTENER_HXX
-#define INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YFOCUSLISTENER_HXX
+#ifndef INCLUDED_VCL_OSX_A11YFOCUSLISTENER_HXX
+#define INCLUDED_VCL_OSX_A11YFOCUSLISTENER_HXX
 
 #include <salhelper/refobj.hxx>
 
-#include "aqua/keyboardfocuslistener.hxx"
-#include "aqua/aquavcltypes.h"
+#include "osx/keyboardfocuslistener.hxx"
+#include "osx/osxvcltypes.h"
 
 class AquaA11yFocusListener :
     public KeyboardFocusListener,
@@ -49,6 +49,6 @@ public:
     virtual oslInterlockedCount SAL_CALL release() SAL_THROW(());
 };
 
-#endif // INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YFOCUSLISTENER_HXX
+#endif // INCLUDED_VCL_OSX_A11YFOCUSLISTENER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11yfocustracker.cxx b/vcl/osx/a11yfocustracker.cxx
index b38af805630c..1017969c879a 100644
--- a/vcl/aqua/source/a11y/aqua11yfocustracker.cxx
+++ b/vcl/osx/a11yfocustracker.cxx
@@ -23,7 +23,7 @@
 #include "vcl/toolbox.hxx"
 #include "vcl/menu.hxx"
 
-#include "aqua/aqua11yfocustracker.hxx"
+#include "osx/a11yfocustracker.hxx"
 
 #include "documentfocuslistener.hxx"
 
diff --git a/vcl/aqua/source/a11y/aqua11ylistener.cxx b/vcl/osx/a11ylistener.cxx
index 46babf97f357..dafabb7133c2 100644
--- a/vcl/aqua/source/a11y/aqua11ylistener.cxx
+++ b/vcl/osx/a11ylistener.cxx
@@ -17,13 +17,13 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "aqua/salinst.h"
-#include "aqua/aqua11ylistener.hxx"
-#include "aqua/aqua11yfactory.h"
-#include "aqua/aqua11yfocustracker.hxx"
-#include "aqua/aqua11ywrapper.h"
+#include "osx/salinst.h"
+#include "osx/a11ylistener.hxx"
+#include "osx/a11yfactory.h"
+#include "osx/a11yfocustracker.hxx"
+#include "osx/a11ywrapper.h"
 
-#include "aqua11ytextwrapper.h"
+#include "a11ytextwrapper.h"
 
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
diff --git a/vcl/aqua/source/a11y/aqua11yrolehelper.h b/vcl/osx/a11yrolehelper.h
index a45cde447ff6..21b2ff5b960a 100644
--- a/vcl/aqua/source/a11y/aqua11yrolehelper.h
+++ b/vcl/osx/a11yrolehelper.h
@@ -17,10 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YROLEHELPER_H
-#define INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YROLEHELPER_H
+#ifndef INCLUDED_VCL_OSX_A11YROLEHELPER_H
+#define INCLUDED_VCL_OSX_A11YROLEHELPER_H
 
-#include "aqua/salinst.h"
+#include "osx/salinst.h"
 #include <com/sun/star/accessibility/XAccessibleContext.hpp>
 
 @interface AquaA11yRoleHelper : NSObject
@@ -31,6 +31,6 @@
 +(id)getRoleDescriptionFrom: (NSString *) role with: (NSString *) subRole;
 @end
 
-#endif // INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YROLEHELPER_H
+#endif // INCLUDED_VCL_OSX_A11YROLEHELPER_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11yrolehelper.mm b/vcl/osx/a11yrolehelper.mm
index 0d55279823ac..2940a4b2f7aa 100644
--- a/vcl/aqua/source/a11y/aqua11yrolehelper.mm
+++ b/vcl/osx/a11yrolehelper.mm
@@ -18,9 +18,9 @@
  */
 
 
-#include "aqua/aqua11yfactory.h"
+#include "osx/a11yfactory.h"
 
-#include "aqua11yrolehelper.h"
+#include "a11yrolehelper.h"
 
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
diff --git a/vcl/aqua/source/a11y/aqua11yselectionwrapper.h b/vcl/osx/a11yselectionwrapper.h
index af3c297dd363..9b254d7df1f6 100644
--- a/vcl/aqua/source/a11y/aqua11yselectionwrapper.h
+++ b/vcl/osx/a11yselectionwrapper.h
@@ -17,11 +17,11 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YSELECTIONWRAPPER_H
-#define INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YSELECTIONWRAPPER_H
+#ifndef INCLUDED_VCL_OSX_A11YSELECTIONWRAPPER_H
+#define INCLUDED_VCL_OSX_A11YSELECTIONWRAPPER_H
 
-#include "aqua/aquavcltypes.h"
-#include "aqua/aqua11ywrapper.h"
+#include "osx/osxvcltypes.h"
+#include "osx/a11ywrapper.h"
 
 @interface AquaA11ySelectionWrapper : NSObject
 {
@@ -32,6 +32,6 @@
 +(void)setSelectedChildrenAttributeForElement:(AquaA11yWrapper *)wrapper to:(id)value;
 @end
 
-#endif // INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YSELECTIONWRAPPER_H
+#endif // INCLUDED_VCL_OSX_A11YSELECTIONWRAPPER_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11yselectionwrapper.mm b/vcl/osx/a11yselectionwrapper.mm
index 929d45443061..e341aedacfe0 100644
--- a/vcl/aqua/source/a11y/aqua11yselectionwrapper.mm
+++ b/vcl/osx/a11yselectionwrapper.mm
@@ -18,10 +18,10 @@
  */
 
 
-#include "aqua/salinst.h"
-#include "aqua/aqua11yfactory.h"
+#include "osx/salinst.h"
+#include "osx/a11yfactory.h"
 
-#include "aqua11yselectionwrapper.h"
+#include "a11yselectionwrapper.h"
 
 using namespace ::com::sun::star::accessibility;
 using namespace ::com::sun::star::uno;
diff --git a/vcl/aqua/source/a11y/aqua11ytablewrapper.h b/vcl/osx/a11ytablewrapper.h
index 09b3ff733759..94b29bd44c78 100644
--- a/vcl/aqua/source/a11y/aqua11ytablewrapper.h
+++ b/vcl/osx/a11ytablewrapper.h
@@ -17,10 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YTABLEWRAPPER_H
-#define INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YTABLEWRAPPER_H
+#ifndef INCLUDED_VCL_OSX_A11YTABLEWRAPPER_H
+#define INCLUDED_VCL_OSX_A11YTABLEWRAPPER_H
 
-#include "aqua/aqua11ywrapper.h"
+#include "osx/a11ywrapper.h"
 
 #define MAXIMUM_ACCESSIBLE_TABLE_CELLS 1000
 
@@ -33,6 +33,6 @@
 -(id)rowsAttribute;
 -(id)columnsAttribute;
 @end
-#endif // INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YTABLEWRAPPER_H
+#endif // INCLUDED_VCL_OSX_A11YTABLEWRAPPER_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11ytablewrapper.mm b/vcl/osx/a11ytablewrapper.mm
index 52ff2a8d2d76..f772efcce4b1 100644
--- a/vcl/aqua/source/a11y/aqua11ytablewrapper.mm
+++ b/vcl/osx/a11ytablewrapper.mm
@@ -18,9 +18,9 @@
  */
 
 
-#include "aqua/aqua11yfactory.h"
+#include "osx/a11yfactory.h"
 
-#include "aqua11ytablewrapper.h"
+#include "a11ytablewrapper.h"
 
 using namespace ::com::sun::star::accessibility;
 using namespace ::com::sun::star::awt;
diff --git a/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.h b/vcl/osx/a11ytextattributeswrapper.h
index 4464bd32bfaf..03e3b3a82eef 100644
--- a/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.h
+++ b/vcl/osx/a11ytextattributeswrapper.h
@@ -17,16 +17,16 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YTEXTATTRIBUTESWRAPPER_H
-#define INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YTEXTATTRIBUTESWRAPPER_H
+#ifndef INCLUDED_VCL_OSX_A11YTEXTATTRIBUTESWRAPPER_H
+#define INCLUDED_VCL_OSX_A11YTEXTATTRIBUTESWRAPPER_H
 
-#include "aqua/aqua11ywrapper.h"
+#include "osx/a11ywrapper.h"
 
 @interface AquaA11yTextAttributesWrapper : NSObject
 {
 }
 +(NSMutableAttributedString *)createAttributedStringForElement:(AquaA11yWrapper *)wrapper inOrigRange:(id)origRange;
 @end
-#endif // INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YTEXTATTRIBUTESWRAPPER_H
+#endif // INCLUDED_VCL_OSX_A11YTEXTATTRIBUTESWRAPPER_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm b/vcl/osx/a11ytextattributeswrapper.mm
index a30b8d2c242a..339103740be0 100644
--- a/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm
+++ b/vcl/osx/a11ytextattributeswrapper.mm
@@ -18,11 +18,11 @@
  */
 
 
-#include "aqua/salinst.h"
+#include "osx/salinst.h"
 #include "quartz/utils.h"
-#include "coretext/salgdi.h"
+#include "quartz/salgdi.h"
 
-#include "aqua11ytextattributeswrapper.h"
+#include "a11ytextattributeswrapper.h"
 
 #include <com/sun/star/accessibility/AccessibleTextType.hpp>
 #include <com/sun/star/awt/FontUnderline.hpp>
diff --git a/vcl/aqua/source/a11y/aqua11ytextwrapper.h b/vcl/osx/a11ytextwrapper.h
index 91b2bd929538..c1830a2072c6 100644
--- a/vcl/aqua/source/a11y/aqua11ytextwrapper.h
+++ b/vcl/osx/a11ytextwrapper.h
@@ -17,11 +17,11 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YTEXTWRAPPER_H
-#define INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YTEXTWRAPPER_H
+#ifndef INCLUDED_VCL_OSX_A11YTEXTWRAPPER_H
+#define INCLUDED_VCL_OSX_A11YTEXTWRAPPER_H
 
-#include "aqua/aquavcltypes.h"
-#include "aqua/aqua11ywrapper.h"
+#include "osx/osxvcltypes.h"
+#include "osx/a11ywrapper.h"
 
 @interface AquaA11yTextWrapper : NSObject
 {
@@ -53,6 +53,6 @@
 +(void)setValueAttributeForElement:(AquaA11yWrapper *)wrapper to:(id)value;
 @end
 
-#endif // INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YTEXTWRAPPER_H
+#endif // INCLUDED_VCL_OSX_A11YTEXTWRAPPER_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11ytextwrapper.mm b/vcl/osx/a11ytextwrapper.mm
index ab02eaf7ef3a..29d525d8b7bf 100644
--- a/vcl/aqua/source/a11y/aqua11ytextwrapper.mm
+++ b/vcl/osx/a11ytextwrapper.mm
@@ -18,11 +18,11 @@
  */
 
 
-#include "aqua/salinst.h"
+#include "osx/salinst.h"
 #include "quartz/utils.h"
-#include "aqua11ytextwrapper.h"
-#include "aqua11ytextattributeswrapper.h"
-#include "aqua11yutil.h"
+#include "a11ytextwrapper.h"
+#include "a11ytextattributeswrapper.h"
+#include "a11yutil.h"
 
 #include <com/sun/star/accessibility/AccessibleTextType.hpp>
 #include <com/sun/star/awt/Rectangle.hpp>
diff --git a/vcl/aqua/source/a11y/aqua11yutil.h b/vcl/osx/a11yutil.h
index 6f597dc354b0..5cc5dc4582f9 100644
--- a/vcl/aqua/source/a11y/aqua11yutil.h
+++ b/vcl/osx/a11yutil.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YUTIL_H
-#define INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YUTIL_H
+#ifndef INCLUDED_VCL_OSX_A11YUTIL_H
+#define INCLUDED_VCL_OSX_A11YUTIL_H
 
 #include <com/sun/star/awt/Point.hpp>
 
@@ -28,5 +28,5 @@
 +(::com::sun::star::awt::Point)nsPointToVclPoint:(NSValue *)nsPoint;
 @end
 
-#endif // INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YUTIL_H
+#endif // INCLUDED_VCL_OSX_A11YUTIL_H
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11yutil.mm b/vcl/osx/a11yutil.mm
index 086fa0a7090d..68438643ace7 100644
--- a/vcl/aqua/source/a11y/aqua11yutil.mm
+++ b/vcl/osx/a11yutil.mm
@@ -18,9 +18,9 @@
  */
 
 
-#include "aqua/aquavcltypes.h"
+#include "osx/osxvcltypes.h"
 
-#include "aqua11yutil.h"
+#include "a11yutil.h"
 
 using namespace ::com::sun::star::awt;
 
diff --git a/vcl/aqua/source/a11y/aqua11yvaluewrapper.h b/vcl/osx/a11yvaluewrapper.h
index 6aa2eab1331d..3ff33d491424 100644
--- a/vcl/aqua/source/a11y/aqua11yvaluewrapper.h
+++ b/vcl/osx/a11yvaluewrapper.h
@@ -17,12 +17,12 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YVALUEWRAPPER_H
-#define INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YVALUEWRAPPER_H
+#ifndef INCLUDED_VCL_OSX_A11YVALUEWRAPPER_H
+#define INCLUDED_VCL_OSX_A11YVALUEWRAPPER_H
 
-#include "aqua/salinst.h"
-#include "aqua/aquavcltypes.h"
-#include "aqua/aqua11ywrapper.h"
+#include "osx/salinst.h"
+#include "osx/osxvcltypes.h"
+#include "osx/a11ywrapper.h"
 
 @interface AquaA11yValueWrapper : NSObject
 {
@@ -35,6 +35,6 @@
 +(void)setValueAttributeForElement:(AquaA11yWrapper *)wrapper to:(id)value;
 @end
 
-#endif // INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YVALUEWRAPPER_H
+#endif // INCLUDED_VCL_OSX_A11YVALUEWRAPPER_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11yvaluewrapper.mm b/vcl/osx/a11yvaluewrapper.mm
index 93a479a8a7a5..539eb9124f67 100644
--- a/vcl/aqua/source/a11y/aqua11yvaluewrapper.mm
+++ b/vcl/osx/a11yvaluewrapper.mm
@@ -18,8 +18,8 @@
  */
 
 
-#include "aqua11yvaluewrapper.h"
-#include "aqua11ywrapperstatictext.h"
+#include "a11yvaluewrapper.h"
+#include "a11ywrapperstatictext.h"
 
 using namespace ::com::sun::star::uno;
 
diff --git a/vcl/aqua/source/a11y/aqua11ywrapper.mm b/vcl/osx/a11ywrapper.mm
index 672fad532df3..85ee3ff3ab05 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapper.mm
+++ b/vcl/osx/a11ywrapper.mm
@@ -18,24 +18,24 @@
  */
 
 
-#include "aqua/salinst.h"
-#include "aqua/saldata.hxx"
+#include "osx/salinst.h"
+#include "osx/saldata.hxx"
 
-#include "aqua/aqua11ywrapper.h"
-#include "aqua/aqua11ylistener.hxx"
-#include "aqua/aqua11yfactory.h"
-#include "aqua/aqua11yfocustracker.hxx"
+#include "osx/a11ywrapper.h"
+#include "osx/a11ylistener.hxx"
+#include "osx/a11yfactory.h"
+#include "osx/a11yfocustracker.hxx"
 
 #include "quartz/utils.h"
 
-#include "aqua11yfocuslistener.hxx"
-#include "aqua11yactionwrapper.h"
-#include "aqua11ycomponentwrapper.h"
-#include "aqua11yselectionwrapper.h"
-#include "aqua11ytablewrapper.h"
-#include "aqua11ytextwrapper.h"
-#include "aqua11yvaluewrapper.h"
-#include "aqua11yrolehelper.h"
+#include "a11yfocuslistener.hxx"
+#include "a11yactionwrapper.h"
+#include "a11ycomponentwrapper.h"
+#include "a11yselectionwrapper.h"
+#include "a11ytablewrapper.h"
+#include "a11ytextwrapper.h"
+#include "a11yvaluewrapper.h"
+#include "a11yrolehelper.h"
 
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
diff --git a/vcl/aqua/source/a11y/aqua11ywrapperbutton.h b/vcl/osx/a11ywrapperbutton.h
index ecb747f05016..0bf115f130be 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapperbutton.h
+++ b/vcl/osx/a11ywrapperbutton.h
@@ -17,10 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERBUTTON_H
-#define INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERBUTTON_H
+#ifndef INCLUDED_VCL_OSX_A11YWRAPPERBUTTON_H
+#define INCLUDED_VCL_OSX_A11YWRAPPERBUTTON_H
 
-#include "aqua/aqua11ywrapper.h"
+#include "osx/a11ywrapper.h"
 
 @interface AquaA11yWrapperButton : AquaA11yWrapper
 {
@@ -30,6 +30,6 @@
 -(NSArray *)accessibilityAttributeNames;
 @end
 
-#endif // INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERBUTTON_H
+#endif // INCLUDED_VCL_OSX_A11YWRAPPERBUTTON_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11ywrapperbutton.mm b/vcl/osx/a11ywrapperbutton.mm
index f1e832261156..eab7e07d00e3 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapperbutton.mm
+++ b/vcl/osx/a11ywrapperbutton.mm
@@ -18,10 +18,10 @@
  */
 
 
-#include "aqua/salinst.h"
+#include "osx/salinst.h"
 
-#include "aqua11ywrapperbutton.h"
-#include "aqua11ytextwrapper.h"
+#include "a11ywrapperbutton.h"
+#include "a11ytextwrapper.h"
 
 // Wrapper for AXButton role
 
diff --git a/vcl/aqua/source/a11y/aqua11ywrappercheckbox.h b/vcl/osx/a11ywrappercheckbox.h
index d5d4a89f4687..58cd2986e41e 100644
--- a/vcl/aqua/source/a11y/aqua11ywrappercheckbox.h
+++ b/vcl/osx/a11ywrappercheckbox.h
@@ -17,10 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERCHECKBOX_H
-#define INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERCHECKBOX_H
+#ifndef INCLUDED_VCL_OSX_A11YWRAPPERCHECKBOX_H
+#define INCLUDED_VCL_OSX_A11YWRAPPERCHECKBOX_H
 
-#include "aqua/aqua11ywrapper.h"
+#include "osx/a11ywrapper.h"
 
 @interface AquaA11yWrapperCheckBox : AquaA11yWrapper
 {
@@ -30,6 +30,6 @@
 -(NSArray *)accessibilityAttributeNames;
 @end
 
-#endif // INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERCHECKBOX_H
+#endif // INCLUDED_VCL_OSX_A11YWRAPPERCHECKBOX_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11ywrappercheckbox.mm b/vcl/osx/a11ywrappercheckbox.mm
index 288dfe9cd4c5..e8ea2a00b9d6 100644
--- a/vcl/aqua/source/a11y/aqua11ywrappercheckbox.mm
+++ b/vcl/osx/a11ywrappercheckbox.mm
@@ -18,11 +18,11 @@
  */
 
 
-#include "aqua/salinst.h"
+#include "osx/salinst.h"
 
-#include "aqua11ywrappercheckbox.h"
-#include "aqua11yvaluewrapper.h"
-#include "aqua11ytextwrapper.h"
+#include "a11ywrappercheckbox.h"
+#include "a11yvaluewrapper.h"
+#include "a11ytextwrapper.h"
 
 // Wrapper for AXCheckbox role
 
diff --git a/vcl/aqua/source/a11y/aqua11ywrappercombobox.h b/vcl/osx/a11ywrappercombobox.h
index 6c8c1fef190b..13058844b746 100644
--- a/vcl/aqua/source/a11y/aqua11ywrappercombobox.h
+++ b/vcl/osx/a11ywrappercombobox.h
@@ -17,10 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERCOMBOBOX_H
-#define INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERCOMBOBOX_H
+#ifndef INCLUDED_VCL_OSX_A11YWRAPPERCOMBOBOX_H
+#define INCLUDED_VCL_OSX_A11YWRAPPERCOMBOBOX_H
 
-#include "aqua/aqua11ywrapper.h"
+#include "osx/a11ywrapper.h"
 #include <com/sun/star/accessibility/XAccessibleContext.hpp>
 
 @interface AquaA11yWrapperComboBox : AquaA11yWrapper
@@ -39,6 +39,6 @@
 -(NSArray *)accessibilityAttributeNames;
 @end
 
-#endif // INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERCOMBOBOX_H
+#endif // INCLUDED_VCL_OSX_A11YWRAPPERCOMBOBOX_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11ywrappercombobox.mm b/vcl/osx/a11ywrappercombobox.mm
index 554a9464f7b1..2467718c79d4 100644
--- a/vcl/aqua/source/a11y/aqua11ywrappercombobox.mm
+++ b/vcl/osx/a11ywrappercombobox.mm
@@ -18,10 +18,10 @@
  */
 
 
-#include "aqua/salinst.h"
+#include "osx/salinst.h"
 
-#include "aqua11ywrappercombobox.h"
-#include "aqua11yrolehelper.h"
+#include "a11ywrappercombobox.h"
+#include "a11yrolehelper.h"
 
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
 
diff --git a/vcl/aqua/source/a11y/aqua11ywrappergroup.h b/vcl/osx/a11ywrappergroup.h
index d018927950c7..af2baea63e11 100644
--- a/vcl/aqua/source/a11y/aqua11ywrappergroup.h
+++ b/vcl/osx/a11ywrappergroup.h
@@ -17,10 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERGROUP_H
-#define INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERGROUP_H
+#ifndef INCLUDED_VCL_OSX_A11YWRAPPERGROUP_H
+#define INCLUDED_VCL_OSX_A11YWRAPPERGROUP_H
 
-#include "aqua/aqua11ywrapper.h"
+#include "osx/a11ywrapper.h"
 
 @interface AquaA11yWrapperGroup : AquaA11yWrapper
 {
@@ -29,6 +29,6 @@
 -(NSArray *)accessibilityAttributeNames;
 @end
 
-#endif // INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERGROUP_H
+#endif // INCLUDED_VCL_OSX_A11YWRAPPERGROUP_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11ywrappergroup.mm b/vcl/osx/a11ywrappergroup.mm
index 4ca15d8aacc7..3eb864fc7eb8 100644
--- a/vcl/aqua/source/a11y/aqua11ywrappergroup.mm
+++ b/vcl/osx/a11ywrappergroup.mm
@@ -18,8 +18,8 @@
  */
 
 
-#include "aqua/salinst.h"
-#include "aqua11ywrappergroup.h"
+#include "osx/salinst.h"
+#include "a11ywrappergroup.h"
 
 // Wrapper for AXGroup role
 
diff --git a/vcl/aqua/source/a11y/aqua11ywrapperlist.h b/vcl/osx/a11ywrapperlist.h
index 14fc22b4afc3..65f605a173b1 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapperlist.h
+++ b/vcl/osx/a11ywrapperlist.h
@@ -17,10 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERLIST_H
-#define INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERLIST_H
+#ifndef INCLUDED_VCL_OSX_A11YWRAPPERLIST_H
+#define INCLUDED_VCL_OSX_A11YWRAPPERLIST_H
 
-#include "aqua/aqua11ywrapper.h"
+#include "osx/a11ywrapper.h"
 
 @interface AquaA11yWrapperList : AquaA11yWrapper
 {
@@ -28,6 +28,6 @@
 -(NSArray *)accessibilityAttributeNames;
 @end
 
-#endif // INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERLIST_H
+#endif // INCLUDED_VCL_OSX_A11YWRAPPERLIST_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11ywrapperlist.mm b/vcl/osx/a11ywrapperlist.mm
index e75aac496bf1..e10bf727858f 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapperlist.mm
+++ b/vcl/osx/a11ywrapperlist.mm
@@ -18,8 +18,8 @@
  */
 
 
-#include "aqua/salinst.h"
-#include "aqua11ywrapperlist.h"
+#include "osx/salinst.h"
+#include "a11ywrapperlist.h"
 
 using namespace ::com::sun::star::accessibility;
 
diff --git a/vcl/aqua/source/a11y/aqua11ywrapperradiobutton.h b/vcl/osx/a11ywrapperradiobutton.h
index 9b31303dfb21..83e3f5fc9e89 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapperradiobutton.h
+++ b/vcl/osx/a11ywrapperradiobutton.h
@@ -17,10 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERRADIOBUTTON_H
-#define INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERRADIOBUTTON_H
+#ifndef INCLUDED_VCL_OSX_A11YWRAPPERRADIOBUTTON_H
+#define INCLUDED_VCL_OSX_A11YWRAPPERRADIOBUTTON_H
 
-#include "aqua/aqua11ywrapper.h"
+#include "osx/a11ywrapper.h"
 
 @interface AquaA11yWrapperRadioButton : AquaA11yWrapper
 {
@@ -30,6 +30,6 @@
 -(NSArray *)accessibilityAttributeNames;
 @end
 
-#endif // INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERRADIOBUTTON_H
+#endif // INCLUDED_VCL_OSX_A11YWRAPPERRADIOBUTTON_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11ywrapperradiobutton.mm b/vcl/osx/a11ywrapperradiobutton.mm
index b4f08f103565..cfd8dbd23871 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapperradiobutton.mm
+++ b/vcl/osx/a11ywrapperradiobutton.mm
@@ -18,10 +18,10 @@
  */
 
 
-#include "aqua/salinst.h"
-#include "aqua11ywrapperradiobutton.h"
-#include "aqua11ytextwrapper.h"
-#include "aqua11yvaluewrapper.h"
+#include "osx/salinst.h"
+#include "a11ywrapperradiobutton.h"
+#include "a11ytextwrapper.h"
+#include "a11yvaluewrapper.h"
 
 // Wrapper for AXRadioButton role
 
diff --git a/vcl/aqua/source/a11y/aqua11ywrapperradiogroup.h b/vcl/osx/a11ywrapperradiogroup.h
index d02193d05570..6ae98cbfd583 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapperradiogroup.h
+++ b/vcl/osx/a11ywrapperradiogroup.h
@@ -17,10 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERRADIOGROUP_H
-#define INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERRADIOGROUP_H
+#ifndef INCLUDED_VCL_OSX_A11YWRAPPERRADIOGROUP_H
+#define INCLUDED_VCL_OSX_A11YWRAPPERRADIOGROUP_H
 
-#include "aqua/aqua11ywrapper.h"
+#include "osx/a11ywrapper.h"
 
 @interface AquaA11yWrapperRadioGroup : AquaA11yWrapper
 {
@@ -28,6 +28,6 @@
 -(NSArray *)accessibilityAttributeNames;
 @end
 
-#endif // INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERRADIOGROUP_H
+#endif // INCLUDED_VCL_OSX_A11YWRAPPERRADIOGROUP_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11ywrapperradiogroup.mm b/vcl/osx/a11ywrapperradiogroup.mm
index b8c7ddbd2909..d66192df67bb 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapperradiogroup.mm
+++ b/vcl/osx/a11ywrapperradiogroup.mm
@@ -18,9 +18,9 @@
  */
 
 
-#include "aqua/salinst.h"
-#include "aqua11ywrapperradiogroup.h"
-#include "aqua11ytextwrapper.h"
+#include "osx/salinst.h"
+#include "a11ywrapperradiogroup.h"
+#include "a11ytextwrapper.h"
 
 // Wrapper for AXRadioGroup role
 
diff --git a/vcl/aqua/source/a11y/aqua11ywrapperrow.h b/vcl/osx/a11ywrapperrow.h
index fa7b64d12a5e..45cd7477d6ec 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapperrow.h
+++ b/vcl/osx/a11ywrapperrow.h
@@ -17,10 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERROW_H
-#define INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERROW_H
+#ifndef INCLUDED_VCL_OSX_A11YWRAPPERROW_H
+#define INCLUDED_VCL_OSX_A11YWRAPPERROW_H
 
-#include "aqua/aqua11ywrapper.h"
+#include "osx/a11ywrapper.h"
 
 @interface AquaA11yWrapperRow : AquaA11yWrapper
 {
@@ -29,6 +29,6 @@
 -(NSArray *)accessibilityAttributeNames;
 @end
 
-#endif // INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERROW_H
+#endif // INCLUDED_VCL_OSX_A11YWRAPPERROW_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11ywrapperrow.mm b/vcl/osx/a11ywrapperrow.mm
index d62b3edb1ddb..8bcef8032cd3 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapperrow.mm
+++ b/vcl/osx/a11ywrapperrow.mm
@@ -18,10 +18,10 @@
  */
 
 
-#include "aqua/salinst.h"
+#include "osx/salinst.h"
 
-#include "aqua11ywrapperrow.h"
-#include "aqua11ytextwrapper.h"
+#include "a11ywrapperrow.h"
+#include "a11ytextwrapper.h"
 
 // Wrapper for AXRow role
 
diff --git a/vcl/aqua/source/a11y/aqua11ywrapperscrollarea.h b/vcl/osx/a11ywrapperscrollarea.h
index e58acb207c67..35a2aa15a028 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapperscrollarea.h
+++ b/vcl/osx/a11ywrapperscrollarea.h
@@ -17,10 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERSCROLLAREA_H
-#define INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERSCROLLAREA_H
+#ifndef INCLUDED_VCL_OSX_A11YWRAPPERSCROLLAREA_H
+#define INCLUDED_VCL_OSX_A11YWRAPPERSCROLLAREA_H
 
-#include "aqua/aqua11ywrapper.h"
+#include "osx/a11ywrapper.h"
 
 @interface AquaA11yWrapperScrollArea : AquaA11yWrapper
 {
@@ -30,6 +30,6 @@
 -(NSArray *)accessibilityAttributeNames;
 @end
 
-#endif // INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERSCROLLAREA_H
+#endif // INCLUDED_VCL_OSX_A11YWRAPPERSCROLLAREA_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11ywrapperscrollarea.mm b/vcl/osx/a11ywrapperscrollarea.mm
index e447ce6f9f44..f70f44962ddb 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapperscrollarea.mm
+++ b/vcl/osx/a11ywrapperscrollarea.mm
@@ -18,11 +18,11 @@
  */
 
 
-#include "aqua/salinst.h"
+#include "osx/salinst.h"
 
-#include "aqua11ywrapperscrollarea.h"
-#include "aqua11ywrapperscrollbar.h"
-#include "aqua11yrolehelper.h"
+#include "a11ywrapperscrollarea.h"
+#include "a11ywrapperscrollbar.h"
+#include "a11yrolehelper.h"
 
 // Wrapper for AXScrollArea role
 
diff --git a/vcl/aqua/source/a11y/aqua11ywrapperscrollbar.h b/vcl/osx/a11ywrapperscrollbar.h
index c2ca6d93b81e..a6d87079a31b 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapperscrollbar.h
+++ b/vcl/osx/a11ywrapperscrollbar.h
@@ -17,10 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERSCROLLBAR_H
-#define INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERSCROLLBAR_H
+#ifndef INCLUDED_VCL_OSX_A11YWRAPPERSCROLLBAR_H
+#define INCLUDED_VCL_OSX_A11YWRAPPERSCROLLBAR_H
 
-#include "aqua/aqua11ywrapper.h"
+#include "osx/a11ywrapper.h"
 
 @interface AquaA11yWrapperScrollBar : AquaA11yWrapper
 {
@@ -28,6 +28,6 @@
 -(NSArray *)accessibilityAttributeNames;
 @end
 
-#endif // INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERSCROLLBAR_H
+#endif // INCLUDED_VCL_OSX_A11YWRAPPERSCROLLBAR_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11ywrapperscrollbar.mm b/vcl/osx/a11ywrapperscrollbar.mm
index 7fdaf413a106..3717cafc883b 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapperscrollbar.mm
+++ b/vcl/osx/a11ywrapperscrollbar.mm
@@ -18,9 +18,9 @@
  */
 
 
-#include "aqua/salinst.h"
+#include "osx/salinst.h"
 
-#include "aqua11ywrapperscrollbar.h"
+#include "a11ywrapperscrollbar.h"
 
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
 
diff --git a/vcl/aqua/source/a11y/aqua11ywrappersplitter.h b/vcl/osx/a11ywrappersplitter.h
index 27eaa9b47272..18cdb6e0cdca 100644
--- a/vcl/aqua/source/a11y/aqua11ywrappersplitter.h
+++ b/vcl/osx/a11ywrappersplitter.h
@@ -17,10 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERSPLITTER_H
-#define INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERSPLITTER_H
+#ifndef INCLUDED_VCL_OSX_A11YWRAPPERSPLITTER_H
+#define INCLUDED_VCL_OSX_A11YWRAPPERSPLITTER_H
 
-#include "aqua/aqua11ywrapper.h"
+#include "osx/a11ywrapper.h"
 
 @interface AquaA11yWrapperSplitter : AquaA11yWrapper
 {
@@ -28,6 +28,6 @@
 -(NSArray *)accessibilityAttributeNames;
 @end
 
-#endif // INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERSPLITTER_H
+#endif // INCLUDED_VCL_OSX_A11YWRAPPERSPLITTER_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11ywrappersplitter.mm b/vcl/osx/a11ywrappersplitter.mm
index ab2095ba0af9..66db6dc92f36 100644
--- a/vcl/aqua/source/a11y/aqua11ywrappersplitter.mm
+++ b/vcl/osx/a11ywrappersplitter.mm
@@ -18,8 +18,8 @@
  */
 
 
-#include "aqua/salinst.h"
-#include "aqua11ywrappersplitter.h"
+#include "osx/salinst.h"
+#include "a11ywrappersplitter.h"
 
 using namespace ::com::sun::star::accessibility;
 
diff --git a/vcl/aqua/source/a11y/aqua11ywrapperstatictext.h b/vcl/osx/a11ywrapperstatictext.h
index 627d6e37b2a2..a210d80b7550 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapperstatictext.h
+++ b/vcl/osx/a11ywrapperstatictext.h
@@ -17,10 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERSTATICTEXT_H
-#define INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERSTATICTEXT_H
+#ifndef INCLUDED_VCL_OSX_A11YWRAPPERSTATICTEXT_H
+#define INCLUDED_VCL_OSX_A11YWRAPPERSTATICTEXT_H
 
-#include "aqua/aqua11ywrapper.h"
+#include "osx/a11ywrapper.h"
 
 @interface AquaA11yWrapperStaticText : AquaA11yWrapper
 {
@@ -29,6 +29,6 @@
 -(NSArray *)accessibilityAttributeNames;
 @end
 
-#endif // INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERSTATICTEXT_H
+#endif // INCLUDED_VCL_OSX_A11YWRAPPERSTATICTEXT_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11ywrapperstatictext.mm b/vcl/osx/a11ywrapperstatictext.mm
index aa871a869802..ce0d7c425d92 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapperstatictext.mm
+++ b/vcl/osx/a11ywrapperstatictext.mm
@@ -18,8 +18,8 @@
  */
 
 
-#include "aqua/salinst.h"
-#include "aqua11ywrapperstatictext.h"
+#include "osx/salinst.h"
+#include "a11ywrapperstatictext.h"
 
 // Wrapper for AXStaticText role
 
diff --git a/vcl/aqua/source/a11y/aqua11ywrappertabgroup.h b/vcl/osx/a11ywrappertabgroup.h
index bd0937e3b3f8..b340d7506995 100644
--- a/vcl/aqua/source/a11y/aqua11ywrappertabgroup.h
+++ b/vcl/osx/a11ywrappertabgroup.h
@@ -17,10 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERTABGROUP_H
-#define INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERTABGROUP_H
+#ifndef INCLUDED_VCL_OSX_A11YWRAPPERTABGROUP_H
+#define INCLUDED_VCL_OSX_A11YWRAPPERTABGROUP_H
 
-#include "aqua/aqua11ywrapper.h"
+#include "osx/a11ywrapper.h"
 
 @interface AquaA11yWrapperTabGroup : AquaA11yWrapper
 {
@@ -28,6 +28,6 @@
 -(NSArray *)accessibilityAttributeNames;
 @end
 
-#endif // INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERTABGROUP_H
+#endif // INCLUDED_VCL_OSX_A11YWRAPPERTABGROUP_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11ywrappertabgroup.mm b/vcl/osx/a11ywrappertabgroup.mm
index 65209219e0e3..0174e43093e2 100644
--- a/vcl/aqua/source/a11y/aqua11ywrappertabgroup.mm
+++ b/vcl/osx/a11ywrappertabgroup.mm
@@ -18,8 +18,8 @@
  */
 
 
-#include "aqua/salinst.h"
-#include "aqua11ywrappertabgroup.h"
+#include "osx/salinst.h"
+#include "a11ywrappertabgroup.h"
 
 // Wrapper for AXTabGroup role
 
diff --git a/vcl/aqua/source/a11y/aqua11ywrappertextarea.h b/vcl/osx/a11ywrappertextarea.h
index e39fcdc6e39a..a0cf4f68d6af 100644
--- a/vcl/aqua/source/a11y/aqua11ywrappertextarea.h
+++ b/vcl/osx/a11ywrappertextarea.h
@@ -17,10 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERTEXTAREA_H
-#define INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERTEXTAREA_H
+#ifndef INCLUDED_VCL_OSX_A11YWRAPPERTEXTAREA_H
+#define INCLUDED_VCL_OSX_A11YWRAPPERTEXTAREA_H
 
-#include "aqua/aqua11ywrapper.h"
+#include "osx/a11ywrapper.h"
 
 @interface AquaA11yWrapperTextArea : AquaA11yWrapper
 {
@@ -28,6 +28,6 @@
 -(NSArray *)accessibilityAttributeNames;
 @end
 
-#endif // INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERTEXTAREA_H
+#endif // INCLUDED_VCL_OSX_A11YWRAPPERTEXTAREA_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11ywrappertextarea.mm b/vcl/osx/a11ywrappertextarea.mm
index 2949a6381624..9b4fbf995733 100644
--- a/vcl/aqua/source/a11y/aqua11ywrappertextarea.mm
+++ b/vcl/osx/a11ywrappertextarea.mm
@@ -18,8 +18,8 @@
  */
 
 
-#include "aqua/salinst.h"
-#include "aqua11ywrappertextarea.h"
+#include "osx/salinst.h"
+#include "a11ywrappertextarea.h"
 
 // Wrapper for AXTextArea role
 
diff --git a/vcl/aqua/source/a11y/aqua11ywrappertoolbar.h b/vcl/osx/a11ywrappertoolbar.h
index 6c388216e565..64bd14250e9e 100644
--- a/vcl/aqua/source/a11y/aqua11ywrappertoolbar.h
+++ b/vcl/osx/a11ywrappertoolbar.h
@@ -17,10 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERTOOLBAR_H
-#define INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERTOOLBAR_H
+#ifndef INCLUDED_VCL_OSX_A11YWRAPPERTOOLBAR_H
+#define INCLUDED_VCL_OSX_A11YWRAPPERTOOLBAR_H
 
-#include "aqua/aqua11ywrapper.h"
+#include "osx/a11ywrapper.h"
 
 @interface AquaA11yWrapperToolbar : AquaA11yWrapper
 {
@@ -28,6 +28,6 @@
 -(NSArray *)accessibilityAttributeNames;
 @end
 
-#endif // INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERTOOLBAR_H
+#endif // INCLUDED_VCL_OSX_A11YWRAPPERTOOLBAR_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11ywrappertoolbar.mm b/vcl/osx/a11ywrappertoolbar.mm
index 76c1bc649058..9636d7882705 100644
--- a/vcl/aqua/source/a11y/aqua11ywrappertoolbar.mm
+++ b/vcl/osx/a11ywrappertoolbar.mm
@@ -18,8 +18,8 @@
  */
 
 
-#include "aqua/salinst.h"
-#include "aqua11ywrappertoolbar.h"
+#include "osx/salinst.h"
+#include "a11ywrappertoolbar.h"
 
 // Wrapper for AXToolbar role
 
diff --git a/vcl/aqua/source/dtrans/aqua_clipboard.cxx b/vcl/osx/clipboard.cxx
index ac3bcaee1d60..72feefe5bdb6 100644
--- a/vcl/aqua/source/dtrans/aqua_clipboard.cxx
+++ b/vcl/osx/clipboard.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "aqua_clipboard.hxx"
+#include "clipboard.hxx"
 
 #include "DataFlavorMapping.hxx"
 #include "OSXTransferable.hxx"
diff --git a/vcl/aqua/source/dtrans/aqua_clipboard.hxx b/vcl/osx/clipboard.hxx
index ba0aecd9f172..1424e34fc4d4 100644
--- a/vcl/aqua/source/dtrans/aqua_clipboard.hxx
+++ b/vcl/osx/clipboard.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_VCL_AQUA_SOURCE_DTRANS_AQUA_CLIPBOARD_HXX
-#define INCLUDED_VCL_AQUA_SOURCE_DTRANS_AQUA_CLIPBOARD_HXX
+#ifndef INCLUDED_VCL_OSX_CLIPBOARD_HXX
+#define INCLUDED_VCL_OSX_CLIPBOARD_HXX
 
 #include "DataFlavorMapping.hxx"
 #include <rtl/ustring.hxx>
@@ -170,6 +170,6 @@ private:
   EventListener* mEventListener;
 };
 
-#endif
+#endif // INCLUDED_VCL_OSX_CLIPBOARD_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/documentfocuslistener.cxx b/vcl/osx/documentfocuslistener.cxx
index ac65f1e84338..ac65f1e84338 100644
--- a/vcl/aqua/source/a11y/documentfocuslistener.cxx
+++ b/vcl/osx/documentfocuslistener.cxx
diff --git a/vcl/aqua/source/a11y/documentfocuslistener.hxx b/vcl/osx/documentfocuslistener.hxx
index 1baba33597d7..1a604a677df5 100644
--- a/vcl/aqua/source/a11y/documentfocuslistener.hxx
+++ b/vcl/osx/documentfocuslistener.hxx
@@ -17,14 +17,14 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_VCL_AQUA_SOURCE_A11Y_DOCUMENTFOCUSLISTENER_HXX
-#define INCLUDED_VCL_AQUA_SOURCE_A11Y_DOCUMENTFOCUSLISTENER_HXX
+#ifndef INCLUDED_VCL_OSX_DOCUMENTFOCUSLISTENER_HXX
+#define INCLUDED_VCL_OSX_DOCUMENTFOCUSLISTENER_HXX
 
 #include <com/sun/star/accessibility/XAccessibleEventListener.hpp>
 
 #include <cppuhelper/implbase1.hxx>
 
-#include "aqua/aqua11yfocustracker.hxx"
+#include "osx/a11yfocustracker.hxx"
 
 #include <set>
 
@@ -87,5 +87,6 @@ private:
     AquaA11yFocusTracker& m_aFocusTracker;
 };
 
-#endif // INCLUDED_VCL_AQUA_SOURCE_A11Y_DOCUMENTFOCUSLISTENER_HXX
+#endif // INCLUDED_VCL_OSX_DOCUMENTFOCUSLISTENER_HXX
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/gdi/aquaprintaccessoryview.mm b/vcl/osx/printaccessoryview.mm
index 5c6ea0e0162c..517dcc09975f 100644
--- a/vcl/aqua/source/gdi/aquaprintaccessoryview.mm
+++ b/vcl/osx/printaccessoryview.mm
@@ -27,8 +27,8 @@
 #include "vcl/svapp.hxx"
 #include "vcl/unohelp.hxx"
 
-#include "aqua/aquaprintview.h"
-#include "aqua/salinst.h"
+#include "osx/printview.h"
+#include "osx/salinst.h"
 #include "quartz/utils.h"
 
 #include "svdata.hxx"
@@ -499,7 +499,7 @@ static void filterAccelerator( rtl::OUString& io_rText )
     }
     else
     {
-        SAL_INFO( "vcl.aqua.print", "Unsupported class" << ([pSender class] ? [NSStringFromClass([pSender class]) UTF8String] : "nil"));
+        SAL_INFO( "vcl.osx.print", "Unsupported class" << ([pSender class] ? [NSStringFromClass([pSender class]) UTF8String] : "nil"));
     }
     mpController->updateEnableState();
 }
@@ -531,7 +531,7 @@ static void filterAccelerator( rtl::OUString& io_rText )
     }
     else
     {
-        SAL_INFO( "vcl.aqua.print", "Unsupported class" << ([pSender class] ? [NSStringFromClass([pSender class]) UTF8String] : "nil"));
+        SAL_INFO( "vcl.osx.print", "Unsupported class" << ([pSender class] ? [NSStringFromClass([pSender class]) UTF8String] : "nil"));
     }
     mpController->updateEnableState();
 }
@@ -1338,7 +1338,7 @@ static void addEdit( NSView* pCurParent, long& rCurX, long& rCurY, long nAttachO
         }
         else
         {
-            SAL_INFO( "vcl.aqua.print", "Unsupported UI option \"" << aCtrlType << "\"");
+            SAL_INFO( "vcl.osx.print", "Unsupported UI option \"" << aCtrlType << "\"");
         }
     }
         
diff --git a/vcl/aqua/source/gdi/aquaprintview.mm b/vcl/osx/printview.mm
index d7957eecb5e2..d2f4ac006d71 100644
--- a/vcl/aqua/source/gdi/aquaprintview.mm
+++ b/vcl/osx/printview.mm
@@ -20,8 +20,8 @@
 
 #include "vcl/print.hxx"
 
-#include "aqua/aquaprintview.h"
-#include "aqua/salprn.h"
+#include "osx/printview.h"
+#include "osx/salprn.h"
 
 @implementation AquaPrintView
 -(id)initWithController: (vcl::PrinterController*)pController withInfoPrinter: (AquaSalInfoPrinter*)pInfoPrinter
diff --git a/vcl/aqua/source/res/MainMenu.nib/classes.nib b/vcl/osx/res/MainMenu.nib/classes.nib
index b9b4b09f6b0d..b9b4b09f6b0d 100644
--- a/vcl/aqua/source/res/MainMenu.nib/classes.nib
+++ b/vcl/osx/res/MainMenu.nib/classes.nib
diff --git a/vcl/aqua/source/res/MainMenu.nib/info.nib b/vcl/osx/res/MainMenu.nib/info.nib
index 856429aee5bd..856429aee5bd 100644
--- a/vcl/aqua/source/res/MainMenu.nib/info.nib
+++ b/vcl/osx/res/MainMenu.nib/info.nib
diff --git a/vcl/aqua/source/res/MainMenu.nib/keyedobjects.nib b/vcl/osx/res/MainMenu.nib/keyedobjects.nib
index d39d10119c0c..d39d10119c0c 100644
--- a/vcl/aqua/source/res/MainMenu.nib/keyedobjects.nib
+++ b/vcl/osx/res/MainMenu.nib/keyedobjects.nib
diff --git a/vcl/aqua/source/res/cursors/airbrush.png b/vcl/osx/res/cursors/airbrush.png
index 7ec780c4f9f9..7ec780c4f9f9 100644
--- a/vcl/aqua/source/res/cursors/airbrush.png
+++ b/vcl/osx/res/cursors/airbrush.png
diff --git a/vcl/aqua/source/res/cursors/ase.png b/vcl/osx/res/cursors/ase.png
index a3a30e0bcdce..a3a30e0bcdce 100644
--- a/vcl/aqua/source/res/cursors/ase.png
+++ b/vcl/osx/res/cursors/ase.png
diff --git a/vcl/aqua/source/res/cursors/asn.png b/vcl/osx/res/cursors/asn.png
index 7a140b1ec926..7a140b1ec926 100644
--- a/vcl/aqua/source/res/cursors/asn.png
+++ b/vcl/osx/res/cursors/asn.png
diff --git a/vcl/aqua/source/res/cursors/asne.png b/vcl/osx/res/cursors/asne.png
index 311506aeb349..311506aeb349 100644
--- a/vcl/aqua/source/res/cursors/asne.png
+++ b/vcl/osx/res/cursors/asne.png
diff --git a/vcl/aqua/source/res/cursors/asns.png b/vcl/osx/res/cursors/asns.png
index 1c8950eb28bc..1c8950eb28bc 100644
--- a/vcl/aqua/source/res/cursors/asns.png
+++ b/vcl/osx/res/cursors/asns.png
diff --git a/vcl/aqua/source/res/cursors/asnswe.png b/vcl/osx/res/cursors/asnswe.png
index aae5246fbbc0..aae5246fbbc0 100644
--- a/vcl/aqua/source/res/cursors/asnswe.png
+++ b/vcl/osx/res/cursors/asnswe.png
diff --git a/vcl/aqua/source/res/cursors/asnw.png b/vcl/osx/res/cursors/asnw.png
index 9fd0036df077..9fd0036df077 100644
--- a/vcl/aqua/source/res/cursors/asnw.png
+++ b/vcl/osx/res/cursors/asnw.png
diff --git a/vcl/aqua/source/res/cursors/ass.png b/vcl/osx/res/cursors/ass.png
index bee09e736ad1..bee09e736ad1 100644
--- a/vcl/aqua/source/res/cursors/ass.png
+++ b/vcl/osx/res/cursors/ass.png
diff --git a/vcl/aqua/source/res/cursors/asse.png b/vcl/osx/res/cursors/asse.png
index d7883211d44f..d7883211d44f 100644
--- a/vcl/aqua/source/res/cursors/asse.png
+++ b/vcl/osx/res/cursors/asse.png
diff --git a/vcl/aqua/source/res/cursors/assw.png b/vcl/osx/res/cursors/assw.png
index 0b0a496a52ec..0b0a496a52ec 100644
--- a/vcl/aqua/source/res/cursors/assw.png
+++ b/vcl/osx/res/cursors/assw.png
diff --git a/vcl/aqua/source/res/cursors/asw.png b/vcl/osx/res/cursors/asw.png
index 5a4b9519e075..5a4b9519e075 100644
--- a/vcl/aqua/source/res/cursors/asw.png
+++ b/vcl/osx/res/cursors/asw.png
diff --git a/vcl/aqua/source/res/cursors/aswe.png b/vcl/osx/res/cursors/aswe.png
index b9c5afaac043..b9c5afaac043 100644
--- a/vcl/aqua/source/res/cursors/aswe.png
+++ b/vcl/osx/res/cursors/aswe.png
diff --git a/vcl/aqua/source/res/cursors/chain.png b/vcl/osx/res/cursors/chain.png
index dbf069924d73..dbf069924d73 100644
--- a/vcl/aqua/source/res/cursors/chain.png
+++ b/vcl/osx/res/cursors/chain.png
diff --git a/vcl/aqua/source/res/cursors/chainnot.png b/vcl/osx/res/cursors/chainnot.png
index 547703edf12c..547703edf12c 100644
--- a/vcl/aqua/source/res/cursors/chainnot.png
+++ b/vcl/osx/res/cursors/chainnot.png
diff --git a/vcl/aqua/source/res/cursors/chart.png b/vcl/osx/res/cursors/chart.png
index de5514006e1f..de5514006e1f 100644
--- a/vcl/aqua/source/res/cursors/chart.png
+++ b/vcl/osx/res/cursors/chart.png
diff --git a/vcl/aqua/source/res/cursors/copydata.png b/vcl/osx/res/cursors/copydata.png
index b6202fd9144f..b6202fd9144f 100644
--- a/vcl/aqua/source/res/cursors/copydata.png
+++ b/vcl/osx/res/cursors/copydata.png
diff --git a/vcl/aqua/source/res/cursors/copydlnk.png b/vcl/osx/res/cursors/copydlnk.png
index fab24c9f8f7c..fab24c9f8f7c 100644
--- a/vcl/aqua/source/res/cursors/copydlnk.png
+++ b/vcl/osx/res/cursors/copydlnk.png
diff --git a/vcl/aqua/source/res/cursors/copyf.png b/vcl/osx/res/cursors/copyf.png
index 70546d0c0c22..70546d0c0c22 100644
--- a/vcl/aqua/source/res/cursors/copyf.png
+++ b/vcl/osx/res/cursors/copyf.png
diff --git a/vcl/aqua/source/res/cursors/copyf2.png b/vcl/osx/res/cursors/copyf2.png
index b6f76051f10f..b6f76051f10f 100644
--- a/vcl/aqua/source/res/cursors/copyf2.png
+++ b/vcl/osx/res/cursors/copyf2.png
diff --git a/vcl/aqua/source/res/cursors/copyflnk.png b/vcl/osx/res/cursors/copyflnk.png
index 23561e484e36..23561e484e36 100644
--- a/vcl/aqua/source/res/cursors/copyflnk.png
+++ b/vcl/osx/res/cursors/copyflnk.png
diff --git a/vcl/aqua/source/res/cursors/crook.png b/vcl/osx/res/cursors/crook.png
index 4378f8df8351..4378f8df8351 100644
--- a/vcl/aqua/source/res/cursors/crook.png
+++ b/vcl/osx/res/cursors/crook.png
diff --git a/vcl/aqua/source/res/cursors/crop.png b/vcl/osx/res/cursors/crop.png
index 92a778ada31a..92a778ada31a 100644
--- a/vcl/aqua/source/res/cursors/crop.png
+++ b/vcl/osx/res/cursors/crop.png
diff --git a/vcl/aqua/source/res/cursors/darc.png b/vcl/osx/res/cursors/darc.png
index 9772a1c6b85a..9772a1c6b85a 100644
--- a/vcl/aqua/source/res/cursors/darc.png
+++ b/vcl/osx/res/cursors/darc.png
diff --git a/vcl/aqua/source/res/cursors/dbezier.png b/vcl/osx/res/cursors/dbezier.png
index 988498137e9a..988498137e9a 100644
--- a/vcl/aqua/source/res/cursors/dbezier.png
+++ b/vcl/osx/res/cursors/dbezier.png
diff --git a/vcl/aqua/source/res/cursors/dcapt.png b/vcl/osx/res/cursors/dcapt.png
index d1ef82818735..d1ef82818735 100644
--- a/vcl/aqua/source/res/cursors/dcapt.png
+++ b/vcl/osx/res/cursors/dcapt.png
diff --git a/vcl/aqua/source/res/cursors/dcirccut.png b/vcl/osx/res/cursors/dcirccut.png
index cb4ed0e85ecd..cb4ed0e85ecd 100644
--- a/vcl/aqua/source/res/cursors/dcirccut.png
+++ b/vcl/osx/res/cursors/dcirccut.png
diff --git a/vcl/aqua/source/res/cursors/dconnect.png b/vcl/osx/res/cursors/dconnect.png
index e4a43bdbe021..e4a43bdbe021 100644
--- a/vcl/aqua/source/res/cursors/dconnect.png
+++ b/vcl/osx/res/cursors/dconnect.png
diff --git a/vcl/aqua/source/res/cursors/dellipse.png b/vcl/osx/res/cursors/dellipse.png
index 319c4574c7c1..319c4574c7c1 100644
--- a/vcl/aqua/source/res/cursors/dellipse.png
+++ b/vcl/osx/res/cursors/dellipse.png
diff --git a/vcl/aqua/source/res/cursors/detectiv.png b/vcl/osx/res/cursors/detectiv.png
index abe93f263d4d..abe93f263d4d 100644
--- a/vcl/aqua/source/res/cursors/detectiv.png
+++ b/vcl/osx/res/cursors/detectiv.png
diff --git a/vcl/aqua/source/res/cursors/dfree.png b/vcl/osx/res/cursors/dfree.png
index 2de92942adde..2de92942adde 100644
--- a/vcl/aqua/source/res/cursors/dfree.png
+++ b/vcl/osx/res/cursors/dfree.png
diff --git a/vcl/aqua/source/res/cursors/dline.png b/vcl/osx/res/cursors/dline.png
index 6afb670ef8a8..6afb670ef8a8 100644
--- a/vcl/aqua/source/res/cursors/dline.png
+++ b/vcl/osx/res/cursors/dline.png
diff --git a/vcl/aqua/source/res/cursors/dpie.png b/vcl/osx/res/cursors/dpie.png
index 44a9474846b9..44a9474846b9 100644
--- a/vcl/aqua/source/res/cursors/dpie.png
+++ b/vcl/osx/res/cursors/dpie.png
diff --git a/vcl/aqua/source/res/cursors/dpolygon.png b/vcl/osx/res/cursors/dpolygon.png
index 847e6ad9bea5..847e6ad9bea5 100644
--- a/vcl/aqua/source/res/cursors/dpolygon.png
+++ b/vcl/osx/res/cursors/dpolygon.png
diff --git a/vcl/aqua/source/res/cursors/drect.png b/vcl/osx/res/cursors/drect.png
index ff3dcbba07b4..ff3dcbba07b4 100644
--- a/vcl/aqua/source/res/cursors/drect.png
+++ b/vcl/osx/res/cursors/drect.png
diff --git a/vcl/aqua/source/res/cursors/dtext.png b/vcl/osx/res/cursors/dtext.png
index ee375f0e47a0..ee375f0e47a0 100644
--- a/vcl/aqua/source/res/cursors/dtext.png
+++ b/vcl/osx/res/cursors/dtext.png
diff --git a/vcl/aqua/source/res/cursors/fill.png b/vcl/osx/res/cursors/fill.png
index 220641b9beb4..220641b9beb4 100644
--- a/vcl/aqua/source/res/cursors/fill.png
+++ b/vcl/osx/res/cursors/fill.png
diff --git a/vcl/aqua/source/res/cursors/help.png b/vcl/osx/res/cursors/help.png
index e29c19eccd22..e29c19eccd22 100644
--- a/vcl/aqua/source/res/cursors/help.png
+++ b/vcl/osx/res/cursors/help.png
diff --git a/vcl/aqua/source/res/cursors/hourglass.png b/vcl/osx/res/cursors/hourglass.png
index 07bb5af73e6e..07bb5af73e6e 100644
--- a/vcl/aqua/source/res/cursors/hourglass.png
+++ b/vcl/osx/res/cursors/hourglass.png
diff --git a/vcl/aqua/source/res/cursors/hshear.png b/vcl/osx/res/cursors/hshear.png
index b45beded2d93..b45beded2d93 100644
--- a/vcl/aqua/source/res/cursors/hshear.png
+++ b/vcl/osx/res/cursors/hshear.png
diff --git a/vcl/aqua/source/res/cursors/linkdata.png b/vcl/osx/res/cursors/linkdata.png
index 6432db0155b6..6432db0155b6 100644
--- a/vcl/aqua/source/res/cursors/linkdata.png
+++ b/vcl/osx/res/cursors/linkdata.png
diff --git a/vcl/aqua/source/res/cursors/linkf.png b/vcl/osx/res/cursors/linkf.png
index e17107fec9ff..e17107fec9ff 100644
--- a/vcl/aqua/source/res/cursors/linkf.png
+++ b/vcl/osx/res/cursors/linkf.png
diff --git a/vcl/aqua/source/res/cursors/magnify.png b/vcl/osx/res/cursors/magnify.png
index 4e73146b91e4..4e73146b91e4 100644
--- a/vcl/aqua/source/res/cursors/magnify.png
+++ b/vcl/osx/res/cursors/magnify.png
diff --git a/vcl/aqua/source/res/cursors/mirror.png b/vcl/osx/res/cursors/mirror.png
index 8fac93f0b6df..8fac93f0b6df 100644
--- a/vcl/aqua/source/res/cursors/mirror.png
+++ b/vcl/osx/res/cursors/mirror.png
diff --git a/vcl/aqua/source/res/cursors/movebw.png b/vcl/osx/res/cursors/movebw.png
index 63bf76ad3942..63bf76ad3942 100644
--- a/vcl/aqua/source/res/cursors/movebw.png
+++ b/vcl/osx/res/cursors/movebw.png
diff --git a/vcl/aqua/source/res/cursors/movedata.png b/vcl/osx/res/cursors/movedata.png
index 60ece8a53e59..60ece8a53e59 100644
--- a/vcl/aqua/source/res/cursors/movedata.png
+++ b/vcl/osx/res/cursors/movedata.png
diff --git a/vcl/aqua/source/res/cursors/movedlnk.png b/vcl/osx/res/cursors/movedlnk.png
index 6951cd718d97..6951cd718d97 100644
--- a/vcl/aqua/source/res/cursors/movedlnk.png
+++ b/vcl/osx/res/cursors/movedlnk.png
diff --git a/vcl/aqua/source/res/cursors/movef.png b/vcl/osx/res/cursors/movef.png
index 97a01c88fa4d..97a01c88fa4d 100644
--- a/vcl/aqua/source/res/cursors/movef.png
+++ b/vcl/osx/res/cursors/movef.png
diff --git a/vcl/aqua/source/res/cursors/movef2.png b/vcl/osx/res/cursors/movef2.png
index 2cdddb410aae..2cdddb410aae 100644
--- a/vcl/aqua/source/res/cursors/movef2.png
+++ b/vcl/osx/res/cursors/movef2.png
diff --git a/vcl/aqua/source/res/cursors/moveflnk.png b/vcl/osx/res/cursors/moveflnk.png
index 53301ba58c50..53301ba58c50 100644
--- a/vcl/aqua/source/res/cursors/moveflnk.png
+++ b/vcl/osx/res/cursors/moveflnk.png
diff --git a/vcl/aqua/source/res/cursors/movept.png b/vcl/osx/res/cursors/movept.png
index 41945deb1916..41945deb1916 100644
--- a/vcl/aqua/source/res/cursors/movept.png
+++ b/vcl/osx/res/cursors/movept.png
diff --git a/vcl/aqua/source/res/cursors/neswsize.png b/vcl/osx/res/cursors/neswsize.png
index 91b89b5803ec..91b89b5803ec 100644
--- a/vcl/aqua/source/res/cursors/neswsize.png
+++ b/vcl/osx/res/cursors/neswsize.png
diff --git a/vcl/aqua/source/res/cursors/notallow.png b/vcl/osx/res/cursors/notallow.png
index df770a495194..df770a495194 100644
--- a/vcl/aqua/source/res/cursors/notallow.png
+++ b/vcl/osx/res/cursors/notallow.png
diff --git a/vcl/aqua/source/res/cursors/nullptr.png b/vcl/osx/res/cursors/nullptr.png
index 489636595bec..489636595bec 100644
--- a/vcl/aqua/source/res/cursors/nullptr.png
+++ b/vcl/osx/res/cursors/nullptr.png
diff --git a/vcl/aqua/source/res/cursors/nwsesize.png b/vcl/osx/res/cursors/nwsesize.png
index fc6a33288ef2..fc6a33288ef2 100644
--- a/vcl/aqua/source/res/cursors/nwsesize.png
+++ b/vcl/osx/res/cursors/nwsesize.png
diff --git a/vcl/aqua/source/res/cursors/pen.png b/vcl/osx/res/cursors/pen.png
index 81b583086778..81b583086778 100644
--- a/vcl/aqua/source/res/cursors/pen.png
+++ b/vcl/osx/res/cursors/pen.png
diff --git a/vcl/aqua/source/res/cursors/pivotcol.png b/vcl/osx/res/cursors/pivotcol.png
index 1c38b915b886..1c38b915b886 100644
--- a/vcl/aqua/source/res/cursors/pivotcol.png
+++ b/vcl/osx/res/cursors/pivotcol.png
diff --git a/vcl/aqua/source/res/cursors/pivotdel.png b/vcl/osx/res/cursors/pivotdel.png
index fbd663ee36c1..fbd663ee36c1 100644
--- a/vcl/aqua/source/res/cursors/pivotdel.png
+++ b/vcl/osx/res/cursors/pivotdel.png
diff --git a/vcl/aqua/source/res/cursors/pivotfld.png b/vcl/osx/res/cursors/pivotfld.png
index 04375de1efe6..04375de1efe6 100644
--- a/vcl/aqua/source/res/cursors/pivotfld.png
+++ b/vcl/osx/res/cursors/pivotfld.png
diff --git a/vcl/aqua/source/res/cursors/pivotrow.png b/vcl/osx/res/cursors/pivotrow.png
index 18ef0e8e59ba..18ef0e8e59ba 100644
--- a/vcl/aqua/source/res/cursors/pivotrow.png
+++ b/vcl/osx/res/cursors/pivotrow.png
diff --git a/vcl/aqua/source/res/cursors/pntbrsh.png b/vcl/osx/res/cursors/pntbrsh.png
index ec8d799f66c2..ec8d799f66c2 100644
--- a/vcl/aqua/source/res/cursors/pntbrsh.png
+++ b/vcl/osx/res/cursors/pntbrsh.png
diff --git a/vcl/aqua/source/res/cursors/rotate.png b/vcl/osx/res/cursors/rotate.png
index a8137e077e56..a8137e077e56 100644
--- a/vcl/aqua/source/res/cursors/rotate.png
+++ b/vcl/osx/res/cursors/rotate.png
diff --git a/vcl/aqua/source/res/cursors/tblsele.png b/vcl/osx/res/cursors/tblsele.png
index a2da05e009d1..a2da05e009d1 100644
--- a/vcl/aqua/source/res/cursors/tblsele.png
+++ b/vcl/osx/res/cursors/tblsele.png
diff --git a/vcl/aqua/source/res/cursors/tblsels.png b/vcl/osx/res/cursors/tblsels.png
index ba20589c794f..ba20589c794f 100644
--- a/vcl/aqua/source/res/cursors/tblsels.png
+++ b/vcl/osx/res/cursors/tblsels.png
diff --git a/vcl/aqua/source/res/cursors/tblselse.png b/vcl/osx/res/cursors/tblselse.png
index 4ee7f62b304b..4ee7f62b304b 100644
--- a/vcl/aqua/source/res/cursors/tblselse.png
+++ b/vcl/osx/res/cursors/tblselse.png
diff --git a/vcl/aqua/source/res/cursors/tblselsw.png b/vcl/osx/res/cursors/tblselsw.png
index 11d7cb34d64d..11d7cb34d64d 100644
--- a/vcl/aqua/source/res/cursors/tblselsw.png
+++ b/vcl/osx/res/cursors/tblselsw.png
diff --git a/vcl/aqua/source/res/cursors/tblselw.png b/vcl/osx/res/cursors/tblselw.png
index 62813a975855..62813a975855 100644
--- a/vcl/aqua/source/res/cursors/tblselw.png
+++ b/vcl/osx/res/cursors/tblselw.png
diff --git a/vcl/aqua/source/res/cursors/timemove.png b/vcl/osx/res/cursors/timemove.png
index 3dae038a2011..3dae038a2011 100644
--- a/vcl/aqua/source/res/cursors/timemove.png
+++ b/vcl/osx/res/cursors/timemove.png
diff --git a/vcl/aqua/source/res/cursors/timesize.png b/vcl/osx/res/cursors/timesize.png
index 22178c9b8d0e..22178c9b8d0e 100644
--- a/vcl/aqua/source/res/cursors/timesize.png
+++ b/vcl/osx/res/cursors/timesize.png
diff --git a/vcl/aqua/source/res/cursors/vshear.png b/vcl/osx/res/cursors/vshear.png
index b01cb6c935e1..b01cb6c935e1 100644
--- a/vcl/aqua/source/res/cursors/vshear.png
+++ b/vcl/osx/res/cursors/vshear.png
diff --git a/vcl/aqua/source/res/cursors/vtext.png b/vcl/osx/res/cursors/vtext.png
index 2d6c847c9fc7..2d6c847c9fc7 100644
--- a/vcl/aqua/source/res/cursors/vtext.png
+++ b/vcl/osx/res/cursors/vtext.png
diff --git a/vcl/aqua/source/app/saldata.cxx b/vcl/osx/saldata.cxx
index 4ec95066e2fe..55a5e6493782 100644
--- a/vcl/aqua/source/app/saldata.cxx
+++ b/vcl/osx/saldata.cxx
@@ -19,9 +19,9 @@
 
 #include <config_features.h>
 
-#include "aqua/saldata.hxx"
-#include "aqua/salnsmenu.h"
-#include "aqua/salinst.h"
+#include "osx/saldata.hxx"
+#include "osx/salnsmenu.h"
+#include "osx/salinst.h"
 
 #import "apple_remote/RemoteMainController.h"
 
diff --git a/vcl/aqua/source/window/salframe.cxx b/vcl/osx/salframe.cxx
index 0a9081e859f2..cf1fe45b97e3 100644
--- a/vcl/aqua/source/window/salframe.cxx
+++ b/vcl/osx/salframe.cxx
@@ -28,13 +28,13 @@
 #include "vcl/window.hxx"
 #include "vcl/syswin.hxx"
 
-#include "aqua/saldata.hxx"
-#include "coretext/salgdi.h"
-#include "aqua/salframe.h"
-#include "aqua/salmenu.h"
-#include "aqua/salinst.h"
-#include "aqua/salframeview.h"
-#include "aqua/aqua11yfactory.h"
+#include "osx/saldata.hxx"
+#include "quartz/salgdi.h"
+#include "osx/salframe.h"
+#include "osx/salmenu.h"
+#include "osx/salinst.h"
+#include "osx/salframeview.h"
+#include "osx/a11yfactory.h"
 #include "quartz/utils.h"
 
 #include "salwtype.hxx"
@@ -1252,7 +1252,7 @@ void AquaSalFrame::UpdateSettings( AllSettings& rSettings )
 
     aStyleSettings.SetToolbarIconSize( STYLE_TOOLBAR_ICONSIZE_LARGE );
 
-    // TODO: better mapping of aqua<->ooo font settings
+    // TODO: better mapping of OS X<->LibreOffice font settings
     aStyleSettings.SetAppFont( aAppFont );
     aStyleSettings.SetHelpFont( aAppFont );
     aStyleSettings.SetPushButtonFont( aAppFont );
@@ -1297,7 +1297,7 @@ void AquaSalFrame::UpdateSettings( AllSettings& rSettings )
 
     aStyleSettings.SetCursorBlinkTime( 500 );
 
-    // no mnemonics on aqua
+    // no mnemonics on OS X
     aStyleSettings.SetOptions( aStyleSettings.GetOptions() | STYLE_OPTION_NOMNEMONICS );
 
     getAppleScrollBarVariant(aStyleSettings);
diff --git a/vcl/aqua/source/window/salframeview.mm b/vcl/osx/salframeview.mm
index 10986d06b423..81ae1cdce8c3 100644
--- a/vcl/aqua/source/window/salframeview.mm
+++ b/vcl/osx/salframeview.mm
@@ -24,11 +24,11 @@
 #include "vcl/window.hxx"
 #include "vcl/svapp.hxx"
 
-#include "aqua/salinst.h"
-#include "coretext/salgdi.h"
-#include "aqua/salframe.h"
-#include "aqua/salframeview.h"
-#include "aqua/aqua11yfactory.h"
+#include "osx/salinst.h"
+#include "quartz/salgdi.h"
+#include "osx/salframe.h"
+#include "osx/salframeview.h"
+#include "osx/a11yfactory.h"
 #include "quartz/utils.h"
 
 #define WHEEL_EVENT_FACTOR 1.5
diff --git a/vcl/aqua/source/app/salinst.cxx b/vcl/osx/salinst.cxx
index 999a19f77ce1..9aab3a066c24 100644
--- a/vcl/aqua/source/app/salinst.cxx
+++ b/vcl/osx/salinst.cxx
@@ -32,17 +32,17 @@
 #include "vcl/timer.hxx"
 #include "vcl/solarmutex.hxx"
 
-#include "aqua/saldata.hxx"
-#include "aqua/salinst.h"
-#include "aqua/salframe.h"
-#include "aqua/salobj.h"
-#include "aqua/salsys.h"
-#include "aqua/salvd.h"
+#include "osx/saldata.hxx"
+#include "osx/salinst.h"
+#include "osx/salframe.h"
+#include "osx/salobj.h"
+#include "osx/salsys.h"
+#include "osx/salvd.h"
 #include "quartz/salbmp.h"
 #include "quartz/utils.h"
-#include "aqua/salprn.h"
-#include "aqua/saltimer.h"
-#include "aqua/vclnsapp.h"
+#include "osx/salprn.h"
+#include "osx/saltimer.h"
+#include "osx/vclnsapp.h"
 
 #include "print.h"
 #include "impbmp.hxx"
@@ -368,7 +368,7 @@ SalInstance* CreateSalInstance()
     pSalData->mpFirstInstance = pInst;
     // this one is for outside AquaSalInstance::Yield
     SalData::ensureThreadAutoreleasePool();
-    // no focus rects on NWF aqua
+    // no focus rects on NWF
     ImplGetSVData()->maNWFData.mbNoFocusRects = true;
     ImplGetSVData()->maNWFData.mbNoActiveTabTextRaise = true;
     ImplGetSVData()->maNWFData.mbCenteredTabs = true;
diff --git a/vcl/aqua/source/window/salmenu.cxx b/vcl/osx/salmenu.cxx
index 37d28c5f9712..db3dd2ef845c 100644
--- a/vcl/aqua/source/window/salmenu.cxx
+++ b/vcl/osx/salmenu.cxx
@@ -26,12 +26,12 @@
 #include "vcl/window.hxx"
 #include "vcl/svapp.hxx"
 
-#include "aqua/saldata.hxx"
-#include "aqua/salinst.h"
-#include "aqua/salmenu.h"
-#include "aqua/salnsmenu.h"
-#include "aqua/salframe.h"
-#include "aqua/aqua11ywrapper.h"
+#include "osx/saldata.hxx"
+#include "osx/salinst.h"
+#include "osx/salmenu.h"
+#include "osx/salnsmenu.h"
+#include "osx/salframe.h"
+#include "osx/a11ywrapper.h"
 #include "quartz/utils.h"
 
 #include "svids.hrc"
diff --git a/vcl/aqua/source/gdi/salnativewidgets.cxx b/vcl/osx/salnativewidgets.cxx
index 18ee1cc3ea2e..ec6ca1d9c72f 100644
--- a/vcl/aqua/source/gdi/salnativewidgets.cxx
+++ b/vcl/osx/salnativewidgets.cxx
@@ -22,10 +22,10 @@
 #include "vcl/svapp.hxx"
 #include "vcl/timer.hxx"
 
-#include "coretext/salgdi.h"
-#include "aqua/salnativewidgets.h"
-#include "aqua/saldata.hxx"
-#include "aqua/salframe.h"
+#include "quartz/salgdi.h"
+#include "osx/salnativewidgets.h"
+#include "osx/saldata.hxx"
+#include "osx/salframe.h"
 
 #include "premac.h"
 #include <Carbon/Carbon.h>
@@ -976,7 +976,7 @@ sal_Bool AquaSalGraphics::drawNativeControl(ControlType nType,
                 aTextDrawInfo.state=getState( nState );
                 aTextDrawInfo.isFocused=false;
 
-                rc.size.width+=1;//else there's a white space because aqua theme hasn't a 3D border
+                rc.size.width+=1;//else there's a white space because an OS X theme has no 3D border
                 rc.size.height+=1;
                 HIThemeDrawFrame(&rc, &aTextDrawInfo, mrContext, kHIThemeOrientationNormal);
 
@@ -997,7 +997,7 @@ sal_Bool AquaSalGraphics::drawNativeControl(ControlType nType,
             aTextDrawInfo.state=getState( nState );
             aTextDrawInfo.isFocused=false;
 
-            rc.size.width  += 1; // else there may be a white space because aqua theme hasn't a 3D border
+            rc.size.width  += 1; // else there may be a white space because an OS X theme has no 3D border
             // change rc so that the frame will encompass only the content region
             // see counterpart in GetNativeControlRegion
             rc.size.width  += 2;
diff --git a/vcl/aqua/source/window/salnsmenu.mm b/vcl/osx/salnsmenu.mm
index 39c36aec7615..796b05ca7ae4 100644
--- a/vcl/aqua/source/window/salnsmenu.mm
+++ b/vcl/osx/salnsmenu.mm
@@ -18,11 +18,11 @@
  */
 
 
-#include "aqua/salinst.h"
-#include "aqua/saldata.hxx"
-#include "aqua/salframe.h"
-#include "aqua/salmenu.h"
-#include "aqua/salnsmenu.h"
+#include "osx/salinst.h"
+#include "osx/saldata.hxx"
+#include "osx/salframe.h"
+#include "osx/salmenu.h"
+#include "osx/salnsmenu.h"
 
 #include "vcl/window.hxx"
  
diff --git a/vcl/aqua/source/app/salnstimer.mm b/vcl/osx/salnstimer.mm
index 610c38212624..bad2f4e51ff7 100644
--- a/vcl/aqua/source/app/salnstimer.mm
+++ b/vcl/osx/salnstimer.mm
@@ -18,10 +18,10 @@
  */
 
 
-#include "aqua/saltimer.h"
-#include "aqua/salnstimer.h"
-#include "aqua/salinst.h"
-#include "aqua/saldata.hxx"
+#include "osx/saltimer.h"
+#include "osx/salnstimer.h"
+#include "osx/salinst.h"
+#include "osx/saldata.hxx"
 
 #include "svdata.hxx"
 
diff --git a/vcl/aqua/source/window/salobj.cxx b/vcl/osx/salobj.cxx
index c5d09d73dac8..16a56b5261ca 100644
--- a/vcl/aqua/source/window/salobj.cxx
+++ b/vcl/osx/salobj.cxx
@@ -20,9 +20,9 @@
 
 #include <string.h>
 
-#include "aqua/saldata.hxx"
-#include "aqua/salobj.h"
-#include "aqua/salframe.h"
+#include "osx/saldata.hxx"
+#include "osx/salobj.h"
+#include "osx/salframe.h"
 
 // =======================================================================
 
diff --git a/vcl/aqua/source/gdi/salprn.cxx b/vcl/osx/salprn.cxx
index b64d039a5c04..082fa1cdc199 100644
--- a/vcl/aqua/source/gdi/salprn.cxx
+++ b/vcl/osx/salprn.cxx
@@ -24,11 +24,11 @@
 #include "vcl/print.hxx"
 #include <sal/macros.h>
 
-#include "aqua/salinst.h"
-#include "aqua/salprn.h"
-#include "aqua/aquaprintview.h"
-#include "coretext/salgdi.h"
-#include "aqua/saldata.hxx"
+#include "osx/salinst.h"
+#include "osx/salprn.h"
+#include "osx/printview.h"
+#include "quartz/salgdi.h"
+#include "osx/saldata.hxx"
 #include "quartz/utils.h"
 
 #include "jobset.h"
diff --git a/vcl/aqua/source/app/salsys.cxx b/vcl/osx/salsys.cxx
index 3cfcb3c1fe94..9ac4b5aeb61f 100644
--- a/vcl/aqua/source/app/salsys.cxx
+++ b/vcl/osx/salsys.cxx
@@ -22,9 +22,9 @@
 
 #include "vcl/button.hxx"
 
-#include "aqua/salsys.h"
-#include "aqua/saldata.hxx"
-#include "aqua/salinst.h"
+#include "osx/salsys.h"
+#include "osx/saldata.hxx"
+#include "osx/salinst.h"
 #include "quartz/utils.h"
 
 #include "svids.hrc"
diff --git a/vcl/aqua/source/app/saltimer.cxx b/vcl/osx/saltimer.cxx
index 40ff26e7967c..ad0959048964 100644
--- a/vcl/aqua/source/app/saltimer.cxx
+++ b/vcl/osx/saltimer.cxx
@@ -18,11 +18,11 @@
  */
 
 
-#include "aqua/saltimer.h"
-#include "aqua/salnstimer.h"
-#include "aqua/saldata.hxx"
-#include "aqua/salframe.h"
-#include "aqua/salinst.h"
+#include "osx/saltimer.h"
+#include "osx/salnstimer.h"
+#include "osx/saldata.hxx"
+#include "osx/salframe.h"
+#include "osx/salinst.h"
 
 // =======================================================================
 
diff --git a/vcl/aqua/source/gdi/salvd.cxx b/vcl/osx/salvd.cxx
index 2be469c7ae2c..3f69ab9f5f7c 100644
--- a/vcl/aqua/source/gdi/salvd.cxx
+++ b/vcl/osx/salvd.cxx
@@ -21,11 +21,11 @@
 #include "vcl/svapp.hxx"
 #include "vcl/sysdata.hxx"
 
-#include "aqua/salvd.h"
-#include "aqua/salinst.h"
-#include "coretext/salgdi.h"
-#include "aqua/saldata.hxx"
-#include "aqua/salframe.h"
+#include "osx/salvd.h"
+#include "osx/salinst.h"
+#include "quartz/salgdi.h"
+#include "osx/saldata.hxx"
+#include "osx/salframe.h"
 
 // -----------------------------------------------------------------------
 
diff --git a/vcl/aqua/source/dtrans/service_entry.cxx b/vcl/osx/service_entry.cxx
index 07103bfe9547..d4fa284c2ddb 100644
--- a/vcl/aqua/source/dtrans/service_entry.cxx
+++ b/vcl/osx/service_entry.cxx
@@ -22,12 +22,12 @@
 
 #include "vcl/svapp.hxx"
 
-#include "aqua/saldata.hxx"
-#include "aqua/salinst.h"
+#include "osx/saldata.hxx"
+#include "osx/salinst.h"
 
 #include "DragSource.hxx"
 #include "DropTarget.hxx"
-#include "aqua_clipboard.hxx"
+#include "clipboard.hxx"
 
 using namespace ::osl;
 using namespace ::rtl;
diff --git a/vcl/aqua/source/app/vclnsapp.mm b/vcl/osx/vclnsapp.mm
index 7c55f8e6c318..18079fb1ca9b 100644
--- a/vcl/aqua/source/app/vclnsapp.mm
+++ b/vcl/osx/vclnsapp.mm
@@ -27,11 +27,11 @@
 #include "vcl/svapp.hxx"
 #include "vcl/cmdevt.hxx"
 
-#include "aqua/vclnsapp.h"
-#include "aqua/salinst.h"
-#include "aqua/saldata.hxx"
-#include "aqua/salframe.h"
-#include "aqua/salframeview.h"
+#include "osx/vclnsapp.h"
+#include "osx/salinst.h"
+#include "osx/saldata.hxx"
+#include "osx/salframe.h"
+#include "osx/salframeview.h"
 #include "quartz/utils.h"
 
 #include "impimagetree.hxx"
diff --git a/vcl/coretext/ctfonts.cxx b/vcl/quartz/ctfonts.cxx
index fd113b892099..d93d4b59b7d3 100644
--- a/vcl/coretext/ctfonts.cxx
+++ b/vcl/quartz/ctfonts.cxx
@@ -24,10 +24,10 @@
 #include "sallayout.hxx"
 
 #ifdef MACOSX
-#include "aqua/salinst.h"
-#include "aqua/saldata.hxx"
+#include "osx/salinst.h"
+#include "osx/saldata.hxx"
 #endif
-#include "coretext/salgdi.h"
+#include "quartz/salgdi.h"
 #include "quartz/utils.h"
 #include "ctfonts.hxx"
 
diff --git a/vcl/coretext/ctfonts.hxx b/vcl/quartz/ctfonts.hxx
index 44153115bb94..00dc6a9783f3 100644
--- a/vcl/coretext/ctfonts.hxx
+++ b/vcl/quartz/ctfonts.hxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "coretext/salgdi.h"
+#include "quartz/salgdi.h"
 #ifdef IOS
 #include "headless/svpgdi.hxx"
 #endif
diff --git a/vcl/coretext/ctlayout.cxx b/vcl/quartz/ctlayout.cxx
index 56d86967aa53..56d86967aa53 100644
--- a/vcl/coretext/ctlayout.cxx
+++ b/vcl/quartz/ctlayout.cxx
diff --git a/vcl/quartz/salbmp.cxx b/vcl/quartz/salbmp.cxx
index 73ead103c6fa..1a509bd68e46 100644
--- a/vcl/quartz/salbmp.cxx
+++ b/vcl/quartz/salbmp.cxx
@@ -31,7 +31,7 @@
 #include "quartz/salbmp.h"
 
 #ifdef MACOSX
-#include "aqua/saldata.hxx"
+#include "osx/saldata.hxx"
 #else
 #include "saldatabasic.hxx"
 #endif
diff --git a/vcl/coretext/salgdi.cxx b/vcl/quartz/salgdi.cxx
index ee6c834aead9..0a48e2d6b2f6 100644
--- a/vcl/coretext/salgdi.cxx
+++ b/vcl/quartz/salgdi.cxx
@@ -38,10 +38,10 @@
 #include "vcl/sysdata.hxx"
 #include "vcl/svapp.hxx"
 
-#include "coretext/salgdi.h"
+#include "quartz/salgdi.h"
 
 #ifdef MACOSX
-#include "aqua/salframe.h"
+#include "osx/salframe.h"
 #endif
 
 #ifdef IOS
diff --git a/vcl/aqua/source/gdi/salgdicommon.cxx b/vcl/quartz/salgdicommon.cxx
index f49ce9f65776..8c5aef267976 100644
--- a/vcl/aqua/source/gdi/salgdicommon.cxx
+++ b/vcl/quartz/salgdicommon.cxx
@@ -28,7 +28,7 @@
 #include "basegfx/polygon/b2dpolygon.hxx"
 
 #include "quartz/salbmp.h"
-#include "coretext/salgdi.h"
+#include "quartz/salgdi.h"
 
 #include "fontsubset.hxx"
 #include "sft.hxx"
diff --git a/vcl/aqua/source/gdi/salgdiutils.cxx b/vcl/quartz/salgdiutils.cxx
index c0a8d0d7ea6e..f31b09a40d12 100644
--- a/vcl/aqua/source/gdi/salgdiutils.cxx
+++ b/vcl/quartz/salgdiutils.cxx
@@ -29,9 +29,9 @@
 
 #include "vcl/svapp.hxx"
 
-#include "coretext/salgdi.h"
-#include "aqua/salframe.h"
-#include "aqua/saldata.hxx"
+#include "quartz/salgdi.h"
+#include "osx/salframe.h"
+#include "osx/saldata.hxx"
 
 // ----------------------------------------------------------------------
 
diff --git a/vcl/aqua/source/gdi/salmathutils.cxx b/vcl/quartz/salmathutils.cxx
index ec4850c91c71..e1222aa63061 100644
--- a/vcl/aqua/source/gdi/salmathutils.cxx
+++ b/vcl/quartz/salmathutils.cxx
@@ -18,7 +18,7 @@
  */
 
 
-#include "aqua/salmathutils.hxx"
+#include "quartz/salmathutils.hxx"
 
 #include <stdlib.h>
 
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index 4474e2066cc8..5e573d065c90 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -371,7 +371,7 @@ inline void ImplYield( bool i_bWait, bool i_bAllEvents )
         vcl::LazyDelete::flush();
 
     // the system timer events will not necessarily come in in non waiting mode
-    // e.g. on aqua; need to trigger timer checks manually
+    // e.g. on OS X; need to trigger timer checks manually
     if( pSVData->maAppData.mbNoYield && !pSVData->mbNoCallTimer )
     {
         do
diff --git a/vcl/source/app/svmainhook.cxx b/vcl/source/app/svmainhook.cxx
index cd8e55226012..e4799d1608df 100644
--- a/vcl/source/app/svmainhook.cxx
+++ b/vcl/source/app/svmainhook.cxx
@@ -20,7 +20,7 @@
 #include <tools/tools.h>
 
 #ifndef MACOSX
-// MacOSX implementation of ImplSVMainHook is in aqua/source/app/salinst.cxx
+// MacOSX implementation of ImplSVMainHook is in osx/salinst.cxx
 
 sal_Bool ImplSVMainHook( int * )
 {
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index d9d17ae52dc7..dee721f0893b 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -501,7 +501,7 @@ void Edit::ImplInvalidateOrRepaint( sal_Int32 nStart, sal_Int32 nEnd )
     if( IsPaintTransparent() )
     {
         Invalidate();
-        // FIXME: this is currently only on aqua
+        // FIXME: this is currently only on OS X
         if( ImplGetSVData()->maNWFData.mbNoFocusRects )
             Update();
     }
@@ -2023,7 +2023,7 @@ void Edit::GetFocus()
 
         ImplShowCursor();
 
-        // FIXME: this is currently only on aqua
+        // FIXME: this is currently only on OS X
         // check for other platforms that need similar handling
         if( ImplGetSVData()->maNWFData.mbNoFocusRects &&
             IsNativeWidgetEnabled() &&
@@ -2069,7 +2069,7 @@ void Edit::LoseFocus()
 
     if ( !mpSubEdit )
     {
-        // FIXME: this is currently only on aqua
+        // FIXME: this is currently only on OS X
         // check for other platforms that need similar handling
         if( ImplGetSVData()->maNWFData.mbNoFocusRects &&
             IsNativeWidgetEnabled() &&
@@ -2492,7 +2492,7 @@ void Edit::Modify()
 
         // #i13677# notify edit listeners about caret position change
         ImplCallEventListeners( VCLEVENT_EDIT_CARETCHANGED );
-        // FIXME: this is currently only on aqua
+        // FIXME: this is currently only on OS X
         // check for other platforms that need similar handling
         if( ImplGetSVData()->maNWFData.mbNoFocusRects &&
             IsNativeWidgetEnabled() &&
diff --git a/vcl/source/control/scrbar.cxx b/vcl/source/control/scrbar.cxx
index 3ff834d4c9d3..8c9f1609003f 100644
--- a/vcl/source/control/scrbar.cxx
+++ b/vcl/source/control/scrbar.cxx
@@ -32,9 +32,9 @@
 
 /*  #i77549#
     HACK: for scrollbars in case of thumb rect, page up and page down rect we
-    abuse the HitTestNativeControl interface. All theming engines but aqua
+    abuse the HitTestNativeControl interface. All theming engines but OS X
     are actually able to draw the thumb according to our internal representation.
-    However aqua draws a little outside. The canonical way would be to enhance the
+    However OS X draws a little outside. The canonical way would be to enhance the
     HitTestNativeControl passing a ScrollbarValue additionally so all necessary
     information is available in the call.
     .
diff --git a/vcl/source/control/spinfld.cxx b/vcl/source/control/spinfld.cxx
index b6aa626d4c1c..f070dfa2cfd4 100644
--- a/vcl/source/control/spinfld.cxx
+++ b/vcl/source/control/spinfld.cxx
@@ -914,7 +914,7 @@ long SpinField::PreNotify( NotifyEvent& rNEvt )
                 Rectangle* pLastRect = ImplFindPartRect( GetLastPointerPosPixel() );
                 if( pRect != pLastRect || (pMouseEvt->IsLeaveWindow() || pMouseEvt->IsEnterWindow()) )
                 {
-                    // FIXME: this is currently only on aqua
+                    // FIXME: this is currently only on OS X
                     // check for other platforms that need similar handling
                     if( ImplGetSVData()->maNWFData.mbNoFocusRects &&
                         IsNativeWidgetEnabled() &&
diff --git a/vcl/source/window/brdwin.cxx b/vcl/source/window/brdwin.cxx
index ff0e4ce398ac..27cee445e905 100644
--- a/vcl/source/window/brdwin.cxx
+++ b/vcl/source/window/brdwin.cxx
@@ -1103,7 +1103,7 @@ void ImplSmallBorderWindowView::Init( OutputDevice* pDev, long nWidth, long nHei
     }
     else
     {
-        // FIXME: this is currently only on aqua, check with other
+        // FIXME: this is currently only on OS X, check with other
         // platforms
         if( ImplGetSVData()->maNWFData.mbNoFocusRects && !( nBorderStyle & WINDOW_BORDER_NWF ) )
         {
@@ -1344,9 +1344,9 @@ void ImplSmallBorderWindowView::DrawWindow( sal_uInt16 nDrawFlags, OutputDevice*
             nState |= CTRL_STATE_FOCUSED;
         else if( mbNWFBorder )
         {
-            // FIXME: this is curently only on aqua, see if other platforms can profit
+            // FIXME: this is curently only on OS X, see if other platforms can profit
 
-            // FIXME: for aqua focus rings all controls need to support GetNativeControlRegion
+            // FIXME: for OS X focus rings all controls need to support GetNativeControlRegion
             // for the dropdown style
             if( pCtrl->HasFocus() || pCtrl->HasChildPathFocus() )
                 nState |= CTRL_STATE_FOCUSED;
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 821ae214b4a2..78995af16b6b 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -370,7 +370,7 @@ void Window::ImplInitAppFontData( Window* pWindow )
     pSVData->maGDIData.mnAppFontX = nTextWidth * 10 / 8;
     pSVData->maGDIData.mnAppFontY = nTextHeight * 10;
 
-    // FIXME: this is currently only on aqua, check with other
+    // FIXME: this is currently only on OS X, check with other
     // platforms
     if( pSVData->maNWFData.mbNoFocusRects )
     {