fixincludeguards.sh: extensions

Change-Id: If652bce4cf7621795b084bcbc0aa4c46dd903878

145 files changed, 391 insertions, 391 deletions

diff --git a/extensions/source/abpilot/abpfinalpage.hxx b/extensions/source/abpilot/abpfinalpage.hxx
index bb54851e339d..eb77393ae17f 100644
--- a/extensions/source/abpilot/abpfinalpage.hxx
+++ b/extensions/source/abpilot/abpfinalpage.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef EXTENSIONS_ABP_ABPFINALPAGE_HXX
-#define EXTENSIONS_ABP_ABPFINALPAGE_HXX
+#ifndef INCLUDED_EXTENSIONS_SOURCE_ABPILOT_ABPFINALPAGE_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_ABPILOT_ABPFINALPAGE_HXX
 
 #include "abspage.hxx"
 #include "abptypes.hxx"
@@ -80,6 +80,6 @@ namespace abp
 }   // namespace abp
 
 
-#endif // EXTENSIONS_ABP_ABPFINALPAGE_HXX
+#endif // INCLUDED_EXTENSIONS_SOURCE_ABPILOT_ABPFINALPAGE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/abpilot/abptypes.hxx b/extensions/source/abpilot/abptypes.hxx
index 5a69cf56cef1..fc3368b5c36b 100644
--- a/extensions/source/abpilot/abptypes.hxx
+++ b/extensions/source/abpilot/abptypes.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef EXTENSIONS_ABP_ABPTYPES_HXX
-#define EXTENSIONS_ABP_ABPTYPES_HXX
+#ifndef INCLUDED_EXTENSIONS_SOURCE_ABPILOT_ABPTYPES_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_ABPILOT_ABPTYPES_HXX
 
 #include <sal/config.h>
 
@@ -40,6 +40,6 @@ namespace abp
 }   // namespace abp
 
 
-#endif // EXTENSIONS_ABP_ABPTYPES_HXX
+#endif // INCLUDED_EXTENSIONS_SOURCE_ABPILOT_ABPTYPES_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/abpilot/abspage.hxx b/extensions/source/abpilot/abspage.hxx
index e4af50254416..24b0cd544915 100644
--- a/extensions/source/abpilot/abspage.hxx
+++ b/extensions/source/abpilot/abspage.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef EXTENSIONS_ABP_ABSPAGE_HXX
-#define EXTENSIONS_ABP_ABSPAGE_HXX
+#ifndef INCLUDED_EXTENSIONS_SOURCE_ABPILOT_ABSPAGE_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_ABPILOT_ABSPAGE_HXX
 
 #include <svtools/wizardmachine.hxx>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
@@ -62,6 +62,6 @@ namespace abp
 }   // namespace abp
 
 
-#endif // EXTENSIONS_ABP_ABSPAGE_HXX
+#endif // INCLUDED_EXTENSIONS_SOURCE_ABPILOT_ABSPAGE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/abpilot/abspilot.hxx b/extensions/source/abpilot/abspilot.hxx
index ea7d0596c8d7..3ffa3b19b74f 100644
--- a/extensions/source/abpilot/abspilot.hxx
+++ b/extensions/source/abpilot/abspilot.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef EXTENSIONS_ABSPILOT_HXX
-#define EXTENSIONS_ABSPILOT_HXX
+#ifndef INCLUDED_EXTENSIONS_SOURCE_ABPILOT_ABSPILOT_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_ABPILOT_ABSPILOT_HXX
 
 #include <svtools/roadmapwizard.hxx>
 #include "addresssettings.hxx"
@@ -138,6 +138,6 @@ namespace abp
 }   // namespace abp
 
 
-#endif // EXTENSIONS_ABSPILOT_HXX
+#endif // INCLUDED_EXTENSIONS_SOURCE_ABPILOT_ABSPILOT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/abpilot/addresssettings.hxx b/extensions/source/abpilot/addresssettings.hxx
index d719751e4c67..839f95a6c90c 100644
--- a/extensions/source/abpilot/addresssettings.hxx
+++ b/extensions/source/abpilot/addresssettings.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef EXTENSIONS_ABP_ADDRESSSETTINGS_HXX
-#define EXTENSIONS_ABP_ADDRESSSETTINGS_HXX
+#ifndef INCLUDED_EXTENSIONS_SOURCE_ABPILOT_ADDRESSSETTINGS_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_ABPILOT_ADDRESSSETTINGS_HXX
 
 #include <rtl/ustring.hxx>
 #include "abptypes.hxx"
@@ -67,6 +67,6 @@ namespace abp
 }   // namespace abp
 
 
-#endif // EXTENSIONS_ABP_ADDRESSSETTINGS_HXX
+#endif // INCLUDED_EXTENSIONS_SOURCE_ABPILOT_ADDRESSSETTINGS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/abpilot/admininvokationimpl.hxx b/extensions/source/abpilot/admininvokationimpl.hxx
index b9f5dbd2739b..c24487d2d372 100644
--- a/extensions/source/abpilot/admininvokationimpl.hxx
+++ b/extensions/source/abpilot/admininvokationimpl.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef EXTENSIONS_ABP_ADMININVOKATIONIMPL_HXX
-#define EXTENSIONS_ABP_ADMININVOKATIONIMPL_HXX
+#ifndef INCLUDED_EXTENSIONS_SOURCE_ABPILOT_ADMININVOKATIONIMPL_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_ABPILOT_ADMININVOKATIONIMPL_HXX
 
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/extensions/source/abpilot/admininvokationpage.hxx b/extensions/source/abpilot/admininvokationpage.hxx
index 192dec51fc67..69517bbe71d6 100644
--- a/extensions/source/abpilot/admininvokationpage.hxx
+++ b/extensions/source/abpilot/admininvokationpage.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef EXTENSIONS_ABP_ADMINDIALOG_INVOKATION_PAGE_HXX
-#define EXTENSIONS_ABP_ADMINDIALOG_INVOKATION_PAGE_HXX
+#ifndef INCLUDED_EXTENSIONS_SOURCE_ABPILOT_ADMININVOKATIONPAGE_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_ABPILOT_ADMININVOKATIONPAGE_HXX
 
 #include "abspage.hxx"
 
@@ -61,6 +61,6 @@ namespace abp
 }   // namespace abp
 
 
-#endif // EXTENSIONS_ABP_ADMINDIALOG_INVOKATION_PAGE_HXX
+#endif // INCLUDED_EXTENSIONS_SOURCE_ABPILOT_ADMININVOKATIONPAGE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/abpilot/datasourcehandling.hxx b/extensions/source/abpilot/datasourcehandling.hxx
index c3f56c56f7a4..b4d71ffa4ab0 100644
--- a/extensions/source/abpilot/datasourcehandling.hxx
+++ b/extensions/source/abpilot/datasourcehandling.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef EXTENSIONS_ABP_DATASOURCEHANDLING_HXX
-#define EXTENSIONS_ABP_DATASOURCEHANDLING_HXX
+#ifndef INCLUDED_EXTENSIONS_SOURCE_ABPILOT_DATASOURCEHANDLING_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_ABPILOT_DATASOURCEHANDLING_HXX
 
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/uno/XComponentContext.hpp>
@@ -203,6 +203,6 @@ namespace abp
 }   // namespace abp
 
 
-#endif // EXTENSIONS_ABP_DATASOURCEHANDLING_HXX
+#endif // INCLUDED_EXTENSIONS_SOURCE_ABPILOT_DATASOURCEHANDLING_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/abpilot/fieldmappingimpl.hxx b/extensions/source/abpilot/fieldmappingimpl.hxx
index a08b455818cf..4e56ca3d422c 100644
--- a/extensions/source/abpilot/fieldmappingimpl.hxx
+++ b/extensions/source/abpilot/fieldmappingimpl.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef EXTENSIONS_ABP_FIELDMAPPINGIMPL_HXX
-#define EXTENSIONS_ABP_FIELDMAPPINGIMPL_HXX
+#ifndef INCLUDED_EXTENSIONS_SOURCE_ABPILOT_FIELDMAPPINGIMPL_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_ABPILOT_FIELDMAPPINGIMPL_HXX
 
 #include <rtl/ustring.hxx>
 #include "abptypes.hxx"
@@ -117,6 +117,6 @@ namespace abp
 }   // namespace abp
 
 
-#endif // EXTENSIONS_ABP_FIELDMAPPINGIMPL_HXX
+#endif // INCLUDED_EXTENSIONS_SOURCE_ABPILOT_FIELDMAPPINGIMPL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/abpilot/fieldmappingpage.hxx b/extensions/source/abpilot/fieldmappingpage.hxx
index ca6f53ce6b9c..e684fc09704f 100644
--- a/extensions/source/abpilot/fieldmappingpage.hxx
+++ b/extensions/source/abpilot/fieldmappingpage.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef EXTENSIONS_ABP_FIELDMAPPINGPAGE_HXX
-#define EXTENSIONS_ABP_FIELDMAPPINGPAGE_HXX
+#ifndef INCLUDED_EXTENSIONS_SOURCE_ABPILOT_FIELDMAPPINGPAGE_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_ABPILOT_FIELDMAPPINGPAGE_HXX
 
 #include "abspage.hxx"
 
@@ -58,6 +58,6 @@ namespace abp
 }   // namespace abp
 
 
-#endif // EXTENSIONS_ABP_FIELDMAPPINGPAGE_HXX
+#endif // INCLUDED_EXTENSIONS_SOURCE_ABPILOT_FIELDMAPPINGPAGE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/abpilot/tableselectionpage.hxx b/extensions/source/abpilot/tableselectionpage.hxx
index 361ab5d5c83f..bf201a3578cf 100644
--- a/extensions/source/abpilot/tableselectionpage.hxx
+++ b/extensions/source/abpilot/tableselectionpage.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef EXTENSIONS_ABP_TABLESELECTIONPAGE_HXX
-#define EXTENSIONS_ABP_TABLESELECTIONPAGE_HXX
+#ifndef INCLUDED_EXTENSIONS_SOURCE_ABPILOT_TABLESELECTIONPAGE_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_ABPILOT_TABLESELECTIONPAGE_HXX
 
 #include "abspage.hxx"
 #include <vcl/lstbox.hxx>
@@ -61,6 +61,6 @@ namespace abp
 }   // namespace abp
 
 
-#endif // EXTENSIONS_ABP_TABLESELECTIONPAGE_HXX
+#endif // INCLUDED_EXTENSIONS_SOURCE_ABPILOT_TABLESELECTIONPAGE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/abpilot/typeselectionpage.hxx b/extensions/source/abpilot/typeselectionpage.hxx
index dba5bb791d18..56249f9af46f 100644
--- a/extensions/source/abpilot/typeselectionpage.hxx
+++ b/extensions/source/abpilot/typeselectionpage.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef EXTENSIONS_ABP_TYPESELECTIONPAGE_HXX
-#define EXTENSIONS_ABP_TYPESELECTIONPAGE_HXX
+#ifndef INCLUDED_EXTENSIONS_SOURCE_ABPILOT_TYPESELECTIONPAGE_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_ABPILOT_TYPESELECTIONPAGE_HXX
 
 #include "abspage.hxx"
 #include "addresssettings.hxx"
@@ -94,6 +94,6 @@ namespace abp
 }   // namespace abp
 
 
-#endif // EXTENSIONS_ABP_TYPESELECTIONPAGE_HXX
+#endif // INCLUDED_EXTENSIONS_SOURCE_ABPILOT_TYPESELECTIONPAGE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/abpilot/unodialogabp.hxx b/extensions/source/abpilot/unodialogabp.hxx
index 8844798f578a..845423d07954 100644
--- a/extensions/source/abpilot/unodialogabp.hxx
+++ b/extensions/source/abpilot/unodialogabp.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef EXTENSIONS_ABP_UNODIALOG_HXX
-#define EXTENSIONS_ABP_UNODIALOG_HXX
+#ifndef INCLUDED_EXTENSIONS_SOURCE_ABPILOT_UNODIALOGABP_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_ABPILOT_UNODIALOGABP_HXX
 
 #include <svtools/genericunodialog.hxx>
 #include <comphelper/proparrhlp.hxx>
@@ -93,6 +93,6 @@ namespace abp
 
 extern "C" void SAL_CALL createRegistryInfo_OABSPilotUno();
 
-#endif // EXTENSIONS_ABP_UNODIALOG_HXX
+#endif // INCLUDED_EXTENSIONS_SOURCE_ABPILOT_UNODIALOGABP_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/bibliography/bibbeam.hxx b/extensions/source/bibliography/bibbeam.hxx
index 54d444623f3d..c4e15925ffe1 100644
--- a/extensions/source/bibliography/bibbeam.hxx
+++ b/extensions/source/bibliography/bibbeam.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef ADRBEAM_HXX
-#define ADRBEAM_HXX
+#ifndef INCLUDED_EXTENSIONS_SOURCE_BIBLIOGRAPHY_BIBBEAM_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_BIBLIOGRAPHY_BIBBEAM_HXX
 
 #include <com/sun/star/awt/XControlContainer.hpp>
 #include <com/sun/star/awt/XControl.hpp>
diff --git a/extensions/source/bibliography/bibconfig.hxx b/extensions/source/bibliography/bibconfig.hxx
index 45fd60945459..3c8cbb0f6874 100644
--- a/extensions/source/bibliography/bibconfig.hxx
+++ b/extensions/source/bibliography/bibconfig.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _BIBCONFIG_HXX
-#define _BIBCONFIG_HXX
+#ifndef INCLUDED_EXTENSIONS_SOURCE_BIBLIOGRAPHY_BIBCONFIG_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_BIBLIOGRAPHY_BIBCONFIG_HXX
 
 #include <unotools/configitem.hxx>
 #include <boost/ptr_container/ptr_vector.hpp>
diff --git a/extensions/source/bibliography/bibcont.hxx b/extensions/source/bibliography/bibcont.hxx
index 2dcf27fa6caa..3d4d4d6040c2 100644
--- a/extensions/source/bibliography/bibcont.hxx
+++ b/extensions/source/bibliography/bibcont.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef ADDRCONT_HXX
-#define ADDRCONT_HXX
+#ifndef INCLUDED_EXTENSIONS_SOURCE_BIBLIOGRAPHY_BIBCONT_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_BIBLIOGRAPHY_BIBCONT_HXX
 
 #include <com/sun/star/frame/XFrame.hpp>
 #include <vcl/splitwin.hxx>
diff --git a/extensions/source/bibliography/bibmod.hxx b/extensions/source/bibliography/bibmod.hxx
index e94692da516d..220f83fcd55a 100644
--- a/extensions/source/bibliography/bibmod.hxx
+++ b/extensions/source/bibliography/bibmod.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef BIBMOD_HXX
-#define BIBMOD_HXX
+#ifndef INCLUDED_EXTENSIONS_SOURCE_BIBLIOGRAPHY_BIBMOD_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_BIBLIOGRAPHY_BIBMOD_HXX
 
 
 class ResMgr;
diff --git a/extensions/source/bibliography/bibresid.hxx b/extensions/source/bibliography/bibresid.hxx
index 3ba9dbdd083f..bb96b885e1e6 100644
--- a/extensions/source/bibliography/bibresid.hxx
+++ b/extensions/source/bibliography/bibresid.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef ADRRESID_HXX
-#define ADRRESID_HXX
+#ifndef INCLUDED_EXTENSIONS_SOURCE_BIBLIOGRAPHY_BIBRESID_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_BIBLIOGRAPHY_BIBRESID_HXX
 
 #include <tools/resid.hxx>
 
@@ -32,6 +32,6 @@ class BibResId : public ResId
 
 #define BIB_RESSTR(i)   BibResId(i).toString()
 
-#endif // ADRRESID_HXX
+#endif // INCLUDED_EXTENSIONS_SOURCE_BIBLIOGRAPHY_BIBRESID_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/bibliography/bibshortcuthandler.hxx b/extensions/source/bibliography/bibshortcuthandler.hxx
index 7f637faa0b8e..1f17d20037ea 100644
--- a/extensions/source/bibliography/bibshortcuthandler.hxx
+++ b/extensions/source/bibliography/bibshortcuthandler.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _BIBSHORTCUTHANDLER_HXX
-#define _BIBSHORTCUTHANDLER_HXX
+#ifndef INCLUDED_EXTENSIONS_SOURCE_BIBLIOGRAPHY_BIBSHORTCUTHANDLER_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_BIBLIOGRAPHY_BIBSHORTCUTHANDLER_HXX
 
 #include <vcl/window.hxx>
 #include <vcl/splitwin.hxx>
diff --git a/extensions/source/bibliography/bibtools.hxx b/extensions/source/bibliography/bibtools.hxx
index 61dca624b79b..cb784656445c 100644
--- a/extensions/source/bibliography/bibtools.hxx
+++ b/extensions/source/bibliography/bibtools.hxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef BIBTOOLS_HXX
+#ifndef INCLUDED_EXTENSIONS_SOURCE_BIBLIOGRAPHY_BIBTOOLS_HXX
 
 #include <vcl/taskpanelist.hxx>
 
diff --git a/extensions/source/bibliography/bibview.hxx b/extensions/source/bibliography/bibview.hxx
index ada46edde405..1ba445eaa46f 100644
--- a/extensions/source/bibliography/bibview.hxx
+++ b/extensions/source/bibliography/bibview.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _BIB_VIEW_HXX
-#define _BIB_VIEW_HXX
+#ifndef INCLUDED_EXTENSIONS_SOURCE_BIBLIOGRAPHY_BIBVIEW_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_BIBLIOGRAPHY_BIBVIEW_HXX
 
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/awt/XControlContainer.hpp>
diff --git a/extensions/source/bibliography/datman.hxx b/extensions/source/bibliography/datman.hxx
index 546e482c21c0..9e7fa2ff5528 100644
--- a/extensions/source/bibliography/datman.hxx
+++ b/extensions/source/bibliography/datman.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _BIB_DATMAN_HXX
-#define _BIB_DATMAN_HXX
+#ifndef INCLUDED_EXTENSIONS_SOURCE_BIBLIOGRAPHY_DATMAN_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_BIBLIOGRAPHY_DATMAN_HXX
 
 #include <com/sun/star/awt/XControlModel.hpp>
 #include <com/sun/star/form/XForm.hpp>
diff --git a/extensions/source/bibliography/formcontrolcontainer.hxx b/extensions/source/bibliography/formcontrolcontainer.hxx
index 77e1f4b725aa..18c30af5f3df 100644
--- a/extensions/source/bibliography/formcontrolcontainer.hxx
+++ b/extensions/source/bibliography/formcontrolcontainer.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef EXTENSIONS_BIB_FORMCONTROLCONTAINER_HXX
-#define EXTENSIONS_BIB_FORMCONTROLCONTAINER_HXX
+#ifndef INCLUDED_EXTENSIONS_SOURCE_BIBLIOGRAPHY_FORMCONTROLCONTAINER_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_BIBLIOGRAPHY_FORMCONTROLCONTAINER_HXX
 
 #include <comphelper/broadcasthelper.hxx>
 #include "loadlisteneradapter.hxx"
@@ -70,6 +70,6 @@ namespace bib
 }   // namespace bib
 
 
-#endif // EXTENSIONS_BIB_FORMCONTROLCONTAINER_HXX
+#endif // INCLUDED_EXTENSIONS_SOURCE_BIBLIOGRAPHY_FORMCONTROLCONTAINER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/bibliography/framectr.hxx b/extensions/source/bibliography/framectr.hxx
index 450eaf1a2524..ef234ad2a57d 100644
--- a/extensions/source/bibliography/framectr.hxx
+++ b/extensions/source/bibliography/framectr.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _BIB_FRAMECTR_HXX
-#define _BIB_FRAMECTR_HXX
+#ifndef INCLUDED_EXTENSIONS_SOURCE_BIBLIOGRAPHY_FRAMECTR_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_BIBLIOGRAPHY_FRAMECTR_HXX
 #include <com/sun/star/beans/XPropertyChangeListener.hpp>
 #include <com/sun/star/frame/XDispatchProvider.hpp>
 #include <com/sun/star/frame/XController.hpp>
diff --git a/extensions/source/bibliography/general.hxx b/extensions/source/bibliography/general.hxx
index 0d91f4165cf7..be416699e584 100644
--- a/extensions/source/bibliography/general.hxx
+++ b/extensions/source/bibliography/general.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _BIB_GENERAL_HXX
-#define _BIB_GENERAL_HXX
+#ifndef INCLUDED_EXTENSIONS_SOURCE_BIBLIOGRAPHY_GENERAL_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_BIBLIOGRAPHY_GENERAL_HXX
 
 #include <com/sun/star/awt/XFocusListener.hpp>
 #include <com/sun/star/awt/XControlContainer.hpp>
diff --git a/extensions/source/bibliography/loadlisteneradapter.hxx b/extensions/source/bibliography/loadlisteneradapter.hxx
index 8501e5b6188b..bedae9738759 100644
--- a/extensions/source/bibliography/loadlisteneradapter.hxx
+++ b/extensions/source/bibliography/loadlisteneradapter.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef EXTENSIONS_BIB_LOADLISTENERADAPTER_HXX
-#define EXTENSIONS_BIB_LOADLISTENERADAPTER_HXX
+#ifndef INCLUDED_EXTENSIONS_SOURCE_BIBLIOGRAPHY_LOADLISTENERADAPTER_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_BIBLIOGRAPHY_LOADLISTENERADAPTER_HXX
 
 #include <osl/mutex.hxx>
 #include <com/sun/star/lang/XComponent.hpp>
@@ -173,6 +173,6 @@ namespace bib
 }   // namespace bib
 
 
-#endif // EXTENSIONS_BIB_LOADLISTENERADAPTER_HXX
+#endif // INCLUDED_EXTENSIONS_SOURCE_BIBLIOGRAPHY_LOADLISTENERADAPTER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/bibliography/toolbar.hxx b/extensions/source/bibliography/toolbar.hxx
index 4daaff7cd1bc..e89899ded45d 100644
--- a/extensions/source/bibliography/toolbar.hxx
+++ b/extensions/source/bibliography/toolbar.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _BIB_TOOLBAR_HXX
-#define _BIB_TOOLBAR_HXX
+#ifndef INCLUDED_EXTENSIONS_SOURCE_BIBLIOGRAPHY_TOOLBAR_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_BIBLIOGRAPHY_TOOLBAR_HXX
 
 #include <com/sun/star/frame/XController.hpp>
 #include <com/sun/star/frame/XStatusListener.hpp>
diff --git a/extensions/source/config/ldap/ldapaccess.hxx b/extensions/source/config/ldap/ldapaccess.hxx
index a991d0692781..16d512863e0d 100644
--- a/extensions/source/config/ldap/ldapaccess.hxx
+++ b/extensions/source/config/ldap/ldapaccess.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef EXTENSIONS_CONFIG_LDAP_LDAPACCESS_HXX_
-#define EXTENSIONS_CONFIG_LDAP_LDAPACCESS_HXX_
+#ifndef INCLUDED_EXTENSIONS_SOURCE_CONFIG_LDAP_LDAPACCESS_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_CONFIG_LDAP_LDAPACCESS_HXX
 
 #include "sal/config.h"
 
diff --git a/extensions/source/config/ldap/ldapuserprofilebe.hxx b/extensions/source/config/ldap/ldapuserprofilebe.hxx
index 359cd15f9091..b27ab2be31b7 100644
--- a/extensions/source/config/ldap/ldapuserprofilebe.hxx
+++ b/extensions/source/config/ldap/ldapuserprofilebe.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef EXTENSIONS_CONFIG_LDAP_LDAPUSERPROFILEBE_HXX_
-#define EXTENSIONS_CONFIG_LDAP_LDAPUSERPROFILEBE_HXX_
+#ifndef INCLUDED_EXTENSIONS_SOURCE_CONFIG_LDAP_LDAPUSERPROFILEBE_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_CONFIG_LDAP_LDAPUSERPROFILEBE_HXX
 
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
diff --git a/extensions/source/dbpilots/commonpagesdbp.hxx b/extensions/source/dbpilots/commonpagesdbp.hxx
index 286b0a60bb0b..b348b9438185 100644
--- a/extensions/source/dbpilots/commonpagesdbp.hxx
+++ b/extensions/source/dbpilots/commonpagesdbp.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _EXTENSIONS_DBP_COMMONPAGESDBP_HXX_
-#define _EXTENSIONS_DBP_COMMONPAGESDBP_HXX_
+#ifndef INCLUDED_EXTENSIONS_SOURCE_DBPILOTS_COMMONPAGESDBP_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_DBPILOTS_COMMONPAGESDBP_HXX
 
 #include "controlwizard.hxx"
 #include <vcl/fixed.hxx>
@@ -134,6 +134,6 @@ namespace dbp
 
 
 
-#endif // _EXTENSIONS_DBP_COMMONPAGESDBP_HXX_
+#endif // INCLUDED_EXTENSIONS_SOURCE_DBPILOTS_COMMONPAGESDBP_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/dbpilots/controlwizard.hxx b/extensions/source/dbpilots/controlwizard.hxx
index 1ef099113faa..d2388d3b75b8 100644
--- a/extensions/source/dbpilots/controlwizard.hxx
+++ b/extensions/source/dbpilots/controlwizard.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _EXTENSIONS_DBP_CONTROLWIZARD_HXX
-#define _EXTENSIONS_DBP_CONTROLWIZARD_HXX
+#ifndef INCLUDED_EXTENSIONS_SOURCE_DBPILOTS_CONTROLWIZARD_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_DBPILOTS_CONTROLWIZARD_HXX
 
 #include <svtools/wizardmachine.hxx>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
@@ -169,6 +169,6 @@ namespace dbp
 }   // namespace dbp
 
 
-#endif // _EXTENSIONS_DBP_CONTROLWIZARD_HXX
+#endif // INCLUDED_EXTENSIONS_SOURCE_DBPILOTS_CONTROLWIZARD_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/dbpilots/dbptools.hxx b/extensions/source/dbpilots/dbptools.hxx
index 2ab984699f06..4a15509c640c 100644
--- a/extensions/source/dbpilots/dbptools.hxx
+++ b/extensions/source/dbpilots/dbptools.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _EXTENSIONS_DBP_DBPTOOLS_HXX_
-#define _EXTENSIONS_DBP_DBPTOOLS_HXX_
+#ifndef INCLUDED_EXTENSIONS_SOURCE_DBPILOTS_DBPTOOLS_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_DBPILOTS_DBPTOOLS_HXX
 
 #include <com/sun/star/container/XNameAccess.hpp>
 
@@ -36,6 +36,6 @@ namespace dbp
 
 
 
-#endif // _EXTENSIONS_DBP_DBPTOOLS_HXX_
+#endif // INCLUDED_EXTENSIONS_SOURCE_DBPILOTS_DBPTOOLS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/dbpilots/dbptypes.hxx b/extensions/source/dbpilots/dbptypes.hxx
index cd41db446e7a..e8e68452edc0 100644
--- a/extensions/source/dbpilots/dbptypes.hxx
+++ b/extensions/source/dbpilots/dbptypes.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _EXTENSIONS_DBP_DBPTYPES_HXX_
-#define _EXTENSIONS_DBP_DBPTYPES_HXX_
+#ifndef INCLUDED_EXTENSIONS_SOURCE_DBPILOTS_DBPTYPES_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_DBPILOTS_DBPTYPES_HXX
 
 #include <sal/config.h>
 
@@ -38,6 +38,6 @@ namespace dbp
 
 }   // namespace dbp
 
-#endif // _EXTENSIONS_DBP_DBPTYPES_HXX_
+#endif // INCLUDED_EXTENSIONS_SOURCE_DBPILOTS_DBPTYPES_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/dbpilots/gridwizard.hxx b/extensions/source/dbpilots/gridwizard.hxx
index 4d208376bf58..128d1e68b6e9 100644
--- a/extensions/source/dbpilots/gridwizard.hxx
+++ b/extensions/source/dbpilots/gridwizard.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _EXTENSIONS_DBP_GRIDWIZARD_HXX_
-#define _EXTENSIONS_DBP_GRIDWIZARD_HXX_
+#ifndef INCLUDED_EXTENSIONS_SOURCE_DBPILOTS_GRIDWIZARD_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_DBPILOTS_GRIDWIZARD_HXX
 
 #include "controlwizard.hxx"
 #include "commonpagesdbp.hxx"
@@ -124,6 +124,6 @@ namespace dbp
 }   // namespace dbp
 
 
-#endif // _EXTENSIONS_DBP_GRIDWIZARD_HXX_
+#endif // INCLUDED_EXTENSIONS_SOURCE_DBPILOTS_GRIDWIZARD_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/dbpilots/groupboxwiz.hxx b/extensions/source/dbpilots/groupboxwiz.hxx
index 1c9bdcb5255f..ee250cb47506 100644
--- a/extensions/source/dbpilots/groupboxwiz.hxx
+++ b/extensions/source/dbpilots/groupboxwiz.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _EXTENSIONS_DBP_GROUPBOXWIZ_HXX_
-#define _EXTENSIONS_DBP_GROUPBOXWIZ_HXX_
+#ifndef INCLUDED_EXTENSIONS_SOURCE_DBPILOTS_GROUPBOXWIZ_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_DBPILOTS_GROUPBOXWIZ_HXX
 
 #include "controlwizard.hxx"
 #include "commonpagesdbp.hxx"
@@ -217,6 +217,6 @@ namespace dbp
 }   // namespace dbp
 
 
-#endif // _EXTENSIONS_DBP_GROUPBOXWIZ_HXX_
+#endif // INCLUDED_EXTENSIONS_SOURCE_DBPILOTS_GROUPBOXWIZ_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/dbpilots/listcombowizard.hxx b/extensions/source/dbpilots/listcombowizard.hxx
index fb0899393c94..e1d86cd6e26b 100644
--- a/extensions/source/dbpilots/listcombowizard.hxx
+++ b/extensions/source/dbpilots/listcombowizard.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _EXTENSIONS_DBP_LISTCOMBOWIZARD_HXX_
-#define _EXTENSIONS_DBP_LISTCOMBOWIZARD_HXX_
+#ifndef INCLUDED_EXTENSIONS_SOURCE_DBPILOTS_LISTCOMBOWIZARD_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_DBPILOTS_LISTCOMBOWIZARD_HXX
 
 #include "controlwizard.hxx"
 #include "commonpagesdbp.hxx"
@@ -215,6 +215,6 @@ namespace dbp
 }   // namespace dbp
 
 
-#endif // _EXTENSIONS_DBP_LISTCOMBOWIZARD_HXX_
+#endif // INCLUDED_EXTENSIONS_SOURCE_DBPILOTS_LISTCOMBOWIZARD_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/dbpilots/optiongrouplayouter.hxx b/extensions/source/dbpilots/optiongrouplayouter.hxx
index 54c2113ab3b3..6b701b49ab9b 100644
--- a/extensions/source/dbpilots/optiongrouplayouter.hxx
+++ b/extensions/source/dbpilots/optiongrouplayouter.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _EXTENSIONS_DBP_OPTIONGROUPLAYOUTER_HXX_
-#define _EXTENSIONS_DBP_OPTIONGROUPLAYOUTER_HXX_
+#ifndef INCLUDED_EXTENSIONS_SOURCE_DBPILOTS_OPTIONGROUPLAYOUTER_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_DBPILOTS_OPTIONGROUPLAYOUTER_HXX
 
 #include <com/sun/star/drawing/XDrawPage.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
@@ -63,6 +63,6 @@ namespace dbp
 }   // namespace dbp
 
 
-#endif // _EXTENSIONS_DBP_OPTIONGROUPLAYOUTER_HXX_
+#endif // INCLUDED_EXTENSIONS_SOURCE_DBPILOTS_OPTIONGROUPLAYOUTER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/dbpilots/unoautopilot.hxx b/extensions/source/dbpilots/unoautopilot.hxx
index 299def94717d..ac053f9ea038 100644
--- a/extensions/source/dbpilots/unoautopilot.hxx
+++ b/extensions/source/dbpilots/unoautopilot.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _EXTENSIONS_DBP_UNOAUTOPILOT_HXX_
-#define _EXTENSIONS_DBP_UNOAUTOPILOT_HXX_
+#ifndef INCLUDED_EXTENSIONS_SOURCE_DBPILOTS_UNOAUTOPILOT_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_DBPILOTS_UNOAUTOPILOT_HXX
 
 #include <svtools/genericunodialog.hxx>
 #include <comphelper/processfactory.hxx>
@@ -95,6 +95,6 @@ namespace dbp
 }   // namespace dbp
 
 
-#endif // _EXTENSIONS_DBP_UNOAUTOPILOT_HXX_
+#endif // INCLUDED_EXTENSIONS_SOURCE_DBPILOTS_UNOAUTOPILOT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/dbpilots/wizardcontext.hxx b/extensions/source/dbpilots/wizardcontext.hxx
index ec4ea9f3202c..523e09f053c1 100644
--- a/extensions/source/dbpilots/wizardcontext.hxx
+++ b/extensions/source/dbpilots/wizardcontext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _EXTENSIONS_DBP_WIZARDCONTEXT_HXX_
-#define _EXTENSIONS_DBP_WIZARDCONTEXT_HXX_
+#ifndef INCLUDED_EXTENSIONS_SOURCE_DBPILOTS_WIZARDCONTEXT_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_DBPILOTS_WIZARDCONTEXT_HXX
 
 #include <sal/config.h>
 
@@ -84,6 +84,6 @@ namespace dbp
 }   // namespace dbp
 
 
-#endif // _EXTENSIONS_DBP_WIZARDCONTEXT_HXX_
+#endif // INCLUDED_EXTENSIONS_SOURCE_DBPILOTS_WIZARDCONTEXT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/dbpilots/wizardservices.hxx b/extensions/source/dbpilots/wizardservices.hxx
index fbcc9a785c24..85637a4edaf6 100644
--- a/extensions/source/dbpilots/wizardservices.hxx
+++ b/extensions/source/dbpilots/wizardservices.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _EXTENSIONS_DBW_WIZARDSERVICES_HXX_
-#define _EXTENSIONS_DBW_WIZARDSERVICES_HXX_
+#ifndef INCLUDED_EXTENSIONS_SOURCE_DBPILOTS_WIZARDSERVICES_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_DBPILOTS_WIZARDSERVICES_HXX
 
 #include <com/sun/star/uno/Sequence.hxx>
 #include <rtl/ustring.hxx>
@@ -68,6 +68,6 @@ namespace dbp
 }   // namespace dbp
 
 
-#endif // _EXTENSIONS_DBW_WIZARDSERVICES_HXX_
+#endif // INCLUDED_EXTENSIONS_SOURCE_DBPILOTS_WIZARDSERVICES_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/inc/componentmodule.hxx b/extensions/source/inc/componentmodule.hxx
index 2f2e5ad0ad5b..b1d039b29181 100644
--- a/extensions/source/inc/componentmodule.hxx
+++ b/extensions/source/inc/componentmodule.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _EXTENSIONS_COMPONENT_MODULE_HXX_
-#define _EXTENSIONS_COMPONENT_MODULE_HXX_
+#ifndef INCLUDED_EXTENSIONS_SOURCE_INC_COMPONENTMODULE_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_INC_COMPONENTMODULE_HXX
 
 /** you may find this file helpful if you implement a component (in it's own library) which can't use
     the usual infrastructure.<br/>
@@ -251,6 +251,6 @@ typedef ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleService
 }   // namespace COMPMOD_NAMESPACE
 
 
-#endif // _EXTENSIONS_COMPONENT_MODULE_HXX_
+#endif // INCLUDED_EXTENSIONS_SOURCE_INC_COMPONENTMODULE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/logging/log_module.hxx b/extensions/source/logging/log_module.hxx
index 6981a90edc89..f6f53971ece4 100644
--- a/extensions/source/logging/log_module.hxx
+++ b/extensions/source/logging/log_module.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef EXTENSIONS_LOG_MODULE_HXX
-#define EXTENSIONS_LOG_MODULE_HXX
+#ifndef INCLUDED_EXTENSIONS_SOURCE_LOGGING_LOG_MODULE_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_LOGGING_LOG_MODULE_HXX
 
 #include <comphelper/componentmodule.hxx>
 
@@ -81,6 +81,6 @@ namespace logging
 } // namespace logging
 
 
-#endif // EXTENSIONS_LOG_MODULE_HXX
+#endif // INCLUDED_EXTENSIONS_SOURCE_LOGGING_LOG_MODULE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/logging/loggerconfig.hxx b/extensions/source/logging/loggerconfig.hxx
index f43c995a5c98..72724b39a44b 100644
--- a/extensions/source/logging/loggerconfig.hxx
+++ b/extensions/source/logging/loggerconfig.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef EXTENSIONS_LOGGERCONFIG_HXX
-#define EXTENSIONS_LOGGERCONFIG_HXX
+#ifndef INCLUDED_EXTENSIONS_SOURCE_LOGGING_LOGGERCONFIG_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_LOGGING_LOGGERCONFIG_HXX
 
 #include <com/sun/star/logging/XLogger.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
@@ -48,6 +48,6 @@ namespace logging
 } // namespace logging
 
 
-#endif // EXTENSIONS_LOGGERCONFIG_HXX
+#endif // INCLUDED_EXTENSIONS_SOURCE_LOGGING_LOGGERCONFIG_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/logging/loghandler.hxx b/extensions/source/logging/loghandler.hxx
index 422b777bd003..a0c8693e4500 100644
--- a/extensions/source/logging/loghandler.hxx
+++ b/extensions/source/logging/loghandler.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef LOGHANDLER_HXX
-#define LOGHANDLER_HXX
+#ifndef INCLUDED_EXTENSIONS_SOURCE_LOGGING_LOGHANDLER_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_LOGGING_LOGHANDLER_HXX
 
 #include <com/sun/star/logging/XLogFormatter.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
@@ -141,6 +141,6 @@ namespace logging
 } // namespace logging
 
 
-#endif // LOGHANDLER_HXX
+#endif // INCLUDED_EXTENSIONS_SOURCE_LOGGING_LOGHANDLER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/logging/logrecord.hxx b/extensions/source/logging/logrecord.hxx
index 20389a085bf6..dfc7e9db47c2 100644
--- a/extensions/source/logging/logrecord.hxx
+++ b/extensions/source/logging/logrecord.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef LOGRECORD_HXX
-#define LOGRECORD_HXX
+#ifndef INCLUDED_EXTENSIONS_SOURCE_LOGGING_LOGRECORD_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_LOGGING_LOGRECORD_HXX
 
 #include <com/sun/star/logging/LogRecord.hpp>
 
@@ -55,6 +55,6 @@ namespace logging
 } // namespace logging
 
 
-#endif // LOGRECORD_HXX
+#endif // INCLUDED_EXTENSIONS_SOURCE_LOGGING_LOGRECORD_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/logging/methodguard.hxx b/extensions/source/logging/methodguard.hxx
index ce2d29cf707f..e0d501f5f9cb 100644
--- a/extensions/source/logging/methodguard.hxx
+++ b/extensions/source/logging/methodguard.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef EXTENSIONS_METHODGUARD_HXX
-#define EXTENSIONS_METHODGUARD_HXX
+#ifndef INCLUDED_EXTENSIONS_SOURCE_LOGGING_METHODGUARD_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_LOGGING_METHODGUARD_HXX
 
 
 namespace logging
@@ -58,6 +58,6 @@ namespace logging
 } // namespace logging
 
 
-#endif // EXTENSIONS_METHODGUARD_HXX
+#endif // INCLUDED_EXTENSIONS_SOURCE_LOGGING_METHODGUARD_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/nsplugin/source/ns_debug.hxx b/extensions/source/nsplugin/source/ns_debug.hxx
index 38c9a2af3626..dc6ddc3f4942 100644
--- a/extensions/source/nsplugin/source/ns_debug.hxx
+++ b/extensions/source/nsplugin/source/ns_debug.hxx
@@ -26,8 +26,8 @@
  *
  ************************************************************************/
 
-#ifndef __NSDEBUG_HXX_
-#define __NSDEBUG_HXX_
+#ifndef INCLUDED_EXTENSIONS_SOURCE_NSPLUGIN_SOURCE_NS_DEBUG_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_NSPLUGIN_SOURCE_NS_DEBUG_HXX
 
 #define NPP_PATH_MAX    1024
 #define NPP_BUFFER_SIZE 1024
diff --git a/extensions/source/nsplugin/source/nsp_func.hxx b/extensions/source/nsplugin/source/nsp_func.hxx
index ca1a62a8ecca..bcf4bf1f2ad0 100644
--- a/extensions/source/nsplugin/source/nsp_func.hxx
+++ b/extensions/source/nsplugin/source/nsp_func.hxx
@@ -25,8 +25,8 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __NSP_FUNC_HXX
-#define __NSP_FUNC_HXX
+#ifndef INCLUDED_EXTENSIONS_SOURCE_NSPLUGIN_SOURCE_NSP_FUNC_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_NSPLUGIN_SOURCE_NSP_FUNC_HXX
 
 
 // Some function different from UNIX and Window.
@@ -98,6 +98,6 @@ typedef HANDLE NSP_PIPE_FD;
 #endif //end of WNT
 
 
-#endif //end of  __NSP_FUNC_HXX
+#endif //end of INCLUDED_EXTENSIONS_SOURCE_NSPLUGIN_SOURCE_NSP_FUNC_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/nsplugin/source/nsp_windows.hxx b/extensions/source/nsplugin/source/nsp_windows.hxx
index cd08c936175b..4dbcc8413652 100644
--- a/extensions/source/nsplugin/source/nsp_windows.hxx
+++ b/extensions/source/nsplugin/source/nsp_windows.hxx
@@ -26,8 +26,8 @@
  *
  ************************************************************************/
 
-#ifndef __NSP_WINDOWS_HXX__
-#define __NSP_WINDOWS_HXX__
+#ifndef INCLUDED_EXTENSIONS_SOURCE_NSPLUGIN_SOURCE_NSP_WINDOWS_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_NSPLUGIN_SOURCE_NSP_WINDOWS_HXX
 #ifdef WNT
 #ifdef _MSC_VER
     #pragma warning (push,1)
diff --git a/extensions/source/nsplugin/source/so_closelistener.hxx b/extensions/source/nsplugin/source/so_closelistener.hxx
index 2bd9cc98e7f0..af38c243b8ab 100644
--- a/extensions/source/nsplugin/source/so_closelistener.hxx
+++ b/extensions/source/nsplugin/source/so_closelistener.hxx
@@ -26,8 +26,8 @@
  *
  ************************************************************************/
 
-#ifndef __SO_CLOSELISTENER_HXX_
-#define __SO_CLOSELISTENER_HXX_
+#ifndef INCLUDED_EXTENSIONS_SOURCE_NSPLUGIN_SOURCE_SO_CLOSELISTENER_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_NSPLUGIN_SOURCE_SO_CLOSELISTENER_HXX
 
 #include <com/sun/star/util/XCloseListener.hpp>
 #include <cppuhelper/implbase1.hxx>
diff --git a/extensions/source/nsplugin/source/so_env.hxx b/extensions/source/nsplugin/source/so_env.hxx
index 461252292a81..28c6c6716409 100644
--- a/extensions/source/nsplugin/source/so_env.hxx
+++ b/extensions/source/nsplugin/source/so_env.hxx
@@ -26,8 +26,8 @@
  *
  ************************************************************************/
 
-#ifndef __SO_ENVIRON_HXX__
-#define __SO_ENVIRON_HXX__
+#ifndef INCLUDED_EXTENSIONS_SOURCE_NSPLUGIN_SOURCE_SO_ENV_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_NSPLUGIN_SOURCE_SO_ENV_HXX
 
 
 
diff --git a/extensions/source/nsplugin/source/so_instance.hxx b/extensions/source/nsplugin/source/so_instance.hxx
index 92b771ed5c5c..7e959b936ad1 100644
--- a/extensions/source/nsplugin/source/so_instance.hxx
+++ b/extensions/source/nsplugin/source/so_instance.hxx
@@ -26,8 +26,8 @@
  *
  ************************************************************************/
 
-#ifndef __SO_INSTANCE_HXX__
-#define __SO_INSTANCE_HXX__
+#ifndef INCLUDED_EXTENSIONS_SOURCE_NSPLUGIN_SOURCE_SO_INSTANCE_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_NSPLUGIN_SOURCE_SO_INSTANCE_HXX
 
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <osl/diagnose.h>
diff --git a/extensions/source/nsplugin/source/so_msg.hxx b/extensions/source/nsplugin/source/so_msg.hxx
index 419dd49053e4..c556bb54137f 100644
--- a/extensions/source/nsplugin/source/so_msg.hxx
+++ b/extensions/source/nsplugin/source/so_msg.hxx
@@ -26,8 +26,8 @@
  *
  ************************************************************************/
 
-#ifndef __PLUGIN_MSG_HXX
-#define __PLUGIN_MSG_HXX
+#ifndef INCLUDED_EXTENSIONS_SOURCE_NSPLUGIN_SOURCE_SO_MSG_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_NSPLUGIN_SOURCE_SO_MSG_HXX
 enum msg_type
 {
     SO_EMPTY,        // 0
diff --git a/extensions/source/ole/comifaces.hxx b/extensions/source/ole/comifaces.hxx
index 5a90e236b3bd..9b2e0899101f 100644
--- a/extensions/source/ole/comifaces.hxx
+++ b/extensions/source/ole/comifaces.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef __COMIFACES_HXX
-#define __COMIFACES_HXX
+#ifndef INCLUDED_EXTENSIONS_SOURCE_OLE_COMIFACES_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_OLE_COMIFACES_HXX
 
 #include <com/sun/star/uno/XInterface.hpp>
 
diff --git a/extensions/source/ole/jscriptclasses.hxx b/extensions/source/ole/jscriptclasses.hxx
index 314631868913..2d692a286689 100644
--- a/extensions/source/ole/jscriptclasses.hxx
+++ b/extensions/source/ole/jscriptclasses.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef JSCRIPTCLASSES_HXX
-#define JSCRIPTCLASSES_HXX
+#ifndef INCLUDED_EXTENSIONS_SOURCE_OLE_JSCRIPTCLASSES_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_OLE_JSCRIPTCLASSES_HXX
 
 #include <wincrap.hxx>
 
diff --git a/extensions/source/ole/ole2uno.hxx b/extensions/source/ole/ole2uno.hxx
index d70908485cc6..b6d74d285fdc 100644
--- a/extensions/source/ole/ole2uno.hxx
+++ b/extensions/source/ole/ole2uno.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _OLE2UNO_HXX
-#define _OLE2UNO_HXX
+#ifndef INCLUDED_EXTENSIONS_SOURCE_OLE_OLE2UNO_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_OLE_OLE2UNO_HXX
 
 
 #ifdef _MSC_VER
@@ -104,6 +104,6 @@ Mutex* getBridgeMutex();
 
 
 
-#endif // _OLE2UNO_HXX
+#endif // INCLUDED_EXTENSIONS_SOURCE_OLE_OLE2UNO_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/ole/oleobjw.hxx b/extensions/source/ole/oleobjw.hxx
index a6485f3c99fe..890a534df9d3 100644
--- a/extensions/source/ole/oleobjw.hxx
+++ b/extensions/source/ole/oleobjw.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OLEOBJW_HXX
-#define OLEOBJW_HXX
+#ifndef INCLUDED_EXTENSIONS_SOURCE_OLE_OLEOBJW_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_OLE_OLEOBJW_HXX
 
 #include "ole2uno.hxx"
 #include "wincrap.hxx"
diff --git a/extensions/source/ole/servprov.hxx b/extensions/source/ole/servprov.hxx
index a174766ec0a0..f085e8cb5c48 100644
--- a/extensions/source/ole/servprov.hxx
+++ b/extensions/source/ole/servprov.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SERVPROV_HXX
-#define _SERVPROV_HXX
+#ifndef INCLUDED_EXTENSIONS_SOURCE_OLE_SERVPROV_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_OLE_SERVPROV_HXX
 
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <cppuhelper/implbase2.hxx>
diff --git a/extensions/source/ole/unoobjw.hxx b/extensions/source/ole/unoobjw.hxx
index 4d3193698085..c39bd237994d 100644
--- a/extensions/source/ole/unoobjw.hxx
+++ b/extensions/source/ole/unoobjw.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _UNOOBJW_HXX
-#define _UNOOBJW_HXX
+#ifndef INCLUDED_EXTENSIONS_SOURCE_OLE_UNOOBJW_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_OLE_UNOOBJW_HXX
 
 #include <com/sun/star/bridge/XBridgeSupplier2.hpp>
 #include <com/sun/star/beans/XExactName.hpp>
diff --git a/extensions/source/ole/unotypewrapper.hxx b/extensions/source/ole/unotypewrapper.hxx
index a55b4912e75f..ef1c422069b6 100644
--- a/extensions/source/ole/unotypewrapper.hxx
+++ b/extensions/source/ole/unotypewrapper.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef UNO_TYPE_WRAPPER_HXX
-#define UNO_TYPE_WRAPPER_HXX
+#ifndef INCLUDED_EXTENSIONS_SOURCE_OLE_UNOTYPEWRAPPER_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_OLE_UNOTYPEWRAPPER_HXX
 
 #include <wincrap.hxx>
 
diff --git a/extensions/source/ole/wincrap.hxx b/extensions/source/ole/wincrap.hxx
index 29801c2e7b9d..389d3ce106db 100644
--- a/extensions/source/ole/wincrap.hxx
+++ b/extensions/source/ole/wincrap.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OLE_WIN_HXX
-#define OLE_WIN_HXX
+#ifndef INCLUDED_EXTENSIONS_SOURCE_OLE_WINCRAP_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_OLE_WINCRAP_HXX
 
 /* wrap all includes that need to be wrapped by presys.h/postsys.h here */
 
@@ -53,6 +53,6 @@ extern CComModule _Module;
 
 #pragma warning (pop)
 
-#endif // OLE_WIN_HXX
+#endif // INCLUDED_EXTENSIONS_SOURCE_OLE_WINCRAP_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/ole/windata.hxx b/extensions/source/ole/windata.hxx
index 681784760c0b..fd907d882984 100644
--- a/extensions/source/ole/windata.hxx
+++ b/extensions/source/ole/windata.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef AUTOMATION_BRIDGE_WINDATA_HXX
-#define AUTOMATION_BRIDGE_WINDATA_HXX
+#ifndef INCLUDED_EXTENSIONS_SOURCE_OLE_WINDATA_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_OLE_WINDATA_HXX
 
 #pragma warning (push,1)
 #pragma warning (disable:4668)
diff --git a/extensions/source/plugin/inc/plugin/aqua/sysplug.hxx b/extensions/source/plugin/inc/plugin/aqua/sysplug.hxx
index c4ee3723b60c..baeba80d473c 100644
--- a/extensions/source/plugin/inc/plugin/aqua/sysplug.hxx
+++ b/extensions/source/plugin/inc/plugin/aqua/sysplug.hxx
@@ -25,8 +25,8 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef PLUGIN_INC_MACPLUG_HXX
-#define PLUGIN_INC_MACPLUG_HXX
+#ifndef INCLUDED_EXTENSIONS_SOURCE_PLUGIN_INC_PLUGIN_AQUA_SYSPLUG_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_PLUGIN_INC_PLUGIN_AQUA_SYSPLUG_HXX
 
 #include <unistd.h>
 
diff --git a/extensions/source/plugin/inc/plugin/impl.hxx b/extensions/source/plugin/inc/plugin/impl.hxx
index 0ceb7cade826..2a1639093db0 100644
--- a/extensions/source/plugin/inc/plugin/impl.hxx
+++ b/extensions/source/plugin/inc/plugin/impl.hxx
@@ -25,8 +25,8 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef PLUGIN_SOURCE_MGR_IMPL_HXX
-#define PLUGIN_SOURCE_MGR_IMPL_HXX
+#ifndef INCLUDED_EXTENSIONS_SOURCE_PLUGIN_INC_PLUGIN_IMPL_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_PLUGIN_INC_PLUGIN_IMPL_HXX
 
 #include <config_lgpl.h>
 
diff --git a/extensions/source/plugin/inc/plugin/model.hxx b/extensions/source/plugin/inc/plugin/model.hxx
index cc516521e8d4..4cf7bdd2e1e0 100644
--- a/extensions/source/plugin/inc/plugin/model.hxx
+++ b/extensions/source/plugin/inc/plugin/model.hxx
@@ -25,8 +25,8 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __PLUGIN_MODEL_HXX
-#define __PLUGIN_MODEL_HXX
+#ifndef INCLUDED_EXTENSIONS_SOURCE_PLUGIN_INC_PLUGIN_MODEL_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_PLUGIN_INC_PLUGIN_MODEL_HXX
 
 #include <com/sun/star/io/XObjectInputStream.hpp>
 #include <com/sun/star/io/XPersistObject.hpp>
@@ -134,6 +134,6 @@ class PluginModel : public BroadcasterHelperHolder,
 };
 Reference< XInterface >  SAL_CALL PluginModel_CreateInstance( const Reference< com::sun::star::lang::XMultiServiceFactory >  & ) throw( Exception );
 
-#endif // __PLUGIN_MODEL_HXX
+#endif // INCLUDED_EXTENSIONS_SOURCE_PLUGIN_INC_PLUGIN_MODEL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/plugin/inc/plugin/multiplx.hxx b/extensions/source/plugin/inc/plugin/multiplx.hxx
index 1f68d6508a9e..b8177f5ed9c1 100644
--- a/extensions/source/plugin/inc/plugin/multiplx.hxx
+++ b/extensions/source/plugin/inc/plugin/multiplx.hxx
@@ -25,8 +25,8 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef _MRC_MULTIPLX_HXX
-#define _MRC_MULTIPLX_HXX
+#ifndef INCLUDED_EXTENSIONS_SOURCE_PLUGIN_INC_PLUGIN_MULTIPLX_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_PLUGIN_INC_PLUGIN_MULTIPLX_HXX
 
 #include <com/sun/star/awt/XControl.hpp>
 #include <com/sun/star/awt/XKeyListener.hpp>
@@ -162,7 +162,7 @@ private:
     MRCListenerMultiplexerHelper & operator = ( const MRCListenerMultiplexerHelper & );
 };
 
-#endif  // _MRC_MULTIPLX_HXX
+#endif // INCLUDED_EXTENSIONS_SOURCE_PLUGIN_INC_PLUGIN_MULTIPLX_HXX
 
 
 
diff --git a/extensions/source/plugin/inc/plugin/plcom.hxx b/extensions/source/plugin/inc/plugin/plcom.hxx
index b685abcd9bdc..e08c264b519e 100644
--- a/extensions/source/plugin/inc/plugin/plcom.hxx
+++ b/extensions/source/plugin/inc/plugin/plcom.hxx
@@ -25,8 +25,8 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __PLUGIN_INC_PLCOM_HXX
-#define __PLUGIN_INC_PLCOM_HXX
+#ifndef INCLUDED_EXTENSIONS_SOURCE_PLUGIN_INC_PLUGIN_PLCOM_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_PLUGIN_INC_PLUGIN_PLCOM_HXX
 
 #include <list>
 
diff --git a/extensions/source/plugin/inc/plugin/plctrl.hxx b/extensions/source/plugin/inc/plugin/plctrl.hxx
index 2928a11f34fa..77972c1e4a52 100644
--- a/extensions/source/plugin/inc/plugin/plctrl.hxx
+++ b/extensions/source/plugin/inc/plugin/plctrl.hxx
@@ -25,8 +25,8 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __PLCTRL_HXX
-#define __PLCTRL_HXX
+#ifndef INCLUDED_EXTENSIONS_SOURCE_PLUGIN_INC_PLUGIN_PLCTRL_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_PLUGIN_INC_PLUGIN_PLCTRL_HXX
 
 #include <cppuhelper/weak.hxx>
 #include <plugin/multiplx.hxx>
diff --git a/extensions/source/plugin/inc/plugin/unx/mediator.hxx b/extensions/source/plugin/inc/plugin/unx/mediator.hxx
index 31148e44f69b..0f69bd5861f5 100644
--- a/extensions/source/plugin/inc/plugin/unx/mediator.hxx
+++ b/extensions/source/plugin/inc/plugin/unx/mediator.hxx
@@ -25,8 +25,8 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef _MEDIATOR_HXX
-#define _MEDIATOR_HXX
+#ifndef INCLUDED_EXTENSIONS_SOURCE_PLUGIN_INC_PLUGIN_UNX_MEDIATOR_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_PLUGIN_INC_PLUGIN_UNX_MEDIATOR_HXX
 
 #include <string.h>
 #include <tools/link.hxx>
@@ -160,6 +160,6 @@ class MediatorListener : public osl::Thread
     virtual void onTerminated() SAL_OVERRIDE;
 };
 
-#endif // _MEDIATOR_HXX
+#endif // INCLUDED_EXTENSIONS_SOURCE_PLUGIN_INC_PLUGIN_UNX_MEDIATOR_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/plugin/inc/plugin/unx/plugcon.hxx b/extensions/source/plugin/inc/plugin/unx/plugcon.hxx
index 1b17152d0e24..0d8f787be5e5 100644
--- a/extensions/source/plugin/inc/plugin/unx/plugcon.hxx
+++ b/extensions/source/plugin/inc/plugin/unx/plugcon.hxx
@@ -25,8 +25,8 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef _PLUGCON_HXX
-#define _PLUGCON_HXX
+#ifndef INCLUDED_EXTENSIONS_SOURCE_PLUGIN_INC_PLUGIN_UNX_PLUGCON_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_PLUGIN_INC_PLUGIN_UNX_PLUGCON_HXX
 
 #include <stdarg.h>
 #include <string.h>
@@ -224,6 +224,6 @@ const char* GetCommandName( CommandAtoms );
 
 #define POST_STRING( x ) x ? x : const_cast<char*>(""), x ? strlen(x) : 1
 
-#endif // _PLUGCON_HXX
+#endif // INCLUDED_EXTENSIONS_SOURCE_PLUGIN_INC_PLUGIN_UNX_PLUGCON_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/plugin/inc/plugin/unx/sysplug.hxx b/extensions/source/plugin/inc/plugin/unx/sysplug.hxx
index fc9ab48a1dcd..982c8ee7aa25 100644
--- a/extensions/source/plugin/inc/plugin/unx/sysplug.hxx
+++ b/extensions/source/plugin/inc/plugin/unx/sysplug.hxx
@@ -25,8 +25,8 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef __PLUGIN_INC_UNXPLUG_HXX
-#define __PLUGIN_INC_UNXPLUG_HXX
+#ifndef INCLUDED_EXTENSIONS_SOURCE_PLUGIN_INC_PLUGIN_UNX_SYSPLUG_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_PLUGIN_INC_PLUGIN_UNX_SYSPLUG_HXX
 
 #include <unistd.h>
 
diff --git a/extensions/source/plugin/inc/plugin/win/sysplug.hxx b/extensions/source/plugin/inc/plugin/win/sysplug.hxx
index 509c77e3a3f5..948fe62c2523 100644
--- a/extensions/source/plugin/inc/plugin/win/sysplug.hxx
+++ b/extensions/source/plugin/inc/plugin/win/sysplug.hxx
@@ -26,8 +26,8 @@
  *
  ************************************************************************/
 
-#ifndef __PLUGIN_INC_WINPLUG_HXX
-#define __PLUGIN_INC_WINPLUG_HXX
+#ifndef INCLUDED_EXTENSIONS_SOURCE_PLUGIN_INC_PLUGIN_WIN_SYSPLUG_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_PLUGIN_INC_PLUGIN_WIN_SYSPLUG_HXX
 
 #if defined _MSC_VER
 #pragma warning (push,1)
diff --git a/extensions/source/propctrlr/MasterDetailLinkDialog.hxx b/extensions/source/propctrlr/MasterDetailLinkDialog.hxx
index 1df195f879c2..392310085e91 100644
--- a/extensions/source/propctrlr/MasterDetailLinkDialog.hxx
+++ b/extensions/source/propctrlr/MasterDetailLinkDialog.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef PROPCTRLR_MASTERDETAILLINKDIALOG_HXX
-#define PROPCTRLR_MASTERDETAILLINKDIALOG_HXX
+#ifndef INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_MASTERDETAILLINKDIALOG_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_MASTERDETAILLINKDIALOG_HXX
 #include <svtools/genericunodialog.hxx>
 #include "modulepcr.hxx"
 
@@ -73,6 +73,6 @@ namespace pcr
 
 }   // namespace pcr
 
-#endif // PROPCTRLR_MASTERDETAILLINKDIALOG_HXX
+#endif // INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_MASTERDETAILLINKDIALOG_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/propctrlr/browserline.hxx b/extensions/source/propctrlr/browserline.hxx
index 1c8b6e4d265f..4a1edf8e1a6a 100644
--- a/extensions/source/propctrlr/browserline.hxx
+++ b/extensions/source/propctrlr/browserline.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _EXTENSIONS_PROPCTRLR_BROWSERLINE_HXX_
-#define _EXTENSIONS_PROPCTRLR_BROWSERLINE_HXX_
+#ifndef INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_BROWSERLINE_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_BROWSERLINE_HXX
 
 #include <com/sun/star/inspection/XPropertyControl.hpp>
 #include <vcl/fixed.hxx>
@@ -130,6 +130,6 @@ namespace pcr
 } // namespace pcr
 
 
-#endif // _EXTENSIONS_PROPCTRLR_BROWSERLINE_HXX_
+#endif // INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_BROWSERLINE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/propctrlr/browserlistbox.hxx b/extensions/source/propctrlr/browserlistbox.hxx
index a7a050b6db85..adac46c12828 100644
--- a/extensions/source/propctrlr/browserlistbox.hxx
+++ b/extensions/source/propctrlr/browserlistbox.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _EXTENSIONS_PROPCTRLR_BROWSERLISTBOX_HXX_
-#define _EXTENSIONS_PROPCTRLR_BROWSERLISTBOX_HXX_
+#ifndef INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_BROWSERLISTBOX_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_BROWSERLISTBOX_HXX
 
 #include "browserline.hxx"
 #include "modulepcr.hxx"
@@ -223,7 +223,7 @@ namespace pcr
 } // namespace pcr
 
 
-#endif // _EXTENSIONS_PROPCTRLR_BROWSERLISTBOX_HXX_
+#endif // INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_BROWSERLISTBOX_HXX
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/propctrlr/browserpage.hxx b/extensions/source/propctrlr/browserpage.hxx
index bc013c3eb3b3..b1420cda2467 100644
--- a/extensions/source/propctrlr/browserpage.hxx
+++ b/extensions/source/propctrlr/browserpage.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _EXTENSIONS_PROPCTRLR_BROWSERPAGE_HXX_
-#define _EXTENSIONS_PROPCTRLR_BROWSERPAGE_HXX_
+#ifndef INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_BROWSERPAGE_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_BROWSERPAGE_HXX
 
 #include <vcl/tabpage.hxx>
 #include "browserlistbox.hxx"
@@ -55,7 +55,7 @@ namespace pcr
 } // namespace pcr
 
 
-#endif // _EXTENSIONS_PROPCTRLR_BROWSERPAGE_HXX_
+#endif // INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_BROWSERPAGE_HXX
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/propctrlr/browserview.hxx b/extensions/source/propctrlr/browserview.hxx
index 50c86ad8e783..58ffb6c3dad9 100644
--- a/extensions/source/propctrlr/browserview.hxx
+++ b/extensions/source/propctrlr/browserview.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _EXTENSIONS_PROPCTRLR_BROWSERVIEW_HXX_
-#define _EXTENSIONS_PROPCTRLR_BROWSERVIEW_HXX_
+#ifndef INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_BROWSERVIEW_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_BROWSERVIEW_HXX
 
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <vcl/window.hxx>
@@ -71,6 +71,6 @@ namespace pcr
 } // namespace pcr
 
 
-#endif // _EXTENSIONS_PROPCTRLR_BROWSERVIEW_HXX_
+#endif // INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_BROWSERVIEW_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/propctrlr/buttonnavigationhandler.hxx b/extensions/source/propctrlr/buttonnavigationhandler.hxx
index 5a1db39609b8..967e66338029 100644
--- a/extensions/source/propctrlr/buttonnavigationhandler.hxx
+++ b/extensions/source/propctrlr/buttonnavigationhandler.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef EXTENSIONS_SOURCE_PROPCTRLR_BUTTONNAVIGATIONHANDLER_HXX
-#define EXTENSIONS_SOURCE_PROPCTRLR_BUTTONNAVIGATIONHANDLER_HXX
+#ifndef INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_BUTTONNAVIGATIONHANDLER_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_BUTTONNAVIGATIONHANDLER_HXX
 
 #include "propertyhandler.hxx"
 
@@ -75,6 +75,6 @@ namespace pcr
 } // namespace pcr
 
 
-#endif // EXTENSIONS_SOURCE_PROPCTRLR_BUTTONNAVIGATIONHANDLER_HXX
+#endif // INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_BUTTONNAVIGATIONHANDLER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/propctrlr/cellbindinghandler.hxx b/extensions/source/propctrlr/cellbindinghandler.hxx
index 68342a643efc..d29d73a567db 100644
--- a/extensions/source/propctrlr/cellbindinghandler.hxx
+++ b/extensions/source/propctrlr/cellbindinghandler.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef EXTENSIONS_SOURCE_PROPCTRLR_CELLBINDINGHANDLER_HXX
-#define EXTENSIONS_SOURCE_PROPCTRLR_CELLBINDINGHANDLER_HXX
+#ifndef INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_CELLBINDINGHANDLER_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_CELLBINDINGHANDLER_HXX
 
 #include "propertyhandler.hxx"
 
@@ -95,6 +95,6 @@ namespace pcr
 } // namespace pcr
 
 
-#endif // EXTENSIONS_SOURCE_PROPCTRLR_CELLBINDINGHANDLER_HXX
+#endif // INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_CELLBINDINGHANDLER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/propctrlr/cellbindinghelper.hxx b/extensions/source/propctrlr/cellbindinghelper.hxx
index 532438dc9844..f271e9889cad 100644
--- a/extensions/source/propctrlr/cellbindinghelper.hxx
+++ b/extensions/source/propctrlr/cellbindinghelper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef EXTENSIONS_PROPCTRLR_CELLBINDINGHELPER_HXX
-#define EXTENSIONS_PROPCTRLR_CELLBINDINGHELPER_HXX
+#ifndef INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_CELLBINDINGHELPER_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_CELLBINDINGHELPER_HXX
 
 #include <com/sun/star/frame/XModel.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
@@ -277,6 +277,6 @@ namespace pcr
 }   // namespace pcr
 
 
-#endif // EXTENSIONS_PROPCTRLR_CELLBINDINGHELPER_HXX
+#endif // INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_CELLBINDINGHELPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/propctrlr/commoncontrol.hxx b/extensions/source/propctrlr/commoncontrol.hxx
index 26e5337f7598..f880a01b0721 100644
--- a/extensions/source/propctrlr/commoncontrol.hxx
+++ b/extensions/source/propctrlr/commoncontrol.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _EXTENSIONS_PROPCTRLR_COMMONCONTROL_HXX_
-#define _EXTENSIONS_PROPCTRLR_COMMONCONTROL_HXX_
+#ifndef INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_COMMONCONTROL_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_COMMONCONTROL_HXX
 
 #include <com/sun/star/inspection/XPropertyControl.hpp>
 #include <com/sun/star/lang/DisposedException.hpp>
@@ -320,6 +320,6 @@ namespace pcr
 } // namespace pcr
 
 
-#endif // _EXTENSIONS_PROPCTRLR_COMMONCONTROL_HXX_
+#endif // INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_COMMONCONTROL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/propctrlr/composeduiupdate.hxx b/extensions/source/propctrlr/composeduiupdate.hxx
index 45ed9854a4a9..74930b169fd6 100644
--- a/extensions/source/propctrlr/composeduiupdate.hxx
+++ b/extensions/source/propctrlr/composeduiupdate.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef EXTENSIONS_SOURCE_PROPCTRLR_COMPOSEDUIUPDATE_HXX
-#define EXTENSIONS_SOURCE_PROPCTRLR_COMPOSEDUIUPDATE_HXX
+#ifndef INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_COMPOSEDUIUPDATE_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_COMPOSEDUIUPDATE_HXX
 
 #include "propertyhandler.hxx"
 
@@ -220,6 +220,6 @@ namespace pcr
 } // namespace pcr
 
 
-#endif // EXTENSIONS_SOURCE_PROPCTRLR_COMPOSEDUIUPDATE_HXX
+#endif // INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_COMPOSEDUIUPDATE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/propctrlr/controlfontdialog.hxx b/extensions/source/propctrlr/controlfontdialog.hxx
index 2aada9d5ec52..efe72404f4de 100644
--- a/extensions/source/propctrlr/controlfontdialog.hxx
+++ b/extensions/source/propctrlr/controlfontdialog.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _EXTENSIONS_PROPCTRLR_CONTROLFONTDIALOG_HXX_
-#define _EXTENSIONS_PROPCTRLR_CONTROLFONTDIALOG_HXX_
+#ifndef INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_CONTROLFONTDIALOG_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_CONTROLFONTDIALOG_HXX
 
 #include <svtools/genericunodialog.hxx>
 #include "modulepcr.hxx"
@@ -91,6 +91,6 @@ namespace pcr
 }   // namespace pcr
 
 
-#endif // _EXTENSIONS_PROPCTRLR_CONTROLFONTDIALOG_HXX_
+#endif // INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_CONTROLFONTDIALOG_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/propctrlr/controltype.hxx b/extensions/source/propctrlr/controltype.hxx
index fc6cf3a59a37..d56ba7402fc5 100644
--- a/extensions/source/propctrlr/controltype.hxx
+++ b/extensions/source/propctrlr/controltype.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef EXTENSIONS_SOURCE_PROPCTRLR_CONTROLTYPE_HXX
-#define EXTENSIONS_SOURCE_PROPCTRLR_CONTROLTYPE_HXX
+#ifndef INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_CONTROLTYPE_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_CONTROLTYPE_HXX
 
 #include <sal/types.h>
 
@@ -42,6 +42,6 @@ namespace pcr
 } // namespacepcr
 
 
-#endif // EXTENSIONS_SOURCE_PROPCTRLR_CONTROLTYPE_HXX
+#endif // INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_CONTROLTYPE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/propctrlr/defaultforminspection.hxx b/extensions/source/propctrlr/defaultforminspection.hxx
index da81086414e7..cfc98ef8925a 100644
--- a/extensions/source/propctrlr/defaultforminspection.hxx
+++ b/extensions/source/propctrlr/defaultforminspection.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef EXTENSIONS_SOURCE_PROPCTRLR_DEFAULTFORMINSPECTION_HXX
-#define EXTENSIONS_SOURCE_PROPCTRLR_DEFAULTFORMINSPECTION_HXX
+#ifndef INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_DEFAULTFORMINSPECTION_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_DEFAULTFORMINSPECTION_HXX
 
 #include "inspectormodelbase.hxx"
 
@@ -78,6 +78,6 @@ namespace pcr
 } // namespace pcr
 
 
-#endif // EXTENSIONS_SOURCE_PROPCTRLR_DEFAULTFORMINSPECTION_HXX
+#endif // INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_DEFAULTFORMINSPECTION_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/propctrlr/defaulthelpprovider.hxx b/extensions/source/propctrlr/defaulthelpprovider.hxx
index a308f06bf7ab..d16f327fe72f 100644
--- a/extensions/source/propctrlr/defaulthelpprovider.hxx
+++ b/extensions/source/propctrlr/defaulthelpprovider.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef EXTENSIONS_DEFAULTHELPPROVIDER_HXX
-#define EXTENSIONS_DEFAULTHELPPROVIDER_HXX
+#ifndef INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_DEFAULTHELPPROVIDER_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_DEFAULTHELPPROVIDER_HXX
 
 #include <com/sun/star/inspection/XPropertyControlObserver.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
@@ -79,6 +79,6 @@ namespace pcr
 } // namespace pcr
 
 
-#endif // EXTENSIONS_DEFAULTHELPPROVIDER_HXX
+#endif // INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_DEFAULTHELPPROVIDER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/propctrlr/editpropertyhandler.hxx b/extensions/source/propctrlr/editpropertyhandler.hxx
index 8cbc02499db8..8afd98291ad3 100644
--- a/extensions/source/propctrlr/editpropertyhandler.hxx
+++ b/extensions/source/propctrlr/editpropertyhandler.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef EXTENSIONS_SOURCE_PROPCTRLR_EDITPROPERTYHANDLER_HXX
-#define EXTENSIONS_SOURCE_PROPCTRLR_EDITPROPERTYHANDLER_HXX
+#ifndef INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_EDITPROPERTYHANDLER_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_EDITPROPERTYHANDLER_HXX
 
 #include "propertyhandler.hxx"
 
@@ -67,6 +67,6 @@ namespace pcr
 } // namespace pcr
 
 
-#endif // EXTENSIONS_SOURCE_PROPCTRLR_EDITPROPERTYHANDLER_HXX
+#endif // INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_EDITPROPERTYHANDLER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/propctrlr/eformshelper.hxx b/extensions/source/propctrlr/eformshelper.hxx
index 22f787e8caff..32d1d89b62e4 100644
--- a/extensions/source/propctrlr/eformshelper.hxx
+++ b/extensions/source/propctrlr/eformshelper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef EXTENSIONS_SOURCE_PROPCTRLR_EFORMSHELPER_HXX
-#define EXTENSIONS_SOURCE_PROPCTRLR_EFORMSHELPER_HXX
+#ifndef INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_EFORMSHELPER_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_EFORMSHELPER_HXX
 
 #include "pcrcommon.hxx"
 
@@ -255,6 +255,6 @@ namespace pcr
 } // namespace pcr
 
 
-#endif // EXTENSIONS_SOURCE_PROPCTRLR_EFORMSHELPER_HXX
+#endif // INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_EFORMSHELPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/propctrlr/eformspropertyhandler.hxx b/extensions/source/propctrlr/eformspropertyhandler.hxx
index 7022bc35d688..3ca187435546 100644
--- a/extensions/source/propctrlr/eformspropertyhandler.hxx
+++ b/extensions/source/propctrlr/eformspropertyhandler.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef EXTENSIONS_SOURCE_PROPCTRLR_EFORMSPROPERTYHANDLER_HXX
-#define EXTENSIONS_SOURCE_PROPCTRLR_EFORMSPROPERTYHANDLER_HXX
+#ifndef INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_EFORMSPROPERTYHANDLER_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_EFORMSPROPERTYHANDLER_HXX
 
 #include "propertyhandler.hxx"
 
@@ -93,6 +93,6 @@ namespace pcr
 } // namespace pcr
 
 
-#endif // EXTENSIONS_SOURCE_PROPCTRLR_EFORMSPROPERTYHANDLER_HXX
+#endif // INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_EFORMSPROPERTYHANDLER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/propctrlr/enumrepresentation.hxx b/extensions/source/propctrlr/enumrepresentation.hxx
index 7cf5635a0660..1d56c55dbffb 100644
--- a/extensions/source/propctrlr/enumrepresentation.hxx
+++ b/extensions/source/propctrlr/enumrepresentation.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef EXTENSIONS_SOURCE_PROPCTRLR_ENUMREPRESENTATION_HXX
-#define EXTENSIONS_SOURCE_PROPCTRLR_ENUMREPRESENTATION_HXX
+#ifndef INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_ENUMREPRESENTATION_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_ENUMREPRESENTATION_HXX
 
 #include <com/sun/star/uno/Any.hxx>
 #include <rtl/ref.hxx>
@@ -62,6 +62,6 @@ namespace pcr
 } // namespace pcr
 
 
-#endif // EXTENSIONS_SOURCE_PROPCTRLR_ENUMREPRESENTATION_HXX
+#endif // INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_ENUMREPRESENTATION_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/propctrlr/eventhandler.hxx b/extensions/source/propctrlr/eventhandler.hxx
index 9e15cf02160d..babfc5c8a5e4 100644
--- a/extensions/source/propctrlr/eventhandler.hxx
+++ b/extensions/source/propctrlr/eventhandler.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef EXTENSIONS_SOURCE_PROPCTRLR_EVENTHANDLER_HXX
-#define EXTENSIONS_SOURCE_PROPCTRLR_EVENTHANDLER_HXX
+#ifndef INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_EVENTHANDLER_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_EVENTHANDLER_HXX
 
 #include "pcrcommontypes.hxx"
 #include "pcrcommon.hxx"
@@ -251,6 +251,6 @@ namespace pcr
 } // namespace pcr
 
 
-#endif // EXTENSIONS_SOURCE_PROPCTRLR_EVENTHANDLER_HXX
+#endif // INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_EVENTHANDLER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/propctrlr/fontdialog.hxx b/extensions/source/propctrlr/fontdialog.hxx
index 7fff48b0d5d9..a96ddc4c0a29 100644
--- a/extensions/source/propctrlr/fontdialog.hxx
+++ b/extensions/source/propctrlr/fontdialog.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _EXTENSIONS_PROPCTRLR_FONTDIALOG_HXX_
-#define _EXTENSIONS_PROPCTRLR_FONTDIALOG_HXX_
+#ifndef INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_FONTDIALOG_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_FONTDIALOG_HXX
 
 #include <sfx2/tabdlg.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
@@ -70,6 +70,6 @@ namespace pcr
 }   // namespace pcr
 
 
-#endif // _EXTENSIONS_PROPCTRLR_FONTDIALOG_HXX_
+#endif // INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_FONTDIALOG_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/propctrlr/fontitemids.hxx b/extensions/source/propctrlr/fontitemids.hxx
index 0aff871f19f2..a7a93961cee5 100644
--- a/extensions/source/propctrlr/fontitemids.hxx
+++ b/extensions/source/propctrlr/fontitemids.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _EXTENSIONS_PROPCTRLR_FONTITEMIDS_HXX_
-#define _EXTENSIONS_PROPCTRLR_FONTITEMIDS_HXX_
+#ifndef INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_FONTITEMIDS_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_FONTITEMIDS_HXX
 
 #define CFID_FONT               1
 #define CFID_HEIGHT             2
@@ -54,6 +54,6 @@ namespace pcr
 }   // namespace pcr
 
 
-#endif // _EXTENSIONS_PROPCTRLR_FONTITEMIDS_HXX_
+#endif // INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_FONTITEMIDS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/propctrlr/formbrowsertools.hxx b/extensions/source/propctrlr/formbrowsertools.hxx
index 7378c4273c09..30c49e15bdb0 100644
--- a/extensions/source/propctrlr/formbrowsertools.hxx
+++ b/extensions/source/propctrlr/formbrowsertools.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _EXTENSIONS_FORMSCTRLR_FORMBROWSERTOOLS_HXX_
-#define _EXTENSIONS_FORMSCTRLR_FORMBROWSERTOOLS_HXX_
+#ifndef INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_FORMBROWSERTOOLS_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_FORMBROWSERTOOLS_HXX
 
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/beans/Property.hpp>
@@ -96,6 +96,6 @@ namespace pcr
 } // namespace pcr
 
 
-#endif // _EXTENSIONS_FORMSCTRLR_FORMBROWSERTOOLS_HXX_
+#endif // INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_FORMBROWSERTOOLS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/propctrlr/formcomponenthandler.hxx b/extensions/source/propctrlr/formcomponenthandler.hxx
index b83b2f7a1fca..c25d17abfe78 100644
--- a/extensions/source/propctrlr/formcomponenthandler.hxx
+++ b/extensions/source/propctrlr/formcomponenthandler.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef EXTENSIONS_SOURCE_PROPCTRLR_FORMCOMPONENTHANDLER_HXX
-#define EXTENSIONS_SOURCE_PROPCTRLR_FORMCOMPONENTHANDLER_HXX
+#ifndef INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_FORMCOMPONENTHANDLER_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_FORMCOMPONENTHANDLER_HXX
 
 #include "propertyhandler.hxx"
 #include "sqlcommanddesign.hxx"
@@ -465,6 +465,6 @@ namespace pcr
 } // namespace pcr
 
 
-#endif // EXTENSIONS_SOURCE_PROPCTRLR_FORMCOMPONENTHANDLER_HXX
+#endif // INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_FORMCOMPONENTHANDLER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/propctrlr/formcontroller.hxx b/extensions/source/propctrlr/formcontroller.hxx
index 194bd8fa7ace..b5d18d25b480 100644
--- a/extensions/source/propctrlr/formcontroller.hxx
+++ b/extensions/source/propctrlr/formcontroller.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef EXTENSIONS_SOURCE_PROPCTRLR_FORMCONTROLLER_HXX
-#define EXTENSIONS_SOURCE_PROPCTRLR_FORMCONTROLLER_HXX
+#ifndef INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_FORMCONTROLLER_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_FORMCONTROLLER_HXX
 
 #include "propcontroller.hxx"
 
@@ -125,6 +125,6 @@ namespace pcr
 } // namespace pcr
 
 
-#endif // EXTENSIONS_SOURCE_PROPCTRLR_FORMCONTROLLER_HXX
+#endif // INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_FORMCONTROLLER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/propctrlr/formlinkdialog.hxx b/extensions/source/propctrlr/formlinkdialog.hxx
index 920d4059fe9f..fe5e70e972c6 100644
--- a/extensions/source/propctrlr/formlinkdialog.hxx
+++ b/extensions/source/propctrlr/formlinkdialog.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef EXTENSIONS_SOURCE_PROPCTRLR_FORMLINKDIALOG_HXX
-#define EXTENSIONS_SOURCE_PROPCTRLR_FORMLINKDIALOG_HXX
+#ifndef INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_FORMLINKDIALOG_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_FORMLINKDIALOG_HXX
 
 #include <vcl/dialog.hxx>
 #include <vcl/fixed.hxx>
@@ -138,6 +138,6 @@ namespace pcr
 }   // namespace pcr
 
 
-#endif // EXTENSIONS_SOURCE_PROPCTRLR_FORMLINKDIALOG_HXX
+#endif // INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_FORMLINKDIALOG_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/propctrlr/formmetadata.hxx b/extensions/source/propctrlr/formmetadata.hxx
index 5bb9ad001422..17f918665c1e 100644
--- a/extensions/source/propctrlr/formmetadata.hxx
+++ b/extensions/source/propctrlr/formmetadata.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _EXTENSIONS_PROPCTRLR_FORMMETADATA_HXX_
-#define _EXTENSIONS_PROPCTRLR_FORMMETADATA_HXX_
+#ifndef INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_FORMMETADATA_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_FORMMETADATA_HXX
 
 #include "propertyinfo.hxx"
 #include "modulepcr.hxx"
@@ -338,6 +338,6 @@ namespace pcr
 } // namespace pcr
 
 
-#endif // _EXTENSIONS_PROPCTRLR_FORMMETADATA_HXX_
+#endif // INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_FORMMETADATA_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/propctrlr/formstrings.hxx b/extensions/source/propctrlr/formstrings.hxx
index cdac126ef2df..c5e8145411fc 100644
--- a/extensions/source/propctrlr/formstrings.hxx
+++ b/extensions/source/propctrlr/formstrings.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _EXTENSIONS_FORMSCTRLR_FORMSTRINGS_HXX_
-#define _EXTENSIONS_FORMSCTRLR_FORMSTRINGS_HXX_
+#ifndef INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_FORMSTRINGS_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_FORMSTRINGS_HXX
 
 
 namespace pcr
@@ -295,6 +295,6 @@ namespace pcr
 } // namespace pcr
 
 
-#endif // _EXTENSIONS_FORMSCTRLR_FORMSTRINGS_HXX_
+#endif // INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_FORMSTRINGS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/propctrlr/genericpropertyhandler.hxx b/extensions/source/propctrlr/genericpropertyhandler.hxx
index e444a2e23956..652d18d0d3e2 100644
--- a/extensions/source/propctrlr/genericpropertyhandler.hxx
+++ b/extensions/source/propctrlr/genericpropertyhandler.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef EXTENSIONS_SOURCE_PROPCTRLR_GENERICPROPERTYHANDLER_HXX
-#define EXTENSIONS_SOURCE_PROPCTRLR_GENERICPROPERTYHANDLER_HXX
+#ifndef INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_GENERICPROPERTYHANDLER_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_GENERICPROPERTYHANDLER_HXX
 
 #include "propertyhandler.hxx"
 #include "pcrcommontypes.hxx"
@@ -145,6 +145,6 @@ namespace pcr
 } // namespace pcr
 
 
-#endif // EXTENSIONS_SOURCE_PROPCTRLR_GENERICPROPERTYHANDLER_HXX
+#endif // INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_GENERICPROPERTYHANDLER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/propctrlr/handlerhelper.hxx b/extensions/source/propctrlr/handlerhelper.hxx
index 473470864422..db813b820b9d 100644
--- a/extensions/source/propctrlr/handlerhelper.hxx
+++ b/extensions/source/propctrlr/handlerhelper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef EXTENSIONS_SOURCE_PROPCTRLR_HANDLERHELPER_HXX
-#define EXTENSIONS_SOURCE_PROPCTRLR_HANDLERHELPER_HXX
+#ifndef INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_HANDLERHELPER_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_HANDLERHELPER_HXX
 
 #include <com/sun/star/beans/Property.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
@@ -205,6 +205,6 @@ namespace pcr
 } // namespace pcr
 
 
-#endif // EXTENSIONS_SOURCE_PROPCTRLR_HANDLERHELPER_HXX
+#endif // INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_HANDLERHELPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/propctrlr/inspectorhelpwindow.hxx b/extensions/source/propctrlr/inspectorhelpwindow.hxx
index 46d30ad5408f..b24d461938e0 100644
--- a/extensions/source/propctrlr/inspectorhelpwindow.hxx
+++ b/extensions/source/propctrlr/inspectorhelpwindow.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef INSPECTORHELPWINDOW_HXX
-#define INSPECTORHELPWINDOW_HXX
+#ifndef INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_INSPECTORHELPWINDOW_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_INSPECTORHELPWINDOW_HXX
 
 #include <vcl/fixed.hxx>
 #include <svtools/svmedit.hxx>
diff --git a/extensions/source/propctrlr/inspectormodelbase.hxx b/extensions/source/propctrlr/inspectormodelbase.hxx
index ce334fe1c673..fc08a0a51c8c 100644
--- a/extensions/source/propctrlr/inspectormodelbase.hxx
+++ b/extensions/source/propctrlr/inspectormodelbase.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INSPECTORMODELBASE_HXX
-#define INSPECTORMODELBASE_HXX
+#ifndef INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_INSPECTORMODELBASE_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_INSPECTORMODELBASE_HXX
 
 #include <com/sun/star/inspection/XObjectInspectorModel.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
@@ -93,6 +93,6 @@ namespace pcr
 } // namespace pcr
 
 
-#endif // INSPECTORMODELBASE_HXX
+#endif // INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_INSPECTORMODELBASE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/propctrlr/linedescriptor.hxx b/extensions/source/propctrlr/linedescriptor.hxx
index f71255741248..245d1e1e3a26 100644
--- a/extensions/source/propctrlr/linedescriptor.hxx
+++ b/extensions/source/propctrlr/linedescriptor.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _EXTENSIONS_PROPCTRLR_LINEDESCRIPTOR_HXX_
-#define _EXTENSIONS_PROPCTRLR_LINEDESCRIPTOR_HXX_
+#ifndef INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_LINEDESCRIPTOR_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_LINEDESCRIPTOR_HXX
 
 #include <vcl/image.hxx>
 #include <com/sun/star/inspection/LineDescriptor.hpp>
@@ -56,6 +56,6 @@ namespace pcr
 } // namespace pcr
 
 
-#endif // _EXTENSIONS_PROPCTRLR_LINEDESCRIPTOR_HXX_
+#endif // INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_LINEDESCRIPTOR_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/propctrlr/listselectiondlg.hxx b/extensions/source/propctrlr/listselectiondlg.hxx
index 4c16d5513ba0..7f81e219b634 100644
--- a/extensions/source/propctrlr/listselectiondlg.hxx
+++ b/extensions/source/propctrlr/listselectiondlg.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef EXTENSIONS_SOURCE_PROPCTRLR_LISTSELECTIONDLG_HXX
-#define EXTENSIONS_SOURCE_PROPCTRLR_LISTSELECTIONDLG_HXX
+#ifndef INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_LISTSELECTIONDLG_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_LISTSELECTIONDLG_HXX
 
 #include <vcl/dialog.hxx>
 #include <vcl/fixed.hxx>
@@ -73,6 +73,6 @@ namespace pcr
 } // namespacepcr
 
 
-#endif // EXTENSIONS_SOURCE_PROPCTRLR_LISTSELECTIONDLG_HXX
+#endif // INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_LISTSELECTIONDLG_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/propctrlr/modulepcr.hxx b/extensions/source/propctrlr/modulepcr.hxx
index 128df7794139..92e33bb9c20d 100644
--- a/extensions/source/propctrlr/modulepcr.hxx
+++ b/extensions/source/propctrlr/modulepcr.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef EXTENSIONS_PROPCTRLR_MODULEPRC_HXX
-#define EXTENSIONS_PROPCTRLR_MODULEPRC_HXX
+#ifndef INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_MODULEPCR_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_MODULEPCR_HXX
 
 #include <unotools/componentresmodule.hxx>
 
@@ -33,6 +33,6 @@ namespace pcr
 } // namespace pcr
 
 
-#endif // _EXTENSIONS_PROPCTRLR_MODULEPRC_HXX_
+#endif // _ INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_MODULEPCR_HXX_
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/propctrlr/newdatatype.hxx b/extensions/source/propctrlr/newdatatype.hxx
index 5c83d6989ea7..f9d64045a5aa 100644
--- a/extensions/source/propctrlr/newdatatype.hxx
+++ b/extensions/source/propctrlr/newdatatype.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef EXTENSIONS_SOURCE_PROPCTRLR_NEWDATATYPE_HXX
-#define EXTENSIONS_SOURCE_PROPCTRLR_NEWDATATYPE_HXX
+#ifndef INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_NEWDATATYPE_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_NEWDATATYPE_HXX
 
 #include <vcl/dialog.hxx>
 #include <vcl/fixed.hxx>
@@ -54,6 +54,6 @@ namespace pcr
 } // namespace pcr
 
 
-#endif // EXTENSIONS_SOURCE_PROPCTRLR_NEWDATATYPE_HXX
+#endif // INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_NEWDATATYPE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/propctrlr/pcrcommon.hxx b/extensions/source/propctrlr/pcrcommon.hxx
index ceba55ba316f..21977af05d7d 100644
--- a/extensions/source/propctrlr/pcrcommon.hxx
+++ b/extensions/source/propctrlr/pcrcommon.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _EXTENSIONS_PROPCTRLR_PCRCOMMON_HXX_
-#define _EXTENSIONS_PROPCTRLR_PCRCOMMON_HXX_
+#ifndef INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_PCRCOMMON_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_PCRCOMMON_HXX
 
 #define EDITOR_LIST_APPEND              (SAL_MAX_UINT16)
 #define EDITOR_LIST_REPLACE_EXISTING    (SAL_MAX_UINT16)
@@ -138,6 +138,6 @@ namespace pcr
 } // namespace pcr
 
 
-#endif // _EXTENSIONS_PROPCTRLR_PCRCOMMON_HXX_
+#endif // INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_PCRCOMMON_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/propctrlr/pcrcommontypes.hxx b/extensions/source/propctrlr/pcrcommontypes.hxx
index e8ed62bb45eb..37ab9b009eb4 100644
--- a/extensions/source/propctrlr/pcrcommontypes.hxx
+++ b/extensions/source/propctrlr/pcrcommontypes.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef EXTENSIONS_SOURCE_PROPCTRLR_PCRCOMMONTYPES_HXX
-#define EXTENSIONS_SOURCE_PROPCTRLR_PCRCOMMONTYPES_HXX
+#ifndef INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_PCRCOMMONTYPES_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_PCRCOMMONTYPES_HXX
 
 #include <com/sun/star/beans/Property.hpp>
 #include <rtl/ustring.hxx>
@@ -37,6 +37,6 @@ namespace pcr
 } // namespace pcr
 
 
-#endif // EXTENSIONS_SOURCE_PROPCTRLR_PCRCOMMONTYPES_HXX
+#endif // INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_PCRCOMMONTYPES_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/propctrlr/pcrstrings.hxx b/extensions/source/propctrlr/pcrstrings.hxx
index 8ca438207818..ec4cab753d2d 100644
--- a/extensions/source/propctrlr/pcrstrings.hxx
+++ b/extensions/source/propctrlr/pcrstrings.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _EXTENSIONS_FORMSCTRLR_PCRSTRINGS_HXX_
-#define _EXTENSIONS_FORMSCTRLR_PCRSTRINGS_HXX_
+#ifndef INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_PCRSTRINGS_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_PCRSTRINGS_HXX
 
 
 namespace pcr
@@ -32,6 +32,6 @@ namespace pcr
 } // namespace pcr
 
 
-#endif // _EXTENSIONS_FORMSCTRLR_PCRSTRINGS_HXX_
+#endif // INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_PCRSTRINGS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/propctrlr/pcrunodialogs.hxx b/extensions/source/propctrlr/pcrunodialogs.hxx
index 545af7988fb0..7ad83a94c4f4 100644
--- a/extensions/source/propctrlr/pcrunodialogs.hxx
+++ b/extensions/source/propctrlr/pcrunodialogs.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef EXTENSIONS_SOURCE_PROPCTRLR_PCRUNODIALOGS_HXX
-#define EXTENSIONS_SOURCE_PROPCTRLR_PCRUNODIALOGS_HXX
+#ifndef INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_PCRUNODIALOGS_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_PCRUNODIALOGS_HXX
 
 #include <svtools/genericunodialog.hxx>
 #include "modulepcr.hxx"
@@ -85,6 +85,6 @@ namespace pcr
 } // namespacepcr
 
 
-#endif // EXTENSIONS_SOURCE_PROPCTRLR_PCRUNODIALOGS_HXX
+#endif // INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_PCRUNODIALOGS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/propctrlr/propcontroller.hxx b/extensions/source/propctrlr/propcontroller.hxx
index 8966814e0f40..278840cf9043 100644
--- a/extensions/source/propctrlr/propcontroller.hxx
+++ b/extensions/source/propctrlr/propcontroller.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _EXTENSIONS_PROPCTRLR_PROPCONTROLLER_HXX_
-#define _EXTENSIONS_PROPCTRLR_PROPCONTROLLER_HXX_
+#ifndef INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_PROPCONTROLLER_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_PROPCONTROLLER_HXX
 
 #include "composeduiupdate.hxx"
 #include "formbrowsertools.hxx"
@@ -400,6 +400,6 @@ namespace pcr
 } // namespace pcr
 
 
-#endif // _EXTENSIONS_PROPCTRLR_PROPCONTROLLER_HXX_
+#endif // INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_PROPCONTROLLER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/propctrlr/propcontrolobserver.hxx b/extensions/source/propctrlr/propcontrolobserver.hxx
index eedca3da8020..4cc058962ff5 100644
--- a/extensions/source/propctrlr/propcontrolobserver.hxx
+++ b/extensions/source/propctrlr/propcontrolobserver.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef PROPCONTROLOBSERVER_HXX
-#define PROPCONTROLOBSERVER_HXX
+#ifndef INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_PROPCONTROLOBSERVER_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_PROPCONTROLOBSERVER_HXX
 
 #include <com/sun/star/inspection/XPropertyControl.hpp>
 
@@ -45,6 +45,6 @@ namespace pcr
 } // namespace pcr
 
 
-#endif // PROPCONTROLOBSERVER_HXX
+#endif // INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_PROPCONTROLOBSERVER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/propctrlr/propertycomposer.hxx b/extensions/source/propctrlr/propertycomposer.hxx
index e374d6fb8741..25ddc2fa0e4f 100644
--- a/extensions/source/propctrlr/propertycomposer.hxx
+++ b/extensions/source/propctrlr/propertycomposer.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef EXTENSIONS_SOURCE_PROPCTRLR_PROPERTYCOMPOSER_HXX
-#define EXTENSIONS_SOURCE_PROPCTRLR_PROPERTYCOMPOSER_HXX
+#ifndef INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_PROPERTYCOMPOSER_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_PROPERTYCOMPOSER_HXX
 
 #include "pcrcommon.hxx"
 #include "composeduiupdate.hxx"
@@ -146,6 +146,6 @@ namespace pcr
 } // namespace pcr
 
 
-#endif // EXTENSIONS_SOURCE_PROPCTRLR_PROPERTYCOMPOSER_HXX
+#endif // INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_PROPERTYCOMPOSER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/propctrlr/propertycontrolextender.hxx b/extensions/source/propctrlr/propertycontrolextender.hxx
index e865e19cd928..8290dff46440 100644
--- a/extensions/source/propctrlr/propertycontrolextender.hxx
+++ b/extensions/source/propctrlr/propertycontrolextender.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef EXTENSIONS_PROPERTYCONTROLEXTENDER_HXX
-#define EXTENSIONS_PROPERTYCONTROLEXTENDER_HXX
+#ifndef INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_PROPERTYCONTROLEXTENDER_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_PROPERTYCONTROLEXTENDER_HXX
 
 #include <com/sun/star/awt/XKeyListener.hpp>
 #include <com/sun/star/inspection/XPropertyControl.hpp>
@@ -62,6 +62,6 @@ namespace pcr
 } // namespace pcr
 
 
-#endif // EXTENSIONS_PROPERTYCONTROLEXTENDER_HXX
+#endif // INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_PROPERTYCONTROLEXTENDER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/propctrlr/propertyeditor.hxx b/extensions/source/propctrlr/propertyeditor.hxx
index d324cf8e76b6..85aad9e79232 100644
--- a/extensions/source/propctrlr/propertyeditor.hxx
+++ b/extensions/source/propctrlr/propertyeditor.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _EXTENSIONS_PROPCTRLR_PROPERTYEDITOR_HXX_
-#define _EXTENSIONS_PROPCTRLR_PROPERTYEDITOR_HXX_
+#ifndef INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_PROPERTYEDITOR_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_PROPERTYEDITOR_HXX
 
 #include "pcrcommon.hxx"
 
@@ -147,7 +147,7 @@ namespace pcr
 } // namespace pcr
 
 
-#endif // _EXTENSIONS_PROPCTRLR_PROPERTYEDITOR_HXX_
+#endif // INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_PROPERTYEDITOR_HXX
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/propctrlr/propertyhandler.hxx b/extensions/source/propctrlr/propertyhandler.hxx
index 7f4bbbbab747..4aed4c7b38f8 100644
--- a/extensions/source/propctrlr/propertyhandler.hxx
+++ b/extensions/source/propctrlr/propertyhandler.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef EXTENSIONS_SOURCE_PROPCTRLR_PROPERTYHANDLER_HXX
-#define EXTENSIONS_SOURCE_PROPCTRLR_PROPERTYHANDLER_HXX
+#ifndef INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_PROPERTYHANDLER_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_PROPERTYHANDLER_HXX
 
 #include "pcrcommon.hxx"
 #include "modulepcr.hxx"
@@ -445,6 +445,6 @@ namespace pcr
 } // namespace pcr
 
 
-#endif // EXTENSIONS_SOURCE_PROPCTRLR_PROPERTYHANDLER_HXX
+#endif // INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_PROPERTYHANDLER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/propctrlr/propertyinfo.hxx b/extensions/source/propctrlr/propertyinfo.hxx
index 601a7a767a09..b677daf4e56e 100644
--- a/extensions/source/propctrlr/propertyinfo.hxx
+++ b/extensions/source/propctrlr/propertyinfo.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _EXTENSIONS_PROPCTRLR_PROPERTYINFO_HXX_
-#define _EXTENSIONS_PROPCTRLR_PROPERTYINFO_HXX_
+#ifndef INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_PROPERTYINFO_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_PROPERTYINFO_HXX
 
 #include <sal/types.h>
 #include <rtl/ustring.hxx>
@@ -53,6 +53,6 @@ namespace pcr
 } // namespace pcr
 
 
-#endif // _EXTENSIONS_PROPCTRLR_PROPERTYINFO_HXX_
+#endif // INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_PROPERTYINFO_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/propctrlr/propeventtranslation.hxx b/extensions/source/propctrlr/propeventtranslation.hxx
index 585024b042db..32f808d96b42 100644
--- a/extensions/source/propctrlr/propeventtranslation.hxx
+++ b/extensions/source/propctrlr/propeventtranslation.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef EXTENSIONS_SOURCE_PROPCTRLR_PROPEVENTTRANSLATION_HXX
-#define EXTENSIONS_SOURCE_PROPCTRLR_PROPEVENTTRANSLATION_HXX
+#ifndef INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_PROPEVENTTRANSLATION_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_PROPEVENTTRANSLATION_HXX
 
 #include <com/sun/star/beans/XPropertyChangeListener.hpp>
 #include <cppuhelper/implbase1.hxx>
@@ -70,6 +70,6 @@ namespace pcr
 } // namespace pcr
 
 
-#endif // EXTENSIONS_SOURCE_PROPCTRLR_PROPEVENTTRANSLATION_HXX
+#endif // INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_PROPEVENTTRANSLATION_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/propctrlr/proplinelistener.hxx b/extensions/source/propctrlr/proplinelistener.hxx
index 592c9408cec9..91d403353b0e 100644
--- a/extensions/source/propctrlr/proplinelistener.hxx
+++ b/extensions/source/propctrlr/proplinelistener.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _EXTENSIONS_PROPCTRLR_PROPLINELISTENER_HXX_
-#define _EXTENSIONS_PROPCTRLR_PROPLINELISTENER_HXX_
+#ifndef INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_PROPLINELISTENER_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_PROPLINELISTENER_HXX
 
 #include <rtl/ustring.hxx>
 
@@ -42,6 +42,6 @@ namespace pcr
 } // namespace pcr
 
 
-#endif // _EXTENSIONS_PROPCTRLR_PROPLINELISTENER_HXX_
+#endif // INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_PROPLINELISTENER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/propctrlr/pushbuttonnavigation.hxx b/extensions/source/propctrlr/pushbuttonnavigation.hxx
index c1a1dacff5fe..ed5e5ebc549d 100644
--- a/extensions/source/propctrlr/pushbuttonnavigation.hxx
+++ b/extensions/source/propctrlr/pushbuttonnavigation.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef EXTENSIONS_PROPCTRLR_PUSHBUTTONNAVIGATION_HXX
-#define EXTENSIONS_PROPCTRLR_PUSHBUTTONNAVIGATION_HXX
+#ifndef INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_PUSHBUTTONNAVIGATION_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_PUSHBUTTONNAVIGATION_HXX
 
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/beans/PropertyState.hpp>
@@ -97,6 +97,6 @@ namespace pcr
 }   // namespace pcr
 
 
-#endif // EXTENSIONS_PROPCTRLR_PUSHBUTTONNAVIGATION_HXX
+#endif // INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_PUSHBUTTONNAVIGATION_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/propctrlr/selectlabeldialog.hxx b/extensions/source/propctrlr/selectlabeldialog.hxx
index 0a732f0e8f2d..cac315a98195 100644
--- a/extensions/source/propctrlr/selectlabeldialog.hxx
+++ b/extensions/source/propctrlr/selectlabeldialog.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _EXTENSIONS_PROPCTRLR_SELECTLABELDIALOG_HXX_
-#define _EXTENSIONS_PROPCTRLR_SELECTLABELDIALOG_HXX_
+#ifndef INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_SELECTLABELDIALOG_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_SELECTLABELDIALOG_HXX
 
 #include <vcl/fixed.hxx>
 #include <svtools/treelistbox.hxx>
@@ -75,6 +75,6 @@ namespace pcr
 }   // namespace pcr
 
 
-#endif // _EXTENSIONS_PROPCTRLR_SELECTLABELDIALOG_HXX_
+#endif // INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_SELECTLABELDIALOG_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/propctrlr/sqlcommanddesign.hxx b/extensions/source/propctrlr/sqlcommanddesign.hxx
index ad86dbd19393..1dfc2067a9e0 100644
--- a/extensions/source/propctrlr/sqlcommanddesign.hxx
+++ b/extensions/source/propctrlr/sqlcommanddesign.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef EXTENSIONS_SOURCE_PROPCTRLR_SQLCOMMANDDESIGN_HXX
-#define EXTENSIONS_SOURCE_PROPCTRLR_SQLCOMMANDDESIGN_HXX
+#ifndef INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_SQLCOMMANDDESIGN_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_SQLCOMMANDDESIGN_HXX
 
 #include <com/sun/star/lang/XMultiComponentFactory.hpp>
 #include <com/sun/star/beans/XPropertyChangeListener.hpp>
@@ -209,6 +209,6 @@ namespace pcr
 } // namespace pcr
 
 
-#endif // EXTENSIONS_SOURCE_PROPCTRLR_SQLCOMMANDDESIGN_HXX
+#endif // INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_SQLCOMMANDDESIGN_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/propctrlr/standardcontrol.hxx b/extensions/source/propctrlr/standardcontrol.hxx
index b365cdd59963..833240c8b39f 100644
--- a/extensions/source/propctrlr/standardcontrol.hxx
+++ b/extensions/source/propctrlr/standardcontrol.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _EXTENSIONS_PROPCTRLR_STANDARDCONTROL_HXX_
-#define _EXTENSIONS_PROPCTRLR_STANDARDCONTROL_HXX_
+#ifndef INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_STANDARDCONTROL_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_STANDARDCONTROL_HXX
 
 #include "commoncontrol.hxx"
 #include "pcrcommon.hxx"
@@ -431,6 +431,6 @@ namespace pcr
 } // namespace pcr
 
 
-#endif // _EXTENSIONS_PROPCTRLR_STANDARDCONTROL_HXX_
+#endif // INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_STANDARDCONTROL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/propctrlr/submissionhandler.hxx b/extensions/source/propctrlr/submissionhandler.hxx
index 8ba663007a95..30f683a6d2e9 100644
--- a/extensions/source/propctrlr/submissionhandler.hxx
+++ b/extensions/source/propctrlr/submissionhandler.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef EXTENSIONS_SOURCE_PROPCTRLR_SUBMISSIONHANDLER_HXX
-#define EXTENSIONS_SOURCE_PROPCTRLR_SUBMISSIONHANDLER_HXX
+#ifndef INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_SUBMISSIONHANDLER_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_SUBMISSIONHANDLER_HXX
 
 #include "propertyhandler.hxx"
 #include "eformshelper.hxx"
@@ -111,6 +111,6 @@ namespace pcr
 } // namespace pcr
 
 
-#endif // EXTENSIONS_SOURCE_PROPCTRLR_SUBMISSIONHANDLER_HXX
+#endif // INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_SUBMISSIONHANDLER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/propctrlr/taborder.hxx b/extensions/source/propctrlr/taborder.hxx
index 9ee8ca658a75..688c5300a7c2 100644
--- a/extensions/source/propctrlr/taborder.hxx
+++ b/extensions/source/propctrlr/taborder.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef EXTENSIONS_SOURCE_PROPCTRLR_TABORDER_HXX
-#define EXTENSIONS_SOURCE_PROPCTRLR_TABORDER_HXX
+#ifndef INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_TABORDER_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_TABORDER_HXX
 
 #include <svtools/treelistbox.hxx>
 #include <com/sun/star/awt/XTabControllerModel.hpp>
@@ -110,6 +110,6 @@ namespace pcr
 }  // namespace pcr
 
 
-#endif  // EXTENSIONS_SOURCE_PROPCTRLR_TABORDER_HXX
+#endif // INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_TABORDER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/propctrlr/unourl.hxx b/extensions/source/propctrlr/unourl.hxx
index fa85362b2685..38f87bb5a727 100644
--- a/extensions/source/propctrlr/unourl.hxx
+++ b/extensions/source/propctrlr/unourl.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef EXTENSIONS_SOURCE_PROPCTRLR_UNOURL_HXX
-#define EXTENSIONS_SOURCE_PROPCTRLR_UNOURL_HXX
+#ifndef INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_UNOURL_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_UNOURL_HXX
 
 #include <rtl/ustring.hxx>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
@@ -53,6 +53,6 @@ namespace pcr
 } // namespacepcr
 
 
-#endif // EXTENSIONS_SOURCE_PROPCTRLR_UNOURL_HXX
+#endif // INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_UNOURL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/propctrlr/usercontrol.hxx b/extensions/source/propctrlr/usercontrol.hxx
index 5fcf95b99ff0..f8c721d65959 100644
--- a/extensions/source/propctrlr/usercontrol.hxx
+++ b/extensions/source/propctrlr/usercontrol.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _EXTENSIONS_PROPCTRLR_USERCONTROL_HXX_
-#define _EXTENSIONS_PROPCTRLR_USERCONTROL_HXX_
+#ifndef INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_USERCONTROL_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_USERCONTROL_HXX
 
 #include "commoncontrol.hxx"
 #include <svtools/fmtfield.hxx>
@@ -159,6 +159,6 @@ namespace pcr
 } // namespace pcr
 
 
-#endif // _EXTENSIONS_PROPCTRLR_USERCONTROL_HXX_
+#endif // INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_USERCONTROL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/propctrlr/xsddatatypes.hxx b/extensions/source/propctrlr/xsddatatypes.hxx
index ea27d92701a1..7f885b462b05 100644
--- a/extensions/source/propctrlr/xsddatatypes.hxx
+++ b/extensions/source/propctrlr/xsddatatypes.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef EXTENSIONS_SOURCE_PROPCTRLR_XSDDATATYPES_HXX
-#define EXTENSIONS_SOURCE_PROPCTRLR_XSDDATATYPES_HXX
+#ifndef INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_XSDDATATYPES_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_XSDDATATYPES_HXX
 
 #include <com/sun/star/uno/Reference.hxx>
 #include <rtl/ref.hxx>
@@ -99,6 +99,6 @@ namespace pcr
 } // namespace pcr
 
 
-#endif // EXTENSIONS_SOURCE_PROPCTRLR_XSDDATATYPES_HXX
+#endif // INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_XSDDATATYPES_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/propctrlr/xsdvalidationhelper.hxx b/extensions/source/propctrlr/xsdvalidationhelper.hxx
index 4bbf1ae4e746..accb75fdd95f 100644
--- a/extensions/source/propctrlr/xsdvalidationhelper.hxx
+++ b/extensions/source/propctrlr/xsdvalidationhelper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef EXTENSIONS_SOURCE_PROPCTRLR_XSDVALIDATIONHELPER_HXX
-#define EXTENSIONS_SOURCE_PROPCTRLR_XSDVALIDATIONHELPER_HXX
+#ifndef INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_XSDVALIDATIONHELPER_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_XSDVALIDATIONHELPER_HXX
 
 #include "eformshelper.hxx"
 #include "xsddatatypes.hxx"
@@ -136,6 +136,6 @@ namespace pcr
 } // namespace pcr
 
 
-#endif // EXTENSIONS_SOURCE_PROPCTRLR_XSDVALIDATIONHELPER_HXX
+#endif // INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_XSDVALIDATIONHELPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/propctrlr/xsdvalidationpropertyhandler.hxx b/extensions/source/propctrlr/xsdvalidationpropertyhandler.hxx
index 747187d557cb..e8ce278e7a43 100644
--- a/extensions/source/propctrlr/xsdvalidationpropertyhandler.hxx
+++ b/extensions/source/propctrlr/xsdvalidationpropertyhandler.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef EXTENSIONS_SOURCE_PROPCTRLR_XSDVALIDATIONPROPERTYHANDLER_HXX
-#define EXTENSIONS_SOURCE_PROPCTRLR_XSDVALIDATIONPROPERTYHANDLER_HXX
+#ifndef INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_XSDVALIDATIONPROPERTYHANDLER_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_XSDVALIDATIONPROPERTYHANDLER_HXX
 
 #include "propertyhandler.hxx"
 
@@ -88,6 +88,6 @@ namespace pcr
 } // namespace pcr
 
 
-#endif // EXTENSIONS_SOURCE_PROPCTRLR_XSDVALIDATIONPROPERTYHANDLER_HXX
+#endif // INCLUDED_EXTENSIONS_SOURCE_PROPCTRLR_XSDVALIDATIONPROPERTYHANDLER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/resource/ResourceIndexAccess.hxx b/extensions/source/resource/ResourceIndexAccess.hxx
index e76b9b9c218a..c6bb6c6b1aad 100644
--- a/extensions/source/resource/ResourceIndexAccess.hxx
+++ b/extensions/source/resource/ResourceIndexAccess.hxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef EXTENSIONS_RESOURCE_RESOURCESTRINGINDEXACCESS_HXX
-#define EXTENSIONS_RESOURCE_RESOURCESTRINGINDEXACCESS_HXX
+#ifndef INCLUDED_EXTENSIONS_SOURCE_RESOURCE_RESOURCEINDEXACCESS_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_RESOURCE_RESOURCEINDEXACCESS_HXX
 
 
 #include <boost/shared_ptr.hpp>
diff --git a/extensions/source/resource/oooresourceloader.hxx b/extensions/source/resource/oooresourceloader.hxx
index cce19e4059c7..ff716ed08fca 100644
--- a/extensions/source/resource/oooresourceloader.hxx
+++ b/extensions/source/resource/oooresourceloader.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef EXTENSIONS_RESOURCE_OOORESOURCELOADER_HXX
-#define EXTENSIONS_RESOURCE_OOORESOURCELOADER_HXX
+#ifndef INCLUDED_EXTENSIONS_SOURCE_RESOURCE_OOORESOURCELOADER_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_RESOURCE_OOORESOURCELOADER_HXX
 
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/resource/XResourceBundleLoader.hpp>
@@ -72,6 +72,6 @@ namespace extensions { namespace resource
     };
 }}
 
-#endif // EXTENSIONS_RESOURCE_OOORESOURCELOADER_HXX
+#endif // INCLUDED_EXTENSIONS_SOURCE_RESOURCE_OOORESOURCELOADER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/scanner/grid.hxx b/extensions/source/scanner/grid.hxx
index 7add3d23a0ec..888ca3b3b99a 100644
--- a/extensions/source/scanner/grid.hxx
+++ b/extensions/source/scanner/grid.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _EXTENSIONS_SCANNER_GRID_HXX
-#define _EXTENSIONS_SCANNER_GRID_HXX
+#ifndef INCLUDED_EXTENSIONS_SOURCE_SCANNER_GRID_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_SCANNER_GRID_HXX
 
 #include <vcl/window.hxx>
 #include <vcl/button.hxx>
@@ -136,6 +136,6 @@ public:
     virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE;
 };
 
-#endif // _EXTENSIONS_SCANNER_GRID_HXX
+#endif // INCLUDED_EXTENSIONS_SOURCE_SCANNER_GRID_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/scanner/sane.hxx b/extensions/source/scanner/sane.hxx
index 2b93df6c875f..475bceefcf1f 100644
--- a/extensions/source/scanner/sane.hxx
+++ b/extensions/source/scanner/sane.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SANE_HXX
-#define _SANE_HXX
+#ifndef INCLUDED_EXTENSIONS_SOURCE_SCANNER_SANE_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_SCANNER_SANE_HXX
 
 #include <osl/thread.h>
 #include <osl/module.h>
diff --git a/extensions/source/scanner/sanedlg.hxx b/extensions/source/scanner/sanedlg.hxx
index cede6214fe9a..4f2715364028 100644
--- a/extensions/source/scanner/sanedlg.hxx
+++ b/extensions/source/scanner/sanedlg.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SVT_SANEDLG_HXX
-#define _SVT_SANEDLG_HXX
+#ifndef INCLUDED_EXTENSIONS_SOURCE_SCANNER_SANEDLG_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_SCANNER_SANEDLG_HXX
 
 #include <vcl/dialog.hxx>
 #include <vcl/lstbox.hxx>
diff --git a/extensions/source/scanner/scanner.hxx b/extensions/source/scanner/scanner.hxx
index 2deaf7a1f38a..200eee1e38f4 100644
--- a/extensions/source/scanner/scanner.hxx
+++ b/extensions/source/scanner/scanner.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _EXT_SCANNER_HXX
-#define _EXT_SCANNER_HXX
+#ifndef INCLUDED_EXTENSIONS_SOURCE_SCANNER_SCANNER_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_SCANNER_SCANNER_HXX
 
 #include <tools/stream.hxx>
 #include <osl/mutex.hxx>
diff --git a/extensions/source/update/check/actionlistener.hxx b/extensions/source/update/check/actionlistener.hxx
index d2b8f898e82f..97d92b9c2bc1 100644
--- a/extensions/source/update/check/actionlistener.hxx
+++ b/extensions/source/update/check/actionlistener.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_ACTION_LISTENER_HXX
-#define INCLUDED_ACTION_LISTENER_HXX
+#ifndef INCLUDED_EXTENSIONS_SOURCE_UPDATE_CHECK_ACTIONLISTENER_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_UPDATE_CHECK_ACTIONLISTENER_HXX
 
 #include <rtl/ref.hxx>
 
@@ -37,6 +37,6 @@ protected:
     ~IActionListener() {}
 };
 
-#endif //INCLUDED_ACTION_LISTENER_HXX
+#endif // INCLUDED_EXTENSIONS_SOURCE_UPDATE_CHECK_ACTIONLISTENER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/update/check/updatecheckconfiglistener.hxx b/extensions/source/update/check/updatecheckconfiglistener.hxx
index 1e7021218337..e6663b8ed7eb 100644
--- a/extensions/source/update/check/updatecheckconfiglistener.hxx
+++ b/extensions/source/update/check/updatecheckconfiglistener.hxx
@@ -19,8 +19,8 @@
 
 #include <rtl/ref.hxx>
 
-#ifndef _UPDATECHECKCONFIGLISTENER_HXX_
-#define _UPDATECHECKCONFIGLISTENER_HXX_
+#ifndef INCLUDED_EXTENSIONS_SOURCE_UPDATE_CHECK_UPDATECHECKCONFIGLISTENER_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_UPDATE_CHECK_UPDATECHECKCONFIGLISTENER_HXX
 
 /* This interface should be implemented by classes acting
  * as controller (as in the MVC pattern).
diff --git a/extensions/source/update/check/updatehdl.hxx b/extensions/source/update/check/updatehdl.hxx
index 948f2b7215b7..570984b1de50 100644
--- a/extensions/source/update/check/updatehdl.hxx
+++ b/extensions/source/update/check/updatehdl.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_UPDATE_HDL_HXX
-#define INCLUDED_UPDATE_HDL_HXX
+#ifndef INCLUDED_EXTENSIONS_SOURCE_UPDATE_CHECK_UPDATEHDL_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_UPDATE_CHECK_UPDATEHDL_HXX
 
 #include "boost/utility.hpp"
 #include <osl/mutex.hxx>
@@ -207,6 +207,6 @@ public:
     virtual void SAL_CALL notifyTermination( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 };
 
-#endif /* INCLUDED_UPDATE_HDL_HXX */
+#endif // INCLUDED_EXTENSIONS_SOURCE_UPDATE_CHECK_UPDATEHDL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/update/check/updateinfo.hxx b/extensions/source/update/check/updateinfo.hxx
index 9896270363da..0f23e8463e71 100644
--- a/extensions/source/update/check/updateinfo.hxx
+++ b/extensions/source/update/check/updateinfo.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _UPDATE_INFO_INCLUDED_
-#define _UPDATE_INFO_INCLUDED_
+#ifndef INCLUDED_EXTENSIONS_SOURCE_UPDATE_CHECK_UPDATEINFO_HXX
+#define INCLUDED_EXTENSIONS_SOURCE_UPDATE_CHECK_UPDATEINFO_HXX
 
 #include <rtl/ustring.hxx>
 #include <vector>
diff --git a/extensions/test/ole/AxTestComponents/Foo.h b/extensions/test/ole/AxTestComponents/Foo.h
index 2142b5248532..b46cbd3436aa 100644
--- a/extensions/test/ole/AxTestComponents/Foo.h
+++ b/extensions/test/ole/AxTestComponents/Foo.h
@@ -18,8 +18,8 @@
  */
 // Basic.h : Declaration of the CBasic
 
-#ifndef __Foo_H_
-#define __Foo_H_
+#ifndef INCLUDED_EXTENSIONS_TEST_OLE_AXTESTCOMPONENTS_FOO_H
+#define INCLUDED_EXTENSIONS_TEST_OLE_AXTESTCOMPONENTS_FOO_H
 
 #include "resource.h"
 #import  "AxTestComponents.tlb" no_namespace no_implementation raw_interfaces_only named_guids
diff --git a/extensions/test/ole/EventListenerSample/EventListener/EvtListener.h b/extensions/test/ole/EventListenerSample/EventListener/EvtListener.h
index 249a71653464..82ce1cfda7b8 100644
--- a/extensions/test/ole/EventListenerSample/EventListener/EvtListener.h
+++ b/extensions/test/ole/EventListenerSample/EventListener/EvtListener.h
@@ -18,8 +18,8 @@
  */
 // EvtListener.h : Deklaration von CEvtListener
 
-#ifndef __EVTLISTENER_H_
-#define __EVTLISTENER_H_
+#ifndef INCLUDED_EXTENSIONS_TEST_OLE_EVENTLISTENERSAMPLE_EVENTLISTENER_EVTLISTENER_H
+#define INCLUDED_EXTENSIONS_TEST_OLE_EVENTLISTENERSAMPLE_EVENTLISTENER_EVTLISTENER_H
 
 #include "resource.h"
 
@@ -50,6 +50,6 @@ public:
     STDMETHOD(disposing)(IDispatch* source);
 };
 
-#endif //__EVTLISTENER_H_
+#endif // INCLUDED_EXTENSIONS_TEST_OLE_EVENTLISTENERSAMPLE_EVENTLISTENER_EVTLISTENER_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/test/ole/OleClient/axhost.hxx b/extensions/test/ole/OleClient/axhost.hxx
index a20e6c308036..ea62befd2754 100644
--- a/extensions/test/ole/OleClient/axhost.hxx
+++ b/extensions/test/ole/OleClient/axhost.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef  __AXHOST_HXX
-#define __AXHOST_HXX
+#ifndef INCLUDED_EXTENSIONS_TEST_OLE_OLECLIENT_AXHOST_HXX
+#define INCLUDED_EXTENSIONS_TEST_OLE_OLECLIENT_AXHOST_HXX
 
 #include <atlbase.h>
 extern CComModule _Module;
diff --git a/extensions/test/ole/OleConverterVar1/smartarray.h b/extensions/test/ole/OleConverterVar1/smartarray.h
index 741958d32e54..424fdb9c45e2 100644
--- a/extensions/test/ole/OleConverterVar1/smartarray.h
+++ b/extensions/test/ole/OleConverterVar1/smartarray.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 _SMARTARRAY_H
-#define _SMARTARRAY_H
+#ifndef INCLUDED_EXTENSIONS_TEST_OLE_OLECONVERTERVAR1_SMARTARRAY_H
+#define INCLUDED_EXTENSIONS_TEST_OLE_OLECONVERTERVAR1_SMARTARRAY_H
 
 
 template< class sourceType>