Resolves fdo#70681: fixincludeguards.pl: all that's left

Change-Id: I3e51a62710bb46c8255fd228d41d9300c90a1fb5
Reviewed-on: https://gerrit.libreoffice.org/9360
Reviewed-by: Thomas Arnhold <thomas@arnhold.org>
Tested-by: Thomas Arnhold <thomas@arnhold.org>

43 files changed, 98 insertions, 98 deletions

diff --git a/i18npool/inc/breakiteratorImpl.hxx b/i18npool/inc/breakiteratorImpl.hxx
index bca243404013..beb857243e7b 100644
--- a/i18npool/inc/breakiteratorImpl.hxx
+++ b/i18npool/inc/breakiteratorImpl.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 _I18N_BREAKITERATOR_HXX_
-#define _I18N_BREAKITERATOR_HXX_
+#ifndef INCLUDED_I18NPOOL_INC_BREAKITERATORIMPL_HXX
+#define INCLUDED_I18NPOOL_INC_BREAKITERATORIMPL_HXX
 
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <comphelper/processfactory.hxx>
@@ -141,6 +141,6 @@ private :
 } // com
 
 
-#endif // _I18N_BREAKITERATOR_HXX_
+#endif // INCLUDED_I18NPOOL_INC_BREAKITERATORIMPL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/i18npool/inc/breakiterator_cjk.hxx b/i18npool/inc/breakiterator_cjk.hxx
index 4a0c93d8ca57..892bd6130e9e 100644
--- a/i18npool/inc/breakiterator_cjk.hxx
+++ b/i18npool/inc/breakiterator_cjk.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 _I18N_BREAKITERATOR_CJK_HXX_
-#define _I18N_BREAKITERATOR_CJK_HXX_
+#ifndef INCLUDED_I18NPOOL_INC_BREAKITERATOR_CJK_HXX
+#define INCLUDED_I18NPOOL_INC_BREAKITERATOR_CJK_HXX
 
 #include <breakiterator_unicode.hxx>
 #include <xdictionary.hxx>
@@ -66,6 +66,6 @@ BREAKITERATOR_CJK( ko )
 
 } } } }
 
-#endif // _I18N_BREAKITERATOR_CJK_HXX_
+#endif // INCLUDED_I18NPOOL_INC_BREAKITERATOR_CJK_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/i18npool/inc/breakiterator_ctl.hxx b/i18npool/inc/breakiterator_ctl.hxx
index 6c9e840757da..d2e90261b2d0 100644
--- a/i18npool/inc/breakiterator_ctl.hxx
+++ b/i18npool/inc/breakiterator_ctl.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 __BREAKITERATOR_CTL_HXX__
-#define __BREAKITERATOR_CTL_HXX__
+#ifndef INCLUDED_I18NPOOL_INC_BREAKITERATOR_CTL_HXX
+#define INCLUDED_I18NPOOL_INC_BREAKITERATOR_CTL_HXX
 
 #include <breakiterator_unicode.hxx>
 #include <xdictionary.hxx>
diff --git a/i18npool/inc/breakiterator_th.hxx b/i18npool/inc/breakiterator_th.hxx
index cee1b52292e6..8de057b82e31 100644
--- a/i18npool/inc/breakiterator_th.hxx
+++ b/i18npool/inc/breakiterator_th.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 _I18N_BREAKITERATOR_TH_HXX_
-#define _I18N_BREAKITERATOR_TH_HXX_
+#ifndef INCLUDED_I18NPOOL_INC_BREAKITERATOR_TH_HXX
+#define INCLUDED_I18NPOOL_INC_BREAKITERATOR_TH_HXX
 #include <breakiterator_ctl.hxx>
 
 namespace com { namespace sun { namespace star { namespace i18n {
@@ -37,6 +37,6 @@ protected:
 
 } } } }
 
-#endif // _I18N_BREAKITERATOR_TH_HXX_
+#endif // INCLUDED_I18NPOOL_INC_BREAKITERATOR_TH_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/i18npool/inc/breakiterator_unicode.hxx b/i18npool/inc/breakiterator_unicode.hxx
index 3f78120e97b2..c72c2d616913 100644
--- a/i18npool/inc/breakiterator_unicode.hxx
+++ b/i18npool/inc/breakiterator_unicode.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 _I18N_BREAKITERATOR_UNICODE_HXX_
-#define _I18N_BREAKITERATOR_UNICODE_HXX_
+#ifndef INCLUDED_I18NPOOL_INC_BREAKITERATOR_UNICODE_HXX
+#define INCLUDED_I18NPOOL_INC_BREAKITERATOR_UNICODE_HXX
 
 #include <breakiteratorImpl.hxx>
 
diff --git a/i18npool/inc/calendarImpl.hxx b/i18npool/inc/calendarImpl.hxx
index 4bbdc5fa62a4..9fd6dc31bdba 100644
--- a/i18npool/inc/calendarImpl.hxx
+++ b/i18npool/inc/calendarImpl.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 _I18N_CALENDARIMPL_HXX_
-#define _I18N_CALENDARIMPL_HXX_
+#ifndef INCLUDED_I18NPOOL_INC_CALENDARIMPL_HXX
+#define INCLUDED_I18NPOOL_INC_CALENDARIMPL_HXX
 
 #include <com/sun/star/i18n/XCalendar3.hpp>
 #include <com/sun/star/i18n/CalendarDisplayCode.hpp>
diff --git a/i18npool/inc/calendar_gregorian.hxx b/i18npool/inc/calendar_gregorian.hxx
index da071da4fffa..43bc4612e423 100644
--- a/i18npool/inc/calendar_gregorian.hxx
+++ b/i18npool/inc/calendar_gregorian.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 _I18N_CALENDAR_GREGORIAN_HXX_
-#define _I18N_CALENDAR_GREGORIAN_HXX_
+#ifndef INCLUDED_I18NPOOL_INC_CALENDAR_GREGORIAN_HXX
+#define INCLUDED_I18NPOOL_INC_CALENDAR_GREGORIAN_HXX
 
 #include "calendarImpl.hxx"
 #include "nativenumbersupplier.hxx"
diff --git a/i18npool/inc/calendar_hijri.hxx b/i18npool/inc/calendar_hijri.hxx
index 80290a58a089..abc727adb04e 100644
--- a/i18npool/inc/calendar_hijri.hxx
+++ b/i18npool/inc/calendar_hijri.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 _I18N_CALENDAR_HIJRI_HXX_
-#define _I18N_CALENDAR_HIJRI_HXX_
+#ifndef INCLUDED_I18NPOOL_INC_CALENDAR_HIJRI_HXX
+#define INCLUDED_I18NPOOL_INC_CALENDAR_HIJRI_HXX
 
 #include "calendar_gregorian.hxx"
 
diff --git a/i18npool/inc/calendar_jewish.hxx b/i18npool/inc/calendar_jewish.hxx
index c03efba8b342..fa350dc8a37e 100644
--- a/i18npool/inc/calendar_jewish.hxx
+++ b/i18npool/inc/calendar_jewish.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 _I18N_CALENDAR_JEWISH_HXX_
-#define _I18N_CALENDAR_JEWISH_HXX_
+#ifndef INCLUDED_I18NPOOL_INC_CALENDAR_JEWISH_HXX
+#define INCLUDED_I18NPOOL_INC_CALENDAR_JEWISH_HXX
 
 #include "calendar_gregorian.hxx"
 
diff --git a/i18npool/inc/cclass_unicode.hxx b/i18npool/inc/cclass_unicode.hxx
index efe8c0730056..1a559173569b 100644
--- a/i18npool/inc/cclass_unicode.hxx
+++ b/i18npool/inc/cclass_unicode.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 _I18N_CCLASS_UNICODE_HXX_
-#define _I18N_CCLASS_UNICODE_HXX_
+#ifndef INCLUDED_I18NPOOL_INC_CCLASS_UNICODE_HXX
+#define INCLUDED_I18NPOOL_INC_CCLASS_UNICODE_HXX
 
 #include <com/sun/star/i18n/XNativeNumberSupplier.hpp>
 #include <com/sun/star/i18n/XCharacterClassification.hpp>
diff --git a/i18npool/inc/chaptercollator.hxx b/i18npool/inc/chaptercollator.hxx
index 96807c497dfa..96286b3433f2 100644
--- a/i18npool/inc/chaptercollator.hxx
+++ b/i18npool/inc/chaptercollator.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 _I18N_CHAPTERCOLLATOR_HXX_
-#define _I18N_CHAPTERCOLLATOR_HXX_
+#ifndef INCLUDED_I18NPOOL_INC_CHAPTERCOLLATOR_HXX
+#define INCLUDED_I18NPOOL_INC_CHAPTERCOLLATOR_HXX
 
 #include <collatorImpl.hxx>
 #include <com/sun/star/i18n/XCharacterClassification.hpp>
diff --git a/i18npool/inc/characterclassificationImpl.hxx b/i18npool/inc/characterclassificationImpl.hxx
index 024453e67041..c7c93dd2d6d7 100644
--- a/i18npool/inc/characterclassificationImpl.hxx
+++ b/i18npool/inc/characterclassificationImpl.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 _I18N_CHARACTERCLASSIFICATIONIMPL_HXX_
-#define _I18N_CHARACTERCLASSIFICATIONIMPL_HXX_
+#ifndef INCLUDED_I18NPOOL_INC_CHARACTERCLASSIFICATIONIMPL_HXX
+#define INCLUDED_I18NPOOL_INC_CHARACTERCLASSIFICATIONIMPL_HXX
 
 #include <com/sun/star/i18n/XCharacterClassification.hpp>
 #include <cppuhelper/implbase2.hxx>
diff --git a/i18npool/inc/collatorImpl.hxx b/i18npool/inc/collatorImpl.hxx
index 8a614873124b..99895914c272 100644
--- a/i18npool/inc/collatorImpl.hxx
+++ b/i18npool/inc/collatorImpl.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 _I18N_COLLATORIMPL_HXX_
-#define _I18N_COLLATORIMPL_HXX_
+#ifndef INCLUDED_I18NPOOL_INC_COLLATORIMPL_HXX
+#define INCLUDED_I18NPOOL_INC_COLLATORIMPL_HXX
 
 #include <comphelper/processfactory.hxx>
 #include <com/sun/star/uno/Reference.h>
diff --git a/i18npool/inc/collator_unicode.hxx b/i18npool/inc/collator_unicode.hxx
index 934b9b7dd728..951de9c7f4c1 100644
--- a/i18npool/inc/collator_unicode.hxx
+++ b/i18npool/inc/collator_unicode.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 _I18N_COLLATOR_UNICODE_HXX_
-#define _I18N_COLLATOR_UNICODE_HXX_
+#ifndef INCLUDED_I18NPOOL_INC_COLLATOR_UNICODE_HXX
+#define INCLUDED_I18NPOOL_INC_COLLATOR_UNICODE_HXX
 
 #include <com/sun/star/uno/Reference.h>
 #include <com/sun/star/i18n/XCollator.hpp>
diff --git a/i18npool/inc/defaultnumberingprovider.hxx b/i18npool/inc/defaultnumberingprovider.hxx
index 42d3c2831bc9..965296eb38f9 100644
--- a/i18npool/inc/defaultnumberingprovider.hxx
+++ b/i18npool/inc/defaultnumberingprovider.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 _I18N_DEFAULT_NUMBERING_PROVIDER_HXX_
-#define _I18N_DEFAULT_NUMBERING_PROVIDER_HXX_
+#ifndef INCLUDED_I18NPOOL_INC_DEFAULTNUMBERINGPROVIDER_HXX
+#define INCLUDED_I18NPOOL_INC_DEFAULTNUMBERINGPROVIDER_HXX
 
 #include <com/sun/star/text/XDefaultNumberingProvider.hpp>
 #include <com/sun/star/text/XNumberingFormatter.hpp>
diff --git a/i18npool/inc/indexentrysupplier.hxx b/i18npool/inc/indexentrysupplier.hxx
index 0c2f667d87a3..d442c39a1d50 100644
--- a/i18npool/inc/indexentrysupplier.hxx
+++ b/i18npool/inc/indexentrysupplier.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 _I18N_INDEXENTRYSUPPLIER_HXX_
-#define _I18N_INDEXENTRYSUPPLIER_HXX_
+#ifndef INCLUDED_I18NPOOL_INC_INDEXENTRYSUPPLIER_HXX
+#define INCLUDED_I18NPOOL_INC_INDEXENTRYSUPPLIER_HXX
 
 #include <com/sun/star/i18n/XExtendedIndexEntrySupplier.hpp>
 #include <cppuhelper/implbase2.hxx>
diff --git a/i18npool/inc/indexentrysupplier_asian.hxx b/i18npool/inc/indexentrysupplier_asian.hxx
index 2f6afd1283e3..7646712383fe 100644
--- a/i18npool/inc/indexentrysupplier_asian.hxx
+++ b/i18npool/inc/indexentrysupplier_asian.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _I18N_INDEXENTRYSUPPLIER_ASIAN_HXX_
-#define _I18N_INDEXENTRYSUPPLIER_ASIAN_HXX_
+#ifndef INCLUDED_I18NPOOL_INC_INDEXENTRYSUPPLIER_ASIAN_HXX
+#define INCLUDED_I18NPOOL_INC_INDEXENTRYSUPPLIER_ASIAN_HXX
 
 #include <indexentrysupplier_common.hxx>
 #include <osl/module.h>
diff --git a/i18npool/inc/indexentrysupplier_common.hxx b/i18npool/inc/indexentrysupplier_common.hxx
index 9e72ef36a8c1..a743f55b6f4c 100644
--- a/i18npool/inc/indexentrysupplier_common.hxx
+++ b/i18npool/inc/indexentrysupplier_common.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _I18N_INDEXENTRYSUPPLIER_COMMON_HXX_
-#define _I18N_INDEXENTRYSUPPLIER_COMMON_HXX_
+#ifndef INCLUDED_I18NPOOL_INC_INDEXENTRYSUPPLIER_COMMON_HXX
+#define INCLUDED_I18NPOOL_INC_INDEXENTRYSUPPLIER_COMMON_HXX
 
 #include <com/sun/star/i18n/XExtendedIndexEntrySupplier.hpp>
 #include <cppuhelper/implbase2.hxx>
diff --git a/i18npool/inc/indexentrysupplier_default.hxx b/i18npool/inc/indexentrysupplier_default.hxx
index bae7c492443c..bc24e1dc8ab5 100644
--- a/i18npool/inc/indexentrysupplier_default.hxx
+++ b/i18npool/inc/indexentrysupplier_default.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 _I18N_INDEXENTRYSUPPLIER_DEFAULT_HXX_
-#define _I18N_INDEXENTRYSUPPLIER_DEFAULT_HXX_
+#ifndef INCLUDED_I18NPOOL_INC_INDEXENTRYSUPPLIER_DEFAULT_HXX
+#define INCLUDED_I18NPOOL_INC_INDEXENTRYSUPPLIER_DEFAULT_HXX
 
 #include <indexentrysupplier_common.hxx>
 
diff --git a/i18npool/inc/indexentrysupplier_ja_phonetic.hxx b/i18npool/inc/indexentrysupplier_ja_phonetic.hxx
index c91f483604df..ac94b40bffce 100644
--- a/i18npool/inc/indexentrysupplier_ja_phonetic.hxx
+++ b/i18npool/inc/indexentrysupplier_ja_phonetic.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _I18N_INDEXENTRYSUPPLIER_JA_PHONETIC_HXX_
-#define _I18N_INDEXENTRYSUPPLIER_JA_PHONETIC_HXX_
+#ifndef INCLUDED_I18NPOOL_INC_INDEXENTRYSUPPLIER_JA_PHONETIC_HXX
+#define INCLUDED_I18NPOOL_INC_INDEXENTRYSUPPLIER_JA_PHONETIC_HXX
 
 #include <indexentrysupplier_common.hxx>
 
diff --git a/i18npool/inc/inputsequencechecker.hxx b/i18npool/inc/inputsequencechecker.hxx
index 8fe3601cdbd5..9114c0ee1a4b 100644
--- a/i18npool/inc/inputsequencechecker.hxx
+++ b/i18npool/inc/inputsequencechecker.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 _I18N_INPUTCHECKER_HXX_
-#define _I18N_INPUTCHECKER_HXX_
+#ifndef INCLUDED_I18NPOOL_INC_INPUTSEQUENCECHECKER_HXX
+#define INCLUDED_I18NPOOL_INC_INPUTSEQUENCECHECKER_HXX
 
 #include <comphelper/processfactory.hxx>
 #include <cppuhelper/implbase2.hxx>
@@ -77,6 +77,6 @@ private :
 
 } } } }
 
-#endif // _I18N_BREAKITERATOR_HXX_
+#endif // INCLUDED_I18NPOOL_INC_INPUTSEQUENCECHECKER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/i18npool/inc/inputsequencechecker_hi.hxx b/i18npool/inc/inputsequencechecker_hi.hxx
index 0b854f0caf81..e6f1a91ddca6 100644
--- a/i18npool/inc/inputsequencechecker_hi.hxx
+++ b/i18npool/inc/inputsequencechecker_hi.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 _I18N_INPUTSEQUENCECHECKER_HI_HXX_
-#define _I18N_INPUTSEQUENCECHECKER_HI_HXX_
+#ifndef INCLUDED_I18NPOOL_INC_INPUTSEQUENCECHECKER_HI_HXX
+#define INCLUDED_I18NPOOL_INC_INPUTSEQUENCECHECKER_HI_HXX
 
 #include <inputsequencechecker.hxx>
 
diff --git a/i18npool/inc/inputsequencechecker_th.hxx b/i18npool/inc/inputsequencechecker_th.hxx
index ec03fe315538..89c99e8cd70e 100644
--- a/i18npool/inc/inputsequencechecker_th.hxx
+++ b/i18npool/inc/inputsequencechecker_th.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 _I18N_INPUTSEQUENCECHECKER_TH_HXX_
-#define _I18N_INPUTSEQUENCECHECKER_TH_HXX_
+#ifndef INCLUDED_I18NPOOL_INC_INPUTSEQUENCECHECKER_TH_HXX
+#define INCLUDED_I18NPOOL_INC_INPUTSEQUENCECHECKER_TH_HXX
 
 #include <inputsequencechecker.hxx>
 
@@ -41,6 +41,6 @@ public:
 
 } } } }
 
-#endif // _I18N_BREAKITERATOR_HXX_
+#endif // INCLUDED_I18NPOOL_INC_INPUTSEQUENCECHECKER_TH_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/i18npool/inc/localedata.hxx b/i18npool/inc/localedata.hxx
index 1c08c385f2cd..8b848221bf65 100644
--- a/i18npool/inc/localedata.hxx
+++ b/i18npool/inc/localedata.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 _I18N_LOCALEDATA_HXX_
-#define _I18N_LOCALEDATA_HXX_
+#ifndef INCLUDED_I18NPOOL_INC_LOCALEDATA_HXX
+#define INCLUDED_I18NPOOL_INC_LOCALEDATA_HXX
 
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 
@@ -152,6 +152,6 @@ private :
 
 } } } }
 
-#endif // _I18N_LOCALEDATA_HXX_
+#endif // INCLUDED_I18NPOOL_INC_LOCALEDATA_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/i18npool/inc/nativenumbersupplier.hxx b/i18npool/inc/nativenumbersupplier.hxx
index c5848f075609..750b5095fff5 100644
--- a/i18npool/inc/nativenumbersupplier.hxx
+++ b/i18npool/inc/nativenumbersupplier.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 _I18N_NATIVENUMBERSUPPLIER_HXX_
-#define _I18N_NATIVENUMBERSUPPLIER_HXX_
+#ifndef INCLUDED_I18NPOOL_INC_NATIVENUMBERSUPPLIER_HXX
+#define INCLUDED_I18NPOOL_INC_NATIVENUMBERSUPPLIER_HXX
 
 #include <com/sun/star/i18n/XNativeNumberSupplier.hpp>
 #include <com/sun/star/i18n/NativeNumberMode.hpp>
diff --git a/i18npool/inc/numberformatcode.hxx b/i18npool/inc/numberformatcode.hxx
index c4461db877d1..65bb0056fe7f 100644
--- a/i18npool/inc/numberformatcode.hxx
+++ b/i18npool/inc/numberformatcode.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _I18N_NUMBERFORMATCODE_HXX_
-#define _I18N_NUMBERFORMATCODE_HXX_
+#ifndef INCLUDED_I18NPOOL_INC_NUMBERFORMATCODE_HXX
+#define INCLUDED_I18NPOOL_INC_NUMBERFORMATCODE_HXX
 
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <comphelper/processfactory.hxx>
@@ -70,6 +70,6 @@ private:
 };
 
 
-#endif // _I18N_NUMBERFORMATCODE_HXX_
+#endif // INCLUDED_I18NPOOL_INC_NUMBERFORMATCODE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/i18npool/inc/servicename.hxx b/i18npool/inc/servicename.hxx
index 7a8d0d11418e..1a5f14a8fe06 100644
--- a/i18npool/inc/servicename.hxx
+++ b/i18npool/inc/servicename.hxx
@@ -54,8 +54,8 @@ Implementation Name
 */
 
 
-#ifndef _I18N_SERVICENAME_HXX_
-#define _I18N_SERVICENAME_HXX_
+#ifndef INCLUDED_I18NPOOL_INC_SERVICENAME_HXX
+#define INCLUDED_I18NPOOL_INC_SERVICENAME_HXX
 
 #define TRLT_SERVICELNAME "com.sun.star.i18n.Transliteration"
 #define TRLT_SERVICELNAME_PREFIX TRLT_SERVICELNAME "."
diff --git a/i18npool/inc/textToPronounce_zh.hxx b/i18npool/inc/textToPronounce_zh.hxx
index 0addc1b006e4..73c7581c10c0 100644
--- a/i18npool/inc/textToPronounce_zh.hxx
+++ b/i18npool/inc/textToPronounce_zh.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 _I18N_TRANSLITERATION_TEXTTOPRONOUNCE_ZH_HXX_
-#define _I18N_TRANSLITERATION_TEXTTOPRONOUNCE_ZH_HXX_
+#ifndef INCLUDED_I18NPOOL_INC_TEXTTOPRONOUNCE_ZH_HXX
+#define INCLUDED_I18NPOOL_INC_TEXTTOPRONOUNCE_ZH_HXX
 
 #include <transliteration_Ignore.hxx>
 #include <indexentrysupplier_asian.hxx>
diff --git a/i18npool/inc/textconversion.hxx b/i18npool/inc/textconversion.hxx
index 7c4d1945a718..d068c0e8d66e 100644
--- a/i18npool/inc/textconversion.hxx
+++ b/i18npool/inc/textconversion.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 _I18N_TEXTCONVERSION_KO_HXX_
-#define _I18N_TEXTCONVERSION_KO_HXX_
+#ifndef INCLUDED_I18NPOOL_INC_TEXTCONVERSION_HXX
+#define INCLUDED_I18NPOOL_INC_TEXTCONVERSION_HXX
 
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
diff --git a/i18npool/inc/textconversionImpl.hxx b/i18npool/inc/textconversionImpl.hxx
index ed81c0e53772..1320f38b0c8e 100644
--- a/i18npool/inc/textconversionImpl.hxx
+++ b/i18npool/inc/textconversionImpl.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 _I18N_TEXTCONERSION_HXX_
-#define _I18N_TEXTCONERSION_HXX_
+#ifndef INCLUDED_I18NPOOL_INC_TEXTCONVERSIONIMPL_HXX
+#define INCLUDED_I18NPOOL_INC_TEXTCONVERSIONIMPL_HXX
 
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
diff --git a/i18npool/inc/transliterationImpl.hxx b/i18npool/inc/transliterationImpl.hxx
index a12061647a37..a1d34a0ce6e6 100644
--- a/i18npool/inc/transliterationImpl.hxx
+++ b/i18npool/inc/transliterationImpl.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 _I18N_TRANSLITERATIONIMPL_HXX_
-#define _I18N_TRANSLITERATIONIMPL_HXX_
+#ifndef INCLUDED_I18NPOOL_INC_TRANSLITERATIONIMPL_HXX
+#define INCLUDED_I18NPOOL_INC_TRANSLITERATIONIMPL_HXX
 
 #include <com/sun/star/i18n/XLocaleData4.hpp>
 #include <com/sun/star/i18n/XExtendedTransliteration.hpp>
diff --git a/i18npool/inc/transliteration_Ignore.hxx b/i18npool/inc/transliteration_Ignore.hxx
index f57e1da04ffd..da3ed51a08fa 100644
--- a/i18npool/inc/transliteration_Ignore.hxx
+++ b/i18npool/inc/transliteration_Ignore.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 _I18N_TRANSLITERATION_TRANSLITERATION_IGNORE_H_
-#define _I18N_TRANSLITERATION_TRANSLITERATION_IGNORE_H_
+#ifndef INCLUDED_I18NPOOL_INC_TRANSLITERATION_IGNORE_HXX
+#define INCLUDED_I18NPOOL_INC_TRANSLITERATION_IGNORE_HXX
 
 #include <transliteration_commonclass.hxx>
 #include <i18nutil/oneToOneMapping.hxx>
@@ -146,6 +146,6 @@ TRANSLITERATION_IGNORE(Size_ja_JP)
 
 } } } }
 
-#endif // _I18N_TRANSLITERATION_TRANSLITERATION_IGNORE_H_
+#endif // INCLUDED_I18NPOOL_INC_TRANSLITERATION_IGNORE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/i18npool/inc/transliteration_Numeric.hxx b/i18npool/inc/transliteration_Numeric.hxx
index fa6d92c5a2a8..c854c14cdaf1 100644
--- a/i18npool/inc/transliteration_Numeric.hxx
+++ b/i18npool/inc/transliteration_Numeric.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 _I18N_TRANSLITERATION_TRANSLITERATION_NUMERIC_H_
-#define _I18N_TRANSLITERATION_TRANSLITERATION_NUMERIC_H_
+#ifndef INCLUDED_I18NPOOL_INC_TRANSLITERATION_NUMERIC_HXX
+#define INCLUDED_I18NPOOL_INC_TRANSLITERATION_NUMERIC_HXX
 
 #include <transliteration_commonclass.hxx>
 
@@ -62,6 +62,6 @@ private:
 
 } } } }
 
-#endif // _I18N_TRANSLITERATION_TRANSLITERATION_NUMERIC_H_
+#endif // INCLUDED_I18NPOOL_INC_TRANSLITERATION_NUMERIC_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/i18npool/inc/transliteration_OneToOne.hxx b/i18npool/inc/transliteration_OneToOne.hxx
index db6b116407bc..afd31b39f0d4 100644
--- a/i18npool/inc/transliteration_OneToOne.hxx
+++ b/i18npool/inc/transliteration_OneToOne.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 _I18N_TRANSLITERATION_TRANSLITERATION_ONETOONE_H_
-#define _I18N_TRANSLITERATION_TRANSLITERATION_ONETOONE_H_
+#ifndef INCLUDED_I18NPOOL_INC_TRANSLITERATION_ONETOONE_HXX
+#define INCLUDED_I18NPOOL_INC_TRANSLITERATION_ONETOONE_HXX
 
 #include <transliteration_commonclass.hxx>
 #include <i18nutil/oneToOneMapping.hxx>
@@ -98,6 +98,6 @@ TRANSLITERATION_ONETOONE(smallToLarge_ja_JP)
 
 } } } }
 
-#endif // _I18N_TRANSLITERATION_TRANSLITERATION_ONETOONE_H_
+#endif // INCLUDED_I18NPOOL_INC_TRANSLITERATION_ONETOONE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/i18npool/inc/transliteration_body.hxx b/i18npool/inc/transliteration_body.hxx
index 4f4b2183a570..ee976eaf4000 100644
--- a/i18npool/inc/transliteration_body.hxx
+++ b/i18npool/inc/transliteration_body.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 TRANSLITERATION_BODY_H
-#define TRANSLITERATION_BODY_H
+#ifndef INCLUDED_I18NPOOL_INC_TRANSLITERATION_BODY_HXX
+#define INCLUDED_I18NPOOL_INC_TRANSLITERATION_BODY_HXX
 
 #include <transliteration_commonclass.hxx>
 #include <i18nutil/casefolding.hxx>
diff --git a/i18npool/inc/transliteration_caseignore.hxx b/i18npool/inc/transliteration_caseignore.hxx
index 55596b606568..2949cabc2184 100644
--- a/i18npool/inc/transliteration_caseignore.hxx
+++ b/i18npool/inc/transliteration_caseignore.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 TRANSLITERATION_CASE_IGNORE_H
-#define TRANSLITERATION_CASE_IGNORE_H
+#ifndef INCLUDED_I18NPOOL_INC_TRANSLITERATION_CASEIGNORE_HXX
+#define INCLUDED_I18NPOOL_INC_TRANSLITERATION_CASEIGNORE_HXX
 
 #define TRANSLITERATION_UPPER_LOWER
 #include "transliteration_body.hxx"
diff --git a/i18npool/inc/transliteration_commonclass.hxx b/i18npool/inc/transliteration_commonclass.hxx
index c27571f5215b..d9580b236d28 100644
--- a/i18npool/inc/transliteration_commonclass.hxx
+++ b/i18npool/inc/transliteration_commonclass.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 _I18N_TRANSLITERATION_TRANSLITERATION_COMMONCLASS_H_
-#define _I18N_TRANSLITERATION_TRANSLITERATION_COMMONCLASS_H_
+#ifndef INCLUDED_I18NPOOL_INC_TRANSLITERATION_COMMONCLASS_HXX
+#define INCLUDED_I18NPOOL_INC_TRANSLITERATION_COMMONCLASS_HXX
 
 #include <com/sun/star/i18n/XExtendedTransliteration.hpp>
 #include <com/sun/star/i18n/TransliterationType.hpp>
@@ -114,6 +114,6 @@ protected:
 
 } } } }
 
-#endif // _I18N_TRANSLITERATION_TRANSLITERATION_COMMONCLASS_H_
+#endif // INCLUDED_I18NPOOL_INC_TRANSLITERATION_COMMONCLASS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/i18npool/inc/unoscripttypedetector.hxx b/i18npool/inc/unoscripttypedetector.hxx
index d6ab941eee92..d10a17de87c8 100644
--- a/i18npool/inc/unoscripttypedetector.hxx
+++ b/i18npool/inc/unoscripttypedetector.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 _I18N_UNOSCRIPTTYPEDETECTOR_HXX_
-#define _I18N_UNOSCRIPTTYPEDETECTOR_HXX_
+#ifndef INCLUDED_I18NPOOL_INC_UNOSCRIPTTYPEDETECTOR_HXX
+#define INCLUDED_I18NPOOL_INC_UNOSCRIPTTYPEDETECTOR_HXX
 
 #include <com/sun/star/lang/XServiceInfo.hpp>
 
diff --git a/i18npool/inc/wtt.h b/i18npool/inc/wtt.h
index 857751ccc852..d09c3d03a5e9 100644
--- a/i18npool/inc/wtt.h
+++ b/i18npool/inc/wtt.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 _I18N_WTT_H_
-#define _I18N_WTT_H_
+#ifndef INCLUDED_I18NPOOL_INC_WTT_H
+#define INCLUDED_I18NPOOL_INC_WTT_H
 
 namespace com { namespace sun { namespace star { namespace i18n {
 
@@ -63,6 +63,6 @@ static const sal_uInt16 thaiCT[128] = {     // Thai character type
 
 } } } }
 
-#endif // _I18N_WTT_H_
+#endif // INCLUDED_I18NPOOL_INC_WTT_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/i18npool/inc/xdictionary.hxx b/i18npool/inc/xdictionary.hxx
index 2b1ece0d2447..57f5238ac853 100644
--- a/i18npool/inc/xdictionary.hxx
+++ b/i18npool/inc/xdictionary.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 _XDICTIONARY_H_
-#define _XDICTIONARY_H_
+#ifndef INCLUDED_I18NPOOL_INC_XDICTIONARY_HXX
+#define INCLUDED_I18NPOOL_INC_XDICTIONARY_HXX
 
 #include <sal/types.h>
 #include <osl/module.h>
diff --git a/i18npool/source/localedata/LocaleNode.hxx b/i18npool/source/localedata/LocaleNode.hxx
index 89e85bc39431..2c48206b070e 100644
--- a/i18npool/source/localedata/LocaleNode.hxx
+++ b/i18npool/source/localedata/LocaleNode.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 _LOCALE_NODE_
-#define _LOCALE_NODE_
+#ifndef INCLUDED_I18NPOOL_SOURCE_LOCALEDATA_LOCALENODE_HXX
+#define INCLUDED_I18NPOOL_SOURCE_LOCALEDATA_LOCALENODE_HXX
 #include <com/sun/star/xml/sax/XParser.hpp>
 #include <com/sun/star/xml/sax/XExtendedDocumentHandler.hpp>
 
diff --git a/i18npool/source/search/levdis.hxx b/i18npool/source/search/levdis.hxx
index a9f7407d0bde..7a477ea17550 100644
--- a/i18npool/source/search/levdis.hxx
+++ b/i18npool/source/search/levdis.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_I18NPOOL_LEVDIS_HXX
-#define INCLUDED_I18NPOOL_LEVDIS_HXX
+#ifndef INCLUDED_I18NPOOL_SOURCE_SEARCH_LEVDIS_HXX
+#define INCLUDED_I18NPOOL_SOURCE_SEARCH_LEVDIS_HXX
 
 #include <rtl/ustring.hxx>
 
diff --git a/i18npool/source/search/textsearch.hxx b/i18npool/source/search/textsearch.hxx
index 39338e767aa6..760052a54e13 100644
--- a/i18npool/source/search/textsearch.hxx
+++ b/i18npool/source/search/textsearch.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_I18NPOOL_TEXTSEARCH_HXX
-#define INCLUDED_I18NPOOL_TEXTSEARCH_HXX
+#ifndef INCLUDED_I18NPOOL_SOURCE_SEARCH_TEXTSEARCH_HXX
+#define INCLUDED_I18NPOOL_SOURCE_SEARCH_TEXTSEARCH_HXX
 
 #include <cppuhelper/implbase2.hxx>
 #include <com/sun/star/util/XTextSearch.hpp>