diff --git a/extensions/source/abpilot/abspilot.cxx b/extensions/source/abpilot/abspilot.cxx
index e7d929a8dd98..865252a38fc3 100644
--- a/extensions/source/abpilot/abspilot.cxx
+++ b/extensions/source/abpilot/abspilot.cxx
@@ -27,7 +27,6 @@
 #include "tableselectionpage.hxx"
 #include <vcl/settings.hxx>
 #include <vcl/svapp.hxx>
-#include <vcl/waitobj.hxx>
 #include <vcl/weld.hxx>
 #include <osl/diagnose.h>
 #include "abpfinalpage.hxx"
diff --git a/extensions/source/abpilot/admininvokationimpl.cxx b/extensions/source/abpilot/admininvokationimpl.cxx
index 6243acce482a..3abb4c836a5d 100644
--- a/extensions/source/abpilot/admininvokationimpl.cxx
+++ b/extensions/source/abpilot/admininvokationimpl.cxx
@@ -24,15 +24,12 @@
 #include <com/sun/star/awt/XWindow.hpp>
 #include <com/sun/star/sdbc/DriverManager.hpp>
 #include <comphelper/propertysequence.hxx>
-#include <vcl/stdtext.hxx>
-#include <toolkit/helper/vclunohelper.hxx>
 #include <strings.hrc>
 #include <componentmodule.hxx>
+#include <vcl/stdtext.hxx>
 #include <vcl/weld.hxx>
-#include <vcl/waitobj.hxx>
 #include <osl/diagnose.h>
 
-
 namespace abp
 {
 
diff --git a/extensions/source/dbpilots/commonpagesdbp.cxx b/extensions/source/dbpilots/commonpagesdbp.cxx
index 37d9fd53acb8..fdd5c727e583 100644
--- a/extensions/source/dbpilots/commonpagesdbp.cxx
+++ b/extensions/source/dbpilots/commonpagesdbp.cxx
@@ -34,8 +34,6 @@
 #include <comphelper/interaction.hxx>
 #include <connectivity/dbtools.hxx>
 #include <vcl/stdtext.hxx>
-#include <vcl/waitobj.hxx>
-#include <vcl/layout.hxx>
 #include <sfx2/docfilt.hxx>
 #include <unotools/pathoptions.hxx>
 #include <sfx2/filedlghelper.hxx>
@@ -190,7 +188,7 @@ namespace dbp
     {
         ::sfx2::FileDialogHelper aFileDlg(
                 ui::dialogs::TemplateDescription::FILEOPEN_READONLY_VERSION,
-                FileDialogFlags::NONE, GetFrameWeld());
+                FileDialogFlags::NONE, getDialog()->getDialog());
         aFileDlg.SetDisplayDirectory( SvtPathOptions().GetWorkPath() );
 
         std::shared_ptr<const SfxFilter> pFilter = SfxFilter::GetFilterByName("StarOffice XML (Base)");
@@ -242,7 +240,7 @@ namespace dbp
     {
         m_xTable->clear();
 
-        WaitObject aWaitCursor(this);
+        weld::WaitObject aWaitCursor(getDialog()->getDialog());
 
         // will be the table tables of the selected data source
         Sequence< OUString > aTableNames;
@@ -273,7 +271,7 @@ namespace dbp
                     if (m_xDSContext->getByName(sCurrentDatasource) >>= xDatasource)
                     {   // connect
                         // get the default SDB interaction handler
-                        Reference< XInteractionHandler > xHandler = getDialog()->getInteractionHandler(GetFrameWeld());
+                        Reference< XInteractionHandler > xHandler = getDialog()->getInteractionHandler(getDialog()->getDialog());
                         if (!xHandler.is() )
                             return;
                         xConn = xDatasource->connectWithCompletion(xHandler);
@@ -333,7 +331,7 @@ namespace dbp
             try
             {
                 // get the default SDB interaction handler
-                Reference< XInteractionHandler > xHandler = getDialog()->getInteractionHandler(GetFrameWeld());
+                Reference< XInteractionHandler > xHandler = getDialog()->getInteractionHandler(getDialog()->getDialog());
                 if ( xHandler.is() )
                     xHandler->handle(xRequest);
             }
diff --git a/extensions/source/dbpilots/controlwizard.cxx b/extensions/source/dbpilots/controlwizard.cxx
index c21e6240ab8a..a5570ca49cbf 100644
--- a/extensions/source/dbpilots/controlwizard.cxx
+++ b/extensions/source/dbpilots/controlwizard.cxx
@@ -41,7 +41,6 @@
 #include <connectivity/conncleanup.hxx>
 #include <com/sun/star/sdbc/DataType.hpp>
 #include <tools/urlobj.hxx>
-#include <vcl/layout.hxx>
 #include <osl/diagnose.h>
 
 #define WINDOW_SIZE_X   240
diff --git a/extensions/source/propctrlr/formlinkdialog.cxx b/extensions/source/propctrlr/formlinkdialog.cxx
index 6f49294439fe..746b7e50a139 100644
--- a/extensions/source/propctrlr/formlinkdialog.cxx
+++ b/extensions/source/propctrlr/formlinkdialog.cxx
@@ -25,10 +25,8 @@
 #include "formstrings.hxx"
 #include <sal/log.hxx>
 #include <vcl/svapp.hxx>
-#include <vcl/waitobj.hxx>
 #include <connectivity/dbtools.hxx>
 #include <connectivity/dbexception.hxx>
-#include <toolkit/helper/vclunohelper.hxx>
 #include <comphelper/sequence.hxx>
 
 #include <com/sun/star/sdbcx/XColumnsSupplier.hpp>