tdf#42949 Fix IWYU warnings in include/connectivity/*

Found with bin/find-unneeded-includes
Only removal proposals are dealt with here.

Change-Id: I02f75be483529ba1f7a6e460e34c4752b4265221
Reviewed-on: https://gerrit.libreoffice.org/68893
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>

44 files changed, 114 insertions, 136 deletions

diff --git a/include/connectivity/CommonTools.hxx b/include/connectivity/CommonTools.hxx
index bfa0fb36d8ec..f9cd35155dd2 100644
--- a/include/connectivity/CommonTools.hxx
+++ b/include/connectivity/CommonTools.hxx
@@ -26,24 +26,16 @@
 
 #include <rtl/ref.hxx>
 #include <rtl/ustring.hxx>
-#include <com/sun/star/lang/DisposedException.hpp>
 #include <vector>
 #include <cppuhelper/weakref.hxx>
 #include <comphelper/stl_types.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
-#include <osl/interlck.h>
-#include <com/sun/star/uno/XComponentContext.hpp>
 #include <connectivity/dbtoolsdllapi.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <salhelper/simplereferenceobject.hxx>
 
-namespace com { namespace sun { namespace star { namespace util {
-    struct Date;
-    struct DateTime;
-    struct Time;
-}
-}}}
+namespace com::sun::star::uno { class XComponentContext; }
 
 #if HAVE_FEATURE_JAVA
 namespace jvmaccess { class VirtualMachine; }
diff --git a/include/connectivity/ConnectionWrapper.hxx b/include/connectivity/ConnectionWrapper.hxx
index 14bc9e88d8c7..0d6132ae02b9 100644
--- a/include/connectivity/ConnectionWrapper.hxx
+++ b/include/connectivity/ConnectionWrapper.hxx
@@ -22,13 +22,14 @@
 
 #include <cppuhelper/implbase2.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
-#include <com/sun/star/sdbc/XConnection.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
 #include <connectivity/CommonTools.hxx>
 #include <connectivity/dbtoolsdllapi.hxx>
 
+namespace com::sun::star::beans { struct PropertyValue; }
+namespace com::sun::star::sdbc { class XConnection; }
+namespace com::sun::star::uno { class XComponentContext; }
+
 namespace connectivity
 {
 
diff --git a/include/connectivity/DriversConfig.hxx b/include/connectivity/DriversConfig.hxx
index 342742597f58..a415f42cb665 100644
--- a/include/connectivity/DriversConfig.hxx
+++ b/include/connectivity/DriversConfig.hxx
@@ -23,7 +23,6 @@
 
 #include <map>
 
-#include <com/sun/star/beans/NamedValue.hpp>
 #include <com/sun/star/uno/Sequence.h>
 #include <connectivity/dbtoolsdllapi.hxx>
 #include <salhelper/singletonref.hxx>
diff --git a/include/connectivity/FValue.hxx b/include/connectivity/FValue.hxx
index 86a94273d352..a06fa627a199 100644
--- a/include/connectivity/FValue.hxx
+++ b/include/connectivity/FValue.hxx
@@ -24,7 +24,6 @@
 #include <com/sun/star/uno/Any.hxx>
 #include <rtl/ustring.hxx>
 #include <salhelper/simplereferenceobject.hxx>
-#include <osl/diagnose.h>
 #include <rtl/ref.hxx>
 #include <connectivity/dbtoolsdllapi.hxx>
 #include <connectivity/CommonTools.hxx>
@@ -32,8 +31,9 @@
 #include <com/sun/star/util/Date.hpp>
 #include <com/sun/star/util/Time.hpp>
 #include <com/sun/star/uno/Sequence.hxx>
-#include <com/sun/star/sdbc/XRow.hpp>
-#include <com/sun/star/sdb/XColumn.hpp>
+
+namespace com::sun::star::sdb { class XColumn; }
+namespace com::sun::star::sdbc { class XRow; }
 
 namespace connectivity
 {
diff --git a/include/connectivity/IParseContext.hxx b/include/connectivity/IParseContext.hxx
index 46601b5f75db..51171281da1f 100644
--- a/include/connectivity/IParseContext.hxx
+++ b/include/connectivity/IParseContext.hxx
@@ -21,9 +21,6 @@
 
 #include <rtl/ustring.hxx>
 #include <com/sun/star/lang/Locale.hpp>
-#include <connectivity/dbtoolsdllapi.hxx>
-
-namespace connectivity { class OSQLParseNode; }
 
 namespace connectivity
 {
diff --git a/include/connectivity/PColumn.hxx b/include/connectivity/PColumn.hxx
index 90c40227fd4d..7442ad1b0b8a 100644
--- a/include/connectivity/PColumn.hxx
+++ b/include/connectivity/PColumn.hxx
@@ -27,11 +27,12 @@
 #include <connectivity/sdbcx/VColumn.hxx>
 #include <connectivity/CommonTools.hxx>
 #include <rtl/ref.hxx>
-#include <com/sun/star/sdbc/XResultSetMetaData.hpp>
-#include <com/sun/star/sdbc/XDatabaseMetaData.hpp>
-#include <com/sun/star/container/XNameAccess.hpp>
 #include <comphelper/proparrhlp.hxx>
 
+namespace com::sun::star::container { class XNameAccess; }
+namespace com::sun::star::sdbc { class XDatabaseMetaData; }
+namespace com::sun::star::sdbc { class XResultSetMetaData; }
+
 namespace connectivity
 {
     namespace parse
diff --git a/include/connectivity/SQLStatementHelper.hxx b/include/connectivity/SQLStatementHelper.hxx
index 19e5ce8bd734..027105ff7cc7 100644
--- a/include/connectivity/SQLStatementHelper.hxx
+++ b/include/connectivity/SQLStatementHelper.hxx
@@ -21,9 +21,11 @@
 #define INCLUDED_CONNECTIVITY_SQLSTATEMENTHELPER_HXX
 
 #include <connectivity/dbtoolsdllapi.hxx>
-#include <com/sun/star/beans/XPropertySet.hpp>
 #include <rtl/ustrbuf.hxx>
 
+namespace com::sun::star::beans { class XPropertySet; }
+namespace com::sun::star::uno { template <typename > class Reference; }
+
 namespace dbtools
 {
     class OOO_DLLPUBLIC_DBTOOLS ISQLStatementHelper
diff --git a/include/connectivity/TColumnsHelper.hxx b/include/connectivity/TColumnsHelper.hxx
index b45cd4ed9aa0..f4249cb34bfe 100644
--- a/include/connectivity/TColumnsHelper.hxx
+++ b/include/connectivity/TColumnsHelper.hxx
@@ -22,8 +22,6 @@
 
 #include <memory>
 #include <connectivity/sdbcx/VCollection.hxx>
-#include <com/sun/star/sdbc/XDatabaseMetaData.hpp>
-#include <connectivity/sdbcx/IRefreshable.hxx>
 #include <connectivity/dbtoolsdllapi.hxx>
 
 namespace connectivity
diff --git a/include/connectivity/TIndex.hxx b/include/connectivity/TIndex.hxx
index a7c3e731ccb1..72241e3a316a 100644
--- a/include/connectivity/TIndex.hxx
+++ b/include/connectivity/TIndex.hxx
@@ -22,7 +22,6 @@
 
 #include <connectivity/dbtoolsdllapi.hxx>
 #include <connectivity/sdbcx/VIndex.hxx>
-#include <com/sun/star/sdbc/XDatabaseMetaData.hpp>
 
 namespace connectivity
 {
diff --git a/include/connectivity/TIndexes.hxx b/include/connectivity/TIndexes.hxx
index b08f65c8e7fc..4f3a093056ed 100644
--- a/include/connectivity/TIndexes.hxx
+++ b/include/connectivity/TIndexes.hxx
@@ -22,7 +22,6 @@
 
 #include <connectivity/dbtoolsdllapi.hxx>
 #include <connectivity/sdbcx/VCollection.hxx>
-#include <com/sun/star/sdbc/XDatabaseMetaData.hpp>
 
 namespace connectivity
 {
diff --git a/include/connectivity/TKey.hxx b/include/connectivity/TKey.hxx
index 3fc9ba1f8b46..204a72e23e6e 100644
--- a/include/connectivity/TKey.hxx
+++ b/include/connectivity/TKey.hxx
@@ -22,7 +22,6 @@
 
 #include <connectivity/dbtoolsdllapi.hxx>
 #include <connectivity/sdbcx/VKey.hxx>
-#include <com/sun/star/sdbc/XDatabaseMetaData.hpp>
 
 namespace connectivity
 {
diff --git a/include/connectivity/TKeyColumns.hxx b/include/connectivity/TKeyColumns.hxx
index c77a35cb32a9..b2653a8a2be9 100644
--- a/include/connectivity/TKeyColumns.hxx
+++ b/include/connectivity/TKeyColumns.hxx
@@ -21,11 +21,11 @@
 #define INCLUDED_CONNECTIVITY_TKEYCOLUMNS_HXX
 
 #include <connectivity/sdbcx/VCollection.hxx>
-#include <connectivity/TKey.hxx>
 #include <connectivity/dbtoolsdllapi.hxx>
 
 namespace connectivity
 {
+    class OTableKeyHelper;
     class OOO_DLLPUBLIC_DBTOOLS OKeyColumnsHelper : public connectivity::sdbcx::OCollection
     {
         OTableKeyHelper* m_pKey;
diff --git a/include/connectivity/TKeys.hxx b/include/connectivity/TKeys.hxx
index 1b78a88e85a6..ae226b874416 100644
--- a/include/connectivity/TKeys.hxx
+++ b/include/connectivity/TKeys.hxx
@@ -21,12 +21,11 @@
 #define INCLUDED_CONNECTIVITY_TKEYS_HXX
 
 #include <connectivity/sdbcx/VCollection.hxx>
-#include <com/sun/star/sdbc/XDatabaseMetaData.hpp>
-#include <connectivity/TTableHelper.hxx>
 #include <connectivity/dbtoolsdllapi.hxx>
 
 namespace connectivity
 {
+    class OTableHelper;
     typedef sdbcx::OCollection OKeys_BASE;
     class OOO_DLLPUBLIC_DBTOOLS OKeysHelper : public OKeys_BASE
     {
diff --git a/include/connectivity/TTableHelper.hxx b/include/connectivity/TTableHelper.hxx
index 54d941421860..ba32ba7e9b80 100644
--- a/include/connectivity/TTableHelper.hxx
+++ b/include/connectivity/TTableHelper.hxx
@@ -27,11 +27,13 @@
 
 #include <connectivity/dbtoolsdllapi.hxx>
 #include <connectivity/sdbcx/VTable.hxx>
-#include <connectivity/sdbcx/VKey.hxx>
-#include <com/sun/star/sdb/tools/XTableRename.hpp>
-#include <com/sun/star/sdb/tools/XTableAlteration.hpp>
-#include <com/sun/star/sdb/tools/XKeyAlteration.hpp>
-#include <com/sun/star/sdb/tools/XIndexAlteration.hpp>
+
+namespace com::sun::star::sdbc { class XConnection; }
+namespace com::sun::star::sdb::tools { class XIndexAlteration; }
+namespace com::sun::star::sdb::tools { class XKeyAlteration; }
+namespace com::sun::star::sdb::tools { class XTableAlteration; }
+namespace com::sun::star::sdb::tools { class XTableRename; }
+namespace connectivity::sdbcx { struct KeyProperties; }
 
 namespace connectivity
 {
diff --git a/include/connectivity/conncleanup.hxx b/include/connectivity/conncleanup.hxx
index 9ef3d2af5aaa..c7966e2fbd98 100644
--- a/include/connectivity/conncleanup.hxx
+++ b/include/connectivity/conncleanup.hxx
@@ -21,12 +21,15 @@
 #define INCLUDED_CONNECTIVITY_CONNCLEANUP_HXX
 
 #include <cppuhelper/implbase.hxx>
-#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/sdbc/XRowSet.hpp>
-#include <com/sun/star/sdbc/XConnection.hpp>
+#include <com/sun/star/beans/XPropertyChangeListener.hpp>
+#include <com/sun/star/sdbc/XRowSetListener.hpp>
 #include <connectivity/dbtoolsdllapi.hxx>
 
 
+namespace com::sun::star::beans { class XPropertySet; }
+namespace com::sun::star::sdbc { class XRowSet; }
+namespace com::sun::star::sdbc { class XConnection; }
+
 namespace dbtools
 {
 
diff --git a/include/connectivity/dbcharset.hxx b/include/connectivity/dbcharset.hxx
index a4a4abe43a33..79e8c8ec48cf 100644
--- a/include/connectivity/dbcharset.hxx
+++ b/include/connectivity/dbcharset.hxx
@@ -22,7 +22,6 @@
 
 #include <sal/config.h>
 
-#include <cstddef>
 #include <set>
 
 #include <rtl/textenc.h>
diff --git a/include/connectivity/dbconversion.hxx b/include/connectivity/dbconversion.hxx
index 270aea7b86da..5991682f7dfe 100644
--- a/include/connectivity/dbconversion.hxx
+++ b/include/connectivity/dbconversion.hxx
@@ -20,11 +20,11 @@
 #ifndef INCLUDED_CONNECTIVITY_DBCONVERSION_HXX
 #define INCLUDED_CONNECTIVITY_DBCONVERSION_HXX
 
-#include <com/sun/star/lang/IllegalArgumentException.hpp>
 #include <com/sun/star/util/Date.hpp>
-#include <com/sun/star/uno/Reference.hxx>
 #include <connectivity/dbtoolsdllapi.hxx>
 
+namespace com::sun::star::uno { template <typename > class Reference; }
+
 namespace com
 {
     namespace sun
@@ -40,10 +40,6 @@ namespace com
                 class XColumn;
                 class XColumnUpdate;
             }
-            namespace sdbc
-            {
-                class SQLException;
-            }
             namespace beans
             {
                 class XPropertySet;
diff --git a/include/connectivity/dbexception.hxx b/include/connectivity/dbexception.hxx
index 729ca3cb80f0..e1335591fc94 100644
--- a/include/connectivity/dbexception.hxx
+++ b/include/connectivity/dbexception.hxx
@@ -20,9 +20,9 @@
 #ifndef INCLUDED_CONNECTIVITY_DBEXCEPTION_HXX
 #define INCLUDED_CONNECTIVITY_DBEXCEPTION_HXX
 
-#include <com/sun/star/sdbc/SQLException.hpp>
 #include <connectivity/standardsqlstate.hxx>
 #include <connectivity/dbtoolsdllapi.hxx>
+#include <com/sun/star/uno/Reference.hxx>
 
 namespace com
 {
@@ -38,6 +38,7 @@ namespace com
             namespace sdbc
             {
                 class SQLWarning;
+                class SQLException;
             }
         }
     }
diff --git a/include/connectivity/dbmetadata.hxx b/include/connectivity/dbmetadata.hxx
index 1d5b13935293..21c8d63013c6 100644
--- a/include/connectivity/dbmetadata.hxx
+++ b/include/connectivity/dbmetadata.hxx
@@ -20,12 +20,13 @@
 #ifndef INCLUDED_CONNECTIVITY_DBMETADATA_HXX
 #define INCLUDED_CONNECTIVITY_DBMETADATA_HXX
 
-#include <com/sun/star/sdbc/XConnection.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
+#include <com/sun/star/uno/Reference.hxx>
 
 #include <memory>
 #include <connectivity/dbtoolsdllapi.hxx>
 
+namespace com::sun::star::sdbc { class XConnection; }
+namespace com::sun::star::uno { class XComponentContext; }
 
 namespace dbtools
 {
diff --git a/include/connectivity/dbtools.hxx b/include/connectivity/dbtools.hxx
index d27d4b54c415..7be98eeeef25 100644
--- a/include/connectivity/dbtools.hxx
+++ b/include/connectivity/dbtools.hxx
@@ -20,20 +20,16 @@
 #ifndef INCLUDED_CONNECTIVITY_DBTOOLS_HXX
 #define INCLUDED_CONNECTIVITY_DBTOOLS_HXX
 
-#include <com/sun/star/sdb/XSingleSelectQueryComposer.hpp>
 #include <connectivity/dbexception.hxx>
-#include <com/sun/star/sdbc/DataType.hpp>
 #include <comphelper/stl_types.hxx>
 #include <unotools/sharedunocomponent.hxx>
 #include <connectivity/dbtoolsdllapi.hxx>
 #include <connectivity/FValue.hxx>
-#include <tools/stream.hxx>
 
 namespace com { namespace sun { namespace star {
 
 namespace sdb {
     class XSingleSelectQueryComposer;
-    class SQLContext;
 }
 namespace sdbcx {
     class XTablesSupplier;
@@ -55,8 +51,6 @@ namespace awt {
 }
 namespace lang {
     struct Locale;
-    class XMultiServiceFactory;
-    class WrappedTargetException;
 }
 namespace container {
     class XNameAccess;
@@ -74,6 +68,7 @@ namespace task {
 
 } } }
 
+class SvStream;
 
 namespace dbtools
 {
diff --git a/include/connectivity/filtermanager.hxx b/include/connectivity/filtermanager.hxx
index 45b58a6183f9..af9baef396fe 100644
--- a/include/connectivity/filtermanager.hxx
+++ b/include/connectivity/filtermanager.hxx
@@ -19,15 +19,14 @@
 #ifndef INCLUDED_CONNECTIVITY_FILTERMANAGER_HXX
 #define INCLUDED_CONNECTIVITY_FILTERMANAGER_HXX
 
-#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/sdb/XSQLQueryComposer.hpp>
-#include <com/sun/star/sdbc/XConnection.hpp>
+#include <com/sun/star/uno/Reference.hxx>
 
 #include <rtl/ustrbuf.hxx>
 
-#include <vector>
 #include <connectivity/dbtoolsdllapi.hxx>
 
+namespace com::sun::star::beans { class XPropertySet; }
+
 
 namespace dbtools
 {
diff --git a/include/connectivity/formattedcolumnvalue.hxx b/include/connectivity/formattedcolumnvalue.hxx
index c8976a83d124..9fdf227edb9e 100644
--- a/include/connectivity/formattedcolumnvalue.hxx
+++ b/include/connectivity/formattedcolumnvalue.hxx
@@ -20,15 +20,17 @@
 #ifndef INCLUDED_CONNECTIVITY_FORMATTEDCOLUMNVALUE_HXX
 #define INCLUDED_CONNECTIVITY_FORMATTEDCOLUMNVALUE_HXX
 
-#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/sdb/XColumn.hpp>
-#include <com/sun/star/sdb/XColumnUpdate.hpp>
-#include <com/sun/star/sdbc/XRowSet.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
-#include <com/sun/star/util/XNumberFormatter.hpp>
 #include <connectivity/dbtoolsdllapi.hxx>
+#include <rtl/ustring.hxx>
 #include <memory>
 
+namespace com::sun::star::beans { class XPropertySet; }
+namespace com::sun::star::sdbc { class XRowSet; }
+namespace com::sun::star::sdb { class XColumn; }
+namespace com::sun::star::uno { class XComponentContext; }
+namespace com::sun::star::uno { template <typename > class Reference; }
+namespace com::sun::star::util { class XNumberFormatter; }
+
 namespace dbtools
 {
     struct FormattedColumnValue_Data;
diff --git a/include/connectivity/parameters.hxx b/include/connectivity/parameters.hxx
index 80efce8689e7..cea765314766 100644
--- a/include/connectivity/parameters.hxx
+++ b/include/connectivity/parameters.hxx
@@ -22,14 +22,6 @@
 #include <map>
 #include <vector>
 
-#include <com/sun/star/uno/XAggregation.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
-#include <com/sun/star/form/XDatabaseParameterListener.hpp>
-#include <com/sun/star/sdbc/XConnection.hpp>
-#include <com/sun/star/task/XInteractionHandler.hpp>
-#include <com/sun/star/sdbc/XParameters.hpp>
-#include <com/sun/star/container/XIndexAccess.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/sdb/XSingleSelectQueryComposer.hpp>
 
 #include <connectivity/dbtoolsdllapi.hxx>
@@ -37,6 +29,20 @@
 #include <unotools/sharedunocomponent.hxx>
 #include <comphelper/interfacecontainer2.hxx>
 
+namespace com::sun::star::beans { class XPropertySet; }
+namespace com::sun::star::container { class XIndexAccess; }
+namespace com::sun::star::form { class XDatabaseParameterListener; }
+namespace com::sun::star::io { class XInputStream; }
+namespace com::sun::star::sdbc { class XArray; }
+namespace com::sun::star::sdbc { class XBlob; }
+namespace com::sun::star::sdbc { class XClob; }
+namespace com::sun::star::sdbc { class XConnection; }
+namespace com::sun::star::sdbc { class XDatabaseMetaData; }
+namespace com::sun::star::sdbc { class XParameters; }
+namespace com::sun::star::sdbc { class XRef; }
+namespace com::sun::star::task { class XInteractionHandler; }
+namespace com::sun::star::uno { class XAggregation; }
+namespace com::sun::star::uno { class XComponentContext; }
 
 namespace dbtools
 {
diff --git a/include/connectivity/paramwrapper.hxx b/include/connectivity/paramwrapper.hxx
index 2cbd8bb89bcb..4a68c61dd678 100644
--- a/include/connectivity/paramwrapper.hxx
+++ b/include/connectivity/paramwrapper.hxx
@@ -23,10 +23,8 @@
 #include <connectivity/dbtoolsdllapi.hxx>
 #include <connectivity/FValue.hxx>
 
-#include <com/sun/star/sdbc/XParameters.hpp>
 #include <com/sun/star/container/XIndexAccess.hpp>
 #include <com/sun/star/container/XEnumerationAccess.hpp>
-#include <com/sun/star/sdb/XSingleSelectQueryAnalyzer.hpp>
 
 #include <comphelper/uno3.hxx>
 #include <comphelper/broadcasthelper.hxx>
@@ -37,6 +35,9 @@
 #include <memory>
 #include <vector>
 
+namespace com::sun::star::sdbc { class XParameters; }
+namespace com::sun::star::sdb { class XSingleSelectQueryAnalyzer; }
+
 
 namespace dbtools
 {
diff --git a/include/connectivity/predicateinput.hxx b/include/connectivity/predicateinput.hxx
index 1e83d4ac43a5..3c54284700f4 100644
--- a/include/connectivity/predicateinput.hxx
+++ b/include/connectivity/predicateinput.hxx
@@ -20,15 +20,17 @@
 #ifndef INCLUDED_CONNECTIVITY_PREDICATEINPUT_HXX
 #define INCLUDED_CONNECTIVITY_PREDICATEINPUT_HXX
 
-#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
-#include <com/sun/star/sdbc/XConnection.hpp>
-#include <com/sun/star/util/XNumberFormatter.hpp>
-#include <com/sun/star/i18n/XLocaleData4.hpp>
 #include <connectivity/sqlparse.hxx>
 #include <connectivity/dbtoolsdllapi.hxx>
 #include <com/sun/star/uno/Any.hxx>
 
+namespace com::sun::star::beans { class XPropertySet; }
+namespace com::sun::star::i18n { class XLocaleData4; }
+namespace com::sun::star::sdbc { class XConnection; }
+namespace com::sun::star::uno { class XComponentContext; }
+namespace com::sun::star::util { class XNumberFormatter; }
+
+
 
 namespace dbtools
 {
diff --git a/include/connectivity/sdbcx/IRefreshable.hxx b/include/connectivity/sdbcx/IRefreshable.hxx
index 5c2105966874..3a9bd9a8c217 100644
--- a/include/connectivity/sdbcx/IRefreshable.hxx
+++ b/include/connectivity/sdbcx/IRefreshable.hxx
@@ -19,7 +19,6 @@
 #ifndef INCLUDED_CONNECTIVITY_SDBCX_IREFRESHABLE_HXX
 #define INCLUDED_CONNECTIVITY_SDBCX_IREFRESHABLE_HXX
 
-#include <connectivity/CommonTools.hxx>
 #include <connectivity/dbtoolsdllapi.hxx>
 
 namespace connectivity
diff --git a/include/connectivity/sdbcx/VCatalog.hxx b/include/connectivity/sdbcx/VCatalog.hxx
index e39cd11abb22..1cf20e1ce257 100644
--- a/include/connectivity/sdbcx/VCatalog.hxx
+++ b/include/connectivity/sdbcx/VCatalog.hxx
@@ -20,13 +20,10 @@
 #ifndef INCLUDED_CONNECTIVITY_SDBCX_VCATALOG_HXX
 #define INCLUDED_CONNECTIVITY_SDBCX_VCATALOG_HXX
 
-#include <osl/diagnose.h>
 #include <com/sun/star/sdbcx/XTablesSupplier.hpp>
 #include <com/sun/star/sdbcx/XViewsSupplier.hpp>
 #include <com/sun/star/sdbcx/XUsersSupplier.hpp>
 #include <com/sun/star/sdbcx/XGroupsSupplier.hpp>
-#include <com/sun/star/sdbc/XConnection.hpp>
-#include <com/sun/star/sdbc/XRow.hpp>
 #include <cppuhelper/compbase.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <connectivity/CommonTools.hxx>
@@ -34,6 +31,11 @@
 #include <connectivity/dbtoolsdllapi.hxx>
 #include <memory>
 
+namespace com::sun::star::sdbc { class XConnection; }
+namespace com::sun::star::sdbc { class XDatabaseMetaData; }
+namespace com::sun::star::sdbc { class XResultSet; }
+namespace com::sun::star::sdbc { class XRow; }
+
 namespace connectivity
 {
     namespace sdbcx
diff --git a/include/connectivity/sdbcx/VCollection.hxx b/include/connectivity/sdbcx/VCollection.hxx
index 9bf5e4c54200..be79da04a8b7 100644
--- a/include/connectivity/sdbcx/VCollection.hxx
+++ b/include/connectivity/sdbcx/VCollection.hxx
@@ -24,10 +24,8 @@
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/container/XIndexAccess.hpp>
 #include <com/sun/star/container/XEnumerationAccess.hpp>
-#include <com/sun/star/container/XEnumeration.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/util/XRefreshable.hpp>
-#include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/sdbcx/XDataDescriptorFactory.hpp>
 #include <com/sun/star/sdbcx/XAppend.hpp>
 #include <com/sun/star/sdbcx/XDrop.hpp>
@@ -39,6 +37,8 @@
 #include <connectivity/dbtoolsdllapi.hxx>
 #include <memory>
 
+namespace com::sun::star::container { class XEnumeration; }
+
 
 namespace connectivity
 {
diff --git a/include/connectivity/sdbcx/VDescriptor.hxx b/include/connectivity/sdbcx/VDescriptor.hxx
index 61b932c77729..b68689d16035 100644
--- a/include/connectivity/sdbcx/VDescriptor.hxx
+++ b/include/connectivity/sdbcx/VDescriptor.hxx
@@ -21,9 +21,6 @@
 #define INCLUDED_CONNECTIVITY_SDBCX_VDESCRIPTOR_HXX
 
 #include <comphelper/propertycontainer.hxx>
-#include <com/sun/star/beans/PropertyAttribute.hpp>
-#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <cppuhelper/typeprovider.hxx>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <comphelper/stl_types.hxx>
 #include <connectivity/dbtoolsdllapi.hxx>
diff --git a/include/connectivity/sdbcx/VGroup.hxx b/include/connectivity/sdbcx/VGroup.hxx
index 61722d234e2f..ead9a500c6b9 100644
--- a/include/connectivity/sdbcx/VGroup.hxx
+++ b/include/connectivity/sdbcx/VGroup.hxx
@@ -20,10 +20,6 @@
 #ifndef INCLUDED_CONNECTIVITY_SDBCX_VGROUP_HXX
 #define INCLUDED_CONNECTIVITY_SDBCX_VGROUP_HXX
 
-#include <memory>
-#include <osl/diagnose.h>
-
-
 #include <com/sun/star/sdbcx/XUsersSupplier.hpp>
 #include <com/sun/star/sdbcx/XAuthorizable.hpp>
 #include <com/sun/star/container/XNamed.hpp>
diff --git a/include/connectivity/sdbcx/VIndex.hxx b/include/connectivity/sdbcx/VIndex.hxx
index 6cd36f02861f..b4360f7e0805 100644
--- a/include/connectivity/sdbcx/VIndex.hxx
+++ b/include/connectivity/sdbcx/VIndex.hxx
@@ -20,10 +20,7 @@
 #ifndef INCLUDED_CONNECTIVITY_SDBCX_VINDEX_HXX
 #define INCLUDED_CONNECTIVITY_SDBCX_VINDEX_HXX
 
-#include <memory>
 #include <com/sun/star/sdbcx/XDataDescriptorFactory.hpp>
-#include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
-#include <com/sun/star/container/XNamed.hpp>
 #include <comphelper/IdPropArrayHelper.hxx>
 #include <cppuhelper/basemutex.hxx>
 #include <connectivity/CommonTools.hxx>
@@ -31,7 +28,6 @@
 #include <connectivity/sdbcx/IRefreshable.hxx>
 #include <connectivity/sdbcx/VDescriptor.hxx>
 #include <connectivity/dbtoolsdllapi.hxx>
-#include <com/sun/star/lang/XServiceInfo.hpp>
 #include <cppuhelper/implbase1.hxx>
 
 namespace connectivity
diff --git a/include/connectivity/sdbcx/VKey.hxx b/include/connectivity/sdbcx/VKey.hxx
index bafab2761015..6bc6b7df2ecb 100644
--- a/include/connectivity/sdbcx/VKey.hxx
+++ b/include/connectivity/sdbcx/VKey.hxx
@@ -24,7 +24,6 @@
 #include <comphelper/IdPropArrayHelper.hxx>
 #include <connectivity/CommonTools.hxx>
 #include <connectivity/sdbcx/VTypeDef.hxx>
-#include <com/sun/star/container/XNamed.hpp>
 #include <connectivity/sdbcx/IRefreshable.hxx>
 #include <connectivity/sdbcx/VDescriptor.hxx>
 #include <connectivity/dbtoolsdllapi.hxx>
diff --git a/include/connectivity/sdbcx/VTable.hxx b/include/connectivity/sdbcx/VTable.hxx
index 0fe70a36e86a..706700f878e9 100644
--- a/include/connectivity/sdbcx/VTable.hxx
+++ b/include/connectivity/sdbcx/VTable.hxx
@@ -26,6 +26,7 @@
 #include <com/sun/star/sdbcx/XAlterTable.hpp>
 #include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
 #include <com/sun/star/sdbcx/XKeysSupplier.hpp>
+#include <com/sun/star/lang/XServiceInfo.hpp>
 #include <comphelper/IdPropArrayHelper.hxx>
 #include <cppuhelper/compbase.hxx>
 #include <cppuhelper/implbase4.hxx>
@@ -35,8 +36,8 @@
 #include <connectivity/sdbcx/VDescriptor.hxx>
 #include <connectivity/CommonTools.hxx>
 #include <connectivity/dbtoolsdllapi.hxx>
-#include <com/sun/star/sdbc/XDatabaseMetaData.hpp>
-#include <memory>
+
+namespace com::sun::star::sdbc { class XDatabaseMetaData; }
 
 namespace connectivity
 {
diff --git a/include/connectivity/sdbcx/VUser.hxx b/include/connectivity/sdbcx/VUser.hxx
index 2727f167a029..ef488b074ac7 100644
--- a/include/connectivity/sdbcx/VUser.hxx
+++ b/include/connectivity/sdbcx/VUser.hxx
@@ -20,8 +20,6 @@
 #ifndef INCLUDED_CONNECTIVITY_SDBCX_VUSER_HXX
 #define INCLUDED_CONNECTIVITY_SDBCX_VUSER_HXX
 
-#include <memory>
-#include <osl/diagnose.h>
 #include <com/sun/star/sdbcx/XUser.hpp>
 #include <com/sun/star/sdbcx/XGroupsSupplier.hpp>
 #include <comphelper/proparrhlp.hxx>
diff --git a/include/connectivity/sdbcx/VView.hxx b/include/connectivity/sdbcx/VView.hxx
index b81cccd27032..e1a56a9fe85e 100644
--- a/include/connectivity/sdbcx/VView.hxx
+++ b/include/connectivity/sdbcx/VView.hxx
@@ -20,18 +20,18 @@
 #ifndef INCLUDED_CONNECTIVITY_SDBCX_VVIEW_HXX
 #define INCLUDED_CONNECTIVITY_SDBCX_VVIEW_HXX
 
-#include <osl/diagnose.h>
 #include <com/sun/star/sdbcx/XDataDescriptorFactory.hpp>
-#include <com/sun/star/sdbc/XDatabaseMetaData.hpp>
-#include <comphelper/proparrhlp.hxx>
+#include <com/sun/star/lang/XServiceInfo.hpp>
+#include <comphelper/broadcasthelper.hxx>
 #include <connectivity/CommonTools.hxx>
-#include <cppuhelper/interfacecontainer.h>
 #include <com/sun/star/container/XNamed.hpp>
 #include <connectivity/sdbcx/VDescriptor.hxx>
 #include <connectivity/dbtoolsdllapi.hxx>
 #include <comphelper/IdPropArrayHelper.hxx>
 #include <cppuhelper/implbase.hxx>
 
+namespace com::sun::star::sdbc { class XDatabaseMetaData; }
+
 namespace connectivity
 {
     namespace sdbcx
diff --git a/include/connectivity/sqlbison_exports.hxx b/include/connectivity/sqlbison_exports.hxx
index 662c5045a1ee..4cd68a5974c0 100644
--- a/include/connectivity/sqlbison_exports.hxx
+++ b/include/connectivity/sqlbison_exports.hxx
@@ -10,9 +10,10 @@
 #ifndef INCLUDED_CONNECTIVITY_SQLBISON_EXPORTS_HXX
 #define INCLUDED_CONNECTIVITY_SQLBISON_EXPORTS_HXX
 
-#include <sal/types.h>
 #include <rtl/ustring.hxx>
-#include <connectivity/sqlnode.hxx>
+
+namespace connectivity { class OSQLParseNode; }
+namespace connectivity { class OSQLParser; }
 
 OUString ConvertLikeToken(const ::connectivity::OSQLParseNode* pTokenNode, const ::connectivity::OSQLParseNode* pEscapeNode, bool bInternational);
 int SQLyyparse();
diff --git a/include/connectivity/sqlerror.hxx b/include/connectivity/sqlerror.hxx
index b1084959a94b..be1112bda46f 100644
--- a/include/connectivity/sqlerror.hxx
+++ b/include/connectivity/sqlerror.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_CONNECTIVITY_SQLERROR_HXX
 
 #include <com/sun/star/sdbc/SQLException.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
 #include <connectivity/dbtoolsdllapi.hxx>
 #include <boost/optional.hpp>
 #include <memory>
diff --git a/include/connectivity/sqliterator.hxx b/include/connectivity/sqliterator.hxx
index f62d6790a63f..f77df204d52c 100644
--- a/include/connectivity/sqliterator.hxx
+++ b/include/connectivity/sqliterator.hxx
@@ -20,21 +20,19 @@
 #define INCLUDED_CONNECTIVITY_SQLITERATOR_HXX
 
 #include <connectivity/dbtoolsdllapi.hxx>
-#include <connectivity/sqlnode.hxx>
 #include <connectivity/IParseContext.hxx>
-#include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
 #include <com/sun/star/sdbc/DataType.hpp>
-#include <com/sun/star/sdbc/SQLWarning.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/sdbc/SQLException.hpp>
 #include <connectivity/CommonTools.hxx>
 #include <rtl/ref.hxx>
-#include <cppuhelper/weak.hxx>
 
-#include <map>
 #include <memory>
 #include <vector>
 #include <o3tl/typed_flags_set.hxx>
 
+namespace com::sun::star::sdbc { class XConnection; }
+namespace com::sun::star::beans { class XPropertySet; }
+
 namespace connectivity
 {
     enum class TraversalParts
diff --git a/include/connectivity/sqlnode.hxx b/include/connectivity/sqlnode.hxx
index 1b5ef59392c3..d6cb4b914890 100644
--- a/include/connectivity/sqlnode.hxx
+++ b/include/connectivity/sqlnode.hxx
@@ -21,16 +21,15 @@
 
 #include <connectivity/dbtoolsdllapi.hxx>
 #include <connectivity/dbmetadata.hxx>
-#include <com/sun/star/sdbc/SQLException.hpp>
 #include <com/sun/star/uno/Reference.hxx>
-#include <com/sun/star/util/XNumberFormatTypes.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
-#include <functional>
 #include <memory>
 #include <set>
 #include <vector>
 #include <rtl/ustrbuf.hxx>
-#include <osl/diagnose.h>
+
+namespace com::sun::star::lang { struct Locale; }
+namespace com::sun::star::sdbc { class SQLException; }
+namespace com::sun::star::sdbc { class XDatabaseMetaData; }
 
 namespace com
 {
@@ -60,7 +59,6 @@ namespace com
 namespace connectivity
 {
     class OSQLParser;
-    class OSQLParseNode;
     class IParseContext;
 
     enum class SQLNodeType { Rule, ListRule, CommaListRule,
diff --git a/include/connectivity/sqlparse.hxx b/include/connectivity/sqlparse.hxx
index cdb92064997e..fc4196ea02b9 100644
--- a/include/connectivity/sqlparse.hxx
+++ b/include/connectivity/sqlparse.hxx
@@ -20,14 +20,10 @@
 #define INCLUDED_CONNECTIVITY_SQLPARSE_HXX
 
 #include <memory>
-#include <config_features.h>
 
 #include <com/sun/star/uno/Reference.h>
 #include <osl/mutex.hxx>
 #include <connectivity/sqlnode.hxx>
-#include <com/sun/star/i18n/XCharacterClassification.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/i18n/XLocaleData4.hpp>
 #include <connectivity/IParseContext.hxx>
 #include <connectivity/dbtoolsdllapi.hxx>
 #include <connectivity/sqlerror.hxx>
@@ -35,6 +31,9 @@
 
 #include <map>
 
+namespace com::sun::star::i18n { class XCharacterClassification; }
+namespace com::sun::star::i18n { class XLocaleData4; }
+
 namespace com
 {
     namespace sun
@@ -49,10 +48,6 @@ namespace com
             {
                 class XNumberFormatter;
             }
-            namespace lang
-            {
-                struct Locale;
-            }
         }
     }
 }
@@ -60,7 +55,6 @@ namespace com
 namespace connectivity
 {
     class OSQLScanner;
-    class SQLError;
 
     //= OParseContext
 
diff --git a/include/connectivity/sqlscan.hxx b/include/connectivity/sqlscan.hxx
index de0f0faff8f1..2ceac71c9ec1 100644
--- a/include/connectivity/sqlscan.hxx
+++ b/include/connectivity/sqlscan.hxx
@@ -19,7 +19,6 @@
 #ifndef INCLUDED_CONNECTIVITY_SQLSCAN_HXX
 #define INCLUDED_CONNECTIVITY_SQLSCAN_HXX
 
-#include <stdarg.h>
 #include <connectivity/IParseContext.hxx>
 #include <connectivity/dbtoolsdllapi.hxx>
 
diff --git a/include/connectivity/standardsqlstate.hxx b/include/connectivity/standardsqlstate.hxx
index 9ddf0c8bd9d7..2569d3a02583 100644
--- a/include/connectivity/standardsqlstate.hxx
+++ b/include/connectivity/standardsqlstate.hxx
@@ -20,6 +20,7 @@
 #ifndef INCLUDED_CONNECTIVITY_STANDARDSQLSTATE_HXX
 #define INCLUDED_CONNECTIVITY_STANDARDSQLSTATE_HXX
 
+#include <sal/types.h>
 
 namespace dbtools
 {
diff --git a/include/connectivity/statementcomposer.hxx b/include/connectivity/statementcomposer.hxx
index e94d95a1a11b..944a4321b12a 100644
--- a/include/connectivity/statementcomposer.hxx
+++ b/include/connectivity/statementcomposer.hxx
@@ -20,12 +20,15 @@
 #ifndef INCLUDED_CONNECTIVITY_STATEMENTCOMPOSER_HXX
 #define INCLUDED_CONNECTIVITY_STATEMENTCOMPOSER_HXX
 
-#include <com/sun/star/sdbc/XConnection.hpp>
-#include <com/sun/star/sdb/XSingleSelectQueryComposer.hpp>
+#include <rtl/ustring.hxx>
 
 #include <memory>
 #include <connectivity/dbtoolsdllapi.hxx>
 
+namespace com::sun::star::sdbc { class XConnection; }
+namespace com::sun::star::sdb { class XSingleSelectQueryComposer; }
+namespace com::sun::star::uno { template <typename > class Reference; }
+
 
 namespace dbtools
 {
diff --git a/include/connectivity/warningscontainer.hxx b/include/connectivity/warningscontainer.hxx
index 1a57ed058f95..c5238ecaf533 100644
--- a/include/connectivity/warningscontainer.hxx
+++ b/include/connectivity/warningscontainer.hxx
@@ -20,11 +20,15 @@
 #ifndef INCLUDED_CONNECTIVITY_WARNINGSCONTAINER_HXX
 #define INCLUDED_CONNECTIVITY_WARNINGSCONTAINER_HXX
 
-#include <com/sun/star/sdbc/XWarningsSupplier.hpp>
-#include <com/sun/star/sdb/SQLContext.hpp>
-
 #include <connectivity/dbtoolsdllapi.hxx>
 
+#include <com/sun/star/uno/Reference.hxx>
+
+namespace com::sun::star::sdbc { class SQLException; }
+namespace com::sun::star::sdbc { class SQLWarning; }
+namespace com::sun::star::sdbc { class XWarningsSupplier; }
+namespace com::sun::star::sdb { class SQLContext; }
+namespace com::sun::star::uno { class XInterface; }
 
 namespace dbtools
 {