From d847ca56ef2d020da5efa696ce5eb3c96e1ba474 Mon Sep 17 00:00:00 2001
From: Gabor Kelemen <kelemen.gabor2@nisz.hu>
Date: Thu, 16 Jan 2020 20:25:45 +0100
Subject: [PATCH] tdf#42949 Fix IWYU warnings in basctl/

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

Change-Id: Id956a2aaffb7ac8787847eedc4860bf9f4b70184
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86943
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
---
 basctl/IwyuFilter_basctl.yaml               |  9 +++++++++
 basctl/qa/unit/basctl-dialogs-test.cxx      |  3 ---
 basctl/source/basicide/IDEComboBox.cxx      |  3 +++
 basctl/source/basicide/ObjectCatalog.cxx    |  2 +-
 basctl/source/basicide/basdoc.hxx           |  1 -
 basctl/source/basicide/basicrenderable.cxx  |  1 +
 basctl/source/basicide/baside2.cxx          | 14 ++++++++------
 basctl/source/basicide/baside2.hxx          |  5 ++---
 basctl/source/basicide/baside2b.cxx         |  4 ++++
 basctl/source/basicide/baside3.cxx          |  4 ++--
 basctl/source/basicide/basides1.cxx         | 12 ++++++------
 basctl/source/basicide/basides2.cxx         |  6 +++---
 basctl/source/basicide/basides3.cxx         |  4 ++--
 basctl/source/basicide/basidesh.cxx         |  6 ++++--
 basctl/source/basicide/basobj2.cxx          |  2 ++
 basctl/source/basicide/basobj3.cxx          |  7 +++++--
 basctl/source/basicide/bastype2.cxx         |  1 +
 basctl/source/basicide/bastype3.cxx         |  2 +-
 basctl/source/basicide/bastypes.cxx         |  4 +++-
 basctl/source/basicide/brkdlg.cxx           |  2 +-
 basctl/source/basicide/brkdlg.hxx           |  1 +
 basctl/source/basicide/iderdll.cxx          |  6 ++----
 basctl/source/basicide/iderdll2.hxx         |  2 --
 basctl/source/basicide/linenumberwindow.hxx |  2 ++
 basctl/source/basicide/localizationmgr.cxx  |  3 ++-
 basctl/source/basicide/macrodlg.cxx         |  1 +
 basctl/source/basicide/macrodlg.hxx         |  1 +
 basctl/source/basicide/moduldl2.cxx         |  6 ++++--
 basctl/source/basicide/moduldlg.cxx         |  2 ++
 basctl/source/basicide/scriptdocument.cxx   |  5 -----
 basctl/source/dlged/dlged.cxx               |  5 -----
 basctl/source/dlged/dlgedfac.cxx            |  1 -
 basctl/source/dlged/dlgedview.cxx           |  5 +----
 basctl/source/dlged/managelang.cxx          |  5 -----
 basctl/source/dlged/propbrw.cxx             |  2 --
 basctl/source/inc/IDEComboBox.hxx           |  3 +++
 basctl/source/inc/baside3.hxx               |  1 +
 basctl/source/inc/basobj.hxx                |  2 --
 basctl/source/inc/bastype2.hxx              |  2 --
 basctl/source/inc/bastypes.hxx              |  3 +--
 basctl/source/inc/dlgeddef.hxx              |  2 --
 basctl/source/inc/dlgedfunc.hxx             |  5 +++++
 basctl/source/inc/layout.hxx                |  1 +
 43 files changed, 85 insertions(+), 73 deletions(-)
 create mode 100644 basctl/IwyuFilter_basctl.yaml

diff --git a/basctl/IwyuFilter_basctl.yaml b/basctl/IwyuFilter_basctl.yaml
new file mode 100644
index 000000000000..114e025c2f10
--- /dev/null
+++ b/basctl/IwyuFilter_basctl.yaml
@@ -0,0 +1,9 @@
+---
+assumeFilename: basctl/source/basicide/baside2b.cxx
+blacklist:
+    basctl/source/basicide/basidesh.cxx:
+    # Needed for STATIC_LINKING
+    - config_options.h
+    # Needed for TypedWhichId defines is basslots.hxx
+    - sfx2/dinfdlg.hxx
+    - sfx2/minfitem.hxx
diff --git a/basctl/qa/unit/basctl-dialogs-test.cxx b/basctl/qa/unit/basctl-dialogs-test.cxx
index 9a0e53d91e58..a719e5c1ae22 100644
--- a/basctl/qa/unit/basctl-dialogs-test.cxx
+++ b/basctl/qa/unit/basctl-dialogs-test.cxx
@@ -9,9 +9,6 @@
 
 #include <sal/config.h>
 #include <test/screenshot_test.hxx>
-#include <rtl/strbuf.hxx>
-#include <osl/file.hxx>
-#include <sfx2/app.hxx>
 #include <vcl/abstdlg.hxx>
 
 using namespace ::com::sun::star;
diff --git a/basctl/source/basicide/IDEComboBox.cxx b/basctl/source/basicide/IDEComboBox.cxx
index 88c73f0c9d9c..93daa7771548 100644
--- a/basctl/source/basicide/IDEComboBox.cxx
+++ b/basctl/source/basicide/IDEComboBox.cxx
@@ -19,8 +19,10 @@
 
 #include <strings.hrc>
 #include <basidesh.hxx>
+#include <basobj.hxx>
 #include <IDEComboBox.hxx>
 #include <iderdll.hxx>
+#include <iderid.hxx>
 #include <localizationmgr.hxx>
 #include <managelang.hxx>
 
@@ -30,6 +32,7 @@
 #include <svtools/langtab.hxx>
 #include <tools/debug.hxx>
 #include <vcl/svapp.hxx>
+#include <vcl/toolbox.hxx>
 #include <vcl/event.hxx>
 
 namespace basctl
diff --git a/basctl/source/basicide/ObjectCatalog.cxx b/basctl/source/basicide/ObjectCatalog.cxx
index 44500f034a4b..0a32d327f860 100644
--- a/basctl/source/basicide/ObjectCatalog.cxx
+++ b/basctl/source/basicide/ObjectCatalog.cxx
@@ -18,11 +18,11 @@
  */
 
 #include <strings.hrc>
+#include <iderid.hxx>
 
 #include <ObjectCatalog.hxx>
 #include <helpids.h>
 
-#include <svl/itemset.hxx>
 #include <vcl/taskpanelist.hxx>
 
 namespace basctl
diff --git a/basctl/source/basicide/basdoc.hxx b/basctl/source/basicide/basdoc.hxx
index 1223a0166704..897ce265b1a3 100644
--- a/basctl/source/basicide/basdoc.hxx
+++ b/basctl/source/basicide/basdoc.hxx
@@ -25,7 +25,6 @@
 #include <vcl/vclptr.hxx>
 #include <sfx2/printer.hxx>
 #include <sfx2/objsh.hxx>
-#include <memory>
 
 namespace basctl
 {
diff --git a/basctl/source/basicide/basicrenderable.cxx b/basctl/source/basicide/basicrenderable.cxx
index ce4f7005f124..e74f455f91df 100644
--- a/basctl/source/basicide/basicrenderable.cxx
+++ b/basctl/source/basicide/basicrenderable.cxx
@@ -19,6 +19,7 @@
 
 #include "basicrenderable.hxx"
 #include <bastypes.hxx>
+#include <iderid.hxx>
 #include <strings.hrc>
 
 #include <toolkit/awt/vclxdevice.hxx>
diff --git a/basctl/source/basicide/baside2.cxx b/basctl/source/basicide/baside2.cxx
index 868379bd955c..5d3bb561b275 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -19,8 +19,11 @@
 
 #include "baside2.hxx"
 #include <baside3.hxx>
+#include <basobj.hxx>
+#include <basidesh.hxx>
 #include "brkdlg.hxx"
 #include <iderdll.hxx>
+#include <iderid.hxx>
 #include "moduldlg.hxx"
 #include <docsignature.hxx>
 #include <officecfg/Office/BasicIDE.hxx>
@@ -39,22 +42,21 @@
 #include <comphelper/SetFlagContextHelper.hxx>
 #include <comphelper/string.hxx>
 #include <svl/srchdefs.hxx>
-#include <svtools/ehdl.hxx>
-#include <sfx2/dinfdlg.hxx>
-#include <sfx2/dispatch.hxx>
+#include <sfx2/bindings.hxx>
 #include <sfx2/docfile.hxx>
-#include <sfx2/printer.hxx>
 #include <sfx2/request.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sot/exchange.hxx>
-#include <svl/aeitem.hxx>
+#include <svl/eitem.hxx>
 #include <svl/srchitem.hxx>
+#include <svl/stritem.hxx>
 #include <svl/visitem.hxx>
 #include <svl/whiter.hxx>
 #include <svx/svxids.hrc>
 #include <vcl/dialog.hxx>
+#include <vcl/errinf.hxx>
 #include <vcl/event.hxx>
-#include <vcl/settings.hxx>
+#include <vcl/print.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/textview.hxx>
 #include <vcl/weld.hxx>
diff --git a/basctl/source/basicide/baside2.hxx b/basctl/source/basicide/baside2.hxx
index 81401763c9ae..d83a2d7b9bc0 100644
--- a/basctl/source/basicide/baside2.hxx
+++ b/basctl/source/basicide/baside2.hxx
@@ -23,7 +23,6 @@
 #include <memory>
 #include <layout.hxx>
 #include "bastype3.hxx"
-#include <basidesh.hxx>
 #include "breakpoint.hxx"
 #include "linenumberwindow.hxx"
 
@@ -32,11 +31,11 @@
 
 #include <vcl/button.hxx>
 #include <basic/sbmod.hxx>
+#include <basic/sbstar.hxx>
 #include <vcl/lstbox.hxx>
 #include <vcl/idle.hxx>
 
 #include <svtools/colorcfg.hxx>
-#include <sfx2/progress.hxx>
 #include <o3tl/enumarray.hxx>
 
 #include <set>
@@ -45,7 +44,6 @@
 #include <basic/codecompletecache.hxx>
 #include <com/sun/star/reflection/XIdlClass.hpp>
 #include <comphelper/syntaxhighlight.hxx>
-#include <com/sun/star/reflection/XIdlReflection.hpp>
 
 class ExtTextEngine;
 class TextView;
@@ -60,6 +58,7 @@ namespace basctl
 class ObjectCatalog;
 class CodeCompleteListBox;
 class CodeCompleteWindow;
+class ModulWindowLayout;
 
 // #108672 Helper functions to get/set text in TextEngine
 // using the stream interface (get/setText() only supports
diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx
index 7449ba41f197..c510e621bf56 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -22,11 +22,14 @@
 #include <cassert>
 
 #include <helpids.h>
+#include <iderid.hxx>
 #include <strings.hrc>
 #include <bitmaps.hlst>
 
 #include "baside2.hxx"
 #include "brkdlg.hxx"
+#include <basidesh.hxx>
+#include <basobj.hxx>
 #include <iderdll.hxx>
 
 #include <basic/sbmeth.hxx>
@@ -37,6 +40,7 @@
 #include <comphelper/string.hxx>
 #include <officecfg/Office/Common.hxx>
 #include <sfx2/dispatch.hxx>
+#include <sfx2/progress.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <vcl/weld.hxx>
 #include <svl/urihelper.hxx>
diff --git a/basctl/source/basicide/baside3.cxx b/basctl/source/basicide/baside3.cxx
index 4e59686119bd..0409e4c5cae5 100644
--- a/basctl/source/basicide/baside3.cxx
+++ b/basctl/source/basicide/baside3.cxx
@@ -19,11 +19,13 @@
 
 #include <strings.hrc>
 #include <helpids.h>
+#include <iderid.hxx>
 
 #include <accessibledialogwindow.hxx>
 #include <baside3.hxx>
 #include <basidesh.hxx>
 #include <bastype2.hxx>
+#include <basobj.hxx>
 #include <dlged.hxx>
 #include <dlgeddef.hxx>
 #include <dlgedmod.hxx>
@@ -32,7 +34,6 @@
 #include <localizationmgr.hxx>
 #include <managelang.hxx>
 
-#include <basic/basmgr.hxx>
 #include <com/sun/star/script/XLibraryContainer2.hpp>
 #include <com/sun/star/resource/StringResourceWithLocation.hpp>
 #include <com/sun/star/ucb/SimpleFileAccess.hpp>
@@ -44,7 +45,6 @@
 #include <sfx2/dispatch.hxx>
 #include <sfx2/request.hxx>
 #include <sfx2/viewfrm.hxx>
-#include <svl/aeitem.hxx>
 #include <svl/visitem.hxx>
 #include <svl/whiter.hxx>
 #include <svx/svdundo.hxx>
diff --git a/basctl/source/basicide/basides1.cxx b/basctl/source/basicide/basides1.cxx
index d614dfc560ce..ff7224ac6cb0 100644
--- a/basctl/source/basicide/basides1.cxx
+++ b/basctl/source/basicide/basides1.cxx
@@ -18,11 +18,14 @@
  */
 
 #include <memory>
+#include <iderid.hxx>
 #include <strings.hrc>
 #include <helpids.h>
 
 #include "baside2.hxx"
 #include <baside3.hxx>
+#include <basidesh.hxx>
+#include <basobj.hxx>
 #include <docsignature.hxx>
 #include <iderdll.hxx>
 #include "iderdll2.hxx"
@@ -30,7 +33,6 @@
 #include <managelang.hxx>
 
 #include <basic/basmgr.hxx>
-#include <basic/sbmeth.hxx>
 #include <com/sun/star/script/ModuleType.hpp>
 #include <com/sun/star/script/XLibraryContainerPassword.hpp>
 #include <com/sun/star/script/XLibraryContainer2.hpp>
@@ -38,20 +40,18 @@
 #include <svl/srchdefs.hxx>
 #include <sal/log.hxx>
 #include <osl/diagnose.h>
+#include <sfx2/bindings.hxx>
 #include <sfx2/childwin.hxx>
-#include <sfx2/docfac.hxx>
 #include <sfx2/dinfdlg.hxx>
-#include <sfx2/dispatch.hxx>
 #include <sfx2/minfitem.hxx>
-#include <sfx2/printer.hxx>
 #include <sfx2/request.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <svx/svxids.hrc>
-#include <svl/aeitem.hxx>
+#include <svl/eitem.hxx>
 #include <svl/intitem.hxx>
 #include <svl/visitem.hxx>
 #include <svl/whiter.hxx>
-#include <vcl/xtextedt.hxx>
+#include <vcl/texteng.hxx>
 #include <vcl/textview.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/weld.hxx>
diff --git a/basctl/source/basicide/basides2.cxx b/basctl/source/basicide/basides2.cxx
index 675ff8d5c093..4c3e8505cab4 100644
--- a/basctl/source/basicide/basides2.cxx
+++ b/basctl/source/basicide/basides2.cxx
@@ -23,15 +23,15 @@
 
 #include <com/sun/star/frame/XTitle.hpp>
 
+#include <iderid.hxx>
 #include <strings.hrc>
 #include "baside2.hxx"
 #include "basdoc.hxx"
-#include <vcl/xtextedt.hxx>
+#include <basidesh.hxx>
+#include <vcl/texteng.hxx>
 #include <vcl/textview.hxx>
-#include <sfx2/dispatch.hxx>
 #include <sfx2/signaturestate.hxx>
 #include <sfx2/viewfrm.hxx>
-#include <com/sun/star/container/XNamed.hpp>
 
 namespace basctl
 {
diff --git a/basctl/source/basicide/basides3.cxx b/basctl/source/basicide/basides3.cxx
index dde84fc38c9c..fb827a5104cc 100644
--- a/basctl/source/basicide/basides3.cxx
+++ b/basctl/source/basicide/basides3.cxx
@@ -18,15 +18,15 @@
  */
 
 
-#include "baside2.hxx"
 #include <baside3.hxx>
+#include <basidesh.hxx>
 #include <localizationmgr.hxx>
 #include <dlgedview.hxx>
 #include <xmlscript/xmldlg_imexp.hxx>
-#include <sfx2/dispatch.hxx>
 #include <sfx2/request.hxx>
 #include <sfx2/sfxsids.hrc>
 #include <sfx2/viewfrm.hxx>
+#include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
 #include <comphelper/processfactory.hxx>
 #include <com/sun/star/uno/XComponentContext.hpp>
diff --git a/basctl/source/basicide/basidesh.cxx b/basctl/source/basicide/basidesh.cxx
index 6d9b75af2f8d..2c6f6424baa1 100644
--- a/basctl/source/basicide/basidesh.cxx
+++ b/basctl/source/basicide/basidesh.cxx
@@ -22,6 +22,7 @@
 #include <tools/diagnose_ex.h>
 #include <basic/basmgr.hxx>
 #include <svx/svxids.hrc>
+#include <iderid.hxx>
 #include <strings.hrc>
 #include "baside2.hxx"
 #include <baside3.hxx>
@@ -30,15 +31,16 @@
 #include <editeng/sizeitem.hxx>
 #include "iderdll2.hxx"
 #include <basidectrlr.hxx>
+#include <basidesh.hxx>
+#include <basobj.hxx>
 #include <localizationmgr.hxx>
 #include <sfx2/app.hxx>
+#include <sfx2/bindings.hxx>
 #include <sfx2/dinfdlg.hxx>
-#include <sfx2/dispatch.hxx>
 #include <sfx2/infobar.hxx>
 #include <sfx2/minfitem.hxx>
 #include <sfx2/objface.hxx>
 #include <sfx2/viewfrm.hxx>
-#include <svl/aeitem.hxx>
 #include <svl/srchitem.hxx>
 
 #ifdef DISABLE_DYNLOADING
diff --git a/basctl/source/basicide/basobj2.cxx b/basctl/source/basicide/basobj2.cxx
index 77e9afe9f795..b302c8b9493c 100644
--- a/basctl/source/basicide/basobj2.cxx
+++ b/basctl/source/basicide/basobj2.cxx
@@ -17,10 +17,12 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <basidesh.hxx>
 #include <iderdll.hxx>
 #include "iderdll2.hxx"
 #include "macrodlg.hxx"
 #include "moduldlg.hxx"
+#include <iderid.hxx>
 #include <strings.hrc>
 #include "baside2.hxx"
 
diff --git a/basctl/source/basicide/basobj3.cxx b/basctl/source/basicide/basobj3.cxx
index 0f7d8d525d01..ab8a36f85341 100644
--- a/basctl/source/basicide/basobj3.cxx
+++ b/basctl/source/basicide/basobj3.cxx
@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <vcl/errinf.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/weld.hxx>
 #include <basic/basmgr.hxx>
@@ -26,10 +27,12 @@
 #include <iderdll.hxx>
 #include "iderdll2.hxx"
 #include "basdoc.hxx"
+#include <iderid.hxx>
 #include <strings.hrc>
 
-#include "baside2.hxx"
 #include <baside3.hxx>
+#include <basidesh.hxx>
+#include <basobj.hxx>
 #include <localizationmgr.hxx>
 #include <dlged.hxx>
 #include <com/sun/star/script/XLibraryContainerPassword.hpp>
@@ -40,7 +43,7 @@
 #include <sfx2/viewfrm.hxx>
 #include <sal/log.hxx>
 #include <osl/diagnose.h>
-#include <svtools/ehdl.hxx>
+#include <tools/debug.hxx>
 
 namespace basctl
 {
diff --git a/basctl/source/basicide/bastype2.cxx b/basctl/source/basicide/bastype2.cxx
index feb45f3d4206..cb1b44f0dfa1 100644
--- a/basctl/source/basicide/bastype2.cxx
+++ b/basctl/source/basicide/bastype2.cxx
@@ -18,6 +18,7 @@
  */
 
 
+#include <basobj.hxx>
 #include <bastypes.hxx>
 #include <bastype2.hxx>
 #include <strings.hrc>
diff --git a/basctl/source/basicide/bastype3.cxx b/basctl/source/basicide/bastype3.cxx
index 8098925a6b67..fec708b6f7f0 100644
--- a/basctl/source/basicide/bastype3.cxx
+++ b/basctl/source/basicide/bastype3.cxx
@@ -19,13 +19,13 @@
 
 #include <basic/basmgr.hxx>
 #include <basic/sbmod.hxx>
+#include <basobj.hxx>
 #include <bastype2.hxx>
 #include <bitmaps.hlst>
 #include <bastypes.hxx>
 #include <com/sun/star/script/XLibraryContainer.hpp>
 #include <com/sun/star/script/XLibraryContainerPassword.hpp>
 #include <deque>
-#include <sfx2/docfac.hxx>
 #include <vcl/treelistentry.hxx>
 #include <osl/diagnose.h>
 #include <tools/debug.hxx>
diff --git a/basctl/source/basicide/bastypes.cxx b/basctl/source/basicide/bastypes.cxx
index 006c6b00bc22..e79452377198 100644
--- a/basctl/source/basicide/bastypes.cxx
+++ b/basctl/source/basicide/bastypes.cxx
@@ -19,13 +19,15 @@
 
 #include <strings.hrc>
 #include <helpids.h>
+#include <iderid.hxx>
 
 #include "baside2.hxx"
 #include <baside3.hxx>
+#include <basidesh.hxx>
+#include <basobj.hxx>
 #include <iderdll.hxx>
 #include "iderdll2.hxx"
 
-#include <basic/basmgr.hxx>
 #include <com/sun/star/script/XLibraryContainerPassword.hpp>
 #include <sal/log.hxx>
 #include <sfx2/dispatch.hxx>
diff --git a/basctl/source/basicide/brkdlg.cxx b/basctl/source/basicide/brkdlg.cxx
index 6839ff0e5a99..bba4f3c45f03 100644
--- a/basctl/source/basicide/brkdlg.cxx
+++ b/basctl/source/basicide/brkdlg.cxx
@@ -21,7 +21,7 @@
 
 #include "breakpoint.hxx"
 #include "brkdlg.hxx"
-#include <basidesh.hxx>
+#include <basobj.hxx>
 
 #include <sfx2/dispatch.hxx>
 #include <sfx2/sfxsids.hrc>
diff --git a/basctl/source/basicide/brkdlg.hxx b/basctl/source/basicide/brkdlg.hxx
index 43e6153b677b..c11f15c1ea98 100644
--- a/basctl/source/basicide/brkdlg.hxx
+++ b/basctl/source/basicide/brkdlg.hxx
@@ -21,6 +21,7 @@
 #define INCLUDED_BASCTL_SOURCE_BASICIDE_BRKDLG_HXX
 
 #include <vcl/weld.hxx>
+#include "breakpoint.hxx"
 
 namespace basctl
 {
diff --git a/basctl/source/basicide/iderdll.cxx b/basctl/source/basicide/iderdll.cxx
index 4eedaa6e17cf..cdcfdf24c1a8 100644
--- a/basctl/source/basicide/iderdll.cxx
+++ b/basctl/source/basicide/iderdll.cxx
@@ -25,16 +25,14 @@
 #include "iderdll2.hxx"
 #include <iderid.hxx>
 #include <basidesh.hxx>
-#include <strings.hrc>
+#include <basobj.hxx>
 #include "basdoc.hxx"
 #include "basicmod.hxx"
 
-#include <svl/srchitem.hxx>
-#include <svx/svxids.hrc>
+#include <basic/sbstar.hxx>
 #include <com/sun/star/frame/Desktop.hpp>
 #include <com/sun/star/script/XLibraryContainerPassword.hpp>
 #include <unotools/resmgr.hxx>
-#include <vcl/settings.hxx>
 #include <sfx2/app.hxx>
 #include <osl/diagnose.h>
 
diff --git a/basctl/source/basicide/iderdll2.hxx b/basctl/source/basicide/iderdll2.hxx
index 0e1bff2be5e4..975811c769c3 100644
--- a/basctl/source/basicide/iderdll2.hxx
+++ b/basctl/source/basicide/iderdll2.hxx
@@ -27,8 +27,6 @@ class SvxSearchItem;
 #include <bastypes.hxx>
 #include <bastype2.hxx>
 
-#include <memory>
-
 namespace basctl
 {
 
diff --git a/basctl/source/basicide/linenumberwindow.hxx b/basctl/source/basicide/linenumberwindow.hxx
index e97dedb3822a..38cf6788fa7b 100644
--- a/basctl/source/basicide/linenumberwindow.hxx
+++ b/basctl/source/basicide/linenumberwindow.hxx
@@ -11,6 +11,8 @@
 #define INCLUDED_BASCTL_SOURCE_BASICIDE_LINENUMBERWINDOW_HXX
 
 
+#include <vcl/window.hxx>
+
 namespace basctl
 {
 
diff --git a/basctl/source/basicide/localizationmgr.cxx b/basctl/source/basicide/localizationmgr.cxx
index db4e8c296b7f..718682cb232b 100644
--- a/basctl/source/basicide/localizationmgr.cxx
+++ b/basctl/source/basicide/localizationmgr.cxx
@@ -21,6 +21,7 @@
 
 #include <basidesh.hxx>
 #include <baside3.hxx>
+#include <basobj.hxx>
 #include <iderdll.hxx>
 #include <dlged.hxx>
 #include <managelang.hxx>
@@ -28,7 +29,7 @@
 #include <com/sun/star/frame/XLayoutManager.hpp>
 #include <com/sun/star/resource/MissingResourceException.hpp>
 #include <com/sun/star/resource/XStringResourceSupplier.hpp>
-#include <sfx2/dispatch.hxx>
+#include <sfx2/bindings.hxx>
 #include <sfx2/sfxsids.hrc>
 #include <sfx2/viewfrm.hxx>
 #include <tools/debug.hxx>
diff --git a/basctl/source/basicide/macrodlg.cxx b/basctl/source/basicide/macrodlg.cxx
index 98c6e2fffed6..0fcc033ca827 100644
--- a/basctl/source/basicide/macrodlg.cxx
+++ b/basctl/source/basicide/macrodlg.cxx
@@ -21,6 +21,7 @@
 #include "macrodlg.hxx"
 #include <basidesh.hxx>
 #include <strings.hrc>
+#include <iderid.hxx>
 
 #include <iderdll.hxx>
 #include "iderdll2.hxx"
diff --git a/basctl/source/basicide/macrodlg.hxx b/basctl/source/basicide/macrodlg.hxx
index 58410363fb63..0d239477206a 100644
--- a/basctl/source/basicide/macrodlg.hxx
+++ b/basctl/source/basicide/macrodlg.hxx
@@ -19,6 +19,7 @@
 
 #pragma once
 
+#include <basobj.hxx>
 #include <bastype2.hxx>
 #include <sfx2/basedlgs.hxx>
 #include <com/sun/star/frame/XFrame.hpp>
diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx
index 48bbe0838f37..38e07178d33d 100644
--- a/basctl/source/basicide/moduldl2.cxx
+++ b/basctl/source/basicide/moduldl2.cxx
@@ -24,16 +24,18 @@
 #include <bitmaps.hlst>
 #include <iderdll.hxx>
 #include "iderdll2.hxx"
+#include <iderid.hxx>
+#include <basobj.hxx>
 #include <svx/passwd.hxx>
 #include <ucbhelper/content.hxx>
 #include <rtl/uri.hxx>
 #include <sfx2/app.hxx>
-#include <sfx2/dinfdlg.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/filedlghelper.hxx>
 #include <sfx2/request.hxx>
 #include <sfx2/sfxsids.hrc>
 #include <sfx2/viewfrm.hxx>
+#include <svl/stritem.hxx>
 #include <tools/debug.hxx>
 #include <tools/urlobj.hxx>
 #include <tools/diagnose_ex.h>
@@ -41,7 +43,7 @@
 #include <vcl/weld.hxx>
 
 #include <com/sun/star/io/Pipe.hpp>
-#include <com/sun/star/ui/dialogs/FilePicker.hpp>
+#include <com/sun/star/ui/dialogs/XFilePicker3.hpp>
 #include <com/sun/star/ui/dialogs/FolderPicker.hpp>
 #include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
 #include <com/sun/star/script/DocumentScriptLibraryContainer.hpp>
diff --git a/basctl/source/basicide/moduldlg.cxx b/basctl/source/basicide/moduldlg.cxx
index 02259ed4314b..960e12e4fea7 100644
--- a/basctl/source/basicide/moduldlg.cxx
+++ b/basctl/source/basicide/moduldlg.cxx
@@ -20,11 +20,13 @@
 #include <sal/config.h>
 
 #include <strings.hrc>
+#include <iderid.hxx>
 #include <bitmaps.hlst>
 
 #include "moduldlg.hxx"
 #include <localizationmgr.hxx>
 #include <basidesh.hxx>
+#include <basobj.hxx>
 
 #include <basic/basmgr.hxx>
 #include <com/sun/star/script/XLibraryContainerPassword.hpp>
diff --git a/basctl/source/basicide/scriptdocument.cxx b/basctl/source/basicide/scriptdocument.cxx
index 3d5e5822180b..25a705cf69df 100644
--- a/basctl/source/basicide/scriptdocument.cxx
+++ b/basctl/source/basicide/scriptdocument.cxx
@@ -29,7 +29,6 @@
 #include <com/sun/star/ucb/ContentCreationException.hpp>
 #include <com/sun/star/uri/UriReferenceFactory.hpp>
 #include <com/sun/star/util/theMacroExpander.hpp>
-#include <com/sun/star/document/MacroExecMode.hpp>
 #include <com/sun/star/frame/XStorable.hpp>
 #include <com/sun/star/frame/FrameSearchFlag.hpp>
 #include <com/sun/star/frame/XDispatchProvider.hpp>
@@ -51,9 +50,6 @@
 #include <xmlscript/xmldlg_imexp.hxx>
 
 #include <i18nlangtag/languagetag.hxx>
-#include <unotools/syslocale.hxx>
-
-#include <unotools/collatorwrapper.hxx>
 
 #include <tools/diagnose_ex.h>
 #include <tools/debug.hxx>
@@ -66,7 +62,6 @@
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 
-#include <sal/log.hxx>
 #include <osl/file.hxx>
 #include <rtl/uri.hxx>
 #include <set>
diff --git a/basctl/source/dlged/dlged.cxx b/basctl/source/dlged/dlged.cxx
index 9d276a92ff7b..7310ed31bee6 100644
--- a/basctl/source/dlged/dlged.cxx
+++ b/basctl/source/dlged/dlged.cxx
@@ -18,7 +18,6 @@
  */
 
 
-#include <basidesh.hxx>
 #include <dlged.hxx>
 #include <dlgedclip.hxx>
 #include <dlgeddef.hxx>
@@ -28,23 +27,19 @@
 #include <dlgedobj.hxx>
 #include <dlgedpage.hxx>
 #include <dlgedview.hxx>
-#include <iderdll.hxx>
 #include <localizationmgr.hxx>
 #include <baside3.hxx>
 
 #include <com/sun/star/awt/Toolkit.hpp>
 #include <com/sun/star/awt/UnoControlDialog.hpp>
-#include <com/sun/star/awt/XDialog.hpp>
 #include <com/sun/star/resource/StringResource.hpp>
 #include <com/sun/star/util/XCloneable.hpp>
 #include <com/sun/star/util/NumberFormatsSupplier.hpp>
 #include <comphelper/types.hxx>
 #include <comphelper/processfactory.hxx>
 #include <tools/debug.hxx>
-#include <sfx2/viewfrm.hxx>
 #include <svl/itempool.hxx>
 #include <svx/sdrpaintwindow.hxx>
-#include <svx/svxids.hrc>
 #include <svx/svdpagv.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <vcl/print.hxx>
diff --git a/basctl/source/dlged/dlgedfac.cxx b/basctl/source/dlged/dlgedfac.cxx
index ec003586e090..3063e7f29e00 100644
--- a/basctl/source/dlged/dlgedfac.cxx
+++ b/basctl/source/dlged/dlgedfac.cxx
@@ -21,7 +21,6 @@
 #include <dlgedobj.hxx>
 #include <dlgeddef.hxx>
 #include <com/sun/star/container/XNameContainer.hpp>
-#include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/awt/ScrollBarOrientation.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
diff --git a/basctl/source/dlged/dlgedview.cxx b/basctl/source/dlged/dlgedview.cxx
index c098cb0c1cc0..3eda45a289d1 100644
--- a/basctl/source/dlged/dlgedview.cxx
+++ b/basctl/source/dlged/dlgedview.cxx
@@ -21,12 +21,9 @@
 #include <dlged.hxx>
 #include <dlgedpage.hxx>
 
-#include <svx/svxids.hrc>
-#include <sfx2/viewfrm.hxx>
 #include <vcl/canvastools.hxx>
+#include <vcl/scrbar.hxx>
 
-#include <basidesh.hxx>
-#include <iderdll.hxx>
 #include <dlgedobj.hxx>
 
 namespace basctl
diff --git a/basctl/source/dlged/managelang.cxx b/basctl/source/dlged/managelang.cxx
index 193dce11dd68..1c2e1093ad56 100644
--- a/basctl/source/dlged/managelang.cxx
+++ b/basctl/source/dlged/managelang.cxx
@@ -26,16 +26,11 @@
 
 #include <strings.hrc>
 
-#include <com/sun/star/i18n/Boundary.hpp>
-#include <com/sun/star/i18n/WordType.hpp>
-#include <com/sun/star/i18n/XBreakIterator.hpp>
 #include <comphelper/sequence.hxx>
-#include <editeng/unolingu.hxx>
 #include <sfx2/bindings.hxx>
 #include <sfx2/sfxsids.hrc>
 #include <svtools/langtab.hxx>
 #include <svx/langbox.hxx>
-#include <vcl/unohelp.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/weld.hxx>
 #include <vcl/settings.hxx>
diff --git a/basctl/source/dlged/propbrw.cxx b/basctl/source/dlged/propbrw.cxx
index 2f7ff78ab52b..8b8775dddaa3 100644
--- a/basctl/source/dlged/propbrw.cxx
+++ b/basctl/source/dlged/propbrw.cxx
@@ -26,9 +26,7 @@
 #include <strings.hrc>
 
 #include <strings.hxx>
-#include <svx/svxids.hrc>
 
-#include <com/sun/star/awt/PosSize.hpp>
 #include <com/sun/star/frame/Frame.hpp>
 #include <com/sun/star/inspection/XObjectInspector.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
diff --git a/basctl/source/inc/IDEComboBox.hxx b/basctl/source/inc/IDEComboBox.hxx
index 0afc4fe60c34..5f09bfd8a212 100644
--- a/basctl/source/inc/IDEComboBox.hxx
+++ b/basctl/source/inc/IDEComboBox.hxx
@@ -24,6 +24,9 @@
 #include <sfx2/tbxctrl.hxx>
 #include <vcl/lstbox.hxx>
 
+#include "doceventnotifier.hxx"
+#include "scriptdocument.hxx"
+
 namespace basctl
 {
 /*!
diff --git a/basctl/source/inc/baside3.hxx b/basctl/source/inc/baside3.hxx
index e955b6b71430..838e94a9ef19 100644
--- a/basctl/source/inc/baside3.hxx
+++ b/basctl/source/inc/baside3.hxx
@@ -20,6 +20,7 @@
 #ifndef INCLUDED_BASCTL_SOURCE_INC_BASIDE3_HXX
 #define INCLUDED_BASCTL_SOURCE_INC_BASIDE3_HXX
 
+#include "dlged.hxx"
 #include "layout.hxx"
 #include "bastypes.hxx"
 #include "propbrw.hxx"
diff --git a/basctl/source/inc/basobj.hxx b/basctl/source/inc/basobj.hxx
index d31d2e9fd070..3ff513a48ac8 100644
--- a/basctl/source/inc/basobj.hxx
+++ b/basctl/source/inc/basobj.hxx
@@ -21,8 +21,6 @@
 
 #include "scriptdocument.hxx"
 
-#include <svl/lstner.hxx>
-
 class SbMethod;
 class SbModule;
 class SbxVariable;
diff --git a/basctl/source/inc/bastype2.hxx b/basctl/source/inc/bastype2.hxx
index d6abc4414453..720d3156ac00 100644
--- a/basctl/source/inc/bastype2.hxx
+++ b/basctl/source/inc/bastype2.hxx
@@ -28,9 +28,7 @@
 
 #include <vcl/treelistbox.hxx>
 #include <vcl/weld.hxx>
-#include <basic/sbstar.hxx>
 #include "sbxitem.hxx"
-#include "basobj.hxx"
 #include <o3tl/typed_flags_set.hxx>
 
 class SbModule;
diff --git a/basctl/source/inc/bastypes.hxx b/basctl/source/inc/bastypes.hxx
index 8ac2a4b3a9b1..fcebade1d7af 100644
--- a/basctl/source/inc/bastypes.hxx
+++ b/basctl/source/inc/bastypes.hxx
@@ -22,10 +22,9 @@
 #include "scriptdocument.hxx"
 
 #include "sbxitem.hxx"
-#include "iderid.hxx"
 #include <svtools/tabbar.hxx>
-#include <vcl/toolbox.hxx>
 #include <basic/sbdef.hxx>
+#include <vcl/dockwin.hxx>
 
 #include <unordered_map>
 
diff --git a/basctl/source/inc/dlgeddef.hxx b/basctl/source/inc/dlgeddef.hxx
index 1aa627abddff..0c81b1402d0b 100644
--- a/basctl/source/inc/dlgeddef.hxx
+++ b/basctl/source/inc/dlgeddef.hxx
@@ -20,8 +20,6 @@
 #ifndef INCLUDED_BASCTL_SOURCE_INC_DLGEDDEF_HXX
 #define INCLUDED_BASCTL_SOURCE_INC_DLGEDDEF_HXX
 
-#include <sal/types.h>
-
 namespace basctl
 {
 
diff --git a/basctl/source/inc/dlgedfunc.hxx b/basctl/source/inc/dlgedfunc.hxx
index 063f2f269222..1d6e9efe6526 100644
--- a/basctl/source/inc/dlgedfunc.hxx
+++ b/basctl/source/inc/dlgedfunc.hxx
@@ -20,6 +20,11 @@
 #ifndef INCLUDED_BASCTL_SOURCE_INC_DLGEDFUNC_HXX
 #define INCLUDED_BASCTL_SOURCE_INC_DLGEDFUNC_HXX
 
+#include <vcl/event.hxx>
+#include <vcl/timer.hxx>
+#include <tools/link.hxx>
+#include <tools/gen.hxx>
+
 namespace basctl
 {
 
diff --git a/basctl/source/inc/layout.hxx b/basctl/source/inc/layout.hxx
index 9618f3c6bd8e..0857ccb82849 100644
--- a/basctl/source/inc/layout.hxx
+++ b/basctl/source/inc/layout.hxx
@@ -20,6 +20,7 @@
 #ifndef INCLUDED_BASCTL_SOURCE_INC_LAYOUT_HXX
 #define INCLUDED_BASCTL_SOURCE_INC_LAYOUT_HXX
 
+#include "bastypes.hxx"
 #include <vcl/split.hxx>
 #include <vcl/vclptr.hxx>