fixincludeguards.sh: include/c*

Change-Id: Icba422d99836518a1b662b15144bc9334bed1473

51 files changed, 104 insertions, 104 deletions

diff --git a/include/cppuhelper/access_control.hxx b/include/cppuhelper/access_control.hxx
index f1fbe3f13cd6..19078e95d217 100644
--- a/include/cppuhelper/access_control.hxx
+++ b/include/cppuhelper/access_control.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 _CPPUHELPER_ACCESS_CONTROL_HXX_
-#define _CPPUHELPER_ACCESS_CONTROL_HXX_
+#ifndef INCLUDED_CPPUHELPER_ACCESS_CONTROL_HXX
+#define INCLUDED_CPPUHELPER_ACCESS_CONTROL_HXX
 
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/security/XAccessController.hpp>
diff --git a/include/cppuhelper/basemutex.hxx b/include/cppuhelper/basemutex.hxx
index 5394b834e434..48c4aa49a501 100644
--- a/include/cppuhelper/basemutex.hxx
+++ b/include/cppuhelper/basemutex.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CPPUHELPER_BASEMUTEX_HXX_
-#define _CPPUHELPER_BASEMUTEX_HXX_
+#ifndef INCLUDED_CPPUHELPER_BASEMUTEX_HXX
+#define INCLUDED_CPPUHELPER_BASEMUTEX_HXX
 
 #include <osl/mutex.hxx>
 
@@ -38,6 +38,6 @@ namespace cppu
         mutable ::osl::Mutex m_aMutex;
     };
 }
-#endif // _CPPUHELPER_BASEMUTEX_HXX_
+#endif // INCLUDED_CPPUHELPER_BASEMUTEX_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/cppuhelper/bootstrap.hxx b/include/cppuhelper/bootstrap.hxx
index d76379a2f3e3..080d66966fa3 100644
--- a/include/cppuhelper/bootstrap.hxx
+++ b/include/cppuhelper/bootstrap.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 _CPPUHELPER_BOOTSTRAP_HXX_
-#define _CPPUHELPER_BOOTSTRAP_HXX_
+#ifndef INCLUDED_CPPUHELPER_BOOTSTRAP_HXX
+#define INCLUDED_CPPUHELPER_BOOTSTRAP_HXX
 
 #include "sal/config.h"
 #include "com/sun/star/uno/Exception.hpp"
diff --git a/include/cppuhelper/compbase.hxx b/include/cppuhelper/compbase.hxx
index dc0b8dd4f905..11e187a3f560 100644
--- a/include/cppuhelper/compbase.hxx
+++ b/include/cppuhelper/compbase.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 _CPPUHELPER_COMPBASE_HXX_
-#define _CPPUHELPER_COMPBASE_HXX_
+#ifndef INCLUDED_CPPUHELPER_COMPBASE_HXX
+#define INCLUDED_CPPUHELPER_COMPBASE_HXX
 
 #include <cppuhelper/compbase_ex.hxx>
 #include <cppuhelper/implbase.hxx>
diff --git a/include/cppuhelper/compbase1.hxx b/include/cppuhelper/compbase1.hxx
index 8948f0120f36..636547bc0557 100644
--- a/include/cppuhelper/compbase1.hxx
+++ b/include/cppuhelper/compbase1.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 _CPPUHELPER_COMPBASE1_HXX_
-#define _CPPUHELPER_COMPBASE1_HXX_
+#ifndef INCLUDED_CPPUHELPER_COMPBASE1_HXX
+#define INCLUDED_CPPUHELPER_COMPBASE1_HXX
 
 #include <cppuhelper/implbase1.hxx>
 #include <cppuhelper/compbase_ex.hxx>
diff --git a/include/cppuhelper/compbase10.hxx b/include/cppuhelper/compbase10.hxx
index 588a47a6fa8a..408c23d301b8 100644
--- a/include/cppuhelper/compbase10.hxx
+++ b/include/cppuhelper/compbase10.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 _CPPUHELPER_COMPBASE10_HXX_
-#define _CPPUHELPER_COMPBASE10_HXX_
+#ifndef INCLUDED_CPPUHELPER_COMPBASE10_HXX
+#define INCLUDED_CPPUHELPER_COMPBASE10_HXX
 
 #include <cppuhelper/implbase10.hxx>
 #include <cppuhelper/compbase_ex.hxx>
diff --git a/include/cppuhelper/compbase11.hxx b/include/cppuhelper/compbase11.hxx
index 259a12258f8d..84685bc6cb6e 100644
--- a/include/cppuhelper/compbase11.hxx
+++ b/include/cppuhelper/compbase11.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 _CPPUHELPER_COMPBASE11_HXX_
-#define _CPPUHELPER_COMPBASE11_HXX_
+#ifndef INCLUDED_CPPUHELPER_COMPBASE11_HXX
+#define INCLUDED_CPPUHELPER_COMPBASE11_HXX
 
 #include <cppuhelper/implbase11.hxx>
 #include <cppuhelper/compbase_ex.hxx>
diff --git a/include/cppuhelper/compbase12.hxx b/include/cppuhelper/compbase12.hxx
index 3009dac8f46e..07adea43884a 100644
--- a/include/cppuhelper/compbase12.hxx
+++ b/include/cppuhelper/compbase12.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 _CPPUHELPER_COMPBASE12_HXX_
-#define _CPPUHELPER_COMPBASE12_HXX_
+#ifndef INCLUDED_CPPUHELPER_COMPBASE12_HXX
+#define INCLUDED_CPPUHELPER_COMPBASE12_HXX
 
 #include <cppuhelper/implbase12.hxx>
 #include <cppuhelper/compbase_ex.hxx>
diff --git a/include/cppuhelper/compbase2.hxx b/include/cppuhelper/compbase2.hxx
index e54a38b00e3b..f848b337f012 100644
--- a/include/cppuhelper/compbase2.hxx
+++ b/include/cppuhelper/compbase2.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 _CPPUHELPER_COMPBASE2_HXX_
-#define _CPPUHELPER_COMPBASE2_HXX_
+#ifndef INCLUDED_CPPUHELPER_COMPBASE2_HXX
+#define INCLUDED_CPPUHELPER_COMPBASE2_HXX
 
 #include <cppuhelper/implbase2.hxx>
 #include <cppuhelper/compbase_ex.hxx>
diff --git a/include/cppuhelper/compbase3.hxx b/include/cppuhelper/compbase3.hxx
index e43991a7c117..c51b46c56471 100644
--- a/include/cppuhelper/compbase3.hxx
+++ b/include/cppuhelper/compbase3.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 _CPPUHELPER_COMPBASE3_HXX_
-#define _CPPUHELPER_COMPBASE3_HXX_
+#ifndef INCLUDED_CPPUHELPER_COMPBASE3_HXX
+#define INCLUDED_CPPUHELPER_COMPBASE3_HXX
 
 #include <cppuhelper/implbase3.hxx>
 #include <cppuhelper/compbase_ex.hxx>
diff --git a/include/cppuhelper/compbase4.hxx b/include/cppuhelper/compbase4.hxx
index a20542e57abe..60c50594ac61 100644
--- a/include/cppuhelper/compbase4.hxx
+++ b/include/cppuhelper/compbase4.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 _CPPUHELPER_COMPBASE4_HXX_
-#define _CPPUHELPER_COMPBASE4_HXX_
+#ifndef INCLUDED_CPPUHELPER_COMPBASE4_HXX
+#define INCLUDED_CPPUHELPER_COMPBASE4_HXX
 
 #include <cppuhelper/implbase4.hxx>
 #include <cppuhelper/compbase_ex.hxx>
diff --git a/include/cppuhelper/compbase5.hxx b/include/cppuhelper/compbase5.hxx
index b22b1038b573..82aa7c13ac32 100644
--- a/include/cppuhelper/compbase5.hxx
+++ b/include/cppuhelper/compbase5.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 _CPPUHELPER_COMPBASE5_HXX_
-#define _CPPUHELPER_COMPBASE5_HXX_
+#ifndef INCLUDED_CPPUHELPER_COMPBASE5_HXX
+#define INCLUDED_CPPUHELPER_COMPBASE5_HXX
 
 #include <cppuhelper/implbase5.hxx>
 #include <cppuhelper/compbase_ex.hxx>
diff --git a/include/cppuhelper/compbase6.hxx b/include/cppuhelper/compbase6.hxx
index 778bbb722295..77168e1b3aa1 100644
--- a/include/cppuhelper/compbase6.hxx
+++ b/include/cppuhelper/compbase6.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 _CPPUHELPER_COMPBASE6_HXX_
-#define _CPPUHELPER_COMPBASE6_HXX_
+#ifndef INCLUDED_CPPUHELPER_COMPBASE6_HXX
+#define INCLUDED_CPPUHELPER_COMPBASE6_HXX
 
 #include <cppuhelper/implbase6.hxx>
 #include <cppuhelper/compbase_ex.hxx>
diff --git a/include/cppuhelper/compbase7.hxx b/include/cppuhelper/compbase7.hxx
index edf3af3fd258..a069cfe7ed3c 100644
--- a/include/cppuhelper/compbase7.hxx
+++ b/include/cppuhelper/compbase7.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 _CPPUHELPER_COMPBASE7_HXX_
-#define _CPPUHELPER_COMPBASE7_HXX_
+#ifndef INCLUDED_CPPUHELPER_COMPBASE7_HXX
+#define INCLUDED_CPPUHELPER_COMPBASE7_HXX
 
 #include <cppuhelper/implbase7.hxx>
 #include <cppuhelper/compbase_ex.hxx>
diff --git a/include/cppuhelper/compbase8.hxx b/include/cppuhelper/compbase8.hxx
index efff5c4a2d09..989b8d43f637 100644
--- a/include/cppuhelper/compbase8.hxx
+++ b/include/cppuhelper/compbase8.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 _CPPUHELPER_COMPBASE8_HXX_
-#define _CPPUHELPER_COMPBASE8_HXX_
+#ifndef INCLUDED_CPPUHELPER_COMPBASE8_HXX
+#define INCLUDED_CPPUHELPER_COMPBASE8_HXX
 
 #include <cppuhelper/implbase8.hxx>
 #include <cppuhelper/compbase_ex.hxx>
diff --git a/include/cppuhelper/compbase9.hxx b/include/cppuhelper/compbase9.hxx
index 5496e63864bd..0fac12ce4075 100644
--- a/include/cppuhelper/compbase9.hxx
+++ b/include/cppuhelper/compbase9.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 _CPPUHELPER_COMPBASE9_HXX_
-#define _CPPUHELPER_COMPBASE9_HXX_
+#ifndef INCLUDED_CPPUHELPER_COMPBASE9_HXX
+#define INCLUDED_CPPUHELPER_COMPBASE9_HXX
 
 #include <cppuhelper/implbase9.hxx>
 #include <cppuhelper/compbase_ex.hxx>
diff --git a/include/cppuhelper/compbase_ex.hxx b/include/cppuhelper/compbase_ex.hxx
index 5937f60e29cc..8cfa78a089a0 100644
--- a/include/cppuhelper/compbase_ex.hxx
+++ b/include/cppuhelper/compbase_ex.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 _CPPUHELPER_COMPBASE_EX_HXX_
-#define _CPPUHELPER_COMPBASE_EX_HXX_
+#ifndef INCLUDED_CPPUHELPER_COMPBASE_EX_HXX
+#define INCLUDED_CPPUHELPER_COMPBASE_EX_HXX
 
 #include <osl/mutex.hxx>
 #include <cppuhelper/implbase_ex.hxx>
diff --git a/include/cppuhelper/component.hxx b/include/cppuhelper/component.hxx
index 64460959fbbf..7fb919d2b0a6 100644
--- a/include/cppuhelper/component.hxx
+++ b/include/cppuhelper/component.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 _CPPUHELPER_COMPONENT_HXX_
-#define _CPPUHELPER_COMPONENT_HXX_
+#ifndef INCLUDED_CPPUHELPER_COMPONENT_HXX
+#define INCLUDED_CPPUHELPER_COMPONENT_HXX
 
 #include <osl/mutex.hxx>
 #include <cppuhelper/weakagg.hxx>
diff --git a/include/cppuhelper/component_context.hxx b/include/cppuhelper/component_context.hxx
index 575fa490a452..943efdd7fcdd 100644
--- a/include/cppuhelper/component_context.hxx
+++ b/include/cppuhelper/component_context.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _CPPUHELPER_COMPONENT_CONTEXT_HXX_
-#define _CPPUHELPER_COMPONENT_CONTEXT_HXX_
+#ifndef INCLUDED_CPPUHELPER_COMPONENT_CONTEXT_HXX
+#define INCLUDED_CPPUHELPER_COMPONENT_CONTEXT_HXX
 
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/lang/XSingleComponentFactory.hpp>
diff --git a/include/cppuhelper/cppuhelperdllapi.h b/include/cppuhelper/cppuhelperdllapi.h
index 8489402c4e86..1eff7bedc313 100644
--- a/include/cppuhelper/cppuhelperdllapi.h
+++ b/include/cppuhelper/cppuhelperdllapi.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_CPPUHELPERDLLAPI_H
-#define INCLUDED_CPPUHELPERDLLAPI_H
+#ifndef INCLUDED_CPPUHELPER_CPPUHELPERDLLAPI_H
+#define INCLUDED_CPPUHELPER_CPPUHELPERDLLAPI_H
 
 #include "sal/types.h"
 
@@ -29,6 +29,6 @@
 #endif
 #define CPPUHELPER_DLLPRIVATE SAL_DLLPRIVATE
 
-#endif /* INCLUDED_CPPUHELPERDLLAPI_H */
+#endif // INCLUDED_CPPUHELPER_CPPUHELPERDLLAPI_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/cppuhelper/exc_hlp.hxx b/include/cppuhelper/exc_hlp.hxx
index 9c110ee6c018..0ca1d1f8e086 100644
--- a/include/cppuhelper/exc_hlp.hxx
+++ b/include/cppuhelper/exc_hlp.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CPPUHELPER_EXC_HLP_HXX_
-#define _CPPUHELPER_EXC_HLP_HXX_
+#ifndef INCLUDED_CPPUHELPER_EXC_HLP_HXX
+#define INCLUDED_CPPUHELPER_EXC_HLP_HXX
 
 #include <com/sun/star/uno/Any.hxx>
 #include "cppuhelperdllapi.h"
diff --git a/include/cppuhelper/factory.hxx b/include/cppuhelper/factory.hxx
index 8dfda840d51c..5a20cc7fcba8 100644
--- a/include/cppuhelper/factory.hxx
+++ b/include/cppuhelper/factory.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 _CPPUHELPER_FACTORY_HXX_
-#define _CPPUHELPER_FACTORY_HXX_
+#ifndef INCLUDED_CPPUHELPER_FACTORY_HXX
+#define INCLUDED_CPPUHELPER_FACTORY_HXX
 
 #include <rtl/ustring.hxx>
 #include <uno/dispatcher.h>
diff --git a/include/cppuhelper/implbase.hxx b/include/cppuhelper/implbase.hxx
index 06ac7a8c8d1a..5c1bdf45a159 100644
--- a/include/cppuhelper/implbase.hxx
+++ b/include/cppuhelper/implbase.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 _CPPUHELPER_IMPLBASE_HXX_
-#define _CPPUHELPER_IMPLBASE_HXX_
+#ifndef INCLUDED_CPPUHELPER_IMPLBASE_HXX
+#define INCLUDED_CPPUHELPER_IMPLBASE_HXX
 
 #include <osl/mutex.hxx>
 #include <cppuhelper/weak.hxx>
diff --git a/include/cppuhelper/implbase1.hxx b/include/cppuhelper/implbase1.hxx
index ead86fe6c56a..b0c1b0bd0893 100644
--- a/include/cppuhelper/implbase1.hxx
+++ b/include/cppuhelper/implbase1.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 _CPPUHELPER_IMPLBASE1_HXX_
-#define _CPPUHELPER_IMPLBASE1_HXX_
+#ifndef INCLUDED_CPPUHELPER_IMPLBASE1_HXX
+#define INCLUDED_CPPUHELPER_IMPLBASE1_HXX
 
 #include <cppuhelper/implbase_ex.hxx>
 #include <rtl/instance.hxx>
diff --git a/include/cppuhelper/implbase10.hxx b/include/cppuhelper/implbase10.hxx
index 57fdda5b3ce0..56434e932ba3 100644
--- a/include/cppuhelper/implbase10.hxx
+++ b/include/cppuhelper/implbase10.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 _CPPUHELPER_IMPLBASE10_HXX_
-#define _CPPUHELPER_IMPLBASE10_HXX_
+#ifndef INCLUDED_CPPUHELPER_IMPLBASE10_HXX
+#define INCLUDED_CPPUHELPER_IMPLBASE10_HXX
 
 #include <cppuhelper/implbase_ex.hxx>
 #include <rtl/instance.hxx>
diff --git a/include/cppuhelper/implbase11.hxx b/include/cppuhelper/implbase11.hxx
index bd282e70fdc2..c7ff78a7cd85 100644
--- a/include/cppuhelper/implbase11.hxx
+++ b/include/cppuhelper/implbase11.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 _CPPUHELPER_IMPLBASE11_HXX_
-#define _CPPUHELPER_IMPLBASE11_HXX_
+#ifndef INCLUDED_CPPUHELPER_IMPLBASE11_HXX
+#define INCLUDED_CPPUHELPER_IMPLBASE11_HXX
 
 #include <cppuhelper/implbase_ex.hxx>
 #include <rtl/instance.hxx>
diff --git a/include/cppuhelper/implbase12.hxx b/include/cppuhelper/implbase12.hxx
index a1d4bf17fa07..08d83069f300 100644
--- a/include/cppuhelper/implbase12.hxx
+++ b/include/cppuhelper/implbase12.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 _CPPUHELPER_IMPLBASE12_HXX_
-#define _CPPUHELPER_IMPLBASE12_HXX_
+#ifndef INCLUDED_CPPUHELPER_IMPLBASE12_HXX
+#define INCLUDED_CPPUHELPER_IMPLBASE12_HXX
 
 #include <cppuhelper/implbase_ex.hxx>
 #include <rtl/instance.hxx>
diff --git a/include/cppuhelper/implbase13.hxx b/include/cppuhelper/implbase13.hxx
index b50fb038564c..f8bd60456054 100644
--- a/include/cppuhelper/implbase13.hxx
+++ b/include/cppuhelper/implbase13.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 _CPPUHELPER_IMPLBASE13_HXX_
-#define _CPPUHELPER_IMPLBASE13_HXX_
+#ifndef INCLUDED_CPPUHELPER_IMPLBASE13_HXX
+#define INCLUDED_CPPUHELPER_IMPLBASE13_HXX
 
 #include <cppuhelper/implbase_ex.hxx>
 #include <rtl/instance.hxx>
diff --git a/include/cppuhelper/implbase2.hxx b/include/cppuhelper/implbase2.hxx
index acd9bbe5e211..1a80cacd436e 100644
--- a/include/cppuhelper/implbase2.hxx
+++ b/include/cppuhelper/implbase2.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 _CPPUHELPER_IMPLBASE2_HXX_
-#define _CPPUHELPER_IMPLBASE2_HXX_
+#ifndef INCLUDED_CPPUHELPER_IMPLBASE2_HXX
+#define INCLUDED_CPPUHELPER_IMPLBASE2_HXX
 
 #include <cppuhelper/implbase_ex.hxx>
 #include <rtl/instance.hxx>
diff --git a/include/cppuhelper/implbase3.hxx b/include/cppuhelper/implbase3.hxx
index f887ee470538..0a4ac365d754 100644
--- a/include/cppuhelper/implbase3.hxx
+++ b/include/cppuhelper/implbase3.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 _CPPUHELPER_IMPLBASE3_HXX_
-#define _CPPUHELPER_IMPLBASE3_HXX_
+#ifndef INCLUDED_CPPUHELPER_IMPLBASE3_HXX
+#define INCLUDED_CPPUHELPER_IMPLBASE3_HXX
 
 #include <cppuhelper/implbase_ex.hxx>
 #include <rtl/instance.hxx>
diff --git a/include/cppuhelper/implbase4.hxx b/include/cppuhelper/implbase4.hxx
index 54fd60e0f54f..29c208d189fa 100644
--- a/include/cppuhelper/implbase4.hxx
+++ b/include/cppuhelper/implbase4.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 _CPPUHELPER_IMPLBASE4_HXX_
-#define _CPPUHELPER_IMPLBASE4_HXX_
+#ifndef INCLUDED_CPPUHELPER_IMPLBASE4_HXX
+#define INCLUDED_CPPUHELPER_IMPLBASE4_HXX
 
 #include <cppuhelper/implbase_ex.hxx>
 #include <rtl/instance.hxx>
diff --git a/include/cppuhelper/implbase5.hxx b/include/cppuhelper/implbase5.hxx
index 4a4b3e640426..f2be88d7f611 100644
--- a/include/cppuhelper/implbase5.hxx
+++ b/include/cppuhelper/implbase5.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 _CPPUHELPER_IMPLBASE5_HXX_
-#define _CPPUHELPER_IMPLBASE5_HXX_
+#ifndef INCLUDED_CPPUHELPER_IMPLBASE5_HXX
+#define INCLUDED_CPPUHELPER_IMPLBASE5_HXX
 
 #include <cppuhelper/implbase_ex.hxx>
 #include <rtl/instance.hxx>
diff --git a/include/cppuhelper/implbase6.hxx b/include/cppuhelper/implbase6.hxx
index 090da8d8a862..6bff24ab030f 100644
--- a/include/cppuhelper/implbase6.hxx
+++ b/include/cppuhelper/implbase6.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 _CPPUHELPER_IMPLBASE6_HXX_
-#define _CPPUHELPER_IMPLBASE6_HXX_
+#ifndef INCLUDED_CPPUHELPER_IMPLBASE6_HXX
+#define INCLUDED_CPPUHELPER_IMPLBASE6_HXX
 
 #include <cppuhelper/implbase_ex.hxx>
 #include <rtl/instance.hxx>
diff --git a/include/cppuhelper/implbase7.hxx b/include/cppuhelper/implbase7.hxx
index 62998349b822..8cf78464ce41 100644
--- a/include/cppuhelper/implbase7.hxx
+++ b/include/cppuhelper/implbase7.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 _CPPUHELPER_IMPLBASE7_HXX_
-#define _CPPUHELPER_IMPLBASE7_HXX_
+#ifndef INCLUDED_CPPUHELPER_IMPLBASE7_HXX
+#define INCLUDED_CPPUHELPER_IMPLBASE7_HXX
 
 #include <cppuhelper/implbase_ex.hxx>
 #include <rtl/instance.hxx>
diff --git a/include/cppuhelper/implbase8.hxx b/include/cppuhelper/implbase8.hxx
index 117dba731b9c..d7c417bd62ef 100644
--- a/include/cppuhelper/implbase8.hxx
+++ b/include/cppuhelper/implbase8.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 _CPPUHELPER_IMPLBASE8_HXX_
-#define _CPPUHELPER_IMPLBASE8_HXX_
+#ifndef INCLUDED_CPPUHELPER_IMPLBASE8_HXX
+#define INCLUDED_CPPUHELPER_IMPLBASE8_HXX
 
 #include <cppuhelper/implbase_ex.hxx>
 #include <rtl/instance.hxx>
diff --git a/include/cppuhelper/implbase9.hxx b/include/cppuhelper/implbase9.hxx
index ca4cdba53f3d..f28cfeae421f 100644
--- a/include/cppuhelper/implbase9.hxx
+++ b/include/cppuhelper/implbase9.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 _CPPUHELPER_IMPLBASE9_HXX_
-#define _CPPUHELPER_IMPLBASE9_HXX_
+#ifndef INCLUDED_CPPUHELPER_IMPLBASE9_HXX
+#define INCLUDED_CPPUHELPER_IMPLBASE9_HXX
 
 #include <cppuhelper/implbase_ex.hxx>
 #include <rtl/instance.hxx>
diff --git a/include/cppuhelper/implbase_ex.hxx b/include/cppuhelper/implbase_ex.hxx
index 4eb111de898a..36d379cb6de1 100644
--- a/include/cppuhelper/implbase_ex.hxx
+++ b/include/cppuhelper/implbase_ex.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 _CPPUHELPER_IMPLBASE_EX_HXX_
-#define _CPPUHELPER_IMPLBASE_EX_HXX_
+#ifndef INCLUDED_CPPUHELPER_IMPLBASE_EX_HXX
+#define INCLUDED_CPPUHELPER_IMPLBASE_EX_HXX
 
 #include <cppuhelper/weak.hxx>
 #include <cppuhelper/weakagg.hxx>
diff --git a/include/cppuhelper/implbase_ex_post.hxx b/include/cppuhelper/implbase_ex_post.hxx
index 6d97b760613b..8b5ca048e81e 100644
--- a/include/cppuhelper/implbase_ex_post.hxx
+++ b/include/cppuhelper/implbase_ex_post.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 _CPPUHELPER_IMPLBASE_EX_POST_HXX_
-#define _CPPUHELPER_IMPLBASE_EX_POST_HXX_
+#ifndef INCLUDED_CPPUHELPER_IMPLBASE_EX_POST_HXX
+#define INCLUDED_CPPUHELPER_IMPLBASE_EX_POST_HXX
 
 /// @cond INTERNAL
 
diff --git a/include/cppuhelper/implbase_ex_pre.hxx b/include/cppuhelper/implbase_ex_pre.hxx
index a9eb82df0251..8590f9d2cd90 100644
--- a/include/cppuhelper/implbase_ex_pre.hxx
+++ b/include/cppuhelper/implbase_ex_pre.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 _CPPUHELPER_IMPLBASE_EX_PRE_HXX_
-#define _CPPUHELPER_IMPLBASE_EX_PRE_HXX_
+#ifndef INCLUDED_CPPUHELPER_IMPLBASE_EX_PRE_HXX
+#define INCLUDED_CPPUHELPER_IMPLBASE_EX_PRE_HXX
 
 /// @cond INTERNAL
 
diff --git a/include/cppuhelper/implementationentry.hxx b/include/cppuhelper/implementationentry.hxx
index 298c0dc9e9ba..c99a9b9156c9 100644
--- a/include/cppuhelper/implementationentry.hxx
+++ b/include/cppuhelper/implementationentry.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 _CPPUHELPER_IMPLEMENTATIONENTRY_HXX_
-#define _CPPUHELPER_IMPLEMENTATIONENTRY_HXX_
+#ifndef INCLUDED_CPPUHELPER_IMPLEMENTATIONENTRY_HXX
+#define INCLUDED_CPPUHELPER_IMPLEMENTATIONENTRY_HXX
 
 #include <cppuhelper/factory.hxx>
 #include "cppuhelperdllapi.h"
diff --git a/include/cppuhelper/interfacecontainer.h b/include/cppuhelper/interfacecontainer.h
index 9a1cb4d76376..39e467e0e2dc 100644
--- a/include/cppuhelper/interfacecontainer.h
+++ b/include/cppuhelper/interfacecontainer.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 _CPPUHELPER_INTERFACECONTAINER_H_
-#define _CPPUHELPER_INTERFACECONTAINER_H_
+#ifndef INCLUDED_CPPUHELPER_INTERFACECONTAINER_H
+#define INCLUDED_CPPUHELPER_INTERFACECONTAINER_H
 
 #include <vector>
 #include <osl/mutex.hxx>
diff --git a/include/cppuhelper/interfacecontainer.hxx b/include/cppuhelper/interfacecontainer.hxx
index 292278f7a078..70c457d2b0ce 100644
--- a/include/cppuhelper/interfacecontainer.hxx
+++ b/include/cppuhelper/interfacecontainer.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 _CPPUHELPER_INTERFACECONTAINER_HXX_
-#define _CPPUHELPER_INTERFACECONTAINER_HXX_
+#ifndef INCLUDED_CPPUHELPER_INTERFACECONTAINER_HXX
+#define INCLUDED_CPPUHELPER_INTERFACECONTAINER_HXX
 
 #include <cppuhelper/interfacecontainer.h>
 
diff --git a/include/cppuhelper/propshlp.hxx b/include/cppuhelper/propshlp.hxx
index aa99ebaa6536..4f886d13df5f 100644
--- a/include/cppuhelper/propshlp.hxx
+++ b/include/cppuhelper/propshlp.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CPPUHELPER_PROPSHLP_HXX
-#define _CPPUHELPER_PROPSHLP_HXX
+#ifndef INCLUDED_CPPUHELPER_PROPSHLP_HXX
+#define INCLUDED_CPPUHELPER_PROPSHLP_HXX
 
 #include <rtl/alloc.h>
 
diff --git a/include/cppuhelper/proptypehlp.h b/include/cppuhelper/proptypehlp.h
index 3236ca0363c3..343a9f82bb5d 100644
--- a/include/cppuhelper/proptypehlp.h
+++ b/include/cppuhelper/proptypehlp.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 _CPPUHELPER_PROPTYPEHLP_H
-#define _CPPUHELPER_PROPTYPEHLP_H
+#ifndef INCLUDED_CPPUHELPER_PROPTYPEHLP_H
+#define INCLUDED_CPPUHELPER_PROPTYPEHLP_H
 
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
 #include <com/sun/star/uno/TypeClass.hpp>
diff --git a/include/cppuhelper/proptypehlp.hxx b/include/cppuhelper/proptypehlp.hxx
index 08107f3b91f7..a848964537e2 100644
--- a/include/cppuhelper/proptypehlp.hxx
+++ b/include/cppuhelper/proptypehlp.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 _CPPUHELPER_PROPTYPEHLP_HXX
-#define _CPPUHELPER_PROPTYPEHLP_HXX
+#ifndef INCLUDED_CPPUHELPER_PROPTYPEHLP_HXX
+#define INCLUDED_CPPUHELPER_PROPTYPEHLP_HXX
 
 #include <cppuhelper/proptypehlp.h>
 
diff --git a/include/cppuhelper/queryinterface.hxx b/include/cppuhelper/queryinterface.hxx
index e8f2dfa9dcbf..b01dfa6dd453 100644
--- a/include/cppuhelper/queryinterface.hxx
+++ b/include/cppuhelper/queryinterface.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CPPUHELPER_QUERYINTERFACE_HXX_
-#define _CPPUHELPER_QUERYINTERFACE_HXX_
+#ifndef INCLUDED_CPPUHELPER_QUERYINTERFACE_HXX
+#define INCLUDED_CPPUHELPER_QUERYINTERFACE_HXX
 
 #include "sal/config.h"
 #include "com/sun/star/uno/Any.hxx"
diff --git a/include/cppuhelper/shlib.hxx b/include/cppuhelper/shlib.hxx
index bb6d4ede7dc8..c0abe4779128 100644
--- a/include/cppuhelper/shlib.hxx
+++ b/include/cppuhelper/shlib.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 _CPPUHELPER_SHLIB_HXX_
-#define _CPPUHELPER_SHLIB_HXX_
+#ifndef INCLUDED_CPPUHELPER_SHLIB_HXX
+#define INCLUDED_CPPUHELPER_SHLIB_HXX
 
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/registry/XRegistryKey.hpp>
diff --git a/include/cppuhelper/typeprovider.hxx b/include/cppuhelper/typeprovider.hxx
index 24201c9a8982..79241e52cb31 100644
--- a/include/cppuhelper/typeprovider.hxx
+++ b/include/cppuhelper/typeprovider.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 _CPPUHELPER_TYPEPROVIDER_HXX_
-#define _CPPUHELPER_TYPEPROVIDER_HXX_
+#ifndef INCLUDED_CPPUHELPER_TYPEPROVIDER_HXX
+#define INCLUDED_CPPUHELPER_TYPEPROVIDER_HXX
 
 #include <rtl/alloc.h>
 #include <rtl/uuid.h>
diff --git a/include/cppuhelper/weak.hxx b/include/cppuhelper/weak.hxx
index 80d5ec07c500..1bc1646e85c7 100644
--- a/include/cppuhelper/weak.hxx
+++ b/include/cppuhelper/weak.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 _CPPUHELPER_WEAK_HXX_
-#define _CPPUHELPER_WEAK_HXX_
+#ifndef INCLUDED_CPPUHELPER_WEAK_HXX
+#define INCLUDED_CPPUHELPER_WEAK_HXX
 
 #include <osl/interlck.h>
 #include <rtl/alloc.h>
diff --git a/include/cppuhelper/weakagg.hxx b/include/cppuhelper/weakagg.hxx
index bfe4ba5151d3..397a80e46ac3 100644
--- a/include/cppuhelper/weakagg.hxx
+++ b/include/cppuhelper/weakagg.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 _CPPUHELPER_WEAKAGG_HXX_
-#define _CPPUHELPER_WEAKAGG_HXX_
+#ifndef INCLUDED_CPPUHELPER_WEAKAGG_HXX
+#define INCLUDED_CPPUHELPER_WEAKAGG_HXX
 
 #include <cppuhelper/weak.hxx>
 #include <com/sun/star/uno/XAggregation.hpp>
diff --git a/include/cppuhelper/weakref.hxx b/include/cppuhelper/weakref.hxx
index 0a9530608159..218612acada3 100644
--- a/include/cppuhelper/weakref.hxx
+++ b/include/cppuhelper/weakref.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 _CPPUHELPER_WEAKREF_HXX_
-#define _CPPUHELPER_WEAKREF_HXX_
+#ifndef INCLUDED_CPPUHELPER_WEAKREF_HXX
+#define INCLUDED_CPPUHELPER_WEAKREF_HXX
 
 #include <com/sun/star/uno/XInterface.hpp>
 #include "cppuhelperdllapi.h"