8 files changed, 11 insertions, 7 deletions
diff --git a/basctl/IwyuFilter_basctl.yaml b/basctl/IwyuFilter_basctl.yaml
index a4275b943e48..f72d7e7b7ee2 100644
--- a/basctl/IwyuFilter_basctl.yaml
+++ b/basctl/IwyuFilter_basctl.yaml
@@ -1,6 +1,11 @@
 ---
 assumeFilename: basctl/source/basicide/baside2b.cxx
 excludelist:
+    basctl/sdi/basslots.hrc:
+    # Needed for basctl/sdi/basslots.sdi
+    - svx/svxids.hrc
+    - svx/unomid.hxx
+    - editeng/memberids.h
     basctl/source/basicide/basidesh.cxx:
     # Needed for TypedWhichId defines is basslots.hxx
     - sfx2/dinfdlg.hxx
diff --git a/basctl/inc/strings.hxx b/basctl/inc/strings.hxx
index 335eecb0bf00..597092e8c3e2 100644
--- a/basctl/inc/strings.hxx
+++ b/basctl/inc/strings.hxx
@@ -9,6 +9,8 @@
 
 #pragma once
 
+#include <rtl/ustring.hxx>
+
 // Dialog Controls ---------------------------------------------------------------
 
 inline constexpr OUStringLiteral RID_STR_CLASS_CONTROL = u"Control";
diff --git a/basctl/source/basicide/baside2.cxx b/basctl/source/basicide/baside2.cxx
index c7f99e8b8e03..52769276bacb 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -38,7 +38,7 @@
 #include <com/sun/star/script/ModuleType.hpp>
 #include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp>
 #include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
-#include <com/sun/star/ui/dialogs/FilePicker.hpp>
+#include <com/sun/star/ui/dialogs/XFilePicker3.hpp>
 #include <com/sun/star/ui/dialogs/XFilePickerControlAccess.hpp>
 #include <comphelper/SetFlagContextHelper.hxx>
 #include <comphelper/string.hxx>
diff --git a/basctl/source/basicide/baside3.cxx b/basctl/source/basicide/baside3.cxx
index 91ac35a4bbc0..6e20187055c9 100644
--- a/basctl/source/basicide/baside3.cxx
+++ b/basctl/source/basicide/baside3.cxx
@@ -39,7 +39,7 @@
 #include <com/sun/star/ucb/SimpleFileAccess.hpp>
 #include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp>
 #include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
-#include <com/sun/star/ui/dialogs/FilePicker.hpp>
+#include <com/sun/star/ui/dialogs/XFilePicker3.hpp>
 #include <com/sun/star/ui/dialogs/XFilePickerControlAccess.hpp>
 #include <comphelper/processfactory.hxx>
 #include <sfx2/dispatch.hxx>
diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx
index 7786ab408de4..2515cace9800 100644
--- a/basctl/source/basicide/moduldl2.cxx
+++ b/basctl/source/basicide/moduldl2.cxx
@@ -44,7 +44,7 @@
 
 #include <com/sun/star/io/Pipe.hpp>
 #include <com/sun/star/ui/dialogs/XFilePicker3.hpp>
-#include <com/sun/star/ui/dialogs/FolderPicker.hpp>
+#include <com/sun/star/ui/dialogs/XFolderPicker2.hpp>
 #include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
 #include <com/sun/star/script/DocumentScriptLibraryContainer.hpp>
 #include <com/sun/star/script/DocumentDialogLibraryContainer.hpp>
@@ -65,7 +65,6 @@
 #include <cppuhelper/implbase.hxx>
 
 #include <cassert>
-#include <string_view>
 
 namespace basctl
 {
diff --git a/basctl/source/basicide/moduldlg.hxx b/basctl/source/basicide/moduldlg.hxx
index 63be9953a290..7dadebcc9ebb 100644
--- a/basctl/source/basicide/moduldlg.hxx
+++ b/basctl/source/basicide/moduldlg.hxx
@@ -24,7 +24,6 @@
 #include <string_view>
 
 #include <bastype2.hxx>
-#include <tools/solar.h>
 #include <vcl/weld.hxx>
 #include <com/sun/star/task/XInteractionHandler.hpp>
 
diff --git a/basctl/source/inc/dlgeddef.hxx b/basctl/source/inc/dlgeddef.hxx
index 511575a4b9ee..ffb726b21bfc 100644
--- a/basctl/source/inc/dlgeddef.hxx
+++ b/basctl/source/inc/dlgeddef.hxx
@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include <svx/svdobjkind.hxx>
+#include <rtl/ustring.hxx>
 
 namespace basctl
 {
diff --git a/basctl/source/inc/docsignature.hxx b/basctl/source/inc/docsignature.hxx
index 94e7db2224dd..9dd66da678b8 100644
--- a/basctl/source/inc/docsignature.hxx
+++ b/basctl/source/inc/docsignature.hxx
@@ -20,7 +20,6 @@
 
 #include <sfx2/signaturestate.hxx>
 #include <vcl/weld.hxx>
-#include <memory>
 
 class SfxObjectShell;