12 files changed, 1 insertions, 23 deletions
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
 {