6 files changed, 38 insertions, 92 deletions
diff --git a/vcl/win/source/app/MAKEFILE.MK b/vcl/win/source/app/MAKEFILE.MK
deleted file mode 100644
index 9b3237567eff..000000000000
--- a/vcl/win/source/app/MAKEFILE.MK
+++ /dev/null
@@ -1,53 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-
-PRJ=..$/..$/..
-
-PRJNAME=vcl
-TARGET=salapp
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile2.pmk
-
-# --- #105371#
-CFLAGS += -DWINVER=0x0400
-
-# --- Files --------------------------------------------------------
-
-SLOFILES=   $(SLO)$/salshl.obj      \
-            $(SLO)$/saldata.obj     \
-            $(SLO)$/salinst.obj     \
-            $(SLO)$/saltimer.obj    \
-            $(SLO)$/salinfo.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
diff --git a/vcl/win/source/app/saldata.cxx b/vcl/win/source/app/saldata.cxx
index 1eb897b55b8d..4faaf7bd4def 100644..100755
--- a/vcl/win/source/app/saldata.cxx
+++ b/vcl/win/source/app/saldata.cxx
@@ -27,11 +27,12 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
-#include <tools/svwin.h>
+
+#include "tools/svwin.h"
 #include "rtl/tencinfo.h"
-#include <saldata.hxx>
-#include <vcl/svapp.hxx>
+#include "vcl/svapp.hxx"
 
+#include "win/saldata.hxx"
 
 // =======================================================================
 
diff --git a/vcl/win/source/app/salinfo.cxx b/vcl/win/source/app/salinfo.cxx
index c635fdfc9845..431e9ca9c15f 100644..100755
--- a/vcl/win/source/app/salinfo.cxx
+++ b/vcl/win/source/app/salinfo.cxx
@@ -34,28 +34,20 @@
 #define WINVER 0x0500
 #endif
 
-#define VCL_NEED_BASETSD
-#include "tools/presys.h"
-#if defined _MSC_VER
-#pragma warning(push, 1)
-#endif
-#include <windows.h>
-#include <winuser.h>
-#if defined _MSC_VER
-#pragma warning(pop)
-#endif
-#include "tools/postsys.h"
+#include "svsys.h"
+#include "rtl/ustrbuf.hxx"
 
-#include "tools/string.hxx"
-#include "salsys.h"
-#include "salframe.h"
-#include "salinst.h"
-#include "saldata.hxx"
 #include "tools/debug.hxx"
-#include "vcl/svdata.hxx"
+#include "tools/string.hxx"
+
 #include "vcl/window.hxx"
 
-#include "rtl/ustrbuf.hxx"
+#include "win/salsys.h"
+#include "win/salframe.h"
+#include "win/salinst.h"
+#include "win/saldata.hxx"
+
+#include "svdata.hxx"
 
 #include <hash_map>
 
diff --git a/vcl/win/source/app/salinst.cxx b/vcl/win/source/app/salinst.cxx
index 05cb20750abd..1e5a306d852d 100755
--- a/vcl/win/source/app/salinst.cxx
+++ b/vcl/win/source/app/salinst.cxx
@@ -36,23 +36,28 @@
 #ifdef __MINGW32__
 #include <excpt.h>
 #endif
+
 #include <osl/file.hxx>
+
 #include <vos/mutex.hxx>
+
+#include <tools/solarmutex.hxx>
 #include <tools/debug.hxx>
-#include <wincomp.hxx>
-#include <salids.hrc>
-#include <saldata.hxx>
-#include <salinst.h>
-#include <salframe.h>
-#include <salobj.h>
-#include <vcl/salsys.hxx>
-#include <saltimer.h>
-#include <vcl/apptypes.hxx>
-#include <salbmp.h>
-#include <vcl/salimestatus.hxx>
+
 #include <vcl/timer.hxx>
-#include <wincomp.hxx>  // CS_DROPSHADOW
-#include <tools/solarmutex.hxx>
+#include <vcl/apptypes.hxx>
+
+#include <win/wincomp.hxx>
+#include <win/salids.hrc>
+#include <win/saldata.hxx>
+#include <win/salinst.h>
+#include <win/salframe.h>
+#include <win/salobj.h>
+#include <win/saltimer.h>
+#include <win/salbmp.h>
+
+#include <salimestatus.hxx>
+#include <salsys.hxx>
 
 #ifndef min
 #define min(a,b)    (((a) < (b)) ? (a) : (b))
diff --git a/vcl/win/source/app/salshl.cxx b/vcl/win/source/app/salshl.cxx
index 578b3cb804bd..427f2092a0dc 100644..100755
--- a/vcl/win/source/app/salshl.cxx
+++ b/vcl/win/source/app/salshl.cxx
@@ -27,9 +27,10 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
-#include <tools/svwin.h>
-#include <saldata.hxx>
+
 #include <tools/debug.hxx>
+#include <tools/svwin.h>
+#include <win/saldata.hxx>
 
 // =======================================================================
 
diff --git a/vcl/win/source/app/saltimer.cxx b/vcl/win/source/app/saltimer.cxx
index 6026f80e6346..f0b88a8e381c 100644..100755
--- a/vcl/win/source/app/saltimer.cxx
+++ b/vcl/win/source/app/saltimer.cxx
@@ -31,9 +31,9 @@
 #ifdef __MINGW32__
 #include <excpt.h>
 #endif
-#include <saldata.hxx>
-#include <saltimer.h>
-#include <salinst.h>
+#include <win/saldata.hxx>
+#include <win/saltimer.h>
+#include <win/salinst.h>
 
 // =======================================================================