more removed include guards using fixguard.py

66 files changed, 0 insertions, 212 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
diff --git a/svtools/source/brwbox/datwin.hxx b/svtools/source/brwbox/datwin.hxx
index 1deb8aeb5b56..86157c991cd5 100644
--- a/svtools/source/brwbox/datwin.hxx
+++ b/svtools/source/brwbox/datwin.hxx
@@ -28,14 +28,10 @@
 #ifndef _SFXDATWIN_HXX
 #define _SFXDATWIN_HXX
 
-#ifndef _BRWBOX_HXX
 #include <svtools/brwbox.hxx>
-#endif
 #include <svtools/brwhead.hxx>
 #include <vcl/timer.hxx>
-#ifndef _IMAGE_HXX //autogen
 #include <vcl/image.hxx>
-#endif
 #include <tools/list.hxx>
 #include <svtools/transfer.hxx>
 
diff --git a/svtools/source/contnr/imivctl.hxx b/svtools/source/contnr/imivctl.hxx
index cc7aa4e05ee1..b1a1f1b8547a 100644
--- a/svtools/source/contnr/imivctl.hxx
+++ b/svtools/source/contnr/imivctl.hxx
@@ -28,12 +28,8 @@
 #ifndef _IMPICNVW_HXX
 #define _IMPICNVW_HXX
 
-#ifndef _VIRDEV_HXX
 #include <vcl/virdev.hxx>
-#endif
-#ifndef _SCRBAR_HXX
 #include <vcl/scrbar.hxx>
-#endif
 #include <vcl/timer.hxx>
 #include <vcl/seleng.hxx>
 #include <tools/debug.hxx>
diff --git a/svtools/source/control/inettbc.cxx b/svtools/source/control/inettbc.cxx
index ebeb10a7651d..b538449a7839 100644
--- a/svtools/source/control/inettbc.cxx
+++ b/svtools/source/control/inettbc.cxx
@@ -42,9 +42,7 @@
 #include <com/sun/star/sdbc/XResultSet.hpp>
 #include <com/sun/star/sdbc/XRow.hpp>
 
-#ifndef  _COM_SUN_STAR_TASK_XINTERACTIONHANDLER_HDL_
 #include <com/sun/star/task/XInteractionHandler.hdl>
-#endif
 #include <com/sun/star/ucb/NumberedSortingInfo.hpp>
 #include <com/sun/star/ucb/XAnyCompareFactory.hpp>
 #include <com/sun/star/ucb/XProgressHandler.hpp>
diff --git a/svtools/source/control/valueimp.hxx b/svtools/source/control/valueimp.hxx
index abde4a015ab8..d0340f2030b7 100755..100644
--- a/svtools/source/control/valueimp.hxx
+++ b/svtools/source/control/valueimp.hxx
@@ -29,9 +29,7 @@
 #include <tools/list.hxx>
 #include <tools/color.hxx>
 #include <tools/string.hxx>
-#ifndef _IMAGE_HXX
 #include <vcl/image.hxx>
-#endif
 #include <rtl/uuid.h>
 #include <cppuhelper/implbase5.hxx>
 #include <cppuhelper/compbase6.hxx>
diff --git a/svtools/source/dialogs/filedlg2.hxx b/svtools/source/dialogs/filedlg2.hxx
index 4d32565a2775..8a793eac3630 100644
--- a/svtools/source/dialogs/filedlg2.hxx
+++ b/svtools/source/dialogs/filedlg2.hxx
@@ -30,9 +30,7 @@
 
 #include <tools/debug.hxx>
 #include <tools/fsys.hxx>
-#ifndef _SV_BUTTON_HXX //autogen wg. PushButton
 #include <vcl/button.hxx>
-#endif
 #include <vcl/unohelp.hxx>
 
 class FixedText;
diff --git a/svtools/source/dialogs/propctrl.hxx b/svtools/source/dialogs/propctrl.hxx
index 949873ceb1b7..43d50dad1761 100644
--- a/svtools/source/dialogs/propctrl.hxx
+++ b/svtools/source/dialogs/propctrl.hxx
@@ -35,18 +35,10 @@
   */
 
 
-#ifndef __PROPED_HXX__
 #include <proped.hxx>
-#endif
-#ifndef _UNO_HXX
 #include <usr/uno.hxx>
-#endif
-#ifndef _USR_SEQU_HXX
 #include <usr/sequ.hxx>
-#endif
-#ifndef __TOOLSIDL_HXX__
 #include <usr/toolsidl.hxx>
-#endif
 
 /*
 class XPropertyEditor
diff --git a/svtools/source/edit/texteng.cxx b/svtools/source/edit/texteng.cxx
index 3f8e13e80660..551c532fbabc 100644
--- a/svtools/source/edit/texteng.cxx
+++ b/svtools/source/edit/texteng.cxx
@@ -50,9 +50,7 @@
 
 #include <com/sun/star/i18n/WordType.hpp>
 
-#ifndef _COM_SUN_STAR_I18N_XEXTENDEDINPUTSEQUENCECHECKER_HDL_
 #include <com/sun/star/i18n/XExtendedInputSequenceChecker.hpp>
-#endif
 #include <com/sun/star/i18n/InputSequenceCheckMode.hpp>
 #include <com/sun/star/i18n/ScriptType.hpp>
 
diff --git a/svtools/source/filter.vcl/igif/decode.hxx b/svtools/source/filter.vcl/igif/decode.hxx
index 3c6a61e7508d..6a55440149be 100644
--- a/svtools/source/filter.vcl/igif/decode.hxx
+++ b/svtools/source/filter.vcl/igif/decode.hxx
@@ -28,9 +28,7 @@
 #ifndef _DECODE_HXX
 #define _DECODE_HXX
 
-#ifndef _BMPACC_HXX
 #include <vcl/bmpacc.hxx>
-#endif
 
 struct GIFLZWTableEntry;
 
diff --git a/svtools/source/filter.vcl/wmf/winmtf.hxx b/svtools/source/filter.vcl/wmf/winmtf.hxx
index 61e737022946..102c8c722a05 100644
--- a/svtools/source/filter.vcl/wmf/winmtf.hxx
+++ b/svtools/source/filter.vcl/wmf/winmtf.hxx
@@ -33,12 +33,8 @@
 #endif
 
 #include <sot/object.hxx>
-#ifndef BOOST_SHARED_PTR_HPP_INCLUDED
 #include <boost/shared_ptr.hpp>
-#endif
-#ifndef _TOOL_DEBUG_HXX
 #include <tools/debug.hxx>
-#endif
 #include <tools/stack.hxx>
 #include <tools/table.hxx>
 #include <tools/dynary.hxx>
diff --git a/svtools/source/hatchwindow/hatchwindowfactory.hxx b/svtools/source/hatchwindow/hatchwindowfactory.hxx
index 9a59c7a95f6d..a2a5b1b58d47 100644
--- a/svtools/source/hatchwindow/hatchwindowfactory.hxx
+++ b/svtools/source/hatchwindow/hatchwindowfactory.hxx
@@ -32,9 +32,7 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 
 
-#ifndef _CPPUHELPER_IMPLBASE5_HXX_
 #include <cppuhelper/implbase2.hxx>
-#endif
 
 
 class OHatchWindowFactory : public ::cppu::WeakImplHelper2<
diff --git a/svtools/source/inc/gifread.hxx b/svtools/source/inc/gifread.hxx
index de4c6935ef67..0a78283b2914 100644
--- a/svtools/source/inc/gifread.hxx
+++ b/svtools/source/inc/gifread.hxx
@@ -28,12 +28,8 @@
 #ifndef _GIFREAD_HXX
 #define _GIFREAD_HXX
 
-#ifndef _GRAPH_HXX
 #include <vcl/graph.hxx>
-#endif
-#ifndef _BMPACC_HXX
 #include <vcl/bmpacc.hxx>
-#endif
 
 #ifdef _GIFPRIVATE
 
diff --git a/svtools/source/inc/gradwrap.hxx b/svtools/source/inc/gradwrap.hxx
index 41887b67822a..37267818c5dc 100644
--- a/svtools/source/inc/gradwrap.hxx
+++ b/svtools/source/inc/gradwrap.hxx
@@ -26,9 +26,7 @@
  ************************************************************************/
 
 
-#ifndef _SVGEN_HXX
 #include <svgen.hxx>
-#endif
 
 
 /******************************************************************************
diff --git a/svtools/source/inc/jpeg.hxx b/svtools/source/inc/jpeg.hxx
index 9923190c5e21..7bcd98036b2e 100644
--- a/svtools/source/inc/jpeg.hxx
+++ b/svtools/source/inc/jpeg.hxx
@@ -28,9 +28,7 @@
 #ifndef _JPEG_HXX
 #define _JPEG_HXX
 
-#ifndef _GRAPH_HXX
 #include <vcl/graph.hxx>
-#endif
 #include <svtools/fltcall.hxx>
 #include <com/sun/star/uno/Sequence.h>
 #include <com/sun/star/beans/PropertyValue.hpp>
diff --git a/svtools/source/inc/property.hxx b/svtools/source/inc/property.hxx
index 689da1faf140..5da77a62c5e2 100644
--- a/svtools/source/inc/property.hxx
+++ b/svtools/source/inc/property.hxx
@@ -28,27 +28,13 @@
 #ifndef SV_PROPERTY_HXX
 #define SV_PROPERTY_HXX
 
-#ifndef _VIRDEV_HXX //autogen
 #include <vcl/virdev.hxx>
-#endif
-#ifndef SV_FIXED_HXX
 #include <vcl/fixed.hxx>
-#endif
-#ifndef SV_LSTBOX_HXX
 #include <vcl/lstbox.hxx>
-#endif
-#ifndef SV_GROUP_HXX
 #include <vcl/group.hxx>
-#endif
-#ifndef SV_BUTTON_HXX
 #include <vcl/button.hxx>
-#endif
-#ifndef SV_MOREBTN_HXX
 #include <vcl/morebtn.hxx>
-#endif
-#ifndef _DIALOG_HXX //autogen
 #include <vcl/dialog.hxx>
-#endif
 #include <vcl/combobox.hxx>
 #include <vcl/field.hxx>
 #include <svl/svarray.hxx>
diff --git a/svtools/source/inc/svimpbox.hxx b/svtools/source/inc/svimpbox.hxx
index 92b9f960b65c..8bc688b4227d 100644
--- a/svtools/source/inc/svimpbox.hxx
+++ b/svtools/source/inc/svimpbox.hxx
@@ -28,12 +28,8 @@
 #ifndef _SVIMPLBOX_HXX
 #define _SVIMPLBOX_HXX
 
-#ifndef _SELENG_HXX
 #include <vcl/seleng.hxx>
-#endif
-#ifndef _SCRBAR_HXX
 #include <vcl/scrbar.hxx>
-#endif
 #include <vcl/vclevent.hxx>
 // #102891# ----------------
 #include <unotools/intlwrapper.hxx>
diff --git a/svtools/source/inc/svimpicn.hxx b/svtools/source/inc/svimpicn.hxx
index 20f98d2bcbbd..6b10938b429b 100644
--- a/svtools/source/inc/svimpicn.hxx
+++ b/svtools/source/inc/svimpicn.hxx
@@ -27,13 +27,9 @@
 #ifndef _SVIMPICN_HXX
 #define _SVIMPICN_HXX
 
-#ifndef _VIRDEV_HXX
 #include <vcl/virdev.hxx>
-#endif
 
-#ifndef _SCRBAR_HXX
 #include <vcl/scrbar.hxx>
-#endif
 #include <limits.h>
 
 class SvLBoxEntry;
diff --git a/svtools/source/inc/xbmread.hxx b/svtools/source/inc/xbmread.hxx
index aab52eeffa63..9515148513bd 100644
--- a/svtools/source/inc/xbmread.hxx
+++ b/svtools/source/inc/xbmread.hxx
@@ -28,12 +28,8 @@
 #ifndef _XBMREAD_HXX
 #define _XBMREAD_HXX
 
-#ifndef _GRAPH_HXX
 #include <vcl/graph.hxx>
-#endif
-#ifndef _BMPACC_HXX
 #include <vcl/bmpacc.hxx>
-#endif
 
 #ifdef _XBMPRIVATE
 
diff --git a/svtools/source/inc/xpmread.hxx b/svtools/source/inc/xpmread.hxx
index 29edd15a3b1c..d7355724b75c 100644
--- a/svtools/source/inc/xpmread.hxx
+++ b/svtools/source/inc/xpmread.hxx
@@ -28,9 +28,7 @@
 #ifndef _XPMREAD_HXX
 #define _XPMREAD_HXX
 
-#ifndef _BITMAP_HXX
 #include <vcl/bitmap.hxx>
-#endif
 
 #ifdef _XPMPRIVATE
 
diff --git a/svtools/source/productregistration/registrationdlg.hxx b/svtools/source/productregistration/registrationdlg.hxx
index 16761aff08fc..bbedb8e3a924 100644
--- a/svtools/source/productregistration/registrationdlg.hxx
+++ b/svtools/source/productregistration/registrationdlg.hxx
@@ -29,9 +29,7 @@
 #define SVTOOLS_REGISTRATIONDLG_HXX
 
 #include <vcl/fixed.hxx>
-#ifndef _SV_BUTTON_HXX
 #include <vcl/button.hxx>
-#endif
 #include <vcl/dialog.hxx>
 
 //........................................................................
diff --git a/svtools/source/table/tablecontrol_impl.hxx b/svtools/source/table/tablecontrol_impl.hxx
index 053766d92841..dfaf949ede53 100644
--- a/svtools/source/table/tablecontrol_impl.hxx
+++ b/svtools/source/table/tablecontrol_impl.hxx
@@ -27,13 +27,9 @@
 #ifndef SVTOOLS_TABLECONTROL_IMPL_HXX
 #define SVTOOLS_TABLECONTROL_IMPL_HXX
 
-#ifndef SVTOOLS_INC_TABLE_TABLEMODEL_HXX
 #include <svtools/table/tablemodel.hxx>
-#endif
 
-#ifndef SVTOOLS_INC_TABLE_ABSTRACTTABLECONTROL_HXX
 #include <svtools/table/abstracttablecontrol.hxx>
-#endif
 
 #include <svtools/table/tablemodel.hxx>
 #include <vector>
diff --git a/svtools/source/table/tablegeometry.hxx b/svtools/source/table/tablegeometry.hxx
index 3ddde0c98c64..97c7c646ceeb 100644
--- a/svtools/source/table/tablegeometry.hxx
+++ b/svtools/source/table/tablegeometry.hxx
@@ -27,13 +27,9 @@
 #ifndef SVTOOLS_TABLEGEOMETRY_HXX
 #define SVTOOLS_TABLEGEOMETRY_HXX
 
-#ifndef SVTOOLS_INC_TABLE_TABLETYPES_HXX
 #include <svtools/table/tabletypes.hxx>
-#endif
 
-#ifndef _SV_GEN_HXX
 #include <tools/gen.hxx>
-#endif
 
 //........................................................................
 namespace svt { namespace table
diff --git a/svtools/source/toolpanel/paneldecklisteners.hxx b/svtools/source/toolpanel/paneldecklisteners.hxx
index bc7e2ae7db88..bc7e2ae7db88 100755..100644
--- a/svtools/source/toolpanel/paneldecklisteners.hxx
+++ b/svtools/source/toolpanel/paneldecklisteners.hxx
diff --git a/svtools/source/toolpanel/toolpaneldeckpeer.hxx b/svtools/source/toolpanel/toolpaneldeckpeer.hxx
index 4b6607ecbd05..4b6607ecbd05 100755..100644
--- a/svtools/source/toolpanel/toolpaneldeckpeer.hxx
+++ b/svtools/source/toolpanel/toolpaneldeckpeer.hxx
diff --git a/svtools/source/uno/svtxgridcontrol.hxx b/svtools/source/uno/svtxgridcontrol.hxx
index b15507e4614f..b15507e4614f 100755..100644
--- a/svtools/source/uno/svtxgridcontrol.hxx
+++ b/svtools/source/uno/svtxgridcontrol.hxx