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

Except for non Linux specific parts:
connectivity/source/drivers/macab/
connectivity/source/inc/ado/

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

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

37 files changed, 9 insertions, 67 deletions

diff --git a/connectivity/source/inc/FDatabaseMetaDataResultSet.hxx b/connectivity/source/inc/FDatabaseMetaDataResultSet.hxx
index 694c49b2ce72..d5d9fc8ce9df 100644
--- a/connectivity/source/inc/FDatabaseMetaDataResultSet.hxx
+++ b/connectivity/source/inc/FDatabaseMetaDataResultSet.hxx
@@ -33,16 +33,12 @@
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/sdbc/XWarningsSupplier.hpp>
-#include <com/sun/star/sdbc/XResultSetUpdate.hpp>
-#include <com/sun/star/sdbc/XRowUpdate.hpp>
 #include <cppuhelper/compbase.hxx>
 #include <cppuhelper/basemutex.hxx>
 #include <comphelper/proparrhlp.hxx>
-#include <connectivity/CommonTools.hxx>
 #include <comphelper/propertycontainer.hxx>
 #include <connectivity/FValue.hxx>
 #include <connectivity/dbtoolsdllapi.hxx>
-#include <salhelper/simplereferenceobject.hxx>
 
 namespace connectivity
 {
diff --git a/connectivity/source/inc/FDatabaseMetaDataResultSetMetaData.hxx b/connectivity/source/inc/FDatabaseMetaDataResultSetMetaData.hxx
index 5f0e728be354..2e5ccb00763d 100644
--- a/connectivity/source/inc/FDatabaseMetaDataResultSetMetaData.hxx
+++ b/connectivity/source/inc/FDatabaseMetaDataResultSetMetaData.hxx
@@ -22,10 +22,9 @@
 
 #include <com/sun/star/sdbc/XResultSetMetaData.hpp>
 #include <cppuhelper/implbase.hxx>
+#include <map>
 #include <vector>
-#include "FDatabaseMetaDataResultSet.hxx"
 #include "OColumn.hxx"
-#include <connectivity/dbtoolsdllapi.hxx>
 
 namespace connectivity
 {
diff --git a/connectivity/source/inc/OTypeInfo.hxx b/connectivity/source/inc/OTypeInfo.hxx
index 65163085cf20..772a46223c88 100644
--- a/connectivity/source/inc/OTypeInfo.hxx
+++ b/connectivity/source/inc/OTypeInfo.hxx
@@ -20,9 +20,9 @@
 #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_OTYPEINFO_HXX
 #define INCLUDED_CONNECTIVITY_SOURCE_INC_OTYPEINFO_HXX
 
-#include <com/sun/star/sdbc/ColumnSearch.hpp>
 #include <com/sun/star/sdbc/DataType.hpp>
-#include <connectivity/dbtoolsdllapi.hxx>
+
+#include <rtl/ustring.hxx>
 
 namespace connectivity
 {
diff --git a/connectivity/source/inc/RowFunctionParser.hxx b/connectivity/source/inc/RowFunctionParser.hxx
index 8df2c00d744f..5bb508bc12ff 100644
--- a/connectivity/source/inc/RowFunctionParser.hxx
+++ b/connectivity/source/inc/RowFunctionParser.hxx
@@ -24,7 +24,6 @@
 #include "FDatabaseMetaDataResultSet.hxx"
 #include <connectivity/dbtoolsdllapi.hxx>
 #include <memory>
-#include <vector>
 
 namespace connectivity
 {
diff --git a/connectivity/source/inc/TConnection.hxx b/connectivity/source/inc/TConnection.hxx
index af528c894a34..85e6e4fac546 100644
--- a/connectivity/source/inc/TConnection.hxx
+++ b/connectivity/source/inc/TConnection.hxx
@@ -21,7 +21,6 @@
 
 #include <rtl/textenc.h>
 #include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/lang/DisposedException.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <com/sun/star/sdbc/XWarningsSupplier.hpp>
diff --git a/connectivity/source/inc/TSkipDeletedSet.hxx b/connectivity/source/inc/TSkipDeletedSet.hxx
index 373e87ea3d7b..3935264696ed 100644
--- a/connectivity/source/inc/TSkipDeletedSet.hxx
+++ b/connectivity/source/inc/TSkipDeletedSet.hxx
@@ -20,8 +20,6 @@
 #define INCLUDED_CONNECTIVITY_SOURCE_INC_TSKIPDELETEDSET_HXX
 
 #include "TResultSetHelper.hxx"
-#include <rtl/alloc.h>
-#include <unordered_map>
 #include <vector>
 #include <connectivity/dbtoolsdllapi.hxx>
 
diff --git a/connectivity/source/inc/calc/CConnection.hxx b/connectivity/source/inc/calc/CConnection.hxx
index 08af0458246c..cc8cc59702b9 100644
--- a/connectivity/source/inc/calc/CConnection.hxx
+++ b/connectivity/source/inc/calc/CConnection.hxx
@@ -24,7 +24,6 @@
 #include <file/FConnection.hxx>
 #include <com/sun/star/frame/XDesktop2.hpp>
 #include <com/sun/star/frame/XTerminateListener.hpp>
-#include <com/sun/star/uno/DeploymentException.hpp>
 #include <unotools/closeveto.hxx>
 
 namespace com { namespace sun { namespace star {
diff --git a/connectivity/source/inc/component/CTable.hxx b/connectivity/source/inc/component/CTable.hxx
index 8bd55668f4e7..69f50ad44b43 100644
--- a/connectivity/source/inc/component/CTable.hxx
+++ b/connectivity/source/inc/component/CTable.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_CONNECTIVITY_SOURCE_INC_COMPONENT_CTABLE_HXX
 
 #include <file/FTable.hxx>
-#include <tools/date.hxx>
 
 namespace com { namespace sun { namespace star { namespace sheet {
     class XSpreadsheet;
diff --git a/connectivity/source/inc/dbase/DIndex.hxx b/connectivity/source/inc/dbase/DIndex.hxx
index 2132f7807e1c..cfa77bdd2583 100644
--- a/connectivity/source/inc/dbase/DIndex.hxx
+++ b/connectivity/source/inc/dbase/DIndex.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_CONNECTIVITY_SOURCE_INC_DBASE_DINDEX_HXX
 
 #include <connectivity/sdbcx/VIndex.hxx>
-#include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <dbase/DTable.hxx>
 #include <dbase/dindexnode.hxx>
 
diff --git a/connectivity/source/inc/dbase/DTable.hxx b/connectivity/source/inc/dbase/DTable.hxx
index f2897c19223a..5b98439875dc 100644
--- a/connectivity/source/inc/dbase/DTable.hxx
+++ b/connectivity/source/inc/dbase/DTable.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_CONNECTIVITY_SOURCE_INC_DBASE_DTABLE_HXX
 
 #include <file/FTable.hxx>
-#include <connectivity/sdbcx/VColumn.hxx>
 #include <connectivity/CommonTools.hxx>
 #include <tools/urlobj.hxx>
 
diff --git a/connectivity/source/inc/dbase/dindexnode.hxx b/connectivity/source/inc/dbase/dindexnode.hxx
index 6d891239e8ab..70c7b832a927 100644
--- a/connectivity/source/inc/dbase/dindexnode.hxx
+++ b/connectivity/source/inc/dbase/dindexnode.hxx
@@ -20,11 +20,8 @@
 #define INCLUDED_CONNECTIVITY_SOURCE_INC_DBASE_DINDEXNODE_HXX
 
 #include <file/fcode.hxx>
-#include <file/FTable.hxx>
 #include <connectivity/FValue.hxx>
-#include <rtl/ref.hxx>
 #include <memory>
-#include <vector>
 
 #define NODE_NOTFOUND 0xFFFF
 #define DINDEX_PAGE_SIZE 512
diff --git a/connectivity/source/inc/file/FColumns.hxx b/connectivity/source/inc/file/FColumns.hxx
index e34345b44e98..57fa6f65cb55 100644
--- a/connectivity/source/inc/file/FColumns.hxx
+++ b/connectivity/source/inc/file/FColumns.hxx
@@ -22,7 +22,6 @@
 
 #include <connectivity/sdbcx/VCollection.hxx>
 #include <com/sun/star/sdbc/XDatabaseMetaData.hpp>
-#include <connectivity/sdbcx/IRefreshable.hxx>
 #include <file/FTable.hxx>
 #include <file/filedllapi.hxx>
 
diff --git a/connectivity/source/inc/file/FConnection.hxx b/connectivity/source/inc/file/FConnection.hxx
index e791e6ec3f07..8511f277102f 100644
--- a/connectivity/source/inc/file/FConnection.hxx
+++ b/connectivity/source/inc/file/FConnection.hxx
@@ -20,19 +20,13 @@
 #define INCLUDED_CONNECTIVITY_SOURCE_INC_FILE_FCONNECTION_HXX
 
 #include <com/sun/star/ucb/XContent.hpp>
-#include <com/sun/star/sdbc/SQLWarning.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <connectivity/CommonTools.hxx>
-#include <OTypeInfo.hxx>
 #include <rtl/ustring.hxx>
 #include <com/sun/star/sdbcx/XTablesSupplier.hpp>
 #include <com/sun/star/ucb/XDynamicResultSet.hpp>
-#include <com/sun/star/uno/DeploymentException.hpp>
-#include <connectivity/sqlparse.hxx>
-#include <connectivity/sqliterator.hxx>
 #include <TConnection.hxx>
 #include <file/filedllapi.hxx>
-#include <map>
 
 namespace connectivity
 {
diff --git a/connectivity/source/inc/file/FDateFunctions.hxx b/connectivity/source/inc/file/FDateFunctions.hxx
index 8547d7e35234..e2fa6965d75e 100644
--- a/connectivity/source/inc/file/FDateFunctions.hxx
+++ b/connectivity/source/inc/file/FDateFunctions.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_CONNECTIVITY_SOURCE_INC_FILE_FDATEFUNCTIONS_HXX
 
 #include <file/fcode.hxx>
-#include <file/filedllapi.hxx>
 
 namespace connectivity
 {
diff --git a/connectivity/source/inc/file/FNumericFunctions.hxx b/connectivity/source/inc/file/FNumericFunctions.hxx
index 0678fcb3a343..3f143c658268 100644
--- a/connectivity/source/inc/file/FNumericFunctions.hxx
+++ b/connectivity/source/inc/file/FNumericFunctions.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_CONNECTIVITY_SOURCE_INC_FILE_FNUMERICFUNCTIONS_HXX
 
 #include <file/fcode.hxx>
-#include <file/filedllapi.hxx>
 
 namespace connectivity
 {
diff --git a/connectivity/source/inc/file/FPreparedStatement.hxx b/connectivity/source/inc/file/FPreparedStatement.hxx
index ffe841aee5ce..31002f6f1306 100644
--- a/connectivity/source/inc/file/FPreparedStatement.hxx
+++ b/connectivity/source/inc/file/FPreparedStatement.hxx
@@ -25,7 +25,6 @@
 #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/XPreparedBatchExecution.hpp>
 #include <com/sun/star/io/XInputStream.hpp>
 #include <file/FResultSet.hxx>
 
diff --git a/connectivity/source/inc/file/FResultSetMetaData.hxx b/connectivity/source/inc/file/FResultSetMetaData.hxx
index bc519c79318f..9ba77bc29822 100644
--- a/connectivity/source/inc/file/FResultSetMetaData.hxx
+++ b/connectivity/source/inc/file/FResultSetMetaData.hxx
@@ -24,7 +24,6 @@
 #include <cppuhelper/implbase.hxx>
 #include <connectivity/CommonTools.hxx>
 #include <rtl/ref.hxx>
-#include <file/filedllapi.hxx>
 
 namespace connectivity
 {
diff --git a/connectivity/source/inc/file/FStatement.hxx b/connectivity/source/inc/file/FStatement.hxx
index f70568e8f31e..a5e61a2dd65d 100644
--- a/connectivity/source/inc/file/FStatement.hxx
+++ b/connectivity/source/inc/file/FStatement.hxx
@@ -22,8 +22,6 @@
 
 #include <com/sun/star/sdbc/XStatement.hpp>
 #include <com/sun/star/sdbc/XWarningsSupplier.hpp>
-#include <com/sun/star/sdbc/XMultipleResults.hpp>
-#include <com/sun/star/sdbc/XBatchExecution.hpp>
 #include <com/sun/star/sdbc/XCloseable.hpp>
 #include <com/sun/star/sdbc/SQLWarning.hpp>
 #include <com/sun/star/util/XCancellable.hpp>
@@ -32,9 +30,9 @@
 #include <cppuhelper/implbase2.hxx>
 #include <cppuhelper/basemutex.hxx>
 #include <connectivity/CommonTools.hxx>
+#include <connectivity/sqlparse.hxx>
 #include <file/FConnection.hxx>
 #include <file/filedllapi.hxx>
-#include <list>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <comphelper/propertycontainer.hxx>
 #include <file/fanalyzer.hxx>
diff --git a/connectivity/source/inc/file/FStringFunctions.hxx b/connectivity/source/inc/file/FStringFunctions.hxx
index 88bd4e7d5607..8d2ea1cef98e 100644
--- a/connectivity/source/inc/file/FStringFunctions.hxx
+++ b/connectivity/source/inc/file/FStringFunctions.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_CONNECTIVITY_SOURCE_INC_FILE_FSTRINGFUNCTIONS_HXX
 
 #include <file/fcode.hxx>
-#include <file/filedllapi.hxx>
 
 namespace connectivity
 {
diff --git a/connectivity/source/inc/file/FTable.hxx b/connectivity/source/inc/file/FTable.hxx
index df3e9714b52c..68d6efb45837 100644
--- a/connectivity/source/inc/file/FTable.hxx
+++ b/connectivity/source/inc/file/FTable.hxx
@@ -21,8 +21,6 @@
 #define INCLUDED_CONNECTIVITY_SOURCE_INC_FILE_FTABLE_HXX
 
 #include <connectivity/sdbcx/VTable.hxx>
-#include <com/sun/star/sdbc/XDatabaseMetaData.hpp>
-#include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <file/FConnection.hxx>
 #include <file/filedllapi.hxx>
 #include <tools/stream.hxx>
diff --git a/connectivity/source/inc/file/fanalyzer.hxx b/connectivity/source/inc/file/fanalyzer.hxx
index f90613343bd4..9fa5d7f45ed3 100644
--- a/connectivity/source/inc/file/fanalyzer.hxx
+++ b/connectivity/source/inc/file/fanalyzer.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_CONNECTIVITY_SOURCE_INC_FILE_FANALYZER_HXX
 
 #include <file/fcomp.hxx>
-#include <file/filedllapi.hxx>
 
 namespace connectivity
 {
diff --git a/connectivity/source/inc/file/fcode.hxx b/connectivity/source/inc/file/fcode.hxx
index 06c8f544f819..6a6feb412844 100644
--- a/connectivity/source/inc/file/fcode.hxx
+++ b/connectivity/source/inc/file/fcode.hxx
@@ -22,9 +22,6 @@
 
 #include <connectivity/sqliterator.hxx>
 #include <com/sun/star/sdbc/DataType.hpp>
-#include <connectivity/CommonTools.hxx>
-#include <com/sun/star/container/XNameAccess.hpp>
-#include <com/sun/star/container/XIndexAccess.hpp>
 #include <connectivity/FValue.hxx>
 #include <file/filedllapi.hxx>
 
diff --git a/connectivity/source/inc/file/fcomp.hxx b/connectivity/source/inc/file/fcomp.hxx
index 3f1d0d9d545d..f43b05374b60 100644
--- a/connectivity/source/inc/file/fcomp.hxx
+++ b/connectivity/source/inc/file/fcomp.hxx
@@ -20,8 +20,6 @@
 #define INCLUDED_CONNECTIVITY_SOURCE_INC_FILE_FCOMP_HXX
 
 #include <file/fcode.hxx>
-#include <file/filedllapi.hxx>
-#include <list>
 
 namespace connectivity
 {
diff --git a/connectivity/source/inc/flat/ETable.hxx b/connectivity/source/inc/flat/ETable.hxx
index b36111c9637a..6680c25851bc 100644
--- a/connectivity/source/inc/flat/ETable.hxx
+++ b/connectivity/source/inc/flat/ETable.hxx
@@ -22,11 +22,10 @@
 
 #include <file/FTable.hxx>
 #include <flat/EConnection.hxx>
-#include <connectivity/sdbcx/VColumn.hxx>
 #include <connectivity/CommonTools.hxx>
-#include <tools/urlobj.hxx>
 #include <file/quotedstring.hxx>
 #include <unotools/syslocale.hxx>
+#include <com/sun/star/util/XNumberFormatter.hpp>
 
 namespace connectivity
 {
diff --git a/connectivity/source/inc/hsqldb/HConnection.hxx b/connectivity/source/inc/hsqldb/HConnection.hxx
index 19739437bf82..dcc2eb49f6a6 100644
--- a/connectivity/source/inc/hsqldb/HConnection.hxx
+++ b/connectivity/source/inc/hsqldb/HConnection.hxx
@@ -24,7 +24,6 @@
 #include <com/sun/star/util/XFlushable.hpp>
 #include <com/sun/star/sdbc/XDriver.hpp>
 #include <com/sun/star/sdb/application/XTableUIProvider.hpp>
-#include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
 #include <cppuhelper/compbase.hxx>
 #include <cppuhelper/basemutex.hxx>
 #include <comphelper/uno3.hxx>
diff --git a/connectivity/source/inc/hsqldb/HTable.hxx b/connectivity/source/inc/hsqldb/HTable.hxx
index efae11c1a145..4540bb089a81 100644
--- a/connectivity/source/inc/hsqldb/HTable.hxx
+++ b/connectivity/source/inc/hsqldb/HTable.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_CONNECTIVITY_SOURCE_INC_HSQLDB_HTABLE_HXX
 
 #include <connectivity/TTableHelper.hxx>
-#include <com/sun/star/sdbc/XDatabaseMetaData.hpp>
 #include <comphelper/IdPropArrayHelper.hxx>
 
 namespace connectivity
diff --git a/connectivity/source/inc/java/GlobalRef.hxx b/connectivity/source/inc/java/GlobalRef.hxx
index 6ff20ce4c0e2..5c00ac2562f6 100644
--- a/connectivity/source/inc/java/GlobalRef.hxx
+++ b/connectivity/source/inc/java/GlobalRef.hxx
@@ -23,8 +23,6 @@
 #include <java/LocalRef.hxx>
 #include <java/lang/Object.hxx>
 
-#include <jvmaccess/virtualmachine.hxx>
-
 
 namespace connectivity { namespace jdbc
 {
diff --git a/connectivity/source/inc/java/LocalRef.hxx b/connectivity/source/inc/java/LocalRef.hxx
index e4db70263801..3730cf8913d3 100644
--- a/connectivity/source/inc/java/LocalRef.hxx
+++ b/connectivity/source/inc/java/LocalRef.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_JAVA_LOCALREF_HXX
 #define INCLUDED_CONNECTIVITY_SOURCE_INC_JAVA_LOCALREF_HXX
 
-#include <jvmaccess/virtualmachine.hxx>
+#include <jni.h>
 
 
 namespace connectivity { namespace jdbc
diff --git a/connectivity/source/inc/java/lang/Object.hxx b/connectivity/source/inc/java/lang/Object.hxx
index f82e307279bf..ba9414008163 100644
--- a/connectivity/source/inc/java/lang/Object.hxx
+++ b/connectivity/source/inc/java/lang/Object.hxx
@@ -19,15 +19,8 @@
 #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_JAVA_LANG_OBJECT_HXX
 #define INCLUDED_CONNECTIVITY_SOURCE_INC_JAVA_LANG_OBJECT_HXX
 
-#include <cstdarg>
-#include <osl/thread.h>
-#include <com/sun/star/sdbc/SQLException.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
-#include <osl/diagnose.h>
 #include <jvmaccess/virtualmachine.hxx>
-#include <functional>
-#include <memory>
 
 #ifdef HAVE_64BIT_POINTERS
 #error "no 64 bit pointer"
diff --git a/connectivity/source/inc/java/sql/Connection.hxx b/connectivity/source/inc/java/sql/Connection.hxx
index 528f0eddf537..cc453e6e87ca 100644
--- a/connectivity/source/inc/java/sql/Connection.hxx
+++ b/connectivity/source/inc/java/sql/Connection.hxx
@@ -22,10 +22,8 @@
 #include <java/lang/Object.hxx>
 #include <TConnection.hxx>
 #include <connectivity/CommonTools.hxx>
-#include <cppuhelper/weakref.hxx>
 #include <AutoRetrievingBase.hxx>
 #include <java/sql/ConnectionLog.hxx>
-#include <java/LocalRef.hxx>
 #include <java/GlobalRef.hxx>
 
 #include <com/sun/star/beans/NamedValue.hpp>
diff --git a/connectivity/source/inc/java/sql/Driver.hxx b/connectivity/source/inc/java/sql/Driver.hxx
index d01f3896b7ef..f50d9a3f55d0 100644
--- a/connectivity/source/inc/java/sql/Driver.hxx
+++ b/connectivity/source/inc/java/sql/Driver.hxx
@@ -21,8 +21,8 @@
 #define INCLUDED_CONNECTIVITY_SOURCE_INC_JAVA_SQL_DRIVER_HXX
 
 #include <com/sun/star/sdbc/XDriver.hpp>
-#include <java/lang/Object.hxx>
 #include <cppuhelper/implbase.hxx>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 
 #include <comphelper/logging.hxx>
diff --git a/connectivity/source/inc/java/sql/DriverPropertyInfo.hxx b/connectivity/source/inc/java/sql/DriverPropertyInfo.hxx
index e6065f4a96e4..b0ab4efda344 100644
--- a/connectivity/source/inc/java/sql/DriverPropertyInfo.hxx
+++ b/connectivity/source/inc/java/sql/DriverPropertyInfo.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_CONNECTIVITY_SOURCE_INC_JAVA_SQL_DRIVERPROPERTYINFO_HXX
 
 #include <java/lang/Object.hxx>
-#include <com/sun/star/sdbc/DriverPropertyInfo.hpp>
 
 namespace connectivity
 {
diff --git a/connectivity/source/inc/java/sql/ResultSetMetaData.hxx b/connectivity/source/inc/java/sql/ResultSetMetaData.hxx
index 036ca4c4bdd7..bc96fdf4b9a8 100644
--- a/connectivity/source/inc/java/sql/ResultSetMetaData.hxx
+++ b/connectivity/source/inc/java/sql/ResultSetMetaData.hxx
@@ -22,7 +22,6 @@
 #include <java/lang/Object.hxx>
 #include <com/sun/star/sdbc/XResultSetMetaData.hpp>
 #include <cppuhelper/implbase.hxx>
-#include <java/sql/ConnectionLog.hxx>
 
 namespace connectivity
 {
diff --git a/connectivity/source/inc/java/sql/Timestamp.hxx b/connectivity/source/inc/java/sql/Timestamp.hxx
index 7f30f28adf24..0d41d46d69c5 100644
--- a/connectivity/source/inc/java/sql/Timestamp.hxx
+++ b/connectivity/source/inc/java/sql/Timestamp.hxx
@@ -20,6 +20,7 @@
 #define INCLUDED_CONNECTIVITY_SOURCE_INC_JAVA_SQL_TIMESTAMP_HXX
 
 #include <java/util/Date.hxx>
+#include <com/sun/star/util/Date.hpp>
 #include <com/sun/star/util/Time.hpp>
 #include <com/sun/star/util/DateTime.hpp>
 
diff --git a/connectivity/source/inc/java/tools.hxx b/connectivity/source/inc/java/tools.hxx
index e3763cd655a0..aa7cb20cad9b 100644
--- a/connectivity/source/inc/java/tools.hxx
+++ b/connectivity/source/inc/java/tools.hxx
@@ -24,13 +24,9 @@
 #include <com/sun/star/uno/Sequence.h>
 
 #include <jni.h>
-#include <java/sql/SQLException.hxx>
 
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/io/XInputStream.hpp>
-#include <com/sun/star/util/Time.hpp>
-#include <com/sun/star/util/Date.hpp>
-#include <com/sun/star/util/DateTime.hpp>
 
 
 namespace connectivity
diff --git a/connectivity/source/inc/java/util/Date.hxx b/connectivity/source/inc/java/util/Date.hxx
index 8fdab188d831..9c2e8a3ee76a 100644
--- a/connectivity/source/inc/java/util/Date.hxx
+++ b/connectivity/source/inc/java/util/Date.hxx
@@ -21,7 +21,7 @@
 #define INCLUDED_CONNECTIVITY_SOURCE_INC_JAVA_UTIL_DATE_HXX
 
 #include <java/lang/Object.hxx>
-#include <com/sun/star/util/Date.hpp>
+//#include <com/sun/star/util/Date.hpp>
 
 namespace connectivity
 {
diff --git a/connectivity/source/inc/mysql/YTable.hxx b/connectivity/source/inc/mysql/YTable.hxx
index 9e7ea59a6607..00739de5ccf5 100644
--- a/connectivity/source/inc/mysql/YTable.hxx
+++ b/connectivity/source/inc/mysql/YTable.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_CONNECTIVITY_SOURCE_INC_MYSQL_YTABLE_HXX
 
 #include <connectivity/TTableHelper.hxx>
-#include <com/sun/star/sdbc/XDatabaseMetaData.hpp>
 #include <comphelper/IdPropArrayHelper.hxx>
 
 namespace connectivity