fixincludeguards.sh: include/u*

Change-Id: I8a07ccb309490206a2edd36f2fe4d0e2c0982ea2

64 files changed, 171 insertions, 170 deletions

diff --git a/include/unotools/accessiblerelationsethelper.hxx b/include/unotools/accessiblerelationsethelper.hxx
index 7135008f9d6e..2d4fb57ab42e 100644
--- a/include/unotools/accessiblerelationsethelper.hxx
+++ b/include/unotools/accessiblerelationsethelper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _UTL_ACCESSIBLERELATIONSETHELPER_HXX_
-#define _UTL_ACCESSIBLERELATIONSETHELPER_HXX_
+#ifndef INCLUDED_UNOTOOLS_ACCESSIBLERELATIONSETHELPER_HXX
+#define INCLUDED_UNOTOOLS_ACCESSIBLERELATIONSETHELPER_HXX
 
 #include "unotools/unotoolsdllapi.h"
 
diff --git a/include/unotools/accessiblestatesethelper.hxx b/include/unotools/accessiblestatesethelper.hxx
index 60470e8eb6a9..4e4622b0c9b0 100644
--- a/include/unotools/accessiblestatesethelper.hxx
+++ b/include/unotools/accessiblestatesethelper.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _UTL_ACCESSIBLESTATESETHELPER_HXX_
-#define _UTL_ACCESSIBLESTATESETHELPER_HXX_
+#ifndef INCLUDED_UNOTOOLS_ACCESSIBLESTATESETHELPER_HXX
+#define INCLUDED_UNOTOOLS_ACCESSIBLESTATESETHELPER_HXX
 
 #include "unotools/unotoolsdllapi.h"
 
diff --git a/include/unotools/atom.hxx b/include/unotools/atom.hxx
index 5b8f193d604f..b9ca11e6bda7 100644
--- a/include/unotools/atom.hxx
+++ b/include/unotools/atom.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _UTL_ATOM_HXX_
-#define _UTL_ATOM_HXX_
+#ifndef INCLUDED_UNOTOOLS_ATOM_HXX
+#define INCLUDED_UNOTOOLS_ATOM_HXX
 
 #include "unotools/unotoolsdllapi.h"
 #include <rtl/ustring.hxx>
diff --git a/include/unotools/bootstrap.hxx b/include/unotools/bootstrap.hxx
index ebbe582127bd..93d009a857a3 100644
--- a/include/unotools/bootstrap.hxx
+++ b/include/unotools/bootstrap.hxx
@@ -18,8 +18,8 @@
  */
 #include "unotools/unotoolsdllapi.h"
 
-#ifndef _UTL_BOOTSTRAP_HXX
-#define _UTL_BOOTSTRAP_HXX
+#ifndef INCLUDED_UNOTOOLS_BOOTSTRAP_HXX
+#define INCLUDED_UNOTOOLS_BOOTSTRAP_HXX
 
 #include <rtl/ustring.hxx>
 
diff --git a/include/unotools/calendarwrapper.hxx b/include/unotools/calendarwrapper.hxx
index 2f3c48f4cc23..ff9c4f67a290 100644
--- a/include/unotools/calendarwrapper.hxx
+++ b/include/unotools/calendarwrapper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _UNOTOOLS_CALENDARWRAPPER_HXX
-#define _UNOTOOLS_CALENDARWRAPPER_HXX
+#ifndef INCLUDED_UNOTOOLS_CALENDARWRAPPER_HXX
+#define INCLUDED_UNOTOOLS_CALENDARWRAPPER_HXX
 
 #include <tools/datetime.hxx>
 #include <com/sun/star/uno/Reference.hxx>
diff --git a/include/unotools/charclass.hxx b/include/unotools/charclass.hxx
index 230a5b2c5057..f86f47b49be4 100644
--- a/include/unotools/charclass.hxx
+++ b/include/unotools/charclass.hxx
@@ -19,8 +19,8 @@
 
 #include "unotools/unotoolsdllapi.h"
 
-#ifndef _UNOTOOLS_CHARCLASS_HXX
-#define _UNOTOOLS_CHARCLASS_HXX
+#ifndef INCLUDED_UNOTOOLS_CHARCLASS_HXX
+#define INCLUDED_UNOTOOLS_CHARCLASS_HXX
 
 #include <boost/noncopyable.hpp>
 #include <i18nlangtag/languagetag.hxx>
@@ -222,6 +222,6 @@ private:
     const ::com::sun::star::lang::Locale &  getMyLocale() const;
 };
 
-#endif // _UNOTOOLS_CHARCLASS_HXX
+#endif // INCLUDED_UNOTOOLS_CHARCLASS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/unotools/closeveto.hxx b/include/unotools/closeveto.hxx
index 21d381c5094b..aa03500bf509 100644
--- a/include/unotools/closeveto.hxx
+++ b/include/unotools/closeveto.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef UNOTOOLS_CLOSEVETO_HXX
-#define UNOTOOLS_CLOSEVETO_HXX
+#ifndef INCLUDED_UNOTOOLS_CLOSEVETO_HXX
+#define INCLUDED_UNOTOOLS_CLOSEVETO_HXX
 
 #include "unotools/unotoolsdllapi.h"
 
@@ -55,6 +55,6 @@ namespace utl
 } // namespace dbaui
 //......................................................................................................................
 
-#endif // UNOTOOLS_CLOSEVETO_HXX
+#endif // INCLUDED_UNOTOOLS_CLOSEVETO_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/unotools/cmdoptions.hxx b/include/unotools/cmdoptions.hxx
index a11aa1ca1e77..c00e2d1807fa 100644
--- a/include/unotools/cmdoptions.hxx
+++ b/include/unotools/cmdoptions.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef INCLUDED_unotools_CMDOPTIONS_HXX
-#define INCLUDED_unotools_CMDOPTIONS_HXX
+#ifndef INCLUDED_UNOTOOLS_CMDOPTIONS_HXX
+#define INCLUDED_UNOTOOLS_CMDOPTIONS_HXX
 
 #include "unotools/unotoolsdllapi.h"
 #include <sal/types.h>
@@ -162,6 +162,6 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtCommandOptions : public utl::detail:
 
 };      // class SvtCmdOptions
 
-#endif  // #ifndef INCLUDED_unotools_CMDOPTIONS_HXX
+#endif // INCLUDED_UNOTOOLS_CMDOPTIONS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/unotools/collatorwrapper.hxx b/include/unotools/collatorwrapper.hxx
index c73be3518569..fbc645167957 100644
--- a/include/unotools/collatorwrapper.hxx
+++ b/include/unotools/collatorwrapper.hxx
@@ -18,8 +18,8 @@
  */
 #include "unotools/unotoolsdllapi.h"
 
-#ifndef _UNOTOOLS_COLLATORWRAPPER_HXX
-#define _UNOTOOLS_COLLATORWRAPPER_HXX
+#ifndef INCLUDED_UNOTOOLS_COLLATORWRAPPER_HXX
+#define INCLUDED_UNOTOOLS_COLLATORWRAPPER_HXX
 
 #include <com/sun/star/i18n/XCollator.hpp>
 
@@ -69,6 +69,6 @@ class UNOTOOLS_DLLPUBLIC CollatorWrapper
         CollatorWrapper();
 };
 
-#endif /* _UNOTOOLS_COLLATORWRAPPER_HXX */
+#endif // INCLUDED_UNOTOOLS_COLLATORWRAPPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/unotools/compatibility.hxx b/include/unotools/compatibility.hxx
index 18c97ae2e14f..3e1b974a1c18 100644
--- a/include/unotools/compatibility.hxx
+++ b/include/unotools/compatibility.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef INCLUDED_unotools_COMPATIBILITY_HXX
-#define INCLUDED_unotools_COMPATIBILITY_HXX
+#ifndef INCLUDED_UNOTOOLS_COMPATIBILITY_HXX
+#define INCLUDED_UNOTOOLS_COMPATIBILITY_HXX
 
 #include "unotools/unotoolsdllapi.h"
 #include <sal/types.h>
@@ -235,6 +235,6 @@ class UNOTOOLS_DLLPUBLIC SvtCompatibilityOptions: public utl::detail::Options
 
 };      // class SvtCompatibilityOptions
 
-#endif  // #ifndef INCLUDED_unotools_COMPATIBILITY_HXX
+#endif // INCLUDED_UNOTOOLS_COMPATIBILITY_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/unotools/componentresmodule.hxx b/include/unotools/componentresmodule.hxx
index 92116cb71db2..64f4c886fa30 100644
--- a/include/unotools/componentresmodule.hxx
+++ b/include/unotools/componentresmodule.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef UNOTOOLS_INC_UNOTOOLS_COMPONENTRESMODULE_HXX
-#define UNOTOOLS_INC_UNOTOOLS_COMPONENTRESMODULE_HXX
+#ifndef INCLUDED_UNOTOOLS_COMPONENTRESMODULE_HXX
+#define INCLUDED_UNOTOOLS_COMPONENTRESMODULE_HXX
 
 #include <comphelper/componentmodule.hxx>
 #include <unotools/unotoolsdllapi.h>
@@ -175,6 +175,6 @@ namespace utl
 } // namespace utl
 //........................................................................
 
-#endif // UNOTOOLS_INC_UNOTOOLS_COMPONENTRESMODULE_HXX
+#endif // INCLUDED_UNOTOOLS_COMPONENTRESMODULE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/unotools/configitem.hxx b/include/unotools/configitem.hxx
index f9427229957f..552da5f435c3 100644
--- a/include/unotools/configitem.hxx
+++ b/include/unotools/configitem.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _UTL_CONFIGITEM_HXX_
-#define _UTL_CONFIGITEM_HXX_
+#ifndef INCLUDED_UNOTOOLS_CONFIGITEM_HXX
+#define INCLUDED_UNOTOOLS_CONFIGITEM_HXX
 
 #include <sal/types.h>
 #include <rtl/ustring.hxx>
@@ -179,6 +179,6 @@ namespace utl
             sal_Bool                IsValidConfigMgr() const;
     };
 }//namespace utl
-#endif //_UTL_CONFIGITEM_HXX_
+#endif // INCLUDED_UNOTOOLS_CONFIGITEM_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/unotools/confignode.hxx b/include/unotools/confignode.hxx
index 60f749664952..a2240a3d3ac7 100644
--- a/include/unotools/confignode.hxx
+++ b/include/unotools/confignode.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _UNOTOOLS_CONFIGNODE_HXX_
-#define _UNOTOOLS_CONFIGNODE_HXX_
+#ifndef INCLUDED_UNOTOOLS_CONFIGNODE_HXX
+#define INCLUDED_UNOTOOLS_CONFIGNODE_HXX
 
 #include "unotools/unotoolsdllapi.h"
 #include <com/sun/star/container/XHierarchicalNameAccess.hpp>
@@ -320,6 +320,6 @@ namespace utl
 }   // namespace utl
 //........................................................................
 
-#endif // _UNOTOOLS_CONFIGNODE_HXX_
+#endif // INCLUDED_UNOTOOLS_CONFIGNODE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/unotools/configpaths.hxx b/include/unotools/configpaths.hxx
index d3e400ae1158..1e46a43de410 100644
--- a/include/unotools/configpaths.hxx
+++ b/include/unotools/configpaths.hxx
@@ -18,8 +18,8 @@
  */
 #include "unotools/unotoolsdllapi.h"
 
-#ifndef UNOTOOLS_CONFIGPATHS_HXX_INCLUDED
-#define UNOTOOLS_CONFIGPATHS_HXX_INCLUDED
+#ifndef INCLUDED_UNOTOOLS_CONFIGPATHS_HXX
+#define INCLUDED_UNOTOOLS_CONFIGPATHS_HXX
 #include <sal/types.h>
 #include <rtl/ustring.hxx>
 
@@ -165,6 +165,6 @@ namespace utl
 }   // namespace utl
 //----------------------------------------------------------------------------
 
-#endif // UNOTOOLS_CONFIGPATHS_HXX_INCLUDED
+#endif // INCLUDED_UNOTOOLS_CONFIGPATHS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/unotools/configvaluecontainer.hxx b/include/unotools/configvaluecontainer.hxx
index 2fa95c337bd0..c510d0faf9f0 100644
--- a/include/unotools/configvaluecontainer.hxx
+++ b/include/unotools/configvaluecontainer.hxx
@@ -18,8 +18,8 @@
  */
 #include "unotools/unotoolsdllapi.h"
 
-#ifndef UNOTOOLS_CONFIGVALUECONTAINER_HXX
-#define UNOTOOLS_CONFIGVALUECONTAINER_HXX
+#ifndef INCLUDED_UNOTOOLS_CONFIGVALUECONTAINER_HXX
+#define INCLUDED_UNOTOOLS_CONFIGVALUECONTAINER_HXX
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <osl/mutex.hxx>
 
@@ -178,6 +178,6 @@ namespace utl
 }   // namespace utl
 //.........................................................................
 
-#endif // UNOTOOLS_CONFIGVALUECONTAINER_HXX
+#endif // INCLUDED_UNOTOOLS_CONFIGVALUECONTAINER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/unotools/datetime.hxx b/include/unotools/datetime.hxx
index dfc0ab139825..bca409dafe35 100644
--- a/include/unotools/datetime.hxx
+++ b/include/unotools/datetime.hxx
@@ -20,8 +20,8 @@
 //= conversions UNO3.TimeClass <-> Tools.TimeClass (Date/Time/DateTime)
 #include "unotools/unotoolsdllapi.h"
 
-#ifndef _UNOTOOLS_DATETIME_HXX_
-#define _UNOTOOLS_DATETIME_HXX_
+#ifndef INCLUDED_UNOTOOLS_DATETIME_HXX
+#define INCLUDED_UNOTOOLS_DATETIME_HXX
 
 #include <com/sun/star/util/Date.hpp>
 #include <com/sun/star/util/Time.hpp>
@@ -54,6 +54,6 @@ namespace utl
 }   // namespace utl
 //.........................................................................
 
-#endif // _UNOTOOLS_DATETIME_HXX_
+#endif // INCLUDED_UNOTOOLS_DATETIME_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/unotools/defaultoptions.hxx b/include/unotools/defaultoptions.hxx
index 692c1463010e..08063f8023d8 100644
--- a/include/unotools/defaultoptions.hxx
+++ b/include/unotools/defaultoptions.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef INCLUDED_unotools_DEFAULTOPTIONS_HXX
-#define INCLUDED_unotools_DEFAULTOPTIONS_HXX
+#ifndef INCLUDED_UNOTOOLS_DEFAULTOPTIONS_HXX
+#define INCLUDED_UNOTOOLS_DEFAULTOPTIONS_HXX
 
 #include "unotools/unotoolsdllapi.h"
 #include <rtl/ustring.hxx>
@@ -42,6 +42,6 @@ public:
     OUString  GetDefaultPath( sal_uInt16 nId ) const;
 };
 
-#endif // #ifndef INCLUDED_unotools_DEFAULTOPTIONS_HXX
+#endif // INCLUDED_UNOTOOLS_DEFAULTOPTIONS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/unotools/desktopterminationobserver.hxx b/include/unotools/desktopterminationobserver.hxx
index 786105efe142..9f637fa954d7 100644
--- a/include/unotools/desktopterminationobserver.hxx
+++ b/include/unotools/desktopterminationobserver.hxx
@@ -18,8 +18,8 @@
  */
 #include "unotools/unotoolsdllapi.h"
 
-#ifndef UNOTOOLS_INC_UNOTOOLS_DESKTOPTERMINATIONOBSERVER_HXX
-#define UNOTOOLS_INC_UNOTOOLS_DESKTOPTERMINATIONOBSERVER_HXX
+#ifndef INCLUDED_UNOTOOLS_DESKTOPTERMINATIONOBSERVER_HXX
+#define INCLUDED_UNOTOOLS_DESKTOPTERMINATIONOBSERVER_HXX
 
 //........................................................................
 namespace utl
@@ -67,6 +67,6 @@ namespace utl
 } // namespace utl
 //........................................................................
 
-#endif // UNOTOOLS_INC_UNOTOOLS_DESKTOPTERMINATIONOBSERVER_HXX
+#endif // INCLUDED_UNOTOOLS_DESKTOPTERMINATIONOBSERVER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/unotools/docinfohelper.hxx b/include/unotools/docinfohelper.hxx
index be32c3bfc7c9..c82dac3ea8e2 100644
--- a/include/unotools/docinfohelper.hxx
+++ b/include/unotools/docinfohelper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _UNOTOOLS_DOCINFOHELPER_HXX_
-#define _UNOTOOLS_DOCINFOHELPER_HXX_
+#ifndef INCLUDED_UNOTOOLS_DOCINFOHELPER_HXX
+#define INCLUDED_UNOTOOLS_DOCINFOHELPER_HXX
 
 #include <unotools/unotoolsdllapi.h>
 #include <rtl/ustring.hxx>
@@ -35,6 +35,6 @@ public:
 }   // namespace utl
 
 
-#endif // _UNOTOOLS_DOCINFOHELPER_HXX_
+#endif // INCLUDED_UNOTOOLS_DOCINFOHELPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/unotools/dynamicmenuoptions.hxx b/include/unotools/dynamicmenuoptions.hxx
index 91784e5d91f8..ac6f9e7f4133 100644
--- a/include/unotools/dynamicmenuoptions.hxx
+++ b/include/unotools/dynamicmenuoptions.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef INCLUDED_unotools_DYNAMICMENUOPTIONS_HXX
-#define INCLUDED_unotools_DYNAMICMENUOPTIONS_HXX
+#ifndef INCLUDED_UNOTOOLS_DYNAMICMENUOPTIONS_HXX
+#define INCLUDED_UNOTOOLS_DYNAMICMENUOPTIONS_HXX
 
 #include "unotools/unotoolsdllapi.h"
 #include <sal/types.h>
@@ -133,6 +133,6 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtDynamicMenuOptions : public utl::det
 
 };      // class SvtDynamicMenuOptions
 
-#endif  // #ifndef INCLUDED_unotools_DYNAMICMENUOPTIONS_HXX
+#endif // INCLUDED_UNOTOOLS_DYNAMICMENUOPTIONS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/unotools/eventcfg.hxx b/include/unotools/eventcfg.hxx
index 2ea72642805a..5feb640f8718 100644
--- a/include/unotools/eventcfg.hxx
+++ b/include/unotools/eventcfg.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _EVENTCFG_HXX
-#define _EVENTCFG_HXX
+#ifndef INCLUDED_UNOTOOLS_EVENTCFG_HXX
+#define INCLUDED_UNOTOOLS_EVENTCFG_HXX
 
 #include "unotools/unotoolsdllapi.h"
 #include <unotools/configitem.hxx>
@@ -108,6 +108,6 @@ class UNOTOOLS_DLLPUBLIC GlobalEventConfig:
         static sal_Int32 m_nRefCount;
 };
 
-#endif // _EVENTCFG_HXX
+#endif // INCLUDED_UNOTOOLS_EVENTCFG_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/unotools/eventlisteneradapter.hxx b/include/unotools/eventlisteneradapter.hxx
index 89fe74782e34..138b4f5fb86e 100644
--- a/include/unotools/eventlisteneradapter.hxx
+++ b/include/unotools/eventlisteneradapter.hxx
@@ -18,8 +18,8 @@
  */
 #include "unotools/unotoolsdllapi.h"
 
-#ifndef _UNOTOOLS_EVENTLISTENERADAPTER_HXX_
-#define _UNOTOOLS_EVENTLISTENERADAPTER_HXX_
+#ifndef INCLUDED_UNOTOOLS_EVENTLISTENERADAPTER_HXX
+#define INCLUDED_UNOTOOLS_EVENTLISTENERADAPTER_HXX
 #include <com/sun/star/lang/XComponent.hpp>
 
 //.........................................................................
@@ -59,6 +59,6 @@ namespace utl
 }   // namespace utl
 //.........................................................................
 
-#endif // _UNOTOOLS_EVENTLISTENERADAPTER_HXX_
+#endif // INCLUDED_UNOTOOLS_EVENTLISTENERADAPTER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/unotools/extendedsecurityoptions.hxx b/include/unotools/extendedsecurityoptions.hxx
index 245f87e0d50f..405f75c94e1a 100644
--- a/include/unotools/extendedsecurityoptions.hxx
+++ b/include/unotools/extendedsecurityoptions.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef INCLUDED_unotools_EXTENDEDSECURITYOPTIONS_HXX
-#define INCLUDED_unotools_EXTENDEDSECURITYOPTIONS_HXX
+#ifndef INCLUDED_UNOTOOLS_EXTENDEDSECURITYOPTIONS_HXX
+#define INCLUDED_UNOTOOLS_EXTENDEDSECURITYOPTIONS_HXX
 
 #include "unotools/unotoolsdllapi.h"
 #include <sal/types.h>
@@ -116,6 +116,6 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtExtendedSecurityOptions : public utl
 
 };      // class SvtExtendedSecurityOptions
 
-#endif  // #ifndef INCLUDED_unotools_EXTENDEDSECURITYOPTIONS_HXX
+#endif // INCLUDED_UNOTOOLS_EXTENDEDSECURITYOPTIONS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/unotools/fltrcfg.hxx b/include/unotools/fltrcfg.hxx
index 71425a3e62c3..5257c819cfa5 100644
--- a/include/unotools/fltrcfg.hxx
+++ b/include/unotools/fltrcfg.hxx
@@ -16,8 +16,8 @@
  *   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_FLTRCFG_HXX
-#define _SVT_FLTRCFG_HXX
+#ifndef INCLUDED_UNOTOOLS_FLTRCFG_HXX
+#define INCLUDED_UNOTOOLS_FLTRCFG_HXX
 
 // -----------------------------------------------------------------------
 
diff --git a/include/unotools/fontcfg.hxx b/include/unotools/fontcfg.hxx
index e33397f289c6..0bae1e42c2b5 100644
--- a/include/unotools/fontcfg.hxx
+++ b/include/unotools/fontcfg.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _UNOTOOLS_FONTCFG_HXX
-#define _UNOTOOLS_FONTCFG_HXX
+#ifndef INCLUDED_UNOTOOLS_FONTCFG_HXX
+#define INCLUDED_UNOTOOLS_FONTCFG_HXX
 
 #include <i18nlangtag/languagetag.hxx>
 #include <unotools/unotoolsdllapi.h>
@@ -183,6 +183,6 @@ public:
 
 } // namespace utl
 
-#endif // _UNOTOOLS_FONTCFG_HXX
+#endif // INCLUDED_UNOTOOLS_FONTCFG_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/unotools/fontcvt.hxx b/include/unotools/fontcvt.hxx
index 216ebcac101b..2beda5d8a77b 100644
--- a/include/unotools/fontcvt.hxx
+++ b/include/unotools/fontcvt.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _UNOTOOLS_FONTCVT_HXX
-#define _UNOTOOLS_FONTCVT_HXX
+#ifndef INCLUDED_UNOTOOLS_FONTCVT_HXX
+#define INCLUDED_UNOTOOLS_FONTCVT_HXX
 
 #include <unotools/unotoolsdllapi.h>
 #include <rtl/ustring.hxx>
@@ -69,6 +69,6 @@ public:
 //The users of this might want to make a distinction between failed characters
 //which were inside and those outside the unicode private area.
 UNOTOOLS_DLLPUBLIC StarSymbolToMSMultiFont *CreateStarSymbolToMSMultiFont(bool bPerfectOnly=false);
-#endif // _UNOTOOLS_FONTCVT_HXX
+#endif // INCLUDED_UNOTOOLS_FONTCVT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/unotools/fontdefs.hxx b/include/unotools/fontdefs.hxx
index 1e88372a1548..68d35f06aba7 100644
--- a/include/unotools/fontdefs.hxx
+++ b/include/unotools/fontdefs.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _UNOTOOLS_FONTDEFS_HXX
-#define _UNOTOOLS_FONTDEFS_HXX
+#ifndef INCLUDED_UNOTOOLS_FONTDEFS_HXX
+#define INCLUDED_UNOTOOLS_FONTDEFS_HXX
 
 #include <unotools/unotoolsdllapi.h>
 #include <sal/types.h>
diff --git a/include/unotools/fontoptions.hxx b/include/unotools/fontoptions.hxx
index 1f192624ed61..2a3bbf872fba 100644
--- a/include/unotools/fontoptions.hxx
+++ b/include/unotools/fontoptions.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef INCLUDED_unotools_FONTOPTIONS_HXX
-#define INCLUDED_unotools_FONTOPTIONS_HXX
+#ifndef INCLUDED_UNOTOOLS_FONTOPTIONS_HXX
+#define INCLUDED_UNOTOOLS_FONTOPTIONS_HXX
 
 #include "unotools/unotoolsdllapi.h"
 #include <sal/types.h>
@@ -124,6 +124,6 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtFontOptions : public utl::detail::Op
 
 };      // class SvtFontOptions
 
-#endif  // #ifndef INCLUDED_unotools_FONTOPTIONS_HXX
+#endif // INCLUDED_UNOTOOLS_FONTOPTIONS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/unotools/historyoptions.hxx b/include/unotools/historyoptions.hxx
index 137acd6abe53..0c7d423dc426 100644
--- a/include/unotools/historyoptions.hxx
+++ b/include/unotools/historyoptions.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef INCLUDED_SVTOOLS_HISTORYOPTIONS_HXX
-#define INCLUDED_SVTOOLS_HISTORYOPTIONS_HXX
+#ifndef INCLUDED_UNOTOOLS_HISTORYOPTIONS_HXX
+#define INCLUDED_UNOTOOLS_HISTORYOPTIONS_HXX
 
 #include "unotools/unotoolsdllapi.h"
 #include <sal/types.h>
@@ -199,6 +199,6 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtHistoryOptions : public utl::detail:
 
 };      // class SvtHistoryOptions
 
-#endif  // #ifndef INCLUDED_SVTOOLS_HISTORYOPTIONS_HXX
+#endif // INCLUDED_UNOTOOLS_HISTORYOPTIONS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/unotools/idhelper.hxx b/include/unotools/idhelper.hxx
index b96c27e8ac0d..e0f8fd3af8fd 100644
--- a/include/unotools/idhelper.hxx
+++ b/include/unotools/idhelper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _UNOTOOLS_ID_HELPER_HXX_
-#define _UNOTOOLS_ID_HELPER_HXX_
+#ifndef INCLUDED_UNOTOOLS_IDHELPER_HXX
+#define INCLUDED_UNOTOOLS_IDHELPER_HXX
 
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/lang/XTypeProvider.hpp>
@@ -194,6 +194,6 @@ void classname::implCreateMap() \
     \
 
 
-#endif // _UNOTOOLS_ID_HELPER_HXX_
+#endif // INCLUDED_UNOTOOLS_IDHELPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/unotools/intlwrapper.hxx b/include/unotools/intlwrapper.hxx
index 9165be22b414..7030f11d9568 100644
--- a/include/unotools/intlwrapper.hxx
+++ b/include/unotools/intlwrapper.hxx
@@ -18,8 +18,8 @@
  */
 #include "unotools/unotoolsdllapi.h"
 
-#ifndef _UNOTOOLS_INTLWRAPPER_HXX
-#define _UNOTOOLS_INTLWRAPPER_HXX
+#ifndef INCLUDED_UNOTOOLS_INTLWRAPPER_HXX
+#define INCLUDED_UNOTOOLS_INTLWRAPPER_HXX
 #include <unotools/charclass.hxx>
 #include <unotools/localedatawrapper.hxx>
 #include <unotools/calendarwrapper.hxx>
@@ -93,6 +93,6 @@ public:
                                     }
 };
 
-#endif // _UNOTOOLS_INTLWRAPPER_HXX
+#endif // INCLUDED_UNOTOOLS_INTLWRAPPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/unotools/itemholderbase.hxx b/include/unotools/itemholderbase.hxx
index 831cba4a4a72..7b153f637252 100644
--- a/include/unotools/itemholderbase.hxx
+++ b/include/unotools/itemholderbase.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_unotools_ITEMHOLDERBASE_HXX_
-#define INCLUDED_unotools_ITEMHOLDERBASE_HXX_
+#ifndef INCLUDED_UNOTOOLS_ITEMHOLDERBASE_HXX
+#define INCLUDED_UNOTOOLS_ITEMHOLDERBASE_HXX
 
 #include <vector>
 #include <osl/mutex.hxx>
@@ -99,6 +99,6 @@ struct TItemInfo
 
 typedef ::std::vector< TItemInfo > TItems;
 
-#endif // INCLUDED_unotools_ITEMHOLDERBASE_HXX_
+#endif // INCLUDED_UNOTOOLS_ITEMHOLDERBASE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/unotools/lingucfg.hxx b/include/unotools/lingucfg.hxx
index 1dc24c605702..412f3bedf40b 100644
--- a/include/unotools/lingucfg.hxx
+++ b/include/unotools/lingucfg.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _unotools_LINGUCFG_HXX_
-#define _unotools_LINGUCFG_HXX_
+#ifndef INCLUDED_UNOTOOLS_LINGUCFG_HXX
+#define INCLUDED_UNOTOOLS_LINGUCFG_HXX
 
 #include "unotools/unotoolsdllapi.h"
 #include <com/sun/star/beans/PropertyValues.hpp>
diff --git a/include/unotools/linguprops.hxx b/include/unotools/linguprops.hxx
index 85cf64b3d31c..b54b44e2ac45 100644
--- a/include/unotools/linguprops.hxx
+++ b/include/unotools/linguprops.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _unotools_LINGUPROPS_HXX_
-#define _unotools_LINGUPROPS_HXX_
+#ifndef INCLUDED_UNOTOOLS_LINGUPROPS_HXX
+#define INCLUDED_UNOTOOLS_LINGUPROPS_HXX
 
 
 // UNO property names for general options
diff --git a/include/unotools/localedatawrapper.hxx b/include/unotools/localedatawrapper.hxx
index a198163831f7..f43daa72a603 100644
--- a/include/unotools/localedatawrapper.hxx
+++ b/include/unotools/localedatawrapper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _UNOTOOLS_LOCALEDATAWRAPPER_HXX
-#define _UNOTOOLS_LOCALEDATAWRAPPER_HXX
+#ifndef INCLUDED_UNOTOOLS_LOCALEDATAWRAPPER_HXX
+#define INCLUDED_UNOTOOLS_LOCALEDATAWRAPPER_HXX
 
 #include <boost/noncopyable.hpp>
 #include <boost/shared_ptr.hpp>
@@ -357,6 +357,6 @@ private:
 };
 
 
-#endif // _UNOTOOLS_LOCALEDATAWRAPPER_HXX
+#endif // INCLUDED_UNOTOOLS_LOCALEDATAWRAPPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/unotools/localfilehelper.hxx b/include/unotools/localfilehelper.hxx
index 77ead6b8a523..9028ff8f0847 100644
--- a/include/unotools/localfilehelper.hxx
+++ b/include/unotools/localfilehelper.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _UNOTOOLS_LOCALFILEHELPER_HXX
-#define _UNOTOOLS_LOCALFILEHELPER_HXX
+#ifndef INCLUDED_UNOTOOLS_LOCALFILEHELPER_HXX
+#define INCLUDED_UNOTOOLS_LOCALFILEHELPER_HXX
 
 #include <com/sun/star/uno/Sequence.hxx>
 #include "unotools/unotoolsdllapi.h"
diff --git a/include/unotools/localisationoptions.hxx b/include/unotools/localisationoptions.hxx
index 96b2e97a9341..90745010a6f1 100644
--- a/include/unotools/localisationoptions.hxx
+++ b/include/unotools/localisationoptions.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef INCLUDED_unotools_LOCALISATIONOPTIONS_HXX
-#define INCLUDED_unotools_LOCALISATIONOPTIONS_HXX
+#ifndef INCLUDED_UNOTOOLS_LOCALISATIONOPTIONS_HXX
+#define INCLUDED_UNOTOOLS_LOCALISATIONOPTIONS_HXX
 
 #include <sal/types.h>
 #include "unotools/unotoolsdllapi.h"
@@ -131,6 +131,6 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtLocalisationOptions : public utl::de
 
 };      // class SvtLocalisationOptions
 
-#endif  // #ifndef INCLUDED_unotools_LOCALISATIONOPTIONS_HXX
+#endif // INCLUDED_UNOTOOLS_LOCALISATIONOPTIONS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/unotools/misccfg.hxx b/include/unotools/misccfg.hxx
index 7759b31ed24a..aa208c631f97 100644
--- a/include/unotools/misccfg.hxx
+++ b/include/unotools/misccfg.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _UTL_MISCCFG_HXX
-#define _UTL_MISCCFG_HXX
+#ifndef INCLUDED_UNOTOOLS_MISCCFG_HXX
+#define INCLUDED_UNOTOOLS_MISCCFG_HXX
 
 #include "unotools/unotoolsdllapi.h"
 #include "tools/solar.h"
diff --git a/include/unotools/moduleoptions.hxx b/include/unotools/moduleoptions.hxx
index 98f4d86e654f..dd42e2bffbea 100644
--- a/include/unotools/moduleoptions.hxx
+++ b/include/unotools/moduleoptions.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SVTOOLS_MODULEOPTIONS_HXX
-#define INCLUDED_SVTOOLS_MODULEOPTIONS_HXX
+#ifndef INCLUDED_UNOTOOLS_MODULEOPTIONS_HXX
+#define INCLUDED_UNOTOOLS_MODULEOPTIONS_HXX
 
 #include "unotools/unotoolsdllapi.h"
 #include <salhelper/singletonref.hxx>
@@ -203,6 +203,6 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtModuleOptions : public utl::detail::
 
 };      // class SvtModuleOptions
 
-#endif  // #ifndef INCLUDED_SVTOOLS_MODULEOPTIONS_HXX
+#endif // INCLUDED_UNOTOOLS_MODULEOPTIONS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/unotools/nativenumberwrapper.hxx b/include/unotools/nativenumberwrapper.hxx
index 252a48d85a13..2c6e079ab45a 100644
--- a/include/unotools/nativenumberwrapper.hxx
+++ b/include/unotools/nativenumberwrapper.hxx
@@ -18,8 +18,8 @@
  */
 #include "unotools/unotoolsdllapi.h"
 
-#ifndef _UNOTOOLS_NATIVENUMBERWRAPPER_HXX
-#define _UNOTOOLS_NATIVENUMBERWRAPPER_HXX
+#ifndef INCLUDED_UNOTOOLS_NATIVENUMBERWRAPPER_HXX
+#define INCLUDED_UNOTOOLS_NATIVENUMBERWRAPPER_HXX
 #include <com/sun/star/i18n/XNativeNumberSupplier.hpp>
 
 namespace com { namespace sun { namespace star {
@@ -59,6 +59,6 @@ public:
 
 };
 
-#endif // _UNOTOOLS_NATIVENUMBERWRAPPER_HXX
+#endif // INCLUDED_UNOTOOLS_NATIVENUMBERWRAPPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/unotools/numberformatcodewrapper.hxx b/include/unotools/numberformatcodewrapper.hxx
index 82e254e7ea1d..ee7a14f07d3a 100644
--- a/include/unotools/numberformatcodewrapper.hxx
+++ b/include/unotools/numberformatcodewrapper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _UNOTOOLS_NUMBERFORMATCODEWRAPPER_HXX
-#define _UNOTOOLS_NUMBERFORMATCODEWRAPPER_HXX
+#ifndef INCLUDED_UNOTOOLS_NUMBERFORMATCODEWRAPPER_HXX
+#define INCLUDED_UNOTOOLS_NUMBERFORMATCODEWRAPPER_HXX
 
 #include <com/sun/star/i18n/XNumberFormatCode.hpp>
 #include "unotools/unotoolsdllapi.h"
@@ -63,6 +63,6 @@ public:
 
 };
 
-#endif // _UNOTOOLS_NUMBERFORMATCODEWRAPPER_HXX
+#endif // INCLUDED_UNOTOOLS_NUMBERFORMATCODEWRAPPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/unotools/options.hxx b/include/unotools/options.hxx
index 5a37b026fb63..6bacefe03fc0 100644
--- a/include/unotools/options.hxx
+++ b/include/unotools/options.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_unotools_OPTIONS_HXX
-#define INCLUDED_unotools_OPTIONS_HXX
+#ifndef INCLUDED_UNOTOOLS_OPTIONS_HXX
+#define INCLUDED_UNOTOOLS_OPTIONS_HXX
 
 #include "sal/config.h"
 #include "unotools/unotoolsdllapi.h"
diff --git a/include/unotools/optionsdlg.hxx b/include/unotools/optionsdlg.hxx
index ba28032a49ea..a3fc1f85b2ab 100644
--- a/include/unotools/optionsdlg.hxx
+++ b/include/unotools/optionsdlg.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef INCLUDED_unotools_OPTIONSDLG_HXX
-#define INCLUDED_unotools_OPTIONSDLG_HXX
+#ifndef INCLUDED_UNOTOOLS_OPTIONSDLG_HXX
+#define INCLUDED_UNOTOOLS_OPTIONSDLG_HXX
 
 #include "unotools/unotoolsdllapi.h"
 #include <rtl/ustring.hxx>
diff --git a/include/unotools/pathoptions.hxx b/include/unotools/pathoptions.hxx
index d1d6bd9f45de..6952e21c5848 100644
--- a/include/unotools/pathoptions.hxx
+++ b/include/unotools/pathoptions.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef INCLUDED_unotools_PATHOPTIONS_HXX
-#define INCLUDED_unotools_PATHOPTIONS_HXX
+#ifndef INCLUDED_UNOTOOLS_PATHOPTIONS_HXX
+#define INCLUDED_UNOTOOLS_PATHOPTIONS_HXX
 
 #include "unotools/unotoolsdllapi.h"
 #include <i18nlangtag/languagetag.hxx>
@@ -124,6 +124,6 @@ public:
     bool            IsReadonly() const;
 };
 
-#endif // #ifndef INCLUDED_unotools_PATHOPTIONS_HXX
+#endif // INCLUDED_UNOTOOLS_PATHOPTIONS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/unotools/printwarningoptions.hxx b/include/unotools/printwarningoptions.hxx
index 61b79ee2eb45..b32adabb2739 100644
--- a/include/unotools/printwarningoptions.hxx
+++ b/include/unotools/printwarningoptions.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_unotools_PRINTWARNINGOPTIONS_HXX
-#define INCLUDED_unotools_PRINTWARNINGOPTIONS_HXX
+#ifndef INCLUDED_UNOTOOLS_PRINTWARNINGOPTIONS_HXX
+#define INCLUDED_UNOTOOLS_PRINTWARNINGOPTIONS_HXX
 
 #include "unotools/unotoolsdllapi.h"
 #include <sal/types.h>
@@ -116,6 +116,6 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtPrintWarningOptions : public utl::de
 
 };      // class SvtPrintWarningOptions
 
-#endif // #ifndef INCLUDED_unotools_PRINTWARNINGOPTIONS_HXX
+#endif // INCLUDED_UNOTOOLS_PRINTWARNINGOPTIONS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/unotools/progresshandlerwrap.hxx b/include/unotools/progresshandlerwrap.hxx
index fc640dc4c4a9..04faadf24258 100644
--- a/include/unotools/progresshandlerwrap.hxx
+++ b/include/unotools/progresshandlerwrap.hxx
@@ -18,8 +18,8 @@
  */
 #include "unotools/unotoolsdllapi.h"
 
-#ifndef _UTL_PROGRESSHANDLERWRAP_HXX_
-#define _UTL_PROGRESSHANDLERWRAP_HXX_
+#ifndef INCLUDED_UNOTOOLS_PROGRESSHANDLERWRAP_HXX
+#define INCLUDED_UNOTOOLS_PROGRESSHANDLERWRAP_HXX
 #include <cppuhelper/implbase1.hxx>
 #include <com/sun/star/task/XStatusIndicator.hpp>
 #include <com/sun/star/ucb/XProgressHandler.hpp>
@@ -45,6 +45,6 @@ public:
 
 }   // namespace utl
 
-#endif // _UTL_PROGRESSHANDLERWRAP_HXX_
+#endif // INCLUDED_UNOTOOLS_PROGRESSHANDLERWRAP_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/unotools/saveopt.hxx b/include/unotools/saveopt.hxx
index 771c7210d09c..e51b25d956f1 100644
--- a/include/unotools/saveopt.hxx
+++ b/include/unotools/saveopt.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef INCLUDED_unotools_SAVEOPT_HXX
-#define INCLUDED_unotools_SAVEOPT_HXX
+#ifndef INCLUDED_UNOTOOLS_SAVEOPT_HXX
+#define INCLUDED_UNOTOOLS_SAVEOPT_HXX
 
 #include "unotools/unotoolsdllapi.h"
 #include <unotools/options.hxx>
diff --git a/include/unotools/searchopt.hxx b/include/unotools/searchopt.hxx
index a808c88eb28f..56bb0eb18c61 100644
--- a/include/unotools/searchopt.hxx
+++ b/include/unotools/searchopt.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVT_SEARCHOPT_HXX_
-#define _SVT_SEARCHOPT_HXX_
+#ifndef INCLUDED_UNOTOOLS_SEARCHOPT_HXX
+#define INCLUDED_UNOTOOLS_SEARCHOPT_HXX
 
 #include "unotools/unotoolsdllapi.h"
 #include "tools/solar.h"
diff --git a/include/unotools/securityoptions.hxx b/include/unotools/securityoptions.hxx
index 9b8f3807ba50..eb6464729f8d 100644
--- a/include/unotools/securityoptions.hxx
+++ b/include/unotools/securityoptions.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef INCLUDED_unotools_SECURITYOPTIONS_HXX
-#define INCLUDED_unotools_SECURITYOPTIONS_HXX
+#ifndef INCLUDED_UNOTOOLS_SECURITYOPTIONS_HXX
+#define INCLUDED_UNOTOOLS_SECURITYOPTIONS_HXX
 
 #include "unotools/unotoolsdllapi.h"
 #include <sal/types.h>
@@ -256,6 +256,6 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtSecurityOptions : public utl::detail
 
 };      // class SvtSecurityOptions
 
-#endif  // #ifndef INCLUDED_unotools_SECURITYOPTIONS_HXX
+#endif // INCLUDED_UNOTOOLS_SECURITYOPTIONS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/unotools/sharedunocomponent.hxx b/include/unotools/sharedunocomponent.hxx
index a8bb97ea9005..bf0bc405e7c4 100644
--- a/include/unotools/sharedunocomponent.hxx
+++ b/include/unotools/sharedunocomponent.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef UNOTOOLS_INC_SHAREDUNOCOMPONENT_HXX
-#define UNOTOOLS_INC_SHAREDUNOCOMPONENT_HXX
+#ifndef INCLUDED_UNOTOOLS_SHAREDUNOCOMPONENT_HXX
+#define INCLUDED_UNOTOOLS_SHAREDUNOCOMPONENT_HXX
 
 #include "unotoolsdllapi.h"
 
@@ -353,6 +353,6 @@ namespace utl
 }   // namespace utl
 //............................................................................
 
-#endif // UNOTOOLS_INC_SHAREDUNOCOMPONENT_HXX
+#endif // INCLUDED_UNOTOOLS_SHAREDUNOCOMPONENT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/unotools/streamhelper.hxx b/include/unotools/streamhelper.hxx
index 60e16a28767a..ea4fb8c1fef3 100644
--- a/include/unotools/streamhelper.hxx
+++ b/include/unotools/streamhelper.hxx
@@ -18,8 +18,8 @@
  */
 #include "unotools/unotoolsdllapi.h"
 
-#ifndef _UNOTOOLS_STREAMHELPER_HXX_
-#define _UNOTOOLS_STREAMHELPER_HXX_
+#ifndef INCLUDED_UNOTOOLS_STREAMHELPER_HXX
+#define INCLUDED_UNOTOOLS_STREAMHELPER_HXX
 #include <com/sun/star/io/XInputStream.hpp>
 #include <com/sun/star/io/XSeekable.hpp>
 #include <osl/mutex.hxx>
diff --git a/include/unotools/streamsection.hxx b/include/unotools/streamsection.hxx
index 66d015e83aab..4fbfe61edb38 100644
--- a/include/unotools/streamsection.hxx
+++ b/include/unotools/streamsection.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _UNOTOOLS_STREAMSECTION_HXX_
-#define _UNOTOOLS_STREAMSECTION_HXX_
+#ifndef INCLUDED_UNOTOOLS_STREAMSECTION_HXX
+#define INCLUDED_UNOTOOLS_STREAMSECTION_HXX
 
 #include <com/sun/star/io/XMarkableStream.hpp>
 #include <com/sun/star/io/XDataInputStream.hpp>
@@ -72,7 +72,7 @@ public:
 
 }   // namespace utl
 
-#endif // _UNOTOOLS_STREAMSECTION_HXX_
+#endif // INCLUDED_UNOTOOLS_STREAMSECTION_HXX
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/unotools/streamwrap.hxx b/include/unotools/streamwrap.hxx
index d4d08cad406e..5b0aa67105f6 100644
--- a/include/unotools/streamwrap.hxx
+++ b/include/unotools/streamwrap.hxx
@@ -18,8 +18,9 @@
  */
 #include "unotools/unotoolsdllapi.h"
 
-#ifndef _UTL_STREAM_WRAPPER_HXX_
-#define _UTL_STREAM_WRAPPER_HXX_
+#ifndef INCLUDED_UNOTOOLS_STREAMWRAP_HXX
+#define INCLUDED_UNOTOOLS_STREAMWRAP_HXX
+
 #include <osl/mutex.hxx>
 #include <com/sun/star/io/XOutputStream.hpp>
 #include <com/sun/star/io/XInputStream.hpp>
@@ -168,6 +169,6 @@ public:
 }
 // namespace utl
 
-#endif // _UTL_STREAM_WRAPPER_HXX_
+#endif // INCLUDED_UNOTOOLS_STREAMWRAP_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/unotools/syslocaleoptions.hxx b/include/unotools/syslocaleoptions.hxx
index 9bf0578ee10f..0d528b54b6c6 100644
--- a/include/unotools/syslocaleoptions.hxx
+++ b/include/unotools/syslocaleoptions.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SVTOOLS_SYSLOCALEOPTIONS_HXX
-#define INCLUDED_SVTOOLS_SYSLOCALEOPTIONS_HXX
+#ifndef INCLUDED_UNOTOOLS_SYSLOCALEOPTIONS_HXX
+#define INCLUDED_UNOTOOLS_SYSLOCALEOPTIONS_HXX
 
 #include "unotools/unotoolsdllapi.h"
 #include <sal/types.h>
@@ -171,6 +171,6 @@ public:
             bool                IsReadOnly( EOption eOption ) const;
 };
 
-#endif  // INCLUDED_SVTOOLS_SYSLOCALEOPTIONS_HXX
+#endif // INCLUDED_UNOTOOLS_SYSLOCALEOPTIONS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/unotools/tempfile.hxx b/include/unotools/tempfile.hxx
index 9efe45a3fb9f..e1281f0d2bf2 100644
--- a/include/unotools/tempfile.hxx
+++ b/include/unotools/tempfile.hxx
@@ -18,8 +18,8 @@
  */
 #include "unotools/unotoolsdllapi.h"
 
-#ifndef _UNOTOOLS_TEMPFILE_HXX
-#define _UNOTOOLS_TEMPFILE_HXX
+#ifndef INCLUDED_UNOTOOLS_TEMPFILE_HXX
+#define INCLUDED_UNOTOOLS_TEMPFILE_HXX
 
 #include <tools/stream.hxx>
 
diff --git a/include/unotools/textsearch.hxx b/include/unotools/textsearch.hxx
index 0880c13ff3f4..7b218e11f67d 100644
--- a/include/unotools/textsearch.hxx
+++ b/include/unotools/textsearch.hxx
@@ -18,8 +18,8 @@
  */
 #include "unotools/unotoolsdllapi.h"
 
-#ifndef _UNOTOOLS_TEXTSEARCH_HXX
-#define _UNOTOOLS_TEXTSEARCH_HXX
+#ifndef INCLUDED_UNOTOOLS_TEXTSEARCH_HXX
+#define INCLUDED_UNOTOOLS_TEXTSEARCH_HXX
 #include <i18nlangtag/lang.h>
 #include <rtl/ustring.hxx>
 #include <com/sun/star/uno/Reference.h>
diff --git a/include/unotools/transliterationwrapper.hxx b/include/unotools/transliterationwrapper.hxx
index fbc845b218be..af05f210a48c 100644
--- a/include/unotools/transliterationwrapper.hxx
+++ b/include/unotools/transliterationwrapper.hxx
@@ -18,8 +18,8 @@
  */
 #include "unotools/unotoolsdllapi.h"
 
-#ifndef _UNOTOOLS_TRANSLITERATIONWRAPPER_HXX
-#define _UNOTOOLS_TRANSLITERATIONWRAPPER_HXX
+#ifndef INCLUDED_UNOTOOLS_TRANSLITERATIONWRAPPER_HXX
+#define INCLUDED_UNOTOOLS_TRANSLITERATIONWRAPPER_HXX
 #include <rtl/ustring.hxx>
 #include <tools/solar.h>
 #include <i18nlangtag/languagetag.hxx>
diff --git a/include/unotools/ucbhelper.hxx b/include/unotools/ucbhelper.hxx
index fe29a3a54201..998fe82c5b3c 100644
--- a/include/unotools/ucbhelper.hxx
+++ b/include/unotools/ucbhelper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _UNOTOOLS_UCBHELPER_HXX
-#define _UNOTOOLS_UCBHELPER_HXX
+#ifndef INCLUDED_UNOTOOLS_UCBHELPER_HXX
+#define INCLUDED_UNOTOOLS_UCBHELPER_HXX
 
 #include "sal/config.h"
 
diff --git a/include/unotools/ucblockbytes.hxx b/include/unotools/ucblockbytes.hxx
index 6df93af9e7b9..2258fe19d38b 100644
--- a/include/unotools/ucblockbytes.hxx
+++ b/include/unotools/ucblockbytes.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _UNTOOLS_UCBLOCKBYTES_HXX
-#define _UNTOOLS_UCBLOCKBYTES_HXX
+#ifndef INCLUDED_UNOTOOLS_UCBLOCKBYTES_HXX
+#define INCLUDED_UNOTOOLS_UCBLOCKBYTES_HXX
 
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
diff --git a/include/unotools/ucbstreamhelper.hxx b/include/unotools/ucbstreamhelper.hxx
index 4a48a21a2820..eb814b4128a0 100644
--- a/include/unotools/ucbstreamhelper.hxx
+++ b/include/unotools/ucbstreamhelper.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _UNTOOLS_UCBSTREAMHELPER_HXX
-#define _UNTOOLS_UCBSTREAMHELPER_HXX
+#ifndef INCLUDED_UNOTOOLS_UCBSTREAMHELPER_HXX
+#define INCLUDED_UNOTOOLS_UCBSTREAMHELPER_HXX
 
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/io/XInputStream.hpp>
diff --git a/include/unotools/unotoolsdllapi.h b/include/unotools/unotoolsdllapi.h
index a08f54ce8a5a..5d7e76a3a3dd 100644
--- a/include/unotools/unotoolsdllapi.h
+++ b/include/unotools/unotoolsdllapi.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_UNOTOOLSDLLAPI_H
-#define INCLUDED_UNOTOOLSDLLAPI_H
+#ifndef INCLUDED_UNOTOOLS_UNOTOOLSDLLAPI_H
+#define INCLUDED_UNOTOOLS_UNOTOOLSDLLAPI_H
 
 #include "sal/types.h"
 
@@ -29,6 +29,6 @@
 #endif
 #define UNOTOOLS_DLLPRIVATE SAL_DLLPRIVATE
 
-#endif /* INCLUDED_UNOTOOLSDLLAPI_H */
+#endif // INCLUDED_UNOTOOLS_UNOTOOLSDLLAPI_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/unotools/useroptions.hxx b/include/unotools/useroptions.hxx
index 77b71ee90bd1..10aa5c7be657 100644
--- a/include/unotools/useroptions.hxx
+++ b/include/unotools/useroptions.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef INCLUDED_unotools_USEROPTIONS_HXX
-#define INCLUDED_unotools_USEROPTIONS_HXX
+#ifndef INCLUDED_UNOTOOLS_USEROPTIONS_HXX
+#define INCLUDED_UNOTOOLS_USEROPTIONS_HXX
 
 #include "unotools/unotoolsdllapi.h"
 #include <unotools/configitem.hxx>
@@ -92,6 +92,6 @@ private:
     class ChangeListener;
 };
 
-#endif // #ifndef INCLUDED_unotools_USEROPTIONS_HXX
+#endif // INCLUDED_UNOTOOLS_USEROPTIONS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/unotools/viewoptions.hxx b/include/unotools/viewoptions.hxx
index bcbca0909cb5..9e17357db723 100644
--- a/include/unotools/viewoptions.hxx
+++ b/include/unotools/viewoptions.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef INCLUDED_unotools_VIEWOPTIONS_HXX
-#define INCLUDED_unotools_VIEWOPTIONS_HXX
+#ifndef INCLUDED_UNOTOOLS_VIEWOPTIONS_HXX
+#define INCLUDED_UNOTOOLS_VIEWOPTIONS_HXX
 
 #include "unotools/unotoolsdllapi.h"
 #include <com/sun/star/uno/Sequence.hxx>
@@ -313,6 +313,6 @@ class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtViewOptions : public utl::detail::Op
 
 };      // class SvtViewOptions
 
-#endif  // #ifndef INCLUDED_unotools_VIEWOPTIONS_HXX
+#endif // INCLUDED_UNOTOOLS_VIEWOPTIONS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/unotools/xmlaccelcfg.hxx b/include/unotools/xmlaccelcfg.hxx
index e9b582bee924..eac33424844f 100644
--- a/include/unotools/xmlaccelcfg.hxx
+++ b/include/unotools/xmlaccelcfg.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_unotools_XMLACCELCFG_HXX
-#define INCLUDED_unotools_XMLACCELCFG_HXX
+#ifndef INCLUDED_UNOTOOLS_XMLACCELCFG_HXX
+#define INCLUDED_UNOTOOLS_XMLACCELCFG_HXX
 
 #include <com/sun/star/xml/sax/XDocumentHandler.hpp>
 #include <cppuhelper/weak.hxx>
@@ -85,6 +85,6 @@ class OReadAccelatorDocumentHandler : public ::com::sun::star::xml::sax::XDocume
         SvtAcceleratorItemList& m_aReadAcceleratorList;
 };
 
-#endif // INCLUDED_unotools_XMLACCELCFG_HXX
+#endif // INCLUDED_UNOTOOLS_XMLACCELCFG_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */