sw: fix include guards

after the latest file move Change-Id: I105eb04ad98d1bf71eddec4528657c248fcc4348
author: Thomas Arnhold <thomas@arnhold.org> 2014-06-03 10:01:18 +0200
committer: Thomas Arnhold <thomas@arnhold.org> 2014-06-03 11:17:22 +0200
commit: cebb96ec3a22d9023fb8a8d91f6c766a8a3866af (patch)
tree: e224a0d04781b60a1925b93347d86e2ff87c9462 /sw/source/uibase
parent: d2bbef3d3d6c7be096175ddbdb788ece5067f5fc (diff)
218 files changed, 461 insertions, 461 deletions
diff --git a/sw/source/uibase/app/swdllimpl.hxx b/sw/source/uibase/app/swdllimpl.hxx
index 34eb956cb45a..f5d7e2dcc19a 100644
--- a/sw/source/uibase/app/swdllimpl.hxx
+++ b/sw/source/uibase/app/swdllimpl.hxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_APP_SWDLLIMPL_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_APP_SWDLLIMPL_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_APP_SWDLLIMPL_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_APP_SWDLLIMPL_HXX
 
 #include <sal/config.h>
 
diff --git a/sw/source/uibase/docvw/AnchorOverlayObject.hxx b/sw/source/uibase/docvw/AnchorOverlayObject.hxx
index c4b4c1c5ce16..8298abc19fff 100644
--- a/sw/source/uibase/docvw/AnchorOverlayObject.hxx
+++ b/sw/source/uibase/docvw/AnchorOverlayObject.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_DOCVW_ANCHOROVERLAYOBJECT_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_DOCVW_ANCHOROVERLAYOBJECT_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_DOCVW_ANCHOROVERLAYOBJECT_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_DOCVW_ANCHOROVERLAYOBJECT_HXX
 
 #include <svx/sdr/overlay/overlayobject.hxx>
 
diff --git a/sw/source/uibase/docvw/AnnotationMenuButton.hxx b/sw/source/uibase/docvw/AnnotationMenuButton.hxx
index b90dea4de951..06731b6cdb39 100644
--- a/sw/source/uibase/docvw/AnnotationMenuButton.hxx
+++ b/sw/source/uibase/docvw/AnnotationMenuButton.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_DOCVW_ANNOTATIONMENUBUTTON_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_DOCVW_ANNOTATIONMENUBUTTON_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_DOCVW_ANNOTATIONMENUBUTTON_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_DOCVW_ANNOTATIONMENUBUTTON_HXX
 
 #include <vcl/menubtn.hxx>
 
diff --git a/sw/source/uibase/docvw/OverlayRanges.hxx b/sw/source/uibase/docvw/OverlayRanges.hxx
index 4458af4587f2..7cdb8721cae5 100644
--- a/sw/source/uibase/docvw/OverlayRanges.hxx
+++ b/sw/source/uibase/docvw/OverlayRanges.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_DOCVW_OVERLAYRANGES_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_DOCVW_OVERLAYRANGES_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_DOCVW_OVERLAYRANGES_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_DOCVW_OVERLAYRANGES_HXX
 
 #include <svx/sdr/overlay/overlayobject.hxx>
 #include <basegfx/range/b2drange.hxx>
@@ -73,6 +73,6 @@ namespace sw
     } // end of namespace overlay
 } // end of namespace sw
 
-#endif // INCLUDED_SW_SOURCE_CORE_UIBASE_DOCVW_OVERLAYRANGES_HXX
+#endif // INCLUDED_SW_SOURCE_UIBASE_DOCVW_OVERLAYRANGES_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/docvw/ShadowOverlayObject.hxx b/sw/source/uibase/docvw/ShadowOverlayObject.hxx
index a6751824d362..82ba7081bb38 100644
--- a/sw/source/uibase/docvw/ShadowOverlayObject.hxx
+++ b/sw/source/uibase/docvw/ShadowOverlayObject.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_DOCVW_SHADOWOVERLAYOBJECT_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_DOCVW_SHADOWOVERLAYOBJECT_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_DOCVW_SHADOWOVERLAYOBJECT_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_DOCVW_SHADOWOVERLAYOBJECT_HXX
 
 #include <svx/sdr/overlay/overlayobject.hxx>
 
diff --git a/sw/source/uibase/docvw/SidebarTxtControl.hxx b/sw/source/uibase/docvw/SidebarTxtControl.hxx
index d98503d01519..f14502031f98 100644
--- a/sw/source/uibase/docvw/SidebarTxtControl.hxx
+++ b/sw/source/uibase/docvw/SidebarTxtControl.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_DOCVW_SIDEBARTXTCONTROL_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_DOCVW_SIDEBARTXTCONTROL_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_DOCVW_SIDEBARTXTCONTROL_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_DOCVW_SIDEBARTXTCONTROL_HXX
 
 #include <vcl/ctrl.hxx>
 
diff --git a/sw/source/uibase/docvw/SidebarTxtControlAcc.hxx b/sw/source/uibase/docvw/SidebarTxtControlAcc.hxx
index 7ac25969e787..38064ff247cf 100644
--- a/sw/source/uibase/docvw/SidebarTxtControlAcc.hxx
+++ b/sw/source/uibase/docvw/SidebarTxtControlAcc.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_DOCVW_SIDEBARTXTCONTROLACC_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_DOCVW_SIDEBARTXTCONTROLACC_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_DOCVW_SIDEBARTXTCONTROLACC_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_DOCVW_SIDEBARTXTCONTROLACC_HXX
 
 #include <toolkit/awt/vclxwindow.hxx>
 
diff --git a/sw/source/uibase/docvw/SidebarWinAcc.hxx b/sw/source/uibase/docvw/SidebarWinAcc.hxx
index 9d4dc49436b4..a07fac7811e8 100644
--- a/sw/source/uibase/docvw/SidebarWinAcc.hxx
+++ b/sw/source/uibase/docvw/SidebarWinAcc.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_DOCVW_SIDEBARWINACC_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_DOCVW_SIDEBARWINACC_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_DOCVW_SIDEBARWINACC_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_DOCVW_SIDEBARWINACC_HXX
 
 #include <toolkit/awt/vclxwindow.hxx>
 
diff --git a/sw/source/uibase/docvw/frmsidebarwincontainer.hxx b/sw/source/uibase/docvw/frmsidebarwincontainer.hxx
index 225399360248..f0fa3faf8abf 100644
--- a/sw/source/uibase/docvw/frmsidebarwincontainer.hxx
+++ b/sw/source/uibase/docvw/frmsidebarwincontainer.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 INCLUDED_SW_SOURCE_CORE_UIBASE_DOCVW_FRMSIDEBARWINCONTAINER_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_DOCVW_FRMSIDEBARWINCONTAINER_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_DOCVW_FRMSIDEBARWINCONTAINER_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_DOCVW_FRMSIDEBARWINCONTAINER_HXX
 
 #include <sal/types.h>
 #include <vector>
diff --git a/sw/source/uibase/docvw/romenu.hxx b/sw/source/uibase/docvw/romenu.hxx
index eae84d594181..7bf0bd243d7c 100644
--- a/sw/source/uibase/docvw/romenu.hxx
+++ b/sw/source/uibase/docvw/romenu.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 INCLUDED_SW_SOURCE_CORE_UIBASE_DOCVW_ROMENU_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_DOCVW_ROMENU_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_DOCVW_ROMENU_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_DOCVW_ROMENU_HXX
 
 #include <vcl/graph.hxx>
 #include <vcl/menu.hxx>
diff --git a/sw/source/uibase/envelp/labimp.hxx b/sw/source/uibase/envelp/labimp.hxx
index 0f123ea20c58..caaf6068e501 100644
--- a/sw/source/uibase/envelp/labimp.hxx
+++ b/sw/source/uibase/envelp/labimp.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 INCLUDED_SW_SOURCE_CORE_UIBASE_ENVELP_LABIMP_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_ENVELP_LABIMP_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_ENVELP_LABIMP_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_ENVELP_LABIMP_HXX
 
 #include <sfx2/tabdlg.hxx>
 #include <vcl/lstbox.hxx>
diff --git a/sw/source/uibase/inc/DashedLine.hxx b/sw/source/uibase/inc/DashedLine.hxx
index 05e3268cbae0..a16899b8698f 100644
--- a/sw/source/uibase/inc/DashedLine.hxx
+++ b/sw/source/uibase/inc/DashedLine.hxx
@@ -6,8 +6,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
-#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_DASHEDLINE_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_DASHEDLINE_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_DASHEDLINE_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_DASHEDLINE_HXX
 
 #include <basegfx/color/bcolor.hxx>
 #include <vcl/fixed.hxx>
diff --git a/sw/source/uibase/inc/DropDownFieldDialog.hxx b/sw/source/uibase/inc/DropDownFieldDialog.hxx
index a6eab562f45d..1787726af8b1 100644
--- a/sw/source/uibase/inc/DropDownFieldDialog.hxx
+++ b/sw/source/uibase/inc/DropDownFieldDialog.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_DROPDOWNFIELDDIALOG_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_DROPDOWNFIELDDIALOG_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_DROPDOWNFIELDDIALOG_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_DROPDOWNFIELDDIALOG_HXX
 
 #include <svx/stddlg.hxx>
 #include <vcl/fixed.hxx>
diff --git a/sw/source/uibase/inc/FrameControl.hxx b/sw/source/uibase/inc/FrameControl.hxx
index 3fc14ac356ff..0235084c4160 100644
--- a/sw/source/uibase/inc/FrameControl.hxx
+++ b/sw/source/uibase/inc/FrameControl.hxx
@@ -6,8 +6,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
-#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_FRAMECONTROL_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_FRAMECONTROL_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_FRAMECONTROL_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_FRAMECONTROL_HXX
 
 class SwEditWin;
 class SwFrm;
diff --git a/sw/source/uibase/inc/FrameControlsManager.hxx b/sw/source/uibase/inc/FrameControlsManager.hxx
index 4cf05e446d9c..75585ea8fe0b 100644
--- a/sw/source/uibase/inc/FrameControlsManager.hxx
+++ b/sw/source/uibase/inc/FrameControlsManager.hxx
@@ -6,8 +6,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
-#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_FRAMECONTROLSMANAGER_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_FRAMECONTROLSMANAGER_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_FRAMECONTROLSMANAGER_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_FRAMECONTROLSMANAGER_HXX
 
 #include <viewsh.hxx>
 #include <FrameControl.hxx>
diff --git a/sw/source/uibase/inc/HeaderFooterWin.hxx b/sw/source/uibase/inc/HeaderFooterWin.hxx
index 6fee20a43b0c..efe7d13a83d9 100644
--- a/sw/source/uibase/inc/HeaderFooterWin.hxx
+++ b/sw/source/uibase/inc/HeaderFooterWin.hxx
@@ -6,8 +6,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
-#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_HEADERFOOTERWIN_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_HEADERFOOTERWIN_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_HEADERFOOTERWIN_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_HEADERFOOTERWIN_HXX
 
 #include <FrameControl.hxx>
 
diff --git a/sw/source/uibase/inc/PageBreakWin.hxx b/sw/source/uibase/inc/PageBreakWin.hxx
index 4839c6cf4490..321cb17c6fd3 100644
--- a/sw/source/uibase/inc/PageBreakWin.hxx
+++ b/sw/source/uibase/inc/PageBreakWin.hxx
@@ -6,8 +6,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
-#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_PAGEBREAKWIN_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_PAGEBREAKWIN_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_PAGEBREAKWIN_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_PAGEBREAKWIN_HXX
 
 #include <FrameControl.hxx>
 
diff --git a/sw/source/uibase/inc/SidebarWindowsConsts.hxx b/sw/source/uibase/inc/SidebarWindowsConsts.hxx
index a96e192a90ec..a7bd9195bad9 100644
--- a/sw/source/uibase/inc/SidebarWindowsConsts.hxx
+++ b/sw/source/uibase/inc/SidebarWindowsConsts.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_SIDEBARWINDOWSCONSTS_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_SIDEBARWINDOWSCONSTS_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_SIDEBARWINDOWSCONSTS_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_SIDEBARWINDOWSCONSTS_HXX
 
 namespace sw { namespace sidebarwindows {
 
diff --git a/sw/source/uibase/inc/SwSpellDialogChildWindow.hxx b/sw/source/uibase/inc/SwSpellDialogChildWindow.hxx
index d1d5271bfb20..b82d9d4c5d4d 100644
--- a/sw/source/uibase/inc/SwSpellDialogChildWindow.hxx
+++ b/sw/source/uibase/inc/SwSpellDialogChildWindow.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_SWSPELLDIALOGCHILDWINDOW_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_SWSPELLDIALOGCHILDWINDOW_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_SWSPELLDIALOGCHILDWINDOW_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_SWSPELLDIALOGCHILDWINDOW_HXX
 
 #include <svx/SpellDialogChildWindow.hxx>
 #include <view.hxx>
diff --git a/sw/source/uibase/inc/SwXFilterOptions.hxx b/sw/source/uibase/inc/SwXFilterOptions.hxx
index 1cca0960400d..02ae7d295f35 100644
--- a/sw/source/uibase/inc/SwXFilterOptions.hxx
+++ b/sw/source/uibase/inc/SwXFilterOptions.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_SWXFILTEROPTIONS_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_SWXFILTEROPTIONS_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_SWXFILTEROPTIONS_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_SWXFILTEROPTIONS_HXX
 
 #include <com/sun/star/beans/XPropertyAccess.hpp>
 #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
diff --git a/sw/source/uibase/inc/abstract.hxx b/sw/source/uibase/inc/abstract.hxx
index 5307637ba8fe..1a40fd8a0e03 100644
--- a/sw/source/uibase/inc/abstract.hxx
+++ b/sw/source/uibase/inc/abstract.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_ABSTRACT_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_ABSTRACT_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_ABSTRACT_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_ABSTRACT_HXX
 
 #include <sfx2/basedlgs.hxx>
 
diff --git a/sw/source/uibase/inc/actctrl.hxx b/sw/source/uibase/inc/actctrl.hxx
index 2ee6a63b0706..0ff473775715 100644
--- a/sw/source/uibase/inc/actctrl.hxx
+++ b/sw/source/uibase/inc/actctrl.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_ACTCTRL_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_ACTCTRL_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_ACTCTRL_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_ACTCTRL_HXX
 
 #include <vcl/field.hxx>
 #include "swdllapi.h"
diff --git a/sw/source/uibase/inc/addrdlg.hxx b/sw/source/uibase/inc/addrdlg.hxx
index 6ddf6d15ced7..43e02f54dfda 100644
--- a/sw/source/uibase/inc/addrdlg.hxx
+++ b/sw/source/uibase/inc/addrdlg.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_ADDRDLG_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_ADDRDLG_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_ADDRDLG_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_ADDRDLG_HXX
 
 #include <sfx2/basedlgs.hxx>
 
diff --git a/sw/source/uibase/inc/annotsh.hxx b/sw/source/uibase/inc/annotsh.hxx
index 32aee688f2cc..8b3bea7cbb98 100644
--- a/sw/source/uibase/inc/annotsh.hxx
+++ b/sw/source/uibase/inc/annotsh.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_ANNOTSH_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_ANNOTSH_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_ANNOTSH_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_ANNOTSH_HXX
 
 #include <sfx2/shell.hxx>
 #include "shellid.hxx"
diff --git a/sw/source/uibase/inc/ascfldlg.hxx b/sw/source/uibase/inc/ascfldlg.hxx
index 2ccabf9ef9b5..b4a5d62d83a5 100644
--- a/sw/source/uibase/inc/ascfldlg.hxx
+++ b/sw/source/uibase/inc/ascfldlg.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_ASCFLDLG_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_ASCFLDLG_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_ASCFLDLG_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_ASCFLDLG_HXX
 #include <vcl/fixed.hxx>
 
 #include <vcl/button.hxx>
diff --git a/sw/source/uibase/inc/autoedit.hxx b/sw/source/uibase/inc/autoedit.hxx
index 78ed260d435a..53ba3123d8a6 100644
--- a/sw/source/uibase/inc/autoedit.hxx
+++ b/sw/source/uibase/inc/autoedit.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_AUTOEDIT_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_AUTOEDIT_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_AUTOEDIT_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_AUTOEDIT_HXX
 
 #include <vcl/edit.hxx>
 
diff --git a/sw/source/uibase/inc/barcfg.hxx b/sw/source/uibase/inc/barcfg.hxx
index d078d69d0e67..1d7507ce7a19 100644
--- a/sw/source/uibase/inc/barcfg.hxx
+++ b/sw/source/uibase/inc/barcfg.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_BARCFG_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_BARCFG_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_BARCFG_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_BARCFG_HXX
 #include <unotools/configitem.hxx>
 
 class SwToolbarConfigItem : public utl::ConfigItem
diff --git a/sw/source/uibase/inc/basesh.hxx b/sw/source/uibase/inc/basesh.hxx
index 9d04cc698a16..68b4db11f84d 100644
--- a/sw/source/uibase/inc/basesh.hxx
+++ b/sw/source/uibase/inc/basesh.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_BASESH_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_BASESH_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_BASESH_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_BASESH_HXX
 
 #include <shellid.hxx>
 
diff --git a/sw/source/uibase/inc/beziersh.hxx b/sw/source/uibase/inc/beziersh.hxx
index 69e57ccfface..2116c1b659d3 100644
--- a/sw/source/uibase/inc/beziersh.hxx
+++ b/sw/source/uibase/inc/beziersh.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_BEZIERSH_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_BEZIERSH_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_BEZIERSH_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_BEZIERSH_HXX
 
 #include "basesh.hxx"
 
diff --git a/sw/source/uibase/inc/bmpwin.hxx b/sw/source/uibase/inc/bmpwin.hxx
index 1fe60bb4201f..070656faf52b 100644
--- a/sw/source/uibase/inc/bmpwin.hxx
+++ b/sw/source/uibase/inc/bmpwin.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_BMPWIN_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_BMPWIN_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_BMPWIN_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_BMPWIN_HXX
 
 #include <vcl/graph.hxx>
 #include <vcl/bitmapex.hxx>
diff --git a/sw/source/uibase/inc/bookctrl.hxx b/sw/source/uibase/inc/bookctrl.hxx
index fd291e3c1bde..8d73b0cfcb6d 100644
--- a/sw/source/uibase/inc/bookctrl.hxx
+++ b/sw/source/uibase/inc/bookctrl.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_BOOKCTRL_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_BOOKCTRL_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_BOOKCTRL_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_BOOKCTRL_HXX
 
 #include <rtl/ustring.hxx>
 #include <sfx2/stbitem.hxx>
diff --git a/sw/source/uibase/inc/bookmark.hxx b/sw/source/uibase/inc/bookmark.hxx
index 34ca620842a0..3130310eb318 100644
--- a/sw/source/uibase/inc/bookmark.hxx
+++ b/sw/source/uibase/inc/bookmark.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_BOOKMARK_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_BOOKMARK_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_BOOKMARK_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_BOOKMARK_HXX
 
 #include <svx/stddlg.hxx>
 #include <vcl/fixed.hxx>
diff --git a/sw/source/uibase/inc/break.hxx b/sw/source/uibase/inc/break.hxx
index 089fe9eae43b..5d939e6efdae 100644
--- a/sw/source/uibase/inc/break.hxx
+++ b/sw/source/uibase/inc/break.hxx
@@ -17,8 +17,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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_BREAK_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_BREAK_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_BREAK_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_BREAK_HXX
 
 #include <svx/stddlg.hxx>
 
diff --git a/sw/source/uibase/inc/caption.hxx b/sw/source/uibase/inc/caption.hxx
index dddaee32b456..ff2760f14bce 100644
--- a/sw/source/uibase/inc/caption.hxx
+++ b/sw/source/uibase/inc/caption.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_CAPTION_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_CAPTION_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_CAPTION_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_CAPTION_HXX
 
 #include <rtl/ustring.hxx>
 #include <tools/globname.hxx>
diff --git a/sw/source/uibase/inc/cfgid.h b/sw/source/uibase/inc/cfgid.h
index d8a7fad011fe..ed7c0a545999 100644
--- a/sw/source/uibase/inc/cfgid.h
+++ b/sw/source/uibase/inc/cfgid.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_CFGID_H
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_CFGID_H
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_CFGID_H
+#define INCLUDED_SW_SOURCE_UIBASE_INC_CFGID_H
 
 #include <sfx2/sfx.hrc>
 
diff --git a/sw/source/uibase/inc/cfgitems.hxx b/sw/source/uibase/inc/cfgitems.hxx
index bdd78cebe0df..8bedf3f7e8ac 100644
--- a/sw/source/uibase/inc/cfgitems.hxx
+++ b/sw/source/uibase/inc/cfgitems.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_CFGITEMS_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_CFGITEMS_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_CFGITEMS_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_CFGITEMS_HXX
 
 #include <tools/color.hxx>
 #include <svl/poolitem.hxx>
diff --git a/sw/source/uibase/inc/changedb.hxx b/sw/source/uibase/inc/changedb.hxx
index a6e1cd520df6..128d7aa8338d 100644
--- a/sw/source/uibase/inc/changedb.hxx
+++ b/sw/source/uibase/inc/changedb.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_CHANGEDB_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_CHANGEDB_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_CHANGEDB_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_CHANGEDB_HXX
 
 #include <vcl/bitmap.hxx>
 #include <vcl/button.hxx>
diff --git a/sw/source/uibase/inc/chartins.hxx b/sw/source/uibase/inc/chartins.hxx
index 5f5ea628b834..f520fe08de2d 100644
--- a/sw/source/uibase/inc/chartins.hxx
+++ b/sw/source/uibase/inc/chartins.hxx
@@ -16,12 +16,12 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_CHARTINS_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_CHARTINS_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_CHARTINS_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_CHARTINS_HXX
 
 Point SwGetChartDialogPos( const Window *pParentWin, const Size& rDialogSize, const Rectangle& rLogicChart );
 void SwInsertChart( Window *pParent, SfxBindings *pBindings );
 
-#endif // INCLUDED_SW_SOURCE_CORE_UIBASE_INC_CHARTINS_HXX
+#endif // INCLUDED_SW_SOURCE_UIBASE_INC_CHARTINS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/inc/chldwrap.hxx b/sw/source/uibase/inc/chldwrap.hxx
index 26f20c2f64f9..142b68982bb6 100644
--- a/sw/source/uibase/inc/chldwrap.hxx
+++ b/sw/source/uibase/inc/chldwrap.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_CHLDWRAP_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_CHLDWRAP_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_CHLDWRAP_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_CHLDWRAP_HXX
 
 #include <sfx2/childwin.hxx>
 #include <vcl/timer.hxx>
diff --git a/sw/source/uibase/inc/chrdlg.hxx b/sw/source/uibase/inc/chrdlg.hxx
index b84b7209c51d..50770d7f7f55 100644
--- a/sw/source/uibase/inc/chrdlg.hxx
+++ b/sw/source/uibase/inc/chrdlg.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_CHRDLG_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_CHRDLG_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_CHRDLG_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_CHRDLG_HXX
 #include <sfx2/tabdlg.hxx>
 
 #include <vcl/group.hxx>
diff --git a/sw/source/uibase/inc/chrdlgmodes.hxx b/sw/source/uibase/inc/chrdlgmodes.hxx
index d11d98addb1e..e4b9fb34285a 100644
--- a/sw/source/uibase/inc/chrdlgmodes.hxx
+++ b/sw/source/uibase/inc/chrdlgmodes.hxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_CHRDLGMODES_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_CHRDLGMODES_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_CHRDLGMODES_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_CHRDLGMODES_HXX
 
 // DialogModes for SwCharDlg
 #define DLG_CHAR_STD    0
@@ -16,6 +16,6 @@
 #define DLG_CHAR_ENV    2
 #define DLG_CHAR_ANN    3
 
-#endif // INCLUDED_SW_SOURCE_CORE_UIBASE_INC_CHRDLGMODES_HXX
+#endif // INCLUDED_SW_SOURCE_UIBASE_INC_CHRDLGMODES_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/inc/cnttab.hxx b/sw/source/uibase/inc/cnttab.hxx
index 034ffd850b85..1fd1e18058e2 100644
--- a/sw/source/uibase/inc/cnttab.hxx
+++ b/sw/source/uibase/inc/cnttab.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_CNTTAB_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_CNTTAB_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_CNTTAB_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_CNTTAB_HXX
 
 #include <svx/stddlg.hxx>
 #include <vcl/button.hxx>
diff --git a/sw/source/uibase/inc/colex.hxx b/sw/source/uibase/inc/colex.hxx
index fe4d569e54e2..1bc29f9b39c2 100644
--- a/sw/source/uibase/inc/colex.hxx
+++ b/sw/source/uibase/inc/colex.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_COLEX_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_COLEX_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_COLEX_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_COLEX_HXX
 
 #include <svx/pagectrl.hxx>
 #include <editeng/paperinf.hxx>
@@ -104,6 +104,6 @@ public:
     virtual Size GetOptimalSize() const SAL_OVERRIDE;
 };
 
-#endif // INCLUDED_SW_SOURCE_CORE_UIBASE_INC_COLEX_HXX
+#endif // INCLUDED_SW_SOURCE_UIBASE_INC_COLEX_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/inc/colmgr.hxx b/sw/source/uibase/inc/colmgr.hxx
index 1f30dfaecada..e63b3f0aba53 100644
--- a/sw/source/uibase/inc/colmgr.hxx
+++ b/sw/source/uibase/inc/colmgr.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_COLMGR_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_COLMGR_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_COLMGR_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_COLMGR_HXX
 
 #include "swdllapi.h"
 #include <fmtclds.hxx>
diff --git a/sw/source/uibase/inc/column.hxx b/sw/source/uibase/inc/column.hxx
index c223660ec631..84c428478562 100644
--- a/sw/source/uibase/inc/column.hxx
+++ b/sw/source/uibase/inc/column.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_COLUMN_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_COLUMN_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_COLUMN_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_COLUMN_HXX
 
 #include <vcl/fixed.hxx>
 #include <vcl/field.hxx>
diff --git a/sw/source/uibase/inc/conarc.hxx b/sw/source/uibase/inc/conarc.hxx
index 3d05c3e596aa..ca63894afb54 100644
--- a/sw/source/uibase/inc/conarc.hxx
+++ b/sw/source/uibase/inc/conarc.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_CONARC_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_CONARC_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_CONARC_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_CONARC_HXX
 
 #include "drawbase.hxx"
 
@@ -38,6 +38,6 @@ public:
     virtual void    Deactivate() SAL_OVERRIDE;
 };
 
-#endif // INCLUDED_SW_SOURCE_CORE_UIBASE_INC_CONARC_HXX
+#endif // INCLUDED_SW_SOURCE_UIBASE_INC_CONARC_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/inc/concustomshape.hxx b/sw/source/uibase/inc/concustomshape.hxx
index 5b4e8a47ec51..f082cc46c373 100644
--- a/sw/source/uibase/inc/concustomshape.hxx
+++ b/sw/source/uibase/inc/concustomshape.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_CONCUSTOMSHAPE_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_CONCUSTOMSHAPE_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_CONCUSTOMSHAPE_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_CONCUSTOMSHAPE_HXX
 
 #include <rtl/ustring.hxx>
 #include "drawbase.hxx"
@@ -53,6 +53,6 @@ class ConstCustomShape : public SwDrawBase
     virtual bool doConstructOrthogonal() const SAL_OVERRIDE;
 };
 
-#endif // INCLUDED_SW_SOURCE_CORE_UIBASE_INC_CONCUSTOMSHAPE_HXX
+#endif // INCLUDED_SW_SOURCE_UIBASE_INC_CONCUSTOMSHAPE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/inc/condedit.hxx b/sw/source/uibase/inc/condedit.hxx
index f82c87eab591..d8c0a41af9c2 100644
--- a/sw/source/uibase/inc/condedit.hxx
+++ b/sw/source/uibase/inc/condedit.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_CONDEDIT_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_CONDEDIT_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_CONDEDIT_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_CONDEDIT_HXX
 
 #include <vcl/edit.hxx>
 #include <svtools/transfer.hxx>
diff --git a/sw/source/uibase/inc/conform.hxx b/sw/source/uibase/inc/conform.hxx
index d3ebbec3ba58..bd116ebe83a3 100644
--- a/sw/source/uibase/inc/conform.hxx
+++ b/sw/source/uibase/inc/conform.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_CONFORM_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_CONFORM_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_CONFORM_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_CONFORM_HXX
 
 #include "drawbase.hxx"
 
diff --git a/sw/source/uibase/inc/conpoly.hxx b/sw/source/uibase/inc/conpoly.hxx
index ea35377d413b..ceabd6fd4b94 100644
--- a/sw/source/uibase/inc/conpoly.hxx
+++ b/sw/source/uibase/inc/conpoly.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_CONPOLY_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_CONPOLY_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_CONPOLY_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_CONPOLY_HXX
 
 #include "drawbase.hxx"
 
@@ -37,6 +37,6 @@ public:
     virtual void Activate(const sal_uInt16 nSlotId) SAL_OVERRIDE;    // activate function
 };
 
-#endif // INCLUDED_SW_SOURCE_CORE_UIBASE_INC_CONPOLY_HXX
+#endif // INCLUDED_SW_SOURCE_UIBASE_INC_CONPOLY_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/inc/conrect.hxx b/sw/source/uibase/inc/conrect.hxx
index b5b8e3e7b074..11ffecd024b8 100644
--- a/sw/source/uibase/inc/conrect.hxx
+++ b/sw/source/uibase/inc/conrect.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_CONRECT_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_CONRECT_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_CONRECT_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_CONRECT_HXX
 
 #include "drawbase.hxx"
 
@@ -41,6 +41,6 @@ class ConstRectangle : public SwDrawBase
     virtual void Activate(const sal_uInt16 nSlotId) SAL_OVERRIDE;    // activate function
 };
 
-#endif // INCLUDED_SW_SOURCE_CORE_UIBASE_INC_CONRECT_HXX
+#endif // INCLUDED_SW_SOURCE_UIBASE_INC_CONRECT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/inc/content.hxx b/sw/source/uibase/inc/content.hxx
index aaf2ff242ce5..880633d5ef54 100644
--- a/sw/source/uibase/inc/content.hxx
+++ b/sw/source/uibase/inc/content.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_CONTENT_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_CONTENT_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_CONTENT_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_CONTENT_HXX
 #include <limits.h>
 #include "swcont.hxx"
 
diff --git a/sw/source/uibase/inc/conttree.hxx b/sw/source/uibase/inc/conttree.hxx
index 850422fe82e7..df1981dc6e85 100644
--- a/sw/source/uibase/inc/conttree.hxx
+++ b/sw/source/uibase/inc/conttree.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_CONTTREE_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_CONTTREE_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_CONTTREE_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_CONTTREE_HXX
 
 #include <svtools/treelistbox.hxx>
 #include <svtools/svlbitm.hxx>
diff --git a/sw/source/uibase/inc/convert.hxx b/sw/source/uibase/inc/convert.hxx
index b03d9c637c6a..8b803bfee2db 100644
--- a/sw/source/uibase/inc/convert.hxx
+++ b/sw/source/uibase/inc/convert.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_CONVERT_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_CONVERT_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_CONVERT_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_CONVERT_HXX
 
 #include <vcl/fixed.hxx>
 #include <vcl/button.hxx>
diff --git a/sw/source/uibase/inc/cption.hxx b/sw/source/uibase/inc/cption.hxx
index 4d96cda1113f..98781e10efb8 100644
--- a/sw/source/uibase/inc/cption.hxx
+++ b/sw/source/uibase/inc/cption.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_CPTION_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_CPTION_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_CPTION_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_CPTION_HXX
 
 #include <svx/stddlg.hxx>
 
diff --git a/sw/source/uibase/inc/dbconfig.hxx b/sw/source/uibase/inc/dbconfig.hxx
index f3e2b43ae59f..16f0481b674f 100644
--- a/sw/source/uibase/inc/dbconfig.hxx
+++ b/sw/source/uibase/inc/dbconfig.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_DBCONFIG_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_DBCONFIG_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_DBCONFIG_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_DBCONFIG_HXX
 
 #include <unotools/configitem.hxx>
 #include "swdllapi.h"
diff --git a/sw/source/uibase/inc/dbinsdlg.hxx b/sw/source/uibase/inc/dbinsdlg.hxx
index e77e77ae415f..f156ebe327a3 100644
--- a/sw/source/uibase/inc/dbinsdlg.hxx
+++ b/sw/source/uibase/inc/dbinsdlg.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_DBINSDLG_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_DBINSDLG_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_DBINSDLG_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_DBINSDLG_HXX
 
 #include <vcl/button.hxx>
 #include <vcl/group.hxx>
diff --git a/sw/source/uibase/inc/dbtree.hxx b/sw/source/uibase/inc/dbtree.hxx
index 9b229e4f13dc..e4ea1325aecb 100644
--- a/sw/source/uibase/inc/dbtree.hxx
+++ b/sw/source/uibase/inc/dbtree.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_DBTREE_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_DBTREE_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_DBTREE_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_DBTREE_HXX
 
 #include <svtools/treelistbox.hxx>
 #include <com/sun/star/uno/Reference.h>
diff --git a/sw/source/uibase/inc/dbui.hxx b/sw/source/uibase/inc/dbui.hxx
index 1dbbccdb2c43..9f4022f20fcf 100644
--- a/sw/source/uibase/inc/dbui.hxx
+++ b/sw/source/uibase/inc/dbui.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_DBUI_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_DBUI_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_DBUI_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_DBUI_HXX
 
 #include <svx/stddlg.hxx>
 
diff --git a/sw/source/uibase/inc/dialmgr.hxx b/sw/source/uibase/inc/dialmgr.hxx
index 58e35543e3ac..91695bdeb4a7 100644
--- a/sw/source/uibase/inc/dialmgr.hxx
+++ b/sw/source/uibase/inc/dialmgr.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_DIALMGR_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_DIALMGR_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_DIALMGR_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_DIALMGR_HXX
 
 #include <tools/resid.hxx>
 
diff --git a/sw/source/uibase/inc/docfnote.hxx b/sw/source/uibase/inc/docfnote.hxx
index f084ada5f441..6878450ec754 100644
--- a/sw/source/uibase/inc/docfnote.hxx
+++ b/sw/source/uibase/inc/docfnote.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_DOCFNOTE_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_DOCFNOTE_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_DOCFNOTE_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_DOCFNOTE_HXX
 
 #include <sfx2/tabdlg.hxx>
 
diff --git a/sw/source/uibase/inc/docstdlg.hxx b/sw/source/uibase/inc/docstdlg.hxx
index 6609d0728fe8..ec28d0de6874 100644
--- a/sw/source/uibase/inc/docstdlg.hxx
+++ b/sw/source/uibase/inc/docstdlg.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_DOCSTDLG_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_DOCSTDLG_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_DOCSTDLG_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_DOCSTDLG_HXX
 
 #include <sfx2/tabdlg.hxx>
 
diff --git a/sw/source/uibase/inc/drawbase.hxx b/sw/source/uibase/inc/drawbase.hxx
index 0cec957aed02..8aaf44434492 100644
--- a/sw/source/uibase/inc/drawbase.hxx
+++ b/sw/source/uibase/inc/drawbase.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_DRAWBASE_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_DRAWBASE_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_DRAWBASE_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_DRAWBASE_HXX
 
 #include <tools/gen.hxx>
 
@@ -69,6 +69,6 @@ public:
     virtual bool doConstructOrthogonal() const;
 };
 
-#endif // INCLUDED_SW_SOURCE_CORE_UIBASE_INC_DRAWBASE_HXX
+#endif // INCLUDED_SW_SOURCE_UIBASE_INC_DRAWBASE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/inc/drawsh.hxx b/sw/source/uibase/inc/drawsh.hxx
index 81af80841d8c..c95505070edc 100644
--- a/sw/source/uibase/inc/drawsh.hxx
+++ b/sw/source/uibase/inc/drawsh.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_DRAWSH_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_DRAWSH_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_DRAWSH_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_DRAWSH_HXX
 
 #include "drwbassh.hxx"
 
diff --git a/sw/source/uibase/inc/drformsh.hxx b/sw/source/uibase/inc/drformsh.hxx
index f810dbdf52d2..19063344d8a0 100644
--- a/sw/source/uibase/inc/drformsh.hxx
+++ b/sw/source/uibase/inc/drformsh.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_DRFORMSH_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_DRFORMSH_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_DRFORMSH_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_DRFORMSH_HXX
 
 #include "drwbassh.hxx"
 
diff --git a/sw/source/uibase/inc/drpcps.hxx b/sw/source/uibase/inc/drpcps.hxx
index 2758e2a1ddfe..a906419e00a9 100644
--- a/sw/source/uibase/inc/drpcps.hxx
+++ b/sw/source/uibase/inc/drpcps.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_DRPCPS_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_DRPCPS_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_DRPCPS_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_DRPCPS_HXX
 
 #include <sfx2/basedlgs.hxx>
 #include <sfx2/tabdlg.hxx>
diff --git a/sw/source/uibase/inc/drwbassh.hxx b/sw/source/uibase/inc/drwbassh.hxx
index 16237b34691a..77ed33b9d113 100644
--- a/sw/source/uibase/inc/drwbassh.hxx
+++ b/sw/source/uibase/inc/drwbassh.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_DRWBASSH_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_DRWBASSH_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_DRWBASSH_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_DRWBASSH_HXX
 
 #include "basesh.hxx"
 
diff --git a/sw/source/uibase/inc/drwtxtsh.hxx b/sw/source/uibase/inc/drwtxtsh.hxx
index c32d3d2128a8..1431992ba258 100644
--- a/sw/source/uibase/inc/drwtxtsh.hxx
+++ b/sw/source/uibase/inc/drwtxtsh.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_DRWTXTSH_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_DRWTXTSH_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_DRWTXTSH_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_DRWTXTSH_HXX
 
 #include <sfx2/shell.hxx>
 #include "shellid.hxx"
diff --git a/sw/source/uibase/inc/dselect.hxx b/sw/source/uibase/inc/dselect.hxx
index 85ef2c6d13a0..49bd1fd0af70 100644
--- a/sw/source/uibase/inc/dselect.hxx
+++ b/sw/source/uibase/inc/dselect.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_DSELECT_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_DSELECT_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_DSELECT_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_DSELECT_HXX
 
 #include "drawbase.hxx"
 
@@ -33,6 +33,6 @@ class DrawSelection : public SwDrawBase
     virtual void Activate(const sal_uInt16 nSlotId) SAL_OVERRIDE;    // activate function
 };
 
-#endif // INCLUDED_SW_SOURCE_CORE_UIBASE_INC_DSELECT_HXX
+#endif // INCLUDED_SW_SOURCE_UIBASE_INC_DSELECT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/inc/edtwin.hxx b/sw/source/uibase/inc/edtwin.hxx
index ddd1ce3cd796..bfe89ad3129e 100644
--- a/sw/source/uibase/inc/edtwin.hxx
+++ b/sw/source/uibase/inc/edtwin.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_EDTWIN_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_EDTWIN_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_EDTWIN_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_EDTWIN_HXX
 
 #include <FrameControlsManager.hxx>
 
diff --git a/sw/source/uibase/inc/envimg.hxx b/sw/source/uibase/inc/envimg.hxx
index 2d10be75b0cd..40fe1e419c83 100644
--- a/sw/source/uibase/inc/envimg.hxx
+++ b/sw/source/uibase/inc/envimg.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_ENVIMG_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_ENVIMG_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_ENVIMG_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_ENVIMG_HXX
 
 #include <svl/poolitem.hxx>
 #include <unotools/configitem.hxx>
diff --git a/sw/source/uibase/inc/envlop.hxx b/sw/source/uibase/inc/envlop.hxx
index dba8a15c07ac..9af6f3e761ae 100644
--- a/sw/source/uibase/inc/envlop.hxx
+++ b/sw/source/uibase/inc/envlop.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_ENVLOP_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_ENVLOP_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_ENVLOP_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_ENVLOP_HXX
 
 #include <svtools/svmedit.hxx>
 #include <sfx2/tabdlg.hxx>
diff --git a/sw/source/uibase/inc/fldedt.hxx b/sw/source/uibase/inc/fldedt.hxx
index fdaab1429584..0c859e9fd69d 100644
--- a/sw/source/uibase/inc/fldedt.hxx
+++ b/sw/source/uibase/inc/fldedt.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_FLDEDT_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_FLDEDT_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_FLDEDT_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_FLDEDT_HXX
 #include <sfx2/basedlgs.hxx>
 #include <vcl/button.hxx>
 
diff --git a/sw/source/uibase/inc/fldmgr.hxx b/sw/source/uibase/inc/fldmgr.hxx
index 1dac07f783ce..46b04379d3e6 100644
--- a/sw/source/uibase/inc/fldmgr.hxx
+++ b/sw/source/uibase/inc/fldmgr.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_FLDMGR_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_FLDMGR_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_FLDMGR_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_FLDMGR_HXX
 
 #include "swdllapi.h"
 #include "swtypes.hxx"
diff --git a/sw/source/uibase/inc/fldtdlg.hxx b/sw/source/uibase/inc/fldtdlg.hxx
index 073da94b8fc6..da57ade2e098 100644
--- a/sw/source/uibase/inc/fldtdlg.hxx
+++ b/sw/source/uibase/inc/fldtdlg.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_FLDTDLG_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_FLDTDLG_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_FLDTDLG_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_FLDTDLG_HXX
 #include <sfx2/tabdlg.hxx>
 
 class SfxBindings;
diff --git a/sw/source/uibase/inc/fldwrap.hxx b/sw/source/uibase/inc/fldwrap.hxx
index 3d0478d9cbd3..ecc67a06ff61 100644
--- a/sw/source/uibase/inc/fldwrap.hxx
+++ b/sw/source/uibase/inc/fldwrap.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_FLDWRAP_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_FLDWRAP_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_FLDWRAP_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_FLDWRAP_HXX
 
 #include "chldwrap.hxx"
 class AbstractSwFldDlg;
diff --git a/sw/source/uibase/inc/fontcfg.hxx b/sw/source/uibase/inc/fontcfg.hxx
index 1730f82c01c4..8bd78440f449 100644
--- a/sw/source/uibase/inc/fontcfg.hxx
+++ b/sw/source/uibase/inc/fontcfg.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_FONTCFG_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_FONTCFG_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_FONTCFG_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_FONTCFG_HXX
 
 #include <rtl/ustring.hxx>
 #include <unotools/configitem.hxx>
diff --git a/sw/source/uibase/inc/formatclipboard.hxx b/sw/source/uibase/inc/formatclipboard.hxx
index 4c90ed28379e..87713da2e5e9 100644
--- a/sw/source/uibase/inc/formatclipboard.hxx
+++ b/sw/source/uibase/inc/formatclipboard.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_FORMATCLIPBOARD_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_FORMATCLIPBOARD_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_FORMATCLIPBOARD_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_FORMATCLIPBOARD_HXX
 
 #include <wrtsh.hxx>
 #include <svl/itemset.hxx>
diff --git a/sw/source/uibase/inc/formedt.hxx b/sw/source/uibase/inc/formedt.hxx
index 0aeea6aa8b5c..7489506e7e8e 100644
--- a/sw/source/uibase/inc/formedt.hxx
+++ b/sw/source/uibase/inc/formedt.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_FORMEDT_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_FORMEDT_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_FORMEDT_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_FORMEDT_HXX
 
 #include <svx/stddlg.hxx>
 
diff --git a/sw/source/uibase/inc/frmdlg.hxx b/sw/source/uibase/inc/frmdlg.hxx
index d2af253abaa8..8a1066dac7e7 100644
--- a/sw/source/uibase/inc/frmdlg.hxx
+++ b/sw/source/uibase/inc/frmdlg.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_FRMDLG_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_FRMDLG_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_FRMDLG_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_FRMDLG_HXX
 
 #include "globals.hrc"
 #include <sfx2/tabdlg.hxx>
@@ -63,6 +63,6 @@ public:
     SwWrtShell*  GetWrtShell()   { return m_pWrtShell; }
 };
 
-#endif // INCLUDED_SW_SOURCE_CORE_UIBASE_INC_FRMDLG_HXX
+#endif // INCLUDED_SW_SOURCE_UIBASE_INC_FRMDLG_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/inc/frmmgr.hxx b/sw/source/uibase/inc/frmmgr.hxx
index 548a68e5c23a..a28d2ff04451 100644
--- a/sw/source/uibase/inc/frmmgr.hxx
+++ b/sw/source/uibase/inc/frmmgr.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_FRMMGR_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_FRMMGR_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_FRMMGR_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_FRMMGR_HXX
 
 #include "swtypes.hxx"
 #include "frmatr.hxx"
diff --git a/sw/source/uibase/inc/frmpage.hxx b/sw/source/uibase/inc/frmpage.hxx
index 92fd3a0e0c7d..edffb7ebd7fc 100644
--- a/sw/source/uibase/inc/frmpage.hxx
+++ b/sw/source/uibase/inc/frmpage.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_FRMPAGE_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_FRMPAGE_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_FRMPAGE_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_FRMPAGE_HXX
 
 #include <vcl/fixed.hxx>
 #include <vcl/button.hxx>
@@ -321,6 +321,6 @@ public:
 
 };
 
-#endif // INCLUDED_SW_SOURCE_CORE_UIBASE_INC_FRMPAGE_HXX
+#endif // INCLUDED_SW_SOURCE_UIBASE_INC_FRMPAGE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/inc/frmsh.hxx b/sw/source/uibase/inc/frmsh.hxx
index 0b8f7cb5ee9d..97ced56dff37 100644
--- a/sw/source/uibase/inc/frmsh.hxx
+++ b/sw/source/uibase/inc/frmsh.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_FRMSH_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_FRMSH_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_FRMSH_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_FRMSH_HXX
 
 #include "basesh.hxx"
 
diff --git a/sw/source/uibase/inc/globals.h b/sw/source/uibase/inc/globals.h
index 821eeea5d00e..8617d791c528 100644
--- a/sw/source/uibase/inc/globals.h
+++ b/sw/source/uibase/inc/globals.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_GLOBALS_H
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_GLOBALS_H
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_GLOBALS_H
+#define INCLUDED_SW_SOURCE_UIBASE_INC_GLOBALS_H
 
 enum SwChangeState
 {
diff --git a/sw/source/uibase/inc/glosbib.hxx b/sw/source/uibase/inc/glosbib.hxx
index 1a154aa4e2b4..e744c6be1e8c 100644
--- a/sw/source/uibase/inc/glosbib.hxx
+++ b/sw/source/uibase/inc/glosbib.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_GLOSBIB_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_GLOSBIB_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_GLOSBIB_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_GLOSBIB_HXX
 
 #include <vcl/edit.hxx>
 #include <svx/stddlg.hxx>
diff --git a/sw/source/uibase/inc/glosdoc.hxx b/sw/source/uibase/inc/glosdoc.hxx
index 49c1493b6545..b075882c1c82 100644
--- a/sw/source/uibase/inc/glosdoc.hxx
+++ b/sw/source/uibase/inc/glosdoc.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_GLOSDOC_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_GLOSDOC_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_GLOSDOC_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_GLOSDOC_HXX
 
 #include <rtl/ustring.hxx>
 #include <com/sun/star/text/XAutoTextGroup.hpp>
@@ -129,6 +129,6 @@ public:
     std::vector<OUString> const& GetPathArray() const { return m_PathArr; }
 };
 
-#endif // INCLUDED_SW_SOURCE_CORE_UIBASE_INC_GLOSDOC_HXX
+#endif // INCLUDED_SW_SOURCE_UIBASE_INC_GLOSDOC_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/inc/gloshdl.hxx b/sw/source/uibase/inc/gloshdl.hxx
index 60708116a99c..aa4e0c9a5704 100644
--- a/sw/source/uibase/inc/gloshdl.hxx
+++ b/sw/source/uibase/inc/gloshdl.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_GLOSHDL_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_GLOSHDL_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_GLOSHDL_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_GLOSHDL_HXX
 
 #include <rtl/ustring.hxx>
 #include "swdllapi.h"
@@ -98,6 +98,6 @@ public:
             ~SwGlossaryHdl();
 };
 
-#endif // INCLUDED_SW_SOURCE_CORE_UIBASE_INC_GLOSHDL_HXX
+#endif // INCLUDED_SW_SOURCE_UIBASE_INC_GLOSHDL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/inc/gloslst.hxx b/sw/source/uibase/inc/gloslst.hxx
index 735c27bdab23..8bac07174418 100644
--- a/sw/source/uibase/inc/gloslst.hxx
+++ b/sw/source/uibase/inc/gloslst.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_GLOSLST_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_GLOSLST_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_GLOSLST_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_GLOSLST_HXX
 
 #include <rtl/ustring.hxx>
 #include <tools/datetime.hxx>
diff --git a/sw/source/uibase/inc/glossary.hxx b/sw/source/uibase/inc/glossary.hxx
index aead0c1e852c..c34dee5d7d27 100644
--- a/sw/source/uibase/inc/glossary.hxx
+++ b/sw/source/uibase/inc/glossary.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_GLOSSARY_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_GLOSSARY_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_GLOSSARY_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_GLOSSARY_HXX
 
 #include <vcl/edit.hxx>
 #include <svtools/treelistbox.hxx>
diff --git a/sw/source/uibase/inc/glshell.hxx b/sw/source/uibase/inc/glshell.hxx
index 33a9a6faac4d..e7e3674587fd 100644
--- a/sw/source/uibase/inc/glshell.hxx
+++ b/sw/source/uibase/inc/glshell.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_GLSHELL_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_GLSHELL_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_GLSHELL_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_GLSHELL_HXX
 #include "wdocsh.hxx"
 
 class SwGlosDocShell : public SwDocShell
diff --git a/sw/source/uibase/inc/grfsh.hxx b/sw/source/uibase/inc/grfsh.hxx
index bfbdaed12689..75c1ab0a53ff 100644
--- a/sw/source/uibase/inc/grfsh.hxx
+++ b/sw/source/uibase/inc/grfsh.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_GRFSH_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_GRFSH_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_GRFSH_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_GRFSH_HXX
 
 #include "frmsh.hxx"
 
diff --git a/sw/source/uibase/inc/hyp.hxx b/sw/source/uibase/inc/hyp.hxx
index ca7642a74c45..6d7be0611eaa 100644
--- a/sw/source/uibase/inc/hyp.hxx
+++ b/sw/source/uibase/inc/hyp.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_HYP_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_HYP_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_HYP_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_HYP_HXX
 
 #include <tools/link.hxx>
 #include <editeng/splwrap.hxx>
diff --git a/sw/source/uibase/inc/idxmrk.hxx b/sw/source/uibase/inc/idxmrk.hxx
index 7518c5b4254b..0115e77a8fe1 100644
--- a/sw/source/uibase/inc/idxmrk.hxx
+++ b/sw/source/uibase/inc/idxmrk.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_IDXMRK_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_IDXMRK_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_IDXMRK_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_IDXMRK_HXX
 
 #include <sfx2/childwin.hxx>
 
@@ -55,6 +55,6 @@ public:
     void    ReInitDlg(SwWrtShell& rWrtShell);
 };
 
-#endif // INCLUDED_SW_SOURCE_CORE_UIBASE_INC_IDXMRK_HXX
+#endif // INCLUDED_SW_SOURCE_UIBASE_INC_IDXMRK_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/inc/imaildsplistener.hxx b/sw/source/uibase/inc/imaildsplistener.hxx
index a0ab9ba6d174..b8e51ddb6d19 100644
--- a/sw/source/uibase/inc/imaildsplistener.hxx
+++ b/sw/source/uibase/inc/imaildsplistener.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_IMAILDSPLISTENER_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_IMAILDSPLISTENER_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_IMAILDSPLISTENER_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_IMAILDSPLISTENER_HXX
 
 #include <com/sun/star/mail/XMailMessage.hpp>
 #include <salhelper/refobj.hxx>
diff --git a/sw/source/uibase/inc/initui.hxx b/sw/source/uibase/inc/initui.hxx
index d917bff51ca3..462fdd58e0d4 100644
--- a/sw/source/uibase/inc/initui.hxx
+++ b/sw/source/uibase/inc/initui.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_INITUI_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_INITUI_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_INITUI_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_INITUI_HXX
 
 #include <tools/solar.h>
 #include "swdllapi.h"
diff --git a/sw/source/uibase/inc/inpdlg.hxx b/sw/source/uibase/inc/inpdlg.hxx
index d21209ef1b59..510e28c202b9 100644
--- a/sw/source/uibase/inc/inpdlg.hxx
+++ b/sw/source/uibase/inc/inpdlg.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_INPDLG_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_INPDLG_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_INPDLG_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_INPDLG_HXX
 
 #include <svx/stddlg.hxx>
 
diff --git a/sw/source/uibase/inc/inputwin.hxx b/sw/source/uibase/inc/inputwin.hxx
index 082274390172..3db10af8b6e0 100644
--- a/sw/source/uibase/inc/inputwin.hxx
+++ b/sw/source/uibase/inc/inputwin.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_INPUTWIN_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_INPUTWIN_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_INPUTWIN_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_INPUTWIN_HXX
 
 #include <vcl/edit.hxx>
 #include <vcl/menu.hxx>
diff --git a/sw/source/uibase/inc/insfnote.hxx b/sw/source/uibase/inc/insfnote.hxx
index 79b158924f50..86cb31312244 100644
--- a/sw/source/uibase/inc/insfnote.hxx
+++ b/sw/source/uibase/inc/insfnote.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_INSFNOTE_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_INSFNOTE_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_INSFNOTE_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_INSFNOTE_HXX
 
 #include <svx/stddlg.hxx>
 
diff --git a/sw/source/uibase/inc/instable.hxx b/sw/source/uibase/inc/instable.hxx
index a5e4c120bda8..ce47d8d30776 100644
--- a/sw/source/uibase/inc/instable.hxx
+++ b/sw/source/uibase/inc/instable.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_INSTABLE_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_INSTABLE_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_INSTABLE_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_INSTABLE_HXX
 
 #include <rtl/ustring.hxx>
 #include <vcl/button.hxx>
diff --git a/sw/source/uibase/inc/javaedit.hxx b/sw/source/uibase/inc/javaedit.hxx
index b17f0f74cc1c..506b6cfdd84a 100644
--- a/sw/source/uibase/inc/javaedit.hxx
+++ b/sw/source/uibase/inc/javaedit.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_JAVAEDIT_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_JAVAEDIT_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_JAVAEDIT_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_JAVAEDIT_HXX
 
 #include <svx/stddlg.hxx>
 #include <vcl/fixed.hxx>
diff --git a/sw/source/uibase/inc/label.hxx b/sw/source/uibase/inc/label.hxx
index cb7dae2163df..a2f22a3ba867 100644
--- a/sw/source/uibase/inc/label.hxx
+++ b/sw/source/uibase/inc/label.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_LABEL_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_LABEL_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_LABEL_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_LABEL_HXX
 
 #include <sfx2/tabdlg.hxx>
 #include <com/sun/star/frame/XModel.hpp>
diff --git a/sw/source/uibase/inc/labelcfg.hxx b/sw/source/uibase/inc/labelcfg.hxx
index 9789d86537e7..40bd8cea6192 100644
--- a/sw/source/uibase/inc/labelcfg.hxx
+++ b/sw/source/uibase/inc/labelcfg.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_LABELCFG_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_LABELCFG_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_LABELCFG_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_LABELCFG_HXX
 
 #include <unotools/configitem.hxx>
 #include "swdllapi.h"
diff --git a/sw/source/uibase/inc/labimg.hxx b/sw/source/uibase/inc/labimg.hxx
index 20f355d4c8ec..dad4ae7f4d9e 100644
--- a/sw/source/uibase/inc/labimg.hxx
+++ b/sw/source/uibase/inc/labimg.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_LABIMG_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_LABIMG_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_LABIMG_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_LABIMG_HXX
 
 #include <svl/poolitem.hxx>
 #include <unotools/configitem.hxx>
diff --git a/sw/source/uibase/inc/langhelper.hxx b/sw/source/uibase/inc/langhelper.hxx
index 668d27d2392b..b4f1ebe8b970 100644
--- a/sw/source/uibase/inc/langhelper.hxx
+++ b/sw/source/uibase/inc/langhelper.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_LANGHELPER_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_LANGHELPER_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_LANGHELPER_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_LANGHELPER_HXX
 
 class SwWrtShell;
 class SwView;
diff --git a/sw/source/uibase/inc/linenum.hxx b/sw/source/uibase/inc/linenum.hxx
index d6ac4d4e0725..c9809c908b7a 100644
--- a/sw/source/uibase/inc/linenum.hxx
+++ b/sw/source/uibase/inc/linenum.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_LINENUM_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_LINENUM_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_LINENUM_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_LINENUM_HXX
 
 #include <sfx2/basedlgs.hxx>
 #include <vcl/button.hxx>
diff --git a/sw/source/uibase/inc/listsh.hxx b/sw/source/uibase/inc/listsh.hxx
index 7230a75abedd..733d26ca06f4 100644
--- a/sw/source/uibase/inc/listsh.hxx
+++ b/sw/source/uibase/inc/listsh.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_LISTSH_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_LISTSH_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_LISTSH_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_LISTSH_HXX
 
 #include "basesh.hxx"
 
diff --git a/sw/source/uibase/inc/macassgn.hxx b/sw/source/uibase/inc/macassgn.hxx
index 92f34911f2c4..828203340ed9 100644
--- a/sw/source/uibase/inc/macassgn.hxx
+++ b/sw/source/uibase/inc/macassgn.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_MACASSGN_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_MACASSGN_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_MACASSGN_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_MACASSGN_HXX
 
 #include <sfx2/evntconf.hxx>
 
diff --git a/sw/source/uibase/inc/mailconfigpage.hxx b/sw/source/uibase/inc/mailconfigpage.hxx
index 2aad6d202ab0..4872c61919e6 100644
--- a/sw/source/uibase/inc/mailconfigpage.hxx
+++ b/sw/source/uibase/inc/mailconfigpage.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_MAILCONFIGPAGE_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_MAILCONFIGPAGE_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_MAILCONFIGPAGE_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_MAILCONFIGPAGE_HXX
 
 #include <sfx2/tabdlg.hxx>
 #include <vcl/button.hxx>
diff --git a/sw/source/uibase/inc/maildispatcher.hxx b/sw/source/uibase/inc/maildispatcher.hxx
index 4da0e5d5fe72..4cbe6cd9f3cd 100644
--- a/sw/source/uibase/inc/maildispatcher.hxx
+++ b/sw/source/uibase/inc/maildispatcher.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_MAILDISPATCHER_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_MAILDISPATCHER_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_MAILDISPATCHER_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_MAILDISPATCHER_HXX
 
 #include <com/sun/star/mail/XSmtpService.hpp>
 #include <com/sun/star/mail/XMailMessage.hpp>
@@ -153,6 +153,6 @@ private:
     bool shutdown_requested_;
 };
 
-#endif // INCLUDED_SW_SOURCE_CORE_UIBASE_INC_MAILDISPATCHER_HXX
+#endif // INCLUDED_SW_SOURCE_UIBASE_INC_MAILDISPATCHER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/inc/mailmergechildwindow.hxx b/sw/source/uibase/inc/mailmergechildwindow.hxx
index 8ceea7cc9dc1..30dc88e849cd 100644
--- a/sw/source/uibase/inc/mailmergechildwindow.hxx
+++ b/sw/source/uibase/inc/mailmergechildwindow.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_MAILMERGECHILDWINDOW_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_MAILMERGECHILDWINDOW_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_MAILMERGECHILDWINDOW_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_MAILMERGECHILDWINDOW_HXX
 #include <sfx2/childwin.hxx>
 #include <sfx2/basedlgs.hxx>
 #include <vcl/toolbox.hxx>
diff --git a/sw/source/uibase/inc/mailmergehelper.hxx b/sw/source/uibase/inc/mailmergehelper.hxx
index 6c57fbbd341c..1a07a483a9f9 100644
--- a/sw/source/uibase/inc/mailmergehelper.hxx
+++ b/sw/source/uibase/inc/mailmergehelper.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_MAILMERGEHELPER_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_MAILMERGEHELPER_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_MAILMERGEHELPER_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_MAILMERGEHELPER_HXX
 
 #include <svtools/stdctrl.hxx>
 #include <unotools/configitem.hxx>
diff --git a/sw/source/uibase/inc/mailmergewizard.hxx b/sw/source/uibase/inc/mailmergewizard.hxx
index 8154aac7964e..5287ca3576d1 100644
--- a/sw/source/uibase/inc/mailmergewizard.hxx
+++ b/sw/source/uibase/inc/mailmergewizard.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_MAILMERGEWIZARD_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_MAILMERGEWIZARD_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_MAILMERGEWIZARD_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_MAILMERGEWIZARD_HXX
 
 #include <svtools/roadmapwizard.hxx>
 #include <rtl/ustring.hxx>
diff --git a/sw/source/uibase/inc/mailmrge.hxx b/sw/source/uibase/inc/mailmrge.hxx
index e61e3bc386cc..29ee649b6dee 100644
--- a/sw/source/uibase/inc/mailmrge.hxx
+++ b/sw/source/uibase/inc/mailmrge.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_MAILMRGE_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_MAILMRGE_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_MAILMRGE_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_MAILMRGE_HXX
 
 #include <svx/stddlg.hxx>
 
diff --git a/sw/source/uibase/inc/mediash.hxx b/sw/source/uibase/inc/mediash.hxx
index f6796bd3c1bb..eb9897a8bc37 100644
--- a/sw/source/uibase/inc/mediash.hxx
+++ b/sw/source/uibase/inc/mediash.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_MEDIASH_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_MEDIASH_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_MEDIASH_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_MEDIASH_HXX
 
 #include "frmsh.hxx"
 
diff --git a/sw/source/uibase/inc/mergetbl.hxx b/sw/source/uibase/inc/mergetbl.hxx
index da889f361c1a..588efaf45e75 100644
--- a/sw/source/uibase/inc/mergetbl.hxx
+++ b/sw/source/uibase/inc/mergetbl.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_MERGETBL_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_MERGETBL_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_MERGETBL_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_MERGETBL_HXX
 
 #include <vcl/button.hxx>
 
diff --git a/sw/source/uibase/inc/mmconfigitem.hxx b/sw/source/uibase/inc/mmconfigitem.hxx
index b40e189b1c11..f9300646b49f 100644
--- a/sw/source/uibase/inc/mmconfigitem.hxx
+++ b/sw/source/uibase/inc/mmconfigitem.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_MMCONFIGITEM_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_MMCONFIGITEM_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_MMCONFIGITEM_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_MMCONFIGITEM_HXX
 
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/uno/Reference.hxx>
diff --git a/sw/source/uibase/inc/multmrk.hxx b/sw/source/uibase/inc/multmrk.hxx
index e1209055b582..b163c5591827 100644
--- a/sw/source/uibase/inc/multmrk.hxx
+++ b/sw/source/uibase/inc/multmrk.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_MULTMRK_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_MULTMRK_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_MULTMRK_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_MULTMRK_HXX
 
 #include <svx/stddlg.hxx>
 #include <vcl/fixed.hxx>
@@ -44,6 +44,6 @@ public:
     virtual ~SwMultiTOXMarkDlg();
 };
 
-#endif // INCLUDED_SW_SOURCE_CORE_UIBASE_INC_MULTMRK_HXX
+#endif // INCLUDED_SW_SOURCE_UIBASE_INC_MULTMRK_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/inc/navicfg.hxx b/sw/source/uibase/inc/navicfg.hxx
index 9dac0c8caf3c..1a3a6faaf062 100644
--- a/sw/source/uibase/inc/navicfg.hxx
+++ b/sw/source/uibase/inc/navicfg.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_NAVICFG_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_NAVICFG_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_NAVICFG_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_NAVICFG_HXX
 
 #include <unotools/configitem.hxx>
 
diff --git a/sw/source/uibase/inc/navicont.hxx b/sw/source/uibase/inc/navicont.hxx
index b1d168e598cc..15b32c482071 100644
--- a/sw/source/uibase/inc/navicont.hxx
+++ b/sw/source/uibase/inc/navicont.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_NAVICONT_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_NAVICONT_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_NAVICONT_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_NAVICONT_HXX
 
 #include <rtl/ustring.hxx>
 
diff --git a/sw/source/uibase/inc/navipi.hxx b/sw/source/uibase/inc/navipi.hxx
index c5a9f32ffba0..02496e26c878 100644
--- a/sw/source/uibase/inc/navipi.hxx
+++ b/sw/source/uibase/inc/navipi.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_NAVIPI_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_NAVIPI_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_NAVIPI_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_NAVIPI_HXX
 
 #include <vcl/lstbox.hxx>
 #include <svl/lstner.hxx>
diff --git a/sw/source/uibase/inc/navmgr.hxx b/sw/source/uibase/inc/navmgr.hxx
index addb172cc4c5..5e33371fb539 100644
--- a/sw/source/uibase/inc/navmgr.hxx
+++ b/sw/source/uibase/inc/navmgr.hxx
@@ -6,8 +6,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
-#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_NAVMGR_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_NAVMGR_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_NAVMGR_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_NAVMGR_HXX
 
 #include <vector>
 
diff --git a/sw/source/uibase/inc/navsh.hxx b/sw/source/uibase/inc/navsh.hxx
index 604f370b63d1..940a124c0b72 100644
--- a/sw/source/uibase/inc/navsh.hxx
+++ b/sw/source/uibase/inc/navsh.hxx
@@ -6,8 +6,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
-#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_NAVSH_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_NAVSH_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_NAVSH_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_NAVSH_HXX
 
 #include "frmsh.hxx"
 
diff --git a/sw/source/uibase/inc/num.hxx b/sw/source/uibase/inc/num.hxx
index ba36e48f4d10..63a8a6dd20d2 100644
--- a/sw/source/uibase/inc/num.hxx
+++ b/sw/source/uibase/inc/num.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_NUM_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_NUM_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_NUM_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_NUM_HXX
 
 #include <sfx2/tabdlg.hxx>
 #include <vcl/menubtn.hxx>
@@ -161,6 +161,6 @@ class SwSvxNumBulletTabDialog : public SfxTabDialog
                     SwWrtShell &);
         virtual ~SwSvxNumBulletTabDialog();
 };
-#endif // INCLUDED_SW_SOURCE_CORE_UIBASE_INC_NUM_HXX
+#endif // INCLUDED_SW_SOURCE_UIBASE_INC_NUM_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/inc/numberingtypelistbox.hxx b/sw/source/uibase/inc/numberingtypelistbox.hxx
index bf9854434221..20e85b819696 100644
--- a/sw/source/uibase/inc/numberingtypelistbox.hxx
+++ b/sw/source/uibase/inc/numberingtypelistbox.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_NUMBERINGTYPELISTBOX_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_NUMBERINGTYPELISTBOX_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_NUMBERINGTYPELISTBOX_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_NUMBERINGTYPELISTBOX_HXX
 
 #include <vcl/lstbox.hxx>
 #include "swdllapi.h"
diff --git a/sw/source/uibase/inc/numfmtlb.hxx b/sw/source/uibase/inc/numfmtlb.hxx
index 3080619e41c4..a2abdfd7b091 100644
--- a/sw/source/uibase/inc/numfmtlb.hxx
+++ b/sw/source/uibase/inc/numfmtlb.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_NUMFMTLB_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_NUMFMTLB_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_NUMFMTLB_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_NUMFMTLB_HXX
 
 #include <vcl/lstbox.hxx>
 #include <svl/zforlist.hxx>
diff --git a/sw/source/uibase/inc/numpara.hxx b/sw/source/uibase/inc/numpara.hxx
index 910dfcf64bd0..872c015d5f08 100644
--- a/sw/source/uibase/inc/numpara.hxx
+++ b/sw/source/uibase/inc/numpara.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_NUMPARA_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_NUMPARA_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_NUMPARA_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_NUMPARA_HXX
 
 #include <sfx2/tabdlg.hxx>
 #include <vcl/lstbox.hxx>
diff --git a/sw/source/uibase/inc/numprevw.hxx b/sw/source/uibase/inc/numprevw.hxx
index 4c29324af9e1..f70b9bc1cb9a 100644
--- a/sw/source/uibase/inc/numprevw.hxx
+++ b/sw/source/uibase/inc/numprevw.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_NUMPREVW_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_NUMPREVW_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_NUMPREVW_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_NUMPREVW_HXX
 
 #include <vcl/window.hxx>
 
diff --git a/sw/source/uibase/inc/olesh.hxx b/sw/source/uibase/inc/olesh.hxx
index 04e30538803a..30979029ed16 100644
--- a/sw/source/uibase/inc/olesh.hxx
+++ b/sw/source/uibase/inc/olesh.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_OLESH_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_OLESH_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_OLESH_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_OLESH_HXX
 
 #include "frmsh.hxx"
 
diff --git a/sw/source/uibase/inc/olmenu.hxx b/sw/source/uibase/inc/olmenu.hxx
index 084c4a50a407..5e13ee660c96 100644
--- a/sw/source/uibase/inc/olmenu.hxx
+++ b/sw/source/uibase/inc/olmenu.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_OLMENU_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_OLMENU_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_OLMENU_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_OLMENU_HXX
 
 #include <com/sun/star/linguistic2/XDictionary.hpp>
 #include <com/sun/star/linguistic2/XSpellAlternatives.hpp>
diff --git a/sw/source/uibase/inc/optcomp.hxx b/sw/source/uibase/inc/optcomp.hxx
index 8851617ff201..2cd02b60fde8 100644
--- a/sw/source/uibase/inc/optcomp.hxx
+++ b/sw/source/uibase/inc/optcomp.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_OPTCOMP_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_OPTCOMP_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_OPTCOMP_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_OPTCOMP_HXX
 
 #include <sfx2/tabdlg.hxx>
 #include <vcl/fixed.hxx>
diff --git a/sw/source/uibase/inc/optload.hxx b/sw/source/uibase/inc/optload.hxx
index 2c1f73981c8a..e6a09bb1e4ac 100644
--- a/sw/source/uibase/inc/optload.hxx
+++ b/sw/source/uibase/inc/optload.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_OPTLOAD_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_OPTLOAD_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_OPTLOAD_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_OPTLOAD_HXX
 
 #include <sfx2/tabdlg.hxx>
 
diff --git a/sw/source/uibase/inc/optpage.hxx b/sw/source/uibase/inc/optpage.hxx
index 5ca74da8a6fe..17dc981d8cc7 100644
--- a/sw/source/uibase/inc/optpage.hxx
+++ b/sw/source/uibase/inc/optpage.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_OPTPAGE_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_OPTPAGE_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_OPTPAGE_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_OPTPAGE_HXX
 #include <sfx2/tabdlg.hxx>
 
 #include <vcl/group.hxx>
diff --git a/sw/source/uibase/inc/outline.hxx b/sw/source/uibase/inc/outline.hxx
index f224a38206bd..41bbd0a85f9f 100644
--- a/sw/source/uibase/inc/outline.hxx
+++ b/sw/source/uibase/inc/outline.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_OUTLINE_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_OUTLINE_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_OUTLINE_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_OUTLINE_HXX
 
 #include <sfx2/tabdlg.hxx>
 
diff --git a/sw/source/uibase/inc/pardlg.hxx b/sw/source/uibase/inc/pardlg.hxx
index 60869db0663e..c73e029a5ea1 100644
--- a/sw/source/uibase/inc/pardlg.hxx
+++ b/sw/source/uibase/inc/pardlg.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_PARDLG_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_PARDLG_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_PARDLG_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_PARDLG_HXX
 
 #include <sfx2/tabdlg.hxx>
 
diff --git a/sw/source/uibase/inc/pattern.hxx b/sw/source/uibase/inc/pattern.hxx
index 85cba67eab1f..67ee99024648 100644
--- a/sw/source/uibase/inc/pattern.hxx
+++ b/sw/source/uibase/inc/pattern.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_PATTERN_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_PATTERN_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_PATTERN_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_PATTERN_HXX
 
 #include <sfx2/basedlgs.hxx>
 
diff --git a/sw/source/uibase/inc/pgfnote.hxx b/sw/source/uibase/inc/pgfnote.hxx
index 1d3d15fda359..1e96c857c85f 100644
--- a/sw/source/uibase/inc/pgfnote.hxx
+++ b/sw/source/uibase/inc/pgfnote.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_PGFNOTE_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_PGFNOTE_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_PGFNOTE_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_PGFNOTE_HXX
 
 #include <sfx2/tabdlg.hxx>
 
diff --git a/sw/source/uibase/inc/pggrid.hxx b/sw/source/uibase/inc/pggrid.hxx
index 9c2adbd5c89c..58664756b0dd 100644
--- a/sw/source/uibase/inc/pggrid.hxx
+++ b/sw/source/uibase/inc/pggrid.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_PGGRID_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_PGGRID_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_PGGRID_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_PGGRID_HXX
 
 #include <sfx2/tabdlg.hxx>
 #include <colex.hxx>
diff --git a/sw/source/uibase/inc/popbox.hxx b/sw/source/uibase/inc/popbox.hxx
index aad89638e3c7..57f2eaeef7a1 100644
--- a/sw/source/uibase/inc/popbox.hxx
+++ b/sw/source/uibase/inc/popbox.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_POPBOX_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_POPBOX_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_POPBOX_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_POPBOX_HXX
 
 #include <vcl/toolbox.hxx>
 #include <svtools/transfer.hxx>
diff --git a/sw/source/uibase/inc/prcntfld.hxx b/sw/source/uibase/inc/prcntfld.hxx
index fe1d654315a1..6675290b20b0 100644
--- a/sw/source/uibase/inc/prcntfld.hxx
+++ b/sw/source/uibase/inc/prcntfld.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_PRCNTFLD_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_PRCNTFLD_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_PRCNTFLD_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_PRCNTFLD_HXX
 
 #include <vcl/field.hxx>
 #include "swdllapi.h"
@@ -106,6 +106,6 @@ public:
     bool IsAutoCalculationLocked() const {return bLockAutoCalculation;}
 };
 
-#endif // INCLUDED_SW_SOURCE_CORE_UIBASE_INC_PRCNTFLD_HXX
+#endif // INCLUDED_SW_SOURCE_UIBASE_INC_PRCNTFLD_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/inc/pview.hxx b/sw/source/uibase/inc/pview.hxx
index a54336876ee1..17676f2fff92 100644
--- a/sw/source/uibase/inc/pview.hxx
+++ b/sw/source/uibase/inc/pview.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_PVIEW_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_PVIEW_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_PVIEW_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_PVIEW_HXX
 
 #include <tools/link.hxx>
 #include <vcl/window.hxx>
diff --git a/sw/source/uibase/inc/redlndlg.hxx b/sw/source/uibase/inc/redlndlg.hxx
index bd0495b72dec..1c3ca950a205 100644
--- a/sw/source/uibase/inc/redlndlg.hxx
+++ b/sw/source/uibase/inc/redlndlg.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_REDLNDLG_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_REDLNDLG_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_REDLNDLG_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_REDLNDLG_HXX
 #include "swdllapi.h"
 #include "chldwrap.hxx"
 #include <redline.hxx>
diff --git a/sw/source/uibase/inc/regionsw.hxx b/sw/source/uibase/inc/regionsw.hxx
index 8a721dd9b7ab..20b200632c7a 100644
--- a/sw/source/uibase/inc/regionsw.hxx
+++ b/sw/source/uibase/inc/regionsw.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_REGIONSW_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_REGIONSW_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_REGIONSW_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_REGIONSW_HXX
 
 #include <hintids.hxx>
 #include <vcl/field.hxx>
diff --git a/sw/source/uibase/inc/rowht.hxx b/sw/source/uibase/inc/rowht.hxx
index 2f4edc8442fb..e8fd8adfb57b 100644
--- a/sw/source/uibase/inc/rowht.hxx
+++ b/sw/source/uibase/inc/rowht.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_ROWHT_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_ROWHT_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_ROWHT_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_ROWHT_HXX
 
 #include <svx/stddlg.hxx>
 #include <vcl/field.hxx>
diff --git a/sw/source/uibase/inc/scroll.hxx b/sw/source/uibase/inc/scroll.hxx
index a0932310ce59..424f920aba8a 100644
--- a/sw/source/uibase/inc/scroll.hxx
+++ b/sw/source/uibase/inc/scroll.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_SCROLL_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_SCROLL_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_SCROLL_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_SCROLL_HXX
 #include <vcl/scrbar.hxx>
 
 class SwScrollbar: public ScrollBar
diff --git a/sw/source/uibase/inc/selglos.hxx b/sw/source/uibase/inc/selglos.hxx
index db698ea5725d..f18288179edd 100644
--- a/sw/source/uibase/inc/selglos.hxx
+++ b/sw/source/uibase/inc/selglos.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_SELGLOS_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_SELGLOS_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_SELGLOS_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_SELGLOS_HXX
 
 #include <vcl/dialog.hxx>
 
diff --git a/sw/source/uibase/inc/sharedconnection.hxx b/sw/source/uibase/inc/sharedconnection.hxx
index 01694e0e84b6..48b23e4f7673 100644
--- a/sw/source/uibase/inc/sharedconnection.hxx
+++ b/sw/source/uibase/inc/sharedconnection.hxx
@@ -17,14 +17,14 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_SHAREDCONNECTION_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_SHAREDCONNECTION_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_SHAREDCONNECTION_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_SHAREDCONNECTION_HXX
 
 #include <unotools/sharedunocomponent.hxx>
 #include <com/sun/star/sdbc/XConnection.hpp>
 
 typedef ::utl::SharedUNOComponent< ::com::sun::star::sdbc::XConnection >   SharedConnection;
 
-#endif // INCLUDED_SW_SOURCE_CORE_UIBASE_INC_SHAREDCONNECTION_HXX
+#endif // INCLUDED_SW_SOURCE_UIBASE_INC_SHAREDCONNECTION_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/inc/shdwcrsr.hxx b/sw/source/uibase/inc/shdwcrsr.hxx
index 35fcd95629d8..e5c6478f9215 100644
--- a/sw/source/uibase/inc/shdwcrsr.hxx
+++ b/sw/source/uibase/inc/shdwcrsr.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_SHDWCRSR_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_SHDWCRSR_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_SHDWCRSR_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_SHDWCRSR_HXX
 
 #include <tools/gen.hxx>
 #include <tools/color.hxx>
diff --git a/sw/source/uibase/inc/splittbl.hxx b/sw/source/uibase/inc/splittbl.hxx
index f2339a0f5955..00b099e0747f 100644
--- a/sw/source/uibase/inc/splittbl.hxx
+++ b/sw/source/uibase/inc/splittbl.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_SPLITTBL_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_SPLITTBL_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_SPLITTBL_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_SPLITTBL_HXX
 
 #include <svx/stddlg.hxx>
 #include <vcl/fixed.hxx>
diff --git a/sw/source/uibase/inc/srcedtw.hxx b/sw/source/uibase/inc/srcedtw.hxx
index d3347d720490..2bb3c368b5db 100644
--- a/sw/source/uibase/inc/srcedtw.hxx
+++ b/sw/source/uibase/inc/srcedtw.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_SRCEDTW_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_SRCEDTW_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_SRCEDTW_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_SRCEDTW_HXX
 
 #include <vcl/window.hxx>
 #include <svl/lstner.hxx>
diff --git a/sw/source/uibase/inc/srcview.hxx b/sw/source/uibase/inc/srcview.hxx
index 0cb7ce12d48d..8ec289d5fcdb 100644
--- a/sw/source/uibase/inc/srcview.hxx
+++ b/sw/source/uibase/inc/srcview.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_SRCVIEW_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_SRCVIEW_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_SRCVIEW_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_SRCVIEW_HXX
 
 #include <sfx2/viewfac.hxx>
 #include <sfx2/viewsh.hxx>
diff --git a/sw/source/uibase/inc/srtdlg.hxx b/sw/source/uibase/inc/srtdlg.hxx
index 9dd074b0e6c4..70522f871322 100644
--- a/sw/source/uibase/inc/srtdlg.hxx
+++ b/sw/source/uibase/inc/srtdlg.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_SRTDLG_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_SRTDLG_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_SRTDLG_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_SRTDLG_HXX
 
 #include <vcl/fixed.hxx>
 #include <vcl/button.hxx>
diff --git a/sw/source/uibase/inc/stmenu.hxx b/sw/source/uibase/inc/stmenu.hxx
index e768470ec0c8..c369d12eaeaa 100644
--- a/sw/source/uibase/inc/stmenu.hxx
+++ b/sw/source/uibase/inc/stmenu.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_STMENU_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_STMENU_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_STMENU_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_STMENU_HXX
 
 #include <vcl/menu.hxx>
 
diff --git a/sw/source/uibase/inc/swcont.hxx b/sw/source/uibase/inc/swcont.hxx
index ca796b9a54f8..463215eb2fa4 100644
--- a/sw/source/uibase/inc/swcont.hxx
+++ b/sw/source/uibase/inc/swcont.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_SWCONT_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_SWCONT_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_SWCONT_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_SWCONT_HXX
 
 #include <rtl/ustring.hxx>
 
diff --git a/sw/source/uibase/inc/swdtflvr.hxx b/sw/source/uibase/inc/swdtflvr.hxx
index 0eefb80ba2f0..c5d3b6e6a6ec 100644
--- a/sw/source/uibase/inc/swdtflvr.hxx
+++ b/sw/source/uibase/inc/swdtflvr.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_SWDTFLVR_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_SWDTFLVR_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_SWDTFLVR_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_SWDTFLVR_HXX
 
 #include <sfx2/objsh.hxx>
 
diff --git a/sw/source/uibase/inc/swlbox.hxx b/sw/source/uibase/inc/swlbox.hxx
index 1de380505d05..174f21206b71 100644
--- a/sw/source/uibase/inc/swlbox.hxx
+++ b/sw/source/uibase/inc/swlbox.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_SWLBOX_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_SWLBOX_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_SWLBOX_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_SWLBOX_HXX
 
 #include <vcl/lstbox.hxx>
 #include <vcl/combobox.hxx>
@@ -75,6 +75,6 @@ public:
     const SwBoxEntry&       GetRemovedEntry(sal_Int32 nPos) const;
 };
 
-#endif // INCLUDED_SW_SOURCE_CORE_UIBASE_INC_SWLBOX_HXX
+#endif // INCLUDED_SW_SOURCE_UIBASE_INC_SWLBOX_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/inc/swmodalredlineacceptdlg.hxx b/sw/source/uibase/inc/swmodalredlineacceptdlg.hxx
index ef8ec69eb027..7f772c41cf8f 100644
--- a/sw/source/uibase/inc/swmodalredlineacceptdlg.hxx
+++ b/sw/source/uibase/inc/swmodalredlineacceptdlg.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_SWMODALREDLINEACCEPTDLG_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_SWMODALREDLINEACCEPTDLG_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_SWMODALREDLINEACCEPTDLG_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_SWMODALREDLINEACCEPTDLG_HXX
 #include "chldwrap.hxx"
 #include <sfx2/basedlgs.hxx>
 
diff --git a/sw/source/uibase/inc/swrenamexnameddlg.hxx b/sw/source/uibase/inc/swrenamexnameddlg.hxx
index d5f2c22f5ad5..7d41baf60894 100644
--- a/sw/source/uibase/inc/swrenamexnameddlg.hxx
+++ b/sw/source/uibase/inc/swrenamexnameddlg.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_SWRENAMEXNAMEDDLG_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_SWRENAMEXNAMEDDLG_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_SWRENAMEXNAMEDDLG_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_SWRENAMEXNAMEDDLG_HXX
 
 #include <vcl/dialog.hxx>
 #include <vcl/fixed.hxx>
diff --git a/sw/source/uibase/inc/swruler.hxx b/sw/source/uibase/inc/swruler.hxx
index 44d2fbee0a9e..9cbaac7f9896 100644
--- a/sw/source/uibase/inc/swruler.hxx
+++ b/sw/source/uibase/inc/swruler.hxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_SWRULER_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_SWRULER_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_SWRULER_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_SWRULER_HXX
 
 #include <svx/ruler.hxx>
 
diff --git a/sw/source/uibase/inc/swtablerep.hxx b/sw/source/uibase/inc/swtablerep.hxx
index 48358705a55c..be8d2216dc05 100644
--- a/sw/source/uibase/inc/swtablerep.hxx
+++ b/sw/source/uibase/inc/swtablerep.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_SWTABLEREP_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_SWTABLEREP_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_SWTABLEREP_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_SWTABLEREP_HXX
 
 #include <sfx2/tabdlg.hxx>
 #include "swdllapi.h"
diff --git a/sw/source/uibase/inc/swuiccoll.hxx b/sw/source/uibase/inc/swuiccoll.hxx
index 965361e321dd..275ae6c99484 100644
--- a/sw/source/uibase/inc/swuiccoll.hxx
+++ b/sw/source/uibase/inc/swuiccoll.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_SWUICCOLL_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_SWUICCOLL_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_SWUICCOLL_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_SWUICCOLL_HXX
 
 #include <tools/resary.hxx>
 
diff --git a/sw/source/uibase/inc/swuicnttab.hxx b/sw/source/uibase/inc/swuicnttab.hxx
index 5443348a15b4..aa1387b893fa 100644
--- a/sw/source/uibase/inc/swuicnttab.hxx
+++ b/sw/source/uibase/inc/swuicnttab.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_SWUICNTTAB_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_SWUICNTTAB_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_SWUICNTTAB_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_SWUICNTTAB_HXX
 
 #include <svx/stddlg.hxx>
 
@@ -492,6 +492,6 @@ public:
 
 };
 
-#endif // INCLUDED_SW_SOURCE_CORE_UIBASE_INC_SWUICNTTAB_HXX
+#endif // INCLUDED_SW_SOURCE_UIBASE_INC_SWUICNTTAB_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/inc/swuiidxmrk.hxx b/sw/source/uibase/inc/swuiidxmrk.hxx
index 199026ebe0ae..ac85a0a52286 100644
--- a/sw/source/uibase/inc/swuiidxmrk.hxx
+++ b/sw/source/uibase/inc/swuiidxmrk.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_SWUIIDXMRK_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_SWUIIDXMRK_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_SWUIIDXMRK_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_SWUIIDXMRK_HXX
 
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <sfx2/basedlgs.hxx>
@@ -247,6 +247,6 @@ public:
     void    ReInitDlg(SwWrtShell& rWrtShell);
 };
 
-#endif // INCLUDED_SW_SOURCE_CORE_UIBASE_INC_SWUIIDXMRK_HXX
+#endif // INCLUDED_SW_SOURCE_UIBASE_INC_SWUIIDXMRK_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/inc/swuipardlg.hxx b/sw/source/uibase/inc/swuipardlg.hxx
index e4c778140339..99192eab4120 100644
--- a/sw/source/uibase/inc/swuipardlg.hxx
+++ b/sw/source/uibase/inc/swuipardlg.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_SWUIPARDLG_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_SWUIPARDLG_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_SWUIPARDLG_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_SWUIPARDLG_HXX
 #include "pardlg.hxx"
 
 class SwParaDlg: public SfxTabDialog
diff --git a/sw/source/uibase/inc/swvset.hxx b/sw/source/uibase/inc/swvset.hxx
index 4977eab7c6d7..7b9ecccf98e6 100644
--- a/sw/source/uibase/inc/swvset.hxx
+++ b/sw/source/uibase/inc/swvset.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_SWVSET_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_SWVSET_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_SWVSET_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_SWVSET_HXX
 #include <svx/numvset.hxx>
 
 class SwRulerValueSet : public SvxBmpNumValueSet
diff --git a/sw/source/uibase/inc/swwrtshitem.hxx b/sw/source/uibase/inc/swwrtshitem.hxx
index 4aa5739c937f..af5836c6999e 100644
--- a/sw/source/uibase/inc/swwrtshitem.hxx
+++ b/sw/source/uibase/inc/swwrtshitem.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_SWWRTSHITEM_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_SWWRTSHITEM_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_SWWRTSHITEM_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_SWWRTSHITEM_HXX
 #include <svl/poolitem.hxx>
 #include "swdllapi.h"
 
diff --git a/sw/source/uibase/inc/syncbtn.hxx b/sw/source/uibase/inc/syncbtn.hxx
index 2fba52627a41..451e6afa9614 100644
--- a/sw/source/uibase/inc/syncbtn.hxx
+++ b/sw/source/uibase/inc/syncbtn.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_SYNCBTN_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_SYNCBTN_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_SYNCBTN_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_SYNCBTN_HXX
 #include <sfx2/childwin.hxx>
 
 #ifdef _SYNCDLG
diff --git a/sw/source/uibase/inc/tabledlg.hxx b/sw/source/uibase/inc/tabledlg.hxx
index 15f6206073d6..9abf088e34f5 100644
--- a/sw/source/uibase/inc/tabledlg.hxx
+++ b/sw/source/uibase/inc/tabledlg.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_TABLEDLG_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_TABLEDLG_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_TABLEDLG_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_TABLEDLG_HXX
 
 #include <sfx2/tabdlg.hxx>
 
diff --git a/sw/source/uibase/inc/tablemgr.hxx b/sw/source/uibase/inc/tablemgr.hxx
index 623016af5297..98ae3b1c2f17 100644
--- a/sw/source/uibase/inc/tablemgr.hxx
+++ b/sw/source/uibase/inc/tablemgr.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_TABLEMGR_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_TABLEMGR_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_TABLEMGR_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_TABLEMGR_HXX
 
 #include "swdllapi.h"
 #include "swtypes.hxx"
diff --git a/sw/source/uibase/inc/tabsh.hxx b/sw/source/uibase/inc/tabsh.hxx
index 7094f49a260a..ed9f7efd0d87 100644
--- a/sw/source/uibase/inc/tabsh.hxx
+++ b/sw/source/uibase/inc/tabsh.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_TABSH_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_TABSH_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_TABSH_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_TABSH_HXX
 
 #include "basesh.hxx"
 #include "swdllapi.h"
diff --git a/sw/source/uibase/inc/tautofmt.hxx b/sw/source/uibase/inc/tautofmt.hxx
index 3faec092eadc..b55356c669b0 100644
--- a/sw/source/uibase/inc/tautofmt.hxx
+++ b/sw/source/uibase/inc/tautofmt.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_TAUTOFMT_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_TAUTOFMT_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_TAUTOFMT_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_TAUTOFMT_HXX
 #include <sfx2/basedlgs.hxx>
 
 #include <vcl/fixed.hxx>
diff --git a/sw/source/uibase/inc/tblctrl.hxx b/sw/source/uibase/inc/tblctrl.hxx
index e678c6280400..33dad5f048fb 100644
--- a/sw/source/uibase/inc/tblctrl.hxx
+++ b/sw/source/uibase/inc/tblctrl.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_TBLCTRL_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_TBLCTRL_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_TBLCTRL_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_TBLCTRL_HXX
 
 #include <sfx2/tbxctrl.hxx>
 
diff --git a/sw/source/uibase/inc/tblnumfm.hxx b/sw/source/uibase/inc/tblnumfm.hxx
index f28c41055071..8fad4ff6d948 100644
--- a/sw/source/uibase/inc/tblnumfm.hxx
+++ b/sw/source/uibase/inc/tblnumfm.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_TBLNUMFM_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_TBLNUMFM_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_TBLNUMFM_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_TBLNUMFM_HXX
 
 #include <sfx2/basedlgs.hxx>
 
diff --git a/sw/source/uibase/inc/tbxanchr.hxx b/sw/source/uibase/inc/tbxanchr.hxx
index c52cfb817acb..64aebb711229 100644
--- a/sw/source/uibase/inc/tbxanchr.hxx
+++ b/sw/source/uibase/inc/tbxanchr.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_TBXANCHR_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_TBXANCHR_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_TBXANCHR_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_TBXANCHR_HXX
 
 #include <sfx2/tbxctrl.hxx>
 
diff --git a/sw/source/uibase/inc/textsh.hxx b/sw/source/uibase/inc/textsh.hxx
index 9082296bdbbf..9e799585f27f 100644
--- a/sw/source/uibase/inc/textsh.hxx
+++ b/sw/source/uibase/inc/textsh.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_TEXTSH_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_TEXTSH_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_TEXTSH_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_TEXTSH_HXX
 
 #include <basesh.hxx>
 #include <unotools/caserotate.hxx>
diff --git a/sw/source/uibase/inc/titlepage.hxx b/sw/source/uibase/inc/titlepage.hxx
index 98292fdbcbfc..efc39bd2e36c 100644
--- a/sw/source/uibase/inc/titlepage.hxx
+++ b/sw/source/uibase/inc/titlepage.hxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_TITLEPAGE_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_TITLEPAGE_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_TITLEPAGE_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_TITLEPAGE_HXX
 
 #include <sfx2/basedlgs.hxx>
 #include <vcl/button.hxx>
diff --git a/sw/source/uibase/inc/tmpdlg.hxx b/sw/source/uibase/inc/tmpdlg.hxx
index 7b0198617dec..57abdf38e763 100644
--- a/sw/source/uibase/inc/tmpdlg.hxx
+++ b/sw/source/uibase/inc/tmpdlg.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_TMPDLG_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_TMPDLG_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_TMPDLG_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_TMPDLG_HXX
 
 #include <sfx2/styledlg.hxx>
 
diff --git a/sw/source/uibase/inc/tmplctrl.hxx b/sw/source/uibase/inc/tmplctrl.hxx
index 14f7254293e6..37722d748590 100644
--- a/sw/source/uibase/inc/tmplctrl.hxx
+++ b/sw/source/uibase/inc/tmplctrl.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_TMPLCTRL_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_TMPLCTRL_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_TMPLCTRL_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_TMPLCTRL_HXX
 
 #include <sfx2/stbitem.hxx>
 
diff --git a/sw/source/uibase/inc/toxmgr.hxx b/sw/source/uibase/inc/toxmgr.hxx
index 01fe269c1428..cd3c0edeb0e4 100644
--- a/sw/source/uibase/inc/toxmgr.hxx
+++ b/sw/source/uibase/inc/toxmgr.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_TOXMGR_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_TOXMGR_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_TOXMGR_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_TOXMGR_HXX
 
 #include "swdllapi.h"
 #include "tox.hxx"
diff --git a/sw/source/uibase/inc/uiborder.hxx b/sw/source/uibase/inc/uiborder.hxx
index a54bf5d2a22f..a4600d6436a0 100644
--- a/sw/source/uibase/inc/uiborder.hxx
+++ b/sw/source/uibase/inc/uiborder.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_UIBORDER_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_UIBORDER_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_UIBORDER_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_UIBORDER_HXX
 
 #include <sfx2/basedlgs.hxx>
 class Window;
diff --git a/sw/source/uibase/inc/uiitems.hxx b/sw/source/uibase/inc/uiitems.hxx
index dfc495816bc6..612a69ccf2c8 100644
--- a/sw/source/uibase/inc/uiitems.hxx
+++ b/sw/source/uibase/inc/uiitems.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_UIITEMS_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_UIITEMS_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_UIITEMS_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_UIITEMS_HXX
 
 #include <svl/intitem.hxx>
 #include "swdllapi.h"
@@ -112,6 +112,6 @@ public:
     SwPaM*   GetValue() const        { return m_pPaM; }
 };
 
-#endif // INCLUDED_SW_SOURCE_CORE_UIBASE_INC_UIITEMS_HXX
+#endif // INCLUDED_SW_SOURCE_UIBASE_INC_UIITEMS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/inc/uinums.hxx b/sw/source/uibase/inc/uinums.hxx
index b61ccf318ba4..b760957f72a3 100644
--- a/sw/source/uibase/inc/uinums.hxx
+++ b/sw/source/uibase/inc/uinums.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_UINUMS_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_UINUMS_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_UINUMS_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_UINUMS_HXX
 
 #include <numrule.hxx>
 #include "swdllapi.h"
diff --git a/sw/source/uibase/inc/uitool.hxx b/sw/source/uibase/inc/uitool.hxx
index 19d07702465d..3680cb0e56fe 100644
--- a/sw/source/uibase/inc/uitool.hxx
+++ b/sw/source/uibase/inc/uitool.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_UITOOL_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_UITOOL_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_UITOOL_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_UITOOL_HXX
 
 #include <tools/wintypes.hxx>
 #include <vcl/field.hxx>
@@ -104,6 +104,6 @@ OUString GetAppLangDateTimeString( const DateTime& );
 // at the dispatcher if there is one, if executed return true
 bool ExecuteMenuCommand( PopupMenu& rMenu, SfxViewFrame& rViewFrame, sal_uInt16 nId );
 
-#endif // INCLUDED_SW_SOURCE_CORE_UIBASE_INC_UITOOL_HXX
+#endif // INCLUDED_SW_SOURCE_UIBASE_INC_UITOOL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/inc/uivwimp.hxx b/sw/source/uibase/inc/uivwimp.hxx
index 5d868f94b12d..b89ee26e0c14 100644
--- a/sw/source/uibase/inc/uivwimp.hxx
+++ b/sw/source/uibase/inc/uivwimp.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_UIVWIMP_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_UIVWIMP_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_UIVWIMP_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_UIVWIMP_HXX
 
 #include <config_features.h>
 
diff --git a/sw/source/uibase/inc/unoatxt.hxx b/sw/source/uibase/inc/unoatxt.hxx
index 8a088d1d0a85..e2981975fdcd 100644
--- a/sw/source/uibase/inc/unoatxt.hxx
+++ b/sw/source/uibase/inc/unoatxt.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_UNOATXT_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_UNOATXT_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_UNOATXT_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_UNOATXT_HXX
 
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/container/XNamed.hpp>
diff --git a/sw/source/uibase/inc/unodispatch.hxx b/sw/source/uibase/inc/unodispatch.hxx
index e78951bf6dc2..7e65f7f81977 100644
--- a/sw/source/uibase/inc/unodispatch.hxx
+++ b/sw/source/uibase/inc/unodispatch.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_UNODISPATCH_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_UNODISPATCH_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_UNODISPATCH_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_UNODISPATCH_HXX
 
 #include <com/sun/star/frame/XDispatchProviderInterception.hpp>
 #include <com/sun/star/frame/XDispatchProviderInterceptor.hpp>
diff --git a/sw/source/uibase/inc/unomailmerge.hxx b/sw/source/uibase/inc/unomailmerge.hxx
index e403a0f6d2cd..212810191735 100644
--- a/sw/source/uibase/inc/unomailmerge.hxx
+++ b/sw/source/uibase/inc/unomailmerge.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_UNOMAILMERGE_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_UNOMAILMERGE_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_UNOMAILMERGE_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_UNOMAILMERGE_HXX
 
 #include <cppuhelper/implbase6.hxx>
 #include <cppuhelper/interfacecontainer.hxx>
diff --git a/sw/source/uibase/inc/unomod.hxx b/sw/source/uibase/inc/unomod.hxx
index 27ef4ed903c6..5c797b26d76c 100644
--- a/sw/source/uibase/inc/unomod.hxx
+++ b/sw/source/uibase/inc/unomod.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_UNOMOD_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_UNOMOD_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_UNOMOD_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_UNOMOD_HXX
 
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/view/XPrintSettingsSupplier.hpp>
diff --git a/sw/source/uibase/inc/unotools.hxx b/sw/source/uibase/inc/unotools.hxx
index c4350ee07b7c..b01c859d4f13 100644
--- a/sw/source/uibase/inc/unotools.hxx
+++ b/sw/source/uibase/inc/unotools.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_UNOTOOLS_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_UNOTOOLS_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_UNOTOOLS_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_UNOTOOLS_HXX
 
 #include <vcl/button.hxx>
 #include <vcl/edit.hxx>
diff --git a/sw/source/uibase/inc/unotxvw.hxx b/sw/source/uibase/inc/unotxvw.hxx
index 1a8cb58e9560..de1dadc31520 100644
--- a/sw/source/uibase/inc/unotxvw.hxx
+++ b/sw/source/uibase/inc/unotxvw.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_UNOTXVW_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_UNOTXVW_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_UNOTXVW_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_UNOTXVW_HXX
 #include <sfx2/sfxbasecontroller.hxx>
 #include <cppuhelper/interfacecontainer.hxx>
 #include <com/sun/star/embed/XEmbeddedObject.hpp>
diff --git a/sw/source/uibase/inc/usrpref.hxx b/sw/source/uibase/inc/usrpref.hxx
index 57370f892170..18f0ff89ed90 100644
--- a/sw/source/uibase/inc/usrpref.hxx
+++ b/sw/source/uibase/inc/usrpref.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_USRPREF_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_USRPREF_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_USRPREF_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_USRPREF_HXX
 
 #include <unotools/configitem.hxx>
 #include <fldupde.hxx>
diff --git a/sw/source/uibase/inc/view.hxx b/sw/source/uibase/inc/view.hxx
index edc0fe4b6399..6d519a535e89 100644
--- a/sw/source/uibase/inc/view.hxx
+++ b/sw/source/uibase/inc/view.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_VIEW_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_VIEW_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_VIEW_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_VIEW_HXX
 
 #include <vcl/timer.hxx>
 #include <vcl/field.hxx>
diff --git a/sw/source/uibase/inc/viewlayoutctrl.hxx b/sw/source/uibase/inc/viewlayoutctrl.hxx
index eb8f921385cc..0816b001eb77 100644
--- a/sw/source/uibase/inc/viewlayoutctrl.hxx
+++ b/sw/source/uibase/inc/viewlayoutctrl.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_VIEWLAYOUTCTRL_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_VIEWLAYOUTCTRL_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_VIEWLAYOUTCTRL_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_VIEWLAYOUTCTRL_HXX
 
 #include <sfx2/stbitem.hxx>
 
diff --git a/sw/source/uibase/inc/wformsh.hxx b/sw/source/uibase/inc/wformsh.hxx
index 0414f98f79a4..dfbfd7ba847b 100644
--- a/sw/source/uibase/inc/wformsh.hxx
+++ b/sw/source/uibase/inc/wformsh.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_WFORMSH_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_WFORMSH_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_WFORMSH_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_WFORMSH_HXX
 
 #include "drformsh.hxx"
 
diff --git a/sw/source/uibase/inc/wfrmsh.hxx b/sw/source/uibase/inc/wfrmsh.hxx
index 4bda0118ce4b..2ab9335ab6fd 100644
--- a/sw/source/uibase/inc/wfrmsh.hxx
+++ b/sw/source/uibase/inc/wfrmsh.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_WFRMSH_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_WFRMSH_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_WFRMSH_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_WFRMSH_HXX
 
 #include "frmsh.hxx"
 
diff --git a/sw/source/uibase/inc/wgrfsh.hxx b/sw/source/uibase/inc/wgrfsh.hxx
index f722fbfedbb9..26ee0bf015b8 100644
--- a/sw/source/uibase/inc/wgrfsh.hxx
+++ b/sw/source/uibase/inc/wgrfsh.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_WGRFSH_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_WGRFSH_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_WGRFSH_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_WGRFSH_HXX
 
 #include "grfsh.hxx"
 
diff --git a/sw/source/uibase/inc/wlistsh.hxx b/sw/source/uibase/inc/wlistsh.hxx
index e4f32fa24765..77a266d27278 100644
--- a/sw/source/uibase/inc/wlistsh.hxx
+++ b/sw/source/uibase/inc/wlistsh.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_WLISTSH_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_WLISTSH_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_WLISTSH_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_WLISTSH_HXX
 
 #include "listsh.hxx"
 
diff --git a/sw/source/uibase/inc/wolesh.hxx b/sw/source/uibase/inc/wolesh.hxx
index 7378f20c0153..fe1990b5ec89 100644
--- a/sw/source/uibase/inc/wolesh.hxx
+++ b/sw/source/uibase/inc/wolesh.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_WOLESH_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_WOLESH_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_WOLESH_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_WOLESH_HXX
 
 #include "olesh.hxx"
 
diff --git a/sw/source/uibase/inc/wordcountctrl.hxx b/sw/source/uibase/inc/wordcountctrl.hxx
index 89aaa15533b8..9feee89eda64 100644
--- a/sw/source/uibase/inc/wordcountctrl.hxx
+++ b/sw/source/uibase/inc/wordcountctrl.hxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_WORDCOUNTCTRL_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_WORDCOUNTCTRL_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_WORDCOUNTCTRL_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_WORDCOUNTCTRL_HXX
 
 #include <sfx2/stbitem.hxx>
 
diff --git a/sw/source/uibase/inc/wordcountdialog.hxx b/sw/source/uibase/inc/wordcountdialog.hxx
index fef9d9299658..50bbef849500 100644
--- a/sw/source/uibase/inc/wordcountdialog.hxx
+++ b/sw/source/uibase/inc/wordcountdialog.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_WORDCOUNTDIALOG_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_WORDCOUNTDIALOG_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_WORDCOUNTDIALOG_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_WORDCOUNTDIALOG_HXX
 #include <sfx2/basedlgs.hxx>
 #include <svtools/stdctrl.hxx>
 #include <vcl/layout.hxx>
diff --git a/sw/source/uibase/inc/workctrl.hxx b/sw/source/uibase/inc/workctrl.hxx
index 513d0efa0daf..38e6a76fae7b 100644
--- a/sw/source/uibase/inc/workctrl.hxx
+++ b/sw/source/uibase/inc/workctrl.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_WORKCTRL_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_WORKCTRL_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_WORKCTRL_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_WORKCTRL_HXX
 
 #include <sfx2/tbxctrl.hxx>
 #include <vcl/toolbox.hxx>
diff --git a/sw/source/uibase/inc/wrap.hxx b/sw/source/uibase/inc/wrap.hxx
index 9f8d644c4551..5efcdababe7c 100644
--- a/sw/source/uibase/inc/wrap.hxx
+++ b/sw/source/uibase/inc/wrap.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_WRAP_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_WRAP_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_WRAP_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_WRAP_HXX
 
 #include <sfx2/tabdlg.hxx>
 #include <sfx2/basedlgs.hxx>
diff --git a/sw/source/uibase/inc/wrtsh.hxx b/sw/source/uibase/inc/wrtsh.hxx
index 7f960048709f..c2baa4b03a72 100644
--- a/sw/source/uibase/inc/wrtsh.hxx
+++ b/sw/source/uibase/inc/wrtsh.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_WRTSH_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_WRTSH_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_WRTSH_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_WRTSH_HXX
 
 #include <com/sun/star/embed/XEmbeddedObject.hpp>
 #include "swdllapi.h"
diff --git a/sw/source/uibase/inc/wtabsh.hxx b/sw/source/uibase/inc/wtabsh.hxx
index 9376d4a900f3..3249e64ea3a4 100644
--- a/sw/source/uibase/inc/wtabsh.hxx
+++ b/sw/source/uibase/inc/wtabsh.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_WTABSH_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_WTABSH_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_WTABSH_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_WTABSH_HXX
 
 #include "tabsh.hxx"
 
diff --git a/sw/source/uibase/inc/wtextsh.hxx b/sw/source/uibase/inc/wtextsh.hxx
index 7f51b01f4ddc..a7b76007a361 100644
--- a/sw/source/uibase/inc/wtextsh.hxx
+++ b/sw/source/uibase/inc/wtextsh.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_INC_WTEXTSH_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_WTEXTSH_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_WTEXTSH_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_WTEXTSH_HXX
 
 #include "textsh.hxx"
 
diff --git a/sw/source/uibase/inc/wview.hxx b/sw/source/uibase/inc/wview.hxx
index 0b3c914bb8a8..44e44f7e5f77 100644
--- a/sw/source/uibase/inc/wview.hxx
+++ b/sw/source/uibase/inc/wview.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_WVIEW_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_WVIEW_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_WVIEW_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_WVIEW_HXX
 
 #include "swdllapi.h"
 #include "view.hxx"
diff --git a/sw/source/uibase/inc/zoomctrl.hxx b/sw/source/uibase/inc/zoomctrl.hxx
index 512785dd4454..758b674684fe 100644
--- a/sw/source/uibase/inc/zoomctrl.hxx
+++ b/sw/source/uibase/inc/zoomctrl.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 INCLUDED_SW_SOURCE_CORE_UIBASE_INC_ZOOMCTRL_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_INC_ZOOMCTRL_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_ZOOMCTRL_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_INC_ZOOMCTRL_HXX
 
 #include <svx/zoomctrl.hxx>
 
diff --git a/sw/source/uibase/lingu/sdrhhcwrap.hxx b/sw/source/uibase/lingu/sdrhhcwrap.hxx
index b6b58ca61153..5c977da8966b 100644
--- a/sw/source/uibase/lingu/sdrhhcwrap.hxx
+++ b/sw/source/uibase/lingu/sdrhhcwrap.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 INCLUDED_SW_SOURCE_CORE_UIBASE_LINGU_SDRHHCWRAP_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_LINGU_SDRHHCWRAP_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_LINGU_SDRHHCWRAP_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_LINGU_SDRHHCWRAP_HXX
 
 #include <svx/svdoutl.hxx>
 
diff --git a/sw/source/uibase/sidebar/PageColumnControl.hxx b/sw/source/uibase/sidebar/PageColumnControl.hxx
index 133e002ebbf8..c53fdf95974c 100644
--- a/sw/source/uibase/sidebar/PageColumnControl.hxx
+++ b/sw/source/uibase/sidebar/PageColumnControl.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 INCLUDED_SW_SOURCE_CORE_UIBASE_SIDEBAR_PAGECOLUMNCONTROL_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_SIDEBAR_PAGECOLUMNCONTROL_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_SIDEBAR_PAGECOLUMNCONTROL_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_SIDEBAR_PAGECOLUMNCONTROL_HXX
 
 #include <svx/sidebar/PopupControl.hxx>
 
diff --git a/sw/source/uibase/sidebar/PageMarginControl.hxx b/sw/source/uibase/sidebar/PageMarginControl.hxx
index ee57102dd941..041e884aa70c 100644
--- a/sw/source/uibase/sidebar/PageMarginControl.hxx
+++ b/sw/source/uibase/sidebar/PageMarginControl.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 INCLUDED_SW_SOURCE_CORE_UIBASE_SIDEBAR_PAGEMARGINCONTROL_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_SIDEBAR_PAGEMARGINCONTROL_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_SIDEBAR_PAGEMARGINCONTROL_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_SIDEBAR_PAGEMARGINCONTROL_HXX
 
 #include <svx/sidebar/PopupControl.hxx>
 
diff --git a/sw/source/uibase/sidebar/PageOrientationControl.hxx b/sw/source/uibase/sidebar/PageOrientationControl.hxx
index e55ba25c8a99..6e8d44f65d48 100644
--- a/sw/source/uibase/sidebar/PageOrientationControl.hxx
+++ b/sw/source/uibase/sidebar/PageOrientationControl.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 INCLUDED_SW_SOURCE_CORE_UIBASE_SIDEBAR_PAGEORIENTATIONCONTROL_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_SIDEBAR_PAGEORIENTATIONCONTROL_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_SIDEBAR_PAGEORIENTATIONCONTROL_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_SIDEBAR_PAGEORIENTATIONCONTROL_HXX
 
 #include <svx/sidebar/PopupControl.hxx>
 
diff --git a/sw/source/uibase/sidebar/PagePropertyPanel.hxx b/sw/source/uibase/sidebar/PagePropertyPanel.hxx
index 044c4740756a..4dc697b3f62a 100644
--- a/sw/source/uibase/sidebar/PagePropertyPanel.hxx
+++ b/sw/source/uibase/sidebar/PagePropertyPanel.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 INCLUDED_SW_SOURCE_CORE_UIBASE_SIDEBAR_PAGEPROPERTYPANEL_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_SIDEBAR_PAGEPROPERTYPANEL_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_SIDEBAR_PAGEPROPERTYPANEL_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_SIDEBAR_PAGEPROPERTYPANEL_HXX
 
 #include <com/sun/star/frame/XFrame.hpp>
 #include <com/sun/star/document/XUndoManager.hpp>
diff --git a/sw/source/uibase/sidebar/PageSizeControl.hxx b/sw/source/uibase/sidebar/PageSizeControl.hxx
index 256715b2abfd..a15550c160b6 100644
--- a/sw/source/uibase/sidebar/PageSizeControl.hxx
+++ b/sw/source/uibase/sidebar/PageSizeControl.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 INCLUDED_SW_SOURCE_CORE_UIBASE_SIDEBAR_PAGESIZECONTROL_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_SIDEBAR_PAGESIZECONTROL_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_SIDEBAR_PAGESIZECONTROL_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_SIDEBAR_PAGESIZECONTROL_HXX
 
 #include <svx/sidebar/PopupControl.hxx>
 
diff --git a/sw/source/uibase/sidebar/WrapPropertyPanel.hxx b/sw/source/uibase/sidebar/WrapPropertyPanel.hxx
index bc261e31c67f..27bff8143680 100644
--- a/sw/source/uibase/sidebar/WrapPropertyPanel.hxx
+++ b/sw/source/uibase/sidebar/WrapPropertyPanel.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 INCLUDED_SW_SOURCE_CORE_UIBASE_SIDEBAR_WRAPPROPERTYPANEL_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_SIDEBAR_WRAPPROPERTYPANEL_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_SIDEBAR_WRAPPROPERTYPANEL_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_SIDEBAR_WRAPPROPERTYPANEL_HXX
 
 #include <svx/sidebar/PanelLayout.hxx>
 #include <vcl/button.hxx>
diff --git a/sw/source/uibase/table/tablepg.hxx b/sw/source/uibase/table/tablepg.hxx
index 8cad6307f4bf..8583214a92aa 100644
--- a/sw/source/uibase/table/tablepg.hxx
+++ b/sw/source/uibase/table/tablepg.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 INCLUDED_SW_SOURCE_CORE_UIBASE_TABLE_TABLEPG_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_TABLE_TABLEPG_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_TABLE_TABLEPG_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_TABLE_TABLEPG_HXX
 #include <sfx2/tabdlg.hxx>
 #include <vcl/fixed.hxx>
 #include <vcl/button.hxx>
diff --git a/sw/source/uibase/uiview/viewfunc.hxx b/sw/source/uibase/uiview/viewfunc.hxx
index f078338435d6..5c9808ade2e6 100644
--- a/sw/source/uibase/uiview/viewfunc.hxx
+++ b/sw/source/uibase/uiview/viewfunc.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 INCLUDED_SW_SOURCE_CORE_UIBASE_UIVIEW_VIEWFUNC_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_UIVIEW_VIEWFUNC_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_UIVIEW_VIEWFUNC_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_UIVIEW_VIEWFUNC_HXX
 #include <tools/solar.h>
 
 class ImageButton;
diff --git a/sw/source/uibase/uno/SwXDocumentSettings.hxx b/sw/source/uibase/uno/SwXDocumentSettings.hxx
index b3759a0f352d..5485a1b971c6 100644
--- a/sw/source/uibase/uno/SwXDocumentSettings.hxx
+++ b/sw/source/uibase/uno/SwXDocumentSettings.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_UNO_SWXDOCUMENTSETTINGS_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_UNO_SWXDOCUMENTSETTINGS_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_UNO_SWXDOCUMENTSETTINGS_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_UNO_SWXDOCUMENTSETTINGS_HXX
 
 #include <comphelper/MasterPropertySet.hxx>
 #include <com/sun/star/text/XTextDocument.hpp>
diff --git a/sw/source/uibase/uno/unodefaults.hxx b/sw/source/uibase/uno/unodefaults.hxx
index 450a2a5d382b..274e6247db2a 100644
--- a/sw/source/uibase/uno/unodefaults.hxx
+++ b/sw/source/uibase/uno/unodefaults.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 INCLUDED_SW_SOURCE_CORE_UIBASE_UNO_UNODEFAULTS_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_UNO_UNODEFAULTS_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_UNO_UNODEFAULTS_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_UNO_UNODEFAULTS_HXX
 
 #include <svx/unopool.hxx>
 
diff --git a/sw/source/uibase/uno/unomodule.hxx b/sw/source/uibase/uno/unomodule.hxx
index 00bd74e46428..424871a2d213 100644
--- a/sw/source/uibase/uno/unomodule.hxx
+++ b/sw/source/uibase/uno/unomodule.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SW_SOURCE_CORE_UIBASE_UNO_UNOMODULE_HXX
-#define INCLUDED_SW_SOURCE_CORE_UIBASE_UNO_UNOMODULE_HXX
+#ifndef INCLUDED_SW_SOURCE_UIBASE_UNO_UNOMODULE_HXX
+#define INCLUDED_SW_SOURCE_UIBASE_UNO_UNOMODULE_HXX
 
 #include <rtl/ustring.hxx>
 #include <com/sun/star/frame/XDispatchProvider.hpp>
author	Thomas Arnhold <thomas@arnhold.org>	2014-06-03 10:01:18 +0200
committer	Thomas Arnhold <thomas@arnhold.org>	2014-06-03 11:17:22 +0200
commit	cebb96ec3a22d9023fb8a8d91f6c766a8a3866af (patch)
tree	e224a0d04781b60a1925b93347d86e2ff87c9462 /sw/source/uibase
parent	d2bbef3d3d6c7be096175ddbdb788ece5067f5fc (diff)