Recheck modules d* with IWYU

See tdf#42949 for motivation

Change-Id: I916f42c46efa1b6cfd7744a189b79659b2867431
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128196
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>

27 files changed, 15 insertions, 21 deletions

diff --git a/desktop/inc/dp_misc.h b/desktop/inc/dp_misc.h
index 4a5c27933b7c..f4c222a943a7 100644
--- a/desktop/inc/dp_misc.h
+++ b/desktop/inc/dp_misc.h
@@ -23,7 +23,6 @@
 
 #include <string_view>
 
-#include <osl/mutex.hxx>
 #include <osl/process.h>
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/lang/XComponent.hpp>
diff --git a/desktop/inc/strings.hxx b/desktop/inc/strings.hxx
index 9254983a9f17..9b086b52693e 100644
--- a/desktop/inc/strings.hxx
+++ b/desktop/inc/strings.hxx
@@ -9,6 +9,8 @@
 
 #pragma once
 
+#include <rtl/ustring.hxx>
+
 inline constexpr OUStringLiteral RID_APPTITLE = u"%PRODUCTNAME %PRODUCTVERSION%PRODUCTEXTENSION";
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx b/desktop/qa/desktop_lib/test_desktop_lib.cxx
index 3f3d59b8673d..689a406e4a07 100644
--- a/desktop/qa/desktop_lib/test_desktop_lib.cxx
+++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx
@@ -39,7 +39,6 @@
 #include <comphelper/dispatchcommand.hxx>
 #include <comphelper/propertysequence.hxx>
 #include <osl/conditn.hxx>
-#include <osl/thread.hxx>
 #include <svl/srchitem.hxx>
 #include <LibreOfficeKit/LibreOfficeKitEnums.h>
 #include <unotools/tempfile.hxx>
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index be4360ed560d..f936680f7eea 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -46,8 +46,6 @@
 #include <framework/desktop.hxx>
 #include <i18nlangtag/languagetag.hxx>
 #include <o3tl/char16_t2wchar_t.hxx>
-#include <svl/languageoptions.hxx>
-#include <svl/cjkoptions.hxx>
 #include <svl/ctloptions.hxx>
 #include <svtools/javacontext.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/desktop/source/app/dispatchwatcher.cxx b/desktop/source/app/dispatchwatcher.cxx
index a0b7e370b1b1..3d24a158261e 100644
--- a/desktop/source/app/dispatchwatcher.cxx
+++ b/desktop/source/app/dispatchwatcher.cxx
@@ -30,7 +30,6 @@
 #include "officeipcthread.hxx"
 #include <rtl/ustring.hxx>
 #include <comphelper/processfactory.hxx>
-#include <comphelper/string.hxx>
 #include <comphelper/synchronousdispatch.hxx>
 #include <com/sun/star/io/IOException.hpp>
 #include <com/sun/star/util/XCloseable.hpp>
diff --git a/desktop/source/deployment/dp_log.cxx b/desktop/source/deployment/dp_log.cxx
index 64c10183b58b..9cdf8d071a99 100644
--- a/desktop/source/deployment/dp_log.cxx
+++ b/desktop/source/deployment/dp_log.cxx
@@ -18,7 +18,6 @@
  */
 
 
-#include <dp_misc.h>
 #include <cppuhelper/basemutex.hxx>
 #include <cppuhelper/compbase.hxx>
 #include <cppuhelper/supportsservice.hxx>
diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
index b13697a75c30..26820c5ea97f 100644
--- a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
@@ -26,7 +26,6 @@
 
 #include <optional>
 #include <com/sun/star/beans/NamedValue.hpp>
-#include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/configuration/theDefaultProvider.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
diff --git a/desktop/source/deployment/manager/dp_activepackages.hxx b/desktop/source/deployment/manager/dp_activepackages.hxx
index 114a11fbff54..fae938019c27 100644
--- a/desktop/source/deployment/manager/dp_activepackages.hxx
+++ b/desktop/source/deployment/manager/dp_activepackages.hxx
@@ -22,6 +22,7 @@
 #include <config_extensions.h>
 
 #include <sal/config.h>
+#include <rtl/ustring.hxx>
 
 #include <utility>
 #include <vector>
diff --git a/desktop/source/deployment/manager/dp_extensionmanager.cxx b/desktop/source/deployment/manager/dp_extensionmanager.cxx
index f9a878e8f1cb..3466a818b870 100644
--- a/desktop/source/deployment/manager/dp_extensionmanager.cxx
+++ b/desktop/source/deployment/manager/dp_extensionmanager.cxx
@@ -44,6 +44,7 @@
 #include <xmlscript/xml_helper.hxx>
 #include <osl/diagnose.h>
 #include <dp_interact.h>
+#include <dp_misc.h>
 #include <dp_ucb.h>
 #include <dp_identifier.hxx>
 #include <dp_descriptioninfoset.hxx>
diff --git a/desktop/source/deployment/manager/dp_extensionmanager.hxx b/desktop/source/deployment/manager/dp_extensionmanager.hxx
index 348b0cc4e68f..0e08314c36f6 100644
--- a/desktop/source/deployment/manager/dp_extensionmanager.hxx
+++ b/desktop/source/deployment/manager/dp_extensionmanager.hxx
@@ -20,7 +20,6 @@
 #pragma once
 
 #include <strings.hrc>
-#include <dp_misc.h>
 #include <dp_shared.hxx>
 #include <cppuhelper/basemutex.hxx>
 #include <cppuhelper/compbase.hxx>
@@ -28,6 +27,7 @@
 #include <com/sun/star/deployment/XPackageManager.hpp>
 #include <com/sun/star/deployment/XPackageManagerFactory.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
 #include <osl/mutex.hxx>
 #include <vector>
 #include <unordered_map>
diff --git a/desktop/source/deployment/manager/dp_manager.cxx b/desktop/source/deployment/manager/dp_manager.cxx
index 54ac26282750..2f0cecc470fa 100644
--- a/desktop/source/deployment/manager/dp_manager.cxx
+++ b/desktop/source/deployment/manager/dp_manager.cxx
@@ -20,6 +20,7 @@
 #include <config_features.h>
 
 #include <dp_interact.h>
+#include <dp_misc.h>
 #include <dp_registry.hxx>
 #include <dp_shared.hxx>
 #include <strings.hrc>
diff --git a/desktop/source/deployment/manager/dp_manager.h b/desktop/source/deployment/manager/dp_manager.h
index fbcc2d594861..56a48420e355 100644
--- a/desktop/source/deployment/manager/dp_manager.h
+++ b/desktop/source/deployment/manager/dp_manager.h
@@ -19,7 +19,6 @@
 
 #pragma once
 
-#include <dp_misc.h>
 #include "dp_activepackages.hxx"
 #include <cppuhelper/basemutex.hxx>
 #include <cppuhelper/compbase.hxx>
diff --git a/desktop/source/deployment/manager/dp_managerfac.cxx b/desktop/source/deployment/manager/dp_managerfac.cxx
index cd96699caec1..79e0ea3588db 100644
--- a/desktop/source/deployment/manager/dp_managerfac.cxx
+++ b/desktop/source/deployment/manager/dp_managerfac.cxx
@@ -19,6 +19,7 @@
 
 
 #include "dp_manager.h"
+#include <dp_misc.h>
 #include <cppuhelper/compbase.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <com/sun/star/deployment/XPackageManagerFactory.hpp>
diff --git a/desktop/source/deployment/manager/dp_properties.cxx b/desktop/source/deployment/manager/dp_properties.cxx
index 7d5e0edda975..b0d2245e8fde 100644
--- a/desktop/source/deployment/manager/dp_properties.cxx
+++ b/desktop/source/deployment/manager/dp_properties.cxx
@@ -24,7 +24,6 @@
 #include <ucbhelper/content.hxx>
 
 #include <dp_ucb.h>
-#include <rtl/ustrbuf.hxx>
 #include "dp_properties.hxx"
 
 namespace lang  = com::sun::star::lang;
diff --git a/desktop/source/deployment/misc/dp_ucb.cxx b/desktop/source/deployment/misc/dp_ucb.cxx
index 3da815f15fa4..28f4192eeca6 100644
--- a/desktop/source/deployment/misc/dp_ucb.cxx
+++ b/desktop/source/deployment/misc/dp_ucb.cxx
@@ -19,8 +19,6 @@
 
 #include <sal/config.h>
 
-#include <string_view>
-
 #include <dp_misc.h>
 #include <dp_ucb.h>
 #include <rtl/uri.hxx>
diff --git a/desktop/source/deployment/registry/component/dp_component.cxx b/desktop/source/deployment/registry/component/dp_component.cxx
index f154134678f5..d29229aa5a05 100644
--- a/desktop/source/deployment/registry/component/dp_component.cxx
+++ b/desktop/source/deployment/registry/component/dp_component.cxx
@@ -19,6 +19,7 @@
 
 
 #include <strings.hrc>
+#include <dp_misc.h>
 #include <dp_shared.hxx>
 #include <dp_backend.h>
 #include <dp_platform.hxx>
diff --git a/desktop/source/deployment/registry/configuration/dp_configuration.cxx b/desktop/source/deployment/registry/configuration/dp_configuration.cxx
index a4f19bf6d875..e2fb409c2f6a 100644
--- a/desktop/source/deployment/registry/configuration/dp_configuration.cxx
+++ b/desktop/source/deployment/registry/configuration/dp_configuration.cxx
@@ -26,6 +26,7 @@
 #if HAVE_FEATURE_EXTENSIONS
 #include <dp_persmap.h>
 #endif
+#include <dp_misc.h>
 #include <dp_ucb.h>
 #include <rtl/string.hxx>
 #include <rtl/strbuf.hxx>
diff --git a/desktop/source/deployment/registry/dp_backend.cxx b/desktop/source/deployment/registry/dp_backend.cxx
index 58e689e9f2eb..ce37da6280fd 100644
--- a/desktop/source/deployment/registry/dp_backend.cxx
+++ b/desktop/source/deployment/registry/dp_backend.cxx
@@ -22,6 +22,7 @@
 #include <cassert>
 
 #include <dp_backend.h>
+#include <dp_misc.h>
 #include <dp_ucb.h>
 #include <rtl/ustring.hxx>
 #include <rtl/bootstrap.hxx>
diff --git a/desktop/source/deployment/registry/help/dp_help.cxx b/desktop/source/deployment/registry/help/dp_help.cxx
index 4c8d077e27fc..834f829ad35b 100644
--- a/desktop/source/deployment/registry/help/dp_help.cxx
+++ b/desktop/source/deployment/registry/help/dp_help.cxx
@@ -22,6 +22,7 @@
 
 #include <strings.hrc>
 #include <dp_backend.h>
+#include <dp_misc.h>
 #include "dp_helpbackenddb.hxx"
 #include <dp_ucb.h>
 #include <rtl/uri.hxx>
diff --git a/desktop/source/deployment/registry/inc/dp_backend.h b/desktop/source/deployment/registry/inc/dp_backend.h
index 4a9353bf415a..e6dd949f1b23 100644
--- a/desktop/source/deployment/registry/inc/dp_backend.h
+++ b/desktop/source/deployment/registry/inc/dp_backend.h
@@ -19,7 +19,6 @@
 
 #pragma once
 
-#include <dp_misc.h>
 #include <dp_shared.hxx>
 #include <dp_interact.h>
 #include <rtl/ref.hxx>
@@ -29,6 +28,7 @@
 #include <com/sun/star/lang/XEventListener.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/deployment/XPackageRegistry.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
 #include <unordered_map>
 #include <strings.hrc>
 
diff --git a/desktop/source/deployment/registry/package/dp_package.cxx b/desktop/source/deployment/registry/package/dp_package.cxx
index 09dc1331d4ef..321db824f40c 100644
--- a/desktop/source/deployment/registry/package/dp_package.cxx
+++ b/desktop/source/deployment/registry/package/dp_package.cxx
@@ -21,6 +21,7 @@
 #include <strings.hrc>
 #include <dp_package.hxx>
 #include <dp_backend.h>
+#include <dp_misc.h>
 #include <dp_ucb.h>
 #include <dp_interact.h>
 #include <dp_dependencies.hxx>
diff --git a/desktop/source/deployment/registry/script/dp_script.cxx b/desktop/source/deployment/registry/script/dp_script.cxx
index 3dc951a6f1d4..47e41a364e7b 100644
--- a/desktop/source/deployment/registry/script/dp_script.cxx
+++ b/desktop/source/deployment/registry/script/dp_script.cxx
@@ -21,6 +21,7 @@
 #include <strings.hrc>
 #include "dp_lib_container.h"
 #include <dp_backend.h>
+#include <dp_misc.h>
 #include <dp_ucb.h>
 #include <ucbhelper/content.hxx>
 #include <cppuhelper/implbase.hxx>
diff --git a/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx b/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx
index 758bdf264a18..34ff6d4ecd05 100644
--- a/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx
+++ b/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx
@@ -21,6 +21,7 @@
 
 #include <strings.hrc>
 #include <dp_backend.h>
+#include <dp_misc.h>
 #include <dp_ucb.h>
 #include "dp_parceldesc.hxx"
 #include <rtl/uri.hxx>
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 5b1f23f1aa20..15476008abf2 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -50,7 +50,6 @@
 #include <rtl/bootstrap.hxx>
 #include <rtl/strbuf.hxx>
 #include <rtl/uri.hxx>
-#include <svl/zforlist.hxx>
 #include <cppuhelper/bootstrap.hxx>
 #include <comphelper/base64.hxx>
 #include <comphelper/dispatchcommand.hxx>
@@ -131,7 +130,6 @@
 #include <svtools/ctrltool.hxx>
 #include <svtools/langtab.hxx>
 #include <vcl/fontcharmap.hxx>
-#include <vcl/graphicfilter.hxx>
 #ifdef IOS
 #include <vcl/sysdata.hxx>
 #endif
@@ -141,7 +139,6 @@
 #include <vcl/dialoghelper.hxx>
 #include <unicode/uchar.h>
 #include <unotools/securityoptions.hxx>
-#include <unotools/configmgr.hxx>
 #include <unotools/confignode.hxx>
 #include <unotools/syslocaleoptions.hxx>
 #include <unotools/mediadescriptor.hxx>
diff --git a/desktop/source/lib/lokinteractionhandler.cxx b/desktop/source/lib/lokinteractionhandler.cxx
index 1e794c0ff651..6b94ee907318 100644
--- a/desktop/source/lib/lokinteractionhandler.cxx
+++ b/desktop/source/lib/lokinteractionhandler.cxx
@@ -19,8 +19,6 @@
 
 #include "lokinteractionhandler.hxx"
 
-#include <boost/property_tree/json_parser.hpp>
-
 #include <comphelper/processfactory.hxx>
 #include <cppuhelper/supportsservice.hxx>
 
diff --git a/desktop/source/pkgchk/unopkg/unopkg_shared.h b/desktop/source/pkgchk/unopkg/unopkg_shared.h
index df03f594331e..9db42e908619 100644
--- a/desktop/source/pkgchk/unopkg/unopkg_shared.h
+++ b/desktop/source/pkgchk/unopkg/unopkg_shared.h
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <com/sun/star/uno/Exception.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/ucb/XCommandEnvironment.hpp>
 #include <com/sun/star/deployment/XPackage.hpp>
diff --git a/desktop/unx/source/pagein.c b/desktop/unx/source/pagein.c
index 1dff59bd5143..87bbb699f897 100644
--- a/desktop/unx/source/pagein.c
+++ b/desktop/unx/source/pagein.c
@@ -20,7 +20,6 @@
 #include "file_image.h"
 #include "pagein.h"
 
-#include <unistd.h>
 #include <errno.h>
 #include <stdio.h>
 #include <string.h>
@@ -28,7 +27,6 @@
 #ifdef LINUX
 #include <sys/sysmacros.h>
 #endif
-#include <sys/types.h>
 
 /* do_pagein */
 static void do_pagein (const char * filename)