Remove unused header guards and options

Change-Id: I391358363a9d30e089b249d894b7abea5a2d1434

19 files changed, 0 insertions, 412 deletions

diff --git a/basctl/source/basicide/baside3.cxx b/basctl/source/basicide/baside3.cxx
index 27637dfe9385..4faa668476a7 100644
--- a/basctl/source/basicide/baside3.cxx
+++ b/basctl/source/basicide/baside3.cxx
@@ -17,14 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#define _SDR_NOITEMS
-#define _SDR_NOTOUCH
-#define _SDR_NOTRANSFORM
-#define _SDR_NOOBJECTS
-#define _SDR_NOVIEWMARKER
-#define _SDR_NODRAGMETHODS
-#define _SDR_NOXOUTDEV
-
 #include "basidesh.hrc"
 #include "helpid.hrc"
 
diff --git a/basctl/source/basicide/basides1.cxx b/basctl/source/basicide/basides1.cxx
index 321560cd89f6..b0f886531897 100644
--- a/basctl/source/basicide/basides1.cxx
+++ b/basctl/source/basicide/basides1.cxx
@@ -19,12 +19,6 @@
 
 #define _SOLAR__PRIVATE 1
 
-#define SI_NOCONTROL
-#define SI_NOSBXCONTROLS
-#define SI_NOITEMS
-#define SI_NODRW
-#define _VCTRLS_HXX
-
 #include "basidesh.hrc"
 #include "helpid.hrc"
 
diff --git a/basctl/source/basicide/basides2.cxx b/basctl/source/basicide/basides2.cxx
index 93351df3fdf6..c4ce84e85b7e 100644
--- a/basctl/source/basicide/basides2.cxx
+++ b/basctl/source/basicide/basides2.cxx
@@ -19,9 +19,6 @@
 
 #include "docsignature.hxx"
 
-#define SI_NOCONTROL
-#define SI_NOSBXCONTROLS
-
 #include <basic/sbx.hxx>
 #include "basicrenderable.hxx"
 
diff --git a/basctl/source/basicide/basides3.cxx b/basctl/source/basicide/basides3.cxx
index 668cbc6541a0..61ef6bab4b8d 100644
--- a/basctl/source/basicide/basides3.cxx
+++ b/basctl/source/basicide/basides3.cxx
@@ -17,10 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-
-#define SI_NOCONTROL
-#define SI_NOSBXCONTROLS
-
 #include <basidesh.hrc>
 
 #define _SOLAR__PRIVATE 1
diff --git a/basctl/source/basicide/basidesh.cxx b/basctl/source/basicide/basidesh.cxx
index 23a166724245..8144b1718d01 100644
--- a/basctl/source/basicide/basidesh.cxx
+++ b/basctl/source/basicide/basidesh.cxx
@@ -19,13 +19,6 @@
 
 // CLOOKS:
 #define _SPIN_HXX
-#define _PRVWIN_HXX
-#define _DIALOGS_HXX
-#define _SVRTF_HXX
-#define _ISETBRW_HXX
-#define _VCTRLS_HXX
-#define SI_NOCONTROL
-#define SI_NOSBXCONTROLS
 
 #define _SOLAR__PRIVATE 1
 #include <tools/diagnose_ex.h>
diff --git a/basctl/source/basicide/bastype2.hxx b/basctl/source/basicide/bastype2.hxx
index bf60e2927438..5a3374d5a321 100644
--- a/basctl/source/basicide/bastype2.hxx
+++ b/basctl/source/basicide/bastype2.hxx
@@ -24,7 +24,6 @@
 #include <memory>
 #include "tools/solar.h"
 
-#define _SVICNVW_HXX
 #include <svtools/svtreebx.hxx>
 #include <svl/lstner.hxx>
 #include <basic/sbstar.hxx>
diff --git a/basctl/source/basicide/bastype3.cxx b/basctl/source/basicide/bastype3.cxx
index 9b1881632067..7ae2c5d61cd5 100644
--- a/basctl/source/basicide/bastype3.cxx
+++ b/basctl/source/basicide/bastype3.cxx
@@ -17,8 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#define _SI_NOSBXCONTROLS
-
 #include <basic/basmgr.hxx>
 #include <basic/sbmod.hxx>
 #include <basic/sbx.hxx>
diff --git a/basctl/source/inc/svheader.hxx b/basctl/source/inc/svheader.hxx
index 6becbabf0dcd..5851faa2a751 100644
--- a/basctl/source/inc/svheader.hxx
+++ b/basctl/source/inc/svheader.hxx
@@ -21,16 +21,11 @@
 
 
 // SV
-#define _COLDLG_HXX
 #define _CONFIG_HXX
 #define _CURSOR_HXX
-#define _FONTDLG_HXX
-#define _PRVWIN_HXX
-#define _VIRTDEV_HXX
 
 // SVTOOLS
 #define _CTRLBOX_HXX
-#define _EXTATTR_HXX
 #define _CTRLTOOL_HXX
 #define _CTRLBOX_HXX
 #define _STDMENU_HXX
@@ -39,11 +34,8 @@
 #define _SCRWIN_HXX
 
 // SFX
-#define _SFXAPPWIN_HXX
 #define _SFX_RESMGR_HXX
 #define _SFX_PRNMON_HXX
-#define _INTRO_HXX
-#define _SFXMSGDESCR_HXX
 #define _SFXMSGPOOL_HXX
 #define _SFXMNUMGR_HXX
 
@@ -57,13 +49,6 @@
 #define _SFX_TEMPLDLG_HXX
 #define _SFXNEW_HXX
 
-// SFXDOC
-#define _SFX_IPFRM_HXX
-#define _SFX_INTERNO_HXX
-
-// SVCONTNR
-#define _SVICNVW_HXX
-
 #define _SBSTDOBJ1_HXX
 #define _SBXMSTRM_HXX
 
diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx
index 80880f172a58..2bb0d73024d6 100644
--- a/cui/source/tabpages/tpbitmap.cxx
+++ b/cui/source/tabpages/tpbitmap.cxx
@@ -26,17 +26,6 @@
  *
  ************************************************************************/
 
-//svdraw.hxx
-#define _SVDRAW_HXX
-#define _SDR_NOITEMS
-#define _SDR_NOTOUCH
-#define _SDR_NOTRANSFORM
-#define _SDR_NOOBJECTS
-#define _SDR_NOVIEWS
-#define _SDR_NOVIEWMARKER
-#define _SDR_NODRAGMETHODS
-#define _SDR_NOUNDO
-#define _SDR_NOXOUTDEV
 #include <vcl/wrkwin.hxx>
 #include <tools/shl.hxx>
 #include <vcl/msgbox.hxx>
diff --git a/sc/source/ui/drawfunc/futext2.cxx b/sc/source/ui/drawfunc/futext2.cxx
index 6db790748309..b7994fb5c4c4 100644
--- a/sc/source/ui/drawfunc/futext2.cxx
+++ b/sc/source/ui/drawfunc/futext2.cxx
@@ -17,21 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-
-
-
-//------------------------------------------------------------------------
-
 // TOOLS
 #define _BIGINT_HXX
-#define _SFXMULTISEL_HXX
-#define _STACK_HXX
-#define _QUEUE_HXX
-#define _DYNARR_HXX
-#define _TREELIST_HXX
 #define _CACHESTR_HXX
-#define _NEW_HXX
-#define _DYNARY_HXX
 #define _SVMEMPOOL_HXX
 #define _CACHESTR_HXX
 #define _SV_MULTISEL_HXX
@@ -39,14 +27,9 @@
 //SV
 #define _CONFIG_HXX
 #define _CURSOR_HXX
-#define _FONTDLG_HXX
-#define _PRVWIN_HXX
 #define _HELP_HXX
-#define _MDIWIN_HXX
 #define _SPIN_HXX
 #define _STATUS_HXX
-#define _SVTCTRL3_HXX
-#define _COLDLG_HXX
 #define _SOUND_HXX
 
 //svtools
@@ -54,55 +37,33 @@
 #define _RULER_HXX
 #define _STDMENU_HXX
 #define _CTRLTOOL_HXX
-#define _EXTATTR_HXX
-#define _FRM3D_HXX
-#define _EXTATTR_HXX
 
 //SVTOOLS
 #define _FILTER_HXX
-#define _SVICNVW_HXX
 #define _SVTABBX_HXX
 
 //sfxcore.hxx
 #define _SFXGENLINK_HXX
 #define _SFXHINTPOST_HXX
 #define _SFXDOCINF_HXX
-#define _SFXLINKHDL_HXX
-
-//sfxsh.hxx
-#define _SFXMACRO_HXX
 
 // SFX
-#define _SFX_SAVEOPT_HXX
-#define _SFXPRNMON_HXX
-#define _INTRO_HXX
-#define _SFXMSGDESCR_HXX
 #define _SFXMSGPOOL_HXX
-#define _SFXFILEDLG_HXX
 #define _PASSWD_HXX
 #define _SFXTBXCTRL_HXX
 #define _SFXSTBITEM_HXX
 #define _SFXMNUITEM_HXX
 #define _SFXIMGMGR_HXX
-#define _SFXTBXMGR_HXX
-#define _SFXSTBMGR_HXX
 #define _SFX_MINFITEM_HXX
 #define _SFXEVENT_HXX
 
-//sfxdoc.hxx
-#define _SFX_DOCFILT_HXX
-#define _SFX_IPFRM_HXX
-
 //sfxdlg.hxx
 #define _SFX_DINFDLG_HXX
-#define _SFXDINFEDT_HXX
 #define _SFX_MGETEMPL_HXX
 #define _SFX_TPLPITEM_HXX
 #define _NEWSTYLE_HXX
-#define _SFXDOCMAN_HXX
 
 //sfxitems.hxx
-#define _SFX_WHMAP_HXX
 #define _SFXFLAGITEM_HXX
 #define _SFXPTITEM_HXX
 #define _SFXRECTITEM_HXX
@@ -111,22 +72,6 @@
 #define _SFXPOOLCACH_HXX
 #define _SFXRNGITEM_HXX
 
-//svdraw.hxx
-#define _SDR_NOITEMS
-#define _SDR_NOTOUCH
-#define _SDR_NOTRANSFORM
-
-#define _SI_NOSBXCONTROLS
-#define _VCATTR_HXX
-#define _VCONT_HXX
-#define _SI_NOOTHERFORMS
-#define _VCTRLS_HXX
-#define _SI_NOCONTROL
-#define _SETBRW_HXX
-#define _VCBRW_HXX
-#define _SI_NOSBXCONTROLS
-#define _SIDLL_HXX
-
 //------------------------------------------------------------------------
 
 #include <svx/svdmodel.hxx>
diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx
index ca84b2bf0ae5..52d339007ada 100644
--- a/sc/source/ui/view/cellsh1.cxx
+++ b/sc/source/ui/view/cellsh1.cxx
@@ -28,22 +28,6 @@
 
 #include <iostream>
 
-//------------------------------------------------------------------
-
-//svdraw.hxx
-#define _SDR_NOITEMS
-#define _SDR_NOTOUCH
-#define _SDR_NOTRANSFORM
-#define _SI_NOSBXCONTROLS
-#define _VCONT_HXX
-#define _SI_NOOTHERFORMS
-#define _VCTRLS_HXX
-#define _SI_NOCONTROL
-#define _SETBRW_HXX
-#define _VCBRW_HXX
-#define _SI_NOSBXCONTROLS
-
-//------------------------------------------------------------------
 #include <com/sun/star/i18n/TextConversionOption.hpp>
 #include <com/sun/star/sheet/DataPilotFieldFilter.hpp>
 
diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx
index 97b5b0f8524e..8e8a65719687 100644
--- a/sc/source/ui/view/formatsh.cxx
+++ b/sc/source/ui/view/formatsh.cxx
@@ -30,23 +30,6 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
 
-//------------------------------------------------------------------
-
-//svdraw.hxx
-#define _SDR_NOITEMS
-#define _SDR_NOTOUCH
-#define _SDR_NOTRANSFORM
-#define _SI_NOSBXCONTROLS
-#define _VCONT_HXX
-#define _SI_NOOTHERFORMS
-#define _VCTRLS_HXX
-#define _SI_NOCONTROL
-#define _SETBRW_HXX
-#define _VCBRW_HXX
-#define _SI_NOSBXCONTROLS
-
-//------------------------------------------------------------------
-
 #include "scitems.hxx"
 #include <editeng/eeitem.hxx>
 
diff --git a/sc/source/ui/view/olkact.cxx b/sc/source/ui/view/olkact.cxx
index 8dd68c42b267..071d8de31eba 100644
--- a/sc/source/ui/view/olkact.cxx
+++ b/sc/source/ui/view/olkact.cxx
@@ -22,87 +22,43 @@
 #define _CONFIG_HXX
 #define _CURSOR_HXX
 #define _CTRLTOOL_HXX
-#define _DLGCFG_HXX
-#define _DYNARR_HXX
-#define _EXTATTR_HXX
-#define _FILDLG_HXX
-#define _FONTDLG_HXX
-#define _FRM3D_HXX
-#define _INTRO_HXX
-#define _ISETBWR_HXX
-#define _NO_SVRTF_PARSER_HXX
 #define _MACRODLG_HXX
-#define _MODALDLG_HXX
-#define _MOREBUTTON_HXX
 #define _OUTLINER_HXX
 #define _PASSWD_HXX
 #define _PRNDLG_HXX
-#define _PVRWIN_HXX
-#define _QUEUE_HXX
 #define _RULER_HXX
 #define _SCRWIN_HXX
-#define _SETBRW_HXX
-#define _STACK_HXX
 #define _STDMENU_HXX
 #define _TABBAR_HXX
-#define _VCTRLS_HXX
-#define _VCONT_HXX
-#define _VDRWOBJ_HXX
-
 
 //sfx
-#define _SFXAPPWIN_HXX
 #define _SFXCTRLITEM
 #define _SFXDISPATCH_HXX
-#define _SFXFILEDLG_HXX
 #define _SFXIMGMGR_HXX
-#define _SFXIPFRM_HXX
-#define _SFX_MACRO_HXX
-#define _SFXMULTISEL_HXX
 #define _SFX_MINFITEM_HXX
 
-
 //sfxcore.hxx
 #define _SFXGENLINK_HXX
 #define _SFXHINTPOST_HXX
 #define _SFXDOCINF_HXX
-#define _SFXLINKHDL_HXX
-
-//sfxsh.hxx
-#define _SFXMACRO_HXX
 
 // SFX
-#define _SFX_SAVEOPT_HXX
-#define _SFXPRNMON_HXX
-#define _INTRO_HXX
-#define _SFXMSGDESCR_HXX
 #define _SFXMSGPOOL_HXX
-#define _SFXFILEDLG_HXX
 #define _PASSWD_HXX
 #define _SFXTBXCTRL_HXX
 #define _SFXSTBITEM_HXX
 #define _SFXMNUITEM_HXX
 #define _SFXIMGMGR_HXX
-#define _SFXTBXMGR_HXX
-#define _SFXSTBMGR_HXX
 #define _SFX_MINFITEM_HXX
 #define _SFXEVENT_HXX
 
-//sfxdoc.hxx
-#define _SFX_DOCFILT_HXX
-#define _SFX_IPFRM_HXX
-
 //sfxdlg.hxx
 #define _SFX_DINFDLG_HXX
-#define _SFXDINFEDT_HXX
 #define _SFX_MGETEMPL_HXX
 #define _SFX_TPLPITEM_HXX
 #define _NEWSTYLE_HXX
-#define _SFXDOCMAN_HXX
 
 //sfxitems.hxx
-#define _SFX_WHMAP_HXX
-#define _ARGS_HXX
 #define _SFXFLAGITEM_HXX
 #define _SFXPTITEM_HXX
 #define _SFXRECTITEM_HXX
@@ -111,56 +67,28 @@
 #define _SFXPOOLCACH_HXX
 #define _SFXRNGITEM_HXX
 
-//svdraw.hxx
-#define _SDR_NOITEMS
-#define _SDR_NOTOUCH
-#define _SDR_NOTRANSFORM
-
 #define _SFXBASIC_HXX
-#define _SFX_DOCFILE_HXX
-#define _SFX_DOCFILT_HXX
-#define _SFX_DOCINF_HXX
-#define _SFX_DOCSH_HXX
 #define _SFX_TEMPLDLG_HXX
-#define _SFXSTBMGR_HXX
-#define _SFXTBXMGR_HXX
 #define _SFXIMGMGR_HXX
 #define _SFXMNUITEM_HXX
 #define _SFXMNUMGR_HXX
 #define _SFXSTBITEM_HXX
 #define _SFXTBXCTRL_HXX
-#define _SFXFILEDLG_HXX
 #define _SFXREQUEST_HXX
 #define _SFXOBJFACE_HXX
 #define _SFXMSGPOOL_HXX
-#define _SFXMSGDESCR_HXX
 #define _SFXMSG_HXX
 #define _SFX_PRNMON_HXX
 
-//si
-#define _SI_NOSBXCONTROLS
-#define _SI_NOCONTROL
-#define _SIDLL_HXX
-
-#define _SVDXOUT_HXX
-#define _SVDEC_HXX
-#define _SVINCVW_HXX
-#define _SVRTV_HXX
 #define _SVTABBX_HXX
 
-#define _SVX_DAILDLL_HXX
 #define _SVX_HYPHEN_HXX
-#define _SVX_IMPGRF_HXX
-#define _SVX_OPTITEMS_HXX
-#define _SVX_OPTGERL_HXX
 #define _SVX_OPTSAVE_HXX
-#define _SVX_OPTSPELL_HXX
 #define _SVX_OPTPATH_HXX
 #define _SVX_OPTLINGU_HXX
 #define _SVX_RULER_HXX
 #define _SVX_RULRITEM_HXX
 #define _SVX_SPLWRAP_HXX
-#define _SVX_SPLDLG_HXX
 #define _SVX_THESDLG_HXX
 
 #include <sfx2/childwin.hxx>
diff --git a/sc/source/ui/view/prevwsh2.cxx b/sc/source/ui/view/prevwsh2.cxx
index 9c1e0b1aa4ac..5415847eb1d7 100644
--- a/sc/source/ui/view/prevwsh2.cxx
+++ b/sc/source/ui/view/prevwsh2.cxx
@@ -26,33 +26,17 @@
  *
  ************************************************************************/
 
-
-
-
-//------------------------------------------------------------------
-
 // TOOLS
 #define _BIGINT_HXX
-#define _SFXMULTISEL_HXX
-#define _STACK_HXX
-#define _QUEUE_HXX
-#define _DYNARR_HXX
-#define _TREELIST_HXX
 #define _CACHESTR_HXX
-#define _NEW_HXX
-#define _DYNARY_HXX
 #define _SVMEMPOOL_HXX
 #define _CACHESTR_HXX
 
 //SV
 #define _CONFIG_HXX
 #define _CURSOR_HXX
-#define _FONTDLG_HXX
-#define _PRVWIN_HXX
 #define _HELP_HXX
-#define _MDIWIN_HXX
 #define _SPIN_HXX
-#define _COLDLG_HXX
 #define _SOUND_HXX
 
 //svtools
@@ -60,56 +44,34 @@
 #define _RULER_HXX
 #define _STDMENU_HXX
 #define _CTRLTOOL_HXX
-#define _EXTATTR_HXX
-#define _FRM3D_HXX
-#define _EXTATTR_HXX
 
 //SVTOOLS
 #define _FILTER_HXX
-#define _SVICNVW_HXX
 #define _SVTABBX_HXX
 
 //sfxcore.hxx
 #define _SFXGENLINK_HXX
 #define _SFXHINTPOST_HXX
 #define _SFXDOCINF_HXX
-#define _SFXLINKHDL_HXX
-
-//sfxsh.hxx
-#define _SFXMACRO_HXX
 
 // SFX
-#define _SFX_SAVEOPT_HXX
-#define _SFXPRNMON_HXX
-#define _INTRO_HXX
-#define _SFXMSGDESCR_HXX
 #define _SFXMSGPOOL_HXX
-#define _SFXFILEDLG_HXX
 #define _PASSWD_HXX
 #define _SFXTBXCTRL_HXX
 #define _SFXSTBITEM_HXX
 #define _SFXMNUITEM_HXX
 #define _SFXIMGMGR_HXX
-#define _SFXTBXMGR_HXX
-#define _SFXSTBMGR_HXX
 #define _SFX_MINFITEM_HXX
 #define _SFXEVENT_HXX
 
-//sfxdoc.hxx
-#define _SFX_DOCFILT_HXX
-#define _SFX_IPFRM_HXX
-
 //sfxdlg.hxx
 #define _SFX_DINFDLG_HXX
-#define _SFXDINFEDT_HXX
 #define _SFX_MGETEMPL_HXX
 #define _SFX_TPLPITEM_HXX
 #define _NEWSTYLE_HXX
-#define _SFXDOCMAN_HXX
 #define _SFXDOCKWIN_HXX
 
 //sfxitems.hxx
-#define _SFX_WHMAP_HXX
 #define _SFXFLAGITEM_HXX
 #define _SFXPTITEM_HXX
 #define _SFXRECTITEM_HXX
@@ -118,39 +80,13 @@
 #define _SFXPOOLCACH_HXX
 #define _SFXRNGITEM_HXX
 
-//svdraw.hxx
-#define _SDR_NOITEMS
-#define _SDR_NOTOUCH
-#define _SDR_NOTRANSFORM
-#define _SDR_NOTRANSFORM
-#define _SDR_NOVIEWMARKER
-#define _SDR_NODRAGMETHODS
-#define _SDR_NOUNDO
-#define _SDR_NOXOUTDEV
-
-
-#define _SI_NOSBXCONTROLS
-#define _VCONT_HXX
-#define _SI_NOOTHERFORMS
-#define _VCTRLS_HXX
-#define _SI_NOCONTROL
-#define _SETBRW_HXX
-#define _VCBRW_HXX
-#define _SI_NOSBXCONTROLS
-
-#define _SVX_DAILDLL_HXX
 #define _SVX_HYPHEN_HXX
-#define _SVX_IMPGRF_HXX
-#define _SVX_OPTITEMS_HXX
-#define _SVX_OPTGERL_HXX
 #define _SVX_OPTSAVE_HXX
-#define _SVX_OPTSPELL_HXX
 #define _SVX_OPTPATH_HXX
 #define _SVX_OPTLINGU_HXX
 #define _SVX_RULER_HXX
 #define _SVX_RULRITEM_HXX
 #define _SVX_SPLWRAP_HXX
-#define _SVX_SPLDLG_HXX
 #define _SVX_THESDLG_HXX
 
 #include <svx/svdmodel.hxx>
diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx
index 73c0b4490661..97701fbc2666 100644
--- a/sc/source/ui/view/tabview.cxx
+++ b/sc/source/ui/view/tabview.cxx
@@ -34,66 +34,10 @@
 // Die u.a. Aenderungen nehmen vorgeschlagene Konstante vorweg
 ///////////////////////////////////////////////////////////////////////////
 
-// Dieses define entfernt die VCControls aus SI.HXX
-
-#define _SI_HXX                 // VCControls
-
 ////////////////////// Umsetzen der Standard-Defines //////////////////////
 
 #define _SVDPAGE_HXX        // SdrPage
 
-#ifdef _SDR_NOSURROGATEOBJ
-    #undef _SDR_NOSURROGATEOBJ
-    #define _SVDSURO_HXX
-#endif
-
-#ifdef _SDR_NOPAGEOBJ
-    #undef _SDR_NOPAGEOBJ
-    #define _SVDOPAGE_HXX
-#endif
-
-#ifdef _SDR_NOVIRTOBJ
-    #undef _SDR_NOVIRTOBJ
-    #define _SVDOVIRT_HXX
-#endif
-
-#ifdef _SDR_NOGROUPOBJ
-    #undef _SDR_NOGROUPOBJ
-    #define _SVDOGRP_HXX
-#endif
-
-#ifdef _SDR_NOTEXTOBJ
-    #undef _SDR_NOTEXTOBJ
-    #define _SVDOTEXT_HXX
-#endif
-
-#ifdef _SDR_NOPATHOBJ
-    #undef _SDR_NOPATHOBJ
-    #define _SVDOPATH_HXX
-#endif
-
-#ifdef _SDR_NOEDGEOBJ
-    #undef _SDR_NOEDGEOBJ
-    #define _SVDOEDGE_HXX
-#endif
-
-#ifdef _SDR_NORECTOBJ
-    #undef _SDR_NORECTOBJ
-    #define _SVDORECT_HXX
-#else
-    #undef _SDVOTEXT_OBJ
-#endif
-
-#ifdef _SDR_NOCAPTIONOBJ
-    #undef _SDR_NOCAPTIONOBJ
-    #define _SVDCAPT_HXX
-#endif
-
-#ifdef _SDR_NOCIRCLEOBJ
-    #undef _SDR_NOCIRCLEOBJ
-    #define _SVDOCIRC_HXX
-#endif
-
 #ifdef _SDR_NOGRAFOBJ
     #undef _SDR_NOGRAFOBJ
     #define _SVDOGRAF_HXX
diff --git a/sc/source/ui/view/viewfun3.cxx b/sc/source/ui/view/viewfun3.cxx
index e6b558d1d8d4..ae057a75525b 100644
--- a/sc/source/ui/view/viewfun3.cxx
+++ b/sc/source/ui/view/viewfun3.cxx
@@ -26,100 +26,48 @@
  *
  ************************************************************************/
 
-#define _SV_NOXSOUND
-
-#define _BASE_DLGS_HXX
 #define _BIGINT_HXX
 #define _CACHESTR_HXX
 #define _CONFIG_HXX
 #define _CURSOR_HXX
 #define _CTRLTOOL_HXX
-#define _DLGCFG_HXX
-#define _DYNARR_HXX
-#define _EXTATTR_HXX
-#define _FILDLG_HXX
-#define _FONTDLG_HXX
-#define _FRM3D_HXX
-#define _INTRO_HXX
-#define _ISETBWR_HXX
-#define _NO_SVRTF_PARSER_HXX
 #define _MACRODLG_HXX
-#define _MODALDLG_HXX
-#define _MOREBUTTON_HXX
 #define _OUTLINER_HXX
-#define _PVRWIN_HXX
 #define _RULER_HXX
 #define _SCRWIN_HXX
-#define _SETBRW_HXX
 #define _STDCTRL_HXX
 #define _STDMENU_HXX
 #define _TABBAR_HXX
-#define _TREELIST_HXX
 #define _VALUESET_HXX
-#define _VCATTR_HXX
-#define _VCBRW_HXX
-#define _VCTRLS_HXX
-#define _VCSBX_HXX
-#define _VCONT_HXX
-#define _VDRWOBJ_HXX
 
 #define _PASSWD_HXX
 
-#define _SFX_DOCFILE_HXX
-#define _SFX_DOCINF_HXX
-#define _SFX_DOCSH_HXX
 #define _SFX_PRNMON_HXX
 #define _SFX_RESMGR_HXX
 #define _SFX_TEMPLDLG_HXX
 #define _SFXBASIC_HXX
 #define _SFXCTRLITEM
-#define _SFXDLGCFG_HXX
-#define _SFXFILEDLG_HXX
-#define _SFXIPFRM_HXX
-#define _SFX_MACRO_HXX
 #define _SFXMNUITEM_HXX
 #define _SFXMNUMGR_HXX
-#define _SFXMULTISEL_HXX
-#define _SFXMSGDESCR_HXX
 #define _SFXMSGPOOL_HXX
 #define _SFX_MINFITEM_HXX
 #define _SFXOBJFACE_HXX
-#define _SFXOBJFAC_HXX
-#define _SFX_SAVEOPT_HXX
 #define _SFXSTBITEM_HXX
-#define _SFXSTBMGR_HXX
 #define _SFXTBXCTRL_HXX
-#define _SFXTBXMGR_HXX
-
-#define _SI_HXX
-
-#define _SVBOXITM_HXX
-#define _SVCONTNR_HXX     //
-
-#define _SDR_NOTRANSFORM
 
-#define _SVDRAG_HXX
-#define _SVINCVW_HXX
-#define _SVRTV_HXX
 #define _SVTABBX_HXX
 #define _SVTREEBOX_HXX
 #define _SVTREELIST_HXX
 
-#define _SVX_DAILDLL_HXX
 #define _SVX_HYPHEN_HXX
-#define _SVX_IMPGRF_HXX
 #define _SVX_LAYCTRL_HXX
-#define _SVX_OPTITEMS_HXX
-#define _SVX_OPTGERL_HXX
 #define _SVX_OPTSAVE_HXX
-#define _SVX_OPTSPELL_HXX
 #define _SVX_OPTPATH_HXX
 #define _SVX_OPTLINGU_HXX
 #define _SVX_RULER_HXX
 #define _SVX_RULRITEM_HXX
 #define _SVX_SELCTRL_HXX
 #define _SVX_SPLWRAP_HXX
-#define _SVX_SPLDLG_HXX
 #define _SVX_STDDLG_HXX
 #define _SVX_THESDLG_HXX
 
diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx
index 7801da526471..c40332cfad0f 100644
--- a/sd/source/core/stlpool.cxx
+++ b/sd/source/core/stlpool.cxx
@@ -60,9 +60,6 @@
 #include <editeng/adjitem.hxx>
 #include <svl/itempool.hxx>
 
-#define _SDR_POSITIVE
-#define _SDR_ITEMS
-
 #include "stlpool.hxx"
 #include "sdresid.hxx"
 #include "stlsheet.hxx"
diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx
index 50486b8650bf..3d1df1bf1cf5 100644
--- a/svx/source/dialog/_contdlg.cxx
+++ b/svx/source/dialog/_contdlg.cxx
@@ -38,16 +38,6 @@
 #include <unotools/localedatawrapper.hxx>
 #include <comphelper/processfactory.hxx>
 
-#define _SDR_NOITEMS
-#define _SDR_NOTOUCH
-#define _SDR_NOTRANSFORM
-#define _SDR_NOOBJECTS
-#define _SDR_NOVIEWMARKER
-#define _SDR_NODRAGMETHODS
-#define _SDR_NOUNDO
-#define _SDR_NOXOUTDEV
-#define _XOUTBMP_STATICS_ONLY
-
 #include <svx/dialmgr.hxx>
 #include "svx/xoutbmp.hxx"
 #include <svx/dialogs.hrc>
diff --git a/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx
index 643fe62d20ae..9b32a300907f 100644
--- a/svx/source/dialog/imapdlg.cxx
+++ b/svx/source/dialog/imapdlg.cxx
@@ -26,16 +26,6 @@
  *
  ************************************************************************/
 
-
-#define _SDR_NOITEMS
-#define _SDR_NOTOUCH
-#define _SDR_NOTRANSFORM
-#define _SDR_NOOBJECTS
-#define _SDR_NOVIEWMARKER
-#define _SDR_NODRAGMETHODS
-#define _SDR_NOUNDO
-#define _SDR_NOXOUTDEV
-
 #include <stdlib.h>
 #include <tools/shl.hxx>
 #include <tools/errinf.hxx>