tdf#42949 Fix IWYU warnings in i18npool/

Found with bin/find-unneeded-includes
Only removal proposals are dealt with here.

Change-Id: Ic331c845f0a8f06c4a8f8f79b6f87e26ca7c3a7d
Reviewed-on: https://gerrit.libreoffice.org/72972
Tested-by: Jenkins
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>

i18npool/IwyuFilter_i18npool.yaml

+---
+assumeFilename: i18npool/source/localedata/localedata.cxx
+blacklist:
+    i18npool/inc/breakiteratorImpl.hxx:
+    # Base class needs complete type
+    - com/sun/star/i18n/XBreakIterator.hpp
+    - com/sun/star/lang/XServiceInfo.hpp
+    i18npool/inc/calendar_gregorian.hxx:
+    # Needed for unique_ptr
+    - unicode/calendar.h
+    i18npool/inc/cclass_unicode.hxx:
+    # Base class needs complete type
+    - com/sun/star/i18n/XCharacterClassification.hpp
+    - com/sun/star/lang/XServiceInfo.hpp
+    i18npool/inc/characterclassificationImpl.hxx:
+    # Base class needs complete type
+    - com/sun/star/i18n/XCharacterClassification.hpp
+    - com/sun/star/lang/XServiceInfo.hpp
+    i18npool/inc/collatorImpl.hxx:
+    # Base class needs complete type
+    - com/sun/star/i18n/XCollator.hpp
+    - com/sun/star/lang/XServiceInfo.hpp
+    i18npool/inc/collator_unicode.hxx:
+    # Base class needs complete type
+    - com/sun/star/i18n/XCollator.hpp
+    - com/sun/star/lang/XServiceInfo.hpp
+    # Needed for unique_ptr
+    - unicode/tblcoll.h
+    i18npool/inc/defaultnumberingprovider.hxx:
+    # Base class needs complete type
+    - com/sun/star/text/XDefaultNumberingProvider.hpp
+    - com/sun/star/text/XNumberingFormatter.hpp
+    - com/sun/star/text/XNumberingTypeInfo.hpp
+    - com/sun/star/lang/XServiceInfo.hpp
+    i18npool/inc/indexentrysupplier.hxx:
+    # Base class needs complete type
+    - com/sun/star/i18n/XExtendedIndexEntrySupplier.hpp
+    - com/sun/star/lang/XServiceInfo.hpp
+    i18npool/inc/indexentrysupplier_common.hxx:
+    # Base class needs complete type
+    - com/sun/star/i18n/XExtendedIndexEntrySupplier.hpp
+    - com/sun/star/lang/XServiceInfo.hpp
+    i18npool/inc/inputsequencechecker.hxx:
+    # Base class needs complete type
+    - com/sun/star/i18n/XExtendedInputSequenceChecker.hpp
+    - com/sun/star/lang/XServiceInfo.hpp
+    i18npool/inc/localedata.hxx:
+    # Base class needs complete type
+    - com/sun/star/i18n/XLocaleData5.hpp
+    - com/sun/star/lang/XServiceInfo.hpp
+    # Don't propose hxx -> h change in URE libs
+    - osl/module.hxx
+    i18npool/inc/numberformatcode.hxx:
+    # Base class needs complete type
+    - com/sun/star/i18n/XNumberFormatCode.hpp
+    - com/sun/star/lang/XServiceInfo.hpp
+    i18npool/inc/ordinalsuffix.hxx:
+    # Base class needs complete type
+    - com/sun/star/i18n/XOrdinalSuffix.hpp
+    - com/sun/star/lang/XServiceInfo.hpp
+    i18npool/inc/textconversion.hxx:
+    # Base class needs complete type
+    - com/sun/star/i18n/XExtendedTextConversion.hpp
+    - com/sun/star/lang/XServiceInfo.hpp
+    i18npool/inc/textToPronounce_zh.hxx:
+    # Don't propose hxx -> h change in URE libs
+    - osl/module.hxx
+    i18npool/inc/transliterationImpl.hxx:
+    # Base class needs complete type
+    - com/sun/star/i18n/XExtendedTransliteration.hpp
+    - com/sun/star/lang/XServiceInfo.hpp
+    i18npool/inc/transliteration_Ignore.hxx:
+    # Needed for variable type
+    - unicode/translit.h
+    i18npool/inc/transliteration_commonclass.hxx:
+    # Base class needs complete type
+    - com/sun/star/i18n/XExtendedTransliteration.hpp
+    - com/sun/star/lang/XServiceInfo.hpp
+    i18npool/inc/unoscripttypedetector.hxx:
+    # Base class needs complete type
+    - com/sun/star/i18n/XScriptTypeDetector.hpp
+    - com/sun/star/lang/XServiceInfo.hpp
+    i18npool/source/search/textsearch.hxx:
+    # Base class needs complete type
+    - com/sun/star/util/XTextSearch2.hpp
+    - com/sun/star/lang/XServiceInfo.hpp
+    i18npool/source/breakiterator/xdictionary.cxx:
+    # Used after #ifdef DICT_JA_ZH_IN_DATAFILE
+    - config_folders.h
+    - osl/file.h
+    - rtl/bootstrap.hxx
+    i18npool/source/collator/collator_unicode.cxx:
+    # Config options are used in #ifdef
+    - config_locales.h

i18npool/inc/breakiteratorImpl.hxx

@@ -19,21 +19,14 @@
 #ifndef INCLUDED_I18NPOOL_INC_BREAKITERATORIMPL_HXX
 #define INCLUDED_I18NPOOL_INC_BREAKITERATORIMPL_HXX
 
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/beans/PropertyValues.hpp>
 #include <com/sun/star/i18n/XBreakIterator.hpp>
-#include <com/sun/star/i18n/WordType.hpp>
-#include <com/sun/star/i18n/BreakType.hpp>
-#include <com/sun/star/i18n/ScriptType.hpp>
-#include <com/sun/star/i18n/CharacterIteratorMode.hpp>
-#include <com/sun/star/i18n/CharType.hpp>
-#include <com/sun/star/i18n/XLocaleData.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
 #include <cppuhelper/implbase.hxx>
 
 #include <vector>
 
+namespace com::sun::star::uno { class XComponentContext; }
+
 namespace i18npool {
 
 

i18npool/inc/breakiterator_th.hxx

@@ -20,7 +20,6 @@
 #define INCLUDED_I18NPOOL_INC_BREAKITERATOR_TH_HXX
 
 #include "breakiterator_unicode.hxx"
-#include "xdictionary.hxx"
 
 namespace i18npool {
 

i18npool/inc/breakiterator_unicode.hxx

@@ -21,10 +21,12 @@
 
 #include "breakiteratorImpl.hxx"
 
-#include <unicode/brkiter.h>
+#include <unicode/utext.h>
 #include <memory>
 #include <unordered_map>
 
+namespace icu_63 { class BreakIterator; }
+
 namespace i18npool {
 
 #define LOAD_CHARACTER_BREAKITERATOR    0

i18npool/inc/calendarImpl.hxx

@@ -20,14 +20,11 @@
 #define INCLUDED_I18NPOOL_INC_CALENDARIMPL_HXX
 
 #include <com/sun/star/i18n/XCalendar4.hpp>
-#include <com/sun/star/i18n/CalendarDisplayCode.hpp>
-#include <com/sun/star/i18n/CalendarFieldIndex.hpp>
-#include <com/sun/star/i18n/CalendarDisplayIndex.hpp>
 #include <cppuhelper/implbase.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
 #include <vector>
 
+namespace com::sun::star::uno { class XComponentContext; }
 
 //  class CalendarImpl
 

i18npool/inc/calendar_gregorian.hxx

@@ -20,13 +20,15 @@
 #define INCLUDED_I18NPOOL_INC_CALENDAR_GREGORIAN_HXX
 
 #include "calendarImpl.hxx"
-#include "nativenumbersupplier.hxx"
+
+#include <com/sun/star/i18n/CalendarFieldIndex.hpp>
 
 #include <unicode/calendar.h>
 #include <rtl/ref.hxx>
 
 #include <memory>
 
+namespace i18npool { class NativeNumberSupplierService; }
 
 //  class Calendar_gregorian
 

i18npool/inc/cclass_unicode.hxx

@@ -19,19 +19,19 @@
 #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>
-#include <com/sun/star/i18n/XLocaleData5.hpp>
 #include <cppuhelper/implbase.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 
-#include "transliteration_body.hxx"
 #include <o3tl/typed_flags_set.hxx>
 #include <memory>
 
 namespace com { namespace sun { namespace star { namespace uno {
     class XComponentContext;
 } } } }
+namespace com::sun::star::i18n { class XNativeNumberSupplier; }
+namespace com::sun::star::i18n { class XLocaleData5; }
+namespace i18npool { class Transliteration_casemapping; }
 
 
 /// Flag values of table.

i18npool/inc/chaptercollator.hxx

@@ -20,7 +20,8 @@
 #define INCLUDED_I18NPOOL_INC_CHAPTERCOLLATOR_HXX
 
 #include "collatorImpl.hxx"
-#include <com/sun/star/i18n/XCharacterClassification.hpp>
+
+namespace com::sun::star::i18n { class XCharacterClassification; }
 
 namespace i18npool {
 

i18npool/inc/characterclassificationImpl.hxx

@@ -23,9 +23,9 @@
 #include <cppuhelper/implbase.hxx>
 #include <vector>
 #include <memory>
-#include <com/sun/star/i18n/KCharacterType.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
+
+namespace com::sun::star::uno { class XComponentContext; }
 
 namespace i18npool {
 

i18npool/inc/collatorImpl.hxx

@@ -20,17 +20,17 @@
 #define INCLUDED_I18NPOOL_INC_COLLATORIMPL_HXX
 
 #include <com/sun/star/uno/Reference.h>
-#include <com/sun/star/i18n/XLocaleData5.hpp>
 #include <com/sun/star/i18n/XCollator.hpp>
 #include <com/sun/star/lang/Locale.hpp>
-#include <cppuhelper/weak.hxx>
 #include <cppuhelper/implbase.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
 
 #include <vector>
 #include <memory>
 
+namespace com::sun::star::i18n { class XLocaleData5; }
+namespace com::sun::star::uno { class XComponentContext; }
+
 namespace i18npool {
 
 //      ----------------------------------------------------

i18npool/inc/defaultnumberingprovider.hxx

@@ -23,14 +23,12 @@
 #include <com/sun/star/text/XNumberingFormatter.hpp>
 #include <com/sun/star/text/XNumberingTypeInfo.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/i18n/XTransliteration.hpp>
-#include <com/sun/star/container/XHierarchicalNameAccess.hpp>
 #include <cppuhelper/implbase.hxx>
 #include <rtl/ref.hxx>
 
-#include "transliterationImpl.hxx"
-
-#include <memory>
+namespace com::sun::star::container { class XHierarchicalNameAccess; }
+namespace com::sun::star::uno { class XComponentContext; }
+namespace i18npool { class TransliterationImpl; }
 
 namespace i18npool {
 

i18npool/inc/indexentrysupplier.hxx

@@ -22,7 +22,8 @@
 #include <com/sun/star/i18n/XExtendedIndexEntrySupplier.hpp>
 #include <cppuhelper/implbase.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
+
+namespace com::sun::star::uno { class XComponentContext; }
 
 namespace i18npool {
 

i18npool/inc/indexentrysupplier_common.hxx

@@ -24,9 +24,9 @@
 #include <cppuhelper/implbase.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <rtl/ref.hxx>
-#include "collatorImpl.hxx"
 
-#include <memory>
+namespace com::sun::star::uno { class XComponentContext; }
+namespace i18npool { class CollatorImpl; }
 
 namespace i18npool {
 

i18npool/inc/inputsequencechecker.hxx

@@ -20,14 +20,14 @@
 #define INCLUDED_I18NPOOL_INC_INPUTSEQUENCECHECKER_HXX
 
 #include <cppuhelper/implbase.hxx>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/i18n/XExtendedInputSequenceChecker.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
 
 #include <vector>
 #include <memory>
 
+namespace com::sun::star::uno { class XComponentContext; }
+
 namespace i18npool {
 
 

i18npool/inc/localedata.hxx

@@ -19,24 +19,15 @@
 #ifndef INCLUDED_I18NPOOL_INC_LOCALEDATA_HXX
 #define INCLUDED_I18NPOOL_INC_LOCALEDATA_HXX
 
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-
 #include <com/sun/star/i18n/XLocaleData5.hpp>
 
 
 #include <cppuhelper/implbase.hxx>
-#include <cppu/macros.hxx>
-#include <com/sun/star/uno/Reference.h>
 
 #include <com/sun/star/uno/Sequence.h>
 #include <com/sun/star/i18n/Calendar.hpp>
-#include <com/sun/star/i18n/FormatElement.hpp>
-#include <com/sun/star/i18n/Currency.hpp>
-#include <com/sun/star/lang/Locale.hpp>
 #include <com/sun/star/i18n/LocaleDataItem2.hpp>
 #include <com/sun/star/i18n/UnicodeScript.hpp>
-#include <com/sun/star/uno/RuntimeException.hpp>
-#include <com/sun/star/uno/XInterface.hpp>
 #include <rtl/ref.hxx>
 #include <rtl/ustring.hxx>
 #include <vector>
@@ -44,15 +35,15 @@
 #include <osl/module.hxx>
 
 
-#include "defaultnumberingprovider.hxx"
-#include <com/sun/star/style/NumberingType.hpp>
-#include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/text/HoriOrientation.hpp>
-
-#include <com/sun/star/uno/Reference.hxx>
-#include <com/sun/star/container/XIndexAccess.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 
+namespace com::sun::star::beans { struct PropertyValue; }
+namespace com::sun::star::container { class XIndexAccess; }
+namespace com::sun::star::i18n { struct Currency; }
+namespace com::sun::star::i18n { struct Currency2; }
+namespace com::sun::star::i18n { struct FormatElement; }
+namespace com::sun::star::lang { struct Locale; }
+
 struct LocaleDataLookupTableItem;
 
 namespace i18npool {

i18npool/inc/nativenumbersupplier.hxx

@@ -20,11 +20,11 @@
 #define INCLUDED_I18NPOOL_INC_NATIVENUMBERSUPPLIER_HXX
 
 #include <com/sun/star/i18n/XNativeNumberSupplier2.hpp>
-#include <com/sun/star/i18n/NativeNumberMode.hpp>
 #include <com/sun/star/i18n/NativeNumberXmlAttributes.hpp>
 #include <cppuhelper/implbase.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/i18n/CharacterClassification.hpp>
+
+namespace com::sun::star::i18n { class XCharacterClassification; }
 
 namespace i18npool {
 

i18npool/inc/numberformatcode.hxx

@@ -20,18 +20,19 @@
 #ifndef INCLUDED_I18NPOOL_INC_NUMBERFORMATCODE_HXX
 #define INCLUDED_I18NPOOL_INC_NUMBERFORMATCODE_HXX
 
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <cppuhelper/implbase.hxx>
 
 #include <com/sun/star/i18n/XNumberFormatCode.hpp>
-#include <com/sun/star/i18n/XLocaleData5.hpp>
 #include <com/sun/star/uno/Sequence.hxx>
-#include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 
 #include <deque>
 #include <utility>
 
+namespace com::sun::star::i18n { class XLocaleData5; }
+namespace com::sun::star::i18n { struct FormatElement; }
+namespace com::sun::star::uno { class XComponentContext; }
+
 class NumberFormatCodeMapper : public cppu::WeakImplHelper
 <
     css::i18n::XNumberFormatCode,

i18npool/inc/ordinalsuffix.hxx

@@ -23,7 +23,8 @@
 #include <com/sun/star/i18n/XOrdinalSuffix.hpp>
 #include <cppuhelper/implbase.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/lang/Locale.hpp>
+
+namespace com::sun::star::lang { struct Locale; }
 
 namespace i18npool {
 

i18npool/inc/textToPronounce_zh.hxx

@@ -20,7 +20,7 @@
 #define INCLUDED_I18NPOOL_INC_TEXTTOPRONOUNCE_ZH_HXX
 
 #include "transliteration_Ignore.hxx"
-#include "indexentrysupplier_asian.hxx"
+#include <osl/module.hxx>
 
 namespace i18npool {
 

i18npool/inc/textconversion.hxx

@@ -19,15 +19,15 @@
 #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>
 #include <com/sun/star/i18n/XExtendedTextConversion.hpp>
-#include <com/sun/star/linguistic2/XConversionDictionary.hpp>
-#include <com/sun/star/linguistic2/XConversionDictionaryList.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
 #include <cppuhelper/implbase.hxx>
 #include <osl/module.h>
 
+namespace com::sun::star::linguistic2 { class XConversionDictionary; }
+namespace com::sun::star::linguistic2 { class XConversionDictionaryList; }
+namespace com::sun::star::uno { class XComponentContext; }
+
 namespace i18npool {
 
 

i18npool/inc/textconversionImpl.hxx

@@ -19,12 +19,12 @@
 #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>
 #include <com/sun/star/i18n/XExtendedTextConversion.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
 #include <cppuhelper/implbase.hxx>
 
+namespace com::sun::star::uno { class XComponentContext; }
+
 namespace i18npool {
 
 

i18npool/inc/transliterationImpl.hxx

@@ -19,13 +19,14 @@
 #ifndef INCLUDED_I18NPOOL_INC_TRANSLITERATIONIMPL_HXX
 #define INCLUDED_I18NPOOL_INC_TRANSLITERATIONIMPL_HXX
 
-#include <com/sun/star/i18n/XLocaleData5.hpp>
 #include <com/sun/star/i18n/XExtendedTransliteration.hpp>
 #include <cppuhelper/implbase.hxx>
-#include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <sal/types.h>
 
+namespace com::sun::star::i18n { class XLocaleData5; }
+namespace com::sun::star::uno { class XComponentContext; }
+
 namespace i18npool {
 
 class TransliterationImpl : public cppu::WeakImplHelper

i18npool/inc/transliteration_Ignore.hxx

@@ -20,9 +20,10 @@
 #define INCLUDED_I18NPOOL_INC_TRANSLITERATION_IGNORE_HXX
 
 #include "transliteration_commonclass.hxx"
-#include <i18nutil/oneToOneMapping.hxx>
 #include <unicode/translit.h>
 
+namespace i18nutil { class oneToOneMapping; }
+
 typedef sal_Unicode (*TransFunc)(const sal_Unicode);
 
 namespace i18npool {

i18npool/inc/transliteration_OneToOne.hxx

@@ -20,7 +20,8 @@
 #define INCLUDED_I18NPOOL_INC_TRANSLITERATION_ONETOONE_HXX
 
 #include "transliteration_commonclass.hxx"
-#include <i18nutil/oneToOneMapping.hxx>
+
+namespace i18nutil { class oneToOneMapping; }
 
 namespace i18npool {
 

i18npool/inc/transliteration_commonclass.hxx

@@ -20,10 +20,8 @@
 #define INCLUDED_I18NPOOL_INC_TRANSLITERATION_COMMONCLASS_HXX
 
 #include <com/sun/star/i18n/XExtendedTransliteration.hpp>
-#include <com/sun/star/i18n/TransliterationType.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <cppuhelper/implbase.hxx>
-#include <rtl/ustrbuf.h>
 #include <rtl/ustring.hxx>
 
 namespace i18npool {

i18npool/inc/xdictionary.hxx

@@ -20,7 +20,6 @@
 #define INCLUDED_I18NPOOL_INC_XDICTIONARY_HXX
 
 #include <sal/types.h>
-#include <osl/module.h>
 
 #include <com/sun/star/i18n/Boundary.hpp>
 

i18npool/qa/cppunit/test_breakiterator.cxx

@@ -7,18 +7,15 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <cppuhelper/bootstrap.hxx>
-#include <cppuhelper/basemutex.hxx>
 #include <com/sun/star/i18n/XBreakIterator.hpp>
 #include <com/sun/star/i18n/CharacterIteratorMode.hpp>
 #include <com/sun/star/i18n/ScriptType.hpp>
 #include <com/sun/star/i18n/WordType.hpp>
 #include <unotest/bootstrapfixturebase.hxx>
 
-#include <unicode/uversion.h>
+#include <unicode/uvernum.h>
 
 #include <rtl/strbuf.hxx>
-#include <rtl/ustrbuf.hxx>
 
 #include <string.h>
 

i18npool/qa/cppunit/test_characterclassification.cxx

@@ -7,16 +7,9 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <cppuhelper/bootstrap.hxx>
-#include <cppuhelper/basemutex.hxx>
 #include <com/sun/star/i18n/XCharacterClassification.hpp>
 #include <unotest/bootstrapfixturebase.hxx>
 
-#include <rtl/strbuf.hxx>
-#include <rtl/ustrbuf.hxx>
-
-#include <string.h>
-
 using namespace ::com::sun::star;
 
 class TestCharacterClassification : public test::BootstrapFixtureBase

i18npool/qa/cppunit/test_textsearch.cxx

@@ -17,21 +17,15 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <cppuhelper/bootstrap.hxx>
-#include <cppuhelper/basemutex.hxx>
 #include <com/sun/star/util/SearchFlags.hpp>
 #include <com/sun/star/util/SearchOptions.hpp>
 #include <com/sun/star/util/SearchAlgorithms2.hpp>
 #include <com/sun/star/util/XTextSearch2.hpp>
-#include <com/sun/star/i18n/Transliteration.hpp>
 #include <unotest/bootstrapfixturebase.hxx>
 #include <i18nutil/transliteration.hxx>
 
 #include <unicode/regex.h>
 
-#include <rtl/strbuf.hxx>
-#include <rtl/ustrbuf.hxx>
-
 using namespace ::com::sun::star;
 using namespace U_ICU_NAMESPACE;
 typedef U_ICU_NAMESPACE::UnicodeString IcuUniString;

i18npool/source/breakiterator/breakiteratorImpl.cxx

@@ -24,6 +24,11 @@
 #include <i18nutil/unicode.hxx>
 #include <rtl/ustrbuf.hxx>
 
+#include <com/sun/star/i18n/CharType.hpp>
+#include <com/sun/star/i18n/ScriptType.hpp>
+#include <com/sun/star/i18n/WordType.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
+
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::i18n;

i18npool/source/breakiterator/breakiterator_cjk.cxx

@@ -19,7 +19,9 @@
 
 #include <breakiterator_cjk.hxx>
 #include <localedata.hxx>
-#include <i18nutil/unicode.hxx>
+
+#include <com/sun/star/i18n/BreakType.hpp>
+#include <com/sun/star/i18n/ScriptType.hpp>
 
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::i18n;

i18npool/source/breakiterator/breakiterator_th.cxx

@@ -23,7 +23,6 @@
 #include <wtt.h>
 
 #include <string.h>
-#include <algorithm>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;

i18npool/source/breakiterator/breakiterator_unicode.cxx

@@ -28,7 +28,10 @@
 #include <unicode/udata.h>
 #include <rtl/strbuf.hxx>
 #include <rtl/ustring.hxx>
-#include <string.h>
+
+#include <com/sun/star/i18n/BreakType.hpp>
+#include <com/sun/star/i18n/CharacterIteratorMode.hpp>
+#include <com/sun/star/i18n/WordType.hpp>
 
 U_CDECL_BEGIN
 extern const char OpenOffice_dat[];

i18npool/source/breakiterator/gendict.cxx

@@ -23,7 +23,6 @@
 #include <errno.h>
 #include <sal/main.h>
 #include <sal/types.h>
-#include <rtl/strbuf.hxx>
 #include <rtl/ustring.hxx>
 #include <osl/diagnose.h>
 #include <vector>

i18npool/source/breakiterator/xdictionary.cxx

@@ -20,9 +20,11 @@
 #include <config_folders.h>
 
 #include <osl/file.h>
+#include <osl/module.h>
 #include <osl/mutex.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <rtl/bootstrap.hxx>
+#include <com/sun/star/i18n/ScriptType.hpp>
 #include <com/sun/star/i18n/WordType.hpp>
 #include <xdictionary.hxx>
 #include <unicode/uchar.h>

i18npool/source/calendar/calendarImpl.cxx

@@ -21,6 +21,8 @@
 #include <localedata.hxx>
 #include <cppuhelper/supportsservice.hxx>
 
+#include <com/sun/star/uno/XComponentContext.hpp>
+
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::i18n;
 using namespace ::com::sun::star::lang;

i18npool/source/calendar/calendar_gregorian.cxx

@@ -21,11 +21,11 @@
 
 #include <calendar_gregorian.hxx>
 #include <localedata.hxx>
-#include <com/sun/star/i18n/AmPmValue.hpp>
-#include <com/sun/star/i18n/Months.hpp>
-#include <com/sun/star/i18n/Weekdays.hpp>
+#include <nativenumbersupplier.hxx>
+#include <com/sun/star/i18n/CalendarDisplayCode.hpp>
+#include <com/sun/star/i18n/CalendarDisplayIndex.hpp>
+#include <com/sun/star/i18n/NativeNumberMode.hpp>
 #include <com/sun/star/i18n/reservedWords.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <cppuhelper/supportsservice.hxx>
 #include <rtl/math.hxx>
 #include <sal/log.hxx>

i18npool/source/calendar/calendar_hijri.cxx

@@ -21,7 +21,6 @@
 
 #include <cmath>
 #include <stdlib.h>
-#include <math.h>
 
 #include <calendar_hijri.hxx>
 

i18npool/source/calendar/calendar_jewish.cxx

@@ -18,10 +18,11 @@
  */
 
 
-#include <math.h>
-#include <stdio.h>
-
 #include <calendar_jewish.hxx>
+#include <nativenumbersupplier.hxx>
+
+#include <com/sun/star/i18n/CalendarDisplayCode.hpp>
+#include <com/sun/star/i18n/NativeNumberMode.hpp>
 
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::i18n;

i18npool/source/characterclassification/cclass_unicode.cxx

@@ -18,14 +18,14 @@
  */
 
 #include <cclass_unicode.hxx>
-#include <com/sun/star/i18n/UnicodeScript.hpp>
-#include <com/sun/star/i18n/UnicodeType.hpp>
 #include <com/sun/star/i18n/KCharacterType.hpp>
+#include <com/sun/star/i18n/WordType.hpp>
 #include <com/sun/star/lang/WrappedTargetRuntimeException.hpp>
 #include <unicode/uchar.h>
 #include <cppuhelper/exc_hlp.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <breakiteratorImpl.hxx>