summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabor Kelemen <kelemen.gabor2@nisz.hu>2020-03-13 19:42:04 +0100
committerMiklos Vajna <vmiklos@collabora.com>2020-03-23 13:57:57 +0100
commit88e1abdee1bf426dc868d17e885f60d18dfa37f7 (patch)
tree3e90cd29723045a12a3ee34b2ee705a5e722f697
parent701238ea7d8a06fe7a90de15b7660b7c6d854f09 (diff)
tdf#42949 Fix IWYU warnings in dbaccess/source/core/*/*cxx
Found with bin/find-unneeded-includes Only removal proposals are dealt with here. Change-Id: I24808de5bfd176e007fdc96f120a3c9a43dc7902 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90480 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
-rw-r--r--dbaccess/IwyuFilter_dbaccess.yaml36
-rw-r--r--dbaccess/source/core/api/BookmarkSet.cxx2
-rw-r--r--dbaccess/source/core/api/CIndexes.cxx5
-rw-r--r--dbaccess/source/core/api/CRowSetColumn.cxx5
-rw-r--r--dbaccess/source/core/api/CRowSetDataColumn.cxx2
-rw-r--r--dbaccess/source/core/api/CacheSet.cxx7
-rw-r--r--dbaccess/source/core/api/FilteredContainer.cxx1
-rw-r--r--dbaccess/source/core/api/HelperCollections.cxx1
-rw-r--r--dbaccess/source/core/api/KeySet.cxx12
-rw-r--r--dbaccess/source/core/api/OptimisticSet.cxx17
-rw-r--r--dbaccess/source/core/api/RowSet.cxx11
-rw-r--r--dbaccess/source/core/api/RowSetBase.cxx4
-rw-r--r--dbaccess/source/core/api/RowSetCache.cxx7
-rw-r--r--dbaccess/source/core/api/SingleSelectQueryComposer.cxx7
-rw-r--r--dbaccess/source/core/api/StaticSet.cxx5
-rw-r--r--dbaccess/source/core/api/TableDeco.cxx6
-rw-r--r--dbaccess/source/core/api/View.cxx4
-rw-r--r--dbaccess/source/core/api/WrappedResultSet.cxx4
-rw-r--r--dbaccess/source/core/api/callablestatement.cxx2
-rw-r--r--dbaccess/source/core/api/column.cxx9
-rw-r--r--dbaccess/source/core/api/columnsettings.cxx2
-rw-r--r--dbaccess/source/core/api/datacolumn.cxx6
-rw-r--r--dbaccess/source/core/api/datasettings.cxx6
-rw-r--r--dbaccess/source/core/api/definitioncolumn.cxx3
-rw-r--r--dbaccess/source/core/api/preparedstatement.cxx3
-rw-r--r--dbaccess/source/core/api/query.cxx8
-rw-r--r--dbaccess/source/core/api/querycomposer.cxx17
-rw-r--r--dbaccess/source/core/api/querycontainer.cxx3
-rw-r--r--dbaccess/source/core/api/querydescriptor.cxx3
-rw-r--r--dbaccess/source/core/api/resultcolumn.cxx7
-rw-r--r--dbaccess/source/core/api/resultset.cxx6
-rw-r--r--dbaccess/source/core/api/statement.cxx2
-rw-r--r--dbaccess/source/core/api/table.cxx10
-rw-r--r--dbaccess/source/core/api/tablecontainer.cxx8
-rw-r--r--dbaccess/source/core/api/viewcontainer.cxx9
-rw-r--r--dbaccess/source/core/dataaccess/ContentHelper.cxx12
-rw-r--r--dbaccess/source/core/dataaccess/ModelImpl.cxx13
-rw-r--r--dbaccess/source/core/dataaccess/bookmarkcontainer.cxx4
-rw-r--r--dbaccess/source/core/dataaccess/commandcontainer.cxx1
-rw-r--r--dbaccess/source/core/dataaccess/commanddefinition.cxx1
-rw-r--r--dbaccess/source/core/dataaccess/connection.cxx8
-rw-r--r--dbaccess/source/core/dataaccess/databasecontext.cxx10
-rw-r--r--dbaccess/source/core/dataaccess/databasedocument.cxx15
-rw-r--r--dbaccess/source/core/dataaccess/databaseregistrations.cxx1
-rw-r--r--dbaccess/source/core/dataaccess/datasource.cxx8
-rw-r--r--dbaccess/source/core/dataaccess/definitioncontainer.cxx5
-rw-r--r--dbaccess/source/core/dataaccess/documentcontainer.cxx3
-rw-r--r--dbaccess/source/core/dataaccess/documentdefinition.cxx13
-rw-r--r--dbaccess/source/core/dataaccess/documentevents.cxx4
-rw-r--r--dbaccess/source/core/dataaccess/intercept.cxx6
-rw-r--r--dbaccess/source/core/dataaccess/myucp_datasupplier.cxx2
-rw-r--r--dbaccess/source/core/misc/ContainerMediator.cxx5
-rw-r--r--dbaccess/source/core/misc/DatabaseDataProvider.cxx7
-rw-r--r--dbaccess/source/core/misc/PropertyForward.cxx3
-rw-r--r--dbaccess/source/core/misc/apitools.cxx2
-rw-r--r--dbaccess/source/core/misc/dsntypes.cxx2
-rw-r--r--dbaccess/source/core/misc/objectnameapproval.cxx1
-rw-r--r--dbaccess/source/core/misc/sdbcoretools.cxx3
-rw-r--r--dbaccess/source/core/misc/services.cxx1
-rw-r--r--dbaccess/source/core/recovery/dbdocrecovery.cxx3
-rw-r--r--dbaccess/source/core/recovery/storagetextstream.cxx2
-rw-r--r--dbaccess/source/core/recovery/subcomponentrecovery.cxx1
-rw-r--r--dbaccess/source/core/resource/core_resource.cxx1
-rw-r--r--dbaccess/source/inc/apitools.hxx1
64 files changed, 59 insertions, 319 deletions
diff --git a/dbaccess/IwyuFilter_dbaccess.yaml b/dbaccess/IwyuFilter_dbaccess.yaml
index da6e9450ed21..9eb35dc8c9bf 100644
--- a/dbaccess/IwyuFilter_dbaccess.yaml
+++ b/dbaccess/IwyuFilter_dbaccess.yaml
@@ -15,6 +15,7 @@ blacklist:
- 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
@@ -30,3 +31,38 @@ blacklist:
dbaccess/source/ui/querydesign/QueryTabConnUndoAction.hxx:
# Needed for direct member access
- JoinTableView.hxx
+ dbaccess/source/core/api/CacheSet.cxx:
+ # Actually used
+ - com/sun/star/io/XInputStream.hpp
+ dbaccess/source/core/api/KeySet.cxx:
+ # Actually used
+ - com/sun/star/sdbc/XDatabaseMetaData.hpp
+ - com/sun/star/sdbc/XPreparedStatement.hpp
+ - com/sun/star/io/XInputStream.hpp
+ dbaccess/source/core/api/TableDeco.cxx:
+ # Actually used
+ - com/sun/star/sdbc/XConnection.hpp
+ 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
+ - com/sun/star/io/XOutputStream.hpp
+ dbaccess/source/core/dataaccess/documentevents.cxx:
+ # Actually used
+ - com/sun/star/beans/PropertyValue.hpp
+ dbaccess/source/core/misc/DatabaseDataProvider.cxx:
+ # Needed for UnoType macro to work
+ - com/sun/star/task/XInteractionHandler.hpp
diff --git a/dbaccess/source/core/api/BookmarkSet.cxx b/dbaccess/source/core/api/BookmarkSet.cxx
index 5c9baa1846b1..2caf911a67f7 100644
--- a/dbaccess/source/core/api/BookmarkSet.cxx
+++ b/dbaccess/source/core/api/BookmarkSet.cxx
@@ -23,8 +23,6 @@
#include <com/sun/star/sdbc/XResultSetUpdate.hpp>
#include <connectivity/dbexception.hxx>
-#include <limits>
-
using namespace dbaccess;
using namespace ::connectivity;
using namespace ::dbtools;
diff --git a/dbaccess/source/core/api/CIndexes.cxx b/dbaccess/source/core/api/CIndexes.cxx
index 1a9bde5569e0..409d877288b8 100644
--- a/dbaccess/source/core/api/CIndexes.cxx
+++ b/dbaccess/source/core/api/CIndexes.cxx
@@ -18,11 +18,6 @@
*/
#include "CIndexes.hxx"
-#include <com/sun/star/sdbc/XRow.hpp>
-#include <com/sun/star/sdbc/XResultSet.hpp>
-#include <com/sun/star/sdbc/IndexType.hpp>
-#include <stringconstants.hxx>
-#include <connectivity/dbtools.hxx>
using namespace connectivity;
diff --git a/dbaccess/source/core/api/CRowSetColumn.cxx b/dbaccess/source/core/api/CRowSetColumn.cxx
index ce0016bfbc3a..cef90a8e8521 100644
--- a/dbaccess/source/core/api/CRowSetColumn.cxx
+++ b/dbaccess/source/core/api/CRowSetColumn.cxx
@@ -22,11 +22,6 @@
#include <apitools.hxx>
#include "CRowSetColumn.hxx"
-#include <com/sun/star/sdb/XColumn.hpp>
-#include <com/sun/star/beans/PropertyAttribute.hpp>
-
-#include <cppuhelper/typeprovider.hxx>
-
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 dde85cf95ccf..3c03ad32c2ec 100644
--- a/dbaccess/source/core/api/CRowSetDataColumn.cxx
+++ b/dbaccess/source/core/api/CRowSetDataColumn.cxx
@@ -21,9 +21,7 @@
#include "CRowSetDataColumn.hxx"
#include <stringconstants.hxx>
#include <apitools.hxx>
-#include <comphelper/types.hxx>
#include <cppuhelper/exc_hlp.hxx>
-#include <cppuhelper/typeprovider.hxx>
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <com/sun/star/lang/WrappedTargetRuntimeException.hpp>
#include <com/sun/star/sdbc/SQLException.hpp>
diff --git a/dbaccess/source/core/api/CacheSet.cxx b/dbaccess/source/core/api/CacheSet.cxx
index 63fb7f1e70c3..a1c5430ac343 100644
--- a/dbaccess/source/core/api/CacheSet.cxx
+++ b/dbaccess/source/core/api/CacheSet.cxx
@@ -21,21 +21,16 @@
#include <core_resource.hxx>
#include <strings.hrc>
#include <strings.hxx>
-#include <com/sun/star/sdbcx/CompareBookmark.hpp>
+#include <com/sun/star/container/XIndexAccess.hpp>
#include <com/sun/star/sdbc/XResultSetMetaDataSupplier.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/sdbc/XDatabaseMetaData.hpp>
#include <com/sun/star/sdbc/XPreparedStatement.hpp>
#include <com/sun/star/sdbc/ColumnValue.hpp>
#include <com/sun/star/sdbc/XParameters.hpp>
-#include <stringconstants.hxx>
-#include <com/sun/star/sdbcx/XKeysSupplier.hpp>
#include <com/sun/star/sdbcx/XIndexesSupplier.hpp>
-#include <limits>
-
#include <connectivity/dbtools.hxx>
-#include <com/sun/star/sdbcx/KeyType.hpp>
#include <com/sun/star/io/XInputStream.hpp>
#include <comphelper/types.hxx>
#include <rtl/ustrbuf.hxx>
diff --git a/dbaccess/source/core/api/FilteredContainer.cxx b/dbaccess/source/core/api/FilteredContainer.cxx
index 2e2a81669408..0e8b2926c37e 100644
--- a/dbaccess/source/core/api/FilteredContainer.cxx
+++ b/dbaccess/source/core/api/FilteredContainer.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <stringconstants.hxx>
#include <strings.hxx>
#include <FilteredContainer.hxx>
#include <RefreshListener.hxx>
diff --git a/dbaccess/source/core/api/HelperCollections.cxx b/dbaccess/source/core/api/HelperCollections.cxx
index 2d55e604d99e..dfc18badc688 100644
--- a/dbaccess/source/core/api/HelperCollections.cxx
+++ b/dbaccess/source/core/api/HelperCollections.cxx
@@ -19,7 +19,6 @@
#include "HelperCollections.hxx"
-#include <stringconstants.hxx>
#include <strings.hxx>
#include <osl/diagnose.h>
diff --git a/dbaccess/source/core/api/KeySet.cxx b/dbaccess/source/core/api/KeySet.cxx
index bbde87c4d146..f7a3c4ed7847 100644
--- a/dbaccess/source/core/api/KeySet.cxx
+++ b/dbaccess/source/core/api/KeySet.cxx
@@ -22,32 +22,28 @@
#include <sal/log.hxx>
#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/sdb/XParametersSupplier.hpp>
#include <com/sun/star/sdbc/XDatabaseMetaData.hpp>
#include <com/sun/star/sdbc/ColumnValue.hpp>
+#include <com/sun/star/sdbc/SQLException.hpp>
#include <com/sun/star/sdbc/XPreparedStatement.hpp>
#include <com/sun/star/sdbc/XParameters.hpp>
#include <com/sun/star/sdbc/XResultSetMetaDataSupplier.hpp>
#include <com/sun/star/sdbc/XGeneratedResultSet.hpp>
-#include <com/sun/star/sdbc/XColumnLocate.hpp>
#include <com/sun/star/container/XIndexAccess.hpp>
-#include <stringconstants.hxx>
-#include <apitools.hxx>
#include <com/sun/star/sdbcx/CompareBookmark.hpp>
-#include <com/sun/star/sdbcx/XKeysSupplier.hpp>
#include <com/sun/star/sdb/XSingleSelectQueryComposer.hpp>
#include <com/sun/star/sdbcx/XIndexesSupplier.hpp>
-#include <cppuhelper/typeprovider.hxx>
#include <comphelper/types.hxx>
#include <com/sun/star/sdbcx/KeyType.hpp>
#include <connectivity/dbtools.hxx>
#include <connectivity/dbexception.hxx>
-#include <list>
#include <algorithm>
-#include <string.h>
#include <com/sun/star/io/XInputStream.hpp>
#include <com/sun/star/sdbcx/XTablesSupplier.hpp>
-#include <querycomposer.hxx>
#include <composertools.hxx>
#include "PrivateRow.hxx"
diff --git a/dbaccess/source/core/api/OptimisticSet.cxx b/dbaccess/source/core/api/OptimisticSet.cxx
index c306e9276c7a..3b5ea1367512 100644
--- a/dbaccess/source/core/api/OptimisticSet.cxx
+++ b/dbaccess/source/core/api/OptimisticSet.cxx
@@ -22,32 +22,19 @@
#include "OptimisticSet.hxx"
#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/ColumnValue.hpp>
#include <com/sun/star/sdbc/XPreparedStatement.hpp>
#include <com/sun/star/sdbc/XParameters.hpp>
-#include <com/sun/star/sdbc/XGeneratedResultSet.hpp>
#include <com/sun/star/sdb/XSingleSelectQueryComposer.hpp>
-#include <com/sun/star/sdb/SQLFilterOperator.hpp>
-#include <com/sun/star/sdbc/XColumnLocate.hpp>
-#include <com/sun/star/container/XIndexAccess.hpp>
-#include <stringconstants.hxx>
-#include <apitools.hxx>
-#include <com/sun/star/sdbcx/XKeysSupplier.hpp>
-#include <com/sun/star/sdbcx/XIndexesSupplier.hpp>
-#include <cppuhelper/typeprovider.hxx>
#include <comphelper/types.hxx>
-#include <com/sun/star/sdbcx/KeyType.hpp>
#include <connectivity/dbtools.hxx>
#include <connectivity/dbexception.hxx>
-#include <list>
#include <map>
#include <algorithm>
-#include <string.h>
-#include <com/sun/star/io/XInputStream.hpp>
#include <com/sun/star/sdbcx/XTablesSupplier.hpp>
-#include <querycomposer.hxx>
#include <composertools.hxx>
using namespace dbaccess;
diff --git a/dbaccess/source/core/api/RowSet.cxx b/dbaccess/source/core/api/RowSet.cxx
index ec37f9634486..bd3314082088 100644
--- a/dbaccess/source/core/api/RowSet.cxx
+++ b/dbaccess/source/core/api/RowSet.cxx
@@ -23,7 +23,6 @@
#include <map>
#include <utility>
-#include <string.h>
#include "RowSet.hxx"
#include <stringconstants.hxx>
#include <sdbcoretools.hxx>
@@ -36,7 +35,6 @@
#include <tablecontainer.hxx>
#include <com/sun/star/beans/PropertyAttribute.hpp>
-#include <com/sun/star/container/XChild.hpp>
#include <com/sun/star/lang/DisposedException.hpp>
#include <com/sun/star/sdb/CommandType.hpp>
#include <com/sun/star/sdb/DatabaseContext.hpp>
@@ -50,14 +48,10 @@
#include <com/sun/star/sdbc/ResultSetConcurrency.hpp>
#include <com/sun/star/sdbc/ResultSetType.hpp>
#include <com/sun/star/sdbc/XDataSource.hpp>
-#include <com/sun/star/sdbc/XDriverAccess.hpp>
-#include <com/sun/star/sdbcx/CompareBookmark.hpp>
#include <com/sun/star/sdbcx/Privilege.hpp>
-#include <com/sun/star/sdbcx/XDataDefinitionSupplier.hpp>
-#include <com/sun/star/uno/XNamingService.hpp>
#include <com/sun/star/util/XNumberFormatsSupplier.hpp>
-#include <comphelper/property.hxx>
+#include <comphelper/extract.hxx>
#include <comphelper/seqstream.hxx>
#include <comphelper/sequence.hxx>
#include <comphelper/servicehelper.hxx>
@@ -74,10 +68,7 @@
#include <i18nlangtag/languagetag.hxx>
#include <o3tl/safeint.hxx>
#include <unotools/syslocale.hxx>
-#include <tools/debug.hxx>
#include <tools/diagnose_ex.h>
-#include <tools/solar.h>
-#include <unotools/configmgr.hxx>
using namespace utl;
using namespace dbaccess;
diff --git a/dbaccess/source/core/api/RowSetBase.cxx b/dbaccess/source/core/api/RowSetBase.cxx
index ce28f49d96a8..2572be7fc0ec 100644
--- a/dbaccess/source/core/api/RowSetBase.cxx
+++ b/dbaccess/source/core/api/RowSetBase.cxx
@@ -26,18 +26,14 @@
#include <core_resource.hxx>
#include <strings.hrc>
#include <strings.hxx>
-#include <com/sun/star/lang/DisposedException.hpp>
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <com/sun/star/sdbcx/CompareBookmark.hpp>
#include <com/sun/star/sdbc/ResultSetConcurrency.hpp>
#include <com/sun/star/sdbc/ResultSetType.hpp>
-#include <com/sun/star/lang/Locale.hpp>
-#include <com/sun/star/util/NumberFormat.hpp>
#include <comphelper/sequence.hxx>
#include <comphelper/seqstream.hxx>
#include <connectivity/dbexception.hxx>
#include <o3tl/safeint.hxx>
-#include <tools/debug.hxx>
using namespace dbaccess;
using namespace connectivity;
diff --git a/dbaccess/source/core/api/RowSetCache.cxx b/dbaccess/source/core/api/RowSetCache.cxx
index e84c89aff20b..fdab6417f0e6 100644
--- a/dbaccess/source/core/api/RowSetCache.cxx
+++ b/dbaccess/source/core/api/RowSetCache.cxx
@@ -19,32 +19,25 @@
#include <memory>
#include "BookmarkSet.hxx"
-#include "CRowSetColumn.hxx"
-#include "CRowSetDataColumn.hxx"
#include "KeySet.hxx"
#include "OptimisticSet.hxx"
#include "RowSetBase.hxx"
#include "RowSetCache.hxx"
#include "StaticSet.hxx"
#include "WrappedResultSet.hxx"
-#include <sal/log.hxx>
#include <core_resource.hxx>
#include <strings.hrc>
#include <strings.hxx>
-#include <stringconstants.hxx>
#include <com/sun/star/sdbc/ColumnValue.hpp>
#include <com/sun/star/sdbc/ResultSetConcurrency.hpp>
#include <com/sun/star/sdbc/ResultSetType.hpp>
#include <com/sun/star/sdbcx/CompareBookmark.hpp>
-#include <com/sun/star/sdbcx/KeyType.hpp>
#include <com/sun/star/sdbcx/Privilege.hpp>
#include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
-#include <com/sun/star/sdbcx/XKeysSupplier.hpp>
#include <com/sun/star/sdbcx/XTablesSupplier.hpp>
#include <comphelper/extract.hxx>
-#include <comphelper/property.hxx>
#include <comphelper/types.hxx>
#include <connectivity/dbexception.hxx>
#include <connectivity/dbtools.hxx>
diff --git a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
index e269aca6290e..ba3b02d2da69 100644
--- a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
+++ b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
@@ -29,9 +29,7 @@
#include <sdbcoretools.hxx>
#include <com/sun/star/beans/PropertyAttribute.hpp>
-#include <com/sun/star/container/XChild.hpp>
#include <com/sun/star/i18n/LocaleData.hpp>
-#include <com/sun/star/lang/DisposedException.hpp>
#include <com/sun/star/script/Converter.hpp>
#include <com/sun/star/sdb/BooleanComparisonMode.hpp>
#include <com/sun/star/sdb/SQLFilterOperator.hpp>
@@ -43,20 +41,15 @@
#include <com/sun/star/sdbc/XResultSetMetaData.hpp>
#include <com/sun/star/sdbc/XResultSetMetaDataSupplier.hpp>
#include <com/sun/star/sdbc/XParameters.hpp>
-#include <com/sun/star/uno/XAggregation.hpp>
#include <com/sun/star/util/NumberFormatter.hpp>
#include <comphelper/types.hxx>
#include <cppuhelper/exc_hlp.hxx>
-#include <cppuhelper/typeprovider.hxx>
#include <connectivity/dbtools.hxx>
#include <connectivity/PColumn.hxx>
#include <connectivity/predicateinput.hxx>
-#include <unotools/syslocale.hxx>
-#include <tools/debug.hxx>
#include <tools/diagnose_ex.h>
#include <osl/diagnose.h>
-#include <unotools/configmgr.hxx>
#include <unotools/sharedunocomponent.hxx>
#include <memory>
diff --git a/dbaccess/source/core/api/StaticSet.cxx b/dbaccess/source/core/api/StaticSet.cxx
index b76b406d6002..423d61a44626 100644
--- a/dbaccess/source/core/api/StaticSet.cxx
+++ b/dbaccess/source/core/api/StaticSet.cxx
@@ -21,12 +21,9 @@
#include "StaticSet.hxx"
#include <com/sun/star/sdbcx/CompareBookmark.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/sdbc/XDatabaseMetaData.hpp>
-#include <com/sun/star/sdbc/XPreparedStatement.hpp>
-#include <stringconstants.hxx>
-#include <apitools.hxx>
#include <connectivity/CommonTools.hxx>
#include <comphelper/types.hxx>
+#include <osl/diagnose.h>
using namespace dbaccess;
using namespace connectivity;
diff --git a/dbaccess/source/core/api/TableDeco.cxx b/dbaccess/source/core/api/TableDeco.cxx
index 3bde5a092527..b8a8da27371e 100644
--- a/dbaccess/source/core/api/TableDeco.cxx
+++ b/dbaccess/source/core/api/TableDeco.cxx
@@ -17,8 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <string.h>
-
#include <TableDeco.hxx>
#include <apitools.hxx>
#include <definitioncolumn.hxx>
@@ -31,12 +29,8 @@
#include <cppuhelper/typeprovider.hxx>
#include <comphelper/property.hxx>
#include <comphelper/servicehelper.hxx>
-#include <comphelper/types.hxx>
-#include <com/sun/star/util/XRefreshListener.hpp>
#include <com/sun/star/sdbc/SQLException.hpp>
#include <com/sun/star/sdbc/XConnection.hpp>
-#include <com/sun/star/sdbc/XRow.hpp>
-#include <com/sun/star/sdbcx/Privilege.hpp>
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <connectivity/dbtools.hxx>
#include <connectivity/dbexception.hxx>
diff --git a/dbaccess/source/core/api/View.cxx b/dbaccess/source/core/api/View.cxx
index 0783de38dd6a..c52c4885c757 100644
--- a/dbaccess/source/core/api/View.cxx
+++ b/dbaccess/source/core/api/View.cxx
@@ -18,17 +18,13 @@
*/
#include <View.hxx>
-#include <stringconstants.hxx>
#include <strings.hxx>
-#include <connectivity/dbexception.hxx>
#include <connectivity/dbtools.hxx>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <cppuhelper/exc_hlp.hxx>
#include <tools/diagnose_ex.h>
-#include <unotools/sharedunocomponent.hxx>
namespace dbaccess
{
diff --git a/dbaccess/source/core/api/WrappedResultSet.cxx b/dbaccess/source/core/api/WrappedResultSet.cxx
index b05a20c4b466..07c2b52f1ad6 100644
--- a/dbaccess/source/core/api/WrappedResultSet.cxx
+++ b/dbaccess/source/core/api/WrappedResultSet.cxx
@@ -19,13 +19,9 @@
#include "WrappedResultSet.hxx"
#include <com/sun/star/sdbc/XResultSetUpdate.hpp>
-#include <connectivity/dbexception.hxx>
-
-#include <limits>
using namespace dbaccess;
using namespace ::connectivity;
-using namespace ::dbtools;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::sdbc;
diff --git a/dbaccess/source/core/api/callablestatement.cxx b/dbaccess/source/core/api/callablestatement.cxx
index f8a51d465cfb..cfddeac19139 100644
--- a/dbaccess/source/core/api/callablestatement.cxx
+++ b/dbaccess/source/core/api/callablestatement.cxx
@@ -18,10 +18,8 @@
*/
#include <callablestatement.hxx>
-#include <com/sun/star/lang/DisposedException.hpp>
#include <cppuhelper/typeprovider.hxx>
#include <cppuhelper/queryinterface.hxx>
-#include <stringconstants.hxx>
#include <strings.hxx>
using namespace dbaccess;
diff --git a/dbaccess/source/core/api/column.cxx b/dbaccess/source/core/api/column.cxx
index 59780891c3a3..5bc70affbce0 100644
--- a/dbaccess/source/core/api/column.cxx
+++ b/dbaccess/source/core/api/column.cxx
@@ -18,17 +18,14 @@
*/
#include <ContainerMediator.hxx>
-#include <apitools.hxx>
#include <column.hxx>
#include <strings.hrc>
+#include <strings.hxx>
#include <core_resource.hxx>
#include <stringconstants.hxx>
#include <sdbcoretools.hxx>
#include <com/sun/star/beans/PropertyAttribute.hpp>
-#include <com/sun/star/lang/DisposedException.hpp>
-#include <com/sun/star/sdbc/ColumnValue.hpp>
-#include <com/sun/star/sdbc/DataType.hpp>
#include <com/sun/star/sdb/tools/XTableAlteration.hpp>
#include <comphelper/sequence.hxx>
@@ -36,13 +33,9 @@
#include <comphelper/uno3.hxx>
#include <connectivity/TTableHelper.hxx>
#include <connectivity/dbexception.hxx>
-#include <connectivity/dbtools.hxx>
#include <cppuhelper/supportsservice.hxx>
-#include <cppuhelper/typeprovider.hxx>
#include <osl/diagnose.h>
-#include <algorithm>
-
using namespace dbaccess;
using namespace connectivity;
using namespace ::com::sun::star::sdbc;
diff --git a/dbaccess/source/core/api/columnsettings.cxx b/dbaccess/source/core/api/columnsettings.cxx
index 6abe2abcc7cd..3f62a5a691fe 100644
--- a/dbaccess/source/core/api/columnsettings.cxx
+++ b/dbaccess/source/core/api/columnsettings.cxx
@@ -23,9 +23,7 @@
#include <com/sun/star/beans/PropertyAttribute.hpp>
-#include <cppuhelper/typeprovider.hxx>
#include <comphelper/property.hxx>
-#include <tools/debug.hxx>
#include <tools/diagnose_ex.h>
namespace dbaccess
diff --git a/dbaccess/source/core/api/datacolumn.cxx b/dbaccess/source/core/api/datacolumn.cxx
index 8153c5de70f2..c597a40649bf 100644
--- a/dbaccess/source/core/api/datacolumn.cxx
+++ b/dbaccess/source/core/api/datacolumn.cxx
@@ -18,15 +18,9 @@
*/
#include "datacolumn.hxx"
-#include <com/sun/star/lang/DisposedException.hpp>
-#include <com/sun/star/sdbc/XResultSetMetaDataSupplier.hpp>
-#include <com/sun/star/sdbc/DataType.hpp>
-#include <com/sun/star/sdbc/ColumnValue.hpp>
#include <cppuhelper/queryinterface.hxx>
#include <cppuhelper/typeprovider.hxx>
-#include <stringconstants.hxx>
#include <strings.hxx>
-#include <apitools.hxx>
using namespace dbaccess;
using namespace ::com::sun::star::sdbc;
diff --git a/dbaccess/source/core/api/datasettings.cxx b/dbaccess/source/core/api/datasettings.cxx
index d1af3d92c8a4..28167184442f 100644
--- a/dbaccess/source/core/api/datasettings.cxx
+++ b/dbaccess/source/core/api/datasettings.cxx
@@ -18,17 +18,13 @@
*/
#include <datasettings.hxx>
-#include <apitools.hxx>
#include <stringconstants.hxx>
+#include <strings.hxx>
#include <comphelper/types.hxx>
#include <com/sun/star/beans/PropertyAttribute.hpp>
-#include <vcl/svapp.hxx>
-#include <com/sun/star/awt/FontWeight.hpp>
#include <com/sun/star/awt/FontEmphasisMark.hpp>
#include <com/sun/star/awt/FontRelief.hpp>
-#include <com/sun/star/awt/FontWidth.hpp>
-
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::awt;
using namespace ::com::sun::star::lang;
diff --git a/dbaccess/source/core/api/definitioncolumn.cxx b/dbaccess/source/core/api/definitioncolumn.cxx
index 17bdfaaf0d09..5fb97bedcc17 100644
--- a/dbaccess/source/core/api/definitioncolumn.cxx
+++ b/dbaccess/source/core/api/definitioncolumn.cxx
@@ -28,11 +28,8 @@
#include <com/sun/star/sdbcx/XTablesSupplier.hpp>
#include <comphelper/property.hxx>
-#include <comphelper/types.hxx>
#include <connectivity/dbtools.hxx>
-#include <cppuhelper/typeprovider.hxx>
#include <sal/log.hxx>
-#include <tools/debug.hxx>
#include <tools/diagnose_ex.h>
using namespace ::com::sun::star::sdbc;
diff --git a/dbaccess/source/core/api/preparedstatement.cxx b/dbaccess/source/core/api/preparedstatement.cxx
index fcdcf7e7a230..d65ea616d8c7 100644
--- a/dbaccess/source/core/api/preparedstatement.cxx
+++ b/dbaccess/source/core/api/preparedstatement.cxx
@@ -18,8 +18,6 @@
*/
-#include <stringconstants.hxx>
-
#include <com/sun/star/lang/DisposedException.hpp>
#include <com/sun/star/sdbc/XConnection.hpp>
#include <com/sun/star/sdbc/XDatabaseMetaData.hpp>
@@ -32,7 +30,6 @@
#include <preparedstatement.hxx>
#include "resultcolumn.hxx"
#include "resultset.hxx"
-#include <tools/debug.hxx>
#include <tools/diagnose_ex.h>
using namespace ::com::sun::star::sdbc;
diff --git a/dbaccess/source/core/api/query.cxx b/dbaccess/source/core/api/query.cxx
index 40a83522bd6b..051c11148075 100644
--- a/dbaccess/source/core/api/query.cxx
+++ b/dbaccess/source/core/api/query.cxx
@@ -27,26 +27,18 @@
#include <strings.hrc>
#include <cppuhelper/interfacecontainer.hxx>
-#include <cppuhelper/queryinterface.hxx>
-#include <tools/debug.hxx>
#include <tools/diagnose_ex.h>
#include <osl/diagnose.h>
#include <com/sun/star/sdbc/XConnection.hpp>
-#include <com/sun/star/lang/DisposedException.hpp>
#include <com/sun/star/sdb/XSingleSelectQueryComposer.hpp>
#include <com/sun/star/sdbc/XResultSetMetaDataSupplier.hpp>
#include <com/sun/star/sdb/SQLContext.hpp>
-#include <comphelper/types.hxx>
#include <comphelper/property.hxx>
#include <unotools/sharedunocomponent.hxx>
#include <definitioncolumn.hxx>
-#include <functional>
-
-#include <sdbcoretools.hxx>
-#include <querycomposer.hxx>
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <ContainerMediator.hxx>
diff --git a/dbaccess/source/core/api/querycomposer.cxx b/dbaccess/source/core/api/querycomposer.cxx
index ed402271c051..1718e15f5ab3 100644
--- a/dbaccess/source/core/api/querycomposer.cxx
+++ b/dbaccess/source/core/api/querycomposer.cxx
@@ -17,33 +17,18 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <string.h>
#include <com/sun/star/lang/DisposedException.hpp>
-#include <com/sun/star/util/XNumberFormatter.hpp>
#include <com/sun/star/sdbc/ColumnSearch.hpp>
-#include <com/sun/star/sdbc/DataType.hpp>
-#include <com/sun/star/sdbc/XResultSetMetaDataSupplier.hpp>
-#include <com/sun/star/sdbc/XResultSetMetaData.hpp>
-#include <com/sun/star/lang/ServiceNotRegisteredException.hpp>
#include <comphelper/sequence.hxx>
-#include <com/sun/star/uno/XAggregation.hpp>
-#include <stringconstants.hxx>
#include <cppuhelper/supportsservice.hxx>
-#include <cppuhelper/typeprovider.hxx>
#include <unotools/configmgr.hxx>
#include <comphelper/types.hxx>
-#include <com/sun/star/beans/PropertyAttribute.hpp>
-#include <com/sun/star/i18n/XLocaleData.hpp>
-#include <unotools/syslocale.hxx>
-#include <com/sun/star/container/XChild.hpp>
#include <com/sun/star/sdb/SQLFilterOperator.hpp>
#include <querycomposer.hxx>
-#include "HelperCollections.hxx"
#include <composertools.hxx>
#include <algorithm>
using namespace dbaccess;
-using namespace dbtools;
using namespace comphelper;
using namespace connectivity;
using namespace ::com::sun::star::uno;
@@ -52,9 +37,7 @@ using namespace ::com::sun::star::sdbc;
using namespace ::com::sun::star::sdb;
using namespace ::com::sun::star::sdbcx;
using namespace ::com::sun::star::container;
-using namespace ::com::sun::star::i18n;
using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::script;
using namespace ::cppu;
using namespace ::osl;
using namespace ::utl;
diff --git a/dbaccess/source/core/api/querycontainer.cxx b/dbaccess/source/core/api/querycontainer.cxx
index 731bf4e21896..27ecf51ef5c1 100644
--- a/dbaccess/source/core/api/querycontainer.cxx
+++ b/dbaccess/source/core/api/querycontainer.cxx
@@ -18,7 +18,6 @@
*/
#include <querycontainer.hxx>
-#include <stringconstants.hxx>
#include "query.hxx"
#include <objectnameapproval.hxx>
#include <veto.hxx>
@@ -31,8 +30,6 @@
#include <com/sun/star/sdbc/XConnection.hpp>
#include <com/sun/star/sdb/QueryDefinition.hpp>
-#include <connectivity/dbexception.hxx>
-
#include <osl/diagnose.h>
#include <comphelper/uno3.hxx>
#include <comphelper/property.hxx>
diff --git a/dbaccess/source/core/api/querydescriptor.cxx b/dbaccess/source/core/api/querydescriptor.cxx
index ab4fa02b7409..c52febb5db6c 100644
--- a/dbaccess/source/core/api/querydescriptor.cxx
+++ b/dbaccess/source/core/api/querydescriptor.cxx
@@ -17,8 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <string.h>
-
#include "querydescriptor.hxx"
#include <apitools.hxx>
#include <stringconstants.hxx>
@@ -26,7 +24,6 @@
#include <cppuhelper/supportsservice.hxx>
#include <cppuhelper/typeprovider.hxx>
#include <com/sun/star/beans/PropertyAttribute.hpp>
-#include <definitioncolumn.hxx>
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::awt;
diff --git a/dbaccess/source/core/api/resultcolumn.cxx b/dbaccess/source/core/api/resultcolumn.cxx
index e1ddc764eedf..afb2e3f574b5 100644
--- a/dbaccess/source/core/api/resultcolumn.cxx
+++ b/dbaccess/source/core/api/resultcolumn.cxx
@@ -18,20 +18,13 @@
*/
#include "resultcolumn.hxx"
-#include <com/sun/star/lang/DisposedException.hpp>
#include <com/sun/star/sdbc/SQLException.hpp>
-#include <com/sun/star/sdbc/XResultSetMetaDataSupplier.hpp>
#include <com/sun/star/sdbc/DataType.hpp>
#include <com/sun/star/sdbc/ColumnValue.hpp>
#include <com/sun/star/sdbc/XRow.hpp>
-#include <cppuhelper/typeprovider.hxx>
-#include <tools/debug.hxx>
#include <tools/diagnose_ex.h>
#include <stringconstants.hxx>
#include <apitools.hxx>
-#include <com/sun/star/beans/PropertyAttribute.hpp>
-#include <cppuhelper/exc_hlp.hxx>
-#include <osl/thread.h>
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 f43fedd1a32f..ee93aa42ac53 100644
--- a/dbaccess/source/core/api/resultset.cxx
+++ b/dbaccess/source/core/api/resultset.cxx
@@ -21,22 +21,16 @@
#include <sal/log.hxx>
#include <stringconstants.hxx>
#include <apitools.hxx>
-#include <com/sun/star/lang/DisposedException.hpp>
#include <com/sun/star/sdbc/ResultSetType.hpp>
#include <com/sun/star/sdbc/SQLException.hpp>
#include <cppuhelper/supportsservice.hxx>
#include <cppuhelper/queryinterface.hxx>
#include <cppuhelper/typeprovider.hxx>
-#include <comphelper/property.hxx>
#include <comphelper/types.hxx>
-#include <tools/debug.hxx>
#include <tools/diagnose_ex.h>
#include "datacolumn.hxx"
-#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <connectivity/dbexception.hxx>
#include <connectivity/dbtools.hxx>
-#include <cppuhelper/exc_hlp.hxx>
-#include <osl/thread.h>
using namespace ::com::sun::star::sdbc;
diff --git a/dbaccess/source/core/api/statement.cxx b/dbaccess/source/core/api/statement.cxx
index 90f939c076f3..812d91c64a47 100644
--- a/dbaccess/source/core/api/statement.cxx
+++ b/dbaccess/source/core/api/statement.cxx
@@ -20,7 +20,6 @@
#include <statement.hxx>
#include "resultset.hxx"
#include <stringconstants.hxx>
-#include <com/sun/star/lang/DisposedException.hpp>
#include <com/sun/star/sdbc/XDatabaseMetaData.hpp>
#include <com/sun/star/sdbc/SQLException.hpp>
#include <cppuhelper/queryinterface.hxx>
@@ -28,7 +27,6 @@
#include <cppuhelper/typeprovider.hxx>
#include <comphelper/property.hxx>
#include <comphelper/types.hxx>
-#include <tools/debug.hxx>
#include <tools/diagnose_ex.h>
#include <connectivity/dbexception.hxx>
diff --git a/dbaccess/source/core/api/table.cxx b/dbaccess/source/core/api/table.cxx
index a17398b03378..d9b8f4484f5e 100644
--- a/dbaccess/source/core/api/table.cxx
+++ b/dbaccess/source/core/api/table.cxx
@@ -17,8 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <string.h>
-
#include <apitools.hxx>
#include <table.hxx>
#include <definitioncolumn.hxx>
@@ -30,23 +28,15 @@
#include <osl/diagnose.h>
#include <cppuhelper/typeprovider.hxx>
#include <comphelper/servicehelper.hxx>
-#include <comphelper/types.hxx>
#include <com/sun/star/beans/PropertyAttribute.hpp>
-#include <com/sun/star/util/XRefreshListener.hpp>
#include <com/sun/star/sdbc/SQLException.hpp>
#include <com/sun/star/sdbc/XConnection.hpp>
-#include <com/sun/star/sdbc/XRow.hpp>
-#include <com/sun/star/sdbcx/Privilege.hpp>
-#include <com/sun/star/sdbc/XResultSetMetaData.hpp>
-#include <com/sun/star/sdbc/XResultSetMetaDataSupplier.hpp>
#include <com/sun/star/sdb/tools/XTableRename.hpp>
#include <com/sun/star/sdb/tools/XTableAlteration.hpp>
#include <connectivity/TKeys.hxx>
#include <connectivity/dbtools.hxx>
-#include <connectivity/dbexception.hxx>
-#include <sdbcoretools.hxx>
#include <ContainerMediator.hxx>
using namespace dbaccess;
diff --git a/dbaccess/source/core/api/tablecontainer.cxx b/dbaccess/source/core/api/tablecontainer.cxx
index 9a7584125889..e4eb5107b99b 100644
--- a/dbaccess/source/core/api/tablecontainer.cxx
+++ b/dbaccess/source/core/api/tablecontainer.cxx
@@ -19,15 +19,12 @@
#include <apitools.hxx>
#include <tablecontainer.hxx>
-#include <stringconstants.hxx>
#include <table.hxx>
#include <sal/log.hxx>
#include <comphelper/property.hxx>
#include <comphelper/processfactory.hxx>
-#include <tools/debug.hxx>
#include <core_resource.hxx>
#include <strings.hrc>
-#include <com/sun/star/sdb/CommandType.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/beans/PropertyState.hpp>
#include <com/sun/star/beans/XPropertyState.hpp>
@@ -35,10 +32,6 @@
#include <com/sun/star/sdbc/XConnection.hpp>
#include <com/sun/star/sdbc/XDatabaseMetaData.hpp>
#include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
-#include <com/sun/star/sdbcx/XTablesSupplier.hpp>
-#include <com/sun/star/sdbc/KeyRule.hpp>
-#include <com/sun/star/sdbcx/KeyType.hpp>
-#include <com/sun/star/sdbc/ColumnValue.hpp>
#include <com/sun/star/sdbc/XRow.hpp>
#include <com/sun/star/sdbc/SQLException.hpp>
#include <comphelper/types.hxx>
@@ -47,7 +40,6 @@
#include <TableDeco.hxx>
#include <sdbcoretools.hxx>
#include <ContainerMediator.hxx>
-#include <definitioncolumn.hxx>
#include <objectnameapproval.hxx>
#include <tools/diagnose_ex.h>
diff --git a/dbaccess/source/core/api/viewcontainer.cxx b/dbaccess/source/core/api/viewcontainer.cxx
index 6d0aee7258fc..bec415ffa2f4 100644
--- a/dbaccess/source/core/api/viewcontainer.cxx
+++ b/dbaccess/source/core/api/viewcontainer.cxx
@@ -19,23 +19,14 @@
#include <apitools.hxx>
#include <viewcontainer.hxx>
-#include <stringconstants.hxx>
#include <View.hxx>
#include <comphelper/types.hxx>
#include <connectivity/dbtools.hxx>
#include <connectivity/dbexception.hxx>
-#include <rtl/ustrbuf.hxx>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/sdbc/XConnection.hpp>
-#include <com/sun/star/sdbc/XDatabaseMetaData.hpp>
-#include <com/sun/star/sdbc/KeyRule.hpp>
-#include <com/sun/star/sdbc/ColumnValue.hpp>
-#include <com/sun/star/sdbc/XRow.hpp>
-#include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
-#include <com/sun/star/sdbcx/XTablesSupplier.hpp>
-#include <com/sun/star/sdbcx/KeyType.hpp>
using namespace dbaccess;
using namespace dbtools;
diff --git a/dbaccess/source/core/dataaccess/ContentHelper.cxx b/dbaccess/source/core/dataaccess/ContentHelper.cxx
index c3ddcca6e182..424d3e8c9cf4 100644
--- a/dbaccess/source/core/dataaccess/ContentHelper.cxx
+++ b/dbaccess/source/core/dataaccess/ContentHelper.cxx
@@ -17,27 +17,29 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <string.h>
#include <ContentHelper.hxx>
+#include <rtl/ref.hxx>
#include <rtl/ustrbuf.hxx>
#include <ucbhelper/cancelcommandexecution.hxx>
#include <com/sun/star/ucb/UnsupportedCommandException.hpp>
#include <com/sun/star/lang/IllegalArgumentException.hpp>
#include <com/sun/star/lang/IllegalAccessException.hpp>
-#include <com/sun/star/io/XOutputStream.hpp>
-#include <com/sun/star/io/XActiveDataSink.hpp>
#include <com/sun/star/beans/IllegalTypeException.hpp>
#include <com/sun/star/beans/PropertyAttribute.hpp>
+#include <com/sun/star/beans/PropertyValue.hpp>
+#include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/container/ElementExistException.hpp>
#include <ucbhelper/propertyvalueset.hxx>
#include <ucbhelper/contentidentifier.hxx>
-#include "myucp_resultset.hxx"
-#include <com/sun/star/container/XNameContainer.hpp>
#include <cppuhelper/interfacecontainer.hxx>
#include <comphelper/servicehelper.hxx>
#include <cppuhelper/typeprovider.hxx>
+#include <apitools.hxx>
#include <sdbcoretools.hxx>
#include <stringconstants.hxx>
+#include <map>
+
namespace dbaccess
{
using namespace ::com::sun::star::uno;
diff --git a/dbaccess/source/core/dataaccess/ModelImpl.cxx b/dbaccess/source/core/dataaccess/ModelImpl.cxx
index 2accd7cae25d..c446950afa54 100644
--- a/dbaccess/source/core/dataaccess/ModelImpl.cxx
+++ b/dbaccess/source/core/dataaccess/ModelImpl.cxx
@@ -17,22 +17,18 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include "commandcontainer.hxx"
-#include "connection.hxx"
#include <databasecontext.hxx>
#include "databasedocument.hxx"
#include "datasource.hxx"
-#include <stringconstants.hxx>
+#include <definitioncontainer.hxx>
#include <ModelImpl.hxx>
#include <sdbcoretools.hxx>
#include <com/sun/star/beans/PropertyBag.hpp>
#include <com/sun/star/container/XSet.hpp>
#include <com/sun/star/document/MacroExecMode.hpp>
-#include <com/sun/star/embed/XTransactedObject.hpp>
#include <com/sun/star/embed/XTransactionBroadcaster.hpp>
#include <com/sun/star/embed/StorageFactory.hpp>
-#include <com/sun/star/form/XLoadable.hpp>
#include <com/sun/star/frame/theGlobalEventBroadcaster.hpp>
#include <com/sun/star/io/IOException.hpp>
#include <com/sun/star/lang/WrappedTargetRuntimeException.hpp>
@@ -41,20 +37,14 @@
#include <com/sun/star/script/DocumentDialogLibraryContainer.hpp>
#include <com/sun/star/util/NumberFormatsSupplier.hpp>
-#include <connectivity/dbexception.hxx>
#include <cppuhelper/exc_hlp.hxx>
#include <cppuhelper/implbase.hxx>
-#include <cppuhelper/typeprovider.hxx>
#include <comphelper/types.hxx>
-#include <rtl/digest.h>
#include <sfx2/signaturestate.hxx>
-#include <tools/debug.hxx>
#include <tools/diagnose_ex.h>
#include <osl/diagnose.h>
#include <sal/log.hxx>
-#include <vcl/errcode.hxx>
#include <tools/urlobj.hxx>
-#include <unotools/sharedunocomponent.hxx>
#include <unotools/configmgr.hxx>
#include <i18nlangtag/languagetag.hxx>
@@ -78,7 +68,6 @@ using namespace ::com::sun::star::task;
using namespace ::com::sun::star::script;
using namespace ::cppu;
using namespace ::osl;
-using namespace ::dbtools;
using namespace ::comphelper;
namespace dbaccess
diff --git a/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx b/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx
index 352eabfde368..647aaf557f97 100644
--- a/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx
+++ b/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx
@@ -18,15 +18,11 @@
*/
#include <bookmarkcontainer.hxx>
-#include <stringconstants.hxx>
-#include <apitools.hxx>
#include <osl/diagnose.h>
#include <comphelper/enumhelper.hxx>
#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
#include <com/sun/star/lang/NoSupportException.hpp>
-#include <com/sun/star/lang/XComponent.hpp>
-#include <comphelper/types.hxx>
#include <cppuhelper/supportsservice.hxx>
using namespace ::com::sun::star::uno;
diff --git a/dbaccess/source/core/dataaccess/commandcontainer.cxx b/dbaccess/source/core/dataaccess/commandcontainer.cxx
index 9f75b5bcc67b..55087272b992 100644
--- a/dbaccess/source/core/dataaccess/commandcontainer.cxx
+++ b/dbaccess/source/core/dataaccess/commandcontainer.cxx
@@ -20,7 +20,6 @@
#include "commandcontainer.hxx"
#include "commanddefinition.hxx"
-#include <stringconstants.hxx>
#include <com/sun/star/sdb/TableDefinition.hpp>
#include <com/sun/star/sdb/CommandDefinition.hpp>
diff --git a/dbaccess/source/core/dataaccess/commanddefinition.cxx b/dbaccess/source/core/dataaccess/commanddefinition.cxx
index 03af40113d72..41ce139a8dc1 100644
--- a/dbaccess/source/core/dataaccess/commanddefinition.cxx
+++ b/dbaccess/source/core/dataaccess/commanddefinition.cxx
@@ -22,7 +22,6 @@
#include <stringconstants.hxx>
#include <com/sun/star/container/ElementExistException.hpp>
-#include <com/sun/star/lang/DisposedException.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 7f21a8cebf11..2754a2c7d56e 100644
--- a/dbaccess/source/core/dataaccess/connection.cxx
+++ b/dbaccess/source/core/dataaccess/connection.cxx
@@ -22,35 +22,27 @@
#include <iterator>
#include "connection.hxx"
-#include <stringconstants.hxx>
#include "datasource.hxx"
#include <strings.hrc>
#include <core_resource.hxx>
#include <statement.hxx>
#include <preparedstatement.hxx>
#include <callablestatement.hxx>
-#include <ContainerMediator.hxx>
#include <SingleSelectQueryComposer.hxx>
#include <querycomposer.hxx>
-#include <sdbcoretools.hxx>
#include <com/sun/star/lang/NoSupportException.hpp>
#include <com/sun/star/sdb/CommandType.hpp>
#include <com/sun/star/sdb/tools/ConnectionTools.hpp>
-#include <com/sun/star/sdbc/XDriverAccess.hpp>
-#include <com/sun/star/sdbcx/XDataDefinitionSupplier.hpp>
#include <com/sun/star/reflection/ProxyFactory.hpp>
#include <com/sun/star/beans/NamedValue.hpp>
#include <connectivity/dbtools.hxx>
#include <connectivity/dbmetadata.hxx>
-#include <connectivity/dbexception.hxx>
-#include <tools/debug.hxx>
#include <tools/diagnose_ex.h>
#include <osl/diagnose.h>
#include <comphelper/sequence.hxx>
#include <comphelper/types.hxx>
#include <cppuhelper/supportsservice.hxx>
-#include <cppuhelper/typeprovider.hxx>
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
diff --git a/dbaccess/source/core/dataaccess/databasecontext.cxx b/dbaccess/source/core/dataaccess/databasecontext.cxx
index 6b4ab7f15ba7..c2c347698fa3 100644
--- a/dbaccess/source/core/dataaccess/databasecontext.cxx
+++ b/dbaccess/source/core/dataaccess/databasecontext.cxx
@@ -19,23 +19,18 @@
#include <config_features.h>
-#include <apitools.hxx>
#include <strings.hrc>
#include <core_resource.hxx>
#include <databasecontext.hxx>
-#include "databasedocument.hxx"
#include "databaseregistrations.hxx"
#include "datasource.hxx"
-#include <stringconstants.hxx>
-#include <com/sun/star/beans/NamedValue.hpp>
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/document/MacroExecMode.hpp>
-#include <com/sun/star/document/XFilter.hpp>
-#include <com/sun/star/document/XImporter.hpp>
#include <com/sun/star/frame/Desktop.hpp>
#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>
@@ -62,12 +57,9 @@
#include <rtl/uri.hxx>
#include <sal/log.hxx>
#include <svl/filenotation.hxx>
-#include <tools/debug.hxx>
#include <tools/diagnose_ex.h>
#include <tools/urlobj.hxx>
#include <ucbhelper/content.hxx>
-#include <unotools/confignode.hxx>
-#include <unotools/pathoptions.hxx>
#include <unotools/sharedunocomponent.hxx>
#include <vector>
diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx b/dbaccess/source/core/dataaccess/databasedocument.cxx
index 3b0058a51c82..ff4e68ef3c15 100644
--- a/dbaccess/source/core/dataaccess/databasedocument.cxx
+++ b/dbaccess/source/core/dataaccess/databasedocument.cxx
@@ -19,29 +19,21 @@
#include <core_resource.hxx>
#include <strings.hrc>
-#include "datasource.hxx"
#include "databasedocument.hxx"
-#include <stringconstants.hxx>
#include "documenteventexecutor.hxx"
#include <databasecontext.hxx>
#include "documentcontainer.hxx"
#include <sdbcoretools.hxx>
#include <recovery/dbdocrecovery.hxx>
-#include <com/sun/star/beans/Optional.hpp>
#include <com/sun/star/document/XExporter.hpp>
#include <com/sun/star/document/XFilter.hpp>
#include <com/sun/star/document/XImporter.hpp>
#include <com/sun/star/document/XGraphicStorageHandler.hpp>
#include <com/sun/star/document/GraphicStorageHandler.hpp>
-#include <com/sun/star/embed/EntryInitModes.hpp>
-#include <com/sun/star/embed/XEmbedPersist.hpp>
-#include <com/sun/star/embed/XTransactedObject.hpp>
-#include <com/sun/star/embed/XTransactionBroadcaster.hpp>
#include <com/sun/star/frame/Desktop.hpp>
#include <com/sun/star/frame/ModuleManager.hpp>
#include <com/sun/star/io/IOException.hpp>
-#include <com/sun/star/io/XActiveDataSource.hpp>
#include <com/sun/star/io/XSeekable.hpp>
#include <com/sun/star/io/XOutputStream.hpp>
#include <com/sun/star/io/XTruncate.hpp>
@@ -51,10 +43,8 @@
#include <com/sun/star/sdb/DatabaseContext.hpp>
#include <com/sun/star/sdb/application/XDatabaseDocumentUI.hpp>
#include <com/sun/star/task/XStatusIndicator.hpp>
-#include <com/sun/star/task/XStatusIndicatorFactory.hpp>
#include <com/sun/star/ucb/SimpleFileAccess.hpp>
#include <com/sun/star/ui/UIConfigurationManager.hpp>
-#include <com/sun/star/ui/XUIConfigurationStorage.hpp>
#include <com/sun/star/util/CloseVetoException.hpp>
#include <com/sun/star/view/XSelectionSupplier.hpp>
#include <com/sun/star/xml/sax/XDocumentHandler.hpp>
@@ -79,13 +69,8 @@
#include <cppuhelper/supportsservice.hxx>
#include <framework/titlehelper.hxx>
#include <unotools/saveopt.hxx>
-#include <tools/debug.hxx>
#include <tools/diagnose_ex.h>
#include <osl/diagnose.h>
-#include <vcl/errcode.hxx>
-#include <sal/log.hxx>
-
-#include <list>
#include <vcl/GraphicObject.hxx>
#include <tools/urlobj.hxx>
diff --git a/dbaccess/source/core/dataaccess/databaseregistrations.cxx b/dbaccess/source/core/dataaccess/databaseregistrations.cxx
index 516873746d7a..c147f99ec694 100644
--- a/dbaccess/source/core/dataaccess/databaseregistrations.cxx
+++ b/dbaccess/source/core/dataaccess/databaseregistrations.cxx
@@ -28,7 +28,6 @@
#include <cppuhelper/basemutex.hxx>
#include <comphelper/interfacecontainer2.hxx>
#include <cppuhelper/implbase1.hxx>
-#include <rtl/ustrbuf.hxx>
#include <osl/diagnose.h>
#include <unotools/pathoptions.hxx>
#include <tools/urlobj.hxx>
diff --git a/dbaccess/source/core/dataaccess/datasource.cxx b/dbaccess/source/core/dataaccess/datasource.cxx
index e8a5f5d6a30a..7931fc425163 100644
--- a/dbaccess/source/core/dataaccess/datasource.cxx
+++ b/dbaccess/source/core/dataaccess/datasource.cxx
@@ -33,9 +33,7 @@
#include <com/sun/star/beans/NamedValue.hpp>
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <com/sun/star/beans/PropertyState.hpp>
-#include <com/sun/star/beans/XPropertyContainer.hpp>
#include <com/sun/star/document/XDocumentSubStorageSupplier.hpp>
-#include <com/sun/star/embed/XTransactedObject.hpp>
#include <com/sun/star/lang/DisposedException.hpp>
#include <com/sun/star/reflection/ProxyFactory.hpp>
#include <com/sun/star/sdb/DatabaseContext.hpp>
@@ -44,11 +42,8 @@
#include <com/sun/star/sdbc/XDriverAccess.hpp>
#include <com/sun/star/sdbc/XDriverManager.hpp>
#include <com/sun/star/sdbc/DriverManager.hpp>
-#include <com/sun/star/sdbcx/XTablesSupplier.hpp>
#include <com/sun/star/ucb/AuthenticationRequest.hpp>
#include <com/sun/star/ucb/XInteractionSupplyAuthentication.hpp>
-#include <com/sun/star/ui/XUIConfigurationManagerSupplier.hpp>
-#include <com/sun/star/view/XPrintable.hpp>
#include <cppuhelper/implbase.hxx>
#include <comphelper/interaction.hxx>
@@ -59,15 +54,12 @@
#include <connectivity/dbexception.hxx>
#include <connectivity/dbtools.hxx>
#include <cppuhelper/typeprovider.hxx>
-#include <tools/debug.hxx>
#include <tools/diagnose_ex.h>
#include <osl/diagnose.h>
#include <osl/process.h>
#include <sal/log.hxx>
#include <svtools/miscopt.hxx>
#include <tools/urlobj.hxx>
-#include <typelib/typedescription.hxx>
-#include <unotools/confignode.hxx>
#include <unotools/sharedunocomponent.hxx>
#include <rtl/digest.h>
diff --git a/dbaccess/source/core/dataaccess/definitioncontainer.cxx b/dbaccess/source/core/dataaccess/definitioncontainer.cxx
index abb9386e2ad1..e31eee40b0dc 100644
--- a/dbaccess/source/core/dataaccess/definitioncontainer.cxx
+++ b/dbaccess/source/core/dataaccess/definitioncontainer.cxx
@@ -18,26 +18,21 @@
*/
#include <definitioncontainer.hxx>
-#include <stringconstants.hxx>
#include <apitools.hxx>
#include <core_resource.hxx>
#include <strings.hrc>
-#include <tools/debug.hxx>
#include <tools/diagnose_ex.h>
#include <osl/diagnose.h>
#include <comphelper/enumhelper.hxx>
#include <cppuhelper/exc_hlp.hxx>
#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
#include <com/sun/star/lang/WrappedTargetRuntimeException.hpp>
-#include <com/sun/star/lang/XComponent.hpp>
-#include <com/sun/star/ucb/CommandInfo.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/sdb/ErrorCondition.hpp>
#include <comphelper/servicehelper.hxx>
#include <comphelper/types.hxx>
#include <cppuhelper/interfacecontainer.hxx>
-#include <ucbhelper/contentidentifier.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 db5bed5ceb43..9d88d27222f5 100644
--- a/dbaccess/source/core/dataaccess/documentcontainer.cxx
+++ b/dbaccess/source/core/dataaccess/documentcontainer.cxx
@@ -20,6 +20,7 @@
#include "documentcontainer.hxx"
#include <stringconstants.hxx>
#include "documentdefinition.hxx"
+#include <ModelImpl.hxx>
#include <com/sun/star/ucb/OpenCommandArgument2.hpp>
#include <com/sun/star/ucb/OpenMode.hpp>
#include <connectivity/dbtools.hxx>
@@ -29,8 +30,6 @@
#include <com/sun/star/ucb/InsertCommandArgument.hpp>
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <com/sun/star/sdb/ErrorCondition.hpp>
-#include "datasource.hxx"
-#include <comphelper/classids.hxx>
#include <comphelper/mimeconfighelper.hxx>
#include <connectivity/sqlerror.hxx>
#include <core_resource.hxx>
diff --git a/dbaccess/source/core/dataaccess/documentdefinition.cxx b/dbaccess/source/core/dataaccess/documentdefinition.cxx
index d1e569afd2a9..8115fd9fe6d2 100644
--- a/dbaccess/source/core/dataaccess/documentdefinition.cxx
+++ b/dbaccess/source/core/dataaccess/documentdefinition.cxx
@@ -18,9 +18,9 @@
*/
#include "documentdefinition.hxx"
+#include <ModelImpl.hxx>
#include <stringconstants.hxx>
#include <sdbcoretools.hxx>
-#include <tools/debug.hxx>
#include <tools/diagnose_ex.h>
#include <osl/diagnose.h>
#include <comphelper/sequence.hxx>
@@ -37,33 +37,26 @@
#include <com/sun/star/frame/XTitle.hpp>
#include <com/sun/star/frame/XController.hpp>
#include <com/sun/star/task/XJobExecutor.hpp>
-#include <com/sun/star/ucb/InsertCommandArgument.hpp>
#include <com/sun/star/report/XReportDefinition.hpp>
#include <com/sun/star/report/XReportEngine.hpp>
#include <com/sun/star/ucb/OpenMode.hpp>
#include <com/sun/star/embed/WrongStateException.hpp>
-#include <com/sun/star/embed/XEmbedObjectFactory.hpp>
#include <com/sun/star/embed/EmbeddedObjectCreator.hpp>
#include <com/sun/star/embed/Aspects.hpp>
#include <com/sun/star/embed/OOoEmbeddedObjectFactory.hpp>
#include <ucbhelper/cancelcommandexecution.hxx>
-#include <com/sun/star/ucb/UnsupportedDataSinkException.hpp>
#include <com/sun/star/ucb/UnsupportedOpenModeException.hpp>
#include <com/sun/star/embed/ElementModes.hpp>
#include <com/sun/star/embed/XEmbedPersist.hpp>
#include <com/sun/star/embed/EmbedStates.hpp>
-#include <com/sun/star/embed/XComponentSupplier.hpp>
#include <com/sun/star/embed/EntryInitModes.hpp>
#include <com/sun/star/ucb/MissingPropertiesException.hpp>
-#include <com/sun/star/ucb/MissingInputStreamException.hpp>
#include <com/sun/star/ucb/OpenCommandArgument2.hpp>
#include <com/sun/star/util/CloseVetoException.hpp>
-#include <com/sun/star/util/XCloseBroadcaster.hpp>
#include <com/sun/star/frame/XModule.hpp>
#include <com/sun/star/datatransfer/DataFlavor.hpp>
#include <com/sun/star/datatransfer/XTransferable.hpp>
#include <com/sun/star/container/XNameContainer.hpp>
-#include <com/sun/star/embed/XTransactedObject.hpp>
#include <com/sun/star/embed/XCommonEmbedPersist.hpp>
#include "intercept.hxx"
#include <com/sun/star/sdb/ErrorCondition.hpp>
@@ -73,19 +66,15 @@
#include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
#include <com/sun/star/document/MacroExecMode.hpp>
#include <com/sun/star/drawing/XDrawPageSupplier.hpp>
-#include <com/sun/star/container/XIndexContainer.hpp>
#include <com/sun/star/form/XFormsSupplier.hpp>
#include <com/sun/star/form/XForm.hpp>
#include <comphelper/interaction.hxx>
#include <connectivity/dbtools.hxx>
#include <vcl/svapp.hxx>
#include <osl/mutex.hxx>
-#include <sal/macros.h>
#include <com/sun/star/view/XViewSettingsSupplier.hpp>
#include <core_resource.hxx>
#include <strings.hrc>
-#include "datasource.hxx"
-#include <com/sun/star/embed/XStateChangeBroadcaster.hpp>
#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/dataaccess/documentevents.cxx b/dbaccess/source/core/dataaccess/documentevents.cxx
index aa89a64c2b43..d3c6a03ceeec 100644
--- a/dbaccess/source/core/dataaccess/documentevents.cxx
+++ b/dbaccess/source/core/dataaccess/documentevents.cxx
@@ -25,10 +25,6 @@
#include <comphelper/namedvaluecollection.hxx>
#include <comphelper/sequence.hxx>
-#include <algorithm>
-#include <functional>
-#include <o3tl/functional.hxx>
-
namespace dbaccess
{
diff --git a/dbaccess/source/core/dataaccess/intercept.cxx b/dbaccess/source/core/dataaccess/intercept.cxx
index b0143978df73..3b42df4ed6a1 100644
--- a/dbaccess/source/core/dataaccess/intercept.cxx
+++ b/dbaccess/source/core/dataaccess/intercept.cxx
@@ -19,13 +19,7 @@
#include "intercept.hxx"
-#include <stringconstants.hxx>
-#include <com/sun/star/embed/EmbedStates.hpp>
-#include <com/sun/star/util/XModifiable.hpp>
-#include <cppuhelper/weak.hxx>
-
-#include <tools/debug.hxx>
#include <tools/diagnose_ex.h>
#include <memory>
diff --git a/dbaccess/source/core/dataaccess/myucp_datasupplier.cxx b/dbaccess/source/core/dataaccess/myucp_datasupplier.cxx
index 04db3216cef0..52d6bd6a2b91 100644
--- a/dbaccess/source/core/dataaccess/myucp_datasupplier.cxx
+++ b/dbaccess/source/core/dataaccess/myucp_datasupplier.cxx
@@ -20,11 +20,9 @@
#include <vector>
#include <ucbhelper/contentidentifier.hxx>
-#include <ucbhelper/providerhelper.hxx>
#include "myucp_datasupplier.hxx"
#include <ContentHelper.hxx>
-#include <com/sun/star/container/XHierarchicalNameAccess.hpp>
#include <com/sun/star/ucb/IllegalIdentifierException.hpp>
using namespace ::com::sun::star::uno;
diff --git a/dbaccess/source/core/misc/ContainerMediator.cxx b/dbaccess/source/core/misc/ContainerMediator.cxx
index 30ffb903425e..5864a42d6cbb 100644
--- a/dbaccess/source/core/misc/ContainerMediator.cxx
+++ b/dbaccess/source/core/misc/ContainerMediator.cxx
@@ -18,24 +18,19 @@
*/
#include <ContainerMediator.hxx>
-#include <stringconstants.hxx>
#include <PropertyForward.hxx>
#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/XTablesSupplier.hpp>
#include <com/sun/star/sdbcx/XRename.hpp>
-#include <connectivity/dbtools.hxx>
#include <comphelper/property.hxx>
-#include <tools/debug.hxx>
#include <tools/diagnose_ex.h>
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::sdbcx;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::container;
diff --git a/dbaccess/source/core/misc/DatabaseDataProvider.cxx b/dbaccess/source/core/misc/DatabaseDataProvider.cxx
index a99e2aa559e1..9c423950daba 100644
--- a/dbaccess/source/core/misc/DatabaseDataProvider.cxx
+++ b/dbaccess/source/core/misc/DatabaseDataProvider.cxx
@@ -18,34 +18,27 @@
*/
#include <DatabaseDataProvider.hxx>
-#include <stringconstants.hxx>
#include <strings.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <comphelper/types.hxx>
#include <comphelper/namedvaluecollection.hxx>
#include <connectivity/FValue.hxx>
-#include <connectivity/dbtools.hxx>
-#include <rtl/ustrbuf.hxx>
#include <rtl/math.hxx>
#include <sal/macros.h>
#include <tools/diagnose_ex.h>
#include <com/sun/star/task/XInteractionHandler.hpp>
-#include <com/sun/star/sdb/XCompletedExecution.hpp>
#include <com/sun/star/sdb/CommandType.hpp>
#include <com/sun/star/sdbc/DataType.hpp>
#include <com/sun/star/sdbc/XRow.hpp>
#include <com/sun/star/sdbc/XResultSet.hpp>
#include <com/sun/star/sdbc/XResultSetMetaDataSupplier.hpp>
-#include <com/sun/star/sdbc/XResultSetMetaData.hpp>
#include <com/sun/star/sdbc/XColumnLocate.hpp>
#include <com/sun/star/beans/NamedValue.hpp>
#include <com/sun/star/chart/ChartDataRowSource.hpp>
#include <com/sun/star/chart/XChartDataArray.hpp>
-#include <com/sun/star/chart/XDateCategories.hpp>
#include <vector>
-#include <list>
// TODO: update for new HavingClause-aware FilterManager
diff --git a/dbaccess/source/core/misc/PropertyForward.cxx b/dbaccess/source/core/misc/PropertyForward.cxx
index 1b3f061f84b2..239bd422fd41 100644
--- a/dbaccess/source/core/misc/PropertyForward.cxx
+++ b/dbaccess/source/core/misc/PropertyForward.cxx
@@ -18,15 +18,12 @@
*/
#include <PropertyForward.hxx>
-#include <stringconstants.hxx>
-#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/lang/DisposedException.hpp>
#include <com/sun/star/sdbcx/XDataDescriptorFactory.hpp>
#include <com/sun/star/sdbcx/XAppend.hpp>
#include <comphelper/property.hxx>
-#include <tools/debug.hxx>
#include <tools/diagnose_ex.h>
namespace dbaccess
diff --git a/dbaccess/source/core/misc/apitools.cxx b/dbaccess/source/core/misc/apitools.cxx
index c22c30d95209..c080979ba042 100644
--- a/dbaccess/source/core/misc/apitools.cxx
+++ b/dbaccess/source/core/misc/apitools.cxx
@@ -18,9 +18,7 @@
*/
#include <apitools.hxx>
-#include <stringconstants.hxx>
#include <cppuhelper/typeprovider.hxx>
-#include <com/sun/star/lang/XServiceInfo.hpp>
#include <sal/log.hxx>
using namespace ::com::sun::star::uno;
diff --git a/dbaccess/source/core/misc/dsntypes.cxx b/dbaccess/source/core/misc/dsntypes.cxx
index b772c85b5b9c..8256f370cce3 100644
--- a/dbaccess/source/core/misc/dsntypes.cxx
+++ b/dbaccess/source/core/misc/dsntypes.cxx
@@ -23,8 +23,6 @@
#include <svtools/miscopt.hxx>
#include <tools/wldcrd.hxx>
#include <osl/file.hxx>
-#include <stringconstants.hxx>
-#include <comphelper/documentconstants.hxx>
#include <comphelper/string.hxx>
namespace dbaccess
diff --git a/dbaccess/source/core/misc/objectnameapproval.cxx b/dbaccess/source/core/misc/objectnameapproval.cxx
index 71e13ec413a1..3ec15caaa4fd 100644
--- a/dbaccess/source/core/misc/objectnameapproval.cxx
+++ b/dbaccess/source/core/misc/objectnameapproval.cxx
@@ -24,7 +24,6 @@
#include <com/sun/star/sdb/CommandType.hpp>
#include <cppuhelper/weakref.hxx>
-#include <cppuhelper/exc_hlp.hxx>
namespace dbaccess
{
diff --git a/dbaccess/source/core/misc/sdbcoretools.cxx b/dbaccess/source/core/misc/sdbcoretools.cxx
index 2216b071ae04..70de1d1944ef 100644
--- a/dbaccess/source/core/misc/sdbcoretools.cxx
+++ b/dbaccess/source/core/misc/sdbcoretools.cxx
@@ -18,10 +18,8 @@
*/
#include <sdbcoretools.hxx>
-#include <stringconstants.hxx>
#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/container/XChild.hpp>
#include <com/sun/star/util/XModifiable.hpp>
#include <com/sun/star/sdb/XDocumentDataSource.hpp>
@@ -30,7 +28,6 @@
#include <com/sun/star/embed/ElementModes.hpp>
#include <tools/diagnose_ex.h>
-#include <tools/debug.hxx>
#include <comphelper/interaction.hxx>
#include <rtl/ref.hxx>
#include <rtl/ustrbuf.hxx>
diff --git a/dbaccess/source/core/misc/services.cxx b/dbaccess/source/core/misc/services.cxx
index a2673049de5c..c45c1673b03e 100644
--- a/dbaccess/source/core/misc/services.cxx
+++ b/dbaccess/source/core/misc/services.cxx
@@ -20,7 +20,6 @@
#include <cppuhelper/factory.hxx>
#include <cppuhelper/implementationentry.hxx>
#include <DatabaseDataProvider.hxx>
-#include <dbadllapi.hxx>
#include <databasecontext.hxx>
diff --git a/dbaccess/source/core/recovery/dbdocrecovery.cxx b/dbaccess/source/core/recovery/dbdocrecovery.cxx
index e330ce0cbc04..280789ff8a84 100644
--- a/dbaccess/source/core/recovery/dbdocrecovery.cxx
+++ b/dbaccess/source/core/recovery/dbdocrecovery.cxx
@@ -22,7 +22,6 @@
#include "storagetextstream.hxx"
#include "subcomponentrecovery.hxx"
#include "subcomponents.hxx"
-#include <stringconstants.hxx>
#include <com/sun/star/sdb/application/XDatabaseDocumentUI.hpp>
#include <com/sun/star/embed/ElementModes.hpp>
@@ -33,8 +32,6 @@
#include <sal/log.hxx>
#include <tools/diagnose_ex.h>
-#include <algorithm>
-
namespace dbaccess
{
diff --git a/dbaccess/source/core/recovery/storagetextstream.cxx b/dbaccess/source/core/recovery/storagetextstream.cxx
index 7dd405b490e6..142615f005c2 100644
--- a/dbaccess/source/core/recovery/storagetextstream.cxx
+++ b/dbaccess/source/core/recovery/storagetextstream.cxx
@@ -21,8 +21,6 @@
#include <com/sun/star/io/TextOutputStream.hpp>
-#include <tools/diagnose_ex.h>
-
namespace dbaccess
{
diff --git a/dbaccess/source/core/recovery/subcomponentrecovery.cxx b/dbaccess/source/core/recovery/subcomponentrecovery.cxx
index f569307fdf3a..55f3f98a250e 100644
--- a/dbaccess/source/core/recovery/subcomponentrecovery.cxx
+++ b/dbaccess/source/core/recovery/subcomponentrecovery.cxx
@@ -32,7 +32,6 @@
#include <com/sun/star/sdb/XFormDocumentsSupplier.hpp>
#include <com/sun/star/sdb/XReportDocumentsSupplier.hpp>
#include <com/sun/star/xml/sax/XDocumentHandler.hpp>
-#include <com/sun/star/xml/sax/SAXException.hpp>
#include <comphelper/namedvaluecollection.hxx>
#include <cppuhelper/implbase.hxx>
diff --git a/dbaccess/source/core/resource/core_resource.cxx b/dbaccess/source/core/resource/core_resource.cxx
index 0cfd227a13a6..34ab1b0ba829 100644
--- a/dbaccess/source/core/resource/core_resource.cxx
+++ b/dbaccess/source/core/resource/core_resource.cxx
@@ -23,7 +23,6 @@
// ---- needed as long as we have no contexts for components ---
#include <rtl/instance.hxx>
-#include <svl/solar.hrc>
namespace dbaccess
{
diff --git a/dbaccess/source/inc/apitools.hxx b/dbaccess/source/inc/apitools.hxx
index 72e93b7a98fe..315791bd62be 100644
--- a/dbaccess/source/inc/apitools.hxx
+++ b/dbaccess/source/inc/apitools.hxx
@@ -22,6 +22,7 @@
#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>