tdf#42949 Fix IWYU warnings in cui/source/{c-f}*/*cxx

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

Change-Id: Ie5e070d13b771cf3e114c2454d49d77d95934160
Reviewed-on: https://gerrit.libreoffice.org/76506
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>

47 files changed, 16 insertions, 389 deletions

diff --git a/cui/IwyuFilter_cui.yaml b/cui/IwyuFilter_cui.yaml
index 98f2bd74a1ea..52c313d212ed 100644
--- a/cui/IwyuFilter_cui.yaml
+++ b/cui/IwyuFilter_cui.yaml
@@ -1,2 +1,6 @@
 ---
 assumeFilename: cui/source/options/optgenrl.cxx
+blacklist:
+    cui/source/customize/macropg.cxx:
+    # Needed for TypedWhichId macro
+    - svl/macitem.hxx
diff --git a/cui/source/customize/CommandCategoryListBox.cxx b/cui/source/customize/CommandCategoryListBox.cxx
index 937916ec3ea6..6c8d0118f1ee 100644
--- a/cui/source/customize/CommandCategoryListBox.cxx
+++ b/cui/source/customize/CommandCategoryListBox.cxx
@@ -40,7 +40,6 @@
 
 #include <dialmgr.hxx>
 #include <strings.hrc>
-#include <bitmaps.hlst>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/sequenceashashmap.hxx>
 #include <comphelper/string.hxx>
diff --git a/cui/source/customize/CustomNotebookbarGenerator.cxx b/cui/source/customize/CustomNotebookbarGenerator.cxx
index b8f7e7c6fd49..f08e6b49fdfe 100644
--- a/cui/source/customize/CustomNotebookbarGenerator.cxx
+++ b/cui/source/customize/CustomNotebookbarGenerator.cxx
@@ -17,16 +17,17 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <comphelper/processfactory.hxx>
 #include <rtl/bootstrap.hxx>
+#include <rtl/ustrbuf.hxx>
 #include <config_folders.h>
 #include <CustomNotebookbarGenerator.hxx>
 #include <osl/file.hxx>
-#include <vcl/dialog.hxx>
+#include <vcl/builder.hxx>
+#include <vcl/EnumContext.hxx>
 #include <sfx2/viewfrm.hxx>
-#include <officecfg/Office/UI/ToolbarMode.hxx>
 #include <com/sun/star/frame/ModuleManager.hpp>
 #include <unotools/confignode.hxx>
-#include <libxml/xmlmemory.h>
 #include <libxml/parser.h>
 
 #define aUIItemIDLength 255
@@ -287,4 +288,4 @@ void CustomNotebookbarGenerator::setCustomizedUIItem(Sequence<OUString> sUIItemP
     aAppNode.commit();
 }
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/customize/SvxMenuConfigPage.cxx b/cui/source/customize/SvxMenuConfigPage.cxx
index 496e245d29bd..d68582f7da5f 100644
--- a/cui/source/customize/SvxMenuConfigPage.cxx
+++ b/cui/source/customize/SvxMenuConfigPage.cxx
@@ -20,75 +20,21 @@
 #include <sal/config.h>
 #include <sal/log.hxx>
 
-#include <cassert>
-#include <stdlib.h>
-#include <time.h>
-#include <typeinfo>
-
 #include <vcl/commandinfoprovider.hxx>
-#include <vcl/help.hxx>
 #include <vcl/weld.hxx>
-#include <vcl/decoview.hxx>
-#include <vcl/virdev.hxx>
-#include <vcl/settings.hxx>
 #include <vcl/svapp.hxx>
 
-#include <sfx2/app.hxx>
-#include <sfx2/sfxdlg.hxx>
-#include <sfx2/viewfrm.hxx>
-#include <sfx2/viewsh.hxx>
-#include <sfx2/msg.hxx>
-#include <sfx2/msgpool.hxx>
-#include <sfx2/minfitem.hxx>
-#include <sfx2/objsh.hxx>
-#include <sfx2/request.hxx>
-#include <sfx2/filedlghelper.hxx>
-#include <svl/stritem.hxx>
-#include <svtools/miscopt.hxx>
-#include <tools/diagnose_ex.h>
-
 #include <algorithm>
 #include <strings.hrc>
 #include <helpids.h>
 
-#include <acccfg.hxx>
 #include <cfg.hxx>
 #include <SvxMenuConfigPage.hxx>
 #include <SvxConfigPageHelper.hxx>
 #include <dialmgr.hxx>
 
 #include <comphelper/processfactory.hxx>
-#include <unotools/configmgr.hxx>
-#include <com/sun/star/embed/ElementModes.hpp>
-#include <com/sun/star/embed/FileSystemStorageFactory.hpp>
-#include <com/sun/star/frame/UnknownModuleException.hpp>
-#include <com/sun/star/frame/XFrames.hpp>
-#include <com/sun/star/frame/XLayoutManager.hpp>
-#include <com/sun/star/frame/FrameSearchFlag.hpp>
-#include <com/sun/star/frame/ModuleManager.hpp>
-#include <com/sun/star/frame/XController.hpp>
-#include <com/sun/star/frame/Desktop.hpp>
-#include <com/sun/star/graphic/GraphicProvider.hpp>
-#include <com/sun/star/io/IOException.hpp>
-#include <com/sun/star/lang/IllegalAccessException.hpp>
-#include <com/sun/star/ui/ItemType.hpp>
-#include <com/sun/star/ui/ItemStyle.hpp>
-#include <com/sun/star/ui/ImageManager.hpp>
-#include <com/sun/star/ui/theModuleUIConfigurationManagerSupplier.hpp>
-#include <com/sun/star/ui/XUIConfiguration.hpp>
-#include <com/sun/star/ui/XUIConfigurationListener.hpp>
-#include <com/sun/star/ui/XUIConfigurationManagerSupplier.hpp>
-#include <com/sun/star/ui/XUIConfigurationPersistence.hpp>
-#include <com/sun/star/ui/XUIConfigurationStorage.hpp>
-#include <com/sun/star/ui/XModuleUIConfigurationManager.hpp>
-#include <com/sun/star/ui/XUIElement.hpp>
-#include <com/sun/star/ui/UIElementType.hpp>
 #include <com/sun/star/ui/ImageType.hpp>
-#include <com/sun/star/ui/theWindowStateConfiguration.hpp>
-#include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp>
-#include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
-#include <com/sun/star/ui/dialogs/XFilePickerControlAccess.hpp>
-#include <com/sun/star/util/thePathSettings.hpp>
 
 #include <dlgname.hxx>
 
diff --git a/cui/source/customize/SvxNotebookbarConfigPage.cxx b/cui/source/customize/SvxNotebookbarConfigPage.cxx
index 7f7bea847e99..c9fbb52d36e9 100644
--- a/cui/source/customize/SvxNotebookbarConfigPage.cxx
+++ b/cui/source/customize/SvxNotebookbarConfigPage.cxx
@@ -18,47 +18,20 @@
  */
 
 #include <sal/config.h>
-#include <sal/log.hxx>
-
-#include <cassert>
-#include <stdlib.h>
-#include <time.h>
-#include <typeinfo>
 
 #include <vcl/commandinfoprovider.hxx>
 #include <vcl/event.hxx>
-#include <vcl/help.hxx>
 #include <vcl/weld.hxx>
-#include <vcl/decoview.hxx>
-#include <vcl/virdev.hxx>
-#include <vcl/settings.hxx>
 #include <vcl/svapp.hxx>
 
-#include <sfx2/app.hxx>
-#include <sfx2/sfxdlg.hxx>
-#include <sfx2/viewfrm.hxx>
-#include <sfx2/viewsh.hxx>
-#include <sfx2/msg.hxx>
-#include <sfx2/msgpool.hxx>
-#include <sfx2/minfitem.hxx>
-#include <sfx2/objsh.hxx>
-#include <sfx2/request.hxx>
-#include <sfx2/filedlghelper.hxx>
-#include <sfx2/sfxsids.hrc>
-#include <svl/stritem.hxx>
-#include <svtools/miscopt.hxx>
-#include <tools/diagnose_ex.h>
-
 #include <algorithm>
 #include <helpids.h>
 #include <strings.hrc>
 
-#include <acccfg.hxx>
 #include <cfg.hxx>
 #include <SvxNotebookbarConfigPage.hxx>
 #include <SvxConfigPageHelper.hxx>
 #include <dialmgr.hxx>
-#include <libxml/xmlmemory.h>
 #include <libxml/parser.h>
 #include <osl/file.hxx>
 #include <CustomNotebookbarGenerator.hxx>
diff --git a/cui/source/customize/SvxToolbarConfigPage.cxx b/cui/source/customize/SvxToolbarConfigPage.cxx
index 2fc8aae463af..ff63843fb261 100644
--- a/cui/source/customize/SvxToolbarConfigPage.cxx
+++ b/cui/source/customize/SvxToolbarConfigPage.cxx
@@ -20,77 +20,26 @@
 #include <sal/config.h>
 #include <sal/log.hxx>
 
-#include <cassert>
-#include <stdlib.h>
-#include <time.h>
-#include <typeinfo>
-
 #include <vcl/commandinfoprovider.hxx>
 #include <vcl/event.hxx>
-#include <vcl/help.hxx>
 #include <vcl/weld.hxx>
-#include <vcl/decoview.hxx>
-#include <vcl/virdev.hxx>
-#include <vcl/settings.hxx>
 #include <vcl/svapp.hxx>
 
-#include <sfx2/app.hxx>
-#include <sfx2/sfxdlg.hxx>
-#include <sfx2/viewfrm.hxx>
-#include <sfx2/viewsh.hxx>
-#include <sfx2/msg.hxx>
-#include <sfx2/msgpool.hxx>
-#include <sfx2/minfitem.hxx>
-#include <sfx2/objsh.hxx>
-#include <sfx2/request.hxx>
-#include <sfx2/filedlghelper.hxx>
 #include <sfx2/sfxsids.hrc>
 #include <svl/stritem.hxx>
-#include <svtools/miscopt.hxx>
 #include <tools/diagnose_ex.h>
 
 #include <algorithm>
 #include <helpids.h>
 #include <strings.hrc>
 
-#include <acccfg.hxx>
 #include <cfg.hxx>
 #include <SvxToolbarConfigPage.hxx>
 #include <SvxConfigPageHelper.hxx>
 #include <dialmgr.hxx>
 
 #include <comphelper/processfactory.hxx>
-#include <unotools/configmgr.hxx>
-#include <com/sun/star/embed/ElementModes.hpp>
-#include <com/sun/star/embed/FileSystemStorageFactory.hpp>
-#include <com/sun/star/frame/UnknownModuleException.hpp>
-#include <com/sun/star/frame/XFrames.hpp>
-#include <com/sun/star/frame/XLayoutManager.hpp>
-#include <com/sun/star/frame/FrameSearchFlag.hpp>
-#include <com/sun/star/frame/ModuleManager.hpp>
-#include <com/sun/star/frame/XController.hpp>
-#include <com/sun/star/frame/Desktop.hpp>
-#include <com/sun/star/graphic/GraphicProvider.hpp>
-#include <com/sun/star/io/IOException.hpp>
-#include <com/sun/star/lang/IllegalAccessException.hpp>
-#include <com/sun/star/ui/ItemType.hpp>
-#include <com/sun/star/ui/ItemStyle.hpp>
-#include <com/sun/star/ui/ImageManager.hpp>
-#include <com/sun/star/ui/theModuleUIConfigurationManagerSupplier.hpp>
-#include <com/sun/star/ui/XUIConfiguration.hpp>
-#include <com/sun/star/ui/XUIConfigurationListener.hpp>
-#include <com/sun/star/ui/XUIConfigurationManagerSupplier.hpp>
-#include <com/sun/star/ui/XUIConfigurationPersistence.hpp>
-#include <com/sun/star/ui/XUIConfigurationStorage.hpp>
-#include <com/sun/star/ui/XModuleUIConfigurationManager.hpp>
-#include <com/sun/star/ui/XUIElement.hpp>
-#include <com/sun/star/ui/UIElementType.hpp>
 #include <com/sun/star/ui/ImageType.hpp>
-#include <com/sun/star/ui/theWindowStateConfiguration.hpp>
-#include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp>
-#include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
-#include <com/sun/star/ui/dialogs/XFilePickerControlAccess.hpp>
-#include <com/sun/star/util/thePathSettings.hpp>
 
 #include <dlgname.hxx>
 
diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx
index 25defd407143..1c738d700e12 100644
--- a/cui/source/customize/acccfg.cxx
+++ b/cui/source/customize/acccfg.cxx
@@ -24,12 +24,9 @@
 #include <cfgutil.hxx>
 #include <dialmgr.hxx>
 
-#include <sfx2/msg.hxx>
-#include <sfx2/app.hxx>
 #include <sfx2/filedlghelper.hxx>
 #include <sfx2/minfitem.hxx>
 #include <sfx2/sfxresid.hxx>
-#include <svl/stritem.hxx>
 
 #include <sal/macros.h>
 #include <vcl/edit.hxx>
@@ -41,7 +38,6 @@
 
 
 // include interface declarations
-#include <com/sun/star/awt/KeyModifier.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/embed/StorageFactory.hpp>
 #include <com/sun/star/embed/XTransactedObject.hpp>
@@ -55,7 +51,6 @@
 #include <com/sun/star/ui/GlobalAcceleratorConfiguration.hpp>
 #include <com/sun/star/ui/theModuleUIConfigurationManagerSupplier.hpp>
 #include <com/sun/star/ui/UIConfigurationManager.hpp>
-#include <com/sun/star/ui/XUIConfigurationManagerSupplier.hpp>
 #include <com/sun/star/ui/XUIConfigurationManager.hpp>
 #include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
 
@@ -69,7 +64,6 @@
 #include <svtools/acceleratorexecute.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/help.hxx>
-#include <rtl/ustrbuf.hxx>
 #include <comphelper/sequenceashashmap.hxx>
 // namespaces
 
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index c745ac57942c..c5c324a40d69 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -22,31 +22,21 @@
 
 #include <cassert>
 #include <stdlib.h>
-#include <time.h>
 #include <typeinfo>
 
 #include <vcl/button.hxx>
 #include <vcl/commandinfoprovider.hxx>
 #include <vcl/edit.hxx>
 #include <vcl/event.hxx>
-#include <vcl/help.hxx>
+#include <vcl/graph.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/toolbox.hxx>
 #include <vcl/weld.hxx>
 #include <vcl/decoview.hxx>
 #include <vcl/virdev.hxx>
-#include <vcl/settings.hxx>
 
 #include <sfx2/sfxhelp.hxx>
-#include <sfx2/app.hxx>
-#include <sfx2/sfxdlg.hxx>
 #include <sfx2/viewfrm.hxx>
-#include <sfx2/viewsh.hxx>
-#include <sfx2/msg.hxx>
-#include <sfx2/msgpool.hxx>
-#include <sfx2/minfitem.hxx>
-#include <sfx2/objsh.hxx>
-#include <sfx2/request.hxx>
 #include <sfx2/filedlghelper.hxx>
 #include <sfx2/sfxsids.hrc>
 #include <svl/stritem.hxx>
@@ -80,17 +70,12 @@
 #include <com/sun/star/frame/theUICommandDescription.hpp>
 #include <com/sun/star/graphic/GraphicProvider.hpp>
 #include <com/sun/star/io/IOException.hpp>
-#include <com/sun/star/lang/IllegalAccessException.hpp>
 #include <com/sun/star/ui/ItemType.hpp>
 #include <com/sun/star/ui/ItemStyle.hpp>
 #include <com/sun/star/ui/ImageManager.hpp>
 #include <com/sun/star/ui/theModuleUIConfigurationManagerSupplier.hpp>
-#include <com/sun/star/ui/XUIConfiguration.hpp>
-#include <com/sun/star/ui/XUIConfigurationListener.hpp>
 #include <com/sun/star/ui/XUIConfigurationManagerSupplier.hpp>
 #include <com/sun/star/ui/XUIConfigurationPersistence.hpp>
-#include <com/sun/star/ui/XUIConfigurationStorage.hpp>
-#include <com/sun/star/ui/XModuleUIConfigurationManager.hpp>
 #include <com/sun/star/ui/XUIElement.hpp>
 #include <com/sun/star/ui/UIElementType.hpp>
 #include <com/sun/star/ui/ImageType.hpp>
@@ -103,8 +88,6 @@
 #include <comphelper/propertysequence.hxx>
 #include <comphelper/processfactory.hxx>
 
-#include <dlgname.hxx>
-
 namespace uno = com::sun::star::uno;
 namespace frame = com::sun::star::frame;
 namespace lang = com::sun::star::lang;
diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx
index 2c0c1e6ac506..06249776bfca 100644
--- a/cui/source/customize/cfgutil.cxx
+++ b/cui/source/customize/cfgutil.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <cfgutil.hxx>
-#include <cfg.hxx>
 
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/container/XEnumerationAccess.hpp>
@@ -36,28 +35,19 @@
 #include <com/sun/star/uno/RuntimeException.hpp>
 #include <com/sun/star/ui/theUICategoryDescription.hpp>
 
-#include <basic/sbx.hxx>
-#include <basic/basicmanagerrepository.hxx>
-#include <basic/sbstar.hxx>
-#include <basic/sbxmeth.hxx>
-#include <basic/sbmod.hxx>
 #include <basic/basmgr.hxx>
 #include <tools/urlobj.hxx>
 #include <strings.hrc>
 #include <bitmaps.hlst>
-#include <sfx2/app.hxx>
 #include <sfx2/minfitem.hxx>
 #include <comphelper/DisableInteractionHelper.hxx>
 #include <comphelper/documentinfo.hxx>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/sequenceashashmap.hxx>
 #include <svtools/imagemgr.hxx>
-#include <rtl/ustrbuf.hxx>
 #include <sal/log.hxx>
 #include <osl/diagnose.h>
-#include <unotools/configmgr.hxx>
 #include <dialmgr.hxx>
-#include <svl/stritem.hxx>
 #include <tools/diagnose_ex.h>
 #include <vcl/commandinfoprovider.hxx>
 #include <vcl/help.hxx>
diff --git a/cui/source/customize/eventdlg.cxx b/cui/source/customize/eventdlg.cxx
index b0f01933d509..44ff4f9e9137 100644
--- a/cui/source/customize/eventdlg.cxx
+++ b/cui/source/customize/eventdlg.cxx
@@ -29,21 +29,8 @@
 #include <rtl/ustring.hxx>
 
 #include "eventdlg.hxx"
-
-#include <sfx2/viewfrm.hxx>
-#include <sfx2/evntconf.hxx>
-#include <sfx2/minfitem.hxx>
-#include <sfx2/app.hxx>
-#include <sfx2/objsh.hxx>
-#include <sfx2/docfac.hxx>
-#include <sfx2/fcontnr.hxx>
-#include <unotools/eventcfg.hxx>
-
-#include <headertablistbox.hxx>
 #include "macropg_impl.hxx"
 
-#include <bitmaps.hlst>
-#include <cfgutil.hxx>
 #include <cfg.hxx>
 
 using namespace ::com::sun::star;
diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx
index b4e1a8b38f6c..453a764db608 100644
--- a/cui/source/customize/macropg.cxx
+++ b/cui/source/customize/macropg.cxx
@@ -17,25 +17,17 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <basic/basmgr.hxx>
-
 #include <macropg.hxx>
 #include <svl/eitem.hxx>
 #include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
-#include <sfx2/app.hxx>
-#include <sfx2/objsh.hxx>
-#include <com/sun/star/container/NoSuchElementException.hpp>
-#include <com/sun/star/lang/IllegalArgumentException.hpp>
 #include <bitmaps.hlst>
-#include <cfg.hxx>
 #include <cfgutil.hxx>
 #include <dialmgr.hxx>
 #include <helpids.h>
 #include <headertablistbox.hxx>
 #include "macropg_impl.hxx"
 #include <svl/macitem.hxx>
-#include <svx/dialogs.hrc>
 #include <svx/svxids.hrc>
 #include <strings.hrc>
 #include <comphelper/namedvaluecollection.hxx>
diff --git a/cui/source/dialogs/FontFeaturesDialog.cxx b/cui/source/dialogs/FontFeaturesDialog.cxx
index d4facba2bf7f..21f962ee4b07 100644
--- a/cui/source/dialogs/FontFeaturesDialog.cxx
+++ b/cui/source/dialogs/FontFeaturesDialog.cxx
@@ -12,7 +12,6 @@
 #include <vcl/font/FeatureParser.hxx>
 #include <vcl/virdev.hxx>
 #include <svtools/colorcfg.hxx>
-#include <svx/dialmgr.hxx>
 #include <unordered_set>
 
 using namespace css;
diff --git a/cui/source/dialogs/QrCodeGenDialog.cxx b/cui/source/dialogs/QrCodeGenDialog.cxx
index 14c9b18e9ab9..c174e5a1d83d 100644
--- a/cui/source/dialogs/QrCodeGenDialog.cxx
+++ b/cui/source/dialogs/QrCodeGenDialog.cxx
@@ -10,7 +10,6 @@
 #include <QrCodeGenDialog.hxx>
 
 #include <comphelper/processfactory.hxx>
-#include <comphelper/xmltools.hxx>
 #include <tools/stream.hxx>
 #include <unotools/streamwrap.hxx>
 #include <utility>
diff --git a/cui/source/dialogs/SignSignatureLineDialog.cxx b/cui/source/dialogs/SignSignatureLineDialog.cxx
index ecdacc4a0e0e..03549d14fefc 100644
--- a/cui/source/dialogs/SignSignatureLineDialog.cxx
+++ b/cui/source/dialogs/SignSignatureLineDialog.cxx
@@ -18,7 +18,6 @@
 #include <comphelper/graphicmimetype.hxx>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/xmlsechelper.hxx>
-#include <osl/file.hxx>
 #include <sfx2/docfile.hxx>
 #include <sfx2/docfilt.hxx>
 #include <sfx2/objsh.hxx>
@@ -33,19 +32,14 @@
 #include <vcl/weld.hxx>
 
 #include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/drawing/XShape.hpp>
 #include <com/sun/star/graphic/GraphicProvider.hpp>
 #include <com/sun/star/graphic/XGraphic.hpp>
 #include <com/sun/star/graphic/XGraphicProvider.hpp>
 #include <com/sun/star/io/XInputStream.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/security/CertificateKind.hpp>
 #include <com/sun/star/security/DocumentDigitalSignatures.hpp>
 #include <com/sun/star/security/XCertificate.hpp>
 #include <com/sun/star/security/XDocumentDigitalSignatures.hpp>
-#include <com/sun/star/text/TextContentAnchorType.hpp>
-#include <com/sun/star/text/XTextContent.hpp>
-#include <com/sun/star/text/XTextDocument.hpp>
 #include <com/sun/star/ui/dialogs/FilePicker.hpp>
 #include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
 #include <com/sun/star/ui/dialogs/XFilePicker3.hpp>
@@ -59,7 +53,6 @@ using namespace css::io;
 using namespace css::lang;
 using namespace css::frame;
 using namespace css::text;
-using namespace css::drawing;
 using namespace css::graphic;
 using namespace css::security;
 using namespace css::ui::dialogs;
diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx
index 004079eb6b8a..ef8f08cd216c 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -19,7 +19,6 @@
 
 #include <memory>
 #include "SpellAttrib.hxx"
-#include <sfx2/dispatch.hxx>
 #include <sfx2/bindings.hxx>
 #include <sfx2/sfxsids.hrc>
 #include <sfx2/viewfrm.hxx>
@@ -33,38 +32,23 @@
 #include <editeng/splwrap.hxx>
 #include <editeng/unolingu.hxx>
 #include <editeng/wghtitem.hxx>
-#include <linguistic/lngprops.hxx>
 #include <linguistic/misc.hxx>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/lang/XServiceDisplayName.hpp>
 #include <com/sun/star/frame/XStorable.hpp>
 #include <com/sun/star/linguistic2/XDictionary.hpp>
 #include <com/sun/star/linguistic2/XSpellAlternatives.hpp>
 #include <com/sun/star/linguistic2/XSearchableDictionaryList.hpp>
 #include <com/sun/star/linguistic2/XSpellChecker1.hpp>
 #include <sfx2/app.hxx>
-#include <vcl/cursor.hxx>
 #include <vcl/event.hxx>
-#include <vcl/graph.hxx>
-#include <vcl/help.hxx>
-#include <vcl/graphicfilter.hxx>
-#include <vcl/ptrstyle.hxx>
-#include <vcl/settings.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/texteng.hxx>
 #include <vcl/weld.hxx>
-#include <osl/file.hxx>
-#include <editeng/optitems.hxx>
-#include <editeng/svxenum.hxx>
 #include <svx/SpellDialogChildWindow.hxx>
 #include <SpellDialog.hxx>
-#include <svx/dlgutil.hxx>
 #include <optlingu.hxx>
-#include <svx/svxerr.hxx>
 #include <treeopt.hxx>
 #include <svtools/langtab.hxx>
-#include <cppuhelper/exc_hlp.hxx>
 #include <sal/log.hxx>
 #include <i18nlangtag/languagetag.hxx>
 
diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index 9dfd18a8f862..a10fd4ecba9b 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -22,16 +22,13 @@
 #include <sal/log.hxx>
 #include <osl/diagnose.h>
 #include <rtl/character.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/button.hxx>
 #include <vcl/graphicfilter.hxx>
-#include <vcl/layout.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/weld.hxx>
 
-#include <tools/stream.hxx>
-#include <rtl/bootstrap.hxx>
 #include <unotools/configmgr.hxx>
 #include <unotools/bootstrap.hxx>
 #include <com/sun/star/uno/Any.h>
@@ -43,18 +40,13 @@
 #include <comphelper/processfactory.hxx>
 #include <comphelper/anytostring.hxx>
 #include <cppuhelper/exc_hlp.hxx>
-#include <cppuhelper/bootstrap.hxx>
-#include <basegfx/numeric/ftools.hxx>
-#include <com/sun/star/geometry/RealRectangle2D.hpp>
 #include <svtools/optionsdrawinglayer.hxx>
 
-#include <sfx2/sfxuno.hxx>
 #include <about.hxx>
 #include <dialmgr.hxx>
 #include <strings.hrc>
 #include <config_buildid.h>
 #include <sfx2/app.hxx>
-#include <rtl/ustrbuf.hxx>
 
 #if HAVE_FEATURE_OPENCL
 #include <opencl/openclwrapper.hxx>
diff --git a/cui/source/dialogs/colorpicker.cxx b/cui/source/dialogs/colorpicker.cxx
index 4587f52660cc..6b7142f2a85b 100644
--- a/cui/source/dialogs/colorpicker.cxx
+++ b/cui/source/dialogs/colorpicker.cxx
@@ -22,28 +22,19 @@
 #include <com/sun/star/beans/XPropertyAccess.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/datatransfer/XTransferable.hpp>
-#include <com/sun/star/datatransfer/clipboard/XClipboard.hpp>
 #include <com/sun/star/awt/XWindow.hpp>
 #include <cppuhelper/compbase.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <cppuhelper/basemutex.hxx>
 #include <vcl/customweld.hxx>
-#include <vcl/bitmapaccess.hxx>
 #include <vcl/event.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/weld.hxx>
-#include <toolkit/helper/vclunohelper.hxx>
-#include <sot/exchange.hxx>
-#include <sot/formats.hxx>
 #include <svx/hexcolorcontrol.hxx>
-#include <sax/tools/converter.hxx>
 #include <basegfx/color/bcolortools.hxx>
 #include <colorpicker.hxx>
-#include <bitmaps.hlst>
 #include <cmath>
-#include <limits>
 #include <o3tl/typed_flags_set.hxx>
 
 using namespace ::com::sun::star::uno;
diff --git a/cui/source/dialogs/cuicharmap.cxx b/cui/source/dialogs/cuicharmap.cxx
index f8c38f589465..dba595d5dd21 100644
--- a/cui/source/dialogs/cuicharmap.cxx
+++ b/cui/source/dialogs/cuicharmap.cxx
@@ -20,14 +20,12 @@
 #include <stdio.h>
 
 #include <vcl/svapp.hxx>
-#include <svtools/colorcfg.hxx>
 #include <svl/eitem.hxx>
 #include <svl/intitem.hxx>
 #include <svl/itempool.hxx>
 
 #include <rtl/textenc.h>
 #include <svx/ucsubset.hxx>
-#include <sfx2/objsh.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/fontcharmap.hxx>
 #include <vcl/virdev.hxx>
@@ -38,14 +36,11 @@
 
 #include <dialmgr.hxx>
 #include <cui/cuicharmap.hxx>
-#include <sfx2/request.hxx>
-#include <sfx2/sfxsids.hrc>
 #include <sfx2/app.hxx>
 #include <svx/svxids.hrc>
 #include <editeng/editids.hrc>
 #include <editeng/fontitem.hxx>
 #include <strings.hrc>
-#include <macroass.hxx>
 #include <unicode/uchar.h>
 #include <unicode/utypes.h>
 
diff --git a/cui/source/dialogs/cuifmsearch.cxx b/cui/source/dialogs/cuifmsearch.cxx
index d898930ef147..bac466b572ff 100644
--- a/cui/source/dialogs/cuifmsearch.cxx
+++ b/cui/source/dialogs/cuifmsearch.cxx
@@ -22,18 +22,15 @@
 #include <vcl/weld.hxx>
 #include <vcl/svapp.hxx>
 #include <dialmgr.hxx>
-#include <sfx2/tabdlg.hxx>
 #include <sfx2/app.hxx>
 #include <svx/fmsrccfg.hxx>
 #include <svx/fmsrcimp.hxx>
 #include <strings.hrc>
 #include <cuifmsearch.hxx>
-#include <svx/srchdlg.hxx>
 #include <svl/cjkoptions.hxx>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/string.hxx>
 #include <svx/svxdlg.hxx>
-#include <sal/macros.h>
 
 using namespace css::uno;
 using namespace css::i18n;
diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx
index 24b03ef54348..4b220800d33c 100644
--- a/cui/source/dialogs/cuigaldlg.cxx
+++ b/cui/source/dialogs/cuigaldlg.cxx
@@ -40,8 +40,6 @@
 #include <unotools/syslocale.hxx>
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
-#include <com/sun/star/lang/XInitialization.hpp>
-#include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
 #include <comphelper/processfactory.hxx>
 #include <com/sun/star/sdbc/XResultSet.hpp>
 #include <com/sun/star/sdbc/XRow.hpp>
@@ -49,10 +47,8 @@
 #include <com/sun/star/ucb/XContentAccess.hpp>
 #include <com/sun/star/ui/dialogs/FolderPicker.hpp>
 #include <com/sun/star/ui/dialogs/XAsynchronousExecutableDialog.hpp>
-#include <sfx2/sfxuno.hxx>
 #include <dialmgr.hxx>
 #include <strings.hrc>
-#include <svx/dialogs.hrc>
 #include <svx/dialmgr.hxx>
 #include <svx/strings.hrc>
 
diff --git a/cui/source/dialogs/cuigrfflt.cxx b/cui/source/dialogs/cuigrfflt.cxx
index 019ee15ddf3c..baaa6603c60d 100644
--- a/cui/source/dialogs/cuigrfflt.cxx
+++ b/cui/source/dialogs/cuigrfflt.cxx
@@ -27,13 +27,8 @@
 #include <vcl/settings.hxx>
 #include <vcl/svapp.hxx>
 #include <osl/diagnose.h>
-#include <sfx2/viewfrm.hxx>
-#include <sfx2/viewsh.hxx>
-#include <sfx2/objsh.hxx>
-#include <sfx2/request.hxx>
 #include <tools/helpers.hxx>
 #include <cuigrfflt.hxx>
-#include <svx/dialogs.hrc>
 
 CuiGraphicPreviewWindow::CuiGraphicPreviewWindow()
     : mpOrigGraphic(nullptr)
diff --git a/cui/source/dialogs/cuihyperdlg.cxx b/cui/source/dialogs/cuihyperdlg.cxx
index 7a9ee445ad92..8ea92bc926b2 100644
--- a/cui/source/dialogs/cuihyperdlg.cxx
+++ b/cui/source/dialogs/cuihyperdlg.cxx
@@ -21,14 +21,12 @@
 
 #include <osl/diagnose.h>
 #include <comphelper/lok.hxx>
-#include <vcl/settings.hxx>
 #include <unotools/viewoptions.hxx>
 #include <cuihyperdlg.hxx>
 #include <hlinettp.hxx>
 #include <hlmailtp.hxx>
 #include <hldoctp.hxx>
 #include <hldocntp.hxx>
-#include <bitmaps.hlst>
 #include <sfx2/app.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <svl/eitem.hxx>
diff --git a/cui/source/dialogs/cuiimapwnd.cxx b/cui/source/dialogs/cuiimapwnd.cxx
index 1882406f7c77..60346dc69816 100644
--- a/cui/source/dialogs/cuiimapwnd.cxx
+++ b/cui/source/dialogs/cuiimapwnd.cxx
@@ -17,25 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <tools/urlobj.hxx>
-#include <vcl/help.hxx>
-#include <sfx2/sfxsids.hrc>
-#include <macroass.hxx>
-#include <vcl/imaprect.hxx>
-#include <vcl/imapcirc.hxx>
-#include <vcl/imappoly.hxx>
-#include <svl/urlbmk.hxx>
-#include <svx/xoutbmp.hxx>
 #include <cuiimapwnd.hxx>
-#include <svx/svdpage.hxx>
-#include <svx/svdorect.hxx>
-#include <svx/svdocirc.hxx>
-#include <svx/svdopath.hxx>
-#include <svx/xfltrit.hxx>
-#include <svx/svdpagv.hxx>
-#include <svl/urihelper.hxx>
-
-#include <sot/formats.hxx>
 
 /*************************************************************************
 |*
diff --git a/cui/source/dialogs/dlgname.cxx b/cui/source/dialogs/dlgname.cxx
index e80e22f121f9..0e201d5e22dd 100644
--- a/cui/source/dialogs/dlgname.cxx
+++ b/cui/source/dialogs/dlgname.cxx
@@ -17,9 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <vcl/svapp.hxx>
 #include <dlgname.hxx>
-#include <defdlgname.hxx>
 
 /*************************************************************************
 |*
diff --git a/cui/source/dialogs/hldocntp.cxx b/cui/source/dialogs/hldocntp.cxx
index facbfb8f05e1..3e875bef1994 100644
--- a/cui/source/dialogs/hldocntp.cxx
+++ b/cui/source/dialogs/hldocntp.cxx
@@ -20,7 +20,6 @@
 #include <hldocntp.hxx>
 #include <osl/file.hxx>
 #include <sfx2/viewfrm.hxx>
-#include <sfx2/docfac.hxx>
 #include <sfx2/docfilt.hxx>
 #include <svl/stritem.hxx>
 #include <com/sun/star/awt/XTopWindow.hpp>
@@ -33,16 +32,13 @@
 #include <tools/urlobj.hxx>
 #include <unotools/pathoptions.hxx>
 #include <unotools/dynamicmenuoptions.hxx>
-#include <sfx2/filedlghelper.hxx>
 #include <unotools/ucbstreamhelper.hxx>
 #include <unotools/ucbhelper.hxx>
 
 #include <comphelper/processfactory.hxx>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/ui/dialogs/FolderPicker.hpp>
 #include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
 
-#include <bitmaps.hlst>
 #include <cuihyperdlg.hxx>
 #include <dialmgr.hxx>
 #include <strings.hrc>
diff --git a/cui/source/dialogs/hldoctp.cxx b/cui/source/dialogs/hldoctp.cxx
index 57d3672bf5c8..d9fb18906392 100644
--- a/cui/source/dialogs/hldoctp.cxx
+++ b/cui/source/dialogs/hldoctp.cxx
@@ -24,7 +24,6 @@
 
 #include <hldoctp.hxx>
 #include <hlmarkwn_def.hxx>
-#include <bitmaps.hlst>
 
 sal_Char const sHash[]          = "#";
 sal_Char const sFileScheme[]    = INET_FILE_SCHEME;
diff --git a/cui/source/dialogs/hlinettp.cxx b/cui/source/dialogs/hlinettp.cxx
index 864c9beb10c0..a2bae6bd1ce2 100644
--- a/cui/source/dialogs/hlinettp.cxx
+++ b/cui/source/dialogs/hlinettp.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <unotools/pathoptions.hxx>
 #include <unotools/useroptions.hxx>
 #include <svl/adrparse.hxx>
 
diff --git a/cui/source/dialogs/hlmailtp.cxx b/cui/source/dialogs/hlmailtp.cxx
index ea2eaa808da0..4e2e111fcc9b 100644
--- a/cui/source/dialogs/hlmailtp.cxx
+++ b/cui/source/dialogs/hlmailtp.cxx
@@ -17,15 +17,12 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <com/sun/star/util/XURLTransformer.hpp>
 #include <sfx2/request.hxx>
 
 #include <sfx2/viewfrm.hxx>
-#include <unotools/pathoptions.hxx>
 #include <unotools/moduleoptions.hxx>
 
 #include <hlmailtp.hxx>
-#include <bitmaps.hlst>
 
 #include <comphelper/lok.hxx>
 
diff --git a/cui/source/dialogs/hlmarkwn.cxx b/cui/source/dialogs/hlmarkwn.cxx
index 1ddc75c42b47..833c4f75efa7 100644
--- a/cui/source/dialogs/hlmarkwn.cxx
+++ b/cui/source/dialogs/hlmarkwn.cxx
@@ -18,20 +18,14 @@
  */
 
 #include <dialmgr.hxx>
-#include <sfx2/docfile.hxx>
 #include <unotools/viewoptions.hxx>
 #include <vcl/graph.hxx>
-#include <vcl/svapp.hxx>
-#include <vcl/settings.hxx>
-#include <vcl/wrkwin.hxx>
-#include <vcl/builderfactory.hxx>
 
 // UNO-Stuff
 #include <comphelper/processfactory.hxx>
 #include <comphelper/sequence.hxx>
 #include <com/sun/star/awt/XBitmap.hpp>
 #include <com/sun/star/frame/Desktop.hpp>
-#include <com/sun/star/frame/XComponentLoader.hpp>
 #include <com/sun/star/beans/NamedValue.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/document/XLinkTargetSupplier.hpp>
diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx
index cf8711073c8d..463cd12d6fec 100644
--- a/cui/source/dialogs/hltpbase.cxx
+++ b/cui/source/dialogs/hltpbase.cxx
@@ -36,7 +36,6 @@
 #include <strings.hrc>
 #include <dialmgr.hxx>
 #include <bitmaps.hlst>
-#include <vcl/builderfactory.hxx>
 #include <comphelper/lok.hxx>
 
 using namespace ::ucbhelper;
diff --git a/cui/source/dialogs/hyphen.cxx b/cui/source/dialogs/hyphen.cxx
index 8cd7d38f24ec..48e7c4574ca1 100644
--- a/cui/source/dialogs/hyphen.cxx
+++ b/cui/source/dialogs/hyphen.cxx
@@ -22,10 +22,8 @@
 #include <com/sun/star/linguistic2/XLinguProperties.hpp>
 
 #include <editeng/splwrap.hxx>
-#include <editeng/svxenum.hxx>
 #include <editeng/unolingu.hxx>
 #include <svtools/langtab.hxx>
-#include <svx/dlgutil.hxx>
 #include <sal/log.hxx>
 #include <i18nlangtag/languagetag.hxx>
 #include <tools/debug.hxx>
diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx
index fa270d7d73a0..06c4a37a5397 100644
--- a/cui/source/dialogs/iconcdlg.cxx
+++ b/cui/source/dialogs/iconcdlg.cxx
@@ -17,19 +17,11 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <sfx2/app.hxx>
-
 #include <iconcdlg.hxx>
 #include <cuihyperdlg.hxx>
 
 #include <sal/log.hxx>
-#include <unotools/viewoptions.hxx>
-#include <svtools/apearcfg.hxx>
-#include <vcl/mnemonic.hxx>
-#include <vcl/i18nhelp.hxx>
-#include <vcl/settings.hxx>
 #include <vcl/svapp.hxx>
-#include <vcl/builderfactory.hxx>
 
 /**********************************************************************
 |
diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx
index 2d9b5b8b9756..63169d3664df 100644
--- a/cui/source/dialogs/insdlg.cxx
+++ b/cui/source/dialogs/insdlg.cxx
@@ -22,18 +22,16 @@
 #include <com/sun/star/embed/EmbedStates.hpp>
 #include <com/sun/star/embed/XInsertObjectDialog.hpp>
 #include <com/sun/star/embed/MSOLEObjectSystemCreator.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/task/InteractionHandler.hpp>
 #include <com/sun/star/ucb/CommandAbortedException.hpp>
 #include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
 #include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
-#include <com/sun/star/ui/dialogs/FilePicker.hpp>
-#include <com/sun/star/ui/dialogs/XFilterManager.hpp>
+#include <com/sun/star/ui/dialogs/XFilePicker3.hpp>
 #include <comphelper/processfactory.hxx>
 
 #include <insdlg.hxx>
 #include <dialmgr.hxx>
+#include <osl/diagnose.h>
 #include <svtools/imagemgr.hxx>
 #include <svtools/strings.hrc>
 #include <svtools/svtresid.hxx>
@@ -42,7 +40,6 @@
 #include <tools/urlobj.hxx>
 #include <tools/debug.hxx>
 #include <tools/stream.hxx>
-#include <svl/urihelper.hxx>
 #include <vcl/image.hxx>
 #include <vcl/weld.hxx>
 #include <vcl/svapp.hxx>
@@ -50,17 +47,10 @@
 #include <sfx2/filedlghelper.hxx>
 #include <sfx2/frmdescr.hxx>
 #include <sfx2/viewsh.hxx>
-#include <svl/ownlist.hxx>
 #include <comphelper/seqstream.hxx>
 
 #include <strings.hrc>
 
-#include <osl/file.hxx>
-
-#include <com/sun/star/container/XHierarchicalNameAccess.hpp>
-#include <com/sun/star/container/XNameAccess.hpp>
-#include <vcl/settings.hxx>
-
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::uno;
diff --git a/cui/source/dialogs/insrc.cxx b/cui/source/dialogs/insrc.cxx
index 3da4c32eab5d..862963275df8 100644
--- a/cui/source/dialogs/insrc.cxx
+++ b/cui/source/dialogs/insrc.cxx
@@ -18,8 +18,6 @@
  */
 
 #include <dialmgr.hxx>
-#include <svx/svxdlg.hxx>
-#include <vcl/svapp.hxx>
 #include <strings.hrc>
 #include <insrc.hxx>
 
diff --git a/cui/source/dialogs/linkdlg.cxx b/cui/source/dialogs/linkdlg.cxx
index ca8c1280ac60..be1f5e288f27 100644
--- a/cui/source/dialogs/linkdlg.cxx
+++ b/cui/source/dialogs/linkdlg.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <linkdlg.hxx>
-#include <sal/log.hxx>
 #include <vcl/svapp.hxx>
 
 #include <tools/diagnose_ex.h>
@@ -32,7 +31,6 @@
 #include <strings.hrc>
 #include <sfx2/linkmgr.hxx>
 #include <sfx2/linksrc.hxx>
-#include <svtools/soerr.hxx>
 #include <sfx2/lnkbase.hxx>
 #include <sfx2/objsh.hxx>
 
diff --git a/cui/source/dialogs/multipat.cxx b/cui/source/dialogs/multipat.cxx
index 6789e83c2a29..72dbde1acec6 100644
--- a/cui/source/dialogs/multipat.cxx
+++ b/cui/source/dialogs/multipat.cxx
@@ -23,14 +23,12 @@
 #include <tools/urlobj.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/weld.hxx>
-#include <sfx2/filedlghelper.hxx>
 
 #include <multipat.hxx>
 #include <dialmgr.hxx>
 
 #include <strings.hrc>
 #include <comphelper/processfactory.hxx>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/ui/dialogs/FolderPicker.hpp>
 #include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
 
diff --git a/cui/source/dialogs/pastedlg.cxx b/cui/source/dialogs/pastedlg.cxx
index eb8b37c3ec62..3b08dcd5466f 100644
--- a/cui/source/dialogs/pastedlg.cxx
+++ b/cui/source/dialogs/pastedlg.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <memory>
-#include <com/sun/star/embed/Aspects.hpp>
 
 #include <pastedlg.hxx>
 #include <svtools/insdlg.hxx>
@@ -27,8 +26,6 @@
 #include <svtools/strings.hrc>
 #include <svtools/svtresid.hxx>
 #include <tools/lineend.hxx>
-#include <vcl/svapp.hxx>
-#include <vcl/settings.hxx>
 
 SvPasteObjectDialog::SvPasteObjectDialog(weld::Window* pParent)
     : GenericDialogController(pParent, "cui/ui/pastespecial.ui", "PasteSpecialDialog")
diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx
index 32c7a4b2e605..349ab2c7062c 100644
--- a/cui/source/dialogs/scriptdlg.cxx
+++ b/cui/source/dialogs/scriptdlg.cxx
@@ -29,7 +29,6 @@
 #include <bitmaps.hlst>
 #include <scriptdlg.hxx>
 #include <dialmgr.hxx>
-#include <cfgutil.hxx>
 
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/script/provider/ScriptFrameworkErrorException.hpp>
@@ -50,12 +49,9 @@
 #include <comphelper/documentinfo.hxx>
 #include <comphelper/processfactory.hxx>
 
-#include <basic/sbx.hxx>
 #include <svtools/imagemgr.hxx>
 #include <tools/urlobj.hxx>
 #include <tools/diagnose_ex.h>
-#include <vector>
-#include <algorithm>
 
 using namespace ::com::sun::star;
 using namespace css::uno;
diff --git a/cui/source/dialogs/sdrcelldlg.cxx b/cui/source/dialogs/sdrcelldlg.cxx
index 5ce9b6514639..3c745692f7ea 100644
--- a/cui/source/dialogs/sdrcelldlg.cxx
+++ b/cui/source/dialogs/sdrcelldlg.cxx
@@ -17,8 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <svl/cjkoptions.hxx>
-#include <svx/flagsdef.hxx>
 #include <sdrcelldlg.hxx>
 #include <cuitabarea.hxx>
 #include <svx/svdmodel.hxx>
diff --git a/cui/source/dialogs/showcols.cxx b/cui/source/dialogs/showcols.cxx
index efa55c8d7466..895ed485ec1c 100644
--- a/cui/source/dialogs/showcols.cxx
+++ b/cui/source/dialogs/showcols.cxx
@@ -20,7 +20,6 @@
 #include <showcols.hxx>
 
 #include <osl/diagnose.h>
-#include <vcl/msgbox.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <comphelper/types.hxx>
 #include <tools/debug.hxx>
diff --git a/cui/source/dialogs/splitcelldlg.cxx b/cui/source/dialogs/splitcelldlg.cxx
index 6c9a7443c54e..40b798b7c2c9 100644
--- a/cui/source/dialogs/splitcelldlg.cxx
+++ b/cui/source/dialogs/splitcelldlg.cxx
@@ -17,10 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <sfx2/dispatch.hxx>
-#include <svl/intitem.hxx>
-#include <svl/eitem.hxx>
-#include <vcl/svapp.hxx>
 #include <splitcelldlg.hxx>
 
 SvxSplitTableDlg::SvxSplitTableDlg(weld::Window *pParent, bool bIsTableVertical, long nMaxVertical, long nMaxHorizontal)
diff --git a/cui/source/dialogs/srchxtra.cxx b/cui/source/dialogs/srchxtra.cxx
index 5f2d9aa9671a..2a68293f00cf 100644
--- a/cui/source/dialogs/srchxtra.cxx
+++ b/cui/source/dialogs/srchxtra.cxx
@@ -24,16 +24,15 @@
 #include <svl/whiter.hxx>
 #include <sfx2/objsh.hxx>
 #include <svx/flagsdef.hxx>
-#include <svx/svxitems.hrc>
 #include <svx/strarray.hxx>
 #include <editeng/flstitem.hxx>
 #include <chardlg.hxx>
 #include <paragrph.hxx>
 #include <backgrnd.hxx>
-#include <svx/dialogs.hrc>
+#include <editeng/editids.hrc>
+#include <svx/svxids.hrc>
 #include <tools/debug.hxx>
 #include <tools/resary.hxx>
-#include <rtl/strbuf.hxx>
 #include <vcl/svapp.hxx>
 
 SvxSearchFormatDialog::SvxSearchFormatDialog(weld::Window* pParent, const SfxItemSet& rSet)
diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx
index f4cc269c0255..2a5f73c43175 100644
--- a/cui/source/dialogs/thesdlg.cxx
+++ b/cui/source/dialogs/thesdlg.cxx
@@ -18,25 +18,14 @@
  */
 
 #include <thesdlg.hxx>
-#include <strings.hrc>
-#include <dialmgr.hxx>
 
 #include <tools/debug.hxx>
 #include <svl/lngmisc.hxx>
 #include <vcl/event.hxx>
-#include <vcl/graphicfilter.hxx>
-#include <vcl/wrkwin.hxx>
 #include <vcl/svapp.hxx>
-#include <svx/dlgutil.hxx>
-#include <svx/svxerr.hxx>
-#include <editeng/unolingu.hxx>
-#include <svx/langbox.hxx>
 #include <svtools/langtab.hxx>
-#include <unotools/lingucfg.hxx>
 #include <i18nlangtag/languagetag.hxx>
-#include <i18nlangtag/mslangid.hxx>
 #include <comphelper/string.hxx>
-#include <osl/file.hxx>
 
 #include <stack>
 #include <algorithm>
diff --git a/cui/source/dialogs/tipofthedaydlg.cxx b/cui/source/dialogs/tipofthedaydlg.cxx
index df52c5cc0106..393b742c062f 100644
--- a/cui/source/dialogs/tipofthedaydlg.cxx
+++ b/cui/source/dialogs/tipofthedaydlg.cxx
@@ -19,15 +19,14 @@
 
 #include <tipofthedaydlg.hxx>
 
-#include <config_folders.h>
 #include <dialmgr.hxx>
 #include <officecfg/Office/Common.hxx>
 #include <osl/file.hxx>
 #include <rtl/bootstrap.hxx>
 #include <tipoftheday.hrc>
 #include <vcl/graphicfilter.hxx>
+#include <vcl/help.hxx>
 #include <vcl/virdev.hxx>
-#include <sfx2/sfxhelp.hxx>
 #include <vcl/svapp.hxx>
 #include <comphelper/random.hxx>
 
diff --git a/cui/source/factory/cuiexp.cxx b/cui/source/factory/cuiexp.cxx
index 1ee11a656c75..bbe1d743120a 100644
--- a/cui/source/factory/cuiexp.cxx
+++ b/cui/source/factory/cuiexp.cxx
@@ -17,41 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <sfx2/basedlgs.hxx>
-#include <svx/ucsubset.hxx>
-#include <cuigaldlg.hxx>
-#include <hlmarkwn.hxx>
-#include <srchxtra.hxx>
-#include <cuisrchdlg.hxx>
-#include <transfrm.hxx>
-#include <labdlg.hxx>
-#include <cuitbxform.hxx>
-#include <optdict.hxx>
-#include <dlgname.hxx>
-#include <cuiimapwnd.hxx>
-#include <multipat.hxx>
-#include <cuifmsearch.hxx>
-#include <cuigrfflt.hxx>
-#include <cuitabarea.hxx>
-#include <insdlg.hxx>
-#include <pastedlg.hxx>
-#include <linkdlg.hxx>
-#include <postdlg.hxx>
-#include <passwdomdlg.hxx>
-#include <screenshotannotationdlg.hxx>
-#include <cui/cuicharmap.hxx>
-#include <cuihyperdlg.hxx>
-#include <cfgutil.hxx>
-#include <SignatureLineDialog.hxx>
-#include <SignSignatureLineDialog.hxx>
-#include <SpellDialog.hxx>
-#include <zoom.hxx>
-#include <showcols.hxx>
-#include <hyphen.hxx>
-#include <thesdlg.hxx>
-#include <hangulhanjadlg.hxx>
-#include <dstribut.hxx>
-#include <tipofthedaydlg.hxx>
 #include "dlgfact.hxx"
 #include <sal/types.h>
 
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx
index bd23fc1981d3..ce64ed27db69 100644
--- a/cui/source/factory/dlgfact.cxx
+++ b/cui/source/factory/dlgfact.cxx
@@ -23,16 +23,12 @@
 #include <sfx2/app.hxx>
 #include <sfx2/basedlgs.hxx>
 #include <sfx2/pageids.hxx>
-#include <sfx2/request.hxx>
-#include <sal/log.hxx>
 #include <svx/dialogs.hrc>
 #include <svx/svxids.hrc>
-#include <svx/ucsubset.hxx>
 #include <numfmt.hxx>
 #include <splitcelldlg.hxx>
 #include <dstribut.hxx>
 #include <cuiimapwnd.hxx>
-#include <hlmarkwn.hxx>
 #include <cui/cuicharmap.hxx>
 #include <srchxtra.hxx>
 #include <textanim.hxx>
@@ -83,7 +79,6 @@
 #include <sdrcelldlg.hxx>
 #include <newtabledlg.hxx>
 #include <macroass.hxx>
-#include <acccfg.hxx>
 #include <insrc.hxx>
 #include <passwdomdlg.hxx>
 #include <screenshotannotationdlg.hxx>
diff --git a/cui/source/inc/QrCodeGenDialog.hxx b/cui/source/inc/QrCodeGenDialog.hxx
index 70fc2c7f7d7a..4d5584fa3e53 100644
--- a/cui/source/inc/QrCodeGenDialog.hxx
+++ b/cui/source/inc/QrCodeGenDialog.hxx
@@ -13,7 +13,6 @@
 
 #include <com/sun/star/frame/XModel.hpp>
 #include <com/sun/star/uno/Reference.hxx>
-#include <com/sun/star/drawing/QRCodeErrorCorrection.hpp>
 
 #include <com/sun/star/beans/XPropertySet.hpp>