summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
Diffstat (limited to 'vcl')
-rw-r--r--vcl/aqua/source/a11y/documentfocuslistener.cxx6
-rw-r--r--vcl/aqua/source/dtrans/DropTarget.cxx2
-rw-r--r--vcl/aqua/source/dtrans/OSXTransferable.cxx2
-rw-r--r--vcl/aqua/source/dtrans/test_aquacb.cxx2
-rw-r--r--[-rwxr-xr-x]vcl/aqua/source/gdi/salatslayout.cxx0
-rw-r--r--[-rwxr-xr-x]vcl/aqua/source/gdi/salcolorutils.cxx0
-rw-r--r--[-rwxr-xr-x]vcl/aqua/source/gdi/salgdiutils.cxx0
-rw-r--r--[-rwxr-xr-x]vcl/aqua/source/gdi/salmathutils.cxx0
-rw-r--r--vcl/os2/source/app/salinst.cxx4
-rw-r--r--vcl/os2/source/app/sallang.cxx2
-rw-r--r--vcl/os2/source/gdi/salgdi.cxx2
-rw-r--r--vcl/os2/source/gdi/salgdi2.cxx2
-rw-r--r--vcl/os2/source/gdi/salgdi3.cxx8
-rw-r--r--vcl/os2/source/window/salframe.cxx8
-rw-r--r--[-rwxr-xr-x]vcl/source/app/settings.cxx0
-rw-r--r--vcl/source/app/sound.cxx4
-rw-r--r--vcl/source/app/stdtext.cxx2
-rw-r--r--vcl/source/app/svdata.cxx4
-rw-r--r--vcl/source/app/timer.cxx2
-rw-r--r--vcl/source/app/unohelp.cxx4
-rw-r--r--vcl/source/components/factory.cxx4
-rw-r--r--vcl/source/control/button.cxx8
-rw-r--r--vcl/source/control/combobox.cxx2
-rw-r--r--vcl/source/control/ctrl.cxx2
-rw-r--r--vcl/source/control/edit.cxx6
-rw-r--r--vcl/source/control/field2.cxx4
-rw-r--r--vcl/source/control/fixbrd.cxx2
-rw-r--r--vcl/source/control/group.cxx2
-rw-r--r--vcl/source/control/ilstbox.cxx4
-rw-r--r--vcl/source/control/longcurr.cxx2
-rw-r--r--vcl/source/control/menubtn.cxx2
-rw-r--r--vcl/source/control/morebtn.cxx2
-rw-r--r--vcl/source/control/slider.cxx2
-rw-r--r--vcl/source/gdi/bitmap.cxx2
-rw-r--r--vcl/source/gdi/bitmap2.cxx2
-rw-r--r--vcl/source/gdi/bitmapex.cxx4
-rw-r--r--vcl/source/gdi/cvtgrf.cxx2
-rw-r--r--vcl/source/gdi/hatch.cxx2
-rw-r--r--vcl/source/gdi/image.cxx6
-rw-r--r--vcl/source/gdi/imagerepository.cxx2
-rw-r--r--vcl/source/gdi/impbmp.cxx2
-rw-r--r--vcl/source/gdi/impgraph.cxx2
-rw-r--r--vcl/source/gdi/impvect.cxx2
-rw-r--r--vcl/source/gdi/jobset.cxx2
-rw-r--r--vcl/source/gdi/outdev.cxx4
-rw-r--r--vcl/source/gdi/outdev2.cxx2
-rw-r--r--vcl/source/gdi/outdev3.cxx4
-rw-r--r--vcl/source/gdi/outdev5.cxx2
-rw-r--r--vcl/source/gdi/outdev6.cxx2
-rw-r--r--vcl/source/gdi/outmap.cxx2
-rw-r--r--vcl/source/gdi/print.cxx2
-rw-r--r--[-rwxr-xr-x]vcl/source/gdi/print3.cxx0
-rw-r--r--vcl/source/gdi/region.cxx6
-rw-r--r--[-rwxr-xr-x]vcl/source/gdi/salgdilayout.cxx2
-rw-r--r--[-rwxr-xr-x]vcl/source/gdi/sallayout.cxx4
-rw-r--r--vcl/source/gdi/virdev.cxx2
-rw-r--r--[-rwxr-xr-x]vcl/source/helper/smartid.cxx0
-rw-r--r--vcl/source/window/accel.cxx4
-rw-r--r--vcl/source/window/brdwin.cxx2
-rw-r--r--vcl/source/window/btndlg.cxx2
-rw-r--r--vcl/source/window/cmdevt.cxx4
-rw-r--r--vcl/source/window/dialog.cxx2
-rw-r--r--vcl/source/window/dockmgr.cxx4
-rw-r--r--vcl/source/window/dockwin.cxx4
-rw-r--r--vcl/source/window/floatwin.cxx4
-rw-r--r--vcl/source/window/introwin.cxx2
-rw-r--r--vcl/source/window/javachild.cxx2
-rw-r--r--vcl/source/window/keycod.cxx6
-rw-r--r--vcl/source/window/msgbox.cxx4
-rw-r--r--vcl/source/window/scrwnd.cxx8
-rw-r--r--vcl/source/window/split.cxx2
-rw-r--r--vcl/source/window/splitwin.cxx2
-rw-r--r--vcl/source/window/status.cxx2
-rw-r--r--vcl/source/window/syschild.cxx6
-rw-r--r--vcl/source/window/syswin.cxx2
-rw-r--r--vcl/source/window/tabdlg.cxx2
-rw-r--r--vcl/source/window/tabpage.cxx2
-rw-r--r--vcl/source/window/toolbox.cxx4
-rw-r--r--vcl/source/window/toolbox2.cxx2
-rw-r--r--vcl/source/window/window.cxx4
-rw-r--r--vcl/source/window/window2.cxx4
-rw-r--r--vcl/source/window/winproc.cxx2
-rw-r--r--vcl/source/window/wrkwin.cxx4
-rw-r--r--[-rwxr-xr-x]vcl/test/dndtest.cxx0
-rw-r--r--vcl/unx/kde/kdedata.cxx2
-rw-r--r--vcl/unx/kde/salnativewidgets-kde.cxx4
-rw-r--r--vcl/unx/source/app/i18n_cb.cxx2
-rw-r--r--vcl/unx/source/app/i18n_ic.cxx4
-rw-r--r--vcl/unx/source/app/saldata.cxx4
-rw-r--r--vcl/unx/source/app/saldisp.cxx2
-rw-r--r--vcl/unx/source/app/soicon.cxx2
-rw-r--r--vcl/unx/source/gdi/xlfd_extd.cxx2
-rw-r--r--vcl/unx/source/window/salobj.cxx4
-rw-r--r--vcl/win/source/gdi/salgdi.cxx2
-rw-r--r--vcl/win/source/gdi/salgdi2.cxx2
-rw-r--r--[-rwxr-xr-x]vcl/win/source/gdi/salnativewidgets-luna.cxx0
-rw-r--r--vcl/win/source/gdi/salprn.cxx2
-rw-r--r--[-rwxr-xr-x]vcl/win/source/gdi/winlayout.cxx0
-rw-r--r--vcl/win/source/window/salframe.cxx8
-rw-r--r--vcl/win/source/window/salobj.cxx2
-rw-r--r--[-rwxr-xr-x]vcl/workben/outdevgrind.cxx0
101 files changed, 0 insertions, 284 deletions
diff --git a/vcl/aqua/source/a11y/documentfocuslistener.cxx b/vcl/aqua/source/a11y/documentfocuslistener.cxx
index 02a7337ce397..dfc425fb95ee 100644
--- a/vcl/aqua/source/a11y/documentfocuslistener.cxx
+++ b/vcl/aqua/source/a11y/documentfocuslistener.cxx
@@ -27,17 +27,11 @@
#include "documentfocuslistener.hxx"
-#ifndef _COM_SUN_STAR_ACCESSIBILITY_XACCESSIBLEEVENTBROADCASTER_HPP_
#include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp>
-#endif
-#ifndef _COM_SUN_STAR_ACCESSIBILITY_ACCESSIBLEEVENTID_HPP_
#include <com/sun/star/accessibility/AccessibleEventId.hpp>
-#endif
-#ifndef _COM_SUN_STAR_ACCESSIBILITY_ACCESSIBLESTATETYPE_HPP_
#include <com/sun/star/accessibility/AccessibleStateType.hpp>
-#endif
using namespace ::com::sun::star::accessibility;
using namespace ::com::sun::star::lang;
diff --git a/vcl/aqua/source/dtrans/DropTarget.cxx b/vcl/aqua/source/dtrans/DropTarget.cxx
index c928d66e156d..0628fbd003bb 100644
--- a/vcl/aqua/source/dtrans/DropTarget.cxx
+++ b/vcl/aqua/source/dtrans/DropTarget.cxx
@@ -32,9 +32,7 @@
#include <com/sun/star/datatransfer/dnd/DropTargetDragEnterEvent.hpp>
#include <rtl/unload.h>
-#ifndef COMPHELPER_MAKESEQUENCE_HXX_INCLUDED
#include "comphelper/makesequence.hxx"
-#endif
#include <cppuhelper/interfacecontainer.hxx>
#include "aqua_clipboard.hxx"
diff --git a/vcl/aqua/source/dtrans/OSXTransferable.cxx b/vcl/aqua/source/dtrans/OSXTransferable.cxx
index 2e6b327de446..ca8892fa1025 100644
--- a/vcl/aqua/source/dtrans/OSXTransferable.cxx
+++ b/vcl/aqua/source/dtrans/OSXTransferable.cxx
@@ -29,9 +29,7 @@
#include "precompiled_vcl.hxx"
#include <sal/types.h>
-#ifndef _TRANSFERABLE_HXX_
#include "OSXTransferable.hxx"
-#endif
#include "DataFlavorMapping.hxx"
diff --git a/vcl/aqua/source/dtrans/test_aquacb.cxx b/vcl/aqua/source/dtrans/test_aquacb.cxx
index 85c87c6b9ba9..18f9038ba802 100644
--- a/vcl/aqua/source/dtrans/test_aquacb.cxx
+++ b/vcl/aqua/source/dtrans/test_aquacb.cxx
@@ -36,9 +36,7 @@
#include <com/sun/star/datatransfer/clipboard/XClipboardEx.hpp>
#include <com/sun/star/lang/XComponent.hpp>
-#ifndef _CPPUHELPER_IMPLBASE1_HXX_
#include <cppuhelper/implbase2.hxx>
-#endif
#include <rtl/ustring.hxx>
#include <sal/types.h>
#include <osl/diagnose.h>
diff --git a/vcl/aqua/source/gdi/salatslayout.cxx b/vcl/aqua/source/gdi/salatslayout.cxx
index 335505de85ac..335505de85ac 100755..100644
--- a/vcl/aqua/source/gdi/salatslayout.cxx
+++ b/vcl/aqua/source/gdi/salatslayout.cxx
diff --git a/vcl/aqua/source/gdi/salcolorutils.cxx b/vcl/aqua/source/gdi/salcolorutils.cxx
index ec33b2dd8f8d..ec33b2dd8f8d 100755..100644
--- a/vcl/aqua/source/gdi/salcolorutils.cxx
+++ b/vcl/aqua/source/gdi/salcolorutils.cxx
diff --git a/vcl/aqua/source/gdi/salgdiutils.cxx b/vcl/aqua/source/gdi/salgdiutils.cxx
index f7c234d2c4c4..f7c234d2c4c4 100755..100644
--- a/vcl/aqua/source/gdi/salgdiutils.cxx
+++ b/vcl/aqua/source/gdi/salgdiutils.cxx
diff --git a/vcl/aqua/source/gdi/salmathutils.cxx b/vcl/aqua/source/gdi/salmathutils.cxx
index 8df44acbf730..8df44acbf730 100755..100644
--- a/vcl/aqua/source/gdi/salmathutils.cxx
+++ b/vcl/aqua/source/gdi/salmathutils.cxx
diff --git a/vcl/os2/source/app/salinst.cxx b/vcl/os2/source/app/salinst.cxx
index b08a9769ccf4..581c37a41ff9 100644
--- a/vcl/os2/source/app/salinst.cxx
+++ b/vcl/os2/source/app/salinst.cxx
@@ -35,14 +35,10 @@
#define _SV_SALINST_CXX
-#ifndef _VOS_MUTEX_HXX
#include <vos/mutex.hxx>
-#endif
#include <tools/debug.hxx>
-#ifndef _SV_SALIDS_HRC
#include <salids.hrc>
-#endif
#include <vcl/salatype.hxx>
#include <saldata.hxx>
#include <salinst.h>
diff --git a/vcl/os2/source/app/sallang.cxx b/vcl/os2/source/app/sallang.cxx
index f23705077ac3..92c4d382a946 100644
--- a/vcl/os2/source/app/sallang.cxx
+++ b/vcl/os2/source/app/sallang.cxx
@@ -25,9 +25,7 @@
*
************************************************************************/
-#ifndef _SALLANG_HXX
#include <sallang.hxx>
-#endif
// =======================================================================
diff --git a/vcl/os2/source/gdi/salgdi.cxx b/vcl/os2/source/gdi/salgdi.cxx
index dff1557170fb..eb152ec9af29 100644
--- a/vcl/os2/source/gdi/salgdi.cxx
+++ b/vcl/os2/source/gdi/salgdi.cxx
@@ -35,9 +35,7 @@
#include <tools/debug.hxx>
#include <salframe.h>
#include <tools/poly.hxx>
-#ifndef _RTL_STRINGBUF_HXX
#include <rtl/strbuf.hxx>
-#endif
#ifndef __H_FT2LIB
#include <wingdi.h>
diff --git a/vcl/os2/source/gdi/salgdi2.cxx b/vcl/os2/source/gdi/salgdi2.cxx
index 37621ee1f6a8..5834dfc75c40 100644
--- a/vcl/os2/source/gdi/salgdi2.cxx
+++ b/vcl/os2/source/gdi/salgdi2.cxx
@@ -31,9 +31,7 @@
#define _SV_SALGDI2_CXX
#include <salbmp.h>
#include <saldata.hxx>
-#ifndef _SV_SALIDS_HRC
#include <salids.hrc>
-#endif
#include <salgdi.h>
#include <salvd.h>
#include <vcl/salbtype.hxx>
diff --git a/vcl/os2/source/gdi/salgdi3.cxx b/vcl/os2/source/gdi/salgdi3.cxx
index 2086c2a5e4d3..2379b8922cb4 100644
--- a/vcl/os2/source/gdi/salgdi3.cxx
+++ b/vcl/os2/source/gdi/salgdi3.cxx
@@ -37,15 +37,9 @@
#define _SV_SALGDI3_CXX
#include <tools/svwin.h>
#include <rtl/tencinfo.h>
-#ifndef _OSL_FILE_HXX
#include <osl/file.hxx>
-#endif
-#ifndef _OSL_THREAD_HXX
#include <osl/thread.hxx>
-#endif
-#ifndef _OSL_PROCESS_HXX
#include <osl/process.h>
-#endif
#include <vcl/svapp.hxx>
#include <saldata.hxx>
#include <salgdi.h>
@@ -57,9 +51,7 @@
#include <tools/debug.hxx>
#include <saldata.hxx>
#include <salgdi.h>
-#ifndef _SV_OUTFONT_HXX
#include <vcl/outfont.hxx>
-#endif
#include <sallayout.h>
#include <tools/poly.hxx>
#include <basegfx/polygon/b2dpolygon.hxx>
diff --git a/vcl/os2/source/window/salframe.cxx b/vcl/os2/source/window/salframe.cxx
index ca40441ccda7..5e0e87f5d54d 100644
--- a/vcl/os2/source/window/salframe.cxx
+++ b/vcl/os2/source/window/salframe.cxx
@@ -36,27 +36,19 @@
#define _SV_SALFRAME_CXX
-#ifndef DEBUG_HXX
#include <tools/debug.hxx>
-#endif
#define private public
-#ifndef _SV_SALLANG_HXX
#include <sallang.hxx>
-#endif
-#ifndef _SV_SALIDS_HRC
#include <salids.hrc>
-#endif
#include <saldata.hxx>
#include <salinst.h>
#include <salgdi.h>
#include <salframe.h>
#include <vcl/timer.hxx>
#include <vcl/settings.hxx>
-#ifndef _SV_KEYCOES_HXX
#include <vcl/keycodes.hxx>
-#endif
#include <saltimer.h>
#if OSL_DEBUG_LEVEL>10
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index 913e11d03614..913e11d03614 100755..100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
diff --git a/vcl/source/app/sound.cxx b/vcl/source/app/sound.cxx
index bac9d50dc5da..910f999358e9 100644
--- a/vcl/source/app/sound.cxx
+++ b/vcl/source/app/sound.cxx
@@ -29,12 +29,8 @@
#include "precompiled_vcl.hxx"
#include <tools/urlobj.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>
diff --git a/vcl/source/app/stdtext.cxx b/vcl/source/app/stdtext.cxx
index 176ec5a1b4c6..79eca315485e 100644
--- a/vcl/source/app/stdtext.cxx
+++ b/vcl/source/app/stdtext.cxx
@@ -28,9 +28,7 @@
// 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>
diff --git a/vcl/source/app/svdata.cxx b/vcl/source/app/svdata.cxx
index f8b0d1d3379f..6ac910a07b0d 100644
--- a/vcl/source/app/svdata.cxx
+++ b/vcl/source/app/svdata.cxx
@@ -29,15 +29,11 @@
#include "precompiled_vcl.hxx"
#include <string.h>
-#ifndef _SV_SVSYS_HXX
#include <svsys.h>
-#endif
#include <vcl/salinst.hxx>
#include <vcl/salframe.hxx>
-#ifndef _VOS_MUTEX_HXX
#include <vos/mutex.hxx>
-#endif
#include <osl/process.h>
#include <osl/file.hxx>
diff --git a/vcl/source/app/timer.cxx b/vcl/source/app/timer.cxx
index 356608e7fbfc..392b783e9fd9 100644
--- a/vcl/source/app/timer.cxx
+++ b/vcl/source/app/timer.cxx
@@ -28,9 +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/saltimer.hxx>
#include <tools/time.hxx>
#include <vcl/svdata.hxx>
diff --git a/vcl/source/app/unohelp.cxx b/vcl/source/app/unohelp.cxx
index 711f9fb06ae1..dd7491922cea 100644
--- a/vcl/source/app/unohelp.cxx
+++ b/vcl/source/app/unohelp.cxx
@@ -35,14 +35,10 @@
#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>
diff --git a/vcl/source/components/factory.cxx b/vcl/source/components/factory.cxx
index 6bed493cacde..0473bca12a2c 100644
--- a/vcl/source/components/factory.cxx
+++ b/vcl/source/components/factory.cxx
@@ -28,12 +28,8 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_vcl.hxx"
#include <tools/debug.hxx>
-#ifndef _OSL_MUTEX_HXX
#include <osl/mutex.hxx>
-#endif
-#ifndef _RTL_USTRBUF_HXX
#include <rtl/ustrbuf.hxx>
-#endif
#include <uno/dispatcher.h> // declaration of generic uno interface
#include <uno/mapping.hxx> // mapping stuff
#include <cppuhelper/factory.hxx>
diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index d4f29e224e7b..7428964b87a9 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -30,13 +30,9 @@
#include <tools/debug.hxx>
-#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>
@@ -48,14 +44,10 @@
#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
diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx
index 5b2e8755e5c8..d760b0b46914 100644
--- a/vcl/source/control/combobox.cxx
+++ b/vcl/source/control/combobox.cxx
@@ -30,9 +30,7 @@
#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>
diff --git a/vcl/source/control/ctrl.cxx b/vcl/source/control/ctrl.cxx
index 918675cc0783..cf6db4139693 100644
--- a/vcl/source/control/ctrl.cxx
+++ b/vcl/source/control/ctrl.cxx
@@ -28,9 +28,7 @@
// 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/svapp.hxx>
#include <vcl/event.hxx>
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index c0e7b352642c..b081b5cf9615 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -28,17 +28,13 @@
// 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>
@@ -59,9 +55,7 @@
#include <com/sun/star/datatransfer/clipboard/XClipboard.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#ifndef _COM_SUN_STAR_DATATRANSFER_DND_DNDCONSTANS_HPP_
#include <com/sun/star/datatransfer/dnd/DNDConstants.hpp>
-#endif
#include <com/sun/star/datatransfer/dnd/XDragGestureRecognizer.hpp>
#include <com/sun/star/datatransfer/dnd/XDropTarget.hpp>
diff --git a/vcl/source/control/field2.cxx b/vcl/source/control/field2.cxx
index 8ae2ecff41b9..a6ffc191a452 100644
--- a/vcl/source/control/field2.cxx
+++ b/vcl/source/control/field2.cxx
@@ -29,13 +29,9 @@
#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>
diff --git a/vcl/source/control/fixbrd.cxx b/vcl/source/control/fixbrd.cxx
index b519174f95d1..f44468c9c374 100644
--- a/vcl/source/control/fixbrd.cxx
+++ b/vcl/source/control/fixbrd.cxx
@@ -28,9 +28,7 @@
// 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/event.hxx>
#include <vcl/fixbrd.hxx>
diff --git a/vcl/source/control/group.cxx b/vcl/source/control/group.cxx
index ecf00568e11f..a4940e1294d2 100644
--- a/vcl/source/control/group.cxx
+++ b/vcl/source/control/group.cxx
@@ -31,9 +31,7 @@
#include <vcl/group.hxx>
#include <vcl/controldata.hxx>
-#ifndef _SV_RC_H
#include <tools/rc.h>
-#endif
diff --git a/vcl/source/control/ilstbox.cxx b/vcl/source/control/ilstbox.cxx
index 02c8d2b5fcb3..f1cd779c97cf 100644
--- a/vcl/source/control/ilstbox.cxx
+++ b/vcl/source/control/ilstbox.cxx
@@ -39,17 +39,13 @@
#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
#ifndef _COM_SUN_STAR_ACCESSIBILITY_XACCESSIBLE_HDL_
#include <com/sun/star/accessibility/XAccessible.hpp>
#endif
-#ifndef _COM_SUN_STAR_ACCESSIBILITY_ACCESSIBLEROLE_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..7e74daa6fe51 100644
--- a/vcl/source/control/longcurr.cxx
+++ b/vcl/source/control/longcurr.cxx
@@ -34,9 +34,7 @@
#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>
diff --git a/vcl/source/control/menubtn.cxx b/vcl/source/control/menubtn.cxx
index 1c83779da1a9..8d26364f8765 100644
--- a/vcl/source/control/menubtn.cxx
+++ b/vcl/source/control/menubtn.cxx
@@ -28,9 +28,7 @@
// 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/decoview.hxx>
#include <vcl/event.hxx>
#include <vcl/menu.hxx>
diff --git a/vcl/source/control/morebtn.cxx b/vcl/source/control/morebtn.cxx
index 921a25756d32..40a687832e37 100644
--- a/vcl/source/control/morebtn.cxx
+++ b/vcl/source/control/morebtn.cxx
@@ -29,9 +29,7 @@
#include "precompiled_vcl.hxx"
#include <vcl/morebtn.hxx>
-#ifndef _SV_RD_H
#include <tools/rc.h>
-#endif
diff --git a/vcl/source/control/slider.cxx b/vcl/source/control/slider.cxx
index daf733a57a33..572edb2a1f41 100644
--- a/vcl/source/control/slider.cxx
+++ b/vcl/source/control/slider.cxx
@@ -28,9 +28,7 @@
// 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/event.hxx>
#include <vcl/decoview.hxx>
#include <vcl/slider.hxx>
diff --git a/vcl/source/gdi/bitmap.cxx b/vcl/source/gdi/bitmap.cxx
index 074935086b0b..24f81481e4e0 100644
--- a/vcl/source/gdi/bitmap.cxx
+++ b/vcl/source/gdi/bitmap.cxx
@@ -35,9 +35,7 @@
#include <vcl/outdev.hxx>
#include <vcl/impbmp.hxx>
#include <vcl/salbmp.hxx>
-#ifndef _SV_RC_H
#include <tools/rc.h>
-#endif
#include <vcl/bitmap.hxx>
#include <vcl/bitmapex.hxx>
#include <vcl/svapp.hxx>
diff --git a/vcl/source/gdi/bitmap2.cxx b/vcl/source/gdi/bitmap2.cxx
index 6da78c697525..0079073216f5 100644
--- a/vcl/source/gdi/bitmap2.cxx
+++ b/vcl/source/gdi/bitmap2.cxx
@@ -29,9 +29,7 @@
#include "precompiled_vcl.hxx"
#include <tools/zcodec.hxx>
-#ifndef _TOOLS_STREAM_HXX
#include <tools/stream.hxx>
-#endif
#include <vcl/salbtype.hxx>
#include <vcl/bmpacc.hxx>
#include <vcl/outdev.hxx>
diff --git a/vcl/source/gdi/bitmapex.cxx b/vcl/source/gdi/bitmapex.cxx
index 38402af626c2..ddcf2fe05248 100644
--- a/vcl/source/gdi/bitmapex.cxx
+++ b/vcl/source/gdi/bitmapex.cxx
@@ -37,12 +37,8 @@
#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>
diff --git a/vcl/source/gdi/cvtgrf.cxx b/vcl/source/gdi/cvtgrf.cxx
index 8ba963bc4718..bd18a24191c3 100644
--- a/vcl/source/gdi/cvtgrf.cxx
+++ b/vcl/source/gdi/cvtgrf.cxx
@@ -28,9 +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/metaact.hxx>
#include <vcl/salinst.hxx>
#include <vcl/svdata.hxx>
diff --git a/vcl/source/gdi/hatch.cxx b/vcl/source/gdi/hatch.cxx
index 3a8b51bf3022..ceb0b924444f 100644
--- a/vcl/source/gdi/hatch.cxx
+++ b/vcl/source/gdi/hatch.cxx
@@ -30,9 +30,7 @@
#include <tools/stream.hxx>
#include <tools/vcompat.hxx>
#include <tools/debug.hxx>
-#ifndef _SV_HATCX_HXX
#include <vcl/hatch.hxx>
-#endif
DBG_NAME( Hatch )
diff --git a/vcl/source/gdi/image.cxx b/vcl/source/gdi/image.cxx
index e79308b2664e..de16a03846bf 100644
--- a/vcl/source/gdi/image.cxx
+++ b/vcl/source/gdi/image.cxx
@@ -33,20 +33,14 @@
#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>
diff --git a/vcl/source/gdi/imagerepository.cxx b/vcl/source/gdi/imagerepository.cxx
index d97999311751..c891ded66001 100644
--- a/vcl/source/gdi/imagerepository.cxx
+++ b/vcl/source/gdi/imagerepository.cxx
@@ -30,9 +30,7 @@
#include <vcl/bitmapex.hxx>
#include <vcl/imagerepository.hxx>
#include <vcl/svapp.hxx>
-#ifndef _SV_IMPIMAGETREE_H
#include "vcl/impimagetree.hxx"
-#endif
//........................................................................
namespace vcl
diff --git a/vcl/source/gdi/impbmp.cxx b/vcl/source/gdi/impbmp.cxx
index 3e328b7db7a4..67f98db54513 100644
--- a/vcl/source/gdi/impbmp.cxx
+++ b/vcl/source/gdi/impbmp.cxx
@@ -28,9 +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/salbmp.hxx>
#include <tools/debug.hxx>
#include <vcl/impbmp.hxx>
diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx
index 397a5d6b704a..19114f60c694 100644
--- a/vcl/source/gdi/impgraph.cxx
+++ b/vcl/source/gdi/impgraph.cxx
@@ -32,9 +32,7 @@
#include <tools/debug.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>
diff --git a/vcl/source/gdi/impvect.cxx b/vcl/source/gdi/impvect.cxx
index 0846f5567200..fcbd3dabd05e 100644
--- a/vcl/source/gdi/impvect.cxx
+++ b/vcl/source/gdi/impvect.cxx
@@ -36,9 +36,7 @@
#include <vcl/svapp.hxx>
#include <vcl/wrkwin.hxx>
#include <vcl/virdev.hxx>
-#ifndef _SV_VECTORIZ_HXX
#include <impvect.hxx>
-#endif
// -----------
// - Defines -
diff --git a/vcl/source/gdi/jobset.cxx b/vcl/source/gdi/jobset.cxx
index 2bc0addaa93c..9bdc31bef8cd 100644
--- a/vcl/source/gdi/jobset.cxx
+++ b/vcl/source/gdi/jobset.cxx
@@ -29,9 +29,7 @@
#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>
diff --git a/vcl/source/gdi/outdev.cxx b/vcl/source/gdi/outdev.cxx
index a011e4ee4a92..d0708e5a26b3 100644
--- a/vcl/source/gdi/outdev.cxx
+++ b/vcl/source/gdi/outdev.cxx
@@ -29,9 +29,7 @@
#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>
@@ -41,9 +39,7 @@
#include <vcl/svdata.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>
diff --git a/vcl/source/gdi/outdev2.cxx b/vcl/source/gdi/outdev2.cxx
index bea307a4c38d..29c22e8f7962 100644
--- a/vcl/source/gdi/outdev2.cxx
+++ b/vcl/source/gdi/outdev2.cxx
@@ -28,9 +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/salbmp.hxx>
#include <vcl/salgdi.hxx>
#include <vcl/impbmp.hxx>
diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx
index 29e7380848f3..4448164e71c2 100644
--- a/vcl/source/gdi/outdev3.cxx
+++ b/vcl/source/gdi/outdev3.cxx
@@ -30,9 +30,7 @@
#include <cstring>
#include <i18npool/mslangid.hxx>
-#ifndef _SV_SVSYS_HXX
#include <svsys.h>
-#endif
#include <vcl/salgdi.hxx>
#include <vcl/sallayout.hxx>
#include <rtl/tencinfo.h>
@@ -62,9 +60,7 @@
#include <unotools/fontcfg.hxx>
#include <vcl/sysdata.hxx>
#include <vcl/textlayout.hxx>
-#ifndef _OSL_FILE_H
#include <osl/file.h>
-#endif
#ifdef ENABLE_GRAPHITE
#include <vcl/graphite_features.hxx>
#endif
diff --git a/vcl/source/gdi/outdev5.cxx b/vcl/source/gdi/outdev5.cxx
index d42723215c55..b2b560030836 100644
--- a/vcl/source/gdi/outdev5.cxx
+++ b/vcl/source/gdi/outdev5.cxx
@@ -29,9 +29,7 @@
#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>
diff --git a/vcl/source/gdi/outdev6.cxx b/vcl/source/gdi/outdev6.cxx
index 5b8d228bb141..d1dc7756a0d2 100644
--- a/vcl/source/gdi/outdev6.cxx
+++ b/vcl/source/gdi/outdev6.cxx
@@ -28,9 +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>
diff --git a/vcl/source/gdi/outmap.cxx b/vcl/source/gdi/outmap.cxx
index 189ba4c29e59..b800658fa2d7 100644
--- a/vcl/source/gdi/outmap.cxx
+++ b/vcl/source/gdi/outmap.cxx
@@ -30,9 +30,7 @@
#include <limits.h>
-#ifndef _SV_SVSYS_HXX
#include <svsys.h>
-#endif
#include <tools/bigint.hxx>
#include <tools/debug.hxx>
#include <vcl/virdev.hxx>
diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx
index 2ea9bfcc4c11..13463325b278 100644
--- a/vcl/source/gdi/print.cxx
+++ b/vcl/source/gdi/print.cxx
@@ -31,9 +31,7 @@
#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>
diff --git a/vcl/source/gdi/print3.cxx b/vcl/source/gdi/print3.cxx
index 51f33ed17f6c..51f33ed17f6c 100755..100644
--- a/vcl/source/gdi/print3.cxx
+++ b/vcl/source/gdi/print3.cxx
diff --git a/vcl/source/gdi/region.cxx b/vcl/source/gdi/region.cxx
index 4931ee66e93f..0e2d0b0fbd8a 100644
--- a/vcl/source/gdi/region.cxx
+++ b/vcl/source/gdi/region.cxx
@@ -33,15 +33,9 @@
#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 <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..589b059c43bc 100755..100644
--- a/vcl/source/gdi/salgdilayout.cxx
+++ b/vcl/source/gdi/salgdilayout.cxx
@@ -29,9 +29,7 @@
#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>
diff --git a/vcl/source/gdi/sallayout.cxx b/vcl/source/gdi/sallayout.cxx
index 5e187944c706..5df10bcb758b 100755..100644
--- a/vcl/source/gdi/sallayout.cxx
+++ b/vcl/source/gdi/sallayout.cxx
@@ -34,9 +34,7 @@
#include <math.h>
#include <sal/alloca.h>
-#ifndef _SV_SVSYS_HXX
#include <svsys.h>
-#endif
#include <vcl/salgdi.hxx>
#include <vcl/sallayout.hxx>
#include <basegfx/polygon/b2dpolypolygon.hxx>
@@ -44,9 +42,7 @@
#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/virdev.cxx b/vcl/source/gdi/virdev.cxx
index 4c1439ffe6f4..b7b0bb382735 100644
--- a/vcl/source/gdi/virdev.cxx
+++ b/vcl/source/gdi/virdev.cxx
@@ -28,9 +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/salinst.hxx>
#include <vcl/salgdi.hxx>
#include <vcl/salframe.hxx>
diff --git a/vcl/source/helper/smartid.cxx b/vcl/source/helper/smartid.cxx
index c367aeb2bce5..c367aeb2bce5 100755..100644
--- a/vcl/source/helper/smartid.cxx
+++ b/vcl/source/helper/smartid.cxx
diff --git a/vcl/source/window/accel.cxx b/vcl/source/window/accel.cxx
index 3018236fff1a..62cb9c82a0a1 100644
--- a/vcl/source/window/accel.cxx
+++ b/vcl/source/window/accel.cxx
@@ -28,16 +28,12 @@
// 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 <vcl/svapp.hxx>
#include <vcl/accel.h>
#include <vcl/accel.hxx>
-#ifndef _RC_H
#include <tools/rc.h>
-#endif
diff --git a/vcl/source/window/brdwin.cxx b/vcl/source/window/brdwin.cxx
index 48d01e4f2059..b5355f8d468b 100644
--- a/vcl/source/window/brdwin.cxx
+++ b/vcl/source/window/brdwin.cxx
@@ -27,9 +27,7 @@
// 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/event.hxx>
#include <vcl/decoview.hxx>
diff --git a/vcl/source/window/btndlg.cxx b/vcl/source/window/btndlg.cxx
index e835fe749ed1..6b1fe7926051 100644
--- a/vcl/source/window/btndlg.cxx
+++ b/vcl/source/window/btndlg.cxx
@@ -34,9 +34,7 @@
#include <vcl/button.hxx>
#include <vcl/btndlg.hxx>
-#ifndef _SV_RC_H
#include <tools/rc.h>
-#endif
diff --git a/vcl/source/window/cmdevt.cxx b/vcl/source/window/cmdevt.cxx
index 03e01c96742b..c946820a880f 100644
--- a/vcl/source/window/cmdevt.cxx
+++ b/vcl/source/window/cmdevt.cxx
@@ -28,13 +28,9 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_vcl.hxx"
-#ifndef _STRING_H
#include <string.h>
-#endif
-#ifndef _SV_CMDEVT_HXX
#include <vcl/cmdevt.hxx>
-#endif
// =======================================================================
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index 3b5585d3bc63..1f6ebd658c84 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -29,9 +29,7 @@
#include "precompiled_vcl.hxx"
#include <tools/debug.hxx>
-#ifndef _SV_RC_H
#include <tools/rc.h>
-#endif
#include <vcl/svdata.hxx>
#include <vcl/svapp.hxx>
#include <vcl/window.h>
diff --git a/vcl/source/window/dockmgr.cxx b/vcl/source/window/dockmgr.cxx
index e67c2d9ecfd5..e414914fae37 100644
--- a/vcl/source/window/dockmgr.cxx
+++ b/vcl/source/window/dockmgr.cxx
@@ -28,13 +28,9 @@
// 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>
diff --git a/vcl/source/window/dockwin.cxx b/vcl/source/window/dockwin.cxx
index c8e382bad982..cfed4f4202ae 100644
--- a/vcl/source/window/dockwin.cxx
+++ b/vcl/source/window/dockwin.cxx
@@ -28,13 +28,9 @@
// 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>
diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx
index d775e9f2bf6e..b0d4680096cf 100644
--- a/vcl/source/window/floatwin.cxx
+++ b/vcl/source/window/floatwin.cxx
@@ -28,9 +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/svdata.hxx>
#include <vcl/svapp.hxx>
#include <vcl/wrkwin.hxx>
@@ -39,9 +37,7 @@
#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..ff3c45db0254 100644
--- a/vcl/source/window/introwin.cxx
+++ b/vcl/source/window/introwin.cxx
@@ -28,9 +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/salframe.hxx>
#include <tools/debug.hxx>
#include <vcl/svdata.hxx>
diff --git a/vcl/source/window/javachild.cxx b/vcl/source/window/javachild.cxx
index 2cd18b897ff5..9569c583fe38 100644
--- a/vcl/source/window/javachild.cxx
+++ b/vcl/source/window/javachild.cxx
@@ -42,9 +42,7 @@
#include <com/sun/star/java/XJavaThreadRegister_11.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#ifndef _SV_SVSYS_HXX
#include <svsys.h>
-#endif
#include <vcl/salinst.hxx>
#include <vcl/salframe.hxx>
#include <vcl/window.hxx>
diff --git a/vcl/source/window/keycod.cxx b/vcl/source/window/keycod.cxx
index bcc5536fd028..14c5309e9d69 100644
--- a/vcl/source/window/keycod.cxx
+++ b/vcl/source/window/keycod.cxx
@@ -28,20 +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 <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/msgbox.cxx b/vcl/source/window/msgbox.cxx
index 7f7a65cd7fb9..bb396ce63570 100644
--- a/vcl/source/window/msgbox.cxx
+++ b/vcl/source/window/msgbox.cxx
@@ -28,9 +28,7 @@
// 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/metric.hxx>
#include <vcl/svapp.hxx>
@@ -40,9 +38,7 @@
#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/scrwnd.cxx b/vcl/source/window/scrwnd.cxx
index 735add842518..e0efb37c9444 100644
--- a/vcl/source/window/scrwnd.cxx
+++ b/vcl/source/window/scrwnd.cxx
@@ -33,19 +33,11 @@
#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 <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..fdc090a0e958 100644
--- a/vcl/source/window/split.cxx
+++ b/vcl/source/window/split.cxx
@@ -28,9 +28,7 @@
// 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/event.hxx>
#include <vcl/split.hxx>
#include <vcl/svapp.hxx>
diff --git a/vcl/source/window/splitwin.cxx b/vcl/source/window/splitwin.cxx
index 689c56cbe619..6d2c9a9ee0c1 100644
--- a/vcl/source/window/splitwin.cxx
+++ b/vcl/source/window/splitwin.cxx
@@ -37,9 +37,7 @@
#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>
diff --git a/vcl/source/window/status.cxx b/vcl/source/window/status.cxx
index 385dd241c770..ce3aa82e89da 100644
--- a/vcl/source/window/status.cxx
+++ b/vcl/source/window/status.cxx
@@ -30,9 +30,7 @@
#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>
diff --git a/vcl/source/window/syschild.cxx b/vcl/source/window/syschild.cxx
index 0ff9189f4fdb..a70a2e1853f0 100644
--- a/vcl/source/window/syschild.cxx
+++ b/vcl/source/window/syschild.cxx
@@ -28,21 +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/salinst.hxx>
#include <vcl/salframe.hxx>
#include <vcl/window.hxx>
#include <vcl/salobj.hxx>
-#ifndef _SV_RC_H
#include <tools/rc.h>
-#endif
#include <vcl/svdata.hxx>
-#ifndef _SV_WIDNOW_H
#include <vcl/window.h>
-#endif
#include <vcl/svapp.hxx>
#include <vcl/syschild.hxx>
diff --git a/vcl/source/window/syswin.cxx b/vcl/source/window/syswin.cxx
index f3624ef56f59..95f0ebd9fe3c 100644
--- a/vcl/source/window/syswin.cxx
+++ b/vcl/source/window/syswin.cxx
@@ -29,9 +29,7 @@
#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>
diff --git a/vcl/source/window/tabdlg.cxx b/vcl/source/window/tabdlg.cxx
index 874881c0c5ef..42e04ce1b4c9 100644
--- a/vcl/source/window/tabdlg.cxx
+++ b/vcl/source/window/tabdlg.cxx
@@ -30,9 +30,7 @@
#include <vcl/fixed.hxx>
#include <vcl/tabctrl.hxx>
#include <vcl/tabdlg.hxx>
-#ifndef _SV_RC_H
#include <tools/rc.h>
-#endif
diff --git a/vcl/source/window/tabpage.cxx b/vcl/source/window/tabpage.cxx
index 0589d57009f4..f3c6c6ee2cc9 100644
--- a/vcl/source/window/tabpage.cxx
+++ b/vcl/source/window/tabpage.cxx
@@ -30,9 +30,7 @@
#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>
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index cde91a8dcd97..47533e6d34e0 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -28,16 +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 <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 <vcl/event.hxx>
#include <vcl/decoview.hxx>
diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx
index 334cdd2d0a64..47f4d68ef8fc 100644
--- a/vcl/source/window/toolbox2.cxx
+++ b/vcl/source/window/toolbox2.cxx
@@ -30,9 +30,7 @@
#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>
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 5277da0567b6..d4c8ee32ae64 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -27,9 +27,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/salframe.hxx"
#include "vcl/salobj.hxx"
#include "vcl/salinst.hxx"
@@ -40,9 +38,7 @@
#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/windata.hxx"
#include "vcl/dbggui.hxx"
diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx
index 02b2713b01cc..6e19dea2c46f 100644
--- a/vcl/source/window/window2.cxx
+++ b/vcl/source/window/window2.cxx
@@ -29,9 +29,7 @@
#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>
@@ -49,9 +47,7 @@
#include <vcl/window.h>
#include <vcl/window.hxx>
#include <vcl/scrbar.hxx>
-#ifndef _SV_SCRWND_HXX
#include <scrwnd.hxx>
-#endif
#include <vcl/dockwin.hxx>
diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx
index c964ad0d739b..ae226a595fac 100644
--- a/vcl/source/window/winproc.cxx
+++ b/vcl/source/window/winproc.cxx
@@ -28,9 +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/salwtype.hxx>
#include <vcl/salframe.hxx>
#include <tools/debug.hxx>
diff --git a/vcl/source/window/wrkwin.cxx b/vcl/source/window/wrkwin.cxx
index 8fb2f2f8346a..ea0fbcafbf96 100644
--- a/vcl/source/window/wrkwin.cxx
+++ b/vcl/source/window/wrkwin.cxx
@@ -28,15 +28,11 @@
// 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>
diff --git a/vcl/test/dndtest.cxx b/vcl/test/dndtest.cxx
index c52d6d3e9589..c52d6d3e9589 100755..100644
--- a/vcl/test/dndtest.cxx
+++ b/vcl/test/dndtest.cxx
diff --git a/vcl/unx/kde/kdedata.cxx b/vcl/unx/kde/kdedata.cxx
index 34b0ff652cde..56e3d505296c 100644
--- a/vcl/unx/kde/kdedata.cxx
+++ b/vcl/unx/kde/kdedata.cxx
@@ -54,9 +54,7 @@
#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 7e07ca6e8d4d..e2494d2c55ce 100644
--- a/vcl/unx/kde/salnativewidgets-kde.cxx
+++ b/vcl/unx/kde/salnativewidgets-kde.cxx
@@ -35,13 +35,9 @@
#include <saldata.hxx>
#include <saldisp.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>
diff --git a/vcl/unx/source/app/i18n_cb.cxx b/vcl/unx/source/app/i18n_cb.cxx
index d3a4f2b819ae..ca2de1da8ecf 100644
--- a/vcl/unx/source/app/i18n_cb.cxx
+++ b/vcl/unx/source/app/i18n_cb.cxx
@@ -42,9 +42,7 @@
#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>
// -------------------------------------------------------------------------
diff --git a/vcl/unx/source/app/i18n_ic.cxx b/vcl/unx/source/app/i18n_ic.cxx
index 3064be9367e1..ef71e6520940 100644
--- a/vcl/unx/source/app/i18n_ic.cxx
+++ b/vcl/unx/source/app/i18n_ic.cxx
@@ -43,15 +43,11 @@
#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
using namespace vcl;
diff --git a/vcl/unx/source/app/saldata.cxx b/vcl/unx/source/app/saldata.cxx
index 50ef71df8619..8202a8804b68 100644
--- a/vcl/unx/source/app/saldata.cxx
+++ b/vcl/unx/source/app/saldata.cxx
@@ -57,9 +57,7 @@
#include <unistd.h>
#endif
#include <vos/process.hxx>
-#ifndef _VOS_MUTEX_HXX
#include <vos/mutex.hxx>
-#endif
#include "Xproto.h"
#include <saldisp.hxx>
@@ -70,9 +68,7 @@
#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>
diff --git a/vcl/unx/source/app/saldisp.cxx b/vcl/unx/source/app/saldisp.cxx
index 19417c83cb91..f81f25673995 100644
--- a/vcl/unx/source/app/saldisp.cxx
+++ b/vcl/unx/source/app/saldisp.cxx
@@ -87,9 +87,7 @@ Status XineramaGetInfo(Display*, int, XRectangle*, unsigned char*, int*);
#include <vcl/keycodes.hxx>
#include <vcl/salbtype.hxx>
#include <salbmp.h>
-#ifndef _OSL_THREADMUTEX_H_
#include <osl/mutex.h>
-#endif
#include <salobj.h>
#include <sm.hxx>
#include <wmadaptor.hxx>
diff --git a/vcl/unx/source/app/soicon.cxx b/vcl/unx/source/app/soicon.cxx
index 2bf9e55731d1..b6dbb0db0252 100644
--- a/vcl/unx/source/app/soicon.cxx
+++ b/vcl/unx/source/app/soicon.cxx
@@ -34,9 +34,7 @@
#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>
diff --git a/vcl/unx/source/gdi/xlfd_extd.cxx b/vcl/unx/source/gdi/xlfd_extd.cxx
index 73731eddf115..f0af21a4c42d 100644
--- a/vcl/unx/source/gdi/xlfd_extd.cxx
+++ b/vcl/unx/source/gdi/xlfd_extd.cxx
@@ -36,9 +36,7 @@
#include <vcl/outfont.hxx>
#include <rtl/alloc.h>
-#ifndef _RTL_TENCINFO_H_
#include <rtl/tencinfo.h>
-#endif
#include <set>
diff --git a/vcl/unx/source/window/salobj.cxx b/vcl/unx/source/window/salobj.cxx
index 647b95ae032c..7cae2d3b7d34 100644
--- a/vcl/unx/source/window/salobj.cxx
+++ b/vcl/unx/source/window/salobj.cxx
@@ -36,13 +36,9 @@
#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>
diff --git a/vcl/win/source/gdi/salgdi.cxx b/vcl/win/source/gdi/salgdi.cxx
index eb260eb808c6..dd97cc549948 100644
--- a/vcl/win/source/gdi/salgdi.cxx
+++ b/vcl/win/source/gdi/salgdi.cxx
@@ -37,9 +37,7 @@
#include <tools/debug.hxx>
#include <salframe.h>
#include <tools/poly.hxx>
-#ifndef _RTL_STRINGBUF_HXX
#include <rtl/strbuf.hxx>
-#endif
using namespace rtl;
diff --git a/vcl/win/source/gdi/salgdi2.cxx b/vcl/win/source/gdi/salgdi2.cxx
index 803c0886f429..0222902f8c96 100644
--- a/vcl/win/source/gdi/salgdi2.cxx
+++ b/vcl/win/source/gdi/salgdi2.cxx
@@ -35,9 +35,7 @@
#include <wincomp.hxx>
#include <salbmp.h>
#include <saldata.hxx>
-#ifndef _SV_SALIDS_HRC
#include <salids.hrc>
-#endif
#include <salgdi.h>
#include <salframe.h>
diff --git a/vcl/win/source/gdi/salnativewidgets-luna.cxx b/vcl/win/source/gdi/salnativewidgets-luna.cxx
index 8197fb37cd6d..8197fb37cd6d 100755..100644
--- a/vcl/win/source/gdi/salnativewidgets-luna.cxx
+++ b/vcl/win/source/gdi/salnativewidgets-luna.cxx
diff --git a/vcl/win/source/gdi/salprn.cxx b/vcl/win/source/gdi/salprn.cxx
index c8c7b5c68fff..4c14ff989bca 100644
--- a/vcl/win/source/gdi/salprn.cxx
+++ b/vcl/win/source/gdi/salprn.cxx
@@ -37,9 +37,7 @@
#include <excpt.h>
#endif
-#ifndef _OSL_MODULE_H
#include <osl/module.h>
-#endif
#include <wincomp.hxx>
#include <saldata.hxx>
#include <salinst.h>
diff --git a/vcl/win/source/gdi/winlayout.cxx b/vcl/win/source/gdi/winlayout.cxx
index 806d3b420b33..806d3b420b33 100755..100644
--- a/vcl/win/source/gdi/winlayout.cxx
+++ b/vcl/win/source/gdi/winlayout.cxx
diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx
index 081bd4827a9b..97a88f41ce95 100644
--- a/vcl/win/source/window/salframe.cxx
+++ b/vcl/win/source/window/salframe.cxx
@@ -46,9 +46,7 @@
#include <stdio.h>
-#ifndef _SVWIN_HXX
#include <tools/svwin.h>
-#endif
#ifdef __MINGW32__
#include <excpt.h>
#endif
@@ -63,9 +61,7 @@
#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>
@@ -80,17 +76,13 @@
#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>
-#endif
#define COMPILE_MULTIMON_STUBS
#include <multimon.h>
#include <vector>
diff --git a/vcl/win/source/window/salobj.cxx b/vcl/win/source/window/salobj.cxx
index 2f657968284f..819fe51646ac 100644
--- a/vcl/win/source/window/salobj.cxx
+++ b/vcl/win/source/window/salobj.cxx
@@ -30,9 +30,7 @@
#include <string.h>
-#ifndef _SVWIN_HXX
#include <tools/svwin.h>
-#endif
#include <wincomp.hxx>
#include <saldata.hxx>
#include <salinst.h>
diff --git a/vcl/workben/outdevgrind.cxx b/vcl/workben/outdevgrind.cxx
index 9122a1addc0a..9122a1addc0a 100755..100644
--- a/vcl/workben/outdevgrind.cxx
+++ b/vcl/workben/outdevgrind.cxx