703 files changed, 3679 insertions, 6707 deletions

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..f98be027fa1d
--- /dev/null
+++ b/vcl/Library_desktop_detector.mk
@@ -0,0 +1,85 @@
+#*************************************************************************
+#
+# 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/stl \
+    -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 \
+    stl \
+    cppu \
+    sal \
+    vos3 \
+    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..d2a02a888513
--- /dev/null
+++ b/vcl/Library_vcl.mk
@@ -0,0 +1,489 @@
+#*************************************************************************
+#
+# 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))
+else ifeq ($(OS),WNT)
+$(eval $(call gb_Library_set_componentfile,vcl,vcl/vcl.windows))
+else
+$(eval $(call gb_Library_set_componentfile,vcl,vcl/vcl.unx))
+endif
+
+$(eval $(call gb_Library_add_package_headers,vcl,vcl_inc))
+
+#$(eval $(call gb_Library_add_precompiled_header,vcl,$(SRCDIR)/vcl/inc/pch/precompiled_vcl))
+
+$(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/stl \
+    -I$(OUTDIR)/inc \
+))
+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=\"$(or $(call gb_Library_get_dllname,cui),$(call gb_Library_get_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 \
+    stl \
+    cppu \
+    sal \
+    vos3 \
+))
+
+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_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 \
+))
+
+### FIXME: need to link windows resources to vcl dll
+endif
+
+$(eval $(call gb_Library_add_cobjects,vcl,\
+    vcl/source/fontsubset/list \
+))
+$(eval $(call gb_Library_add_exception_objects,vcl,\
+    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/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/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/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/salgdilayout \
+    vcl/source/gdi/sallayout \
+    vcl/source/gdi/salmisc \
+    vcl/source/gdi/salnativewidgets-none \
+    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_cache \
+    vcl/source/glyphs/graphite_features \
+    vcl/source/glyphs/graphite_layout \
+    vcl/source/glyphs/graphite_textsrc \
+))
+ifeq ($(GUIBASE),unx)
+$(eval $(call gb_Library_add_exception_objects,vcl,\
+    vcl/source/glyphs/graphite_adaptors \
+    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,\
+    graphite \
+))
+endif
+endif
+endif
+
+ifeq ($(OS),LINUX)
+$(eval $(call gb_Library_add_linked_libs,vcl,\
+    dl \
+    m \
+    pthread \
+))
+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_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 100644
index 000000000000..7d534aa211a3
--- /dev/null
+++ b/vcl/Library_vclplug_gen.mk
@@ -0,0 +1,205 @@
+#*************************************************************************
+#
+# 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_add_package_headers,vcl,vcl_inc))
+
+$(eval $(call gb_Library_add_precompiled_header,vclplug_gen,$(SRCDIR)/vcl/inc/pch/precompiled_vcl))
+
+$(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/stl \
+    -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 \
+    stl \
+    cppu \
+    sal \
+    vos3 \
+    X11 \
+    Xext \
+    SM \
+    ICE \
+))
+
+$(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=\"$(gb_Library_SYSPRE)spa$(gb_Library_OOOEXT)\" \
+    -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) \
+))
+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 100644
index 000000000000..d0df791bad7d
--- /dev/null
+++ b/vcl/Library_vclplug_gtk.mk
@@ -0,0 +1,130 @@
+#*************************************************************************
+#
+# 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_add_package_headers,vcl,vcl_inc))
+
+$(eval $(call gb_Library_add_precompiled_header,vclplug_gtk,$(SRCDIR)/vcl/inc/pch/precompiled_vcl))
+
+$(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/stl \
+    -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)\
+))
+
+$(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 \
+    stl \
+    cppu \
+    sal \
+    vos3 \
+    X11 \
+    Xext \
+    SM \
+    ICE \
+))
+
+$(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 100644
index 000000000000..560898d94ed7
--- /dev/null
+++ b/vcl/Library_vclplug_kde.mk
@@ -0,0 +1,97 @@
+#*************************************************************************
+#
+# 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_add_package_headers,vcl,vcl_inc))
+
+$(eval $(call gb_Library_add_precompiled_header,vclplug_kde,$(SRCDIR)/vcl/inc/pch/precompiled_vcl))
+
+$(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/stl \
+    -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 \
+    stl \
+    cppu \
+    sal \
+    vos3 \
+    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 100644
index 000000000000..ad1c5530ce79
--- /dev/null
+++ b/vcl/Library_vclplug_kde4.mk
@@ -0,0 +1,103 @@
+#*************************************************************************
+#
+# 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_add_package_headers,vcl,vcl_inc))
+
+$(eval $(call gb_Library_add_precompiled_header,vclplug_kde4,$(SRCDIR)/vcl/inc/pch/precompiled_vcl))
+
+$(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/stl \
+    -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 \
+    stl \
+    cppu \
+    sal \
+    vos3 \
+    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 100644
index 000000000000..845b0c93d320
--- /dev/null
+++ b/vcl/Library_vclplug_svp.mk
@@ -0,0 +1,101 @@
+#*************************************************************************
+#
+# 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_add_package_headers,vcl,vcl_inc))
+
+$(eval $(call gb_Library_add_precompiled_header,vclplug_svp,$(SRCDIR)/vcl/inc/pch/precompiled_vcl))
+
+$(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/stl \
+    -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 \
+    tl \
+    utl \
+    sot \
+    ucbhelper \
+    basegfx \
+    basebmp \
+    comphelper \
+    cppuhelper \
+    icuuc \
+    icule \
+    i18nisolang1 \
+    i18npaper \
+    i18nutil \
+    jvmaccess \
+    stl \
+    cppu \
+    sal \
+    vos3 \
+    X11 \
+    Xext \
+    SM \
+    ICE \
+))
+
+$(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 2043504450e7..ff35aadd574c 100644
--- a/vcl/aqua/source/res/makefile.mk
+++ b/vcl/Module_vcl.mk
@@ -25,30 +25,45 @@
 #
 #*************************************************************************
 
-PRJ=..$/..$/..
-TARGET=aquares
 
-# --- Settings -------------------------------------------------
+$(eval $(call gb_Module_Module,vcl))
 
-.INCLUDE :	settings.mk
+$(eval $(call gb_Module_add_targets,vcl,\
+    Library_vcl \
+    Package_inc \
+    StaticLibrary_vclmain \
+    AllLangResTarget_vcl \
+))
 
-# --- Files ----------------------------------------------------
+ifeq ($(GUIBASE),unx)
+$(eval $(call gb_Module_add_targets,vcl,\
+    Library_vclplug_gen \
+    Library_vclplug_svp \
+    Library_desktop_detector \
+))
 
-.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
-#ZIP1DIR = 
-ZIP1LIST = MainMenu.nib/*.nib cursors/*.png
-
-# --- Targets --------------------------------------------------
-
-.INCLUDE : target.mk
-
-.ENDIF		# "$(OS)"!="MACOSX"	
 
+# vim: set noet sw=4 ts=4:
diff --git a/vcl/Package_inc.mk b/vcl/Package_inc.mk
new file mode 100644
index 000000000000..f3177b01c5dd
--- /dev/null
+++ b/vcl/Package_inc.mk
@@ -0,0 +1,164 @@
+#*************************************************************************
+#
+# 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/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/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/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..414479a88fed 100644
--- a/vcl/util/target.pmk
+++ b/vcl/Package_osx.mk
@@ -14,26 +14,23 @@
 #
 # 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)
+### 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))
 
-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"
+/$(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/aqua/source/app/makefile.mk b/vcl/StaticLibrary_vclmain.mk
index a0ddcbc02226..9e6275f345d5 100644..100755
--- a/vcl/aqua/source/app/makefile.mk
+++ b/vcl/StaticLibrary_vclmain.mk
@@ -14,50 +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_StaticLibrary_StaticLibrary,vclmain))
 
-PRJNAME=vcl
-TARGET=salapp
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-ENABLE_EXCEPTIONS=TRUE
+$(eval $(call gb_StaticLibrary_add_package_headers,vclmain,vcl_inc))
 
-# --- Settings -----------------------------------------------------
+$(eval $(call gb_StaticLibrary_add_exception_objects,vclmain,\
+    vcl/source/salmain/salmain \
+))
 
-.INCLUDE :  settings.mk
-.INCLUDE :	$(PRJ)$/util$/makefile2.pmk
+# 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)))
 
-# --- Files --------------------------------------------------------
+$(OUTDIR)/lib/$(1) : $(call gb_CxxObject_get_target,vcl/source/salmain/salmain)
+    $$(call gb_Deliver_deliver,$$<,$$@)
 
-.IF "$(GUIBASE)"!="aqua"
+endef
 
-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
+ifeq ($(OS),WNT)
+$(eval $(call StaticLibrary_salmain_hack,salmain.obj))
+else
+$(eval $(call StaticLibrary_salmain_hack,salmain.o))
+endif
 
+# vim: set noet sw=4 ts=4:
diff --git a/vcl/aqua/source/a11y/aqua11yactionwrapper.h b/vcl/aqua/source/a11y/aqua11yactionwrapper.h
index 3a7f13f8a545..94388a98e3c3 100644
--- a/vcl/aqua/source/a11y/aqua11yactionwrapper.h
+++ b/vcl/aqua/source/a11y/aqua11yactionwrapper.h
@@ -28,8 +28,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 6d44f62b5611..a1a3fbab5ce3 100644
--- a/vcl/aqua/source/a11y/aqua11ycomponentwrapper.h
+++ b/vcl/aqua/source/a11y/aqua11ycomponentwrapper.h
@@ -28,8 +28,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 9ac9401abd62..1a7c72eac9ec 100644
--- a/vcl/aqua/source/a11y/aqua11yfocuslistener.cxx
+++ b/vcl/aqua/source/a11y/aqua11yfocuslistener.cxx
@@ -28,12 +28,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 1fdd340c698e..db114be14771 100644
--- a/vcl/aqua/source/a11y/aqua11yfocuslistener.hxx
+++ b/vcl/aqua/source/a11y/aqua11yfocuslistener.hxx
@@ -30,8 +30,8 @@
 
 #include <salhelper/refobj.hxx>
 
-#include "keyboardfocuslistener.hxx"
-#include "aquavcltypes.h"
+#include "aqua/keyboardfocuslistener.hxx"
+#include "aqua/aquavcltypes.h"
 
 // #include <com/sun/star/accessibility/XAccessibleContext.hpp>
 
diff --git a/vcl/aqua/source/a11y/aqua11yfocustracker.cxx b/vcl/aqua/source/a11y/aqua11yfocustracker.cxx
index 2a8ebb39bd80..c901eea915a6 100644
--- a/vcl/aqua/source/a11y/aqua11yfocustracker.cxx
+++ b/vcl/aqua/source/a11y/aqua11yfocustracker.cxx
@@ -28,7 +28,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>
@@ -37,11 +43,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 7f680f43b3a6..4ce39da6c2bf 100644
--- a/vcl/aqua/source/a11y/aqua11ylistener.cxx
+++ b/vcl/aqua/source/a11y/aqua11ylistener.cxx
@@ -25,12 +25,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>
diff --git a/vcl/aqua/source/a11y/aqua11yrolehelper.h b/vcl/aqua/source/a11y/aqua11yrolehelper.h
index f847eb3f41c3..c15c39903432 100644
--- a/vcl/aqua/source/a11y/aqua11yrolehelper.h
+++ b/vcl/aqua/source/a11y/aqua11yrolehelper.h
@@ -28,7 +28,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 bf290990faa2..20bb99938ef0 100644
--- a/vcl/aqua/source/a11y/aqua11yselectionwrapper.h
+++ b/vcl/aqua/source/a11y/aqua11yselectionwrapper.h
@@ -28,8 +28,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 9368c599d131..1330424df739 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;
diff --git a/vcl/aqua/source/a11y/aqua11ytablewrapper.h b/vcl/aqua/source/a11y/aqua11ytablewrapper.h
index 7bf3e44a2945..ed70ed219b6e 100644
--- a/vcl/aqua/source/a11y/aqua11ytablewrapper.h
+++ b/vcl/aqua/source/a11y/aqua11ytablewrapper.h
@@ -28,7 +28,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 fcf185ca5478..0aa271a7f1e2 100644
--- a/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.h
+++ b/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.h
@@ -28,8 +28,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 60b12c762b25..948e0dfa95aa 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 b132bdd0f12a..34ba1611b7b3 100644
--- a/vcl/aqua/source/a11y/aqua11ytextwrapper.h
+++ b/vcl/aqua/source/a11y/aqua11ytextwrapper.h
@@ -28,8 +28,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..d4c27812de63 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>
 
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 1dbafe33baea..35573f855549 100644
--- a/vcl/aqua/source/a11y/aqua11yvaluewrapper.h
+++ b/vcl/aqua/source/a11y/aqua11yvaluewrapper.h
@@ -28,9 +28,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..ce2db7745c30 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>
diff --git a/vcl/aqua/source/a11y/aqua11ywrapperbutton.h b/vcl/aqua/source/a11y/aqua11ywrapperbutton.h
index aa35062d15c4..78c54e2c35ea 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapperbutton.h
+++ b/vcl/aqua/source/a11y/aqua11ywrapperbutton.h
@@ -28,7 +28,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 b1c5fc751e52..e1016a6fe551 100644
--- a/vcl/aqua/source/a11y/aqua11ywrappercheckbox.h
+++ b/vcl/aqua/source/a11y/aqua11ywrappercheckbox.h
@@ -28,7 +28,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 e18da11dd0ad..c9b71585aea3 100644
--- a/vcl/aqua/source/a11y/aqua11ywrappercombobox.h
+++ b/vcl/aqua/source/a11y/aqua11ywrappercombobox.h
@@ -28,7 +28,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 7757e067ee22..bdbfb6e6b264 100644
--- a/vcl/aqua/source/a11y/aqua11ywrappergroup.h
+++ b/vcl/aqua/source/a11y/aqua11ywrappergroup.h
@@ -28,7 +28,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 95df8323467b..db9bf7511af6 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapperlist.h
+++ b/vcl/aqua/source/a11y/aqua11ywrapperlist.h
@@ -28,7 +28,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 3fc6558c633c..276f1c162e8c 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapperradiobutton.h
+++ b/vcl/aqua/source/a11y/aqua11ywrapperradiobutton.h
@@ -28,7 +28,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 544b709223b3..4c138372e27e 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapperradiogroup.h
+++ b/vcl/aqua/source/a11y/aqua11ywrapperradiogroup.h
@@ -28,7 +28,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 252af6f5987f..deaa4f07248f 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapperrow.h
+++ b/vcl/aqua/source/a11y/aqua11ywrapperrow.h
@@ -28,7 +28,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 2c206fd0904b..e1e37a45d36e 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapperscrollarea.h
+++ b/vcl/aqua/source/a11y/aqua11ywrapperscrollarea.h
@@ -28,7 +28,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 1070c682cd5e..df57418803fa 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapperscrollbar.h
+++ b/vcl/aqua/source/a11y/aqua11ywrapperscrollbar.h
@@ -28,7 +28,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 084a72ea7a18..a114e6fb7a74 100644
--- a/vcl/aqua/source/a11y/aqua11ywrappersplitter.h
+++ b/vcl/aqua/source/a11y/aqua11ywrappersplitter.h
@@ -28,7 +28,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 c21e5573d125..aef2957557d4 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapperstatictext.h
+++ b/vcl/aqua/source/a11y/aqua11ywrapperstatictext.h
@@ -28,7 +28,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 be72b9e27396..7fda77789015 100644
--- a/vcl/aqua/source/a11y/aqua11ywrappertabgroup.h
+++ b/vcl/aqua/source/a11y/aqua11ywrappertabgroup.h
@@ -28,7 +28,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 724f85994053..e47795d976b3 100644
--- a/vcl/aqua/source/a11y/aqua11ywrappertextarea.h
+++ b/vcl/aqua/source/a11y/aqua11ywrappertextarea.h
@@ -28,7 +28,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 e7ac0a25acec..4ab947484cc4 100644
--- a/vcl/aqua/source/a11y/aqua11ywrappertoolbar.h
+++ b/vcl/aqua/source/a11y/aqua11ywrappertoolbar.h
@@ -28,7 +28,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 863bc59d173f..3f02d3fc0ada 100644
--- a/vcl/aqua/source/a11y/documentfocuslistener.hxx
+++ b/vcl/aqua/source/a11y/documentfocuslistener.hxx
@@ -28,15 +28,12 @@
 #ifndef _DOCUMENTFOCUSLISTENER_HXX_
 #define _DOCUMENTFOCUSLISTENER_HXX_
 
-#ifndef _COM_SUN_STAR_ACCESSIBILITY_XACCESSIBLEEVENTLISTENER_HPP_
 #include <com/sun/star/accessibility/XAccessibleEventListener.hpp>
-#endif
 
-#ifndef _CPPUHELPER_IMPLBASE1_HXX_
 #include <cppuhelper/implbase1.hxx>
-#endif
 
-#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/saldata.cxx b/vcl/aqua/source/app/saldata.cxx
index 3cb878636ad3..7b8174e16703 100644
--- a/vcl/aqua/source/app/saldata.cxx
+++ b/vcl/aqua/source/app/saldata.cxx
@@ -28,9 +28,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 352396a7fb2b..f1a4fc1213c7 100644
--- a/vcl/aqua/source/app/salinst.cxx
+++ b/vcl/aqua/source/app/salinst.cxx
@@ -32,25 +32,30 @@
 
 #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 "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>
 
@@ -66,7 +71,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;
diff --git a/vcl/aqua/source/app/salnstimer.mm b/vcl/aqua/source/app/salnstimer.mm
index 73e49fd99c61..2f1f0158cc05 100755
--- a/vcl/aqua/source/app/salnstimer.mm
+++ b/vcl/aqua/source/app/salnstimer.mm
@@ -28,12 +28,12 @@
 // 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
diff --git a/vcl/aqua/source/app/salsys.cxx b/vcl/aqua/source/app/salsys.cxx
index cf5cf00b7fe4..21da319b42b7 100644
--- a/vcl/aqua/source/app/salsys.cxx
+++ b/vcl/aqua/source/app/salsys.cxx
@@ -29,14 +29,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 namespace rtl;
 
 // =======================================================================
diff --git a/vcl/aqua/source/app/saltimer.cxx b/vcl/aqua/source/app/saltimer.cxx
index 9abcc18bf6af..b482453704af 100644
--- a/vcl/aqua/source/app/saltimer.cxx
+++ b/vcl/aqua/source/app/saltimer.cxx
@@ -28,11 +28,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..f79414457452 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"
diff --git a/vcl/aqua/source/dtrans/DragSource.cxx b/vcl/aqua/source/dtrans/DragSource.cxx
index 62b153176893..1db6a3a848e1 100644
--- a/vcl/aqua/source/dtrans/DragSource.cxx
+++ b/vcl/aqua/source/dtrans/DragSource.cxx
@@ -27,10 +27,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"
 
@@ -38,9 +41,9 @@
 #include "DragSourceContext.hxx"
 #include "aqua_clipboard.hxx"
 #include "DragActionConversion.hxx"
-#include "salframe.h"
 
-#include <rtl/ustring.h>
+#include "aqua/salframe.h"
+
 #include <memory>
 
 
diff --git a/vcl/aqua/source/dtrans/aqua_service.cxx b/vcl/aqua/source/dtrans/aqua_service.cxx
deleted file mode 100644
index 57ef1f11175c..000000000000
--- a/vcl/aqua/source/dtrans/aqua_service.cxx
+++ /dev/null
@@ -1,86 +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.
- *
- ************************************************************************/
-
-// 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 rtl;
-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;
-
-namespace aqua {
-
-Reference< XInterface > SAL_CALL createInstance( const Reference< XMultiServiceFactory >& rServiceManager )
-{
-    return Reference< XInterface >( static_cast< XClipboard* >( new AquaClipboard(rServiceManager) ) );
-}
-
-} // namespace aqua
-
-extern "C"
-{
-
-void SAL_CALL component_getImplementationEnvironment(
-    const sal_Char ** ppEnvTypeName, uno_Environment ** ppEnv )
-{
-    *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-
-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"
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 222b5cf40e04..9af69045888d 100644
--- a/vcl/aqua/source/dtrans/service_entry.cxx
+++ b/vcl/aqua/source/dtrans/service_entry.cxx
@@ -28,13 +28,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 85c87c6b9ba9..000000000000
--- a/vcl/aqua/source/dtrans/test_aquacb.cxx
+++ /dev/null
@@ -1,208 +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.
- *
- ************************************************************************/
-
-// 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>
-
-#ifndef _CPPUHELPER_IMPLBASE1_HXX_
-#include <cppuhelper/implbase2.hxx>
-#endif
-#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::createFromAscii( "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 occured.
-    if ( !g_xFactory.is() )
-    {
-        OSL_ENSURE(sal_False, "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_ENSURE( sal_False, "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_ENSURE(sal_False, "Error shuting down");
-
-    // Dispose and clear factory
-    xComponent->dispose();
-    g_xFactory.clear();
-    g_xFactory = Reference< XMultiServiceFactory >();
-
-    return 0;
-}
diff --git a/vcl/aqua/source/gdi/aquaprintaccessoryview.mm b/vcl/aqua/source/gdi/aquaprintaccessoryview.mm
index 038f366b584c..ce3d6a9d3d98 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"
diff --git a/vcl/aqua/source/gdi/aquaprintview.mm b/vcl/aqua/source/gdi/aquaprintview.mm
index 11b4b9088591..947906ce4172 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
 {
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 9626e2fcbdce..1b505abd60d9 100755
--- a/vcl/aqua/source/gdi/salatslayout.cxx
+++ b/vcl/aqua/source/gdi/salatslayout.cxx
@@ -25,13 +25,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>
 
 // =======================================================================
diff --git a/vcl/aqua/source/gdi/salatsuifontutils.cxx b/vcl/aqua/source/gdi/salatsuifontutils.cxx
index 8281c41ceeab..61fcd78586b3 100644
--- a/vcl/aqua/source/gdi/salatsuifontutils.cxx
+++ b/vcl/aqua/source/gdi/salatsuifontutils.cxx
@@ -32,10 +32,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 e54c7edd6fe5..00ae72b4fa9e 100644
--- a/vcl/aqua/source/gdi/salbmp.cxx
+++ b/vcl/aqua/source/gdi/salbmp.cxx
@@ -28,19 +28,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"
 
 // =======================================================================
 
diff --git a/vcl/aqua/source/gdi/salcolorutils.cxx b/vcl/aqua/source/gdi/salcolorutils.cxx
index ec33b2dd8f8d..37b6ec65a108 100755
--- a/vcl/aqua/source/gdi/salcolorutils.cxx
+++ b/vcl/aqua/source/gdi/salcolorutils.cxx
@@ -28,9 +28,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 7a3a2a76f173..6275cfbcef1d 100644
--- a/vcl/aqua/source/gdi/salgdi.cxx
+++ b/vcl/aqua/source/gdi/salgdi.cxx
@@ -28,20 +28,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 "osl/file.hxx"
 #include "osl/process.h"
 
@@ -54,7 +40,23 @@
 #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 "sallayout.hxx"
+#include "sft.hxx"
+
 
 using namespace vcl;
 
diff --git a/vcl/aqua/source/gdi/salgdiutils.cxx b/vcl/aqua/source/gdi/salgdiutils.cxx
index 9bafb50d19fc..8daa456a03c2 100755
--- a/vcl/aqua/source/gdi/salgdiutils.cxx
+++ b/vcl/aqua/source/gdi/salgdiutils.cxx
@@ -28,20 +28,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"
 
 // ----------------------------------------------------------------------
 
diff --git a/vcl/aqua/source/gdi/salmathutils.cxx b/vcl/aqua/source/gdi/salmathutils.cxx
index 8df44acbf730..1a0011068194 100755
--- a/vcl/aqua/source/gdi/salmathutils.cxx
+++ b/vcl/aqua/source/gdi/salmathutils.cxx
@@ -28,7 +28,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 d2763411e039..b06bf753e54f 100644
--- a/vcl/aqua/source/gdi/salnativewidgets.cxx
+++ b/vcl/aqua/source/gdi/salnativewidgets.cxx
@@ -25,17 +25,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"
diff --git a/vcl/aqua/source/gdi/salprn.cxx b/vcl/aqua/source/gdi/salprn.cxx
index 0df146eef8fa..04098f68de67 100644
--- a/vcl/aqua/source/gdi/salprn.cxx
+++ b/vcl/aqua/source/gdi/salprn.cxx
@@ -28,17 +28,19 @@
 // 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 <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"
diff --git a/vcl/aqua/source/gdi/salvd.cxx b/vcl/aqua/source/gdi/salvd.cxx
index b40f5e602ebe..6e71fa482b21 100644
--- a/vcl/aqua/source/gdi/salvd.cxx
+++ b/vcl/aqua/source/gdi/salvd.cxx
@@ -28,15 +28,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,
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 676014be2277..7521dd7cc253 100644
--- a/vcl/aqua/source/window/salframe.cxx
+++ b/vcl/aqua/source/window/salframe.cxx
@@ -30,28 +30,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;
 
diff --git a/vcl/aqua/source/window/salframeview.mm b/vcl/aqua/source/window/salframeview.mm
index 783d203c76fd..1d5a50315adc 100755
--- a/vcl/aqua/source/window/salframeview.mm
+++ b/vcl/aqua/source/window/salframeview.mm
@@ -28,16 +28,17 @@
 // 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 "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 )
diff --git a/vcl/aqua/source/window/salmenu.cxx b/vcl/aqua/source/window/salmenu.cxx
index fa045776c448..fa5026abb245 100644
--- a/vcl/aqua/source/window/salmenu.cxx
+++ b/vcl/aqua/source/window/salmenu.cxx
@@ -25,21 +25,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;
 
diff --git a/vcl/aqua/source/window/salnsmenu.mm b/vcl/aqua/source/window/salnsmenu.mm
index 015c43aed70f..cd6f7e1e2f28 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"
  
diff --git a/vcl/aqua/source/window/salobj.cxx b/vcl/aqua/source/window/salobj.cxx
index 3df1347e3b10..bbbb85cd1351 100644
--- a/vcl/aqua/source/window/salobj.cxx
+++ b/vcl/aqua/source/window/salobj.cxx
@@ -30,9 +30,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"
 
 // =======================================================================
 
diff --git a/vcl/inc/vcl/accel.h b/vcl/inc/accel.h
index 284868748c89..284868748c89 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 553503380b15..553503380b15 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 30f355dd502c..30f355dd502c 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 1dbf68c4a5ef..1dbf68c4a5ef 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 461b149e4650..461b149e4650 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 44640966d760..44640966d760 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 391a9546f63a..391a9546f63a 100755
--- 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 8e03c59d0954..8e03c59d0954 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 7346282963d7..7346282963d7 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 71eba2f46c02..71eba2f46c02 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 81e60871ae86..81e60871ae86 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 c95c326f1548..0f86332ca761 100644
--- a/vcl/aqua/inc/salbmp.h
+++ b/vcl/inc/aqua/salbmp.h
@@ -29,16 +29,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 74ccb69756fd..74ccb69756fd 100755
--- 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 2046ec20a806..2046ec20a806 100755
--- 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 dd5df5751973..5dc528b04f4b 100644
--- a/vcl/aqua/inc/saldata.hxx
+++ b/vcl/inc/aqua/saldata.hxx
@@ -34,11 +34,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 6f9f61efda70..6f9f61efda70 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 06ca66f8803f..8852b538f537 100644
--- a/vcl/aqua/inc/salframe.h
+++ b/vcl/inc/aqua/salframe.h
@@ -28,14 +28,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 5e93839719b5..3277c52d4456 100755
--- a/vcl/aqua/inc/salframeview.h
+++ b/vcl/inc/aqua/salframeview.h
@@ -28,7 +28,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 8043f38defad..103e207a9b79 100644
--- a/vcl/aqua/inc/salgdi.h
+++ b/vcl/inc/aqua/salgdi.h
@@ -28,16 +28,16 @@
 #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 "aquavcltypes.h"
+#include "aqua/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 514876b0e1f4..62baaa2762f8 100644
--- a/vcl/aqua/inc/salinst.h
+++ b/vcl/inc/aqua/salinst.h
@@ -28,13 +28,13 @@
 #ifndef _SV_SALINST_H
 #define _SV_SALINST_H
 
-#include "vcl/sv.h"
 #include "vos/mutex.hxx"
 #include "vos/thread.hxx"
-#include "vcl/salinst.hxx"
 #include "osl/conditn.h"
 
-#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 6106dc328740..6106dc328740 100755
--- 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 63dfb6c48a91..6a83c4a7add3 100644
--- a/vcl/aqua/inc/salmenu.h
+++ b/vcl/inc/aqua/salmenu.h
@@ -32,8 +32,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 11d4ea5c1c62..11d4ea5c1c62 100755
--- 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 e9b2cbe922b8..e9b2cbe922b8 100755
--- 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 e29fef43b6b4..e29fef43b6b4 100755
--- 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 c411287a4686..423e63715065 100644
--- a/vcl/aqua/inc/salobj.h
+++ b/vcl/inc/aqua/salobj.h
@@ -28,9 +28,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 5458a5b51bd6..725fc9a43861 100644
--- a/vcl/aqua/inc/salprn.h
+++ b/vcl/inc/aqua/salprn.h
@@ -28,9 +28,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 ae20706a1756..dbb2ea0b20ea 100644
--- a/vcl/aqua/inc/salsys.h
+++ b/vcl/inc/aqua/salsys.h
@@ -28,8 +28,7 @@
 #ifndef _SV_SALSYS_H
 #define _SV_SALSYS_H
 
-#include "vcl/sv.h"
-#include "vcl/salsys.hxx"
+#include "salsys.hxx"
 
 #include <list>
 
@@ -37,10 +36,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 dacb9b09de39..f2840eee45ea 100644
--- a/vcl/aqua/inc/saltimer.h
+++ b/vcl/inc/aqua/saltimer.h
@@ -32,7 +32,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 949ad70d5b36..6f184167d22a 100644
--- a/vcl/aqua/inc/salvd.h
+++ b/vcl/inc/aqua/salvd.h
@@ -32,12 +32,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 1edce25cea28..1edce25cea28 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 f25593d335a7..f25593d335a7 100755
--- 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 de330704b74f..de330704b74f 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 7e1dfb6b0b39..7e1dfb6b0b39 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 6b719ef988ef..6b719ef988ef 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 0be0f5bd402e..0be0f5bd402e 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 0526a109a376..0526a109a376 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 5b91bd0713ec..5b91bd0713ec 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 5a41a20e4271..5a41a20e4271 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 b18748ed5791..b18748ed5791 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 a34212128741..a57f5f0fd553 100644
--- a/vcl/inc/vcl/fontsubset.hxx
+++ b/vcl/inc/fontsubset.hxx
@@ -32,9 +32,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 20c3f9aaa68e..a17018699d71 100644
--- a/vcl/inc/vcl/glyphcache.hxx
+++ b/vcl/inc/glyphcache.hxx
@@ -49,11 +49,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>
 
 // =======================================================================
 
diff --git a/vcl/inc/vcl/graphite_adaptors.hxx b/vcl/inc/graphite_adaptors.hxx
index ae2ff2962adb..4f78a8a0b13b 100644
--- a/vcl/inc/vcl/graphite_adaptors.hxx
+++ b/vcl/inc/graphite_adaptors.hxx
@@ -44,11 +44,11 @@
 #endif
 
 #ifndef _SV_SALGDI_HXX
-#include <vcl/salgdi.hxx>
+#include <salgdi.hxx>
 #endif
 
 #ifndef _SV_SALLAYOUT_HXX
-#include <vcl/sallayout.hxx>
+#include <sallayout.hxx>
 #endif
 
 // Module
diff --git a/vcl/inc/vcl/graphite_cache.hxx b/vcl/inc/graphite_cache.hxx
index af1392ed4d4b..af1392ed4d4b 100644
--- a/vcl/inc/vcl/graphite_cache.hxx
+++ b/vcl/inc/graphite_cache.hxx
diff --git a/vcl/inc/vcl/graphite_features.hxx b/vcl/inc/graphite_features.hxx
index 47b8f062e299..47b8f062e299 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 cd22abdcdb26..bbeaf21ecd60 100644
--- a/vcl/inc/vcl/graphite_layout.hxx
+++ b/vcl/inc/graphite_layout.hxx
@@ -48,7 +48,7 @@
 #include <graphite/SegmentAux.h>
 #include <postextstl.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 19eb70b11908..3980031cf7b6 100644
--- a/vcl/inc/vcl/graphite_serverfont.hxx
+++ b/vcl/inc/graphite_serverfont.hxx
@@ -32,8 +32,8 @@
 #define GR_NAMESPACE
 
 #ifndef MSC
-#include <vcl/graphite_layout.hxx>
-#include <vcl/graphite_adaptors.hxx>
+#include <graphite_layout.hxx>
+#include <graphite_adaptors.hxx>
 
 // Modules
 
diff --git a/vcl/inc/vcl/helpwin.hxx b/vcl/inc/helpwin.hxx
index a3fd0a81da36..a3fd0a81da36 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 93da741827eb..93da741827eb 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 b509464bae4e..b509464bae4e 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 6ae9ad3a9c4a..6ae9ad3a9c4a 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 778cc0f8f750..778cc0f8f750 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 c0ff0a080b17..c0ff0a080b17 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 7164952ea51b..7164952ea51b 100644
--- a/vcl/inc/vcl/impgraph.hxx
+++ b/vcl/inc/impgraph.hxx
diff --git a/vcl/inc/vcl/impimagetree.hxx b/vcl/inc/impimagetree.hxx
index 9649fe2f5ec8..9649fe2f5ec8 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 8b0e85021db9..8b0e85021db9 100644
--- a/vcl/inc/vcl/impoct.hxx
+++ b/vcl/inc/impoct.hxx
diff --git a/vcl/inc/vcl/impprn.hxx b/vcl/inc/impprn.hxx
index 883bd55c66be..883bd55c66be 100644
--- a/vcl/inc/vcl/impprn.hxx
+++ b/vcl/inc/impprn.hxx
diff --git a/vcl/inc/vcl/jobset.h b/vcl/inc/jobset.h
index 981194080ede..981194080ede 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 5d2852444767..5d2852444767 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 6ca85bff768a..50aee1fbe049 100644
--- a/vcl/inc/vcl/outdev.h
+++ b/vcl/inc/outdev.h
@@ -29,7 +29,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 f31e6590a315..f31e6590a315 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 78c1bb647575..66ab22d65570 100644
--- a/vcl/inc/vcl/print.h
+++ b/vcl/inc/print.h
@@ -31,6 +31,8 @@
 #include "vcl/sv.h"
 #include "vcl/dllapi.h"
 
+#include "rtl/ustring.hxx"
+
 #include <vector>
 #include <hash_map>
 
diff --git a/vcl/inc/vcl/prndlg.hxx b/vcl/inc/printdlg.hxx
index d21e517d12f7..d1bbc3030c18 100644
--- a/vcl/inc/vcl/prndlg.hxx
+++ b/vcl/inc/printdlg.hxx
@@ -30,9 +30,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 4198c9d5e86e..c11bfa867148 100644
--- a/vcl/inc/vcl/printergfx.hxx
+++ b/vcl/inc/printergfx.hxx
@@ -29,7 +29,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 cdf8745febcc..cdf8745febcc 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 b45ab91be149..b45ab91be149 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 e12d5a21152c..e12d5a21152c 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 a40cd045611c..ead0e0974713 100644
--- a/vcl/inc/vcl/saldatabasic.hxx
+++ b/vcl/inc/saldatabasic.hxx
@@ -28,10 +28,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 c5e9aba8d272..4576641dcd45 100644
--- a/vcl/inc/vcl/salframe.hxx
+++ b/vcl/inc/salframe.hxx
@@ -39,8 +39,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 e6d60e2b329c..e6d60e2b329c 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 3d59e6199fa7..3d59e6199fa7 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 779a75c9afaa..779a75c9afaa 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 e1ed7288651a..e1ed7288651a 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 e23090c42392..e23090c42392 100755
--- 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 ab9f44922aa8..ab9f44922aa8 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 649058289699..81078dcdcaf1 100644
--- a/vcl/inc/vcl/salobj.hxx
+++ b/vcl/inc/salobj.hxx
@@ -31,7 +31,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 ae21a8a5b438..ae21a8a5b438 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 136821b76855..136821b76855 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 2da1ae551074..2da1ae551074 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 310b0a27e30f..310b0a27e30f 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 13b85d609e9e..73fe3a13fd02 100644
--- a/vcl/inc/vcl/saltimer.hxx
+++ b/vcl/inc/saltimer.hxx
@@ -30,7 +30,7 @@
 
 #include <vcl/sv.h>
 #include <vcl/dllapi.h>
-#include <vcl/salwtype.hxx>
+#include <salwtype.hxx>
 
 // ------------
 // - SalTimer -
diff --git a/vcl/inc/vcl/salvd.hxx b/vcl/inc/salvd.hxx
index 6aa3222c5d96..6aa3222c5d96 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 55753465a860..55753465a860 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 88ba2844e1e0..7758545dd37c 100644
--- a/vcl/inc/sft.hxx
+++ b/vcl/inc/sft.hxx
@@ -68,6 +68,8 @@
 
 #include <sal/types.h>
 
+#include "vcl/dllapi.h"
+
 #include <vector>
 
 namespace vcl
@@ -286,7 +288,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) && !defined(OS2)
 /**
  * TrueTypeFont constructor.
@@ -297,14 +299,14 @@ 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
 
 /**
  * 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
@@ -505,7 +507,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 3ea1eaffa864..3ea1eaffa864 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 24d85c873572..24d85c873572 100644
--- a/vcl/inc/vcl/svdata.hxx
+++ b/vcl/inc/svdata.hxx
diff --git a/vcl/inc/vcl/svids.hrc b/vcl/inc/svids.hrc
index 432a30c3a748..432a30c3a748 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 183cb5ac9b0f..183cb5ac9b0f 100755
--- 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 4fd3238647d0..4fd3238647d0 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 b00634090b5d..b00634090b5d 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 804b3ffa98cc..804b3ffa98cc 100644
--- a/vcl/unx/inc/Xproto.h
+++ b/vcl/inc/unx/Xproto.h
diff --git a/vcl/unx/inc/cdeint.hxx b/vcl/inc/unx/cdeint.hxx
index 91cbf33caf47..572f358955c1 100644
--- a/vcl/unx/inc/cdeint.hxx
+++ b/vcl/inc/unx/cdeint.hxx
@@ -27,7 +27,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 ebe2cae90803..ebe2cae90803 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 959b3aec1fb1..9d51ed0cc194 100644
--- a/vcl/unx/inc/plugins/gtk/atkbridge.hxx
+++ b/vcl/inc/unx/gtk/atkbridge.hxx
@@ -28,9 +28,9 @@
 #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 b650cffbae8b..bba4399b76c5 100644
--- a/vcl/unx/inc/plugins/gtk/gtkdata.hxx
+++ b/vcl/inc/unx/gtk/gtkdata.hxx
@@ -34,8 +34,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 1ddc9e24e4f1..d03537361056 100644
--- a/vcl/unx/inc/plugins/gtk/gtkframe.hxx
+++ b/vcl/inc/unx/gtk/gtkframe.hxx
@@ -35,7 +35,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 0b4439e6881f..d80f109e3e21 100644
--- a/vcl/unx/inc/plugins/gtk/gtkgdi.hxx
+++ b/vcl/inc/unx/gtk/gtkgdi.hxx
@@ -34,7 +34,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 a9f788831199..40e18b41f7dc 100644
--- a/vcl/unx/inc/plugins/gtk/gtkinst.hxx
+++ b/vcl/inc/unx/gtk/gtkinst.hxx
@@ -28,8 +28,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 67434f038617..18c2fa95d13d 100644
--- a/vcl/unx/inc/plugins/gtk/gtkobject.hxx
+++ b/vcl/inc/unx/gtk/gtkobject.hxx
@@ -30,8 +30,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 97fd7f1fb6c8..3a84aa2667c1 100644
--- a/vcl/unx/inc/i18n_cb.hxx
+++ b/vcl/inc/unx/i18n_cb.hxx
@@ -27,7 +27,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 977d7f3e3a6f..977d7f3e3a6f 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 a22a57b976c8..c54749772dd3 100644
--- a/vcl/unx/inc/i18n_im.hxx
+++ b/vcl/inc/unx/i18n_im.hxx
@@ -28,13 +28,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 641d00dc02c0..641d00dc02c0 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 7202cf6e0eef..46e4e48f76e1 100644
--- a/vcl/unx/inc/i18n_status.hxx
+++ b/vcl/inc/unx/i18n_status.hxx
@@ -32,10 +32,9 @@
 #include <tools/link.hxx>
 #include <tools/gen.hxx>
 
-#ifndef _RTL_USTRING_HXX
 #include <rtl/ustring.hxx>
-#endif
-#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 db6517cbea0b..2d75ea6f7d23 100644
--- a/vcl/unx/inc/i18n_xkb.hxx
+++ b/vcl/inc/unx/i18n_xkb.hxx
@@ -29,9 +29,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 210799493638..1f23da40a3f8 100644
--- a/vcl/unx/inc/plugins/kde/kdedata.hxx
+++ b/vcl/inc/unx/kde/kdedata.hxx
@@ -28,9 +28,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 143c628eb178..c46e59e63fad 100644
--- a/vcl/unx/inc/pspgraphics.h
+++ b/vcl/inc/unx/pspgraphics.h
@@ -30,9 +30,10 @@
 
 
 #include "vcl/fontmanager.hxx"
-#include "vcl/salgdi.hxx"
-#include "vcl/sallayout.hxx"
-#include "vcl/dllapi.h"
+
+#include "vclpluginapi.h"
+#include "salgdi.hxx"
+#include "sallayout.hxx"
 
 namespace psp { struct JobData; class PrinterGfx; }
 
@@ -40,7 +41,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 121966345f75..d5ecdec34961 100644
--- a/vcl/unx/inc/salbmp.h
+++ b/vcl/inc/unx/salbmp.h
@@ -28,13 +28,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;
@@ -46,7 +46,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 42240237a5ec..ac26f81548b4 100644
--- a/vcl/unx/inc/saldata.hxx
+++ b/vcl/inc/unx/saldata.hxx
@@ -30,14 +30,14 @@
 
 // -=-= 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>
 #ifndef _OSL_MODULE_H
 #include <osl/module.h>
 #endif
-#include <vcl/dllapi.h>
+#include <vclpluginapi.h>
 
 // -=-= forwards -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 class SalXLib;
@@ -55,7 +55,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 42d1f820acff..2117f43e1a2b 100644
--- a/vcl/unx/inc/saldisp.hxx
+++ b/vcl/inc/unx/saldisp.hxx
@@ -35,7 +35,7 @@ class   SalVisual;
 class   SalXLib;
 
 // -=-= #includes =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-#include <salunx.h>
+#include <unx/salunx.h>
 #include <vcl/salgtype.hxx>
 #ifndef _SV_PTRSTYLE_HXX
 #include <vcl/ptrstyle.hxx>
@@ -48,8 +48,9 @@ class   SalXLib;
 #include <list>
 #include <hash_map>
 #include <tools/gen.hxx>
-#include <vcl/salwtype.hxx>
-#include <vcl/dllapi.h>
+#include <salwtype.hxx>
+
+#include <vclpluginapi.h>
 
 // -=-= forwards -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 class   BitmapPalette;
@@ -208,7 +209,7 @@ public:
 typedef int(*YieldFunc)(int fd, void* data);
 struct YieldEntry;
 
-class VCL_DLLPUBLIC SalXLib
+class VCLPLUG_GEN_PUBLIC SalXLib
 {
 protected:
     timeval         m_aTimeout;
@@ -279,7 +280,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/salfont.h b/vcl/inc/unx/salfont.h
index b3fbe93137f3..b3fbe93137f3 100644
--- a/vcl/unx/inc/salfont.h
+++ b/vcl/inc/unx/salfont.h
diff --git a/vcl/unx/inc/salframe.h b/vcl/inc/unx/salframe.h
index dde04b79f3ac..02dc58f67d2b 100644
--- a/vcl/unx/inc/salframe.h
+++ b/vcl/inc/unx/salframe.h
@@ -28,18 +28,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 -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
@@ -56,7 +57,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 c40a85741c5d..e27b2ab31e2d 100644
--- a/vcl/unx/inc/salgdi.h
+++ b/vcl/inc/unx/salgdi.h
@@ -29,13 +29,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 -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
@@ -73,7 +76,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 2f53a979a485..31da4b1a86bd 100644
--- a/vcl/unx/inc/salinst.h
+++ b/vcl/inc/unx/salinst.h
@@ -36,10 +36,10 @@
 #ifndef _VOS_THREAD_HXX
 #include <vos/thread.hxx>
 #endif
-#include <vcl/dllapi.h>
-#include <vcl/salinst.hxx>
+#include <vclpluginapi.h>
+#include <salinst.hxx>
 
-class VCL_DLLPUBLIC SalYieldMutex : public vos::OMutex
+class VCLPLUG_GEN_PUBLIC SalYieldMutex : public vos::OMutex
 {
 protected:
     sal_uIntPtr                                     mnCount;
@@ -57,7 +57,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 09a753ff1d98..09a753ff1d98 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 c843708f0c2e..c9c6bfe4a8e7 100644
--- a/vcl/unx/inc/salobj.h
+++ b/vcl/inc/unx/salobj.h
@@ -30,8 +30,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
 {
@@ -64,7 +65,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 7b42ad74c923..3f23836828d8 100644
--- a/vcl/unx/inc/salprn.h
+++ b/vcl/inc/unx/salprn.h
@@ -29,9 +29,10 @@
 #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;
 
@@ -107,7 +108,7 @@ public:
 class Timer;
 
 namespace vcl_sal {
-class VCL_DLLPUBLIC PrinterUpdate
+class VCLPLUG_GEN_PUBLIC PrinterUpdate
 {
     static Timer*           pPrinterUpdateTimer;
     static int              nActiveJobs;
diff --git a/vcl/unx/inc/salstd.hxx b/vcl/inc/unx/salstd.hxx
index cc03b3fb35a4..cc03b3fb35a4 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 1da7cae8564a..3b21985b8282 100644
--- a/vcl/unx/inc/salsys.h
+++ b/vcl/inc/unx/salsys.h
@@ -36,12 +36,12 @@
 #ifndef _VOS_THREAD_HXX
 #include <vos/thread.hxx>
 #endif
-#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 ba52b96c073a..f92c6df7c8a5 100644
--- a/vcl/unx/inc/saltimer.h
+++ b/vcl/inc/unx/saltimer.h
@@ -28,7 +28,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 8be91cbd3bce..8e82258e51a2 100644
--- a/vcl/unx/inc/salunx.h
+++ b/vcl/inc/unx/salunx.h
@@ -36,8 +36,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 c6bf12165ae9..d5f6b0988147 100644
--- a/vcl/unx/inc/salvd.h
+++ b/vcl/inc/unx/salvd.h
@@ -29,8 +29,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 b4339bb8567e..f5123f3e7ae0 100644
--- a/vcl/unx/inc/sm.hxx
+++ b/vcl/inc/unx/sm.hxx
@@ -27,10 +27,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
 {
@@ -60,7 +61,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();
@@ -69,7 +70,7 @@ public:
     static void interactionDone( bool bCancelShutdown );
 
     static String 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 4efaea4e736f..4efaea4e736f 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 cd0220b77e05..cd0220b77e05 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 d4077d0998e9..a2ee16f7091d 100644
--- a/vcl/unx/inc/svsys.h
+++ b/vcl/inc/unx/svsys.h
@@ -27,6 +27,6 @@
 #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 e7d6150b79f4..e7d6150b79f4 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 e8620db29c6f..88f0e62024a9 100644
--- a/vcl/unx/inc/wmadaptor.hxx
+++ b/vcl/inc/unx/wmadaptor.hxx
@@ -32,12 +32,12 @@
 #include <tools/string.hxx>
 #endif
 #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;
@@ -45,7 +45,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 293c9757e77b..293c9757e77b 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 811ea2819669..811ea2819669 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 52b67f56d2ae..52b67f56d2ae 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 5dbd5c134dbf..5dbd5c134dbf 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 3b5f4364b5e2..3b5f4364b5e2 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 902fe80df8a1..902fe80df8a1 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 0939b1d07e4b..0939b1d07e4b 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 9ab55c293218..9ab55c293218 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 fef8fe2f4ab5..fef8fe2f4ab5 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 f90cb95ee721..f90cb95ee721 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 fd6ddaca65cb..fd6ddaca65cb 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 e48da90e3de5..e48da90e3de5 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 cb3a35d793c7..cb3a35d793c7 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 e583957c4bae..e583957c4bae 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 ea942cefe942..ea942cefe942 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 b35298183cb1..b35298183cb1 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 4b30e81882ff..4b30e81882ff 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 ad74b0cf724a..ad74b0cf724a 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 d26c36e79ed4..d26c36e79ed4 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 ea47a3ee27e9..ea47a3ee27e9 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 7b9b2199955a..7b9b2199955a 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 df934399fe91..df934399fe91 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 f06d2140559e..f06d2140559e 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 c04dbf5deafb..c04dbf5deafb 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 95b4fbe66c2e..95b4fbe66c2e 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 91d89bbed3c6..91d89bbed3c6 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 841e2efdec63..841e2efdec63 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 9fbed6408c54..9fbed6408c54 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 9346fbd8f2c0..9346fbd8f2c0 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 d4804fb6c85b..d4804fb6c85b 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 e3d0e3e76530..e3d0e3e76530 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 f25b0863d807..f25b0863d807 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 8e22a5bee37b..8e22a5bee37b 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 02ee5db5fbc1..02ee5db5fbc1 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 c74a1da26b66..c74a1da26b66 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 c13089abaea5..c13089abaea5 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 e6a9b7a668af..e6a9b7a668af 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 f904b7848f64..f904b7848f64 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 b76368923f31..b76368923f31 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 b8fac92fdd75..b8fac92fdd75 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 6e4d5f613959..6e4d5f613959 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 7493f3a501dc..7493f3a501dc 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 a546ce6c1ba8..a546ce6c1ba8 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 5a10726cf36c..5a10726cf36c 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 9d8a0d6a1c47..9d8a0d6a1c47 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 14402a37b641..14402a37b641 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 daea116e186e..daea116e186e 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 c9e2b6dd8737..c9e2b6dd8737 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 ea677d4734aa..ea677d4734aa 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 17c1075d07a7..17c1075d07a7 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 3fe104f3673e..3fe104f3673e 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 70b39e37b65e..70b39e37b65e 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 dc632873dd3b..dc632873dd3b 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 1f96be33b86a..1f96be33b86a 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 994f34b96e0e..994f34b96e0e 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 187cf31cfd1a..187cf31cfd1a 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 4fdba0e8442a..4fdba0e8442a 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 657fcff2b4fd..657fcff2b4fd 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 7f574e1ab351..7f574e1ab351 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 ac2e8885bdbb..ac2e8885bdbb 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 bddc330d71d2..bddc330d71d2 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 0ac5f200eab1..0ac5f200eab1 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 75795c088c8e..75795c088c8e 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 29edf44a9999..29edf44a9999 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 2d2aa162fac6..2d2aa162fac6 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 d66b0fd09aaa..d66b0fd09aaa 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 3f61e751befb..3f61e751befb 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 5394dd74576a..5394dd74576a 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 327b15258d3d..327b15258d3d 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 6b5e5ac4ff0d..6b5e5ac4ff0d 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 ee68c707444c..ee68c707444c 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 8b82e237233c..8b82e237233c 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 c2508d37fad5..c2508d37fad5 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 955152f312c9..955152f312c9 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 c5049670b9ec..c5049670b9ec 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 e27ce2514306..e27ce2514306 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 792ea50e4f00..792ea50e4f00 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 67681f243f7b..67681f243f7b 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 7f6092b648de..7f6092b648de 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 6d09b3b0af01..6d09b3b0af01 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 7c0d00ce8fa4..7c0d00ce8fa4 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 c60edc3b99d0..c60edc3b99d0 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 cf0f89f63b1b..cf0f89f63b1b 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 fb676ae2a04b..fb676ae2a04b 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 28ff46c4fae4..28ff46c4fae4 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 76114ca410d5..76114ca410d5 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 db4213943b6e..db4213943b6e 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 0f0f1b360224..0f0f1b360224 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 da9c00435162..da9c00435162 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 a1ece2d925e9..a1ece2d925e9 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 27e0d8c703db..27e0d8c703db 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 b79412bc3f41..b79412bc3f41 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 e25d0837d8dc..e25d0837d8dc 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 56608b8153a6..56608b8153a6 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 2aa3eb4b277d..2aa3eb4b277d 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 ed3a11e7f49d..ed3a11e7f49d 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 668d8d7e8015..668d8d7e8015 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 148fe2e72a5e..148fe2e72a5e 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 dc990dc5cb61..dc990dc5cb61 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 7f48bc4506fc..7f48bc4506fc 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 a25b7ee18960..a25b7ee18960 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 e3b20bd8edf9..e3b20bd8edf9 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 e4fae36c023c..e4fae36c023c 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 8e208e32f293..8e208e32f293 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 7cbecef2c60f..7cbecef2c60f 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 19d4130d4b5d..19d4130d4b5d 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 a657cfa54af4..a657cfa54af4 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 5dfd18a539a6..5dfd18a539a6 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 a5b5617b820f..a5b5617b820f 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 22873985daf0..22873985daf0 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 911eede87ed4..911eede87ed4 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 e0dcbc14a6d6..e0dcbc14a6d6 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 147bc2da410d..147bc2da410d 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 1daf4f553275..1daf4f553275 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 6d62d8bbda46..6d62d8bbda46 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 75f4965f2582..75f4965f2582 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 a8896d0975f9..a8896d0975f9 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 f9c57674dfb2..f9c57674dfb2 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 9fcff18925f0..9fcff18925f0 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 7ad1314d1957..7ad1314d1957 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 bb35c22c97cb..bb35c22c97cb 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 0bf38d4b3fdb..0bf38d4b3fdb 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 9ba3b51d8d76..9ba3b51d8d76 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 208c7c59dc2d..208c7c59dc2d 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 4c4c97ad4ccf..4c4c97ad4ccf 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 a3166a27ca52..a3166a27ca52 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 3981cbaa884d..3981cbaa884d 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 9d802d094ef8..9d802d094ef8 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 940668e3db7f..940668e3db7f 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 252a702caf77..252a702caf77 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 b7a9542a64c6..b7a9542a64c6 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 61e53971290e..61e53971290e 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 3c4333c5e7b8..3c4333c5e7b8 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 d67251a1743d..d67251a1743d 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 769d6966571f..769d6966571f 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 87357c0a5027..87357c0a5027 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 be77728c13f9..be77728c13f9 100644
--- a/vcl/unx/source/inc/vshear_mask.h
+++ b/vcl/inc/unx/x11_cursors/vshear_mask.h
diff --git a/vcl/inc/vcl/jobdata.hxx b/vcl/inc/vcl/jobdata.hxx
index 18330ae3508d..fcdcf933bbd3 100644
--- a/vcl/inc/vcl/jobdata.hxx
+++ b/vcl/inc/vcl/jobdata.hxx
@@ -39,7 +39,7 @@ enum type {
 };
 }
 
-struct JobData
+struct VCL_DLLPUBLIC JobData
 {
     int                     m_nCopies;
     int                     m_nLeftMarginAdjust;
diff --git a/vcl/inc/vcl/polyscan.hxx b/vcl/inc/vcl/polyscan.hxx
deleted file mode 100644
index de9f62184483..000000000000
--- a/vcl/inc/vcl/polyscan.hxx
+++ /dev/null
@@ -1,155 +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.
- *
- ************************************************************************/
-
-#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
diff --git a/vcl/inc/vcl/ppdparser.hxx b/vcl/inc/vcl/ppdparser.hxx
index 01cbcbb5fc81..ab777c392836 100644
--- a/vcl/inc/vcl/ppdparser.hxx
+++ b/vcl/inc/vcl/ppdparser.hxx
@@ -34,6 +34,8 @@
 #include "tools/string.hxx"
 #include "tools/stream.hxx"
 
+#include "vcl/dllapi.h"
+
 #include "com/sun/star/lang/Locale.hpp"
 
 #define PRINTER_PPDDIR "driver"
@@ -45,7 +47,7 @@ class PPDTranslator;
 
 enum PPDValueType { eInvocation, eQuoted, eSymbol, eString, eNo };
 
-struct PPDValue
+struct VCL_DLLPUBLIC PPDValue
 {
     PPDValueType    m_eType;
     String          m_aOption;
@@ -58,7 +60,7 @@ struct PPDValue
  * PPDKey - a container for the available options (=values) of a PPD keyword
  */
 
-class PPDKey
+class VCL_DLLPUBLIC PPDKey
 {
     friend class PPDParser;
 
@@ -120,7 +122,7 @@ struct PPDKeyhash
 class PPDContext;
 class CUPSManager;
 
-class PPDParser
+class VCL_DLLPUBLIC PPDParser
 {
     friend class PPDContext;
     friend class CUPSManager;
@@ -296,7 +298,7 @@ public:
  * contents of a PPDParser.
  */
 
-class PPDContext
+class VCL_DLLPUBLIC PPDContext
 {
     typedef ::std::hash_map< const PPDKey*, const PPDValue*, PPDKeyhash > hash_type;
     hash_type m_aCurrentValues;
diff --git a/vcl/inc/vcl/svcompat.hxx b/vcl/inc/vcl/svcompat.hxx
deleted file mode 100644
index dce884cdf776..000000000000
--- a/vcl/inc/vcl/svcompat.hxx
+++ /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.
- *
- ************************************************************************/
-
-#ifndef _SV_SVCOMPAT_HXX
-#define _SV_SVCOMPAT_HXX
-
-#include <sv.h>
-
-// -----------
-// - Defines -
-// -----------
-
-#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;
-
-// --------------
-// - ImplCompat -
-// --------------
-
-class ImplCompat
-{
-    SvStream*   mpRWStm;
-    sal_uInt32      mnCompatPos;
-    sal_uInt32      mnTotalSize;
-    sal_uInt16      mnStmMode;
-    sal_uInt16      mnVersion;
-
-                ImplCompat() {}
-                ImplCompat( const ImplCompat& rCompat ) {}
-    ImplCompat& operator=( const ImplCompat& rCompat ) { return *this; }
-    sal_Bool        operator==( const ImplCompat& rCompat ) { return sal_False; }
-
-public:
-                ImplCompat( SvStream& rStm, sal_uInt16 nStreamMode, sal_uInt16 nVersion = 1 );
-                ~ImplCompat();
-
-    sal_uInt16      GetVersion() const { return mnVersion; }
-};
-
-#endif // _SV_SVCOMPAT_HXX
diff --git a/vcl/inc/vcl/unobrok.hxx b/vcl/inc/vclpluginapi.h
index af616e80351a..3fe781a7bb97 100644
--- a/vcl/inc/vcl/unobrok.hxx
+++ b/vcl/inc/vclpluginapi.h
@@ -25,15 +25,46 @@
  *
  ************************************************************************/
 
-#ifndef _UNOBROK_HXX
-#define _UNOBROK_HXX
+#ifndef _VCLPLUGINAPI_H
+#define _VCLPLUGINAPI_H
 
-#include <vcl/svdata.hxx>
-#include <vos/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
diff --git a/vcl/inc/vcl/wall2.hxx b/vcl/inc/wall2.hxx
index 12ef95e017d7..12ef95e017d7 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 07655d6b7a65..8ef8e9fd9f6e 100644..100755
--- a/vcl/win/inc/salbmp.h
+++ b/vcl/inc/win/salbmp.h
@@ -28,10 +28,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 b86b4cc29ed4..6c040993c76e 100755
--- a/vcl/win/inc/saldata.hxx
+++ b/vcl/inc/win/saldata.hxx
@@ -28,13 +28,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 cfb26847db02..71786924d097 100644..100755
--- a/vcl/win/inc/salframe.h
+++ b/vcl/inc/win/salframe.h
@@ -28,9 +28,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 94c4849bb197..52c4d84f0db3 100755
--- a/vcl/win/inc/salgdi.h
+++ b/vcl/inc/win/salgdi.h
@@ -28,11 +28,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 "boost/scoped_ptr.hpp"
 #include <hash_set>
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 f08f99898915..0c3580509654 100755
--- a/vcl/win/inc/salinst.h
+++ b/vcl/inc/win/salinst.h
@@ -28,8 +28,7 @@
 #ifndef _SV_SALINST_H
 #define _SV_SALINST_H
 
-#include <vcl/sv.h>
-#include <vcl/salinst.hxx>
+#include <salinst.hxx>
 
 namespace vos { class OMutex; }
 
diff --git a/vcl/win/inc/salmenu.h b/vcl/inc/win/salmenu.h
index c9442ced8936..686c6c406aeb 100644..100755
--- a/vcl/win/inc/salmenu.h
+++ b/vcl/inc/win/salmenu.h
@@ -28,10 +28,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 fceee1076595..772e0cc5b036 100644..100755
--- a/vcl/win/inc/salnativewidgets.h
+++ b/vcl/inc/win/salnativewidgets.h
@@ -31,8 +31,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 e262fd9bc10d..57ed83ee8e6b 100644..100755
--- a/vcl/win/inc/salobj.h
+++ b/vcl/inc/win/salobj.h
@@ -28,8 +28,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 14141b6e7e6b..538fc8ea18e3 100644..100755
--- a/vcl/win/inc/salprn.h
+++ b/vcl/inc/win/salprn.h
@@ -28,8 +28,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 51a8c0443b58..af0019c47615 100644..100755
--- a/vcl/win/inc/salsys.h
+++ b/vcl/inc/win/salsys.h
@@ -28,7 +28,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 38f861fad441..f04c9bf3104a 100644..100755
--- a/vcl/win/inc/saltimer.h
+++ b/vcl/inc/win/saltimer.h
@@ -28,7 +28,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 24aa8b99ba01..14632bccf649 100644..100755
--- a/vcl/win/inc/salvd.h
+++ b/vcl/inc/win/salvd.h
@@ -28,8 +28,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 7b0e87304d59..7b0e87304d59 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 141ea4106238..2eabc23c8f48 100644..100755
--- a/vcl/win/inc/wincomp.hxx
+++ b/vcl/inc/win/wincomp.hxx
@@ -31,7 +31,6 @@
 #ifndef _STRING_H
 #include <string.h>
 #endif
-#include <vcl/sv.h>
 
 // ----------
 // - Strict -
diff --git a/vcl/inc/vcl/window.h b/vcl/inc/window.h
index 4a9afddea8b0..4a9afddea8b0 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 aa9d37430ea6..aa9d37430ea6 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 af15ad73e19d..1cebe9d1b319 100644
--- a/vcl/prj/build.lst
+++ b/vcl/prj/build.lst
@@ -1,57 +1,4 @@
 vc	vcl	:	l10n 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 SO:print_header cpputools shell 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 5a7dd7d9ef91..8b137891791f 100644
--- a/vcl/prj/d.lst
+++ b/vcl/prj/d.lst
@@ -1,159 +1 @@
-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\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\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\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 a50c8aeec149..2fa14c2f44cb 100644..100755
--- a/vcl/source/app/dbggui.cxx
+++ b/vcl/source/app/dbggui.cxx
@@ -37,14 +37,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"
@@ -57,13 +53,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 "vos/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>
@@ -626,10 +627,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 275280eff692..e2cc57886f40 100644
--- a/vcl/source/app/help.cxx
+++ b/vcl/source/app/help.cxx
@@ -28,15 +28,17 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-#include "vcl/svdata.hxx"
+#include "tools/debug.hxx"
+#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/time.hxx"
+
+#include "helpwin.hxx"
+#include "svdata.hxx"
 
 // =======================================================================
 
diff --git a/vcl/source/app/i18nhelp.cxx b/vcl/source/app/i18nhelp.cxx
index 5b2f302adaa7..b7ae51615c08 100644
--- a/vcl/source/app/i18nhelp.cxx
+++ b/vcl/source/app/i18nhelp.cxx
@@ -28,16 +28,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 42e4cf09fdb0..de1c2b985f4a 100644
--- a/vcl/source/app/idlemgr.cxx
+++ b/vcl/source/app/idlemgr.cxx
@@ -27,10 +27,13 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
+
 #include <tools/list.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 5d14f0032b4a..000000000000
--- a/vcl/source/app/makefile.mk
+++ /dev/null
@@ -1,69 +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)$/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)$/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 8ee732acf981..3bb06c03ebdb 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -28,16 +28,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 066d58ce4eec..e2357eb57558 100644
--- a/vcl/source/app/session.cxx
+++ b/vcl/source/app/session.cxx
@@ -27,12 +27,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 480817f26b37..55974b57815c 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -27,24 +27,26 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
+
 #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"
 
 #ifdef WNT
 #include "tools/prewin.h"
@@ -52,6 +54,9 @@
 #include "tools/postwin.h"
 #endif
 
+#include "svdata.hxx"
+#include "impimagetree.hxx"
+
 using namespace rtl;
 
 // =======================================================================
diff --git a/vcl/source/app/sound.cxx b/vcl/source/app/sound.cxx
index d180f2647135..9c9caa81da49 100644
--- a/vcl/source/app/sound.cxx
+++ b/vcl/source/app/sound.cxx
@@ -27,22 +27,21 @@
 
 // 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>
-#ifndef _UNOTOOLS_UCBSTREAMHELPER_HXX
 #include <unotools/ucbstreamhelper.hxx>
-#endif
-#ifndef _SV_SVSYS_HXX
-#include <svsys.h>
-#endif
-#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 7411baaf470e..bbe09eb1b411 100644
--- a/vcl/source/app/stdtext.cxx
+++ b/vcl/source/app/stdtext.cxx
@@ -28,13 +28,11 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-#ifndef _SV_SVIDS_HRC
-#include <vcl/svids.hrc>
-#endif
-#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 191c39ba477e..ef31eb76f2e7 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -28,52 +28,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 "vos/process.hxx"
 #include "vos/mutex.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/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 f5b03f2b9b91..62780f7d1fd3 100644
--- a/vcl/source/app/svdata.cxx
+++ b/vcl/source/app/svdata.cxx
@@ -31,35 +31,37 @@
 #include <string.h>
 
 #include "rtl/instance.hxx"
+
 #include "osl/process.h"
 #include "osl/file.hxx"
 
-#include "svsys.h"
-
 #include "tools/debug.hxx"
 #include "tools/resary.hxx"
 
-#include "vcl/salinst.hxx"
-#include "vcl/salframe.hxx"
+#include "unotools/fontcfg.hxx"
+
+#include "vos/mutex.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 "unotools/fontcfg.hxx"
+#include "salinst.hxx"
+#include "salframe.hxx"
+#include "svdata.hxx"
+#include "window.h"
+#include "salimestatus.hxx"
+#include "salsys.hxx"
+#include "svids.hrc"
 
-#include "vos/mutex.hxx"
-
-#include "cppuhelper/implbase1.hxx"
-#include "uno/current_context.hxx"
 
 #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 44990c39c05a..0bf26bdd4c3d 100644
--- a/vcl/source/app/svmain.cxx
+++ b/vcl/source/app/svmain.cxx
@@ -28,6 +28,32 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
+#include "rtl/logfile.hxx"
+
+#include "osl/file.hxx"
+
+#include "vos/signal.hxx"
+#include "vos/process.hxx"
+
+#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 <tools/prewin.h>
 #include <process.h>    // for _beginthreadex
@@ -40,46 +66,28 @@
 // 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 "vos/signal.hxx"
-#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 "vos/process.hxx"
-#include "osl/file.hxx"
-#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"
diff --git a/vcl/source/app/timer.cxx b/vcl/source/app/timer.cxx
index f31779f759c6..ec421651637e 100644
--- a/vcl/source/app/timer.cxx
+++ b/vcl/source/app/timer.cxx
@@ -28,17 +28,15 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-#ifndef _SV_SVSYS_HXX
-#include <svsys.h>
-#endif
-#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 711f9fb06ae1..c67abda51f60 100644
--- a/vcl/source/app/unohelp.cxx
+++ b/vcl/source/app/unohelp.cxx
@@ -28,35 +28,29 @@
 // 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>
 
-#ifndef _COM_SUN_STAR_TEXT_XBREAKITERATOR_HPP_
 #include <com/sun/star/i18n/XBreakIterator.hpp>
-#endif
 #include <com/sun/star/i18n/XCharacterClassification.hpp>
-
-#ifndef _COM_SUN_STAR_UTIL_XCOLLATOR_HPP_
 #include <com/sun/star/i18n/XCollator.hpp>
-#endif
 #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 1ae5f7537ca6..33f22a3a50d5 100644
--- a/vcl/source/app/vclevent.cxx
+++ b/vcl/source/app/vclevent.cxx
@@ -29,7 +29,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 9c88deccec23..f988c58f953e 100644
--- a/vcl/source/components/dtranscomp.cxx
+++ b/vcl/source/components/dtranscomp.cxx
@@ -28,6 +28,15 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
+#include "vos/mutex.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"
@@ -41,12 +50,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 "vos/mutex.hxx"
-#include "osl/mutex.hxx"
-
 #include "cppuhelper/compbase1.hxx"
 #include "cppuhelper/compbase2.hxx"
 #include "cppuhelper/compbase3.hxx"
diff --git a/vcl/source/components/fontident.cxx b/vcl/source/components/fontident.cxx
index ad309e4f2560..2cbea1628f4e 100644
--- a/vcl/source/components/fontident.cxx
+++ b/vcl/source/components/fontident.cxx
@@ -28,6 +28,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>
@@ -38,15 +45,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
deleted file mode 100644
index 982687104c01..000000000000
--- a/vcl/source/components/makefile.mk
+++ /dev/null
@@ -1,52 +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=components
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.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 \
-            $(SLO)$/factory.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :	target.mk
-.INCLUDE :	$(PRJ)$/util$/target.pmk
-
diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index 5ffe94212d20..1a6439a0502e 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -29,14 +29,10 @@
 #include "precompiled_vcl.hxx"
 
 #include <tools/debug.hxx>
+#include <tools/poly.hxx>
+#include <tools/rc.h>
 
-#ifndef _SV_SVIDS_HRC
-#include <vcl/svids.hrc>
-#endif
-#include <vcl/svdata.hxx>
-#ifndef _SV_IAMGE_HXX
 #include <vcl/image.hxx>
-#endif
 #include <vcl/bitmap.hxx>
 #include <vcl/bitmapex.hxx>
 #include <vcl/decoview.hxx>
@@ -44,20 +40,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>
-#ifndef _SV_NATIVEWIDGET_HXX
 #include <vcl/salnativewidgets.hxx>
-#endif
 #include <vcl/edit.hxx>
 
-#ifndef _SV_RC_H
-#include <tools/rc.h>
-#endif
-
-
+#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 2fd0ade0f65d..2d6cb76b0512 100644
--- a/vcl/source/control/combobox.cxx
+++ b/vcl/source/control/combobox.cxx
@@ -27,23 +27,21 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
+
 #include <tools/table.hxx>
 #include <tools/debug.hxx>
-
-#ifndef _SV_RC_H
 #include <tools/rc.h>
-#endif
-#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 6bbe5bb32c38..26ef9b076d8c 100644
--- a/vcl/source/control/ctrl.cxx
+++ b/vcl/source/control/ctrl.cxx
@@ -28,20 +28,21 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-#ifndef _SV_RC_H
+#include <comphelper/processfactory.hxx>
+
+#include <tools/diagnose_ex.h>
 #include <tools/rc.h>
-#endif
-#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 f166a3c1f535..89b2f86bb068 100755
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -28,25 +28,22 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-#ifndef _SV_RC_H
 #include <tools/rc.h>
-#endif
-#include <vcl/svdata.hxx>
 #include <vcl/decoview.hxx>
 #include <vcl/event.hxx>
 #include <vcl/cursor.hxx>
 #include <vcl/virdev.hxx>
-#ifndef _SV_SVIDS_HRC
-#include <vcl/svids.hrc>
-#endif
 #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 <vos/mutex.hxx>
 
diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx
index 4a42abd3ea79..fd69457c8026 100644
--- a/vcl/source/control/field.cxx
+++ b/vcl/source/control/field.cxx
@@ -37,12 +37,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 4b14a5a4b199..9aac58e1a30a 100644
--- a/vcl/source/control/field2.cxx
+++ b/vcl/source/control/field2.cxx
@@ -29,21 +29,18 @@
 #include "precompiled_vcl.hxx"
 #include <tools/debug.hxx>
 
-#ifndef _SV_RC_H
 #include <tools/rc.h>
-#endif
-#include <vcl/svdata.hxx>
-#ifndef _SV_EVENT_HXX
-#include <vcl/field.hxx>
-#endif
+
 #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 db92cd0b09af..5455f9410f54 100644
--- a/vcl/source/control/fixed.cxx
+++ b/vcl/source/control/fixed.cxx
@@ -27,13 +27,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 5b09bf6bb3b5..6bf4d519a64b 100644
--- a/vcl/source/control/group.cxx
+++ b/vcl/source/control/group.cxx
@@ -27,15 +27,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>
 
-#ifndef _SV_RC_H
 #include <tools/rc.h>
-#endif
 
+#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 670d6dad0ada..d3824ad3b4e9 100644
--- a/vcl/source/control/ilstbox.cxx
+++ b/vcl/source/control/ilstbox.cxx
@@ -27,29 +27,25 @@
 
 // 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>
-#ifndef _COM_SUN_STAR_UTIL_XCOLLATOR_HPP_
-#include <com/sun/star/i18n/XCollator.hpp>
-#endif
+#include <vcl/i18nhelp.hxx>
 
-#ifndef _COM_SUN_STAR_ACCESSIBILITY_XACCESSIBLE_HDL_
-#include <com/sun/star/accessibility/XAccessible.hpp>
-#endif
+#include <ilstbox.hxx>
+#include <controldata.hxx>
+#include <svdata.hxx>
 
-#ifndef _COM_SUN_STAR_ACCESSIBILITY_ACCESSIBLEROLE_HPP_
+#include <com/sun/star/i18n/XCollator.hpp>
+#include <com/sun/star/accessibility/XAccessible.hpp>
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
-#endif
 
 #define MULTILINE_ENTRY_DRAW_FLAGS ( TEXT_DRAW_WORDBREAK | TEXT_DRAW_MULTILINE | TEXT_DRAW_VCENTER )
 
diff --git a/vcl/source/control/longcurr.cxx b/vcl/source/control/longcurr.cxx
index aae78baa3fb7..40b897bbb35c 100644
--- a/vcl/source/control/longcurr.cxx
+++ b/vcl/source/control/longcurr.cxx
@@ -34,15 +34,13 @@
 #include <tools/debug.hxx>
 #include <tools/bigint.hxx>
 
-#ifndef _SV_RC_H
 #include <tools/rc.h>
-#endif
 
 #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 594b76684a1a..1d2f5ee63b0f 100644
--- a/vcl/source/control/lstbox.cxx
+++ b/vcl/source/control/lstbox.cxx
@@ -29,22 +29,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>
 
 // =======================================================================
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 9bc71f1a55e3..17ecbd4a6ce8 100644
--- a/vcl/source/control/scrbar.cxx
+++ b/vcl/source/control/scrbar.cxx
@@ -33,7 +33,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 d7501a6f99b6..ed0bb4374c53 100644
--- a/vcl/source/control/spinfld.cxx
+++ b/vcl/source/control/spinfld.cxx
@@ -29,12 +29,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 31de70d73616..dacd912d3bea 100644
--- a/vcl/source/control/tabctrl.cxx
+++ b/vcl/source/control/tabctrl.cxx
@@ -27,10 +27,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"
@@ -39,11 +39,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 <hash_map>
 #include <vector>
diff --git a/vcl/source/fontsubset/cff.cxx b/vcl/source/fontsubset/cff.cxx
index cb565122ea63..45172002bff6 100644
--- a/vcl/source/fontsubset/cff.cxx
+++ b/vcl/source/fontsubset/cff.cxx
@@ -32,7 +32,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 64cf243c6a9d..26382e245996 100644
--- a/vcl/source/fontsubset/fontsubset.cxx
+++ b/vcl/source/fontsubset/fontsubset.cxx
@@ -28,10 +28,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 5f434f9ba48a..a99cdd91c2f5 100644
--- a/vcl/source/gdi/bitmap.cxx
+++ b/vcl/source/gdi/bitmap.cxx
@@ -27,22 +27,23 @@
 
 // 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>
-#ifndef _SV_RC_H
 #include <tools/rc.h>
-#endif
+
+#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 4905646d3563..d39b0f7169d0 100644
--- a/vcl/source/gdi/bitmap3.cxx
+++ b/vcl/source/gdi/bitmap3.cxx
@@ -29,13 +29,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 abee1ed9bf67..743326df04d5 100644
--- a/vcl/source/gdi/bitmapex.cxx
+++ b/vcl/source/gdi/bitmapex.cxx
@@ -27,25 +27,26 @@
 
 // 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>
-#ifndef _SV_IMPIMAGETREE_H
-#include <vcl/impimagetree.hxx>
-#endif
-#ifndef _SV_RC_H
-#include <tools/rc.h>
-#endif
 #include <vcl/svapp.hxx>
 #include <vcl/bmpacc.hxx>
 
+#include <image.h>
+#include <impimagetree.hxx>
+
 // ------------
 // - BitmapEx -
 // ------------
diff --git a/vcl/source/gdi/bmpacc.cxx b/vcl/source/gdi/bmpacc.cxx
index 1c7b41b51de6..ed0dc6225a0f 100644
--- a/vcl/source/gdi/bmpacc.cxx
+++ b/vcl/source/gdi/bmpacc.cxx
@@ -27,10 +27,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 ac2e09df832f..fc3e031f260e 100644
--- a/vcl/source/gdi/bmpacc3.cxx
+++ b/vcl/source/gdi/bmpacc3.cxx
@@ -27,12 +27,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 ac3a80612fe5..a3b729e69244 100644
--- a/vcl/source/gdi/bmpfast.cxx
+++ b/vcl/source/gdi/bmpfast.cxx
@@ -28,7 +28,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 b11b9ab822f4..ce39c70e243f 100644
--- a/vcl/source/gdi/configsettings.cxx
+++ b/vcl/source/gdi/configsettings.cxx
@@ -29,7 +29,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 3f95f56315f6..61a08df4ddc0 100644
--- a/vcl/source/gdi/cvtgrf.cxx
+++ b/vcl/source/gdi/cvtgrf.cxx
@@ -28,14 +28,12 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-#ifndef _SV_SVSYS_HXX
-#include <svsys.h>
-#endif
 #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 4a3a2f265374..a77ab0bcba6a 100644
--- a/vcl/source/gdi/font.cxx
+++ b/vcl/source/gdi/font.cxx
@@ -28,15 +28,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 <algorithm>
 
diff --git a/vcl/source/gdi/graph.cxx b/vcl/source/gdi/graph.cxx
index 1a8201706212..1aae4e2dc060 100644
--- a/vcl/source/gdi/graph.cxx
+++ b/vcl/source/gdi/graph.cxx
@@ -27,11 +27,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>
diff --git a/vcl/source/gdi/image.cxx b/vcl/source/gdi/image.cxx
index ee6060b7d8f3..d33709787d2d 100644
--- a/vcl/source/gdi/image.cxx
+++ b/vcl/source/gdi/image.cxx
@@ -31,25 +31,22 @@
 #include <boost/scoped_array.hpp>
 
 #include <rtl/logfile.hxx>
+
 #include <tools/debug.hxx>
 #include <tools/stream.hxx>
-#ifndef _SV_RC_H
 #include <tools/rc.h>
-#endif
 #include <tools/rc.hxx>
-#ifndef _SV_RESMGR_HXX
 #include <tools/resmgr.hxx>
-#endif
+
 #include <vcl/settings.hxx>
 #include <vcl/outdev.hxx>
 #include <vcl/graph.hxx>
 #include <vcl/svapp.hxx>
-#ifndef _SV_IMPIMAGETREE_H
-#include <vcl/impimagetree.hxx>
-#endif
-#include <vcl/image.h>
 #include <vcl/image.hxx>
 
+#include <impimagetree.hxx>
+#include <image.h>
+
 #if OSL_DEBUG_LEVEL > 0
 #include <rtl/strbuf.hxx>
 #endif
diff --git a/vcl/source/gdi/imagerepository.cxx b/vcl/source/gdi/imagerepository.cxx
index d97999311751..0118acc13146 100644
--- a/vcl/source/gdi/imagerepository.cxx
+++ b/vcl/source/gdi/imagerepository.cxx
@@ -27,12 +27,12 @@
 
 // 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>
-#ifndef _SV_IMPIMAGETREE_H
-#include "vcl/impimagetree.hxx"
-#endif
+
+#include "impimagetree.hxx"
 
 //........................................................................
 namespace vcl
diff --git a/vcl/source/gdi/impbmp.cxx b/vcl/source/gdi/impbmp.cxx
index af39ed615874..f8d71112d3a1 100644
--- a/vcl/source/gdi/impbmp.cxx
+++ b/vcl/source/gdi/impbmp.cxx
@@ -28,15 +28,14 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-#ifndef _SV_SVSYS_HXX
-#include <svsys.h>
-#endif
-#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 500ba9549b9e..8ca2fec6e037 100644
--- a/vcl/source/gdi/impgraph.cxx
+++ b/vcl/source/gdi/impgraph.cxx
@@ -27,24 +27,27 @@
 
 // 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>
-#ifndef _UNTOOLS_TEMPFILE_HXX
 #include <unotools/tempfile.hxx>
-#endif
+
 #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>
 
 // -----------
diff --git a/vcl/source/gdi/impimage.cxx b/vcl/source/gdi/impimage.cxx
index 0d0af3365c00..735f912f0782 100644
--- a/vcl/source/gdi/impimage.cxx
+++ b/vcl/source/gdi/impimage.cxx
@@ -27,15 +27,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 03e4c1dbbb2a..19947679567c 100644
--- a/vcl/source/gdi/impimagetree.cxx
+++ b/vcl/source/gdi/impimagetree.cxx
@@ -26,13 +26,13 @@
  ***********************************************************************/
 
 #include "precompiled_vcl.hxx"
+
 #include "sal/config.h"
 
 #include <list>
 #include <memory>
 #include <utility>
 #include <vector>
-
 #include <hash_map>
 
 #include "com/sun/star/container/XNameAccess.hpp"
@@ -43,24 +43,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 ff3c9a20ef06..a1291b8dd67d 100644
--- a/vcl/source/gdi/jobset.cxx
+++ b/vcl/source/gdi/jobset.cxx
@@ -27,13 +27,15 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
+
 #include <tools/debug.hxx>
 #include <tools/stream.hxx>
-#ifndef _RTL_ALLOC_H
+
 #include <rtl/alloc.h>
-#endif
+
 #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
deleted file mode 100755
index ac2e586a41cb..000000000000
--- a/vcl/source/gdi/makefile.mk
+++ /dev/null
@@ -1,122 +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=gdi
-
-.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
-.IF "$(ENABLE_GRAPHITE)" == "TRUE"
-CDEFS+=-DENABLE_GRAPHITE
-.ENDIF
-
-# --- Files --------------------------------------------------------
-
-EXCEPTIONSFILES=	$(SLO)$/salmisc.obj 	\
-                    $(SLO)$/outdev.obj		\
-                    $(SLO)$/outdev3.obj 	\
-                    $(SLO)$/outdevnative.obj 	\
-                    $(SLO)$/gfxlink.obj		\
-                    $(SLO)$/print.obj		\
-                    $(SLO)$/print2.obj		\
-                    $(SLO)$/print3.obj		\
-                    $(SLO)$/oldprintadaptor.obj		\
-                    $(SLO)$/configsettings.obj 	\
-                    $(SLO)$/sallayout.obj		\
-                    $(SLO)$/image.obj		\
-                    $(SLO)$/impimage.obj		\
-                    $(SLO)$/impgraph.obj	\
-                    $(SLO)$/metric.obj		\
-                    $(SLO)$/pdfwriter_impl.obj	\
-                    $(SLO)$/pdfwriter_impl2.obj	\
-                    $(SLO)$/pdffontcache.obj\
-                    $(SLO)$/bmpconv.obj		\
-                    $(SLO)$/pdfextoutdevdata.obj	\
-                    $(SLO)$/jobset.obj		\
-                    $(SLO)$/impimagetree.obj		\
-                    $(SLO)$/pngread.obj		\
-                    $(SLO)$/pngwrite.obj    \
-                    $(SLO)$/virdev.obj \
-                    $(SLO)$/gdimtf.obj		\
-                    $(SLO)$/graphictools.obj \
-                    $(SLO)$/textlayout.obj   \
-                    $(SLO)$/lineinfo.obj
-
-SLOFILES=	$(EXCEPTIONSFILES)      \
-            $(SLO)$/animate.obj 	\
-            $(SLO)$/impanmvw.obj	\
-            $(SLO)$/bitmap.obj		\
-            $(SLO)$/bitmap2.obj 	\
-            $(SLO)$/bitmap3.obj 	\
-            $(SLO)$/bitmap4.obj 	\
-            $(SLO)$/alpha.obj		\
-            $(SLO)$/bitmapex.obj	\
-            $(SLO)$/bmpacc.obj		\
-            $(SLO)$/bmpacc2.obj 	\
-            $(SLO)$/bmpacc3.obj 	\
-            $(SLO)$/bmpfast.obj	\
-            $(SLO)$/cvtsvm.obj		\
-            $(SLO)$/cvtgrf.obj		\
-            $(SLO)$/font.obj		\
-            $(SLO)$/gradient.obj	\
-            $(SLO)$/hatch.obj		\
-            $(SLO)$/graph.obj		\
-            $(SLO)$/impbmp.obj		\
-            $(SLO)$/imagerepository.obj   \
-            $(SLO)$/impvect.obj 	\
-            $(SLO)$/mapmod.obj		\
-            $(SLO)$/metaact.obj 	\
-            $(SLO)$/octree.obj		\
-            $(SLO)$/outmap.obj		\
-            $(SLO)$/outdev2.obj 	\
-            $(SLO)$/outdev4.obj 	\
-            $(SLO)$/outdev5.obj 	\
-            $(SLO)$/outdev6.obj 	\
-            $(SLO)$/regband.obj 	\
-            $(SLO)$/region.obj		\
-            $(SLO)$/wall.obj		\
-            $(SLO)$/base14.obj		\
-            $(SLO)$/pdfwriter.obj	\
-            $(SLO)$/salgdilayout.obj	\
-            $(SLO)$/extoutdevdata.obj	\
-            $(SLO)$/salnativewidgets-none.obj
-
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :	target.mk
diff --git a/vcl/source/gdi/metric.cxx b/vcl/source/gdi/metric.cxx
index 01f88e9d8860..b05ae27a8f5f 100644
--- a/vcl/source/gdi/metric.cxx
+++ b/vcl/source/gdi/metric.cxx
@@ -28,7 +28,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 658856dbe100..be69d34bff7e 100644
--- a/vcl/source/gdi/octree.cxx
+++ b/vcl/source/gdi/octree.cxx
@@ -27,11 +27,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 ad89fda760b9..69caa0105999 100644..100755
--- a/vcl/source/gdi/outdev.cxx
+++ b/vcl/source/gdi/outdev.cxx
@@ -29,35 +29,34 @@
 #include "precompiled_vcl.hxx"
 
 #include <tools/ref.hxx>
-#ifndef _SV_SVSYS_HXX
-#include <svsys.h>
-#endif
-#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>
-#ifndef _POLY_HXX
-#include <tools/poly.hxx>
-#endif
 #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 6d98f79dcaaa..46b0d81c348d 100755
--- a/vcl/source/gdi/outdev2.cxx
+++ b/vcl/source/gdi/outdev2.cxx
@@ -28,30 +28,29 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-#ifndef _SV_SVSYS_HXX
-#include <svsys.h>
-#endif
-#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 25e589e70c95..e6d385ced122 100644..100755
--- a/vcl/source/gdi/outdev3.cxx
+++ b/vcl/source/gdi/outdev3.cxx
@@ -30,49 +30,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 a18b7ff48413..84fc4fd7c524 100644
--- a/vcl/source/gdi/outdev4.cxx
+++ b/vcl/source/gdi/outdev4.cxx
@@ -28,25 +28,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 627f75e88282..0a28203dbdfd 100644
--- a/vcl/source/gdi/outdev5.cxx
+++ b/vcl/source/gdi/outdev5.cxx
@@ -29,20 +29,19 @@
 #include "precompiled_vcl.hxx"
 
 #include <tools/ref.hxx>
-#ifndef _SV_SVSYS_HXX
-#include <svsys.h>
-#endif
-#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 eb4b76fb4b41..6752cb881b65 100644
--- a/vcl/source/gdi/outdev6.cxx
+++ b/vcl/source/gdi/outdev6.cxx
@@ -28,12 +28,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-#ifndef _SV_SVSYS_HXX
-#include <svsys.h>
-#endif
-#include <vcl/salgdi.hxx>
 #include <tools/debug.hxx>
-#include <vcl/outdev.h>
 #include <vcl/outdev.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/bmpacc.hxx>
@@ -42,16 +37,21 @@
 #include <vcl/svapp.hxx>
 #include <vcl/wrkwin.hxx>
 #include <vcl/graph.hxx>
-#include <vcl/wall2.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>
 
 // ========================================================================
 
diff --git a/vcl/source/gdi/outdevnative.cxx b/vcl/source/gdi/outdevnative.cxx
index cb472762338b..c31188fc357e 100755
--- a/vcl/source/gdi/outdevnative.cxx
+++ b/vcl/source/gdi/outdevnative.cxx
@@ -30,10 +30,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 1bdd86e13ecb..72bcd2cc8a14 100644
--- a/vcl/source/gdi/outmap.cxx
+++ b/vcl/source/gdi/outmap.cxx
@@ -30,25 +30,25 @@
 
 #include <limits.h>
 
-#ifndef _SV_SVSYS_HXX
-#include <svsys.h>
-#endif
 #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/pdffontcache.cxx b/vcl/source/gdi/pdffontcache.cxx
index 507ede81ef24..f0842c6bc1ba 100644
--- a/vcl/source/gdi/pdffontcache.cxx
+++ b/vcl/source/gdi/pdffontcache.cxx
@@ -28,9 +28,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 06ffff86b070..b9997c1e6fc9 100644
--- a/vcl/source/gdi/pdffontcache.hxx
+++ b/vcl/source/gdi/pdffontcache.hxx
@@ -30,8 +30,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_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
index 32f534129e07..331c264fee03 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -33,41 +33,52 @@
 #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 <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/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;
 using namespace rtl;
diff --git a/vcl/source/gdi/pdfwriter_impl.hxx b/vcl/source/gdi/pdfwriter_impl.hxx
index b6612d835ca2..06ee068343a7 100644
--- a/vcl/source/gdi/pdfwriter_impl.hxx
+++ b/vcl/source/gdi/pdfwriter_impl.hxx
@@ -37,14 +37,14 @@
 #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"
 #include "com/sun/star/util/XURLTransformer.hpp"
 #include "com/sun/star/lang/Locale.hpp"
 
-#include <vcl/sallayout.hxx>
+#include <sallayout.hxx>
 #include "pdffontcache.hxx"
 
 #include <vector>
diff --git a/vcl/source/gdi/pdfwriter_impl2.cxx b/vcl/source/gdi/pdfwriter_impl2.cxx
index 8546df1be705..7d1c1994c012 100644
--- a/vcl/source/gdi/pdfwriter_impl2.cxx
+++ b/vcl/source/gdi/pdfwriter_impl2.cxx
@@ -34,9 +34,12 @@
 #include "vcl/gdimtf.hxx"
 #include "vcl/metaact.hxx"
 #include "vcl/graph.hxx"
-#include "vcl/svdata.hxx"
+
+#include "svdata.hxx"
+
 #include "unotools/streamwrap.hxx"
 #include "unotools/processfactory.hxx"
+
 #include "comphelper/processfactory.hxx"
 
 #include "com/sun/star/beans/PropertyValue.hpp"
diff --git a/vcl/source/gdi/polyscan.cxx b/vcl/source/gdi/polyscan.cxx
deleted file mode 100644
index 7c69f79d50e6..000000000000
--- a/vcl/source/gdi/polyscan.cxx
+++ /dev/null
@@ -1,358 +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.
- *
- ************************************************************************/
-
-// 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 );
-    }
-}
diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx
index c00dfd7635ae..4a09d30299e9 100644
--- a/vcl/source/gdi/print.cxx
+++ b/vcl/source/gdi/print.cxx
@@ -31,30 +31,28 @@
 #define ENABLE_BYTESTRING_STREAM_OPERATORS
 #include <list>
 
-#ifndef _SV_SVSYS_HXX
-#include <svsys.h>
-#endif
-#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/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 <salinst.hxx>
+#include <salgdi.hxx>
+#include <salptype.hxx>
+#include <salprn.hxx>
+#include <svdata.hxx>
+#include <jobset.h>
+#include <outdev.h>
+#include <print.h>
+
 #include <comphelper/processfactory.hxx>
 
 #include "com/sun/star/beans/XPropertySet.hpp"
diff --git a/vcl/source/gdi/print2.cxx b/vcl/source/gdi/print2.cxx
index 01bf4ca90d65..d69d8e38be93 100644
--- a/vcl/source/gdi/print2.cxx
+++ b/vcl/source/gdi/print2.cxx
@@ -33,19 +33,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 <print.h>
+
 #include "pdfwriter_impl.hxx"
 
 // -----------
diff --git a/vcl/source/gdi/print3.cxx b/vcl/source/gdi/print3.cxx
index 34276fafdfe5..35356913d0d2 100755
--- a/vcl/source/gdi/print3.cxx
+++ b/vcl/source/gdi/print3.cxx
@@ -28,16 +28,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 cab1b6610d26..26d187c3e596 100644
--- a/vcl/source/gdi/region.cxx
+++ b/vcl/source/gdi/region.cxx
@@ -29,19 +29,16 @@
 #include "precompiled_vcl.hxx"
 
 #include <limits.h>
+
 #include <tools/vcompat.hxx>
-#include <vcl/salbtype.hxx>
 #include <tools/stream.hxx>
 #include <tools/debug.hxx>
-#ifndef _REGION_H
-#include <vcl/region.h>
-#endif
-#ifndef _REGION_HXX
+
 #include <vcl/region.hxx>
-#endif
-#ifndef _REGBAND_HXX
 #include <vcl/regband.hxx>
-#endif
+#include <vcl/salbtype.hxx>
+
+#include <region.h>
 
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
diff --git a/vcl/source/gdi/salgdilayout.cxx b/vcl/source/gdi/salgdilayout.cxx
index f3c381147054..5522e0e0232a 100755
--- a/vcl/source/gdi/salgdilayout.cxx
+++ b/vcl/source/gdi/salgdilayout.cxx
@@ -29,30 +29,31 @@
 #include "precompiled_vcl.hxx"
 
 #include <tools/ref.hxx>
-#ifndef _SV_SVSYS_HXX
-#include <svsys.h>
-#endif
-#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 5e187944c706..3a2251da5d84 100755
--- a/vcl/source/gdi/sallayout.cxx
+++ b/vcl/source/gdi/sallayout.cxx
@@ -34,19 +34,16 @@
 #include <math.h>
 #include <sal/alloca.h>
 
-#ifndef _SV_SVSYS_HXX
-#include <svsys.h>
-#endif
-#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>
 
-#ifndef _TL_DEBUG_HXX
 #include <tools/debug.hxx>
-#endif
 
 #include <limits.h>
 
diff --git a/vcl/source/gdi/salmisc.cxx b/vcl/source/gdi/salmisc.cxx
index f77ce914fd4d..d1cf56f6a044 100644
--- a/vcl/source/gdi/salmisc.cxx
+++ b/vcl/source/gdi/salmisc.cxx
@@ -30,7 +30,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 4cbce4c5298a..50048831f3b3 100644
--- a/vcl/source/gdi/salnativewidgets-none.cxx
+++ b/vcl/source/gdi/salnativewidgets-none.cxx
@@ -28,7 +28,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-#include <vcl/salgdi.hxx>
+#include <salgdi.hxx>
 
 using namespace rtl;
 
diff --git a/vcl/source/gdi/svcompat.cxx b/vcl/source/gdi/svcompat.cxx
deleted file mode 100644
index be0c9cd7dcc9..000000000000
--- a/vcl/source/gdi/svcompat.cxx
+++ /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.
- *
- ************************************************************************/
-
-// 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 );
-    }
-}
diff --git a/vcl/source/gdi/textlayout.cxx b/vcl/source/gdi/textlayout.cxx
index 6d69bc67b982..fa674d1a712b 100755
--- a/vcl/source/gdi/textlayout.cxx
+++ b/vcl/source/gdi/textlayout.cxx
@@ -30,8 +30,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 e6e100072679..cfea7205ee34 100644
--- a/vcl/source/gdi/virdev.cxx
+++ b/vcl/source/gdi/virdev.cxx
@@ -28,21 +28,20 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-#ifndef _SV_SVSYS_HXX
-#include <svsys.h>
-#endif
-#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 5b865038bb2b..ebad1e68a8ca 100644
--- a/vcl/source/gdi/wall.cxx
+++ b/vcl/source/gdi/wall.cxx
@@ -27,15 +27,18 @@
 
 // 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 );
 
diff --git a/vcl/source/glyphs/gcach_ftyp.cxx b/vcl/source/glyphs/gcach_ftyp.cxx
index 4e94df4810da..fc23dba23bfb 100644
--- a/vcl/source/glyphs/gcach_ftyp.cxx
+++ b/vcl/source/glyphs/gcach_ftyp.cxx
@@ -36,12 +36,13 @@
 #include "gcach_ftyp.hxx"
 
 #include "vcl/svapp.hxx"
-#include "vcl/outfont.hxx"
-#include "vcl/impfont.hxx"
+
+#include "outfont.hxx"
+#include "impfont.hxx"
 
 #include "tools/poly.hxx"
 #include "basegfx/matrix/b2dhommatrix.hxx"
-#include <basegfx/matrix/b2dhommatrixtools.hxx>
+#include "basegfx/matrix/b2dhommatrixtools.hxx"
 #include "basegfx/polygon/b2dpolypolygon.hxx"
 
 #include "osl/file.hxx"
diff --git a/vcl/source/glyphs/gcach_ftyp.hxx b/vcl/source/glyphs/gcach_ftyp.hxx
index e607af2a90a8..747219451b64 100644
--- a/vcl/source/glyphs/gcach_ftyp.hxx
+++ b/vcl/source/glyphs/gcach_ftyp.hxx
@@ -28,7 +28,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 84f1eef2e477..3fb0a21bd13c 100755
--- a/vcl/source/glyphs/gcach_layout.cxx
+++ b/vcl/source/glyphs/gcach_layout.cxx
@@ -30,8 +30,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 f5e259d8852c..34d0d4104590 100755
--- a/vcl/source/glyphs/gcach_rbmp.cxx
+++ b/vcl/source/glyphs/gcach_rbmp.cxx
@@ -28,7 +28,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/gcach_vdev.cxx b/vcl/source/glyphs/gcach_vdev.cxx
deleted file mode 100644
index b2ed9e891516..000000000000
--- a/vcl/source/glyphs/gcach_vdev.cxx
+++ /dev/null
@@ -1,287 +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.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_vcl.hxx"
-
-#include <gcach_vdev.hxx>
-
-#include <vcl/svapp.hxx>
-#include <vcl/bitmap.hxx>
-#include <vcl/outfont.hxx>
-#include <vcl/virdev.hxx>
-#include <vcl/metric.hxx>
-
-// =======================================================================
-// VirtDevServerFont
-// =======================================================================
-
-// -----------------------------------------------------------------------
-
-void VirtDevServerFont::AnnounceFonts( ImplDevFontList* pToAdd )
-{
-    // TODO: get fonts on server but not on client,
-    // problem is that currently there is no serverside virtual device...
-    VirtualDevice vdev( 1 );
-    long nCount = vdev.GetDevFontCount();
-
-    for( int i = 0; i < nCount; ++i )
-    {
-        const FontInfo aFontInfo = vdev.GetDevFont( i );
-
-        ImplFontData& rData = *new ImplFontData;
-        rData.SetSysData( new FontSysData( (void*)SERVERFONT_MAGIC ) );
-
-        rData.maName        = aFontInfo.GetName();
-        rData.maStyleName   = aFontInfo.GetStyleName();
-        rData.mnWidth       = aFontInfo.GetWidth();
-        rData.mnHeight      = aFontInfo.GetHeight();
-        rData.meFamily      = aFontInfo.GetFamily();
-        rData.meCharSet     = aFontInfo.GetCharSet();
-        rData.mePitch       = aFontInfo.GetPitch();
-        rData.meWidthType   = aFontInfo.GetWidthType();
-        rData.meWeight      = aFontInfo.GetWeight();
-        rData.meItalic      = aFontInfo.GetItalic();
-        rData.meType        = aFontInfo.GetType();
-        rData.meFamily      = aFontInfo.GetFamily();
-
-        rData.mbOrientation = true;         // TODO: where to get this info?
-        rData.mbDevice      = false;
-        rData.mnQuality     = 0;            // prefer client-side fonts if available
-
-        pToAdd->Add( &rData );
-    }
-}
-
-// -----------------------------------------------------------------------
-
-void VirtDevServerFont::ClearFontList()
-{
-    // TODO
-}
-
-// -----------------------------------------------------------------------
-
-VirtDevServerFont* VirtDevServerFont::CreateFont( const ImplFontSelectData& rFSD )
-{
-    VirtDevServerFont* pServerFont = NULL;
-    // TODO: search list of VirtDevServerFonts, return NULL if not found
-    // pServerFont = new VirtDevServerFont( rFSD );
-    return pServerFont;
-}
-
-// -----------------------------------------------------------------------
-
-VirtDevServerFont::VirtDevServerFont( const ImplFontSelectData& rFSD )
-:   ServerFont( rFSD)
-{}
-
-// -----------------------------------------------------------------------
-
-void VirtDevServerFont::FetchFontMetric( ImplFontMetricData& rTo, long& rFactor ) const
-{
-    const ImplFontSelectData& aFSD = GetFontSelData();
-
-    Font aFont;
-    aFont.SetName       ( aFSD.maName );
-    aFont.SetStyleName  ( aFSD.maStyleName );
-    aFont.SetHeight     ( aFSD.mnHeight );
-    aFont.SetWidth      ( aFSD.mnWidth );
-    aFont.SetOrientation( aFSD.mnOrientation );
-    aFont.SetVertical   ( GetFontSelData().mbVertical );
-
-    VirtualDevice vdev( 1 );
-    FontMetric aMetric( vdev.GetFontMetric( aFont ) );
-
-    rFactor = 0x100;
-
-    rTo.mnAscent        = aMetric.GetAscent();
-    rTo.mnDescent       = aMetric.GetDescent();
-    rTo.mnIntLeading    = aMetric.GetIntLeading();
-    rTo.mnExtLeading    = aMetric.GetExtLeading();
-    rTo.mnSlant     = aMetric.GetSlant();
-    rTo.meType      = aMetric.GetType();
-    rTo.mnFirstChar     = 0x0020;   // TODO: where to get this info?
-    rTo.mnLastChar      = 0xFFFE;   // TODO: where to get this info?
-
-    rTo.mnWidth         = aFSD.mnWidth;
-    rTo.maName          = aFSD.maName;
-    rTo.maStyleName     = aFSD.maStyleName;
-    rTo.mnOrientation   = aFSD.mnOrientation;
-    rTo.meFamily        = aFSD.meFamily;
-    rTo.meCharSet       = aFSD.meCharSet;
-    rTo.meWeight        = aFSD.meWeight;
-    rTo.meItalic        = aFSD.meItalic;
-    rTo.mePitch         = aFSD.mePitch;
-    rTo.mbDevice        = sal_False;
-}
-
-// -----------------------------------------------------------------------
-
-int VirtDevServerFont::GetGlyphIndex( sal_Unicode aChar ) const
-{
-    return aChar;
-}
-
-// -----------------------------------------------------------------------
-
-void VirtDevServerFont::InitGlyphData( int nGlyphIndex, GlyphData& rGD ) const
-{
-    Font aFont;
-    aFont.SetName       ( GetFontSelData().maName );
-    aFont.SetStyleName  ( GetFontSelData().maStyleName );
-    aFont.SetHeight     ( GetFontSelData().mnHeight );
-    aFont.SetWidth      ( GetFontSelData().mnWidth );
-    aFont.SetOrientation( GetFontSelData().mnOrientation );
-    aFont.SetVertical   ( GetFontSelData().mbVertical );
-
-    VirtualDevice vdev( 1 );
-    vdev.SetFont( aFont );
-
-    // get glyph metrics
-    sal_Int32 nCharWidth = 10;
-// TODO:    vdev.GetCharWidth( nGlyphIndex, nGlyphIndex, &nCharWidth );
-    rGD.SetCharWidth( nCharWidth );
-
-    sal_Unicode aChar = nGlyphIndex;
-    String aGlyphStr( &aChar, 1 );
-    Rectangle aRect;
-    if( vdev.GetTextBoundRect( aRect, aGlyphStr, 0, 1 ) )
-    {
-        rGD.SetOffset( aRect.Top(), aRect.Left() );
-        rGD.SetDelta( vdev.GetTextWidth( nGlyphIndex ), 0 );
-        rGD.SetSize( aRect.GetSize() );
-    }
-}
-
-// -----------------------------------------------------------------------
-
-bool VirtDevServerFont::GetAntialiasAdvice( void ) const
-{
-    return false;
-}
-
-// -----------------------------------------------------------------------
-
-bool VirtDevServerFont::GetGlyphBitmap1( int nGlyphIndex, RawBitmap& ) const
-{
-    /*
-    sal_Unicode aChar = nGlyphIndex;
-    String aGlyphStr( &aChar, 1 );
-
-    // draw bitmap
-    vdev.SetOutputSizePixel( aSize, sal_True );
-    vdev.DrawText( Point(0,0)-rGD.GetMetric().GetOffset(), aGlyphStr );
-
-    // create new glyph item
-
-    const Bitmap& rBitmap = vdev.GetBitmap( Point(0,0), aSize );
-    rGD.SetBitmap( new Bitmap( rBitmap ) );
-    return true;
-    */
-    return false;
-}
-
-// -----------------------------------------------------------------------
-
-bool     VirtDevServerFont::GetGlyphBitmap8( int nGlyphIndex, RawBitmap& ) const
-{
-    return false;
-}
-
-// -----------------------------------------------------------------------
-
-int VirtDevServerFont::GetGlyphKernValue( int, int ) const
-{
-    return 0;
-}
-
-// -----------------------------------------------------------------------
-
-sal_uLong VirtDevServerFont::GetKernPairs( ImplKernPairData** ppImplKernPairs ) const
-{
-    Font aFont;
-    aFont.SetName       ( GetFontSelData().maName );
-    aFont.SetStyleName  ( GetFontSelData().maStyleName );
-    aFont.SetHeight     ( GetFontSelData().mnHeight );
-    aFont.SetWidth      ( GetFontSelData().mnWidth );
-    aFont.SetOrientation( GetFontSelData().mnOrientation );
-    aFont.SetVertical   ( GetFontSelData().mbVertical );
-
-    VirtualDevice vdev( 1 );
-    vdev.SetFont( aFont );
-
-    sal_uLong nPairs = vdev.GetKerningPairCount();
-    if( nPairs > 0 )
-    {
-        KerningPair* const pKernPairs = new KerningPair[ nPairs ];
-        vdev.GetKerningPairs( nPairs, pKernPairs );
-
-        *ppImplKernPairs = new ImplKernPairData[ nPairs ];
-        ImplKernPairData* pTo = *ppImplKernPairs;
-        KerningPair* pFrom = pKernPairs;
-        for ( sal_uLong n = 0; n < nPairs; n++ )
-        {
-            pTo->mnChar1    = pFrom->nChar1;
-            pTo->mnChar2    = pFrom->nChar2;
-            pTo->mnKern     = pFrom->nKern;
-            ++pFrom;
-            ++pTo;
-        }
-
-        delete[] pKernPairs;
-    }
-
-    return nPairs;
-}
-
-// -----------------------------------------------------------------------
-
-bool VirtDevServerFont::GetGlyphOutline( int nGlyphIndex, PolyPolygon& rPolyPoly ) const
-{
-    return false;
-    /*
-    Font aFont;
-    aFont.SetName       ( GetFontSelData().maName );
-    aFont.SetStyleName  ( GetFontSelData().maStyleName );
-    aFont.SetHeight     ( GetFontSelData().mnHeight );
-    aFont.SetWidth      ( GetFontSelData().mnWidth );
-    aFont.SetOrientation( GetFontSelData().mnOrientation );
-    aFont.SetVertical   ( GetFontSelData().mbVertical );
-
-    VirtualDevice vdev( 1 );
-    vdev.SetFont( aFont );
-
-    const bool bOptimize = true;
-
-    sal_Unicode aChar = nGlyphIndex;
-    String aGlyphStr( &aChar, 1 );
-    return vdev.GetTextOutline( rPolyPoly, aGlyphStr, 0, 1, bOptimize );
-    */
-}
-
-// =======================================================================
diff --git a/vcl/source/glyphs/gcach_vdev.hxx b/vcl/source/glyphs/gcach_vdev.hxx
deleted file mode 100644
index 4e7d36a69f80..000000000000
--- a/vcl/source/glyphs/gcach_vdev.hxx
+++ /dev/null
@@ -1,57 +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.
- *
- ************************************************************************/
-
-#include <vcl/glyphcache.hxx>
-
-// -----------------------------------------------------------------------
-
-class VirtDevServerFont : public ServerFont
-{
-public:
-    virtual bool                GetAntialiasAdvice( void ) const;
-    virtual bool                GetGlyphBitmap1( int nGlyphIndex, RawBitmap& ) const;
-    virtual bool                GetGlyphBitmap8( int nGlyphIndex, RawBitmap& ) const;
-    virtual bool                GetGlyphOutline( int nGlyphIndex, PolyPolygon& ) const;
-
-protected:
-    friend class GlyphCache;
-    static void                 AnnounceFonts( ImplDevFontList* );
-    static void                 ClearFontList();
-
-    static VirtDevServerFont*   CreateFont( const ImplFontSelectData& );
-    virtual void                FetchFontMetric( ImplFontMetricData&, long& rFactor ) const;
-    virtual sal_uLong               GetKernPairs( ImplKernPairData** ) const;
-    virtual int                 GetGlyphKernValue( int, int ) const;
-
-    virtual int                 GetGlyphIndex( sal_Unicode ) const;
-    virtual void                InitGlyphData( int nGlyphIndex, GlyphData& ) const;
-
-private:
-                                VirtDevServerFont( const ImplFontSelectData& );
-};
-
-// -----------------------------------------------------------------------
diff --git a/vcl/source/glyphs/glyphcache.cxx b/vcl/source/glyphs/glyphcache.cxx
index 3b4b77cb5358..5dbec89e9619 100644
--- a/vcl/source/glyphs/glyphcache.cxx
+++ b/vcl/source/glyphs/glyphcache.cxx
@@ -31,15 +31,17 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <math.h>
-#include <vcl/salbtype.hxx>
+
 #include <gcach_ftyp.hxx>
 
 #include <vcl/svapp.hxx>
 #include <vcl/bitmap.hxx>
-#include <vcl/outfont.hxx>
+#include <vcl/salbtype.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_adaptors.cxx b/vcl/source/glyphs/graphite_adaptors.cxx
index 8507e55065f2..27c9eb02da64 100644
--- a/vcl/source/glyphs/graphite_adaptors.cxx
+++ b/vcl/source/glyphs/graphite_adaptors.cxx
@@ -45,17 +45,17 @@
 #include <i18npool/mslangid.hxx>
 // Platform
 #ifndef WNT
-#include <saldisp.hxx>
+#include <unx/saldisp.hxx>
 
-#include <vcl/salgdi.hxx>
+#include <salgdi.hxx>
 
 #include <freetype/ftsynth.h>
 
 // Module
 #include "gcach_ftyp.hxx"
 
-#include <vcl/graphite_features.hxx>
-#include <vcl/graphite_adaptors.hxx>
+#include <graphite_features.hxx>
+#include <graphite_adaptors.hxx>
 
 // Module private type definitions and forward declarations.
 //
diff --git a/vcl/source/glyphs/graphite_cache.cxx b/vcl/source/glyphs/graphite_cache.cxx
index 7682cdb6c8ba..a19f5c5a2c9d 100644
--- a/vcl/source/glyphs/graphite_cache.cxx
+++ b/vcl/source/glyphs/graphite_cache.cxx
@@ -34,7 +34,7 @@
 #endif
 
 #include <tools/debug.hxx>
-#include <vcl/sallayout.hxx>
+#include <sallayout.hxx>
 
 #include <preextstl.h>
 #include <graphite/GrClient.h>
@@ -42,8 +42,8 @@
 #include <postextstl.h>
 
 #include <rtl/ustring.hxx>
-#include <vcl/graphite_layout.hxx>
-#include <vcl/graphite_cache.hxx>
+#include <graphite_layout.hxx>
+#include <graphite_cache.hxx>
 
 #include "graphite_textsrc.hxx"
 
diff --git a/vcl/source/glyphs/graphite_features.cxx b/vcl/source/glyphs/graphite_features.cxx
index 1cb25306c4ee..4aba41c4b6d3 100644
--- a/vcl/source/glyphs/graphite_features.cxx
+++ b/vcl/source/glyphs/graphite_features.cxx
@@ -40,7 +40,7 @@
 #include <svsys.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 8a011606ab41..267454d825c5 100644
--- a/vcl/source/glyphs/graphite_layout.cxx
+++ b/vcl/source/glyphs/graphite_layout.cxx
@@ -57,10 +57,10 @@
 #endif
 
 #ifdef UNX
-#include <vcl/graphite_adaptors.hxx>
+#include <graphite_adaptors.hxx>
 #endif
 
-#include <vcl/salgdi.hxx>
+#include <salgdi.hxx>
 
 #include <unicode/uchar.h>
 #include <unicode/ubidi.h>
@@ -75,8 +75,8 @@
 #include <graphite/SegmentPainter.h>
 #include <postextstl.h>
 
-#include <vcl/graphite_layout.hxx>
-#include <vcl/graphite_features.hxx>
+#include <graphite_layout.hxx>
+#include <graphite_features.hxx>
 #include "graphite_textsrc.hxx"
 
 
@@ -102,7 +102,7 @@ FILE * grLog()
 #endif
 
 #ifdef GRCACHE
-#include <vcl/graphite_cache.hxx>
+#include <graphite_cache.hxx>
 #endif
 
 
diff --git a/vcl/source/glyphs/graphite_serverfont.cxx b/vcl/source/glyphs/graphite_serverfont.cxx
index eda97f509f03..ceba4dd4f6c8 100644
--- a/vcl/source/glyphs/graphite_serverfont.cxx
+++ b/vcl/source/glyphs/graphite_serverfont.cxx
@@ -35,12 +35,12 @@
 //
 
 // Platform
-#include <vcl/sallayout.hxx>
+#include <sallayout.hxx>
 // Module
 #include "gcach_ftyp.hxx"
-#include <vcl/graphite_features.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
index 5764ba9454c9..ac5fd0c558af 100644
--- a/vcl/source/glyphs/graphite_textsrc.cxx
+++ b/vcl/source/glyphs/graphite_textsrc.cxx
@@ -37,7 +37,7 @@
 #include <string>
 #include <cassert>
 #include "graphite_textsrc.hxx"
-#include <vcl/graphite_features.hxx>
+#include <graphite_features.hxx>
 
 // class TextSourceAdaptor implementation.
 //
diff --git a/vcl/source/glyphs/graphite_textsrc.hxx b/vcl/source/glyphs/graphite_textsrc.hxx
index 388f8a631b49..ece01cc1a532 100644
--- a/vcl/source/glyphs/graphite_textsrc.hxx
+++ b/vcl/source/glyphs/graphite_textsrc.hxx
@@ -43,17 +43,9 @@
 #include <tools/svwin.h>
 #endif
 
-#ifndef _SV_SVSYS_HXX
 #include <svsys.h>
-#endif
-
-#ifndef _SV_SALGDI_HXX
-#include <vcl/salgdi.hxx>
-#endif
-
-#ifndef _SV_SALLAYOUT_HXX
-#include <vcl/sallayout.hxx>
-#endif
+#include <salgdi.hxx>
+#include <sallayout.hxx>
 
 // Module
 #include "vcl/dllapi.h"
diff --git a/vcl/source/glyphs/makefile.mk b/vcl/source/glyphs/makefile.mk
deleted file mode 100644
index 74811aba6204..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_adaptors.obj	\
-        $(SLO)$/graphite_features.obj	\
-        $(SLO)$/graphite_cache.obj	\
-        $(SLO)$/graphite_textsrc.obj	\
-        $(SLO)$/graphite_serverfont.obj	\
-        $(SLO)$/graphite_layout.obj
-.ENDIF
-
-.ELSE
-
-.IF "$(ENABLE_GRAPHITE)" == "TRUE"
-# Graphite support on non-UNX platforms
-# make use of stlport headerfiles
-EXT_USE_STLPORT=TRUE
-SLOFILES=\
-        $(SLO)$/graphite_textsrc.obj	\
-        $(SLO)$/graphite_cache.obj	\
-        $(SLO)$/graphite_features.obj	\
-        $(SLO)$/graphite_layout.obj
-.ENDIF
-.ENDIF
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/vcl/source/helper/canvasbitmap.cxx b/vcl/source/helper/canvasbitmap.cxx
index 711a985b6fe5..f541ad92b552 100644
--- a/vcl/source/helper/canvasbitmap.cxx
+++ b/vcl/source/helper/canvasbitmap.cxx
@@ -37,7 +37,7 @@
 #include <vos/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 36fdd514efe9..1ab4f9a619d0 100644
--- a/vcl/source/helper/canvastools.cxx
+++ b/vcl/source/helper/canvastools.cxx
@@ -69,7 +69,7 @@
 #include <vcl/bmpacc.hxx>
 #include <vcl/bitmapex.hxx>
 
-#include <vcl/canvasbitmap.hxx>
+#include <canvasbitmap.hxx>
 #include <vcl/canvastools.hxx>
 #include <hash_map>
 
diff --git a/vcl/source/helper/lazydelete.cxx b/vcl/source/helper/lazydelete.cxx
index f5ecd02f39ae..b8ede1b5220a 100644
--- a/vcl/source/helper/lazydelete.cxx
+++ b/vcl/source/helper/lazydelete.cxx
@@ -33,7 +33,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 d35e4b30caac..b9c2950e4e2f 100644
--- a/vcl/source/helper/xconnection.cxx
+++ b/vcl/source/helper/xconnection.cxx
@@ -28,10 +28,9 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-#include "svsys.h"
-#include "vcl/xconnection.hxx"
-#include "vcl/svdata.hxx"
-#include "vcl/salinst.hxx"
+#include "xconnection.hxx"
+#include "svdata.hxx"
+#include "salinst.hxx"
 #include "vcl/svapp.hxx"
 
 namespace vcl
diff --git a/vcl/source/salmain/salmain.cxx b/vcl/source/salmain/salmain.cxx
index c2e3af01635a..56f197966276 100644
--- a/vcl/source/salmain/salmain.cxx
+++ b/vcl/source/salmain/salmain.cxx
@@ -32,7 +32,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 b786184fa2f3..a8962044b47d 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 a42a9531d9ee..f66683bfd5dc 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 000d7215d80d..987ee29277c7 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 161d821573b9..000000000000
--- a/vcl/source/src/makefile.mk
+++ /dev/null
@@ -1,57 +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           \
-                    throbber.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 04ab77f09288..6b0c378939f6 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 16b40b3f41a3..ea5f6ecad2ce 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>
 
 StringArray SV_FUNIT_STRINGS
 {
diff --git a/vcl/source/window/abstdlg.cxx b/vcl/source/window/abstdlg.cxx
index 7f00b73b0808..58f235bea25e 100644
--- a/vcl/source/window/abstdlg.cxx
+++ b/vcl/source/window/abstdlg.cxx
@@ -29,7 +29,6 @@
 #include "precompiled_vcl.hxx"
 
 #include <vcl/abstdlg.hxx>
-#include "cuilib.hxx"
 
 #include <osl/module.hxx>
 #include <tools/string.hxx>
@@ -42,7 +41,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::createFromAscii("CreateDialogFactory") );
     if ( fp )
diff --git a/vcl/source/window/accel.cxx b/vcl/source/window/accel.cxx
index be71aa3e02e6..29f6cc16a176 100644
--- a/vcl/source/window/accel.cxx
+++ b/vcl/source/window/accel.cxx
@@ -28,16 +28,13 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 #include <tools/list.hxx>
-#ifndef _TABLE_HXX
 #include <tools/table.hxx>
-#endif
 #include <tools/debug.hxx>
+#include <tools/rc.h>
+
 #include <vcl/svapp.hxx>
-#include <vcl/accel.h>
+#include <accel.h>
 #include <vcl/accel.hxx>
-#ifndef _RC_H
-#include <tools/rc.h>
-#endif
 
 
 
diff --git a/vcl/source/window/accmgr.cxx b/vcl/source/window/accmgr.cxx
index 6b30dd3a3c23..0781b50eb37b 100644
--- a/vcl/source/window/accmgr.cxx
+++ b/vcl/source/window/accmgr.cxx
@@ -29,9 +29,10 @@
 #include "precompiled_vcl.hxx"
 #include <tools/list.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 f016ef2c053b..90f8bc9a4c1e 100644
--- a/vcl/source/window/arrange.cxx
+++ b/vcl/source/window/arrange.cxx
@@ -27,9 +27,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 79454d8b1fe5..3a00b522952e 100644
--- a/vcl/source/window/brdwin.cxx
+++ b/vcl/source/window/brdwin.cxx
@@ -27,10 +27,12 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
-#ifndef _SV_SVIDS_HRC
-#include <vcl/svids.hrc>
-#endif
-#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>
@@ -42,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 4ce3c34d65e4..08132496dc36 100644
--- a/vcl/source/window/btndlg.cxx
+++ b/vcl/source/window/btndlg.cxx
@@ -30,14 +30,13 @@
 
 #include <tools/ref.hxx>
 #include <tools/debug.hxx>
-#include <vcl/svdata.hxx>
+#include <tools/rc.h>
+
+#include <svdata.hxx>
+
 #include <vcl/button.hxx>
 #include <vcl/btndlg.hxx>
 
-#ifndef _SV_RC_H
-#include <tools/rc.h>
-#endif
-
 
 
 // =======================================================================
diff --git a/vcl/source/window/cursor.cxx b/vcl/source/window/cursor.cxx
index 3be6fad02366..e978689bbf38 100644
--- a/vcl/source/window/cursor.cxx
+++ b/vcl/source/window/cursor.cxx
@@ -27,14 +27,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 73a3bc7eb981..031e947cbf13 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -29,14 +29,14 @@
 #include "precompiled_vcl.hxx"
 #include <tools/debug.hxx>
 
-#ifndef _SV_RC_H
 #include <tools/rc.h>
-#endif
-#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 bf4cc231fcc7..a8b297b1ad94 100644
--- a/vcl/source/window/dlgctrl.cxx
+++ b/vcl/source/window/dlgctrl.cxx
@@ -27,15 +27,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 e4d5a8c4c0eb..70453d6c4f9a 100644
--- a/vcl/source/window/dndevdis.cxx
+++ b/vcl/source/window/dndevdis.cxx
@@ -28,13 +28,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 <vos/mutex.hxx>
 #include <vcl/svapp.hxx>
-#include <vcl/svdata.hxx>
+
 using namespace ::osl;
 using namespace ::vos;
 using namespace ::cppu;
diff --git a/vcl/source/window/dndlcon.cxx b/vcl/source/window/dndlcon.cxx
index 07819e76f957..9d768ad49ac9 100644
--- a/vcl/source/window/dndlcon.cxx
+++ b/vcl/source/window/dndlcon.cxx
@@ -28,7 +28,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 6c8519b68a1e..4d1c77ab09b5 100644
--- a/vcl/source/window/dockingarea.cxx
+++ b/vcl/source/window/dockingarea.cxx
@@ -27,11 +27,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 c59cb4da5dc8..314aa67597b2 100644
--- a/vcl/source/window/dockmgr.cxx
+++ b/vcl/source/window/dockmgr.cxx
@@ -28,25 +28,24 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-#ifndef _SV_SVSYS_HXX
-#include <svsys.h>
-#endif
 #include <tools/time.hxx>
 #ifndef _SV_RC_H
 #include <tools/rc.h>
 #endif
+
+#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 eb16832e5c00..a3caabce0c5c 100644
--- a/vcl/source/window/dockwin.cxx
+++ b/vcl/source/window/dockwin.cxx
@@ -28,23 +28,20 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-#ifndef _SV_SVSYS_HXX
-#include <svsys.h>
-#endif
 #include <tools/time.hxx>
-#ifndef _SV_RC_H
 #include <tools/rc.h>
-#endif
+
 #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 170fcbd65cee..f8bf9a97d6dd 100644
--- a/vcl/source/window/floatwin.cxx
+++ b/vcl/source/window/floatwin.cxx
@@ -28,21 +28,18 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-#ifndef _SV_SVSYS_HXX
-#include <svsys.h>
-#endif
-#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>
-#ifndef _SV_RC_H
+
 #include <tools/rc.h>
-#endif
-#include <vcl/salframe.hxx>
 #include <tools/debug.hxx>
 
 
diff --git a/vcl/source/window/introwin.cxx b/vcl/source/window/introwin.cxx
index 03f88adc3566..4ed808852336 100644
--- a/vcl/source/window/introwin.cxx
+++ b/vcl/source/window/introwin.cxx
@@ -28,18 +28,15 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-#ifndef _SV_SVSYS_HXX
-#include <svsys.h>
-#endif
-#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 968c72abd383..44c0a8b79d0b 100644
--- a/vcl/source/window/keycod.cxx
+++ b/vcl/source/window/keycod.cxx
@@ -28,21 +28,14 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-#ifndef _SV_SVSYS_HXX
-#include <svsys.h>
-#endif
-#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>
-#ifndef _SV_KEYCOD_HXX
 #include <vcl/keycod.hxx>
-#endif
 
-#ifndef _RC_H
 #include <tools/rc.h>
-#endif
-
 
 
 // =======================================================================
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 dda796ba41e4..72715139f699 100755
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -28,38 +28,39 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-#include "svsys.h"
-#include "vcl/salinst.hxx"
 #include "tools/list.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 7b3dcfaa3341..ddfe8e9dc137 100644
--- a/vcl/source/window/msgbox.cxx
+++ b/vcl/source/window/msgbox.cxx
@@ -28,23 +28,21 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-#ifndef _SV_SVIDS_HRC
-#include <vcl/svids.hrc>
-#endif
-#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>
-#ifndef _SV_RC_H
-#include <tools/rc.h>
-#endif
 #include <vcl/mnemonic.hxx>
-#include <vcl/window.h>
 
 
 
diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx
index 83b1c9513a8d..ffc6a31beb0b 100644
--- a/vcl/source/window/printdlg.cxx
+++ b/vcl/source/window/printdlg.cxx
@@ -27,14 +27,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 31740214532b..178692ff45c2 100644
--- a/vcl/source/window/scrwnd.cxx
+++ b/vcl/source/window/scrwnd.cxx
@@ -33,19 +33,12 @@
 #include <tools/time.hxx>
 #include <tools/debug.hxx>
 
-#ifndef _SV_SVIDS_HRC
-#include <vcl/svids.hrc>
-#endif
-#include <vcl/svdata.hxx>
-#ifndef _VCL_TIMER_HXX
+#include <svids.hrc>
+#include <svdata.hxx>
+#include <scrwnd.hxx>
+
 #include <vcl/timer.hxx>
-#endif
-#ifndef _VCL_EVENT_HXX
 #include <vcl/event.hxx>
-#endif
-#ifndef _VCL_SCRWND_HXX
-#include <scrwnd.hxx>
-#endif
 
 #include <math.h>
 #include <limits.h>
diff --git a/vcl/source/window/split.cxx b/vcl/source/window/split.cxx
index face35a179d8..976c56cfea56 100644
--- a/vcl/source/window/split.cxx
+++ b/vcl/source/window/split.cxx
@@ -28,19 +28,20 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-#ifndef _SV_RC_H
 #include <tools/rc.h>
-#endif
+#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 3a66ead3944c..1d701752389c 100644
--- a/vcl/source/window/splitwin.cxx
+++ b/vcl/source/window/splitwin.cxx
@@ -29,22 +29,22 @@
 #include "precompiled_vcl.hxx"
 
 #include <string.h>
+
 #include <tools/list.hxx>
 #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>
-#ifndef _SV_SVIDS_HRC
-#include <vcl/svids.hrc>
-#endif
 #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 a261b6bd96a7..ee673e87c4b5 100644
--- a/vcl/source/window/status.cxx
+++ b/vcl/source/window/status.cxx
@@ -27,20 +27,20 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
+
 #include <tools/list.hxx>
 #include <tools/debug.hxx>
-
-#ifndef _SV_RC_H
 #include <tools/rc.h>
-#endif
-#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 9e7a30e983cb..bddf1f9606ad 100644..100755
--- a/vcl/source/window/syschild.cxx
+++ b/vcl/source/window/syschild.cxx
@@ -28,21 +28,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
@@ -53,8 +58,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;
 
 // =======================================================================
diff --git a/vcl/source/window/syswin.cxx b/vcl/source/window/syswin.cxx
index 48c7629c2026..3313402dfef6 100644
--- a/vcl/source/window/syswin.cxx
+++ b/vcl/source/window/syswin.cxx
@@ -29,16 +29,8 @@
 #include "precompiled_vcl.hxx"
 #include <tools/debug.hxx>
 
-#ifndef _SV_SVSYS_HXX
-#include <svsys.h>
-#endif
-#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>
@@ -46,6 +38,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 dcb95b9b52a2..459e07f97042 100644
--- a/vcl/source/window/tabpage.cxx
+++ b/vcl/source/window/tabpage.cxx
@@ -29,20 +29,17 @@
 #include "precompiled_vcl.hxx"
 
 #include <tools/ref.hxx>
-
-#ifndef _SV_RC_H
 #include <tools/rc.h>
-#endif
-#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 71a8f2ec2a30..f4f40f6722bf 100644
--- a/vcl/source/window/taskpanelist.cxx
+++ b/vcl/source/window/taskpanelist.cxx
@@ -27,11 +27,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 105cf18bb43a..682c65e47a6f 100644..100755
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -28,17 +28,13 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-#ifndef _SV_SVSYS_HXX
-#include <svsys.h>
-#endif
 #include <rtl/logfile.hxx>
+
 #include <tools/list.hxx>
 #include <tools/debug.hxx>
-
-#ifndef _SV_RC_H
 #include <tools/rc.h>
-#endif
-#include <vcl/svdata.hxx>
+#include <tools/poly.hxx>
+
 #include <vcl/event.hxx>
 #include <vcl/decoview.hxx>
 #include <vcl/accel.hxx>
@@ -48,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 c993c9143a2c..fd6fb5dffb6b 100644
--- a/vcl/source/window/toolbox2.cxx
+++ b/vcl/source/window/toolbox2.cxx
@@ -27,26 +27,26 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
+
 #include <tools/list.hxx>
 #include <tools/debug.hxx>
-
-#ifndef _SV_RC_H
 #include <tools/rc.h>
-#endif
-#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 0a44486839f6..d7d22f3d5c5d 100644..100755
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -27,48 +27,58 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
-#ifndef _SV_SVSYS_HXX
-#include "svsys.h"
-#endif
-#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"
-#ifndef _SV_RC_H
 #include "tools/rc.h"
-#endif
-#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"
@@ -85,16 +95,6 @@
 #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 "vcl/pdfextoutdevdata.hxx"
-#include "vcl/lazydelete.hxx"
-
 #include <set>
 #include <typeinfo>
 
@@ -9679,7 +9679,7 @@ sal_Bool Window::IsNativeWidgetEnabled() const
 }
 
 #ifdef WNT // see #140456#
-#include <salframe.h>
+#include <win/salframe.h>
 #endif
 
 Reference< rendering::XCanvas > Window::ImplGetCanvas( const Size& rFullscreenSize,
diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx
index 669fce05a791..2513170a4d25 100644
--- a/vcl/source/window/window2.cxx
+++ b/vcl/source/window/window2.cxx
@@ -29,31 +29,28 @@
 #include "precompiled_vcl.hxx"
 
 #include <limits.h>
-#ifndef _SV_SVSYS_HXX
-#include <svsys.h>
-#endif
-#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>
-#ifndef _SV_SCRWND_HXX
-#include <scrwnd.hxx>
-#endif
 #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 9cb38756e770..c011fb667f21 100644
--- a/vcl/source/window/winproc.cxx
+++ b/vcl/source/window/winproc.cxx
@@ -28,40 +28,37 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-#ifndef _SV_SVSYS_HXX
-#include <svsys.h>
-#endif
-#include <vcl/salwtype.hxx>
-#include <vcl/salframe.hxx>
 #include <tools/debug.hxx>
-#ifndef _INTN_HXX
-//#include <tools/intn.hxx>
-#endif
+
+#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>
 
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 81c2b36345eb..0e667de73067 100644..100755
--- a/vcl/source/window/wrkwin.cxx
+++ b/vcl/source/window/wrkwin.cxx
@@ -28,22 +28,20 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-#ifndef _SV_SVSYS_HXX
-#include <svsys.h>
-#endif
-#include <vcl/salframe.hxx>
 #include <tools/debug.hxx>
-
-#ifndef _SV_RC_H
 #include <tools/rc.h>
-#endif
-#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 <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 9756c728250d..341c1263ac9e 100644
--- a/vcl/unx/source/app/i18n_cb.cxx
+++ b/vcl/unx/generic/app/i18n_cb.cxx
@@ -30,22 +30,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"
-#ifndef _OSL_THREAD_H
-#include <osl/thread.h>
-#endif
-#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 46471d553dda..73de37538d61 100644
--- a/vcl/unx/source/app/i18n_ic.cxx
+++ b/vcl/unx/generic/app/i18n_ic.cxx
@@ -29,29 +29,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 <unx/salunx.h>
+#include <unx/XIM.h>
+#include <unx/i18n_ic.hxx>
+#include <unx/i18n_im.hxx>
+#include <unx/i18n_status.hxx>
 
-#include <XIM.h>
-#include <i18n_ic.hxx>
-#include <i18n_im.hxx>
-#include <i18n_status.hxx>
-
-#ifndef _SV_SALFRAME_HXX
-#include <salframe.h>
-#endif
-#include <saldata.hxx>
-#include <saldisp.hxx>
-
-#ifndef _OSL_THREAD_H
-#include <osl/thread.h>
-#endif
+#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 c797da34e76c..176212f681d5 100644
--- a/vcl/unx/source/app/i18n_im.cxx
+++ b/vcl/unx/generic/app/i18n_im.cxx
@@ -30,6 +30,7 @@
 
 #include <stdio.h>
 #include <string.h>
+
 #ifdef LINUX
 #  ifndef __USE_XOPEN
 #    define __USE_XOPEN
@@ -40,19 +41,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 812e54aae937..122a88517baf 100644
--- a/vcl/unx/source/app/i18n_keysym.cxx
+++ b/vcl/unx/generic/app/i18n_keysym.cxx
@@ -31,7 +31,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 844775779935..04ffe8bd8d71 100644
--- a/vcl/unx/source/app/i18n_status.cxx
+++ b/vcl/unx/generic/app/i18n_status.cxx
@@ -35,25 +35,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;
 using namespace rtl;
 
diff --git a/vcl/unx/source/app/i18n_wrp.cxx b/vcl/unx/generic/app/i18n_wrp.cxx
index eb48962a24d0..ff56f0ed0647 100644
--- a/vcl/unx/source/app/i18n_wrp.cxx
+++ b/vcl/unx/generic/app/i18n_wrp.cxx
@@ -43,9 +43,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 e9a787eda667..5587bbf02339 100644
--- a/vcl/unx/source/app/i18n_xkb.cxx
+++ b/vcl/unx/generic/app/i18n_xkb.cxx
@@ -31,9 +31,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 b48f0e629bd9..73d4b2a2e7eb 100644
--- a/vcl/unx/source/app/keysymnames.cxx
+++ b/vcl/unx/generic/app/keysymnames.cxx
@@ -34,7 +34,7 @@
 #include <tools/postx.h>
 #endif
 
-#include <saldisp.hxx>
+#include <unx/saldisp.hxx>
 #include <X11/keysym.h>
 
 #if !defined (SunXK_Undo)
diff --git a/vcl/unx/source/app/randrwrapper.cxx b/vcl/unx/generic/app/randrwrapper.cxx
index 27f9b1d1b77c..e7f37c00e2ca 100644
--- a/vcl/unx/source/app/randrwrapper.cxx
+++ b/vcl/unx/generic/app/randrwrapper.cxx
@@ -282,8 +282,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 b14c11ac783e..ec8db9509bf6 100644
--- a/vcl/unx/source/app/saldata.cxx
+++ b/vcl/unx/generic/app/saldata.cxx
@@ -56,29 +56,27 @@
 #include <sys/time.h>
 #include <unistd.h>
 #endif
+
 #include <vos/process.hxx>
-#ifndef _VOS_MUTEX_HXX
 #include <vos/mutex.hxx>
-#endif
 
-#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 <osl/process.h>
 #include <rtl/strbuf.hxx>
-#ifndef _RTL_BOOTSTRAP_HXX
 #include <rtl/bootstrap.hxx>
-#endif
 
 #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 91f6934f27f0..b06a664c57a6 100644
--- a/vcl/unx/source/app/saldisp.cxx
+++ b/vcl/unx/generic/app/saldisp.cxx
@@ -48,8 +48,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
@@ -75,25 +75,25 @@ 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>
 #ifndef _OSL_THREADMUTEX_H_
 #include <osl/mutex.h>
 #endif
-#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 8814e6c65f89..3b57544ebad0 100644
--- a/vcl/unx/source/app/salinst.cxx
+++ b/vcl/unx/generic/app/salinst.cxx
@@ -32,23 +32,24 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <osl/module.hxx>
+#include "osl/module.hxx"
+#include "tools/solarmutex.hxx"
+#include "vos/mutex.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 "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 "vcl/salwtype.hxx"
 #include "vcl/apptypes.hxx"
 #include "vcl/helper.hxx"
-#include <tools/solarmutex.hxx>
-#include "vos/mutex.hxx"
+
+#include "salwtype.hxx"
 
 // -------------------------------------------------------------------------
 //
@@ -101,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 5e2b870f559f..672b3e53e672 100644
--- a/vcl/unx/source/app/salsys.cxx
+++ b/vcl/unx/generic/app/salsys.cxx
@@ -28,16 +28,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 1085967f74a2..af8b2df4124b 100644
--- a/vcl/unx/source/app/saltimer.cxx
+++ b/vcl/unx/generic/app/saltimer.cxx
@@ -34,11 +34,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 21d9b8df60f3..c8090270d611 100644
--- a/vcl/unx/source/app/sm.cxx
+++ b/vcl/unx/generic/app/sm.cxx
@@ -36,19 +36,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 ddb14e9ecc39..bb41299c376d 100644
--- a/vcl/unx/source/app/soicon.cxx
+++ b/vcl/unx/generic/app/soicon.cxx
@@ -28,20 +28,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>
-#ifndef _SV_BITMAP_HXX
 #include <vcl/bitmapex.hxx>
-#endif
 #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 f816c5d1426e..90b2e5426bdf 100644
--- a/vcl/unx/source/app/wmadaptor.cxx
+++ b/vcl/unx/generic/app/wmadaptor.cxx
@@ -31,17 +31,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 "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 74ab2e2c3ea2..777e5aa921d3 100644
--- a/vcl/unx/source/desktopdetect/desktopdetector.cxx
+++ b/vcl/unx/generic/desktopdetect/desktopdetector.cxx
@@ -28,18 +28,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>
 
 using namespace rtl;
@@ -253,7 +253,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 a08a9481b8e8..a08a9481b8e8 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 21bf547a9cb7..21bf547a9cb7 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 e6fc3dd8a532..e6fc3dd8a532 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 9b48d346f03b..9b48d346f03b 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 5db23329abd8..5db23329abd8 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 403ee9707a94..2561df0ec591 100644
--- a/vcl/unx/source/dtrans/X11_selection.cxx
+++ b/vcl/unx/generic/dtrans/X11_selection.cxx
@@ -28,8 +28,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 47baa1776d1a..47baa1776d1a 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 e14d81643553..fcd99535eb61 100644
--- a/vcl/unx/source/dtrans/X11_service.cxx
+++ b/vcl/unx/generic/dtrans/X11_service.cxx
@@ -28,7 +28,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 16518f0b2864..16518f0b2864 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 57f0d6682cab..57f0d6682cab 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 1ccd04eba725..1ccd04eba725 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 b59b4417ca69..b59b4417ca69 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 001da3900bb7..001da3900bb7 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 e3d0e3e76530..e3d0e3e76530 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 f25b0863d807..f25b0863d807 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 c60edc3b99d0..c60edc3b99d0 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 cf0f89f63b1b..cf0f89f63b1b 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 b79412bc3f41..b79412bc3f41 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 e25d0837d8dc..e25d0837d8dc 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 8e208e32f293..8e208e32f293 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 7cbecef2c60f..7cbecef2c60f 100644
--- a/vcl/unx/source/inc/nodrop_mask.h
+++ b/vcl/unx/generic/dtrans/nodrop_mask.h
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_hash.cpp b/vcl/unx/generic/fontmanager/afm_hash.cpp
index de01d8cd0434..de01d8cd0434 100755
--- a/vcl/unx/source/fontmanager/afm_hash.cpp
+++ b/vcl/unx/generic/fontmanager/afm_hash.cpp
diff --git a/vcl/unx/source/fontmanager/afm_keyword_list b/vcl/unx/generic/fontmanager/afm_keyword_list
index 263d76bca4d3..263d76bca4d3 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 0c43373bfa8e..639e394f0edd 100644
--- a/vcl/unx/source/fontmanager/fontcache.cxx
+++ b/vcl/unx/generic/fontmanager/fontcache.cxx
@@ -31,7 +31,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 434263db352e..be7904c55959 100644
--- a/vcl/unx/source/fontmanager/fontconfig.cxx
+++ b/vcl/unx/generic/fontmanager/fontconfig.cxx
@@ -28,9 +28,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"
 
 using namespace psp;
 
diff --git a/vcl/unx/source/fontmanager/fontmanager.cxx b/vcl/unx/generic/fontmanager/fontmanager.cxx
index 21183dc567ec..f5431026fb02 100644
--- a/vcl/unx/source/fontmanager/fontmanager.cxx
+++ b/vcl/unx/generic/fontmanager/fontmanager.cxx
@@ -36,15 +36,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 05213a52597c..05213a52597c 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 e1a33b4d1b5d..e1a33b4d1b5d 100644
--- a/vcl/unx/source/fontmanager/parseAFM.cxx
+++ b/vcl/unx/generic/fontmanager/parseAFM.cxx
diff --git a/vcl/unx/source/fontmanager/parseAFM.hxx b/vcl/unx/generic/fontmanager/parseAFM.hxx
index cfebde696c14..cfebde696c14 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 ee0054814761..af635f38e9bc 100644
--- a/vcl/unx/source/gdi/cdeint.cxx
+++ b/vcl/unx/generic/gdi/cdeint.cxx
@@ -27,17 +27,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 5f0dbd50ea17..d14389cd0438 100644
--- a/vcl/unx/source/gdi/dtint.cxx
+++ b/vcl/unx/generic/gdi/dtint.cxx
@@ -34,23 +34,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 5406ac870a43..5406ac870a43 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 9b876eb329b8..3cd828c24065 100644
--- a/vcl/unx/source/gdi/gcach_xpeer.cxx
+++ b/vcl/unx/generic/gdi/gcach_xpeer.cxx
@@ -28,15 +28,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 13277fa975de..a65c75174858 100644
--- a/vcl/unx/source/gdi/gcach_xpeer.hxx
+++ b/vcl/unx/generic/gdi/gcach_xpeer.hxx
@@ -28,13 +28,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 0edf2326b58d..f2e5b1669e0c 100644
--- a/vcl/unx/source/gdi/pspgraphics.cxx
+++ b/vcl/unx/generic/gdi/pspgraphics.cxx
@@ -28,20 +28,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 <stdlib.h>
 #include <unistd.h>
 #include <fcntl.h>
@@ -49,9 +35,25 @@
 #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"
+
 #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 42d657b431bd..732ae465df52 100644
--- a/vcl/unx/source/gdi/salbmp.cxx
+++ b/vcl/unx/generic/gdi/salbmp.cxx
@@ -34,19 +34,22 @@
 #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 <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 c699cdb12335..c699cdb12335 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 c142c76fe5d0..6d0e3bf9650c 100644
--- a/vcl/unx/source/gdi/salcvt.hxx
+++ b/vcl/unx/generic/gdi/salcvt.hxx
@@ -27,10 +27,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 979e3927024a..6dc8135a53d7 100644
--- a/vcl/unx/source/gdi/salgdi.cxx
+++ b/vcl/unx/generic/gdi/salgdi.cxx
@@ -28,19 +28,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 "tools/debug.hxx"
 
 #include "basegfx/polygon/b2dpolygon.hxx"
@@ -54,6 +41,19 @@
 #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 <vector>
 #include <queue>
 #include <set>
diff --git a/vcl/unx/source/gdi/salgdi2.cxx b/vcl/unx/generic/gdi/salgdi2.cxx
index 018f7514dfeb..266d3cd41be7 100644
--- a/vcl/unx/source/gdi/salgdi2.cxx
+++ b/vcl/unx/generic/gdi/salgdi2.cxx
@@ -31,17 +31,19 @@
 #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"
 
 #undef SALGDI2_TESTTRANS
diff --git a/vcl/unx/source/gdi/salgdi3.cxx b/vcl/unx/generic/gdi/salgdi3.cxx
index c719b33a1fbf..8cbecd1e259a 100644
--- a/vcl/unx/source/gdi/salgdi3.cxx
+++ b/vcl/unx/generic/gdi/salgdi3.cxx
@@ -38,26 +38,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"
 
@@ -73,11 +53,33 @@
 
 #include "i18npool/mslangid.hxx"
 
+#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"
+
+
 #include <hash_set>
 
 #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 f3b50db6a9d9..4ab0cecb8f3e 100644
--- a/vcl/unx/source/gdi/salprnpsp.cxx
+++ b/vcl/unx/generic/gdi/salprnpsp.cxx
@@ -40,28 +40,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"
 
 using namespace psp;
 using namespace rtl;
@@ -71,8 +73,6 @@ using namespace com::sun::star;
  *  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 675deef90ffe..9f18ba6388ea 100644
--- a/vcl/unx/source/gdi/salvd.cxx
+++ b/vcl/unx/generic/gdi/salvd.cxx
@@ -28,17 +28,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 8d24e4098df4..32e656bcbf5f 100644
--- a/vcl/unx/source/gdi/xrender_peer.cxx
+++ b/vcl/unx/generic/gdi/xrender_peer.cxx
@@ -29,16 +29,17 @@
 #include "precompiled_vcl.hxx"
 
 #include <stdio.h>
+
 #include <rtl/ustring.hxx>
 #include <osl/module.h>
-//#include <osl/thread.h>
-using namespace rtl;
+
+#include <unx/salunx.h>
+#include <unx/saldata.hxx>
+#include <unx/saldisp.hxx>
 
 #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 89dccfcef40b..89dccfcef40b 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 fd49ee34f543..00058bf24461 100644
--- a/vcl/unx/source/plugadapt/salplug.cxx
+++ b/vcl/unx/generic/plugadapt/salplug.cxx
@@ -33,9 +33,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>
@@ -68,7 +67,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 caf3249b5f46..97fe10f4d7ce 100644
--- a/vcl/unx/source/printer/cupsmgr.cxx
+++ b/vcl/unx/generic/printer/cupsmgr.cxx
@@ -1135,8 +1135,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 811f93bcb826..811f93bcb826 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 9a85d02db894..9a85d02db894 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 421ce74b98d8..7108d7fb2a5c 100644
--- a/vcl/unx/source/printer/printerinfomanager.cxx
+++ b/vcl/unx/generic/printer/printerinfomanager.cxx
@@ -35,7 +35,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 1421fb7433f7..9275db1e469f 100644
--- a/vcl/unx/source/printergfx/bitmap_gfx.cxx
+++ b/vcl/unx/generic/printergfx/bitmap_gfx.cxx
@@ -30,7 +30,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 fa032c46a74b..6ebf79cfac73 100644
--- a/vcl/unx/source/printergfx/common_gfx.cxx
+++ b/vcl/unx/generic/printergfx/common_gfx.cxx
@@ -31,8 +31,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 8885a6b42c1e..9b0f5fb99c43 100644
--- a/vcl/unx/source/printergfx/glyphset.cxx
+++ b/vcl/unx/generic/printergfx/glyphset.cxx
@@ -33,9 +33,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 320e8e071955..320e8e071955 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 947eb290ec60..351d1af9b41d 100644
--- a/vcl/unx/source/printergfx/printerjob.cxx
+++ b/vcl/unx/generic/printergfx/printerjob.cxx
@@ -38,11 +38,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 370114be47cb..370114be47cb 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 d4af41bb95ed..d4af41bb95ed 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 1901aa0d004a..7934821d4d70 100644
--- a/vcl/unx/source/printergfx/text_gfx.cxx
+++ b/vcl/unx/generic/printergfx/text_gfx.cxx
@@ -33,7 +33,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 4683864fd116..4683864fd116 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 a687870ede4a..a687870ede4a 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 5ad3a9d94375..c0348beb6a34 100644
--- a/vcl/unx/source/window/salframe.cxx
+++ b/vcl/unx/generic/window/salframe.cxx
@@ -33,6 +33,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>
@@ -43,32 +53,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 <com/sun/star/uno/Exception.hpp>
 
 #include <algorithm>
diff --git a/vcl/unx/source/window/salobj.cxx b/vcl/unx/generic/window/salobj.cxx
index 93aeeba66ee8..49225e2c99ce 100644
--- a/vcl/unx/source/window/salobj.cxx
+++ b/vcl/unx/generic/window/salobj.cxx
@@ -28,29 +28,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>
-#ifndef _SV_SALINST_HXX
-#include <salinst.h>
-#endif
-#include <saldisp.hxx>
-#ifndef _SV_SALFRAME_HXX
-#include <salframe.h>
-#endif
-#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 25add8e0dd18..71c05bd16626 100644
--- a/vcl/unx/gtk/a11y/atkbridge.cxx
+++ b/vcl/unx/gtk/a11y/atkbridge.cxx
@@ -28,8 +28,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 d2574f616539..9588123f4032 100644
--- a/vcl/unx/gtk/a11y/atkfactory.cxx
+++ b/vcl/unx/gtk/a11y/atkfactory.cxx
@@ -28,7 +28,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 c4fdc54e9064..b1e4bde84756 100644
--- a/vcl/unx/gtk/a11y/atkwindow.cxx
+++ b/vcl/unx/gtk/a11y/atkwindow.cxx
@@ -28,7 +28,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 14d3014ddf11..000000000000
--- a/vcl/unx/gtk/a11y/makefile.mk
+++ /dev/null
@@ -1,93 +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
-
-# workaround for makedepend hang
-MKDEPENDSOLVER=
-NO_DEFAULT_STL=YES
-
-# --- 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 36d475b8795b..4140894c36af 100644
--- a/vcl/unx/gtk/app/gtkdata.cxx
+++ b/vcl/unx/gtk/app/gtkdata.cxx
@@ -46,19 +46,19 @@
 #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 <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>
 
diff --git a/vcl/unx/gtk/app/gtkinst.cxx b/vcl/unx/gtk/app/gtkinst.cxx
index 2b0e90dc9bc0..888e2ed883b9 100644
--- a/vcl/unx/gtk/app/gtkinst.cxx
+++ b/vcl/unx/gtk/app/gtkinst.cxx
@@ -29,13 +29,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>
 
@@ -131,7 +130,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 272af20d0886..daaf4b27bc5c 100644
--- a/vcl/unx/gtk/app/gtksys.cxx
+++ b/vcl/unx/gtk/app/gtksys.cxx
@@ -28,10 +28,10 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-#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 3e8cd750bf7a..000000000000
--- a/vcl/unx/gtk/app/makefile.mk
+++ /dev/null
@@ -1,76 +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
-
-.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 34a7cfcd196b..ff5063def03d 100644
--- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
@@ -28,12 +28,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>
@@ -41,10 +45,6 @@
 #include <algorithm>
 #include <hash_map>
 
-#include "saldata.hxx"
-#include "saldisp.hxx"
-#include "vcl/svapp.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 aa5926702731..5f4a2bda25f8 100644
--- a/vcl/unx/gtk/window/gtkframe.cxx
+++ b/vcl/unx/gtk/window/gtkframe.cxx
@@ -28,17 +28,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>
 
@@ -49,8 +48,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 <algorithm>
 
diff --git a/vcl/unx/gtk/window/gtkobject.cxx b/vcl/unx/gtk/window/gtkobject.cxx
index f7ef753dc628..68c8f1f1286d 100644
--- a/vcl/unx/gtk/window/gtkobject.cxx
+++ b/vcl/unx/gtk/window/gtkobject.cxx
@@ -28,10 +28,10 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-#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 e62f24a171e2..e5a40320bc4c 100644
--- a/vcl/unx/headless/svpbmp.hxx
+++ b/vcl/unx/headless/svpbmp.hxx
@@ -28,7 +28,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 a72ba11e5c12..cec6540adc79 100644
--- a/vcl/unx/headless/svpdummies.hxx
+++ b/vcl/unx/headless/svpdummies.hxx
@@ -27,10 +27,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 af40fb66fb7f..0e9a78a4562e 100644
--- a/vcl/unx/headless/svpframe.hxx
+++ b/vcl/unx/headless/svpframe.hxx
@@ -27,9 +27,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.hxx b/vcl/unx/headless/svpgdi.hxx
index a7486a55198f..54acdf384d63 100644
--- a/vcl/unx/headless/svpgdi.hxx
+++ b/vcl/unx/headless/svpgdi.hxx
@@ -27,11 +27,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 bce609b95035..ebd0ee457bd5 100644
--- a/vcl/unx/headless/svpinst.cxx
+++ b/vcl/unx/headless/svpinst.cxx
@@ -30,17 +30,19 @@
 #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 <sal/types.h>
+#include <salframe.hxx>
+#include <svdata.hxx>
+#include <saldatabasic.hxx>
 
 // plugin factory function
 extern "C"
diff --git a/vcl/unx/headless/svpinst.hxx b/vcl/unx/headless/svpinst.hxx
index 736916bbaced..cf6def7f3d8a 100644
--- a/vcl/unx/headless/svpinst.hxx
+++ b/vcl/unx/headless/svpinst.hxx
@@ -28,12 +28,13 @@
 #ifndef _SVP_SALINST_HXX
 #define _SVP_SALINST_HXX
 
-#include <vcl/salinst.hxx>
-#include <vcl/salwtype.hxx>
-#include <vcl/saltimer.hxx>
 #include <vos/mutex.hxx>
 #include <vos/thread.hxx>
 
+#include <salinst.hxx>
+#include <salwtype.hxx>
+#include <saltimer.hxx>
+
 #include <list>
 
 #include <time.h>  // timeval
diff --git a/vcl/unx/headless/svpprn.cxx b/vcl/unx/headless/svpprn.cxx
index 0c8a119806af..0a5eb0ad0e7b 100644
--- a/vcl/unx/headless/svpprn.cxx
+++ b/vcl/unx/headless/svpprn.cxx
@@ -28,21 +28,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 namespace rtl;
 
diff --git a/vcl/unx/headless/svpprn.hxx b/vcl/unx/headless/svpprn.hxx
index 84dbf8277054..d7064522e2b3 100644
--- a/vcl/unx/headless/svpprn.hxx
+++ b/vcl/unx/headless/svpprn.hxx
@@ -29,9 +29,12 @@
 #define _SVP_SVPPRN_HXX
 
 #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;
 
@@ -101,7 +104,7 @@ public:
 class Timer;
 
 namespace vcl_sal {
-class VCL_DLLPUBLIC PrinterUpdate
+class VCLPLUG_SVP_PUBLIC PrinterUpdate
 {
     static Timer*           pPrinterUpdateTimer;
     static int              nActiveJobs;
diff --git a/vcl/unx/headless/svppspgraphics.cxx b/vcl/unx/headless/svppspgraphics.cxx
index 6fdc8aac75d0..365a0b34632c 100644
--- a/vcl/unx/headless/svppspgraphics.cxx
+++ b/vcl/unx/headless/svppspgraphics.cxx
@@ -28,32 +28,33 @@
 // 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 "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"
 
 using namespace psp;
 using namespace rtl;
diff --git a/vcl/unx/headless/svppspgraphics.hxx b/vcl/unx/headless/svppspgraphics.hxx
index fe9352c1fd8b..b677382f2fe9 100644
--- a/vcl/unx/headless/svppspgraphics.hxx
+++ b/vcl/unx/headless/svppspgraphics.hxx
@@ -30,8 +30,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 fba7fe4bf31d..243e2b6ec422 100644
--- a/vcl/unx/headless/svptext.cxx
+++ b/vcl/unx/headless/svptext.cxx
@@ -25,12 +25,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>
@@ -39,10 +37,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 784a2ad6f664..d66a31905c04 100644
--- a/vcl/unx/headless/svpvd.hxx
+++ b/vcl/unx/headless/svpvd.hxx
@@ -28,7 +28,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 ae3938b4fbb9..a6badfbea23e 100644
--- a/vcl/unx/kde/kdedata.cxx
+++ b/vcl/unx/kde/kdedata.cxx
@@ -45,18 +45,21 @@
 #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 <tools/debug.hxx>
-#include "i18n_im.hxx"
-#include "i18n_xkb.hxx"
+
 #include <vos/process.hxx>
-#ifndef _VOS_MUTEX_HXX
 #include <vos/mutex.hxx>
-#endif
+
+#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.
@@ -227,7 +230,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 30cbb0cea365..c9f35b295511 100644
--- a/vcl/unx/kde/salnativewidgets-kde.cxx
+++ b/vcl/unx/kde/salnativewidgets-kde.cxx
@@ -31,23 +31,16 @@
 #define _SV_SALNATIVEWIDGETS_KDE_CXX
 #include <shell/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>
 
-#ifndef _SV_SALGDI_HXX
-#include <salgdi.h>
-#endif
-
-#ifndef _SV_SALGDI_HXX
-#include <salframe.h>
-#endif
 #include <vcl/settings.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.cxx b/vcl/unx/kde4/KDEData.cxx
index 99871edadae3..dcf1db32068e 100644
--- a/vcl/unx/kde4/KDEData.cxx
+++ b/vcl/unx/kde4/KDEData.cxx
@@ -51,4 +51,4 @@ void KDEData::initNWF()
 
 void KDEData::deInitNWF()
 {
-}
\ No newline at end of file
+}
diff --git a/vcl/unx/kde4/KDEData.hxx b/vcl/unx/kde4/KDEData.hxx
index 7cf5836c9688..753deb697e95 100644
--- a/vcl/unx/kde4/KDEData.hxx
+++ b/vcl/unx/kde4/KDEData.hxx
@@ -27,8 +27,8 @@
 
 #pragma once
 
-#include <saldisp.hxx>
-#include <saldata.hxx>
+#include <unx/saldisp.hxx>
+#include <unx/saldata.hxx>
 
 class KDEData : public X11SalData
 {
@@ -39,4 +39,4 @@ class KDEData : public X11SalData
         virtual void Init();
         virtual void initNWF();
         virtual void deInitNWF();
-};
\ No newline at end of file
+};
diff --git a/vcl/unx/kde4/KDESalDisplay.cxx b/vcl/unx/kde4/KDESalDisplay.cxx
index d67399528a7c..41fa9fedde3f 100644
--- a/vcl/unx/kde4/KDESalDisplay.cxx
+++ b/vcl/unx/kde4/KDESalDisplay.cxx
@@ -42,4 +42,4 @@ SalKDEDisplay::~SalKDEDisplay()
     doDestruct();
     // prevent SalDisplay from closing KApplication's display
     pDisp_ = NULL;
-}
\ No newline at end of file
+}
diff --git a/vcl/unx/kde4/KDESalDisplay.hxx b/vcl/unx/kde4/KDESalDisplay.hxx
index 1ab966b1847b..8287bbfb9bda 100644
--- a/vcl/unx/kde4/KDESalDisplay.hxx
+++ b/vcl/unx/kde4/KDESalDisplay.hxx
@@ -27,7 +27,7 @@
 
 #pragma once
 
-#include <saldisp.hxx>
+#include <unx/saldisp.hxx>
 
 class SalKDEDisplay : public SalX11Display
 {
@@ -35,3 +35,4 @@ class SalKDEDisplay : public SalX11Display
         SalKDEDisplay( Display* pDisp );
             virtual ~SalKDEDisplay();
 };
+
diff --git a/vcl/unx/kde4/KDESalFrame.cxx b/vcl/unx/kde4/KDESalFrame.cxx
index 0c8f04f9fe41..6741fb7449ae 100644
--- a/vcl/unx/kde4/KDESalFrame.cxx
+++ b/vcl/unx/kde4/KDESalFrame.cxx
@@ -44,13 +44,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>
@@ -86,12 +87,14 @@ static OUString readEntryUntranslated( KConfigGroup *pGroup, const char *pKey )
     return OUString::createFromAscii( (const char *) pGroup->readEntryUntranslated( pKey ).toAscii() );
 }
 
+#if 0
 /** Helper function to read color from KConfig configuration repository.
 */
 static Color readColor( KConfigGroup *pGroup, const char *pKey )
 {
     return toColor( pGroup->readEntry( pKey, QColor(Qt::white) ) );
 }
+#endif
 
 /** Helper function to add information to Font from QFont.
 
@@ -402,4 +405,4 @@ SalGraphics* KDESalFrame::GetGraphics()
     }
 
     return NULL;
-}
\ No newline at end of file
+}
diff --git a/vcl/unx/kde4/KDESalFrame.hxx b/vcl/unx/kde4/KDESalFrame.hxx
index 643be72c27f3..a518017855cb 100644
--- a/vcl/unx/kde4/KDESalFrame.hxx
+++ b/vcl/unx/kde4/KDESalFrame.hxx
@@ -27,8 +27,8 @@
 
 #pragma once
 
-#include <saldisp.hxx>
-#include <salframe.h>
+#include <unx/saldisp.hxx>
+#include <unx/salframe.h>
 
 class KDESalFrame : public X11SalFrame
 {
@@ -55,4 +55,4 @@ class KDESalFrame : public X11SalFrame
         virtual void updateGraphics( bool bClear );
         virtual void UpdateSettings( AllSettings& rSettings );
         virtual void Show( BOOL bVisible, BOOL bNoActivate );
-};
\ No newline at end of file
+};
diff --git a/vcl/unx/kde4/KDESalGraphics.hxx b/vcl/unx/kde4/KDESalGraphics.hxx
index 0bce1700f1fc..327ba0b3d464 100644
--- a/vcl/unx/kde4/KDESalGraphics.hxx
+++ b/vcl/unx/kde4/KDESalGraphics.hxx
@@ -28,8 +28,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>
@@ -110,4 +110,4 @@ class KDESalGraphics : public X11SalGraphics
                                             const ImplControlValue& aValue,
                                             const rtl::OUString& aCaption,
                                             Rectangle &rNativeBoundingRegion, Rectangle &rNativeContentRegion );
-};
\ No newline at end of file
+};
diff --git a/vcl/unx/kde4/KDESalInstance.cxx b/vcl/unx/kde4/KDESalInstance.cxx
index 01c4723bd530..e06bf1a3cf7a 100644
--- a/vcl/unx/kde4/KDESalInstance.cxx
+++ b/vcl/unx/kde4/KDESalInstance.cxx
@@ -32,4 +32,4 @@
 SalFrame* KDESalInstance::CreateFrame( SalFrame *pParent, ULONG nState )
 {
     return new KDESalFrame( pParent, nState );
-}
\ No newline at end of file
+}
diff --git a/vcl/unx/kde4/KDESalInstance.hxx b/vcl/unx/kde4/KDESalInstance.hxx
index 7d050fe6819e..dc1e52b26717 100644
--- a/vcl/unx/kde4/KDESalInstance.hxx
+++ b/vcl/unx/kde4/KDESalInstance.hxx
@@ -27,7 +27,7 @@
 
 #pragma once
 
-#include <salinst.h>
+#include <unx/salinst.h>
 
 class SalYieldMutex;
 class SalFrame;
@@ -38,4 +38,4 @@ class KDESalInstance : public X11SalInstance
         KDESalInstance( SalYieldMutex* pMutex ) : X11SalInstance( pMutex ) {}
         virtual ~KDESalInstance() {}
         virtual SalFrame* CreateFrame( SalFrame* pParent, ULONG nStyle );
-};
\ No newline at end of file
+};
diff --git a/vcl/unx/kde4/KDEXLib.cxx b/vcl/unx/kde4/KDEXLib.cxx
index 6a2793b8abe3..f60e84c0bc02 100644
--- a/vcl/unx/kde4/KDEXLib.cxx
+++ b/vcl/unx/kde4/KDEXLib.cxx
@@ -25,6 +25,8 @@
  *
  ************************************************************************/
 
+#include <vos/process.hxx>
+
 #include "VCLKDEApplication.hxx"
 
 #define Region QtXRegion
@@ -39,11 +41,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 <vos/process.hxx>
+#include <unx/saldata.hxx>
 
 #include "KDESalDisplay.hxx"
 
diff --git a/vcl/unx/kde4/KDEXLib.hxx b/vcl/unx/kde4/KDEXLib.hxx
index 985e0c3c6717..561f6ee73a78 100644
--- a/vcl/unx/kde4/KDEXLib.hxx
+++ b/vcl/unx/kde4/KDEXLib.hxx
@@ -27,7 +27,7 @@
 
 #pragma once
 
-#include <saldisp.hxx>
+#include <unx/saldisp.hxx>
 
 class KDEXLib : public SalXLib
 {
@@ -46,3 +46,4 @@ class KDEXLib : public SalXLib
 
         void doStartup();
 };
+
diff --git a/vcl/unx/kde4/VCLKDEApplication.cxx b/vcl/unx/kde4/VCLKDEApplication.cxx
index 2cfb071e96ae..94d28d2e698a 100644
--- a/vcl/unx/kde4/VCLKDEApplication.cxx
+++ b/vcl/unx/kde4/VCLKDEApplication.cxx
@@ -39,14 +39,14 @@ VCLKDEApplication::VCLKDEApplication() :
     disp = 0;
 }
 
-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
-    if (disp && disp->Dispatch(event) > 0)
+    if (disp && disp->Dispatch(ev) > 0)
     {
         return true;
     }
 
     return false;
-}
\ No newline at end of file
+}
diff --git a/vcl/unx/kde4/VCLKDEApplication.hxx b/vcl/unx/kde4/VCLKDEApplication.hxx
index 2edfddd69a9c..7cbbe38b61df 100644
--- a/vcl/unx/kde4/VCLKDEApplication.hxx
+++ b/vcl/unx/kde4/VCLKDEApplication.hxx
@@ -50,4 +50,4 @@ class VCLKDEApplication : public KApplication
         virtual bool x11EventFilter(XEvent* event);
 
         SalKDEDisplay* disp;
-};
\ No newline at end of file
+};
diff --git a/vcl/unx/kde4/main.cxx b/vcl/unx/kde4/main.cxx
index 962a882af26b..063cdf2bef86 100644
--- a/vcl/unx/kde4/main.cxx
+++ b/vcl/unx/kde4/main.cxx
@@ -35,6 +35,8 @@
 #include "KDEData.hxx"
 #include "KDESalInstance.hxx"
 
+#include "vclpluginapi.h"
+
 #if OSL_DEBUG_LEVEL > 1
 #include <stdio.h>
 #endif
@@ -43,7 +45,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 fd1e9ca59236..000000000000
--- a/vcl/unx/kde4/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=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)
-
-.IF "$(ENABLE_RANDR)" != ""
-CDEFS+=-DUSE_RANDR
-.ENDIF
-
-SLOFILES=\
-    $(SLO)$/main.obj \
-    $(SLO)$/VCLKDEApplication.obj \
-    $(SLO)$/KDEXLib.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
diff --git a/vcl/unx/source/app/makefile.mk b/vcl/unx/source/app/makefile.mk
deleted file mode 100644
index bd7549945c7c..000000000000
--- a/vcl/unx/source/app/makefile.mk
+++ /dev/null
@@ -1,110 +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_xkb.obj		\
-            $(SLO)$/i18n_wrp.obj		\
-            $(SLO)$/i18n_status.obj		\
-            $(SLO)$/i18n_keysym.obj		\
-            $(SLO)$/saldata.obj			\
-            $(SLO)$/saltimer.obj		\
-            $(SLO)$/saldisp.obj			\
-            $(SLO)$/randrwrapper.obj	\
-            $(SLO)$/salinst.obj			\
-            $(SLO)$/salsys.obj			\
-            $(SLO)$/soicon.obj			\
-            $(SLO)$/sm.obj				\
-            $(SLO)$/keysymnames.obj		\
-            $(SLO)$/wmadaptor.obj
-
-EXCEPTIONSFILES=\
-            $(SLO)$/wmadaptor.obj		\
-            $(SLO)$/saldata.obj			\
-            $(SLO)$/salinst.obj			\
-            $(SLO)$/saldisp.obj			\
-            $(SLO)$/i18n_status.obj		\
-            $(SLO)$/i18n_cb.obj				\
-            $(SLO)$/i18n_ic.obj				\
-            $(SLO)$/salsys.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 c6a23b88f35b..000000000000
--- a/vcl/unx/source/fontmanager/makefile.mk
+++ /dev/null
@@ -1,72 +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)
-
-
-# --- 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
diff --git a/vcl/unx/source/gdi/makefile.mk b/vcl/unx/source/gdi/makefile.mk
deleted file mode 100644
index 123fcbcf9131..000000000000
--- a/vcl/unx/source/gdi/makefile.mk
+++ /dev/null
@@ -1,101 +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
-.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 e8a63d6195aa..000000000000
--- a/vcl/unx/source/inc/salcursors.h
+++ /dev/null
@@ -1,162 +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.
- *
- ************************************************************************/
-
-#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"
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 99d1c4537111..000000000000
--- a/vcl/util/linksvp/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=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)
-SHL1STDLIBS=\
-            $(VCLLIB)\
-            $(I18NPAPERLIB)\
-            $(BASEBMPLIB)\
-            $(BASEGFXLIB)\
-            $(TOOLSLIB)         \
-            $(VOSLIB)           \
-            $(SALLIB)
-.ENDIF # GUIBASE unx
-
-
-# --- Allgemein ----------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/vcl/util/makefile.mk b/vcl/util/makefile.mk
deleted file mode 100644
index 8d1de2ed30f0..000000000000
--- a/vcl/util/makefile.mk
+++ /dev/null
@@ -1,475 +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=vcl
-TARGETTYPE=GUI
-USE_DEFFILE=TRUE
-GEN_HID_OTHER=TRUE
-
-.IF "$(SNDFILE_LIBS)"!=""
-SNDFILELIB=$(SNDFILE_LIBS)
-.ENDIF
-
-# --- Settings -----------------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  makefile.pmk
-.INCLUDE :  makefile2.pmk
-
-.IF "$(OS)" == "SOLARIS"
-.IF "$(CPUNAME)" == "SPARC" && "$(CPU)" == "U"
-LINKFLAGSRUNPATH_OOO := -R/usr/sfw/lib/64 $(LINKFLAGSRUNPATH_OOO)
-.ELSE
-LINKFLAGSRUNPATH_OOO := -R/usr/sfw/lib $(LINKFLAGSRUNPATH_OOO)
-.ENDIF
-.ENDIF
-
-# --- Allgemein ----------------------------------------------------------
-
-HXXDEPNLST= $(INC)$/vcl$/accel.hxx       \
-            $(INC)$/vcl$/animate.hxx     \
-            $(INC)$/vcl$/apptypes.hxx    \
-            $(INC)$/vcl$/bitmap.hxx      \
-            $(INC)$/vcl$/bitmapex.hxx    \
-            $(INC)$/vcl$/bmpacc.hxx      \
-            $(INC)$/vcl$/btndlg.hxx      \
-            $(INC)$/vcl$/button.hxx      \
-            $(INC)$/vcl$/ctrl.hxx        \
-            $(INC)$/vcl$/cursor.hxx      \
-            $(INC)$/vcl$/cmdevt.hxx      \
-            $(INC)$/vcl$/decoview.hxx    \
-            $(INC)$/vcl$/dialog.hxx      \
-            $(INC)$/vcl$/dllapi.h        \
-            $(INC)$/vcl$/dockwin.hxx     \
-            $(INC)$/vcl$/edit.hxx        \
-            $(INC)$/vcl$/event.hxx       \
-            $(INC)$/vcl$/field.hxx       \
-            $(INC)$/vcl$/fixed.hxx       \
-            $(INC)$/vcl$/floatwin.hxx    \
-            $(INC)$/vcl$/font.hxx        \
-            $(INC)$/vcl$/floatwin.hxx    \
-            $(INC)$/vcl$/graph.hxx       \
-            $(INC)$/vcl$/group.hxx       \
-            $(INC)$/vcl$/help.hxx        \
-            $(INC)$/vcl$/jobset.hxx      \
-            $(INC)$/vcl$/keycodes.hxx    \
-            $(INC)$/vcl$/keycod.hxx      \
-            $(INC)$/vcl$/image.hxx       \
-            $(INC)$/vcl$/lstbox.h             \
-            $(INC)$/vcl$/lstbox.hxx      \
-            $(INC)$/vcl$/mapmod.hxx      \
-            $(INC)$/vcl$/metaact.hxx     \
-            $(INC)$/vcl$/menu.hxx        \
-            $(INC)$/vcl$/menubtn.hxx     \
-            $(INC)$/vcl$/metric.hxx      \
-            $(INC)$/vcl$/morebtn.hxx     \
-            $(INC)$/vcl$/msgbox.hxx      \
-            $(INC)$/vcl$/octree.hxx      \
-            $(INC)$/vcl$/outdev.hxx      \
-            $(INC)$/vcl$/pointr.hxx      \
-            $(INC)$/vcl$/ptrstyle.hxx    \
-            $(INC)$/vcl$/prntypes.hxx    \
-            $(INC)$/vcl$/print.hxx       \
-            $(INC)$/vcl$/prndlg.hxx      \
-            $(INC)$/vcl$/region.hxx      \
-            $(INC)$/vcl$/salbtype.hxx    \
-            $(INC)$/vcl$/scrbar.hxx      \
-            $(INC)$/vcl$/slider.hxx      \
-            $(INC)$/vcl$/seleng.hxx      \
-            $(INC)$/vcl$/settings.hxx    \
-            $(INC)$/vcl$/sound.hxx       \
-            $(INC)$/vcl$/sndstyle.hxx    \
-            $(INC)$/vcl$/split.hxx       \
-            $(INC)$/vcl$/splitwin.hxx    \
-            $(INC)$/vcl$/spin.hxx        \
-            $(INC)$/vcl$/spinfld.hxx     \
-            $(INC)$/vcl$/status.hxx      \
-            $(INC)$/vcl$/stdtext.hxx     \
-            $(INC)$/vcl$/sv.h            \
-            $(INC)$/vcl$/svapp.hxx       \
-            $(INC)$/vcl$/syschild.hxx    \
-            $(INC)$/vcl$/sysdata.hxx     \
-            $(INC)$/vcl$/syswin.hxx      \
-            $(INC)$/vcl$/tabctrl.hxx     \
-            $(INC)$/vcl$/tabdlg.hxx      \
-            $(INC)$/vcl$/tabpage.hxx     \
-            $(INC)$/vcl$/toolbox.hxx     \
-            $(INC)$/vcl$/timer.hxx       \
-            $(INC)$/vcl$/virdev.hxx      \
-            $(INC)$/vcl$/wall.hxx        \
-            $(INC)$/vcl$/waitobj.hxx     \
-            $(INC)$/vcl$/window.hxx      \
-            $(INC)$/vcl$/wrkwin.hxx
-
-.IF "$(linkinc)" != ""
-SHL11FILE=  $(MISC)$/app.slo
-SHL12FILE=  $(MISC)$/gdi.slo
-SHL13FILE=  $(MISC)$/win.slo
-SHL14FILE=  $(MISC)$/ctrl.slo
-#SHL15FILE=  $(MISC)$/ex.slo
-SHL16FILE=  $(MISC)$/salapp.slo
-SHL17FILE=  $(MISC)$/salwin.slo
-SHL18FILE=  $(MISC)$/salgdi.slo
-.ENDIF
-
-LIB1TARGET= $(SLB)$/$(TARGET).lib
-LIB1FILES=  $(SLB)$/app.lib         \
-            $(SLB)$/gdi.lib         \
-            $(SLB)$/win.lib         \
-            $(SLB)$/ctrl.lib        \
-            $(SLB)$/helper.lib	    \
-            $(SLB)$/fontsubset.lib  \
-            $(SLB)$/components.lib
-
-.IF "$(GUI)" == "UNX" && "$(GUIBASE)"!="aqua"
-LIB1FILES+= $(SLB)$/salplug.lib  \
-            $(SLB)$/fontman.lib  \
-            $(SLB)$/printer.lib
-.ELSE
-LIB1FILES+= \
-            $(SLB)$/salwin.lib  \
-            $(SLB)$/salgdi.lib  \
-            $(SLB)$/salapp.lib
-.IF "$(GUIBASE)" == "aqua"
-LIB1FILES+= $(SLB)$/dtransaqua.lib
-.ENDIF
-.ENDIF
-
-SHL1TARGET= vcl$(DLLPOSTFIX)
-SHL1IMPLIB= ivcl
-SHL1STDLIBS+=\
-            $(SOTLIB)           \
-            $(UNOTOOLSLIB)      \
-            $(TOOLSLIB)         \
-            $(I18NPAPERLIB)     \
-            $(I18NISOLANGLIB)   \
-            $(I18NUTILLIB)      \
-            $(COMPHELPERLIB)	\
-            $(UCBHELPERLIB)     \
-            $(CPPUHELPERLIB)    \
-            $(CPPULIB)          \
-            $(VOSLIB)           \
-            $(SALLIB)			\
-            $(BASEGFXLIB)		\
-            $(ICUUCLIB)			\
-            $(ICUDATALIB)		\
-            $(ICULELIB)			\
-            $(JVMACCESSLIB)
-
-.IF "$(GUI)" == "UNX"
-.IF "$(ENABLE_GRAPHITE)" != ""
-.IF "$(SYSTEM_GRAPHITE)" == "YES"
-SHL1STDLIBS+= $(GRAPHITE_LIBS)
-.ELSE
-SHL1STDLIBS+= $(SOLARVERSION)/$(INPATH)/lib$(UPDMINOREXT)/libgraphite.a
-.ENDIF
-.ENDIF
-.ENDIF
-SHL1USE_EXPORTS=name
-
-.IF "$(GUIBASE)"=="aqua"
-SHL1STDLIBS+= \
-    $(BASEBMPLIB) \
-    -lAppleRemote$(DLLPOSTFIX) \
-    -framework QuickTime
-
-LIB1FILES+= \
-            $(SLB)$/sala11y.lib
-.ENDIF
-
-.IF "$(USE_BUILTIN_RASTERIZER)"!=""
-    LIB1FILES +=    $(SLB)$/glyphs.lib
-    SHL1STDLIBS+=   $(FREETYPELIB)
-.ELSE
-.IF "$(ENABLE_GRAPHITE)" == "TRUE"
-    LIB1FILES +=    $(SLB)$/glyphs.lib
-.ENDIF
-.ENDIF # USE_BUILTIN_RASTERIZER
-
-SHL1LIBS=   $(LIB1TARGET)
-.IF "$(GUI)"!="UNX"
-.IF "$(COM)"!="GCC"
-#SHL1OBJS=   $(SLO)$/salshl.obj
-.ENDIF
-.ENDIF
-
-.IF "$(GUI)" != "UNX"
-SHL1RES=    $(RES)$/salsrc.res
-.ENDIF
-
-SHL1DEF=    $(MISC)$/$(SHL1TARGET).def
-
-DEF1NAME    =$(SHL1TARGET)
-DEF1DEPN    =   $(HXXDEPNLST) \
-                $(LIB1TARGET)
-DEF1DES     =VCL
-DEFLIB1NAME =vcl
-
-# --- W32 ----------------------------------------------------------------
-
-.IF "$(GUI)" == "WNT"
-
-.IF "$(ENABLE_GRAPHITE)" == "TRUE"
-.IF "$(COM)" == "GCC"
-SHL1STDLIBS += -lgraphite
-.ELSE
-SHL1STDLIBS += graphite_dll.lib
-.ENDIF
-.ENDIF
-
-SHL1STDLIBS += $(UWINAPILIB)      \
-               $(GDI32LIB)        \
-               $(GDIPLUSLIB)	  \
-               $(MSIMG32LIB)      \
-               $(WINSPOOLLIB)     \
-               $(OLE32LIB)        \
-               $(SHELL32LIB)      \
-               $(ADVAPI32LIB)
-
-SHL1STDLIBS += $(IMM32LIB)
-
-.IF "$(GUI)$(COM)$(CPU)" == "WNTMSCI"
-LINKFLAGSSHL += /ENTRY:LibMain@12
-.ENDIF
-.ENDIF
-
-# --- OS2 ----------------------------------------------------------------
-
-.IF "$(GUI)" == "OS2"
-STDSHL1 += ft2lib.lib
-.ENDIF
-
-# --- UNX ----------------------------------------------------------------
-
-# UNX sal plugins
-.IF "$(GUI)" == "UNX" && "$(GUIBASE)" != "aqua"
-
-# desktop detector
-LIB7TARGET=$(SLB)$/idet
-LIB7FILES=$(SLB)$/dtdetect.lib
-SHL7TARGET=desktop_detector$(DLLPOSTFIX)
-SHL7STDLIBS=\
-            $(SALLIB) \
-            $(X11LINK_DYNAMIC)
-SHL7IMPLIB=idet
-SHL7LIBS=$(LIB7TARGET)
-
-# basic pure X11 plugin
-LIB2TARGET=$(SLB)$/ipure_x
-LIB2FILES= \
-            $(SLB)$/dtransX11.lib  \
-            $(SLB)$/printergfx.lib  \
-            $(SLB)$/salwin.lib  \
-            $(SLB)$/salgdi.lib  \
-            $(SLB)$/salapp.lib
-SHL2TARGET=vclplug_gen$(DLLPOSTFIX)
-SHL2IMPLIB=ipure_x
-SHL2LIBS=$(LIB2TARGET)
-SHL2DEPN=$(SHL1IMPLIBN) $(SHL1TARGETN)
-
-# libs for generic plugin
-SHL2STDLIBS=\
-            $(VCLLIB)\
-            $(I18NPAPERLIB)     \
-            $(I18NISOLANGLIB)     \
-            $(TOOLSLIB)         \
-            $(VOSLIB)           \
-            $(BASEGFXLIB)	\
-            $(UNOTOOLSLIB) \
-            $(COMPHELPERLIB)	\
-            $(CPPUHELPERLIB) \
-            $(CPPULIB) \
-            $(SALLIB)
-
-# prepare linking of Xinerama
-.IF "$(USE_XINERAMA)" != "NO"
-
-.IF "$(OS)"=="MACOSX" || "$(OS)$(CPU)" == "LINUXX"
-XINERAMALIBS=-lXinerama
-.ELSE
-.IF "$(OS)" != "SOLARIS" || "$(USE_XINERAMA_VERSION)" == "Xorg"
-.IF "$(XINERAMA_LINK)" == "dynamic"
-XINERAMALIBS= -lXinerama
-.ELSE
-XINERAMALIBS= -Wl,-Bstatic -lXinerama -Wl,-Bdynamic 
-.ENDIF # XINERAMA_LINK == dynamic
-.ENDIF # OS == SOLARIS
-.ENDIF # OS == MACOSX
-
-SHL2STDLIBS += $(XINERAMALIBS)
-.ENDIF # USE_XINERAMA != NO
-
-.IF "$(XRENDER_LINK)" == "YES"
-SHL2STDLIBS+=`pkg-config --libs xrender`
-.ENDIF
-
-.IF "$(GUIBASE)"=="unx"
-
-SHL2STDLIBS += -lXext -lSM -lICE -lX11
-.IF "$(OS)"!="MACOSX" && "$(OS)"!="FREEBSD" && "$(OS)"!="NETBSD"
-# needed by salprnpsp.cxx
-SHL2STDLIBS+= -ldl
-.ENDIF
-
-.IF "$(ENABLE_RANDR)" != ""
-.IF "$(XRANDR_DLOPEN)" == "FALSE"
-SHL2STDLIBS+= $(XRANDR_LIBS)
-.ENDIF
-.ENDIF
-
-.ENDIF          # "$(GUIBASE)"=="unx"
-
-# gtk plugin
-.IF "$(ENABLE_GTK)" != ""
-PKGCONFIG_MODULES=gtk+-2.0 gthread-2.0
-.IF "$(ENABLE_DBUS)" != ""
-PKGCONFIG_MODULES+= dbus-glib-1
-.ENDIF
-.INCLUDE: pkg_config.mk
-
-LIB4TARGET=$(SLB)$/igtk_plug_
-LIB4FILES=\
-            $(SLB)$/gtkapp.lib\
-            $(SLB)$/gtka11y.lib \
-            $(SLB)$/gtkgdi.lib\
-            $(SLB)$/gtkwin.lib
-
-SHL4TARGET=vclplug_gtk$(DLLPOSTFIX)
-SHL4IMPLIB=igtk_plug_
-SHL4LIBS=$(LIB4TARGET)
-SHL4DEPN=$(SHL1IMPLIBN) $(SHL1TARGETN) $(SHL2IMPLIBN) $(SHL2TARGETN)
-# libs for gtk plugin
-SHL4STDLIBS+=$(PKGCONFIG_LIBS:s/ -lpangoxft-1.0//)
-# hack for faked SO environment
-.IF "$(PKGCONFIG_ROOT)"!=""
-SHL4SONAME+=-z nodefs
-SHL4NOCHECK=TRUE
-.ENDIF          # "$(PKGCONFIG_ROOT)"!=""
-
-
-SHL4STDLIBS+=-l$(SHL2TARGET)
-SHL4STDLIBS+=\
-            $(VCLLIB)		\
-            $(TOOLSLIB)         \
-            $(CPPUHELPERLIB)    \
-            $(CPPULIB)          \
-            $(VOSLIB)           \
-            $(SALLIB)           \
-            $(X11LINK_DYNAMIC)
-
-.IF "$(ENABLE_RANDR)" != ""
-.IF "$(XRANDR_DLOPEN)" == "FALSE"
-SHL4STDLIBS+= $(XRANDR_LIBS)
-.ENDIF
-.ENDIF
-
-.ENDIF # "$(ENABLE_GTK)" != ""
-
-# KDE plugin
-.IF "$(ENABLE_KDE)" != ""
-.IF "$(KDE_ROOT)"!=""
-EXTRALIBPATHS+=-L$(KDE_ROOT)$/lib
-.IF "$(OS)$(CPU)" == "LINUXX"
-EXTRALIBPATHS+=-L$(KDE_ROOT)$/lib64
-.ENDIF
-.ENDIF
-LIB5TARGET=$(SLB)$/ikde_plug_
-LIB5FILES=$(SLB)$/kdeplug.lib
-SHL5TARGET=vclplug_kde$(DLLPOSTFIX)
-SHL5IMPLIB=ikde_plug_
-SHL5LIBS=$(LIB5TARGET)
-SHL5DEPN=$(SHL2TARGETN)
-# libs for KDE plugin
-SHL5LINKFLAGS+=$(KDE_LIBS)
-SHL5STDLIBS+=-l$(SHL2TARGET)
-SHL5STDLIBS+=\
-        $(VCLLIB)       \
-        $(TOOLSLIB)     \
-        $(VOSLIB)       \
-        $(SALLIB)       \
-        $(X11LINK_DYNAMIC)
-
-.IF "$(ENABLE_RANDR)" != ""
-.IF "$(XRANDR_DLOPEN)" == "FALSE"
-SHL5STDLIBS+= $(XRANDR_LIBS)
-.ENDIF
-.ENDIF
-
-.ENDIF # "$(ENABLE_KDE)" != ""
-
-# KDE4 plugin
-.IF "$(ENABLE_KDE4)" != ""
-.IF "$(KDE4_ROOT)"!=""
-EXTRALIBPATHS+=-L$(KDE4_ROOT)$/lib
-.ENDIF
-LIB6TARGET=$(SLB)$/ikde4_plug_
-LIB6FILES=$(SLB)$/kde4plug.lib
-SHL6TARGET=vclplug_kde4$(DLLPOSTFIX)
-SHL6IMPLIB=ikde4_plug_
-SHL6LIBS=$(LIB6TARGET)
-SHL6DEPN=$(SHL2TARGETN)
-# libs for KDE4 plugin
-SHL6LINKFLAGS+=$(KDE4_LIBS)
-SHL6STDLIBS+=-l$(SHL2TARGET)
-SHL6STDLIBS+=\
-        $(VCLLIB)       \
-        $(PSPLIB)	\
-        $(TOOLSLIB)     \
-        $(VOSLIB)       \
-        $(SALLIB)   \
-        $(X11LINK_DYNAMIC)
-
-.IF "$(ENABLE_RANDR)" != ""
-.IF "$(XRANDR_DLOPEN)" == "FALSE"
-SHL6STDLIBS+= $(XRANDR_LIBS)
-.ENDIF
-.ENDIF
-
-.ENDIF # "$(ENABLE_KDE4)" != ""
-
-.ENDIF # UNX
-
-# --- Allgemein ----------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-ALLTAR : $(MISC)/vcl.component
-
-.IF "$(OS)" == "MACOSX"
-my_platform = .macosx
-.ELIF "$(OS)" == "WNT"
-my_platform = .windows
-.END
-
-$(MISC)/vcl.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
-        vcl.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt vcl$(my_platform).component
diff --git a/vcl/util/makefile2.pmk b/vcl/util/makefile2.pmk
deleted file mode 100644
index ac2977ca8eab..000000000000
--- a/vcl/util/makefile2.pmk
+++ /dev/null
@@ -1,41 +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"
-
-#building with stlport, but graphite was not built with stlport
-.IF "$(USE_SYSTEM_STL)"!="YES"
-.IF "$(SYSTEM_GRAPHITE)"=="YES"
-CFLAGSCXX+=-DADAPT_EXT_STL
-.ENDIF
-.ENDIF
diff --git a/vcl/util/vcl.macosx.component b/vcl/vcl.macosx.component
index 3aabcd8c7050..3aabcd8c7050 100644
--- a/vcl/util/vcl.macosx.component
+++ b/vcl/vcl.macosx.component
diff --git a/vcl/util/vcl.component b/vcl/vcl.unx.component
index da20fc916c32..da20fc916c32 100644
--- a/vcl/util/vcl.component
+++ b/vcl/vcl.unx.component
diff --git a/vcl/util/vcl.windows.component b/vcl/vcl.windows.component
index 72f7ace9f251..72f7ace9f251 100644
--- a/vcl/util/vcl.windows.component
+++ b/vcl/vcl.windows.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 1eb897b55b8d..4faaf7bd4def 100644..100755
--- a/vcl/win/source/app/saldata.cxx
+++ b/vcl/win/source/app/saldata.cxx
@@ -27,11 +27,12 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
-#include <tools/svwin.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 c635fdfc9845..431e9ca9c15f 100644..100755
--- a/vcl/win/source/app/salinfo.cxx
+++ b/vcl/win/source/app/salinfo.cxx
@@ -34,28 +34,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 <hash_map>
 
diff --git a/vcl/win/source/app/salinst.cxx b/vcl/win/source/app/salinst.cxx
index 05cb20750abd..1e5a306d852d 100755
--- a/vcl/win/source/app/salinst.cxx
+++ b/vcl/win/source/app/salinst.cxx
@@ -36,23 +36,28 @@
 #ifdef __MINGW32__
 #include <excpt.h>
 #endif
+
 #include <osl/file.hxx>
+
 #include <vos/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 <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 578b3cb804bd..427f2092a0dc 100644..100755
--- a/vcl/win/source/app/salshl.cxx
+++ b/vcl/win/source/app/salshl.cxx
@@ -27,9 +27,10 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
-#include <tools/svwin.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 6026f80e6346..f0b88a8e381c 100644..100755
--- a/vcl/win/source/app/saltimer.cxx
+++ b/vcl/win/source/app/saltimer.cxx
@@ -31,9 +31,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 7489be633f2b..000000000000
--- a/vcl/win/source/gdi/MAKEFILE.MK
+++ /dev/null
@@ -1,69 +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
-
-.IF "$(ENABLE_GRAPHITE)" == "TRUE"
-CFLAGS+=-DENABLE_GRAPHITE
-.ENDIF
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
diff --git a/vcl/win/source/gdi/salbmp.cxx b/vcl/win/source/gdi/salbmp.cxx
index 8be85d210bd6..3dc176ae23b8 100644..100755
--- a/vcl/win/source/gdi/salbmp.cxx
+++ b/vcl/win/source/gdi/salbmp.cxx
@@ -27,13 +27,17 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
+
 #include <tools/svwin.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 8cb52c917b38..18fda5a97007 100644..100755
--- a/vcl/win/source/gdi/salgdi.cxx
+++ b/vcl/win/source/gdi/salgdi.cxx
@@ -30,16 +30,17 @@
 
 #include <stdio.h>
 #include <string.h>
+
+#include <rtl/strbuf.hxx>
+
 #include <tools/svwin.h>
-#include <wincomp.hxx>
-#include <saldata.hxx>
-#include <salgdi.h>
 #include <tools/debug.hxx>
-#include <salframe.h>
 #include <tools/poly.hxx>
-#ifndef _RTL_STRINGBUF_HXX
-#include <rtl/strbuf.hxx>
-#endif
+
+#include <win/wincomp.hxx>
+#include <win/saldata.hxx>
+#include <win/salgdi.h>
+#include <win/salframe.h>
 
 using namespace rtl;
 
diff --git a/vcl/win/source/gdi/salgdi2.cxx b/vcl/win/source/gdi/salgdi2.cxx
index f957c59f8a01..3043593d7dd9 100644..100755
--- a/vcl/win/source/gdi/salgdi2.cxx
+++ b/vcl/win/source/gdi/salgdi2.cxx
@@ -30,16 +30,16 @@
 
 #include <string.h>
 #include <stdlib.h>
+
 #include <tools/svwin.h>
 #include <tools/debug.hxx>
-#include <wincomp.hxx>
-#include <salbmp.h>
-#include <saldata.hxx>
-#ifndef _SV_SALIDS_HRC
-#include <salids.hrc>
-#endif
-#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>
 
 bool WinSalGraphics::supportsOperation( OutDevSupportType eType ) const
 {
diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx
index eded1a8f7aaf..86f6ad0f4af1 100755
--- a/vcl/win/source/gdi/salgdi3.cxx
+++ b/vcl/win/source/gdi/salgdi3.cxx
@@ -31,25 +31,6 @@
 #include <string.h>
 #include <malloc.h>
 
-#include <tools/prewin.h>
-#include <windows.h>
-#include <tools/postwin.h>
-#include <vcl/sysdata.hxx>
-#include "tools/svwin.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"
@@ -62,15 +43,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 88efbb29d30a..2b46ce47b82d 100644..100755
--- a/vcl/win/source/gdi/salgdi_gdiplus.cxx
+++ b/vcl/win/source/gdi/salgdi_gdiplus.cxx
@@ -30,12 +30,14 @@
 
 #include <stdio.h>
 #include <string.h>
+
 #include <tools/svwin.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 403d6c3780cd..0f1b8151967d 100755
--- a/vcl/win/source/gdi/salnativewidgets-luna.cxx
+++ b/vcl/win/source/gdi/salnativewidgets-luna.cxx
@@ -30,14 +30,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 2c8f81bce364..e0a82869a763 100644..100755
--- a/vcl/win/source/gdi/salprn.cxx
+++ b/vcl/win/source/gdi/salprn.cxx
@@ -29,26 +29,26 @@
 #include "precompiled_vcl.hxx"
 
 #include <string.h>
-#include <tools/svwin.h>
 
+#include <osl/module.h>
+
+#include <tools/urlobj.hxx>
+#include <tools/svwin.h>
 #ifdef __MINGW32__
 #include <excpt.h>
 #endif
 
-#ifndef _OSL_MODULE_H
-#include <osl/module.h>
-#endif
-#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 3a6e89059a69..94f08a33179c 100644..100755
--- a/vcl/win/source/gdi/salvd.cxx
+++ b/vcl/win/source/gdi/salvd.cxx
@@ -27,14 +27,17 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
+
 #include <tools/svwin.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 14b9fd5a59c2..dd896059160e 100755
--- a/vcl/win/source/gdi/winlayout.cxx
+++ b/vcl/win/source/gdi/winlayout.cxx
@@ -28,21 +28,21 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-#include "tools/svwin.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>
@@ -74,9 +74,9 @@ typedef std::set<int> IntSet;
 #include <graphite/GrClient.h>
 #include <graphite/WinFont.h>
 #include <graphite/Segment.h>
-#include <vcl/graphite_layout.hxx>
-#include <vcl/graphite_cache.hxx>
-#include <vcl/graphite_features.hxx>
+#include <graphite_layout.hxx>
+#include <graphite_cache.hxx>
+#include <graphite_features.hxx>
 #endif
 
 #define DROPPED_OUTGLYPH 0xFFFF
diff --git a/vcl/win/source/gdi/wntgdi.cxx b/vcl/win/source/gdi/wntgdi.cxx
index eb53fb4d8699..2f6d73a83ec6 100755
--- a/vcl/win/source/gdi/wntgdi.cxx
+++ b/vcl/win/source/gdi/wntgdi.cxx
@@ -25,9 +25,6 @@
  *
  ************************************************************************/
 
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_vcl.hxx"
-
 #if defined _MSC_VER
 #pragma warning(push, 1)
 #endif
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 d2baea1a8e90..d66a17ac1fe6 100755
--- a/vcl/win/source/window/salframe.cxx
+++ b/vcl/win/source/window/salframe.cxx
@@ -46,51 +46,48 @@
 
 #include <stdio.h>
 
-#ifndef _SVWIN_HXX
 #include <tools/svwin.h>
-#endif
 #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>
-#ifndef _SV_SALIDS_HRC
-#include <salids.hrc>
-#endif
 #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>
-#ifndef _SV_KEYCOES_HXX
 #include <vcl/keycodes.hxx>
-#endif
-#include <vcl/window.h>
 #include <vcl/window.hxx>
 #include <vcl/wrkwin.hxx>
-#include <vcl/sallayout.hxx>
 #include <vcl/svapp.hxx>
-#ifndef _VCL_IMPDEL_HXX
-#include <impdel.hxx>
+#include <vcl/impdel.hxx>
+
+// Warning in SDK header
+#if defined(_MSC_VER) && (_MSC_VER > 1400)
+#pragma warning( disable: 4242 4244 )
 #endif
+#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 23295838bfc9..ce7c6064f790 100755
--- a/vcl/win/source/window/salmenu.cxx
+++ b/vcl/win/source/window/salmenu.cxx
@@ -27,16 +27,20 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
+
 #include <tools/svwin.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 00ee39092aff..51712f07e709 100644..100755
--- a/vcl/win/source/window/salobj.cxx
+++ b/vcl/win/source/window/salobj.cxx
@@ -30,17 +30,17 @@
 
 #include <string.h>
 
-#ifndef _SVWIN_HXX
-#include <tools/svwin.h>
-#endif
-#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 )