more removed include guards using fixguard.py

65 files changed, 0 insertions, 182 deletions

diff --git a/svx/inc/connctrl.hxx b/svx/inc/connctrl.hxx
index 6ba07e23ae..43c409a238 100644
--- a/svx/inc/connctrl.hxx
+++ b/svx/inc/connctrl.hxx
@@ -29,9 +29,7 @@
 
 // include ---------------------------------------------------------------
 
-#ifndef _CTRL_HXX //autogen
 #include <vcl/ctrl.hxx>
-#endif
 #include "svx/svxdllapi.h"
 
 class SfxItemSet;
diff --git a/svx/inc/fontlb.hxx b/svx/inc/fontlb.hxx
index e8bcd3777c..8c56f9e7f0 100644
--- a/svx/inc/fontlb.hxx
+++ b/svx/inc/fontlb.hxx
@@ -28,9 +28,7 @@
 #ifndef SVX_FONTLB_HXX
 #define	SVX_FONTLB_HXX
 
-#ifndef _SVTABBOX_HXX
 #include <svtools/svtabbx.hxx>
-#endif
 #include <vcl/virdev.hxx>
 #include "svx/svxdllapi.h"
 #include <layout/layout.hxx>
diff --git a/svx/inc/imapdlg.hxx b/svx/inc/imapdlg.hxx
index dc587513b8..65efcea510 100644
--- a/svx/inc/imapdlg.hxx
+++ b/svx/inc/imapdlg.hxx
@@ -34,25 +34,15 @@
 #include <sfx2/ctrlitem.hxx>
 #include <sfx2/basedlgs.hxx>
 
-#ifndef _FIXED_HXX //autogen
 #include <vcl/fixed.hxx>
-#endif
 
-#ifndef _COMBOBOX_HXX //autogen
 #include <vcl/combobox.hxx>
-#endif
 
-#ifndef _EDIT_HXX //autogen
 #include <vcl/edit.hxx>
-#endif
 
-#ifndef _TOOLBOX_HXX //autogen
 #include <vcl/toolbox.hxx>
-#endif
 
-#ifndef _STATUS_HXX //autogen
 #include <vcl/status.hxx>
-#endif
 #include "svx/svxdllapi.h"
 
 
diff --git a/svx/inc/lightdlg.hxx b/svx/inc/lightdlg.hxx
index fe00bcf0e5..cf283976b6 100644
--- a/svx/inc/lightdlg.hxx
+++ b/svx/inc/lightdlg.hxx
@@ -35,9 +35,7 @@
 #include <sfx2/tabdlg.hxx>
 #include <sfx2/basedlgs.hxx>
 
-#ifndef _FIELD_HXX //autogen
 #include <vcl/field.hxx>
-#endif
 #include <svx/dlgctrl.hxx>
 
 /*************************************************************************
diff --git a/svx/inc/measctrl.hxx b/svx/inc/measctrl.hxx
index 00e061b08e..9021242198 100644
--- a/svx/inc/measctrl.hxx
+++ b/svx/inc/measctrl.hxx
@@ -29,9 +29,7 @@
 
 // include ---------------------------------------------------------------
 
-#ifndef _CTRL_HXX //autogen
 #include <vcl/ctrl.hxx>
-#endif
 #include "svx/svxdllapi.h"
 
 
diff --git a/svx/inc/passwd.hxx b/svx/inc/passwd.hxx
index 617c89014d..22dd412e31 100644
--- a/svx/inc/passwd.hxx
+++ b/svx/inc/passwd.hxx
@@ -31,17 +31,11 @@
 
 #include <sfx2/basedlgs.hxx>
 
-#ifndef _FIXED_HXX //autogen
 #include <vcl/fixed.hxx>
-#endif
 
-#ifndef _EDIT_HXX //autogen
 #include <vcl/edit.hxx>
-#endif
 
-#ifndef _BUTTON_HXX //autogen
 #include <vcl/button.hxx>
-#endif
 #include "svx/svxdllapi.h"
 
 // class SvxPasswordDialog -----------------------------------------------
diff --git a/svx/inc/relfld.hxx b/svx/inc/relfld.hxx
index 15863f498e..9f5817ba53 100644
--- a/svx/inc/relfld.hxx
+++ b/svx/inc/relfld.hxx
@@ -29,9 +29,7 @@
 
 // include ---------------------------------------------------------------
 
-#ifndef _FIELD_HXX //autogen
 #include <vcl/field.hxx>
-#endif
 #include "svx/svxdllapi.h"
 
 
diff --git a/svx/inc/rubydialog.hxx b/svx/inc/rubydialog.hxx
index 51f83c79ac..e2b599dd1e 100644
--- a/svx/inc/rubydialog.hxx
+++ b/svx/inc/rubydialog.hxx
@@ -32,12 +32,8 @@
 #include <sfx2/childwin.hxx>
 #include <sfx2/basedlgs.hxx>
 #include <vcl/lstbox.hxx>
-#ifndef _FIXED_HXX //autogen
 #include <vcl/fixed.hxx>
-#endif
-#ifndef _SV_BUTTON_HXX
 #include <vcl/button.hxx>
-#endif
 #include <vcl/edit.hxx>
 #include <vcl/scrbar.hxx>
 #include <com/sun/star/uno/Reference.h>
diff --git a/svx/inc/sdrpaintwindow.hxx b/svx/inc/sdrpaintwindow.hxx
index 5b2224dfa8..a31f47b864 100644
--- a/svx/inc/sdrpaintwindow.hxx
+++ b/svx/inc/sdrpaintwindow.hxx
@@ -28,9 +28,7 @@
 #ifndef _SDRPAINTWINDOW_HXX
 #define _SDRPAINTWINDOW_HXX
 
-#ifndef _VIRDEV_HXX //autogen
 #include <vcl/virdev.hxx>
-#endif
 #include "svx/svxdllapi.h"
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/svx/inc/sjctrl.hxx b/svx/inc/sjctrl.hxx
index 19e735265b..2b27902e0c 100644
--- a/svx/inc/sjctrl.hxx
+++ b/svx/inc/sjctrl.hxx
@@ -27,9 +27,7 @@
 
 #ifdef SOLAR_JAVA
 
-#ifndef _SFXSFXJS_HXX
 #include <sfx2/sfxjs.hxx>
-#endif
 
 class VCControl;
 class VCForm;
diff --git a/svx/inc/svx/AccessibleOLEShape.hxx b/svx/inc/svx/AccessibleOLEShape.hxx
index c8136ca4b9..6c69fde5e6 100644
--- a/svx/inc/svx/AccessibleOLEShape.hxx
+++ b/svx/inc/svx/AccessibleOLEShape.hxx
@@ -28,13 +28,9 @@
 #ifndef _SVX_ACCESSIBILITY_ACCESSIBLE_OLE_SHAPE_HXX
 #define _SVX_ACCESSIBILITY_ACCESSIBLE_OLE_SHAPE_HXX
 
-#ifndef _SVX_ACCESSIBILITY_ACCESSIBLE_SHAPE_MANAGER_HXX
 #include <svx/AccessibleShape.hxx>
-#endif
 
-#ifndef _COM_SUN_STAR_ACCESSIBILITY_XACCESSIBLE_ACTION_HPP_
 #include <com/sun/star/accessibility/XAccessibleAction.hpp>
-#endif
 #include "svx/svxdllapi.h"
 
 namespace accessibility {
diff --git a/svx/inc/svx/AccessibleShape.hxx b/svx/inc/svx/AccessibleShape.hxx
index 59a601c5a4..59a601c5a4 100755..100644
--- a/svx/inc/svx/AccessibleShape.hxx
+++ b/svx/inc/svx/AccessibleShape.hxx
diff --git a/svx/inc/svx/ShapeTypeHandler.hxx b/svx/inc/svx/ShapeTypeHandler.hxx
index dbbca94edc..dbbca94edc 100755..100644
--- a/svx/inc/svx/ShapeTypeHandler.hxx
+++ b/svx/inc/svx/ShapeTypeHandler.hxx
diff --git a/svx/inc/svx/SvxShapeTypes.hxx b/svx/inc/svx/SvxShapeTypes.hxx
index 403ad6726e..f747ea938e 100644
--- a/svx/inc/svx/SvxShapeTypes.hxx
+++ b/svx/inc/svx/SvxShapeTypes.hxx
@@ -28,9 +28,7 @@
 #ifndef _SVX_ACCESSIBILITY_SVX_SHAPE_TYPES_HXX
 #define _SVX_ACCESSIBILITY_SVX_SHAPE_TYPES_HXX
 
-#ifndef _SVX_ACCESSIBILITY_ACCESSIBLE_SHAPE_HXX
 #include <svx/ShapeTypeHandler.hxx>
-#endif
 #include <com/sun/star/accessibility/XAccessible.hpp>
 
 namespace accessibility {
diff --git a/svx/inc/svx/checklbx.hxx b/svx/inc/svx/checklbx.hxx
index 4aefcf2791..4b8d391482 100644
--- a/svx/inc/svx/checklbx.hxx
+++ b/svx/inc/svx/checklbx.hxx
@@ -33,9 +33,7 @@
 #include <svtools/svtreebx.hxx>
 #include <svtools/svlbitm.hxx>
 
-#ifndef _LSTBOX_HXX //autogen
 #include <vcl/lstbox.hxx>
-#endif
 #include "svx/svxdllapi.h"
 
 // class SvxCheckListBox -------------------------------------------------
diff --git a/svx/inc/svx/ctredlin.hxx b/svx/inc/svx/ctredlin.hxx
index 853fd75470..b6f14273d1 100644
--- a/svx/inc/svx/ctredlin.hxx
+++ b/svx/inc/svx/ctredlin.hxx
@@ -28,12 +28,8 @@
 #ifndef _SVX_CTREDLIN_HXX
 #define _SVX_CTREDLIN_HXX
 
-#ifndef _MOREBTN_HXX //autogen
 #include <vcl/morebtn.hxx>
-#endif
-#ifndef _COMBOBOX_HXX //autogen
 #include <vcl/combobox.hxx>
-#endif
 #include <svtools/headbar.hxx>
 #include <svtools/svtabbx.hxx>
 #include <vcl/lstbox.hxx>
diff --git a/svx/inc/svx/dbcharsethelper.hxx b/svx/inc/svx/dbcharsethelper.hxx
index 8d1c4b7f5c..8d1c4b7f5c 100755..100644
--- a/svx/inc/svx/dbcharsethelper.hxx
+++ b/svx/inc/svx/dbcharsethelper.hxx
diff --git a/svx/inc/svx/dbtoolsclient.hxx b/svx/inc/svx/dbtoolsclient.hxx
index 22e2ab820e..22e2ab820e 100755..100644
--- a/svx/inc/svx/dbtoolsclient.hxx
+++ b/svx/inc/svx/dbtoolsclient.hxx
diff --git a/svx/inc/svx/float3d.hxx b/svx/inc/svx/float3d.hxx
index 1d255187c0..9bdb2feac7 100644
--- a/svx/inc/svx/float3d.hxx
+++ b/svx/inc/svx/float3d.hxx
@@ -29,16 +29,10 @@
 #define _SVX_FLOAT3D_HXX
 
 #include <sfx2/ctrlitem.hxx>
-#ifndef _FIXED_HXX //autogen
 #include <vcl/fixed.hxx>
-#endif
-#ifndef _FIELD_HXX //autogen
 #include <vcl/field.hxx>
-#endif
 #include <sfx2/dockwin.hxx>
-#ifndef _IMAGEBTN_HXX //autogen
 #include <vcl/imagebtn.hxx>
-#endif
 #include <svtools/valueset.hxx>
 #include <svtools/stdctrl.hxx>
 #include "svx/svxdllapi.h"
diff --git a/svx/inc/svx/fmsearch.hxx b/svx/inc/svx/fmsearch.hxx
index 63ab4b85e7..1fda6f0595 100644
--- a/svx/inc/svx/fmsearch.hxx
+++ b/svx/inc/svx/fmsearch.hxx
@@ -33,21 +33,13 @@
 #define _SVSTDARR_STRINGSDTOR
 #include <svl/svstdarr.hxx>
 
-#ifndef _DIALOG_HXX //autogen
 #include <vcl/dialog.hxx>
-#endif
 
-#ifndef _BUTTON_HXX //autogen
 #include <vcl/button.hxx>
-#endif
 
-#ifndef _FIXED_HXX //autogen
 #include <vcl/fixed.hxx>
-#endif
 
-#ifndef _EDIT_HXX //autogen
 #include <vcl/edit.hxx>
-#endif
 #include <vcl/combobox.hxx>
 #include <vcl/lstbox.hxx>
 #include <tools/link.hxx>
diff --git a/svx/inc/svx/fmshell.hxx b/svx/inc/svx/fmshell.hxx
index 911ac0a78b..faf26fc175 100644
--- a/svx/inc/svx/fmshell.hxx
+++ b/svx/inc/svx/fmshell.hxx
@@ -35,9 +35,7 @@
 #include <sfx2/module.hxx>
 #include <vcl/event.hxx>
 
-#ifndef _SVX_SVXIDS_HRC
 #include <svx/svxids.hrc>
-#endif
 #include <svx/fmview.hxx>
 #include "svx/svxdllapi.h"
 
diff --git a/svx/inc/svx/fntctrl.hxx b/svx/inc/svx/fntctrl.hxx
index 20badbeb75..13c43f7580 100644
--- a/svx/inc/svx/fntctrl.hxx
+++ b/svx/inc/svx/fntctrl.hxx
@@ -33,9 +33,7 @@
 #include <editeng/svxfont.hxx>
 #include "svx/svxdllapi.h"
 
-#ifndef _RTL_USTRING_HXX_
 #include <rtl/ustring.hxx>
-#endif
 
 // forward ---------------------------------------------------------------
 
diff --git a/svx/inc/svx/fontwork.hxx b/svx/inc/svx/fontwork.hxx
index 756b76c868..cd06a07ad9 100644
--- a/svx/inc/svx/fontwork.hxx
+++ b/svx/inc/svx/fontwork.hxx
@@ -29,12 +29,8 @@
 
 // include ---------------------------------------------------------------
 
-#ifndef _TOOLBOX_HXX //autogen
 #include <vcl/toolbox.hxx>
-#endif
-#ifndef _FIXED_HXX //autogen
 #include <vcl/fixed.hxx>
-#endif
 #include <svtools/valueset.hxx>
 #include <sfx2/dockwin.hxx>
 #include <sfx2/ctrlitem.hxx>
diff --git a/svx/inc/svx/frmdirlbox.hxx b/svx/inc/svx/frmdirlbox.hxx
index c56b363d58..b7f9ba36c0 100644
--- a/svx/inc/svx/frmdirlbox.hxx
+++ b/svx/inc/svx/frmdirlbox.hxx
@@ -28,9 +28,7 @@
 #ifndef _SVX_FRMDIRLBOX_HXX
 #define _SVX_FRMDIRLBOX_HXX
 
-#ifndef _LSTBOX_HXX
 #include <vcl/lstbox.hxx>
-#endif
 #include <sfx2/itemconnect.hxx>
 #include <editeng/frmdir.hxx>
 #include "svx/svxdllapi.h"
diff --git a/svx/inc/svx/grfflt.hxx b/svx/inc/svx/grfflt.hxx
index e754b32ced..9c5b1a6a09 100644
--- a/svx/inc/svx/grfflt.hxx
+++ b/svx/inc/svx/grfflt.hxx
@@ -30,9 +30,7 @@
 
 #include <vcl/fixed.hxx>
 #include <vcl/field.hxx>
-#ifndef _SV_BUTTON_HXX
 #include <vcl/button.hxx>
-#endif
 #include <vcl/timer.hxx>
 #include <vcl/dialog.hxx>
 #include <vcl/group.hxx>
diff --git a/svx/inc/svx/gridctrl.hxx b/svx/inc/svx/gridctrl.hxx
index 496891c758..302f0a6f97 100644
--- a/svx/inc/svx/gridctrl.hxx
+++ b/svx/inc/svx/gridctrl.hxx
@@ -38,9 +38,7 @@
 #include <vcl/fixed.hxx>
 #include <vcl/field.hxx>
 
-#ifndef _SV_BUTTON_HXX //autogen
 #include <vcl/button.hxx>
-#endif
 #include <tools/date.hxx>
 #include <tools/ref.hxx>
 #include <svtools/editbrowsebox.hxx>
diff --git a/svx/inc/svx/hdft.hxx b/svx/inc/svx/hdft.hxx
index 7efa978285..c40a6103d6 100644
--- a/svx/inc/svx/hdft.hxx
+++ b/svx/inc/svx/hdft.hxx
@@ -31,17 +31,11 @@
 
 #include <sfx2/tabdlg.hxx>
 
-#ifndef _FIXED_HXX //autogen
 #include <vcl/fixed.hxx>
-#endif
 
-#ifndef _FIELD_HXX //autogen
 #include <vcl/field.hxx>
-#endif
 
-#ifndef _GROUP_HXX //autogen
 #include <vcl/group.hxx>
-#endif
 #include <svx/pagectrl.hxx>
 #include "svx/svxdllapi.h"
 
diff --git a/svx/inc/svx/msdffdef.hxx b/svx/inc/svx/msdffdef.hxx
index a20eecf424..bb476d441d 100644
--- a/svx/inc/svx/msdffdef.hxx
+++ b/svx/inc/svx/msdffdef.hxx
@@ -31,9 +31,7 @@
 
 #include <tools/solar.h>
 #include <tools/stream.hxx>
-#ifndef _TABLE_HXX
 #include <tools/table.hxx>
-#endif
 #include <tools/string.hxx>
 #include <tools/gen.hxx>
 #include "svx/svxdllapi.h"
diff --git a/svx/inc/svx/sdr/contact/viewcontactofe3dcube.hxx b/svx/inc/svx/sdr/contact/viewcontactofe3dcube.hxx
index 43f8c8cd96..63dc2e60e8 100644
--- a/svx/inc/svx/sdr/contact/viewcontactofe3dcube.hxx
+++ b/svx/inc/svx/sdr/contact/viewcontactofe3dcube.hxx
@@ -28,9 +28,7 @@
 #ifndef _SDR_CONTACT_VIEWCONTACTOFE3DCUBE_HXX
 #define _SDR_CONTACT_VIEWCONTACTOFE3DCUBE_HXX
 
-#ifndef _SDR_CONTACT_VIEWCONTACTOFE3D_HXX
 #include <svx/sdr/contact/viewcontactofe3d.hxx>
-#endif
 
 //////////////////////////////////////////////////////////////////////////////
 // predeclarations
diff --git a/svx/inc/svx/sdr/contact/viewcontactofe3dextrude.hxx b/svx/inc/svx/sdr/contact/viewcontactofe3dextrude.hxx
index 493ba8d79a..e16c9fb297 100644
--- a/svx/inc/svx/sdr/contact/viewcontactofe3dextrude.hxx
+++ b/svx/inc/svx/sdr/contact/viewcontactofe3dextrude.hxx
@@ -28,9 +28,7 @@
 #ifndef _SDR_CONTACT_VIEWCONTACTOFE3DEXTRUDE_HXX
 #define _SDR_CONTACT_VIEWCONTACTOFE3DEXTRUDE_HXX
 
-#ifndef _SDR_CONTACT_VIEWCONTACTOFE3D_HXX
 #include <svx/sdr/contact/viewcontactofe3d.hxx>
-#endif
 
 //////////////////////////////////////////////////////////////////////////////
 // predeclarations
diff --git a/svx/inc/svx/sdr/contact/viewcontactofe3dlathe.hxx b/svx/inc/svx/sdr/contact/viewcontactofe3dlathe.hxx
index 20987d603c..f283196606 100644
--- a/svx/inc/svx/sdr/contact/viewcontactofe3dlathe.hxx
+++ b/svx/inc/svx/sdr/contact/viewcontactofe3dlathe.hxx
@@ -28,9 +28,7 @@
 #ifndef _SDR_CONTACT_VIEWCONTACTOFE3DLATHE_HXX
 #define _SDR_CONTACT_VIEWCONTACTOFE3DLATHE_HXX
 
-#ifndef _SDR_CONTACT_VIEWCONTACTOFE3D_HXX
 #include <svx/sdr/contact/viewcontactofe3d.hxx>
-#endif
 
 //////////////////////////////////////////////////////////////////////////////
 // predeclarations
diff --git a/svx/inc/svx/sdr/contact/viewcontactofe3dpolygon.hxx b/svx/inc/svx/sdr/contact/viewcontactofe3dpolygon.hxx
index 48741625a3..e23763dd55 100644
--- a/svx/inc/svx/sdr/contact/viewcontactofe3dpolygon.hxx
+++ b/svx/inc/svx/sdr/contact/viewcontactofe3dpolygon.hxx
@@ -28,9 +28,7 @@
 #ifndef _SDR_CONTACT_VIEWCONTACTOFE3DPOLYGON_HXX
 #define _SDR_CONTACT_VIEWCONTACTOFE3DPOLYGON_HXX
 
-#ifndef _SDR_CONTACT_VIEWCONTACTOFE3D_HXX
 #include <svx/sdr/contact/viewcontactofe3d.hxx>
-#endif
 
 //////////////////////////////////////////////////////////////////////////////
 // predeclarations
diff --git a/svx/inc/svx/sdr/contact/viewcontactofe3dsphere.hxx b/svx/inc/svx/sdr/contact/viewcontactofe3dsphere.hxx
index a14b252d01..6f62af8656 100644
--- a/svx/inc/svx/sdr/contact/viewcontactofe3dsphere.hxx
+++ b/svx/inc/svx/sdr/contact/viewcontactofe3dsphere.hxx
@@ -28,9 +28,7 @@
 #ifndef _SDR_CONTACT_VIEWCONTACTOFE3DSPHERE_HXX
 #define _SDR_CONTACT_VIEWCONTACTOFE3DSPHERE_HXX
 
-#ifndef _SDR_CONTACT_VIEWCONTACTOFE3D_HXX
 #include <svx/sdr/contact/viewcontactofe3d.hxx>
-#endif
 
 //////////////////////////////////////////////////////////////////////////////
 // predeclarations
diff --git a/svx/inc/svx/sdshitm.hxx b/svx/inc/svx/sdshitm.hxx
index 13fb76bcb0..29a319cc0a 100644
--- a/svx/inc/svx/sdshitm.hxx
+++ b/svx/inc/svx/sdshitm.hxx
@@ -27,9 +27,7 @@
 #ifndef _SDSHITM_HXX
 #define _SDSHITM_HXX
 
-#ifndef _SDOOITEM_HXX
 #include <svx/sdooitm.hxx>
-#endif
 #include <svx/svddef.hxx>
 
 //------------------------------
diff --git a/svx/inc/svx/shapeproperty.hxx b/svx/inc/svx/shapeproperty.hxx
index ccd041888a..ccd041888a 100755..100644
--- a/svx/inc/svx/shapeproperty.hxx
+++ b/svx/inc/svx/shapeproperty.hxx
diff --git a/svx/inc/svx/simptabl.hxx b/svx/inc/svx/simptabl.hxx
index 6f313b4419..54a90b7877 100644
--- a/svx/inc/svx/simptabl.hxx
+++ b/svx/inc/svx/simptabl.hxx
@@ -28,17 +28,11 @@
 #ifndef _SVX_SIMPTABL_HXX
 #define _SVX_SIMPTABL_HXX
 
-#ifndef _MOREBTN_HXX //autogen
 #include <vcl/morebtn.hxx>
-#endif
 
-#ifndef _COMBOBOX_HXX //autogen
 #include <vcl/combobox.hxx>
-#endif
 
-#ifndef _GROUP_HXX //autogen
 #include <vcl/group.hxx>
-#endif
 #include <svtools/headbar.hxx>
 #include <svtools/svtabbx.hxx>
 #include <vcl/lstbox.hxx>
diff --git a/svx/inc/svx/strarray.hxx b/svx/inc/svx/strarray.hxx
index 0a8c4fe7f7..8a57d39747 100644
--- a/svx/inc/svx/strarray.hxx
+++ b/svx/inc/svx/strarray.hxx
@@ -29,9 +29,7 @@
 
 // include ---------------------------------------------------------------
 
-#ifndef _RESARY_HXX //autogen
 #include <tools/resary.hxx>
-#endif
 #include "svx/svxdllapi.h"
 
 //	class SvxStringArray -------------------------------------------------
diff --git a/svx/inc/svx/svdattr.hxx b/svx/inc/svx/svdattr.hxx
index 50cb575ede..fdd3f60212 100644
--- a/svx/inc/svx/svdattr.hxx
+++ b/svx/inc/svx/svdattr.hxx
@@ -28,9 +28,7 @@
 #ifndef _SVDATTR_HXX
 #define _SVDATTR_HXX
 
-#ifndef _SOLAR_HRC
 #include <svl/solar.hrc>
-#endif
 #include <tools/solar.h>
 #include <svx/sdangitm.hxx>
 #include <svx/sderitm.hxx>
@@ -42,25 +40,15 @@
 #include <svx/sdshtitm.hxx>
 #include <svx/sdsxyitm.hxx>
 #include <svx/sdtaaitm.hxx>
-#ifndef _SDTACITM_HXX
 #include <svx/sdtacitm.hxx>
-#endif
-#ifndef _SDTACITM_HXX
 #include <svx/sdtaditm.hxx>
-#endif
 #include <svx/sdtagitm.hxx>
 #include <svx/sdtaiitm.hxx>
 #include <svx/sdtaitm.hxx>
-#ifndef _SDTAKITM_HXX
 #include <svx/sdtakitm.hxx>
-#endif
 #include <svx/sdtayitm.hxx>
-#ifndef SDTCFITM_HXX
 #include <svx/sdtcfitm.hxx>
-#endif
-#ifndef _SDTDITM_HXX
 #include <svx/sdtditm.hxx>
-#endif
 #include <svx/sdtfsitm.hxx>
 #include <svx/sdtmfitm.hxx>
 #include <svx/sdynitm.hxx>
diff --git a/svx/inc/svx/svdattrx.hxx b/svx/inc/svx/svdattrx.hxx
index cf1f8e4762..6da6f9ed8a 100644
--- a/svx/inc/svx/svdattrx.hxx
+++ b/svx/inc/svx/svdattrx.hxx
@@ -33,9 +33,7 @@
 #include <svx/sxcaitm.hxx>
 #include <svx/sxcecitm.hxx>
 
-#ifndef _SXCGIITM_HXX
 #include <svx/sxcgitm.hxx>
-#endif
 #include <svx/sxciaitm.hxx>
 #include <svx/sxcikitm.hxx>
 #include <svx/sxcllitm.hxx>
@@ -44,13 +42,9 @@
 #include <svx/sxelditm.hxx>
 #include <svx/sxenditm.hxx>
 
-#ifndef _SXFIITM_HXX
 #include <svx/sxfiitm.hxx>
-#endif
 
-#ifndef _SXLAYITM_HXX
 #include <svx/sxlayitm.hxx>
-#endif
 #include <svx/sxlogitm.hxx>
 #include <svx/sxmbritm.hxx>
 #include <svx/sxmfsitm.hxx>
@@ -58,9 +52,7 @@
 #include <svx/sxmoitm.hxx>
 #include <svx/sxmovitm.hxx>
 
-#ifndef _SXMSIITM_HXX
 #include <svx/sxmsitm.hxx>
-#endif
 #include <svx/sxmspitm.hxx>
 #include <svx/sxmsuitm.hxx>
 #include <svx/sxmtaitm.hxx>
diff --git a/svx/inc/svx/svdetc.hxx b/svx/inc/svx/svdetc.hxx
index 3abbde007a..3d99487e7d 100644
--- a/svx/inc/svx/svdetc.hxx
+++ b/svx/inc/svx/svdetc.hxx
@@ -31,9 +31,7 @@
 #include <tools/string.hxx>
 #include <tools/contnr.hxx>
 
-#ifndef _OUTDEV_HXX //autogen
 #include <vcl/outdev.hxx>
-#endif
 #include <tools/shl.hxx>
 #include <editeng/outliner.hxx>
 #include "svx/svxdllapi.h"
diff --git a/svx/inc/svx/svdhdl.hxx b/svx/inc/svx/svdhdl.hxx
index 777117c925..1eaa24f4a1 100644
--- a/svx/inc/svx/svdhdl.hxx
+++ b/svx/inc/svx/svdhdl.hxx
@@ -30,14 +30,10 @@
 
 #include <tools/gen.hxx>
 
-#ifndef _POINTR_HXX //autogen
 #include <vcl/pointr.hxx>
-#endif
 #include <tools/contnr.hxx>
 
-#ifndef _SOLAR_HRC
 #include <svl/solar.hrc>
-#endif
 
 #include <svx/xpoly.hxx>
 #include <svx/svdoedge.hxx>
diff --git a/svx/inc/svx/svdhlpln.hxx b/svx/inc/svx/svdhlpln.hxx
index d1b5896118..401ae8046c 100644
--- a/svx/inc/svx/svdhlpln.hxx
+++ b/svx/inc/svx/svdhlpln.hxx
@@ -32,9 +32,7 @@
 #include <tools/color.hxx>
 #include <tools/gen.hxx>
 
-#ifndef _POINTR_HXX //autogen
 #include <vcl/pointr.hxx>
-#endif
 #include <tools/contnr.hxx>
 #include "svx/svxdllapi.h"
 
diff --git a/svx/inc/svx/svdouno.hxx b/svx/inc/svx/svdouno.hxx
index e8b2eaf3bc..dfda4a711c 100644
--- a/svx/inc/svx/svdouno.hxx
+++ b/svx/inc/svx/svdouno.hxx
@@ -30,9 +30,7 @@
 
 #include <com/sun/star/awt/XControlModel.hpp>
 #include <com/sun/star/awt/XControl.hpp>
-#ifndef _COM_SUN_STAR_AWT_XMULTISERVICEFACTORY_HPP_
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#endif
 #include <com/sun/star/awt/XControlContainer.hpp>
 #include "svx/svxdllapi.h"
 #include <svx/svdorect.hxx>
diff --git a/svx/inc/svx/svdtrans.hxx b/svx/inc/svx/svdtrans.hxx
index c6c2271917..8212eb79d1 100644
--- a/svx/inc/svx/svdtrans.hxx
+++ b/svx/inc/svx/svdtrans.hxx
@@ -32,9 +32,7 @@
 #include <tools/poly.hxx>
 #include <tools/fract.hxx>
 
-#ifndef _MAPMOD_HXX //autogen
 #include <vcl/mapmod.hxx>
-#endif
 #include <tools/string.hxx>
 #include "svx/svxdllapi.h"
 
diff --git a/svx/inc/svx/svdundo.hxx b/svx/inc/svx/svdundo.hxx
index 5017f1e127..c56e08c10c 100644
--- a/svx/inc/svx/svdundo.hxx
+++ b/svx/inc/svx/svdundo.hxx
@@ -28,9 +28,7 @@
 #ifndef _SVDUNDO_HXX
 #define _SVDUNDO_HXX
 
-#ifndef _SOLAR_HRC
 #include <svl/solar.hrc>
-#endif
 #include <svl/undo.hxx>
 #include <tools/contnr.hxx>
 #include <tools/gen.hxx>
diff --git a/svx/inc/svx/svdxcgv.hxx b/svx/inc/svx/svdxcgv.hxx
index f93d72e68c..e2dd877b76 100644
--- a/svx/inc/svx/svdxcgv.hxx
+++ b/svx/inc/svx/svdxcgv.hxx
@@ -30,9 +30,7 @@
 
 #include <svx/svdedxv.hxx>
 
-#ifndef _GDIMTF_HXX //autogen
 #include <vcl/gdimtf.hxx>
-#endif
 #include "svx/svxdllapi.h"
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/svx/inc/svx/sxcaitm.hxx b/svx/inc/svx/sxcaitm.hxx
index 28221d57ba..ed7734fa3b 100644
--- a/svx/inc/svx/sxcaitm.hxx
+++ b/svx/inc/svx/sxcaitm.hxx
@@ -29,9 +29,7 @@
 
 #include <svx/svddef.hxx>
 
-#ifndef _SDRANGITM_HXX
 #include <svx/sdangitm.hxx>
-#endif
 #include <svx/sdooitm.hxx>
 
 //------------------------------------
diff --git a/svx/inc/svx/sxmbritm.hxx b/svx/inc/svx/sxmbritm.hxx
index f6765fc7f0..06af7e729e 100644
--- a/svx/inc/svx/sxmbritm.hxx
+++ b/svx/inc/svx/sxmbritm.hxx
@@ -29,9 +29,7 @@
 
 #include <svx/svddef.hxx>
 
-#ifndef SXMBRITM_HXX
 #include <svx/sdynitm.hxx>
-#endif
 
 // Die Masslinie unterhalb der Bezugskante
 // Zur Bemassung einer Objektunterkante
diff --git a/svx/inc/svx/sxreaitm.hxx b/svx/inc/svx/sxreaitm.hxx
index bf1c214557..bdca34b01a 100644
--- a/svx/inc/svx/sxreaitm.hxx
+++ b/svx/inc/svx/sxreaitm.hxx
@@ -29,9 +29,7 @@
 
 #include <svx/svddef.hxx>
 
-#ifndef _SXFIITM_HXX
 #include <svx/sxfiitm.hxx>
-#endif
 
 //------------------------------
 // class SdrResizeXAllItem
diff --git a/svx/inc/svx/sxreoitm.hxx b/svx/inc/svx/sxreoitm.hxx
index 6a70ba5cca..87a96197e1 100644
--- a/svx/inc/svx/sxreoitm.hxx
+++ b/svx/inc/svx/sxreoitm.hxx
@@ -29,9 +29,7 @@
 
 #include <svx/svddef.hxx>
 
-#ifndef _SXFIITM_HXX
 #include <svx/sxfiitm.hxx>
-#endif
 
 //------------------------------
 // class SdrResizeXOneItem
diff --git a/svx/inc/svx/sxsiitm.hxx b/svx/inc/svx/sxsiitm.hxx
index e984f38bb2..bda81abef9 100644
--- a/svx/inc/svx/sxsiitm.hxx
+++ b/svx/inc/svx/sxsiitm.hxx
@@ -27,9 +27,7 @@
 #ifndef _SXSIITM_HXX
 #define _SXSIITM_HXX
 
-#ifndef _SXFIITM_HXX
 #include <svx/sxfiitm.hxx>
-#endif
 
 class SdrScaleItem: public SdrFractionItem {
 public:
diff --git a/svx/inc/svx/tabarea.hxx b/svx/inc/svx/tabarea.hxx
index d6229320d3..480ef78129 100644
--- a/svx/inc/svx/tabarea.hxx
+++ b/svx/inc/svx/tabarea.hxx
@@ -30,12 +30,8 @@
 // include ---------------------------------------------------------------
 
 #include <svtools/valueset.hxx>
-#ifndef _IMAGEBTN_HXX //autogen
 #include <vcl/imagebtn.hxx>
-#endif
-#ifndef _FIXED_HXX //autogen
 #include <vcl/fixed.hxx>
-#endif
 #include <svx/dlgctrl.hxx>
 #include <svx/xsetit.hxx>
 #include <svx/xfillit0.hxx>
diff --git a/svx/inc/svx/tabline.hxx b/svx/inc/svx/tabline.hxx
index 8015939271..d81e65a648 100644
--- a/svx/inc/svx/tabline.hxx
+++ b/svx/inc/svx/tabline.hxx
@@ -29,12 +29,8 @@
 
 // include ---------------------------------------------------------------
 
-#ifndef _IMAGEBTN_HXX //autogen
 #include <vcl/imagebtn.hxx>
-#endif
-#ifndef _GROUP_HXX //autogen
 #include <vcl/group.hxx>
-#endif
 #include <svtools/stdctrl.hxx>
 #include <svx/svdpage.hxx>
 #include <svx/xlineit0.hxx>
diff --git a/svx/inc/svx/unopage.hxx b/svx/inc/svx/unopage.hxx
index b01c13b55a..2b62fd6053 100644
--- a/svx/inc/svx/unopage.hxx
+++ b/svx/inc/svx/unopage.hxx
@@ -36,9 +36,7 @@
 #include <com/sun/star/drawing/XShapeGrouper.hpp>
 #include <com/sun/star/drawing/XShapeCombiner.hpp>
 #include <com/sun/star/drawing/XShapeBinder.hpp>
-#ifndef _COM_SUN_STAR_UNO_XUNOTUNNEL_HPP_
 #include <com/sun/star/lang/XUnoTunnel.hpp>
-#endif
 #include <cppuhelper/weak.hxx>
 #include <cppuhelper/weakagg.hxx>
 #include <svl/lstner.hxx>
diff --git a/svx/inc/svx/viewlayoutitem.hxx b/svx/inc/svx/viewlayoutitem.hxx
index c0a793df80..6869a064fc 100644
--- a/svx/inc/svx/viewlayoutitem.hxx
+++ b/svx/inc/svx/viewlayoutitem.hxx
@@ -28,9 +28,7 @@
 #define _SVX_VIEWLAYOUTITEM_HXX
 
 #include <svl/intitem.hxx>
-#ifndef _SVX_SVXIDS_HRC
 #include <svx/svxids.hrc>
-#endif
 #include "svx/svxdllapi.h"
 
 //-------------------------------------------------------------------------
diff --git a/svx/inc/svx/xbitmap.hxx b/svx/inc/svx/xbitmap.hxx
index 187a0678d4..beb4ce29ee 100644
--- a/svx/inc/svx/xbitmap.hxx
+++ b/svx/inc/svx/xbitmap.hxx
@@ -29,9 +29,7 @@
 #define _SVX_XBITMAP_HXX
 
 #include <tools/color.hxx>
-#ifndef _BITMAP_HXX //autogen
 #include <vcl/bitmap.hxx>
-#endif
 #include <svtools/grfmgr.hxx>
 #include <svx/xenum.hxx>
 #include "svx/svxdllapi.h"
diff --git a/svx/inc/svx/xfillit.hxx b/svx/inc/svx/xfillit.hxx
index 3a35a0d6d8..ce6fb2624a 100644
--- a/svx/inc/svx/xfillit.hxx
+++ b/svx/inc/svx/xfillit.hxx
@@ -28,9 +28,7 @@
 #ifndef _SVX_FILLITEM_HXX
 #define _SVX_FILLITEM_HXX
 
-#ifndef _BITMAP_HXX //autogen
 #include <vcl/bitmap.hxx>
-#endif
 #include <svx/xcolit.hxx>
 #include <svx/xgrad.hxx>
 #include <svx/xhatch.hxx>
diff --git a/svx/inc/svx/xlndsit.hxx b/svx/inc/svx/xlndsit.hxx
index bb571dcd5a..7185808864 100644
--- a/svx/inc/svx/xlndsit.hxx
+++ b/svx/inc/svx/xlndsit.hxx
@@ -30,9 +30,7 @@
 
 #include <svx/xit.hxx>
 
-#ifndef _SVX_XLINIIT_HXX //autogen
 #include <svx/xdash.hxx>
-#endif
 #include "svx/svxdllapi.h"
 
 class SdrModel;
diff --git a/svx/inc/svx/xsetit.hxx b/svx/inc/svx/xsetit.hxx
index f40b9fa939..da68a579f9 100644
--- a/svx/inc/svx/xsetit.hxx
+++ b/svx/inc/svx/xsetit.hxx
@@ -28,9 +28,7 @@
 #ifndef _SVX_XSETITEM_HXX
 #define _SVX_XSETITEM_HXX
 
-#ifndef _XATTR_HXX
 #include <svx/xit.hxx>
-#endif
 #include <svl/metitem.hxx>
 #include <svl/eitem.hxx>
 #include <svx/rectenum.hxx>
diff --git a/svx/inc/svx/xtable.hxx b/svx/inc/svx/xtable.hxx
index 444d2cf984..d5c8b199f5 100644
--- a/svx/inc/svx/xtable.hxx
+++ b/svx/inc/svx/xtable.hxx
@@ -37,14 +37,10 @@
 #include <svx/xflasit.hxx>
 #include <svx/xlnasit.hxx>
 
-#ifndef _SV_COLOR_HXX
 #include <tools/color.hxx>
-#endif
 #include <tools/string.hxx>
 
-#ifndef _TABLE_HXX //autogen
 #include <tools/table.hxx>
-#endif
 #include "svx/svxdllapi.h"
 #include <basegfx/polygon/b2dpolypolygon.hxx>
 
diff --git a/svx/inc/svx/zoomitem.hxx b/svx/inc/svx/zoomitem.hxx
index ef335083aa..99e5bfda0b 100644
--- a/svx/inc/svx/zoomitem.hxx
+++ b/svx/inc/svx/zoomitem.hxx
@@ -28,9 +28,7 @@
 #define _SVX_ZOOMITEM_HXX
 
 #include <svl/intitem.hxx>
-#ifndef _SVX_SVXIDS_HRC
 #include <svx/svxids.hrc>
-#endif
 #include "svx/svxdllapi.h"
 
 //-------------------------------------------------------------------------
diff --git a/svx/inc/svx/zoomslideritem.hxx b/svx/inc/svx/zoomslideritem.hxx
index dddb6ec80c..ef6c5ccd97 100644
--- a/svx/inc/svx/zoomslideritem.hxx
+++ b/svx/inc/svx/zoomslideritem.hxx
@@ -28,9 +28,7 @@
 #define _SVX_ZOOMSLIDERITEM_HXX
 
 #include <svl/intitem.hxx>
-#ifndef _SVX_SVXIDS_HRC
 #include <svx/svxids.hrc>
-#endif
 #include <com/sun/star/uno/Sequence.hxx>
 #include "svx/svxdllapi.h"
 
diff --git a/svx/inc/txencbox.hxx b/svx/inc/txencbox.hxx
index a37cf0aad7..e37971cdd4 100644
--- a/svx/inc/txencbox.hxx
+++ b/svx/inc/txencbox.hxx
@@ -29,9 +29,7 @@
 
 // include ---------------------------------------------------------------
 
-#ifndef _LSTBOX_HXX //autogen
 #include <vcl/lstbox.hxx>
-#endif
 #include <rtl/textenc.h>
 #include "svx/svxdllapi.h"
 
diff --git a/svx/inc/txenctab.hxx b/svx/inc/txenctab.hxx
index a1d28b2695..3634af6122 100644
--- a/svx/inc/txenctab.hxx
+++ b/svx/inc/txenctab.hxx
@@ -29,9 +29,7 @@
 
 // include ---------------------------------------------------------------
 
-#ifndef _RESARY_HXX //autogen
 #include <tools/resary.hxx>
-#endif
 #include <rtl/textenc.h>
 #include "svx/svxdllapi.h"
 
diff --git a/svx/inc/uiks.hxx b/svx/inc/uiks.hxx
index 8fe1de39b2..210bfb475d 100644
--- a/svx/inc/uiks.hxx
+++ b/svx/inc/uiks.hxx
@@ -27,9 +27,7 @@
 #ifndef _SVX_UIKS_HXX
 #define _SVX_UIKS_HXX
 
-#ifndef _USR_UIKS_HXX
 #include <usr/uiks.hxx>
-#endif
 
 //	DBENGINE