summaryrefslogtreecommitdiff
path: root/svtools/inc
diff options
context:
space:
mode:
Diffstat (limited to 'svtools/inc')
-rw-r--r--svtools/inc/QueryFolderName.hxx2
-rw-r--r--svtools/inc/acceleratorexecute.hxx12
-rw-r--r--svtools/inc/addresstemplate.hxx2
-rw-r--r--svtools/inc/calendar.hxx6
-rw-r--r--svtools/inc/ctrlbox.hxx12
-rw-r--r--svtools/inc/ctrltool.hxx4
-rw-r--r--svtools/inc/filectrl.hxx2
-rw-r--r--svtools/inc/filedlg.hxx2
-rw-r--r--svtools/inc/fileview.hxx2
-rw-r--r--svtools/inc/roadmap.hxx2
-rw-r--r--svtools/inc/rtfout.hxx2
-rw-r--r--svtools/inc/ruler.hxx2
-rw-r--r--svtools/inc/scrwin.hxx2
-rw-r--r--svtools/inc/stdmenu.hxx2
-rw-r--r--[-rwxr-xr-x]svtools/inc/svtools/accessiblefactory.hxx4
-rw-r--r--[-rwxr-xr-x]svtools/inc/svtools/accessibletable.hxx0
-rw-r--r--svtools/inc/svtools/chartprettypainter.hxx2
-rw-r--r--svtools/inc/svtools/colrdlg.hxx2
-rw-r--r--svtools/inc/svtools/editbrowsebox.hxx2
-rw-r--r--svtools/inc/svtools/ehdl.hxx2
-rw-r--r--svtools/inc/svtools/embedhlp.hxx2
-rw-r--r--svtools/inc/svtools/inettbc.hxx2
-rw-r--r--svtools/inc/svtools/insdlg.hxx2
-rw-r--r--svtools/inc/svtools/printdlg.hxx14
-rw-r--r--svtools/inc/svtools/prnsetup.hxx12
-rw-r--r--svtools/inc/svtools/stdctrl.hxx4
-rw-r--r--svtools/inc/svtools/svicnvw.hxx2
-rw-r--r--svtools/inc/svtools/svlbitm.hxx4
-rw-r--r--svtools/inc/svtools/svlbox.hxx6
-rw-r--r--svtools/inc/svtools/table/tabledatawindow.hxx2
-rw-r--r--svtools/inc/svtools/texteng.hxx2
-rw-r--r--[-rwxr-xr-x]svtools/inc/svtools/toolpanel/decklayouter.hxx0
-rw-r--r--[-rwxr-xr-x]svtools/inc/svtools/toolpanel/tablayouter.hxx0
-rw-r--r--[-rwxr-xr-x]svtools/inc/svtools/toolpanel/toolpaneldeck.hxx0
-rw-r--r--svtools/inc/svtools/transfer.hxx2
-rw-r--r--svtools/inc/svtools/treelist.hxx2
-rw-r--r--svtools/inc/svtools/valueset.hxx4
-rw-r--r--svtools/inc/svtools/wizardmachine.hxx2
-rw-r--r--svtools/inc/svtools/wizdlg.hxx2
-rw-r--r--[-rwxr-xr-x]svtools/inc/svtools/xwindowitem.hxx0
-rw-r--r--svtools/inc/taskbar.hxx2
-rw-r--r--svtools/inc/wallitem.hxx2
42 files changed, 0 insertions, 134 deletions
diff --git a/svtools/inc/QueryFolderName.hxx b/svtools/inc/QueryFolderName.hxx
index 971b4b26e13e..31d08e31c7ed 100644
--- a/svtools/inc/QueryFolderName.hxx
+++ b/svtools/inc/QueryFolderName.hxx
@@ -28,9 +28,7 @@
#define SVT_QUERYFOLDER_HXX
#include <vcl/fixed.hxx>
-#ifndef _SV_BUTTON_HXX
#include <vcl/button.hxx>
-#endif
#include <vcl/edit.hxx>
#include <vcl/dialog.hxx>
diff --git a/svtools/inc/acceleratorexecute.hxx b/svtools/inc/acceleratorexecute.hxx
index 3ee79e1fca0c..818f4c40b3f7 100644
--- a/svtools/inc/acceleratorexecute.hxx
+++ b/svtools/inc/acceleratorexecute.hxx
@@ -38,30 +38,18 @@
#define INCLUDED_VECTOR
#endif
-#ifndef __COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#endif
-#ifndef __COM_SUN_STAR_FRAME_XFRAME_HPP_
#include <com/sun/star/frame/XFrame.hpp>
-#endif
-#ifndef __COM_SUN_STAR_FRAME_XDISPATCHPROVIDER_HPP_
#include <com/sun/star/frame/XDispatchProvider.hpp>
-#endif
-#ifndef __com_SUN_STAR_UI_XACCELERATORCONFIGURATION_HPP_
#include <com/sun/star/ui/XAcceleratorConfiguration.hpp>
-#endif
-#ifndef __COM_SUN_STAR_UTIL_XURLTRANSFORMER_HPP_
#include <com/sun/star/util/XURLTransformer.hpp>
-#endif
#include <com/sun/star/util/URL.hpp>
-#ifndef __COM_SUN_STAR_AWT_KEYEVENT_HPP_
#include <com/sun/star/awt/KeyEvent.hpp>
-#endif
#include <vcl/keycod.hxx>
#include <vcl/evntpost.hxx>
#include <osl/mutex.h>
diff --git a/svtools/inc/addresstemplate.hxx b/svtools/inc/addresstemplate.hxx
index f29ea2478b4e..812bee1997ed 100644
--- a/svtools/inc/addresstemplate.hxx
+++ b/svtools/inc/addresstemplate.hxx
@@ -37,9 +37,7 @@
#include <vcl/lstbox.hxx>
#include <vcl/scrbar.hxx>
#include <com/sun/star/container/XNameAccess.hpp>
-#ifndef _COM_SUN_STAR_LANG_XSINGLESERVICEFACTORY_HPP_
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#endif
#include <com/sun/star/util/AliasProgrammaticPair.hpp>
#include <com/sun/star/sdbc/XDataSource.hpp>
#include <unotools/configitem.hxx>
diff --git a/svtools/inc/calendar.hxx b/svtools/inc/calendar.hxx
index f85887873bb0..b98d7e46f3f2 100644
--- a/svtools/inc/calendar.hxx
+++ b/svtools/inc/calendar.hxx
@@ -30,17 +30,11 @@
#include "svtools/svtdllapi.h"
#include <unotools/calendarwrapper.hxx>
-#ifndef _COM_SUN_STAR_I18N_WEEKDAYS_HPP
#include <com/sun/star/i18n/Weekdays.hpp>
-#endif
-#ifndef _CTRL_HXX
#include <vcl/ctrl.hxx>
-#endif
#include <vcl/timer.hxx>
-#ifndef _FIELD_HXX
#include <vcl/field.hxx>
-#endif
class Table;
class MouseEvent;
diff --git a/svtools/inc/ctrlbox.hxx b/svtools/inc/ctrlbox.hxx
index 9e6e942daf1e..27745478cb3c 100644
--- a/svtools/inc/ctrlbox.hxx
+++ b/svtools/inc/ctrlbox.hxx
@@ -30,24 +30,12 @@
#include "svtools/svtdllapi.h"
-#ifndef _LSTBOX_HXX
#include <vcl/lstbox.hxx>
-#endif
-#ifndef _COMBOBOX_HXX
#include <vcl/combobox.hxx>
-#endif
-#ifndef _IMAGE_HXX
#include <vcl/image.hxx>
-#endif
-#ifndef _VIRDEV_HXX
#include <vcl/virdev.hxx>
-#endif
-#ifndef _METRIC_HXX
#include <vcl/metric.hxx>
-#endif
-#ifndef _FIELD_HXX
#include <vcl/field.hxx>
-#endif
class ImplFontList;
class ImpColorList;
diff --git a/svtools/inc/ctrltool.hxx b/svtools/inc/ctrltool.hxx
index a0eb5db2b955..fca5f9795f1f 100644
--- a/svtools/inc/ctrltool.hxx
+++ b/svtools/inc/ctrltool.hxx
@@ -30,13 +30,9 @@
#include "svtools/svtdllapi.h"
-#ifndef _SAL_TYPES_H
#include <sal/types.h>
-#endif
#include <tools/list.hxx>
-#ifndef _METRIC_HXX
#include <vcl/metric.hxx>
-#endif
class ImplFontListNameInfo;
class OutputDevice;
diff --git a/svtools/inc/filectrl.hxx b/svtools/inc/filectrl.hxx
index dd314bb23ca1..101090f80b6f 100644
--- a/svtools/inc/filectrl.hxx
+++ b/svtools/inc/filectrl.hxx
@@ -31,9 +31,7 @@
#include "svtools/svtdllapi.h"
#include <vcl/window.hxx>
#include <vcl/edit.hxx>
-#ifndef _SV_BUTTON_HXX
#include <vcl/button.hxx>
-#endif
#define STR_FILECTRL_BUTTONTEXT 333 // ID-Range?!
diff --git a/svtools/inc/filedlg.hxx b/svtools/inc/filedlg.hxx
index c04e48fc7658..e9ecd9a3d65c 100644
--- a/svtools/inc/filedlg.hxx
+++ b/svtools/inc/filedlg.hxx
@@ -30,9 +30,7 @@
#include "svtools/svtdllapi.h"
-#ifndef _DIALOG_HXX
#include <vcl/dialog.hxx>
-#endif
class Edit;
class ImpSvFileDlg;
diff --git a/svtools/inc/fileview.hxx b/svtools/inc/fileview.hxx
index 74476541dcd8..bd52e0824003 100644
--- a/svtools/inc/fileview.hxx
+++ b/svtools/inc/fileview.hxx
@@ -33,9 +33,7 @@
#include <vcl/ctrl.hxx>
#include <vcl/image.hxx>
#include <vcl/fixed.hxx>
-#ifndef _SV_BUTTON_HXX
#include <vcl/button.hxx>
-#endif
#include <vcl/dialog.hxx>
#include <rtl/ustring.hxx>
diff --git a/svtools/inc/roadmap.hxx b/svtools/inc/roadmap.hxx
index ff94cc966f4d..738a1b49ea8f 100644
--- a/svtools/inc/roadmap.hxx
+++ b/svtools/inc/roadmap.hxx
@@ -31,9 +31,7 @@
#include <vcl/ctrl.hxx>
#include <vcl/imgctrl.hxx>
-#ifndef _SVTOOLS_HYPERLABEL_HXX
#include "svtools/hyperlabel.hxx"
-#endif
diff --git a/svtools/inc/rtfout.hxx b/svtools/inc/rtfout.hxx
index 12a125635132..54559e9030bb 100644
--- a/svtools/inc/rtfout.hxx
+++ b/svtools/inc/rtfout.hxx
@@ -31,9 +31,7 @@
#include "svtools/svtdllapi.h"
#include <tools/solar.h>
-#ifndef _RTL_TEXTENC_H_
#include <rtl/textenc.h>
-#endif
class String;
class SvStream;
diff --git a/svtools/inc/ruler.hxx b/svtools/inc/ruler.hxx
index 3caa9cd6bccd..71564e0974dc 100644
--- a/svtools/inc/ruler.hxx
+++ b/svtools/inc/ruler.hxx
@@ -31,9 +31,7 @@
#include "svtools/svtdllapi.h"
#include <tools/link.hxx>
#include <vcl/window.hxx>
-#ifndef _VIRDEV_HXX
#include <vcl/virdev.hxx>
-#endif
#include <vcl/field.hxx>
class MouseEvent;
diff --git a/svtools/inc/scrwin.hxx b/svtools/inc/scrwin.hxx
index 1542ed667133..98dc8f783ed6 100644
--- a/svtools/inc/scrwin.hxx
+++ b/svtools/inc/scrwin.hxx
@@ -30,9 +30,7 @@
#include "svtools/svtdllapi.h"
-#ifndef _SCRBAR_HXX //autogen
#include <vcl/scrbar.hxx>
-#endif
class DataChangedEvent;
diff --git a/svtools/inc/stdmenu.hxx b/svtools/inc/stdmenu.hxx
index 1b7e9816a103..613f5aaded2a 100644
--- a/svtools/inc/stdmenu.hxx
+++ b/svtools/inc/stdmenu.hxx
@@ -30,9 +30,7 @@
#include "svtools/svtdllapi.h"
#include <tools/link.hxx>
-#ifndef _MENU_HXX
#include <vcl/menu.hxx>
-#endif
class FontList;
class FontInfo;
diff --git a/svtools/inc/svtools/accessiblefactory.hxx b/svtools/inc/svtools/accessiblefactory.hxx
index 9606e93a2fa0..c80e5bd9cee6 100755..100644
--- a/svtools/inc/svtools/accessiblefactory.hxx
+++ b/svtools/inc/svtools/accessiblefactory.hxx
@@ -28,13 +28,9 @@
#ifndef SVTOOLS_ACCESSIBLE_FACTORY_HXX
#define SVTOOLS_ACCESSIBLE_FACTORY_HXX
-#ifndef _COM_SUN_STAR_UNO_REFERENCE_HXX
#include <com/sun/star/uno/Reference.hxx>
-#endif
-#ifndef _RTL_REF_HXX
#include <rtl/ref.hxx>
-#endif
#include "AccessibleBrowseBoxObjType.hxx"
#include "accessibletableprovider.hxx"
#include "accessibletable.hxx"
diff --git a/svtools/inc/svtools/accessibletable.hxx b/svtools/inc/svtools/accessibletable.hxx
index 8ff17a2b71c7..8ff17a2b71c7 100755..100644
--- a/svtools/inc/svtools/accessibletable.hxx
+++ b/svtools/inc/svtools/accessibletable.hxx
diff --git a/svtools/inc/svtools/chartprettypainter.hxx b/svtools/inc/svtools/chartprettypainter.hxx
index 200951d5c5e8..c885bdb83de1 100644
--- a/svtools/inc/svtools/chartprettypainter.hxx
+++ b/svtools/inc/svtools/chartprettypainter.hxx
@@ -28,9 +28,7 @@
#ifndef CHARTPRETTYPAINTER_HXX
#define CHARTPRETTYPAINTER_HXX
-#ifndef INCLUDED_SVTDLLAPI_H
#include "svtools/svtdllapi.h"
-#endif
//#include <svtools/embedhlp.hxx>
#include <vcl/outdev.hxx>
diff --git a/svtools/inc/svtools/colrdlg.hxx b/svtools/inc/svtools/colrdlg.hxx
index 00ec9647aa7a..e5e6ff5c6ec3 100644
--- a/svtools/inc/svtools/colrdlg.hxx
+++ b/svtools/inc/svtools/colrdlg.hxx
@@ -30,9 +30,7 @@
#include "svtools/svtdllapi.h"
#include <vcl/dialog.hxx>
-#ifndef _SV_BUTTON_HXX //autogen
#include <vcl/button.hxx>
-#endif
#include <vcl/fixed.hxx>
#include <vcl/field.hxx>
#include <svtools/colctrl.hxx>
diff --git a/svtools/inc/svtools/editbrowsebox.hxx b/svtools/inc/svtools/editbrowsebox.hxx
index f97449e1880c..0eafc79c69e4 100644
--- a/svtools/inc/svtools/editbrowsebox.hxx
+++ b/svtools/inc/svtools/editbrowsebox.hxx
@@ -36,9 +36,7 @@
#include <vcl/combobox.hxx>
#include <vcl/lstbox.hxx>
-#ifndef _IMAGEBTN_HXX
#include <vcl/imagebtn.hxx>
-#endif
#include <svtools/brwbox.hxx>
#include <vcl/timer.hxx>
#include <svtools/brwhead.hxx>
diff --git a/svtools/inc/svtools/ehdl.hxx b/svtools/inc/svtools/ehdl.hxx
index 967c41636ea3..827b781ac004 100644
--- a/svtools/inc/svtools/ehdl.hxx
+++ b/svtools/inc/svtools/ehdl.hxx
@@ -32,9 +32,7 @@
#include "svtools/svtdllapi.h"
-#ifndef _EINF_HXX
#include <tools/errinf.hxx>
-#endif
class Window;
class ResMgr;
diff --git a/svtools/inc/svtools/embedhlp.hxx b/svtools/inc/svtools/embedhlp.hxx
index 098b565385ec..812e79dfcd43 100644
--- a/svtools/inc/svtools/embedhlp.hxx
+++ b/svtools/inc/svtools/embedhlp.hxx
@@ -34,9 +34,7 @@
#include <com/sun/star/embed/Aspects.hpp>
#include <com/sun/star/io/XInputStream.hpp>
#include <vcl/graph.hxx>
-#ifndef _SV_MAPUNIT_HXX
#include <vcl/mapunit.hxx>
-#endif
#include <rtl/ustring.hxx>
#define NS_UNO ::com::sun::star::uno
diff --git a/svtools/inc/svtools/inettbc.hxx b/svtools/inc/svtools/inettbc.hxx
index 9394f1ba5ccd..9fff33ac2ca5 100644
--- a/svtools/inc/svtools/inettbc.hxx
+++ b/svtools/inc/svtools/inettbc.hxx
@@ -34,9 +34,7 @@
#include <tools/string.hxx>
#include <tools/urlobj.hxx>
-#ifndef _COMBOBOX_HXX //autogen
#include <vcl/combobox.hxx>
-#endif
class IUrlFilter;
class SvtMatchContext_Impl;
diff --git a/svtools/inc/svtools/insdlg.hxx b/svtools/inc/svtools/insdlg.hxx
index afbbc2509011..d98d723bca2c 100644
--- a/svtools/inc/svtools/insdlg.hxx
+++ b/svtools/inc/svtools/insdlg.hxx
@@ -34,9 +34,7 @@
#include <tools/globname.hxx>
#include <sot/formats.hxx>
-#ifndef _OWNCONT_HXX
#include <svl/ownlist.hxx>
-#endif
#include <svtools/transfer.hxx>
class SvObjectServer
diff --git a/svtools/inc/svtools/printdlg.hxx b/svtools/inc/svtools/printdlg.hxx
index 8c455b910b41..090cb12f44ed 100644
--- a/svtools/inc/svtools/printdlg.hxx
+++ b/svtools/inc/svtools/printdlg.hxx
@@ -30,27 +30,13 @@
#include "svtools/svtdllapi.h"
-#ifndef _VCL_DIALOG_HXX
#include <vcl/dialog.hxx>
-#endif
-#ifndef _VCL_FIXED_HXX
#include <vcl/fixed.hxx>
-#endif
-#ifndef _VCL_BUTTON_HXX
#include <vcl/button.hxx>
-#endif
-#ifndef _VCL_GROUP_HXX
#include <vcl/group.hxx>
-#endif
-#ifndef _VCL_FIELD_HXX
#include <vcl/field.hxx>
-#endif
-#ifndef _VCL_EDIT_HXX
#include <vcl/edit.hxx>
-#endif
-#ifndef _VCL_LSTBOX_HXX
#include <vcl/lstbox.hxx>
-#endif
#include <svtools/stdctrl.hxx>
class Printer;
diff --git a/svtools/inc/svtools/prnsetup.hxx b/svtools/inc/svtools/prnsetup.hxx
index 8e1ced9ed1a0..963d28ab2dda 100644
--- a/svtools/inc/svtools/prnsetup.hxx
+++ b/svtools/inc/svtools/prnsetup.hxx
@@ -30,24 +30,12 @@
#include "svtools/svtdllapi.h"
-#ifndef _VCL_DIALOG_HXX
#include <vcl/dialog.hxx>
-#endif
-#ifndef _VCL_FIXED_HXX
#include <vcl/fixed.hxx>
-#endif
-#ifndef _VCL_BUTTON_HXX
#include <vcl/button.hxx>
-#endif
-#ifndef _VCL_GROUP_HXX
#include <vcl/group.hxx>
-#endif
-#ifndef _VCL_LSTBOX_HXX
#include <vcl/lstbox.hxx>
-#endif
-#ifndef _VCL_TIMER_HXX
#include <vcl/timer.hxx>
-#endif
#include <svtools/stdctrl.hxx>
class Printer;
diff --git a/svtools/inc/svtools/stdctrl.hxx b/svtools/inc/svtools/stdctrl.hxx
index 4c0b794f78e3..cef065ae8f80 100644
--- a/svtools/inc/svtools/stdctrl.hxx
+++ b/svtools/inc/svtools/stdctrl.hxx
@@ -30,12 +30,8 @@
#include "svtools/svtdllapi.h"
-#ifndef _EDIT_HXX
#include <vcl/edit.hxx>
-#endif
-#ifndef _FIXED_HXX
#include <vcl/fixed.hxx>
-#endif
// -------------
// - FixedInfo -
diff --git a/svtools/inc/svtools/svicnvw.hxx b/svtools/inc/svtools/svicnvw.hxx
index ac15f0b55be6..b8385e85ed42 100644
--- a/svtools/inc/svtools/svicnvw.hxx
+++ b/svtools/inc/svtools/svicnvw.hxx
@@ -28,9 +28,7 @@
#ifndef _SVICNVW_HXX
#define _SVICNVW_HXX
-#ifndef _IMAGE_HXX
#include <vcl/image.hxx>
-#endif
#include <svtools/svlbox.hxx>
class SvImpIconView;
diff --git a/svtools/inc/svtools/svlbitm.hxx b/svtools/inc/svtools/svlbitm.hxx
index c28b8d5db10c..0e58f02f1ce8 100644
--- a/svtools/inc/svtools/svlbitm.hxx
+++ b/svtools/inc/svtools/svlbitm.hxx
@@ -31,13 +31,9 @@
#include "svtools/svtdllapi.h"
-#ifndef LINK_HXX
#include <tools/link.hxx>
-#endif
-#ifndef _IMAGE_HXX
#include <vcl/image.hxx>
-#endif
#include <svtools/svlbox.hxx>
class SvLBoxEntry;
diff --git a/svtools/inc/svtools/svlbox.hxx b/svtools/inc/svtools/svlbox.hxx
index f33784f45397..3c1371586a74 100644
--- a/svtools/inc/svtools/svlbox.hxx
+++ b/svtools/inc/svtools/svlbox.hxx
@@ -35,17 +35,11 @@
#define INCLUDED_DEQUE
#endif
-#ifndef _CTRL_HXX
#include <vcl/ctrl.hxx>
-#endif
#include <vcl/seleng.hxx>
-#ifndef _EDIT_HXX
#include <vcl/edit.hxx>
-#endif
#include <vcl/timer.hxx>
-#ifndef _ACCEL_HXX
#include <vcl/accel.hxx>
-#endif
#include <vcl/mnemonicengine.hxx>
#include <tools/gen.hxx>
#include <svtools/treelist.hxx>
diff --git a/svtools/inc/svtools/table/tabledatawindow.hxx b/svtools/inc/svtools/table/tabledatawindow.hxx
index 9a6ece489119..4f145cf3c25f 100644
--- a/svtools/inc/svtools/table/tabledatawindow.hxx
+++ b/svtools/inc/svtools/table/tabledatawindow.hxx
@@ -27,9 +27,7 @@
#ifndef SVTOOLS_SOURCE_TABLE_TABLEDATAWINDOW_HXX
#define SVTOOLS_SOURCE_TABLE_TABLEDATAWINDOW_HXX
-#ifndef _SV_WINDOW_HXX
#include <vcl/window.hxx>
-#endif
#include <vcl/seleng.hxx>
//........................................................................
diff --git a/svtools/inc/svtools/texteng.hxx b/svtools/inc/svtools/texteng.hxx
index ef27edee2efe..83f21b9647c2 100644
--- a/svtools/inc/svtools/texteng.hxx
+++ b/svtools/inc/svtools/texteng.hxx
@@ -57,9 +57,7 @@ class TETextPortion;
#include <tools/string.hxx>
#include <tools/gen.hxx>
-#ifndef _COM_SUN_STAR_LOCALE_LOCALE_HPP_
#include <com/sun/star/lang/Locale.hpp>
-#endif
#include <com/sun/star/uno/Reference.hxx>
struct TEIMEInfos;
diff --git a/svtools/inc/svtools/toolpanel/decklayouter.hxx b/svtools/inc/svtools/toolpanel/decklayouter.hxx
index da03d7c6c3aa..da03d7c6c3aa 100755..100644
--- a/svtools/inc/svtools/toolpanel/decklayouter.hxx
+++ b/svtools/inc/svtools/toolpanel/decklayouter.hxx
diff --git a/svtools/inc/svtools/toolpanel/tablayouter.hxx b/svtools/inc/svtools/toolpanel/tablayouter.hxx
index 92b36acf9114..92b36acf9114 100755..100644
--- a/svtools/inc/svtools/toolpanel/tablayouter.hxx
+++ b/svtools/inc/svtools/toolpanel/tablayouter.hxx
diff --git a/svtools/inc/svtools/toolpanel/toolpaneldeck.hxx b/svtools/inc/svtools/toolpanel/toolpaneldeck.hxx
index a1009591ffba..a1009591ffba 100755..100644
--- a/svtools/inc/svtools/toolpanel/toolpaneldeck.hxx
+++ b/svtools/inc/svtools/toolpanel/toolpaneldeck.hxx
diff --git a/svtools/inc/svtools/transfer.hxx b/svtools/inc/svtools/transfer.hxx
index 5eac1484fff9..168f2fbb99a4 100644
--- a/svtools/inc/svtools/transfer.hxx
+++ b/svtools/inc/svtools/transfer.hxx
@@ -44,9 +44,7 @@
#include <com/sun/star/datatransfer/dnd/DropTargetDragEvent.hpp>
#include <com/sun/star/datatransfer/dnd/DropTargetDropEvent.hpp>
#include <com/sun/star/datatransfer/dnd/XDragSourceListener.hpp>
-#ifndef _COM_SUN_STAR_DATATRANSFER_DND_XDROPTARGETELISTENER_HPP_
#include <com/sun/star/datatransfer/dnd/XDropTargetListener.hpp>
-#endif
#include <com/sun/star/io/XInputStream.hpp>
// ------------------------
diff --git a/svtools/inc/svtools/treelist.hxx b/svtools/inc/svtools/treelist.hxx
index 3ba013d90830..e648023b9bbe 100644
--- a/svtools/inc/svtools/treelist.hxx
+++ b/svtools/inc/svtools/treelist.hxx
@@ -32,9 +32,7 @@
#include <tools/solar.h>
#include <tools/list.hxx>
-#ifndef _TABLE_HXX
#include <tools/table.hxx>
-#endif
#include <tools/link.hxx>
#include <tools/string.hxx>
#include <tools/debug.hxx>
diff --git a/svtools/inc/svtools/valueset.hxx b/svtools/inc/svtools/valueset.hxx
index 0937d824daf0..b4dac5cc196c 100644
--- a/svtools/inc/svtools/valueset.hxx
+++ b/svtools/inc/svtools/valueset.hxx
@@ -30,12 +30,8 @@
#include "svtools/svtdllapi.h"
-#ifndef _CTRL_HXX
#include <vcl/ctrl.hxx>
-#endif
-#ifndef _VIRDEV_HXX
#include <vcl/virdev.hxx>
-#endif
#include <vcl/timer.hxx>
class MouseEvent;
diff --git a/svtools/inc/svtools/wizardmachine.hxx b/svtools/inc/svtools/wizardmachine.hxx
index 02562ac4bb63..3fcfd4c20aa4 100644
--- a/svtools/inc/svtools/wizardmachine.hxx
+++ b/svtools/inc/svtools/wizardmachine.hxx
@@ -29,9 +29,7 @@
#include "svtools/svtdllapi.h"
#include <svtools/wizdlg.hxx>
-#ifndef _SV_BUTTON_HXX
#include <vcl/button.hxx>
-#endif
#include <vcl/tabpage.hxx>
#include <comphelper/stl_types.hxx>
diff --git a/svtools/inc/svtools/wizdlg.hxx b/svtools/inc/svtools/wizdlg.hxx
index 5bd2db5672ed..17fccaeea3ec 100644
--- a/svtools/inc/svtools/wizdlg.hxx
+++ b/svtools/inc/svtools/wizdlg.hxx
@@ -30,9 +30,7 @@
#include "svtools/svtdllapi.h"
-#ifndef _VCL_DIALOG_HXX
#include <vcl/dialog.hxx>
-#endif
class TabPage;
class Button;
diff --git a/svtools/inc/svtools/xwindowitem.hxx b/svtools/inc/svtools/xwindowitem.hxx
index eca425cf1369..eca425cf1369 100755..100644
--- a/svtools/inc/svtools/xwindowitem.hxx
+++ b/svtools/inc/svtools/xwindowitem.hxx
diff --git a/svtools/inc/taskbar.hxx b/svtools/inc/taskbar.hxx
index 46853fa07c03..32f0396cde8e 100644
--- a/svtools/inc/taskbar.hxx
+++ b/svtools/inc/taskbar.hxx
@@ -30,9 +30,7 @@
#include "svtools/svtdllapi.h"
#include <tools/time.hxx>
-#ifndef _TOOLS_LIST_HXX
#include <tools/list.hxx>
-#endif
#include <vcl/timer.hxx>
#include <vcl/toolbox.hxx>
#include <vcl/status.hxx>
diff --git a/svtools/inc/wallitem.hxx b/svtools/inc/wallitem.hxx
index 533d5ae3f6d3..468d68e82d3d 100644
--- a/svtools/inc/wallitem.hxx
+++ b/svtools/inc/wallitem.hxx
@@ -27,9 +27,7 @@
#ifndef _WALLITEM_HXX
#define _WALLITEM_HXX
-#ifndef SHL_HXX
#include <tools/shl.hxx>
-#endif
// -----------------------------------------------------------------------------------------
// Hilfsklasse, um die Download-Funktionalitaet des SvxBrushItems unterhalb