fixincludeguards.sh: sfx2

Change-Id: I135d03fa8926e0fdba977005e97452045861b2a4

97 files changed, 217 insertions, 217 deletions

diff --git a/sfx2/inc/arrdecl.hxx b/sfx2/inc/arrdecl.hxx
index 0cfdf6009c7b..1ce03bc03e79 100644
--- a/sfx2/inc/arrdecl.hxx
+++ b/sfx2/inc/arrdecl.hxx
@@ -16,8 +16,8 @@
  *   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_ARRDECL_HXX
-#define _SFX_ARRDECL_HXX
+#ifndef INCLUDED_SFX2_INC_ARRDECL_HXX
+#define INCLUDED_SFX2_INC_ARRDECL_HXX
 
 #include <vector>
 
diff --git a/sfx2/inc/backingcomp.hxx b/sfx2/inc/backingcomp.hxx
index 794e80dae296..d4d86fe784a6 100644
--- a/sfx2/inc/backingcomp.hxx
+++ b/sfx2/inc/backingcomp.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __SFX2_DIALOG_BACKINGCOMP_HXX_
-#define __SFX2_DIALOG_BACKINGCOMP_HXX_
+#ifndef INCLUDED_SFX2_INC_BACKINGCOMP_HXX
+#define INCLUDED_SFX2_INC_BACKINGCOMP_HXX
 
 #include <com/sun/star/lang/XTypeProvider.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
@@ -130,6 +130,6 @@ class BackingComp : public  css::lang::XTypeProvider
         static css::uno::Reference< css::lang::XSingleServiceFactory > SAL_CALL impl_createFactory                 ( const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR );
 };
 
-#endif // __SFX2_DIALOG_BACKINGCOMP_HXX_
+#endif // INCLUDED_SFX2_INC_BACKINGCOMP_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/bitset.hxx b/sfx2/inc/bitset.hxx
index bb2f8409893f..6fb04245e904 100644
--- a/sfx2/inc/bitset.hxx
+++ b/sfx2/inc/bitset.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SFXBITSET_HXX
-#define _SFXBITSET_HXX
+#ifndef INCLUDED_SFX2_INC_BITSET_HXX
+#define INCLUDED_SFX2_INC_BITSET_HXX
 
 #include <tools/solar.h>
 
diff --git a/sfx2/inc/bluthsndapi.hxx b/sfx2/inc/bluthsndapi.hxx
index 6a190d2b0d41..90dbe8b808bb 100644
--- a/sfx2/inc/bluthsndapi.hxx
+++ b/sfx2/inc/bluthsndapi.hxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef INCLUDED_SFX_BLUTHSNDAPI_HXX
-#define INCLUDED_SFX_BLUTHSNDAPI_HXX
+#ifndef INCLUDED_SFX2_INC_BLUTHSNDAPI_HXX
+#define INCLUDED_SFX2_INC_BLUTHSNDAPI_HXX
 
 #include <vector>
 #include <com/sun/star/frame/XFrame.hpp>
diff --git a/sfx2/inc/configmgr.hxx b/sfx2/inc/configmgr.hxx
index 15689d8dc7fe..402db2ac2e0a 100644
--- a/sfx2/inc/configmgr.hxx
+++ b/sfx2/inc/configmgr.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SFX_CONFIGMGR_HXX_
-#define _SFX_CONFIGMGR_HXX_
+#ifndef INCLUDED_SFX2_INC_CONFIGMGR_HXX
+#define INCLUDED_SFX2_INC_CONFIGMGR_HXX
 
 namespace utl{
     class ConfigManager;
diff --git a/sfx2/inc/frmload.hxx b/sfx2/inc/frmload.hxx
index a62ea316a1e7..f14690620cc6 100644
--- a/sfx2/inc/frmload.hxx
+++ b/sfx2/inc/frmload.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SFX_FRMLOAD_HXX
-#define _SFX_FRMLOAD_HXX
+#ifndef INCLUDED_SFX2_INC_FRMLOAD_HXX
+#define INCLUDED_SFX2_INC_FRMLOAD_HXX
 
 #include "sfx2/sfxuno.hxx"
 #include "sfx2/objsh.hxx"
diff --git a/sfx2/inc/fwkhelper.hxx b/sfx2/inc/fwkhelper.hxx
index 28391007c329..35a27dbd98fd 100644
--- a/sfx2/inc/fwkhelper.hxx
+++ b/sfx2/inc/fwkhelper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SFX_FWKHELPER_HXX_
-#define _SFX_FWKHELPER_HXX_
+#ifndef INCLUDED_SFX2_INC_FWKHELPER_HXX
+#define INCLUDED_SFX2_INC_FWKHELPER_HXX
 
 #include "sal/config.h"
 #include "sfx2/dllapi.h"
diff --git a/sfx2/inc/guisaveas.hxx b/sfx2/inc/guisaveas.hxx
index a6d6b7c7ba12..8bfa87653a55 100644
--- a/sfx2/inc/guisaveas.hxx
+++ b/sfx2/inc/guisaveas.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SFX_GUISAVEAS_HXX_
-#define _SFX_GUISAVEAS_HXX_
+#ifndef INCLUDED_SFX2_INC_GUISAVEAS_HXX
+#define INCLUDED_SFX2_INC_GUISAVEAS_HXX
 
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/beans/PropertyValue.hpp>
diff --git a/sfx2/inc/idpool.hxx b/sfx2/inc/idpool.hxx
index 1c67492a8483..eadcf39a4c60 100644
--- a/sfx2/inc/idpool.hxx
+++ b/sfx2/inc/idpool.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SFXIDPOOL_HXX
-#define _SFXIDPOOL_HXX
+#ifndef INCLUDED_SFX2_INC_IDPOOL_HXX
+#define INCLUDED_SFX2_INC_IDPOOL_HXX
 
 #include <limits.h>
 #include "bitset.hxx"
diff --git a/sfx2/inc/inettbc.hxx b/sfx2/inc/inettbc.hxx
index 5d1dc1f8b2d0..464bf8238606 100644
--- a/sfx2/inc/inettbc.hxx
+++ b/sfx2/inc/inettbc.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SFX_INETTBC_HXX
-#define _SFX_INETTBC_HXX
+#ifndef INCLUDED_SFX2_INC_INETTBC_HXX
+#define INCLUDED_SFX2_INC_INETTBC_HXX
 
 #include <rtl/ustring.hxx>
 #include <sfx2/tbxctrl.hxx>
diff --git a/sfx2/inc/sorgitm.hxx b/sfx2/inc/sorgitm.hxx
index 5c4c5a39118d..5bfa6ff3ff54 100644
--- a/sfx2/inc/sorgitm.hxx
+++ b/sfx2/inc/sorgitm.hxx
@@ -16,8 +16,8 @@
  *   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_SORGITM_HXX
-#define _SFX_SORGITM_HXX
+#ifndef INCLUDED_SFX2_INC_SORGITM_HXX
+#define INCLUDED_SFX2_INC_SORGITM_HXX
 
 #include <svl/stritem.hxx>
 
diff --git a/sfx2/inc/srchdlg.hxx b/sfx2/inc/srchdlg.hxx
index f6be4489a726..66ec03d99560 100644
--- a/sfx2/inc/srchdlg.hxx
+++ b/sfx2/inc/srchdlg.hxx
@@ -16,8 +16,8 @@
  *   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_SRCHDLG_HXX_
-#define _SFX_SRCHDLG_HXX_
+#ifndef INCLUDED_SFX2_INC_SRCHDLG_HXX
+#define INCLUDED_SFX2_INC_SRCHDLG_HXX
 
 #include <vcl/button.hxx>
 #include <vcl/combobox.hxx>
@@ -87,6 +87,6 @@ public:
 
 // ============================================================================
 
-#endif // _SFX_SRCHDLG_HXX_
+#endif // INCLUDED_SFX2_INC_SRCHDLG_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/templatedlg.hxx b/sfx2/inc/templatedlg.hxx
index 46c3a96fd16c..b36e96e7e02f 100644
--- a/sfx2/inc/templatedlg.hxx
+++ b/sfx2/inc/templatedlg.hxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef TEMPLATEDLG_HXX
-#define TEMPLATEDLG_HXX
+#ifndef INCLUDED_SFX2_INC_TEMPLATEDLG_HXX
+#define INCLUDED_SFX2_INC_TEMPLATEDLG_HXX
 
 #include <set>
 
@@ -162,6 +162,6 @@ private:
     std::vector<TemplateRepository*> maRepositories; ///< Stores the remote repositories for templates
 };
 
-#endif // TEMPLATEDLG_HXX
+#endif // INCLUDED_SFX2_INC_TEMPLATEDLG_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/appl/fileobj.hxx b/sfx2/source/appl/fileobj.hxx
index 9d6cbee2d2e7..c04500ce94bf 100644
--- a/sfx2/source/appl/fileobj.hxx
+++ b/sfx2/source/appl/fileobj.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _FILEOBJ_HXX
-#define _FILEOBJ_HXX
+#ifndef INCLUDED_SFX2_SOURCE_APPL_FILEOBJ_HXX
+#define INCLUDED_SFX2_SOURCE_APPL_FILEOBJ_HXX
 
 #include <sfx2/linksrc.hxx>
 #include <sfx2/docfile.hxx>
diff --git a/sfx2/source/appl/helpdispatch.hxx b/sfx2/source/appl/helpdispatch.hxx
index b4b772e3f7fa..f7c13215f970 100644
--- a/sfx2/source/appl/helpdispatch.hxx
+++ b/sfx2/source/appl/helpdispatch.hxx
@@ -16,8 +16,8 @@
  *   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_HELPDISPATCH_HXX
-#define SFX_HELPDISPATCH_HXX
+#ifndef INCLUDED_SFX2_SOURCE_APPL_HELPDISPATCH_HXX
+#define INCLUDED_SFX2_SOURCE_APPL_HELPDISPATCH_HXX
 
 #include <com/sun/star/frame/XDispatch.hpp>
 #include <cppuhelper/implbase1.hxx>
diff --git a/sfx2/source/appl/helpinterceptor.hxx b/sfx2/source/appl/helpinterceptor.hxx
index e2eebaa2bb1f..7b0ec31bb37b 100644
--- a/sfx2/source/appl/helpinterceptor.hxx
+++ b/sfx2/source/appl/helpinterceptor.hxx
@@ -16,8 +16,8 @@
  *   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_HELPINTERCEPTOR_HXX
-#define INCLUDED_SFX_HELPINTERCEPTOR_HXX
+#ifndef INCLUDED_SFX2_SOURCE_APPL_HELPINTERCEPTOR_HXX
+#define INCLUDED_SFX2_SOURCE_APPL_HELPINTERCEPTOR_HXX
 
 #include <cppuhelper/implbase3.hxx>
 #include <com/sun/star/frame/XDispatchProviderInterceptor.hpp>
@@ -157,6 +157,6 @@ public:
 };
 
 
-#endif // #ifndef INCLUDED_SFX_HELPINTERCEPTOR_HXX
+#endif // INCLUDED_SFX2_SOURCE_APPL_HELPINTERCEPTOR_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/appl/imestatuswindow.hxx b/sfx2/source/appl/imestatuswindow.hxx
index 4ab18a5841ce..69a4fe47a62d 100644
--- a/sfx2/source/appl/imestatuswindow.hxx
+++ b/sfx2/source/appl/imestatuswindow.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SFX2_APPL_IMESTATUSWINDOW_HXX
-#define INCLUDED_SFX2_APPL_IMESTATUSWINDOW_HXX
+#ifndef INCLUDED_SFX2_SOURCE_APPL_IMESTATUSWINDOW_HXX
+#define INCLUDED_SFX2_SOURCE_APPL_IMESTATUSWINDOW_HXX
 
 #include "com/sun/star/beans/XPropertyChangeListener.hpp"
 #include "com/sun/star/uno/Reference.hxx"
@@ -116,6 +116,6 @@ private:
 
 } }
 
-#endif // INCLUDED_SFX2_APPL_IMESTATUSWINDOW_HXX
+#endif // INCLUDED_SFX2_SOURCE_APPL_IMESTATUSWINDOW_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/appl/impldde.hxx b/sfx2/source/appl/impldde.hxx
index 46904573966b..79a0bd286072 100644
--- a/sfx2/source/appl/impldde.hxx
+++ b/sfx2/source/appl/impldde.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _IMPLDDE_HXX
-#define _IMPLDDE_HXX
+#ifndef INCLUDED_SFX2_SOURCE_APPL_IMPLDDE_HXX
+#define INCLUDED_SFX2_SOURCE_APPL_IMPLDDE_HXX
 
 #include <rtl/ustring.hxx>
 #include <sfx2/linksrc.hxx>
diff --git a/sfx2/source/appl/newhelp.hxx b/sfx2/source/appl/newhelp.hxx
index 3ae32c98ee0f..e62af43004f8 100644
--- a/sfx2/source/appl/newhelp.hxx
+++ b/sfx2/source/appl/newhelp.hxx
@@ -16,8 +16,8 @@
  *   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_NEWHELP_HXX
-#define INCLUDED_SFX_NEWHELP_HXX
+#ifndef INCLUDED_SFX2_SOURCE_APPL_NEWHELP_HXX
+#define INCLUDED_SFX2_SOURCE_APPL_NEWHELP_HXX
 
 #include <cppuhelper/implbase1.hxx>
 #include <com/sun/star/uno/Reference.h>
@@ -599,6 +599,6 @@ public:
 /// Appends ?Language=xy&System=abc to the help URL in rURL
 void AppendConfigToken(OUStringBuffer& rURL, sal_Bool bQuestionMark, const OUString &rLang = OUString());
 
-#endif // #ifndef INCLUDED_SFX_NEWHELP_HXX
+#endif // INCLUDED_SFX2_SOURCE_APPL_NEWHELP_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/appl/panelist.hxx b/sfx2/source/appl/panelist.hxx
index 3caef24bcb10..23f3d8db6436 100644
--- a/sfx2/source/appl/panelist.hxx
+++ b/sfx2/source/appl/panelist.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef SFX_PANELIST_HXX
-#define SFX_PANELIST_HXX
+#ifndef INCLUDED_SFX2_SOURCE_APPL_PANELIST_HXX
+#define INCLUDED_SFX2_SOURCE_APPL_PANELIST_HXX
 
 #include <vcl/taskpanelist.hxx>
 
diff --git a/sfx2/source/bastyp/fltlst.hxx b/sfx2/source/bastyp/fltlst.hxx
index 00155b8553e0..f61bb591ce2b 100644
--- a/sfx2/source/bastyp/fltlst.hxx
+++ b/sfx2/source/bastyp/fltlst.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SFX_FLTLST_HXX
-#define _SFX_FLTLST_HXX
+#ifndef INCLUDED_SFX2_SOURCE_BASTYP_FLTLST_HXX
+#define INCLUDED_SFX2_SOURCE_BASTYP_FLTLST_HXX
 
 #include <sfx2/fcontnr.hxx>
 #include <cppuhelper/implbase1.hxx>
@@ -48,6 +48,6 @@ class SfxFilterListener
 
 };
 
-#endif // _SFX_FLTLST_HXX
+#endif // INCLUDED_SFX2_SOURCE_BASTYP_FLTLST_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/control/thumbnailviewacc.hxx b/sfx2/source/control/thumbnailviewacc.hxx
index 6794ceca11bc..1e4f5823e636 100644
--- a/sfx2/source/control/thumbnailviewacc.hxx
+++ b/sfx2/source/control/thumbnailviewacc.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef THUMBNAILVIEWACC_HXX
-#define THUMBNAILVIEWACC_HXX
+#ifndef INCLUDED_SFX2_SOURCE_CONTROL_THUMBNAILVIEWACC_HXX
+#define INCLUDED_SFX2_SOURCE_CONTROL_THUMBNAILVIEWACC_HXX
 
 #include <osl/mutex.hxx>
 #include <cppuhelper/implbase5.hxx>
@@ -228,6 +228,6 @@ public:
     virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw( ::com::sun::star::uno::RuntimeException );
 };
 
-#endif // THUMBNAILVIEWACC_HXX
+#endif // INCLUDED_SFX2_SOURCE_CONTROL_THUMBNAILVIEWACC_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/dialog/backingwindow.hxx b/sfx2/source/dialog/backingwindow.hxx
index e03867d19b9f..7cb516a348a3 100644
--- a/sfx2/source/dialog/backingwindow.hxx
+++ b/sfx2/source/dialog/backingwindow.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef SFX2_BACKINGWINDOW_HXX
-#define SFX2_BACKINGWINDOW_HXX
+#ifndef INCLUDED_SFX2_SOURCE_DIALOG_BACKINGWINDOW_HXX
+#define INCLUDED_SFX2_SOURCE_DIALOG_BACKINGWINDOW_HXX
 
 #include <rtl/ustring.hxx>
 
diff --git a/sfx2/source/dialog/filedlgimpl.hxx b/sfx2/source/dialog/filedlgimpl.hxx
index 6173eaee8f08..d0dcb4658bbd 100644
--- a/sfx2/source/dialog/filedlgimpl.hxx
+++ b/sfx2/source/dialog/filedlgimpl.hxx
@@ -16,8 +16,8 @@
  *   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_FILEDLGIMPL_HXX
-#define _SFX_FILEDLGIMPL_HXX
+#ifndef INCLUDED_SFX2_SOURCE_DIALOG_FILEDLGIMPL_HXX
+#define INCLUDED_SFX2_SOURCE_DIALOG_FILEDLGIMPL_HXX
 
 #include <vcl/timer.hxx>
 #include <vcl/graph.hxx>
@@ -222,6 +222,6 @@ namespace sfx2
 
 }   // end of namespace sfx2
 
-#endif // _SFX_FILEDLGIMPL_HXX
+#endif // INCLUDED_SFX2_SOURCE_DIALOG_FILEDLGIMPL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/dialog/filtergrouping.hxx b/sfx2/source/dialog/filtergrouping.hxx
index 2112f6a58fb7..603e15de5e3d 100644
--- a/sfx2/source/dialog/filtergrouping.hxx
+++ b/sfx2/source/dialog/filtergrouping.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef SFX2_FILTERGROUPING_HXX
-#define SFX2_FILTERGROUPING_HXX
+#ifndef INCLUDED_SFX2_SOURCE_DIALOG_FILTERGROUPING_HXX
+#define INCLUDED_SFX2_SOURCE_DIALOG_FILTERGROUPING_HXX
 
 #include <com/sun/star/ui/dialogs/XFilterManager.hpp>
 #include <com/sun/star/container/XEnumeration.hpp>
@@ -91,7 +91,7 @@ namespace sfx2
 }   // namespace sfx2
 //........................................................................
 
-#endif // SFX2_FILTERGROUPING_HXX
+#endif // INCLUDED_SFX2_SOURCE_DIALOG_FILTERGROUPING_HXX
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/doc/doctemplateslocal.hxx b/sfx2/source/doc/doctemplateslocal.hxx
index e1e413856fa4..b52475180948 100644
--- a/sfx2/source/doc/doctemplateslocal.hxx
+++ b/sfx2/source/doc/doctemplateslocal.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SFX_DOCTEMPLATESLOCAL_HXX
-#define _SFX_DOCTEMPLATESLOCAL_HXX
+#ifndef INCLUDED_SFX2_SOURCE_DOC_DOCTEMPLATESLOCAL_HXX
+#define INCLUDED_SFX2_SOURCE_DOC_DOCTEMPLATESLOCAL_HXX
 
 #include <com/sun/star/xml/sax/XDocumentHandler.hpp>
 #include <com/sun/star/beans/StringPair.hpp>
diff --git a/sfx2/source/doc/graphhelp.hxx b/sfx2/source/doc/graphhelp.hxx
index de298ea3b86b..4fd29960feaf 100644
--- a/sfx2/source/doc/graphhelp.hxx
+++ b/sfx2/source/doc/graphhelp.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef SFX_GRAPHHELP_HXX
-#define SFX_GRAPHHELP_HXX
+#ifndef INCLUDED_SFX2_SOURCE_DOC_GRAPHHELP_HXX
+#define INCLUDED_SFX2_SOURCE_DOC_GRAPHHELP_HXX
 
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/io/XStream.hpp>
diff --git a/sfx2/source/doc/oleprops.hxx b/sfx2/source/doc/oleprops.hxx
index d69c58ec6679..76d161955406 100644
--- a/sfx2/source/doc/oleprops.hxx
+++ b/sfx2/source/doc/oleprops.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef SFX_OLEPROPS_HXX
-#define SFX_OLEPROPS_HXX
+#ifndef INCLUDED_SFX2_SOURCE_DOC_OLEPROPS_HXX
+#define INCLUDED_SFX2_SOURCE_DOC_OLEPROPS_HXX
 
 #include <map>
 #include <boost/shared_ptr.hpp>
diff --git a/sfx2/source/doc/printhelper.hxx b/sfx2/source/doc/printhelper.hxx
index 997768955abf..1ef8bd8db42a 100644
--- a/sfx2/source/doc/printhelper.hxx
+++ b/sfx2/source/doc/printhelper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef SFX_PRINTHELPER_HXX
-#define SFX_PRINTHELPER_HXX
+#ifndef INCLUDED_SFX2_SOURCE_DOC_PRINTHELPER_HXX
+#define INCLUDED_SFX2_SOURCE_DOC_PRINTHELPER_HXX
 
 #include "sal/config.h"
 #include "sfx2/dllapi.h"
diff --git a/sfx2/source/doc/querytemplate.hxx b/sfx2/source/doc/querytemplate.hxx
index b5ef5b70c580..e2d229b791f5 100644
--- a/sfx2/source/doc/querytemplate.hxx
+++ b/sfx2/source/doc/querytemplate.hxx
@@ -16,8 +16,8 @@
  *   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_QUERYTEMPLATE_HXX
-#define _SFX2_QUERYTEMPLATE_HXX
+#ifndef INCLUDED_SFX2_SOURCE_DOC_QUERYTEMPLATE_HXX
+#define INCLUDED_SFX2_SOURCE_DOC_QUERYTEMPLATE_HXX
 
 #include <vcl/msgbox.hxx>
 
diff --git a/sfx2/source/doc/sfxacldetect.hxx b/sfx2/source/doc/sfxacldetect.hxx
index a46fc1d98116..994e18bd88b6 100644
--- a/sfx2/source/doc/sfxacldetect.hxx
+++ b/sfx2/source/doc/sfxacldetect.hxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef __SFXACLDETECT_HXX__
-#define __SFXACLDETECT_HXX__
+#ifndef INCLUDED_SFX2_SOURCE_DOC_SFXACLDETECT_HXX
+#define INCLUDED_SFX2_SOURCE_DOC_SFXACLDETECT_HXX
 
 // Let's check if this extra ACL check is still necessary...  If disabling it
 // causes no regressions, then we can safely remove this code.
diff --git a/sfx2/source/doc/syspath.hxx b/sfx2/source/doc/syspath.hxx
index f3690ac13703..169c85a27817 100644
--- a/sfx2/source/doc/syspath.hxx
+++ b/sfx2/source/doc/syspath.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __SYSPATH_HXX__
-#define __SYSPATH_HXX__
+#ifndef INCLUDED_SFX2_SOURCE_DOC_SYSPATH_HXX
+#define INCLUDED_SFX2_SOURCE_DOC_SYSPATH_HXX
 //#pragma warning(disable:4917)
 
 #include <sfx2/dllapi.h>
diff --git a/sfx2/source/inc/SfxDocumentMetaData.hxx b/sfx2/source/inc/SfxDocumentMetaData.hxx
index 2f7ad4ad12f5..647868c9431a 100644
--- a/sfx2/source/inc/SfxDocumentMetaData.hxx
+++ b/sfx2/source/inc/SfxDocumentMetaData.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SFXDOCUMENTMETADATA_HXX
-#define _SFXDOCUMENTMETADATA_HXX
+#ifndef INCLUDED_SFX2_SOURCE_INC_SFXDOCUMENTMETADATA_HXX
+#define INCLUDED_SFX2_SOURCE_INC_SFXDOCUMENTMETADATA_HXX
 
 #include "sal/config.h"
 #include "cppuhelper/factory.hxx"
diff --git a/sfx2/source/inc/alienwarn.hxx b/sfx2/source/inc/alienwarn.hxx
index dd5805c39924..722115879ca5 100644
--- a/sfx2/source/inc/alienwarn.hxx
+++ b/sfx2/source/inc/alienwarn.hxx
@@ -16,8 +16,8 @@
  *   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_ALIENWARN_HXX
-#define _SFX_ALIENWARN_HXX
+#ifndef INCLUDED_SFX2_SOURCE_INC_ALIENWARN_HXX
+#define INCLUDED_SFX2_SOURCE_INC_ALIENWARN_HXX
 
 #include <vcl/button.hxx>
 #include <vcl/fixed.hxx>
@@ -42,6 +42,6 @@ public:
     virtual ~SfxAlienWarningDialog();
 };
 
-#endif // #ifndef _SFX_ALIENWARN_HXX
+#endif // INCLUDED_SFX2_SOURCE_INC_ALIENWARN_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/inc/appbas.hxx b/sfx2/source/inc/appbas.hxx
index 9443afde6bd5..578370d20978 100644
--- a/sfx2/source/inc/appbas.hxx
+++ b/sfx2/source/inc/appbas.hxx
@@ -16,8 +16,8 @@
  *   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_APPBAS_HXX
-#define _SFX_APPBAS_HXX
+#ifndef INCLUDED_SFX2_SOURCE_INC_APPBAS_HXX
+#define INCLUDED_SFX2_SOURCE_INC_APPBAS_HXX
 
 
 #include <basic/sbxdef.hxx>
diff --git a/sfx2/source/inc/appbaslib.hxx b/sfx2/source/inc/appbaslib.hxx
index afec42ee9107..8c471224574c 100644
--- a/sfx2/source/inc/appbaslib.hxx
+++ b/sfx2/source/inc/appbaslib.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef APPBASLIB_HXX
-#define APPBASLIB_HXX
+#ifndef INCLUDED_SFX2_SOURCE_INC_APPBASLIB_HXX
+#define INCLUDED_SFX2_SOURCE_INC_APPBASLIB_HXX
 
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
@@ -123,6 +123,6 @@ public:
 
 };
 
-#endif // APPBASLIB_HXX
+#endif // INCLUDED_SFX2_SOURCE_INC_APPBASLIB_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/inc/appdata.hxx b/sfx2/source/inc/appdata.hxx
index cdd66809ae18..b9e287b0ff53 100644
--- a/sfx2/source/inc/appdata.hxx
+++ b/sfx2/source/inc/appdata.hxx
@@ -16,8 +16,8 @@
  *   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_APPDATA_HXX
-#define _SFX_APPDATA_HXX
+#ifndef INCLUDED_SFX2_SOURCE_INC_APPDATA_HXX
+#define INCLUDED_SFX2_SOURCE_INC_APPDATA_HXX
 
 #include <rtl/ref.hxx>
 #include <rtl/ustring.hxx>
@@ -157,7 +157,7 @@ public:
     void                        OnApplicationBasicManagerCreated( BasicManager& _rManager );
 };
 
-#endif // #ifndef _SFX_APPDATA_HXX
+#endif // INCLUDED_SFX2_SOURCE_INC_APPDATA_HXX
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/inc/doctemplates.hxx b/sfx2/source/inc/doctemplates.hxx
index 99a1b94863e4..7294a4bc5031 100644
--- a/sfx2/source/inc/doctemplates.hxx
+++ b/sfx2/source/inc/doctemplates.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SFX_DOCTEMPLATES_HXX_
-#define _SFX_DOCTEMPLATES_HXX_
+#ifndef INCLUDED_SFX2_SOURCE_INC_DOCTEMPLATES_HXX
+#define INCLUDED_SFX2_SOURCE_INC_DOCTEMPLATES_HXX
 
 #include <cppuhelper/weak.hxx>
 #include <cppuhelper/implbase3.hxx>
diff --git a/sfx2/source/inc/documentfontsdialog.hxx b/sfx2/source/inc/documentfontsdialog.hxx
index 1f0c56038e0d..a5f606a48246 100644
--- a/sfx2/source/inc/documentfontsdialog.hxx
+++ b/sfx2/source/inc/documentfontsdialog.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef SW_DOCUMENTFONTSDIALOG_HXX
-#define SW_DOCUMENTFONTSDIALOG_HXX
+#ifndef INCLUDED_SFX2_SOURCE_INC_DOCUMENTFONTSDIALOG_HXX
+#define INCLUDED_SFX2_SOURCE_INC_DOCUMENTFONTSDIALOG_HXX
 
 #include <sfx2/tabdlg.hxx>
 
diff --git a/sfx2/source/inc/docundomanager.hxx b/sfx2/source/inc/docundomanager.hxx
index 569fdb7ff509..b5175e0c1ce9 100644
--- a/sfx2/source/inc/docundomanager.hxx
+++ b/sfx2/source/inc/docundomanager.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef DOCUMENT_UNDO_MANAGER_HXX
-#define DOCUMENT_UNDO_MANAGER_HXX
+#ifndef INCLUDED_SFX2_SOURCE_INC_DOCUNDOMANAGER_HXX
+#define INCLUDED_SFX2_SOURCE_INC_DOCUNDOMANAGER_HXX
 
 #include "sfx2/sfxbasemodel.hxx"
 
@@ -99,6 +99,6 @@ namespace sfx2
 } // namespace sfx2
 //......................................................................................................................
 
-#endif // DOCUMENT_UNDO_MANAGER_HXX
+#endif // INCLUDED_SFX2_SOURCE_INC_DOCUNDOMANAGER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/inc/eventsupplier.hxx b/sfx2/source/inc/eventsupplier.hxx
index 56d477427f34..2465ca8919fa 100644
--- a/sfx2/source/inc/eventsupplier.hxx
+++ b/sfx2/source/inc/eventsupplier.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SFX_EVENTSUPPLIER_HXX_
-#define _SFX_EVENTSUPPLIER_HXX_
+#ifndef INCLUDED_SFX2_SOURCE_INC_EVENTSUPPLIER_HXX
+#define INCLUDED_SFX2_SOURCE_INC_EVENTSUPPLIER_HXX
 
 #include <com/sun/star/lang/XTypeProvider.hpp>
 #include <com/sun/star/container/XNameReplace.hpp>
diff --git a/sfx2/source/inc/fltoptint.hxx b/sfx2/source/inc/fltoptint.hxx
index 4530fcbcd1b7..2770bb226995 100644
--- a/sfx2/source/inc/fltoptint.hxx
+++ b/sfx2/source/inc/fltoptint.hxx
@@ -16,8 +16,8 @@
  *   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_FLTOPTINT_HXX
-#define SFX2_FLTOPTINT_HXX
+#ifndef INCLUDED_SFX2_SOURCE_INC_FLTOPTINT_HXX
+#define INCLUDED_SFX2_SOURCE_INC_FLTOPTINT_HXX
 
 #include <com/sun/star/document/FilterOptionsRequest.hpp>
 #include <com/sun/star/document/XInteractionFilterOptions.hpp>
diff --git a/sfx2/source/inc/helper.hxx b/sfx2/source/inc/helper.hxx
index 65bd80db152a..382fa1dce4f6 100644
--- a/sfx2/source/inc/helper.hxx
+++ b/sfx2/source/inc/helper.hxx
@@ -16,8 +16,8 @@
  *   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_HELPER_HXX
-#define _SFX_HELPER_HXX
+#ifndef INCLUDED_SFX2_SOURCE_INC_HELPER_HXX
+#define INCLUDED_SFX2_SOURCE_INC_HELPER_HXX
 
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/ucb/NameClash.hpp>
@@ -39,7 +39,7 @@ public:
     static sal_Int64 GetSize( const OUString& rContent );
 };
 
-#endif // #ifndef _SFX_HELPER_HXX
+#endif // INCLUDED_SFX2_SOURCE_INC_HELPER_HXX
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/inc/iframe.hxx b/sfx2/source/inc/iframe.hxx
index 965550de57bf..5e2f36244707 100644
--- a/sfx2/source/inc/iframe.hxx
+++ b/sfx2/source/inc/iframe.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SFX_IFRAME_HXX
-#define _SFX_IFRAME_HXX
+#ifndef INCLUDED_SFX2_SOURCE_INC_IFRAME_HXX
+#define INCLUDED_SFX2_SOURCE_INC_IFRAME_HXX
 
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
diff --git a/sfx2/source/inc/inputdlg.hxx b/sfx2/source/inc/inputdlg.hxx
index 6cc8b01becdc..932fc3da50d0 100644
--- a/sfx2/source/inc/inputdlg.hxx
+++ b/sfx2/source/inc/inputdlg.hxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef INPUTDLG_HXX
-#define INPUTDLG_HXX
+#ifndef INCLUDED_SFX2_SOURCE_INC_INPUTDLG_HXX
+#define INCLUDED_SFX2_SOURCE_INC_INPUTDLG_HXX
 
 #include <vcl/dialog.hxx>
 
@@ -38,6 +38,6 @@ private:
     PushButton *mpCancel;
 };
 
-#endif // INPUTDLG_HXX
+#endif // INCLUDED_SFX2_SOURCE_INC_INPUTDLG_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/inc/nochaos.hxx b/sfx2/source/inc/nochaos.hxx
index 867397106e6c..a9b5c809f4d3 100644
--- a/sfx2/source/inc/nochaos.hxx
+++ b/sfx2/source/inc/nochaos.hxx
@@ -16,8 +16,8 @@
  *   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_NOCHAOS_HXX
-#define _SFX_NOCHAOS_HXX
+#ifndef INCLUDED_SFX2_SOURCE_INC_NOCHAOS_HXX
+#define INCLUDED_SFX2_SOURCE_INC_NOCHAOS_HXX
 
 class SfxItemPool;
 
diff --git a/sfx2/source/inc/objshimp.hxx b/sfx2/source/inc/objshimp.hxx
index 9c396d13efba..5fef7424e180 100644
--- a/sfx2/source/inc/objshimp.hxx
+++ b/sfx2/source/inc/objshimp.hxx
@@ -16,8 +16,8 @@
  *   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_OBJSHIMP_HXX
-#define _SFX_OBJSHIMP_HXX
+#ifndef INCLUDED_SFX2_SOURCE_INC_OBJSHIMP_HXX
+#define INCLUDED_SFX2_SOURCE_INC_OBJSHIMP_HXX
 
 #include <com/sun/star/frame/XModel.hpp>
 #include <com/sun/star/uno/Sequence.hxx>
diff --git a/sfx2/source/inc/openflag.hxx b/sfx2/source/inc/openflag.hxx
index aca735aa4fb2..ecfb51884a54 100644
--- a/sfx2/source/inc/openflag.hxx
+++ b/sfx2/source/inc/openflag.hxx
@@ -16,8 +16,8 @@
  *   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_OPENFLAG_HXX
-#define _SFX_OPENFLAG_HXX
+#ifndef INCLUDED_SFX2_SOURCE_INC_OPENFLAG_HXX
+#define INCLUDED_SFX2_SOURCE_INC_OPENFLAG_HXX
 
 // Open file for editing, then only the third option (reading a copy) works
 #define SFX_STREAM_READWRITE  (STREAM_READWRITE |  STREAM_SHARE_DENYWRITE)
diff --git a/sfx2/source/inc/ownsubfilterservice.hxx b/sfx2/source/inc/ownsubfilterservice.hxx
index baea7d948171..3a2be4f1685f 100644
--- a/sfx2/source/inc/ownsubfilterservice.hxx
+++ b/sfx2/source/inc/ownsubfilterservice.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _OWNSUBFILTERSERVICE_HXX_
-#define _OWNSUBFILTERSERVICE_HXX_
+#ifndef INCLUDED_SFX2_SOURCE_INC_OWNSUBFILTERSERVICE_HXX
+#define INCLUDED_SFX2_SOURCE_INC_OWNSUBFILTERSERVICE_HXX
 
 #include <com/sun/star/document/XFilter.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
diff --git a/sfx2/source/inc/partwnd.hxx b/sfx2/source/inc/partwnd.hxx
index 22fafa3ed6c7..7dd94611bf55 100644
--- a/sfx2/source/inc/partwnd.hxx
+++ b/sfx2/source/inc/partwnd.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _PARTWND_HXX
-#define _PARTWND_HXX
+#ifndef INCLUDED_SFX2_SOURCE_INC_PARTWND_HXX
+#define INCLUDED_SFX2_SOURCE_INC_PARTWND_HXX
 
 #include <com/sun/star/uno/Reference.h>
 
diff --git a/sfx2/source/inc/plugin.hxx b/sfx2/source/inc/plugin.hxx
index ee1fe4adb278..c304435e7a11 100644
--- a/sfx2/source/inc/plugin.hxx
+++ b/sfx2/source/inc/plugin.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SFX_PLUGIN_HXX
-#define _SFX_PLUGIN_HXX
+#ifndef INCLUDED_SFX2_SOURCE_INC_PLUGIN_HXX
+#define INCLUDED_SFX2_SOURCE_INC_PLUGIN_HXX
 
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
diff --git a/sfx2/source/inc/preview.hxx b/sfx2/source/inc/preview.hxx
index 62adb20318c6..19dd4a58a235 100644
--- a/sfx2/source/inc/preview.hxx
+++ b/sfx2/source/inc/preview.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SFXPREVIEW_HXX
-#define _SFXPREVIEW_HXX
+#ifndef INCLUDED_SFX2_SOURCE_INC_PREVIEW_HXX
+#define INCLUDED_SFX2_SOURCE_INC_PREVIEW_HXX
 
 
 #include <sfx2/doctempl.hxx>
diff --git a/sfx2/source/inc/recfloat.hxx b/sfx2/source/inc/recfloat.hxx
index 256c96c58cfc..18b7f9bd644a 100644
--- a/sfx2/source/inc/recfloat.hxx
+++ b/sfx2/source/inc/recfloat.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _RECFLOAT_HXX
-#define _RECFLOAT_HXX
+#ifndef INCLUDED_SFX2_SOURCE_INC_RECFLOAT_HXX
+#define INCLUDED_SFX2_SOURCE_INC_RECFLOAT_HXX
 
 #include <sfx2/childwin.hxx>
 #include <sfx2/basedlgs.hxx>
diff --git a/sfx2/source/inc/referers.hxx b/sfx2/source/inc/referers.hxx
index 5789587da96d..fb895e8dbe78 100644
--- a/sfx2/source/inc/referers.hxx
+++ b/sfx2/source/inc/referers.hxx
@@ -16,8 +16,8 @@
  *   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_REFERERS_HXX
-#define _SFX_REFERERS_HXX
+#ifndef INCLUDED_SFX2_SOURCE_INC_REFERERS_HXX
+#define INCLUDED_SFX2_SOURCE_INC_REFERERS_HXX
 
 #define SFX_REFERER_USER        "private:user"
 #define SFX_REFERER_APPEVENT    "private:appevent"
diff --git a/sfx2/source/inc/sfxpicklist.hxx b/sfx2/source/inc/sfxpicklist.hxx
index 443e85df4491..b9a220113edb 100644
--- a/sfx2/source/inc/sfxpicklist.hxx
+++ b/sfx2/source/inc/sfxpicklist.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SFX_PICKLIST_HXX_
-#define _SFX_PICKLIST_HXX_
+#ifndef INCLUDED_SFX2_SOURCE_INC_SFXPICKLIST_HXX
+#define INCLUDED_SFX2_SOURCE_INC_SFXPICKLIST_HXX
 
 #include <osl/mutex.hxx>
 #include <vcl/menu.hxx>
@@ -73,6 +73,6 @@ class SfxPickList : public SfxListener
         virtual void        Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
 };
 
-#endif // _SFX_PICKLIST_HXX_
+#endif // INCLUDED_SFX2_SOURCE_INC_SFXPICKLIST_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/inc/sfxtypes.hxx b/sfx2/source/inc/sfxtypes.hxx
index 3684cadb2073..f26d397dc344 100644
--- a/sfx2/source/inc/sfxtypes.hxx
+++ b/sfx2/source/inc/sfxtypes.hxx
@@ -16,8 +16,8 @@
  *   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_SFXTYPES_HXX
-#define _SFX_SFXTYPES_HXX
+#ifndef INCLUDED_SFX2_SOURCE_INC_SFXTYPES_HXX
+#define INCLUDED_SFX2_SOURCE_INC_SFXTYPES_HXX
 
 #include <tools/debug.hxx>
 #include <tools/rc.hxx>
@@ -126,7 +126,7 @@ struct StringList_Impl : private Resource
 
 };
 
-#endif // #ifndef _SFX_SFXTYPES_HXX
+#endif // INCLUDED_SFX2_SOURCE_INC_SFXTYPES_HXX
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/inc/sfxurlrelocator.hxx b/sfx2/source/inc/sfxurlrelocator.hxx
index 51a4fb767fca..e6803baaea39 100644
--- a/sfx2/source/inc/sfxurlrelocator.hxx
+++ b/sfx2/source/inc/sfxurlrelocator.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SFX_SFXURLRELOCATOR_HXX_
-#define _SFX_SFXURLRELOCATOR_HXX_
+#ifndef INCLUDED_SFX2_SOURCE_INC_SFXURLRELOCATOR_HXX
+#define INCLUDED_SFX2_SOURCE_INC_SFXURLRELOCATOR_HXX
 
 #include <com/sun/star/util/XOfficeInstallationDirectories.hpp>
 #include <com/sun/star/util/XMacroExpander.hpp>
diff --git a/sfx2/source/inc/slotserv.hxx b/sfx2/source/inc/slotserv.hxx
index 1688ced5ec88..0d259ef26fb5 100644
--- a/sfx2/source/inc/slotserv.hxx
+++ b/sfx2/source/inc/slotserv.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SFXSLOTSERV_HXX
-#define _SFXSLOTSERV_HXX
+#ifndef INCLUDED_SFX2_SOURCE_INC_SLOTSERV_HXX
+#define INCLUDED_SFX2_SOURCE_INC_SLOTSERV_HXX
 
 #include <tools/solar.h>
 
diff --git a/sfx2/source/inc/splitwin.hxx b/sfx2/source/inc/splitwin.hxx
index b303b2b7cf4e..6adb73def98e 100644
--- a/sfx2/source/inc/splitwin.hxx
+++ b/sfx2/source/inc/splitwin.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SFXSPLITWIN_HXX
-#define _SFXSPLITWIN_HXX
+#ifndef INCLUDED_SFX2_SOURCE_INC_SPLITWIN_HXX
+#define INCLUDED_SFX2_SOURCE_INC_SPLITWIN_HXX
 
 #include <vcl/splitwin.hxx>
 #include <sfx2/childwin.hxx>
@@ -118,7 +118,7 @@ public:
     void                SetActiveWindow_Impl( SfxDockingWindow* pWin );
 };
 
-#endif // #ifndef _SFXSPLITWIN_HXX
+#endif // INCLUDED_SFX2_SOURCE_INC_SPLITWIN_HXX
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/inc/statcach.hxx b/sfx2/source/inc/statcach.hxx
index d5ed59af628f..60479bad1ba3 100644
--- a/sfx2/source/inc/statcach.hxx
+++ b/sfx2/source/inc/statcach.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SFXSTATCACH_HXX
-#define _SFXSTATCACH_HXX
+#ifndef INCLUDED_SFX2_SOURCE_INC_STATCACH_HXX
+#define INCLUDED_SFX2_SOURCE_INC_STATCACH_HXX
 
 #include <com/sun/star/frame/XDispatchProviderInterceptor.hpp>
 #include <com/sun/star/frame/XDispatch.hpp>
diff --git a/sfx2/source/inc/templatesearchview.hxx b/sfx2/source/inc/templatesearchview.hxx
index a6a81a311842..2b35ded447c0 100644
--- a/sfx2/source/inc/templatesearchview.hxx
+++ b/sfx2/source/inc/templatesearchview.hxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef __SFX2_TEMPLATESEARCHVIEW_HXX__
-#define __SFX2_TEMPLATESEARCHVIEW_HXX__
+#ifndef INCLUDED_SFX2_SOURCE_INC_TEMPLATESEARCHVIEW_HXX
+#define INCLUDED_SFX2_SOURCE_INC_TEMPLATESEARCHVIEW_HXX
 
 #include <sfx2/thumbnailview.hxx>
 
@@ -25,6 +25,6 @@ public:
                     const OUString &rPath, const BitmapEx &rImage );
 };
 
-#endif // __SFX2_TEMPLATESEARCHVIEW_HXX__
+#endif // INCLUDED_SFX2_SOURCE_INC_TEMPLATESEARCHVIEW_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/inc/templatesearchviewitem.hxx b/sfx2/source/inc/templatesearchviewitem.hxx
index 0b52abcd3f06..f2b6801860f6 100644
--- a/sfx2/source/inc/templatesearchviewitem.hxx
+++ b/sfx2/source/inc/templatesearchviewitem.hxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef __SFX2_TEMPLATESEARCHVIEWITEM_HXX__
-#define __SFX2_TEMPLATESEARCHVIEWITEM_HXX__
+#ifndef INCLUDED_SFX2_SOURCE_INC_TEMPLATESEARCHVIEWITEM_HXX
+#define INCLUDED_SFX2_SOURCE_INC_TEMPLATESEARCHVIEWITEM_HXX
 
 #include <sfx2/templateviewitem.hxx>
 
@@ -25,6 +25,6 @@ struct TemplateSearchViewItem : public TemplateViewItem
     sal_uInt16 mnAssocId;    //Associated item id to the TemplateViews
 };
 
-#endif // __SFX2_TEMPLATESEARCHVIEWITEM_HXX__
+#endif // INCLUDED_SFX2_SOURCE_INC_TEMPLATESEARCHVIEWITEM_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/inc/templdgi.hxx b/sfx2/source/inc/templdgi.hxx
index 4a81df5ea04f..0011aed2796c 100644
--- a/sfx2/source/inc/templdgi.hxx
+++ b/sfx2/source/inc/templdgi.hxx
@@ -16,8 +16,8 @@
  *   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_TEMPDLGI_HXX
-#define _SFX_TEMPDLGI_HXX
+#ifndef INCLUDED_SFX2_SOURCE_INC_TEMPLDGI_HXX
+#define INCLUDED_SFX2_SOURCE_INC_TEMPLDGI_HXX
 
 class SfxTemplateControllerItem;
 
@@ -328,7 +328,7 @@ public:
     void Initialize (void);
 };
 
-#endif // #ifndef _SFX_TEMPDLGI_HXX
+#endif // INCLUDED_SFX2_SOURCE_INC_TEMPLDGI_HXX
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/inc/tplcitem.hxx b/sfx2/source/inc/tplcitem.hxx
index f7c30e0800e4..28515d1a644b 100644
--- a/sfx2/source/inc/tplcitem.hxx
+++ b/sfx2/source/inc/tplcitem.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _TPLCITEM_HXX
-#define _TPLCITEM_HXX
+#ifndef INCLUDED_SFX2_SOURCE_INC_TPLCITEM_HXX
+#define INCLUDED_SFX2_SOURCE_INC_TPLCITEM_HXX
 
 #include <sfx2/ctrlitem.hxx>
 #include <tools/link.hxx>
diff --git a/sfx2/source/inc/versdlg.hxx b/sfx2/source/inc/versdlg.hxx
index ad96ef073f18..169d084dace3 100644
--- a/sfx2/source/inc/versdlg.hxx
+++ b/sfx2/source/inc/versdlg.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _VERSDLG_HXX
-#define _VERSDLG_HXX
+#ifndef INCLUDED_SFX2_SOURCE_INC_VERSDLG_HXX
+#define INCLUDED_SFX2_SOURCE_INC_VERSDLG_HXX
 
 #include <sfx2/basedlgs.hxx>
 #include <svtools/simptabl.hxx>
diff --git a/sfx2/source/inc/virtmenu.hxx b/sfx2/source/inc/virtmenu.hxx
index fa091cfd2603..cc637c51998c 100644
--- a/sfx2/source/inc/virtmenu.hxx
+++ b/sfx2/source/inc/virtmenu.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef SFXVIRTMENU_HXX
-#define SFXVIRTMENU_HXX
+#ifndef INCLUDED_SFX2_SOURCE_INC_VIRTMENU_HXX
+#define INCLUDED_SFX2_SOURCE_INC_VIRTMENU_HXX
 
 #include <boost/ptr_container/ptr_vector.hpp>
 
diff --git a/sfx2/source/inc/workwin.hxx b/sfx2/source/inc/workwin.hxx
index a0faee2491ff..ceed92e008a1 100644
--- a/sfx2/source/inc/workwin.hxx
+++ b/sfx2/source/inc/workwin.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SFXWORKWIN_HXX
-#define _SFXWORKWIN_HXX
+#ifndef INCLUDED_SFX2_SOURCE_INC_WORKWIN_HXX
+#define INCLUDED_SFX2_SOURCE_INC_WORKWIN_HXX
 
 #include <vector>
 #include <deque>
diff --git a/sfx2/source/menu/thessubmenu.hxx b/sfx2/source/menu/thessubmenu.hxx
index 8e7168f42b4f..94af27e0b5c6 100644
--- a/sfx2/source/menu/thessubmenu.hxx
+++ b/sfx2/source/menu/thessubmenu.hxx
@@ -18,8 +18,8 @@
  */
 
 
-#ifndef _THESSUBMENU_HXX_
-#define _THESSUBMENU_HXX_
+#ifndef INCLUDED_SFX2_SOURCE_MENU_THESSUBMENU_HXX
+#define INCLUDED_SFX2_SOURCE_MENU_THESSUBMENU_HXX
 
 #include <com/sun/star/linguistic2/XThesaurus.hpp>
 #include <com/sun/star/linguistic2/XLinguServiceManager2.hpp>
diff --git a/sfx2/source/sidebar/Accessible.hxx b/sfx2/source/sidebar/Accessible.hxx
index 7b828682693b..dbc03f87d005 100644
--- a/sfx2/source/sidebar/Accessible.hxx
+++ b/sfx2/source/sidebar/Accessible.hxx
@@ -16,8 +16,8 @@
  *   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_ACCESSIBLE_HXX
-#define SFX_SIDEBAR_ACCESSIBLE_HXX
+#ifndef INCLUDED_SFX2_SOURCE_SIDEBAR_ACCESSIBLE_HXX
+#define INCLUDED_SFX2_SOURCE_SIDEBAR_ACCESSIBLE_HXX
 
 #include <boost/noncopyable.hpp>
 
diff --git a/sfx2/source/sidebar/AccessibleTitleBar.hxx b/sfx2/source/sidebar/AccessibleTitleBar.hxx
index 642e2dc6b351..4c6cb1117310 100644
--- a/sfx2/source/sidebar/AccessibleTitleBar.hxx
+++ b/sfx2/source/sidebar/AccessibleTitleBar.hxx
@@ -16,8 +16,8 @@
  *   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_ACCESSIBLE_TITLE_BAR_HXX
-#define SFX_SIDEBAR_ACCESSIBLE_TITLE_BAR_HXX
+#ifndef INCLUDED_SFX2_SOURCE_SIDEBAR_ACCESSIBLETITLEBAR_HXX
+#define INCLUDED_SFX2_SOURCE_SIDEBAR_ACCESSIBLETITLEBAR_HXX
 
 #include <toolkit/awt/vclxaccessiblecomponent.hxx>
 #include <com/sun/star/accessibility/XAccessible.hpp>
diff --git a/sfx2/source/sidebar/AsynchronousCall.hxx b/sfx2/source/sidebar/AsynchronousCall.hxx
index 440aca0f4dc3..1c2b45d61db4 100644
--- a/sfx2/source/sidebar/AsynchronousCall.hxx
+++ b/sfx2/source/sidebar/AsynchronousCall.hxx
@@ -16,8 +16,8 @@
  *   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_ASYNCHRONOUS_CALL_HXX
-#define SFX_SIDEBAR_ASYNCHRONOUS_CALL_HXX
+#ifndef INCLUDED_SFX2_SOURCE_SIDEBAR_ASYNCHRONOUSCALL_HXX
+#define INCLUDED_SFX2_SOURCE_SIDEBAR_ASYNCHRONOUSCALL_HXX
 
 #include <boost/function.hpp>
 #include <tools/solar.h>
diff --git a/sfx2/source/sidebar/Context.hxx b/sfx2/source/sidebar/Context.hxx
index cb6408f103fb..71c744565bdc 100644
--- a/sfx2/source/sidebar/Context.hxx
+++ b/sfx2/source/sidebar/Context.hxx
@@ -16,8 +16,8 @@
  *   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_HXX
-#define SFX_SIDEBAR_CONTEXT_HXX
+#ifndef INCLUDED_SFX2_SOURCE_SIDEBAR_CONTEXT_HXX
+#define INCLUDED_SFX2_SOURCE_SIDEBAR_CONTEXT_HXX
 
 #include "rtl/ustring.hxx"
 
diff --git a/sfx2/source/sidebar/ContextList.hxx b/sfx2/source/sidebar/ContextList.hxx
index e4b5274eb964..5c5c4d9d5201 100644
--- a/sfx2/source/sidebar/ContextList.hxx
+++ b/sfx2/source/sidebar/ContextList.hxx
@@ -16,8 +16,8 @@
  *   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_LIST_HXX
-#define SFX_SIDEBAR_CONTEXT_LIST_HXX
+#ifndef INCLUDED_SFX2_SOURCE_SIDEBAR_CONTEXTLIST_HXX
+#define INCLUDED_SFX2_SOURCE_SIDEBAR_CONTEXTLIST_HXX
 
 #include "Context.hxx"
 #include <sal/types.h>
diff --git a/sfx2/source/sidebar/ContextMatcher.hxx b/sfx2/source/sidebar/ContextMatcher.hxx
index d02fca864fa2..99b218d56aee 100644
--- a/sfx2/source/sidebar/ContextMatcher.hxx
+++ b/sfx2/source/sidebar/ContextMatcher.hxx
@@ -16,8 +16,8 @@
  *   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_MATCHER_HXX
-#define SFX_SIDEBAR_CONTEXT_MATCHER_HXX
+#ifndef INCLUDED_SFX2_SOURCE_SIDEBAR_CONTEXTMATCHER_HXX
+#define INCLUDED_SFX2_SOURCE_SIDEBAR_CONTEXTMATCHER_HXX
 
 #include <sal/types.h>
 #include <rtl/ustring.hxx>
diff --git a/sfx2/source/sidebar/Deck.hxx b/sfx2/source/sidebar/Deck.hxx
index 0cbb8f057387..33eff61d7454 100644
--- a/sfx2/source/sidebar/Deck.hxx
+++ b/sfx2/source/sidebar/Deck.hxx
@@ -16,8 +16,8 @@
  *   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_DECK_HXX
-#define SFX_SIDEBAR_DECK_HXX
+#ifndef INCLUDED_SFX2_SOURCE_SIDEBAR_DECK_HXX
+#define INCLUDED_SFX2_SOURCE_SIDEBAR_DECK_HXX
 
 #include "Panel.hxx"
 
diff --git a/sfx2/source/sidebar/DeckConfiguration.hxx b/sfx2/source/sidebar/DeckConfiguration.hxx
index 238645137e67..208c84e62552 100644
--- a/sfx2/source/sidebar/DeckConfiguration.hxx
+++ b/sfx2/source/sidebar/DeckConfiguration.hxx
@@ -16,8 +16,8 @@
  *   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_DECK_CONFIGURATION_HXX
-#define SFX_SIDEBAR_DECK_CONFIGURATION_HXX
+#ifndef INCLUDED_SFX2_SOURCE_SIDEBAR_DECKCONFIGURATION_HXX
+#define INCLUDED_SFX2_SOURCE_SIDEBAR_DECKCONFIGURATION_HXX
 
 #include <vector>
 
diff --git a/sfx2/source/sidebar/DeckDescriptor.hxx b/sfx2/source/sidebar/DeckDescriptor.hxx
index b4212b2f470d..3959bbe4db8c 100644
--- a/sfx2/source/sidebar/DeckDescriptor.hxx
+++ b/sfx2/source/sidebar/DeckDescriptor.hxx
@@ -16,8 +16,8 @@
  *   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_DECK_DESCRIPTOR_HXX
-#define SFX_SIDEBAR_DECK_DESCRIPTOR_HXX
+#ifndef INCLUDED_SFX2_SOURCE_SIDEBAR_DECKDESCRIPTOR_HXX
+#define INCLUDED_SFX2_SOURCE_SIDEBAR_DECKDESCRIPTOR_HXX
 
 #include "sfx2/sidebar/EnumContext.hxx"
 #include "ContextList.hxx"
diff --git a/sfx2/source/sidebar/DeckLayouter.hxx b/sfx2/source/sidebar/DeckLayouter.hxx
index 3c27d6874878..10a90e676528 100644
--- a/sfx2/source/sidebar/DeckLayouter.hxx
+++ b/sfx2/source/sidebar/DeckLayouter.hxx
@@ -16,8 +16,8 @@
  *   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_DECK_LAYOUTER_HXX
-#define SFX_SIDEBAR_DECK_LAYOUTER_HXX
+#ifndef INCLUDED_SFX2_SOURCE_SIDEBAR_DECKLAYOUTER_HXX
+#define INCLUDED_SFX2_SOURCE_SIDEBAR_DECKLAYOUTER_HXX
 
 #include "Panel.hxx"
 
diff --git a/sfx2/source/sidebar/DeckTitleBar.hxx b/sfx2/source/sidebar/DeckTitleBar.hxx
index 4f4637427412..7b4be835b6c8 100644
--- a/sfx2/source/sidebar/DeckTitleBar.hxx
+++ b/sfx2/source/sidebar/DeckTitleBar.hxx
@@ -16,8 +16,8 @@
  *   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_DECK_TITLE_BAR_HXX
-#define SFX_SIDEBAR_DECK_TITLE_BAR_HXX
+#ifndef INCLUDED_SFX2_SOURCE_SIDEBAR_DECKTITLEBAR_HXX
+#define INCLUDED_SFX2_SOURCE_SIDEBAR_DECKTITLEBAR_HXX
 
 #include "TitleBar.hxx"
 
diff --git a/sfx2/source/sidebar/DrawHelper.hxx b/sfx2/source/sidebar/DrawHelper.hxx
index a7f75fd8b711..df521c7ebe5f 100644
--- a/sfx2/source/sidebar/DrawHelper.hxx
+++ b/sfx2/source/sidebar/DrawHelper.hxx
@@ -16,8 +16,8 @@
  *   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_DRAW_HELPER_HXX
-#define SFX_SIDEBAR_DRAW_HELPER_HXX
+#ifndef INCLUDED_SFX2_SOURCE_SIDEBAR_DRAWHELPER_HXX
+#define INCLUDED_SFX2_SOURCE_SIDEBAR_DRAWHELPER_HXX
 
 #include "vcl/window.hxx"
 
diff --git a/sfx2/source/sidebar/FocusManager.hxx b/sfx2/source/sidebar/FocusManager.hxx
index c1249e19925c..21b58eacc016 100644
--- a/sfx2/source/sidebar/FocusManager.hxx
+++ b/sfx2/source/sidebar/FocusManager.hxx
@@ -16,8 +16,8 @@
  *   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_FOCUS_MANAGER_HXX
-#define SFX_SIDEBAR_FOCUS_MANAGER_HXX
+#ifndef INCLUDED_SFX2_SOURCE_SIDEBAR_FOCUSMANAGER_HXX
+#define INCLUDED_SFX2_SOURCE_SIDEBAR_FOCUSMANAGER_HXX
 
 #include "Panel.hxx"
 #include <tools/link.hxx>
diff --git a/sfx2/source/sidebar/MenuButton.hxx b/sfx2/source/sidebar/MenuButton.hxx
index 63d8410682b6..adfb7fa0751d 100644
--- a/sfx2/source/sidebar/MenuButton.hxx
+++ b/sfx2/source/sidebar/MenuButton.hxx
@@ -16,8 +16,8 @@
  *   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_MENU_BUTTON_HXX
-#define SFX_SIDEBAR_MENU_BUTTON_HXX
+#ifndef INCLUDED_SFX2_SOURCE_SIDEBAR_MENUBUTTON_HXX
+#define INCLUDED_SFX2_SOURCE_SIDEBAR_MENUBUTTON_HXX
 
 #include "vcl/button.hxx"
 
diff --git a/sfx2/source/sidebar/Paint.hxx b/sfx2/source/sidebar/Paint.hxx
index 3509ddfdd455..4849a8b49aad 100644
--- a/sfx2/source/sidebar/Paint.hxx
+++ b/sfx2/source/sidebar/Paint.hxx
@@ -16,8 +16,8 @@
  *   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_PAINT_HXX
-#define SFX_SIDEBAR_PAINT_HXX
+#ifndef INCLUDED_SFX2_SOURCE_SIDEBAR_PAINT_HXX
+#define INCLUDED_SFX2_SOURCE_SIDEBAR_PAINT_HXX
 
 #include <tools/color.hxx>
 #include <vcl/gradient.hxx>
diff --git a/sfx2/source/sidebar/Panel.hxx b/sfx2/source/sidebar/Panel.hxx
index cc8c09e9acbd..b88f8726474e 100644
--- a/sfx2/source/sidebar/Panel.hxx
+++ b/sfx2/source/sidebar/Panel.hxx
@@ -16,8 +16,8 @@
  *   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_HXX
-#define SFX_SIDEBAR_PANEL_HXX
+#ifndef INCLUDED_SFX2_SOURCE_SIDEBAR_PANEL_HXX
+#define INCLUDED_SFX2_SOURCE_SIDEBAR_PANEL_HXX
 
 #include "Context.hxx"
 #include <vcl/window.hxx>
diff --git a/sfx2/source/sidebar/PanelDescriptor.hxx b/sfx2/source/sidebar/PanelDescriptor.hxx
index b48181da0f99..90450cde2f64 100644
--- a/sfx2/source/sidebar/PanelDescriptor.hxx
+++ b/sfx2/source/sidebar/PanelDescriptor.hxx
@@ -16,8 +16,8 @@
  *   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_DESCRIPTOR_HXX
-#define SFX_SIDEBAR_PANEL_DESCRIPTOR_HXX
+#ifndef INCLUDED_SFX2_SOURCE_SIDEBAR_PANELDESCRIPTOR_HXX
+#define INCLUDED_SFX2_SOURCE_SIDEBAR_PANELDESCRIPTOR_HXX
 
 #include "sfx2/sidebar/EnumContext.hxx"
 #include "ContextList.hxx"
diff --git a/sfx2/source/sidebar/PanelTitleBar.hxx b/sfx2/source/sidebar/PanelTitleBar.hxx
index 9876debd331f..ba83173acd64 100644
--- a/sfx2/source/sidebar/PanelTitleBar.hxx
+++ b/sfx2/source/sidebar/PanelTitleBar.hxx
@@ -16,8 +16,8 @@
  *   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_TITLE_BAR_HXX
-#define SFX_SIDEBAR_PANEL_TITLE_BAR_HXX
+#ifndef INCLUDED_SFX2_SOURCE_SIDEBAR_PANELTITLEBAR_HXX
+#define INCLUDED_SFX2_SOURCE_SIDEBAR_PANELTITLEBAR_HXX
 
 #include "TitleBar.hxx"
 
diff --git a/sfx2/source/sidebar/ResourceManager.hxx b/sfx2/source/sidebar/ResourceManager.hxx
index aea7cb216bcb..0ea23e7c3012 100644
--- a/sfx2/source/sidebar/ResourceManager.hxx
+++ b/sfx2/source/sidebar/ResourceManager.hxx
@@ -16,8 +16,8 @@
  *   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_RESOURCE_MANAGER_HXX
-#define SFX_SIDEBAR_RESOURCE_MANAGER_HXX
+#ifndef INCLUDED_SFX2_SOURCE_SIDEBAR_RESOURCEMANAGER_HXX
+#define INCLUDED_SFX2_SOURCE_SIDEBAR_RESOURCEMANAGER_HXX
 
 #include "DeckDescriptor.hxx"
 #include "PanelDescriptor.hxx"
diff --git a/sfx2/source/sidebar/SidebarController.hxx b/sfx2/source/sidebar/SidebarController.hxx
index cb8461447cbc..905958234ee6 100644
--- a/sfx2/source/sidebar/SidebarController.hxx
+++ b/sfx2/source/sidebar/SidebarController.hxx
@@ -16,8 +16,8 @@
  *   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_HXX
-#define SFX_SIDEBAR_CONTROLLER_HXX
+#ifndef INCLUDED_SFX2_SOURCE_SIDEBAR_SIDEBARCONTROLLER_HXX
+#define INCLUDED_SFX2_SOURCE_SIDEBAR_SIDEBARCONTROLLER_HXX
 
 #include "AsynchronousCall.hxx"
 #include "Context.hxx"
diff --git a/sfx2/source/sidebar/SidebarDockingWindow.hxx b/sfx2/source/sidebar/SidebarDockingWindow.hxx
index 80939faa45ba..07857f1cc067 100644
--- a/sfx2/source/sidebar/SidebarDockingWindow.hxx
+++ b/sfx2/source/sidebar/SidebarDockingWindow.hxx
@@ -16,8 +16,8 @@
  *   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_DOCKING_WINDOW_HXX
-#define SFX_SIDEBAR_DOCKING_WINDOW_HXX
+#ifndef INCLUDED_SFX2_SOURCE_SIDEBAR_SIDEBARDOCKINGWINDOW_HXX
+#define INCLUDED_SFX2_SOURCE_SIDEBAR_SIDEBARDOCKINGWINDOW_HXX
 
 #include "sfx2/dockwin.hxx"
 #include "sfx2/dockwin.hxx"
diff --git a/sfx2/source/sidebar/SidebarPanel.hxx b/sfx2/source/sidebar/SidebarPanel.hxx
index 6a2a06259205..2679c663b23a 100644
--- a/sfx2/source/sidebar/SidebarPanel.hxx
+++ b/sfx2/source/sidebar/SidebarPanel.hxx
@@ -16,8 +16,8 @@
  *   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_SIDEBAR_PANEL_HXX
-#define SFX_SIDEBAR_SIDEBAR_PANEL_HXX
+#ifndef INCLUDED_SFX2_SOURCE_SIDEBAR_SIDEBARPANEL_HXX
+#define INCLUDED_SFX2_SOURCE_SIDEBAR_SIDEBARPANEL_HXX
 
 #include <tools/link.hxx>
 #include <com/sun/star/ui/XSidebarPanel.hpp>
diff --git a/sfx2/source/sidebar/SidebarResource.hxx b/sfx2/source/sidebar/SidebarResource.hxx
index 35883011a76b..a0396deb0e86 100644
--- a/sfx2/source/sidebar/SidebarResource.hxx
+++ b/sfx2/source/sidebar/SidebarResource.hxx
@@ -16,8 +16,8 @@
  *   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_RESOURCE_HXX
-#define SFX_SIDEBAR_RESOURCE_HXX
+#ifndef INCLUDED_SFX2_SOURCE_SIDEBAR_SIDEBARRESOURCE_HXX
+#define INCLUDED_SFX2_SOURCE_SIDEBAR_SIDEBARRESOURCE_HXX
 
 
 #include "Sidebar.hrc"
diff --git a/sfx2/source/sidebar/TabBar.hxx b/sfx2/source/sidebar/TabBar.hxx
index 0b87f851865e..20d4cc9be173 100644
--- a/sfx2/source/sidebar/TabBar.hxx
+++ b/sfx2/source/sidebar/TabBar.hxx
@@ -16,8 +16,8 @@
  *   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_TAB_BAR_HXX
-#define SFX_SIDEBAR_TAB_BAR_HXX
+#ifndef INCLUDED_SFX2_SOURCE_SIDEBAR_TABBAR_HXX
+#define INCLUDED_SFX2_SOURCE_SIDEBAR_TABBAR_HXX
 
 #include "DeckDescriptor.hxx"
 #include "ResourceManager.hxx"
diff --git a/sfx2/source/sidebar/TabItem.hxx b/sfx2/source/sidebar/TabItem.hxx
index 761034400639..ef009dbc39ae 100644
--- a/sfx2/source/sidebar/TabItem.hxx
+++ b/sfx2/source/sidebar/TabItem.hxx
@@ -16,8 +16,8 @@
  *   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_TAB_ITEM_HXX
-#define SFX_SIDEBAR_TAB_ITEM_HXX
+#ifndef INCLUDED_SFX2_SOURCE_SIDEBAR_TABITEM_HXX
+#define INCLUDED_SFX2_SOURCE_SIDEBAR_TABITEM_HXX
 
 #include "vcl/button.hxx"
 
diff --git a/sfx2/source/sidebar/TitleBar.hxx b/sfx2/source/sidebar/TitleBar.hxx
index a0c3a35bf894..9635c4b580f6 100644
--- a/sfx2/source/sidebar/TitleBar.hxx
+++ b/sfx2/source/sidebar/TitleBar.hxx
@@ -16,8 +16,8 @@
  *   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_TITLE_BAR_HXX
-#define SFX_SIDEBAR_TITLE_BAR_HXX
+#ifndef INCLUDED_SFX2_SOURCE_SIDEBAR_TITLEBAR_HXX
+#define INCLUDED_SFX2_SOURCE_SIDEBAR_TITLEBAR_HXX
 
 #include "Paint.hxx"
 
diff --git a/sfx2/source/view/impframe.hxx b/sfx2/source/view/impframe.hxx
index 56584c87eb31..b052bc2a16cc 100644
--- a/sfx2/source/view/impframe.hxx
+++ b/sfx2/source/view/impframe.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SFX_IMPFRAME_HXX
-#define _SFX_IMPFRAME_HXX
+#ifndef INCLUDED_SFX2_SOURCE_VIEW_IMPFRAME_HXX
+#define INCLUDED_SFX2_SOURCE_VIEW_IMPFRAME_HXX
 
 #include <sfx2/frame.hxx>
 #include <sfx2/viewfrm.hxx>
diff --git a/sfx2/source/view/impviewframe.hxx b/sfx2/source/view/impviewframe.hxx
index 8eee2a344c02..b3f4cf894ce9 100644
--- a/sfx2/source/view/impviewframe.hxx
+++ b/sfx2/source/view/impviewframe.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef SFX2_IMPVIEWFRAME_HXX
-#define SFX2_IMPVIEWFRAME_HXX
+#ifndef INCLUDED_SFX2_SOURCE_VIEW_IMPVIEWFRAME_HXX
+#define INCLUDED_SFX2_SOURCE_VIEW_IMPVIEWFRAME_HXX
 
 #include "sfx2/viewfrm.hxx"
 
@@ -87,6 +87,6 @@ public:
     virtual void        StateChanged( StateChangedType nStateChange );
 };
 
-#endif // SFX2_IMPVIEWFRAME_HXX
+#endif // INCLUDED_SFX2_SOURCE_VIEW_IMPVIEWFRAME_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/view/viewimp.hxx b/sfx2/source/view/viewimp.hxx
index 827c21da22cb..5b6e3f08ac18 100644
--- a/sfx2/source/view/viewimp.hxx
+++ b/sfx2/source/view/viewimp.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef SFX_VIEWIMP_HXX
-#define SFX_VIEWIMP_HXX
+#ifndef INCLUDED_SFX2_SOURCE_VIEW_VIEWIMP_HXX
+#define INCLUDED_SFX2_SOURCE_VIEW_VIEWIMP_HXX
 
 #include <basic/sbxobj.hxx>
 #include <sfx2/viewsh.hxx>