dbaccess/IwyuFilter_dbaccess.yaml | 8 ++++++++
dbaccess/qa/extras/rowsetclones.cxx | 1 -
dbaccess/qa/unit/CRMDatabase_test.cxx | 6 +-----
dbaccess/qa/unit/embeddeddb_performancetest.cxx | 6 ------
dbaccess/source/core/api/KeySet.hxx | 3 +--
dbaccess/source/core/api/OptimisticSet.cxx | 1 -
dbaccess/source/core/api/RowSet.cxx | 2 --
dbaccess/source/core/api/RowSet.hxx | 2 +-
dbaccess/source/core/api/RowSetBase.hxx | 1 -
dbaccess/source/core/api/StaticSet.cxx | 1 -
dbaccess/source/core/api/column.cxx | 1 -
dbaccess/source/core/api/preparedstatement.cxx | 1 -
dbaccess/source/core/api/querycomposer.cxx | 3 ---
dbaccess/source/core/api/querydescriptor.cxx | 1 -
dbaccess/source/core/api/table.cxx | 1 -
dbaccess/source/core/dataaccess/ComponentDefinition.cxx | 1 -
dbaccess/source/core/dataaccess/ContentHelper.cxx | 1 -
dbaccess/source/core/dataaccess/SharedConnection.cxx | 2 --
dbaccess/source/core/dataaccess/SharedConnection.hxx | 3 ---
dbaccess/source/core/dataaccess/databasecontext.cxx | 5 -----
dbaccess/source/core/dataaccess/databasedocument.cxx | 2 --
dbaccess/source/core/dataaccess/databaseregistrations.cxx | 1 -
dbaccess/source/core/dataaccess/databaseregistrations.hxx | 2 +-
dbaccess/source/core/dataaccess/datasource.cxx | 2 --
dbaccess/source/core/dataaccess/definitioncontainer.cxx | 1 -
dbaccess/source/core/dataaccess/documentcontainer.cxx | 1 -
dbaccess/source/core/dataaccess/documentdefinition.cxx | 2 --
dbaccess/source/core/dataaccess/documenteventexecutor.hxx | 1 -
dbaccess/source/core/dataaccess/documentevents.cxx | 1 -
dbaccess/source/core/dataaccess/myucp_datasupplier.cxx | 1 -
dbaccess/source/core/inc/ModelImpl.hxx | 5 ++---
dbaccess/source/core/inc/connection.hxx | 1 -
dbaccess/source/core/inc/databasecontext.hxx | 1 -
dbaccess/source/core/inc/objectnameapproval.hxx | 1 -
dbaccess/source/core/inc/querycontainer.hxx | 2 --
dbaccess/source/core/inc/statement.hxx | 1 -
dbaccess/source/core/inc/tablecontainer.hxx | 1 -
dbaccess/source/core/inc/viewcontainer.hxx | 1 -
dbaccess/source/core/misc/ContainerMediator.cxx | 1 -
dbaccess/source/core/misc/DatabaseDataProvider.cxx | 1 -
dbaccess/source/core/misc/apitools.cxx | 1 -
dbaccess/source/filter/hsqldb/columndef.cxx | 1 -
dbaccess/source/filter/xml/dbloader2.cxx | 2 --
dbaccess/source/filter/xml/xmlAutoStyle.hxx | 2 +-
dbaccess/source/filter/xml/xmlConnectionData.cxx | 1 -
dbaccess/source/filter/xml/xmlDataSourceSettings.cxx | 1 -
dbaccess/source/filter/xml/xmlDatabase.cxx | 1 -
dbaccess/source/filter/xml/xmlDatabaseDescription.cxx | 1 -
dbaccess/source/filter/xml/xmlDocuments.cxx | 1 -
dbaccess/source/filter/xml/xmlExport.hxx | 4 ----
dbaccess/source/filter/xml/xmlHelper.cxx | 1 -
dbaccess/source/filter/xml/xmlStyleImport.cxx | 2 --
dbaccess/source/filter/xml/xmlTableFilterList.cxx | 1 -
dbaccess/source/filter/xml/xmlfilter.hxx | 1 -
dbaccess/source/inc/OAuthenticationContinuation.hxx | 4 ++--
dbaccess/source/ui/app/AppDetailView.cxx | 1 -
dbaccess/source/ui/app/AppSwapWindow.cxx | 1 -
dbaccess/source/ui/app/AppView.cxx | 1 -
dbaccess/source/ui/browser/brwview.cxx | 1 -
dbaccess/source/ui/browser/dbexchange.cxx | 1 -
dbaccess/source/ui/browser/dsbrowserDnD.cxx | 1 -
dbaccess/source/ui/browser/sbagrid.cxx | 2 --
dbaccess/source/ui/browser/unodatbr.cxx | 1 -
dbaccess/source/ui/control/opendoccontrols.cxx | 1 -
dbaccess/source/ui/dlg/ConnectionPage.cxx | 2 --
dbaccess/source/ui/dlg/ConnectionPageSetup.cxx | 2 --
dbaccess/source/ui/dlg/adtabdlg.cxx | 1 -
dbaccess/source/ui/dlg/dbadmin.cxx | 2 --
dbaccess/source/ui/dlg/dlgsave.cxx | 1 -
dbaccess/source/ui/dlg/dsselect.cxx | 3 ---
dbaccess/source/ui/dlg/generalpage.cxx | 3 ---
dbaccess/source/ui/dlg/queryfilter.cxx | 2 --
dbaccess/source/ui/dlg/queryorder.cxx | 1 -
dbaccess/source/ui/dlg/tablespage.cxx | 1 -
dbaccess/source/ui/inc/CollectionView.hxx | 1 -
dbaccess/source/ui/inc/ConnectionLineAccess.hxx | 1 -
dbaccess/source/ui/inc/JAccess.hxx | 1 -
dbaccess/source/ui/inc/TableConnection.hxx | 1 -
dbaccess/source/ui/inc/TableCopyHelper.hxx | 2 +-
dbaccess/source/ui/inc/TableWindowAccess.hxx | 1 -
dbaccess/source/ui/inc/defaultobjectnamecheck.hxx | 4 +---
dbaccess/source/ui/inc/dsmeta.hxx | 2 --
dbaccess/source/ui/inc/sbagrid.hxx | 1 -
dbaccess/source/ui/inc/unodatbr.hxx | 1 -
dbaccess/source/ui/misc/DExport.cxx | 1 -
dbaccess/source/ui/misc/HtmlReader.cxx | 4 ----
dbaccess/source/ui/misc/RtfReader.cxx | 4 ----
dbaccess/source/ui/misc/TableCopyHelper.cxx | 2 +-
dbaccess/source/ui/misc/TokenWriter.cxx | 1 -
dbaccess/source/ui/misc/UITools.cxx | 2 --
dbaccess/source/ui/misc/WColumnSelect.cxx | 1 -
dbaccess/source/ui/misc/WCopyTable.cxx | 1 -
dbaccess/source/ui/misc/datasourceconnector.cxx | 1 -
dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx | 1 -
dbaccess/source/ui/misc/defaultobjectnamecheck.cxx | 2 +-
dbaccess/source/ui/misc/dsmeta.cxx | 1 -
dbaccess/source/ui/misc/linkeddocuments.cxx | 2 --
dbaccess/source/ui/misc/singledoccontroller.cxx | 1 -
dbaccess/source/ui/querydesign/ConnectionLine.cxx | 1 -
dbaccess/source/ui/querydesign/JoinController.cxx | 2 --
dbaccess/source/ui/querydesign/QTableConnectionData.cxx | 2 --
dbaccess/source/ui/querydesign/TableFieldDescription.cxx | 1 -
dbaccess/source/ui/querydesign/limitboxcontroller.cxx | 1 -
dbaccess/source/ui/querydesign/querycontroller.cxx | 2 --
dbaccess/source/ui/relationdesign/RTableConnectionData.cxx | 1 -
dbaccess/source/ui/relationdesign/RelationController.cxx | 1 -
dbaccess/source/ui/relationdesign/RelationTableView.cxx | 2 --
dbaccess/source/ui/tabledesign/TEditControl.cxx | 5 ++---
dbaccess/source/ui/tabledesign/TableRowExchange.cxx | 2 +-
dbaccess/source/ui/tabledesign/TableUndo.cxx | 2 +-
dbaccess/source/ui/uno/textconnectionsettings_uno.cxx | 1 -
dbaccess/source/ui/uno/unoDirectSql.cxx | 1 -
desktop/inc/lib/init.hxx | 1 -
desktop/source/app/app.cxx | 4 ++++
desktop/source/app/appinit.cxx | 1 -
desktop/source/app/dispatchwatcher.hxx | 1 +
desktop/source/app/officeipcthread.cxx | 1 -
desktop/source/app/officeipcthread.hxx | 1 -
desktop/source/deployment/gui/dp_gui_dialog2.cxx | 2 --
desktop/source/deployment/gui/dp_gui_dialog2.hxx | 2 --
desktop/source/deployment/gui/dp_gui_updatedialog.cxx | 2 --
desktop/source/deployment/gui/license_dialog.cxx | 1 -
desktop/source/deployment/misc/dp_descriptioninfoset.cxx | 1 -
desktop/source/deployment/misc/dp_misc.cxx | 1 -
desktop/source/deployment/misc/dp_resource.cxx | 2 --
desktop/source/deployment/registry/executable/dp_executable.cxx | 1 -
desktop/source/deployment/registry/package/dp_package.cxx | 1 -
desktop/source/deployment/registry/sfwk/dp_parceldesc.hxx | 1 -
desktop/source/lib/init.cxx | 1 -
desktop/source/migration/services/jvmfwk.cxx | 1 -
desktop/source/pkgchk/unopkg/unopkg_shared.h | 1 -
desktop/unx/source/splashx.c | 3 ---
desktop/unx/source/start.c | 2 --
133 files changed, 30 insertions(+), 195 deletions(-)
New commits:
commit 3765f46745ed659e00039481bc1df00819c39ded
Author: Gabor Kelemen <gabor.kele...@collabora.com>
AuthorDate: Fri Aug 15 17:12:59 2025 +0200
Commit: Gabor Kelemen <gabor.kelemen.ext...@allotropia.de>
CommitDate: Sat Sep 13 09:23:36 2025 +0200
tdf#146619 Run IWYU on desktop/
Change-Id: Iff8f62782c3935e012574ea29877495fb2aa34ec
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/189779
Tested-by: Jenkins
Reviewed-by: Gabor Kelemen <gabor.kelemen.ext...@allotropia.de>
diff --git a/desktop/inc/lib/init.hxx b/desktop/inc/lib/init.hxx
index 04a72802e4f5..51d6903071d3 100644
--- a/desktop/inc/lib/init.hxx
+++ b/desktop/inc/lib/init.hxx
@@ -23,7 +23,6 @@
#include <osl/thread.h>
#include <rtl/ref.hxx>
#include <rtl/strbuf.hxx>
-#include <vcl/idle.hxx>
#include <LibreOfficeKit/LibreOfficeKit.h>
#include <LibreOfficeKit/LibreOfficeKitEnums.h>
#include <com/sun/star/beans/PropertyValue.hpp>
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 2a803500d4e6..b604ceca4955 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -58,7 +58,9 @@
#include <com/sun/star/frame/XSynchronousDispatch.hpp>
#include <com/sun/star/configuration/theDefaultProvider.hpp>
#include <com/sun/star/util/XFlushable.hpp>
+#if HAVE_FEATURE_UPDATE_MAR
#include <com/sun/star/system/SystemShellExecuteFlags.hpp>
+#endif
#include <com/sun/star/frame/Desktop.hpp>
#include <com/sun/star/frame/StartModule.hpp>
#include <com/sun/star/awt/XTopWindow.hpp>
@@ -170,7 +172,9 @@ using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::frame;
using namespace ::com::sun::star::document;
using namespace ::com::sun::star::task;
+#if HAVE_FEATURE_UPDATE_MAR
using namespace ::com::sun::star::system;
+#endif
using namespace ::com::sun::star::ui;
using namespace ::com::sun::star::ui::dialogs;
using namespace ::com::sun::star::container;
diff --git a/desktop/source/app/appinit.cxx b/desktop/source/app/appinit.cxx
index f4fd9c621c87..33b2e4ea42a1 100644
--- a/desktop/source/app/appinit.cxx
+++ b/desktop/source/app/appinit.cxx
@@ -23,7 +23,6 @@
#include <app.hxx>
#include <dp_shared.hxx>
-#include <initjsunoscripting.hxx>
#include "cmdlineargs.hxx"
#include <strings.hrc>
#include <com/sun/star/lang/XInitialization.hpp>
diff --git a/desktop/source/app/dispatchwatcher.hxx
b/desktop/source/app/dispatchwatcher.hxx
index a6b53a74d2a1..c75e1aa3677e 100644
--- a/desktop/source/app/dispatchwatcher.hxx
+++ b/desktop/source/app/dispatchwatcher.hxx
@@ -21,6 +21,7 @@
#include <cppuhelper/implbase.hxx>
#include <com/sun/star/frame/XDispatchResultListener.hpp>
+#include <o3tl/typed_flags_set.hxx>
#include <optional>
#include <atomic>
#include <vector>
diff --git a/desktop/source/app/officeipcthread.cxx
b/desktop/source/app/officeipcthread.cxx
index 76dbec575e4d..9c1a040768b2 100644
--- a/desktop/source/app/officeipcthread.cxx
+++ b/desktop/source/app/officeipcthread.cxx
@@ -35,7 +35,6 @@
#include <vcl/svapp.hxx>
#include <unotools/configmgr.hxx>
#include <osl/pipe.hxx>
-#include <rtl/digest.h>
#include <rtl/ustrbuf.hxx>
#include <osl/conditn.hxx>
#include <unotools/moduleoptions.hxx>
diff --git a/desktop/source/app/officeipcthread.hxx
b/desktop/source/app/officeipcthread.hxx
index 3f7f4c00d602..3ef272c434e0 100644
--- a/desktop/source/app/officeipcthread.hxx
+++ b/desktop/source/app/officeipcthread.hxx
@@ -70,7 +70,6 @@ struct ProcessDocumentsRequest
bool bScriptCat; // boolean flag indicating whether to dump script content
to console
};
-class DispatchWatcher;
class IpcThread;
class PipeIpcThread;
class DbusIpcThread;
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx
b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
index e2b547d382db..5e34e4d18065 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
@@ -59,9 +59,7 @@
#include <com/sun/star/system/SystemShellExecuteFlags.hpp>
#include <com/sun/star/system/SystemShellExecute.hpp>
-#include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
#include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
-#include <com/sun/star/ui/dialogs/XFilePicker3.hpp>
#include <officecfg/Office/ExtensionManager.hxx>
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.hxx
b/desktop/source/deployment/gui/dp_gui_dialog2.hxx
index 36c6dddb9c1d..5bfa8ba0aca2 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.hxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.hxx
@@ -25,8 +25,6 @@
#include <vcl/customweld.hxx>
#include <vcl/weld.hxx>
-#include <mutex>
-
#include <rtl/ustring.hxx>
#include <cppuhelper/implbase.hxx>
diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
index da576ee07b52..f3998e286353 100644
--- a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
@@ -72,8 +72,6 @@
#include "dp_gui_updatedialog.hxx"
#include <dp_shared.hxx>
-class KeyEvent;
-class MouseEvent;
namespace com::sun::star::uno {
class XComponentContext;
}
diff --git a/desktop/source/deployment/gui/license_dialog.cxx
b/desktop/source/deployment/gui/license_dialog.cxx
index 12bfcd5ef04f..0677fb247904 100644
--- a/desktop/source/deployment/gui/license_dialog.cxx
+++ b/desktop/source/deployment/gui/license_dialog.cxx
@@ -28,7 +28,6 @@
#include "license_dialog.hxx"
-#include <functional>
#include <string_view>
using namespace ::com::sun::star;
diff --git a/desktop/source/deployment/misc/dp_descriptioninfoset.cxx
b/desktop/source/deployment/misc/dp_descriptioninfoset.cxx
index 73000af5ddb6..a25da33c50a4 100644
--- a/desktop/source/deployment/misc/dp_descriptioninfoset.cxx
+++ b/desktop/source/deployment/misc/dp_descriptioninfoset.cxx
@@ -38,7 +38,6 @@
#include <com/sun/star/lang/WrappedTargetRuntimeException.hpp>
#include <com/sun/star/task/XInteractionHandler.hpp>
#include <com/sun/star/ucb/XCommandEnvironment.hpp>
-#include <com/sun/star/ucb/XProgressHandler.hpp>
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/uno/RuntimeException.hpp>
#include <com/sun/star/uno/Sequence.hxx>
diff --git a/desktop/source/deployment/misc/dp_misc.cxx
b/desktop/source/deployment/misc/dp_misc.cxx
index e0de3cba3f38..008303342583 100644
--- a/desktop/source/deployment/misc/dp_misc.cxx
+++ b/desktop/source/deployment/misc/dp_misc.cxx
@@ -23,7 +23,6 @@
#include <dp_misc.h>
#include <dp_interact.h>
#include <dp_shared.hxx>
-#include <o3tl/string_view.hxx>
#include <rtl/uri.hxx>
#include <rtl/digest.h>
#include <rtl/random.h>
diff --git a/desktop/source/deployment/misc/dp_resource.cxx
b/desktop/source/deployment/misc/dp_resource.cxx
index 30caef8d9a7d..1969be49058d 100644
--- a/desktop/source/deployment/misc/dp_resource.cxx
+++ b/desktop/source/deployment/misc/dp_resource.cxx
@@ -21,8 +21,6 @@
#include <unotools/configmgr.hxx>
#include <i18nlangtag/languagetag.hxx>
-using namespace ::com::sun::star;
-
namespace dp_misc
{
const LanguageTag& getOfficeLanguageTag()
diff --git a/desktop/source/deployment/registry/executable/dp_executable.cxx
b/desktop/source/deployment/registry/executable/dp_executable.cxx
index ce15db9f7eb9..35ce4179bd7b 100644
--- a/desktop/source/deployment/registry/executable/dp_executable.cxx
+++ b/desktop/source/deployment/registry/executable/dp_executable.cxx
@@ -24,7 +24,6 @@
#include <dp_misc.h>
#include <dp_backend.h>
#include <dp_ucb.h>
-#include <dp_interact.h>
#include <com/sun/star/lang/IllegalArgumentException.hpp>
#include <osl/file.hxx>
#include <ucbhelper/content.hxx>
diff --git a/desktop/source/deployment/registry/package/dp_package.cxx
b/desktop/source/deployment/registry/package/dp_package.cxx
index 21b2fba25452..fad839c2d886 100644
--- a/desktop/source/deployment/registry/package/dp_package.cxx
+++ b/desktop/source/deployment/registry/package/dp_package.cxx
@@ -41,7 +41,6 @@
#include <comphelper/propertyvalue.hxx>
#include <comphelper/sequence.hxx>
#include <com/sun/star/lang/WrappedTargetException.hpp>
-#include <com/sun/star/graphic/XGraphic.hpp>
#include <com/sun/star/graphic/GraphicProvider.hpp>
#include <com/sun/star/graphic/XGraphicProvider.hpp>
#include <com/sun/star/io/Pipe.hpp>
diff --git a/desktop/source/deployment/registry/sfwk/dp_parceldesc.hxx
b/desktop/source/deployment/registry/sfwk/dp_parceldesc.hxx
index 6b5bde8bdd4c..8629078277ce 100644
--- a/desktop/source/deployment/registry/sfwk/dp_parceldesc.hxx
+++ b/desktop/source/deployment/registry/sfwk/dp_parceldesc.hxx
@@ -21,7 +21,6 @@
#include <cppuhelper/implbase.hxx>
-#include <com/sun/star/xml/sax/XAttributeList.hpp>
#include <com/sun/star/xml/sax/XDocumentHandler.hpp>
namespace dp_registry::backend::sfwk
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index c53a51014e76..5404a2b7999f 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -213,7 +213,6 @@
#include <svx/pageitem.hxx>
#include <app.hxx>
-#include <initjsunoscripting.hxx>
#include "../app/cmdlineargs.hxx"
// We also need to hackily be able to start the main libreoffice thread:
diff --git a/desktop/source/migration/services/jvmfwk.cxx
b/desktop/source/migration/services/jvmfwk.cxx
index 8d46ac59ccea..eb1d6bd19c05 100644
--- a/desktop/source/migration/services/jvmfwk.cxx
+++ b/desktop/source/migration/services/jvmfwk.cxx
@@ -31,7 +31,6 @@
#include <com/sun/star/configuration/backend/XLayer.hpp>
#include <com/sun/star/configuration/backend/XLayerHandler.hpp>
#include <com/sun/star/configuration/backend/MalformedDataException.hpp>
-#include <com/sun/star/configuration/backend/TemplateIdentifier.hpp>
#include <jvmfwk/framework.hxx>
#include "jvmfwk.hxx"
#include <memory>
diff --git a/desktop/source/pkgchk/unopkg/unopkg_shared.h
b/desktop/source/pkgchk/unopkg/unopkg_shared.h
index ac8322629093..33e7d61e1340 100644
--- a/desktop/source/pkgchk/unopkg/unopkg_shared.h
+++ b/desktop/source/pkgchk/unopkg/unopkg_shared.h
@@ -20,7 +20,6 @@
#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/ucb/XCommandEnvironment.hpp>
#include <com/sun/star/deployment/XPackage.hpp>
-#include <osl/diagnose.h>
#include <rtl/ustring.hxx>
#include <utility>
diff --git a/desktop/unx/source/splashx.c b/desktop/unx/source/splashx.c
index 13fe6ef679f4..a207e9d0117b 100644
--- a/desktop/unx/source/splashx.c
+++ b/desktop/unx/source/splashx.c
@@ -19,19 +19,16 @@
#include <X11/extensions/Xinerama.h>
#include <osl/endian.h>
-#include <fcntl.h>
#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <unistd.h>
#include <png.h>
#include <osl/process.h>
#include <osl/thread.h>
#include <rtl/bootstrap.h>
-#include <rtl/ustrbuf.h>
typedef struct {
unsigned char b, g, r;
diff --git a/desktop/unx/source/start.c b/desktop/unx/source/start.c
index fce975227fa5..2529e214ff8c 100644
--- a/desktop/unx/source/start.c
+++ b/desktop/unx/source/start.c
@@ -16,9 +16,7 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/socket.h>
-#include <arpa/inet.h>
#include <sys/un.h>
-#include <poll.h>
#include <fcntl.h>
#include <stdio.h>
#include <libgen.h>
commit 2060e38e11e7c28a1209ad061c2afb417ed6609f
Author: Gabor Kelemen <gabor.kele...@collabora.com>
AuthorDate: Thu Aug 14 21:06:18 2025 +0200
Commit: Gabor Kelemen <gabor.kelemen.ext...@allotropia.de>
CommitDate: Sat Sep 13 09:23:23 2025 +0200
tdf#146619 Run IWYU on dbaccess/
Change-Id: I86a60f94268ee3594c68fe9f1dfb4e2c819ac616
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/189784
Tested-by: Jenkins
Reviewed-by: Gabor Kelemen <gabor.kelemen.ext...@allotropia.de>
diff --git a/dbaccess/IwyuFilter_dbaccess.yaml
b/dbaccess/IwyuFilter_dbaccess.yaml
index 2e2d73d88b0b..afd00322e626 100644
--- a/dbaccess/IwyuFilter_dbaccess.yaml
+++ b/dbaccess/IwyuFilter_dbaccess.yaml
@@ -37,6 +37,9 @@ excludelist:
dbaccess/source/core/dataaccess/documentevents.cxx:
# Actually used
- com/sun/star/beans/PropertyValue.hpp
+ dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx:
+ # Actually used
+ - com/sun/star/lang/XServiceInfo.hpp
dbaccess/source/core/misc/DatabaseDataProvider.cxx:
# Needed for UnoType macro to work
- com/sun/star/task/XInteractionHandler.hpp
@@ -56,12 +59,17 @@ excludelist:
dbaccess/source/filter/xml/xmlExport.cxx:
# Needed for template
- com/sun/star/frame/XModel.hpp
+ dbaccess/source/filter/xml/xmlfilter.cxx:
+ # Needed for template
+ - com/sun/star/frame/XModel.hpp
dbaccess/source/ui/inc/dsitems.hxx:
# Needed in fwdecl mode
- class OptionalBoolItem
- class SfxBoolItem
- class SfxInt32Item
- class SfxStringItem
+ # Needed for TypedWhichId in macros
+ - svl/typedwhich.hxx
dbaccess/source/ui/app/AppDetailPageHelper.cxx:
# Actually used
- com/sun/star/sdbc/XConnection.hpp
diff --git a/dbaccess/qa/extras/rowsetclones.cxx
b/dbaccess/qa/extras/rowsetclones.cxx
index 8ffaeea202b2..134b4b61f542 100644
--- a/dbaccess/qa/extras/rowsetclones.cxx
+++ b/dbaccess/qa/extras/rowsetclones.cxx
@@ -14,7 +14,6 @@
#include <com/sun/star/sdbc/XConnection.hpp>
#include <com/sun/star/sdbc/XResultSet.hpp>
#include <com/sun/star/sdbc/XRow.hpp>
-#include <com/sun/star/sdbcx/XRowLocate.hpp>
#include <com/sun/star/sdbc/XRowSet.hpp>
#include <com/sun/star/sdb/XResultSetAccess.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/dbaccess/qa/unit/CRMDatabase_test.cxx
b/dbaccess/qa/unit/CRMDatabase_test.cxx
index 3ca1d5c7db82..0c445450e27c 100644
--- a/dbaccess/qa/unit/CRMDatabase_test.cxx
+++ b/dbaccess/qa/unit/CRMDatabase_test.cxx
@@ -11,11 +11,8 @@
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/container/XNameAccess.hpp>
-#include <com/sun/star/frame/XStorable.hpp>
-#include <com/sun/star/lang/XSingleServiceFactory.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/sdb/DatabaseContext.hpp>
-#include <com/sun/star/sdb/XDocumentDataSource.hpp>
+#include <com/sun/star/sdb/XDatabaseContext.hpp>
#include <com/sun/star/sdb/XOfficeDatabaseDocument.hpp>
#include <com/sun/star/sdb/XQueriesSupplier.hpp>
#include <com/sun/star/sdb/XSingleSelectQueryComposer.hpp>
@@ -24,7 +21,6 @@
#include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
#include <com/sun/star/sdbc/XResultSet.hpp>
#include <com/sun/star/sdbc/XRow.hpp>
-#include <com/sun/star/uno/XNamingService.hpp>
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
diff --git a/dbaccess/qa/unit/embeddeddb_performancetest.cxx
b/dbaccess/qa/unit/embeddeddb_performancetest.cxx
index 01444e8592f0..0a1d88e764e9 100644
--- a/dbaccess/qa/unit/embeddeddb_performancetest.cxx
+++ b/dbaccess/qa/unit/embeddeddb_performancetest.cxx
@@ -11,13 +11,10 @@
#include <memory>
#include <o3tl/environment.hxx>
-#include <osl/process.h>
#include <osl/time.h>
#include <rtl/ustrbuf.hxx>
#include <tools/stream.hxx>
-#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/frame/XStorable.hpp>
#include <com/sun/star/sdb/XOfficeDatabaseDocument.hpp>
#include <com/sun/star/sdbc/XConnection.hpp>
#include <com/sun/star/sdbc/XParameters.hpp>
@@ -27,9 +24,6 @@
#include <com/sun/star/sdbc/XStatement.hpp>
using namespace ::com::sun::star;
-using namespace ::com::sun::star::beans;
-using namespace ::com::sun::star::frame;
-using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::sdb;
using namespace ::com::sun::star::sdbc;
using namespace ::com::sun::star::uno;
diff --git a/dbaccess/source/core/api/KeySet.hxx
b/dbaccess/source/core/api/KeySet.hxx
index 37cde22d7e32..b23f89d4cedb 100644
--- a/dbaccess/source/core/api/KeySet.hxx
+++ b/dbaccess/source/core/api/KeySet.hxx
@@ -20,6 +20,7 @@
#pragma once
#include "CacheSet.hxx"
+#include "PrivateRow.hxx"
#include <memory>
#include <map>
@@ -32,8 +33,6 @@
namespace dbaccess
{
- class OPrivateRow;
-
struct SelectColumnDescription
{
OUString sRealName; // may be empty
diff --git a/dbaccess/source/core/api/OptimisticSet.cxx
b/dbaccess/source/core/api/OptimisticSet.cxx
index a74ec45e41d7..b58ce088a72b 100644
--- a/dbaccess/source/core/api/OptimisticSet.cxx
+++ b/dbaccess/source/core/api/OptimisticSet.cxx
@@ -23,7 +23,6 @@
#include <core_resource.hxx>
#include <strings.hrc>
#include <strings.hxx>
-#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/sdbc/XDatabaseMetaData.hpp>
#include <com/sun/star/sdbc/XPreparedStatement.hpp>
diff --git a/dbaccess/source/core/api/RowSet.cxx
b/dbaccess/source/core/api/RowSet.cxx
index 4f1dd11fcf5b..5d9f5eaa787e 100644
--- a/dbaccess/source/core/api/RowSet.cxx
+++ b/dbaccess/source/core/api/RowSet.cxx
@@ -56,7 +56,6 @@
#include <comphelper/extract.hxx>
#include <comphelper/seqstream.hxx>
#include <comphelper/sequence.hxx>
-#include <comphelper/servicehelper.hxx>
#include <comphelper/types.hxx>
#include <comphelper/uno3.hxx>
#include <connectivity/BlobHelper.hxx>
@@ -64,7 +63,6 @@
#include <connectivity/dbexception.hxx>
#include <connectivity/dbtools.hxx>
#include <cppuhelper/exc_hlp.hxx>
-#include <cppuhelper/interfacecontainer.h>
#include <cppuhelper/supportsservice.hxx>
#include <cppuhelper/typeprovider.hxx>
#include <i18nlangtag/languagetag.hxx>
diff --git a/dbaccess/source/core/api/RowSet.hxx
b/dbaccess/source/core/api/RowSet.hxx
index 6ca1d47578dc..245bc7308fcf 100644
--- a/dbaccess/source/core/api/RowSet.hxx
+++ b/dbaccess/source/core/api/RowSet.hxx
@@ -24,7 +24,6 @@
#include <atomic>
#include <cstddef>
-#include <apitools.hxx>
#include "RowSetBase.hxx"
#include <com/sun/star/sdbc/XPreparedStatement.hpp>
@@ -42,6 +41,7 @@
#include <com/sun/star/sdb/XParametersSupplier.hpp>
#include <com/sun/star/sdb/XRowsChangeBroadcaster.hpp>
+#include <cppuhelper/compbase.hxx>
#include <cppuhelper/compbase12.hxx>
#include <cppuhelper/basemutex.hxx>
#include <comphelper/interfacecontainer3.hxx>
diff --git a/dbaccess/source/core/api/RowSetBase.hxx
b/dbaccess/source/core/api/RowSetBase.hxx
index 547a792d7aeb..8e2506c8803b 100644
--- a/dbaccess/source/core/api/RowSetBase.hxx
+++ b/dbaccess/source/core/api/RowSetBase.hxx
@@ -35,7 +35,6 @@
#include <comphelper/proparrhlp.hxx>
#include <com/sun/star/sdbc/XRowSet.hpp>
#include <com/sun/star/util/XNumberFormatTypes.hpp>
-#include <com/sun/star/container/XNameAccess.hpp>
#include "RowSetRow.hxx"
#include "RowSetCacheIterator.hxx"
diff --git a/dbaccess/source/core/api/StaticSet.cxx
b/dbaccess/source/core/api/StaticSet.cxx
index 57eea66f34cf..254734ad7dce 100644
--- a/dbaccess/source/core/api/StaticSet.cxx
+++ b/dbaccess/source/core/api/StaticSet.cxx
@@ -20,7 +20,6 @@
#include "StaticSet.hxx"
#include <com/sun/star/sdbcx/CompareBookmark.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
#include <connectivity/CommonTools.hxx>
#include <comphelper/types.hxx>
#include <o3tl/safeint.hxx>
diff --git a/dbaccess/source/core/api/column.cxx
b/dbaccess/source/core/api/column.cxx
index e0775417c3dd..b51dc53bc11b 100644
--- a/dbaccess/source/core/api/column.cxx
+++ b/dbaccess/source/core/api/column.cxx
@@ -29,7 +29,6 @@
#include <com/sun/star/sdb/tools/XTableAlteration.hpp>
#include <comphelper/sequence.hxx>
-#include <comphelper/types.hxx>
#include <comphelper/uno3.hxx>
#include <connectivity/TTableHelper.hxx>
#include <connectivity/dbexception.hxx>
diff --git a/dbaccess/source/core/api/preparedstatement.cxx
b/dbaccess/source/core/api/preparedstatement.cxx
index 506da4908f44..7688d23a363c 100644
--- a/dbaccess/source/core/api/preparedstatement.cxx
+++ b/dbaccess/source/core/api/preparedstatement.cxx
@@ -18,7 +18,6 @@
*/
-#include <com/sun/star/lang/DisposedException.hpp>
#include <com/sun/star/sdbc/XConnection.hpp>
#include <com/sun/star/sdbc/XDatabaseMetaData.hpp>
#include <com/sun/star/sdbc/SQLException.hpp>
diff --git a/dbaccess/source/core/api/querycomposer.cxx
b/dbaccess/source/core/api/querycomposer.cxx
index 68d59673e310..d39bd24e5f4a 100644
--- a/dbaccess/source/core/api/querycomposer.cxx
+++ b/dbaccess/source/core/api/querycomposer.cxx
@@ -17,13 +17,10 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <com/sun/star/lang/DisposedException.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/sdbc/ColumnSearch.hpp>
#include <com/sun/star/sdbc/XConnection.hpp>
#include <comphelper/sequence.hxx>
#include <cppuhelper/supportsservice.hxx>
-#include <unotools/configmgr.hxx>
#include <comphelper/types.hxx>
#include <com/sun/star/sdb/SQLFilterOperator.hpp>
#include <querycomposer.hxx>
diff --git a/dbaccess/source/core/api/querydescriptor.cxx
b/dbaccess/source/core/api/querydescriptor.cxx
index 116a132eb72d..aa1d9b8f931b 100644
--- a/dbaccess/source/core/api/querydescriptor.cxx
+++ b/dbaccess/source/core/api/querydescriptor.cxx
@@ -20,7 +20,6 @@
#include "querydescriptor.hxx"
#include <stringconstants.hxx>
#include <strings.hxx>
-#include <comphelper/servicehelper.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <com/sun/star/beans/PropertyAttribute.hpp>
diff --git a/dbaccess/source/core/api/table.cxx
b/dbaccess/source/core/api/table.cxx
index 2ba0dda7bc32..8bee907134f2 100644
--- a/dbaccess/source/core/api/table.cxx
+++ b/dbaccess/source/core/api/table.cxx
@@ -26,7 +26,6 @@
#include "CIndexes.hxx"
#include <osl/diagnose.h>
-#include <comphelper/servicehelper.hxx>
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <com/sun/star/sdbc/SQLException.hpp>
#include <com/sun/star/sdb/tools/XTableRename.hpp>
diff --git a/dbaccess/source/core/dataaccess/ComponentDefinition.cxx
b/dbaccess/source/core/dataaccess/ComponentDefinition.cxx
index a36adad3f40a..6eff582b72e2 100644
--- a/dbaccess/source/core/dataaccess/ComponentDefinition.cxx
+++ b/dbaccess/source/core/dataaccess/ComponentDefinition.cxx
@@ -23,7 +23,6 @@
#include <osl/diagnose.h>
#include <com/sun/star/beans/PropertyAttribute.hpp>
-//#include <cppuhelper/interfacecontainer.hxx>
#include <comphelper/property.hxx>
#include <comphelper/propertysequence.hxx>
#include <definitioncolumn.hxx>
diff --git a/dbaccess/source/core/dataaccess/ContentHelper.cxx
b/dbaccess/source/core/dataaccess/ContentHelper.cxx
index 6736e22d9bd6..f3460b38c174 100644
--- a/dbaccess/source/core/dataaccess/ContentHelper.cxx
+++ b/dbaccess/source/core/dataaccess/ContentHelper.cxx
@@ -31,7 +31,6 @@
#include <com/sun/star/container/ElementExistException.hpp>
#include <ucbhelper/propertyvalueset.hxx>
#include <ucbhelper/contentidentifier.hxx>
-#include <comphelper/servicehelper.hxx>
#include <comphelper/diagnose_ex.hxx>
#include <sdbcoretools.hxx>
#include <stringconstants.hxx>
diff --git a/dbaccess/source/core/dataaccess/SharedConnection.cxx
b/dbaccess/source/core/dataaccess/SharedConnection.cxx
index 86dae318ede9..1e6156202bd7 100644
--- a/dbaccess/source/core/dataaccess/SharedConnection.cxx
+++ b/dbaccess/source/core/dataaccess/SharedConnection.cxx
@@ -18,12 +18,10 @@
*/
#include "SharedConnection.hxx"
-#include <comphelper/uno3.hxx>
namespace dbaccess
{
using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::sdbc;
using namespace ::com::sun::star::container;
using namespace connectivity;
diff --git a/dbaccess/source/core/dataaccess/SharedConnection.hxx
b/dbaccess/source/core/dataaccess/SharedConnection.hxx
index e4467c44d060..0eb93f02eac8 100644
--- a/dbaccess/source/core/dataaccess/SharedConnection.hxx
+++ b/dbaccess/source/core/dataaccess/SharedConnection.hxx
@@ -20,11 +20,8 @@
#include <connectivity/ConnectionWrapper.hxx>
#include <connectivity/CommonTools.hxx>
-#include <cppuhelper/compbase.hxx>
-#include <cppuhelper/basemutex.hxx>
#include <com/sun/star/sdbc/SQLException.hpp>
#include <com/sun/star/sdbc/XConnection.hpp>
-#include <comphelper/sequence.hxx>
namespace dbaccess
{
diff --git a/dbaccess/source/core/dataaccess/databasecontext.cxx
b/dbaccess/source/core/dataaccess/databasecontext.cxx
index 412e34ca2a50..8b4f815f3414 100644
--- a/dbaccess/source/core/dataaccess/databasecontext.cxx
+++ b/dbaccess/source/core/dataaccess/databasecontext.cxx
@@ -34,10 +34,7 @@
#include <com/sun/star/frame/TerminationVetoException.hpp>
#include <com/sun/star/frame/XLoadable.hpp>
#include <com/sun/star/frame/XModel.hpp>
-#include <com/sun/star/frame/XModel2.hpp>
#include <com/sun/star/frame/XTerminateListener.hpp>
-#include <com/sun/star/lang/DisposedException.hpp>
-#include <com/sun/star/registry/InvalidRegistryException.hpp>
#include <com/sun/star/sdbc/XDataSource.hpp>
#include <com/sun/star/task/InteractionClassification.hpp>
#include <com/sun/star/ucb/InteractiveIOException.hpp>
@@ -45,13 +42,11 @@
#include <com/sun/star/uri/UriReferenceFactory.hpp>
#include <com/sun/star/task/InteractionHandler.hpp>
#include <com/sun/star/util/CloseVetoException.hpp>
-#include <com/sun/star/util/XCloseable.hpp>
#include <basic/basmgr.hxx>
#include <comphelper/enumhelper.hxx>
#include <comphelper/namedvaluecollection.hxx>
#include <comphelper/processfactory.hxx>
-#include <comphelper/servicehelper.hxx>
#include <cppuhelper/implbase.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <cppuhelper/exc_hlp.hxx>
diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx
b/dbaccess/source/core/dataaccess/databasedocument.cxx
index 0e2eb08524d9..8be42a59112e 100644
--- a/dbaccess/source/core/dataaccess/databasedocument.cxx
+++ b/dbaccess/source/core/dataaccess/databasedocument.cxx
@@ -51,7 +51,6 @@
#include <com/sun/star/ui/UIConfigurationManager.hpp>
#include <com/sun/star/util/CloseVetoException.hpp>
#include <com/sun/star/view/XSelectionSupplier.hpp>
-#include <com/sun/star/xml/sax/XDocumentHandler.hpp>
#include <com/sun/star/xml/sax/Writer.hpp>
#include <com/sun/star/script/XStorageBasedLibraryContainer.hpp>
@@ -63,7 +62,6 @@
#include <comphelper/genericpropertyset.hxx>
#include <comphelper/namedvaluecollection.hxx>
#include <comphelper/numberedcollection.hxx>
-#include <comphelper/servicehelper.hxx>
#include <comphelper/storagehelper.hxx>
#include <comphelper/propertysetinfo.hxx>
#include <comphelper/types.hxx>
diff --git a/dbaccess/source/core/dataaccess/databaseregistrations.cxx
b/dbaccess/source/core/dataaccess/databaseregistrations.cxx
index a328eb39ecf8..4c9c80de2e1a 100644
--- a/dbaccess/source/core/dataaccess/databaseregistrations.cxx
+++ b/dbaccess/source/core/dataaccess/databaseregistrations.cxx
@@ -23,7 +23,6 @@
#include <com/sun/star/lang/IllegalArgumentException.hpp>
#include <com/sun/star/container/ElementExistException.hpp>
#include <com/sun/star/container/NoSuchElementException.hpp>
-#include <com/sun/star/sdb/XDatabaseRegistrations.hpp>
#include <cppuhelper/basemutex.hxx>
#include <comphelper/interfacecontainer3.hxx>
diff --git a/dbaccess/source/core/dataaccess/databaseregistrations.hxx
b/dbaccess/source/core/dataaccess/databaseregistrations.hxx
index 52def1de5aa2..f6bdd8cdcf52 100644
--- a/dbaccess/source/core/dataaccess/databaseregistrations.hxx
+++ b/dbaccess/source/core/dataaccess/databaseregistrations.hxx
@@ -19,7 +19,7 @@
#pragma once
-#include <com/sun/star/uno/XAggregation.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/sdb/XDatabaseRegistrations.hpp>
namespace dbaccess
diff --git a/dbaccess/source/core/dataaccess/datasource.cxx
b/dbaccess/source/core/dataaccess/datasource.cxx
index af166a92caa6..b1aa595cd8d9 100644
--- a/dbaccess/source/core/dataaccess/datasource.cxx
+++ b/dbaccess/source/core/dataaccess/datasource.cxx
@@ -35,7 +35,6 @@
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <com/sun/star/beans/PropertyState.hpp>
#include <com/sun/star/document/XDocumentSubStorageSupplier.hpp>
-#include <com/sun/star/lang/DisposedException.hpp>
#include <com/sun/star/reflection/ProxyFactory.hpp>
#include <com/sun/star/sdb/DatabaseContext.hpp>
#include <com/sun/star/sdb/SQLContext.hpp>
@@ -59,7 +58,6 @@
#include <comphelper/diagnose_ex.hxx>
#include <o3tl/environment.hxx>
#include <osl/diagnose.h>
-#include <osl/process.h>
#include <sal/log.hxx>
#include <tools/urlobj.hxx>
#include <unotools/sharedunocomponent.hxx>
diff --git a/dbaccess/source/core/dataaccess/definitioncontainer.cxx
b/dbaccess/source/core/dataaccess/definitioncontainer.cxx
index 9f050d79e08b..91e36d2a925d 100644
--- a/dbaccess/source/core/dataaccess/definitioncontainer.cxx
+++ b/dbaccess/source/core/dataaccess/definitioncontainer.cxx
@@ -31,7 +31,6 @@
#include <com/sun/star/lang/WrappedTargetRuntimeException.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/sdb/ErrorCondition.hpp>
-#include <comphelper/servicehelper.hxx>
#include <comphelper/types.hxx>
#include <rtl/ref.hxx>
diff --git a/dbaccess/source/core/dataaccess/documentcontainer.cxx
b/dbaccess/source/core/dataaccess/documentcontainer.cxx
index 85661d8b270c..217ae7f4391f 100644
--- a/dbaccess/source/core/dataaccess/documentcontainer.cxx
+++ b/dbaccess/source/core/dataaccess/documentcontainer.cxx
@@ -37,7 +37,6 @@
#include <strings.hxx>
#include <comphelper/namedvaluecollection.hxx>
#include <comphelper/propertysequence.hxx>
-#include <comphelper/servicehelper.hxx>
#include <com/sun/star/lang/WrappedTargetRuntimeException.hpp>
#include <vcl/svapp.hxx>
diff --git a/dbaccess/source/core/dataaccess/documentdefinition.cxx
b/dbaccess/source/core/dataaccess/documentdefinition.cxx
index 04da2b8f6e7e..9c3f4fe7a3b8 100644
--- a/dbaccess/source/core/dataaccess/documentdefinition.cxx
+++ b/dbaccess/source/core/dataaccess/documentdefinition.cxx
@@ -31,7 +31,6 @@
#include <comphelper/propertysequence.hxx>
#include <comphelper/propertyvalue.hxx>
#include <comphelper/types.hxx>
-#include <com/sun/star/frame/XUntitledNumbers.hpp>
#include <com/sun/star/awt/Size.hpp>
#include <com/sun/star/lang/DisposedException.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
@@ -83,7 +82,6 @@
#include <com/sun/star/task/XInteractionApprove.hpp>
#include <com/sun/star/task/XInteractionDisapprove.hpp>
#include <com/sun/star/frame/XLayoutManager.hpp>
-#include <cppuhelper/compbase.hxx>
#include <cppuhelper/exc_hlp.hxx>
#include <cppuhelper/implbase.hxx>
#include <comphelper/mimeconfighelper.hxx>
diff --git a/dbaccess/source/core/dataaccess/documenteventexecutor.hxx
b/dbaccess/source/core/dataaccess/documenteventexecutor.hxx
index e012846c83e9..fd64a9d458cb 100644
--- a/dbaccess/source/core/dataaccess/documenteventexecutor.hxx
+++ b/dbaccess/source/core/dataaccess/documenteventexecutor.hxx
@@ -20,7 +20,6 @@
#pragma once
#include <com/sun/star/document/XDocumentEventListener.hpp>
-#include <com/sun/star/document/XEventsSupplier.hpp>
#include <cppuhelper/implbase.hxx>
#include <unotools/weakref.hxx>
diff --git a/dbaccess/source/core/dataaccess/documentevents.cxx
b/dbaccess/source/core/dataaccess/documentevents.cxx
index 66c312417ecb..6482fe9564b3 100644
--- a/dbaccess/source/core/dataaccess/documentevents.cxx
+++ b/dbaccess/source/core/dataaccess/documentevents.cxx
@@ -21,7 +21,6 @@
#include <com/sun/star/beans/PropertyValue.hpp>
-#include <o3tl/string_view.hxx>
#include <osl/diagnose.h>
#include <comphelper/namedvaluecollection.hxx>
#include <comphelper/sequence.hxx>
diff --git a/dbaccess/source/core/dataaccess/myucp_datasupplier.cxx
b/dbaccess/source/core/dataaccess/myucp_datasupplier.cxx
index 483712b90dac..825c288883d2 100644
--- a/dbaccess/source/core/dataaccess/myucp_datasupplier.cxx
+++ b/dbaccess/source/core/dataaccess/myucp_datasupplier.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <utility>
#include <vector>
#include "myucp_datasupplier.hxx"
diff --git a/dbaccess/source/core/inc/ModelImpl.hxx
b/dbaccess/source/core/inc/ModelImpl.hxx
index e20c32b5f3f5..c35a99ad508b 100644
--- a/dbaccess/source/core/inc/ModelImpl.hxx
+++ b/dbaccess/source/core/inc/ModelImpl.hxx
@@ -19,6 +19,7 @@
#pragma once
+#include "connection.hxx"
#include "ContentHelper.hxx"
#include "documentevents.hxx"
@@ -26,10 +27,9 @@
#include <com/sun/star/beans/XPropertyBag.hpp>
#include <com/sun/star/document/XDocumentSubStorageSupplier.hpp>
#include <com/sun/star/embed/XStorage.hpp>
-#include <com/sun/star/frame/XModel.hpp>
#include <com/sun/star/lang/XEventListener.hpp>
#include <com/sun/star/lang/XSingleServiceFactory.hpp>
-#include <com/sun/star/reflection/ProxyFactory.hpp>
+#include <com/sun/star/reflection/XProxyFactory.hpp>
#include <com/sun/star/script/XStorageBasedLibraryContainer.hpp>
#include <com/sun/star/sdbc/XDataSource.hpp>
#include <com/sun/star/util/XNumberFormatsSupplier.hpp>
@@ -51,7 +51,6 @@
namespace dbaccess
{
class OCommandContainer;
-class OConnection;
typedef std::vector< css::uno::WeakReference< css::sdbc::XConnection > >
OWeakConnectionArray;
diff --git a/dbaccess/source/core/inc/connection.hxx
b/dbaccess/source/core/inc/connection.hxx
index 31f2c924bde1..9756b07ed3f0 100644
--- a/dbaccess/source/core/inc/connection.hxx
+++ b/dbaccess/source/core/inc/connection.hxx
@@ -43,7 +43,6 @@
#include <com/sun/star/sdb/application/XTableUIProvider.hpp>
#include <com/sun/star/sdbc/XWarningsSupplier.hpp>
-#include <cppuhelper/implbase13.hxx>
#include <connectivity/ConnectionWrapper.hxx>
#include <connectivity/CommonTools.hxx>
#include <connectivity/warningscontainer.hxx>
diff --git a/dbaccess/source/core/inc/databasecontext.hxx
b/dbaccess/source/core/inc/databasecontext.hxx
index 8b8dd2b40fbb..827295f1be23 100644
--- a/dbaccess/source/core/inc/databasecontext.hxx
+++ b/dbaccess/source/core/inc/databasecontext.hxx
@@ -30,7 +30,6 @@
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/sdb/XDatabaseContext.hpp>
#include <com/sun/star/sdb/XDatabaseRegistrations.hpp>
-#include <com/sun/star/uno/XAggregation.hpp>
#if HAVE_FEATURE_SCRIPTING
#include <basic/basrdll.hxx>
diff --git a/dbaccess/source/core/inc/objectnameapproval.hxx
b/dbaccess/source/core/inc/objectnameapproval.hxx
index e503c347ea4e..6aa3e9c2b464 100644
--- a/dbaccess/source/core/inc/objectnameapproval.hxx
+++ b/dbaccess/source/core/inc/objectnameapproval.hxx
@@ -19,7 +19,6 @@
#pragma once
-#include <memory>
#include "containerapprove.hxx"
#include <cppuhelper/weakref.hxx>
#include <com/sun/star/sdbc/XConnection.hpp>
diff --git a/dbaccess/source/core/inc/querycontainer.hxx
b/dbaccess/source/core/inc/querycontainer.hxx
index df4b1acea5f1..f36e605ce3a3 100644
--- a/dbaccess/source/core/inc/querycontainer.hxx
+++ b/dbaccess/source/core/inc/querycontainer.hxx
@@ -23,10 +23,8 @@
#include <connectivity/CommonTools.hxx>
#include <rtl/ref.hxx>
-#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/container/XContainerListener.hpp>
#include <com/sun/star/container/XNameContainer.hpp>
-#include <com/sun/star/uno/Sequence.hxx>
#include <com/sun/star/sdbcx/XDataDescriptorFactory.hpp>
#include <com/sun/star/sdbcx/XAppend.hpp>
#include <com/sun/star/sdbcx/XDrop.hpp>
diff --git a/dbaccess/source/core/inc/statement.hxx
b/dbaccess/source/core/inc/statement.hxx
index 17726d7d0f0b..cde3d1cf9c6a 100644
--- a/dbaccess/source/core/inc/statement.hxx
+++ b/dbaccess/source/core/inc/statement.hxx
@@ -20,7 +20,6 @@
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/sdbc/XStatement.hpp>
-#include <com/sun/star/sdbc/XConnection.hpp>
#include <com/sun/star/util/XCancellable.hpp>
#include <com/sun/star/sdbc/XWarningsSupplier.hpp>
#include <com/sun/star/sdbc/XCloseable.hpp>
diff --git a/dbaccess/source/core/inc/tablecontainer.hxx
b/dbaccess/source/core/inc/tablecontainer.hxx
index 985cf3e5e8aa..ba2ddb13ae19 100644
--- a/dbaccess/source/core/inc/tablecontainer.hxx
+++ b/dbaccess/source/core/inc/tablecontainer.hxx
@@ -27,7 +27,6 @@
#include <cppuhelper/implbase1.hxx>
#include <rtl/ref.hxx>
#include <com/sun/star/sdbc/XConnection.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/container/XContainerListener.hpp>
#include <com/sun/star/container/XNameContainer.hpp>
#include "FilteredContainer.hxx"
diff --git a/dbaccess/source/core/inc/viewcontainer.hxx
b/dbaccess/source/core/inc/viewcontainer.hxx
index 52928e79e686..017ac7630dba 100644
--- a/dbaccess/source/core/inc/viewcontainer.hxx
+++ b/dbaccess/source/core/inc/viewcontainer.hxx
@@ -26,7 +26,6 @@
#include <cppuhelper/implbase1.hxx>
-#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/container/XContainerListener.hpp>
#include "FilteredContainer.hxx"
diff --git a/dbaccess/source/core/misc/ContainerMediator.cxx
b/dbaccess/source/core/misc/ContainerMediator.cxx
index 0ee0d2e1f93c..3c6fcb55de0c 100644
--- a/dbaccess/source/core/misc/ContainerMediator.cxx
+++ b/dbaccess/source/core/misc/ContainerMediator.cxx
@@ -22,7 +22,6 @@
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <com/sun/star/container/XNameContainer.hpp>
-#include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
#include <com/sun/star/sdbcx/XRename.hpp>
#include <comphelper/property.hxx>
#include <comphelper/diagnose_ex.hxx>
diff --git a/dbaccess/source/core/misc/DatabaseDataProvider.cxx
b/dbaccess/source/core/misc/DatabaseDataProvider.cxx
index cfc3d0a55b63..1104d8f28b6f 100644
--- a/dbaccess/source/core/misc/DatabaseDataProvider.cxx
+++ b/dbaccess/source/core/misc/DatabaseDataProvider.cxx
@@ -23,7 +23,6 @@
#include <comphelper/types.hxx>
#include <comphelper/namedvaluecollection.hxx>
#include <connectivity/FValue.hxx>
-#include <sal/macros.h>
#include <comphelper/diagnose_ex.hxx>
#include <com/sun/star/task/XInteractionHandler.hpp>
diff --git a/dbaccess/source/core/misc/apitools.cxx
b/dbaccess/source/core/misc/apitools.cxx
index 2693f59eebb9..0d29f7102628 100644
--- a/dbaccess/source/core/misc/apitools.cxx
+++ b/dbaccess/source/core/misc/apitools.cxx
@@ -18,7 +18,6 @@
*/
#include <apitools.hxx>
-#include <cppuhelper/typeprovider.hxx>
#include <sal/log.hxx>
using namespace ::com::sun::star::uno;
diff --git a/dbaccess/source/filter/hsqldb/columndef.cxx
b/dbaccess/source/filter/hsqldb/columndef.cxx
index 643e8187627d..22acf31768e0 100644
--- a/dbaccess/source/filter/hsqldb/columndef.cxx
+++ b/dbaccess/source/filter/hsqldb/columndef.cxx
@@ -19,7 +19,6 @@
*/
#include "columndef.hxx"
-#include <com/sun/star/sdbc/DataType.hpp>
#include <utility>
namespace dbahsql
diff --git a/dbaccess/source/filter/xml/dbloader2.cxx
b/dbaccess/source/filter/xml/dbloader2.cxx
index 2d722b8e8c9c..9bf4f01a2c6b 100644
--- a/dbaccess/source/filter/xml/dbloader2.cxx
+++ b/dbaccess/source/filter/xml/dbloader2.cxx
@@ -19,11 +19,9 @@
#include <strings.hxx>
-#include <com/sun/star/beans/NamedValue.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/document/XExtendedFilterDetection.hpp>
#include <com/sun/star/embed/ElementModes.hpp>
-#include <com/sun/star/embed/XStorage.hpp>
#include <com/sun/star/frame/Desktop.hpp>
#include <com/sun/star/frame/XController2.hpp>
#include <com/sun/star/frame/XFrame.hpp>
diff --git a/dbaccess/source/filter/xml/xmlAutoStyle.hxx
b/dbaccess/source/filter/xml/xmlAutoStyle.hxx
index d358b50f7230..c316524ea837 100644
--- a/dbaccess/source/filter/xml/xmlAutoStyle.hxx
+++ b/dbaccess/source/filter/xml/xmlAutoStyle.hxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#pragma once
-#include <xmloff/maptype.hxx>
+
#include <xmloff/xmlaustp.hxx>
namespace dbaxml
diff --git a/dbaccess/source/filter/xml/xmlConnectionData.cxx
b/dbaccess/source/filter/xml/xmlConnectionData.cxx
index 221358537481..adf1d0323885 100644
--- a/dbaccess/source/filter/xml/xmlConnectionData.cxx
+++ b/dbaccess/source/filter/xml/xmlConnectionData.cxx
@@ -30,7 +30,6 @@
namespace dbaxml
{
using namespace ::com::sun::star::uno;
- using namespace ::com::sun::star::xml::sax;
OXMLConnectionData::OXMLConnectionData( ODBFilter& rImport) :
SvXMLImportContext( rImport )
diff --git a/dbaccess/source/filter/xml/xmlDataSourceSettings.cxx
b/dbaccess/source/filter/xml/xmlDataSourceSettings.cxx
index 49847ef541ed..e28657b5f00c 100644
--- a/dbaccess/source/filter/xml/xmlDataSourceSettings.cxx
+++ b/dbaccess/source/filter/xml/xmlDataSourceSettings.cxx
@@ -27,7 +27,6 @@
namespace dbaxml
{
using namespace ::com::sun::star::uno;
- using namespace ::com::sun::star::xml::sax;
OXMLDataSourceSettings::OXMLDataSourceSettings( ODBFilter& rImport ) :
SvXMLImportContext( rImport )
diff --git a/dbaccess/source/filter/xml/xmlDatabase.cxx
b/dbaccess/source/filter/xml/xmlDatabase.cxx
index 3c56a58f8d67..054914c6f486 100644
--- a/dbaccess/source/filter/xml/xmlDatabase.cxx
+++ b/dbaccess/source/filter/xml/xmlDatabase.cxx
@@ -37,7 +37,6 @@ namespace dbaxml
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::sdb;
using namespace ::com::sun::star::sdbcx;
- using namespace ::com::sun::star::xml::sax;
OXMLDatabase::OXMLDatabase( ODBFilter& rImport ) :
SvXMLImportContext( rImport )
diff --git a/dbaccess/source/filter/xml/xmlDatabaseDescription.cxx
b/dbaccess/source/filter/xml/xmlDatabaseDescription.cxx
index a8168e129501..6a09cea6e650 100644
--- a/dbaccess/source/filter/xml/xmlDatabaseDescription.cxx
+++ b/dbaccess/source/filter/xml/xmlDatabaseDescription.cxx
@@ -28,7 +28,6 @@
namespace dbaxml
{
using namespace ::com::sun::star::uno;
- using namespace ::com::sun::star::xml::sax;
OXMLDatabaseDescription::OXMLDatabaseDescription( ODBFilter& rImport ) :
SvXMLImportContext( rImport )
diff --git a/dbaccess/source/filter/xml/xmlDocuments.cxx
b/dbaccess/source/filter/xml/xmlDocuments.cxx
index 80834d353735..61569ebbdcb9 100644
--- a/dbaccess/source/filter/xml/xmlDocuments.cxx
+++ b/dbaccess/source/filter/xml/xmlDocuments.cxx
@@ -32,7 +32,6 @@ namespace dbaxml
{
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::container;
- using namespace ::com::sun::star::xml::sax;
OXMLDocuments::OXMLDocuments( ODBFilter& rImport
,const Reference< XNameAccess >& _xContainer
diff --git a/dbaccess/source/filter/xml/xmlExport.hxx
b/dbaccess/source/filter/xml/xmlExport.hxx
index fa808eaf6378..7695f9da9851 100644
--- a/dbaccess/source/filter/xml/xmlExport.hxx
+++ b/dbaccess/source/filter/xml/xmlExport.hxx
@@ -19,12 +19,8 @@
#pragma once
-#include <com/sun/star/container/XNamed.hpp>
-#include <com/sun/star/document/XFilter.hpp>
#include <com/sun/star/document/XImporter.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/lang/XComponent.hpp>
-#include <com/sun/star/io/XActiveDataSource.hpp>
#include <optional>
#include <utility>
diff --git a/dbaccess/source/filter/xml/xmlHelper.cxx
b/dbaccess/source/filter/xml/xmlHelper.cxx
index 5386a4036843..eb0e7d16f9b4 100644
--- a/dbaccess/source/filter/xml/xmlHelper.cxx
+++ b/dbaccess/source/filter/xml/xmlHelper.cxx
@@ -25,7 +25,6 @@
#include <xmloff/xmltypes.hxx>
#include <xmloff/maptype.hxx>
-#include <com/sun/star/awt/TextAlign.hpp>
#include <strings.hxx>
#include <rtl/ref.hxx>
diff --git a/dbaccess/source/filter/xml/xmlStyleImport.cxx
b/dbaccess/source/filter/xml/xmlStyleImport.cxx
index 4f3824008638..7db5b097dc3b 100644
--- a/dbaccess/source/filter/xml/xmlStyleImport.cxx
+++ b/dbaccess/source/filter/xml/xmlStyleImport.cxx
@@ -33,9 +33,7 @@ namespace dbaxml
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::xml::sax;
using namespace ::com::sun::star::style;
-using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::container;
using namespace xmloff::token;
diff --git a/dbaccess/source/filter/xml/xmlTableFilterList.cxx
b/dbaccess/source/filter/xml/xmlTableFilterList.cxx
index a6541684acba..487516acaff5 100644
--- a/dbaccess/source/filter/xml/xmlTableFilterList.cxx
+++ b/dbaccess/source/filter/xml/xmlTableFilterList.cxx
@@ -34,7 +34,6 @@ namespace dbaxml
using namespace ::xmloff::token;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::beans;
- using namespace ::com::sun::star::xml::sax;
OXMLTableFilterList::OXMLTableFilterList( SvXMLImport& rImport)
:SvXMLImportContext( rImport )
diff --git a/dbaccess/source/filter/xml/xmlfilter.hxx
b/dbaccess/source/filter/xml/xmlfilter.hxx
index ec776cd75f87..3d362bf869c3 100644
--- a/dbaccess/source/filter/xml/xmlfilter.hxx
+++ b/dbaccess/source/filter/xml/xmlfilter.hxx
@@ -28,7 +28,6 @@
#include <xmloff/xmlprmap.hxx>
#include <map>
-#include <memory>
namespace dbaxml
diff --git a/dbaccess/source/inc/OAuthenticationContinuation.hxx
b/dbaccess/source/inc/OAuthenticationContinuation.hxx
index a87203e7a64c..dbb6c571c4d2 100644
--- a/dbaccess/source/inc/OAuthenticationContinuation.hxx
+++ b/dbaccess/source/inc/OAuthenticationContinuation.hxx
@@ -19,11 +19,11 @@
#pragma once
+#include <config_options.h>
+
#include <dbadllapi.hxx>
#include <com/sun/star/ucb/XInteractionSupplyAuthentication.hpp>
-#include <com/sun/star/ucb/RememberAuthentication.hpp>
-#include <com/sun/star/uno/Sequence.hxx>
#include <rtl/ustring.hxx>
#include <comphelper/interaction.hxx>
diff --git a/dbaccess/source/ui/app/AppDetailView.cxx
b/dbaccess/source/ui/app/AppDetailView.cxx
index 68b47ae89539..eec21b32d33e 100644
--- a/dbaccess/source/ui/app/AppDetailView.cxx
+++ b/dbaccess/source/ui/app/AppDetailView.cxx
@@ -26,7 +26,6 @@
#include <com/sun/star/ui/theModuleUIConfigurationManagerSupplier.hpp>
#include <com/sun/star/ui/XImageManager.hpp>
#include <com/sun/star/ui/ImageType.hpp>
-#include <com/sun/star/sdbcx/XViewsSupplier.hpp>
#include <com/sun/star/graphic/XGraphic.hpp>
#include <com/sun/star/util/URL.hpp>
#include <core_resource.hxx>
diff --git a/dbaccess/source/ui/app/AppSwapWindow.cxx
b/dbaccess/source/ui/app/AppSwapWindow.cxx
index b1edf21f28a6..605e249efdce 100644
--- a/dbaccess/source/ui/app/AppSwapWindow.cxx
+++ b/dbaccess/source/ui/app/AppSwapWindow.cxx
@@ -27,7 +27,6 @@
#include "AppController.hxx"
using namespace ::dbaui;
-using namespace ::com::sun::star::uno;
OApplicationSwapWindow::OApplicationSwapWindow(weld::Container* pParent,
OAppBorderWindow& rBorderWindow)
diff --git a/dbaccess/source/ui/app/AppView.cxx
b/dbaccess/source/ui/app/AppView.cxx
index 0d8969c46cbb..78c5fc00caea 100644
--- a/dbaccess/source/ui/app/AppView.cxx
+++ b/dbaccess/source/ui/app/AppView.cxx
@@ -33,7 +33,6 @@
using namespace ::dbaui;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::ucb;
-using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::sdb;
using namespace ::com::sun::star::sdbc;
using namespace ::com::sun::star::sdbcx;
diff --git a/dbaccess/source/ui/browser/brwview.cxx
b/dbaccess/source/ui/browser/brwview.cxx
index 6a15ce0fca39..92b265657366 100644
--- a/dbaccess/source/ui/browser/brwview.cxx
+++ b/dbaccess/source/ui/browser/brwview.cxx
@@ -35,7 +35,6 @@ using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::form;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::container;
-using namespace ::com::sun::star::lang;
namespace
{
diff --git a/dbaccess/source/ui/browser/dbexchange.cxx
b/dbaccess/source/ui/browser/dbexchange.cxx
index dc318dc0f61c..7803001c78e9 100644
--- a/dbaccess/source/ui/browser/dbexchange.cxx
+++ b/dbaccess/source/ui/browser/dbexchange.cxx
@@ -21,7 +21,6 @@
#include <sot/formats.hxx>
#include <sot/storage.hxx>
#include <osl/diagnose.h>
-#include <com/sun/star/sdb/CommandType.hpp>
#include <com/sun/star/sdb/XResultSetAccess.hpp>
#include <com/sun/star/lang/XComponent.hpp>
#include <TokenWriter.hxx>
diff --git a/dbaccess/source/ui/browser/dsbrowserDnD.cxx
b/dbaccess/source/ui/browser/dsbrowserDnD.cxx
index 774f43b4c7a4..dfc04e2d991c 100644
--- a/dbaccess/source/ui/browser/dsbrowserDnD.cxx
+++ b/dbaccess/source/ui/browser/dsbrowserDnD.cxx
@@ -28,7 +28,6 @@
#include <com/sun/star/sdbc/SQLException.hpp>
#include <connectivity/dbexception.hxx>
-#include <connectivity/dbtools.hxx>
#include <cppuhelper/exc_hlp.hxx>
#include <svx/dataaccessdescriptor.hxx>
#include <comphelper/diagnose_ex.hxx>
diff --git a/dbaccess/source/ui/browser/sbagrid.cxx
b/dbaccess/source/ui/browser/sbagrid.cxx
index 58017ff4c24c..e962b8331b1e 100644
--- a/dbaccess/source/ui/browser/sbagrid.cxx
+++ b/dbaccess/source/ui/browser/sbagrid.cxx
@@ -30,7 +30,6 @@
#include <com/sun/star/form/XForm.hpp>
#include <com/sun/star/container/XIndexContainer.hpp>
-#include <com/sun/star/view/XSelectionSupplier.hpp>
#include <com/sun/star/awt/XTextComponent.hpp>
#include <com/sun/star/sdbc/XResultSetUpdate.hpp>
#include <comphelper/diagnose_ex.hxx>
@@ -57,7 +56,6 @@
using namespace ::com::sun::star::ui::dialogs;
using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::sdb;
using namespace ::com::sun::star::sdbc;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::container;
diff --git a/dbaccess/source/ui/browser/unodatbr.cxx
b/dbaccess/source/ui/browser/unodatbr.cxx
index 283f3680afd6..6a5ea3a1aea7 100644
--- a/dbaccess/source/ui/browser/unodatbr.cxx
+++ b/dbaccess/source/ui/browser/unodatbr.cxx
@@ -70,7 +70,6 @@
#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>
#include <comphelper/extract.hxx>
#include <comphelper/sequence.hxx>
diff --git a/dbaccess/source/ui/control/opendoccontrols.cxx
b/dbaccess/source/ui/control/opendoccontrols.cxx
index 58f12c9e01a0..2b1fe7b80181 100644
--- a/dbaccess/source/ui/control/opendoccontrols.cxx
+++ b/dbaccess/source/ui/control/opendoccontrols.cxx
@@ -25,7 +25,6 @@
#include <com/sun/star/container/XNameAccess.hpp>
#include <com/sun/star/ui/theModuleUIConfigurationManagerSupplier.hpp>
#include <com/sun/star/ui/XUIConfigurationManager.hpp>
-#include <com/sun/star/graphic/XGraphic.hpp>
#include <com/sun/star/ui/XImageManager.hpp>
#include <comphelper/processfactory.hxx>
diff --git a/dbaccess/source/ui/dlg/ConnectionPage.cxx
b/dbaccess/source/ui/dlg/ConnectionPage.cxx
index c7293deea86e..7ce288a076c0 100644
--- a/dbaccess/source/ui/dlg/ConnectionPage.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionPage.cxx
@@ -32,8 +32,6 @@
#include <dsitems.hxx>
#include <helpids.h>
#include <sqlmessage.hxx>
-#include <svl/filenotation.hxx>
-#include <com/sun/star/ucb/XProgressHandler.hpp>
#include <connectivity/CommonTools.hxx>
#include <o3tl/string_view.hxx>
diff --git a/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx
b/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx
index f27225c003be..33bb8f01c6fc 100644
--- a/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx
@@ -23,8 +23,6 @@
#include <IItemSetHelper.hxx>
#include <svl/itemset.hxx>
#include <dsitems.hxx>
-#include <svl/filenotation.hxx>
-#include <com/sun/star/ucb/XProgressHandler.hpp>
namespace dbaui
{
diff --git a/dbaccess/source/ui/dlg/adtabdlg.cxx
b/dbaccess/source/ui/dlg/adtabdlg.cxx
index ade72252fda1..9871db56c898 100644
--- a/dbaccess/source/ui/dlg/adtabdlg.cxx
+++ b/dbaccess/source/ui/dlg/adtabdlg.cxx
@@ -31,7 +31,6 @@
#include <imageprovider.hxx>
#include <comphelper/containermultiplexer.hxx>
#include <cppuhelper/basemutex.hxx>
-#include <algorithm>
// slot ids
using namespace dbaui;
diff --git a/dbaccess/source/ui/dlg/dbadmin.cxx
b/dbaccess/source/ui/dlg/dbadmin.cxx
index 27b226256736..37b0301f4d82 100644
--- a/dbaccess/source/ui/dlg/dbadmin.cxx
+++ b/dbaccess/source/ui/dlg/dbadmin.cxx
@@ -32,8 +32,6 @@
#include "optionalboolitem.hxx"
#include <stringlistitem.hxx>
-#include <unotools/confignode.hxx>
-
namespace dbaui
{
using namespace com::sun::star::uno;
diff --git a/dbaccess/source/ui/dlg/dlgsave.cxx
b/dbaccess/source/ui/dlg/dlgsave.cxx
index 0bb460428d46..b07eb152ec11 100644
--- a/dbaccess/source/ui/dlg/dlgsave.cxx
+++ b/dbaccess/source/ui/dlg/dlgsave.cxx
@@ -25,7 +25,6 @@
#include <connectivity/dbtools.hxx>
#include <UITools.hxx>
#include <objectnamecheck.hxx>
-#include <utility>
#include <comphelper/diagnose_ex.hxx>
using namespace dbaui;
diff --git a/dbaccess/source/ui/dlg/dsselect.cxx
b/dbaccess/source/ui/dlg/dsselect.cxx
index 3d4a17b8ffcd..adb24331c236 100644
--- a/dbaccess/source/ui/dlg/dsselect.cxx
+++ b/dbaccess/source/ui/dlg/dsselect.cxx
@@ -19,9 +19,6 @@
#include "dsselect.hxx"
-#include <com/sun/star/sdbcx/XCreateCatalog.hpp>
-#include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
-
namespace dbaui
{
ODatasourceSelectDialog::ODatasourceSelectDialog(weld::Window* _pParent, const
std::set<OUString>& _rDatasources)
diff --git a/dbaccess/source/ui/dlg/generalpage.cxx
b/dbaccess/source/ui/dlg/generalpage.cxx
index 2030860d1ac6..b6f2b359ccac 100644
--- a/dbaccess/source/ui/dlg/generalpage.cxx
+++ b/dbaccess/source/ui/dlg/generalpage.cxx
@@ -21,7 +21,6 @@
#include <core_resource.hxx>
#include "dsnItem.hxx"
#include "generalpage.hxx"
-#include <connectivity/dbexception.hxx>
#include <strings.hrc>
#include <dsitems.hxx>
#include <sfx2/filedlghelper.hxx>
@@ -44,8 +43,6 @@ namespace dbaui
{
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
- using namespace ::com::sun::star::sdbc;
- using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::container;
// OGeneralPage
diff --git a/dbaccess/source/ui/dlg/queryfilter.cxx
b/dbaccess/source/ui/dlg/queryfilter.cxx
index 4ffd8d070249..b99d59597901 100644
--- a/dbaccess/source/ui/dlg/queryfilter.cxx
+++ b/dbaccess/source/ui/dlg/queryfilter.cxx
@@ -18,8 +18,6 @@
*/
#include <queryfilter.hxx>
-#include <com/sun/star/sdbc/DataType.hpp>
-#include <com/sun/star/util/Date.hpp>
#include <com/sun/star/sdbc/ColumnSearch.hpp>
#include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
#include <com/sun/star/sdb/SQLFilterOperator.hpp>
diff --git a/dbaccess/source/ui/dlg/queryorder.cxx
b/dbaccess/source/ui/dlg/queryorder.cxx
index 2afbfed14eb5..0e41b99ffd56 100644
--- a/dbaccess/source/ui/dlg/queryorder.cxx
+++ b/dbaccess/source/ui/dlg/queryorder.cxx
@@ -26,7 +26,6 @@
#include <com/sun/star/sdbc/XConnection.hpp>
#include <com/sun/star/container/XNameAccess.hpp>
#include <connectivity/dbtools.hxx>
-#include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
#include <comphelper/diagnose_ex.hxx>
using namespace dbaui;
diff --git a/dbaccess/source/ui/dlg/tablespage.cxx
b/dbaccess/source/ui/dlg/tablespage.cxx
index 06ff0c0e4373..e827cce83bff 100644
--- a/dbaccess/source/ui/dlg/tablespage.cxx
+++ b/dbaccess/source/ui/dlg/tablespage.cxx
@@ -19,7 +19,6 @@
#include "tablespage.hxx"
#include <dsitems.hxx>
-#include <datasourceconnector.hxx>
#include <comphelper/types.hxx>
#include <connectivity/dbtools.hxx>
#include <connectivity/dbexception.hxx>
diff --git a/dbaccess/source/ui/inc/CollectionView.hxx
b/dbaccess/source/ui/inc/CollectionView.hxx
index 8162dcd2d676..444424b9cacf 100644
--- a/dbaccess/source/ui/inc/CollectionView.hxx
+++ b/dbaccess/source/ui/inc/CollectionView.hxx
@@ -21,7 +21,6 @@
#include <vcl/weld.hxx>
#include <com/sun/star/ucb/XContent.hpp>
-#include <com/sun/star/ucb/XCommandEnvironment.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
namespace ucbhelper { class CommandEnvironment; }
diff --git a/dbaccess/source/ui/inc/ConnectionLineAccess.hxx
b/dbaccess/source/ui/inc/ConnectionLineAccess.hxx
index ad1f4cc7c616..bc9dbbb6fef0 100644
--- a/dbaccess/source/ui/inc/ConnectionLineAccess.hxx
+++ b/dbaccess/source/ui/inc/ConnectionLineAccess.hxx
@@ -19,7 +19,6 @@
#pragma once
#include "TableConnection.hxx"
-#include <com/sun/star/accessibility/AccessibleRelationType.hpp>
#include <com/sun/star/accessibility/XAccessibleRelationSet.hpp>
#include <cppuhelper/implbase.hxx>
#include <vcl/accessibility/vclxaccessiblecomponent.hxx>
diff --git a/dbaccess/source/ui/inc/JAccess.hxx
b/dbaccess/source/ui/inc/JAccess.hxx
index 8377a076779c..33c539dfb14c 100644
--- a/dbaccess/source/ui/inc/JAccess.hxx
+++ b/dbaccess/source/ui/inc/JAccess.hxx
@@ -19,7 +19,6 @@
#pragma once
#include "JoinTableView.hxx"
-#include <cppuhelper/implbase.hxx>
#include <vcl/accessibility/vclxaccessiblecomponent.hxx>
#include <vcl/vclptr.hxx>
diff --git a/dbaccess/source/ui/inc/TableConnection.hxx
b/dbaccess/source/ui/inc/TableConnection.hxx
index e2d4f36067bd..78b396d55c58 100644
--- a/dbaccess/source/ui/inc/TableConnection.hxx
+++ b/dbaccess/source/ui/inc/TableConnection.hxx
@@ -20,7 +20,6 @@
#include <vector>
#include <vcl/window.hxx>
-#include <com/sun/star/uno/Reference.h>
#include "TableConnectionData.hxx"
class Point;
diff --git a/dbaccess/source/ui/inc/TableCopyHelper.hxx
b/dbaccess/source/ui/inc/TableCopyHelper.hxx
index 636ca85c7752..17d5d4c78926 100644
--- a/dbaccess/source/ui/inc/TableCopyHelper.hxx
+++ b/dbaccess/source/ui/inc/TableCopyHelper.hxx
@@ -21,7 +21,7 @@
#include "AppElementType.hxx"
#include "commontypes.hxx"
#include <svx/dataaccessdescriptor.hxx>
-#include <sot/storage.hxx>
+#include <tools/stream.hxx>
#include <vcl/transfer.hxx>
#include <vcl/weld.hxx>
#include <com/sun/star/sdbc/XConnection.hpp>
diff --git a/dbaccess/source/ui/inc/TableWindowAccess.hxx
b/dbaccess/source/ui/inc/TableWindowAccess.hxx
index 3adb4d5ed0a5..327f929c6d79 100644
--- a/dbaccess/source/ui/inc/TableWindowAccess.hxx
+++ b/dbaccess/source/ui/inc/TableWindowAccess.hxx
@@ -19,7 +19,6 @@
#pragma once
#include "TableWindow.hxx"
-#include <com/sun/star/accessibility/AccessibleRelationType.hpp>
#include <com/sun/star/accessibility/XAccessibleRelationSet.hpp>
#include <cppuhelper/implbase.hxx>
#include <vcl/accessibility/vclxaccessiblecomponent.hxx>
diff --git a/dbaccess/source/ui/inc/defaultobjectnamecheck.hxx
b/dbaccess/source/ui/inc/defaultobjectnamecheck.hxx
index c75528940e15..46b5606844bf 100644
--- a/dbaccess/source/ui/inc/defaultobjectnamecheck.hxx
+++ b/dbaccess/source/ui/inc/defaultobjectnamecheck.hxx
@@ -23,9 +23,7 @@
#include <com/sun/star/container/XHierarchicalNameAccess.hpp>
#include <com/sun/star/sdbc/XConnection.hpp>
-#include <com/sun/star/sdb/tools/XConnectionTools.hpp>
-
-#include <memory>
+#include <com/sun/star/sdb/tools/XObjectNames.hpp>
namespace dbaui
{
diff --git a/dbaccess/source/ui/inc/dsmeta.hxx
b/dbaccess/source/ui/inc/dsmeta.hxx
index 091426809e86..f1e5ca6fb7a9 100644
--- a/dbaccess/source/ui/inc/dsmeta.hxx
+++ b/dbaccess/source/ui/inc/dsmeta.hxx
@@ -27,8 +27,6 @@
#include <rtl/ustring.hxx>
-#include <memory>
-
namespace dbaui
{
diff --git a/dbaccess/source/ui/inc/sbagrid.hxx
b/dbaccess/source/ui/inc/sbagrid.hxx
index 682c570c7093..dea84eae022d 100644
--- a/dbaccess/source/ui/inc/sbagrid.hxx
+++ b/dbaccess/source/ui/inc/sbagrid.hxx
@@ -26,7 +26,6 @@
#include <com/sun/star/frame/XDispatch.hpp>
#include <com/sun/star/util/URL.hpp>
#include <comphelper/multiinterfacecontainer4.hxx>
-#include <comphelper/servicehelper.hxx>
#include <comphelper/uno3.hxx>
#include "sbamultiplex.hxx"
#include <svx/dataaccessdescriptor.hxx>
diff --git a/dbaccess/source/ui/inc/unodatbr.hxx
b/dbaccess/source/ui/inc/unodatbr.hxx
index abdb75372539..68c887e25e7e 100644
--- a/dbaccess/source/ui/inc/unodatbr.hxx
+++ b/dbaccess/source/ui/inc/unodatbr.hxx
@@ -35,7 +35,6 @@
#include <cppuhelper/implbase5.hxx>
#include "callbacks.hxx"
#include <utility>
-#include <vcl/transfer.hxx>
#include <svx/dataaccessdescriptor.hxx>
#include "TableCopyHelper.hxx"
#include "commontypes.hxx"
diff --git a/dbaccess/source/ui/misc/DExport.cxx
b/dbaccess/source/ui/misc/DExport.cxx
index 1cba0dee6943..ad1ff39f3b80 100644
--- a/dbaccess/source/ui/misc/DExport.cxx
+++ b/dbaccess/source/ui/misc/DExport.cxx
@@ -24,7 +24,6 @@
#include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
#include <com/sun/star/sdbc/DataType.hpp>
#include <com/sun/star/sdbc/ColumnValue.hpp>
-#include <com/sun/star/sdb/CommandType.hpp>
#include <com/sun/star/sdbc/XResultSetMetaDataSupplier.hpp>
#include <com/sun/star/sdbc/XRow.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
diff --git a/dbaccess/source/ui/misc/HtmlReader.cxx
b/dbaccess/source/ui/misc/HtmlReader.cxx
index c2917a6300e0..0da9f975f0b8 100644
--- a/dbaccess/source/ui/misc/HtmlReader.cxx
+++ b/dbaccess/source/ui/misc/HtmlReader.cxx
@@ -26,7 +26,6 @@
#include <strings.hrc>
#include <osl/diagnose.h>
#include <core_resource.hxx>
-#include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
#include <com/sun/star/awt/FontWeight.hpp>
#include <com/sun/star/awt/FontStrikeout.hpp>
#include <com/sun/star/awt/FontSlant.hpp>
@@ -40,10 +39,7 @@
using namespace dbaui;
using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::beans;
-using namespace ::com::sun::star::container;
using namespace ::com::sun::star::sdbc;
-using namespace ::com::sun::star::sdbcx;
using namespace ::com::sun::star::awt;
#define DBAUI_HTML_FONTSIZES 8 // like export, HTML-Options
diff --git a/dbaccess/source/ui/misc/RtfReader.cxx
b/dbaccess/source/ui/misc/RtfReader.cxx
index 8895d494f817..3cb47cda8388 100644
--- a/dbaccess/source/ui/misc/RtfReader.cxx
+++ b/dbaccess/source/ui/misc/RtfReader.cxx
@@ -19,7 +19,6 @@
#include <RtfReader.hxx>
#include <tools/stream.hxx>
-#include <com/sun/star/sdbcx/XDataDescriptorFactory.hpp>
#include <com/sun/star/awt/FontDescriptor.hpp>
#include <com/sun/star/awt/FontWeight.hpp>
#include <com/sun/star/awt/FontStrikeout.hpp>
@@ -38,10 +37,7 @@
using namespace dbaui;
using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::beans;
-using namespace ::com::sun::star::container;
using namespace ::com::sun::star::sdbc;
-using namespace ::com::sun::star::sdbcx;
using namespace ::com::sun::star::awt;
// ORTFReader
diff --git a/dbaccess/source/ui/misc/TableCopyHelper.cxx
b/dbaccess/source/ui/misc/TableCopyHelper.cxx
index 75be554a1cd1..3f48a44d9fe6 100644
--- a/dbaccess/source/ui/misc/TableCopyHelper.cxx
+++ b/dbaccess/source/ui/misc/TableCopyHelper.cxx
@@ -23,7 +23,6 @@
#include <strings.hxx>
#include <dbaccess/genericcontroller.hxx>
#include <com/sun/star/task/InteractionHandler.hpp>
-#include <com/sun/star/task/XInteractionHandler.hpp>
#include <com/sun/star/sdb/application/CopyTableOperation.hpp>
#include <com/sun/star/sdb/application/CopyTableWizard.hpp>
#include <com/sun/star/sdb/DataAccessDescriptorFactory.hpp>
@@ -32,6 +31,7 @@
#include <TokenWriter.hxx>
#include <UITools.hxx>
#include <dbaccess/dataview.hxx>
+#include <sot/storage.hxx>
#include <svx/dbaexchange.hxx>
#include <unotools/ucbhelper.hxx>
#include <tools/urlobj.hxx>
diff --git a/dbaccess/source/ui/misc/TokenWriter.cxx
b/dbaccess/source/ui/misc/TokenWriter.cxx
index 17db6b7cdd5d..768177354f41 100644
--- a/dbaccess/source/ui/misc/TokenWriter.cxx
+++ b/dbaccess/source/ui/misc/TokenWriter.cxx
@@ -55,7 +55,6 @@
#include <vcl/outdev.hxx>
#include <vcl/settings.hxx>
#include <svtools/rtfout.hxx>
-#include <svtools/htmlcfg.hxx>
#include <o3tl/string_view.hxx>
#include <connectivity/formattedcolumnvalue.hxx>
#include <memory>
diff --git a/dbaccess/source/ui/misc/UITools.cxx
b/dbaccess/source/ui/misc/UITools.cxx
index 4d22d004f37b..6d11eb21340d 100644
--- a/dbaccess/source/ui/misc/UITools.cxx
+++ b/dbaccess/source/ui/misc/UITools.cxx
@@ -29,7 +29,6 @@
#include <com/sun/star/sdb/XCompletedConnection.hpp>
#include <com/sun/star/sdbc/XDataSource.hpp>
#include <com/sun/star/sdb/SQLContext.hpp>
-#include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
#include <com/sun/star/sdbcx/XViewsSupplier.hpp>
#include <com/sun/star/sdbcx/XTablesSupplier.hpp>
#include <com/sun/star/sdbcx/XDataDescriptorFactory.hpp>
@@ -40,7 +39,6 @@
#include <com/sun/star/sdbc/ColumnValue.hpp>
#include <com/sun/star/task/InteractionHandler.hpp>
#include <com/sun/star/ucb/XContent.hpp>
-#include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/container/XNameContainer.hpp>
#include <com/sun/star/ucb/InteractiveIOException.hpp>
diff --git a/dbaccess/source/ui/misc/WColumnSelect.cxx
b/dbaccess/source/ui/misc/WColumnSelect.cxx
index 8cc8868760cd..d12b8752d1a5 100644
--- a/dbaccess/source/ui/misc/WColumnSelect.cxx
+++ b/dbaccess/source/ui/misc/WColumnSelect.cxx
@@ -21,7 +21,6 @@
#include <strings.hrc>
#include <osl/diagnose.h>
#include <WCopyTable.hxx>
-#include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
#include <core_resource.hxx>
#include <com/sun/star/sdb/application/CopyTableOperation.hpp>
diff --git a/dbaccess/source/ui/misc/WCopyTable.cxx
b/dbaccess/source/ui/misc/WCopyTable.cxx
index 361f3dd512ae..c8a7e023c366 100644
--- a/dbaccess/source/ui/misc/WCopyTable.cxx
+++ b/dbaccess/source/ui/misc/WCopyTable.cxx
@@ -20,7 +20,6 @@
#include <strings.hrc>
#include <strings.hxx>
#include <core_resource.hxx>
-#include <sqlmessage.hxx>
#include <UITools.hxx>
#include <WColumnSelect.hxx>
#include <WCopyTable.hxx>
diff --git a/dbaccess/source/ui/misc/datasourceconnector.cxx
b/dbaccess/source/ui/misc/datasourceconnector.cxx
index 11fcf5ff6c1e..715d7077e173 100644
--- a/dbaccess/source/ui/misc/datasourceconnector.cxx
+++ b/dbaccess/source/ui/misc/datasourceconnector.cxx
@@ -32,7 +32,6 @@
#include <UITools.hxx>
#include <utility>
#include <vcl/mnemonic.hxx>
-#include <vcl/outdev.hxx>
#include <vcl/stdtext.hxx>
#include <vcl/weld.hxx>
#include <comphelper/diagnose_ex.hxx>
diff --git a/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx
b/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx
index 0d3676db5d80..2571e8c02e50 100644
--- a/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx
+++ b/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx
@@ -33,7 +33,6 @@
#include <com/sun/star/util/NumberFormatter.hpp>
#include <com/sun/star/lang/IllegalArgumentException.hpp>
-#include <comphelper/types.hxx>
#include <connectivity/dbexception.hxx>
#include <connectivity/dbmetadata.hxx>
#include <connectivity/dbtools.hxx>
diff --git a/dbaccess/source/ui/misc/defaultobjectnamecheck.cxx
b/dbaccess/source/ui/misc/defaultobjectnamecheck.cxx
index cc44de2bdee0..9b8853f2d63f 100644
--- a/dbaccess/source/ui/misc/defaultobjectnamecheck.cxx
+++ b/dbaccess/source/ui/misc/defaultobjectnamecheck.cxx
@@ -24,6 +24,7 @@
#include <com/sun/star/lang/IllegalArgumentException.hpp>
#include <com/sun/star/sdb/CommandType.hpp>
+#include <com/sun/star/sdb/tools/XConnectionTools.hpp>
#include <com/sun/star/sdbc/SQLException.hpp>
#include <connectivity/dbexception.hxx>
@@ -34,7 +35,6 @@
#include <comphelper/diagnose_ex.hxx>
#include <cppuhelper/exc_hlp.hxx>
-#include <memory>
#include <string_view>
namespace dbaui
diff --git a/dbaccess/source/ui/misc/dsmeta.cxx
b/dbaccess/source/ui/misc/dsmeta.cxx
index b2f207b0b04a..dfd86ae92a72 100644
--- a/dbaccess/source/ui/misc/dsmeta.cxx
+++ b/dbaccess/source/ui/misc/dsmeta.cxx
@@ -19,7 +19,6 @@
#include <dsmeta.hxx>
#include <connectivity/DriversConfig.hxx>
-#include <dsntypes.hxx>
#include <comphelper/processfactory.hxx>
#include <osl/diagnose.h>
diff --git a/dbaccess/source/ui/misc/linkeddocuments.cxx
b/dbaccess/source/ui/misc/linkeddocuments.cxx
index 4e7dd396a0ca..d2fda9527144 100644
--- a/dbaccess/source/ui/misc/linkeddocuments.cxx
+++ b/dbaccess/source/ui/misc/linkeddocuments.cxx
@@ -21,7 +21,6 @@
#include <linkeddocuments.hxx>
#include <osl/diagnose.h>
#include <comphelper/diagnose_ex.hxx>
-#include <unotools/confignode.hxx>
#include <comphelper/classids.hxx>
#include <comphelper/namedvaluecollection.hxx>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
@@ -34,7 +33,6 @@
#include <comphelper/types.hxx>
#include <strings.hrc>
#include <strings.hxx>
-#include <svl/filenotation.hxx>
#include <browserids.hxx>
#include <com/sun/star/container/XHierarchicalNameContainer.hpp>
#include <comphelper/mimeconfighelper.hxx>
diff --git a/dbaccess/source/ui/misc/singledoccontroller.cxx
b/dbaccess/source/ui/misc/singledoccontroller.cxx
index 6f58676629d0..13c28ed6229f 100644
--- a/dbaccess/source/ui/misc/singledoccontroller.cxx
+++ b/dbaccess/source/ui/misc/singledoccontroller.cxx
@@ -18,7 +18,6 @@
*/
#include <dbaccess/dbaundomanager.hxx>
-#include <dbaccess/dataview.hxx>
#include <core_resource.hxx>
#include <singledoccontroller.hxx>
#include <browserids.hxx>
diff --git a/dbaccess/source/ui/querydesign/ConnectionLine.cxx
b/dbaccess/source/ui/querydesign/ConnectionLine.cxx
index b22a05424df3..c34940e8d5cc 100644
--- a/dbaccess/source/ui/querydesign/ConnectionLine.cxx
+++ b/dbaccess/source/ui/querydesign/ConnectionLine.cxx
@@ -24,7 +24,6 @@
#include <TableConnection.hxx>
#include <utility>
#include <vcl/svapp.hxx>
-#include <math.h>
#include <osl/diagnose.h>
#include <vcl/lineinfo.hxx>
#include <vcl/settings.hxx>
diff --git a/dbaccess/source/ui/querydesign/JoinController.cxx
b/dbaccess/source/ui/querydesign/JoinController.cxx
index c8cdf45492c9..df9f7e03aae7 100644
--- a/dbaccess/source/ui/querydesign/JoinController.cxx
+++ b/dbaccess/source/ui/querydesign/JoinController.cxx
@@ -19,8 +19,6 @@
#include <browserids.hxx>
#include <com/sun/star/sdbc/XRow.hpp>
-#include <connectivity/dbexception.hxx>
-#include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
#include <JoinController.hxx>
#include <TableWindowData.hxx>
#include <TableWindow.hxx>
diff --git a/dbaccess/source/ui/querydesign/QTableConnectionData.cxx
b/dbaccess/source/ui/querydesign/QTableConnectionData.cxx
index a42d65508008..16f426d99152 100644
--- a/dbaccess/source/ui/querydesign/QTableConnectionData.cxx
+++ b/dbaccess/source/ui/querydesign/QTableConnectionData.cxx
@@ -20,8 +20,6 @@
#include "QTableConnectionData.hxx"
#include "QTableWindow.hxx"
-#include <osl/diagnose.h>
-
using namespace dbaui;
OQueryTableConnectionData::OQueryTableConnectionData()
diff --git a/dbaccess/source/ui/querydesign/TableFieldDescription.cxx
b/dbaccess/source/ui/querydesign/TableFieldDescription.cxx
index b835f3b62aff..61052d01c1da 100644
--- a/dbaccess/source/ui/querydesign/TableFieldDescription.cxx
+++ b/dbaccess/source/ui/querydesign/TableFieldDescription.cxx
@@ -20,7 +20,6 @@
#include <TableFieldDescription.hxx>
#include <osl/diagnose.h>
-#include <com/sun/star/sdbc/DataType.hpp>
#include <comphelper/namedvaluecollection.hxx>
using namespace ::com::sun::star::uno;
diff --git a/dbaccess/source/ui/querydesign/limitboxcontroller.cxx
b/dbaccess/source/ui/querydesign/limitboxcontroller.cxx
index 59d563388fd5..ac61359cd67c 100644
--- a/dbaccess/source/ui/querydesign/limitboxcontroller.cxx
+++ b/dbaccess/source/ui/querydesign/limitboxcontroller.cxx
@@ -20,7 +20,6 @@
#include <vcl/svapp.hxx>
#include <vcl/window.hxx>
#include <toolkit/helper/vclunohelper.hxx>
-#include <cppuhelper/queryinterface.hxx>
#include <core_resource.hxx>
#include <strings.hrc>
diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx
b/dbaccess/source/ui/querydesign/querycontroller.cxx
index 5134161cce5a..981ff5f458a2 100644
--- a/dbaccess/source/ui/querydesign/querycontroller.cxx
+++ b/dbaccess/source/ui/querydesign/querycontroller.cxx
@@ -30,7 +30,6 @@
#include <QueryDesignView.hxx>
#include <QueryTableView.hxx>
#include <sqlmessage.hxx>
-#include <TableConnectionData.hxx>
#include <TableFieldDescription.hxx>
#include <UITools.hxx>
#include <QueryPropertiesDialog.hxx>
@@ -49,7 +48,6 @@
#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/ui/dialogs/XExecutableDialog.hpp>
#include <com/sun/star/util/XCloseable.hpp>
#include <com/sun/star/util/VetoException.hpp>
#include <com/sun/star/ui/XUIElement.hpp>
diff --git a/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx
b/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx
index c679e462c630..e936e9e16cdc 100644
--- a/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx
+++ b/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx
@@ -38,7 +38,6 @@ using namespace ::com::sun::star::sdbcx;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::container;
-using namespace ::com::sun::star::lang;
ORelationTableConnectionData::ORelationTableConnectionData()
:m_nUpdateRules(KeyRule::NO_ACTION)
diff --git a/dbaccess/source/ui/relationdesign/RelationController.cxx
b/dbaccess/source/ui/relationdesign/RelationController.cxx
index b2fc5c0ffec3..9aea133bd04e 100644
--- a/dbaccess/source/ui/relationdesign/RelationController.cxx
+++ b/dbaccess/source/ui/relationdesign/RelationController.cxx
@@ -34,7 +34,6 @@
#include <com/sun/star/sdbcx/XKeysSupplier.hpp>
#include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
#include <com/sun/star/sdbc/SQLException.hpp>
-#include <com/sun/star/sdbc/XRow.hpp>
#include <connectivity/dbexception.hxx>
#include <connectivity/dbmetadata.hxx>
#include <sqlmessage.hxx>
diff --git a/dbaccess/source/ui/relationdesign/RelationTableView.cxx
b/dbaccess/source/ui/relationdesign/RelationTableView.cxx
index a73697858dea..909b5edef03b 100644
--- a/dbaccess/source/ui/relationdesign/RelationTableView.cxx
+++ b/dbaccess/source/ui/relationdesign/RelationTableView.cxx
@@ -26,7 +26,6 @@
#include <com/sun/star/container/XContainer.hpp>
#include <com/sun/star/container/XIndexAccess.hpp>
#include <com/sun/star/container/XNameAccess.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
#include <connectivity/dbtools.hxx>
#include <comphelper/diagnose_ex.hxx>
#include <helpids.h>
@@ -51,7 +50,6 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::sdbc;
using namespace ::com::sun::star::sdbcx;
-using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::container;
using namespace ::com::sun::star::accessibility;
diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx
b/dbaccess/source/ui/tabledesign/TEditControl.cxx
index 00ef43be9f6d..062c0f5baa14 100644
--- a/dbaccess/source/ui/tabledesign/TEditControl.cxx
+++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx
@@ -21,7 +21,6 @@
#include <com/sun/star/sdbc/ColumnValue.hpp>
#include <com/sun/star/sdbc/SQLException.hpp>
#include <com/sun/star/sdbc/XDatabaseMetaData.hpp>
-#include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
#include <com/sun/star/util/XNumberFormatTypes.hpp>
#include <core_resource.hxx>
#include <strings.hrc>
@@ -37,8 +36,8 @@
#include <SqlNameEdit.hxx>
#include <TableRowExchange.hxx>
#include <o3tl/safeint.hxx>
-#include <sot/storage.hxx>
-#include <svx/svxids.hrc>
+#include <sfx2/sfxsids.hrc>
+#include <tools/stream.hxx>
#include <UITools.hxx>
#include "TableFieldControl.hxx"
#include <dsntypes.hxx>
diff --git a/dbaccess/source/ui/tabledesign/TableRowExchange.cxx
b/dbaccess/source/ui/tabledesign/TableRowExchange.cxx
index 19917e7a26d1..219b7cf58845 100644
--- a/dbaccess/source/ui/tabledesign/TableRowExchange.cxx
+++ b/dbaccess/source/ui/tabledesign/TableRowExchange.cxx
@@ -19,7 +19,7 @@
#include <TableRowExchange.hxx>
#include <sot/formats.hxx>
-#include <sot/storage.hxx>
+#include <tools/stream.hxx>
#include <TableRow.hxx>
namespace dbaui
diff --git a/dbaccess/source/ui/tabledesign/TableUndo.cxx
b/dbaccess/source/ui/tabledesign/TableUndo.cxx
index 7829a09d6959..5a4106b4b007 100644
--- a/dbaccess/source/ui/tabledesign/TableUndo.cxx
+++ b/dbaccess/source/ui/tabledesign/TableUndo.cxx
@@ -24,7 +24,7 @@
#include <TableController.hxx>
#include <TableDesignView.hxx>
#include <FieldDescriptions.hxx>
-#include <svx/svxids.hrc>
+#include <sfx2/sfxsids.hrc>
#include <utility>
using namespace dbaui;
diff --git a/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx
b/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx
index dbb56c9b6d95..7f0053310be8 100644
--- a/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx
+++ b/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx
@@ -22,7 +22,6 @@
#include <stringconstants.hxx>
#include <propertystorage.hxx>
-#include <com/sun/star/beans/XPropertySetInfo.hpp>
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <com/sun/star/sdb/XTextConnectionSettings.hpp>
diff --git a/dbaccess/source/ui/uno/unoDirectSql.cxx
b/dbaccess/source/ui/uno/unoDirectSql.cxx
index 807589689d53..99be43c4aec5 100644
--- a/dbaccess/source/ui/uno/unoDirectSql.cxx
+++ b/dbaccess/source/ui/uno/unoDirectSql.cxx
@@ -20,7 +20,6 @@
#include <sal/config.h>
#include "unoDirectSql.hxx"
-#include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
#include <com/sun/star/connection/XConnection.hpp>
#include <com/sun/star/beans/PropertyValue.hpp>
#include <directsql.hxx>
