Merge remote-tracking branch 'origin/integration/dev300_m106'

Conflicts:
cppcanvas/source/mtfrenderer/implrenderer.cxx
i18npool/inc/i18npool/lang.h
i18npool/source/isolang/isolang.cxx
svtools/source/filter/exportdialog.cxx
svtools/source/graphic/grfmgr.cxx
vcl/aqua/source/dtrans/aqua_service.cxx
vcl/aqua/source/window/salframe.cxx
vcl/inc/sft.hxx
vcl/inc/unx/pspgraphics.h
vcl/inc/vcl/cursor.hxx
vcl/inc/vcl/gdimtf.hxx
vcl/inc/vcl/settings.hxx
vcl/prj/d.lst
vcl/source/app/settings.cxx
vcl/source/control/edit.cxx
vcl/source/gdi/gdimtf.cxx
vcl/source/window/cursor.cxx
vcl/source/window/window.cxx
vcl/unx/generic/fontmanager/fontconfig.cxx
vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
vcl/unx/kde4/KDESalGraphics.cxx

118 files changed, 528 insertions, 4237 deletions

diff --git a/vcl/aqua/inc/aqua11yfactory.h b/vcl/aqua/inc/aqua11yfactory.h
deleted file mode 100644
index 2fa38d9901db..000000000000
--- a/vcl/aqua/inc/aqua11yfactory.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _SV_AQUA11FACTORY_H
-#define _SV_AQUA11FACTORY_H
-
-#include "aquavcltypes.h"
-#include "aqua11ywrapper.h"
-#include <com/sun/star/accessibility/XAccessibleContext.hpp>
-
-@interface AquaA11yFactory : NSObject
-{
-}
-+(void)insertIntoWrapperRepository: (NSView *) viewElement forAccessibleContext: (::com::sun::star::uno::Reference < ::com::sun::star::accessibility::XAccessibleContext >) rxAccessibleContext;
-+(AquaA11yWrapper *)wrapperForAccessible: (::com::sun::star::uno::Reference < ::com::sun::star::accessibility::XAccessible >) rxAccessible;
-+(AquaA11yWrapper *)wrapperForAccessibleContext: (::com::sun::star::uno::Reference < ::com::sun::star::accessibility::XAccessibleContext >) rxAccessibleContext;
-+(AquaA11yWrapper *)wrapperForAccessibleContext: (::com::sun::star::uno::Reference < ::com::sun::star::accessibility::XAccessibleContext >) rxAccessibleContext createIfNotExists:(BOOL) bCreate;
-+(AquaA11yWrapper *)wrapperForAccessibleContext: (::com::sun::star::uno::Reference < ::com::sun::star::accessibility::XAccessibleContext >) rxAccessibleContext createIfNotExists:(BOOL) bCreate asRadioGroup:(BOOL) asRadioGroup;
-+(void)removeFromWrapperRepositoryFor: (::com::sun::star::uno::Reference < ::com::sun::star::accessibility::XAccessibleContext >) rxAccessibleContext;
-+(void)registerView: (NSView *) theView;
-+(void)revokeView: (NSView *) theViewt;
-@end
-#endif // _SV_AQUA11FACTORY_H
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/inc/aqua11yfocustracker.hxx b/vcl/aqua/inc/aqua11yfocustracker.hxx
deleted file mode 100644
index b9721619b8ac..000000000000
--- a/vcl/aqua/inc/aqua11yfocustracker.hxx
+++ /dev/null
@@ -1,109 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _AQUA11YFOCUSTRACKER_HXX_
-#define _AQUA11YFOCUSTRACKER_HXX_
-
-#include <com/sun/star/accessibility/XAccessible.hpp>
-
-#include "keyboardfocuslistener.hxx"
-
-#include <rtl/instance.hxx>
-
-#include <tools/link.hxx>
-#include <vcl/vclevent.hxx>
-#include <set>
-
-class Window;
-class ToolBox;
-class DocumentFocusListener;
-
-// ------------------------
-// - AquaA11yFocusTracker -
-// ------------------------
-
-class AquaA11yFocusTracker : public rtl::Static< AquaA11yFocusTracker, AquaA11yFocusTracker>
-{
-
-public:
-    AquaA11yFocusTracker();
-
-    ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > getFocusedObject() { return m_xFocusedObject; };
-
-    // sets the currently focus object and notifies the FocusEventListener (if any)
-    void setFocusedObject(const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& xAccessible);
-
-    // may evolve to add/remove later
-    void setFocusListener(const rtl::Reference< KeyboardFocusListener >& aFocusListener) { m_aFocusListener = aFocusListener; };
-
-protected:
-
-    // received a WINDOW_GETFOCUS event for this window
-    virtual void window_got_focus(Window *pWindow);
-
-    // received a TOOLBOX_HIGHLIGHT event for this window
-    virtual void toolbox_highlight_on(Window *pWindow);
-
-    // received a TOOLBOX_HIGHLIGHTOFF event for this window
-    virtual void toolbox_highlight_off(Window *pWindow);
-
-    // received a TABPAGE_ACTIVATE event for this window
-    virtual void tabpage_activated(Window *pWindow);
-
-    // received a MENU_HIGHLIGHT event for this window
-    virtual void menu_highlighted(const ::VclMenuEvent *pEvent);
-
-    // toolbox items are widgets in gtk+ and Cocoa
-    virtual void notify_toolbox_item_focus(ToolBox *pToolBox);
-
-    // toolbox item opened a floating window (e.g. color chooser)
-    virtual void toolbox_open_floater(Window *pWindow);
-
-    // callback function for Application::addEventListener
-    static long WindowEventHandler(AquaA11yFocusTracker *pFocusTracker, ::VclSimpleEvent const *pEvent);
-
-private:
-    // the accessible object that has the keyboard focus (if any)
-    ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > m_xFocusedObject;
-
-    // the listener for focus events
-    rtl::Reference< KeyboardFocusListener > m_aFocusListener;
-
-    // the list of Windows that need deeper (focus) investigation
-    std::set< Window *> m_aDocumentWindowList;
-
-    // the link object needed for Application::addEventListener
-    Link m_aWindowEventLink;
-
-    // the UNO XAccessibilityEventListener for Documents and other non VCL objects
-    const ::com::sun::star::uno::Reference< DocumentFocusListener > m_xDocumentFocusListener;
-};
-
-#endif  // _AQUA11YFOCUSTRACKER_HXX_
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/inc/aqua11ylistener.hxx b/vcl/aqua/inc/aqua11ylistener.hxx
deleted file mode 100644
index cab8d8c89d58..000000000000
--- a/vcl/aqua/inc/aqua11ylistener.hxx
+++ /dev/null
@@ -1,67 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _AQUA11YLISTENER_HXX_
-#define _AQUA11YLISTENER_HXX_
-
-#include <com/sun/star/accessibility/XAccessibleEventListener.hpp>
-#include <cppuhelper/implbase1.hxx>
-
-#include "aqua11yfocustracker.hxx"
-#include "aquavcltypes.h"
-#include <set>
-#include <com/sun/star/awt/Rectangle.hpp>
-
-// -------------------------
-// - AquaA11yEventListener -
-// -------------------------
-
-class AquaA11yEventListener :
-    public ::cppu::WeakImplHelper1< ::com::sun::star::accessibility::XAccessibleEventListener >
-{
-
-public:
-    AquaA11yEventListener(id wrapperObject, sal_Int16 role);
-    virtual ~AquaA11yEventListener();
-
-    // XEventListener
-    virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source )
-        throw (::com::sun::star::uno::RuntimeException);
-
-    // XAccessibleEventListener
-    virtual void SAL_CALL notifyEvent( const ::com::sun::star::accessibility::AccessibleEventObject& aEvent )
-        throw( ::com::sun::star::uno::RuntimeException );
-
-private:
-    const id m_wrapperObject;
-    const sal_Int16 m_role;
-    ::com::sun::star::awt::Rectangle m_oldBounds;
-};
-
-#endif // _AQUA11YLISTENER_HXX_
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/inc/aqua11ywrapper.h b/vcl/aqua/inc/aqua11ywrapper.h
deleted file mode 100644
index aebea78f0394..000000000000
--- a/vcl/aqua/inc/aqua11ywrapper.h
+++ /dev/null
@@ -1,122 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _SV_AQUA11WRAPPER_H
-#define _SV_AQUA11WRAPPER_H
-
-#include "aquavcltypes.h"
-#include <com/sun/star/accessibility/XAccessibleAction.hpp>
-#include <com/sun/star/accessibility/XAccessibleContext.hpp>
-#include <com/sun/star/accessibility/XAccessibleComponent.hpp>
-#include <com/sun/star/accessibility/XAccessibleExtendedComponent.hpp>
-#include <com/sun/star/accessibility/XAccessibleSelection.hpp>
-#include <com/sun/star/accessibility/XAccessibleTable.hpp>
-#include <com/sun/star/accessibility/XAccessibleText.hpp>
-#include <com/sun/star/accessibility/XAccessibleTextAttributes.hpp>
-#include <com/sun/star/accessibility/XAccessibleEditableText.hpp>
-#include <com/sun/star/accessibility/XAccessibleValue.hpp>
-#include <com/sun/star/accessibility/XAccessibleMultiLineText.hpp>
-
-// rAccessibleXYZ as a field in an Objective-C-Class would not call Con-/Destructor, so use a struct instead
-struct ReferenceWrapper
-{
-    ::com::sun::star::uno::Reference < ::com::sun::star::accessibility::XAccessibleAction > rAccessibleAction;
-    ::com::sun::star::uno::Reference < ::com::sun::star::accessibility::XAccessibleContext > rAccessibleContext;
-    ::com::sun::star::uno::Reference < ::com::sun::star::accessibility::XAccessibleComponent > rAccessibleComponent;
-    ::com::sun::star::uno::Reference < ::com::sun::star::accessibility::XAccessibleExtendedComponent > rAccessibleExtendedComponent;
-    ::com::sun::star::uno::Reference < ::com::sun::star::accessibility::XAccessibleSelection > rAccessibleSelection;
-    ::com::sun::star::uno::Reference < ::com::sun::star::accessibility::XAccessibleTable > rAccessibleTable;
-    ::com::sun::star::uno::Reference < ::com::sun::star::accessibility::XAccessibleText > rAccessibleText;
-    ::com::sun::star::uno::Reference < ::com::sun::star::accessibility::XAccessibleEditableText > rAccessibleEditableText;
-    ::com::sun::star::uno::Reference < ::com::sun::star::accessibility::XAccessibleValue > rAccessibleValue;
-    ::com::sun::star::uno::Reference < ::com::sun::star::accessibility::XAccessibleTextAttributes > rAccessibleTextAttributes;
-    ::com::sun::star::uno::Reference < ::com::sun::star::accessibility::XAccessibleMultiLineText > rAccessibleMultiLineText;
-};
-
-@interface AquaA11yWrapper : NSView
-{
-    ReferenceWrapper * mpReferenceWrapper;
-    NSString * mpDefaultFontname;
-    float mDefaultFontsize;
-    BOOL mActsAsRadioGroup;
-    BOOL mIsTableCell;
-}
-// NSAccessibility Protocol
--(id)accessibilityAttributeValue:(NSString *)attribute;
--(BOOL)accessibilityIsIgnored;
--(NSArray *)accessibilityAttributeNames;
--(BOOL)accessibilityIsAttributeSettable:(NSString *)attribute;
--(NSArray *)accessibilityParameterizedAttributeNames;
--(BOOL)accessibilitySetOverrideValue:(id)value forAttribute:(NSString *)attribute;
--(void)accessibilitySetValue:(id)value forAttribute:(NSString *)attribute;
--(id)accessibilityAttributeValue:(NSString *)attribute forParameter:(id)parameter;
--(id)accessibilityFocusedUIElement;
--(NSString *)accessibilityActionDescription:(NSString *)action;
--(void)accessibilityPerformAction:(NSString *)action;
--(NSArray *)accessibilityActionNames;
--(id)accessibilityHitTest:(NSPoint)point;
-// Attribute values
--(id)parentAttribute;
--(id)valueAttribute;
--(id)titleAttribute;
--(id)helpAttribute;
--(id)numberOfCharactersAttribute;
--(id)selectedTextAttribute;
--(id)selectedTextRangeAttribute;
--(id)visibleCharacterRangeAttribute;
--(id)childrenAttribute;
--(id)orientationAttribute;
--(id)windowAttribute;
-// Wrapper-specific
--(void)setActsAsRadioGroup:(BOOL)actsAsRadioGroup;
--(BOOL)actsAsRadioGroup;
--(NSView *)viewElementForParent;
--(id)initWithAccessibleContext: (::com::sun::star::uno::Reference < ::com::sun::star::accessibility::XAccessibleContext >) anAccessibleContext;
--(void) setDefaults: (::com::sun::star::uno::Reference < ::com::sun::star::accessibility::XAccessibleContext >) rxAccessibleContext;
--(void) dealloc;
--(void)setDefaultFontname:(NSString *)fontname;
--(NSString *)defaultFontname;
--(void)setDefaultFontsize:(float)fontsize;
--(float)defaultFontsize;
-+(void)setPopupMenuOpen:(BOOL)popupMenuOpen;
--(::com::sun::star::accessibility::XAccessibleAction *)accessibleAction;
--(::com::sun::star::accessibility::XAccessibleContext *)accessibleContext;
--(::com::sun::star::accessibility::XAccessibleComponent *)accessibleComponent;
--(::com::sun::star::accessibility::XAccessibleExtendedComponent *)accessibleExtendedComponent;
--(::com::sun::star::accessibility::XAccessibleSelection *)accessibleSelection;
--(::com::sun::star::accessibility::XAccessibleTable *)accessibleTable;
--(::com::sun::star::accessibility::XAccessibleText *)accessibleText;
--(::com::sun::star::accessibility::XAccessibleEditableText *)accessibleEditableText;
--(::com::sun::star::accessibility::XAccessibleValue *)accessibleValue;
--(::com::sun::star::accessibility::XAccessibleTextAttributes *)accessibleTextAttributes;
--(::com::sun::star::accessibility::XAccessibleMultiLineText *)accessibleMultiLineText;
-@end
-
-#endif // _SV_AQUA11WRAPPER_H
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/inc/aquaprintview.h b/vcl/aqua/inc/aquaprintview.h
deleted file mode 100644
index 2c5849f10e65..000000000000
--- a/vcl/aqua/inc/aquaprintview.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _VCL_AQUAPRINTVIEW_H
-#define _VCL_AQUAPRINTVIEW_H
-
-#include "premac.h"
-#include <Cocoa/Cocoa.h>
-#include "postmac.h"
-
-#include "vcl/print.hxx"
-
-class AquaSalInfoPrinter;
-
-struct PrintAccessoryViewState
-{
-    bool        bNeedRestart;
-    sal_Int32   nLastPage;
-
-    PrintAccessoryViewState()
-    : bNeedRestart( false ), nLastPage( 0 ) {}
-};
-
-@interface AquaPrintView : NSView
-{
-    vcl::PrinterController*     mpController;
-    AquaSalInfoPrinter*         mpInfoPrinter;
-}
--(id)initWithController: (vcl::PrinterController*)pController withInfoPrinter: (AquaSalInfoPrinter*)pInfoPrinter;
--(BOOL)knowsPageRange: (NSRangePointer)range;
--(NSRect)rectForPage: (int)page;
--(NSPoint)locationOfPrintRect: (NSRect)aRect;
--(void)drawRect: (NSRect)rect;
-@end
-
-@interface AquaPrintAccessoryView : NSObject
-{
-}
-+(NSObject*)setupPrinterPanel: (NSPrintOperation*)pOp withController: (vcl::PrinterController*)pController withState: (PrintAccessoryViewState*)pState;
-@end
-
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/inc/aquavclevents.hxx b/vcl/aqua/inc/aquavclevents.hxx
deleted file mode 100644
index 034edd3882b5..000000000000
--- a/vcl/aqua/inc/aquavclevents.hxx
+++ /dev/null
@@ -1,99 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef INCLUDED_AQUAVCLEVENTS_HXX
-#define INCLUDED_AQUAVCLEVENTS_HXX
-
-#include <premac.h>
-#include <Carbon/Carbon.h>
-#include <postmac.h>
-
-/* Definition of custom OpenOffice.org events.
-
-   Avoid conflict with Apple defined event class and type
-   definitions by using uppercase letters. Lowercase
-   letter definitions are reserved for Apple!
- */
-enum {
-  cOOoSalUserEventClass = 'OOUE'
-};
-
-enum {
-  cOOoSalEventUser = 'UEVT',
-  cOOoSalEventTimer = 'EVTT',
-  cOOoSalEventData = 'EVTD',
-  cOOoSalEventParamTypePtr = 'EPPT'
-};
-
-/* Definition of all necessary EventTypeSpec's */
-
-const EventTypeSpec cWindowBoundsChangedEvent = { kEventClassWindow, kEventWindowBoundsChanged };
-const EventTypeSpec cWindowCloseEvent = { kEventClassWindow, kEventWindowClose };
-const EventTypeSpec cOOoSalUserEvent = { cOOoSalUserEventClass, cOOoSalEventUser };
-const EventTypeSpec cOOoSalTimerEvent = { cOOoSalUserEventClass, cOOoSalEventTimer };
-const EventTypeSpec cWindowActivatedEvent[] = { { kEventClassWindow, kEventWindowActivated },
-                                                { kEventClassWindow, kEventWindowDeactivated } };
-const EventTypeSpec cWindowPaintEvent = { kEventClassWindow, kEventWindowPaint };
-const EventTypeSpec cWindowDrawContentEvent = { kEventClassWindow, kEventWindowDrawContent };
-
-const EventTypeSpec cWindowFocusEvent[] = { { kEventClassWindow, kEventWindowFocusAcquired },
-                                            { kEventClassWindow, kEventWindowFocusRelinquish } };
-
-const EventTypeSpec cMouseEnterExitEvent[] = { { kEventClassControl, kEventControlTrackingAreaEntered },
-                                               { kEventClassControl, kEventControlTrackingAreaExited } };
-
-const EventTypeSpec cMouseEvent[] = { { kEventClassMouse, kEventMouseDown },
-                                      { kEventClassMouse, kEventMouseUp },
-                                      { kEventClassMouse, kEventMouseMoved },
-                                      { kEventClassMouse, kEventMouseDragged } };
-const EventTypeSpec cMouseWheelMovedEvent = { kEventClassMouse, kEventMouseWheelMoved };
-const EventTypeSpec cWindowResizeStarted = { kEventClassWindow, kEventWindowResizeStarted };
-const EventTypeSpec cWindowResizeCompleted = { kEventClassWindow, kEventWindowResizeCompleted };
-
-/* Events for native menus */
-const EventTypeSpec cCommandProcessEvent = { kEventClassCommand, kEventCommandProcess };
-const EventTypeSpec cMenuPopulateEvent = { kEventClassMenu, kEventMenuPopulate };
-const EventTypeSpec cMenuClosedEvent = { kEventClassMenu, kEventMenuClosed };
-const EventTypeSpec cMenuTargetItemEvent = { kEventClassMenu, kEventMenuTargetItem };
-
-/* Events for keyboard */
-const EventTypeSpec cKeyboardRawKeyEvents[] = { { kEventClassKeyboard, kEventRawKeyDown},
-                        { kEventClassKeyboard, kEventRawKeyUp},
-                        { kEventClassKeyboard, kEventRawKeyRepeat},
-                        { kEventClassKeyboard, kEventRawKeyModifiersChanged} };
-
-const EventTypeSpec cTextInputEvents[] = { { kEventClassTextInput, kEventTextInputUpdateActiveInputArea},
-                                           { kEventClassTextInput, kEventTextInputUnicodeForKeyEvent},
-                                           { kEventClassTextInput, kEventTextInputOffsetToPos} };
-
-/* Events for scrollbar */
-
-const EventTypeSpec cAppearanceScrollbarVariantChangedEvent = { kEventClassAppearance, kEventAppearanceScrollBarVariantChanged };
-
-#endif // INCLUDED_AQUAVCLEVENTS_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/inc/aquavcltypes.h b/vcl/aqua/inc/aquavcltypes.h
deleted file mode 100644
index 93003faecad7..000000000000
--- a/vcl/aqua/inc/aquavcltypes.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _AQUAVCLTYPES_H
-#define _AQUAVCLTYPES_H
-
-#include "premac.h"
-#import <Cocoa/Cocoa.h>
-#import <AppKit/NSEvent.h>
-#include "postmac.h"
-
-#endif _AQUAVCLTYPES_H
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/inc/keyboardfocuslistener.hxx b/vcl/aqua/inc/keyboardfocuslistener.hxx
deleted file mode 100644
index bf9c70250005..000000000000
--- a/vcl/aqua/inc/keyboardfocuslistener.hxx
+++ /dev/null
@@ -1,47 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _KEYBOARDFOCUSLISTENER_HXX_
-#define _KEYBOARDFOCUSLISTENER_HXX_
-
-#include <com/sun/star/accessibility/XAccessible.hpp>
-
-#include <rtl/ref.hxx>
-
-// -------------------------
-// - KeyboardFocusListener -
-// -------------------------
-
-class KeyboardFocusListener : public rtl::IReference
-{
-public:
-    virtual void SAL_CALL focusedObjectChanged(const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& xAccessible) = 0;
-};
-
-#endif // _KEYBOARDFOCUSLISTENER_HXX_
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/inc/salatsuifontutils.hxx b/vcl/aqua/inc/salatsuifontutils.hxx
deleted file mode 100644
index 51079b8ec5d2..000000000000
--- a/vcl/aqua/inc/salatsuifontutils.hxx
+++ /dev/null
@@ -1,65 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _SV_SALATSUIFONTUTILS_HXX
-#define _SV_SALATSUIFONTUTILS_HXX
-
-class ImplMacFontData;
-class ImplDevFontList;
-
-#include <premac.h>
-#include <ApplicationServices/ApplicationServices.h>
-#include <postmac.h>
-
-#include <map>
-
-/* This class has the responsibility of assembling a list
-   of atsui compatible fonts available on the system and
-   enabling access to that list.
- */
-class SystemFontList
-{
-public:
-    SystemFontList();
-    ~SystemFontList();
-
-    void AnnounceFonts( ImplDevFontList& ) const;
-    ImplMacFontData* GetFontDataFromId( ATSUFontID ) const;
-
-    ATSUFontFallbacks maFontFallbacks;
-
-private:
-    typedef boost::unordered_map<ATSUFontID,ImplMacFontData*> MacFontContainer;
-    MacFontContainer maFontContainer;
-
-    void InitGlyphFallbacks();
-};
-
-#endif  // _SV_SALATSUIFONTUTILS_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/inc/salbmp.h b/vcl/aqua/inc/salbmp.h
deleted file mode 100644
index 33e671b05735..000000000000
--- a/vcl/aqua/inc/salbmp.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
-*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
-************************************************************************/
-
-#ifndef _SV_SALBMP_H
-#define _SV_SALBMP_H
-
-#include "tools/gen.hxx"
-#include "vcl/sv.h"
-#include "vcl/salbtype.hxx"
-#include "saldata.hxx"
-#include "vcl/salinst.hxx"
-#include "salconst.h"
-#include "vcl/salvd.hxx"
-#include "salcolorutils.hxx"
-#include "vcl/salbmp.hxx"
-#include "salgdi.h"
-#include "basebmp/bitmapdevice.hxx"
-
-// --------------
-// - SalBitmap  -
-// --------------
-
-struct  BitmapBuffer;
-class   BitmapColor;
-class   BitmapPalette;
-class   AquaSalVirtualDevice;
-class   AquaSalGraphics;
-
-class AquaSalBitmap : public SalBitmap
-{
-public:
-    CGContextRef                    mxGraphicContext;
-    mutable CGImageRef              mxCachedImage;
-    BitmapPalette                   maPalette;
-    basebmp::RawMemorySharedArray   maUserBuffer;
-    basebmp::RawMemorySharedArray   maContextBuffer;
-    sal_uInt16                      mnBits;
-    int                             mnWidth;
-    int                             mnHeight;
-    sal_uInt32                      mnBytesPerRow;
-
-public:
-    AquaSalBitmap();
-    virtual ~AquaSalBitmap();
-
-public:
-
-    // SalBitmap methods
-    bool            Create( const Size& rSize, sal_uInt16 nBitCount, const BitmapPalette& rPal );
-    bool            Create( const SalBitmap& rSalBmp );
-    bool            Create( const SalBitmap& rSalBmp, SalGraphics* pGraphics );
-    bool            Create( const SalBitmap& rSalBmp, sal_uInt16 nNewBitCount );
-    virtual bool    Create( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmapCanvas > xBitmapCanvas,
-                            Size& rSize,
-                            bool bMask = false );
-
-    void            Destroy();
-
-    Size            GetSize() const;
-    sal_uInt16          GetBitCount() const;
-
-    BitmapBuffer   *AcquireBuffer( bool bReadOnly );
-    void            ReleaseBuffer( BitmapBuffer* pBuffer, bool bReadOnly );
-
-    bool            GetSystemData( BitmapSystemData& rData );
-
-private:
-    // quartz helper
-    bool            CreateContext();
-    void            DestroyContext();
-    bool            AllocateUserData();
-
-    void            ConvertBitmapData( sal_uInt32 nWidth, sal_uInt32 nHeight,
-                                       sal_uInt16 nDestBits, sal_uInt32 nDestBytesPerRow, const BitmapPalette& rDestPalette, sal_uInt8* pDestData,
-                                       sal_uInt16 nSrcBits, sal_uInt32 nSrcBytesPerRow, const BitmapPalette& rSrcPalette, sal_uInt8* pSrcData );
-
-public:
-    bool            Create( CGLayerRef xLayer, int nBitCount, int nX, int nY, int nWidth, int nHeight, bool bMirrorVert = true );
-
-public:
-    CGImageRef      CreateWithMask( const AquaSalBitmap& rMask, int nX, int nY, int nWidth, int nHeight ) const;
-    CGImageRef      CreateColorMask( int nX, int nY, int nWidth, int nHeight, SalColor nMaskColor ) const;
-    CGImageRef      CreateCroppedImage( int nX, int nY, int nWidth, int nHeight ) const;
-};
-
-#endif // _SV_SALBMP_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/inc/salcolorutils.hxx b/vcl/aqua/inc/salcolorutils.hxx
deleted file mode 100644
index ae6afdabb9ff..000000000000
--- a/vcl/aqua/inc/salcolorutils.hxx
+++ /dev/null
@@ -1,55 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _SV_SALCOLORUTILS_HXX
-#define _SV_SALCOLORUTILS_HXX
-
-#ifndef _LIMITS_H
-    #include <limits.h>
-#endif
-
-#include "premac.h"
-#include <ApplicationServices/ApplicationServices.h>
-#include "postmac.h"
-
-#include "vcl/salbtype.hxx"
-#include "vcl/salgtype.hxx"
-#include "salconst.h"
-#include "salmathutils.hxx"
-
-// ------------------------------------------------------------------
-
-SalColor GetSalColor( const float* pQuartzColor );
-
-void SetSalColor( const SalColor& rColor, float* pQuartzColor );
-
-// ------------------------------------------------------------------
-
-#endif  // _SV_SALCOLORUTILS_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/inc/salconst.h b/vcl/aqua/inc/salconst.h
deleted file mode 100644
index 50971a819c09..000000000000
--- a/vcl/aqua/inc/salconst.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _SV_SALCONST_H
-#define _SV_SALCONST_H
-
-// -------------------
-// - Constants -
-// -------------------
-
-static const unsigned short kByteMask = 0xFF;
-
-static const unsigned short kOneByte  =  8;
-static const unsigned short kTwoBytes = 16;
-
-static const unsigned short kOneBit     =  1;
-static const unsigned short kFiveBits   =  5;
-static const unsigned short kEightBits  =  8;
-static const unsigned short kTenBits    = 10;
-static const unsigned short kElevenBits = 11;
-
-static const unsigned short kBlackAndWhite  =  1;
-static const unsigned short kFourBitColor   =  4;
-static const unsigned short kEightBitColor  =  8;
-static const unsigned short kThousandsColor = 16;
-static const unsigned short kTrueColor      = 32;
-
-static const unsigned long k16BitRedColorMask   = 0x00007c00;
-static const unsigned long k16BitGreenColorMask = 0x000003e0;
-static const unsigned long k16BitBlueColorMask  = 0x0000001f;
-
-static const unsigned long k32BitRedColorMask   = 0x00ff0000;
-static const unsigned long k32BitGreenColorMask = 0x0000ff00;
-static const unsigned long k32BitBlueColorMask  = 0x000000ff;
-
-static const unsigned short kPixMapCmpSizeOneBit    =  1;
-static const unsigned short kPixMapCmpSizeFourBits  =  4;
-static const unsigned short kPixMapCmpSizeFiveBits  =  5;
-static const unsigned short kPixMapCmpSizeEightBits =  8;
-
-static const long kPixMapHRes = 72;
-static const long kPixMapVRes = 72;
-
-#endif // _SV_SALCONST_H
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/inc/saldata.hxx b/vcl/aqua/inc/saldata.hxx
deleted file mode 100644
index d87938bd4474..000000000000
--- a/vcl/aqua/inc/saldata.hxx
+++ /dev/null
@@ -1,141 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _SV_SALDATA_HXX
-#define _SV_SALDATA_HXX
-
-#include "premac.h"
-#include <Cocoa/Cocoa.h>
-#include "postmac.h"
-
-#include "com/sun/star/uno/Reference.hxx"
-
-#include "vcl/sv.h"
-#include "vcl/svdata.hxx"
-#include "vcl/salwtype.hxx"
-#include "vcl/ptrstyle.hxx"
-
-#include <list>
-#include <vector>
-#include <map>
-#include <boost/unordered_set.hpp>
-
-#include <cstdio>
-#include <cstdarg>
-
-#include "apple_remote/RemoteMainController.h"
-
-class AquaSalInstance;
-class SalObject;
-class SalFrame;
-class SalVirtualDevice;
-class SalPrinter;
-class SystemFontList;
-
-// ------------------
-// - Some constants -
-// ------------------
-
-#define SAL_CLIPRECT_COUNT 16
-
-#define VER_TIGER   0x1040
-#define VER_LEOPARD 0x1050
-
-// -----------
-// - SalData -
-// -----------
-
-class AquaSalFrame;
-struct FrameHash : public boost::hash<sal_IntPtr>
-{
-    size_t operator()(const AquaSalFrame* frame) const
-    { return boost::hash<sal_IntPtr>::operator()( reinterpret_cast<const sal_IntPtr>(frame) ); }
-};
-
-#define INVALID_CURSOR_PTR (NSCursor*)0xdeadbeef
-
-struct SalData
-{
-
-    SALTIMERPROC                                  mpTimerProc;      // timer callback proc
-    AquaSalInstance                              *mpFirstInstance;  // pointer of first instance
-    std::list<AquaSalFrame*>                      maFrames;         // pointer of first frame
-    boost::unordered_set<const AquaSalFrame*,FrameHash>  maFrameCheck;     // for fast check of frame existance
-    SalObject                                    *mpFirstObject;    // pointer of first object window
-    SalVirtualDevice                             *mpFirstVD;        // first VirDev
-    SalPrinter                                   *mpFirstPrinter;   // first printing printer
-    SystemFontList                               *mpFontList;
-    NSStatusItem*                                 mpStatusItem;     // one status item that draws all our stati
-                                                                    // at the moment this is only one add menu button
-
-    CGColorSpaceRef                               mxRGBSpace;
-    CGColorSpaceRef                               mxGraySpace;
-    CGColorSpaceRef                               mxP50Space;
-    CGPatternRef                                  mxP50Pattern;
-
-    std::vector< NSCursor* >                      maCursors;
-    std::vector< NSMenuItem* >                    maFallbackMenu;
-    std::map< NSEvent*, bool >                    maKeyEventAnswer;
-
-    static oslThreadKey                           s_aAutoReleaseKey;
-
-    bool                                          mbIsScrollbarDoubleMax;   // TODO: support DoubleMin and DoubleBoth too
-    SInt32                                        mnSystemVersion;          // Store System Version
-    MainController*                               mpMainController;         // Apple Remote
-
-    NSObject*                                     mpDockIconClickHandler;
-    long                                          mnDPIX;           // #i100617# read DPI only once per office life
-    long                                          mnDPIY;           // #i100617# read DPI only once per office life
-
-    com::sun::star::uno::Reference< com::sun::star::uno::XInterface >
-                                                  mxClipboard;
-
-    SalData();
-    ~SalData();
-
-    NSCursor* getCursor( PointerStyle i_eStyle );
-
-    static void ensureThreadAutoreleasePool();
-    static void drainThreadAutoreleasePool();
-
-    static NSStatusItem* getStatusItem();
-};
-
-inline void SetSalData( SalData* pData ) { ImplGetSVData()->mpSalData = (void*)pData; }
-inline SalData *GetSalData() { return (SalData*)ImplGetSVData()->mpSalData; }
-inline SalData *GetAppSalData() { return (SalData*)ImplGetAppSVData()->mpSalData; }
-
-// --- Prototypes ---
-
-sal_Bool ImplSalYieldMutexTryToAcquire();
-void ImplSalYieldMutexAcquire();
-void ImplSalYieldMutexRelease();
-
-#endif  // _SV_SALDATA_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/inc/salfontutils.hxx b/vcl/aqua/inc/salfontutils.hxx
deleted file mode 100644
index 8394d874bf10..000000000000
--- a/vcl/aqua/inc/salfontutils.hxx
+++ /dev/null
@@ -1,68 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-
-#ifndef _SV_SALFONTUTILS_HXX
-#define _SV_SALFONTUTILS_HXX
-
-#include "vcl/outfont.hxx"
-
-static const char *kFontWeightThin1 = "Thin";
-static const char *kFontWeightThin2 = "thin";
-
-static const char *kFontWeightLight1 = "Light";
-static const char *kFontWeightLight2 = "light";
-
-static const char *kFontWeightBold1 = "Bold";
-static const char *kFontWeightBold2 = "bold";
-
-static const char *kFontWeightUltra1 = "Ultra";
-static const char *kFontWeightUltra2 = "ultra";
-
-static const char *kFontWeightSemi1 = "Semi";
-static const char *kFontWeightSemi2 = "semi";
-
-static const char *kFontWeightNormal1 = "Normal";
-static const char *kFontWeightNormal2 = "normal";
-
-static const char *kFontWeightMedium1 = "Medium";
-static const char *kFontWeightMedium2 = "medium";
-
-static const char *kFontWeightBlack1 = "Black";
-static const char *kFontWeightBlack2 = "black";
-
-static const char *kFontWeightRoman1 = "Roman";
-static const char *kFontWeightRoman2 = "roman";
-
-static const char *kFontWeightRegular1 = "Regular";
-static const char *kFontWeightRegular2 = "regular";
-
-
-#endif  // _SV_SALFONTUTILS_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/inc/salframe.h b/vcl/aqua/inc/salframe.h
deleted file mode 100644
index 4025b0aea70a..000000000000
--- a/vcl/aqua/inc/salframe.h
+++ /dev/null
@@ -1,226 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _SV_SALFRAME_H
-#define _SV_SALFRAME_H
-
-
-#include "vcl/sv.h"
-#include "vcl/salframe.hxx"
-#include "vcl/sysdata.hxx"
-
-#include "salmenu.h"
-#include "saldata.hxx"
-#include "aquavcltypes.h"
-
-#include <vector>
-#include <utility>
-#include <stdexcept>
-
-#include <boost/shared_ptr.hpp>
-
-class AquaSalGraphics;
-class AquaSalFrame;
-class AquaSalTimer;
-class AquaSalInstance;
-class AquaSalMenu;
-class AquaBlinker;
-
-typedef struct SalFrame::SalPointerState SalPointerState;
-
-// ----------------
-// - AquaSalFrame -
-// ----------------
-
-class AquaSalFrame : public SalFrame
-{
-public:
-    NSWindow*                       mpWindow;               // Cocoa window
-    NSView*                         mpView;                 // Cocoa view (actually a custom view, see below
-    NSMenuItem*                     mpDockMenuEntry;        // entry in the dynamic dock menu
-    NSRect                          maScreenRect;           // for mirroring purposes
-    AquaSalGraphics*                mpGraphics;             // current frame graphics
-    AquaSalFrame*                   mpParent;               // pointer to parent frame
-     SystemEnvData                  maSysData;              // system data
-    int                             mnMinWidth;             // min. client width in pixels
-    int                             mnMinHeight;            // min. client height in pixels
-    int                             mnMaxWidth;             // max. client width in pixels
-    int                             mnMaxHeight;            // max. client height in pixels
-    NSRect                          maFullScreenRect;       // old window size when in FullScreen
-    bool                            mbGraphics:1;           // is Graphics used?
-    bool                            mbFullScreen:1;         // is Window in FullScreen?
-    bool                            mbShown:1;
-    bool                            mbInitShow:1;
-    bool                            mbPositioned:1;
-    bool                            mbSized:1;
-    bool                            mbPresentation:1;
-
-    sal_uLong                           mnStyle;
-    unsigned int                    mnStyleMask;            // our style mask from NSWindow creation
-
-    sal_uLong                           mnLastEventTime;
-    unsigned int                    mnLastModifierFlags;
-    AquaSalMenu*                    mpMenu;
-
-    SalExtStyle                     mnExtStyle;             // currently document frames are marked this way
-
-    PointerStyle                    mePointerStyle;         // currently active pointer style
-
-    NSTrackingRectTag               mnTrackingRectTag;      // used to get enter/leave messages
-
-    CGMutablePathRef                mrClippingPath;         // used for "shaping"
-    std::vector< CGRect >           maClippingRects;
-
-    std::list<AquaBlinker*>         maBlinkers;
-
-    Rectangle                       maInvalidRect;
-
-    sal_uLong                           mnICOptions;
-
-    boost::shared_ptr< Timer >      mpActivityTimer; // Timer to prevent system sleep during presentation
-public:
-    /** Constructor
-
-        Creates a system window and connects this frame with it.
-
-        @throws std::runtime_error in case window creation fails
-    */
-    AquaSalFrame( SalFrame* pParent, sal_uLong salFrameStyle );
-
-    virtual ~AquaSalFrame();
-
-    virtual SalGraphics*        GetGraphics();
-    virtual void                ReleaseGraphics( SalGraphics* pGraphics );
-    virtual sal_Bool                PostEvent( void* pData );
-    virtual void                SetTitle( const XubString& rTitle );
-    virtual void                SetIcon( sal_uInt16 nIcon );
-    virtual void                SetRepresentedURL( const rtl::OUString& );
-    virtual void                SetMenu( SalMenu* pSalMenu );
-    virtual void                DrawMenuBar();
-    virtual void                Show( sal_Bool bVisible, sal_Bool bNoActivate = sal_False );
-    virtual void                Enable( sal_Bool bEnable );
-    virtual void                SetMinClientSize( long nWidth, long nHeight );
-    virtual void                SetMaxClientSize( long nWidth, long nHeight );
-    virtual void                SetPosSize( long nX, long nY, long nWidth, long nHeight, sal_uInt16 nFlags );
-    virtual void                GetClientSize( long& rWidth, long& rHeight );
-    virtual void                GetWorkArea( Rectangle& rRect );
-    virtual SalFrame*           GetParent() const;
-    virtual void                SetWindowState( const SalFrameState* pState );
-    virtual sal_Bool                GetWindowState( SalFrameState* pState );
-    virtual void                ShowFullScreen( sal_Bool bFullScreen, sal_Int32 nDisplay );
-    virtual void                StartPresentation( sal_Bool bStart );
-    virtual void                SetAlwaysOnTop( sal_Bool bOnTop );
-    virtual void                ToTop( sal_uInt16 nFlags );
-    virtual void                SetPointer( PointerStyle ePointerStyle );
-    virtual void                CaptureMouse( sal_Bool bMouse );
-    virtual void                SetPointerPos( long nX, long nY );
-    virtual void                Flush( void );
-    virtual void                Flush( const Rectangle& );
-    virtual void                Sync();
-    virtual void                SetInputContext( SalInputContext* pContext );
-    virtual void                EndExtTextInput( sal_uInt16 nFlags );
-    virtual String              GetKeyName( sal_uInt16 nKeyCode );
-    virtual String              GetSymbolKeyName( const XubString& rFontName, sal_uInt16 nKeyCode );
-    virtual sal_Bool                MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, KeyCode& rKeyCode );
-    virtual LanguageType        GetInputLanguage();
-    virtual SalBitmap*          SnapShot();
-    virtual void                UpdateSettings( AllSettings& rSettings );
-    virtual void                Beep( SoundType eSoundType );
-    virtual const SystemEnvData*    GetSystemData() const;
-    virtual SalPointerState     GetPointerState();
-    virtual SalIndicatorState   GetIndicatorState();
-    virtual void                SimulateKeyPress( sal_uInt16 nKeyCode );
-    virtual void                SetParent( SalFrame* pNewParent );
-    virtual bool                SetPluginParent( SystemParentData* pNewParent );
-    virtual void                SetExtendedFrameStyle( SalExtStyle );
-    virtual void                SetBackgroundBitmap( SalBitmap* );
-    virtual void                SetScreenNumber(unsigned int);
-    virtual void                SetApplicationID( const rtl::OUString &rApplicationID );
-
-    // shaped system windows
-    // set clip region to none (-> rectangular windows, normal state)
-    virtual void ResetClipRegion();
-    // start setting the clipregion consisting of nRects rectangles
-    virtual void BeginSetClipRegion( sal_uLong nRects );
-    // add a rectangle to the clip region
-    virtual void UnionClipRegion( long nX, long nY, long nWidth, long nHeight );
-    // done setting up the clipregion
-    virtual void EndSetClipRegion();
-
-    virtual void SetClientSize( long nWidth, long nHeight );
-
-    void UpdateFrameGeometry();
-
-    // trigger painting of the window
-    void SendPaintEvent( const Rectangle* pRect = NULL );
-
-    static bool isAlive( const AquaSalFrame* pFrame )
-    { return GetSalData()->maFrameCheck.find( pFrame ) != GetSalData()->maFrameCheck.end(); }
-
-    static AquaSalFrame* GetCaptureFrame() { return s_pCaptureFrame; }
-
-    NSWindow* getWindow() const { return mpWindow; }
-    NSView* getView() const { return mpView; }
-    unsigned int getStyleMask() const { return mnStyleMask; }
-
-    void getResolution( long& o_rDPIX, long& o_rDPIY );
-
-    // actually the follwing methods do the same thing: flipping y coordinates
-    // but having two of them makes clearer what the coordinate system
-    // is supposed to be before and after
-    void VCLToCocoa( NSRect& io_rRect, bool bRelativeToScreen = true );
-    void CocoaToVCL( NSRect& io_rRect, bool bRelativeToScreen = true );
-
-    void VCLToCocoa( NSPoint& io_rPoint, bool bRelativeToScreen = true );
-    void CocoaToVCL( NSPoint& io_Point, bool bRelativeToScreen = true );
-
-    NSCursor* getCurrentCursor() const;
-
-    CGMutablePathRef getClipPath() const { return mrClippingPath; }
-
-    // called by VCL_NSApplication to indicate screen settings have changed
-    void screenParametersChanged();
-
- private: // methods
-    /** do things on initial show (like centering on parent or on screen)
-    */
-    void initShow();
-
-    void initWindowAndView();
-
- private: // data
-    static AquaSalFrame*                   s_pCaptureFrame;
-
-    // make AquaSalFrame non copyable
-    AquaSalFrame( const AquaSalFrame& );
-    AquaSalFrame& operator=(const AquaSalFrame&);
-};
-
-#endif // _SV_SALFRAME_H
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/inc/salframeview.h b/vcl/aqua/inc/salframeview.h
deleted file mode 100644
index f28eb17f4e10..000000000000
--- a/vcl/aqua/inc/salframeview.h
+++ /dev/null
@@ -1,217 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _VCL_SALFRAMEVIEW_H
-#define _VCL_SALFRAMEVIEW_H
-
-#include "aqua11ywrapper.h"
-
-@interface SalFrameWindow : NSWindow
-{
-    AquaSalFrame*       mpFrame;
-    id mDraggingDestinationHandler;
-}
--(id)initWithSalFrame: (AquaSalFrame*)pFrame;
--(BOOL)canBecomeKeyWindow;
--(void)displayIfNeeded;
--(void)windowDidBecomeKey: (NSNotification*)pNotification;
--(void)windowDidResignKey: (NSNotification*)pNotification;
--(void)windowDidChangeScreen: (NSNotification*)pNotification;
--(void)windowDidMove: (NSNotification*)pNotification;
--(void)windowDidResize: (NSNotification*)pNotification;
--(void)windowDidMiniaturize: (NSNotification*)pNotification;
--(void)windowDidDeminiaturize: (NSNotification*)pNotification;
--(BOOL)windowShouldClose: (NSNotification*)pNotification;
--(void)dockMenuItemTriggered: (id)sender;
--(AquaSalFrame*)getSalFrame;
--(BOOL)containsMouse;
--(::com::sun::star::uno::Reference < ::com::sun::star::accessibility::XAccessibleContext >)accessibleContext;
-
-/* NSDraggingDestination protocol methods
- */
--(NSDragOperation)draggingEntered:(id <NSDraggingInfo>)sender;
--(NSDragOperation)draggingUpdated:(id <NSDraggingInfo>)sender;
--(void)draggingExited:(id <NSDraggingInfo>)sender;
--(BOOL)prepareForDragOperation:(id <NSDraggingInfo>)sender;
--(BOOL)performDragOperation:(id <NSDraggingInfo>)sender;
--(void)concludeDragOperation:(id <NSDraggingInfo>)sender;
-
--(void)registerDraggingDestinationHandler:(id)theHandler;
--(void)unregisterDraggingDestinationHandler:(id)theHandler;
-@end
-
-@interface SalFrameView : AquaA11yWrapper <NSTextInput>
-{
-    AquaSalFrame*       mpFrame;
-
-    // for NSTextInput
-    NSEvent*        mpLastEvent;
-    BOOL            mbNeedSpecialKeyHandle;
-    BOOL            mbInKeyInput;
-    BOOL            mbKeyHandled;
-    NSRange         mMarkedRange;
-    NSRange         mSelectedRange;
-    id              mpMouseEventListener;
-    id              mDraggingDestinationHandler;
-    NSEvent*        mpLastSuperEvent;
-
-    // #i102807# used by magnify event handler
-    NSTimeInterval  mfLastMagnifyTime;
-    float           mfMagnifyDeltaSum;
-}
-+(void)unsetMouseFrame: (AquaSalFrame*)pFrame;
--(id)initWithSalFrame: (AquaSalFrame*)pFrame;
--(AquaSalFrame*)getSalFrame;
--(BOOL)acceptsFirstResponder;
--(BOOL)acceptsFirstMouse: (NSEvent *)pEvent;
--(BOOL)isOpaque;
--(void)drawRect: (NSRect)aRect;
--(void)mouseDown: (NSEvent*)pEvent;
--(void)mouseDragged: (NSEvent*)pEvent;
--(void)mouseUp: (NSEvent*)pEvent;
--(void)mouseMoved: (NSEvent*)pEvent;
--(void)mouseEntered: (NSEvent*)pEvent;
--(void)mouseExited: (NSEvent*)pEvent;
--(void)rightMouseDown: (NSEvent*)pEvent;
--(void)rightMouseDragged: (NSEvent*)pEvent;
--(void)rightMouseUp: (NSEvent*)pEvent;
--(void)otherMouseDown: (NSEvent*)pEvent;
--(void)otherMouseDragged: (NSEvent*)pEvent;
--(void)otherMouseUp: (NSEvent*)pEvent;
--(void)scrollWheel: (NSEvent*)pEvent;
--(void)magnifyWithEvent: (NSEvent*)pEvent;
--(void)rotateWithEvent: (NSEvent*)pEvent;
--(void)swipeWithEvent: (NSEvent*)pEvent;
--(void)keyDown: (NSEvent*)pEvent;
--(void)flagsChanged: (NSEvent*)pEvent;
--(void)sendMouseEventToFrame:(NSEvent*)pEvent button:(sal_uInt16)nButton eventtype:(sal_uInt16)nEvent;
--(BOOL)sendKeyInputAndReleaseToFrame: (sal_uInt16)nKeyCode character: (sal_Unicode)aChar;
--(BOOL)sendKeyInputAndReleaseToFrame: (sal_uInt16)nKeyCode character: (sal_Unicode)aChar modifiers: (unsigned int)nMod;
--(BOOL)sendKeyToFrameDirect: (sal_uInt16)nKeyCode character: (sal_Unicode)aChar modifiers: (unsigned int)nMod;
--(BOOL)sendSingleCharacter:(NSEvent*)pEvent;
--(BOOL)handleKeyDownException:(NSEvent*)pEvent;
--(void)clearLastEvent;
-/*
-    text action methods
-*/
--(void)insertText:(id)aString;
--(void)insertTab: (id)aSender;
--(void)insertBacktab: (id)aSender;
--(void)moveLeft: (id)aSender;
--(void)moveLeftAndModifySelection: (id)aSender;
--(void)moveBackwardAndModifySelection: (id)aSender;
--(void)moveRight: (id)aSender;
--(void)moveRightAndModifySelection: (id)aSender;
--(void)moveForwardAndModifySelection: (id)aSender;
--(void)moveUp: (id)aSender;
--(void)moveDown: (id)aSender;
--(void)moveWordBackward: (id)aSender;
--(void)moveWordBackwardAndModifySelection: (id)aSender;
--(void)moveWordLeftAndModifySelection: (id)aSender;
--(void)moveWordForward: (id)aSender;
--(void)moveWordForwardAndModifySelection: (id)aSender;
--(void)moveWordRightAndModifySelection: (id)aSender;
--(void)moveToEndOfLine: (id)aSender;
--(void)moveToRightEndOfLine: (id)aSender;
--(void)moveToLeftEndOfLine: (id)aSender;
--(void)moveToEndOfLineAndModifySelection: (id)aSender;
--(void)moveToRightEndOfLineAndModifySelection: (id)aSender;
--(void)moveToLeftEndOfLineAndModifySelection: (id)aSender;
--(void)moveToBeginningOfLine: (id)aSender;
--(void)moveToBeginningOfLineAndModifySelection: (id)aSender;
--(void)moveToEndOfParagraph: (id)aSender;
--(void)moveToEndOfParagraphAndModifySelection: (id)aSender;
--(void)moveToBeginningOfParagraph: (id)aSender;
--(void)moveToBeginningOfParagraphAndModifySelection: (id)aSender;
--(void)moveParagraphForward: (id)aSender;
--(void)moveParagraphForwardAndModifySelection: (id)aSender;
--(void)moveParagraphBackward: (id)aSender;
--(void)moveParagraphBackwardAndModifySelection: (id)aSender;
--(void)moveToEndOfDocument: (id)aSender;
--(void)scrollToEndOfDocument: (id)aSender;
--(void)moveToEndOfDocumentAndModifySelection: (id)aSender;
--(void)moveToBeginningOfDocument: (id)aSender;
--(void)scrollToBeginningOfDocument: (id)aSender;
--(void)moveToBeginningOfDocumentAndModifySelection: (id)aSender;
--(void)insertNewline: (id)aSender;
--(void)deleteBackward: (id)aSender;
--(void)deleteForward: (id)aSender;
--(void)cancelOperation: (id)aSender;
--(void)deleteBackwardByDecomposingPreviousCharacter: (id)aSender;
--(void)deleteWordBackward: (id)aSender;
--(void)deleteWordForward: (id)aSender;
--(void)deleteToBeginningOfLine: (id)aSender;
--(void)deleteToEndOfLine: (id)aSender;
--(void)deleteToBeginningOfParagraph: (id)aSender;
--(void)deleteToEndOfParagraph: (id)aSender;
--(void)insertLineBreak: (id)aSender;
--(void)insertParagraphSeparator: (id)aSender;
--(void)selectWord: (id)aSender;
--(void)selectLine: (id)aSender;
--(void)selectParagraph: (id)aSender;
--(void)selectAll: (id)aSender;
--(void)noop: (id)aSender;
-/* set the correct pointer for our view */
--(void)resetCursorRects;
--(::com::sun::star::accessibility::XAccessibleContext *)accessibleContext;
--(id)parentAttribute;
--(NSView *)viewElementForParent;
-/*
-  Event hook for D&D service.
-
-  A drag operation will be invoked on a NSView using
-  the method 'dragImage'. This method requires the
-  actual mouse event initiating this drag operation.
-  Mouse events can only be received by subclassing
-  NSView and overriding methods like 'mouseDown' etc.
-  hence we implement a event hook here so that the
-  D&D service can register as listener for mouse
-  messages and use the last 'mouseDown' or
-  'mouseDragged' message to initiate the drag
-  operation.
-*/
--(void)registerMouseEventListener: (id)theListener;
--(void)unregisterMouseEventListener: (id)theListener;
-
-/* NSDraggingDestination protocol methods
- */
--(NSDragOperation)draggingEntered:(id <NSDraggingInfo>)sender;
--(NSDragOperation)draggingUpdated:(id <NSDraggingInfo>)sender;
--(void)draggingExited:(id <NSDraggingInfo>)sender;
--(BOOL)prepareForDragOperation:(id <NSDraggingInfo>)sender;
--(BOOL)performDragOperation:(id <NSDraggingInfo>)sender;
--(void)concludeDragOperation:(id <NSDraggingInfo>)sender;
-
--(void)registerDraggingDestinationHandler:(id)theHandler;
--(void)unregisterDraggingDestinationHandler:(id)theHandler;
-
-@end
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/inc/salgdi.h b/vcl/aqua/inc/salgdi.h
deleted file mode 100644
index c69f5d70bf96..000000000000
--- a/vcl/aqua/inc/salgdi.h
+++ /dev/null
@@ -1,419 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _SV_SALGDI_H
-#define _SV_SALGDI_H
-
-#include "premac.h"
-#include <ApplicationServices/ApplicationServices.h>
-#include "postmac.h"
-
-#include "vcl/sv.h"
-#include "vcl/outfont.hxx"
-#include "vcl/salgdi.hxx"
-#include <vcl/fontcapabilities.hxx>
-#include "aquavcltypes.h"
-
-#include "basegfx/polygon/b2dpolypolygon.hxx"
-
-#include <vector>
-
-class AquaSalFrame;
-class AquaSalBitmap;
-class ImplDevFontAttributes;
-
-class CGRect;
-
-// mac specific physically available font face
-class ImplMacFontData : public ImplFontData
-{
-public:
-    ImplMacFontData( const ImplDevFontAttributes&, ATSUFontID );
-
-    virtual ~ImplMacFontData();
-
-    virtual ImplFontData*   Clone() const;
-    virtual ImplFontEntry*  CreateFontInstance( ImplFontSelectData& ) const;
-    virtual sal_IntPtr      GetFontId() const;
-
-    const ImplFontCharMap*  GetImplFontCharMap() const;
-    bool                    GetImplFontCapabilities(vcl::FontCapabilities &rFontCapabilities) const;
-    bool                    HasChar( sal_uInt32 cChar ) const;
-
-    void                    ReadOs2Table() const;
-    void                    ReadMacCmapEncoding() const;
-    bool                    HasCJKSupport() const;
-
-private:
-    const ATSUFontID            mnFontId;
-    mutable const ImplFontCharMap*  mpCharMap;
-    mutable vcl::FontCapabilities maFontCapabilities;
-    mutable bool                mbOs2Read;       // true if OS2-table related info is valid
-    mutable bool                mbHasOs2Table;
-    mutable bool                mbCmapEncodingRead; // true if cmap encoding of Mac font is read
-    mutable bool                mbHasCJKSupport; // #i78970# CJK fonts need extra leading
-    mutable bool                mbFontCapabilitiesRead;
-};
-
-// abstracting quartz color instead of having to use an CGFloat[] array
-class RGBAColor
-{
-public:
-    RGBAColor( SalColor );
-    RGBAColor( float fRed, float fGreen, float fBlue, float fAlpha ); //NOTUSEDYET
-    const float* AsArray() const    { return &mfRed; }
-    bool IsVisible() const          { return (mfAlpha > 0); }
-    void SetAlpha( float fAlpha )   { mfAlpha = fAlpha; }
-private:
-    float mfRed, mfGreen, mfBlue, mfAlpha;
-};
-
-// -------------------
-// - AquaSalGraphics -
-// -------------------
-class AquaSalGraphics : public SalGraphics
-{
-    friend class ATSLayout;
-protected:
-    AquaSalFrame*                           mpFrame;
-    CGLayerRef                              mxLayer;    // Quartz graphics layer
-    CGContextRef                            mrContext;  // Quartz drawing context
-    class XorEmulation*                     mpXorEmulation;
-    int                                     mnXorMode; // 0: off 1: on 2: invert only
-    int                                     mnWidth;
-    int                                     mnHeight;
-    int                                     mnBitmapDepth;  // zero unless bitmap
-    /// device resolution of this graphics
-    long                                    mnRealDPIX;
-    long                                    mnRealDPIY;
-    /// some graphics implementations (e.g. AquaSalInfoPrinter) scale
-    /// everything down by a factor (see SetupPrinterGraphics for details)
-    /// so we have to compensate for it with the inverse factor
-    double                                  mfFakeDPIScale;
-
-    /// path representing current clip region
-    CGMutablePathRef                        mxClipPath;
-
-    /// Drawing colors
-    /// pen color RGBA
-    RGBAColor                               maLineColor;
-    /// brush color RGBA
-    RGBAColor                               maFillColor;
-
-    // Device Font settings
-     const ImplMacFontData*                  mpMacFontData;
-    /// ATSU style object which carries all font attributes
-    ATSUStyle                               maATSUStyle;
-    /// text rotation as ATSU angle
-    Fixed                                   mnATSUIRotation;
-    /// workaround to prevent ATSU overflows for huge font sizes
-    float                                   mfFontScale;
-    /// <1.0: font is squeezed, >1.0 font is stretched, else 1.0
-    float                                   mfFontStretch;
-    /// allows text to be rendered without antialiasing
-    bool                                    mbNonAntialiasedText;
-
-    // Graphics types
-
-    /// is this a printer graphics
-    bool                                    mbPrinter;
-    /// is this a virtual device graphics
-    bool                                    mbVirDev;
-    /// is this a window graphics
-    bool                                    mbWindow;
-
-public:
-    AquaSalGraphics();
-    virtual ~AquaSalGraphics();
-
-    bool                IsPenVisible() const    { return maLineColor.IsVisible(); }
-    bool                IsBrushVisible() const  { return maFillColor.IsVisible(); }
-
-    void                SetWindowGraphics( AquaSalFrame* pFrame );
-    void                SetPrinterGraphics( CGContextRef, long nRealDPIX, long nRealDPIY, double fFakeScale );
-    void                SetVirDevGraphics( CGLayerRef, CGContextRef, int nBitDepth = 0 );
-
-    void                initResolution( NSWindow* );
-    void                copyResolution( AquaSalGraphics& );
-    void                updateResolution();
-
-    bool                IsWindowGraphics()      const   { return mbWindow; }
-    bool                IsPrinterGraphics()     const   { return mbPrinter; }
-    bool                IsVirDevGraphics()      const   { return mbVirDev; }
-    AquaSalFrame*       getGraphicsFrame() const { return mpFrame; }
-    void                setGraphicsFrame( AquaSalFrame* pFrame ) { mpFrame = pFrame; }
-
-    void                ImplDrawPixel( long nX, long nY, const RGBAColor& ); // helper to draw single pixels
-
-    bool                CheckContext();
-    void                UpdateWindow( NSRect& ); // delivered in NSView coordinates
-    void                RefreshRect( const CGRect& );
-    void                RefreshRect( const NSRect& );
-    void                RefreshRect(float lX, float lY, float lWidth, float lHeight);
-
-    void                SetState();
-    void                UnsetState();
-    // InvalidateContext does an UnsetState and sets mrContext to 0
-    void                InvalidateContext();
-
-    virtual bool        setClipRegion( const Region& );
-
-    // draw --> LineColor and FillColor and RasterOp and ClipRegion
-    virtual void        drawPixel( long nX, long nY );
-    virtual void        drawPixel( long nX, long nY, SalColor nSalColor );
-    virtual void        drawLine( long nX1, long nY1, long nX2, long nY2 );
-    virtual void        drawRect( long nX, long nY, long nWidth, long nHeight );
-    virtual void        drawPolyLine( sal_uLong nPoints, const SalPoint* pPtAry );
-    virtual void        drawPolygon( sal_uLong nPoints, const SalPoint* pPtAry );
-    virtual void        drawPolyPolygon( sal_uLong nPoly, const sal_uLong* pPoints, PCONSTSALPOINT* pPtAry );
-    virtual bool        drawPolyPolygon( const ::basegfx::B2DPolyPolygon&, double fTransparency );
-    virtual sal_Bool    drawPolyLineBezier( sal_uLong nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry );
-    virtual sal_Bool    drawPolygonBezier( sal_uLong nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry );
-    virtual sal_Bool    drawPolyPolygonBezier( sal_uLong nPoly, const sal_uLong* pPoints, const SalPoint* const* pPtAry, const sal_uInt8* const* pFlgAry );
-    virtual bool        drawPolyLine( const ::basegfx::B2DPolygon&, double fTransparency, const ::basegfx::B2DVector& rLineWidths, basegfx::B2DLineJoin );
-
-    // CopyArea --> No RasterOp, but ClipRegion
-    virtual void        copyArea( long nDestX, long nDestY, long nSrcX, long nSrcY, long nSrcWidth,
-                                  long nSrcHeight, sal_uInt16 nFlags );
-
-    // CopyBits and DrawBitmap --> RasterOp and ClipRegion
-    // CopyBits() --> pSrcGraphics == NULL, then CopyBits on same Graphics
-    virtual void        copyBits( const SalTwoRect* pPosAry, SalGraphics* pSrcGraphics );
-    virtual void        drawBitmap( const SalTwoRect* pPosAry, const SalBitmap& rSalBitmap );
-    virtual void        drawBitmap( const SalTwoRect* pPosAry,
-                                    const SalBitmap& rSalBitmap,
-                                    SalColor nTransparentColor );
-    virtual void        drawBitmap( const SalTwoRect* pPosAry,
-                                    const SalBitmap& rSalBitmap,
-                                    const SalBitmap& rTransparentBitmap );
-    virtual void        drawMask( const SalTwoRect* pPosAry,
-                                  const SalBitmap& rSalBitmap,
-                                  SalColor nMaskColor );
-
-    virtual SalBitmap*  getBitmap( long nX, long nY, long nWidth, long nHeight );
-    virtual SalColor    getPixel( long nX, long nY );
-
-    // invert --> ClipRegion (only Windows or VirDevs)
-    virtual void        invert( long nX, long nY, long nWidth, long nHeight, SalInvert nFlags);
-    virtual void        invert( sal_uLong nPoints, const SalPoint* pPtAry, SalInvert nFlags );
-
-    virtual sal_Bool        drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uLong nSize );
-
-    virtual bool            drawAlphaBitmap( const SalTwoRect&,
-                                             const SalBitmap& rSourceBitmap,
-                                             const SalBitmap& rAlphaBitmap );
-
-    virtual bool            drawAlphaRect( long nX, long nY, long nWidth,
-                                           long nHeight, sal_uInt8 nTransparency );
-
-    CGPoint*                makeCGptArray(sal_uLong nPoints, const SalPoint*  pPtAry);
-    // native widget rendering methods that require mirroring
-    virtual sal_Bool        hitTestNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion,
-                                              const Point& aPos, sal_Bool& rIsInside );
-    virtual sal_Bool        drawNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion,
-                                           ControlState nState, const ImplControlValue& aValue,
-                                           const rtl::OUString& aCaption );
-    virtual sal_Bool        drawNativeControlText( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion,
-                                               ControlState nState, const ImplControlValue& aValue,
-                                               const rtl::OUString& aCaption );
-    virtual sal_Bool        getNativeControlRegion( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState,
-                                                const ImplControlValue& aValue, const rtl::OUString& aCaption,
-                                                Rectangle &rNativeBoundingRegion, Rectangle &rNativeContentRegion );
-
-    // get device resolution
-    virtual void            GetResolution( long& rDPIX, long& rDPIY );
-    // get the depth of the device
-    virtual sal_uInt16          GetBitCount() const;
-    // get the width of the device
-    virtual long            GetGraphicsWidth() const;
-
-    // set the clip region to empty
-    virtual void            ResetClipRegion();
-
-    // set the line color to transparent (= don't draw lines)
-    virtual void            SetLineColor();
-    // set the line color to a specific color
-    virtual void            SetLineColor( SalColor nSalColor );
-    // set the fill color to transparent (= don't fill)
-    virtual void            SetFillColor();
-    // set the fill color to a specific color, shapes will be
-    // filled accordingly
-    virtual void            SetFillColor( SalColor nSalColor );
-    // enable/disable XOR drawing
-    virtual void            SetXORMode( bool bSet, bool bInvertOnly );
-    // set line color for raster operations
-    virtual void            SetROPLineColor( SalROPColor nROPColor );
-    // set fill color for raster operations
-    virtual void            SetROPFillColor( SalROPColor nROPColor );
-    // set the text color to a specific color
-    virtual void            SetTextColor( SalColor nSalColor );
-    // set the font
-    virtual sal_uInt16         SetFont( ImplFontSelectData*, int nFallbackLevel );
-    // get the current font's etrics
-    virtual void            GetFontMetric( ImplFontMetricData*, int nFallbackLevel );
-    // get kernign pairs of the current font
-    // return only PairCount if (pKernPairs == NULL)
-    virtual sal_uLong           GetKernPairs( sal_uLong nPairs, ImplKernPairData* pKernPairs );
-    // get the repertoire of the current font
-    virtual const ImplFontCharMap* GetImplFontCharMap() const;
-    virtual bool GetImplFontCapabilities(vcl::FontCapabilities &rFontCapabilities) const;
-    // graphics must fill supplied font list
-    virtual void            GetDevFontList( ImplDevFontList* );
-    // graphics should call ImplAddDevFontSubstitute on supplied
-    // OutputDevice for all its device specific preferred font substitutions
-    virtual void            GetDevFontSubstList( OutputDevice* );
-    virtual bool            AddTempDevFont( ImplDevFontList*, const String& rFileURL, const String& rFontName );
-    // CreateFontSubset: a method to get a subset of glyhps of a font
-    // inside a new valid font file
-    // returns TRUE if creation of subset was successfull
-    // parameters: rToFile: contains a osl file URL to write the subset to
-    //             pFont: describes from which font to create a subset
-    //             pGlyphIDs: the glyph ids to be extracted
-    //             pEncoding: the character code corresponding to each glyph
-    //             pWidths: the advance widths of the correspoding glyphs (in PS font units)
-    //             nGlyphs: the number of glyphs
-    //             rInfo: additional outgoing information
-    // implementation note: encoding 0 with glyph id 0 should be added implicitly
-    // as "undefined character"
-    virtual sal_Bool            CreateFontSubset( const rtl::OUString& rToFile,
-                                              const ImplFontData* pFont,
-                                              long* pGlyphIDs,
-                                              sal_uInt8* pEncoding,
-                                              sal_Int32* pWidths,
-                                              int nGlyphs,
-                                              FontSubsetInfo& rInfo // out parameter
-                                              );
-
-    // GetFontEncodingVector: a method to get the encoding map Unicode
-    // to font encoded character; this is only used for type1 fonts and
-    // may return NULL in case of unknown encoding vector
-    // if ppNonEncoded is set and non encoded characters (that is type1
-    // glyphs with only a name) exist it is set to the corresponding
-    // map for non encoded glyphs; the encoding vector contains -1
-    // as encoding for these cases
-    virtual const Ucs2SIntMap* GetFontEncodingVector( const ImplFontData*, const Ucs2OStrMap** ppNonEncoded );
-
-    // GetEmbedFontData: gets the font data for a font marked
-    // embeddable by GetDevFontList or NULL in case of error
-    // parameters: pFont: describes the font in question
-    //             pWidths: the widths of all glyphs from char code 0 to 255
-    //                      pWidths MUST support at least 256 members;
-    //             rInfo: additional outgoing information
-    //             pDataLen: out parameter, contains the byte length of the returned buffer
-    virtual const void* GetEmbedFontData( const ImplFontData*,
-                                          const sal_Ucs* pUnicodes,
-                                          sal_Int32* pWidths,
-                                          FontSubsetInfo& rInfo,
-                                          long* pDataLen );
-    // frees the font data again
-    virtual void            FreeEmbedFontData( const void* pData, long nDataLen );
-
-    virtual void            GetGlyphWidths( const ImplFontData*,
-                                            bool bVertical,
-                                            Int32Vector& rWidths,
-                                            Ucs2UIntMap& rUnicodeEnc );
-
-    virtual sal_Bool                    GetGlyphBoundRect( long nIndex, Rectangle& );
-    virtual sal_Bool                    GetGlyphOutline( long nIndex, basegfx::B2DPolyPolygon& );
-
-    virtual SalLayout*              GetTextLayout( ImplLayoutArgs&, int nFallbackLevel );
-    virtual void                     DrawServerFontLayout( const ServerFontLayout& );
-    virtual bool                    supportsOperation( OutDevSupportType ) const;
-
-    // Query the platform layer for control support
-    virtual sal_Bool IsNativeControlSupported( ControlType nType, ControlPart nPart );
-
-    virtual SystemGraphicsData    GetGraphicsData() const;
-    virtual SystemFontData        GetSysFontData( int /* nFallbacklevel */ ) const;
-
-private:
-    // differences between VCL, Quartz and kHiThemeOrientation coordinate systems
-    // make some graphics seem to be vertically-mirrored from a VCL perspective
-    bool IsFlipped() const { return mbWindow; }
-
-    void ApplyXorContext();
-    void Pattern50Fill();
-    UInt32 getState( ControlState nState );
-    UInt32 getTrackState( ControlState nState );
-};
-
-class XorEmulation
-{
-public:
-                    XorEmulation();
-    /*final*/       ~XorEmulation();
-
-    void            SetTarget( int nWidth, int nHeight, int nBitmapDepth, CGContextRef, CGLayerRef );
-    bool            UpdateTarget();
-    void            Enable()            { mbIsEnabled = true; }
-    void            Disable()           { mbIsEnabled = false; }
-    bool            IsEnabled() const   { return mbIsEnabled; }
-    CGContextRef    GetTargetContext() const { return mxTargetContext; }
-    CGContextRef    GetMaskContext() const { return (mbIsEnabled ? mxMaskContext : NULL); }
-
-private:
-    CGLayerRef      mxTargetLayer;
-    CGContextRef    mxTargetContext;
-    CGContextRef    mxMaskContext;
-    CGContextRef    mxTempContext;
-    sal_uLong*          mpMaskBuffer;
-    sal_uLong*          mpTempBuffer;
-    int             mnBufferLongs;
-    bool            mbIsEnabled;
-};
-
-
-// --- some trivial inlines
-
-inline void AquaSalGraphics::RefreshRect( const CGRect& rRect )
-{
-    RefreshRect( rRect.origin.x, rRect.origin.y, rRect.size.width, rRect.size.height );
-}
-
-inline void AquaSalGraphics::RefreshRect( const NSRect& rRect )
-{
-    RefreshRect( rRect.origin.x, rRect.origin.y, rRect.size.width, rRect.size.height );
-}
-
-inline RGBAColor::RGBAColor( SalColor nSalColor )
-:   mfRed( SALCOLOR_RED(nSalColor) * (1.0/255))
-,   mfGreen( SALCOLOR_GREEN(nSalColor) * (1.0/255))
-,   mfBlue( SALCOLOR_BLUE(nSalColor) * (1.0/255))
-,   mfAlpha( 1.0 )  // opaque
-{}
-
-inline RGBAColor::RGBAColor( float fRed, float fGreen, float fBlue, float fAlpha )
-:   mfRed( fRed )
-,   mfGreen( fGreen )
-,   mfBlue( fBlue )
-,   mfAlpha( fAlpha )
-{}
-
-#endif // _SV_SALGDI_H
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/inc/salinst.h b/vcl/aqua/inc/salinst.h
deleted file mode 100644
index 9bd65be14ac8..000000000000
--- a/vcl/aqua/inc/salinst.h
+++ /dev/null
@@ -1,207 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _SV_SALINST_H
-#define _SV_SALINST_H
-
-#include "vcl/sv.h"
-#include "osl/mutex.hxx"
-#include "osl/thread.hxx"
-#include "vcl/salinst.hxx"
-#include "osl/conditn.h"
-#include <vcl/solarmutex.hxx>
-
-#include "aquavcltypes.h"
-
-#include <list>
-
-class AquaSalFrame;
-class ApplicationEvent;
-class Image;
-
-// -----------------
-// - SalYieldMutex -
-// -----------------
-
-class SalYieldMutex : public vcl::SolarMutexObject
-{
-    sal_uLong                                       mnCount;
-    oslThreadIdentifier                         mnThreadId;
-
-public:
-                                                SalYieldMutex();
-    virtual void                                acquire();
-    virtual void                                release();
-    virtual sal_Bool                            tryToAcquire();
-    sal_uLong                                       GetAcquireCount() const { return mnCount; }
-    oslThreadIdentifier                         GetThreadId() const { return mnThreadId; }
-};
-
-#define YIELD_GUARD osl::SolarGuard aGuard( GetSalData()->mpFirstInstance->GetYieldMutex() )
-
-
-// -------------------
-// - SalInstanceData -
-// -------------------
-
-//struct SalInstanceData
-//{
-//public:
-//};
-
-// ------------------
-// - AquaSalInstance -
-// ------------------
-
-class AquaSalInstance : public SalInstance
-{
-    struct SalUserEvent
-    {
-        AquaSalFrame*   mpFrame;
-        void*           mpData;
-        sal_uInt16          mnType;
-
-        SalUserEvent( AquaSalFrame* pFrame, void* pData, sal_uInt16 nType ) :
-            mpFrame( pFrame ), mpData( pData ), mnType( nType )
-        {}
-    };
-
-public:
-    SalYieldMutex*                          mpSalYieldMutex;        // Sal-Yield-Mutex
-    rtl::OUString                           maDefaultPrinter;
-    oslThreadIdentifier                     maMainThread;
-    bool                                    mbWaitingYield;
-    int                                     mnActivePrintJobs;
-    std::list< SalUserEvent >               maUserEvents;
-    oslMutex                                maUserEventListMutex;
-    oslCondition                            maWaitingYieldCond;
-
-    typedef std::list<const ApplicationEvent*> AppEventList;
-    static AppEventList aAppEventList;
-
-public:
-    AquaSalInstance();
-    virtual ~AquaSalInstance();
-
-    virtual SalSystem*      CreateSystem();
-    virtual void            DestroySystem(SalSystem*);
-    virtual SalFrame*       CreateChildFrame( SystemParentData* pParent, sal_uLong nStyle );
-    virtual SalFrame*       CreateFrame( SalFrame* pParent, sal_uLong nStyle );
-    virtual void            DestroyFrame( SalFrame* pFrame );
-    virtual SalObject*      CreateObject( SalFrame* pParent, SystemWindowData* pWindowData, sal_Bool bShow = sal_True );
-    virtual void            DestroyObject( SalObject* pObject );
-    virtual SalVirtualDevice*   CreateVirtualDevice( SalGraphics* pGraphics,
-                                                     long nDX, long nDY,
-                                                     sal_uInt16 nBitCount, const SystemGraphicsData *pData );
-    virtual void            DestroyVirtualDevice( SalVirtualDevice* pDevice );
-
-    virtual SalInfoPrinter* CreateInfoPrinter( SalPrinterQueueInfo* pQueueInfo,
-                                               ImplJobSetup* pSetupData );
-    virtual void            DestroyInfoPrinter( SalInfoPrinter* pPrinter );
-    virtual SalPrinter*     CreatePrinter( SalInfoPrinter* pInfoPrinter );
-    virtual void            DestroyPrinter( SalPrinter* pPrinter );
-    virtual void            GetPrinterQueueInfo( ImplPrnQueueList* pList );
-    virtual void            GetPrinterQueueState( SalPrinterQueueInfo* pInfo );
-    virtual void            DeletePrinterQueueInfo( SalPrinterQueueInfo* pInfo );
-    virtual String             GetDefaultPrinter();
-    virtual SalTimer*           CreateSalTimer();
-    virtual SalI18NImeStatus*   CreateI18NImeStatus();
-    virtual SalSystem*          CreateSalSystem();
-    virtual SalBitmap*          CreateSalBitmap();
-    virtual osl::SolarMutex*    GetYieldMutex();
-    virtual sal_uLong               ReleaseYieldMutex();
-    virtual void                AcquireYieldMutex( sal_uLong nCount );
-    virtual bool                CheckYieldMutex();
-    virtual void                Yield( bool bWait, bool bHandleAllCurrentEvents );
-    virtual bool                AnyInput( sal_uInt16 nType );
-    virtual SalMenu*            CreateMenu( sal_Bool bMenuBar, Menu* pVCLMenu );
-    virtual void                DestroyMenu( SalMenu* );
-    virtual SalMenuItem*        CreateMenuItem( const SalItemParams* pItemData );
-    virtual void                DestroyMenuItem( SalMenuItem* );
-    virtual SalSession*         CreateSalSession();
-    virtual void*               GetConnectionIdentifier( ConnectionIdentifierType& rReturnedType, int& rReturnedBytes );
-    virtual void                AddToRecentDocumentList(const rtl::OUString& rFileUrl, const rtl::OUString& rMimeType);
-    virtual void            SetEventCallback( void* pInstance, bool(*pCallback)(void*,void*,int) );
-    virtual void            SetErrorEventCallback( void* pInstance, bool(*pCallback)(void*,void*,int) );
-
-    // dtrans implementation
-    virtual com::sun::star::uno::Reference< com::sun::star::uno::XInterface >
-        CreateClipboard( const com::sun::star::uno::Sequence< com::sun::star::uno::Any >& i_rArguments );
-    virtual com::sun::star::uno::Reference< com::sun::star::uno::XInterface > CreateDragSource();
-    virtual com::sun::star::uno::Reference< com::sun::star::uno::XInterface > CreateDropTarget();
-
-    static void handleAppDefinedEvent( NSEvent* pEvent );
-
-    // check whether a particular string is passed on the command line
-    // this is needed to avoid duplicate open events through a) command line and b) NSApp's openFile
-    static bool isOnCommandLine( const rtl::OUString& );
-
-    void wakeupYield();
-
- public:
-    friend class AquaSalFrame;
-
-    void PostUserEvent( AquaSalFrame* pFrame, sal_uInt16 nType, void* pData );
-    void delayedSettingsChanged( bool bInvalidate );
-
-    bool isNSAppThread() const;
-
-    void startedPrintJob() { mnActivePrintJobs++; }
-    void endedPrintJob() { mnActivePrintJobs--; }
-
-    // event subtypes for NSApplicationDefined events
-    static const short AppExecuteSVMain   = 0x7fff;
-    static const short AppEndLoopEvent    = 1;
-    static const short AppStartTimerEvent = 10;
-    static const short AppleRemoteEvent   = 15;
-    static const short YieldWakeupEvent   = 20;
-
-    static NSMenu* GetDynamicDockMenu();
-};
-
-// helper class: inverted solar guard
-class YieldMutexReleaser
-{
-    sal_uLong mnCount;
-    public:
-    YieldMutexReleaser();
-    ~YieldMutexReleaser();
-};
-
-// helper class
-rtl::OUString GetOUString( CFStringRef );
-rtl::OUString GetOUString( NSString* );
-CFStringRef CreateCFString( const rtl::OUString& );
-NSString* CreateNSString( const rtl::OUString& );
-
-CGImageRef CreateCGImage( const Image& );
-NSImage*   CreateNSImage( const Image& );
-
-#endif // _SV_SALINST_H
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/inc/salmathutils.hxx b/vcl/aqua/inc/salmathutils.hxx
deleted file mode 100644
index e81f68e46b0b..000000000000
--- a/vcl/aqua/inc/salmathutils.hxx
+++ /dev/null
@@ -1,90 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _SV_SALMATHUTILS_HXX
-#define _SV_SALMATHUTILS_HXX
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-// ------------------------------------------------------------------
-//
-//                            Structures
-//
-// ------------------------------------------------------------------
-
-// LRectCoor is an abreviation for rectangular coordinates
-// represented as long integers
-
-struct LRectCoor
-{
-    long  x;
-    long  y;
-    long  z;
-};
-
-// ------------------------------------------------------------------
-//
-//                       Type Definitions
-//
-// ------------------------------------------------------------------
-
-// LRectCoorVec is an abreviation for vectors in rectangular
-// coordinates represented as long integers
-
-typedef struct LRectCoor   LRectCoor;
-typedef LRectCoor         *LRectCoorVector;
-typedef LRectCoorVector   *LRectCoorTensor;
-
-// ------------------------------------------------------------------
-//
-//                      Function Headers
-//
-// ------------------------------------------------------------------
-
-void CSwap  ( char            &rX, char            &rY );
-void UCSwap ( unsigned char   &rX, unsigned char   &rY );
-void SSwap  ( short           &rX, short           &rY );
-void USSwap ( unsigned short  &rX, unsigned short  &rY );
-void LSwap  ( long            &rX, long            &rY );
-void ULSwap ( unsigned long   &rX, unsigned long   &rY );
-
-// ------------------------------------------------------------------
-
-unsigned long  Euclidian2Norm ( const LRectCoorVector  pVec );
-
-// ------------------------------------------------------------------
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  // _SV_SALMATHUTILS_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/inc/salmenu.h b/vcl/aqua/inc/salmenu.h
deleted file mode 100644
index 71081ad48b77..000000000000
--- a/vcl/aqua/inc/salmenu.h
+++ /dev/null
@@ -1,124 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _SV_SALMENU_H
-#define _SV_SALMENU_H
-
-#include "premac.h"
-#include <Cocoa/Cocoa.h>
-#include "postmac.h"
-
-#include "vcl/sv.h"
-#include "vcl/salmenu.hxx"
-
-#include <vector>
-
-class AquaSalFrame;
-class AquaSalMenuItem;
-
-class AquaSalMenu : public SalMenu
-{
-    std::vector< AquaSalMenuItem* >     maItems;
-
-public: // for OOStatusView
-    struct MenuBarButtonEntry
-    {
-        SalMenuButtonItem       maButton;
-        NSImage*                mpNSImage;      // cached image
-        NSString*               mpToolTipString;
-
-        MenuBarButtonEntry() : mpNSImage( nil ), mpToolTipString( nil ) {}
-        MenuBarButtonEntry( const SalMenuButtonItem& i_rItem )
-        : maButton( i_rItem), mpNSImage( nil ), mpToolTipString( nil ) {}
-    };
-private:
-    std::vector< MenuBarButtonEntry >   maButtons;
-
-    MenuBarButtonEntry* findButtonItem( sal_uInt16 i_nItemId );
-    void releaseButtonEntry( MenuBarButtonEntry& i_rEntry );
-    static void statusLayout();
-public:
-    AquaSalMenu( bool bMenuBar );
-    virtual ~AquaSalMenu();
-
-    virtual sal_Bool VisibleMenuBar();  // must return TRUE to actually DISPLAY native menu bars
-                                    // otherwise only menu messages are processed (eg, OLE on Windows)
-
-    virtual void InsertItem( SalMenuItem* pSalMenuItem, unsigned nPos );
-    virtual void RemoveItem( unsigned nPos );
-    virtual void SetSubMenu( SalMenuItem* pSalMenuItem, SalMenu* pSubMenu, unsigned nPos );
-    virtual void SetFrame( const SalFrame* pFrame );
-    virtual void CheckItem( unsigned nPos, sal_Bool bCheck );
-    virtual void EnableItem( unsigned nPos, sal_Bool bEnable );
-    virtual void SetItemText( unsigned nPos, SalMenuItem* pSalMenuItem, const XubString& rText );
-    virtual void SetItemImage( unsigned nPos, SalMenuItem* pSalMenuItem, const Image& rImage);
-    virtual void SetAccelerator( unsigned nPos, SalMenuItem* pSalMenuItem, const KeyCode& rKeyCode, const XubString& rKeyName );
-    virtual void GetSystemMenuData( SystemMenuData* pData );
-    virtual bool ShowNativePopupMenu(FloatingWindow * pWin, const Rectangle& rRect, sal_uLong nFlags);
-    virtual bool AddMenuBarButton( const SalMenuButtonItem& );
-    virtual void RemoveMenuBarButton( sal_uInt16 nId );
-    virtual Rectangle GetMenuBarButtonRectPixel( sal_uInt16 i_nItemId, SalFrame* i_pReferenceFrame );
-
-    int getItemIndexByPos( sal_uInt16 nPos ) const;
-    const AquaSalFrame* getFrame() const;
-
-    void setMainMenu();
-    static void unsetMainMenu();
-    static void setDefaultMenu();
-    static void enableMainMenu( bool bEnable );
-    static void addFallbackMenuItem( NSMenuItem* NewItem );
-    static void removeFallbackMenuItem( NSMenuItem* pOldItem );
-
-    const std::vector< MenuBarButtonEntry >& getButtons() const { return maButtons; }
-
-    bool                    mbMenuBar;          // true - Menubar, false - Menu
-    NSMenu*                 mpMenu;             // The Carbon reference to this menu
-    Menu*                   mpVCLMenu;          // the corresponding vcl Menu object
-    const AquaSalFrame*     mpFrame;            // the frame to dispatch the menu events to
-    AquaSalMenu*            mpParentSalMenu;    // the parent menu that contains us (and perhaps has a frame)
-
-    static const AquaSalMenu* pCurrentMenuBar;
-
-};
-
-class AquaSalMenuItem : public SalMenuItem
-{
-public:
-    AquaSalMenuItem( const SalItemParams* );
-    virtual ~AquaSalMenuItem();
-
-    sal_uInt16          mnId;                 // Item ID
-    Menu*               mpVCLMenu;            // VCL Menu into which this MenuItem is inserted
-    AquaSalMenu*        mpParentMenu;         // The menu in which this menu item is inserted
-    AquaSalMenu*        mpSubMenu;            // Sub menu of this item (if defined)
-    NSMenuItem*         mpMenuItem;           // The NSMenuItem
-};
-
-#endif // _SV_SALMENU_H
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/inc/salnativewidgets.h b/vcl/aqua/inc/salnativewidgets.h
deleted file mode 100644
index fd6226c8030b..000000000000
--- a/vcl/aqua/inc/salnativewidgets.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _SV_NATIVEWIDGETS_H
-#define _SV_NATIVEWIDGETS_H
-
-// since 10.4 ... no metrics are returned, and we have to fix the values
-#define BUTTON_WIDTH 16
-#define BUTTON_HEIGHT 17
-
-//standard height of the AHIG
-//tabs
-#define TAB_HEIGHT_NORMAL 20
-#define TAB_HEIGHT_SMALL  17
-#define TAB_HEIGHT_MINI   15
-
-#define TAB_TEXT_OFFSET     12
-#define VCL_TAB_TEXT_OFFSET 2
-
-//listboxes, comboboxes (they have the same dimensions)
-#define COMBOBOX_HEIGHT_NORMAL 20
-#define DROPDOWN_BUTTON_WIDTH 20
-
-//text edit
-#define TEXT_EDIT_HEIGHT_NORMAL 22
-
-//spin box
-#define SPIN_BUTTON_SPACE           2
-#define SPIN_BUTTON_WIDTH           13
-#define SPIN_UPPER_BUTTON_HEIGHT    11
-#define SPIN_LOWER_BUTTON_HEIGHT    10
-#define SPIN_TWO_BUTTONS_HEIGHT     21
-
-// progress bar
-#define INTRO_PROGRESS_HEIGHT 9
-
-// for some controls, like spinbuttons + spinboxes, or listboxes
-// we need it to adjust text position beside radio and check buttons
-
-#define TEXT_SEPARATOR 3
-
-// extra border for focus ring
-#define FOCUS_RING_WIDTH 4
-
-#define CLIP_FUZZ 1
-
-#endif  // _SV_NATIVEWIDGETS_H
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/inc/salnsmenu.h b/vcl/aqua/inc/salnsmenu.h
deleted file mode 100644
index fac4aec75792..000000000000
--- a/vcl/aqua/inc/salnsmenu.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _VCL_SALNSMENU_H
-#define _VCL_SALNSMENU_H
-
-class AquaSalMenu;
-class AquaSalMenuItem;
-
-@interface OOStatusItemView : NSView
-{
-}
--(void)drawRect: (NSRect)aRect;
--(void)layout;
--(void)mouseUp: (NSEvent *)pEvent;
-@end
-
-@interface SalNSMenu : NSMenu
-{
-    /* Caution: SalNSMenu instances occasionally are binary copied
-       in AquaSalMenu::ShowNativePopupMenu. If any members are added,
-       please take this into account !
-    */
-    AquaSalMenu*        mpMenu;
-}
--(id)initWithMenu: (AquaSalMenu*)pMenu;
--(void)menuNeedsUpdate: (NSMenu*)pMenu;
--(void)setSalMenu: (AquaSalMenu*)pMenu;
-@end
-
-@interface SalNSMenuItem : NSMenuItem
-{
-    /* Caution: SalNSMenuItem instances occasionally are binary copied
-       in AquaSalMenu::ShowNativePopupMenu. If any members are added,
-       please take this into account !
-    */
-    AquaSalMenuItem*    mpMenuItem;
-}
--(id)initWithMenuItem: (AquaSalMenuItem*)pMenuItem;
--(void)menuItemTriggered: (id)aSender;
-@end
-
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/inc/salnstimer.h b/vcl/aqua/inc/salnstimer.h
deleted file mode 100644
index 5c4ba0eea430..000000000000
--- a/vcl/aqua/inc/salnstimer.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef _VCL_SALNSTIMER_H
-#define _VCL_SALNSTIMER_H
-
-#include "premac.h"
-#include "Cocoa/Cocoa.h"
-#include "postmac.h"
-
-@interface TimerCallbackCaller : NSObject
-{
-}
--(void)timerElapsed:(NSTimer*)pTimer;
-@end
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/inc/salobj.h b/vcl/aqua/inc/salobj.h
deleted file mode 100644
index 63f5fecb7279..000000000000
--- a/vcl/aqua/inc/salobj.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _SV_SALOBJ_H
-#define _SV_SALOBJ_H
-
-#include "vcl/sv.h"
-#include "vcl/sysdata.hxx"
-#include "vcl/salobj.hxx"
-
-class AquaSalFrame;
-class AquaSalObject;
-
-
-// -----------------
-// - SalObjectData -
-// -----------------
-
-struct SalObjectData
-{
-};
-
-class AquaSalObject : public SalObject
-{
-public:
-    AquaSalFrame*               mpFrame;                // parent frame
-    NSClipView*                 mpClipView;
-    SystemEnvData               maSysData;
-
-    long                        mnClipX;
-    long                        mnClipY;
-    long                        mnClipWidth;
-    long                        mnClipHeight;
-    bool                        mbClip;
-
-    long                        mnX;
-    long                        mnY;
-    long                        mnWidth;
-    long                        mnHeight;
-
-
-    void setClippedPosSize();
-
-
-    AquaSalObject( AquaSalFrame* pFrame );
-    virtual ~AquaSalObject();
-
-    virtual void                    ResetClipRegion();
-    virtual sal_uInt16              GetClipRegionType();
-    virtual void                    BeginSetClipRegion( sal_uLong nRects );
-    virtual void                    UnionClipRegion( long nX, long nY, long nWidth, long nHeight );
-    virtual void                    EndSetClipRegion();
-    virtual void                    SetPosSize( long nX, long nY, long nWidth, long nHeight );
-    virtual void                    Show( sal_Bool bVisible );
-    virtual void                    Enable( sal_Bool nEnable );
-    virtual void                    GrabFocus();
-    virtual void                    SetBackground();
-    virtual void                    SetBackground( SalColor nSalColor );
-    virtual const SystemEnvData*    GetSystemData() const;
-    virtual void InterceptChildWindowKeyDown( sal_Bool bIntercept );
-};
-
-#endif // _SV_SALOBJ_H
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/inc/salprn.h b/vcl/aqua/inc/salprn.h
deleted file mode 100644
index 86d456907a67..000000000000
--- a/vcl/aqua/inc/salprn.h
+++ /dev/null
@@ -1,174 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _SV_SALPRN_H
-#define _SV_SALPRN_H
-
-#include "vcl/sv.h"
-#include "aquavcltypes.h"
-#include "vcl/salprn.hxx"
-
-#include <boost/shared_array.hpp>
-
-
-// ---------------------
-// - AquaSalInfoPrinter -
-// ---------------------
-
-class AquaSalGraphics;
-
-class AquaSalInfoPrinter : public SalInfoPrinter
-{
-    /// Printer graphics
-    AquaSalGraphics*        mpGraphics;
-    /// is Graphics used
-    bool                    mbGraphics;
-    /// job active ?
-    bool                    mbJob;
-
-    /// cocoa printer object
-    NSPrinter*              mpPrinter;
-    /// cocoa print info object
-    NSPrintInfo*            mpPrintInfo;
-
-    /// FIXME: get real printer context for infoprinter if possible
-    /// fake context for info printer
-    /// graphics context for Quartz 2D
-    CGContextRef                            mrContext;
-    /// memory for graphics bitmap context for querying metrics
-    boost::shared_array< sal_uInt8 >        maContextMemory;
-
-    // since changes to NSPrintInfo during a job are ignored
-    // we have to care for some settings ourselves
-    // currently we do this for orientation;
-    // really needed however is a solution for paper formats
-    Orientation               mePageOrientation;
-
-    int                       mnStartPageOffsetX;
-    int                       mnStartPageOffsetY;
-    sal_Int32                 mnCurPageRangeStart;
-    sal_Int32                 mnCurPageRangeCount;
-
-    public:
-    AquaSalInfoPrinter( const SalPrinterQueueInfo& pInfo );
-    virtual ~AquaSalInfoPrinter();
-
-    void                        SetupPrinterGraphics( CGContextRef i_xContext ) const;
-
-    virtual SalGraphics*        GetGraphics();
-    virtual void                ReleaseGraphics( SalGraphics* i_pGraphics );
-    virtual sal_Bool                Setup( SalFrame* i_pFrame, ImplJobSetup* i_pSetupData );
-    virtual sal_Bool                SetPrinterData( ImplJobSetup* pSetupData );
-    virtual sal_Bool                SetData( sal_uLong i_nFlags, ImplJobSetup* i_pSetupData );
-    virtual void                GetPageInfo( const ImplJobSetup* i_pSetupData,
-                                             long& o_rOutWidth, long& o_rOutHeight,
-                                             long& o_rPageOffX, long& o_rPageOffY,
-                                             long& o_rPageWidth, long& o_rPageHeight );
-    virtual sal_uLong               GetCapabilities( const ImplJobSetup* i_pSetupData, sal_uInt16 i_nType );
-    virtual sal_uLong               GetPaperBinCount( const ImplJobSetup* i_pSetupData );
-    virtual String              GetPaperBinName( const ImplJobSetup* i_pSetupData, sal_uLong i_nPaperBin );
-    virtual void                InitPaperFormats( const ImplJobSetup* i_pSetupData );
-    virtual int                 GetLandscapeAngle( const ImplJobSetup* i_pSetupData );
-
-    // the artificial separation between InfoPrinter and Printer
-    // is not really useful for us
-    // so let's make AquaSalPrinter just a forwarder to AquaSalInfoPrinter
-    // and concentrate the real work in one class
-    // implement pull model print system
-    sal_Bool                        StartJob( const String* i_pFileName,
-                                          const String& rJobName,
-                                          const String& i_rAppName,
-                                          ImplJobSetup* i_pSetupData,
-                                          vcl::PrinterController& i_rController );
-    sal_Bool                        EndJob();
-    sal_Bool                        AbortJob();
-    SalGraphics*                StartPage( ImplJobSetup* i_pSetupData, sal_Bool i_bNewJobData );
-    sal_Bool                        EndPage();
-    sal_uLong                       GetErrorCode() const;
-
-    NSPrintInfo* getPrintInfo() const { return mpPrintInfo; }
-    void setStartPageOffset( int nOffsetX, int nOffsetY ) { mnStartPageOffsetX = nOffsetX; mnStartPageOffsetY = nOffsetY; }
-    sal_Int32 getCurPageRangeStart() const { return mnCurPageRangeStart; }
-    sal_Int32 getCurPageRangeCount() const { return mnCurPageRangeCount; }
-
-    // match width/height against known paper formats, possibly switching orientation
-    const PaperInfo* matchPaper( long i_nWidth, long i_nHeight, Orientation& o_rOrientation ) const;
-    void setPaperSize( long i_nWidth, long i_nHeight, Orientation i_eSetOrientation );
-
-    private:
-    AquaSalInfoPrinter( const AquaSalInfoPrinter& );
-    AquaSalInfoPrinter& operator=(const AquaSalInfoPrinter&);
-};
-
-// -----------------
-// - AquaSalPrinter -
-// -----------------
-
-class AquaSalPrinter : public SalPrinter
-{
-    AquaSalInfoPrinter*         mpInfoPrinter;          // pointer to the compatible InfoPrinter
-    public:
-    AquaSalPrinter( AquaSalInfoPrinter* i_pInfoPrinter );
-    virtual ~AquaSalPrinter();
-
-    virtual sal_Bool                    StartJob( const XubString* i_pFileName,
-                                              const XubString& i_rJobName,
-                                              const XubString& i_rAppName,
-                                              sal_uLong i_nCopies,
-                                              bool i_bCollate,
-                                              bool i_bDirect,
-                                              ImplJobSetup* i_pSetupData );
-    // implement pull model print system
-    virtual sal_Bool                    StartJob( const String* i_pFileName,
-                                              const String& rJobName,
-                                              const String& i_rAppName,
-                                              ImplJobSetup* i_pSetupData,
-                                              vcl::PrinterController& i_rListener );
-
-    virtual sal_Bool                    EndJob();
-    virtual sal_Bool                    AbortJob();
-    virtual SalGraphics*            StartPage( ImplJobSetup* i_pSetupData, sal_Bool i_bNewJobData );
-    virtual sal_Bool                    EndPage();
-    virtual sal_uLong                   GetErrorCode();
-
-    private:
-    AquaSalPrinter( const AquaSalPrinter& );
-    AquaSalPrinter& operator=(const AquaSalPrinter&);
-};
-
-const double fPtTo100thMM = 35.27777778;
-
-inline int PtTo10Mu( double nPoints ) { return (int)(((nPoints)*fPtTo100thMM)+0.5); }
-
-inline double TenMuToPt( double nUnits ) { return floor(((nUnits)/fPtTo100thMM)+0.5); }
-
-
-
-#endif // _SV_SALPRN_H
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/inc/salsys.h b/vcl/aqua/inc/salsys.h
deleted file mode 100644
index 64e1791668b1..000000000000
--- a/vcl/aqua/inc/salsys.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _SV_SALSYS_H
-#define _SV_SALSYS_H
-
-#include "vcl/sv.h"
-#include "vcl/salsys.hxx"
-
-#include <list>
-
-// -----------------
-// - SalSystemData -
-// -----------------
-
-//struct SalSystemData
-//{
-//};
-
-class VCL_DLLPUBLIC AquaSalSystem : public SalSystem
-{
-public:
-    AquaSalSystem() {}
-    virtual ~AquaSalSystem();
-
-    // get info about the display
-    virtual unsigned int GetDisplayScreenCount();
-    virtual bool IsMultiDisplay();
-    virtual unsigned int GetDefaultDisplayNumber();
-    virtual Rectangle GetDisplayScreenPosSizePixel( unsigned int nScreen );
-    virtual Rectangle GetDisplayWorkAreaPosSizePixel( unsigned int nScreen );
-
-    virtual rtl::OUString GetScreenName( unsigned int nScreen );
-    virtual int ShowNativeMessageBox( const String& rTitle,
-                                      const String& rMessage,
-                                      int nButtonCombination,
-                                      int nDefaultButton);
-};
-
-
-#endif // _SV_SALSYS_H
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/inc/saltimer.h b/vcl/aqua/inc/saltimer.h
deleted file mode 100644
index 03772a2dfc2c..000000000000
--- a/vcl/aqua/inc/saltimer.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
-*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
-************************************************************************/
-
-#ifndef _SV_SALTIMER_H
-#define _SV_SALTIMER_H
-
-#include "premac.h"
-#include <Cocoa/Cocoa.h>
-#include "postmac.h"
-
-#include "vcl/saltimer.hxx"
-
-class AquaSalTimer : public SalTimer
-{
-  public:
-
-    AquaSalTimer();
-    virtual ~AquaSalTimer();
-
-    void Start( sal_uLong nMS );
-    void Stop();
-
-    static void handleStartTimerEvent( NSEvent* pEvent );
-
-
-    static NSTimer* pRunningTimer;
-    static bool bDispatchTimer;
-};
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/inc/salvd.h b/vcl/aqua/inc/salvd.h
deleted file mode 100644
index 6333fd31e460..000000000000
--- a/vcl/aqua/inc/salvd.h
+++ /dev/null
@@ -1,97 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _SV_SALVD_H
-#define _SV_SALVD_H
-
-#include "premac.h"
-#include <ApplicationServices/ApplicationServices.h>
-#include "postmac.h"
-
-#include "vcl/sv.h"
-#include "vcl/salgdi.hxx"
-#include "salconst.h"
-#include "salcolorutils.hxx"
-#include "vcl/salvd.hxx"
-#include "salgdi.h"
-
-#if PRAGMA_ONCE
-    #pragma once
-#endif
-
-// =======================================================================
-
-// =======================================================================
-
-// -----------------
-// - SalVirDevData -
-// -----------------
-
-struct SalVirDevData
-{
-};
-
-typedef struct SalVirDevData   SalVirDevData;
-typedef SalVirDevData         *SalVirDevDataPtr;
-typedef SalVirDevDataPtr      *SalVirDevDataHandle;
-
-// =======================================================================
-
-class AquaSalGraphics;
-
-// -----------------
-// - SalVirDevData -
-// -----------------
-
-class AquaSalVirtualDevice : public SalVirtualDevice
-{
-private:
-    bool mbGraphicsUsed;             // is Graphics used
-    bool mbForeignContext;           // is mxContext from outside VCL
-    CGContextRef mxBitmapContext;
-    int mnBitmapDepth;
-    CGLayerRef mxLayer;              // Quartz layer
-    AquaSalGraphics* mpGraphics;     // current VirDev graphics
-
-    void Destroy();
-
-public:
-    AquaSalVirtualDevice( AquaSalGraphics* pGraphic, long nDX, long nDY, sal_uInt16 nBitCount, const SystemGraphicsData *pData );
-    virtual ~AquaSalVirtualDevice();
-
-    virtual SalGraphics*            GetGraphics();
-    virtual void                    ReleaseGraphics( SalGraphics* pGraphics );
-    virtual sal_Bool                    SetSize( long nNewDX, long nNewDY );
-    virtual void                       GetSize( long& rWidth, long& rHeight );
-};
-
-// =======================================================================
-
-#endif // _SV_SALVD_H
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/inc/svsys.h b/vcl/aqua/inc/svsys.h
deleted file mode 100644
index 291e7801db75..000000000000
--- a/vcl/aqua/inc/svsys.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _SV_SVSYS_H
-#define _SV_SVSYS_H
-
-#include "premac.h"
-#include "Cocoa/Cocoa.h"
-#include "postmac.h"
-
-#endif // _SV_SVSYS_H
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/inc/vclnsapp.h b/vcl/aqua/inc/vclnsapp.h
deleted file mode 100644
index bdbe15840e0f..000000000000
--- a/vcl/aqua/inc/vclnsapp.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _VCL_VCLNSAPP_H
-#define _VCL_VCLNSAPP_H
-
-#include "premac.h"
-#include "Cocoa/Cocoa.h"
-#include "postmac.h"
-
-class AquaSalFrame;
-
-@interface CocoaThreadEnabler : NSObject
-{
-}
--(void)enableCocoaThreads:(id)param;
-@end
-
-// our very own application
-@interface VCL_NSApplication : NSApplication
-{
-}
--(void)sendEvent:(NSEvent*)pEvent;
--(void)sendSuperEvent:(NSEvent*)pEvent;
--(NSMenu*)applicationDockMenu:(NSApplication *)sender;
--(BOOL)application: (NSApplication*) app openFile: (NSString*)file;
--(void)application: (NSApplication*) app openFiles: (NSArray*)files;
--(BOOL)application: (NSApplication*) app printFile: (NSString*)file;
--(NSApplicationPrintReply)application: (NSApplication *) app printFiles:(NSArray *)files withSettings: (NSDictionary *)printSettings showPrintPanels:(BOOL)bShowPrintPanels;
--(NSApplicationTerminateReply)applicationShouldTerminate: (NSApplication *) app;
--(void)systemColorsChanged: (NSNotification*) pNotification;
--(void)screenParametersChanged: (NSNotification*) pNotification;
--(void)scrollbarVariantChanged: (NSNotification*) pNotification;
--(void)scrollbarSettingsChanged: (NSNotification*) pNotification;
--(void)addFallbackMenuItem: (NSMenuItem*)pNewItem;
--(void)removeFallbackMenuItem: (NSMenuItem*)pOldItem;
--(void)addDockMenuItem: (NSMenuItem*)pNewItem;
--(void)applicationWillBecomeActive: (NSNotification *)pNotification;
--(void)applicationWillResignActive: (NSNotification *)pNotification;
--(BOOL)applicationShouldHandleReopen: (NSApplication*)pApp hasVisibleWindows: (BOOL)bWinVisible;
--(void)setDockIconClickHandler: (NSObject*)pHandler;
--(void)cycleFrameForward: (AquaSalFrame*)pCurFrame;
--(void)cycleFrameBackward: (AquaSalFrame*)pCurFrame;
-@end
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/a11y/aqua11yactionwrapper.h b/vcl/aqua/source/a11y/aqua11yactionwrapper.h
index 0fd2fa1e25ff..9df4fc986859 100644
--- a/vcl/aqua/source/a11y/aqua11yactionwrapper.h
+++ b/vcl/aqua/source/a11y/aqua11yactionwrapper.h
@@ -29,8 +29,8 @@
 #ifndef _SV_AQUA11ACTIONWRAPPER_H
 #define _SV_AQUA11ACTIONWRAPPER_H
 
-#include "aquavcltypes.h"
-#include "aqua11ywrapper.h"
+#include "aqua/aquavcltypes.h"
+#include "aqua/aqua11ywrapper.h"
 
 @interface AquaA11yActionWrapper : NSObject
 {
diff --git a/vcl/aqua/source/a11y/aqua11yactionwrapper.mm b/vcl/aqua/source/a11y/aqua11yactionwrapper.mm
index fcd49fd67ff4..e49ad251faad 100644
--- a/vcl/aqua/source/a11y/aqua11yactionwrapper.mm
+++ b/vcl/aqua/source/a11y/aqua11yactionwrapper.mm
@@ -28,7 +28,8 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-#include "salinst.h"
+#include "aqua/salinst.h"
+
 #include "aqua11yactionwrapper.h"
 
 // Wrapper for XAccessibleAction
diff --git a/vcl/aqua/source/a11y/aqua11ycomponentwrapper.h b/vcl/aqua/source/a11y/aqua11ycomponentwrapper.h
index f7ec6e513fa7..62ab9d7141be 100644
--- a/vcl/aqua/source/a11y/aqua11ycomponentwrapper.h
+++ b/vcl/aqua/source/a11y/aqua11ycomponentwrapper.h
@@ -29,8 +29,8 @@
 #ifndef _SV_AQUA11COMPONENTWRAPPER_H
 #define _SV_AQUA11COMPONENTWRAPPER_H
 
-#include "aquavcltypes.h"
-#include "aqua11ywrapper.h"
+#include "aqua/aquavcltypes.h"
+#include "aqua/aqua11ywrapper.h"
 
 @interface AquaA11yComponentWrapper : NSObject
 {
diff --git a/vcl/aqua/source/a11y/aqua11yfactory.mm b/vcl/aqua/source/a11y/aqua11yfactory.mm
index 5dcdf4bb9f61..41b66d19e578 100644
--- a/vcl/aqua/source/a11y/aqua11yfactory.mm
+++ b/vcl/aqua/source/a11y/aqua11yfactory.mm
@@ -28,10 +28,11 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-#include "salinst.h"
-#include "aqua11yfactory.h"
+#include "aqua/salinst.h"
+#include "aqua/aqua11yfactory.h"
+#include "aqua/aqua11yfocustracker.hxx"
+
 #include "aqua11yfocuslistener.hxx"
-#include "aqua11yfocustracker.hxx"
 #include "aqua11yrolehelper.h"
 #include "aqua11ywrapperbutton.h"
 #include "aqua11ywrapperstatictext.h"
@@ -49,6 +50,7 @@
 #include "aqua11ywrappertabgroup.h"
 #include "aqua11ywrappertoolbar.h"
 #include "aqua11ytablewrapper.h"
+
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
 
 using namespace ::com::sun::star::accessibility;
diff --git a/vcl/aqua/source/a11y/aqua11yfocuslistener.cxx b/vcl/aqua/source/a11y/aqua11yfocuslistener.cxx
index 8e93bd450bf8..61bc4d44f147 100644
--- a/vcl/aqua/source/a11y/aqua11yfocuslistener.cxx
+++ b/vcl/aqua/source/a11y/aqua11yfocuslistener.cxx
@@ -29,12 +29,13 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-#include "aqua11yfocuslistener.hxx"
-#include "aqua11yfocustracker.hxx"
-#include "aqua11yfactory.h"
-
 #include <salhelper/refobj.hxx>
 
+#include "aqua/aqua11yfocustracker.hxx"
+#include "aqua/aqua11yfactory.h"
+
+#include "aqua11yfocuslistener.hxx"
+
 using namespace ::com::sun::star::accessibility;
 using namespace ::com::sun::star::uno;
 
diff --git a/vcl/aqua/source/a11y/aqua11yfocuslistener.hxx b/vcl/aqua/source/a11y/aqua11yfocuslistener.hxx
index 192a1f04e278..bdfc9085ad08 100644
--- a/vcl/aqua/source/a11y/aqua11yfocuslistener.hxx
+++ b/vcl/aqua/source/a11y/aqua11yfocuslistener.hxx
@@ -31,8 +31,8 @@
 
 #include <salhelper/refobj.hxx>
 
-#include "keyboardfocuslistener.hxx"
-#include "aquavcltypes.h"
+#include "aqua/keyboardfocuslistener.hxx"
+#include "aqua/aquavcltypes.h"
 
 class AquaA11yFocusListener :
     public KeyboardFocusListener,
diff --git a/vcl/aqua/source/a11y/aqua11yfocustracker.cxx b/vcl/aqua/source/a11y/aqua11yfocustracker.cxx
index f4b5393c7e8f..187e715c54f7 100644
--- a/vcl/aqua/source/a11y/aqua11yfocustracker.cxx
+++ b/vcl/aqua/source/a11y/aqua11yfocustracker.cxx
@@ -29,7 +29,13 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-#include "aqua11yfocustracker.hxx"
+#include "vcl/svapp.hxx"
+#include "vcl/window.hxx"
+#include "vcl/toolbox.hxx"
+#include "vcl/menu.hxx"
+
+#include "aqua/aqua11yfocustracker.hxx"
+
 #include "documentfocuslistener.hxx"
 
 #include <com/sun/star/accessibility/XAccessibleContext.hpp>
@@ -38,11 +44,6 @@
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
 
-#include "vcl/svapp.hxx"
-#include "vcl/window.hxx"
-#include "vcl/toolbox.hxx"
-#include "vcl/menu.hxx"
-
 using namespace ::com::sun::star::accessibility;
 using namespace ::com::sun::star::uno;
 
diff --git a/vcl/aqua/source/a11y/aqua11ylistener.cxx b/vcl/aqua/source/a11y/aqua11ylistener.cxx
index 3b77f054a0ac..08b56718885a 100644
--- a/vcl/aqua/source/a11y/aqua11ylistener.cxx
+++ b/vcl/aqua/source/a11y/aqua11ylistener.cxx
@@ -26,12 +26,13 @@
  *
  ************************************************************************/
 
-#include "aqua11ylistener.hxx"
-#include "aqua11yfactory.h"
-#include "aqua11yfocustracker.hxx"
+#include "aqua/salinst.h"
+#include "aqua/aqua11ylistener.hxx"
+#include "aqua/aqua11yfactory.h"
+#include "aqua/aqua11yfocustracker.hxx"
+#include "aqua/aqua11ywrapper.h"
+
 #include "aqua11ytextwrapper.h"
-#include "aqua11ywrapper.h"
-#include "salinst.h"
 
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
@@ -75,7 +76,7 @@ AquaA11yEventListener::~AquaA11yEventListener()
 //------------------------------------------------------------------------------
 
 void SAL_CALL
-AquaA11yEventListener::disposing( const EventObject& Source ) throw( RuntimeException )
+AquaA11yEventListener::disposing( const EventObject& ) throw( RuntimeException )
 {
     [ AquaA11yFactory removeFromWrapperRepositoryFor: [ (AquaA11yWrapper *) m_wrapperObject accessibleContext ] ];
 }
diff --git a/vcl/aqua/source/a11y/aqua11yrolehelper.h b/vcl/aqua/source/a11y/aqua11yrolehelper.h
index 38328c6a3d46..69404fa372a1 100644
--- a/vcl/aqua/source/a11y/aqua11yrolehelper.h
+++ b/vcl/aqua/source/a11y/aqua11yrolehelper.h
@@ -29,7 +29,7 @@
 #ifndef _SV_AQUA11ROLEHELPER_H
 #define _SV_AQUA11ROLEHELPER_H
 
-#include "salinst.h"
+#include "aqua/salinst.h"
 #include <com/sun/star/accessibility/XAccessibleContext.hpp>
 
 @interface AquaA11yRoleHelper : NSObject
diff --git a/vcl/aqua/source/a11y/aqua11yrolehelper.mm b/vcl/aqua/source/a11y/aqua11yrolehelper.mm
index b8ebdb08c3df..cfc052e96beb 100644
--- a/vcl/aqua/source/a11y/aqua11yrolehelper.mm
+++ b/vcl/aqua/source/a11y/aqua11yrolehelper.mm
@@ -28,8 +28,10 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
+#include "aqua/aqua11yfactory.h"
+
 #include "aqua11yrolehelper.h"
-#include "aqua11yfactory.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/aqua/source/a11y/aqua11yselectionwrapper.h
index 0585f01c9360..de78565f4c4a 100644
--- a/vcl/aqua/source/a11y/aqua11yselectionwrapper.h
+++ b/vcl/aqua/source/a11y/aqua11yselectionwrapper.h
@@ -29,8 +29,8 @@
 #ifndef _SV_AQUA11SELECTIONWRAPPER_H
 #define _SV_AQUA11SELECTIONWRAPPER_H
 
-#include "aquavcltypes.h"
-#include "aqua11ywrapper.h"
+#include "aqua/aquavcltypes.h"
+#include "aqua/aqua11ywrapper.h"
 
 @interface AquaA11ySelectionWrapper : NSObject
 {
diff --git a/vcl/aqua/source/a11y/aqua11yselectionwrapper.mm b/vcl/aqua/source/a11y/aqua11yselectionwrapper.mm
index 66f19b80a9f9..5b8d604f3b1a 100644
--- a/vcl/aqua/source/a11y/aqua11yselectionwrapper.mm
+++ b/vcl/aqua/source/a11y/aqua11yselectionwrapper.mm
@@ -28,8 +28,9 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-#include "salinst.h"
-#include "aqua11yfactory.h"
+#include "aqua/salinst.h"
+#include "aqua/aqua11yfactory.h"
+
 #include "aqua11yselectionwrapper.h"
 
 using namespace ::com::sun::star::accessibility;
@@ -67,6 +68,7 @@ using namespace ::com::sun::star::uno;
 
 +(BOOL)isAttributeSettable:(NSString *)attribute forElement:(AquaA11yWrapper *)wrapper
 {
+    (void)wrapper;
     if ( [ attribute isEqualToString: NSAccessibilitySelectedChildrenAttribute ] )
     {
         return YES;
diff --git a/vcl/aqua/source/a11y/aqua11ytablewrapper.h b/vcl/aqua/source/a11y/aqua11ytablewrapper.h
index 8f3e48364257..0b41d48e10c6 100644
--- a/vcl/aqua/source/a11y/aqua11ytablewrapper.h
+++ b/vcl/aqua/source/a11y/aqua11ytablewrapper.h
@@ -29,7 +29,7 @@
 #ifndef _SV_AQUA11TABLEWRAPPER_H
 #define _SV_AQUA11TABLEWRAPPER_H
 
-#include "aqua11ywrapper.h"
+#include "aqua/aqua11ywrapper.h"
 
 #define MAXIMUM_ACCESSIBLE_TABLE_CELLS 1000
 
diff --git a/vcl/aqua/source/a11y/aqua11ytablewrapper.mm b/vcl/aqua/source/a11y/aqua11ytablewrapper.mm
index 98454ab8d57b..110cb42ffee7 100644
--- a/vcl/aqua/source/a11y/aqua11ytablewrapper.mm
+++ b/vcl/aqua/source/a11y/aqua11ytablewrapper.mm
@@ -28,8 +28,9 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
+#include "aqua/aqua11yfactory.h"
+
 #include "aqua11ytablewrapper.h"
-#include "aqua11yfactory.h"
 
 using namespace ::com::sun::star::accessibility;
 using namespace ::com::sun::star::awt;
diff --git a/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.h b/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.h
index d7159de9f526..a21f75e7fd5a 100644
--- a/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.h
+++ b/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.h
@@ -29,8 +29,7 @@
 #ifndef _SV_AQUA11TEXTATTRIBUTESWRAPPER_H
 #define _SV_AQUA11TEXTATTRIBUTESWRAPPER_H
 
-#include <com/sun/star/uno/Sequence.hxx>
-#include "aqua11ywrapper.h"
+#include "aqua/aqua11ywrapper.h"
 
 @interface AquaA11yTextAttributesWrapper : NSObject
 {
diff --git a/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm b/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm
index f0d0e46a517e..2122f56e9565 100644
--- a/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm
+++ b/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm
@@ -28,8 +28,10 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
+#include "aqua/salinst.h"
+
 #include "aqua11ytextattributeswrapper.h"
-#include "salinst.h"
+
 #include <com/sun/star/accessibility/AccessibleTextType.hpp>
 #include <com/sun/star/awt/FontUnderline.hpp>
 #include <com/sun/star/awt/FontWeight.hpp>
diff --git a/vcl/aqua/source/a11y/aqua11ytextwrapper.h b/vcl/aqua/source/a11y/aqua11ytextwrapper.h
index ceb9bcbe393d..dd7fa5c0411c 100644
--- a/vcl/aqua/source/a11y/aqua11ytextwrapper.h
+++ b/vcl/aqua/source/a11y/aqua11ytextwrapper.h
@@ -29,8 +29,8 @@
 #ifndef _SV_AQUA11TEXTWRAPPER_H
 #define _SV_AQUA11TEXTWRAPPER_H
 
-#include "aquavcltypes.h"
-#include "aqua11ywrapper.h"
+#include "aqua/aquavcltypes.h"
+#include "aqua/aqua11ywrapper.h"
 
 @interface AquaA11yTextWrapper : NSObject
 {
diff --git a/vcl/aqua/source/a11y/aqua11ytextwrapper.mm b/vcl/aqua/source/a11y/aqua11ytextwrapper.mm
index 89c164e5e0b9..d956d2beb0b7 100644
--- a/vcl/aqua/source/a11y/aqua11ytextwrapper.mm
+++ b/vcl/aqua/source/a11y/aqua11ytextwrapper.mm
@@ -28,10 +28,12 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-#include "salinst.h"
+#include "aqua/salinst.h"
+
 #include "aqua11ytextwrapper.h"
 #include "aqua11ytextattributeswrapper.h"
 #include "aqua11yutil.h"
+
 #include <com/sun/star/accessibility/AccessibleTextType.hpp>
 #include <com/sun/star/awt/Rectangle.hpp>
 
@@ -49,8 +51,11 @@ using namespace ::rtl;
     return CreateNSString ( [ wrapper accessibleText ] -> getText() );
 }
 
-+(void)setValueAttributeForElement:(AquaA11yWrapper *)wrapper to:(id)value {
++(void)setValueAttributeForElement:(AquaA11yWrapper *)wrapper to:(id)value
+{
     // TODO
+    (void)wrapper;
+    (void)value;
 }
 
 +(id)numberOfCharactersAttributeForElement:(AquaA11yWrapper *)wrapper {
@@ -103,15 +108,22 @@ using namespace ::rtl;
     return [ NSValue valueWithRange: NSMakeRange ( 0, [ wrapper accessibleText ] -> getCharacterCount() ) ];
 }
 
-+(void)setVisibleCharacterRangeAttributeForElement:(AquaA11yWrapper *)wrapper to:(id)value {
++(void)setVisibleCharacterRangeAttributeForElement:(AquaA11yWrapper *)wrapper to:(id)value
+{
     // do nothing
+    (void)wrapper;
+    (void)value;
 }
 
-+(id)sharedTextUIElementsAttributeForElement:(AquaA11yWrapper *)wrapper {
++(id)sharedTextUIElementsAttributeForElement:(AquaA11yWrapper *)wrapper
+{
+    (void)wrapper;
     return [ [ NSArray alloc ] init ]; // unsupported
 }
 
-+(id)sharedCharacterRangeAttributeForElement:(AquaA11yWrapper *)wrapper {
++(id)sharedCharacterRangeAttributeForElement:(AquaA11yWrapper *)wrapper
+{
+    (void)wrapper;
     return [ NSValue valueWithRange: NSMakeRange ( 0, 0 ) ]; // unsupported
 }
 
diff --git a/vcl/aqua/source/a11y/aqua11yutil.mm b/vcl/aqua/source/a11y/aqua11yutil.mm
index 4749a3b40822..74de0a19aa41 100644
--- a/vcl/aqua/source/a11y/aqua11yutil.mm
+++ b/vcl/aqua/source/a11y/aqua11yutil.mm
@@ -28,7 +28,8 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-#include "aquavcltypes.h"
+#include "aqua/aquavcltypes.h"
+
 #include "aqua11yutil.h"
 
 using namespace ::com::sun::star::awt;
diff --git a/vcl/aqua/source/a11y/aqua11yvaluewrapper.h b/vcl/aqua/source/a11y/aqua11yvaluewrapper.h
index 1292ef5ab77b..517a3014d565 100644
--- a/vcl/aqua/source/a11y/aqua11yvaluewrapper.h
+++ b/vcl/aqua/source/a11y/aqua11yvaluewrapper.h
@@ -29,9 +29,9 @@
 #ifndef _SV_AQUA11VALUEWRAPPER_H
 #define _SV_AQUA11VALUEWRAPPER_H
 
-#include "salinst.h"
-#include "aquavcltypes.h"
-#include "aqua11ywrapper.h"
+#include "aqua/salinst.h"
+#include "aqua/aquavcltypes.h"
+#include "aqua/aqua11ywrapper.h"
 
 @interface AquaA11yValueWrapper : NSObject
 {
diff --git a/vcl/aqua/source/a11y/aqua11ywrapper.mm b/vcl/aqua/source/a11y/aqua11ywrapper.mm
index c2724a372f9f..bf8de98c3318 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapper.mm
+++ b/vcl/aqua/source/a11y/aqua11ywrapper.mm
@@ -28,20 +28,21 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-#include "salinst.h"
-#include "saldata.hxx"
+#include "aqua/salinst.h"
+#include "aqua/saldata.hxx"
 
-#include "aqua11ywrapper.h"
+#include "aqua/aqua11ywrapper.h"
+#include "aqua/aqua11ylistener.hxx"
+#include "aqua/aqua11yfactory.h"
+#include "aqua/aqua11yfocustracker.hxx"
+
+#include "aqua11yfocuslistener.hxx"
 #include "aqua11yactionwrapper.h"
 #include "aqua11ycomponentwrapper.h"
-#include "aqua11ylistener.hxx"
 #include "aqua11yselectionwrapper.h"
 #include "aqua11ytablewrapper.h"
 #include "aqua11ytextwrapper.h"
 #include "aqua11yvaluewrapper.h"
-#include "aqua11yfactory.h"
-#include "aqua11yfocuslistener.hxx"
-#include "aqua11yfocustracker.hxx"
 #include "aqua11yrolehelper.h"
 
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
@@ -163,7 +164,8 @@ static BOOL isPopupMenuOpen = NO;
         if ( ! asGetter ) {
             [ methodName appendString: @"set" ];
         }
-        NSString * firstChar = [ attribute substringWithRange: NSMakeRange ( 2, 1 ) ]; // drop leading "AX" and get first char
+        NSRange aRange = { 2, 1 };
+        NSString * firstChar = [ attribute substringWithRange: aRange ]; // drop leading "AX" and get first char
         if ( asGetter ) {
             [ methodName appendString: [ firstChar lowercaseString ] ]; 
         } else {
@@ -830,7 +832,10 @@ static BOOL isPopupMenuOpen = NO;
     return nil; // TODO: to be completed
 }
 
--(BOOL)accessibilitySetOverrideValue:(id)value forAttribute:(NSString *)attribute {
+-(BOOL)accessibilitySetOverrideValue:(id)value forAttribute:(NSString *)attribute
+{
+    (void)value;
+    (void)attribute;
     return NO; // TODO
 }
 
diff --git a/vcl/aqua/source/a11y/aqua11ywrapperbutton.h b/vcl/aqua/source/a11y/aqua11ywrapperbutton.h
index d232e111865e..e4af22081106 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapperbutton.h
+++ b/vcl/aqua/source/a11y/aqua11ywrapperbutton.h
@@ -29,7 +29,7 @@
 #ifndef _SV_AQUA11WRAPPERBUTTON_H
 #define _SV_AQUA11WRAPPERBUTTON_H
 
-#include "aqua11ywrapper.h"
+#include "aqua/aqua11ywrapper.h"
 
 @interface AquaA11yWrapperButton : AquaA11yWrapper
 {
diff --git a/vcl/aqua/source/a11y/aqua11ywrapperbutton.mm b/vcl/aqua/source/a11y/aqua11ywrapperbutton.mm
index 48f1804c58a2..e51ceff14af9 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapperbutton.mm
+++ b/vcl/aqua/source/a11y/aqua11ywrapperbutton.mm
@@ -28,7 +28,8 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-#include "salinst.h"
+#include "aqua/salinst.h"
+
 #include "aqua11ywrapperbutton.h"
 #include "aqua11ytextwrapper.h"
 
diff --git a/vcl/aqua/source/a11y/aqua11ywrappercheckbox.h b/vcl/aqua/source/a11y/aqua11ywrappercheckbox.h
index 192e528e930d..9c2580c19f31 100644
--- a/vcl/aqua/source/a11y/aqua11ywrappercheckbox.h
+++ b/vcl/aqua/source/a11y/aqua11ywrappercheckbox.h
@@ -29,7 +29,7 @@
 #ifndef _SV_AQUA11WRAPPERCHECKBOX_H
 #define _SV_AQUA11WRAPPERCHECKBOX_H
 
-#include "aqua11ywrapper.h"
+#include "aqua/aqua11ywrapper.h"
 
 @interface AquaA11yWrapperCheckBox : AquaA11yWrapper
 {
diff --git a/vcl/aqua/source/a11y/aqua11ywrappercheckbox.mm b/vcl/aqua/source/a11y/aqua11ywrappercheckbox.mm
index 25f012e1163f..6bf2aa2f8340 100644
--- a/vcl/aqua/source/a11y/aqua11ywrappercheckbox.mm
+++ b/vcl/aqua/source/a11y/aqua11ywrappercheckbox.mm
@@ -28,7 +28,8 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-#include "salinst.h"
+#include "aqua/salinst.h"
+
 #include "aqua11ywrappercheckbox.h"
 #include "aqua11yvaluewrapper.h"
 #include "aqua11ytextwrapper.h"
diff --git a/vcl/aqua/source/a11y/aqua11ywrappercombobox.h b/vcl/aqua/source/a11y/aqua11ywrappercombobox.h
index 5ca5c967234f..bdcff4a981d6 100644
--- a/vcl/aqua/source/a11y/aqua11ywrappercombobox.h
+++ b/vcl/aqua/source/a11y/aqua11ywrappercombobox.h
@@ -29,7 +29,7 @@
 #ifndef _SV_AQUA11WRAPPERCOMBOBOX_H
 #define _SV_AQUA11WRAPPERCOMBOBOX_H
 
-#include "aqua11ywrapper.h"
+#include "aqua/aqua11ywrapper.h"
 #include <com/sun/star/accessibility/XAccessibleContext.hpp>
 
 @interface AquaA11yWrapperComboBox : AquaA11yWrapper
diff --git a/vcl/aqua/source/a11y/aqua11ywrappercombobox.mm b/vcl/aqua/source/a11y/aqua11ywrappercombobox.mm
index 16fa1372fe4e..6f8e9d05d112 100644
--- a/vcl/aqua/source/a11y/aqua11ywrappercombobox.mm
+++ b/vcl/aqua/source/a11y/aqua11ywrappercombobox.mm
@@ -28,9 +28,11 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-#include "salinst.h"
+#include "aqua/salinst.h"
+
 #include "aqua11ywrappercombobox.h"
 #include "aqua11yrolehelper.h"
+
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
 
 using namespace ::com::sun::star::accessibility;
diff --git a/vcl/aqua/source/a11y/aqua11ywrappergroup.h b/vcl/aqua/source/a11y/aqua11ywrappergroup.h
index 0e6deae658d1..e53676d531ed 100644
--- a/vcl/aqua/source/a11y/aqua11ywrappergroup.h
+++ b/vcl/aqua/source/a11y/aqua11ywrappergroup.h
@@ -29,7 +29,7 @@
 #ifndef _SV_AQUA11WRAPPERGROUP_H
 #define _SV_AQUA11WRAPPERGROUP_H
 
-#include "aqua11ywrapper.h"
+#include "aqua/aqua11ywrapper.h"
 
 @interface AquaA11yWrapperGroup : AquaA11yWrapper
 {
diff --git a/vcl/aqua/source/a11y/aqua11ywrappergroup.mm b/vcl/aqua/source/a11y/aqua11ywrappergroup.mm
index 42298f9c745b..536cc9bba8eb 100644
--- a/vcl/aqua/source/a11y/aqua11ywrappergroup.mm
+++ b/vcl/aqua/source/a11y/aqua11ywrappergroup.mm
@@ -28,7 +28,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-#include "salinst.h"
+#include "aqua/salinst.h"
 #include "aqua11ywrappergroup.h"
 
 // Wrapper for AXGroup role
diff --git a/vcl/aqua/source/a11y/aqua11ywrapperlist.h b/vcl/aqua/source/a11y/aqua11ywrapperlist.h
index d0b0b17d3769..367795ff8d16 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapperlist.h
+++ b/vcl/aqua/source/a11y/aqua11ywrapperlist.h
@@ -29,7 +29,7 @@
 #ifndef _SV_AQUA11WRAPPERLIST_H
 #define _SV_AQUA11WRAPPERLIST_H
 
-#include "aqua11ywrapper.h"
+#include "aqua/aqua11ywrapper.h"
 
 @interface AquaA11yWrapperList : AquaA11yWrapper
 {
diff --git a/vcl/aqua/source/a11y/aqua11ywrapperlist.mm b/vcl/aqua/source/a11y/aqua11ywrapperlist.mm
index eeb210d70e65..d70679ed6966 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapperlist.mm
+++ b/vcl/aqua/source/a11y/aqua11ywrapperlist.mm
@@ -28,7 +28,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-#include "salinst.h"
+#include "aqua/salinst.h"
 #include "aqua11ywrapperlist.h"
 
 using namespace ::com::sun::star::accessibility;
diff --git a/vcl/aqua/source/a11y/aqua11ywrapperradiobutton.h b/vcl/aqua/source/a11y/aqua11ywrapperradiobutton.h
index ac9e0e7022ff..1494e7dfe0b6 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapperradiobutton.h
+++ b/vcl/aqua/source/a11y/aqua11ywrapperradiobutton.h
@@ -29,7 +29,7 @@
 #ifndef _SV_AQUA11WRAPPERRADIOBUTTON_H
 #define _SV_AQUA11WRAPPERRADIOBUTTON_H
 
-#include "aqua11ywrapper.h"
+#include "aqua/aqua11ywrapper.h"
 
 @interface AquaA11yWrapperRadioButton : AquaA11yWrapper
 {
diff --git a/vcl/aqua/source/a11y/aqua11ywrapperradiobutton.mm b/vcl/aqua/source/a11y/aqua11ywrapperradiobutton.mm
index 930f940c4971..4c1e9047d65e 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapperradiobutton.mm
+++ b/vcl/aqua/source/a11y/aqua11ywrapperradiobutton.mm
@@ -28,7 +28,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-#include "salinst.h"
+#include "aqua/salinst.h"
 #include "aqua11ywrapperradiobutton.h"
 #include "aqua11ytextwrapper.h"
 #include "aqua11yvaluewrapper.h"
diff --git a/vcl/aqua/source/a11y/aqua11ywrapperradiogroup.h b/vcl/aqua/source/a11y/aqua11ywrapperradiogroup.h
index f73a746046ad..f6c05b955744 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapperradiogroup.h
+++ b/vcl/aqua/source/a11y/aqua11ywrapperradiogroup.h
@@ -29,7 +29,7 @@
 #ifndef _SV_AQUA11WRAPPERRADIOGROUP_H
 #define _SV_AQUA11WRAPPERRADIOGROUP_H
 
-#include "aqua11ywrapper.h"
+#include "aqua/aqua11ywrapper.h"
 
 @interface AquaA11yWrapperRadioGroup : AquaA11yWrapper
 {
diff --git a/vcl/aqua/source/a11y/aqua11ywrapperradiogroup.mm b/vcl/aqua/source/a11y/aqua11ywrapperradiogroup.mm
index f89ac78b044c..52e71620ceed 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapperradiogroup.mm
+++ b/vcl/aqua/source/a11y/aqua11ywrapperradiogroup.mm
@@ -28,7 +28,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-#include "salinst.h"
+#include "aqua/salinst.h"
 #include "aqua11ywrapperradiogroup.h"
 #include "aqua11ytextwrapper.h"
 
diff --git a/vcl/aqua/source/a11y/aqua11ywrapperrow.h b/vcl/aqua/source/a11y/aqua11ywrapperrow.h
index b4956ec466af..9b649ea0698d 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapperrow.h
+++ b/vcl/aqua/source/a11y/aqua11ywrapperrow.h
@@ -29,7 +29,7 @@
 #ifndef _SV_AQUA11WRAPPERROW_H
 #define _SV_AQUA11WRAPPERROW_H
 
-#include "aqua11ywrapper.h"
+#include "aqua/aqua11ywrapper.h"
 
 @interface AquaA11yWrapperRow : AquaA11yWrapper
 {
diff --git a/vcl/aqua/source/a11y/aqua11ywrapperrow.mm b/vcl/aqua/source/a11y/aqua11ywrapperrow.mm
index d49e229218bf..0fd65fd01365 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapperrow.mm
+++ b/vcl/aqua/source/a11y/aqua11ywrapperrow.mm
@@ -28,7 +28,8 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-#include "salinst.h"
+#include "aqua/salinst.h"
+
 #include "aqua11ywrapperrow.h"
 #include "aqua11ytextwrapper.h"
 
diff --git a/vcl/aqua/source/a11y/aqua11ywrapperscrollarea.h b/vcl/aqua/source/a11y/aqua11ywrapperscrollarea.h
index b92d9ac4a1cb..3d4cdd848efc 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapperscrollarea.h
+++ b/vcl/aqua/source/a11y/aqua11ywrapperscrollarea.h
@@ -29,7 +29,7 @@
 #ifndef _SV_AQUA11WRAPPERSCROLLAREA_H
 #define _SV_AQUA11WRAPPERSCROLLAREA_H
 
-#include "aqua11ywrapper.h"
+#include "aqua/aqua11ywrapper.h"
 
 @interface AquaA11yWrapperScrollArea : AquaA11yWrapper
 {
diff --git a/vcl/aqua/source/a11y/aqua11ywrapperscrollarea.mm b/vcl/aqua/source/a11y/aqua11ywrapperscrollarea.mm
index f375e5ce788d..8a481b64926d 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapperscrollarea.mm
+++ b/vcl/aqua/source/a11y/aqua11ywrapperscrollarea.mm
@@ -28,7 +28,8 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-#include "salinst.h"
+#include "aqua/salinst.h"
+
 #include "aqua11ywrapperscrollarea.h"
 #include "aqua11ywrapperscrollbar.h"
 #include "aqua11yrolehelper.h"
diff --git a/vcl/aqua/source/a11y/aqua11ywrapperscrollbar.h b/vcl/aqua/source/a11y/aqua11ywrapperscrollbar.h
index 8fc87d02b0fe..d589da51b153 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapperscrollbar.h
+++ b/vcl/aqua/source/a11y/aqua11ywrapperscrollbar.h
@@ -29,7 +29,7 @@
 #ifndef _SV_AQUA11WRAPPERSCROLLBAR_H
 #define _SV_AQUA11WRAPPERSCROLLBAR_H
 
-#include "aqua11ywrapper.h"
+#include "aqua/aqua11ywrapper.h"
 
 @interface AquaA11yWrapperScrollBar : AquaA11yWrapper
 {
diff --git a/vcl/aqua/source/a11y/aqua11ywrapperscrollbar.mm b/vcl/aqua/source/a11y/aqua11ywrapperscrollbar.mm
index 826da647055b..42b67b739602 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapperscrollbar.mm
+++ b/vcl/aqua/source/a11y/aqua11ywrapperscrollbar.mm
@@ -28,8 +28,10 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-#include "salinst.h"
+#include "aqua/salinst.h"
+
 #include "aqua11ywrapperscrollbar.h"
+
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
 
 using namespace ::com::sun::star::accessibility;
diff --git a/vcl/aqua/source/a11y/aqua11ywrappersplitter.h b/vcl/aqua/source/a11y/aqua11ywrappersplitter.h
index dfe39d88949e..be6e99f8f3c8 100644
--- a/vcl/aqua/source/a11y/aqua11ywrappersplitter.h
+++ b/vcl/aqua/source/a11y/aqua11ywrappersplitter.h
@@ -29,7 +29,7 @@
 #ifndef _SV_AQUA11WRAPPERSPLITTER_H
 #define _SV_AQUA11WRAPPERSPLITTER_H
 
-#include "aqua11ywrapper.h"
+#include "aqua/aqua11ywrapper.h"
 
 @interface AquaA11yWrapperSplitter : AquaA11yWrapper
 {
diff --git a/vcl/aqua/source/a11y/aqua11ywrappersplitter.mm b/vcl/aqua/source/a11y/aqua11ywrappersplitter.mm
index 4dc645c006c8..37821f25e423 100644
--- a/vcl/aqua/source/a11y/aqua11ywrappersplitter.mm
+++ b/vcl/aqua/source/a11y/aqua11ywrappersplitter.mm
@@ -28,7 +28,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-#include "salinst.h"
+#include "aqua/salinst.h"
 #include "aqua11ywrappersplitter.h"
 
 using namespace ::com::sun::star::accessibility;
diff --git a/vcl/aqua/source/a11y/aqua11ywrapperstatictext.h b/vcl/aqua/source/a11y/aqua11ywrapperstatictext.h
index a87f238b6027..d7115b879e2a 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapperstatictext.h
+++ b/vcl/aqua/source/a11y/aqua11ywrapperstatictext.h
@@ -29,7 +29,7 @@
 #ifndef _SV_AQUA11WRAPPERSTATICTEXT_H
 #define _SV_AQUA11WRAPPERSTATICTEXT_H
 
-#include "aqua11ywrapper.h"
+#include "aqua/aqua11ywrapper.h"
 
 @interface AquaA11yWrapperStaticText : AquaA11yWrapper
 {
diff --git a/vcl/aqua/source/a11y/aqua11ywrapperstatictext.mm b/vcl/aqua/source/a11y/aqua11ywrapperstatictext.mm
index 7192e64b2e7c..d5afe0962904 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapperstatictext.mm
+++ b/vcl/aqua/source/a11y/aqua11ywrapperstatictext.mm
@@ -28,7 +28,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-#include "salinst.h"
+#include "aqua/salinst.h"
 #include "aqua11ywrapperstatictext.h"
 
 // Wrapper for AXStaticText role
diff --git a/vcl/aqua/source/a11y/aqua11ywrappertabgroup.h b/vcl/aqua/source/a11y/aqua11ywrappertabgroup.h
index 9c448c057eff..54743abaa390 100644
--- a/vcl/aqua/source/a11y/aqua11ywrappertabgroup.h
+++ b/vcl/aqua/source/a11y/aqua11ywrappertabgroup.h
@@ -29,7 +29,7 @@
 #ifndef _SV_AQUA11WRAPPERTABGROUP_H
 #define _SV_AQUA11WRAPPERTABGROUP_H
 
-#include "aqua11ywrapper.h"
+#include "aqua/aqua11ywrapper.h"
 
 @interface AquaA11yWrapperTabGroup : AquaA11yWrapper
 {
diff --git a/vcl/aqua/source/a11y/aqua11ywrappertabgroup.mm b/vcl/aqua/source/a11y/aqua11ywrappertabgroup.mm
index 708ae5440c4f..fb4e66ad9b90 100644
--- a/vcl/aqua/source/a11y/aqua11ywrappertabgroup.mm
+++ b/vcl/aqua/source/a11y/aqua11ywrappertabgroup.mm
@@ -28,7 +28,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-#include "salinst.h"
+#include "aqua/salinst.h"
 #include "aqua11ywrappertabgroup.h"
 
 // Wrapper for AXTabGroup role
diff --git a/vcl/aqua/source/a11y/aqua11ywrappertextarea.h b/vcl/aqua/source/a11y/aqua11ywrappertextarea.h
index 3e11797bb383..7a458163e400 100644
--- a/vcl/aqua/source/a11y/aqua11ywrappertextarea.h
+++ b/vcl/aqua/source/a11y/aqua11ywrappertextarea.h
@@ -29,7 +29,7 @@
 #ifndef _SV_AQUA11WRAPPERTEXTAREA_H
 #define _SV_AQUA11WRAPPERTEXTAREA_H
 
-#include "aqua11ywrapper.h"
+#include "aqua/aqua11ywrapper.h"
 
 @interface AquaA11yWrapperTextArea : AquaA11yWrapper
 {
diff --git a/vcl/aqua/source/a11y/aqua11ywrappertextarea.mm b/vcl/aqua/source/a11y/aqua11ywrappertextarea.mm
index 9a425eb2b893..a90fe7ae28aa 100644
--- a/vcl/aqua/source/a11y/aqua11ywrappertextarea.mm
+++ b/vcl/aqua/source/a11y/aqua11ywrappertextarea.mm
@@ -28,7 +28,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-#include "salinst.h"
+#include "aqua/salinst.h"
 #include "aqua11ywrappertextarea.h"
 
 // Wrapper for AXTextArea role
diff --git a/vcl/aqua/source/a11y/aqua11ywrappertoolbar.h b/vcl/aqua/source/a11y/aqua11ywrappertoolbar.h
index e7163fd8b373..c02195c7d0fa 100644
--- a/vcl/aqua/source/a11y/aqua11ywrappertoolbar.h
+++ b/vcl/aqua/source/a11y/aqua11ywrappertoolbar.h
@@ -29,7 +29,7 @@
 #ifndef _SV_AQUA11WRAPPERTOOLBAR_H
 #define _SV_AQUA11WRAPPERTOOLBAR_H
 
-#include "aqua11ywrapper.h"
+#include "aqua/aqua11ywrapper.h"
 
 @interface AquaA11yWrapperToolbar : AquaA11yWrapper
 {
diff --git a/vcl/aqua/source/a11y/aqua11ywrappertoolbar.mm b/vcl/aqua/source/a11y/aqua11ywrappertoolbar.mm
index 28990355af55..29ddaf540266 100644
--- a/vcl/aqua/source/a11y/aqua11ywrappertoolbar.mm
+++ b/vcl/aqua/source/a11y/aqua11ywrappertoolbar.mm
@@ -28,7 +28,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-#include "salinst.h"
+#include "aqua/salinst.h"
 #include "aqua11ywrappertoolbar.h"
 
 // Wrapper for AXToolbar role
diff --git a/vcl/aqua/source/a11y/documentfocuslistener.hxx b/vcl/aqua/source/a11y/documentfocuslistener.hxx
index 6e3f3bd511ac..340219ec1967 100644
--- a/vcl/aqua/source/a11y/documentfocuslistener.hxx
+++ b/vcl/aqua/source/a11y/documentfocuslistener.hxx
@@ -33,7 +33,8 @@
 
 #include <cppuhelper/implbase1.hxx>
 
-#include "aqua11yfocustracker.hxx"
+#include "aqua/aqua11yfocustracker.hxx"
+
 #include <set>
 
 // -------------------------
diff --git a/vcl/aqua/source/a11y/makefile.mk b/vcl/aqua/source/a11y/makefile.mk
deleted file mode 100644
index 0a16281e5a69..000000000000
--- a/vcl/aqua/source/a11y/makefile.mk
+++ /dev/null
@@ -1,88 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=vcl
-TARGET=sala11y
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :	$(PRJ)$/util$/makefile2.pmk
-
-# --- Files --------------------------------------------------------
-
-.IF "$(GUIBASE)"!="aqua"
-
-dummy:
-    @echo "Nothing to build for GUIBASE $(GUIBASE)"
-
-.ELSE		# "$(GUIBASE)"!="aqua"
-
-SLOFILES=	\
-        $(SLO)$/aqua11ywrapper.obj \
-        $(SLO)$/aqua11yfactory.obj \
-        $(SLO)$/aqua11yfocuslistener.obj \
-        $(SLO)$/aqua11yfocustracker.obj \
-        $(SLO)$/aqua11ylistener.obj \
-        $(SLO)$/aqua11yrolehelper.obj \
-        $(SLO)$/aqua11yactionwrapper.obj \
-        $(SLO)$/aqua11ycomponentwrapper.obj \
-        $(SLO)$/aqua11yselectionwrapper.obj \
-        $(SLO)$/aqua11ytablewrapper.obj \
-        $(SLO)$/aqua11ytextattributeswrapper.obj \
-        $(SLO)$/aqua11ytextwrapper.obj \
-        $(SLO)$/aqua11yutil.obj \
-        $(SLO)$/aqua11yvaluewrapper.obj \
-        $(SLO)$/aqua11ywrapperbutton.obj \
-        $(SLO)$/aqua11ywrappercheckbox.obj \
-        $(SLO)$/aqua11ywrappercombobox.obj \
-        $(SLO)$/aqua11ywrappergroup.obj \
-        $(SLO)$/aqua11ywrapperlist.obj \
-        $(SLO)$/aqua11ywrapperradiobutton.obj \
-        $(SLO)$/aqua11ywrapperradiogroup.obj \
-        $(SLO)$/aqua11ywrapperrow.obj \
-        $(SLO)$/aqua11ywrapperscrollarea.obj \
-        $(SLO)$/aqua11ywrapperscrollbar.obj \
-        $(SLO)$/aqua11ywrappersplitter.obj \
-        $(SLO)$/aqua11ywrapperstatictext.obj \
-        $(SLO)$/aqua11ywrappertabgroup.obj \
-        $(SLO)$/aqua11ywrappertextarea.obj \
-        $(SLO)$/aqua11ywrappertoolbar.obj \
-        $(SLO)$/documentfocuslistener.obj
-
-.ENDIF		# "$(GUIBASE)"!="aqua"
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/vcl/aqua/source/app/makefile.mk b/vcl/aqua/source/app/makefile.mk
deleted file mode 100644
index a0ddcbc02226..000000000000
--- a/vcl/aqua/source/app/makefile.mk
+++ /dev/null
@@ -1,63 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=vcl
-TARGET=salapp
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :	$(PRJ)$/util$/makefile2.pmk
-
-# --- Files --------------------------------------------------------
-
-.IF "$(GUIBASE)"!="aqua"
-
-dummy:
-    @echo "Nothing to build for GUIBASE $(GUIBASE)"
-
-.ELSE		# "$(GUIBASE)"!="aqua"
-
-SLOFILES=   $(SLO)$/salinst.obj			\
-            $(SLO)$/saldata.obj         \
-            $(SLO)$/vclnsapp.obj        \
-            $(SLO)$/saltimer.obj		\
-            $(SLO)$/salnstimer.obj		\
-            $(SLO)$/salsys.obj
-
-.ENDIF		# "$(GUIBASE)"!="aqua"
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-.INCLUDE :  $(PRJ)$/util$/target.pmk
-
diff --git a/vcl/aqua/source/app/saldata.cxx b/vcl/aqua/source/app/saldata.cxx
index 925dfa8c00b0..b6f47ab440af 100644
--- a/vcl/aqua/source/app/saldata.cxx
+++ b/vcl/aqua/source/app/saldata.cxx
@@ -29,9 +29,10 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-#include "saldata.hxx"
-#include "salnsmenu.h"
-#include "salinst.h"
+#include "aqua/saldata.hxx"
+#include "aqua/salnsmenu.h"
+#include "aqua/salinst.h"
+
 #import "apple_remote/RemoteMainController.h"
 
 oslThreadKey SalData::s_aAutoReleaseKey = 0;
diff --git a/vcl/aqua/source/app/salinst.cxx b/vcl/aqua/source/app/salinst.cxx
index 20ac4e2251d6..df0d95c12f1d 100644
--- a/vcl/aqua/source/app/salinst.cxx
+++ b/vcl/aqua/source/app/salinst.cxx
@@ -33,26 +33,31 @@
 
 #include "tools/fsys.hxx"
 #include "tools/getprocessworkingdir.hxx"
+#include <tools/solarmutex.hxx>
+
 #include "osl/process.h"
+
 #include "rtl/ustrbuf.hxx"
+
 #include "vcl/svapp.hxx"
-#include "vcl/print.h"
-#include "vcl/salimestatus.hxx"
 #include "vcl/window.hxx"
 #include "vcl/timer.hxx"
-#include "vcl/impbmp.hxx"
 #include "vcl/solarmutex.hxx"
 
-#include "saldata.hxx"
-#include "salinst.h"
-#include "salframe.h"
-#include "salobj.h"
-#include "salsys.h"
-#include "salvd.h"
-#include "salbmp.h"
-#include "salprn.h"
-#include "saltimer.h"
-#include "vclnsapp.h"
+#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 "aqua/salbmp.h"
+#include "aqua/salprn.h"
+#include "aqua/saltimer.h"
+#include "aqua/vclnsapp.h"
+
+#include "print.h"
+#include "impbmp.hxx"
+#include "salimestatus.hxx"
 
 #include <comphelper/processfactory.hxx>
 
@@ -68,7 +73,6 @@
 #import "apple_remote/RemoteMainController.h"
 #include "apple_remote/RemoteControl.h"
 #include "postmac.h"
-#include <tools/solarmutex.hxx>
 
 using namespace std;
 using namespace ::com::sun::star;
@@ -891,7 +895,7 @@ bool AquaSalInstance::AnyInput( sal_uInt16 nType )
 
 // -----------------------------------------------------------------------
 
-SalFrame* AquaSalInstance::CreateChildFrame( SystemParentData* pSystemParentData, sal_uLong nSalFrameStyle )
+SalFrame* AquaSalInstance::CreateChildFrame( SystemParentData*, sal_uLong /*nSalFrameStyle*/ )
 {
     return NULL;
 }
@@ -977,7 +981,7 @@ void AquaSalInstance::GetPrinterQueueInfo( ImplPrnQueueList* pList )
 
 // -----------------------------------------------------------------------
 
-void AquaSalInstance::GetPrinterQueueState( SalPrinterQueueInfo* pInfo )
+void AquaSalInstance::GetPrinterQueueState( SalPrinterQueueInfo* )
 {
 }
 
@@ -1059,13 +1063,13 @@ void AquaSalInstance::DestroySystem( SalSystem* pSystem )
 
 // -----------------------------------------------------------------------
 
-void AquaSalInstance::SetEventCallback( void* pInstance, bool(*pCallback)(void*,void*,int) )
+void AquaSalInstance::SetEventCallback( void*, bool(*)(void*,void*,int) )
 {
 }
 
 // -----------------------------------------------------------------------
 
-void AquaSalInstance::SetErrorEventCallback( void* pInstance, bool(*pCallback)(void*,void*,int) )
+void AquaSalInstance::SetErrorEventCallback( void*, bool(*)(void*,void*,int) )
 {
 }
 
diff --git a/vcl/aqua/source/app/salnstimer.mm b/vcl/aqua/source/app/salnstimer.mm
index 73e49fd99c61..f44c3d698f73 100755
--- a/vcl/aqua/source/app/salnstimer.mm
+++ b/vcl/aqua/source/app/salnstimer.mm
@@ -28,16 +28,17 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-#include "saltimer.h"
-#include "salnstimer.h"
-#include "salinst.h"
-#include "saldata.hxx"
+#include "aqua/saltimer.h"
+#include "aqua/salnstimer.h"
+#include "aqua/salinst.h"
+#include "aqua/saldata.hxx"
 
-#include "vcl/svdata.hxx"
+#include "svdata.hxx"
 
 @implementation TimerCallbackCaller
 -(void)timerElapsed:(NSTimer*)pTimer
 {
+    (void)pTimer;
     ImplSVData* pSVData = ImplGetSVData();
     if( AquaSalTimer::bDispatchTimer )
     {
diff --git a/vcl/aqua/source/app/salsys.cxx b/vcl/aqua/source/app/salsys.cxx
index ea588c9de132..6bda7feae1df 100644
--- a/vcl/aqua/source/app/salsys.cxx
+++ b/vcl/aqua/source/app/salsys.cxx
@@ -30,14 +30,17 @@
 #include "precompiled_vcl.hxx"
 
 #include "tools/rc.hxx"
-#include "vcl/svids.hrc"
-#include "vcl/button.hxx"
 
-#include "salsys.h"
-#include "saldata.hxx"
-#include "salinst.h"
 #include "rtl/ustrbuf.hxx"
 
+#include "vcl/button.hxx"
+
+#include "aqua/salsys.h"
+#include "aqua/saldata.hxx"
+#include "aqua/salinst.h"
+
+#include "svids.hrc"
+
 using ::rtl::OUString;
 
 // =======================================================================
diff --git a/vcl/aqua/source/app/saltimer.cxx b/vcl/aqua/source/app/saltimer.cxx
index e0c406a6a589..a3907ccb9621 100644
--- a/vcl/aqua/source/app/saltimer.cxx
+++ b/vcl/aqua/source/app/saltimer.cxx
@@ -29,11 +29,11 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-#include "saltimer.h"
-#include "salnstimer.h"
-#include "saldata.hxx"
-#include "salframe.h"
-#include "salinst.h"
+#include "aqua/saltimer.h"
+#include "aqua/salnstimer.h"
+#include "aqua/saldata.hxx"
+#include "aqua/salframe.h"
+#include "aqua/salinst.h"
 
 // =======================================================================
 
diff --git a/vcl/aqua/source/app/vclnsapp.mm b/vcl/aqua/source/app/vclnsapp.mm
index 455e7c64c6a4..cfb4d5e62454 100755
--- a/vcl/aqua/source/app/vclnsapp.mm
+++ b/vcl/aqua/source/app/vclnsapp.mm
@@ -28,18 +28,19 @@
  // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-#include "vclnsapp.h"
-#include "salinst.h"
-#include "saldata.hxx"
-#include "salframe.h"
-#include "salframeview.h"
+#include "rtl/ustrbuf.hxx"
 
 #include "vcl/window.hxx"
 #include "vcl/svapp.hxx"
 #include "vcl/cmdevt.hxx"
-#include "rtl/ustrbuf.hxx"
 
-#include "vcl/impimagetree.hxx"
+#include "aqua/vclnsapp.h"
+#include "aqua/salinst.h"
+#include "aqua/saldata.hxx"
+#include "aqua/salframe.h"
+#include "aqua/salframeview.h"
+
+#include "impimagetree.hxx"
 
 #include "premac.h"
 #import "Carbon/Carbon.h"
@@ -52,6 +53,7 @@
 {
     // do nothing, this is just to start an NSThread and therefore put
     // Cocoa into multithread mode
+    (void)param;
 }
 @end
 
@@ -284,11 +286,13 @@
  
 -(NSMenu*)applicationDockMenu:(NSApplication *)sender
 {
+    (void)sender;
     return AquaSalInstance::GetDynamicDockMenu();
 }
 
 -(BOOL)application: (NSApplication*)app openFile: (NSString*)pFile
 {
+    (void)app;
     const rtl::OUString aFile( GetOUString( pFile ) );
     if( ! AquaSalInstance::isOnCommandLine( aFile ) )
     {
@@ -301,6 +305,7 @@
 
 -(void)application: (NSApplication*) app openFiles: (NSArray*)files
 {
+    (void)app;
     rtl::OUStringBuffer aFileList( 256 );
     
     NSEnumerator* it = [files objectEnumerator];
@@ -330,6 +335,7 @@
 
 -(BOOL)application: (NSApplication*)app printFile: (NSString*)pFile
 {
+    (void)app;
     const rtl::OUString aFile( GetOUString( pFile ) );
 	const ApplicationEvent* pAppEvent = new ApplicationEvent( String(), ApplicationAddress(),
                                                 APPEVENT_PRINT_STRING, aFile );
@@ -338,6 +344,9 @@
 }
 -(NSApplicationPrintReply)application: (NSApplication *) app printFiles:(NSArray *)files withSettings: (NSDictionary *)printSettings showPrintPanels:(BOOL)bShowPrintPanels
 {
+    (void)app;
+    (void)printSettings;
+    (void)bShowPrintPanels;
     // currently ignores print settings an bShowPrintPanels
     rtl::OUStringBuffer aFileList( 256 );
     
@@ -360,6 +369,7 @@
 
 -(NSApplicationTerminateReply)applicationShouldTerminate: (NSApplication *) app
 {
+    (void)app;
     NSApplicationTerminateReply aReply = NSTerminateNow;
     {
         YIELD_GUARD;
@@ -387,6 +397,7 @@
 
 -(void)systemColorsChanged: (NSNotification*) pNotification
 {
+    (void)pNotification;
     YIELD_GUARD;
     
     const SalData* pSalData = GetSalData();
@@ -396,6 +407,7 @@
 
 -(void)screenParametersChanged: (NSNotification*) pNotification
 {
+    (void)pNotification;
     YIELD_GUARD;
     
     SalData* pSalData = GetSalData();
@@ -408,11 +420,13 @@
 
 -(void)scrollbarVariantChanged: (NSNotification*) pNotification
 {
+    (void)pNotification;
     GetSalData()->mpFirstInstance->delayedSettingsChanged( true );
 }
 
 -(void)scrollbarSettingsChanged: (NSNotification*) pNotification
 {
+    (void)pNotification;
     GetSalData()->mpFirstInstance->delayedSettingsChanged( false );
 }
 
@@ -436,7 +450,9 @@
 
 #pragma mark -
 #pragma mark NSApplication Delegates
-- (void)applicationWillBecomeActive:(NSNotification *)aNotification {
+- (void)applicationWillBecomeActive:(NSNotification *)pNotification
+{
+    (void)pNotification;
     if (GetSalData()->mpMainController->remoteControl) {
 
         // [remoteControl startListening: self];
@@ -452,7 +468,9 @@
     }
 }
 
-- (void)applicationWillResignActive:(NSNotification *)aNotification {
+- (void)applicationWillResignActive:(NSNotification *)pNotification
+{
+    (void)pNotification;
     if (GetSalData()->mpMainController->remoteControl) {
 
         // [remoteControl stopListening: self];
@@ -470,6 +488,8 @@
 
 - (BOOL)applicationShouldHandleReopen: (NSApplication*)pApp hasVisibleWindows: (BOOL) bWinVisible
 {
+    (void)pApp;
+    (void)bWinVisible;
     NSObject* pHdl = GetSalData()->mpDockIconClickHandler;
     if( pHdl && [pHdl respondsToSelector: @selector(dockIconClicked:)] )
     {
diff --git a/vcl/aqua/source/dtrans/DataFlavorMapping.cxx b/vcl/aqua/source/dtrans/DataFlavorMapping.cxx
index c660dbc0616d..5c2259ff22c6 100644
--- a/vcl/aqua/source/dtrans/DataFlavorMapping.cxx
+++ b/vcl/aqua/source/dtrans/DataFlavorMapping.cxx
@@ -623,7 +623,7 @@ DataProviderPtr_t DataFlavorMapper::getDataProvider(NSString* systemFlavor, Refe
   return dp;
 }
 
-DataProviderPtr_t DataFlavorMapper::getDataProvider(const NSString* systemFlavor, NSArray* systemData) const
+DataProviderPtr_t DataFlavorMapper::getDataProvider(const NSString* /*systemFlavor*/, NSArray* systemData) const
 {
   return DataProviderPtr_t(new FileListDataProvider(systemData));
 }
diff --git a/vcl/aqua/source/dtrans/DragSource.cxx b/vcl/aqua/source/dtrans/DragSource.cxx
index bef1e639caf9..2586c9ff6a79 100644
--- a/vcl/aqua/source/dtrans/DragSource.cxx
+++ b/vcl/aqua/source/dtrans/DragSource.cxx
@@ -28,10 +28,13 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
+
 #include <com/sun/star/datatransfer/dnd/DNDConstants.hpp>
 #include <com/sun/star/datatransfer/XTransferable.hpp>
 #include <com/sun/star/awt/MouseButton.hpp>
-#include <rtl/unload.h>
+
+#include "rtl/unload.h"
+#include "rtl/ustring.hxx"
 
 #include "comphelper/makesequence.hxx"
 
@@ -39,9 +42,9 @@
 #include "DragSourceContext.hxx"
 #include "aqua_clipboard.hxx"
 #include "DragActionConversion.hxx"
-#include "salframe.h"
 
-#include <rtl/ustring.h>
+#include "aqua/salframe.h"
+
 #include <memory>
 
 
@@ -115,44 +118,50 @@ Sequence<OUString> dragSource_getSupportedServiceNames()
 
 -(void)draggedImage:(NSImage*)anImage beganAt:(NSPoint)aPoint
 {
-  DragSourceDragEvent dsde(static_cast<OWeakObject*>(mDragSource),
-                           new DragSourceContext(mDragSource),
-                           mDragSource,
-                           DNDConstants::ACTION_COPY,
-                           DNDConstants::ACTION_COPY);
-
-  mDragSource->mXDragSrcListener->dragEnter(dsde);
+    (void)anImage;
+    (void)aPoint;
+    DragSourceDragEvent dsde(static_cast<OWeakObject*>(mDragSource),
+                             new DragSourceContext(mDragSource),
+                             mDragSource,
+                             DNDConstants::ACTION_COPY,
+                             DNDConstants::ACTION_COPY);
+
+    mDragSource->mXDragSrcListener->dragEnter(dsde);
 }
 
 
 -(void)draggedImage:(NSImage *)anImage endedAt:(NSPoint)aPoint operation:(NSDragOperation)operation
 {
-  // an internal drop can accept the drop but fail with dropComplete( false )
-  // this is different than the Cocoa API
-  bool bDropSuccess = operation != NSDragOperationNone;
-  if( DragSource::g_DropSuccessSet )
-      bDropSuccess = DragSource::g_DropSuccess;
-
-  DragSourceDropEvent dsde(static_cast<OWeakObject*>(mDragSource),
-                           new DragSourceContext(mDragSource),
-                           static_cast< XDragSource* >(mDragSource),
-                           SystemToOfficeDragActions(operation),
-                           bDropSuccess );
-
-  mDragSource->mXDragSrcListener->dragDropEnd(dsde);
-  mDragSource->mXDragSrcListener = uno::Reference<XDragSourceListener>();
+    (void)anImage;
+    (void)aPoint;
+    // an internal drop can accept the drop but fail with dropComplete( false )
+    // this is different than the Cocoa API
+    bool bDropSuccess = operation != NSDragOperationNone;
+    if( DragSource::g_DropSuccessSet )
+        bDropSuccess = DragSource::g_DropSuccess;
+
+    DragSourceDropEvent dsde(static_cast<OWeakObject*>(mDragSource),
+                             new DragSourceContext(mDragSource),
+                             static_cast< XDragSource* >(mDragSource),
+                             SystemToOfficeDragActions(operation),
+                             bDropSuccess );
+
+    mDragSource->mXDragSrcListener->dragDropEnd(dsde);
+    mDragSource->mXDragSrcListener = uno::Reference<XDragSourceListener>();
 }
 
 
 -(void)draggedImage:(NSImage *)draggedImage movedTo:(NSPoint)screenPoint
 {
-  DragSourceDragEvent dsde(static_cast<OWeakObject*>(mDragSource),
-                           new DragSourceContext(mDragSource),
-                           mDragSource,
-                           DNDConstants::ACTION_COPY,
-                           DNDConstants::ACTION_COPY);
-
-  mDragSource->mXDragSrcListener->dragOver(dsde);
+    (void)draggedImage;
+    (void)screenPoint;
+    DragSourceDragEvent dsde(static_cast<OWeakObject*>(mDragSource),
+                             new DragSourceContext(mDragSource),
+                             mDragSource,
+                             DNDConstants::ACTION_COPY,
+                             DNDConstants::ACTION_COPY);
+
+    mDragSource->mXDragSrcListener->dragOver(dsde);
 }
 
 @end
@@ -242,8 +251,8 @@ sal_Int32 SAL_CALL DragSource::getDefaultCursor( sal_Int8 /*dragAction*/ )
 
 void SAL_CALL DragSource::startDrag(const DragGestureEvent& trigger,
                                     sal_Int8 sourceActions,
-                                    sal_Int32 cursor,
-                                    sal_Int32 image,
+                                    sal_Int32 /*cursor*/,
+                                    sal_Int32 /*image*/,
                                     const uno::Reference<XTransferable >& transferable,
                                     const uno::Reference<XDragSourceListener >& listener )
   throw( RuntimeException)
diff --git a/vcl/aqua/source/dtrans/DropTarget.cxx b/vcl/aqua/source/dtrans/DropTarget.cxx
index e0318b405163..f5ac3b975491 100644
--- a/vcl/aqua/source/dtrans/DropTarget.cxx
+++ b/vcl/aqua/source/dtrans/DropTarget.cxx
@@ -49,8 +49,8 @@
 #include <Carbon/Carbon.h>
 #include <postmac.h>
 
-#include <salframe.h>
-#include <salframeview.h>
+#include <aqua/salframe.h>
+#include <aqua/salframeview.h>
 
 using namespace cppu;
 using namespace osl;
@@ -317,20 +317,20 @@ NSDragOperation DropTarget::draggingUpdated(id sender)
 }
 
 
-  void DropTarget::draggingExited(id sender)
-  {
+void DropTarget::draggingExited(id /*sender*/)
+{
     DropTargetEvent dte(static_cast<OWeakObject*>(this), 0);
     fire_dragExit(dte);
     mDragSourceSupportedActions = DNDConstants::ACTION_NONE;
     mSelectedDropAction = DNDConstants::ACTION_NONE;
     SetThemeCursor(kThemeArrowCursor);
-  }
+}
 
 
-  BOOL DropTarget::prepareForDragOperation(id sender)
-  {
+BOOL DropTarget::prepareForDragOperation(id /*sender*/)
+{
     return 1;
-  }
+}
 
 
 BOOL DropTarget::performDragOperation(id sender)
@@ -372,13 +372,13 @@ BOOL DropTarget::performDragOperation(id sender)
 }
 
 
-  void DropTarget::concludeDragOperation(id sender)
-  {
+void DropTarget::concludeDragOperation(id /*sender*/)
+{
     mDragSourceSupportedActions = DNDConstants::ACTION_NONE;
     mSelectedDropAction = DNDConstants::ACTION_NONE;
     mXCurrentDragClipboard = uno::Reference<XClipboard>();
     SetThemeCursor(kThemeArrowCursor);
-  }
+}
 
 
   // called from WeakComponentImplHelperX::dispose
diff --git a/vcl/aqua/source/dtrans/aqua_clipboard.cxx b/vcl/aqua/source/dtrans/aqua_clipboard.cxx
index 82440811a7fb..6e47df691623 100644
--- a/vcl/aqua/source/dtrans/aqua_clipboard.cxx
+++ b/vcl/aqua/source/dtrans/aqua_clipboard.cxx
@@ -255,7 +255,7 @@ void SAL_CALL AquaClipboard::removeClipboardListener(const Reference< XClipboard
 }
 
 
-void AquaClipboard::applicationDidBecomeActive(NSNotification* aNotification)
+void AquaClipboard::applicationDidBecomeActive(NSNotification*)
 {
   ClearableMutexGuard aGuard(m_aMutex);
 
@@ -379,7 +379,7 @@ OUString SAL_CALL AquaClipboard::getImplementationName() throw( RuntimeException
 }
 
 
-sal_Bool SAL_CALL AquaClipboard::supportsService( const OUString& ServiceName ) throw( RuntimeException )
+sal_Bool SAL_CALL AquaClipboard::supportsService( const OUString& /*ServiceName*/ ) throw( RuntimeException )
 {
     return sal_False;
 }
diff --git a/vcl/aqua/source/dtrans/aqua_service.cxx b/vcl/aqua/source/dtrans/aqua_service.cxx
deleted file mode 100644
index 1f8f2a984ba2..000000000000
--- a/vcl/aqua/source/dtrans/aqua_service.cxx
+++ /dev/null
@@ -1,90 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_vcl.hxx"
-#include "aqua_clipboard.hxx"
-#include <cppuhelper/factory.hxx>
-#include <com/sun/star/container/XSet.hpp>
-#include <osl/diagnose.h>
-
-using namespace com::sun::star::uno;
-using namespace com::sun::star::registry;
-using namespace cppu;
-using namespace com::sun::star::lang;
-using namespace com::sun::star::datatransfer::clipboard;
-using namespace aqua;
-
-using ::rtl::OUString;
-
-namespace aqua {
-
-Reference< XInterface > SAL_CALL createInstance( const Reference< XMultiServiceFactory >& rServiceManager )
-{
-    return Reference< XInterface >( static_cast< XClipboard* >( new AquaClipboard(rServiceManager) ) );
-}
-
-} // namespace aqua
-
-extern "C"
-{
-
-SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
-    const sal_Char ** ppEnvTypeName, uno_Environment ** ppEnv )
-{
-    *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-
-SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplName, uno_Interface* pSrvManager, uno_Interface* pRegistryKey )
-{
-    void* pRet = 0;
-
-    if ( pSrvManager && ( 0 == rtl_str_compare( pImplName, AQUA_CLIPBOARD_IMPL_NAME ) ) )
-    {
-        Sequence< OUString > aSNS( 1 );
-        aSNS.getArray()[0] = OUString( RTL_CONSTASCII_USTRINGPARAM( AQUA_CLIPBOARD_SERVICE_NAME ) );
-
-        //OUString( RTL_CONSTASCII_USTRINGPARAM( FPS_IMPL_NAME ) )
-        Reference< XSingleServiceFactory > xFactory ( createOneInstanceFactory(
-            reinterpret_cast< XMultiServiceFactory* > ( pSrvManager ),
-            OUString::createFromAscii( pImplName ),
-            createInstance,
-            aSNS ) );
-        if ( xFactory.is() )
-        {
-            xFactory->acquire();
-            pRet = xFactory.get();
-        }
-    }
-
-    return pRet;
-}
-
-} // extern "C"
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/dtrans/makefile.mk b/vcl/aqua/source/dtrans/makefile.mk
deleted file mode 100644
index 369799c9a260..000000000000
--- a/vcl/aqua/source/dtrans/makefile.mk
+++ /dev/null
@@ -1,68 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=vcl
-TARGET=dtransaqua
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# ------------------------------------------------------------------
-
-.IF "$(OS)"!="MACOSX"
-dummy:
-    @echo "Nothing to build for this platform"
-.ELSE # "$(OS)"!="MACOSX"
-.IF "$(GUIBASE)"!="aqua"
-dummy:
-    @echo "Nothing to build for GUIBASE $(GUIBASE)"
-.ELSE
-
-CFLAGSCXX+=-fconstant-cfstrings -x objective-c++ -fobjc-exceptions
-
-SLOFILES= \
-        $(SLO)$/aqua_clipboard.obj \
-        $(SLO)$/DataFlavorMapping.obj \
-        $(SLO)$/OSXTransferable.obj \
-        $(SLO)$/HtmlFmtFlt.obj \
-        $(SLO)$/PictToBmpFlt.obj \
-        $(SLO)$/DropTarget.obj \
-        $(SLO)$/DragSource.obj \
-        $(SLO)$/service_entry.obj \
-        $(SLO)$/DragSourceContext.obj \
-        $(SLO)$/DragActionConversion.obj
-
-# --- Targets ------------------------------------------------------
-.INCLUDE :	target.mk
-
-.ENDIF		# "$(GUIBASE)"!="aqua"
-.ENDIF		# "$(OS)"!="MACOSX"
-
diff --git a/vcl/aqua/source/dtrans/service_entry.cxx b/vcl/aqua/source/dtrans/service_entry.cxx
index 661d87576fa8..4c4aa893ae0b 100644
--- a/vcl/aqua/source/dtrans/service_entry.cxx
+++ b/vcl/aqua/source/dtrans/service_entry.cxx
@@ -29,13 +29,16 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-#include "saldata.hxx"
-#include "salinst.h"
+#include "osl/diagnose.h"
+
+#include "vcl/svapp.hxx"
+
+#include "aqua/saldata.hxx"
+#include "aqua/salinst.h"
+
 #include "DragSource.hxx"
 #include "DropTarget.hxx"
 #include "aqua_clipboard.hxx"
-#include "osl/diagnose.h"
-#include "vcl/svapp.hxx"
 
 using namespace ::osl;
 using namespace ::rtl;
diff --git a/vcl/aqua/source/dtrans/test_aquacb.cxx b/vcl/aqua/source/dtrans/test_aquacb.cxx
deleted file mode 100644
index 1803f786c8a9..000000000000
--- a/vcl/aqua/source/dtrans/test_aquacb.cxx
+++ /dev/null
@@ -1,209 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_vcl.hxx"
-
-#include "aqua_clipboard.hxx"
-#include <cppuhelper/servicefactory.hxx>
-#include <com/sun/star/datatransfer/XTransferable.hpp>
-#include <com/sun/star/datatransfer/clipboard/XClipboardOwner.hpp>
-#include <com/sun/star/datatransfer/clipboard/XClipboardNotifier.hpp>
-#include <com/sun/star/datatransfer/clipboard/XClipboardEx.hpp>
-#include <com/sun/star/lang/XComponent.hpp>
-
-#include <cppuhelper/implbase2.hxx>
-#include <rtl/ustring.hxx>
-#include <sal/types.h>
-#include <osl/diagnose.h>
-
-#include <stdio.h>
-
-using namespace ::rtl;
-using namespace ::std;
-using namespace ::cppu;
-using namespace ::com::sun::star::datatransfer;
-using namespace ::com::sun::star::datatransfer::clipboard;
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::io;
-using namespace ::com::sun::star::lang;
-
-Reference< XTransferable > rXTransfRead;
-
-class TestTransferable : public WeakImplHelper2< XClipboardOwner, XTransferable >
-{
-public:
-    TestTransferable();
-    virtual Any SAL_CALL getTransferData( const DataFlavor& aFlavor ) throw(UnsupportedFlavorException, IOException, RuntimeException);
-    virtual Sequence< DataFlavor > SAL_CALL getTransferDataFlavors() throw(RuntimeException);
-    virtual sal_Bool SAL_CALL isDataFlavorSupported( const DataFlavor& aFlavor ) throw(RuntimeException);
-    virtual void SAL_CALL lostOwnership( const Reference< XClipboard >& xClipboard, const Reference< XTransferable >& xTrans ) throw(RuntimeException);
-
-private:
-    Sequence< DataFlavor > m_seqDFlv;
-    OUString               m_Data;
-};
-
-TestTransferable::TestTransferable() :
-    m_seqDFlv( 1 ),
-    m_Data( RTL_CONSTASCII_USTRINGPARAM( "This is a test string" ) )
-{
-    DataFlavor df;
-
-    df.MimeType = OUString(RTL_CONSTASCII_USTRINGPARAM("text/html"));
-    df.DataType = getCppuType( ( Sequence< sal_Int8 >* )0 );
-
-    m_seqDFlv[0] = df;
-}
-
-Any SAL_CALL TestTransferable::getTransferData( const DataFlavor& aFlavor )
-    throw(UnsupportedFlavorException, IOException, RuntimeException)
-{
-    Any anyData;
-
-    if ( aFlavor.MimeType == m_seqDFlv[0].MimeType )
-    {
-        OString aStr( m_Data.getStr(), m_Data.getLength(), 1252 );
-        Sequence< sal_Int8 > sOfChars( aStr.getLength() );
-        sal_Int32 lenStr = aStr.getLength();
-
-        for ( sal_Int32 i = 0; i < lenStr; ++i )
-            sOfChars[i] = aStr[i];
-
-        anyData = makeAny( sOfChars );
-    }
-
-    return anyData;
-}
-
-Sequence< DataFlavor > SAL_CALL TestTransferable::getTransferDataFlavors()
-    throw(RuntimeException)
-{
-    return m_seqDFlv;
-}
-
-sal_Bool SAL_CALL TestTransferable::isDataFlavorSupported( const DataFlavor& aFlavor )
-    throw(RuntimeException)
-{
-    sal_Int32 nLength = m_seqDFlv.getLength();
-    sal_Bool bRet     = sal_False;
-
-    for ( sal_Int32 i = 0; i < nLength; ++i )
-    {
-        if ( m_seqDFlv[i].MimeType == aFlavor.MimeType )
-        {
-            bRet = sal_True;
-            break;
-        }
-    }
-
-    return bRet;
-}
-
-void SAL_CALL TestTransferable::lostOwnership( const Reference< XClipboard >& xClipboard, const Reference< XTransferable >& xTrans )
-    throw(RuntimeException)
-{
-}
-
-int SAL_CALL main( int argc, char** argv )
-{
-    if(argc != 2)
-    {
-        fprintf( stderr, "usage: %s <my rdb file>\n", argv[0] );
-        return 1;
-    }
-
-    //-------------------------------------------------
-    // get the global service-manager
-    //-------------------------------------------------
-    OUString rdbName = OUString::createFromAscii( argv[1] );
-    Reference< XMultiServiceFactory > g_xFactory( createRegistryServiceFactory( rdbName ) );
-
-    // Print a message if an error occurred.
-    if ( !g_xFactory.is() )
-    {
-        OSL_FAIL("Can't create RegistryServiceFactory");
-        return(-1);
-    }
-
-    //-------------------------------------------------
-    // try to get an Interface to a XFilePicker Service
-    //-------------------------------------------------
-
-    Reference< XTransferable > rXTransf( static_cast< XTransferable* >( new TestTransferable ) );
-
-    Reference< XClipboard > xClipboard( g_xFactory->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( AQUA_CLIPBOARD_SERVICE_NAME ) ) ), UNO_QUERY );
-    if ( !xClipboard.is() )
-    {
-        OSL_FAIL( "Error creating FolderPicker Service" );
-        return(-1);
-    }
-
-    Reference< XTypeProvider > rXTypProv( xClipboard, UNO_QUERY );
-
-    if ( rXTypProv.is() )
-    {
-        Sequence< Type >     seqType = rXTypProv->getTypes();
-        sal_Int32 nLen = seqType.getLength();
-        for ( sal_Int32 i = 0; i < nLen; i++ )
-        {
-            Type nxtType = seqType[i];
-        }
-
-        Sequence< sal_Int8 > seqInt8 = rXTypProv->getImplementationId();
-    }
-
-    xClipboard->setContents( rXTransf, Reference< XClipboardOwner >( rXTransf, UNO_QUERY )  );
-
-    rXTransfRead = xClipboard->getContents();
-
-    // destroy the transferable explicitly
-    rXTransfRead = Reference< XTransferable>();
-
-    // destroy the clipboard
-    xClipboard = Reference< XClipboard >();
-
-    //--------------------------------------------------
-    // shutdown the service manager
-    //--------------------------------------------------
-
-    // Cast factory to XComponent
-    Reference< XComponent > xComponent( g_xFactory, UNO_QUERY );
-
-    if ( !xComponent.is() )
-        OSL_FAIL("Error shuting down");
-
-    // Dispose and clear factory
-    xComponent->dispose();
-    g_xFactory.clear();
-    g_xFactory = Reference< XMultiServiceFactory >();
-
-    return 0;
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/aqua/source/gdi/aquaprintaccessoryview.mm b/vcl/aqua/source/gdi/aquaprintaccessoryview.mm
index e62a950129e4..2bb67dcc1940 100644
--- a/vcl/aqua/source/gdi/aquaprintaccessoryview.mm
+++ b/vcl/aqua/source/gdi/aquaprintaccessoryview.mm
@@ -28,18 +28,19 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-#include "aquaprintview.h"
-#include "salinst.h"
+#include "tools/resary.hxx"
+
 #include "vcl/print.hxx"
 #include "vcl/image.hxx"
 #include "vcl/virdev.hxx"
-#include "vcl/svdata.hxx"
 #include "vcl/svapp.hxx"
 #include "vcl/unohelp.hxx"
 
-#include "vcl/svids.hrc"
+#include "aqua/aquaprintview.h"
+#include "aqua/salinst.h"
 
-#include "tools/resary.hxx"
+#include "svdata.hxx"
+#include "svids.hrc"
 
 #include "com/sun/star/i18n/XBreakIterator.hpp"
 #include "com/sun/star/i18n/WordType.hpp"
@@ -918,7 +919,7 @@ static void addRadio( NSView* pCurParent, long& rCurX, long& rCurY, long nAttach
     [pProto release];
 }
 
-static void addList( NSView* pCurParent, long& rCurX, long& rCurY, long nAttachOffset,
+static void addList( NSView* pCurParent, long& rCurX, long& rCurY, long /*nAttachOffset*/,
                     const rtl::OUString& rText,
                     const rtl::OUString& rProperty, const Sequence< rtl::OUString > rChoices, sal_Int32 nSelectValue,
                     std::vector<ColumnItem >& rLeftColumn,
diff --git a/vcl/aqua/source/gdi/aquaprintview.mm b/vcl/aqua/source/gdi/aquaprintview.mm
index 11b4b9088591..692435fc00f0 100755
--- a/vcl/aqua/source/gdi/aquaprintview.mm
+++ b/vcl/aqua/source/gdi/aquaprintview.mm
@@ -28,10 +28,11 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-#include "aquaprintview.h"
-#include "salprn.h"
 #include "vcl/print.hxx"
 
+#include "aqua/aquaprintview.h"
+#include "aqua/salprn.h"
+
 @implementation AquaPrintView
 -(id)initWithController: (vcl::PrinterController*)pController withInfoPrinter: (AquaSalInfoPrinter*)pInfoPrinter
 {
@@ -64,6 +65,7 @@
 
 -(NSPoint)locationOfPrintRect: (NSRect)aRect
 {
+    (void)aRect;
     NSPoint aPoint = { 0, 0 };
     return aPoint;
 }
diff --git a/vcl/aqua/source/gdi/makefile.mk b/vcl/aqua/source/gdi/makefile.mk
deleted file mode 100644
index 2aea58e49250..000000000000
--- a/vcl/aqua/source/gdi/makefile.mk
+++ /dev/null
@@ -1,74 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=vcl
-TARGET=salgdi
-ENABLE_EXCEPTIONS=TRUE
-
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :	$(PRJ)$/util$/makefile2.pmk
-
-# --- Files --------------------------------------------------------
-
-.IF "$(GUIBASE)"!="aqua"
-
-dummy:
-    @echo "Nothing to build for GUIBASE $(GUIBASE)"
-
-.ELSE		# "$(GUIBASE)"!="aqua"
-
-SLOFILES=   $(SLO)$/salmathutils.obj      \
-            $(SLO)$/salcolorutils.obj     \
-            $(SLO)$/salgdiutils.obj       \
-            $(SLO)$/salnativewidgets.obj  \
-            $(SLO)$/salatsuifontutils.obj \
-            $(SLO)$/salatslayout.obj      \
-            $(SLO)$/salgdi.obj            \
-            $(SLO)$/salvd.obj             \
-            $(SLO)$/salprn.obj            \
-            $(SLO)$/aquaprintview.obj     \
-            $(SLO)$/aquaprintaccessoryview.obj     \
-            $(SLO)$/salbmp.obj
-
-.IF "$(ENABLE_CAIRO)" == "TRUE"
-CDEFS+= -DCAIRO
-.ENDIF
-
-.ENDIF		# "$(GUIBASE)"!="aqua"
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-.INCLUDE :  $(PRJ)$/util$/target.pmk
-
diff --git a/vcl/aqua/source/gdi/salatslayout.cxx b/vcl/aqua/source/gdi/salatslayout.cxx
index 3a88422a2160..94022b763a03 100644
--- a/vcl/aqua/source/gdi/salatslayout.cxx
+++ b/vcl/aqua/source/gdi/salatslayout.cxx
@@ -26,13 +26,15 @@
  *
 ************************************************************************/
 
-#include "vcl/salgdi.hxx"
-#include "saldata.hxx"
-#include "salgdi.h"
-#include "vcl/sallayout.hxx"
-#include "salatsuifontutils.hxx"
 #include "tools/debug.hxx"
 
+#include "aqua/saldata.hxx"
+#include "aqua/salgdi.h"
+#include "aqua/salatsuifontutils.hxx"
+
+#include "sallayout.hxx"
+#include "salgdi.hxx"
+
 #include <math.h>
 
 // =======================================================================
@@ -1093,7 +1095,7 @@ void ATSLayout::InvalidateMeasurements()
 
 // glyph fallback is supported directly by Aqua
 // so methods used only by MultiSalLayout can be dummy implementated
-bool ATSLayout::GetGlyphOutlines( SalGraphics&, PolyPolyVector& rPPV ) const { return false; }
+bool ATSLayout::GetGlyphOutlines( SalGraphics&, PolyPolyVector& ) const { return false; }
 void ATSLayout::InitFont() {}
 void ATSLayout::MoveGlyph( int /*nStart*/, long /*nNewXPos*/ ) {}
 void ATSLayout::DropGlyph( int /*nStart*/ ) {}
@@ -1145,7 +1147,7 @@ const ImplFontData* FallbackInfo::GetFallbackFontData( int nFallbackLevel ) cons
 
 // =======================================================================
 
-SalLayout* AquaSalGraphics::GetTextLayout( ImplLayoutArgs& rArgs, int nFallbackLevel )
+SalLayout* AquaSalGraphics::GetTextLayout( ImplLayoutArgs&, int /*nFallbackLevel*/ )
 {
     ATSLayout* pATSLayout = new ATSLayout( maATSUStyle, mfFontScale );
     return pATSLayout;
diff --git a/vcl/aqua/source/gdi/salatsuifontutils.cxx b/vcl/aqua/source/gdi/salatsuifontutils.cxx
index c11ca9764400..a8ded318e1e0 100644
--- a/vcl/aqua/source/gdi/salatsuifontutils.cxx
+++ b/vcl/aqua/source/gdi/salatsuifontutils.cxx
@@ -33,10 +33,11 @@
 #include <vector>
 #include <set>
 
-#include "salgdi.h"
-#include "saldata.hxx"
 #include "vcl/svapp.hxx"
-#include "salatsuifontutils.hxx"
+
+#include "aqua/salgdi.h"
+#include "aqua/saldata.hxx"
+#include "aqua/salatsuifontutils.hxx"
 
 // we have to get the font attributes from the name table
 // since neither head's macStyle nor OS/2's panose are easily available
diff --git a/vcl/aqua/source/gdi/salbmp.cxx b/vcl/aqua/source/gdi/salbmp.cxx
index 7fc5ff74ed2e..bfb15f0a8076 100644
--- a/vcl/aqua/source/gdi/salbmp.cxx
+++ b/vcl/aqua/source/gdi/salbmp.cxx
@@ -29,19 +29,22 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-#include "tools/color.hxx"
-#include "salbmp.h"
-#include "vcl/bitmap.hxx" // for BitmapSystemData
-#include "vcl/salbtype.hxx"
-#include "vcl/bmpfast.hxx"
+#include <boost/bind.hpp>
 
 #include "basebmp/scanlineformats.hxx"
 #include "basebmp/color.hxx"
+
 #include "basegfx/vector/b2ivector.hxx"
 
-#include <boost/bind.hpp>
+#include "tools/color.hxx"
+
+#include "vcl/bitmap.hxx" // for BitmapSystemData
+#include "vcl/salbtype.hxx"
+
+#include "aqua/salbmp.h"
+#include "aqua/salinst.h"
 
-#include "salinst.h"
+#include "bmpfast.hxx"
 
 // =======================================================================
 
@@ -663,7 +666,7 @@ const BitmapPalette& GetDefaultPalette( int mnBits, bool bMonochrome )
     return aEmptyPalette;
 }
 
-BitmapBuffer* AquaSalBitmap::AcquireBuffer( bool bReadOnly )
+BitmapBuffer* AquaSalBitmap::AcquireBuffer( bool /*bReadOnly*/ )
 {
     if( !maUserBuffer.get() )
 //  || maContextBuffer.get() && (maUserBuffer.get() != maContextBuffer.get()) )
diff --git a/vcl/aqua/source/gdi/salcolorutils.cxx b/vcl/aqua/source/gdi/salcolorutils.cxx
index 664011b2684d..682537771178 100644
--- a/vcl/aqua/source/gdi/salcolorutils.cxx
+++ b/vcl/aqua/source/gdi/salcolorutils.cxx
@@ -29,9 +29,10 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-#include "salcolorutils.hxx"
 #include "vcl/salbtype.hxx"
 
+#include "aqua/salcolorutils.hxx"
+
 // =======================================================================
 
 SalColor GetSalColor( const float* pQuartzColor )
diff --git a/vcl/aqua/source/gdi/salgdi.cxx b/vcl/aqua/source/gdi/salgdi.cxx
index c64601ba48a3..9e658b24021e 100644
--- a/vcl/aqua/source/gdi/salgdi.cxx
+++ b/vcl/aqua/source/gdi/salgdi.cxx
@@ -29,21 +29,6 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-#include "salconst.h"
-#include "salgdi.h"
-#include "salbmp.h"
-#include "salframe.h"
-#include "salcolorutils.hxx"
-#include "sft.hxx"
-#include "salatsuifontutils.hxx"
-
-#include "vcl/impfont.hxx"
-#include "vcl/fontsubset.hxx"
-#include "vcl/sysdata.hxx"
-#include "vcl/sallayout.hxx"
-#include "vcl/svapp.hxx"
-#include "vcl/region.h"
-
 #include "osl/file.hxx"
 #include "osl/process.h"
 
@@ -56,7 +41,24 @@
 #include "basegfx/polygon/b2dpolygon.hxx"
 #include "basegfx/polygon/b2dpolygontools.hxx"
 #include "basegfx/matrix/b2dhommatrix.hxx"
-#include <basegfx/matrix/b2dhommatrixtools.hxx>
+#include "basegfx/matrix/b2dhommatrixtools.hxx"
+
+#include "vcl/sysdata.hxx"
+#include "vcl/svapp.hxx"
+
+#include "aqua/salconst.h"
+#include "aqua/salgdi.h"
+#include "aqua/salbmp.h"
+#include "aqua/salframe.h"
+#include "aqua/salcolorutils.hxx"
+#include "aqua/salatsuifontutils.hxx"
+
+#include "fontsubset.hxx"
+#include "impfont.hxx"
+#include "region.h"
+#include "sallayout.hxx"
+#include "sft.hxx"
+
 
 using namespace vcl;
 
@@ -392,7 +394,7 @@ void AquaSalGraphics::updateResolution()
     initResolution( (mbWindow && mpFrame) ?  mpFrame->mpWindow : nil );
 }
 
-void AquaSalGraphics::initResolution( NSWindow* pWin )
+void AquaSalGraphics::initResolution( NSWindow* )
 {
     // #i100617# read DPI only once; there is some kind of weird caching going on
     // if the main screen changes
@@ -1093,22 +1095,22 @@ bool AquaSalGraphics::drawPolyLine( const ::basegfx::B2DPolygon& rPolyLine,
 
 // -----------------------------------------------------------------------
 
-sal_Bool AquaSalGraphics::drawPolyLineBezier( sal_uLong nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry )
+sal_Bool AquaSalGraphics::drawPolyLineBezier( sal_uLong, const SalPoint*, const sal_uInt8* )
 {
     return sal_False;
 }
 
 // -----------------------------------------------------------------------
 
-sal_Bool AquaSalGraphics::drawPolygonBezier( sal_uLong nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry )
+sal_Bool AquaSalGraphics::drawPolygonBezier( sal_uLong, const SalPoint*, const sal_uInt8* )
 {
     return sal_False;
 }
 
 // -----------------------------------------------------------------------
 
-sal_Bool AquaSalGraphics::drawPolyPolygonBezier( sal_uLong nPoly, const sal_uLong* pPoints,
-                                             const SalPoint* const* pPtAry, const sal_uInt8* const* pFlgAry )
+sal_Bool AquaSalGraphics::drawPolyPolygonBezier( sal_uLong, const sal_uLong*,
+                                             const SalPoint* const*, const sal_uInt8* const* )
 {
     return sal_False;
 }
@@ -1194,7 +1196,7 @@ void AquaSalGraphics::copyBits( const SalTwoRect *pPosAry, SalGraphics *pSrcGrap
 
 // -----------------------------------------------------------------------
 
-void AquaSalGraphics::copyArea( long nDstX, long nDstY,long nSrcX, long nSrcY, long nSrcWidth, long nSrcHeight, sal_uInt16 nFlags )
+void AquaSalGraphics::copyArea( long nDstX, long nDstY,long nSrcX, long nSrcY, long nSrcWidth, long nSrcHeight, sal_uInt16 /*nFlags*/ )
 {
     ApplyXorContext();
 
@@ -1259,7 +1261,7 @@ void AquaSalGraphics::drawBitmap( const SalTwoRect* pPosAry, const SalBitmap& rS
 
 // -----------------------------------------------------------------------
 
-void AquaSalGraphics::drawBitmap( const SalTwoRect* pPosAry, const SalBitmap& rSalBitmap,SalColor nTransparentColor )
+void AquaSalGraphics::drawBitmap( const SalTwoRect* pPosAry, const SalBitmap& rSalBitmap,SalColor )
 {
     OSL_FAIL("not implemented for color masking!");
     drawBitmap( pPosAry, rSalBitmap );
@@ -1361,7 +1363,7 @@ SalColor AquaSalGraphics::getPixel( long nX, long nY )
 // -----------------------------------------------------------------------
 
 
-static void DrawPattern50( void* info, CGContextRef rContext )
+static void DrawPattern50( void*, CGContextRef rContext )
 {
     static const CGRect aRects[2] = { { {0,0}, { 2, 2 } }, { { 2, 2 }, { 2, 2 } } };
     CGContextAddRects( rContext, aRects, 2 );
@@ -1628,7 +1630,7 @@ void AquaSalGraphics::GetFontMetric( ImplFontMetricData* pMetric, int nFallbackL
 
 // -----------------------------------------------------------------------
 
-sal_uLong AquaSalGraphics::GetKernPairs( sal_uLong nPairs, ImplKernPairData*  pKernPairs )
+sal_uLong AquaSalGraphics::GetKernPairs( sal_uLong, ImplKernPairData* )
 {
     return 0;
 }
@@ -1725,8 +1727,8 @@ void AquaSalGraphics::GetDevFontList( ImplDevFontList* pFontList )
 
 // -----------------------------------------------------------------------
 
-bool AquaSalGraphics::AddTempDevFont( ImplDevFontList* pFontList,
-    const String& rFontFileURL, const String& rFontName )
+bool AquaSalGraphics::AddTempDevFont( ImplDevFontList*,
+    const String& rFontFileURL, const String& /*rFontName*/ )
 {
     ::rtl::OUString aUSytemPath;
     OSL_VERIFY( !osl::FileBase::getSystemPathFromFileURL( rFontFileURL, aUSytemPath ) );
@@ -1884,7 +1886,7 @@ void AquaSalGraphics::DrawServerFontLayout( const ServerFontLayout& )
 
 // -----------------------------------------------------------------------
 
-sal_uInt16 AquaSalGraphics::SetFont( ImplFontSelectData* pReqFont, int nFallbackLevel )
+sal_uInt16 AquaSalGraphics::SetFont( ImplFontSelectData* pReqFont, int /*nFallbackLevel*/ )
 {
     if( !pReqFont )
     {
@@ -2419,28 +2421,29 @@ void AquaSalGraphics::GetGlyphWidths( const ImplFontData* pFontData, bool bVerti
 // -----------------------------------------------------------------------
 
 const Ucs2SIntMap* AquaSalGraphics::GetFontEncodingVector(
-    const ImplFontData* pFontData, const Ucs2OStrMap** ppNonEncoded )
+    const ImplFontData*, const Ucs2OStrMap** /*ppNonEncoded*/ )
 {
     return NULL;
 }
 
 // -----------------------------------------------------------------------
 
-const void* AquaSalGraphics::GetEmbedFontData( const ImplFontData* pFontData,
-                              const sal_Ucs* pUnicodes,
-                              sal_Int32* pWidths,
-                              FontSubsetInfo& rInfo,
-                              long* pDataLen )
+const void* AquaSalGraphics::GetEmbedFontData( const ImplFontData*,
+                              const sal_Ucs* /*pUnicodes*/,
+                              sal_Int32* /*pWidths*/,
+                              FontSubsetInfo&,
+                              long* /*pDataLen*/ )
 {
     return NULL;
 }
 
 // -----------------------------------------------------------------------
 
-void AquaSalGraphics::FreeEmbedFontData( const void* pData, long nDataLen )
+void AquaSalGraphics::FreeEmbedFontData( const void* pData, long /*nDataLen*/ )
 {
     // TODO: implementing this only makes sense when the implementation of
     //      AquaSalGraphics::GetEmbedFontData() returns non-NULL
+    (void)pData;
     DBG_ASSERT( (pData!=NULL), "AquaSalGraphics::FreeEmbedFontData() is not implemented\n");
 }
 
diff --git a/vcl/aqua/source/gdi/salgdiutils.cxx b/vcl/aqua/source/gdi/salgdiutils.cxx
index 22316a50da8d..5480b630f373 100644
--- a/vcl/aqua/source/gdi/salgdiutils.cxx
+++ b/vcl/aqua/source/gdi/salgdiutils.cxx
@@ -29,20 +29,22 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-#include "salgdi.h"
-#include "salframe.h"
+#include <boost/bind.hpp>
 
 #include "basebmp/scanlineformats.hxx"
 #include "basebmp/color.hxx"
+
 #include "basegfx/range/b2drectangle.hxx"
 #include "basegfx/range/b2irange.hxx"
 #include "basegfx/vector/b2ivector.hxx"
 #include "basegfx/polygon/b2dpolygon.hxx"
 #include "basegfx/polygon/b2dpolygontools.hxx"
-#include <boost/bind.hpp>
 
 #include "vcl/svapp.hxx"
-#include "saldata.hxx"
+
+#include "aqua/salgdi.h"
+#include "aqua/salframe.h"
+#include "aqua/saldata.hxx"
 
 // ----------------------------------------------------------------------
 
@@ -270,7 +272,7 @@ CGPoint* AquaSalGraphics::makeCGptArray(sal_uLong nPoints, const SalPoint*  pPtA
 
 // -----------------------------------------------------------------------
 
-void AquaSalGraphics::UpdateWindow( NSRect& rRect )
+void AquaSalGraphics::UpdateWindow( NSRect& )
 {
     if( !mpFrame )
         return;
diff --git a/vcl/aqua/source/gdi/salmathutils.cxx b/vcl/aqua/source/gdi/salmathutils.cxx
index 26516902c5c1..7c02a276e278 100644
--- a/vcl/aqua/source/gdi/salmathutils.cxx
+++ b/vcl/aqua/source/gdi/salmathutils.cxx
@@ -29,7 +29,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-#include "salmathutils.hxx"
+#include "aqua/salmathutils.hxx"
 
 #include <stdlib.h>
 
diff --git a/vcl/aqua/source/gdi/salnativewidgets.cxx b/vcl/aqua/source/gdi/salnativewidgets.cxx
index 1ad5f5d3919c..81060fd38633 100644
--- a/vcl/aqua/source/gdi/salnativewidgets.cxx
+++ b/vcl/aqua/source/gdi/salnativewidgets.cxx
@@ -26,17 +26,17 @@
  *
  ************************************************************************/
 
-#include "salconst.h"
-#include "salgdi.h"
-#include "salnativewidgets.h"
-#include "saldata.hxx"
-#include "salframe.h"
-
 #include "vcl/salnativewidgets.hxx"
 #include "vcl/decoview.hxx"
 #include "vcl/svapp.hxx"
 #include "vcl/timer.hxx"
 
+#include "aqua/salconst.h"
+#include "aqua/salgdi.h"
+#include "aqua/salnativewidgets.h"
+#include "aqua/saldata.hxx"
+#include "aqua/salframe.h"
+
 #include "premac.h"
 #include <Carbon/Carbon.h>
 #include "postmac.h"
@@ -472,7 +472,7 @@ sal_Bool AquaSalGraphics::drawNativeControl(ControlType nType,
                     const Rectangle& rControlRegion,
                     ControlState nState,
                     const ImplControlValue& aValue,
-                    const rtl::OUString& aCaption )
+                    const rtl::OUString& )
 {
     sal_Bool bOK = sal_False;
 
@@ -1225,9 +1225,9 @@ sal_Bool AquaSalGraphics::drawNativeControl(ControlType nType,
  *  aValue:     An optional value (tristate/numerical/string)
  *  aCaption:   A caption or title string (like button text etc)
  */
-sal_Bool AquaSalGraphics::drawNativeControlText( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion,
-                                               ControlState nState, const ImplControlValue& aValue,
-                                               const rtl::OUString& aCaption )
+sal_Bool AquaSalGraphics::drawNativeControlText( ControlType /*nType*/, ControlPart /*nPart*/, const Rectangle& /*rControlRegion*/,
+                                               ControlState /*nState*/, const ImplControlValue& /*aValue*/,
+                                               const rtl::OUString& )
 {
     return( sal_False );
 }
@@ -1246,8 +1246,8 @@ sal_Bool AquaSalGraphics::drawNativeControlText( ControlType nType, ControlPart
  *  aValue:     An optional value (tristate/numerical/string)
  *  aCaption:       A caption or title string (like button text etc)
  */
-sal_Bool AquaSalGraphics::getNativeControlRegion( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState,
-                                               const ImplControlValue& aValue, const rtl::OUString& aCaption,
+sal_Bool AquaSalGraphics::getNativeControlRegion( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState /*nState*/,
+                                               const ImplControlValue& aValue, const rtl::OUString&,
                                                 Rectangle &rNativeBoundingRegion, Rectangle &rNativeContentRegion )
 
 {
diff --git a/vcl/aqua/source/gdi/salprn.cxx b/vcl/aqua/source/gdi/salprn.cxx
index 18377308c91d..5183cb9d9a4c 100644
--- a/vcl/aqua/source/gdi/salprn.cxx
+++ b/vcl/aqua/source/gdi/salprn.cxx
@@ -29,18 +29,20 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-#include "salinst.h"
-#include "salprn.h"
-#include "aquaprintview.h"
-#include "salgdi.h"
-#include "saldata.hxx"
-#include "vcl/jobset.h"
-#include "vcl/salptype.hxx"
+#include <boost/bind.hpp>
+
 #include "vcl/print.hxx"
 #include "vcl/unohelp.hxx"
 #include <sal/macros.h>
 
-#include <boost/bind.hpp>
+#include "aqua/salinst.h"
+#include "aqua/salprn.h"
+#include "aqua/aquaprintview.h"
+#include "aqua/salgdi.h"
+#include "aqua/saldata.hxx"
+
+#include "jobset.h"
+#include "salptype.hxx"
 
 #include "com/sun/star/lang/XMultiServiceFactory.hpp"
 #include "com/sun/star/container/XNameAccess.hpp"
@@ -174,7 +176,7 @@ void AquaSalInfoPrinter::ReleaseGraphics( SalGraphics* )
 
 // -----------------------------------------------------------------------
 
-sal_Bool AquaSalInfoPrinter::Setup( SalFrame* i_pFrame, ImplJobSetup* i_pSetupData )
+sal_Bool AquaSalInfoPrinter::Setup( SalFrame*, ImplJobSetup* )
 {
     return sal_False;
 }
@@ -358,14 +360,14 @@ sal_Bool AquaSalInfoPrinter::SetData( sal_uLong i_nFlags, ImplJobSetup* io_pSetu
 
 // -----------------------------------------------------------------------
 
-sal_uLong AquaSalInfoPrinter::GetPaperBinCount( const ImplJobSetup* i_pSetupData )
+sal_uLong AquaSalInfoPrinter::GetPaperBinCount( const ImplJobSetup* )
 {
     return 0;
 }
 
 // -----------------------------------------------------------------------
 
-XubString AquaSalInfoPrinter::GetPaperBinName( const ImplJobSetup* i_pSetupData, sal_uLong i_nPaperBin )
+XubString AquaSalInfoPrinter::GetPaperBinName( const ImplJobSetup*, sal_uLong )
 {
     return XubString();
 }
@@ -434,7 +436,7 @@ static bool getUseNativeDialog()
     return bNative;
 }
 
-sal_uLong AquaSalInfoPrinter::GetCapabilities( const ImplJobSetup* i_pSetupData, sal_uInt16 i_nType )
+sal_uLong AquaSalInfoPrinter::GetCapabilities( const ImplJobSetup*, sal_uInt16 i_nType )
 {
     switch( i_nType )
     {
@@ -518,7 +520,7 @@ static Size getPageSize( vcl::PrinterController& i_rController, sal_Int32 i_nPag
 
 sal_Bool AquaSalInfoPrinter::StartJob( const String* i_pFileName,
                                    const String& i_rJobName,
-                                   const String& i_rAppName,
+                                   const String& /*i_rAppName*/,
                                    ImplJobSetup* i_pSetupData,
                                    vcl::PrinterController& i_rController
                                    )
@@ -769,13 +771,13 @@ sal_Bool AquaSalPrinter::StartJob( const String* i_pFileName,
 
 // -----------------------------------------------------------------------
 
-sal_Bool AquaSalPrinter::StartJob( const XubString* i_pFileName,
-                               const XubString& i_rJobName,
-                               const XubString& i_rAppName,
-                               sal_uLong i_nCopies,
-                               bool i_bCollate,
-                               bool i_bDirect,
-                               ImplJobSetup* i_pSetupData )
+sal_Bool AquaSalPrinter::StartJob( const XubString* /*i_pFileName*/,
+                               const XubString& /*i_rJobName*/,
+                               const XubString& /*i_rAppName*/,
+                               sal_uLong /*i_nCopies*/,
+                               bool /*i_bCollate*/,
+                               bool /*i_bDirect*/,
+                               ImplJobSetup* )
 {
     OSL_FAIL( "should never be called" );
     return sal_False;
@@ -816,7 +818,7 @@ sal_uLong AquaSalPrinter::GetErrorCode()
     return mpInfoPrinter->GetErrorCode();
 }
 
-void AquaSalInfoPrinter::InitPaperFormats( const ImplJobSetup* i_pSetupData )
+void AquaSalInfoPrinter::InitPaperFormats( const ImplJobSetup* )
 {
     m_aPaperFormats.clear();
     m_bPapersInit = true;
@@ -881,7 +883,7 @@ const PaperInfo* AquaSalInfoPrinter::matchPaper( long i_nWidth, long i_nHeight,
     return pMatch;
 }
 
-int AquaSalInfoPrinter::GetLandscapeAngle( const ImplJobSetup* i_pSetupData )
+int AquaSalInfoPrinter::GetLandscapeAngle( const ImplJobSetup* )
 {
     return 900;
 }
diff --git a/vcl/aqua/source/gdi/salvd.cxx b/vcl/aqua/source/gdi/salvd.cxx
index 2aa8357b28f6..af5fa82958f9 100644
--- a/vcl/aqua/source/gdi/salvd.cxx
+++ b/vcl/aqua/source/gdi/salvd.cxx
@@ -29,15 +29,15 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-#include "salvd.h"
-#include "salinst.h"
-#include "salgdi.h"
-#include "saldata.hxx"
-#include "salframe.h"
-#include <vcl/svapp.hxx>
-
+#include "vcl/svapp.hxx"
 #include "vcl/sysdata.hxx"
 
+#include "aqua/salvd.h"
+#include "aqua/salinst.h"
+#include "aqua/salgdi.h"
+#include "aqua/saldata.hxx"
+#include "aqua/salframe.h"
+
 // -----------------------------------------------------------------------
 
 SalVirtualDevice* AquaSalInstance::CreateVirtualDevice( SalGraphics* pGraphics,
@@ -150,7 +150,7 @@ SalGraphics* AquaSalVirtualDevice::GetGraphics()
 
 // -----------------------------------------------------------------------
 
-void AquaSalVirtualDevice::ReleaseGraphics( SalGraphics *pGraphics )
+void AquaSalVirtualDevice::ReleaseGraphics( SalGraphics* )
 {
     mbGraphicsUsed = false;
 }
diff --git a/vcl/aqua/source/res/makefile.mk b/vcl/aqua/source/res/makefile.mk
deleted file mode 100644
index 8cc46caf443b..000000000000
--- a/vcl/aqua/source/res/makefile.mk
+++ /dev/null
@@ -1,53 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-TARGET=aquares
-
-# --- Settings -------------------------------------------------
-
-.INCLUDE :	settings.mk
-
-# --- Files ----------------------------------------------------
-
-.IF "$(OS)"!="MACOSX"
-
-dummy:
-        @echo "Nothing to build for OS $(OS)"
-
-.ELSE           # "$(OS)"!="MACOSX"
-
-ZIPFLAGS = -r
-ZIP1TARGET = osxres
-ZIP1LIST = MainMenu.nib/*.nib cursors/*.png
-
-# --- Targets --------------------------------------------------
-
-.INCLUDE : target.mk
-
-.ENDIF		# "$(OS)"!="MACOSX"	
-
diff --git a/vcl/aqua/source/window/makefile.mk b/vcl/aqua/source/window/makefile.mk
deleted file mode 100644
index 7afbce885e4a..000000000000
--- a/vcl/aqua/source/window/makefile.mk
+++ /dev/null
@@ -1,63 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=vcl
-TARGET=salwin
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :	$(PRJ)$/util$/makefile2.pmk
-
-# --- Files --------------------------------------------------------
-
-.IF "$(GUIBASE)"!="aqua"
-
-dummy:
-    @echo "Nothing to build for GUIBASE $(GUIBASE)"
-
-.ELSE		# "$(GUIBASE)"!="aqua"
-
-SLOFILES=	\
-        $(SLO)/salframe.obj		\
-        $(SLO)/salframeview.obj	\
-        $(SLO)/salmenu.obj		\
-        $(SLO)/salnsmenu.obj		\
-        $(SLO)/salobj.obj
-
-.ENDIF		# "$(GUIBASE)"!="aqua"
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/vcl/aqua/source/window/salframe.cxx b/vcl/aqua/source/window/salframe.cxx
index 63f269d14444..095427cb1d23 100644
--- a/vcl/aqua/source/window/salframe.cxx
+++ b/vcl/aqua/source/window/salframe.cxx
@@ -31,28 +31,31 @@
 
 #include <string>
 
-#include "saldata.hxx"
-#include "salgdi.h"
-#include "salframe.h"
-#include "salmenu.h"
-#include "saltimer.h"
-#include "salinst.h"
-#include "salframeview.h"
-#include "aqua11yfactory.h"
-#include "vcl/salwtype.hxx"
+#include "rtl/ustrbuf.hxx"
+
+#include "osl/file.h"
+
+#include "vcl/svapp.hxx"
 #include "vcl/window.hxx"
 #include "vcl/timer.hxx"
 
+#include "aqua/saldata.hxx"
+#include "aqua/salgdi.h"
+#include "aqua/salframe.h"
+#include "aqua/salmenu.h"
+#include "aqua/saltimer.h"
+#include "aqua/salinst.h"
+#include "aqua/salframeview.h"
+#include "aqua/aqua11yfactory.h"
+
+#include "salwtype.hxx"
+
 #include "premac.h"
 // needed for theming
 // FIXME: move theming code to salnativewidgets.cxx
 #include <Carbon/Carbon.h>
 #include "postmac.h"
 
-#include "boost/assert.hpp"
-#include "vcl/svapp.hxx"
-#include "rtl/ustrbuf.hxx"
-#include "osl/file.h"
 
 using namespace std;
 
@@ -286,6 +289,7 @@ SalGraphics* AquaSalFrame::GetGraphics()
 
 void AquaSalFrame::ReleaseGraphics( SalGraphics *pGraphics )
 {
+    (void)pGraphics;
     DBG_ASSERT( pGraphics == mpGraphics, "graphics released on wrong frame" );
     mbGraphics = FALSE;
 }
@@ -479,7 +483,7 @@ void AquaSalFrame::Show(sal_Bool bVisible, sal_Bool bNoActivate)
 
 // -----------------------------------------------------------------------
 
-void AquaSalFrame::Enable( sal_Bool bEnable )
+void AquaSalFrame::Enable( sal_Bool )
 {
 }
 
@@ -862,7 +866,7 @@ void AquaSalFrame::StartPresentation( sal_Bool bStart )
 
 // -----------------------------------------------------------------------
 
-void AquaSalFrame::SetAlwaysOnTop( sal_Bool bOnTop )
+void AquaSalFrame::SetAlwaysOnTop( sal_Bool )
 {
 }
 
@@ -1034,7 +1038,7 @@ void AquaSalFrame::SetInputContext( SalInputContext* pContext )
 
 // -----------------------------------------------------------------------
 
-void AquaSalFrame::EndExtTextInput( sal_uInt16 nFlags )
+void AquaSalFrame::EndExtTextInput( sal_uInt16 )
 {
 }
 
@@ -1557,7 +1561,7 @@ void AquaSalFrame::SimulateKeyPress( sal_uInt16 /*nKeyCode*/ )
 {
 }
 
-bool AquaSalFrame::SetPluginParent( SystemParentData* pNewParent )
+bool AquaSalFrame::SetPluginParent( SystemParentData* )
 {
     // plugin parent may be killed unexpectedly by
     // plugging process;
diff --git a/vcl/aqua/source/window/salframeview.mm b/vcl/aqua/source/window/salframeview.mm
index 57d605bed1ce..ade5594ec667 100755
--- a/vcl/aqua/source/window/salframeview.mm
+++ b/vcl/aqua/source/window/salframeview.mm
@@ -28,17 +28,18 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-#include "salinst.h"
-#include "salgdi.h"
-#include "salframe.h"
-#include "salframeview.h"
-#include "aqua11yfactory.h"
 #include <sal/alloca.h>
 #include <sal/macros.h>
-#include "vcl/window.hxx"
 
+#include "vcl/window.hxx"
 #include "vcl/svapp.hxx"
 
+#include "aqua/salinst.h"
+#include "aqua/salgdi.h"
+#include "aqua/salframe.h"
+#include "aqua/salframeview.h"
+#include "aqua/aqua11yfactory.h"
+
 #define WHEEL_EVENT_FACTOR 1.5
 
 static sal_uInt16 ImplGetModifierMask( unsigned int nMask )
@@ -207,6 +208,7 @@ static AquaSalFrame* getMouseContainerFrame()
 
 -(void)windowDidBecomeKey: (NSNotification*)pNotification
 {
+    (void)pNotification;
     YIELD_GUARD;
 
     if( mpFrame && AquaSalFrame::isAlive( mpFrame ) )
@@ -237,6 +239,7 @@ static AquaSalFrame* getMouseContainerFrame()
 
 -(void)windowDidResignKey: (NSNotification*)pNotification
 {
+    (void)pNotification;
     YIELD_GUARD;
 
     if( mpFrame && AquaSalFrame::isAlive( mpFrame ) )
@@ -248,6 +251,7 @@ static AquaSalFrame* getMouseContainerFrame()
 
 -(void)windowDidChangeScreen: (NSNotification*)pNotification
 {
+    (void)pNotification;
     YIELD_GUARD;
 
     if( mpFrame && AquaSalFrame::isAlive( mpFrame ) )
@@ -256,6 +260,7 @@ static AquaSalFrame* getMouseContainerFrame()
 
 -(void)windowDidMove: (NSNotification*)pNotification
 {
+    (void)pNotification;
     YIELD_GUARD;
 
     if( mpFrame && AquaSalFrame::isAlive( mpFrame ) )
@@ -267,6 +272,7 @@ static AquaSalFrame* getMouseContainerFrame()
 
 -(void)windowDidResize: (NSNotification*)pNotification
 {
+    (void)pNotification;
     YIELD_GUARD;
 
     if( mpFrame && AquaSalFrame::isAlive( mpFrame ) )
@@ -279,6 +285,7 @@ static AquaSalFrame* getMouseContainerFrame()
 
 -(void)windowDidMiniaturize: (NSNotification*)pNotification
 {
+    (void)pNotification;
     YIELD_GUARD;
 
     if( mpFrame && AquaSalFrame::isAlive( mpFrame ) )
@@ -291,6 +298,7 @@ static AquaSalFrame* getMouseContainerFrame()
 
 -(void)windowDidDeminiaturize: (NSNotification*)pNotification
 {
+    (void)pNotification;
     YIELD_GUARD;
 
     if( mpFrame && AquaSalFrame::isAlive( mpFrame ) )
@@ -303,6 +311,7 @@ static AquaSalFrame* getMouseContainerFrame()
 
 -(BOOL)windowShouldClose: (NSNotification*)pNotification
 {
+    (void)pNotification;
     YIELD_GUARD;
 
     BOOL bRet = YES;
@@ -322,6 +331,7 @@ static AquaSalFrame* getMouseContainerFrame()
 
 -(void)dockMenuItemTriggered: (id)sender
 {
+    (void)sender;
     YIELD_GUARD;
 
     if( mpFrame && AquaSalFrame::isAlive( mpFrame ) )
@@ -370,6 +380,7 @@ static AquaSalFrame* getMouseContainerFrame()
 
 -(void)unregisterDraggingDestinationHandler:(id)theHandler
 {
+    (void)theHandler;
     mDraggingDestinationHandler = nil;
 }
 
@@ -421,6 +432,7 @@ static AquaSalFrame* getMouseContainerFrame()
 
 -(BOOL)acceptsFirstMouse: (NSEvent*)pEvent
 {
+    (void)pEvent;
     return YES;
 }
 
@@ -731,6 +743,7 @@ private:
 {
     //Rotation : -(float)rotation;
     // TODO: create new CommandType so rotation is available to the applications
+    (void)pEvent;
 }
 
 - (void)swipeWithEvent: (NSEvent*)pEvent
@@ -1026,294 +1039,352 @@ private:
 
 -(void)insertTab: (id)aSender
 {
+    (void)aSender;
     [self sendKeyInputAndReleaseToFrame: KEY_TAB character: '\t' modifiers: 0];
 }
 
 -(void)insertBacktab: (id)aSender
 {
+    (void)aSender;
     [self sendKeyInputAndReleaseToFrame: (KEY_TAB | KEY_SHIFT) character: '\t' modifiers: 0];
 }
 
 -(void)moveLeft: (id)aSender
 {
+    (void)aSender;
     [self sendKeyInputAndReleaseToFrame: KEY_LEFT character: 0 modifiers: 0];
 }
 
 -(void)moveLeftAndModifySelection: (id)aSender
 {
+    (void)aSender;
     [self sendKeyInputAndReleaseToFrame: KEY_LEFT character: 0 modifiers: NSShiftKeyMask];
 }
 
 -(void)moveBackwardAndModifySelection: (id)aSender
 {
+    (void)aSender;
     [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::SELECT_BACKWARD character: 0  modifiers: 0];
 }
 
 -(void)moveRight: (id)aSender
 {
+    (void)aSender;
     [self sendKeyInputAndReleaseToFrame: KEY_RIGHT character: 0 modifiers: 0];
 }
 
 -(void)moveRightAndModifySelection: (id)aSender
 {
+    (void)aSender;
     [self sendKeyInputAndReleaseToFrame: KEY_RIGHT character: 0 modifiers: NSShiftKeyMask];
 }
 
 -(void)moveForwardAndModifySelection: (id)aSender
 {
+    (void)aSender;
     [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::SELECT_FORWARD character: 0  modifiers: 0];
 }
 
 -(void)moveWordLeft: (id)aSender
 {
+    (void)aSender;
     [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::MOVE_WORD_BACKWARD character: 0  modifiers: 0];
 }
 
 -(void)moveWordBackward: (id)aSender
 {
+    (void)aSender;
     [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::MOVE_WORD_BACKWARD character: 0  modifiers: 0];
 }
 
 -(void)moveWordBackwardAndModifySelection: (id)aSender
 {
+    (void)aSender;
     [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::SELECT_WORD_BACKWARD character: 0  modifiers: 0];
 }
 
 -(void)moveWordLeftAndModifySelection: (id)aSender
 {
+    (void)aSender;
     [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::SELECT_WORD_BACKWARD character: 0  modifiers: 0];
 }
 
 -(void)moveWordRight: (id)aSender
 {
+    (void)aSender;
     [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::MOVE_WORD_FORWARD character: 0  modifiers: 0];
 }
 
 -(void)moveWordForward: (id)aSender
 {
+    (void)aSender;
     [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::MOVE_WORD_FORWARD character: 0  modifiers: 0];
 }
 
 -(void)moveWordForwardAndModifySelection: (id)aSender
 {
+    (void)aSender;
     [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::SELECT_WORD_FORWARD character: 0  modifiers: 0];
 }
 
 -(void)moveWordRightAndModifySelection: (id)aSender
 {
+    (void)aSender;
     [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::SELECT_WORD_FORWARD character: 0  modifiers: 0];
 }
 
 -(void)moveToEndOfLine: (id)aSender
 {
+    (void)aSender;
     [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::MOVE_TO_END_OF_LINE character: 0  modifiers: 0];
 }
 
 -(void)moveToRightEndOfLine: (id)aSender
 {
+    (void)aSender;
     [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::MOVE_TO_END_OF_LINE character: 0  modifiers: 0];
 }
 
 -(void)moveToEndOfLineAndModifySelection: (id)aSender
 {
+    (void)aSender;
     [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::SELECT_TO_END_OF_LINE character: 0  modifiers: 0];
 }
 
 -(void)moveToRightEndOfLineAndModifySelection: (id)aSender
 {
+    (void)aSender;
     [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::SELECT_TO_END_OF_LINE character: 0  modifiers: 0];
 }
 
 -(void)moveToBeginningOfLine: (id)aSender
 {
+    (void)aSender;
     [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::MOVE_TO_BEGIN_OF_LINE character: 0  modifiers: 0];
 }
 
 -(void)moveToLeftEndOfLine: (id)aSender
 {
+    (void)aSender;
     [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::MOVE_TO_BEGIN_OF_LINE character: 0  modifiers: 0];
 }
 
 -(void)moveToBeginningOfLineAndModifySelection: (id)aSender
 {
+    (void)aSender;
     [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::SELECT_TO_BEGIN_OF_LINE character: 0  modifiers: 0];
 }
 
 -(void)moveToLeftEndOfLineAndModifySelection: (id)aSender
 {
+    (void)aSender;
     [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::SELECT_TO_BEGIN_OF_LINE character: 0  modifiers: 0];
 }
 
 -(void)moveToEndOfParagraph: (id)aSender
 {
+    (void)aSender;
     [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::MOVE_TO_END_OF_PARAGRAPH character: 0  modifiers: 0];
 }
 
 -(void)moveToEndOfParagraphAndModifySelection: (id)aSender
 {
+    (void)aSender;
     [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::SELECT_TO_END_OF_PARAGRAPH character: 0  modifiers: 0];
 }
 
 -(void)moveParagraphForward: (id)aSender
 {
+    (void)aSender;
     [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::MOVE_TO_END_OF_PARAGRAPH character: 0  modifiers: 0];
 }
 
 -(void)moveParagraphForwardAndModifySelection: (id)aSender
 {
+    (void)aSender;
     [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::SELECT_TO_END_OF_PARAGRAPH character: 0  modifiers: 0];
 }
 
 -(void)moveToBeginningOfParagraph: (id)aSender
 {
+    (void)aSender;
     [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::MOVE_TO_BEGIN_OF_PARAGRAPH character: 0  modifiers: 0];
 }
 
 -(void)moveParagraphBackward: (id)aSender
 {
+    (void)aSender;
     [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::MOVE_TO_BEGIN_OF_PARAGRAPH character: 0  modifiers: 0];
 }
 
 -(void)moveToBeginningOfParagraphAndModifySelection: (id)aSender
 {
+    (void)aSender;
     [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::SELECT_TO_BEGIN_OF_PARAGRAPH character: 0  modifiers: 0];
 }
 
 -(void)moveParagraphBackwardAndModifySelection: (id)aSender
 {
+    (void)aSender;
     [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::SELECT_TO_BEGIN_OF_PARAGRAPH character: 0  modifiers: 0];
 }
 
 -(void)moveToEndOfDocument: (id)aSender
 {
+    (void)aSender;
     [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::MOVE_TO_END_OF_DOCUMENT character: 0  modifiers: 0];
 }
 
 -(void)scrollToEndOfDocument: (id)aSender
 {
+    (void)aSender;
     // this is not exactly what we should do, but it makes "End" and "Shift-End" behave consistent
     [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::MOVE_TO_END_OF_DOCUMENT character: 0  modifiers: 0];
 }
 
 -(void)moveToEndOfDocumentAndModifySelection: (id)aSender
 {
+    (void)aSender;
     [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::SELECT_TO_END_OF_DOCUMENT character: 0  modifiers: 0];
 }
 
 -(void)moveToBeginningOfDocument: (id)aSender
 {
+    (void)aSender;
     [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::MOVE_TO_BEGIN_OF_DOCUMENT character: 0  modifiers: 0];
 }
 
 -(void)scrollToBeginningOfDocument: (id)aSender
 {
+    (void)aSender;
     // this is not exactly what we should do, but it makes "Home" and "Shift-Home" behave consistent
     [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::MOVE_TO_BEGIN_OF_DOCUMENT character: 0  modifiers: 0];
 }
 
 -(void)moveToBeginningOfDocumentAndModifySelection: (id)aSender
 {
+    (void)aSender;
     [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::SELECT_TO_BEGIN_OF_DOCUMENT character: 0  modifiers: 0];
 }
 
 -(void)moveUp: (id)aSender
 {
+    (void)aSender;
     [self sendKeyInputAndReleaseToFrame: KEY_UP character: 0 modifiers: 0];
 }
 
 -(void)moveDown: (id)aSender
 {
+    (void)aSender;
     [self sendKeyInputAndReleaseToFrame: KEY_DOWN character: 0 modifiers: 0];
 }
 
 -(void)insertNewline: (id)aSender
 {
+    (void)aSender;
     // #i91267# make enter and shift-enter work by evaluating the modifiers
     [self sendKeyInputAndReleaseToFrame: KEY_RETURN character: '\n' modifiers: mpFrame->mnLastModifierFlags];
 }
 
 -(void)deleteBackward: (id)aSender
 {
+    (void)aSender;
     [self sendKeyInputAndReleaseToFrame: KEY_BACKSPACE character: '\b' modifiers: 0];
 }
 
 -(void)deleteForward: (id)aSender
 {
+    (void)aSender;
     [self sendKeyInputAndReleaseToFrame: KEY_DELETE character: 0x7f modifiers: 0];
 }
 
 -(void)deleteBackwardByDecomposingPreviousCharacter: (id)aSender
 {
+    (void)aSender;
     [self sendKeyInputAndReleaseToFrame: KEY_BACKSPACE character: '\b' modifiers: 0];
 }
 
 -(void)deleteWordBackward: (id)aSender
 {
+    (void)aSender;
     [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::DELETE_WORD_BACKWARD character: 0  modifiers: 0];
 }
 
 -(void)deleteWordForward: (id)aSender
 {
+    (void)aSender;
     [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::DELETE_WORD_FORWARD character: 0  modifiers: 0];
 }
 
 -(void)deleteToBeginningOfLine: (id)aSender
 {
+    (void)aSender;
     [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::DELETE_TO_BEGIN_OF_LINE character: 0  modifiers: 0];
 }
 
 -(void)deleteToEndOfLine: (id)aSender
 {
+    (void)aSender;
     [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::DELETE_TO_END_OF_LINE character: 0  modifiers: 0];
 }
 
 -(void)deleteToBeginningOfParagraph: (id)aSender
 {
+    (void)aSender;
     [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::DELETE_TO_BEGIN_OF_PARAGRAPH character: 0  modifiers: 0];
 }
 
 -(void)deleteToEndOfParagraph: (id)aSender
 {
+    (void)aSender;
     [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::DELETE_TO_END_OF_PARAGRAPH character: 0  modifiers: 0];
 }
 
 -(void)insertLineBreak: (id)aSender
 {
+    (void)aSender;
     [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::INSERT_LINEBREAK character: 0  modifiers: 0];
 }
 
 -(void)insertParagraphSeparator: (id)aSender
 {
+    (void)aSender;
     [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::INSERT_PARAGRAPH character: 0  modifiers: 0];
 }
 
 -(void)selectWord: (id)aSender
 {
+    (void)aSender;
     [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::SELECT_WORD character: 0  modifiers: 0];
 }
 
 -(void)selectLine: (id)aSender
 {
+    (void)aSender;
     [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::SELECT_LINE character: 0  modifiers: 0];
 }
 
 -(void)selectParagraph: (id)aSender
 {
+    (void)aSender;
     [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::SELECT_PARAGRAPH character: 0  modifiers: 0];
 }
 
 -(void)selectAll: (id)aSender
 {
+    (void)aSender;
     [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::SELECT_ALL character: 0  modifiers: 0];
 }
 
 -(void)cancelOperation: (id)aSender
 {
+    (void)aSender;
     [self sendKeyInputAndReleaseToFrame: KEY_ESCAPE character: 0x1b modifiers: 0];
 }
 
 -(void)noop: (id)aSender
 {
+    (void)aSender;
     if( ! mbKeyHandled )
     {
         if( ! [self sendSingleCharacter:mpLastEvent] )
@@ -1513,12 +1584,14 @@ private:
 
 - (NSAttributedString *)attributedSubstringFromRange:(NSRange)theRange
 {
+    (void)theRange;
     // FIXME
     return nil;
 }
 
 - (unsigned int)characterIndexForPoint:(NSPoint)thePoint
 {
+    (void)thePoint;
     // FIXME
     return 0;
 }
@@ -1562,6 +1635,7 @@ private:
 
 - (NSRect)firstRectForCharacterRange:(NSRange)theRange
 {
+    (void)theRange;
     SalExtTextInputPosEvent aPosEvent;
     mpFrame->CallCallback( SALEVENT_EXTTEXTINPUTPOS, (void *)&aPosEvent );
 
@@ -1607,7 +1681,8 @@ private:
 
 -(void)unregisterMouseEventListener: (id)theListener
 {
-  mpMouseEventListener = nil;
+    (void)theListener;
+    mpMouseEventListener = nil;
 }
 
 -(NSDragOperation)draggingEntered:(id <NSDraggingInfo>)sender
@@ -1647,7 +1722,8 @@ private:
 
 -(void)unregisterDraggingDestinationHandler:(id)theHandler
 {
-  mDraggingDestinationHandler = nil;
+    (void)theHandler;
+    mDraggingDestinationHandler = nil;
 }
 
 @end
diff --git a/vcl/aqua/source/window/salmenu.cxx b/vcl/aqua/source/window/salmenu.cxx
index 0b4f41651aa0..ef76f4cf6e61 100644
--- a/vcl/aqua/source/window/salmenu.cxx
+++ b/vcl/aqua/source/window/salmenu.cxx
@@ -26,21 +26,23 @@
  *
  ************************************************************************/
 
-#include "saldata.hxx"
-#include "salinst.h"
-#include "salmenu.h"
-#include "salnsmenu.h"
-#include "salframe.h"
-#include "salbmp.h"
-#include "vcl/svids.hrc"
+#include "rtl/ustrbuf.hxx"
+
 #include "vcl/cmdevt.hxx"
 #include "vcl/floatwin.hxx"
-#include "vcl/window.h"
 #include "vcl/window.hxx"
 #include "vcl/svapp.hxx"
 
-#include "rtl/ustrbuf.hxx"
-#include "aqua11ywrapper.h"
+#include "aqua/saldata.hxx"
+#include "aqua/salinst.h"
+#include "aqua/salmenu.h"
+#include "aqua/salnsmenu.h"
+#include "aqua/salframe.h"
+#include "aqua/salbmp.h"
+#include "aqua/aqua11ywrapper.h"
+
+#include "svids.hrc"
+#include "window.h"
 
 const AquaSalMenu* AquaSalMenu::pCurrentMenuBar = NULL;
 
@@ -80,12 +82,14 @@ const AquaSalMenu* AquaSalMenu::pCurrentMenuBar = NULL;
 
 -(void)showPreferences: (id) sender
 {
+    (void)sender;
     YIELD_GUARD;
 
     [self showDialog: SHOWDIALOG_ID_PREFERENCES];
 }
 -(void)showAbout: (id) sender
 {
+    (void)sender;
     YIELD_GUARD;
 
     [self showDialog: SHOWDIALOG_ID_ABOUT];
@@ -592,7 +596,7 @@ void AquaSalMenu::RemoveItem( unsigned nPos )
         [mpMenu removeItemAtIndex: getItemIndexByPos(nPos)];
 }
 
-void AquaSalMenu::SetSubMenu( SalMenuItem* pSalMenuItem, SalMenu* pSubMenu, unsigned nPos )
+void AquaSalMenu::SetSubMenu( SalMenuItem* pSalMenuItem, SalMenu* pSubMenu, unsigned /*nPos*/ )
 {
     AquaSalMenuItem *pAquaSalMenuItem = static_cast<AquaSalMenuItem*>(pSalMenuItem);
     AquaSalMenu *subAquaSalMenu = static_cast<AquaSalMenu*>(pSubMenu);
@@ -650,7 +654,7 @@ void AquaSalMenu::EnableItem( unsigned nPos, sal_Bool bEnable )
     }
 }
 
-void AquaSalMenu::SetItemImage( unsigned nPos, SalMenuItem* pSMI, const Image& rImage )
+void AquaSalMenu::SetItemImage( unsigned /*nPos*/, SalMenuItem* pSMI, const Image& rImage )
 {
     AquaSalMenuItem* pSalMenuItem = static_cast<AquaSalMenuItem*>( pSMI );
     if( ! pSalMenuItem || ! pSalMenuItem->mpMenuItem )
@@ -663,7 +667,7 @@ void AquaSalMenu::SetItemImage( unsigned nPos, SalMenuItem* pSMI, const Image& r
         [pImage release];
 }
 
-void AquaSalMenu::SetItemText( unsigned i_nPos, SalMenuItem* i_pSalMenuItem, const XubString& i_rText )
+void AquaSalMenu::SetItemText( unsigned /*i_nPos*/, SalMenuItem* i_pSalMenuItem, const XubString& i_rText )
 {
     if (!i_pSalMenuItem)
         return;
@@ -700,7 +704,7 @@ void AquaSalMenu::SetItemText( unsigned i_nPos, SalMenuItem* i_pSalMenuItem, con
     }
 }
 
-void AquaSalMenu::SetAccelerator( unsigned nPos, SalMenuItem* pSalMenuItem, const KeyCode& rKeyCode, const XubString& rKeyName )
+void AquaSalMenu::SetAccelerator( unsigned /*nPos*/, SalMenuItem* pSalMenuItem, const KeyCode& rKeyCode, const XubString& /*rKeyName*/ )
 {
     sal_uInt16 nModifier;
     sal_Unicode nCommandKey = 0;
@@ -783,7 +787,7 @@ void AquaSalMenu::SetAccelerator( unsigned nPos, SalMenuItem* pSalMenuItem, cons
         [pString release];
 }
 
-void AquaSalMenu::GetSystemMenuData( SystemMenuData* pData )
+void AquaSalMenu::GetSystemMenuData( SystemMenuData* )
 {
 }
 
diff --git a/vcl/aqua/source/window/salnsmenu.mm b/vcl/aqua/source/window/salnsmenu.mm
index 5c32d880e81f..b86caa49d870 100755
--- a/vcl/aqua/source/window/salnsmenu.mm
+++ b/vcl/aqua/source/window/salnsmenu.mm
@@ -28,11 +28,11 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-#include "salinst.h"
-#include "saldata.hxx"
-#include "salframe.h"
-#include "salmenu.h"
-#include "salnsmenu.h"
+#include "aqua/salinst.h"
+#include "aqua/saldata.hxx"
+#include "aqua/salframe.h"
+#include "aqua/salmenu.h"
+#include "aqua/salnsmenu.h"
 
 #include "vcl/window.hxx"
  
@@ -45,6 +45,7 @@
 
 -(void)menuNeedsUpdate: (NSMenu*)pMenu
 {
+    (void)pMenu;
     YIELD_GUARD;
     
     if( mpMenu )
@@ -84,6 +85,7 @@
 }
 -(void)menuItemTriggered: (id)aSender
 {
+    (void)aSender;
     YIELD_GUARD;
     
     const AquaSalFrame* pFrame = mpMenuItem->mpParentMenu ? mpMenuItem->mpParentMenu->getFrame() : NULL;
diff --git a/vcl/aqua/source/window/salobj.cxx b/vcl/aqua/source/window/salobj.cxx
index 5bc239e26f29..a070a8f0be12 100644
--- a/vcl/aqua/source/window/salobj.cxx
+++ b/vcl/aqua/source/window/salobj.cxx
@@ -31,9 +31,9 @@
 
 #include <string.h>
 
-#include "saldata.hxx"
-#include "salobj.h"
-#include "salframe.h"
+#include "aqua/saldata.hxx"
+#include "aqua/salobj.h"
+#include "aqua/salframe.h"
 
 // =======================================================================
 
@@ -115,7 +115,7 @@ sal_uInt16 AquaSalObject::GetClipRegionType()
 
 // -----------------------------------------------------------------------
 
-void AquaSalObject::BeginSetClipRegion( sal_uLong nRectCount )
+void AquaSalObject::BeginSetClipRegion( sal_uLong )
 {
     mbClip = false;
 }
@@ -209,7 +209,7 @@ void AquaSalObject::Show( sal_Bool bVisible )
 
 // -----------------------------------------------------------------------
 
-void AquaSalObject::Enable( sal_Bool bEnable )
+void AquaSalObject::Enable( sal_Bool )
 {
 }
 
@@ -227,7 +227,7 @@ void AquaSalObject::SetBackground()
 
 // -----------------------------------------------------------------------
 
-void AquaSalObject::SetBackground( SalColor nSalColor )
+void AquaSalObject::SetBackground( SalColor )
 {
 }