tdf#42949 Fix IWYU warnings in include/sfx2/sidebar/*

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

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

36 files changed, 76 insertions, 120 deletions

diff --git a/include/sfx2/sidebar/Accessible.hxx b/include/sfx2/sidebar/Accessible.hxx
index 34e436972893..a32955812fec 100644
--- a/include/sfx2/sidebar/Accessible.hxx
+++ b/include/sfx2/sidebar/Accessible.hxx
@@ -20,11 +20,12 @@
 #define INCLUDED_SFX2_SOURCE_SIDEBAR_ACCESSIBLE_HXX
 
 #include <com/sun/star/accessibility/XAccessible.hpp>
-#include <com/sun/star/accessibility/XAccessibleContext.hpp>
 
 #include <cppuhelper/compbase.hxx>
 #include <cppuhelper/basemutex.hxx>
 
+namespace com::sun::star::accessibility { class XAccessibleContext; }
+
 typedef cppu::WeakComponentImplHelper <
     css::accessibility::XAccessible
     > AccessibleInterfaceBase;
diff --git a/include/sfx2/sidebar/AccessibleTitleBar.hxx b/include/sfx2/sidebar/AccessibleTitleBar.hxx
index 3ed43ab248b2..6172bb4fd666 100644
--- a/include/sfx2/sidebar/AccessibleTitleBar.hxx
+++ b/include/sfx2/sidebar/AccessibleTitleBar.hxx
@@ -20,7 +20,8 @@
 #define INCLUDED_SFX2_SOURCE_SIDEBAR_ACCESSIBLETITLEBAR_HXX
 
 #include <toolkit/awt/vclxaccessiblecomponent.hxx>
-#include <com/sun/star/accessibility/XAccessible.hpp>
+
+namespace com::sun::star::accessibility { class XAccessible; }
 
 namespace sfx2 { namespace sidebar {
 
diff --git a/include/sfx2/sidebar/AsynchronousCall.hxx b/include/sfx2/sidebar/AsynchronousCall.hxx
index b42caf50ed19..b05c90dc86db 100644
--- a/include/sfx2/sidebar/AsynchronousCall.hxx
+++ b/include/sfx2/sidebar/AsynchronousCall.hxx
@@ -19,7 +19,6 @@
 #ifndef INCLUDED_SFX2_SOURCE_SIDEBAR_ASYNCHRONOUSCALL_HXX
 #define INCLUDED_SFX2_SOURCE_SIDEBAR_ASYNCHRONOUSCALL_HXX
 
-#include <tools/solar.h>
 #include <tools/link.hxx>
 
 #include <functional>
diff --git a/include/sfx2/sidebar/Context.hxx b/include/sfx2/sidebar/Context.hxx
index aa6b2716cdd3..05cdf84e938e 100644
--- a/include/sfx2/sidebar/Context.hxx
+++ b/include/sfx2/sidebar/Context.hxx
@@ -21,8 +21,6 @@
 
 #include <rtl/ustring.hxx>
 
-#include <vector>
-
 namespace sfx2 { namespace sidebar {
 
 class Context
diff --git a/include/sfx2/sidebar/ContextList.hxx b/include/sfx2/sidebar/ContextList.hxx
index 08ee70cb617a..fc2f6845fbf5 100644
--- a/include/sfx2/sidebar/ContextList.hxx
+++ b/include/sfx2/sidebar/ContextList.hxx
@@ -20,7 +20,6 @@
 #define INCLUDED_SFX2_SOURCE_SIDEBAR_CONTEXTLIST_HXX
 
 #include <sfx2/sidebar/Context.hxx>
-#include <sal/types.h>
 #include <rtl/ustring.hxx>
 
 #include <vector>
diff --git a/include/sfx2/sidebar/ControlFactory.hxx b/include/sfx2/sidebar/ControlFactory.hxx
index be010e5076e2..42db1081b5c1 100644
--- a/include/sfx2/sidebar/ControlFactory.hxx
+++ b/include/sfx2/sidebar/ControlFactory.hxx
@@ -20,16 +20,14 @@
 #define INCLUDED_SFX2_SIDEBAR_CONTROLFACTORY_HXX
 
 #include <sfx2/dllapi.h>
-#include <sfx2/sidebar/SidebarToolBox.hxx>
-#include <vcl/button.hxx>
 #include <vcl/vclptr.hxx>
 
-class ToolBox;
+class CheckBox;
+class ImageRadioButton;
+namespace vcl { class Window; }
 
 namespace sfx2 { namespace sidebar {
 
-class ToolBoxBackground;
-
 /** Factory for controls used in sidebar panels.
     The reason to use this factory instead of creating the controls
     directly is that this way the sidebar has a little more control
diff --git a/include/sfx2/sidebar/ControllerFactory.hxx b/include/sfx2/sidebar/ControllerFactory.hxx
index 83d631a1bed8..4dfff756415d 100644
--- a/include/sfx2/sidebar/ControllerFactory.hxx
+++ b/include/sfx2/sidebar/ControllerFactory.hxx
@@ -20,10 +20,12 @@
 #define INCLUDED_SFX2_SIDEBAR_CONTROLLERFACTORY_HXX
 
 #include <sfx2/dllapi.h>
-#include <com/sun/star/awt/XWindow.hpp>
-#include <com/sun/star/frame/XFrame.hpp>
-#include <com/sun/star/frame/XToolbarController.hpp>
+#include <com/sun/star/uno/Reference.hxx>
 
+namespace com::sun::star::awt { class XWindow; }
+namespace com::sun::star::frame { class XController; }
+namespace com::sun::star::frame { class XFrame; }
+namespace com::sun::star::frame { class XToolbarController; }
 
 class ToolBox;
 
diff --git a/include/sfx2/sidebar/ControllerItem.hxx b/include/sfx2/sidebar/ControllerItem.hxx
index 23a94487706e..41eec7a9fc51 100644
--- a/include/sfx2/sidebar/ControllerItem.hxx
+++ b/include/sfx2/sidebar/ControllerItem.hxx
@@ -21,7 +21,7 @@
 
 #include <sfx2/ctrlitem.hxx>
 
-#include <com/sun/star/lang/XComponent.hpp>
+namespace com::sun::star::lang { class XComponent; }
 
 
 namespace sfx2 { namespace sidebar {
diff --git a/include/sfx2/sidebar/Deck.hxx b/include/sfx2/sidebar/Deck.hxx
index c8273c568742..e3a3570f199a 100644
--- a/include/sfx2/sidebar/Deck.hxx
+++ b/include/sfx2/sidebar/Deck.hxx
@@ -22,8 +22,6 @@
 #include <sfx2/sidebar/Panel.hxx>
 
 #include <vcl/window.hxx>
-#include <vcl/image.hxx>
-#include <com/sun/star/ui/LayoutSize.hpp>
 
 class ScrollBar;
 
diff --git a/include/sfx2/sidebar/DeckDescriptor.hxx b/include/sfx2/sidebar/DeckDescriptor.hxx
index 086de40068b8..9a205335b6e2 100644
--- a/include/sfx2/sidebar/DeckDescriptor.hxx
+++ b/include/sfx2/sidebar/DeckDescriptor.hxx
@@ -19,7 +19,6 @@
 #ifndef INCLUDED_SFX2_SOURCE_SIDEBAR_DECKDESCRIPTOR_HXX
 #define INCLUDED_SFX2_SOURCE_SIDEBAR_DECKDESCRIPTOR_HXX
 
-#include <vcl/EnumContext.hxx>
 #include <sfx2/sidebar/ContextList.hxx>
 
 #include <sfx2/sidebar/Deck.hxx>
diff --git a/include/sfx2/sidebar/DeckLayouter.hxx b/include/sfx2/sidebar/DeckLayouter.hxx
index 27a94dd7b3e9..1208fb94c164 100644
--- a/include/sfx2/sidebar/DeckLayouter.hxx
+++ b/include/sfx2/sidebar/DeckLayouter.hxx
@@ -21,19 +21,12 @@
 
 #include <sfx2/sidebar/Panel.hxx>
 
-#include <tools/gen.hxx>
-
-#include <com/sun/star/ui/LayoutSize.hpp>
-
-#include <vector>
-
 class ScrollBar;
 namespace vcl { class Window; }
+namespace tools { class Rectangle; }
 
 namespace sfx2 { namespace sidebar {
 
-class Panel;
-
 /** Helper for layouting the direct and indirect children of a
     deck like title bars, panels, and scroll bars.
 */
diff --git a/include/sfx2/sidebar/DrawHelper.hxx b/include/sfx2/sidebar/DrawHelper.hxx
index f80a0ca12775..6bf6d17756a0 100644
--- a/include/sfx2/sidebar/DrawHelper.hxx
+++ b/include/sfx2/sidebar/DrawHelper.hxx
@@ -19,11 +19,10 @@
 #ifndef INCLUDED_SFX2_SOURCE_SIDEBAR_DRAWHELPER_HXX
 #define INCLUDED_SFX2_SOURCE_SIDEBAR_DRAWHELPER_HXX
 
-#include <vcl/window.hxx>
-
-#include <tools/svborder.hxx>
+#include <vcl/outdev.hxx>
 
 class Color;
+class SvBorder;
 
 namespace sfx2 { namespace sidebar {
 
diff --git a/include/sfx2/sidebar/FocusManager.hxx b/include/sfx2/sidebar/FocusManager.hxx
index a8c52279ad0b..5bbb3b0441fe 100644
--- a/include/sfx2/sidebar/FocusManager.hxx
+++ b/include/sfx2/sidebar/FocusManager.hxx
@@ -24,7 +24,6 @@
 #include <vcl/keycod.hxx>
 
 class Button;
-class VclSimpleEvent;
 
 namespace sfx2 { namespace sidebar {
 
diff --git a/include/sfx2/sidebar/IContextChangeReceiver.hxx b/include/sfx2/sidebar/IContextChangeReceiver.hxx
index b8f65128fff5..a36bb21de4e5 100644
--- a/include/sfx2/sidebar/IContextChangeReceiver.hxx
+++ b/include/sfx2/sidebar/IContextChangeReceiver.hxx
@@ -19,9 +19,10 @@
 #ifndef INCLUDED_SFX2_SIDEBAR_ICONTEXTCHANGERECEIVER_HXX
 #define INCLUDED_SFX2_SIDEBAR_ICONTEXTCHANGERECEIVER_HXX
 
-#include <vcl/EnumContext.hxx>
 #include <sfx2/dllapi.h>
 
+namespace vcl { class EnumContext; }
+
 
 namespace sfx2 { namespace sidebar {
 
diff --git a/include/sfx2/sidebar/ILayoutableWindow.hxx b/include/sfx2/sidebar/ILayoutableWindow.hxx
index 957601a84632..ce8b12eccf1c 100644
--- a/include/sfx2/sidebar/ILayoutableWindow.hxx
+++ b/include/sfx2/sidebar/ILayoutableWindow.hxx
@@ -20,12 +20,9 @@
 #define INCLUDED_SFX2_SIDEBAR_ILAYOUTABLEWINDOW_HXX
 
 #include <sfx2/dllapi.h>
-#include <tools/gen.hxx>
 #include <sal/types.h>
 #include <com/sun/star/ui/LayoutSize.hpp>
 
-namespace vcl { class Window; }
-
 namespace sfx2 { namespace sidebar {
 
 
diff --git a/include/sfx2/sidebar/Paint.hxx b/include/sfx2/sidebar/Paint.hxx
index 3328eb47624b..f693482a6c75 100644
--- a/include/sfx2/sidebar/Paint.hxx
+++ b/include/sfx2/sidebar/Paint.hxx
@@ -21,12 +21,9 @@
 
 #include <vcl/gradient.hxx>
 #include <vcl/wall.hxx>
-#include <com/sun/star/awt/Gradient.hpp>
 
 #include <boost/variant.hpp>
 
-class Color;
-
 namespace sfx2 { namespace sidebar {
 
 /** Abstraction of different ways to fill outlines.
diff --git a/include/sfx2/sidebar/Panel.hxx b/include/sfx2/sidebar/Panel.hxx
index 119843cc6c4e..25687459def2 100644
--- a/include/sfx2/sidebar/Panel.hxx
+++ b/include/sfx2/sidebar/Panel.hxx
@@ -19,22 +19,22 @@
 #ifndef INCLUDED_SFX2_SOURCE_SIDEBAR_PANEL_HXX
 #define INCLUDED_SFX2_SOURCE_SIDEBAR_PANEL_HXX
 
-#include <sfx2/sidebar/Context.hxx>
 #include <sfx2/dllapi.h>
 
 #include <vcl/window.hxx>
 
-#include <com/sun/star/ui/XUIElement.hpp>
-#include <com/sun/star/ui/XSidebarPanel.hpp>
-#include <com/sun/star/frame/XFrame.hpp>
-
 #include <vector>
 
+namespace com::sun::star::frame { class XFrame; }
+namespace com::sun::star::ui { class XSidebarPanel; }
+namespace com::sun::star::ui { class XUIElement; }
+namespace com::sun::star::awt { class XWindow; }
+
 namespace sfx2 { namespace sidebar {
 
 class PanelDescriptor;
-class TitleBar;
 class PanelTitleBar;
+class Context;
 
 class SFX2_DLLPUBLIC Panel : public vcl::Window
 {
diff --git a/include/sfx2/sidebar/PanelDescriptor.hxx b/include/sfx2/sidebar/PanelDescriptor.hxx
index ad40f6a42af0..2fdf2b1d4702 100644
--- a/include/sfx2/sidebar/PanelDescriptor.hxx
+++ b/include/sfx2/sidebar/PanelDescriptor.hxx
@@ -19,7 +19,6 @@
 #ifndef INCLUDED_SFX2_SOURCE_SIDEBAR_PANELDESCRIPTOR_HXX
 #define INCLUDED_SFX2_SOURCE_SIDEBAR_PANELDESCRIPTOR_HXX
 
-#include <vcl/EnumContext.hxx>
 #include <sfx2/sidebar/ContextList.hxx>
 
 namespace sfx2 { namespace sidebar {
diff --git a/include/sfx2/sidebar/PanelTitleBar.hxx b/include/sfx2/sidebar/PanelTitleBar.hxx
index 4a5475a98c93..1965caac687d 100644
--- a/include/sfx2/sidebar/PanelTitleBar.hxx
+++ b/include/sfx2/sidebar/PanelTitleBar.hxx
@@ -21,7 +21,8 @@
 
 #include <sfx2/sidebar/TitleBar.hxx>
 
-#include <com/sun/star/frame/XFrame.hpp>
+namespace com::sun::star::frame { class XController; }
+namespace com::sun::star::frame { class XFrame; }
 
 namespace sfx2 { namespace sidebar {
 
diff --git a/include/sfx2/sidebar/ResourceManager.hxx b/include/sfx2/sidebar/ResourceManager.hxx
index 97c8047d6a13..816aacf5c42f 100644
--- a/include/sfx2/sidebar/ResourceManager.hxx
+++ b/include/sfx2/sidebar/ResourceManager.hxx
@@ -19,15 +19,16 @@
 #ifndef INCLUDED_SFX2_SOURCE_SIDEBAR_RESOURCEMANAGER_HXX
 #define INCLUDED_SFX2_SOURCE_SIDEBAR_RESOURCEMANAGER_HXX
 
-#include <sfx2/sidebar/DeckDescriptor.hxx>
-#include <sfx2/sidebar/PanelDescriptor.hxx>
-#include <sfx2/sidebar/Context.hxx>
 #include <unotools/confignode.hxx>
-#include <com/sun/star/frame/XController.hpp>
 #include <map>
 #include <set>
 #include <svtools/miscopt.hxx>
 
+namespace com::sun::star::frame { class XController; }
+namespace com::sun::star::frame { class XModel; }
+namespace sfx2 { namespace sidebar { class DeckDescriptor; } }
+namespace sfx2 { namespace sidebar { class PanelDescriptor; } }
+
 namespace sfx2 { namespace sidebar {
 
 class Context;
diff --git a/include/sfx2/sidebar/Sidebar.hxx b/include/sfx2/sidebar/Sidebar.hxx
index b2808dd28b3d..427acf9c6c8b 100644
--- a/include/sfx2/sidebar/Sidebar.hxx
+++ b/include/sfx2/sidebar/Sidebar.hxx
@@ -21,7 +21,10 @@
 #define INCLUDED_SFX2_SIDEBAR_SIDEBAR_HXX
 
 #include <sfx2/dllapi.h>
-#include <com/sun/star/frame/XFrame.hpp>
+#include <rtl/ustring.hxx>
+
+namespace com::sun::star::frame { class XFrame; }
+namespace com::sun::star::uno { template <typename > class Reference; }
 
 
 namespace sfx2 { namespace sidebar {
diff --git a/include/sfx2/sidebar/SidebarController.hxx b/include/sfx2/sidebar/SidebarController.hxx
index eaed146d3b47..b4521bd4166c 100644
--- a/include/sfx2/sidebar/SidebarController.hxx
+++ b/include/sfx2/sidebar/SidebarController.hxx
@@ -24,24 +24,25 @@
 
 #include <sfx2/sidebar/AsynchronousCall.hxx>
 #include <sfx2/sidebar/Context.hxx>
+#include <sfx2/sidebar/Deck.hxx>
 #include <sfx2/sidebar/FocusManager.hxx>
-#include <sfx2/sidebar/Panel.hxx>
 #include <sfx2/sidebar/ResourceManager.hxx>
 #include <sfx2/sidebar/TabBar.hxx>
 
-#include <vcl/menu.hxx>
-
-#include <com/sun/star/awt/XWindowPeer.hpp>
 #include <com/sun/star/beans/XPropertyChangeListener.hpp>
-#include <com/sun/star/frame/XDispatch.hpp>
+#include <com/sun/star/frame/XStatusListener.hpp>
+#include <com/sun/star/frame/XFrameActionListener.hpp>
 #include <com/sun/star/ui/XContextChangeEventListener.hpp>
-#include <com/sun/star/ui/XUIElement.hpp>
 #include <com/sun/star/ui/XSidebar.hpp>
 
 #include <boost/optional.hpp>
 #include <cppuhelper/compbase.hxx>
 #include <cppuhelper/basemutex.hxx>
 
+namespace com::sun::star::awt { class XWindowPeer; }
+namespace com::sun::star::frame { class XDispatch; }
+namespace com::sun::star::ui { class XUIElement; }
+
 typedef cppu::WeakComponentImplHelper <
     css::ui::XContextChangeEventListener,
     css::beans::XPropertyChangeListener,
@@ -51,16 +52,11 @@ typedef cppu::WeakComponentImplHelper <
     > SidebarControllerInterfaceBase;
 
 class SfxSplitWindow;
-class FixedBitmap;
 
 namespace sfx2 { namespace sidebar {
 
-class ContentPanelDescriptor;
-class Deck;
 class DeckDescriptor;
 class SidebarDockingWindow;
-class TabBar;
-class TabBarConfiguration;
 
 class SFX2_DLLPUBLIC SidebarController
     : private ::cppu::BaseMutex,
diff --git a/include/sfx2/sidebar/SidebarDockingWindow.hxx b/include/sfx2/sidebar/SidebarDockingWindow.hxx
index 931cb34c5c6b..3c3059b87d7a 100644
--- a/include/sfx2/sidebar/SidebarDockingWindow.hxx
+++ b/include/sfx2/sidebar/SidebarDockingWindow.hxx
@@ -23,7 +23,7 @@
 
 #include <rtl/ref.hxx>
 
-#include <svtools/acceleratorexecute.hxx>
+namespace svt { class AcceleratorExecute; }
 
 namespace sfx2 { namespace sidebar {
 
diff --git a/include/sfx2/sidebar/SidebarModelUpdate.hxx b/include/sfx2/sidebar/SidebarModelUpdate.hxx
index 981f7fa5ffd3..3286d7573fe6 100644
--- a/include/sfx2/sidebar/SidebarModelUpdate.hxx
+++ b/include/sfx2/sidebar/SidebarModelUpdate.hxx
@@ -10,10 +10,11 @@
 #ifndef INCLUDED_INCLUDE_SFX2_SIDEBAR_SIDEBARUPDATEMODEL_HXX
 #define INCLUDED_INCLUDE_SFX2_SIDEBAR_SIDEBARUPDATEMODEL_HXX
 
-#include <com/sun/star/frame/XModel.hpp>
-
 #include <sfx2/dllapi.h>
 
+namespace com::sun::star::frame { class XModel; }
+namespace com::sun::star::uno { template <typename > class Reference; }
+
 namespace sfx2 { namespace sidebar {
 
 class SFX2_DLLPUBLIC SidebarModelUpdate
diff --git a/include/sfx2/sidebar/SidebarPanelBase.hxx b/include/sfx2/sidebar/SidebarPanelBase.hxx
index 2494be1e0bf5..f1cc0e26b93d 100644
--- a/include/sfx2/sidebar/SidebarPanelBase.hxx
+++ b/include/sfx2/sidebar/SidebarPanelBase.hxx
@@ -19,8 +19,7 @@
 #ifndef INCLUDED_SFX2_SIDEBAR_SIDEBARPANELBASE_HXX
 #define INCLUDED_SFX2_SIDEBAR_SIDEBARPANELBASE_HXX
 
-#include <vcl/EnumContext.hxx>
-#include <sfx2/sidebar/IContextChangeReceiver.hxx>
+#include <sfx2/dllapi.h>
 
 #include <cppuhelper/compbase.hxx>
 #include <cppuhelper/basemutex.hxx>
diff --git a/include/sfx2/sidebar/SidebarToolBox.hxx b/include/sfx2/sidebar/SidebarToolBox.hxx
index a19c7af4b3b1..75aece3e344d 100644
--- a/include/sfx2/sidebar/SidebarToolBox.hxx
+++ b/include/sfx2/sidebar/SidebarToolBox.hxx
@@ -21,11 +21,10 @@
 
 #include <sfx2/dllapi.h>
 #include <vcl/toolbox.hxx>
-#include <com/sun/star/frame/XFrame.hpp>
-#include <com/sun/star/frame/XToolbarController.hpp>
-#include <com/sun/star/util/URL.hpp>
 #include <map>
 
+namespace com::sun::star::frame { class XToolbarController; }
+
 namespace sfx2 { namespace sidebar {
 
 /** The sidebar tool box has two responsibilities:
diff --git a/include/sfx2/sidebar/TabBar.hxx b/include/sfx2/sidebar/TabBar.hxx
index 1736a478aea2..a6fcf6a33db4 100644
--- a/include/sfx2/sidebar/TabBar.hxx
+++ b/include/sfx2/sidebar/TabBar.hxx
@@ -20,28 +20,20 @@
 #define INCLUDED_SFX2_SOURCE_SIDEBAR_TABBAR_HXX
 
 #include <sfx2//dllapi.h>
-#include <sfx2/sidebar/DeckDescriptor.hxx>
 #include <sfx2/sidebar/ResourceManager.hxx>
 
 
+#include <vcl/button.hxx>
 #include <vcl/menu.hxx>
 #include <vcl/window.hxx>
 
-#include <com/sun/star/frame/XFrame.hpp>
-
 #include <functional>
 
-#include <svtools/acceleratorexecute.hxx>
-
-class Button;
-class CheckBox;
-class RadioButton;
+namespace svt { class AcceleratorExecute; }
 
 namespace sfx2 { namespace sidebar {
 
 class FocusManager;
-class TabBarConfiguration;
-class TabItem;
 class SidebarController;
 
 /** The tab bar is the container for the individual tabs.
diff --git a/include/sfx2/sidebar/TabItem.hxx b/include/sfx2/sidebar/TabItem.hxx
index ff39fb4e9cd6..2f4a3c979538 100644
--- a/include/sfx2/sidebar/TabItem.hxx
+++ b/include/sfx2/sidebar/TabItem.hxx
@@ -21,8 +21,6 @@
 
 #include <vcl/button.hxx>
 
-#include <sfx2/sidebar/DeckDescriptor.hxx>
-
 namespace vcl { class Window; }
 
 namespace sfx2 { namespace sidebar {
diff --git a/include/sfx2/sidebar/Theme.hxx b/include/sfx2/sidebar/Theme.hxx
index be3a7a2db1a7..16a4798cdf9f 100644
--- a/include/sfx2/sidebar/Theme.hxx
+++ b/include/sfx2/sidebar/Theme.hxx
@@ -26,7 +26,6 @@
 #include <cppuhelper/compbase.hxx>
 #include <cppuhelper/basemutex.hxx>
 #include <tools/gen.hxx>
-#include <rtl/ref.hxx>
 #include <vcl/wall.hxx>
 
 #include <com/sun/star/beans/XPropertySet.hpp>
@@ -34,8 +33,6 @@
 #include <map>
 #include <unordered_map>
 
-class SvBorder;
-
 
 namespace sfx2 { namespace sidebar {
 
diff --git a/include/sfx2/sidebar/TitleBar.hxx b/include/sfx2/sidebar/TitleBar.hxx
index 1812503732fb..2d83637888ae 100644
--- a/include/sfx2/sidebar/TitleBar.hxx
+++ b/include/sfx2/sidebar/TitleBar.hxx
@@ -21,7 +21,6 @@
 
 #include <sfx2/sidebar/Paint.hxx>
 
-#include <vcl/fixed.hxx>
 #include <sfx2/sidebar/SidebarToolBox.hxx>
 
 namespace sfx2 { namespace sidebar {
diff --git a/include/sfx2/sidebar/Tools.hxx b/include/sfx2/sidebar/Tools.hxx
index 854de39e62da..97b26c368dd9 100644
--- a/include/sfx2/sidebar/Tools.hxx
+++ b/include/sfx2/sidebar/Tools.hxx
@@ -21,15 +21,16 @@
 
 #include <vcl/image.hxx>
 #include <vcl/gradient.hxx>
-#include <tools/svborder.hxx>
 
 #include <sfx2/dllapi.h>
 
 #include <com/sun/star/awt/Gradient.hpp>
-#include <com/sun/star/frame/XDispatch.hpp>
-#include <com/sun/star/frame/XFrame.hpp>
 #include <com/sun/star/util/URL.hpp>
 
+namespace com::sun::star::frame { class XController; }
+namespace com::sun::star::frame { class XDispatch; }
+namespace com::sun::star::frame { class XFrame; }
+
 
 namespace sfx2 { namespace sidebar {
 
diff --git a/include/sfx2/sidebar/UnoDeck.hxx b/include/sfx2/sidebar/UnoDeck.hxx
index b0e82e63f1da..bf1865c9e06e 100644
--- a/include/sfx2/sidebar/UnoDeck.hxx
+++ b/include/sfx2/sidebar/UnoDeck.hxx
@@ -13,14 +13,15 @@
 
 
 #include <com/sun/star/ui/XDeck.hpp>
-#include <com/sun/star/frame/XFrame.hpp>
-#include <com/sun/star/ui/XPanels.hpp>
 
-#include <cppuhelper/compbase.hxx>
+#include <cppuhelper/implbase.hxx>
 
-#include <sfx2/sidebar/SidebarController.hxx>
 #include <sfx2/sidebar/ResourceManager.hxx>
 
+namespace com::sun::star::frame { class XFrame; }
+namespace com::sun::star::ui { class XPanels; }
+namespace sfx2 { namespace sidebar { class SidebarController; } }
+
 /** get the decks
 */
 class SfxUnoDeck : public cppu::WeakImplHelper<css::ui::XDeck>
diff --git a/include/sfx2/sidebar/UnoDecks.hxx b/include/sfx2/sidebar/UnoDecks.hxx
index 3f7c623283e0..1e93d8d1e07c 100644
--- a/include/sfx2/sidebar/UnoDecks.hxx
+++ b/include/sfx2/sidebar/UnoDecks.hxx
@@ -14,14 +14,10 @@
 
 #include <com/sun/star/ui/XDecks.hpp>
 
-#include <com/sun/star/container/XIndexAccess.hpp>
-#include <com/sun/star/container/XNameAccess.hpp>
-#include <com/sun/star/frame/XFrame.hpp>
+#include <cppuhelper/implbase.hxx>
 
-#include <cppuhelper/compbase.hxx>
-
-#include <sfx2/sidebar/SidebarController.hxx>
-#include <sfx2/sidebar/ResourceManager.hxx>
+namespace com::sun::star::frame { class XFrame; }
+namespace sfx2 { namespace sidebar { class SidebarController; } }
 
 /** get the decks
 */
diff --git a/include/sfx2/sidebar/UnoPanel.hxx b/include/sfx2/sidebar/UnoPanel.hxx
index b77a0ab0fcec..17c25b10e6ef 100644
--- a/include/sfx2/sidebar/UnoPanel.hxx
+++ b/include/sfx2/sidebar/UnoPanel.hxx
@@ -12,17 +12,18 @@
 #define INCLUDED_SFX2_SIDEBAR_UNOPANEL_HXX
 
 #include <com/sun/star/ui/XPanel.hpp>
-#include <com/sun/star/frame/XFrame.hpp>
-#include <com/sun/star/awt/XWindow.hpp>
 
 
-#include <cppuhelper/compbase.hxx>
+#include <cppuhelper/implbase.hxx>
 
-#include <sfx2/sidebar/SidebarController.hxx>
 #include <sfx2/sidebar/Panel.hxx>
 #include <sfx2/sidebar/Deck.hxx>
 #include <sfx2/sidebar/ResourceManager.hxx>
 
+namespace com::sun::star::awt { class XWindow; }
+namespace com::sun::star::frame { class XFrame; }
+namespace sfx2 { namespace sidebar { class SidebarController; } }
+
 
 /** get the Panel
 */
diff --git a/include/sfx2/sidebar/UnoPanels.hxx b/include/sfx2/sidebar/UnoPanels.hxx
index 71aa7d0431bd..aa2ecaeade10 100644
--- a/include/sfx2/sidebar/UnoPanels.hxx
+++ b/include/sfx2/sidebar/UnoPanels.hxx
@@ -13,13 +13,10 @@
 
 #include <com/sun/star/ui/XPanels.hpp>
 
-#include <com/sun/star/container/XIndexAccess.hpp>
-#include <com/sun/star/container/XNameAccess.hpp>
-#include <com/sun/star/frame/XFrame.hpp>
+#include <cppuhelper/implbase.hxx>
 
-#include <cppuhelper/compbase.hxx>
-
-#include <sfx2/sidebar/SidebarController.hxx>
+namespace com::sun::star::frame { class XFrame; }
+namespace sfx2 { namespace sidebar { class SidebarController; } }
 
 /** get the decks
 */
diff --git a/include/sfx2/sidebar/UnoSidebar.hxx b/include/sfx2/sidebar/UnoSidebar.hxx
index a60143b65f94..5b67554cbf21 100644
--- a/include/sfx2/sidebar/UnoSidebar.hxx
+++ b/include/sfx2/sidebar/UnoSidebar.hxx
@@ -11,20 +11,14 @@
 #ifndef INCLUDED_SFX2_SIDEBAR_SIDEBAR_HXX
 #define INCLUDED_SFX2_SIDEBAR_SIDEBAR_HXX
 
-#include <sfx2/dllapi.h>
-#include <com/sun/star/frame/XFrame.hpp>
 #include <com/sun/star/ui/XSidebarProvider.hpp>
-#include <com/sun/star/ui/XSidebar.hpp>
 
-#include <com/sun/star/awt/XWindow2.hpp>
+#include <cppuhelper/implbase.hxx>
 
-#include <cppuhelper/compbase.hxx>
-
-#include <sfx2/sidebar/SidebarController.hxx>
-#include <sfx2/sidebar/SidebarDockingWindow.hxx>
-
-#include <sfx2/sidebar/UnoDecks.hxx>
-#include <com/sun/star/ui/XDecks.hpp>
+namespace com::sun::star::frame { class XFrame; }
+namespace com::sun::star::ui { class XDecks; }
+namespace com::sun::star::ui { class XSidebar; }
+namespace sfx2 { namespace sidebar { class SidebarController; } }
 
 /** get the sidebar for a given frame
 */