[Libreoffice-commits] core.git: dbaccess/IwyuFilter_dbaccess.yaml dbaccess/source

Gabor Kelemen (via logerrit) logerrit at kemper.freedesktop.org
Mon Apr 20 12:57:43 UTC 2020 

 dbaccess/IwyuFilter_dbaccess.yaml                  |   43 +++++++++++++++++++++
 dbaccess/source/ui/app/AppController.cxx           |   22 +---------
 dbaccess/source/ui/app/AppControllerDnD.cxx        |   19 ---------
 dbaccess/source/ui/app/AppControllerGen.cxx        |   10 ----
 dbaccess/source/ui/app/AppDetailPageHelper.cxx     |   12 -----
 dbaccess/source/ui/app/AppDetailView.cxx           |    4 -
 dbaccess/source/ui/app/AppIconControl.cxx          |    1 
 dbaccess/source/ui/app/AppSwapWindow.cxx           |    3 -
 dbaccess/source/ui/app/AppView.cxx                 |   15 -------
 dbaccess/source/ui/app/subcomponentmanager.cxx     |    1 
 dbaccess/source/ui/browser/brwctrlr.cxx            |   17 --------
 dbaccess/source/ui/browser/brwview.cxx             |    5 --
 dbaccess/source/ui/browser/dataview.cxx            |    2 
 dbaccess/source/ui/browser/dbexchange.cxx          |    1 
 dbaccess/source/ui/browser/dbtreeview.cxx          |    1 
 dbaccess/source/ui/browser/dsbrowserDnD.cxx        |    5 --
 dbaccess/source/ui/browser/exsrcbrw.cxx            |    3 -
 dbaccess/source/ui/browser/formadapter.cxx         |    3 -
 dbaccess/source/ui/browser/genericcontroller.cxx   |   12 -----
 dbaccess/source/ui/browser/sbagrid.cxx             |   28 -------------
 dbaccess/source/ui/browser/unodatbr.cxx            |   34 ----------------
 dbaccess/source/ui/control/ColumnControlWindow.cxx |    1 
 dbaccess/source/ui/control/FieldControls.cxx       |    2 
 dbaccess/source/ui/control/FieldDescControl.cxx    |    9 ----
 dbaccess/source/ui/control/RelationControl.cxx     |    2 
 dbaccess/source/ui/control/TableGrantCtrl.cxx      |    2 
 dbaccess/source/ui/control/curledit.cxx            |    3 -
 dbaccess/source/ui/control/dbtreelistbox.cxx       |    5 --
 dbaccess/source/ui/control/opendoccontrols.cxx     |    4 -
 dbaccess/source/ui/control/sqledit.cxx             |    3 -
 dbaccess/source/ui/control/tabletree.cxx           |    9 ----
 dbaccess/source/ui/dlg/CollectionView.cxx          |   11 -----
 dbaccess/source/ui/dlg/ConnectionHelper.cxx        |   17 --------
 dbaccess/source/ui/dlg/ConnectionPage.cxx          |   30 --------------
 dbaccess/source/ui/dlg/ConnectionPageSetup.cxx     |   27 -------------
 dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx  |   17 --------
 dbaccess/source/ui/dlg/DbAdminImpl.cxx             |    5 --
 dbaccess/source/ui/dlg/RelationDlg.cxx             |    7 ---
 dbaccess/source/ui/dlg/TablesSingleDlg.cxx         |    2 
 dbaccess/source/ui/dlg/TextConnectionHelper.cxx    |   23 -----------
 dbaccess/source/ui/dlg/UserAdmin.cxx               |    8 +--
 dbaccess/source/ui/dlg/UserAdminDlg.cxx            |   10 ----
 dbaccess/source/ui/dlg/admincontrols.cxx           |    1 
 dbaccess/source/ui/dlg/adminpages.cxx              |    7 ---
 dbaccess/source/ui/dlg/adtabdlg.cxx                |    9 ----
 dbaccess/source/ui/dlg/advancedsettings.cxx        |    1 
 dbaccess/source/ui/dlg/dbadmin.cxx                 |    2 
 dbaccess/source/ui/dlg/dbfindex.cxx                |    2 
 dbaccess/source/ui/dlg/dbwiz.cxx                   |    6 --
 dbaccess/source/ui/dlg/dbwizsetup.cxx              |   13 ------
 dbaccess/source/ui/dlg/detailpages.cxx             |    5 --
 dbaccess/source/ui/dlg/directsql.cxx               |    2 
 dbaccess/source/ui/dlg/dlgattr.cxx                 |    4 -
 dbaccess/source/ui/dlg/dlgsave.cxx                 |    4 -
 dbaccess/source/ui/dlg/dlgsize.cxx                 |    1 
 dbaccess/source/ui/dlg/dsselect.cxx                |   11 -----
 dbaccess/source/ui/dlg/generalpage.cxx             |    8 ---
 dbaccess/source/ui/dlg/indexdialog.cxx             |    4 -
 dbaccess/source/ui/dlg/indexfieldscontrol.cxx      |    2 
 dbaccess/source/ui/dlg/odbcconfig.cxx              |    1 
 dbaccess/source/ui/dlg/paramdialog.cxx             |    6 --
 dbaccess/source/ui/dlg/queryfilter.cxx             |    8 ---
 dbaccess/source/ui/dlg/queryorder.cxx              |    5 --
 dbaccess/source/ui/dlg/sqlmessage.cxx              |    4 -
 dbaccess/source/ui/dlg/tablespage.cxx              |   15 -------
 65 files changed, 70 insertions(+), 489 deletions(-)

New commits:
commit 644db9df9ccce3d10c92ff365d0ac2e1b1fa33de
Author:     Gabor Kelemen <kelemen.gabor2 at nisz.hu>
AuthorDate: Fri Apr 17 10:05:22 2020 +0200
Commit:     Miklos Vajna <vmiklos at collabora.com>
CommitDate: Mon Apr 20 14:56:58 2020 +0200

    tdf#42949 Fix IWYU warnings in dbaccess/source/ui/[a-d]*/*cxx
    
    Found with bin/find-unneeded-includes
    Only removal proposals are dealt with here.
    
    Change-Id: Ifd96569ecdbbcde3c7fc9462a29e42386d1ae3a3
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92401
    Tested-by: Jenkins
    Reviewed-by: Miklos Vajna <vmiklos at collabora.com>

diff --git a/dbaccess/IwyuFilter_dbaccess.yaml b/dbaccess/IwyuFilter_dbaccess.yaml
index cfd5466d4aee..aa5e9a4683c8 100644
--- a/dbaccess/IwyuFilter_dbaccess.yaml
+++ b/dbaccess/IwyuFilter_dbaccess.yaml
@@ -82,3 +82,46 @@ blacklist:
     dbaccess/source/shared/dbu_reghelper.cxx:
     # Needed for weird included cxx file
     - comphelper/sequence.hxx
+    dbaccess/source/ui/app/AppDetailPageHelper.cxx:
+    # Actually used
+    - com/sun/star/sdbc/XConnection.hpp
+    dbaccess/source/ui/browser/brwview.cxx:
+    # Needed for direct member access
+    - com/sun/star/awt/XControlContainer.hpp
+    dbaccess/source/ui/browser/genericcontroller.cxx:
+    # Actually used
+    - com/sun/star/sdbc/XDataSource.hpp
+    - com/sun/star/ui/XSidebarProvider.hpp
+    dbaccess/source/ui/browser/sbagrid.cxx:
+    # Actually used
+    - com/sun/star/form/XForm.hpp
+    dbaccess/source/ui/control/TableGrantCtrl.cxx:
+    # Actually used
+    - com/sun/star/sdbcx/XTablesSupplier.hpp
+    dbaccess/source/ui/control/RelationControl.cxx:
+    # Actually used
+    - com/sun/star/awt/XWindow.hpp
+    dbaccess/source/ui/dlg/ConnectionHelper.cxx:
+    # Actually used
+    - com/sun/star/awt/XSystemDependentWindowPeer.hpp
+    - com/sun/star/lang/SystemDependent.hpp
+    dbaccess/source/ui/dlg/DbAdminImpl.cxx:
+    # Actually used
+    - com/sun/star/sdbc/XDriver.hpp
+    dbaccess/source/ui/dlg/dbfindex.cxx:
+    # Keep for osl_getThreadTextEncoding
+    - osl/thread.hxx
+    dbaccess/source/ui/dlg/odbcconfig.cxx:
+    # Needed for HAVE_ODBC_ADMINISTRATION on WIN32
+    - config_folders.h
+    - rtl/bootstrap.hxx
+    - osl/process.h
+    - osl/thread.hxx
+    - vcl/svapp.hxx
+    # Needed for platform-specific odbc headers
+    - connectivity/odbc.hxx
+    dbaccess/source/ui/dlg/queryfilter.cxx:
+    # Actually used
+    - com/sun/star/sdb/XSingleSelectQueryComposer.hpp
+    - com/sun/star/container/XNameAccess.hpp
+    - com/sun/star/sdbc/XConnection.hpp
diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx
index f2ae1614eff0..402880eedb0c 100644
--- a/dbaccess/source/ui/app/AppController.cxx
+++ b/dbaccess/source/ui/app/AppController.cxx
@@ -20,7 +20,6 @@
 #include <memory>
 #include "AppController.hxx"
 #include <core_resource.hxx>
-#include <stringconstants.hxx>
 #include <strings.hxx>
 #include <advancedsettingsdlg.hxx>
 #include "subcomponentmanager.hxx"
@@ -32,14 +31,12 @@
 #include <com/sun/star/container/XContentEnumerationAccess.hpp>
 #include <com/sun/star/container/XHierarchicalNameAccess.hpp>
 #include <com/sun/star/container/XHierarchicalNameContainer.hpp>
-#include <com/sun/star/container/XNameContainer.hpp>
 #include <com/sun/star/frame/XStorable.hpp>
 #include <com/sun/star/sdb/CommandType.hpp>
 #include <com/sun/star/sdb/ErrorMessageDialog.hpp>
-#include <com/sun/star/sdb/SQLContext.hpp>
-#include <com/sun/star/sdb/XBookmarksSupplier.hpp>
 #include <com/sun/star/sdb/XOfficeDatabaseDocument.hpp>
-#include <com/sun/star/sdb/XQueryDefinitionsSupplier.hpp>
+#include <com/sun/star/sdbc/SQLException.hpp>
+#include <com/sun/star/sdbc/SQLWarning.hpp>
 #include <com/sun/star/sdbc/XDataSource.hpp>
 #include <com/sun/star/sdbcx/XAlterView.hpp>
 #include <com/sun/star/sdbcx/XAppend.hpp>
@@ -47,30 +44,25 @@
 #include <com/sun/star/sdbcx/XTablesSupplier.hpp>
 #include <com/sun/star/sdbcx/XViewsSupplier.hpp>
 #include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
-#include <com/sun/star/uno/XNamingService.hpp>
 #include <com/sun/star/util/XFlushable.hpp>
 #include <com/sun/star/util/XModifiable.hpp>
 #include <com/sun/star/util/XModifyBroadcaster.hpp>
-#include <com/sun/star/util/XNumberFormatter.hpp>
 #include <com/sun/star/util/XURLTransformer.hpp>
 #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
 #include <com/sun/star/document/XEmbeddedScripts.hpp>
 #include <com/sun/star/frame/XModel2.hpp>
-#include <com/sun/star/awt/XTopWindow.hpp>
 #include <com/sun/star/task/XInteractionHandler.hpp>
 #include <com/sun/star/sdb/application/DatabaseObject.hpp>
 #include <com/sun/star/sdb/application/DatabaseObjectContainer.hpp>
 #include <com/sun/star/document/XDocumentEventBroadcaster.hpp>
-#include <com/sun/star/container/XHierarchicalName.hpp>
 #include <tools/diagnose_ex.h>
+#include <tools/urlobj.hxx>
 #include <osl/diagnose.h>
 
-#include <svl/urihelper.hxx>
 #include <svl/filenotation.hxx>
 #include <vcl/treelistbox.hxx>
 #include <vcl/transfer.hxx>
 #include <svtools/cliplistener.hxx>
-#include <svtools/insdlg.hxx>
 
 #include <comphelper/sequence.hxx>
 #include <comphelper/uno3.hxx>
@@ -78,14 +70,11 @@
 #include <comphelper/interaction.hxx>
 #include <comphelper/processfactory.hxx>
 
-#include <vcl/stdtext.hxx>
 #include <vcl/svapp.hxx>
-#include <vcl/menu.hxx>
 #include <vcl/weld.hxx>
 
 #include <unotools/closeveto.hxx>
 #include <unotools/pathoptions.hxx>
-#include <unotools/tempfile.hxx>
 #include <unotools/moduleoptions.hxx>
 #include <unotools/historyoptions.hxx>
 
@@ -94,7 +83,6 @@
 #include <sfx2/docfilt.hxx>
 #include <sfx2/QuerySaveDocument.hxx>
 
-#include <cppuhelper/typeprovider.hxx>
 #include <cppuhelper/exc_hlp.hxx>
 
 #include <connectivity/dbtools.hxx>
@@ -111,17 +99,13 @@
 #include <strings.hrc>
 #include <defaultobjectnamecheck.hxx>
 #include <databaseobjectview.hxx>
-#include <listviewitems.hxx>
 #include "AppDetailView.hxx"
 #include <linkeddocuments.hxx>
-#include <sqlmessage.hxx>
 #include <UITools.hxx>
 #include <dsntypes.hxx>
 #include <dlgsave.hxx>
 #include <dbaccess_slotid.hrc>
 
-#include <functional>
-
 extern "C" void createRegistryInfo_ODBApplication()
 {
     static ::dbaui::OMultiInstanceAutoRegistration< ::dbaui::OApplicationController > aAutoRegistration;
diff --git a/dbaccess/source/ui/app/AppControllerDnD.cxx b/dbaccess/source/ui/app/AppControllerDnD.cxx
index 845945b9567f..98d622584494 100644
--- a/dbaccess/source/ui/app/AppControllerDnD.cxx
+++ b/dbaccess/source/ui/app/AppControllerDnD.cxx
@@ -21,47 +21,32 @@
 #include "AppController.hxx"
 #include <comphelper/property.hxx>
 #include <core_resource.hxx>
-#include <stringconstants.hxx>
 #include <strings.hxx>
 #include <com/sun/star/sdbcx/XDataDescriptorFactory.hpp>
 #include <com/sun/star/sdbcx/XAppend.hpp>
 #include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
-#include <com/sun/star/sdb/XSingleSelectQueryComposer.hpp>
 #include <com/sun/star/container/XNameContainer.hpp>
-#include <com/sun/star/uno/XNamingService.hpp>
-#include <com/sun/star/sdbc/XDataSource.hpp>
 #include <com/sun/star/frame/XStorable.hpp>
-#include <com/sun/star/container/XChild.hpp>
 #include <com/sun/star/container/XHierarchicalNameContainer.hpp>
-#include <com/sun/star/sdbc/DataType.hpp>
+#include <com/sun/star/lang/XSingleServiceFactory.hpp>
 #include <com/sun/star/sdb/CommandType.hpp>
-#include <com/sun/star/sdb/XBookmarksSupplier.hpp>
 #include <com/sun/star/sdb/SQLContext.hpp>
 #include <com/sun/star/sdbcx/XTablesSupplier.hpp>
 #include <com/sun/star/sdbcx/XViewsSupplier.hpp>
 #include <com/sun/star/sdb/XQueryDefinitionsSupplier.hpp>
 #include <com/sun/star/sdbcx/XDrop.hpp>
-#include <unotools/ucbhelper.hxx>
 #include <dlgsave.hxx>
 #include <vcl/weld.hxx>
-#include <cppuhelper/typeprovider.hxx>
 #include <cppuhelper/exc_hlp.hxx>
 #include <connectivity/dbexception.hxx>
-#include <rtl/ustrbuf.hxx>
 #include <sal/log.hxx>
 #include "AppView.hxx"
 #include <svx/dataaccessdescriptor.hxx>
 #include <svx/dbaobjectex.hxx>
-#include <browserids.hxx>
-#include <dbu_reghelper.hxx>
 #include <strings.hrc>
-#include <vcl/menu.hxx>
 #include <vcl/svapp.hxx>
-#include <listviewitems.hxx>
-#include "AppDetailView.hxx"
 #include <linkeddocuments.hxx>
 #include <connectivity/dbtools.hxx>
-#include <sqlmessage.hxx>
 #include <dbexchange.hxx>
 #include <UITools.hxx>
 #include <algorithm>
@@ -69,8 +54,6 @@
 #include <com/sun/star/sdb/XReportDocumentsSupplier.hpp>
 #include <com/sun/star/sdb/XFormDocumentsSupplier.hpp>
 #include <svtools/querydelete.hxx>
-#include <unotools/pathoptions.hxx>
-#include <sfx2/docfilt.hxx>
 #include <tools/diagnose_ex.h>
 #include <osl/diagnose.h>
 #include <defaultobjectnamecheck.hxx>
diff --git a/dbaccess/source/ui/app/AppControllerGen.cxx b/dbaccess/source/ui/app/AppControllerGen.cxx
index dec3fc9081e7..8eb52b89db76 100644
--- a/dbaccess/source/ui/app/AppControllerGen.cxx
+++ b/dbaccess/source/ui/app/AppControllerGen.cxx
@@ -23,7 +23,6 @@
 #include <core_resource.hxx>
 #include <dbaccess_slotid.hrc>
 #include <strings.hrc>
-#include <stringconstants.hxx>
 #include <strings.hxx>
 #include <defaultobjectnamecheck.hxx>
 #include <dlgsave.hxx>
@@ -34,21 +33,13 @@
 #include <com/sun/star/container/XContainer.hpp>
 #include <com/sun/star/container/XHierarchicalNameContainer.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
-#include <com/sun/star/container/XNameContainer.hpp>
-#include <com/sun/star/lang/XEventListener.hpp>
 #include <com/sun/star/sdb/CommandType.hpp>
-#include <com/sun/star/sdb/SQLContext.hpp>
 #include <com/sun/star/sdb/XQueriesSupplier.hpp>
 #include <com/sun/star/sdbcx/XRename.hpp>
 #include <com/sun/star/sdb/ErrorCondition.hpp>
 #include <com/sun/star/sdb/application/DatabaseObject.hpp>
 #include <com/sun/star/sdbcx/XTablesSupplier.hpp>
-#include <com/sun/star/sdbcx/XViewsSupplier.hpp>
-#include <com/sun/star/ucb/Command.hpp>
-#include <com/sun/star/ucb/XCommandEnvironment.hpp>
-#include <com/sun/star/ucb/XCommandProcessor.hpp>
 #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
-#include <com/sun/star/uno/XNamingService.hpp>
 #include <com/sun/star/util/XRefreshable.hpp>
 
 #include <cppuhelper/exc_hlp.hxx>
@@ -61,7 +52,6 @@
 #include <toolkit/helper/vclunohelper.hxx>
 #include <tools/diagnose_ex.h>
 #include <osl/diagnose.h>
-#include <unotools/bootstrap.hxx>
 #include <vcl/weld.hxx>
 #include <vcl/mnemonic.hxx>
 #include <vcl/svapp.hxx>
diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
index fe8d438845be..502ad243cd76 100644
--- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx
+++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
@@ -18,15 +18,10 @@
  */
 
 #include "AppDetailPageHelper.hxx"
-#include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
-#include <connectivity/dbtools.hxx>
 #include <tabletree.hxx>
-#include <UITools.hxx>
 #include <dbtreelistbox.hxx>
 #include <com/sun/star/awt/XTabController.hpp>
-#include <com/sun/star/awt/XWindow.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/container/XChild.hpp>
 #include <com/sun/star/container/XContainer.hpp>
 #include <com/sun/star/form/XLoadable.hpp>
@@ -35,13 +30,10 @@
 #include <com/sun/star/frame/Frame.hpp>
 #include <com/sun/star/frame/XFrames.hpp>
 #include <com/sun/star/frame/XFramesSupplier.hpp>
-#include <com/sun/star/sdb/CommandType.hpp>
 #include <com/sun/star/sdb/application/XDatabaseDocumentUI.hpp>
 #include <com/sun/star/sdb/application/DatabaseObject.hpp>
 #include <com/sun/star/sdb/application/DatabaseObjectContainer.hpp>
 #include <com/sun/star/sdbc/XConnection.hpp>
-#include <com/sun/star/sdbcx/XTablesSupplier.hpp>
-#include <com/sun/star/sdbcx/XViewsSupplier.hpp>
 #include <com/sun/star/ucb/XCommandEnvironment.hpp>
 #include <com/sun/star/ucb/XCommandProcessor.hpp>
 #include <com/sun/star/ucb/Command.hpp>
@@ -52,9 +44,6 @@
 #include "AppView.hxx"
 #include <helpids.h>
 #include <strings.hxx>
-#include <callbacks.hxx>
-#include <dbaccess/IController.hxx>
-#include <stringconstants.hxx>
 #include <dbaccess_slotid.hrc>
 #include <databaseobjectview.hxx>
 #include <imageprovider.hxx>
@@ -81,7 +70,6 @@ using namespace ::com::sun::star::form;
 using namespace ::com::sun::star::sdb;
 using namespace ::com::sun::star::sdb::application;
 using namespace ::com::sun::star::sdbc;
-using namespace ::com::sun::star::sdbcx;
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star;
 using ::com::sun::star::awt::XTabController;
diff --git a/dbaccess/source/ui/app/AppDetailView.cxx b/dbaccess/source/ui/app/AppDetailView.cxx
index 1a4947ea7a1b..39da2cd497e1 100644
--- a/dbaccess/source/ui/app/AppDetailView.cxx
+++ b/dbaccess/source/ui/app/AppDetailView.cxx
@@ -30,15 +30,11 @@
 #include <com/sun/star/graphic/XGraphic.hpp>
 #include <com/sun/star/util/URL.hpp>
 #include <core_resource.hxx>
-#include <listviewitems.hxx>
 #include <vcl/event.hxx>
 #include <vcl/image.hxx>
 #include <vcl/mnemonic.hxx>
 #include <vcl/settings.hxx>
-#include <browserids.hxx>
 #include "AppDetailPageHelper.hxx"
-#include <vcl/svapp.hxx>
-#include <callbacks.hxx>
 #include <dbaccess/IController.hxx>
 #include <vcl/treelistentry.hxx>
 #include <vcl/viewdataentry.hxx>
diff --git a/dbaccess/source/ui/app/AppIconControl.cxx b/dbaccess/source/ui/app/AppIconControl.cxx
index 569692f39326..514580014f79 100644
--- a/dbaccess/source/ui/app/AppIconControl.cxx
+++ b/dbaccess/source/ui/app/AppIconControl.cxx
@@ -24,7 +24,6 @@
 #include <vcl/image.hxx>
 #include <callbacks.hxx>
 #include <AppElementType.hxx>
-#include <memory>
 
 using namespace ::dbaui;
 OApplicationIconControl::OApplicationIconControl(vcl::Window* _pParent)
diff --git a/dbaccess/source/ui/app/AppSwapWindow.cxx b/dbaccess/source/ui/app/AppSwapWindow.cxx
index 29cdef2b79e5..e291bdb8a6ac 100644
--- a/dbaccess/source/ui/app/AppSwapWindow.cxx
+++ b/dbaccess/source/ui/app/AppSwapWindow.cxx
@@ -21,9 +21,6 @@
 #include <helpids.h>
 #include "AppView.hxx"
 #include <vcl/event.hxx>
-#include <vcl/svapp.hxx>
-#include <vcl/syswin.hxx>
-#include <vcl/menu.hxx>
 #include <vcl/mnemonic.hxx>
 #include <vcl/settings.hxx>
 #include "AppController.hxx"
diff --git a/dbaccess/source/ui/app/AppView.cxx b/dbaccess/source/ui/app/AppView.cxx
index 09cfa9e0f703..fb61be9092d1 100644
--- a/dbaccess/source/ui/app/AppView.cxx
+++ b/dbaccess/source/ui/app/AppView.cxx
@@ -19,28 +19,15 @@
 
 #include "AppView.hxx"
 #include <strings.hrc>
-#include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
-#include <vcl/toolbox.hxx>
 #include <vcl/event.hxx>
-#include <unotools/configmgr.hxx>
-#include <com/sun/star/datatransfer/clipboard/XClipboard.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
+#include <vcl/weld.hxx>
 #include <com/sun/star/sdbcx/XTablesSupplier.hpp>
 #include <com/sun/star/sdb/XQueriesSupplier.hpp>
-#include <unotools/syslocale.hxx>
-#include <UITools.hxx>
 #include "AppDetailView.hxx"
-#include <tabletree.hxx>
 #include "AppSwapWindow.hxx"
-#include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 #include "AppTitleWindow.hxx"
-#include <dsntypes.hxx>
-#include <stringconstants.hxx>
-#include <dbaccess/IController.hxx>
-#include <browserids.hxx>
-#include <unotools/pathoptions.hxx>
 #include "AppController.hxx"
 
 using namespace ::dbaui;
diff --git a/dbaccess/source/ui/app/subcomponentmanager.cxx b/dbaccess/source/ui/app/subcomponentmanager.cxx
index 9413f98f4ee2..08df1dff0930 100644
--- a/dbaccess/source/ui/app/subcomponentmanager.cxx
+++ b/dbaccess/source/ui/app/subcomponentmanager.cxx
@@ -19,7 +19,6 @@
 
 #include "subcomponentmanager.hxx"
 #include "AppController.hxx"
-#include <stringconstants.hxx>
 #include <strings.hxx>
 
 #include <com/sun/star/frame/XFrame.hpp>
diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx
index 73fb0f2b6483..4fb84775099a 100644
--- a/dbaccess/source/ui/browser/brwctrlr.cxx
+++ b/dbaccess/source/ui/browser/brwctrlr.cxx
@@ -23,27 +23,16 @@
 #include <strings.hrc>
 #include <strings.hxx>
 #include <core_resource.hxx>
-#include <stringconstants.hxx>
 #include <queryfilter.hxx>
 #include <queryorder.hxx>
 #include <sqlmessage.hxx>
 
-#include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/container/XNameContainer.hpp>
-#include <com/sun/star/container/XNamed.hpp>
-#include <com/sun/star/form/FormButtonType.hpp>
-#include <com/sun/star/form/FormSubmitEncoding.hpp>
-#include <com/sun/star/form/FormSubmitMethod.hpp>
-#include <com/sun/star/form/XApproveActionBroadcaster.hpp>
 #include <com/sun/star/form/XBoundControl.hpp>
-#include <com/sun/star/form/XChangeBroadcaster.hpp>
-#include <com/sun/star/form/XChangeListener.hpp>
 #include <com/sun/star/form/XDatabaseParameterBroadcaster.hpp>
 #include <com/sun/star/form/XLoadable.hpp>
 #include <com/sun/star/form/XReset.hpp>
 #include <com/sun/star/form/XResetListener.hpp>
-#include <com/sun/star/form/XSubmit.hpp>
-#include <com/sun/star/form/XSubmitListener.hpp>
 #include <com/sun/star/form/runtime/XFormController.hpp>
 #include <com/sun/star/form/runtime/FormOperations.hpp>
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
@@ -52,21 +41,17 @@
 #include <com/sun/star/sdb/CommandType.hpp>
 #include <com/sun/star/sdb/ErrorCondition.hpp>
 #include <com/sun/star/sdb/ParametersRequest.hpp>
-#include <com/sun/star/sdb/SQLContext.hpp>
 #include <com/sun/star/sdb/XInteractionSupplyParameters.hpp>
 #include <com/sun/star/sdb/XSQLErrorBroadcaster.hpp>
 #include <com/sun/star/sdb/XSingleSelectQueryComposer.hpp>
 #include <com/sun/star/sdb/SQLFilterOperator.hpp>
 #include <com/sun/star/sdbc/XConnection.hpp>
 #include <com/sun/star/sdbc/XResultSetUpdate.hpp>
-#include <com/sun/star/sdbc/XRowSetListener.hpp>
 #include <com/sun/star/sdbc/XWarningsSupplier.hpp>
 #include <com/sun/star/sdbcx/Privilege.hpp>
 #include <com/sun/star/sdbcx/XRowLocate.hpp>
 #include <com/sun/star/task/InteractionHandler.hpp>
-#include <com/sun/star/uno/TypeClass.hpp>
 #include <com/sun/star/util/NumberFormatter.hpp>
-#include <com/sun/star/util/XCancellable.hpp>
 
 #include <comphelper/enumhelper.hxx>
 #include <comphelper/extract.hxx>
@@ -79,10 +64,8 @@
 #include <connectivity/sqlerror.hxx>
 #include <cppuhelper/exc_hlp.hxx>
 #include <cppuhelper/implbase2.hxx>
-#include <cppuhelper/typeprovider.hxx>
 #include <osl/mutex.hxx>
 #include <sal/log.hxx>
-#include <sfx2/app.hxx>
 #include <svx/fmsearch.hxx>
 #include <svx/svxdlg.hxx>
 #include <tools/diagnose_ex.h>
diff --git a/dbaccess/source/ui/browser/brwview.cxx b/dbaccess/source/ui/browser/brwview.cxx
index b724e866aa59..01b17fd7c544 100644
--- a/dbaccess/source/ui/browser/brwview.cxx
+++ b/dbaccess/source/ui/browser/brwview.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <brwctrlr.hxx>
 #include <brwview.hxx>
 #include <sbagrid.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
@@ -25,12 +24,12 @@
 #include <vcl/fixed.hxx>
 #include <vcl/split.hxx>
 #include "dbtreeview.hxx"
-#include <stringconstants.hxx>
 #include <strings.hxx>
 #include <com/sun/star/form/XLoadable.hpp>
 #include <com/sun/star/awt/XControlContainer.hpp>
 #include <com/sun/star/awt/PosSize.hpp>
-#include <UITools.hxx>
+#include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/container/XChild.hpp>
 #include <osl/diagnose.h>
 
 using namespace dbaui;
diff --git a/dbaccess/source/ui/browser/dataview.cxx b/dbaccess/source/ui/browser/dataview.cxx
index 724969302a54..123a329ee282 100644
--- a/dbaccess/source/ui/browser/dataview.cxx
+++ b/dbaccess/source/ui/browser/dataview.cxx
@@ -21,9 +21,7 @@
 #include <com/sun/star/frame/XModel.hpp>
 #include <dbaccess/dataview.hxx>
 #include <comphelper/namedvaluecollection.hxx>
-#include <sfx2/app.hxx>
 #include <dbaccess/IController.hxx>
-#include <UITools.hxx>
 #include <svtools/acceleratorexecute.hxx>
 #include <tools/diagnose_ex.h>
 #include <vcl/event.hxx>
diff --git a/dbaccess/source/ui/browser/dbexchange.cxx b/dbaccess/source/ui/browser/dbexchange.cxx
index 4d204e34708a..2fe0a3b21ed5 100644
--- a/dbaccess/source/ui/browser/dbexchange.cxx
+++ b/dbaccess/source/ui/browser/dbexchange.cxx
@@ -25,7 +25,6 @@
 #include <com/sun/star/sdb/XResultSetAccess.hpp>
 #include <com/sun/star/lang/XComponent.hpp>
 #include <TokenWriter.hxx>
-#include <stringconstants.hxx>
 #include <svx/dataaccessdescriptor.hxx>
 #include <UITools.hxx>
 
diff --git a/dbaccess/source/ui/browser/dbtreeview.cxx b/dbaccess/source/ui/browser/dbtreeview.cxx
index 8a8eee6e88fc..38464068bbb7 100644
--- a/dbaccess/source/ui/browser/dbtreeview.cxx
+++ b/dbaccess/source/ui/browser/dbtreeview.cxx
@@ -20,7 +20,6 @@
 #include "dbtreeview.hxx"
 #include <vcl/treelistbox.hxx>
 #include <dbtreelistbox.hxx>
-#include "dbtreemodel.hxx"
 #include <helpids.h>
 
 namespace dbaui
diff --git a/dbaccess/source/ui/browser/dsbrowserDnD.cxx b/dbaccess/source/ui/browser/dsbrowserDnD.cxx
index 32228090bec6..cd8c124f059a 100644
--- a/dbaccess/source/ui/browser/dsbrowserDnD.cxx
+++ b/dbaccess/source/ui/browser/dsbrowserDnD.cxx
@@ -21,15 +21,12 @@
 #include <dbtreelistbox.hxx>
 #include "dbtreemodel.hxx"
 #include "dbtreeview.hxx"
-#include <stringconstants.hxx>
-#include <QEnumTypes.hxx>
 #include <UITools.hxx>
 #include <unodatbr.hxx>
 
 #include <com/sun/star/frame/XStorable.hpp>
 #include <com/sun/star/sdb/CommandType.hpp>
 #include <com/sun/star/sdbc/SQLException.hpp>
-#include <com/sun/star/sdbc/XConnection.hpp>
 
 #include <connectivity/dbexception.hxx>
 #include <connectivity/dbtools.hxx>
@@ -41,7 +38,7 @@
 #include <vcl/svapp.hxx>
 
 #include <algorithm>
-#include <functional>
+
 namespace dbaui
 {
 
diff --git a/dbaccess/source/ui/browser/exsrcbrw.cxx b/dbaccess/source/ui/browser/exsrcbrw.cxx
index f108670041c6..e468f9a5aa28 100644
--- a/dbaccess/source/ui/browser/exsrcbrw.cxx
+++ b/dbaccess/source/ui/browser/exsrcbrw.cxx
@@ -19,19 +19,16 @@
 
 #include <exsrcbrw.hxx>
 #include <uiservices.hxx>
-#include <com/sun/star/form/FormComponentType.hpp>
 #include <com/sun/star/util/XURLTransformer.hpp>
 #include <com/sun/star/form/XGridColumnFactory.hpp>
 #include <com/sun/star/form/XLoadable.hpp>
 #include <com/sun/star/frame/FrameSearchFlag.hpp>
 #include <formadapter.hxx>
 #include <comphelper/processfactory.hxx>
-#include <stringconstants.hxx>
 #include <strings.hxx>
 #include <dbu_reghelper.hxx>
 #include <o3tl/any.hxx>
 #include <tools/diagnose_ex.h>
-#include <rtl/strbuf.hxx>
 #include <sal/log.hxx>
 
 using namespace ::com::sun::star::uno;
diff --git a/dbaccess/source/ui/browser/formadapter.cxx b/dbaccess/source/ui/browser/formadapter.cxx
index 800ee31db23d..9620d5840a34 100644
--- a/dbaccess/source/ui/browser/formadapter.cxx
+++ b/dbaccess/source/ui/browser/formadapter.cxx
@@ -23,11 +23,8 @@
 #include <comphelper/types.hxx>
 #include <comphelper/enumhelper.hxx>
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <strings.hxx>
-#include <stringconstants.hxx>
 #include <connectivity/dbexception.hxx>
-#include <cppuhelper/typeprovider.hxx>
 #include <comphelper/sequence.hxx>
 
 using namespace dbaui;
diff --git a/dbaccess/source/ui/browser/genericcontroller.cxx b/dbaccess/source/ui/browser/genericcontroller.cxx
index cce3d6b35e82..58f5b55ea940 100644
--- a/dbaccess/source/ui/browser/genericcontroller.cxx
+++ b/dbaccess/source/ui/browser/genericcontroller.cxx
@@ -26,37 +26,27 @@
 #include <dbaccess/dataview.hxx>
 #include <tools/diagnose_ex.h>
 #include <osl/diagnose.h>
-#include <stringconstants.hxx>
 #include <vcl/stdtext.hxx>
-#include <cppuhelper/typeprovider.hxx>
 #include <framework/titlehelper.hxx>
+#include <connectivity/dbtools.hxx>
 #include <comphelper/sequence.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <com/sun/star/sdbc/XDataSource.hpp>
 #include <com/sun/star/sdb/DatabaseContext.hpp>
-#include <com/sun/star/sdb/SQLContext.hpp>
-#include <com/sun/star/sdb/XCompletedConnection.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/task/XInteractionHandler.hpp>
 #include <com/sun/star/util/URLTransformer.hpp>
 #include <com/sun/star/util/XCloseable.hpp>
-#include <UITools.hxx>
-#include <commontypes.hxx>
 
 #include <com/sun/star/ui/XSidebarProvider.hpp>
-#include <sfx2/sidebar/UnoSidebar.hxx>
 #include <sfx2/userinputinterception.hxx>
 
-#include <svl/urihelper.hxx>
 #include <datasourceconnector.hxx>
-#include <unotools/moduleoptions.hxx>
 #include <com/sun/star/frame/FrameSearchFlag.hpp>
 #include <com/sun/star/frame/status/Visibility.hpp>
 #include <com/sun/star/frame/XUntitledNumbers.hpp>
 #include <com/sun/star/util/XModifiable.hpp>
 #include <rtl/ustring.hxx>
 #include <sal/log.hxx>
-#include <o3tl/functional.hxx>
 #include <limits>
 #include <unordered_map>
 #include <set>
diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx
index 3cfbfb542c3e..b035a9eeb365 100644
--- a/dbaccess/source/ui/browser/sbagrid.cxx
+++ b/dbaccess/source/ui/browser/sbagrid.cxx
@@ -17,49 +17,27 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <sbagrid.hrc>
 #include <core_resource.hxx>
 #include <helpids.h>
 #include <uiservices.hxx>
 
 #include <sot/exchange.hxx>
-#include <svx/svxids.hrc>
 
-#include <svx/numinf.hxx>
 #include <svx/dbaexchange.hxx>
 #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
 
 #include <sbagrid.hxx>
-#include <dlgattr.hxx>
 #include <dlgsize.hxx>
 #include <com/sun/star/beans/XPropertyState.hpp>
-#include <com/sun/star/form/XLoadable.hpp>
-#include <com/sun/star/form/ControlFontDialog.hpp>
-#include <com/sun/star/sdb/CommandType.hpp>
-#include <com/sun/star/sdb/XSQLQueryComposerFactory.hpp>
-#include <com/sun/star/sdb/XResultSetAccess.hpp>
 #include <com/sun/star/form/XForm.hpp>
 #include <com/sun/star/container/XIndexContainer.hpp>
-#include <com/sun/star/util/NumberFormat.hpp>
 
 #include <com/sun/star/view/XSelectionSupplier.hpp>
-#include <com/sun/star/form/DataSelectionType.hpp>
-#include <com/sun/star/awt/TextAlign.hpp>
 #include <com/sun/star/awt/XTextComponent.hpp>
-#include <com/sun/star/util/Date.hpp>
-#include <com/sun/star/util/Time.hpp>
-#include <com/sun/star/util/DateTime.hpp>
 #include <com/sun/star/sdbc/XResultSetUpdate.hpp>
 #include <tools/diagnose_ex.h>
 
-#include <sal/log.hxx>
-#include <svl/intitem.hxx>
-#include <svx/algitem.hxx>
-#include <tools/multisel.hxx>
 #include <svl/numuno.hxx>
-#include <svl/itempool.hxx>
-#include <svl/itemset.hxx>
-#include <svl/rngitem.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 
 #include <vcl/svapp.hxx>
@@ -67,24 +45,18 @@
 #include <svl/zforlist.hxx>
 #include <cppuhelper/queryinterface.hxx>
 #include <connectivity/dbtools.hxx>
-#include <connectivity/dbconversion.hxx>
-#include <cppuhelper/typeprovider.hxx>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/types.hxx>
-#include <com/sun/star/sdbcx/XTablesSupplier.hpp>
 #include <com/sun/star/sdbc/DataType.hpp>
 #include <com/sun/star/sdbc/SQLException.hpp>
 #include <browserids.hxx>
-#include <stringconstants.hxx>
 #include <strings.hrc>
 #include <strings.hxx>
 #include <dbu_reghelper.hxx>
 #include <dbexchange.hxx>
 #include <TableRowExchange.hxx>
 #include <TableRow.hxx>
-#include <FieldDescriptions.hxx>
 #include <svtools/stringtransfer.hxx>
-#include <vcl/stdtext.hxx>
 #include <UITools.hxx>
 #include <TokenWriter.hxx>
 #include <osl/diagnose.h>
diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx
index cc74ae42fb79..cd0aed665a7f 100644
--- a/dbaccess/source/ui/browser/unodatbr.cxx
+++ b/dbaccess/source/ui/browser/unodatbr.cxx
@@ -20,34 +20,18 @@
 #include <browserids.hxx>
 #include <core_resource.hxx>
 #include <helpids.h>
-#include <dbexchange.hxx>
 #include <dbtreelistbox.hxx>
 #include "dbtreemodel.hxx"
 #include "dbtreeview.hxx"
 #include <dbu_reghelper.hxx>
-#include <stringconstants.hxx>
 #include <strings.hrc>
-#include <dlgsave.hxx>
 #include <uiservices.hxx>
-#include <HtmlReader.hxx>
 #include <imageprovider.hxx>
-#include <listviewitems.hxx>
-#include <QEnumTypes.hxx>
-#include <RtfReader.hxx>
-#include <sbagrid.hrc>
 #include <sbagrid.hxx>
-#include <sqlmessage.hxx>
 #include <strings.hxx>
-#include <TokenWriter.hxx>
 #include <UITools.hxx>
 #include <unodatbr.hxx>
-#include <WColumnSelect.hxx>
-#include <WCopyTable.hxx>
-#include <WCPage.hxx>
-#include <WExtendPages.hxx>
-#include <WNameMatch.hxx>
 
-#include <com/sun/star/awt/LineEndFormat.hpp>
 #include <com/sun/star/awt/MouseWheelBehavior.hpp>
 #include <com/sun/star/awt/TextAlign.hpp>
 #include <com/sun/star/awt/VisualEffect.hpp>
@@ -55,7 +39,6 @@
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/beans/XMultiPropertySet.hpp>
 #include <com/sun/star/container/XNameContainer.hpp>
-#include <com/sun/star/form/XForm.hpp>
 #include <com/sun/star/form/XGridColumnFactory.hpp>
 #include <com/sun/star/form/XLoadable.hpp>
 #include <com/sun/star/form/XReset.hpp>
@@ -66,8 +49,6 @@
 #include <com/sun/star/i18n/Collator.hpp>
 #include <com/sun/star/sdb/CommandType.hpp>
 #include <com/sun/star/sdb/SQLContext.hpp>
-#include <com/sun/star/sdb/XBookmarksSupplier.hpp>
-#include <com/sun/star/sdb/XCompletedConnection.hpp>
 #include <com/sun/star/sdb/XDatabaseContext.hpp>
 #include <com/sun/star/sdb/XDatabaseRegistrations.hpp>
 #include <com/sun/star/sdb/XDocumentDataSource.hpp>
@@ -82,17 +63,13 @@
 #include <com/sun/star/sdbc/FetchDirection.hpp>
 #include <com/sun/star/sdbc/SQLWarning.hpp>
 #include <com/sun/star/sdbc/XDataSource.hpp>
-#include <com/sun/star/sdbc/XResultSetMetaDataSupplier.hpp>
 #include <com/sun/star/sdbc/XWarningsSupplier.hpp>
-#include <com/sun/star/sdbcx/Privilege.hpp>
 #include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
-#include <com/sun/star/sdbcx/XDataDescriptorFactory.hpp>
-#include <com/sun/star/sdbcx/XDrop.hpp>
 #include <com/sun/star/sdbcx/XTablesSupplier.hpp>
 #include <com/sun/star/sdbcx/XViewsSupplier.hpp>
 #include <com/sun/star/task/InteractionHandler.hpp>
-#include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
 #include <com/sun/star/util/XFlushable.hpp>
+#include <com/sun/star/util/XNumberFormatter.hpp>
 #include <com/sun/star/util/XURLTransformer.hpp>
 #include <com/sun/star/document/MacroExecMode.hpp>
 #include <com/sun/star/ui/XContextMenuInterceptor.hpp>
@@ -103,18 +80,11 @@
 #include <comphelper/types.hxx>
 #include <connectivity/dbexception.hxx>
 #include <cppuhelper/exc_hlp.hxx>
-#include <cppuhelper/typeprovider.hxx>
 #include <i18nlangtag/languagetag.hxx>
-#include <sfx2/app.hxx>
-#include <sfx2/dispatch.hxx>
-#include <sot/storage.hxx>
 #include <svl/filenotation.hxx>
-#include <svl/intitem.hxx>
-#include <unotools/moduleoptions.hxx>
 #include <vcl/svlbitm.hxx>
 #include <vcl/treelistbox.hxx>
 #include <vcl/treelistentry.hxx>
-#include <svx/algitem.hxx>
 #include <svx/dataaccessdescriptor.hxx>
 #include <svx/databaseregistrationui.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
@@ -125,10 +95,10 @@
 #include <tools/urlobj.hxx>
 #include <unotools/confignode.hxx>
 #include <vcl/split.hxx>
-#include <vcl/stdtext.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/toolbox.hxx>
 #include <vcl/settings.hxx>
+#include <vcl/weld.hxx>
 
 #include <memory>
 
diff --git a/dbaccess/source/ui/control/ColumnControlWindow.cxx b/dbaccess/source/ui/control/ColumnControlWindow.cxx
index d080fd875c9f..bac5b49cbd7c 100644
--- a/dbaccess/source/ui/control/ColumnControlWindow.cxx
+++ b/dbaccess/source/ui/control/ColumnControlWindow.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <ColumnControlWindow.hxx>
-#include <FieldControls.hxx>
 #include <unotools/syslocale.hxx>
 #include <i18nlangtag/languagetag.hxx>
 #include <connectivity/dbtools.hxx>
diff --git a/dbaccess/source/ui/control/FieldControls.cxx b/dbaccess/source/ui/control/FieldControls.cxx
index fbe68caf39f5..866014a99f2d 100644
--- a/dbaccess/source/ui/control/FieldControls.cxx
+++ b/dbaccess/source/ui/control/FieldControls.cxx
@@ -21,8 +21,6 @@
 #include <SqlNameEdit.hxx>
 #include <core_resource.hxx>
 
-#include <vcl/settings.hxx>
-
 namespace dbaui {
 
 OPropColumnEditCtrl::OPropColumnEditCtrl(std::unique_ptr<weld::Entry> xEntry,
diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx b/dbaccess/source/ui/control/FieldDescControl.cxx
index 976943b27796..4650ba113303 100644
--- a/dbaccess/source/ui/control/FieldDescControl.cxx
+++ b/dbaccess/source/ui/control/FieldDescControl.cxx
@@ -23,19 +23,10 @@
 #include <tools/diagnose_ex.h>
 #include <TableDesignHelpBar.hxx>
 #include <vcl/svapp.hxx>
-#include <vector>
 #include <FieldDescriptions.hxx>
-#include <dlgattr.hxx>
-#include <svx/numfmtsh.hxx>
-#include <svx/svxids.hrc>
-#include <svx/algitem.hxx>
-#include <svl/itempool.hxx>
 #include <svl/zforlist.hxx>
-#include <svl/rngitem.hxx>
-#include <svl/intitem.hxx>
 #include <svl/numuno.hxx>
 #include <vcl/transfer.hxx>
-#include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <com/sun/star/sdbc/ColumnValue.hpp>
 #include <com/sun/star/util/NumberFormat.hpp>
 #include <com/sun/star/util/XNumberFormatPreviewer.hpp>
diff --git a/dbaccess/source/ui/control/RelationControl.cxx b/dbaccess/source/ui/control/RelationControl.cxx
index e448c69bfebd..14c923c3bf26 100644
--- a/dbaccess/source/ui/control/RelationControl.cxx
+++ b/dbaccess/source/ui/control/RelationControl.cxx
@@ -28,9 +28,7 @@
 #include <TableWindow.hxx>
 #include <com/sun/star/awt/XWindow.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
-#include <com/sun/star/sdbc/XDatabaseMetaData.hpp>
 #include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
-#include <UITools.hxx>
 #include <RelControliFace.hxx>
 #include <helpids.h>
 #include <o3tl/safeint.hxx>
diff --git a/dbaccess/source/ui/control/TableGrantCtrl.cxx b/dbaccess/source/ui/control/TableGrantCtrl.cxx
index d4c6829af5cd..373340afd776 100644
--- a/dbaccess/source/ui/control/TableGrantCtrl.cxx
+++ b/dbaccess/source/ui/control/TableGrantCtrl.cxx
@@ -25,12 +25,12 @@
 #include <com/sun/star/sdbcx/PrivilegeObject.hpp>
 #include <com/sun/star/sdbcx/XUsersSupplier.hpp>
 #include <com/sun/star/sdbcx/XAuthorizable.hpp>
+#include <connectivity/dbtools.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <vcl/button.hxx>
 #include <vcl/svapp.hxx>
 #include <osl/diagnose.h>
 #include <strings.hrc>
-#include <UITools.hxx>
 
 using namespace ::com::sun::star::accessibility;
 using namespace ::com::sun::star::container;
diff --git a/dbaccess/source/ui/control/curledit.cxx b/dbaccess/source/ui/control/curledit.cxx
index eadc67c6de30..9cccde370f93 100644
--- a/dbaccess/source/ui/control/curledit.cxx
+++ b/dbaccess/source/ui/control/curledit.cxx
@@ -18,9 +18,6 @@
  */
 
 #include <curledit.hxx>
-#include <vcl/svapp.hxx>
-#include <vcl/settings.hxx>
-#include <osl/diagnose.h>
 
 namespace dbaui
 {
diff --git a/dbaccess/source/ui/control/dbtreelistbox.cxx b/dbaccess/source/ui/control/dbtreelistbox.cxx
index 0f505d424c96..549a27c392e7 100644
--- a/dbaccess/source/ui/control/dbtreelistbox.cxx
+++ b/dbaccess/source/ui/control/dbtreelistbox.cxx
@@ -18,14 +18,10 @@
  */
 
 #include <dbtreelistbox.hxx>
-#include <browserids.hxx>
 #include <listviewitems.hxx>
 #include <callbacks.hxx>
 
-#include <com/sun/star/datatransfer/dnd/XDragGestureListener.hpp>
-#include <com/sun/star/datatransfer/dnd/XDragGestureRecognizer.hpp>
 #include <com/sun/star/ui/XContextMenuInterceptor.hpp>
-#include <com/sun/star/util/URL.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/frame/XController.hpp>
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
@@ -38,7 +34,6 @@
 #include <framework/actiontriggerhelper.hxx>
 #include <toolkit/awt/vclxmenu.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
-#include <vcl/svapp.hxx>
 #include <vcl/treelistentry.hxx>
 #include <vcl/event.hxx>
 
diff --git a/dbaccess/source/ui/control/opendoccontrols.cxx b/dbaccess/source/ui/control/opendoccontrols.cxx
index 232a4849e82f..a80ed3ede422 100644
--- a/dbaccess/source/ui/control/opendoccontrols.cxx
+++ b/dbaccess/source/ui/control/opendoccontrols.cxx
@@ -29,14 +29,10 @@
 #include <com/sun/star/ui/XImageManager.hpp>
 
 #include <comphelper/processfactory.hxx>
-#include <vcl/graph.hxx>
-#include <vcl/help.hxx>
 #include <vcl/commandinfoprovider.hxx>
-#include <vcl/event.hxx>
 #include <unotools/historyoptions.hxx>
 #include <comphelper/sequenceashashmap.hxx>
 #include <tools/urlobj.hxx>
-#include <svl/filenotation.hxx>
 #include <osl/diagnose.h>
 
 namespace dbaui
diff --git a/dbaccess/source/ui/control/sqledit.cxx b/dbaccess/source/ui/control/sqledit.cxx
index 1cdb1c4c5793..84cfa4ff8878 100644
--- a/dbaccess/source/ui/control/sqledit.cxx
+++ b/dbaccess/source/ui/control/sqledit.cxx
@@ -28,10 +28,9 @@
 #include <QueryTextView.hxx>
 #include <querycontainerwindow.hxx>
 #include <helpids.h>
-#include <browserids.hxx>
-#include <querycontroller.hxx>
 #include <undosqledit.hxx>
 #include <QueryDesignView.hxx>
+#include <svx/svxids.hrc>
 #include <vcl/settings.hxx>
 #include <cppuhelper/implbase.hxx>
 #include <i18nlangtag/languagetag.hxx>
diff --git a/dbaccess/source/ui/control/tabletree.cxx b/dbaccess/source/ui/control/tabletree.cxx
index e34cd4918e2e..b3170487ed32 100644
--- a/dbaccess/source/ui/control/tabletree.cxx
+++ b/dbaccess/source/ui/control/tabletree.cxx
@@ -21,24 +21,17 @@
 #include <tabletree.hxx>
 #include <imageprovider.hxx>
 #include <strings.hrc>
-#include <vcl/menu.hxx>
 #include <connectivity/dbtools.hxx>
-#include <comphelper/types.hxx>
-#include <stringconstants.hxx>
 #include <com/sun/star/sdb/application/DatabaseObject.hpp>
 #include <com/sun/star/sdb/application/DatabaseObjectContainer.hpp>
-#include <com/sun/star/sdbc/XDriverAccess.hpp>
-#include <com/sun/star/sdbcx/XDataDefinitionSupplier.hpp>
 #include <com/sun/star/sdbcx/XViewsSupplier.hpp>
 #include <com/sun/star/sdbcx/XTablesSupplier.hpp>
-#include <com/sun/star/sdb/SQLContext.hpp>
+#include <com/sun/star/sdbc/SQLException.hpp>
 #include <com/sun/star/sdbc/XRow.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
-#include <commontypes.hxx>
 #include <listviewitems.hxx>
 #include <tools/diagnose_ex.h>
 #include <osl/diagnose.h>
-#include <rtl/ustrbuf.hxx>
 #include <connectivity/dbmetadata.hxx>
 #include <vcl/treelistentry.hxx>
 
diff --git a/dbaccess/source/ui/dlg/CollectionView.cxx b/dbaccess/source/ui/dlg/CollectionView.cxx
index a55badb43b28..6b978bc301c4 100644
--- a/dbaccess/source/ui/dlg/CollectionView.cxx
+++ b/dbaccess/source/ui/dlg/CollectionView.cxx
@@ -18,39 +18,28 @@
  */
 
 #include <CollectionView.hxx>
-#include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
 #include <core_resource.hxx>
-#include <dbu_dlg.hxx>
 #include <strings.hrc>
 #include <comphelper/interaction.hxx>
 #include <comphelper/propertysequence.hxx>
 #include <cppuhelper/exc_hlp.hxx>
-#include <toolkit/helper/vclunohelper.hxx>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/container/XChild.hpp>
 #include <com/sun/star/container/XNameContainer.hpp>
-#include <com/sun/star/beans/PropertyValue.hpp>
 #include <vcl/svapp.hxx>
 #include <vcl/weld.hxx>
-#include <stringconstants.hxx>
-#include <bitmaps.hlst>
 #include <UITools.hxx>
 #include <com/sun/star/container/XHierarchicalNameContainer.hpp>
 #include <com/sun/star/ucb/InteractiveAugmentedIOException.hpp>
 #include <com/sun/star/ucb/IOErrorCode.hpp>
-#include <com/sun/star/ucb/XContentAccess.hpp>
 #include <com/sun/star/ucb/XDynamicResultSet.hpp>
 #include <com/sun/star/sdbc/XRow.hpp>
 #include <com/sun/star/task/InteractionHandler.hpp>
 #include <com/sun/star/task/InteractionClassification.hpp>
 #include <com/sun/star/sdbc/SQLException.hpp>
-#include <com/sun/star/awt/XWindow.hpp>
 #include <comphelper/processfactory.hxx>
 #include <ucbhelper/commandenvironment.hxx>
 #include <ucbhelper/content.hxx>
-#include <unotools/viewoptions.hxx>
-#include <osl/thread.h>
 #include <connectivity/dbexception.hxx>
 
 namespace dbaui
diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.cxx b/dbaccess/source/ui/dlg/ConnectionHelper.cxx
index a491f0736a6c..b932f886414d 100644
--- a/dbaccess/source/ui/dlg/ConnectionHelper.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionHelper.cxx
@@ -20,48 +20,33 @@
 #include <core_resource.hxx>
 #include "dsnItem.hxx"
 #include "ConnectionHelper.hxx"
-#include <dbu_dlg.hxx>
+#include <IItemSetHelper.hxx>
 #include <strings.hrc>
 #include <svl/itemset.hxx>
 #include <unotools/moduleoptions.hxx>
-#include <sfx2/fcontnr.hxx>
 #include <unotools/pathoptions.hxx>
 #include <svl/stritem.hxx>
-#include <svl/eitem.hxx>
-#include <svl/intitem.hxx>
 #include <dsitems.hxx>
-#include <osl/process.h>
 #include <osl/diagnose.h>
 #include <vcl/svapp.hxx>
 #include <vcl/weld.hxx>
 #include <sfx2/filedlghelper.hxx>
-#include <dbadmin.hxx>
 #include <vcl/stdtext.hxx>
 #include <sqlmessage.hxx>
-#include "odbcconfig.hxx"
 #include "dsselect.hxx"
 #include <svl/filenotation.hxx>
-#include <stringconstants.hxx>
 #include <com/sun/star/awt/XSystemDependentWindowPeer.hpp>
-#include <com/sun/star/awt/XWindow.hpp>
 #include <com/sun/star/ui/dialogs/FolderPicker.hpp>
 #include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
 #include <com/sun/star/lang/SystemDependent.hpp>
-#include <com/sun/star/sdbc/XRow.hpp>
 #include <com/sun/star/mozilla/MozillaBootstrap.hpp>
 #include <com/sun/star/task/InteractionHandler.hpp>
 #include <com/sun/star/ucb/XProgressHandler.hpp>
-#include <UITools.hxx>
-#include <unotools/localfilehelper.hxx>
-#include <unotools/ucbhelper.hxx>
 #include <ucbhelper/commandenvironment.hxx>
 #include <ucbhelper/content.hxx>
 #include "finteraction.hxx"
-#include <connectivity/CommonTools.hxx>
 #include <tools/urlobj.hxx>
 #include <tools/diagnose_ex.h>
-#include <rtl/process.h>
-#include <sfx2/docfilt.hxx>
 
 #if defined _WIN32
 #include <vcl/sysdata.hxx>
diff --git a/dbaccess/source/ui/dlg/ConnectionPage.cxx b/dbaccess/source/ui/dlg/ConnectionPage.cxx
index e29402a505d0..37407770cec4 100644
--- a/dbaccess/source/ui/dlg/ConnectionPage.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionPage.cxx
@@ -20,49 +20,21 @@
 #include <config_java.h>
 #include "ConnectionPage.hxx"
 #include <core_resource.hxx>
-#include <dbu_dlg.hxx>
+#include <IItemSetHelper.hxx>
 #include <strings.hrc>
 #include <dsmeta.hxx>
 #if HAVE_FEATURE_JAVA
 #include <jvmaccess/virtualmachine.hxx>
 #endif
 #include <svl/itemset.hxx>
-#include <unotools/pathoptions.hxx>
 #include <svl/stritem.hxx>
 #include <svl/eitem.hxx>
-#include <svl/intitem.hxx>
-#include <unotools/moduleoptions.hxx>
 #include <dsitems.hxx>
 #include <helpids.h>
-#include <osl/process.h>
-#include <dbadmin.hxx>
-#include <vcl/stdtext.hxx>
 #include <sqlmessage.hxx>
-#include "odbcconfig.hxx"
-#include "dsselect.hxx"
 #include <svl/filenotation.hxx>
-#include <stringconstants.hxx>
-#include <com/sun/star/sdbc/XRow.hpp>
-#include <com/sun/star/awt/XWindow.hpp>
-#include <com/sun/star/task/XInteractionHandler.hpp>
 #include <com/sun/star/ucb/XProgressHandler.hpp>
-#include <com/sun/star/sdbc/XConnection.hpp>
-#include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp>
-#include <com/sun/star/ui/dialogs/XFilePickerControlAccess.hpp>
-#include <com/sun/star/ui/dialogs/XFilePicker.hpp>
-#include <UITools.hxx>
-#include <unotools/localfilehelper.hxx>
-#include <unotools/ucbhelper.hxx>
-#include <ucbhelper/commandenvironment.hxx>
-#include "finteraction.hxx"
 #include <connectivity/CommonTools.hxx>
-#include <sfx2/docfilt.hxx>
-#include "dsnItem.hxx"
-
-#if defined _WIN32
-#include <vcl/sysdata.hxx>
-#include "adodatalinks.hxx"
-#endif
 
 namespace dbaui
 {
diff --git a/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx b/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx
index 198cb096419e..bee1b1f11493 100644
--- a/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx
@@ -20,45 +20,20 @@
 #include "ConnectionPageSetup.hxx"
 #include <strings.hrc>
 #include <core_resource.hxx>
-#include <dbu_dlg.hxx>
+#include <IItemSetHelper.hxx>
 #include <svl/itemset.hxx>
-#include <unotools/pathoptions.hxx>
-#include <svl/stritem.hxx>
-#include <svl/eitem.hxx>
-#include <svl/intitem.hxx>
 #include <dsitems.hxx>
-#include <osl/process.h>
-#include <dbadmin.hxx>
-#include <vcl/stdtext.hxx>
-#include <sqlmessage.hxx>
-#include "odbcconfig.hxx"
-#include "dsselect.hxx"
 #include <svl/filenotation.hxx>
-#include <stringconstants.hxx>
-#include <com/sun/star/sdbc/XRow.hpp>
-#include <com/sun/star/awt/XWindow.hpp>
-#include <com/sun/star/task/XInteractionHandler.hpp>
 #include <com/sun/star/ucb/XProgressHandler.hpp>
-#include <com/sun/star/sdbc/XConnection.hpp>
-#include <UITools.hxx>
-#include <unotools/localfilehelper.hxx>
-#include <unotools/ucbhelper.hxx>
-#include <ucbhelper/commandenvironment.hxx>
-#include "finteraction.hxx"
-#include <connectivity/CommonTools.hxx>
-#include <sfx2/docfilt.hxx>
-#include <vcl/mnemonic.hxx>
 
 namespace dbaui
 {
     using namespace ::com::sun::star::uno;
     using namespace ::com::sun::star::ucb;
     using namespace ::com::sun::star::ui::dialogs;
-    using namespace ::com::sun::star::sdbc;
     using namespace ::com::sun::star::beans;
     using namespace ::com::sun::star::lang;
     using namespace ::com::sun::star::container;
-    using namespace ::dbtools;
     using namespace ::svt;
 
     std::unique_ptr<OGenericAdministrationPage> OConnectionTabPageSetup::CreateDbaseTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& _rAttrSet)
diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
index 565cf61489b9..9c8d0fdd8e91 100644
--- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
+++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
@@ -22,7 +22,6 @@
 #include "DBSetupConnectionPages.hxx"
 #include <core_resource.hxx>
 #include <sqlmessage.hxx>
-#include <dbu_dlg.hxx>
 #include <strings.hrc>
 #include <svl/itemset.hxx>
 #include <svl/stritem.hxx>
@@ -30,28 +29,12 @@
 #include <svl/intitem.hxx>
 #include <dsitems.hxx>
 #include "dsnItem.hxx"
-#include <vcl/mnemonic.hxx>
-#include <svl/cjkoptions.hxx>
 
 #if HAVE_FEATURE_JAVA
     #include <jvmaccess/virtualmachine.hxx>
 #endif
 
 #include <connectivity/CommonTools.hxx>
-#include "DriverSettings.hxx"
-#include <dbadmin.hxx>
-
-#include <com/sun/star/task/XInteractionHandler.hpp>
-#include <com/sun/star/sdbc/XDriverAccess.hpp>
-#include <stringconstants.hxx>
-#include <svl/filenotation.hxx>
-
-#include <unotools/localfilehelper.hxx>
-#include <unotools/ucbhelper.hxx>
-#include <ucbhelper/commandenvironment.hxx>
-#include "finteraction.hxx"
-#include <unotools/pathoptions.hxx>
-#include <vcl/roadmapwizard.hxx>
 #include <dbwizsetup.hxx>
 #include "TextConnectionHelper.hxx"
 #include <osl/diagnose.h>
diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.cxx b/dbaccess/source/ui/dlg/DbAdminImpl.cxx
index ae6735d4c029..2437196f14e3 100644
--- a/dbaccess/source/ui/dlg/DbAdminImpl.cxx
+++ b/dbaccess/source/ui/dlg/DbAdminImpl.cxx
@@ -25,12 +25,9 @@
 #include <svl/stritem.hxx>
 #include <svl/intitem.hxx>
 #include <svl/eitem.hxx>
-#include "DriverSettings.hxx"
 #include <IItemSetHelper.hxx>
 #include <UITools.hxx>
 #include <core_resource.hxx>
-#include <dbu_dlg.hxx>
-#include <stringconstants.hxx>
 #include <strings.hrc>
 #include <strings.hxx>
 #include <dsitems.hxx>
@@ -45,10 +42,8 @@
 #include <com/sun/star/sdb/SQLContext.hpp>
 #include <com/sun/star/sdbc/ConnectionPool.hpp>
 #include <com/sun/star/sdbc/XDriver.hpp>
-#include <com/sun/star/sdbc/XDriverAccess.hpp>
 #include <com/sun/star/task/InteractionHandler.hpp>
 #include <com/sun/star/task/XInteractionRequest.hpp>
-#include <com/sun/star/ucb/XInteractionSupplyAuthentication2.hpp>
 #include <com/sun/star/ucb/AuthenticationRequest.hpp>
 
 #include <comphelper/interaction.hxx>
diff --git a/dbaccess/source/ui/dlg/RelationDlg.cxx b/dbaccess/source/ui/dlg/RelationDlg.cxx
index f53a654de997..f47d3ccd1d68 100644
--- a/dbaccess/source/ui/dlg/RelationDlg.cxx
+++ b/dbaccess/source/ui/dlg/RelationDlg.cxx
@@ -19,23 +19,18 @@
 
 #include <RelationDlg.hxx>
 
-#include <vcl/svapp.hxx>
-#include <dbu_dlg.hxx>
 #include <com/sun/star/sdbc/KeyRule.hpp>
 #include <com/sun/star/sdbc/SQLException.hpp>
 
-#include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
-#include <UITools.hxx>
 #include <JoinDesignView.hxx>
 #include <JoinController.hxx>
 #include <connectivity/dbexception.hxx>
+#include <connectivity/dbtools.hxx>
 #include <RTableConnectionData.hxx>
 #include <RelationControl.hxx>
 #include <cppuhelper/exc_hlp.hxx>
 
-#include <algorithm>
-
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::sdbc;
 using namespace ::com::sun::star::container;
diff --git a/dbaccess/source/ui/dlg/TablesSingleDlg.cxx b/dbaccess/source/ui/dlg/TablesSingleDlg.cxx
index f1e74c7e47c0..52babf2b1523 100644
--- a/dbaccess/source/ui/dlg/TablesSingleDlg.cxx
+++ b/dbaccess/source/ui/dlg/TablesSingleDlg.cxx
@@ -20,8 +20,6 @@
 #include <TablesSingleDlg.hxx>
 #include "DbAdminImpl.hxx"
 #include "tablespage.hxx"
-#include <dsitems.hxx>
-#include <dbu_dlg.hxx>
 
 namespace dbaui
 {
diff --git a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
index 12198011a270..bacc0f7cb67c 100644
--- a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
+++ b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
@@ -17,40 +17,17 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <config_java.h>
-
 #include <core_resource.hxx>
 #include "TextConnectionHelper.hxx"
-#include <sqlmessage.hxx>
-#include <dbu_dlg.hxx>
 #include <strings.hrc>
 #include <strings.hxx>
 #include <svl/itemset.hxx>
 #include <svl/stritem.hxx>
 #include <svl/eitem.hxx>
-#include <svl/intitem.hxx>
 #include <dsitems.hxx>
-#include "dbfindex.hxx"
 #include <vcl/svapp.hxx>
 #include <vcl/weld.hxx>
 #include <vcl/mnemonic.hxx>
-#include <svl/cjkoptions.hxx>
-#if HAVE_FEATURE_JAVA
-#include <jvmaccess/virtualmachine.hxx>
-#endif
-#include <connectivity/CommonTools.hxx>
-#include "DriverSettings.hxx"
-#include <dbadmin.hxx>
-#include <comphelper/string.hxx>
-#include <com/sun/star/task/XInteractionHandler.hpp>
-#include <svl/filenotation.hxx>
-#include <unotools/localfilehelper.hxx>
-#include <unotools/ucbhelper.hxx>
-#include <ucbhelper/commandenvironment.hxx>
-#include "finteraction.hxx"
-#include "DBSetupConnectionPages.hxx"
-#include <unotools/pathoptions.hxx>
-#include <vcl/roadmapwizard.hxx>
 
 namespace
 {
diff --git a/dbaccess/source/ui/dlg/UserAdmin.cxx b/dbaccess/source/ui/dlg/UserAdmin.cxx
index 3a2804b3ac32..17f8b4e4e314 100644
--- a/dbaccess/source/ui/dlg/UserAdmin.cxx
+++ b/dbaccess/source/ui/dlg/UserAdmin.cxx
@@ -18,24 +18,22 @@
  */
 
 #include "UserAdmin.hxx"
-#include <UITools.hxx>
-#include <dbu_dlg.hxx>
 #include <com/sun/star/sdbc/SQLException.hpp>
 #include <com/sun/star/sdbc/XDatabaseMetaData.hpp>
 #include <com/sun/star/sdbcx/XDataDefinitionSupplier.hpp>
 #include <com/sun/star/sdbcx/XUsersSupplier.hpp>
 #include <com/sun/star/sdbcx/XDrop.hpp>
 #include <ucbhelper/interactionrequest.hxx>
-#include <ucbhelper/simpleauthenticationrequest.hxx>
 #include <com/sun/star/sdbcx/XDataDescriptorFactory.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/sdbcx/XUser.hpp>
 #include <com/sun/star/sdbcx/XAppend.hpp>
-#include <stringconstants.hxx>
+#include <IItemSetHelper.hxx>
 #include <strings.hrc>
 #include <strings.hxx>
 #include <core_resource.hxx>
-#include <dbadmin.hxx>
+#include <connectivity/dbexception.hxx>
+#include <connectivity/dbtools.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/weld.hxx>
 #include <sfx2/passwd.hxx>
diff --git a/dbaccess/source/ui/dlg/UserAdminDlg.cxx b/dbaccess/source/ui/dlg/UserAdminDlg.cxx
index 9b30dcaa750a..ec44c33994b9 100644
--- a/dbaccess/source/ui/dlg/UserAdminDlg.cxx
+++ b/dbaccess/source/ui/dlg/UserAdminDlg.cxx
@@ -20,24 +20,18 @@
 #include <core_resource.hxx>
 #include "adminpages.hxx"
 #include "DbAdminImpl.hxx"
-#include <dbu_dlg.hxx>
 #include <strings.hrc>
-#include "DriverSettings.hxx"
-#include <dsitems.hxx>
-#include <UITools.hxx>
 #include "UserAdmin.hxx"
 #include <UserAdminDlg.hxx>
 
 #include <com/sun/star/sdbc/SQLException.hpp>
 
+#include <connectivity/dbexception.hxx>
 #include <connectivity/dbmetadata.hxx>
+#include <connectivity/dbtools.hxx>
 #include <comphelper/types.hxx>
 #include <cppuhelper/exc_hlp.hxx>
-#include <svl/eitem.hxx>
-#include <svl/intitem.hxx>
-#include <svl/stritem.hxx>
 #include <tools/diagnose_ex.h>
-#include <vcl/stdtext.hxx>
 
 namespace dbaui
 {
diff --git a/dbaccess/source/ui/dlg/admincontrols.cxx b/dbaccess/source/ui/dlg/admincontrols.cxx
index 3af6b2a6eb2c..88a3bdc1465f 100644
--- a/dbaccess/source/ui/dlg/admincontrols.cxx
+++ b/dbaccess/source/ui/dlg/admincontrols.cxx
@@ -18,7 +18,6 @@
  */
 
 #include "admincontrols.hxx"
-#include <dbu_dlg.hxx>
 #include <dsitems.hxx>
 
 #include <svl/eitem.hxx>
diff --git a/dbaccess/source/ui/dlg/adminpages.cxx b/dbaccess/source/ui/dlg/adminpages.cxx
index 3f709f845d9d..1b8f70dd49e5 100644
--- a/dbaccess/source/ui/dlg/adminpages.cxx
+++ b/dbaccess/source/ui/dlg/adminpages.cxx
@@ -19,13 +19,12 @@
 
 #include "adminpages.hxx"
 #include <core_resource.hxx>
-#include <dbadmin.hxx>
 #include <dbu_dlg.hxx>
+#include <IItemSetHelper.hxx>
 #include <strings.hrc>
 #include <svl/stritem.hxx>
 #include <svl/eitem.hxx>
 #include <svl/intitem.hxx>
-#include <stringconstants.hxx>
 #include <dsitems.hxx>
 #include "dsselect.hxx"
 #include "odbcconfig.hxx"
@@ -33,13 +32,9 @@
 #include <sqlmessage.hxx>
 
 #include <comphelper/types.hxx>
-#include <osl/file.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/weld.hxx>
 
-#include <algorithm>
-#include <stdlib.h>
-
 namespace dbaui
 {
 
diff --git a/dbaccess/source/ui/dlg/adtabdlg.cxx b/dbaccess/source/ui/dlg/adtabdlg.cxx
index 1a74a67ca6a7..4ad01555d226 100644
--- a/dbaccess/source/ui/dlg/adtabdlg.cxx
+++ b/dbaccess/source/ui/dlg/adtabdlg.cxx
@@ -18,25 +18,16 @@
  */
 
 #include <adtabdlg.hxx>
-#include <sqlmessage.hxx>
-#include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
 #include <core_resource.hxx>
-#include <dbu_dlg.hxx>
 #include <strings.hrc>
-#include <sfx2/sfxsids.hrc>
-#include <QueryTableView.hxx>
-#include <QueryDesignView.hxx>
-#include <querycontroller.hxx>
 #include <connectivity/dbtools.hxx>
-#include <browserids.hxx>
 #include <com/sun/star/container/XContainer.hpp>
 #include <com/sun/star/sdb/application/DatabaseObject.hpp>
 #include <com/sun/star/sdb/XQueriesSupplier.hpp>
 #include <com/sun/star/sdbcx/XViewsSupplier.hpp>
 #include <com/sun/star/sdbcx/XTablesSupplier.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
-#include <UITools.hxx>
 #include <imageprovider.hxx>
 #include <comphelper/containermultiplexer.hxx>
 #include <cppuhelper/basemutex.hxx>
diff --git a/dbaccess/source/ui/dlg/advancedsettings.cxx b/dbaccess/source/ui/dlg/advancedsettings.cxx
index f01985660758..6ec06a9dbeb7 100644
--- a/dbaccess/source/ui/dlg/advancedsettings.cxx
+++ b/dbaccess/source/ui/dlg/advancedsettings.cxx
@@ -27,7 +27,6 @@
 #include "DbAdminImpl.hxx"
 #include "DriverSettings.hxx"
 #include "optionalboolitem.hxx"
-#include <dbu_dlg.hxx>
 
 #include <svl/eitem.hxx>
 #include <svl/intitem.hxx>
diff --git a/dbaccess/source/ui/dlg/dbadmin.cxx b/dbaccess/source/ui/dlg/dbadmin.cxx
index 80f319baa79c..e37541bfd271 100644
--- a/dbaccess/source/ui/dlg/dbadmin.cxx
+++ b/dbaccess/source/ui/dlg/dbadmin.cxx
@@ -22,12 +22,10 @@
 #include "DriverSettings.hxx"
 #include "adminpages.hxx"
 #include <dbadmin.hxx>
-#include <dbu_dlg.hxx>
 #include <svl/stritem.hxx>
 #include <svl/eitem.hxx>
 #include <svl/intitem.hxx>
 #include <core_resource.hxx>
-#include <stringconstants.hxx>
 #include <strings.hrc>
 #include <dsitems.hxx>
 #include "dsnItem.hxx"
diff --git a/dbaccess/source/ui/dlg/dbfindex.cxx b/dbaccess/source/ui/dlg/dbfindex.cxx
index 01e7fcda9e84..84635980b983 100644
--- a/dbaccess/source/ui/dlg/dbfindex.cxx
+++ b/dbaccess/source/ui/dlg/dbfindex.cxx
@@ -22,8 +22,6 @@
 #include <osl/file.hxx>
 #include <osl/thread.hxx>
 #include <tools/config.hxx>
-#include <sfx2/app.hxx>
-#include <dbu_dlg.hxx>
 #include <osl/diagnose.h>
 #include <unotools/localfilehelper.hxx>
 #include <tools/urlobj.hxx>
diff --git a/dbaccess/source/ui/dlg/dbwiz.cxx b/dbaccess/source/ui/dlg/dbwiz.cxx
index 35a61c62a39a..d39fd3c79c29 100644
--- a/dbaccess/source/ui/dlg/dbwiz.cxx
+++ b/dbaccess/source/ui/dlg/dbwiz.cxx
@@ -19,18 +19,12 @@
 
 #include <core_resource.hxx>
 #include <dbwiz.hxx>
-#include <dbu_dlg.hxx>
 #include <strings.hrc>
 #include <strings.hxx>
 #include <dsitems.hxx>
 #include "dsnItem.hxx"
-#include <svl/stritem.hxx>
-#include <svl/eitem.hxx>
-#include <svl/intitem.hxx>
-#include <stringconstants.hxx>
 #include "adminpages.hxx"
 #include "generalpage.hxx"
-#include <stringlistitem.hxx>
 #include <unotools/confignode.hxx>
 #include "ConnectionPage.hxx"
 #include "DriverSettings.hxx"
diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx b/dbaccess/source/ui/dlg/dbwizsetup.cxx
index 5ddc06b33fd0..1dd342c12401 100644
--- a/dbaccess/source/ui/dlg/dbwizsetup.cxx
+++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx
@@ -21,7 +21,6 @@
 #include <dbwizsetup.hxx>
 #include <dsmeta.hxx>
 #include "DBSetupConnectionPages.hxx"
-#include <dbu_dlg.hxx>
 #include <strings.hrc>
 #include <strings.hxx>
 #include <dsitems.hxx>
@@ -29,14 +28,10 @@
 
 #include <unotools/pathoptions.hxx>
 #include <svl/stritem.hxx>
-#include <svl/eitem.hxx>
-#include <svl/intitem.hxx>
-#include <stringconstants.hxx>
 #include "adminpages.hxx"
 #include <sfx2/docfilt.hxx>
 #include <unotools/ucbhelper.hxx>
 #include "generalpage.hxx"
-#include <stringlistitem.hxx>
 #include <unotools/confignode.hxx>
 #include "DbAdminImpl.hxx"
 #include <helpids.h>
@@ -48,30 +43,22 @@
 #include <cppuhelper/implbase.hxx>
 #include <com/sun/star/frame/TerminationVetoException.hpp>
 #include <com/sun/star/frame/XStorable.hpp>
-#include <com/sun/star/sdbcx/XTablesSupplier.hpp>
-#include <com/sun/star/sdbc/XDataSource.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/sdb/DatabaseContext.hpp>
-#include <com/sun/star/sdb/XDocumentDataSource.hpp>
 #include <com/sun/star/frame/Desktop.hpp>
 #include <com/sun/star/frame/FrameSearchFlag.hpp>
 #include <com/sun/star/frame/XComponentLoader.hpp>
 #include <com/sun/star/frame/XModel.hpp>
 #include <com/sun/star/ucb/SimpleFileAccess.hpp>
-#include <com/sun/star/lang/XInitialization.hpp>
-#include <com/sun/star/sdb/CommandType.hpp>
 #include <com/sun/star/ucb/InteractiveIOException.hpp>
 #include <com/sun/star/io/IOException.hpp>
 #include <com/sun/star/frame/XTerminateListener.hpp>
-#include <com/sun/star/sdbc/XDriverAccess.hpp>
 #include <com/sun/star/document/MacroExecMode.hpp>
 #include <com/sun/star/ucb/IOErrorCode.hpp>
 #include <com/sun/star/task/InteractionHandler.hpp>
 #include <com/sun/star/task/XInteractionHandler2.hpp>
-#include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
 #include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
 
-#include <svl/filenotation.hxx>
 #include <comphelper/interaction.hxx>
 #include <comphelper/namedvaluecollection.hxx>
 #include <tools/diagnose_ex.h>
diff --git a/dbaccess/source/ui/dlg/detailpages.cxx b/dbaccess/source/ui/dlg/detailpages.cxx
index 07055200a3f3..1ce6475b6573 100644
--- a/dbaccess/source/ui/dlg/detailpages.cxx
+++ b/dbaccess/source/ui/dlg/detailpages.cxx
@@ -28,21 +28,18 @@
 #include "dbfindex.hxx"
 #include "dsnItem.hxx"
 
-#include <dbu_dlg.hxx>
+#include <IItemSetHelper.hxx>
 #include <strings.hrc>
 
 #include <svl/itemset.hxx>
 #include <svl/stritem.hxx>
 #include <svl/eitem.hxx>
 #include <svl/intitem.hxx>
-#include <vcl/mnemonic.hxx>
-#include <svl/cjkoptions.hxx>
 #if HAVE_FEATURE_JAVA
 #include <jvmaccess/virtualmachine.hxx>
 #endif
 #include <connectivity/CommonTools.hxx>
 #include "DriverSettings.hxx"
-#include <dbadmin.hxx>
 
 namespace dbaui
 {
diff --git a/dbaccess/source/ui/dlg/directsql.cxx b/dbaccess/source/ui/dlg/directsql.cxx
index cc1fb5ae9ee5..5e7b579df72e 100644
--- a/dbaccess/source/ui/dlg/directsql.cxx
+++ b/dbaccess/source/ui/dlg/directsql.cxx
@@ -19,7 +19,6 @@
 
 #include <core_resource.hxx>
 #include <directsql.hxx>
-#include <dbu_dlg.hxx>
 #include <strings.hrc>
 #include <comphelper/types.hxx>
 #include <editeng/colritem.hxx>
@@ -29,7 +28,6 @@
 #include <svl/itemset.hxx>
 #include <svtools/editsyntaxhighlighter.hxx>
 #include <tools/diagnose_ex.h>
-#include <rtl/strbuf.hxx>
 #include <vcl/event.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/weld.hxx>
diff --git a/dbaccess/source/ui/dlg/dlgattr.cxx b/dbaccess/source/ui/dlg/dlgattr.cxx
index 52b3797c69bc..a69f29fe7fb2 100644
--- a/dbaccess/source/ui/dlg/dlgattr.cxx
+++ b/dbaccess/source/ui/dlg/dlgattr.cxx
@@ -24,12 +24,10 @@
 #include <svx/numinf.hxx>
 
 #include <svx/dialogs.hrc>
-#include <dbu_dlg.hxx>
 #include <svl/itemset.hxx>
 #include <svl/zforlist.hxx>
 #include <svx/svxids.hrc>
-#include <svx/flagsdef.hxx>
-#include <svl/intitem.hxx>
+
 using namespace dbaui;
 
 
diff --git a/dbaccess/source/ui/dlg/dlgsave.cxx b/dbaccess/source/ui/dlg/dlgsave.cxx
index ebd84975853a..ce5d16881f1d 100644
--- a/dbaccess/source/ui/dlg/dlgsave.cxx
+++ b/dbaccess/source/ui/dlg/dlgsave.cxx
@@ -19,16 +19,12 @@
 
 #include <dlgsave.hxx>
 #include <core_resource.hxx>
-#include <dbu_dlg.hxx>
 #include <strings.hrc>
 #include <com/sun/star/sdb/CommandType.hpp>
 #include <com/sun/star/sdbc/XRow.hpp>
-#include <sqlmessage.hxx>
 #include <connectivity/dbtools.hxx>
 #include <UITools.hxx>
 #include <SqlNameEdit.hxx>
-#include <com/sun/star/container/XNameAccess.hpp>
-#include <com/sun/star/container/XHierarchicalNameAccess.hpp>
 #include <com/sun/star/sdbc/XDatabaseMetaData.hpp>
 #include <objectnamecheck.hxx>
 #include <tools/diagnose_ex.h>
diff --git a/dbaccess/source/ui/dlg/dlgsize.cxx b/dbaccess/source/ui/dlg/dlgsize.cxx
index 45c624518f1a..5b9f3a1ae839 100644
--- a/dbaccess/source/ui/dlg/dlgsize.cxx
+++ b/dbaccess/source/ui/dlg/dlgsize.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <dlgsize.hxx>
-#include <dbu_dlg.hxx>
 
 namespace dbaui
 {
diff --git a/dbaccess/source/ui/dlg/dsselect.cxx b/dbaccess/source/ui/dlg/dsselect.cxx
index 091f3ef7a67d..4c0b9a836382 100644
--- a/dbaccess/source/ui/dlg/dsselect.cxx
+++ b/dbaccess/source/ui/dlg/dsselect.cxx
@@ -18,20 +18,9 @@
  */
 
 #include "dsselect.hxx"
-#include <dbu_dlg.hxx>
 
 #include <com/sun/star/sdbcx/XCreateCatalog.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/beans/XPropertySetInfo.hpp>
 #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
-#include <com/sun/star/awt/XWindow.hpp>
-#include <stringconstants.hxx>
-#include <dsitems.hxx>
-#include <svl/stritem.hxx>
-#include <svl/intitem.hxx>
-#include <svl/eitem.hxx>
-#include <svl/itemset.hxx>
-#include <sal/log.hxx>
 
 namespace dbaui
 {
diff --git a/dbaccess/source/ui/dlg/generalpage.cxx b/dbaccess/source/ui/dlg/generalpage.cxx
index 055053a76af5..5361fc2d0907 100644
--- a/dbaccess/source/ui/dlg/generalpage.cxx
+++ b/dbaccess/source/ui/dlg/generalpage.cxx
@@ -21,22 +21,14 @@
 #include "dsnItem.hxx"
 #include "generalpage.hxx"
 #include <connectivity/dbexception.hxx>
-#include <dbu_dlg.hxx>
 #include <strings.hrc>
 #include <dsitems.hxx>
-#include <stringconstants.hxx>
-#include <dbadmin.hxx>
 #include <sfx2/filedlghelper.hxx>
 #include <sfx2/docfilt.hxx>
-#include <vcl/stdtext.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/weld.hxx>
 #include <svl/stritem.hxx>
-#include <com/sun/star/sdbc/XDriverAccess.hpp>
-#include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
-#include <com/sun/star/container/XNameAccess.hpp>
-#include "DriverSettings.hxx"
 #include <UITools.hxx>
 #include <comphelper/processfactory.hxx>
 #include <unotools/confignode.hxx>
diff --git a/dbaccess/source/ui/dlg/indexdialog.cxx b/dbaccess/source/ui/dlg/indexdialog.cxx
index 1ab95230acf5..978fa9f36bff 100644
--- a/dbaccess/source/ui/dlg/indexdialog.cxx
+++ b/dbaccess/source/ui/dlg/indexdialog.cxx
@@ -23,17 +23,13 @@
 
 #include <core_resource.hxx>
 #include <indexdialog.hxx>
-#include <dbu_dlg.hxx>
 #include <strings.hrc>
 #include <bitmaps.hlst>
 #include <indexfieldscontrol.hxx>
 #include <indexcollection.hxx>
-#include <vcl/settings.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/weld.hxx>
 #include <com/sun/star/sdb/SQLContext.hpp>
-#include <UITools.hxx>
-#include <browserids.hxx>
 #include <connectivity/dbtools.hxx>
 #include <osl/diagnose.h>
 
diff --git a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx
index 9a51f99ba100..9f11f0ee09a8 100644
--- a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx
+++ b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx
@@ -18,9 +18,7 @@
  */
 
 #include <core_resource.hxx>
-#include <indexcollection.hxx>
 #include <indexfieldscontrol.hxx>
-#include <dbu_dlg.hxx>
 #include <strings.hrc>
 #include <osl/diagnose.h>
 #include <helpids.h>
diff --git a/dbaccess/source/ui/dlg/odbcconfig.cxx b/dbaccess/source/ui/dlg/odbcconfig.cxx
index c9c6e73e1dda..49b120d13588 100644
--- a/dbaccess/source/ui/dlg/odbcconfig.cxx
+++ b/dbaccess/source/ui/dlg/odbcconfig.cxx
@@ -22,7 +22,6 @@
 
 #include <rtl/bootstrap.hxx>
 #include <rtl/ustring.hxx>
-#include <rtl/ustrbuf.hxx>
 #include <osl/diagnose.h>
 #include <osl/process.h>
 #include <osl/thread.hxx>
diff --git a/dbaccess/source/ui/dlg/paramdialog.cxx b/dbaccess/source/ui/dlg/paramdialog.cxx
index dc7d01dfcbc8..a7bd8ae1538f 100644
--- a/dbaccess/source/ui/dlg/paramdialog.cxx
+++ b/dbaccess/source/ui/dlg/paramdialog.cxx
@@ -19,21 +19,15 @@
 
 #include <core_resource.hxx>
 #include <paramdialog.hxx>
-#include <dbu_dlg.hxx>
 #include <strings.hrc>
 #include <strings.hxx>
-#include <commontypes.hxx>
 #include <com/sun/star/util/NumberFormatter.hpp>
-#include <com/sun/star/sdbc/DataType.hpp>
 #include <comphelper/types.hxx>
 #include <connectivity/dbtools.hxx>
-#include <stringconstants.hxx>
-#include <vcl/svapp.hxx>
 #include <vcl/weld.hxx>
 #include <o3tl/safeint.hxx>
 #include <osl/diagnose.h>
 #include <tools/diagnose_ex.h>
-#include <unotools/syslocale.hxx>
 
 namespace dbaui
 {
diff --git a/dbaccess/source/ui/dlg/queryfilter.cxx b/dbaccess/source/ui/dlg/queryfilter.cxx
index b6370d1e6b51..5eeb86ef0869 100644
--- a/dbaccess/source/ui/dlg/queryfilter.cxx
+++ b/dbaccess/source/ui/dlg/queryfilter.cxx
@@ -20,22 +20,14 @@
 #include <queryfilter.hxx>
 #include <com/sun/star/sdbc/DataType.hpp>
 #include <com/sun/star/util/Date.hpp>
-#include <com/sun/star/util/DateTime.hpp>
-#include <com/sun/star/util/Time.hpp>
-#include <com/sun/star/sdb/XSQLQueryComposer.hpp>
 #include <com/sun/star/sdbc/ColumnSearch.hpp>
 #include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
 #include <com/sun/star/sdb/SQLFilterOperator.hpp>
 #include <com/sun/star/sdbc/XConnection.hpp>
-#include <com/sun/star/sdbc/XRow.hpp>
-#include <com/sun/star/sdbc/XResultSet.hpp>
-#include <com/sun/star/container/XNameAccess.hpp>
 #include <comphelper/string.hxx>
 #include <tools/diagnose_ex.h>
 #include <osl/diagnose.h>
-#include <connectivity/sqliterator.hxx>
 #include <connectivity/dbtools.hxx>
-#include <stringconstants.hxx>
 #include <strings.hxx>
 #include <com/sun/star/sdb/XSingleSelectQueryComposer.hpp>
 
diff --git a/dbaccess/source/ui/dlg/queryorder.cxx b/dbaccess/source/ui/dlg/queryorder.cxx
index 292e90621863..f06935f5e72b 100644
--- a/dbaccess/source/ui/dlg/queryorder.cxx
+++ b/dbaccess/source/ui/dlg/queryorder.cxx
@@ -21,18 +21,13 @@
 #include <strings.hxx>
 #include <core_resource.hxx>
 #include <queryorder.hxx>
-#include <stringconstants.hxx>
 #include <com/sun/star/sdb/XSingleSelectQueryComposer.hpp>
 #include <com/sun/star/sdbc/ColumnSearch.hpp>
 #include <com/sun/star/sdbc/XConnection.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
-#include <tools/debug.hxx>
-#include <connectivity/sqliterator.hxx>
 #include <connectivity/dbtools.hxx>
 #include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
 #include <tools/diagnose_ex.h>
-#include <vcl/settings.hxx>
-#include <algorithm>
 
 using namespace dbaui;
 using namespace connectivity;
diff --git a/dbaccess/source/ui/dlg/sqlmessage.cxx b/dbaccess/source/ui/dlg/sqlmessage.cxx
index 73c9aa001221..39ba6dc8eed1 100644
--- a/dbaccess/source/ui/dlg/sqlmessage.cxx
+++ b/dbaccess/source/ui/dlg/sqlmessage.cxx
@@ -19,9 +19,7 @@
 
 #include <core_resource.hxx>
 #include <sqlmessage.hxx>
-#include <dbu_dlg.hxx>
 #include <strings.hrc>
-#include <bitmaps.hlst>
 #include <com/sun/star/sdbc/SQLException.hpp>
 #include <com/sun/star/sdb/SQLContext.hpp>
 #include <vcl/stdtext.hxx>
@@ -31,8 +29,6 @@
 #include <connectivity/dbexception.hxx>
 #include <connectivity/sqlerror.hxx>
 #include <unotools/configmgr.hxx>
-#include <sfx2/sfxuno.hxx>
-#include <UITools.hxx>
 
 #include <tools/urlobj.hxx>
 
diff --git a/dbaccess/source/ui/dlg/tablespage.cxx b/dbaccess/source/ui/dlg/tablespage.cxx
index 7ea6f0050c05..586cf77bf8a4 100644
--- a/dbaccess/source/ui/dlg/tablespage.cxx
+++ b/dbaccess/source/ui/dlg/tablespage.cxx
@@ -18,28 +18,16 @@
  */
 
 #include "tablespage.hxx"
-#include <dbu_dlg.hxx>
 #include <dsitems.hxx>
-#include <browserids.hxx>
 #include <datasourceconnector.hxx>
 #include <comphelper/types.hxx>
 #include <connectivity/dbtools.hxx>
 #include <connectivity/dbexception.hxx>
-#include <i18nlangtag/languagetag.hxx>
 #include <stringlistitem.hxx>
-#include <svl/eitem.hxx>
 #include <svl/stritem.hxx>
-#include <stringconstants.hxx>
 #include <strings.hxx>
-#include <vcl/svapp.hxx>
-#include <vcl/settings.hxx>
-#include <com/sun/star/i18n/Collator.hpp>
-#include <com/sun/star/sdb/SQLContext.hpp>
-#include <com/sun/star/sdbcx/XTablesSupplier.hpp>
-#include <com/sun/star/sdbcx/XAppend.hpp>
+#include <com/sun/star/sdbc/SQLException.hpp>
 #include <com/sun/star/util/XModifiable.hpp>
-#include <com/sun/star/sdbcx/XDrop.hpp>
-#include <com/sun/star/sdbcx/XDataDefinitionSupplier.hpp>
 #include <sqlmessage.hxx>
 #include <UITools.hxx>
 #include <osl/diagnose.h>
@@ -56,7 +44,6 @@ namespace dbaui
     using namespace ::com::sun::star::sdb;
     using namespace ::com::sun::star::beans;
     using namespace ::com::sun::star::lang;
-    using namespace ::com::sun::star::i18n;
     using namespace ::com::sun::star::container;
     using namespace ::com::sun::star::util;
     using namespace ::dbtools;

More information about the Libreoffice-commits mailing list