15 files changed, 152 insertions, 58 deletions
diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx
index 3612e810c6ad..c7850b23752c 100644
--- a/dbaccess/source/ui/app/AppController.cxx
+++ b/dbaccess/source/ui/app/AppController.cxx
@@ -51,6 +51,7 @@
 #include <com/sun/star/util/XModifiable.hpp>
 #include <com/sun/star/util/XModifyBroadcaster.hpp>
 #include <com/sun/star/util/XNumberFormatter.hpp>
+#include <com/sun/star/util/XURLTransformer.hpp>
 #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
 #include <com/sun/star/document/XEmbeddedScripts.hpp>
 #include <com/sun/star/frame/XModel2.hpp>
diff --git a/dbaccess/source/ui/browser/dataview.cxx b/dbaccess/source/ui/browser/dataview.cxx
index cc8b82c9180b..d091404669fd 100644
--- a/dbaccess/source/ui/browser/dataview.cxx
+++ b/dbaccess/source/ui/browser/dataview.cxx
@@ -17,6 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <com/sun/star/frame/XController.hpp>
+#include <com/sun/star/frame/XModel.hpp>
 #include <dbaccess/dataview.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <comphelper/types.hxx>
@@ -26,8 +28,10 @@
 #include <dbaccess/IController.hxx>
 #include "UITools.hxx"
 #include <sfx2/sfx.hrc>
+#include <svtools/acceleratorexecute.hxx>
 #include <svtools/imgdef.hxx>
 #include <tools/diagnose_ex.h>
+#include <vcl/fixed.hxx>
 #include <vcl/settings.hxx>
 
 namespace dbaui
diff --git a/dbaccess/source/ui/browser/genericcontroller.cxx b/dbaccess/source/ui/browser/genericcontroller.cxx
index 633e94ac61bf..209b50c7d8f9 100644
--- a/dbaccess/source/ui/browser/genericcontroller.cxx
+++ b/dbaccess/source/ui/browser/genericcontroller.cxx
@@ -47,7 +47,7 @@
 
 #include <com/sun/star/ui/XSidebarProvider.hpp>
 #include <sfx2/sidebar/UnoSidebar.hxx>
-
+#include <sfx2/userinputinterception.hxx>
 
 #include <vcl/waitobj.hxx>
 #include <svl/urihelper.hxx>
diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx
index d3a80511b860..f41c7e04de74 100644
--- a/dbaccess/source/ui/browser/unodatbr.cxx
+++ b/dbaccess/source/ui/browser/unodatbr.cxx
@@ -65,6 +65,7 @@
 #include <com/sun/star/sdb/SQLContext.hpp>
 #include <com/sun/star/sdb/XBookmarksSupplier.hpp>
 #include <com/sun/star/sdb/XCompletedConnection.hpp>
+#include <com/sun/star/sdb/XDatabaseContext.hpp>
 #include <com/sun/star/sdb/XDatabaseRegistrations.hpp>
 #include <com/sun/star/sdb/XDocumentDataSource.hpp>
 #include <com/sun/star/sdb/XParametersSupplier.hpp>
diff --git a/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx b/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx
index 72e409fefad8..5e030f2ac8fe 100644
--- a/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx
+++ b/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx
@@ -39,6 +39,7 @@
 #include <comphelper/sequence.hxx>
 #include <comphelper/types.hxx>
 #include <connectivity/dbexception.hxx>
+#include <connectivity/dbmetadata.hxx>
 #include <connectivity/dbtools.hxx>
 #include <cppuhelper/typeprovider.hxx>
 #include <comphelper/interfacecontainer2.hxx>
diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx b/dbaccess/source/ui/tabledesign/TEditControl.cxx
index ce444d860544..04da703df831 100644
--- a/dbaccess/source/ui/tabledesign/TEditControl.cxx
+++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx
@@ -37,6 +37,7 @@
 #include <vcl/msgbox.hxx>
 #include "TableUndo.hxx"
 #include "TableController.hxx"
+#include <connectivity/dbmetadata.hxx>
 #include <connectivity/dbtools.hxx>
 #include "SqlNameEdit.hxx"
 #include "TableRowExchange.hxx"
diff --git a/include/dbaccess/AsynchronousLink.hxx b/include/dbaccess/AsynchronousLink.hxx
index aaeb187d974c..8adefd1d45dc 100644
--- a/include/dbaccess/AsynchronousLink.hxx
+++ b/include/dbaccess/AsynchronousLink.hxx
@@ -20,8 +20,8 @@
 #ifndef INCLUDED_DBACCESS_ASYNCRONOUSLINK_HXX
 #define INCLUDED_DBACCESS_ASYNCRONOUSLINK_HXX
 
-#include <tools/link.hxx>
 #include <osl/mutex.hxx>
+#include <tools/link.hxx>
 
 struct ImplSVEvent;
 
diff --git a/include/dbaccess/IController.hxx b/include/dbaccess/IController.hxx
index 01ea207f00b9..f19ca143a1c0 100644
--- a/include/dbaccess/IController.hxx
+++ b/include/dbaccess/IController.hxx
@@ -20,11 +20,17 @@
 #ifndef INCLUDED_DBACCESS_ICONTROLLER_HXX
 #define INCLUDED_DBACCESS_ICONTROLLER_HXX
 
-#include <com/sun/star/beans/PropertyValue.hpp>
+#include <com/sun/star/uno/Reference.hxx>
+#include <com/sun/star/uno/RuntimeException.hpp>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <dbaccess/dbaccessdllapi.h>
+#include <rtl/ustring.hxx>
+#include <sal/types.h>
 
 namespace com { namespace sun { namespace star {
+    namespace beans {
+        struct PropertyValue;
+    }
     namespace util {
         struct URL;
     }
diff --git a/include/dbaccess/ToolBoxHelper.hxx b/include/dbaccess/ToolBoxHelper.hxx
index a7ad8375e00b..7386bf35cbc3 100644
--- a/include/dbaccess/ToolBoxHelper.hxx
+++ b/include/dbaccess/ToolBoxHelper.hxx
@@ -20,13 +20,13 @@
 #ifndef INCLUDED_DBACCESS_TOOLBOXHELPER_HXX
 #define INCLUDED_DBACCESS_TOOLBOXHELPER_HXX
 
+#include <dbaccess/dbaccessdllapi.h>
 #include <sal/types.h>
 #include <tools/link.hxx>
-#include <vcl/image.hxx>
 #include <vcl/vclptr.hxx>
-#include <dbaccess/dbaccessdllapi.h>
 
-class SvtMiscOptions;
+class LinkParamNone;
+class Size;
 class ToolBox;
 class VclSimpleEvent;
 
diff --git a/include/dbaccess/controllerframe.hxx b/include/dbaccess/controllerframe.hxx
index dbf30ceb3a73..fd14bb02f92a 100644
--- a/include/dbaccess/controllerframe.hxx
+++ b/include/dbaccess/controllerframe.hxx
@@ -20,11 +20,14 @@
 #ifndef INCLUDED_DBACCESS_CONTROLLERFRAME_HXX
 #define INCLUDED_DBACCESS_CONTROLLERFRAME_HXX
 
-#include <com/sun/star/frame/XFrame.hpp>
-#include <com/sun/star/frame/FrameAction.hpp>
-
 #include <memory>
 
+#include <com/sun/star/frame/FrameAction.hpp>
+#include <com/sun/star/uno/Reference.hxx>
+
+namespace com { namespace sun { namespace star {
+    namespace frame { class XFrame; }
+} } }
 
 namespace dbaui
 {
diff --git a/include/dbaccess/dataview.hxx b/include/dbaccess/dataview.hxx
index dffc73bb7abd..289697ef0637 100644
--- a/include/dbaccess/dataview.hxx
+++ b/include/dbaccess/dataview.hxx
@@ -19,16 +19,30 @@
 #ifndef INCLUDED_DBACCESS_DATAVIEW_HXX
 #define INCLUDED_DBACCESS_DATAVIEW_HXX
 
+#include <memory>
+
+#include <com/sun/star/uno/Reference.hxx>
 #include <dbaccess/dbaccessdllapi.h>
+#include <rtl/ref.hxx>
+#include <tools/wintypes.hxx>
+#include <vcl/outdev.hxx>
+#include <vcl/vclptr.hxx>
+#include <vcl/window.hxx>
 
-#include <com/sun/star/uno/XComponentContext.hpp>
-#include <svtools/acceleratorexecute.hxx>
-#include <sal/macros.h>
-#include <vcl/fixed.hxx>
+namespace com { namespace sun { namespace star {
+    namespace frame { class XFrame; }
+    namespace uno { class XComponentContext; }
+} } }
 
-#include <memory>
+namespace svt {
+    class AcceleratorExecute;
+}
 
+class DataChangedEvent;
 class FixedLine;
+class NotifyEvent;
+class Rectangle;
+
 namespace dbaui
 {
     class IController;
diff --git a/include/dbaccess/dbaundomanager.hxx b/include/dbaccess/dbaundomanager.hxx
index 3f4ef39ca3f1..b855c0d682a0 100644
--- a/include/dbaccess/dbaundomanager.hxx
+++ b/include/dbaccess/dbaundomanager.hxx
@@ -20,13 +20,38 @@
 #ifndef INCLUDED_DBACCESS_DBAUNDOMANAGER_HXX
 #define INCLUDED_DBACCESS_DBAUNDOMANAGER_HXX
 
-#include <dbaccess/dbaccessdllapi.h>
+#include <exception>
+#include <memory>
 
+#include <com/sun/star/document/EmptyUndoStackException.hpp>
+#include <com/sun/star/document/UndoContextNotClosedException.hpp>
+#include <com/sun/star/document/UndoFailedException.hpp>
 #include <com/sun/star/document/XUndoManager.hpp>
-
+#include <com/sun/star/lang/IllegalArgumentException.hpp>
+#include <com/sun/star/lang/NoSupportException.hpp>
+#include <com/sun/star/uno/Reference.hxx>
+#include <com/sun/star/uno/RuntimeException.hpp>
+#include <com/sun/star/uno/Sequence.hxx>
+#include <com/sun/star/util/InvalidStateException.hpp>
+#include <com/sun/star/util/NotLockedException.hpp>
 #include <cppuhelper/implbase1.hxx>
-
-#include <memory>
+#include <dbaccess/dbaccessdllapi.h>
+#include <rtl/ustring.hxx>
+#include <sal/types.h>
+
+namespace com { namespace sun { namespace star {
+    namespace document { class XUndoAction; }
+    namespace document { class XUndoManagerListener; }
+    namespace uno { class XInterface; }
+} } }
+
+namespace cppu {
+    class OWeakObject;
+}
+
+namespace osl {
+    class Mutex;
+}
 
 class SfxUndoManager;
 
diff --git a/include/dbaccess/dbsubcomponentcontroller.hxx b/include/dbaccess/dbsubcomponentcontroller.hxx
index 5805bdc0ee73..a43b28d61580 100644
--- a/include/dbaccess/dbsubcomponentcontroller.hxx
+++ b/include/dbaccess/dbsubcomponentcontroller.hxx
@@ -20,32 +20,45 @@
 #ifndef INCLUDED_DBACCESS_DBSUBCOMPONENTCONTROLLER_HXX
 #define INCLUDED_DBACCESS_DBSUBCOMPONENTCONTROLLER_HXX
 
-#include <dbaccess/genericcontroller.hxx>
+#include <exception>
+#include <memory>
 
+#include <com/sun/star/beans/PropertyVetoException.hpp>
 #include <com/sun/star/document/XScriptInvocationContext.hpp>
-#include <com/sun/star/sdbc/XConnection.hpp>
-#include <com/sun/star/sdbc/XDatabaseMetaData.hpp>
-#include <com/sun/star/sdbc/XDataSource.hpp>
-#include <com/sun/star/util/XNumberFormatter.hpp>
+#include <com/sun/star/lang/EventObject.hpp>
+#include <com/sun/star/uno/Any.hxx>
+#include <com/sun/star/uno/Reference.hxx>
+#include <com/sun/star/uno/RuntimeException.hpp>
+#include <com/sun/star/uno/Sequence.hxx>
+#include <com/sun/star/uno/Type.hxx>
 #include <com/sun/star/util/XModifiable.hpp>
-
-#include <comphelper/broadcasthelper.hxx>
-#include <comphelper/proparrhlp.hxx>
-#include <comphelper/propertycontainer.hxx>
-#include <connectivity/dbmetadata.hxx>
 #include <cppuhelper/implbase.hxx>
-
-#include <memory>
-
+#include <dbaccess/dbaccessdllapi.h>
+#include <dbaccess/genericcontroller.hxx>
+#include <rtl/ustring.hxx>
+#include <sal/types.h>
+
+namespace com { namespace sun { namespace star {
+    namespace beans { class XPropertySet; }
+    namespace beans { struct PropertyValue; }
+    namespace document { class XEmbeddedScripts; }
+    namespace frame { class XModel; }
+    namespace sdbc { class XConnection; }
+    namespace sdbc { class XDatabaseMetaData; }
+    namespace uno { class XComponentContext; }
+    namespace util { class XModifyListener; }
+    namespace util { class XNumberFormatter; }
+} } }
+
+namespace dbtools {
+    class DatabaseMetaData;
+    class SQLExceptionInfo;
+}
 
 namespace dbaui
 {
-
-
     //= DBSubComponentController
 
-    class DBSubComponentController;
-
     typedef ::cppu::ImplInheritanceHelper<   OGenericUnoController
                                          ,   css::document::XScriptInvocationContext
                                          ,   css::util::XModifiable
diff --git a/include/dbaccess/genericcontroller.hxx b/include/dbaccess/genericcontroller.hxx
index dae637c6bf0d..53c32cb34249 100644
--- a/include/dbaccess/genericcontroller.hxx
+++ b/include/dbaccess/genericcontroller.hxx
@@ -23,52 +23,76 @@
 #include <sal/config.h>
 
 #include <deque>
+#include <exception>
+#include <functional>
 #include <map>
+#include <memory>
 #include <vector>
 
-#include <dbaccess/AsynchronousLink.hxx>
-#include <dbaccess/controllerframe.hxx>
-#include <dbaccess/dbaccessdllapi.h>
-#include <dbaccess/IController.hxx>
+#include <boost/optional.hpp>
 
+#include <com/sun/star/awt/XUserInputInterception.hpp>
 #include <com/sun/star/frame/CommandGroup.hpp>
+#include <com/sun/star/frame/DispatchInformation.hpp>
 #include <com/sun/star/frame/XController2.hpp>
 #include <com/sun/star/frame/XDispatch.hpp>
 #include <com/sun/star/frame/XDispatchInformationProvider.hpp>
 #include <com/sun/star/frame/XDispatchProviderInterceptor.hpp>
-#include <com/sun/star/frame/XFrameActionListener.hpp>
+#include <com/sun/star/frame/XLayoutManager.hpp>
 #include <com/sun/star/frame/XTitle.hpp>
 #include <com/sun/star/frame/XTitleChangeBroadcaster.hpp>
-#include <com/sun/star/frame/XLayoutManager.hpp>
+#include <com/sun/star/lang/EventObject.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/sdb/XDatabaseContext.hpp>
-#include <com/sun/star/sdbc/XConnection.hpp>
-#include <com/sun/star/sdbc/XDataSource.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
+#include <com/sun/star/uno/Any.hxx>
+#include <com/sun/star/uno/Exception.hpp>
+#include <com/sun/star/uno/Reference.hxx>
+#include <com/sun/star/uno/RuntimeException.hpp>
+#include <com/sun/star/uno/Sequence.hxx>
+#include <com/sun/star/util/URL.hpp>
 #include <com/sun/star/util/XModifyListener.hpp>
-#include <com/sun/star/util/XURLTransformer.hpp>
-#include <com/sun/star/awt/XUserInputInterception.hpp>
-
-#include <comphelper/broadcasthelper.hxx>
 #include <comphelper/sharedmutex.hxx>
 #include <comphelper/namedvaluecollection.hxx>
 #include <connectivity/dbexception.hxx>
 #include <cppuhelper/compbase.hxx>
 #include <cppuhelper/interfacecontainer.h>
-
-#include <boost/optional.hpp>
-#include <sfx2/userinputinterception.hxx>
+#include <dbaccess/AsynchronousLink.hxx>
+#include <dbaccess/controllerframe.hxx>
+#include <dbaccess/dbaccessdllapi.h>
+#include <dbaccess/IController.hxx>
+#include <osl/mutex.hxx>
+#include <rtl/string.hxx>
+#include <rtl/ustring.hxx>
+#include <sal/types.h>
+#include <tools/link.hxx>
 #include <vcl/vclptr.hxx>
 
-#include <com/sun/star/ui/XSidebarProvider.hpp>
-
-namespace dbtools
-{
-    class SQLExceptionInfo;
-}
+namespace com { namespace sun { namespace star {
+    namespace awt { class XKeyHandler; }
+    namespace awt { class XMouseClickHandler; }
+    namespace awt { class XWindow; }
+    namespace beans { struct PropertyValue; }
+    namespace frame { class XController; }
+    namespace frame { class XDispatchProvider; }
+    namespace frame { class XFrame; }
+    namespace frame { class XFrameActionListener; }
+    namespace frame { class XModel; }
+    namespace frame { class XStatusListener; }
+    namespace frame { class XTitleChangeListener; }
+    namespace frame { struct DispatchDescriptor; }
+    namespace frame { struct FrameActionEvent; }
+    namespace lang { class XEventListener; }
+    namespace sdb { class XDatabaseContext; }
+    namespace sdbc { class XConnection; }
+    namespace sdbc { class XDataSource; }
+    namespace ui { class XSidebarProvider; }
+    namespace uno { class XComponentContext; }
+    namespace util { class XURLTransformer; }
+} } }
 
 namespace vcl { class Window; }
+class NotifyEvent;
+
 namespace dbaui
 {
     class ODataView;
diff --git a/reportdesign/source/ui/report/DesignView.cxx b/reportdesign/source/ui/report/DesignView.cxx
index ed030a2c4cf6..3057db7e3062 100644
--- a/reportdesign/source/ui/report/DesignView.cxx
+++ b/reportdesign/source/ui/report/DesignView.cxx
@@ -21,6 +21,7 @@
 #include <tools/debug.hxx>
 #include "ReportController.hxx"
 #include <comphelper/types.hxx>
+#include <svtools/acceleratorexecute.hxx>
 #include <unotools/syslocale.hxx>
 #include <unotools/viewoptions.hxx>
 #include "RptDef.hxx"