Recheck modules [i-l]* with IWYU

See tdf#42949 for motivation

Change-Id: I758bb27e93779e3df21c463714e49354748f446f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128715
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>

23 files changed, 37 insertions, 50 deletions

diff --git a/l10ntools/IwyuFilter_l10ntools.yaml b/l10ntools/IwyuFilter_l10ntools.yaml
new file mode 100644
index 000000000000..171e54ae6b22
--- /dev/null
+++ b/l10ntools/IwyuFilter_l10ntools.yaml
@@ -0,0 +1,9 @@
+---
+assumeFilename: l10ntools/source/helpmerge.cxx
+excludelist:
+    l10ntools/source/idxdict/idxdict.cxx:
+    # Actually needed
+    - fstream
+    l10ntools/source/xmlparse.cxx:
+    # Actually needed
+    - fstream
diff --git a/l10ntools/inc/cfgmerge.hxx b/l10ntools/inc/cfgmerge.hxx
index 3f4fdb55c947..8c7e90720081 100644
--- a/l10ntools/inc/cfgmerge.hxx
+++ b/l10ntools/inc/cfgmerge.hxx
@@ -27,6 +27,7 @@
 #include <memory>
 #include <vector>
 #include "po.hxx"
+#include "export.hxx"
 
 typedef std::unordered_map<OString, OString> OStringHashMap;
 
diff --git a/l10ntools/inc/common.hxx b/l10ntools/inc/common.hxx
index 78bbbfdb83cc..ec5ed0c19586 100644
--- a/l10ntools/inc/common.hxx
+++ b/l10ntools/inc/common.hxx
@@ -14,7 +14,6 @@
 
 #include <sal/config.h>
 
-#include <iostream>
 #include <string_view>
 
 #include <rtl/string.hxx>
diff --git a/l10ntools/inc/export.hxx b/l10ntools/inc/export.hxx
index 183cecea2531..64091d6cc5b8 100644
--- a/l10ntools/inc/export.hxx
+++ b/l10ntools/inc/export.hxx
@@ -21,27 +21,17 @@
 #define INCLUDED_L10NTOOLS_INC_EXPORT_HXX
 
 #include <sal/config.h>
-#include "po.hxx"
 
-#include <cstddef>
-#include <fstream>
+#include <rtl/string.hxx>
 
-#include <osl/file.hxx>
-#include <osl/file.h>
-
-#include <iterator>
 #include <set>
 #include <unordered_map>
 #include <memory>
 #include <vector>
-#include <queue>
-#include <string>
 #include <string_view>
 
 #ifdef _WIN32
 #include <direct.h>
-#else
-#include <unistd.h>
 #endif
 
 #define NO_TRANSLATE_ISO        "x-no-translate"
diff --git a/l10ntools/inc/helper.hxx b/l10ntools/inc/helper.hxx
index c63f781a5d91..fb0db0fc13f7 100644
--- a/l10ntools/inc/helper.hxx
+++ b/l10ntools/inc/helper.hxx
@@ -16,12 +16,9 @@
 
 #include <string_view>
 
-#include <sal/types.h>
-
-#include <libxml/parser.h>
+#include <libxml/xmlstring.h>
 
 #include <rtl/string.hxx>
-#include <rtl/strbuf.hxx>
 
 
 namespace helper {
diff --git a/l10ntools/inc/helpmerge.hxx b/l10ntools/inc/helpmerge.hxx
index 3f9426b6b4de..9420f2356b2f 100644
--- a/l10ntools/inc/helpmerge.hxx
+++ b/l10ntools/inc/helpmerge.hxx
@@ -24,10 +24,10 @@
 
 #include <string_view>
 
+#include "export.hxx"
 #include "xmlparse.hxx"
-#include <rtl/ustring.hxx>
-#include <rtl/ustrbuf.hxx>
-#include <rtl/strbuf.hxx>
+
+#include <rtl/string.hxx>
 
 /// This Class is responsible for extracting/merging OpenOffice XML Helpfiles
 class HelpParser
diff --git a/l10ntools/inc/lngmerge.hxx b/l10ntools/inc/lngmerge.hxx
index 56eaec71b11d..89f383d92ab7 100644
--- a/l10ntools/inc/lngmerge.hxx
+++ b/l10ntools/inc/lngmerge.hxx
@@ -22,11 +22,10 @@
 
 #include <sal/config.h>
 
-#include <iosfwd>
 #include <vector>
 
-#include "common.hxx"
 #include "export.hxx"
+#include "po.hxx"
 
 #define LNG_OK              0x0000
 #define LNG_COULD_NOT_OPEN  0x0001
diff --git a/l10ntools/inc/treemerge.hxx b/l10ntools/inc/treemerge.hxx
index 63791b4655a9..8e87188d8b69 100644
--- a/l10ntools/inc/treemerge.hxx
+++ b/l10ntools/inc/treemerge.hxx
@@ -12,7 +12,6 @@
 
 #include <libxml/tree.h>
 #include <rtl/string.hxx>
-#include <vector>
 
 /**
   Class for localization of *.tree files
diff --git a/l10ntools/inc/xmlparse.hxx b/l10ntools/inc/xmlparse.hxx
index a9993f460b5c..9a8b1e673213 100644
--- a/l10ntools/inc/xmlparse.hxx
+++ b/l10ntools/inc/xmlparse.hxx
@@ -26,14 +26,10 @@
 #include <memory>
 #include <vector>
 
-#include <signal.h>
-
-#include <libxml/xmlexports.h>
 #include <expat.h>
 
 #include <rtl/string.hxx>
 #include <rtl/strbuf.hxx>
-#include "export.hxx"
 #include <unordered_map>
 
 class XMLParentNode;
diff --git a/l10ntools/inc/xrmmerge.hxx b/l10ntools/inc/xrmmerge.hxx
index 7468f43f6122..4225f44d12b8 100644
--- a/l10ntools/inc/xrmmerge.hxx
+++ b/l10ntools/inc/xrmmerge.hxx
@@ -26,6 +26,11 @@
 #include <fstream>
 #include <string_view>
 
+#include <rtl/string.hxx>
+
+#include "export.hxx"
+#include "po.hxx"
+
 /// Parser for *.xrm and description.xml files
 class XRMResParser
 {
diff --git a/l10ntools/source/cfgmerge.cxx b/l10ntools/source/cfgmerge.cxx
index 3fc24d50d5ca..69fbd3777f85 100644
--- a/l10ntools/source/cfgmerge.cxx
+++ b/l10ntools/source/cfgmerge.cxx
@@ -24,8 +24,7 @@
 
 #include <cstdio>
 #include <cstdlib>
-#include <cstring>
-
+#include <iostream>
 #include <memory>
 #include <rtl/strbuf.hxx>
 
diff --git a/l10ntools/source/common.cxx b/l10ntools/source/common.cxx
index e2d14ac36431..4cc9ba6405a9 100644
--- a/l10ntools/source/common.cxx
+++ b/l10ntools/source/common.cxx
@@ -7,6 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#include <iostream>
+
 #include <common.hxx>
 
 namespace {
diff --git a/l10ntools/source/helper.cxx b/l10ntools/source/helper.cxx
index 767c04eb5152..b8df012dc149 100644
--- a/l10ntools/source/helper.cxx
+++ b/l10ntools/source/helper.cxx
@@ -9,7 +9,10 @@
 
 #include <sal/config.h>
 
+#include <libxml/parser.h>
+
 #include <o3tl/safeint.hxx>
+#include <rtl/strbuf.hxx>
 
 #include <helper.hxx>
 
diff --git a/l10ntools/source/helpex.cxx b/l10ntools/source/helpex.cxx
index c81fce12ca74..e9f744a95bbc 100644
--- a/l10ntools/source/helpex.cxx
+++ b/l10ntools/source/helpex.cxx
@@ -20,7 +20,6 @@
 #include <sal/config.h>
 
 #include <iostream>
-#include <fstream>
 #include <string>
 #include <cstring>
 
diff --git a/l10ntools/source/helpmerge.cxx b/l10ntools/source/helpmerge.cxx
index ed5e1c8777aa..42cdb6ce19ab 100644
--- a/l10ntools/source/helpmerge.cxx
+++ b/l10ntools/source/helpmerge.cxx
@@ -20,21 +20,14 @@
 #include <sal/config.h>
 
 #include <fstream>
-#include <functional>
-#include <memory>
 
-#include <osl/file.hxx>
 #include <sal/log.hxx>
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <helpmerge.hxx>
-#include <algorithm>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <iostream>
 #include <vector>
-#include <rtl/strbuf.hxx>
+
 #ifdef _WIN32
 #if !defined WIN32_LEAN_AND_MEAN
 # define WIN32_LEAN_AND_MEAN
diff --git a/l10ntools/source/lngex.cxx b/l10ntools/source/lngex.cxx
index 7435c063ed1c..2d7c413ad1ed 100644
--- a/l10ntools/source/lngex.cxx
+++ b/l10ntools/source/lngex.cxx
@@ -21,6 +21,8 @@
 
 #include <sal/main.h>
 
+#include <common.hxx>
+
 #include <lngmerge.hxx>
 
 SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
diff --git a/l10ntools/source/lngmerge.cxx b/l10ntools/source/lngmerge.cxx
index 33794a377c2b..530bda4cfc5d 100644
--- a/l10ntools/source/lngmerge.cxx
+++ b/l10ntools/source/lngmerge.cxx
@@ -20,11 +20,11 @@
 #include <sal/config.h>
 
 #include <cstddef>
-#include <fstream>
-#include <iterator>
+#include <iostream>
 #include <memory>
 #include <string>
 
+#include <common.hxx>
 #include <po.hxx>
 #include <lngmerge.hxx>
 
diff --git a/l10ntools/source/localize.cxx b/l10ntools/source/localize.cxx
index a5a1b2c3b3ef..8dc1f26422ac 100644
--- a/l10ntools/source/localize.cxx
+++ b/l10ntools/source/localize.cxx
@@ -20,7 +20,6 @@
 #include <sal/config.h>
 
 #include <cassert>
-#include <cstddef>
 #include <cstdlib>
 #include <iostream>
 #include <string>
diff --git a/l10ntools/source/po.cxx b/l10ntools/source/po.cxx
index dfe013cb9b7c..a29fb4fe98dd 100644
--- a/l10ntools/source/po.cxx
+++ b/l10ntools/source/po.cxx
@@ -8,6 +8,7 @@
  */
 
 #include <rtl/ustring.hxx>
+#include <rtl/strbuf.hxx>
 #include <rtl/crc.h>
 #include <sal/log.hxx>
 
diff --git a/l10ntools/source/propmerge.cxx b/l10ntools/source/propmerge.cxx
index 8c6da8e93b54..2e2cf19e4cc6 100644
--- a/l10ntools/source/propmerge.cxx
+++ b/l10ntools/source/propmerge.cxx
@@ -7,11 +7,12 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#include <rtl/ustring.hxx>
+
 #include <memory>
 #include <cstdlib>
 #include <cassert>
 #include <iostream>
-#include <fstream>
 #include <iomanip>
 #include <string_view>
 
diff --git a/l10ntools/source/treemerge.cxx b/l10ntools/source/treemerge.cxx
index 2920734eea4d..b50311cce6af 100644
--- a/l10ntools/source/treemerge.cxx
+++ b/l10ntools/source/treemerge.cxx
@@ -8,13 +8,11 @@
  */
 
 #include <iostream>
-#include <fstream>
 #include <cassert>
 #include <cstring>
 
 #include <libxml/tree.h>
 #include <libxml/parser.h>
-#include <libxml/xmlmemory.h>
 #include <libxml/xmlstring.h>
 
 #include <export.hxx>
diff --git a/l10ntools/source/xmlparse.cxx b/l10ntools/source/xmlparse.cxx
index 10f52fdcb3d7..7e067f7f039b 100644
--- a/l10ntools/source/xmlparse.cxx
+++ b/l10ntools/source/xmlparse.cxx
@@ -18,19 +18,17 @@
  */
 #include <sal/config.h>
 
-#include <iterator> /* std::iterator*/
-
 #include <cassert>
 #include <stdio.h>
 #include <string_view>
 
 #include <helper.hxx>
-#include <common.hxx>
 #include <xmlparse.hxx>
 #include <fstream>
 #include <iostream>
-#include <osl/thread.hxx>
+#include <osl/file.hxx>
 #include <osl/process.h>
+#include <rtl/ustring.hxx>
 #include <rtl/strbuf.hxx>
 #include <unicode/regex.h>
 
diff --git a/l10ntools/source/xrmmerge.cxx b/l10ntools/source/xrmmerge.cxx
index d1dc5bb4dcd2..b7a7e0042c01 100644
--- a/l10ntools/source/xrmmerge.cxx
+++ b/l10ntools/source/xrmmerge.cxx
@@ -19,8 +19,6 @@
 
 #include <sal/config.h>
 
-#include <cstring>
-
 #include <stdio.h>
 
 #include <common.hxx>
@@ -31,7 +29,6 @@
 #include <tokens.h>
 #include <helper.hxx>
 #include <iostream>
-#include <fstream>
 #include <vector>
 #include <memory>