fixincludeguards.sh: include/s*

Change-Id: I57fcfd442d2b5815e7c07a9cbd660f3698168dee

113 files changed, 265 insertions, 265 deletions

diff --git a/include/sfx2/DocumentMetadataAccess.hxx b/include/sfx2/DocumentMetadataAccess.hxx
index d81401266ac3..a1bc8dc65aea 100644
--- a/include/sfx2/DocumentMetadataAccess.hxx
+++ b/include/sfx2/DocumentMetadataAccess.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SFX_DOCUMENTMETADATAACCESS_HXX_
-#define _SFX_DOCUMENTMETADATAACCESS_HXX_
+#ifndef INCLUDED_SFX2_DOCUMENTMETADATAACCESS_HXX
+#define INCLUDED_SFX2_DOCUMENTMETADATAACCESS_HXX
 
 #include <sal/config.h>
 
@@ -203,6 +203,6 @@ private:
 
 } // namespace sfx2
 
-#endif // _SFX_DOCUMENTMETADATAACCESS_HXX_
+#endif // INCLUDED_SFX2_DOCUMENTMETADATAACCESS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/sfx2/Metadatable.hxx b/include/sfx2/Metadatable.hxx
index 9b0f9585838a..6bf8aad57adc 100644
--- a/include/sfx2/Metadatable.hxx
+++ b/include/sfx2/Metadatable.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 METADATABLE_HXX
-#define METADATABLE_HXX
+#ifndef INCLUDED_SFX2_METADATABLE_HXX
+#define INCLUDED_SFX2_METADATABLE_HXX
 
 #include <sal/config.h>
 
@@ -176,6 +176,6 @@ protected:
 
 } // namespace sfx2
 
-#endif // METADATABLE_HXX
+#endif // INCLUDED_SFX2_METADATABLE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/sfx2/QuerySaveDocument.hxx b/include/sfx2/QuerySaveDocument.hxx
index ecdf0aa6a67e..5c84050fcca4 100644
--- a/include/sfx2/QuerySaveDocument.hxx
+++ b/include/sfx2/QuerySaveDocument.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 SFX_QUERYSAVEDOCUMENT_HXX
-#define SFX_QUERYSAVEDOCUMENT_HXX
+#ifndef INCLUDED_SFX2_QUERYSAVEDOCUMENT_HXX
+#define INCLUDED_SFX2_QUERYSAVEDOCUMENT_HXX
 
 #include <rtl/ustring.hxx>
 #include <sfx2/dllapi.h>
@@ -33,6 +33,6 @@ class Window;
 SFX2_DLLPUBLIC short ExecuteQuerySaveDocument(
     Window* _pParent, const OUString& _rTitle);
 
-#endif //SFX_QUERYSAVEDOCUMENT_HXX
+#endif // INCLUDED_SFX2_QUERYSAVEDOCUMENT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/sfx2/XmlIdRegistry.hxx b/include/sfx2/XmlIdRegistry.hxx
index a7540dc469b0..3b1dff4432b1 100644
--- a/include/sfx2/XmlIdRegistry.hxx
+++ b/include/sfx2/XmlIdRegistry.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SFX_XMLIDREGISTRY_HXX_
-#define _SFX_XMLIDREGISTRY_HXX_
+#ifndef INCLUDED_SFX2_XMLIDREGISTRY_HXX
+#define INCLUDED_SFX2_XMLIDREGISTRY_HXX
 
 #include <sal/config.h>
 
@@ -79,6 +79,6 @@ public:
 
 } // namespace sfx2
 
-#endif // _SFX_XMLIDREGISTRY_HXX_
+#endif // INCLUDED_SFX2_XMLIDREGISTRY_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/sfx2/app.hxx b/include/sfx2/app.hxx
index d24b40abf53d..d28a373bc5bf 100644
--- a/include/sfx2/app.hxx
+++ b/include/sfx2/app.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 _SFXAPP_HXX
-#define _SFXAPP_HXX
+#ifndef INCLUDED_SFX2_APP_HXX
+#define INCLUDED_SFX2_APP_HXX
 
 #include "sal/config.h"
 #include "sfx2/dllapi.h"
diff --git a/include/sfx2/appuno.hxx b/include/sfx2/appuno.hxx
index 1845867acc99..a513dbc7505c 100644
--- a/include/sfx2/appuno.hxx
+++ b/include/sfx2/appuno.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 _SFX_APPUNO_HXX
-#define _SFX_APPUNO_HXX
+#ifndef INCLUDED_SFX2_APPUNO_HXX
+#define INCLUDED_SFX2_APPUNO_HXX
 
 #include <com/sun/star/frame/XFrame.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
diff --git a/include/sfx2/basedlgs.hxx b/include/sfx2/basedlgs.hxx
index a201f7494ece..819953b4d098 100644
--- a/include/sfx2/basedlgs.hxx
+++ b/include/sfx2/basedlgs.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 _BASEDLGS_HXX
-#define _BASEDLGS_HXX
+#ifndef INCLUDED_SFX2_BASEDLGS_HXX
+#define INCLUDED_SFX2_BASEDLGS_HXX
 
 #include "sal/config.h"
 #include "sfx2/dllapi.h"
diff --git a/include/sfx2/bindings.hxx b/include/sfx2/bindings.hxx
index 5a1cbabb8711..0a3cbc578da8 100644
--- a/include/sfx2/bindings.hxx
+++ b/include/sfx2/bindings.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 _SFX_BINDINGS_HXX
-#define _SFX_BINDINGS_HXX
+#ifndef INCLUDED_SFX2_BINDINGS_HXX
+#define INCLUDED_SFX2_BINDINGS_HXX
 
 #include "sal/config.h"
 #include "sfx2/dllapi.h"
diff --git a/include/sfx2/chalign.hxx b/include/sfx2/chalign.hxx
index f8bf451e2b22..c964299cccdf 100644
--- a/include/sfx2/chalign.hxx
+++ b/include/sfx2/chalign.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 _SFX_CHILDALIGN_HXX
-#define _SFX_CHILDALIGN_HXX
+#ifndef INCLUDED_SFX2_CHALIGN_HXX
+#define INCLUDED_SFX2_CHALIGN_HXX
 
 #include <tools/solar.h>
 
diff --git a/include/sfx2/checkin.hxx b/include/sfx2/checkin.hxx
index 9a9c20f485d7..b5b87b0c9f31 100644
--- a/include/sfx2/checkin.hxx
+++ b/include/sfx2/checkin.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 _SFX_CHECKIN_HXX
-#define _SFX_CHECKIN_HXX
+#ifndef INCLUDED_SFX2_CHECKIN_HXX
+#define INCLUDED_SFX2_CHECKIN_HXX
 
 #include <vcl/button.hxx>
 #include <vcl/dialog.hxx>
diff --git a/include/sfx2/childwin.hxx b/include/sfx2/childwin.hxx
index 3337e71654df..b2a7aeba86b8 100644
--- a/include/sfx2/childwin.hxx
+++ b/include/sfx2/childwin.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 _SFX_CHILDWIN_HXX
-#define _SFX_CHILDWIN_HXX
+#ifndef INCLUDED_SFX2_CHILDWIN_HXX
+#define INCLUDED_SFX2_CHILDWIN_HXX
 
 #include "sal/config.h"
 #include "sfx2/dllapi.h"
diff --git a/include/sfx2/controlwrapper.hxx b/include/sfx2/controlwrapper.hxx
index 18696240b1ac..2d28cb5f4a87 100644
--- a/include/sfx2/controlwrapper.hxx
+++ b/include/sfx2/controlwrapper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef SFX_CONTROLWRAPPER_HXX
-#define SFX_CONTROLWRAPPER_HXX
+#ifndef INCLUDED_SFX2_CONTROLWRAPPER_HXX
+#define INCLUDED_SFX2_CONTROLWRAPPER_HXX
 
 #include <tools/debug.hxx>
 #include "sal/config.h"
diff --git a/include/sfx2/ctrlitem.hxx b/include/sfx2/ctrlitem.hxx
index af6288e772e9..5f433e08fdb6 100644
--- a/include/sfx2/ctrlitem.hxx
+++ b/include/sfx2/ctrlitem.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 _SFXCTRLITEM_HXX
-#define _SFXCTRLITEM_HXX
+#ifndef INCLUDED_SFX2_CTRLITEM_HXX
+#define INCLUDED_SFX2_CTRLITEM_HXX
 
 #include "sal/config.h"
 #include "sfx2/dllapi.h"
diff --git a/include/sfx2/dialoghelper.hxx b/include/sfx2/dialoghelper.hxx
index a1a6dacf8ffe..dfff3627154c 100644
--- a/include/sfx2/dialoghelper.hxx
+++ b/include/sfx2/dialoghelper.hxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef _SFX_DIALOGHELPER_HXX
-#define _SFX_DIALOGHELPER_HXX
+#ifndef INCLUDED_SFX2_DIALOGHELPER_HXX
+#define INCLUDED_SFX2_DIALOGHELPER_HXX
 
 #include "sfx2/dllapi.h"
 #include <rtl/ustring.hxx>
diff --git a/include/sfx2/dinfdlg.hxx b/include/sfx2/dinfdlg.hxx
index 2834ca25f9a5..c43b85260a2d 100644
--- a/include/sfx2/dinfdlg.hxx
+++ b/include/sfx2/dinfdlg.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 SFX_DINFDLG_HXX
-#define SFX_DINFDLG_HXX
+#ifndef INCLUDED_SFX2_DINFDLG_HXX
+#define INCLUDED_SFX2_DINFDLG_HXX
 
 #include <boost/optional/optional.hpp>
 
@@ -636,6 +636,6 @@ public:
     static SfxTabPage*  Create( Window* pParent, const SfxItemSet& );
 };
 
-#endif // #ifndef _SFX_DINFDLG_HXX
+#endif // #ifndef _ INCLUDED_SFX2_DINFDLG_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/sfx2/dinfedt.hxx b/include/sfx2/dinfedt.hxx
index b24908a7d081..3560e0e2fc39 100644
--- a/include/sfx2/dinfedt.hxx
+++ b/include/sfx2/dinfedt.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 _SFX_DINFEDT_HXX
-#define _SFX_DINFEDT_HXX
+#ifndef INCLUDED_SFX2_DINFEDT_HXX
+#define INCLUDED_SFX2_DINFEDT_HXX
 
 #include <vcl/button.hxx>
 #include <vcl/dialog.hxx>
diff --git a/include/sfx2/dispatch.hxx b/include/sfx2/dispatch.hxx
index 711dbdac6689..701381840583 100644
--- a/include/sfx2/dispatch.hxx
+++ b/include/sfx2/dispatch.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 _SFXDISPATCH_HXX
-#define _SFXDISPATCH_HXX
+#ifndef INCLUDED_SFX2_DISPATCH_HXX
+#define INCLUDED_SFX2_DISPATCH_HXX
 
 #include "sal/config.h"
 #include "sfx2/dllapi.h"
diff --git a/include/sfx2/docfac.hxx b/include/sfx2/docfac.hxx
index 96034944e0a2..11ee0faf7dd0 100644
--- a/include/sfx2/docfac.hxx
+++ b/include/sfx2/docfac.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 _SFX_OBJFAC_HXX
-#define _SFX_OBJFAC_HXX
+#ifndef INCLUDED_SFX2_DOCFAC_HXX
+#define INCLUDED_SFX2_DOCFAC_HXX
 
 #include "sal/config.h"
 #include "sfx2/dllapi.h"
@@ -120,6 +120,6 @@ public:                                                                     \
         static SfxObjectFactory aObjectFactory(GlobName, Flags, ShortName); \
         return aObjectFactory;                                              \
     }
-#endif // #ifndef _SFX_OBJFAC_HXX
+#endif // INCLUDED_SFX2_DOCFAC_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/sfx2/docfile.hxx b/include/sfx2/docfile.hxx
index 917cc2ced113..50c9a2b6c461 100644
--- a/include/sfx2/docfile.hxx
+++ b/include/sfx2/docfile.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SFXDOCFILE_HXX
-#define _SFXDOCFILE_HXX
+#ifndef INCLUDED_SFX2_DOCFILE_HXX
+#define INCLUDED_SFX2_DOCFILE_HXX
 
 #include <com/sun/star/io/XSeekable.hpp>
 #include "sal/config.h"
diff --git a/include/sfx2/docfilt.hxx b/include/sfx2/docfilt.hxx
index 2470155462e8..85f93da8edf6 100644
--- a/include/sfx2/docfilt.hxx
+++ b/include/sfx2/docfilt.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 _SFX_DOCFILT_HACK_HXX
-#define _SFX_DOCFILT_HACK_HXX
+#ifndef INCLUDED_SFX2_DOCFILT_HXX
+#define INCLUDED_SFX2_DOCFILT_HXX
 
 #include <com/sun/star/plugin/PluginDescription.hpp>
 #include <com/sun/star/embed/XStorage.hpp>
diff --git a/include/sfx2/docinf.hxx b/include/sfx2/docinf.hxx
index 8ab57ffe2ae4..0b9179aa14a9 100644
--- a/include/sfx2/docinf.hxx
+++ b/include/sfx2/docinf.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 _SFXDOCINF_HXX
-#define _SFXDOCINF_HXX
+#ifndef INCLUDED_SFX2_DOCINF_HXX
+#define INCLUDED_SFX2_DOCINF_HXX
 
 #include "sal/config.h"
 #include "sfx2/dllapi.h"
diff --git a/include/sfx2/docinsert.hxx b/include/sfx2/docinsert.hxx
index 414991d7728d..62d43deee264 100644
--- a/include/sfx2/docinsert.hxx
+++ b/include/sfx2/docinsert.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SFX_DOCINSERT_HXX
-#define _SFX_DOCINSERT_HXX
+#ifndef INCLUDED_SFX2_DOCINSERT_HXX
+#define INCLUDED_SFX2_DOCINSERT_HXX
 
 #include <rtl/ustring.hxx>
 #include <sfx2/dllapi.h>
@@ -65,6 +65,6 @@ public:
 
 } // namespace sfx2
 
-#endif // _SFX_DOCINSERT_HXX
+#endif // INCLUDED_SFX2_DOCINSERT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/sfx2/dockwin.hxx b/include/sfx2/dockwin.hxx
index d64b6ed7a6f7..85d6fe9004e1 100644
--- a/include/sfx2/dockwin.hxx
+++ b/include/sfx2/dockwin.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 _SFXDOCKWIN_HXX
-#define _SFXDOCKWIN_HXX
+#ifndef INCLUDED_SFX2_DOCKWIN_HXX
+#define INCLUDED_SFX2_DOCKWIN_HXX
 
 #include "sal/config.h"
 #include "sal/types.h"
@@ -125,6 +125,6 @@ class SfxDockingWrapper : public SfxChildWindow
         SFX_DECL_CHILDWINDOW(SfxDockingWrapper);
 };
 
-#endif // #ifndef _SFXDOCKWIN_HXX
+#endif // INCLUDED_SFX2_DOCKWIN_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/sfx2/docmacromode.hxx b/include/sfx2/docmacromode.hxx
index 4e089d7e3d55..c4c8a1621920 100644
--- a/include/sfx2/docmacromode.hxx
+++ b/include/sfx2/docmacromode.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef SFX2_DOCMACROMODE_HXX
-#define SFX2_DOCMACROMODE_HXX
+#ifndef INCLUDED_SFX2_DOCMACROMODE_HXX
+#define INCLUDED_SFX2_DOCMACROMODE_HXX
 
 #include "sfx2/dllapi.h"
 
@@ -323,6 +323,6 @@ namespace sfx2
 } // namespace sfx2
 //........................................................................
 
-#endif // SFX2_DOCMACROMODE_HXX
+#endif // INCLUDED_SFX2_DOCMACROMODE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/sfx2/docstoragemodifylistener.hxx b/include/sfx2/docstoragemodifylistener.hxx
index 792a8dab0d97..032f6bec181b 100644
--- a/include/sfx2/docstoragemodifylistener.hxx
+++ b/include/sfx2/docstoragemodifylistener.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef SFX2_DOCSTORAGEMODIFYLISTENER_HXX
-#define SFX2_DOCSTORAGEMODIFYLISTENER_HXX
+#ifndef INCLUDED_SFX2_DOCSTORAGEMODIFYLISTENER_HXX
+#define INCLUDED_SFX2_DOCSTORAGEMODIFYLISTENER_HXX
 
 #include "sfx2/dllapi.h"
 
@@ -82,6 +82,6 @@ namespace sfx2
 } // namespace sfx2
 //........................................................................
 
-#endif // SFX2_DOCSTORAGEMODIFYLISTENER_HXX
+#endif // INCLUDED_SFX2_DOCSTORAGEMODIFYLISTENER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/sfx2/event.hxx b/include/sfx2/event.hxx
index f178a40544cd..7dcb12ff432c 100644
--- a/include/sfx2/event.hxx
+++ b/include/sfx2/event.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 _SFXEVENT_HXX
-#define _SFXEVENT_HXX
+#ifndef INCLUDED_SFX2_EVENT_HXX
+#define INCLUDED_SFX2_EVENT_HXX
 
 #include "sal/config.h"
 #include "sfx2/dllapi.h"
diff --git a/include/sfx2/evntconf.hxx b/include/sfx2/evntconf.hxx
index f4605759bc61..f33fb332eebb 100644
--- a/include/sfx2/evntconf.hxx
+++ b/include/sfx2/evntconf.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 _SFX_EVENTCONF_HXX
-#define _SFX_EVENTCONF_HXX
+#ifndef INCLUDED_SFX2_EVNTCONF_HXX
+#define INCLUDED_SFX2_EVNTCONF_HXX
 
 #include "sal/config.h"
 #include "sfx2/dllapi.h"
diff --git a/include/sfx2/fcontnr.hxx b/include/sfx2/fcontnr.hxx
index d064d1bf406b..8ccbbd94ae95 100644
--- a/include/sfx2/fcontnr.hxx
+++ b/include/sfx2/fcontnr.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 _SFX_FCONTNR_HXX
-#define _SFX_FCONTNR_HXX
+#ifndef INCLUDED_SFX2_FCONTNR_HXX
+#define INCLUDED_SFX2_FCONTNR_HXX
 
 #include "sal/config.h"
 #include "sfx2/dllapi.h"
diff --git a/include/sfx2/filedlghelper.hxx b/include/sfx2/filedlghelper.hxx
index 163eef9a1388..97ca3b5bc531 100644
--- a/include/sfx2/filedlghelper.hxx
+++ b/include/sfx2/filedlghelper.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 _FILEDLGHELPER_HXX
-#define _FILEDLGHELPER_HXX
+#ifndef INCLUDED_SFX2_FILEDLGHELPER_HXX
+#define INCLUDED_SFX2_FILEDLGHELPER_HXX
 
 #include "sal/config.h"
 #include "sfx2/dllapi.h"
diff --git a/include/sfx2/frame.hxx b/include/sfx2/frame.hxx
index 510f79bdd664..93b6fcecf933 100644
--- a/include/sfx2/frame.hxx
+++ b/include/sfx2/frame.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 _SFXFRAME_HXX
-#define _SFXFRAME_HXX
+#ifndef INCLUDED_SFX2_FRAME_HXX
+#define INCLUDED_SFX2_FRAME_HXX
 
 #ifndef TF_NEWDESKTOP
 #define TF_NEWDESKTOP 1
diff --git a/include/sfx2/frmhtml.hxx b/include/sfx2/frmhtml.hxx
index 356d778e6590..d79e09874232 100644
--- a/include/sfx2/frmhtml.hxx
+++ b/include/sfx2/frmhtml.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _FRMHTML_HXX
-#define _FRMHTML_HXX
+#ifndef INCLUDED_SFX2_FRMHTML_HXX
+#define INCLUDED_SFX2_FRMHTML_HXX
 
 #include "sal/config.h"
 #include "sfx2/dllapi.h"
diff --git a/include/sfx2/frmhtmlw.hxx b/include/sfx2/frmhtmlw.hxx
index cc5e7be79b31..83487881e8bf 100644
--- a/include/sfx2/frmhtmlw.hxx
+++ b/include/sfx2/frmhtmlw.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 _FRMHTMLW_HXX
-#define _FRMHTMLW_HXX
+#ifndef INCLUDED_SFX2_FRMHTMLW_HXX
+#define INCLUDED_SFX2_FRMHTMLW_HXX
 
 #include "sal/config.h"
 #include "sfx2/dllapi.h"
diff --git a/include/sfx2/genlink.hxx b/include/sfx2/genlink.hxx
index 045047d9d0c7..6d210057cf94 100644
--- a/include/sfx2/genlink.hxx
+++ b/include/sfx2/genlink.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 _SFXGENLINK_HXX
-#define _SFXGENLINK_HXX
+#ifndef INCLUDED_SFX2_GENLINK_HXX
+#define INCLUDED_SFX2_GENLINK_HXX
 
 
 #include <tools/link.hxx>
diff --git a/include/sfx2/hintpost.hxx b/include/sfx2/hintpost.hxx
index 25adb3ea3d58..b9aca77fc3f2 100644
--- a/include/sfx2/hintpost.hxx
+++ b/include/sfx2/hintpost.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 _SFXHINTPOST_HXX
-#define _SFXHINTPOST_HXX
+#ifndef INCLUDED_SFX2_HINTPOST_HXX
+#define INCLUDED_SFX2_HINTPOST_HXX
 
 #include <sfx2/genlink.hxx>
 #include <tools/ref.hxx>
diff --git a/include/sfx2/htmlmode.hxx b/include/sfx2/htmlmode.hxx
index 0ce8e430869e..952b93d9b07c 100644
--- a/include/sfx2/htmlmode.hxx
+++ b/include/sfx2/htmlmode.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 _SFX_HTMLMODE_HXX_
-#define _SFX_HTMLMODE_HXX_
+#ifndef INCLUDED_SFX2_HTMLMODE_HXX
+#define INCLUDED_SFX2_HTMLMODE_HXX
 
 #define HTMLMODE_ON                 0x0001
 #define HTMLMODE_PARA_DISTANCE      0x0004
diff --git a/include/sfx2/imgmgr.hxx b/include/sfx2/imgmgr.hxx
index 7ef278023336..c06d480ae964 100644
--- a/include/sfx2/imgmgr.hxx
+++ b/include/sfx2/imgmgr.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SFXIMGMGR_HXX
-#define _SFXIMGMGR_HXX
+#ifndef INCLUDED_SFX2_IMGMGR_HXX
+#define INCLUDED_SFX2_IMGMGR_HXX
 
 #include "sal/config.h"
 #include "sfx2/dllapi.h"
diff --git a/include/sfx2/infobar.hxx b/include/sfx2/infobar.hxx
index b91d01ad4927..9cd504d50b8f 100644
--- a/include/sfx2/infobar.hxx
+++ b/include/sfx2/infobar.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 _SFX2_MESSAGEBAR_HXX_
-#define _SFX2_MESSAGEBAR_HXX_
+#ifndef INCLUDED_SFX2_INFOBAR_HXX
+#define INCLUDED_SFX2_INFOBAR_HXX
 
 #include <vector>
 
diff --git a/include/sfx2/ipclient.hxx b/include/sfx2/ipclient.hxx
index e97b628d4b1a..126a36e1484f 100644
--- a/include/sfx2/ipclient.hxx
+++ b/include/sfx2/ipclient.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 _SFX_IPCLIENT_HXX
-#define _SFX_IPCLIENT_HXX
+#ifndef INCLUDED_SFX2_IPCLIENT_HXX
+#define INCLUDED_SFX2_IPCLIENT_HXX
 
 #include "sal/config.h"
 #include "sfx2/dllapi.h"
diff --git a/include/sfx2/itemconnect.hxx b/include/sfx2/itemconnect.hxx
index 3f73a90e3f30..455a9c643448 100644
--- a/include/sfx2/itemconnect.hxx
+++ b/include/sfx2/itemconnect.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef SFX_ITEMCONNECT_HXX
-#define SFX_ITEMCONNECT_HXX
+#ifndef INCLUDED_SFX2_ITEMCONNECT_HXX
+#define INCLUDED_SFX2_ITEMCONNECT_HXX
 
 #include "sal/config.h"
 #include "sfx2/dllapi.h"
diff --git a/include/sfx2/itemwrapper.hxx b/include/sfx2/itemwrapper.hxx
index 072da9eed4cf..5c24fd72b1a0 100644
--- a/include/sfx2/itemwrapper.hxx
+++ b/include/sfx2/itemwrapper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef SFX_ITEMWRAPPER_HXX
-#define SFX_ITEMWRAPPER_HXX
+#ifndef INCLUDED_SFX2_ITEMWRAPPER_HXX
+#define INCLUDED_SFX2_ITEMWRAPPER_HXX
 
 #include "sal/config.h"
 #include "sfx2/dllapi.h"
diff --git a/include/sfx2/linkmgr.hxx b/include/sfx2/linkmgr.hxx
index 909a5ae09823..f62b07319b31 100644
--- a/include/sfx2/linkmgr.hxx
+++ b/include/sfx2/linkmgr.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 _LINKMGR_HXX
-#define _LINKMGR_HXX
+#ifndef INCLUDED_SFX2_LINKMGR_HXX
+#define INCLUDED_SFX2_LINKMGR_HXX
 
 #include <rtl/ustring.hxx>
 #include <sal/config.h>
diff --git a/include/sfx2/linksrc.hxx b/include/sfx2/linksrc.hxx
index c19da26306f5..b512408e1bc2 100644
--- a/include/sfx2/linksrc.hxx
+++ b/include/sfx2/linksrc.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 _LINKSRC_HXX
-#define _LINKSRC_HXX
+#ifndef INCLUDED_SFX2_LINKSRC_HXX
+#define INCLUDED_SFX2_LINKSRC_HXX
 
 #include "sal/config.h"
 #include "sfx2/dllapi.h"
diff --git a/include/sfx2/lnkbase.hxx b/include/sfx2/lnkbase.hxx
index 71ccb16b8888..6fe28bf97ea3 100644
--- a/include/sfx2/lnkbase.hxx
+++ b/include/sfx2/lnkbase.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 _LNKBASE_HXX
-#define _LNKBASE_HXX
+#ifndef INCLUDED_SFX2_LNKBASE_HXX
+#define INCLUDED_SFX2_LNKBASE_HXX
 
 #include <com/sun/star/io/XInputStream.hpp>
 #include <rtl/ustring.hxx>
diff --git a/include/sfx2/macropg.hxx b/include/sfx2/macropg.hxx
index e75549609b0c..ceaa6f6ffce5 100644
--- a/include/sfx2/macropg.hxx
+++ b/include/sfx2/macropg.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 _MACROPG_HXX
-#define _MACROPG_HXX
+#ifndef INCLUDED_SFX2_MACROPG_HXX
+#define INCLUDED_SFX2_MACROPG_HXX
 
 #include "sal/config.h"
 #include "sfx2/dllapi.h"
diff --git a/include/sfx2/mailmodelapi.hxx b/include/sfx2/mailmodelapi.hxx
index ff89a4d5cc0b..c688cf051897 100644
--- a/include/sfx2/mailmodelapi.hxx
+++ b/include/sfx2/mailmodelapi.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_SFX_MAILMODEL_HXX
-#define INCLUDED_SFX_MAILMODEL_HXX
+#ifndef INCLUDED_SFX2_MAILMODELAPI_HXX
+#define INCLUDED_SFX2_MAILMODELAPI_HXX
 
 #include <com/sun/star/frame/XFrame.hpp>
 #include <com/sun/star/frame/XModel.hpp>
@@ -129,6 +129,6 @@ public:
 
 sal_Bool CreateFromAddress_Impl( OUString& rFrom );
 
-#endif // INCLUDED_SFX_MAILMODEL_HXX
+#endif // INCLUDED_SFX2_MAILMODELAPI_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/sfx2/mieclip.hxx b/include/sfx2/mieclip.hxx
index e324946c4164..bbd8f5b765c5 100644
--- a/include/sfx2/mieclip.hxx
+++ b/include/sfx2/mieclip.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _MIECLIP_HXX
-#define _MIECLIP_HXX
+#ifndef INCLUDED_SFX2_MIECLIP_HXX
+#define INCLUDED_SFX2_MIECLIP_HXX
 
 #include <rtl/ustring.hxx>
 #include <sal/config.h>
@@ -51,6 +51,6 @@ public:
 };
 
 
-#endif //_MIECLIP_HXX
+#endif // INCLUDED_SFX2_MIECLIP_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/sfx2/minfitem.hxx b/include/sfx2/minfitem.hxx
index 41780767474f..83e023b74ed2 100644
--- a/include/sfx2/minfitem.hxx
+++ b/include/sfx2/minfitem.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 _SFX_MINFITEM_HXX
-#define _SFX_MINFITEM_HXX
+#ifndef INCLUDED_SFX2_MINFITEM_HXX
+#define INCLUDED_SFX2_MINFITEM_HXX
 
 #include <rtl/ustring.hxx>
 #include <sal/config.h>
diff --git a/include/sfx2/mnuitem.hxx b/include/sfx2/mnuitem.hxx
index 5fa53213e559..51d2c65d69d0 100644
--- a/include/sfx2/mnuitem.hxx
+++ b/include/sfx2/mnuitem.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 _SFXMNUITEM_HXX
-#define _SFXMNUITEM_HXX
+#ifndef INCLUDED_SFX2_MNUITEM_HXX
+#define INCLUDED_SFX2_MNUITEM_HXX
 
 #include <com/sun/star/frame/XDispatch.hpp>
 #include <com/sun/star/util/URL.hpp>
diff --git a/include/sfx2/module.hxx b/include/sfx2/module.hxx
index 3b285faf6593..2d3988a10a1b 100644
--- a/include/sfx2/module.hxx
+++ b/include/sfx2/module.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 _SFXMODULE_HXX
-#define _SFXMODULE_HXX  // internal
+#ifndef INCLUDED_SFX2_MODULE_HXX
+#define INCLUDED_SFX2_MODULE_HXX  // internal
 #define _SFXMOD_HXX     // external
 
 #include "sal/config.h"
diff --git a/include/sfx2/msg.hxx b/include/sfx2/msg.hxx
index eca6618cc118..f48284cbbb4d 100644
--- a/include/sfx2/msg.hxx
+++ b/include/sfx2/msg.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 _SFXMSG_HXX
-#define _SFXMSG_HXX
+#ifndef INCLUDED_SFX2_MSG_HXX
+#define INCLUDED_SFX2_MSG_HXX
 
 #include <tools/rtti.hxx>
 #include <sfx2/shell.hxx>
diff --git a/include/sfx2/navigat.hxx b/include/sfx2/navigat.hxx
index 7f0dc928818e..8ae93a8ef088 100644
--- a/include/sfx2/navigat.hxx
+++ b/include/sfx2/navigat.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SFXNAVI_HXX
-#define _SFXNAVI_HXX
+#ifndef INCLUDED_SFX2_NAVIGAT_HXX
+#define INCLUDED_SFX2_NAVIGAT_HXX
 
 #include <sfx2/childwin.hxx>
 #include <sfx2/dockwin.hxx>
diff --git a/include/sfx2/objface.hxx b/include/sfx2/objface.hxx
index 34ca4ba305bf..d44d49718dfe 100644
--- a/include/sfx2/objface.hxx
+++ b/include/sfx2/objface.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 _SFXOBJFACE_HXX
-#define _SFXOBJFACE_HXX
+#ifndef INCLUDED_SFX2_OBJFACE_HXX
+#define INCLUDED_SFX2_OBJFACE_HXX
 
 #include <rtl/ustring.hxx>
 #include <sal/config.h>
diff --git a/include/sfx2/objitem.hxx b/include/sfx2/objitem.hxx
index 8e607c9f0ce5..3297cac145f3 100644
--- a/include/sfx2/objitem.hxx
+++ b/include/sfx2/objitem.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 _SFX_OBJITEM_HXX
-#define _SFX_OBJITEM_HXX
+#ifndef INCLUDED_SFX2_OBJITEM_HXX
+#define INCLUDED_SFX2_OBJITEM_HXX
 
 #include "sal/config.h"
 #include "sfx2/dllapi.h"
diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx
index e2f2c6e3d42e..eb9479af11ba 100644
--- a/include/sfx2/objsh.hxx
+++ b/include/sfx2/objsh.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 _SFX_OBJSH_HXX
-#define _SFX_OBJSH_HXX
+#ifndef INCLUDED_SFX2_OBJSH_HXX
+#define INCLUDED_SFX2_OBJSH_HXX
 
 #include <config_features.h>
 
diff --git a/include/sfx2/opengrf.hxx b/include/sfx2/opengrf.hxx
index 13e7a6bcd84b..0a7c12c01c3d 100644
--- a/include/sfx2/opengrf.hxx
+++ b/include/sfx2/opengrf.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 _SFX2_OPENGRF_HXX
-#define _SFX2_OPENGRF_HXX
+#ifndef INCLUDED_SFX2_OPENGRF_HXX
+#define INCLUDED_SFX2_OPENGRF_HXX
 
 #include <memory>
 #include <vcl/graphicfilter.hxx>
diff --git a/include/sfx2/passwd.hxx b/include/sfx2/passwd.hxx
index 21c5e0107fe1..821b311bc4ae 100644
--- a/include/sfx2/passwd.hxx
+++ b/include/sfx2/passwd.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 _SFX_PASSWD_HXX
-#define _SFX_PASSWD_HXX
+#ifndef INCLUDED_SFX2_PASSWD_HXX
+#define INCLUDED_SFX2_PASSWD_HXX
 
 #include "sal/config.h"
 #include <sfx2/dllapi.h>
@@ -118,6 +118,6 @@ public:
     virtual short Execute();
 };
 
-#endif // #ifndef _SFX_PASSWD_HXX
+#endif // INCLUDED_SFX2_PASSWD_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/sfx2/printer.hxx b/include/sfx2/printer.hxx
index 3b17333366ee..03500f24dc23 100644
--- a/include/sfx2/printer.hxx
+++ b/include/sfx2/printer.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 _SFX_PRINTER_HXX
-#define _SFX_PRINTER_HXX
+#ifndef INCLUDED_SFX2_PRINTER_HXX
+#define INCLUDED_SFX2_PRINTER_HXX
 
 #include "sal/config.h"
 #include "sfx2/dllapi.h"
diff --git a/include/sfx2/printopt.hxx b/include/sfx2/printopt.hxx
index 44d37d0a4558..ebe0fd29f39e 100644
--- a/include/sfx2/printopt.hxx
+++ b/include/sfx2/printopt.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SFX_PRINTOPT_HXX
-#define _SFX_PRINTOPT_HXX
+#ifndef INCLUDED_SFX2_PRINTOPT_HXX
+#define INCLUDED_SFX2_PRINTOPT_HXX
 
 #include "sal/config.h"
 #include "sfx2/dllapi.h"
@@ -104,6 +104,6 @@ public:
     static SfxTabPage*  Create( Window* pParent, const SfxItemSet& rAttrSet );
 };
 
-#endif // #ifndef _SFX_PRINTOPT_HXX
+#endif // INCLUDED_SFX2_PRINTOPT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/sfx2/progress.hxx b/include/sfx2/progress.hxx
index bb598b8a62bf..433c4272819f 100644
--- a/include/sfx2/progress.hxx
+++ b/include/sfx2/progress.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 _SFX_PROGRESS_HXX
-#define _SFX_PROGRESS_HXX
+#ifndef INCLUDED_SFX2_PROGRESS_HXX
+#define INCLUDED_SFX2_PROGRESS_HXX
 
 #include "sal/config.h"
 #include "sfx2/dllapi.h"
diff --git a/include/sfx2/querystatus.hxx b/include/sfx2/querystatus.hxx
index 475d3cd00765..05d72e756b19 100644
--- a/include/sfx2/querystatus.hxx
+++ b/include/sfx2/querystatus.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SFXQUERYSTATUS_HXX
-#define _SFXQUERYSTATUS_HXX
+#ifndef INCLUDED_SFX2_QUERYSTATUS_HXX
+#define INCLUDED_SFX2_QUERYSTATUS_HXX
 
 #include "sal/config.h"
 #include "sfx2/dllapi.h"
@@ -50,6 +50,6 @@ class SFX2_DLLPUBLIC SfxQueryStatus
         SfxQueryStatus_Impl*                                                       m_pSfxQueryStatusImpl;
 };
 
-#endif // _SFXQUERYSTATUS_HXX
+#endif // INCLUDED_SFX2_QUERYSTATUS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/sfx2/recentdocsview.hxx b/include/sfx2/recentdocsview.hxx
index 1c3949e7159a..05526368b961 100644
--- a/include/sfx2/recentdocsview.hxx
+++ b/include/sfx2/recentdocsview.hxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef __SFX2_RECENTDOCSVIEW_HXX__
-#define __SFX2_RECENTDOCSVIEW_HXX__
+#ifndef INCLUDED_SFX2_RECENTDOCSVIEW_HXX
+#define INCLUDED_SFX2_RECENTDOCSVIEW_HXX
 
 #include <sfx2/thumbnailview.hxx>
 #include <sfx2/recentdocsviewitem.hxx>
@@ -68,6 +68,6 @@ protected:
     long    mnItemMaxTextLength;
 };
 
-#endif  // __SFX2_RECENTDOCSVIEW_HXX__
+#endif // INCLUDED_SFX2_RECENTDOCSVIEW_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/sfx2/recentdocsviewitem.hxx b/include/sfx2/recentdocsviewitem.hxx
index 33d3bb938fb3..4442e3266cc2 100644
--- a/include/sfx2/recentdocsviewitem.hxx
+++ b/include/sfx2/recentdocsviewitem.hxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef __SFX2_RECENTDOCSVIEWITEM_HXX__
-#define __SFX2_RECENTDOCSVIEWITEM_HXX__
+#ifndef INCLUDED_SFX2_RECENTDOCSVIEWITEM_HXX
+#define INCLUDED_SFX2_RECENTDOCSVIEWITEM_HXX
 
 #include <sfx2/thumbnailview.hxx>
 
@@ -22,6 +22,6 @@ public:
     OUString maURL;
 };
 
-#endif  // __SFX2_RECENTDOCSVIEWITEM_HXX__
+#endif // INCLUDED_SFX2_RECENTDOCSVIEWITEM_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/sfx2/request.hxx b/include/sfx2/request.hxx
index 9a044e6f7e72..d8d95fe8c9bf 100644
--- a/include/sfx2/request.hxx
+++ b/include/sfx2/request.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 _SFXREQUEST_HXX
-#define _SFXREQUEST_HXX
+#ifndef INCLUDED_SFX2_REQUEST_HXX
+#define INCLUDED_SFX2_REQUEST_HXX
 
 #include "sal/config.h"
 #include "sfx2/dllapi.h"
diff --git a/include/sfx2/securitypage.hxx b/include/sfx2/securitypage.hxx
index 994fd0befa41..bfe62f248ed6 100644
--- a/include/sfx2/securitypage.hxx
+++ b/include/sfx2/securitypage.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 _SECURITYPAGE_HXX_
-#define _SECURITYPAGE_HXX_
+#ifndef INCLUDED_SFX2_SECURITYPAGE_HXX
+#define INCLUDED_SFX2_SECURITYPAGE_HXX
 
 #include "sfx2/tabdlg.hxx"
 #include "sfx2/htmlmode.hxx"
@@ -44,6 +44,6 @@ public:
 };
 
 
-#endif // #ifndef _SECURITYPAGE_HXX_
+#endif // INCLUDED_SFX2_SECURITYPAGE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/sfx2/sfxbasecontroller.hxx b/include/sfx2/sfxbasecontroller.hxx
index df2635f711ed..6628200b6116 100644
--- a/include/sfx2/sfxbasecontroller.hxx
+++ b/include/sfx2/sfxbasecontroller.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SFX_SFXBASECONTROLLER_HXX_
-#define _SFX_SFXBASECONTROLLER_HXX_
+#ifndef INCLUDED_SFX2_SFXBASECONTROLLER_HXX
+#define INCLUDED_SFX2_SFXBASECONTROLLER_HXX
 
 #include "sal/config.h"
 #include "sfx2/dllapi.h"
diff --git a/include/sfx2/sfxbasemodel.hxx b/include/sfx2/sfxbasemodel.hxx
index 4d4d4dd9e036..30e51ebd2d47 100644
--- a/include/sfx2/sfxbasemodel.hxx
+++ b/include/sfx2/sfxbasemodel.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SFX_SFXBASEMODEL_HXX_
-#define _SFX_SFXBASEMODEL_HXX_
+#ifndef INCLUDED_SFX2_SFXBASEMODEL_HXX
+#define INCLUDED_SFX2_SFXBASEMODEL_HXX
 
 #include "sal/config.h"
 #include "sfx2/dllapi.h"
@@ -1557,6 +1557,6 @@ private:
     SolarMutexResettableGuard  m_aGuard;
 };
 
-#endif // _SFX_SFXBASEMODEL_HXX_
+#endif // INCLUDED_SFX2_SFXBASEMODEL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/sfx2/sfxcommands.h b/include/sfx2/sfxcommands.h
index 4d4a9d3ac3df..63a4dc2c616b 100644
--- a/include/sfx2/sfxcommands.h
+++ b/include/sfx2/sfxcommands.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 SFX2_SFXCOMMANDS_HRC
-#define SFX2_SFXCOMMANDS_HRC
+#ifndef INCLUDED_SFX2_SFXCOMMANDS_H
+#define INCLUDED_SFX2_SFXCOMMANDS_H
 
 #define CMD_SID_ABOUT                               ".uno:About"
 #define CMD_SID_NEWDOC                              ".uno:NewDoc"
diff --git a/include/sfx2/sfxdefs.hxx b/include/sfx2/sfxdefs.hxx
index cca545f7e2f7..0e92214f68e8 100644
--- a/include/sfx2/sfxdefs.hxx
+++ b/include/sfx2/sfxdefs.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SFXDEFS_HXX
-#define _SFXDEFS_HXX
+#ifndef INCLUDED_SFX2_SFXDEFS_HXX
+#define INCLUDED_SFX2_SFXDEFS_HXX
 
 #define SfxFilterFlags sal_uLong
 
diff --git a/include/sfx2/sfxdlg.hxx b/include/sfx2/sfxdlg.hxx
index 1d809fdd598a..6ab744c2594a 100644
--- a/include/sfx2/sfxdlg.hxx
+++ b/include/sfx2/sfxdlg.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 _SFX2_DIALOG_HXX
-#define _SFX2_DIALOG_HXX
+#ifndef INCLUDED_SFX2_SFXDLG_HXX
+#define INCLUDED_SFX2_SFXDLG_HXX
 
 #include "sal/config.h"
 #include "sfx2/dllapi.h"
diff --git a/include/sfx2/sfxhelp.hxx b/include/sfx2/sfxhelp.hxx
index b92bc9dd66ab..9ab5b5d8cfd3 100644
--- a/include/sfx2/sfxhelp.hxx
+++ b/include/sfx2/sfxhelp.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 _SFX_HELP_HXX
-#define _SFX_HELP_HXX
+#ifndef INCLUDED_SFX2_SFXHELP_HXX
+#define INCLUDED_SFX2_SFXHELP_HXX
 
 #include <rtl/ustring.hxx>
 #include "sal/config.h"
@@ -55,6 +55,6 @@ public:
     static OUString         GetCurrentModuleIdentifier();
 };
 
-#endif // #ifndef _SFX_HELP_HXX
+#endif // INCLUDED_SFX2_SFXHELP_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/sfx2/sfxhtml.hxx b/include/sfx2/sfxhtml.hxx
index 77035ce0ba75..ced819c01c14 100644
--- a/include/sfx2/sfxhtml.hxx
+++ b/include/sfx2/sfxhtml.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SFXHTML_HXX
-#define _SFXHTML_HXX
+#ifndef INCLUDED_SFX2_SFXHTML_HXX
+#define INCLUDED_SFX2_SFXHTML_HXX
 
 #include "sal/config.h"
 #include "sfx2/dllapi.h"
diff --git a/include/sfx2/sfxmodelfactory.hxx b/include/sfx2/sfxmodelfactory.hxx
index 612aea61d07e..b4dccc202c51 100644
--- a/include/sfx2/sfxmodelfactory.hxx
+++ b/include/sfx2/sfxmodelfactory.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef SFX2_SFXMODELFACTORY_HXX
-#define SFX2_SFXMODELFACTORY_HXX
+#ifndef INCLUDED_SFX2_SFXMODELFACTORY_HXX
+#define INCLUDED_SFX2_SFXMODELFACTORY_HXX
 
 #include "sfx2/dllapi.h"
 
@@ -62,6 +62,6 @@ namespace sfx2
 } // namespace sfx2
 //........................................................................
 
-#endif // SFX2_SFXMODELFACTORY_HXX
+#endif // INCLUDED_SFX2_SFXMODELFACTORY_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/sfx2/sfxresid.hxx b/include/sfx2/sfxresid.hxx
index f90221847579..c3ea0689e163 100644
--- a/include/sfx2/sfxresid.hxx
+++ b/include/sfx2/sfxresid.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 _SFX_SFXRESID_HXX
-#define _SFX_SFXRESID_HXX
+#ifndef INCLUDED_SFX2_SFXRESID_HXX
+#define INCLUDED_SFX2_SFXRESID_HXX
 
 #include "sfx2/dllapi.h"
 #include <tools/resid.hxx>
diff --git a/include/sfx2/sfxstatuslistener.hxx b/include/sfx2/sfxstatuslistener.hxx
index 9913b911ffed..a466b2f08f06 100644
--- a/include/sfx2/sfxstatuslistener.hxx
+++ b/include/sfx2/sfxstatuslistener.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SFXSTATUSLISTENER_HXX
-#define _SFXSTATUSLISTENER_HXX
+#ifndef INCLUDED_SFX2_SFXSTATUSLISTENER_HXX
+#define INCLUDED_SFX2_SFXSTATUSLISTENER_HXX
 
 #include "sal/config.h"
 #include "sfx2/dllapi.h"
@@ -80,6 +80,6 @@ class SFX2_DLLPUBLIC SfxStatusListener : public ::cppu::WeakImplHelper2<
         ::com::sun::star::uno::Reference< com::sun::star::frame::XDispatch >            m_xDispatch;
 };
 
-#endif // _SFXSTATUSLISTENER_HXX
+#endif // INCLUDED_SFX2_SFXSTATUSLISTENER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/sfx2/sfxuno.hxx b/include/sfx2/sfxuno.hxx
index 70029b1d9228..b926f9890e04 100644
--- a/include/sfx2/sfxuno.hxx
+++ b/include/sfx2/sfxuno.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SFX_SFXUNO_HXX
-#define _SFX_SFXUNO_HXX
+#ifndef INCLUDED_SFX2_SFXUNO_HXX
+#define INCLUDED_SFX2_SFXUNO_HXX
 
 #include "sal/config.h"
 #include "sfx2/dllapi.h"
@@ -277,6 +277,6 @@ typedef sal_Int32 FrameSearchFlags;
         CREATEFACTORY ( CLASS )                                                                                         \
     }
 
-#endif // _SFX_SFXUNO_HXX
+#endif // INCLUDED_SFX2_SFXUNO_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/sfx2/shell.hxx b/include/sfx2/shell.hxx
index 7bde39f915da..93e2e782b7dc 100644
--- a/include/sfx2/shell.hxx
+++ b/include/sfx2/shell.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 _SFX_SHELL_HXX
-#define _SFX_SHELL_HXX
+#ifndef INCLUDED_SFX2_SHELL_HXX
+#define INCLUDED_SFX2_SHELL_HXX
 
 #include <com/sun/star/embed/VerbDescriptor.hpp>
 #include <rtl/ustring.hxx>
diff --git a/include/sfx2/sidebar/CommandInfoProvider.hxx b/include/sfx2/sidebar/CommandInfoProvider.hxx
index 412455d4e0a7..fdfb26a581a2 100644
--- a/include/sfx2/sidebar/CommandInfoProvider.hxx
+++ b/include/sfx2/sidebar/CommandInfoProvider.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 SIDEBAR_COMMAND_INFO_PROVIDER_HXX
-#define SIDEBAR_COMMAND_INFO_PROVIDER_HXX
+#ifndef INCLUDED_SFX2_SIDEBAR_COMMANDINFOPROVIDER_HXX
+#define INCLUDED_SFX2_SIDEBAR_COMMANDINFOPROVIDER_HXX
 
 #include "sfx2/dllapi.h"
 
diff --git a/include/sfx2/sidebar/ContextChangeBroadcaster.hxx b/include/sfx2/sidebar/ContextChangeBroadcaster.hxx
index b1012da342b8..923fb382fb69 100644
--- a/include/sfx2/sidebar/ContextChangeBroadcaster.hxx
+++ b/include/sfx2/sidebar/ContextChangeBroadcaster.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 SFX_SIDEBAR_CONTEXT_CHANGE_BROADCASTER_HXX
-#define SFX_SIDEBAR_CONTEXT_CHANGE_BROADCASTER_HXX
+#ifndef INCLUDED_SFX2_SIDEBAR_CONTEXTCHANGEBROADCASTER_HXX
+#define INCLUDED_SFX2_SIDEBAR_CONTEXTCHANGEBROADCASTER_HXX
 
 #include <com/sun/star/frame/XFrame.hpp>
 
diff --git a/include/sfx2/sidebar/ControlFactory.hxx b/include/sfx2/sidebar/ControlFactory.hxx
index af6d77121360..aebb0b348eb4 100644
--- a/include/sfx2/sidebar/ControlFactory.hxx
+++ b/include/sfx2/sidebar/ControlFactory.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 SFX_SIDEBAR_CONTROL_FACTORY_HXX
-#define SFX_SIDEBAR_CONTROL_FACTORY_HXX
+#ifndef INCLUDED_SFX2_SIDEBAR_CONTROLFACTORY_HXX
+#define INCLUDED_SFX2_SIDEBAR_CONTROLFACTORY_HXX
 
 #include <sfx2/dllapi.h>
 #include <sfx2/sidebar/SidebarToolBox.hxx>
diff --git a/include/sfx2/sidebar/ControllerFactory.hxx b/include/sfx2/sidebar/ControllerFactory.hxx
index 97d32a44ad6d..4871ce048f9c 100644
--- a/include/sfx2/sidebar/ControllerFactory.hxx
+++ b/include/sfx2/sidebar/ControllerFactory.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 SFX_SIDEBAR_CONTROLLER_FACTORY_HXX
-#define SFX_SIDEBAR_CONTROLLER_FACTORY_HXX
+#ifndef INCLUDED_SFX2_SIDEBAR_CONTROLLERFACTORY_HXX
+#define INCLUDED_SFX2_SIDEBAR_CONTROLLERFACTORY_HXX
 
 #include "sfx2/dllapi.h"
 #include <com/sun/star/awt/XWindow.hpp>
diff --git a/include/sfx2/sidebar/ControllerItem.hxx b/include/sfx2/sidebar/ControllerItem.hxx
index 8b889e64e3e0..858bf5d990fb 100644
--- a/include/sfx2/sidebar/ControllerItem.hxx
+++ b/include/sfx2/sidebar/ControllerItem.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 SVX_SIDEBAR_CONTROLLER_ITEM_HXX
-#define SVX_SIDEBAR_CONTROLLER_ITEM_HXX
+#ifndef INCLUDED_SFX2_SIDEBAR_CONTROLLERITEM_HXX
+#define INCLUDED_SFX2_SIDEBAR_CONTROLLERITEM_HXX
 
 #include <sfx2/ctrlitem.hxx>
 
diff --git a/include/sfx2/sidebar/EnumContext.hxx b/include/sfx2/sidebar/EnumContext.hxx
index 53292fecfea8..1b80a9f42663 100644
--- a/include/sfx2/sidebar/EnumContext.hxx
+++ b/include/sfx2/sidebar/EnumContext.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 SFX_SIDEBAR_ENUM_CONTEXT_HXX
-#define SFX_SIDEBAR_ENUM_CONTEXT_HXX
+#ifndef INCLUDED_SFX2_SIDEBAR_ENUMCONTEXT_HXX
+#define INCLUDED_SFX2_SIDEBAR_ENUMCONTEXT_HXX
 
 #include "sfx2/dllapi.h"
 
diff --git a/include/sfx2/sidebar/IContextChangeReceiver.hxx b/include/sfx2/sidebar/IContextChangeReceiver.hxx
index e926045eace9..37ccc103197e 100644
--- a/include/sfx2/sidebar/IContextChangeReceiver.hxx
+++ b/include/sfx2/sidebar/IContextChangeReceiver.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 SFX_SIDEBAR_CONTEXT_CHANGE_RECEIVER_INTERFACE_HXX
-#define SFX_SIDEBAR_CONTEXT_CHANGE_RECEIVER_INTERFACE_HXX
+#ifndef INCLUDED_SFX2_SIDEBAR_ICONTEXTCHANGERECEIVER_HXX
+#define INCLUDED_SFX2_SIDEBAR_ICONTEXTCHANGERECEIVER_HXX
 
 #include "EnumContext.hxx"
 #include "sfx2/dllapi.h"
diff --git a/include/sfx2/sidebar/ILayoutableWindow.hxx b/include/sfx2/sidebar/ILayoutableWindow.hxx
index c0415af8f81d..9a3d85debd11 100644
--- a/include/sfx2/sidebar/ILayoutableWindow.hxx
+++ b/include/sfx2/sidebar/ILayoutableWindow.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 SFX_SIDEBAR_LAYOUTABLE_WINDOW_INTERFACE_HXX
-#define SFX_SIDEBAR_LAYOUTABLE_WINDOW_INTERFACE_HXX
+#ifndef INCLUDED_SFX2_SIDEBAR_ILAYOUTABLEWINDOW_HXX
+#define INCLUDED_SFX2_SIDEBAR_ILAYOUTABLEWINDOW_HXX
 
 #include "sfx2/dllapi.h"
 #include <tools/gen.hxx>
diff --git a/include/sfx2/sidebar/PopupContainer.hxx b/include/sfx2/sidebar/PopupContainer.hxx
index 689f77c19a1e..622fb2eff1d0 100644
--- a/include/sfx2/sidebar/PopupContainer.hxx
+++ b/include/sfx2/sidebar/PopupContainer.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 SFX_SIDEBAR_POPUP_CONTAINER_HXX
-#define SFX_SIDEBAR_POPUP_CONTAINER_HXX
+#ifndef INCLUDED_SFX2_SIDEBAR_POPUPCONTAINER_HXX
+#define INCLUDED_SFX2_SIDEBAR_POPUPCONTAINER_HXX
 
 #include "sfx2/dllapi.h"
 #include <vcl/floatwin.hxx>
diff --git a/include/sfx2/sidebar/Sidebar.hxx b/include/sfx2/sidebar/Sidebar.hxx
index 458100ebb8b1..aac42b7a3a2a 100644
--- a/include/sfx2/sidebar/Sidebar.hxx
+++ b/include/sfx2/sidebar/Sidebar.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef SFX_SIDEBAR_SIDEBAR_HXX
-#define SFX_SIDEBAR_SIDEBAR_HXX
+#ifndef INCLUDED_SFX2_SIDEBAR_SIDEBAR_HXX
+#define INCLUDED_SFX2_SIDEBAR_SIDEBAR_HXX
 
 #include "sfx2/dllapi.h"
 #include <com/sun/star/frame/XFrame.hpp>
diff --git a/include/sfx2/sidebar/SidebarChildWindow.hxx b/include/sfx2/sidebar/SidebarChildWindow.hxx
index c78c17f64129..f74931b40c63 100644
--- a/include/sfx2/sidebar/SidebarChildWindow.hxx
+++ b/include/sfx2/sidebar/SidebarChildWindow.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 SFX_SIDEBAR_CHILD_WINDOW_HXX
-#define SFX_SIDEBAR_CHILD_WINDOW_HXX
+#ifndef INCLUDED_SFX2_SIDEBAR_SIDEBARCHILDWINDOW_HXX
+#define INCLUDED_SFX2_SIDEBAR_SIDEBARCHILDWINDOW_HXX
 
 #include "sfx2/childwin.hxx"
 
diff --git a/include/sfx2/sidebar/SidebarPanelBase.hxx b/include/sfx2/sidebar/SidebarPanelBase.hxx
index cab01ceaba42..e20fbbb8f575 100644
--- a/include/sfx2/sidebar/SidebarPanelBase.hxx
+++ b/include/sfx2/sidebar/SidebarPanelBase.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 SFX_SIDEBAR_PANEL_BASE_HXX
-#define SFX_SIDEBAR_PANEL_BASE_HXX
+#ifndef INCLUDED_SFX2_SIDEBAR_SIDEBARPANELBASE_HXX
+#define INCLUDED_SFX2_SIDEBAR_SIDEBARPANELBASE_HXX
 
 #include "EnumContext.hxx"
 #include "IContextChangeReceiver.hxx"
diff --git a/include/sfx2/sidebar/Theme.hxx b/include/sfx2/sidebar/Theme.hxx
index 098b63d7ed0c..069a8ab8ed47 100644
--- a/include/sfx2/sidebar/Theme.hxx
+++ b/include/sfx2/sidebar/Theme.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 SFX_SIDEBAR_THEME_HXX
-#define SFX_SIDEBAR_THEME_HXX
+#ifndef INCLUDED_SFX2_SIDEBAR_THEME_HXX
+#define INCLUDED_SFX2_SIDEBAR_THEME_HXX
 
 #include "sfx2/dllapi.h"
 
diff --git a/include/sfx2/sidebar/Tools.hxx b/include/sfx2/sidebar/Tools.hxx
index 1515d1b4ccbb..8ea20b6970a0 100644
--- a/include/sfx2/sidebar/Tools.hxx
+++ b/include/sfx2/sidebar/Tools.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 SFX_SIDEBAR_TOOLS_HXX
-#define SFX_SIDEBAR_TOOLS_HXX
+#ifndef INCLUDED_SFX2_SIDEBAR_TOOLS_HXX
+#define INCLUDED_SFX2_SIDEBAR_TOOLS_HXX
 
 #include <vcl/image.hxx>
 #include <vcl/gradient.hxx>
diff --git a/include/sfx2/signaturestate.hxx b/include/sfx2/signaturestate.hxx
index ff17355d2f48..0e795d5d5255 100644
--- a/include/sfx2/signaturestate.hxx
+++ b/include/sfx2/signaturestate.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef SFX2_SIGNATURESTATE_HXX
-#define SFX2_SIGNATURESTATE_HXX
+#ifndef INCLUDED_SFX2_SIGNATURESTATE_HXX
+#define INCLUDED_SFX2_SIGNATURESTATE_HXX
 
 // xmlsec05, check with SFX team
 #define SIGNATURESTATE_UNKNOWN                  (sal_Int16)(-1)
@@ -33,6 +33,6 @@
 //OOo 2.x - OOo 3.1.1. This state is only used  together with document signatures.
 #define SIGNATURESTATE_SIGNATURES_PARTIAL_OK    (sal_Int16)5
 
-#endif // SFX2_SIGNATURESTATE_HXX
+#endif // INCLUDED_SFX2_SIGNATURESTATE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/sfx2/stbitem.hxx b/include/sfx2/stbitem.hxx
index 0512c310d3b7..1c825703ef9b 100644
--- a/include/sfx2/stbitem.hxx
+++ b/include/sfx2/stbitem.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 _SFXSTBITEM_HXX
-#define _SFXSTBITEM_HXX
+#ifndef INCLUDED_SFX2_STBITEM_HXX
+#define INCLUDED_SFX2_STBITEM_HXX
 
 #include "sal/config.h"
 #include "sfx2/dllapi.h"
diff --git a/include/sfx2/styfitem.hxx b/include/sfx2/styfitem.hxx
index 69915308004f..8b0ed9b5eed7 100644
--- a/include/sfx2/styfitem.hxx
+++ b/include/sfx2/styfitem.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 _SFX_STYFITEM_HXX
-#define _SFX_STYFITEM_HXX
+#ifndef INCLUDED_SFX2_STYFITEM_HXX
+#define INCLUDED_SFX2_STYFITEM_HXX
 
 #include <rtl/ustring.hxx>
 #include <sal/config.h>
diff --git a/include/sfx2/tabdlg.hxx b/include/sfx2/tabdlg.hxx
index c6880d39e9ae..0828f9dea2f9 100644
--- a/include/sfx2/tabdlg.hxx
+++ b/include/sfx2/tabdlg.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 _SFXTABDLG_HXX
-#define _SFXTABDLG_HXX
+#ifndef INCLUDED_SFX2_TABDLG_HXX
+#define INCLUDED_SFX2_TABDLG_HXX
 
 #include "sal/config.h"
 #include "sfx2/dllapi.h"
diff --git a/include/sfx2/taskpane.hxx b/include/sfx2/taskpane.hxx
index 0e25fcef0e7a..ad6351205f05 100644
--- a/include/sfx2/taskpane.hxx
+++ b/include/sfx2/taskpane.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef SFX_TASKPANE_HXX
-#define SFX_TASKPANE_HXX
+#ifndef INCLUDED_SFX2_TASKPANE_HXX
+#define INCLUDED_SFX2_TASKPANE_HXX
 
 #include "sfx2/dllapi.h"
 #include "sfx2/childwin.hxx"
@@ -207,6 +207,6 @@ namespace sfx2
 } // namespace sfx2
 //......................................................................................................................
 
-#endif // SFX_TASKPANE_HXX
+#endif // INCLUDED_SFX2_TASKPANE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/sfx2/tbxctrl.hxx b/include/sfx2/tbxctrl.hxx
index 3d4037661a7d..9170f04de60b 100644
--- a/include/sfx2/tbxctrl.hxx
+++ b/include/sfx2/tbxctrl.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 _SFXTBXCTRL_HXX
-#define _SFXTBXCTRL_HXX
+#ifndef INCLUDED_SFX2_TBXCTRL_HXX
+#define INCLUDED_SFX2_TBXCTRL_HXX
 
 #include "sal/config.h"
 #include "sfx2/dllapi.h"
diff --git a/include/sfx2/templateabstractview.hxx b/include/sfx2/templateabstractview.hxx
index 962e75477762..fc2df865e954 100644
--- a/include/sfx2/templateabstractview.hxx
+++ b/include/sfx2/templateabstractview.hxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef __SFX2_TEMPLATEABSTRACTVIEW_HXX__
-#define __SFX2_TEMPLATEABSTRACTVIEW_HXX__
+#ifndef INCLUDED_SFX2_TEMPLATEABSTRACTVIEW_HXX
+#define INCLUDED_SFX2_TEMPLATEABSTRACTVIEW_HXX
 
 #include <sfx2/templateproperties.hxx>
 #include <sfx2/thumbnailview.hxx>
@@ -145,6 +145,6 @@ protected:
     Link maOpenTemplateHdl;
 };
 
-#endif // __SFX2_TEMPLATEABSTRACTVIEW_HXX__
+#endif // INCLUDED_SFX2_TEMPLATEABSTRACTVIEW_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/sfx2/templatecontaineritem.hxx b/include/sfx2/templatecontaineritem.hxx
index 9d69ddf57d2e..b33b3946e248 100644
--- a/include/sfx2/templatecontaineritem.hxx
+++ b/include/sfx2/templatecontaineritem.hxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef TEMPLATEFOLDERVIEWITEM_HXX
-#define TEMPLATEFOLDERVIEWITEM_HXX
+#ifndef INCLUDED_SFX2_TEMPLATECONTAINERITEM_HXX
+#define INCLUDED_SFX2_TEMPLATECONTAINERITEM_HXX
 
 #include <sfx2/templateproperties.hxx>
 #include <sfx2/thumbnailviewitem.hxx>
@@ -41,6 +41,6 @@ private:
     Rectangle maThumbnailArea;
 };
 
-#endif // TEMPLATEFOLDERVIEWITEM_HXX
+#endif // INCLUDED_SFX2_TEMPLATECONTAINERITEM_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/sfx2/templateinfodlg.hxx b/include/sfx2/templateinfodlg.hxx
index 69d79b20da9a..d064109736c0 100644
--- a/include/sfx2/templateinfodlg.hxx
+++ b/include/sfx2/templateinfodlg.hxx
@@ -7,8 +7,8 @@
 * file, You can obtain one at http://mozilla.org/MPL/2.0/.
 */
 
-#ifndef __SFX2_TEMPLATEINFODLG_HXX__
-#define __SFX2_TEMPLATEINFODLG_HXX__
+#ifndef INCLUDED_SFX2_TEMPLATEINFODLG_HXX
+#define INCLUDED_SFX2_TEMPLATEINFODLG_HXX
 
 #include <vcl/dialog.hxx>
 #include <vcl/button.hxx>
@@ -45,6 +45,6 @@ private:
     ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > xWindow;
 };
 
-#endif // __SFX2_TEMPLATEINFODLG_HXX__
+#endif // INCLUDED_SFX2_TEMPLATEINFODLG_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/sfx2/templatelocalview.hxx b/include/sfx2/templatelocalview.hxx
index 02cc26a352ab..5e065e774005 100644
--- a/include/sfx2/templatelocalview.hxx
+++ b/include/sfx2/templatelocalview.hxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef TEMPLATEFOLDERVIEW_HXX
-#define TEMPLATEFOLDERVIEW_HXX
+#ifndef INCLUDED_SFX2_TEMPLATELOCALVIEW_HXX
+#define INCLUDED_SFX2_TEMPLATELOCALVIEW_HXX
 
 #include <set>
 
@@ -102,6 +102,6 @@ private:
     std::vector<TemplateContainerItem* > maRegions;
 };
 
-#endif // TEMPLATEFOLDERVIEW_HXX
+#endif // INCLUDED_SFX2_TEMPLATELOCALVIEW_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/sfx2/templateproperties.hxx b/include/sfx2/templateproperties.hxx
index 493c092ad8b1..60a406595458 100644
--- a/include/sfx2/templateproperties.hxx
+++ b/include/sfx2/templateproperties.hxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef __SFX2_TEMPLATEPROPERTIES_HXX__
-#define __SFX2_TEMPLATEPROPERTIES_HXX__
+#ifndef INCLUDED_SFX2_TEMPLATEPROPERTIES_HXX
+#define INCLUDED_SFX2_TEMPLATEPROPERTIES_HXX
 
 #include <rtl/ustring.hxx>
 #include <vcl/bitmapex.hxx>
@@ -24,6 +24,6 @@ struct TemplateItemProperties
     BitmapEx aThumbnail;
 };
 
-#endif // __SFX2_TEMPLATEPROPERTIES_HXX__
+#endif // INCLUDED_SFX2_TEMPLATEPROPERTIES_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/sfx2/templateremoteview.hxx b/include/sfx2/templateremoteview.hxx
index bcb2b68fc0a4..7cf6fbb8acf4 100644
--- a/include/sfx2/templateremoteview.hxx
+++ b/include/sfx2/templateremoteview.hxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef __SFX2_TEMPLATEREMOTEVIEW_HXX__
-#define __SFX2_TEMPLATEREMOTEVIEW_HXX__
+#ifndef INCLUDED_SFX2_TEMPLATEREMOTEVIEW_HXX
+#define INCLUDED_SFX2_TEMPLATEREMOTEVIEW_HXX
 
 #include <sfx2/templateabstractview.hxx>
 #include <sfx2/templateproperties.hxx>
@@ -42,7 +42,7 @@ private:
     com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment > m_xCmdEnv;
 };
 
-#endif // __SFX2_TEMPLATEREMOTEVIEW_HXX__
+#endif // INCLUDED_SFX2_TEMPLATEREMOTEVIEW_HXX
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/sfx2/templaterepository.hxx b/include/sfx2/templaterepository.hxx
index f134c9897bf6..ac502f5d1eb8 100644
--- a/include/sfx2/templaterepository.hxx
+++ b/include/sfx2/templaterepository.hxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef __SFX2_TEMPLATEREPOSITORY_HXX__
-#define __SFX2_TEMPLATEREPOSITORY_HXX__
+#ifndef INCLUDED_SFX2_TEMPLATEREPOSITORY_HXX
+#define INCLUDED_SFX2_TEMPLATEREPOSITORY_HXX
 
 #include <sfx2/templateproperties.hxx>
 
@@ -41,6 +41,6 @@ private:
     std::vector<TemplateItemProperties> maTemplates;
 };
 
-#endif // __SFX2_TEMPLATEREPOSITORY_HXX__
+#endif // INCLUDED_SFX2_TEMPLATEREPOSITORY_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/sfx2/templateviewitem.hxx b/include/sfx2/templateviewitem.hxx
index 92d591995189..95b0abc79d51 100644
--- a/include/sfx2/templateviewitem.hxx
+++ b/include/sfx2/templateviewitem.hxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef TEMPLATEVIEWITEM_HXX
-#define TEMPLATEVIEWITEM_HXX
+#ifndef INCLUDED_SFX2_TEMPLATEVIEWITEM_HXX
+#define INCLUDED_SFX2_TEMPLATEVIEWITEM_HXX
 
 #include <sfx2/thumbnailviewitem.hxx>
 
@@ -56,6 +56,6 @@ private:
     Point maSubTitlePos;
 };
 
-#endif // TEMPLATEVIEWITEM_HXX
+#endif // INCLUDED_SFX2_TEMPLATEVIEWITEM_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/sfx2/thumbnailview.hxx b/include/sfx2/thumbnailview.hxx
index bfb08bc8b4fa..6ce43d550612 100644
--- a/include/sfx2/thumbnailview.hxx
+++ b/include/sfx2/thumbnailview.hxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef THUMBNAILVIEW_HXX
-#define THUMBNAILVIEW_HXX
+#ifndef INCLUDED_SFX2_THUMBNAILVIEW_HXX
+#define INCLUDED_SFX2_THUMBNAILVIEW_HXX
 
 #include "sfx2/dllapi.h"
 
@@ -344,6 +344,6 @@ protected:
     boost::function<bool (const ThumbnailViewItem*) > maFilterFunc;
 };
 
-#endif // THUMBNAILVIEW_HXX
+#endif // INCLUDED_SFX2_THUMBNAILVIEW_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/sfx2/thumbnailviewitem.hxx b/include/sfx2/thumbnailviewitem.hxx
index ea7bf933c637..fff3bdfc30f9 100644
--- a/include/sfx2/thumbnailviewitem.hxx
+++ b/include/sfx2/thumbnailviewitem.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef THUMBNAILVIEWITEM_HXX
-#define THUMBNAILVIEWITEM_HXX
+#ifndef INCLUDED_SFX2_THUMBNAILVIEWITEM_HXX
+#define INCLUDED_SFX2_THUMBNAILVIEWITEM_HXX
 
 #include <basegfx/vector/b2dvector.hxx>
 #include <drawinglayer/attribute/fontattribute.hxx>
@@ -129,6 +129,6 @@ protected:
     Rectangle maTextEditMaxArea;
 };
 
-#endif // THUMBNAILVIEWITEM_HXX
+#endif // INCLUDED_SFX2_THUMBNAILVIEWITEM_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/sfx2/titledockwin.hxx b/include/sfx2/titledockwin.hxx
index 5712d32ad614..7b43c6756da5 100644
--- a/include/sfx2/titledockwin.hxx
+++ b/include/sfx2/titledockwin.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef SFX_TITLEDOCKWIN_HXX
-#define SFX_TITLEDOCKWIN_HXX
+#ifndef INCLUDED_SFX2_TITLEDOCKWIN_HXX
+#define INCLUDED_SFX2_TITLEDOCKWIN_HXX
 
 #include "sfx2/dllapi.h"
 #include "sfx2/dockwin.hxx"
@@ -156,6 +156,6 @@ namespace sfx2
 } // namespace sfx2
 //......................................................................................................................
 
-#endif // SFX_TITLEDOCKWIN_HXX
+#endif // INCLUDED_SFX2_TITLEDOCKWIN_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/sfx2/unoctitm.hxx b/include/sfx2/unoctitm.hxx
index 321de229e340..2641c455566b 100644
--- a/include/sfx2/unoctitm.hxx
+++ b/include/sfx2/unoctitm.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 _SFX_UNOCTITM_HXX
-#define _SFX_UNOCTITM_HXX
+#ifndef INCLUDED_SFX2_UNOCTITM_HXX
+#define INCLUDED_SFX2_UNOCTITM_HXX
 
 #include <functional>
 #include <com/sun/star/frame/XNotifyingDispatch.hpp>
diff --git a/include/sfx2/userinputinterception.hxx b/include/sfx2/userinputinterception.hxx
index 7350314b4835..7f07511c8b8d 100644
--- a/include/sfx2/userinputinterception.hxx
+++ b/include/sfx2/userinputinterception.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef USERINPUTINTERCEPTION_HXX
-#define USERINPUTINTERCEPTION_HXX
+#ifndef INCLUDED_SFX2_USERINPUTINTERCEPTION_HXX
+#define INCLUDED_SFX2_USERINPUTINTERCEPTION_HXX
 
 #include "sfx2/dllapi.h"
 
@@ -70,6 +70,6 @@ namespace sfx2
 } // namespace sfx2
 //........................................................................
 
-#endif // USERINPUTINTERCEPTION_HXX
+#endif // INCLUDED_SFX2_USERINPUTINTERCEPTION_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/sfx2/viewfac.hxx b/include/sfx2/viewfac.hxx
index a4184c15dc2f..687be03d1b1a 100644
--- a/include/sfx2/viewfac.hxx
+++ b/include/sfx2/viewfac.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 _VIEWFAC_HXX
-#define _VIEWFAC_HXX
+#ifndef INCLUDED_SFX2_VIEWFAC_HXX
+#define INCLUDED_SFX2_VIEWFAC_HXX
 
 #include <rtl/ustring.hxx>
 #include <sal/config.h>
diff --git a/include/sfx2/viewfrm.hxx b/include/sfx2/viewfrm.hxx
index dce9b89c7e95..4c3b493d6714 100644
--- a/include/sfx2/viewfrm.hxx
+++ b/include/sfx2/viewfrm.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 _SFXVIEWFRM_HXX
-#define _SFXVIEWFRM_HXX
+#ifndef INCLUDED_SFX2_VIEWFRM_HXX
+#define INCLUDED_SFX2_VIEWFRM_HXX
 
 #include "sal/config.h"
 #include "sfx2/dllapi.h"
diff --git a/include/sfx2/viewsh.hxx b/include/sfx2/viewsh.hxx
index 17ae07be30ab..315ae17362af 100644
--- a/include/sfx2/viewsh.hxx
+++ b/include/sfx2/viewsh.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 _SFXVIEWSH_HXX
-#define _SFXVIEWSH_HXX
+#ifndef INCLUDED_SFX2_VIEWSH_HXX
+#define INCLUDED_SFX2_VIEWSH_HXX
 
 #include "sal/config.h"
 #include "sfx2/dllapi.h"
@@ -127,7 +127,7 @@ typedef ::std::vector< SfxInPlaceClient* > SfxInPlaceClientList;
 // -----------------------------------------------------------------------
 class SFX2_DLLPUBLIC SfxViewShell: public SfxShell, public SfxListener
 {
-#ifdef _SFXVIEWSH_HXX
+#ifdef INCLUDED_SFX2_VIEWSH_HXX
 friend class SfxViewFrame;
 friend class SfxBaseController;
 friend class SfxPrinterController;
@@ -337,7 +337,7 @@ inline SfxViewFrame* SfxViewShell::GetViewFrame() const
     return pFrame;
 }
 
-#endif // #ifndef _SFXVIEWSH_HXX
+#endif // INCLUDED_SFX2_VIEWSH_HXX
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/sfx2/zoomitem.hxx b/include/sfx2/zoomitem.hxx
index ab5c81c425aa..44c8082e034a 100644
--- a/include/sfx2/zoomitem.hxx
+++ b/include/sfx2/zoomitem.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 _SVX_ZOOMITEM_HXX
-#define _SVX_ZOOMITEM_HXX
+#ifndef INCLUDED_SFX2_ZOOMITEM_HXX
+#define INCLUDED_SFX2_ZOOMITEM_HXX
 
 #include <svl/intitem.hxx>
 #include <sfx2/sfxsids.hrc>