40 files changed, 217 insertions, 195 deletions

diff --git a/vcl/win/inc/salbmp.h b/vcl/inc/win/salbmp.h
index 7a31add2ae19..44f3af42c137 100644..100755
--- a/vcl/win/inc/salbmp.h
+++ b/vcl/inc/win/salbmp.h
@@ -28,10 +28,9 @@
 #ifndef _SV_SALBMP_H
 #define _SV_SALBMP_H
 
-#include <wincomp.hxx>
 #include <tools/gen.hxx>
-#include <vcl/sv.h>
-#include <vcl/salbmp.hxx>
+#include <win/wincomp.hxx>
+#include <salbmp.hxx>
 
 // --------------
 // - SalBitmap  -
diff --git a/vcl/win/inc/saldata.hxx b/vcl/inc/win/saldata.hxx
index 48180bbe185b..d945f7cedfa6 100755
--- a/vcl/win/inc/saldata.hxx
+++ b/vcl/inc/win/saldata.hxx
@@ -28,13 +28,13 @@
 #ifndef _SV_SALDATA_HXX
 #define _SV_SALDATA_HXX
 
-#include <vcl/sv.h>
-#include <vcl/svdata.hxx>
-#include <vcl/salwtype.hxx>
-#include <wincomp.hxx>
-
 #include "osl/module.h"
 
+#include <svdata.hxx>
+#include <salwtype.hxx>
+
+#include <win/wincomp.hxx>
+
 #include <set>  // for hMenu validation
 #include <map>
 
diff --git a/vcl/win/inc/salframe.h b/vcl/inc/win/salframe.h
index f9aa8ef9dc4b..92b6bbc509da 100644..100755
--- a/vcl/win/inc/salframe.h
+++ b/vcl/inc/win/salframe.h
@@ -28,9 +28,8 @@
 #ifndef _SV_SALFRAME_H
 #define _SV_SALFRAME_H
 
-#include <vcl/sv.h>
 #include <vcl/sysdata.hxx>
-#include <vcl/salframe.hxx>
+#include <salframe.hxx>
 
 class WinSalGraphics;
 
diff --git a/vcl/win/inc/salgdi.h b/vcl/inc/win/salgdi.h
index f592f53ae29c..3b0daa6d95ef 100755
--- a/vcl/win/inc/salgdi.h
+++ b/vcl/inc/win/salgdi.h
@@ -28,11 +28,10 @@
 #ifndef _SV_SALGDI_H
 #define _SV_SALGDI_H
 
-#include <vcl/sv.h>
-#include <vcl/sallayout.hxx>
-#include <vcl/salgdi.hxx>
-#include <vcl/outfont.hxx>
-#include <vcl/impfont.hxx>
+#include <sallayout.hxx>
+#include <salgdi.hxx>
+#include <outfont.hxx>
+#include <impfont.hxx>
 
 #include "boost/scoped_ptr.hpp"
 #include <hash_set>
diff --git a/vcl/win/inc/salids.hrc b/vcl/inc/win/salids.hrc
index 3049f11b551b..3049f11b551b 100644
--- a/vcl/win/inc/salids.hrc
+++ b/vcl/inc/win/salids.hrc
diff --git a/vcl/win/inc/salinst.h b/vcl/inc/win/salinst.h
index 1ab59f8f7f9f..6fc160a19e05 100755
--- a/vcl/win/inc/salinst.h
+++ b/vcl/inc/win/salinst.h
@@ -28,8 +28,7 @@
 #ifndef _SV_SALINST_H
 #define _SV_SALINST_H
 
-#include <vcl/sv.h>
-#include <vcl/salinst.hxx>
+#include <salinst.hxx>
 
 namespace vos { class OMutex; }
 
diff --git a/vcl/win/inc/salmenu.h b/vcl/inc/win/salmenu.h
index 7f1774b61975..1d8428b2b418 100644..100755
--- a/vcl/win/inc/salmenu.h
+++ b/vcl/inc/win/salmenu.h
@@ -28,10 +28,8 @@
 #ifndef _SV_SALMENU_H
 #define _SV_SALMENU_H
 
-#include <vcl/sv.h>
 #include <vcl/bitmap.hxx>
-#include <vcl/salmenu.hxx>
-
+#include <salmenu.hxx>
 
 class WinSalMenu : public SalMenu
 {
diff --git a/vcl/win/inc/salnativewidgets.h b/vcl/inc/win/salnativewidgets.h
index fceee1076595..772e0cc5b036 100644..100755
--- a/vcl/win/inc/salnativewidgets.h
+++ b/vcl/inc/win/salnativewidgets.h
@@ -31,8 +31,6 @@
 
 #ifdef __cplusplus
 
-#include <vcl/sv.h>
-
 /* SalControlHandleData:
  *
  *   Holds platform specific theming data.
diff --git a/vcl/win/inc/salobj.h b/vcl/inc/win/salobj.h
index ae7ea5271800..52137437975a 100644..100755
--- a/vcl/win/inc/salobj.h
+++ b/vcl/inc/win/salobj.h
@@ -28,8 +28,7 @@
 #ifndef _SV_SALOBJ_H
 #define _SV_SALOBJ_H
 
-#include <vcl/sv.h>
-#include <vcl/salobj.hxx>
+#include <salobj.hxx>
 
 // -----------------
 // - SalObjectData -
diff --git a/vcl/win/inc/salprn.h b/vcl/inc/win/salprn.h
index 57ae8eae55e3..c438fc3ead71 100644..100755
--- a/vcl/win/inc/salprn.h
+++ b/vcl/inc/win/salprn.h
@@ -28,8 +28,7 @@
 #ifndef _SV_SALPRN_H
 #define _SV_SALPRN_H
 
-#include <vcl/sv.h>
-#include <vcl/salprn.hxx>
+#include <salprn.hxx>
 
 // -----------------
 // - SalDriverData -
diff --git a/vcl/win/inc/salsys.h b/vcl/inc/win/salsys.h
index b6eadc6e6818..f1848b72cee2 100644..100755
--- a/vcl/win/inc/salsys.h
+++ b/vcl/inc/win/salsys.h
@@ -28,7 +28,7 @@
 #ifndef _SV_SALSYS_H
 #define _SV_SALSYS_H
 
-#include <vcl/salsys.hxx>
+#include <salsys.hxx>
 
 #include <vector>
 #include <map>
diff --git a/vcl/win/inc/saltimer.h b/vcl/inc/win/saltimer.h
index c24af459aa97..88707ef41ad1 100644..100755
--- a/vcl/win/inc/saltimer.h
+++ b/vcl/inc/win/saltimer.h
@@ -28,7 +28,7 @@
 #ifndef _SV_SALTIMER_H
 #define _SV_SALTIMER_H
 
-#include <vcl/saltimer.hxx>
+#include <saltimer.hxx>
 
 class WinSalTimer : public SalTimer
 {
diff --git a/vcl/win/inc/salvd.h b/vcl/inc/win/salvd.h
index d0f32a6460a9..665d6b1c3a9c 100644..100755
--- a/vcl/win/inc/salvd.h
+++ b/vcl/inc/win/salvd.h
@@ -28,8 +28,7 @@
 #ifndef _SV_SALVD_H
 #define _SV_SALVD_H
 
-#include <vcl/sv.h>
-#include <vcl/salvd.hxx>
+#include <salvd.hxx>
 
 class WinSalGraphics;
 
diff --git a/vcl/win/inc/svsys.h b/vcl/inc/win/svsys.h
index 7b0e87304d59..7b0e87304d59 100644
--- a/vcl/win/inc/svsys.h
+++ b/vcl/inc/win/svsys.h
diff --git a/vcl/win/inc/wincomp.hxx b/vcl/inc/win/wincomp.hxx
index 61e04779dbce..d9c218d193ac 100644..100755
--- a/vcl/win/inc/wincomp.hxx
+++ b/vcl/inc/win/wincomp.hxx
@@ -31,7 +31,6 @@
 #ifndef _STRING_H
 #include <string.h>
 #endif
-#include <vcl/sv.h>
 
 // ----------
 // - Strict -
diff --git a/vcl/source/app/dbggui.cxx b/vcl/source/app/dbggui.cxx
index f5fa628b3c28..fe8dd9607834 100644..100755
--- a/vcl/source/app/dbggui.cxx
+++ b/vcl/source/app/dbggui.cxx
@@ -54,9 +54,6 @@
 #include "vcl/sound.hxx"
 #include "vcl/threadex.hxx"
 
-#ifdef WNT
-#undef min
-#endif
 #include "svdata.hxx"
 #include "dbggui.hxx"
 
@@ -65,7 +62,7 @@
 
 #include "salinst.hxx"
 #include "svdata.hxx"
-// #include "svsys.h"
+#include "svsys.h"
 
 #include "com/sun/star/i18n/XCharacterClassification.hpp"
 
@@ -630,10 +627,9 @@ BOOL DbgWindow::Close()
     // remember window position
     ByteString aState( GetWindowState() );
     DbgData* pData = DbgGetData();
-    strncpy( pData->aDbgWinState,
-         aState.GetBuffer(),
-         std::min( sizeof( pData->aDbgWinState ),
-               size_t(aState.Len() + 1U )) );
+    size_t nCopy = (sizeof( pData->aDbgWinState ) < size_t(aState.Len() + 1U ))
+    ? sizeof( pData->aDbgWinState ) : size_t(aState.Len() + 1U );
+    strncpy( pData->aDbgWinState, aState.GetBuffer(), nCopy );
     pData->aDbgWinState[ sizeof( pData->aDbgWinState ) - 1 ] = 0;
     // and save for next session
     DbgSaveData( *pData );
diff --git a/vcl/source/gdi/outdev.cxx b/vcl/source/gdi/outdev.cxx
index 195f3cf6dc42..001b4e0b4043 100644..100755
--- a/vcl/source/gdi/outdev.cxx
+++ b/vcl/source/gdi/outdev.cxx
@@ -42,6 +42,8 @@
 #include <vcl/print.hxx>
 #include <vcl/outdev.hxx>
 #include <vcl/unowrap.hxx>
+// declare system types in sysdata.hxx
+#include <svsys.h>
 #include <vcl/sysdata.hxx>
 
 #include <salgdi.hxx>
diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx
index cfee741657e1..9478ff40dad6 100644..100755
--- a/vcl/source/gdi/outdev3.cxx
+++ b/vcl/source/gdi/outdev3.cxx
@@ -51,6 +51,8 @@
 #include "vcl/bmpacc.hxx"
 #include "vcl/outdev.hxx"
 #include "vcl/edit.hxx"
+// declare system types in sysdata.hxx
+#include <svsys.h>
 #include "vcl/sysdata.hxx"
 #include "vcl/unohelp.hxx"
 #include "vcl/controllayout.hxx"
diff --git a/vcl/source/window/syschild.cxx b/vcl/source/window/syschild.cxx
index 513f0a39dff7..8eca0ad09b89 100644..100755
--- a/vcl/source/window/syschild.cxx
+++ b/vcl/source/window/syschild.cxx
@@ -33,6 +33,9 @@
 
 #include <tools/rc.h>
 
+// declare system types in sysdata.hxx
+#include <svsys.h>
+
 #include <vcl/window.hxx>
 #include <vcl/sysdata.hxx>
 #include <vcl/svapp.hxx>
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index 021b7e53402c..509d53638f77 100644..100755
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -53,6 +53,9 @@
 #include <window.h>
 #include <toolbox.h>
 #include <salframe.hxx>
+#if defined WNT
+#include <svsys.h>
+#endif
 
 #include <string.h>
 #include <vector>
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 9b4af1f01503..fdc3f20fea06 100644..100755
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -49,7 +49,6 @@
 #include "vcl/wrkwin.hxx"
 #include "vcl/wall.hxx"
 #include "vcl/gradient.hxx"
-#include "vcl/sysdata.hxx"
 #include "vcl/salctype.hxx"
 #include "vcl/button.hxx"
 #include "vcl/taskpanelist.hxx"
@@ -59,6 +58,10 @@
 #include "vcl/pdfextoutdevdata.hxx"
 #include "vcl/lazydelete.hxx"
 
+// declare system types in sysdata.hxx
+#include "svsys.h"
+#include "vcl/sysdata.hxx"
+
 #include "salframe.hxx"
 #include "salobj.hxx"
 #include "salinst.hxx"
@@ -9676,7 +9679,7 @@ BOOL Window::IsNativeWidgetEnabled() const
 }
 
 #ifdef WNT // see #140456#
-#include <salframe.h>
+#include <win/salframe.h>
 #endif
 
 Reference< rendering::XCanvas > Window::ImplGetCanvas( const Size& rFullscreenSize,
diff --git a/vcl/source/window/wrkwin.cxx b/vcl/source/window/wrkwin.cxx
index cd3522d431f4..0b62236430bf 100644..100755
--- a/vcl/source/window/wrkwin.cxx
+++ b/vcl/source/window/wrkwin.cxx
@@ -33,6 +33,8 @@
 
 #include <vcl/svapp.hxx>
 #include <vcl/wrkwin.hxx>
+// declare system types in sysdata.hxx
+#include <svsys.h>
 #include <vcl/sysdata.hxx>
 
 #include <svdata.hxx>
diff --git a/vcl/win/source/app/saldata.cxx b/vcl/win/source/app/saldata.cxx
index 5f94029ad817..8dab0b56947a 100644..100755
--- a/vcl/win/source/app/saldata.cxx
+++ b/vcl/win/source/app/saldata.cxx
@@ -27,11 +27,12 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
-#include <tools/svwin.h>
+
+#include "tools/svwin.h"
 #include "rtl/tencinfo.h"
-#include <saldata.hxx>
-#include <vcl/svapp.hxx>
+#include "vcl/svapp.hxx"
 
+#include "win/saldata.hxx"
 
 // =======================================================================
 
diff --git a/vcl/win/source/app/salinfo.cxx b/vcl/win/source/app/salinfo.cxx
index 14cb5d63437a..5a846d068d9a 100644..100755
--- a/vcl/win/source/app/salinfo.cxx
+++ b/vcl/win/source/app/salinfo.cxx
@@ -46,16 +46,19 @@
 #endif
 #include "tools/postsys.h"
 
-#include "tools/string.hxx"
-#include "salsys.h"
-#include "salframe.h"
-#include "salinst.h"
-#include "saldata.hxx"
+#include "rtl/ustrbuf.hxx"
+
 #include "tools/debug.hxx"
-#include "vcl/svdata.hxx"
+#include "tools/string.hxx"
+
 #include "vcl/window.hxx"
 
-#include "rtl/ustrbuf.hxx"
+#include "win/salsys.h"
+#include "win/salframe.h"
+#include "win/salinst.h"
+#include "win/saldata.hxx"
+
+#include "svdata.hxx"
 
 #include <hash_map>
 
diff --git a/vcl/win/source/app/salinst.cxx b/vcl/win/source/app/salinst.cxx
index 2a2a1827a515..a679cf709efc 100755
--- a/vcl/win/source/app/salinst.cxx
+++ b/vcl/win/source/app/salinst.cxx
@@ -36,23 +36,28 @@
 #ifdef __MINGW32__
 #include <excpt.h>
 #endif
+
 #include <osl/file.hxx>
+
 #include <vos/mutex.hxx>
+
+#include <tools/solarmutex.hxx>
 #include <tools/debug.hxx>
-#include <wincomp.hxx>
-#include <salids.hrc>
-#include <saldata.hxx>
-#include <salinst.h>
-#include <salframe.h>
-#include <salobj.h>
-#include <vcl/salsys.hxx>
-#include <saltimer.h>
-#include <vcl/apptypes.hxx>
-#include <salbmp.h>
-#include <vcl/salimestatus.hxx>
+
 #include <vcl/timer.hxx>
-#include <wincomp.hxx>  // CS_DROPSHADOW
-#include <tools/solarmutex.hxx>
+#include <vcl/apptypes.hxx>
+
+#include <win/wincomp.hxx>
+#include <win/salids.hrc>
+#include <win/saldata.hxx>
+#include <win/salinst.h>
+#include <win/salframe.h>
+#include <win/salobj.h>
+#include <win/saltimer.h>
+#include <win/salbmp.h>
+
+#include <salimestatus.hxx>
+#include <salsys.hxx>
 
 #ifndef min
 #define min(a,b)    (((a) < (b)) ? (a) : (b))
diff --git a/vcl/win/source/app/salshl.cxx b/vcl/win/source/app/salshl.cxx
index 0f3b0c41e258..f9df1b0be783 100644..100755
--- a/vcl/win/source/app/salshl.cxx
+++ b/vcl/win/source/app/salshl.cxx
@@ -27,9 +27,10 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
-#include <tools/svwin.h>
-#include <saldata.hxx>
+
 #include <tools/debug.hxx>
+#include <tools/svwin.h>
+#include <win/saldata.hxx>
 
 // =======================================================================
 
diff --git a/vcl/win/source/app/saltimer.cxx b/vcl/win/source/app/saltimer.cxx
index d512be753f9c..52fe8b7ddcb3 100644..100755
--- a/vcl/win/source/app/saltimer.cxx
+++ b/vcl/win/source/app/saltimer.cxx
@@ -31,9 +31,9 @@
 #ifdef __MINGW32__
 #include <excpt.h>
 #endif
-#include <saldata.hxx>
-#include <saltimer.h>
-#include <salinst.h>
+#include <win/saldata.hxx>
+#include <win/saltimer.h>
+#include <win/salinst.h>
 
 // =======================================================================
 
diff --git a/vcl/win/source/gdi/salbmp.cxx b/vcl/win/source/gdi/salbmp.cxx
index 141c812dcd31..5b08645b1d4c 100644..100755
--- a/vcl/win/source/gdi/salbmp.cxx
+++ b/vcl/win/source/gdi/salbmp.cxx
@@ -27,13 +27,17 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
+
 #include <tools/svwin.h>
-#include <wincomp.hxx>
-#include <vcl/salbtype.hxx>
-#include <salgdi.h>
-#include <saldata.hxx>
-#include <salbmp.h>
+
 #include <vcl/bitmap.hxx> // for BitmapSystemData
+#include <vcl/salbtype.hxx>
+
+#include <win/wincomp.hxx>
+#include <win/salgdi.h>
+#include <win/saldata.hxx>
+#include <win/salbmp.h>
+
 #include <string.h>
 
 // -----------
diff --git a/vcl/win/source/gdi/salgdi.cxx b/vcl/win/source/gdi/salgdi.cxx
index eb260eb808c6..885111801eea 100644..100755
--- a/vcl/win/source/gdi/salgdi.cxx
+++ b/vcl/win/source/gdi/salgdi.cxx
@@ -30,16 +30,17 @@
 
 #include <stdio.h>
 #include <string.h>
+
+#include <rtl/strbuf.hxx>
+
 #include <tools/svwin.h>
-#include <wincomp.hxx>
-#include <saldata.hxx>
-#include <salgdi.h>
 #include <tools/debug.hxx>
-#include <salframe.h>
 #include <tools/poly.hxx>
-#ifndef _RTL_STRINGBUF_HXX
-#include <rtl/strbuf.hxx>
-#endif
+
+#include <win/wincomp.hxx>
+#include <win/saldata.hxx>
+#include <win/salgdi.h>
+#include <win/salframe.h>
 
 using namespace rtl;
 
diff --git a/vcl/win/source/gdi/salgdi2.cxx b/vcl/win/source/gdi/salgdi2.cxx
index 803c0886f429..a3dde8feece6 100644..100755
--- a/vcl/win/source/gdi/salgdi2.cxx
+++ b/vcl/win/source/gdi/salgdi2.cxx
@@ -30,16 +30,16 @@
 
 #include <string.h>
 #include <stdlib.h>
+
 #include <tools/svwin.h>
 #include <tools/debug.hxx>
-#include <wincomp.hxx>
-#include <salbmp.h>
-#include <saldata.hxx>
-#ifndef _SV_SALIDS_HRC
-#include <salids.hrc>
-#endif
-#include <salgdi.h>
-#include <salframe.h>
+
+#include <win/wincomp.hxx>
+#include <win/salbmp.h>
+#include <win/saldata.hxx>
+#include <win/salids.hrc>
+#include <win/salgdi.h>
+#include <win/salframe.h>
 
 bool WinSalGraphics::supportsOperation( OutDevSupportType eType ) const
 {
diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx
index 91662fb8aded..c8aed894844f 100755
--- a/vcl/win/source/gdi/salgdi3.cxx
+++ b/vcl/win/source/gdi/salgdi3.cxx
@@ -31,25 +31,6 @@
 #include <string.h>
 #include <malloc.h>
 
-#include <tools/prewin.h>
-#include <windows.h>
-#include <tools/postwin.h>
-#include <vcl/sysdata.hxx>
-#include "tools/svwin.h"
-
-#include "wincomp.hxx"
-#include "saldata.hxx"
-#include "salgdi.h"
-
-#include "vcl/svapp.hxx"
-#include "vcl/outfont.hxx"
-#include "vcl/font.hxx"
-#include "vcl/fontsubset.hxx"
-#include "vcl/sallayout.hxx"
-
-#include "vcl/outdev.h"         // for ImplGlyphFallbackFontSubstitution
-#include "unotools/fontcfg.hxx" // for IMPL_FONT_ATTR_SYMBOL
-
 #include "rtl/logfile.hxx"
 #include "rtl/tencinfo.h"
 #include "rtl/textcvt.h"
@@ -62,15 +43,34 @@
 #include "osl/thread.hxx"
 #include "osl/process.h"
 
+#include "basegfx/polygon/b2dpolygon.hxx"
+#include "basegfx/polygon/b2dpolypolygon.hxx"
+#include "basegfx/matrix/b2dhommatrix.hxx"
+#include "basegfx/matrix/b2dhommatrixtools.hxx"
+
+#include "unotools/fontcfg.hxx" // for IMPL_FONT_ATTR_SYMBOL
+
+#include "vcl/font.hxx"
+#include "vcl/svapp.hxx"
+
 #include "tools/poly.hxx"
 #include "tools/debug.hxx"
 #include "tools/stream.hxx"
 
-#include "basegfx/polygon/b2dpolygon.hxx"
-#include "basegfx/polygon/b2dpolypolygon.hxx"
-#include "basegfx/matrix/b2dhommatrix.hxx"
-#include <basegfx/matrix/b2dhommatrixtools.hxx>
+#include <tools/prewin.h>
+#include <windows.h>
+#include <tools/postwin.h>
+
+#include <vcl/sysdata.hxx>
+
+#include "win/wincomp.hxx"
+#include "win/saldata.hxx"
+#include "win/salgdi.h"
 
+#include "outfont.hxx"
+#include "fontsubset.hxx"
+#include "sallayout.hxx"
+#include "outdev.h"         // for ImplGlyphFallbackFontSubstitution
 #include "sft.hxx"
 
 #ifdef GCP_KERN_HACK
diff --git a/vcl/win/source/gdi/salgdi_gdiplus.cxx b/vcl/win/source/gdi/salgdi_gdiplus.cxx
index 88efbb29d30a..2b46ce47b82d 100644..100755
--- a/vcl/win/source/gdi/salgdi_gdiplus.cxx
+++ b/vcl/win/source/gdi/salgdi_gdiplus.cxx
@@ -30,12 +30,14 @@
 
 #include <stdio.h>
 #include <string.h>
+
 #include <tools/svwin.h>
-#include <wincomp.hxx>
-#include <saldata.hxx>
-#include <salgdi.h>
 #include <tools/debug.hxx>
 
+#include <win/wincomp.hxx>
+#include <win/saldata.hxx>
+#include <win/salgdi.h>
+
 #ifndef min
 #define min(a,b)    (((a) < (b)) ? (a) : (b))
 #endif
diff --git a/vcl/win/source/gdi/salnativewidgets-luna.cxx b/vcl/win/source/gdi/salnativewidgets-luna.cxx
index 97e3e1b48c79..2e08c9cb6af8 100755
--- a/vcl/win/source/gdi/salnativewidgets-luna.cxx
+++ b/vcl/win/source/gdi/salnativewidgets-luna.cxx
@@ -30,14 +30,16 @@
 
 #define _SV_SALNATIVEWIDGETS_CXX
 
-#include "svsys.h"
-#include "salgdi.h"
-#include "saldata.hxx"
-#include "vcl/svapp.hxx"
-
 #include "rtl/ustring.h"
+
 #include "osl/module.h"
 
+#include "vcl/svapp.hxx"
+
+#include "win/svsys.h"
+#include "win/salgdi.h"
+#include "win/saldata.hxx"
+
 #include "uxtheme.h"
 #include "vssym32.h"
 
diff --git a/vcl/win/source/gdi/salprn.cxx b/vcl/win/source/gdi/salprn.cxx
index 702ff639ed84..d8f2a7342157 100644..100755
--- a/vcl/win/source/gdi/salprn.cxx
+++ b/vcl/win/source/gdi/salprn.cxx
@@ -29,26 +29,26 @@
 #include "precompiled_vcl.hxx"
 
 #include <string.h>
-#include <tools/svwin.h>
 
+#include <osl/module.h>
+
+#include <tools/urlobj.hxx>
+#include <tools/svwin.h>
 #ifdef __MINGW32__
 #include <excpt.h>
 #endif
 
-#ifndef _OSL_MODULE_H
-#include <osl/module.h>
-#endif
-#include <wincomp.hxx>
-#include <saldata.hxx>
-#include <salinst.h>
-#include <salgdi.h>
-#include <salframe.h>
-#include <vcl/salptype.hxx>
-#include <salprn.h>
-#include <vcl/print.h>
-#include <vcl/jobset.h>
+#include <win/wincomp.hxx>
+#include <win/saldata.hxx>
+#include <win/salinst.h>
+#include <win/salgdi.h>
+#include <win/salframe.h>
+#include <win/salprn.h>
+
+#include <salptype.hxx>
+#include <print.h>
+#include <jobset.h>
 
-#include <tools/urlobj.hxx>
 #include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
 #include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
 #include <com/sun/star/ui/dialogs/XFilePicker.hpp>
diff --git a/vcl/win/source/gdi/salvd.cxx b/vcl/win/source/gdi/salvd.cxx
index 816a8fef1141..37800435bdf4 100644..100755
--- a/vcl/win/source/gdi/salvd.cxx
+++ b/vcl/win/source/gdi/salvd.cxx
@@ -27,14 +27,17 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
+
 #include <tools/svwin.h>
-#include <wincomp.hxx>
-#include <saldata.hxx>
-#include <salinst.h>
-#include <salgdi.h>
-#include <salvd.h>
+
 #include <vcl/sysdata.hxx>
 
+#include <win/wincomp.hxx>
+#include <win/saldata.hxx>
+#include <win/salinst.h>
+#include <win/salgdi.h>
+#include <win/salvd.h>
+
 // =======================================================================
 
 static HBITMAP ImplCreateVirDevBitmap( HDC hDC, long nDX, long nDY,
diff --git a/vcl/win/source/gdi/winlayout.cxx b/vcl/win/source/gdi/winlayout.cxx
index a4c588f059d4..8c9e183bb729 100755
--- a/vcl/win/source/gdi/winlayout.cxx
+++ b/vcl/win/source/gdi/winlayout.cxx
@@ -28,21 +28,21 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-#include "tools/svwin.h"
-
-#include "salgdi.h"
-#include "saldata.hxx"
-// for GetMirroredChar
-#include "sft.hxx"
-
-#include "vcl/sallayout.hxx"
-#include "vcl/svapp.hxx"
-
 #include "rtl/ustring.hxx"
 
 #include "osl/module.h"
 #include "osl/file.h"
 
+#include "tools/svwin.h"
+
+#include "vcl/svapp.hxx"
+
+#include "win/salgdi.h"
+#include "win/saldata.hxx"
+
+// for GetMirroredChar
+#include "sft.hxx"
+#include "sallayout.hxx"
 
 #include <cstdio>
 #include <malloc.h>
@@ -74,9 +74,9 @@ typedef std::set<int> IntSet;
 #include <graphite/GrClient.h>
 #include <graphite/WinFont.h>
 #include <graphite/Segment.h>
-#include <vcl/graphite_layout.hxx>
-#include <vcl/graphite_cache.hxx>
-#include <vcl/graphite_features.hxx>
+#include <graphite_layout.hxx>
+#include <graphite_cache.hxx>
+#include <graphite_features.hxx>
 #endif
 
 #define DROPPED_OUTGLYPH 0xFFFF
diff --git a/vcl/win/source/src/salsrc.rc b/vcl/win/source/src/salsrc.rc
index 1db1bfc910cf..11b967ff475b 100644..100755
--- a/vcl/win/source/src/salsrc.rc
+++ b/vcl/win/source/src/salsrc.rc
@@ -29,7 +29,7 @@
 #include <windows.h>
 
 #ifndef _SV_SALIDS_HRC
-#include <salids.hrc>
+#include <win/salids.hrc>
 #endif
 
 SAL_RESID_POINTER_NULL				CURSOR		NULLPTR.CUR
diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx
index 89a191c99ef6..b837d4e38278 100755
--- a/vcl/win/source/window/salframe.cxx
+++ b/vcl/win/source/window/salframe.cxx
@@ -46,51 +46,48 @@
 
 #include <stdio.h>
 
-#ifndef _SVWIN_HXX
 #include <tools/svwin.h>
-#endif
 #ifdef __MINGW32__
 #include <excpt.h>
 #endif
+
 #include <rtl/string.h>
 #include <rtl/ustring.h>
 
 #include <osl/module.h>
+
 #include <tools/debug.hxx>
 
-// Warning in SDK header
-#if defined(_MSC_VER) && (_MSC_VER > 1400)
-#pragma warning( disable: 4242 4244 )
-#endif
-#include <wincomp.hxx>
-#ifndef _SV_SALIDS_HRC
-#include <salids.hrc>
-#endif
 #include <vcl/sysdata.hxx>
-#include <saldata.hxx>
-#include <salinst.h>
-#include <salbmp.h>
-#include <salgdi.h>
-#include <salsys.h>
-#include <salframe.h>
-#include <salvd.h>
-#include <salmenu.h>
-#include <salobj.h>
-#include <vcl/impbmp.hxx>
 #include <vcl/timer.hxx>
-#include <saltimer.h>
 #include <vcl/settings.hxx>
-#ifndef _SV_KEYCOES_HXX
 #include <vcl/keycodes.hxx>
-#endif
-#include <vcl/window.h>
 #include <vcl/window.hxx>
 #include <vcl/wrkwin.hxx>
-#include <vcl/sallayout.hxx>
 #include <vcl/svapp.hxx>
-#ifndef _VCL_IMPDEL_HXX
-#include <impdel.hxx>
+#include <vcl/impdel.hxx>
+
+// Warning in SDK header
+#if defined(_MSC_VER) && (_MSC_VER > 1400)
+#pragma warning( disable: 4242 4244 )
 #endif
+#include <win/wincomp.hxx>
+#include <win/salids.hrc>
+#include <win/saldata.hxx>
+#include <win/salinst.h>
+#include <win/salbmp.h>
+#include <win/salgdi.h>
+#include <win/salsys.h>
+#include <win/salframe.h>
+#include <win/salvd.h>
+#include <win/salmenu.h>
+#include <win/salobj.h>
+#include <win/saltimer.h>
+
+#include <impbmp.hxx>
+#include <window.h>
+#include <sallayout.hxx>
+
 #define COMPILE_MULTIMON_STUBS
 #include <multimon.h>
 #include <vector>
diff --git a/vcl/win/source/window/salmenu.cxx b/vcl/win/source/window/salmenu.cxx
index 47da911b012e..e16d9e573b2d 100755
--- a/vcl/win/source/window/salmenu.cxx
+++ b/vcl/win/source/window/salmenu.cxx
@@ -27,16 +27,20 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
+
 #include <tools/svwin.h>
-#include <wincomp.hxx>
-#include <saldata.hxx>
-#include <salinst.h>
-#include <vcl/salgdi.hxx>
-#include <salmenu.h>
+
 #include <vcl/menu.hxx>
 #include <vcl/sysdata.hxx>
-#include <salframe.h>
-#include <vcl/impbmp.hxx>
+
+#include <win/wincomp.hxx>
+#include <win/saldata.hxx>
+#include <win/salinst.h>
+#include <win/salframe.h>
+#include <win/salmenu.h>
+
+#include <impbmp.hxx>
+#include <salgdi.hxx>
 
 // uncomment the following line to have ownerdrawn menues, ie, with bitmaps
 // however, this is incompatible with OLE inplace editing
diff --git a/vcl/win/source/window/salobj.cxx b/vcl/win/source/window/salobj.cxx
index bf0f29bb72d3..ed2665096838 100644..100755
--- a/vcl/win/source/window/salobj.cxx
+++ b/vcl/win/source/window/salobj.cxx
@@ -30,17 +30,17 @@
 
 #include <string.h>
 
-#ifndef _SVWIN_HXX
-#include <tools/svwin.h>
-#endif
-#include <wincomp.hxx>
-#include <saldata.hxx>
-#include <salinst.h>
-#include <salframe.h>
-#include <salobj.h>
 #include <tools/debug.hxx>
+#include <tools/svwin.h>
+
 #include <vcl/svapp.hxx>
 
+#include <win/wincomp.hxx>
+#include <win/saldata.hxx>
+#include <win/salinst.h>
+#include <win/salframe.h>
+#include <win/salobj.h>
+
 // =======================================================================
 
 static BOOL ImplIsSysWindowOrChild( HWND hWndParent, HWND hWndChild )