removed unnecessary forward declarations of class

except
* sd::ViewTabBar moved to ViewShellBase.hxx
* sd::TemplateEntry moved to AllMasterPageSelector.hxx

Change-Id: I802cdc0b77027bbe0843fbb259ce1a5a46354fc3

55 files changed, 5 insertions, 158 deletions

diff --git a/sd/inc/CustomAnimationEffect.hxx b/sd/inc/CustomAnimationEffect.hxx
index 860db64d4632..458bba4f98b5 100644
--- a/sd/inc/CustomAnimationEffect.hxx
+++ b/sd/inc/CustomAnimationEffect.hxx
@@ -55,7 +55,6 @@ namespace sd {
 enum EValue { VALUE_FROM, VALUE_TO, VALUE_BY, VALUE_FIRST, VALUE_LAST };
 
 class CustomAnimationEffect;
-class AnimationTrigger;
 
 class CustomAnimationPreset;
 typedef boost::shared_ptr< CustomAnimationPreset > CustomAnimationPresetPtr;
diff --git a/sd/inc/Outliner.hxx b/sd/inc/Outliner.hxx
index 805b1ef1516e..81497875d26e 100644
--- a/sd/inc/Outliner.hxx
+++ b/sd/inc/Outliner.hxx
@@ -40,16 +40,12 @@
 #include <boost/noncopyable.hpp>
 
 class Dialog;
-class SdPage;
 class SdrObject;
 class SdrTextObj;
 class SdDrawDocument;
-class SfxStyleSheetPool;
-class SdrObjListIter;
 
 namespace sd {
 
-class DrawViewShell;
 class View;
 class ViewShell;
 class Window;
diff --git a/sd/inc/OutlinerIterator.hxx b/sd/inc/OutlinerIterator.hxx
index b60ff2d160ca..87e1ab9ca2c1 100644
--- a/sd/inc/OutlinerIterator.hxx
+++ b/sd/inc/OutlinerIterator.hxx
@@ -33,7 +33,6 @@ namespace sd {
 
 class ViewShell;
 class Outliner;
-class View;
 
 namespace outliner {
 
diff --git a/sd/inc/anminfo.hxx b/sd/inc/anminfo.hxx
index e2d6c07005e7..7379c4cac3d8 100644
--- a/sd/inc/anminfo.hxx
+++ b/sd/inc/anminfo.hxx
@@ -29,13 +29,8 @@
 #include <tools/color.hxx>
 #include <sddllapi.h>
 
-class Polygon;
-class Point;
-class SvStream;
-class SdrObjSurrogate;
 class SdrObject;
 class SdrPathObj;
-class SdDrawDocument;
 
 class SdAnimationInfo : public SdrObjUserData
 {
diff --git a/sd/inc/drawdoc.hxx b/sd/inc/drawdoc.hxx
index b8026e3abe45..5063f4bab29b 100644
--- a/sd/inc/drawdoc.hxx
+++ b/sd/inc/drawdoc.hxx
@@ -54,14 +54,6 @@ namespace com
     {
         namespace star
         {
-            namespace embed
-            {
-                class XStorage;
-            }
-            namespace io
-            {
-                class XStream;
-            }
             namespace presentation
             {
                 class XPresentation2;
@@ -79,7 +71,6 @@ namespace sd
 
 class Timer;
 class SfxObjectShell;
-class SdDrawDocShell;
 class SdPage;
 class SdAnimationInfo;
 class SdIMapInfo;
@@ -87,9 +78,7 @@ class IMapObject;
 class SdStyleSheetPool;
 class SfxMedium;
 class SvxSearchItem;
-class SdrOle2Obj;
 class EditStatus;
-class Graphic;
 class Point;
 class Window;
 class SdTransferable;
diff --git a/sd/inc/sdabstdlg.hxx b/sd/inc/sdabstdlg.hxx
index 95ae85d799e3..f009214da796 100644
--- a/sd/inc/sdabstdlg.hxx
+++ b/sd/inc/sdabstdlg.hxx
@@ -51,12 +51,7 @@ namespace sd {
     class DrawView;
 }
 
-class SfxTabPage;
-class SfxViewFrame;
-class SfxBindings;
-class ResId;
 class String;
-class SfxItemPool;
 class SfxObjectShell;
 class SfxObjectShellLock;
 class SvxFieldData;
diff --git a/sd/inc/sddll.hxx b/sd/inc/sddll.hxx
index 642d655418db..838630587d98 100644
--- a/sd/inc/sddll.hxx
+++ b/sd/inc/sddll.hxx
@@ -32,12 +32,6 @@
 #include <sfx2/module.hxx>
 #include <sfx2/sfxdefs.hxx>
 
-class SvFactory;
-class SotFactory;
-class SfxMedium;
-class SfxFilter;
-
-
 /*************************************************************************
 |*
 |* This class is a wrapper for a Load-On-Demand-DLL. One instance
diff --git a/sd/inc/sdfilter.hxx b/sd/inc/sdfilter.hxx
index abedb41a5b8d..1f3ea8024930 100644
--- a/sd/inc/sdfilter.hxx
+++ b/sd/inc/sdfilter.hxx
@@ -35,7 +35,6 @@ namespace sd {
 class DrawDocShell;
 }
 class SdDrawDocument;
-class SfxProgress;
 namespace osl { class Module; }
 
 class SdFilter
diff --git a/sd/inc/sdgrffilter.hxx b/sd/inc/sdgrffilter.hxx
index 1a0a16e911f6..f6eddc070261 100644
--- a/sd/inc/sdgrffilter.hxx
+++ b/sd/inc/sdgrffilter.hxx
@@ -25,8 +25,6 @@
 #include <tools/errinf.hxx>
 #include "sdfilter.hxx"
 
-class Graphic;
-
 // ---------------
 // - SdCGMFilter -
 // ---------------
diff --git a/sd/inc/sdmod.hxx b/sd/inc/sdmod.hxx
index c6f5900042f5..234143510244 100644
--- a/sd/inc/sdmod.hxx
+++ b/sd/inc/sdmod.hxx
@@ -34,17 +34,12 @@
 #include <memory>
 
 class SdOptions;
-class BasicIDE;
 class SvxSearchItem;
-class SdAppLinkHdl;
-class SvxErrorHandler;
 class EditFieldInfo;
-class SvFactory;
 class SdTransferable;
 class SvNumberFormatter;
 class SfxErrorHandler;
 class OutputDevice;
-class SdPage;
 class SdDrawDocument;
 class SfxFrame;
 
diff --git a/sd/inc/undo/undoobjects.hxx b/sd/inc/undo/undoobjects.hxx
index 1bca0eb994aa..f615af64bc9b 100644
--- a/sd/inc/undo/undoobjects.hxx
+++ b/sd/inc/undo/undoobjects.hxx
@@ -30,8 +30,6 @@ class SdPage;
 
 namespace sd
 {
-    class UndoManager;
-
 ///////////////////////////////////////////////////////////////////////
 
 class UndoRemovePresObjectImpl
diff --git a/sd/source/ui/animations/CustomAnimationPane.hxx b/sd/source/ui/animations/CustomAnimationPane.hxx
index 0b59daf8b511..c8b9ffc7a1b7 100644
--- a/sd/source/ui/animations/CustomAnimationPane.hxx
+++ b/sd/source/ui/animations/CustomAnimationPane.hxx
@@ -47,7 +47,6 @@ class FixedText;
 class ListBox;
 class ComboBox;
 class CheckBox;
-class SdDrawDocument;
 
 namespace com { namespace sun { namespace star { namespace animations {
     class XAnimationNode;
diff --git a/sd/source/ui/animations/SlideTransitionPane.hxx b/sd/source/ui/animations/SlideTransitionPane.hxx
index e5db4fba8751..20d12bb656f9 100644
--- a/sd/source/ui/animations/SlideTransitionPane.hxx
+++ b/sd/source/ui/animations/SlideTransitionPane.hxx
@@ -44,7 +44,6 @@
 #include <map>
 
 class SdDrawDocument;
-class SdPage;
 
 namespace sd
 {
diff --git a/sd/source/ui/annotations/annotationwindow.hxx b/sd/source/ui/annotations/annotationwindow.hxx
index da49c763c41d..12e70afd6050 100644
--- a/sd/source/ui/annotations/annotationwindow.hxx
+++ b/sd/source/ui/annotations/annotationwindow.hxx
@@ -43,11 +43,8 @@
 class OutlinerView;
 class Outliner;
 class ScrollBar;
-class Edit;
 class MultiLineEdit;
-class PopupMenu;
 class SvxLanguageItem;
-class OutlinerParaObject;
 class SdDrawDocument;
 
 namespace sd {
diff --git a/sd/source/ui/dlg/sddlgfact.hxx b/sd/source/ui/dlg/sddlgfact.hxx
index c06200edaabb..31f8e5ecc6c5 100644
--- a/sd/source/ui/dlg/sddlgfact.hxx
+++ b/sd/source/ui/dlg/sddlgfact.hxx
@@ -219,7 +219,6 @@ class AbstractSdPresLayoutDlg_Impl : public AbstractSdPresLayoutDlg
 };
 
 // add for SdActionDlg
-class SfxSingleTabDialog;
 class AbstractSfxDialog_Impl : public SfxAbstractDialog
 {
     DECL_ABSTDLG_BASE(AbstractSfxDialog_Impl,SfxModalDialog)
diff --git a/sd/source/ui/framework/factories/ChildWindowPane.hxx b/sd/source/ui/framework/factories/ChildWindowPane.hxx
index 5a41bd62cea5..b95c7f83ba98 100644
--- a/sd/source/ui/framework/factories/ChildWindowPane.hxx
+++ b/sd/source/ui/framework/factories/ChildWindowPane.hxx
@@ -40,8 +40,6 @@ typedef ::cppu::ImplInheritanceHelper1 <
 } // end of anonymous namespace.
 
 
-class SfxViewFrame;
-
 namespace sd { class ViewShellBase; }
 
 namespace sd { namespace framework {
diff --git a/sd/source/ui/framework/module/ToolPanelModule.hxx b/sd/source/ui/framework/module/ToolPanelModule.hxx
index 0e664b786e62..90b78fa5b366 100644
--- a/sd/source/ui/framework/module/ToolPanelModule.hxx
+++ b/sd/source/ui/framework/module/ToolPanelModule.hxx
@@ -26,8 +26,6 @@
 
 namespace sd { namespace framework {
 
-class ReadOnlyModeObserver;
-
 /** This module is responsible for showing the task pane.
 */
 class ToolPanelModule
diff --git a/sd/source/ui/inc/DrawDocShell.hxx b/sd/source/ui/inc/DrawDocShell.hxx
index 0083f53ec9bc..9f5c34848a33 100644
--- a/sd/source/ui/inc/DrawDocShell.hxx
+++ b/sd/source/ui/inc/DrawDocShell.hxx
@@ -40,11 +40,8 @@
 #include "fupoor.hxx"
 
 class SfxStyleSheetBasePool;
-class SfxStatusBarManager;
-class SdStyleSheetPool;
 class FontList;
 class SdDrawDocument;
-class SvxItemFactory;
 class SdPage;
 class SfxPrinter;
 struct SpellCallbackInfo;
@@ -54,7 +51,6 @@ class SfxUndoManager;
 namespace sd {
 
 class FrameView;
-class View;
 class ViewShell;
 
 // ------------------
diff --git a/sd/source/ui/inc/DrawViewShell.hxx b/sd/source/ui/inc/DrawViewShell.hxx
index 57b32386ada5..738409128807 100644
--- a/sd/source/ui/inc/DrawViewShell.hxx
+++ b/sd/source/ui/inc/DrawViewShell.hxx
@@ -41,8 +41,6 @@
 
 class SdPage;
 class DrawDocShell;
-class SdAnimationWin;
-class SdRuler;
 class TabBar;
 class SdrObject;
 class SdrPageView;
@@ -57,7 +55,6 @@ namespace sd {
 class DrawView;
 class LayerTabBar;
 class Ruler;
-class SdUnoDrawView;
 class AnnotationManager;
 class ViewOverlayManager;
 
diff --git a/sd/source/ui/inc/SdUnoOutlineView.hxx b/sd/source/ui/inc/SdUnoOutlineView.hxx
index b4b53c2c601a..1c812be81b74 100644
--- a/sd/source/ui/inc/SdUnoOutlineView.hxx
+++ b/sd/source/ui/inc/SdUnoOutlineView.hxx
@@ -25,8 +25,6 @@
 #include <com/sun/star/lang/EventObject.hpp>
 
 
-class SdPage;
-
 namespace css = ::com::sun::star;
 
 namespace sd {
diff --git a/sd/source/ui/inc/SdUnoSlideView.hxx b/sd/source/ui/inc/SdUnoSlideView.hxx
index ea5d9b0ecbee..8264522de3fb 100644
--- a/sd/source/ui/inc/SdUnoSlideView.hxx
+++ b/sd/source/ui/inc/SdUnoSlideView.hxx
@@ -39,10 +39,6 @@ namespace sd { namespace slidesorter {
 class SlideSorter;
 } }
 
-namespace sd { namespace slidesorter { namespace controller {
-class PageSelector;
-} } }
-
 namespace sd {
 
 class DrawController;
diff --git a/sd/source/ui/inc/TextObjectBar.hxx b/sd/source/ui/inc/TextObjectBar.hxx
index 878cead0bede..c7421dd30c56 100644
--- a/sd/source/ui/inc/TextObjectBar.hxx
+++ b/sd/source/ui/inc/TextObjectBar.hxx
@@ -31,7 +31,6 @@ namespace sd {
 
 class View;
 class ViewShell;
-class Window;
 
 class TextObjectBar
     : public SfxShell
diff --git a/sd/source/ui/inc/View.hxx b/sd/source/ui/inc/View.hxx
index 7c3fa7d7390d..ca6b4fe12fc5 100644
--- a/sd/source/ui/inc/View.hxx
+++ b/sd/source/ui/inc/View.hxx
@@ -46,7 +46,6 @@ class SdrOle2Obj;
 class SdrGrafObj;
 class SdrMediaObj;
 class OutputDevice;
-class VirtualDevice;
 class ImageMap;
 class Point;
 class Graphic;
diff --git a/sd/source/ui/inc/ViewShell.hxx b/sd/source/ui/inc/ViewShell.hxx
index 58fc6af21911..e1a2b79e48c6 100644
--- a/sd/source/ui/inc/ViewShell.hxx
+++ b/sd/source/ui/inc/ViewShell.hxx
@@ -52,9 +52,6 @@ class SdrOle2Obj;       // fuer die, die Teile von SVDRAW rausdefiniert haben
 class ScrollBarBox;
 class SdDrawDocument;
 class ScrollBar;
-class FmFormShell;
-class SdOptionsPrintItem;
-class MultiSelection;
 
 extern const String aEmptyStr;
 
@@ -67,17 +64,11 @@ namespace css = ::com::sun::star;
 
 namespace sd {
 
-class Client;
 class DrawDocShell;
-class DrawSubController;
 class FrameView;
-class FuPoor;
-class FuSearch;
-class SlideShow;
 class LayerTabBar;
 class View;
 class ViewShellBase;
-class ViewTabBar;
 class Window;
 class WindowUpdater;
 class ZoomList;
diff --git a/sd/source/ui/inc/ViewShellBase.hxx b/sd/source/ui/inc/ViewShellBase.hxx
index 6c6ee69dbb13..4dbbbf9559f5 100644
--- a/sd/source/ui/inc/ViewShellBase.hxx
+++ b/sd/source/ui/inc/ViewShellBase.hxx
@@ -57,6 +57,7 @@ class FormShellManager;
 class ToolBarManager;
 class ViewShell;
 class ViewShellManager;
+class ViewTabBar;
 
 /** SfxViewShell descendant that the stacked Draw/Impress shells are
     based on.
diff --git a/sd/source/ui/inc/ViewShellImplementation.hxx b/sd/source/ui/inc/ViewShellImplementation.hxx
index 0efa987180f8..2fa57d3298e6 100644
--- a/sd/source/ui/inc/ViewShellImplementation.hxx
+++ b/sd/source/ui/inc/ViewShellImplementation.hxx
@@ -42,8 +42,6 @@ class SvxIMapDlg;
 
 namespace sd {
 
-class DrawController;
-
 /** This class contains (will contain) the implementation of methods that
     have not be accessible from the outside.
 */
diff --git a/sd/source/ui/inc/bulmaper.hxx b/sd/source/ui/inc/bulmaper.hxx
index 6b9eb3b50ef0..a7ffa117dd99 100644
--- a/sd/source/ui/inc/bulmaper.hxx
+++ b/sd/source/ui/inc/bulmaper.hxx
@@ -32,8 +32,6 @@
 #include <sddllapi.h>
 
 class SfxItemSet;
-class SvxBulletItem;
-class SvxNumberFormat;
 class SvxNumRule;
 
 class SD_DLLPUBLIC SdBulletMapper
diff --git a/sd/source/ui/inc/celltempl.hxx b/sd/source/ui/inc/celltempl.hxx
index 621c7507541f..1abf4b8026e6 100644
--- a/sd/source/ui/inc/celltempl.hxx
+++ b/sd/source/ui/inc/celltempl.hxx
@@ -31,10 +31,6 @@
 
 #include <sfx2/styledlg.hxx>
 
-class XColorList;
-class XGradientList;
-class XHatchList;
-class XBitmapList;
 class SfxStyleSheetBase;
 class SdrModel;
 
diff --git a/sd/source/ui/inc/copydlg.hxx b/sd/source/ui/inc/copydlg.hxx
index c327e1e00224..2cbbc69ae378 100644
--- a/sd/source/ui/inc/copydlg.hxx
+++ b/sd/source/ui/inc/copydlg.hxx
@@ -36,8 +36,6 @@
 #include <vcl/fixed.hxx>
 #include <sfx2/basedlgs.hxx>
 
-class XColorList;
-
 namespace sd {
 
 class View;
diff --git a/sd/source/ui/inc/dlgpage.hxx b/sd/source/ui/inc/dlgpage.hxx
index 1b7e8de35862..713e620ec4ce 100644
--- a/sd/source/ui/inc/dlgpage.hxx
+++ b/sd/source/ui/inc/dlgpage.hxx
@@ -34,10 +34,6 @@
 #include "dlgpage.hrc"
 
 class SfxObjectShell;
-class XColorList;
-class XGradientList;
-class XHatchList;
-class XBitmapList;
 
 typedef sal_uInt16 ChangeType;
 
diff --git a/sd/source/ui/inc/drawview.hxx b/sd/source/ui/inc/drawview.hxx
index 5e79daa50a2d..a2b27c3703b8 100644
--- a/sd/source/ui/inc/drawview.hxx
+++ b/sd/source/ui/inc/drawview.hxx
@@ -27,8 +27,6 @@ namespace sd {
 
 class DrawDocShell;
 class DrawViewShell;
-class FuSlideShow;
-class SlideShow;
 
 #define SDDRAWVIEW_MAGIC  0x456789BA
 
diff --git a/sd/source/ui/inc/framework/ConfigurationController.hxx b/sd/source/ui/inc/framework/ConfigurationController.hxx
index ad60b1d23415..93c73fcc8e7a 100644
--- a/sd/source/ui/inc/framework/ConfigurationController.hxx
+++ b/sd/source/ui/inc/framework/ConfigurationController.hxx
@@ -56,11 +56,6 @@ namespace sd { class ViewShellBase; }
 
 namespace sd { namespace framework {
 
-class ChangeRequestQueueProcessor;
-class ConfigurationControllerBroadcaster;
-class ConfigurationUpdater;
-class ConfigurationUpdaterLock;
-
 /** The configuration controller is responsible for maintaining the current
     configuration.
 
diff --git a/sd/source/ui/inc/fuconbez.hxx b/sd/source/ui/inc/fuconbez.hxx
index 17de46f41aa8..de9786c85503 100644
--- a/sd/source/ui/inc/fuconbez.hxx
+++ b/sd/source/ui/inc/fuconbez.hxx
@@ -36,8 +36,6 @@ class SdDrawDocument;
 
 namespace sd {
 
-class DrawView;
-class DrawViewShell;
 class Window;
 
 
diff --git a/sd/source/ui/inc/fuconcs.hxx b/sd/source/ui/inc/fuconcs.hxx
index 258fb2109551..351b4a99c787 100644
--- a/sd/source/ui/inc/fuconcs.hxx
+++ b/sd/source/ui/inc/fuconcs.hxx
@@ -34,8 +34,6 @@
 class KeyEvent;
 class SdDrawDocument;
 class SdrObject;
-class SdxRequest;
-class SfxItemSet;
 
 namespace sd {
 
diff --git a/sd/source/ui/inc/fuprlout.hxx b/sd/source/ui/inc/fuprlout.hxx
index d1bb005d19b0..80b37af7f40d 100644
--- a/sd/source/ui/inc/fuprlout.hxx
+++ b/sd/source/ui/inc/fuprlout.hxx
@@ -24,7 +24,6 @@
 
 class SdDrawDocument;
 class SfxRequest;
-class SfxStyleSheetBasePool;
 
 namespace sd {
 
diff --git a/sd/source/ui/inc/futext.hxx b/sd/source/ui/inc/futext.hxx
index 290a43ebff80..6a654117d2d4 100644
--- a/sd/source/ui/inc/futext.hxx
+++ b/sd/source/ui/inc/futext.hxx
@@ -35,7 +35,6 @@
 
 struct StyleRequestData;
 class SdrTextObj;
-class OutlinerParaObject;
 class FontList;
 class OutlinerView;
 
diff --git a/sd/source/ui/inc/headerfooterdlg.hxx b/sd/source/ui/inc/headerfooterdlg.hxx
index 9439160bad61..53dea9e21ec4 100644
--- a/sd/source/ui/inc/headerfooterdlg.hxx
+++ b/sd/source/ui/inc/headerfooterdlg.hxx
@@ -36,7 +36,6 @@
 #include "headerfooterdlg.hrc"
 #include "sdpage.hxx"
 
-class SfxObjectShell;
 class SdUndoGroup;
 
 namespace sd
diff --git a/sd/source/ui/inc/navigatr.hxx b/sd/source/ui/inc/navigatr.hxx
index 7ddee515c86e..4489da7c89a7 100644
--- a/sd/source/ui/inc/navigatr.hxx
+++ b/sd/source/ui/inc/navigatr.hxx
@@ -59,7 +59,6 @@
 namespace sd {
 class DrawDocShell;
 class NavigatorChildWindow;
-class View;
 }
 class Menu;
 class SdNavigatorControllerItem;
diff --git a/sd/source/ui/inc/optsitem.hxx b/sd/source/ui/inc/optsitem.hxx
index 0cd66e19004e..e9563df59d8e 100644
--- a/sd/source/ui/inc/optsitem.hxx
+++ b/sd/source/ui/inc/optsitem.hxx
@@ -56,7 +56,6 @@
 // - Forwards -
 // ------------
 
-class SfxConfigItem;
 class SdOptions;
 
 namespace sd {
diff --git a/sd/source/ui/inc/prltempl.hxx b/sd/source/ui/inc/prltempl.hxx
index eafa1a3fc1b0..7c49f3a27845 100644
--- a/sd/source/ui/inc/prltempl.hxx
+++ b/sd/source/ui/inc/prltempl.hxx
@@ -37,12 +37,6 @@
 #include "prlayout.hxx" // fuer enum PresentationObjects
 
 
-class XColorList;
-class XGradientList;
-class XHatchList;
-class XBitmapList;
-class XDashList;
-class XLineEndList;
 class SfxObjectShell;
 class SfxStyleSheetBase;
 class SfxStyleSheetBasePool;
diff --git a/sd/source/ui/inc/taskpane/ControlContainer.hxx b/sd/source/ui/inc/taskpane/ControlContainer.hxx
index 3d0ab36fdf63..db075e64585b 100644
--- a/sd/source/ui/inc/taskpane/ControlContainer.hxx
+++ b/sd/source/ui/inc/taskpane/ControlContainer.hxx
@@ -25,8 +25,6 @@
 #include <vector>
 #include <memory>
 
-class Window;
-
 namespace sd { namespace toolpanel {
 
 class TreeNode;
diff --git a/sd/source/ui/inc/taskpane/TaskPaneControlFactory.hxx b/sd/source/ui/inc/taskpane/TaskPaneControlFactory.hxx
index 619fe659e13f..298e58314724 100644
--- a/sd/source/ui/inc/taskpane/TaskPaneControlFactory.hxx
+++ b/sd/source/ui/inc/taskpane/TaskPaneControlFactory.hxx
@@ -24,10 +24,6 @@
 
 #include <memory>
 
-namespace sd {
-class ViewShellBase;
-}
-
 namespace sd { namespace toolpanel {
 class TreeNode;
 } }
diff --git a/sd/source/ui/inc/taskpane/TaskPaneTreeNode.hxx b/sd/source/ui/inc/taskpane/TaskPaneTreeNode.hxx
index 945ce7475d63..146e5050fbef 100644
--- a/sd/source/ui/inc/taskpane/TaskPaneTreeNode.hxx
+++ b/sd/source/ui/inc/taskpane/TaskPaneTreeNode.hxx
@@ -26,10 +26,6 @@
 #include <com/sun/star/accessibility/XAccessible.hpp>
 #include <tools/link.hxx>
 
-namespace sd {
-class ObjectBarManager;
-}
-
 namespace sd { namespace toolpanel {
 
 class ControlContainer;
diff --git a/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx b/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx
index 015f5ef4b65e..89a093169130 100644
--- a/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx
+++ b/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx
@@ -39,13 +39,8 @@ namespace com { namespace sun { namespace star { namespace ui {
 } } } }
 
 namespace sd {
-class PaneDockingWindow;
-
 namespace toolpanel {
 class TaskPaneShellManager;
-class TitleToolBox;
-class TitleBar;
-class TitledControl;
 class ToolPanelViewShell_Impl;
 /** The tool panel is a view shell for some very specific reasons:
     - It fits better into the concept of panes being docking windows whose
diff --git a/sd/source/ui/inc/unosrch.hxx b/sd/source/ui/inc/unosrch.hxx
index 9b44e84df4d2..caf5006052b7 100644
--- a/sd/source/ui/inc/unosrch.hxx
+++ b/sd/source/ui/inc/unosrch.hxx
@@ -31,7 +31,6 @@
 #include <editeng/editdata.hxx>
 #include <editeng/unoipset.hxx>
 
-class SdrObject;
 class SvxItemPropertySet;
 class SdUnoSearchReplaceDescriptor;
 
diff --git a/sd/source/ui/slideshow/showwindow.hxx b/sd/source/ui/slideshow/showwindow.hxx
index aec9926cd5ee..0df24852aaf5 100644
--- a/sd/source/ui/slideshow/showwindow.hxx
+++ b/sd/source/ui/slideshow/showwindow.hxx
@@ -46,8 +46,6 @@
 namespace sd {
 
 class SlideshowImpl;
-class PreviewWindow;
-class ViewShell;
 
 // -----------
 // - Defines -
diff --git a/sd/source/ui/toolpanel/LayoutMenu.hxx b/sd/source/ui/toolpanel/LayoutMenu.hxx
index 6f544defb313..82551292ed2a 100644
--- a/sd/source/ui/toolpanel/LayoutMenu.hxx
+++ b/sd/source/ui/toolpanel/LayoutMenu.hxx
@@ -46,7 +46,6 @@ class SfxModule;
 
 namespace sd {
 class DrawDocShell;
-class PaneManagerEvent;
 class ViewShellBase;
 }
 
diff --git a/sd/source/ui/toolpanel/ToolPanelUIElement.hxx b/sd/source/ui/toolpanel/ToolPanelUIElement.hxx
index c3f6e90199c1..ff0dfdaec08c 100644
--- a/sd/source/ui/toolpanel/ToolPanelUIElement.hxx
+++ b/sd/source/ui/toolpanel/ToolPanelUIElement.hxx
@@ -33,8 +33,6 @@ namespace sd { namespace toolpanel
 {
 //......................................................................................................................
 
-    class TreeNode;
-
     //==================================================================================================================
     //= ToolPanelUIElement
     //==================================================================================================================
diff --git a/sd/source/ui/toolpanel/controls/AllMasterPagesSelector.hxx b/sd/source/ui/toolpanel/controls/AllMasterPagesSelector.hxx
index 024f89d12f36..af01f2571a5b 100644
--- a/sd/source/ui/toolpanel/controls/AllMasterPagesSelector.hxx
+++ b/sd/source/ui/toolpanel/controls/AllMasterPagesSelector.hxx
@@ -24,6 +24,10 @@
 
 #include <memory>
 
+namespace sd {
+class TemplateEntry;
+}
+
 namespace sd { namespace toolpanel { namespace controls {
 
 
diff --git a/sd/source/ui/toolpanel/controls/CustomAnimationPanel.hxx b/sd/source/ui/toolpanel/controls/CustomAnimationPanel.hxx
index 8181bc64abd4..cb47272a1fab 100644
--- a/sd/source/ui/toolpanel/controls/CustomAnimationPanel.hxx
+++ b/sd/source/ui/toolpanel/controls/CustomAnimationPanel.hxx
@@ -22,10 +22,6 @@
 
 #include "taskpane/SubToolPanel.hxx"
 
-namespace sd {
-class ViewShellBase;
-}
-
 namespace sd { namespace toolpanel {
 class TreeNode;
 class ControlFactory;
diff --git a/sd/source/ui/toolpanel/controls/MasterPageContainer.hxx b/sd/source/ui/toolpanel/controls/MasterPageContainer.hxx
index ece2db1b4ac1..68939582bb6a 100644
--- a/sd/source/ui/toolpanel/controls/MasterPageContainer.hxx
+++ b/sd/source/ui/toolpanel/controls/MasterPageContainer.hxx
@@ -34,12 +34,6 @@
 #include <boost/shared_ptr.hpp>
 
 class SdPage;
-class SdDrawDocument;
-class SfxObjectShellLock;
-
-namespace sd {
-class DrawDocShell;
-}
 
 namespace sd { namespace toolpanel { namespace controls {
 
diff --git a/sd/source/ui/toolpanel/controls/MasterPagesSelector.hxx b/sd/source/ui/toolpanel/controls/MasterPagesSelector.hxx
index 74a549172e60..b69a0f6f5ec5 100644
--- a/sd/source/ui/toolpanel/controls/MasterPagesSelector.hxx
+++ b/sd/source/ui/toolpanel/controls/MasterPagesSelector.hxx
@@ -44,12 +44,8 @@
 class MouseEvent;
 class SdDrawDocument;
 class SdPage;
-class SfxModule;
 
 namespace sd {
-class DrawViewShell;
-class TemplateEntry;
-class TemplateDir;
 class ViewShellBase;
 }
 
diff --git a/sd/source/ui/toolpanel/controls/RecentlyUsedMasterPages.hxx b/sd/source/ui/toolpanel/controls/RecentlyUsedMasterPages.hxx
index 291a2c796dac..4d43ae3e784f 100644
--- a/sd/source/ui/toolpanel/controls/RecentlyUsedMasterPages.hxx
+++ b/sd/source/ui/toolpanel/controls/RecentlyUsedMasterPages.hxx
@@ -30,8 +30,6 @@
 #include "MasterPageContainer.hxx"
 #include <com/sun/star/uno/XInterface.hpp>
 
-class SdPage;
-
 namespace sd {
 class MasterPageObserverEvent;
 }
diff --git a/sd/source/ui/toolpanel/controls/SlideTransitionPanel.hxx b/sd/source/ui/toolpanel/controls/SlideTransitionPanel.hxx
index df152b81738c..a3671c3d68d0 100644
--- a/sd/source/ui/toolpanel/controls/SlideTransitionPanel.hxx
+++ b/sd/source/ui/toolpanel/controls/SlideTransitionPanel.hxx
@@ -21,10 +21,6 @@
 
 #include "taskpane/SubToolPanel.hxx"
 
-namespace sd {
-class ViewShellBase;
-}
-
 namespace sd { namespace toolpanel {
 class ControlFactory;
 class TreeNode;
diff --git a/sd/source/ui/toolpanel/controls/TableDesignPanel.hxx b/sd/source/ui/toolpanel/controls/TableDesignPanel.hxx
index ce5f4d3b5b9a..82e862d0a0a6 100644
--- a/sd/source/ui/toolpanel/controls/TableDesignPanel.hxx
+++ b/sd/source/ui/toolpanel/controls/TableDesignPanel.hxx
@@ -22,10 +22,6 @@
 
 #include "taskpane/SubToolPanel.hxx"
 
-namespace sd {
-class ViewShellBase;
-}
-
 namespace sd { namespace toolpanel {
 class TreeNode;
 class ControlFactory;