5 files changed, 11 insertions, 20 deletions
diff --git a/dbaccess/inc/dbaccess_helpid.hrc b/dbaccess/inc/dbaccess_helpid.hrc
index 4140e049a939..ec30ff3d3d1d 100644
--- a/dbaccess/inc/dbaccess_helpid.hrc
+++ b/dbaccess/inc/dbaccess_helpid.hrc
@@ -32,7 +32,7 @@
 #define _DBA_DBACCESS_HELPID_HRC_
 
 #ifndef _SOLAR_HRC
-#include <svtools/solar.hrc>    // HID_DBACCESS_START
+#include <svl/solar.hrc>    // HID_DBACCESS_START
 #endif
 
 #define HID_DSADMIN_CHARSET                         (HID_DBACCESS_START +  9)
diff --git a/dbaccess/inc/documentcontroller.hxx b/dbaccess/inc/documentcontroller.hxx
index a16e4c645b06..2ca154625d90 100644
--- a/dbaccess/inc/documentcontroller.hxx
+++ b/dbaccess/inc/documentcontroller.hxx
@@ -72,18 +72,6 @@ namespace dbaui
         Controller  m_xController;
 
     public:
-        /** constructs the object, and connects the controller to the model
-
-        @param _rxModel
-            the model to which the controller should be connected
-        @param _rxController
-            the controller which should be connected to the model
-        */
-        ModelControllerConnector(
-            const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& _rxModel,
-            const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController >& _rxController
-        );
-
         /** connects the controller to the model
 
         @param _rxModel
diff --git a/dbaccess/inc/genericcontroller.hxx b/dbaccess/inc/genericcontroller.hxx
index b4570bc1215b..8464f491ff66 100644
--- a/dbaccess/inc/genericcontroller.hxx
+++ b/dbaccess/inc/genericcontroller.hxx
@@ -531,7 +531,9 @@ namespace dbaui
         virtual void SAL_CALL removeMouseClickHandler( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseClickHandler >& xHandler ) throw (::com::sun::star::uno::RuntimeException);
 
     protected:
+#ifdef WNT
         OGenericUnoController();    // never implemented
+#endif
     };
 }
 
diff --git a/dbaccess/inc/pch/precompiled_dbaccess.hxx b/dbaccess/inc/pch/precompiled_dbaccess.hxx
index 2b7a2c5a5f6e..28e749191284 100644
--- a/dbaccess/inc/pch/precompiled_dbaccess.hxx
+++ b/dbaccess/inc/pch/precompiled_dbaccess.hxx
@@ -411,6 +411,7 @@
 #include "comphelper/types.hxx"
 
 #include "connectivity/FValue.hxx"
+#include <connectivity/DriversConfig.hxx>
 #include "connectivity/dbcharset.hxx"
 #include "connectivity/dbconversion.hxx"
 #include "connectivity/dbexception.hxx"
@@ -457,19 +458,19 @@
 #include "comphelper/classids.hxx"
 
 
-#include "svtools/cjkoptions.hxx"
-#include "svtools/filenotation.hxx"
-#include "svtools/historyoptions.hxx"
+#include "svl/cjkoptions.hxx"
+#include "svl/filenotation.hxx"
+#include "unotools/historyoptions.hxx"
 #include "svtools/htmlkywd.hxx"
 #include "svtools/imgdef.hxx"
-#include "svtools/internaloptions.hxx"
+#include "unotools/internaloptions.hxx"
 #include "svtools/menuoptions.hxx"
 #include "svtools/miscopt.hxx"
 #include "svtools/rtfkeywd.hxx"
 #include "svtools/rtftoken.h"
-#include "svtools/solar.hrc"
+#include "svl/solar.hrc"
 #include "svtools/toolboxcontroller.hxx"
-#include "svtools/viewoptions.hxx"
+#include "unotools/viewoptions.hxx"
 
 #include "svx/dataaccessdescriptor.hxx"
 #include "svx/dbexch.hrc"
diff --git a/dbaccess/inc/singledoccontroller.hxx b/dbaccess/inc/singledoccontroller.hxx
index f63d1c02fdf2..1d6773961972 100644
--- a/dbaccess/inc/singledoccontroller.hxx
+++ b/dbaccess/inc/singledoccontroller.hxx
@@ -48,7 +48,7 @@
 #include <comphelper/propertycontainer.hxx>
 #include <connectivity/dbmetadata.hxx>
 #include <cppuhelper/implbase1.hxx>
-#include <svtools/undo.hxx>
+#include <svl/undo.hxx>
 
 #include <memory>