10 files changed, 14 insertions, 26 deletions
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