fixincludeguards.sh: sw

Change-Id: I8e0889200d1a1c36e53022a74792728efd66c2fc
author: Thomas Arnhold <thomas@arnhold.org> 2013-11-05 02:17:53 +0100
committer: Thomas Arnhold <thomas@arnhold.org> 2013-11-05 09:28:51 +0100
commit: 3c01203ea657b9a3538f9956591b3d4da5fce6e7 (patch)
tree: fa55b199faff9de2f352e9d4403336b24301d3e9 /sw/source/core
parent: 07fc8122f41210acc788396efa3d16499f58b78c (diff)
183 files changed, 406 insertions, 406 deletions
diff --git a/sw/source/core/access/acccell.hxx b/sw/source/core/access/acccell.hxx
index 74ae197129d9..74d3185908df 100644
--- a/sw/source/core/access/acccell.hxx
+++ b/sw/source/core/access/acccell.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _ACCCELL_HXX
-#define _ACCCELL_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_ACCESS_ACCCELL_HXX
+#define INCLUDED_SW_SOURCE_CORE_ACCESS_ACCCELL_HXX
 
 #include "acccontext.hxx"
 #include <com/sun/star/accessibility/XAccessibleValue.hpp>
diff --git a/sw/source/core/access/acccontext.hxx b/sw/source/core/access/acccontext.hxx
index 8f2d76225bfc..b8d164b7a128 100644
--- a/sw/source/core/access/acccontext.hxx
+++ b/sw/source/core/access/acccontext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _ACCBASE_HXX
-#define _ACCBASE_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_ACCESS_ACCCONTEXT_HXX
+#define INCLUDED_SW_SOURCE_CORE_ACCESS_ACCCONTEXT_HXX
 
 #include <accframe.hxx>
 #include <accmap.hxx>
diff --git a/sw/source/core/access/accdoc.hxx b/sw/source/core/access/accdoc.hxx
index fe73a901eec4..2ff5576059e7 100644
--- a/sw/source/core/access/accdoc.hxx
+++ b/sw/source/core/access/accdoc.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _ACCDOC_HXX
-#define _ACCDOC_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_ACCESS_ACCDOC_HXX
+#define INCLUDED_SW_SOURCE_CORE_ACCESS_ACCDOC_HXX
 
 #include "acccontext.hxx"
 #include <com/sun/star/accessibility/XAccessibleSelection.hpp>
diff --git a/sw/source/core/access/accembedded.hxx b/sw/source/core/access/accembedded.hxx
index a301f85e37d5..a459eb1cd8d0 100644
--- a/sw/source/core/access/accembedded.hxx
+++ b/sw/source/core/access/accembedded.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _ACCEMBEDDED_HXX
-#define _ACCEMBEDDED_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_ACCESS_ACCEMBEDDED_HXX
+#define INCLUDED_SW_SOURCE_CORE_ACCESS_ACCEMBEDDED_HXX
 
 #include "accnotextframe.hxx"
 
diff --git a/sw/source/core/access/accfootnote.hxx b/sw/source/core/access/accfootnote.hxx
index ae0256d69c84..6b0f4a5df613 100644
--- a/sw/source/core/access/accfootnote.hxx
+++ b/sw/source/core/access/accfootnote.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _ACCFOOTNOTE_HXX
-#define _ACCFOOTNOTE_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_ACCESS_ACCFOOTNOTE_HXX
+#define INCLUDED_SW_SOURCE_CORE_ACCESS_ACCFOOTNOTE_HXX
 
 #include <sal/types.h>
 #include <acccontext.hxx>
diff --git a/sw/source/core/access/accframe.hxx b/sw/source/core/access/accframe.hxx
index 579d087be7f4..08c8139aa721 100644
--- a/sw/source/core/access/accframe.hxx
+++ b/sw/source/core/access/accframe.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _ACCFRAME_HXX
-#define _ACCFRAME_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_ACCESS_ACCFRAME_HXX
+#define INCLUDED_SW_SOURCE_CORE_ACCESS_ACCFRAME_HXX
 
 #include <swrect.hxx>
 
diff --git a/sw/source/core/access/accframebase.hxx b/sw/source/core/access/accframebase.hxx
index a1ee392d96d0..dd99bd8c503f 100644
--- a/sw/source/core/access/accframebase.hxx
+++ b/sw/source/core/access/accframebase.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _ACCFRAMEBASE_HXX
-#define _ACCFRAMEBASE_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_ACCESS_ACCFRAMEBASE_HXX
+#define INCLUDED_SW_SOURCE_CORE_ACCESS_ACCFRAMEBASE_HXX
 
 #include <acccontext.hxx>
 #include <calbck.hxx>
diff --git a/sw/source/core/access/accfrmobj.hxx b/sw/source/core/access/accfrmobj.hxx
index 355c9aebcf6a..47e1f3ba6684 100644
--- a/sw/source/core/access/accfrmobj.hxx
+++ b/sw/source/core/access/accfrmobj.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _ACCFRMOBJ_HXX
-#define _ACCFRMOBJ_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_ACCESS_ACCFRMOBJ_HXX
+#define INCLUDED_SW_SOURCE_CORE_ACCESS_ACCFRMOBJ_HXX
 
 #include <sal/types.h>
 
diff --git a/sw/source/core/access/accfrmobjmap.hxx b/sw/source/core/access/accfrmobjmap.hxx
index 39f03b963cc8..92e3402598cd 100644
--- a/sw/source/core/access/accfrmobjmap.hxx
+++ b/sw/source/core/access/accfrmobjmap.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _ACCFRMOBJMAP_HXX
-#define _ACCFRMOBJMAP_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_ACCESS_ACCFRMOBJMAP_HXX
+#define INCLUDED_SW_SOURCE_CORE_ACCESS_ACCFRMOBJMAP_HXX
 
 #include <accfrmobj.hxx>
 #include <svx/svdtypes.hxx>
diff --git a/sw/source/core/access/accfrmobjslist.hxx b/sw/source/core/access/accfrmobjslist.hxx
index bebaafecbdef..d54a6315ba73 100644
--- a/sw/source/core/access/accfrmobjslist.hxx
+++ b/sw/source/core/access/accfrmobjslist.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _ACCFRMOBJSLIST_HXX
-#define _ACCFRMOBJSLIST_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_ACCESS_ACCFRMOBJSLIST_HXX
+#define INCLUDED_SW_SOURCE_CORE_ACCESS_ACCFRMOBJSLIST_HXX
 
 #include <accfrmobj.hxx>
 #include <swrect.hxx>
diff --git a/sw/source/core/access/accgraphic.hxx b/sw/source/core/access/accgraphic.hxx
index f8c3ac422229..51bbd7c5550f 100644
--- a/sw/source/core/access/accgraphic.hxx
+++ b/sw/source/core/access/accgraphic.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _ACCGRAPHIC_HXX
-#define _ACCGRAPHIC_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_ACCESS_ACCGRAPHIC_HXX
+#define INCLUDED_SW_SOURCE_CORE_ACCESS_ACCGRAPHIC_HXX
 
 #include "accnotextframe.hxx"
 
diff --git a/sw/source/core/access/accheaderfooter.hxx b/sw/source/core/access/accheaderfooter.hxx
index 07d84edc733c..f6eed47a9e0c 100644
--- a/sw/source/core/access/accheaderfooter.hxx
+++ b/sw/source/core/access/accheaderfooter.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _ACCHEADERFOOTER_HXX
-#define _ACCHEADERFOOTER_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_ACCESS_ACCHEADERFOOTER_HXX
+#define INCLUDED_SW_SOURCE_CORE_ACCESS_ACCHEADERFOOTER_HXX
 
 #include "acccontext.hxx"
 
diff --git a/sw/source/core/access/acchyperlink.hxx b/sw/source/core/access/acchyperlink.hxx
index 21b60ebc0ec8..0970e5cfa62e 100644
--- a/sw/source/core/access/acchyperlink.hxx
+++ b/sw/source/core/access/acchyperlink.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _ACCHYPERLINK_HXX
-#define _ACCHYPERLINK_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_ACCESS_ACCHYPERLINK_HXX
+#define INCLUDED_SW_SOURCE_CORE_ACCESS_ACCHYPERLINK_HXX
 
 #include <com/sun/star/accessibility/XAccessibleHyperlink.hpp>
 #include <rtl/ref.hxx>
diff --git a/sw/source/core/access/acchypertextdata.hxx b/sw/source/core/access/acchypertextdata.hxx
index 1e106ad5b53b..639fb3acc664 100644
--- a/sw/source/core/access/acchypertextdata.hxx
+++ b/sw/source/core/access/acchypertextdata.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _ACCHYPERTEXTDATA_HXX
-#define _ACCHYPERTEXTDATA_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_ACCESS_ACCHYPERTEXTDATA_HXX
+#define INCLUDED_SW_SOURCE_CORE_ACCESS_ACCHYPERTEXTDATA_HXX
 
 #include <cppuhelper/weakref.hxx>
 #include <map>
diff --git a/sw/source/core/access/accnotextframe.hxx b/sw/source/core/access/accnotextframe.hxx
index 4e86e3937afe..bcbef05911f3 100644
--- a/sw/source/core/access/accnotextframe.hxx
+++ b/sw/source/core/access/accnotextframe.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _ACCNOTEXTFRAME_HXX
-#define _ACCNOTEXTFRAME_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_ACCESS_ACCNOTEXTFRAME_HXX
+#define INCLUDED_SW_SOURCE_CORE_ACCESS_ACCNOTEXTFRAME_HXX
 
 #include "accframebase.hxx"
 #include <com/sun/star/accessibility/XAccessibleImage.hpp>
diff --git a/sw/source/core/access/accpage.hxx b/sw/source/core/access/accpage.hxx
index ffd3cd430c52..b4b27f89bfbc 100644
--- a/sw/source/core/access/accpage.hxx
+++ b/sw/source/core/access/accpage.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _ACCPAGE_HXX
-#define _ACCPAGE_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_ACCESS_ACCPAGE_HXX
+#define INCLUDED_SW_SOURCE_CORE_ACCESS_ACCPAGE_HXX
 
 #include "acccontext.hxx"
 
diff --git a/sw/source/core/access/accpara.hxx b/sw/source/core/access/accpara.hxx
index 468e33a02388..55d2e77d7b2a 100644
--- a/sw/source/core/access/accpara.hxx
+++ b/sw/source/core/access/accpara.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _ACCPARA_HXX
-#define _ACCPARA_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_ACCESS_ACCPARA_HXX
+#define INCLUDED_SW_SOURCE_CORE_ACCESS_ACCPARA_HXX
 
 #include <acccontext.hxx>
 #include <com/sun/star/accessibility/XAccessibleEditableText.hpp>
diff --git a/sw/source/core/access/accportions.hxx b/sw/source/core/access/accportions.hxx
index d6436365d1f5..a2efbe862cf0 100644
--- a/sw/source/core/access/accportions.hxx
+++ b/sw/source/core/access/accportions.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _ACCPORTIONS_HXX
-#define _ACCPORTIONS_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_ACCESS_ACCPORTIONS_HXX
+#define INCLUDED_SW_SOURCE_CORE_ACCESS_ACCPORTIONS_HXX
 
 #include <SwPortionHandler.hxx>
 #include <sal/types.h>
diff --git a/sw/source/core/access/accpreview.hxx b/sw/source/core/access/accpreview.hxx
index 4c0f431984b7..b911da101be7 100644
--- a/sw/source/core/access/accpreview.hxx
+++ b/sw/source/core/access/accpreview.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _ACCPREVIEW_HXX
-#define _ACCPREVIEW_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_ACCESS_ACCPREVIEW_HXX
+#define INCLUDED_SW_SOURCE_CORE_ACCESS_ACCPREVIEW_HXX
 
 #include "accdoc.hxx"
 
diff --git a/sw/source/core/access/accselectionhelper.hxx b/sw/source/core/access/accselectionhelper.hxx
index 2b1e6433c163..5e51987df66a 100644
--- a/sw/source/core/access/accselectionhelper.hxx
+++ b/sw/source/core/access/accselectionhelper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _ACCSELECTIONHELPER_HXX_
-#define _ACCSELECTIONHELPER_HXX_
+#ifndef INCLUDED_SW_SOURCE_CORE_ACCESS_ACCSELECTIONHELPER_HXX
+#define INCLUDED_SW_SOURCE_CORE_ACCESS_ACCSELECTIONHELPER_HXX
 
 class SwAccessibleContext;
 class SwFEShell;
diff --git a/sw/source/core/access/acctable.hxx b/sw/source/core/access/acctable.hxx
index d71f45cabd71..9c0a365e2b6e 100644
--- a/sw/source/core/access/acctable.hxx
+++ b/sw/source/core/access/acctable.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _ACCTABLE_HXX
-#define _ACCTABLE_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_ACCESS_ACCTABLE_HXX
+#define INCLUDED_SW_SOURCE_CORE_ACCESS_ACCTABLE_HXX
 
 #include <com/sun/star/accessibility/XAccessibleTable.hpp>
 #include <com/sun/star/accessibility/XAccessibleSelection.hpp>
diff --git a/sw/source/core/access/acctextframe.hxx b/sw/source/core/access/acctextframe.hxx
index e0568c14f124..8c891cf25975 100644
--- a/sw/source/core/access/acctextframe.hxx
+++ b/sw/source/core/access/acctextframe.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _ACCTEXTFRAME_HXX
-#define _ACCTEXTFRAME_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_ACCESS_ACCTEXTFRAME_HXX
+#define INCLUDED_SW_SOURCE_CORE_ACCESS_ACCTEXTFRAME_HXX
 
 #include "accframebase.hxx"
 
diff --git a/sw/source/core/access/parachangetrackinginfo.hxx b/sw/source/core/access/parachangetrackinginfo.hxx
index b95759db8a12..02866abad9ae 100644
--- a/sw/source/core/access/parachangetrackinginfo.hxx
+++ b/sw/source/core/access/parachangetrackinginfo.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _PARACHANGETRACKINGINFO_HXX_
-#define _PARACHANGETRACKINGINFO_HXX_
+#ifndef INCLUDED_SW_SOURCE_CORE_ACCESS_PARACHANGETRACKINGINFO_HXX
+#define INCLUDED_SW_SOURCE_CORE_ACCESS_PARACHANGETRACKINGINFO_HXX
 
 #include <sal/types.h>
 
diff --git a/sw/source/core/access/textmarkuphelper.hxx b/sw/source/core/access/textmarkuphelper.hxx
index 07f8dcc58dc9..ba555825cda8 100644
--- a/sw/source/core/access/textmarkuphelper.hxx
+++ b/sw/source/core/access/textmarkuphelper.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _TEXTMARKUPHELPER_HXX_
-#define _TEXTMARKUPHELPER_HXX_
+#ifndef INCLUDED_SW_SOURCE_CORE_ACCESS_TEXTMARKUPHELPER_HXX
+#define INCLUDED_SW_SOURCE_CORE_ACCESS_TEXTMARKUPHELPER_HXX
 
 #include <sal/types.h>
 #include "com/sun/star/lang/IndexOutOfBoundsException.hpp"
diff --git a/sw/source/core/crsr/BlockCursor.hxx b/sw/source/core/crsr/BlockCursor.hxx
index 1bea5c594b8f..b7d6ec99e0fa 100644
--- a/sw/source/core/crsr/BlockCursor.hxx
+++ b/sw/source/core/crsr/BlockCursor.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _BLOCKCURSOR_HXX
-#define _BLOCKCURSOR_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_CRSR_BLOCKCURSOR_HXX
+#define INCLUDED_SW_SOURCE_CORE_CRSR_BLOCKCURSOR_HXX
 
 class IBlockCursor;
 class SwCrsrShell;
diff --git a/sw/source/core/crsr/IBlockCursor.hxx b/sw/source/core/crsr/IBlockCursor.hxx
index cbe91add8f4a..fd48ecb0b744 100644
--- a/sw/source/core/crsr/IBlockCursor.hxx
+++ b/sw/source/core/crsr/IBlockCursor.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef IBLOCKCURSOR_HXX_INCLUDED
-#define IBLOCKCURSOR_HXX_INCLUDED
+#ifndef INCLUDED_SW_SOURCE_CORE_CRSR_IBLOCKCURSOR_HXX
+#define INCLUDED_SW_SOURCE_CORE_CRSR_IBLOCKCURSOR_HXX
 
 class SwShellCrsr;
 class Point;
diff --git a/sw/source/core/crsr/callnk.hxx b/sw/source/core/crsr/callnk.hxx
index 1fe5f0918684..3446a58d8e13 100644
--- a/sw/source/core/crsr/callnk.hxx
+++ b/sw/source/core/crsr/callnk.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CALLNK_HXX
-#define _CALLNK_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_CRSR_CALLNK_HXX
+#define INCLUDED_SW_SOURCE_CORE_CRSR_CALLNK_HXX
 
 #include <tools/solar.h>
 
@@ -45,6 +45,6 @@ public:
     static long getLayoutFrm( const SwRootFrm*, SwTxtNode& rNd, xub_StrLen nCntPos, sal_Bool bCalcFrm );
 };
 
-#endif  // _CALLNK_HXX
+#endif // INCLUDED_SW_SOURCE_CORE_CRSR_CALLNK_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/doc/swstylemanager.hxx b/sw/source/core/doc/swstylemanager.hxx
index d2851ef96f4e..edd7b3aed398 100644
--- a/sw/source/core/doc/swstylemanager.hxx
+++ b/sw/source/core/doc/swstylemanager.hxx
@@ -17,13 +17,13 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SWSTYLEMANAGER_HXX
-#define _SWSTYLEMANAGER_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_DOC_SWSTYLEMANAGER_HXX
+#define INCLUDED_SW_SOURCE_CORE_DOC_SWSTYLEMANAGER_HXX
 
 class IStyleAccess;
 class SfxItemSet;
 
 IStyleAccess *createStyleManager( SfxItemSet* pIgnorableParagraphItems = 0 );
-#endif  //_SWSTYLEMANAGER_HXX
+#endif // INCLUDED_SW_SOURCE_CORE_DOC_SWSTYLEMANAGER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/docnode/cancellablejob.hxx b/sw/source/core/docnode/cancellablejob.hxx
index 2be7824e240a..bad3b4325fde 100644
--- a/sw/source/core/docnode/cancellablejob.hxx
+++ b/sw/source/core/docnode/cancellablejob.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CANCELLABLEJOB_HXX
-#define _CANCELLABLEJOB_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_DOCNODE_CANCELLABLEJOB_HXX
+#define INCLUDED_SW_SOURCE_CORE_DOCNODE_CANCELLABLEJOB_HXX
 
 #include "sal/config.h"
 #include "cppuhelper/implbase1.hxx"
diff --git a/sw/source/core/inc/GetMetricVal.hxx b/sw/source/core/inc/GetMetricVal.hxx
index 43ab1864aab9..e7a85a8e6947 100644
--- a/sw/source/core/inc/GetMetricVal.hxx
+++ b/sw/source/core/inc/GetMetricVal.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _GETMETRICVAL_HXX
-#define _GETMETRICVAL_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_GETMETRICVAL_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_GETMETRICVAL_HXX
 
 #include <tools/solar.h>
 
diff --git a/sw/source/core/inc/MarkManager.hxx b/sw/source/core/inc/MarkManager.hxx
index e5f08b342c27..c4af698c703f 100644
--- a/sw/source/core/inc/MarkManager.hxx
+++ b/sw/source/core/inc/MarkManager.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SW_BOOKMARK_MARKMANAGER_HXX
-#define _SW_BOOKMARK_MARKMANAGER_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_MARKMANAGER_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_MARKMANAGER_HXX
 
 #include <IMark.hxx>
 #include <IDocumentMarkAccess.hxx>
diff --git a/sw/source/core/inc/SwGrammarMarkUp.hxx b/sw/source/core/inc/SwGrammarMarkUp.hxx
index 4611155a4ce1..76b862239e76 100644
--- a/sw/source/core/inc/SwGrammarMarkUp.hxx
+++ b/sw/source/core/inc/SwGrammarMarkUp.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SWGRAMMARMARKUP_HXX
-#define _SWGRAMMARMARKUP_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_SWGRAMMARMARKUP_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_SWGRAMMARMARKUP_HXX
 
 #include <wrong.hxx>
 #include <vector>
diff --git a/sw/source/core/inc/SwPortionHandler.hxx b/sw/source/core/inc/SwPortionHandler.hxx
index 325deb9ccc03..1cb7670cea95 100644
--- a/sw/source/core/inc/SwPortionHandler.hxx
+++ b/sw/source/core/inc/SwPortionHandler.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SW_PORTIONHANDLER_HXX
-#define _SW_PORTIONHANDLER_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_SWPORTIONHANDLER_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_SWPORTIONHANDLER_HXX
 
 #include <tools/solar.h>
 #include <txttypes.hxx>
diff --git a/sw/source/core/inc/SwUndoFmt.hxx b/sw/source/core/inc/SwUndoFmt.hxx
index 8616edb8f89a..808b6b30da75 100644
--- a/sw/source/core/inc/SwUndoFmt.hxx
+++ b/sw/source/core/inc/SwUndoFmt.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef SW_UNDO_TXT_FMT_COLL_HXX
-#define SW_UNDO_TXT_FMT_COLL_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_SWUNDOFMT_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_SWUNDOFMT_HXX
 
 #include <undobj.hxx>
 #include <swundo.hxx>
@@ -239,6 +239,6 @@ class SwUndoNumruleRename : public SwUndo
     SwRewriter GetRewriter() const;
 };
 
-#endif // SW_UNDO_TXT_FMT_COLL_HXX
+#endif // INCLUDED_SW_SOURCE_CORE_INC_SWUNDOFMT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/SwUndoPageDesc.hxx b/sw/source/core/inc/SwUndoPageDesc.hxx
index 167d8a3fd639..6efaf6d32b56 100644
--- a/sw/source/core/inc/SwUndoPageDesc.hxx
+++ b/sw/source/core/inc/SwUndoPageDesc.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef SW_UNDO_PAGE_DESC_HXX
-#define SW_UNDO_PAGE_DESC_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_SWUNDOPAGEDESC_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_SWUNDOPAGEDESC_HXX
 
 #include <undobj.hxx>
 #include <pagedesc.hxx>
diff --git a/sw/source/core/inc/SwUndoTOXChange.hxx b/sw/source/core/inc/SwUndoTOXChange.hxx
index 850b13247536..08cc3e15c852 100644
--- a/sw/source/core/inc/SwUndoTOXChange.hxx
+++ b/sw/source/core/inc/SwUndoTOXChange.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef SW_UNDO_TOX_CHANGE_HXX
-#define SW_UNDO_TOX_CHANGE_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_SWUNDOTOXCHANGE_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_SWUNDOTOXCHANGE_HXX
 
 #include <undobj.hxx>
 #include <tox.hxx>
@@ -39,6 +39,6 @@ public:
     virtual void RepeatImpl( ::sw::RepeatContext & );
 };
 
-#endif // SW_UNDO_TOX_CHANGE_HXX
+#endif // INCLUDED_SW_SOURCE_CORE_INC_SWUNDOTOXCHANGE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/SwXMLBlockExport.hxx b/sw/source/core/inc/SwXMLBlockExport.hxx
index a499907bb4e8..c3901088273b 100644
--- a/sw/source/core/inc/SwXMLBlockExport.hxx
+++ b/sw/source/core/inc/SwXMLBlockExport.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SW_XMLBLOCKEXPORT_HXX
-#define _SW_XMLBLOCKEXPORT_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_SWXMLBLOCKEXPORT_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_SWXMLBLOCKEXPORT_HXX
 
 #include <xmloff/xmlexp.hxx>
 
diff --git a/sw/source/core/inc/SwXMLBlockImport.hxx b/sw/source/core/inc/SwXMLBlockImport.hxx
index 9b665040ebd4..6955ff478148 100644
--- a/sw/source/core/inc/SwXMLBlockImport.hxx
+++ b/sw/source/core/inc/SwXMLBlockImport.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SW_XMLBLOCKIMPORT_HXX
-#define _SW_XMLBLOCKIMPORT_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_SWXMLBLOCKIMPORT_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_SWXMLBLOCKIMPORT_HXX
 
 #include <xmloff/xmlimp.hxx>
 
diff --git a/sw/source/core/inc/SwXMLBlockListContext.hxx b/sw/source/core/inc/SwXMLBlockListContext.hxx
index 204de9a0cffc..52605b31dda1 100644
--- a/sw/source/core/inc/SwXMLBlockListContext.hxx
+++ b/sw/source/core/inc/SwXMLBlockListContext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SW_XMLBLOCKLISTCONTEXT_HXX
-#define _SW_XMLBLOCKLISTCONTEXT_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_SWXMLBLOCKLISTCONTEXT_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_SWXMLBLOCKLISTCONTEXT_HXX
 
 #include <xmloff/xmlictxt.hxx>
 
diff --git a/sw/source/core/inc/SwXMLTextBlocks.hxx b/sw/source/core/inc/SwXMLTextBlocks.hxx
index ec21818d1a10..5afd8f1b4d08 100644
--- a/sw/source/core/inc/SwXMLTextBlocks.hxx
+++ b/sw/source/core/inc/SwXMLTextBlocks.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SW_XMLTEXTBLOCKS_HXX
-#define _SW_XMLTEXTBLOCKS_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_SWXMLTEXTBLOCKS_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_SWXMLTEXTBLOCKS_HXX
 
 #include <sfx2/objsh.hxx>
 #include <sfx2/docfile.hxx>
diff --git a/sw/source/core/inc/SwXTextDefaults.hxx b/sw/source/core/inc/SwXTextDefaults.hxx
index 6df0bc2cb547..b352dfe04e8d 100644
--- a/sw/source/core/inc/SwXTextDefaults.hxx
+++ b/sw/source/core/inc/SwXTextDefaults.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SW_XTEXT_DEFAULTS_HXX
-#define _SW_XTEXT_DEFAULTS_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_SWXTEXTDEFAULTS_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_SWXTEXTDEFAULTS_HXX
 
 #include <cppuhelper/implbase3.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/sw/source/core/inc/UndoAttribute.hxx b/sw/source/core/inc/UndoAttribute.hxx
index 72c82bcfebbe..84e6a6507342 100644
--- a/sw/source/core/inc/UndoAttribute.hxx
+++ b/sw/source/core/inc/UndoAttribute.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef SW_UNDO_ATTRIBUTE_HXX
-#define SW_UNDO_ATTRIBUTE_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_UNDOATTRIBUTE_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_UNDOATTRIBUTE_HXX
 
 #include <undobj.hxx>
 #include <memory>
@@ -272,6 +272,6 @@ public:
     virtual void RedoImpl( ::sw::UndoRedoContext & );
 };
 
-#endif // SW_UNDO_ATTRIBUTE_HXX
+#endif // INCLUDED_SW_SOURCE_CORE_INC_UNDOATTRIBUTE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/UndoBookmark.hxx b/sw/source/core/inc/UndoBookmark.hxx
index a9650f5ea056..4cfb8543c7d0 100644
--- a/sw/source/core/inc/UndoBookmark.hxx
+++ b/sw/source/core/inc/UndoBookmark.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef SW_UNDO_BOOKMARK_HXX
-#define SW_UNDO_BOOKMARK_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_UNDOBOOKMARK_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_UNDOBOOKMARK_HXX
 
 #include <undobj.hxx>
 
@@ -68,6 +68,6 @@ public:
     virtual void RedoImpl( ::sw::UndoRedoContext & );
 };
 
-#endif // SW_UNDO_BOOKMARK_HXX
+#endif // INCLUDED_SW_SOURCE_CORE_INC_UNDOBOOKMARK_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/UndoCore.hxx b/sw/source/core/inc/UndoCore.hxx
index e71e9d028fad..13e46ac14087 100644
--- a/sw/source/core/inc/UndoCore.hxx
+++ b/sw/source/core/inc/UndoCore.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef SW_UNDOCORE_HXX
-#define SW_UNDOCORE_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_UNDOCORE_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_UNDOCORE_HXX
 
 #include <undobj.hxx>
 #include <calbck.hxx>
@@ -235,6 +235,6 @@ ShortenString(const OUString & rStr, xub_StrLen nLength, const OUString & rFillS
 */
 OUString DenoteSpecialCharacters(const OUString & rStr);
 
-#endif // SW_UNDOCORE_HXX
+#endif // INCLUDED_SW_SOURCE_CORE_INC_UNDOCORE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/UndoDelete.hxx b/sw/source/core/inc/UndoDelete.hxx
index a21b56cf8120..41169bdd66f3 100644
--- a/sw/source/core/inc/UndoDelete.hxx
+++ b/sw/source/core/inc/UndoDelete.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef SW_UNDO_DELETE_HXX
-#define SW_UNDO_DELETE_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_UNDODELETE_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_UNDODELETE_HXX
 
 #include <undobj.hxx>
 #include <rtl/ustring.hxx>
@@ -100,6 +100,6 @@ public:
     DECL_FIXEDMEMPOOL_NEWDEL(SwUndoDelete)
 };
 
-#endif // SW_UNDO_DELETE_HXX
+#endif // INCLUDED_SW_SOURCE_CORE_INC_UNDODELETE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/UndoDraw.hxx b/sw/source/core/inc/UndoDraw.hxx
index 54f335cd4d9d..b9d9c3ae063e 100644
--- a/sw/source/core/inc/UndoDraw.hxx
+++ b/sw/source/core/inc/UndoDraw.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef SW_UNDO_DRAW_HXX
-#define SW_UNDO_DRAW_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_UNDODRAW_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_UNDODRAW_HXX
 
 #include <undobj.hxx>
 #include <svx/svdundo.hxx>
@@ -129,6 +129,6 @@ public:
     void AddObj( sal_uInt16 nPos, SwDrawFrmFmt*, const SdrMark& );
 };
 
-#endif // SW_UNDO_DRAW_HXX
+#endif // INCLUDED_SW_SOURCE_CORE_INC_UNDODRAW_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/UndoInsert.hxx b/sw/source/core/inc/UndoInsert.hxx
index 3a046b2848f9..787d93a5c952 100644
--- a/sw/source/core/inc/UndoInsert.hxx
+++ b/sw/source/core/inc/UndoInsert.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef SW_UNDO_INSERT_HXX
-#define SW_UNDO_INSERT_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_UNDOINSERT_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_UNDOINSERT_HXX
 
 #include <undobj.hxx>
 #include <rtl/ustring.hxx>
@@ -211,6 +211,6 @@ public:
     void SetDrawObj( sal_uInt8 nLayerId );
 };
 
-#endif // SW_UNDO_INSERT_HXX
+#endif // INCLUDED_SW_SOURCE_CORE_INC_UNDOINSERT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/UndoManager.hxx b/sw/source/core/inc/UndoManager.hxx
index bf0ac205b7c0..2ab0bf7fef5b 100644
--- a/sw/source/core/inc/UndoManager.hxx
+++ b/sw/source/core/inc/UndoManager.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef SW_UNDO_MANAGER_HXX
-#define SW_UNDO_MANAGER_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_UNDOMANAGER_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_UNDOMANAGER_HXX
 
 #include <IDocumentUndoRedo.hxx>
 #include <boost/shared_ptr.hpp>
@@ -107,6 +107,6 @@ private:
 
 } // namespace sw
 
-#endif // SW_UNDO_MANAGER_HXX
+#endif // INCLUDED_SW_SOURCE_CORE_INC_UNDOMANAGER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/UndoNumbering.hxx b/sw/source/core/inc/UndoNumbering.hxx
index b037e8f2169c..bf92ea626613 100644
--- a/sw/source/core/inc/UndoNumbering.hxx
+++ b/sw/source/core/inc/UndoNumbering.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef SW_UNDO_NUMBERING_HXX
-#define SW_UNDO_NUMBERING_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_UNDONUMBERING_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_UNDONUMBERING_HXX
 
 #include <vector>
 #include <undobj.hxx>
@@ -140,6 +140,6 @@ public:
     virtual void RepeatImpl( ::sw::RepeatContext & );
 };
 
-#endif // SW_UNDO_NUMBERING_HXX
+#endif // INCLUDED_SW_SOURCE_CORE_INC_UNDONUMBERING_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/UndoOverwrite.hxx b/sw/source/core/inc/UndoOverwrite.hxx
index 6e6f02bc66ed..e43b4f62cf03 100644
--- a/sw/source/core/inc/UndoOverwrite.hxx
+++ b/sw/source/core/inc/UndoOverwrite.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef SW_UNDO_OVERWRITE_HXX
-#define SW_UNDO_OVERWRITE_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_UNDOOVERWRITE_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_UNDOOVERWRITE_HXX
 
 #include <com/sun/star/uno/Sequence.h>
 #include <rtl/ustring.hxx>
@@ -88,6 +88,6 @@ public:
     sal_Bool HasData() const { return aChanges.size() > 0; }
 };
 
-#endif // SW_UNDO_OVERWRITE_HXX
+#endif // INCLUDED_SW_SOURCE_CORE_INC_UNDOOVERWRITE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/UndoRedline.hxx b/sw/source/core/inc/UndoRedline.hxx
index e796dfc39dd4..24476073e2e5 100644
--- a/sw/source/core/inc/UndoRedline.hxx
+++ b/sw/source/core/inc/UndoRedline.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef SW_UNDO_REDLINE_HXX
-#define SW_UNDO_REDLINE_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_UNDOREDLINE_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_UNDOREDLINE_HXX
 
 #include <undobj.hxx>
 
@@ -128,6 +128,6 @@ public:
     virtual void RedoImpl( ::sw::UndoRedoContext & );
 };
 
-#endif // SW_UNDO_REDLINE_HXX
+#endif // INCLUDED_SW_SOURCE_CORE_INC_UNDOREDLINE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/UndoSection.hxx b/sw/source/core/inc/UndoSection.hxx
index 0cca72b77a2d..00de819f50e0 100644
--- a/sw/source/core/inc/UndoSection.hxx
+++ b/sw/source/core/inc/UndoSection.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef SW_UNDO_SECTION_HXX
-#define SW_UNDO_SECTION_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_UNDOSECTION_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_UNDOSECTION_HXX
 
 #include <undobj.hxx>
 #include <memory>
@@ -65,6 +65,6 @@ SW_DLLPRIVATE SwUndo * MakeUndoDelSection(SwSectionFmt const&);
 
 SW_DLLPRIVATE SwUndo * MakeUndoUpdateSection(SwSectionFmt const&, bool const);
 
-#endif // SW_UNDO_SECTION_HXX
+#endif // INCLUDED_SW_SOURCE_CORE_INC_UNDOSECTION_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/UndoSort.hxx b/sw/source/core/inc/UndoSort.hxx
index 08b2d48417a6..5deb7ea8a5a1 100644
--- a/sw/source/core/inc/UndoSort.hxx
+++ b/sw/source/core/inc/UndoSort.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef SW_UNDO_SORT_HXX
-#define SW_UNDO_SORT_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_UNDOSORT_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_UNDOSORT_HXX
 
 #include <undobj.hxx>
 #include <boost/ptr_container/ptr_vector.hpp>
@@ -81,6 +81,6 @@ public:
     void Insert( sal_uLong nOrgPos, sal_uLong nNewPos );
 };
 
-#endif // SW_UNDO_SORT_HXX
+#endif // INCLUDED_SW_SOURCE_CORE_INC_UNDOSORT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/UndoSplitMove.hxx b/sw/source/core/inc/UndoSplitMove.hxx
index f69a0d4869db..3b9e93f8e598 100644
--- a/sw/source/core/inc/UndoSplitMove.hxx
+++ b/sw/source/core/inc/UndoSplitMove.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef SW_UNDO_MOVE_HXX
-#define SW_UNDO_MOVE_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_UNDOSPLITMOVE_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_UNDOSPLITMOVE_HXX
 
 #include <undobj.hxx>
 
@@ -82,6 +82,6 @@ public:
     void SetMoveRedlines( bool b )       { bMoveRedlines = b; }
 };
 
-#endif // SW_UNDO_MOVE_HXX
+#endif // INCLUDED_SW_SOURCE_CORE_INC_UNDOSPLITMOVE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/UndoTable.hxx b/sw/source/core/inc/UndoTable.hxx
index 2788d83d3095..0fd261368732 100644
--- a/sw/source/core/inc/UndoTable.hxx
+++ b/sw/source/core/inc/UndoTable.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef SW_UNDO_TABLE_HXX
-#define SW_UNDO_TABLE_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_UNDOTABLE_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_UNDOTABLE_HXX
 
 #include <undobj.hxx>
 #include <memory>
@@ -376,6 +376,6 @@ public:
     virtual void RepeatImpl( ::sw::RepeatContext & );
 };
 
-#endif // SW_UNDO_TABLE_HXX
+#endif // INCLUDED_SW_SOURCE_CORE_INC_UNDOTABLE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/acorrect.hxx b/sw/source/core/inc/acorrect.hxx
index e84560e108c3..b6ae8f8f3717 100644
--- a/sw/source/core/inc/acorrect.hxx
+++ b/sw/source/core/inc/acorrect.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _ACORRECT_HXX
-#define _ACORRECT_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_ACORRECT_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_ACORRECT_HXX
 
 #include <editeng/svxacorr.hxx>
 #include <swundo.hxx>
diff --git a/sw/source/core/inc/anchoredobjectposition.hxx b/sw/source/core/inc/anchoredobjectposition.hxx
index 734d3bef9c36..90798d6292e2 100644
--- a/sw/source/core/inc/anchoredobjectposition.hxx
+++ b/sw/source/core/inc/anchoredobjectposition.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _ANCHOREDOBJECTPOSITION_HXX
-#define _ANCHOREDOBJECTPOSITION_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_ANCHOREDOBJECTPOSITION_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_ANCHOREDOBJECTPOSITION_HXX
 
 #include <swtypes.hxx>
 // #i11860#
diff --git a/sw/source/core/inc/ascharanchoredobjectposition.hxx b/sw/source/core/inc/ascharanchoredobjectposition.hxx
index 05b1bb62342e..70bbcbd985f0 100644
--- a/sw/source/core/inc/ascharanchoredobjectposition.hxx
+++ b/sw/source/core/inc/ascharanchoredobjectposition.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _ASCHARANCHOREDOBJECTPOSITION_HXX
-#define _ASCHARANCHOREDOBJECTPOSITION_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_ASCHARANCHOREDOBJECTPOSITION_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_ASCHARANCHOREDOBJECTPOSITION_HXX
 
 #include <anchoredobjectposition.hxx>
 #include <sal/types.h>
diff --git a/sw/source/core/inc/attrhint.hxx b/sw/source/core/inc/attrhint.hxx
index af6891997edf..34d563179978 100644
--- a/sw/source/core/inc/attrhint.hxx
+++ b/sw/source/core/inc/attrhint.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _ATTRHINT_HXX
-#define _ATTRHINT_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_ATTRHINT_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_ATTRHINT_HXX
 
 #include <svl/hint.hxx>
 
diff --git a/sw/source/core/inc/blink.hxx b/sw/source/core/inc/blink.hxx
index 9062ea9aaa43..a5a865eabdb4 100644
--- a/sw/source/core/inc/blink.hxx
+++ b/sw/source/core/inc/blink.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _BLINK_HXX
-#define _BLINK_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_BLINK_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_BLINK_HXX
 
 class SwLinePortion;
 class SwRootFrm;
diff --git a/sw/source/core/inc/bodyfrm.hxx b/sw/source/core/inc/bodyfrm.hxx
index e73b70198c48..769fe1ea4eb2 100644
--- a/sw/source/core/inc/bodyfrm.hxx
+++ b/sw/source/core/inc/bodyfrm.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _BODYFRM_HXX
-#define _BODYFRM_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_BODYFRM_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_BODYFRM_HXX
 
 #include <tools/mempool.hxx>
 #include "layfrm.hxx"
diff --git a/sw/source/core/inc/bookmrk.hxx b/sw/source/core/inc/bookmrk.hxx
index 37f32ee19e17..761842fe8da7 100644
--- a/sw/source/core/inc/bookmrk.hxx
+++ b/sw/source/core/inc/bookmrk.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _BOOKMRK_HXX
-#define _BOOKMRK_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_BOOKMRK_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_BOOKMRK_HXX
 
 #include <cppuhelper/weakref.hxx>
 #include <sfx2/Metadatable.hxx>
diff --git a/sw/source/core/inc/cellfrm.hxx b/sw/source/core/inc/cellfrm.hxx
index 050723ccea3e..7168b569a9aa 100644
--- a/sw/source/core/inc/cellfrm.hxx
+++ b/sw/source/core/inc/cellfrm.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef SW_CELLFRM_HXX
-#define SW_CELLFRM_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_CELLFRM_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_CELLFRM_HXX
 
 #include <tools/mempool.hxx>
 #include "layfrm.hxx"
diff --git a/sw/source/core/inc/cntfrm.hxx b/sw/source/core/inc/cntfrm.hxx
index f8da74e82835..3eba858ab9a4 100644
--- a/sw/source/core/inc/cntfrm.hxx
+++ b/sw/source/core/inc/cntfrm.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CNTFRM_HXX
-#define _CNTFRM_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_CNTFRM_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_CNTFRM_HXX
 
 #include "frame.hxx"
 #include "flowfrm.hxx"
diff --git a/sw/source/core/inc/colfrm.hxx b/sw/source/core/inc/colfrm.hxx
index 10986274026c..93ee8b163668 100644
--- a/sw/source/core/inc/colfrm.hxx
+++ b/sw/source/core/inc/colfrm.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _COLFRM_HXX
-#define _COLFRM_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_COLFRM_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_COLFRM_HXX
 
 #include <tools/mempool.hxx>
 #include "ftnboss.hxx"
@@ -35,6 +35,6 @@ public:
     DECL_FIXEDMEMPOOL_NEWDEL(SwColumnFrm)
 };
 
-#endif  //_COLFRM_HXX
+#endif // INCLUDED_SW_SOURCE_CORE_INC_COLFRM_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/crossrefbookmark.hxx b/sw/source/core/inc/crossrefbookmark.hxx
index 314cdf83fdb5..ae74d74cd824 100644
--- a/sw/source/core/inc/crossrefbookmark.hxx
+++ b/sw/source/core/inc/crossrefbookmark.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CROSSREFBOOKMRK_HXX
-#define _CROSSREFBOOKMRK_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_CROSSREFBOOKMARK_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_CROSSREFBOOKMARK_HXX
 
 #include <IMark.hxx>
 #include <bookmrk.hxx>
diff --git a/sw/source/core/inc/dbg_lay.hxx b/sw/source/core/inc/dbg_lay.hxx
index f5a537fbd0f6..c175c7cecd7b 100644
--- a/sw/source/core/inc/dbg_lay.hxx
+++ b/sw/source/core/inc/dbg_lay.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DBG_LAY_HXX
-#define _DBG_LAY_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_DBG_LAY_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_DBG_LAY_HXX
 
 #define PROT_FILE_INIT  0x00000000
 #define PROT_INIT       0x00000001
diff --git a/sw/source/core/inc/dflyobj.hxx b/sw/source/core/inc/dflyobj.hxx
index 5dd9133bbaeb..1f84e50b414b 100644
--- a/sw/source/core/inc/dflyobj.hxx
+++ b/sw/source/core/inc/dflyobj.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DFLYOBJ_HXX
-#define _DFLYOBJ_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_DFLYOBJ_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_DFLYOBJ_HXX
 
 #include <svx/svdovirt.hxx>
 
diff --git a/sw/source/core/inc/docfld.hxx b/sw/source/core/inc/docfld.hxx
index 3bc12878f5af..d4597aef76a7 100644
--- a/sw/source/core/inc/docfld.hxx
+++ b/sw/source/core/inc/docfld.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DOCFLD_HXX
-#define _DOCFLD_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_DOCFLD_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_DOCFLD_HXX
 
 #include <calc.hxx>
 #include <doc.hxx>
diff --git a/sw/source/core/inc/docsort.hxx b/sw/source/core/inc/docsort.hxx
index 982eafa8fc4a..64e34fb5609a 100644
--- a/sw/source/core/inc/docsort.hxx
+++ b/sw/source/core/inc/docsort.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SORT_HXX
-#define _SORT_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_DOCSORT_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_DOCSORT_HXX
 
 #include <ndindex.hxx>
 #include <vector>
diff --git a/sw/source/core/inc/doctxm.hxx b/sw/source/core/inc/doctxm.hxx
index 2fbcb5eeb8a5..0def0d698cc8 100644
--- a/sw/source/core/inc/doctxm.hxx
+++ b/sw/source/core/inc/doctxm.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DOCTXM_HXX
-#define _DOCTXM_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_DOCTXM_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_DOCTXM_HXX
 
 #include <tools/gen.hxx>
 #include <tox.hxx>
diff --git a/sw/source/core/inc/drawfont.hxx b/sw/source/core/inc/drawfont.hxx
index 86c18b863015..657026c6f32e 100644
--- a/sw/source/core/inc/drawfont.hxx
+++ b/sw/source/core/inc/drawfont.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DRAWFONT_HXX
-#define _DRAWFONT_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_DRAWFONT_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_DRAWFONT_HXX
 
 #include <tools/solar.h>
 #include <tools/debug.hxx>
diff --git a/sw/source/core/inc/dumpfilter.hxx b/sw/source/core/inc/dumpfilter.hxx
index 3fd551c17fa8..b177e9cc00e9 100644
--- a/sw/source/core/inc/dumpfilter.hxx
+++ b/sw/source/core/inc/dumpfilter.hxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef _LAYOUTDUMP_HXX
-#define _LAYOUTDUMP_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_DUMPFILTER_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_DUMPFILTER_HXX
 
 #include <com/sun/star/document/XFilter.hpp>
 #include <com/sun/star/document/XExporter.hpp>
diff --git a/sw/source/core/inc/dview.hxx b/sw/source/core/inc/dview.hxx
index 66aa2c3dcda6..727c060ea67f 100644
--- a/sw/source/core/inc/dview.hxx
+++ b/sw/source/core/inc/dview.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _DVIEW_HXX
-#define _DVIEW_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_DVIEW_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_DVIEW_HXX
 
 #include <svx/fmview.hxx>
 
diff --git a/sw/source/core/inc/environmentofanchoredobject.hxx b/sw/source/core/inc/environmentofanchoredobject.hxx
index 54961f4daf61..462dfbd87ab9 100644
--- a/sw/source/core/inc/environmentofanchoredobject.hxx
+++ b/sw/source/core/inc/environmentofanchoredobject.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _ENVIRONMENTOFANCHOREDOBJECT_HXX
-#define _ENVIRONMENTOFANCHOREDOBJECT_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_ENVIRONMENTOFANCHOREDOBJECT_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_ENVIRONMENTOFANCHOREDOBJECT_HXX
 
 class SwFrm;
 class SwLayoutFrm;
diff --git a/sw/source/core/inc/fieldhint.hxx b/sw/source/core/inc/fieldhint.hxx
index 2a2fa7a707ba..8821698580d5 100644
--- a/sw/source/core/inc/fieldhint.hxx
+++ b/sw/source/core/inc/fieldhint.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _FIELDHINT_HXX
-#define _FIELDHINT_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_FIELDHINT_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_FIELDHINT_HXX
 
 #include <svl/hint.hxx>
 
diff --git a/sw/source/core/inc/finalthreadmanager.hxx b/sw/source/core/inc/finalthreadmanager.hxx
index b0df0acdc808..d9fa0953a796 100644
--- a/sw/source/core/inc/finalthreadmanager.hxx
+++ b/sw/source/core/inc/finalthreadmanager.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _FINALTHREADMANAGER_HXX
-#define _FINALTHREADMANAGER_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_FINALTHREADMANAGER_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_FINALTHREADMANAGER_HXX
 
 #include "sal/config.h"
 #include "cppuhelper/factory.hxx"
diff --git a/sw/source/core/inc/flowfrm.hxx b/sw/source/core/inc/flowfrm.hxx
index 2a75f9c40c71..398d5bd9f819 100644
--- a/sw/source/core/inc/flowfrm.hxx
+++ b/sw/source/core/inc/flowfrm.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _FLOWFRM_HXX
-#define _FLOWFRM_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_FLOWFRM_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_FLOWFRM_HXX
 
 class SwPageFrm;
 class SwRect;
diff --git a/sw/source/core/inc/flyfrm.hxx b/sw/source/core/inc/flyfrm.hxx
index 1c6328c09108..5d94e6a1041c 100644
--- a/sw/source/core/inc/flyfrm.hxx
+++ b/sw/source/core/inc/flyfrm.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef SW_FLYFRM_HXX
-#define SW_FLYFRM_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_FLYFRM_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_FLYFRM_HXX
 
 #include "layfrm.hxx"
 #include <list>
diff --git a/sw/source/core/inc/flyfrms.hxx b/sw/source/core/inc/flyfrms.hxx
index 067393734467..2fb9c0e012e4 100644
--- a/sw/source/core/inc/flyfrms.hxx
+++ b/sw/source/core/inc/flyfrms.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _FLYFRMS_HXX
-#define _FLYFRMS_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_FLYFRMS_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_FLYFRMS_HXX
 
 #include "flyfrm.hxx"
 
diff --git a/sw/source/core/inc/fntcache.hxx b/sw/source/core/inc/fntcache.hxx
index d92a5e4196f4..27ac5b41e88e 100644
--- a/sw/source/core/inc/fntcache.hxx
+++ b/sw/source/core/inc/fntcache.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _FNTCACHE_HXX
-#define _FNTCACHE_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_FNTCACHE_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_FNTCACHE_HXX
 
 #include <vcl/font.hxx>
 #include <tools/mempool.hxx>
diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx
index 5e91620ae190..8c1006174cf1 100644
--- a/sw/source/core/inc/frame.hxx
+++ b/sw/source/core/inc/frame.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef SW_FRAME_HXX
-#define SW_FRAME_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_FRAME_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_FRAME_HXX
 
 #include <vector>
 #include <drawinglayer/primitive2d/baseprimitive2d.hxx>
diff --git a/sw/source/core/inc/frminf.hxx b/sw/source/core/inc/frminf.hxx
index 4220ee0c690c..b6bb3ce377ac 100644
--- a/sw/source/core/inc/frminf.hxx
+++ b/sw/source/core/inc/frminf.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _FRMINF_HXX
-#define _FRMINF_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_FRMINF_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_FRMINF_HXX
 
 #include "swtypes.hxx"
 
diff --git a/sw/source/core/inc/frmtool.hxx b/sw/source/core/inc/frmtool.hxx
index c3c609fd097b..33043516190c 100644
--- a/sw/source/core/inc/frmtool.hxx
+++ b/sw/source/core/inc/frmtool.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _FRMTOOL_HXX
-#define _FRMTOOL_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_FRMTOOL_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_FRMTOOL_HXX
 
 #include "swtypes.hxx"
 #include "layfrm.hxx"
diff --git a/sw/source/core/inc/ftnboss.hxx b/sw/source/core/inc/ftnboss.hxx
index 5775b7745e89..1822a3513511 100644
--- a/sw/source/core/inc/ftnboss.hxx
+++ b/sw/source/core/inc/ftnboss.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _FTNBOSS_HXX
-#define _FTNBOSS_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_FTNBOSS_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_FTNBOSS_HXX
 
 #include "layfrm.hxx"
 
diff --git a/sw/source/core/inc/ftnfrm.hxx b/sw/source/core/inc/ftnfrm.hxx
index ebd1b097517c..862b86357214 100644
--- a/sw/source/core/inc/ftnfrm.hxx
+++ b/sw/source/core/inc/ftnfrm.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _FTNFRM_HXX
-#define _FTNFRM_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_FTNFRM_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_FTNFRM_HXX
 
 #include "layfrm.hxx"
 
diff --git a/sw/source/core/inc/hffrm.hxx b/sw/source/core/inc/hffrm.hxx
index d6701b5872d8..ba6b3625aba6 100644
--- a/sw/source/core/inc/hffrm.hxx
+++ b/sw/source/core/inc/hffrm.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _HFFRM_HXX
-#define _HFFRM_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_HFFRM_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_HFFRM_HXX
 
 #include <tools/mempool.hxx>
 #include "layfrm.hxx"
diff --git a/sw/source/core/inc/ifinishedthreadlistener.hxx b/sw/source/core/inc/ifinishedthreadlistener.hxx
index 2ca9d9fc3a56..0cee4360810c 100644
--- a/sw/source/core/inc/ifinishedthreadlistener.hxx
+++ b/sw/source/core/inc/ifinishedthreadlistener.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _IFINISHEDTHREADLISTENER_HXX
-#define _IFINISHEDTHREADLISTENER_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_IFINISHEDTHREADLISTENER_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_IFINISHEDTHREADLISTENER_HXX
 
 #include <osl/interlck.h>
 
diff --git a/sw/source/core/inc/ithreadlistenerowner.hxx b/sw/source/core/inc/ithreadlistenerowner.hxx
index 2103ccb92951..47e07dd687b6 100644
--- a/sw/source/core/inc/ithreadlistenerowner.hxx
+++ b/sw/source/core/inc/ithreadlistenerowner.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _ITHREADLISTENEROWNER_HXX
-#define _ITHREADLISTENEROWNER_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_ITHREADLISTENEROWNER_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_ITHREADLISTENEROWNER_HXX
 
 #include <ifinishedthreadlistener.hxx>
 #include <boost/weak_ptr.hpp>
diff --git a/sw/source/core/inc/layact.hxx b/sw/source/core/inc/layact.hxx
index 2cf740b94474..29f1f8296097 100644
--- a/sw/source/core/inc/layact.hxx
+++ b/sw/source/core/inc/layact.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _LAYACT_HXX
-#define _LAYACT_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_LAYACT_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_LAYACT_HXX
 #include "swtypes.hxx"
 #include "swrect.hxx"
 
@@ -228,6 +228,6 @@ inline void SwLayAction::SetCheckPageNum( sal_uInt16 nNew )
         nCheckPageNum = nNew;
 }
 
-#endif  //_LAYACT_HXX
+#endif // INCLUDED_SW_SOURCE_CORE_INC_LAYACT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/laycache.hxx b/sw/source/core/inc/laycache.hxx
index fd8fb2a001e0..b9a0a40ca557 100644
--- a/sw/source/core/inc/laycache.hxx
+++ b/sw/source/core/inc/laycache.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _LAYCACHE_HXX
-#define _LAYCACHE_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_LAYCACHE_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_LAYCACHE_HXX
 
 #include <tools/solar.h>
 
diff --git a/sw/source/core/inc/layfrm.hxx b/sw/source/core/inc/layfrm.hxx
index fdd6b7cb034e..30af36c8e9aa 100644
--- a/sw/source/core/inc/layfrm.hxx
+++ b/sw/source/core/inc/layfrm.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef SW_LAYFRM_HXX
-#define SW_LAYFRM_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_LAYFRM_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_LAYFRM_HXX
 
 #include "frame.hxx"
 
@@ -198,6 +198,6 @@ inline SwFrm* SwLayoutFrm::GetLastLower()
     return const_cast<SwFrm*>(static_cast<const SwLayoutFrm*>(this)->GetLastLower());
 }
 
-#endif  // SW_LAYFRM_HXX
+#endif // INCLUDED_SW_SOURCE_CORE_INC_LAYFRM_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/layouter.hxx b/sw/source/core/inc/layouter.hxx
index 2750a361136f..2454d2df7187 100644
--- a/sw/source/core/inc/layouter.hxx
+++ b/sw/source/core/inc/layouter.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _LAYOUTER_HXX
-#define _LAYOUTER_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_LAYOUTER_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_LAYOUTER_HXX
 
 #include "swtypes.hxx"
 
@@ -141,7 +141,7 @@ public:
 
 extern void LOOPING_LOUIE_LIGHT( bool bCondition, const SwTxtFrm& rTxtFrm );
 
-#endif  //_LAYOUTER_HXX
+#endif // INCLUDED_SW_SOURCE_CORE_INC_LAYOUTER_HXX
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/movedfwdfrmsbyobjpos.hxx b/sw/source/core/inc/movedfwdfrmsbyobjpos.hxx
index a4afc5819211..8683d68f69fc 100644
--- a/sw/source/core/inc/movedfwdfrmsbyobjpos.hxx
+++ b/sw/source/core/inc/movedfwdfrmsbyobjpos.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _MOVEDFWDFRMSBYOBJPOS_HXX
-#define _MOVEDFWDFRMSBYOBJPOS_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_MOVEDFWDFRMSBYOBJPOS_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_MOVEDFWDFRMSBYOBJPOS_HXX
 
 #include <map>
 #include <sal/types.h>
diff --git a/sw/source/core/inc/mvsave.hxx b/sw/source/core/inc/mvsave.hxx
index 5117481f86ea..6ad480c53cc1 100644
--- a/sw/source/core/inc/mvsave.hxx
+++ b/sw/source/core/inc/mvsave.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef SW_MVSAVE_HXX
-#define SW_MVSAVE_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_MVSAVE_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_MVSAVE_HXX
 
 #include <vcl/keycod.hxx>
 #include <IDocumentMarkAccess.hxx>
@@ -196,6 +196,6 @@ public:
 };
 
 
-#endif  // SW_MVSAVE_HXX
+#endif // INCLUDED_SW_SOURCE_CORE_INC_MVSAVE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/node2lay.hxx b/sw/source/core/inc/node2lay.hxx
index 080163159532..89de8533e131 100644
--- a/sw/source/core/inc/node2lay.hxx
+++ b/sw/source/core/inc/node2lay.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _NODE2LAY_HXX
-#define _NODE2LAY_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_NODE2LAY_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_NODE2LAY_HXX
 
 #include <tools/solar.h>
 
diff --git a/sw/source/core/inc/noteurl.hxx b/sw/source/core/inc/noteurl.hxx
index 779f67ac2f87..734f0c1796fa 100644
--- a/sw/source/core/inc/noteurl.hxx
+++ b/sw/source/core/inc/noteurl.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _NOTEURL_HXX
-#define _NOTEURL_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_NOTEURL_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_NOTEURL_HXX
 
 #include "swrect.hxx"
 #include <boost/ptr_container/ptr_vector.hpp>
diff --git a/sw/source/core/inc/notxtfrm.hxx b/sw/source/core/inc/notxtfrm.hxx
index cbaa1995f16a..d514d8af7e29 100644
--- a/sw/source/core/inc/notxtfrm.hxx
+++ b/sw/source/core/inc/notxtfrm.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef SW_NOTXTFRM_HXX
-#define SW_NOTXTFRM_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_NOTXTFRM_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_NOTXTFRM_HXX
 
 #include <cntfrm.hxx>
 
diff --git a/sw/source/core/inc/objectformatter.hxx b/sw/source/core/inc/objectformatter.hxx
index 07ed8bdd2676..fc5964c46885 100644
--- a/sw/source/core/inc/objectformatter.hxx
+++ b/sw/source/core/inc/objectformatter.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _OBJECTFORMATTER_HXX
-#define _OBJECTFORMATTER_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_OBJECTFORMATTER_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_OBJECTFORMATTER_HXX
 
 #include <sal/types.h>
 
diff --git a/sw/source/core/inc/observablethread.hxx b/sw/source/core/inc/observablethread.hxx
index ef545d10a1d7..365c807a18db 100644
--- a/sw/source/core/inc/observablethread.hxx
+++ b/sw/source/core/inc/observablethread.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _OBSERVABLETHREAD_HXX
-#define _OBSERVABLETHREAD_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_OBSERVABLETHREAD_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_OBSERVABLETHREAD_HXX
 
 #include <osl/thread.hxx>
 #include <rtl/ref.hxx>
diff --git a/sw/source/core/inc/pagedeschint.hxx b/sw/source/core/inc/pagedeschint.hxx
index 6857521b649c..715caee10cf9 100644
--- a/sw/source/core/inc/pagedeschint.hxx
+++ b/sw/source/core/inc/pagedeschint.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _PAGEDESCHINT_HXX
-#define _PAGEDESCHINT_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_PAGEDESCHINT_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_PAGEDESCHINT_HXX
 
 #include <svl/hint.hxx>
 
diff --git a/sw/source/core/inc/pagefrm.hxx b/sw/source/core/inc/pagefrm.hxx
index d633e5a8c35c..31087175d306 100644
--- a/sw/source/core/inc/pagefrm.hxx
+++ b/sw/source/core/inc/pagefrm.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _PAGEFRM_HXX
-#define _PAGEFRM_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_PAGEFRM_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_PAGEFRM_HXX
 
 #include <viewsh.hxx>
 #include "ftnboss.hxx"
@@ -440,6 +440,6 @@ inline sal_Bool SwPageFrm::IsInvalidFly() const
 
 
 
-#endif  //_PAGEFRM_HXX
+#endif // INCLUDED_SW_SOURCE_CORE_INC_PAGEFRM_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/pamtyp.hxx b/sw/source/core/inc/pamtyp.hxx
index 647596e6a6dd..b1e6b90b8504 100644
--- a/sw/source/core/inc/pamtyp.hxx
+++ b/sw/source/core/inc/pamtyp.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _PAMTYP_HXX
-#define _PAMTYP_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_PAMTYP_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_PAMTYP_HXX
 
 #include <unotools/textsearch.hxx>
 #include <node.hxx>
diff --git a/sw/source/core/inc/prevwpage.hxx b/sw/source/core/inc/prevwpage.hxx
index 4863cb7fbcb8..60dc7a650bda 100644
--- a/sw/source/core/inc/prevwpage.hxx
+++ b/sw/source/core/inc/prevwpage.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _PREVIEWPAGES_HXX
-#define _PREVIEWPAGES_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_PREVWPAGE_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_PREVWPAGE_HXX
 
 // classes <Point>, <Size> and <Rectangle>
 #include <tools/gen.hxx>
diff --git a/sw/source/core/inc/ptqueue.hxx b/sw/source/core/inc/ptqueue.hxx
index 7d1fab25cb0a..155776d850e3 100644
--- a/sw/source/core/inc/ptqueue.hxx
+++ b/sw/source/core/inc/ptqueue.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _PTQUEUE_HXX
-#define _PTQUEUE_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_PTQUEUE_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_PTQUEUE_HXX
 
 //Leider vertragen wir es nicht so gut, wenn wir mehr als ein Paint
 //gleichzeitig verarbeiten sollen. Insbesondere beim Drucken kommt dies
diff --git a/sw/source/core/inc/retrievedinputstreamdata.hxx b/sw/source/core/inc/retrievedinputstreamdata.hxx
index e616f518e235..ba330e383dbd 100644
--- a/sw/source/core/inc/retrievedinputstreamdata.hxx
+++ b/sw/source/core/inc/retrievedinputstreamdata.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _RETRIEVEDINPUTSTREAMDATA_HXX
-#define _RETRIEVEDINPUTSTREAMDATA_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_RETRIEVEDINPUTSTREAMDATA_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_RETRIEVEDINPUTSTREAMDATA_HXX
 
 #include <tools/link.hxx>
 #include <sal/types.h>
diff --git a/sw/source/core/inc/retrieveinputstream.hxx b/sw/source/core/inc/retrieveinputstream.hxx
index a7ddbc530402..267d5fe56494 100644
--- a/sw/source/core/inc/retrieveinputstream.hxx
+++ b/sw/source/core/inc/retrieveinputstream.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _RETRIEVEINPUTSTREAM_HXX
-#define _RETRIEVEINPUTSTREAM_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_RETRIEVEINPUTSTREAM_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_RETRIEVEINPUTSTREAM_HXX
 
 #include <observablethread.hxx>
 #include <rtl/ustring.hxx>
diff --git a/sw/source/core/inc/retrieveinputstreamconsumer.hxx b/sw/source/core/inc/retrieveinputstreamconsumer.hxx
index 6410bf7fcba0..e56f664a72a8 100644
--- a/sw/source/core/inc/retrieveinputstreamconsumer.hxx
+++ b/sw/source/core/inc/retrieveinputstreamconsumer.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _RETRIEVEINPUTSTREAMCONSUMER_HXX
-#define _RETRIEVEINPUTSTREAMCONSUMER_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_RETRIEVEINPUTSTREAMCONSUMER_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_RETRIEVEINPUTSTREAMCONSUMER_HXX
 
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/io/XInputStream.hpp>
diff --git a/sw/source/core/inc/rolbck.hxx b/sw/source/core/inc/rolbck.hxx
index 3bb927d850f0..7a30ea88c023 100644
--- a/sw/source/core/inc/rolbck.hxx
+++ b/sw/source/core/inc/rolbck.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _ROLBCK_HXX
-#define _ROLBCK_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_ROLBCK_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_ROLBCK_HXX
 
 #include <tools/solar.h>
 #include <svl/itemset.hxx>
@@ -425,6 +425,6 @@ public:
     void ChangeNodeIndex( sal_uLong nNew ) { m_nNodeIndex = nNew; }
 };
 
-#endif // _ROLBCK_HXX
+#endif // INCLUDED_SW_SOURCE_CORE_INC_ROLBCK_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/rootfrm.hxx b/sw/source/core/inc/rootfrm.hxx
index 7de8ef58a194..a40d847cb707 100644
--- a/sw/source/core/inc/rootfrm.hxx
+++ b/sw/source/core/inc/rootfrm.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef SW_ROOTFRM_HXX
-#define SW_ROOTFRM_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_ROOTFRM_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_ROOTFRM_HXX
 
 #include "layfrm.hxx"
 #include <viewsh.hxx>
@@ -370,6 +370,6 @@ inline  void SwRootFrm::SetVirtPageNum( const sal_Bool bOf) const
     ((SwRootFrm*)this)->bIsVirtPageNum = bOf;
 }
 
-#endif  // SW_ROOTFRM_HXX
+#endif // INCLUDED_SW_SOURCE_CORE_INC_ROOTFRM_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/rowfrm.hxx b/sw/source/core/inc/rowfrm.hxx
index abff0264f81d..2983e4561559 100644
--- a/sw/source/core/inc/rowfrm.hxx
+++ b/sw/source/core/inc/rowfrm.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _ROWFRM_HXX
-#define _ROWFRM_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_ROWFRM_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_ROWFRM_HXX
 
 #include <tools/mempool.hxx>
 
diff --git a/sw/source/core/inc/scriptinfo.hxx b/sw/source/core/inc/scriptinfo.hxx
index 719fbf7ff5eb..b824e072fcdc 100644
--- a/sw/source/core/inc/scriptinfo.hxx
+++ b/sw/source/core/inc/scriptinfo.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef SW_SCRIPTINFO_HXX
-#define SW_SCRIPTINFO_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_SCRIPTINFO_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_SCRIPTINFO_HXX
 
 #include <list>
 #include <deque>
diff --git a/sw/source/core/inc/sectfrm.hxx b/sw/source/core/inc/sectfrm.hxx
index 0d513b13f648..c25ef6314163 100644
--- a/sw/source/core/inc/sectfrm.hxx
+++ b/sw/source/core/inc/sectfrm.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SECTFRM_HXX
-#define _SECTFRM_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_SECTFRM_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_SECTFRM_HXX
 #include <tools/mempool.hxx>
 
 #include "layfrm.hxx"
@@ -161,6 +161,6 @@ inline const SwCntntFrm *SwSectionFrm::FindLastCntnt( sal_uInt8 nMode ) const
 }
 
 
-#endif  //_SECTFRM_HXX
+#endif // INCLUDED_SW_SOURCE_CORE_INC_SECTFRM_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/setmapvirtdev.hxx b/sw/source/core/inc/setmapvirtdev.hxx
index 7f2ef6dd6101..2ee57c2f6ed7 100644
--- a/sw/source/core/inc/setmapvirtdev.hxx
+++ b/sw/source/core/inc/setmapvirtdev.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SETMAPVIRTDEV_HXX
-#define _SETMAPVIRTDEV_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_SETMAPVIRTDEV_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_SETMAPVIRTDEV_HXX
 
 class OutputDevice;
 class VirtualDevice;
diff --git a/sw/source/core/inc/sortedobjs.hxx b/sw/source/core/inc/sortedobjs.hxx
index e82027138735..a4c820f35420 100644
--- a/sw/source/core/inc/sortedobjs.hxx
+++ b/sw/source/core/inc/sortedobjs.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SORTEDOBJS_HXX
-#define _SORTEDOBJS_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_SORTEDOBJS_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_SORTEDOBJS_HXX
 
 #include <sal/types.h>
 #include <vector>
diff --git a/sw/source/core/inc/swblocks.hxx b/sw/source/core/inc/swblocks.hxx
index e5f0e20970e5..840485c40990 100644
--- a/sw/source/core/inc/swblocks.hxx
+++ b/sw/source/core/inc/swblocks.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SWBLOCKS_HXX
-#define _SWBLOCKS_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_SWBLOCKS_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_SWBLOCKS_HXX
 
 #include <tools/datetime.hxx>
 #include <o3tl/sorted_vector.hxx>
diff --git a/sw/source/core/inc/swcache.hxx b/sw/source/core/inc/swcache.hxx
index 6899521853f7..fb412c3ad93b 100644
--- a/sw/source/core/inc/swcache.hxx
+++ b/sw/source/core/inc/swcache.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SWCACHE_HXX
-#define _SWCACHE_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_SWCACHE_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_SWCACHE_HXX
 
 /*
  * Es werden Pointer auf Objekte verwaltet. Diese werden in einem einfachen
diff --git a/sw/source/core/inc/swfntcch.hxx b/sw/source/core/inc/swfntcch.hxx
index 7f29fd8bc69f..1169f9455e5e 100644
--- a/sw/source/core/inc/swfntcch.hxx
+++ b/sw/source/core/inc/swfntcch.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SWFNTCCH_HXX
-#define _SWFNTCCH_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_SWFNTCCH_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_SWFNTCCH_HXX
 
 #include <tools/mempool.hxx>
 
diff --git a/sw/source/core/inc/swfont.hxx b/sw/source/core/inc/swfont.hxx
index 34edd1dabb50..8a4526cfe038 100644
--- a/sw/source/core/inc/swfont.hxx
+++ b/sw/source/core/inc/swfont.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SWFONT_HXX
-#define _SWFONT_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_SWFONT_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_SWFONT_HXX
 
 #include <i18nlangtag/lang.h>
 #include <tools/color.hxx>
diff --git a/sw/source/core/inc/swselectionlist.hxx b/sw/source/core/inc/swselectionlist.hxx
index ac4650ad1818..aa920d78d0e5 100644
--- a/sw/source/core/inc/swselectionlist.hxx
+++ b/sw/source/core/inc/swselectionlist.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SWSELECTIONLIST_HXX
-#define _SWSELECTIONLIST_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_SWSELECTIONLIST_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_SWSELECTIONLIST_HXX
 
 #include <list>
 
@@ -86,6 +86,6 @@ public:
     bool checkContext( const SwFrm* pCheck );
 };
 
-#endif  //_SWSELECTIONLIST_HXX
+#endif // INCLUDED_SW_SOURCE_CORE_INC_SWSELECTIONLIST_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/swthreadjoiner.hxx b/sw/source/core/inc/swthreadjoiner.hxx
index a9c38037b313..29b1b132f5f2 100644
--- a/sw/source/core/inc/swthreadjoiner.hxx
+++ b/sw/source/core/inc/swthreadjoiner.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SWTHREADJOINER_HXX
-#define _SWTHREADJOINER_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_SWTHREADJOINER_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_SWTHREADJOINER_HXX
 
 #include "com/sun/star/util/XJobManager.hpp"
 
diff --git a/sw/source/core/inc/swthreadmanager.hxx b/sw/source/core/inc/swthreadmanager.hxx
index 9629790a202a..e4c332287e1c 100644
--- a/sw/source/core/inc/swthreadmanager.hxx
+++ b/sw/source/core/inc/swthreadmanager.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SWTHREADMANAGER_HXX
-#define _SWTHREADMANAGER_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_SWTHREADMANAGER_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_SWTHREADMANAGER_HXX
 
 #include <osl/interlck.h>
 #include <osl/mutex.hxx>
diff --git a/sw/source/core/inc/tabfrm.hxx b/sw/source/core/inc/tabfrm.hxx
index 1041385562ba..15ad133f0946 100644
--- a/sw/source/core/inc/tabfrm.hxx
+++ b/sw/source/core/inc/tabfrm.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef SW_TABFRM_HXX
-#define SW_TABFRM_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_TABFRM_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_TABFRM_HXX
 
 #include <tools/mempool.hxx>
 #include "layfrm.hxx"
@@ -223,6 +223,6 @@ inline SwTabFrm *SwTabFrm::GetFollow()
     return (SwTabFrm*)SwFlowFrm::GetFollow();
 }
 
-#endif  // SW_TABFRM_HXX
+#endif // INCLUDED_SW_SOURCE_CORE_INC_TABFRM_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/tblrwcl.hxx b/sw/source/core/inc/tblrwcl.hxx
index 96895beb3947..5d2a701e24e9 100644
--- a/sw/source/core/inc/tblrwcl.hxx
+++ b/sw/source/core/inc/tblrwcl.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _TBLRWCL_HXX
-#define _TBLRWCL_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_TBLRWCL_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_TBLRWCL_HXX
 #include <cstddef>
 #include <vector>
 #include <swtypes.hxx>
diff --git a/sw/source/core/inc/textapi.hxx b/sw/source/core/inc/textapi.hxx
index 4daf52959169..c4158c9dadc5 100644
--- a/sw/source/core/inc/textapi.hxx
+++ b/sw/source/core/inc/textapi.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef SW_TEXTAPI_HXX
-#define SW_TEXTAPI_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_TEXTAPI_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_TEXTAPI_HXX
 
 #include <editeng/unoedsrc.hxx>
 #include <editeng/unotext.hxx>
diff --git a/sw/source/core/inc/threadlistener.hxx b/sw/source/core/inc/threadlistener.hxx
index a0fceb4c1889..f345728ec66b 100644
--- a/sw/source/core/inc/threadlistener.hxx
+++ b/sw/source/core/inc/threadlistener.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _THREADLISTENER_HXX
-#define _THREADLISTENER_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_THREADLISTENER_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_THREADLISTENER_HXX
 
 #include <ifinishedthreadlistener.hxx>
 #include <ithreadlistenerowner.hxx>
diff --git a/sw/source/core/inc/threadmanager.hxx b/sw/source/core/inc/threadmanager.hxx
index 4b47f323f5ed..aa6d952fed7c 100644
--- a/sw/source/core/inc/threadmanager.hxx
+++ b/sw/source/core/inc/threadmanager.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _THREADMANAGER_HXX
-#define _THREADMANAGER_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_THREADMANAGER_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_THREADMANAGER_HXX
 
 #include <ithreadlistenerowner.hxx>
 #include <vcl/timer.hxx>
diff --git a/sw/source/core/inc/tocntntanchoredobjectposition.hxx b/sw/source/core/inc/tocntntanchoredobjectposition.hxx
index 0b629bf08a52..4673b52a8dcb 100644
--- a/sw/source/core/inc/tocntntanchoredobjectposition.hxx
+++ b/sw/source/core/inc/tocntntanchoredobjectposition.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _TOCNTNTANCHOREDOBJECTPOSITION_HXX
-#define _TOCNTNTANCHOREDOBJECTPOSITION_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_TOCNTNTANCHOREDOBJECTPOSITION_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_TOCNTNTANCHOREDOBJECTPOSITION_HXX
 #include <anchoredobjectposition.hxx>
 
 class SwFrm;
diff --git a/sw/source/core/inc/tolayoutanchoredobjectposition.hxx b/sw/source/core/inc/tolayoutanchoredobjectposition.hxx
index 6558ce98dce1..cab45c43763e 100644
--- a/sw/source/core/inc/tolayoutanchoredobjectposition.hxx
+++ b/sw/source/core/inc/tolayoutanchoredobjectposition.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _TOLAYOUTANCHOREDOBJECTPOSITION_HXX
-#define _TOLAYOUTANCHOREDOBJECTPOSITION_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_TOLAYOUTANCHOREDOBJECTPOSITION_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_TOLAYOUTANCHOREDOBJECTPOSITION_HXX
 #include <anchoredobjectposition.hxx>
 #include <swtypes.hxx>
 #include <swrect.hxx>
diff --git a/sw/source/core/inc/txmsrt.hxx b/sw/source/core/inc/txmsrt.hxx
index 1d6fd1f1262b..5d0b3d9385f1 100644
--- a/sw/source/core/inc/txmsrt.hxx
+++ b/sw/source/core/inc/txmsrt.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef SW_TXMSRT_HXX
-#define SW_TXMSRT_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_TXMSRT_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_TXMSRT_HXX
 
 #include <i18nlangtag/lang.h>
 #include <tox.hxx>
@@ -292,6 +292,6 @@ public:
 };
 
 
-#endif // SW_TXMSRT_HXX
+#endif // INCLUDED_SW_SOURCE_CORE_INC_TXMSRT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/txtfrm.hxx b/sw/source/core/inc/txtfrm.hxx
index 3f3a277505fb..6bde38bd2038 100644
--- a/sw/source/core/inc/txtfrm.hxx
+++ b/sw/source/core/inc/txtfrm.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef SW_TXTFRM_HXX
-#define SW_TXTFRM_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_TXTFRM_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_TXTFRM_HXX
 
 #include <tools/mempool.hxx>
 #include "cntfrm.hxx"
diff --git a/sw/source/core/inc/txttypes.hxx b/sw/source/core/inc/txttypes.hxx
index 9222442e3d7c..debef5231eec 100644
--- a/sw/source/core/inc/txttypes.hxx
+++ b/sw/source/core/inc/txttypes.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _TXTTYPES_HXX
-#define _TXTTYPES_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_TXTTYPES_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_TXTTYPES_HXX
 
 #include "swtypes.hxx"
 
@@ -92,6 +92,6 @@
 
 #define POR_TABLEFT     0x0740
 
-#endif  //_TXTTYPES_HXX
+#endif // INCLUDED_SW_SOURCE_CORE_INC_TXTTYPES_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/undoflystrattr.hxx b/sw/source/core/inc/undoflystrattr.hxx
index 4dc312247b4d..5d1ea5395fac 100644
--- a/sw/source/core/inc/undoflystrattr.hxx
+++ b/sw/source/core/inc/undoflystrattr.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef SW_UNDO_FLY_STR_ATTR_HXX
-#define SW_UNDO_FLY_STR_ATTR_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_UNDOFLYSTRATTR_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_UNDOFLYSTRATTR_HXX
 
 #include <undobj.hxx>
 #include <swundo.hxx>
@@ -44,6 +44,6 @@ class SwUndoFlyStrAttr : public SwUndo
         const OUString msNewStr;
 };
 
-#endif // SW_UNDO_FLY_STR_ATTR_HXX
+#endif // INCLUDED_SW_SOURCE_CORE_INC_UNDOFLYSTRATTR_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/unobookmark.hxx b/sw/source/core/inc/unobookmark.hxx
index 74354448568d..753a35d448f2 100644
--- a/sw/source/core/inc/unobookmark.hxx
+++ b/sw/source/core/inc/unobookmark.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef SW_UNOBOOKMARK_HXX
-#define SW_UNOBOOKMARK_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_UNOBOOKMARK_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_UNOBOOKMARK_HXX
 
 #include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
@@ -273,6 +273,6 @@ public:
     SwXODFCheckboxField( ::sw::mark::IMark* pBkm = 0, SwDoc* pDoc = 0) : SwXFieldmark(true,
             pBkm, pDoc) {}
 };
-#endif // SW_UNOBOOKMARK_HXX
+#endif // INCLUDED_SW_SOURCE_CORE_INC_UNOBOOKMARK_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/unoevent.hxx b/sw/source/core/inc/unoevent.hxx
index 94926455e1aa..347b77e46b78 100644
--- a/sw/source/core/inc/unoevent.hxx
+++ b/sw/source/core/inc/unoevent.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _UNOEVENT_HXX
-#define _UNOEVENT_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_UNOEVENT_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_UNOEVENT_HXX
 
 #include <svtools/unoevent.hxx>
 #include <svl/macitem.hxx>
diff --git a/sw/source/core/inc/unofield.hxx b/sw/source/core/inc/unofield.hxx
index 19685a3d8952..c7d77c369e14 100644
--- a/sw/source/core/inc/unofield.hxx
+++ b/sw/source/core/inc/unofield.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef SW_UNOFIELD_HXX
-#define SW_UNOFIELD_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_UNOFIELD_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_UNOFIELD_HXX
 
 #include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
diff --git a/sw/source/core/inc/unoflatpara.hxx b/sw/source/core/inc/unoflatpara.hxx
index 31927517aa09..999e3c19fa24 100644
--- a/sw/source/core/inc/unoflatpara.hxx
+++ b/sw/source/core/inc/unoflatpara.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _UNOFLATPARA_HXX
-#define _UNOFLATPARA_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_UNOFLATPARA_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_UNOFLATPARA_HXX
 
 #include <cppuhelper/implbase1.hxx>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
diff --git a/sw/source/core/inc/unofldmid.h b/sw/source/core/inc/unofldmid.h
index b95941852072..4652871e02b8 100644
--- a/sw/source/core/inc/unofldmid.h
+++ b/sw/source/core/inc/unofldmid.h
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef SW_UNOFLDMID_H
-#define SW_UNOFLDMID_H
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_UNOFLDMID_H
+#define INCLUDED_SW_SOURCE_CORE_INC_UNOFLDMID_H
 
 #include <tools/solar.h>
 
diff --git a/sw/source/core/inc/unofootnote.hxx b/sw/source/core/inc/unofootnote.hxx
index da579dc0516c..d0685cdcacf1 100644
--- a/sw/source/core/inc/unofootnote.hxx
+++ b/sw/source/core/inc/unofootnote.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef SW_UNOFOOTNOTE_HXX
-#define SW_UNOFOOTNOTE_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_UNOFOOTNOTE_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_UNOFOOTNOTE_HXX
 
 #include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
@@ -213,6 +213,6 @@ public:
 
 };
 
-#endif // SW_UNOFOOTNOTE_HXX
+#endif // INCLUDED_SW_SOURCE_CORE_INC_UNOFOOTNOTE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/unoidx.hxx b/sw/source/core/inc/unoidx.hxx
index c975617695cd..e945c75580d8 100644
--- a/sw/source/core/inc/unoidx.hxx
+++ b/sw/source/core/inc/unoidx.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef SW_UNOIDX_HXX
-#define SW_UNOIDX_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_UNOIDX_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_UNOIDX_HXX
 
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
diff --git a/sw/source/core/inc/unometa.hxx b/sw/source/core/inc/unometa.hxx
index 01f1d12401ef..fcff17c64e24 100644
--- a/sw/source/core/inc/unometa.hxx
+++ b/sw/source/core/inc/unometa.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef SW_UNOMETA_HXX
-#define SW_UNOMETA_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_UNOMETA_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_UNOMETA_HXX
 
 #include <deque>
 
@@ -359,6 +359,6 @@ void getPrefixAndSuffix(
             ::com::sun::star::rdf::XMetadatable>& xMetaField,
         OUString *const o_pPrefix, OUString *const o_pSuffix);
 
-#endif // SW_UNOMETA_HXX
+#endif // INCLUDED_SW_SOURCE_CORE_INC_UNOMETA_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/unoparaframeenum.hxx b/sw/source/core/inc/unoparaframeenum.hxx
index 54d2313eacdd..cfa3694eafd6 100644
--- a/sw/source/core/inc/unoparaframeenum.hxx
+++ b/sw/source/core/inc/unoparaframeenum.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef SW_UNOPARAFRAMEENUM_HXX
-#define SW_UNOPARAFRAMEENUM_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_UNOPARAFRAMEENUM_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_UNOPARAFRAMEENUM_HXX
 
 #include <deque>
 
@@ -110,6 +110,6 @@ public:
 
 };
 
-#endif // SW_UNOPARAFRAMEENUM_HXX
+#endif // INCLUDED_SW_SOURCE_CORE_INC_UNOPARAFRAMEENUM_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/unoport.hxx b/sw/source/core/inc/unoport.hxx
index be32d74647b2..d32dc8242a81 100644
--- a/sw/source/core/inc/unoport.hxx
+++ b/sw/source/core/inc/unoport.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef SW_UNOPORT_HXX
-#define SW_UNOPORT_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_UNOPORT_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_UNOPORT_HXX
 
 #include <memory>
 #include <deque>
diff --git a/sw/source/core/inc/unorefmark.hxx b/sw/source/core/inc/unorefmark.hxx
index 6aa02a2311d9..32a89a37ebcc 100644
--- a/sw/source/core/inc/unorefmark.hxx
+++ b/sw/source/core/inc/unorefmark.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef SW_UNOREFMARK_HXX
-#define SW_UNOREFMARK_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_UNOREFMARK_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_UNOREFMARK_HXX
 
 #include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
@@ -158,6 +158,6 @@ public:
 
 };
 
-#endif // SW_UNOREFMARK_HXX
+#endif // INCLUDED_SW_SOURCE_CORE_INC_UNOREFMARK_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/unosection.hxx b/sw/source/core/inc/unosection.hxx
index a7a178e9ee8d..b21aaca37f0b 100644
--- a/sw/source/core/inc/unosection.hxx
+++ b/sw/source/core/inc/unosection.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef SW_UNOSECTION_HXX
-#define SW_UNOSECTION_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_UNOSECTION_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_UNOSECTION_HXX
 
 #include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
@@ -239,6 +239,6 @@ public:
 
 };
 
-#endif // SW_UNOSECTION_HXX
+#endif // INCLUDED_SW_SOURCE_CORE_INC_UNOSECTION_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/unotextmarkup.hxx b/sw/source/core/inc/unotextmarkup.hxx
index 1ceb4131933b..89f01bd1447b 100644
--- a/sw/source/core/inc/unotextmarkup.hxx
+++ b/sw/source/core/inc/unotextmarkup.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _UNOTEXTMARKUP_HXX
-#define _UNOTEXTMARKUP_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_UNOTEXTMARKUP_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_UNOTEXTMARKUP_HXX
 
 #include <cppuhelper/implbase1.hxx>
 #include <cppuhelper/implbase2.hxx>
diff --git a/sw/source/core/inc/viewimp.hxx b/sw/source/core/inc/viewimp.hxx
index 86e0ac4b9789..62442793f765 100644
--- a/sw/source/core/inc/viewimp.hxx
+++ b/sw/source/core/inc/viewimp.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef SW_VIEWIMP_HXX
-#define SW_VIEWIMP_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_VIEWIMP_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_VIEWIMP_HXX
 
 #include <rtl/ustring.hxx>
 #include <tools/color.hxx>
@@ -333,6 +333,6 @@ inline void SwViewImp::AddAccessibleObj( const SdrObject *pObj )
     SwRect aEmptyRect;
     MoveAccessible( 0, pObj, aEmptyRect );
 }
-#endif // SW_VIEWIMP_HXX
+#endif // INCLUDED_SW_SOURCE_CORE_INC_VIEWIMP_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/visiturl.hxx b/sw/source/core/inc/visiturl.hxx
index 8f372be0f1d0..b9ed68134c2e 100644
--- a/sw/source/core/inc/visiturl.hxx
+++ b/sw/source/core/inc/visiturl.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _VISITURL_HXX
-#define _VISITURL_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_VISITURL_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_VISITURL_HXX
 
 #include <svl/lstner.hxx>
 
diff --git a/sw/source/core/inc/wrong.hxx b/sw/source/core/inc/wrong.hxx
index abb4807d24e9..2c06e5384482 100644
--- a/sw/source/core/inc/wrong.hxx
+++ b/sw/source/core/inc/wrong.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _WRONG_HXX
-#define _WRONG_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_INC_WRONG_HXX
+#define INCLUDED_SW_SOURCE_CORE_INC_WRONG_HXX
 
 #include <com/sun/star/container/XStringKeyMap.hpp>
 
diff --git a/sw/source/core/layout/layhelp.hxx b/sw/source/core/layout/layhelp.hxx
index 6f34fbcaa23d..61dc7bbabfd0 100644
--- a/sw/source/core/layout/layhelp.hxx
+++ b/sw/source/core/layout/layhelp.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef SW_LAYHELP_HXX
-#define SW_LAYHELP_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_LAYOUT_LAYHELP_HXX
+#define INCLUDED_SW_SOURCE_CORE_LAYOUT_LAYHELP_HXX
 
 #include <swrect.hxx>
 #include <vector>
diff --git a/sw/source/core/layout/objectformatterlayfrm.hxx b/sw/source/core/layout/objectformatterlayfrm.hxx
index 34028cac53b9..89a47e0f2ee7 100644
--- a/sw/source/core/layout/objectformatterlayfrm.hxx
+++ b/sw/source/core/layout/objectformatterlayfrm.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _OBJECTFORMATTERLAYFRM_HXX
-#define _OBJECTFORMATTERLAYFRM_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_LAYOUT_OBJECTFORMATTERLAYFRM_HXX
+#define INCLUDED_SW_SOURCE_CORE_LAYOUT_OBJECTFORMATTERLAYFRM_HXX
 
 #include <objectformatter.hxx>
 
diff --git a/sw/source/core/layout/objectformattertxtfrm.hxx b/sw/source/core/layout/objectformattertxtfrm.hxx
index fde76429388e..eb52adaeaab6 100644
--- a/sw/source/core/layout/objectformattertxtfrm.hxx
+++ b/sw/source/core/layout/objectformattertxtfrm.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _OBJECTFORMATTERTXTFRM_HXX
-#define _OBJECTFORMATTERTXTFRM_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_LAYOUT_OBJECTFORMATTERTXTFRM_HXX
+#define INCLUDED_SW_SOURCE_CORE_LAYOUT_OBJECTFORMATTERTXTFRM_HXX
 
 #include <objectformatter.hxx>
 #include <sal/types.h>
diff --git a/sw/source/core/layout/objstmpconsiderwrapinfl.hxx b/sw/source/core/layout/objstmpconsiderwrapinfl.hxx
index ed5d98f44e4e..fcf495e72a50 100644
--- a/sw/source/core/layout/objstmpconsiderwrapinfl.hxx
+++ b/sw/source/core/layout/objstmpconsiderwrapinfl.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _OBJSTMPCONSIDERWRAPINFL_HXX
-#define _OBJSTMPCONSIDERWRAPINFL_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_LAYOUT_OBJSTMPCONSIDERWRAPINFL_HXX
+#define INCLUDED_SW_SOURCE_CORE_LAYOUT_OBJSTMPCONSIDERWRAPINFL_HXX
 
 #include <vector>
 
diff --git a/sw/source/core/layout/virtoutp.hxx b/sw/source/core/layout/virtoutp.hxx
index 33a1df2a046f..bec49d21250e 100644
--- a/sw/source/core/layout/virtoutp.hxx
+++ b/sw/source/core/layout/virtoutp.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _VIRTOUTP_HXX
-#define _VIRTOUTP_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_LAYOUT_VIRTOUTP_HXX
+#define INCLUDED_SW_SOURCE_CORE_LAYOUT_VIRTOUTP_HXX
 
 #include <vcl/virdev.hxx>
 
diff --git a/sw/source/core/text/atrhndl.hxx b/sw/source/core/text/atrhndl.hxx
index 6fa4b2cf39b4..2571c584e520 100644
--- a/sw/source/core/text/atrhndl.hxx
+++ b/sw/source/core/text/atrhndl.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _ATRHNDL_HXX
-#define _ATRHNDL_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_TEXT_ATRHNDL_HXX
+#define INCLUDED_SW_SOURCE_CORE_TEXT_ATRHNDL_HXX
 
 #define INITIAL_NUM_ATTR 3
 #define NUM_ATTRIBUTE_STACKS 43
diff --git a/sw/source/core/text/guess.hxx b/sw/source/core/text/guess.hxx
index c6deb076376d..48fe7f94a385 100644
--- a/sw/source/core/text/guess.hxx
+++ b/sw/source/core/text/guess.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _GUESS_HXX
-#define _GUESS_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_TEXT_GUESS_HXX
+#define INCLUDED_SW_SOURCE_CORE_TEXT_GUESS_HXX
 #include <com/sun/star/linguistic2/XHyphenatedWord.hpp>
 
 #include "txttypes.hxx"
diff --git a/sw/source/core/text/inftxt.hxx b/sw/source/core/text/inftxt.hxx
index 010cbdc840d5..6602f94b3594 100644
--- a/sw/source/core/text/inftxt.hxx
+++ b/sw/source/core/text/inftxt.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _INFTXT_HXX
-#define _INFTXT_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_TEXT_INFTXT_HXX
+#define INCLUDED_SW_SOURCE_CORE_TEXT_INFTXT_HXX
 #include <com/sun/star/linguistic2/XHyphenatedWord.hpp>
 #include <com/sun/star/beans/PropertyValues.hpp>
 
diff --git a/sw/source/core/text/itratr.hxx b/sw/source/core/text/itratr.hxx
index acd35fcc8706..d550e4319404 100644
--- a/sw/source/core/text/itratr.hxx
+++ b/sw/source/core/text/itratr.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _ITRATR_HXX
-#define _ITRATR_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_TEXT_ITRATR_HXX
+#define INCLUDED_SW_SOURCE_CORE_TEXT_ITRATR_HXX
 #include <atrhndl.hxx>
 
 #include "txttypes.hxx"
diff --git a/sw/source/core/text/itrform2.hxx b/sw/source/core/text/itrform2.hxx
index d4633173c9dc..bbaead1201bd 100644
--- a/sw/source/core/text/itrform2.hxx
+++ b/sw/source/core/text/itrform2.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _ITRFORM2_HXX
-#define _ITRFORM2_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_TEXT_ITRFORM2_HXX
+#define INCLUDED_SW_SOURCE_CORE_TEXT_ITRFORM2_HXX
 #include "itrpaint.hxx"
 
 class SwFlyCntPortion;
diff --git a/sw/source/core/text/itrpaint.hxx b/sw/source/core/text/itrpaint.hxx
index 12b95664ad4c..04b9170ef1b1 100644
--- a/sw/source/core/text/itrpaint.hxx
+++ b/sw/source/core/text/itrpaint.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _ITRPAINT_HXX
-#define _ITRPAINT_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_TEXT_ITRPAINT_HXX
+#define INCLUDED_SW_SOURCE_CORE_TEXT_ITRPAINT_HXX
 #include "itrtxt.hxx"
 
 class SwSaveClip;          // SwTxtPainter
diff --git a/sw/source/core/text/itrtxt.hxx b/sw/source/core/text/itrtxt.hxx
index cd56e8e55745..d1e004283a4d 100644
--- a/sw/source/core/text/itrtxt.hxx
+++ b/sw/source/core/text/itrtxt.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _ITRTXT_HXX
-#define _ITRTXT_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_TEXT_ITRTXT_HXX
+#define INCLUDED_SW_SOURCE_CORE_TEXT_ITRTXT_HXX
 #include "swtypes.hxx"
 #include "itratr.hxx"
 #include "inftxt.hxx"
diff --git a/sw/source/core/text/pordrop.hxx b/sw/source/core/text/pordrop.hxx
index a462e6bfe839..3ba9795aff7e 100644
--- a/sw/source/core/text/pordrop.hxx
+++ b/sw/source/core/text/pordrop.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _PORDROP_HXX
-#define _PORDROP_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_TEXT_PORDROP_HXX
+#define INCLUDED_SW_SOURCE_CORE_TEXT_PORDROP_HXX
 
 #include "portxt.hxx"
 
diff --git a/sw/source/core/text/porexp.hxx b/sw/source/core/text/porexp.hxx
index 4c9e0874c361..77ece8afa223 100644
--- a/sw/source/core/text/porexp.hxx
+++ b/sw/source/core/text/porexp.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _POREXP_HXX
-#define _POREXP_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_TEXT_POREXP_HXX
+#define INCLUDED_SW_SOURCE_CORE_TEXT_POREXP_HXX
 
 #include "portxt.hxx"
 
diff --git a/sw/source/core/text/porfld.hxx b/sw/source/core/text/porfld.hxx
index fb6ff6497ac0..ef9f9567f7a2 100644
--- a/sw/source/core/text/porfld.hxx
+++ b/sw/source/core/text/porfld.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _PORFLD_HXX
-#define _PORFLD_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_TEXT_PORFLD_HXX
+#define INCLUDED_SW_SOURCE_CORE_TEXT_PORFLD_HXX
 
 #include "swtypes.hxx"
 #include "porexp.hxx"
diff --git a/sw/source/core/text/porfly.hxx b/sw/source/core/text/porfly.hxx
index f5fbfa88f300..34a4dfe4d896 100644
--- a/sw/source/core/text/porfly.hxx
+++ b/sw/source/core/text/porfly.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _PORFLY_HXX
-#define _PORFLY_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_TEXT_PORFLY_HXX
+#define INCLUDED_SW_SOURCE_CORE_TEXT_PORFLY_HXX
 // OD 28.10.2003 #113049#
 #include <ascharanchoredobjectposition.hxx>
 
diff --git a/sw/source/core/text/porftn.hxx b/sw/source/core/text/porftn.hxx
index b20e1eb14c50..48c5b7eff249 100644
--- a/sw/source/core/text/porftn.hxx
+++ b/sw/source/core/text/porftn.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _PORFTN_HXX
-#define _PORFTN_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_TEXT_PORFTN_HXX
+#define INCLUDED_SW_SOURCE_CORE_TEXT_PORFTN_HXX
 
 #include "porfld.hxx"
 
diff --git a/sw/source/core/text/porglue.hxx b/sw/source/core/text/porglue.hxx
index f368fbff4c46..0496a8a5c28c 100644
--- a/sw/source/core/text/porglue.hxx
+++ b/sw/source/core/text/porglue.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _PORGLUE_HXX
-#define _PORGLUE_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_TEXT_PORGLUE_HXX
+#define INCLUDED_SW_SOURCE_CORE_TEXT_PORGLUE_HXX
 
 #include "porlin.hxx"
 
diff --git a/sw/source/core/text/porhyph.hxx b/sw/source/core/text/porhyph.hxx
index 3b7450e8e9f6..32e6128c931c 100644
--- a/sw/source/core/text/porhyph.hxx
+++ b/sw/source/core/text/porhyph.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _PORHYPH_HXX
-#define _PORHYPH_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_TEXT_PORHYPH_HXX
+#define INCLUDED_SW_SOURCE_CORE_TEXT_PORHYPH_HXX
 
 #include "porexp.hxx"
 
diff --git a/sw/source/core/text/porlay.hxx b/sw/source/core/text/porlay.hxx
index ac89498d782c..ccfa12d7cb81 100644
--- a/sw/source/core/text/porlay.hxx
+++ b/sw/source/core/text/porlay.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _PORLAY_HXX
-#define _PORLAY_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_TEXT_PORLAY_HXX
+#define INCLUDED_SW_SOURCE_CORE_TEXT_PORLAY_HXX
 
 #include <tools/fract.hxx>
 #include <scriptinfo.hxx>
diff --git a/sw/source/core/text/porlin.hxx b/sw/source/core/text/porlin.hxx
index fb17d745b782..429d865d05a8 100644
--- a/sw/source/core/text/porlin.hxx
+++ b/sw/source/core/text/porlin.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _PORLIN_HXX
-#define _PORLIN_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_TEXT_PORLIN_HXX
+#define INCLUDED_SW_SOURCE_CORE_TEXT_PORLIN_HXX
 
 #include "possiz.hxx"
 
diff --git a/sw/source/core/text/pormulti.hxx b/sw/source/core/text/pormulti.hxx
index 5f48b54baa38..46ca418ab48e 100644
--- a/sw/source/core/text/pormulti.hxx
+++ b/sw/source/core/text/pormulti.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _PORMULTI_HXX
-#define _PORMULTI_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_TEXT_PORMULTI_HXX
+#define INCLUDED_SW_SOURCE_CORE_TEXT_PORMULTI_HXX
 
 #include "porlay.hxx"
 #include "porexp.hxx"
diff --git a/sw/source/core/text/porref.hxx b/sw/source/core/text/porref.hxx
index 82d0e0582152..4ace502be56a 100644
--- a/sw/source/core/text/porref.hxx
+++ b/sw/source/core/text/porref.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _PORREF_HXX
-#define _PORREF_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_TEXT_PORREF_HXX
+#define INCLUDED_SW_SOURCE_CORE_TEXT_PORREF_HXX
 
 #include "portxt.hxx"
 
diff --git a/sw/source/core/text/porrst.hxx b/sw/source/core/text/porrst.hxx
index fcc616b4c5eb..574be5625d07 100644
--- a/sw/source/core/text/porrst.hxx
+++ b/sw/source/core/text/porrst.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _PORRST_HXX
-#define _PORRST_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_TEXT_PORRST_HXX
+#define INCLUDED_SW_SOURCE_CORE_TEXT_PORRST_HXX
 #include "porlay.hxx"
 #include "porexp.hxx"
 
diff --git a/sw/source/core/text/portab.hxx b/sw/source/core/text/portab.hxx
index 463c8dd3320d..2082712378cb 100644
--- a/sw/source/core/text/portab.hxx
+++ b/sw/source/core/text/portab.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _PORTAB_HXX
-#define _PORTAB_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_TEXT_PORTAB_HXX
+#define INCLUDED_SW_SOURCE_CORE_TEXT_PORTAB_HXX
 
 #include "porglue.hxx"
 
diff --git a/sw/source/core/text/portox.hxx b/sw/source/core/text/portox.hxx
index 2ae4348233e9..a80183bfc337 100644
--- a/sw/source/core/text/portox.hxx
+++ b/sw/source/core/text/portox.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _PORTOX_HXX
-#define _PORTOX_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_TEXT_PORTOX_HXX
+#define INCLUDED_SW_SOURCE_CORE_TEXT_PORTOX_HXX
 
 #include "portxt.hxx"
 
diff --git a/sw/source/core/text/portxt.hxx b/sw/source/core/text/portxt.hxx
index 34750eba1779..6831661b1e17 100644
--- a/sw/source/core/text/portxt.hxx
+++ b/sw/source/core/text/portxt.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _PORTXT_HXX
-#define _PORTXT_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_TEXT_PORTXT_HXX
+#define INCLUDED_SW_SOURCE_CORE_TEXT_PORTXT_HXX
 
 #include <tools/mempool.hxx>
 
diff --git a/sw/source/core/text/possiz.hxx b/sw/source/core/text/possiz.hxx
index 969dc9a2ddda..0e9fb3697715 100644
--- a/sw/source/core/text/possiz.hxx
+++ b/sw/source/core/text/possiz.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _POSSIZ_HXX
-#define _POSSIZ_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_TEXT_POSSIZ_HXX
+#define INCLUDED_SW_SOURCE_CORE_TEXT_POSSIZ_HXX
 
 
 #include <tools/gen.hxx>
diff --git a/sw/source/core/text/redlnitr.hxx b/sw/source/core/text/redlnitr.hxx
index 80bdba19395e..ff7a3b91a45c 100644
--- a/sw/source/core/text/redlnitr.hxx
+++ b/sw/source/core/text/redlnitr.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _REDLNITR_HXX
-#define _REDLNITR_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_TEXT_REDLNITR_HXX
+#define INCLUDED_SW_SOURCE_CORE_TEXT_REDLNITR_HXX
 
 #include "ndhints.hxx"
 
diff --git a/sw/source/core/text/txtcache.hxx b/sw/source/core/text/txtcache.hxx
index cedba1db5132..b96cd4325f46 100644
--- a/sw/source/core/text/txtcache.hxx
+++ b/sw/source/core/text/txtcache.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _TXTCACHE_HXX
-#define _TXTCACHE_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_TEXT_TXTCACHE_HXX
+#define INCLUDED_SW_SOURCE_CORE_TEXT_TXTCACHE_HXX
 
 #include <sal/types.h>
 #include <tools/mempool.hxx>
diff --git a/sw/source/core/text/txtfly.hxx b/sw/source/core/text/txtfly.hxx
index 4c1398f78b95..b0b06094d34f 100644
--- a/sw/source/core/text/txtfly.hxx
+++ b/sw/source/core/text/txtfly.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _TXTFLY_HXX
-#define _TXTFLY_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_TEXT_TXTFLY_HXX
+#define INCLUDED_SW_SOURCE_CORE_TEXT_TXTFLY_HXX
 
 #include "swtypes.hxx"
 #include "swrect.hxx"
diff --git a/sw/source/core/text/txtpaint.hxx b/sw/source/core/text/txtpaint.hxx
index 86d34c8bd31d..7441d931d342 100644
--- a/sw/source/core/text/txtpaint.hxx
+++ b/sw/source/core/text/txtpaint.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _TXTPAINT_HXX
-#define _TXTPAINT_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_TEXT_TXTPAINT_HXX
+#define INCLUDED_SW_SOURCE_CORE_TEXT_TXTPAINT_HXX
 #include <vcl/outdev.hxx>
 
 class SwRect;               // SwSaveClip
diff --git a/sw/source/core/text/widorp.hxx b/sw/source/core/text/widorp.hxx
index 85afba89e3fb..42d052848ad5 100644
--- a/sw/source/core/text/widorp.hxx
+++ b/sw/source/core/text/widorp.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _WIDORP_HXX
-#define _WIDORP_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_TEXT_WIDORP_HXX
+#define INCLUDED_SW_SOURCE_CORE_TEXT_WIDORP_HXX
 class SwTxtFrm;
 
 #include "swtypes.hxx"
diff --git a/sw/source/core/unocore/XMLRangeHelper.hxx b/sw/source/core/unocore/XMLRangeHelper.hxx
index 18f692fccb5a..776f95e2622d 100644
--- a/sw/source/core/unocore/XMLRangeHelper.hxx
+++ b/sw/source/core/unocore/XMLRangeHelper.hxx
@@ -21,8 +21,8 @@
 //!! This file is an exact copy of the same file in chart2 project
 //!!
 
-#ifndef XMLRANGEHELPER_HXX
-#define XMLRANGEHELPER_HXX
+#ifndef INCLUDED_SW_SOURCE_CORE_UNOCORE_XMLRANGEHELPER_HXX
+#define INCLUDED_SW_SOURCE_CORE_UNOCORE_XMLRANGEHELPER_HXX
 
 #include <sal/types.h>
 #include <rtl/ustring.hxx>
@@ -66,7 +66,7 @@ OUString getXMLStringFromCellRange( const CellRange & rRange );
 } //  namespace XMLRangeHelper
 //} //  namespace chart
 
-// XMLRANGEHELPER_HXX
+// INCLUDED_SW_SOURCE_CORE_UNOCORE_XMLRANGEHELPER_HXX
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
author	Thomas Arnhold <thomas@arnhold.org>	2013-11-05 02:17:53 +0100
committer	Thomas Arnhold <thomas@arnhold.org>	2013-11-05 09:28:51 +0100
commit	3c01203ea657b9a3538f9956591b3d4da5fce6e7 (patch)
tree	fa55b199faff9de2f352e9d4403336b24301d3e9 /sw/source/core
parent	07fc8122f41210acc788396efa3d16499f58b78c (diff)