Remove include guards

Change-Id: Ib4ba76d0083e5bd75cc589a55318089c004f591f

57 files changed, 22 insertions, 280 deletions

diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx b/chart2/source/controller/dialogs/DataBrowser.cxx
index 0c38dc020f05..ddba9b1f8cfa 100644
--- a/chart2/source/controller/dialogs/DataBrowser.cxx
+++ b/chart2/source/controller/dialogs/DataBrowser.cxx
@@ -26,11 +26,8 @@
  *
  ************************************************************************/
 
-
 // header for class SvNumberformat
-#ifndef _ZFORMAT_HXX
 #include <svl/zformat.hxx>
-#endif
 // header for SvNumberFormatter
 #include <svl/zforlist.hxx>
 
diff --git a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
index b4f5906ac4b0..44e7348aeb37 100644
--- a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
+++ b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
@@ -26,10 +26,7 @@
  *
  ************************************************************************/
 
-#ifndef _ZFORLIST_HXX
 #include <svl/zforlist.hxx>
-#endif
-
 #include "dlg_ObjectProperties.hxx"
 #include "ResourceIds.hrc"
 #include "Strings.hrc"
diff --git a/chart2/source/controller/dialogs/res_Titles.cxx b/chart2/source/controller/dialogs/res_Titles.cxx
index 0fc7f39c366a..e2845b7566ab 100644
--- a/chart2/source/controller/dialogs/res_Titles.cxx
+++ b/chart2/source/controller/dialogs/res_Titles.cxx
@@ -22,10 +22,7 @@
 #include "res_Titles.hrc"
 #include "ResId.hxx"
 #include "TitleDialogData.hxx"
-
- #ifndef _SVT_CONTROLDIMS_HRC_
- #include <svtools/controldims.hrc>
- #endif
+#include <svtools/controldims.hrc>
 
 //.............................................................................
 namespace chart
diff --git a/chart2/source/controller/dialogs/tp_AxisPositions.cxx b/chart2/source/controller/dialogs/tp_AxisPositions.cxx
index 41fb85f3fea5..59d06f635e14 100644
--- a/chart2/source/controller/dialogs/tp_AxisPositions.cxx
+++ b/chart2/source/controller/dialogs/tp_AxisPositions.cxx
@@ -48,9 +48,7 @@
 #include <vcl/msgbox.hxx>
 
 // header for class SvNumberformat
-#ifndef _ZFORMAT_HXX
 #include <svl/zformat.hxx>
-#endif
 
 #include <svtools/controldims.hrc>
 
diff --git a/chart2/source/controller/dialogs/tp_Scale.cxx b/chart2/source/controller/dialogs/tp_Scale.cxx
index 7bcdb925f2ed..e198a68678d4 100644
--- a/chart2/source/controller/dialogs/tp_Scale.cxx
+++ b/chart2/source/controller/dialogs/tp_Scale.cxx
@@ -48,9 +48,7 @@
 #include <vcl/msgbox.hxx>
 
 // header for class SvNumberformat
-#ifndef _ZFORMAT_HXX
 #include <svl/zformat.hxx>
-#endif
 
 #include <svtools/controldims.hrc>
 
diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx
index 05e9133f3b09..2a3490a7a609 100644
--- a/cui/source/tabpages/tpline.cxx
+++ b/cui/source/tabpages/tpline.cxx
@@ -26,9 +26,7 @@
  *
  ************************************************************************/
 
-#ifndef _SVX_SIZEITEM_HXX //autogen
 #include <editeng/sizeitem.hxx>
-#endif
 #include <tools/shl.hxx>
 #include <tools/urlobj.hxx>
 #include <sfx2/app.hxx>
diff --git a/filter/source/svg/svgdialog.cxx b/filter/source/svg/svgdialog.cxx
index 342466ce3e8b..98717ccbab9c 100644
--- a/filter/source/svg/svgdialog.cxx
+++ b/filter/source/svg/svgdialog.cxx
@@ -34,15 +34,9 @@
 #include <vcl/svapp.hxx>
 #include <vcl/dialog.hxx>
 
-#ifndef _COM_SUN_STAR_VIEW_XRENDERABLE_HPP_
 #include <com/sun/star/view/XRenderable.hpp>
-#endif
-#ifndef _COM_SUN_STAR_FRAME_XCONTROLLER_HPP_
 #include <com/sun/star/frame/XController.hpp>
-#endif
-#ifndef _COM_SUN_STAR_VIEW_XSELECTIONSUPPLIER_HPP_
 #include <com/sun/star/view/XSelectionSupplier.hpp>
-#endif
 
 #define SVG_DIALOG_SERVICE_NAME         "com.sun.star.comp.Draw.SVGFilterDialog"
 #define SVG_DIALOG_IMPLEMENTATION_NAME  SVG_DIALOG_SERVICE_NAME
diff --git a/filter/source/xmlfilteradaptor/genericfilter.cxx b/filter/source/xmlfilteradaptor/genericfilter.cxx
index 3e73b3a9545f..5f9fe9e939fe 100644
--- a/filter/source/xmlfilteradaptor/genericfilter.cxx
+++ b/filter/source/xmlfilteradaptor/genericfilter.cxx
@@ -30,11 +30,7 @@
 #include <osl/mutex.hxx>
 #include <osl/thread.h>
 #include <cppuhelper/factory.hxx>
-
-#ifndef _COM_SUN_STAR_LANG_XSINGLESERVICEFACTORY_HPP_
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>
-#endif
-
 #include "XmlFilterAdaptor.hxx"
 
 using namespace ::rtl;
diff --git a/filter/source/xmlfilterdetect/fdcomp.cxx b/filter/source/xmlfilterdetect/fdcomp.cxx
index 7be124eda3dd..a031a33488a5 100644
--- a/filter/source/xmlfilterdetect/fdcomp.cxx
+++ b/filter/source/xmlfilterdetect/fdcomp.cxx
@@ -27,15 +27,10 @@
  ************************************************************************/
 
 #include <stdio.h>
-
 #include <osl/mutex.hxx>
 #include <osl/thread.h>
 #include <cppuhelper/factory.hxx>
-
-#ifndef _COM_SUN_STAR_LANG_XSINGLESERVICEFACTORY_HPP_
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>
-#endif
-
 #include "filterdetect.hxx"
 
 using namespace ::rtl;
diff --git a/forms/source/richtext/richtextvclcontrol.cxx b/forms/source/richtext/richtextvclcontrol.cxx
index c8e4fd72ae75..043aeff2456c 100644
--- a/forms/source/richtext/richtextvclcontrol.cxx
+++ b/forms/source/richtext/richtextvclcontrol.cxx
@@ -32,18 +32,10 @@
 #include <svl/itemset.hxx>
 #include <svl/languageoptions.hxx>
 #if OSL_DEBUG_LEVEL > 0
-    #ifndef _UNTOOLS_UCBSTREAMHELPER_HXX
     #include <unotools/ucbstreamhelper.hxx>
-    #endif
-    #ifndef _SV_MSGBOX_HXX
     #include <vcl/msgbox.hxx>
-    #endif
-    #ifndef _FILEDLGHELPER_HXX
     #include <sfx2/filedlghelper.hxx>
-    #endif
-    #ifndef _URLOBJ_HXX
     #include <tools/urlobj.hxx>
-    #endif
     #include "com/sun/star/ui/dialogs/TemplateDescription.hpp"
 #endif
 #include <editeng/scripttypeitem.hxx>
diff --git a/fpicker/source/win32/filepicker/workbench/Test_fps.cxx b/fpicker/source/win32/filepicker/workbench/Test_fps.cxx
index e3683641e69c..07b2003eef77 100644
--- a/fpicker/source/win32/filepicker/workbench/Test_fps.cxx
+++ b/fpicker/source/win32/filepicker/workbench/Test_fps.cxx
@@ -39,10 +39,7 @@
 //  other includes
 //_________________________________________________________________________________________________________________________
 #include <cppuhelper/servicefactory.hxx>
-
-#ifndef _RTL_USTRING_
 #include <rtl/ustring.hxx>
-#endif
 #include <sal/types.h>
 #include <osl/diagnose.h>
 #include <com/sun/star/ui/dialogs/XFilePicker.hpp>
diff --git a/fpicker/source/win32/folderpicker/workbench/Test_fops.cxx b/fpicker/source/win32/folderpicker/workbench/Test_fops.cxx
index 0c14a93472fa..859c8121ec25 100644
--- a/fpicker/source/win32/folderpicker/workbench/Test_fops.cxx
+++ b/fpicker/source/win32/folderpicker/workbench/Test_fops.cxx
@@ -40,9 +40,7 @@
 //--------------------------------------------------------------
 #include <cppuhelper/servicefactory.hxx>
 
-#ifndef _RTL_USTRING_
 #include <rtl/ustring.hxx>
-#endif
 #include <sal/types.h>
 #include <osl/diagnose.h>
 
diff --git a/framework/source/fwe/xml/toolboxlayoutdocumenthandler.cxx b/framework/source/fwe/xml/toolboxlayoutdocumenthandler.cxx
index 44c081229c25..a5702dab8833 100644
--- a/framework/source/fwe/xml/toolboxlayoutdocumenthandler.cxx
+++ b/framework/source/fwe/xml/toolboxlayoutdocumenthandler.cxx
@@ -33,9 +33,7 @@
 //  interface includes
 //_________________________________________________________________________________________________________________
 
-#ifndef __COM_SUN_STAR_XML_SAX_XEXTENDEDDOCUMENTHANDLER_HPP_
 #include <com/sun/star/xml/sax/XExtendedDocumentHandler.hpp>
-#endif
 
 //_________________________________________________________________________________________________________________
 //  other includes
diff --git a/framework/source/lomenubar/exports.cxx b/framework/source/lomenubar/exports.cxx
index db3e07bfff04..f1a332106ac7 100644
--- a/framework/source/lomenubar/exports.cxx
+++ b/framework/source/lomenubar/exports.cxx
@@ -30,10 +30,7 @@
 #include <rtl/ustring.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <sal/types.h>
-
-#ifndef _COM_SUN_STAR_LANG_XSINGLESERVICEFACTORY_HPP_
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>
-#endif
 
 #include "DesktopJob.hxx"
 #include "FrameJob.hxx"
diff --git a/framework/source/register/register3rdcomponents.cxx b/framework/source/register/register3rdcomponents.cxx
index c2a8566deb76..8ea6674092ed 100644
--- a/framework/source/register/register3rdcomponents.cxx
+++ b/framework/source/register/register3rdcomponents.cxx
@@ -36,13 +36,8 @@
 
     Example:
 
-        #ifndef __YOUR_SERVICE_1_HXX_
         #include <service1.hxx>
-        #endif
-
-        #ifndef __YOUR_SERVICE_2_HXX_
         #include <service2.hxx>
-        #endif
 
         COMPONENTGETFACTORY (   IFFACTORIE( Service1 )
                                  else
diff --git a/framework/source/register/registerlogindialog.cxx b/framework/source/register/registerlogindialog.cxx
index a857f12a4cf0..9d176757b89d 100644
--- a/framework/source/register/registerlogindialog.cxx
+++ b/framework/source/register/registerlogindialog.cxx
@@ -37,13 +37,8 @@
 
     Example:
 
-        #ifndef __YOUR_SERVICE_1_HXX_
         #include <service1.hxx>
-        #endif
-
-        #ifndef __YOUR_SERVICE_2_HXX_
         #include <service2.hxx>
-        #endif
 
         COMPONENTGETFACTORY (   IFFACTORIE( Service1 )
                                  else
diff --git a/framework/source/register/registerservices.cxx b/framework/source/register/registerservices.cxx
index cf13ca488ade..28fb36675728 100644
--- a/framework/source/register/registerservices.cxx
+++ b/framework/source/register/registerservices.cxx
@@ -34,13 +34,8 @@
 
     Example:
 
-        #ifndef __YOUR_SERVICE_1_HXX_
         #include <service1.hxx>
-        #endif
-
-        #ifndef __YOUR_SERVICE_2_HXX_
         #include <service2.hxx>
-        #endif
 
         COMPONENTGETFACTORY (   IFFACTORIE( Service1 )
                                  else
diff --git a/framework/source/register/registertemp.cxx b/framework/source/register/registertemp.cxx
index 2cfac4f3b4ef..8b77dd39109d 100644
--- a/framework/source/register/registertemp.cxx
+++ b/framework/source/register/registertemp.cxx
@@ -36,13 +36,8 @@
 
     Example:
 
-        #ifndef __YOUR_SERVICE_1_HXX_
         #include <service1.hxx>
-        #endif
-
-        #ifndef __YOUR_SERVICE_2_HXX_
         #include <service2.hxx>
-        #endif
 
         COMPONENTGETFACTORY (   IFFACTORIE( Service1 )
                                  else
diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx
index 078361e8b4f4..9178979b841d 100644
--- a/framework/source/services/frame.cxx
+++ b/framework/source/services/frame.cxx
@@ -92,9 +92,7 @@
 #include <unotools/moduleoptions.hxx>
 
 #ifdef ENABLE_ASSERTIONS
-    #ifndef _RTL_STRBUF_HXX_
     #include <rtl/strbuf.hxx>
-    #endif
 #endif
 
 #include <vcl/menu.hxx>
diff --git a/lotuswordpro/source/filter/genericfilter.cxx b/lotuswordpro/source/filter/genericfilter.cxx
index d889515acb4e..1a374720c460 100644
--- a/lotuswordpro/source/filter/genericfilter.cxx
+++ b/lotuswordpro/source/filter/genericfilter.cxx
@@ -4,10 +4,7 @@
 #include <osl/mutex.hxx>
 #include <osl/thread.h>
 #include <cppuhelper/factory.hxx>
-
-#ifndef _COM_SUN_STAR_LANG_XSINGLESERVICEFACTORY_HPP_
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>
-#endif
 
 #include "LotusWordProImportFilter.hxx"
 
diff --git a/lotuswordpro/source/filter/lwp9reader.cxx b/lotuswordpro/source/filter/lwp9reader.cxx
index 29c52d382e24..eda611afd372 100644
--- a/lotuswordpro/source/filter/lwp9reader.cxx
+++ b/lotuswordpro/source/filter/lwp9reader.cxx
@@ -53,9 +53,7 @@
  *
  *
  ************************************************************************/
-#ifndef _LWP9READER_HXX
 #include "lwp9reader.hxx"
-#endif
 #include "lwpglobalmgr.hxx"
 #include "lwpunoheader.hxx"
 #include "lwparrowstyles.hxx"
diff --git a/lotuswordpro/source/filter/lwpdoc.cxx b/lotuswordpro/source/filter/lwpdoc.cxx
index c5986d59f875..e9a2f72b8cef 100644
--- a/lotuswordpro/source/filter/lwpdoc.cxx
+++ b/lotuswordpro/source/filter/lwpdoc.cxx
@@ -66,9 +66,7 @@
 #include "lwplayout.hxx"
 #include "lwppagelayout.hxx"
 #include "xfilter/xfstylemanager.hxx"
-#ifndef _OSL_THREAD_H_
 #include <osl/thread.h>
-#endif
 
 LwpDocument::LwpDocument(LwpObjectHeader& objHdr, LwpSvStream* pStrm)
     : LwpDLNFPVList(objHdr, pStrm), m_pOwnedFoundry(NULL), m_pLnOpts(NULL)
diff --git a/lotuswordpro/source/filter/lwpglobalmgr.cxx b/lotuswordpro/source/filter/lwpglobalmgr.cxx
index ce3167e15b6e..71dcc243d7dd 100644
--- a/lotuswordpro/source/filter/lwpglobalmgr.cxx
+++ b/lotuswordpro/source/filter/lwpglobalmgr.cxx
@@ -54,9 +54,7 @@
  *
  ************************************************************************/
 #include "lwpglobalmgr.hxx"
-#ifndef _OSL_THREAD_H_
 #include <osl/thread.h>
-#endif
 std::map< sal_uInt32,LwpGlobalMgr* > LwpGlobalMgr::m_ThreadMap;
 LwpGlobalMgr::LwpGlobalMgr(LwpSvStream* pSvStream)
 {
diff --git a/lotuswordpro/source/filter/lwpgrfobj.cxx b/lotuswordpro/source/filter/lwpgrfobj.cxx
index 56320836b00a..718d5f5fe984 100644
--- a/lotuswordpro/source/filter/lwpgrfobj.cxx
+++ b/lotuswordpro/source/filter/lwpgrfobj.cxx
@@ -82,9 +82,7 @@
 //For chart
 #include "string.h"
 
-#ifndef _OSL_THREAD_H_
 #include <osl/thread.h>
-#endif
 
 #define EF_NONE 0x0000
 #define EF_FTP 0x0001
diff --git a/lotuswordpro/source/filter/lwplayout.cxx b/lotuswordpro/source/filter/lwplayout.cxx
index 4a4ebe9a5bcd..1c646f9ffc4f 100644
--- a/lotuswordpro/source/filter/lwplayout.cxx
+++ b/lotuswordpro/source/filter/lwplayout.cxx
@@ -74,9 +74,7 @@
 #include "lwppagehint.hxx"
 #include "lwpdivinfo.hxx"
 #include "lwpgrfobj.hxx"
-#ifndef _OSL_THREAD_H_
 #include <osl/thread.h>
-#endif
 
 LwpVirtualLayout::LwpVirtualLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm)
     : LwpDLNFPVList(objHdr, pStrm)
diff --git a/lotuswordpro/source/filter/lwpobjfactory.cxx b/lotuswordpro/source/filter/lwpobjfactory.cxx
index a14e1932e315..616b11b246bb 100644
--- a/lotuswordpro/source/filter/lwpobjfactory.cxx
+++ b/lotuswordpro/source/filter/lwpobjfactory.cxx
@@ -63,11 +63,7 @@
  ************************************************************************/
 
 #include "lwpobjfactory.hxx"
-
-#ifndef _LWPDEFS_HXX
 #include "lwpdefs.hxx"
-#endif
-
 #include "lwpdoc.hxx"
 #include "lwptemp.hxx"
 #include "lwpstory.hxx"
diff --git a/lotuswordpro/source/filter/lwpobjid.cxx b/lotuswordpro/source/filter/lwpobjid.cxx
index 78268669d740..5eb7f6d3e2ce 100644
--- a/lotuswordpro/source/filter/lwpobjid.cxx
+++ b/lotuswordpro/source/filter/lwpobjid.cxx
@@ -62,11 +62,7 @@
  Jan 2005           Created
  ************************************************************************/
 
-
-#ifndef _LWPOBJECTID_HXX
 #include "lwpobjid.hxx"
-#endif
-
 #include "lwpfilehdr.hxx"
 #include "lwpobjfactory.hxx"
 #include "lwpglobalmgr.hxx"
diff --git a/sal/osl/unx/file_error_transl.cxx b/sal/osl/unx/file_error_transl.cxx
index c7167073c660..7e7bb9b2f435 100644
--- a/sal/osl/unx/file_error_transl.cxx
+++ b/sal/osl/unx/file_error_transl.cxx
@@ -17,19 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-
- #ifndef _ERRNO_H
- #include <errno.h>
- #endif
-
- #ifndef _FILE_ERROR_TRANSL_H_
- #include "file_error_transl.h"
- #endif
-
- #ifndef _OSL_DIAGNOSE_H_
- #include <osl/diagnose.h>
- #endif
-
+#include <errno.h>
+#include "file_error_transl.h"
+#include <osl/diagnose.h>
 
 /********************************************
  * oslTranslateFileError
diff --git a/sal/osl/unx/file_path_helper.cxx b/sal/osl/unx/file_path_helper.cxx
index 1aaf0e48be67..39b9a5863123 100644
--- a/sal/osl/unx/file_path_helper.cxx
+++ b/sal/osl/unx/file_path_helper.cxx
@@ -31,25 +31,12 @@
      Includes
   ******************************************/
 
- #ifndef _OSL_FILE_PATH_HELPER_H_
  #include "file_path_helper.h"
- #endif
-
- #ifndef _OSL_FILE_PATH_HELPER_HXX_
  #include "file_path_helper.hxx"
- #endif
-
- #ifndef _OSL_UUNXAPI_HXX_
  #include "uunxapi.hxx"
- #endif
 
- #ifndef _OSL_DIAGNOSE_H_
  #include <osl/diagnose.h>
- #endif
-
- #ifndef _RTL_USTRING_HXX_
  #include <rtl/ustring.hxx>
- #endif
 
  /*******************************************
      Constants
diff --git a/sal/osl/unx/process.cxx b/sal/osl/unx/process.cxx
index ff68fded7658..cb9d6c8bf4c1 100644
--- a/sal/osl/unx/process.cxx
+++ b/sal/osl/unx/process.cxx
@@ -56,10 +56,7 @@
 #endif
 #include <osl/diagnose.h>
 #include <osl/mutex.h>
-
-#ifndef _OSL_CONDITN_H_
 #include <osl/conditn.h>
-#endif
 #include <osl/thread.h>
 #include <osl/file.h>
 #include <osl/signal.h>
diff --git a/sal/osl/unx/uunxapi.cxx b/sal/osl/unx/uunxapi.cxx
index 270f5c33513a..b2b2bc34bb10 100644
--- a/sal/osl/unx/uunxapi.cxx
+++ b/sal/osl/unx/uunxapi.cxx
@@ -26,26 +26,11 @@
  *
  ************************************************************************/
 
-
- #ifndef _OSL_UUNXAPI_H_
  #include "uunxapi.h"
- #endif
-
- #ifndef __OSL_SYSTEM_H__
  #include "system.h"
- #endif
-
- #ifndef _LIMITS_H
  #include <limits.h>
- #endif
-
- #ifndef _RTL_USTRING_HXX_
  #include <rtl/ustring.hxx>
- #endif
-
- #ifndef _OSL_THREAD_H_
  #include <osl/thread.h>
- #endif
 
  #ifdef ANDROID
  #include <osl/detail/android-bootstrap.h>
diff --git a/sal/qa/rtl_strings/rtl_OString.cxx b/sal/qa/rtl_strings/rtl_OString.cxx
index 5be8f3199f9d..8a5f31ea82c1 100644
--- a/sal/qa/rtl_strings/rtl_OString.cxx
+++ b/sal/qa/rtl_strings/rtl_OString.cxx
@@ -27,24 +27,11 @@
  ************************************************************************/
 
 #include <string.h>
-
-#ifndef _SAL_TYPES_H_
-    #include <sal/types.h>
-#endif
-
+#include <sal/types.h>
 #include <testshl/tresstatewrapper.hxx>
-
-#ifndef _RTL_STRING_HXX_
-    #include <rtl/string.hxx>
-#endif
-
-#ifndef _RTL_STRING_CONST_H_
-    #include <rtl_String_Const.h>
-#endif
-
-#ifndef _RTL_STRING_UTILS_HXX_
-    #include <rtl_String_Utils.hxx>
-#endif
+#include <rtl/string.hxx>
+#include <rtl_String_Const.h>
+#include <rtl_String_Utils.hxx>
 #include <rtl/ustring.h>
 
 using ::rtl::OString;
diff --git a/sal/qa/rtl_strings/rtl_OUStringBuffer.cxx b/sal/qa/rtl_strings/rtl_OUStringBuffer.cxx
index 7a9871c041e4..58cf2ca1b89e 100644
--- a/sal/qa/rtl_strings/rtl_OUStringBuffer.cxx
+++ b/sal/qa/rtl_strings/rtl_OUStringBuffer.cxx
@@ -26,45 +26,16 @@
  *
  ************************************************************************/
 
-
-#ifndef _SAL_TYPES_H_
-    #include <sal/types.h>
-#endif
-
+#include <sal/types.h>
 #include <testshl/tresstatewrapper.hxx>
-
-#ifndef _RTL_STRING_HXX_
-    #include <rtl/string.hxx>
-#endif
-
-#ifndef _RTL_USTRING_H_
-    #include <rtl/ustring.h>
-#endif
-
-#ifndef _RTL_USTRING_HXX_
-    #include <rtl/ustring.hxx>
-#endif
-
-#ifndef _RTL_USTRBUF_H_
-        #include <rtl/ustrbuf.h>
-#endif
-
-#ifndef _RTL_USTRBUF_HXX
-        #include <rtl/ustrbuf.hxx>
-#endif
-
-#ifndef _OSL_THREAD_H_
-    #include <osl/thread.h>
-#endif
-
-#ifndef _RTL_STRING_CONST_H_
-    #include <rtl_String_Const.h>
-#endif
-
-#ifndef _RTL_STRING_UTILS_HXX_
-    #include <rtl_String_Utils.hxx>
-#endif
-
+#include <rtl/string.hxx>
+#include <rtl/ustring.h>
+#include <rtl/ustring.hxx>
+#include <rtl/ustrbuf.h>
+#include <rtl/ustrbuf.hxx>
+#include <osl/thread.h>
+#include <rtl_String_Const.h>
+#include <rtl_String_Utils.hxx>
 #include "stdio.h"
 
 using ::rtl::OUString;
diff --git a/sal/qa/rtl_strings/rtl_String_Utils.cxx b/sal/qa/rtl_strings/rtl_String_Utils.cxx
index 972124f03e24..2c11679b89f6 100644
--- a/sal/qa/rtl_strings/rtl_String_Utils.cxx
+++ b/sal/qa/rtl_strings/rtl_String_Utils.cxx
@@ -26,25 +26,12 @@
  *
 #*************************************************************************/
 
-
 #include <math.h>
 #include <stdlib.h>
-
-#ifndef _SAL_TYPES_H_
-    #include <sal/types.h>
-#endif
-
-#ifndef _RTL_USTRING_H_
-    #include <rtl/ustring.h>
-#endif
-
-#ifndef _RTL_STRING_HXX_
-    #include <rtl/string.hxx>
-#endif
-
-#ifndef _RTL_STRING_UTILS_CONST_H_
-    #include <rtl_String_Utils_Const.h>
-#endif
+#include <sal/types.h>
+#include <rtl/ustring.h>
+#include <rtl/string.hxx>
+#include <rtl_String_Utils_Const.h>
 
 using ::rtl::OString;
 sal_uInt32 AStringLen( const sal_Char *pAStr )
diff --git a/sal/rtl/source/strbuf.cxx b/sal/rtl/source/strbuf.cxx
index c9a4f3140643..d4a5a75ba929 100644
--- a/sal/rtl/source/strbuf.cxx
+++ b/sal/rtl/source/strbuf.cxx
@@ -27,18 +27,9 @@
  ************************************************************************/
 
 #include <osl/interlck.h>
-
-#ifndef _RTL_STRING_HXX_
 #include <rtl/strbuf.hxx>
-#endif
 #include <rtl/memory.h>
 
-/*
-#include <rtl/alloc.h>
-*/
-
-
-
 /*************************************************************************
  *  rtl_stringbuffer_newFromStr_WithLength
  */
diff --git a/sd/source/filter/ppt/pptatom.cxx b/sd/source/filter/ppt/pptatom.cxx
index dc309652a6fd..ce19f3971514 100644
--- a/sd/source/filter/ppt/pptatom.cxx
+++ b/sd/source/filter/ppt/pptatom.cxx
@@ -26,13 +26,8 @@
  *
  ************************************************************************/
 
-#ifndef _STREAM_HXX
 #include <tools/stream.hxx>
-#endif
-
-#ifndef _PPTATOM_HXX_
 #include "pptatom.hxx"
-#endif
 
 using namespace ppt;
 
diff --git a/shell/source/unix/sysshell/recently_used_file.cxx b/shell/source/unix/sysshell/recently_used_file.cxx
index b985402ec1e5..30cfca699ec1 100644
--- a/shell/source/unix/sysshell/recently_used_file.cxx
+++ b/shell/source/unix/sysshell/recently_used_file.cxx
@@ -26,10 +26,7 @@
  *
  ************************************************************************/
 
-
-#ifndef INCLUDED_RECENTLY_USED_FILE
 #include "recently_used_file.hxx"
-#endif
 #include <rtl/ustring.hxx>
 #include <osl/process.h>
 #include <osl/security.hxx>
diff --git a/svx/source/dialog/svxbmpnumvalueset.cxx b/svx/source/dialog/svxbmpnumvalueset.cxx
index cd505ac71346..13a2e344bb44 100644
--- a/svx/source/dialog/svxbmpnumvalueset.cxx
+++ b/svx/source/dialog/svxbmpnumvalueset.cxx
@@ -45,10 +45,7 @@
 #include <vcl/msgbox.hxx>
 #include <editeng/flstitem.hxx>
 #include <svx/dlgutil.hxx>
-#ifndef _XTABLE_HXX //autogen
-
 #include <svx/xtable.hxx>
-#endif
 #include <svx/drawitem.hxx>
 #include <svx/numvset.hxx>
 #include <svx/htmlmode.hxx>
diff --git a/svx/source/svdraw/svdibrow.cxx b/svx/source/svdraw/svdibrow.cxx
index f2dc1b956120..21cef82b3a61 100644
--- a/svx/source/svdraw/svdibrow.cxx
+++ b/svx/source/svdraw/svdibrow.cxx
@@ -30,10 +30,7 @@
 
 #include "svdibrow.hxx"
 
-#ifndef _STDLIB_H
 #include <stdlib.h>
-#define _STDLIB_H
-#endif
 
 #include "svx/svditext.hxx"
 #include <editeng/flditem.hxx>
diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx
index 21b507fbf229..bbf3c76b236a 100644
--- a/sw/source/core/doc/docfmt.cxx
+++ b/sw/source/core/doc/docfmt.cxx
@@ -36,9 +36,7 @@
 #include <editeng/lrspitem.hxx>
 #include <editeng/brkitem.hxx>
 #include <svl/whiter.hxx>
-#ifndef _ZFORLIST_HXX //autogen
 #include <svl/zforlist.hxx>
-#endif
 #include <comphelper/processfactory.hxx>
 #include <unotools/misccfg.hxx>
 #include <com/sun/star/i18n/WordType.hpp>
diff --git a/sw/source/filter/ww8/writerhelper.cxx b/sw/source/filter/ww8/writerhelper.cxx
index 69114a4c8f67..f261f7e36f0c 100644
--- a/sw/source/filter/ww8/writerhelper.cxx
+++ b/sw/source/filter/ww8/writerhelper.cxx
@@ -56,9 +56,7 @@
 #include <docary.hxx>            //SwCharFmts
 #include <charfmt.hxx>           //SwCharFmt
 #include <fchrfmt.hxx>           //SwFmtCharFmt
-#ifndef _UNOTOOLS_STREAMWRAP_HXX
 #include <unotools/streamwrap.hxx>
-#endif
 #include <numrule.hxx>
 
 using namespace com::sun::star;
diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx
index df0c10bc9494..d29d4f1f2816 100644
--- a/sw/source/filter/ww8/wrtw8esh.cxx
+++ b/sw/source/filter/ww8/wrtw8esh.cxx
@@ -53,12 +53,7 @@
 #include <editeng/frmdiritem.hxx>
 #include <svx/svdoole2.hxx>
 #include <editeng/editeng.hxx>
-#ifndef _SVX_FLDITEM_HXX
-//miserable hack to get around #98519#
-
 #include <editeng/flditem.hxx>
-#endif
-
 #include <comphelper/seqstream.hxx>
 #include <unotools/ucbstreamhelper.hxx>
 #include <svx/fmglob.hxx>
diff --git a/sw/source/ui/inc/num.hxx b/sw/source/ui/inc/num.hxx
index 06bd31a219cb..d6133666918f 100644
--- a/sw/source/ui/inc/num.hxx
+++ b/sw/source/ui/inc/num.hxx
@@ -161,6 +161,6 @@ class SwSvxNumBulletTabDialog : public SfxTabDialog
                     SwWrtShell &);
         ~SwSvxNumBulletTabDialog();
 };
-#endif // _NUM_CXX
+#endif // _NUM_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/misc/num.cxx b/sw/source/ui/misc/num.cxx
index 983bb7eb63c3..912b24b342de 100644
--- a/sw/source/ui/misc/num.cxx
+++ b/sw/source/ui/misc/num.cxx
@@ -21,12 +21,7 @@
 #undef SW_DLLIMPLEMENTATION
 #endif
 
-
-
-#define USE_NUMTABPAGES
-#define _NUM_CXX
 #include <hintids.hxx>
-
 #include <vcl/msgbox.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/imgmgr.hxx>
diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx
index abd58e4496a3..cfa46f51cd1c 100644
--- a/sw/source/ui/misc/outline.cxx
+++ b/sw/source/ui/misc/outline.cxx
@@ -37,11 +37,7 @@
 #include <editeng/brshitem.hxx>
 #include <unotools/configmgr.hxx>
 #include <SwStyleNameMapper.hxx>
-
-#ifndef _NUM_HXX //autogen
-#define USE_NUMTABPAGES
 #include <num.hxx>
-#endif
 #include <view.hxx>
 #include <docsh.hxx>
 #include <uitool.hxx>
@@ -68,9 +64,7 @@
 #include <IDocumentOutlineNodes.hxx>
 #include <app.hrc>
 
-#ifndef _COM_SUN_STAR_ACCESSIBILITY_ACCESSIBLEROLE_HPP_
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
-#endif
 
 using namespace ::com::sun::star;
 
diff --git a/sw/source/ui/shells/tabsh.cxx b/sw/source/ui/shells/tabsh.cxx
index 2e14c57d991c..b1884b740ef6 100644
--- a/sw/source/ui/shells/tabsh.cxx
+++ b/sw/source/ui/shells/tabsh.cxx
@@ -27,10 +27,7 @@
  ************************************************************************/
 
 #include <hintids.hxx>
-
-#ifndef _ZFORLIST_HXX
 #include <svl/zforlist.hxx>
-#endif
 #include <svl/stritem.hxx>
 #include <svl/whiter.hxx>
 #include <unotools/moduleoptions.hxx>
diff --git a/sw/source/ui/utlui/numfmtlb.cxx b/sw/source/ui/utlui/numfmtlb.cxx
index 880e0c4d34b0..bdf712cc2fd6 100644
--- a/sw/source/ui/utlui/numfmtlb.cxx
+++ b/sw/source/ui/utlui/numfmtlb.cxx
@@ -32,9 +32,7 @@
 #include <editeng/unolingu.hxx>
 #include <unotools/localedatawrapper.hxx>
 #include <i18npool/lang.h>
-#ifndef _ZFORMAT_HXX //autogen
 #include <svl/zformat.hxx>
-#endif
 #include <svl/eitem.hxx>
 #include <svx/svxids.hrc>
 #include <svx/numinf.hxx>
diff --git a/toolkit/source/controls/controlmodelcontainerbase.cxx b/toolkit/source/controls/controlmodelcontainerbase.cxx
index 7af946ae939b..e56edd51edd7 100644
--- a/toolkit/source/controls/controlmodelcontainerbase.cxx
+++ b/toolkit/source/controls/controlmodelcontainerbase.cxx
@@ -38,9 +38,7 @@
 #include <toolkit/controls/unocontrols.hxx>
 #include "toolkit/controls/formattedcontrol.hxx"
 #include "toolkit/controls/roadmapcontrol.hxx"
-#ifndef TOOLKIT_INC_TOOLKIT_CONTROLS_TKSCROLLBAR_HXX
 #include "toolkit/controls/tkscrollbar.hxx"
-#endif
 #include <toolkit/controls/stdtabcontroller.hxx>
 #include <com/sun/star/awt/PosSize.hpp>
 #include <com/sun/star/awt/WindowAttribute.hpp>
diff --git a/writerfilter/source/dmapper/FontTable.cxx b/writerfilter/source/dmapper/FontTable.cxx
index 02c6eb96dfc0..d5de5d8c9f51 100644
--- a/writerfilter/source/dmapper/FontTable.cxx
+++ b/writerfilter/source/dmapper/FontTable.cxx
@@ -18,10 +18,8 @@
  */
 
 #include <FontTable.hxx>
-#ifndef INCLUDED_RESOURCESIDS
 #include <doctok/resourceids.hxx>
 #include <ooxml/resourceids.hxx>
-#endif
 #include <vector>
 #include <stdio.h>
 #include <rtl/tencinfo.h>
diff --git a/writerfilter/source/dmapper/ThemeTable.cxx b/writerfilter/source/dmapper/ThemeTable.cxx
index 0dc8ba4d9efe..0b19382667fa 100644
--- a/writerfilter/source/dmapper/ThemeTable.cxx
+++ b/writerfilter/source/dmapper/ThemeTable.cxx
@@ -18,10 +18,8 @@
  */
 
 #include <ThemeTable.hxx>
-#ifndef INCLUDED_RESOURCESIDS
 #include <doctok/resourceids.hxx>
 #include <ooxml/resourceids.hxx>
-#endif
 #include "dmapperLoggers.hxx"
 
 #if DEBUG_DOMAINMAPPER
diff --git a/writerfilter/source/doctok/WW8PieceTableImpl.cxx b/writerfilter/source/doctok/WW8PieceTableImpl.cxx
index 96ba5d18a45d..9214243edfca 100644
--- a/writerfilter/source/doctok/WW8PieceTableImpl.cxx
+++ b/writerfilter/source/doctok/WW8PieceTableImpl.cxx
@@ -20,9 +20,7 @@
 #include <algorithm>
 #include <iterator>
 
-#ifndef INCLUDED_DOCTOK_EXCEPTIONS
 #include <resourcemodel/exceptions.hxx>
-#endif
 #include <WW8PieceTableImpl.hxx>
 #include <WW8Clx.hxx>
 
diff --git a/xmloff/source/forms/propertyimport.cxx b/xmloff/source/forms/propertyimport.cxx
index 632f691a43cc..501622c24e29 100644
--- a/xmloff/source/forms/propertyimport.cxx
+++ b/xmloff/source/forms/propertyimport.cxx
@@ -47,9 +47,7 @@
 #include <rtl/strbuf.hxx>
 
 #if OSL_DEBUG_LEVEL > 0
-    #ifndef _OSL_THREAD_H_
     #include <osl/thread.h>
-    #endif
 #endif
 
 //.........................................................................
diff --git a/xmloff/source/text/XMLFootnoteBodyImportContext.cxx b/xmloff/source/text/XMLFootnoteBodyImportContext.cxx
index fe33907ba0e9..135fc97ae860 100644
--- a/xmloff/source/text/XMLFootnoteBodyImportContext.cxx
+++ b/xmloff/source/text/XMLFootnoteBodyImportContext.cxx
@@ -19,9 +19,7 @@
 
 #include "XMLFootnoteBodyImportContext.hxx"
 
-#ifndef _RTL_USTRING
 #include <rtl/ustring.hxx>
-#endif
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/txtimp.hxx>
 #include <xmloff/nmspmap.hxx>
diff --git a/xmloff/source/text/XMLSectionFootnoteConfigExport.cxx b/xmloff/source/text/XMLSectionFootnoteConfigExport.cxx
index 3c09c161d112..cedb551741e5 100644
--- a/xmloff/source/text/XMLSectionFootnoteConfigExport.cxx
+++ b/xmloff/source/text/XMLSectionFootnoteConfigExport.cxx
@@ -40,10 +40,7 @@
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmlnume.hxx>
 #include <tools/debug.hxx>
-
-#ifndef _RTL_USTRING
 #include <rtl/ustring.hxx>
-#endif
 #include <rtl/ustrbuf.hxx>
 
 #include <vector>
diff --git a/xmloff/source/text/XMLSectionFootnoteConfigImport.cxx b/xmloff/source/text/XMLSectionFootnoteConfigImport.cxx
index 199e56a058a3..ba8fa95b3d0d 100644
--- a/xmloff/source/text/XMLSectionFootnoteConfigImport.cxx
+++ b/xmloff/source/text/XMLSectionFootnoteConfigImport.cxx
@@ -28,9 +28,7 @@
 
 #include "XMLSectionFootnoteConfigImport.hxx"
 
-#ifndef _RTL_USTRING
 #include <rtl/ustring.hxx>
-#endif
 #include <com/sun/star/uno/Reference.h>
 #include <com/sun/star/xml/sax/XAttributeList.hpp>
 #include <com/sun/star/style/NumberingType.hpp>
diff --git a/xmlsecurity/source/xmlsec/mscrypt/sanextension_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/sanextension_mscryptimpl.cxx
index 1dc97f9ff3ba..377da31bb0fa 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/sanextension_mscryptimpl.cxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/sanextension_mscryptimpl.cxx
@@ -35,10 +35,7 @@
 #include <com/sun/star/uno/Reference.hxx>
 #include <comphelper/sequence.hxx>
 
-
-#ifndef _SANEXTENSION_MSCRYPTIMPL_HXX_
 #include "sanextension_mscryptimpl.hxx"
-#endif
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno ;
diff --git a/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.cxx
index f83aff3bcabb..3ca94b769385 100644
--- a/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.cxx
@@ -40,10 +40,7 @@
 #include <secitem.h>
 #include <secport.h>
 
-
-#ifndef _SANEXTENSION_NSSIMPL_HXX_
 #include "sanextension_nssimpl.hxx"
-#endif
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno ;