Recheck modules d* with IWYU

See tdf#42949 for motivation

Change-Id: I916f42c46efa1b6cfd7744a189b79659b2867431
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128196
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>

65 files changed, 51 insertions, 82 deletions

diff --git a/dbaccess/IwyuFilter_dbaccess.yaml b/dbaccess/IwyuFilter_dbaccess.yaml
index 7d15949a9e78..7d0e1f9c085e 100644
--- a/dbaccess/IwyuFilter_dbaccess.yaml
+++ b/dbaccess/IwyuFilter_dbaccess.yaml
@@ -13,18 +13,12 @@ excludelist:
     - com/sun/star/lang/XMultiServiceFactory.hpp
     - rtl/ustring.hxx
     - cppuhelper/factory.hxx
-    dbaccess/source/inc/apitools.hxx:
-    # Needed for macros to work
-    - com/sun/star/beans/PropertyAttribute.hpp
-    - com/sun/star/lang/XMultiServiceFactory.hpp
-    - comphelper/sequence.hxx
-    - strings.hxx
+    dbaccess/inc/strings.hrc:
+    # Needed for TranslateId macro to work
+    - unotools/resmgr.hxx
     dbaccess/source/filter/xml/xmlExport.hxx:
     # Needed for implicit dtor
     - xmloff/txtprmap.hxx
-    dbaccess/source/ui/inc/sbamultiplex.hxx:
-    # Needed for macros
-    - cppuhelper/queryinterface.hxx
     dbaccess/source/ui/dlg/odbcconfig.hxx:
     # Needed on WIN32
     - tools/link.hxx
@@ -45,17 +39,9 @@ excludelist:
     dbaccess/source/core/api/query.cxx:
     # Actually used
     - com/sun/star/sdbc/XConnection.hpp
-    # Needed for inline OMultiTypeInterfaceContainerHelperVar
-    - cppuhelper/interfacecontainer.hxx
     dbaccess/source/core/api/querycontainer.cxx:
     # Actually used
     - com/sun/star/sdbc/XConnection.hpp
-    dbaccess/source/core/dataaccess/ComponentDefinition.cxx:
-    # Needed for inline OMultiTypeInterfaceContainerHelperVar
-    - cppuhelper/interfacecontainer.hxx
-    dbaccess/source/core/dataaccess/definitioncontainer.cxx:
-    # Needed for inline OMultiTypeInterfaceContainerHelperVar
-    - cppuhelper/interfacecontainer.hxx
     dbaccess/source/core/dataaccess/databasedocument.cxx:
     # Actually used
     - com/sun/star/script/XStorageBasedLibraryContainer.hpp
diff --git a/dbaccess/inc/helpids.h b/dbaccess/inc/helpids.h
index 87077eb318c4..86c233f9d619 100644
--- a/dbaccess/inc/helpids.h
+++ b/dbaccess/inc/helpids.h
@@ -20,6 +20,7 @@
 #ifndef INCLUDED_DBACCESS_INC_HELPIDS_H
 #define INCLUDED_DBACCESS_INC_HELPIDS_H
 
+#include <rtl/string.hxx>
 
 inline constexpr OStringLiteral HID_DATABROWSE_HEADER = "DBACCESS_HID_DATABROWSE_HEADER";
 inline constexpr OStringLiteral HID_CTL_TABBROWSER = "DBACCESS_HID_CTL_TABBROWSER";
diff --git a/dbaccess/inc/query.hrc b/dbaccess/inc/query.hrc
index e4c034ded11c..e183f777ca5f 100644
--- a/dbaccess/inc/query.hrc
+++ b/dbaccess/inc/query.hrc
@@ -19,6 +19,8 @@
 #ifndef INCLUDED_VCL_INC_PRINTACCESSORYVIEW_HRC
 #define INCLUDED_VCL_INC_PRINTACCESSORYVIEW_HRC
 
+#include <unotools/resmgr.hxx>
+
 #define NC_(Context, String) TranslateId(Context, reinterpret_cast<char const *>(u8##String))
 
 const TranslateId RSC_QUERY_OBJECT_TYPE[] =
diff --git a/dbaccess/source/core/api/CRowSetColumn.cxx b/dbaccess/source/core/api/CRowSetColumn.cxx
index 556b1250eec0..56328bd18009 100644
--- a/dbaccess/source/core/api/CRowSetColumn.cxx
+++ b/dbaccess/source/core/api/CRowSetColumn.cxx
@@ -19,9 +19,11 @@
 
 
 #include <stringconstants.hxx>
-#include <apitools.hxx>
+#include <strings.hxx>
 #include "CRowSetColumn.hxx"
 
+#include <com/sun/star/beans/PropertyAttribute.hpp>
+
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::sdbc;
 using namespace ::com::sun::star::sdb;
diff --git a/dbaccess/source/core/api/CRowSetDataColumn.cxx b/dbaccess/source/core/api/CRowSetDataColumn.cxx
index e55063b6e2a8..c3628d887ac7 100644
--- a/dbaccess/source/core/api/CRowSetDataColumn.cxx
+++ b/dbaccess/source/core/api/CRowSetDataColumn.cxx
@@ -20,7 +20,7 @@
 
 #include "CRowSetDataColumn.hxx"
 #include <stringconstants.hxx>
-#include <apitools.hxx>
+#include <strings.hxx>
 #include <cppuhelper/exc_hlp.hxx>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/lang/WrappedTargetRuntimeException.hpp>
diff --git a/dbaccess/source/core/api/RowSet.cxx b/dbaccess/source/core/api/RowSet.cxx
index 79dd9d4a593b..d22717c263b0 100644
--- a/dbaccess/source/core/api/RowSet.cxx
+++ b/dbaccess/source/core/api/RowSet.cxx
@@ -31,11 +31,13 @@
 #include "CRowSetDataColumn.hxx"
 #include "RowSetCache.hxx"
 #include <strings.hrc>
+#include <strings.hxx>
 #include <core_resource.hxx>
 #include <tablecontainer.hxx>
 
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/lang/DisposedException.hpp>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/sdb/CommandType.hpp>
 #include <com/sun/star/sdb/DatabaseContext.hpp>
 #include <com/sun/star/sdb/ErrorCondition.hpp>
diff --git a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
index 401d2dcf4fb9..ab018431c9ce 100644
--- a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
+++ b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
@@ -21,6 +21,7 @@
 #include <sal/log.hxx>
 #include <composertools.hxx>
 #include <strings.hrc>
+#include <strings.hxx>
 #include <core_resource.hxx>
 #include <stringconstants.hxx>
 #include "HelperCollections.hxx"
diff --git a/dbaccess/source/core/api/TableDeco.cxx b/dbaccess/source/core/api/TableDeco.cxx
index 03b8a9495cb9..abd206b6e147 100644
--- a/dbaccess/source/core/api/TableDeco.cxx
+++ b/dbaccess/source/core/api/TableDeco.cxx
@@ -18,9 +18,9 @@
  */
 
 #include <TableDeco.hxx>
-#include <apitools.hxx>
 #include <definitioncolumn.hxx>
 #include <stringconstants.hxx>
+#include <strings.hxx>
 #include <core_resource.hxx>
 #include <strings.hrc>
 #include <osl/diagnose.h>
diff --git a/dbaccess/source/core/api/definitioncolumn.cxx b/dbaccess/source/core/api/definitioncolumn.cxx
index 6307e64eddcd..3f95421803c1 100644
--- a/dbaccess/source/core/api/definitioncolumn.cxx
+++ b/dbaccess/source/core/api/definitioncolumn.cxx
@@ -19,8 +19,8 @@
 
 #include <bitset>
 
-#include <apitools.hxx>
 #include <stringconstants.hxx>
+#include <strings.hxx>
 #include <definitioncolumn.hxx>
 #include <sdbcoretools.hxx>
 
diff --git a/dbaccess/source/core/api/preparedstatement.cxx b/dbaccess/source/core/api/preparedstatement.cxx
index 52f099a4c88f..02dd32379a88 100644
--- a/dbaccess/source/core/api/preparedstatement.cxx
+++ b/dbaccess/source/core/api/preparedstatement.cxx
@@ -28,6 +28,7 @@
 #include <cppuhelper/queryinterface.hxx>
 #include <cppuhelper/typeprovider.hxx>
 #include <preparedstatement.hxx>
+#include <strings.hxx>
 #include "resultcolumn.hxx"
 #include "resultset.hxx"
 #include <tools/diagnose_ex.h>
diff --git a/dbaccess/source/core/api/query.cxx b/dbaccess/source/core/api/query.cxx
index f043db068d5e..33ceca9ce2e4 100644
--- a/dbaccess/source/core/api/query.cxx
+++ b/dbaccess/source/core/api/query.cxx
@@ -25,8 +25,8 @@
 #include "HelperCollections.hxx"
 #include <core_resource.hxx>
 #include <strings.hrc>
+#include <strings.hxx>
 
-#include <cppuhelper/interfacecontainer.hxx>
 #include <tools/diagnose_ex.h>
 #include <osl/diagnose.h>
 
@@ -40,6 +40,7 @@
 #include <definitioncolumn.hxx>
 
 #include <com/sun/star/beans/PropertyAttribute.hpp>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <ContainerMediator.hxx>
 
 using namespace dbaccess;
diff --git a/dbaccess/source/core/api/querycomposer.cxx b/dbaccess/source/core/api/querycomposer.cxx
index 5f33eefbd48d..8bab8718709b 100644
--- a/dbaccess/source/core/api/querycomposer.cxx
+++ b/dbaccess/source/core/api/querycomposer.cxx
@@ -18,6 +18,7 @@
  */
 
 #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>
@@ -26,6 +27,7 @@
 #include <comphelper/types.hxx>
 #include <com/sun/star/sdb/SQLFilterOperator.hpp>
 #include <querycomposer.hxx>
+#include <strings.hxx>
 #include <composertools.hxx>
 #include <algorithm>
 
diff --git a/dbaccess/source/core/api/querycontainer.cxx b/dbaccess/source/core/api/querycontainer.cxx
index 6e3f05ea4d18..5a8a93a4f7d4 100644
--- a/dbaccess/source/core/api/querycontainer.cxx
+++ b/dbaccess/source/core/api/querycontainer.cxx
@@ -19,6 +19,7 @@
 
 #include <querycontainer.hxx>
 #include "query.hxx"
+#include <strings.hxx>
 #include <objectnameapproval.hxx>
 #include <veto.hxx>
 
diff --git a/dbaccess/source/core/api/querydescriptor.cxx b/dbaccess/source/core/api/querydescriptor.cxx
index 52948614519a..b9e7a0debca4 100644
--- a/dbaccess/source/core/api/querydescriptor.cxx
+++ b/dbaccess/source/core/api/querydescriptor.cxx
@@ -18,8 +18,8 @@
  */
 
 #include "querydescriptor.hxx"
-#include <apitools.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/resultcolumn.cxx b/dbaccess/source/core/api/resultcolumn.cxx
index 8852da26c94a..4e467a305852 100644
--- a/dbaccess/source/core/api/resultcolumn.cxx
+++ b/dbaccess/source/core/api/resultcolumn.cxx
@@ -18,13 +18,14 @@
  */
 
 #include "resultcolumn.hxx"
+#include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/sdbc/SQLException.hpp>
 #include <com/sun/star/sdbc/DataType.hpp>
 #include <com/sun/star/sdbc/ColumnValue.hpp>
 #include <com/sun/star/sdbc/XRow.hpp>
 #include <tools/diagnose_ex.h>
 #include <stringconstants.hxx>
-#include <apitools.hxx>
+#include <strings.hxx>
 
 using namespace ::com::sun::star::sdbc;
 using namespace ::com::sun::star::beans;
diff --git a/dbaccess/source/core/api/resultset.cxx b/dbaccess/source/core/api/resultset.cxx
index f545c2e3153d..dd5833fcd523 100644
--- a/dbaccess/source/core/api/resultset.cxx
+++ b/dbaccess/source/core/api/resultset.cxx
@@ -20,7 +20,8 @@
 #include "resultset.hxx"
 #include <sal/log.hxx>
 #include <stringconstants.hxx>
-#include <apitools.hxx>
+#include <strings.hxx>
+#include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/sdbc/ResultSetType.hpp>
 #include <com/sun/star/sdbc/SQLException.hpp>
 #include <cppuhelper/supportsservice.hxx>
diff --git a/dbaccess/source/core/api/statement.cxx b/dbaccess/source/core/api/statement.cxx
index 82236dfe7202..290eac540099 100644
--- a/dbaccess/source/core/api/statement.cxx
+++ b/dbaccess/source/core/api/statement.cxx
@@ -20,6 +20,8 @@
 #include <statement.hxx>
 #include "resultset.hxx"
 #include <stringconstants.hxx>
+#include <strings.hxx>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/sdbc/XDatabaseMetaData.hpp>
 #include <com/sun/star/sdbc/SQLException.hpp>
 #include <cppuhelper/queryinterface.hxx>
diff --git a/dbaccess/source/core/api/table.cxx b/dbaccess/source/core/api/table.cxx
index 52d6b5cf64f6..50467cfa0c2e 100644
--- a/dbaccess/source/core/api/table.cxx
+++ b/dbaccess/source/core/api/table.cxx
@@ -17,10 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <apitools.hxx>
 #include <table.hxx>
 #include <definitioncolumn.hxx>
 #include <stringconstants.hxx>
+#include <strings.hxx>
 #include <core_resource.hxx>
 #include <strings.hrc>
 #include "CIndexes.hxx"
@@ -29,7 +29,6 @@
 #include <comphelper/servicehelper.hxx>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/sdbc/SQLException.hpp>
-#include <com/sun/star/sdbc/XConnection.hpp>
 #include <com/sun/star/sdb/tools/XTableRename.hpp>
 #include <com/sun/star/sdb/tools/XTableAlteration.hpp>
 
diff --git a/dbaccess/source/core/api/tablecontainer.cxx b/dbaccess/source/core/api/tablecontainer.cxx
index 9bcf4b610eec..27f40f97f964 100644
--- a/dbaccess/source/core/api/tablecontainer.cxx
+++ b/dbaccess/source/core/api/tablecontainer.cxx
@@ -17,13 +17,13 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <apitools.hxx>
 #include <tablecontainer.hxx>
 #include <table.hxx>
 #include <comphelper/property.hxx>
 #include <comphelper/processfactory.hxx>
 #include <core_resource.hxx>
 #include <strings.hrc>
+#include <strings.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/beans/PropertyState.hpp>
 #include <com/sun/star/beans/XPropertyState.hpp>
diff --git a/dbaccess/source/core/api/viewcontainer.cxx b/dbaccess/source/core/api/viewcontainer.cxx
index 4e35515a4196..462a3b1d0004 100644
--- a/dbaccess/source/core/api/viewcontainer.cxx
+++ b/dbaccess/source/core/api/viewcontainer.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <apitools.hxx>
+#include <strings.hxx>
 #include <viewcontainer.hxx>
 #include <View.hxx>
 
diff --git a/dbaccess/source/core/dataaccess/ComponentDefinition.cxx b/dbaccess/source/core/dataaccess/ComponentDefinition.cxx
index 258cfc473a90..a3a6459824fa 100644
--- a/dbaccess/source/core/dataaccess/ComponentDefinition.cxx
+++ b/dbaccess/source/core/dataaccess/ComponentDefinition.cxx
@@ -18,12 +18,12 @@
  */
 
 #include "ComponentDefinition.hxx"
-#include <apitools.hxx>
 #include <stringconstants.hxx>
+#include <strings.hxx>
 
 #include <osl/diagnose.h>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
-#include <cppuhelper/interfacecontainer.hxx>
+//#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 cefc2443d2c2..1623a579471b 100644
--- a/dbaccess/source/core/dataaccess/ContentHelper.cxx
+++ b/dbaccess/source/core/dataaccess/ContentHelper.cxx
@@ -31,12 +31,11 @@
 #include <com/sun/star/container/ElementExistException.hpp>
 #include <ucbhelper/propertyvalueset.hxx>
 #include <ucbhelper/contentidentifier.hxx>
-#include <cppuhelper/interfacecontainer.hxx>
 #include <comphelper/servicehelper.hxx>
 #include <tools/diagnose_ex.h>
-#include <apitools.hxx>
 #include <sdbcoretools.hxx>
 #include <stringconstants.hxx>
+#include <strings.hxx>
 
 #include <map>
 
diff --git a/dbaccess/source/core/dataaccess/commanddefinition.cxx b/dbaccess/source/core/dataaccess/commanddefinition.cxx
index f460911f3392..998865036f20 100644
--- a/dbaccess/source/core/dataaccess/commanddefinition.cxx
+++ b/dbaccess/source/core/dataaccess/commanddefinition.cxx
@@ -18,8 +18,8 @@
  */
 
 #include "commanddefinition.hxx"
-#include <apitools.hxx>
 #include <stringconstants.hxx>
+#include <strings.hxx>
 
 #include <com/sun/star/container/ElementExistException.hpp>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
diff --git a/dbaccess/source/core/dataaccess/connection.cxx b/dbaccess/source/core/dataaccess/connection.cxx
index 0da533536a9d..c45cb24538c8 100644
--- a/dbaccess/source/core/dataaccess/connection.cxx
+++ b/dbaccess/source/core/dataaccess/connection.cxx
@@ -24,6 +24,7 @@
 #include "connection.hxx"
 #include "datasource.hxx"
 #include <strings.hrc>
+#include <strings.hxx>
 #include <core_resource.hxx>
 #include <statement.hxx>
 #include <preparedstatement.hxx>
diff --git a/dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx b/dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx
index 97a8f5b9fb86..ef5239a6793f 100644
--- a/dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx
+++ b/dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx
@@ -35,7 +35,6 @@
 #include <comphelper/uno3.hxx>
 #include <cppuhelper/implbase.hxx>
 #include <cppuhelper/supportsservice.hxx>
-#include <rtl/ref.hxx>
 
 namespace
 {
diff --git a/dbaccess/source/core/dataaccess/databasecontext.cxx b/dbaccess/source/core/dataaccess/databasecontext.cxx
index 79c657db3054..703553913fcc 100644
--- a/dbaccess/source/core/dataaccess/databasecontext.cxx
+++ b/dbaccess/source/core/dataaccess/databasecontext.cxx
@@ -20,6 +20,7 @@
 #include <config_features.h>
 
 #include <strings.hrc>
+#include <strings.hxx>
 #include <core_resource.hxx>
 #include <databasecontext.hxx>
 #include "databaseregistrations.hxx"
diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx b/dbaccess/source/core/dataaccess/databasedocument.cxx
index b8b352a3a59c..4fce39de0b35 100644
--- a/dbaccess/source/core/dataaccess/databasedocument.cxx
+++ b/dbaccess/source/core/dataaccess/databasedocument.cxx
@@ -24,9 +24,11 @@
 #include <databasecontext.hxx>
 #include "documentcontainer.hxx"
 #include <sdbcoretools.hxx>
+#include <strings.hxx>
 #include <recovery/dbdocrecovery.hxx>
 
 #include <officecfg/Office/Common.hxx>
+#include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/document/XExporter.hpp>
 #include <com/sun/star/document/XFilter.hpp>
 #include <com/sun/star/document/XImporter.hpp>
diff --git a/dbaccess/source/core/dataaccess/datasource.cxx b/dbaccess/source/core/dataaccess/datasource.cxx
index 45ad2e500d8b..dc304d7e3e11 100644
--- a/dbaccess/source/core/dataaccess/datasource.cxx
+++ b/dbaccess/source/core/dataaccess/datasource.cxx
@@ -22,6 +22,7 @@
 #include <stringconstants.hxx>
 #include <core_resource.hxx>
 #include <strings.hrc>
+#include <strings.hxx>
 #include "connection.hxx"
 #include "SharedConnection.hxx"
 #include "databasedocument.hxx"
diff --git a/dbaccess/source/core/dataaccess/definitioncontainer.cxx b/dbaccess/source/core/dataaccess/definitioncontainer.cxx
index 53824f87388f..8f3378d69748 100644
--- a/dbaccess/source/core/dataaccess/definitioncontainer.cxx
+++ b/dbaccess/source/core/dataaccess/definitioncontainer.cxx
@@ -18,9 +18,9 @@
  */
 
 #include <definitioncontainer.hxx>
-#include <apitools.hxx>
 #include <core_resource.hxx>
 #include <strings.hrc>
+#include <strings.hxx>
 
 #include <tools/diagnose_ex.h>
 #include <osl/diagnose.h>
@@ -32,7 +32,6 @@
 #include <com/sun/star/sdb/ErrorCondition.hpp>
 #include <comphelper/servicehelper.hxx>
 #include <comphelper/types.hxx>
-#include <cppuhelper/interfacecontainer.hxx>
 #include <rtl/ref.hxx>
 
 using namespace ::com::sun::star::uno;
diff --git a/dbaccess/source/core/dataaccess/documentcontainer.cxx b/dbaccess/source/core/dataaccess/documentcontainer.cxx
index f878e7b57ee7..6c3598e9313c 100644
--- a/dbaccess/source/core/dataaccess/documentcontainer.cxx
+++ b/dbaccess/source/core/dataaccess/documentcontainer.cxx
@@ -34,6 +34,7 @@
 #include <connectivity/sqlerror.hxx>
 #include <core_resource.hxx>
 #include <strings.hrc>
+#include <strings.hxx>
 #include <comphelper/namedvaluecollection.hxx>
 #include <comphelper/propertysequence.hxx>
 #include <comphelper/servicehelper.hxx>
diff --git a/dbaccess/source/core/dataaccess/documentdefinition.cxx b/dbaccess/source/core/dataaccess/documentdefinition.cxx
index e4dc881a1a63..d3383cc837b0 100644
--- a/dbaccess/source/core/dataaccess/documentdefinition.cxx
+++ b/dbaccess/source/core/dataaccess/documentdefinition.cxx
@@ -32,6 +32,7 @@
 #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>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/frame/Desktop.hpp>
 #include <com/sun/star/frame/XModel.hpp>
@@ -76,6 +77,7 @@
 #include <com/sun/star/view/XViewSettingsSupplier.hpp>
 #include <core_resource.hxx>
 #include <strings.hrc>
+#include <strings.hxx>
 #include <com/sun/star/task/XInteractionApprove.hpp>
 #include <com/sun/star/task/XInteractionDisapprove.hpp>
 #include <com/sun/star/frame/XLayoutManager.hpp>
diff --git a/dbaccess/source/core/misc/DatabaseDataProvider.cxx b/dbaccess/source/core/misc/DatabaseDataProvider.cxx
index 9b455c5ae452..c177ce70573c 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 <rtl/math.hxx>
 #include <sal/macros.h>
 #include <tools/diagnose_ex.h>
 
diff --git a/dbaccess/source/core/misc/sdbcoretools.cxx b/dbaccess/source/core/misc/sdbcoretools.cxx
index 5cd5367ba117..1789aea84641 100644
--- a/dbaccess/source/core/misc/sdbcoretools.cxx
+++ b/dbaccess/source/core/misc/sdbcoretools.cxx
@@ -30,7 +30,6 @@
 #include <tools/diagnose_ex.h>
 #include <comphelper/interaction.hxx>
 #include <rtl/ref.hxx>
-#include <rtl/ustrbuf.hxx>
 
 namespace dbaccess
 {
diff --git a/dbaccess/source/filter/xml/xmlColumn.cxx b/dbaccess/source/filter/xml/xmlColumn.cxx
index 198a92f76fa4..b86707789cd7 100644
--- a/dbaccess/source/filter/xml/xmlColumn.cxx
+++ b/dbaccess/source/filter/xml/xmlColumn.cxx
@@ -25,7 +25,6 @@
 #include <com/sun/star/sdbcx/XAppend.hpp>
 #include "xmlStyleImport.hxx"
 #include <osl/diagnose.h>
-#include <sal/log.hxx>
 
 namespace dbaxml
 {
diff --git a/dbaccess/source/filter/xml/xmlDataSourceInfo.cxx b/dbaccess/source/filter/xml/xmlDataSourceInfo.cxx
index e7362ca5ba77..eefc08e4191a 100644
--- a/dbaccess/source/filter/xml/xmlDataSourceInfo.cxx
+++ b/dbaccess/source/filter/xml/xmlDataSourceInfo.cxx
@@ -22,7 +22,6 @@
 #include <xmloff/xmltoken.hxx>
 #include <strings.hxx>
 #include <com/sun/star/beans/PropertyValue.hpp>
-#include <sal/log.hxx>
 
 namespace dbaxml
 {
diff --git a/dbaccess/source/filter/xml/xmlHierarchyCollection.cxx b/dbaccess/source/filter/xml/xmlHierarchyCollection.cxx
index 879575482b54..66b7ca1217ba 100644
--- a/dbaccess/source/filter/xml/xmlHierarchyCollection.cxx
+++ b/dbaccess/source/filter/xml/xmlHierarchyCollection.cxx
@@ -27,8 +27,6 @@
 #include <com/sun/star/container/XNameContainer.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <comphelper/propertysequence.hxx>
-#include <osl/diagnose.h>
-#include <sal/log.hxx>
 #include <tools/diagnose_ex.h>
 
 namespace dbaxml
diff --git a/dbaccess/source/filter/xml/xmlQuery.cxx b/dbaccess/source/filter/xml/xmlQuery.cxx
index 8f91145d72e9..df732af6b698 100644
--- a/dbaccess/source/filter/xml/xmlQuery.cxx
+++ b/dbaccess/source/filter/xml/xmlQuery.cxx
@@ -23,8 +23,6 @@
 #include <xmloff/ProgressBarHelper.hxx>
 #include "xmlEnums.hxx"
 #include <strings.hxx>
-#include <osl/diagnose.h>
-#include <sal/log.hxx>
 #include <tools/diagnose_ex.h>
 
 namespace dbaxml
diff --git a/dbaccess/source/filter/xml/xmlTable.cxx b/dbaccess/source/filter/xml/xmlTable.cxx
index 1af5f8e1955a..31d135ee42ea 100644
--- a/dbaccess/source/filter/xml/xmlTable.cxx
+++ b/dbaccess/source/filter/xml/xmlTable.cxx
@@ -29,9 +29,7 @@
 #include <com/sun/star/container/XNameContainer.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <comphelper/propertysequence.hxx>
-#include <osl/diagnose.h>
 #include <tools/diagnose_ex.h>
-#include <sal/log.hxx>
 
 namespace dbaxml
 {
diff --git a/dbaccess/source/inc/apitools.hxx b/dbaccess/source/inc/apitools.hxx
index 4242019eb404..17e002761e0b 100644
--- a/dbaccess/source/inc/apitools.hxx
+++ b/dbaccess/source/inc/apitools.hxx
@@ -22,13 +22,8 @@
 
 #include <sal/config.h>
 
-#include <com/sun/star/beans/PropertyAttribute.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <cppuhelper/component.hxx>
 #include <osl/mutex.hxx>
-#include <osl/diagnose.h>
-#include <comphelper/sequence.hxx>
-#include <strings.hxx>
 
 // OSubComponent - a component which holds a hard ref to its parent
 //                 and is been hold itself (by the parent) with a weak ref
diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
index e4b2b86f62bd..4e9bb41cb63c 100644
--- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx
+++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
@@ -52,7 +52,6 @@
 #include <vcl/commandinfoprovider.hxx>
 #include <vcl/cvtgrf.hxx>
 #include <tools/stream.hxx>
-#include <rtl/ustrbuf.hxx>
 #include "AppController.hxx"
 
 #include <com/sun/star/document/XDocumentProperties.hpp>
diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx
index fb768ac21c91..d1adbea01ed5 100644
--- a/dbaccess/source/ui/browser/sbagrid.cxx
+++ b/dbaccess/source/ui/browser/sbagrid.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <core_resource.hxx>
-#include <helpids.h>
 
 #include <sot/exchange.hxx>
 
@@ -41,19 +40,15 @@
 
 #include <vcl/svapp.hxx>
 
-#include <svl/zforlist.hxx>
 #include <cppuhelper/queryinterface.hxx>
 #include <connectivity/dbtools.hxx>
 #include <comphelper/propertyvalue.hxx>
 #include <comphelper/types.hxx>
 #include <com/sun/star/sdbc/DataType.hpp>
 #include <com/sun/star/sdbc/SQLException.hpp>
-#include <browserids.hxx>
 #include <strings.hrc>
 #include <strings.hxx>
 #include <dbexchange.hxx>
-#include <TableRowExchange.hxx>
-#include <TableRow.hxx>
 #include <svtools/stringtransfer.hxx>
 #include <UITools.hxx>
 #include <TokenWriter.hxx>
diff --git a/dbaccess/source/ui/browser/sbamultiplex.cxx b/dbaccess/source/ui/browser/sbamultiplex.cxx
index 2c2db8163dab..8bf7ed747c03 100644
--- a/dbaccess/source/ui/browser/sbamultiplex.cxx
+++ b/dbaccess/source/ui/browser/sbamultiplex.cxx
@@ -18,6 +18,8 @@
  */
 
 #include <sbamultiplex.hxx>
+#include <cppuhelper/queryinterface.hxx>
+
 using namespace dbaui;
 
 // the listener multiplexers
diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx b/dbaccess/source/ui/control/FieldDescControl.cxx
index 336fa15bac9f..c11c6770b65e 100644
--- a/dbaccess/source/ui/control/FieldDescControl.cxx
+++ b/dbaccess/source/ui/control/FieldDescControl.cxx
@@ -24,7 +24,6 @@
 #include <TableDesignHelpBar.hxx>
 #include <vcl/svapp.hxx>
 #include <FieldDescriptions.hxx>
-#include <svl/zforlist.hxx>
 #include <svl/numuno.hxx>
 #include <vcl/transfer.hxx>
 #include <com/sun/star/sdbc/ColumnValue.hpp>
diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.cxx b/dbaccess/source/ui/dlg/ConnectionHelper.cxx
index b9c954c62c0b..ae1968a738b9 100644
--- a/dbaccess/source/ui/dlg/ConnectionHelper.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionHelper.cxx
@@ -36,7 +36,7 @@
 #include "dsselect.hxx"
 #include <svl/filenotation.hxx>
 #include <com/sun/star/awt/XSystemDependentWindowPeer.hpp>
-#include <com/sun/star/ui/dialogs/FolderPicker.hpp>
+#include <com/sun/star/ui/dialogs/XFolderPicker2.hpp>
 #include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
 #include <com/sun/star/lang/SystemDependent.hpp>
 #include <com/sun/star/mozilla/MozillaBootstrap.hpp>
diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.cxx b/dbaccess/source/ui/dlg/DbAdminImpl.cxx
index 215a8c8f53c4..551f613fe5bb 100644
--- a/dbaccess/source/ui/dlg/DbAdminImpl.cxx
+++ b/dbaccess/source/ui/dlg/DbAdminImpl.cxx
@@ -43,7 +43,6 @@
 #include <com/sun/star/sdbc/ConnectionPool.hpp>
 #include <com/sun/star/sdbc/XDriver.hpp>
 #include <com/sun/star/task/InteractionHandler.hpp>
-#include <com/sun/star/task/XInteractionRequest.hpp>
 #include <com/sun/star/ucb/AuthenticationRequest.hpp>
 
 #include <comphelper/interaction.hxx>
diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx b/dbaccess/source/ui/dlg/dbwizsetup.cxx
index 5a67b9166185..f3582e41dbed 100644
--- a/dbaccess/source/ui/dlg/dbwizsetup.cxx
+++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx
@@ -43,7 +43,6 @@
 #include <cppuhelper/implbase.hxx>
 #include <com/sun/star/frame/TerminationVetoException.hpp>
 #include <com/sun/star/frame/XStorable.hpp>
-#include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/sdb/DatabaseContext.hpp>
 #include <com/sun/star/frame/Desktop.hpp>
 #include <com/sun/star/frame/FrameSearchFlag.hpp>
diff --git a/dbaccess/source/ui/dlg/dlgattr.cxx b/dbaccess/source/ui/dlg/dlgattr.cxx
index ce42469873c4..47457be595ca 100644
--- a/dbaccess/source/ui/dlg/dlgattr.cxx
+++ b/dbaccess/source/ui/dlg/dlgattr.cxx
@@ -25,7 +25,6 @@
 
 #include <svx/dialogs.hrc>
 #include <svl/itemset.hxx>
-#include <svl/zforlist.hxx>
 #include <svx/svxids.hrc>
 
 using namespace dbaui;
diff --git a/dbaccess/source/ui/inc/TableRow.hxx b/dbaccess/source/ui/inc/TableRow.hxx
index fe1852fb2032..4f34a94bf58e 100644
--- a/dbaccess/source/ui/inc/TableRow.hxx
+++ b/dbaccess/source/ui/inc/TableRow.hxx
@@ -18,7 +18,6 @@
  */
 #pragma once
 
-#include <com/sun/star/beans/XPropertySet.hpp>
 #include <tools/long.hxx>
 #include "TypeInfo.hxx"
 
diff --git a/dbaccess/source/ui/inc/directsql.hxx b/dbaccess/source/ui/inc/directsql.hxx
index 23235824d4e4..bfe8195fc5ff 100644
--- a/dbaccess/source/ui/inc/directsql.hxx
+++ b/dbaccess/source/ui/inc/directsql.hxx
@@ -21,7 +21,6 @@
 
 #include <sal/config.h>
 
-#include <sal/log.hxx>
 #include <vcl/weld.hxx>
 #include <deque>
 #include <string_view>
diff --git a/dbaccess/source/ui/inc/imageprovider.hxx b/dbaccess/source/ui/inc/imageprovider.hxx
index d2719a59b657..a8d24f4288b9 100644
--- a/dbaccess/source/ui/inc/imageprovider.hxx
+++ b/dbaccess/source/ui/inc/imageprovider.hxx
@@ -19,8 +19,6 @@
 
 #pragma once
 
-#include <vcl/image.hxx>
-
 #include <com/sun/star/graphic/XGraphic.hpp>
 #include <com/sun/star/sdbc/XConnection.hpp>
 
diff --git a/dbaccess/source/ui/inc/sbamultiplex.hxx b/dbaccess/source/ui/inc/sbamultiplex.hxx
index 3609bfeb0842..d48e3299e9b6 100644
--- a/dbaccess/source/ui/inc/sbamultiplex.hxx
+++ b/dbaccess/source/ui/inc/sbamultiplex.hxx
@@ -31,10 +31,8 @@
 #include <com/sun/star/sdbc/XRowSetListener.hpp>
 #include <com/sun/star/frame/XStatusListener.hpp>
 #include <comphelper/uno3.hxx>
-#include <cppuhelper/interfacecontainer.hxx>
 #include <comphelper/interfacecontainer3.hxx>
 #include <comphelper/multiinterfacecontainer3.hxx>
-#include <cppuhelper/queryinterface.hxx>
 #include <cppuhelper/weak.hxx>
 
 namespace dbaui
diff --git a/dbaccess/source/ui/misc/DExport.cxx b/dbaccess/source/ui/misc/DExport.cxx
index 114c793b0af7..72838e83cabf 100644
--- a/dbaccess/source/ui/misc/DExport.cxx
+++ b/dbaccess/source/ui/misc/DExport.cxx
@@ -45,7 +45,6 @@
 #include <WCopyTable.hxx>
 #include <unotools/syslocale.hxx>
 #include <svl/numformat.hxx>
-#include <svl/zforlist.hxx>
 #include <connectivity/dbexception.hxx>
 #include <connectivity/FValue.hxx>
 #include <com/sun/star/sdb/application/CopyTableOperation.hpp>
diff --git a/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.cxx b/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.cxx
index d3bc756c07f0..2afe74db4232 100644
--- a/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.cxx
+++ b/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.cxx
@@ -20,7 +20,6 @@
 #include "QueryTabWinUndoAct.hxx"
 #include <osl/diagnose.h>
 #include "QTableWindow.hxx"
-#include <TableConnection.hxx>
 #include "QueryDesignFieldUndoAct.hxx"
 #include <QueryTableView.hxx>
 
diff --git a/dbaccess/source/ui/querydesign/TableWindowTitle.cxx b/dbaccess/source/ui/querydesign/TableWindowTitle.cxx
index ed2f2151781f..50eb19c28b47 100644
--- a/dbaccess/source/ui/querydesign/TableWindowTitle.cxx
+++ b/dbaccess/source/ui/querydesign/TableWindowTitle.cxx
@@ -19,8 +19,6 @@
 
 #include <TableWindowTitle.hxx>
 #include <TableWindow.hxx>
-#include <vcl/svapp.hxx>
-#include <vcl/settings.hxx>
 #include <vcl/commandevent.hxx>
 #include <vcl/event.hxx>
 #include <TableWindowListBox.hxx>
diff --git a/dbaccess/source/ui/querydesign/limitboxcontroller.cxx b/dbaccess/source/ui/querydesign/limitboxcontroller.cxx
index 8c48a5ec9d7c..8b6884338063 100644
--- a/dbaccess/source/ui/querydesign/limitboxcontroller.cxx
+++ b/dbaccess/source/ui/querydesign/limitboxcontroller.cxx
@@ -8,7 +8,6 @@
  */
 
 #include "limitboxcontroller.hxx"
-#include <apitools.hxx>
 
 #include <com/sun/star/frame/XDispatchProvider.hpp>
 #include <com/sun/star/frame/XFrame.hpp>
diff --git a/dbaccess/source/ui/tabledesign/TableRowExchange.cxx b/dbaccess/source/ui/tabledesign/TableRowExchange.cxx
index 2728fbdfbe61..c56450ac1c26 100644
--- a/dbaccess/source/ui/tabledesign/TableRowExchange.cxx
+++ b/dbaccess/source/ui/tabledesign/TableRowExchange.cxx
@@ -27,7 +27,6 @@ namespace dbaui
     constexpr sal_uInt32 FORMAT_OBJECT_ID_SBA_TABED = 1;
 
     using namespace ::com::sun::star::uno;
-    using namespace ::com::sun::star::beans;
     OTableRowExchange::OTableRowExchange(std::vector< std::shared_ptr<OTableRow> >&& _rvTableRow)
         : m_vTableRow(std::move(_rvTableRow))
     {
diff --git a/dbaccess/source/ui/uno/ColumnControl.cxx b/dbaccess/source/ui/uno/ColumnControl.cxx
index 4930ba994454..0d26048f8e32 100644
--- a/dbaccess/source/ui/uno/ColumnControl.cxx
+++ b/dbaccess/source/ui/uno/ColumnControl.cxx
@@ -19,7 +19,7 @@
 
 #include "ColumnControl.hxx"
 #include "ColumnPeer.hxx"
-#include <apitools.hxx>
+#include <strings.hxx>
 #include <vcl/window.hxx>
 #include <com/sun/star/awt/PosSize.hpp>
 
diff --git a/dbaccess/source/ui/uno/ColumnModel.cxx b/dbaccess/source/ui/uno/ColumnModel.cxx
index 2ed2e56d6b0d..de83b6176dd6 100644
--- a/dbaccess/source/ui/uno/ColumnModel.cxx
+++ b/dbaccess/source/ui/uno/ColumnModel.cxx
@@ -21,6 +21,7 @@
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 
 #include <stringconstants.hxx>
+#include <strings.hxx>
 
 extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
 com_sun_star_comp_dbu_OColumnControlModel_get_implementation(
diff --git a/dbaccess/source/ui/uno/ColumnModel.hxx b/dbaccess/source/ui/uno/ColumnModel.hxx
index 2a1d768476a5..400d03652d1a 100644
--- a/dbaccess/source/ui/uno/ColumnModel.hxx
+++ b/dbaccess/source/ui/uno/ColumnModel.hxx
@@ -29,7 +29,6 @@
 #include <comphelper/uno3.hxx>
 #include <cppuhelper/compbase4.hxx>
 #include <connectivity/CommonTools.hxx>
-#include <apitools.hxx>
 
 namespace dbaui
 {
diff --git a/dbaccess/source/ui/uno/composerdialogs.cxx b/dbaccess/source/ui/uno/composerdialogs.cxx
index 4040aea94ca7..d05f3239d15b 100644
--- a/dbaccess/source/ui/uno/composerdialogs.cxx
+++ b/dbaccess/source/ui/uno/composerdialogs.cxx
@@ -24,6 +24,7 @@
 #include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
 #include <queryfilter.hxx>
 #include <queryorder.hxx>
+#include <strings.hxx>
 #include <connectivity/dbtools.hxx>
 #include <tools/diagnose_ex.h>
 #include <osl/diagnose.h>
diff --git a/dbaccess/source/ui/uno/composerdialogs.hxx b/dbaccess/source/ui/uno/composerdialogs.hxx
index a2f68fe02223..4e71b1c64704 100644
--- a/dbaccess/source/ui/uno/composerdialogs.hxx
+++ b/dbaccess/source/ui/uno/composerdialogs.hxx
@@ -27,7 +27,6 @@
 #include <comphelper/proparrhlp.hxx>
 #include <connectivity/CommonTools.hxx>
 #include <svtools/genericunodialog.hxx>
-#include <apitools.hxx>
 
 namespace dbaui
 {
diff --git a/dbaccess/source/ui/uno/dbinteraction.cxx b/dbaccess/source/ui/uno/dbinteraction.cxx
index db2d5be60964..ad7480c1a197 100644
--- a/dbaccess/source/ui/uno/dbinteraction.cxx
+++ b/dbaccess/source/ui/uno/dbinteraction.cxx
@@ -18,7 +18,6 @@
  */
 
 #include "dbinteraction.hxx"
-#include <apitools.hxx>
 #include <tools/diagnose_ex.h>
 #include <osl/diagnose.h>
 #include <connectivity/dbexception.hxx>
diff --git a/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx b/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx
index aaae73ee1fbf..5b1636f90bea 100644
--- a/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx
+++ b/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <textconnectionsettings.hxx>
-#include <apitools.hxx>
 #include <unoadmin.hxx>
 #include <stringconstants.hxx>
 #include <propertystorage.hxx>
@@ -32,7 +31,6 @@
 #include <toolkit/helper/vclunohelper.hxx>
 #include <vcl/svapp.hxx>
 #include <cppuhelper/implbase.hxx>
-#include <cppuhelper/implbase1.hxx>
 
 namespace dbaui
 {
diff --git a/dbaccess/source/ui/uno/unoDirectSql.cxx b/dbaccess/source/ui/uno/unoDirectSql.cxx
index bc155f76da35..7b3a4cc6c8dd 100644
--- a/dbaccess/source/ui/uno/unoDirectSql.cxx
+++ b/dbaccess/source/ui/uno/unoDirectSql.cxx
@@ -25,6 +25,7 @@
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <directsql.hxx>
 #include <datasourceconnector.hxx>
+#include <strings.hxx>
 #include <tools/diagnose_ex.h>
 #include <vcl/svapp.hxx>
 
diff --git a/dbaccess/source/ui/uno/unoDirectSql.hxx b/dbaccess/source/ui/uno/unoDirectSql.hxx
index 679c28c5060c..c83f975d63dd 100644
--- a/dbaccess/source/ui/uno/unoDirectSql.hxx
+++ b/dbaccess/source/ui/uno/unoDirectSql.hxx
@@ -20,7 +20,6 @@
 #pragma once
 
 #include <svtools/genericunodialog.hxx>
-#include <apitools.hxx>
 #include <com/sun/star/sdbc/XConnection.hpp>
 #include <comphelper/proparrhlp.hxx>
 #include <connectivity/CommonTools.hxx>