vcl2gnumake: #i116589# header cleanup: linux,solaris,macos

617 files changed, 1904 insertions, 2465 deletions

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 c1806054e253..cdb85445e0d7 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 7732ce202cd2..7436403131c7 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 a88e6c71c04b..9be55e83ad86 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 804cf108dba8..5ba013b67380 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 6577cebf295e..aa938d88c8fb 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 dfdab349bafe..c872ebc097ce 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 2033135564d8..6b6e6aac004d 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 d3afebf7f828..e65d3c4e4917 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 e86676e725f2..1f6f2d53cf81 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 95fee9a3ec4b..09f311755d57 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 c4ac34dc5bce..395dbb19682d 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 7ed76d607176..6ad6b0e71514 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 85aed320e470..d981f813beae 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 13ceee6f826f..9969f46e398b 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 54d6edac619a..e87470317934 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/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 5d2fc3f00741..cc2546ccad85 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 724857e92a0c..4204519deed6 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 5a476e0a54cc..861ab6ee0947 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 1a8f950e50d4..6d7fdada99ad 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/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/gdi/aquaprintaccessoryview.mm b/vcl/aqua/source/gdi/aquaprintaccessoryview.mm
index 93945570dc96..1b045c20a282 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 ae42c5c09e8d..de5047b7faf6 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/salatslayout.cxx b/vcl/aqua/source/gdi/salatslayout.cxx
index a355ff86d00e..f0c33b550a04 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 0e58c35b5fad..c1e7b7145914 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 070c0753637d..934e3d14f967 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 f7c234d2c4c4..bba3c795f6e3 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 9ce2b8a5a518..55a4ccc16c3e 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 c79add81d791..b40c82c77de3 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 f633dbbdcdce..9c2b3631fa3d 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/salframe.cxx b/vcl/aqua/source/window/salframe.cxx
index 17e034bd6e3d..1e20448fad7a 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 bc87ea444710..bfcc047c812a 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 USHORT ImplGetModifierMask( unsigned int nMask )
diff --git a/vcl/aqua/source/window/salmenu.cxx b/vcl/aqua/source/window/salmenu.cxx
index 82102f2e7095..08c1f9310529 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 f300929f04fe..642c5e5d9637 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 e726d04e7c99..e726d04e7c99 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 a60322eac403..a60322eac403 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 1982093f8bba..1982093f8bba 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 079dcfe7f112..079dcfe7f112 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 84d9dd54d6aa..84d9dd54d6aa 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 1c427cce0cd5..f560a14a7eab 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 fb7c8cddd6d4..9731a8ea5bda 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 c2ded3267f45..6fa93673556e 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 e7d9a14b52aa..7ead3e7aaab9 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 17c4aa7acd44..457ffa2acdf2 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 4b0385844eed..7cd87aa6af26 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 100e8c22972c..e0fe5c679388 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 56b07cea4262..3142c1d9d9fc 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 6bcafa2ee2e3..dfc03c806dc9 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 374b9c5a45c5..ed6bafad87f1 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 865cb7b5b766..cbf6a0275a37 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 59b070b421ea..59b070b421ea 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 bf76174150e2..bf76174150e2 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 85c0aa795c8c..85c0aa795c8c 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 7ed23706e6f3..7ed23706e6f3 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..a34212128741 100644
--- a/vcl/inc/vcl/fontsubset.hxx
+++ b/vcl/inc/fontsubset.hxx
diff --git a/vcl/inc/vcl/glyphcache.hxx b/vcl/inc/glyphcache.hxx
index 0e77d5dd6bc4..676d32e5f053 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 244ae1b7d846..244ae1b7d846 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 6d7d7c8e531f..6d7d7c8e531f 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 6580538f5d10..6580538f5d10 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 023b2c2d1a2c..023b2c2d1a2c 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 dc40fdcd3181..dc40fdcd3181 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 e38e1dea78d4..e38e1dea78d4 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 bb28d801fe12..bb28d801fe12 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 543ab19d6a57..543ab19d6a57 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 954b2340d0c7..954b2340d0c7 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 2a8be4a6999e..2a8be4a6999e 100644
--- a/vcl/inc/vcl/jobset.h
+++ b/vcl/inc/jobset.h
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 43a1e9cf2cea..72805ae60d1b 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 7ad233449d93..7ad233449d93 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 790021ae3adc..0f7b07d109b0 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 b10f0eaf0f0f..b10f0eaf0f0f 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 4aca4a9277e9..4aca4a9277e9 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..b9438e97c06e 100644
--- a/vcl/inc/vcl/saldatabasic.hxx
+++ b/vcl/inc/saldatabasic.hxx
@@ -28,8 +28,8 @@
 #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>
 
 namespace psp
diff --git a/vcl/inc/vcl/salframe.hxx b/vcl/inc/salframe.hxx
index d82a2099f315..838fd108ea6c 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 b4769c045708..b4769c045708 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 71b820803473..71b820803473 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 cc0438c4e177..cc0438c4e177 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 adf0e0a3d45d..44d556b39eb0 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 19f023108349..19f023108349 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 8613ead5301a..8613ead5301a 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 d693070138d2..05f2349e6b86 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 fcbe1fb35383..fcbe1fb35383 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 95b3806d648b..95b3806d648b 100644
--- a/vcl/inc/vcl/salwtype.hxx
+++ b/vcl/inc/salwtype.hxx
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 67aa6806be49..67aa6806be49 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/inc/vcl/unobrok.hxx b/vcl/inc/svsys.h
index af616e80351a..df0b58c548ca 100644
--- a/vcl/inc/vcl/unobrok.hxx
+++ b/vcl/inc/svsys.h
@@ -25,15 +25,18 @@
  *
  ************************************************************************/
 
-#ifndef _UNOBROK_HXX
-#define _UNOBROK_HXX
+#ifndef _VCL_SVSYS_H
+#define _VCL_SVSYS_H
 
-#include <vcl/svdata.hxx>
-#include <vos/thread.hxx>
+#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
 
-namespace vcl_accept
-{
-    sal_Bool accept(const ::rtl::OUString & accDcp, const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory> & rSMgr);
-}
 
-#endif  // _UNOBROK_HXX
+#endif
diff --git a/vcl/inc/vcl/textlayout.hxx b/vcl/inc/textlayout.hxx
index 418e1aa8bf64..418e1aa8bf64 100644
--- a/vcl/inc/vcl/textlayout.hxx
+++ b/vcl/inc/textlayout.hxx
diff --git a/vcl/inc/vcl/toolbox.h b/vcl/inc/toolbox.h
index 7cdeb0b17a5a..7cdeb0b17a5a 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 75f197c81e13..75f197c81e13 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..959b3aec1fb1 100644
--- a/vcl/unx/inc/plugins/gtk/atkbridge.hxx
+++ b/vcl/inc/unx/gtk/atkbridge.hxx
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 d47e5fb50fca..d6b945068bad 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 38c79b3e11df..c6ba3c2fcdb5 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 ee07199cb266..fc3bd1f07ce1 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 9d3f235b8894..fde53cfd8dcb 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 d2301c26a3b0..72579282c40b 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 2fb97a00b6f2..2fb97a00b6f2 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..a22a57b976c8 100644
--- a/vcl/unx/inc/i18n_im.hxx
+++ b/vcl/inc/unx/i18n_im.hxx
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..db6517cbea0b 100644
--- a/vcl/unx/inc/i18n_xkb.hxx
+++ b/vcl/inc/unx/i18n_xkb.hxx
diff --git a/vcl/unx/inc/plugins/kde/kdedata.hxx b/vcl/inc/unx/kde/kdedata.hxx
index a55471901283..45640c1a4d43 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 d4f5a9f156e0..f0015c301229 100644
--- a/vcl/unx/inc/pspgraphics.h
+++ b/vcl/inc/unx/pspgraphics.h
@@ -30,10 +30,11 @@
 
 
 #include "vcl/fontmanager.hxx"
-#include "vcl/salgdi.hxx"
-#include "vcl/sallayout.hxx"
 #include "vcl/dllapi.h"
 
+#include "salgdi.hxx"
+#include "sallayout.hxx"
+
 namespace psp { struct JobData; class PrinterGfx; }
 
 class ServerFont;
diff --git a/vcl/unx/inc/salbmp.h b/vcl/inc/unx/salbmp.h
index 23e038f30ab1..1da035536179 100644
--- a/vcl/unx/inc/salbmp.h
+++ b/vcl/inc/unx/salbmp.h
@@ -28,12 +28,12 @@
 #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 <unx/saldisp.hxx>
+#include <salbmp.hxx>
 #include <vcl/dllapi.h>
 
 struct  BitmapBuffer;
diff --git a/vcl/unx/inc/saldata.hxx b/vcl/inc/unx/saldata.hxx
index 939437060750..566d17e98a32 100644
--- a/vcl/unx/inc/saldata.hxx
+++ b/vcl/inc/unx/saldata.hxx
@@ -30,10 +30,10 @@
 
 // -=-= 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
diff --git a/vcl/unx/inc/saldisp.hxx b/vcl/inc/unx/saldisp.hxx
index 89efad3cde4d..c83c1c56e1c5 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,7 +48,7 @@ class   SalXLib;
 #include <list>
 #include <hash_map>
 #include <tools/gen.hxx>
-#include <vcl/salwtype.hxx>
+#include <salwtype.hxx>
 #include <vcl/dllapi.h>
 
 // -=-= forwards -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
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 9786bac76f35..9f063975173d 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 <salunx.h>
+
 #include <list>
 
 // -=-= forwards -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
diff --git a/vcl/unx/inc/salgdi.h b/vcl/inc/unx/salgdi.h
index 8af62a5c6607..a8804f1b3778 100644
--- a/vcl/unx/inc/salgdi.h
+++ b/vcl/inc/unx/salgdi.h
@@ -30,12 +30,12 @@
 
 // -=-= includes -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 #include "salstd.hxx"
-#include "vcl/salgdi.hxx"
+#include "salgdi.hxx"
 #include "vcl/salgtype.hxx"
 #include "tools/fract.hxx"
 #include "vcl/dllapi.h"
 #include <vcl/vclenum.hxx>
-#include <vcl/sallayout.hxx>
+#include <sallayout.hxx>
 #include <deque>
 
 // -=-= forwards -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
diff --git a/vcl/unx/inc/salinst.h b/vcl/inc/unx/salinst.h
index 133f0bf6037f..15cb4f1c7e65 100644
--- a/vcl/unx/inc/salinst.h
+++ b/vcl/inc/unx/salinst.h
@@ -37,7 +37,7 @@
 #include <vos/thread.hxx>
 #endif
 #include <vcl/dllapi.h>
-#include <vcl/salinst.hxx>
+#include <salinst.hxx>
 
 class VCL_DLLPUBLIC SalYieldMutex : public vos::OMutex
 {
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 d7d9334f281b..d2f63dad99aa 100644
--- a/vcl/unx/inc/salobj.h
+++ b/vcl/inc/unx/salobj.h
@@ -30,9 +30,10 @@
 
 #include <vcl/sv.h>
 #include <vcl/sysdata.hxx>
-#include <vcl/salobj.hxx>
 #include <vcl/dllapi.h>
 
+#include <salobj.hxx>
+
 class SalClipRegion
 {
 
diff --git a/vcl/unx/inc/salprn.h b/vcl/inc/unx/salprn.h
index 6e6ca0a2f1cc..b65792e1351a 100644
--- a/vcl/unx/inc/salprn.h
+++ b/vcl/inc/unx/salprn.h
@@ -29,9 +29,9 @@
 #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"
 
 class PspGraphics;
 
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..a62a3384a17e 100644
--- a/vcl/unx/inc/salsys.h
+++ b/vcl/inc/unx/salsys.h
@@ -36,7 +36,7 @@
 #ifndef _VOS_THREAD_HXX
 #include <vos/thread.hxx>
 #endif
-#include <vcl/salsys.hxx>
+#include <salsys.hxx>
 #include <vcl/dllapi.h>
 
 #include <list>
diff --git a/vcl/unx/inc/saltimer.h b/vcl/inc/unx/saltimer.h
index 132107d705f8..9edab5f15981 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 ef53273b60b4..6e55285d3586 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 3d8c681c4e22..aa5676fdbdeb 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..4c6a0c356c36 100644
--- a/vcl/unx/inc/sm.hxx
+++ b/vcl/inc/unx/sm.hxx
@@ -28,9 +28,9 @@
 #define _VCL_SM_HXX
 
 #include <tools/link.hxx>
-#include <salunx.h>
+#include <unx/salunx.h>
 #include <X11/SM/SMlib.h>
-#include <vcl/salsession.hxx>
+#include <salsession.hxx>
 
 class SessionManagerClient
 {
diff --git a/vcl/unx/inc/soicon.hxx b/vcl/inc/unx/soicon.hxx
index 419f9b2cc54a..419f9b2cc54a 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..e8620db29c6f 100644
--- a/vcl/unx/inc/wmadaptor.hxx
+++ b/vcl/inc/unx/wmadaptor.hxx
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/polyscan.hxx b/vcl/inc/vcl/polyscan.hxx
deleted file mode 100644
index 1c699e36623d..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 BOOL             GetFirstX( long& rX );
-    inline BOOL             GetNextX( long& rX );
-
-    BOOL                    GetFirstSegment( PolyScanSegment& rSegment );
-    BOOL                    GetNextSegment( PolyScanSegment& rSegment );
-};
-
-// ------------------------------------------------------------------------
-
-inline BOOL PolyScanline::GetFirstX( long& rX )
-{
-    mpAct = mpFirst;
-    return( mpAct ? ( rX = mpAct->mnX, mpAct = mpAct->mpNext, TRUE ) : FALSE );
-}
-
-// ------------------------------------------------------------------------
-
-inline BOOL PolyScanline::GetNextX( long& rX )
-{
-    return( mpAct ? ( rX = mpAct->mnX, mpAct = mpAct->mpNext, TRUE ) : 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 ); }
-
-    ULONG           Count() const { return Height(); }
-    PolyScanline*   operator[]( ULONG nPos ) const;
-};
-
-#endif // _SV_POLYSCAN_HXX
diff --git a/vcl/inc/vcl/svcompat.hxx b/vcl/inc/vcl/svcompat.hxx
deleted file mode 100644
index 9e461da4e54b..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 ) \
-    ((ULONG)((((ULONG)(char)(char1)))|              \
-    (((ULONG)(char)(char2))<<8UL)|                  \
-    (((ULONG)(char)(char3))<<16UL)|                 \
-    ((ULONG)(char)(char4))<<24UL))
-
-
-class SvStream;
-
-// --------------
-// - ImplCompat -
-// --------------
-
-class ImplCompat
-{
-    SvStream*   mpRWStm;
-    UINT32      mnCompatPos;
-    UINT32      mnTotalSize;
-    UINT16      mnStmMode;
-    UINT16      mnVersion;
-
-                ImplCompat() {}
-                ImplCompat( const ImplCompat& rCompat ) {}
-    ImplCompat& operator=( const ImplCompat& rCompat ) { return *this; }
-    BOOL        operator==( const ImplCompat& rCompat ) { return FALSE; }
-
-public:
-                ImplCompat( SvStream& rStm, USHORT nStreamMode, UINT16 nVersion = 1 );
-                ~ImplCompat();
-
-    UINT16      GetVersion() const { return mnVersion; }
-};
-
-#endif // _SV_SVCOMPAT_HXX
diff --git a/vcl/inc/vcl/wall2.hxx b/vcl/inc/wall2.hxx
index e93a8370ee7d..e93a8370ee7d 100644
--- a/vcl/inc/vcl/wall2.hxx
+++ b/vcl/inc/wall2.hxx
diff --git a/vcl/inc/vcl/window.h b/vcl/inc/window.h
index c710156422bf..c710156422bf 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..6707cf5f4c47 100644
--- a/vcl/prj/build.lst
+++ b/vcl/prj/build.lst
@@ -19,15 +19,15 @@ 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\generic\plugadapt				nmake	-	u	vc__plug vc_inc NULL
+vc  vcl\unx\generic\desktopdetect			nmake	-	u	vc__desk vc_inc NULL
+vc	vcl\unx\generic\app						nmake	-	u	vc__appu vc_inc NULL
+vc	vcl\unx\generic\dtrans					nmake	-	u	vc__dtru vc_inc NULL
+vc	vcl\unx\generic\fontmanager				nmake	-	u	vc__ftmu vc_inc NULL
+vc	vcl\unx\generic\gdi						nmake	-	u	vc__gdiu vc_inc NULL
+vc	vcl\unx\generic\printer   				nmake	-	u	vc__prnu vc_inc NULL
+vc	vcl\unx\generic\printergfx  				nmake	-	u	vc__prgu vc_inc NULL
+vc	vcl\unx\generic\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
diff --git a/vcl/prj/d.lst b/vcl/prj/d.lst
index 307064f7555d..ba5949b00fad 100644
--- a/vcl/prj/d.lst
+++ b/vcl/prj/d.lst
@@ -10,34 +10,44 @@ mkdir: %_DEST%\inc%_EXT%\vcl
 ..\%__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%\misc\vcl.component %_DEST%\xml%_EXT%\vcl.component
 ..\%__SRC%\obj\salmain.obj %_DEST%\lib%_EXT%\salmain.obj
 ..\%__SRC%\obj\salmain.o %_DEST%\lib%_EXT%\salmain.o
 
+..\inc\vcl\ImageListProvider.hxx %_DEST%\inc%_EXT%\vcl\ImageListProvider.hxx
+..\inc\vcl\abstdlg.hxx %_DEST%\inc%_EXT%\vcl\abstdlg.hxx
 ..\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\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\canvastools.hxx %_DEST%\inc%_EXT%\vcl\canvastools.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\configsettings.hxx %_DEST%\inc%_EXT%\vcl\configsettings.hxx
+..\inc\vcl\controllayout.hxx %_DEST%\inc%_EXT%\vcl\controllayout.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\dllapi.h %_DEST%\inc%_EXT%\vcl\dllapi.h
+..\inc\vcl\dndhelp.hxx %_DEST%\inc%_EXT%\vcl\dndhelp.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\evntpost.hxx %_DEST%\inc%_EXT%\vcl\evntpost.hxx
+..\inc\vcl\extoutdevdata.hxx %_DEST%\inc%_EXT%\vcl\extoutdevdata.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
@@ -45,24 +55,30 @@ mkdir: %_DEST%\inc%_EXT%\vcl
 ..\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\fontmanager.hxx %_DEST%\inc%_EXT%\vcl\fontmanager.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\graphictools.hxx %_DEST%\inc%_EXT%\vcl\graphictools.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\helper.hxx %_DEST%\inc%_EXT%\vcl\helper.hxx
+..\inc\vcl\i18nhelp.hxx %_DEST%\inc%_EXT%\vcl\i18nhelp.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\impdel.hxx %_DEST%\inc%_EXT%\vcl\impdel.hxx
 ..\inc\vcl\inputctx.hxx %_DEST%\inc%_EXT%\vcl\inputctx.hxx
+..\inc\vcl\introwin.hxx %_DEST%\inc%_EXT%\vcl\introwin.hxx
 ..\inc\vcl\javachild.hxx %_DEST%\inc%_EXT%\vcl\javachild.hxx
+..\inc\vcl\jobdata.hxx %_DEST%\inc%_EXT%\vcl\jobdata.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\lazydelete.hxx %_DEST%\inc%_EXT%\vcl\lazydelete.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
@@ -71,27 +87,31 @@ mkdir: %_DEST%\inc%_EXT%\vcl
 ..\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\pdfextoutdevdata.hxx %_DEST%\inc%_EXT%\vcl\pdfextoutdevdata.hxx
+..\inc\vcl\pdfwriter.hxx %_DEST%\inc%_EXT%\vcl\pdfwriter.hxx
+..\inc\vcl\pngread.hxx %_DEST%\inc%_EXT%\vcl\pngread.hxx
+..\inc\vcl\pngwrite.hxx %_DEST%\inc%_EXT%\vcl\pngwrite.hxx
 ..\inc\vcl\pointr.hxx %_DEST%\inc%_EXT%\vcl\pointr.hxx
 ..\inc\vcl\popupmenuwindow.hxx %_DEST%\inc%_EXT%\vcl\popupmenuwindow.hxx
+..\inc\vcl\ppdparser.hxx %_DEST%\inc%_EXT%\vcl\ppdparser.hxx
 ..\inc\vcl\print.hxx %_DEST%\inc%_EXT%\vcl\print.hxx
+..\inc\vcl\printerinfomanager.hxx %_DEST%\inc%_EXT%\vcl\printerinfomanager.hxx
 ..\inc\vcl\prntypes.hxx %_DEST%\inc%_EXT%\vcl\prntypes.hxx
 ..\inc\vcl\ptrstyle.hxx %_DEST%\inc%_EXT%\vcl\ptrstyle.hxx
+..\inc\vcl\quickselectionengine.hxx %_DEST%\inc%_EXT%\vcl\quickselectionengine.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
@@ -106,6 +126,7 @@ mkdir: %_DEST%\inc%_EXT%\vcl
 ..\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\strhelper.hxx %_DEST%\inc%_EXT%\vcl\strhelper.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
@@ -116,41 +137,18 @@ mkdir: %_DEST%\inc%_EXT%\vcl
 ..\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\threadex.hxx %_DEST%\inc%_EXT%\vcl\threadex.hxx
 ..\inc\vcl\timer.hxx %_DEST%\inc%_EXT%\vcl\timer.hxx
 ..\inc\vcl\toolbox.hxx %_DEST%\inc%_EXT%\vcl\toolbox.hxx
+..\inc\vcl\unohelp.hxx %_DEST%\inc%_EXT%\vcl\unohelp.hxx
+..\inc\vcl\unohelp2.hxx %_DEST%\inc%_EXT%\vcl\unohelp2.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
+..\inc\vcl\wrkwin.hxx %_DEST%\inc%_EXT%\vcl\wrkwin.hxx
 
diff --git a/vcl/source/app/dbggui.cxx b/vcl/source/app/dbggui.cxx
index b48db1d6ee97..f5fa628b3c28 100644
--- 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,21 @@
 #include "vcl/wrkwin.hxx"
 #include "vcl/sound.hxx"
 #include "vcl/threadex.hxx"
-#include "vcl/dbggui.hxx"
-#include "com/sun/star/i18n/XCharacterClassification.hpp"
+
+#ifdef WNT
+#undef min
+#endif
+#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>
diff --git a/vcl/source/app/help.cxx b/vcl/source/app/help.cxx
index 2c7ad2fa9c3e..a952ad798655 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 17bc760ff5fc..1083b3e26899 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 0318bc5d6f2d..0507f2174476 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/salvtables.cxx b/vcl/source/app/salvtables.cxx
index 73eaa8f965d2..cd92eb146fd7 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 c65eb13224e1..b7c952b6eff9 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 dbc792039f80..81865de12e14 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 176ec5a1b4c6..a34da349da17 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 dd1ea7c0469e..6f810c3cc470 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 935d2c1894ea..023bd332d0a1 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 4efa2b659e7c..1fc6b4952802 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 356608e7fbfc..903380036ebb 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 237156a5f9f7..907a32ea700f 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 0c98da48e6d0..40b1491b44c9 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/control/button.cxx b/vcl/source/control/button.cxx
index 82bec2214dff..f75a659b5872 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 5b2e8755e5c8..b045f9e29341 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 918675cc0783..ea63b9eefdfd 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 5091a4722845..6acd34e70607 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 4c4e3c870429..c66a844979ac 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 8ae2ecff41b9..f9bce6fa8fa1 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 f73cf008a5e5..24f495402c10 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 ecf00568e11f..bbec6f2997d9 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 bd0179ffe454..5f253a2971c4 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 65fe11929d1e..8e19a265d0cc 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 03527bf083a7..68bd53469983 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/scrbar.cxx b/vcl/source/control/scrbar.cxx
index 4261965995fa..4af77177b4b8 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 c51ac834f1b4..b42f77375737 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 2c81b6af241b..b61842ebe363 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/gdi/bitmap.cxx b/vcl/source/gdi/bitmap.cxx
index 074935086b0b..91785fae5641 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 ec476157fbeb..8c6c2f10bd7c 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 38402af626c2..5e3145a541ee 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 c963ea32542e..50fdca07605d 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 a89015d12351..3aef42dfeb02 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 e6c94ba0475e..4901491e2ed1 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 8ba963bc4718..dd0173f17423 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 e26c15309c54..d7f0aac5bdeb 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 790c3d43bb85..51a01db868c1 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 e79308b2664e..3a6e81e8d48a 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 3e328b7db7a4..244e688601a5 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 397a5d6b704a..14326371c89e 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 3105850c4fbf..f68c844c73f9 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 2bc0addaa93c..d813629668d7 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/metric.cxx b/vcl/source/gdi/metric.cxx
index 6d225ad7e0dc..1f0d89e6926c 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 0660728fc8a5..26860097d1ee 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 847a8d7a299a..195f3cf6dc42 100644
--- a/vcl/source/gdi/outdev.cxx
+++ b/vcl/source/gdi/outdev.cxx
@@ -29,35 +29,32 @@
 #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>
 #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 06dcd73cc3d4..fb14751fa9e9 100755..100644
--- 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 ca50e4bf6c82..cfee741657e1 100644
--- a/vcl/source/gdi/outdev3.cxx
+++ b/vcl/source/gdi/outdev3.cxx
@@ -30,49 +30,55 @@
 
 #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"
 #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 8ad02ed2d818..e1b20a1b7aff 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 d42723215c55..e509ce716d7a 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 5b8d228bb141..a597ccc1d5bf 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 b5b745b708fa..c3427cf9bb0f 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 189ba4c29e59..d93c27c06211 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 325ccef1c3a6..30f51af0c401 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 5702bee23ea5..bd7d6973004d 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 ee1fe1cc6bc5..d43d210db7a1 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 eb329f8c6869..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 ) );
-}
-
-// ------------------------------------------------------------------------
-
-BOOL PolyScanline::GetFirstSegment( PolyScanSegment& rSegment )
-{
-    BOOL bRet = GetFirstX( rSegment.mnStart );
-
-    if( bRet && !GetNextX( rSegment.mnEnd ) )
-        rSegment.mnEnd = rSegment.mnStart;
-
-    return bRet;
-}
-
-// ------------------------------------------------------------------------
-
-BOOL PolyScanline::GetNextSegment( PolyScanSegment& rSegment )
-{
-    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 );
-        ULONG       nHeight;
-
-        aRect.Justify();
-        mnLeft = aRect.Left();
-        mnTop = aRect.Top();
-        mnRight = aRect.Right();
-        mnBottom = aRect.Bottom();
-        mpArray = new PolyScanline[ nHeight = Height() ];
-
-        for( 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[ (USHORT) nLast ] );
-
-        while( nLast && ( aLast == aFirst ) )
-            aLast = rPoly[ (USHORT) --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() );
-            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[ (USHORT) 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[]( 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;
-        BOOL        bLast = 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 = FALSE;
-                }
-                else
-                    bLast = 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 = FALSE;
-                }
-                else
-                    bLast = 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 78456992340f..3dd9b37c5b10 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 5c2a742a10ba..a87dbad5276f 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 8207282add99..11f5e187c61d 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 4931ee66e93f..087497549cc3 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 97e11c5a6aa4..0a616a84eddb 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 31df581f50a2..6fdafe04e88b 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 8aa0e47f1a35..d2a0b1aebf0c 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 415cad128a49..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, USHORT nStreamMode, USHORT 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 UINT32 nEndPos = mpRWStm->Tell();
-
-        mpRWStm->Seek( mnCompatPos );
-        *mpRWStm << ( nEndPos - mnTotalSize );
-        mpRWStm->Seek( nEndPos );
-    }
-    else
-    {
-        const 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 78ce197525ec..33bdf6b05bcc 100644
--- 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 4c1439ffe6f4..9088ce51de6a 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 10aa4431f69d..3eb7e654a829 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 601e46411cd8..57e948b55843 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 d760ce1d1fed..5ee155db3008 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 a9f9167062ba..b212b036425a 100644
--- 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 5ea80da77794..8e3fe158b1f5 100644
--- 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/glyphcache.cxx b/vcl/source/glyphs/glyphcache.cxx
index 7181db56dd4d..29b5ec8bac2d 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 f82e3afe39c8..46bce54f6298 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/helper/canvasbitmap.cxx b/vcl/source/helper/canvasbitmap.cxx
index 2bc0ab94d272..2caddb0ced7a 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 71c306ff9bbb..03956568e057 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 7b244781c3c7..5ef79f92d401 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/xconnection.cxx b/vcl/source/helper/xconnection.cxx
index caf7ee237d67..0e19478bcfbc 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/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/accel.cxx b/vcl/source/window/accel.cxx
index 3018236fff1a..ccb6360a25fe 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 81699bcaabb0..6078ab77404d 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 2ff7d0a687e7..855b2e827952 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 9a0452027737..070a4324a54e 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 5725189e10c3..10bf2b40ae15 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 3b5585d3bc63..c963b96197ea 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 055b7e9fe80b..4116248f892f 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 9ea407e52ee3..aaacf074a802 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 e67c2d9ecfd5..91a6cfabb754 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 c8e382bad982..77dc10771acd 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 323bbe3b0d74..c5e57da71e75 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 bcc5536fd028..c8da4e5c1d8a 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/menu.cxx b/vcl/source/window/menu.cxx
index 5909ab9f8489..f20eb67cca69 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 d00d569883d5..132703758e5c 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 574cef4e5a07..efa6a693d6dd 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 735add842518..a5103fa663e1 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 b4553a4cf8a7..2c0d584f8ba4 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 62fbe2e507f3..51da3077518c 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 36f27b1ceee7..e7a82ae1ef0a 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 4e897eef4a8b..513f0a39dff7 100644
--- a/vcl/source/window/syschild.cxx
+++ b/vcl/source/window/syschild.cxx
@@ -28,21 +28,23 @@
 // 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>
+
 #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 +55,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 f6a37658b79f..5621ed5b6516 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 0589d57009f4..552807ab9235 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 1adabe487492..3db85093582e 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 b71cf1c13c8d..021b7e53402c 100644
--- 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,15 @@
 #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>
 
 #include <string.h>
 #include <vector>
diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx
index 35a39676353a..3394da1153aa 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 0762a07476e2..9b4af1f01503 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -27,48 +27,55 @@
 
 // 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"
+
+#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 +92,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>
 
diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx
index e5b58a8b6f3c..00391b2814bb 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 2fce7e52f24c..72e9b581526a 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 4aaa3f987b77..e10715922572 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 8fb2f2f8346a..cd3522d431f4 100644
--- a/vcl/source/window/wrkwin.cxx
+++ b/vcl/source/window/wrkwin.cxx
@@ -28,22 +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/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>
 #include <vcl/sysdata.hxx>
 
+#include <svdata.hxx>
+#include <salframe.hxx>
+#include <brdwin.hxx>
+#include <window.h>
+
 // =======================================================================
 
 #define WORKWIN_WINDOWSTATE_FULLSCREEN          ((ULONG)0x00010000)
diff --git a/vcl/unx/source/app/i18n_cb.cxx b/vcl/unx/generic/app/i18n_cb.cxx
index d3a4f2b819ae..5a314c19d3e5 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 3064be9367e1..517eb37a1b2e 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 3a6ae26a2b0e..76193f0ef842 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 c9515f016433..45a07ac66987 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/makefile.mk b/vcl/unx/generic/app/makefile.mk
index bd7549945c7c..bd7549945c7c 100644
--- a/vcl/unx/source/app/makefile.mk
+++ b/vcl/unx/generic/app/makefile.mk
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 beb7b60a551c..1b72d55e21c5 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 92d5f75f7315..923d3d3e9ac4 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 f125d5f98fa6..98bce72d6bce 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"
 
 // -------------------------------------------------------------------------
 //
diff --git a/vcl/unx/source/app/salsys.cxx b/vcl/unx/generic/app/salsys.cxx
index 84c9dba32e40..92f0748b6460 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 431470935d9e..d68ec388448e 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 959d6af5912d..c421ceeaf0e3 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 2bf9e55731d1..663dc9371caf 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>
+
 
 BOOL SelectAppIconPixmap( SalDisplay *pDisplay, int nScreen,USHORT nIcon, USHORT 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..03429982c2d1 100644
--- a/vcl/unx/source/desktopdetect/desktopdetector.cxx
+++ b/vcl/unx/generic/desktopdetect/desktopdetector.cxx
@@ -28,7 +28,7 @@
 // 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>
diff --git a/vcl/unx/source/desktopdetect/makefile.mk b/vcl/unx/generic/desktopdetect/makefile.mk
index 83d5d29f4b71..83d5d29f4b71 100644
--- a/vcl/unx/source/desktopdetect/makefile.mk
+++ b/vcl/unx/generic/desktopdetect/makefile.mk
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/dtrans/makefile.mk b/vcl/unx/generic/dtrans/makefile.mk
index 6f5caccfd734..6f5caccfd734 100644
--- a/vcl/unx/source/dtrans/makefile.mk
+++ b/vcl/unx/generic/dtrans/makefile.mk
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/makefile.mk b/vcl/unx/generic/fontmanager/makefile.mk
index c6a23b88f35b..c6a23b88f35b 100644
--- a/vcl/unx/source/fontmanager/makefile.mk
+++ b/vcl/unx/generic/fontmanager/makefile.mk
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 caa4867af874..553338b37194 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 a69a2426b519..bdaec4f6c05d 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..4e041e51aec2 100644
--- a/vcl/unx/source/gdi/gcach_xpeer.hxx
+++ b/vcl/unx/generic/gdi/gcach_xpeer.hxx
@@ -28,13 +28,12 @@
 #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/makefile.mk b/vcl/unx/generic/gdi/makefile.mk
index 123fcbcf9131..123fcbcf9131 100644
--- a/vcl/unx/source/gdi/makefile.mk
+++ b/vcl/unx/generic/gdi/makefile.mk
diff --git a/vcl/unx/source/gdi/pspgraphics.cxx b/vcl/unx/generic/gdi/pspgraphics.cxx
index bab78b0cb2df..f18bb7e561b8 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 cc7934b0a798..88a22e6537bf 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 9dfbfff22d03..c6d834294bd7 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 1cb2abbedf43..54c978b47794 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 d9f81c0f67d2..1e9acf96f9f8 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 ece724d717cb..c961c321a2d3 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 "osl/module.h"
+#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 "jobset.h"
+#include "print.h"
+#include "salptype.hxx"
 
 using namespace psp;
 using namespace rtl;
diff --git a/vcl/unx/source/gdi/salvd.cxx b/vcl/unx/generic/gdi/salvd.cxx
index f242fffae715..79b8f9d6f04b 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/makefile.mk b/vcl/unx/generic/plugadapt/makefile.mk
index af409c04af35..af409c04af35 100644
--- a/vcl/unx/source/plugadapt/makefile.mk
+++ b/vcl/unx/generic/plugadapt/makefile.mk
diff --git a/vcl/unx/source/plugadapt/salplug.cxx b/vcl/unx/generic/plugadapt/salplug.cxx
index fd49ee34f543..29970e1299e6 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>
diff --git a/vcl/unx/source/printer/cupsmgr.cxx b/vcl/unx/generic/printer/cupsmgr.cxx
index caf3249b5f46..caf3249b5f46 100644
--- a/vcl/unx/source/printer/cupsmgr.cxx
+++ b/vcl/unx/generic/printer/cupsmgr.cxx
diff --git a/vcl/unx/source/printer/jobdata.cxx b/vcl/unx/generic/printer/jobdata.cxx
index d4211eae31df..d4211eae31df 100644
--- a/vcl/unx/source/printer/jobdata.cxx
+++ b/vcl/unx/generic/printer/jobdata.cxx
diff --git a/vcl/unx/source/printer/makefile.mk b/vcl/unx/generic/printer/makefile.mk
index 5cd35088acd9..5cd35088acd9 100644
--- a/vcl/unx/source/printer/makefile.mk
+++ b/vcl/unx/generic/printer/makefile.mk
diff --git a/vcl/unx/source/printer/ppdparser.cxx b/vcl/unx/generic/printer/ppdparser.cxx
index 587e58be5bc7..587e58be5bc7 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 af189b1b01b5..cbd96611661f 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 6bb31acfcbbe..620386e267d0 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/makefile.mk b/vcl/unx/generic/printergfx/makefile.mk
index cc5692e951f5..cc5692e951f5 100644
--- a/vcl/unx/source/printergfx/makefile.mk
+++ b/vcl/unx/generic/printergfx/makefile.mk
diff --git a/vcl/unx/source/printergfx/printerjob.cxx b/vcl/unx/generic/printergfx/printerjob.cxx
index af2cf14b1a0c..bda06b96e1bd 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/makefile.mk b/vcl/unx/generic/window/makefile.mk
index c5cd95ba6b1c..c5cd95ba6b1c 100644
--- a/vcl/unx/source/window/makefile.mk
+++ b/vcl/unx/generic/window/makefile.mk
diff --git a/vcl/unx/source/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx
index 11c20aa40f5a..7be7d9bff6c5 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 2ff6d05c35c6..6651b5b3eccb 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 5448235998e8..83c1c14876e1 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/app/gtkdata.cxx b/vcl/unx/gtk/app/gtkdata.cxx
index f308822df147..eac10d041021 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 2cb92ecd8292..22adb201aa72 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>
 
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/gdi/salnativewidgets-gtk.cxx b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
index ff615f5ede74..a97198d7def8 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 9181ee3fd40d..f26750695180 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 c5f5a168f653..f2ab26179d27 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, BOOL bShow )
         : m_pSocket( NULL ),
diff --git a/vcl/unx/headless/svpbmp.hxx b/vcl/unx/headless/svpbmp.hxx
index dc775e66aaf1..5573fa0ef940 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 ea7667ce51ca..7d6ef9221395 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 de968bbf7a4a..692a117b184d 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 93ec080d0136..829ba84295c8 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 09e359ca3f71..d53ed5cf202d 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 02d5e3fa9494..fe873a5f7940 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 5b461bb996ef..2be922038bd7 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 0da506076908..f53cf97e0eed 100644
--- a/vcl/unx/headless/svpprn.hxx
+++ b/vcl/unx/headless/svpprn.hxx
@@ -29,9 +29,10 @@
 #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"
 
 class PspGraphics;
 
diff --git a/vcl/unx/headless/svppspgraphics.cxx b/vcl/unx/headless/svppspgraphics.cxx
index c7b1f4f41fca..253dd0b8c792 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 138198239621..4e4085773200 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 dff1fd4d6ca7..a229859a9570 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 083547cf19a9..dbe3d8072647 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 34b0ff652cde..d3b94fdb5456 100644
--- a/vcl/unx/kde/kdedata.cxx
+++ b/vcl/unx/kde/kdedata.cxx
@@ -45,18 +45,18 @@
 #include <sys/time.h>
 #include <unistd.h>
 #endif
-#include <plugins/kde/kdedata.hxx>
+#include <unx/kde/kdedata.hxx>
+#include "unx/i18n_im.hxx"
+#include "unx/i18n_xkb.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
 
 /* #i59042# override KApplications method for session management
  * since it will interfere badly with our own.
diff --git a/vcl/unx/kde/salnativewidgets-kde.cxx b/vcl/unx/kde/salnativewidgets-kde.cxx
index 29d79f88ffb3..15d3edfbf8c5 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.cxx b/vcl/unx/kde4/KDESalGraphics.cxx
index 2c04af384c51..5a5cd11c52d9 100644
--- a/vcl/unx/kde4/KDESalGraphics.cxx
+++ b/vcl/unx/kde4/KDESalGraphics.cxx
@@ -556,7 +556,7 @@ BOOL KDESalGraphics::drawNativeControl( ControlType type, ControlPart part,
 
     if (returnVal)
     {
-        GC gc = SelectFont();
+        GC gc = GetFontGC();
 
         if( gc )
         {
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..5e3a85256313 100644
--- a/vcl/unx/kde4/VCLKDEApplication.cxx
+++ b/vcl/unx/kde4/VCLKDEApplication.cxx
@@ -49,4 +49,4 @@ bool VCLKDEApplication::x11EventFilter(XEvent* event)
     }
 
     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/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/util/makefile.mk b/vcl/util/makefile.mk
index 8d1de2ed30f0..bff6998fbb3b 100644
--- a/vcl/util/makefile.mk
+++ b/vcl/util/makefile.mk
@@ -97,7 +97,6 @@ HXXDEPNLST= $(INC)$/vcl$/accel.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      \