tdf#42949 Fix IWYU warnings in sd/source/ui/f*

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

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

77 files changed, 39 insertions, 341 deletions

diff --git a/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx b/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx
index 6f02779ead31..7ac69647522c 100644
--- a/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx
+++ b/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx
@@ -21,14 +21,13 @@
 #include "ChangeRequestQueueProcessor.hxx"
 #include "ConfigurationTracer.hxx"
 
-#include <framework/ConfigurationController.hxx>
 #include "ConfigurationUpdater.hxx"
 
 #include <vcl/svapp.hxx>
 #include <sal/log.hxx>
+#include <osl/diagnose.h>
 #include <com/sun/star/container/XNamed.hpp>
-#include <com/sun/star/drawing/framework/XConfiguration.hpp>
-#include <com/sun/star/drawing/framework/ConfigurationChangeEvent.hpp>
+#include <com/sun/star/drawing/framework/XConfigurationChangeRequest.hpp>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
diff --git a/sd/source/ui/framework/configuration/Configuration.cxx b/sd/source/ui/framework/configuration/Configuration.cxx
index c2438477c01a..f2034ac389fc 100644
--- a/sd/source/ui/framework/configuration/Configuration.cxx
+++ b/sd/source/ui/framework/configuration/Configuration.cxx
@@ -25,7 +25,6 @@
 #include <com/sun/star/drawing/framework/XConfigurationControllerBroadcaster.hpp>
 #include <comphelper/sequence.hxx>
 #include <cppuhelper/supportsservice.hxx>
-#include <facreg.hxx>
 #include <sal/log.hxx>
 
 using namespace ::com::sun::star;
diff --git a/sd/source/ui/framework/configuration/ConfigurationController.cxx b/sd/source/ui/framework/configuration/ConfigurationController.cxx
index 601eb228ee51..9e8fb6fadeee 100644
--- a/sd/source/ui/framework/configuration/ConfigurationController.cxx
+++ b/sd/source/ui/framework/configuration/ConfigurationController.cxx
@@ -29,11 +29,8 @@
 #include "UpdateRequest.hxx"
 #include "ChangeRequestQueueProcessor.hxx"
 #include "ConfigurationClassifier.hxx"
-#include <ViewShellBase.hxx>
-#include <DrawController.hxx>
-#include <facreg.hxx>
 #include <com/sun/star/drawing/framework/XControllerManager.hpp>
-#include <com/sun/star/util/XURLTransformer.hpp>
+#include <com/sun/star/frame/XController.hpp>
 
 #include <sal/log.hxx>
 #include <osl/mutex.hxx>
diff --git a/sd/source/ui/framework/configuration/ConfigurationTracer.cxx b/sd/source/ui/framework/configuration/ConfigurationTracer.cxx
index 4db6aa54d8c9..aef2366824c6 100644
--- a/sd/source/ui/framework/configuration/ConfigurationTracer.cxx
+++ b/sd/source/ui/framework/configuration/ConfigurationTracer.cxx
@@ -19,7 +19,6 @@
 
 #include "ConfigurationTracer.hxx"
 
-#include <cstdio>
 #include <sal/log.hxx>
 
 using namespace ::com::sun::star::uno;
diff --git a/sd/source/ui/framework/configuration/ResourceFactoryManager.cxx b/sd/source/ui/framework/configuration/ResourceFactoryManager.cxx
index ba296968e879..d92e60455103 100644
--- a/sd/source/ui/framework/configuration/ResourceFactoryManager.cxx
+++ b/sd/source/ui/framework/configuration/ResourceFactoryManager.cxx
@@ -21,7 +21,6 @@
 #include <tools/wldcrd.hxx>
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
 #include <com/sun/star/lang/XComponent.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/util/URLTransformer.hpp>
 #include <com/sun/star/drawing/framework/XControllerManager.hpp>
 #include <comphelper/processfactory.hxx>
diff --git a/sd/source/ui/framework/configuration/ResourceId.cxx b/sd/source/ui/framework/configuration/ResourceId.cxx
index 84d97c18963f..78090fe121ac 100644
--- a/sd/source/ui/framework/configuration/ResourceId.cxx
+++ b/sd/source/ui/framework/configuration/ResourceId.cxx
@@ -18,16 +18,14 @@
  */
 
 #include <framework/ResourceId.hxx>
-#include <framework/FrameworkHelper.hxx>
 #include <tools/SdGlobalResourceContainer.hxx>
-#include <com/sun/star/lang/IllegalArgumentException.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/util/URLTransformer.hpp>
 #include <comphelper/processfactory.hxx>
 #include <cppuhelper/supportsservice.hxx>
+#include <cppuhelper/weakref.hxx>
 #include <rtl/ref.hxx>
 
-#include <facreg.hxx>
+namespace com::sun::star::uno { class XComponentContext; }
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
diff --git a/sd/source/ui/framework/configuration/UpdateRequest.cxx b/sd/source/ui/framework/configuration/UpdateRequest.cxx
index f8f602ce8f41..1a8a0b120094 100644
--- a/sd/source/ui/framework/configuration/UpdateRequest.cxx
+++ b/sd/source/ui/framework/configuration/UpdateRequest.cxx
@@ -19,8 +19,6 @@
 
 #include "UpdateRequest.hxx"
 
-#include <framework/FrameworkHelper.hxx>
-
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::drawing::framework;
diff --git a/sd/source/ui/framework/factories/BasicPaneFactory.cxx b/sd/source/ui/framework/factories/BasicPaneFactory.cxx
index 166c5d38618f..7d009fa8548b 100644
--- a/sd/source/ui/framework/factories/BasicPaneFactory.cxx
+++ b/sd/source/ui/framework/factories/BasicPaneFactory.cxx
@@ -20,10 +20,7 @@
 #include <memory>
 #include <sal/config.h>
 
-#include <utility>
-
 #include "BasicPaneFactory.hxx"
-#include <facreg.hxx>
 
 #include "ChildWindowPane.hxx"
 #include "FrameWindowPane.hxx"
@@ -34,7 +31,6 @@
 #include <ViewShellBase.hxx>
 #include <PaneChildWindows.hxx>
 #include <DrawController.hxx>
-#include <DrawDocShell.hxx>
 #include <com/sun/star/drawing/framework/XControllerManager.hpp>
 
 using namespace ::com::sun::star;
diff --git a/sd/source/ui/framework/factories/BasicPaneFactory.hxx b/sd/source/ui/framework/factories/BasicPaneFactory.hxx
index 69d57fe0836f..c22ba9cf9976 100644
--- a/sd/source/ui/framework/factories/BasicPaneFactory.hxx
+++ b/sd/source/ui/framework/factories/BasicPaneFactory.hxx
@@ -29,7 +29,6 @@
 #include <memory>
 
 namespace com { namespace sun { namespace star { namespace drawing { namespace framework { class XConfigurationController; } } } } }
-namespace com { namespace sun { namespace star { namespace frame { class XController; } } } }
 namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
 
 namespace sd {
diff --git a/sd/source/ui/framework/factories/BasicToolBarFactory.cxx b/sd/source/ui/framework/factories/BasicToolBarFactory.cxx
index b7f3d307ff39..bb1ede4c63ea 100644
--- a/sd/source/ui/framework/factories/BasicToolBarFactory.cxx
+++ b/sd/source/ui/framework/factories/BasicToolBarFactory.cxx
@@ -20,13 +20,13 @@
 #include "BasicToolBarFactory.hxx"
 
 #include <ViewTabBar.hxx>
-#include <facreg.hxx>
 #include <framework/FrameworkHelper.hxx>
 #include <unotools/mediadescriptor.hxx>
 
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
-#include <com/sun/star/lang/XUnoTunnel.hpp>
-#include <DrawController.hxx>
+#include <com/sun/star/drawing/framework/XConfigurationController.hpp>
+#include <com/sun/star/frame/XController.hpp>
+#include <com/sun/star/drawing/framework/XControllerManager.hpp>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
diff --git a/sd/source/ui/framework/factories/BasicViewFactory.cxx b/sd/source/ui/framework/factories/BasicViewFactory.cxx
index 3bc14fdfbea8..71eb27ac19e7 100644
--- a/sd/source/ui/framework/factories/BasicViewFactory.cxx
+++ b/sd/source/ui/framework/factories/BasicViewFactory.cxx
@@ -25,7 +25,6 @@
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
 #include <framework/Pane.hxx>
 #include <DrawController.hxx>
-#include <DrawSubController.hxx>
 #include <ViewShellBase.hxx>
 #include <ViewShellManager.hxx>
 #include <DrawDocShell.hxx>
@@ -35,7 +34,6 @@
 #include <PresentationViewShell.hxx>
 #include <SlideSorterViewShell.hxx>
 #include <FrameView.hxx>
-#include <facreg.hxx>
 #include <Window.hxx>
 
 #include <sfx2/viewfrm.hxx>
diff --git a/sd/source/ui/framework/factories/ChildWindowPane.cxx b/sd/source/ui/framework/factories/ChildWindowPane.cxx
index 996ab2c52d3d..83bc87af3dd9 100644
--- a/sd/source/ui/framework/factories/ChildWindowPane.cxx
+++ b/sd/source/ui/framework/factories/ChildWindowPane.cxx
@@ -28,9 +28,7 @@
 #include <PaneDockingWindow.hxx>
 #include <ViewShellBase.hxx>
 #include <ViewShellManager.hxx>
-#include <framework/FrameworkHelper.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
-#include <vcl/svapp.hxx>
 #include <sfx2/viewfrm.hxx>
 
 using namespace ::com::sun::star;
diff --git a/sd/source/ui/framework/factories/FullScreenPane.cxx b/sd/source/ui/framework/factories/FullScreenPane.cxx
index b9d227c00dfe..652930c6ce86 100644
--- a/sd/source/ui/framework/factories/FullScreenPane.cxx
+++ b/sd/source/ui/framework/factories/FullScreenPane.cxx
@@ -18,13 +18,9 @@
  */
 
 #include "FullScreenPane.hxx"
-#include <ViewShellBase.hxx>
-#include <cppcanvas/vclfactory.hxx>
-#include <sfx2/dispatch.hxx>
+#include <vcl/vclevent.hxx>
 #include <vcl/wrkwin.hxx>
-#include <vcl/svapp.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
-#include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/util/URL.hpp>
diff --git a/sd/source/ui/framework/factories/FullScreenPane.hxx b/sd/source/ui/framework/factories/FullScreenPane.hxx
index de957cf635c4..41b49fabe16b 100644
--- a/sd/source/ui/framework/factories/FullScreenPane.hxx
+++ b/sd/source/ui/framework/factories/FullScreenPane.hxx
@@ -22,8 +22,8 @@
 
 #include "FrameWindowPane.hxx"
 #include <tools/link.hxx>
+#include <vcl/wrkwin.hxx>
 
-class WorkWindow;
 class VclWindowEvent;
 
 namespace vcl { class Window; }
diff --git a/sd/source/ui/framework/factories/Pane.cxx b/sd/source/ui/framework/factories/Pane.cxx
index a9fdd52f1265..0245cdbb357f 100644
--- a/sd/source/ui/framework/factories/Pane.cxx
+++ b/sd/source/ui/framework/factories/Pane.cxx
@@ -19,7 +19,6 @@
 
 #include <framework/Pane.hxx>
 
-#include <vcl/svapp.hxx>
 #include <osl/mutex.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <vcl/window.hxx>
diff --git a/sd/source/ui/framework/factories/PresentationFactory.cxx b/sd/source/ui/framework/factories/PresentationFactory.cxx
index 237e6f04e43e..fe8d1331a7f9 100644
--- a/sd/source/ui/framework/factories/PresentationFactory.cxx
+++ b/sd/source/ui/framework/factories/PresentationFactory.cxx
@@ -20,15 +20,14 @@
 #include <framework/PresentationFactory.hxx>
 
 #include <DrawController.hxx>
-#include <ViewShellBase.hxx>
-#include <facreg.hxx>
 #include <com/sun/star/drawing/framework/XControllerManager.hpp>
 #include <com/sun/star/drawing/framework/XView.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
 #include <cppuhelper/compbase.hxx>
 #include <tools/diagnose_ex.h>
 #include <slideshow.hxx>
 
+namespace com::sun::star::uno { class XComponentContext; }
+
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
diff --git a/sd/source/ui/framework/factories/ViewShellWrapper.cxx b/sd/source/ui/framework/factories/ViewShellWrapper.cxx
index 488cad3b1932..ce78f380259f 100644
--- a/sd/source/ui/framework/factories/ViewShellWrapper.cxx
+++ b/sd/source/ui/framework/factories/ViewShellWrapper.cxx
@@ -18,18 +18,14 @@
  */
 
 #include <framework/ViewShellWrapper.hxx>
-#include <framework/Pane.hxx>
 #include <sdpage.hxx>
 #include <ViewShell.hxx>
-#include <Window.hxx>
 
 #include <SlideSorter.hxx>
 #include <SlideSorterViewShell.hxx>
 #include <controller/SlsPageSelector.hxx>
-#include <controller/SlsCurrentSlideManager.hxx>
 #include <controller/SlideSorterController.hxx>
 #include <model/SlsPageEnumerationProvider.hxx>
-#include <model/SlideSorterModel.hxx>
 #include <model/SlsPageDescriptor.hxx>
 
 #include <com/sun/star/drawing/framework/XPane.hpp>
@@ -37,10 +33,7 @@
 
 #include <toolkit/helper/vclunohelper.hxx>
 #include <comphelper/servicehelper.hxx>
-#include <cppuhelper/typeprovider.hxx>
-#include <vcl/svapp.hxx>
 #include <osl/mutex.hxx>
-#include <tools/diagnose_ex.h>
 #include <sal/log.hxx>
 
 using namespace ::com::sun::star;
diff --git a/sd/source/ui/framework/module/CenterViewFocusModule.cxx b/sd/source/ui/framework/module/CenterViewFocusModule.cxx
index 6cca423ecc38..8c7e6abbd2d6 100644
--- a/sd/source/ui/framework/module/CenterViewFocusModule.cxx
+++ b/sd/source/ui/framework/module/CenterViewFocusModule.cxx
@@ -19,7 +19,6 @@
 
 #include "CenterViewFocusModule.hxx"
 
-#include <framework/ConfigurationController.hxx>
 #include <framework/FrameworkHelper.hxx>
 #include <framework/ViewShellWrapper.hxx>
 
@@ -29,9 +28,6 @@
 #include <com/sun/star/drawing/framework/XControllerManager.hpp>
 #include <com/sun/star/drawing/framework/XConfigurationController.hpp>
 
-#include <toolkit/awt/vclxdevice.hxx>
-#include <sfx2/viewfrm.hxx>
-
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::drawing::framework;
diff --git a/sd/source/ui/framework/module/ModuleController.cxx b/sd/source/ui/framework/module/ModuleController.cxx
index 20ddc1cf1871..edfe932474f0 100644
--- a/sd/source/ui/framework/module/ModuleController.cxx
+++ b/sd/source/ui/framework/module/ModuleController.cxx
@@ -29,8 +29,6 @@
 #include <tools/diagnose_ex.h>
 #include <sal/log.hxx>
 
-#include <facreg.hxx>
-
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::drawing::framework;
diff --git a/sd/source/ui/framework/module/PresentationModule.cxx b/sd/source/ui/framework/module/PresentationModule.cxx
index 92e369138c16..38d37766f5ba 100644
--- a/sd/source/ui/framework/module/PresentationModule.cxx
+++ b/sd/source/ui/framework/module/PresentationModule.cxx
@@ -20,7 +20,6 @@
 #include <framework/PresentationModule.hxx>
 
 #include "CenterViewFocusModule.hxx"
-#include "SlideSorterModule.hxx"
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
diff --git a/sd/source/ui/framework/module/ToolBarModule.cxx b/sd/source/ui/framework/module/ToolBarModule.cxx
index 42d4549da228..d4f3932a2f9c 100644
--- a/sd/source/ui/framework/module/ToolBarModule.cxx
+++ b/sd/source/ui/framework/module/ToolBarModule.cxx
@@ -21,7 +21,6 @@
 #include <ViewShellBase.hxx>
 #include <DrawController.hxx>
 #include <framework/FrameworkHelper.hxx>
-#include <framework/ConfigurationController.hxx>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
diff --git a/sd/source/ui/framework/module/ViewTabBarModule.cxx b/sd/source/ui/framework/module/ViewTabBarModule.cxx
index 2e026de3cdc1..4a6f0f12f02f 100644
--- a/sd/source/ui/framework/module/ViewTabBarModule.cxx
+++ b/sd/source/ui/framework/module/ViewTabBarModule.cxx
@@ -20,7 +20,6 @@
 #include "ViewTabBarModule.hxx"
 
 #include <framework/FrameworkHelper.hxx>
-#include <framework/ConfigurationController.hxx>
 #include <com/sun/star/drawing/framework/XControllerManager.hpp>
 #include <com/sun/star/drawing/framework/XTabBar.hpp>
 
diff --git a/sd/source/ui/framework/tools/FrameworkHelper.cxx b/sd/source/ui/framework/tools/FrameworkHelper.cxx
index 67818b6a6313..9e7fb199b27a 100644
--- a/sd/source/ui/framework/tools/FrameworkHelper.cxx
+++ b/sd/source/ui/framework/tools/FrameworkHelper.cxx
@@ -25,18 +25,14 @@
 #include <framework/ResourceId.hxx>
 #include <framework/ViewShellWrapper.hxx>
 #include <ViewShellBase.hxx>
-#include <FrameView.hxx>
 #include <DrawViewShell.hxx>
 #include <ViewShellHint.hxx>
-#include <DrawController.hxx>
 #include <app.hrc>
 #include <com/sun/star/drawing/framework/XControllerManager.hpp>
-#include <com/sun/star/drawing/framework/XPane.hpp>
 #include <cppuhelper/compbase.hxx>
 #include <svl/lstner.hxx>
 
 #include <sfx2/request.hxx>
-#include <sfx2/dispatch.hxx>
 
 #include <MutexOwner.hxx>
 #include <vcl/svapp.hxx>
diff --git a/sd/source/ui/func/bulmaper.cxx b/sd/source/ui/func/bulmaper.cxx
index 6ba3f8ceb6bc..13bb404e4be9 100644
--- a/sd/source/ui/func/bulmaper.cxx
+++ b/sd/source/ui/func/bulmaper.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <svx/svxids.hrc>
+#include <editeng/editids.hrc>
 
 //-> Fonts & Items
 #include <vcl/font.hxx>
@@ -31,13 +31,9 @@
 #include <editeng/shdditem.hxx>
 
 //<- Fonts & Items
-#include <editeng/bulletitem.hxx>
-#include <editeng/brushitem.hxx>
-#include <vcl/graph.hxx>
 #include <svl/itemset.hxx>
 #include <svl/itempool.hxx>
 #include <editeng/numitem.hxx>
-#include <editeng/eeitem.hxx>
 
 #include <bulmaper.hxx>
 
diff --git a/sd/source/ui/func/fuarea.cxx b/sd/source/ui/func/fuarea.cxx
index a7cfa3fef87f..e75ab54a8f9a 100644
--- a/sd/source/ui/func/fuarea.cxx
+++ b/sd/source/ui/func/fuarea.cxx
@@ -20,8 +20,6 @@
 #include <fuarea.hxx>
 
 #include <svx/svxids.hrc>
-#include <svl/intitem.hxx>
-#include <svl/stritem.hxx>
 #include <sfx2/request.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/bindings.hxx>
@@ -29,11 +27,7 @@
 
 #include <drawdoc.hxx>
 #include <View.hxx>
-#include <Window.hxx>
-#include <app.hrc>
 #include <svx/svxdlg.hxx>
-#include <svx/dialogs.hrc>
-#include <memory>
 
 namespace sd {
 
diff --git a/sd/source/ui/func/fubullet.cxx b/sd/source/ui/func/fubullet.cxx
index d50ae9a82a48..1f2e1c9877ff 100644
--- a/sd/source/ui/func/fubullet.cxx
+++ b/sd/source/ui/func/fubullet.cxx
@@ -38,11 +38,7 @@
 #include <svl/itempool.hxx>
 
 #include <svx/svxdlg.hxx>
-#include <svx/dialogs.hrc>
-#include <drawview.hxx>
-#include <memory>
-
-#include <app.hrc>
+#include <svx/svxids.hrc>
 
 namespace sd {
 
diff --git a/sd/source/ui/func/fuchar.cxx b/sd/source/ui/func/fuchar.cxx
index 1e00b5803ac6..6b5cad68a973 100644
--- a/sd/source/ui/func/fuchar.cxx
+++ b/sd/source/ui/func/fuchar.cxx
@@ -18,11 +18,9 @@
  */
 
 #include <fuchar.hxx>
-#include <svx/dialogs.hrc>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/sfxdlg.hxx>
 
-#include <editeng/editdata.hxx>
 #include <svx/svxids.hrc>
 #include <editeng/eeitem.hxx>
 #include <editeng/colritem.hxx>
@@ -30,14 +28,10 @@
 #include <sfx2/bindings.hxx>
 #include <sfx2/request.hxx>
 #include <View.hxx>
-#include <Window.hxx>
-#include <drawview.hxx>
 #include <drawdoc.hxx>
-#include <DrawViewShell.hxx>
 #include <ViewShell.hxx>
 #include <DrawDocShell.hxx>
 #include <sdabstdlg.hxx>
-#include <memory>
 
 namespace sd {
 
diff --git a/sd/source/ui/func/fucon3d.cxx b/sd/source/ui/func/fucon3d.cxx
index 4e6b82cc3d3f..d5ee31160b63 100644
--- a/sd/source/ui/func/fucon3d.cxx
+++ b/sd/source/ui/func/fucon3d.cxx
@@ -21,14 +21,10 @@
 #include <vcl/waitobj.hxx>
 
 #include <svx/svxids.hrc>
-#include <svl/aeitem.hxx>
-#include <sfx2/app.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <tools/poly.hxx>
 
-#include <math.h>
-#include <svx/globl3d.hxx>
 #include <svx/scene3d.hxx>
 #include <svx/sphere3d.hxx>
 #include <svx/cube3d.hxx>
diff --git a/sd/source/ui/func/fuconarc.cxx b/sd/source/ui/func/fuconarc.cxx
index 9ca9d9468733..ee7f1d54f650 100644
--- a/sd/source/ui/func/fuconarc.cxx
+++ b/sd/source/ui/func/fuconarc.cxx
@@ -22,15 +22,12 @@
 #include <svx/svdocirc.hxx>
 #include <sfx2/request.hxx>
 #include <svl/intitem.hxx>
-#include <svl/aeitem.hxx>
 #include <sfx2/dispatch.hxx>
 #include <svx/svdobj.hxx>
 #include <sfx2/viewfrm.hxx>
 
 #include <svx/svxids.hrc>
-#include <math.h>
 
-#include <app.hrc>
 #include <Window.hxx>
 #include <drawdoc.hxx>
 
diff --git a/sd/source/ui/func/fuconbez.cxx b/sd/source/ui/func/fuconbez.cxx
index 12c680cbaf57..b95d2c2bb704 100644
--- a/sd/source/ui/func/fuconbez.cxx
+++ b/sd/source/ui/func/fuconbez.cxx
@@ -20,7 +20,6 @@
 #include <com/sun/star/presentation/EffectNodeType.hpp>
 
 #include <fuconbez.hxx>
-#include <svl/aeitem.hxx>
 #include <svx/svdopath.hxx>
 #include <svl/intitem.hxx>
 #include <sfx2/dispatch.hxx>
diff --git a/sd/source/ui/func/fuconcs.cxx b/sd/source/ui/func/fuconcs.cxx
index 7af006896a84..5c5a0a7f0203 100644
--- a/sd/source/ui/func/fuconcs.cxx
+++ b/sd/source/ui/func/fuconcs.cxx
@@ -19,48 +19,25 @@
 
 #include <fuconcs.hxx>
 #include <rtl/ustring.hxx>
-#include <svx/svdpagv.hxx>
 
 #include <svx/svxids.hrc>
-#include <svx/dialogs.hrc>
-
-#include <app.hrc>
-#include <svl/aeitem.hxx>
-#include <svx/xlnstwit.hxx>
-#include <svx/xlnedwit.hxx>
-#include <svx/xlnedit.hxx>
-#include <svx/xlnstit.hxx>
-#include <svx/xlnwtit.hxx>
+
 #include <sfx2/viewfrm.hxx>
-#include <svx/sdtmfitm.hxx>
-#include <svx/sxekitm.hxx>
-#include <svx/sderitm.hxx>
 #include <sfx2/dispatch.hxx>
-#include <svx/svdopath.hxx>
-#include <svx/svdocirc.hxx>
-#include <svl/intitem.hxx>
 #include <sfx2/request.hxx>
 #include <editeng/adjustitem.hxx>
 #include <editeng/eeitem.hxx>
-#include <svx/xtable.hxx>
-#include <svx/sdasitm.hxx>
 #include <svx/svdoashp.hxx>
 #include <svx/sdtagitm.hxx>
 
-#include <svx/svdocapt.hxx>
-
-#include <svx/svdomeas.hxx>
 #include <ViewShell.hxx>
 #include <ViewShellBase.hxx>
 #include <ToolBarManager.hxx>
-#include <editeng/writingmodeitem.hxx>
 #include <svx/gallery.hxx>
 #include <svl/itempool.hxx>
 
 #include <View.hxx>
-#include <sdpage.hxx>
 #include <Window.hxx>
-#include <stlpool.hxx>
 #include <drawdoc.hxx>
 
 namespace sd {
diff --git a/sd/source/ui/func/fuconnct.cxx b/sd/source/ui/func/fuconnct.cxx
index fb5cb5afba0d..fc95b4907746 100644
--- a/sd/source/ui/func/fuconnct.cxx
+++ b/sd/source/ui/func/fuconnct.cxx
@@ -20,11 +20,9 @@
 #include <fuconnct.hxx>
 #include <sfx2/request.hxx>
 #include <View.hxx>
-#include <ViewShell.hxx>
 #include <drawdoc.hxx>
 #include <svx/svxdlg.hxx>
 #include <svx/dialogs.hrc>
-#include <memory>
 
 namespace sd {
 
diff --git a/sd/source/ui/func/fuconrec.cxx b/sd/source/ui/func/fuconrec.cxx
index 4016f31e1174..6cf702a5d4c9 100644
--- a/sd/source/ui/func/fuconrec.cxx
+++ b/sd/source/ui/func/fuconrec.cxx
@@ -25,7 +25,6 @@
 #include <svx/dialmgr.hxx>
 
 #include <app.hrc>
-#include <svl/aeitem.hxx>
 #include <svl/itemset.hxx>
 #include <svx/xlnstwit.hxx>
 #include <svx/xlnedwit.hxx>
@@ -45,7 +44,7 @@
 #include <editeng/eeitem.hxx>
 #include <svx/xtable.hxx>
 #include <svx/xfltrit.hxx>
-#include <svx/xfillit.hxx>
+#include <svx/xflclit.hxx>
 
 #include <svx/svdocapt.hxx>
 
@@ -61,7 +60,6 @@
 #include <View.hxx>
 #include <sdpage.hxx>
 #include <Window.hxx>
-#include <stlpool.hxx>
 #include <drawdoc.hxx>
 #include <unokywds.hxx>
 
diff --git a/sd/source/ui/func/fuconstr.cxx b/sd/source/ui/func/fuconstr.cxx
index d3c7b93c89f7..d5ab09812688 100644
--- a/sd/source/ui/func/fuconstr.cxx
+++ b/sd/source/ui/func/fuconstr.cxx
@@ -20,7 +20,6 @@
 #include <fuconstr.hxx>
 
 #include <svx/svxids.hrc>
-#include <svl/aeitem.hxx>
 #include <svx/svdpagv.hxx>
 #include <svx/xdef.hxx>
 #include <svx/xfillit0.hxx>
@@ -38,8 +37,6 @@
 #include <FrameView.hxx>
 #include <sdpage.hxx>
 #include <sdresid.hxx>
-#include <stlpool.hxx>
-#include <svx/globl3d.hxx>
 #include <glob.hxx>
 
 using namespace com::sun::star;
diff --git a/sd/source/ui/func/fuconuno.cxx b/sd/source/ui/func/fuconuno.cxx
index a2f345c25e94..6edfaaa769c9 100644
--- a/sd/source/ui/func/fuconuno.cxx
+++ b/sd/source/ui/func/fuconuno.cxx
@@ -19,25 +19,18 @@
 
 #include <fuconuno.hxx>
 #include <rtl/ustring.hxx>
-#include <svl/aeitem.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/request.hxx>
 #include <svl/intitem.hxx>
-
-#include <svx/fmglob.hxx>
-
-#include <svx/dialogs.hrc>
+#include <svx/svxids.hrc>
 #include <vcl/ptrstyle.hxx>
 
-#include <app.hrc>
-#include <strings.hrc>
 #include <ViewShell.hxx>
 #include <View.hxx>
 #include <Window.hxx>
 #include <ViewShellBase.hxx>
 #include <ToolBarManager.hxx>
-#include <drawdoc.hxx>
 #include <unokywds.hxx>
 
 
diff --git a/sd/source/ui/func/fucopy.cxx b/sd/source/ui/func/fucopy.cxx
index 18e7dbb5e1bf..69298c352a86 100644
--- a/sd/source/ui/func/fucopy.cxx
+++ b/sd/source/ui/func/fucopy.cxx
@@ -19,19 +19,15 @@
 
 #include <fucopy.hxx>
 #include <sfx2/progress.hxx>
-#include <svx/svxids.hrc>
 
+#include <sdattr.hrc>
 #include <sdresid.hxx>
-#include <sdattr.hxx>
 #include <strings.hrc>
 #include <ViewShell.hxx>
 #include <View.hxx>
-#include <Window.hxx>
 #include <drawdoc.hxx>
 #include <DrawDocShell.hxx>
-#include <vcl/wrkwin.hxx>
 #include <svx/svdobj.hxx>
-#include <sfx2/app.hxx>
 #include <svx/xcolit.hxx>
 #include <svx/xflclit.hxx>
 #include <svx/xdef.hxx>
diff --git a/sd/source/ui/func/fucushow.cxx b/sd/source/ui/func/fucushow.cxx
index 7350da59c6ea..a87076b8ed6f 100644
--- a/sd/source/ui/func/fucushow.cxx
+++ b/sd/source/ui/func/fucushow.cxx
@@ -21,16 +21,13 @@
 
 #include <svx/svxids.hrc>
 
-#include <app.hrc>
 #include <ViewShell.hxx>
 #include <Window.hxx>
 #include <drawdoc.hxx>
-#include <sdpage.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/viewfrm.hxx>
 
 #include <sdabstdlg.hxx>
-#include <memory>
 
 namespace sd {
 
diff --git a/sd/source/ui/func/fudraw.cxx b/sd/source/ui/func/fudraw.cxx
index 4d847373fbd3..45a5629609bd 100644
--- a/sd/source/ui/func/fudraw.cxx
+++ b/sd/source/ui/func/fudraw.cxx
@@ -19,7 +19,6 @@
 
 #include <sal/config.h>
 
-#include <editeng/eeitem.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/waitobj.hxx>
 #include <vcl/ptrstyle.hxx>
@@ -41,8 +40,6 @@
 #include <sfx2/viewfrm.hxx>
 
 #include <anminfo.hxx>
-#include <imapinfo.hxx>
-#include <app.hrc>
 #include <strings.hrc>
 
 
@@ -55,11 +52,9 @@
 #include <Window.hxx>
 #include <drawdoc.hxx>
 #include <DrawDocShell.hxx>
-#include <Client.hxx>
 #include <sdresid.hxx>
 #include <drawview.hxx>
 #include <fusel.hxx>
-#include <svl/aeitem.hxx>
 #include <vcl/weld.hxx>
 #include <slideshow.hxx>
 #include <svx/sdrhittesthelper.hxx>
diff --git a/sd/source/ui/func/fudspord.cxx b/sd/source/ui/func/fudspord.cxx
index f3b620a57d9a..f129c523ccb4 100644
--- a/sd/source/ui/func/fudspord.cxx
+++ b/sd/source/ui/func/fudspord.cxx
@@ -19,7 +19,6 @@
 
 #include <fudspord.hxx>
 
-#include <svx/svxids.hrc>
 #include <vcl/ptrstyle.hxx>
 
 #include <app.hrc>
@@ -27,7 +26,6 @@
 #include <ViewShell.hxx>
 #include <View.hxx>
 #include <Window.hxx>
-#include <drawdoc.hxx>
 
 namespace sd {
 
diff --git a/sd/source/ui/func/fuediglu.cxx b/sd/source/ui/func/fuediglu.cxx
index 8317c7a817e1..678582736ceb 100644
--- a/sd/source/ui/func/fuediglu.cxx
+++ b/sd/source/ui/func/fuediglu.cxx
@@ -19,15 +19,12 @@
 
 #include <fuediglu.hxx>
 #include <svl/eitem.hxx>
-#include <svx/dialogs.hrc>
 #include <svx/svdglue.hxx>
 #include <sfx2/request.hxx>
 
 #include <app.hrc>
 
 #include <Window.hxx>
-#include <drawdoc.hxx>
-#include <FrameView.hxx>
 #include <View.hxx>
 #include <ViewShell.hxx>
 #include <ViewShellBase.hxx>
diff --git a/sd/source/ui/func/fuexpand.cxx b/sd/source/ui/func/fuexpand.cxx
index 4944caa7a055..3366028dd4d4 100644
--- a/sd/source/ui/func/fuexpand.cxx
+++ b/sd/source/ui/func/fuexpand.cxx
@@ -23,7 +23,6 @@
 #include <svx/svdotext.hxx>
 #include <svx/xlineit0.hxx>
 #include <svx/svdundo.hxx>
-#include <sfx2/printer.hxx>
 #include <editeng/outlobj.hxx>
 #include <svx/svdetc.hxx>
 #include <xmloff/autolayout.hxx>
@@ -35,12 +34,9 @@
 #include <View.hxx>
 #include <sdpage.hxx>
 #include <Outliner.hxx>
-#include <drawview.hxx>
 #include <drawdoc.hxx>
 #include <ViewShell.hxx>
-#include <DrawDocShell.hxx>
 #include <sdresid.hxx>
-#include <optsitem.hxx>
 #include <sdmod.hxx>
 #include <sfx2/dispatch.hxx>
 #include <editeng/eeitem.hxx>
diff --git a/sd/source/ui/func/fuformatpaintbrush.cxx b/sd/source/ui/func/fuformatpaintbrush.cxx
index 7939a88851a1..e4c305808b6f 100644
--- a/sd/source/ui/func/fuformatpaintbrush.cxx
+++ b/sd/source/ui/func/fuformatpaintbrush.cxx
@@ -22,26 +22,17 @@
 #include <sfx2/dispatch.hxx>
 #include <sfx2/viewfrm.hxx>
 
-#include <svl/itemiter.hxx>
-
-#include <svx/globl3d.hxx>
 #include <svx/svxids.hrc>
 #include <svx/svdotable.hxx>
 #include <svx/svdundo.hxx>
 #include <editeng/outliner.hxx>
-#include <editeng/eeitem.hxx>
-#include <editeng/editeng.hxx>
 #include <vcl/ptrstyle.hxx>
 
-#include <sdmod.hxx>
-
 #include <fuformatpaintbrush.hxx>
 #include <drawview.hxx>
-#include <DrawDocShell.hxx>
 #include <DrawViewShell.hxx>
 #include <FrameView.hxx>
 #include <drawdoc.hxx>
-#include <Outliner.hxx>
 #include <ViewShellBase.hxx>
 
 #include <Window.hxx>
diff --git a/sd/source/ui/func/fuhhconv.cxx b/sd/source/ui/func/fuhhconv.cxx
index eb54b73af5ad..eea58f039c93 100644
--- a/sd/source/ui/func/fuhhconv.cxx
+++ b/sd/source/ui/func/fuhhconv.cxx
@@ -23,7 +23,6 @@
 #include <com/sun/star/lang/XMultiComponentFactory.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/awt/XWindow.hpp>
-#include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <comphelper/propertysequence.hxx>
 #include <cppuhelper/bootstrap.hxx>
@@ -51,8 +50,6 @@ using namespace ::com::sun::star::uno;
 
 namespace sd {
 
-class ViewShell;
-
 
 FuHangulHanjaConversion::FuHangulHanjaConversion (
     ViewShell* pViewSh,
diff --git a/sd/source/ui/func/fuinsert.cxx b/sd/source/ui/func/fuinsert.cxx
index cd7860b48c4b..d0093616d858 100644
--- a/sd/source/ui/func/fuinsert.cxx
+++ b/sd/source/ui/func/fuinsert.cxx
@@ -29,29 +29,18 @@
 #include <com/sun/star/embed/XComponentSupplier.hpp>
 #include <com/sun/star/embed/Aspects.hpp>
 #include <com/sun/star/embed/XEmbeddedObject.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/chart2/XChartDocument.hpp>
-#include <com/sun/star/drawing/FillStyle.hpp>
-#include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
 
-#include <tools/urlobj.hxx>
-#include <svl/urihelper.hxx>
 #include <sfx2/docfile.hxx>
 #include <sfx2/msgpool.hxx>
 #include <sfx2/msg.hxx>
-#include <sfx2/filedlghelper.hxx>
 #include <svtools/insdlg.hxx>
 #include <sfx2/request.hxx>
 #include <svl/globalnameitem.hxx>
-#include <unotools/pathoptions.hxx>
 #include <svtools/miscopt.hxx>
 #include <svtools/embedhlp.hxx>
-#include <svx/dialogs.hrc>
-#include <sfx2/linkmgr.hxx>
 #include <svx/linkwarn.hxx>
-#include <svx/svdetc.hxx>
 #include <avmedia/mediawindow.hxx>
-#include <sfx2/printer.hxx>
 #include <comphelper/classids.hxx>
 #include <svtools/sfxecode.hxx>
 #include <vcl/transfer.hxx>
@@ -59,21 +48,17 @@
 #include <svx/svdobj.hxx>
 #include <svx/svdograf.hxx>
 #include <svx/svdoole2.hxx>
-#include <svx/svdomedia.hxx>
-#include <editeng/editeng.hxx>
-#include <sot/storage.hxx>
 #include <sot/formats.hxx>
 #include <svx/svdpagv.hxx>
 #include <sfx2/opengrf.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <svx/charthelper.hxx>
+#include <svx/svxids.hrc>
 
-#include <app.hrc>
 #include <sdresid.hxx>
 #include <View.hxx>
 #include <sdmod.hxx>
 #include <Window.hxx>
-#include <drawview.hxx>
 #include <DrawViewShell.hxx>
 #include <DrawDocShell.hxx>
 #include <GraphicDocShell.hxx>
@@ -81,9 +66,7 @@
 #include <drawdoc.hxx>
 #include <sdpage.hxx>
 #include <sdgrffilter.hxx>
-#include <sdxfer.hxx>
 #include <vcl/svapp.hxx>
-#include <undo/undoobjects.hxx>
 #include <memory>
 #include <vcl/weld.hxx>
 #include <vcl/errinf.hxx>
diff --git a/sd/source/ui/func/fuinsfil.cxx b/sd/source/ui/func/fuinsfil.cxx
index 05b5c5ff36de..81a8da28fd64 100644
--- a/sd/source/ui/func/fuinsfil.cxx
+++ b/sd/source/ui/func/fuinsfil.cxx
@@ -19,7 +19,6 @@
 
 #include <fuinsfil.hxx>
 #include <vcl/svapp.hxx>
-#include <vcl/wrkwin.hxx>
 #include <sfx2/progress.hxx>
 #include <editeng/outliner.hxx>
 #include <editeng/outlobj.hxx>
@@ -28,22 +27,18 @@
 #include <sfx2/request.hxx>
 #include <sfx2/app.hxx>
 #include <vcl/weld.hxx>
-#include <sfx2/printer.hxx>
 #include <svx/svdorect.hxx>
 #include <svx/svdundo.hxx>
 #include <svx/svdoutl.hxx>
 #include <sfx2/filedlghelper.hxx>
 #include <sot/formats.hxx>
-#include <svl/urihelper.hxx>
-#include <editeng/forbiddencharacterstable.hxx>
 #include <sfx2/docfile.hxx>
 #include <sfx2/docfilt.hxx>
 #include <sfx2/fcontnr.hxx>
 #include <svx/svdpagv.hxx>
-#include <svx/dialogs.hrc>
+#include <svx/svxids.hrc>
 #include <com/sun/star/ui/dialogs/XFilterManager.hpp>
 #include <com/sun/star/ui/dialogs/XFilePicker.hpp>
-#include <com/sun/star/ui/dialogs/XFilePickerControlAccess.hpp>
 #include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
 
 #include <sdresid.hxx>
@@ -51,18 +46,14 @@
 #include <Window.hxx>
 #include <View.hxx>
 #include <strings.hrc>
-#include <stlpool.hxx>
 #include <sdmod.hxx>
 #include <sdpage.hxx>
-#include <strmname.h>
 #include <ViewShellBase.hxx>
 #include <DrawViewShell.hxx>
 #include <OutlineView.hxx>
-#include <OutlineViewShell.hxx>
 #include <DrawDocShell.hxx>
 #include <GraphicDocShell.hxx>
 #include <app.hrc>
-#include <unmovss.hxx>
 #include <Outliner.hxx>
 #include <sdabstdlg.hxx>
 #include <memory>
diff --git a/sd/source/ui/func/fuline.cxx b/sd/source/ui/func/fuline.cxx
index 5ddefa8b5cc6..7908505d2326 100644
--- a/sd/source/ui/func/fuline.cxx
+++ b/sd/source/ui/func/fuline.cxx
@@ -20,21 +20,13 @@
 #include <fuline.hxx>
 
 #include <svx/svxids.hrc>
-#include <svx/tabline.hxx>
-#include <svx/xenum.hxx>
-#include <svl/intitem.hxx>
-#include <svl/stritem.hxx>
 #include <sfx2/request.hxx>
-#include <svx/xdef.hxx>
 #include <sfx2/bindings.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <ViewShell.hxx>
 #include <View.hxx>
-#include <Window.hxx>
 #include <drawdoc.hxx>
-#include <app.hrc>
 #include <svx/svxdlg.hxx>
-#include <svx/dialogs.hrc>
 #include <memory>
 
 namespace sd {
diff --git a/sd/source/ui/func/fulinend.cxx b/sd/source/ui/func/fulinend.cxx
index 81d3ca189ebf..6f9df0b16028 100644
--- a/sd/source/ui/func/fulinend.cxx
+++ b/sd/source/ui/func/fulinend.cxx
@@ -20,14 +20,12 @@
 #include <fulinend.hxx>
 #include <svx/xtable.hxx>
 #include <svx/svxdlg.hxx>
-#include <svx/dialogs.hrc>
 #include <svx/svdobj.hxx>
 #include <svx/svdopath.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/weld.hxx>
 
 #include <strings.hrc>
-#include <ViewShell.hxx>
 #include <helpids.h>
 #include <sdresid.hxx>
 #include <drawdoc.hxx>
diff --git a/sd/source/ui/func/fulink.cxx b/sd/source/ui/func/fulink.cxx
index 5b21bb3a0402..8a6d726deca1 100644
--- a/sd/source/ui/func/fulink.cxx
+++ b/sd/source/ui/func/fulink.cxx
@@ -19,17 +19,14 @@
 
 #include <fulink.hxx>
 
-#include <sfx2/linkmgr.hxx>
 #include <sfx2/bindings.hxx>
 #include <sfx2/viewfrm.hxx>
 
 #include <svx/svxdlg.hxx>
 
-#include <Window.hxx>
 #include <drawdoc.hxx>
 #include <ViewShell.hxx>
 #include <app.hrc>
-#include <memory>
 
 class SfxRequest;
 
diff --git a/sd/source/ui/func/fumeasur.cxx b/sd/source/ui/func/fumeasur.cxx
index e7ec6224a8ea..27afd0f7a120 100644
--- a/sd/source/ui/func/fumeasur.cxx
+++ b/sd/source/ui/func/fumeasur.cxx
@@ -20,11 +20,9 @@
 #include <fumeasur.hxx>
 #include <sfx2/request.hxx>
 #include <View.hxx>
-#include <ViewShell.hxx>
 #include <drawdoc.hxx>
 #include <svx/svxdlg.hxx>
 #include <svx/dialogs.hrc>
-#include <memory>
 
 namespace sd {
 
diff --git a/sd/source/ui/func/fumorph.cxx b/sd/source/ui/func/fumorph.cxx
index 09ad824f9a7a..0519633b9138 100644
--- a/sd/source/ui/func/fumorph.cxx
+++ b/sd/source/ui/func/fumorph.cxx
@@ -18,17 +18,15 @@
  */
 
 #include <fumorph.hxx>
-#include <svx/xfillit.hxx>
-#include <svx/xlineit.hxx>
-#include <svx/svdpool.hxx>
-#include <tools/poly.hxx>
+#include <svx/xlnclit.hxx>
+#include <svx/xlnwtit.hxx>
+#include <svx/xflclit.hxx>
 #include <svx/svdopath.hxx>
 #include <svx/svdogrp.hxx>
 #include <editeng/eeitem.hxx>
 #include <editeng/outlobj.hxx>
 
 #include <View.hxx>
-#include <ViewShell.hxx>
 #include <Window.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
@@ -44,7 +42,6 @@
 
 #include <basegfx/color/bcolor.hxx>
 #include <com/sun/star/drawing/LineStyle.hpp>
-#include <memory>
 
 using namespace com::sun::star;
 
diff --git a/sd/source/ui/func/fuoaprms.cxx b/sd/source/ui/func/fuoaprms.cxx
index 785006055dc0..a105c95275f6 100644
--- a/sd/source/ui/func/fuoaprms.cxx
+++ b/sd/source/ui/func/fuoaprms.cxx
@@ -18,18 +18,15 @@
  */
 
 #include <fuoaprms.hxx>
+#include <sdattr.hrc>
 
-#include <sdattr.hxx>
-#include <svx/svdpagv.hxx>
 #include <editeng/colritem.hxx>
 #include <svx/svdundo.hxx>
-#include <vcl/fixed.hxx>
 #include <sfx2/objsh.hxx>
 #include <sfx2/request.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/sfxdlg.hxx>
 #include <svl/aeitem.hxx>
-#include <svx/xtable.hxx>
 #include <svx/svdopath.hxx>
 
 #include <strings.hrc>
@@ -40,7 +37,6 @@
 #include <unoaprms.hxx>
 #include <sdundogr.hxx>
 #include <View.hxx>
-#include <Window.hxx>
 #include <sdabstdlg.hxx>
 #include <sdresid.hxx>
 #include <tools/helpers.hxx>
diff --git a/sd/source/ui/func/fuolbull.cxx b/sd/source/ui/func/fuolbull.cxx
index e695eaad8c70..72262c7235f7 100644
--- a/sd/source/ui/func/fuolbull.cxx
+++ b/sd/source/ui/func/fuolbull.cxx
@@ -26,10 +26,8 @@
 #include <editeng/numitem.hxx>
 #include <strings.hxx>
 
-#include <editeng/editdata.hxx>
 #include <svx/svxids.hrc>
 #include <OutlineView.hxx>
-#include <OutlineViewShell.hxx>
 #include <DrawDocShell.hxx>
 #include <DrawViewShell.hxx>
 #include <Window.hxx>
diff --git a/sd/source/ui/func/fuoltext.cxx b/sd/source/ui/func/fuoltext.cxx
index adfd2b3ef121..9131de20c4d8 100644
--- a/sd/source/ui/func/fuoltext.cxx
+++ b/sd/source/ui/func/fuoltext.cxx
@@ -21,7 +21,6 @@
 
 #include <sfx2/viewfrm.hxx>
 #include <editeng/outliner.hxx>
-#include <editeng/eeitem.hxx>
 #include <editeng/flditem.hxx>
 #include <sfx2/bindings.hxx>
 #include <sfx2/docfile.hxx>
@@ -37,8 +36,6 @@
 
 #include <memory>
 
-#include <stdio.h>
-
 namespace sd {
 
 static const sal_uInt16 SidArray[] = {
diff --git a/sd/source/ui/func/fupage.cxx b/sd/source/ui/func/fupage.cxx
index 4f84ee9df596..ba77b29c54ef 100644
--- a/sd/source/ui/func/fupage.cxx
+++ b/sd/source/ui/func/fupage.cxx
@@ -19,38 +19,28 @@
 
 #include <fupage.hxx>
 
-#include <sfx2/viewfrm.hxx>
-
 // arrange Tab-Page
 
 #include <sfx2/sfxdlg.hxx>
 #include <svx/svxids.hrc>
-#include <svx/dialogs.hrc>
 #include <svl/itempool.hxx>
-#include <vcl/layout.hxx>
 #include <sfx2/request.hxx>
-#include <svl/stritem.hxx>
 #include <vcl/prntypes.hxx>
-#include <svl/style.hxx>
 #include <stlsheet.hxx>
-#include <svx/svdorect.hxx>
-#include <svx/svdundo.hxx>
 #include <editeng/eeitem.hxx>
 #include <editeng/frmdiritem.hxx>
 #include <svx/graphichelper.hxx>
 #include <svx/xbtmpit.hxx>
-#include <svx/xsetit.hxx>
+#include <svx/xflbstit.hxx>
+#include <svx/xflbmtit.hxx>
 #include <editeng/ulspitem.hxx>
 #include <editeng/lrspitem.hxx>
 #include <svx/sdr/properties/properties.hxx>
-#include <sfx2/bindings.hxx>
 #include <editeng/shaditem.hxx>
 #include <editeng/boxitem.hxx>
 #include <editeng/sizeitem.hxx>
 #include <editeng/pbinitem.hxx>
-#include <sfx2/app.hxx>
 #include <sfx2/opengrf.hxx>
-#include <rtl/ustring.hxx>
 
 #include <strings.hrc>
 #include <sdpage.hxx>
@@ -60,22 +50,17 @@
 #include <drawdoc.hxx>
 #include <DrawDocShell.hxx>
 #include <ViewShell.hxx>
-#include <ViewShellBase.hxx>
 #include <DrawViewShell.hxx>
 #include <app.hrc>
 #include <unchss.hxx>
 #include <undoback.hxx>
 #include <sdabstdlg.hxx>
 #include <sdresid.hxx>
-#include <sdundogr.hxx>
-#include <helpids.h>
 
 #include <memory>
 
 using namespace com::sun::star;
 
-namespace vcl { class Window; }
-
 namespace sd {
 
 // 50 cm 28350
diff --git a/sd/source/ui/func/fuparagr.cxx b/sd/source/ui/func/fuparagr.cxx
index ad1e66432233..06480b5bf6a3 100644
--- a/sd/source/ui/func/fuparagr.cxx
+++ b/sd/source/ui/func/fuparagr.cxx
@@ -28,14 +28,11 @@
 #include <editeng/lrspitem.hxx>
 #include <svx/svdoutl.hxx>
 
-#include <app.hrc>
 #include <View.hxx>
 #include <ViewShell.hxx>
-#include <Window.hxx>
 #include <drawdoc.hxx>
 #include <sdabstdlg.hxx>
 #include <sdattr.hrc>
-#include <memory>
 
 namespace sd {
 
diff --git a/sd/source/ui/func/fupoor.cxx b/sd/source/ui/func/fupoor.cxx
index a02e52ea0bae..f1c7154d45d1 100644
--- a/sd/source/ui/func/fupoor.cxx
+++ b/sd/source/ui/func/fupoor.cxx
@@ -20,31 +20,22 @@
 #include <fupoor.hxx>
 
 #include <svx/svxids.hrc>
-#include <svl/aeitem.hxx>
 #include <svx/svdpagv.hxx>
 #include <svx/svdoole2.hxx>
 #include <svx/svdograf.hxx>
 #include <vcl/seleng.hxx>
-#include <sfx2/app.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/bindings.hxx>
 #include <sfx2/request.hxx>
-#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/drawing/XLayer.hpp>
-#include <com/sun/star/drawing/XLayerManager.hpp>
-#include <com/sun/star/container/XChild.hpp>
 
-#include <FrameView.hxx>
 #include <app.hrc>
 #include <fusel.hxx>
 #include <sdpage.hxx>
-#include <drawview.hxx>
 #include <DrawViewShell.hxx>
 #include <Window.hxx>
 #include <drawdoc.hxx>
 #include <DrawDocShell.hxx>
 #include <zoomlist.hxx>
-#include <Client.hxx>
 #include <slideshow.hxx>
 #include <LayerTabBar.hxx>
 
diff --git a/sd/source/ui/func/fuprlout.cxx b/sd/source/ui/func/fuprlout.cxx
index 9e9eb7721596..a0a7e399fd68 100644
--- a/sd/source/ui/func/fuprlout.cxx
+++ b/sd/source/ui/func/fuprlout.cxx
@@ -18,35 +18,23 @@
  */
 
 #include <fuprlout.hxx>
-#include <vcl/wrkwin.hxx>
 #include <sfx2/dispatch.hxx>
-#include <svl/itempool.hxx>
-#include <sot/storage.hxx>
-#include <svx/svdundo.hxx>
 
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/request.hxx>
 
+#include <sdattr.hrc>
 #include <drawdoc.hxx>
 #include <sdpage.hxx>
 #include <pres.hxx>
 #include <DrawViewShell.hxx>
-#include <FrameView.hxx>
-#include <stlpool.hxx>
 #include <View.hxx>
 #include <glob.hxx>
-#include <strmname.h>
 #include <app.hrc>
 #include <DrawDocShell.hxx>
 #include <SlideSorterViewShell.hxx>
 #include <Window.hxx>
-#include <unprlout.hxx>
-#include <unchss.hxx>
-#include <unmovss.hxx>
-#include <sdattr.hxx>
 #include <drawview.hxx>
-#include <editeng/outliner.hxx>
-#include <editeng/editdata.hxx>
 #include <sdabstdlg.hxx>
 #include <memory>
 
diff --git a/sd/source/ui/func/fuscale.cxx b/sd/source/ui/func/fuscale.cxx
index 9a486d488d39..9bcca7f95b3b 100644
--- a/sd/source/ui/func/fuscale.cxx
+++ b/sd/source/ui/func/fuscale.cxx
@@ -19,13 +19,12 @@
 
 #include <fuscale.hxx>
 
-#include <svx/dialogs.hrc>
+#include <svx/svxids.hrc>
 
 #include <app.hrc>
 #include <View.hxx>
 #include <Window.hxx>
 #include <OutlineViewShell.hxx>
-#include <drawview.hxx>
 #include <drawdoc.hxx>
 #include <DrawViewShell.hxx>
 #include <ViewShell.hxx>
@@ -34,7 +33,6 @@
 #include <svx/svdpagv.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/dispatch.hxx>
-#include <svx/zoom_def.hxx>
 #include <sfx2/zoomitem.hxx>
 #include <sfx2/request.hxx>
 #include <svx/svxdlg.hxx>
diff --git a/sd/source/ui/func/fusearch.cxx b/sd/source/ui/func/fusearch.cxx
index 88e1f564e7b5..817d357fa25b 100644
--- a/sd/source/ui/func/fusearch.cxx
+++ b/sd/source/ui/func/fusearch.cxx
@@ -21,16 +21,10 @@
 
 #include <sfx2/viewfrm.hxx>
 
-#include <svx/svxids.hrc>
-#include <svl/srchitem.hxx>
-#include <svx/srchdlg.hxx>
 #include <sfx2/bindings.hxx>
 #include <fupoor.hxx>
-#include <Window.hxx>
 #include <drawdoc.hxx>
 #include <app.hrc>
-#include <sdmod.hxx>
-#include <View.hxx>
 #include <Outliner.hxx>
 #include <DrawDocShell.hxx>
 #include <DrawViewShell.hxx>
diff --git a/sd/source/ui/func/fusel.cxx b/sd/source/ui/func/fusel.cxx
index 136a1c784383..ef74c5eeaa7c 100644
--- a/sd/source/ui/func/fusel.cxx
+++ b/sd/source/ui/func/fusel.cxx
@@ -29,19 +29,16 @@
 #include <drawview.hxx>
 #include <vcl/imapobj.hxx>
 #include <svl/urihelper.hxx>
-#include <unotools/localfilehelper.hxx>
 #include <unotools/securityoptions.hxx>
 #include <svx/svxids.hrc>
 #include <svx/xfillit0.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/viewfrm.hxx>
-#include <svl/aeitem.hxx>
 #include <svl/stritem.hxx>
 #include <svl/intitem.hxx>
 #include <sfx2/dispatch.hxx>
 #include <tools/urlobj.hxx>
 #include <sfx2/docfile.hxx>
-#include <editeng/eeitem.hxx>
 #include <editeng/flditem.hxx>
 
 #include <svx/svdotable.hxx>
@@ -60,11 +57,9 @@
 #include <View.hxx>
 #include <Window.hxx>
 #include <drawdoc.hxx>
-#include <sdpage.hxx>
 #include <DrawViewShell.hxx>
 #include <ToolBarManager.hxx>
 #include <pgjump.hxx>
-#include <svx/globl3d.hxx>
 #include <Client.hxx>
 
 #include <slideshow.hxx>
diff --git a/sd/source/ui/func/fusldlg.cxx b/sd/source/ui/func/fusldlg.cxx
index a783f98b4977..062ef720e8ab 100644
--- a/sd/source/ui/func/fusldlg.cxx
+++ b/sd/source/ui/func/fusldlg.cxx
@@ -19,18 +19,18 @@
 
 #include <fusldlg.hxx>
 #include <svl/itemset.hxx>
+#include <svl/stritem.hxx>
+#include <svl/intitem.hxx>
 
 #include <drawdoc.hxx>
 #include <sdpage.hxx>
 #include <sdresid.hxx>
 #include <strings.hrc>
-#include <sdattr.hxx>
+#include <sdattr.hrc>
 #include <sdmod.hxx>
-#include <ViewShell.hxx>
 #include <Window.hxx>
 #include <optsitem.hxx>
 #include <sdabstdlg.hxx>
-#include <memory>
 
 namespace sd {
 
diff --git a/sd/source/ui/func/fusnapln.cxx b/sd/source/ui/func/fusnapln.cxx
index d1de6ecca556..ea8d0bc035d5 100644
--- a/sd/source/ui/func/fusnapln.cxx
+++ b/sd/source/ui/func/fusnapln.cxx
@@ -23,8 +23,8 @@
 #include <svx/svxids.hrc>
 
 #include <strings.hrc>
+#include <sdattr.hrc>
 
-#include <sdattr.hxx>
 #include <View.hxx>
 #include <ViewShell.hxx>
 #include <DrawViewShell.hxx>
@@ -32,9 +32,7 @@
 #include <sdenumdef.hxx>
 #include <sdresid.hxx>
 #include <sdabstdlg.hxx>
-#include <app.hrc>
 #include <svx/svdpagv.hxx>
-#include <memory>
 
 namespace sd {
 
diff --git a/sd/source/ui/func/fusumry.cxx b/sd/source/ui/func/fusumry.cxx
index 3fcc0bd2279e..2c7c8df8dc3f 100644
--- a/sd/source/ui/func/fusumry.cxx
+++ b/sd/source/ui/func/fusumry.cxx
@@ -21,7 +21,6 @@
 #include <editeng/eeitem.hxx>
 #include <svx/svdotext.hxx>
 #include <svx/svdundo.hxx>
-#include <sfx2/printer.hxx>
 #include <editeng/outlobj.hxx>
 #include <xmloff/autolayout.hxx>
 
@@ -31,13 +30,10 @@
 #include <View.hxx>
 #include <sdpage.hxx>
 #include <Outliner.hxx>
-#include <drawview.hxx>
 #include <drawdoc.hxx>
 #include <ViewShell.hxx>
-#include <DrawDocShell.hxx>
 #include <sdmod.hxx>
 #include <sdresid.hxx>
-#include <optsitem.hxx>
 #include <DrawViewShell.hxx>
 
 using namespace com::sun::star;
diff --git a/sd/source/ui/func/futempl.cxx b/sd/source/ui/func/futempl.cxx
index df2a92a8e415..b30f17008e41 100644
--- a/sd/source/ui/func/futempl.cxx
+++ b/sd/source/ui/func/futempl.cxx
@@ -23,18 +23,13 @@
 
 #include <futempl.hxx>
 
-#include <editeng/editdata.hxx>
-#include <editeng/bulletitem.hxx>
 #include <svx/svxids.hrc>
 #include <sfx2/bindings.hxx>
-#include <svl/aeitem.hxx>
 #include <sfx2/dispatch.hxx>
 #include <editeng/eeitem.hxx>
 #include <sfx2/request.hxx>
 #include <sfx2/sfxdlg.hxx>
 #include <editeng/numitem.hxx>
-#include <editeng/editeng.hxx>
-#include <editeng/lrspitem.hxx>
 #include <svx/svdopage.hxx>
 #include <editeng/colritem.hxx>
 #include <editeng/brushitem.hxx>
@@ -45,14 +40,16 @@
 #include <svx/xlndsit.hxx>
 #include <svx/xlnstit.hxx>
 #include <svx/xlnedit.hxx>
+#include <svx/xbtmpit.hxx>
+#include <svx/xflgrit.hxx>
+#include <svx/xflftrit.hxx>
+#include <svx/xflhtit.hxx>
 #include <app.hrc>
 #include <stlsheet.hxx>
 #include <sdpage.hxx>
 #include <stlpool.hxx>
 #include <sdmod.hxx>
 #include <View.hxx>
-#include <Window.hxx>
-#include <drawview.hxx>
 #include <drawdoc.hxx>
 #include <DrawDocShell.hxx>
 #include <DrawViewShell.hxx>
@@ -60,11 +57,8 @@
 
 #include <strings.hrc>
 #include <prlayout.hxx>
-#include <svx/xfillit.hxx>
 #include <sdresid.hxx>
 #include <OutlineView.hxx>
-#include <OutlineViewShell.hxx>
-#include <helpids.h>
 #include <sdabstdlg.hxx>
 #include <memory>
 
diff --git a/sd/source/ui/func/futext.cxx b/sd/source/ui/func/futext.cxx
index 48a9c7d36dfa..0650d033290e 100644
--- a/sd/source/ui/func/futext.cxx
+++ b/sd/source/ui/func/futext.cxx
@@ -19,19 +19,13 @@
 
 #include <futext.hxx>
 #include <editeng/eeitem.hxx>
-#include <editeng/editerr.hxx>
-#include <svx/dlgutil.hxx>
 #include <svx/sdrpagewindow.hxx>
 #include <svx/sdrpaintwindow.hxx>
-#include <svx/svxerr.hxx>
 #include <tools/urlobj.hxx>
 #include <vcl/help.hxx>
-#include <editeng/editstat.hxx>
 #include <editeng/fhgtitem.hxx>
-#include <svl/aeitem.hxx>
 #include <svl/intitem.hxx>
 #include <svx/svdotext.hxx>
-#include <svx/svdogrp.hxx>
 #include <editeng/flditem.hxx>
 #include <svl/style.hxx>
 #include <svx/svdpagv.hxx>
@@ -41,11 +35,9 @@
 #include <sfx2/request.hxx>
 #include <editeng/editeng.hxx>
 #include <svx/svdoutl.hxx>
-#include <svx/svdotable.hxx>
 #include <svx/svxids.hrc>
 #include <sfx2/docfile.hxx>
 #include <editeng/outlobj.hxx>
-#include <svtools/langtab.hxx>
 
 #include <editeng/frmdiritem.hxx>
 
@@ -58,17 +50,14 @@
 #include <ViewShell.hxx>
 #include <ViewShellBase.hxx>
 #include <View.hxx>
-#include <Outliner.hxx>
 #include <Window.hxx>
 #include <drawdoc.hxx>
 #include <sdpage.hxx>
-#include <sdmod.hxx>
 #include <FrameView.hxx>
 #include <ToolBarManager.hxx>
 #include <DrawDocShell.hxx>
 #include <strings.hrc>
 #include <pres.hxx>
-#include <optsitem.hxx>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
diff --git a/sd/source/ui/func/futhes.cxx b/sd/source/ui/func/futhes.cxx
index b6596189d0cc..75926c3c46b1 100644
--- a/sd/source/ui/func/futhes.cxx
+++ b/sd/source/ui/func/futhes.cxx
@@ -20,18 +20,14 @@
 #include <futhes.hxx>
 
 #include <editeng/outliner.hxx>
-#include <vcl/layout.hxx>
 #include <svx/svdobj.hxx>
 #include <svx/svdotext.hxx>
 #include <editeng/eeitem.hxx>
 
-#include <svx/dialogs.hrc>
 #include <svx/svxerr.hxx>
 #include <svx/dialmgr.hxx>
 #include <editeng/unolingu.hxx>
-#include <app.hrc>
 #include <drawdoc.hxx>
-#include <sdmod.hxx>
 #include <View.hxx>
 #include <Outliner.hxx>
 #include <DrawViewShell.hxx>
diff --git a/sd/source/ui/func/futransf.cxx b/sd/source/ui/func/futransf.cxx
index ca14213fcf01..161fe7237266 100644
--- a/sd/source/ui/func/futransf.cxx
+++ b/sd/source/ui/func/futransf.cxx
@@ -19,14 +19,12 @@
 
 #include <futransf.hxx>
 
-#include <comphelper/scopeguard.hxx>
-#include <svx/dialogs.hrc>
+#include <svx/svxids.hrc>
 #include <sfx2/request.hxx>
 
 #include <strings.hrc>
 #include <ViewShell.hxx>
 #include <View.hxx>
-#include <Window.hxx>
 #include <sdresid.hxx>
 #include <drawdoc.hxx>
 #include <svx/svxdlg.hxx>
diff --git a/sd/source/ui/func/futxtatt.cxx b/sd/source/ui/func/futxtatt.cxx
index 721acabcdcb0..56f8c25696e0 100644
--- a/sd/source/ui/func/futxtatt.cxx
+++ b/sd/source/ui/func/futxtatt.cxx
@@ -21,11 +21,8 @@
 #include <sfx2/request.hxx>
 
 #include <svx/svxdlg.hxx>
-#include <svx/dialogs.hrc>
 #include <View.hxx>
-#include <ViewShell.hxx>
 #include <drawdoc.hxx>
-#include <memory>
 
 namespace sd {
 
diff --git a/sd/source/ui/func/fuvect.cxx b/sd/source/ui/func/fuvect.cxx
index fc7fd0ee03a2..000fee7014f7 100644
--- a/sd/source/ui/func/fuvect.cxx
+++ b/sd/source/ui/func/fuvect.cxx
@@ -18,17 +18,13 @@
  */
 
 #include <fuvect.hxx>
-#include <tools/poly.hxx>
 #include <svx/svdograf.hxx>
-#include <svx/svdedtv.hxx>
 
 #include <View.hxx>
-#include <ViewShell.hxx>
 #include <Window.hxx>
 #include <strings.hrc>
 #include <sdresid.hxx>
 #include <sdabstdlg.hxx>
-#include <memory>
 
 namespace sd
 {
diff --git a/sd/source/ui/func/fuzoom.cxx b/sd/source/ui/func/fuzoom.cxx
index 8b7a63e30ddd..dd2901cb7e42 100644
--- a/sd/source/ui/func/fuzoom.cxx
+++ b/sd/source/ui/func/fuzoom.cxx
@@ -26,11 +26,9 @@
 #include <svx/svdpagv.hxx>
 #include <vcl/ptrstyle.hxx>
 
-#include <FrameView.hxx>
 #include <ViewShell.hxx>
 #include <View.hxx>
 #include <Window.hxx>
-#include <drawdoc.hxx>
 #include <zoomlist.hxx>
 
 namespace sd {
diff --git a/sd/source/ui/func/undoheaderfooter.cxx b/sd/source/ui/func/undoheaderfooter.cxx
index 18a6c5eef0ec..648a2dd35842 100644
--- a/sd/source/ui/func/undoheaderfooter.cxx
+++ b/sd/source/ui/func/undoheaderfooter.cxx
@@ -21,8 +21,6 @@
 #include <sfx2/viewfrm.hxx>
 
 #include <app.hrc>
-#include <DrawViewShell.hxx>
-#include <drawview.hxx>
 #include <undoheaderfooter.hxx>
 
 
diff --git a/sd/source/ui/func/undopage.cxx b/sd/source/ui/func/undopage.cxx
index 6a073dbd6e21..174747bf6c5d 100644
--- a/sd/source/ui/func/undopage.cxx
+++ b/sd/source/ui/func/undopage.cxx
@@ -18,16 +18,7 @@
  */
 
 #include <undopage.hxx>
-
-#include <svx/svxids.hrc>
-#include <sfx2/bindings.hxx>
-#include <sfx2/dispatch.hxx>
-#include <sfx2/viewfrm.hxx>
-
 #include <sdpage.hxx>
-#include <DrawViewShell.hxx>
-#include <drawview.hxx>
-#include <svx/svdpagv.hxx>
 
 
 SdPageFormatUndoAction::~SdPageFormatUndoAction()
diff --git a/sd/source/ui/func/unmovss.cxx b/sd/source/ui/func/unmovss.cxx
index 77391d606a68..eaa37a73a695 100644
--- a/sd/source/ui/func/unmovss.cxx
+++ b/sd/source/ui/func/unmovss.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <unmovss.hxx>
-#include <DrawDocShell.hxx>
 #include <drawdoc.hxx>
 #include <stlsheet.hxx>
 #include <stlpool.hxx>
diff --git a/sd/source/ui/func/unprlout.cxx b/sd/source/ui/func/unprlout.cxx
index c78fe137dcb4..218883349882 100644
--- a/sd/source/ui/func/unprlout.cxx
+++ b/sd/source/ui/func/unprlout.cxx
@@ -23,7 +23,6 @@
 
 #include <strings.hrc>
 #include <sdpage.hxx>
-#include <drawdoc.hxx>
 #include <sdresid.hxx>
 
 
diff --git a/sd/source/ui/inc/framework/Pane.hxx b/sd/source/ui/inc/framework/Pane.hxx
index e2441474e6f7..29efeb5d9417 100644
--- a/sd/source/ui/inc/framework/Pane.hxx
+++ b/sd/source/ui/inc/framework/Pane.hxx
@@ -27,8 +27,7 @@
 #include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <cppuhelper/compbase.hxx>
 #include <vcl/vclptr.hxx>
-
-namespace vcl { class Window; }
+#include <vcl/window.hxx>
 
 namespace sd { namespace framework {
 
diff --git a/sd/source/ui/inc/framework/PresentationFactory.hxx b/sd/source/ui/inc/framework/PresentationFactory.hxx
index e9f10b73794c..d23ad35c0e2d 100644
--- a/sd/source/ui/inc/framework/PresentationFactory.hxx
+++ b/sd/source/ui/inc/framework/PresentationFactory.hxx
@@ -26,7 +26,6 @@
 #include <com/sun/star/drawing/framework/XConfigurationChangeListener.hpp>
 #include <cppuhelper/compbase.hxx>
 
-namespace com { namespace sun { namespace star { namespace drawing { namespace framework { class XConfigurationController; } } } } }
 namespace com { namespace sun { namespace star { namespace frame { class XController; } } } }
 
 namespace sd { namespace framework {
diff --git a/sd/source/ui/inc/fumorph.hxx b/sd/source/ui/inc/fumorph.hxx
index 434beaae4755..1961c3ed4806 100644
--- a/sd/source/ui/inc/fumorph.hxx
+++ b/sd/source/ui/inc/fumorph.hxx
@@ -21,11 +21,11 @@
 #define INCLUDED_SD_SOURCE_UI_INC_FUMORPH_HXX
 
 #include "fupoor.hxx"
+#include <basegfx/polygon/b2dpolypolygon.hxx>
 
 #include <vector>
 
 namespace basegfx {
-    class B2DPolyPolygon;
     class B2DPolygon;
     class B2DPoint;
 }