fixincludeguards.sh: sfx2

Change-Id: I135d03fa8926e0fdba977005e97452045861b2a4

35 files changed, 82 insertions, 82 deletions

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>