removed unnecessary forward declarations of class

except moving 'class SfxStringItem' to cui/source/inc/acccfg.hxx

Change-Id: I11d3803ebcfa02658d376bacf28b3d6030ee9d1b

68 files changed, 1 insertions, 159 deletions

diff --git a/avmedia/source/viewer/mediaevent_impl.hxx b/avmedia/source/viewer/mediaevent_impl.hxx
index 9f282a90688f..048e6bd7265d 100644
--- a/avmedia/source/viewer/mediaevent_impl.hxx
+++ b/avmedia/source/viewer/mediaevent_impl.hxx
@@ -43,9 +43,6 @@ namespace avmedia
         // ---------------------------
         // - MediaEventListenersImpl -
         // ---------------------------
-
-        class MediaWindowImpl;
-
         class MediaEventListenersImpl : public ::cppu::WeakImplHelper4< ::com::sun::star::awt::XKeyListener,
                                                                         ::com::sun::star::awt::XMouseListener,
                                                                         ::com::sun::star::awt::XMouseMotionListener,
diff --git a/cui/source/customize/eventdlg.hxx b/cui/source/customize/eventdlg.hxx
index 0f04204705d8..c68bcf634226 100644
--- a/cui/source/customize/eventdlg.hxx
+++ b/cui/source/customize/eventdlg.hxx
@@ -27,10 +27,6 @@
 
 #include <com/sun/star/frame/XFrame.hpp>
 
-class Menu;
-class SfxMacroInfoItem;
-class SvxMacroItem;
-
 class SvxEventConfigPage : public _SvxMacroTabPage
 {
     FixedText                           aSaveInText;
diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx
index 024300bd4767..0a9c5beba5b9 100644
--- a/cui/source/factory/dlgfact.hxx
+++ b/cui/source/factory/dlgfact.hxx
@@ -43,7 +43,6 @@ class FmShowColsDialog;
 class SvxZoomDialog;
 class FmInputRecordNoDialog;
 class SvxJSearchOptionsDialog;
-class FmFormShell;
 class SvxNewDictionaryDialog;
 class SvxNameDialog;
 
diff --git a/cui/source/inc/SpellDialog.hxx b/cui/source/inc/SpellDialog.hxx
index fc6448e9f8ff..b3152c68ff8e 100644
--- a/cui/source/inc/SpellDialog.hxx
+++ b/cui/source/inc/SpellDialog.hxx
@@ -54,9 +54,6 @@
 
 #include <set>
 
-class ScrollBar;
-class TextEngine;
-class ExtTextView;
 namespace svx{ class SpellUndoAction_Impl;}
 
 // forward ---------------------------------------------------------------
diff --git a/cui/source/inc/acccfg.hxx b/cui/source/inc/acccfg.hxx
index 1cfdc81f36a2..7562366541f6 100644
--- a/cui/source/inc/acccfg.hxx
+++ b/cui/source/inc/acccfg.hxx
@@ -62,6 +62,7 @@ class SfxMacroInfoItem;
 class SfxConfigGroupListBox_Impl;
 class SfxConfigFunctionListBox_Impl;
 class SfxAcceleratorConfigPage;
+class SfxStringItem;
 
 class SfxAccCfgTabListBox_Impl : public SvTabListBox
 {
diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx
index ee2798a74012..7fab79e9276c 100644
--- a/cui/source/inc/autocdlg.hxx
+++ b/cui/source/inc/autocdlg.hxx
@@ -36,7 +36,6 @@
 #include <vcl/metric.hxx>
 #include <svx/langbox.hxx>
 
-class SvxAutoCorrect;
 class CharClass;
 class CollatorWrapper;
 class SmartTagMgr;
diff --git a/cui/source/inc/cfgutil.hxx b/cui/source/inc/cfgutil.hxx
index 174bc53e9f08..9043ea62f76a 100644
--- a/cui/source/inc/cfgutil.hxx
+++ b/cui/source/inc/cfgutil.hxx
@@ -44,13 +44,7 @@
 #include <svtools/svtreebx.hxx>
 #include <vcl/image.hxx>
 
-class BasicManager;
-class SfxSlotPool;
-class SfxStringItem;
-class SfxFontItem;
 class SfxMacroInfoItem;
-struct SfxStyleInfo_Impl;
-struct SfxStylesInfo_Impl;
 
 namespace css = ::com::sun::star;
 
diff --git a/cui/source/inc/cuicharmap.hxx b/cui/source/inc/cuicharmap.hxx
index 070c7499d4f2..537a0e134b64 100644
--- a/cui/source/inc/cuicharmap.hxx
+++ b/cui/source/inc/cuicharmap.hxx
@@ -48,7 +48,6 @@ class SvxCharMapData;
 namespace svx
 {
     struct SvxShowCharSetItem;
-    class SvxShowCharSetVirtualAcc;
 }
 // class SvxCharacterMap -------------------------------------------------
 // the main purpose of this dialog is to enable the use of characters
diff --git a/cui/source/inc/cuigaldlg.hxx b/cui/source/inc/cuigaldlg.hxx
index 77e94a981050..f0d2581b3ba4 100644
--- a/cui/source/inc/cuigaldlg.hxx
+++ b/cui/source/inc/cuigaldlg.hxx
@@ -55,7 +55,6 @@
 // - Forwards -
 // ------------
 
-class Gallery;
 class GalleryTheme;
 class SearchProgress;
 class TakeProgress;
diff --git a/cui/source/inc/hyphen.hxx b/cui/source/inc/hyphen.hxx
index 594d8d9c8d2b..d112517e371e 100644
--- a/cui/source/inc/hyphen.hxx
+++ b/cui/source/inc/hyphen.hxx
@@ -34,7 +34,6 @@
 namespace com{namespace sun{namespace star{
 namespace linguistic2{
     class XHyphenator;
-    class XPossibleHyphens;
 }}}}
 
 class SvxSpellWrapper;
diff --git a/cui/source/inc/macroass.hxx b/cui/source/inc/macroass.hxx
index 238638d976a0..74e925ce58e4 100644
--- a/cui/source/inc/macroass.hxx
+++ b/cui/source/inc/macroass.hxx
@@ -38,12 +38,8 @@
 
 class _SfxMacroTabPage;
 class SvTabListBox;
-class Edit;
 class String;
 
-class SfxConfigGroupListBox_Impl;
-class SfxConfigFunctionListBox_Impl;
-class _HeaderTabListBox;
 class _SfxMacroTabPage_Impl;
 
 class _SfxMacroTabPage : public SfxTabPage
diff --git a/cui/source/inc/macropg.hxx b/cui/source/inc/macropg.hxx
index cf9443661e3c..30a8460d6a57 100644
--- a/cui/source/inc/macropg.hxx
+++ b/cui/source/inc/macropg.hxx
@@ -59,10 +59,7 @@ typedef ::std::vector< EventDisplayName >   EventDisplayNames;
 
 class _SvxMacroTabPage;
 class SvTabListBox;
-class Edit;
-class String;
 
-class _HeaderTabListBox;
 class _SvxMacroTabPage_Impl;
 
 
diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx
index 897aa151430e..1cde79e2715b 100644
--- a/cui/source/inc/numpages.hxx
+++ b/cui/source/inc/numpages.hxx
@@ -38,7 +38,6 @@
 class SvxNumRule;
 class SvxBmpNumValueSet;
 class SvxNumValueSet;
-class ValueSet;
 class SvxNumberingPreview;
 class SvxBrushItem;
 
diff --git a/cui/source/inc/optdict.hxx b/cui/source/inc/optdict.hxx
index b1517609cd26..d3b2696aafba 100644
--- a/cui/source/inc/optdict.hxx
+++ b/cui/source/inc/optdict.hxx
@@ -51,7 +51,6 @@ namespace com{namespace sun{namespace star{
 namespace linguistic2{
     class XDictionary;
     class XSpellChecker1;
-    class XSpellChecker;
 }}}}
 
 // forward ---------------------------------------------------------------
diff --git a/cui/source/inc/optlingu.hxx b/cui/source/inc/optlingu.hxx
index df428d997d7d..a9e9d091d633 100644
--- a/cui/source/inc/optlingu.hxx
+++ b/cui/source/inc/optlingu.hxx
@@ -49,7 +49,6 @@ namespace beans{
 namespace linguistic2{
     class XDictionary;
     class XDictionaryList;
-    class XSpellChecker;
 }}}}
 
 class SvLBoxEntry;
diff --git a/cui/source/inc/optpath.hxx b/cui/source/inc/optpath.hxx
index d09021ac19c8..96ee62330264 100644
--- a/cui/source/inc/optpath.hxx
+++ b/cui/source/inc/optpath.hxx
@@ -46,7 +46,6 @@ class HeaderBar;
 
 // forward ---------------------------------------------------------------
 
-class SvTabListBox;
 namespace svx
 {
     class OptHeaderTabListBox;
diff --git a/cui/source/inc/paragrph.hxx b/cui/source/inc/paragrph.hxx
index 4ac63127806d..ba71a2c174c5 100644
--- a/cui/source/inc/paragrph.hxx
+++ b/cui/source/inc/paragrph.hxx
@@ -42,7 +42,6 @@
 // forward ---------------------------------------------------------------
 
 class SvxLineSpacingItem;
-class SvxParagraphControllerItem;
 
 // class SvxStdParagraphTabPage ------------------------------------------
 
diff --git a/cui/source/inc/pastedlg.hxx b/cui/source/inc/pastedlg.hxx
index 21dee342f4f3..45ec875f70c2 100644
--- a/cui/source/inc/pastedlg.hxx
+++ b/cui/source/inc/pastedlg.hxx
@@ -44,7 +44,6 @@
 *************************************************************************/
 
 struct TransferableObjectDescriptor;
-class DataFlavorExVecor;
 class TransferableDataHelper;
 
 class SvPasteObjectDialog : public ModalDialog
diff --git a/cui/source/options/optinet2.hxx b/cui/source/options/optinet2.hxx
index 74d05788ec15..54a0bedfcbc3 100644
--- a/cui/source/options/optinet2.hxx
+++ b/cui/source/options/optinet2.hxx
@@ -44,8 +44,6 @@ class HeaderBar;
 #endif
 #include <readonlyimage.hxx>
 
-class SfxFilter;
-
 namespace svx {
     class SecurityOptionsDialog;
 }
diff --git a/mysqlc/source/mysqlc_preparedstatement.hxx b/mysqlc/source/mysqlc_preparedstatement.hxx
index 522250829109..8e167e40db5b 100644
--- a/mysqlc/source/mysqlc_preparedstatement.hxx
+++ b/mysqlc/source/mysqlc_preparedstatement.hxx
@@ -41,7 +41,6 @@ namespace connectivity
         using ::com::sun::star::uno::RuntimeException;
         using ::com::sun::star::sdbc::XResultSetMetaData;
 
-        class OBoundParam;
         typedef ::cppu::ImplHelper5<    ::com::sun::star::sdbc::XPreparedStatement,
                                         ::com::sun::star::sdbc::XParameters,
                                         ::com::sun::star::sdbc::XPreparedBatchExecution,
diff --git a/package/inc/ZipPackage.hxx b/package/inc/ZipPackage.hxx
index e24c2f173b52..b39ff2998403 100644
--- a/package/inc/ZipPackage.hxx
+++ b/package/inc/ZipPackage.hxx
@@ -40,7 +40,6 @@
 class ZipOutputStream;
 class ZipPackageFolder;
 class ZipFile;
-class ByteGrabber;
 namespace com { namespace sun { namespace star {
     namespace container { class XNameContainer; }
     namespace io { class XStream; class XOutputStream; class XInputStream; class XSeekable; class XActiveDataStreamer; }
diff --git a/package/inc/ZipPackageBuffer.hxx b/package/inc/ZipPackageBuffer.hxx
index 1ea003ca0230..71fceb41ffd9 100644
--- a/package/inc/ZipPackageBuffer.hxx
+++ b/package/inc/ZipPackageBuffer.hxx
@@ -24,8 +24,6 @@
 #include <com/sun/star/io/XInputStream.hpp>
 #include <cppuhelper/implbase3.hxx>
 
-class ZipPackage;
-
 class ZipPackageBuffer : public ::cppu::WeakImplHelper3
 <
     com::sun::star::io::XInputStream,
diff --git a/package/inc/ZipPackageFolder.hxx b/package/inc/ZipPackageFolder.hxx
index 9936d5470ed1..92ad93554f6c 100644
--- a/package/inc/ZipPackageFolder.hxx
+++ b/package/inc/ZipPackageFolder.hxx
@@ -38,8 +38,6 @@ namespace packages
 }
 } } }
 
-class ZipFile;
-class ZipPackage;
 class ZipOutputStream;
 struct ZipEntry;
 typedef void* rtlRandomPool;
diff --git a/package/source/xstor/xfactory.hxx b/package/source/xstor/xfactory.hxx
index bfda26bd5706..7d845b28d881 100644
--- a/package/source/xstor/xfactory.hxx
+++ b/package/source/xstor/xfactory.hxx
@@ -27,8 +27,6 @@
 #include <cppuhelper/implbase2.hxx>
 
 
-class OStorage;
-
 class OStorageFactory : public ::cppu::WeakImplHelper2< ::com::sun::star::lang::XSingleServiceFactory,
                                                 ::com::sun::star::lang::XServiceInfo >
 {
diff --git a/package/source/xstor/xstorage.hxx b/package/source/xstor/xstorage.hxx
index 4758ae07f3a8..e1839daf1b39 100644
--- a/package/source/xstor/xstorage.hxx
+++ b/package/source/xstor/xstorage.hxx
@@ -64,11 +64,6 @@
 #define STOR_MESS_PREREVERT 3
 #define STOR_MESS_REVERTED  4
 
-namespace cppu
-{
-    class OTypeCollection;
-}
-
 //================================================
 // a common implementation for an entry
 
diff --git a/scaddins/source/analysis/analysis.hxx b/scaddins/source/analysis/analysis.hxx
index 95956e91c0dd..02792920568d 100644
--- a/scaddins/source/analysis/analysis.hxx
+++ b/scaddins/source/analysis/analysis.hxx
@@ -36,7 +36,6 @@
 #include "analysishelper.hxx"
 
 
-class FuncData;
 class FuncDataList;
 class ConvertDataList;
 class ResMgr;
diff --git a/sdext/source/minimizer/impoptimizer.hxx b/sdext/source/minimizer/impoptimizer.hxx
index d4f61d06d7a6..6e60970d2769 100644
--- a/sdext/source/minimizer/impoptimizer.hxx
+++ b/sdext/source/minimizer/impoptimizer.hxx
@@ -30,9 +30,6 @@
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 
-class Point;
-class Size;
-
 // -------------
 // - PDFExport -
 // -------------
diff --git a/sdext/source/pdfimport/sax/emitcontext.hxx b/sdext/source/pdfimport/sax/emitcontext.hxx
index 864309e9c80c..635944cb3537 100644
--- a/sdext/source/pdfimport/sax/emitcontext.hxx
+++ b/sdext/source/pdfimport/sax/emitcontext.hxx
@@ -29,8 +29,6 @@
 
 namespace pdfi
 {
-    class PDFIProcessor;
-    class StyleContainer;
     class SaxEmitter : public XmlEmitter
     {
     private:
diff --git a/sdext/source/pdfimport/tree/treevisiting.hxx b/sdext/source/pdfimport/tree/treevisiting.hxx
index 6af5402af994..901342963563 100644
--- a/sdext/source/pdfimport/tree/treevisiting.hxx
+++ b/sdext/source/pdfimport/tree/treevisiting.hxx
@@ -35,8 +35,6 @@
 
 namespace pdfi
 {
-    class  PDFIProcessor;
-    class  StyleContainer;
     struct HyperlinkElement;
     struct TextElement;
     struct ParagraphElement;
@@ -45,7 +43,6 @@ namespace pdfi
     struct ImageElement;
     struct PageElement;
     struct DocumentElement;
-    struct EmitContext;
     struct Element;
 
     /** To be visited by all tree element types
diff --git a/sdext/source/presenter/PresenterCanvasHelper.hxx b/sdext/source/presenter/PresenterCanvasHelper.hxx
index ae044f28a268..cb7d10980a81 100644
--- a/sdext/source/presenter/PresenterCanvasHelper.hxx
+++ b/sdext/source/presenter/PresenterCanvasHelper.hxx
@@ -34,8 +34,6 @@ namespace css = ::com::sun::star;
 
 namespace sdext { namespace presenter {
 
-class PresenterController;
-
 /** Collection of functions to ease the life of a canvas user.
 */
 class PresenterCanvasHelper
diff --git a/sdext/source/presenter/PresenterController.hxx b/sdext/source/presenter/PresenterController.hxx
index c19d23a2af15..69cc55392a56 100644
--- a/sdext/source/presenter/PresenterController.hxx
+++ b/sdext/source/presenter/PresenterController.hxx
@@ -69,7 +69,6 @@ class PresenterPaneAnimator;
 class PresenterPaneContainer;
 class PresenterPaneBorderPainter;
 class PresenterTheme;
-class PresenterScreen;
 class PresenterWindowManager;
 
 namespace {
diff --git a/sdext/source/presenter/PresenterPaneBase.hxx b/sdext/source/presenter/PresenterPaneBase.hxx
index 3ce321483aa4..acb69e6cd053 100644
--- a/sdext/source/presenter/PresenterPaneBase.hxx
+++ b/sdext/source/presenter/PresenterPaneBase.hxx
@@ -53,7 +53,6 @@ namespace cssu = ::com::sun::star::uno;
 namespace sdext { namespace presenter {
 
 class PresenterController;
-class PresenterTextView;
 
 namespace {
     typedef ::cppu::WeakComponentImplHelper4 <
diff --git a/sdext/source/presenter/PresenterPaneBorderPainter.hxx b/sdext/source/presenter/PresenterPaneBorderPainter.hxx
index d46b2259901a..d2582160614a 100644
--- a/sdext/source/presenter/PresenterPaneBorderPainter.hxx
+++ b/sdext/source/presenter/PresenterPaneBorderPainter.hxx
@@ -44,10 +44,6 @@
 
 namespace css = ::com::sun::star;
 
-namespace sdext { namespace tools {
-    class ConfigurationAccess;
-} }
-
 namespace sdext { namespace presenter {
 
 class PresenterPane;
diff --git a/sdext/source/presenter/PresenterScreen.hxx b/sdext/source/presenter/PresenterScreen.hxx
index 20a9735fa335..07aff4e7c8ee 100644
--- a/sdext/source/presenter/PresenterScreen.hxx
+++ b/sdext/source/presenter/PresenterScreen.hxx
@@ -51,7 +51,6 @@ namespace css = ::com::sun::star;
 
 namespace sdext { namespace presenter {
 
-class PresenterWindowManager;
 class PresenterController;
 
 namespace {
diff --git a/sdext/source/presenter/PresenterTimer.hxx b/sdext/source/presenter/PresenterTimer.hxx
index f56fe513fd19..242d746aa9b2 100644
--- a/sdext/source/presenter/PresenterTimer.hxx
+++ b/sdext/source/presenter/PresenterTimer.hxx
@@ -45,8 +45,6 @@ namespace css = ::com::sun::star;
 
 namespace sdext { namespace presenter {
 
-class PresenterClockInternalTimer;
-
 /** The timer allows tasks to be scheduled for execution at a specified time
     in the future.
 */
diff --git a/sdext/source/presenter/PresenterViewFactory.hxx b/sdext/source/presenter/PresenterViewFactory.hxx
index a37435554fbf..5c6aedf50016 100644
--- a/sdext/source/presenter/PresenterViewFactory.hxx
+++ b/sdext/source/presenter/PresenterViewFactory.hxx
@@ -45,8 +45,6 @@ namespace css = ::com::sun::star;
 
 namespace sdext { namespace presenter {
 
-class PresenterPaneContainer;
-
 namespace {
     typedef ::cppu::WeakComponentImplHelper1 <
         css::drawing::framework::XResourceFactory
diff --git a/sfx2/inc/bitset.hxx b/sfx2/inc/bitset.hxx
index 66e9f4f49ac7..bb2f8409893f 100644
--- a/sfx2/inc/bitset.hxx
+++ b/sfx2/inc/bitset.hxx
@@ -21,8 +21,6 @@
 
 #include <tools/solar.h>
 
-class Range;
-
 class BitSet
 {
 private:
diff --git a/sfx2/inc/frmload.hxx b/sfx2/inc/frmload.hxx
index ee77297488b0..fe5874ab2758 100644
--- a/sfx2/inc/frmload.hxx
+++ b/sfx2/inc/frmload.hxx
@@ -46,8 +46,6 @@
 class SfxFilter;
 class SfxFilterMatcher;
 
-class SfxFrameWeak;
-
 class SAL_DLLPRIVATE SfxFrameLoader_Impl : public ::cppu::WeakImplHelper2< ::com::sun::star::frame::XSynchronousFrameLoader, ::com::sun::star::lang::XServiceInfo >
 {
     ::comphelper::ComponentContext  m_aContext;
diff --git a/sfx2/inc/orgmgr.hxx b/sfx2/inc/orgmgr.hxx
index 16d0c9e07212..2c8d989f9dec 100644
--- a/sfx2/inc/orgmgr.hxx
+++ b/sfx2/inc/orgmgr.hxx
@@ -23,7 +23,6 @@
 
 class SfxDocumentTemplates;
 class SfxOrganizeListBox_Impl;
-class SfxObjectShell;
 struct _FileListEntry;
 
 //=========================================================================
diff --git a/sfx2/source/dialog/filtergrouping.hxx b/sfx2/source/dialog/filtergrouping.hxx
index 6dbe3cc7cce4..4b35f87ef219 100644
--- a/sfx2/source/dialog/filtergrouping.hxx
+++ b/sfx2/source/dialog/filtergrouping.hxx
@@ -24,8 +24,6 @@
 #include <com/sun/star/container/XEnumeration.hpp>
 #include "filedlgimpl.hxx"
 
-class SfxFilterMatcherIter;
-
 //........................................................................
 namespace sfx2
 {
diff --git a/sfx2/source/inc/appdata.hxx b/sfx2/source/inc/appdata.hxx
index 4319b01da940..9b4480bc76b1 100644
--- a/sfx2/source/inc/appdata.hxx
+++ b/sfx2/source/inc/appdata.hxx
@@ -35,8 +35,6 @@ class SfxProgress;
 class SfxChildWinFactArr_Impl;
 class SfxDdeDocTopics_Impl;
 class DdeService;
-class SfxEventConfiguration;
-class SfxMacroConfig;
 class SfxItemPool;
 class SfxFilterMatcher;
 class ISfxTemplateCommon;
@@ -48,10 +46,7 @@ class SfxFrame;
 typedef ::std::vector<SfxFrame*> SfxFrameArr_Impl;
 class SvtSaveOptions;
 class SvtHelpOptions;
-class SfxObjectFactory;
-class SfxObjectShell;
 class ResMgr;
-class Window;
 class SfxTbxCtrlFactArr_Impl;
 class SfxStbCtrlFactArr_Impl;
 class SfxMenuCtrlFactArr_Impl;
@@ -59,7 +54,6 @@ class SfxViewFrameArr_Impl;
 class SfxViewShellArr_Impl;
 class SfxObjectShellArr_Impl;
 class ResMgr;
-class SimpleResMgr;
 class SfxViewFrame;
 class SfxSlotPool;
 class SfxResourceManager;
diff --git a/sfx2/source/inc/docundomanager.hxx b/sfx2/source/inc/docundomanager.hxx
index 14a29e33cdcb..2ac1da4b33d4 100644
--- a/sfx2/source/inc/docundomanager.hxx
+++ b/sfx2/source/inc/docundomanager.hxx
@@ -29,11 +29,6 @@
 #include <boost/scoped_ptr.hpp>
 #include <boost/noncopyable.hpp>
 
-namespace svl
-{
-    class IUndoManager;
-}
-
 //......................................................................................................................
 namespace sfx2
 {
diff --git a/sfx2/source/inc/eventsupplier.hxx b/sfx2/source/inc/eventsupplier.hxx
index 12fa0a65cda4..9b2793a33f06 100644
--- a/sfx2/source/inc/eventsupplier.hxx
+++ b/sfx2/source/inc/eventsupplier.hxx
@@ -74,7 +74,6 @@ namespace comphelper
 //--------------------------------------------------------------------------------------------------------
 
 class SfxObjectShell;
-class SfxBaseModel;
 class SvxMacro;
 
 //--------------------------------------------------------------------------------------------------------
diff --git a/sfx2/source/inc/objshimp.hxx b/sfx2/source/inc/objshimp.hxx
index 0a90876f9a44..868995f24c65 100644
--- a/sfx2/source/inc/objshimp.hxx
+++ b/sfx2/source/inc/objshimp.hxx
@@ -45,8 +45,6 @@ struct MarkData_Impl
     SfxViewFrame* pFrame;
 };
 
-class SfxFrame;
-class SfxToolBoxConfig;
 class SfxBasicManagerHolder;
 
 struct SfxObjectShell_Impl : public ::sfx2::IMacroDocumentAccess
diff --git a/sfx2/source/inc/preview.hxx b/sfx2/source/inc/preview.hxx
index 5d4f82d3e3f1..62adb20318c6 100644
--- a/sfx2/source/inc/preview.hxx
+++ b/sfx2/source/inc/preview.hxx
@@ -24,9 +24,6 @@
 #include <sfx2/basedlgs.hxx>
 
 class SfxObjectShell;
-class SfxFrameWindow;
-
-class SfxFrame;
 class GDIMetaFile;
 
 class SfxPreviewBase_Impl : public Window
diff --git a/sfx2/source/inc/sfxtypes.hxx b/sfx2/source/inc/sfxtypes.hxx
index ab22a7bb77a8..cb1aced2f087 100644
--- a/sfx2/source/inc/sfxtypes.hxx
+++ b/sfx2/source/inc/sfxtypes.hxx
@@ -40,9 +40,6 @@
 #endif
 #endif
 
-class SfxShell;
-class Timer;
-
 //------------------------------------------------------------------------
 
 // Macro for the Call-Profiler under WinNT
diff --git a/sfx2/source/inc/versdlg.hxx b/sfx2/source/inc/versdlg.hxx
index 270fd4da1e8e..7514c3679b4d 100644
--- a/sfx2/source/inc/versdlg.hxx
+++ b/sfx2/source/inc/versdlg.hxx
@@ -26,7 +26,6 @@
 #include <svtools/svmedit.hxx>
 #include <sfx2/basedlgs.hxx>
 
-class SfxObjectShell;
 class SfxViewFrame;
 struct SfxVersionInfo;
 
diff --git a/sfx2/source/menu/thessubmenu.hxx b/sfx2/source/menu/thessubmenu.hxx
index 065b0b0cc874..a30883e8abc3 100644
--- a/sfx2/source/menu/thessubmenu.hxx
+++ b/sfx2/source/menu/thessubmenu.hxx
@@ -27,10 +27,6 @@
 #include <vcl/menu.hxx>
 #include <sfx2/mnuitem.hxx>
 
-class SfxBindings;
-class PopupMenu;
-class Menu;
-
 namespace css = ::com::sun::star;
 
 class SfxThesSubMenuHelper
diff --git a/sfx2/source/view/impframe.hxx b/sfx2/source/view/impframe.hxx
index 32eefc6fa810..da05e3ee8e77 100644
--- a/sfx2/source/view/impframe.hxx
+++ b/sfx2/source/view/impframe.hxx
@@ -24,7 +24,6 @@
 #include <sfx2/viewfrm.hxx>                  // SvBorder
 
 class SfxViewFrame;
-class SfxObjectShell;
 #include <com/sun/star/frame/XController.hpp>
 #include <com/sun/star/awt/XTopWindow.hpp>
 #include <com/sun/star/awt/XWindow.hpp>
diff --git a/sfx2/source/view/viewimp.hxx b/sfx2/source/view/viewimp.hxx
index 0296cfcd55b9..a5c750af3062 100644
--- a/sfx2/source/view/viewimp.hxx
+++ b/sfx2/source/view/viewimp.hxx
@@ -32,7 +32,6 @@
 #include <vcl/print.hxx>
 #include <queue>
 
-class SfxOfficeDispatch;
 class SfxBaseController;
 
 typedef SfxShell* SfxShellPtr_Impl;
diff --git a/sfx2/workben/custompanel/ctp_factory.hxx b/sfx2/workben/custompanel/ctp_factory.hxx
index e726b99f7f40..91d6ef8dc7d8 100644
--- a/sfx2/workben/custompanel/ctp_factory.hxx
+++ b/sfx2/workben/custompanel/ctp_factory.hxx
@@ -32,8 +32,6 @@ namespace sd { namespace colortoolpanel
 {
 //......................................................................................................................
 
-    class FactoryGuard;
-
     //==================================================================================================================
     //= ToolPanelFactory
     //==================================================================================================================
diff --git a/svx/inc/dragmt3d.hxx b/svx/inc/dragmt3d.hxx
index 6044f7e4d14d..c60493e6f1e6 100644
--- a/svx/inc/dragmt3d.hxx
+++ b/svx/inc/dragmt3d.hxx
@@ -35,8 +35,6 @@
 #include <vcl/timer.hxx>
 #include <basegfx/matrix/b3dhommatrix.hxx>
 
-class E3dScene;
-
 /*************************************************************************
 |*
 |* Parameters for the interaction of a 3D object
diff --git a/svx/source/engine3d/helperminimaldepth3d.hxx b/svx/source/engine3d/helperminimaldepth3d.hxx
index e25467796ac1..767970dd7201 100644
--- a/svx/source/engine3d/helperminimaldepth3d.hxx
+++ b/svx/source/engine3d/helperminimaldepth3d.hxx
@@ -26,7 +26,6 @@
 // predefines
 
 class E3dCompoundObject;
-class E3dScene;
 
 //////////////////////////////////////////////////////////////////////////////
 /** support extracting the minimal depth of a 3d object in it's scene
diff --git a/svx/source/gallery2/codec.hxx b/svx/source/gallery2/codec.hxx
index 08d213ffe98f..99363af0fb79 100644
--- a/svx/source/gallery2/codec.hxx
+++ b/svx/source/gallery2/codec.hxx
@@ -24,7 +24,6 @@
 // ----------------
 
 class SvStream;
-class SvMemoryStreamStream;
 
 class GalleryCodec
 {
diff --git a/svx/source/inc/GraphCtlAccessibleContext.hxx b/svx/source/inc/GraphCtlAccessibleContext.hxx
index fe248f43c6ea..1bec3256036e 100644
--- a/svx/source/inc/GraphCtlAccessibleContext.hxx
+++ b/svx/source/inc/GraphCtlAccessibleContext.hxx
@@ -66,7 +66,6 @@ namespace com { namespace sun { namespace star { namespace awt {
 
 class Rectangle;
 class GraphCtrl;
-class Window;
 class SdrObject;
 class SdrModel;
 class SdrPage;
diff --git a/svx/source/inc/fmPropBrw.hxx b/svx/source/inc/fmPropBrw.hxx
index 195e140d78c0..2d8c72393058 100644
--- a/svx/source/inc/fmPropBrw.hxx
+++ b/svx/source/inc/fmPropBrw.hxx
@@ -38,7 +38,6 @@ public:
     SFX_DECL_CHILDWINDOW(FmPropBrwMgr);
 };
 
-class FmPropControl;
 class SfxBindings;
 class FmFormShell;
 //========================================================================
diff --git a/svx/source/inc/fmexch.hxx b/svx/source/inc/fmexch.hxx
index d4f800218437..2bafd5652392 100644
--- a/svx/source/inc/fmexch.hxx
+++ b/svx/source/inc/fmexch.hxx
@@ -27,8 +27,6 @@
 
 #include <svx/svxdllapi.h>
 
-class FmFormShell;
-class FmFormPage;
 class SvLBoxEntry;
 
 //========================================================================
diff --git a/svx/source/inc/fmitems.hxx b/svx/source/inc/fmitems.hxx
index 9cefcae57ac6..42b34115aa11 100644
--- a/svx/source/inc/fmitems.hxx
+++ b/svx/source/inc/fmitems.hxx
@@ -32,12 +32,6 @@
 #include <svl/poolitem.hxx>
 #include <comphelper/uno3.hxx>
 
-namespace com { namespace sun { namespace star {
-    namespace uno {
-        class Any;
-    }
-}}}
-
 //==================================================================
 class FmInterfaceItem : public SfxPoolItem
 {
diff --git a/svx/source/inc/fmobj.hxx b/svx/source/inc/fmobj.hxx
index b86b8ef908f2..2b8c6ffb1b63 100644
--- a/svx/source/inc/fmobj.hxx
+++ b/svx/source/inc/fmobj.hxx
@@ -37,7 +37,6 @@ class FmFormView;
 //==================================================================
 // FmFormObj
 //==================================================================
-class FmXForms;
 class FmFormObj: public SdrUnoObj
 {
     ::com::sun::star::uno::Sequence< ::com::sun::star::script::ScriptEventDescriptor >  aEvts;  // events des Objects
diff --git a/svx/source/inc/fmpgeimp.hxx b/svx/source/inc/fmpgeimp.hxx
index 0f39df015b11..71feaa20027b 100644
--- a/svx/source/inc/fmpgeimp.hxx
+++ b/svx/source/inc/fmpgeimp.hxx
@@ -44,23 +44,10 @@
 #include "svx/svxdllapi.h"
 #include <map>
 
-class SvStream;
 class FmFormObj;
 class FmFormPage;
 class SdrObject;
 
-namespace com { namespace sun { namespace star {
-    namespace container {
-        class XIndexContainer;
-    }
-    namespace io {
-        class XObjectOutputStream;
-        class XObjectInputStream;
-    }
-}}}
-
-class SdrObjList;
-
 //==================================================================
 // FmFormPageImpl
 // lauscht an allen Containern, um festzustellen, wann Objecte
diff --git a/svx/source/inc/fmtextcontrolshell.hxx b/svx/source/inc/fmtextcontrolshell.hxx
index 50caebf72560..8d8baa7ad4c9 100644
--- a/svx/source/inc/fmtextcontrolshell.hxx
+++ b/svx/source/inc/fmtextcontrolshell.hxx
@@ -49,7 +49,6 @@ class SfxItemSet;
 class SfxAllItemSet;
 class SfxBindings;
 class SfxViewFrame;
-class Window;
 class SfxApplication;
 
 //........................................................................
diff --git a/svx/source/inc/fmundo.hxx b/svx/source/inc/fmundo.hxx
index dd53b90b03d5..8ffe30b2a04d 100644
--- a/svx/source/inc/fmundo.hxx
+++ b/svx/source/inc/fmundo.hxx
@@ -53,14 +53,6 @@
 class FmFormModel;
 class FmFormObj;
 class SdrObject;
-class FmXFormView;
-
-namespace com { namespace sun { namespace star {
-    namespace awt {
-        class XControl;
-        class XControlContainer;
-    }
-}}}
 
 //==================================================================
 // FmUndoPropertyAction
diff --git a/svx/source/inc/fmvwimp.hxx b/svx/source/inc/fmvwimp.hxx
index 48295cc75ccb..0043ad29ca87 100644
--- a/svx/source/inc/fmvwimp.hxx
+++ b/svx/source/inc/fmvwimp.hxx
@@ -51,10 +51,8 @@
 #include <comphelper/componentcontext.hxx>
 #include <rtl/ref.hxx>
 
-//class SdrPageViewWinRec;
 class SdrPageWindow;
 
-class SdrPageView;
 class SdrObject;
 class FmFormObj;
 class FmFormModel;
@@ -63,7 +61,6 @@ class FmFormShell;
 class Window;
 class OutputDevice;
 class SdrUnoObj;
-class SdrView;
 
 namespace com { namespace sun { namespace star {
     namespace awt {
diff --git a/svx/source/inc/formcontroller.hxx b/svx/source/inc/formcontroller.hxx
index 28f374c401b4..9d1bef749393 100644
--- a/svx/source/inc/formcontroller.hxx
+++ b/svx/source/inc/formcontroller.hxx
@@ -102,7 +102,6 @@ typedef ::std::map< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTe
 typedef ::std::vector< FmFilterRow > FmFilterRows;
 typedef ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController > > FmFormControllers;
 
-class FmFormView;
 class Window;
 
 namespace svxform
diff --git a/svx/source/svdraw/svddrgm1.hxx b/svx/source/svdraw/svddrgm1.hxx
index b45dde17729d..49e5a3c1d9a1 100644
--- a/svx/source/svdraw/svddrgm1.hxx
+++ b/svx/source/svdraw/svddrgm1.hxx
@@ -38,7 +38,6 @@
 // predeclarations
 
 class SdrDragView;
-class SdrDragStat;
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 //   SdrDragMovHdl
diff --git a/svx/source/table/accessiblecell.hxx b/svx/source/table/accessiblecell.hxx
index 5b32554f39ac..d31e2de454ca 100644
--- a/svx/source/table/accessiblecell.hxx
+++ b/svx/source/table/accessiblecell.hxx
@@ -48,15 +48,11 @@
 
 #include <boost/noncopyable.hpp>
 
-class SdrObject;
-
 
 namespace accessibility
 {
 
-class AccessibleShapeInfo;
 class AccessibleShapeTreeInfo;
-class IAccessibleParent;
 
 typedef ::cppu::ImplInheritanceHelper1< AccessibleContextBase, ::com::sun::star::accessibility::XAccessibleExtendedComponent > AccessibleCellBase;
 
diff --git a/svx/source/tbxctrls/extrusioncontrols.hxx b/svx/source/tbxctrls/extrusioncontrols.hxx
index 5ff022bd0cf5..0c487f6af7ac 100644
--- a/svx/source/tbxctrls/extrusioncontrols.hxx
+++ b/svx/source/tbxctrls/extrusioncontrols.hxx
@@ -40,16 +40,12 @@
 #include <svtools/popupwindowcontroller.hxx>
 #include <svtools/popupmenucontrollerbase.hxx>
 
-class SfxBindings;
-class SfxStatusForwarder;
 class ValueSet;
 
 //========================================================================
 
 namespace svx
 {
-class ToolboxButtonColorUpdater;
-
 class ExtrusionDirectionWindow : public svtools::ToolbarMenu
 {
 public:
diff --git a/svx/source/unodraw/shapeimpl.hxx b/svx/source/unodraw/shapeimpl.hxx
index abe386350154..3b9f1c83aa0c 100644
--- a/svx/source/unodraw/shapeimpl.hxx
+++ b/svx/source/unodraw/shapeimpl.hxx
@@ -30,8 +30,6 @@
 
 #include <svx/unoshape.hxx>
 
-class SvGlobalName;
-
 /***********************************************************************
 *                                                                      *
 ***********************************************************************/