798 files changed, 8070 insertions, 6518 deletions

diff --git a/comphelper/inc/comphelper/servicedecl.hxx b/comphelper/inc/comphelper/servicedecl.hxx
index 4574406db031..b025cc7ffdce 100644
--- a/comphelper/inc/comphelper/servicedecl.hxx
+++ b/comphelper/inc/comphelper/servicedecl.hxx
@@ -28,26 +28,17 @@
 #if ! defined(COMPHELPER_SERVICEDECL_HXX_INCLUDED)
 #define COMPHELPER_SERVICEDECL_HXX_INCLUDED
 
-#if ! defined(INCLUDED_COMPHELPERDLLAPI_H)
-#include "comphelper/comphelperdllapi.h"
-#endif
-#if ! defined(_CPPUHELPER_IMPLBASE1_HXX_)
-#include "cppuhelper/implbase1.hxx"
-#endif
-#if ! defined(_COM_SUN_STAR_UNO_XCOMPONENTCONTEXT_HPP_)
-#include "com/sun/star/uno/XComponentContext.hpp"
-#endif
-#if ! defined(_COM_SUN_STAR_LANG_XSERVICEINFO_HPP_)
-#include "com/sun/star/lang/XServiceInfo.hpp"
-#endif
-#if ! defined(_COM_SUN_STAR_REGISTRY_XREGISTRYKEY_HPP_)
-#include "com/sun/star/registry/XRegistryKey.hpp"
-#endif
-#include "boost/utility.hpp"
-#include "boost/function.hpp"
-#include "boost/preprocessor/cat.hpp"
-#include "boost/preprocessor/repetition.hpp"
-#include "boost/preprocessor/seq/enum.hpp"
+#include <comphelper/comphelperdllapi.h>
+#include <cppuhelper/implbase1.hxx>
+#include <com/sun/star/uno/XComponentContext.hpp>
+#include <com/sun/star/lang/XServiceInfo.hpp>
+#include <com/sun/star/registry/XRegistryKey.hpp>
+#include <uno/environment.h>
+#include <boost/utility.hpp>
+#include <boost/function.hpp>
+#include <boost/preprocessor/cat.hpp>
+#include <boost/preprocessor/repetition.hpp>
+#include <boost/preprocessor/seq/enum.hpp>
 
 namespace comphelper {
 namespace service_decl {
diff --git a/comphelper/inc/comphelper/storagehelper.hxx b/comphelper/inc/comphelper/storagehelper.hxx
index 05afd901fc57..00da529ab967 100644
--- a/comphelper/inc/comphelper/storagehelper.hxx
+++ b/comphelper/inc/comphelper/storagehelper.hxx
@@ -45,6 +45,7 @@
 #define ZIP_STORAGE_FORMAT_STRING       ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ZipFormat" ) )
 #define OFOPXML_STORAGE_FORMAT_STRING   ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "OFOPXMLFormat" ) )
 
+#define PACKAGE_ENCRYPTIONDATA_SHA256UTF8 ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PackageSHA256UTF8EncryptionKey" ) )
 #define PACKAGE_ENCRYPTIONDATA_SHA1UTF8   ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PackageSHA1UTF8EncryptionKey" ) )
 #define PACKAGE_ENCRYPTIONDATA_SHA1MS1252 ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PackageSHA1MS1252EncryptionKey" ) )
 
@@ -165,7 +166,10 @@ public:
         throw ( ::com::sun::star::uno::Exception );
 
     static ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >
-        CreatePackageEncryptionData( const ::rtl::OUString& aPassword );
+        CreatePackageEncryptionData(
+            const ::rtl::OUString& aPassword,
+            const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xSF
+                = ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >() );
 
     static sal_Bool IsValidZipEntryFileName( const ::rtl::OUString& aName, sal_Bool bSlashAllowed );
     static sal_Bool IsValidZipEntryFileName( const sal_Unicode *pChar, sal_Int32 nLength, sal_Bool bSlashAllowed );
diff --git a/comphelper/source/misc/storagehelper.cxx b/comphelper/source/misc/storagehelper.cxx
index 039ad82dacb3..3441e0a1736f 100644
--- a/comphelper/source/misc/storagehelper.cxx
+++ b/comphelper/source/misc/storagehelper.cxx
@@ -35,6 +35,9 @@
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/beans/NamedValue.hpp>
 #include <com/sun/star/beans/IllegalTypeException.hpp>
+#include <com/sun/star/xml/crypto/XDigestContext.hpp>
+#include <com/sun/star/xml/crypto/XDigestContextSupplier.hpp>
+#include <com/sun/star/xml/crypto/DigestID.hpp>
 
 #include <rtl/digest.h>
 
@@ -423,18 +426,42 @@ uno::Reference< embed::XStorage > OStorageHelper::GetStorageOfFormatFromStream(
 }
 
 // ----------------------------------------------------------------------
-uno::Sequence< beans::NamedValue > OStorageHelper::CreatePackageEncryptionData( const ::rtl::OUString& aPassword )
+uno::Sequence< beans::NamedValue > OStorageHelper::CreatePackageEncryptionData( const ::rtl::OUString& aPassword, const uno::Reference< lang::XMultiServiceFactory >& xSF )
 {
     // TODO/LATER: Should not the method be part of DocPasswordHelper?
     uno::Sequence< beans::NamedValue > aEncryptionData;
+    sal_Int32 nSha1Ind = 0;
     if ( aPassword.getLength() )
     {
+        // generate SHA256 start key
+        try
+        {
+            uno::Reference< lang::XMultiServiceFactory > xFactory = xSF.is() ? xSF : ::comphelper::getProcessServiceFactory();
+            if ( !xFactory.is() )
+                throw uno::RuntimeException();
+
+            uno::Reference< xml::crypto::XDigestContextSupplier > xDigestContextSupplier( xFactory->createInstance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.xml.crypto.NSSInitializer" ) ) ), uno::UNO_QUERY_THROW );
+            uno::Reference< xml::crypto::XDigestContext > xDigestContext( xDigestContextSupplier->getDigestContext( xml::crypto::DigestID::SHA256, uno::Sequence< beans::NamedValue >() ), uno::UNO_SET_THROW );
+
+            ::rtl::OString aUTF8Password( ::rtl::OUStringToOString( aPassword, RTL_TEXTENCODING_UTF8 ) );
+            xDigestContext->updateDigest( uno::Sequence< sal_Int8 >( reinterpret_cast< const sal_Int8* >( aUTF8Password.getStr() ), aUTF8Password.getLength() ) );
+            uno::Sequence< sal_Int8 > aDigest = xDigestContext->finalizeDigestAndDispose();
+
+            aEncryptionData.realloc( ++nSha1Ind );
+            aEncryptionData[0].Name = PACKAGE_ENCRYPTIONDATA_SHA256UTF8;
+            aEncryptionData[0].Value <<= aDigest;
+        }
+        catch ( uno::Exception& )
+        {
+            OSL_ENSURE( false, "Can not create SHA256 digest!" );
+        }
+
         // MS_1252 encoding was used for SO60 document format password encoding,
         // this encoding supports only a minor subset of nonascii characters,
         // but for compatibility reasons it has to be used for old document formats
-        aEncryptionData.realloc( 2 );
-        aEncryptionData[0].Name = PACKAGE_ENCRYPTIONDATA_SHA1UTF8;
-        aEncryptionData[1].Name = PACKAGE_ENCRYPTIONDATA_SHA1MS1252;
+        aEncryptionData.realloc( nSha1Ind + 2 );
+        aEncryptionData[nSha1Ind].Name = PACKAGE_ENCRYPTIONDATA_SHA1UTF8;
+        aEncryptionData[nSha1Ind + 1].Name = PACKAGE_ENCRYPTIONDATA_SHA1MS1252;
 
         rtl_TextEncoding pEncoding[2] = { RTL_TEXTENCODING_UTF8, RTL_TEXTENCODING_MS_1252 };
 
@@ -450,11 +477,11 @@ uno::Sequence< beans::NamedValue > OStorageHelper::CreatePackageEncryptionData(
 
             if ( nError != rtl_Digest_E_None )
             {
-                aEncryptionData.realloc( 0 );
+                aEncryptionData.realloc( nSha1Ind );
                 break;
             }
 
-            aEncryptionData[nInd].Value <<= uno::Sequence< sal_Int8 >( (sal_Int8*)pBuffer, RTL_DIGEST_LENGTH_SHA1 );
+            aEncryptionData[nSha1Ind+nInd].Value <<= uno::Sequence< sal_Int8 >( (sal_Int8*)pBuffer, RTL_DIGEST_LENGTH_SHA1 );
         }
     }
 
diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx b/cppcanvas/source/mtfrenderer/implrenderer.cxx
index 116748d38d10..2ef752b7024a 100644
--- a/cppcanvas/source/mtfrenderer/implrenderer.cxx
+++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx
@@ -84,6 +84,7 @@
 #include <lineaction.hxx>
 #include <pointaction.hxx>
 #include <polypolyaction.hxx>
+#include <rendergraphicaction.hxx>
 #include <textaction.hxx>
 #include <transparencygroupaction.hxx>
 #include <vector>
@@ -2684,6 +2685,32 @@ namespace cppcanvas
                     }
                     break;
 
+                    case META_RENDERGRAPHIC_ACTION:
+                    {
+                        MetaRenderGraphicAction* pAct = static_cast<MetaRenderGraphicAction*>(pCurrAct);
+
+                        ActionSharedPtr pRenderGraphicAction(
+                                internal::RenderGraphicActionFactory::createRenderGraphicAction(
+                                    pAct->GetRenderGraphic(),
+                                    getState( rStates ).mapModeTransform *
+                                    ::vcl::unotools::b2DPointFromPoint( pAct->GetPoint() ),
+                                    getState( rStates ).mapModeTransform *
+                                    ::vcl::unotools::b2DSizeFromSize( pAct->GetSize() ),
+                                    rCanvas,
+                                    getState( rStates ) ) );
+
+                        if( pRenderGraphicAction )
+                        {
+                            maActions.push_back(
+                                MtfAction(
+                                    pRenderGraphicAction,
+                                    io_rCurrActionIndex ) );
+
+                            io_rCurrActionIndex += pRenderGraphicAction->getActionCount()-1;
+                        }
+                    }
+                    break;
+
                     default:
                         OSL_FAIL( "Unknown meta action type encountered" );
                         break;
diff --git a/cppcanvas/source/mtfrenderer/makefile.mk b/cppcanvas/source/mtfrenderer/makefile.mk
index 1109ce2a3950..b92f2525200c 100644
--- a/cppcanvas/source/mtfrenderer/makefile.mk
+++ b/cppcanvas/source/mtfrenderer/makefile.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # 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
@@ -49,6 +49,7 @@ SLOFILES =	$(SLO)$/cachedprimitivebase.obj \
             $(SLO)$/lineaction.obj \
             $(SLO)$/pointaction.obj \
             $(SLO)$/polypolyaction.obj \
+            $(SLO)$/rendergraphicaction.obj \
             $(SLO)$/textaction.obj \
             $(SLO)$/transparencygroupaction.obj \
             $(SLO)$/mtftools.obj
diff --git a/cppcanvas/source/mtfrenderer/rendergraphicaction.cxx b/cppcanvas/source/mtfrenderer/rendergraphicaction.cxx
new file mode 100644
index 000000000000..764d3eabc6af
--- /dev/null
+++ b/cppcanvas/source/mtfrenderer/rendergraphicaction.cxx
@@ -0,0 +1,201 @@
+/*************************************************************************
+ *
+ * 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_cppcanvas.hxx"
+
+#include <rtl/logfile.hxx>
+#include <com/sun/star/rendering/XBitmap.hpp>
+#include <com/sun/star/rendering/RepaintResult.hpp>
+#include <com/sun/star/rendering/XCachedPrimitive.hpp>
+#include <vcl/rendergraphicrasterizer.hxx>
+#include <tools/gen.hxx>
+#include <vcl/canvastools.hxx>
+#include <canvas/canvastools.hxx>
+#include <basegfx/matrix/b2dhommatrix.hxx>
+#include <basegfx/vector/b2dsize.hxx>
+#include <basegfx/point/b2dpoint.hxx>
+#include <basegfx/range/b2drange.hxx>
+#include <basegfx/tools/canvastools.hxx>
+#include <boost/utility.hpp>
+#include "cachedprimitivebase.hxx"
+#include "rendergraphicaction.hxx"
+#include "outdevstate.hxx"
+#include "mtftools.hxx"
+#include <basegfx/matrix/b2dhommatrixtools.hxx>
+
+
+using namespace ::com::sun::star;
+
+namespace cppcanvas
+{
+    namespace internal
+    {
+        namespace
+        {
+
+            class RenderGraphicAction : public CachedPrimitiveBase
+            {
+            public:
+                RenderGraphicAction( const ::vcl::RenderGraphic& rRenderGraphic,
+                              const ::basegfx::B2DPoint& rDstPoint,
+                              const ::basegfx::B2DVector& rDstSize,
+                              const CanvasSharedPtr&,
+                              const OutDevState& );
+
+                virtual bool render( const ::basegfx::B2DHomMatrix& rTransformation,
+                                     const Subset& rSubset ) const;
+
+                virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation ) const;
+                virtual ::basegfx::B2DRange getBounds( const ::basegfx::B2DHomMatrix& rTransformation,
+                                                       const Subset& rSubset ) const;
+
+                virtual sal_Int32 getActionCount() const;
+
+            private:
+                using Action::render;
+                virtual bool render( uno::Reference< rendering::XCachedPrimitive >& rCachedPrimitive,
+                                     const ::basegfx::B2DHomMatrix& rTransformation ) const;
+
+                ::vcl::RenderGraphic                    maRenderGraphic;
+                uno::Reference< rendering::XBitmap >    mxBitmap;
+                CanvasSharedPtr                         mpCanvas;
+                rendering::RenderState                  maState;
+            };
+
+            RenderGraphicAction::RenderGraphicAction( const ::vcl::RenderGraphic& rRenderGraphic,
+                                                      const ::basegfx::B2DPoint& rDstPoint,
+                                                      const ::basegfx::B2DVector& rDstSize,
+                                                      const CanvasSharedPtr& rCanvas,
+                                                      const OutDevState& rState ) :
+                CachedPrimitiveBase( rCanvas, true ),
+                maRenderGraphic( rRenderGraphic ),
+                mpCanvas( rCanvas )
+            {
+                tools::initRenderState( maState,rState );
+
+                const ::vcl::RenderGraphicRasterizer aRasterizer( rRenderGraphic );
+                const BitmapEx aBmpEx( aRasterizer.Rasterize( ::vcl::unotools::sizeFromB2DSize( rDstSize ) ) );
+                const Size aRasteredSizePixel( aBmpEx.GetSizePixel() );
+
+                if( aRasteredSizePixel.Width() && aRasteredSizePixel.Height() )
+                {
+                    const ::basegfx::B2DVector aScale( rDstSize.getX() / aRasteredSizePixel.Width(),
+                                                       rDstSize.getY() / aRasteredSizePixel.Height() );
+                    const basegfx::B2DHomMatrix aLocalTransformation(
+                        basegfx::tools::createScaleTranslateB2DHomMatrix( aScale, rDstPoint)) ;
+
+                    ::canvas::tools::appendToRenderState( maState, aLocalTransformation );
+
+                    // correct clip (which is relative to original transform)
+                    tools::modifyClip( maState, rState, rCanvas, rDstPoint, &aScale, NULL );
+
+                    mxBitmap = ::vcl::unotools::xBitmapFromBitmapEx( rCanvas->getUNOCanvas()->getDevice(), aBmpEx );
+                }
+            }
+
+            bool RenderGraphicAction::render( uno::Reference< rendering::XCachedPrimitive >& rCachedPrimitive,
+                                       const ::basegfx::B2DHomMatrix&                 rTransformation ) const
+            {
+                RTL_LOGFILE_CONTEXT( aLog, "::cppcanvas::internal::RenderGraphicAction::render()" );
+                RTL_LOGFILE_CONTEXT_TRACE1( aLog, "::cppcanvas::internal::RenderGraphicAction: 0x%X", this );
+
+                if( mxBitmap.is() )
+                {
+                    rendering::RenderState aLocalState( maState );
+                    ::canvas::tools::prependToRenderState(aLocalState, rTransformation);
+
+                    rCachedPrimitive = mpCanvas->getUNOCanvas()->drawBitmap( mxBitmap,
+                                                                             mpCanvas->getViewState(),
+                                                                             aLocalState );
+                }
+
+                return true;
+            }
+
+            bool RenderGraphicAction::render( const ::basegfx::B2DHomMatrix&    rTransformation,
+                                       const Subset&                    rSubset ) const
+            {
+                // rendergraphic only contains a single action, fail if subset
+                // requests different range
+                if( rSubset.mnSubsetBegin != 0 ||
+                    rSubset.mnSubsetEnd != 1 )
+                    return false;
+
+                return CachedPrimitiveBase::render( rTransformation );
+            }
+
+            ::basegfx::B2DRange RenderGraphicAction::getBounds( const ::basegfx::B2DHomMatrix& rTransformation ) const
+            {
+                ::basegfx::B2DRange aRet;
+
+                if( mxBitmap.is() )
+                {
+                    rendering::RenderState aLocalState( maState );
+                    ::canvas::tools::prependToRenderState(aLocalState, rTransformation);
+
+                    geometry::IntegerSize2D aSize( mxBitmap->getSize() );
+
+                    aRet = tools::calcDevicePixelBounds( ::basegfx::B2DRange( 0, 0, aSize.Width, aSize.Height ),
+                                                         mpCanvas->getViewState(), aLocalState );
+                }
+
+                return( aRet );
+            }
+
+            ::basegfx::B2DRange RenderGraphicAction::getBounds( const ::basegfx::B2DHomMatrix&  rTransformation,
+                                                         const Subset&                  rSubset ) const
+            {
+                // rendergraphic only contains a single action, empty bounds
+                // if subset requests different range
+                if( rSubset.mnSubsetBegin != 0 ||
+                    rSubset.mnSubsetEnd != 1 )
+                    return ::basegfx::B2DRange();
+
+                return getBounds( rTransformation );
+            }
+
+            sal_Int32 RenderGraphicAction::getActionCount() const
+            {
+                return 1;
+            }
+        }
+
+        ActionSharedPtr RenderGraphicActionFactory::createRenderGraphicAction( const ::vcl::RenderGraphic& rRenderGraphic,
+                                                                 const ::basegfx::B2DPoint&  rDstPoint,
+                                                                 const ::basegfx::B2DVector& rDstSize,
+                                                                 const CanvasSharedPtr&      rCanvas,
+                                                                 const OutDevState&          rState )
+        {
+            return ActionSharedPtr( new RenderGraphicAction(rRenderGraphic,
+                                                     rDstPoint,
+                                                     rDstSize,
+                                                     rCanvas,
+                                                     rState ) );
+        }
+    }
+}
diff --git a/cppcanvas/source/mtfrenderer/rendergraphicaction.hxx b/cppcanvas/source/mtfrenderer/rendergraphicaction.hxx
new file mode 100644
index 000000000000..f1e2dccdfe0d
--- /dev/null
+++ b/cppcanvas/source/mtfrenderer/rendergraphicaction.hxx
@@ -0,0 +1,77 @@
+/*************************************************************************
+ *
+ * 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 _CPPCANVAS_RENDERGRAPHICACTION_HXX
+#define _CPPCANVAS_RENDERGRAPHICACTION_HXX
+
+#include <cppcanvas/canvas.hxx>
+#include <action.hxx>
+
+namespace basegfx {
+    class B2DPoint;
+    class B2DVector;
+}
+namespace vcl {
+    class RenderGraphic;
+}
+
+/* Definition of internal::RenderGraphicActionFactory class */
+
+namespace cppcanvas
+{
+    namespace internal
+    {
+        struct OutDevState;
+
+        /** Creates encapsulated converters between GDIMetaFile and
+            XCanvas. The Canvas argument is deliberately placed at the
+            constructor, to force reconstruction of this object for a
+            new canvas. This considerably eases internal state
+            handling, since a lot of the internal state (e.g. fonts,
+            text layout) is Canvas-dependent.
+         */
+        class RenderGraphicActionFactory
+        {
+        public:
+            /// Scaled rendergraphic action, dest point and dest size
+            static ActionSharedPtr createRenderGraphicAction( const ::vcl::RenderGraphic& rRenderGraphic,
+                                                       const ::basegfx::B2DPoint&  rDstPoint,
+                                                       const ::basegfx::B2DVector& rDstSize,
+                                                       const CanvasSharedPtr&,
+                                                       const OutDevState& );
+
+        private:
+            // static factory, disable big four
+            RenderGraphicActionFactory();
+            ~RenderGraphicActionFactory();
+            RenderGraphicActionFactory(const RenderGraphicActionFactory&);
+            RenderGraphicActionFactory& operator=( const RenderGraphicActionFactory& );
+        };
+    }
+}
+
+#endif /*_CPPCANVAS_RENDERGRAPHICACTION_HXX */
diff --git a/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx b/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx
index 4a12e2abb78c..482b2a430dc1 100644
--- a/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx
+++ b/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx
@@ -391,6 +391,7 @@ namespace cppcanvas
                                 case META_TEXTLINE_ACTION:
                                 case META_TEXTRECT_ACTION:
                                 case META_STRETCHTEXT_ACTION:
+                                case META_RENDERGRAPHIC_ACTION:
                                     // output-generating action - only
                                     // copy, if we're within the
                                     // requested subset
diff --git a/i18npool/inc/i18npool/lang.h b/i18npool/inc/i18npool/lang.h
index 5d8066cc4e31..4f21704875fb 100644
--- a/i18npool/inc/i18npool/lang.h
+++ b/i18npool/inc/i18npool/lang.h
@@ -522,8 +522,16 @@ typedef unsigned short LanguageType;
 #define LANGUAGE_USER_LOJBAN                0x0658  /* no locale */
 #define LANGUAGE_USER_KABYLE                0x0659
 #define LANGUAGE_USER_HAITIAN               0x065A
-#define LANGUAGE_USER_MANX                  0x065B
-
+#define LANGUAGE_USER_BEEMBE                0x065B
+#define LANGUAGE_USER_BEKWEL                0x065C
+#define LANGUAGE_USER_KITUBA                0x065D
+#define LANGUAGE_USER_LARI                  0x065E
+#define LANGUAGE_USER_MBOCHI                0x065F
+#define LANGUAGE_USER_TEKE_IBALI            0x0660
+#define LANGUAGE_USER_TEKE_TYEE             0x0661
+#define LANGUAGE_USER_VILI                  0x0662
+#define LANGUAGE_USER_PORTUGUESE_ANGOLA     0x8016  /* makeLangID( 0x20, getPrimaryLanguage( LANGUAGE_PORTUGUESE)) */
+#define LANGUAGE_USER_MANX                  0x0663
 
 #endif /* INCLUDED_I18NPOOL_LANG_H */
 
diff --git a/i18npool/source/isolang/isolang.cxx b/i18npool/source/isolang/isolang.cxx
index 3e64f791ded5..f639df661073 100644
--- a/i18npool/source/isolang/isolang.cxx
+++ b/i18npool/source/isolang/isolang.cxx
@@ -470,6 +470,15 @@ static MsLangId::IsoLangEntry const aImplIsoLangEntries[] =
     { LANGUAGE_USER_KABYLE,                "kab", "DZ" },
     { LANGUAGE_USER_HAITIAN,                "ht", "HT" },
     { LANGUAGE_FRENCH_HAITI,                "fr", "HT" },
+    { LANGUAGE_USER_BEEMBE,                "beq", "CG" },
+    { LANGUAGE_USER_BEKWEL,                "bkw", "CG" },
+    { LANGUAGE_USER_KITUBA,                "mkw", "CG" },
+    { LANGUAGE_USER_LARI,                  "ldi", "CG" },
+    { LANGUAGE_USER_MBOCHI,                "mdw", "CG" },
+    { LANGUAGE_USER_TEKE_IBALI,            "tek", "CG" },
+    { LANGUAGE_USER_TEKE_TYEE,             "tyx", "CG" },
+    { LANGUAGE_USER_VILI,                  "vif", "CG" },
+    { LANGUAGE_USER_PORTUGUESE_ANGOLA,      "pt", "AO" },
     { LANGUAGE_USER_MANX,                   "gv", "GB" },
     { LANGUAGE_NONE,                       "zxx", ""   },   // added to ISO 639-2 on 2006-01-11: Used to declare the absence of linguistic information
     { LANGUAGE_DONTKNOW,                    "",   ""   }    // marks end of table
diff --git a/i18npool/source/isolang/langid.pl b/i18npool/source/isolang/langid.pl
index 8035178b7bb5..9787309e20d9 100755
--- a/i18npool/source/isolang/langid.pl
+++ b/i18npool/source/isolang/langid.pl
@@ -53,13 +53,13 @@ sub Usage()
         "langtab.src, a generic string match of the listbox entries will be tried.\n\n",
 
         "Numeric values of LangID,primarylanguage,sublanguage can be given\n",
-        "decimal, hexagesimal (leading 0x), octal (leading 0) or binary (leading 0b).\n",
+        "decimal, hexadecimal (leading 0x), octal (leading 0) or binary (leading 0b).\n",
         "The exact language_define of an exact match will be used in remaining lookups.\n\n",
 
         "A language-country pair will lookup a xx-YY mapping from isolang.cxx,\n",
         "for example: 'en-US' or 'de-' or '-CH',\n",
         "xx and YY can be given case insensitive, will be lowered-uppered internally,\n",
-        "and xx and YY themselfs may be regular expressions.\n",
+        "and xx and YY themselves may be regular expressions.\n",
         "Also here a list of matches will be processed.\n\n",
 
         "If option --single is given, only the first match will be processed.\n\n";
diff --git a/i18npool/source/localedata/data/localedata_others.map b/i18npool/source/localedata/data/localedata_others.map
index 5e9d81eaf31c..de7a2312bfb9 100644
--- a/i18npool/source/localedata/data/localedata_others.map
+++ b/i18npool/source/localedata/data/localedata_others.map
@@ -57,6 +57,7 @@ getAllCalendars_om_ET;
 getAllCalendars_or_IN;
 getAllCalendars_pa_IN;
 getAllCalendars_plt_MG;
+getAllCalendars_pt_AO;
 getAllCalendars_rw_RW;
 getAllCalendars_sg_CF;
 getAllCalendars_shs_CA;
@@ -142,6 +143,7 @@ getAllCurrencies_om_ET;
 getAllCurrencies_or_IN;
 getAllCurrencies_pa_IN;
 getAllCurrencies_plt_MG;
+getAllCurrencies_pt_AO;
 getAllCurrencies_rw_RW;
 getAllCurrencies_sg_CF;
 getAllCurrencies_shs_CA;
@@ -227,6 +229,7 @@ getAllFormats0_om_ET;
 getAllFormats0_or_IN;
 getAllFormats0_pa_IN;
 getAllFormats0_plt_MG;
+getAllFormats0_pt_AO;
 getAllFormats0_rw_RW;
 getAllFormats0_sg_CF;
 getAllFormats0_shs_CA;
@@ -312,6 +315,7 @@ getBreakIteratorRules_om_ET;
 getBreakIteratorRules_or_IN;
 getBreakIteratorRules_pa_IN;
 getBreakIteratorRules_plt_MG;
+getBreakIteratorRules_pt_AO;
 getBreakIteratorRules_rw_RW;
 getBreakIteratorRules_sg_CF;
 getBreakIteratorRules_shs_CA;
@@ -397,6 +401,7 @@ getCollationOptions_om_ET;
 getCollationOptions_or_IN;
 getCollationOptions_pa_IN;
 getCollationOptions_plt_MG;
+getCollationOptions_pt_AO;
 getCollationOptions_rw_RW;
 getCollationOptions_sg_CF;
 getCollationOptions_shs_CA;
@@ -482,6 +487,7 @@ getCollatorImplementation_om_ET;
 getCollatorImplementation_or_IN;
 getCollatorImplementation_pa_IN;
 getCollatorImplementation_plt_MG;
+getCollatorImplementation_pt_AO;
 getCollatorImplementation_rw_RW;
 getCollatorImplementation_sg_CF;
 getCollatorImplementation_shs_CA;
@@ -567,6 +573,7 @@ getContinuousNumberingLevels_om_ET;
 getContinuousNumberingLevels_or_IN;
 getContinuousNumberingLevels_pa_IN;
 getContinuousNumberingLevels_plt_MG;
+getContinuousNumberingLevels_pt_AO;
 getContinuousNumberingLevels_rw_RW;
 getContinuousNumberingLevels_sg_CF;
 getContinuousNumberingLevels_shs_CA;
@@ -652,6 +659,7 @@ getFollowPageWords_om_ET;
 getFollowPageWords_or_IN;
 getFollowPageWords_pa_IN;
 getFollowPageWords_plt_MG;
+getFollowPageWords_pt_AO;
 getFollowPageWords_rw_RW;
 getFollowPageWords_sg_CF;
 getFollowPageWords_shs_CA;
@@ -737,6 +745,7 @@ getForbiddenCharacters_om_ET;
 getForbiddenCharacters_or_IN;
 getForbiddenCharacters_pa_IN;
 getForbiddenCharacters_plt_MG;
+getForbiddenCharacters_pt_AO;
 getForbiddenCharacters_rw_RW;
 getForbiddenCharacters_sg_CF;
 getForbiddenCharacters_shs_CA;
@@ -822,6 +831,7 @@ getIndexAlgorithm_om_ET;
 getIndexAlgorithm_or_IN;
 getIndexAlgorithm_pa_IN;
 getIndexAlgorithm_plt_MG;
+getIndexAlgorithm_pt_AO;
 getIndexAlgorithm_rw_RW;
 getIndexAlgorithm_sg_CF;
 getIndexAlgorithm_shs_CA;
@@ -907,6 +917,7 @@ getLCInfo_om_ET;
 getLCInfo_or_IN;
 getLCInfo_pa_IN;
 getLCInfo_plt_MG;
+getLCInfo_pt_AO;
 getLCInfo_rw_RW;
 getLCInfo_sg_CF;
 getLCInfo_shs_CA;
@@ -992,6 +1003,7 @@ getLocaleItem_om_ET;
 getLocaleItem_or_IN;
 getLocaleItem_pa_IN;
 getLocaleItem_plt_MG;
+getLocaleItem_pt_AO;
 getLocaleItem_rw_RW;
 getLocaleItem_sg_CF;
 getLocaleItem_shs_CA;
@@ -1077,6 +1089,7 @@ getOutlineNumberingLevels_om_ET;
 getOutlineNumberingLevels_or_IN;
 getOutlineNumberingLevels_pa_IN;
 getOutlineNumberingLevels_plt_MG;
+getOutlineNumberingLevels_pt_AO;
 getOutlineNumberingLevels_rw_RW;
 getOutlineNumberingLevels_sg_CF;
 getOutlineNumberingLevels_shs_CA;
@@ -1162,6 +1175,7 @@ getReservedWords_om_ET;
 getReservedWords_or_IN;
 getReservedWords_pa_IN;
 getReservedWords_plt_MG;
+getReservedWords_pt_AO;
 getReservedWords_rw_RW;
 getReservedWords_sg_CF;
 getReservedWords_shs_CA;
@@ -1247,6 +1261,7 @@ getSearchOptions_om_ET;
 getSearchOptions_or_IN;
 getSearchOptions_pa_IN;
 getSearchOptions_plt_MG;
+getSearchOptions_pt_AO;
 getSearchOptions_rw_RW;
 getSearchOptions_sg_CF;
 getSearchOptions_shs_CA;
@@ -1332,6 +1347,7 @@ getTransliterations_om_ET;
 getTransliterations_or_IN;
 getTransliterations_pa_IN;
 getTransliterations_plt_MG;
+getTransliterations_pt_AO;
 getTransliterations_rw_RW;
 getTransliterations_sg_CF;
 getTransliterations_shs_CA;
@@ -1417,6 +1433,7 @@ getUnicodeScripts_om_ET;
 getUnicodeScripts_or_IN;
 getUnicodeScripts_pa_IN;
 getUnicodeScripts_plt_MG;
+getUnicodeScripts_pt_AO;
 getUnicodeScripts_rw_RW;
 getUnicodeScripts_sg_CF;
 getUnicodeScripts_shs_CA;
diff --git a/i18npool/source/localedata/data/makefile.mk b/i18npool/source/localedata/data/makefile.mk
index ee46865afe10..df038d445ead 100644
--- a/i18npool/source/localedata/data/makefile.mk
+++ b/i18npool/source/localedata/data/makefile.mk
@@ -279,6 +279,7 @@ SHL4OBJS= \
     $(SLO)$/localedata_or_IN.obj \
     $(SLO)$/localedata_pa_IN.obj \
     $(SLO)$/localedata_plt_MG.obj \
+    $(SLO)$/localedata_pt_AO.obj	\
     $(SLO)$/localedata_rw_RW.obj \
     $(SLO)$/localedata_sg_CF.obj \
     $(SLO)$/localedata_shs_CA.obj \
diff --git a/i18npool/source/localedata/data/pt_AO.xml b/i18npool/source/localedata/data/pt_AO.xml
new file mode 100644
index 000000000000..f1bb92becf05
--- /dev/null
+++ b/i18npool/source/localedata/data/pt_AO.xml
@@ -0,0 +1,373 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE Locale SYSTEM 'locale.dtd'>
+<Locale versionDTD="2.0.3" allowUpdateFromCLDR="no" version="1.2">
+<LC_INFO>
+<Language>
+<LangID>pt</LangID>
+<DefaultName>Portuguese</DefaultName>
+</Language>
+<Country>
+<CountryID>AO</CountryID>
+<DefaultName>Angola</DefaultName>
+</Country>
+</LC_INFO>
+<LC_CTYPE unoid="generic">
+<Separators>
+<DateSeparator>-</DateSeparator>
+<ThousandSeparator>.</ThousandSeparator>
+<DecimalSeparator>,</DecimalSeparator>
+<TimeSeparator>:</TimeSeparator>
+<Time100SecSeparator>,</Time100SecSeparator>
+<ListSeparator>;</ListSeparator>
+<LongDateDayOfWeekSeparator>, </LongDateDayOfWeekSeparator>
+<LongDateDaySeparator> de </LongDateDaySeparator>
+<LongDateMonthSeparator> de </LongDateMonthSeparator>
+<LongDateYearSeparator> </LongDateYearSeparator>
+</Separators>
+<Markers>
+<QuotationStart>‘</QuotationStart>
+<QuotationEnd>’</QuotationEnd>
+<DoubleQuotationStart>“</DoubleQuotationStart>
+<DoubleQuotationEnd>”</DoubleQuotationEnd>
+</Markers>
+<TimeAM>AM</TimeAM>
+<TimePM>PM</TimePM>
+<MeasurementSystem>Metric</MeasurementSystem>
+</LC_CTYPE>
+<LC_FORMAT>
+<FormatElement msgid="DateFormatskey1" default="true" type="short" usage="DATE" formatindex="18">
+<FormatCode>DD-MM-AAAA</FormatCode>
+<DefaultName></DefaultName>
+</FormatElement>
+<FormatElement msgid="DateFormatskey2" default="false" type="medium" usage="DATE" formatindex="28">
+<FormatCode>NN DD-MMM AA</FormatCode>
+<DefaultName></DefaultName>
+</FormatElement>
+<FormatElement msgid="DateFormatskey3" default="false" type="medium" usage="DATE" formatindex="34">
+<FormatCode>MM-AA</FormatCode>
+<DefaultName></DefaultName>
+</FormatElement>
+<FormatElement msgid="DateFormatskey4" default="false" type="medium" usage="DATE" formatindex="35">
+<FormatCode>DD-MMM</FormatCode>
+<DefaultName></DefaultName>
+</FormatElement>
+<FormatElement msgid="DateFormatskey5" default="false" type="medium" usage="DATE" formatindex="36">
+<FormatCode>MMMM</FormatCode>
+<DefaultName></DefaultName>
+</FormatElement>
+<FormatElement msgid="DateFormatskey6" default="false" type="medium" usage="DATE" formatindex="37">
+<FormatCode>QQ AA</FormatCode>
+<DefaultName></DefaultName>
+</FormatElement>
+<FormatElement msgid="DateFormatskey7" default="false" type="medium" usage="DATE" formatindex="21">
+<FormatCode>DD-MM-AAAA</FormatCode>
+<DefaultName></DefaultName>
+</FormatElement>
+<FormatElement msgid="DateFormatskey8" default="true" type="medium" usage="DATE" formatindex="20">
+<FormatCode>DD-MM-AA</FormatCode>
+<DefaultName></DefaultName>
+</FormatElement>
+<FormatElement msgid="DateFormatskey9" default="true" type="long" usage="DATE" formatindex="19">
+<FormatCode>NNNND "de" MMMM "de" AAAA</FormatCode>
+<DefaultName></DefaultName>
+</FormatElement>
+<FormatElement msgid="DateFormatskey10" default="false" type="long" usage="DATE" formatindex="22">
+<FormatCode>D "de" MMM "de" AA</FormatCode>
+<DefaultName></DefaultName>
+</FormatElement>
+<FormatElement msgid="DateFormatskey11" default="false" type="long" usage="DATE" formatindex="23">
+<FormatCode>D "de" MMM "de" AAAA</FormatCode>
+<DefaultName></DefaultName>
+</FormatElement>
+<FormatElement msgid="DateFormatskey12" default="false" type="long" usage="DATE" formatindex="25">
+<FormatCode>D "de" MMMM "de" AAAA</FormatCode>
+<DefaultName></DefaultName>
+</FormatElement>
+<FormatElement msgid="DateFormatskey13" default="false" type="long" usage="DATE" formatindex="27">
+<FormatCode>NN, D "de" MMM "de" AA</FormatCode>
+<DefaultName></DefaultName>
+</FormatElement>
+<FormatElement msgid="DateFormatskey14" default="false" type="long" usage="DATE" formatindex="29">
+<FormatCode>NN, D "de" MMMM "de" AAAA</FormatCode>
+<DefaultName></DefaultName>
+</FormatElement>
+<FormatElement msgid="DateFormatskey15" default="false" type="long" usage="DATE" formatindex="30">
+<FormatCode>NNNND "de" MMMM "de" AAAA</FormatCode>
+<DefaultName></DefaultName>
+</FormatElement>
+<FormatElement msgid="DateFormatskey16" default="false" type="long" usage="DATE" formatindex="24">
+<FormatCode>D. MMM. AAAA</FormatCode>
+<DefaultName></DefaultName>
+</FormatElement>
+<FormatElement msgid="DateFormatskey17" default="false" type="long" usage="DATE" formatindex="26">
+<FormatCode>D. MMMM AAAA</FormatCode>
+<DefaultName></DefaultName>
+</FormatElement>
+<FormatElement msgid="DateFormatskey18" default="false" type="short" usage="DATE" formatindex="31">
+<FormatCode>MM-DD</FormatCode>
+<DefaultName></DefaultName>
+</FormatElement>
+<FormatElement msgid="DateFormatskey19" default="false" type="medium" usage="DATE" formatindex="32">
+<FormatCode>AA-MM-DD</FormatCode>
+<DefaultName>ISO 8601 (EN 28601)</DefaultName>
+</FormatElement>
+<FormatElement msgid="DateFormatskey20" default="false" type="medium" usage="DATE" formatindex="33">
+<FormatCode>AAAA-MM-DD</FormatCode>
+<DefaultName>ISO 8601 (EN 28601)</DefaultName>
+</FormatElement>
+<FormatElement msgid="DateFormatskey21" default="false" type="medium" usage="DATE" formatindex="38">
+<FormatCode>WW</FormatCode>
+<DefaultName></DefaultName>
+</FormatElement>
+<FormatElement msgid="TimeFormatskey1" default="true" type="short" usage="TIME"  formatindex="39">
+<FormatCode>HH:MM</FormatCode>
+<DefaultName></DefaultName>
+</FormatElement>
+<FormatElement msgid="TimeFormatskey2" default="true" type="medium" usage="TIME"  formatindex="40">
+<FormatCode>HH:MM:SS</FormatCode>
+<DefaultName></DefaultName>
+</FormatElement>
+<FormatElement msgid="TimeFormatskey3" default="false" type="short" usage="TIME"  formatindex="41">
+<FormatCode>HH:MM AM/PM</FormatCode>
+<DefaultName></DefaultName>
+</FormatElement>
+<FormatElement msgid="TimeFormatskey4" default="false" type="medium" usage="TIME"  formatindex="42">
+<FormatCode>HH:MM:SS AM/PM</FormatCode>
+<DefaultName></DefaultName>
+</FormatElement>
+<FormatElement msgid="TimeFormatskey5" default="false" type="medium" usage="TIME"  formatindex="43">
+<FormatCode>[HH]:MM:SS</FormatCode>
+<DefaultName></DefaultName>
+</FormatElement>
+<FormatElement msgid="TimeFormatskey6" default="false" type="short" usage="TIME"  formatindex="44">
+<FormatCode>MM:SS,00</FormatCode>
+<DefaultName></DefaultName>
+</FormatElement>
+<FormatElement msgid="TimeFormatskey7" default="false" type="medium" usage="TIME"  formatindex="45">
+<FormatCode>[HH]:MM:SS,00</FormatCode>
+<DefaultName></DefaultName>
+</FormatElement>
+<FormatElement msgid="DateTimeFormatskey1" default="true" type="medium" usage="DATE_TIME"  formatindex="46">
+<FormatCode>DD-MM-AA HH:MM</FormatCode>
+<DefaultName></DefaultName>
+</FormatElement>
+<FormatElement msgid="DateTimeFormatskey2" default="false" type="medium" usage="DATE_TIME"  formatindex="47">
+<FormatCode>DD-MM-AAAA HH:MM:SS</FormatCode>
+<DefaultName></DefaultName>
+</FormatElement>
+<FormatElement msgid="FixedFormatskey1" default="true" type="medium" usage="FIXED_NUMBER"  formatindex="0">
+<FormatCode>Estandar</FormatCode>
+<DefaultName></DefaultName>
+</FormatElement>
+<FormatElement msgid="FixedFormatskey2" default="true" type="short" usage="FIXED_NUMBER"  formatindex="1">
+<FormatCode>0</FormatCode>
+<DefaultName></DefaultName>
+</FormatElement>
+<FormatElement msgid="FixedFormatskey3" default="false" type="medium" usage="FIXED_NUMBER"  formatindex="2">
+<FormatCode>0,00</FormatCode>
+<DefaultName></DefaultName>
+</FormatElement>
+<FormatElement msgid="FixedFormatskey4" default="false" type="short" usage="FIXED_NUMBER"  formatindex="3">
+<FormatCode>#.##0</FormatCode>
+<DefaultName></DefaultName>
+</FormatElement>
+<FormatElement msgid="FixedFormatskey5" default="false" type="medium" usage="FIXED_NUMBER"  formatindex="4">
+<FormatCode>#.##0,00</FormatCode>
+<DefaultName></DefaultName>
+</FormatElement>
+<FormatElement msgid="FixedFormatskey6" default="false" type="medium" usage="FIXED_NUMBER"  formatindex="5">
+<FormatCode>#.###,00</FormatCode>
+<DefaultName></DefaultName>
+</FormatElement>
+<FormatElement msgid="CurrencyFormatskey1" default="true" type="short" usage="CURRENCY"  formatindex="12">
+<FormatCode>#.##0 [$Kz-816];-#.##0 [$Kz-816]</FormatCode>
+<DefaultName></DefaultName>
+</FormatElement>
+<FormatElement msgid="CurrencyFormatskey2" default="false" type="medium" usage="CURRENCY"  formatindex="13">
+<FormatCode>#.##0,00 [$Kz-816];-#.##0,00 [$Kz-816]</FormatCode>
+<DefaultName></DefaultName>
+</FormatElement>
+<FormatElement msgid="CurrencyFormatskey3" default="false" type="medium" usage="CURRENCY"  formatindex="14">
+<FormatCode>#.##0 [$Kz-816];[RED]-#.##0 [$Kz-816]</FormatCode>
+<DefaultName></DefaultName>
+</FormatElement>
+<FormatElement msgid="CurrencyFormatskey4" default="true" type="medium" usage="CURRENCY"  formatindex="15">
+<FormatCode>#.##0,00 [$Kz-816];[RED]-#.##0,00 [$Kz-816]</FormatCode>
+<DefaultName></DefaultName>
+</FormatElement>
+<FormatElement msgid="CurrencyFormatskey5" default="false" type="medium" usage="CURRENCY"  formatindex="16">
+<FormatCode>#.##0,00 CCC</FormatCode>
+<DefaultName></DefaultName>
+</FormatElement>
+<FormatElement msgid="CurrencyFormatskey6" default="false" type="medium" usage="CURRENCY"  formatindex="17">
+<FormatCode>#.##0,-- [$Kz-816];[RED]-#.##0,-- [$Kz-816]</FormatCode>
+<DefaultName></DefaultName>
+</FormatElement>
+<FormatElement msgid="PercentFormatskey1" default="true" type="short" usage="PERCENT_NUMBER"  formatindex="8">
+<FormatCode>0%</FormatCode>
+<DefaultName></DefaultName>
+</FormatElement>
+<FormatElement msgid="PercentFormatskey2" default="true" type="long" usage="PERCENT_NUMBER"  formatindex="9">
+<FormatCode>0,00%</FormatCode>
+<DefaultName></DefaultName>
+</FormatElement>
+<FormatElement msgid="ScientificFormatskey1" default="true" type="medium" usage="SCIENTIFIC_NUMBER"  formatindex="6">
+<FormatCode>0,00E+000</FormatCode>
+<DefaultName></DefaultName>
+</FormatElement>
+<FormatElement msgid="ScientificFormatskey2" default="false" type="medium" usage="SCIENTIFIC_NUMBER"  formatindex="7">
+<FormatCode>0,00E+00</FormatCode>
+<DefaultName></DefaultName>
+</FormatElement>
+</LC_FORMAT>
+<LC_COLLATION ref="en_US"/>
+<LC_SEARCH ref="en_US"/>
+<LC_INDEX ref="en_US"/>
+<LC_CALENDAR>
+<Calendar unoid="gregorian" default="true">
+<DaysOfWeek>
+<Day>
+<DayID>sun</DayID>
+<DefaultAbbrvName>Dom</DefaultAbbrvName>
+<DefaultFullName>Domingo</DefaultFullName>
+</Day>
+<Day>
+<DayID>mon</DayID>
+<DefaultAbbrvName>Seg</DefaultAbbrvName>
+<DefaultFullName>Segunda-feira</DefaultFullName>
+</Day>
+<Day>
+<DayID>tue</DayID>
+<DefaultAbbrvName>Ter</DefaultAbbrvName>
+<DefaultFullName>Terça-feira</DefaultFullName>
+</Day>
+<Day>
+<DayID>wed</DayID>
+<DefaultAbbrvName>Qua</DefaultAbbrvName>
+<DefaultFullName>Quarta-feira</DefaultFullName>
+</Day>
+<Day>
+<DayID>thu</DayID>
+<DefaultAbbrvName>Qui</DefaultAbbrvName>
+<DefaultFullName>Quinta-feira</DefaultFullName>
+</Day>
+<Day>
+<DayID>fri</DayID>
+<DefaultAbbrvName>Sex</DefaultAbbrvName>
+<DefaultFullName>Sexta-feira</DefaultFullName>
+</Day>
+<Day>
+<DayID>sat</DayID>
+<DefaultAbbrvName>Sáb</DefaultAbbrvName>
+<DefaultFullName>Sábado</DefaultFullName>
+</Day>
+</DaysOfWeek>
+<MonthsOfYear>
+<Month>
+<MonthID>jan</MonthID>
+<DefaultAbbrvName>Jan</DefaultAbbrvName>
+<DefaultFullName>Janeiro</DefaultFullName>
+</Month>
+<Month>
+<MonthID>feb</MonthID>
+<DefaultAbbrvName>Fev</DefaultAbbrvName>
+<DefaultFullName>Fevereiro</DefaultFullName>
+</Month>
+<Month>
+<MonthID>mar</MonthID>
+<DefaultAbbrvName>Mar</DefaultAbbrvName>
+<DefaultFullName>Março</DefaultFullName>
+</Month>
+<Month>
+<MonthID>apr</MonthID>
+<DefaultAbbrvName>Abr</DefaultAbbrvName>
+<DefaultFullName>Abril</DefaultFullName>
+</Month>
+<Month>
+<MonthID>may</MonthID>
+<DefaultAbbrvName>Mai</DefaultAbbrvName>
+<DefaultFullName>Maio</DefaultFullName>
+</Month>
+<Month>
+<MonthID>jun</MonthID>
+<DefaultAbbrvName>Jun</DefaultAbbrvName>
+<DefaultFullName>Junho</DefaultFullName>
+</Month>
+<Month>
+<MonthID>jul</MonthID>
+<DefaultAbbrvName>Jul</DefaultAbbrvName>
+<DefaultFullName>Julho</DefaultFullName>
+</Month>
+<Month>
+<MonthID>aug</MonthID>
+<DefaultAbbrvName>Ago</DefaultAbbrvName>
+<DefaultFullName>Agosto</DefaultFullName>
+</Month>
+<Month>
+<MonthID>sep</MonthID>
+<DefaultAbbrvName>Set</DefaultAbbrvName>
+<DefaultFullName>Setembro</DefaultFullName>
+</Month>
+<Month>
+<MonthID>oct</MonthID>
+<DefaultAbbrvName>Out</DefaultAbbrvName>
+<DefaultFullName>Outubro</DefaultFullName>
+</Month>
+<Month>
+<MonthID>nov</MonthID>
+<DefaultAbbrvName>Nov</DefaultAbbrvName>
+<DefaultFullName>Novembro</DefaultFullName>
+</Month>
+<Month>
+<MonthID>dec</MonthID>
+<DefaultAbbrvName>Dez</DefaultAbbrvName>
+<DefaultFullName>Dezembro</DefaultFullName>
+</Month>
+</MonthsOfYear>
+<Eras>
+<Era>
+<EraID>bc</EraID>
+<DefaultAbbrvName>BC</DefaultAbbrvName>
+<DefaultFullName>BC</DefaultFullName>
+</Era>
+<Era>
+<EraID>ad</EraID>
+<DefaultAbbrvName>AD</DefaultAbbrvName>
+<DefaultFullName>AD</DefaultFullName>
+</Era>
+</Eras>
+<StartDayOfWeek>
+<DayID>mon</DayID>
+</StartDayOfWeek>
+<MinimalDaysInFirstWeek>1</MinimalDaysInFirstWeek>
+</Calendar>
+</LC_CALENDAR>
+<LC_CURRENCY>
+<Currency default="true" usedInCompatibleFormatCodes="true">
+<CurrencyID>AOA</CurrencyID>
+<CurrencySymbol>Kz</CurrencySymbol>
+<BankSymbol>AOA</BankSymbol>
+<CurrencyName>Kwanza</CurrencyName>
+<DecimalPlaces>2</DecimalPlaces>
+</Currency>
+</LC_CURRENCY>
+<LC_TRANSLITERATION ref="en_US"/>
+<LC_MISC>
+<ReservedWords>
+<trueWord>verdadeiro</trueWord>
+<falseWord>falso</falseWord>
+<quarter1Word>1º trimestre</quarter1Word>
+<quarter2Word>2º trimestre</quarter2Word>
+<quarter3Word>3º trimestre</quarter3Word>
+<quarter4Word>4º trimestre</quarter4Word>
+<aboveWord>acima</aboveWord>
+<belowWord>abaixo</belowWord>
+<quarter1Abbreviation>T1</quarter1Abbreviation>
+<quarter2Abbreviation>T2</quarter2Abbreviation>
+<quarter3Abbreviation>T3</quarter3Abbreviation>
+<quarter4Abbreviation>T4</quarter4Abbreviation>
+</ReservedWords>
+</LC_MISC>
+<LC_NumberingLevel ref="en_US"/>
+<LC_OutLineNumberingLevel ref="en_US"/>
+</Locale>
diff --git a/i18npool/source/localedata/localedata.cxx b/i18npool/source/localedata/localedata.cxx
index 5c04a124bf24..d011865a7e35 100644
--- a/i18npool/source/localedata/localedata.cxx
+++ b/i18npool/source/localedata/localedata.cxx
@@ -255,7 +255,8 @@ static const struct {
     { "ur_PK",  lcl_DATA_OTHERS },
     { "ht_HT",  lcl_DATA_OTHERS },
     { "jbo",    lcl_DATA_OTHERS },
-    { "kab_DZ", lcl_DATA_OTHERS }
+    { "kab_DZ", lcl_DATA_OTHERS },
+    { "pt_AO",  lcl_DATA_OTHERS }
 };
 
 static const sal_Unicode under = sal_Unicode('_');
diff --git a/i18npool/source/transliteration/transliterationImpl.cxx b/i18npool/source/transliteration/transliterationImpl.cxx
index f2cf31e79308..c900f2f3636f 100644
--- a/i18npool/source/transliteration/transliterationImpl.cxx
+++ b/i18npool/source/transliteration/transliterationImpl.cxx
@@ -44,6 +44,8 @@
 #include <rtl/ustring.hxx>
 #include <rtl/ustrbuf.hxx>
 
+#include <algorithm>
+
 #if OSL_DEBUG_LEVEL > 1
 #include <stdio.h>
 #endif
@@ -476,24 +478,25 @@ TransliterationImpl::equals(
 
     OUString tmpStr1 = folding(str1, pos1, nCount1, offset1);
     OUString tmpStr2 = folding(str2, pos2, nCount2, offset2);
+    // Length of offset1 and offset2 may still be 0 if there was no folding
+    // necessary!
 
     const sal_Unicode *p1 = tmpStr1.getStr();
     const sal_Unicode *p2 = tmpStr2.getStr();
-    sal_Int32 i, nLen = (tmpStr1.getLength() < tmpStr1.getLength() ?
-                        tmpStr1.getLength() : tmpStr2.getLength());
+    sal_Int32 i, nLen = ::std::min( tmpStr1.getLength(), tmpStr2.getLength());
     for (i = 0; i < nLen; ++i, ++p1, ++p2 ) {
         if (*p1 != *p2) {
             // return number of matched code points so far
-            nMatch1 = offset1[i];
-            nMatch2 = offset2[i];
+            nMatch1 = (i < offset1.getLength()) ? offset1[i] : i;
+            nMatch2 = (i < offset2.getLength()) ? offset2[i] : i;
             return sal_False;
         }
     }
     // i==nLen
     if ( tmpStr1.getLength() != tmpStr2.getLength() ) {
         // return number of matched code points so far
-        nMatch1 = offset1[i-1] + 1;
-        nMatch2 = offset2[i-1] + 1;
+        nMatch1 = (i <= offset1.getLength()) ? offset1[i-1] + 1 : i;
+        nMatch2 = (i <= offset2.getLength()) ? offset2[i-1] + 1 : i;
         return sal_False;
     } else {
         nMatch1 = nCount1;
diff --git a/l10ntools/source/directory.cxx b/l10ntools/source/directory.cxx
index fbb9bcd53c6f..97be7c2332fb 100644
--- a/l10ntools/source/directory.cxx
+++ b/l10ntools/source/directory.cxx
@@ -194,20 +194,33 @@ void Directory::readDirectory( const rtl::OUString& sFullpath )
     if( sFullpath.getLength() < 1 ) return;
 
     rtl::OString   sFullpathext = rtl::OUStringToOString( sFullpath , RTL_TEXTENCODING_UTF8 );
-    const char*    path         = sFullpathext.getStr();
 
     // stat
-    if( stat( path  , &statbuf ) < 0 ){   printf("warning: Can not stat %s" , path ); return; }
+    if( stat( sFullpathext.getStr(), &statbuf ) < 0 )
+    {
+        printf("warning: Can not stat %s" , sFullpathext.getStr() );
+        return;
+    }
+
+    if( S_ISDIR(statbuf.st_mode ) == 0 )
+        return;
 
-    if( S_ISDIR(statbuf.st_mode ) == 0 ) {  return; }
+    if( (dir = opendir( sFullpathext.getStr() ) ) == NULL  )
+    {
+        printf("readerror 2 in %s \n",sFullpathext.getStr());
+        return;
+    }
 
-    if( (dir = opendir( path ) ) == NULL  ) {printf("readerror 2 in %s \n",path); return; }
     dirholder aHolder(dir);
 
     const rtl::OString sDot ( "." ) ;
     const rtl::OString sDDot( ".." );
 
-    if ( chdir( path ) == -1 ) { printf("chdir error in %s \n",path); return; }
+    if ( chdir( sFullpathext.getStr() ) == -1 )
+    {
+        printf("chdir error in %s \n",sFullpathext.getStr());
+        return;
+    }
 
     sFullpathext += rtl::OString( "/" );
 
@@ -261,8 +274,14 @@ void Directory::readDirectory( const rtl::OUString& sFullpath )
                          }
         }
     }
-    if ( chdir( ".." ) == -1 ) { printf("chdir error in .. \n"); return; }
-    if( aHolder.close() < 0 )   return ;
+    if ( chdir( ".." ) == -1 )
+    {
+        printf("chdir error in .. \n");
+        return;
+    }
+
+    if ( aHolder.close() < 0 )
+        return;
 
     std::sort( aFileVec.begin() , aFileVec.end() , File::lessFile );
     std::sort( aDirVec.begin()  , aDirVec.end()  , Directory::lessDir  );
diff --git a/padmin/Executable_spadmin.bin.mk b/padmin/Executable_spadmin.bin.mk
index 5f958d406965..bcb69b28e748 100644
--- a/padmin/Executable_spadmin.bin.mk
+++ b/padmin/Executable_spadmin.bin.mk
@@ -52,6 +52,7 @@ $(eval $(call gb_Executable_add_linked_libs,spadmin.bin,\
     cppuhelper \
     cppu \
     sal \
+    $(gb_STDLIBS) \
 ))
 
 $(eval $(call gb_Executable_add_exception_objects,spadmin.bin,\
diff --git a/padmin/Library_spa.mk b/padmin/Library_spa.mk
index 82b3e4e8a45d..3cd9dc7c271e 100644
--- a/padmin/Library_spa.mk
+++ b/padmin/Library_spa.mk
@@ -47,6 +47,7 @@ $(eval $(call gb_Library_add_linked_libs,spa,\
     i18nisolang1 \
     cppu \
     sal \
+    $(gb_STDLIBS) \
 ))
 
 
diff --git a/svl/inc/svl/nfkeytab.hxx b/svl/inc/svl/nfkeytab.hxx
index 68acf61ebb1f..4fe3fd2e2df6 100644
--- a/svl/inc/svl/nfkeytab.hxx
+++ b/svl/inc/svl/nfkeytab.hxx
@@ -29,6 +29,7 @@
 #ifndef INCLUDED_SVTOOLS_NFKEYTAB_HXX
 #define INCLUDED_SVTOOLS_NFKEYTAB_HXX
 
+#include <vector>
 #include <tools/string.hxx>
 
 //! For ImpSvNumberformatScan: first the short symbols, then the long symbols!
@@ -112,7 +113,18 @@ enum NfKeywordIndex
     NF_KEYWORD_ENTRIES_COUNT
 };
 
-typedef String NfKeywordTable [NF_KEYWORD_ENTRIES_COUNT];
+class NfKeywordTable
+{
+    typedef ::std::vector<String> Keywords_t;
+    Keywords_t m_keywords;
+
+public:
+    NfKeywordTable() : m_keywords(NF_KEYWORD_ENTRIES_COUNT) {};
+    virtual ~NfKeywordTable() {}
+
+    String & operator[] (Keywords_t::size_type n) { return m_keywords[n]; }
+    const String & operator[] (Keywords_t::size_type n) const { return m_keywords[n]; }
+};
 
 #endif // INCLUDED_SVTOOLS_NFKEYTAB_HXX
 
diff --git a/svl/inc/svl/undo.hxx b/svl/inc/svl/undo.hxx
index e3f964864eb8..4e18504fbfc7 100644
--- a/svl/inc/svl/undo.hxx
+++ b/svl/inc/svl/undo.hxx
@@ -36,6 +36,7 @@
 #include <boost/scoped_ptr.hpp>
 
 #include <vector>
+#include <limits>
 
 //====================================================================
 
diff --git a/svl/source/items/cenumitm.cxx b/svl/source/items/cenumitm.cxx
index 1c302f962431..03f3ae784da9 100644
--- a/svl/source/items/cenumitm.cxx
+++ b/svl/source/items/cenumitm.cxx
@@ -287,8 +287,8 @@ UniString CntBoolItem::GetValueTextByVal(sal_Bool bTheValue) const
 {
     return
         bTheValue ?
-            UniString::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("sal_True")) :
-            UniString::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("sal_False"));
+            UniString::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("TRUE")) :
+            UniString::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("FALSE"));
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svl/source/items/visitem.cxx b/svl/source/items/visitem.cxx
index 13f19a48800e..599709d70938 100644
--- a/svl/source/items/visitem.cxx
+++ b/svl/source/items/visitem.cxx
@@ -141,8 +141,8 @@ UniString SfxVisibilityItem::GetValueTextByVal(sal_Bool bTheValue) const
 {
     return
         bTheValue ?
-            UniString::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("sal_True")) :
-            UniString::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("sal_False"));
+            UniString::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("TRUE")) :
+            UniString::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("FALSE"));
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx
index c95f212ba976..b4611b79babf 100644
--- a/svl/source/numbers/zforlist.cxx
+++ b/svl/source/numbers/zforlist.cxx
@@ -951,10 +951,10 @@ void SvNumberFormatter::FillKeywordTable( NfKeywordTable& rKeywords,
         LanguageType eLang )
 {
     ChangeIntl( eLang );
-    const String* pTable = pFormatScanner->GetKeywords();
+    const NfKeywordTable & rTable = pFormatScanner->GetKeywords();
     for ( sal_uInt16 i = 0; i < NF_KEYWORD_ENTRIES_COUNT; ++i )
     {
-        rKeywords[i] = pTable[i];
+        rKeywords[i] = rTable[i];
     }
 }
 
@@ -962,9 +962,9 @@ void SvNumberFormatter::FillKeywordTable( NfKeywordTable& rKeywords,
 String SvNumberFormatter::GetKeyword( LanguageType eLnge, sal_uInt16 nIndex )
 {
     ChangeIntl(eLnge);
-    const String* pTable = pFormatScanner->GetKeywords();
-    if ( pTable && nIndex < NF_KEYWORD_ENTRIES_COUNT )
-        return pTable[nIndex];
+    const NfKeywordTable & rTable = pFormatScanner->GetKeywords();
+    if ( nIndex < NF_KEYWORD_ENTRIES_COUNT )
+        return rTable[nIndex];
 
     OSL_FAIL("GetKeyword: invalid index");
     return String();
@@ -2613,8 +2613,8 @@ void SvNumberFormatter::ImpGenerateFormats( sal_uInt32 CLOffset, sal_Bool bLoadi
         CLOffset + SetIndexTable( NF_FRACTION_4, ZF_STANDARD_FRACTION+3 ));
 
     // Week of year   must be appended here because of nNewExtended
-    const String* pKeyword = pFormatScanner->GetKeywords();
-    aSingleFormatCode.Code = pKeyword[NF_KEY_WW];
+    const NfKeywordTable & rKeyword = pFormatScanner->GetKeywords();
+    aSingleFormatCode.Code = rKeyword[NF_KEY_WW];
     ImpInsertNewStandardFormat( aSingleFormatCode,
         CLOffset + SetIndexTable( NF_DATE_WW, nNewExtended++ ),
         SV_NUMBERFORMATTER_VERSION_NF_DATE_WW );
diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx
index 421cc8769f16..990b7e261172 100644
--- a/svl/source/numbers/zformat.cxx
+++ b/svl/source/numbers/zformat.cxx
@@ -1219,7 +1219,7 @@ short SvNumberformat::ImpNextSymbol(String& rString,
     xub_StrLen nLen = rString.Len();
     ScanState eState = SsStart;
     sSymbol.Erase();
-    const String* pKeywords = rScan.GetKeywords();
+    const NfKeywordTable & rKeywords = rScan.GetKeywords();
     while (nPos < nLen && eState != SsStop)
     {
         cToken = rString.GetChar(nPos);
@@ -1347,9 +1347,9 @@ short SvNumberformat::ImpNextSymbol(String& rString,
                                 BRACKET_SYMBOLTYPE_DBNUM1 - (cDBNum - '1'));
                             eState = SsGetPrefix;
                         }
-                        else if (cUpper == pKeywords[NF_KEY_H].GetChar(0)   ||  // H
-                            cUpper == pKeywords[NF_KEY_MI].GetChar(0)   ||  // M
-                            cUpper == pKeywords[NF_KEY_S].GetChar(0)    )   // S
+                        else if (cUpper == rKeywords[NF_KEY_H].GetChar(0)   ||  // H
+                            cUpper == rKeywords[NF_KEY_MI].GetChar(0)   ||  // M
+                            cUpper == rKeywords[NF_KEY_S].GetChar(0)    )   // S
                         {
                             sSymbol += cToken;
                             eState = SsGetTime;
@@ -1386,9 +1386,9 @@ short SvNumberformat::ImpNextSymbol(String& rString,
                 else
                 {
                     sal_Unicode cUpper = rChrCls().toUpper( rString, nPos-1, 1 ).GetChar(0);
-                    if (cUpper == pKeywords[NF_KEY_H].GetChar(0)    ||  // H
-                        cUpper == pKeywords[NF_KEY_MI].GetChar(0)   ||  // M
-                        cUpper == pKeywords[NF_KEY_S].GetChar(0)    )   // S
+                    if (cUpper == rKeywords[NF_KEY_H].GetChar(0)    ||  // H
+                        cUpper == rKeywords[NF_KEY_MI].GetChar(0)   ||  // M
+                        cUpper == rKeywords[NF_KEY_S].GetChar(0)    )   // S
                     {
                         if (cLetter == cToken)
                         {
@@ -4345,10 +4345,10 @@ String SvNumberformat::GetMappedFormatstring(
         const String& rColorName = NumFor[n].GetColorName();
         if ( rColorName.Len() )
         {
-            const String* pKey = rScan.GetKeywords() + NF_KEY_FIRSTCOLOR;
-            for ( int j=NF_KEY_FIRSTCOLOR; j<=NF_KEY_LASTCOLOR; j++, pKey++ )
+            const NfKeywordTable & rKey = rScan.GetKeywords();
+            for ( int j=NF_KEY_FIRSTCOLOR; j<=NF_KEY_LASTCOLOR; j++ )
             {
-                if ( *pKey == rColorName )
+                if ( rKey[j] == rColorName )
                 {
                     aPrefix += '[';
                     aPrefix += rKeywords[j];
diff --git a/svl/source/numbers/zforscan.cxx b/svl/source/numbers/zforscan.cxx
index 46f5951de7bd..9eee6a55c823 100644
--- a/svl/source/numbers/zforscan.cxx
+++ b/svl/source/numbers/zforscan.cxx
@@ -143,7 +143,7 @@ void ImpSvNumberformatScan::InitSpecialKeyword( NfKeywordIndex eIdx ) const
             if ( !sKeyword[NF_KEY_TRUE].Len() )
             {
                 DBG_ERRORFILE( "InitSpecialKeyword: TRUE_WORD?" );
-                ((ImpSvNumberformatScan*)this)->sKeyword[NF_KEY_TRUE].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "sal_True" ) );
+                ((ImpSvNumberformatScan*)this)->sKeyword[NF_KEY_TRUE].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "TRUE" ) );
             }
         break;
         case NF_KEY_FALSE :
@@ -153,7 +153,7 @@ void ImpSvNumberformatScan::InitSpecialKeyword( NfKeywordIndex eIdx ) const
             if ( !sKeyword[NF_KEY_FALSE].Len() )
             {
                 DBG_ERRORFILE( "InitSpecialKeyword: FALSE_WORD?" );
-                ((ImpSvNumberformatScan*)this)->sKeyword[NF_KEY_FALSE].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "sal_False" ) );
+                ((ImpSvNumberformatScan*)this)->sKeyword[NF_KEY_FALSE].AssignAscii( RTL_CONSTASCII_STRINGPARAM( "FALSE" ) );
             }
         break;
         default:
@@ -465,10 +465,10 @@ void ImpSvNumberformatScan::ChangeStandardPrec(sal_uInt16 nPrec)
 Color* ImpSvNumberformatScan::GetColor(String& sStr)
 {
     String sString = pFormatter->GetCharClass()->upper(sStr);
-    const String* pKeyword = GetKeywords();
+    const NfKeywordTable & rKeyword = GetKeywords();
     size_t i = 0;
     while (i < NF_MAX_DEFAULT_COLORS &&
-           sString != pKeyword[NF_KEY_FIRSTCOLOR+i] )
+           sString != rKeyword[NF_KEY_FIRSTCOLOR+i] )
         i++;
     if ( i >= NF_MAX_DEFAULT_COLORS )
     {
@@ -484,7 +484,7 @@ Color* ImpSvNumberformatScan::GetColor(String& sStr)
     Color* pResult = NULL;
     if (i >= NF_MAX_DEFAULT_COLORS)
     {
-        const String& rColorWord = pKeyword[NF_KEY_COLOR];
+        const String& rColorWord = rKeyword[NF_KEY_COLOR];
         xub_StrLen nPos = sString.Match(rColorWord);
         if (nPos > 0)
         {
@@ -521,7 +521,7 @@ Color* ImpSvNumberformatScan::GetColor(String& sStr)
             pFormatter->ChangeIntl(eTmpLnge);
         }
         else
-            sStr = pKeyword[NF_KEY_FIRSTCOLOR+i];
+            sStr = rKeyword[NF_KEY_FIRSTCOLOR+i];
 
         pResult = &(StandardColor[i]);
     }
@@ -531,16 +531,16 @@ Color* ImpSvNumberformatScan::GetColor(String& sStr)
 short ImpSvNumberformatScan::GetKeyWord( const String& sSymbol, xub_StrLen nPos )
 {
     String sString = pFormatter->GetCharClass()->toUpper( sSymbol, nPos, sSymbol.Len() - nPos );
-    const String* pKeyword = GetKeywords();
+    const NfKeywordTable & rKeyword = GetKeywords();
     // #77026# for the Xcl perverts: the GENERAL keyword is recognized anywhere
-    if ( sString.Search( pKeyword[NF_KEY_GENERAL] ) == 0 )
+    if ( sString.Search( rKeyword[NF_KEY_GENERAL] ) == 0 )
         return NF_KEY_GENERAL;
     //! MUST be a reverse search to find longer strings first
     short i = NF_KEYWORD_ENTRIES_COUNT-1;
     sal_Bool bFound = sal_False;
     for ( ; i > NF_KEY_LASTKEYWORD_SO5; --i )
     {
-        bFound = sString.Search(pKeyword[i]) == 0;
+        bFound = sString.Search(rKeyword[i]) == 0;
         if ( bFound )
         {
             break;
@@ -550,15 +550,15 @@ short ImpSvNumberformatScan::GetKeyWord( const String& sSymbol, xub_StrLen nPos
     if ( !bFound )
     {   // skip the gap of colors et al between new and old keywords and search on
         i = NF_KEY_LASTKEYWORD;
-        while ( i > 0 && sString.Search(pKeyword[i]) != 0 )
+        while ( i > 0 && sString.Search(rKeyword[i]) != 0 )
             i--;
-        if ( i > NF_KEY_LASTOLDKEYWORD && sString != pKeyword[i] )
+        if ( i > NF_KEY_LASTOLDKEYWORD && sString != rKeyword[i] )
         {   // found something, but maybe it's something else?
             // e.g. new NNN is found in NNNN, for NNNN we must search on
             short j = i - 1;
-            while ( j > 0 && sString.Search(pKeyword[j]) != 0 )
+            while ( j > 0 && sString.Search(rKeyword[j]) != 0 )
                 j--;
-            if ( j && pKeyword[j].Len() > pKeyword[i].Len() )
+            if ( j && rKeyword[j].Len() > rKeyword[i].Len() )
                 return j;
         }
     }
diff --git a/svl/source/numbers/zforscan.hxx b/svl/source/numbers/zforscan.hxx
index 6ea2055efe59..3aa279c3ee46 100644
--- a/svl/source/numbers/zforscan.hxx
+++ b/svl/source/numbers/zforscan.hxx
@@ -67,7 +67,7 @@ public:
     const LocaleDataWrapper& GetLoc() const     { return *pFormatter->GetLocaleData(); }
     CalendarWrapper& GetCal() const             { return *pFormatter->GetCalendar(); }
 
-    const String* GetKeywords() const
+    const NfKeywordTable & GetKeywords() const
         {
             if ( bKeywordsNeedInit )
                 InitKeywords();
diff --git a/svtools/AllLangResTarget_svt.mk b/svtools/AllLangResTarget_svt.mk
index 71dfd1801c29..52bed245f66d 100644
--- a/svtools/AllLangResTarget_svt.mk
+++ b/svtools/AllLangResTarget_svt.mk
@@ -56,7 +56,7 @@ $(eval $(call gb_SrsTarget_add_files,svt/res,\
     svtools/source/dialogs/prnsetup.src \
     svtools/source/dialogs/so3res.src \
     svtools/source/dialogs/wizardmachine.src \
-    svtools/source/filter.vcl/filter/exportdialog.src \
+    svtools/source/filter/exportdialog.src \
     svtools/source/java/javaerror.src \
     svtools/source/misc/ehdl.src \
     svtools/source/misc/helpagent.src \
diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk
index 11e658641ac6..def31f0d121f 100644
--- a/svtools/Library_svt.mk
+++ b/svtools/Library_svt.mk
@@ -34,6 +34,7 @@ $(eval $(call gb_Library_add_precompiled_header,svt,$(SRCDIR)/svtools/inc/pch/pr
 $(eval $(call gb_Library_set_componentfile,svt,svtools/util/svt))
 
 $(eval $(call gb_Library_set_include,svt,\
+    -I$(OUTDIR)/inc/external/jpeg \
     $$(INCLUDE) \
     -I$(WORKDIR)/inc/svtools \
     -I$(WORKDIR)/inc/ \
@@ -43,7 +44,6 @@ $(eval $(call gb_Library_set_include,svt,\
     -I$(realpath $(SRCDIR)/svtools/source/inc) \
     -I$(realpath $(SRCDIR)/svtools/inc/pch) \
     -I$(OUTDIR)/inc/offuh \
-    -I$(OUTDIR)/inc \
 ))
 
 $(eval $(call gb_Library_set_defs,svt,\
@@ -173,27 +173,27 @@ $(eval $(call gb_Library_add_exception_objects,svt,\
     svtools/source/edit/textwindowpeer \
     svtools/source/edit/txtattr \
     svtools/source/edit/xtextedt \
-    svtools/source/filter.vcl/filter/FilterConfigCache \
-    svtools/source/filter.vcl/filter/FilterConfigItem \
-    svtools/source/filter.vcl/filter/SvFilterOptionsDialog \
-    svtools/source/filter.vcl/filter/exportdialog \
-    svtools/source/filter.vcl/filter/filter \
-    svtools/source/filter.vcl/filter/filter2 \
-    svtools/source/filter.vcl/filter/sgfbram \
-    svtools/source/filter.vcl/filter/sgvmain \
-    svtools/source/filter.vcl/filter/sgvspln \
-    svtools/source/filter.vcl/filter/sgvtext \
-    svtools/source/filter.vcl/igif/decode \
-    svtools/source/filter.vcl/igif/gifread \
-    svtools/source/filter.vcl/ixbm/xbmread \
-    svtools/source/filter.vcl/ixpm/xpmread \
-    svtools/source/filter.vcl/jpeg/jpeg \
-    svtools/source/filter.vcl/wmf/emfwr \
-    svtools/source/filter.vcl/wmf/enhwmf \
-    svtools/source/filter.vcl/wmf/winmtf \
-    svtools/source/filter.vcl/wmf/winwmf \
-    svtools/source/filter.vcl/wmf/wmf \
-    svtools/source/filter.vcl/wmf/wmfwr \
+    svtools/source/filter/FilterConfigCache \
+    svtools/source/filter/FilterConfigItem \
+    svtools/source/filter/SvFilterOptionsDialog \
+    svtools/source/filter/exportdialog \
+    svtools/source/filter/filter \
+    svtools/source/filter/filter2 \
+    svtools/source/filter/sgfbram \
+    svtools/source/filter/sgvmain \
+    svtools/source/filter/sgvspln \
+    svtools/source/filter/sgvtext \
+    svtools/source/filter/igif/decode \
+    svtools/source/filter/igif/gifread \
+    svtools/source/filter/ixbm/xbmread \
+    svtools/source/filter/ixpm/xpmread \
+    svtools/source/filter/jpeg/jpeg \
+    svtools/source/filter/wmf/emfwr \
+    svtools/source/filter/wmf/enhwmf \
+    svtools/source/filter/wmf/winmtf \
+    svtools/source/filter/wmf/winwmf \
+    svtools/source/filter/wmf/wmf \
+    svtools/source/filter/wmf/wmfwr \
     svtools/source/graphic/descriptor \
     svtools/source/graphic/graphic \
     svtools/source/graphic/graphicunofactory \
@@ -289,7 +289,7 @@ $(eval $(call gb_Library_add_exception_objects,svt,\
 ))
 
 $(eval $(call gb_Library_add_cobjects,svt,\
-    svtools/source/filter.vcl/jpeg/jpegc \
+    svtools/source/filter/jpeg/jpegc \
 ))
 
 ifeq ($(OS),WNT)
diff --git a/svtools/inc/svtools/filter.hxx b/svtools/inc/svtools/filter.hxx
index 446bbcfeb2a8..4ea0bce85ee0 100644
--- a/svtools/inc/svtools/filter.hxx
+++ b/svtools/inc/svtools/filter.hxx
@@ -85,6 +85,7 @@ class Graphic;
 #define IMP_JPEG                "SVIJPEG"
 #define IMP_XBM                 "SVIXBM"
 #define IMP_XPM                 "SVIXPM"
+#define IMP_SVG                 "SVISVG"
 #define EXP_BMP                 "SVBMP"
 #define EXP_SVMETAFILE          "SVMETAFILE"
 #define EXP_WMF                 "SVWMF"
@@ -103,6 +104,7 @@ class Graphic;
 #define TIF_SHORTNAME           "TIF"
 #define WMF_SHORTNAME           "WMF"
 #define EMF_SHORTNAME           "EMF"
+#define SVG_SHORTNAME           "SVG"
 
 // ------------------------------------
 // - Info-Klasse fuer alle von uns
@@ -134,6 +136,7 @@ class Graphic;
 #define GFF_WMF ( (sal_uInt16)0x00f6 )
 #define GFF_SGV ( (sal_uInt16)0x00f7 )
 #define GFF_EMF ( (sal_uInt16)0x00f8 )
+#define GFF_SVG ( (sal_uInt16)0x00f9 )
 #define GFF_XXX ( (sal_uInt16)0xffff )
 
 // ---------------------
@@ -155,30 +158,31 @@ class SVT_DLLPUBLIC GraphicDescriptor
 
     void                ImpConstruct();
 
-    sal_Bool                ImpDetectBMP( SvStream& rStm, sal_Bool bExtendedInfo );
-    sal_Bool                ImpDetectGIF( SvStream& rStm, sal_Bool bExtendedInfo );
-    sal_Bool                ImpDetectJPG( SvStream& rStm, sal_Bool bExtendedInfo );
-    sal_Bool                ImpDetectPCD( SvStream& rStm, sal_Bool bExtendedInfo );
-    sal_Bool                ImpDetectPCX( SvStream& rStm, sal_Bool bExtendedInfo );
-    sal_Bool                ImpDetectPNG( SvStream& rStm, sal_Bool bExtendedInfo );
-    sal_Bool                ImpDetectTIF( SvStream& rStm, sal_Bool bExtendedInfo );
-    sal_Bool                ImpDetectXBM( SvStream& rStm, sal_Bool bExtendedInfo );
-    sal_Bool                ImpDetectXPM( SvStream& rStm, sal_Bool bExtendedInfo );
-    sal_Bool                ImpDetectPBM( SvStream& rStm, sal_Bool bExtendedInfo );
-    sal_Bool                ImpDetectPGM( SvStream& rStm, sal_Bool bExtendedInfo );
-    sal_Bool                ImpDetectPPM( SvStream& rStm, sal_Bool bExtendedInfo );
-    sal_Bool                ImpDetectRAS( SvStream& rStm, sal_Bool bExtendedInfo );
-    sal_Bool                ImpDetectTGA( SvStream& rStm, sal_Bool bExtendedInfo );
-    sal_Bool                ImpDetectPSD( SvStream& rStm, sal_Bool bExtendedInfo );
-    sal_Bool                ImpDetectEPS( SvStream& rStm, sal_Bool bExtendedInfo );
-    sal_Bool                ImpDetectDXF( SvStream& rStm, sal_Bool bExtendedInfo );
-    sal_Bool                ImpDetectMET( SvStream& rStm, sal_Bool bExtendedInfo );
-    sal_Bool                ImpDetectPCT( SvStream& rStm, sal_Bool bExtendedInfo );
-    sal_Bool                ImpDetectSGF( SvStream& rStm, sal_Bool bExtendedInfo );
-    sal_Bool                ImpDetectSVM( SvStream& rStm, sal_Bool bExtendedInfo );
-    sal_Bool                ImpDetectWMF( SvStream& rStm, sal_Bool bExtendedInfo );
-    sal_Bool                ImpDetectSGV( SvStream& rStm, sal_Bool bExtendedInfo );
-    sal_Bool                ImpDetectEMF( SvStream& rStm, sal_Bool bExtendedInfo );
+    sal_Bool            ImpDetectBMP( SvStream& rStm, sal_Bool bExtendedInfo );
+    sal_Bool            ImpDetectGIF( SvStream& rStm, sal_Bool bExtendedInfo );
+    sal_Bool            ImpDetectJPG( SvStream& rStm, sal_Bool bExtendedInfo );
+    sal_Bool            ImpDetectPCD( SvStream& rStm, sal_Bool bExtendedInfo );
+    sal_Bool            ImpDetectPCX( SvStream& rStm, sal_Bool bExtendedInfo );
+    sal_Bool            ImpDetectPNG( SvStream& rStm, sal_Bool bExtendedInfo );
+    sal_Bool            ImpDetectTIF( SvStream& rStm, sal_Bool bExtendedInfo );
+    sal_Bool            ImpDetectXBM( SvStream& rStm, sal_Bool bExtendedInfo );
+    sal_Bool            ImpDetectXPM( SvStream& rStm, sal_Bool bExtendedInfo );
+    sal_Bool            ImpDetectPBM( SvStream& rStm, sal_Bool bExtendedInfo );
+    sal_Bool            ImpDetectPGM( SvStream& rStm, sal_Bool bExtendedInfo );
+    sal_Bool            ImpDetectPPM( SvStream& rStm, sal_Bool bExtendedInfo );
+    sal_Bool            ImpDetectRAS( SvStream& rStm, sal_Bool bExtendedInfo );
+    sal_Bool            ImpDetectTGA( SvStream& rStm, sal_Bool bExtendedInfo );
+    sal_Bool            ImpDetectPSD( SvStream& rStm, sal_Bool bExtendedInfo );
+    sal_Bool            ImpDetectEPS( SvStream& rStm, sal_Bool bExtendedInfo );
+    sal_Bool            ImpDetectDXF( SvStream& rStm, sal_Bool bExtendedInfo );
+    sal_Bool            ImpDetectMET( SvStream& rStm, sal_Bool bExtendedInfo );
+    sal_Bool            ImpDetectPCT( SvStream& rStm, sal_Bool bExtendedInfo );
+    sal_Bool            ImpDetectSGF( SvStream& rStm, sal_Bool bExtendedInfo );
+    sal_Bool            ImpDetectSVM( SvStream& rStm, sal_Bool bExtendedInfo );
+    sal_Bool            ImpDetectWMF( SvStream& rStm, sal_Bool bExtendedInfo );
+    sal_Bool            ImpDetectSGV( SvStream& rStm, sal_Bool bExtendedInfo );
+    sal_Bool            ImpDetectEMF( SvStream& rStm, sal_Bool bExtendedInfo );
+    sal_Bool            ImpDetectSVG( SvStream& rStm, sal_Bool bExtendedInfo );
     GraphicDescriptor( const GraphicDescriptor& );
     GraphicDescriptor& operator=( const GraphicDescriptor& );
 
diff --git a/svtools/inc/svtools/grfmgr.hxx b/svtools/inc/svtools/grfmgr.hxx
index d3fcc9800c88..c99ea7a55bcd 100644
--- a/svtools/inc/svtools/grfmgr.hxx
+++ b/svtools/inc/svtools/grfmgr.hxx
@@ -214,14 +214,16 @@ private:
     sal_uLong                   mnAnimationLoopCount;
     void*                   mpDummy1;
     void*                   mpDummy2;
-    sal_Bool                    mbAutoSwapped   : 1;
-    sal_Bool                    mbTransparent   : 1;
-    sal_Bool                    mbAnimated      : 1;
-    sal_Bool                    mbEPS           : 1;
-    sal_Bool                    mbIsInSwapIn    : 1;
-    sal_Bool                    mbIsInSwapOut   : 1;
-    sal_Bool                    mbAlpha         : 1;
-    sal_Bool                    mbDummyFlag8    : 1;
+    sal_Bool                mbAutoSwapped   : 1;
+    sal_Bool                mbTransparent   : 1;
+    sal_Bool                mbAnimated      : 1;
+    sal_Bool                mbEPS           : 1;
+    sal_Bool                mbIsInSwapIn    : 1;
+    sal_Bool                mbIsInSwapOut   : 1;
+    sal_Bool                mbAlpha         : 1;
+    sal_Bool                mbDummyFlag8    : 1;
+    sal_Bool                mbIsRenderGraphic   : 1;
+    sal_Bool                mbHasRenderGraphic  : 1;
 
     void                    SVT_DLLPRIVATE ImplConstruct();
     void                    SVT_DLLPRIVATE ImplAssignGraphicData();
@@ -397,12 +399,14 @@ public:
     GraphicType             GetType() const { return meType; }
     const Size&             GetPrefSize() const { return maPrefSize; }
     const MapMode&          GetPrefMapMode() const { return maPrefMapMode; }
-    sal_uLong                   GetSizeBytes() const { return mnSizeBytes; }
-    sal_uLong                   GetChecksum() const;
-    sal_Bool                    IsTransparent() const { return mbTransparent; }
-    sal_Bool                    IsAlpha() const { return mbAlpha; }
-    sal_Bool                    IsAnimated() const { return mbAnimated; }
-    sal_Bool                    IsEPS() const { return mbEPS; }
+    sal_uLong               GetSizeBytes() const { return mnSizeBytes; }
+    sal_uLong               GetChecksum() const;
+    sal_Bool                IsTransparent() const { return mbTransparent; }
+    sal_Bool                IsAlpha() const { return mbAlpha; }
+    sal_Bool                IsAnimated() const { return mbAnimated; }
+    sal_Bool                IsEPS() const { return mbEPS; }
+    sal_Bool                IsRenderGraphic() const { return mbIsRenderGraphic; }
+    sal_Bool                HasRenderGraphic() const { return mbHasRenderGraphic; }
 
     void                    ResetAnimationLoopCount();
     List*                   GetAnimationInfoList() const;
@@ -570,4 +574,4 @@ public:
 
 #endif // _GRFMGR_HXX
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
diff --git a/svtools/source/filter.vcl/filter/FilterConfigCache.cxx b/svtools/source/filter/FilterConfigCache.cxx
index f7821646edcc..73e89d747a21 100644
--- a/svtools/source/filter.vcl/filter/FilterConfigCache.cxx
+++ b/svtools/source/filter/FilterConfigCache.cxx
@@ -57,7 +57,7 @@ const char* FilterConfigCache::FilterConfigCacheEntry::InternalPixelFilterNameLi
 
 const char* FilterConfigCache::FilterConfigCacheEntry::InternalVectorFilterNameList[] =
 {
-    IMP_SVMETAFILE, IMP_WMF, IMP_EMF, IMP_SVSGF, IMP_SVSGV,
+    IMP_SVMETAFILE, IMP_WMF, IMP_EMF, IMP_SVSGF, IMP_SVSGV, IMP_SVG,
     EXP_SVMETAFILE, EXP_WMF, EXP_EMF, EXP_SVG, NULL
 };
 
@@ -303,6 +303,7 @@ const char* FilterConfigCache::InternalFilterListForSvxLight[] =
     "xbm","1","SVIXBM",
     "xpm","1","SVIXPM",
     "xpm","2","exp",
+    "svg","1","SVISVG",
     "svg","2","SVESVG",
     NULL
 };
diff --git a/svtools/source/filter.vcl/filter/FilterConfigCache.hxx b/svtools/source/filter/FilterConfigCache.hxx
index b1579bec092a..b1579bec092a 100644
--- a/svtools/source/filter.vcl/filter/FilterConfigCache.hxx
+++ b/svtools/source/filter/FilterConfigCache.hxx
diff --git a/svtools/source/filter.vcl/filter/FilterConfigItem.cxx b/svtools/source/filter/FilterConfigItem.cxx
index fddeec1f0482..fddeec1f0482 100644
--- a/svtools/source/filter.vcl/filter/FilterConfigItem.cxx
+++ b/svtools/source/filter/FilterConfigItem.cxx
diff --git a/svtools/source/filter.vcl/filter/SvFilterOptionsDialog.cxx b/svtools/source/filter/SvFilterOptionsDialog.cxx
index 6f78dd19fb6e..6f78dd19fb6e 100644
--- a/svtools/source/filter.vcl/filter/SvFilterOptionsDialog.cxx
+++ b/svtools/source/filter/SvFilterOptionsDialog.cxx
diff --git a/svtools/source/filter.vcl/filter/SvFilterOptionsDialog.hxx b/svtools/source/filter/SvFilterOptionsDialog.hxx
index 6cc10d98d6a7..6cc10d98d6a7 100644
--- a/svtools/source/filter.vcl/filter/SvFilterOptionsDialog.hxx
+++ b/svtools/source/filter/SvFilterOptionsDialog.hxx
diff --git a/svtools/source/filter.vcl/filter/exportdialog.cxx b/svtools/source/filter/exportdialog.cxx
index 62ea9d42cefb..0a03904cf176 100644
--- a/svtools/source/filter.vcl/filter/exportdialog.cxx
+++ b/svtools/source/filter/exportdialog.cxx
@@ -522,7 +522,7 @@ Bitmap ExportDialog::GetGraphicBitmap( SvStream& rInputStream )
     Bitmap aRet;
     Graphic aGraphic;
     GraphicFilter aFilter( sal_False );
-    if ( aFilter.ImportGraphic( aGraphic, String(), rInputStream, GRFILTER_FORMAT_NOTFOUND, NULL, 0, NULL, NULL ) == GRFILTER_OK )
+    if ( aFilter.ImportGraphic( aGraphic, String(), rInputStream, GRFILTER_FORMAT_NOTFOUND, NULL, 0, static_cast<com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >*>(NULL), NULL ) == GRFILTER_OK )
     {
         aRet = aGraphic.GetBitmap();
     }
@@ -1512,4 +1512,4 @@ IMPL_LINK( ExportDialog, OK, void *, EMPTYARG )
     return 0;
 }
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
diff --git a/svtools/source/filter.vcl/filter/exportdialog.hrc b/svtools/source/filter/exportdialog.hrc
index e230bcd2c5c3..e230bcd2c5c3 100755..100644
--- a/svtools/source/filter.vcl/filter/exportdialog.hrc
+++ b/svtools/source/filter/exportdialog.hrc
diff --git a/svtools/source/filter.vcl/filter/exportdialog.hxx b/svtools/source/filter/exportdialog.hxx
index d15f143701ec..d15f143701ec 100644
--- a/svtools/source/filter.vcl/filter/exportdialog.hxx
+++ b/svtools/source/filter/exportdialog.hxx
diff --git a/svtools/source/filter.vcl/filter/exportdialog.src b/svtools/source/filter/exportdialog.src
index c9e87989a314..c9e87989a314 100644
--- a/svtools/source/filter.vcl/filter/exportdialog.src
+++ b/svtools/source/filter/exportdialog.src
diff --git a/svtools/source/filter.vcl/filter/filter.cxx b/svtools/source/filter/filter.cxx
index c0c642d7ad88..830082fa6eb0 100644
--- a/svtools/source/filter.vcl/filter/filter.cxx
+++ b/svtools/source/filter/filter.cxx
@@ -40,6 +40,7 @@
 #include <vcl/salctype.hxx>
 #include <vcl/pngread.hxx>
 #include <vcl/pngwrite.hxx>
+#include <vcl/svgread.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/svapp.hxx>
 #include <osl/file.hxx>
@@ -537,7 +538,7 @@ static sal_Bool ImpPeekGraphicFormat( SvStream& rStream, String& rFormatExtensio
         for ( nOffset = 0; ( nOffset <= 512 ) && ( ( nStreamPos + nOffset + 14 ) <= nStreamLen ); nOffset += 512 )
         {
             short y1,x1,y2,x2;
-            bool bdBoxOk = true;
+            sal_Bool bdBoxOk = sal_True;
 
             rStream.Seek( nStreamPos + nOffset);
             // size of the pict in version 1 pict ( 2bytes) : ignored
@@ -550,7 +551,7 @@ static sal_Bool ImpPeekGraphicFormat( SvStream& rStream, String& rFormatExtensio
             if (x1 > x2 || y1 > y2 || // bad bdbox
                 (x1 == x2 && y1 == y2) || // 1 pixel picture
                 x2-x1 > 2048 || y2-y1 > 2048 ) // picture anormaly big
-              bdBoxOk = false;
+              bdBoxOk = sal_False;
 
             // read version op
             rStream.Read( sBuf,3 );
@@ -659,10 +660,22 @@ static sal_Bool ImpPeekGraphicFormat( SvStream& rStream, String& rFormatExtensio
         return sal_True;
     }
 
+    //--------------------------- SVG ------------------------------------
+    if( !bTest || ( rFormatExtension.CompareToAscii( "SVG", 3 ) == COMPARE_EQUAL ) )
+    {
+        bSomethingTested=sal_True;
+
+        // just a simple test for the extension
+        if( rFormatExtension.CompareToAscii( "SVG", 3 ) == COMPARE_EQUAL )
+            return sal_True;
+    }
+
     //--------------------------- TGA ------------------------------------
     if( !bTest || ( rFormatExtension.CompareToAscii( "TGA", 3 ) == COMPARE_EQUAL ) )
     {
         bSomethingTested = sal_True;
+
+        // just a simple test for the extension
         if( rFormatExtension.CompareToAscii( "TGA", 3 ) == COMPARE_EQUAL )
             return sal_True;
     }
@@ -671,6 +684,8 @@ static sal_Bool ImpPeekGraphicFormat( SvStream& rStream, String& rFormatExtensio
     if( !bTest || ( rFormatExtension.CompareToAscii( "SGV", 3 ) == COMPARE_EQUAL ) )
     {
         bSomethingTested = sal_True;
+
+        // just a simple test for the extension
         if( rFormatExtension.CompareToAscii( "SGV", 3 ) == COMPARE_EQUAL )
             return sal_True;
     }
@@ -1468,6 +1483,27 @@ sal_uInt16 GraphicFilter::ImportGraphic( Graphic& rGraphic, const String& rPath,
             else
                 eLinkType = GFX_LINK_TYPE_NATIVE_JPG;
         }
+        else if( aFilterName.EqualsIgnoreCaseAscii( IMP_SVG ) )
+        {
+            if( rGraphic.GetContext() == (GraphicReader*) 1 )
+                rGraphic.SetContext( NULL );
+
+            vcl::SVGReader  aSVGReader( rIStream );
+            GDIMetaFile     aSVGMtf;
+
+            if( 0 == aSVGReader.Read( aSVGMtf ).GetActionSize() )
+                nStatus = GRFILTER_FILTERERROR;
+            else
+                rGraphic = Graphic( aSVGMtf );
+
+            // Dont set any GfxLink here, since the MetaRenderGraphicAction
+            // inside the just read MetaFile contains excatly this native data;
+            // setting a ǴfxLink would also affect other program parts, since
+            // GfxLinks are preferably written to the file format in general,
+            // which would be a bad idea in case of SVG files, since earlier
+            // implementations are not able to handle native SVG data in any
+            // case. (KA 01/19/2011)
+        }
         else if( aFilterName.EqualsIgnoreCaseAscii( IMP_XBM ) )
         {
             if( rGraphic.GetContext() == (GraphicReader*) 1 )
@@ -1730,7 +1766,7 @@ sal_uInt16 GraphicFilter::ExportGraphic( const Graphic& rGraphic, const String&
 
             // Maximalen Speicherbedarf fuer das Bildes holen:
 //          if( GetOptionsConfig() )
-//              nMaxMem = (sal_uInt32)GetOptionsConfig()->ReadKey( "VEC-TO-PIX-MAX-KB", "1024" ).ToInt32();
+//              nMaxMem = (UINT32)GetOptionsConfig()->ReadKey( "VEC-TO-PIX-MAX-KB", "1024" ).ToInt32();
 //          else
                 nMaxMem = 1024;
 
@@ -1808,7 +1844,7 @@ sal_uInt16 GraphicFilter::ExportGraphic( const Graphic& rGraphic, const String&
                     aMTF.SetPrefSize( aGraphic.GetPrefSize() );
                     aMTF.SetPrefMapMode( aGraphic.GetPrefMapMode() );
                 }
-                rOStm << aMTF;
+                aMTF.Write( rOStm, GDIMETAFILE_WRITE_REPLACEMENT_RENDERGRAPHIC );
                 if( rOStm.GetError() )
                     nStatus = GRFILTER_IOERROR;
             }
@@ -1925,44 +1961,69 @@ sal_uInt16 GraphicFilter::ExportGraphic( const Graphic& rGraphic, const String&
             }
             else if( aFilterName.EqualsIgnoreCaseAscii( EXP_SVG ) )
             {
-                try
+                sal_Bool bDone = sal_False;
+
+                // do we have a native SVG RenderGraphic, whose data can be written directly?
+                if( ( GRAPHIC_GDIMETAFILE == eType ) && aGraphic.IsRenderGraphic() )
                 {
-                    ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xMgr( ::comphelper::getProcessServiceFactory() );
+                    const ::vcl::RenderGraphic aRenderGraphic( aGraphic.GetRenderGraphic() );
 
-                    if( xMgr.is() )
+                    if( aRenderGraphic.GetGraphicDataLength() &&
+                        aRenderGraphic.GetGraphicDataMimeType().equalsIgnoreAsciiCase(
+                            ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "image/svg+xml" ) ) ) )
                     {
-                        ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > xSaxWriter( xMgr->createInstance(
-                            ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.xml.sax.Writer" )) ), ::com::sun::star::uno::UNO_QUERY );
+                        rOStm.Write( aRenderGraphic.GetGraphicData().get(),
+                                     aRenderGraphic.GetGraphicDataLength() );
 
-                        ::com::sun::star::uno::Reference< ::com::sun::star::svg::XSVGWriter > xSVGWriter( xMgr->createInstance(
-                            ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.svg.SVGWriter" )) ), ::com::sun::star::uno::UNO_QUERY );
+                           if( rOStm.GetError() )
+                        {
+                            nStatus = GRFILTER_IOERROR;
+                        }
+                    }
+                }
 
-                        if( xSaxWriter.is() && xSVGWriter.is() )
+                if( !bDone )
+                {
+                    // do the normal GDIMetaFile export instead
+                    try
+                    {
+                        ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xMgr( ::comphelper::getProcessServiceFactory() );
+
+                        if( xMgr.is() )
                         {
-                            ::com::sun::star::uno::Reference< ::com::sun::star::io::XActiveDataSource > xActiveDataSource(
-                                xSaxWriter, ::com::sun::star::uno::UNO_QUERY );
+                            ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > xSaxWriter( xMgr->createInstance(
+                                ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.xml.sax.Writer" )) ), ::com::sun::star::uno::UNO_QUERY );
+
+                            ::com::sun::star::uno::Reference< ::com::sun::star::svg::XSVGWriter > xSVGWriter( xMgr->createInstance(
+                                ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.svg.SVGWriter" )) ), ::com::sun::star::uno::UNO_QUERY );
 
-                            if( xActiveDataSource.is() )
+                            if( xSaxWriter.is() && xSVGWriter.is() )
                             {
-                                const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > xStmIf(
-                                    static_cast< ::cppu::OWeakObject* >( new ImpFilterOutputStream( rOStm ) ) );
+                                ::com::sun::star::uno::Reference< ::com::sun::star::io::XActiveDataSource > xActiveDataSource(
+                                    xSaxWriter, ::com::sun::star::uno::UNO_QUERY );
 
-                                SvMemoryStream aMemStm( 65535, 65535 );
+                                if( xActiveDataSource.is() )
+                                {
+                                    const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > xStmIf(
+                                        static_cast< ::cppu::OWeakObject* >( new ImpFilterOutputStream( rOStm ) ) );
+
+                                    SvMemoryStream aMemStm( 65535, 65535 );
 
-                                aMemStm.SetCompressMode( COMPRESSMODE_FULL );
-                                ( (GDIMetaFile&) aGraphic.GetGDIMetaFile() ).Write( aMemStm );
+                                    aMemStm.SetCompressMode( COMPRESSMODE_FULL );
+                                    ( (GDIMetaFile&) aGraphic.GetGDIMetaFile() ).Write( aMemStm );
 
-                                xActiveDataSource->setOutputStream( ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >(
-                                    xStmIf, ::com::sun::star::uno::UNO_QUERY ) );
-                                ::com::sun::star::uno::Sequence< sal_Int8 > aMtfSeq( (sal_Int8*) aMemStm.GetData(), aMemStm.Tell() );
-                                xSVGWriter->write( xSaxWriter, aMtfSeq );
+                                    xActiveDataSource->setOutputStream( ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >(
+                                        xStmIf, ::com::sun::star::uno::UNO_QUERY ) );
+                                    ::com::sun::star::uno::Sequence< sal_Int8 > aMtfSeq( (sal_Int8*) aMemStm.GetData(), aMemStm.Tell() );
+                                    xSVGWriter->write( xSaxWriter, aMtfSeq );
+                                }
                             }
                         }
                     }
-                }
-                catch( ::com::sun::star::uno::Exception& )
-                {
-                    nStatus = GRFILTER_IOERROR;
+                    catch( ::com::sun::star::uno::Exception& )
+                    {
+                        nStatus = GRFILTER_IOERROR;
+                    }
                 }
             }
             else
@@ -2109,6 +2170,7 @@ IMPL_LINK( GraphicFilter, FilterCallback, ConvertData*, pData )
             case( CVT_TIF ): aShortName = TIF_SHORTNAME; break;
             case( CVT_WMF ): aShortName = WMF_SHORTNAME; break;
             case( CVT_EMF ): aShortName = EMF_SHORTNAME; break;
+            case( CVT_SVG ): aShortName = SVG_SHORTNAME; break;
 
             default:
             break;
diff --git a/svtools/source/filter.vcl/filter/filter2.cxx b/svtools/source/filter/filter2.cxx
index 55b02d39c19f..d34825312470 100644
--- a/svtools/source/filter.vcl/filter/filter2.cxx
+++ b/svtools/source/filter/filter2.cxx
@@ -115,6 +115,7 @@ sal_Bool GraphicDescriptor::Detect( sal_Bool bExtendedInfo )
         else if ( ImpDetectSVM( rStm, bExtendedInfo ) ) bRet = sal_True;
         else if ( ImpDetectWMF( rStm, bExtendedInfo ) ) bRet = sal_True;
         else if ( ImpDetectEMF( rStm, bExtendedInfo ) ) bRet = sal_True;
+        else if ( ImpDetectSVG( rStm, bExtendedInfo ) ) bRet = sal_True;
         else if ( ImpDetectPCT( rStm, bExtendedInfo ) ) bRet = sal_True;
         else if ( ImpDetectXBM( rStm, bExtendedInfo ) ) bRet = sal_True;
         else if ( ImpDetectXPM( rStm, bExtendedInfo ) ) bRet = sal_True;
@@ -1300,6 +1301,21 @@ sal_Bool GraphicDescriptor::ImpDetectEMF( SvStream&, sal_Bool )
 |*
 \************************************************************************/
 
+sal_Bool GraphicDescriptor::ImpDetectSVG( SvStream& /*rStm*/, sal_Bool /*bExtendedInfo*/ )
+{
+    sal_Bool bRet = aPathExt.CompareToAscii( "svg", 3 ) == COMPARE_EQUAL;
+    if (bRet)
+        nFormat = GFF_SVG;
+
+    return bRet;
+}
+
+/*************************************************************************
+|*
+|*
+|*
+\************************************************************************/
+
 String GraphicDescriptor::GetImportFormatShortName( sal_uInt16 nFormat )
 {
     ByteString          aKeyName;
@@ -1330,9 +1346,10 @@ String GraphicDescriptor::GetImportFormatShortName( sal_uInt16 nFormat )
         case( GFF_SVM ) :   aKeyName = "svm";   break;
         case( GFF_WMF ) :   aKeyName = "wmf";   break;
         case( GFF_EMF ) :   aKeyName = "emf";   break;
+        case( GFF_SVG ) :   aKeyName = "svg";   break;
     }
 
     return String( aKeyName, RTL_TEXTENCODING_ASCII_US );
 }
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
diff --git a/svtools/source/filter.vcl/igif/decode.cxx b/svtools/source/filter/igif/decode.cxx
index 03a69414cd4b..03a69414cd4b 100644
--- a/svtools/source/filter.vcl/igif/decode.cxx
+++ b/svtools/source/filter/igif/decode.cxx
diff --git a/svtools/source/filter.vcl/igif/decode.hxx b/svtools/source/filter/igif/decode.hxx
index 3dd6328839d9..3dd6328839d9 100644
--- a/svtools/source/filter.vcl/igif/decode.hxx
+++ b/svtools/source/filter/igif/decode.hxx
diff --git a/svtools/source/filter.vcl/igif/gifread.cxx b/svtools/source/filter/igif/gifread.cxx
index 6765937081d7..6765937081d7 100644
--- a/svtools/source/filter.vcl/igif/gifread.cxx
+++ b/svtools/source/filter/igif/gifread.cxx
diff --git a/svtools/source/filter.vcl/ixbm/xbmread.cxx b/svtools/source/filter/ixbm/xbmread.cxx
index 0870eecb7187..0870eecb7187 100644
--- a/svtools/source/filter.vcl/ixbm/xbmread.cxx
+++ b/svtools/source/filter/ixbm/xbmread.cxx
diff --git a/svtools/source/filter.vcl/ixpm/rgbtable.hxx b/svtools/source/filter/ixpm/rgbtable.hxx
index 738c3f33460c..738c3f33460c 100644
--- a/svtools/source/filter.vcl/ixpm/rgbtable.hxx
+++ b/svtools/source/filter/ixpm/rgbtable.hxx
diff --git a/svtools/source/filter.vcl/ixpm/xpmread.cxx b/svtools/source/filter/ixpm/xpmread.cxx
index c218cff1630f..c218cff1630f 100644
--- a/svtools/source/filter.vcl/ixpm/xpmread.cxx
+++ b/svtools/source/filter/ixpm/xpmread.cxx
diff --git a/svtools/source/filter.vcl/jpeg/jpeg.cxx b/svtools/source/filter/jpeg/jpeg.cxx
index 609e4684513e..14a6988893c4 100644
--- a/svtools/source/filter.vcl/jpeg/jpeg.cxx
+++ b/svtools/source/filter/jpeg/jpeg.cxx
@@ -113,7 +113,7 @@ extern "C" void init_destination (j_compress_ptr cinfo)
   dest->pub.free_in_buffer = BUF_SIZE;
 }
 
-extern "C" int empty_output_buffer (j_compress_ptr cinfo)
+extern "C" boolean empty_output_buffer (j_compress_ptr cinfo)
 {
   my_dest_ptr dest = (my_dest_ptr) cinfo->dest;
 
@@ -218,7 +218,7 @@ long StreamRead( SvStream* pSvStm, void* pBuffer, long nBufferSize )
         return nRead;
 }
 
-extern "C" int fill_input_buffer (j_decompress_ptr cinfo)
+extern "C" boolean fill_input_buffer (j_decompress_ptr cinfo)
 {
   my_src_ptr src = (my_src_ptr) cinfo->src;
   size_t nbytes;
diff --git a/svtools/source/filter.vcl/jpeg/jpeg.h b/svtools/source/filter/jpeg/jpeg.h
index a77c335d4b66..a77c335d4b66 100644
--- a/svtools/source/filter.vcl/jpeg/jpeg.h
+++ b/svtools/source/filter/jpeg/jpeg.h
diff --git a/svtools/source/filter.vcl/jpeg/jpegc.c b/svtools/source/filter/jpeg/jpegc.c
index 06c7d4f69964..06c7d4f69964 100644
--- a/svtools/source/filter.vcl/jpeg/jpegc.c
+++ b/svtools/source/filter/jpeg/jpegc.c
diff --git a/svtools/source/filter.vcl/filter/sgf.ini b/svtools/source/filter/sgf.ini
index 7444e40c8836..7444e40c8836 100644
--- a/svtools/source/filter.vcl/filter/sgf.ini
+++ b/svtools/source/filter/sgf.ini
diff --git a/svtools/source/filter.vcl/filter/sgfbram.cxx b/svtools/source/filter/sgfbram.cxx
index 8559cbee30eb..8559cbee30eb 100644
--- a/svtools/source/filter.vcl/filter/sgfbram.cxx
+++ b/svtools/source/filter/sgfbram.cxx
diff --git a/svtools/source/filter.vcl/filter/sgvmain.cxx b/svtools/source/filter/sgvmain.cxx
index ad0c530382f8..ad0c530382f8 100644
--- a/svtools/source/filter.vcl/filter/sgvmain.cxx
+++ b/svtools/source/filter/sgvmain.cxx
diff --git a/svtools/source/filter.vcl/filter/sgvspln.cxx b/svtools/source/filter/sgvspln.cxx
index 864ff3ee5c8b..864ff3ee5c8b 100644
--- a/svtools/source/filter.vcl/filter/sgvspln.cxx
+++ b/svtools/source/filter/sgvspln.cxx
diff --git a/svtools/source/filter.vcl/filter/sgvtext.cxx b/svtools/source/filter/sgvtext.cxx
index ddda27f2efa2..ddda27f2efa2 100644
--- a/svtools/source/filter.vcl/filter/sgvtext.cxx
+++ b/svtools/source/filter/sgvtext.cxx
diff --git a/svtools/source/filter.vcl/wmf/emfwr.cxx b/svtools/source/filter/wmf/emfwr.cxx
index c9e6eb634604..4efaa1bbbb88 100644
--- a/svtools/source/filter.vcl/wmf/emfwr.cxx
+++ b/svtools/source/filter/wmf/emfwr.cxx
@@ -34,6 +34,7 @@
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <basegfx/polygon/b2dpolypolygon.hxx>
 #include <vcl/lineinfo.hxx>
+#include <vcl/rendergraphicrasterizer.hxx>
 
 // -----------
 // - Defines -
@@ -1186,7 +1187,7 @@ void EMFWriter::ImplWrite( const GDIMetaFile& rMtf )
             case META_BMP_ACTION:
             {
                 const MetaBmpAction* pA = (const MetaBmpAction *) pAction;
-                ImplWriteBmpRecord( pA->GetBitmap(), pA->GetPoint(), pA->GetBitmap().GetSizePixel(), WIN_SRCCOPY );
+                ImplWriteBmpRecord( pA->GetBitmap(), pA->GetPoint(), maVDev.PixelToLogic( pA->GetBitmap().GetSizePixel() ), WIN_SRCCOPY );
             }
             break;
 
@@ -1217,8 +1218,8 @@ void EMFWriter::ImplWrite( const GDIMetaFile& rMtf )
                 {
                     aBmp.Replace( aMsk, COL_WHITE );
                     aMsk.Invert();
-                    ImplWriteBmpRecord( aMsk, pA->GetPoint(), aMsk.GetSizePixel(), WIN_SRCPAINT );
-                    ImplWriteBmpRecord( aBmp, pA->GetPoint(), aBmp.GetSizePixel(), WIN_SRCAND );
+                    ImplWriteBmpRecord( aMsk, pA->GetPoint(), maVDev.PixelToLogic( aMsk.GetSizePixel() ), WIN_SRCPAINT );
+                    ImplWriteBmpRecord( aBmp, pA->GetPoint(), maVDev.PixelToLogic( aBmp.GetSizePixel() ), WIN_SRCAND );
                 }
                 else
                     ImplWriteBmpRecord( aBmp, pA->GetPoint(), aBmp.GetSizePixel(), WIN_SRCCOPY );
@@ -1407,6 +1408,26 @@ void EMFWriter::ImplWrite( const GDIMetaFile& rMtf )
             }
             break;
 
+            case( META_RENDERGRAPHIC_ACTION ):
+            {
+                const MetaRenderGraphicAction*          pA = (const MetaRenderGraphicAction*) pAction;
+                const ::vcl::RenderGraphicRasterizer    aRasterizer( pA->GetRenderGraphic() );
+                const BitmapEx                          aBmpEx( aRasterizer.Rasterize( maVDev.LogicToPixel( pA->GetSize() ) ) );
+                Bitmap                                  aBmp( aBmpEx.GetBitmap() );
+                Bitmap                                  aMsk( aBmpEx.GetMask() );
+
+                if( !!aMsk )
+                {
+                    aBmp.Replace( aMsk, COL_WHITE );
+                    aMsk.Invert();
+                    ImplWriteBmpRecord( aMsk, pA->GetPoint(), pA->GetSize(), WIN_SRCPAINT );
+                    ImplWriteBmpRecord( aBmp, pA->GetPoint(), pA->GetSize(), WIN_SRCAND );
+                }
+                else
+                    ImplWriteBmpRecord( aBmp, pA->GetPoint(), pA->GetSize(), WIN_SRCCOPY );
+            }
+            break;
+
             default:
                 OSL_FAIL( ( ByteString( "EMFWriter::ImplWriteActions: unsupported MetaAction #" ) += ByteString::CreateFromInt32( nType ) ).GetBuffer() );
             break;
diff --git a/svtools/source/filter.vcl/wmf/emfwr.hxx b/svtools/source/filter/wmf/emfwr.hxx
index ee3b723ace3e..ee3b723ace3e 100644
--- a/svtools/source/filter.vcl/wmf/emfwr.hxx
+++ b/svtools/source/filter/wmf/emfwr.hxx
diff --git a/svtools/source/filter.vcl/wmf/enhwmf.cxx b/svtools/source/filter/wmf/enhwmf.cxx
index 91cabcf430a3..7956064b909e 100644
--- a/svtools/source/filter.vcl/wmf/enhwmf.cxx
+++ b/svtools/source/filter/wmf/enhwmf.cxx
@@ -1530,4 +1530,4 @@ EnhWMFReader::~EnhWMFReader()
 
 };
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
diff --git a/svtools/source/filter.vcl/wmf/winmtf.cxx b/svtools/source/filter/wmf/winmtf.cxx
index d2a4b0ec50c2..d2a4b0ec50c2 100644
--- a/svtools/source/filter.vcl/wmf/winmtf.cxx
+++ b/svtools/source/filter/wmf/winmtf.cxx
diff --git a/svtools/source/filter.vcl/wmf/winmtf.hxx b/svtools/source/filter/wmf/winmtf.hxx
index e4a418ae77fb..16e9296a2b8f 100644
--- a/svtools/source/filter.vcl/wmf/winmtf.hxx
+++ b/svtools/source/filter/wmf/winmtf.hxx
@@ -797,5 +797,4 @@ public:
 
 #endif
 
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/filter.vcl/wmf/winwmf.cxx b/svtools/source/filter/wmf/winwmf.cxx
index a794da5b3274..a794da5b3274 100644
--- a/svtools/source/filter.vcl/wmf/winwmf.cxx
+++ b/svtools/source/filter/wmf/winwmf.cxx
diff --git a/svtools/source/filter.vcl/wmf/wmf.cxx b/svtools/source/filter/wmf/wmf.cxx
index 9b2a8edf2d6e..9b2a8edf2d6e 100644
--- a/svtools/source/filter.vcl/wmf/wmf.cxx
+++ b/svtools/source/filter/wmf/wmf.cxx
diff --git a/svtools/source/filter.vcl/wmf/wmfwr.cxx b/svtools/source/filter/wmf/wmfwr.cxx
index a340c52f8860..18c0336740e1 100644
--- a/svtools/source/filter.vcl/wmf/wmfwr.cxx
+++ b/svtools/source/filter/wmf/wmfwr.cxx
@@ -30,6 +30,7 @@
 #include "precompiled_svtools.hxx"
 
 #include <vcl/salbtype.hxx>
+#include <vcl/rendergraphicrasterizer.hxx>
 #include "wmfwr.hxx"
 #include <unotools/fontcvt.hxx>
 #include "emfwr.hxx"
@@ -289,6 +290,7 @@ void WMFWriter::CountActionsAndBitmaps( const GDIMetaFile & rMTF )
             case META_BMPEX_ACTION:
             case META_BMPEXSCALE_ACTION:
             case META_BMPEXSCALEPART_ACTION:
+            case META_RENDERGRAPHIC_ACTION:
                 nNumberOfBitmaps++;
             break;
         }
@@ -1761,6 +1763,32 @@ void WMFWriter::WriteRecords( const GDIMetaFile & rMTF )
                     OSL_FAIL( "Unsupported action: MetaMoveClipRegionAction!" );
                 }
                 break;
+
+                case( META_RENDERGRAPHIC_ACTION ):
+                {
+                    const MetaRenderGraphicAction*          pA = (const MetaRenderGraphicAction*) pMA;
+                    const ::vcl::RenderGraphicRasterizer    aRasterizer( pA->GetRenderGraphic() );
+                    const BitmapEx                          aBmpEx( aRasterizer.Rasterize( pVirDev->LogicToPixel( pA->GetSize(), aSrcMapMode ) ) );
+                    Bitmap                                  aBmp( aBmpEx.GetBitmap() );
+                    Bitmap                                  aMsk( aBmpEx.GetMask() );
+
+                    if( !!aMsk )
+                    {
+                        aBmp.Replace( aMsk, COL_WHITE );
+                        aMsk.Invert();
+                        WMFRecord_StretchDIB( pA->GetPoint(), pA->GetSize(), aMsk, W_SRCPAINT );
+                        WMFRecord_StretchDIB( pA->GetPoint(), pA->GetSize(), aBmp, W_SRCAND );
+                    }
+                    else
+                        WMFRecord_StretchDIB( pA->GetPoint(), pA->GetSize(), aBmp );
+                }
+                break;
+
+                default:
+                {
+                    OSL_FAIL( "Unsupported meta action!" );
+                }
+                break;
           }
 
           nWrittenActions++;
diff --git a/svtools/source/filter.vcl/wmf/wmfwr.hxx b/svtools/source/filter/wmf/wmfwr.hxx
index 42aa647d78c2..75cf46c0bcb3 100644
--- a/svtools/source/filter.vcl/wmf/wmfwr.hxx
+++ b/svtools/source/filter/wmf/wmfwr.hxx
@@ -133,7 +133,7 @@ private:
 
     void MayCallback();
         // Berechnet anhand der obigen 5 Parameter eine Prozentzahl
-        // und macht dann ggf. einen Callback. Setzt bStatus auf sal_False wenn User abbrechen
+        // und macht dann ggf. einen Callback. Setzt bStatus auf FALSE wenn User abbrechen
         // moechte.
 
     void CountActionsAndBitmaps(const GDIMetaFile & rMTF);
@@ -155,7 +155,7 @@ private:
     void UpdateRecordHeader();
         // berichtig die Groesse des Records nach dem Schreiben der Parameter, wenn
         // nSizeWords bei Aufruf von WriteRecordHeader(..) unbekannt war.
-        // fuegt ggf. noch ein sal_uInt8 0 ein damit Anzahl Bytes immer gerade.
+        // fuegt ggf. noch ein BYTE 0 ein damit Anzahl Bytes immer gerade.
 
     void WMFRecord_Arc(const Rectangle & rRect, const Point & rStartPt, const Point & rEndPt);
     void WMFRecord_Chord(const Rectangle & rRect, const Point & rStartPt, const Point & rEndPt);
diff --git a/svtools/source/graphic/descriptor.cxx b/svtools/source/graphic/descriptor.cxx
index 5a2ed9d9df1b..623c698bcae8 100644
--- a/svtools/source/graphic/descriptor.cxx
+++ b/svtools/source/graphic/descriptor.cxx
@@ -170,6 +170,7 @@ void GraphicDescriptor::implCreate( SvStream& rIStm, const ::rtl::OUString* pURL
             case( GFF_WMF ): pMimeType = MIMETYPE_WMF; cType = graphic::GraphicType::VECTOR; break;
             case( GFF_SGV ): pMimeType = MIMETYPE_SGV; cType = graphic::GraphicType::VECTOR; break;
             case( GFF_EMF ): pMimeType = MIMETYPE_EMF; cType = graphic::GraphicType::VECTOR; break;
+            case( GFF_SVG ): pMimeType = MIMETYPE_SVG; cType = graphic::GraphicType::VECTOR; break;
 
             default:
             break;
diff --git a/svtools/source/graphic/grfmgr.cxx b/svtools/source/graphic/grfmgr.cxx
index 1952d6a8e41c..19b09e8f67a7 100644
--- a/svtools/source/graphic/grfmgr.cxx
+++ b/svtools/source/graphic/grfmgr.cxx
@@ -157,15 +157,10 @@ void GraphicObject::ImplAssignGraphicData()
     mbTransparent = maGraphic.IsTransparent();
     mbAlpha = maGraphic.IsAlpha();
     mbAnimated = maGraphic.IsAnimated();
+    mbEPS = maGraphic.IsEPS();
+    mbIsRenderGraphic = maGraphic.IsRenderGraphic();
+    mbHasRenderGraphic = maGraphic.HasRenderGraphic();
     mnAnimationLoopCount = ( mbAnimated ? maGraphic.GetAnimationLoopCount() : 0 );
-
-    if( maGraphic.GetType() == GRAPHIC_GDIMETAFILE )
-    {
-        const GDIMetaFile& rMtf = GetGraphic().GetGDIMetaFile();
-        mbEPS = ( rMtf.GetActionSize() >= 1 ) && ( META_EPS_ACTION == rMtf.GetAction( 0 )->GetType() );
-    }
-    else
-        mbEPS = sal_False;
 }
 
 void GraphicObject::ImplSetGraphicManager( const GraphicManager* pMgr, const ByteString* pID, const GraphicObject* pCopyObj )
@@ -387,7 +382,7 @@ void GraphicObject::Assign( const SvDataCopyStream& rCopyStream )
 
 ByteString GraphicObject::GetUniqueID() const
 {
-    if ( !IsInSwapIn() && IsEPS() )
+    if ( !IsInSwapIn() && ( IsEPS() || IsRenderGraphic() ) )
         const_cast<GraphicObject*>(this)->FireSwapInRequest();
 
     ByteString aRet;
@@ -643,7 +638,7 @@ sal_Bool GraphicObject::DrawWithPDFHandling( OutputDevice& rOutDev,
     const GraphicAttr aGrfAttr( pGrfAttr ? *pGrfAttr : GetAttr() );
 
     // Notify PDF writer about linked graphic (if any)
-    bool bWritingPdfLinkedGraphic( false );
+    sal_Bool bWritingPdfLinkedGraphic( sal_False );
     Point aPt( rPt );
     Size aSz( rSz );
     Rectangle aCropRect;
@@ -1237,4 +1232,4 @@ GraphicObject GraphicObject::CreateGraphicObjectFromURL( const ::rtl::OUString &
     }
 }
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
diff --git a/svtools/source/graphic/grfmgr2.cxx b/svtools/source/graphic/grfmgr2.cxx
index dc21aba0c216..1115635157a8 100644
--- a/svtools/source/graphic/grfmgr2.cxx
+++ b/svtools/source/graphic/grfmgr2.cxx
@@ -869,6 +869,8 @@ sal_Bool GraphicManager::ImplCreateOutput( OutputDevice* pOut,
                     // FALLTHROUGH intended
                 case META_GRADIENTEX_ACTION:
                     // FALLTHROUGH intended
+                case META_RENDERGRAPHIC_ACTION:
+                    // FALLTHROUGH intended
 
                     // OutDev state changes that _do_ affect bitmap
                     // output
@@ -2382,4 +2384,4 @@ void GraphicObject::ImplTransformBitmap( BitmapEx&          rBmpEx,
     }
 }
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
diff --git a/svtools/source/misc/langtab.src b/svtools/source/misc/langtab.src
index 67d650b61c8e..771afe609d83 100644
--- a/svtools/source/misc/langtab.src
+++ b/svtools/source/misc/langtab.src
@@ -148,6 +148,7 @@ StringArray STR_ARR_SVT_LANGUAGE_TABLE
         < "Norwegian, Nynorsk" ; LANGUAGE_NORWEGIAN_NYNORSK ; > ;
         < "Oriya" ; LANGUAGE_ORIYA ; > ;
         < "Polish" ; LANGUAGE_POLISH ; > ;
+        < "Portuguese (Angola)" ; LANGUAGE_USER_PORTUGUESE_ANGOLA ; > ;
         < "Portuguese (Portugal)" ; LANGUAGE_PORTUGUESE ; > ;
         < "Portuguese (Brazil)" ; LANGUAGE_PORTUGUESE_BRAZILIAN ; > ;
         < "Punjabi" ; LANGUAGE_PUNJABI ; > ;
@@ -330,6 +331,14 @@ StringArray STR_ARR_SVT_LANGUAGE_TABLE
         < "Lojban" ; LANGUAGE_USER_LOJBAN ; > ;
         < "Kabyle" ; LANGUAGE_USER_KABYLE ; > ;
         < "Haitian" ; LANGUAGE_USER_HAITIAN ; > ;
+        < "Beembe" ; LANGUAGE_USER_BEEMBE ; > ;
+        < "Bekwel" ; LANGUAGE_USER_BEKWEL ; > ;
+        < "Kituba" ; LANGUAGE_USER_KITUBA ; > ;
+        < "Lari" ; LANGUAGE_USER_LARI ; > ;
+        < "Mbochi" ; LANGUAGE_USER_MBOCHI ; > ;
+        < "Teke-Ibali" ; LANGUAGE_USER_TEKE_IBALI ; > ;
+        < "Teke-Tyee" ; LANGUAGE_USER_TEKE_TYEE ; > ;
+        < "Vili" ; LANGUAGE_USER_VILI ; > ;
     };
 };
 
diff --git a/svtools/source/uno/unoiface.cxx b/svtools/source/uno/unoiface.cxx
index e58a4789428b..d2cf9cbf12cf 100644
--- a/svtools/source/uno/unoiface.cxx
+++ b/svtools/source/uno/unoiface.cxx
@@ -81,6 +81,7 @@ SAL_DLLPUBLIC_EXPORT Window* CreateWindow( VCLXWindow** ppNewComp, const ::com::
         if ( pParent )
         {
             pWindow = new MultiLineEdit( pParent, nWinBits|WB_IGNORETAB);
+            static_cast< MultiLineEdit* >( pWindow )->DisableSelectionOnFocus();
             *ppNewComp = new VCLXMultiLineEdit;
         }
         else
diff --git a/toolkit/inc/toolkit/helper/formpdfexport.hxx b/toolkit/inc/toolkit/helper/formpdfexport.hxx
index 2bed137d0e6b..73ed870c13e5 100644
--- a/toolkit/inc/toolkit/helper/formpdfexport.hxx
+++ b/toolkit/inc/toolkit/helper/formpdfexport.hxx
@@ -39,6 +39,11 @@
 
 #include <memory>
 
+namespace vcl
+{
+    class PDFExtOutDevData;
+}
+
 //........................................................................
 namespace toolkitform
 {
@@ -48,7 +53,8 @@ namespace toolkitform
     */
     void TOOLKIT_DLLPUBLIC describePDFControl(
             const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >& _rxControl,
-            ::std::auto_ptr< ::vcl::PDFWriter::AnyWidget >& _rpDescriptor
+            ::std::auto_ptr< ::vcl::PDFWriter::AnyWidget >& _rpDescriptor,
+            ::vcl::PDFExtOutDevData& i_pdfExportData
         ) SAL_THROW(());
 
 //........................................................................
diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx
index c879e4b6bd2c..cd488833782a 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -798,7 +798,14 @@ Window* VCLXToolkit::ImplCreateWindow( VCLXWindow** ppNewComp,
                 if ( (pParent == NULL ) && ( rDescriptor.ParentIndex == -1 ) )
                     pParent = DIALOG_NO_PARENT;
                 pNewWindow = new Dialog( pParent, nWinBits );
-                *ppNewComp = new VCLXDialog;
+                // #i70217# Don't always create a new component object. It's possible that VCL has called
+                // GetComponentInterface( sal_True ) in the Dialog ctor itself (see Window::IsTopWindow() )
+                // which creates a component object.
+                css::uno::Reference< css::awt::XWindowPeer > xWinPeer = pNewWindow->GetComponentInterface( sal_False );
+                if ( xWinPeer.is() )
+                    *ppNewComp = dynamic_cast< VCLXDialog* >( xWinPeer.get() );
+                else
+                    *ppNewComp = new VCLXDialog;
             }
             break;
             case WINDOW_MOREBUTTON:
diff --git a/toolkit/source/controls/controlmodelcontainerbase.cxx b/toolkit/source/controls/controlmodelcontainerbase.cxx
index cc2dc434f7ec..56f1b7fab53d 100644
--- a/toolkit/source/controls/controlmodelcontainerbase.cxx
+++ b/toolkit/source/controls/controlmodelcontainerbase.cxx
@@ -435,7 +435,7 @@ Sequence< ::rtl::OUString > ControlModelContainerBase::getAvailableServiceNames(
     static Sequence< ::rtl::OUString >* pNamesSeq = NULL;
     if ( !pNamesSeq )
     {
-        pNamesSeq = new Sequence< ::rtl::OUString >( 25 );
+        pNamesSeq = new Sequence< ::rtl::OUString >( 26 );
         ::rtl::OUString* pNames = pNamesSeq->getArray();
         pNames[0] = ::rtl::OUString::createFromAscii( szServiceName2_UnoControlEditModel );
         pNames[1] = ::rtl::OUString::createFromAscii( szServiceName2_UnoControlFormattedFieldModel );
@@ -460,7 +460,7 @@ Sequence< ::rtl::OUString > ControlModelContainerBase::getAvailableServiceNames(
         pNames[20] = ::rtl::OUString::createFromAscii( szServiceName_TreeControlModel );
         pNames[21] = ::rtl::OUString::createFromAscii( szServiceName_GridControlModel );
         pNames[22] = ::rtl::OUString::createFromAscii( szServiceName_UnoControlTabPageContainerModel );
-
+        pNames[23] = ::rtl::OUString::createFromAscii( szServiceName_UnoControlTabPageModel );
         pNames[23] = ::rtl::OUString::createFromAscii( szServiceName_UnoMultiPageModel );
         pNames[24] = ::rtl::OUString::createFromAscii( szServiceName_UnoFrameModel );
     }
diff --git a/toolkit/source/controls/dialogcontrol.cxx b/toolkit/source/controls/dialogcontrol.cxx
index 47d6589a952a..7516a422eddd 100644
--- a/toolkit/source/controls/dialogcontrol.cxx
+++ b/toolkit/source/controls/dialogcontrol.cxx
@@ -421,7 +421,10 @@ throw (::com::sun::star::uno::RuntimeException)
         Reference< XControl > xDialogControl( *this, UNO_QUERY_THROW );
         Reference< XDevice > xDialogDevice( xDialogControl->getPeer(), UNO_QUERY );
         OSL_ENSURE( xDialogDevice.is(), "UnoDialogControl::windowResized: no peer, but a windowResized event?" );
-        if ( xDialogDevice.is() )
+
+        // #i87592 In design mode the drawing layer works with sizes with decoration.
+        // Therefore we have to substract them before writing back to the properties (model).
+        if ( xDialogDevice.is() && mbDesignMode )
         {
             DeviceInfo aDeviceInfo( xDialogDevice->getInfo() );
             aAppFontSize.Width() -= aDeviceInfo.LeftInset + aDeviceInfo.RightInset;
diff --git a/toolkit/source/controls/unocontrol.cxx b/toolkit/source/controls/unocontrol.cxx
index d759e05e318d..af46d98cef5d 100644
--- a/toolkit/source/controls/unocontrol.cxx
+++ b/toolkit/source/controls/unocontrol.cxx
@@ -91,17 +91,6 @@ static const LanguageDependentProp aLanguageDependentProp[] =
     { 0, 0                 }
 };
 
-WorkWindow* lcl_GetDefaultWindow()
-{
-    static WorkWindow* pW = NULL;
-    if ( !pW )
-    {
-        pW = new WorkWindow( NULL, 0 );
-        pW->EnableChildTransparentMode();
-    }
-    return pW;
-}
-
 static Sequence< ::rtl::OUString> lcl_ImplGetPropertyNames( const Reference< XMultiPropertySet > & rxModel )
 {
     Sequence< ::rtl::OUString> aNames;
@@ -237,14 +226,15 @@ Reference< XWindowPeer >    UnoControl::ImplGetCompatiblePeer( sal_Bool bAcceptE
         Reference< XControl > xMe;
         OWeakAggObject::queryInterface( ::getCppuType( &xMe ) ) >>= xMe;
 
-        WorkWindow* pWW;
+        Window* pParentWindow( NULL );
         {
             SolarMutexGuard aGuard;
-            pWW = lcl_GetDefaultWindow();
+            pParentWindow = dynamic_cast< Window* >( Application::GetDefaultDevice() );
+            ENSURE_OR_THROW( pParentWindow != NULL, "could obtain a default parent window!" );
         }
         try
         {
-            xMe->createPeer( NULL, pWW->GetComponentInterface( sal_True ) );
+            xMe->createPeer( NULL, pParentWindow->GetComponentInterface( sal_True ) );
         }
         catch( const Exception& )
         {
diff --git a/toolkit/source/helper/formpdfexport.cxx b/toolkit/source/helper/formpdfexport.cxx
index ae2af72ab09b..d62570084c2a 100644
--- a/toolkit/source/helper/formpdfexport.cxx
+++ b/toolkit/source/helper/formpdfexport.cxx
@@ -267,7 +267,8 @@ namespace toolkitform
     //--------------------------------------------------------------------
     /** creates a PDF compatible control descriptor for the given control
     */
-    void TOOLKIT_DLLPUBLIC describePDFControl( const Reference< XControl >& _rxControl, ::std::auto_ptr< ::vcl::PDFWriter::AnyWidget >& _rpDescriptor ) SAL_THROW(())
+    void TOOLKIT_DLLPUBLIC describePDFControl( const Reference< XControl >& _rxControl,
+        ::std::auto_ptr< ::vcl::PDFWriter::AnyWidget >& _rpDescriptor, ::vcl::PDFExtOutDevData& i_pdfExportData ) SAL_THROW(())
     {
         _rpDescriptor.reset( NULL );
         OSL_ENSURE( _rxControl.is(), "describePDFControl: invalid (NULL) control!" );
@@ -494,7 +495,25 @@ namespace toolkitform
                 }
                 else if ( eButtonType == FormButtonType_URL )
                 {
-                    OSL_VERIFY( xModelProps->getPropertyValue( FM_PROP_TARGET_URL ) >>= pButtonWidget->URL);
+                    ::rtl::OUString sURL;
+                    OSL_VERIFY( xModelProps->getPropertyValue( FM_PROP_TARGET_URL ) >>= sURL );
+                    const bool bDocumentLocalTarget = ( sURL.getLength() > 0 ) && ( sURL.getStr()[0] == '#' );
+                    if ( bDocumentLocalTarget )
+                    {
+                        const ::rtl::OUString sDestinationName( sURL.copy(1) );
+                        // Register the destination for for future handling ...
+                        pButtonWidget->Dest = i_pdfExportData.RegisterDest();
+
+                        // and put it into the bookmarks, to ensure the future handling really happens
+                        ::std::vector< ::vcl::PDFExtOutDevBookmarkEntry >& rBookmarks( i_pdfExportData.GetBookmarks() );
+                        ::vcl::PDFExtOutDevBookmarkEntry aBookmark;
+                        aBookmark.nDestId = pButtonWidget->Dest;
+                        aBookmark.aBookmark = sURL;
+                        rBookmarks.push_back( aBookmark );
+                    }
+                    else
+                        pButtonWidget->URL = sURL;
+
                     pButtonWidget->Submit = false;
                 }
 
diff --git a/toolkit/source/helper/unowrapper.cxx b/toolkit/source/helper/unowrapper.cxx
index 5e107a8c6559..b5abb11d632e 100644
--- a/toolkit/source/helper/unowrapper.cxx
+++ b/toolkit/source/helper/unowrapper.cxx
@@ -182,11 +182,13 @@ void UnoWrapper::SetWindowInterface( Window* pWindow, ::com::sun::star::uno::Ref
     DBG_ASSERT( pVCLXWindow, "SetComponentInterface - unsupported type" );
     if ( pVCLXWindow )
     {
-        if( pWindow->GetWindowPeer() )
+        ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer> xPeer = pWindow->GetWindowPeer();
+        if( xPeer.is() )
         {
-            int i = 0;
-            i++;
-            //          OSL_FAIL( "UnoWrapper::SetWindowInterface: there already *is* a WindowInterface for this window!" );
+            bool bSameInstance( pVCLXWindow == dynamic_cast< VCLXWindow* >( xPeer.get() ));
+            DBG_ASSERT( bSameInstance, "UnoWrapper::SetWindowInterface: there already *is* a WindowInterface for this window!" );
+            if ( bSameInstance )
+                return;
         }
         pVCLXWindow->SetWindow( pWindow );
         pWindow->SetWindowPeer( xIFace, pVCLXWindow );
diff --git a/unotools/inc/unotools/saveopt.hxx b/unotools/inc/unotools/saveopt.hxx
index c2db897c0e74..43f60c5b4b19 100644
--- a/unotools/inc/unotools/saveopt.hxx
+++ b/unotools/inc/unotools/saveopt.hxx
@@ -54,7 +54,9 @@ public:
         E_DOPRETTYPRINTING,
         E_WARNALIENFORMAT,
         E_LOADDOCPRINTER,
-        E_ODFDEFAULTVERSION
+        E_ODFDEFAULTVERSION,
+        E_USESHA1INODF12,
+        E_USEBLOWFISHINODF12
     };
 
     // keep enum values sorted that a less or greater compare maps to older and newer versions!
@@ -120,6 +122,12 @@ public:
     void                    SetODFDefaultVersion( ODFDefaultVersion eVersion );
     ODFDefaultVersion       GetODFDefaultVersion() const;
 
+    void                    SetUseSHA1InODF12( sal_Bool bUse );
+    sal_Bool                IsUseSHA1InODF12() const;
+
+    void                    SetUseBlowfishInODF12( sal_Bool bUse );
+    sal_Bool                IsUseBlowfishInODF12() const;
+
     sal_Bool                IsReadOnly( EOption eOption ) const;
 };
 
diff --git a/unotools/source/config/saveopt.cxx b/unotools/source/config/saveopt.cxx
index 754c65d63ccf..83aea5d7cc9f 100644
--- a/unotools/source/config/saveopt.cxx
+++ b/unotools/source/config/saveopt.cxx
@@ -79,7 +79,11 @@ class SvtSaveOptions_Impl : public utl::ConfigItem
                                         bSaveUnpacked,
                                         bDoPrettyPrinting,
                                         bWarnAlienFormat,
-                                        bLoadDocPrinter;
+                                        bLoadDocPrinter,
+                                        bUseSHA1InODF12,
+                                        bUseBlowfishInODF12;
+
+    SvtSaveOptions::ODFDefaultVersion   eODFDefaultVersion;
 
     sal_Bool                            bROAutoSaveTime,
                                         bROUseUserData,
@@ -95,9 +99,9 @@ class SvtSaveOptions_Impl : public utl::ConfigItem
                                         bROWarnAlienFormat,
                                         bRODoPrettyPrinting,
                                         bROLoadDocPrinter,
-                                        bROODFDefaultVersion;
-
-    SvtSaveOptions::ODFDefaultVersion   eODFDefaultVersion;
+                                        bROODFDefaultVersion,
+                                        bROUseSHA1InODF12,
+                                        bROUseBlowfishInODF12;
 
 public:
                             SvtSaveOptions_Impl();
@@ -120,6 +124,9 @@ public:
     sal_Bool                IsPrettyPrintingEnabled( ) const    { return bDoPrettyPrinting; }
     sal_Bool                IsWarnAlienFormat() const           { return bWarnAlienFormat; }
     sal_Bool                IsLoadDocPrinter() const            { return bLoadDocPrinter; }
+    sal_Bool                IsUseSHA1InODF12() const            { return bUseSHA1InODF12; }
+    sal_Bool                IsUseBlowfishInODF12() const        { return bUseBlowfishInODF12; }
+
     SvtSaveOptions::ODFDefaultVersion
                             GetODFDefaultVersion() const        { return eODFDefaultVersion; }
 
@@ -137,6 +144,8 @@ public:
     void                    EnablePrettyPrinting( sal_Bool _bDoPP );
     void                    SetWarnAlienFormat( sal_Bool _bDoPP );
     void                    SetLoadDocPrinter( sal_Bool bNew );
+    void                    SetUseSHA1InODF12( sal_Bool bUse );
+    void                    SetUseBlowfishInODF12( sal_Bool bUse );
     void                    SetODFDefaultVersion( SvtSaveOptions::ODFDefaultVersion eNew );
 
     sal_Bool                IsReadOnly( SvtSaveOptions::EOption eOption ) const;
@@ -279,6 +288,24 @@ void SvtSaveOptions_Impl::SetODFDefaultVersion( SvtSaveOptions::ODFDefaultVersio
     }
 }
 
+void SvtSaveOptions_Impl::SetUseSHA1InODF12( sal_Bool bUse )
+{
+    if ( !bROUseSHA1InODF12 && bUseSHA1InODF12 != bUse )
+    {
+        bUseSHA1InODF12 = bUse;
+        SetModified();
+    }
+}
+
+void SvtSaveOptions_Impl::SetUseBlowfishInODF12( sal_Bool bUse )
+{
+    if ( !bROUseBlowfishInODF12 && bUseBlowfishInODF12 != bUse )
+    {
+        bUseBlowfishInODF12 = bUse;
+        SetModified();
+    }
+}
+
 sal_Bool SvtSaveOptions_Impl::IsReadOnly( SvtSaveOptions::EOption eOption ) const
 {
     sal_Bool bReadOnly = CFG_READONLY_DEFAULT;
@@ -329,6 +356,12 @@ sal_Bool SvtSaveOptions_Impl::IsReadOnly( SvtSaveOptions::EOption eOption ) cons
         case SvtSaveOptions::E_ODFDEFAULTVERSION :
             bReadOnly = bROLoadDocPrinter;
             break;
+        case SvtSaveOptions::E_USESHA1INODF12:
+            bReadOnly = bROUseSHA1InODF12;
+            break;
+        case SvtSaveOptions::E_USEBLOWFISHINODF12:
+            bReadOnly = bROUseBlowfishInODF12;
+            break;
     }
     return bReadOnly;
 }
@@ -349,6 +382,8 @@ sal_Bool SvtSaveOptions_Impl::IsReadOnly( SvtSaveOptions::EOption eOption ) cons
 #define INTERNET            13
 #define SAVEWORKINGSET      14
 #define ODFDEFAULTVERSION   15
+#define USESHA1INODF12      16
+#define USEBLOWFISHINODF12  17
 
 Sequence< OUString > GetPropertyNames()
 {
@@ -369,7 +404,9 @@ Sequence< OUString > GetPropertyNames()
         "URL/FileSystem",
         "URL/Internet",
         "WorkingSet",
-        "ODF/DefaultVersion"
+        "ODF/DefaultVersion",
+        "ODF/UseSHA1InODF12",
+        "ODF/UseBlowfishInODF12"
     };
 
     const int nCount = sizeof( aPropNames ) / sizeof( const char* );
@@ -399,6 +436,9 @@ SvtSaveOptions_Impl::SvtSaveOptions_Impl()
     , bDoPrettyPrinting( sal_False )
     , bWarnAlienFormat( sal_True )
     , bLoadDocPrinter( sal_True )
+    , bUseSHA1InODF12( sal_False )
+    , bUseBlowfishInODF12( sal_False )
+    , eODFDefaultVersion( SvtSaveOptions::ODFVER_LATEST )
     , bROAutoSaveTime( CFG_READONLY_DEFAULT )
     , bROUseUserData( CFG_READONLY_DEFAULT )
     , bROBackup( CFG_READONLY_DEFAULT )
@@ -414,7 +454,8 @@ SvtSaveOptions_Impl::SvtSaveOptions_Impl()
     , bRODoPrettyPrinting( CFG_READONLY_DEFAULT )
     , bROLoadDocPrinter( CFG_READONLY_DEFAULT )
     , bROODFDefaultVersion( CFG_READONLY_DEFAULT )
-    , eODFDefaultVersion( SvtSaveOptions::ODFVER_LATEST )
+    , bROUseSHA1InODF12( CFG_READONLY_DEFAULT )
+    , bROUseBlowfishInODF12( CFG_READONLY_DEFAULT )
 {
     Sequence< OUString > aNames = GetPropertyNames();
     Sequence< Any > aValues = GetProperties( aNames );
@@ -527,6 +568,16 @@ SvtSaveOptions_Impl::SvtSaveOptions_Impl()
                                     bROLoadDocPrinter = pROStates[nProp];
                                     break;
 
+                                case USESHA1INODF12:
+                                    bUseSHA1InODF12 = bTemp;
+                                    bROUseSHA1InODF12 = pROStates[nProp];
+                                    break;
+
+                                case USEBLOWFISHINODF12:
+                                    bUseBlowfishInODF12 = bTemp;
+                                    bROUseBlowfishInODF12 = pROStates[nProp];
+                                    break;
+
                                 default :
                                     DBG_ERRORFILE( "invalid index to load a path" );
                             }
@@ -704,6 +755,23 @@ void SvtSaveOptions_Impl::Commit()
                     ++nRealCount;
                 }
                 break;
+            case USESHA1INODF12:
+                if (!bROUseSHA1InODF12)
+                {
+                    pValues[nRealCount] <<= bUseSHA1InODF12;
+                    pNames[nRealCount] = pOrgNames[i];
+                    ++nRealCount;
+                }
+                break;
+            case USEBLOWFISHINODF12:
+                if (!bROUseBlowfishInODF12)
+                {
+                    pValues[nRealCount] <<= bUseBlowfishInODF12;
+                    pNames[nRealCount] = pOrgNames[i];
+                    ++nRealCount;
+                }
+                break;
+
             default:
                 DBG_ERRORFILE( "invalid index to save a path" );
         }
@@ -995,6 +1063,26 @@ SvtSaveOptions::ODFDefaultVersion SvtSaveOptions::GetODFDefaultVersion() const
     return pImp->pSaveOpt->GetODFDefaultVersion();
 }
 
+void SvtSaveOptions::SetUseSHA1InODF12( sal_Bool bUse )
+{
+    pImp->pSaveOpt->SetUseSHA1InODF12( bUse );
+}
+
+sal_Bool SvtSaveOptions::IsUseSHA1InODF12() const
+{
+    return pImp->pSaveOpt->IsUseSHA1InODF12();
+}
+
+void SvtSaveOptions::SetUseBlowfishInODF12( sal_Bool bUse )
+{
+    pImp->pSaveOpt->SetUseBlowfishInODF12( bUse );
+}
+
+sal_Bool SvtSaveOptions::IsUseBlowfishInODF12() const
+{
+    return pImp->pSaveOpt->IsUseBlowfishInODF12();
+}
+
 sal_Bool SvtSaveOptions::IsReadOnly( SvtSaveOptions::EOption eOption ) const
 {
     return pImp->pSaveOpt->IsReadOnly(eOption);
diff --git a/unotools/source/misc/fontcvt.cxx b/unotools/source/misc/fontcvt.cxx
index abeb9cbb6f80..00f4ffce1e6b 100644
--- a/unotools/source/misc/fontcvt.cxx
+++ b/unotools/source/misc/fontcvt.cxx
@@ -345,7 +345,7 @@ static const sal_Unicode aWingDings2Tab[224] =
         0xe5c1,    0xe5c2,    0xe5c3,    0xe5c4,
         0xe5c5,    0xe5c6,    0xe5c7,    0xe5c8,
     // F0f0
-        0xe5c9,    0x2022,    0xe5cb,    0xe5cc,
+        0xe5c9,    0,    0xe5cb,    0xe5cc,
         0xe5cd,    0xe5ce,    0xe5cf,    0xe5d0,
         0x203b,    0x2042,         0,         0,
              0,         0,         0,         0
diff --git a/vcl/unx/source/desktopdetect/makefile.mk b/vcl/AllLangResTarget_vcl.mk
index 83d5d29f4b71..9a3453af2810 100644
--- a/vcl/unx/source/desktopdetect/makefile.mk
+++ b/vcl/AllLangResTarget_vcl.mk
@@ -2,7 +2,7 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
+# Copyright 2009 by Sun Microsystems, Inc.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
@@ -14,44 +14,41 @@
 #
 # 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
+# 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
+# version 3 along with OpenOffice.org.	If not, see
 # <http://www.openoffice.org/license.html>
 # for a copy of the LGPLv3 License.
 #
 #*************************************************************************
 
-PRJ=..$/..$/..
+$(eval $(call gb_AllLangResTarget_AllLangResTarget,vcl))
 
-PRJNAME=vcl
-TARGET=dtdetect
+$(eval $(call gb_AllLangResTarget_set_reslocation,vcl,vcl))
 
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
+$(eval $(call gb_AllLangResTarget_add_srs,vcl,\
+    vcl/source/src \
+))
 
-# --- Settings -----------------------------------------------------
+$(eval $(call gb_SrsTarget_SrsTarget,vcl/source/src))
 
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile2.pmk
+$(eval $(call gb_SrsTarget_set_include,vcl/source/src,\
+        $$(INCLUDE) \
+        -I$(SRCDIR)/vcl/inc \
+))
 
-# --- Files --------------------------------------------------------
+$(eval $(call gb_SrsTarget_add_files,vcl/source/src,\
+    vcl/source/src/btntext.src \
+    vcl/source/src/helptext.src \
+    vcl/source/src/images.src \
+    vcl/source/src/menu.src \
+    vcl/source/src/print.src \
+    vcl/source/src/stdtext.src \
+    vcl/source/src/units.src \
+))
 
-.IF "$(GUIBASE)"!="unx"
 
-dummy:
-    @echo "Nothing to build for GUIBASE $(GUIBASE)"
-
-.ELSE		# "$(GUIBASE)"!="unx"
-
-SLOFILES=$(SLO)$/desktopdetector.obj
-
-.ENDIF		# "$(GUIBASE)"!="unx"
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-.INCLUDE :  $(PRJ)$/util$/target.pmk
+# vim: set noet sw=4 ts=4:
diff --git a/vcl/Library_desktop_detector.mk b/vcl/Library_desktop_detector.mk
new file mode 100644
index 000000000000..7963b1cfe5d5
--- /dev/null
+++ b/vcl/Library_desktop_detector.mk
@@ -0,0 +1,82 @@
+#*************************************************************************
+#
+# 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_Library_Library,desktop_detector))
+
+#$(eval $(call gb_Library_add_package_headers,vcl,vcl_inc))
+
+$(eval $(call gb_Library_add_precompiled_header,desktop_detector,$(SRCDIR)/vcl/inc/pch/precompiled_vcl))
+
+$(eval $(call gb_Library_set_include,desktop_detector,\
+    $$(INCLUDE) \
+    -I$(SRCDIR)/vcl/inc \
+    -I$(SRCDIR)/vcl/inc/pch \
+    -I$(SRCDIR)/solenv/inc \
+    -I$(OUTDIR)/inc/offuh \
+    -I$(OUTDIR)/inc \
+))
+
+$(eval $(call gb_Library_set_defs,vclplug_kde,\
+    $$(DEFS) \
+    -DDESKTOP_DETECTOR_IMPLEMENTATION \
+))
+
+$(eval $(call gb_Library_add_linked_libs,desktop_detector,\
+    vcl \
+    tl \
+    utl \
+    sot \
+    ucbhelper \
+    basegfx \
+    comphelper \
+    cppuhelper \
+    icuuc \
+    icule \
+    i18nisolang1 \
+    i18npaper \
+    i18nutil \
+    jvmaccess \
+    cppu \
+    sal \
+    X11 \
+    Xext \
+    SM \
+    ICE \
+))
+
+$(eval $(call gb_Library_add_exception_objects,vclplug_kde,\
+    vcl/unx/generic/desktopdetect/desktopdetector \
+))
+
+ifeq ($(OS),LINUX)
+$(eval $(call gb_Library_add_linked_libs,desktop_detector,\
+    dl \
+    m \
+    pthread \
+))
+endif
+# vim: set noet sw=4 ts=4:
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
new file mode 100755
index 000000000000..44df1f03ffde
--- /dev/null
+++ b/vcl/Library_vcl.mk
@@ -0,0 +1,510 @@
+#*************************************************************************
+#
+# 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_Library_Library,vcl))
+
+ifeq ($(OS),MACOSX)
+$(eval $(call gb_Library_set_componentfile,vcl,vcl/vcl.macosx,vcl/vcl))
+else ifeq ($(OS),WNT)
+$(eval $(call gb_Library_set_componentfile,vcl,vcl/vcl.windows,vcl/vcl))
+else
+$(eval $(call gb_Library_set_componentfile,vcl,vcl/vcl.unx,vcl/vcl))
+endif
+
+$(eval $(call gb_Library_add_package_headers,vcl,vcl_inc))
+$(eval $(call gb_Library_add_package_headers,vcl,vcl_afmhash))
+
+$(eval $(call gb_Library_set_include,vcl,\
+    $$(INCLUDE) \
+    -I$(SRCDIR)/vcl/inc \
+    -I$(SRCDIR)/vcl/inc/pch \
+    -I$(SRCDIR)/solenv/inc \
+    -I$(OUTDIR)/inc/offuh \
+    -I$(OUTDIR)/inc \
+	-I$(WORKDIR)/CustomTarget/vcl/unx/generic/fontmanager \
+))
+ifeq ($(GUIBASE),unx)
+$(eval $(call gb_Library_set_cxxflags,vcl,\
+    $$(CXXFLAGS) \
+    $$(FREETYPE_CFLAGS) \
+))
+endif
+
+$(eval $(call gb_Library_set_defs,vcl,\
+    $$(DEFS) \
+    -DVCL_DLLIMPLEMENTATION \
+    -DCUI_DLL_NAME=\"$(call gb_Library_get_runtime_filename,cui)\" \
+    -DDLLPOSTFIX=$(subst $(or $(gb_Library_DLLEXT),$(gb_Library_PLAINEXT)),,$(gb_Library_OOOEXT)) \
+))
+
+$(eval $(call gb_Library_add_linked_libs,vcl,\
+    tl \
+    utl \
+    sot \
+    ucbhelper \
+    basegfx \
+    comphelper \
+    cppuhelper \
+    icuuc \
+    icule \
+    i18nisolang1 \
+    i18npaper \
+    i18nutil \
+    jvmaccess \
+    cppu \
+    sal \
+    $(gb_STDLIBS) \
+))
+
+ifneq ($(ENABLE_GRAPHITE),)
+ifeq ($(OS),WNT)
+$(eval $(call gb_Library_add_linked_libs,vcl,\
+    graphite_dll \
+))
+endif
+endif
+ifeq ($(GUIBASE),unx)
+$(eval $(call gb_Library_add_linked_libs,vcl,\
+    freetype \
+))
+endif
+
+ifeq ($(GUIBASE),aqua)
+$(eval $(call gb_Library_set_cxxflags,vcl,\
+    $$(CXXFLAGS) \
+    $$(OBJCXXFLAGS) \
+))
+ifeq ($(ENABLE_CAIRO),TRUE)
+$(eval $(call gb_Library_set_defs,vclplug_gen,\
+    $$(DEFS) \
+    -DCAIRO \
+))
+endif
+$(eval $(call gb_Library_add_objcxxobjects,vcl,\
+    vcl/aqua/source/a11y/aqua11yactionwrapper \
+    vcl/aqua/source/a11y/aqua11ycomponentwrapper \
+    vcl/aqua/source/a11y/aqua11yfactory \
+    vcl/aqua/source/a11y/aqua11yrolehelper \
+    vcl/aqua/source/a11y/aqua11yselectionwrapper \
+    vcl/aqua/source/a11y/aqua11ytablewrapper \
+    vcl/aqua/source/a11y/aqua11ytextattributeswrapper \
+    vcl/aqua/source/a11y/aqua11ytextwrapper \
+    vcl/aqua/source/a11y/aqua11yutil \
+    vcl/aqua/source/a11y/aqua11yvaluewrapper \
+    vcl/aqua/source/a11y/aqua11ywrapper \
+    vcl/aqua/source/a11y/aqua11ywrapperbutton \
+    vcl/aqua/source/a11y/aqua11ywrappercheckbox \
+    vcl/aqua/source/a11y/aqua11ywrappercombobox \
+    vcl/aqua/source/a11y/aqua11ywrappergroup \
+    vcl/aqua/source/a11y/aqua11ywrapperlist \
+    vcl/aqua/source/a11y/aqua11ywrapperradiobutton \
+    vcl/aqua/source/a11y/aqua11ywrapperradiogroup \
+    vcl/aqua/source/a11y/aqua11ywrapperrow \
+    vcl/aqua/source/a11y/aqua11ywrapperscrollarea \
+    vcl/aqua/source/a11y/aqua11ywrapperscrollbar \
+    vcl/aqua/source/a11y/aqua11ywrappersplitter \
+    vcl/aqua/source/a11y/aqua11ywrapperstatictext \
+    vcl/aqua/source/a11y/aqua11ywrappertabgroup \
+    vcl/aqua/source/a11y/aqua11ywrappertextarea \
+    vcl/aqua/source/a11y/aqua11ywrappertoolbar \
+    vcl/aqua/source/app/salnstimer \
+    vcl/aqua/source/app/vclnsapp \
+    vcl/aqua/source/gdi/aquaprintaccessoryview \
+    vcl/aqua/source/gdi/aquaprintview \
+    vcl/aqua/source/window/salframeview \
+    vcl/aqua/source/window/salnsmenu \
+))
+$(eval $(call gb_Library_add_exception_objects,vcl,\
+    vcl/aqua/source/a11y/aqua11yfocuslistener \
+    vcl/aqua/source/a11y/aqua11yfocustracker \
+    vcl/aqua/source/a11y/aqua11ylistener \
+    vcl/aqua/source/a11y/documentfocuslistener \
+    vcl/aqua/source/app/saldata \
+    vcl/aqua/source/app/salinst \
+    vcl/aqua/source/app/salsys \
+    vcl/aqua/source/app/saltimer \
+    vcl/aqua/source/dtrans/DataFlavorMapping \
+    vcl/aqua/source/dtrans/DragActionConversion \
+    vcl/aqua/source/dtrans/DragSource \
+    vcl/aqua/source/dtrans/DragSourceContext \
+    vcl/aqua/source/dtrans/DropTarget \
+    vcl/aqua/source/dtrans/HtmlFmtFlt \
+    vcl/aqua/source/dtrans/OSXTransferable \
+    vcl/aqua/source/dtrans/PictToBmpFlt \
+    vcl/aqua/source/dtrans/aqua_clipboard \
+    vcl/aqua/source/dtrans/service_entry \
+    vcl/aqua/source/gdi/salatslayout \
+    vcl/aqua/source/gdi/salatsuifontutils \
+    vcl/aqua/source/gdi/salbmp \
+    vcl/aqua/source/gdi/salcolorutils \
+    vcl/aqua/source/gdi/salgdi \
+    vcl/aqua/source/gdi/salgdiutils \
+    vcl/aqua/source/gdi/salmathutils \
+    vcl/aqua/source/gdi/salnativewidgets \
+    vcl/aqua/source/gdi/salprn \
+    vcl/aqua/source/gdi/salvd \
+    vcl/aqua/source/window/salframe \
+    vcl/aqua/source/window/salmenu \
+    vcl/aqua/source/window/salobj \
+))
+endif
+
+ifeq ($(GUIBASE),unx)
+$(eval $(call gb_Library_set_defs,vcl,\
+    $$(DEFS) \
+    -DSAL_DLLPREFIX=\"$(gb_Library_SYSPRE)\" \
+    -DSAL_DLLPOSTFIX=\"$(gb_Library_OOOEXT)\" \
+    -D_XSALSET_LIBNAME=\"$(call gb_Library_get_runtime_filename,spa)\" \
+))
+## handle fontconfig
+ifneq ($(ENABLE_FONTCONFIG),)
+$(eval $(call gb_Library_set_defs,vcl,\
+    $$(DEFS) \
+    -DENABLE_FONTCONFIG \
+))
+## handle CUPS
+ifneq ($(ENABLE_CUPS),)
+$(eval $(call gb_Library_set_defs,vcl,\
+    $$(DEFS) \
+    -DENABLE_CUPS \
+))
+endif
+endif
+$(eval $(call gb_Library_add_exception_objects,vcl,\
+    vcl/source/glyphs/gcach_ftyp \
+    vcl/source/glyphs/gcach_layout \
+    vcl/source/glyphs/gcach_rbmp \
+    vcl/source/glyphs/glyphcache \
+    vcl/unx/generic/fontmanager/fontcache \
+    vcl/unx/generic/fontmanager/fontconfig \
+    vcl/unx/generic/fontmanager/fontmanager \
+    vcl/unx/generic/fontmanager/helper \
+    vcl/unx/generic/fontmanager/parseAFM \
+    vcl/unx/generic/plugadapt/salplug \
+    vcl/unx/generic/printer/cupsmgr \
+    vcl/unx/generic/printer/jobdata \
+    vcl/unx/generic/printer/ppdparser \
+    vcl/unx/generic/printer/printerinfomanager \
+))
+endif
+
+ifeq ($(OS),WNT)
+$(eval $(call gb_Library_add_exception_objects,vcl,\
+    vcl/win/source/app/saldata \
+    vcl/win/source/app/salinfo \
+    vcl/win/source/app/salinst \
+    vcl/win/source/app/salshl \
+    vcl/win/source/app/saltimer \
+    vcl/win/source/gdi/salbmp \
+    vcl/win/source/gdi/salgdi \
+    vcl/win/source/gdi/salgdi2 \
+    vcl/win/source/gdi/salgdi3 \
+    vcl/win/source/gdi/salgdi_gdiplus \
+    vcl/win/source/gdi/salnativewidgets-luna \
+    vcl/win/source/gdi/salprn \
+    vcl/win/source/gdi/salvd \
+    vcl/win/source/gdi/winlayout \
+    vcl/win/source/gdi/wntgdi \
+    vcl/win/source/window/salframe \
+    vcl/win/source/window/salmenu \
+    vcl/win/source/window/salobj \
+))
+
+$(eval $(call gb_Library_add_nativeres,vcl,src))
+
+endif
+
+$(eval $(call gb_Library_add_cobjects,vcl,\
+    vcl/source/fontsubset/list \
+))
+$(eval $(call gb_Library_add_exception_objects,vcl,\
+    vcl/source/app/brand \
+    vcl/source/app/dbggui \
+    vcl/source/app/dndhelp \
+    vcl/source/app/help \
+    vcl/source/app/i18nhelp \
+    vcl/source/app/idlemgr \
+    vcl/source/app/salvtables \
+    vcl/source/app/session \
+    vcl/source/app/settings \
+    vcl/source/app/solarmutex \
+    vcl/source/app/sound \
+    vcl/source/app/stdtext \
+    vcl/source/app/svapp \
+    vcl/source/app/svdata \
+    vcl/source/app/svmain \
+    vcl/source/app/svmainhook \
+    vcl/source/app/timer \
+    vcl/source/app/unohelp2 \
+    vcl/source/app/unohelp \
+    vcl/source/app/vclevent \
+    vcl/source/components/display \
+    vcl/source/components/dtranscomp \
+    vcl/source/components/factory \
+    vcl/source/components/fontident \
+    vcl/source/components/rasterizer_rsvg \
+    vcl/source/components/stringmirror \
+    vcl/source/control/button \
+    vcl/source/control/combobox \
+    vcl/source/control/ctrl \
+    vcl/source/control/edit \
+    vcl/source/control/field2 \
+    vcl/source/control/field \
+    vcl/source/control/fixbrd \
+    vcl/source/control/fixed \
+    vcl/source/control/group \
+    vcl/source/control/ilstbox \
+    vcl/source/control/imgctrl \
+    vcl/source/control/longcurr \
+    vcl/source/control/lstbox \
+    vcl/source/control/menubtn \
+    vcl/source/control/morebtn \
+    vcl/source/control/quickselectionengine \
+    vcl/source/control/scrbar \
+    vcl/source/control/slider \
+    vcl/source/control/spinbtn \
+    vcl/source/control/spinfld \
+    vcl/source/control/tabctrl \
+    vcl/source/control/throbber \
+    vcl/source/fontsubset/cff \
+    vcl/source/fontsubset/fontsubset \
+    vcl/source/fontsubset/gsub \
+    vcl/source/fontsubset/sft \
+    vcl/source/fontsubset/ttcr \
+    vcl/source/fontsubset/xlat \
+    vcl/source/gdi/alpha \
+    vcl/source/gdi/animate \
+    vcl/source/gdi/base14 \
+    vcl/source/gdi/bitmap2 \
+    vcl/source/gdi/bitmap3 \
+    vcl/source/gdi/bitmap4 \
+    vcl/source/gdi/bitmap \
+    vcl/source/gdi/bitmapex \
+    vcl/source/gdi/bmpacc2 \
+    vcl/source/gdi/bmpacc3 \
+    vcl/source/gdi/bmpacc \
+    vcl/source/gdi/bmpconv \
+    vcl/source/gdi/bmpfast \
+    vcl/source/gdi/configsettings \
+    vcl/source/gdi/cvtgrf \
+    vcl/source/gdi/cvtsvm \
+    vcl/source/gdi/extoutdevdata \
+    vcl/source/gdi/font \
+    vcl/source/gdi/gdimtf \
+    vcl/source/gdi/gfxlink \
+    vcl/source/gdi/gradient \
+    vcl/source/gdi/graph \
+    vcl/source/gdi/graphictools \
+    vcl/source/gdi/hatch \
+    vcl/source/gdi/image \
+    vcl/source/gdi/imagerepository \
+    vcl/source/gdi/impanmvw \
+    vcl/source/gdi/impbmp \
+    vcl/source/gdi/impgraph \
+    vcl/source/gdi/impimage \
+    vcl/source/gdi/impimagetree \
+    vcl/source/gdi/impvect \
+    vcl/source/gdi/jobset \
+    vcl/source/gdi/lineinfo \
+    vcl/source/gdi/mapmod \
+    vcl/source/gdi/metaact \
+    vcl/source/gdi/metric \
+    vcl/source/gdi/octree \
+    vcl/source/gdi/oldprintadaptor \
+    vcl/source/gdi/outdev2 \
+    vcl/source/gdi/outdev3 \
+    vcl/source/gdi/outdev4 \
+    vcl/source/gdi/outdev5 \
+    vcl/source/gdi/outdev6 \
+    vcl/source/gdi/outdev \
+    vcl/source/gdi/outdevnative \
+    vcl/source/gdi/outmap \
+    vcl/source/gdi/pdfextoutdevdata \
+    vcl/source/gdi/pdffontcache \
+    vcl/source/gdi/pdfwriter \
+    vcl/source/gdi/pdfwriter_impl2 \
+    vcl/source/gdi/pdfwriter_impl \
+    vcl/source/gdi/pngread \
+    vcl/source/gdi/pngwrite \
+    vcl/source/gdi/print2 \
+    vcl/source/gdi/print3 \
+    vcl/source/gdi/print \
+    vcl/source/gdi/regband \
+    vcl/source/gdi/region \
+    vcl/source/gdi/rendergraphic \
+    vcl/source/gdi/rendergraphicrasterizer \
+    vcl/source/gdi/salgdilayout \
+    vcl/source/gdi/sallayout \
+    vcl/source/gdi/salmisc \
+    vcl/source/gdi/salnativewidgets-none \
+    vcl/source/gdi/svgread \
+    vcl/source/gdi/textlayout \
+    vcl/source/gdi/virdev \
+    vcl/source/gdi/wall \
+    vcl/source/helper/canvasbitmap \
+    vcl/source/helper/canvastools \
+    vcl/source/helper/evntpost \
+    vcl/source/helper/lazydelete \
+    vcl/source/helper/strhelper \
+    vcl/source/helper/threadex \
+    vcl/source/helper/xconnection \
+    vcl/source/salmain/salmain \
+    vcl/source/window/abstdlg \
+    vcl/source/window/accel \
+    vcl/source/window/accmgr \
+    vcl/source/window/arrange \
+    vcl/source/window/brdwin \
+    vcl/source/window/btndlg \
+    vcl/source/window/cmdevt \
+    vcl/source/window/cursor \
+    vcl/source/window/decoview \
+    vcl/source/window/dialog \
+    vcl/source/window/dlgctrl \
+    vcl/source/window/dndevdis \
+    vcl/source/window/dndlcon \
+    vcl/source/window/dockingarea \
+    vcl/source/window/dockmgr \
+    vcl/source/window/dockwin \
+    vcl/source/window/floatwin \
+    vcl/source/window/introwin \
+    vcl/source/window/javachild \
+    vcl/source/window/keycod \
+    vcl/source/window/keyevent \
+    vcl/source/window/menu \
+    vcl/source/window/mnemonic \
+    vcl/source/window/mnemonicengine \
+    vcl/source/window/mouseevent \
+    vcl/source/window/msgbox \
+    vcl/source/window/popupmenuwindow \
+    vcl/source/window/printdlg \
+    vcl/source/window/scrwnd \
+    vcl/source/window/seleng \
+    vcl/source/window/split \
+    vcl/source/window/splitwin \
+    vcl/source/window/status \
+    vcl/source/window/syschild \
+    vcl/source/window/syswin \
+    vcl/source/window/tabdlg \
+    vcl/source/window/tabpage \
+    vcl/source/window/taskpanelist \
+    vcl/source/window/toolbox2 \
+    vcl/source/window/toolbox \
+    vcl/source/window/window2 \
+    vcl/source/window/window3 \
+    vcl/source/window/window4 \
+    vcl/source/window/window \
+    vcl/source/window/winproc \
+    vcl/source/window/wpropset \
+    vcl/source/window/wrkwin \
+))
+
+## handle Graphite
+ifneq ($(ENABLE_GRAPHITE),)
+$(eval $(call gb_Library_set_defs,vcl,\
+    $$(DEFS) \
+    -DENABLE_GRAPHITE \
+))
+$(eval $(call gb_Library_add_exception_objects,vcl,\
+    vcl/source/glyphs/graphite_features \
+    vcl/source/glyphs/graphite_layout \
+))
+ifeq ($(GUIBASE),unx)
+$(eval $(call gb_Library_add_exception_objects,vcl,\
+    vcl/source/glyphs/graphite_serverfont \
+))
+ifeq ($(SYSTEM_GRAPHITE),YES)
+$(eval $(call gb_Library_set_ldflags,vcl,\
+    $$(LDFLAGS) \
+    $(GRAPHITE_LIBS)
+))
+else
+$(eval $(call gb_Library_add_linked_static_libs,vcl,\
+    graphite2_off \
+))
+endif
+endif
+endif
+
+ifeq ($(OS),LINUX)
+$(eval $(call gb_Library_add_linked_libs,vcl,\
+    dl \
+    m \
+    pthread \
+))
+endif
+
+ifeq ($(OS),SOLARIS)
+ifeq ($(CPUNAME)$(CPU),SPARCU)
+$(eval $(call gb_Library_set_ldflags,vcl,\
+    $$(LDFLAGS) \
+    -R/usr/sfw/lib/64 \
+))
+else
+$(eval $(call gb_Library_set_ldflags,vcl,\
+    $$(LDFLAGS) \
+    -R/usr/sfw/lib \
+))
+endif
+endif
+
+ifeq ($(GUIBASE),aqua)
+$(eval $(call gb_Library_add_linked_libs,vcl,\
+    AppleRemote \
+))
+$(eval $(call gb_Library_set_ldflags,vcl,\
+    $$(LDFLAGS) \
+    -framework QuickTime \
+    -framework Cocoa \
+    -framework Carbon \
+    -framework CoreFoundation \
+))
+endif
+
+ifeq ($(OS),WNT)
+$(eval $(call gb_Library_set_ldflags,vcl,\
+    $$(LDFLAGS) \
+    /ENTRY:LibMain@12 \
+))
+$(eval $(call gb_Library_add_linked_libs,vcl,\
+    advapi32 \
+    gdi32 \
+    gdiplus \
+    imm32 \
+    kernel32 \
+    mpr \
+    msimg32 \
+    msvcrt \
+    oldnames \
+    ole32 \
+    shell32 \
+    user32 \
+    uuid \
+    uwinapi \
+    winspool \
+))
+endif
+# vim: set noet sw=4 ts=4:
diff --git a/vcl/Library_vclplug_gen.mk b/vcl/Library_vclplug_gen.mk
new file mode 100755
index 000000000000..494f36acc349
--- /dev/null
+++ b/vcl/Library_vclplug_gen.mk
@@ -0,0 +1,203 @@
+#*************************************************************************
+#
+# 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_Library_Library,vclplug_gen))
+
+$(eval $(call gb_Library_set_include,vclplug_gen,\
+    $$(INCLUDE) \
+    -I$(SRCDIR)/vcl/inc \
+    -I$(SRCDIR)/vcl/inc/pch \
+    -I$(SRCDIR)/solenv/inc \
+    -I$(OUTDIR)/inc/offuh \
+    -I$(OUTDIR)/inc \
+))
+
+$(eval $(call gb_Library_add_linked_libs,vclplug_gen,\
+    vcl \
+    tl \
+    utl \
+    sot \
+    ucbhelper \
+    basegfx \
+    comphelper \
+    cppuhelper \
+    icuuc \
+    icule \
+    i18nisolang1 \
+    i18npaper \
+    i18nutil \
+    jvmaccess \
+    cppu \
+    sal \
+    X11 \
+    Xext \
+    SM \
+    ICE \
+    $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,vclplug_gen,\
+    vcl/unx/generic/app/i18n_cb \
+    vcl/unx/generic/app/i18n_ic \
+    vcl/unx/generic/app/i18n_im \
+    vcl/unx/generic/app/i18n_keysym \
+    vcl/unx/generic/app/i18n_status \
+    vcl/unx/generic/app/i18n_wrp \
+    vcl/unx/generic/app/i18n_xkb \
+    vcl/unx/generic/app/keysymnames \
+    vcl/unx/generic/app/randrwrapper \
+    vcl/unx/generic/app/saldata \
+    vcl/unx/generic/app/saldisp \
+    vcl/unx/generic/app/salinst \
+    vcl/unx/generic/app/salsys \
+    vcl/unx/generic/app/saltimer \
+    vcl/unx/generic/app/sm \
+    vcl/unx/generic/app/soicon \
+    vcl/unx/generic/app/wmadaptor \
+    vcl/unx/generic/dtrans/bmp \
+    vcl/unx/generic/dtrans/config \
+    vcl/unx/generic/dtrans/X11_clipboard \
+    vcl/unx/generic/dtrans/X11_dndcontext \
+    vcl/unx/generic/dtrans/X11_droptarget \
+    vcl/unx/generic/dtrans/X11_selection \
+    vcl/unx/generic/dtrans/X11_service \
+    vcl/unx/generic/dtrans/X11_transferable \
+    vcl/unx/generic/gdi/cdeint \
+    vcl/unx/generic/gdi/dtint \
+    vcl/unx/generic/gdi/gcach_xpeer \
+    vcl/unx/generic/gdi/pspgraphics \
+    vcl/unx/generic/gdi/salbmp \
+    vcl/unx/generic/gdi/salcvt \
+    vcl/unx/generic/gdi/salgdi2 \
+    vcl/unx/generic/gdi/salgdi3 \
+    vcl/unx/generic/gdi/salgdi \
+    vcl/unx/generic/gdi/salprnpsp \
+    vcl/unx/generic/gdi/salvd \
+    vcl/unx/generic/gdi/xrender_peer \
+    vcl/unx/generic/printergfx/bitmap_gfx \
+    vcl/unx/generic/printergfx/common_gfx \
+    vcl/unx/generic/printergfx/glyphset \
+    vcl/unx/generic/printergfx/printerjob \
+    vcl/unx/generic/printergfx/psputil \
+    vcl/unx/generic/printergfx/text_gfx \
+    vcl/unx/generic/window/FWS \
+    vcl/unx/generic/window/salframe \
+    vcl/unx/generic/window/salobj \
+))
+
+$(eval $(call gb_Library_set_defs,vclplug_gen,\
+    $$(DEFS) \
+    -D_XSALSET_LIBNAME=\"$(call gb_Library_get_runtime_filename,spa)\" \
+    -DVCLPLUG_GEN_IMPLEMENTATION \
+))
+
+
+## handle RandR 
+ifneq ($(ENABLE_RANDR),)
+$(eval $(call gb_Library_set_defs,vclplug_gen,\
+    $$(DEFS) \
+    -DUSE_RANDR \
+))
+ifeq ($(XRANDR_DLOPEN),FALSE)
+$(eval $(call gb_Library_set_cxxflags,vclplug_gen,\
+    $$(CXXFLAGS) \
+    $$(XRANDR_CFLAGS) \
+))
+$(eval $(call gb_Library_set_ldflags,vclplug_gen,\
+    $$(LDFLAGS) \
+    $(XRANDR_LIBS) \
+))
+else
+$(eval $(call gb_Library_set_defs,vclplug_gen,\
+    $$(DEFS) \
+    -DXRANDR_DLOPEN \
+))
+endif
+endif
+
+## handle Xinerama
+ifneq ($(USE_XINERAMA),NO)
+ifneq ($(OS),SOLARIS)
+# not Solaris
+$(eval $(call gb_Library_set_defs,vclplug_gen,\
+    $$(DEFS) \
+    -DUSE_XINERAMA_XORG \
+))
+ifeq ($(XINERAMA_LINK),dynamic)
+$(eval $(call gb_Library_set_ldflags,vclplug_gen,\
+    $$(LDFLAGS) \
+    -lXinerama \
+))
+else
+$(eval $(call gb_Library_set_ldflags,vclplug_gen,\
+    $$(LDFLAGS) \
+    -Wl,-Bstatic -lXinerama -Wl,-Bdynamic \
+))
+endif
+else
+# Solaris
+$(eval $(call gb_Library_set_defs,vclplug_gen,\
+    $$(DEFS) \
+    -DUSE_XINERAMA_XSUN \
+))
+ifeq ($(USE_XINERAMA_VERSION),Xorg)
+# Solaris, Xorg
+ifeq ($(XINERAMA_LINK),dynamic)
+$(eval $(call gb_Library_set_ldflags,vclplug_gen,\
+    $$(LDFLAGS) \
+    -lXinerama \
+))
+else
+$(eval $(call gb_Library_set_ldflags,vclplug_gen,\
+    $$(LDFLAGS) \
+    -Wl,-Bstatic -lXinerama -Wl,-Bdynamic \
+))
+endif
+endif
+endif
+endif
+
+## handle Render linking
+ifeq ($(XRENDER_LINK),YES)
+$(eval $(call gb_Library_set_defs,vclplug_gen,\
+    $$(DEFS) \
+    -DXRENDER_LINK \
+))
+$(eval $(call gb_Library_set_ldflags,vclplug_gen,\
+    $$(LDFLAGS) \
+    $(shell pkg-config --libs xrender) \
+))
+endif
+
+ifeq ($(OS),LINUX)
+$(eval $(call gb_Library_add_linked_libs,vclplug_gen,\
+    dl \
+    m \
+    pthread \
+))
+endif
+# vim: set noet sw=4 ts=4:
diff --git a/vcl/Library_vclplug_gtk.mk b/vcl/Library_vclplug_gtk.mk
new file mode 100755
index 000000000000..62f5c334a23c
--- /dev/null
+++ b/vcl/Library_vclplug_gtk.mk
@@ -0,0 +1,125 @@
+#*************************************************************************
+#
+# 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_Library_Library,vclplug_gtk))
+
+$(eval $(call gb_Library_set_include,vclplug_gtk,\
+    $$(INCLUDE) \
+    -I$(SRCDIR)/vcl/inc \
+    -I$(SRCDIR)/vcl/inc/pch \
+    -I$(SRCDIR)/solenv/inc \
+    -I$(OUTDIR)/inc/offuh \
+    -I$(OUTDIR)/inc \
+))
+
+$(eval $(call gb_Library_set_cxxflags,vclplug_gtk,\
+    $$(CXXFLAGS) \
+    $$(GTK_CFLAGS) \
+))
+
+$(eval $(call gb_Library_set_defs,vclplug_gtk,\
+    $$(DEFS) \
+    -DVCLPLUG_GTK_IMPLEMENTATION \
+    -DVERSION=\"$(UPD)$(LAST_MINOR)\" \
+))
+
+ifneq ($(ENABLE_DBUS),)
+$(eval $(call gb_Library_set_defs,vclplug_gtk,\
+    $$(DEFS) \
+    -DENABLE_DBUS \
+))
+$(eval $(call gb_Library_set_ldflags,vclplug_gtk,\
+    $$(LDFLAGS) \
+    $(shell pkg-config --libs dbus-glib-1)\
+))
+endif
+
+$(eval $(call gb_Library_set_ldflags,vclplug_gtk,\
+    $$(LDFLAGS) \
+    $$(GTK_LIBS) \
+    $$(GTHREAD_LIBS) \
+))
+
+$(eval $(call gb_Library_add_linked_libs,vclplug_gtk,\
+    vclplug_gen \
+    vcl \
+    tl \
+    utl \
+    sot \
+    ucbhelper \
+    basegfx \
+    comphelper \
+    cppuhelper \
+    icuuc \
+    icule \
+    i18nisolang1 \
+    i18npaper \
+    i18nutil \
+    jvmaccess \
+    cppu \
+    sal \
+    X11 \
+    Xext \
+    SM \
+    ICE \
+    $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,vclplug_gtk,\
+    vcl/unx/gtk/a11y/atkaction \
+    vcl/unx/gtk/a11y/atkbridge \
+    vcl/unx/gtk/a11y/atkcomponent \
+    vcl/unx/gtk/a11y/atkeditabletext \
+    vcl/unx/gtk/a11y/atkfactory \
+    vcl/unx/gtk/a11y/atkhypertext \
+    vcl/unx/gtk/a11y/atkimage \
+    vcl/unx/gtk/a11y/atklistener \
+    vcl/unx/gtk/a11y/atkregistry \
+    vcl/unx/gtk/a11y/atkselection \
+    vcl/unx/gtk/a11y/atktable \
+    vcl/unx/gtk/a11y/atktextattributes \
+    vcl/unx/gtk/a11y/atktext \
+    vcl/unx/gtk/a11y/atkutil \
+    vcl/unx/gtk/a11y/atkvalue \
+    vcl/unx/gtk/a11y/atkwindow \
+    vcl/unx/gtk/a11y/atkwrapper \
+    vcl/unx/gtk/app/gtkdata \
+    vcl/unx/gtk/app/gtkinst \
+    vcl/unx/gtk/app/gtksys \
+    vcl/unx/gtk/gdi/salnativewidgets-gtk \
+    vcl/unx/gtk/window/gtkframe \
+    vcl/unx/gtk/window/gtkobject \
+))
+
+ifeq ($(OS),LINUX)
+$(eval $(call gb_Library_add_linked_libs,vclplug_gtk,\
+    dl \
+    m \
+    pthread \
+))
+endif
+# vim: set noet sw=4 ts=4:
diff --git a/vcl/Library_vclplug_kde.mk b/vcl/Library_vclplug_kde.mk
new file mode 100755
index 000000000000..efb134d912ac
--- /dev/null
+++ b/vcl/Library_vclplug_kde.mk
@@ -0,0 +1,90 @@
+#*************************************************************************
+#
+# 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_Library_Library,vclplug_kde))
+
+$(eval $(call gb_Library_set_include,vclplug_kde,\
+    $$(INCLUDE) \
+    -I$(SRCDIR)/vcl/inc \
+    -I$(SRCDIR)/vcl/inc/pch \
+    -I$(SRCDIR)/solenv/inc \
+    -I$(OUTDIR)/inc/offuh \
+    -I$(OUTDIR)/inc \
+))
+
+$(eval $(call gb_Library_set_cxxflags,vclplug_kde,\
+    $$(CXXFLAGS) \
+    $$(KDE_CFLAGS) \
+))
+
+$(eval $(call gb_Library_set_defs,vclplug_kde,\
+    $$(DEFS) \
+    -DVCLPLUG_KDE_IMPLEMENTATION \
+))
+
+$(eval $(call gb_Library_set_ldflags,vclplug_kde,\
+    $$(KDE_LIBS)\
+    $$(LDFLAGS) \
+))
+
+$(eval $(call gb_Library_add_linked_libs,vclplug_kde,\
+    vclplug_gen \
+    vcl \
+    tl \
+    utl \
+    sot \
+    ucbhelper \
+    basegfx \
+    comphelper \
+    cppuhelper \
+    icuuc \
+    icule \
+    i18nisolang1 \
+    i18npaper \
+    i18nutil \
+    jvmaccess \
+    cppu \
+    sal \
+    X11 \
+    Xext \
+    SM \
+    ICE \
+))
+
+$(eval $(call gb_Library_add_exception_objects,vclplug_kde,\
+    vcl/unx/kde/kdedata \
+    vcl/unx/kde/salnativewidgets-kde \
+))
+
+ifeq ($(OS),LINUX)
+$(eval $(call gb_Library_add_linked_libs,vclplug_kde,\
+    dl \
+    m \
+    pthread \
+))
+endif
+# vim: set noet sw=4 ts=4:
diff --git a/vcl/Library_vclplug_kde4.mk b/vcl/Library_vclplug_kde4.mk
new file mode 100755
index 000000000000..e7160ee55906
--- /dev/null
+++ b/vcl/Library_vclplug_kde4.mk
@@ -0,0 +1,96 @@
+#*************************************************************************
+#
+# 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_Library_Library,vclplug_kde4))
+
+$(eval $(call gb_Library_set_include,vclplug_kde4,\
+    $$(INCLUDE) \
+    -I$(SRCDIR)/vcl/inc \
+    -I$(SRCDIR)/vcl/inc/pch \
+    -I$(SRCDIR)/solenv/inc \
+    -I$(OUTDIR)/inc/offuh \
+    -I$(OUTDIR)/inc \
+))
+
+$(eval $(call gb_Library_set_cxxflags,vclplug_kde4,\
+    $$(CXXFLAGS) \
+    $$(KDE4_CFLAGS) \
+))
+
+$(eval $(call gb_Library_set_defs,vclplug_kde4,\
+    $$(DEFS) \
+    -DVCLPLUG_KDE4_IMPLEMENTATION \
+))
+
+$(eval $(call gb_Library_set_ldflags,vclplug_kde4,\
+    $$(KDE4_LIBS)\
+    $$(LDFLAGS) \
+))
+
+$(eval $(call gb_Library_add_linked_libs,vclplug_kde4,\
+    vclplug_gen \
+    vcl \
+    tl \
+    utl \
+    sot \
+    ucbhelper \
+    basegfx \
+    comphelper \
+    cppuhelper \
+    icuuc \
+    icule \
+    i18nisolang1 \
+    i18npaper \
+    i18nutil \
+    jvmaccess \
+    cppu \
+    sal \
+    X11 \
+    Xext \
+    SM \
+    ICE \
+))
+
+$(eval $(call gb_Library_add_exception_objects,vclplug_kde4,\
+    vcl/unx/kde4/KDEData \
+    vcl/unx/kde4/KDESalDisplay \
+    vcl/unx/kde4/KDESalFrame \
+    vcl/unx/kde4/KDESalGraphics \
+    vcl/unx/kde4/KDESalInstance \
+    vcl/unx/kde4/KDEXLib \
+    vcl/unx/kde4/main \
+    vcl/unx/kde4/VCLKDEApplication \
+))
+
+ifeq ($(OS),LINUX)
+$(eval $(call gb_Library_add_linked_libs,vclplug_kde4,\
+    dl \
+    m \
+    pthread \
+))
+endif
+# vim: set noet sw=4 ts=4:
diff --git a/vcl/Library_vclplug_svp.mk b/vcl/Library_vclplug_svp.mk
new file mode 100755
index 000000000000..e62e50beeaa0
--- /dev/null
+++ b/vcl/Library_vclplug_svp.mk
@@ -0,0 +1,96 @@
+#*************************************************************************
+#
+# 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_Library_Library,vclplug_svp))
+
+$(eval $(call gb_Library_set_include,vclplug_svp,\
+    $$(INCLUDE) \
+    -I$(SRCDIR)/vcl/inc \
+    -I$(SRCDIR)/vcl/inc/pch \
+    -I$(SRCDIR)/solenv/inc \
+    -I$(OUTDIR)/inc/offuh \
+    -I$(OUTDIR)/inc \
+))
+
+$(eval $(call gb_Library_set_defs,vclplug_svp,\
+    $$(DEFS) \
+    -DVCLPLUG_SVP_IMPLEMENTATION \
+))
+
+$(eval $(call gb_Library_add_linked_libs,vclplug_svp,\
+    vcl \
+    vclplug_gen \
+    tl \
+    utl \
+    sot \
+    ucbhelper \
+    basegfx \
+    basebmp \
+    comphelper \
+    cppuhelper \
+    icuuc \
+    icule \
+    i18nisolang1 \
+    i18npaper \
+    i18nutil \
+    jvmaccess \
+    cppu \
+    sal \
+    X11 \
+    Xext \
+    SM \
+    ICE \
+    $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,vclplug_svp,\
+    vcl/unx/generic/printergfx/bitmap_gfx \
+    vcl/unx/generic/printergfx/common_gfx \
+    vcl/unx/generic/printergfx/glyphset \
+    vcl/unx/generic/printergfx/printerjob \
+    vcl/unx/generic/printergfx/psputil \
+    vcl/unx/generic/printergfx/text_gfx \
+    vcl/unx/headless/svpbmp \
+    vcl/unx/headless/svpdummies \
+    vcl/unx/headless/svpelement \
+    vcl/unx/headless/svpframe \
+    vcl/unx/headless/svpgdi \
+    vcl/unx/headless/svpinst \
+    vcl/unx/headless/svpprn \
+    vcl/unx/headless/svppspgraphics \
+    vcl/unx/headless/svptext \
+    vcl/unx/headless/svpvd \
+))
+
+ifeq ($(OS),LINUX)
+$(eval $(call gb_Library_add_linked_libs,vclplug_svp,\
+    dl \
+    m \
+    pthread \
+))
+endif
+# vim: set noet sw=4 ts=4:
diff --git a/vcl/source/salmain/makefile.mk b/vcl/Makefile
index 9c790bf28d75..a79aff831024 100644
--- a/vcl/source/salmain/makefile.mk
+++ b/vcl/Makefile
@@ -25,17 +25,14 @@
 #
 #*************************************************************************
 
-PRJ = ..$/..
-PRJNAME = vcl
-TARGET = salmain
-ENABLE_EXCEPTIONS = TRUE
+ifeq ($(strip $(SOLARENV)),)
+$(error No environment set!)
+endif
 
-.INCLUDE: settings.mk
+gb_PARTIALBUILD := T
+GBUILDDIR := $(SOLARENV)/gbuild
+include $(GBUILDDIR)/gbuild.mk
 
-OBJFILES = $(OBJ)$/salmain.obj
+$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
 
-LIB1TARGET=$(LB)$/vclmain.lib
-LIB1ARCHIV=$(LB)$/libvclmain.a
-LIB1FILES=$(LB)$/salmain.lib
-
-.INCLUDE: target.mk
+# vim: set noet sw=4 ts=4:
diff --git a/vcl/aqua/source/res/makefile.mk b/vcl/Module_vcl.mk
index 8cc46caf443b..895e479de822 100644
--- a/vcl/aqua/source/res/makefile.mk
+++ b/vcl/Module_vcl.mk
@@ -25,29 +25,51 @@
 #
 #*************************************************************************
 
-PRJ=..$/..$/..
-TARGET=aquares
 
-# --- Settings -------------------------------------------------
+$(eval $(call gb_Module_Module,vcl))
 
-.INCLUDE :	settings.mk
+$(eval $(call gb_Module_add_targets,vcl,\
+    Library_vcl \
+    StaticLibrary_vclmain \
+    Package_inc \
+    AllLangResTarget_vcl \
+))
 
-# --- Files ----------------------------------------------------
+ifeq ($(GUIBASE),unx)
+$(eval $(call gb_Module_add_targets,vcl,\
+    Library_vclplug_gen \
+    Library_vclplug_svp \
+    Library_desktop_detector \
+	Package_afmhash \
+))
 
-.IF "$(OS)"!="MACOSX"
+ifneq ($(ENABLE_GTK),)
+$(eval $(call gb_Module_add_targets,vcl,\
+    Library_vclplug_gtk \
+))
+endif
+ifneq ($(ENABLE_KDE),)
+$(eval $(call gb_Module_add_targets,vcl,\
+    Library_vclplug_kde \
+))
+endif
+ifneq ($(ENABLE_KDE4),)
+$(eval $(call gb_Module_add_targets,vcl,\
+    Library_vclplug_kde4 \
+))
+endif
+endif
 
-dummy:
-        @echo "Nothing to build for OS $(OS)"
+ifeq ($(GUIBASE),aqua)
+$(eval $(call gb_Module_add_targets,vcl,\
+    Package_osx \
+))
+endif
 
-.ELSE           # "$(OS)"!="MACOSX"
-
-ZIPFLAGS = -r
-ZIP1TARGET = osxres
-ZIP1LIST = MainMenu.nib/*.nib cursors/*.png
-
-# --- Targets --------------------------------------------------
-
-.INCLUDE : target.mk
-
-.ENDIF		# "$(OS)"!="MACOSX"	
+ifeq ($(GUIBASE),WIN)
+$(eval $(call gb_Module_add_targets,vcl,\
+    WinResTarget_vcl \
+))
+endif
 
+# vim: set noet sw=4 ts=4:
diff --git a/vcl/Package_afmhash.mk b/vcl/Package_afmhash.mk
new file mode 100644
index 000000000000..d3de8357eb93
--- /dev/null
+++ b/vcl/Package_afmhash.mk
@@ -0,0 +1,29 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#        Bjoern Michaelsen <bjoern.michaelsen@canonical.com> (Canonical Ltd.)
+# Portions created by the Initial Developer are Copyright (C) 2011 the
+# Initial Developer. All Rights Reserved.
+#
+# Contributor(s): Jan Holesovsky <kendy@suse.cz>
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Package_Package,vcl_afmhash,$(WORKDIR)/CustomTarget/vcl/unx/generic/fontmanager))
+$(eval $(call gb_Package_add_customtarget,vcl_afmhash,vcl/unx/generic/fontmanager))
+
+# vim: set noet sw=4:
diff --git a/vcl/Package_inc.mk b/vcl/Package_inc.mk
new file mode 100644
index 000000000000..f45f2b9c3917
--- /dev/null
+++ b/vcl/Package_inc.mk
@@ -0,0 +1,168 @@
+#*************************************************************************
+#
+# 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_Package_Package,vcl_inc,$(SRCDIR)/vcl/inc))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/abstdlg.hxx,vcl/abstdlg.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/accel.hxx,vcl/accel.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/alpha.hxx,vcl/alpha.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/animate.hxx,vcl/animate.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/apptypes.hxx,vcl/apptypes.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/arrange.hxx,vcl/arrange.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/bitmapex.hxx,vcl/bitmapex.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/bitmap.hxx,vcl/bitmap.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/bmpacc.hxx,vcl/bmpacc.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/btndlg.hxx,vcl/btndlg.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/button.hxx,vcl/button.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/canvastools.hxx,vcl/canvastools.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/cmdevt.h,vcl/cmdevt.h))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/cmdevt.hxx,vcl/cmdevt.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/combobox.h,vcl/combobox.h))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/combobox.hxx,vcl/combobox.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/configsettings.hxx,vcl/configsettings.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/controllayout.hxx,vcl/controllayout.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/ctrl.hxx,vcl/ctrl.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/cursor.hxx,vcl/cursor.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/cvtgrf.hxx,vcl/cvtgrf.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/cvtsvm.hxx,vcl/cvtsvm.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/decoview.hxx,vcl/decoview.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/dialog.hxx,vcl/dialog.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/dllapi.h,vcl/dllapi.h))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/dndhelp.hxx,vcl/dndhelp.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/dockingarea.hxx,vcl/dockingarea.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/dockwin.hxx,vcl/dockwin.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/edit.hxx,vcl/edit.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/event.hxx,vcl/event.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/evntpost.hxx,vcl/evntpost.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/extoutdevdata.hxx,vcl/extoutdevdata.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/field.hxx,vcl/field.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/fixbrd.hxx,vcl/fixbrd.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/fixed.hxx,vcl/fixed.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/floatwin.hxx,vcl/floatwin.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/fntstyle.hxx,vcl/fntstyle.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/font.hxx,vcl/font.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/fontmanager.hxx,vcl/fontmanager.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/gdimtf.hxx,vcl/gdimtf.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/gfxlink.hxx,vcl/gfxlink.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/gradient.hxx,vcl/gradient.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/graph.h,vcl/graph.h))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/graph.hxx,vcl/graph.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/graphictools.hxx,vcl/graphictools.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/group.hxx,vcl/group.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/hatch.hxx,vcl/hatch.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/helper.hxx,vcl/helper.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/help.hxx,vcl/help.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/i18nhelp.hxx,vcl/i18nhelp.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/image.hxx,vcl/image.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/ImageListProvider.hxx,vcl/ImageListProvider.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/imagerepository.hxx,vcl/imagerepository.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/imgctrl.hxx,vcl/imgctrl.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/impdel.hxx,vcl/impdel.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/inputctx.hxx,vcl/inputctx.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/introwin.hxx,vcl/introwin.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/javachild.hxx,vcl/javachild.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/jobdata.hxx,vcl/jobdata.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/jobset.hxx,vcl/jobset.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/keycodes.hxx,vcl/keycodes.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/keycod.hxx,vcl/keycod.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/lazydelete.hxx,vcl/lazydelete.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/lineinfo.hxx,vcl/lineinfo.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/longcurr.hxx,vcl/longcurr.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/lstbox.h,vcl/lstbox.h))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/lstbox.hxx,vcl/lstbox.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/mapmod.hxx,vcl/mapmod.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/menubtn.hxx,vcl/menubtn.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/menu.hxx,vcl/menu.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/metaact.hxx,vcl/metaact.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/metric.hxx,vcl/metric.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/mnemonicengine.hxx,vcl/mnemonicengine.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/mnemonic.hxx,vcl/mnemonic.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/morebtn.hxx,vcl/morebtn.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/msgbox.hxx,vcl/msgbox.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/octree.hxx,vcl/octree.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/oldprintadaptor.hxx,vcl/oldprintadaptor.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/outdev.hxx,vcl/outdev.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/pdfextoutdevdata.hxx,vcl/pdfextoutdevdata.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/pdfwriter.hxx,vcl/pdfwriter.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/pngread.hxx,vcl/pngread.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/pngwrite.hxx,vcl/pngwrite.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/pointr.hxx,vcl/pointr.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/popupmenuwindow.hxx,vcl/popupmenuwindow.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/ppdparser.hxx,vcl/ppdparser.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/printerinfomanager.hxx,vcl/printerinfomanager.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/print.hxx,vcl/print.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/prntypes.hxx,vcl/prntypes.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/ptrstyle.hxx,vcl/ptrstyle.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/quickselectionengine.hxx,vcl/quickselectionengine.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/regband.hxx,vcl/regband.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/region.hxx,vcl/region.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/rendergraphicrasterizer.hxx,vcl/rendergraphicrasterizer.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/rendergraphic.hxx,vcl/rendergraphic.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/salbtype.hxx,vcl/salbtype.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/salctype.hxx,vcl/salctype.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/salgtype.hxx,vcl/salgtype.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/salnativewidgets.hxx,vcl/salnativewidgets.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/scrbar.hxx,vcl/scrbar.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/seleng.hxx,vcl/seleng.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/settings.hxx,vcl/settings.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/slider.hxx,vcl/slider.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/sndstyle.hxx,vcl/sndstyle.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/sound.hxx,vcl/sound.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/spinfld.hxx,vcl/spinfld.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/spin.h,vcl/spin.h))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/spin.hxx,vcl/spin.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/split.hxx,vcl/split.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/splitwin.hxx,vcl/splitwin.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/status.hxx,vcl/status.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/stdtext.hxx,vcl/stdtext.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/strhelper.hxx,vcl/strhelper.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/svapp.hxx,vcl/svapp.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/sv.h,vcl/sv.h))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/svgread.hxx,vcl/svgread.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/symbol.hxx,vcl/symbol.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/syschild.hxx,vcl/syschild.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/sysdata.hxx,vcl/sysdata.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/syswin.hxx,vcl/syswin.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/tabctrl.hxx,vcl/tabctrl.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/tabdlg.hxx,vcl/tabdlg.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/tabpage.hxx,vcl/tabpage.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/taskpanelist.hxx,vcl/taskpanelist.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/threadex.hxx,vcl/threadex.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/throbber.hxx,vcl/throbber.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/timer.hxx,vcl/timer.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/toolbox.hxx,vcl/toolbox.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/unohelp2.hxx,vcl/unohelp2.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/unohelp.hxx,vcl/unohelp.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/unowrap.hxx,vcl/unowrap.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/vclenum.hxx,vcl/vclenum.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/vclevent.hxx,vcl/vclevent.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/virdev.hxx,vcl/virdev.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/waitobj.hxx,vcl/waitobj.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/wall.hxx,vcl/wall.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/window.hxx,vcl/window.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/wpropset.hxx,vcl/wpropset.hxx))
+$(eval $(call gb_Package_add_file,vcl_inc,inc/vcl/wrkwin.hxx,vcl/wrkwin.hxx))
+
diff --git a/vcl/util/target.pmk b/vcl/Package_osx.mk
index 8ec15475bc90..4d5986c36ed2 100644
--- a/vcl/util/target.pmk
+++ b/vcl/Package_osx.mk
@@ -14,26 +14,22 @@
 #
 # 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
+# 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
+# version 3 along with OpenOffice.org.	If not, see
 # <http://www.openoffice.org/license.html>
 # for a copy of the LGPLv3 License.
 #
 #*************************************************************************
-ALLSLO: $(SLOFILES)
 
-SOSHL: $(SHL1TARGETN)
-
-WHOLEPRJ .SETDIR=$(PRJ)$/prj:
-    make debug linkinc prjpch compinc
-    @echo "READY"
-
-ONLYDLL .SETDIR=$(PRJ)$/util: $(SLOFILES)
-    $(RM) ..$/$(OUTPATH)$/bin$/sv$(DLLPOSTFIX).dll
-    dmake debug=t prjpch=t linkinc=t compinc=t ..$/$(OUTPATH)$/bin$/sv$(DLLPOSTFIX).dll
-    @echo "READY"
+### FIXME: when we have a real ZipTarget mechanism in gbuild replace this mess
+$(eval $(call gb_Package_Package,vcl_zip,))
+$(eval $(call gb_Package_add_file,vcl_zip,bin/osxres.zip,$(WORKDIR)/Misc/osxres.zip))
 
+/$(WORKDIR)/Misc/osxres.zip: $(SRCDIR)/vcl/aqua/source/res/MainMenu.nib/*.nib $(SRCDIR)/vcl/aqua/source/res/cursors/*.png 
+    cd $(SRCDIR)/vcl/aqua/source/res ; \
+    mkdir -p $(dir $@) ; \
+    zip $@ MainMenu.nib/*.nib cursors/*.png
diff --git a/vcl/StaticLibrary_vclmain.mk b/vcl/StaticLibrary_vclmain.mk
new file mode 100755
index 000000000000..cc38a2772d0f
--- /dev/null
+++ b/vcl/StaticLibrary_vclmain.mk
@@ -0,0 +1,61 @@
+#*************************************************************************
+#
+# 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_StaticLibrary_StaticLibrary,vclmain))
+
+$(eval $(call gb_StaticLibrary_set_include,vclmain,\
+    $$(INCLUDE) \
+    -I$(SRCDIR)/vcl/inc \
+    -I$(SRCDIR)/vcl/inc/pch \
+    -I$(SRCDIR)/solenv/inc \
+    -I$(OUTDIR)/inc/offuh \
+    -I$(OUTDIR)/inc \
+))
+
+$(eval $(call gb_StaticLibrary_add_exception_objects,vclmain,\
+    vcl/source/salmain/salmain \
+))
+
+# HACK for now
+# We really should fix the clients of this to link against the static library
+# Instead of this evil linking of an object from $(OUTDIR)
+define StaticLibrary_salmain_hack
+$(call gb_StaticLibrary_get_target,vclmain) : $(OUTDIR)/lib/$(1)
+$$(eval $$(call gb_Deliver_add_deliverable,$(OUTDIR)/lib/$(1),$(call gb_CxxObject_get_target,vcl/source/salmain/salmain)))
+
+$(OUTDIR)/lib/$(1) : $(call gb_CxxObject_get_target,vcl/source/salmain/salmain)
+	$$(call gb_Deliver_deliver,$$<,$$@)
+
+endef
+
+ifeq ($(OS),WNT)
+$(eval $(call StaticLibrary_salmain_hack,salmain.obj))
+else
+$(eval $(call StaticLibrary_salmain_hack,salmain.o))
+endif
+
+# vim: set noet sw=4:
diff --git a/vcl/WinResTarget_vcl.mk b/vcl/WinResTarget_vcl.mk
new file mode 100755
index 000000000000..68fe30c0826c
--- /dev/null
+++ b/vcl/WinResTarget_vcl.mk
@@ -0,0 +1,123 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2011 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_WinResTarget_WinResTarget,vcl/src))
+
+$(eval $(call gb_WinResTarget_set_include,vcl/src,\
+        $$(INCLUDE) \
+        -I$(SRCDIR)/vcl/inc \
+))
+
+$(eval $(call gb_WinResTarget_add_file,vcl/src,\
+    vcl/win/source/src/salsrc \
+))
+$(eval $(call gb_WinResTarget_add_dependency,vcl/src,\
+    vcl/win/source/src/dtext.cur \
+    vcl/win/source/src/50.bmp \
+    vcl/win/source/src/copydata.cur \
+    vcl/win/source/src/dpie.cur \
+    vcl/win/source/src/movedata.cur \
+    vcl/win/source/src/rotate.cur \
+    vcl/win/source/src/50.png \
+    vcl/win/source/src/copydlnk.cur \
+    vcl/win/source/src/dpolygon.cur \
+    vcl/win/source/src/movedlnk.cur \
+    vcl/win/source/src/salsrc.rc \
+    vcl/win/source/src/airbrush.cur \
+    vcl/win/source/src/copyf.cur \
+    vcl/win/source/src/drect.cur \
+    vcl/win/source/src/movef.cur \
+    vcl/win/source/src/sd.ico \
+    vcl/win/source/src/ase.cur \
+    vcl/win/source/src/copyf2.cur \
+    vcl/win/source/src/dtext.cur \
+    vcl/win/source/src/movef2.cur \
+    vcl/win/source/src/tblsele.cur \
+    vcl/win/source/src/asn.cur \
+    vcl/win/source/src/copyflnk.cur \
+    vcl/win/source/src/fill.cur \
+    vcl/win/source/src/moveflnk.cur \
+    vcl/win/source/src/tblsels.cur \
+    vcl/win/source/src/asne.cur \
+    vcl/win/source/src/crook.cur \
+    vcl/win/source/src/hand.cur \
+    vcl/win/source/src/movept.cur \
+    vcl/win/source/src/tblselse.cur \
+    vcl/win/source/src/asns.cur \
+    vcl/win/source/src/crop.cur \
+    vcl/win/source/src/help.cur \
+    vcl/win/source/src/neswsize.cur \
+    vcl/win/source/src/tblselsw.cur \
+    vcl/win/source/src/asnswe.cur \
+    vcl/win/source/src/cross.cur \
+    vcl/win/source/src/hshear.cur \
+    vcl/win/source/src/notallow.cur \
+    vcl/win/source/src/tblselw.cur \
+    vcl/win/source/src/asnw.cur \
+    vcl/win/source/src/darc.cur \
+    vcl/win/source/src/hsize.cur \
+    vcl/win/source/src/nullptr.cur \
+    vcl/win/source/src/timemove.cur \
+    vcl/win/source/src/ass.cur \
+    vcl/win/source/src/dbezier.cur \
+    vcl/win/source/src/hsizebar.cur \
+    vcl/win/source/src/nwsesize.cur \
+    vcl/win/source/src/timesize.cur \
+    vcl/win/source/src/asse.cur \
+    vcl/win/source/src/dcapt.cur \
+    vcl/win/source/src/hsplit.cur \
+    vcl/win/source/src/pen.cur \
+    vcl/win/source/src/vshear.cur \
+    vcl/win/source/src/assw.cur \
+    vcl/win/source/src/dcirccut.cur \
+    vcl/win/source/src/linkdata.cur \
+    vcl/win/source/src/pivotcol.cur \
+    vcl/win/source/src/vsize.cur \
+    vcl/win/source/src/asw.cur \
+    vcl/win/source/src/dconnect.cur \
+    vcl/win/source/src/linkf.cur \
+    vcl/win/source/src/pivotdel.cur \
+    vcl/win/source/src/vsizebar.cur \
+    vcl/win/source/src/aswe.cur \
+    vcl/win/source/src/dellipse.cur \
+    vcl/win/source/src/magnify.cur \
+    vcl/win/source/src/pivotfld.cur \
+    vcl/win/source/src/vsplit.cur \
+    vcl/win/source/src/chain.cur \
+    vcl/win/source/src/detectiv.cur \
+    vcl/win/source/src/mirror.cur \
+    vcl/win/source/src/pivotrow.cur \
+    vcl/win/source/src/vtext.cur \
+    vcl/win/source/src/chainnot.cur \
+    vcl/win/source/src/dfree.cur \
+    vcl/win/source/src/move.cur \
+    vcl/win/source/src/pntbrsh.cur \
+    vcl/win/source/src/chart.cur \
+    vcl/win/source/src/dline.cur \
+    vcl/win/source/src/movebw.cur \
+    vcl/win/source/src/refhand.cur \
+))
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/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 )
 {
 }
 
diff --git a/vcl/inc/vcl/accel.h b/vcl/inc/accel.h
index bf3006c9ca7b..bf3006c9ca7b 100644
--- a/vcl/inc/vcl/accel.h
+++ b/vcl/inc/accel.h
diff --git a/vcl/inc/vcl/accmgr.hxx b/vcl/inc/accmgr.hxx
index 2ffa2b366920..2ffa2b366920 100644
--- a/vcl/inc/vcl/accmgr.hxx
+++ b/vcl/inc/accmgr.hxx
diff --git a/vcl/aqua/inc/aqua11yfactory.h b/vcl/inc/aqua/aqua11yfactory.h
index 2fa38d9901db..2fa38d9901db 100644
--- a/vcl/aqua/inc/aqua11yfactory.h
+++ b/vcl/inc/aqua/aqua11yfactory.h
diff --git a/vcl/aqua/inc/aqua11yfocustracker.hxx b/vcl/inc/aqua/aqua11yfocustracker.hxx
index b9721619b8ac..b9721619b8ac 100644
--- a/vcl/aqua/inc/aqua11yfocustracker.hxx
+++ b/vcl/inc/aqua/aqua11yfocustracker.hxx
diff --git a/vcl/aqua/inc/aqua11ylistener.hxx b/vcl/inc/aqua/aqua11ylistener.hxx
index cab8d8c89d58..cab8d8c89d58 100644
--- a/vcl/aqua/inc/aqua11ylistener.hxx
+++ b/vcl/inc/aqua/aqua11ylistener.hxx
diff --git a/vcl/aqua/inc/aqua11ywrapper.h b/vcl/inc/aqua/aqua11ywrapper.h
index aebea78f0394..aebea78f0394 100644
--- a/vcl/aqua/inc/aqua11ywrapper.h
+++ b/vcl/inc/aqua/aqua11ywrapper.h
diff --git a/vcl/aqua/inc/aquaprintview.h b/vcl/inc/aqua/aquaprintview.h
index 2c5849f10e65..2c5849f10e65 100644
--- a/vcl/aqua/inc/aquaprintview.h
+++ b/vcl/inc/aqua/aquaprintview.h
diff --git a/vcl/aqua/inc/aquavclevents.hxx b/vcl/inc/aqua/aquavclevents.hxx
index 034edd3882b5..034edd3882b5 100644
--- a/vcl/aqua/inc/aquavclevents.hxx
+++ b/vcl/inc/aqua/aquavclevents.hxx
diff --git a/vcl/aqua/inc/aquavcltypes.h b/vcl/inc/aqua/aquavcltypes.h
index 93003faecad7..93003faecad7 100644
--- a/vcl/aqua/inc/aquavcltypes.h
+++ b/vcl/inc/aqua/aquavcltypes.h
diff --git a/vcl/aqua/inc/keyboardfocuslistener.hxx b/vcl/inc/aqua/keyboardfocuslistener.hxx
index bf9c70250005..bf9c70250005 100644
--- a/vcl/aqua/inc/keyboardfocuslistener.hxx
+++ b/vcl/inc/aqua/keyboardfocuslistener.hxx
diff --git a/vcl/aqua/inc/salatsuifontutils.hxx b/vcl/inc/aqua/salatsuifontutils.hxx
index 51079b8ec5d2..51079b8ec5d2 100644
--- a/vcl/aqua/inc/salatsuifontutils.hxx
+++ b/vcl/inc/aqua/salatsuifontutils.hxx
diff --git a/vcl/aqua/inc/salbmp.h b/vcl/inc/aqua/salbmp.h
index 33e671b05735..e0dd26554aac 100644
--- a/vcl/aqua/inc/salbmp.h
+++ b/vcl/inc/aqua/salbmp.h
@@ -30,16 +30,21 @@
 #define _SV_SALBMP_H
 
 #include "tools/gen.hxx"
-#include "vcl/sv.h"
+
+#include "basebmp/bitmapdevice.hxx"
+
 #include "vcl/salbtype.hxx"
+
+#include "aqua/salconst.h"
+#include "aqua/salgdi.h"
+
 #include "saldata.hxx"
-#include "vcl/salinst.hxx"
-#include "salconst.h"
-#include "vcl/salvd.hxx"
+#include "salinst.hxx"
+#include "salvd.hxx"
+#include "salbmp.hxx"
+
 #include "salcolorutils.hxx"
-#include "vcl/salbmp.hxx"
-#include "salgdi.h"
-#include "basebmp/bitmapdevice.hxx"
+
 
 // --------------
 // - SalBitmap  -
diff --git a/vcl/aqua/inc/salcolorutils.hxx b/vcl/inc/aqua/salcolorutils.hxx
index ae6afdabb9ff..ae6afdabb9ff 100644
--- a/vcl/aqua/inc/salcolorutils.hxx
+++ b/vcl/inc/aqua/salcolorutils.hxx
diff --git a/vcl/aqua/inc/salconst.h b/vcl/inc/aqua/salconst.h
index 50971a819c09..50971a819c09 100644
--- a/vcl/aqua/inc/salconst.h
+++ b/vcl/inc/aqua/salconst.h
diff --git a/vcl/aqua/inc/saldata.hxx b/vcl/inc/aqua/saldata.hxx
index d87938bd4474..ea831f593bfb 100644
--- a/vcl/aqua/inc/saldata.hxx
+++ b/vcl/inc/aqua/saldata.hxx
@@ -35,11 +35,11 @@
 
 #include "com/sun/star/uno/Reference.hxx"
 
-#include "vcl/sv.h"
-#include "vcl/svdata.hxx"
-#include "vcl/salwtype.hxx"
 #include "vcl/ptrstyle.hxx"
 
+#include "svdata.hxx"
+#include "salwtype.hxx"
+
 #include <list>
 #include <vector>
 #include <map>
diff --git a/vcl/aqua/inc/salfontutils.hxx b/vcl/inc/aqua/salfontutils.hxx
index 8394d874bf10..8394d874bf10 100644
--- a/vcl/aqua/inc/salfontutils.hxx
+++ b/vcl/inc/aqua/salfontutils.hxx
diff --git a/vcl/aqua/inc/salframe.h b/vcl/inc/aqua/salframe.h
index 4025b0aea70a..4d205c08287f 100644
--- a/vcl/aqua/inc/salframe.h
+++ b/vcl/inc/aqua/salframe.h
@@ -29,14 +29,13 @@
 #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 "aqua/salmenu.h"
+#include "aqua/saldata.hxx"
+#include "aqua/aquavcltypes.h"
+
+#include "salframe.hxx"
 
 #include <vector>
 #include <utility>
diff --git a/vcl/aqua/inc/salframeview.h b/vcl/inc/aqua/salframeview.h
index f28eb17f4e10..d4418d36bf5a 100644
--- a/vcl/aqua/inc/salframeview.h
+++ b/vcl/inc/aqua/salframeview.h
@@ -29,7 +29,7 @@
 #ifndef _VCL_SALFRAMEVIEW_H
 #define _VCL_SALFRAMEVIEW_H
 
-#include "aqua11ywrapper.h"
+#include "aqua/aqua11ywrapper.h"
 
 @interface SalFrameWindow : NSWindow
 {
diff --git a/vcl/aqua/inc/salgdi.h b/vcl/inc/aqua/salgdi.h
index c69f5d70bf96..078859f079b6 100644
--- a/vcl/aqua/inc/salgdi.h
+++ b/vcl/inc/aqua/salgdi.h
@@ -29,17 +29,17 @@
 #ifndef _SV_SALGDI_H
 #define _SV_SALGDI_H
 
+#include "basegfx/polygon/b2dpolypolygon.hxx"
+
 #include "premac.h"
 #include <ApplicationServices/ApplicationServices.h>
 #include "postmac.h"
 
-#include "vcl/sv.h"
-#include "vcl/outfont.hxx"
-#include "vcl/salgdi.hxx"
+#include "aqua/aquavcltypes.h"
 #include <vcl/fontcapabilities.hxx>
-#include "aquavcltypes.h"
 
-#include "basegfx/polygon/b2dpolypolygon.hxx"
+#include "outfont.hxx"
+#include "salgdi.hxx"
 
 #include <vector>
 
diff --git a/vcl/aqua/inc/salinst.h b/vcl/inc/aqua/salinst.h
index 9bd65be14ac8..a53243f65966 100644
--- a/vcl/aqua/inc/salinst.h
+++ b/vcl/inc/aqua/salinst.h
@@ -29,14 +29,14 @@
 #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 "aqua/aquavcltypes.h"
+
+#include "salinst.hxx"
 
 #include <list>
 
diff --git a/vcl/aqua/inc/salmathutils.hxx b/vcl/inc/aqua/salmathutils.hxx
index e81f68e46b0b..e81f68e46b0b 100644
--- a/vcl/aqua/inc/salmathutils.hxx
+++ b/vcl/inc/aqua/salmathutils.hxx
diff --git a/vcl/aqua/inc/salmenu.h b/vcl/inc/aqua/salmenu.h
index 71081ad48b77..84c7341889b7 100644
--- a/vcl/aqua/inc/salmenu.h
+++ b/vcl/inc/aqua/salmenu.h
@@ -33,8 +33,7 @@
 #include <Cocoa/Cocoa.h>
 #include "postmac.h"
 
-#include "vcl/sv.h"
-#include "vcl/salmenu.hxx"
+#include "salmenu.hxx"
 
 #include <vector>
 
diff --git a/vcl/aqua/inc/salnativewidgets.h b/vcl/inc/aqua/salnativewidgets.h
index fd6226c8030b..fd6226c8030b 100644
--- a/vcl/aqua/inc/salnativewidgets.h
+++ b/vcl/inc/aqua/salnativewidgets.h
diff --git a/vcl/aqua/inc/salnsmenu.h b/vcl/inc/aqua/salnsmenu.h
index fac4aec75792..fac4aec75792 100644
--- a/vcl/aqua/inc/salnsmenu.h
+++ b/vcl/inc/aqua/salnsmenu.h
diff --git a/vcl/aqua/inc/salnstimer.h b/vcl/inc/aqua/salnstimer.h
index 5c4ba0eea430..5c4ba0eea430 100644
--- a/vcl/aqua/inc/salnstimer.h
+++ b/vcl/inc/aqua/salnstimer.h
diff --git a/vcl/aqua/inc/salobj.h b/vcl/inc/aqua/salobj.h
index 63f5fecb7279..0eca9e9badbd 100644
--- a/vcl/aqua/inc/salobj.h
+++ b/vcl/inc/aqua/salobj.h
@@ -29,9 +29,8 @@
 #ifndef _SV_SALOBJ_H
 #define _SV_SALOBJ_H
 
-#include "vcl/sv.h"
 #include "vcl/sysdata.hxx"
-#include "vcl/salobj.hxx"
+#include "salobj.hxx"
 
 class AquaSalFrame;
 class AquaSalObject;
diff --git a/vcl/aqua/inc/salprn.h b/vcl/inc/aqua/salprn.h
index 86d456907a67..f2a188cc0340 100644
--- a/vcl/aqua/inc/salprn.h
+++ b/vcl/inc/aqua/salprn.h
@@ -29,9 +29,9 @@
 #ifndef _SV_SALPRN_H
 #define _SV_SALPRN_H
 
-#include "vcl/sv.h"
-#include "aquavcltypes.h"
-#include "vcl/salprn.hxx"
+#include "aqua/aquavcltypes.h"
+
+#include "salprn.hxx"
 
 #include <boost/shared_array.hpp>
 
diff --git a/vcl/aqua/inc/salsys.h b/vcl/inc/aqua/salsys.h
index 64e1791668b1..15415712d896 100644
--- a/vcl/aqua/inc/salsys.h
+++ b/vcl/inc/aqua/salsys.h
@@ -29,8 +29,7 @@
 #ifndef _SV_SALSYS_H
 #define _SV_SALSYS_H
 
-#include "vcl/sv.h"
-#include "vcl/salsys.hxx"
+#include "salsys.hxx"
 
 #include <list>
 
@@ -38,10 +37,6 @@
 // - SalSystemData -
 // -----------------
 
-//struct SalSystemData
-//{
-//};
-
 class VCL_DLLPUBLIC AquaSalSystem : public SalSystem
 {
 public:
diff --git a/vcl/aqua/inc/saltimer.h b/vcl/inc/aqua/saltimer.h
index 03772a2dfc2c..305bce14af07 100644
--- a/vcl/aqua/inc/saltimer.h
+++ b/vcl/inc/aqua/saltimer.h
@@ -33,7 +33,7 @@
 #include <Cocoa/Cocoa.h>
 #include "postmac.h"
 
-#include "vcl/saltimer.hxx"
+#include "saltimer.hxx"
 
 class AquaSalTimer : public SalTimer
 {
diff --git a/vcl/aqua/inc/salvd.h b/vcl/inc/aqua/salvd.h
index 6333fd31e460..a589430e9fb7 100644
--- a/vcl/aqua/inc/salvd.h
+++ b/vcl/inc/aqua/salvd.h
@@ -33,12 +33,11 @@
 #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"
+#include "aqua/salconst.h"
+#include "aqua/salcolorutils.hxx"
+#include "aqua/salgdi.h"
+
+#include "salvd.hxx"
 
 #if PRAGMA_ONCE
     #pragma once
diff --git a/vcl/aqua/inc/svsys.h b/vcl/inc/aqua/svsys.h
index 291e7801db75..291e7801db75 100644
--- a/vcl/aqua/inc/svsys.h
+++ b/vcl/inc/aqua/svsys.h
diff --git a/vcl/aqua/inc/vclnsapp.h b/vcl/inc/aqua/vclnsapp.h
index bdbe15840e0f..bdbe15840e0f 100644
--- a/vcl/aqua/inc/vclnsapp.h
+++ b/vcl/inc/aqua/vclnsapp.h
diff --git a/vcl/inc/vcl/bmpfast.hxx b/vcl/inc/bmpfast.hxx
index b43df0e115b2..b43df0e115b2 100644
--- a/vcl/inc/vcl/bmpfast.hxx
+++ b/vcl/inc/bmpfast.hxx
diff --git a/vcl/inc/vcl/brdwin.hxx b/vcl/inc/brdwin.hxx
index e6374ea032f5..e6374ea032f5 100644
--- a/vcl/inc/vcl/brdwin.hxx
+++ b/vcl/inc/brdwin.hxx
diff --git a/vcl/inc/vcl/canvasbitmap.hxx b/vcl/inc/canvasbitmap.hxx
index e0773257b029..e0773257b029 100644
--- a/vcl/inc/vcl/canvasbitmap.hxx
+++ b/vcl/inc/canvasbitmap.hxx
diff --git a/vcl/inc/vcl/controldata.hxx b/vcl/inc/controldata.hxx
index b30184be2481..b30184be2481 100644
--- a/vcl/inc/vcl/controldata.hxx
+++ b/vcl/inc/controldata.hxx
diff --git a/vcl/inc/vcl/dbggui.hxx b/vcl/inc/dbggui.hxx
index 61d878de3451..61d878de3451 100644
--- a/vcl/inc/vcl/dbggui.hxx
+++ b/vcl/inc/dbggui.hxx
diff --git a/vcl/inc/vcl/dndevdis.hxx b/vcl/inc/dndevdis.hxx
index 41be5ba3fc38..41be5ba3fc38 100644
--- a/vcl/inc/vcl/dndevdis.hxx
+++ b/vcl/inc/dndevdis.hxx
diff --git a/vcl/inc/vcl/dndlcon.hxx b/vcl/inc/dndlcon.hxx
index 1c3654c1a9ea..1c3654c1a9ea 100644
--- a/vcl/inc/vcl/dndlcon.hxx
+++ b/vcl/inc/dndlcon.hxx
diff --git a/vcl/inc/vcl/fontcache.hxx b/vcl/inc/fontcache.hxx
index ad261e8d8e6d..ad261e8d8e6d 100644
--- a/vcl/inc/vcl/fontcache.hxx
+++ b/vcl/inc/fontcache.hxx
diff --git a/vcl/inc/vcl/fontsubset.hxx b/vcl/inc/fontsubset.hxx
index f710434698de..99b627153fa3 100644
--- a/vcl/inc/vcl/fontsubset.hxx
+++ b/vcl/inc/fontsubset.hxx
@@ -33,9 +33,11 @@
 #include <tools/string.hxx>
 #include <cstdio>
 
+#include "vcl/dllapi.h"
+
 namespace vcl { struct _TrueTypeFont; } // SFT's idea of a TTF font
 
-class FontSubsetInfo
+class VCL_DLLPUBLIC FontSubsetInfo
 {
 public:
     explicit    FontSubsetInfo( void );
diff --git a/vcl/inc/vcl/glyphcache.hxx b/vcl/inc/glyphcache.hxx
index dc11ba1637d8..42f90672f87b 100644
--- a/vcl/inc/vcl/glyphcache.hxx
+++ b/vcl/inc/glyphcache.hxx
@@ -51,11 +51,11 @@ namespace basegfx { class B2DPolyPolygon; }
 
 class RawBitmap;
 
-#include <vcl/outfont.hxx>
-#include <vcl/impfont.hxx>
+#include <outfont.hxx>
+#include <impfont.hxx>
 
 class ServerFontLayout;
-#include <vcl/sallayout.hxx>
+#include <sallayout.hxx>
 
 namespace vcl
 {
diff --git a/vcl/inc/vcl/graphite_features.hxx b/vcl/inc/graphite_features.hxx
index 742ad2c3f5f5..742ad2c3f5f5 100644
--- a/vcl/inc/vcl/graphite_features.hxx
+++ b/vcl/inc/graphite_features.hxx
diff --git a/vcl/inc/vcl/graphite_layout.hxx b/vcl/inc/graphite_layout.hxx
index f605f190f669..c6c711d94dc7 100644
--- a/vcl/inc/vcl/graphite_layout.hxx
+++ b/vcl/inc/graphite_layout.hxx
@@ -43,7 +43,7 @@
 #include <graphite2/Font.h>
 #include <graphite2/Segment.h>
 // Platform
-#include <vcl/sallayout.hxx>
+#include <sallayout.hxx>
 #include <vcl/dllapi.h>
 // Module
 
diff --git a/vcl/inc/vcl/graphite_serverfont.hxx b/vcl/inc/graphite_serverfont.hxx
index b4a6e10be925..63adf526c2a1 100644
--- a/vcl/inc/vcl/graphite_serverfont.hxx
+++ b/vcl/inc/graphite_serverfont.hxx
@@ -33,7 +33,7 @@
 #define GR_NAMESPACE
 
 #ifndef MSC
-#include "vcl/graphite_layout.hxx"
+#include <graphite_layout.hxx>
 
 // Modules
 
diff --git a/vcl/inc/vcl/helpwin.hxx b/vcl/inc/helpwin.hxx
index 7862a4961bbd..7862a4961bbd 100644
--- a/vcl/inc/vcl/helpwin.hxx
+++ b/vcl/inc/helpwin.hxx
diff --git a/vcl/inc/vcl/idlemgr.hxx b/vcl/inc/idlemgr.hxx
index 674bdf070c3a..674bdf070c3a 100644
--- a/vcl/inc/vcl/idlemgr.hxx
+++ b/vcl/inc/idlemgr.hxx
diff --git a/vcl/inc/vcl/ilstbox.hxx b/vcl/inc/ilstbox.hxx
index 69d127a68d15..69d127a68d15 100644
--- a/vcl/inc/vcl/ilstbox.hxx
+++ b/vcl/inc/ilstbox.hxx
diff --git a/vcl/inc/vcl/image.h b/vcl/inc/image.h
index 86f924993ed3..86f924993ed3 100644
--- a/vcl/inc/vcl/image.h
+++ b/vcl/inc/image.h
diff --git a/vcl/inc/vcl/impbmp.hxx b/vcl/inc/impbmp.hxx
index c77e906bd8ae..c77e906bd8ae 100644
--- a/vcl/inc/vcl/impbmp.hxx
+++ b/vcl/inc/impbmp.hxx
diff --git a/vcl/inc/vcl/impfont.hxx b/vcl/inc/impfont.hxx
index 40355af21518..40355af21518 100644
--- a/vcl/inc/vcl/impfont.hxx
+++ b/vcl/inc/impfont.hxx
diff --git a/vcl/inc/vcl/impgraph.hxx b/vcl/inc/impgraph.hxx
index 22c409fb476a..6b6bce184770 100644
--- a/vcl/inc/vcl/impgraph.hxx
+++ b/vcl/inc/impgraph.hxx
@@ -34,6 +34,7 @@
 #include <vcl/bitmapex.hxx>
 #include <vcl/animate.hxx>
 #include <vcl/gdimtf.hxx>
+#include <vcl/rendergraphic.hxx>
 #include <vcl/graph.h>
 
 // ---------------
@@ -97,14 +98,19 @@ private:
     void                ImplSetDefaultType();
     sal_Bool                ImplIsSupportedGraphic() const;
 
-    sal_Bool                ImplIsTransparent() const;
-    sal_Bool                ImplIsAlpha() const;
-    sal_Bool                ImplIsAnimated() const;
+    sal_Bool            ImplIsTransparent() const;
+    sal_Bool            ImplIsAlpha() const;
+    sal_Bool            ImplIsAnimated() const;
+    sal_Bool            ImplIsEPS() const;
+    sal_Bool            ImplIsRenderGraphic() const;
+    sal_Bool            ImplHasRenderGraphic() const;
+
+    Bitmap                  ImplGetBitmap(const GraphicConversionParameters& rParameters) const;
+    BitmapEx                ImplGetBitmapEx(const GraphicConversionParameters& rParameters) const;
+    Animation               ImplGetAnimation() const;
+    const GDIMetaFile&      ImplGetGDIMetaFile() const;
+    ::vcl::RenderGraphic    ImplGetRenderGraphic() const;
 
-    Bitmap              ImplGetBitmap(const GraphicConversionParameters& rParameters) const;
-    BitmapEx            ImplGetBitmapEx(const GraphicConversionParameters& rParameters) const;
-    Animation           ImplGetAnimation() const;
-    const GDIMetaFile&  ImplGetGDIMetaFile() const;
 
     Size                ImplGetPrefSize() const;
     void                ImplSetPrefSize( const Size& rPrefSize );
diff --git a/vcl/inc/vcl/impimagetree.hxx b/vcl/inc/impimagetree.hxx
index 41c4f565ef22..41c4f565ef22 100644
--- a/vcl/inc/vcl/impimagetree.hxx
+++ b/vcl/inc/impimagetree.hxx
diff --git a/vcl/inc/vcl/impoct.hxx b/vcl/inc/impoct.hxx
index daf6a275ada1..daf6a275ada1 100644
--- a/vcl/inc/vcl/impoct.hxx
+++ b/vcl/inc/impoct.hxx
diff --git a/vcl/inc/vcl/jobset.h b/vcl/inc/jobset.h
index b1cbdb9853f9..b1cbdb9853f9 100644
--- a/vcl/inc/vcl/jobset.h
+++ b/vcl/inc/jobset.h
diff --git a/vcl/inc/makefile.mk b/vcl/inc/makefile.mk
deleted file mode 100644
index f1f917284f71..000000000000
--- a/vcl/inc/makefile.mk
+++ /dev/null
@@ -1,49 +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=inc
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile2.pmk
-
-# --- Files --------------------------------------------------------
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-.IF "$(ENABLE_PCH)"!=""
-ALLTAR : \
-    $(SLO)$/precompiled.pch \
-    $(SLO)$/precompiled_ex.pch
-    
-.ENDIF			# "$(ENABLE_PCH)"!=""
-
diff --git a/vcl/inc/vcl/outdata.hxx b/vcl/inc/outdata.hxx
index 2f4a9b5ed7aa..2f4a9b5ed7aa 100644
--- a/vcl/inc/vcl/outdata.hxx
+++ b/vcl/inc/outdata.hxx
diff --git a/vcl/inc/vcl/outdev.h b/vcl/inc/outdev.h
index fc6bab815c48..43ba77df8ab7 100644
--- a/vcl/inc/vcl/outdev.h
+++ b/vcl/inc/outdev.h
@@ -30,7 +30,7 @@
 #define _SV_OUTDEV_H
 
 #include <tools/solar.h>
-#include <vcl/outfont.hxx>
+#include <outfont.hxx>
 
 #include <vector>
 #include <list>
diff --git a/vcl/inc/vcl/outfont.hxx b/vcl/inc/outfont.hxx
index faf2b00793f2..faf2b00793f2 100644
--- a/vcl/inc/vcl/outfont.hxx
+++ b/vcl/inc/outfont.hxx
diff --git a/vcl/inc/vcl/print.h b/vcl/inc/print.h
index db236f2a0f17..dc54ca28dc8b 100644
--- a/vcl/inc/vcl/print.h
+++ b/vcl/inc/print.h
@@ -32,6 +32,8 @@
 #include "vcl/sv.h"
 #include "vcl/dllapi.h"
 
+#include "rtl/ustring.hxx"
+
 #include <vector>
 #include <boost/unordered_map.hpp>
 
diff --git a/vcl/inc/vcl/prndlg.hxx b/vcl/inc/printdlg.hxx
index 247998303178..d162bc07ea8a 100644
--- a/vcl/inc/vcl/prndlg.hxx
+++ b/vcl/inc/printdlg.hxx
@@ -31,9 +31,9 @@
 
 #include <vcl/dllapi.h>
 
-#include "vcl/print.hxx"
-#include "vcl/print.h"
+#include "print.h"
 
+#include "vcl/print.hxx"
 #include "vcl/dialog.hxx"
 #include "vcl/fixed.hxx"
 #include "vcl/button.hxx"
diff --git a/vcl/inc/vcl/printergfx.hxx b/vcl/inc/printergfx.hxx
index 8bfd1c69a7d2..65d31e65e0aa 100644
--- a/vcl/inc/vcl/printergfx.hxx
+++ b/vcl/inc/printergfx.hxx
@@ -30,7 +30,7 @@
 #define _PSPRINT_PRINTERGFX_HXX_
 
 #include "vcl/helper.hxx"
-#include "vcl/sallayout.hxx"
+#include "sallayout.hxx"
 #include "osl/file.hxx"
 #include "tools/gen.hxx"
 
diff --git a/vcl/inc/vcl/printerjob.hxx b/vcl/inc/printerjob.hxx
index 62a1c078bc32..62a1c078bc32 100644
--- a/vcl/inc/vcl/printerjob.hxx
+++ b/vcl/inc/printerjob.hxx
diff --git a/vcl/inc/vcl/region.h b/vcl/inc/region.h
index 5814e981aac2..5814e981aac2 100644
--- a/vcl/inc/vcl/region.h
+++ b/vcl/inc/region.h
diff --git a/vcl/inc/vcl/salbmp.hxx b/vcl/inc/salbmp.hxx
index d880be0d6d37..d880be0d6d37 100644
--- a/vcl/inc/vcl/salbmp.hxx
+++ b/vcl/inc/salbmp.hxx
diff --git a/vcl/inc/vcl/saldatabasic.hxx b/vcl/inc/saldatabasic.hxx
index e080cb91ff99..9d4eb0fc73f9 100644
--- a/vcl/inc/vcl/saldatabasic.hxx
+++ b/vcl/inc/saldatabasic.hxx
@@ -29,10 +29,12 @@
 #ifndef _SV_SALDATABASIC_HXX
 #define _SV_SALDATABASIC_HXX
 
-#include <vcl/svdata.hxx>
-#include <vcl/salinst.hxx>
+#include <svdata.hxx>
+#include <salinst.hxx>
 #include <osl/module.h>
 
+#include "vcl/dllapi.h"
+
 namespace psp
 {
     class PrinterInfoManager;
diff --git a/vcl/inc/vcl/salframe.hxx b/vcl/inc/salframe.hxx
index f5b98756f5f6..51c6bcf7e73e 100644
--- a/vcl/inc/vcl/salframe.hxx
+++ b/vcl/inc/salframe.hxx
@@ -38,8 +38,8 @@
 #include <vcl/sndstyle.hxx>
 
 #endif // __cplusplus
-#include <vcl/salwtype.hxx>
-#include <vcl/salgeom.hxx>
+#include <salwtype.hxx>
+#include <salgeom.hxx>
 #include <tools/gen.hxx>
 #include <vcl/region.hxx>
 
diff --git a/vcl/inc/vcl/salgdi.hxx b/vcl/inc/salgdi.hxx
index 5b9e59f68d8f..5b9e59f68d8f 100644
--- a/vcl/inc/vcl/salgdi.hxx
+++ b/vcl/inc/salgdi.hxx
diff --git a/vcl/inc/vcl/salgeom.hxx b/vcl/inc/salgeom.hxx
index c512d0a195fa..c512d0a195fa 100644
--- a/vcl/inc/vcl/salgeom.hxx
+++ b/vcl/inc/salgeom.hxx
diff --git a/vcl/inc/vcl/salimestatus.hxx b/vcl/inc/salimestatus.hxx
index 13362c20071d..13362c20071d 100644
--- a/vcl/inc/vcl/salimestatus.hxx
+++ b/vcl/inc/salimestatus.hxx
diff --git a/vcl/inc/vcl/salinst.hxx b/vcl/inc/salinst.hxx
index d878dd7fea80..d878dd7fea80 100644
--- a/vcl/inc/vcl/salinst.hxx
+++ b/vcl/inc/salinst.hxx
diff --git a/vcl/inc/vcl/sallayout.hxx b/vcl/inc/sallayout.hxx
index b91185769b27..b91185769b27 100644
--- a/vcl/inc/vcl/sallayout.hxx
+++ b/vcl/inc/sallayout.hxx
diff --git a/vcl/inc/vcl/salmenu.hxx b/vcl/inc/salmenu.hxx
index 63fb12ee4a84..63fb12ee4a84 100644
--- a/vcl/inc/vcl/salmenu.hxx
+++ b/vcl/inc/salmenu.hxx
diff --git a/vcl/inc/vcl/salobj.hxx b/vcl/inc/salobj.hxx
index 4e781787b0c9..d83379d3a09a 100644
--- a/vcl/inc/vcl/salobj.hxx
+++ b/vcl/inc/salobj.hxx
@@ -32,7 +32,7 @@
 #include <vcl/sv.h>
 #include <vcl/dllapi.h>
 #include <vcl/salgtype.hxx>
-#include <vcl/salwtype.hxx>
+#include <salwtype.hxx>
 
 struct SystemEnvData;
 
diff --git a/vcl/inc/vcl/salprn.hxx b/vcl/inc/salprn.hxx
index e820614e4cdd..e820614e4cdd 100644
--- a/vcl/inc/vcl/salprn.hxx
+++ b/vcl/inc/salprn.hxx
diff --git a/vcl/inc/vcl/salptype.hxx b/vcl/inc/salptype.hxx
index ca47f599271c..ca47f599271c 100644
--- a/vcl/inc/vcl/salptype.hxx
+++ b/vcl/inc/salptype.hxx
diff --git a/vcl/inc/vcl/salsession.hxx b/vcl/inc/salsession.hxx
index c912565a920c..c912565a920c 100644
--- a/vcl/inc/vcl/salsession.hxx
+++ b/vcl/inc/salsession.hxx
diff --git a/vcl/inc/vcl/salsys.hxx b/vcl/inc/salsys.hxx
index 2f2f6d08e9e6..2f2f6d08e9e6 100644
--- a/vcl/inc/vcl/salsys.hxx
+++ b/vcl/inc/salsys.hxx
diff --git a/vcl/inc/vcl/saltimer.hxx b/vcl/inc/saltimer.hxx
index 4bbaddb65b31..38dd20e69ff3 100644
--- a/vcl/inc/vcl/saltimer.hxx
+++ b/vcl/inc/saltimer.hxx
@@ -1,4 +1,3 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -31,7 +30,7 @@
 
 #include <vcl/sv.h>
 #include <vcl/dllapi.h>
-#include <vcl/salwtype.hxx>
+#include <salwtype.hxx>
 
 // ------------
 // - SalTimer -
@@ -68,5 +67,3 @@ public:
 };
 
 #endif // _SV_SALTIMER_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/vcl/salvd.hxx b/vcl/inc/salvd.hxx
index 68ed56a901d8..68ed56a901d8 100644
--- a/vcl/inc/vcl/salvd.hxx
+++ b/vcl/inc/salvd.hxx
diff --git a/vcl/inc/vcl/salwtype.hxx b/vcl/inc/salwtype.hxx
index d8bd6c527f85..d8bd6c527f85 100644
--- a/vcl/inc/vcl/salwtype.hxx
+++ b/vcl/inc/salwtype.hxx
diff --git a/vcl/inc/sft.hxx b/vcl/inc/sft.hxx
index ad4c2518d3f2..3f9dbcfc1af2 100644
--- a/vcl/inc/sft.hxx
+++ b/vcl/inc/sft.hxx
@@ -69,6 +69,8 @@
 
 #include <sal/types.h>
 
+#include "vcl/dllapi.h"
+
 #include <vector>
 
 #include "vcl/fontcapabilities.hxx"
@@ -287,7 +289,7 @@ namespace vcl
  * @return value of SFErrCodes enum
  * @ingroup sft
  */
-    int OpenTTFontBuffer(void* pBuffer, sal_uInt32 nLen, sal_uInt32 facenum, TrueTypeFont** ttf); /*FOLD01*/
+    int VCL_DLLPUBLIC OpenTTFontBuffer(void* pBuffer, sal_uInt32 nLen, sal_uInt32 facenum, TrueTypeFont** ttf); /*FOLD01*/
 #if !defined(WIN32)
 /**
  * TrueTypeFont constructor.
@@ -298,7 +300,7 @@ namespace vcl
  * @return value of SFErrCodes enum
  * @ingroup sft
  */
-    int OpenTTFontFile(const char *fname, sal_uInt32 facenum, TrueTypeFont** ttf);
+    int VCL_DLLPUBLIC OpenTTFontFile(const char *fname, sal_uInt32 facenum, TrueTypeFont** ttf);
 #endif
 
     void getTTScripts(std::vector< sal_uInt32 > &rScriptTags, const unsigned char* pTable, size_t nLength);
@@ -311,7 +313,7 @@ namespace vcl
  * TrueTypeFont destructor. Deallocates the memory.
  * @ingroup sft
  */
-    void CloseTTFont(TrueTypeFont *);
+    void VCL_DLLPUBLIC CloseTTFont(TrueTypeFont *);
 
 /**
  * Extracts TrueType control points, and stores them in an allocated array pointed to
@@ -512,7 +514,7 @@ namespace vcl
  * MapString() replaces the UCS-2 characters in str with glyphIDs.
  * @ingroup sft
  */
-    int MapString(TrueTypeFont *ttf, sal_uInt16 *str, int nchars, sal_uInt16 *glyphArray, int bvertical);
+    int VCL_DLLPUBLIC MapString(TrueTypeFont *ttf, sal_uInt16 *str, int nchars, sal_uInt16 *glyphArray, int bvertical);
 
 /**
  * Maps a Unicode (UCS-2) character to a glyph ID and returns it. Missing glyph has
diff --git a/vcl/inc/vcl/subedit.hxx b/vcl/inc/subedit.hxx
index 17b22e2b5587..17b22e2b5587 100644
--- a/vcl/inc/vcl/subedit.hxx
+++ b/vcl/inc/subedit.hxx
diff --git a/vcl/inc/vcl/svdata.hxx b/vcl/inc/svdata.hxx
index b28283f1a405..79daa17b7933 100644
--- a/vcl/inc/vcl/svdata.hxx
+++ b/vcl/inc/svdata.hxx
@@ -31,19 +31,25 @@
 
 #include <osl/thread.hxx>
 #include <rtl/ref.hxx>
+
 #include "tools/gen.hxx"
 #include "tools/shl.hxx"
 #include "tools/link.hxx"
 #include "tools/fldunit.hxx"
 #include "tools/string.hxx"
-#include "vcl/vclevent.hxx"
-#include "vcl/sv.h"
 #include "tools/color.hxx"
 #include "tools/debug.hxx"
+
+#include "vcl/vclevent.hxx"
+#include "vcl/sv.h"
 #include "vcl/dllapi.h"
-#include "com/sun/star/uno/Reference.hxx"
+
 #include "unotools/options.hxx"
 
+#include "xconnection.hxx"
+
+#include "com/sun/star/uno/Reference.hxx"
+
 #include <boost/unordered_map.hpp>
 
 namespace com {
diff --git a/vcl/inc/vcl/svids.hrc b/vcl/inc/svids.hrc
index bc76c70e1ebe..bc76c70e1ebe 100644
--- a/vcl/inc/vcl/svids.hrc
+++ b/vcl/inc/svids.hrc
diff --git a/vcl/util/hidother.src b/vcl/inc/svsys.h
index f966fcded1b3..df0b58c548ca 100644
--- a/vcl/util/hidother.src
+++ b/vcl/inc/svsys.h
@@ -25,7 +25,18 @@
  *
  ************************************************************************/
 
-#include "vcl/svids.hrc"
+#ifndef _VCL_SVSYS_H
+#define _VCL_SVSYS_H
 
-hidspecial HID_PRINTDLG                         { HelpID = HID_PRINTDLG; };
+#ifdef WNT
+#include "win/svsys.h"
+#elif defined QUARTZ
+#include "aqua/svsys.h"
+#elif defined OS2
+#include "os2/svsys.h"
+#else
+#include "unx/svsys.h"
+#endif
 
+
+#endif
diff --git a/vcl/inc/vcl/textlayout.hxx b/vcl/inc/textlayout.hxx
index 5902573f8746..5902573f8746 100644
--- a/vcl/inc/vcl/textlayout.hxx
+++ b/vcl/inc/textlayout.hxx
diff --git a/vcl/inc/vcl/toolbox.h b/vcl/inc/toolbox.h
index aec0c11cf790..aec0c11cf790 100644
--- a/vcl/inc/vcl/toolbox.h
+++ b/vcl/inc/toolbox.h
diff --git a/vcl/unx/inc/XIM.h b/vcl/inc/unx/XIM.h
index 9a061edd1ed4..9a061edd1ed4 100644
--- a/vcl/unx/inc/XIM.h
+++ b/vcl/inc/unx/XIM.h
diff --git a/vcl/unx/inc/Xproto.h b/vcl/inc/unx/Xproto.h
index b6db98dbfe15..804b3ffa98cc 100644
--- a/vcl/unx/inc/Xproto.h
+++ b/vcl/inc/unx/Xproto.h
@@ -1,4 +1,3 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -48,5 +47,3 @@
 #include <tools/postx.h>
 
 #endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/inc/cdeint.hxx b/vcl/inc/unx/cdeint.hxx
index e88d221f3aff..c2b7d578b137 100644
--- a/vcl/unx/inc/cdeint.hxx
+++ b/vcl/inc/unx/cdeint.hxx
@@ -28,7 +28,7 @@
 #ifndef _SV_CDEINT_HXX
 #define _SV_CDEINT_HXX
 
-#include <dtint.hxx>
+#include <unx/dtint.hxx>
 
 class CDEIntegrator : public DtIntegrator
 {
diff --git a/vcl/unx/inc/dtint.hxx b/vcl/inc/unx/dtint.hxx
index 010a0417d89b..010a0417d89b 100644
--- a/vcl/unx/inc/dtint.hxx
+++ b/vcl/inc/unx/dtint.hxx
diff --git a/vcl/unx/inc/plugins/gtk/atkbridge.hxx b/vcl/inc/unx/gtk/atkbridge.hxx
index 2624f046a612..b54c0a517914 100644
--- a/vcl/unx/inc/plugins/gtk/atkbridge.hxx
+++ b/vcl/inc/unx/gtk/atkbridge.hxx
@@ -29,10 +29,10 @@
 #ifndef __ATK_BRIDGE_HXX__
 #define __ATK_BRIDGE_HXX__
 
-#include <vcl/dllapi.h>
+#include <vclpluginapi.h>
 
-bool VCL_DLLPUBLIC InitAtkBridge(void);
-void VCL_DLLPUBLIC DeInitAtkBridge(void);
+bool VCLPLUG_GTK_PUBLIC InitAtkBridge(void);
+void VCLPLUG_GTK_PUBLIC DeInitAtkBridge(void);
 
 #endif
 
diff --git a/vcl/unx/inc/plugins/gtk/gtkdata.hxx b/vcl/inc/unx/gtk/gtkdata.hxx
index f14aa2b8c401..571b5ca6fd86 100644
--- a/vcl/unx/inc/plugins/gtk/gtkdata.hxx
+++ b/vcl/inc/unx/gtk/gtkdata.hxx
@@ -35,8 +35,8 @@
 #include <gtk/gtk.h>
 #include <tools/postx.h>
 
-#include <saldisp.hxx>
-#include <saldata.hxx>
+#include <unx/saldisp.hxx>
+#include <unx/saldata.hxx>
 #include <vcl/ptrstyle.hxx>
 
 #include <list>
diff --git a/vcl/unx/inc/plugins/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx
index 010844ec3c78..f4f01a4bb801 100644
--- a/vcl/unx/inc/plugins/gtk/gtkframe.hxx
+++ b/vcl/inc/unx/gtk/gtkframe.hxx
@@ -36,7 +36,7 @@
 #include <gdk/gdkkeysyms.h>
 #include <tools/postx.h>
 
-#include <vcl/salframe.hxx>
+#include <salframe.hxx>
 #include <vcl/sysdata.hxx>
 
 #include "tools/link.hxx"
diff --git a/vcl/unx/inc/plugins/gtk/gtkgdi.hxx b/vcl/inc/unx/gtk/gtkgdi.hxx
index 4f7d66712ac7..33120ac8453a 100644
--- a/vcl/unx/inc/plugins/gtk/gtkgdi.hxx
+++ b/vcl/inc/unx/gtk/gtkgdi.hxx
@@ -35,7 +35,7 @@
 #include <gdk/gdkkeysyms.h>
 #include <tools/postx.h>
 
-#include <salgdi.h>
+#include <unx/salgdi.h>
 
 class GtkSalGraphics : public X11SalGraphics
 {
diff --git a/vcl/unx/inc/plugins/gtk/gtkinst.hxx b/vcl/inc/unx/gtk/gtkinst.hxx
index 07549776e9cf..506c78191115 100644
--- a/vcl/unx/inc/plugins/gtk/gtkinst.hxx
+++ b/vcl/inc/unx/gtk/gtkinst.hxx
@@ -29,8 +29,8 @@
 #ifndef _VCL_GTKINST_HXX
 #define _VCL_GTKINST_HXX
 
-#include <salinst.h>
-#include <salsys.h>
+#include <unx/salinst.h>
+#include <unx/salsys.h>
 
 class GtkYieldMutex : public SalYieldMutex
 {
diff --git a/vcl/unx/inc/plugins/gtk/gtkobject.hxx b/vcl/inc/unx/gtk/gtkobject.hxx
index 72b33b0e5c3b..4822a7772be2 100644
--- a/vcl/unx/inc/plugins/gtk/gtkobject.hxx
+++ b/vcl/inc/unx/gtk/gtkobject.hxx
@@ -31,8 +31,8 @@
 
 #include <vcl/sv.h>
 #include <vcl/sysdata.hxx>
-#include <vcl/salobj.hxx>
-#include <plugins/gtk/gtkframe.hxx>
+#include <salobj.hxx>
+#include <unx/gtk/gtkframe.hxx>
 
 class GtkSalObject : public SalObject
 {
diff --git a/vcl/unx/inc/i18n_cb.hxx b/vcl/inc/unx/i18n_cb.hxx
index 22aee5aeb41a..43b76615e8ed 100644
--- a/vcl/unx/inc/i18n_cb.hxx
+++ b/vcl/inc/unx/i18n_cb.hxx
@@ -28,7 +28,7 @@
 #ifndef _SAL_I18N_CALLBACK_HXX
 #define _SAL_I18N_CALLBACK_HXX
 
-#include <vcl/salwtype.hxx>
+#include <salwtype.hxx>
 #include <vector>
 
 #ifdef __cplusplus
diff --git a/vcl/unx/inc/i18n_ic.hxx b/vcl/inc/unx/i18n_ic.hxx
index b038d179f4a2..b038d179f4a2 100644
--- a/vcl/unx/inc/i18n_ic.hxx
+++ b/vcl/inc/unx/i18n_ic.hxx
diff --git a/vcl/unx/inc/i18n_im.hxx b/vcl/inc/unx/i18n_im.hxx
index 92931ec6353e..e363a47d0c85 100644
--- a/vcl/unx/inc/i18n_im.hxx
+++ b/vcl/inc/unx/i18n_im.hxx
@@ -29,13 +29,13 @@
 #ifndef _SAL_I18N_INPUTMETHOD_HXX
 #define _SAL_I18N_INPUTMETHOD_HXX
 
-#include <vcl/dllapi.h>
+#include <vclpluginapi.h>
 
 extern "C" char* GetMethodName( XIMStyle nStyle, char *pBuf, int nBufSize);
 
 #define bUseInputMethodDefault True
 
-class VCL_DLLPUBLIC SalI18N_InputMethod
+class VCLPLUG_GEN_PUBLIC SalI18N_InputMethod
 {
     Bool        mbUseable;  // system supports locale as well as status
                             // and preedit style ?
diff --git a/vcl/unx/inc/i18n_keysym.hxx b/vcl/inc/unx/i18n_keysym.hxx
index e34d80900b79..e34d80900b79 100644
--- a/vcl/unx/inc/i18n_keysym.hxx
+++ b/vcl/inc/unx/i18n_keysym.hxx
diff --git a/vcl/unx/inc/i18n_status.hxx b/vcl/inc/unx/i18n_status.hxx
index 832f2a713091..0b88d778e966 100644
--- a/vcl/unx/inc/i18n_status.hxx
+++ b/vcl/inc/unx/i18n_status.hxx
@@ -34,7 +34,7 @@
 #include <tools/gen.hxx>
 
 #include <rtl/ustring.hxx>
-#include <vcl/salimestatus.hxx>
+#include <salimestatus.hxx>
 
 #include <vector>
 
diff --git a/vcl/unx/inc/i18n_xkb.hxx b/vcl/inc/unx/i18n_xkb.hxx
index e077fdb67526..c1a1a2864861 100644
--- a/vcl/unx/inc/i18n_xkb.hxx
+++ b/vcl/inc/unx/i18n_xkb.hxx
@@ -30,9 +30,9 @@
 #define _SAL_I18N_XKBDEXTENSION_HXX
 
 #include <sal/types.h>
-#include <vcl/dllapi.h>
+#include <vclpluginapi.h>
 
-class VCL_DLLPUBLIC SalI18N_KeyboardExtension
+class VCLPLUG_GEN_PUBLIC SalI18N_KeyboardExtension
 {
 private:
 
diff --git a/vcl/unx/inc/plugins/kde/kdedata.hxx b/vcl/inc/unx/kde/kdedata.hxx
index 9125b33f1b20..6f04d0a01220 100644
--- a/vcl/unx/inc/plugins/kde/kdedata.hxx
+++ b/vcl/inc/unx/kde/kdedata.hxx
@@ -29,9 +29,9 @@
 #ifndef _VCL_KDEDATA_HXX
 #define _VCL_KDEDATA_HXX
 
-#include <saldisp.hxx>
-#include <saldata.hxx>
-#include <salframe.h>
+#include <unx/saldisp.hxx>
+#include <unx/saldata.hxx>
+#include <unx/salframe.h>
 
 class KDEData : public X11SalData
 {
diff --git a/vcl/unx/inc/pspgraphics.h b/vcl/inc/unx/pspgraphics.h
index 2c41297d3162..bb9f67d05cde 100644
--- a/vcl/unx/inc/pspgraphics.h
+++ b/vcl/inc/unx/pspgraphics.h
@@ -31,10 +31,11 @@
 
 
 #include "vcl/fontmanager.hxx"
-#include "vcl/salgdi.hxx"
-#include "vcl/sallayout.hxx"
-#include "vcl/dllapi.h"
+
+#include "vclpluginapi.h"
+#include "salgdi.hxx"
 #include "vcl/vclenum.hxx"
+#include <sallayout.hxx>
 
 namespace psp { struct JobData; class PrinterGfx; }
 
@@ -42,7 +43,7 @@ class ServerFont;
 class ImplDevFontAttributes;
 class SalInfoPrinter;
 
-class VCL_DLLPUBLIC PspGraphics : public SalGraphics
+class VCLPLUG_GEN_PUBLIC PspGraphics : public SalGraphics
 {
     psp::JobData*               m_pJobData;
     psp::PrinterGfx*            m_pPrinterGfx;
diff --git a/vcl/unx/inc/salbmp.h b/vcl/inc/unx/salbmp.h
index f72f77b9909f..a389195308d3 100644
--- a/vcl/unx/inc/salbmp.h
+++ b/vcl/inc/unx/salbmp.h
@@ -29,13 +29,13 @@
 #ifndef _SV_SALBMP_H
 #define _SV_SALBMP_H
 
-#include <salstd.hxx>
+#include <unx/salstd.hxx>
 #ifndef _SV_SALGTYPE
 #include <vcl/salgtype.hxx>
 #endif
-#include <saldisp.hxx>
-#include <vcl/salbmp.hxx>
-#include <vcl/dllapi.h>
+#include <unx/saldisp.hxx>
+#include <salbmp.hxx>
+#include <vclpluginapi.h>
 
 struct  BitmapBuffer;
 class   BitmapPalette;
@@ -47,7 +47,7 @@ class   ImplSalBitmapCache;
 // - SalBitmap -
 // -------------
 
-class VCL_DLLPUBLIC X11SalBitmap : public SalBitmap
+class VCLPLUG_GEN_PUBLIC X11SalBitmap : public SalBitmap
 {
 private:
 
diff --git a/vcl/unx/inc/saldata.hxx b/vcl/inc/unx/saldata.hxx
index e967b0f7e4d0..7bce61cc9ce7 100644
--- a/vcl/unx/inc/saldata.hxx
+++ b/vcl/inc/unx/saldata.hxx
@@ -31,12 +31,12 @@
 
 // -=-= includes -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 #include <signal.h>
-#include <salstd.hxx>
-#include <vcl/salframe.hxx>
-#include <salinst.h>
-#include <vcl/saldatabasic.hxx>
+#include <unx/salstd.hxx>
+#include <salframe.hxx>
+#include <unx/salinst.h>
+#include <saldatabasic.hxx>
 #include <osl/module.h>
-#include <vcl/dllapi.h>
+#include <vclpluginapi.h>
 
 // -=-= forwards -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 class SalXLib;
@@ -53,7 +53,7 @@ typedef unsigned int pthread_t;
 #endif
 
 // -=-= SalData =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-class VCL_DLLPUBLIC X11SalData : public SalData
+class VCLPLUG_GEN_PUBLIC X11SalData : public SalData
 {
 protected:
             sal_Bool                bNoExceptions_;
diff --git a/vcl/unx/inc/saldisp.hxx b/vcl/inc/unx/saldisp.hxx
index 630e665c9def..6687762c1e9d 100644
--- a/vcl/unx/inc/saldisp.hxx
+++ b/vcl/inc/unx/saldisp.hxx
@@ -36,7 +36,7 @@ class   SalVisual;
 class   SalXLib;
 
 // -=-= #includes =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-#include <salunx.h>
+#include <unx/salunx.h>
 #include <vcl/salgtype.hxx>
 #include <vcl/ptrstyle.hxx>
 #include <sal/types.h>
@@ -45,8 +45,9 @@ class   SalXLib;
 #include <list>
 #include <boost/unordered_map.hpp>
 #include <tools/gen.hxx>
-#include <vcl/salwtype.hxx>
-#include <vcl/dllapi.h>
+#include <salwtype.hxx>
+
+#include <vclpluginapi.h>
 
 // -=-= forwards -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 class   BitmapPalette;
@@ -205,7 +206,7 @@ public:
 typedef int(*YieldFunc)(int fd, void* data);
 struct YieldEntry;
 
-class VCL_DLLPUBLIC SalXLib
+class VCLPLUG_GEN_PUBLIC SalXLib
 {
 protected:
     timeval         m_aTimeout;
@@ -276,7 +277,7 @@ extern "C" {
     typedef Bool(*X_if_predicate)(Display*,XEvent*,XPointer);
 }
 
-class VCL_DLLPUBLIC SalDisplay
+class VCLPLUG_GEN_PUBLIC SalDisplay
 {
 public:
     struct RenderEntry
@@ -524,7 +525,7 @@ inline GC SalDisplay::GetGC( sal_uInt16 nDepth, int nScreen ) const
 inline  Display *SalColormap::GetXDisplay() const
 { return m_pDisplay->GetDisplay(); }
 
-class VCL_DLLPUBLIC SalX11Display : public SalDisplay
+class VCLPLUG_GEN_PUBLIC SalX11Display : public SalDisplay
 {
 public:
              SalX11Display( Display* pDisp );
diff --git a/vcl/unx/inc/salframe.h b/vcl/inc/unx/salframe.h
index 0025afce2ad6..4bfe8958d728 100644
--- a/vcl/unx/inc/salframe.h
+++ b/vcl/inc/unx/salframe.h
@@ -29,18 +29,19 @@
 #define _SV_SALFRAME_H
 
 // -=-= #includes -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
-#include <salstd.hxx>
-#include <vcl/salframe.hxx>
-#include <vcl/salwtype.hxx>
-#ifndef _SV_PTRSTYLE_HXX
+#include <unx/salstd.hxx>
+#include <unx/salunx.h>
+
+#include <salframe.hxx>
+#include <salwtype.hxx>
+#include <salinst.hxx>
+
 #include <vcl/ptrstyle.hxx>
-#endif
-#include <vcl/salinst.hxx>
 #include <vcl/sysdata.hxx>
 #include <vcl/timer.hxx>
-#include <vcl/dllapi.h>
+#include <vclpluginapi.h>
+
 
-#include <salunx.h>
 #include <list>
 
 // -=-= forwards -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
@@ -57,7 +58,7 @@ namespace vcl_sal { class WMAdaptor; class NetWMAdaptor; class GnomeWMAdaptor; }
 #define SHOWSTATE_NORMAL        1
 #define SHOWSTATE_HIDDEN        2
 
-class VCL_DLLPUBLIC X11SalFrame : public SalFrame
+class VCLPLUG_GEN_PUBLIC X11SalFrame : public SalFrame
 {
     friend class vcl_sal::WMAdaptor;
     friend class vcl_sal::NetWMAdaptor;
diff --git a/vcl/unx/inc/salgdi.h b/vcl/inc/unx/salgdi.h
index a2774099673b..7786ffe195ea 100644
--- a/vcl/unx/inc/salgdi.h
+++ b/vcl/inc/unx/salgdi.h
@@ -30,13 +30,16 @@
 #define _SV_SALGDI_H
 
 // -=-= includes -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-#include "salstd.hxx"
-#include "vcl/salgdi.hxx"
-#include "vcl/salgtype.hxx"
 #include "tools/fract.hxx"
-#include "vcl/dllapi.h"
-#include <vcl/vclenum.hxx>
-#include <vcl/sallayout.hxx>
+
+#include "vcl/salgtype.hxx"
+#include "vcl/vclenum.hxx"
+
+#include "salstd.hxx"
+#include "salgdi.hxx"
+#include "sallayout.hxx"
+#include "vclpluginapi.h"
+
 #include <deque>
 
 // -=-= forwards -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
@@ -87,7 +90,7 @@ public:
     ~CairoFontsCache();
 };
 
-class VCL_DLLPUBLIC X11SalGraphics : public SalGraphics
+class VCLPLUG_GEN_PUBLIC X11SalGraphics : public SalGraphics
 {
     friend class            X11FontLayout;
     friend class            ServerFontLayout;
diff --git a/vcl/unx/inc/salinst.h b/vcl/inc/unx/salinst.h
index a571303333b3..4d264f7c9f45 100644
--- a/vcl/unx/inc/salinst.h
+++ b/vcl/inc/unx/salinst.h
@@ -32,11 +32,11 @@
 
 #include <vcl/sv.h>
 #include <osl/thread.hxx>
-#include <vcl/dllapi.h>
-#include <vcl/salinst.hxx>
+#include <vclpluginapi.h>
+#include <salinst.hxx>
 #include <vcl/solarmutex.hxx>
 
-class VCL_DLLPUBLIC SalYieldMutex : public vcl::SolarMutexObject
+class VCLPLUG_GEN_PUBLIC SalYieldMutex : public vcl::SolarMutexObject
 {
 protected:
     sal_uIntPtr                                     mnCount;
@@ -54,7 +54,7 @@ public:
 };
 
 // -=-= SalInstanceData =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-class VCL_DLLPUBLIC X11SalInstance : public SalInstance
+class VCLPLUG_GEN_PUBLIC X11SalInstance : public SalInstance
 {
 protected:
     SalYieldMutex*                  mpSalYieldMutex;
diff --git a/vcl/unx/inc/salmenu.h b/vcl/inc/unx/salmenu.h
index e7b5effed653..e7b5effed653 100644
--- a/vcl/unx/inc/salmenu.h
+++ b/vcl/inc/unx/salmenu.h
diff --git a/vcl/unx/inc/salobj.h b/vcl/inc/unx/salobj.h
index 577a3675fa3d..5f10027a0d8b 100644
--- a/vcl/unx/inc/salobj.h
+++ b/vcl/inc/unx/salobj.h
@@ -31,8 +31,9 @@
 
 #include <vcl/sv.h>
 #include <vcl/sysdata.hxx>
-#include <vcl/salobj.hxx>
-#include <vcl/dllapi.h>
+
+#include <vclpluginapi.h>
+#include <salobj.hxx>
 
 class SalClipRegion
 {
@@ -65,7 +66,7 @@ private:
 };
 
 
-class X11SalObject : public SalObject
+class VCLPLUG_GEN_PUBLIC X11SalObject : public SalObject
 {
 public:
     SystemChildData maSystemChildData;
diff --git a/vcl/unx/inc/salprn.h b/vcl/inc/unx/salprn.h
index bf71205586fa..e51a4b6d50f5 100644
--- a/vcl/unx/inc/salprn.h
+++ b/vcl/inc/unx/salprn.h
@@ -30,13 +30,14 @@
 #define _SV_SALPRN_H
 
 #include "vcl/jobdata.hxx"
-#include "vcl/printergfx.hxx"
-#include "vcl/printerjob.hxx"
-#include "vcl/salprn.hxx"
+#include "printergfx.hxx"
+#include "printerjob.hxx"
+#include "salprn.hxx"
+#include "vclpluginapi.h"
 
 class PspGraphics;
 
-class VCL_DLLPUBLIC PspSalInfoPrinter : public SalInfoPrinter
+class VCLPLUG_GEN_PUBLIC PspSalInfoPrinter : public SalInfoPrinter
 {
 public:
     PspGraphics*            m_pGraphics;
@@ -63,7 +64,7 @@ public:
     virtual int                 GetLandscapeAngle( const ImplJobSetup* pSetupData );
 };
 
-class VCL_DLLPUBLIC PspSalPrinter : public SalPrinter
+class VCLPLUG_GEN_PUBLIC PspSalPrinter : public SalPrinter
 {
 public:
     String                  m_aFileName;
diff --git a/vcl/unx/inc/salstd.hxx b/vcl/inc/unx/salstd.hxx
index 07056a91bdec..07056a91bdec 100644
--- a/vcl/unx/inc/salstd.hxx
+++ b/vcl/inc/unx/salstd.hxx
diff --git a/vcl/unx/inc/salsys.h b/vcl/inc/unx/salsys.h
index 751222161022..e4ce898e9550 100644
--- a/vcl/unx/inc/salsys.h
+++ b/vcl/inc/unx/salsys.h
@@ -33,12 +33,12 @@
 #include <vcl/sv.h>
 #include <osl/mutex.hxx>
 #include <osl/thread.hxx>
-#include <vcl/salsys.hxx>
-#include <vcl/dllapi.h>
+#include <salsys.hxx>
+#include <vclpluginapi.h>
 
 #include <list>
 
-class VCL_DLLPUBLIC X11SalSystem : public SalSystem
+class VCLPLUG_GEN_PUBLIC X11SalSystem : public SalSystem
 {
 public:
     X11SalSystem() {}
diff --git a/vcl/unx/inc/saltimer.h b/vcl/inc/unx/saltimer.h
index 9820ba32d40c..f5c889cabe6e 100644
--- a/vcl/unx/inc/saltimer.h
+++ b/vcl/inc/unx/saltimer.h
@@ -29,7 +29,7 @@
 #ifndef _SV_SALTIMER_H
 #define _SV_SALTIMER_H
 
-#include <vcl/saltimer.hxx>
+#include <saltimer.hxx>
 
 class X11SalTimer : public SalTimer
 {
diff --git a/vcl/unx/inc/salunx.h b/vcl/inc/unx/salunx.h
index 1c331d06b9e8..f022f43ce028 100644
--- a/vcl/unx/inc/salunx.h
+++ b/vcl/inc/unx/salunx.h
@@ -38,8 +38,8 @@
 #include <sys/time.h>
 #include <strings.h>
 #endif
-#include <svunx.h>
-#include <salstd.hxx>
+#include <unx/svunx.h>
+#include <unx/salstd.hxx>
 
 // -=-= #defines -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 #define capacityof(a)   (sizeof(a)/sizeof(*a))
diff --git a/vcl/unx/inc/salvd.h b/vcl/inc/unx/salvd.h
index 9add5c261bbd..42ce192ea76f 100644
--- a/vcl/unx/inc/salvd.h
+++ b/vcl/inc/unx/salvd.h
@@ -30,8 +30,8 @@
 #define _SV_SALVD_H
 
 // -=-= #includes -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
-#include <salstd.hxx>
-#include <vcl/salvd.hxx>
+#include <unx/salstd.hxx>
+#include <salvd.hxx>
 
 // -=-= forwards -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 class SalDisplay;
diff --git a/vcl/unx/inc/sm.hxx b/vcl/inc/unx/sm.hxx
index b13d25cc5cc8..a7900d3981e7 100644
--- a/vcl/unx/inc/sm.hxx
+++ b/vcl/inc/unx/sm.hxx
@@ -28,10 +28,11 @@
 #ifndef _VCL_SM_HXX
 #define _VCL_SM_HXX
 
-#include <tools/link.hxx>
-#include <salunx.h>
+#include "tools/link.hxx"
+#include "unx/salunx.h"
 #include <X11/SM/SMlib.h>
-#include <vcl/salsession.hxx>
+#include "salsession.hxx"
+#include "vclpluginapi.h"
 
 class SessionManagerClient
 {
@@ -61,7 +62,7 @@ class SessionManagerClient
     DECL_STATIC_LINK( SessionManagerClient, SaveYourselfHdl, void* );
     DECL_STATIC_LINK( SessionManagerClient, InteractionHdl, void* );
 public:
-    static VCL_DLLPUBLIC void open(); // needed by other plugins, so export
+    static VCLPLUG_GEN_PUBLIC void open(); // needed by other plugins, so export
     static void close();
 
     static bool checkDocumentsSaved();
@@ -70,7 +71,7 @@ public:
     static void interactionDone( bool bCancelShutdown );
 
     static rtl::OUString getExecName();
-    static VCL_DLLPUBLIC const ByteString&  getSessionID();
+    static VCLPLUG_GEN_PUBLIC const ByteString&  getSessionID();
 };
 
 class SalFrame;
diff --git a/vcl/unx/inc/soicon.hxx b/vcl/inc/unx/soicon.hxx
index cb3302cb777b..cb3302cb777b 100644
--- a/vcl/unx/inc/soicon.hxx
+++ b/vcl/inc/unx/soicon.hxx
diff --git a/vcl/unx/inc/strhelper.hxx b/vcl/inc/unx/strhelper.hxx
index 78db60567133..78db60567133 100644
--- a/vcl/unx/inc/strhelper.hxx
+++ b/vcl/inc/unx/strhelper.hxx
diff --git a/vcl/unx/inc/svsys.h b/vcl/inc/unx/svsys.h
index 149acc4cc644..0adc3e423329 100644
--- a/vcl/unx/inc/svsys.h
+++ b/vcl/inc/unx/svsys.h
@@ -28,7 +28,7 @@
 #ifndef _SV_SVSYS_H
 #define _SV_SVSYS_H
 
-#include <svunx.h>
+#include <unx/svunx.h>
 
 #endif // _SV_SVSYS_H
 
diff --git a/vcl/unx/inc/svunx.h b/vcl/inc/unx/svunx.h
index e3ea4cc3e790..e3ea4cc3e790 100644
--- a/vcl/unx/inc/svunx.h
+++ b/vcl/inc/unx/svunx.h
diff --git a/vcl/unx/inc/wmadaptor.hxx b/vcl/inc/unx/wmadaptor.hxx
index c6ef6d98bca8..dc0fe65f290b 100644
--- a/vcl/unx/inc/wmadaptor.hxx
+++ b/vcl/inc/unx/wmadaptor.hxx
@@ -31,12 +31,12 @@
 
 #include <tools/string.hxx>
 #include <tools/gen.hxx>
-#include <vcl/dllapi.h>
 #ifndef _PREX_H
 #include <tools/prex.h>
 #include <X11/Xlib.h>
 #include <tools/postx.h>
 #endif
+#include <vclpluginapi.h>
 #include <vector>
 
 class SalDisplay;
@@ -44,7 +44,7 @@ class X11SalFrame;
 
 namespace vcl_sal {
 
-class VCL_DLLPUBLIC WMAdaptor
+class VCLPLUG_GEN_PUBLIC WMAdaptor
 {
 public:
     enum WMAtom {
diff --git a/vcl/unx/source/inc/airbrush_curs.h b/vcl/inc/unx/x11_cursors/airbrush_curs.h
index a78666bb243d..a78666bb243d 100644
--- a/vcl/unx/source/inc/airbrush_curs.h
+++ b/vcl/inc/unx/x11_cursors/airbrush_curs.h
diff --git a/vcl/unx/source/inc/airbrush_mask.h b/vcl/inc/unx/x11_cursors/airbrush_mask.h
index 82d70f05bbb7..82d70f05bbb7 100644
--- a/vcl/unx/source/inc/airbrush_mask.h
+++ b/vcl/inc/unx/x11_cursors/airbrush_mask.h
diff --git a/vcl/unx/source/inc/ase_curs.h b/vcl/inc/unx/x11_cursors/ase_curs.h
index 0a7c9bfd29c2..0a7c9bfd29c2 100644
--- a/vcl/unx/source/inc/ase_curs.h
+++ b/vcl/inc/unx/x11_cursors/ase_curs.h
diff --git a/vcl/unx/source/inc/ase_mask.h b/vcl/inc/unx/x11_cursors/ase_mask.h
index 4ded0773a72a..4ded0773a72a 100644
--- a/vcl/unx/source/inc/ase_mask.h
+++ b/vcl/inc/unx/x11_cursors/ase_mask.h
diff --git a/vcl/unx/source/inc/asn_curs.h b/vcl/inc/unx/x11_cursors/asn_curs.h
index 68ab521de1a5..68ab521de1a5 100644
--- a/vcl/unx/source/inc/asn_curs.h
+++ b/vcl/inc/unx/x11_cursors/asn_curs.h
diff --git a/vcl/unx/source/inc/asn_mask.h b/vcl/inc/unx/x11_cursors/asn_mask.h
index 0e7a30e5a190..0e7a30e5a190 100644
--- a/vcl/unx/source/inc/asn_mask.h
+++ b/vcl/inc/unx/x11_cursors/asn_mask.h
diff --git a/vcl/unx/source/inc/asne_curs.h b/vcl/inc/unx/x11_cursors/asne_curs.h
index 8ba58f9639e2..8ba58f9639e2 100644
--- a/vcl/unx/source/inc/asne_curs.h
+++ b/vcl/inc/unx/x11_cursors/asne_curs.h
diff --git a/vcl/unx/source/inc/asne_mask.h b/vcl/inc/unx/x11_cursors/asne_mask.h
index 6408f127b1f4..6408f127b1f4 100644
--- a/vcl/unx/source/inc/asne_mask.h
+++ b/vcl/inc/unx/x11_cursors/asne_mask.h
diff --git a/vcl/unx/source/inc/asns_curs.h b/vcl/inc/unx/x11_cursors/asns_curs.h
index 3e039241ba61..3e039241ba61 100644
--- a/vcl/unx/source/inc/asns_curs.h
+++ b/vcl/inc/unx/x11_cursors/asns_curs.h
diff --git a/vcl/unx/source/inc/asns_mask.h b/vcl/inc/unx/x11_cursors/asns_mask.h
index 2a753501bc9d..2a753501bc9d 100644
--- a/vcl/unx/source/inc/asns_mask.h
+++ b/vcl/inc/unx/x11_cursors/asns_mask.h
diff --git a/vcl/unx/source/inc/asnswe_curs.h b/vcl/inc/unx/x11_cursors/asnswe_curs.h
index 599511e1d433..599511e1d433 100644
--- a/vcl/unx/source/inc/asnswe_curs.h
+++ b/vcl/inc/unx/x11_cursors/asnswe_curs.h
diff --git a/vcl/unx/source/inc/asnswe_mask.h b/vcl/inc/unx/x11_cursors/asnswe_mask.h
index a0bcb3c5310e..a0bcb3c5310e 100644
--- a/vcl/unx/source/inc/asnswe_mask.h
+++ b/vcl/inc/unx/x11_cursors/asnswe_mask.h
diff --git a/vcl/unx/source/inc/asnw_curs.h b/vcl/inc/unx/x11_cursors/asnw_curs.h
index 139cd4e2ea5e..139cd4e2ea5e 100644
--- a/vcl/unx/source/inc/asnw_curs.h
+++ b/vcl/inc/unx/x11_cursors/asnw_curs.h
diff --git a/vcl/unx/source/inc/asnw_mask.h b/vcl/inc/unx/x11_cursors/asnw_mask.h
index 6f7da9a88661..6f7da9a88661 100644
--- a/vcl/unx/source/inc/asnw_mask.h
+++ b/vcl/inc/unx/x11_cursors/asnw_mask.h
diff --git a/vcl/unx/source/inc/ass_curs.h b/vcl/inc/unx/x11_cursors/ass_curs.h
index ea98bf5b0404..ea98bf5b0404 100644
--- a/vcl/unx/source/inc/ass_curs.h
+++ b/vcl/inc/unx/x11_cursors/ass_curs.h
diff --git a/vcl/unx/source/inc/ass_mask.h b/vcl/inc/unx/x11_cursors/ass_mask.h
index ccb91615d34a..ccb91615d34a 100644
--- a/vcl/unx/source/inc/ass_mask.h
+++ b/vcl/inc/unx/x11_cursors/ass_mask.h
diff --git a/vcl/unx/source/inc/asse_curs.h b/vcl/inc/unx/x11_cursors/asse_curs.h
index 0df55658c10a..0df55658c10a 100644
--- a/vcl/unx/source/inc/asse_curs.h
+++ b/vcl/inc/unx/x11_cursors/asse_curs.h
diff --git a/vcl/unx/source/inc/asse_mask.h b/vcl/inc/unx/x11_cursors/asse_mask.h
index 1835e939f275..1835e939f275 100644
--- a/vcl/unx/source/inc/asse_mask.h
+++ b/vcl/inc/unx/x11_cursors/asse_mask.h
diff --git a/vcl/unx/source/inc/assw_curs.h b/vcl/inc/unx/x11_cursors/assw_curs.h
index 5956aa5bf40b..5956aa5bf40b 100644
--- a/vcl/unx/source/inc/assw_curs.h
+++ b/vcl/inc/unx/x11_cursors/assw_curs.h
diff --git a/vcl/unx/source/inc/assw_mask.h b/vcl/inc/unx/x11_cursors/assw_mask.h
index 3023b2a6061f..3023b2a6061f 100644
--- a/vcl/unx/source/inc/assw_mask.h
+++ b/vcl/inc/unx/x11_cursors/assw_mask.h
diff --git a/vcl/unx/source/inc/asw_curs.h b/vcl/inc/unx/x11_cursors/asw_curs.h
index 8064570cb8fe..8064570cb8fe 100644
--- a/vcl/unx/source/inc/asw_curs.h
+++ b/vcl/inc/unx/x11_cursors/asw_curs.h
diff --git a/vcl/unx/source/inc/asw_mask.h b/vcl/inc/unx/x11_cursors/asw_mask.h
index 245c42e7d790..245c42e7d790 100644
--- a/vcl/unx/source/inc/asw_mask.h
+++ b/vcl/inc/unx/x11_cursors/asw_mask.h
diff --git a/vcl/unx/source/inc/aswe_curs.h b/vcl/inc/unx/x11_cursors/aswe_curs.h
index ed83d450c269..ed83d450c269 100644
--- a/vcl/unx/source/inc/aswe_curs.h
+++ b/vcl/inc/unx/x11_cursors/aswe_curs.h
diff --git a/vcl/unx/source/inc/aswe_mask.h b/vcl/inc/unx/x11_cursors/aswe_mask.h
index d2a97d7fa4c8..d2a97d7fa4c8 100644
--- a/vcl/unx/source/inc/aswe_mask.h
+++ b/vcl/inc/unx/x11_cursors/aswe_mask.h
diff --git a/vcl/unx/source/inc/chain_curs.h b/vcl/inc/unx/x11_cursors/chain_curs.h
index ea319fb6b128..ea319fb6b128 100644
--- a/vcl/unx/source/inc/chain_curs.h
+++ b/vcl/inc/unx/x11_cursors/chain_curs.h
diff --git a/vcl/unx/source/inc/chain_mask.h b/vcl/inc/unx/x11_cursors/chain_mask.h
index 688835ecbd3e..688835ecbd3e 100644
--- a/vcl/unx/source/inc/chain_mask.h
+++ b/vcl/inc/unx/x11_cursors/chain_mask.h
diff --git a/vcl/unx/source/inc/chainnot_curs.h b/vcl/inc/unx/x11_cursors/chainnot_curs.h
index e327586e3110..e327586e3110 100644
--- a/vcl/unx/source/inc/chainnot_curs.h
+++ b/vcl/inc/unx/x11_cursors/chainnot_curs.h
diff --git a/vcl/unx/source/inc/chainnot_mask.h b/vcl/inc/unx/x11_cursors/chainnot_mask.h
index 6666599ad64c..6666599ad64c 100644
--- a/vcl/unx/source/inc/chainnot_mask.h
+++ b/vcl/inc/unx/x11_cursors/chainnot_mask.h
diff --git a/vcl/unx/source/inc/chart_curs.h b/vcl/inc/unx/x11_cursors/chart_curs.h
index f1fbd5557ad4..f1fbd5557ad4 100644
--- a/vcl/unx/source/inc/chart_curs.h
+++ b/vcl/inc/unx/x11_cursors/chart_curs.h
diff --git a/vcl/unx/source/inc/chart_mask.h b/vcl/inc/unx/x11_cursors/chart_mask.h
index 53f4ae125bda..53f4ae125bda 100644
--- a/vcl/unx/source/inc/chart_mask.h
+++ b/vcl/inc/unx/x11_cursors/chart_mask.h
diff --git a/vcl/unx/source/dtrans/copydata_curs.h b/vcl/inc/unx/x11_cursors/copydata_curs.h
index a882a541a6d7..a882a541a6d7 100644
--- a/vcl/unx/source/dtrans/copydata_curs.h
+++ b/vcl/inc/unx/x11_cursors/copydata_curs.h
diff --git a/vcl/unx/source/dtrans/copydata_mask.h b/vcl/inc/unx/x11_cursors/copydata_mask.h
index 9cd73b08d106..9cd73b08d106 100644
--- a/vcl/unx/source/dtrans/copydata_mask.h
+++ b/vcl/inc/unx/x11_cursors/copydata_mask.h
diff --git a/vcl/unx/source/inc/copydlnk_curs.h b/vcl/inc/unx/x11_cursors/copydlnk_curs.h
index 353297212083..353297212083 100644
--- a/vcl/unx/source/inc/copydlnk_curs.h
+++ b/vcl/inc/unx/x11_cursors/copydlnk_curs.h
diff --git a/vcl/unx/source/inc/copydlnk_mask.h b/vcl/inc/unx/x11_cursors/copydlnk_mask.h
index b6ac40003814..b6ac40003814 100644
--- a/vcl/unx/source/inc/copydlnk_mask.h
+++ b/vcl/inc/unx/x11_cursors/copydlnk_mask.h
diff --git a/vcl/unx/source/inc/copyfile_curs.h b/vcl/inc/unx/x11_cursors/copyfile_curs.h
index da1366c71c6c..da1366c71c6c 100644
--- a/vcl/unx/source/inc/copyfile_curs.h
+++ b/vcl/inc/unx/x11_cursors/copyfile_curs.h
diff --git a/vcl/unx/source/inc/copyfile_mask.h b/vcl/inc/unx/x11_cursors/copyfile_mask.h
index 5679ee8c2da8..5679ee8c2da8 100644
--- a/vcl/unx/source/inc/copyfile_mask.h
+++ b/vcl/inc/unx/x11_cursors/copyfile_mask.h
diff --git a/vcl/unx/source/inc/copyfiles_curs.h b/vcl/inc/unx/x11_cursors/copyfiles_curs.h
index c761f67ae370..c761f67ae370 100644
--- a/vcl/unx/source/inc/copyfiles_curs.h
+++ b/vcl/inc/unx/x11_cursors/copyfiles_curs.h
diff --git a/vcl/unx/source/inc/copyfiles_mask.h b/vcl/inc/unx/x11_cursors/copyfiles_mask.h
index e6be0c5f105d..e6be0c5f105d 100644
--- a/vcl/unx/source/inc/copyfiles_mask.h
+++ b/vcl/inc/unx/x11_cursors/copyfiles_mask.h
diff --git a/vcl/unx/source/inc/copyflnk_curs.h b/vcl/inc/unx/x11_cursors/copyflnk_curs.h
index 9fdf78685365..9fdf78685365 100644
--- a/vcl/unx/source/inc/copyflnk_curs.h
+++ b/vcl/inc/unx/x11_cursors/copyflnk_curs.h
diff --git a/vcl/unx/source/inc/copyflnk_mask.h b/vcl/inc/unx/x11_cursors/copyflnk_mask.h
index 3b678164e0c6..3b678164e0c6 100644
--- a/vcl/unx/source/inc/copyflnk_mask.h
+++ b/vcl/inc/unx/x11_cursors/copyflnk_mask.h
diff --git a/vcl/unx/source/inc/crook_curs.h b/vcl/inc/unx/x11_cursors/crook_curs.h
index 97db1feaa394..97db1feaa394 100644
--- a/vcl/unx/source/inc/crook_curs.h
+++ b/vcl/inc/unx/x11_cursors/crook_curs.h
diff --git a/vcl/unx/source/inc/crook_mask.h b/vcl/inc/unx/x11_cursors/crook_mask.h
index 534ad6da53fd..534ad6da53fd 100644
--- a/vcl/unx/source/inc/crook_mask.h
+++ b/vcl/inc/unx/x11_cursors/crook_mask.h
diff --git a/vcl/unx/source/inc/crop_curs.h b/vcl/inc/unx/x11_cursors/crop_curs.h
index 5647de80b196..5647de80b196 100644
--- a/vcl/unx/source/inc/crop_curs.h
+++ b/vcl/inc/unx/x11_cursors/crop_curs.h
diff --git a/vcl/unx/source/inc/crop_mask.h b/vcl/inc/unx/x11_cursors/crop_mask.h
index f7d3c87201c3..f7d3c87201c3 100644
--- a/vcl/unx/source/inc/crop_mask.h
+++ b/vcl/inc/unx/x11_cursors/crop_mask.h
diff --git a/vcl/unx/source/inc/detective_curs.h b/vcl/inc/unx/x11_cursors/detective_curs.h
index b2e3e2a375b9..b2e3e2a375b9 100644
--- a/vcl/unx/source/inc/detective_curs.h
+++ b/vcl/inc/unx/x11_cursors/detective_curs.h
diff --git a/vcl/unx/source/inc/detective_mask.h b/vcl/inc/unx/x11_cursors/detective_mask.h
index e731aff3c989..e731aff3c989 100644
--- a/vcl/unx/source/inc/detective_mask.h
+++ b/vcl/inc/unx/x11_cursors/detective_mask.h
diff --git a/vcl/unx/source/inc/drawarc_curs.h b/vcl/inc/unx/x11_cursors/drawarc_curs.h
index 08a3e324dae6..08a3e324dae6 100644
--- a/vcl/unx/source/inc/drawarc_curs.h
+++ b/vcl/inc/unx/x11_cursors/drawarc_curs.h
diff --git a/vcl/unx/source/inc/drawarc_mask.h b/vcl/inc/unx/x11_cursors/drawarc_mask.h
index b4e42dc824c6..b4e42dc824c6 100644
--- a/vcl/unx/source/inc/drawarc_mask.h
+++ b/vcl/inc/unx/x11_cursors/drawarc_mask.h
diff --git a/vcl/unx/source/inc/drawbezier_curs.h b/vcl/inc/unx/x11_cursors/drawbezier_curs.h
index a84a2da70333..a84a2da70333 100644
--- a/vcl/unx/source/inc/drawbezier_curs.h
+++ b/vcl/inc/unx/x11_cursors/drawbezier_curs.h
diff --git a/vcl/unx/source/inc/drawbezier_mask.h b/vcl/inc/unx/x11_cursors/drawbezier_mask.h
index 13bac21a4594..13bac21a4594 100644
--- a/vcl/unx/source/inc/drawbezier_mask.h
+++ b/vcl/inc/unx/x11_cursors/drawbezier_mask.h
diff --git a/vcl/unx/source/inc/drawcaption_curs.h b/vcl/inc/unx/x11_cursors/drawcaption_curs.h
index 9905c240002d..9905c240002d 100644
--- a/vcl/unx/source/inc/drawcaption_curs.h
+++ b/vcl/inc/unx/x11_cursors/drawcaption_curs.h
diff --git a/vcl/unx/source/inc/drawcaption_mask.h b/vcl/inc/unx/x11_cursors/drawcaption_mask.h
index 98c0bc5aaf38..98c0bc5aaf38 100644
--- a/vcl/unx/source/inc/drawcaption_mask.h
+++ b/vcl/inc/unx/x11_cursors/drawcaption_mask.h
diff --git a/vcl/unx/source/inc/drawcirclecut_curs.h b/vcl/inc/unx/x11_cursors/drawcirclecut_curs.h
index c36720ad659e..c36720ad659e 100644
--- a/vcl/unx/source/inc/drawcirclecut_curs.h
+++ b/vcl/inc/unx/x11_cursors/drawcirclecut_curs.h
diff --git a/vcl/unx/source/inc/drawcirclecut_mask.h b/vcl/inc/unx/x11_cursors/drawcirclecut_mask.h
index 885c210bda34..885c210bda34 100644
--- a/vcl/unx/source/inc/drawcirclecut_mask.h
+++ b/vcl/inc/unx/x11_cursors/drawcirclecut_mask.h
diff --git a/vcl/unx/source/inc/drawconnect_curs.h b/vcl/inc/unx/x11_cursors/drawconnect_curs.h
index 40f4e6dc3905..40f4e6dc3905 100644
--- a/vcl/unx/source/inc/drawconnect_curs.h
+++ b/vcl/inc/unx/x11_cursors/drawconnect_curs.h
diff --git a/vcl/unx/source/inc/drawconnect_mask.h b/vcl/inc/unx/x11_cursors/drawconnect_mask.h
index 270cdbac3fe6..270cdbac3fe6 100644
--- a/vcl/unx/source/inc/drawconnect_mask.h
+++ b/vcl/inc/unx/x11_cursors/drawconnect_mask.h
diff --git a/vcl/unx/source/inc/drawcrook_curs.h b/vcl/inc/unx/x11_cursors/drawcrook_curs.h
index e89e91322432..e89e91322432 100644
--- a/vcl/unx/source/inc/drawcrook_curs.h
+++ b/vcl/inc/unx/x11_cursors/drawcrook_curs.h
diff --git a/vcl/unx/source/inc/drawcrook_mask.h b/vcl/inc/unx/x11_cursors/drawcrook_mask.h
index b42d2591d123..b42d2591d123 100644
--- a/vcl/unx/source/inc/drawcrook_mask.h
+++ b/vcl/inc/unx/x11_cursors/drawcrook_mask.h
diff --git a/vcl/unx/source/inc/drawcrop_curs.h b/vcl/inc/unx/x11_cursors/drawcrop_curs.h
index 903c5b314418..903c5b314418 100644
--- a/vcl/unx/source/inc/drawcrop_curs.h
+++ b/vcl/inc/unx/x11_cursors/drawcrop_curs.h
diff --git a/vcl/unx/source/inc/drawcrop_mask.h b/vcl/inc/unx/x11_cursors/drawcrop_mask.h
index eea6b4448146..eea6b4448146 100644
--- a/vcl/unx/source/inc/drawcrop_mask.h
+++ b/vcl/inc/unx/x11_cursors/drawcrop_mask.h
diff --git a/vcl/unx/source/inc/drawellipse_curs.h b/vcl/inc/unx/x11_cursors/drawellipse_curs.h
index 5928139b81f3..5928139b81f3 100644
--- a/vcl/unx/source/inc/drawellipse_curs.h
+++ b/vcl/inc/unx/x11_cursors/drawellipse_curs.h
diff --git a/vcl/unx/source/inc/drawellipse_mask.h b/vcl/inc/unx/x11_cursors/drawellipse_mask.h
index 72ceedfb57ee..72ceedfb57ee 100644
--- a/vcl/unx/source/inc/drawellipse_mask.h
+++ b/vcl/inc/unx/x11_cursors/drawellipse_mask.h
diff --git a/vcl/unx/source/inc/drawfreehand_curs.h b/vcl/inc/unx/x11_cursors/drawfreehand_curs.h
index 644d5bbb639d..644d5bbb639d 100644
--- a/vcl/unx/source/inc/drawfreehand_curs.h
+++ b/vcl/inc/unx/x11_cursors/drawfreehand_curs.h
diff --git a/vcl/unx/source/inc/drawfreehand_mask.h b/vcl/inc/unx/x11_cursors/drawfreehand_mask.h
index 959a54e827fe..959a54e827fe 100644
--- a/vcl/unx/source/inc/drawfreehand_mask.h
+++ b/vcl/inc/unx/x11_cursors/drawfreehand_mask.h
diff --git a/vcl/unx/source/inc/drawline_curs.h b/vcl/inc/unx/x11_cursors/drawline_curs.h
index 84f78ccec876..84f78ccec876 100644
--- a/vcl/unx/source/inc/drawline_curs.h
+++ b/vcl/inc/unx/x11_cursors/drawline_curs.h
diff --git a/vcl/unx/source/inc/drawline_mask.h b/vcl/inc/unx/x11_cursors/drawline_mask.h
index 80784ca860b6..80784ca860b6 100644
--- a/vcl/unx/source/inc/drawline_mask.h
+++ b/vcl/inc/unx/x11_cursors/drawline_mask.h
diff --git a/vcl/unx/source/inc/drawmirror_curs.h b/vcl/inc/unx/x11_cursors/drawmirror_curs.h
index b68907138e42..b68907138e42 100644
--- a/vcl/unx/source/inc/drawmirror_curs.h
+++ b/vcl/inc/unx/x11_cursors/drawmirror_curs.h
diff --git a/vcl/unx/source/inc/drawmirror_mask.h b/vcl/inc/unx/x11_cursors/drawmirror_mask.h
index 231f109a24ae..231f109a24ae 100644
--- a/vcl/unx/source/inc/drawmirror_mask.h
+++ b/vcl/inc/unx/x11_cursors/drawmirror_mask.h
diff --git a/vcl/unx/source/inc/drawpie_curs.h b/vcl/inc/unx/x11_cursors/drawpie_curs.h
index 1cc5933c88b3..1cc5933c88b3 100644
--- a/vcl/unx/source/inc/drawpie_curs.h
+++ b/vcl/inc/unx/x11_cursors/drawpie_curs.h
diff --git a/vcl/unx/source/inc/drawpie_mask.h b/vcl/inc/unx/x11_cursors/drawpie_mask.h
index 880be6043497..880be6043497 100644
--- a/vcl/unx/source/inc/drawpie_mask.h
+++ b/vcl/inc/unx/x11_cursors/drawpie_mask.h
diff --git a/vcl/unx/source/inc/drawpolygon_curs.h b/vcl/inc/unx/x11_cursors/drawpolygon_curs.h
index a101b1bff576..a101b1bff576 100644
--- a/vcl/unx/source/inc/drawpolygon_curs.h
+++ b/vcl/inc/unx/x11_cursors/drawpolygon_curs.h
diff --git a/vcl/unx/source/inc/drawpolygon_mask.h b/vcl/inc/unx/x11_cursors/drawpolygon_mask.h
index 660bee287c09..660bee287c09 100644
--- a/vcl/unx/source/inc/drawpolygon_mask.h
+++ b/vcl/inc/unx/x11_cursors/drawpolygon_mask.h
diff --git a/vcl/unx/source/inc/drawrect_curs.h b/vcl/inc/unx/x11_cursors/drawrect_curs.h
index 553df540aa29..553df540aa29 100644
--- a/vcl/unx/source/inc/drawrect_curs.h
+++ b/vcl/inc/unx/x11_cursors/drawrect_curs.h
diff --git a/vcl/unx/source/inc/drawrect_mask.h b/vcl/inc/unx/x11_cursors/drawrect_mask.h
index 3bb39e1d98a8..3bb39e1d98a8 100644
--- a/vcl/unx/source/inc/drawrect_mask.h
+++ b/vcl/inc/unx/x11_cursors/drawrect_mask.h
diff --git a/vcl/unx/source/inc/drawtext_curs.h b/vcl/inc/unx/x11_cursors/drawtext_curs.h
index 67726d6e5a2d..67726d6e5a2d 100644
--- a/vcl/unx/source/inc/drawtext_curs.h
+++ b/vcl/inc/unx/x11_cursors/drawtext_curs.h
diff --git a/vcl/unx/source/inc/drawtext_mask.h b/vcl/inc/unx/x11_cursors/drawtext_mask.h
index ce1fc2c41053..ce1fc2c41053 100644
--- a/vcl/unx/source/inc/drawtext_mask.h
+++ b/vcl/inc/unx/x11_cursors/drawtext_mask.h
diff --git a/vcl/unx/source/inc/fill_curs.h b/vcl/inc/unx/x11_cursors/fill_curs.h
index c8dfbb274f13..c8dfbb274f13 100644
--- a/vcl/unx/source/inc/fill_curs.h
+++ b/vcl/inc/unx/x11_cursors/fill_curs.h
diff --git a/vcl/unx/source/inc/fill_mask.h b/vcl/inc/unx/x11_cursors/fill_mask.h
index 32b25ae67660..32b25ae67660 100644
--- a/vcl/unx/source/inc/fill_mask.h
+++ b/vcl/inc/unx/x11_cursors/fill_mask.h
diff --git a/vcl/unx/source/inc/hshear_curs.h b/vcl/inc/unx/x11_cursors/hshear_curs.h
index edaa9fe7958b..edaa9fe7958b 100644
--- a/vcl/unx/source/inc/hshear_curs.h
+++ b/vcl/inc/unx/x11_cursors/hshear_curs.h
diff --git a/vcl/unx/source/inc/hshear_mask.h b/vcl/inc/unx/x11_cursors/hshear_mask.h
index 5c6f9a017e5a..5c6f9a017e5a 100644
--- a/vcl/unx/source/inc/hshear_mask.h
+++ b/vcl/inc/unx/x11_cursors/hshear_mask.h
diff --git a/vcl/unx/source/inc/invert50.h b/vcl/inc/unx/x11_cursors/invert50.h
index b1f4c1e86d18..b1f4c1e86d18 100644
--- a/vcl/unx/source/inc/invert50.h
+++ b/vcl/inc/unx/x11_cursors/invert50.h
diff --git a/vcl/unx/source/dtrans/linkdata_curs.h b/vcl/inc/unx/x11_cursors/linkdata_curs.h
index 054ef55ef2bb..054ef55ef2bb 100644
--- a/vcl/unx/source/dtrans/linkdata_curs.h
+++ b/vcl/inc/unx/x11_cursors/linkdata_curs.h
diff --git a/vcl/unx/source/dtrans/linkdata_mask.h b/vcl/inc/unx/x11_cursors/linkdata_mask.h
index 429c603066dc..429c603066dc 100644
--- a/vcl/unx/source/dtrans/linkdata_mask.h
+++ b/vcl/inc/unx/x11_cursors/linkdata_mask.h
diff --git a/vcl/unx/source/inc/linkfile_curs.h b/vcl/inc/unx/x11_cursors/linkfile_curs.h
index 5f68af135810..5f68af135810 100644
--- a/vcl/unx/source/inc/linkfile_curs.h
+++ b/vcl/inc/unx/x11_cursors/linkfile_curs.h
diff --git a/vcl/unx/source/inc/linkfile_mask.h b/vcl/inc/unx/x11_cursors/linkfile_mask.h
index fad8d6ad7624..fad8d6ad7624 100644
--- a/vcl/unx/source/inc/linkfile_mask.h
+++ b/vcl/inc/unx/x11_cursors/linkfile_mask.h
diff --git a/vcl/unx/source/inc/magnify_curs.h b/vcl/inc/unx/x11_cursors/magnify_curs.h
index 4db8bb382b15..4db8bb382b15 100644
--- a/vcl/unx/source/inc/magnify_curs.h
+++ b/vcl/inc/unx/x11_cursors/magnify_curs.h
diff --git a/vcl/unx/source/inc/magnify_mask.h b/vcl/inc/unx/x11_cursors/magnify_mask.h
index a7b5b027362d..a7b5b027362d 100644
--- a/vcl/unx/source/inc/magnify_mask.h
+++ b/vcl/inc/unx/x11_cursors/magnify_mask.h
diff --git a/vcl/unx/source/inc/mirror_curs.h b/vcl/inc/unx/x11_cursors/mirror_curs.h
index c2488a6fd725..c2488a6fd725 100644
--- a/vcl/unx/source/inc/mirror_curs.h
+++ b/vcl/inc/unx/x11_cursors/mirror_curs.h
diff --git a/vcl/unx/source/inc/mirror_mask.h b/vcl/inc/unx/x11_cursors/mirror_mask.h
index 60e8f1593b2b..60e8f1593b2b 100644
--- a/vcl/unx/source/inc/mirror_mask.h
+++ b/vcl/inc/unx/x11_cursors/mirror_mask.h
diff --git a/vcl/unx/source/inc/movebezierweight_curs.h b/vcl/inc/unx/x11_cursors/movebezierweight_curs.h
index df99aab7ea0f..df99aab7ea0f 100644
--- a/vcl/unx/source/inc/movebezierweight_curs.h
+++ b/vcl/inc/unx/x11_cursors/movebezierweight_curs.h
diff --git a/vcl/unx/source/inc/movebezierweight_mask.h b/vcl/inc/unx/x11_cursors/movebezierweight_mask.h
index 831f427a9086..831f427a9086 100644
--- a/vcl/unx/source/inc/movebezierweight_mask.h
+++ b/vcl/inc/unx/x11_cursors/movebezierweight_mask.h
diff --git a/vcl/unx/source/dtrans/movedata_curs.h b/vcl/inc/unx/x11_cursors/movedata_curs.h
index 642bbd176e4b..642bbd176e4b 100644
--- a/vcl/unx/source/dtrans/movedata_curs.h
+++ b/vcl/inc/unx/x11_cursors/movedata_curs.h
diff --git a/vcl/unx/source/dtrans/movedata_mask.h b/vcl/inc/unx/x11_cursors/movedata_mask.h
index f06c80f1728c..f06c80f1728c 100644
--- a/vcl/unx/source/dtrans/movedata_mask.h
+++ b/vcl/inc/unx/x11_cursors/movedata_mask.h
diff --git a/vcl/unx/source/inc/movedlnk_curs.h b/vcl/inc/unx/x11_cursors/movedlnk_curs.h
index c163488d8d26..c163488d8d26 100644
--- a/vcl/unx/source/inc/movedlnk_curs.h
+++ b/vcl/inc/unx/x11_cursors/movedlnk_curs.h
diff --git a/vcl/unx/source/inc/movedlnk_mask.h b/vcl/inc/unx/x11_cursors/movedlnk_mask.h
index 8f3fa3cb92f6..8f3fa3cb92f6 100644
--- a/vcl/unx/source/inc/movedlnk_mask.h
+++ b/vcl/inc/unx/x11_cursors/movedlnk_mask.h
diff --git a/vcl/unx/source/inc/movefile_curs.h b/vcl/inc/unx/x11_cursors/movefile_curs.h
index 54c3ce91df96..54c3ce91df96 100644
--- a/vcl/unx/source/inc/movefile_curs.h
+++ b/vcl/inc/unx/x11_cursors/movefile_curs.h
diff --git a/vcl/unx/source/inc/movefile_mask.h b/vcl/inc/unx/x11_cursors/movefile_mask.h
index 566b3fdeb8de..566b3fdeb8de 100644
--- a/vcl/unx/source/inc/movefile_mask.h
+++ b/vcl/inc/unx/x11_cursors/movefile_mask.h
diff --git a/vcl/unx/source/inc/movefiles_curs.h b/vcl/inc/unx/x11_cursors/movefiles_curs.h
index 95ec95bd8302..95ec95bd8302 100644
--- a/vcl/unx/source/inc/movefiles_curs.h
+++ b/vcl/inc/unx/x11_cursors/movefiles_curs.h
diff --git a/vcl/unx/source/inc/movefiles_mask.h b/vcl/inc/unx/x11_cursors/movefiles_mask.h
index 03a56a169218..03a56a169218 100644
--- a/vcl/unx/source/inc/movefiles_mask.h
+++ b/vcl/inc/unx/x11_cursors/movefiles_mask.h
diff --git a/vcl/unx/source/inc/moveflnk_curs.h b/vcl/inc/unx/x11_cursors/moveflnk_curs.h
index 1f1fea56dead..1f1fea56dead 100644
--- a/vcl/unx/source/inc/moveflnk_curs.h
+++ b/vcl/inc/unx/x11_cursors/moveflnk_curs.h
diff --git a/vcl/unx/source/inc/moveflnk_mask.h b/vcl/inc/unx/x11_cursors/moveflnk_mask.h
index f8312aba525e..f8312aba525e 100644
--- a/vcl/unx/source/inc/moveflnk_mask.h
+++ b/vcl/inc/unx/x11_cursors/moveflnk_mask.h
diff --git a/vcl/unx/source/inc/movepoint_curs.h b/vcl/inc/unx/x11_cursors/movepoint_curs.h
index 8ccf2d581455..8ccf2d581455 100644
--- a/vcl/unx/source/inc/movepoint_curs.h
+++ b/vcl/inc/unx/x11_cursors/movepoint_curs.h
diff --git a/vcl/unx/source/inc/movepoint_mask.h b/vcl/inc/unx/x11_cursors/movepoint_mask.h
index 547dfb03a87e..547dfb03a87e 100644
--- a/vcl/unx/source/inc/movepoint_mask.h
+++ b/vcl/inc/unx/x11_cursors/movepoint_mask.h
diff --git a/vcl/unx/source/dtrans/nodrop_curs.h b/vcl/inc/unx/x11_cursors/nodrop_curs.h
index 5c501d3876c4..5c501d3876c4 100644
--- a/vcl/unx/source/dtrans/nodrop_curs.h
+++ b/vcl/inc/unx/x11_cursors/nodrop_curs.h
diff --git a/vcl/unx/source/dtrans/nodrop_mask.h b/vcl/inc/unx/x11_cursors/nodrop_mask.h
index bd315dc28df1..bd315dc28df1 100644
--- a/vcl/unx/source/dtrans/nodrop_mask.h
+++ b/vcl/inc/unx/x11_cursors/nodrop_mask.h
diff --git a/vcl/unx/source/inc/null_curs.h b/vcl/inc/unx/x11_cursors/null_curs.h
index 1f5687cbcf61..1f5687cbcf61 100644
--- a/vcl/unx/source/inc/null_curs.h
+++ b/vcl/inc/unx/x11_cursors/null_curs.h
diff --git a/vcl/unx/source/inc/null_mask.h b/vcl/inc/unx/x11_cursors/null_mask.h
index e7ff46805d41..e7ff46805d41 100644
--- a/vcl/unx/source/inc/null_mask.h
+++ b/vcl/inc/unx/x11_cursors/null_mask.h
diff --git a/vcl/unx/source/inc/paintbrush_curs.h b/vcl/inc/unx/x11_cursors/paintbrush_curs.h
index 1e3cef066ddc..1e3cef066ddc 100644
--- a/vcl/unx/source/inc/paintbrush_curs.h
+++ b/vcl/inc/unx/x11_cursors/paintbrush_curs.h
diff --git a/vcl/unx/source/inc/paintbrush_mask.h b/vcl/inc/unx/x11_cursors/paintbrush_mask.h
index 4e3000d3b981..4e3000d3b981 100644
--- a/vcl/unx/source/inc/paintbrush_mask.h
+++ b/vcl/inc/unx/x11_cursors/paintbrush_mask.h
diff --git a/vcl/unx/source/inc/pivotcol_curs.h b/vcl/inc/unx/x11_cursors/pivotcol_curs.h
index dcd7e321fd2e..dcd7e321fd2e 100644
--- a/vcl/unx/source/inc/pivotcol_curs.h
+++ b/vcl/inc/unx/x11_cursors/pivotcol_curs.h
diff --git a/vcl/unx/source/inc/pivotcol_mask.h b/vcl/inc/unx/x11_cursors/pivotcol_mask.h
index b5537c03ec9f..b5537c03ec9f 100644
--- a/vcl/unx/source/inc/pivotcol_mask.h
+++ b/vcl/inc/unx/x11_cursors/pivotcol_mask.h
diff --git a/vcl/unx/source/inc/pivotdel_curs.h b/vcl/inc/unx/x11_cursors/pivotdel_curs.h
index 18348b9e21df..18348b9e21df 100644
--- a/vcl/unx/source/inc/pivotdel_curs.h
+++ b/vcl/inc/unx/x11_cursors/pivotdel_curs.h
diff --git a/vcl/unx/source/inc/pivotdel_mask.h b/vcl/inc/unx/x11_cursors/pivotdel_mask.h
index bf2e2379f194..bf2e2379f194 100644
--- a/vcl/unx/source/inc/pivotdel_mask.h
+++ b/vcl/inc/unx/x11_cursors/pivotdel_mask.h
diff --git a/vcl/unx/source/inc/pivotfld_curs.h b/vcl/inc/unx/x11_cursors/pivotfld_curs.h
index 424179cbfe16..424179cbfe16 100644
--- a/vcl/unx/source/inc/pivotfld_curs.h
+++ b/vcl/inc/unx/x11_cursors/pivotfld_curs.h
diff --git a/vcl/unx/source/inc/pivotfld_mask.h b/vcl/inc/unx/x11_cursors/pivotfld_mask.h
index e768b4b26889..e768b4b26889 100644
--- a/vcl/unx/source/inc/pivotfld_mask.h
+++ b/vcl/inc/unx/x11_cursors/pivotfld_mask.h
diff --git a/vcl/unx/source/inc/pivotrow_curs.h b/vcl/inc/unx/x11_cursors/pivotrow_curs.h
index 1b6060ea5b8b..1b6060ea5b8b 100644
--- a/vcl/unx/source/inc/pivotrow_curs.h
+++ b/vcl/inc/unx/x11_cursors/pivotrow_curs.h
diff --git a/vcl/unx/source/inc/pivotrow_mask.h b/vcl/inc/unx/x11_cursors/pivotrow_mask.h
index f6ea09498aa0..f6ea09498aa0 100644
--- a/vcl/unx/source/inc/pivotrow_mask.h
+++ b/vcl/inc/unx/x11_cursors/pivotrow_mask.h
diff --git a/vcl/unx/source/inc/rotate_curs.h b/vcl/inc/unx/x11_cursors/rotate_curs.h
index c6550475c989..c6550475c989 100644
--- a/vcl/unx/source/inc/rotate_curs.h
+++ b/vcl/inc/unx/x11_cursors/rotate_curs.h
diff --git a/vcl/unx/source/inc/rotate_mask.h b/vcl/inc/unx/x11_cursors/rotate_mask.h
index 12790cca4beb..12790cca4beb 100644
--- a/vcl/unx/source/inc/rotate_mask.h
+++ b/vcl/inc/unx/x11_cursors/rotate_mask.h
diff --git a/vcl/inc/unx/x11_cursors/salcursors.h b/vcl/inc/unx/x11_cursors/salcursors.h
new file mode 100644
index 000000000000..e0d34e122336
--- /dev/null
+++ b/vcl/inc/unx/x11_cursors/salcursors.h
@@ -0,0 +1,162 @@
+/*************************************************************************
+ *
+ * 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.
+ *
+ ************************************************************************/
+
+#include "unx/x11_cursors/nodrop_curs.h"
+#include "unx/x11_cursors/nodrop_mask.h"
+#include "unx/x11_cursors/magnify_curs.h"
+#include "unx/x11_cursors/magnify_mask.h"
+#include "unx/x11_cursors/rotate_curs.h"
+#include "unx/x11_cursors/rotate_mask.h"
+#include "unx/x11_cursors/hshear_curs.h"
+#include "unx/x11_cursors/hshear_mask.h"
+#include "unx/x11_cursors/vshear_curs.h"
+#include "unx/x11_cursors/vshear_mask.h"
+#include "unx/x11_cursors/drawline_curs.h"
+#include "unx/x11_cursors/drawline_mask.h"
+#include "unx/x11_cursors/drawrect_curs.h"
+#include "unx/x11_cursors/drawrect_mask.h"
+#include "unx/x11_cursors/drawpolygon_curs.h"
+#include "unx/x11_cursors/drawpolygon_mask.h"
+#include "unx/x11_cursors/drawbezier_curs.h"
+#include "unx/x11_cursors/drawbezier_mask.h"
+#include "unx/x11_cursors/drawarc_curs.h"
+#include "unx/x11_cursors/drawarc_mask.h"
+#include "unx/x11_cursors/drawpie_curs.h"
+#include "unx/x11_cursors/drawpie_mask.h"
+#include "unx/x11_cursors/drawcirclecut_curs.h"
+#include "unx/x11_cursors/drawcirclecut_mask.h"
+#include "unx/x11_cursors/drawellipse_curs.h"
+#include "unx/x11_cursors/drawellipse_mask.h"
+#include "unx/x11_cursors/drawconnect_curs.h"
+#include "unx/x11_cursors/drawconnect_mask.h"
+#include "unx/x11_cursors/drawtext_curs.h"
+#include "unx/x11_cursors/drawtext_mask.h"
+#include "unx/x11_cursors/mirror_curs.h"
+#include "unx/x11_cursors/mirror_mask.h"
+#include "unx/x11_cursors/crook_curs.h"
+#include "unx/x11_cursors/crook_mask.h"
+#include "unx/x11_cursors/crop_curs.h"
+#include "unx/x11_cursors/crop_mask.h"
+#include "unx/x11_cursors/movepoint_curs.h"
+#include "unx/x11_cursors/movepoint_mask.h"
+#include "unx/x11_cursors/movebezierweight_curs.h"
+#include "unx/x11_cursors/movebezierweight_mask.h"
+#include "unx/x11_cursors/drawfreehand_curs.h"
+#include "unx/x11_cursors/drawfreehand_mask.h"
+#include "unx/x11_cursors/drawcaption_curs.h"
+#include "unx/x11_cursors/drawcaption_mask.h"
+#include "unx/x11_cursors/movedata_curs.h"
+#include "unx/x11_cursors/movedata_mask.h"
+#include "unx/x11_cursors/copydata_curs.h"
+#include "unx/x11_cursors/copydata_mask.h"
+#include "unx/x11_cursors/linkdata_curs.h"
+#include "unx/x11_cursors/linkdata_mask.h"
+#include "unx/x11_cursors/movedlnk_curs.h"
+#include "unx/x11_cursors/movedlnk_mask.h"
+#include "unx/x11_cursors/copydlnk_curs.h"
+#include "unx/x11_cursors/copydlnk_mask.h"
+#include "unx/x11_cursors/movefile_curs.h"
+#include "unx/x11_cursors/movefile_mask.h"
+#include "unx/x11_cursors/copyfile_curs.h"
+#include "unx/x11_cursors/copyfile_mask.h"
+#include "unx/x11_cursors/linkfile_curs.h"
+#include "unx/x11_cursors/linkfile_mask.h"
+#include "unx/x11_cursors/moveflnk_curs.h"
+#include "unx/x11_cursors/moveflnk_mask.h"
+#include "unx/x11_cursors/copyflnk_curs.h"
+#include "unx/x11_cursors/copyflnk_mask.h"
+#include "unx/x11_cursors/movefiles_curs.h"
+#include "unx/x11_cursors/movefiles_mask.h"
+#include "unx/x11_cursors/copyfiles_curs.h"
+#include "unx/x11_cursors/copyfiles_mask.h"
+
+#include "unx/x11_cursors/chart_curs.h"
+#include "unx/x11_cursors/chart_mask.h"
+#include "unx/x11_cursors/detective_curs.h"
+#include "unx/x11_cursors/detective_mask.h"
+#include "unx/x11_cursors/pivotcol_curs.h"
+#include "unx/x11_cursors/pivotcol_mask.h"
+#include "unx/x11_cursors/pivotfld_curs.h"
+#include "unx/x11_cursors/pivotfld_mask.h"
+#include "unx/x11_cursors/pivotrow_curs.h"
+#include "unx/x11_cursors/pivotrow_mask.h"
+#include "unx/x11_cursors/pivotdel_curs.h"
+#include "unx/x11_cursors/pivotdel_mask.h"
+
+#include "unx/x11_cursors/chain_curs.h"
+#include "unx/x11_cursors/chain_mask.h"
+#include "unx/x11_cursors/chainnot_curs.h"
+#include "unx/x11_cursors/chainnot_mask.h"
+
+#include "unx/x11_cursors/timemove_curs.h"
+#include "unx/x11_cursors/timemove_mask.h"
+#include "unx/x11_cursors/timesize_curs.h"
+#include "unx/x11_cursors/timesize_mask.h"
+
+#include "unx/x11_cursors/ase_curs.h"
+#include "unx/x11_cursors/ase_mask.h"
+#include "unx/x11_cursors/asn_curs.h"
+#include "unx/x11_cursors/asn_mask.h"
+#include "unx/x11_cursors/asne_curs.h"
+#include "unx/x11_cursors/asne_mask.h"
+#include "unx/x11_cursors/asns_curs.h"
+#include "unx/x11_cursors/asns_mask.h"
+#include "unx/x11_cursors/asnswe_curs.h"
+#include "unx/x11_cursors/asnswe_mask.h"
+#include "unx/x11_cursors/asnw_curs.h"
+#include "unx/x11_cursors/asnw_mask.h"
+#include "unx/x11_cursors/ass_curs.h"
+#include "unx/x11_cursors/ass_mask.h"
+#include "unx/x11_cursors/asse_curs.h"
+#include "unx/x11_cursors/asse_mask.h"
+#include "unx/x11_cursors/assw_curs.h"
+#include "unx/x11_cursors/assw_mask.h"
+#include "unx/x11_cursors/asw_curs.h"
+#include "unx/x11_cursors/asw_mask.h"
+#include "unx/x11_cursors/aswe_curs.h"
+#include "unx/x11_cursors/aswe_mask.h"
+#include "unx/x11_cursors/null_curs.h"
+#include "unx/x11_cursors/null_mask.h"
+
+#include "unx/x11_cursors/airbrush_curs.h"
+#include "unx/x11_cursors/airbrush_mask.h"
+#include "unx/x11_cursors/fill_curs.h"
+#include "unx/x11_cursors/fill_mask.h"
+#include "unx/x11_cursors/vertcurs_curs.h"
+#include "unx/x11_cursors/vertcurs_mask.h"
+#include "unx/x11_cursors/tblsele_curs.h"
+#include "unx/x11_cursors/tblsele_mask.h"
+#include "unx/x11_cursors/tblsels_curs.h"
+#include "unx/x11_cursors/tblsels_mask.h"
+#include "unx/x11_cursors/tblselse_curs.h"
+#include "unx/x11_cursors/tblselse_mask.h"
+#include "unx/x11_cursors/tblselw_curs.h"
+#include "unx/x11_cursors/tblselw_mask.h"
+#include "unx/x11_cursors/tblselsw_curs.h"
+#include "unx/x11_cursors/tblselsw_mask.h"
+#include "unx/x11_cursors/paintbrush_curs.h"
+#include "unx/x11_cursors/paintbrush_mask.h"
diff --git a/vcl/unx/source/inc/tblsele_curs.h b/vcl/inc/unx/x11_cursors/tblsele_curs.h
index 21bcfd1fdd9f..21bcfd1fdd9f 100644
--- a/vcl/unx/source/inc/tblsele_curs.h
+++ b/vcl/inc/unx/x11_cursors/tblsele_curs.h
diff --git a/vcl/unx/source/inc/tblsele_mask.h b/vcl/inc/unx/x11_cursors/tblsele_mask.h
index 2a555e83d884..2a555e83d884 100644
--- a/vcl/unx/source/inc/tblsele_mask.h
+++ b/vcl/inc/unx/x11_cursors/tblsele_mask.h
diff --git a/vcl/unx/source/inc/tblsels_curs.h b/vcl/inc/unx/x11_cursors/tblsels_curs.h
index fb739951e9f4..fb739951e9f4 100644
--- a/vcl/unx/source/inc/tblsels_curs.h
+++ b/vcl/inc/unx/x11_cursors/tblsels_curs.h
diff --git a/vcl/unx/source/inc/tblsels_mask.h b/vcl/inc/unx/x11_cursors/tblsels_mask.h
index 5a75aabe4c51..5a75aabe4c51 100644
--- a/vcl/unx/source/inc/tblsels_mask.h
+++ b/vcl/inc/unx/x11_cursors/tblsels_mask.h
diff --git a/vcl/unx/source/inc/tblselse_curs.h b/vcl/inc/unx/x11_cursors/tblselse_curs.h
index fb34ff02b574..fb34ff02b574 100644
--- a/vcl/unx/source/inc/tblselse_curs.h
+++ b/vcl/inc/unx/x11_cursors/tblselse_curs.h
diff --git a/vcl/unx/source/inc/tblselse_mask.h b/vcl/inc/unx/x11_cursors/tblselse_mask.h
index fc289854e3ea..fc289854e3ea 100644
--- a/vcl/unx/source/inc/tblselse_mask.h
+++ b/vcl/inc/unx/x11_cursors/tblselse_mask.h
diff --git a/vcl/unx/source/inc/tblselsw_curs.h b/vcl/inc/unx/x11_cursors/tblselsw_curs.h
index a421a18b815d..a421a18b815d 100644
--- a/vcl/unx/source/inc/tblselsw_curs.h
+++ b/vcl/inc/unx/x11_cursors/tblselsw_curs.h
diff --git a/vcl/unx/source/inc/tblselsw_mask.h b/vcl/inc/unx/x11_cursors/tblselsw_mask.h
index 14b49a9863fb..14b49a9863fb 100644
--- a/vcl/unx/source/inc/tblselsw_mask.h
+++ b/vcl/inc/unx/x11_cursors/tblselsw_mask.h
diff --git a/vcl/unx/source/inc/tblselw_curs.h b/vcl/inc/unx/x11_cursors/tblselw_curs.h
index 2ee9a0d4af20..2ee9a0d4af20 100644
--- a/vcl/unx/source/inc/tblselw_curs.h
+++ b/vcl/inc/unx/x11_cursors/tblselw_curs.h
diff --git a/vcl/unx/source/inc/tblselw_mask.h b/vcl/inc/unx/x11_cursors/tblselw_mask.h
index 8fa5be7c724a..8fa5be7c724a 100644
--- a/vcl/unx/source/inc/tblselw_mask.h
+++ b/vcl/inc/unx/x11_cursors/tblselw_mask.h
diff --git a/vcl/unx/source/inc/timemove_curs.h b/vcl/inc/unx/x11_cursors/timemove_curs.h
index ce5e2b6914b5..ce5e2b6914b5 100644
--- a/vcl/unx/source/inc/timemove_curs.h
+++ b/vcl/inc/unx/x11_cursors/timemove_curs.h
diff --git a/vcl/unx/source/inc/timemove_mask.h b/vcl/inc/unx/x11_cursors/timemove_mask.h
index 42664e6998fb..42664e6998fb 100644
--- a/vcl/unx/source/inc/timemove_mask.h
+++ b/vcl/inc/unx/x11_cursors/timemove_mask.h
diff --git a/vcl/unx/source/inc/timesize_curs.h b/vcl/inc/unx/x11_cursors/timesize_curs.h
index 99c75d4affb1..99c75d4affb1 100644
--- a/vcl/unx/source/inc/timesize_curs.h
+++ b/vcl/inc/unx/x11_cursors/timesize_curs.h
diff --git a/vcl/unx/source/inc/timesize_mask.h b/vcl/inc/unx/x11_cursors/timesize_mask.h
index 68d03c95057f..68d03c95057f 100644
--- a/vcl/unx/source/inc/timesize_mask.h
+++ b/vcl/inc/unx/x11_cursors/timesize_mask.h
diff --git a/vcl/unx/source/inc/vertcurs_curs.h b/vcl/inc/unx/x11_cursors/vertcurs_curs.h
index 5f8cfde93a8d..5f8cfde93a8d 100644
--- a/vcl/unx/source/inc/vertcurs_curs.h
+++ b/vcl/inc/unx/x11_cursors/vertcurs_curs.h
diff --git a/vcl/unx/source/inc/vertcurs_mask.h b/vcl/inc/unx/x11_cursors/vertcurs_mask.h
index 05ac8246e52e..05ac8246e52e 100644
--- a/vcl/unx/source/inc/vertcurs_mask.h
+++ b/vcl/inc/unx/x11_cursors/vertcurs_mask.h
diff --git a/vcl/unx/source/inc/vshear_curs.h b/vcl/inc/unx/x11_cursors/vshear_curs.h
index c8f0f7dd4b8b..c8f0f7dd4b8b 100644
--- a/vcl/unx/source/inc/vshear_curs.h
+++ b/vcl/inc/unx/x11_cursors/vshear_curs.h
diff --git a/vcl/unx/source/inc/vshear_mask.h b/vcl/inc/unx/x11_cursors/vshear_mask.h
index 70b777a18d2f..70b777a18d2f 100644
--- a/vcl/unx/source/inc/vshear_mask.h
+++ b/vcl/inc/unx/x11_cursors/vshear_mask.h
diff --git a/vcl/inc/vcl/gdimtf.hxx b/vcl/inc/vcl/gdimtf.hxx
index 263ce26c9226..86f8dc5cbc77 100644
--- a/vcl/inc/vcl/gdimtf.hxx
+++ b/vcl/inc/vcl/gdimtf.hxx
@@ -70,6 +70,15 @@ class Gradient;
 #define MTF_MIRROR_HORZ             0x00000001UL
 #define MTF_MIRROR_VERT             0x00000002UL
 
+// -----------------------------
+// - Write flags for streaming -
+// -----------------------------
+
+#define GDIMETAFILE_WRITE_DEFAULT                   0x00000000
+#define GDIMETAFILE_WRITE_REPLACEMENT_RENDERGRAPHIC 0x00000001
+
+typedef sal_uInt32 GDIMetaFileWriteFlags;
+
 // ---------
 // - Enums -
 // ---------
@@ -243,7 +252,7 @@ public:
     // Methoden zum Lesen und Schreiben des neuen Formats;
     // die Read-Methode kann auch das alte Format lesen
     SvStream&       Read( SvStream& rIStm );
-    SvStream&       Write( SvStream& rOStm );
+    SvStream&       Write( SvStream& rOStm, GDIMetaFileWriteFlags = GDIMETAFILE_WRITE_DEFAULT );
 
     // Stream-Operatoren schreiben das alte Format (noch)
     // und lesen sowohl das alte wie auch das neue Format
@@ -282,4 +291,4 @@ MetaCommentAction* makePluggableRendererAction( const rtl::OUString& rRendererSe
 
 #endif // _SV_GDIMTF_HXX
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
diff --git a/vcl/inc/vcl/gfxlink.hxx b/vcl/inc/vcl/gfxlink.hxx
index 1d4362f00dc1..d86973b5686c 100644
--- a/vcl/inc/vcl/gfxlink.hxx
+++ b/vcl/inc/vcl/gfxlink.hxx
@@ -110,11 +110,12 @@ enum GfxLinkType
     GFX_LINK_TYPE_NATIVE_WMF    = 6,    // Don't forget to update the following defines
     GFX_LINK_TYPE_NATIVE_MET    = 7,    // Don't forget to update the following defines
     GFX_LINK_TYPE_NATIVE_PCT    = 8,    // Don't forget to update the following defines
+    GFX_LINK_TYPE_NATIVE_SVG    = 9,    // Don't forget to update the following defines
     GFX_LINK_TYPE_USER          = 0xffff
 };
 
 #define GFX_LINK_FIRST_NATIVE_ID    GFX_LINK_TYPE_NATIVE_GIF
-#define GFX_LINK_LAST_NATIVE_ID     GFX_LINK_TYPE_NATIVE_PCT
+#define GFX_LINK_LAST_NATIVE_ID     GFX_LINK_TYPE_NATIVE_SVG
 
 // -----------
 // - GfxLink -
diff --git a/vcl/inc/vcl/graph.hxx b/vcl/inc/vcl/graph.hxx
index 3dfbb8d261d8..61da922acce6 100644
--- a/vcl/inc/vcl/graph.hxx
+++ b/vcl/inc/vcl/graph.hxx
@@ -36,6 +36,7 @@
 #include <vcl/bitmapex.hxx>
 #include <vcl/animate.hxx>
 #include <vcl/gdimtf.hxx>
+#include <vcl/rendergraphic.hxx>
 #include <vcl/graph.h>
 #include <vcl/gfxlink.hxx>
 #include <com/sun/star/uno/Reference.hxx>
@@ -116,9 +117,12 @@ public:
     void                SetDefaultType();
     sal_Bool                IsSupportedGraphic() const;
 
-    sal_Bool                IsTransparent() const;
-    sal_Bool                IsAlpha() const;
-    sal_Bool                IsAnimated() const;
+    sal_Bool            IsTransparent() const;
+    sal_Bool            IsAlpha() const;
+    sal_Bool            IsAnimated() const;
+    sal_Bool            IsEPS() const;
+    sal_Bool            IsRenderGraphic() const;
+    sal_Bool            HasRenderGraphic() const;
 
     // #i102089# Access of Bitmap potentially will have to rasterconvert the Graphic
     // if it is a MetaFile. To be able to control this conversion it is necessary to
@@ -128,8 +132,9 @@ public:
     Bitmap              GetBitmap(const GraphicConversionParameters& rParameters = GraphicConversionParameters()) const;
     BitmapEx            GetBitmapEx(const GraphicConversionParameters& rParameters = GraphicConversionParameters()) const;
 
-    Animation           GetAnimation() const;
-    const GDIMetaFile&  GetGDIMetaFile() const;
+    Animation               GetAnimation() const;
+    const GDIMetaFile&      GetGDIMetaFile() const;
+    ::vcl::RenderGraphic    GetRenderGraphic() const;
 
     ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > GetXGraphic() const;
 
@@ -217,4 +222,4 @@ public:
 
 #endif  // _SV_GRAPH_HXX
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
diff --git a/vcl/inc/vcl/jobdata.hxx b/vcl/inc/vcl/jobdata.hxx
index 7517b41ef03c..c296abb27e9d 100644
--- a/vcl/inc/vcl/jobdata.hxx
+++ b/vcl/inc/vcl/jobdata.hxx
@@ -40,7 +40,7 @@ enum type {
 };
 }
 
-struct JobData
+struct VCL_DLLPUBLIC JobData
 {
     int                     m_nCopies;
     int                     m_nLeftMarginAdjust;
diff --git a/vcl/inc/vcl/metaact.hxx b/vcl/inc/vcl/metaact.hxx
index fd8f3b8e985b..87bc75fab2a0 100644
--- a/vcl/inc/vcl/metaact.hxx
+++ b/vcl/inc/vcl/metaact.hxx
@@ -43,6 +43,7 @@
 #include <vcl/gdimtf.hxx>
 #include <vcl/gfxlink.hxx>
 #include <vcl/lineinfo.hxx>
+#include <vcl/rendergraphic.hxx>
 
 class SvStream;
 
@@ -103,6 +104,7 @@ class SvStream;
 #define META_LAYOUTMODE_ACTION              (149)
 #define META_TEXTLANGUAGE_ACTION            (150)
 #define META_OVERLINECOLOR_ACTION           (151)
+#define META_RENDERGRAPHIC_ACTION           (152)
 
 #define META_COMMENT_ACTION                 (512)
 
@@ -111,6 +113,11 @@ class SvStream;
 struct ImplMetaReadData
 {
     rtl_TextEncoding        meActualCharSet;
+
+                            ImplMetaReadData() :
+                                meActualCharSet( RTL_TEXTENCODING_ASCII_US )
+                            {
+                            }
 };
 
 // ------------------------------------------------------------------------
@@ -118,6 +125,13 @@ struct ImplMetaReadData
 struct ImplMetaWriteData
 {
     rtl_TextEncoding        meActualCharSet;
+    GDIMetaFileWriteFlags   mnWriteFlags;
+
+                            ImplMetaWriteData() :
+                                meActualCharSet( RTL_TEXTENCODING_ASCII_US ),
+                                mnWriteFlags( GDIMETAFILE_WRITE_DEFAULT )
+                            {
+                            }
 };
 
 // ------------------------------------------------------------------------
@@ -1544,6 +1558,43 @@ public:
     LanguageType        GetTextLanguage() const { return meTextLanguage; }
 };
 
+// ---------------------------
+// - MetaRenderGraphicAction -
+// ---------------------------
+
+class VCL_DLLPUBLIC MetaRenderGraphicAction : public MetaAction
+{
+private:
+
+    ::vcl::RenderGraphic        maRenderGraphic;
+    Point                       maPoint;
+    Size                        maSize;
+    double                      mfRotateAngle;
+    double                      mfShearAngleX;
+    double                      mfShearAngleY;
+
+    virtual sal_Bool            Compare( const MetaAction& ) const;
+
+public:
+                                DECL_META_ACTION( RenderGraphic, META_RENDERGRAPHIC_ACTION )
+
+                                MetaRenderGraphicAction( const Point& rPoint, const Size& rSize,
+                                                         const vcl::RenderGraphic& rRenderData,
+                                                         double fRotateAngle = 0.0,
+                                                         double fShearAngleX = 0.0,
+                                                         double fShearAngleY = 0.0 );
+
+    virtual void                Move( long nHorzMove, long nVertMove );
+    virtual void                Scale( double fScaleX, double fScaleY );
+
+    const ::vcl::RenderGraphic& GetRenderGraphic() const { return maRenderGraphic; }
+    const Point&                GetPoint() const { return maPoint; }
+    const Size&                 GetSize() const { return maSize; }
+    double                      GetRotateAngle() const { return mfRotateAngle; }
+    double                      GetShearAngleX() const { return mfShearAngleX; }
+    double                      GetShearAngleY() const { return mfShearAngleY; }
+};
+
 #endif // _SV_METAACT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/vcl/outdev.hxx b/vcl/inc/vcl/outdev.hxx
index e6aaec2c9971..b0d694c5e75e 100644
--- a/vcl/inc/vcl/outdev.hxx
+++ b/vcl/inc/vcl/outdev.hxx
@@ -110,6 +110,7 @@ namespace vcl
     class ExtOutDevData;
     class ITextLayout;
     struct FontCapabilities;
+    class RenderGraphic;
 }
 
 #define OUTDEV_BUFFER_SIZE  128
@@ -813,7 +814,19 @@ public:
 
     void                DrawTransparent( const PolyPolygon& rPolyPoly, sal_uInt16 nTransparencePercent );
     void                DrawTransparent( const basegfx::B2DPolyPolygon& rB2DPolyPoly, double fTransparency);
-    void                DrawTransparent( const GDIMetaFile& rMtf, const Point& rPos, const Size& rSize, const Gradient& rTransparenceGradient );
+    void                DrawTransparent( const GDIMetaFile& rMtf, const Point& rPos, const Size& rSize,
+                                         const Gradient& rTransparenceGradient );
+
+    /** Added return value to see if EPS could be painted directly.
+        Theoreticaly, handing over a matrix would be needed to handle
+        painting rotated EPS files (e.g. contained in Metafiles). This
+        would then need to be supported for Mac and PS printers, but
+        that's too much for now, wrote #i107046# for this */
+    bool                DrawEPS( const Point& rPt, const Size& rSz,
+                                 const GfxLink& rGfxLink, GDIMetaFile* pSubst = NULL );
+
+    void                DrawRenderGraphic( const Point& rPt, const Size& rSz,
+                                           const ::vcl::RenderGraphic& rRenderGraphic );
 
     Color               GetPixel( const Point& rPt ) const;
     Color*              GetPixel( const Polygon& rPts ) const;
@@ -1123,14 +1136,6 @@ public:
      */
     sal_Bool                HasAlpha();
 
-    /** Added return value to see if EPS could be painted directly.
-        Theoreticaly, handing over a matrix would be needed to handle
-        painting rotated EPS files (e.g. contained in Metafiles). This
-        would then need to be supported for Mac and PS printers, but
-        that's too much for now, wrote #i107046# for this */
-    bool                DrawEPS( const Point& rPt, const Size& rSz,
-                                 const GfxLink& rGfxLink, GDIMetaFile* pSubst = NULL );
-
     /// request XCanvas render interface for this OutputDevice
     ::com::sun::star::uno::Reference<
         ::com::sun::star::rendering::XCanvas > GetCanvas() const;
diff --git a/vcl/inc/vcl/pdfextoutdevdata.hxx b/vcl/inc/vcl/pdfextoutdevdata.hxx
index f4b8039fc9e8..37dadb9a63db 100644
--- a/vcl/inc/vcl/pdfextoutdevdata.hxx
+++ b/vcl/inc/vcl/pdfextoutdevdata.hxx
@@ -53,8 +53,24 @@ namespace vcl
 */
 struct PDFExtOutDevBookmarkEntry
 {
+    /** ID of the link pointing to the bookmark, or -1 if the entry denotes a destination instead of a link.
+    */
     sal_Int32       nLinkId;
+
+    /** ID of the named destination denoted by the bookmark, or -1 if the entry denotes a link instead of a named destination.
+    */
+    sal_Int32       nDestId;
+
+    /** link target name, respectively destination name
+    */
     rtl::OUString   aBookmark;
+
+    PDFExtOutDevBookmarkEntry()
+        :nLinkId( -1 )
+        ,nDestId( -1 )
+        ,aBookmark()
+    {
+    }
 };
 
 /*
@@ -196,6 +212,24 @@ public :
     -1 if page id does not exist
     */
     sal_Int32 CreateNamedDest( const String& sDestName,  const Rectangle& rRect, sal_Int32 nPageNr = -1, PDFWriter::DestAreaType eType = PDFWriter::XYZ );
+
+    /** registers a destination for which a destinatin ID needs to be known immediately, instead of later on setting it via
+        SetLinkDest.
+
+        This is used in contexts where a destination is referenced by means other than a link.
+
+        Later in the export process, a call to DescribeRegisteredDest must be made, providing the information about
+        the destination.
+
+        @return
+            the unique Id of the destination
+    */
+    sal_Int32   RegisterDest();
+
+    /** provides detailed information about a destination range which previously has been registered using RegisterDest.
+    */
+    void        DescribeRegisteredDest( sal_Int32 nDestId, const Rectangle& rRect, sal_Int32 nPageNr = -1, PDFWriter::DestAreaType eType = PDFWriter::XYZ );
+
 //<---i56629
 
     /** Create a new destination to be used in a link
diff --git a/vcl/inc/vcl/pdfwriter.hxx b/vcl/inc/vcl/pdfwriter.hxx
index b1f76046678d..9df687de8b05 100644
--- a/vcl/inc/vcl/pdfwriter.hxx
+++ b/vcl/inc/vcl/pdfwriter.hxx
@@ -940,6 +940,29 @@ The following structure describes the permissions used in PDF security
     -1 if page id does not exist
     */
     sal_Int32           CreateLink( const Rectangle& rRect, sal_Int32 nPageNr = -1 );
+
+    /** creates a destination which is not intended to be referred to by a link, but by a public destination Id.
+
+        Form widgets, for instance, might refer to a destination, without ever actually creating a source link to
+        point to this destination. In such cases, a public destination Id will be assigned to the form widget,
+        and later on, the concrete destination data for this public Id will be registered using RegisterDestReference.
+
+        @param rRect
+            target rectangle on page to be displayed if dest is jumped to
+
+        @param nPageNr
+            number of page the dest is on (as returned by NewPage)
+            or -1 in which case the current page is used
+
+        @param eType
+            what dest type to use
+
+        @returns
+            the internal destination Id.
+    */
+    sal_Int32           RegisterDestReference( sal_Int32 nDestId, const Rectangle& rRect, sal_Int32 nPageNr = -1, DestAreaType eType = XYZ );
+
+
     /** Set the destination for a link
         <p>will change a URL type link to a dest link if necessary</p>
 
diff --git a/vcl/inc/vcl/polyscan.hxx b/vcl/inc/vcl/polyscan.hxx
deleted file mode 100644
index da91477f6a67..000000000000
--- a/vcl/inc/vcl/polyscan.hxx
+++ /dev/null
@@ -1,158 +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_POLYSCAN_HXX
-#define _SV_POLYSCAN_HXX
-
-#include <tools/gen.hxx>
-
-// -----------------
-// - ScanlinePoint -
-// -----------------
-
-struct ScanlinePoint
-{
-    long            mnX;
-    ScanlinePoint*  mpNext;
-
-                    ScanlinePoint() : mnX( 0L ), mpNext( NULL ) {};
-                    ScanlinePoint( long nX, ScanlinePoint* pNext ) : mnX( nX ), mpNext( pNext ) {};
-                    ~ScanlinePoint() {};
-
-    void            Set( long nX, ScanlinePoint* pNext ) { mnX = nX, mpNext = pNext; }
-};
-
-// -------------------
-// - PolyScanSegment -
-// -------------------
-
-struct PolyScanSegment
-{
-    long            mnStart;
-    long            mnEnd;
-
-                    PolyScanSegment() : mnStart( 0L ), mnEnd( 0L ) {};
-                    PolyScanSegment( long nStart, long nEnd ) : mnStart( nStart ), mnEnd( nEnd ) {};
-                    ~PolyScanSegment() {};
-};
-
-// ----------------
-// - PolyScanline -
-// ----------------
-
-struct  ScanlinePoint;
-class   Polygon;
-class   PolyPolygon;
-
-class PolyScanline
-{
-private:
-
-    ScanlinePoint*          mpFirst;
-    ScanlinePoint*          mpLast;
-    ScanlinePoint*          mpAct;
-    long                    mnLeft;
-    long                    mnRight;
-
-    void                    ImplDelete();
-
-public:
-
-                            PolyScanline();
-                            ~PolyScanline();
-
-    void                    Insert( long nX );
-    void                    Set( long nStart, long nEnd );
-    void                    Set( const PolyScanSegment& rSegment ) { Set( rSegment.mnStart, rSegment.mnEnd ); }
-
-    inline sal_Bool             GetFirstX( long& rX );
-    inline sal_Bool             GetNextX( long& rX );
-
-    sal_Bool                    GetFirstSegment( PolyScanSegment& rSegment );
-    sal_Bool                    GetNextSegment( PolyScanSegment& rSegment );
-};
-
-// ------------------------------------------------------------------------
-
-inline sal_Bool PolyScanline::GetFirstX( long& rX )
-{
-    mpAct = mpFirst;
-    return( mpAct ? ( rX = mpAct->mnX, mpAct = mpAct->mpNext, sal_True ) : sal_False );
-}
-
-// ------------------------------------------------------------------------
-
-inline sal_Bool PolyScanline::GetNextX( long& rX )
-{
-    return( mpAct ? ( rX = mpAct->mnX, mpAct = mpAct->mpNext, sal_True ) : sal_False );
-}
-
-// ---------------
-// - PolyScanner -
-// ---------------
-
-class PolyScanner
-{
-private:
-
-    PolyScanline*   mpArray;
-    long            mnLeft;
-    long            mnTop;
-    long            mnRight;
-    long            mnBottom;
-
-                    PolyScanner() {};
-
-protected:
-
-    void            InsertLine( const Point& rStart, const Point& rEnd );
-
-public:
-
-                    PolyScanner( const Rectangle& rRect );
-                    PolyScanner( const Polygon& rPoly );
-                    PolyScanner( const PolyPolygon& rPolyPoly );
-                    ~PolyScanner();
-
-    long            Left() const { return mnLeft; }
-    long            Top() const { return mnTop; }
-    long            Right() const { return mnRight; }
-    long            Bottom() const { return mnBottom; }
-
-    long            Width() const { return( mnRight - mnLeft + 1L ); }
-    long            Height() const { return( mnBottom - mnTop + 1L ); }
-
-    Rectangle       GetBoundRect() const { return Rectangle( mnLeft, mnTop, mnRight, mnBottom ); }
-
-    sal_uLong           Count() const { return Height(); }
-    PolyScanline*   operator[]( sal_uLong nPos ) const;
-};
-
-#endif // _SV_POLYSCAN_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/vcl/ppdparser.hxx b/vcl/inc/vcl/ppdparser.hxx
index 346cb7328352..7082c020c7a2 100644
--- a/vcl/inc/vcl/ppdparser.hxx
+++ b/vcl/inc/vcl/ppdparser.hxx
@@ -35,6 +35,8 @@
 #include "tools/string.hxx"
 #include "tools/stream.hxx"
 
+#include "vcl/dllapi.h"
+
 #include "com/sun/star/lang/Locale.hpp"
 
 #define PRINTER_PPDDIR "driver"
@@ -46,7 +48,7 @@ class PPDTranslator;
 
 enum PPDValueType { eInvocation, eQuoted, eSymbol, eString, eNo };
 
-struct PPDValue
+struct VCL_DLLPUBLIC PPDValue
 {
     PPDValueType    m_eType;
     String          m_aOption;
@@ -59,7 +61,7 @@ struct PPDValue
  * PPDKey - a container for the available options (=values) of a PPD keyword
  */
 
-class PPDKey
+class VCL_DLLPUBLIC PPDKey
 {
     friend class PPDParser;
 
@@ -121,7 +123,7 @@ struct PPDKeyhash
 class PPDContext;
 class CUPSManager;
 
-class PPDParser
+class VCL_DLLPUBLIC PPDParser
 {
     friend class PPDContext;
     friend class CUPSManager;
@@ -293,7 +295,7 @@ public:
  * contents of a PPDParser.
  */
 
-class PPDContext
+class VCL_DLLPUBLIC PPDContext
 {
     typedef ::boost::unordered_map< const PPDKey*, const PPDValue*, PPDKeyhash > hash_type;
     hash_type m_aCurrentValues;
diff --git a/vcl/inc/vcl/rendergraphic.hxx b/vcl/inc/vcl/rendergraphic.hxx
new file mode 100644
index 000000000000..0a0f475decd6
--- /dev/null
+++ b/vcl/inc/vcl/rendergraphic.hxx
@@ -0,0 +1,124 @@
+/*************************************************************************
+ *
+ * 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_RENDERGRAPHIC_HXX
+#define _SV_RENDERGRAPHIC_HXX
+
+#include <vcl/dllapi.h>
+#include <rtl/ustring.hxx>
+#include <boost/shared_array.hpp>
+#include <memory>
+
+class SvStream;
+class MapMode;
+class Size;
+class BitmapEx;
+
+namespace vcl
+{
+    // -----------------
+    // - RenderGraphic -
+    // -----------------
+    class VCL_DLLPUBLIC RenderGraphic
+    {
+    public:
+
+        typedef boost::shared_array< sal_uInt8 > GraphicData;
+
+        friend VCL_DLLPUBLIC ::SvStream& operator>>( ::SvStream& rIStm, RenderGraphic& rRenderGraphic );
+        friend VCL_DLLPUBLIC ::SvStream& operator<<( ::SvStream& rOStm, const RenderGraphic& rRenderGraphic );
+
+    public:
+
+        RenderGraphic( );
+
+        RenderGraphic( const RenderGraphic& rRenderGraphic );
+
+        RenderGraphic( const GraphicData& rGraphicData,
+                       sal_uInt32 nGraphicDataLength,
+                       const rtl::OUString& rGraphicDataMimeType );
+
+        RenderGraphic( const rtl::OUString& rGraphicDataMimeType,
+                       sal_uInt32 nGraphicDataLength,
+                       const sal_uInt8* pGraphicData = NULL );
+
+        virtual ~RenderGraphic();
+
+        RenderGraphic& operator=(const RenderGraphic& rRenderGraphic );
+
+        bool operator==(const RenderGraphic& rRenderGraphic ) const;
+
+        inline bool operator!=(const RenderGraphic& rRenderGraphic ) const
+        {
+            return( !( rRenderGraphic == *this ) );
+        }
+
+        bool IsEqual( const RenderGraphic& rRenderGraphic ) const;
+
+        bool operator!() const;
+
+        inline bool IsEmpty( ) const
+        {
+            return( !( *this ) );
+        }
+
+        inline const GraphicData& GetGraphicData( ) const
+        {
+            return( maGraphicData );
+        }
+
+        inline sal_uInt32 GetGraphicDataLength( ) const
+        {
+            return( mnGraphicDataLength );
+        }
+
+        inline const rtl::OUString& GetGraphicDataMimeType( ) const
+        {
+            return( maGraphicDataMimeType );
+        }
+
+        const MapMode& GetPrefMapMode() const;
+        const Size& GetPrefSize() const;
+
+        BitmapEx GetReplacement() const;
+
+    private:
+
+        void ImplCheckData();
+        void ImplGetDefaults() const;
+
+    private:
+
+        GraphicData maGraphicData;
+        sal_uInt32 mnGraphicDataLength;
+        rtl::OUString maGraphicDataMimeType;
+        mutable ::std::auto_ptr< MapMode > mapPrefMapMode;
+        mutable ::std::auto_ptr< Size > mapPrefSize;
+    };
+}
+
+#endif // _SV_RENDERHRAPHIC_HXX
diff --git a/vcl/inc/vcl/rendergraphicrasterizer.hxx b/vcl/inc/vcl/rendergraphicrasterizer.hxx
new file mode 100644
index 000000000000..f2166b03ffb3
--- /dev/null
+++ b/vcl/inc/vcl/rendergraphicrasterizer.hxx
@@ -0,0 +1,111 @@
+/*************************************************************************
+ *
+ * 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_RENDERGRAPHICRASTERIZER_HXX
+#define _SV_RENDERGRAPHICRASTERIZER_HXX
+
+#include <vcl/rendergraphic.hxx>
+#include <vcl/bitmapex.hxx>
+
+#include <com/sun/star/graphic/XGraphicRasterizer.hpp>
+
+#include <memory>
+#include <deque>
+
+#define VCL_RASTERIZER_UNLIMITED_EXTENT 0x00000000
+#define VCL_RASTERIZER_DEFAULT_EXTENT   0xffffffff
+
+namespace vcl
+{
+    // ---------------------------
+    // - RenderGraphicRasterizer -
+    // ---------------------------
+
+    class VCL_DLLPUBLIC RenderGraphicRasterizer
+    {
+    public:
+
+        RenderGraphicRasterizer( const RenderGraphic& rData );
+
+
+        RenderGraphicRasterizer( const RenderGraphicRasterizer& rRenderGraphicRasterizer );
+
+        virtual ~RenderGraphicRasterizer();
+
+        RenderGraphicRasterizer& operator=( const RenderGraphicRasterizer& rRenderGraphicRasterizer );
+
+        inline const RenderGraphic& GetRenderGraphic() const
+        {
+            return( maRenderGraphic );
+        }
+
+        const Size& GetDefaultSizePixel() const;
+
+        BitmapEx GetReplacement() const;
+
+        virtual Size GetPrefSize() const;
+
+        virtual MapMode GetPrefMapMode() const;
+
+        virtual const BitmapEx& Rasterize( const Size& rSizePixel_UnrotatedUnsheared,
+                                           double fRotateAngle = 0.0,
+                                           double fShearAngleX = 0.0,
+                                           double fShearAngleY = 0.0,
+                                           sal_uInt32 nMaxExtent = VCL_RASTERIZER_DEFAULT_EXTENT ) const;
+
+    protected:
+
+        RenderGraphic                                                                           maRenderGraphic;
+        mutable com::sun::star::uno::Reference< com::sun::star::graphic::XGraphicRasterizer >   mxRasterizer;
+
+        virtual void InitializeRasterizer();
+
+    private:
+
+        RenderGraphicRasterizer();
+
+        mutable BitmapEx    maBitmapEx;
+        mutable Size        maDefaultSizePixel;
+        mutable double      mfRotateAngle;
+        mutable double      mfShearAngleX;
+        mutable double      mfShearAngleY;
+
+    private:
+
+        typedef ::std::deque< RenderGraphicRasterizer > RenderGraphicRasterizerCache;
+
+        static RenderGraphicRasterizerCache& ImplGetCache();
+
+        static bool ImplInitializeFromCache( RenderGraphicRasterizer& rRasterizer );
+        static bool ImplRasterizeFromCache( RenderGraphicRasterizer& rRasterizer,
+                                            const Size& rSizePixel, double fRotateAngle,
+                                            double fShearAngleX, double fShearAngleY );
+        static void ImplUpdateCache( const RenderGraphicRasterizer& rRasterizer );
+};
+}
+
+#endif // _SV_RENDERGRAPHICRASTERIZER_HXX
diff --git a/vcl/inc/vcl/salctype.hxx b/vcl/inc/vcl/salctype.hxx
index 93eb69bd439d..4b3e1e3ad772 100644
--- a/vcl/inc/vcl/salctype.hxx
+++ b/vcl/inc/vcl/salctype.hxx
@@ -49,6 +49,7 @@
 #define CVT_TIF     (0x00000008UL)
 #define CVT_WMF     (0x00000009UL)
 #define CVT_EMF     (0x0000000aUL)
+#define CVT_SVG     (0x0000000bUL)
 
 // ---------------
 // - ConvertData -
diff --git a/vcl/inc/vcl/svcompat.hxx b/vcl/inc/vcl/svgread.hxx
index 70d31381287f..4427198eeb5a 100644
--- a/vcl/inc/vcl/svcompat.hxx
+++ b/vcl/inc/vcl/svgread.hxx
@@ -26,48 +26,58 @@
  *
  ************************************************************************/
 
-#ifndef _SV_SVCOMPAT_HXX
-#define _SV_SVCOMPAT_HXX
+#ifndef _SV_SVGREAD_HXX
+#define _SV_SVGREAD_HXX
 
-#include <sv.h>
+#include <vcl/dllapi.h>
+#include <memory>
 
-// -----------
-// - Defines -
-// -----------
+// -------------
+// - SVGReader -
+// -------------
 
-#define COMPAT_FORMAT( char1, char2, char3, char4 ) \
-    ((sal_uLong)((((sal_uLong)(char)(char1)))|              \
-    (((sal_uLong)(char)(char2))<<8UL)|                  \
-    (((sal_uLong)(char)(char3))<<16UL)|                 \
-    ((sal_uLong)(char)(char4))<<24UL))
+class SvStream;
+class GDIMetaFile;
 
+namespace vcl
+{
+    class SVGReaderImpl;
 
-class SvStream;
+    class VCL_DLLPUBLIC SVGReader
+    {
+    public:
 
-// --------------
-// - ImplCompat -
-// --------------
+        SVGReader( SvStream& rStm );
+        ~SVGReader();
 
-class ImplCompat
-{
-    SvStream*   mpRWStm;
-    sal_uInt32      mnCompatPos;
-    sal_uInt32      mnTotalSize;
-    sal_uInt16      mnStmMode;
-    sal_uInt16      mnVersion;
+        /* rSVGMtf is an output parameter, that is also returned
+          by the method as well.
+
+          In case of a failure, the GDIMetaFile will not contain
+          any actions at all and thus GDIMetaFile::GetActionCount
+          will return 0.
+
+         In case of success, the GDIMetaFile will contain a
+         META_RENDERGRAPHIC_ACTION, containing the SVG raw data. The
+         data can be rendered by using the standard ways to output a
+         GDIMetaFile, e.g. calling GDIMetaFile::Play
+
+        */
+        GDIMetaFile& Read( GDIMetaFile& rSVGMtf );
+
+    private:
+
+        SVGReader();
+        SVGReader( const SVGReader& rReader );
 
-                ImplCompat() {}
-                ImplCompat( const ImplCompat& rCompat ) {}
-    ImplCompat& operator=( const ImplCompat& rCompat ) { return *this; }
-    sal_Bool        operator==( const ImplCompat& rCompat ) { return sal_False; }
+        inline SVGReader& operator=( const SVGReader& /* rReader */ ) { return( *this ); }
 
-public:
-                ImplCompat( SvStream& rStm, sal_uInt16 nStreamMode, sal_uInt16 nVersion = 1 );
-                ~ImplCompat();
+    private:
 
-    sal_uInt16      GetVersion() const { return mnVersion; }
-};
+        std::auto_ptr< SVGReaderImpl > mapImpl;
+    };
+}
 
-#endif // _SV_SVCOMPAT_HXX
+#endif
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
diff --git a/vcl/inc/vcl/unobrok.hxx b/vcl/inc/vclpluginapi.h
index 67c83ea83952..462943b95401 100644
--- a/vcl/inc/vcl/unobrok.hxx
+++ b/vcl/inc/vclpluginapi.h
@@ -26,17 +26,48 @@
  *
  ************************************************************************/
 
-#ifndef _UNOBROK_HXX
-#define _UNOBROK_HXX
+#ifndef _VCLPLUGINAPI_H
+#define _VCLPLUGINAPI_H
 
-#include <vcl/svdata.hxx>
-#include <osl/thread.hxx>
+#include "sal/config.h"
+#include "sal/types.h"
 
-namespace vcl_accept
-{
-    sal_Bool accept(const ::rtl::OUString & accDcp, const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory> & rSMgr);
-}
+#if defined VCLPLUG_GEN_IMPLEMENTATION
+#define VCLPLUG_GEN_PUBLIC SAL_DLLPUBLIC_EXPORT
+#else
+#define VCLPLUG_GEN_PUBLIC SAL_DLLPUBLIC_IMPORT
+#endif
 
-#endif  // _UNOBROK_HXX
+#if defined VCLPLUG_GTK_IMPLEMENTATION
+#define VCLPLUG_GTK_PUBLIC SAL_DLLPUBLIC_EXPORT
+#else
+#define VCLPLUG_GTK_PUBLIC SAL_DLLPUBLIC_IMPORT
+#endif
+
+#if defined VCLPLUG_KDE_IMPLEMENTATION
+#define VCLPLUG_KDE_PUBLIC SAL_DLLPUBLIC_EXPORT
+#else
+#define VCLPLUG_KDE_PUBLIC SAL_DLLPUBLIC_IMPORT
+#endif
+
+#if defined VCLPLUG_KDE4_IMPLEMENTATION
+#define VCLPLUG_KDE4_PUBLIC SAL_DLLPUBLIC_EXPORT
+#else
+#define VCLPLUG_KDE4_PUBLIC SAL_DLLPUBLIC_IMPORT
+#endif
+
+#if defined VCLPLUG_SVP_IMPLEMENTATION
+#define VCLPLUG_SVP_PUBLIC SAL_DLLPUBLIC_EXPORT
+#else
+#define VCLPLUG_SVP_PUBLIC SAL_DLLPUBLIC_IMPORT
+#endif
+
+#if defined DESKTOP_DETECTOR_IMPLEMENTATION
+#define DESKTOP_DETECTOR_PUBLIC SAL_DLLPUBLIC_EXPORT
+#else
+#define DESKTOP_DETECTOR_PUBLIC SAL_DLLPUBLIC_IMPORT
+#endif
+
+#endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/vcl/wall2.hxx b/vcl/inc/wall2.hxx
index 162614262095..162614262095 100644
--- a/vcl/inc/vcl/wall2.hxx
+++ b/vcl/inc/wall2.hxx
diff --git a/vcl/win/inc/salbmp.h b/vcl/inc/win/salbmp.h
index 9ae4b4bef2ca..5cf92bcf3591 100644..100755
--- a/vcl/win/inc/salbmp.h
+++ b/vcl/inc/win/salbmp.h
@@ -29,10 +29,9 @@
 #ifndef _SV_SALBMP_H
 #define _SV_SALBMP_H
 
-#include <wincomp.hxx>
 #include <tools/gen.hxx>
-#include <vcl/sv.h>
-#include <vcl/salbmp.hxx>
+#include <win/wincomp.hxx>
+#include <salbmp.hxx>
 
 // --------------
 // - SalBitmap  -
diff --git a/vcl/win/inc/saldata.hxx b/vcl/inc/win/saldata.hxx
index 95aa8f5434f2..ca0a19f4361a 100644
--- a/vcl/win/inc/saldata.hxx
+++ b/vcl/inc/win/saldata.hxx
@@ -29,13 +29,13 @@
 #ifndef _SV_SALDATA_HXX
 #define _SV_SALDATA_HXX
 
-#include <vcl/sv.h>
-#include <vcl/svdata.hxx>
-#include <vcl/salwtype.hxx>
-#include <wincomp.hxx>
-
 #include "osl/module.h"
 
+#include <svdata.hxx>
+#include <salwtype.hxx>
+
+#include <win/wincomp.hxx>
+
 #include <set>  // for hMenu validation
 #include <map>
 
diff --git a/vcl/win/inc/salframe.h b/vcl/inc/win/salframe.h
index d3e7516f17f3..e62d60196a1e 100644..100755
--- a/vcl/win/inc/salframe.h
+++ b/vcl/inc/win/salframe.h
@@ -29,9 +29,8 @@
 #ifndef _SV_SALFRAME_H
 #define _SV_SALFRAME_H
 
-#include <vcl/sv.h>
 #include <vcl/sysdata.hxx>
-#include <vcl/salframe.hxx>
+#include <salframe.hxx>
 
 class WinSalGraphics;
 
diff --git a/vcl/win/inc/salgdi.h b/vcl/inc/win/salgdi.h
index a23963f81e7b..b7082baecad7 100644
--- a/vcl/win/inc/salgdi.h
+++ b/vcl/inc/win/salgdi.h
@@ -29,11 +29,10 @@
 #ifndef _SV_SALGDI_H
 #define _SV_SALGDI_H
 
-#include <vcl/sv.h>
-#include <vcl/sallayout.hxx>
-#include <vcl/salgdi.hxx>
-#include <vcl/outfont.hxx>
-#include <vcl/impfont.hxx>
+#include <sallayout.hxx>
+#include <salgdi.hxx>
+#include <outfont.hxx>
+#include <impfont.hxx>
 #include <vcl/fontcapabilities.hxx>
 
 #include "boost/scoped_ptr.hpp"
diff --git a/vcl/win/inc/salids.hrc b/vcl/inc/win/salids.hrc
index 3049f11b551b..3049f11b551b 100644
--- a/vcl/win/inc/salids.hrc
+++ b/vcl/inc/win/salids.hrc
diff --git a/vcl/win/inc/salinst.h b/vcl/inc/win/salinst.h
index 524cf3aca141..04ea296e13d4 100644
--- a/vcl/win/inc/salinst.h
+++ b/vcl/inc/win/salinst.h
@@ -29,8 +29,7 @@
 #ifndef _SV_SALINST_H
 #define _SV_SALINST_H
 
-#include <vcl/sv.h>
-#include <vcl/salinst.hxx>
+#include <salinst.hxx>
 
 // -------------------
 // - SalInstanceData -
diff --git a/vcl/win/inc/salmenu.h b/vcl/inc/win/salmenu.h
index 59160dc8a8bc..99239d7b8191 100644..100755
--- a/vcl/win/inc/salmenu.h
+++ b/vcl/inc/win/salmenu.h
@@ -29,10 +29,8 @@
 #ifndef _SV_SALMENU_H
 #define _SV_SALMENU_H
 
-#include <vcl/sv.h>
 #include <vcl/bitmap.hxx>
-#include <vcl/salmenu.hxx>
-
+#include <salmenu.hxx>
 
 class WinSalMenu : public SalMenu
 {
diff --git a/vcl/win/inc/salnativewidgets.h b/vcl/inc/win/salnativewidgets.h
index 515a4b44d02c..33ba8de4ba87 100644..100755
--- a/vcl/win/inc/salnativewidgets.h
+++ b/vcl/inc/win/salnativewidgets.h
@@ -32,8 +32,6 @@
 
 #ifdef __cplusplus
 
-#include <vcl/sv.h>
-
 /* SalControlHandleData:
  *
  *   Holds platform specific theming data.
diff --git a/vcl/win/inc/salobj.h b/vcl/inc/win/salobj.h
index d96b5f4a93df..068d65a611f2 100644..100755
--- a/vcl/win/inc/salobj.h
+++ b/vcl/inc/win/salobj.h
@@ -29,8 +29,7 @@
 #ifndef _SV_SALOBJ_H
 #define _SV_SALOBJ_H
 
-#include <vcl/sv.h>
-#include <vcl/salobj.hxx>
+#include <salobj.hxx>
 
 // -----------------
 // - SalObjectData -
diff --git a/vcl/win/inc/salprn.h b/vcl/inc/win/salprn.h
index 123af2f79a90..6b399f99f971 100644..100755
--- a/vcl/win/inc/salprn.h
+++ b/vcl/inc/win/salprn.h
@@ -29,8 +29,7 @@
 #ifndef _SV_SALPRN_H
 #define _SV_SALPRN_H
 
-#include <vcl/sv.h>
-#include <vcl/salprn.hxx>
+#include <salprn.hxx>
 
 // -----------------
 // - SalDriverData -
diff --git a/vcl/win/inc/salsys.h b/vcl/inc/win/salsys.h
index 806c6b9df812..6f133b57d15f 100644..100755
--- a/vcl/win/inc/salsys.h
+++ b/vcl/inc/win/salsys.h
@@ -29,7 +29,7 @@
 #ifndef _SV_SALSYS_H
 #define _SV_SALSYS_H
 
-#include <vcl/salsys.hxx>
+#include <salsys.hxx>
 
 #include <vector>
 #include <map>
diff --git a/vcl/win/inc/saltimer.h b/vcl/inc/win/saltimer.h
index 41839ad2f0c2..d408e099eaaf 100644..100755
--- a/vcl/win/inc/saltimer.h
+++ b/vcl/inc/win/saltimer.h
@@ -29,7 +29,7 @@
 #ifndef _SV_SALTIMER_H
 #define _SV_SALTIMER_H
 
-#include <vcl/saltimer.hxx>
+#include <saltimer.hxx>
 
 class WinSalTimer : public SalTimer
 {
diff --git a/vcl/win/inc/salvd.h b/vcl/inc/win/salvd.h
index 4e7416cf2b97..0f213ed5a6f3 100644..100755
--- a/vcl/win/inc/salvd.h
+++ b/vcl/inc/win/salvd.h
@@ -29,8 +29,7 @@
 #ifndef _SV_SALVD_H
 #define _SV_SALVD_H
 
-#include <vcl/sv.h>
-#include <vcl/salvd.hxx>
+#include <salvd.hxx>
 
 class WinSalGraphics;
 
diff --git a/vcl/win/inc/svsys.h b/vcl/inc/win/svsys.h
index f7bc87b0c514..f7bc87b0c514 100644
--- a/vcl/win/inc/svsys.h
+++ b/vcl/inc/win/svsys.h
diff --git a/vcl/win/inc/wincomp.hxx b/vcl/inc/win/wincomp.hxx
index ab399453884c..6e20eb8e16e5 100644..100755
--- a/vcl/win/inc/wincomp.hxx
+++ b/vcl/inc/win/wincomp.hxx
@@ -30,7 +30,6 @@
 #define _SV_WINCOMP_HXX
 
 #include <string.h>
-#include <vcl/sv.h>
 
 // ----------
 // - Strict -
diff --git a/vcl/inc/vcl/window.h b/vcl/inc/window.h
index 12f6eedc2906..12f6eedc2906 100644
--- a/vcl/inc/vcl/window.h
+++ b/vcl/inc/window.h
diff --git a/vcl/inc/vcl/xconnection.hxx b/vcl/inc/xconnection.hxx
index bd3270fa24c7..bd3270fa24c7 100644
--- a/vcl/inc/vcl/xconnection.hxx
+++ b/vcl/inc/xconnection.hxx
diff --git a/vcl/prj/build.lst b/vcl/prj/build.lst
index ea3c074103ab..9e0ccdba440b 100644
--- a/vcl/prj/build.lst
+++ b/vcl/prj/build.lst
@@ -1,57 +1,4 @@
 vc	vcl	:	TRANSLATIONS:translations apple_remote BOOST:boost rsc sot ucbhelper unotools ICU:icu GRAPHITE:graphite i18npool i18nutil unoil ridljar X11_EXTENSIONS:x11_extensions offuh basegfx basebmp tools l10ntools icc cpputools svl LIBXSLT:libxslt NULL
 vc	vcl										usr1	-	all	vc_mkout NULL
-vc	vcl\inc									nmake	-	all	vc_inc NULL
-vc	vcl\source\glyphs						nmake	-	all	vc_glyphs vc_inc NULL
-vc	vcl\source\app							nmake	-	all	vc_app vc_inc NULL
-vc	vcl\source\gdi							nmake	-	all	vc_gdi vc_inc NULL
-vc	vcl\source\window						nmake	-	all	vc_win vc_inc NULL
-vc	vcl\source\control						nmake	-	all	vc_ctrl vc_inc NULL
-vc	vcl\source\src							nmake	-	all	vc_src vc_inc NULL
-vc	vcl\source\helper						nmake	-	all	vc_hlp vc_inc NULL
-vc	vcl\source\fontsubset					nmake	-	all	vc_fts vc_inc NULL
-vc  vcl\source\salmain                      nmake   -   all vc_salmain vc_inc NULL
-vc	vcl\os2\source\app						nmake	-	p	vc__appp vc_inc NULL
-vc	vcl\os2\source\gdi						nmake	-	p	vc__gdip vc_inc NULL
-vc	vcl\os2\source\window					nmake	-	p	vc__winp vc_inc NULL
-vc	vcl\os2\source\src						nmake	-	p	vc__srcp vc_inc NULL
-vc  vcl\source\components					nmake	-	all	vc_components vc_inc NULL
-vc	vcl\win\source\app						nmake	-	w	vc__appw vc_inc NULL
-vc	vcl\win\source\gdi						nmake	-	w	vc__gdiw vc_inc NULL
-vc	vcl\win\source\window					nmake	-	w	vc__winw vc_inc NULL
-vc	vcl\win\source\src						nmake	-	w	vc__srcw vc_inc NULL
-vc  vcl\unx\source\plugadapt				nmake	-	u	vc__plug vc_inc NULL
-vc  vcl\unx\source\desktopdetect			nmake	-	u	vc__desk vc_inc NULL
-vc	vcl\unx\source\app						nmake	-	u	vc__appu vc_inc NULL
-vc	vcl\unx\source\dtrans					nmake	-	u	vc__dtru vc_inc NULL
-vc	vcl\unx\source\fontmanager				nmake	-	u	vc__ftmu vc_inc NULL
-vc	vcl\unx\source\gdi						nmake	-	u	vc__gdiu vc_inc NULL
-vc	vcl\unx\source\printer   				nmake	-	u	vc__prnu vc_inc NULL
-vc	vcl\unx\source\printergfx  				nmake	-	u	vc__prgu vc_inc NULL
-vc	vcl\unx\source\window					nmake	-	u	vc__winu vc_inc NULL
-vc  vcl\unx\gtk\a11y						nmake   -   u   vc__gtky vc_inc NULL
-vc  vcl\unx\gtk\app							nmake   -   u   vc__gtka vc_inc NULL
-vc  vcl\unx\gtk\window						nmake   -   u   vc__gtkw vc_inc NULL
-vc  vcl\unx\gtk\gdi 						nmake   -   u   vc__gtkg vc_inc NULL
-vc  vcl\unx\headless						nmake   -   u   vc__hl   vc_inc NULL
-vc  vcl\unx\kde							nmake   -   u   vc__kde  vc_inc NULL
-vc  vcl\unx\kde4							nmake   -   u   vc__kde4  vc_inc NULL
-vc	vcl\aqua\source\a11y					nmake	-	u	vc__aquy vc_inc NULL
-vc	vcl\aqua\source\app						nmake	-	u	vc__appa vc_inc NULL
-vc	vcl\aqua\source\dtrans					nmake	-	u	vc__dtra vc_inc NULL
-vc	vcl\aqua\source\gdi						nmake	-	u	vc__gdia vc_inc NULL
-vc	vcl\aqua\source\res                 nmake   -   u   vc__resa NULL
-vc	vcl\aqua\source\window					nmake	-	u	vc__wina vc_inc NULL
-vc	vcl\mac\source\app						nmake	-	m	vc__appm vc_inc NULL
-vc	vcl\mac\source\gdi						nmake	-	m	vc__gdim vc_inc NULL
-vc	vcl\mac\source\window					nmake	-	m	vc__winm vc_inc NULL
-vc	vcl\mac\source\src						nmake	-	m	vc__srcm vc_inc NULL
-vc	vcl\util								nmake	-	all	vc_util vc__plug.u vc__desk.u vc__aquy.u vc__appa.u vc__dtra.u vc__appm.m vc__appu.u vc__dtru.u vc__appw.w vc__appp.p vc__gdia.u vc__gdim.m vc__gdiu.u vc__gdiw.w vc__gdip.p vc__srcm.m vc__srcw.w vc__srcp.p vc__wina.u vc__winm.m vc__winu.u vc__winw.w vc__winp.p vc__gtka.u vc__gtky.u vc__gtkw.u vc__gtkg.u vc__kde.u vc__kde4.u vc__hl.u vc__ftmu.u vc__prgu.u vc__prnu.u vc_app vc_ctrl vc_gdi vc_hlp vc_src vc_win vc_glyphs vc_fts vc_components NULL
-vc  vcl\util\linksvp                        nmake   -   u   vc_lsvp vc_util NULL
-vc	vcl\workben								nmake	-	all	vc_wrkb vc_util vc_salmain NULL
-
-# memCheck works only within unix
-# memCheck is not right yet
-# vc      vcl\qa\complex\memCheck                  nmake - u   vc_qa_complex vc_util NULL
-# GPF
-# vc      vcl\qa\complex\persistent_window_states  nmake - all vc_qa_complex vc_util NULL
+vc	vcl\prj									nmake	-	all	vc_prj NULL
 
diff --git a/vcl/prj/d.lst b/vcl/prj/d.lst
index 3626a3ee36bd..0d5befed1e78 100644
--- a/vcl/prj/d.lst
+++ b/vcl/prj/d.lst
@@ -1,162 +1,4 @@
-mkdir: %COMMON_DEST%\bin%_EXT%\hid
-mkdir: %_DEST%\inc%_EXT%\vcl
-
-..\%COMMON_OUTDIR%\bin\*.zip %COMMON_DEST%\bin%_EXT%\*.zip
-..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid
-..\%__SRC%\bin\vcl*.res %_DEST%\bin%_EXT%\vcl*.res
-..\%__SRC%\bin\vcl?????.dll %_DEST%\bin%_EXT%\vcl?????.dll
-..\%__SRC%\bin\vcl?????.sym %_DEST%\bin%_EXT%\vcl?????.sym
-..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%\lib*.so
-..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib
-..\%__SRC%\lib\ivcl.lib %_DEST%\lib%_EXT%\ivcl.lib
-..\%__SRC%\misc\vcl?????.map %_DEST%\bin%_EXT%\vcl?????.map
-..\%__SRC%\obj\salmain.obj %_DEST%\lib%_EXT%\salmain.obj
-..\%__SRC%\obj\salmain.o %_DEST%\lib%_EXT%\salmain.o
-..\%__SRC%\lib\libvclmain.a %_DEST%\lib%_EXT%\libvclmain.a
-..\%__SRC%\lib\vclmain.lib %_DEST%\lib%_EXT%\vclmain.lib
-
-..\inc\vcl\accel.hxx %_DEST%\inc%_EXT%\vcl\accel.hxx
-..\inc\vcl\alpha.hxx %_DEST%\inc%_EXT%\vcl\alpha.hxx
-..\inc\vcl\animate.hxx %_DEST%\inc%_EXT%\vcl\animate.hxx
-..\inc\vcl\apptypes.hxx %_DEST%\inc%_EXT%\vcl\apptypes.hxx
-..\inc\vcl\arrange.hxx %_DEST%\inc%_EXT%\vcl\arrange.hxx
-..\inc\vcl\bitmap.hxx %_DEST%\inc%_EXT%\vcl\bitmap.hxx
-..\inc\vcl\bitmapex.hxx %_DEST%\inc%_EXT%\vcl\bitmapex.hxx
-..\inc\vcl\bmpacc.hxx %_DEST%\inc%_EXT%\vcl\bmpacc.hxx
-..\inc\vcl\btndlg.hxx %_DEST%\inc%_EXT%\vcl\btndlg.hxx
-..\inc\vcl\button.hxx %_DEST%\inc%_EXT%\vcl\button.hxx
-..\inc\vcl\cmdevt.h %_DEST%\inc%_EXT%\vcl\cmdevt.h
-..\inc\vcl\cmdevt.hxx %_DEST%\inc%_EXT%\vcl\cmdevt.hxx
-..\inc\vcl\combobox.h %_DEST%\inc%_EXT%\vcl\combobox.h
-..\inc\vcl\combobox.hxx %_DEST%\inc%_EXT%\vcl\combobox.hxx
-..\inc\vcl\ctrl.hxx %_DEST%\inc%_EXT%\vcl\ctrl.hxx
-..\inc\vcl\cursor.hxx %_DEST%\inc%_EXT%\vcl\cursor.hxx
-..\inc\vcl\cvtgrf.hxx %_DEST%\inc%_EXT%\vcl\cvtgrf.hxx
-..\inc\vcl\cvtsvm.hxx %_DEST%\inc%_EXT%\vcl\cvtsvm.hxx
-..\inc\vcl\decoview.hxx %_DEST%\inc%_EXT%\vcl\decoview.hxx
-..\inc\vcl\dialog.hxx %_DEST%\inc%_EXT%\vcl\dialog.hxx
-..\inc\vcl\dockingarea.hxx %_DEST%\inc%_EXT%\vcl\dockingarea.hxx
-..\inc\vcl\dockwin.hxx %_DEST%\inc%_EXT%\vcl\dockwin.hxx
-..\inc\vcl\dllapi.h %_DEST%\inc%_EXT%\vcl\dllapi.h
-..\inc\vcl\edit.hxx %_DEST%\inc%_EXT%\vcl\edit.hxx
-..\inc\vcl\event.hxx %_DEST%\inc%_EXT%\vcl\event.hxx
-..\inc\vcl\field.hxx %_DEST%\inc%_EXT%\vcl\field.hxx
-..\inc\vcl\fixbrd.hxx %_DEST%\inc%_EXT%\vcl\fixbrd.hxx
-..\inc\vcl\fixed.hxx %_DEST%\inc%_EXT%\vcl\fixed.hxx
-..\inc\vcl\floatwin.hxx %_DEST%\inc%_EXT%\vcl\floatwin.hxx
-..\inc\vcl\fntstyle.hxx %_DEST%\inc%_EXT%\vcl\fntstyle.hxx
-..\inc\vcl\font.hxx %_DEST%\inc%_EXT%\vcl\font.hxx
 ..\inc\vcl\fontcapabilities.hxx %_DEST%\inc%_EXT%\vcl\fontcapabilities.hxx
-..\inc\vcl\fontcvt.hxx %_DEST%\inc%_EXT%\vcl\fontcvt.hxx
-..\inc\vcl\gdimtf.hxx %_DEST%\inc%_EXT%\vcl\gdimtf.hxx
-..\inc\vcl\gfxlink.hxx %_DEST%\inc%_EXT%\vcl\gfxlink.hxx
-..\inc\vcl\gradient.hxx %_DEST%\inc%_EXT%\vcl\gradient.hxx
-..\inc\vcl\graph.h %_DEST%\inc%_EXT%\vcl\graph.h
-..\inc\vcl\graph.hxx %_DEST%\inc%_EXT%\vcl\graph.hxx
-..\inc\vcl\group.hxx %_DEST%\inc%_EXT%\vcl\group.hxx
-..\inc\vcl\hatch.hxx %_DEST%\inc%_EXT%\vcl\hatch.hxx
-..\inc\vcl\help.hxx %_DEST%\inc%_EXT%\vcl\help.hxx
-..\inc\vcl\image.hxx %_DEST%\inc%_EXT%\vcl\image.hxx
-..\inc\vcl\imagerepository.hxx %_DEST%\inc%_EXT%\vcl\imagerepository.hxx
-..\inc\vcl\imgctrl.hxx %_DEST%\inc%_EXT%\vcl\imgctrl.hxx
-..\inc\vcl\throbber.hxx %_DEST%\inc%_EXT%\vcl\throbber.hxx
-..\inc\vcl\impdel.hxx %_DEST%\inc%_EXT%\vcl\impdel.hxx
-..\inc\vcl\inputctx.hxx %_DEST%\inc%_EXT%\vcl\inputctx.hxx
-..\inc\vcl\javachild.hxx %_DEST%\inc%_EXT%\vcl\javachild.hxx
-..\inc\vcl\jobset.hxx %_DEST%\inc%_EXT%\vcl\jobset.hxx
-..\unx\inc\kde_headers.h %_DEST%\inc%_EXT%\vcl\kde_headers.h
-..\inc\vcl\keycod.hxx %_DEST%\inc%_EXT%\vcl\keycod.hxx
-..\inc\vcl\keycodes.hxx %_DEST%\inc%_EXT%\vcl\keycodes.hxx
-..\inc\vcl\lineinfo.hxx %_DEST%\inc%_EXT%\vcl\lineinfo.hxx
-..\inc\vcl\longcurr.hxx %_DEST%\inc%_EXT%\vcl\longcurr.hxx
-..\inc\vcl\lstbox.h %_DEST%\inc%_EXT%\vcl\lstbox.h
-..\inc\vcl\lstbox.hxx %_DEST%\inc%_EXT%\vcl\lstbox.hxx
-..\inc\vcl\mapmod.hxx %_DEST%\inc%_EXT%\vcl\mapmod.hxx
-..\inc\vcl\menu.hxx %_DEST%\inc%_EXT%\vcl\menu.hxx
-..\inc\vcl\menubtn.hxx %_DEST%\inc%_EXT%\vcl\menubtn.hxx
-..\inc\vcl\metaact.hxx %_DEST%\inc%_EXT%\vcl\metaact.hxx
-..\inc\vcl\graphictools.hxx %_DEST%\inc%_EXT%\vcl\graphictools.hxx
-..\inc\vcl\metric.hxx %_DEST%\inc%_EXT%\vcl\metric.hxx
-..\inc\vcl\mnemonic.hxx %_DEST%\inc%_EXT%\vcl\mnemonic.hxx
-..\inc\vcl\mnemonicengine.hxx %_DEST%\inc%_EXT%\vcl\mnemonicengine.hxx
-..\inc\vcl\quickselectionengine.hxx %_DEST%\inc%_EXT%\vcl\quickselectionengine.hxx
-..\inc\vcl\morebtn.hxx %_DEST%\inc%_EXT%\vcl\morebtn.hxx
-..\inc\vcl\msgbox.hxx %_DEST%\inc%_EXT%\vcl\msgbox.hxx
-..\inc\vcl\octree.hxx %_DEST%\inc%_EXT%\vcl\octree.hxx
-..\inc\vcl\oldprintadaptor.hxx %_DEST%\inc%_EXT%\vcl\oldprintadaptor.hxx
-..\inc\vcl\outdev.hxx %_DEST%\inc%_EXT%\vcl\outdev.hxx
-..\inc\vcl\pointr.hxx %_DEST%\inc%_EXT%\vcl\pointr.hxx
-..\inc\vcl\popupmenuwindow.hxx %_DEST%\inc%_EXT%\vcl\popupmenuwindow.hxx
-..\inc\vcl\print.hxx %_DEST%\inc%_EXT%\vcl\print.hxx
-..\inc\vcl\prntypes.hxx %_DEST%\inc%_EXT%\vcl\prntypes.hxx
-..\inc\vcl\ptrstyle.hxx %_DEST%\inc%_EXT%\vcl\ptrstyle.hxx
-..\inc\vcl\regband.hxx %_DEST%\inc%_EXT%\vcl\regband.hxx
-..\inc\vcl\region.hxx %_DEST%\inc%_EXT%\vcl\region.hxx
-..\inc\vcl\salbtype.hxx %_DEST%\inc%_EXT%\vcl\salbtype.hxx
-..\inc\vcl\salctype.hxx %_DEST%\inc%_EXT%\vcl\salctype.hxx
-..\inc\vcl\salgtype.hxx %_DEST%\inc%_EXT%\vcl\salgtype.hxx
-..\inc\vcl\salstype.hxx %_DEST%\inc%_EXT%\vcl\salstype.hxx
-..\inc\vcl\salnativewidgets.hxx %_DEST%\inc%_EXT%\vcl\salnativewidgets.hxx
 ..\inc\vcl\scopedbitmapaccess.hxx %_DEST%\inc%_EXT%\vcl\scopedbitmapaccess.hxx
-..\inc\vcl\scrbar.hxx %_DEST%\inc%_EXT%\vcl\scrbar.hxx
-..\inc\vcl\seleng.hxx %_DEST%\inc%_EXT%\vcl\seleng.hxx
-..\inc\vcl\settings.hxx %_DEST%\inc%_EXT%\vcl\settings.hxx
-..\inc\vcl\slider.hxx %_DEST%\inc%_EXT%\vcl\slider.hxx
-..\inc\vcl\sndstyle.hxx %_DEST%\inc%_EXT%\vcl\sndstyle.hxx
 ..\inc\vcl\solarmutex.hxx %_DEST%\inc%_EXT%\vcl\solarmutex.hxx
-..\inc\vcl\sound.hxx %_DEST%\inc%_EXT%\vcl\sound.hxx
-..\inc\vcl\spin.h %_DEST%\inc%_EXT%\vcl\spin.h
-..\inc\vcl\spin.hxx %_DEST%\inc%_EXT%\vcl\spin.hxx
-..\inc\vcl\spinfld.hxx %_DEST%\inc%_EXT%\vcl\spinfld.hxx
-..\inc\vcl\split.hxx %_DEST%\inc%_EXT%\vcl\split.hxx
-..\inc\vcl\splitwin.hxx %_DEST%\inc%_EXT%\vcl\splitwin.hxx
-..\inc\vcl\status.hxx %_DEST%\inc%_EXT%\vcl\status.hxx
-..\inc\vcl\stdtext.hxx %_DEST%\inc%_EXT%\vcl\stdtext.hxx
-..\inc\vcl\sv.h %_DEST%\inc%_EXT%\vcl\sv.h
-..\inc\vcl\svapp.hxx %_DEST%\inc%_EXT%\vcl\svapp.hxx
-..\inc\vcl\symbol.hxx %_DEST%\inc%_EXT%\vcl\symbol.hxx
-..\inc\vcl\syschild.hxx %_DEST%\inc%_EXT%\vcl\syschild.hxx
-..\inc\vcl\sysdata.hxx %_DEST%\inc%_EXT%\vcl\sysdata.hxx
-..\inc\vcl\syswin.hxx %_DEST%\inc%_EXT%\vcl\syswin.hxx
-..\inc\vcl\tabctrl.hxx %_DEST%\inc%_EXT%\vcl\tabctrl.hxx
-..\inc\vcl\tabdlg.hxx %_DEST%\inc%_EXT%\vcl\tabdlg.hxx
-..\inc\vcl\tabpage.hxx %_DEST%\inc%_EXT%\vcl\tabpage.hxx
-..\inc\vcl\taskpanelist.hxx %_DEST%\inc%_EXT%\vcl\taskpanelist.hxx
-..\inc\vcl\timer.hxx %_DEST%\inc%_EXT%\vcl\timer.hxx
-..\inc\vcl\toolbox.hxx %_DEST%\inc%_EXT%\vcl\toolbox.hxx
-..\inc\vcl\unowrap.hxx %_DEST%\inc%_EXT%\vcl\unowrap.hxx
-..\inc\vcl\canvastools.hxx %_DEST%\inc%_EXT%\vcl\canvastools.hxx
-..\inc\vcl\vclenum.hxx %_DEST%\inc%_EXT%\vcl\vclenum.hxx
-..\inc\vcl\vclevent.hxx %_DEST%\inc%_EXT%\vcl\vclevent.hxx
-..\inc\vcl\virdev.hxx %_DEST%\inc%_EXT%\vcl\virdev.hxx
-..\inc\vcl\waitobj.hxx %_DEST%\inc%_EXT%\vcl\waitobj.hxx
-..\inc\vcl\wall.hxx %_DEST%\inc%_EXT%\vcl\wall.hxx
-..\inc\vcl\window.hxx %_DEST%\inc%_EXT%\vcl\window.hxx
-..\inc\vcl\wrkwin.hxx %_DEST%\inc%_EXT%\vcl\wrkwin.hxx
-..\inc\vcl\threadex.hxx %_DEST%\inc%_EXT%\vcl\threadex.hxx
-..\inc\vcl\evntpost.hxx %_DEST%\inc%_EXT%\vcl\evntpost.hxx
-..\inc\vcl\unohelp.hxx %_DEST%\inc%_EXT%\vcl\unohelp.hxx
-..\inc\vcl\unohelp2.hxx %_DEST%\inc%_EXT%\vcl\unohelp2.hxx
-..\inc\vcl\i18nhelp.hxx %_DEST%\inc%_EXT%\vcl\i18nhelp.hxx
-..\inc\vcl\dndhelp.hxx %_DEST%\inc%_EXT%\vcl\dndhelp.hxx
-..\inc\vcl\pdfwriter.hxx %_DEST%\inc%_EXT%\vcl\pdfwriter.hxx
-..\inc\vcl\controllayout.hxx %_DEST%\inc%_EXT%\vcl\controllayout.hxx
-..\inc\vcl\introwin.hxx %_DEST%\inc%_EXT%\vcl\introwin.hxx
-..\inc\vcl\abstdlg.hxx %_DEST%\inc%_EXT%\vcl\abstdlg.hxx
-..\inc\vcl\extoutdevdata.hxx %_DEST%\inc%_EXT%\vcl\extoutdevdata.hxx
-..\inc\vcl\pdfextoutdevdata.hxx %_DEST%\inc%_EXT%\vcl\pdfextoutdevdata.hxx
-..\inc\vcl\pngread.hxx %_DEST%\inc%_EXT%\vcl\pngread.hxx
-..\inc\vcl\pngwrite.hxx %_DEST%\inc%_EXT%\vcl\pngwrite.hxx
-..\inc\vcl\configsettings.hxx %_DEST%\inc%_EXT%\vcl\configsettings.hxx
-..\inc\vcl\ImageListProvider.hxx %_DEST%\inc%_EXT%\vcl\ImageListProvider.hxx
-..\inc\vcl\fontmanager.hxx %_DEST%\inc%_EXT%\vcl\fontmanager.hxx
-..\inc\vcl\printerinfomanager.hxx %_DEST%\inc%_EXT%\vcl\printerinfomanager.hxx
-..\inc\vcl\jobdata.hxx %_DEST%\inc%_EXT%\vcl\jobdata.hxx
-..\inc\vcl\ppdparser.hxx %_DEST%\inc%_EXT%\vcl\ppdparser.hxx
-..\inc\vcl\helper.hxx %_DEST%\inc%_EXT%\vcl\helper.hxx
-..\inc\vcl\strhelper.hxx %_DEST%\inc%_EXT%\vcl\strhelper.hxx
-..\inc\vcl\lazydelete.hxx %_DEST%\inc%_EXT%\vcl\lazydelete.hxx
-..\inc\vcl\arrange.hxx %_DEST%\inc%_EXT%\vcl\arrange.hxx
-..\inc\vcl\wpropset.hxx %_DEST%\inc%_EXT%\vcl\wpropset.hxx
-..\%__SRC%\misc\vcl.component %_DEST%\xml%_EXT%\vcl.component
 
diff --git a/vcl/util/makefile.pmk b/vcl/prj/makefile.mk
index 884eb499b532..c73a3d944bbf 100644
--- a/vcl/util/makefile.pmk
+++ b/vcl/prj/makefile.mk
@@ -25,10 +25,16 @@
 #
 #*************************************************************************
 
-.IF "$(GUI)" == "UNX" && "$(GUIBASE)"!="aqua"
-USE_BUILTIN_RASTERIZER=true
-.ENDIF
+PRJ=..
+TARGET=prj
+
+.INCLUDE : settings.mk
 
-.IF "$(USE_BUILTIN_RASTERIZER)" != ""
-ADDCDEFS += -DUSE_BUILTIN_RASTERIZER
+.IF "$(VERBOSE)"!=""
+VERBOSEFLAG :=
+.ELSE
+VERBOSEFLAG := -s
 .ENDIF
+
+all:
+    cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET)
diff --git a/vcl/source/app/dbggui.cxx b/vcl/source/app/dbggui.cxx
index 0380e9e58044..ccc509ced1f1 100644..100755
--- a/vcl/source/app/dbggui.cxx
+++ b/vcl/source/app/dbggui.cxx
@@ -38,14 +38,10 @@
 #include <cmath>
 #include <limits.h>
 
-#include "vcl/svdata.hxx"
-#include "svsys.h"
-
-#ifdef WNT
-#undef min
-#endif
 #include "tools/debug.hxx"
-#include "vcl/svdata.hxx"
+
+#include "vos/mutex.hxx"
+
 #include "vcl/svapp.hxx"
 #include "vcl/event.hxx"
 #include "vcl/lstbox.hxx"
@@ -58,13 +54,18 @@
 #include "vcl/wrkwin.hxx"
 #include "vcl/sound.hxx"
 #include "vcl/threadex.hxx"
-#include "vcl/dbggui.hxx"
-#include "com/sun/star/i18n/XCharacterClassification.hpp"
+
+#include "svdata.hxx"
+#include "dbggui.hxx"
 
 #include "vcl/unohelp.hxx"
 #include "vcl/unohelp2.hxx"
-#include <osl/mutex.hxx>
-#include "vcl/salinst.hxx"
+
+#include "salinst.hxx"
+#include "svdata.hxx"
+#include "svsys.h"
+
+#include "com/sun/star/i18n/XCharacterClassification.hpp"
 
 #include <map>
 #include <algorithm>
@@ -627,10 +628,9 @@ sal_Bool DbgWindow::Close()
     // remember window position
     ByteString aState( GetWindowState() );
     DbgData* pData = DbgGetData();
-    strncpy( pData->aDbgWinState,
-         aState.GetBuffer(),
-         std::min( sizeof( pData->aDbgWinState ),
-               size_t(aState.Len() + 1U )) );
+    size_t nCopy = (sizeof( pData->aDbgWinState ) < size_t(aState.Len() + 1U ))
+    ? sizeof( pData->aDbgWinState ) : size_t(aState.Len() + 1U );
+    strncpy( pData->aDbgWinState, aState.GetBuffer(), nCopy );
     pData->aDbgWinState[ sizeof( pData->aDbgWinState ) - 1 ] = 0;
     // and save for next session
     DbgSaveData( *pData );
diff --git a/vcl/source/app/help.cxx b/vcl/source/app/help.cxx
index 41263675840f..75bab1a29694 100644
--- a/vcl/source/app/help.cxx
+++ b/vcl/source/app/help.cxx
@@ -29,16 +29,18 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-#include "vcl/svdata.hxx"
+#include "tools/debug.hxx"
+#include "tools/diagnose_ex.h"
+#include "tools/time.hxx"
+
 #include "vcl/window.hxx"
 #include "vcl/event.hxx"
 #include "vcl/svapp.hxx"
 #include "vcl/wrkwin.hxx"
 #include "vcl/help.hxx"
-#include "vcl/helpwin.hxx"
-#include "tools/debug.hxx"
-#include "tools/diagnose_ex.h"
-#include "tools/time.hxx"
+
+#include "helpwin.hxx"
+#include "svdata.hxx"
 
 // =======================================================================
 
diff --git a/vcl/source/app/i18nhelp.cxx b/vcl/source/app/i18nhelp.cxx
index 0f9a8df94255..b55a988fa7da 100644
--- a/vcl/source/app/i18nhelp.cxx
+++ b/vcl/source/app/i18nhelp.cxx
@@ -29,16 +29,18 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-#include "vcl/i18nhelp.hxx"
-
-#include "com/sun/star/lang/XMultiServiceFactory.hpp"
-#include "com/sun/star/i18n/TransliterationModules.hpp"
 #include "unotools/localedatawrapper.hxx"
 #include "unotools/transliterationwrapper.hxx"
+
 #include "i18npool/mslangid.hxx"
 
 #include "rtl/ustrbuf.hxx"
 
+#include "vcl/i18nhelp.hxx"
+
+#include "com/sun/star/lang/XMultiServiceFactory.hpp"
+#include "com/sun/star/i18n/TransliterationModules.hpp"
+
 using namespace ::com::sun::star;
 
 vcl::I18nHelper::I18nHelper(  ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxMSF, const ::com::sun::star::lang::Locale& rLocale )
diff --git a/vcl/source/app/idlemgr.cxx b/vcl/source/app/idlemgr.cxx
index cc6502a74896..57547d80a007 100644
--- a/vcl/source/app/idlemgr.cxx
+++ b/vcl/source/app/idlemgr.cxx
@@ -28,9 +28,12 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
-#include <vcl/idlemgr.hxx>
+
+
 #include <vcl/svapp.hxx>
 
+#include <idlemgr.hxx>
+
 // =======================================================================
 
 struct ImplIdleData
diff --git a/vcl/source/app/makefile.mk b/vcl/source/app/makefile.mk
deleted file mode 100644
index 6e9c91f3c2e7..000000000000
--- a/vcl/source/app/makefile.mk
+++ /dev/null
@@ -1,71 +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=app
-ENABLE_EXCEPTIONS=TRUE
-
-.INCLUDE :	$(PRJ)$/util$/makefile.pmk
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile2.pmk
-
-CDEFS+=-DDLLPOSTFIX=$(DLLPOSTFIX)
-
-# --- Files --------------------------------------------------------
-
-SLOFILES=	$(SLO)$/dbggui.obj		\
-            $(SLO)$/brand.obj		\
-            $(SLO)$/help.obj		\
-            $(SLO)$/idlemgr.obj 	\
-            $(SLO)$/settings.obj	\
-            $(SLO)$/sound.obj		\
-            $(SLO)$/stdtext.obj 	\
-            $(SLO)$/svapp.obj		\
-            $(SLO)$/svdata.obj		\
-            $(SLO)$/svmain.obj		\
-            $(SLO)$/svmainhook.obj	\
-            $(SLO)$/timer.obj		\
-            $(SLO)$/dndhelp.obj     \
-            $(SLO)$/unohelp.obj     \
-            $(SLO)$/unohelp2.obj    \
-            $(SLO)$/vclevent.obj	\
-            $(SLO)$/i18nhelp.obj	\
-            $(SLO)$/salvtables.obj	\
-            $(SLO)$/solarmutex.obj      \
-            $(SLO)$/session.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :	target.mk
-
-.INCLUDE :	$(PRJ)$/util$/target.pmk
-
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index 8cbd1d816f8c..d30637f1e54e 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -29,16 +29,16 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-#include <vcl/salframe.hxx>
-#include <vcl/salinst.hxx>
-#include <vcl/salvd.hxx>
-#include <vcl/salprn.hxx>
-#include <vcl/saltimer.hxx>
-#include <vcl/salimestatus.hxx>
-#include <vcl/salsys.hxx>
-#include <vcl/salbmp.hxx>
-#include <vcl/salobj.hxx>
-#include <vcl/salmenu.hxx>
+#include <salframe.hxx>
+#include <salinst.hxx>
+#include <salvd.hxx>
+#include <salprn.hxx>
+#include <saltimer.hxx>
+#include <salimestatus.hxx>
+#include <salsys.hxx>
+#include <salbmp.hxx>
+#include <salobj.hxx>
+#include <salmenu.hxx>
 
 // this file contains the virtual destructors of the sal interface
 // compilers ususally put their vtables where the destructor is
diff --git a/vcl/source/app/session.cxx b/vcl/source/app/session.cxx
index 89aaf9026312..afcbab4bcc71 100644
--- a/vcl/source/app/session.cxx
+++ b/vcl/source/app/session.cxx
@@ -28,12 +28,17 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
-#include <vcl/svapp.hxx>
-#include <vcl/svdata.hxx>
-#include <vcl/salinst.hxx>
-#include <vcl/salsession.hxx>
+
 #include <cppuhelper/compbase1.hxx>
+
 #include <tools/debug.hxx>
+
+#include <vcl/svapp.hxx>
+
+#include <svdata.hxx>
+#include <salinst.hxx>
+#include <salsession.hxx>
+
 #include <com/sun/star/frame/XSessionManagerClient.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/frame/XSessionManagerListener2.hpp>
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index 9c7e76a392ae..9ffb8bc373da 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -30,25 +30,29 @@
 #include "precompiled_vcl.hxx"
 #include <svsys.h>
 #include "tools/debug.hxx"
+
 #include "i18npool/mslangid.hxx"
+
 #include "vcl/svapp.hxx"
-#include "vcl/svdata.hxx"
 #include "vcl/event.hxx"
 #include "vcl/settings.hxx"
 #include "vcl/i18nhelp.hxx"
-#include "unotools/fontcfg.hxx"
 #include "vcl/configsettings.hxx"
 #include "vcl/gradient.hxx"
 #include "vcl/unohelp.hxx"
 #include "vcl/bitmapex.hxx"
-#include "vcl/impimagetree.hxx"
+
+#include "unotools/fontcfg.hxx"
 #include "unotools/localedatawrapper.hxx"
 #include "unotools/collatorwrapper.hxx"
 #include "unotools/configmgr.hxx"
 #include "unotools/confignode.hxx"
-#include <unotools/syslocaleoptions.hxx>
+#include "unotools/syslocaleoptions.hxx"
 
 using ::rtl::OUString;
+
+#include "svdata.hxx"
+#include "impimagetree.hxx"
 // =======================================================================
 
 DBG_NAME( AllSettings )
diff --git a/vcl/source/app/sound.cxx b/vcl/source/app/sound.cxx
index 13f832339977..5fe5b5d38143 100644
--- a/vcl/source/app/sound.cxx
+++ b/vcl/source/app/sound.cxx
@@ -28,18 +28,20 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
+
 #include <tools/urlobj.hxx>
+#include <tools/debug.hxx>
+
 #include <unotools/localfilehelper.hxx>
 #include <unotools/ucbstreamhelper.hxx>
-#include <svsys.h>
-#include <vcl/salframe.hxx>
-#include <tools/debug.hxx>
-#include <vcl/svdata.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/window.hxx>
 #include <vcl/salbtype.hxx>
 #include <vcl/sound.hxx>
-#include <vcl/salinst.hxx>
+
+#include <salframe.hxx>
+#include <svdata.hxx>
+#include <salinst.hxx>
 
 void Sound::Beep( SoundType eType, Window* pWindow )
 {
diff --git a/vcl/source/app/stdtext.cxx b/vcl/source/app/stdtext.cxx
index 3fc2e67cc488..d33fbd7da71f 100644
--- a/vcl/source/app/stdtext.cxx
+++ b/vcl/source/app/stdtext.cxx
@@ -29,11 +29,11 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-#include <vcl/svids.hrc>
-#include <vcl/svdata.hxx>
 #include <vcl/msgbox.hxx>
 #include <vcl/stdtext.hxx>
 
+#include <svids.hrc>
+#include <svdata.hxx>
 
 
 // =======================================================================
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index e4cf7bf32330..fe536addac98 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -29,51 +29,58 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-#include "svsys.h"
-#include "vcl/salinst.hxx"
-#include "vcl/salframe.hxx"
-#include "vcl/salsys.hxx"
+//#include "svsys.h"
+
+#include "comphelper/processfactory.hxx"
+
+#include "osl/module.h"
+#include "osl/file.hxx"
+#include "osl/thread.h"
+
+#include "rtl/tencinfo.h"
+#include "rtl/instance.hxx"
+
+
 #include "tools/tools.h"
 #include "tools/debug.hxx"
 #include "tools/time.hxx"
+
 #include "i18npool/mslangid.hxx"
-#include "vcl/svdata.hxx"
+
+#include "unotools/syslocaleoptions.hxx"
+
 #include "vcl/settings.hxx"
-#include "vcl/accmgr.hxx"
 #include "vcl/keycod.hxx"
 #include "vcl/event.hxx"
 #include "vcl/vclevent.hxx"
 #include "vcl/virdev.hxx"
-#include "vcl/window.h"
 #include "vcl/wrkwin.hxx"
-#include "vcl/idlemgr.hxx"
 #include "vcl/svapp.hxx"
 #include "vcl/cvtgrf.hxx"
 #include "vcl/unowrap.hxx"
-#include "vcl/xconnection.hxx"
-#include "vcl/svids.hrc"
 #include "vcl/timer.hxx"
-
 #include "vcl/unohelp.hxx"
+#include "vcl/lazydelete.hxx"
+
+#include "salinst.hxx"
+#include "salframe.hxx"
+#include "salsys.hxx"
+#include "svdata.hxx"
+#include "salimestatus.hxx"
+#include "xconnection.hxx"
+#include "window.h"
+#include "accmgr.hxx"
+#include "idlemgr.hxx"
+#include "svids.hrc"
 
 #include "com/sun/star/uno/Reference.h"
 #include "com/sun/star/awt/XToolkit.hpp"
 #include "com/sun/star/uno/XNamingService.hpp"
 #include "com/sun/star/lang/XMultiServiceFactory.hpp"
-#include "comphelper/processfactory.hxx"
-
-#include "osl/module.h"
-#include "osl/file.hxx"
 #include "osl/mutex.hxx"
 #include "osl/process.h"
-#include "osl/thread.h"
-#include "rtl/tencinfo.h"
-#include "rtl/instance.hxx"
-#include "vcl/salimestatus.hxx"
 
 #include <utility>
-#include <vcl/lazydelete.hxx>
-#include <unotools/syslocaleoptions.hxx>
 
 using namespace ::com::sun::star::uno;
 
diff --git a/vcl/source/app/svdata.cxx b/vcl/source/app/svdata.cxx
index ee46f14acae0..7648dbbae75c 100644
--- a/vcl/source/app/svdata.cxx
+++ b/vcl/source/app/svdata.cxx
@@ -33,33 +33,33 @@
 
 #include <boost/ptr_container/ptr_vector.hpp>
 
+
 #include <osl/file.hxx>
 #include <osl/mutex.hxx>
 #include <rtl/process.h>
-
 #include "tools/debug.hxx"
 #include "tools/resary.hxx"
 
-#include "vcl/salinst.hxx"
-#include "vcl/salframe.hxx"
+#include "unotools/fontcfg.hxx"
+
+#include "cppuhelper/implbase1.hxx"
+
+#include "uno/current_context.hxx"
+
 #include "vcl/configsettings.hxx"
-#include "vcl/svdata.hxx"
-#include "vcl/window.h"
 #include "vcl/svapp.hxx"
 #include "vcl/wrkwin.hxx"
 #include "vcl/msgbox.hxx"
 #include "vcl/unohelp.hxx"
 #include "vcl/button.hxx" // for Button::GetStandardText
 #include "vcl/dockwin.hxx"  // for DockingManager
-#include "vcl/salimestatus.hxx"
-#include "vcl/salsys.hxx"
-#include "vcl/svids.hrc"
-#include "vcl/xconnection.hxx"
-
-#include "unotools/fontcfg.hxx"
-
-#include "cppuhelper/implbase1.hxx"
-#include "uno/current_context.hxx"
+#include "salinst.hxx"
+#include "salframe.hxx"
+#include "svdata.hxx"
+#include "window.h"
+#include "salimestatus.hxx"
+#include "salsys.hxx"
+#include "svids.hrc"
 
 #include "com/sun/star/lang/XMultiServiceFactory.hpp"
 #include "com/sun/star/lang/XComponent.hpp"
diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx
index 655bb0393563..e1f9052792ff 100644
--- a/vcl/source/app/svmain.cxx
+++ b/vcl/source/app/svmain.cxx
@@ -29,6 +29,30 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
+#include "rtl/logfile.hxx"
+
+#include <osl/file.hxx>
+#include <osl/signal.h>
+
+#include "tools/tools.h"
+#include "tools/debug.hxx"
+#include "tools/unqid.hxx"
+#include "tools/resmgr.hxx"
+
+#include "comphelper/processfactory.hxx"
+
+#include "unotools/syslocaleoptions.hxx"
+#include "unotools/fontcfg.hxx"
+
+#include "vcl/svapp.hxx"
+#include "vcl/wrkwin.hxx"
+#include "vcl/cvtgrf.hxx"
+#include "vcl/image.hxx"
+#include "vcl/settings.hxx"
+#include "vcl/unowrap.hxx"
+#include "vcl/configsettings.hxx"
+#include "vcl/lazydelete.hxx"
+
 #ifdef WNT
 #include <svsys.h>
 #include <process.h>    // for _beginthreadex
@@ -40,46 +64,29 @@
 // building X11 graphics layers.
 
 #if defined UNX && ! defined QUARTZ
-#include "svunx.h"
+//#include "svunx.h"
 #endif
 
-#include "svsys.h"
-#include "vcl/salinst.hxx"
-#include "vcl/salwtype.hxx"
-#include "osl/signal.h"
-#include "tools/tools.h"
-#include "tools/debug.hxx"
-#include "tools/unqid.hxx"
-#include "vcl/svdata.hxx"
-#include "vcl/dbggui.hxx"
-#include "vcl/svapp.hxx"
-#include "vcl/wrkwin.hxx"
-#include "vcl/cvtgrf.hxx"
-#include "vcl/image.hxx"
-#include "tools/resmgr.hxx"
-#include "vcl/accmgr.hxx"
-#include "vcl/idlemgr.hxx"
-#include "vcl/outdev.h"
-#include "vcl/outfont.hxx"
-#include "vcl/print.h"
-#include "vcl/settings.hxx"
-#include "vcl/unowrap.hxx"
-#include "vcl/salsys.hxx"
-#include "vcl/saltimer.hxx"
-#include "vcl/salimestatus.hxx"
-#include "vcl/impimagetree.hxx"
-#include "vcl/xconnection.hxx"
+//#include "svsys.h"
+
+#include "salinst.hxx"
+#include "salwtype.hxx"
+#include "svdata.hxx"
+#include "dbggui.hxx"
+#include "accmgr.hxx"
+#include "idlemgr.hxx"
+#include "outdev.h"
+#include "outfont.hxx"
+#include "print.h"
+#include "salsys.hxx"
+#include "saltimer.hxx"
+#include "salimestatus.hxx"
+#include "impimagetree.hxx"
+#include "xconnection.hxx"
 
-#include "osl/file.hxx"
 #include "osl/process.h"
-#include "comphelper/processfactory.hxx"
 #include "com/sun/star/lang/XMultiServiceFactory.hpp"
 #include "com/sun/star/lang/XComponent.hpp"
-#include "rtl/logfile.hxx"
-#include <unotools/syslocaleoptions.hxx>
-#include "unotools/fontcfg.hxx"
-#include "vcl/configsettings.hxx"
-#include "vcl/lazydelete.hxx"
 
 #include "cppuhelper/implbase1.hxx"
 #include "uno/current_context.hxx"
@@ -379,7 +386,9 @@ void DeInitVCL()
             aBuf.append( rtl::OUStringToOString( pWin->GetText(), osl_getThreadTextEncoding() ) );
             aBuf.append( "\" type = \"" );
             aBuf.append( typeid(*pWin).name() );
-            aBuf.append( "\"\n" );
+            aBuf.append( "\", ptr = 0x" );
+            aBuf.append( sal_Int64( pWin ), 16 );
+            aBuf.append( "\n" );
         }
     }
     DBG_ASSERT( nBadTopWindows==0, aBuf.getStr() );
diff --git a/vcl/source/app/timer.cxx b/vcl/source/app/timer.cxx
index 6c2d08b18659..fc2242522433 100644
--- a/vcl/source/app/timer.cxx
+++ b/vcl/source/app/timer.cxx
@@ -29,15 +29,15 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-#include <svsys.h>
-#include <vcl/saltimer.hxx>
 #include <tools/time.hxx>
-#include <vcl/svdata.hxx>
-#include <vcl/svapp.hxx>
-#include <vcl/salinst.hxx>
 #include <tools/debug.hxx>
+
+#include <vcl/svapp.hxx>
 #include <vcl/timer.hxx>
 
+#include <saltimer.hxx>
+#include <svdata.hxx>
+#include <salinst.hxx>
 
 
 // =======================================================================
diff --git a/vcl/source/app/unohelp.cxx b/vcl/source/app/unohelp.cxx
index fa484b70f6d0..096321e05cfe 100644
--- a/vcl/source/app/unohelp.cxx
+++ b/vcl/source/app/unohelp.cxx
@@ -29,30 +29,28 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
+#include <tools/tempfile.hxx>
+
+#include <osl/file.hxx>
 
+#include <cppuhelper/servicefactory.hxx>
 
+#include <vcl/svapp.hxx>
 #include <vcl/unohelp.hxx>
+
+#include <svdata.hxx>
+
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <comphelper/processfactory.hxx>
 
 #include <com/sun/star/i18n/XBreakIterator.hpp>
 #include <com/sun/star/i18n/XCharacterClassification.hpp>
-
 #include <com/sun/star/awt/XExtendedToolkit.hpp>
 #include <com/sun/star/accessibility/AccessibleEventObject.hpp>
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
-
-
 #include <com/sun/star/registry/XImplementationRegistration.hpp>
 
-#include <cppuhelper/servicefactory.hxx>
-
-#include <tools/tempfile.hxx>
-#include <osl/file.hxx>
-
-#include <vcl/svdata.hxx>
-#include <vcl/svapp.hxx>
 
 using namespace ::com::sun::star;
 using namespace ::rtl;
diff --git a/vcl/source/app/vclevent.cxx b/vcl/source/app/vclevent.cxx
index f7614c99046b..0ce3cc90f633 100644
--- a/vcl/source/app/vclevent.cxx
+++ b/vcl/source/app/vclevent.cxx
@@ -30,7 +30,8 @@
 #include "precompiled_vcl.hxx"
 
 #include "vcl/vclevent.hxx"
-#include "vcl/svdata.hxx"
+
+#include "svdata.hxx"
 
 #include <com/sun/star/accessibility/XAccessible.hpp>
 
diff --git a/vcl/source/components/dtranscomp.cxx b/vcl/source/components/dtranscomp.cxx
index cd1fbec0502b..b089db6e387e 100644
--- a/vcl/source/components/dtranscomp.cxx
+++ b/vcl/source/components/dtranscomp.cxx
@@ -29,6 +29,13 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
+#include "osl/mutex.hxx"
+
+#include "vcl/svapp.hxx"
+
+#include "svdata.hxx"
+#include "salinst.hxx"
+
 #include "com/sun/star/lang/XServiceInfo.hpp"
 #include "com/sun/star/lang/XSingleServiceFactory.hpp"
 #include "com/sun/star/lang/XInitialization.hpp"
@@ -42,12 +49,6 @@
 #include "com/sun/star/datatransfer/dnd/XDropTarget.hpp"
 #include "com/sun/star/datatransfer/dnd/DNDConstants.hpp"
 
-#include "vcl/svapp.hxx"
-#include "vcl/svdata.hxx"
-#include "vcl/salinst.hxx"
-#include "osl/mutex.hxx"
-#include "osl/mutex.hxx"
-
 #include "cppuhelper/compbase1.hxx"
 #include "cppuhelper/compbase2.hxx"
 #include "cppuhelper/compbase3.hxx"
diff --git a/vcl/source/components/factory.cxx b/vcl/source/components/factory.cxx
index 9325c047b5d7..04b0e122cbce 100644
--- a/vcl/source/components/factory.cxx
+++ b/vcl/source/components/factory.cxx
@@ -42,9 +42,7 @@ using ::rtl::OUStringBuffer;
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
 
-
 // service implementation
-
 extern Sequence< OUString > SAL_CALL vcl_session_getSupportedServiceNames();
 extern OUString SAL_CALL vcl_session_getImplementationName();
 extern Reference< XInterface > SAL_CALL vcl_session_createInstance( const Reference< XMultiServiceFactory > & );
@@ -74,6 +72,13 @@ extern Reference< XInterface > SAL_CALL DragSource_createInstance( const Referen
 extern Sequence< OUString > SAL_CALL DropTarget_getSupportedServiceNames();
 extern OUString SAL_CALL DropTarget_getImplementationName();
 extern Reference< XInterface > SAL_CALL DropTarget_createInstance( const Reference< XMultiServiceFactory > & );
+
+namespace rsvg
+{
+    extern Sequence< OUString > SAL_CALL Rasterizer_getSupportedServiceNames();
+    extern OUString SAL_CALL Rasterizer_getImplementationName();
+    extern Reference< XInterface > SAL_CALL Rasterizer_createInstance( const Reference< XMultiServiceFactory > & );
+}
 }
 
 extern "C" {
@@ -139,6 +144,12 @@ extern "C" {
                     xMgr, vcl::DropTarget_getImplementationName(), vcl::DropTarget_createInstance,
                     vcl::DropTarget_getSupportedServiceNames() );
             }
+            else if( vcl::rsvg::Rasterizer_getImplementationName().equalsAscii( pImplementationName ) )
+            {
+                xFactory = ::cppu::createSingleFactory(
+                    xMgr, vcl::rsvg::Rasterizer_getImplementationName(), vcl::rsvg::Rasterizer_createInstance,
+                    vcl::rsvg::Rasterizer_getSupportedServiceNames() );
+            }
             if( xFactory.is() )
             {
                 xFactory->acquire();
diff --git a/vcl/source/components/fontident.cxx b/vcl/source/components/fontident.cxx
index e411dcf49aba..6afadbbe267e 100644
--- a/vcl/source/components/fontident.cxx
+++ b/vcl/source/components/fontident.cxx
@@ -29,6 +29,13 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
+#include <tools/debug.hxx>
+
+#include "vcl/svapp.hxx"
+#include "vcl/font.hxx"
+
+#include "svdata.hxx"
+
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/beans/XMaterialHolder.hpp>
 #include <com/sun/star/awt/FontDescriptor.hpp>
@@ -39,15 +46,8 @@
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/lang/DisposedException.hpp>
 
-#include "vcl/svapp.hxx"
-#include "vcl/svdata.hxx"
-#include "vcl/font.hxx"
-
 #include <cppuhelper/implbase3.hxx>
 
-#include <tools/debug.hxx>
-
-
 using ::rtl::OUString;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
diff --git a/vcl/source/components/makefile.mk b/vcl/source/components/makefile.mk
index 982687104c01..41f21bfa3749 100644
--- a/vcl/source/components/makefile.mk
+++ b/vcl/source/components/makefile.mk
@@ -33,20 +33,23 @@ ENABLE_EXCEPTIONS=TRUE
 
 # --- Settings -----------------------------------------------------
 
-.INCLUDE :	$(PRJ)$/util$/makefile.pmk
-.INCLUDE :	settings.mk
+.INCLUDE :  $(PRJ)$/util$/makefile.pmk
+.INCLUDE :  settings.mk
 .INCLUDE :  $(PRJ)$/util$/makefile2.pmk
 
 # --- Files --------------------------------------------------------
 
-SLOFILES=	$(SLO)$/display.obj		 \
-            $(SLO)$/dtranscomp.obj   \
-            $(SLO)$/fontident.obj    \
-            $(SLO)$/stringmirror.obj \
+SLOFILES=   $(SLO)$/display.obj		\
+            $(SLO)$/dtranscomp.obj	\
+            $(SLO)$/fontident.obj	\
+            $(SLO)$/stringmirror.obj	\
+            $(SLO)$/rasterizer_rsvg.obj \
             $(SLO)$/factory.obj
 
-# --- Targets ------------------------------------------------------
+EXCEPTIONSFILES=	$(SLO)$/rasterizer_rsvg.obj
+
 
-.INCLUDE :	target.mk
-.INCLUDE :	$(PRJ)$/util$/target.pmk
+# --- Targets ------------------------------------------------------
 
+.INCLUDE :  target.mk
+.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/vcl/source/components/rasterizer_rsvg.cxx b/vcl/source/components/rasterizer_rsvg.cxx
new file mode 100644
index 000000000000..5547b179d227
--- /dev/null
+++ b/vcl/source/components/rasterizer_rsvg.cxx
@@ -0,0 +1,640 @@
+/*************************************************************************
+ *
+ * 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 <vcl/graph.hxx>
+#include <vcl/bmpacc.hxx>
+#include <vcl/alpha.hxx>
+#include <com/sun/star/graphic/XGraphicRasterizer.hpp>
+#include <com/sun/star/lang/XServiceInfo.hpp>
+#include <com/sun/star/io/XSeekable.hpp>
+#include <cppuhelper/implbase2.hxx>
+#include <osl/module.h>
+
+#include <vector>
+
+#if defined MACOSX
+    #define VCL_RSVG_GOBJECT_LIBNAME    "libgobject-2.0.0.dylib"
+    #define VCL_RSVG_CAIRO_LIBNAME      "libcairo.2.dylib"
+    #define VCL_RSVG_LIBRSVG_LIBNAME    "librsvg-2.2.dylib"
+#elif defined UNX
+    #define VCL_RSVG_GOBJECT_LIBNAME    "libgobject-2.0.so"
+    #define VCL_RSVG_CAIRO_LIBNAME      "libcairo.so"
+    #define VCL_RSVG_LIBRSVG_LIBNAME    "librsvg-2.so"
+#elif defined WNT
+    #define VCL_RSVG_GOBJECT_LIBNAME    "libgobject-2.0-0.dll"
+    #define VCL_RSVG_CAIRO_LIBNAME      "cairo.dll"
+    #define VCL_RSVG_LIBRSVG_LIBNAME    "librsvg-2-2.dll"
+#else
+    #define VCL_RSVG_GOBJECT_LIBNAME    "nogobjectlib"
+    #define VCL_RSVG_CAIRO_LIBNAME      "nocairolib"
+    #define VCL_RSVG_LIBRSVG_LIBNAME    "nolibrsvglib"
+#endif
+
+#define VCL_RSVG_DEFAULT_DPI 72
+
+using namespace ::com::sun::star;
+
+// -----------------------------------------------------
+// - external stuff for dynamic library function calls -
+// -----------------------------------------------------
+
+typedef int gboolean;
+typedef unsigned char guint8;
+typedef sal_Size gsize;
+typedef void* gpointer;
+
+struct GError;
+
+enum cairo_format_t { CAIRO_FORMAT_ARGB32 = 0 };
+enum cairo_status_t { CAIRO_STATUS_SUCCESS = 0 };
+
+struct cairo_surface_t;
+struct cairo_t;
+struct cairo_matrix_t
+{
+    double xx; double yx;
+    double xy; double yy;
+    double x0; double y0;
+};
+
+struct RsvgHandle;
+struct RsvgDimensionData
+{
+    int width;
+    int height;
+    double em;
+    double ex;
+};
+
+namespace vcl
+{
+namespace rsvg
+{
+// -----------------
+// - Uno functions -
+// ----------------
+
+uno::Sequence< ::rtl::OUString > Rasterizer_getSupportedServiceNames()
+{
+    static ::rtl::OUString aServiceName( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.graphic.GraphicRasterizer_RSVG" ) );
+    static uno::Sequence< ::rtl::OUString > aServiceNames( &aServiceName, 1 );
+
+    return( aServiceNames );
+}
+
+// -----------------------------------------------------------------------------
+
+::rtl::OUString Rasterizer_getImplementationName()
+{
+    return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "vcl::rsvg::Rasterizer" ) );
+}
+
+// ------------------
+// - LibraryWrapper -
+// ------------------
+
+class LibraryWrapper
+{
+public:
+
+    static LibraryWrapper& get();
+
+    bool isValid() const { return( ( mpGObjectLib != NULL ) && ( mpCairoLib != NULL ) && ( mpRSVGLib != NULL ) ); }
+
+    // G-Object
+    gpointer g_object_unref( gpointer pointer ) { return( (*mp_g_object_unref)( pointer ) ); };
+
+    // LibRSVG
+
+    // Cairo
+    cairo_surface_t* image_surface_create( cairo_format_t format, int width, int height ) { return( (*mp_image_surface_create)( format, width, height ) ); }
+    void surface_destroy( cairo_surface_t* surface ) { (*mp_surface_destroy)( surface ); }
+    cairo_status_t surface_status( cairo_surface_t* surface ) { return( (*mp_surface_status)( surface ) ); }
+    cairo_t* create( cairo_surface_t* surface ) { return( (*mp_create)( surface ) ); }
+    void destroy( cairo_t* cairo ) { (*mp_destroy )( cairo ); }
+    void matrix_init_identity( cairo_matrix_t* matrix ){ (*mp_matrix_init_identity)( matrix ); }
+    void matrix_translate( cairo_matrix_t* matrix, double nx, double ny ) { (*mp_matrix_translate)( matrix, nx, ny ); }
+    void matrix_scale( cairo_matrix_t* matrix, double sx, double sy ) {( *mp_matrix_scale )( matrix, sx, sy ); }
+    void matrix_rotate( cairo_matrix_t* matrix, double radians ) { ( *mp_matrix_rotate )( matrix, radians ); }
+    void transform( cairo_t* cairo, cairo_matrix_t *matrix ) { (*mp_transform)( cairo, matrix ); }
+    unsigned char* image_surface_get_data(cairo_surface_t* surface) { return( (*mp_image_surface_get_data)( surface ) ); }
+    int image_surface_get_width(cairo_surface_t* surface) { return( (*mp_image_surface_get_width)( surface ) ); }
+    int image_surface_get_height(cairo_surface_t* surface) { return( (*mp_image_surface_get_height)( surface ) ); }
+    int image_surface_get_stride(cairo_surface_t* surface) { return( (*mp_image_surface_get_stride)( surface ) ); }
+
+    // LibRSVG
+    void rsvg_init() { (*mp_rsvg_init)(); }
+    RsvgHandle* rsvg_handle_new_from_data( const guint8* data, gsize size, GError** error) { return( (*mp_rsvg_handle_new_from_data)( data, size, error ) ); }
+    gboolean rsvg_handle_close( RsvgHandle* handle, GError** error ) { return( (*mp_rsvg_handle_close)( handle, error ) ); }
+    void rsvg_handle_set_dpi_x_y( RsvgHandle* handle, double dpix, double dpiy ) { (*mp_rsvg_handle_set_dpi_x_y)( handle, dpix, dpiy ); }
+    void rsvg_handle_get_dimensions( RsvgHandle* handle, RsvgDimensionData* dimensions ) { (*mp_rsvg_handle_get_dimensions)( handle, dimensions ); }
+    gboolean rsvg_handle_render_cairo( RsvgHandle* handle, cairo_t* cairo ) { return( (*mp_rsvg_handle_render_cairo)( handle, cairo ) ); }
+
+private:
+
+    LibraryWrapper();
+
+private:
+
+    oslModule mpGObjectLib;
+    oslModule mpCairoLib;
+    oslModule mpRSVGLib;
+
+    // GObject
+    gpointer (*mp_g_object_unref)( gpointer );
+
+    // Cairo
+    cairo_surface_t* (*mp_image_surface_create)(cairo_format_t,int,int);
+    void (*mp_surface_destroy )(cairo_surface_t*);
+    cairo_status_t (*mp_surface_status)(cairo_surface_t*);
+    cairo_t* (*mp_create)(cairo_surface_t*);
+    void (*mp_destroy)(cairo_t*);
+    void (*mp_matrix_init_identity)(cairo_matrix_t*);
+    void (*mp_matrix_translate)( cairo_matrix_t*, double, double);
+    void (*mp_matrix_scale )( cairo_matrix_t*, double, double);
+    void (*mp_matrix_rotate)( cairo_matrix_t*, double);
+    void (*mp_transform)( cairo_t*, cairo_matrix_t*);
+    unsigned char* (*mp_image_surface_get_data)( cairo_surface_t* );
+    int (*mp_image_surface_get_width)(cairo_surface_t* surface);
+    int (*mp_image_surface_get_height)(cairo_surface_t* surface);
+    int (*mp_image_surface_get_stride)(cairo_surface_t* surface);
+
+    // LibRSVG
+    void (*mp_rsvg_init)( void );
+    RsvgHandle* (*mp_rsvg_handle_new_from_data)( const guint8*, gsize, GError** );
+    gboolean (*mp_rsvg_handle_close)( RsvgHandle*, GError** );
+    void (*mp_rsvg_handle_set_dpi_x_y)( RsvgHandle*, double, double );
+    void (*mp_rsvg_handle_get_dimensions)( RsvgHandle*, RsvgDimensionData* );
+    gboolean (*mp_rsvg_handle_render_cairo)( RsvgHandle*, cairo_t* );
+};
+
+// -----------------------------------------------------------------------------
+
+LibraryWrapper& LibraryWrapper::get()
+{
+    static LibraryWrapper* pLibraryInstance = NULL;
+
+    if( !pLibraryInstance )
+        pLibraryInstance = new LibraryWrapper;
+
+    return( *pLibraryInstance );
+}
+
+// -----------------------------------------------------------------------------
+
+LibraryWrapper::LibraryWrapper() :
+    mpGObjectLib( NULL ),
+    mpCairoLib( NULL ),
+    mpRSVGLib( NULL )
+{
+    const ::rtl::OUString aGObjectLibName( RTL_CONSTASCII_USTRINGPARAM( VCL_RSVG_GOBJECT_LIBNAME ) );
+    const ::rtl::OUString aCairoLibName( RTL_CONSTASCII_USTRINGPARAM( VCL_RSVG_CAIRO_LIBNAME ) );
+    const ::rtl::OUString aRSVGLibName( RTL_CONSTASCII_USTRINGPARAM( VCL_RSVG_LIBRSVG_LIBNAME ) );
+    bool bCont = true;
+
+    // GObject
+    if( bCont && ( NULL != ( mpGObjectLib = osl_loadModule( aGObjectLibName.pData, SAL_LOADMODULE_DEFAULT ) ) ||
+                   NULL != ( mpGObjectLib = osl_loadModuleRelative( (oslGenericFunction)LibraryWrapper::get,
+                                                                   aGObjectLibName.pData, SAL_LOADMODULE_DEFAULT ) )
+
+                  ) )
+    {
+        mp_g_object_unref = ( gpointer (*)( gpointer ) ) osl_getAsciiFunctionSymbol( mpGObjectLib, "g_object_unref" );
+
+        if( !( mp_g_object_unref ) )
+        {
+            OSL_TRACE( "not all needed symbols were found in g-object library" );
+            bCont = false;
+        }
+    }
+
+    // Cairo
+    if( bCont && ( NULL != ( mpCairoLib = osl_loadModule( aCairoLibName.pData, SAL_LOADMODULE_DEFAULT ) ) ||
+                   NULL != ( mpCairoLib = osl_loadModuleRelative( (oslGenericFunction)LibraryWrapper::get,
+                                                                   aCairoLibName.pData, SAL_LOADMODULE_DEFAULT ) )
+                  ) )
+    {
+        mp_image_surface_create = ( cairo_surface_t* (*)( cairo_format_t, int, int ) ) osl_getAsciiFunctionSymbol( mpCairoLib, "cairo_image_surface_create" );
+        mp_surface_destroy = ( void (*)( cairo_surface_t* ) ) osl_getAsciiFunctionSymbol( mpCairoLib, "cairo_surface_destroy" );
+        mp_surface_status = ( cairo_status_t (*)( cairo_surface_t* ) ) osl_getAsciiFunctionSymbol( mpCairoLib, "cairo_surface_status" );
+        mp_create = ( cairo_t* (*)( cairo_surface_t* ) ) osl_getAsciiFunctionSymbol( mpCairoLib, "cairo_create" );
+        mp_destroy = ( void (*)( cairo_t* ) ) osl_getAsciiFunctionSymbol( mpCairoLib, "cairo_destroy" );
+        mp_matrix_init_identity = ( void (*)( cairo_matrix_t* ) ) osl_getAsciiFunctionSymbol( mpCairoLib, "cairo_matrix_init_identity" );
+        mp_matrix_translate = ( void (*)( cairo_matrix_t*, double, double ) ) osl_getAsciiFunctionSymbol( mpCairoLib, "cairo_matrix_translate" );
+        mp_matrix_scale = ( void (*)( cairo_matrix_t*, double, double ) ) osl_getAsciiFunctionSymbol( mpCairoLib, "cairo_matrix_scale" );
+        mp_matrix_rotate = ( void (*)( cairo_matrix_t*, double ) ) osl_getAsciiFunctionSymbol( mpCairoLib, "cairo_matrix_rotate" );
+        mp_transform = ( void (*)( cairo_t*, cairo_matrix_t* ) ) osl_getAsciiFunctionSymbol( mpCairoLib, "cairo_transform" );
+        mp_image_surface_get_data = ( unsigned char* (*)( cairo_surface_t* ) ) osl_getAsciiFunctionSymbol( mpCairoLib, "cairo_image_surface_get_data" );
+        mp_image_surface_get_width = ( int (*)( cairo_surface_t* ) ) osl_getAsciiFunctionSymbol( mpCairoLib, "cairo_image_surface_get_width" );
+        mp_image_surface_get_height = ( int (*)( cairo_surface_t* ) ) osl_getAsciiFunctionSymbol( mpCairoLib, "cairo_image_surface_get_height" );
+        mp_image_surface_get_stride = ( int (*)( cairo_surface_t* ) ) osl_getAsciiFunctionSymbol( mpCairoLib, "cairo_image_surface_get_stride" );
+
+        if( !( mp_image_surface_create &&
+               mp_surface_destroy &&
+               mp_surface_status &&
+               mp_create &&
+               mp_destroy &&
+               mp_matrix_init_identity &&
+               mp_matrix_translate &&
+               mp_matrix_scale &&
+               mp_matrix_rotate &&
+               mp_transform &&
+               mp_image_surface_get_data &&
+               mp_image_surface_get_width &&
+               mp_image_surface_get_height &&
+               mp_image_surface_get_stride ) )
+        {
+            OSL_TRACE( "not all needed symbols were found in cairo library" );
+            bCont = false;
+        }
+    }
+
+    // LibRSVG
+    if( bCont && ( NULL != ( mpRSVGLib = osl_loadModule( aRSVGLibName.pData, SAL_LOADMODULE_DEFAULT ) ) ||
+                   NULL != ( mpRSVGLib = osl_loadModuleRelative( (oslGenericFunction)LibraryWrapper::get,
+                                                                   aRSVGLibName.pData, SAL_LOADMODULE_DEFAULT ) )
+                  ) )
+    {
+        mp_rsvg_init = ( void (*)( void ) ) osl_getAsciiFunctionSymbol( mpRSVGLib, "rsvg_init" );
+        mp_rsvg_handle_new_from_data = ( RsvgHandle* (*)( const guint8*, gsize, GError** ) ) osl_getAsciiFunctionSymbol( mpRSVGLib, "rsvg_handle_new_from_data" );
+        mp_rsvg_handle_close = ( gboolean (*)( RsvgHandle*, GError** ) ) osl_getAsciiFunctionSymbol( mpRSVGLib, "rsvg_handle_close" );
+        mp_rsvg_handle_set_dpi_x_y = ( void (*)( RsvgHandle*, double, double ) ) osl_getAsciiFunctionSymbol( mpRSVGLib, "rsvg_handle_set_dpi_x_y" );
+        mp_rsvg_handle_get_dimensions = ( void (*)( RsvgHandle*, RsvgDimensionData* ) ) osl_getAsciiFunctionSymbol( mpRSVGLib, "rsvg_handle_get_dimensions" );
+        mp_rsvg_handle_render_cairo = ( gboolean (*)( RsvgHandle*, cairo_t* ) ) osl_getAsciiFunctionSymbol( mpRSVGLib, "rsvg_handle_render_cairo" );
+
+        if( !( mp_rsvg_init &&
+               mp_rsvg_handle_new_from_data &&
+               mp_rsvg_handle_close &&
+               mp_rsvg_handle_set_dpi_x_y &&
+               mp_rsvg_handle_get_dimensions &&
+               mp_rsvg_handle_render_cairo ) )
+        {
+            OSL_TRACE( "not all needed symbols were found in librsvg library" );
+            bCont = false;
+        }
+    }
+
+    OSL_ENSURE( mpGObjectLib, "g-object library could not be loaded" );
+    OSL_ENSURE( mpCairoLib, "cairo library could not be loaded" );
+    OSL_ENSURE( mpRSVGLib, "librsvg library could not be loaded" );
+
+    bCont = bCont && mpGObjectLib != NULL && mpCairoLib != NULL && mpRSVGLib != NULL;
+
+    // unload all libraries in case of failure
+    if( !bCont )
+    {
+        if( mpRSVGLib )
+        {
+            osl_unloadModule( mpRSVGLib );
+            mpRSVGLib = NULL;
+        }
+
+        if( mpCairoLib )
+        {
+            osl_unloadModule( mpCairoLib );
+            mpCairoLib = NULL;
+        }
+
+        if( mpGObjectLib )
+        {
+            osl_unloadModule( mpGObjectLib );
+            mpGObjectLib = NULL;
+        }
+    }
+    else
+        rsvg_init();
+}
+
+// ---------------------------
+// - ::vcl::rsvg::Rasterizer -
+// ---------------------------
+
+class Rasterizer : public ::cppu::WeakAggImplHelper2< graphic::XGraphicRasterizer, lang::XServiceInfo >
+{
+public:
+                Rasterizer();
+    virtual     ~Rasterizer();
+
+    // XGraphicRasterizer
+    virtual ::sal_Bool SAL_CALL initializeData( const uno::Reference< io::XInputStream >& DataStream,
+                                                ::sal_uInt32 DPI_X, ::sal_uInt32 DPI_Y,
+                                                awt::Size& DefaultSizePixel )
+        throw ( uno::RuntimeException );
+
+    virtual uno::Reference< graphic::XGraphic > SAL_CALL rasterize( ::sal_uInt32 Width,
+                                                                    ::sal_uInt32 Height,
+                                                                    double RotateAngle,
+                                                                    double ShearAngle_X,
+                                                                    double ShearAngle_Y,
+                                                                    const uno::Sequence< beans::PropertyValue >& RasterizeProperties )
+        throw (uno::RuntimeException);
+
+    // XServiceInfo
+    virtual ::rtl::OUString SAL_CALL getImplementationName()
+        throw( uno::RuntimeException);
+
+    virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& )
+        throw( uno::RuntimeException );
+
+    virtual uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames()
+        throw( uno::RuntimeException );
+
+protected:
+
+    void        implFreeRsvgHandle();
+
+    uno::Reference< graphic::XGraphic > implGetXGraphicFromSurface( cairo_surface_t* pSurface ) const;
+
+private:
+
+                Rasterizer( const Rasterizer& );
+    Rasterizer& operator=( const Rasterizer& );
+
+private:
+
+    RsvgHandle* mpRsvgHandle;
+    sal_Int32   mnDefaultWidth;
+    sal_Int32   mnDefaultHeight;
+    bool        mbLibInit;
+};
+
+// -----------------------------------------------------------------------------
+
+Rasterizer::Rasterizer() :
+    mpRsvgHandle( NULL ),
+    mnDefaultWidth( 0 ),
+    mnDefaultHeight( 0 ),
+    mbLibInit( true )
+{
+    try
+    {
+        LibraryWrapper& rLib = LibraryWrapper::get();
+        mbLibInit = rLib.isValid();
+    }
+    catch( ... )
+    {
+        mbLibInit = false;
+    }
+}
+
+// -----------------------------------------------------------------------------
+
+Rasterizer::~Rasterizer()
+{
+    implFreeRsvgHandle();
+}
+
+// -----------------------------------------------------------------------------
+
+void Rasterizer::implFreeRsvgHandle()
+{
+    if( mpRsvgHandle )
+    {
+        LibraryWrapper::get().g_object_unref( static_cast< gpointer >( mpRsvgHandle ) );
+        mpRsvgHandle = NULL;
+    }
+}
+
+// -----------------------------------------------------------------------------
+
+uno::Reference< graphic::XGraphic > Rasterizer::implGetXGraphicFromSurface( cairo_surface_t* pSurface ) const
+{
+    LibraryWrapper& rLib = LibraryWrapper::get();
+    unsigned char*  pData = rLib.image_surface_get_data( pSurface );
+    const sal_Int32 nWidth = rLib.image_surface_get_width( pSurface );
+    const sal_Int32 nHeight =rLib.image_surface_get_height( pSurface );
+    const sal_Int32 nStride = rLib.image_surface_get_stride( pSurface );
+
+    uno::Reference< graphic::XGraphic > xRet;
+
+    if( pData && nWidth && nHeight && nStride )
+    {
+        Size                aSize( nWidth, nHeight );
+        Bitmap              aBmp( aSize, 24 );
+        AlphaMask           aAlphaMask( aSize );
+        BitmapWriteAccess*  pBmpAcc = aBmp.AcquireWriteAccess();
+        BitmapWriteAccess*  pAlpAcc = aAlphaMask.AcquireWriteAccess();
+
+        if( pBmpAcc && pAlpAcc )
+        {
+            BitmapColor aPixel, aWhitePixel( 255, 255, 255 ), aAlpha( 0 ), aFullAlpha( 255 );
+            sal_uInt32* pRow = reinterpret_cast< sal_uInt32* >( pData );
+
+            for( sal_Int32 nY = 0; nY < nHeight; ++nY, pRow = reinterpret_cast< sal_uInt32* >( pData += nStride )  )
+            {
+                for( sal_Int32 nX = 0; nX < nWidth; ++nX )
+                {
+                    const register sal_uInt32 nPixel = *pRow++;
+                    const register sal_uInt32 nAlpha = nPixel >> 24;
+
+                    if( !nAlpha )
+                    {
+                        pBmpAcc->SetPixel( nY, nX, aWhitePixel );
+                        pAlpAcc->SetPixel( nY, nX, aFullAlpha );
+                    }
+                    else
+                    {
+                        aPixel.SetRed( static_cast< sal_uInt8 >( ( ( ( nPixel & 0x00ff0000 ) >> 16 ) * 255 ) / nAlpha ) );
+                        aPixel.SetGreen( static_cast< sal_uInt8 >( ( ( ( nPixel & 0x0000ff00 ) >> 8 ) * 255 ) / nAlpha ) );
+                        aPixel.SetBlue( static_cast< sal_uInt8 >( ( ( nPixel & 0x000000ff ) * 255 ) / nAlpha ) );
+                        pBmpAcc->SetPixel( nY, nX, aPixel );
+
+                        aAlpha.SetIndex( static_cast< sal_uInt8 >( 255 - nAlpha ) );
+                        pAlpAcc->SetPixel( nY, nX, aAlpha );
+                    }
+                }
+            }
+
+            aBmp.ReleaseAccess( pBmpAcc );
+            aAlphaMask.ReleaseAccess( pAlpAcc );
+
+            const Graphic aGraphic( BitmapEx( aBmp, aAlphaMask ) );
+            xRet.set( aGraphic.GetXGraphic(), uno::UNO_QUERY );
+        }
+        else
+        {
+            aBmp.ReleaseAccess( pBmpAcc );
+            aAlphaMask.ReleaseAccess( pAlpAcc );
+        }
+    }
+
+    return( xRet );
+}
+
+// -----------------------------------------------------------------------------
+
+::sal_Bool SAL_CALL Rasterizer::initializeData( const uno::Reference< io::XInputStream >& rDataStream,
+                                                ::sal_uInt32 nDPI_X, ::sal_uInt32 nDPI_Y,
+                                                awt::Size& rDefaultSizePixel )
+        throw ( uno::RuntimeException )
+{
+    LibraryWrapper& rLib = LibraryWrapper::get();
+
+    implFreeRsvgHandle();
+
+    if( mbLibInit && rDataStream.is() )
+    {
+        ::std::vector< sal_Int8 >       aDataBuffer;
+        uno::Reference< io::XSeekable > xSeekable( rDataStream, uno::UNO_QUERY );
+        sal_Int32                       nReadSize, nBlockSize = ( xSeekable.is() ? xSeekable->getLength() : 65536 );
+        uno::Sequence< sal_Int8 >       aStmBuffer( nBlockSize );
+
+        do
+        {
+            nReadSize = rDataStream->readBytes( aStmBuffer, nBlockSize );
+
+            if( nReadSize > 0 )
+            {
+                const sal_Int8* pArray = aStmBuffer.getArray();
+                aDataBuffer.insert( aDataBuffer.end(), pArray, pArray + nReadSize );
+            }
+        }
+        while( nReadSize == nBlockSize );
+
+        if( aDataBuffer.size() &&
+            ( NULL != ( mpRsvgHandle = rLib.rsvg_handle_new_from_data( reinterpret_cast< sal_uInt8* >( &aDataBuffer[ 0 ] ),
+                                                                       aDataBuffer.size(), NULL ) ) ) &&
+            !rLib.rsvg_handle_close( mpRsvgHandle, NULL ) )
+        {
+            implFreeRsvgHandle();
+        }
+    }
+
+    // get default dimensions of image
+    mnDefaultWidth = mnDefaultHeight = 0;
+
+    if( mpRsvgHandle )
+    {
+        RsvgDimensionData aDefaultDimension = { 0, 0, 0.0, 0.0 };
+
+        rLib.rsvg_handle_set_dpi_x_y( mpRsvgHandle, nDPI_X ? nDPI_X: 72, nDPI_Y ? nDPI_Y : 72 );
+        rLib.rsvg_handle_get_dimensions( mpRsvgHandle, &aDefaultDimension );
+
+        mnDefaultWidth = aDefaultDimension.width;
+        mnDefaultHeight = aDefaultDimension.height;
+    }
+
+    rDefaultSizePixel.Width = mnDefaultWidth;
+    rDefaultSizePixel.Height = mnDefaultHeight;
+
+    return( mpRsvgHandle != NULL );
+}
+
+// -----------------------------------------------------------------------------
+
+uno::Reference< graphic::XGraphic > SAL_CALL Rasterizer::rasterize( ::sal_uInt32 nWidth,
+                                                                    ::sal_uInt32 nHeight,
+                                                                    double /*fRotateAngle*/,
+                                                                    double /*fShearAngle_X*/,
+                                                                    double /*ShearAngle_Y*/,
+                                                                    const uno::Sequence< beans::PropertyValue >&
+                                                                        /*rRasterizeProperties*/ )
+        throw ( uno::RuntimeException )
+{
+    LibraryWrapper& rLib = LibraryWrapper::get();
+    uno::Reference< graphic::XGraphic > xRet;
+
+    if( mpRsvgHandle && rLib.isValid() && nWidth && nHeight && mnDefaultWidth && mnDefaultHeight )
+    {
+        cairo_surface_t* pSurface = rLib.image_surface_create( CAIRO_FORMAT_ARGB32, nWidth, nHeight );
+
+        if( pSurface && ( CAIRO_STATUS_SUCCESS == rLib.surface_status( pSurface ) ) )
+        {
+            cairo_t* pCr = rLib.create( pSurface );
+
+            if( pCr )
+            {
+                cairo_matrix_t aMatrix;
+
+                rLib.matrix_init_identity( &aMatrix );
+                rLib.matrix_scale( &aMatrix,
+                                     static_cast< double >( nWidth ) / mnDefaultWidth,
+                                     static_cast< double >( nHeight ) / mnDefaultHeight );
+                rLib.transform( pCr, &aMatrix );
+
+                if( rLib.rsvg_handle_render_cairo( mpRsvgHandle, pCr ) )
+                {
+                    xRet = implGetXGraphicFromSurface( pSurface );
+                }
+
+                rLib.destroy( pCr );
+            }
+
+            rLib.surface_destroy( pSurface );
+            OSL_ENSURE( xRet.is(), "SVG *not* rendered successfully" );
+        }
+    }
+
+    return( xRet );
+}
+
+// -----------------------------------------------------------------------------
+
+::rtl::OUString SAL_CALL Rasterizer::getImplementationName()
+    throw( uno::RuntimeException )
+{
+    return( Rasterizer_getImplementationName() );
+}
+
+// -----------------------------------------------------------------------------
+
+sal_Bool SAL_CALL Rasterizer::supportsService( const ::rtl::OUString& rServiceName )
+        throw( uno::RuntimeException )
+{
+    const uno::Sequence< ::rtl::OUString > aServices( Rasterizer_getSupportedServiceNames() );
+
+    for( sal_Int32 nService = 0; nService < aServices.getLength(); ++nService )
+    {
+        if( rServiceName == aServices[ nService ] )
+            return sal_True;
+    }
+
+    return sal_False;
+}
+
+// -----------------------------------------------------------------------------
+
+uno::Sequence< ::rtl::OUString > SAL_CALL Rasterizer::getSupportedServiceNames()
+    throw( uno::RuntimeException )
+{
+    return( Rasterizer_getSupportedServiceNames() );
+}
+
+// ------------------------------
+// - Uno instantiation function -
+// ------------------------------
+
+uno::Reference< uno::XInterface > SAL_CALL Rasterizer_createInstance( const uno::Reference< lang::XMultiServiceFactory >&  )
+{
+    return static_cast< ::cppu::OWeakObject* >( new rsvg::Rasterizer );
+}
+
+} // namespace rsvg
+} // namespace vcl
diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index 7926ee339bc7..c6cd35fed964 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -30,9 +30,9 @@
 #include "precompiled_vcl.hxx"
 
 #include <tools/debug.hxx>
+#include <tools/poly.hxx>
+#include <tools/rc.h>
 
-#include <vcl/svids.hrc>
-#include <vcl/svdata.hxx>
 #include <vcl/image.hxx>
 #include <vcl/bitmap.hxx>
 #include <vcl/bitmapex.hxx>
@@ -41,16 +41,14 @@
 #include <vcl/svapp.hxx>
 #include <vcl/dialog.hxx>
 #include <vcl/fixed.hxx>
-#include <tools/poly.hxx>
 #include <vcl/button.hxx>
-#include <vcl/window.h>
-#include <vcl/controldata.hxx>
 #include <vcl/salnativewidgets.hxx>
 #include <vcl/edit.hxx>
 
-#include <tools/rc.h>
-
-
+#include <svids.hrc>
+#include <svdata.hxx>
+#include <window.h>
+#include <controldata.hxx>
 
 // =======================================================================
 
diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx
index 9881edd62ca3..c01092749e73 100644
--- a/vcl/source/control/combobox.cxx
+++ b/vcl/source/control/combobox.cxx
@@ -28,21 +28,20 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
+
 #include <tools/table.hxx>
 #include <tools/debug.hxx>
-
 #include <tools/rc.h>
-#include <vcl/svdata.hxx>
 #include <vcl/decoview.hxx>
-#include <vcl/ilstbox.hxx>
 #include <vcl/lstbox.h>
 #include <vcl/button.hxx>
-#include <vcl/subedit.hxx>
 #include <vcl/event.hxx>
 #include <vcl/combobox.hxx>
-#include <vcl/controldata.hxx>
-
 
+#include <svdata.hxx>
+#include <subedit.hxx>
+#include <ilstbox.hxx>
+#include <controldata.hxx>
 
 // =======================================================================
 
diff --git a/vcl/source/control/ctrl.cxx b/vcl/source/control/ctrl.cxx
index 99cd6b3cba60..c9497abaef61 100644
--- a/vcl/source/control/ctrl.cxx
+++ b/vcl/source/control/ctrl.cxx
@@ -29,18 +29,19 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
+#include <comphelper/processfactory.hxx>
+
 #include <tools/rc.h>
-#include <vcl/svdata.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/event.hxx>
 #include <vcl/ctrl.hxx>
 #include <vcl/decoview.hxx>
-#include <vcl/controldata.hxx>
 #include <vcl/salnativewidgets.hxx>
-#include <vcl/textlayout.hxx>
 
-#include <comphelper/processfactory.hxx>
-#include <tools/diagnose_ex.h>
+#include <textlayout.hxx>
+#include <svdata.hxx>
+#include <controldata.hxx>
+
 
 using namespace vcl;
 
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index b8c0bacf105f..e36cdaf9a0df 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -30,20 +30,21 @@
 #include "precompiled_vcl.hxx"
 
 #include <tools/rc.h>
-#include <vcl/svdata.hxx>
 #include <vcl/decoview.hxx>
 #include <vcl/event.hxx>
 #include <vcl/cursor.hxx>
 #include <vcl/virdev.hxx>
-#include <vcl/svids.hrc>
 #include <vcl/menu.hxx>
 #include <vcl/cmdevt.h>
-#include <vcl/subedit.hxx>
 #include <vcl/edit.hxx>
 #include <vcl/svapp.hxx>
-#include <vcl/controldata.hxx>
 #include <vcl/msgbox.hxx>
-#include <vcl/window.h>
+
+#include <window.h>
+#include <svdata.hxx>
+#include <svids.hrc>
+#include <subedit.hxx>
+#include <controldata.hxx>
 
 #include <osl/mutex.hxx>
 
diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx
index 2cd6b4bc9e0c..e34aa3752895 100644
--- a/vcl/source/control/field.cxx
+++ b/vcl/source/control/field.cxx
@@ -38,12 +38,15 @@
 
 #include "tools/rc.h"
 #include "tools/resary.hxx"
-#include "vcl/svids.hrc"
+
 #include "vcl/field.hxx"
 #include "vcl/event.hxx"
 #include "vcl/svapp.hxx"
-#include "vcl/svdata.hxx"
 #include "vcl/unohelp.hxx"
+
+#include "svids.hrc"
+#include "svdata.hxx"
+
 #include "i18nutil/unicode.hxx"
 
 #include "rtl/math.hxx"
diff --git a/vcl/source/control/field2.cxx b/vcl/source/control/field2.cxx
index 65e8c8d91f82..69a3fdbdce9d 100644
--- a/vcl/source/control/field2.cxx
+++ b/vcl/source/control/field2.cxx
@@ -31,16 +31,16 @@
 #include <tools/debug.hxx>
 
 #include <tools/rc.h>
-#include <vcl/svdata.hxx>
-#include <vcl/field.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/sound.hxx>
 #include <vcl/event.hxx>
 #include <vcl/field.hxx>
-#include <i18npool/mslangid.hxx>
-
 #include <vcl/unohelp.hxx>
 
+#include <svdata.hxx>
+
+#include <i18npool/mslangid.hxx>
+
 #include <com/sun/star/lang/Locale.hpp>
 #include <com/sun/star/i18n/XCharacterClassification.hpp>
 #include <com/sun/star/i18n/KCharacterType.hpp>
diff --git a/vcl/source/control/fixed.cxx b/vcl/source/control/fixed.cxx
index 1828ded64a14..514589d0660b 100644
--- a/vcl/source/control/fixed.cxx
+++ b/vcl/source/control/fixed.cxx
@@ -28,13 +28,15 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
+
+#include "tools/rc.h"
+
 #include "vcl/decoview.hxx"
 #include "vcl/event.hxx"
 #include "vcl/fixed.hxx"
-#include "vcl/controldata.hxx"
-#include "vcl/window.h"
 
-#include "tools/rc.h"
+#include "controldata.hxx"
+#include "window.h"
 
 // =======================================================================
 
diff --git a/vcl/source/control/group.cxx b/vcl/source/control/group.cxx
index 52dd061e317e..3de86f5a2cd5 100644
--- a/vcl/source/control/group.cxx
+++ b/vcl/source/control/group.cxx
@@ -28,13 +28,13 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
-#include <vcl/event.hxx>
-#include <vcl/group.hxx>
-#include <vcl/controldata.hxx>
 
 #include <tools/rc.h>
 
+#include <vcl/event.hxx>
+#include <vcl/group.hxx>
 
+#include <controldata.hxx>
 
 // =======================================================================
 
diff --git a/vcl/source/control/ilstbox.cxx b/vcl/source/control/ilstbox.cxx
index 4a75a05f00d2..77a1650bcdd1 100644
--- a/vcl/source/control/ilstbox.cxx
+++ b/vcl/source/control/ilstbox.cxx
@@ -28,21 +28,24 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
+
 #include <tools/debug.hxx>
-#include <vcl/svdata.hxx>
+
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/event.hxx>
 #include <vcl/scrbar.hxx>
 #include <vcl/help.hxx>
 #include <vcl/lstbox.h>
-#include <vcl/ilstbox.hxx>
-#include <vcl/i18nhelp.hxx>
-#include <vcl/controldata.hxx>
 #include <vcl/unohelp.hxx>
+#include <vcl/i18nhelp.hxx>
 
-#include <com/sun/star/accessibility/XAccessible.hpp>
+#include <ilstbox.hxx>
+#include <controldata.hxx>
+#include <svdata.hxx>
 
+#include <com/sun/star/i18n/XCollator.hpp>
+#include <com/sun/star/accessibility/XAccessible.hpp>
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
 
 #include <rtl/instance.hxx>
diff --git a/vcl/source/control/longcurr.cxx b/vcl/source/control/longcurr.cxx
index e2d502026203..34048a1c60ce 100644
--- a/vcl/source/control/longcurr.cxx
+++ b/vcl/source/control/longcurr.cxx
@@ -39,9 +39,9 @@
 
 #include <vcl/event.hxx>
 #include <vcl/svapp.hxx>
-#include <vcl/svdata.hxx>
 #include <vcl/longcurr.hxx>
 
+#include <svdata.hxx>
 
 #include <unotools/localedatawrapper.hxx>
 
diff --git a/vcl/source/control/lstbox.cxx b/vcl/source/control/lstbox.cxx
index 88b583a3240d..9b31913756e4 100644
--- a/vcl/source/control/lstbox.cxx
+++ b/vcl/source/control/lstbox.cxx
@@ -30,22 +30,23 @@
 #include "precompiled_vcl.hxx"
 
 #include "tools/rc.h"
+#include "tools/debug.hxx"
+
 
-#include "vcl/svdata.hxx"
 #include "vcl/decoview.hxx"
 #include "vcl/event.hxx"
 #include "vcl/scrbar.hxx"
 #include "vcl/button.hxx"
 #include "vcl/edit.hxx"
-#include "vcl/subedit.hxx"
-#include "vcl/ilstbox.hxx"
 #include "vcl/lstbox.hxx"
 #include "vcl/combobox.hxx"
-#include "vcl/controldata.hxx"
 
-#include "tools/debug.hxx"
+#include "svdata.hxx"
+#include "controldata.hxx"
+#include "subedit.hxx"
+#include "ilstbox.hxx"
+#include "dndevdis.hxx"
 
-#include <vcl/dndevdis.hxx>
 #include <com/sun/star/datatransfer/dnd/XDropTarget.hpp>
 
 // =======================================================================
@@ -291,8 +292,15 @@ IMPL_LINK( ListBox, ImplSelectionChangedHdl, void*, n )
                 Image aImage = mpImplLB->GetEntryList()->GetEntryImage( nChanged );
                 mpImplWin->SetImage( aImage );
             }
-            mpImplWin->Invalidate();
         }
+        else
+        {
+            mpImplWin->SetItemPos( LISTBOX_ENTRY_NOTFOUND );
+            mpImplWin->SetString( ImplGetSVEmptyStr() );
+            Image aImage;
+            mpImplWin->SetImage( aImage );
+        }
+        mpImplWin->Invalidate();
     }
     return 1;
 }
diff --git a/vcl/source/control/makefile.mk b/vcl/source/control/makefile.mk
deleted file mode 100644
index de2613b1084f..000000000000
--- a/vcl/source/control/makefile.mk
+++ /dev/null
@@ -1,78 +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=ctrl
-
-.INCLUDE :	$(PRJ)$/util$/makefile.pmk
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile2.pmk
-
-.IF "$(COM)"=="ICC"
-CDEFS+=-D_STD_NO_NAMESPACE -D_VOS_NO_NAMESPACE -D_UNO_NO_NAMESPACE
-.ENDIF
-
-# --- Files --------------------------------------------------------
-
-EXCEPTIONSFILES=					\
-            $(SLO)$/button.obj		\
-            $(SLO)$/ctrl.obj		\
-            $(SLO)$/edit.obj		\
-            $(SLO)$/field2.obj		\
-            $(SLO)$/ilstbox.obj		\
-            $(SLO)$/tabctrl.obj		\
-            $(SLO)$/throbber.obj
-
-SLOFILES=	$(EXCEPTIONSFILES)      \
-            $(SLO)$/combobox.obj	\
-            $(SLO)$/field.obj		\
-            $(SLO)$/fixbrd.obj		\
-            $(SLO)$/fixed.obj		\
-            $(SLO)$/group.obj		\
-            $(SLO)$/imgctrl.obj 	\
-            $(SLO)$/longcurr.obj	\
-            $(SLO)$/lstbox.obj		\
-            $(SLO)$/morebtn.obj 	\
-            $(SLO)$/menubtn.obj 	\
-            $(SLO)$/scrbar.obj		\
-            $(SLO)$/slider.obj		\
-            $(SLO)$/spinfld.obj 	\
-            $(SLO)$/spinbtn.obj 	\
-            $(SLO)$/quickselectionengine.obj
-
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :	target.mk
-
-.INCLUDE :	$(PRJ)$/util$/target.pmk
-
diff --git a/vcl/source/control/scrbar.cxx b/vcl/source/control/scrbar.cxx
index 938b7831985c..6e87647eb8df 100644
--- a/vcl/source/control/scrbar.cxx
+++ b/vcl/source/control/scrbar.cxx
@@ -34,7 +34,8 @@
 #include "vcl/decoview.hxx"
 #include "vcl/scrbar.hxx"
 #include "vcl/timer.hxx"
-#include "vcl/svdata.hxx"
+
+#include "svdata.hxx"
 
 #include "rtl/string.hxx"
 #include "tools/rc.h"
diff --git a/vcl/source/control/spinfld.cxx b/vcl/source/control/spinfld.cxx
index 904c684b1fdd..adbb2ad0ae0a 100644
--- a/vcl/source/control/spinfld.cxx
+++ b/vcl/source/control/spinfld.cxx
@@ -30,12 +30,14 @@
 #include "precompiled_vcl.hxx"
 
 #include "tools/rc.h"
+
 #include "vcl/event.hxx"
 #include "vcl/decoview.hxx"
 #include "vcl/spin.h"
 #include "vcl/spinfld.hxx"
-#include "vcl/controldata.hxx"
-#include "vcl/svdata.hxx"
+
+#include "controldata.hxx"
+#include "svdata.hxx"
 
 // =======================================================================
 
diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx
index bb60e7e5eea9..765907721ed6 100644
--- a/vcl/source/control/tabctrl.cxx
+++ b/vcl/source/control/tabctrl.cxx
@@ -28,10 +28,10 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
-#include "tools/debug.hxx"
 
+#include "tools/debug.hxx"
 #include "tools/rc.h"
-#include "vcl/svdata.hxx"
+
 #include "vcl/svapp.hxx"
 #include "vcl/help.hxx"
 #include "vcl/event.hxx"
@@ -40,11 +40,12 @@
 #include "vcl/tabpage.hxx"
 #include "vcl/tabctrl.hxx"
 #include "vcl/controllayout.hxx"
-#include "vcl/controldata.hxx"
 #include "vcl/sound.hxx"
 #include "vcl/lstbox.hxx"
 
-#include "vcl/window.h"
+#include "controldata.hxx"
+#include "svdata.hxx"
+#include "window.h"
 
 #include <boost/unordered_map.hpp>
 #include <vector>
diff --git a/vcl/source/fontsubset/cff.cxx b/vcl/source/fontsubset/cff.cxx
index b0c17df110b7..cc6b41b0841b 100644
--- a/vcl/source/fontsubset/cff.cxx
+++ b/vcl/source/fontsubset/cff.cxx
@@ -33,7 +33,8 @@
 #include <cstring>
 #include <assert.h>
 
-#include <vcl/fontsubset.hxx>
+#include <fontsubset.hxx>
+
 #include <vcl/strhelper.hxx>
 
 //#define IGNORE_HINTS
diff --git a/vcl/source/fontsubset/fontsubset.cxx b/vcl/source/fontsubset/fontsubset.cxx
index 889d46efe373..494d739010da 100644
--- a/vcl/source/fontsubset/fontsubset.cxx
+++ b/vcl/source/fontsubset/fontsubset.cxx
@@ -29,10 +29,11 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-#include <vcl/fontsubset.hxx>
-#include <sft.hxx>
 #include <tools/debug.hxx>
 
+#include <fontsubset.hxx>
+#include <sft.hxx>
+
 // ====================================================================
 
 FontSubsetInfo::FontSubsetInfo()
diff --git a/vcl/source/fontsubset/makefile.mk b/vcl/source/fontsubset/makefile.mk
deleted file mode 100644
index 25dde00af521..000000000000
--- a/vcl/source/fontsubset/makefile.mk
+++ /dev/null
@@ -1,51 +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=fontsubset
-
-# --- Settings -----------------------------------------------------
-ENABLE_EXCEPTIONS=true
-
-.INCLUDE :  settings.mk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES=\
-    $(SLO)$/list.obj		\
-    $(SLO)$/sft.obj			\
-    $(SLO)$/cff.obj			\
-    $(SLO)$/fontsubset.obj	\
-    $(SLO)$/xlat.obj		\
-    $(SLO)$/ttcr.obj		\
-    $(SLO)$/gsub.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
diff --git a/vcl/source/gdi/bitmap.cxx b/vcl/source/gdi/bitmap.cxx
index a0b48f4ee124..e2ab338e66b0 100644
--- a/vcl/source/gdi/bitmap.cxx
+++ b/vcl/source/gdi/bitmap.cxx
@@ -28,20 +28,22 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
+
 #include <rtl/crc.h>
-#include <vcl/salbtype.hxx>
 #include <tools/stream.hxx>
-#include <vcl/bmpacc.hxx>
 #include <tools/poly.hxx>
-#include <vcl/outdev.hxx>
-#include <vcl/impbmp.hxx>
-#include <vcl/salbmp.hxx>
 #include <tools/rc.h>
+#include <vcl/salbtype.hxx>
+#include <vcl/bmpacc.hxx>
+#include <vcl/outdev.hxx>
 #include <vcl/bitmap.hxx>
 #include <vcl/bitmapex.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/image.hxx>
 
+#include <impbmp.hxx>
+#include <salbmp.hxx>
+
 // ----------
 // - Bitmap -
 // ----------
diff --git a/vcl/source/gdi/bitmap3.cxx b/vcl/source/gdi/bitmap3.cxx
index c2d929ea4fa0..0ae8e63d2519 100644
--- a/vcl/source/gdi/bitmap3.cxx
+++ b/vcl/source/gdi/bitmap3.cxx
@@ -30,13 +30,15 @@
 #include "precompiled_vcl.hxx"
 
 #include <stdlib.h>
+
 #include <vcl/bmpacc.hxx>
-#include <vcl/impoct.hxx>
 #include <vcl/octree.hxx>
-#include <impvect.hxx>
 #include <vcl/bitmapex.hxx>
 #include <vcl/bitmap.hxx>
 
+#include <impoct.hxx>
+#include <impvect.hxx>
+
 // -----------
 // - Defines -
 // -----------
diff --git a/vcl/source/gdi/bitmapex.cxx b/vcl/source/gdi/bitmapex.cxx
index d1f130d9d1cc..2e77b666f8c8 100644
--- a/vcl/source/gdi/bitmapex.cxx
+++ b/vcl/source/gdi/bitmapex.cxx
@@ -28,22 +28,27 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
+
 #include <ctype.h>
+
 #include <rtl/crc.h>
-#include <vcl/salbtype.hxx>
+
 #include <tools/stream.hxx>
 #include <tools/debug.hxx>
+#include <tools/rc.h>
+
+#include <vcl/salbtype.hxx>
 #include <vcl/outdev.hxx>
 #include <vcl/alpha.hxx>
-#include <vcl/image.h>
 #include <vcl/bitmapex.hxx>
 #include <vcl/pngread.hxx>
-#include <vcl/impimagetree.hxx>
-#include <tools/rc.h>
 #include <vcl/svapp.hxx>
 #include <vcl/bmpacc.hxx>
 #include <vcl/virdev.hxx>
 
+#include <image.h>
+#include <impimagetree.hxx>
+
 // ------------
 // - BitmapEx -
 // ------------
diff --git a/vcl/source/gdi/bmpacc.cxx b/vcl/source/gdi/bmpacc.cxx
index 0762821c3267..03b29fcbc965 100644
--- a/vcl/source/gdi/bmpacc.cxx
+++ b/vcl/source/gdi/bmpacc.cxx
@@ -28,10 +28,13 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
+
 #include <vcl/salbtype.hxx>
-#include <vcl/impbmp.hxx>
 #include <vcl/bitmap.hxx>
 #include <vcl/bmpacc.hxx>
+
+#include <impbmp.hxx>
+
 #include <string.h>
 
 // --------------------
diff --git a/vcl/source/gdi/bmpacc3.cxx b/vcl/source/gdi/bmpacc3.cxx
index 5e87d680e9c0..39d57a05cb84 100644
--- a/vcl/source/gdi/bmpacc3.cxx
+++ b/vcl/source/gdi/bmpacc3.cxx
@@ -28,12 +28,15 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
+
+#include <tools/poly.hxx>
+
 #include <vcl/salbtype.hxx>
 #include <vcl/bitmap.hxx>
-#include <tools/poly.hxx>
 #include <vcl/region.hxx>
 #include <vcl/bmpacc.hxx>
-#include <vcl/bmpfast.hxx>
+
+#include <bmpfast.hxx>
 
 // ---------------------
 // - BitmapWriteAccess -
diff --git a/vcl/source/gdi/bmpfast.cxx b/vcl/source/gdi/bmpfast.cxx
index 8fc5188c9204..e410e0ee25e8 100644
--- a/vcl/source/gdi/bmpfast.cxx
+++ b/vcl/source/gdi/bmpfast.cxx
@@ -29,7 +29,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-#include <vcl/bmpfast.hxx>
+#include <bmpfast.hxx>
 
 #ifndef NO_OPTIMIZED_BITMAP_ACCESS
 
diff --git a/vcl/source/gdi/configsettings.cxx b/vcl/source/gdi/configsettings.cxx
index ff701ab640fa..1ddc801c8329 100644
--- a/vcl/source/gdi/configsettings.cxx
+++ b/vcl/source/gdi/configsettings.cxx
@@ -30,7 +30,9 @@
 #include "precompiled_vcl.hxx"
 
 #include <vcl/configsettings.hxx>
-#include <vcl/svdata.hxx>
+
+#include <svdata.hxx>
+
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/beans/PropertyValue.hpp>
diff --git a/vcl/source/gdi/cvtgrf.cxx b/vcl/source/gdi/cvtgrf.cxx
index 261781ebcf50..6d3b60777120 100644
--- a/vcl/source/gdi/cvtgrf.cxx
+++ b/vcl/source/gdi/cvtgrf.cxx
@@ -29,12 +29,12 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-#include <svsys.h>
 #include <vcl/metaact.hxx>
-#include <vcl/salinst.hxx>
-#include <vcl/svdata.hxx>
 #include <vcl/cvtgrf.hxx>
 
+#include <salinst.hxx>
+#include <svdata.hxx>
+
 // --------------
 // - Callback   -
 // --------------
diff --git a/vcl/source/gdi/font.cxx b/vcl/source/gdi/font.cxx
index 03708f865c96..8ed39ea10fed 100644
--- a/vcl/source/gdi/font.cxx
+++ b/vcl/source/gdi/font.cxx
@@ -29,15 +29,18 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-#include "sft.hxx"
+#include "unotools/fontcfg.hxx"
 
 #include "tools/stream.hxx"
 #include "tools/vcompat.hxx"
 #include "tools/debug.hxx"
+
 #include "vcl/font.hxx"
-#include "vcl/impfont.hxx"
-#include "vcl/outfont.hxx"
-#include "unotools/fontcfg.hxx"
+
+#include "impfont.hxx"
+#include "outfont.hxx"
+#include "sft.hxx"
+
 #include <sal/macros.h>
 
 #include <algorithm>
@@ -876,9 +879,6 @@ namespace
     bool identifyTrueTypeFont( const void* i_pBuffer, sal_uInt32 i_nSize, Font& o_rResult )
     {
         bool bResult = false;
-// FIXME: This is HACK. We do not build psprint's part on aqua...
-// How to solve this?
-#ifndef QUARTZ
         TrueTypeFont* pTTF = NULL;
         if( OpenTTFontBuffer( const_cast<void*>(i_pBuffer), i_nSize, 0, &pTTF ) == SF_OK )
         {
@@ -952,7 +952,6 @@ namespace
             // success
             bResult = true;
         }
-#endif
         return bResult;
     }
 
diff --git a/vcl/source/gdi/gdimtf.cxx b/vcl/source/gdi/gdimtf.cxx
index 20f0731f19d2..984386028cdc 100644
--- a/vcl/source/gdi/gdimtf.cxx
+++ b/vcl/source/gdi/gdimtf.cxx
@@ -37,18 +37,20 @@
 #include <vcl/window.hxx>
 #include <vcl/cvtsvm.hxx>
 #include <vcl/virdev.hxx>
-#include <vcl/salbmp.hxx>
 #include <vcl/svapp.hxx>
-#include <vcl/svdata.hxx>
-#include <vcl/salinst.hxx>
 #include <vcl/gdimtf.hxx>
 #include <vcl/graphictools.hxx>
 #include <vcl/canvastools.hxx>
 #include <vcl/unohelp.hxx>
 
+#include <salbmp.hxx>
+#include <salinst.hxx>
+#include <svdata.hxx>
+
 #include <com/sun/star/beans/XFastPropertySet.hpp>
-#include <com/sun/star/rendering/XCanvas.hpp>
 #include <com/sun/star/rendering/MtfRenderer.hpp>
+#include <com/sun/star/rendering/XBitmapCanvas.hpp>
+#include <com/sun/star/rendering/XCanvas.hpp>
 #include <comphelper/processfactory.hxx>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
@@ -1745,6 +1747,15 @@ void GDIMetaFile::Rotate( long nAngle10 )
                 }
                 break;
 
+                case( META_RENDERGRAPHIC_ACTION ):
+                {
+                    OSL_TRACE( "Rotate not supported for RenderGraphic MetaActions yet" );
+
+                    pAction->Duplicate();
+                    aMtf.AddAction( pAction );
+                }
+                break;
+
                 default:
                 {
                     pAction->Execute( &aMapVDev );
@@ -1809,363 +1820,371 @@ Rectangle GDIMetaFile::GetBoundRect( OutputDevice& i_rReference )
         switch( nActionType )
         {
         case( META_PIXEL_ACTION ):
-            {
-                MetaPixelAction* pAct = (MetaPixelAction*) pAction;
-                ImplActionBounds( aBound,
-                                 Rectangle( aMapVDev.LogicToLogic( pAct->GetPoint(), aMapVDev.GetMapMode(), GetPrefMapMode() ),
-                                           aMapVDev.PixelToLogic( Size( 1, 1 ), GetPrefMapMode() ) ),
-                                 aClipStack );
-            }
-            break;
+        {
+            MetaPixelAction* pAct = (MetaPixelAction*) pAction;
+            ImplActionBounds( aBound,
+                             Rectangle( aMapVDev.LogicToLogic( pAct->GetPoint(), aMapVDev.GetMapMode(), GetPrefMapMode() ),
+                                       aMapVDev.PixelToLogic( Size( 1, 1 ), GetPrefMapMode() ) ),
+                             aClipStack );
+        }
+        break;
 
         case( META_POINT_ACTION ):
-            {
-                MetaPointAction* pAct = (MetaPointAction*) pAction;
-                ImplActionBounds( aBound,
-                                 Rectangle( aMapVDev.LogicToLogic( pAct->GetPoint(), aMapVDev.GetMapMode(), GetPrefMapMode() ),
-                                           aMapVDev.PixelToLogic( Size( 1, 1 ), GetPrefMapMode() ) ),
-                                 aClipStack );
-            }
-            break;
+        {
+            MetaPointAction* pAct = (MetaPointAction*) pAction;
+            ImplActionBounds( aBound,
+                             Rectangle( aMapVDev.LogicToLogic( pAct->GetPoint(), aMapVDev.GetMapMode(), GetPrefMapMode() ),
+                                       aMapVDev.PixelToLogic( Size( 1, 1 ), GetPrefMapMode() ) ),
+                             aClipStack );
+        }
+        break;
 
         case( META_LINE_ACTION ):
-            {
-                MetaLineAction* pAct = (MetaLineAction*) pAction;
-                Point aP1( pAct->GetStartPoint() ), aP2( pAct->GetEndPoint() );
-                Rectangle aRect( aP1, aP2 );
-                aRect.Justify();
-                ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack );
-            }
-            break;
+        {
+            MetaLineAction* pAct = (MetaLineAction*) pAction;
+            Point aP1( pAct->GetStartPoint() ), aP2( pAct->GetEndPoint() );
+            Rectangle aRect( aP1, aP2 );
+            aRect.Justify();
+            ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack );
+        }
+        break;
 
         case( META_RECT_ACTION ):
-            {
-                MetaRectAction* pAct = (MetaRectAction*) pAction;
-                ImplActionBounds( aBound, aMapVDev.LogicToLogic( pAct->GetRect(), aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack );
-            }
-            break;
+        {
+            MetaRectAction* pAct = (MetaRectAction*) pAction;
+            ImplActionBounds( aBound, aMapVDev.LogicToLogic( pAct->GetRect(), aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack );
+        }
+        break;
 
         case( META_ROUNDRECT_ACTION ):
-            {
-                MetaRoundRectAction*    pAct = (MetaRoundRectAction*) pAction;
-                ImplActionBounds( aBound, aMapVDev.LogicToLogic( pAct->GetRect(), aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack );
-            }
-            break;
+        {
+            MetaRoundRectAction*    pAct = (MetaRoundRectAction*) pAction;
+            ImplActionBounds( aBound, aMapVDev.LogicToLogic( pAct->GetRect(), aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack );
+        }
+        break;
 
         case( META_ELLIPSE_ACTION ):
-            {
-                MetaEllipseAction*      pAct = (MetaEllipseAction*) pAction;
-                ImplActionBounds( aBound, aMapVDev.LogicToLogic( pAct->GetRect(), aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack );
-            }
-            break;
+        {
+            MetaEllipseAction*      pAct = (MetaEllipseAction*) pAction;
+            ImplActionBounds( aBound, aMapVDev.LogicToLogic( pAct->GetRect(), aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack );
+        }
+        break;
 
         case( META_ARC_ACTION ):
-            {
-                MetaArcAction*  pAct = (MetaArcAction*) pAction;
-                // FIXME: this is imprecise
-                // e.g. for small arcs the whole rectangle is WAY too large
-                ImplActionBounds( aBound, aMapVDev.LogicToLogic( pAct->GetRect(), aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack );
-            }
-            break;
+        {
+            MetaArcAction*  pAct = (MetaArcAction*) pAction;
+            // FIXME: this is imprecise
+            // e.g. for small arcs the whole rectangle is WAY too large
+            ImplActionBounds( aBound, aMapVDev.LogicToLogic( pAct->GetRect(), aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack );
+        }
+        break;
 
         case( META_PIE_ACTION ):
-            {
-                MetaPieAction*  pAct = (MetaPieAction*) pAction;
-                // FIXME: this is imprecise
-                // e.g. for small arcs the whole rectangle is WAY too large
-                ImplActionBounds( aBound, aMapVDev.LogicToLogic( pAct->GetRect(), aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack );
-            }
-            break;
+        {
+            MetaPieAction*  pAct = (MetaPieAction*) pAction;
+            // FIXME: this is imprecise
+            // e.g. for small arcs the whole rectangle is WAY too large
+            ImplActionBounds( aBound, aMapVDev.LogicToLogic( pAct->GetRect(), aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack );
+        }
+        break;
 
         case( META_CHORD_ACTION ):
-            {
-                MetaChordAction*    pAct = (MetaChordAction*) pAction;
-                // FIXME: this is imprecise
-                // e.g. for small arcs the whole rectangle is WAY too large
-                ImplActionBounds( aBound, aMapVDev.LogicToLogic( pAct->GetRect(), aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack );
-            }
-            break;
+        {
+            MetaChordAction*    pAct = (MetaChordAction*) pAction;
+            // FIXME: this is imprecise
+            // e.g. for small arcs the whole rectangle is WAY too large
+            ImplActionBounds( aBound, aMapVDev.LogicToLogic( pAct->GetRect(), aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack );
+        }
+        break;
 
         case( META_POLYLINE_ACTION ):
-            {
-                MetaPolyLineAction* pAct = (MetaPolyLineAction*) pAction;
-                Rectangle aRect( pAct->GetPolygon().GetBoundRect() );
-                ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack );
-            }
-            break;
+        {
+            MetaPolyLineAction* pAct = (MetaPolyLineAction*) pAction;
+            Rectangle aRect( pAct->GetPolygon().GetBoundRect() );
+            ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack );
+        }
+        break;
 
         case( META_POLYGON_ACTION ):
-            {
-                MetaPolygonAction* pAct = (MetaPolygonAction*) pAction;
-                Rectangle aRect( pAct->GetPolygon().GetBoundRect() );
-                ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack );
-            }
-            break;
+        {
+            MetaPolygonAction* pAct = (MetaPolygonAction*) pAction;
+            Rectangle aRect( pAct->GetPolygon().GetBoundRect() );
+            ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack );
+        }
+        break;
 
         case( META_POLYPOLYGON_ACTION ):
-            {
-                MetaPolyPolygonAction* pAct = (MetaPolyPolygonAction*) pAction;
-                Rectangle aRect( pAct->GetPolyPolygon().GetBoundRect() );
-                ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack );
-            }
-            break;
+        {
+            MetaPolyPolygonAction* pAct = (MetaPolyPolygonAction*) pAction;
+            Rectangle aRect( pAct->GetPolyPolygon().GetBoundRect() );
+            ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack );
+        }
+        break;
 
         case( META_TEXT_ACTION ):
-            {
-                MetaTextAction* pAct = (MetaTextAction*) pAction;
-                Rectangle aRect;
-                // hdu said base = index
-                aMapVDev.GetTextBoundRect( aRect, pAct->GetText(), pAct->GetIndex(), pAct->GetIndex(), pAct->GetLen() );
-                Point aPt( pAct->GetPoint() );
-                aRect.Move( aPt.X(), aPt.Y() );
-                ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack );
-            }
-            break;
+        {
+            MetaTextAction* pAct = (MetaTextAction*) pAction;
+            Rectangle aRect;
+            // hdu said base = index
+            aMapVDev.GetTextBoundRect( aRect, pAct->GetText(), pAct->GetIndex(), pAct->GetIndex(), pAct->GetLen() );
+            Point aPt( pAct->GetPoint() );
+            aRect.Move( aPt.X(), aPt.Y() );
+            ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack );
+        }
+        break;
 
         case( META_TEXTARRAY_ACTION ):
-            {
-                MetaTextArrayAction* pAct = (MetaTextArrayAction*) pAction;
-                Rectangle aRect;
-                // hdu said base = index
-                aMapVDev.GetTextBoundRect( aRect, pAct->GetText(), pAct->GetIndex(), pAct->GetIndex(), pAct->GetLen(),
-                                           0, pAct->GetDXArray() );
-                Point aPt( pAct->GetPoint() );
-                aRect.Move( aPt.X(), aPt.Y() );
-                ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack );
-            }
-            break;
+        {
+            MetaTextArrayAction* pAct = (MetaTextArrayAction*) pAction;
+            Rectangle aRect;
+            // hdu said base = index
+            aMapVDev.GetTextBoundRect( aRect, pAct->GetText(), pAct->GetIndex(), pAct->GetIndex(), pAct->GetLen(),
+                                       0, pAct->GetDXArray() );
+            Point aPt( pAct->GetPoint() );
+            aRect.Move( aPt.X(), aPt.Y() );
+            ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack );
+        }
+        break;
 
         case( META_STRETCHTEXT_ACTION ):
-            {
-                MetaStretchTextAction* pAct = (MetaStretchTextAction*) pAction;
-                Rectangle aRect;
-                // hdu said base = index
-                aMapVDev.GetTextBoundRect( aRect, pAct->GetText(), pAct->GetIndex(), pAct->GetIndex(), pAct->GetLen(),
-                                           pAct->GetWidth(), NULL );
-                Point aPt( pAct->GetPoint() );
-                aRect.Move( aPt.X(), aPt.Y() );
-                ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack );
-            }
-            break;
+        {
+            MetaStretchTextAction* pAct = (MetaStretchTextAction*) pAction;
+            Rectangle aRect;
+            // hdu said base = index
+            aMapVDev.GetTextBoundRect( aRect, pAct->GetText(), pAct->GetIndex(), pAct->GetIndex(), pAct->GetLen(),
+                                       pAct->GetWidth(), NULL );
+            Point aPt( pAct->GetPoint() );
+            aRect.Move( aPt.X(), aPt.Y() );
+            ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack );
+        }
+        break;
 
         case( META_TEXTLINE_ACTION ):
-            {
-                MetaTextLineAction* pAct = (MetaTextLineAction*) pAction;
-                // measure a test string to get ascend and descent right
-                static const sal_Unicode pStr[] = { 0xc4, 0x67, 0 };
-                String aStr( pStr );
-
-                Rectangle aRect;
-                aMapVDev.GetTextBoundRect( aRect, aStr, 0, 0, aStr.Len(), 0, NULL );
-                Point aPt( pAct->GetStartPoint() );
-                aRect.Move( aPt.X(), aPt.Y() );
-                aRect.Right() = aRect.Left() + pAct->GetWidth();
-                ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack );
-            }
-            break;
+        {
+            MetaTextLineAction* pAct = (MetaTextLineAction*) pAction;
+            // measure a test string to get ascend and descent right
+            static const sal_Unicode pStr[] = { 0xc4, 0x67, 0 };
+            String aStr( pStr );
+
+            Rectangle aRect;
+            aMapVDev.GetTextBoundRect( aRect, aStr, 0, 0, aStr.Len(), 0, NULL );
+            Point aPt( pAct->GetStartPoint() );
+            aRect.Move( aPt.X(), aPt.Y() );
+            aRect.Right() = aRect.Left() + pAct->GetWidth();
+            ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack );
+        }
+        break;
 
         case( META_BMPSCALE_ACTION ):
-            {
-                MetaBmpScaleAction* pAct = (MetaBmpScaleAction*) pAction;
-                Rectangle aRect( pAct->GetPoint(), pAct->GetSize() );
-                ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack );
-            }
-            break;
+        {
+            MetaBmpScaleAction* pAct = (MetaBmpScaleAction*) pAction;
+            Rectangle aRect( pAct->GetPoint(), pAct->GetSize() );
+            ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack );
+        }
+        break;
 
         case( META_BMPSCALEPART_ACTION ):
-            {
-                MetaBmpScalePartAction* pAct = (MetaBmpScalePartAction*) pAction;
-                Rectangle aRect( pAct->GetDestPoint(), pAct->GetDestSize() );
-                ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack );
-            }
-            break;
+        {
+            MetaBmpScalePartAction* pAct = (MetaBmpScalePartAction*) pAction;
+            Rectangle aRect( pAct->GetDestPoint(), pAct->GetDestSize() );
+            ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack );
+        }
+        break;
 
         case( META_BMPEXSCALE_ACTION ):
-            {
-                MetaBmpExScaleAction*   pAct = (MetaBmpExScaleAction*) pAction;
-                Rectangle aRect( pAct->GetPoint(), pAct->GetSize() );
-                ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack );
-            }
-            break;
+        {
+            MetaBmpExScaleAction*   pAct = (MetaBmpExScaleAction*) pAction;
+            Rectangle aRect( pAct->GetPoint(), pAct->GetSize() );
+            ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack );
+        }
+        break;
 
         case( META_BMPEXSCALEPART_ACTION ):
-            {
-                MetaBmpExScalePartAction*   pAct = (MetaBmpExScalePartAction*) pAction;
-                Rectangle aRect( pAct->GetDestPoint(), pAct->GetDestSize() );
-                ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack );
-            }
-            break;
+        {
+            MetaBmpExScalePartAction*   pAct = (MetaBmpExScalePartAction*) pAction;
+            Rectangle aRect( pAct->GetDestPoint(), pAct->GetDestSize() );
+            ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack );
+        }
+        break;
 
         case( META_GRADIENT_ACTION ):
-            {
-                MetaGradientAction* pAct = (MetaGradientAction*) pAction;
-                Rectangle aRect( pAct->GetRect() );
-                ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack );
-            }
-            break;
+        {
+            MetaGradientAction* pAct = (MetaGradientAction*) pAction;
+            Rectangle aRect( pAct->GetRect() );
+            ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack );
+        }
+        break;
 
         case( META_GRADIENTEX_ACTION ):
-            {
-                MetaGradientExAction* pAct = (MetaGradientExAction*) pAction;
-                Rectangle aRect( pAct->GetPolyPolygon().GetBoundRect() );
-                ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack );
-            }
-            break;
+        {
+            MetaGradientExAction* pAct = (MetaGradientExAction*) pAction;
+            Rectangle aRect( pAct->GetPolyPolygon().GetBoundRect() );
+            ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack );
+        }
+        break;
 
         case( META_COMMENT_ACTION ):
-            {
-                // nothing to do
-            };
-            break;
+        {
+            // nothing to do
+        };
+        break;
 
         case( META_HATCH_ACTION ):
-            {
-                MetaHatchAction*    pAct = (MetaHatchAction*) pAction;
-                Rectangle aRect( pAct->GetPolyPolygon().GetBoundRect() );
-                ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack );
-            }
-            break;
+        {
+            MetaHatchAction*    pAct = (MetaHatchAction*) pAction;
+            Rectangle aRect( pAct->GetPolyPolygon().GetBoundRect() );
+            ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack );
+        }
+        break;
 
         case( META_TRANSPARENT_ACTION ):
-            {
-                MetaTransparentAction* pAct = (MetaTransparentAction*) pAction;
-                Rectangle aRect( pAct->GetPolyPolygon().GetBoundRect() );
-                ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack );
-            }
-            break;
+        {
+            MetaTransparentAction* pAct = (MetaTransparentAction*) pAction;
+            Rectangle aRect( pAct->GetPolyPolygon().GetBoundRect() );
+            ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack );
+        }
+        break;
 
         case( META_FLOATTRANSPARENT_ACTION ):
-            {
-                MetaFloatTransparentAction* pAct = (MetaFloatTransparentAction*) pAction;
-                GDIMetaFile                 aTransMtf( pAct->GetGDIMetaFile() );
-                // get the bound rect of the contained metafile
-                Rectangle aRect( aTransMtf.GetBoundRect( i_rReference ) );
-                // scale the rect now on the assumption that the correct top left of the metafile
-                // (not its bounds !) is (0,0)
-                Size aPSize( aTransMtf.GetPrefSize() );
-                aPSize = aMapVDev.LogicToLogic( aPSize, aTransMtf.GetPrefMapMode(), aMapVDev.GetMapMode() );
-                Size aActSize( pAct->GetSize() );
-                double fX = double(aActSize.Width())/double(aPSize.Width());
-                double fY = double(aActSize.Height())/double(aPSize.Height());
-                aRect.Left()   = long(double(aRect.Left())*fX);
-                aRect.Right()  = long(double(aRect.Right())*fX);
-                aRect.Top()    = long(double(aRect.Top())*fY);
-                aRect.Bottom() = long(double(aRect.Bottom())*fY);
-
-                // transform the rect to current VDev state
-                aRect = aMapVDev.LogicToLogic( aRect, aTransMtf.GetPrefMapMode(), aMapVDev.GetMapMode() );
-
-                ImplActionBounds( aBound, aRect, aClipStack );
-            }
-            break;
+        {
+            MetaFloatTransparentAction* pAct = (MetaFloatTransparentAction*) pAction;
+            GDIMetaFile                 aTransMtf( pAct->GetGDIMetaFile() );
+            // get the bound rect of the contained metafile
+            Rectangle aRect( aTransMtf.GetBoundRect( i_rReference ) );
+            // scale the rect now on the assumption that the correct top left of the metafile
+            // (not its bounds !) is (0,0)
+            Size aPSize( aTransMtf.GetPrefSize() );
+            aPSize = aMapVDev.LogicToLogic( aPSize, aTransMtf.GetPrefMapMode(), aMapVDev.GetMapMode() );
+            Size aActSize( pAct->GetSize() );
+            double fX = double(aActSize.Width())/double(aPSize.Width());
+            double fY = double(aActSize.Height())/double(aPSize.Height());
+            aRect.Left()   = long(double(aRect.Left())*fX);
+            aRect.Right()  = long(double(aRect.Right())*fX);
+            aRect.Top()    = long(double(aRect.Top())*fY);
+            aRect.Bottom() = long(double(aRect.Bottom())*fY);
+
+            // transform the rect to current VDev state
+            aRect = aMapVDev.LogicToLogic( aRect, aTransMtf.GetPrefMapMode(), aMapVDev.GetMapMode() );
+
+            ImplActionBounds( aBound, aRect, aClipStack );
+        }
+        break;
 
         case( META_EPS_ACTION ):
-            {
-                MetaEPSAction*  pAct = (MetaEPSAction*) pAction;
-                Rectangle aRect( pAct->GetPoint(), pAct->GetSize() );
-                ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack );
-            }
-            break;
+        {
+            MetaEPSAction*  pAct = (MetaEPSAction*) pAction;
+            Rectangle aRect( pAct->GetPoint(), pAct->GetSize() );
+            ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack );
+        }
+        break;
 
         case( META_CLIPREGION_ACTION ):
-            {
-                MetaClipRegionAction* pAct = (MetaClipRegionAction*) pAction;
-                if( pAct->IsClipping() )
-                    aClipStack.back() = aMapVDev.LogicToLogic( pAct->GetRegion().GetBoundRect(), aMapVDev.GetMapMode(), GetPrefMapMode() );
-                else
-                    aClipStack.back() = Rectangle();
-            }
-            break;
+        {
+            MetaClipRegionAction* pAct = (MetaClipRegionAction*) pAction;
+            if( pAct->IsClipping() )
+                aClipStack.back() = aMapVDev.LogicToLogic( pAct->GetRegion().GetBoundRect(), aMapVDev.GetMapMode(), GetPrefMapMode() );
+            else
+                aClipStack.back() = Rectangle();
+        }
+        break;
 
         case( META_ISECTRECTCLIPREGION_ACTION ):
-            {
-                MetaISectRectClipRegionAction* pAct = (MetaISectRectClipRegionAction*) pAction;
-                Rectangle aRect( aMapVDev.LogicToLogic( pAct->GetRect(), aMapVDev.GetMapMode(), GetPrefMapMode() ) );
-                if( aClipStack.back().IsEmpty() )
-                    aClipStack.back() = aRect;
-                else
-                    aClipStack.back().Intersection( aRect );
-            }
-            break;
+        {
+            MetaISectRectClipRegionAction* pAct = (MetaISectRectClipRegionAction*) pAction;
+            Rectangle aRect( aMapVDev.LogicToLogic( pAct->GetRect(), aMapVDev.GetMapMode(), GetPrefMapMode() ) );
+            if( aClipStack.back().IsEmpty() )
+                aClipStack.back() = aRect;
+            else
+                aClipStack.back().Intersection( aRect );
+        }
+        break;
 
         case( META_ISECTREGIONCLIPREGION_ACTION ):
-            {
-                MetaISectRegionClipRegionAction*    pAct = (MetaISectRegionClipRegionAction*) pAction;
-                Rectangle aRect( aMapVDev.LogicToLogic( pAct->GetRegion().GetBoundRect(), aMapVDev.GetMapMode(), GetPrefMapMode() ) );
-                if( aClipStack.back().IsEmpty() )
-                    aClipStack.back() = aRect;
-                else
-                    aClipStack.back().Intersection( aRect );
-            }
-            break;
+        {
+            MetaISectRegionClipRegionAction*    pAct = (MetaISectRegionClipRegionAction*) pAction;
+            Rectangle aRect( aMapVDev.LogicToLogic( pAct->GetRegion().GetBoundRect(), aMapVDev.GetMapMode(), GetPrefMapMode() ) );
+            if( aClipStack.back().IsEmpty() )
+                aClipStack.back() = aRect;
+            else
+                aClipStack.back().Intersection( aRect );
+        }
+        break;
 
         case( META_BMP_ACTION ):
-            {
-                MetaBmpAction* pAct = (MetaBmpAction*) pAction;
-                Rectangle aRect( pAct->GetPoint(), aMapVDev.PixelToLogic( pAct->GetBitmap().GetSizePixel() ) );
-                ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack );
-            }
-            break;
+        {
+            MetaBmpAction* pAct = (MetaBmpAction*) pAction;
+            Rectangle aRect( pAct->GetPoint(), aMapVDev.PixelToLogic( pAct->GetBitmap().GetSizePixel() ) );
+            ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack );
+        }
+        break;
 
         case( META_BMPEX_ACTION ):
-            {
-                MetaBmpExAction* pAct = (MetaBmpExAction*) pAction;
-                Rectangle aRect( pAct->GetPoint(), aMapVDev.PixelToLogic( pAct->GetBitmapEx().GetSizePixel() ) );
-                ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack );
-            }
-            break;
+        {
+            MetaBmpExAction* pAct = (MetaBmpExAction*) pAction;
+            Rectangle aRect( pAct->GetPoint(), aMapVDev.PixelToLogic( pAct->GetBitmapEx().GetSizePixel() ) );
+            ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack );
+        }
+        break;
 
         case( META_MASK_ACTION ):
-            {
-                MetaMaskAction* pAct = (MetaMaskAction*) pAction;
-                Rectangle aRect( pAct->GetPoint(), aMapVDev.PixelToLogic( pAct->GetBitmap().GetSizePixel() ) );
-                ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack );
-            }
-            break;
+        {
+            MetaMaskAction* pAct = (MetaMaskAction*) pAction;
+            Rectangle aRect( pAct->GetPoint(), aMapVDev.PixelToLogic( pAct->GetBitmap().GetSizePixel() ) );
+            ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack );
+        }
+        break;
 
         case( META_MASKSCALE_ACTION ):
-            {
-                MetaMaskScalePartAction* pAct = (MetaMaskScalePartAction*) pAction;
-                Rectangle aRect( pAct->GetDestPoint(), pAct->GetDestSize() );
-                ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack );
-            }
-            break;
+        {
+            MetaMaskScalePartAction* pAct = (MetaMaskScalePartAction*) pAction;
+            Rectangle aRect( pAct->GetDestPoint(), pAct->GetDestSize() );
+            ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack );
+        }
+        break;
 
         case( META_MASKSCALEPART_ACTION ):
-            {
-                MetaMaskScalePartAction* pAct = (MetaMaskScalePartAction*) pAction;
-                Rectangle aRect( pAct->GetDestPoint(), pAct->GetDestSize() );
-                ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack );
-            }
-            break;
+        {
+            MetaMaskScalePartAction* pAct = (MetaMaskScalePartAction*) pAction;
+            Rectangle aRect( pAct->GetDestPoint(), pAct->GetDestSize() );
+            ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack );
+        }
+        break;
 
         case( META_WALLPAPER_ACTION ):
-            {
-                MetaWallpaperAction* pAct = (MetaWallpaperAction*) pAction;
-                Rectangle aRect( pAct->GetRect() );
-                ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack );
-            }
-            break;
+        {
+            MetaWallpaperAction* pAct = (MetaWallpaperAction*) pAction;
+            Rectangle aRect( pAct->GetRect() );
+            ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack );
+        }
+        break;
 
         case( META_TEXTRECT_ACTION ):
-            {
-                MetaTextRectAction* pAct = (MetaTextRectAction*) pAction;
-                Rectangle aRect( pAct->GetRect() );
-                ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack );
-            }
-            break;
+        {
+            MetaTextRectAction* pAct = (MetaTextRectAction*) pAction;
+            Rectangle aRect( pAct->GetRect() );
+            ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack );
+        }
+        break;
 
         case( META_MOVECLIPREGION_ACTION ):
+        {
+            MetaMoveClipRegionAction* pAct = (MetaMoveClipRegionAction*) pAction;
+            if( ! aClipStack.back().IsEmpty() )
             {
-                MetaMoveClipRegionAction* pAct = (MetaMoveClipRegionAction*) pAction;
-                if( ! aClipStack.back().IsEmpty() )
-                {
-                    Size aDelta( pAct->GetHorzMove(), pAct->GetVertMove() );
-                    aDelta = aMapVDev.LogicToLogic( aDelta, aMapVDev.GetMapMode(), GetPrefMapMode() );
-                    aClipStack.back().Move( aDelta.Width(), aDelta.Width() );
-                }
+                Size aDelta( pAct->GetHorzMove(), pAct->GetVertMove() );
+                aDelta = aMapVDev.LogicToLogic( aDelta, aMapVDev.GetMapMode(), GetPrefMapMode() );
+                aClipStack.back().Move( aDelta.Width(), aDelta.Width() );
             }
-            break;
+        }
+        break;
+
+        case( META_RENDERGRAPHIC_ACTION ):
+        {
+            MetaRenderGraphicAction* pAct = (MetaRenderGraphicAction*) pAction;
+            Rectangle aRect( pAct->GetPoint(), pAct->GetSize() );
+            ImplActionBounds( aBound, aMapVDev.LogicToLogic( aRect, aMapVDev.GetMapMode(), GetPrefMapMode() ), aClipStack );
+        }
+        break;
 
         default:
             {
@@ -2564,6 +2583,15 @@ void GDIMetaFile::ImplExchangeColors( ColorExchangeFnc pFncCol, const void* pCol
             }
             break;
 
+            case( META_RENDERGRAPHIC_ACTION ):
+            {
+                OSL_TRACE( "ExchangeColors not supported for RenderGraphic MetaActions yet" );
+
+                pAction->Duplicate();
+                aMtf.push_back( pAction );
+            }
+            break;
+
             default:
             {
                 pAction->Duplicate();
@@ -2749,11 +2777,12 @@ sal_uLong GDIMetaFile::GetChecksum() const
 {
     GDIMetaFile         aMtf;
     SvMemoryStream      aMemStm( 65535, 65535 );
-    ImplMetaWriteData   aWriteData; aWriteData.meActualCharSet = aMemStm.GetStreamCharSet();
+    ImplMetaWriteData   aWriteData;
     SVBT16              aBT16;
     SVBT32              aBT32;
     sal_uLong               nCrc = 0;
 
+    aWriteData.meActualCharSet = aMemStm.GetStreamCharSet();
     for( size_t i = 0, nObjCount = GetActionSize(); i < nObjCount; i++ )
     {
         MetaAction* pAction = GetAction( i );
@@ -3010,6 +3039,30 @@ sal_uLong GDIMetaFile::GetChecksum() const
             }
             break;
 
+            case( META_RENDERGRAPHIC_ACTION ):
+            {
+                MetaRenderGraphicAction*    pAct = (MetaRenderGraphicAction*) pAction;
+                const ::vcl::RenderGraphic& rRenderGraphic = pAct->GetRenderGraphic();
+
+                ShortToSVBT16( pAct->GetType(), aBT16 );
+                nCrc = rtl_crc32( nCrc, aBT16, 2 );
+
+                nCrc = rtl_crc32( nCrc, rRenderGraphic.GetGraphicData().get(), rRenderGraphic.GetGraphicDataLength() );
+
+                UInt32ToSVBT32( pAct->GetPoint().X(), aBT32 );
+                nCrc = rtl_crc32( nCrc, aBT32, 4 );
+
+                UInt32ToSVBT32( pAct->GetPoint().Y(), aBT32 );
+                nCrc = rtl_crc32( nCrc, aBT32, 4 );
+
+                UInt32ToSVBT32( pAct->GetSize().Width(), aBT32 );
+                nCrc = rtl_crc32( nCrc, aBT32, 4 );
+
+                UInt32ToSVBT32( pAct->GetSize().Height(), aBT32 );
+                nCrc = rtl_crc32( nCrc, aBT32, 4 );
+            }
+            break;
+
             default:
             {
                 pAction->Write( aMemStm, &aWriteData );
@@ -3076,8 +3129,7 @@ sal_uLong GDIMetaFile::GetSizeBytes() const
             }
             break;
 
-            default:
-            break;
+            case( META_RENDERGRAPHIC_ACTION ): nSizeBytes += ( ( (MetaRenderGraphicAction*) pAction )->GetRenderGraphic() ).GetGraphicDataLength(); break;
         }
     }
 
@@ -3105,27 +3157,63 @@ SvStream& operator>>( SvStream& rIStm, GDIMetaFile& rGDIMetaFile )
             // new format
             VersionCompat*  pCompat;
             MetaAction*     pAction;
-            sal_uInt32          nStmCompressMode = 0;
-            sal_uInt32          nCount = 0;
+            sal_uInt32      nStmCompressMode = 0;
+            sal_uInt32      nCount = 0;
+            sal_uInt8       bRenderGraphicReplacements = 0;
 
             pCompat = new VersionCompat( rIStm, STREAM_READ );
+            {
+                // version 1
+                rIStm >> nStmCompressMode;
+                rIStm >> rGDIMetaFile.aPrefMapMode;
+                rIStm >> rGDIMetaFile.aPrefSize;
+                rIStm >> nCount;
 
-            rIStm >> nStmCompressMode;
-            rIStm >> rGDIMetaFile.aPrefMapMode;
-            rIStm >> rGDIMetaFile.aPrefSize;
-            rIStm >> nCount;
+                if( pCompat->GetVersion() >= 2 )
+                {
+                    // version 2
+                    // =========
+                    // contains an additional flag to indicate that RenderGraphic
+                    // actions are immediately followed by a replacement image, that
+                    // needs to be skipped in case the flag is set (KA 01/2011)
 
+                    rIStm >> bRenderGraphicReplacements;
+                }
+            }
             delete pCompat;
 
             ImplMetaReadData aReadData;
             aReadData.meActualCharSet = rIStm.GetStreamCharSet();
 
-            for( sal_uInt32 nAction = 0UL; ( nAction < nCount ) && !rIStm.IsEof(); nAction++ )
+            for( sal_uInt32 nAction = 0UL; ( nAction < nCount ) && !rIStm.IsEof(); ++nAction )
             {
                 pAction = MetaAction::ReadMetaAction( rIStm, &aReadData );
 
                 if( pAction )
+                {
                     rGDIMetaFile.AddAction( pAction );
+
+                    // if the MetaFile was written in RenderGraphics replacement mode
+                    // and we just read a RenderGraphic action, skip the following
+                    // META_BMPEXSCALE_ACTION, since this is the replacement image,
+                    // just needed for old implementations; don't forget to increment
+                    // the action read counter! (KA 01/2011)
+                    if( bRenderGraphicReplacements &&
+                        ( META_RENDERGRAPHIC_ACTION == pAction->GetType() ) &&
+                        ( ++nAction < nCount ) && !rIStm.IsEof() )
+                    {
+                        sal_uInt16 nFollowingType;
+
+                        // dummy read of the next following META_BMPEXSCALE_ACTION
+                        // RenderGraphic replacement action (KA 01/2011)
+                        rIStm >> nFollowingType;
+                        delete ( new VersionCompat( rIStm, STREAM_READ ) );
+
+                        OSL_ENSURE( META_BMPEXSCALE_ACTION == nFollowingType, \
+"META_RENDERGRAPHIC_ACTION read in RenderGraphic replacement mode \
+without following META_BMPEXSCALE_ACTION replacement" );
+                    }
+                }
             }
         }
         else
@@ -3154,10 +3242,27 @@ SvStream& operator<<( SvStream& rOStm, const GDIMetaFile& rGDIMetaFile )
 {
     if( !rOStm.GetError() )
     {
-        if( rOStm.GetVersion() >= SOFFICE_FILEFORMAT_50 )
-            ((GDIMetaFile&) rGDIMetaFile ).Write( rOStm );
+        static const char*  pEnableSVM1 = getenv( "SAL_ENABLE_SVM1" );
+        static const bool   bNoSVM1 = (NULL == pEnableSVM1 ) || ( '0' == *pEnableSVM1 );
+
+        if( bNoSVM1 || rOStm.GetVersion() >= SOFFICE_FILEFORMAT_50  )
+        {
+            const_cast< GDIMetaFile& >( rGDIMetaFile ).Write( rOStm );
+        }
         else
-            delete( new SVMConverter( rOStm, (GDIMetaFile&) rGDIMetaFile, CONVERT_TO_SVM1 ) );
+        {
+            delete( new SVMConverter( rOStm, const_cast< GDIMetaFile& >( rGDIMetaFile ), CONVERT_TO_SVM1 ) );
+        }
+
+#ifdef DEBUG
+        if( !bNoSVM1 && rOStm.GetVersion() < SOFFICE_FILEFORMAT_50 )
+        {
+OSL_TRACE( \
+"GDIMetaFile would normally be written in old SVM1 format by this call. \
+The current implementation always writes in VCLMTF format. \
+Please set environment variable SAL_ENABLE_SVM1 to '1' to reenable old behavior" );
+        }
+#endif // DEBUG
     }
 
     return rOStm;
@@ -3175,32 +3280,90 @@ SvStream& GDIMetaFile::Read( SvStream& rIStm )
 
 // ------------------------------------------------------------------------
 
-SvStream& GDIMetaFile::Write( SvStream& rOStm )
+SvStream& GDIMetaFile::Write( SvStream& rOStm, GDIMetaFileWriteFlags nWriteFlags )
 {
     VersionCompat*  pCompat;
     const sal_uInt32    nStmCompressMode = rOStm.GetCompressMode();
     sal_uInt16          nOldFormat = rOStm.GetNumberFormatInt();
+    const               sal_uInt8 bRenderGraphicReplacements =
+                                ( ( ( GDIMETAFILE_WRITE_REPLACEMENT_RENDERGRAPHIC & nWriteFlags ) != 0 ) ? 1 : 0 );
+
+    // With the introduction of the META_RENDERGRAPHIC_ACTION, it is neccessary
+    // to provide some kind of document backward compatibility:
+    //
+    //  If the flag GDIMETAFILE_WRITE_REPLACEMENT_RENDERGRAPHIC is set in
+    //  parameter nWriteFlags, each META_RENDERGRAPHIC_ACTION is followed by
+    //  an additional META_BMPEXSCALE_ACTION, that contains a replacement
+    //  image for the new RenderGraphic action.
+    //
+    //  Old implementations, not knowing anything about META_RENDERGRAPHIC_ACTION,
+    //  will skip this new action and read the META_BMPEXSCALE_ACTION instead
+    //
+    //  Since the current implementation is able to handle the new action, the
+    //  then following image replacement action needs to be skipped by this
+    //  implementation, if the metafile was written in the RenderGraphic
+    //  replacement mode.
+    //
+    //  To be able to detect this compatibility mode, the header needs to
+    //  be extended by a corresponding flag, resulting in version 2 of
+    //  the header. The surrounding VersionCompat of the header
+    //  allows to add such new data without any problems (KA 01/2011)
 
     rOStm.SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN );
     rOStm.Write( "VCLMTF", 6 );
 
-    pCompat = new VersionCompat( rOStm, STREAM_WRITE, 1 );
+    pCompat = new VersionCompat( rOStm, STREAM_WRITE, 2 );
 
-    rOStm << nStmCompressMode;
-    rOStm << aPrefMapMode;
-    rOStm << aPrefSize;
-    rOStm << (sal_uInt32) GetActionSize();
+    {
+        // version 1
+        sal_uInt32 nActionCount = 0;
+
+        // calculate correct action count and watch for
+        // additional RenderGraphic replacement actions, if the
+        // GDIMETAFILE_WRITE_REPLACEMENT_RENDERGRAPHIC is set
+        // and META_RENDERGRAPHIC_ACTION are encountered (KA 01/2011)
+        for( MetaAction* pAct = FirstAction(); pAct; pAct = NextAction() )
+        {
+            nActionCount += ( bRenderGraphicReplacements && ( META_RENDERGRAPHIC_ACTION == pAct->GetType() ) ? 2 : 1 );
+        }
+
+        rOStm << nStmCompressMode << aPrefMapMode << aPrefSize << nActionCount;
+
+        {
+            // version 2
+            // =========
+            // since version 2, a GDIMETAFILE_WRITE_REPLACEMENT_RENDERGRAPHIC flag
+            // is written, to indicate that each META_BMPEXSCALE_ACTION following
+            // a META_RENDERGRAPHIC_ACTION needs to be skipped, in case the flag is
+            // set (KA 01/2011)
+            rOStm << bRenderGraphicReplacements;
+        }
+    }
 
     delete pCompat;
 
     ImplMetaWriteData aWriteData;
+
     aWriteData.meActualCharSet = rOStm.GetStreamCharSet();
+    aWriteData.mnWriteFlags = nWriteFlags;
 
-    MetaAction* pAct = FirstAction();
-    while ( pAct )
+    for( MetaAction* pAct = FirstAction(); pAct; pAct = NextAction() )
     {
         pAct->Write( rOStm, &aWriteData );
-        pAct = NextAction();
+
+        // write the RenderGraphic replacement image, if the
+        // GDIMETAFILE_WRITE_REPLACEMENT_RENDERGRAPHIC flag is set
+        // and if a META_RENDERGRAPHIC_ACTION is encountered (KA 01/2011)
+        if( bRenderGraphicReplacements && ( META_RENDERGRAPHIC_ACTION == pAct->GetType() ) )
+        {
+            MetaRenderGraphicAction*    pRenderAction = static_cast< MetaRenderGraphicAction* >( pAct );
+            MetaBmpExScaleAction*       pBmpExScaleAction = new MetaBmpExScaleAction(
+                                            pRenderAction->GetPoint(), pRenderAction->GetSize(),
+                                            pRenderAction->GetRenderGraphic().GetReplacement() );
+
+            pBmpExScaleAction->Write( rOStm, &aWriteData );
+            pBmpExScaleAction->Delete();
+        }
     }
 
     rOStm.SetNumberFormatInt( nOldFormat );
diff --git a/vcl/source/gdi/gfxlink.cxx b/vcl/source/gdi/gfxlink.cxx
index 29b6a62253a6..745c4f765398 100644
--- a/vcl/source/gdi/gfxlink.cxx
+++ b/vcl/source/gdi/gfxlink.cxx
@@ -259,6 +259,7 @@ sal_Bool GfxLink::LoadNative( Graphic& rGraphic )
                 case( GFX_LINK_TYPE_NATIVE_WMF ): nCvtType = CVT_WMF; break;
                 case( GFX_LINK_TYPE_NATIVE_MET ): nCvtType = CVT_MET; break;
                 case( GFX_LINK_TYPE_NATIVE_PCT ): nCvtType = CVT_PCT; break;
+                case( GFX_LINK_TYPE_NATIVE_SVG ): nCvtType = CVT_SVG; break;
 
                 default: nCvtType = CVT_UNKNOWN; break;
             }
diff --git a/vcl/source/gdi/graph.cxx b/vcl/source/gdi/graph.cxx
index f61bbf8dc041..eb22d31937df 100644
--- a/vcl/source/gdi/graph.cxx
+++ b/vcl/source/gdi/graph.cxx
@@ -28,11 +28,15 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
-#include <vcl/impgraph.hxx>
+
 #include <vcl/outdev.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/graph.hxx>
+
+#include <impgraph.hxx>
+
 #include <comphelper/processfactory.hxx>
+
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/graphic/XGraphicProvider.hpp>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
@@ -428,6 +432,27 @@ sal_Bool Graphic::IsAnimated() const
 
 // ------------------------------------------------------------------------
 
+sal_Bool Graphic::IsEPS() const
+{
+    return mpImpGraphic->ImplIsEPS();
+}
+
+// ------------------------------------------------------------------------
+
+sal_Bool Graphic::IsRenderGraphic() const
+{
+    return mpImpGraphic->ImplIsRenderGraphic();
+}
+
+// ------------------------------------------------------------------------
+
+sal_Bool Graphic::HasRenderGraphic() const
+{
+    return mpImpGraphic->ImplHasRenderGraphic();
+}
+
+// ------------------------------------------------------------------------
+
 Bitmap Graphic::GetBitmap(const GraphicConversionParameters& rParameters) const
 {
     return mpImpGraphic->ImplGetBitmap(rParameters);
@@ -456,6 +481,13 @@ const GDIMetaFile& Graphic::GetGDIMetaFile() const
 
 // ------------------------------------------------------------------------
 
+::vcl::RenderGraphic Graphic::GetRenderGraphic() const
+{
+    return mpImpGraphic->ImplGetRenderGraphic();
+}
+
+// ------------------------------------------------------------------------
+
 uno::Reference< graphic::XGraphic > Graphic::GetXGraphic() const
 {
     uno::Reference< graphic::XGraphic > xRet;
diff --git a/vcl/source/gdi/image.cxx b/vcl/source/gdi/image.cxx
index 24c86c326910..18f927e5b0ff 100644
--- a/vcl/source/gdi/image.cxx
+++ b/vcl/source/gdi/image.cxx
@@ -32,6 +32,7 @@
 #include <boost/scoped_array.hpp>
 
 #include <rtl/logfile.hxx>
+
 #include <tools/debug.hxx>
 #include <tools/stream.hxx>
 #include <tools/rc.h>
@@ -41,10 +42,10 @@
 #include <vcl/outdev.hxx>
 #include <vcl/graph.hxx>
 #include <vcl/svapp.hxx>
-#include <vcl/impimagetree.hxx>
-#include <vcl/image.h>
 #include <vcl/image.hxx>
 #include <vcl/imagerepository.hxx>
+#include <impimagetree.hxx>
+#include <image.h>
 
 #if OSL_DEBUG_LEVEL > 0
 #include <rtl/strbuf.hxx>
diff --git a/vcl/source/gdi/imagerepository.cxx b/vcl/source/gdi/imagerepository.cxx
index ea5b5f5d87a4..6fda85735b01 100644
--- a/vcl/source/gdi/imagerepository.cxx
+++ b/vcl/source/gdi/imagerepository.cxx
@@ -28,10 +28,11 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
+
 #include <vcl/bitmapex.hxx>
 #include <vcl/imagerepository.hxx>
 #include <vcl/svapp.hxx>
-#include "vcl/impimagetree.hxx"
+#include "impimagetree.hxx"
 
 //........................................................................
 namespace vcl
diff --git a/vcl/source/gdi/impbmp.cxx b/vcl/source/gdi/impbmp.cxx
index 6957e32b3e25..579515f67e9c 100644
--- a/vcl/source/gdi/impbmp.cxx
+++ b/vcl/source/gdi/impbmp.cxx
@@ -29,13 +29,14 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-#include <svsys.h>
-#include <vcl/salbmp.hxx>
 #include <tools/debug.hxx>
-#include <vcl/impbmp.hxx>
+
 #include <vcl/bitmap.hxx>
-#include <vcl/svdata.hxx>
-#include <vcl/salinst.hxx>
+
+#include <svdata.hxx>
+#include <salinst.hxx>
+#include <salbmp.hxx>
+#include <impbmp.hxx>
 
 // --------------
 // - ImpBitmap  -
diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx
index bf99364a0f64..9d995f361329 100644
--- a/vcl/source/gdi/impgraph.cxx
+++ b/vcl/source/gdi/impgraph.cxx
@@ -28,22 +28,26 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
+
 #include <tools/vcompat.hxx>
 #include <tools/urlobj.hxx>
 #include <tools/debug.hxx>
+#include <tools/stream.hxx>
+
 #include <ucbhelper/content.hxx>
+
 #include <unotools/ucbstreamhelper.hxx>
 #include <unotools/tempfile.hxx>
 #include <vcl/outdev.hxx>
 #include <vcl/virdev.hxx>
-#include <tools/debug.hxx>
-#include <tools/stream.hxx>
-#include <vcl/impgraph.hxx>
 #include <vcl/gfxlink.hxx>
 #include <vcl/cvtgrf.hxx>
 #include <vcl/salbtype.hxx>
 #include <vcl/graph.hxx>
 #include <vcl/metaact.hxx>
+
+#include <impgraph.hxx>
+
 #include <com/sun/star/ucb/CommandAbortedException.hpp>
 
 // -----------
@@ -479,6 +483,48 @@ sal_Bool ImpGraphic::ImplIsAnimated() const
 
 // ------------------------------------------------------------------------
 
+sal_Bool ImpGraphic::ImplIsEPS() const
+{
+    return( ( meType == GRAPHIC_GDIMETAFILE ) &&
+            ( maMetaFile.GetActionSize() > 0 ) &&
+            ( maMetaFile.GetAction( 0 )->GetType() == META_EPS_ACTION ) );
+}
+
+// ------------------------------------------------------------------------
+
+sal_Bool ImpGraphic::ImplIsRenderGraphic() const
+{
+    return( ( GRAPHIC_GDIMETAFILE == meType ) &&
+            ( 1 == maMetaFile.GetActionSize() ) &&
+            ( META_RENDERGRAPHIC_ACTION == maMetaFile.GetAction( 0 )->GetType() ) );
+}
+
+// ------------------------------------------------------------------------
+
+sal_Bool ImpGraphic::ImplHasRenderGraphic() const
+{
+    sal_Bool bRet = sal_False;
+
+    if( GRAPHIC_GDIMETAFILE == meType )
+    {
+        GDIMetaFile& rMtf = const_cast< ImpGraphic* >( this )->maMetaFile;
+
+        for( MetaAction* pAct = rMtf.FirstAction(); pAct && !bRet; pAct = rMtf.NextAction() )
+        {
+            if( META_RENDERGRAPHIC_ACTION == pAct->GetType() )
+            {
+                bRet = sal_True;
+            }
+        }
+
+        rMtf.WindStart();
+    }
+
+    return( bRet );
+}
+
+// ------------------------------------------------------------------------
+
 Bitmap ImpGraphic::ImplGetBitmap(const GraphicConversionParameters& rParameters) const
 {
     Bitmap aRetBmp;
@@ -591,6 +637,18 @@ Animation ImpGraphic::ImplGetAnimation() const
 
 // ------------------------------------------------------------------------
 
+::vcl::RenderGraphic ImpGraphic::ImplGetRenderGraphic() const
+{
+    ::vcl::RenderGraphic aRet;
+
+    if( ImplIsRenderGraphic() )
+        aRet = static_cast< MetaRenderGraphicAction* >( maMetaFile.GetAction( 0 ) )->GetRenderGraphic();
+
+    return( aRet );
+}
+
+// ------------------------------------------------------------------------
+
 const GDIMetaFile& ImpGraphic::ImplGetGDIMetaFile() const
 {
     return maMetaFile;
diff --git a/vcl/source/gdi/impimage.cxx b/vcl/source/gdi/impimage.cxx
index d2e479e1edb5..2246058fb10f 100644
--- a/vcl/source/gdi/impimage.cxx
+++ b/vcl/source/gdi/impimage.cxx
@@ -28,15 +28,17 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
+
 #include <vcl/outdev.hxx>
 #include <vcl/bitmapex.hxx>
 #include <vcl/alpha.hxx>
 #include <vcl/window.hxx>
 #include <vcl/bmpacc.hxx>
 #include <vcl/virdev.hxx>
-#include <vcl/image.h>
 #include <vcl/image.hxx>
 
+#include <image.h>
+
 // -----------
 // - Defines -
 // -----------
diff --git a/vcl/source/gdi/impimagetree.cxx b/vcl/source/gdi/impimagetree.cxx
index 88b465c89f7d..b43611e34b04 100644
--- a/vcl/source/gdi/impimagetree.cxx
+++ b/vcl/source/gdi/impimagetree.cxx
@@ -27,13 +27,13 @@
  ***********************************************************************/
 
 #include "precompiled_vcl.hxx"
+
 #include "sal/config.h"
 
 #include <list>
 #include <memory>
 #include <utility>
 #include <vector>
-
 #include <boost/unordered_map.hpp>
 
 #include "com/sun/star/container/XNameAccess.hpp"
@@ -44,24 +44,31 @@
 #include "com/sun/star/uno/Reference.hxx"
 #include "com/sun/star/uno/RuntimeException.hpp"
 #include "com/sun/star/uno/Sequence.hxx"
+
 #include "comphelper/processfactory.hxx"
+
 #include "osl/file.hxx"
 #include "osl/diagnose.h"
+
 #include "rtl/bootstrap.hxx"
 #include "rtl/string.h"
 #include "rtl/textenc.h"
 #include "rtl/ustrbuf.hxx"
 #include "rtl/ustring.h"
 #include "rtl/ustring.hxx"
+
 #include "sal/types.h"
+
 #include "tools/stream.hxx"
 #include "tools/urlobj.hxx"
+
 #include "vcl/bitmapex.hxx"
-#include "vcl/impimagetree.hxx"
 #include "vcl/pngread.hxx"
 #include "vcl/settings.hxx"
 #include "vcl/svapp.hxx"
 
+#include "impimagetree.hxx"
+
 namespace {
 
 namespace css = com::sun::star;
diff --git a/vcl/source/gdi/jobset.cxx b/vcl/source/gdi/jobset.cxx
index bcf7986c70b2..d06e16dcf0cb 100644
--- a/vcl/source/gdi/jobset.cxx
+++ b/vcl/source/gdi/jobset.cxx
@@ -28,11 +28,13 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
+
 #include <tools/debug.hxx>
 #include <tools/stream.hxx>
 #include <rtl/alloc.h>
 #include <vcl/jobset.hxx>
-#include <vcl/jobset.h>
+
+#include <jobset.h>
 
 // =======================================================================
 
diff --git a/vcl/source/gdi/makefile.mk b/vcl/source/gdi/makefile.mk
index d01c46a77ca0..e124dc343eba 100755
--- a/vcl/source/gdi/makefile.mk
+++ b/vcl/source/gdi/makefile.mk
@@ -50,7 +50,7 @@ CDEFS+=-DGR2_STATIC
 
 # --- Files --------------------------------------------------------
 
-EXCEPTIONSFILES=	$(SLO)$/salmisc.obj 	\
+EXCEPTIONSFILES=	$(SLO)$/salmisc.obj		\
                     $(SLO)$/animate.obj 	\
                     $(SLO)$/base14.obj		\
                     $(SLO)$/bitmap.obj		\
@@ -90,36 +90,38 @@ EXCEPTIONSFILES=	$(SLO)$/salmisc.obj 	\
                     $(SLO)$/pdfwriter_impl.obj	\
                     $(SLO)$/pdfwriter_impl2.obj	\
                     $(SLO)$/pngread.obj		\
-                    $(SLO)$/pngwrite.obj    \
+                    $(SLO)$/pngwrite.obj		\
                     $(SLO)$/print.obj		\
                     $(SLO)$/print2.obj		\
                     $(SLO)$/print3.obj		\
+                    $(SLO)$/rendergraphic.obj	\
+                    $(SLO)$/rendergraphicrasterizer.obj \
                     $(SLO)$/salgdilayout.obj	\
                     $(SLO)$/sallayout.obj		\
                     $(SLO)$/salnativewidgets-none.obj	\
+                    $(SLO)$/svgread.obj		\
                     $(SLO)$/textlayout.obj   \
                     $(SLO)$/virdev.obj \
                     $(SLO)$/wall.obj
 
-SLOFILES=	$(EXCEPTIONSFILES)      \
+SLOFILES=	$(EXCEPTIONSFILES)		\
             $(SLO)$/bitmap3.obj 	\
             $(SLO)$/bitmap4.obj 	\
-            $(SLO)$/alpha.obj		\
+            $(SLO)$/alpha.obj	\
             $(SLO)$/bmpacc.obj		\
             $(SLO)$/bmpacc2.obj 	\
             $(SLO)$/bmpacc3.obj 	\
             $(SLO)$/bmpfast.obj	\
-            $(SLO)$/font.obj		\
+            $(SLO)$/font.obj	\
             $(SLO)$/gradient.obj	\
-            $(SLO)$/hatch.obj		\
-            $(SLO)$/impbmp.obj		\
-            $(SLO)$/mapmod.obj		\
-            $(SLO)$/octree.obj		\
+            $(SLO)$/hatch.obj	\
+            $(SLO)$/impbmp.obj	\
+            $(SLO)$/mapmod.obj	\
+            $(SLO)$/octree.obj	\
             $(SLO)$/regband.obj 	\
-            $(SLO)$/region.obj		\
+            $(SLO)$/region.obj	\
             $(SLO)$/extoutdevdata.obj
 
-
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :	target.mk
diff --git a/vcl/source/gdi/metaact.cxx b/vcl/source/gdi/metaact.cxx
index feba437c7c2f..2ffa3c68e4f7 100644
--- a/vcl/source/gdi/metaact.cxx
+++ b/vcl/source/gdi/metaact.cxx
@@ -39,6 +39,7 @@
 #include <vcl/salbtype.hxx>
 #include <vcl/metaact.hxx>
 #include <vcl/graphictools.hxx>
+#include <vcl/rendergraphicrasterizer.hxx>
 
 // ========================================================================
 
@@ -236,6 +237,7 @@ MetaAction* MetaAction::ReadMetaAction( SvStream& rIStm, ImplMetaReadData* pData
         case( META_COMMENT_ACTION ): pAction = new MetaCommentAction; break;
         case( META_LAYOUTMODE_ACTION ): pAction = new MetaLayoutModeAction; break;
         case( META_TEXTLANGUAGE_ACTION ): pAction = new MetaTextLanguageAction; break;
+        case( META_RENDERGRAPHIC_ACTION ): pAction = new MetaRenderGraphicAction; break;
 
         default:
         {
@@ -2566,7 +2568,10 @@ MetaGradientExAction::~MetaGradientExAction()
 void MetaGradientExAction::Execute( OutputDevice* pOut )
 {
     if( pOut->GetConnectMetaFile() )
-        pOut->GetConnectMetaFile()->AddAction( Clone() );
+    {
+        Duplicate();
+        pOut->GetConnectMetaFile()->AddAction( this );
+    }
 }
 
 // ------------------------------------------------------------------------
@@ -4060,7 +4065,10 @@ void MetaCommentAction::ImplInitDynamicData( const sal_uInt8* pData, sal_uInt32
 void MetaCommentAction::Execute( OutputDevice* pOut )
 {
     if ( pOut->GetConnectMetaFile() )
-        pOut->GetConnectMetaFile()->AddAction( Clone() );
+    {
+        Duplicate();
+        pOut->GetConnectMetaFile()->AddAction( this );
+    }
 }
 
 // ------------------------------------------------------------------------
@@ -4323,4 +4331,82 @@ void MetaTextLanguageAction::Read( SvStream& rIStm, ImplMetaReadData* )
 
 // ========================================================================
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+IMPL_META_ACTION( RenderGraphic, META_RENDERGRAPHIC_ACTION )
+
+// ------------------------------------------------------------------------
+
+MetaRenderGraphicAction::MetaRenderGraphicAction( const Point& rPoint, const Size& rSize,
+                                                  const vcl::RenderGraphic& rRenderGraphic,
+                                                  double fRotateAngle, double fShearAngleX, double fShearAngleY ) :
+    MetaAction( META_RENDERGRAPHIC_ACTION ),
+    maRenderGraphic( rRenderGraphic ),
+    maPoint( rPoint ),
+    maSize( rSize ),
+    mfRotateAngle( fRotateAngle ),
+    mfShearAngleX( fShearAngleX ),
+    mfShearAngleY( fShearAngleY )
+{
+}
+
+// ------------------------------------------------------------------------
+
+void MetaRenderGraphicAction::Execute( OutputDevice* pOut )
+{
+    pOut->DrawRenderGraphic( maPoint, maSize, maRenderGraphic );
+}
+
+// ------------------------------------------------------------------------
+
+MetaAction* MetaRenderGraphicAction::Clone()
+{
+    MetaAction* pClone = (MetaAction*) new MetaRenderGraphicAction( *this );
+    pClone->ResetRefCount();
+    return pClone;
+}
+
+// ------------------------------------------------------------------------
+
+void MetaRenderGraphicAction::Move( long nHorzMove, long nVertMove )
+{
+    maPoint.Move( nHorzMove, nVertMove );
+}
+
+// ------------------------------------------------------------------------
+
+void MetaRenderGraphicAction::Scale( double fScaleX, double fScaleY )
+{
+    Rectangle aRectangle( maPoint, maSize );
+    ImplScaleRect( aRectangle, fScaleX, fScaleY );
+    maPoint = aRectangle.TopLeft();
+    maSize = aRectangle.GetSize();
+}
+
+// ------------------------------------------------------------------------
+
+sal_Bool MetaRenderGraphicAction::Compare( const MetaAction& rMetaAction ) const
+{
+    return ( maRenderGraphic.IsEqual( ( (MetaRenderGraphicAction&) rMetaAction).maRenderGraphic ) &&
+           ( maPoint == ( (MetaRenderGraphicAction&) rMetaAction).maPoint ) &&
+           ( maSize == ( (MetaRenderGraphicAction&) rMetaAction).maSize ) &&
+           ( mfRotateAngle == ( (MetaRenderGraphicAction&) rMetaAction).mfRotateAngle ) &&
+           ( mfShearAngleX == ( (MetaRenderGraphicAction&) rMetaAction).mfShearAngleX ) &&
+           ( mfShearAngleY == ( (MetaRenderGraphicAction&) rMetaAction).mfShearAngleY ) );
+}
+
+// ------------------------------------------------------------------------
+
+void MetaRenderGraphicAction::Write( SvStream& rOStm, ImplMetaWriteData* pData )
+{
+    WRITE_BASE_COMPAT( rOStm, 1, pData );
+    rOStm << maRenderGraphic << maPoint << maSize << mfRotateAngle << mfShearAngleX << mfShearAngleY;
+}
+
+// ------------------------------------------------------------------------
+
+void MetaRenderGraphicAction::Read( SvStream& rIStm, ImplMetaReadData* )
+{
+    COMPAT( rIStm );
+    rIStm >> maRenderGraphic >> maPoint >> maSize >> mfRotateAngle >> mfShearAngleX >> mfShearAngleY;
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
diff --git a/vcl/source/gdi/metric.cxx b/vcl/source/gdi/metric.cxx
index 4814d6e3114e..e8a8a2cb3a63 100644
--- a/vcl/source/gdi/metric.cxx
+++ b/vcl/source/gdi/metric.cxx
@@ -29,7 +29,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-#include <vcl/impfont.hxx>
+#include <impfont.hxx>
 #include <vcl/metric.hxx>
 
 #include <vector>
diff --git a/vcl/source/gdi/octree.cxx b/vcl/source/gdi/octree.cxx
index c2f0d92f03c3..56c46f421695 100644
--- a/vcl/source/gdi/octree.cxx
+++ b/vcl/source/gdi/octree.cxx
@@ -28,11 +28,14 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
+
 #include <limits.h>
+
 #include <vcl/bmpacc.hxx>
-#include <vcl/impoct.hxx>
 #include <vcl/octree.hxx>
 
+#include <impoct.hxx>
+
 // ---------
 // - pMask -
 // ---------
diff --git a/vcl/source/gdi/outdev.cxx b/vcl/source/gdi/outdev.cxx
index 99a93432652f..3e5e05904e57 100644
--- a/vcl/source/gdi/outdev.cxx
+++ b/vcl/source/gdi/outdev.cxx
@@ -30,31 +30,34 @@
 #include "precompiled_vcl.hxx"
 
 #include <tools/ref.hxx>
-#include <svsys.h>
-#include <vcl/salgdi.hxx>
-#include <vcl/sallayout.hxx>
-#include <vcl/salframe.hxx>
-#include <vcl/salvd.hxx>
-#include <vcl/salprn.hxx>
 #include <tools/debug.hxx>
-#include <vcl/svdata.hxx>
+#include <tools/poly.hxx>
+
 #include <vcl/svapp.hxx>
 #include <vcl/ctrl.hxx>
-#include <tools/poly.hxx>
 #include <vcl/region.hxx>
-#include <vcl/region.h>
 #include <vcl/virdev.hxx>
-#include <vcl/window.h>
 #include <vcl/window.hxx>
 #include <vcl/metaact.hxx>
 #include <vcl/gdimtf.hxx>
-#include <vcl/outdata.hxx>
 #include <vcl/print.hxx>
-#include <vcl/outdev.h>
 #include <vcl/outdev.hxx>
 #include <vcl/unowrap.hxx>
+// declare system types in sysdata.hxx
+#include <svsys.h>
 #include <vcl/sysdata.hxx>
 
+#include <salgdi.hxx>
+#include <sallayout.hxx>
+#include <salframe.hxx>
+#include <salvd.hxx>
+#include <salprn.hxx>
+#include <svdata.hxx>
+#include <window.h>
+#include <outdev.h>
+#include <region.h>
+#include <outdata.hxx>
+
 #include <basegfx/point/b2dpoint.hxx>
 #include <basegfx/vector/b2dvector.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
diff --git a/vcl/source/gdi/outdev2.cxx b/vcl/source/gdi/outdev2.cxx
index 356542952360..d1a76a9f085b 100644
--- a/vcl/source/gdi/outdev2.cxx
+++ b/vcl/source/gdi/outdev2.cxx
@@ -29,28 +29,29 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-#include <svsys.h>
-#include <vcl/salbmp.hxx>
-#include <vcl/salgdi.hxx>
-#include <vcl/impbmp.hxx>
 #include <tools/debug.hxx>
+
 #include <vcl/bitmap.hxx>
 #include <vcl/bitmapex.hxx>
 #include <vcl/window.hxx>
 #include <vcl/metaact.hxx>
 #include <vcl/gdimtf.hxx>
 #include <vcl/virdev.hxx>
-#include <vcl/outdata.hxx>
-#include <vcl/outdev.h>
 #include <vcl/bmpacc.hxx>
-#include <vcl/region.h>
 #include <vcl/outdev.hxx>
 #include <vcl/window.hxx>
-#include <vcl/window.h>
-#include <vcl/sallayout.hxx>
-#include <vcl/image.h>
 #include <vcl/image.hxx>
-#include <vcl/bmpfast.hxx>
+
+#include <bmpfast.hxx>
+#include <salbmp.hxx>
+#include <salgdi.hxx>
+#include <impbmp.hxx>
+#include <sallayout.hxx>
+#include <image.h>
+#include <outdev.h>
+#include <window.h>
+#include <region.h>
+#include <outdata.hxx>
 
 #define BAND_MAX_SIZE 512000
 
diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx
index 59242e24a473..31ef2c5a8250 100644..100755
--- a/vcl/source/gdi/outdev3.cxx
+++ b/vcl/source/gdi/outdev3.cxx
@@ -31,49 +31,57 @@
 
 #include "i18npool/mslangid.hxx"
 
-#include "svsys.h"
-#include "vcl/salgdi.hxx"
-#include "vcl/sallayout.hxx"
 #include "rtl/tencinfo.h"
+#include "rtl/logfile.hxx"
+
 #include "tools/debug.hxx"
-#include "vcl/svdata.hxx"
-#include "vcl/metric.hxx"
-#include "vcl/impfont.hxx"
-#include "vcl/metaact.hxx"
-#include "vcl/gdimtf.hxx"
-#include "vcl/outdata.hxx"
-#include "vcl/outfont.hxx"
+#include "tools/poly.hxx"
+
 #include "basegfx/polygon/b2dpolygon.hxx"
 #include "basegfx/polygon/b2dpolypolygon.hxx"
 #include "basegfx/matrix/b2dhommatrix.hxx"
-#include "tools/poly.hxx"
-#include "vcl/outdev.h"
+
+#include "vcl/metric.hxx"
+#include "vcl/metaact.hxx"
+#include "vcl/gdimtf.hxx"
 #include "vcl/virdev.hxx"
 #include "vcl/print.hxx"
 #include "vcl/event.hxx"
-#include "vcl/window.h"
 #include "vcl/window.hxx"
 #include "vcl/svapp.hxx"
 #include "vcl/bmpacc.hxx"
-#include "unotools/fontcvt.hxx"
 #include "vcl/outdev.hxx"
 #include "vcl/edit.hxx"
-#include "unotools/fontcfg.hxx"
+// declare system types in sysdata.hxx
+#include <svsys.h>
 #include "vcl/sysdata.hxx"
-#include "vcl/textlayout.hxx"
-#include "vcl/svids.hrc"
+#include "vcl/unohelp.hxx"
+#include "vcl/controllayout.hxx"
+
+#include "salgdi.hxx"
+#include "sallayout.hxx"
+#include "svdata.hxx"
+#include "impfont.hxx"
+#include "outdata.hxx"
+#include "outfont.hxx"
+#include "outdev.h"
+#include "textlayout.hxx"
+#include "svids.hrc"
+#include "window.h"
+
+#include "unotools/fontcvt.hxx"
+#include "unotools/fontcfg.hxx"
+
 #include "osl/file.h"
+
 #ifdef ENABLE_GRAPHITE
-#include "vcl/graphite_features.hxx"
+#include "graphite_features.hxx"
 #endif
 #ifdef USE_BUILTIN_RASTERIZER
-#include "vcl/glyphcache.hxx"
+#include "glyphcache.hxx"
 #endif
 
-#include "vcl/unohelp.hxx"
 #include "pdfwriter_impl.hxx"
-#include "vcl/controllayout.hxx"
-#include "rtl/logfile.hxx"
 
 #include "com/sun/star/beans/PropertyValues.hpp"
 #include "com/sun/star/i18n/XBreakIterator.hpp"
diff --git a/vcl/source/gdi/outdev4.cxx b/vcl/source/gdi/outdev4.cxx
index 94226e863de5..f3828761bd6f 100644
--- a/vcl/source/gdi/outdev4.cxx
+++ b/vcl/source/gdi/outdev4.cxx
@@ -29,25 +29,26 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-#include <svsys.h>
-#include <vcl/salgdi.hxx>
 #include <tools/debug.hxx>
-#include <vcl/svdata.hxx>
+#include <tools/line.hxx>
+#include <tools/poly.hxx>
+
 #include <vcl/gradient.hxx>
 #include <vcl/metaact.hxx>
 #include <vcl/gdimtf.hxx>
-#include <vcl/outdata.hxx>
-#include <tools/poly.hxx>
 #include <vcl/salbtype.hxx>
-#include <tools/line.hxx>
 #include <vcl/hatch.hxx>
 #include <vcl/window.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/outdev.hxx>
 
 #include "pdfwriter_impl.hxx"
-#include "vcl/window.h"
-#include "vcl/salframe.hxx"
+
+#include "window.h"
+#include "salframe.hxx"
+#include "salgdi.hxx"
+#include "svdata.hxx"
+#include "outdata.hxx"
 
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <basegfx/polygon/b2dpolypolygon.hxx>
diff --git a/vcl/source/gdi/outdev5.cxx b/vcl/source/gdi/outdev5.cxx
index 2df0ff86dc3e..fcf32aff87e6 100644
--- a/vcl/source/gdi/outdev5.cxx
+++ b/vcl/source/gdi/outdev5.cxx
@@ -30,18 +30,19 @@
 #include "precompiled_vcl.hxx"
 
 #include <tools/ref.hxx>
-#include <svsys.h>
-#include <vcl/salgdi.hxx>
 #include <tools/debug.hxx>
-#include <vcl/svdata.hxx>
 #include <tools/poly.hxx>
+
 #include <vcl/metaact.hxx>
 #include <vcl/gdimtf.hxx>
-#include <vcl/outdata.hxx>
-#include <vcl/outdev.h>
 #include <vcl/outdev.hxx>
 #include <vcl/virdev.hxx>
 
+#include <salgdi.hxx>
+#include <svdata.hxx>
+#include <outdata.hxx>
+#include <outdev.h>
+
 // =======================================================================
 
 DBG_NAMEEX( OutputDevice )
diff --git a/vcl/source/gdi/outdev6.cxx b/vcl/source/gdi/outdev6.cxx
index 92898ebfdf3a..dd2d30642d25 100644
--- a/vcl/source/gdi/outdev6.cxx
+++ b/vcl/source/gdi/outdev6.cxx
@@ -29,10 +29,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-#include <svsys.h>
-#include <vcl/salgdi.hxx>
 #include <tools/debug.hxx>
-#include <vcl/outdev.h>
 #include <vcl/outdev.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/bmpacc.hxx>
@@ -41,16 +38,22 @@
 #include <vcl/svapp.hxx>
 #include <vcl/wrkwin.hxx>
 #include <vcl/graph.hxx>
-#include <vcl/wall2.hxx>
+#include <vcl/rendergraphicrasterizer.hxx>
+
+#include <wall2.hxx>
+#include <salgdi.hxx>
+#include <window.h>
+#include <svdata.hxx>
+#include <outdev.h>
+
 #include <com/sun/star/uno/Sequence.hxx>
 
 #include <basegfx/vector/b2dvector.hxx>
 #include <basegfx/polygon/b2dpolypolygon.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
+
 #include <math.h>
-#include <vcl/window.h>
-#include <vcl/svdata.hxx>
 
 // ========================================================================
 
@@ -1135,6 +1138,7 @@ void OutputDevice::Erase()
         return;
 
     sal_Bool bNativeOK = sal_False;
+
     if( meOutDevType == OUTDEV_WINDOW )
     {
         Window* pWindow = static_cast<Window*>(this);
@@ -1185,6 +1189,8 @@ void OutputDevice::ImplDraw2ColorFrame( const Rectangle& rRect,
 bool OutputDevice::DrawEPS( const Point& rPoint, const Size& rSize,
                             const GfxLink& rGfxLink, GDIMetaFile* pSubst )
 {
+    OSL_TRACE( "OutputDevice::DrawEPS()" );
+
     bool bDrawn(true);
 
     if ( mpMetaFile )
@@ -1203,7 +1209,7 @@ bool OutputDevice::DrawEPS( const Point& rPoint, const Size& rSize,
     if( mbOutputClipped )
         return bDrawn;
 
-    Rectangle   aRect( ImplLogicToDevicePixel( Rectangle( rPoint, rSize ) ) );
+    Rectangle aRect( ImplLogicToDevicePixel( Rectangle( rPoint, rSize ) ) );
 
     if( !aRect.IsEmpty() )
     {
@@ -1238,4 +1244,27 @@ bool OutputDevice::DrawEPS( const Point& rPoint, const Size& rSize,
     return bDrawn;
 }
 
+// ------------------------------------------------------------------
+
+void OutputDevice::DrawRenderGraphic( const Point& rPoint, const Size& rSize,
+                                      const ::vcl::RenderGraphic& rRenderGraphic )
+{
+    OSL_TRACE( "OutputDevice::DrawRenderGraphic()" );
+
+    if( mpMetaFile )
+        mpMetaFile->AddAction( new MetaRenderGraphicAction( rPoint, rSize, rRenderGraphic ) );
+
+    if( !rRenderGraphic.IsEmpty() )
+    {
+        ::vcl::RenderGraphicRasterizer  aRasterizer( rRenderGraphic );
+        BitmapEx                        aBmpEx;
+        const Size                      aSizePixel( LogicToPixel( rSize ) );
+        GDIMetaFile*                    pOldMetaFile = mpMetaFile;
+
+        mpMetaFile = NULL;
+        DrawBitmapEx( rPoint, rSize, aRasterizer.Rasterize( aSizePixel ) );
+        mpMetaFile = pOldMetaFile;
+    }
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/gdi/outdevnative.cxx b/vcl/source/gdi/outdevnative.cxx
index 8449828eb48a..52500a53e24f 100644
--- a/vcl/source/gdi/outdevnative.cxx
+++ b/vcl/source/gdi/outdevnative.cxx
@@ -31,10 +31,11 @@
 
 #include "vcl/outdev.hxx"
 #include "vcl/window.hxx"
-#include "vcl/salgdi.hxx"
 #include "vcl/salnativewidgets.hxx"
 #include "vcl/pdfextoutdevdata.hxx"
 
+#include "salgdi.hxx"
+
 // -----------------------------------------------------------------------
 
 static bool lcl_enableNativeWidget( const OutputDevice& i_rDevice )
diff --git a/vcl/source/gdi/outmap.cxx b/vcl/source/gdi/outmap.cxx
index 40c42a071025..a7e138361200 100644
--- a/vcl/source/gdi/outmap.cxx
+++ b/vcl/source/gdi/outmap.cxx
@@ -31,23 +31,25 @@
 
 #include <limits.h>
 
-#include <svsys.h>
 #include <tools/bigint.hxx>
 #include <tools/debug.hxx>
-#include <vcl/virdev.hxx>
-#include <vcl/svdata.hxx>
 #include <tools/poly.hxx>
+
+#include <vcl/virdev.hxx>
 #include <vcl/region.hxx>
-#include <vcl/region.h>
-#include <vcl/window.h>
 #include <vcl/wrkwin.hxx>
 #include <vcl/cursor.hxx>
 #include <vcl/metaact.hxx>
 #include <vcl/gdimtf.hxx>
 #include <vcl/lineinfo.hxx>
 #include <vcl/outdev.hxx>
-#include <vcl/outdev.h>
-#include <vcl/salgdi.hxx>
+
+#include <svdata.hxx>
+#include <region.h>
+#include <window.h>
+#include <outdev.h>
+#include <salgdi.hxx>
+
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <basegfx/polygon/b2dpolypolygon.hxx>
diff --git a/vcl/source/gdi/pdfextoutdevdata.cxx b/vcl/source/gdi/pdfextoutdevdata.cxx
index a626bacd9589..868163d5ded8 100644
--- a/vcl/source/gdi/pdfextoutdevdata.cxx
+++ b/vcl/source/gdi/pdfextoutdevdata.cxx
@@ -32,22 +32,25 @@
 #include "vcl/graph.hxx"
 #include "vcl/outdev.hxx"
 #include "vcl/gfxlink.hxx"
+#include "vcl/dllapi.h"
 #include "basegfx/polygon/b2dpolygon.hxx"
 #include "basegfx/polygon/b2dpolygontools.hxx"
 
 
 #include <boost/shared_ptr.hpp>
 #include <set>
+#include <map>
 
 namespace vcl
 {
-struct PDFExtOutDevDataSync
+struct SAL_DLLPRIVATE PDFExtOutDevDataSync
 {
     enum Action{    CreateNamedDest,
                     CreateDest,
                     CreateLink,
                     SetLinkDest,
                     SetLinkURL,
+                    RegisterDest,
                     CreateOutlineItem,
                     SetOutlineItemParent,
                     SetOutlineItemText,
@@ -74,7 +77,15 @@ struct PDFExtOutDevDataSync
     Action      eAct;
 };
 
-struct GlobalSyncData
+struct SAL_DLLPRIVATE PDFLinkDestination
+{
+    Rectangle               mRect;
+    MapMode                 mMapMode;
+    sal_Int32               mPageNr;
+    PDFWriter::DestAreaType mAreaType;
+};
+
+struct SAL_DLLPRIVATE GlobalSyncData
 {
     std::deque< PDFExtOutDevDataSync::Action >  mActions;
     std::deque< MapMode >                       mParaMapModes;
@@ -85,6 +96,7 @@ struct GlobalSyncData
     std::deque< PDFWriter::DestAreaType >       mParaDestAreaTypes;
     std::deque< PDFNote >                       mParaPDFNotes;
     std::deque< PDFWriter::PageTransition >     mParaPageTransitions;
+    ::std::map< sal_Int32, PDFLinkDestination > mFutureDestinations;
 
     sal_Int32 GetMappedId();
     sal_Int32 GetMappedStructId( sal_Int32 );
@@ -146,7 +158,7 @@ void GlobalSyncData::PlayGlobalActions( PDFWriter& rWriter )
     {
         switch( *aIter )
         {
-        case PDFExtOutDevDataSync::CreateNamedDest : //i56629
+            case PDFExtOutDevDataSync::CreateNamedDest : //i56629
             {
                  rWriter.Push( PUSH_MAPMODE );
                 rWriter.SetMapMode( mParaMapModes.front() );
@@ -198,6 +210,21 @@ void GlobalSyncData::PlayGlobalActions( PDFWriter& rWriter )
                 mParaOUStrings.pop_front();
             }
             break;
+            case PDFExtOutDevDataSync::RegisterDest :
+            {
+                const sal_Int32 nDestId = mParaInts.front();
+                mParaInts.pop_front();
+                OSL_ENSURE( mFutureDestinations.find( nDestId ) != mFutureDestinations.end(),
+                    "GlobalSyncData::PlayGlobalActions: DescribeRegisteredRequest has not been called for that destination!" );
+
+                PDFLinkDestination& rDest = mFutureDestinations[ nDestId ];
+
+                rWriter.Push( PUSH_MAPMODE );
+                rWriter.SetMapMode( rDest.mMapMode );
+                mParaIds.push_back( rWriter.RegisterDestReference( nDestId, rDest.mRect, rDest.mPageNr, rDest.mAreaType ) );
+                rWriter.Pop();
+            }
+            break;
             case PDFExtOutDevDataSync::CreateOutlineItem :
             {
                 sal_Int32 nParent = GetMappedId();
@@ -458,6 +485,7 @@ sal_Bool PageSyncData::PlaySyncPageAct( PDFWriter& rWriter, sal_uInt32& rCurGDIM
             case PDFExtOutDevDataSync::CreateLink:
             case PDFExtOutDevDataSync::SetLinkDest:
             case PDFExtOutDevDataSync::SetLinkURL:
+            case PDFExtOutDevDataSync::RegisterDest:
             case PDFExtOutDevDataSync::CreateOutlineItem:
             case PDFExtOutDevDataSync::SetOutlineItemParent:
             case PDFExtOutDevDataSync::SetOutlineItemText:
@@ -616,9 +644,28 @@ sal_Int32 PDFExtOutDevData::CreateNamedDest(const String& sDestName,  const Rect
     mpGlobalSyncData->mParaMapModes.push_back( mrOutDev.GetMapMode() );
     mpGlobalSyncData->mParaInts.push_back( nPageNr == -1 ? mnPage : nPageNr );
     mpGlobalSyncData->mParaDestAreaTypes.push_back( eType );
+
     return mpGlobalSyncData->mCurId++;
 }
 //<---i56629
+sal_Int32 PDFExtOutDevData::RegisterDest()
+{
+    const sal_Int32 nLinkDestID = mpGlobalSyncData->mCurId++;
+    mpGlobalSyncData->mActions.push_back( PDFExtOutDevDataSync::RegisterDest );
+    mpGlobalSyncData->mParaInts.push_back( nLinkDestID );
+
+    return nLinkDestID;
+}
+void PDFExtOutDevData::DescribeRegisteredDest( sal_Int32 nDestId, const Rectangle& rRect, sal_Int32 nPageNr, PDFWriter::DestAreaType eType )
+{
+    OSL_PRECOND( nDestId != -1, "PDFExtOutDevData::DescribeRegisteredDest: invalid destination Id!" );
+    PDFLinkDestination aLinkDestination;
+    aLinkDestination.mRect = rRect;
+    aLinkDestination.mMapMode = mrOutDev.GetMapMode();
+    aLinkDestination.mPageNr = nPageNr == -1 ? mnPage : nPageNr;
+    aLinkDestination.mAreaType = eType;
+    mpGlobalSyncData->mFutureDestinations[ nDestId ] = aLinkDestination;
+}
 sal_Int32 PDFExtOutDevData::CreateDest( const Rectangle& rRect, sal_Int32 nPageNr, PDFWriter::DestAreaType eType )
 {
     mpGlobalSyncData->mActions.push_back( PDFExtOutDevDataSync::CreateDest );
diff --git a/vcl/source/gdi/pdffontcache.cxx b/vcl/source/gdi/pdffontcache.cxx
index 2b5944377eac..61499fdc24d8 100644
--- a/vcl/source/gdi/pdffontcache.cxx
+++ b/vcl/source/gdi/pdffontcache.cxx
@@ -29,9 +29,9 @@
 #include "precompiled_vcl.hxx"
 
 #include "pdffontcache.hxx"
-#include <vcl/salgdi.hxx>
-#include <vcl/outfont.hxx>
-#include <vcl/sallayout.hxx>
+#include <salgdi.hxx>
+#include <outfont.hxx>
+#include <sallayout.hxx>
 
 using namespace vcl;
 
diff --git a/vcl/source/gdi/pdffontcache.hxx b/vcl/source/gdi/pdffontcache.hxx
index 30d075d23e42..f607f100c52c 100644
--- a/vcl/source/gdi/pdffontcache.hxx
+++ b/vcl/source/gdi/pdffontcache.hxx
@@ -31,8 +31,8 @@
 
 #include <sal/types.h>
 
-#include <vcl/sallayout.hxx>
-#include <vcl/salgdi.hxx>
+#include <sallayout.hxx>
+#include <salgdi.hxx>
 
 namespace vcl
 {
diff --git a/vcl/source/gdi/pdfwriter.cxx b/vcl/source/gdi/pdfwriter.cxx
index 4f56caf6e822..481ad2be3aa4 100644
--- a/vcl/source/gdi/pdfwriter.cxx
+++ b/vcl/source/gdi/pdfwriter.cxx
@@ -421,6 +421,10 @@ sal_Int32 PDFWriter::CreateLink( const Rectangle& rRect, sal_Int32 nPageNr )
 {
     return ((PDFWriterImpl*)pImplementation)->createLink( rRect, nPageNr );
 }
+sal_Int32 PDFWriter::RegisterDestReference( sal_Int32 nDestId, const Rectangle& rRect, sal_Int32 nPageNr, DestAreaType eType )
+{
+    return ((PDFWriterImpl*)pImplementation)->registerDestReference( nDestId, rRect, nPageNr, eType );
+}
 //--->i56629
 sal_Int32 PDFWriter::CreateNamedDest( const rtl::OUString& sDestName, const Rectangle& rRect, sal_Int32 nPageNr, PDFWriter::DestAreaType eType )
 {
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
index b9d76cd4faa5..91aec0e83ba5 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -34,42 +34,53 @@
 #include <algorithm>
 
 #include <tools/urlobj.hxx>
+
 #include <pdfwriter_impl.hxx>
+
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <basegfx/polygon/b2dpolypolygon.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
 #include <basegfx/polygon/b2dpolypolygoncutter.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
+
+#include <osl/thread.h>
+#include <osl/file.h>
+
+#include <rtl/crc.h>
+#include <rtl/digest.h>
 #include <rtl/ustrbuf.hxx>
+
 #include <tools/debug.hxx>
 #include <tools/zcodec.hxx>
 #include <tools/stream.hxx>
+
 #include <i18npool/mslangid.hxx>
+
 #include <vcl/virdev.hxx>
 #include <vcl/bmpacc.hxx>
 #include <vcl/bitmapex.hxx>
 #include <vcl/image.hxx>
-#include <vcl/outdev.h>
-#include <vcl/sallayout.hxx>
 #include <vcl/metric.hxx>
-#include <vcl/fontsubset.hxx>
-#include <vcl/textlayout.hxx>
-#include <vcl/cvtgrf.hxx>
-#include <svsys.h>
-#include <vcl/salgdi.hxx>
 #include <vcl/svapp.hxx>
-#include <osl/thread.h>
-#include <osl/file.h>
-#include <rtl/crc.h>
-#include <rtl/digest.h>
+#include <vcl/lineinfo.hxx>
+#include "vcl/cvtgrf.hxx"
+#include "vcl/strhelper.hxx"
+
+#include <fontsubset.hxx>
+#include <outdev.h>
+#include <sallayout.hxx>
+#include <textlayout.hxx>
+#include <salgdi.hxx>
+
+#include <icc/sRGB-IEC61966-2.1.hxx>
+
 #include <comphelper/processfactory.hxx>
+
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/util/URL.hpp>
+
 #include "cppuhelper/implbase1.hxx"
-#include <icc/sRGB-IEC61966-2.1.hxx>
-#include <vcl/lineinfo.hxx>
-#include "vcl/strhelper.hxx"
 
 using namespace vcl;
 
@@ -5582,7 +5593,7 @@ bool PDFWriterImpl::emitWidgetAnnotations()
             if(!m_bIsPDF_A1)
             {
                 OStringBuffer aDest;
-                if( rWidget.m_nDest != -1 && appendDest( rWidget.m_nDest, aDest ) )
+                if( rWidget.m_nDest != -1 && appendDest( m_aDestinationIdTranslation[ rWidget.m_nDest ], aDest ) )
                 {
                     aLine.append( "/AA<</D<</Type/Action/S/GoTo/D " );
                     aLine.append( aDest.makeStringAndClear() );
@@ -10819,6 +10830,11 @@ sal_Int32 PDFWriterImpl::createDest( const Rectangle& rRect, sal_Int32 nPageNr,
     return nRet;
 }
 
+sal_Int32 PDFWriterImpl::registerDestReference( sal_Int32 nDestId, const Rectangle& rRect, sal_Int32 nPageNr, PDFWriter::DestAreaType eType )
+{
+    return m_aDestinationIdTranslation[ nDestId ] = createDest( rRect, nPageNr, eType );
+}
+
 sal_Int32 PDFWriterImpl::setLinkDest( sal_Int32 nLinkId, sal_Int32 nDestId )
 {
     if( nLinkId < 0 || nLinkId >= (sal_Int32)m_aLinks.size() )
diff --git a/vcl/source/gdi/pdfwriter_impl.hxx b/vcl/source/gdi/pdfwriter_impl.hxx
index a8ae5164d385..8649beff6ceb 100644
--- a/vcl/source/gdi/pdfwriter_impl.hxx
+++ b/vcl/source/gdi/pdfwriter_impl.hxx
@@ -38,7 +38,7 @@
 #include "vcl/gradient.hxx"
 #include "vcl/hatch.hxx"
 #include "vcl/wall.hxx"
-#include "vcl/outdata.hxx"
+#include "outdata.hxx"
 #include "rtl/strbuf.hxx"
 #include "rtl/cipher.h"
 #include "rtl/digest.h"
@@ -46,7 +46,7 @@
 #include "com/sun/star/lang/Locale.hpp"
 #include <sal/macros.h>
 
-#include <vcl/sallayout.hxx>
+#include <sallayout.hxx>
 #include "pdffontcache.hxx"
 
 #include <vector>
@@ -613,6 +613,9 @@ private:
        dest id is always the dest's position in this vector
      */
     std::vector<PDFDest>                m_aDests;
+    /** contains destinations accessible via a public Id, instead of being linked to by an ordinary link
+    */
+    ::std::map< sal_Int32, sal_Int32 >  m_aDestinationIdTranslation;
     /* contains all links ever set during PDF creation,
        link id is always the link's position in this vector
     */
@@ -1279,6 +1282,7 @@ public:
     // links
     sal_Int32 createLink( const Rectangle& rRect, sal_Int32 nPageNr = -1 );
     sal_Int32 createDest( const Rectangle& rRect, sal_Int32 nPageNr = -1, PDFWriter::DestAreaType eType = PDFWriter::XYZ );
+    sal_Int32 registerDestReference( sal_Int32 nDestId, const Rectangle& rRect, sal_Int32 nPageNr = -1, PDFWriter::DestAreaType eType = PDFWriter::XYZ );
     sal_Int32 setLinkDest( sal_Int32 nLinkId, sal_Int32 nDestId );
     sal_Int32 setLinkURL( sal_Int32 nLinkId, const rtl::OUString& rURL );
     void setLinkPropertyId( sal_Int32 nLinkId, sal_Int32 nPropertyId );
diff --git a/vcl/source/gdi/pdfwriter_impl2.cxx b/vcl/source/gdi/pdfwriter_impl2.cxx
index caa19380394c..17b684e6a675 100644
--- a/vcl/source/gdi/pdfwriter_impl2.cxx
+++ b/vcl/source/gdi/pdfwriter_impl2.cxx
@@ -35,9 +35,13 @@
 #include "vcl/metaact.hxx"
 #include "vcl/bmpacc.hxx"
 #include "vcl/graph.hxx"
-#include "vcl/svdata.hxx"
+#include "vcl/rendergraphicrasterizer.hxx"
+
+#include "svdata.hxx"
+
 #include "unotools/streamwrap.hxx"
 #include "unotools/processfactory.hxx"
+
 #include "comphelper/processfactory.hxx"
 
 #include "com/sun/star/beans/PropertyValue.hpp"
@@ -1044,6 +1048,17 @@ void PDFWriterImpl::playMetafile( const GDIMetaFile& i_rMtf, vcl::PDFExtOutDevDa
                 }
                 break;
 
+                case( META_RENDERGRAPHIC_ACTION ):
+                {
+                    const MetaRenderGraphicAction* pA = static_cast< const MetaRenderGraphicAction* >( pAction );
+                    const ::vcl::RenderGraphicRasterizer aRasterizer( pA->GetRenderGraphic() );
+
+                    implWriteBitmapEx( pA->GetPoint(), pA->GetSize(),
+                                       aRasterizer.Rasterize( pDummyVDev->LogicToPixel( pA->GetSize() ) ),
+                                       pDummyVDev, i_rContext );
+                }
+                break;
+
                 default:
                     // #i24604# Made assertion fire only once per
                     // metafile. The asserted actions here are all
diff --git a/vcl/source/gdi/polyscan.cxx b/vcl/source/gdi/polyscan.cxx
deleted file mode 100644
index 81d05bf33354..000000000000
--- a/vcl/source/gdi/polyscan.cxx
+++ /dev/null
@@ -1,361 +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 <string.h>
-#include <tools/new.hxx>
-#include <vcl/salbtype.hxx>
-#include "polyscan.hxx"
-#include <tools/poly.hxx>
-
-// ----------------
-// - PolyScanline -
-// ----------------
-
-PolyScanline::PolyScanline() :
-        mpFirst ( NULL ),
-        mpLast  ( NULL ),
-        mpAct   ( NULL ),
-        mnLeft  ( 0L ),
-        mnRight ( 0L )
-{
-}
-
-// ------------------------------------------------------------------------
-
-PolyScanline::~PolyScanline()
-{
-    ImplDelete();
-}
-
-// ------------------------------------------------------------------------
-
-void PolyScanline::ImplDelete()
-{
-    ScanlinePoint* pAct = mpFirst;
-
-    while( pAct )
-    {
-        ScanlinePoint* pNext = pAct->mpNext;
-        delete pAct;
-        pAct = pNext;
-    }
-
-    mnLeft = mnRight = 0L;
-    mpFirst = mpAct = mpLast = NULL;
-}
-
-// ------------------------------------------------------------------------
-
-void PolyScanline::Insert( long nX )
-{
-    // first point to insert?
-    if( !mpFirst )
-        mpLast = mpFirst = new ScanlinePoint( mnLeft = mnRight = nX, NULL );
-    else
-    {
-        // insert at the beginning of the scanline
-        if( nX <= mpFirst->mnX )
-            mpFirst = new ScanlinePoint( mnLeft = nX, mpFirst );
-        else if( nX >= mnRight )
-            mpLast = mpLast->mpNext = new ScanlinePoint( mnRight = nX, NULL );
-        else
-        {
-            ScanlinePoint* pLast = mpFirst;
-            ScanlinePoint* pAct = mpFirst->mpNext;
-
-            while( pAct )
-            {
-                // insert in the midlle of the scanline?
-                if( nX <= pAct->mnX )
-                {
-                    pLast->mpNext = new ScanlinePoint( nX, pAct );
-                    break;
-                }
-
-                pLast = pAct;
-                pAct = pAct->mpNext;
-            }
-        }
-    }
-}
-
-// ------------------------------------------------------------------------
-
-void PolyScanline::Set( long nStart, long nEnd )
-{
-    if( mpFirst )
-        ImplDelete();
-
-    if( nStart <= nEnd )
-        mpFirst = new ScanlinePoint( mnLeft = nStart, mpLast = new ScanlinePoint( mnRight = nEnd, NULL ) );
-    else
-        mpFirst = new ScanlinePoint( mnLeft = nEnd, mpLast = new ScanlinePoint( mnRight = nStart, NULL ) );
-}
-
-// ------------------------------------------------------------------------
-
-sal_Bool PolyScanline::GetFirstSegment( PolyScanSegment& rSegment )
-{
-    sal_Bool bRet = GetFirstX( rSegment.mnStart );
-
-    if( bRet && !GetNextX( rSegment.mnEnd ) )
-        rSegment.mnEnd = rSegment.mnStart;
-
-    return bRet;
-}
-
-// ------------------------------------------------------------------------
-
-sal_Bool PolyScanline::GetNextSegment( PolyScanSegment& rSegment )
-{
-    sal_Bool bRet = GetNextX( rSegment.mnStart );
-
-    if( bRet && !GetNextX( rSegment.mnEnd ) )
-        rSegment.mnEnd = rSegment.mnStart;
-
-    return bRet;
-}
-
-// ---------------
-// - PolyScanner -
-// ---------------
-
-PolyScanner::PolyScanner( const Rectangle& rRect )
-{
-    if( !rRect.IsEmpty() )
-    {
-        Rectangle   aRect( rRect );
-        sal_uLong       nHeight;
-
-        aRect.Justify();
-        mnLeft = aRect.Left();
-        mnTop = aRect.Top();
-        mnRight = aRect.Right();
-        mnBottom = aRect.Bottom();
-        mpArray = new PolyScanline[ nHeight = Height() ];
-
-        for( sal_uLong i = 0UL; i < nHeight; i++ )
-            mpArray[ i ].Set( mnLeft, mnRight );
-    }
-    else
-    {
-        mnLeft = mnTop = mnRight = mnBottom = 0L;
-        mpArray = NULL;
-    }
-}
-
-// ------------------------------------------------------------------------
-
-PolyScanner::PolyScanner( const Polygon& rPoly )
-{
-    const long nCount = rPoly.GetSize();
-
-    if( nCount )
-    {
-        long    nLast = nCount - 1;
-        Point   aFirst( rPoly[ 0 ] );
-        Point   aLast( rPoly[ (sal_uInt16) nLast ] );
-
-        while( nLast && ( aLast == aFirst ) )
-            aLast = rPoly[ (sal_uInt16) --nLast ];
-
-        if( !nLast )
-        {
-            aLast = rPoly[ 0 ];
-            mnLeft = mnRight = aLast.X();
-            mnTop = mnBottom = aLast.Y();
-            mpArray = new PolyScanline[ 1UL ];
-            mpArray[ 0 ].Set( mnLeft, mnRight );
-        }
-        else
-        {
-            const Rectangle aRect( rPoly.GetBoundRect() );
-            sal_uLong           nHeight;
-
-            mnLeft = aRect.Left();
-            mnTop = aRect.Top();
-            mnRight = aRect.Right();
-            mnBottom = aRect.Bottom();
-            aLast = aFirst;
-            mpArray = new PolyScanline[ nHeight = Height() ];
-
-            for( long i = 1L; i <= nLast; i++ )
-            {
-                const Point& rPt = rPoly[ (sal_uInt16) i ];
-
-                if( rPt != aLast )
-                {
-                    InsertLine( aLast, rPt );
-                    aLast = rPt;
-                }
-            }
-
-            InsertLine( aLast, aFirst );
-        }
-    }
-    else
-        mpArray = NULL;
-}
-
-// ------------------------------------------------------------------------
-
-PolyScanner::PolyScanner( const PolyPolygon& rPolyPoly )
-{
-    mpArray = NULL;
-}
-
-// ------------------------------------------------------------------------
-
-PolyScanner::~PolyScanner()
-{
-    delete[] mpArray;
-}
-
-// ------------------------------------------------------------------------
-
-PolyScanline* PolyScanner::operator[]( sal_uLong nPos ) const
-{
-    DBG_ASSERT( nPos < Count(), "nPos out of range!" );
-    return( mpArray ? ( mpArray + nPos ) : NULL );
-}
-
-// ------------------------------------------------------------------------
-
-void PolyScanner::InsertLine( const Point& rStart, const Point& rEnd )
-{
-    long nX, nY;
-
-    if( rStart.Y() == rEnd.Y() )
-        mpArray[ rStart.Y() - mnTop ].Insert( rStart.X() );
-    else if( rStart.X() == rEnd.X() )
-    {
-        // vertical line
-        const long nEndY = rEnd.Y();
-
-        nX = rStart.X();
-        nY = rStart.Y();
-
-        if( nEndY > nY )
-            while( nY < nEndY )
-                mpArray[ nY++ - mnTop ].Insert( nX );
-        else
-            while( nY > nEndY )
-                mpArray[ nY-- - mnTop ].Insert( nX );
-    }
-    else
-    {
-        const long  nDX = labs( rEnd.X() - rStart.X() );
-        const long  nDY = labs( rEnd.Y() - rStart.Y() );
-        const long  nStartX = rStart.X();
-        const long  nStartY = rStart.Y();
-        const long  nEndX = rEnd.X();
-        const long  nEndY = rEnd.Y();
-        const long  nXInc = ( nStartX < nEndX ) ? 1L : -1L;
-        const long  nYInc = ( nStartY < nEndY ) ? 1L : -1L;
-        long        nLastX = nStartX;
-        long        nLastY = nStartY;
-        sal_Bool        bLast = sal_False;
-
-        mpArray[ nStartY - mnTop ].Insert( nStartX );
-
-        if( nDX >= nDY )
-        {
-            const long  nDYX = ( nDY - nDX ) << 1;
-            const long  nDY2 = nDY << 1;
-            long        nD = nDY2 - nDX;
-
-            for( nX = nStartX, nY = nLastY = nStartY; nX != nEndX; )
-            {
-                if( nY != nLastY )
-                {
-                    if( bLast )
-                        mpArray[ nLastY - mnTop ].Insert( nLastX );
-
-                    mpArray[ nY - mnTop ].Insert( nX );
-                    bLast = sal_False;
-                }
-                else
-                    bLast = sal_True;
-
-                nLastX = nX;
-                nLastY = nY;
-
-                if( nD < 0L )
-                    nD += nDY2;
-                else
-                {
-                    nD += nDYX;
-                    nY += nYInc;
-                }
-
-                nX += nXInc;
-            }
-        }
-        else
-        {
-            const long  nDYX = ( nDX - nDY ) << 1;
-            const long  nDY2 = nDX << 1;
-            long        nD = nDY2 - nDY;
-
-            for( nX = nStartX, nY = nStartY; nY != nEndY; )
-            {
-                if( nY != nLastY )
-                {
-                    if( bLast )
-                        mpArray[ nLastY - mnTop ].Insert( nLastX );
-
-                    mpArray[ nY - mnTop ].Insert( nX );
-                    bLast = sal_False;
-                }
-                else
-                    bLast = sal_True;
-
-                nLastX = nX;
-                nLastY = nY;
-
-                if( nD < 0L )
-                    nD += nDY2;
-                else
-                {
-                    nD += nDYX;
-                    nX += nXInc;
-                }
-
-                nY += nYInc;
-            }
-        }
-
-        if( bLast )
-            mpArray[ nLastY - mnTop ].Insert( nLastX );
-    }
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx
index 15964d9da09f..4c9461fbcb97 100644
--- a/vcl/source/gdi/print.cxx
+++ b/vcl/source/gdi/print.cxx
@@ -32,29 +32,29 @@
 #define ENABLE_BYTESTRING_STREAM_OPERATORS
 #include <list>
 
-#include <svsys.h>
-#include <vcl/salinst.hxx>
-#include <vcl/salgdi.hxx>
-#include <vcl/salptype.hxx>
-#include <vcl/salprn.hxx>
-
-#include <vcl/unohelp.hxx>
 #include <tools/debug.hxx>
 #include <tools/resary.hxx>
 #include <tools/stream.hxx>
 #include <tools/vcompat.hxx>
-#include <vcl/svdata.hxx>
+
+#include <vcl/unohelp.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/wrkwin.hxx>
-#include <vcl/jobset.h>
-#include <vcl/outdev.h>
 #include <vcl/virdev.hxx>
 #include <vcl/window.hxx>
-#include <vcl/print.h>
 #include <vcl/gdimtf.hxx>
 #include <vcl/metaact.hxx>
 #include <vcl/print.hxx>
-#include <vcl/svids.hrc>
+
+#include <salinst.hxx>
+#include <salgdi.hxx>
+#include <salptype.hxx>
+#include <salprn.hxx>
+#include <svdata.hxx>
+#include <svids.hrc>
+#include <jobset.h>
+#include <outdev.h>
+#include <print.h>
 
 #include <comphelper/processfactory.hxx>
 
diff --git a/vcl/source/gdi/print2.cxx b/vcl/source/gdi/print2.cxx
index 1f160dc3bbb9..add5071ef2dd 100644
--- a/vcl/source/gdi/print2.cxx
+++ b/vcl/source/gdi/print2.cxx
@@ -34,18 +34,22 @@
 #include <utility>
 #include <list>
 #include <vector>
+
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
+
 #include <tools/debug.hxx>
+
 #include <vcl/virdev.hxx>
 #include <vcl/metaact.hxx>
 #include <vcl/gdimtf.hxx>
-#include <vcl/print.h>
 #include <vcl/salbtype.hxx>
 #include <vcl/print.hxx>
 #include <vcl/svapp.hxx>
-#include <vcl/sallayout.hxx>
 #include <vcl/bmpacc.hxx>
+#include <vcl/rendergraphicrasterizer.hxx>
+
+#include <print.h>
 
 #include "pdfwriter_impl.hxx"
 
@@ -112,6 +116,9 @@ static bool ImplIsActionSpecial( const MetaAction& rAct )
         case META_BMPEXSCALEPART_ACTION:
             return static_cast<const MetaBmpExScalePartAction&>(rAct).GetBitmapEx().IsTransparent();
 
+        case META_RENDERGRAPHIC_ACTION:
+            return true;
+
         default:
             return false;
     }
@@ -199,6 +206,16 @@ static void ImplConvertTransparentAction( GDIMetaFile&        o_rMtf,
                 aBmpEx = static_cast<const MetaBmpExScaleAction&>(rAct).GetBitmapEx();
                 break;
 
+            case META_RENDERGRAPHIC_ACTION:
+            {
+                const ::vcl::RenderGraphicRasterizer aRasterizer( static_cast<const MetaRenderGraphicAction&>(rAct).
+                                                                      GetRenderGraphic() );
+
+                aBmpEx = aRasterizer.Rasterize( rStateOutDev.LogicToPixel(
+                             static_cast<const MetaRenderGraphicAction&>(rAct).GetSize() ) );
+                break;
+            }
+
             case META_TRANSPARENT_ACTION:
 
             default:
@@ -266,6 +283,11 @@ static void ImplConvertTransparentAction( GDIMetaFile&        o_rMtf,
                                        static_cast<const MetaBmpExScalePartAction&>(rAct).GetSrcSize(),
                                        aBmp ));
                 break;
+            case META_RENDERGRAPHIC_ACTION:
+                o_rMtf.AddAction( new MetaBmpScaleAction(
+                                       static_cast<const MetaRenderGraphicAction&>(rAct).GetPoint(),
+                                       static_cast<const MetaRenderGraphicAction&>(rAct).GetSize(),
+                                       aBmp ));
             default:
                 OSL_FAIL("Unexpected case");
                 break;
@@ -378,6 +400,7 @@ static bool ImplIsNotTransparent( const MetaAction& rAct, const OutputDevice& rO
         case META_TEXTRECT_ACTION:
         case META_STRETCHTEXT_ACTION:
         case META_TEXTLINE_ACTION:
+        case META_RENDERGRAPHIC_ACTION:
             // all other actions: generate non-transparent output
             bRet = true;
             break;
@@ -630,7 +653,14 @@ static Rectangle ImplCalcActionBounds( const MetaAction& rAct, const OutputDevic
 
         case META_TEXTLINE_ACTION:
             OSL_FAIL("META_TEXTLINE_ACTION not supported");
-            break;
+        break;
+
+        case( META_RENDERGRAPHIC_ACTION ):
+        {
+            const MetaRenderGraphicAction& rRenderAct = static_cast<const MetaRenderGraphicAction&>(rAct);
+            aActionBounds = Rectangle( rRenderAct.GetPoint(), rRenderAct.GetSize() );
+        }
+        break;
 
         default:
             break;
@@ -657,6 +687,7 @@ static bool ImplIsActionHandlingTransparency( const MetaAction& rAct )
         case META_BMPEX_ACTION:
         case META_BMPEXSCALE_ACTION:
         case META_BMPEXSCALEPART_ACTION:
+        case META_RENDERGRAPHIC_ACTION:
             return true;
 
         default:
diff --git a/vcl/source/gdi/print3.cxx b/vcl/source/gdi/print3.cxx
index a769e948372a..61a40af43bdd 100644
--- a/vcl/source/gdi/print3.cxx
+++ b/vcl/source/gdi/print3.cxx
@@ -29,16 +29,17 @@
 #include "precompiled_vcl.hxx"
 
 #include "vcl/print.hxx"
-#include "vcl/prndlg.hxx"
 #include "vcl/svapp.hxx"
-#include "vcl/svdata.hxx"
-#include "vcl/salinst.hxx"
-#include "vcl/salprn.hxx"
-#include "vcl/svids.hrc"
 #include "vcl/metaact.hxx"
 #include "vcl/msgbox.hxx"
 #include "vcl/configsettings.hxx"
 
+#include "printdlg.hxx"
+#include "svdata.hxx"
+#include "salinst.hxx"
+#include "salprn.hxx"
+#include "svids.hrc"
+
 #include "tools/urlobj.hxx"
 
 #include "com/sun/star/ui/dialogs/XFilePicker.hpp"
diff --git a/vcl/source/gdi/region.cxx b/vcl/source/gdi/region.cxx
index 480a17a9f88b..3992b774630d 100644
--- a/vcl/source/gdi/region.cxx
+++ b/vcl/source/gdi/region.cxx
@@ -30,14 +30,15 @@
 #include "precompiled_vcl.hxx"
 
 #include <limits.h>
+
 #include <tools/vcompat.hxx>
-#include <vcl/salbtype.hxx>
 #include <tools/stream.hxx>
 #include <tools/debug.hxx>
-#include <vcl/region.h>
 #include <vcl/region.hxx>
 #include <vcl/regband.hxx>
 
+#include <region.h>
+
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
diff --git a/vcl/source/gdi/rendergraphic.cxx b/vcl/source/gdi/rendergraphic.cxx
new file mode 100644
index 000000000000..10b6064cc57c
--- /dev/null
+++ b/vcl/source/gdi/rendergraphic.cxx
@@ -0,0 +1,240 @@
+/*************************************************************************
+ *
+ * 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.
+ *
+ ************************************************************************/
+
+#include <vcl/rendergraphic.hxx>
+#include <vcl/rendergraphicrasterizer.hxx>
+#include <vcl/mapmod.hxx>
+#include <tools/stream.hxx>
+#include <tools/vcompat.hxx>
+
+#include <cstring>
+#include <cstdio>
+
+namespace vcl
+{
+
+// -----------------
+// - RenderGraphic -
+// -----------------
+RenderGraphic::RenderGraphic( ) :
+    mnGraphicDataLength( 0 )
+{
+}
+
+// -------------------------------------------------------------------------
+
+RenderGraphic::RenderGraphic( const RenderGraphic& rRenderGraphic ) :
+    maGraphicData( rRenderGraphic.maGraphicData ),
+    mnGraphicDataLength( rRenderGraphic.mnGraphicDataLength ),
+    maGraphicDataMimeType( rRenderGraphic.maGraphicDataMimeType ),
+    mapPrefMapMode( rRenderGraphic.mapPrefMapMode.get() ? new MapMode( *rRenderGraphic.mapPrefMapMode ) : NULL ),
+    mapPrefSize( rRenderGraphic.mapPrefSize.get() ? new Size( *rRenderGraphic.mapPrefSize ) : NULL )
+{
+}
+
+// -------------------------------------------------------------------------
+
+RenderGraphic::RenderGraphic( const GraphicData& rGraphicData,
+                              sal_uInt32 nGraphicDataLength,
+                              const rtl::OUString& rGraphicDataMimeType ) :
+    maGraphicData( rGraphicData ),
+    mnGraphicDataLength( nGraphicDataLength ),
+    maGraphicDataMimeType( rGraphicDataMimeType )
+{
+    ImplCheckData( );
+}
+
+// -------------------------------------------------------------------------
+
+RenderGraphic::RenderGraphic( const rtl::OUString& rGraphicDataMimeType,
+                              sal_uInt32 nGraphicDataLength,
+                              const sal_uInt8* pGraphicData ) :
+    maGraphicData(),
+    mnGraphicDataLength( nGraphicDataLength ),
+    maGraphicDataMimeType( rGraphicDataMimeType )
+{
+    if( rGraphicDataMimeType.getLength( ) && nGraphicDataLength )
+    {
+        maGraphicData.reset( new sal_uInt8[ nGraphicDataLength ] );
+
+        if( pGraphicData )
+        {
+            memcpy( maGraphicData.get(), pGraphicData, nGraphicDataLength );
+        }
+    }
+    else
+    {
+        ImplCheckData( );
+    }
+}
+
+// -------------------------------------------------------------------------
+
+RenderGraphic::~RenderGraphic( )
+{
+}
+
+// -------------------------------------------------------------------------
+
+RenderGraphic& RenderGraphic::operator=(const RenderGraphic& rRenderGraphic )
+{
+    maGraphicData = rRenderGraphic.maGraphicData;
+    mnGraphicDataLength = rRenderGraphic.mnGraphicDataLength;
+    maGraphicDataMimeType = rRenderGraphic.maGraphicDataMimeType;
+    mapPrefMapMode.reset( rRenderGraphic.mapPrefMapMode.get() ? new MapMode( *rRenderGraphic.mapPrefMapMode ) : NULL );
+    mapPrefSize.reset( rRenderGraphic.mapPrefSize.get() ? new Size( *rRenderGraphic.mapPrefSize ) : NULL );
+
+    return( *this );
+}
+
+// -------------------------------------------------------------------------
+
+bool RenderGraphic::operator==(const RenderGraphic& rRenderGraphic ) const
+{
+    return( ( rRenderGraphic.mnGraphicDataLength == mnGraphicDataLength ) &&
+            ( rRenderGraphic.maGraphicData == maGraphicData ) &&
+            ( rRenderGraphic.maGraphicDataMimeType.equalsIgnoreAsciiCase( maGraphicDataMimeType ) ) );
+}
+
+// -------------------------------------------------------------------------
+
+bool RenderGraphic::operator!() const
+{
+    return( ( 0 == maGraphicDataMimeType.getLength( ) ) ||
+            ( 0 == mnGraphicDataLength ) ||
+            !maGraphicData.get( ) );
+}
+
+// -------------------------------------------------------------------------
+
+bool RenderGraphic::IsEqual( const RenderGraphic& rRenderGraphic ) const
+{
+    bool bRet = ( rRenderGraphic.mnGraphicDataLength == mnGraphicDataLength ) &&
+                ( rRenderGraphic.maGraphicDataMimeType.equalsIgnoreAsciiCase( maGraphicDataMimeType ) );
+
+    if( bRet && mnGraphicDataLength && ( rRenderGraphic.maGraphicData != maGraphicData ) )
+    {
+        bRet = ( 0 == memcmp( rRenderGraphic.maGraphicData.get( ),
+                              maGraphicData.get( ),
+                              mnGraphicDataLength ) );
+    }
+
+    return( bRet );
+}
+
+// -------------------------------------------------------------------------
+
+const MapMode& RenderGraphic::GetPrefMapMode() const
+{
+    ImplGetDefaults();
+    return( *mapPrefMapMode );
+}
+
+// -------------------------------------------------------------------------
+
+const Size& RenderGraphic::GetPrefSize() const
+{
+    ImplGetDefaults();
+    return( *mapPrefSize );
+}
+
+// -------------------------------------------------------------------------
+
+BitmapEx RenderGraphic::GetReplacement() const
+{
+    const RenderGraphicRasterizer aRasterizer( *this );
+
+    return( aRasterizer.GetReplacement() );
+}
+
+// -------------------------------------------------------------------------
+
+void RenderGraphic::ImplCheckData( )
+{
+    if( !( *this ) )
+    {
+        maGraphicData.reset( );
+        mnGraphicDataLength = 0;
+        maGraphicDataMimeType = ::rtl::OUString();
+        mapPrefMapMode.reset();
+        mapPrefSize.reset();
+    }
+}
+
+// -------------------------------------------------------------------------
+
+void RenderGraphic::ImplGetDefaults() const
+{
+    if( !mapPrefMapMode.get() || !mapPrefSize.get() )
+    {
+        const RenderGraphicRasterizer aRasterizer( *this );
+
+        mapPrefMapMode.reset( new MapMode( aRasterizer.GetPrefMapMode() ) );
+        mapPrefSize.reset( new Size( aRasterizer.GetPrefSize() ) );
+    }
+}
+
+// -------------------------------------------------------------------------
+
+::SvStream& operator>>( ::SvStream& rIStm, RenderGraphic& rRenderGraphic )
+{
+    ::VersionCompat aVCompat( rIStm, STREAM_READ );
+    String          aGraphicDataMimeType;
+    sal_uInt32      nGraphicDataLength = 0;
+
+    rIStm.ReadByteString( aGraphicDataMimeType, RTL_TEXTENCODING_ASCII_US );
+    rIStm >> nGraphicDataLength;
+
+    rRenderGraphic = RenderGraphic( aGraphicDataMimeType, nGraphicDataLength );
+
+    if( !rRenderGraphic.IsEmpty() )
+    {
+        rIStm.Read( rRenderGraphic.GetGraphicData().get(), nGraphicDataLength );
+    }
+
+    return rIStm;
+}
+
+// ------------------------------------------------------------------
+
+::SvStream& operator<<( ::SvStream& rOStm, const RenderGraphic& rRenderGraphic )
+{
+    ::VersionCompat     aVCompat( rOStm, STREAM_WRITE, 1 );
+    const sal_uInt32    nGraphicDataLength = rRenderGraphic.GetGraphicDataLength();
+
+    rOStm.WriteByteString( rRenderGraphic.GetGraphicDataMimeType(), RTL_TEXTENCODING_ASCII_US );
+    rOStm << nGraphicDataLength;
+
+    if( nGraphicDataLength )
+    {
+        rOStm.Write( rRenderGraphic.GetGraphicData().get(), nGraphicDataLength );
+    }
+
+    return rOStm;
+}
+
+} // VCL
diff --git a/vcl/source/gdi/rendergraphicrasterizer.cxx b/vcl/source/gdi/rendergraphicrasterizer.cxx
new file mode 100644
index 000000000000..29c9863335b3
--- /dev/null
+++ b/vcl/source/gdi/rendergraphicrasterizer.cxx
@@ -0,0 +1,400 @@
+/*************************************************************************
+ *
+ * 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.
+ *
+ ************************************************************************/
+
+#include <vcl/rendergraphicrasterizer.hxx>
+#include <vcl/svapp.hxx>
+#include <vcl/wrkwin.hxx>
+#include <vcl/virdev.hxx>
+#include <vcl/unohelp.hxx>
+#include <vcl/bmpacc.hxx>
+#include <vcl/graph.hxx>
+#include <tools/stream.hxx>
+#include <comphelper/processfactory.hxx>
+#include <unotools/streamwrap.hxx>
+
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+
+#define VCL_SERVICENAME_RASTERIZER_SVG  "com.sun.star.graphic.GraphicRasterizer_RSVG"
+
+using namespace com::sun::star;
+
+namespace vcl
+{
+// ---------------------------------------------------------
+// - maximum extent in pixel for graphics to be rasterized -
+// ---------------------------------------------------------
+
+static const sal_uInt32 nRasterizerDefaultExtent = 4096;
+
+// ---------------------------
+// - RenderGraphicRasterizer -
+// ---------------------------
+
+RenderGraphicRasterizer::RenderGraphicRasterizer( const RenderGraphic& rRenderGraphic ) :
+    maRenderGraphic( rRenderGraphic ),
+    mfRotateAngle( 0.0 ),
+    mfShearAngleX( 0.0 ),
+    mfShearAngleY( 0.0 )
+{
+}
+
+// -------------------------------------------------------------------------
+
+RenderGraphicRasterizer::RenderGraphicRasterizer( const RenderGraphicRasterizer& rRenderGraphicRasterizer ) :
+    maRenderGraphic( rRenderGraphicRasterizer.maRenderGraphic ),
+    mxRasterizer( rRenderGraphicRasterizer.mxRasterizer ),
+    maBitmapEx( rRenderGraphicRasterizer.maBitmapEx ),
+    maDefaultSizePixel( rRenderGraphicRasterizer.maDefaultSizePixel ),
+    mfRotateAngle( rRenderGraphicRasterizer.mfRotateAngle ),
+    mfShearAngleX( rRenderGraphicRasterizer.mfShearAngleX ),
+    mfShearAngleY( rRenderGraphicRasterizer.mfShearAngleY )
+{
+}
+
+// -------------------------------------------------------------------------
+
+RenderGraphicRasterizer::~RenderGraphicRasterizer()
+{
+}
+
+// -------------------------------------------------------------------------
+
+RenderGraphicRasterizer& RenderGraphicRasterizer::operator=(
+    const RenderGraphicRasterizer& rRenderGraphicRasterizer )
+{
+    maRenderGraphic = rRenderGraphicRasterizer.maRenderGraphic;
+    maBitmapEx = rRenderGraphicRasterizer.maBitmapEx;
+    maDefaultSizePixel = rRenderGraphicRasterizer.maDefaultSizePixel;
+    mfRotateAngle = rRenderGraphicRasterizer.mfRotateAngle;
+    mfShearAngleX = rRenderGraphicRasterizer.mfShearAngleX;
+    mfShearAngleY = rRenderGraphicRasterizer.mfShearAngleY;
+    mxRasterizer = rRenderGraphicRasterizer.mxRasterizer;
+
+    return( *this );
+}
+
+// -------------------------------------------------------------------------
+
+const Size& RenderGraphicRasterizer::GetDefaultSizePixel() const
+{
+    const_cast< RenderGraphicRasterizer* >( this )->InitializeRasterizer();
+
+    return( maDefaultSizePixel );
+}
+
+// -------------------------------------------------------------------------
+
+BitmapEx RenderGraphicRasterizer::GetReplacement() const
+{
+    BitmapEx aRet( Rasterize( GetDefaultSizePixel() ) );
+
+    aRet.SetPrefSize( GetPrefSize() );
+    aRet.SetPrefMapMode( GetPrefMapMode() );
+
+    return( aRet );
+}
+
+// -------------------------------------------------------------------------
+
+Size RenderGraphicRasterizer::GetPrefSize() const
+{
+    const Size                      aSizePixel( GetDefaultSizePixel() );
+    std::auto_ptr< VirtualDevice >  apCompVDev;
+    OutputDevice*                   pCompDev = NULL;
+
+#ifndef NO_GETAPPWINDOW
+    pCompDev = Application::GetAppWindow();
+#endif
+
+    if( !pCompDev )
+    {
+        apCompVDev.reset( new VirtualDevice );
+        pCompDev = apCompVDev.get();
+    }
+
+    return( pCompDev->PixelToLogic( aSizePixel, GetPrefMapMode() ) );
+}
+
+// -------------------------------------------------------------------------
+
+MapMode RenderGraphicRasterizer::GetPrefMapMode() const
+{
+    return( MapMode( MAP_100TH_MM ) );
+}
+
+// -------------------------------------------------------------------------
+
+const BitmapEx& RenderGraphicRasterizer::Rasterize( const Size& rSizePixel,
+                                                    double fRotateAngle,
+                                                    double fShearAngleX,
+                                                    double fShearAngleY,
+                                                    sal_uInt32 nMaxExtent ) const
+{
+    const bool bRasterize = !maRenderGraphic.IsEmpty() &&
+                            rSizePixel.Width() && rSizePixel.Height() &&
+                            ( maBitmapEx.IsEmpty() ||
+                              ( rSizePixel != maBitmapEx.GetSizePixel() ) ||
+                              ( fRotateAngle != mfRotateAngle ) ||
+                              ( fShearAngleX != mfShearAngleX ) ||
+                              ( fShearAngleY != mfShearAngleY ) );
+
+    if( bRasterize )
+    {
+        const_cast< RenderGraphicRasterizer* >( this )->InitializeRasterizer();
+
+        if( mxRasterizer.is() )
+        {
+            sal_uInt32 nWidth = labs( rSizePixel.Width() );
+            sal_uInt32 nHeight = labs( rSizePixel.Height() );
+
+            // limiting the extent of the rastered bitmap
+            if( VCL_RASTERIZER_UNLIMITED_EXTENT != nMaxExtent )
+            {
+                if( VCL_RASTERIZER_DEFAULT_EXTENT == nMaxExtent )
+                {
+                    nMaxExtent = nRasterizerDefaultExtent;
+                }
+
+                if( ( nWidth > nMaxExtent ) || ( nHeight > nMaxExtent ) )
+                {
+                    const double fScale = static_cast< double >( nMaxExtent ) / ::std::max( nWidth, nHeight );
+
+                    nWidth = FRound( nWidth * fScale );
+                    nHeight = FRound( nHeight * fScale );
+                }
+            }
+
+            if( !ImplRasterizeFromCache( const_cast< RenderGraphicRasterizer& >( *this ),
+                                         Size( nWidth, nHeight ), fRotateAngle, fShearAngleX, fShearAngleY ) )
+            {
+                try
+                {
+                    const uno::Sequence< beans::PropertyValue > aPropertySeq;
+                    const Graphic aRasteredGraphic( mxRasterizer->rasterize( nWidth,
+                                                                             nHeight,
+                                                                             fRotateAngle,
+                                                                             fShearAngleX,
+                                                                             fShearAngleY,
+                                                                             aPropertySeq ) );
+
+                    maBitmapEx = aRasteredGraphic.GetBitmapEx();
+                    mfRotateAngle = fRotateAngle;
+                    mfShearAngleX = fShearAngleX;
+                    mfShearAngleY = fShearAngleY;
+
+                    ImplUpdateCache( *this );
+
+//                    OSL_TRACE( "Wanted: %d x %d / Got: %d x %d", rSizePixel.Width(), rSizePixel.Height(), maBitmapEx.GetSizePixel().Width(), maBitmapEx.GetSizePixel().Height() );
+                }
+                catch( ... )
+                {
+                    OSL_TRACE( "caught exception during rasterization" );
+                }
+            }
+        }
+    }
+
+    return( maBitmapEx );
+}
+
+// -------------------------------------------------------------------------
+
+void RenderGraphicRasterizer::InitializeRasterizer()
+{
+    if( !mxRasterizer.is() && !ImplInitializeFromCache( *this ) )
+    {
+        uno::Reference< lang::XMultiServiceFactory > xFactory( ::comphelper::getProcessServiceFactory() );
+
+        maDefaultSizePixel.Width() = maDefaultSizePixel.Height() = 0;
+
+        if( !maRenderGraphic.IsEmpty() )
+        {
+            rtl::OUString aServiceName;
+
+            if( 0 == maRenderGraphic.GetGraphicDataMimeType().compareToAscii( "image/svg+xml" ) )
+            {
+                aServiceName = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( VCL_SERVICENAME_RASTERIZER_SVG ) );
+            }
+
+            if( aServiceName.getLength() )
+            {
+                mxRasterizer.set( xFactory->createInstance( aServiceName ), uno::UNO_QUERY );
+
+                if( mxRasterizer.is() )
+                {
+                    std::auto_ptr< VirtualDevice > apCompVDev;
+                    OutputDevice* pCompDev = NULL;
+
+#ifndef NO_GETAPPWINDOW
+                    pCompDev = Application::GetAppWindow();
+#endif
+
+                    if( !pCompDev )
+                    {
+                        apCompVDev.reset( new VirtualDevice );
+                        pCompDev = apCompVDev.get();
+                    }
+
+                    const Size      aDPI( pCompDev->LogicToPixel( Size( 1, 1 ), MAP_INCH ) );
+                    awt::Size       aSizePixel;
+                    SvMemoryStream  aMemStm( maRenderGraphic.GetGraphicData().get(),
+                                             maRenderGraphic.GetGraphicDataLength(),
+                                             STREAM_READ );
+
+                    uno::Reference< io::XInputStream > xIStm( new utl::OSeekableInputStreamWrapper( aMemStm ) );
+
+                    try
+                    {
+                        if( !xIStm.is() || !mxRasterizer->initializeData( xIStm, aDPI.Width(), aDPI.Height(), aSizePixel ) )
+                        {
+                            mxRasterizer.clear();
+                        }
+                        else
+                        {
+                            maDefaultSizePixel.Width() = aSizePixel.Width;
+                            maDefaultSizePixel.Height() = aSizePixel.Height;
+                        }
+                    }
+                    catch( ... )
+                    {
+                        OSL_TRACE( "caught exception during initialization of SVG rasterizer component" );
+                        mxRasterizer.clear();
+                    }
+                }
+            }
+        }
+    }
+}
+
+// ------------------------------------------------------------------------------
+
+RenderGraphicRasterizer::RenderGraphicRasterizerCache& RenderGraphicRasterizer::ImplGetCache()
+{
+    static RenderGraphicRasterizerCache* pCache = NULL;
+
+    if( !pCache )
+    {
+        pCache = new RenderGraphicRasterizerCache;
+    }
+
+    return( *pCache );
+}
+
+// ------------------------------------------------------------------------------
+
+bool RenderGraphicRasterizer::ImplInitializeFromCache( RenderGraphicRasterizer& rRasterizer )
+{
+    RenderGraphicRasterizerCache&   rCache = ImplGetCache();
+    bool                            bRet = false;
+
+    for( sal_uInt32 i = 0; i < rCache.size(); ++i )
+    {
+        const RenderGraphicRasterizer* pCheck = &rCache[ i ];
+
+        if( pCheck && pCheck->mxRasterizer.is() && ( pCheck->maRenderGraphic == rRasterizer.maRenderGraphic ) )
+        {
+//            OSL_TRACE( "Hit RenderGraphicRasterizer cache for initialization" );
+
+            rRasterizer.mxRasterizer = pCheck->mxRasterizer;
+            rRasterizer.maDefaultSizePixel = pCheck->maDefaultSizePixel;
+
+            // put found Rasterizer at begin of deque
+            const RenderGraphicRasterizer aFound( rCache[ i ] );
+
+            rCache.erase( rCache.begin() + i );
+            rCache.push_front( aFound );
+
+
+            bRet = true;
+        }
+    }
+
+    return( bRet );
+}
+
+// ------------------------------------------------------------------------------
+
+bool RenderGraphicRasterizer::ImplRasterizeFromCache( RenderGraphicRasterizer& rRasterizer,
+                                                      const Size& rSizePixel,
+                                                      double fRotateAngle,
+                                                      double fShearAngleX,
+                                                      double fShearAngleY )
+{
+    RenderGraphicRasterizerCache&   rCache = ImplGetCache();
+    bool                            bRet = false;
+
+    for( sal_uInt32 i = 0; i < rCache.size(); ++i )
+    {
+        const RenderGraphicRasterizer& rCheck = rCache[ i ];
+
+        if( rCheck.mxRasterizer.is() && rRasterizer.mxRasterizer.is() &&
+            ( ( rCheck.mxRasterizer == rRasterizer.mxRasterizer ) ||
+              ( rRasterizer.maRenderGraphic == rCheck.maRenderGraphic ) ) &&
+            ( rCheck.maBitmapEx.GetSizePixel() == rSizePixel ) &&
+            ( rCheck.mfRotateAngle == fRotateAngle ) &&
+            ( rCheck.mfShearAngleX == fShearAngleX ) &&
+            ( rCheck.mfShearAngleY == fShearAngleY ) )
+        {
+//            OSL_TRACE( "Hit RenderGraphicRasterizer cache for rasterizing" );
+
+            rRasterizer.maBitmapEx = rCheck.maBitmapEx;
+            rRasterizer.mfRotateAngle = fRotateAngle;
+            rRasterizer.mfShearAngleX = fShearAngleX;
+            rRasterizer.mfShearAngleY = fShearAngleY;
+
+            // put found Rasterizer at begin of deque
+            const RenderGraphicRasterizer aFound( rCache[ i ] );
+
+            rCache.erase( rCache.begin() + i );
+            rCache.push_front( aFound );
+
+            bRet = true;
+        }
+    }
+
+    return( bRet );
+}
+
+// ------------------------------------------------------------------------------
+
+void RenderGraphicRasterizer::ImplUpdateCache( const RenderGraphicRasterizer& rRasterizer )
+{
+    RenderGraphicRasterizerCache&   rCache = ImplGetCache();
+    const sal_uInt32                nMaxCacheSize = 8;
+
+    if( rCache.size() < nMaxCacheSize )
+    {
+        rCache.push_front( rRasterizer );
+    }
+    else
+    {
+        rCache.pop_back();
+        rCache.push_front( rRasterizer );
+    }
+}
+
+} // VCL
diff --git a/vcl/source/gdi/salgdilayout.cxx b/vcl/source/gdi/salgdilayout.cxx
index 9fa4d813b2b7..bf0f7523a453 100644
--- a/vcl/source/gdi/salgdilayout.cxx
+++ b/vcl/source/gdi/salgdilayout.cxx
@@ -30,28 +30,31 @@
 #include "precompiled_vcl.hxx"
 
 #include <tools/ref.hxx>
-#include <svsys.h>
-#include <vcl/salgdi.hxx>
-#include <vcl/salframe.hxx>
-#include <vcl/salvd.hxx>
-#include <vcl/salprn.hxx>
 #include <tools/debug.hxx>
-#include <vcl/svdata.hxx>
-#include <vcl/svapp.hxx>
 #include <tools/poly.hxx>
+
+#include <vcl/svapp.hxx>
 #include <vcl/region.hxx>
-#include <vcl/region.h>
 #include <vcl/virdev.hxx>
-#include <vcl/window.h>
 #include <vcl/window.hxx>
 #include <vcl/metaact.hxx>
 #include <vcl/gdimtf.hxx>
-#include <vcl/outdata.hxx>
 #include <vcl/print.hxx>
-#include <vcl/outdev.h>
 #include <vcl/outdev.hxx>
 #include <vcl/unowrap.hxx>
-#include <vcl/sallayout.hxx>
+
+#include <window.h>
+#include <region.h>
+#include <outdev.h>
+#include <sallayout.hxx>
+#include <salgdi.hxx>
+#include <salframe.hxx>
+#include <salvd.hxx>
+#include <salprn.hxx>
+#include <svdata.hxx>
+#include <outdata.hxx>
+
+
 #include "basegfx/polygon/b2dpolygon.hxx"
 
 // ----------------------------------------------------------------------------
diff --git a/vcl/source/gdi/sallayout.cxx b/vcl/source/gdi/sallayout.cxx
index 970b0ff3cd0b..9679170df9b9 100644
--- a/vcl/source/gdi/sallayout.cxx
+++ b/vcl/source/gdi/sallayout.cxx
@@ -35,12 +35,12 @@
 #include <math.h>
 #include <sal/alloca.h>
 
-#include <svsys.h>
-#include <vcl/salgdi.hxx>
-#include <vcl/sallayout.hxx>
+#include <salgdi.hxx>
+#include <sallayout.hxx>
 #include <basegfx/polygon/b2dpolypolygon.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
+
 #include <i18npool/lang.h>
 
 #include <tools/debug.hxx>
diff --git a/vcl/source/gdi/salmisc.cxx b/vcl/source/gdi/salmisc.cxx
index 3a9bd669f54f..d2b794af02d6 100644
--- a/vcl/source/gdi/salmisc.cxx
+++ b/vcl/source/gdi/salmisc.cxx
@@ -31,7 +31,7 @@
 #include <rtl/memory.h>
 #include <vcl/bmpacc.hxx>
 #include <vcl/salbtype.hxx>
-#include <vcl/bmpfast.hxx>
+#include <bmpfast.hxx>
 
 // -----------
 // - Defines -
diff --git a/vcl/source/gdi/salnativewidgets-none.cxx b/vcl/source/gdi/salnativewidgets-none.cxx
index cc204069c2c4..8f50802c9431 100644
--- a/vcl/source/gdi/salnativewidgets-none.cxx
+++ b/vcl/source/gdi/salnativewidgets-none.cxx
@@ -29,7 +29,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-#include <vcl/salgdi.hxx>
+#include <salgdi.hxx>
 
 using ::rtl::OUString;
 
diff --git a/vcl/source/gdi/svcompat.cxx b/vcl/source/gdi/svcompat.cxx
deleted file mode 100644
index c594dd1f93d7..000000000000
--- a/vcl/source/gdi/svcompat.cxx
+++ /dev/null
@@ -1,81 +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 <tools/stream.hxx>
-#include <svcompat.hxx>
-
-// --------------
-// - ImplCompat -
-// --------------
-
-ImplCompat::ImplCompat( SvStream& rStm, sal_uInt16 nStreamMode, sal_uInt16 nVersion ) :
-            mpRWStm     ( &rStm ),
-            mnStmMode   ( nStreamMode ),
-            mnVersion   ( nVersion )
-{
-    if( !mpRWStm->GetError() )
-    {
-        if( STREAM_WRITE == mnStmMode )
-        {
-            *mpRWStm << mnVersion;
-            mnTotalSize = ( mnCompatPos = mpRWStm->Tell() ) + 4UL;
-            mpRWStm->SeekRel( 4L );
-        }
-        else
-        {
-            *mpRWStm >> mnVersion;
-            *mpRWStm >> mnTotalSize;
-            mnCompatPos = mpRWStm->Tell();
-        }
-    }
-}
-
-// ------------------------------------------------------------------------
-
-ImplCompat::~ImplCompat()
-{
-    if( STREAM_WRITE == mnStmMode )
-    {
-        const sal_uInt32 nEndPos = mpRWStm->Tell();
-
-        mpRWStm->Seek( mnCompatPos );
-        *mpRWStm << ( nEndPos - mnTotalSize );
-        mpRWStm->Seek( nEndPos );
-    }
-    else
-    {
-        const sal_uInt32 nReadSize = mpRWStm->Tell() - mnCompatPos;
-
-        if( mnTotalSize > nReadSize )
-            mpRWStm->SeekRel( mnTotalSize - nReadSize );
-    }
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/gdi/svgread.cxx b/vcl/source/gdi/svgread.cxx
new file mode 100644
index 000000000000..47ef39c37f20
--- /dev/null
+++ b/vcl/source/gdi/svgread.cxx
@@ -0,0 +1,131 @@
+/*************************************************************************
+ *
+ * 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 <tools/stream.hxx>
+#include <vcl/svgread.hxx>
+#include <vcl/gdimtf.hxx>
+#include <vcl/metaact.hxx>
+#include <vcl/rendergraphicrasterizer.hxx>
+
+// -----------
+// - Defines -
+// -----------
+
+namespace vcl
+{
+    // -----------------
+    // - SVGReaderImpl -
+    // -----------------
+
+    class SVGReaderImpl
+    {
+    public:
+
+        SVGReaderImpl( SvStream& rStm );
+        ~SVGReaderImpl();
+
+        GDIMetaFile& ImplRead( GDIMetaFile& rSVGMtf );
+
+    private:
+
+        SvStream&           mrStm;
+    };
+
+    // ------------------------------------------------------------------------------
+
+    SVGReaderImpl::SVGReaderImpl( SvStream& rStm ) :
+        mrStm( rStm )
+    {
+    }
+
+    // ------------------------------------------------------------------------
+
+    SVGReaderImpl::~SVGReaderImpl()
+    {
+    }
+
+    // ------------------------------------------------------------------------
+
+    GDIMetaFile& SVGReaderImpl::ImplRead( GDIMetaFile& rSVGMtf )
+    {
+        const sal_uInt32 nStmPos = mrStm.Tell();
+        const sal_uInt32 nStmLen = mrStm.Seek( STREAM_SEEK_TO_END ) - nStmPos;
+
+        if( nStmLen )
+        {
+            const vcl::RenderGraphic aSVGGraphic( ::rtl::OUString::createFromAscii( "image/svg+xml" ), nStmLen );
+
+            mrStm.Seek( nStmPos );
+            mrStm.Read( aSVGGraphic.GetGraphicData().get(), nStmLen );
+
+            if( !mrStm.GetError() )
+            {
+                const vcl::RenderGraphicRasterizer  aRasterizer( aSVGGraphic );
+                const Size                          aDefaultSizePixel( aRasterizer.GetDefaultSizePixel() );
+
+                if( aDefaultSizePixel.Width() && aDefaultSizePixel.Height() )
+                {
+                    const Point aPos;
+                    const Size  aPrefSize( aRasterizer.GetPrefSize() );
+
+                    rSVGMtf.SetPrefMapMode( aRasterizer.GetPrefMapMode() );
+                    rSVGMtf.SetPrefSize( aPrefSize );
+                    rSVGMtf.AddAction( new MetaRenderGraphicAction( aPos, aPrefSize, aSVGGraphic ) );
+                    rSVGMtf.WindStart();
+                }
+            }
+        }
+
+        return( rSVGMtf );
+    }
+
+    // -------------
+    // - SVGReader -
+    // -------------
+
+    SVGReader::SVGReader( SvStream& rIStm ) :
+        mapImpl( new ::vcl::SVGReaderImpl( rIStm ) )
+    {
+    }
+
+    // ------------------------------------------------------------------------
+
+    SVGReader::~SVGReader()
+    {
+    }
+
+    // ------------------------------------------------------------------------
+
+    GDIMetaFile& SVGReader::Read( GDIMetaFile& rSVGMtf )
+    {
+        rSVGMtf = GDIMetaFile();
+
+        return( mapImpl.get() ? mapImpl->ImplRead( rSVGMtf ) : rSVGMtf );
+    }
+
+} // namespace vcl
diff --git a/vcl/source/gdi/textlayout.cxx b/vcl/source/gdi/textlayout.cxx
index 1afa8840fcf3..e1a2667a8f58 100644
--- a/vcl/source/gdi/textlayout.cxx
+++ b/vcl/source/gdi/textlayout.cxx
@@ -31,8 +31,9 @@
 
 #include "vcl/ctrl.hxx"
 #include "vcl/outdev.hxx"
-#include "vcl/outfont.hxx"
-#include "vcl/textlayout.hxx"
+
+#include "outfont.hxx"
+#include "textlayout.hxx"
 
 #include <com/sun/star/i18n/ScriptDirection.hpp>
 
diff --git a/vcl/source/gdi/virdev.cxx b/vcl/source/gdi/virdev.cxx
index 981fc38b7375..5e693d23abf5 100644
--- a/vcl/source/gdi/virdev.cxx
+++ b/vcl/source/gdi/virdev.cxx
@@ -29,19 +29,20 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-#include <svsys.h>
-#include <vcl/salinst.hxx>
-#include <vcl/salgdi.hxx>
-#include <vcl/salframe.hxx>
-#include <vcl/salvd.hxx>
 #include <tools/debug.hxx>
-#include <vcl/svdata.hxx>
+
 #include <vcl/settings.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/wrkwin.hxx>
-#include <vcl/outdev.h>
 #include <vcl/virdev.hxx>
 
+#include <salinst.hxx>
+#include <salgdi.hxx>
+#include <salframe.hxx>
+#include <salvd.hxx>
+#include <outdev.h>
+#include <svdata.hxx>
+
 using namespace ::com::sun::star::uno;
 
 // =======================================================================
diff --git a/vcl/source/gdi/wall.cxx b/vcl/source/gdi/wall.cxx
index 600f78941cbe..a24d3b0cbd66 100644
--- a/vcl/source/gdi/wall.cxx
+++ b/vcl/source/gdi/wall.cxx
@@ -28,17 +28,20 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
+
 #include <tools/stream.hxx>
 #include <tools/vcompat.hxx>
 #include <tools/debug.hxx>
+
 #include <vcl/bitmapex.hxx>
 #include <vcl/gradient.hxx>
 #include <vcl/wall.hxx>
-#include <vcl/wall2.hxx>
 #include <vcl/svapp.hxx>
 
+#include <wall2.hxx>
+
 
-DBG_NAME( Wallpaper );
+DBG_NAME( Wallpaper )
 
 // -----------------------------------------------------------------------
 
diff --git a/vcl/source/glyphs/gcach_ftyp.cxx b/vcl/source/glyphs/gcach_ftyp.cxx
index 5eea8df58fc3..79bcb608fb5f 100644
--- a/vcl/source/glyphs/gcach_ftyp.cxx
+++ b/vcl/source/glyphs/gcach_ftyp.cxx
@@ -37,11 +37,11 @@
 #include "gcach_ftyp.hxx"
 
 #include "vcl/svapp.hxx"
-#include "vcl/outfont.hxx"
-#include "vcl/impfont.hxx"
+#include <outfont.hxx>
+#include <impfont.hxx>
 #ifdef ENABLE_GRAPHITE
 #include <graphite2/Font.h>
-#include "vcl/graphite_layout.hxx"
+#include <graphite_layout.hxx>
 #endif
 
 #include "tools/poly.hxx"
diff --git a/vcl/source/glyphs/gcach_ftyp.hxx b/vcl/source/glyphs/gcach_ftyp.hxx
index 6b461fe59143..9cbe49cd495e 100644
--- a/vcl/source/glyphs/gcach_ftyp.hxx
+++ b/vcl/source/glyphs/gcach_ftyp.hxx
@@ -29,7 +29,7 @@
 #ifndef _SV_GCACHFTYP_HXX
 #define _SV_GCACHFTYP_HXX
 
-#include <vcl/glyphcache.hxx>
+#include <glyphcache.hxx>
 #include <rtl/textcvt.h>
 
 #include <ft2build.h>
diff --git a/vcl/source/glyphs/gcach_layout.cxx b/vcl/source/glyphs/gcach_layout.cxx
index 4cc869b0c5f5..311654586596 100644
--- a/vcl/source/glyphs/gcach_layout.cxx
+++ b/vcl/source/glyphs/gcach_layout.cxx
@@ -31,8 +31,8 @@
 
 #define ENABLE_ICU_LAYOUT
 #include <gcach_ftyp.hxx>
-#include <vcl/sallayout.hxx>
-#include <vcl/salgdi.hxx>
+#include <sallayout.hxx>
+#include <salgdi.hxx>
 
 #include <vcl/svapp.hxx>
 
diff --git a/vcl/source/glyphs/gcach_rbmp.cxx b/vcl/source/glyphs/gcach_rbmp.cxx
index 161e4c6314e7..71784f5dd083 100644
--- a/vcl/source/glyphs/gcach_rbmp.cxx
+++ b/vcl/source/glyphs/gcach_rbmp.cxx
@@ -29,7 +29,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-#include <vcl/glyphcache.hxx>
+#include <glyphcache.hxx>
 #include <string.h>
 
 //------------------------------------------------------------------------
diff --git a/vcl/source/glyphs/glyphcache.cxx b/vcl/source/glyphs/glyphcache.cxx
index ab56853dcf65..c12eb1cabcf5 100644
--- a/vcl/source/glyphs/glyphcache.cxx
+++ b/vcl/source/glyphs/glyphcache.cxx
@@ -37,10 +37,10 @@
 
 #include <vcl/svapp.hxx>
 #include <vcl/bitmap.hxx>
-#include <vcl/outfont.hxx>
+#include <outfont.hxx>
 
 #ifdef ENABLE_GRAPHITE
-#include <vcl/graphite_features.hxx>
+#include <graphite_features.hxx>
 #endif
 
 #include <rtl/ustring.hxx>      // used only for string=>hashvalue
diff --git a/vcl/source/glyphs/graphite_features.cxx b/vcl/source/glyphs/graphite_features.cxx
index 175656e25515..1db4a50564bd 100644
--- a/vcl/source/glyphs/graphite_features.cxx
+++ b/vcl/source/glyphs/graphite_features.cxx
@@ -40,7 +40,7 @@
 #include <windows.h>
 #endif
 
-#include <vcl/graphite_features.hxx>
+#include <graphite_features.hxx>
 
 using namespace grutils;
 // These mustn't conflict with font name lists which use ; and ,
diff --git a/vcl/source/glyphs/graphite_layout.cxx b/vcl/source/glyphs/graphite_layout.cxx
index a653cf76cdb7..46de93aaac39 100644
--- a/vcl/source/glyphs/graphite_layout.cxx
+++ b/vcl/source/glyphs/graphite_layout.cxx
@@ -55,7 +55,7 @@
 // Platform
 #include <svsys.h>
 
-#include <vcl/salgdi.hxx>
+#include <salgdi.hxx>
 
 #include <unicode/uchar.h>
 #include <unicode/ubidi.h>
@@ -64,8 +64,8 @@
 // Graphite Libraries (must be after vcl headers on windows)
 #include <graphite2/Segment.h>
 
-#include "vcl/graphite_layout.hxx"
-#include "vcl/graphite_features.hxx"
+#include <graphite_layout.hxx>
+#include <graphite_features.hxx>
 
 // Module private type definitions and forward declarations.
 //
diff --git a/vcl/source/glyphs/graphite_serverfont.cxx b/vcl/source/glyphs/graphite_serverfont.cxx
index ec1388d9bb29..1f9ee322455a 100644
--- a/vcl/source/glyphs/graphite_serverfont.cxx
+++ b/vcl/source/glyphs/graphite_serverfont.cxx
@@ -37,13 +37,13 @@
 
 // Platform
 #include <i18npool/mslangid.hxx>
-#include <vcl/sallayout.hxx>
+#include <sallayout.hxx>
 // Module
 #include "gcach_ftyp.hxx"
-#include <vcl/glyphcache.hxx>
-#include <vcl/graphite_features.hxx>
+#include <glyphcache.hxx>
+#include <graphite_features.hxx>
 //#include "graphite_textsrc.hxx"
-#include <vcl/graphite_serverfont.hxx>
+#include <graphite_serverfont.hxx>
 
 #ifndef WNT
 
diff --git a/vcl/source/glyphs/graphite_textsrc.cxx b/vcl/source/glyphs/graphite_textsrc.cxx
deleted file mode 100644
index 33508ae34712..000000000000
--- a/vcl/source/glyphs/graphite_textsrc.cxx
+++ /dev/null
@@ -1,172 +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"
-
-// We need this to enable namespace support in libgrengine headers.
-#define GR_NAMESPACE
-
-// Header files
-//
-// Standard Library
-#include <string>
-#include <cassert>
-#include "graphite_textsrc.hxx"
-#include <vcl/graphite_features.hxx>
-
-// class TextSourceAdaptor implementation.
-//
-TextSourceAdaptor::~TextSourceAdaptor()
-{
-    delete mpFeatures;
-}
-
-gr::UtfType TextSourceAdaptor::utfEncodingForm() {
-    return gr::kutf16;
-}
-
-
-size_t TextSourceAdaptor::getLength()
-{
-    return maLayoutArgs.mnLength;
-}
-
-
-size_t  TextSourceAdaptor::fetch(gr::toffset, size_t, gr::utf32 *)
-{
-    assert(false);
-    return 0;
-}
-
-
-size_t  TextSourceAdaptor::fetch(gr::toffset offset, size_t char_count, gr::utf16 * char_buffer)
-{
-  assert(char_buffer);
-
-  size_t copy_count =  std::min(size_t(maLayoutArgs.mnLength), char_count);
-  std::copy(maLayoutArgs.mpStr + offset, maLayoutArgs.mpStr + offset + copy_count, char_buffer);
-
-  return copy_count;
-}
-
-
-size_t TextSourceAdaptor::fetch(gr::toffset, size_t, gr::utf8  *)
-{
-    assert(false);
-    return 0;
-}
-
-
-inline void TextSourceAdaptor::getCharProperties(const int nCharIdx, int & min, int & lim, size_t & depth)
-{
-    maLayoutArgs.ResetPos();
-    bool rtl = maLayoutArgs.mnFlags & SAL_LAYOUT_BIDI_RTL;
-    for(depth = ((rtl)? 1:0); maLayoutArgs.maRuns.GetRun(&min, &lim, &rtl); maLayoutArgs.maRuns.NextRun())
-    {
-        if (min > nCharIdx)
-            break;
-        // Only increase the depth when a change of direction occurs.
-        depth += int(rtl ^ bool(depth & 0x1));
-        if (min <= nCharIdx && nCharIdx < lim)
-            break;
-    }
-    // If there is no run for this position increment the depth, but don't
-    // change if this is out of bounds context
-    if (lim > 0 && nCharIdx >= lim && nCharIdx < maLayoutArgs.mnEndCharPos)
-        depth++;
-}
-
-
-bool TextSourceAdaptor::getRightToLeft(gr::toffset nCharIdx)
-{
-    size_t depth;
-    int min, lim = 0;
-    getCharProperties(nCharIdx, min, lim, depth);
-    //printf("getRtl %d,%x=%d\n", nCharIdx, maLayoutArgs.mpStr[nCharIdx], depth & 0x1);
-    return depth & 0x1;
-}
-
-
-unsigned int TextSourceAdaptor::getDirectionDepth(gr::toffset nCharIdx)
-{
-    size_t depth;
-    int min, lim;
-    getCharProperties(nCharIdx, min, lim, depth);
-    //printf("getDirectionDepth %d,%x=%d\n", nCharIdx, maLayoutArgs.mpStr[nCharIdx], depth);
-    return depth;
-}
-
-
-float TextSourceAdaptor::getVerticalOffset(gr::toffset)
-{
-    return 0.0f;    //TODO: Implement correctly
-}
-
-gr::isocode TextSourceAdaptor::getLanguage(gr::toffset)
-{
-    if (mpFeatures && mpFeatures->hasLanguage())
-        return mpFeatures->getLanguage();
-    gr::isocode unknown = {{0,0,0,0}};
-    return unknown;
-}
-
-std::pair<gr::toffset, gr::toffset> TextSourceAdaptor::propertyRange(gr::toffset nCharIdx)
-{
-
-    if (nCharIdx < unsigned(maLayoutArgs.mnMinCharPos))
-        return std::make_pair(0, maLayoutArgs.mnMinCharPos);
-
-    if (nCharIdx < mnEnd)
-        return std::make_pair(maLayoutArgs.mnMinCharPos, mnEnd);
-
-    return std::make_pair(mnEnd, maLayoutArgs.mnLength);
-}
-
-size_t TextSourceAdaptor::getFontFeatures(gr::toffset, gr::FeatureSetting * settings)
-{
-    if (mpFeatures) return mpFeatures->getFontFeatures(settings);
-    return 0;
-}
-
-
-bool TextSourceAdaptor::sameSegment(gr::toffset char_idx1, gr::toffset char_idx2)
-{
-    const std::pair<gr::toffset, gr::toffset>
-    range1 = propertyRange(char_idx1),
-    range2 = propertyRange(char_idx2);
-
-    return range1 == range2;
-}
-
-void TextSourceAdaptor::setFeatures(const grutils::GrFeatureParser * pFeatures)
-{
-    mpFeatures = new grutils::GrFeatureParser(*pFeatures);
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/glyphs/graphite_textsrc.hxx b/vcl/source/glyphs/graphite_textsrc.hxx
deleted file mode 100644
index b5251cff2922..000000000000
--- a/vcl/source/glyphs/graphite_textsrc.hxx
+++ /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_GRAPHITETEXTSRC_HXX
-#define _SV_GRAPHITETEXTSRC_HXX
-// Description: Implements the Graphite interfaces IGrTextSource and
-//              IGrGraphics which provide Graphite with access to the
-//              app's text storage system and the platform's font and
-//              graphics systems.
-
-// We need this to enable namespace support in libgrengine headers.
-#define GR_NAMESPACE
-
-// Standard Library
-#include <stdexcept>
-// Platform
-
-#ifdef WNT
-#include <windows.h>
-#endif
-
-#include <vcl/salgdi.hxx>
-
-#include <vcl/sallayout.hxx>
-
-// Module
-#include "vcl/dllapi.h"
-
-// Libraries
-#include <graphite/GrClient.h>
-#include <graphite/Font.h>
-#include <graphite/ITextSource.h>
-
-// Module type definitions and forward declarations.
-//
-namespace grutils
-{
-    class GrFeatureParser;
-}
-// Implements the Adaptor pattern to adapt the LayoutArgs and the ServerFont interfaces to the
-// gr::IGrTextSource interface.
-// @author tse
-//
-class TextSourceAdaptor : public gr::ITextSource
-{
-public:
-        TextSourceAdaptor(ImplLayoutArgs &layout_args, const int nContextLen) throw();
-        ~TextSourceAdaptor();
-        virtual gr::UtfType     utfEncodingForm();
-        virtual size_t          getLength();
-        virtual size_t          fetch(gr::toffset ichMin, size_t cch, gr::utf32 * prgchBuffer);
-        virtual size_t          fetch(gr::toffset ichMin, size_t cch, gr::utf16 * prgchwBuffer);
-        virtual size_t          fetch(gr::toffset ichMin, size_t cch, gr::utf8  * prgchsBuffer);
-        virtual bool            getRightToLeft(gr::toffset ich);
-        virtual unsigned int    getDirectionDepth(gr::toffset ich);
-        virtual float           getVerticalOffset(gr::toffset ich);
-        virtual gr::isocode     getLanguage(gr::toffset ich);
-
-        virtual std::pair<gr::toffset, gr::toffset> propertyRange(gr::toffset ich);
-        virtual size_t  getFontFeatures(gr::toffset ich, gr::FeatureSetting * prgfset);
-        virtual bool    sameSegment(gr::toffset ich1, gr::toffset ich2);
-        virtual bool featureVariations() { return false; }
-
-        operator ImplLayoutArgs & () throw();
-        void setFeatures(const grutils::GrFeatureParser * pFeatures);
-        const ImplLayoutArgs & getLayoutArgs() const { return maLayoutArgs; }
-        size_t          getContextLength() const { return mnEnd; };
-        inline void switchLayoutArgs(ImplLayoutArgs & newArgs);
-private:
-        // Prevent the generation of a default assignment operator.
-        TextSourceAdaptor & operator=(const TextSourceAdaptor &);
-
-        void getCharProperties(const int, int &, int &, size_t &);
-
-        ImplLayoutArgs  maLayoutArgs;
-        size_t    mnEnd;
-        const grutils::GrFeatureParser * mpFeatures;
-};
-
-inline TextSourceAdaptor::TextSourceAdaptor(ImplLayoutArgs &la, const int nContextLen) throw()
-  : maLayoutArgs(la),
-    mnEnd(std::min(la.mnLength, nContextLen)),
-    mpFeatures(NULL)
-{
-}
-
-inline  TextSourceAdaptor::operator ImplLayoutArgs & () throw() {
-        return maLayoutArgs;
-}
-
-inline void TextSourceAdaptor::switchLayoutArgs(ImplLayoutArgs & aNewArgs)
-{
-    mnEnd += aNewArgs.mnMinCharPos - maLayoutArgs.mnMinCharPos;
-    maLayoutArgs = aNewArgs;
-}
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/glyphs/makefile.mk b/vcl/source/glyphs/makefile.mk
deleted file mode 100644
index cbc9a38b4f9e..000000000000
--- a/vcl/source/glyphs/makefile.mk
+++ /dev/null
@@ -1,80 +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=glyphs
-
-ENABLE_EXCEPTIONS=true
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile2.pmk
-
-CFLAGS+= $(FREETYPE_CFLAGS)
-
-# --- Files --------------------------------------------------------
-
-.IF "$(USE_BUILTIN_RASTERIZER)" != ""
-# GlyphCache + FreeType support (only on UNX platforms currently)
-SLOFILES=\
-        $(SLO)$/glyphcache.obj		\
-        $(SLO)$/gcach_rbmp.obj		\
-        $(SLO)$/gcach_layout.obj	\
-        $(SLO)$/gcach_ftyp.obj
-
-.IF "$(ENABLE_GRAPHITE)" != ""
-# Graphite support using the glyphcache infrastructure
-CFLAGS+=-DENABLE_GRAPHITE
-SLOFILES+=\
-        $(SLO)$/graphite_features.obj	\
-        $(SLO)$/graphite_serverfont.obj	\
-        $(SLO)$/graphite_layout.obj
-
-.ENDIF
-
-.ELSE
-
-.IF "$(ENABLE_GRAPHITE)" == "TRUE"
-# Graphite support on non-UNX platforms
-SLOFILES=\
-        $(SLO)$/graphite_features.obj	\
-        $(SLO)$/graphite_layout.obj
-
-.IF "$(SYSTEM_GRAPHITE)" != "YES"
-CDEFS+=-DGR2_STATIC
-.ENDIF
-
-.ENDIF
-.ENDIF
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/vcl/source/helper/canvasbitmap.cxx b/vcl/source/helper/canvasbitmap.cxx
index 3138c55b2bb5..d86a0a07bedf 100644
--- a/vcl/source/helper/canvasbitmap.cxx
+++ b/vcl/source/helper/canvasbitmap.cxx
@@ -38,7 +38,7 @@
 #include <osl/mutex.hxx>
 
 #include <tools/diagnose_ex.h>
-#include <vcl/canvasbitmap.hxx>
+#include <canvasbitmap.hxx>
 #include <vcl/canvastools.hxx>
 #include <vcl/bmpacc.hxx>
 #include <vcl/svapp.hxx>
diff --git a/vcl/source/helper/canvastools.cxx b/vcl/source/helper/canvastools.cxx
index 757a830b8360..ac8e658f7bd8 100644
--- a/vcl/source/helper/canvastools.cxx
+++ b/vcl/source/helper/canvastools.cxx
@@ -70,7 +70,7 @@
 #include <vcl/bmpacc.hxx>
 #include <vcl/bitmapex.hxx>
 
-#include <vcl/canvasbitmap.hxx>
+#include <canvasbitmap.hxx>
 #include <vcl/canvastools.hxx>
 #include <boost/unordered_map.hpp>
 
diff --git a/vcl/source/helper/lazydelete.cxx b/vcl/source/helper/lazydelete.cxx
index 9173474af759..3fa046bc076c 100644
--- a/vcl/source/helper/lazydelete.cxx
+++ b/vcl/source/helper/lazydelete.cxx
@@ -34,7 +34,7 @@
 #include "vcl/window.hxx"
 #include "vcl/menu.hxx"
 #include "vcl/lazydelete.hxx"
-#include "vcl/svdata.hxx"
+#include "svdata.hxx"
 
 namespace vcl {
 
diff --git a/vcl/source/helper/makefile.mk b/vcl/source/helper/makefile.mk
deleted file mode 100644
index 1a417417dbe4..000000000000
--- a/vcl/source/helper/makefile.mk
+++ /dev/null
@@ -1,55 +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=..$/..
-
-ENABLE_EXCEPTIONS=TRUE
-PRJNAME=vcl
-TARGET=helper
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile2.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES=\
-    $(SLO)$/strhelper.obj   	\
-    $(SLO)$/evntpost.obj		\
-    $(SLO)$/canvasbitmap.obj    \
-    $(SLO)$/canvastools.obj		\
-    $(SLO)$/xconnection.obj		\
-    $(SLO)$/threadex.obj		\
-    $(SLO)$/lazydelete.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/vcl/source/helper/xconnection.cxx b/vcl/source/helper/xconnection.cxx
index d6aa0429bcf3..5250cc067b25 100644
--- a/vcl/source/helper/xconnection.cxx
+++ b/vcl/source/helper/xconnection.cxx
@@ -29,13 +29,12 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-#include "svsys.h"
-#include "rtl/ref.hxx"
-#include "vcl/xconnection.hxx"
-#include "vcl/svdata.hxx"
-#include "vcl/salinst.hxx"
 #include "vcl/svapp.hxx"
 
+#include "xconnection.hxx"
+#include "svdata.hxx"
+#include "salinst.hxx"
+
 namespace {
 
 namespace css = com::sun::star;
diff --git a/vcl/source/salmain/salmain.cxx b/vcl/source/salmain/salmain.cxx
index e5135b9aa241..80e853b3b654 100644
--- a/vcl/source/salmain/salmain.cxx
+++ b/vcl/source/salmain/salmain.cxx
@@ -33,7 +33,8 @@
 
 #include "sal/main.h"
 #include "tools/extendapplicationenvironment.hxx"
-#include "vcl/salinst.hxx"
+
+#include "salinst.hxx"
 
 SAL_IMPLEMENT_MAIN() {
     tools::extendApplicationEnvironment();
diff --git a/vcl/source/src/btntext.src b/vcl/source/src/btntext.src
index 181650b24ce8..c0303aac0f1f 100644
--- a/vcl/source/src/btntext.src
+++ b/vcl/source/src/btntext.src
@@ -27,9 +27,7 @@
 
 #define _SV_BTNTEXT_SRC
 
-#ifndef _SV_SVIDS_HRC
-#include <vcl/svids.hrc>
-#endif
+#include <svids.hrc>
 
 String SV_BUTTONTEXT_OK
 {
diff --git a/vcl/source/src/helptext.src b/vcl/source/src/helptext.src
index 59d7ea3d443e..1f3def6f8cd4 100644
--- a/vcl/source/src/helptext.src
+++ b/vcl/source/src/helptext.src
@@ -27,9 +27,7 @@
 
 #define _SV_HELPTEXT_SRC
 
-#ifndef _SV_SVIDS_HRC
-#include <vcl/svids.hrc>
-#endif
+#include <svids.hrc>
 
 String SV_HELPTEXT_CLOSE
 {
diff --git a/vcl/source/src/images.src b/vcl/source/src/images.src
index 541ac34c29e7..f836306cba45 100644
--- a/vcl/source/src/images.src
+++ b/vcl/source/src/images.src
@@ -27,9 +27,7 @@
 
 #define _SV_IMAGES_SRC
 
-#ifndef _SV_SVIDS_HRC
-#include <vcl/svids.hrc>
-#endif
+#include <svids.hrc>
 
 // =======================================================================
 
diff --git a/vcl/source/src/makefile.mk b/vcl/source/src/makefile.mk
deleted file mode 100644
index 2db77b7ffc74..000000000000
--- a/vcl/source/src/makefile.mk
+++ /dev/null
@@ -1,56 +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=svsrc
-RESTARGET=vcl
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-
-# --- Files --------------------------------------------------------
-
-SRS1NAME=$(TARGET)
-SRC1FILES=			images.src			\
-                    menu.src			\
-                    stdtext.src 		\
-                    helptext.src		\
-                    units.src		    \
-                    btntext.src         \
-                    print.src           \
-
-RESLIB1NAME=		$(RESTARGET)
-RESLIB1IMAGES= $(PRJ)$/source/src
-RESLIB1SRSFILES=	$(SRS)$/svsrc.srs
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :	target.mk
-
diff --git a/vcl/source/src/menu.src b/vcl/source/src/menu.src
index 1833093adfac..cead04b9f6ec 100644
--- a/vcl/source/src/menu.src
+++ b/vcl/source/src/menu.src
@@ -25,9 +25,8 @@
  *
  ************************************************************************/
 #define _SV_MENU_SRC
-#ifndef _SV_SVIDS_HRC
-#include <vcl/svids.hrc>
-#endif
+
+#include <svids.hrc>
 
 String SV_RESID_STRING_NOSELECTIONPOSSIBLE
 {
diff --git a/vcl/source/src/print.src b/vcl/source/src/print.src
index b4f4d56029e1..e1dab9679bda 100644
--- a/vcl/source/src/print.src
+++ b/vcl/source/src/print.src
@@ -25,7 +25,7 @@
  *
  ************************************************************************/
 
-#include "vcl/svids.hrc"
+#include "svids.hrc"
 
 ModalDialog SV_DLG_PRINT
 {
diff --git a/vcl/source/src/stdtext.src b/vcl/source/src/stdtext.src
index 1b95f7bb1d72..9fd1487ce522 100644
--- a/vcl/source/src/stdtext.src
+++ b/vcl/source/src/stdtext.src
@@ -27,9 +27,7 @@
 
 #define _SV_STDTEXT_SRC
 
-#ifndef _SV_SVIDS_HRC
-#include <vcl/svids.hrc>
-#endif
+#include <svids.hrc>
 
 String SV_STDTEXT_SERVICENOTAVAILABLE
 {
diff --git a/vcl/source/src/units.src b/vcl/source/src/units.src
index f908105d812e..24023569aaeb 100644
--- a/vcl/source/src/units.src
+++ b/vcl/source/src/units.src
@@ -26,9 +26,7 @@
  ************************************************************************/
 #define _SV_UNITS_SRC
 
-#ifndef _SV_SVIDS_HRC
-#include <vcl/svids.hrc>
-#endif
+#include <svids.hrc>
 
 // Amelia : adds two units , 'ch' and 'line'
 StringArray SV_FUNIT_STRINGS
diff --git a/vcl/source/window/abstdlg.cxx b/vcl/source/window/abstdlg.cxx
index d60dbb83b6c5..e11e50533647 100644
--- a/vcl/source/window/abstdlg.cxx
+++ b/vcl/source/window/abstdlg.cxx
@@ -30,7 +30,6 @@
 #include "precompiled_vcl.hxx"
 
 #include <vcl/abstdlg.hxx>
-#include "cuilib.hxx"
 
 #include <osl/module.hxx>
 #include <tools/string.hxx>
@@ -43,7 +42,7 @@ VclAbstractDialogFactory* VclAbstractDialogFactory::Create()
 {
     FuncPtrCreateDialogFactory fp = 0;
     static ::osl::Module aDialogLibrary;
-    if ( aDialogLibrary.is() || aDialogLibrary.loadRelative( &thisModule, String( RTL_CONSTASCII_USTRINGPARAM( DLL_NAME ) ) ) )
+    if ( aDialogLibrary.is() || aDialogLibrary.loadRelative( &thisModule, String( RTL_CONSTASCII_USTRINGPARAM( CUI_DLL_NAME ) ) ) )
         fp = ( VclAbstractDialogFactory* (__LOADONCALLAPI*)() )
             aDialogLibrary.getFunctionSymbol( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CreateDialogFactory")) );
     if ( fp )
diff --git a/vcl/source/window/accel.cxx b/vcl/source/window/accel.cxx
index 837fa60d1e1e..525c8ad5a76a 100644
--- a/vcl/source/window/accel.cxx
+++ b/vcl/source/window/accel.cxx
@@ -31,10 +31,11 @@
 
 #include <tools/table.hxx>
 #include <tools/debug.hxx>
+#include <tools/rc.h>
+
 #include <vcl/svapp.hxx>
-#include <vcl/accel.h>
+#include <accel.h>
 #include <vcl/accel.hxx>
-#include <tools/rc.h>
 #include <vector>
 
 // =======================================================================
diff --git a/vcl/source/window/accmgr.cxx b/vcl/source/window/accmgr.cxx
index c8b1e42c5ed1..43c78d55adc1 100644
--- a/vcl/source/window/accmgr.cxx
+++ b/vcl/source/window/accmgr.cxx
@@ -30,9 +30,10 @@
 #include "precompiled_vcl.hxx"
 
 #include <tools/debug.hxx>
-#include <vcl/accel.h>
+
+#include <accel.h>
 #include <vcl/accel.hxx>
-#include <vcl/accmgr.hxx>
+#include <accmgr.hxx>
 
 // =======================================================================
 
diff --git a/vcl/source/window/arrange.cxx b/vcl/source/window/arrange.cxx
index 28e0d8ae65fe..0d5be0d2b625 100644
--- a/vcl/source/window/arrange.cxx
+++ b/vcl/source/window/arrange.cxx
@@ -28,9 +28,10 @@
 
 #include "precompiled_vcl.hxx"
 
+#include "svdata.hxx"
+
 #include "vcl/arrange.hxx"
 #include "vcl/edit.hxx"
-#include "vcl/svdata.hxx"
 #include "vcl/svapp.hxx"
 
 #include "com/sun/star/beans/PropertyValue.hpp"
diff --git a/vcl/source/window/brdwin.cxx b/vcl/source/window/brdwin.cxx
index 25ef3e27001c..d048b3ab6fba 100644
--- a/vcl/source/window/brdwin.cxx
+++ b/vcl/source/window/brdwin.cxx
@@ -28,8 +28,11 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
-#include <vcl/svids.hrc>
-#include <vcl/svdata.hxx>
+#include <svids.hrc>
+#include <svdata.hxx>
+#include <brdwin.hxx>
+#include <window.h>
+
 #include <vcl/event.hxx>
 #include <vcl/decoview.hxx>
 #include <vcl/syswin.hxx>
@@ -41,9 +44,8 @@
 #include <vcl/virdev.hxx>
 #include <vcl/help.hxx>
 #include <vcl/edit.hxx>
-#include <vcl/brdwin.hxx>
-#include <vcl/window.h>
 #include <vcl/metric.hxx>
+
 #include <tools/debug.hxx>
 
 using namespace ::com::sun::star::uno;
diff --git a/vcl/source/window/btndlg.cxx b/vcl/source/window/btndlg.cxx
index cf9697b4f602..add12e4427bb 100644
--- a/vcl/source/window/btndlg.cxx
+++ b/vcl/source/window/btndlg.cxx
@@ -31,9 +31,11 @@
 
 #include <tools/debug.hxx>
 #include <tools/rc.h>
+
+#include <svdata.hxx>
+
 #include <vcl/button.hxx>
 #include <vcl/btndlg.hxx>
-#include <vcl/svdata.hxx>
 
 typedef boost::ptr_vector<ImplBtnDlgItem>::iterator btn_iterator;
 typedef boost::ptr_vector<ImplBtnDlgItem>::const_iterator btn_const_iterator;
diff --git a/vcl/source/window/cursor.cxx b/vcl/source/window/cursor.cxx
index 68dc8248a776..89bfe4f2d067 100644
--- a/vcl/source/window/cursor.cxx
+++ b/vcl/source/window/cursor.cxx
@@ -28,14 +28,17 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
+
 #include <vcl/svapp.hxx>
 #include <vcl/timer.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/window.hxx>
-#include <vcl/window.h>
-#include <tools/poly.hxx>
 #include <vcl/cursor.hxx>
 
+#include <window.h>
+
+#include <tools/poly.hxx>
+
 
 // =======================================================================
 
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index 7e2725e07023..5c4c786a1f39 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -31,11 +31,12 @@
 #include <tools/debug.hxx>
 
 #include <tools/rc.h>
-#include <vcl/svdata.hxx>
+#include <svdata.hxx>
+#include <window.h>
+#include <brdwin.hxx>
+
 #include <vcl/svapp.hxx>
-#include <vcl/window.h>
 #include <vcl/event.hxx>
-#include <vcl/brdwin.hxx>
 #include <vcl/wrkwin.hxx>
 #include <vcl/button.hxx>
 #include <vcl/mnemonic.hxx>
diff --git a/vcl/source/window/dlgctrl.cxx b/vcl/source/window/dlgctrl.cxx
index ce7b6dca8119..24468089e88a 100644
--- a/vcl/source/window/dlgctrl.cxx
+++ b/vcl/source/window/dlgctrl.cxx
@@ -28,15 +28,18 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
+
 #include <tools/debug.hxx>
-#include <vcl/svdata.hxx>
+
+#include <svdata.hxx>
+#include <window.h>
+
 #include <vcl/event.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/tabpage.hxx>
 #include <vcl/tabctrl.hxx>
 #include <vcl/tabdlg.hxx>
 #include <vcl/button.hxx>
-#include <vcl/window.h>
 
 #include <vcl/unohelp.hxx>
 #include <com/sun/star/i18n/XCharacterClassification.hpp>
diff --git a/vcl/source/window/dndevdis.cxx b/vcl/source/window/dndevdis.cxx
index d9417e3bacf0..5d6a309e838e 100644
--- a/vcl/source/window/dndevdis.cxx
+++ b/vcl/source/window/dndevdis.cxx
@@ -29,13 +29,14 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-#include <vcl/dndevdis.hxx>
-#include <vcl/dndlcon.hxx>
-#include <vcl/window.h>
+#include <dndevdis.hxx>
+#include <dndlcon.hxx>
+#include <window.h>
+#include <svdata.hxx>
 
 #include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
-#include <vcl/svdata.hxx>
+
 using namespace ::cppu;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
diff --git a/vcl/source/window/dndlcon.cxx b/vcl/source/window/dndlcon.cxx
index e7be0e0f6437..977e8611e70a 100644
--- a/vcl/source/window/dndlcon.cxx
+++ b/vcl/source/window/dndlcon.cxx
@@ -29,7 +29,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-#include <vcl/dndlcon.hxx>
+#include <dndlcon.hxx>
 
 using namespace ::cppu;
 using namespace ::com::sun::star::uno;
diff --git a/vcl/source/window/dockingarea.cxx b/vcl/source/window/dockingarea.cxx
index ded887c59933..df29d9e3a07a 100644
--- a/vcl/source/window/dockingarea.cxx
+++ b/vcl/source/window/dockingarea.cxx
@@ -28,11 +28,14 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
+
 #include <tools/debug.hxx>
+
 #include <vcl/dockingarea.hxx>
 #include <vcl/syswin.hxx>
 #include <vcl/menu.hxx>
-#include <vcl/svdata.hxx>
+
+#include <svdata.hxx>
 
 #include <map>
 
diff --git a/vcl/source/window/dockmgr.cxx b/vcl/source/window/dockmgr.cxx
index a2ebdb43c857..6186514d2b88 100644
--- a/vcl/source/window/dockmgr.cxx
+++ b/vcl/source/window/dockmgr.cxx
@@ -29,21 +29,22 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-#include <svsys.h>
 #include <tools/time.hxx>
 #include <tools/rc.h>
+
+#include <brdwin.hxx>
+#include <svdata.hxx>
+#include <salframe.hxx>
+#include <window.h>
+
 #include <vcl/event.hxx>
-#include <vcl/brdwin.hxx>
 #include <vcl/floatwin.hxx>
 #include <vcl/dockwin.hxx>
 #include <vcl/toolbox.hxx>
 #include <vcl/svapp.hxx>
-#include <vcl/svdata.hxx>
 #include <vcl/timer.hxx>
 #include <vcl/lineinfo.hxx>
-#include <vcl/window.h>
 #include <vcl/unowrap.hxx>
-#include <vcl/salframe.hxx>
 
 
 // =======================================================================
diff --git a/vcl/source/window/dockwin.cxx b/vcl/source/window/dockwin.cxx
index c9b71b01f78e..6440d118fe54 100644
--- a/vcl/source/window/dockwin.cxx
+++ b/vcl/source/window/dockwin.cxx
@@ -29,19 +29,19 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-#include <svsys.h>
 #include <tools/time.hxx>
 #include <tools/rc.h>
 #include <vcl/event.hxx>
-#include <vcl/brdwin.hxx>
 #include <vcl/floatwin.hxx>
 #include <vcl/dockwin.hxx>
 #include <vcl/svapp.hxx>
-#include <vcl/svdata.hxx>
 #include <vcl/timer.hxx>
-#include <vcl/window.h>
 #include <vcl/unowrap.hxx>
-#include <vcl/salframe.hxx>
+
+#include <svdata.hxx>
+#include <window.h>
+#include <brdwin.hxx>
+#include <salframe.hxx>
 
 
 
diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx
index 2c21ec7a83d1..118c60f214cc 100644
--- a/vcl/source/window/floatwin.cxx
+++ b/vcl/source/window/floatwin.cxx
@@ -29,17 +29,18 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-#include <svsys.h>
-#include <vcl/svdata.hxx>
+#include <svdata.hxx>
+#include <brdwin.hxx>
+#include <window.h>
+#include <salframe.hxx>
+
 #include <vcl/svapp.hxx>
 #include <vcl/wrkwin.hxx>
-#include <vcl/brdwin.hxx>
 #include <vcl/event.hxx>
 #include <vcl/toolbox.hxx>
 #include <vcl/floatwin.hxx>
-#include <vcl/window.h>
+
 #include <tools/rc.h>
-#include <vcl/salframe.hxx>
 #include <tools/debug.hxx>
 
 
diff --git a/vcl/source/window/introwin.cxx b/vcl/source/window/introwin.cxx
index a0926ec789ad..538bd6bf25a6 100644
--- a/vcl/source/window/introwin.cxx
+++ b/vcl/source/window/introwin.cxx
@@ -29,16 +29,15 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-#include <svsys.h>
-#include <vcl/salframe.hxx>
 #include <tools/debug.hxx>
-#include <vcl/svdata.hxx>
-#include <vcl/wrkwin.hxx>
 
+#include <vcl/wrkwin.hxx>
 #include <vcl/bitmap.hxx>
-#include <vcl/impbmp.hxx>
 #include <vcl/introwin.hxx>
 
+#include <impbmp.hxx>
+#include <svdata.hxx>
+#include <salframe.hxx>
 
 
 
diff --git a/vcl/source/window/keycod.cxx b/vcl/source/window/keycod.cxx
index 05370f3a029f..466ebbb41ebf 100644
--- a/vcl/source/window/keycod.cxx
+++ b/vcl/source/window/keycod.cxx
@@ -29,17 +29,16 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-#include <svsys.h>
-#include <vcl/salinst.hxx>
-#include <vcl/salframe.hxx>
-#include <vcl/svdata.hxx>
+#include <salinst.hxx>
+#include <salframe.hxx>
+#include <svdata.hxx>
+
 #include <vcl/window.hxx>
 #include <vcl/keycod.hxx>
 
 #include <tools/rc.h>
 
 
-
 // =======================================================================
 static sal_uInt16 aImplKeyFuncTab[(KEYFUNC_FRONT+1)*4] =
 {
diff --git a/vcl/source/window/makefile.mk b/vcl/source/window/makefile.mk
deleted file mode 100644
index 1c63376dfda5..000000000000
--- a/vcl/source/window/makefile.mk
+++ /dev/null
@@ -1,106 +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=win
-ENABLE_EXCEPTIONS=TRUE
-
-.INCLUDE :	$(PRJ)$/util$/makefile.pmk
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile2.pmk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES= \
-            $(SLO)$/arrange.obj		\
-            $(SLO)$/abstdlg.obj		\
-            $(SLO)$/accel.obj		\
-            $(SLO)$/accmgr.obj		\
-            $(SLO)$/brdwin.obj		\
-            $(SLO)$/btndlg.obj		\
-            $(SLO)$/cmdevt.obj		\
-            $(SLO)$/cursor.obj		\
-            $(SLO)$/decoview.obj	\
-            $(SLO)$/dialog.obj		\
-            $(SLO)$/dlgctrl.obj 	\
-            $(SLO)$/dndevdis.obj	\
-            $(SLO)$/dndlcon.obj     \
-            $(SLO)$/dockingarea.obj \
-            $(SLO)$/dockmgr.obj 	\
-            $(SLO)$/dockwin.obj 	\
-            $(SLO)$/floatwin.obj	\
-            $(SLO)$/introwin.obj	\
-            $(SLO)$/keycod.obj		\
-            $(SLO)$/keyevent.obj	\
-            $(SLO)$/mouseevent.obj	\
-            $(SLO)$/menu.obj		\
-            $(SLO)$/mnemonic.obj	\
-            $(SLO)$/mnemonicengine.obj  \
-            $(SLO)$/msgbox.obj		\
-            $(SLO)$/popupmenuwindow.obj		\
-            $(SLO)$/scrwnd.obj		\
-            $(SLO)$/printdlg.obj    \
-            $(SLO)$/seleng.obj		\
-            $(SLO)$/split.obj		\
-            $(SLO)$/splitwin.obj	\
-            $(SLO)$/status.obj		\
-            $(SLO)$/syschild.obj	\
-            $(SLO)$/javachild.obj	\
-            $(SLO)$/syswin.obj		\
-            $(SLO)$/tabdlg.obj		\
-            $(SLO)$/tabpage.obj 	\
-            $(SLO)$/taskpanelist.obj	\
-            $(SLO)$/toolbox.obj 	\
-            $(SLO)$/toolbox2.obj	\
-            $(SLO)$/window.obj		\
-            $(SLO)$/winproc.obj 	\
-            $(SLO)$/window2.obj 	\
-            $(SLO)$/window3.obj		\
-            $(SLO)$/window4.obj		\
-            $(SLO)$/wpropset.obj	\
-            $(SLO)$/wrkwin.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :	target.mk
-
-.INCLUDE :	$(PRJ)$/util$/target.pmk
-
-$(INCCOM)$/cuilib.hxx: makefile.mk
-.IF "$(GUI)"=="UNX"
-    @$(RM) $@
-    @echo \#define DLL_NAME \"libcui$(DLLPOSTFIX)$(DLLPOST)\" >$@
-.ELSE
-    @echo $(EMQ)#define DLL_NAME $(EMQ)"cui$(DLLPOSTFIX)$(DLLPOST)$(EMQ)" >$@
-.ENDIF
-
-$(SLO)$/abstdlg.obj : $(INCCOM)$/cuilib.hxx
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index 4f7b09b0f589..d4e16ed6c121 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -30,37 +30,38 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-#include "svsys.h"
-#include "vcl/salinst.hxx"
 #include "tools/debug.hxx"
 #include "tools/diagnose_ex.h"
-#include "vcl/svdata.hxx"
+#include "tools/rc.h"
+#include "tools/stream.hxx"
+
 #include "vcl/svapp.hxx"
 #include "vcl/mnemonic.hxx"
 #include "vcl/image.hxx"
 #include "vcl/event.hxx"
 #include "vcl/help.hxx"
-#include "vcl/svids.hrc"
 #include "vcl/floatwin.hxx"
 #include "vcl/wrkwin.hxx"
 #include "vcl/timer.hxx"
 #include "vcl/sound.hxx"
 #include "vcl/decoview.hxx"
 #include "vcl/bitmap.hxx"
-#include "tools/rc.h"
 #include "vcl/menu.hxx"
 #include "vcl/button.hxx"
 #include "vcl/gradient.hxx"
 #include "vcl/i18nhelp.hxx"
 #include "vcl/taskpanelist.hxx"
-#include "vcl/window.h"
 #include "vcl/controllayout.hxx"
 #include "vcl/toolbox.hxx"
-#include "tools/stream.hxx"
-#include "vcl/salmenu.hxx"
-#include "vcl/salframe.hxx"
 #include "vcl/dockingarea.hxx"
 
+#include "salinst.hxx"
+#include "svdata.hxx"
+#include "svids.hrc"
+#include "window.h"
+#include "salmenu.hxx"
+#include "salframe.hxx"
+
 
 #include <com/sun/star/uno/Reference.h>
 #include <com/sun/star/i18n/XCharacterClassification.hpp>
diff --git a/vcl/source/window/msgbox.cxx b/vcl/source/window/msgbox.cxx
index ae4c148d5807..3f8c5683458f 100644
--- a/vcl/source/window/msgbox.cxx
+++ b/vcl/source/window/msgbox.cxx
@@ -29,19 +29,21 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-#include <vcl/svids.hrc>
-#include <vcl/svdata.hxx>
+#include <tools/rc.h>
+
+#include <svids.hrc>
+#include <svdata.hxx>
+#include <brdwin.hxx>
+#include <window.h>
+
 #include <vcl/metric.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/wrkwin.hxx>
 #include <vcl/fixed.hxx>
 #include <vcl/sound.hxx>
-#include <vcl/brdwin.hxx>
 #include <vcl/msgbox.hxx>
 #include <vcl/button.hxx>
-#include <tools/rc.h>
 #include <vcl/mnemonic.hxx>
-#include <vcl/window.h>
 
 
 
diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx
index af4fea4ef076..36293298172c 100644
--- a/vcl/source/window/printdlg.cxx
+++ b/vcl/source/window/printdlg.cxx
@@ -28,14 +28,15 @@
 
 #include "precompiled_vcl.hxx"
 
+#include "printdlg.hxx"
+#include "svdata.hxx"
+#include "svids.hrc"
+#include "jobset.h"
+
 #include "vcl/print.hxx"
-#include "vcl/prndlg.hxx"
 #include "vcl/dialog.hxx"
 #include "vcl/button.hxx"
-#include "vcl/svdata.hxx"
-#include "vcl/svids.hrc"
 #include "vcl/wall.hxx"
-#include "vcl/jobset.h"
 #include "vcl/status.hxx"
 #include "vcl/decoview.hxx"
 #include "vcl/arrange.hxx"
diff --git a/vcl/source/window/scrwnd.cxx b/vcl/source/window/scrwnd.cxx
index 588f4d4fa1fa..5882ef3999ba 100644
--- a/vcl/source/window/scrwnd.cxx
+++ b/vcl/source/window/scrwnd.cxx
@@ -33,11 +33,12 @@
 #include <tools/time.hxx>
 #include <tools/debug.hxx>
 
-#include <vcl/svids.hrc>
-#include <vcl/svdata.hxx>
+#include <svids.hrc>
+#include <svdata.hxx>
+#include <scrwnd.hxx>
+
 #include <vcl/timer.hxx>
 #include <vcl/event.hxx>
-#include <scrwnd.hxx>
 
 #include <math.h>
 #include <limits.h>
diff --git a/vcl/source/window/seleng.cxx b/vcl/source/window/seleng.cxx
index b8b6735d81ca..0c323c37f0f6 100644
--- a/vcl/source/window/seleng.cxx
+++ b/vcl/source/window/seleng.cxx
@@ -175,11 +175,7 @@ void SelectionEngine::CursorPosChanging( sal_Bool bShift, sal_Bool bMod1 )
 sal_Bool SelectionEngine::SelMouseButtonDown( const MouseEvent& rMEvt )
 {
     nFlags &= (~SELENG_CMDEVT);
-    if ( !pFunctionSet || !pWin )
-        return sal_False;
-    const bool bRightClickCursorPositioning =
-            rMEvt.IsRight() && rMEvt.GetClicks() == 1 && !IsInSelection();
-    if ( (rMEvt.GetClicks() > 1 || rMEvt.IsRight()) && !bRightClickCursorPositioning )
+    if ( !pFunctionSet || !pWin || rMEvt.GetClicks() > 1 || rMEvt.IsRight() )
         return sal_False;
 
     sal_uInt16 nModifier = rMEvt.GetModifier() | nLockedMods;
diff --git a/vcl/source/window/split.cxx b/vcl/source/window/split.cxx
index 1d4c8bfae815..683c114f48f7 100644
--- a/vcl/source/window/split.cxx
+++ b/vcl/source/window/split.cxx
@@ -30,16 +30,19 @@
 #include "precompiled_vcl.hxx"
 
 #include <tools/rc.h>
+#include <tools/poly.hxx>
+
 #include <vcl/event.hxx>
 #include <vcl/split.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/syswin.hxx>
 #include <vcl/taskpanelist.hxx>
 #include <vcl/gradient.hxx>
-#include <tools/poly.hxx>
 #include <vcl/lineinfo.hxx>
+
 #include <rtl/instance.hxx>
-#include <vcl/window.h>
+
+#include <window.h>
 
 namespace
 {
diff --git a/vcl/source/window/splitwin.cxx b/vcl/source/window/splitwin.cxx
index 0a9a9dd70407..9c0f4699baa8 100644
--- a/vcl/source/window/splitwin.cxx
+++ b/vcl/source/window/splitwin.cxx
@@ -30,19 +30,21 @@
 #include "precompiled_vcl.hxx"
 
 #include <string.h>
+
 #include <tools/debug.hxx>
 #include <tools/rcid.h>
+
 #include <vcl/event.hxx>
 #include <vcl/wall.hxx>
 #include <vcl/bitmap.hxx>
 #include <vcl/decoview.hxx>
 #include <vcl/symbol.hxx>
-#include <vcl/svids.hrc>
 #include <vcl/image.hxx>
-#include <vcl/svdata.hxx>
 #include <vcl/help.hxx>
 #include <vcl/splitwin.hxx>
 
+#include <svdata.hxx>
+#include <svids.hrc>
 
 // =======================================================================
 
diff --git a/vcl/source/window/status.cxx b/vcl/source/window/status.cxx
index 9280bb25b80c..60765be7af5d 100644
--- a/vcl/source/window/status.cxx
+++ b/vcl/source/window/status.cxx
@@ -28,17 +28,19 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
-#include <tools/debug.hxx>
 
+#include <tools/debug.hxx>
 #include <tools/rc.h>
-#include <vcl/svdata.hxx>
+
 #include <vcl/event.hxx>
 #include <vcl/decoview.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/help.hxx>
 #include <vcl/status.hxx>
 #include <vcl/virdev.hxx>
-#include <vcl/window.h>
+
+#include <svdata.hxx>
+#include <window.h>
 
 // =======================================================================
 
diff --git a/vcl/source/window/syschild.cxx b/vcl/source/window/syschild.cxx
index 2c4e6246bbce..341d7f3bfff8 100644..100755
--- a/vcl/source/window/syschild.cxx
+++ b/vcl/source/window/syschild.cxx
@@ -29,21 +29,26 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-#include <svsys.h>
 #include <rtl/process.h>
 #include <rtl/ref.hxx>
+
 #include <tools/rc.h>
-#include <vcl/window.h>
-#include <vcl/salinst.hxx>
-#include <vcl/salframe.hxx>
+
+// declare system types in sysdata.hxx
+#include <svsys.h>
+
 #include <vcl/window.hxx>
-#include <vcl/salobj.hxx>
-#include <vcl/svdata.hxx>
 #include <vcl/sysdata.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/syschild.hxx>
 #include <vcl/unohelp.hxx>
 
+#include <window.h>
+#include <salinst.hxx>
+#include <salframe.hxx>
+#include <salobj.hxx>
+#include <svdata.hxx>
+
 #ifdef SOLAR_JAVA
 #include <jni.h>
 #endif
@@ -54,8 +59,6 @@
 #include <com/sun/star/java/XJavaThreadRegister_11.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 
-#include <vcl/syschild.hxx>
-
 using namespace ::com::sun::star;
 
 // =======================================================================
@@ -249,6 +252,7 @@ sal_IntPtr SystemChildWindow::GetParentWindowHandle( sal_Bool bUseJava )
 {
     sal_IntPtr nRet = 0;
 
+    (void)bUseJava;
 #if defined WNT
     nRet = reinterpret_cast< sal_IntPtr >( GetSystemData()->hWnd );
     (void)bUseJava;
diff --git a/vcl/source/window/syswin.cxx b/vcl/source/window/syswin.cxx
index 3343779f632b..f6c7e422cc3b 100644
--- a/vcl/source/window/syswin.cxx
+++ b/vcl/source/window/syswin.cxx
@@ -30,14 +30,8 @@
 #include "precompiled_vcl.hxx"
 #include <tools/debug.hxx>
 
-#include <svsys.h>
-#include <vcl/salframe.hxx>
-#include <vcl/svdata.hxx>
 #include <vcl/svapp.hxx>
-#include <vcl/brdwin.hxx>
 #include <vcl/menu.hxx>
-#include <vcl/window.h>
-#include <vcl/brdwin.hxx>
 #include <vcl/sound.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/event.hxx>
@@ -45,6 +39,10 @@
 #include <vcl/taskpanelist.hxx>
 #include <vcl/unowrap.hxx>
 
+#include <salframe.hxx>
+#include <svdata.hxx>
+#include <brdwin.hxx>
+#include <window.h>
 
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
diff --git a/vcl/source/window/tabpage.cxx b/vcl/source/window/tabpage.cxx
index f109f2079a4c..a834af10d37d 100644
--- a/vcl/source/window/tabpage.cxx
+++ b/vcl/source/window/tabpage.cxx
@@ -30,18 +30,17 @@
 #include "precompiled_vcl.hxx"
 
 #include <tools/ref.hxx>
-
 #include <tools/rc.h>
-#include <vcl/svdata.hxx>
+
 #include <vcl/svapp.hxx>
 #include <vcl/event.hxx>
 #include <vcl/tabpage.hxx>
 #include <vcl/tabctrl.hxx>
 #include <vcl/bitmapex.hxx>
-#include <com/sun/star/accessibility/XAccessible.hpp>
-
 
+#include <svdata.hxx>
 
+#include <com/sun/star/accessibility/XAccessible.hpp>
 
 // =======================================================================
 
diff --git a/vcl/source/window/taskpanelist.cxx b/vcl/source/window/taskpanelist.cxx
index 6b6421d1595e..24c8ded6e4b4 100644
--- a/vcl/source/window/taskpanelist.cxx
+++ b/vcl/source/window/taskpanelist.cxx
@@ -28,11 +28,14 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
-#include <vcl/svdata.hxx>
+
 #include <tools/rcid.h>
-#include <vcl/dockwin.hxx>
 
+#include <vcl/dockwin.hxx>
 #include <vcl/taskpanelist.hxx>
+
+#include <svdata.hxx>
+
 #include <functional>
 #include <algorithm>
 
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index deacae06dc86..3e83a1711a24 100644..100755
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -29,12 +29,12 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-#include <svsys.h>
 #include <rtl/logfile.hxx>
-#include <tools/debug.hxx>
 
+#include <tools/debug.hxx>
 #include <tools/rc.h>
-#include <vcl/svdata.hxx>
+#include <tools/poly.hxx>
+
 #include <vcl/event.hxx>
 #include <vcl/decoview.hxx>
 #include <vcl/accel.hxx>
@@ -44,14 +44,18 @@
 #include <vcl/virdev.hxx>
 #include <vcl/spin.h>
 #include <vcl/toolbox.hxx>
-#include <vcl/toolbox.h>
 #include <vcl/bitmap.hxx>
-#include <tools/poly.hxx>
-#include <vcl/salframe.hxx>
 #include <vcl/mnemonic.hxx>
 #include <vcl/gradient.hxx>
 #include <vcl/menu.hxx>
-#include <vcl/window.h>
+
+#include <svdata.hxx>
+#include <window.h>
+#include <toolbox.h>
+#include <salframe.hxx>
+#if defined WNT
+#include <svsys.h>
+#endif
 
 #include <string.h>
 #include <vector>
diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx
index 37650232fd7f..08ffb453b06a 100644
--- a/vcl/source/window/toolbox2.cxx
+++ b/vcl/source/window/toolbox2.cxx
@@ -28,23 +28,25 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
-#include <tools/debug.hxx>
 
+#include <tools/debug.hxx>
 #include <tools/rc.h>
-#include <vcl/svdata.hxx>
+
 #include <vcl/svapp.hxx>
 #include <vcl/help.hxx>
 #include <vcl/bitmap.hxx>
 #include <vcl/toolbox.hxx>
-#include <vcl/toolbox.h>
 #include <vcl/mnemonic.hxx>
 #include <vcl/menu.hxx>
-#include <vcl/brdwin.hxx>
-
 #include <vcl/unohelp.hxx>
+#include <vcl/ImageListProvider.hxx>
+
+#include <svdata.hxx>
+#include <brdwin.hxx>
+#include <toolbox.h>
+
 #include <unotools/confignode.hxx>
 
-#include <vcl/ImageListProvider.hxx>
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
 
 using namespace vcl;
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index c392c6dfe587..6da22a6207eb 100644..100755
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -28,44 +28,58 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
-#include "svsys.h"
-#include "vcl/salframe.hxx"
-#include "vcl/salobj.hxx"
-#include "vcl/salinst.hxx"
-#include "vcl/salgtype.hxx"
-#include "vcl/salgdi.hxx"
 
-#include "vcl/unohelp.hxx"
 #include "tools/time.hxx"
 #include "tools/debug.hxx"
 #include "tools/rc.h"
-#include "vcl/svdata.hxx"
-#include "vcl/dbggui.hxx"
-#include "vcl/outfont.hxx"
-#include "vcl/outdev.h"
-#include "vcl/region.h"
+
+#include "unotools/fontcfg.hxx"
+#include "unotools/confignode.hxx"
+
+#include "vcl/unohelp.hxx"
+#include "vcl/salgtype.hxx"
 #include "vcl/event.hxx"
 #include "vcl/help.hxx"
 #include "vcl/cursor.hxx"
 #include "vcl/svapp.hxx"
-#include "vcl/window.h"
 #include "vcl/window.hxx"
 #include "vcl/syswin.hxx"
 #include "vcl/syschild.hxx"
-#include "vcl/brdwin.hxx"
-#include "vcl/helpwin.hxx"
 #include "vcl/dockwin.hxx"
 #include "vcl/menu.hxx"
 #include "vcl/wrkwin.hxx"
 #include "vcl/wall.hxx"
 #include "vcl/gradient.hxx"
-#include "vcl/toolbox.h"
-#include "unotools/fontcfg.hxx"
-#include "vcl/sysdata.hxx"
-#include "vcl/sallayout.hxx"
 #include "vcl/salctype.hxx"
-#include "vcl/button.hxx" // Button::GetStandardText
+#include "vcl/button.hxx"
 #include "vcl/taskpanelist.hxx"
+#include "vcl/dialog.hxx"
+#include "vcl/unowrap.hxx"
+#include "vcl/gdimtf.hxx"
+#include "vcl/pdfextoutdevdata.hxx"
+#include "vcl/lazydelete.hxx"
+
+// declare system types in sysdata.hxx
+#include "svsys.h"
+#include "vcl/sysdata.hxx"
+
+#include "salframe.hxx"
+#include "salobj.hxx"
+#include "salinst.hxx"
+#include "salgdi.hxx"
+#include "svdata.hxx"
+#include "dbggui.hxx"
+#include "outfont.hxx"
+#include "window.h"
+#include "toolbox.h"
+#include "outdev.h"
+#include "region.h"
+#include "brdwin.hxx"
+#include "helpwin.hxx"
+#include "sallayout.hxx"
+#include "dndlcon.hxx"
+#include "dndevdis.hxx"
+
 #include "com/sun/star/awt/XWindowPeer.hpp"
 #include "com/sun/star/rendering/XCanvas.hpp"
 #include "com/sun/star/rendering/XSpriteCanvas.hpp"
@@ -82,15 +96,7 @@
 #include "com/sun/star/accessibility/XAccessible.hpp"
 #include "com/sun/star/accessibility/AccessibleRole.hpp"
 
-#include "vcl/dialog.hxx"
-#include "vcl/unowrap.hxx"
-#include "vcl/dndlcon.hxx"
-#include "vcl/dndevdis.hxx"
-#include "unotools/confignode.hxx"
-#include "vcl/gdimtf.hxx"
 #include <sal/macros.h>
-#include "vcl/pdfextoutdevdata.hxx"
-#include "vcl/lazydelete.hxx"
 
 #include <set>
 #include <typeinfo>
@@ -2893,7 +2899,7 @@ void Window::ImplScroll( const Rectangle& rRect,
         ImplInvalidateAllOverlapBackgrounds();
 
     if ( mpWindowImpl->mpCursor )
-        mpWindowImpl->mpCursor->ImplHide();
+        mpWindowImpl->mpCursor->ImplSuspend();
 
     sal_uInt16 nOrgFlags = nFlags;
     if ( !(nFlags & (SCROLL_CHILDREN | SCROLL_NOCHILDREN)) )
@@ -3040,7 +3046,7 @@ void Window::ImplScroll( const Rectangle& rRect,
         Update();
 
     if ( mpWindowImpl->mpCursor )
-        mpWindowImpl->mpCursor->ImplShow( false );
+        mpWindowImpl->mpCursor->ImplResume();
 }
 
 // -----------------------------------------------------------------------
@@ -9555,7 +9561,7 @@ sal_Bool Window::IsNativeWidgetEnabled() const
 }
 
 #ifdef WNT // see #140456#
-#include <salframe.h>
+#include <win/salframe.h>
 #endif
 
 uno::Reference< rendering::XCanvas > Window::ImplGetCanvas( const Size& rFullscreenSize,
diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx
index e98d51d252c9..bf81d2665f48 100644
--- a/vcl/source/window/window2.cxx
+++ b/vcl/source/window/window2.cxx
@@ -30,27 +30,27 @@
 #include "precompiled_vcl.hxx"
 
 #include <limits.h>
-#include <svsys.h>
-#include <vcl/salbmp.hxx>
-#include <vcl/salgdi.hxx>
-#include <vcl/salframe.hxx>
 #include <tools/debug.hxx>
-#include <vcl/svdata.hxx>
-#include <vcl/impbmp.hxx>
+#include <tools/poly.hxx>
+
 #include <vcl/bitmap.hxx>
 #include <vcl/event.hxx>
 #include <vcl/timer.hxx>
 #include <vcl/metric.hxx>
-#include <vcl/outfont.hxx>
-#include <vcl/outdev.h>
-#include <tools/poly.hxx>
 #include <vcl/virdev.hxx>
-#include <vcl/window.h>
 #include <vcl/window.hxx>
 #include <vcl/scrbar.hxx>
-#include <scrwnd.hxx>
 #include <vcl/dockwin.hxx>
 
+#include <window.h>
+#include <outfont.hxx>
+#include <outdev.h>
+#include <svdata.hxx>
+#include <impbmp.hxx>
+#include <salbmp.hxx>
+#include <salgdi.hxx>
+#include <salframe.hxx>
+#include <scrwnd.hxx>
 
 
 // =======================================================================
diff --git a/vcl/source/window/window4.cxx b/vcl/source/window/window4.cxx
index 577a573c2015..775249c450ee 100644
--- a/vcl/source/window/window4.cxx
+++ b/vcl/source/window/window4.cxx
@@ -28,10 +28,11 @@
 #include "precompiled_vcl.hxx"
 
 #include "vcl/window.hxx"
-#include "vcl/window.h"
-#include "vcl/svdata.hxx"
 #include "vcl/arrange.hxx"
 
+#include "window.h"
+#include "svdata.hxx"
+
 #include "com/sun/star/beans/PropertyValue.hpp"
 
 #include <map>
diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx
index 2892bcb00c38..2e52891d18fc 100644
--- a/vcl/source/window/winproc.cxx
+++ b/vcl/source/window/winproc.cxx
@@ -29,35 +29,37 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-#include <svsys.h>
-#include <vcl/salwtype.hxx>
-#include <vcl/salframe.hxx>
 #include <tools/debug.hxx>
+
+#include <unotools/localedatawrapper.hxx>
+
 #include <vcl/i18nhelp.hxx>
 #include <vcl/unohelp.hxx>
-#include <unotools/localedatawrapper.hxx>
-#include <vcl/svdata.hxx>
-#include <vcl/dbggui.hxx>
 #include <vcl/timer.hxx>
 #include <vcl/event.hxx>
 #include <vcl/sound.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/cursor.hxx>
-#include <vcl/accmgr.hxx>
-#include <vcl/print.h>
-#include <vcl/window.h>
 #include <vcl/wrkwin.hxx>
 #include <vcl/floatwin.hxx>
 #include <vcl/dialog.hxx>
 #include <vcl/help.hxx>
-#include <vcl/helpwin.hxx>
-#include <vcl/brdwin.hxx>
 #include <vcl/dockwin.hxx>
-#include <vcl/salgdi.hxx>
 #include <vcl/menu.hxx>
 
-#include <vcl/dndlcon.hxx>
+#include <svdata.hxx>
+#include <dbggui.hxx>
+#include <salwtype.hxx>
+#include <salframe.hxx>
+#include <accmgr.hxx>
+#include <print.h>
+#include <window.h>
+#include <helpwin.hxx>
+#include <brdwin.hxx>
+#include <salgdi.hxx>
+#include <dndlcon.hxx>
+
 #include <com/sun/star/datatransfer/dnd/XDragSource.hpp>
 #include <com/sun/star/awt/MouseEvent.hpp>
 
@@ -1642,7 +1644,13 @@ void ImplHandleResize( Window* pWindow, long nNewWidth, long nNewHeight )
                         // #i42750# presentation wants to be informed about resize
                         // as early as possible
                         WorkWindow* pWorkWindow = dynamic_cast<WorkWindow*>(pWindow->ImplGetWindowImpl()->mpClientWindow);
-                        if( pWorkWindow && pWorkWindow->IsPresentationMode() )
+                        if( ! pWorkWindow || pWorkWindow->IsPresentationMode() )
+                            bStartTimer = false;
+                    }
+                    else
+                    {
+                        WorkWindow* pWorkWindow = dynamic_cast<WorkWindow*>(pWindow);
+                        if( ! pWorkWindow || pWorkWindow->IsPresentationMode() )
                             bStartTimer = false;
                     }
                 }
diff --git a/vcl/source/window/wpropset.cxx b/vcl/source/window/wpropset.cxx
index fcb0c560291e..10e3e8fa5e2f 100644
--- a/vcl/source/window/wpropset.cxx
+++ b/vcl/source/window/wpropset.cxx
@@ -30,7 +30,8 @@
 #include "vcl/wpropset.hxx"
 #include "vcl/window.hxx"
 #include "vcl/vclevent.hxx"
-#include "vcl/svdata.hxx"
+
+#include "svdata.hxx"
 
 #include "com/sun/star/lang/XMultiServiceFactory.hpp"
 #include "com/sun/star/beans/PropertyValue.hpp"
diff --git a/vcl/source/window/wrkwin.cxx b/vcl/source/window/wrkwin.cxx
index 38d78fbc9723..24ca3c9120d5 100644..100755
--- a/vcl/source/window/wrkwin.cxx
+++ b/vcl/source/window/wrkwin.cxx
@@ -29,20 +29,22 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-#include <svsys.h>
-#include <vcl/salframe.hxx>
 #include <tools/debug.hxx>
-
 #include <tools/rc.h>
-#include <vcl/svdata.hxx>
+
 #include <vcl/svapp.hxx>
-#include <vcl/brdwin.hxx>
-#include <vcl/window.h>
 #include <vcl/wrkwin.hxx>
+// declare system types in sysdata.hxx
+#include <svsys.h>
 #include <vcl/sysdata.hxx>
 #include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/rendering/XCanvas.hpp>
 
+#include <svdata.hxx>
+#include <salframe.hxx>
+#include <brdwin.hxx>
+#include <window.h>
+
 // =======================================================================
 
 #define WORKWIN_WINDOWSTATE_FULLSCREEN          ((sal_uLong)0x00010000)
diff --git a/vcl/unx/source/app/i18n_cb.cxx b/vcl/unx/generic/app/i18n_cb.cxx
index fbbb6eeabbf1..92429e63c91e 100644
--- a/vcl/unx/source/app/i18n_cb.cxx
+++ b/vcl/unx/generic/app/i18n_cb.cxx
@@ -31,20 +31,22 @@
 
 #include <stdio.h>
 #include <string.h>
+
 #include <sal/alloca.h>
+#include <osl/thread.h>
+
 #include <tools/prex.h>
 #include <X11/Xlocale.h>
 #include <X11/Xlib.h>
 #include <tools/postx.h>
 
-#include <salunx.h>
-#include <XIM.h>
-#include <i18n_cb.hxx>
-#include <i18n_status.hxx>
-#include "i18n_ic.hxx"
-#include "i18n_im.hxx"
-#include <osl/thread.h>
-#include <vcl/salframe.hxx>
+#include "unx/salunx.h"
+#include "unx/XIM.h"
+#include "unx/i18n_cb.hxx"
+#include "unx/i18n_status.hxx"
+#include "unx/i18n_ic.hxx"
+#include "unx/i18n_im.hxx"
+#include "salframe.hxx"
 
 // -------------------------------------------------------------------------
 //
diff --git a/vcl/unx/source/app/i18n_ic.cxx b/vcl/unx/generic/app/i18n_ic.cxx
index 9b30ba6a6546..8a8b5d620cb6 100644
--- a/vcl/unx/source/app/i18n_ic.cxx
+++ b/vcl/unx/generic/app/i18n_ic.cxx
@@ -30,25 +30,24 @@
 #include "precompiled_vcl.hxx"
 
 #include <stdio.h>
+
 #include <sal/alloca.h>
+#include <osl/thread.h>
 
 #include <tools/prex.h>
 #include <X11/Xlocale.h>
 #include <X11/Xlib.h>
 #include <tools/postx.h>
 
-#include <salunx.h>
-
-#include <XIM.h>
-#include <i18n_ic.hxx>
-#include <i18n_im.hxx>
-#include <i18n_status.hxx>
+#include <unx/salunx.h>
+#include <unx/XIM.h>
+#include <unx/i18n_ic.hxx>
+#include <unx/i18n_im.hxx>
+#include <unx/i18n_status.hxx>
 
-#include <salframe.h>
-#include <saldata.hxx>
-#include <saldisp.hxx>
-
-#include <osl/thread.h>
+#include <unx/salframe.h>
+#include <unx/saldata.hxx>
+#include <unx/saldisp.hxx>
 
 using namespace vcl;
 
diff --git a/vcl/unx/source/app/i18n_im.cxx b/vcl/unx/generic/app/i18n_im.cxx
index 32233cfb748c..5d30d74455ae 100644
--- a/vcl/unx/source/app/i18n_im.cxx
+++ b/vcl/unx/generic/app/i18n_im.cxx
@@ -31,6 +31,7 @@
 
 #include <stdio.h>
 #include <string.h>
+
 #ifdef LINUX
 #  ifndef __USE_XOPEN
 #    define __USE_XOPEN
@@ -41,19 +42,19 @@
 #include <tools/prex.h>
 #include <X11/Xlocale.h>
 #include <X11/Xlib.h>
-#include <XIM.h>
+#include <unx/XIM.h>
 #include <tools/postx.h>
 
-#include <salunx.h>
-#include <saldisp.hxx>
-#include "i18n_im.hxx"
-#include <i18n_status.hxx>
+#include "unx/salunx.h"
+#include "unx/saldisp.hxx"
+#include "unx/i18n_im.hxx"
+#include "unx/i18n_status.hxx"
 
 #include <osl/thread.h>
 #include <osl/process.h>
 
 using namespace vcl;
-#include "i18n_cb.hxx"
+#include "unx/i18n_cb.hxx"
 #if defined(SOLARIS) ||  defined(LINUX)
 extern "C" char * XSetIMValues(XIM im, ...);
 #endif
diff --git a/vcl/unx/source/app/i18n_keysym.cxx b/vcl/unx/generic/app/i18n_keysym.cxx
index 985448f3eb8d..2e2005f1a874 100644
--- a/vcl/unx/source/app/i18n_keysym.cxx
+++ b/vcl/unx/generic/app/i18n_keysym.cxx
@@ -32,7 +32,7 @@
 #include <X11/X.h>
 #include <sal/types.h>
 
-#include <i18n_keysym.hxx>
+#include <unx/i18n_keysym.hxx>
 
 // convert keysyms to unicode
 // for all keysyms with byte1 and byte2 equal zero, and of course only for
diff --git a/vcl/unx/source/app/i18n_status.cxx b/vcl/unx/generic/app/i18n_status.cxx
index bfea280dc687..8cae9d12eedd 100644
--- a/vcl/unx/source/app/i18n_status.cxx
+++ b/vcl/unx/generic/app/i18n_status.cxx
@@ -36,25 +36,25 @@
 
 #include <tools/prex.h>
 #include <X11/Xlib.h>
-#include <XIM.h>
+#include <unx/XIM.h>
 #include <tools/postx.h>
 
-#include <salunx.h>
-
-#include <i18n_status.hxx>
-#include <i18n_ic.hxx>
+#include <unx/salunx.h>
+#include <unx/i18n_status.hxx>
+#include <unx/i18n_ic.hxx>
+#include <unx/saldisp.hxx>
+#include <unx/salframe.h>
+#include <unx/saldata.hxx>
 
 #include <vcl/wrkwin.hxx>
 #include <vcl/fixed.hxx>
 #include <vcl/menubtn.hxx>
 #include <vcl/menu.hxx>
-#include <vcl/svdata.hxx>
 #include <vcl/svapp.hxx>
-#include <saldisp.hxx>
-#include <salframe.h>
-#include <saldata.hxx>
 #include <vcl/sysdata.hxx>
 
+#include <svdata.hxx>
+
 using namespace vcl;
 
 namespace vcl {
diff --git a/vcl/unx/source/app/i18n_wrp.cxx b/vcl/unx/generic/app/i18n_wrp.cxx
index baf7e175eac5..981dc390e278 100644
--- a/vcl/unx/source/app/i18n_wrp.cxx
+++ b/vcl/unx/generic/app/i18n_wrp.cxx
@@ -44,9 +44,10 @@ struct XIMArg
 
 #include <string.h>
 #include <dlfcn.h>
+
 #include <X11/Xlib.h>
 #include <X11/Xlibint.h>
-#include "XIM.h"
+#include "unx/XIM.h"
 
 #define XIIIMP_LIB       "xiiimp.so.2"
 
diff --git a/vcl/unx/source/app/i18n_xkb.cxx b/vcl/unx/generic/app/i18n_xkb.cxx
index bb62e248b1d7..cb93f48b6bd7 100644
--- a/vcl/unx/source/app/i18n_xkb.cxx
+++ b/vcl/unx/generic/app/i18n_xkb.cxx
@@ -32,9 +32,9 @@
 
 #include <stdio.h>
 
-#include "saldisp.hxx"
-#include "saldata.hxx"
-#include "i18n_xkb.hxx"
+#include "unx/saldisp.hxx"
+#include "unx/saldata.hxx"
+#include "unx/i18n_xkb.hxx"
 
 SalI18N_KeyboardExtension::SalI18N_KeyboardExtension( Display*
 #if __XKeyboardExtension__
diff --git a/vcl/unx/source/app/keysymnames.cxx b/vcl/unx/generic/app/keysymnames.cxx
index 80623499897f..e164d06d5d07 100644
--- a/vcl/unx/source/app/keysymnames.cxx
+++ b/vcl/unx/generic/app/keysymnames.cxx
@@ -35,7 +35,7 @@
 #include <tools/postx.h>
 #endif
 
-#include <saldisp.hxx>
+#include <unx/saldisp.hxx>
 #include <X11/keysym.h>
 #include <sal/macros.h>
 
diff --git a/vcl/unx/source/app/randrwrapper.cxx b/vcl/unx/generic/app/randrwrapper.cxx
index eb266485ce03..316bde14a83a 100644
--- a/vcl/unx/source/app/randrwrapper.cxx
+++ b/vcl/unx/generic/app/randrwrapper.cxx
@@ -283,8 +283,8 @@ void RandRWrapper::releaseWrapper()
 
 #endif
 
-#include "saldisp.hxx"
-#include "salframe.h"
+#include "unx/saldisp.hxx"
+#include "unx/salframe.h"
 #if OSL_DEBUG_LEVEL > 1
 #include <cstdio>
 #endif
diff --git a/vcl/unx/source/app/saldata.cxx b/vcl/unx/generic/app/saldata.cxx
index d8d54ddcc081..233582c07f6e 100644
--- a/vcl/unx/source/app/saldata.cxx
+++ b/vcl/unx/generic/app/saldata.cxx
@@ -57,24 +57,26 @@
 #include <sys/time.h>
 #include <unistd.h>
 #endif
+
 #include <osl/process.h>
 #include <osl/mutex.hxx>
 
-#include "Xproto.h"
-#include <saldisp.hxx>
-#include <saldata.hxx>
-#include <vcl/salinst.hxx>
-#include <salframe.h>
+#include "unx/Xproto.h"
+#include "unx/saldisp.hxx"
+#include "unx/saldata.hxx"
+#include "unx/salframe.h"
+#include "unx/sm.hxx"
+#include "unx/i18n_im.hxx"
+#include "unx/i18n_xkb.hxx"
+#include "salinst.hxx"
+
 #include <osl/signal.h>
 #include <osl/thread.h>
 #include <rtl/strbuf.hxx>
 #include <rtl/bootstrap.hxx>
 
 #include <tools/debug.hxx>
-#include <sm.hxx>
 #include <vcl/svapp.hxx>
-#include "i18n_im.hxx"
-#include "i18n_xkb.hxx"
 
 // -=-= <signal.h> -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 #ifndef UNX
diff --git a/vcl/unx/source/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx
index 65f6f471323d..358bbc205004 100644
--- a/vcl/unx/source/app/saldisp.cxx
+++ b/vcl/unx/generic/app/saldisp.cxx
@@ -49,8 +49,8 @@
 
 #include <tools/prex.h>
 #include <X11/cursorfont.h>
-#include "salcursors.h"
-#include "invert50.h"
+#include "unx/x11_cursors/salcursors.h"
+#include "unx/x11_cursors/invert50.h"
 #ifdef SOLARIS
 #define XK_KOREAN
 #endif
@@ -76,23 +76,23 @@ Status XineramaGetInfo(Display*, int, XRectangle*, unsigned char*, int*);
 
 #include <tools/postx.h>
 
-#include <salunx.h>
+#include <unx/salunx.h>
 #include <sal/types.h>
-#include "i18n_im.hxx"
-#include "i18n_xkb.hxx"
-#include <saldisp.hxx>
-#include <saldata.hxx>
-#include <vcl/salinst.hxx>
-#include <salgdi.h>
-#include <salframe.h>
+#include "unx/i18n_im.hxx"
+#include "unx/i18n_xkb.hxx"
+#include <unx/saldisp.hxx>
+#include <unx/saldata.hxx>
+#include <salinst.hxx>
+#include <unx/salgdi.h>
+#include <unx/salframe.h>
 #include <vcl/keycodes.hxx>
 #include <vcl/salbtype.hxx>
-#include <salbmp.h>
+#include <unx/salbmp.h>
 #include <osl/mutex.h>
-#include <salobj.h>
-#include <sm.hxx>
-#include <wmadaptor.hxx>
-#include <dtint.hxx>
+#include <unx/salobj.h>
+#include <unx/sm.hxx>
+#include <unx/wmadaptor.hxx>
+#include <unx/dtint.hxx>
 
 #include <osl/socket.h>
 #include <poll.h>
diff --git a/vcl/unx/source/app/salinst.cxx b/vcl/unx/generic/app/salinst.cxx
index 9b83ceb45413..81bc26cb3672 100644
--- a/vcl/unx/source/app/salinst.cxx
+++ b/vcl/unx/generic/app/salinst.cxx
@@ -33,23 +33,22 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <osl/module.hxx>
+#include "osl/module.hxx"
+#include "tools/solarmutex.hxx"
+
+#include "unx/salunx.h"
+#include "unx/saldata.hxx"
+#include "unx/saldisp.hxx"
+#include "unx/salinst.h"
+#include "unx/salframe.h"
+#include "unx/dtint.hxx"
+#include "unx/salprn.h"
+#include "unx/sm.hxx"
 
-#include "salunx.h"
-
-#include "saldata.hxx"
-#include "saldisp.hxx"
-#include "salinst.h"
-#include "salframe.h"
-#include "dtint.hxx"
-#include "salprn.h"
-#include "sm.hxx"
-
-#include "vcl/salwtype.hxx"
 #include "vcl/apptypes.hxx"
 #include "vcl/helper.hxx"
-#include <tools/solarmutex.hxx>
-#include "osl/mutex.hxx"
+
+#include "salwtype.hxx"
 #include <sal/macros.h>
 
 // -------------------------------------------------------------------------
@@ -103,7 +102,7 @@ sal_Bool SalYieldMutex::tryToAcquire()
 // plugin factory function
 extern "C"
 {
-    VCL_DLLPUBLIC SalInstance* create_SalInstance()
+    VCLPLUG_GEN_PUBLIC SalInstance* create_SalInstance()
     {
         /* #i92121# workaround deadlocks in the X11 implementation
         */
diff --git a/vcl/unx/source/app/salsys.cxx b/vcl/unx/generic/app/salsys.cxx
index 0b4ca3e84f0e..c5f7174e3d4c 100644
--- a/vcl/unx/source/app/salsys.cxx
+++ b/vcl/unx/generic/app/salsys.cxx
@@ -29,16 +29,17 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-#include <salunx.h>
-#include <vcl/salsys.hxx>
-#include <dtint.hxx>
+#include <unx/salunx.h>
+#include <unx/dtint.hxx>
+#include <unx/saldata.hxx>
+#include <unx/salinst.h>
+#include <unx/saldisp.hxx>
+#include <unx/salsys.h>
+
 #include <vcl/msgbox.hxx>
 #include <vcl/button.hxx>
-#include <vcl/svdata.hxx>
-#include <saldata.hxx>
-#include <salinst.h>
-#include <saldisp.hxx>
-#include <salsys.h>
+
+#include <svdata.hxx>
 
 #include <rtl/ustrbuf.hxx>
 #include <osl/thread.h>
diff --git a/vcl/unx/source/app/saltimer.cxx b/vcl/unx/generic/app/saltimer.cxx
index 885aeb7c38e7..98d6ccde5943 100644
--- a/vcl/unx/source/app/saltimer.cxx
+++ b/vcl/unx/generic/app/saltimer.cxx
@@ -35,11 +35,11 @@
 #include <time.h>
 #include <unistd.h>
 
-#include <salunx.h>
-#include <saldata.hxx>
-#include <saldisp.hxx>
-#include <saltimer.h>
-#include <salinst.h>
+#include <unx/salunx.h>
+#include <unx/saldata.hxx>
+#include <unx/saldisp.hxx>
+#include <unx/saltimer.h>
+#include <unx/salinst.h>
 
 // -=-= SalData =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
diff --git a/vcl/unx/source/app/sm.cxx b/vcl/unx/generic/app/sm.cxx
index 6bfd09fc4f5d..ac2682df4510 100644
--- a/vcl/unx/source/app/sm.cxx
+++ b/vcl/unx/generic/app/sm.cxx
@@ -37,19 +37,20 @@
 
 #include <osl/process.h>
 #include <osl/security.h>
+#include <osl/conditn.h>
 
 #include <tools/prex.h>
 #include <X11/Xatom.h>
 #include <tools/postx.h>
-#include <sm.hxx>
-#include <saldata.hxx>
-#include <saldisp.hxx>
-#include <salframe.h>
+
+#include <unx/sm.hxx>
+#include <unx/saldata.hxx>
+#include <unx/saldisp.hxx>
+#include <unx/salframe.h>
+#include <unx/salinst.h>
+
 #include <vcl/svapp.hxx>
 #include <vcl/window.hxx>
-#include <salinst.h>
-
-#include <osl/conditn.h>
 
 #define USE_SM_EXTENSION
 
diff --git a/vcl/unx/source/app/soicon.cxx b/vcl/unx/generic/app/soicon.cxx
index 54240f8eef45..1557b064977e 100644
--- a/vcl/unx/source/app/soicon.cxx
+++ b/vcl/unx/generic/app/soicon.cxx
@@ -29,18 +29,21 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-#include <salunx.h>
-#include <saldisp.hxx>
-#include <vcl/salbmp.hxx>
+#include <unx/salunx.h>
+#include <unx/saldisp.hxx>
+#include <unx/salbmp.h>
+#include <unx/soicon.hxx>
+
 #include <vcl/salbtype.hxx>
-#include <vcl/impbmp.hxx>
 #include <vcl/bitmap.hxx>
 #include <vcl/bitmapex.hxx>
 #include <vcl/graph.hxx>
-#include <soicon.hxx>
-#include <vcl/svdata.hxx>
-#include <salbmp.h>
-#include <vcl/svids.hrc>
+
+#include <svdata.hxx>
+#include <svids.hrc>
+#include <salbmp.hxx>
+#include <impbmp.hxx>
+
 
 sal_Bool SelectAppIconPixmap( SalDisplay *pDisplay, int nScreen,sal_uInt16 nIcon, sal_uInt16 iconSize,
                           Pixmap& icon_pixmap, Pixmap& icon_mask)
diff --git a/vcl/unx/source/app/wmadaptor.cxx b/vcl/unx/generic/app/wmadaptor.cxx
index e03f357998ce..ad9b5ee22d6c 100644
--- a/vcl/unx/source/app/wmadaptor.cxx
+++ b/vcl/unx/generic/app/wmadaptor.cxx
@@ -32,18 +32,22 @@
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
+
 #include "sal/alloca.h"
-#include "wmadaptor.hxx"
-#include "saldisp.hxx"
-#include "saldata.hxx"
-#include "salframe.h"
-#include "vcl/salgdi.hxx"
-#include "osl/thread.h"
 #include "rtl/locale.h"
+
+#include "osl/thread.h"
 #include "osl/process.h"
 #include <sal/macros.h>
 #include "vcl/configsettings.hxx"
 
+#include "unx/wmadaptor.hxx"
+#include "unx/saldisp.hxx"
+#include "unx/saldata.hxx"
+#include "unx/salframe.h"
+
+#include "salgdi.hxx"
+
 #include "tools/prex.h"
 #include <X11/X.h>
 #include <X11/Xatom.h>
diff --git a/vcl/unx/source/desktopdetect/desktopdetector.cxx b/vcl/unx/generic/desktopdetect/desktopdetector.cxx
index cb3574591bcf..568507822c1e 100644
--- a/vcl/unx/source/desktopdetect/desktopdetector.cxx
+++ b/vcl/unx/generic/desktopdetect/desktopdetector.cxx
@@ -29,18 +29,18 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-#include <svunx.h>
+#include <unx/svunx.h>
 #include <tools/prex.h>
 #include <X11/Xatom.h>
 #include <tools/postx.h>
 
-#include "vcl/dllapi.h"
-
 #include "rtl/ustrbuf.hxx"
 #include "osl/module.h"
 #include "osl/process.h"
 #include "osl/thread.h"
 
+#include "vclpluginapi.h"
+
 #include <unistd.h>
 #include <string.h>
 
@@ -255,7 +255,7 @@ static bool is_cde_desktop( Display* pDisplay )
 extern "C"
 {
 
-VCL_DLLPUBLIC rtl::OUString get_desktop_environment()
+DESKTOP_DETECTOR_PUBLIC rtl::OUString get_desktop_environment()
 {
     rtl::OUStringBuffer aRet( 8 );
     static const char *pOverride = getenv( "OOO_FORCE_DESKTOP" );
diff --git a/vcl/unx/source/dtrans/X11_clipboard.cxx b/vcl/unx/generic/dtrans/X11_clipboard.cxx
index e2cc22b32198..e2cc22b32198 100644
--- a/vcl/unx/source/dtrans/X11_clipboard.cxx
+++ b/vcl/unx/generic/dtrans/X11_clipboard.cxx
diff --git a/vcl/unx/source/dtrans/X11_clipboard.hxx b/vcl/unx/generic/dtrans/X11_clipboard.hxx
index 73240d8715e6..73240d8715e6 100644
--- a/vcl/unx/source/dtrans/X11_clipboard.hxx
+++ b/vcl/unx/generic/dtrans/X11_clipboard.hxx
diff --git a/vcl/unx/source/dtrans/X11_dndcontext.cxx b/vcl/unx/generic/dtrans/X11_dndcontext.cxx
index 988dce430a51..988dce430a51 100644
--- a/vcl/unx/source/dtrans/X11_dndcontext.cxx
+++ b/vcl/unx/generic/dtrans/X11_dndcontext.cxx
diff --git a/vcl/unx/source/dtrans/X11_dndcontext.hxx b/vcl/unx/generic/dtrans/X11_dndcontext.hxx
index bca708eb24c7..bca708eb24c7 100644
--- a/vcl/unx/source/dtrans/X11_dndcontext.hxx
+++ b/vcl/unx/generic/dtrans/X11_dndcontext.hxx
diff --git a/vcl/unx/source/dtrans/X11_droptarget.cxx b/vcl/unx/generic/dtrans/X11_droptarget.cxx
index d72c5c4c7eeb..d72c5c4c7eeb 100644
--- a/vcl/unx/source/dtrans/X11_droptarget.cxx
+++ b/vcl/unx/generic/dtrans/X11_droptarget.cxx
diff --git a/vcl/unx/source/dtrans/X11_selection.cxx b/vcl/unx/generic/dtrans/X11_selection.cxx
index d6456562b977..22f109905b13 100644
--- a/vcl/unx/source/dtrans/X11_selection.cxx
+++ b/vcl/unx/generic/dtrans/X11_selection.cxx
@@ -29,8 +29,8 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-#include "saldisp.hxx"
-#include "saldata.hxx"
+#include "unx/saldisp.hxx"
+#include "unx/saldata.hxx"
 
 #include <unistd.h>
 #include <stdio.h>
diff --git a/vcl/unx/source/dtrans/X11_selection.hxx b/vcl/unx/generic/dtrans/X11_selection.hxx
index ad02ca36c2c1..ad02ca36c2c1 100644
--- a/vcl/unx/source/dtrans/X11_selection.hxx
+++ b/vcl/unx/generic/dtrans/X11_selection.hxx
diff --git a/vcl/unx/source/dtrans/X11_service.cxx b/vcl/unx/generic/dtrans/X11_service.cxx
index 7397f25e2c76..bdfdd4bb7a91 100644
--- a/vcl/unx/source/dtrans/X11_service.cxx
+++ b/vcl/unx/generic/dtrans/X11_service.cxx
@@ -29,7 +29,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-#include "salinst.h"
+#include "unx/salinst.h"
 
 #include <X11_clipboard.hxx>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
diff --git a/vcl/unx/source/dtrans/X11_transferable.cxx b/vcl/unx/generic/dtrans/X11_transferable.cxx
index fa4629f1c0f2..fa4629f1c0f2 100644
--- a/vcl/unx/source/dtrans/X11_transferable.cxx
+++ b/vcl/unx/generic/dtrans/X11_transferable.cxx
diff --git a/vcl/unx/source/dtrans/X11_transferable.hxx b/vcl/unx/generic/dtrans/X11_transferable.hxx
index 9eb4efba8dfc..9eb4efba8dfc 100644
--- a/vcl/unx/source/dtrans/X11_transferable.hxx
+++ b/vcl/unx/generic/dtrans/X11_transferable.hxx
diff --git a/vcl/unx/source/dtrans/bmp.cxx b/vcl/unx/generic/dtrans/bmp.cxx
index 57ad8ecf8a4d..57ad8ecf8a4d 100644
--- a/vcl/unx/source/dtrans/bmp.cxx
+++ b/vcl/unx/generic/dtrans/bmp.cxx
diff --git a/vcl/unx/source/dtrans/bmp.hxx b/vcl/unx/generic/dtrans/bmp.hxx
index 6d2e76bae0bb..6d2e76bae0bb 100644
--- a/vcl/unx/source/dtrans/bmp.hxx
+++ b/vcl/unx/generic/dtrans/bmp.hxx
diff --git a/vcl/unx/source/dtrans/config.cxx b/vcl/unx/generic/dtrans/config.cxx
index 5f711da47434..5f711da47434 100644
--- a/vcl/unx/source/dtrans/config.cxx
+++ b/vcl/unx/generic/dtrans/config.cxx
diff --git a/vcl/unx/source/inc/copydata_curs.h b/vcl/unx/generic/dtrans/copydata_curs.h
index a882a541a6d7..a882a541a6d7 100644
--- a/vcl/unx/source/inc/copydata_curs.h
+++ b/vcl/unx/generic/dtrans/copydata_curs.h
diff --git a/vcl/unx/source/inc/copydata_mask.h b/vcl/unx/generic/dtrans/copydata_mask.h
index 9cd73b08d106..9cd73b08d106 100644
--- a/vcl/unx/source/inc/copydata_mask.h
+++ b/vcl/unx/generic/dtrans/copydata_mask.h
diff --git a/vcl/unx/source/inc/linkdata_curs.h b/vcl/unx/generic/dtrans/linkdata_curs.h
index 054ef55ef2bb..054ef55ef2bb 100644
--- a/vcl/unx/source/inc/linkdata_curs.h
+++ b/vcl/unx/generic/dtrans/linkdata_curs.h
diff --git a/vcl/unx/source/inc/linkdata_mask.h b/vcl/unx/generic/dtrans/linkdata_mask.h
index 429c603066dc..429c603066dc 100644
--- a/vcl/unx/source/inc/linkdata_mask.h
+++ b/vcl/unx/generic/dtrans/linkdata_mask.h
diff --git a/vcl/unx/source/inc/movedata_curs.h b/vcl/unx/generic/dtrans/movedata_curs.h
index 642bbd176e4b..642bbd176e4b 100644
--- a/vcl/unx/source/inc/movedata_curs.h
+++ b/vcl/unx/generic/dtrans/movedata_curs.h
diff --git a/vcl/unx/source/inc/movedata_mask.h b/vcl/unx/generic/dtrans/movedata_mask.h
index f06c80f1728c..f06c80f1728c 100644
--- a/vcl/unx/source/inc/movedata_mask.h
+++ b/vcl/unx/generic/dtrans/movedata_mask.h
diff --git a/vcl/unx/source/inc/nodrop_curs.h b/vcl/unx/generic/dtrans/nodrop_curs.h
index 5c501d3876c4..5c501d3876c4 100644
--- a/vcl/unx/source/inc/nodrop_curs.h
+++ b/vcl/unx/generic/dtrans/nodrop_curs.h
diff --git a/vcl/unx/source/inc/nodrop_mask.h b/vcl/unx/generic/dtrans/nodrop_mask.h
index bd315dc28df1..bd315dc28df1 100644
--- a/vcl/unx/source/inc/nodrop_mask.h
+++ b/vcl/unx/generic/dtrans/nodrop_mask.h
diff --git a/vcl/unx/generic/fontmanager/Makefile b/vcl/unx/generic/fontmanager/Makefile
new file mode 100644
index 000000000000..7fb7b0325aea
--- /dev/null
+++ b/vcl/unx/generic/fontmanager/Makefile
@@ -0,0 +1,32 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#        Bjoern Michaelsen <bjoern.michaelsen@canonical.com> (Canonical Ltd.)
+# Portions created by the Initial Developer are Copyright (C) 2011 the
+# Initial Developer. All Rights Reserved.
+#
+# Contributor(s): Jan Holesovsky <kendy@suse.cz>
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+all : afm_hash.hpp
+
+afm_hash.hpp : $(realpath $(dir $(firstword $(MAKEFILE_LIST))))/afm_keyword_list
+	$(GPERF) -C -t -l -L C++ -m 20 -Z AfmKeywordHash -k '1,4,6,$$' $< | sed -e "s/(char\*)0/(char\*)0, NOPE/g" | grep -v "^#line" > $@
+
+.PHONY : all
+# vim: set noet sw=4:
diff --git a/vcl/unx/source/fontmanager/adobeenc.tab b/vcl/unx/generic/fontmanager/adobeenc.tab
index 492e92f3fcf2..492e92f3fcf2 100644
--- a/vcl/unx/source/fontmanager/adobeenc.tab
+++ b/vcl/unx/generic/fontmanager/adobeenc.tab
diff --git a/vcl/unx/source/fontmanager/afm_keyword_list b/vcl/unx/generic/fontmanager/afm_keyword_list
index c9bb13467e3e..c9bb13467e3e 100755
--- a/vcl/unx/source/fontmanager/afm_keyword_list
+++ b/vcl/unx/generic/fontmanager/afm_keyword_list
diff --git a/vcl/unx/source/fontmanager/fontcache.cxx b/vcl/unx/generic/fontmanager/fontcache.cxx
index f1c07afed1c9..e7a4008f07f0 100644
--- a/vcl/unx/source/fontmanager/fontcache.cxx
+++ b/vcl/unx/generic/fontmanager/fontcache.cxx
@@ -32,7 +32,7 @@
 #include <cstdlib>
 #include <cstring>
 
-#include "vcl/fontcache.hxx"
+#include "fontcache.hxx"
 
 #include "osl/thread.h"
 
diff --git a/vcl/unx/source/fontmanager/fontconfig.cxx b/vcl/unx/generic/fontmanager/fontconfig.cxx
index b22453caebfe..c1d506d91d83 100644
--- a/vcl/unx/source/fontmanager/fontconfig.cxx
+++ b/vcl/unx/generic/fontmanager/fontconfig.cxx
@@ -29,9 +29,9 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
+#include "fontcache.hxx"
+#include "impfont.hxx"
 #include "vcl/fontmanager.hxx"
-#include "vcl/fontcache.hxx"
-#include "vcl/impfont.hxx"
 #include "vcl/vclenum.hxx"
 
 using namespace psp;
diff --git a/vcl/unx/source/fontmanager/fontmanager.cxx b/vcl/unx/generic/fontmanager/fontmanager.cxx
index 1aced1e9fb8c..1427daedb193 100644
--- a/vcl/unx/source/fontmanager/fontmanager.cxx
+++ b/vcl/unx/generic/fontmanager/fontmanager.cxx
@@ -37,15 +37,14 @@
 
 #include "unotools/atom.hxx"
 
+#include "fontcache.hxx"
+#include "fontsubset.hxx"
+#include "impfont.hxx"
+#include "svdata.hxx"
+#include "salinst.hxx"
 #include "vcl/fontmanager.hxx"
-#include "vcl/fontcache.hxx"
-#include "vcl/fontcache.hxx"
-#include "vcl/fontsubset.hxx"
-#include "vcl/impfont.hxx"
 #include "vcl/strhelper.hxx"
 #include "vcl/ppdparser.hxx"
-#include "vcl/svdata.hxx"
-#include "vcl/salinst.hxx"
 
 #include "tools/urlobj.hxx"
 #include "tools/stream.hxx"
diff --git a/vcl/unx/source/fontmanager/helper.cxx b/vcl/unx/generic/fontmanager/helper.cxx
index 4b0d327a9a03..4b0d327a9a03 100644
--- a/vcl/unx/source/fontmanager/helper.cxx
+++ b/vcl/unx/generic/fontmanager/helper.cxx
diff --git a/vcl/unx/source/fontmanager/parseAFM.cxx b/vcl/unx/generic/fontmanager/parseAFM.cxx
index 242537c8e699..82d94f2518e0 100644
--- a/vcl/unx/source/fontmanager/parseAFM.cxx
+++ b/vcl/unx/generic/fontmanager/parseAFM.cxx
@@ -333,7 +333,7 @@ static char *linetoken( FileInputStream* stream )
  *
  *  The algorithm is a standard Knuth binary search.
  */
-#include "afm_hash.cpp"
+#include "afm_hash.hpp"
 
 static inline enum parseKey recognize( register char* ident, int len)
 {
diff --git a/vcl/unx/source/fontmanager/parseAFM.hxx b/vcl/unx/generic/fontmanager/parseAFM.hxx
index 0c390bd8cf8d..0c390bd8cf8d 100644
--- a/vcl/unx/source/fontmanager/parseAFM.hxx
+++ b/vcl/unx/generic/fontmanager/parseAFM.hxx
diff --git a/vcl/unx/source/gdi/cdeint.cxx b/vcl/unx/generic/gdi/cdeint.cxx
index a10568054477..fc516099630f 100644
--- a/vcl/unx/source/gdi/cdeint.cxx
+++ b/vcl/unx/generic/gdi/cdeint.cxx
@@ -28,17 +28,20 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
+
 #include <stdlib.h>
 #include <ctype.h>
 #include <unistd.h>
-#include <salunx.h>
-#include <saldisp.hxx>
-#include <cdeint.hxx>
-#include <vcl/settings.hxx>
 
 #include <tools/stream.hxx>
 #include <tools/debug.hxx>
 
+#include <vcl/settings.hxx>
+
+#include <unx/salunx.h>
+#include <unx/saldisp.hxx>
+#include <unx/cdeint.hxx>
+
 CDEIntegrator::CDEIntegrator()
 {
     meType = DtCDE;
diff --git a/vcl/unx/source/gdi/dtint.cxx b/vcl/unx/generic/gdi/dtint.cxx
index 704e4b977450..df1826df90f5 100644
--- a/vcl/unx/source/gdi/dtint.cxx
+++ b/vcl/unx/generic/gdi/dtint.cxx
@@ -35,23 +35,23 @@
 #include <fcntl.h>
 #include <dlfcn.h>
 
-#include <salunx.h>
-#include <X11/Xatom.h>
+#include "osl/file.h"
+#include "osl/process.h"
+#include "osl/security.h"
+
+#include "vcl/svapp.hxx"
 
+#include "unx/salunx.h"
+#include <X11/Xatom.h>
 #ifdef USE_CDE
-#include <cdeint.hxx>
+#include "unx/cdeint.hxx"
 #endif
-#include <dtint.hxx>
-#include <saldisp.hxx>
-#include <saldata.hxx>
-#include <wmadaptor.hxx>
-
-#include <vcl/svapp.hxx>
-#include <dtsetenum.hxx>
+#include "unx/dtint.hxx"
+#include "unx/saldisp.hxx"
+#include "unx/saldata.hxx"
+#include "unx/wmadaptor.hxx"
 
-#include <osl/file.h>
-#include <osl/process.h>
-#include <osl/security.h>
+#include "dtsetenum.hxx"
 
 #include <set>
 #include <stdio.h>
diff --git a/vcl/unx/source/gdi/dtsetenum.hxx b/vcl/unx/generic/gdi/dtsetenum.hxx
index 7973758d9f0d..7973758d9f0d 100644
--- a/vcl/unx/source/gdi/dtsetenum.hxx
+++ b/vcl/unx/generic/gdi/dtsetenum.hxx
diff --git a/vcl/unx/source/gdi/gcach_xpeer.cxx b/vcl/unx/generic/gdi/gcach_xpeer.cxx
index 5c6bf42885b5..a2b247fc231f 100644
--- a/vcl/unx/source/gdi/gcach_xpeer.cxx
+++ b/vcl/unx/generic/gdi/gcach_xpeer.cxx
@@ -29,15 +29,16 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-#include <rtl/ustring.hxx>
-#include <osl/module.h>
-#include <osl/thread.h>
-
-#include <gcach_xpeer.hxx>
-#include <xrender_peer.hxx>
-#include <saldisp.hxx>
-#include <saldata.hxx>
-#include <salgdi.h>
+#include "rtl/ustring.hxx"
+#include "osl/module.h"
+#include "osl/thread.h"
+
+#include "unx/saldisp.hxx"
+#include "unx/saldata.hxx"
+#include "unx/salgdi.h"
+
+#include "gcach_xpeer.hxx"
+#include "xrender_peer.hxx"
 
 // ===========================================================================
 
diff --git a/vcl/unx/source/gdi/gcach_xpeer.hxx b/vcl/unx/generic/gdi/gcach_xpeer.hxx
index 6b0f19c263d4..d2b4ec259e8e 100644
--- a/vcl/unx/source/gdi/gcach_xpeer.hxx
+++ b/vcl/unx/generic/gdi/gcach_xpeer.hxx
@@ -29,13 +29,11 @@
 #ifndef _SV_GCACH_XPEER_HXX
 #define _SV_GCACH_XPEER_HXX
 
-#include <vcl/glyphcache.hxx>
-
 #include <tools/prex.h>
 #include <X11/extensions/Xrender.h>
 #include <tools/postx.h>
-#include <vcl/dllapi.h>
 
+#include <glyphcache.hxx>
 
 class SalDisplay;
 struct MultiScreenGlyph;
diff --git a/vcl/unx/source/gdi/pspgraphics.cxx b/vcl/unx/generic/gdi/pspgraphics.cxx
index 4b4a4d9ebfa4..228c1ff7a606 100644
--- a/vcl/unx/source/gdi/pspgraphics.cxx
+++ b/vcl/unx/generic/gdi/pspgraphics.cxx
@@ -29,21 +29,6 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-#include "pspgraphics.h"
-#include "vcl/jobdata.hxx"
-#include "vcl/printergfx.hxx"
-#include "vcl/printerinfomanager.hxx"
-#include "vcl/bmpacc.hxx"
-#include "vcl/salbmp.hxx"
-#include "vcl/glyphcache.hxx"
-#include "vcl/impfont.hxx"
-#include "vcl/outfont.hxx"
-#include "vcl/fontsubset.hxx"
-#include "vcl/svapp.hxx"
-#include "vcl/salprn.hxx"
-#include "vcl/sysdata.hxx"
-#include "vcl/region.h"
-
 #include <stdlib.h>
 #include <unistd.h>
 #include <fcntl.h>
@@ -51,9 +36,26 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 
+#include "unx/pspgraphics.h"
+
+#include "vcl/jobdata.hxx"
+#include "vcl/printerinfomanager.hxx"
+#include "vcl/bmpacc.hxx"
+#include "vcl/svapp.hxx"
+#include "vcl/sysdata.hxx"
+
+#include "printergfx.hxx"
+#include "salbmp.hxx"
+#include "glyphcache.hxx"
+#include "impfont.hxx"
+#include "outfont.hxx"
+#include "fontsubset.hxx"
+#include "salprn.hxx"
+#include "region.h"
+
 #ifdef ENABLE_GRAPHITE
-#include <vcl/graphite_layout.hxx>
-#include <vcl/graphite_serverfont.hxx>
+#include <graphite_layout.hxx>
+#include <graphite_serverfont.hxx>
 #endif
 
 using namespace psp;
diff --git a/vcl/unx/source/gdi/salbmp.cxx b/vcl/unx/generic/gdi/salbmp.cxx
index 655ace3d21db..3349e6ef3c01 100644
--- a/vcl/unx/source/gdi/salbmp.cxx
+++ b/vcl/unx/generic/gdi/salbmp.cxx
@@ -35,21 +35,24 @@
 #ifdef FREEBSD
 #include <sys/types.h>
 #endif
-#include <tools/prex.h>
-#include "Xproto.h"
-#include <tools/postx.h>
-#include <salunx.h>
+
 #include <osl/endian.h>
 #include <rtl/memory.h>
-#include <vcl/salbtype.hxx>
-#include <saldata.hxx>
-#include <saldisp.hxx>
-#include <salgdi.h>
-#include <salbmp.h>
-#include <salinst.h>
+
 #include <vcl/bitmap.hxx>
+#include <vcl/salbtype.hxx>
 #include <com/sun/star/beans/XFastPropertySet.hpp>
 
+#include <tools/prex.h>
+#include "unx/Xproto.h"
+#include <tools/postx.h>
+#include <unx/salunx.h>
+#include <unx/saldata.hxx>
+#include <unx/saldisp.hxx>
+#include <unx/salgdi.h>
+#include <unx/salbmp.h>
+#include <unx/salinst.h>
+
 // -----------
 // - Defines -
 // -----------
diff --git a/vcl/unx/source/gdi/salcvt.cxx b/vcl/unx/generic/gdi/salcvt.cxx
index b67b5828bf13..b67b5828bf13 100644
--- a/vcl/unx/source/gdi/salcvt.cxx
+++ b/vcl/unx/generic/gdi/salcvt.cxx
diff --git a/vcl/unx/source/gdi/salcvt.hxx b/vcl/unx/generic/gdi/salcvt.hxx
index 0c4b1bd3f953..896ae4f30b36 100644
--- a/vcl/unx/source/gdi/salcvt.hxx
+++ b/vcl/unx/generic/gdi/salcvt.hxx
@@ -28,10 +28,11 @@
 #ifndef SAL_CONVERTER_CACHE_HXX_
 #define SAL_CONVERTER_CACHE_HXX_
 
-#include <salunx.h>
 #include <rtl/tencinfo.h>
 #include <rtl/textcvt.h>
 
+#include <unx/salunx.h>
+
 #include <map>
 
 extern "C" const char*
diff --git a/vcl/unx/source/gdi/salgdi.cxx b/vcl/unx/generic/gdi/salgdi.cxx
index 044c5b950d54..b1b8d337430d 100644
--- a/vcl/unx/source/gdi/salgdi.cxx
+++ b/vcl/unx/generic/gdi/salgdi.cxx
@@ -29,20 +29,6 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-#include "Xproto.h"
-
-#include "salunx.h"
-#include "saldata.hxx"
-#include "saldisp.hxx"
-#include "salgdi.h"
-#include "salframe.h"
-#include "salvd.h"
-#include "xrender_peer.hxx"
-
-#include "vcl/printergfx.hxx"
-#include "vcl/jobdata.hxx"
-#include "vcl/region.h"
-
 #include "tools/debug.hxx"
 
 #include "basegfx/polygon/b2dpolygon.hxx"
@@ -56,6 +42,20 @@
 #include "basegfx/polygon/b2dpolypolygoncutter.hxx"
 #include "basegfx/polygon/b2dtrapezoid.hxx"
 
+#include "vcl/jobdata.hxx"
+
+#include "unx/Xproto.h"
+#include "unx/salunx.h"
+#include "unx/saldata.hxx"
+#include "unx/saldisp.hxx"
+#include "unx/salgdi.h"
+#include "unx/salframe.h"
+#include "unx/salvd.h"
+
+#include "printergfx.hxx"
+#include "xrender_peer.hxx"
+#include "region.h"
+
 #include <vector>
 #include <queue>
 #include <set>
diff --git a/vcl/unx/source/gdi/salgdi2.cxx b/vcl/unx/generic/gdi/salgdi2.cxx
index a2736cf5c5f9..1382fff3d1c1 100644
--- a/vcl/unx/source/gdi/salgdi2.cxx
+++ b/vcl/unx/generic/gdi/salgdi2.cxx
@@ -32,19 +32,21 @@
 #include <stdio.h>
 #include <poll.h>
 
-#include "salunx.h"
-#include "saldata.hxx"
-#include "saldisp.hxx"
-#include "salbmp.h"
-#include "salgdi.h"
-#include "salframe.h"
-#include "salvd.h"
+#include "vcl/salbtype.hxx"
+
+#include "unx/salunx.h"
+#include "unx/saldata.hxx"
+#include "unx/saldisp.hxx"
+#include "unx/salbmp.h"
+#include "unx/salgdi.h"
+#include "unx/salframe.h"
+#include "unx/salvd.h"
 #include "xrender_peer.hxx"
 
-#include "vcl/salbtype.hxx"
-#include "vcl/printergfx.hxx"
+#include "printergfx.hxx"
+
 #include "vcl/bmpacc.hxx"
-#include "vcl/outdata.hxx"
+#include <outdata.hxx>
 
 #undef SALGDI2_TESTTRANS
 
diff --git a/vcl/unx/source/gdi/salgdi3.cxx b/vcl/unx/generic/gdi/salgdi3.cxx
index 894fa28f8b56..8f287521c18b 100644
--- a/vcl/unx/source/gdi/salgdi3.cxx
+++ b/vcl/unx/generic/gdi/salgdi3.cxx
@@ -39,26 +39,6 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 
-#include "gcach_xpeer.hxx"
-#include "xrender_peer.hxx"
-#include "salunx.h"
-#include "saldata.hxx"
-#include "saldisp.hxx"
-#include "salgdi.h"
-#include "pspgraphics.h"
-#include "salvd.h"
-#include <vcl/sysdata.hxx>
-#include "salcvt.hxx"
-
-#include "vcl/printergfx.hxx"
-#include "vcl/fontmanager.hxx"
-#include "vcl/jobdata.hxx"
-#include "vcl/printerinfomanager.hxx"
-#include "vcl/svapp.hxx"
-#include "vcl/impfont.hxx"
-#include "vcl/salframe.hxx"
-#include "vcl/outdev.h"
-
 #include "sal/alloca.h"
 #include "sal/types.h"
 
@@ -77,9 +57,32 @@
 
 #include <boost/unordered_set.hpp>
 
+#include <vcl/sysdata.hxx>
+#include "printergfx.hxx"
+#include "vcl/fontmanager.hxx"
+#include "vcl/jobdata.hxx"
+#include "vcl/printerinfomanager.hxx"
+#include "vcl/svapp.hxx"
+
+#include "unx/salunx.h"
+#include "unx/saldata.hxx"
+#include "unx/saldisp.hxx"
+#include "unx/salgdi.h"
+#include "unx/pspgraphics.h"
+#include "unx/salvd.h"
+
+#include "salcvt.hxx"
+#include "gcach_xpeer.hxx"
+#include "xrender_peer.hxx"
+#include "impfont.hxx"
+#include "salframe.hxx"
+#include "outdev.h"
+
+
+
 #ifdef ENABLE_GRAPHITE
-#include <vcl/graphite_layout.hxx>
-#include <vcl/graphite_serverfont.hxx>
+#include <graphite_layout.hxx>
+#include <graphite_serverfont.hxx>
 #endif
 
 struct cairo_surface_t;
diff --git a/vcl/unx/source/gdi/salprnpsp.cxx b/vcl/unx/generic/gdi/salprnpsp.cxx
index 9951367d2e70..009621a9e22e 100644
--- a/vcl/unx/source/gdi/salprnpsp.cxx
+++ b/vcl/unx/generic/gdi/salprnpsp.cxx
@@ -41,28 +41,30 @@
   printer job functions.
  */
 
-#include <salunx.h>
 #include <unistd.h>
 #include <sys/wait.h>
 #include <sys/stat.h>
 
-#include "saldisp.hxx"
-#include "salinst.h"
-#include "salprn.h"
-#include "salframe.h"
-#include "pspgraphics.h"
-#include "saldata.hxx"
+#include "rtl/ustring.hxx"
+
+#include "osl/module.h"
+
 #include "vcl/svapp.hxx"
-#include "vcl/jobset.h"
-#include "vcl/print.h"
 #include "vcl/print.hxx"
 #include "vcl/pdfwriter.hxx"
-#include "vcl/salptype.hxx"
 #include "vcl/printerinfomanager.hxx"
 
-#include "rtl/ustring.hxx"
+#include <unx/salunx.h>
+#include "unx/saldisp.hxx"
+#include "unx/salinst.h"
+#include "unx/salprn.h"
+#include "unx/salframe.h"
+#include "unx/pspgraphics.h"
+#include "unx/saldata.hxx"
 
-#include "osl/module.h"
+#include "jobset.h"
+#include "print.h"
+#include "salptype.hxx"
 
 #include <com/sun/star/beans/PropertyValue.hpp>
 
@@ -77,8 +79,6 @@ using ::rtl::OUStringToOString;
  *  static helpers
  */
 
-#include "rtsname.hxx"
-
 static oslModule driverLib                  = NULL;
 extern "C"
 {
diff --git a/vcl/unx/source/gdi/salvd.cxx b/vcl/unx/generic/gdi/salvd.cxx
index c6797cc6418c..0bb34519bd8f 100644
--- a/vcl/unx/source/gdi/salvd.cxx
+++ b/vcl/unx/generic/gdi/salvd.cxx
@@ -29,17 +29,19 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
+#include <vcl/sysdata.hxx>
+
 #include <tools/prex.h>
 #include <X11/extensions/Xrender.h>
 #include <tools/postx.h>
 
-#include <salunx.h>
-#include <saldata.hxx>
-#include <saldisp.hxx>
-#include <vcl/salinst.hxx>
-#include <salgdi.h>
-#include <salvd.h>
-#include <vcl/sysdata.hxx>
+#include <unx/salunx.h>
+#include <unx/saldata.hxx>
+#include <unx/saldisp.hxx>
+#include <unx/salgdi.h>
+#include <unx/salvd.h>
+
+#include <salinst.hxx>
 
 // -=-= SalInstance =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
diff --git a/vcl/unx/source/gdi/xrender_peer.cxx b/vcl/unx/generic/gdi/xrender_peer.cxx
index 6ad312bef70b..eda3254958f0 100644
--- a/vcl/unx/source/gdi/xrender_peer.cxx
+++ b/vcl/unx/generic/gdi/xrender_peer.cxx
@@ -30,16 +30,19 @@
 #include "precompiled_vcl.hxx"
 
 #include <stdio.h>
+
 #include <rtl/ustring.hxx>
 #include <osl/module.h>
 
+#include <unx/salunx.h>
+#include <unx/saldata.hxx>
+#include <unx/saldisp.hxx>
+
 using ::rtl::OUString;
 using ::rtl::OUStringToOString;
 #include <xrender_peer.hxx>
 
-#include <salunx.h>
-#include <saldata.hxx>
-#include <saldisp.hxx>
+using namespace rtl;
 
 // ---------------------------------------------------------------------------
 
diff --git a/vcl/unx/source/gdi/xrender_peer.hxx b/vcl/unx/generic/gdi/xrender_peer.hxx
index f9417bb2be95..f9417bb2be95 100644
--- a/vcl/unx/source/gdi/xrender_peer.hxx
+++ b/vcl/unx/generic/gdi/xrender_peer.hxx
diff --git a/vcl/unx/source/plugadapt/salplug.cxx b/vcl/unx/generic/plugadapt/salplug.cxx
index c951ac470a50..2f3b25e0ac6a 100644
--- a/vcl/unx/source/plugadapt/salplug.cxx
+++ b/vcl/unx/generic/plugadapt/salplug.cxx
@@ -34,9 +34,8 @@
 
 #include "rtl/ustrbuf.hxx"
 
-
-#include "vcl/salinst.hxx"
-#include "saldata.hxx"
+#include "salinst.hxx"
+#include "unx/saldata.hxx"
 #include "vcl/printerinfomanager.hxx"
 
 #include <cstdio>
@@ -69,7 +68,6 @@ static SalInstance* tryInstance( const OUString& rModuleBase )
     aModName.appendAscii( SAL_DLLPREFIX"vclplug_" );
     aModName.append( rModuleBase );
     aModName.appendAscii( SAL_DLLPOSTFIX );
-    aModName.appendAscii( SAL_DLLEXTENSION );
     OUString aModule = aModName.makeStringAndClear();
 
     oslModule aMod = osl_loadModuleRelative(
diff --git a/vcl/unx/source/printer/cupsmgr.cxx b/vcl/unx/generic/printer/cupsmgr.cxx
index 655181294190..a850ec14bb28 100644
--- a/vcl/unx/source/printer/cupsmgr.cxx
+++ b/vcl/unx/generic/printer/cupsmgr.cxx
@@ -1141,8 +1141,6 @@ bool CUPSManager::addOrRemovePossible() const
     return (m_nDests && m_pDests && ! isCUPSDisabled())? false : PrinterInfoManager::addOrRemovePossible();
 }
 
-#include <rtsname.hxx>
-
 const char* CUPSManager::authenticateUser( const char* /*pIn*/ )
 {
     const char* pRet = NULL;
diff --git a/vcl/unx/source/printer/jobdata.cxx b/vcl/unx/generic/printer/jobdata.cxx
index 03d676470ecb..03d676470ecb 100644
--- a/vcl/unx/source/printer/jobdata.cxx
+++ b/vcl/unx/generic/printer/jobdata.cxx
diff --git a/vcl/unx/source/printer/ppdparser.cxx b/vcl/unx/generic/printer/ppdparser.cxx
index 6133df14c88b..6133df14c88b 100644
--- a/vcl/unx/source/printer/ppdparser.cxx
+++ b/vcl/unx/generic/printer/ppdparser.cxx
diff --git a/vcl/unx/source/printer/printerinfomanager.cxx b/vcl/unx/generic/printer/printerinfomanager.cxx
index c6c5a4b28f0a..eda102cb54a7 100644
--- a/vcl/unx/source/printer/printerinfomanager.cxx
+++ b/vcl/unx/generic/printer/printerinfomanager.cxx
@@ -36,7 +36,8 @@
 #include "cupsmgr.hxx"
 #include "vcl/fontmanager.hxx"
 #include "vcl/strhelper.hxx"
-#include "saldata.hxx"
+
+#include "unx/saldata.hxx"
 
 #include "tools/urlobj.hxx"
 #include "tools/stream.hxx"
diff --git a/vcl/unx/source/printergfx/bitmap_gfx.cxx b/vcl/unx/generic/printergfx/bitmap_gfx.cxx
index c33e11122c51..0c139678f8ab 100644
--- a/vcl/unx/source/printergfx/bitmap_gfx.cxx
+++ b/vcl/unx/generic/printergfx/bitmap_gfx.cxx
@@ -31,7 +31,7 @@
 
 #include "psputil.hxx"
 
-#include "vcl/printergfx.hxx"
+#include "printergfx.hxx"
 #include "vcl/strhelper.hxx"
 
 namespace psp {
diff --git a/vcl/unx/source/printergfx/common_gfx.cxx b/vcl/unx/generic/printergfx/common_gfx.cxx
index fc366aab838f..7cae4586bf6e 100644
--- a/vcl/unx/source/printergfx/common_gfx.cxx
+++ b/vcl/unx/generic/printergfx/common_gfx.cxx
@@ -32,8 +32,8 @@
 #include "psputil.hxx"
 #include "glyphset.hxx"
 
-#include "vcl/printergfx.hxx"
-#include "vcl/printerjob.hxx"
+#include "printergfx.hxx"
+#include "printerjob.hxx"
 #include "vcl/fontmanager.hxx"
 #include "vcl/strhelper.hxx"
 #include "vcl/printerinfomanager.hxx"
diff --git a/vcl/unx/source/printergfx/glyphset.cxx b/vcl/unx/generic/printergfx/glyphset.cxx
index 189d8419f4ec..967c9f2a175f 100644
--- a/vcl/unx/source/printergfx/glyphset.cxx
+++ b/vcl/unx/generic/printergfx/glyphset.cxx
@@ -34,9 +34,9 @@
 
 #include "sft.hxx"
 
-#include "vcl/printergfx.hxx"
+#include "printergfx.hxx"
+#include "fontsubset.hxx"
 #include "vcl/fontmanager.hxx"
-#include "vcl/fontsubset.hxx"
 
 #include "osl/thread.h"
 
diff --git a/vcl/unx/source/printergfx/glyphset.hxx b/vcl/unx/generic/printergfx/glyphset.hxx
index c8b009c91155..c8b009c91155 100644
--- a/vcl/unx/source/printergfx/glyphset.hxx
+++ b/vcl/unx/generic/printergfx/glyphset.hxx
diff --git a/vcl/unx/source/printergfx/printerjob.cxx b/vcl/unx/generic/printergfx/printerjob.cxx
index 7df531975c57..827b5c7cf269 100644
--- a/vcl/unx/source/printergfx/printerjob.cxx
+++ b/vcl/unx/generic/printergfx/printerjob.cxx
@@ -39,11 +39,11 @@
 #include "psputil.hxx"
 #include "glyphset.hxx"
 
-#include "vcl/printerjob.hxx"
+#include "printerjob.hxx"
+#include "printergfx.hxx"
 #include "vcl/ppdparser.hxx"
 #include "vcl/strhelper.hxx"
 #include "vcl/printerinfomanager.hxx"
-#include "vcl/printergfx.hxx"
 
 #include "rtl/ustring.hxx"
 #include "rtl/strbuf.hxx"
diff --git a/vcl/unx/source/printergfx/psheader.ps b/vcl/unx/generic/printergfx/psheader.ps
index 6a0e350d9ddc..6a0e350d9ddc 100644
--- a/vcl/unx/source/printergfx/psheader.ps
+++ b/vcl/unx/generic/printergfx/psheader.ps
diff --git a/vcl/unx/source/printergfx/psputil.cxx b/vcl/unx/generic/printergfx/psputil.cxx
index 9a5de44960e6..9a5de44960e6 100644
--- a/vcl/unx/source/printergfx/psputil.cxx
+++ b/vcl/unx/generic/printergfx/psputil.cxx
diff --git a/vcl/unx/source/printergfx/psputil.hxx b/vcl/unx/generic/printergfx/psputil.hxx
index 878fd9c7791a..878fd9c7791a 100644
--- a/vcl/unx/source/printergfx/psputil.hxx
+++ b/vcl/unx/generic/printergfx/psputil.hxx
diff --git a/vcl/unx/source/printergfx/text_gfx.cxx b/vcl/unx/generic/printergfx/text_gfx.cxx
index 0b170565de75..263e0b4c7995 100644
--- a/vcl/unx/source/printergfx/text_gfx.cxx
+++ b/vcl/unx/generic/printergfx/text_gfx.cxx
@@ -34,7 +34,7 @@
 #include "psputil.hxx"
 #include "glyphset.hxx"
 
-#include "vcl/printergfx.hxx"
+#include "printergfx.hxx"
 #include "vcl/fontmanager.hxx"
 #include "vcl/helper.hxx"
 
diff --git a/vcl/unx/source/window/FWS.cxx b/vcl/unx/generic/window/FWS.cxx
index a90f76af90c2..a90f76af90c2 100644
--- a/vcl/unx/source/window/FWS.cxx
+++ b/vcl/unx/generic/window/FWS.cxx
diff --git a/vcl/unx/source/window/FWS.hxx b/vcl/unx/generic/window/FWS.hxx
index 36b4b16a9214..36b4b16a9214 100644
--- a/vcl/unx/source/window/FWS.hxx
+++ b/vcl/unx/generic/window/FWS.hxx
diff --git a/vcl/unx/source/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx
index 9a5d149f14fd..1fdfc02c3916 100644
--- a/vcl/unx/source/window/salframe.cxx
+++ b/vcl/unx/generic/window/salframe.cxx
@@ -34,6 +34,16 @@
 #include <stdlib.h>
 #include <unistd.h>
 
+#include "tools/debug.hxx"
+
+#include "sal/alloca.h"
+
+#include "vcl/floatwin.hxx"
+#include "vcl/svapp.hxx"
+#include "vcl/keycodes.hxx"
+#include "vcl/printerinfomanager.hxx"
+#include "vcl/settings.hxx"
+
 #include <tools/prex.h>
 #include <X11/Xatom.h>
 #include <X11/keysym.h>
@@ -44,32 +54,24 @@
 #endif
 #include <tools/postx.h>
 
-#include "salunx.h"
-#include "saldata.hxx"
-#include "saldisp.hxx"
-#include "salgdi.h"
-#include "salframe.h"
-#include "soicon.hxx"
-#include "dtint.hxx"
-#include "sm.hxx"
-#include "wmadaptor.hxx"
-#include "salprn.h"
-#include "salbmp.h"
-#include "i18n_ic.hxx"
-#include "i18n_keysym.hxx"
-#include "i18n_status.hxx"
-
-#include "vcl/salinst.hxx"
-#include "vcl/floatwin.hxx"
-#include "vcl/sallayout.hxx"
-#include "vcl/svapp.hxx"
-#include "vcl/keycodes.hxx"
-#include "vcl/printerinfomanager.hxx"
-#include "vcl/settings.hxx"
-
-#include "tools/debug.hxx"
+#include "unx/salunx.h"
+#include "unx/saldata.hxx"
+#include "unx/saldisp.hxx"
+#include "unx/salgdi.h"
+#include "unx/salframe.h"
+#include "unx/soicon.hxx"
+#include "unx/dtint.hxx"
+#include "unx/sm.hxx"
+#include "unx/wmadaptor.hxx"
+#include "unx/salprn.h"
+#include "unx/salbmp.h"
+#include "unx/i18n_ic.hxx"
+#include "unx/i18n_keysym.hxx"
+#include "unx/i18n_status.hxx"
+
+#include "salinst.hxx"
+#include "sallayout.hxx"
 
-#include "sal/alloca.h"
 #include <sal/macros.h>
 #include <com/sun/star/uno/Exception.hpp>
 
diff --git a/vcl/unx/source/window/salobj.cxx b/vcl/unx/generic/window/salobj.cxx
index 4ead532a082d..0164d27ba185 100644
--- a/vcl/unx/source/window/salobj.cxx
+++ b/vcl/unx/generic/window/salobj.cxx
@@ -29,25 +29,28 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
+#if OSL_DEBUG_LEVEL > 1
+#include <stdio.h>
+#endif
+#include <tools/debug.hxx>
+
+#include <vcl/keycodes.hxx>
+
 #include <tools/prex.h>
 #include <X11/Xlib.h>
 #include <X11/extensions/shape.h>
 #include <tools/postx.h>
 
-#include <salunx.h>
-#include <salstd.hxx>
-#include <saldata.hxx>
-#include <salinst.h>
-#include <saldisp.hxx>
-#include <salframe.h>
-#include <salobj.h>
-#include <vcl/salwtype.hxx>
-#include <vcl/keycodes.hxx>
+#include <unx/salunx.h>
+#include <unx/salstd.hxx>
+#include <unx/saldata.hxx>
+#include <unx/salinst.h>
+#include <unx/saldisp.hxx>
+#include <unx/salframe.h>
+#include <unx/salobj.h>
+
+#include <salwtype.hxx>
 
-#include <tools/debug.hxx>
-#if OSL_DEBUG_LEVEL > 1
-#include <stdio.h>
-#endif
 
 // =======================================================================
 // SalInstance member to create and destroy a SalObject
diff --git a/vcl/unx/gtk/a11y/atkbridge.cxx b/vcl/unx/gtk/a11y/atkbridge.cxx
index bdd6d526e527..da667fe75326 100644
--- a/vcl/unx/gtk/a11y/atkbridge.cxx
+++ b/vcl/unx/gtk/a11y/atkbridge.cxx
@@ -29,8 +29,8 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-#include <plugins/gtk/atkbridge.hxx>
-#include <plugins/gtk/gtkframe.hxx>
+#include <unx/gtk/atkbridge.hxx>
+#include <unx/gtk/gtkframe.hxx>
 
 #include "atkfactory.hxx"
 #include "atkutil.hxx"
diff --git a/vcl/unx/gtk/a11y/atkfactory.cxx b/vcl/unx/gtk/a11y/atkfactory.cxx
index 87dcdc46d679..fef6c80767e5 100644
--- a/vcl/unx/gtk/a11y/atkfactory.cxx
+++ b/vcl/unx/gtk/a11y/atkfactory.cxx
@@ -29,7 +29,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-#include <plugins/gtk/gtkframe.hxx>
+#include <unx/gtk/gtkframe.hxx>
 #include <vcl/window.hxx>
 #include "atkwrapper.hxx"
 #include "atkfactory.hxx"
diff --git a/vcl/unx/gtk/a11y/atkwindow.cxx b/vcl/unx/gtk/a11y/atkwindow.cxx
index 1b84026dd281..2cedf59eaea2 100644
--- a/vcl/unx/gtk/a11y/atkwindow.cxx
+++ b/vcl/unx/gtk/a11y/atkwindow.cxx
@@ -29,7 +29,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-#include <plugins/gtk/gtkframe.hxx>
+#include <unx/gtk/gtkframe.hxx>
 #include <vcl/window.hxx>
 #include "vcl/popupmenuwindow.hxx"
 
diff --git a/vcl/unx/gtk/a11y/makefile.mk b/vcl/unx/gtk/a11y/makefile.mk
deleted file mode 100644
index 30c6d5e7cfb3..000000000000
--- a/vcl/unx/gtk/a11y/makefile.mk
+++ /dev/null
@@ -1,89 +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=gtka11y
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- Files --------------------------------------------------------
-
-.IF "$(GUIBASE)"!="unx"
-
-dummy:
-    @echo "Nothing to build for GUIBASE $(GUIBASE)"
-
-.ELSE		# "$(GUIBASE)"!="unx"
-
-.IF "$(ENABLE_GTK)" != ""
-
-PKGCONFIG_MODULES=gtk+-2.0
-.INCLUDE : pkg_config.mk
-
-CFLAGS+=-DVERSION=$(EMQ)"$(UPD)$(LAST_MINOR)$(EMQ)"
-
-ATKVERSION:=$(shell @$(PKG_CONFIG) --modversion atk | $(AWK) -v num=true -f $(SOLARENV)$/bin$/getcompver.awk)
-
-.IF "$(ATKVERSION)" >= "000100070000"
-CFLAGS+=-DHAS_ATKRECTANGLE
-.ENDIF
-
-SLOFILES=\
-    $(SLO)$/atkaction.obj \
-    $(SLO)$/atkbridge.obj \
-    $(SLO)$/atkcomponent.obj \
-    $(SLO)$/atkeditabletext.obj \
-    $(SLO)$/atkfactory.obj \
-    $(SLO)$/atkhypertext.obj \
-    $(SLO)$/atkimage.obj \
-    $(SLO)$/atklistener.obj \
-    $(SLO)$/atkregistry.obj \
-    $(SLO)$/atkselection.obj \
-    $(SLO)$/atktable.obj \
-    $(SLO)$/atktext.obj \
-    $(SLO)$/atktextattributes.obj \
-    $(SLO)$/atkutil.obj \
-    $(SLO)$/atkvalue.obj \
-    $(SLO)$/atkwindow.obj \
-    $(SLO)$/atkwrapper.obj
-
-.ELSE # "$(ENABLE_GTK)" != ""
-
-dummy:
-    @echo GTK disabled - nothing to build
-.ENDIF
-.ENDIF		# "$(GUIBASE)"!="unx"
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/vcl/unx/gtk/app/gtkdata.cxx b/vcl/unx/gtk/app/gtkdata.cxx
index 3aad9467e276..c2c0b54faf78 100644
--- a/vcl/unx/gtk/app/gtkdata.cxx
+++ b/vcl/unx/gtk/app/gtkdata.cxx
@@ -47,20 +47,20 @@
 #include <sys/time.h>
 #include <unistd.h>
 #endif
-#include <plugins/gtk/gtkdata.hxx>
-#include <plugins/gtk/gtkinst.hxx>
-#include <plugins/gtk/gtkframe.hxx>
-#include <salobj.h>
+#include <unx/gtk/gtkdata.hxx>
+#include <unx/gtk/gtkinst.hxx>
+#include <unx/gtk/gtkframe.hxx>
+#include <unx/salobj.h>
 #include <osl/thread.h>
 #include <osl/process.h>
 
 #include <osl/conditn.h>
 #include <tools/debug.hxx>
-#include "i18n_im.hxx"
-#include "i18n_xkb.hxx"
-#include <wmadaptor.hxx>
+#include "unx/i18n_im.hxx"
+#include "unx/i18n_xkb.hxx"
+#include <unx/wmadaptor.hxx>
 
-#include "../../unx/source/inc/salcursors.h"
+#include "unx/x11_cursors/salcursors.h"
 
 #include <vcl/svapp.hxx>
 
@@ -570,6 +570,7 @@ GtkXLib::~GtkXLib()
 #if OSL_DEBUG_LEVEL > 1
     fprintf( stderr, "GtkXLib::~GtkXLib()\n" );
 #endif
+    Yield( true, true );
     StopTimer();
      // sanity check: at this point nobody should be yielding, but wake them
      // up anyway before the condition they're waiting on gets destroyed.
diff --git a/vcl/unx/gtk/app/gtkinst.cxx b/vcl/unx/gtk/app/gtkinst.cxx
index abaf97c2a00f..95547f20d933 100644
--- a/vcl/unx/gtk/app/gtkinst.cxx
+++ b/vcl/unx/gtk/app/gtkinst.cxx
@@ -30,13 +30,12 @@
 #include "precompiled_vcl.hxx"
 
 #include <osl/module.h>
-#include <plugins/gtk/gtkdata.hxx>
-#include <plugins/gtk/gtkinst.hxx>
-#include <salframe.h>
-#include <salobj.h>
-#include <plugins/gtk/gtkframe.hxx>
-#include <plugins/gtk/gtkobject.hxx>
-#include <plugins/gtk/atkbridge.hxx>
+#include <unx/gtk/gtkdata.hxx>
+#include <unx/gtk/gtkinst.hxx>
+#include <unx/salobj.h>
+#include <unx/gtk/gtkframe.hxx>
+#include <unx/gtk/gtkobject.hxx>
+#include <unx/gtk/atkbridge.hxx>
 
 #include <rtl/strbuf.hxx>
 
@@ -132,7 +131,7 @@ extern "C"
         return true;
     }
 
-    VCL_DLLPUBLIC SalInstance* create_SalInstance( oslModule pModule )
+    VCLPLUG_GTK_PUBLIC SalInstance* create_SalInstance( oslModule pModule )
     {
         /* #i92121# workaround deadlocks in the X11 implementation
         */
diff --git a/vcl/unx/gtk/app/gtksys.cxx b/vcl/unx/gtk/app/gtksys.cxx
index db90edf39b99..2076d39cc229 100644
--- a/vcl/unx/gtk/app/gtksys.cxx
+++ b/vcl/unx/gtk/app/gtksys.cxx
@@ -35,10 +35,11 @@
 #undef _LINUX_SOURCE_COMPAT
 #endif
 
-#include <svunx.h>
-#include <vcl/svdata.hxx>
+#include <unx/svunx.h>
+#include <svdata.hxx>
+
 #include <vcl/window.hxx>
-#include <plugins/gtk/gtkinst.hxx>
+#include <unx/gtk/gtkinst.hxx>
 #include <cstdio>
 #include <gdk/gdk.h>
 #include <gtk/gtk.h>
diff --git a/vcl/unx/gtk/app/makefile.mk b/vcl/unx/gtk/app/makefile.mk
deleted file mode 100644
index 5c480e8ecca7..000000000000
--- a/vcl/unx/gtk/app/makefile.mk
+++ /dev/null
@@ -1,77 +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=gtkapp
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# workaround for makedepend hang
-MKDEPENDSOLVER=
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile2.pmk
-
-# --- Files --------------------------------------------------------
-
-.IF "$(GUIBASE)"!="unx"
-
-dummy:
-    @echo "Nothing to build for GUIBASE $(GUIBASE)"
-
-.ELSE		# "$(GUIBASE)"!="unx"
-
-.IF "$(ENABLE_GTK)" != ""
-
-PKGCONFIG_MODULES=gtk+-2.0
-.INCLUDE : pkg_config.mk
-
-SLOFILES=\
-            $(SLO)$/gtkdata.obj	\
-            $(SLO)$/gtkinst.obj \
-            $(SLO)$/gtksys.obj
-
-EXCEPTIONSFILES=\
-            $(SLO)$/gtkdata.obj \
-            $(SLO)$/gtkinst.obj \
-            $(SLO)$/gtksys.obj
-
-.ELSE # "$(ENABLE_GTK)" != ""
-
-dummy:
-    @echo GTK disabled - nothing to build
-.ENDIF
-.ENDIF		# "$(GUIBASE)"!="unx"
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/vcl/unx/gtk/gdi/makefile.mk b/vcl/unx/gtk/gdi/makefile.mk
deleted file mode 100644
index ec6b4e1d205e..000000000000
--- a/vcl/unx/gtk/gdi/makefile.mk
+++ /dev/null
@@ -1,67 +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=gtkgdi
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile2.pmk
-
-# --- Files --------------------------------------------------------
-
-.IF "$(GUIBASE)"!="unx"
-
-dummy:
-    @echo "Nothing to build for GUIBASE $(GUIBASE)"
-
-.ELSE		# "$(GUIBASE)"!="unx"
-
-.IF "$(ENABLE_GTK)" != ""
-
-PKGCONFIG_MODULES=gtk+-2.0
-.INCLUDE : pkg_config.mk
-
-SLOFILES=$(SLO)$/salnativewidgets-gtk.obj
-EXCEPTIONSFILES=$(SLO)$/salnativewidgets-gtk.obj
-
-.ELSE # "$(ENABLE_GTK)" != ""
-dummy:
-    @echo GTK disabled - nothing to build
-.ENDIF
-
-.ENDIF		# "$(GUIBASE)"!="unx"
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
index fe247e2f046c..4f3677b742b1 100644
--- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
@@ -29,12 +29,16 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-#include "plugins/gtk/gtkframe.hxx"
-#include "plugins/gtk/gtkdata.hxx"
-#include "plugins/gtk/gtkinst.hxx"
-#include "plugins/gtk/gtkgdi.hxx"
+#include "vcl/svapp.hxx"
+
+#include "unx/gtk/gtkframe.hxx"
+#include "unx/gtk/gtkdata.hxx"
+#include "unx/gtk/gtkinst.hxx"
+#include "unx/gtk/gtkgdi.hxx"
 
-#include "pspgraphics.h"
+#include "unx/pspgraphics.h"
+#include "unx/saldata.hxx"
+#include "unx/saldisp.hxx"
 
 #include <cstdio>
 #include <cmath>
@@ -42,11 +46,7 @@
 #include <algorithm>
 #include <boost/unordered_map.hpp>
 
-#include "saldata.hxx"
-#include "saldisp.hxx"
-#include "vcl/svapp.hxx"
 #include "vcl/vclenum.hxx"
-
 typedef struct _cairo_font_options cairo_font_options_t;
 
 // initialize statics
diff --git a/vcl/unx/gtk/window/gtkframe.cxx b/vcl/unx/gtk/window/gtkframe.cxx
index 2ae761aaa1a4..d49d0ae7921d 100644
--- a/vcl/unx/gtk/window/gtkframe.cxx
+++ b/vcl/unx/gtk/window/gtkframe.cxx
@@ -29,17 +29,16 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-#include <plugins/gtk/gtkframe.hxx>
-#include <plugins/gtk/gtkdata.hxx>
-#include <plugins/gtk/gtkinst.hxx>
-#include <plugins/gtk/gtkgdi.hxx>
+#include <unx/gtk/gtkframe.hxx>
+#include <unx/gtk/gtkdata.hxx>
+#include <unx/gtk/gtkinst.hxx>
+#include <unx/gtk/gtkgdi.hxx>
 #include <vcl/keycodes.hxx>
-#include <wmadaptor.hxx>
-#include <sm.hxx>
-#include <salbmp.h>
-#include <salprn.h>
+#include <unx/wmadaptor.hxx>
+#include <unx/sm.hxx>
+#include <unx/salbmp.h>
+#include <unx/salprn.h>
 #include <vcl/floatwin.hxx>
-#include <salprn.h>
 #include <vcl/svapp.hxx>
 #include <vcl/window.hxx>
 
@@ -50,8 +49,8 @@
 #include <dlfcn.h>
 #include <vcl/salbtype.hxx>
 #include <vcl/bitmapex.hxx>
-#include <vcl/impbmp.hxx>
-#include <vcl/svids.hrc>
+#include <impbmp.hxx>
+#include <svids.hrc>
 #include <sal/macros.h>
 
 #include <algorithm>
diff --git a/vcl/unx/gtk/window/gtkobject.cxx b/vcl/unx/gtk/window/gtkobject.cxx
index ac4d7af56674..04dcde7ff4e3 100644
--- a/vcl/unx/gtk/window/gtkobject.cxx
+++ b/vcl/unx/gtk/window/gtkobject.cxx
@@ -35,10 +35,10 @@
 #undef _LINUX_SOURCE_COMPAT
 #endif
 
-#include <plugins/gtk/gtkobject.hxx>
-#include <plugins/gtk/gtkframe.hxx>
-#include <plugins/gtk/gtkdata.hxx>
-#include <plugins/gtk/gtkinst.hxx>
+#include <unx/gtk/gtkobject.hxx>
+#include <unx/gtk/gtkframe.hxx>
+#include <unx/gtk/gtkdata.hxx>
+#include <unx/gtk/gtkinst.hxx>
 
 GtkSalObject::GtkSalObject( GtkSalFrame* pParent, sal_Bool bShow )
         : m_pSocket( NULL ),
diff --git a/vcl/unx/gtk/window/makefile.mk b/vcl/unx/gtk/window/makefile.mk
deleted file mode 100644
index ac23e9363eef..000000000000
--- a/vcl/unx/gtk/window/makefile.mk
+++ /dev/null
@@ -1,79 +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=gtkwin
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# workaround for makedepend hang
-MKDEPENDSOLVER=
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile2.pmk
-
-# --- Files --------------------------------------------------------
-
-.IF "$(GUIBASE)"!="unx"
-
-dummy:
-    @echo "Nothing to build for GUIBASE $(GUIBASE)"
-
-.ELSE		# "$(GUIBASE)"!="unx"
-
-.IF "$(ENABLE_GTK)" != ""
-
-PKGCONFIG_MODULES=gtk+-2.0
-.IF "$(ENABLE_DBUS)" != ""
-CDEFS+=-DENABLE_DBUS
-PKGCONFIG_MODULES+= dbus-glib-1
-.ENDIF
-.INCLUDE : pkg_config.mk
-
-.IF "$(COM)" == "C52"
-NOOPTFILES=$(SLO)$/gtkframe.obj
-.ENDIF
-
-SLOFILES=\
-            $(SLO)$/gtkframe.obj				\
-            $(SLO)$/gtkobject.obj
-EXCEPTIONSFILES=$(SLO)$/gtkframe.obj
-.ELSE # "$(ENABLE_GTK)" != ""
-
-dummy:
-    @echo GTK disabled - nothing to build
-.ENDIF
-.ENDIF		# "$(GUIBASE)"!="unx"
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/vcl/unx/headless/makefile.mk b/vcl/unx/headless/makefile.mk
deleted file mode 100644
index a32f02838080..000000000000
--- a/vcl/unx/headless/makefile.mk
+++ /dev/null
@@ -1,66 +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=..$/..
-
-
-ENABLE_EXCEPTIONS=true
-
-PRJNAME=vcl
-TARGET=svpplug
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-.IF "$(listening)"!="" || "$(LISTENING)"!=""
-CDEFS+= -DWITH_SVP_LISTENING
-.ENDIF
-
-# --- Files --------------------------------------------------------
-
-.IF "$(GUIBASE)" == "unx"
-
-SLOFILES=\
-        $(SLO)$/svpinst.obj\
-        $(SLO)$/svpdummies.obj\
-        $(SLO)$/svpframe.obj\
-        $(SLO)$/svpgdi.obj\
-        $(SLO)$/svptext.obj\
-        $(SLO)$/svpprn.obj\
-        $(SLO)$/svppspgraphics.obj\
-        $(SLO)$/svpvd.obj\
-        $(SLO)$/svpbmp.obj\
-        $(SLO)$/svpelement.obj
-
-.ENDIF
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-
diff --git a/vcl/unx/headless/svpbmp.hxx b/vcl/unx/headless/svpbmp.hxx
index 695d7226b0f0..b3adb3b9951f 100644
--- a/vcl/unx/headless/svpbmp.hxx
+++ b/vcl/unx/headless/svpbmp.hxx
@@ -29,7 +29,7 @@
 #ifndef SVP_SVBMP_HXX
 #define SVP_SVBMP_HXX
 
-#include <vcl/salbmp.hxx>
+#include <salbmp.hxx>
 #include "svpelement.hxx"
 
 class SvpSalBitmap : public SalBitmap, public SvpElement
diff --git a/vcl/unx/headless/svpdummies.hxx b/vcl/unx/headless/svpdummies.hxx
index 86a9382adb96..bc46e9b22f70 100644
--- a/vcl/unx/headless/svpdummies.hxx
+++ b/vcl/unx/headless/svpdummies.hxx
@@ -28,10 +28,11 @@
 
 #ifndef _SVP_SVPDUMMIES_HXX
 
-#include <vcl/salobj.hxx>
 #include <vcl/sysdata.hxx>
-#include <vcl/salimestatus.hxx>
-#include <vcl/salsys.hxx>
+
+#include <salobj.hxx>
+#include <salimestatus.hxx>
+#include <salsys.hxx>
 
 class SalGraphics;
 
diff --git a/vcl/unx/headless/svpframe.hxx b/vcl/unx/headless/svpframe.hxx
index be160626957a..e57381780f61 100644
--- a/vcl/unx/headless/svpframe.hxx
+++ b/vcl/unx/headless/svpframe.hxx
@@ -28,9 +28,9 @@
 
 #ifndef _SVP_SVPFRAME_HXX
 
-#include <vcl/salframe.hxx>
 #include <vcl/sysdata.hxx>
 
+#include <salframe.hxx>
 #include "svpelement.hxx"
 
 #include <list>
diff --git a/vcl/unx/headless/svpgdi.cxx b/vcl/unx/headless/svpgdi.cxx
index 8c9a4e42a65a..0a7041661d4e 100644
--- a/vcl/unx/headless/svpgdi.cxx
+++ b/vcl/unx/headless/svpgdi.cxx
@@ -30,7 +30,6 @@
 #include "svpbmp.hxx"
 
 #include <vcl/sysdata.hxx>
-#include <vcl/region.h>
 #include <basegfx/range/b2drange.hxx>
 #include <basegfx/range/b2irange.hxx>
 #include <basegfx/polygon/b2dpolypolygon.hxx>
@@ -48,6 +47,7 @@
 #endif
 
 #include <svppspgraphics.hxx>
+#include <region.h>
 
 using namespace basegfx;
 using namespace basebmp;
diff --git a/vcl/unx/headless/svpgdi.hxx b/vcl/unx/headless/svpgdi.hxx
index 0489606e9fce..4b6bcb58c9b0 100644
--- a/vcl/unx/headless/svpgdi.hxx
+++ b/vcl/unx/headless/svpgdi.hxx
@@ -28,11 +28,12 @@
 
 #ifndef _SVP_SVPGDI_HXX
 
-#include <vcl/salgdi.hxx>
-#include <vcl/sallayout.hxx>
 #include <basebmp/bitmapdevice.hxx>
 #include <basebmp/color.hxx>
 
+#include <salgdi.hxx>
+#include <sallayout.hxx>
+
 class ServerFont;
 
 class SvpSalGraphics : public SalGraphics
diff --git a/vcl/unx/headless/svpinst.cxx b/vcl/unx/headless/svpinst.cxx
index f4fe1dbdc649..e563e95821f0 100644
--- a/vcl/unx/headless/svpinst.cxx
+++ b/vcl/unx/headless/svpinst.cxx
@@ -31,18 +31,20 @@
 #include <sys/time.h>
 #include <sys/poll.h>
 
+#include <sal/types.h>
+
+#include <vcl/apptypes.hxx>
+
 #include "svpinst.hxx"
 #include "svpframe.hxx"
 #include "svpdummies.hxx"
 #include "svpvd.hxx"
 #include "svpbmp.hxx"
 
-#include <vcl/salframe.hxx>
-#include <vcl/svdata.hxx>
-#include <vcl/apptypes.hxx>
-#include <vcl/saldatabasic.hxx>
+#include <salframe.hxx>
+#include <svdata.hxx>
+#include <saldatabasic.hxx>
 #include <vcl/solarmutex.hxx>
-#include <sal/types.h>
 
 // plugin factory function
 extern "C"
diff --git a/vcl/unx/headless/svpinst.hxx b/vcl/unx/headless/svpinst.hxx
index eaffc99978d6..6fcafe0c7f66 100644
--- a/vcl/unx/headless/svpinst.hxx
+++ b/vcl/unx/headless/svpinst.hxx
@@ -29,13 +29,13 @@
 #ifndef _SVP_SALINST_HXX
 #define _SVP_SALINST_HXX
 
-#include <vcl/salinst.hxx>
-#include <vcl/salwtype.hxx>
-#include <vcl/saltimer.hxx>
 #include <vcl/solarmutex.hxx>
 
 #include <osl/mutex.hxx>
 #include <osl/thread.hxx>
+#include <salinst.hxx>
+#include <salwtype.hxx>
+#include <saltimer.hxx>
 
 #include <list>
 
diff --git a/vcl/unx/headless/svpprn.cxx b/vcl/unx/headless/svpprn.cxx
index 35ca451e432c..6f30f2d38969 100644
--- a/vcl/unx/headless/svpprn.cxx
+++ b/vcl/unx/headless/svpprn.cxx
@@ -29,21 +29,22 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
+#include <unistd.h>
+#include <sys/stat.h>
+#include <sys/wait.h>
+
 #include "vcl/svapp.hxx"
-#include "vcl/jobset.h"
-#include "vcl/print.h"
-#include "vcl/salptype.hxx"
 #include "vcl/timer.hxx"
 #include "vcl/printerinfomanager.hxx"
 
+#include "jobset.h"
+#include "print.h"
+#include "salptype.hxx"
+
 #include "svpprn.hxx"
 #include "svppspgraphics.hxx"
 #include "svpinst.hxx"
 
-#include <unistd.h>
-#include <sys/stat.h>
-#include <sys/wait.h>
-
 using namespace psp;
 
 using ::rtl::OUString;
diff --git a/vcl/unx/headless/svpprn.hxx b/vcl/unx/headless/svpprn.hxx
index 3a143443a599..f7e6a671f4b3 100644
--- a/vcl/unx/headless/svpprn.hxx
+++ b/vcl/unx/headless/svpprn.hxx
@@ -30,10 +30,12 @@
 #define _SVP_SVPPRN_HXX
 
 #include "vcl/jobdata.hxx"
-#include "vcl/printergfx.hxx"
-#include "vcl/printerjob.hxx"
-#include "vcl/salprn.hxx"
-#include "salprn.h"
+
+#include "printergfx.hxx"
+#include "printerjob.hxx"
+#include <unx/salprn.h>
+
+#include "vclpluginapi.h"
 
 class PspGraphics;
 
diff --git a/vcl/unx/headless/svppspgraphics.cxx b/vcl/unx/headless/svppspgraphics.cxx
index 071c5b09f9c9..a15557ef0cab 100644
--- a/vcl/unx/headless/svppspgraphics.cxx
+++ b/vcl/unx/headless/svppspgraphics.cxx
@@ -29,33 +29,34 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-#include "svppspgraphics.hxx"
-#include "svpbmp.hxx"
+#include <stdlib.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <sys/mman.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+
+#include "basegfx/vector/b2ivector.hxx"
+#include "basegfx/point/b2ipoint.hxx"
+
+#include "basebmp/color.hxx"
 
 #include "vcl/jobdata.hxx"
-#include "vcl/printergfx.hxx"
 #include "vcl/printerinfomanager.hxx"
 #include "vcl/bmpacc.hxx"
-#include "vcl/salbmp.hxx"
-#include "vcl/glyphcache.hxx"
-#include "vcl/impfont.hxx"
-#include "vcl/outfont.hxx"
-#include "vcl/fontsubset.hxx"
 #include "vcl/svapp.hxx"
-#include "vcl/salprn.hxx"
 #include "vcl/sysdata.hxx"
-#include "vcl/region.h"
 
-#include "basegfx/vector/b2ivector.hxx"
-#include "basegfx/point/b2ipoint.hxx"
-#include "basebmp/color.hxx"
-
-#include <stdlib.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <sys/mman.h>
-#include <sys/stat.h>
-#include <sys/types.h>
+#include "salprn.hxx"
+#include "salbmp.hxx"
+#include "glyphcache.hxx"
+#include "impfont.hxx"
+#include "outfont.hxx"
+#include "fontsubset.hxx"
+#include "printergfx.hxx"
+#include "svppspgraphics.hxx"
+#include "svpbmp.hxx"
+#include "region.h"
 
 using namespace psp;
 using namespace basebmp;
diff --git a/vcl/unx/headless/svppspgraphics.hxx b/vcl/unx/headless/svppspgraphics.hxx
index 5fdab151003c..736ab9b3c83e 100644
--- a/vcl/unx/headless/svppspgraphics.hxx
+++ b/vcl/unx/headless/svppspgraphics.hxx
@@ -31,8 +31,9 @@
 
 
 #include "vcl/fontmanager.hxx"
-#include "vcl/sallayout.hxx"
-#include "vcl/salgdi.hxx"
+
+#include "sallayout.hxx"
+#include "salgdi.hxx"
 
 namespace psp { struct JobData; class PrinterGfx; }
 
diff --git a/vcl/unx/headless/svptext.cxx b/vcl/unx/headless/svptext.cxx
index 18e2f4af8c90..40351bc27d07 100644
--- a/vcl/unx/headless/svptext.cxx
+++ b/vcl/unx/headless/svptext.cxx
@@ -26,12 +26,10 @@
  *
  ************************************************************************/
 
-#include "svpgdi.hxx"
-#include "svpbmp.hxx"
-
 #include <basegfx/range/b2drange.hxx>
 #include <basegfx/range/b2irange.hxx>
 #include <basegfx/polygon/b2dpolypolygon.hxx>
+
 #include <basebmp/scanlineformats.hxx>
 
 #include <tools/debug.hxx>
@@ -40,10 +38,12 @@
 #include <basebmp/debug.hxx>
 #endif
 
-#include <vcl/outfont.hxx>
-#include <vcl/glyphcache.hxx>
-#include <vcl/impfont.hxx>
+#include <outfont.hxx>
+#include <glyphcache.hxx>
+#include <impfont.hxx>
 
+#include "svpgdi.hxx"
+#include "svpbmp.hxx"
 #include "svppspgraphics.hxx"
 
 using namespace basegfx;
diff --git a/vcl/unx/headless/svpvd.hxx b/vcl/unx/headless/svpvd.hxx
index c6dde57abd38..211cf36846f9 100644
--- a/vcl/unx/headless/svpvd.hxx
+++ b/vcl/unx/headless/svpvd.hxx
@@ -29,7 +29,7 @@
 #ifndef _SVP_SVPVD_HXX
 #define _SVP_SVPVD_HXX
 
-#include <vcl/salvd.hxx>
+#include <salvd.hxx>
 #include "svpelement.hxx"
 
 #include <list>
diff --git a/vcl/unx/kde/kdedata.cxx b/vcl/unx/kde/kdedata.cxx
index b87e7a0aea5b..06acbb7cff96 100644
--- a/vcl/unx/kde/kdedata.cxx
+++ b/vcl/unx/kde/kdedata.cxx
@@ -46,15 +46,19 @@
 #include <sys/time.h>
 #include <unistd.h>
 #endif
-#include <plugins/kde/kdedata.hxx>
+
 #include <osl/thread.h>
 #include <osl/process.h>
 #include <osl/module.h>
 #include <osl/mutex.hxx>
 
 #include <tools/debug.hxx>
-#include "i18n_im.hxx"
-#include "i18n_xkb.hxx"
+
+#include "unx/kde/kdedata.hxx"
+#include "unx/i18n_im.hxx"
+#include "unx/i18n_xkb.hxx"
+
+#include "vclpluginapi.h"
 
 /* #i59042# override KApplications method for session management
  * since it will interfere badly with our own.
@@ -224,7 +228,7 @@ void KDEData::Init()
  **********************************************************************/
 
 extern "C" {
-    VCL_DLLPUBLIC SalInstance* create_SalInstance( oslModule )
+    VCLPLUG_KDE_PUBLIC SalInstance* create_SalInstance( oslModule )
     {
         /* #i92121# workaround deadlocks in the X11 implementation
         */
diff --git a/vcl/unx/kde/makefile.mk b/vcl/unx/kde/makefile.mk
deleted file mode 100644
index e4e056ee6435..000000000000
--- a/vcl/unx/kde/makefile.mk
+++ /dev/null
@@ -1,81 +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=kdeplug
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# workaround for makedepend hang
-MKDEPENDSOLVER=
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile2.pmk
-
-# For some of the included external KDE headers, GCC complains about shadowed
-# symbols in instantiated template code only at the end of a compilation unit,
-# so the only solution is to disable that warning here:
-.IF "$(COM)" == "GCC"
-CFLAGSCXX+=-Wno-shadow
-.ENDIF
-
-# --- Files --------------------------------------------------------
-
-.IF "$(GUIBASE)"!="unx"
-
-dummy:
-    @echo "Nothing to build for GUIBASE $(GUIBASE)"
-
-.ELSE		# "$(GUIBASE)"!="unx"
-
-.IF "$(ENABLE_KDE)" != ""
-
-CFLAGS+=$(KDE_CFLAGS)
-
-.IF "$(ENABLE_RANDR)" != ""
-CDEFS+=-DUSE_RANDR
-.ENDIF
-
-SLOFILES=\
-    $(SLO)$/kdedata.obj	\
-    $(SLO)$/salnativewidgets-kde.obj
-
-.ELSE # "$(ENABLE_KDE)" != ""
-
-dummy:
-    @echo KDE disabled - nothing to build
-.ENDIF
-.ENDIF		# "$(GUIBASE)"!="unx"
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/vcl/unx/kde/salnativewidgets-kde.cxx b/vcl/unx/kde/salnativewidgets-kde.cxx
index 0142078382cc..a7857119c16a 100644
--- a/vcl/unx/kde/salnativewidgets-kde.cxx
+++ b/vcl/unx/kde/salnativewidgets-kde.cxx
@@ -32,20 +32,17 @@
 #define _SV_SALNATIVEWIDGETS_KDE_CXX
 #include <kde_headers.h>
 
-#include <salunx.h>
-#include <saldata.hxx>
-#include <saldisp.hxx>
+#include <unx/salunx.h>
+#include <unx/saldata.hxx>
+#include <unx/saldisp.hxx>
+#include <unx/salgdi.h>
+#include <unx/pspgraphics.h>
+#include <unx/kde/kdedata.hxx>
 
-#include <salgdi.h>
-
-#include <salframe.h>
 #include <vcl/settings.hxx>
 #include <vcl/vclenum.hxx>
 #include <rtl/ustrbuf.hxx>
-#include <plugins/kde/kdedata.hxx>
-#include <iostream>
 
-#include <pspgraphics.h>
 
 using namespace ::rtl;
 
diff --git a/vcl/unx/kde4/KDEData.hxx b/vcl/unx/kde4/KDEData.hxx
index 31dc7b9dcba7..db1e12226673 100644
--- a/vcl/unx/kde4/KDEData.hxx
+++ b/vcl/unx/kde4/KDEData.hxx
@@ -28,8 +28,8 @@
 
 #pragma once
 
-#include <saldisp.hxx>
-#include <saldata.hxx>
+#include <unx/saldisp.hxx>
+#include <unx/saldata.hxx>
 
 class KDEData : public X11SalData
 {
diff --git a/vcl/unx/kde4/KDESalDisplay.hxx b/vcl/unx/kde4/KDESalDisplay.hxx
index 3b7117684942..5fd1e4459660 100644
--- a/vcl/unx/kde4/KDESalDisplay.hxx
+++ b/vcl/unx/kde4/KDESalDisplay.hxx
@@ -28,7 +28,7 @@
 
 #pragma once
 
-#include <saldisp.hxx>
+#include <unx/saldisp.hxx>
 
 class SalKDEDisplay : public SalX11Display
 {
diff --git a/vcl/unx/kde4/KDESalFrame.cxx b/vcl/unx/kde4/KDESalFrame.cxx
index a2f4b72b4edd..98b84ce54d7a 100644
--- a/vcl/unx/kde4/KDESalFrame.cxx
+++ b/vcl/unx/kde4/KDESalFrame.cxx
@@ -45,13 +45,14 @@
 #include "KDEXLib.hxx"
 #include "KDESalGraphics.hxx"
 
+#include <tools/color.hxx>
+
 #include <vcl/settings.hxx>
 #include <vcl/font.hxx>
-#include <tools/color.hxx>
 
-#include <vcl/svdata.hxx>
+#include <svdata.hxx>
 
-#include <pspgraphics.h>
+#include <unx/pspgraphics.h>
 
 #if OSL_DEBUG_LEVEL > 1
 #include <stdio.h>
diff --git a/vcl/unx/kde4/KDESalFrame.hxx b/vcl/unx/kde4/KDESalFrame.hxx
index f006a6e0d796..7658ea036bb2 100644
--- a/vcl/unx/kde4/KDESalFrame.hxx
+++ b/vcl/unx/kde4/KDESalFrame.hxx
@@ -28,8 +28,8 @@
 
 #pragma once
 
-#include <saldisp.hxx>
-#include <salframe.h>
+#include <unx/saldisp.hxx>
+#include <unx/salframe.h>
 
 class KDESalFrame : public X11SalFrame
 {
diff --git a/vcl/unx/kde4/KDESalGraphics.hxx b/vcl/unx/kde4/KDESalGraphics.hxx
index 5d1f3541a9b5..2f4c3f384c75 100644
--- a/vcl/unx/kde4/KDESalGraphics.hxx
+++ b/vcl/unx/kde4/KDESalGraphics.hxx
@@ -29,8 +29,8 @@
 #pragma once
 
 #include <rtl/string.hxx>
-#include <saldisp.hxx>
-#include <salgdi.h>
+#include <unx/saldisp.hxx>
+#include <unx/salgdi.h>
 
 #define Region QtXRegion
 #include <QImage>
diff --git a/vcl/unx/kde4/KDESalInstance.hxx b/vcl/unx/kde4/KDESalInstance.hxx
index 9f35557061bb..a8efcd4dcde1 100644
--- a/vcl/unx/kde4/KDESalInstance.hxx
+++ b/vcl/unx/kde4/KDESalInstance.hxx
@@ -28,7 +28,7 @@
 
 #pragma once
 
-#include <salinst.h>
+#include <unx/salinst.h>
 
 class SalYieldMutex;
 class SalFrame;
diff --git a/vcl/unx/kde4/KDEXLib.cxx b/vcl/unx/kde4/KDEXLib.cxx
index ce4ea14dadb5..c025d4b28215 100644
--- a/vcl/unx/kde4/KDEXLib.cxx
+++ b/vcl/unx/kde4/KDEXLib.cxx
@@ -26,6 +26,8 @@
  *
  ************************************************************************/
 
+#include <vos/process.hxx>
+
 #include "VCLKDEApplication.hxx"
 
 #define Region QtXRegion
@@ -43,10 +45,10 @@
 
 #include "KDEXLib.hxx"
 
-#include <i18n_im.hxx>
-#include <i18n_xkb.hxx>
+#include <unx/i18n_im.hxx>
+#include <unx/i18n_xkb.hxx>
 
-#include <saldata.hxx>
+#include <unx/saldata.hxx>
 #include <osl/process.h>
 
 #include "KDESalDisplay.hxx"
diff --git a/vcl/unx/kde4/KDEXLib.hxx b/vcl/unx/kde4/KDEXLib.hxx
index 72848ed4084c..497a97f3b828 100644
--- a/vcl/unx/kde4/KDEXLib.hxx
+++ b/vcl/unx/kde4/KDEXLib.hxx
@@ -28,7 +28,7 @@
 
 #pragma once
 
-#include <saldisp.hxx>
+#include <unx/saldisp.hxx>
 
 #include <fixx11h.h>
 
diff --git a/vcl/unx/kde4/VCLKDEApplication.cxx b/vcl/unx/kde4/VCLKDEApplication.cxx
index c923598736e8..9ab88020d119 100644
--- a/vcl/unx/kde4/VCLKDEApplication.cxx
+++ b/vcl/unx/kde4/VCLKDEApplication.cxx
@@ -39,7 +39,7 @@ VCLKDEApplication::VCLKDEApplication() :
 {
 }
 
-bool VCLKDEApplication::x11EventFilter(XEvent* event)
+bool VCLKDEApplication::x11EventFilter(XEvent* ev)
 {
     //if we have a display and the display consumes the event
     //do not process the event in qt
diff --git a/vcl/unx/kde4/main.cxx b/vcl/unx/kde4/main.cxx
index e244198b3709..791d155d7de4 100644
--- a/vcl/unx/kde4/main.cxx
+++ b/vcl/unx/kde4/main.cxx
@@ -36,6 +36,8 @@
 #include "KDEData.hxx"
 #include "KDESalInstance.hxx"
 
+#include "vclpluginapi.h"
+
 #if OSL_DEBUG_LEVEL > 1
 #include <stdio.h>
 #endif
@@ -44,7 +46,7 @@
 
 /// entry point for the KDE4 VCL plugin
 extern "C" {
-    VCL_DLLPUBLIC SalInstance* create_SalInstance( oslModule )
+    VCLPLUG_KDE4_PUBLIC SalInstance* create_SalInstance( oslModule )
     {
         /* #i92121# workaround deadlocks in the X11 implementation
         */
diff --git a/vcl/unx/kde4/makefile.mk b/vcl/unx/kde4/makefile.mk
deleted file mode 100644
index 83ac1c0e6802..000000000000
--- a/vcl/unx/kde4/makefile.mk
+++ /dev/null
@@ -1,96 +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=kde4plug
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# workaround for makedepend hang
-MKDEPENDSOLVER=
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile2.pmk
-
-# For some of the included external KDE headers, GCC complains about shadowed
-# symbols in instantiated template code only at the end of a compilation unit,
-# so the only solution is to disable that warning here:
-.IF "$(COM)" == "GCC"
-CFLAGSCXX+=-Wno-shadow
-.ENDIF
-
-# --- Files --------------------------------------------------------
-
-.IF "$(GUIBASE)"!="unx"
-
-dummy:
-    @echo "Nothing to build for GUIBASE $(GUIBASE)"
-
-.ELSE		# "$(GUIBASE)"!="unx"
-
-.IF "$(ENABLE_KDE4)" != ""
-
-CFLAGS+=$(KDE4_CFLAGS) $(KDE_GLIB_CFLAGS)
-
-.IF "$(ENABLE_RANDR)" != ""
-CDEFS+=-DUSE_RANDR
-.ENDIF
-
-.IF "$(KDE_HAVE_GLIB)" != ""
-CDEFS+=-DKDE_HAVE_GLIB
-.ENDIF
-
-SLOFILES=\
-    $(SLO)$/main.obj \
-    $(SLO)$/VCLKDEApplication.obj \
-    $(SLO)$/KDEXLib.obj \
-    $(SLO)$/KDEXLib.moc.obj \
-    $(SLO)$/KDESalDisplay.obj \
-    $(SLO)$/KDESalFrame.obj \
-    $(SLO)$/KDESalGraphics.obj \
-    $(SLO)$/KDESalInstance.obj \
-    $(SLO)$/KDEData.obj
-    
-
-.ELSE # "$(ENABLE_KDE4)" != ""
-
-dummy:
-    @echo KDE disabled - nothing to build
-.ENDIF
-.ENDIF		# "$(GUIBASE)"!="unx"
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-.INCLUDE :  $(PRJ)$/util$/target.pmk
-
-$(MISC)$/KDEXLib.moc.cxx : KDEXLib.hxx
-    $(MOC4) $< -o $@
diff --git a/vcl/unx/source/app/makefile.mk b/vcl/unx/source/app/makefile.mk
deleted file mode 100644
index 1e704184a40d..000000000000
--- a/vcl/unx/source/app/makefile.mk
+++ /dev/null
@@ -1,111 +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
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile2.pmk
-
-# --- Files --------------------------------------------------------
-
-.IF "$(GUIBASE)"!="unx"
-
-dummy:
-    @echo "Nothing to build for GUIBASE $(GUIBASE)"
-
-.ELSE		# "$(GUIBASE)"!="unx"
-
-SLOFILES=\
-            $(SLO)$/i18n_cb.obj			\
-            $(SLO)$/i18n_ic.obj			\
-            $(SLO)$/i18n_im.obj			\
-            $(SLO)$/i18n_keysym.obj		\
-            $(SLO)$/i18n_status.obj		\
-            $(SLO)$/i18n_wrp.obj		\
-            $(SLO)$/i18n_xkb.obj		\
-            $(SLO)$/keysymnames.obj		\
-            $(SLO)$/randrwrapper.obj	\
-            $(SLO)$/saldata.obj			\
-            $(SLO)$/saldisp.obj			\
-            $(SLO)$/salinst.obj			\
-            $(SLO)$/salsys.obj			\
-            $(SLO)$/saltimer.obj		\
-            $(SLO)$/sm.obj			\
-            $(SLO)$/soicon.obj			\
-            $(SLO)$/wmadaptor.obj
-
-EXCEPTIONSFILES=\
-            $(SLO)$/i18n_cb.obj			\
-            $(SLO)$/i18n_ic.obj			\
-            $(SLO)$/i18n_status.obj		\
-            $(SLO)$/saldata.obj			\
-            $(SLO)$/saldisp.obj			\
-            $(SLO)$/salinst.obj			\
-            $(SLO)$/salsys.obj			\
-            $(SLO)$/sm.obj			\
-            $(SLO)$/wmadaptor.obj
-
-
-.IF "$(ENABLE_RANDR)" != ""
-CDEFS+=-DUSE_RANDR
-.IF "$(XRANDR_DLOPEN)" == "FALSE"
-CDEFS+=$(XRANDR_CFLAGS)
-.ELSE
-CDEFS+=-DXRANDR_DLOPEN
-.ENDIF
-.ENDIF
-
-.IF "$(USE_XINERAMA)" != "NO"
-CDEFS+=-DUSE_XINERAMA
-.IF "$(USE_XINERAMA_VERSION)" == "Xorg"
-CDEFS+=-DUSE_XINERAMA_XORG
-.ELIF "$(USE_XINERAMA_VERSION)" == "Xsun"
-CDEFS+=-DUSE_XINERAMA_XSUN
-.ELSE
-# provide sensible default
-.IF "$(OS)" != "SOLARIS"
-CDEFS+=-DUSE_XINERAMA_XORG
-.ELSE
-CDEFS+=-DUSE_XINERAMA_XSUN
-.ENDIF
-.ENDIF
-.ENDIF
-
-.ENDIF		# "$(GUIBASE)"!="unx"
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-.INCLUDE :  $(PRJ)$/util$/target.pmk
-
diff --git a/vcl/unx/source/dtrans/makefile.mk b/vcl/unx/source/dtrans/makefile.mk
deleted file mode 100644
index 6f5caccfd734..000000000000
--- a/vcl/unx/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=dtransX11
-TARGETTYPE=GUI
-
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# ------------------------------------------------------------------
-
-.IF "$(GUIBASE)"=="aqua"
-
-dummy:
-    @echo "Nothing to build for Mac OS X"
- 
-.ELSE		# "$(GUIBASE)"=="aqua"
-
-.IF "$(COM)$(CPU)" == "C50I" || "$(COM)$(CPU)" == "C52I"
-NOOPTFILES=\
-    $(SLO)$/X11_selection.obj
-.ENDIF
-
-SLOFILES=\
-    $(SLO)$/X11_dndcontext.obj		\
-    $(SLO)$/X11_transferable.obj	\
-    $(SLO)$/X11_clipboard.obj		\
-    $(SLO)$/X11_selection.obj		\
-    $(SLO)$/X11_droptarget.obj		\
-    $(SLO)$/X11_service.obj			\
-    $(SLO)$/bmp.obj					\
-    $(SLO)$/config.obj
-
-.ENDIF		# "$(OS)"=="MACOSX"
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :	target.mk
diff --git a/vcl/unx/source/fontmanager/makefile.mk b/vcl/unx/source/fontmanager/makefile.mk
deleted file mode 100644
index 5aa36a984438..000000000000
--- a/vcl/unx/source/fontmanager/makefile.mk
+++ /dev/null
@@ -1,77 +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=..$/..$/..
-
-ENABLE_EXCEPTIONS=TRUE
-PRJNAME=vcl
-TARGET=fontman
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-CFLAGS+= -I..$/fontsubset
-INCDEPN+= -I..$/fontsubset
-
-.IF "$(ENABLE_FONTCONFIG)" != ""
-CDEFS += -DENABLE_FONTCONFIG
-.ENDIF
-
-CFLAGS+= $(FREETYPE_CFLAGS)
-CFLAGS+= $(FONTCONFIG_CFLAGS)
-
-# --- Files --------------------------------------------------------
-
-.IF "$(GUIBASE)"=="aqua"
-
-dummy:
-    @echo "Nothing to build for GUIBASE $(GUIBASE)"
-
-.ELSE		# "$(GUIBASE)"=="aqua"
-
-SLOFILES=\
-    $(SLO)$/fontmanager.obj		\
-    $(SLO)$/fontcache.obj		\
-    $(SLO)$/fontconfig.obj		\
-    $(SLO)$/helper.obj    		\
-    $(SLO)$/parseAFM.obj
-
-.IF "$(OS)$(CPU)"=="SOLARISI"
-NOOPTFILES=$(SLO)$/fontmanager.obj
-.ENDIF
-
-.ENDIF
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-$(SLO)$/parseAFM.obj: $(INCCOM)$/afm_hash.cpp
-
-$(INCCOM)$/afm_hash.cpp: afm_keyword_list
-    $(GPERF) -C -t -l -L C++ -m 20 -Z AfmKeywordHash -k '1,4,6,$$' afm_keyword_list | $(SED) -e "s/(char\*)0/(char\*)0, NOPE/g" | $(GREP) -v "^#line" > $@
diff --git a/vcl/unx/source/gdi/makefile.mk b/vcl/unx/source/gdi/makefile.mk
deleted file mode 100644
index ef5a8726fedc..000000000000
--- a/vcl/unx/source/gdi/makefile.mk
+++ /dev/null
@@ -1,104 +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
-
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile2.pmk
-
-# --- Files --------------------------------------------------------
-
-.IF "$(GUIBASE)"!="unx"
-
-dummy:
-    @echo "Nothing to build for GUIBASE $(GUIBASE)"
-
-.ELSE		# "$(GUIBASE)"!="unx"
-
-SLOFILES=	\
-        $(SLO)$/salgdi2.obj		\
-        $(SLO)$/salbmp.obj		\
-        $(SLO)$/salgdi.obj		\
-        $(SLO)$/salvd.obj		\
-        $(SLO)$/dtint.obj		\
-        $(SLO)$/salcvt.obj		\
-        $(SLO)$/salgdi3.obj		\
-        $(SLO)$/gcach_xpeer.obj		\
-        $(SLO)$/xrender_peer.obj	\
-        $(SLO)$/pspgraphics.obj
-        
-EXCEPTIONSFILES=\
-        $(SLO)$/salgdi.obj		\
-        $(SLO)$/salbmp.obj		\
-        $(SLO)$/salgdi3.obj		\
-        $(SLO)$/salcvt.obj
-
-SLOFILES+=$(SLO)$/salprnpsp.obj
-EXCEPTIONSFILES+=$(SLO)$/salprnpsp.obj
-
-.IF "$(OS)"=="SOLARIS"
-SLOFILES+=$(SLO)$/cdeint.obj
-ENVCFLAGS+=-DUSE_CDE
-.ENDIF
-
-.IF "$(XRENDER_LINK)" == "YES"
-CFLAGS+=-DXRENDER_LINK
-.ENDIF
-
-.IF "$(ENABLE_GRAPHITE)" == "TRUE"
-CFLAGS+=-DENABLE_GRAPHITE
-.IF "$(SYSTEM_GRAPHITE)" != "YES"
-CDEFS+=-DGR2_STATIC
-.ENDIF
-.ENDIF
-
-.ENDIF	# "$(GUIBASE)"!="unx"
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-.INCLUDE :  $(PRJ)$/util$/target.pmk
-
-ALLTAR : $(MACOSXRC)
-
-XSALSETLIBNAME=$(DLLPRE)spa$(DLLPOSTFIX)$(DLLPOST)
-
-$(INCCOM)$/rtsname.hxx:
-    @rm -f $(INCCOM)$/rtsname.hxx ; \
-        echo "#define _XSALSET_LIBNAME "\"$(XSALSETLIBNAME)\" > $(INCCOM)$/rtsname.hxx
-
-$(SLO)$/salpimpl.obj : $(INCCOM)$/rtsname.hxx
-$(SLO)$/salprnpsp.obj : $(INCCOM)$/rtsname.hxx
-
diff --git a/vcl/unx/source/inc/salcursors.h b/vcl/unx/source/inc/salcursors.h
deleted file mode 100644
index 997b94c90054..000000000000
--- a/vcl/unx/source/inc/salcursors.h
+++ /dev/null
@@ -1,165 +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.
- *
- ************************************************************************/
-
-#include "nodrop_curs.h"
-#include "nodrop_mask.h"
-#include "magnify_curs.h"
-#include "magnify_mask.h"
-#include "rotate_curs.h"
-#include "rotate_mask.h"
-#include "hshear_curs.h"
-#include "hshear_mask.h"
-#include "vshear_curs.h"
-#include "vshear_mask.h"
-#include "drawline_curs.h"
-#include "drawline_mask.h"
-#include "drawrect_curs.h"
-#include "drawrect_mask.h"
-#include "drawpolygon_curs.h"
-#include "drawpolygon_mask.h"
-#include "drawbezier_curs.h"
-#include "drawbezier_mask.h"
-#include "drawarc_curs.h"
-#include "drawarc_mask.h"
-#include "drawpie_curs.h"
-#include "drawpie_mask.h"
-#include "drawcirclecut_curs.h"
-#include "drawcirclecut_mask.h"
-#include "drawellipse_curs.h"
-#include "drawellipse_mask.h"
-#include "drawconnect_curs.h"
-#include "drawconnect_mask.h"
-#include "drawtext_curs.h"
-#include "drawtext_mask.h"
-#include "mirror_curs.h"
-#include "mirror_mask.h"
-#include "crook_curs.h"
-#include "crook_mask.h"
-#include "crop_curs.h"
-#include "crop_mask.h"
-#include "movepoint_curs.h"
-#include "movepoint_mask.h"
-#include "movebezierweight_curs.h"
-#include "movebezierweight_mask.h"
-#include "drawfreehand_curs.h"
-#include "drawfreehand_mask.h"
-#include "drawcaption_curs.h"
-#include "drawcaption_mask.h"
-#include "movedata_curs.h"
-#include "movedata_mask.h"
-#include "copydata_curs.h"
-#include "copydata_mask.h"
-#include "linkdata_curs.h"
-#include "linkdata_mask.h"
-#include "movedlnk_curs.h"
-#include "movedlnk_mask.h"
-#include "copydlnk_curs.h"
-#include "copydlnk_mask.h"
-#include "movefile_curs.h"
-#include "movefile_mask.h"
-#include "copyfile_curs.h"
-#include "copyfile_mask.h"
-#include "linkfile_curs.h"
-#include "linkfile_mask.h"
-#include "moveflnk_curs.h"
-#include "moveflnk_mask.h"
-#include "copyflnk_curs.h"
-#include "copyflnk_mask.h"
-#include "movefiles_curs.h"
-#include "movefiles_mask.h"
-#include "copyfiles_curs.h"
-#include "copyfiles_mask.h"
-
-#include "chart_curs.h"
-#include "chart_mask.h"
-#include "detective_curs.h"
-#include "detective_mask.h"
-#include "pivotcol_curs.h"
-#include "pivotcol_mask.h"
-#include "pivotfld_curs.h"
-#include "pivotfld_mask.h"
-#include "pivotrow_curs.h"
-#include "pivotrow_mask.h"
-#include "pivotdel_curs.h"
-#include "pivotdel_mask.h"
-
-#include "chain_curs.h"
-#include "chain_mask.h"
-#include "chainnot_curs.h"
-#include "chainnot_mask.h"
-
-#include "timemove_curs.h"
-#include "timemove_mask.h"
-#include "timesize_curs.h"
-#include "timesize_mask.h"
-
-#include "ase_curs.h"
-#include "ase_mask.h"
-#include "asn_curs.h"
-#include "asn_mask.h"
-#include "asne_curs.h"
-#include "asne_mask.h"
-#include "asns_curs.h"
-#include "asns_mask.h"
-#include "asnswe_curs.h"
-#include "asnswe_mask.h"
-#include "asnw_curs.h"
-#include "asnw_mask.h"
-#include "ass_curs.h"
-#include "ass_mask.h"
-#include "asse_curs.h"
-#include "asse_mask.h"
-#include "assw_curs.h"
-#include "assw_mask.h"
-#include "asw_curs.h"
-#include "asw_mask.h"
-#include "aswe_curs.h"
-#include "aswe_mask.h"
-#include "null_curs.h"
-#include "null_mask.h"
-
-#include "airbrush_curs.h"
-#include "airbrush_mask.h"
-#include "fill_curs.h"
-#include "fill_mask.h"
-#include "vertcurs_curs.h"
-#include "vertcurs_mask.h"
-#include "tblsele_curs.h"
-#include "tblsele_mask.h"
-#include "tblsels_curs.h"
-#include "tblsels_mask.h"
-#include "tblselse_curs.h"
-#include "tblselse_mask.h"
-#include "tblselw_curs.h"
-#include "tblselw_mask.h"
-#include "tblselsw_curs.h"
-#include "tblselsw_mask.h"
-#include "paintbrush_curs.h"
-#include "paintbrush_mask.h"
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/source/plugadapt/makefile.mk b/vcl/unx/source/plugadapt/makefile.mk
deleted file mode 100644
index af409c04af35..000000000000
--- a/vcl/unx/source/plugadapt/makefile.mk
+++ /dev/null
@@ -1,59 +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=salplug
-
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile2.pmk
-
-# --- Files --------------------------------------------------------
-
-.IF "$(GUIBASE)"!="unx"
-
-dummy:
-    @echo "Nothing to build for GUIBASE $(GUIBASE)"
-
-.ELSE		# "$(GUIBASE)"!="unx"
-
-CFLAGS+=-DSAL_DLLPOSTFIX=\"$(DLLPOSTFIX)\"
-
-SLOFILES=$(SLO)$/salplug.obj
-
-.ENDIF		# "$(GUIBASE)"!="unx"
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/vcl/unx/source/printer/makefile.mk b/vcl/unx/source/printer/makefile.mk
deleted file mode 100644
index 5cd35088acd9..000000000000
--- a/vcl/unx/source/printer/makefile.mk
+++ /dev/null
@@ -1,70 +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=..$/..$/..
-
-ENABLE_EXCEPTIONS=TRUE
-PRJNAME=vcl
-TARGET=printer
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-.IF "$(ENABLE_CUPS)" != ""
-CDEFS += -DENABLE_CUPS
-.ENDIF
-
-# --- Files --------------------------------------------------------
-
-.IF "$(GUIBASE)"=="aqua"
-
-dummy:
-    @echo "Nothing to build for GUIBASE $(GUIBASE)"
-
-.ELSE		# "$(GUIBASE)"=="aqua"
-
-SLOFILES=\
-    $(SLO)$/ppdparser.obj   	    \
-    $(SLO)$/printerinfomanager.obj	\
-    $(SLO)$/jobdata.obj				\
-    $(SLO)$/cupsmgr.obj
-
-.ENDIF # GUIBASE = aqua
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-XSALSETLIBNAME=$(DLLPRE)spa$(DLLPOSTFIX)$(DLLPOST)
-
-$(INCCOM)$/rtsname.hxx:
-    rm -f $(INCCOM)$/rtsname.hxx ; \
-    echo "#define _XSALSET_LIBNAME "\"$(XSALSETLIBNAME)\" > $(INCCOM)$/rtsname.hxx
-
-$(SLO)$/cupsmgr.obj : $(INCCOM)$/rtsname.hxx
-
diff --git a/vcl/unx/source/printergfx/makefile.mk b/vcl/unx/source/printergfx/makefile.mk
deleted file mode 100644
index cc5692e951f5..000000000000
--- a/vcl/unx/source/printergfx/makefile.mk
+++ /dev/null
@@ -1,65 +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=printergfx
-
-# --- Settings -----------------------------------------------------
-
-ENABLE_EXCEPTIONS=true
-
-.INCLUDE :	settings.mk
-
-.IF "$(ENABLE_CUPS)" != ""
-CDEFS += -DENABLE_CUPS
-.ENDIF
-
-# --- Files --------------------------------------------------------
-
-.IF "$(GUIBASE)"=="aqua"
-
-dummy:
-    @echo "Nothing to build for GUIBASE $(GUIBASE)"
-
-.ELSE		# "$(GUIBASE)"=="aqua"
-
-SLOFILES=\
-    $(SLO)$/printerjob.obj		\
-    $(SLO)$/text_gfx.obj		\
-    $(SLO)$/psputil.obj			\
-    $(SLO)$/common_gfx.obj		\
-    $(SLO)$/glyphset.obj		\
-    $(SLO)$/bitmap_gfx.obj
-
-.ENDIF
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :	target.mk
-
diff --git a/vcl/unx/source/window/makefile.mk b/vcl/unx/source/window/makefile.mk
deleted file mode 100644
index c5cd95ba6b1c..000000000000
--- a/vcl/unx/source/window/makefile.mk
+++ /dev/null
@@ -1,59 +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)"!="unx"
-
-dummy:
-    @echo "Nothing to build for GUIBASE $(GUIBASE)"
-
-.ELSE		# "$(GUIBASE)"!="unx"
-
-SLOFILES=	\
-        $(SLO)/FWS.obj $(SLO)/salframe.obj $(SLO)/salobj.obj
-
-.ENDIF		# "$(GUIBASE)"!="unx"
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-.INCLUDE :  $(PRJ)$/util$/target.pmk
diff --git a/vcl/util/linksvp/makefile.mk b/vcl/util/linksvp/makefile.mk
deleted file mode 100644
index d11aa2cd51d6..000000000000
--- a/vcl/util/linksvp/makefile.mk
+++ /dev/null
@@ -1,67 +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=svp
-TARGETTYPE=CUI
-
-# --- Settings -----------------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-.IF "$(OS)" == "SOLARIS"
-LINKFLAGSRUNPATH_OOO := -R/usr/sfw/lib $(LINKFLAGSRUNPATH_OOO)
-.ENDIF
-
-.IF "$(GUIBASE)" == "unx"
-# headless plugin
-LIB1TARGET=$(SLB)$/isvpplug
-LIB1FILES= $(SLB)$/svpplug.lib \
-           $(SLB)$/printergfx.lib
-SHL1TARGET=vclplug_svp$(DLLPOSTFIX)
-SHL1IMPLIB=isvpplug
-SHL1LIBS=$(LIB1TARGET)
-SHL1DEPN=\
-    $(LB)$/libvcl$(DLLPOSTFIX)$(DLLPOST) \
-    $(LB)$/libvclplug_gen$(DLLPOSTFIX)$(DLLPOST)
-SHL1STDLIBS=\
-            $(VCLLIB)\
-            -lvclplug_gen$(DLLPOSTFIX) \
-            $(I18NPAPERLIB)\
-            $(BASEBMPLIB)\
-            $(BASEGFXLIB)\
-            $(TOOLSLIB)         \
-            $(SALLIB)
-.ENDIF # GUIBASE unx
-
-
-# --- Allgemein ----------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/vcl/util/makefile.mk b/vcl/util/makefile.mk
index bba023ab779f..c8dc1012dd8f 100755
--- a/vcl/util/makefile.mk
+++ b/vcl/util/makefile.mk
@@ -99,6 +99,8 @@ HXXDEPNLST= $(INC)$/vcl$/accel.hxx       \
             $(INC)$/vcl$/print.hxx       \
             $(INC)$/vcl$/prndlg.hxx      \
             $(INC)$/vcl$/region.hxx      \
+            $(INC)$/vcl$/rendergraphic.hxx		\
+            $(INC)$/vcl$/rendergraphicrasterizer.hxx	\
             $(INC)$/vcl$/salbtype.hxx    \
             $(INC)$/vcl$/scrbar.hxx      \
             $(INC)$/vcl$/slider.hxx      \
diff --git a/vcl/util/makefile2.pmk b/vcl/util/makefile2.pmk
deleted file mode 100644
index ce1f2a31bd65..000000000000
--- a/vcl/util/makefile2.pmk
+++ /dev/null
@@ -1,34 +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.
-#
-#*************************************************************************
-
-# Reduction of exported symbols:
-CDEFS += -DVCL_DLLIMPLEMENTATION
-VISIBILITY_HIDDEN=TRUE
-
-.IF "$(GUIBASE)"=="aqua"
-CFLAGSCXX+=$(OBJCXXFLAGS)
-.ENDIF  # "$(GUIBASE)"=="aqua"
diff --git a/vcl/util/vcl.macosx.component b/vcl/vcl.macosx.component
index 3aabcd8c7050..023f805672bd 100644
--- a/vcl/util/vcl.macosx.component
+++ b/vcl/vcl.macosx.component
@@ -46,4 +46,7 @@
   <implementation name="vcl::FontIdentificator">
     <service name="com.sun.star.awt.FontIdentificator"/>
   </implementation>
+  <implementation name="vcl::rsvg::Rasterizer">
+    <service name="com.sun.star.graphic.GraphicRasterizer_RSVG"/>
+  </implementation>
 </component>
diff --git a/vcl/util/vcl.component b/vcl/vcl.unx.component
index da20fc916c32..ea14667d17c1 100644
--- a/vcl/util/vcl.component
+++ b/vcl/vcl.unx.component
@@ -46,4 +46,7 @@
   <implementation name="vcl::FontIdentificator">
     <service name="com.sun.star.awt.FontIdentificator"/>
   </implementation>
+  <implementation name="vcl::rsvg::Rasterizer">
+    <service name="com.sun.star.graphic.GraphicRasterizer_RSVG"/>
+  </implementation>
 </component>
diff --git a/vcl/util/vcl.windows.component b/vcl/vcl.windows.component
index 72f7ace9f251..df786c4d832b 100644
--- a/vcl/util/vcl.windows.component
+++ b/vcl/vcl.windows.component
@@ -37,4 +37,7 @@
   <implementation name="vcl::FontIdentificator">
     <service name="com.sun.star.awt.FontIdentificator"/>
   </implementation>
+  <implementation name="vcl::rsvg::Rasterizer">
+    <service name="com.sun.star.graphic.GraphicRasterizer_RSVG"/>
+  </implementation>
 </component>
diff --git a/vcl/win/source/app/MAKEFILE.MK b/vcl/win/source/app/MAKEFILE.MK
deleted file mode 100644
index 9b3237567eff..000000000000
--- a/vcl/win/source/app/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=..$/..$/..
-
-PRJNAME=vcl
-TARGET=salapp
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile2.pmk
-
-# --- #105371#
-CFLAGS += -DWINVER=0x0400
-
-# --- Files --------------------------------------------------------
-
-SLOFILES=   $(SLO)$/salshl.obj      \
-            $(SLO)$/saldata.obj     \
-            $(SLO)$/salinst.obj     \
-            $(SLO)$/saltimer.obj    \
-            $(SLO)$/salinfo.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
diff --git a/vcl/win/source/app/saldata.cxx b/vcl/win/source/app/saldata.cxx
index 3d9834a86466..ebe1728ed6b5 100644..100755
--- a/vcl/win/source/app/saldata.cxx
+++ b/vcl/win/source/app/saldata.cxx
@@ -29,10 +29,11 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 #include <svsys.h>
+#include "tools/svwin.h"
 #include "rtl/tencinfo.h"
-#include <saldata.hxx>
-#include <vcl/svapp.hxx>
+#include "vcl/svapp.hxx"
 
+#include "win/saldata.hxx"
 
 // =======================================================================
 
diff --git a/vcl/win/source/app/salinfo.cxx b/vcl/win/source/app/salinfo.cxx
index 020e555d8498..4436c0243f1d 100644..100755
--- a/vcl/win/source/app/salinfo.cxx
+++ b/vcl/win/source/app/salinfo.cxx
@@ -35,28 +35,20 @@
 #define WINVER 0x0500
 #endif
 
-#define VCL_NEED_BASETSD
-#include "tools/presys.h"
-#if defined _MSC_VER
-#pragma warning(push, 1)
-#endif
-#include <windows.h>
-#include <winuser.h>
-#if defined _MSC_VER
-#pragma warning(pop)
-#endif
-#include "tools/postsys.h"
+#include "svsys.h"
+#include "rtl/ustrbuf.hxx"
 
-#include "tools/string.hxx"
-#include "salsys.h"
-#include "salframe.h"
-#include "salinst.h"
-#include "saldata.hxx"
 #include "tools/debug.hxx"
-#include "vcl/svdata.hxx"
+#include "tools/string.hxx"
+
 #include "vcl/window.hxx"
 
-#include "rtl/ustrbuf.hxx"
+#include "win/salsys.h"
+#include "win/salframe.h"
+#include "win/salinst.h"
+#include "win/saldata.hxx"
+
+#include "svdata.hxx"
 
 #include <boost/unordered_map.hpp>
 
diff --git a/vcl/win/source/app/salinst.cxx b/vcl/win/source/app/salinst.cxx
index 7baa25fd5101..6db248c0ddb4 100644
--- a/vcl/win/source/app/salinst.cxx
+++ b/vcl/win/source/app/salinst.cxx
@@ -37,24 +37,28 @@
 #ifdef __MINGW32__
 #include <excpt.h>
 #endif
+
 #include <osl/file.hxx>
 #include <osl/mutex.hxx>
+
+#include <tools/solarmutex.hxx>
 #include <tools/debug.hxx>
-#include <wincomp.hxx>
-#include <salids.hrc>
-#include <saldata.hxx>
-#include <salinst.h>
-#include <salframe.h>
-#include <salobj.h>
-#include <vcl/salsys.hxx>
-#include <saltimer.h>
-#include <vcl/apptypes.hxx>
-#include <salbmp.h>
-#include <vcl/salimestatus.hxx>
+
 #include <vcl/timer.hxx>
-#include <wincomp.hxx>  // CS_DROPSHADOW
-#include <tools/solarmutex.hxx>
+#include <vcl/apptypes.hxx>
+
 #include <vcl/solarmutex.hxx>
+#include <win/wincomp.hxx>
+#include <win/salids.hrc>
+#include <win/saldata.hxx>
+#include <win/salinst.h>
+#include <win/salframe.h>
+#include <win/salobj.h>
+#include <win/saltimer.h>
+#include <win/salbmp.h>
+
+#include <salimestatus.hxx>
+#include <salsys.hxx>
 
 #ifndef min
 #define min(a,b)    (((a) < (b)) ? (a) : (b))
diff --git a/vcl/win/source/app/salshl.cxx b/vcl/win/source/app/salshl.cxx
index cdcf89d2224c..2aa9d5cb2336 100644..100755
--- a/vcl/win/source/app/salshl.cxx
+++ b/vcl/win/source/app/salshl.cxx
@@ -28,9 +28,11 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
+
 #include <svsys.h>
-#include <saldata.hxx>
 #include <tools/debug.hxx>
+#include <tools/svwin.h>
+#include <win/saldata.hxx>
 
 // =======================================================================
 
diff --git a/vcl/win/source/app/saltimer.cxx b/vcl/win/source/app/saltimer.cxx
index 536ca438e458..60c917475a94 100644..100755
--- a/vcl/win/source/app/saltimer.cxx
+++ b/vcl/win/source/app/saltimer.cxx
@@ -32,9 +32,9 @@
 #ifdef __MINGW32__
 #include <excpt.h>
 #endif
-#include <saldata.hxx>
-#include <saltimer.h>
-#include <salinst.h>
+#include <win/saldata.hxx>
+#include <win/saltimer.h>
+#include <win/salinst.h>
 
 // =======================================================================
 
diff --git a/vcl/win/source/gdi/makefile.mk b/vcl/win/source/gdi/makefile.mk
deleted file mode 100644
index 07a8bf52656d..000000000000
--- a/vcl/win/source/gdi/makefile.mk
+++ /dev/null
@@ -1,73 +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
-
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile2.pmk
-
-# --- #105371#
-.IF "$(COM)"=="GCC"
-.ELSE
-CFLAGS += -DWINVER=0x0400
-.ENDIF
-
-# --- Files --------------------------------------------------------
-
-SLOFILES=   $(SLO)$/salgdi.obj   \
-            $(SLO)$/salgdi2.obj  \
-            $(SLO)$/salgdi3.obj  \
-            $(SLO)$/salgdi_gdiplus.obj  \
-            $(SLO)$/salvd.obj    \
-            $(SLO)$/salprn.obj   \
-            $(SLO)$/salbmp.obj	 \
-            $(SLO)$/winlayout.obj	\
-            $(SLO)$/wntgdi.obj      \
-            $(SLO)$/salnativewidgets-luna.obj
-
-
-EXCEPTIONSFILES=	$(SLO)$/salprn.obj \
-					$(SLO)$/salgdi2.obj
-
-.IF "$(ENABLE_GRAPHITE)" == "TRUE"
-CFLAGS+=-DENABLE_GRAPHITE
-.IF "$(SYSTEM_GRAPHITE)" != "YES"
-CDEFS+=-DGR2_STATIC
-.ENDIF
-.ENDIF
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
diff --git a/vcl/win/source/gdi/salbmp.cxx b/vcl/win/source/gdi/salbmp.cxx
index 959374699dbb..7661fa5f6ed1 100644..100755
--- a/vcl/win/source/gdi/salbmp.cxx
+++ b/vcl/win/source/gdi/salbmp.cxx
@@ -28,13 +28,17 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
+
 #include <svsys.h>
-#include <wincomp.hxx>
-#include <vcl/salbtype.hxx>
-#include <salgdi.h>
-#include <saldata.hxx>
-#include <salbmp.h>
+
 #include <vcl/bitmap.hxx> // for BitmapSystemData
+#include <vcl/salbtype.hxx>
+
+#include <win/wincomp.hxx>
+#include <win/salgdi.h>
+#include <win/saldata.hxx>
+#include <win/salbmp.h>
+
 #include <string.h>
 
 // -----------
diff --git a/vcl/win/source/gdi/salgdi.cxx b/vcl/win/source/gdi/salgdi.cxx
index 727c67298e89..ae490d41584c 100644
--- a/vcl/win/source/gdi/salgdi.cxx
+++ b/vcl/win/source/gdi/salgdi.cxx
@@ -31,17 +31,22 @@
 
 #include <stdio.h>
 #include <string.h>
+
 #include <svsys.h>
-#include <wincomp.hxx>
-#include <saldata.hxx>
-#include <salgdi.h>
+#include <rtl/strbuf.hxx>
+
 #include <tools/debug.hxx>
-#include <salframe.h>
 #include <tools/poly.hxx>
+
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
-#include <rtl/strbuf.hxx>
-#include <vcl/region.h>
+
+#include <win/wincomp.hxx>
+#include <win/saldata.hxx>
+#include <win/salgdi.h>
+#include <win/salframe.h>
+
+#include <region.h>
 
 using ::rtl::OStringBuffer;
 // =======================================================================
diff --git a/vcl/win/source/gdi/salgdi2.cxx b/vcl/win/source/gdi/salgdi2.cxx
index 447a00686125..a7069b3b911e 100644
--- a/vcl/win/source/gdi/salgdi2.cxx
+++ b/vcl/win/source/gdi/salgdi2.cxx
@@ -31,14 +31,16 @@
 
 #include <string.h>
 #include <stdlib.h>
+
 #include <svsys.h>
 #include <tools/debug.hxx>
-#include <wincomp.hxx>
-#include <salbmp.h>
-#include <saldata.hxx>
-#include <salids.hrc>
-#include <salgdi.h>
-#include <salframe.h>
+
+#include <win/wincomp.hxx>
+#include <win/salbmp.h>
+#include <win/saldata.hxx>
+#include <win/salids.hrc>
+#include <win/salgdi.h>
+#include <win/salframe.h>
 
 #include "vcl/salbtype.hxx"
 #include "vcl/bmpacc.hxx"
diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx
index c7e35143b107..17774dab7026 100644
--- a/vcl/win/source/gdi/salgdi3.cxx
+++ b/vcl/win/source/gdi/salgdi3.cxx
@@ -32,22 +32,7 @@
 #include <string.h>
 #include <malloc.h>
 
-#include <vcl/sysdata.hxx>
 #include <svsys.h>
-
-#include "wincomp.hxx"
-#include "saldata.hxx"
-#include "salgdi.h"
-
-#include "vcl/svapp.hxx"
-#include "vcl/outfont.hxx"
-#include "vcl/font.hxx"
-#include "vcl/fontsubset.hxx"
-#include "vcl/sallayout.hxx"
-
-#include "vcl/outdev.h"         // for ImplGlyphFallbackFontSubstitution
-#include "unotools/fontcfg.hxx" // for IMPL_FONT_ATTR_SYMBOL
-
 #include "rtl/logfile.hxx"
 #include "rtl/tencinfo.h"
 #include "rtl/textcvt.h"
@@ -60,15 +45,34 @@
 #include "osl/thread.hxx"
 #include "osl/process.h"
 
+#include "basegfx/polygon/b2dpolygon.hxx"
+#include "basegfx/polygon/b2dpolypolygon.hxx"
+#include "basegfx/matrix/b2dhommatrix.hxx"
+#include "basegfx/matrix/b2dhommatrixtools.hxx"
+
+#include "unotools/fontcfg.hxx" // for IMPL_FONT_ATTR_SYMBOL
+
+#include "vcl/font.hxx"
+#include "vcl/svapp.hxx"
+
 #include "tools/poly.hxx"
 #include "tools/debug.hxx"
 #include "tools/stream.hxx"
 
-#include "basegfx/polygon/b2dpolygon.hxx"
-#include "basegfx/polygon/b2dpolypolygon.hxx"
-#include "basegfx/matrix/b2dhommatrix.hxx"
-#include <basegfx/matrix/b2dhommatrixtools.hxx>
+#include <tools/prewin.h>
+#include <windows.h>
+#include <tools/postwin.h>
+
+#include <vcl/sysdata.hxx>
+
+#include "win/wincomp.hxx"
+#include "win/saldata.hxx"
+#include "win/salgdi.h"
 
+#include "outfont.hxx"
+#include "fontsubset.hxx"
+#include "sallayout.hxx"
+#include "outdev.h"         // for ImplGlyphFallbackFontSubstitution
 #include "sft.hxx"
 
 #ifdef GCP_KERN_HACK
diff --git a/vcl/win/source/gdi/salgdi_gdiplus.cxx b/vcl/win/source/gdi/salgdi_gdiplus.cxx
index 22c1b54559b6..3c55685f0aba 100644
--- a/vcl/win/source/gdi/salgdi_gdiplus.cxx
+++ b/vcl/win/source/gdi/salgdi_gdiplus.cxx
@@ -31,12 +31,14 @@
 
 #include <stdio.h>
 #include <string.h>
+
 #include <svsys.h>
-#include <wincomp.hxx>
-#include <saldata.hxx>
-#include <salgdi.h>
 #include <tools/debug.hxx>
 
+#include <win/wincomp.hxx>
+#include <win/saldata.hxx>
+#include <win/salgdi.h>
+
 #ifndef min
 #define min(a,b)    (((a) < (b)) ? (a) : (b))
 #endif
diff --git a/vcl/win/source/gdi/salnativewidgets-luna.cxx b/vcl/win/source/gdi/salnativewidgets-luna.cxx
index ccd378750580..09d214593a42 100644
--- a/vcl/win/source/gdi/salnativewidgets-luna.cxx
+++ b/vcl/win/source/gdi/salnativewidgets-luna.cxx
@@ -31,14 +31,16 @@
 
 #define _SV_SALNATIVEWIDGETS_CXX
 
-#include "svsys.h"
-#include "salgdi.h"
-#include "saldata.hxx"
-#include "vcl/svapp.hxx"
-
 #include "rtl/ustring.h"
+
 #include "osl/module.h"
 
+#include "vcl/svapp.hxx"
+
+#include "win/svsys.h"
+#include "win/salgdi.h"
+#include "win/saldata.hxx"
+
 #include "uxtheme.h"
 #include "vssym32.h"
 
diff --git a/vcl/win/source/gdi/salprn.cxx b/vcl/win/source/gdi/salprn.cxx
index 929fd8c8a644..e14e61f06870 100644
--- a/vcl/win/source/gdi/salprn.cxx
+++ b/vcl/win/source/gdi/salprn.cxx
@@ -32,24 +32,28 @@
 #define WINVER 0x0500
 
 #include <string.h>
+
 #include <svsys.h>
 
+#include <osl/module.h>
+
+#include <tools/urlobj.hxx>
+#include <tools/svwin.h>
 #ifdef __MINGW32__
 #include <excpt.h>
 #endif
 
-#include <osl/module.h>
-#include <wincomp.hxx>
-#include <saldata.hxx>
-#include <salinst.h>
-#include <salgdi.h>
-#include <salframe.h>
-#include <vcl/salptype.hxx>
-#include <salprn.h>
-#include <vcl/print.h>
-#include <vcl/jobset.h>
+#include <win/wincomp.hxx>
+#include <win/saldata.hxx>
+#include <win/salinst.h>
+#include <win/salgdi.h>
+#include <win/salframe.h>
+#include <win/salprn.h>
+
+#include <salptype.hxx>
+#include <print.h>
+#include <jobset.h>
 
-#include <tools/urlobj.hxx>
 #include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
 #include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
 #include <com/sun/star/ui/dialogs/XFilePicker.hpp>
diff --git a/vcl/win/source/gdi/salvd.cxx b/vcl/win/source/gdi/salvd.cxx
index 417c7e1f4952..564a50d71ebb 100644..100755
--- a/vcl/win/source/gdi/salvd.cxx
+++ b/vcl/win/source/gdi/salvd.cxx
@@ -28,14 +28,17 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
+
 #include <svsys.h>
-#include <wincomp.hxx>
-#include <saldata.hxx>
-#include <salinst.h>
-#include <salgdi.h>
-#include <salvd.h>
+
 #include <vcl/sysdata.hxx>
 
+#include <win/wincomp.hxx>
+#include <win/saldata.hxx>
+#include <win/salinst.h>
+#include <win/salgdi.h>
+#include <win/salvd.h>
+
 // =======================================================================
 
 static HBITMAP ImplCreateVirDevBitmap( HDC hDC, long nDX, long nDY,
diff --git a/vcl/win/source/gdi/winlayout.cxx b/vcl/win/source/gdi/winlayout.cxx
index 02ceb2b90c96..429b3f082217 100644
--- a/vcl/win/source/gdi/winlayout.cxx
+++ b/vcl/win/source/gdi/winlayout.cxx
@@ -30,20 +30,21 @@
 #include "precompiled_vcl.hxx"
 
 #include <svsys.h>
-
-#include "salgdi.h"
-#include "saldata.hxx"
-// for GetMirroredChar
-#include "sft.hxx"
-
-#include "vcl/sallayout.hxx"
-#include "vcl/svapp.hxx"
-
 #include "rtl/ustring.hxx"
 
 #include "osl/module.h"
 #include "osl/file.h"
 
+#include "tools/svwin.h"
+
+#include "vcl/svapp.hxx"
+
+#include "win/salgdi.h"
+#include "win/saldata.hxx"
+
+// for GetMirroredChar
+#include "sft.hxx"
+#include "sallayout.hxx"
 
 #include <cstdio>
 #include <malloc.h>
@@ -72,8 +73,8 @@ typedef std::set<int> IntSet;
 // Graphite headers
 #ifdef ENABLE_GRAPHITE
 #include <i18npool/mslangid.hxx>
-#include <vcl/graphite_layout.hxx>
-#include <vcl/graphite_features.hxx>
+#include <graphite_layout.hxx>
+#include <graphite_features.hxx>
 #endif
 
 #define DROPPED_OUTGLYPH 0xFFFF
diff --git a/vcl/win/source/src/MAKEFILE.MK b/vcl/win/source/src/MAKEFILE.MK
deleted file mode 100644
index 7addba363481..000000000000
--- a/vcl/win/source/src/MAKEFILE.MK
+++ /dev/null
@@ -1,130 +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=salsrc
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile2.pmk
-
-# --- #105371#
-CFLAGS += -DWINVER=0x0400
-
-# --- Files --------------------------------------------------------
-
-RCDEPN= 	nullptr.cur 		\
-            help.cur			\
-            hsize.cur			\
-            vsize.cur			\
-            neswsize.cur		\
-            nwsesize.cur		\
-            cross.cur			\
-            move.cur			\
-            hsplit.cur			\
-            vsplit.cur			\
-            hsizebar.cur		\
-            vsizebar.cur		\
-            hand.cur			\
-            refhand.cur 		\
-            pen.cur 			\
-            magnify.cur 		\
-            fill.cur			\
-            rotate.cur			\
-            hshear.cur			\
-            vshear.cur			\
-            mirror.cur			\
-            crook.cur			\
-            crop.cur			\
-            movept.cur			\
-            movebw.cur			\
-            movedata.cur		\
-            copydata.cur		\
-            linkdata.cur		\
-            movedlnk.cur		\
-            copydlnk.cur		\
-            movef.cur			\
-            copyf.cur			\
-            linkf.cur			\
-            moveflnk.cur		\
-            copyflnk.cur		\
-            movef2.cur			\
-            copyf2.cur			\
-            notallow.cur		\
-            dline.cur			\
-            drect.cur			\
-            dpolygon.cur		\
-            dbezier.cur 		\
-            darc.cur			\
-            dpie.cur			\
-            dcirccut.cur		\
-            dellipse.cur		\
-            dfree.cur			\
-            dconnect.cur		\
-            dtext.cur			\
-            dcapt.cur			\
-            chart.cur			\
-            detectiv.cur		\
-            pivotcol.cur		\
-            pivotrow.cur		\
-            pivotfld.cur		\
-            pivotdel.cur		\
-            chain.cur			\
-            chainnot.cur		\
-            timemove.cur		\
-            timesize.cur		\
-            asn.cur 			\
-            ass.cur 			\
-            asw.cur 			\
-            ase.cur 			\
-            asnw.cur			\
-            asne.cur			\
-            assw.cur			\
-            asse.cur			\
-            asns.cur			\
-            aswe.cur			\
-            asnswe.cur			\
-            airbrush.cur		\
-            vtext.cur			\
-                        tblsels.cur                     \
-                        tblsele.cur                     \
-                        tblselse.cur                     \
-                        tblselw.cur                     \
-                        tblselsw.cur                     \
-                        pntbrsh.cur                  \
-                        50.bmp                          \
-            sd.ico
-
-RCFILES=	salsrc.rc
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :	target.mk
diff --git a/vcl/win/source/src/salsrc.rc b/vcl/win/source/src/salsrc.rc
index 1db1bfc910cf..11b967ff475b 100644..100755
--- a/vcl/win/source/src/salsrc.rc
+++ b/vcl/win/source/src/salsrc.rc
@@ -29,7 +29,7 @@
 #include <windows.h>
 
 #ifndef _SV_SALIDS_HRC
-#include <salids.hrc>
+#include <win/salids.hrc>
 #endif
 
 SAL_RESID_POINTER_NULL				CURSOR		NULLPTR.CUR
diff --git a/vcl/win/source/window/MAKEFILE.MK b/vcl/win/source/window/MAKEFILE.MK
deleted file mode 100644
index cecfbcf5b2e5..000000000000
--- a/vcl/win/source/window/MAKEFILE.MK
+++ /dev/null
@@ -1,60 +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
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :	settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile2.pmk
-
-# --- #105371#
-CDEFS +=-U_WIN32_WINNT -D_WIN32_WINNT=0x0501
-
-# --- Files --------------------------------------------------------
-
-SLOFILES=   \
-            $(SLO)$/salframe.obj   \
-            $(SLO)$/salmenu.obj    \
-            $(SLO)$/salobj.obj
-
-.IF "$(COM)"=="GCC"
-EXCEPTIONSFILES=   $(SLO)$/salframe.obj
-.ENDIF
-
-.IF "$(ENABLE_GRAPHITE)" == "TRUE"
-CFLAGS+=-DENABLE_GRAPHITE
-.ENDIF
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :	target.mk
diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx
index 39e28d49a437..bff9d136fe84 100644
--- a/vcl/win/source/window/salframe.cxx
+++ b/vcl/win/source/window/salframe.cxx
@@ -51,38 +51,42 @@
 #ifdef __MINGW32__
 #include <excpt.h>
 #endif
+
 #include <rtl/string.h>
 #include <rtl/ustring.h>
 
 #include <osl/module.h>
+
 #include <tools/debug.hxx>
 
-// Warning in SDK header
-#if defined(_MSC_VER) && (_MSC_VER > 1400)
-#pragma warning( disable: 4242 4244 )
-#endif
-#include <wincomp.hxx>
-#include <salids.hrc>
 #include <vcl/sysdata.hxx>
-#include <saldata.hxx>
-#include <salinst.h>
-#include <salbmp.h>
-#include <salgdi.h>
-#include <salsys.h>
-#include <salframe.h>
-#include <salvd.h>
-#include <salmenu.h>
-#include <salobj.h>
-#include <vcl/impbmp.hxx>
 #include <vcl/timer.hxx>
-#include <saltimer.h>
 #include <vcl/settings.hxx>
 #include <vcl/keycodes.hxx>
-#include <vcl/window.h>
 #include <vcl/window.hxx>
 #include <vcl/wrkwin.hxx>
-#include <vcl/sallayout.hxx>
 #include <vcl/svapp.hxx>
+
+// Warning in SDK header
+#if defined(_MSC_VER) && (_MSC_VER > 1400)
+#pragma warning( disable: 4242 4244 )
+#include <win/wincomp.hxx>
+#include <win/salids.hrc>
+#include <win/saldata.hxx>
+#include <win/salinst.h>
+#include <win/salbmp.h>
+#include <win/salgdi.h>
+#include <win/salsys.h>
+#include <win/salframe.h>
+#include <win/salvd.h>
+#include <win/salmenu.h>
+#include <win/salobj.h>
+#include <win/saltimer.h>
+
+#include <impbmp.hxx>
+#include <window.h>
+#include <sallayout.hxx>
+
 #define COMPILE_MULTIMON_STUBS
 #include <multimon.h>
 #include <vector>
diff --git a/vcl/win/source/window/salmenu.cxx b/vcl/win/source/window/salmenu.cxx
index dcdf8fb7ae2a..aa81ee4f44f9 100644
--- a/vcl/win/source/window/salmenu.cxx
+++ b/vcl/win/source/window/salmenu.cxx
@@ -28,16 +28,20 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
+
 #include <svsys.h>
-#include <wincomp.hxx>
-#include <saldata.hxx>
-#include <salinst.h>
-#include <vcl/salgdi.hxx>
-#include <salmenu.h>
+
 #include <vcl/menu.hxx>
 #include <vcl/sysdata.hxx>
-#include <salframe.h>
-#include <vcl/impbmp.hxx>
+
+#include <win/wincomp.hxx>
+#include <win/saldata.hxx>
+#include <win/salinst.h>
+#include <win/salframe.h>
+#include <win/salmenu.h>
+
+#include <impbmp.hxx>
+#include <salgdi.hxx>
 
 // uncomment the following line to have ownerdrawn menues, ie, with bitmaps
 // however, this is incompatible with OLE inplace editing
diff --git a/vcl/win/source/window/salobj.cxx b/vcl/win/source/window/salobj.cxx
index c0965c298f63..7cb00aba1c7e 100644..100755
--- a/vcl/win/source/window/salobj.cxx
+++ b/vcl/win/source/window/salobj.cxx
@@ -32,14 +32,17 @@
 #include <string.h>
 
 #include <svsys.h>
-#include <wincomp.hxx>
-#include <saldata.hxx>
-#include <salinst.h>
-#include <salframe.h>
-#include <salobj.h>
 #include <tools/debug.hxx>
+#include <tools/svwin.h>
+
 #include <vcl/svapp.hxx>
 
+#include <win/wincomp.hxx>
+#include <win/saldata.hxx>
+#include <win/salinst.h>
+#include <win/salframe.h>
+#include <win/salobj.h>
+
 // =======================================================================
 
 static sal_Bool ImplIsSysWindowOrChild( HWND hWndParent, HWND hWndChild )