From 941372b694c0170cdadb2cb16447604011b295a1 Mon Sep 17 00:00:00 2001
From: Gabor Kelemen <kelemen.gabor2@nisz.hu>
Date: Wed, 1 Jan 2020 17:26:50 +0100
Subject: tdf#42949 Fix IWYU warnings in slideshow/

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

Change-Id: Id1c207705b7aa9b057fb8207d735e376675c91d9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86069
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
---
 slideshow/IwyuFilter_slideshow.yaml                | 42 ++++++++++++++++++++++
 .../source/engine/activities/activitiesfactory.cxx |  2 +-
 .../source/engine/activities/activitybase.cxx      |  1 -
 .../activities/continuouskeytimeactivitybase.cxx   |  2 --
 .../activities/continuouskeytimeactivitybase.hxx   |  1 -
 .../source/engine/activities/interpolation.hxx     |  4 +++
 slideshow/source/engine/animatedsprite.cxx         |  1 +
 slideshow/source/engine/animationfactory.cxx       |  2 --
 .../engine/animationnodes/animationaudionode.cxx   |  2 --
 .../engine/animationnodes/animationbasenode.cxx    |  3 --
 .../engine/animationnodes/animationbasenode.hxx    |  1 -
 .../engine/animationnodes/animationcommandnode.cxx |  3 +-
 .../engine/animationnodes/animationcommandnode.hxx |  1 -
 .../engine/animationnodes/animationnodefactory.cxx |  1 -
 .../engine/animationnodes/basecontainernode.cxx    |  1 -
 .../source/engine/animationnodes/basenode.cxx      |  1 -
 .../source/engine/animationnodes/generateevent.cxx |  1 -
 .../source/engine/animationnodes/nodetools.cxx     |  1 -
 .../source/engine/animationnodes/nodetools.hxx     |  2 --
 .../animationnodes/sequentialtimecontainer.cxx     |  3 --
 .../source/engine/animationnodes/setactivity.hxx   |  1 -
 slideshow/source/engine/attributemap.cxx           |  1 -
 slideshow/source/engine/effectrewinder.cxx         |  2 --
 slideshow/source/engine/effectrewinder.hxx         |  1 -
 slideshow/source/engine/eventmultiplexer.cxx       |  5 +--
 slideshow/source/engine/eventqueue.cxx             |  3 --
 slideshow/source/engine/expressionnodefactory.cxx  |  4 ---
 slideshow/source/engine/opengl/TransitionImpl.cxx  |  1 -
 slideshow/source/engine/opengl/TransitionImpl.hxx  |  3 ++
 .../source/engine/opengl/TransitionerImpl.cxx      |  4 ---
 slideshow/source/engine/pointersymbol.cxx          |  4 +--
 slideshow/source/engine/pointersymbol.hxx          |  3 +-
 .../source/engine/rehearsetimingsactivity.cxx      |  4 ---
 .../source/engine/rehearsetimingsactivity.hxx      |  4 +++
 slideshow/source/engine/shapeattributelayer.cxx    |  4 ---
 slideshow/source/engine/shapes/appletshape.cxx     |  3 --
 slideshow/source/engine/shapes/backgroundshape.cxx |  9 -----
 slideshow/source/engine/shapes/backgroundshape.hxx |  2 ++
 .../source/engine/shapes/drawinglayeranimation.cxx | 16 ++-------
 .../source/engine/shapes/drawinglayeranimation.hxx |  1 +
 slideshow/source/engine/shapes/drawshape.cxx       | 19 ----------
 slideshow/source/engine/shapes/drawshape.hxx       |  2 +-
 .../source/engine/shapes/drawshapesubsetting.cxx   |  7 +---
 .../source/engine/shapes/externalshapebase.cxx     |  5 +--
 .../source/engine/shapes/externalshapebase.hxx     |  4 ---
 slideshow/source/engine/shapes/gdimtftools.cxx     |  8 -----
 .../engine/shapes/intrinsicanimationactivity.cxx   |  2 --
 .../engine/shapes/intrinsicanimationactivity.hxx   |  1 -
 slideshow/source/engine/shapes/mediashape.cxx      |  2 --
 slideshow/source/engine/shapes/shapeimporter.cxx   | 10 +-----
 slideshow/source/engine/shapes/viewappletshape.cxx |  6 +---
 slideshow/source/engine/shapes/viewappletshape.hxx |  2 +-
 .../source/engine/shapes/viewbackgroundshape.cxx   |  7 ----
 .../source/engine/shapes/viewbackgroundshape.hxx   |  3 +-
 slideshow/source/engine/shapes/viewmediashape.cxx  | 19 +---------
 slideshow/source/engine/shapes/viewmediashape.hxx  |  1 +
 slideshow/source/engine/shapes/viewshape.cxx       |  6 ----
 slideshow/source/engine/shapes/viewshape.hxx       |  1 -
 slideshow/source/engine/shapesubset.cxx            |  3 --
 slideshow/source/engine/slide/layer.cxx            |  2 --
 slideshow/source/engine/slide/layer.hxx            |  3 +-
 slideshow/source/engine/slide/layermanager.cxx     |  5 +--
 slideshow/source/engine/slide/layermanager.hxx     |  5 ---
 slideshow/source/engine/slide/shapemanagerimpl.hxx |  2 --
 slideshow/source/engine/slide/slideanimations.cxx  |  4 ---
 slideshow/source/engine/slide/slideanimations.hxx  |  3 --
 slideshow/source/engine/slide/slideimpl.cxx        | 17 ---------
 .../engine/slide/targetpropertiescreator.cxx       |  3 --
 .../engine/slide/targetpropertiescreator.hxx       |  4 +--
 slideshow/source/engine/slide/userpaintoverlay.cxx |  4 ---
 slideshow/source/engine/slide/userpaintoverlay.hxx |  3 +-
 slideshow/source/engine/slidebitmap.cxx            |  3 --
 slideshow/source/engine/slideshowimpl.cxx          | 26 +-------------
 slideshow/source/engine/slideview.cxx              |  7 ++--
 slideshow/source/engine/smilfunctionparser.cxx     |  7 +---
 slideshow/source/engine/soundplayer.cxx            |  5 ---
 slideshow/source/engine/tools.cxx                  |  1 +
 .../source/engine/transitions/clippingfunctor.cxx  |  3 +-
 .../source/engine/transitions/clippingfunctor.hxx  |  2 --
 slideshow/source/engine/transitions/clockwipe.cxx  |  1 -
 .../source/engine/transitions/combtransition.cxx   |  2 --
 .../source/engine/transitions/combtransition.hxx   |  1 -
 .../engine/transitions/doublediamondwipe.cxx       |  1 -
 .../engine/transitions/doublediamondwipe.hxx       |  1 -
 .../source/engine/transitions/ellipsewipe.cxx      |  1 -
 slideshow/source/engine/transitions/fanwipe.cxx    |  1 -
 slideshow/source/engine/transitions/figurewipe.cxx |  1 -
 .../source/engine/transitions/pinwheelwipe.cxx     |  2 --
 .../source/engine/transitions/pinwheelwipe.hxx     |  1 -
 slideshow/source/engine/transitions/randomwipe.cxx |  1 +
 slideshow/source/engine/transitions/randomwipe.hxx |  1 -
 .../engine/transitions/shapetransitionfactory.cxx  |  5 ---
 .../source/engine/transitions/slidechangebase.cxx  |  4 ---
 .../engine/transitions/slidetransitionfactory.cxx  |  9 -----
 slideshow/source/engine/transitions/snakewipe.hxx  |  3 --
 slideshow/source/engine/transitions/spiralwipe.hxx |  2 --
 slideshow/source/engine/transitions/sweepwipe.cxx  |  1 -
 .../engine/transitions/transitionfactorytab.cxx    |  3 +-
 .../source/engine/transitions/transitiontools.cxx  |  2 --
 .../source/engine/transitions/transitiontools.hxx  |  3 --
 slideshow/source/engine/transitions/veewipe.hxx    |  1 -
 .../source/engine/transitions/waterfallwipe.cxx    |  1 -
 slideshow/source/engine/transitions/zigzagwipe.cxx |  1 -
 slideshow/source/engine/usereventqueue.cxx         |  5 ---
 slideshow/source/engine/waitsymbol.cxx             |  4 +--
 slideshow/source/engine/waitsymbol.hxx             |  2 +-
 slideshow/source/inc/activitiesqueue.hxx           |  1 -
 slideshow/source/inc/activity.hxx                  |  2 --
 slideshow/source/inc/animatedsprite.hxx            |  3 --
 slideshow/source/inc/animationfactory.hxx          |  2 --
 slideshow/source/inc/animationnodefactory.hxx      |  9 ++---
 slideshow/source/inc/basenode.hxx                  |  1 +
 slideshow/source/inc/cursormanager.hxx             |  1 -
 slideshow/source/inc/disposable.hxx                |  1 -
 slideshow/source/inc/expressionnode.hxx            |  2 --
 slideshow/source/inc/expressionnodefactory.hxx     |  3 +-
 slideshow/source/inc/hslcolor.hxx                  |  2 --
 slideshow/source/inc/hyperlinkarea.hxx             |  2 ++
 slideshow/source/inc/listenercontainer.hxx         |  2 +-
 slideshow/source/inc/mediafilemanager.hxx          |  3 +-
 slideshow/source/inc/mouseeventhandler.hxx         |  2 ++
 slideshow/source/inc/shape.hxx                     |  2 --
 slideshow/source/inc/shapeattributelayer.hxx       |  2 --
 slideshow/source/inc/shapeimporter.hxx             |  5 ++-
 slideshow/source/inc/shapesubset.hxx               |  1 -
 slideshow/source/inc/slide.hxx                     |  2 --
 slideshow/source/inc/smilfunctionparser.hxx        |  3 +-
 slideshow/source/inc/soundplayer.hxx               |  1 -
 slideshow/source/inc/tools.hxx                     |  4 ---
 slideshow/source/inc/transitionfactory.hxx         |  3 +-
 slideshow/source/inc/unoviewcontainer.hxx          |  3 --
 slideshow/source/inc/viewupdate.hxx                |  1 -
 slideshow/test/slidetest.cxx                       |  6 ----
 slideshow/test/testshape.cxx                       |  4 ---
 slideshow/test/testview.cxx                        |  6 ----
 slideshow/test/views.cxx                           |  6 ----
 136 files changed, 107 insertions(+), 405 deletions(-)
 create mode 100644 slideshow/IwyuFilter_slideshow.yaml

(limited to 'slideshow')

diff --git a/slideshow/IwyuFilter_slideshow.yaml b/slideshow/IwyuFilter_slideshow.yaml
new file mode 100644
index 000000000000..7dc8f1a463f8
--- /dev/null
+++ b/slideshow/IwyuFilter_slideshow.yaml
@@ -0,0 +1,42 @@
+---
+assumeFilename: slideshow/source/engine/slideshowimpl.cxx
+blacklist:
+    slideshow/source/inc/mouseeventhandler.hxx:
+    # Needed for css shortcut
+    - sal/types.h
+    slideshow/source/engine/opengl/Operation.hxx:
+    # Needed for licensing
+    - config_lgpl.h
+    # Wrapper for external lib
+    - glm/gtc/type_ptr.hpp
+    slideshow/source/engine/opengl/TransitionImpl.hxx:
+    # Needed for licensing
+    - config_lgpl.h
+    # Wrapper for external lib
+    - glm/gtc/type_ptr.hpp
+    slideshow/source/engine/opengl/Operation.cxx:
+    # Wrapper for external lib
+    - glm/gtc/matrix_transform.hpp
+    - glm/gtc/type_ptr.hpp
+    slideshow/source/engine/opengl/TransitionImpl.cxx:
+    # Wrapper for external lib
+    - glm/gtc/matrix_transform.hpp
+    - glm/gtc/type_ptr.hpp
+    slideshow/source/engine/smilfunctionparser.cxx:
+    # Boost wrapper is needed
+    - boost/spirit/include/classic_core.hpp
+    slideshow/source/engine/shapes/drawshape.cxx:
+    # Actually used
+    - comphelper/scopeguard.hxx
+    slideshow/source/engine/shapes/viewappletshape.cxx:
+    # Actually used
+    - com/sun/star/uno/XComponentContext.hpp
+    # Needed for direct member access
+    - basegfx/matrix/b2dhommatrix.hxx
+    slideshow/source/engine/shapes/mediashape.cxx:
+    # Actually used
+    - com/sun/star/drawing/XShape.hpp
+    slideshow/source/engine/shapes/viewmediashape.cxx:
+    # Actually used
+    - com/sun/star/media/XPlayer.hpp
+    - com/sun/star/media/XPlayerWindow.hpp
diff --git a/slideshow/source/engine/activities/activitiesfactory.cxx b/slideshow/source/engine/activities/activitiesfactory.cxx
index 9f24302d995b..eee0f55cda2d 100644
--- a/slideshow/source/engine/activities/activitiesfactory.cxx
+++ b/slideshow/source/engine/activities/activitiesfactory.cxx
@@ -24,6 +24,7 @@
 #include <comphelper/sequence.hxx>
 
 #include <activitiesfactory.hxx>
+#include <slideshowexceptions.hxx>
 #include <smilfunctionparser.hxx>
 #include "accumulation.hxx"
 #include "activityparameters.hxx"
@@ -37,7 +38,6 @@
 #include <o3tl/optional.hxx>
 
 #include <memory>
-#include <cmath>
 #include <vector>
 #include <algorithm>
 
diff --git a/slideshow/source/engine/activities/activitybase.cxx b/slideshow/source/engine/activities/activitybase.cxx
index 1050bc033322..e256b269611c 100644
--- a/slideshow/source/engine/activities/activitybase.cxx
+++ b/slideshow/source/engine/activities/activitybase.cxx
@@ -22,7 +22,6 @@
 #include <algorithm>
 
 #include <tools/diagnose_ex.h>
-#include <canvas/canvastools.hxx>
 
 #include "activitybase.hxx"
 
diff --git a/slideshow/source/engine/activities/continuouskeytimeactivitybase.cxx b/slideshow/source/engine/activities/continuouskeytimeactivitybase.cxx
index c13327a081e5..0369c22851ca 100644
--- a/slideshow/source/engine/activities/continuouskeytimeactivitybase.cxx
+++ b/slideshow/source/engine/activities/continuouskeytimeactivitybase.cxx
@@ -22,8 +22,6 @@
 
 #include "continuouskeytimeactivitybase.hxx"
 
-#include <algorithm>
-#include <iterator>
 #include <tuple>
 
 namespace slideshow
diff --git a/slideshow/source/engine/activities/continuouskeytimeactivitybase.hxx b/slideshow/source/engine/activities/continuouskeytimeactivitybase.hxx
index abf943ce4597..5b9f66278be4 100644
--- a/slideshow/source/engine/activities/continuouskeytimeactivitybase.hxx
+++ b/slideshow/source/engine/activities/continuouskeytimeactivitybase.hxx
@@ -23,7 +23,6 @@
 #include "simplecontinuousactivitybase.hxx"
 
 #include <basegfx/utils/keystoplerp.hxx>
-#include <vector>
 
 
 namespace slideshow
diff --git a/slideshow/source/engine/activities/interpolation.hxx b/slideshow/source/engine/activities/interpolation.hxx
index 0744b270d831..155456ed576d 100644
--- a/slideshow/source/engine/activities/interpolation.hxx
+++ b/slideshow/source/engine/activities/interpolation.hxx
@@ -22,6 +22,10 @@
 
 #include <basegfx/utils/lerp.hxx>
 #include <osl/diagnose.h>
+#include <rtl/ustring.hxx>
+
+#include <rgbcolor.hxx>
+#include <hslcolor.hxx>
 
 namespace basegfx
 {
diff --git a/slideshow/source/engine/animatedsprite.cxx b/slideshow/source/engine/animatedsprite.cxx
index 3ebd7dc5f688..82d5e5e4624b 100644
--- a/slideshow/source/engine/animatedsprite.cxx
+++ b/slideshow/source/engine/animatedsprite.cxx
@@ -23,6 +23,7 @@
 #include <animatedsprite.hxx>
 
 #include <cppcanvas/canvas.hxx>
+#include <cppcanvas/customsprite.hxx>
 #include <canvas/canvastools.hxx>
 
 #include <basegfx/vector/b2dvector.hxx>
diff --git a/slideshow/source/engine/animationfactory.cxx b/slideshow/source/engine/animationfactory.cxx
index e1a02d083760..4d42fb45a425 100644
--- a/slideshow/source/engine/animationfactory.cxx
+++ b/slideshow/source/engine/animationfactory.cxx
@@ -30,8 +30,6 @@
 #include <com/sun/star/drawing/FillStyle.hpp>
 #include <com/sun/star/drawing/LineStyle.hpp>
 #include <com/sun/star/awt/FontSlant.hpp>
-#include <com/sun/star/awt/FontUnderline.hpp>
-#include <com/sun/star/awt/FontWeight.hpp>
 
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
diff --git a/slideshow/source/engine/animationnodes/animationaudionode.cxx b/slideshow/source/engine/animationnodes/animationaudionode.cxx
index 571af6c7b773..76895b68d96d 100644
--- a/slideshow/source/engine/animationnodes/animationaudionode.cxx
+++ b/slideshow/source/engine/animationnodes/animationaudionode.cxx
@@ -24,8 +24,6 @@
 #include <eventqueue.hxx>
 #include "animationaudionode.hxx"
 #include <delayevent.hxx>
-#include <tools.hxx>
-#include "nodetools.hxx"
 
 using namespace com::sun::star;
 
diff --git a/slideshow/source/engine/animationnodes/animationbasenode.cxx b/slideshow/source/engine/animationnodes/animationbasenode.cxx
index 1aa7bbc50055..a26f840e1017 100644
--- a/slideshow/source/engine/animationnodes/animationbasenode.cxx
+++ b/slideshow/source/engine/animationnodes/animationbasenode.cxx
@@ -18,13 +18,10 @@
  */
 
 
-#include <cppuhelper/exc_hlp.hxx>
-#include <comphelper/anytostring.hxx>
 #include <sal/log.hxx>
 #include <com/sun/star/presentation/ParagraphTarget.hpp>
 #include <com/sun/star/animations/Timing.hpp>
 #include <com/sun/star/animations/AnimationAdditiveMode.hpp>
-#include <com/sun/star/animations/AnimationFill.hpp>
 #include <com/sun/star/presentation/ShapeAnimationSubType.hpp>
 
 #include "nodetools.hxx"
diff --git a/slideshow/source/engine/animationnodes/animationbasenode.hxx b/slideshow/source/engine/animationnodes/animationbasenode.hxx
index 7751642517aa..ec03c57034cc 100644
--- a/slideshow/source/engine/animationnodes/animationbasenode.hxx
+++ b/slideshow/source/engine/animationnodes/animationbasenode.hxx
@@ -23,7 +23,6 @@
 
 #include <basecontainernode.hxx>
 #include <activitiesfactory.hxx>
-#include <shapeattributelayer.hxx>
 #include <shapeattributelayerholder.hxx>
 #include <attributableshape.hxx>
 #include <shapesubset.hxx>
diff --git a/slideshow/source/engine/animationnodes/animationcommandnode.cxx b/slideshow/source/engine/animationnodes/animationcommandnode.cxx
index e765f2a5a531..9d8e476e091b 100644
--- a/slideshow/source/engine/animationnodes/animationcommandnode.cxx
+++ b/slideshow/source/engine/animationnodes/animationcommandnode.cxx
@@ -22,9 +22,8 @@
 #include <com/sun/star/beans/PropertyValue.hpp>
 
 #include "animationcommandnode.hxx"
+#include <eventmultiplexer.hxx>
 #include <delayevent.hxx>
-#include <tools.hxx>
-#include "nodetools.hxx"
 
 
 using namespace com::sun::star;
diff --git a/slideshow/source/engine/animationnodes/animationcommandnode.hxx b/slideshow/source/engine/animationnodes/animationcommandnode.hxx
index 675da7c3b0e8..09dcf9eb1df0 100644
--- a/slideshow/source/engine/animationnodes/animationcommandnode.hxx
+++ b/slideshow/source/engine/animationnodes/animationcommandnode.hxx
@@ -22,7 +22,6 @@
 
 #include <basecontainernode.hxx>
 #include <iexternalmediashapebase.hxx>
-#include <soundplayer.hxx>
 #include <com/sun/star/animations/XCommand.hpp>
 
 namespace slideshow {
diff --git a/slideshow/source/engine/animationnodes/animationnodefactory.cxx b/slideshow/source/engine/animationnodes/animationnodefactory.cxx
index a02feb9bb085..7589ce03ae85 100644
--- a/slideshow/source/engine/animationnodes/animationnodefactory.cxx
+++ b/slideshow/source/engine/animationnodes/animationnodefactory.cxx
@@ -24,7 +24,6 @@
 #include <com/sun/star/animations/XIterateContainer.hpp>
 #include <com/sun/star/presentation/ShapeAnimationSubType.hpp>
 #include <com/sun/star/presentation/ParagraphTarget.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
 #include <basegfx/numeric/ftools.hxx>
 #include <sal/log.hxx>
 
diff --git a/slideshow/source/engine/animationnodes/basecontainernode.cxx b/slideshow/source/engine/animationnodes/basecontainernode.cxx
index 02668ae7fd28..e1044a1a364a 100644
--- a/slideshow/source/engine/animationnodes/basecontainernode.cxx
+++ b/slideshow/source/engine/animationnodes/basecontainernode.cxx
@@ -22,7 +22,6 @@
 #include <com/sun/star/animations/AnimationRestart.hpp>
 #include <com/sun/star/animations/AnimationFill.hpp>
 #include <eventqueue.hxx>
-#include <tools.hxx>
 #include "nodetools.hxx"
 #include <delayevent.hxx>
 #include <sal/log.hxx>
diff --git a/slideshow/source/engine/animationnodes/basenode.cxx b/slideshow/source/engine/animationnodes/basenode.cxx
index dee7b862b8fd..12f3610f1165 100644
--- a/slideshow/source/engine/animationnodes/basenode.cxx
+++ b/slideshow/source/engine/animationnodes/basenode.cxx
@@ -38,7 +38,6 @@
 
 #include <vector>
 #include <algorithm>
-#include <iterator>
 
 using namespace ::com::sun::star;
 
diff --git a/slideshow/source/engine/animationnodes/generateevent.cxx b/slideshow/source/engine/animationnodes/generateevent.cxx
index d252100e5bd4..adfed30885b7 100644
--- a/slideshow/source/engine/animationnodes/generateevent.cxx
+++ b/slideshow/source/engine/animationnodes/generateevent.cxx
@@ -27,7 +27,6 @@
 #include <com/sun/star/animations/Event.hpp>
 
 #include "generateevent.hxx"
-#include <shape.hxx>
 #include <subsettableshapemanager.hxx>
 #include <usereventqueue.hxx>
 #include <slideshowcontext.hxx>
diff --git a/slideshow/source/engine/animationnodes/nodetools.cxx b/slideshow/source/engine/animationnodes/nodetools.cxx
index f2f98ad15035..abad7f24eb27 100644
--- a/slideshow/source/engine/animationnodes/nodetools.cxx
+++ b/slideshow/source/engine/animationnodes/nodetools.cxx
@@ -20,7 +20,6 @@
 
 #include <com/sun/star/animations/Timing.hpp>
 
-#include <tools.hxx>
 #include "nodetools.hxx"
 
 
diff --git a/slideshow/source/engine/animationnodes/nodetools.hxx b/slideshow/source/engine/animationnodes/nodetools.hxx
index 8b0ecef2d48b..f68f9dbddae5 100644
--- a/slideshow/source/engine/animationnodes/nodetools.hxx
+++ b/slideshow/source/engine/animationnodes/nodetools.hxx
@@ -20,12 +20,10 @@
 #ifndef INCLUDED_SLIDESHOW_SOURCE_ENGINE_ANIMATIONNODES_NODETOOLS_HXX
 #define INCLUDED_SLIDESHOW_SOURCE_ENGINE_ANIMATIONNODES_NODETOOLS_HXX
 
-#include <com/sun/star/beans/NamedValue.hpp>
 #include <com/sun/star/drawing/XShape.hpp>
 
 #include <shapemanager.hxx>
 #include <basenode.hxx>
-#include <doctreenode.hxx>
 #include <attributableshape.hxx>
 
 
diff --git a/slideshow/source/engine/animationnodes/sequentialtimecontainer.cxx b/slideshow/source/engine/animationnodes/sequentialtimecontainer.cxx
index 15e5a7f2763d..d48fe1c45238 100644
--- a/slideshow/source/engine/animationnodes/sequentialtimecontainer.cxx
+++ b/slideshow/source/engine/animationnodes/sequentialtimecontainer.cxx
@@ -22,9 +22,6 @@
 #include <eventqueue.hxx>
 #include <usereventqueue.hxx>
 #include "sequentialtimecontainer.hxx"
-#include <tools.hxx>
-
-#include <algorithm>
 
 namespace slideshow {
 namespace internal {
diff --git a/slideshow/source/engine/animationnodes/setactivity.hxx b/slideshow/source/engine/animationnodes/setactivity.hxx
index 9b45e72dff59..fbe6e3a11397 100644
--- a/slideshow/source/engine/animationnodes/setactivity.hxx
+++ b/slideshow/source/engine/animationnodes/setactivity.hxx
@@ -22,7 +22,6 @@
 #include <tools/diagnose_ex.h>
 
 #include <animationactivity.hxx>
-#include <animation.hxx>
 #include <animatableshape.hxx>
 #include <shapeattributelayer.hxx>
 #include <activitiesfactory.hxx>
diff --git a/slideshow/source/engine/attributemap.cxx b/slideshow/source/engine/attributemap.cxx
index 905e5d8cba35..ae01a3023976 100644
--- a/slideshow/source/engine/attributemap.cxx
+++ b/slideshow/source/engine/attributemap.cxx
@@ -21,7 +21,6 @@
 #include <canvas/canvastools.hxx>
 
 #include <attributemap.hxx>
-#include <tools.hxx>
 #include <sal/log.hxx>
 
 
diff --git a/slideshow/source/engine/effectrewinder.cxx b/slideshow/source/engine/effectrewinder.cxx
index d8889024108b..41f6976fc6ed 100644
--- a/slideshow/source/engine/effectrewinder.cxx
+++ b/slideshow/source/engine/effectrewinder.cxx
@@ -21,11 +21,9 @@
 #include "effectrewinder.hxx"
 #include <eventqueue.hxx>
 #include <usereventqueue.hxx>
-#include <mouseeventhandler.hxx>
 #include <basecontainernode.hxx>
 #include <delayevent.hxx>
 
-#include <com/sun/star/awt/MouseEvent.hpp>
 #include <com/sun/star/animations/Event.hpp>
 #include <com/sun/star/animations/EventTrigger.hpp>
 #include <com/sun/star/container/XEnumerationAccess.hpp>
diff --git a/slideshow/source/engine/effectrewinder.hxx b/slideshow/source/engine/effectrewinder.hxx
index f23bd01995d7..57f7e2339cd8 100644
--- a/slideshow/source/engine/effectrewinder.hxx
+++ b/slideshow/source/engine/effectrewinder.hxx
@@ -28,7 +28,6 @@
 
 #include <functional>
 #include <memory>
-#include <vector>
 
 namespace slideshow { namespace internal {
 
diff --git a/slideshow/source/engine/eventmultiplexer.cxx b/slideshow/source/engine/eventmultiplexer.cxx
index 7aa09adf1ac9..3fd5a336234c 100644
--- a/slideshow/source/engine/eventmultiplexer.cxx
+++ b/slideshow/source/engine/eventmultiplexer.cxx
@@ -26,15 +26,12 @@
 
 #include <com/sun/star/awt/XMouseListener.hpp>
 #include <com/sun/star/awt/XMouseMotionListener.hpp>
-#include <com/sun/star/awt/SystemPointer.hpp>
-#include <com/sun/star/awt/XWindow.hpp>
-#include <com/sun/star/awt/MouseButton.hpp>
 #include <com/sun/star/presentation/XSlideShowView.hpp>
 
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/numeric/ftools.hxx>
+#include <basegfx/point/b2dpoint.hxx>
 
-#include <tools.hxx>
 #include <eventqueue.hxx>
 #include <eventmultiplexer.hxx>
 #include <listenercontainer.hxx>
diff --git a/slideshow/source/engine/eventqueue.cxx b/slideshow/source/engine/eventqueue.cxx
index e2b909e40185..8184dc92ed32 100644
--- a/slideshow/source/engine/eventqueue.cxx
+++ b/slideshow/source/engine/eventqueue.cxx
@@ -21,9 +21,6 @@
 #include <tools/diagnose_ex.h>
 #include <sal/log.hxx>
 
-#include <comphelper/anytostring.hxx>
-#include <cppuhelper/exc_hlp.hxx>
-
 #include <event.hxx>
 #include <eventqueue.hxx>
 #include <slideshowexceptions.hxx>
diff --git a/slideshow/source/engine/expressionnodefactory.cxx b/slideshow/source/engine/expressionnodefactory.cxx
index 2be231aed327..74cfd96f8406 100644
--- a/slideshow/source/engine/expressionnodefactory.cxx
+++ b/slideshow/source/engine/expressionnodefactory.cxx
@@ -20,10 +20,6 @@
 
 #include <expressionnodefactory.hxx>
 
-#include <basegfx/matrix/b2dhommatrix.hxx>
-#include <basegfx/point/b2dpoint.hxx>
-
-#include <functional>
 #include <algorithm>
 
 
diff --git a/slideshow/source/engine/opengl/TransitionImpl.cxx b/slideshow/source/engine/opengl/TransitionImpl.cxx
index 27f1ac28bb9a..489bb9f8e47e 100644
--- a/slideshow/source/engine/opengl/TransitionImpl.cxx
+++ b/slideshow/source/engine/opengl/TransitionImpl.cxx
@@ -34,7 +34,6 @@
 
 #include <algorithm>
 #include <array>
-#include <utility>
 
 #include <comphelper/random.hxx>
 
diff --git a/slideshow/source/engine/opengl/TransitionImpl.hxx b/slideshow/source/engine/opengl/TransitionImpl.hxx
index d0313236d8b4..2e50b8ba5418 100644
--- a/slideshow/source/engine/opengl/TransitionImpl.hxx
+++ b/slideshow/source/engine/opengl/TransitionImpl.hxx
@@ -29,8 +29,11 @@
 #define INCLUDED_OGLTRANS_TRANSITIONIMPL_HXX_
 
 #include <config_lgpl.h>
+#include <epoxy/gl.h>
 #include <glm/gtc/type_ptr.hpp>
 
+#include <sal/types.h>
+
 #include <limits>
 #include <memory>
 #include <vector>
diff --git a/slideshow/source/engine/opengl/TransitionerImpl.cxx b/slideshow/source/engine/opengl/TransitionerImpl.cxx
index 19cbea1f8a38..cadf4c7dece2 100644
--- a/slideshow/source/engine/opengl/TransitionerImpl.cxx
+++ b/slideshow/source/engine/opengl/TransitionerImpl.cxx
@@ -27,8 +27,6 @@
  ************************************************************************/
 
 #include <sal/types.h>
-#include <glm/gtc/matrix_transform.hpp>
-#include <glm/gtc/type_ptr.hpp>
 
 #include <memory>
 
@@ -68,8 +66,6 @@
 
 #include "TransitionImpl.hxx"
 
-#include <vcl/sysdata.hxx>
-
 #if OSL_DEBUG_LEVEL > 0
 #include <chrono>
 #endif
diff --git a/slideshow/source/engine/pointersymbol.cxx b/slideshow/source/engine/pointersymbol.cxx
index 050e392d805d..3421d6d1cca3 100644
--- a/slideshow/source/engine/pointersymbol.cxx
+++ b/slideshow/source/engine/pointersymbol.cxx
@@ -20,9 +20,7 @@
 
 #include <canvas/canvastools.hxx>
 
-#include <comphelper/anytostring.hxx>
-#include <cppuhelper/exc_hlp.hxx>
-#include <sal/log.hxx>
+#include <cppcanvas/customsprite.hxx>
 
 #include <basegfx/point/b2dpoint.hxx>
 #include <basegfx/vector/b2dvector.hxx>
diff --git a/slideshow/source/engine/pointersymbol.hxx b/slideshow/source/engine/pointersymbol.hxx
index 40e46018443b..c2ebe61d285b 100644
--- a/slideshow/source/engine/pointersymbol.hxx
+++ b/slideshow/source/engine/pointersymbol.hxx
@@ -12,8 +12,9 @@
 #define INCLUDED_SLIDESHOW_SOURCE_ENGINE_POINTERSYMBOL_HXX
 
 #include <com/sun/star/rendering/XBitmap.hpp>
-#include <cppcanvas/customsprite.hxx>
+#include <cppcanvas/sprite.hxx>
 
+#include <com/sun/star/geometry/RealPoint2D.hpp>
 #include <com/sun/star/uno/Reference.hxx>
 
 #include <vieweventhandler.hxx>
diff --git a/slideshow/source/engine/rehearsetimingsactivity.cxx b/slideshow/source/engine/rehearsetimingsactivity.cxx
index 10dbeb776502..ce07413054a4 100644
--- a/slideshow/source/engine/rehearsetimingsactivity.cxx
+++ b/slideshow/source/engine/rehearsetimingsactivity.cxx
@@ -26,14 +26,10 @@
 #include <vcl/settings.hxx>
 
 #include <cppcanvas/vclfactory.hxx>
-#include <cppcanvas/basegfxfactory.hxx>
 #include <basegfx/range/b2drange.hxx>
-#include <sal/log.hxx>
 #include <osl/diagnose.h>
 #include <tools/diagnose_ex.h>
 
-#include <cppuhelper/exc_hlp.hxx>
-
 #include <com/sun/star/awt/MouseButton.hpp>
 #include <com/sun/star/awt/MouseEvent.hpp>
 #include <com/sun/star/rendering/XBitmap.hpp>
diff --git a/slideshow/source/engine/rehearsetimingsactivity.hxx b/slideshow/source/engine/rehearsetimingsactivity.hxx
index 4ae0e16f00ad..9c7ebdc486bd 100644
--- a/slideshow/source/engine/rehearsetimingsactivity.hxx
+++ b/slideshow/source/engine/rehearsetimingsactivity.hxx
@@ -21,8 +21,12 @@
 #define INCLUDED_SLIDESHOW_SOURCE_ENGINE_REHEARSETIMINGSACTIVITY_HXX
 
 #include <activity.hxx>
+#include <activitiesqueue.hxx>
+#include <eventqueue.hxx>
+#include <vieweventhandler.hxx>
 
 #include <basegfx/range/b2drange.hxx>
+#include <vcl/font.hxx>
 
 #include <vector>
 #include <utility>
diff --git a/slideshow/source/engine/shapeattributelayer.cxx b/slideshow/source/engine/shapeattributelayer.cxx
index 2816d33983a7..383a0cbc3a2a 100644
--- a/slideshow/source/engine/shapeattributelayer.cxx
+++ b/slideshow/source/engine/shapeattributelayer.cxx
@@ -22,14 +22,10 @@
 #include <tools/diagnose_ex.h>
 #include <shapeattributelayer.hxx>
 
-#include <com/sun/star/awt/Rectangle.hpp>
 #include <com/sun/star/awt/FontUnderline.hpp>
 #include <com/sun/star/awt/FontWeight.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/animations/AnimationAdditiveMode.hpp>
 
-#include <basegfx/numeric/ftools.hxx>
-#include <basegfx/polygon/b2dpolygon.hxx>
 #include <rtl/math.hxx>
 
 
diff --git a/slideshow/source/engine/shapes/appletshape.cxx b/slideshow/source/engine/shapes/appletshape.cxx
index 1fac5a42739d..f3b8edc9c02c 100644
--- a/slideshow/source/engine/shapes/appletshape.cxx
+++ b/slideshow/source/engine/shapes/appletshape.cxx
@@ -18,11 +18,8 @@
  */
 
 
-#include <canvas/canvastools.hxx>
-
 #include "appletshape.hxx"
 #include "externalshapebase.hxx"
-#include <vieweventhandler.hxx>
 #include "viewappletshape.hxx"
 #include <tools.hxx>
 
diff --git a/slideshow/source/engine/shapes/backgroundshape.cxx b/slideshow/source/engine/shapes/backgroundshape.cxx
index 704e7cb9598e..adc550662298 100644
--- a/slideshow/source/engine/shapes/backgroundshape.cxx
+++ b/slideshow/source/engine/shapes/backgroundshape.cxx
@@ -18,20 +18,11 @@
  */
 
 
-#include <com/sun/star/awt/Rectangle.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/awt/FontWeight.hpp>
 
-#include <vcl/metaact.hxx>
-#include <vcl/gdimtf.hxx>
-
-#include <basegfx/numeric/ftools.hxx>
 #include <sal/log.hxx>
 
-#include <cmath>
 #include <algorithm>
-#include <functional>
-#include <limits>
 
 #include "backgroundshape.hxx"
 #include <slideshowexceptions.hxx>
diff --git a/slideshow/source/engine/shapes/backgroundshape.hxx b/slideshow/source/engine/shapes/backgroundshape.hxx
index c7ff134e0dc5..0ded09bd8983 100644
--- a/slideshow/source/engine/shapes/backgroundshape.hxx
+++ b/slideshow/source/engine/shapes/backgroundshape.hxx
@@ -22,6 +22,8 @@
 
 #include <com/sun/star/uno/Reference.hxx>
 
+#include <memory>
+
 namespace com { namespace sun { namespace star { namespace drawing
 {
     class XDrawPage;
diff --git a/slideshow/source/engine/shapes/drawinglayeranimation.cxx b/slideshow/source/engine/shapes/drawinglayeranimation.cxx
index ef931979c643..b8b500936557 100644
--- a/slideshow/source/engine/shapes/drawinglayeranimation.cxx
+++ b/slideshow/source/engine/shapes/drawinglayeranimation.cxx
@@ -19,25 +19,15 @@
 
 
 #include <tools/diagnose_ex.h>
+#include <tools/gen.hxx>
 #include <tools/helpers.hxx>
 #include <canvas/elapsedtime.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
 
-#include <comphelper/anytostring.hxx>
-#include <cppuhelper/exc_hlp.hxx>
-
-#include <rtl/math.hxx>
-#include <sal/log.hxx>
-#include <vcl/metric.hxx>
 #include <vcl/canvastools.hxx>
-#include <vcl/metaact.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/drawing/TextAnimationKind.hpp>
 #include <com/sun/star/drawing/TextAnimationDirection.hpp>
-#include <com/sun/star/drawing/TextHorizontalAdjust.hpp>
-#include <com/sun/star/drawing/TextVerticalAdjust.hpp>
-#include <com/sun/star/drawing/HomogenMatrix3.hpp>
-#include <com/sun/star/awt/Rectangle.hpp>
 
 #include <activity.hxx>
 #include <wakeupevent.hxx>
@@ -45,13 +35,11 @@
 #include "drawinglayeranimation.hxx"
 #include "drawshapesubsetting.hxx"
 #include "drawshape.hxx"
-#include <shapesubset.hxx>
 #include <shapeattributelayerholder.hxx>
 #include <slideshowcontext.hxx>
+#include <subsettableshapemanager.hxx>
 #include <tools.hxx>
 #include "gdimtftools.hxx"
-#include <eventmultiplexer.hxx>
-#include "intrinsicanimationactivity.hxx"
 #include <intrinsicanimationeventhandler.hxx>
 
 #include <vector>
diff --git a/slideshow/source/engine/shapes/drawinglayeranimation.hxx b/slideshow/source/engine/shapes/drawinglayeranimation.hxx
index 3ebd45e1f766..523108e3ebb7 100644
--- a/slideshow/source/engine/shapes/drawinglayeranimation.hxx
+++ b/slideshow/source/engine/shapes/drawinglayeranimation.hxx
@@ -20,6 +20,7 @@
 #define INCLUDED_SLIDESHOW_SOURCE_ENGINE_SHAPES_DRAWINGLAYERANIMATION_HXX
 
 #include <sal/config.h>
+#include <memory>
 
 namespace slideshow {
 namespace internal {
diff --git a/slideshow/source/engine/shapes/drawshape.cxx b/slideshow/source/engine/shapes/drawshape.cxx
index 0bad87a71055..a09dd07e19f0 100644
--- a/slideshow/source/engine/shapes/drawshape.cxx
+++ b/slideshow/source/engine/shapes/drawshape.cxx
@@ -19,13 +19,8 @@
 
 #include <tools/diagnose_ex.h>
 
-#include <osl/diagnose.hxx>
 #include <sal/log.hxx>
-#include <com/sun/star/awt/Rectangle.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/awt/FontWeight.hpp>
-#include <comphelper/anytostring.hxx>
-#include <cppuhelper/exc_hlp.hxx>
 
 #include <vcl/metaact.hxx>
 #include <vcl/gdimtf.hxx>
@@ -33,24 +28,13 @@
 
 #include <basegfx/numeric/ftools.hxx>
 
-#include <rtl/math.hxx>
-
 #include <com/sun/star/drawing/TextAnimationKind.hpp>
 
-#include <vcl/svapp.hxx>
-#include <vcl/window.hxx>
-#include <tools/stream.hxx>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/datatransfer/XTransferable.hpp>
-
 #include <comphelper/scopeguard.hxx>
-#include <canvas/canvastools.hxx>
 
-#include <cmath>
 #include <algorithm>
 #include <iterator>
 #include <functional>
-#include <limits>
 
 #include "drawshapesubsetting.hxx"
 #include "drawshape.hxx"
@@ -58,13 +42,10 @@
 #include <wakeupevent.hxx>
 #include <subsettableshapemanager.hxx>
 #include "intrinsicanimationactivity.hxx"
-#include <slideshowexceptions.hxx>
 #include <tools.hxx>
 #include "gdimtftools.hxx"
 #include "drawinglayeranimation.hxx"
 
-#include <math.h>
-
 using namespace ::com::sun::star;
 
 
diff --git a/slideshow/source/engine/shapes/drawshape.hxx b/slideshow/source/engine/shapes/drawshape.hxx
index e76fe9c115a0..a7bfa8812032 100644
--- a/slideshow/source/engine/shapes/drawshape.hxx
+++ b/slideshow/source/engine/shapes/drawshape.hxx
@@ -25,12 +25,12 @@
 
 #include <attributableshape.hxx>
 #include <doctreenodesupplier.hxx>
+#include "drawshapesubsetting.hxx"
 #include "gdimtftools.hxx"
 #include "viewshape.hxx"
 #include <hyperlinkarea.hxx>
 
 #include <o3tl/optional.hxx>
-#include <set>
 #include <vector>
 
 class Graphic;
diff --git a/slideshow/source/engine/shapes/drawshapesubsetting.cxx b/slideshow/source/engine/shapes/drawshapesubsetting.cxx
index cca217a0a59c..08f2dbba9481 100644
--- a/slideshow/source/engine/shapes/drawshapesubsetting.cxx
+++ b/slideshow/source/engine/shapes/drawshapesubsetting.cxx
@@ -20,20 +20,15 @@
 
 #include <tools/diagnose_ex.h>
 
-#include <rtl/math.hxx>
-
 #include <sal/log.hxx>
 #include <utility>
 #include <vcl/metaact.hxx>
 #include <vcl/gdimtf.hxx>
-#include <basegfx/numeric/ftools.hxx>
 
 #include "drawshapesubsetting.hxx"
-#include "drawshape.hxx"
+#include "gdimtftools.hxx"
 
 #include <algorithm>
-#include <functional>
-#include <limits>
 
 using namespace ::com::sun::star;
 
diff --git a/slideshow/source/engine/shapes/externalshapebase.cxx b/slideshow/source/engine/shapes/externalshapebase.cxx
index 6e557bb456de..fef7cef6d5d4 100644
--- a/slideshow/source/engine/shapes/externalshapebase.cxx
+++ b/slideshow/source/engine/shapes/externalshapebase.cxx
@@ -20,13 +20,10 @@
 
 // must be first
 #include <tools/diagnose_ex.h>
-#include <sal/log.hxx>
-
-#include <comphelper/anytostring.hxx>
-#include <cppuhelper/exc_hlp.hxx>
 
 #include "externalshapebase.hxx"
 #include <eventmultiplexer.hxx>
+#include <subsettableshapemanager.hxx>
 #include <vieweventhandler.hxx>
 #include <intrinsicanimationeventhandler.hxx>
 #include <tools.hxx>
diff --git a/slideshow/source/engine/shapes/externalshapebase.hxx b/slideshow/source/engine/shapes/externalshapebase.hxx
index bdefea769408..f539d554e064 100644
--- a/slideshow/source/engine/shapes/externalshapebase.hxx
+++ b/slideshow/source/engine/shapes/externalshapebase.hxx
@@ -20,12 +20,8 @@
 #ifndef INCLUDED_SLIDESHOW_SOURCE_ENGINE_SHAPES_EXTERNALSHAPEBASE_HXX
 #define INCLUDED_SLIDESHOW_SOURCE_ENGINE_SHAPES_EXTERNALSHAPEBASE_HXX
 
-#include <vector>
-
 #include <iexternalmediashapebase.hxx>
 #include <unoview.hxx>
-#include <subsettableshapemanager.hxx>
-#include <slideshowexceptions.hxx>
 #include <slideshowcontext.hxx>
 
 
diff --git a/slideshow/source/engine/shapes/gdimtftools.cxx b/slideshow/source/engine/shapes/gdimtftools.cxx
index cb1b9b4617a5..a85a9cdc796c 100644
--- a/slideshow/source/engine/shapes/gdimtftools.cxx
+++ b/slideshow/source/engine/shapes/gdimtftools.cxx
@@ -18,15 +18,11 @@
  */
 
 
-#include <tools/diagnose_ex.h>
 #include <sal/log.hxx>
 #include "gdimtftools.hxx"
 
-#include <com/sun/star/document/XExporter.hpp>
-#include <com/sun/star/document/XFilter.hpp>
 #include <com/sun/star/graphic/XGraphic.hpp>
 #include <com/sun/star/graphic/XGraphicRenderer.hpp>
-#include <com/sun/star/drawing/XShape.hpp>
 #include <com/sun/star/drawing/GraphicExportFilter.hpp>
 
 #include <cppuhelper/basemutex.hxx>
@@ -34,8 +30,6 @@
 
 #include <comphelper/fileformat.h>
 
-#include <tools/stream.hxx>
-#include <vcl/svapp.hxx>
 #include <vcl/canvastools.hxx>
 #include <vcl/metaact.hxx>
 #include <vcl/virdev.hxx>
@@ -43,8 +37,6 @@
 #include <vcl/animate/Animation.hxx>
 #include <vcl/graph.hxx>
 
-#include <unotools/streamwrap.hxx>
-
 #include <tools.hxx>
 
 using namespace ::com::sun::star;
diff --git a/slideshow/source/engine/shapes/intrinsicanimationactivity.cxx b/slideshow/source/engine/shapes/intrinsicanimationactivity.cxx
index cf3748f4a4d5..de0bc4e5a2ea 100644
--- a/slideshow/source/engine/shapes/intrinsicanimationactivity.cxx
+++ b/slideshow/source/engine/shapes/intrinsicanimationactivity.cxx
@@ -20,10 +20,8 @@
 
 #include <tools/diagnose_ex.h>
 
-#include "drawshapesubsetting.hxx"
 #include <subsettableshapemanager.hxx>
 #include <eventqueue.hxx>
-#include <eventmultiplexer.hxx>
 #include "intrinsicanimationactivity.hxx"
 #include <intrinsicanimationeventhandler.hxx>
 
diff --git a/slideshow/source/engine/shapes/intrinsicanimationactivity.hxx b/slideshow/source/engine/shapes/intrinsicanimationactivity.hxx
index 5cc660078895..aeef925a3c7a 100644
--- a/slideshow/source/engine/shapes/intrinsicanimationactivity.hxx
+++ b/slideshow/source/engine/shapes/intrinsicanimationactivity.hxx
@@ -24,7 +24,6 @@
 #include <activity.hxx>
 #include <slideshowcontext.hxx>
 #include "drawshape.hxx"
-#include <tools.hxx>
 
 /* Definition of IntrinsicAnimationActivity class */
 
diff --git a/slideshow/source/engine/shapes/mediashape.cxx b/slideshow/source/engine/shapes/mediashape.cxx
index 17a82c4392a1..9aa9009a9002 100644
--- a/slideshow/source/engine/shapes/mediashape.cxx
+++ b/slideshow/source/engine/shapes/mediashape.cxx
@@ -18,8 +18,6 @@
  */
 
 
-#include <canvas/canvastools.hxx>
-
 #include <com/sun/star/drawing/XShape.hpp>
 
 #include "mediashape.hxx"
diff --git a/slideshow/source/engine/shapes/shapeimporter.cxx b/slideshow/source/engine/shapes/shapeimporter.cxx
index 542308813d36..c3b681017106 100644
--- a/slideshow/source/engine/shapes/shapeimporter.cxx
+++ b/slideshow/source/engine/shapes/shapeimporter.cxx
@@ -17,11 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <vcl/cvtgrf.hxx>
 #include <vcl/GraphicObject.hxx>
-#include <tools/urlobj.hxx>
-#include <tools/stream.hxx>
-#include <unotools/streamwrap.hxx>
 #include <basegfx/point/b2dpoint.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <cppcanvas/basegfxfactory.hxx>
@@ -29,27 +25,23 @@
 #include <com/sun/star/awt/Rectangle.hpp>
 #include <com/sun/star/drawing/ColorMode.hpp>
 #include <com/sun/star/text/GraphicCrop.hpp>
-#include <com/sun/star/container/XNameContainer.hpp>
 #include <com/sun/star/drawing/PointSequenceSequence.hpp>
 #include <com/sun/star/drawing/PointSequence.hpp>
-#include <com/sun/star/lang/XMultiComponentFactory.hpp>
 #include <com/sun/star/drawing/XLayerSupplier.hpp>
 #include <com/sun/star/drawing/XLayerManager.hpp>
 #include <com/sun/star/graphic/XGraphic.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
-#include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/drawing/XDrawPagesSupplier.hpp>
 
-#include "drawshapesubsetting.hxx"
 #include "drawshape.hxx"
 #include "backgroundshape.hxx"
 #include "mediashape.hxx"
 #include "appletshape.hxx"
 #include <shapeimporter.hxx>
 #include <slideshowexceptions.hxx>
-#include "gdimtftools.hxx"
 #include <tools.hxx>
 #include <slideshowcontext.hxx>
+#include <unoviewcontainer.hxx>
 
 #include <memory>
 
diff --git a/slideshow/source/engine/shapes/viewappletshape.cxx b/slideshow/source/engine/shapes/viewappletshape.cxx
index 4f8c86bce467..756ac85d7637 100644
--- a/slideshow/source/engine/shapes/viewappletshape.cxx
+++ b/slideshow/source/engine/shapes/viewappletshape.cxx
@@ -19,21 +19,17 @@
 
 
 #include <tools/diagnose_ex.h>
-#include <sal/log.hxx>
-
-#include <cppuhelper/exc_hlp.hxx>
 
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/range/b2irange.hxx>
 #include <basegfx/utils/canvastools.hxx>
 
-#include <cppcanvas/spritecanvas.hxx>
+#include <cppcanvas/canvas.hxx>
 #include <canvas/canvastools.hxx>
 
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/lang/XMultiComponentFactory.hpp>
 #include <com/sun/star/rendering/XCanvas.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/util/XCloseable.hpp>
diff --git a/slideshow/source/engine/shapes/viewappletshape.hxx b/slideshow/source/engine/shapes/viewappletshape.hxx
index d54ad064a41e..66336148c87b 100644
--- a/slideshow/source/engine/shapes/viewappletshape.hxx
+++ b/slideshow/source/engine/shapes/viewappletshape.hxx
@@ -21,7 +21,7 @@
 #define INCLUDED_SLIDESHOW_SOURCE_ENGINE_SHAPES_VIEWAPPLETSHAPE_HXX
 
 #include <basegfx/range/b2drectangle.hxx>
-#include <com/sun/star/awt/Point.hpp>
+#include <com/sun/star/frame/XSynchronousFrameLoader.hpp>
 
 #include <memory>
 
diff --git a/slideshow/source/engine/shapes/viewbackgroundshape.cxx b/slideshow/source/engine/shapes/viewbackgroundshape.cxx
index cdfd10bad100..97e861e9e445 100644
--- a/slideshow/source/engine/shapes/viewbackgroundshape.cxx
+++ b/slideshow/source/engine/shapes/viewbackgroundshape.cxx
@@ -25,13 +25,6 @@
 #include "viewbackgroundshape.hxx"
 #include <tools.hxx>
 
-#include <rtl/math.hxx>
-
-#include <comphelper/anytostring.hxx>
-#include <cppuhelper/exc_hlp.hxx>
-
-#include <basegfx/polygon/b2dpolygontools.hxx>
-#include <basegfx/polygon/b2dpolygon.hxx>
 #include <basegfx/numeric/ftools.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
diff --git a/slideshow/source/engine/shapes/viewbackgroundshape.hxx b/slideshow/source/engine/shapes/viewbackgroundshape.hxx
index fa61459889d8..f9da137e2f47 100644
--- a/slideshow/source/engine/shapes/viewbackgroundshape.hxx
+++ b/slideshow/source/engine/shapes/viewbackgroundshape.hxx
@@ -25,11 +25,10 @@
 
 #include <basegfx/range/b2drectangle.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
-#include <cppcanvas/spritecanvas.hxx>
 
 #include <memory>
 
-#include "gdimtftools.hxx"
+#include <tools.hxx>
 #include <viewlayer.hxx>
 
 
diff --git a/slideshow/source/engine/shapes/viewmediashape.cxx b/slideshow/source/engine/shapes/viewmediashape.cxx
index 057b508437ae..e68cdf2b543a 100644
--- a/slideshow/source/engine/shapes/viewmediashape.cxx
+++ b/slideshow/source/engine/shapes/viewmediashape.cxx
@@ -21,48 +21,31 @@
 
 #include <tools/diagnose_ex.h>
 
-#include <math.h>
-
-#include <comphelper/anytostring.hxx>
-#include <cppuhelper/exc_hlp.hxx>
-
 #include <sal/log.hxx>
 #include <vcl/canvastools.hxx>
 #include <vcl/syschild.hxx>
-#include <vcl/sysdata.hxx>
 #include <vcl/window.hxx>
 #include <vcl/graph.hxx>
 
 #include <basegfx/utils/canvastools.hxx>
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
-#include <basegfx/numeric/ftools.hxx>
-#include <basegfx/polygon/b2dpolygon.hxx>
 #include <basegfx/point/b2dpoint.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
-#include <basegfx/polygon/b2dpolygontools.hxx>
 #include <basegfx/range/b2irange.hxx>
 #include <canvas/canvastools.hxx>
-#include <cppcanvas/vclfactory.hxx>
-#include <cppcanvas/basegfxfactory.hxx>
+#include <cppcanvas/canvas.hxx>
 #include <avmedia/mediawindow.hxx>
 
-#if HAVE_FEATURE_OPENGL
-#include <vcl/opengl/OpenGLContext.hxx>
-#endif
-
 #include <com/sun/star/awt/XWindow.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/lang/XComponent.hpp>
-#include <com/sun/star/lang/XMultiComponentFactory.hpp>
 #include <com/sun/star/lang/NoSupportException.hpp>
-#include <com/sun/star/media/XManager.hpp>
 #include <com/sun/star/media/XPlayer.hpp>
 #include <com/sun/star/media/XPlayerWindow.hpp>
 #include <com/sun/star/presentation/XSlideShowView.hpp>
 #include <com/sun/star/rendering/XCanvas.hpp>
 
 #include "viewmediashape.hxx"
-#include "mediashape.hxx"
 #include <tools.hxx>
 #include <unoview.hxx>
 
diff --git a/slideshow/source/engine/shapes/viewmediashape.hxx b/slideshow/source/engine/shapes/viewmediashape.hxx
index 53fc804d4633..f1bd23644823 100644
--- a/slideshow/source/engine/shapes/viewmediashape.hxx
+++ b/slideshow/source/engine/shapes/viewmediashape.hxx
@@ -22,6 +22,7 @@
 
 #include <basegfx/range/b2drectangle.hxx>
 #include <com/sun/star/awt/Point.hpp>
+#include <com/sun/star/drawing/XShape.hpp>
 
 #include <memory>
 #include <vcl/vclptr.hxx>
diff --git a/slideshow/source/engine/shapes/viewshape.cxx b/slideshow/source/engine/shapes/viewshape.cxx
index c3b676d6ec41..8426503671f1 100644
--- a/slideshow/source/engine/shapes/viewshape.cxx
+++ b/slideshow/source/engine/shapes/viewshape.cxx
@@ -22,19 +22,13 @@
 #include <tools/diagnose_ex.h>
 
 #include <algorithm>
-#include <math.h>
 
 #include <rtl/math.hxx>
 #include <sal/log.hxx>
 
-#include <com/sun/star/rendering/XCanvas.hpp>
-#include <com/sun/star/rendering/XIntegerBitmap.hpp>
 #include <com/sun/star/rendering/PanoseLetterForm.hpp>
 #include <com/sun/star/awt/FontSlant.hpp>
 
-#include <cppuhelper/exc_hlp.hxx>
-
-#include <basegfx/polygon/b2dpolygontools.hxx>
 #include <basegfx/numeric/ftools.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
diff --git a/slideshow/source/engine/shapes/viewshape.hxx b/slideshow/source/engine/shapes/viewshape.hxx
index b3fc29d27a2d..2dc4255aafe5 100644
--- a/slideshow/source/engine/shapes/viewshape.hxx
+++ b/slideshow/source/engine/shapes/viewshape.hxx
@@ -24,7 +24,6 @@
 #include <cppcanvas/bitmap.hxx>
 
 #include <basegfx/range/b2drectangle.hxx>
-#include <basegfx/polygon/b2dpolygon.hxx>
 #include <o3tl/typed_flags_set.hxx>
 
 #include <tools.hxx>
diff --git a/slideshow/source/engine/shapesubset.cxx b/slideshow/source/engine/shapesubset.cxx
index 188d30c95533..4f5c797775af 100644
--- a/slideshow/source/engine/shapesubset.cxx
+++ b/slideshow/source/engine/shapesubset.cxx
@@ -19,9 +19,6 @@
 
 
 #include <tools/diagnose_ex.h>
-#include <sal/log.hxx>
-
-#include <cppuhelper/exc_hlp.hxx>
 
 #include <shapesubset.hxx>
 
diff --git a/slideshow/source/engine/slide/layer.cxx b/slideshow/source/engine/slide/layer.cxx
index fce4c234e78a..c8ec5f5f57f8 100644
--- a/slideshow/source/engine/slide/layer.cxx
+++ b/slideshow/source/engine/slide/layer.cxx
@@ -21,9 +21,7 @@
 #include <basegfx/range/b2drange.hxx>
 #include <basegfx/range/b1drange.hxx>
 #include <basegfx/range/b2dpolyrange.hxx>
-#include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/polygon/b2dpolypolygon.hxx>
-#include <basegfx/polygon/b2dpolypolygontools.hxx>
 #include <basegfx/polygon/b2dpolypolygoncutter.hxx>
 #include <osl/diagnose.h>
 
diff --git a/slideshow/source/engine/slide/layer.hxx b/slideshow/source/engine/slide/layer.hxx
index 2da9d66c7b48..a3115622955e 100644
--- a/slideshow/source/engine/slide/layer.hxx
+++ b/slideshow/source/engine/slide/layer.hxx
@@ -21,10 +21,9 @@
 #define INCLUDED_SLIDESHOW_SOURCE_ENGINE_SLIDE_LAYER_HXX
 
 #include <basegfx/range/b2dpolyrange.hxx>
-#include <cppcanvas/spritecanvas.hxx>
 
+#include <shape.hxx>
 #include <view.hxx>
-#include <animatableshape.hxx>
 
 #include <vector>
 #include <memory>
diff --git a/slideshow/source/engine/slide/layermanager.cxx b/slideshow/source/engine/slide/layermanager.cxx
index a85317d20512..543308ef5496 100644
--- a/slideshow/source/engine/slide/layermanager.cxx
+++ b/slideshow/source/engine/slide/layermanager.cxx
@@ -21,10 +21,7 @@
 #include <tools/diagnose_ex.h>
 #include <basegfx/range/b1drange.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
-
-#include <sal/log.hxx>
-#include <comphelper/anytostring.hxx>
-#include <cppuhelper/exc_hlp.hxx>
+#include <cppcanvas/canvas.hxx>
 
 #include <functional>
 #include <algorithm>
diff --git a/slideshow/source/engine/slide/layermanager.hxx b/slideshow/source/engine/slide/layermanager.hxx
index b6a029c2bb2d..4ad046c3a122 100644
--- a/slideshow/source/engine/slide/layermanager.hxx
+++ b/slideshow/source/engine/slide/layermanager.hxx
@@ -20,16 +20,11 @@
 #ifndef INCLUDED_SLIDESHOW_SOURCE_ENGINE_SLIDE_LAYERMANAGER_HXX
 #define INCLUDED_SLIDESHOW_SOURCE_ENGINE_SLIDE_LAYERMANAGER_HXX
 
-#include <cppcanvas/spritecanvas.hxx>
-
-#include <unoview.hxx>
 #include <unoviewcontainer.hxx>
 #include <attributableshape.hxx>
 #include "layer.hxx"
 #include <tools.hxx>
 
-#include <algorithm>
-#include <functional>
 #include <memory>
 #include <map>
 #include <unordered_map>
diff --git a/slideshow/source/engine/slide/shapemanagerimpl.hxx b/slideshow/source/engine/slide/shapemanagerimpl.hxx
index 16042c2e9b5e..9730975630b0 100644
--- a/slideshow/source/engine/slide/shapemanagerimpl.hxx
+++ b/slideshow/source/engine/slide/shapemanagerimpl.hxx
@@ -19,10 +19,8 @@
 #ifndef INCLUDED_SLIDESHOW_SOURCE_ENGINE_SLIDE_SHAPEMANAGERIMPL_HXX
 #define INCLUDED_SLIDESHOW_SOURCE_ENGINE_SLIDE_SHAPEMANAGERIMPL_HXX
 
-#include <cppuhelper/interfacecontainer.h>
 #include <com/sun/star/drawing/XDrawPage.hpp>
 #include <com/sun/star/uno/Reference.hxx>
-#include <com/sun/star/presentation/XShapeEventListener.hpp>
 
 #include <shape.hxx>
 #include <subsettableshapemanager.hxx>
diff --git a/slideshow/source/engine/slide/slideanimations.cxx b/slideshow/source/engine/slide/slideanimations.cxx
index 4cdf99ee671c..a6d526ba5a55 100644
--- a/slideshow/source/engine/slide/slideanimations.cxx
+++ b/slideshow/source/engine/slide/slideanimations.cxx
@@ -20,10 +20,6 @@
 
 #include <tools/diagnose_ex.h>
 
-#include <sal/log.hxx>
-#include <comphelper/anytostring.hxx>
-#include <cppuhelper/exc_hlp.hxx>
-
 #include "slideanimations.hxx"
 #include <animationnodefactory.hxx>
 
diff --git a/slideshow/source/engine/slide/slideanimations.hxx b/slideshow/source/engine/slide/slideanimations.hxx
index 3954aa345120..bcb958f36f9f 100644
--- a/slideshow/source/engine/slide/slideanimations.hxx
+++ b/slideshow/source/engine/slide/slideanimations.hxx
@@ -21,12 +21,9 @@
 #define INCLUDED_SLIDESHOW_SOURCE_ENGINE_SLIDE_SLIDEANIMATIONS_HXX
 
 #include <com/sun/star/uno/Reference.hxx>
-#include <com/sun/star/uno/XComponentContext.hpp>
 #include <basegfx/vector/b2dvector.hxx>
 
-#include <event.hxx>
 #include <slideshowcontext.hxx>
-#include <subsettableshapemanager.hxx>
 #include <animationnode.hxx>
 
 namespace com { namespace sun { namespace star { namespace animations
diff --git a/slideshow/source/engine/slide/slideimpl.cxx b/slideshow/source/engine/slide/slideimpl.cxx
index fecbe82df2d1..c164f1e82a61 100644
--- a/slideshow/source/engine/slide/slideimpl.cxx
+++ b/slideshow/source/engine/slide/slideimpl.cxx
@@ -20,28 +20,16 @@
 
 #include <osl/diagnose.hxx>
 #include <tools/diagnose_ex.h>
-#include <sal/log.hxx>
-#include <canvas/canvastools.hxx>
 #include <cppcanvas/basegfxfactory.hxx>
 
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/point/b2dpoint.hxx>
-#include <basegfx/polygon/b2dpolygon.hxx>
-#include <basegfx/polygon/b2dpolygontools.hxx>
-#include <basegfx/numeric/ftools.hxx>
 
 #include <com/sun/star/awt/SystemPointer.hpp>
-#include <com/sun/star/container/XIndexAccess.hpp>
 #include <com/sun/star/drawing/XMasterPageTarget.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/container/XEnumerationAccess.hpp>
-#include <com/sun/star/awt/Rectangle.hpp>
 #include <com/sun/star/presentation/ParagraphTarget.hpp>
 #include <com/sun/star/presentation/EffectNodeType.hpp>
-#include <com/sun/star/drawing/TextAnimationKind.hpp>
-
-#include <cppuhelper/exc_hlp.hxx>
-#include <comphelper/anytostring.hxx>
 
 #include <slide.hxx>
 #include <slideshowcontext.hxx>
@@ -57,14 +45,9 @@
 #include "shapemanagerimpl.hxx"
 #include <usereventqueue.hxx>
 #include "userpaintoverlay.hxx"
-#include <event.hxx>
 #include "targetpropertiescreator.hxx"
 #include <tools.hxx>
 
-#include <iterator>
-#include <functional>
-#include <iostream>
-
 using namespace ::com::sun::star;
 
 
diff --git a/slideshow/source/engine/slide/targetpropertiescreator.cxx b/slideshow/source/engine/slide/targetpropertiescreator.cxx
index c76fd6a1b1a4..0701526937b5 100644
--- a/slideshow/source/engine/slide/targetpropertiescreator.cxx
+++ b/slideshow/source/engine/slide/targetpropertiescreator.cxx
@@ -17,11 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <com/sun/star/uno/XComponentContext.hpp>
-#include <com/sun/star/lang/XTypeProvider.hpp>
 #include <com/sun/star/animations/XIterateContainer.hpp>
 #include <com/sun/star/presentation/ParagraphTarget.hpp>
-#include <com/sun/star/registry/XRegistryKey.hpp>
 #include <com/sun/star/drawing/XShape.hpp>
 #include <com/sun/star/animations/AnimationNodeType.hpp>
 #include <com/sun/star/animations/XAnimate.hpp>
diff --git a/slideshow/source/engine/slide/targetpropertiescreator.hxx b/slideshow/source/engine/slide/targetpropertiescreator.hxx
index 9a8c00e5654b..04dec8d59230 100644
--- a/slideshow/source/engine/slide/targetpropertiescreator.hxx
+++ b/slideshow/source/engine/slide/targetpropertiescreator.hxx
@@ -21,9 +21,7 @@
 #define INCLUDED_SLIDESHOW_SOURCE_ENGINE_SLIDE_TARGETPROPERTIESCREATOR_HXX
 
 #include <com/sun/star/animations/TargetProperties.hpp>
-
-#include <cppuhelper/factory.hxx>
-#include <cppuhelper/implementationentry.hxx>
+#include <com/sun/star/animations/XAnimationNode.hpp>
 
 using namespace ::com::sun::star;
 
diff --git a/slideshow/source/engine/slide/userpaintoverlay.cxx b/slideshow/source/engine/slide/userpaintoverlay.cxx
index 3ad95c1a6cdb..e3f1954557b5 100644
--- a/slideshow/source/engine/slide/userpaintoverlay.cxx
+++ b/slideshow/source/engine/slide/userpaintoverlay.cxx
@@ -18,19 +18,15 @@
  */
 
 
-#include <cppuhelper/exc_hlp.hxx>
-
 #include <com/sun/star/awt/MouseButton.hpp>
 #include <com/sun/star/awt/MouseEvent.hpp>
 
-#include <sal/log.hxx>
 #include <basegfx/point/b2dpoint.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <cppcanvas/basegfxfactory.hxx>
 #include <tools/diagnose_ex.h>
 
-#include <activity.hxx>
 #include <slideshowcontext.hxx>
 #include "userpaintoverlay.hxx"
 #include <mouseeventhandler.hxx>
diff --git a/slideshow/source/engine/slide/userpaintoverlay.hxx b/slideshow/source/engine/slide/userpaintoverlay.hxx
index 449b34174fa9..5dab806a9e76 100644
--- a/slideshow/source/engine/slide/userpaintoverlay.hxx
+++ b/slideshow/source/engine/slide/userpaintoverlay.hxx
@@ -20,9 +20,8 @@
 #ifndef INCLUDED_SLIDESHOW_SOURCE_ENGINE_SLIDE_USERPAINTOVERLAY_HXX
 #define INCLUDED_SLIDESHOW_SOURCE_ENGINE_SLIDE_USERPAINTOVERLAY_HXX
 
-#include <basegfx/polygon/b2dpolypolygon.hxx>
+#include <cppcanvas/canvasgraphic.hxx>
 
-#include <unoview.hxx>
 #include <rgbcolor.hxx>
 
 #include <memory>
diff --git a/slideshow/source/engine/slidebitmap.cxx b/slideshow/source/engine/slidebitmap.cxx
index 9c52fccd2359..b59d4813ab9a 100644
--- a/slideshow/source/engine/slidebitmap.cxx
+++ b/slideshow/source/engine/slidebitmap.cxx
@@ -20,12 +20,9 @@
 
 #include <tools/diagnose_ex.h>
 #include <slidebitmap.hxx>
-#include <sal/log.hxx>
 
 #include <com/sun/star/rendering/XCanvas.hpp>
 #include <com/sun/star/rendering/XBitmap.hpp>
-#include <comphelper/anytostring.hxx>
-#include <cppuhelper/exc_hlp.hxx>
 
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
diff --git a/slideshow/source/engine/slideshowimpl.cxx b/slideshow/source/engine/slideshowimpl.cxx
index aa6ee0b5eeb9..9e9893ffdbba 100644
--- a/slideshow/source/engine/slideshowimpl.cxx
+++ b/slideshow/source/engine/slideshowimpl.cxx
@@ -22,46 +22,27 @@
 
 #include <cppuhelper/basemutex.hxx>
 #include <cppuhelper/compbase.hxx>
-#include <cppuhelper/factory.hxx>
-#include <cppuhelper/implementationentry.hxx>
 #include <cppuhelper/interfacecontainer.h>
-#include <cppuhelper/exc_hlp.hxx>
 
-#include <comphelper/anytostring.hxx>
 #include <comphelper/scopeguard.hxx>
 #include <comphelper/servicedecl.hxx>
 #include <comphelper/storagehelper.hxx>
-
-#include <cppcanvas/spritecanvas.hxx>
-#include <cppcanvas/vclfactory.hxx>
-#include <cppcanvas/basegfxfactory.hxx>
+#include <cppcanvas/polypolygon.hxx>
 
 #include <tools/debug.hxx>
 
 #include <basegfx/point/b2dpoint.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
-#include <basegfx/matrix/b2dhommatrix.hxx>
-#include <basegfx/polygon/b2dpolygontools.hxx>
-#include <basegfx/polygon/b2dpolypolygontools.hxx>
 #include <basegfx/utils/canvastools.hxx>
 
-#include <vcl/font.hxx>
-#include <rtl/ref.hxx>
 #include <sal/log.hxx>
 
 #include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/util/XModifyListener.hpp>
 #include <com/sun/star/util/XUpdatable.hpp>
-#include <com/sun/star/awt/XPaintListener.hpp>
 #include <com/sun/star/awt/SystemPointer.hpp>
-#include <com/sun/star/animations/TransitionType.hpp>
-#include <com/sun/star/animations/TransitionSubType.hpp>
 #include <com/sun/star/presentation/XSlideShow.hpp>
 #include <com/sun/star/presentation/XSlideShowListener.hpp>
 #include <com/sun/star/lang/NoSupportException.hpp>
-#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/lang/XServiceName.hpp>
-#include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/drawing/PointSequenceSequence.hpp>
 #include <com/sun/star/drawing/PointSequence.hpp>
@@ -90,7 +71,6 @@
 #include <slideview.hxx>
 #include <tools.hxx>
 #include <unoview.hxx>
-#include <slidebitmap.hxx>
 #include "rehearsetimingsactivity.hxx"
 #include "waitsymbol.hxx"
 #include "effectrewinder.hxx"
@@ -99,11 +79,7 @@
 
 #include <map>
 #include <vector>
-#include <iterator>
-#include <string>
 #include <algorithm>
-#include <stdio.h>
-#include <iostream>
 
 using namespace com::sun::star;
 using namespace ::slideshow::internal;
diff --git a/slideshow/source/engine/slideview.cxx b/slideshow/source/engine/slideview.cxx
index 8fb3549c613a..9878bab7797f 100644
--- a/slideshow/source/engine/slideview.cxx
+++ b/slideshow/source/engine/slideview.cxx
@@ -28,8 +28,6 @@
 
 #include <cppuhelper/basemutex.hxx>
 #include <cppuhelper/compbase.hxx>
-#include <cppuhelper/implementationentry.hxx>
-#include <cppuhelper/interfacecontainer.h>
 #include <comphelper/make_shared_from_uno.hxx>
 
 #include <cppcanvas/spritecanvas.hxx>
@@ -49,12 +47,13 @@
 #include <basegfx/polygon/b2dpolygonclipper.hxx>
 #include <basegfx/polygon/b2dpolypolygoncutter.hxx>
 
-#include <com/sun/star/presentation/XSlideShow.hpp>
+#include <com/sun/star/awt/XPaintListener.hpp>
+#include <com/sun/star/presentation/XSlideShowView.hpp>
 #include <com/sun/star/rendering/CompositeOperation.hpp>
+#include <com/sun/star/util/XModifyListener.hpp>
 
 #include <memory>
 #include <vector>
-#include <iterator>
 #include <algorithm>
 
 using namespace com::sun::star;
diff --git a/slideshow/source/engine/smilfunctionparser.cxx b/slideshow/source/engine/smilfunctionparser.cxx
index 6c587e8919a0..2ec3d8dc4d3c 100644
--- a/slideshow/source/engine/smilfunctionparser.cxx
+++ b/slideshow/source/engine/smilfunctionparser.cxx
@@ -20,17 +20,13 @@
 
 #include <tools/diagnose_ex.h>
 
-#include <rtl/math.hxx>
-
+#include <slideshowexceptions.hxx>
 #include <smilfunctionparser.hxx>
 #include <expressionnodefactory.hxx>
 
 #include <rtl/ustring.hxx>
 #include <sal/log.hxx>
 
-#include <basegfx/matrix/b2dhommatrix.hxx>
-#include <basegfx/point/b2dpoint.hxx>
-
 // Makes parser a static resource,
 // we're synchronized externally.
 // But watch out, the parser might have
@@ -38,7 +34,6 @@
 #define BOOST_SPIRIT_SINGLE_GRAMMAR_INSTANCE
 
 #if defined(DBG_UTIL)
-#include <typeinfo>
 #define BOOST_SPIRIT_DEBUG
 #endif
 #include <boost/spirit/include/classic_core.hpp>
diff --git a/slideshow/source/engine/soundplayer.cxx b/slideshow/source/engine/soundplayer.cxx
index 5381b829425f..0b411d292f9f 100644
--- a/slideshow/source/engine/soundplayer.cxx
+++ b/slideshow/source/engine/soundplayer.cxx
@@ -20,11 +20,6 @@
 
 #include <tools/diagnose_ex.h>
 
-#include <comphelper/anytostring.hxx>
-#include <cppuhelper/exc_hlp.hxx>
-#include <sal/log.hxx>
-
-#include <com/sun/star/lang/XMultiComponentFactory.hpp>
 #include <com/sun/star/lang/NoSupportException.hpp>
 #include <com/sun/star/lang/XComponent.hpp>
 
diff --git a/slideshow/source/engine/tools.cxx b/slideshow/source/engine/tools.cxx
index 096715a73c90..8afcc9739650 100644
--- a/slideshow/source/engine/tools.cxx
+++ b/slideshow/source/engine/tools.cxx
@@ -43,6 +43,7 @@
 #include <cppcanvas/basegfxfactory.hxx>
 
 #include <unoview.hxx>
+#include <slideshowexceptions.hxx>
 #include <smilfunctionparser.hxx>
 #include <tools.hxx>
 
diff --git a/slideshow/source/engine/transitions/clippingfunctor.cxx b/slideshow/source/engine/transitions/clippingfunctor.cxx
index 57fcc38a207e..5aa3857a7712 100644
--- a/slideshow/source/engine/transitions/clippingfunctor.cxx
+++ b/slideshow/source/engine/transitions/clippingfunctor.cxx
@@ -20,10 +20,9 @@
 
 #include <tools/diagnose_ex.h>
 #include "clippingfunctor.hxx"
-#include "transitiontools.hxx"
 
 #include <basegfx/polygon/b2dpolypolygoncutter.hxx>
-#include <basegfx/polygon/b2dpolygonclipper.hxx>
+#include <basegfx/polygon/b2dpolypolygontools.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
 
diff --git a/slideshow/source/engine/transitions/clippingfunctor.hxx b/slideshow/source/engine/transitions/clippingfunctor.hxx
index 82356a9e3be7..bc3e7b61ab12 100644
--- a/slideshow/source/engine/transitions/clippingfunctor.hxx
+++ b/slideshow/source/engine/transitions/clippingfunctor.hxx
@@ -20,10 +20,8 @@
 #ifndef INCLUDED_SLIDESHOW_SOURCE_ENGINE_TRANSITIONS_CLIPPINGFUNCTOR_HXX
 #define INCLUDED_SLIDESHOW_SOURCE_ENGINE_TRANSITIONS_CLIPPINGFUNCTOR_HXX
 
-#include <basegfx/numeric/ftools.hxx>
 #include <basegfx/vector/b2dsize.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
-#include <basegfx/polygon/b2dpolypolygontools.hxx>
 #include <transitioninfo.hxx>
 #include "parametricpolypolygon.hxx"
 
diff --git a/slideshow/source/engine/transitions/clockwipe.cxx b/slideshow/source/engine/transitions/clockwipe.cxx
index d274d582856c..cd4360b3672c 100644
--- a/slideshow/source/engine/transitions/clockwipe.cxx
+++ b/slideshow/source/engine/transitions/clockwipe.cxx
@@ -20,7 +20,6 @@
 
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/point/b2dpoint.hxx>
-#include <basegfx/numeric/ftools.hxx>
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
 #include "clockwipe.hxx"
 
diff --git a/slideshow/source/engine/transitions/combtransition.cxx b/slideshow/source/engine/transitions/combtransition.cxx
index d6c17e5129da..90a2f56fa0ca 100644
--- a/slideshow/source/engine/transitions/combtransition.cxx
+++ b/slideshow/source/engine/transitions/combtransition.cxx
@@ -23,8 +23,6 @@
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
 
-#include <cppcanvas/spritecanvas.hxx>
-
 #include "combtransition.hxx"
 
 namespace slideshow {
diff --git a/slideshow/source/engine/transitions/combtransition.hxx b/slideshow/source/engine/transitions/combtransition.hxx
index c0d2f46f24e6..2446e4923b95 100644
--- a/slideshow/source/engine/transitions/combtransition.hxx
+++ b/slideshow/source/engine/transitions/combtransition.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_SLIDESHOW_SOURCE_ENGINE_TRANSITIONS_COMBTRANSITION_HXX
 #define INCLUDED_SLIDESHOW_SOURCE_ENGINE_TRANSITIONS_COMBTRANSITION_HXX
 
-#include <basegfx/polygon/b2dpolypolygon.hxx>
 #include "slidechangebase.hxx"
 
 namespace slideshow {
diff --git a/slideshow/source/engine/transitions/doublediamondwipe.cxx b/slideshow/source/engine/transitions/doublediamondwipe.cxx
index 499fab1a9b02..220f3ec8c6f8 100644
--- a/slideshow/source/engine/transitions/doublediamondwipe.cxx
+++ b/slideshow/source/engine/transitions/doublediamondwipe.cxx
@@ -18,7 +18,6 @@
  */
 
 
-#include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/point/b2dpoint.hxx>
 #include "doublediamondwipe.hxx"
 
diff --git a/slideshow/source/engine/transitions/doublediamondwipe.hxx b/slideshow/source/engine/transitions/doublediamondwipe.hxx
index 5415f61ef38c..eee6e32e5179 100644
--- a/slideshow/source/engine/transitions/doublediamondwipe.hxx
+++ b/slideshow/source/engine/transitions/doublediamondwipe.hxx
@@ -23,7 +23,6 @@
 #include <basegfx/polygon/b2dpolypolygon.hxx>
 
 #include "parametricpolypolygon.hxx"
-#include "transitiontools.hxx"
 
 
 namespace slideshow {
diff --git a/slideshow/source/engine/transitions/ellipsewipe.cxx b/slideshow/source/engine/transitions/ellipsewipe.cxx
index 395b1a750de4..f8647b3becb7 100644
--- a/slideshow/source/engine/transitions/ellipsewipe.cxx
+++ b/slideshow/source/engine/transitions/ellipsewipe.cxx
@@ -21,7 +21,6 @@
 #include <basegfx/numeric/ftools.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
 #include "ellipsewipe.hxx"
-#include "transitiontools.hxx"
 
 
 namespace slideshow {
diff --git a/slideshow/source/engine/transitions/fanwipe.cxx b/slideshow/source/engine/transitions/fanwipe.cxx
index b6720d916ed5..fb61ee9402a7 100644
--- a/slideshow/source/engine/transitions/fanwipe.cxx
+++ b/slideshow/source/engine/transitions/fanwipe.cxx
@@ -18,7 +18,6 @@
  */
 
 
-#include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
 #include <sal/log.hxx>
 #include "transitiontools.hxx"
diff --git a/slideshow/source/engine/transitions/figurewipe.cxx b/slideshow/source/engine/transitions/figurewipe.cxx
index 1761fdc1a4e4..caf573bfda6a 100644
--- a/slideshow/source/engine/transitions/figurewipe.cxx
+++ b/slideshow/source/engine/transitions/figurewipe.cxx
@@ -22,7 +22,6 @@
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/point/b2dpoint.hxx>
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
-#include "transitiontools.hxx"
 #include "figurewipe.hxx"
 
 
diff --git a/slideshow/source/engine/transitions/pinwheelwipe.cxx b/slideshow/source/engine/transitions/pinwheelwipe.cxx
index f529a778cfd1..646d3a04afa1 100644
--- a/slideshow/source/engine/transitions/pinwheelwipe.cxx
+++ b/slideshow/source/engine/transitions/pinwheelwipe.cxx
@@ -18,8 +18,6 @@
  */
 
 
-#include <basegfx/matrix/b2dhommatrix.hxx>
-#include <basegfx/numeric/ftools.hxx>
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
 #include "clockwipe.hxx"
 #include "pinwheelwipe.hxx"
diff --git a/slideshow/source/engine/transitions/pinwheelwipe.hxx b/slideshow/source/engine/transitions/pinwheelwipe.hxx
index 1c7ee3216e72..f4654548f26e 100644
--- a/slideshow/source/engine/transitions/pinwheelwipe.hxx
+++ b/slideshow/source/engine/transitions/pinwheelwipe.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_SLIDESHOW_SOURCE_ENGINE_TRANSITIONS_PINWHEELWIPE_HXX
 #define INCLUDED_SLIDESHOW_SOURCE_ENGINE_TRANSITIONS_PINWHEELWIPE_HXX
 
-#include <basegfx/polygon/b2dpolygon.hxx>
 #include "parametricpolypolygon.hxx"
 
 
diff --git a/slideshow/source/engine/transitions/randomwipe.cxx b/slideshow/source/engine/transitions/randomwipe.cxx
index dbe78386bb6e..4dd16f3f9278 100644
--- a/slideshow/source/engine/transitions/randomwipe.cxx
+++ b/slideshow/source/engine/transitions/randomwipe.cxx
@@ -22,6 +22,7 @@
 #include <basegfx/numeric/ftools.hxx>
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
 #include "randomwipe.hxx"
+#include "transitiontools.hxx"
 #include <tools.hxx>
 
 
diff --git a/slideshow/source/engine/transitions/randomwipe.hxx b/slideshow/source/engine/transitions/randomwipe.hxx
index 237fa59d2882..8af80f5f715a 100644
--- a/slideshow/source/engine/transitions/randomwipe.hxx
+++ b/slideshow/source/engine/transitions/randomwipe.hxx
@@ -25,7 +25,6 @@
 #include <memory>
 
 #include "parametricpolypolygon.hxx"
-#include "transitiontools.hxx"
 
 
 namespace slideshow {
diff --git a/slideshow/source/engine/transitions/shapetransitionfactory.cxx b/slideshow/source/engine/transitions/shapetransitionfactory.cxx
index ffc008191193..666ce116b6be 100644
--- a/slideshow/source/engine/transitions/shapetransitionfactory.cxx
+++ b/slideshow/source/engine/transitions/shapetransitionfactory.cxx
@@ -20,10 +20,6 @@
 
 #include <tools/diagnose_ex.h>
 
-#include <cppuhelper/exc_hlp.hxx>
-#include <basegfx/numeric/ftools.hxx>
-#include <basegfx/matrix/b2dhommatrix.hxx>
-#include <basegfx/polygon/b2dpolypolygontools.hxx>
 #include <sal/log.hxx>
 
 #include <com/sun/star/animations/TransitionType.hpp>
@@ -31,7 +27,6 @@
 
 #include <transitionfactory.hxx>
 #include "transitionfactorytab.hxx"
-#include "transitiontools.hxx"
 #include "parametricpolypolygonfactory.hxx"
 #include <animationfactory.hxx>
 #include "clippingfunctor.hxx"
diff --git a/slideshow/source/engine/transitions/slidechangebase.cxx b/slideshow/source/engine/transitions/slidechangebase.cxx
index 3fbad5bec67d..6c53690017cc 100644
--- a/slideshow/source/engine/transitions/slidechangebase.cxx
+++ b/slideshow/source/engine/transitions/slidechangebase.cxx
@@ -19,10 +19,6 @@
 
 
 #include <tools/diagnose_ex.h>
-#include <canvas/canvastools.hxx>
-#include <basegfx/numeric/ftools.hxx>
-#include <basegfx/polygon/b2dpolygontools.hxx>
-#include <basegfx/polygon/b2dpolypolygontools.hxx>
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
 #include <cppcanvas/basegfxfactory.hxx>
 #include <cppcanvas/customsprite.hxx>
diff --git a/slideshow/source/engine/transitions/slidetransitionfactory.cxx b/slideshow/source/engine/transitions/slidetransitionfactory.cxx
index 34ee72eb11c9..30724effa283 100644
--- a/slideshow/source/engine/transitions/slidetransitionfactory.cxx
+++ b/slideshow/source/engine/transitions/slidetransitionfactory.cxx
@@ -21,25 +21,16 @@
 #include <sal/log.hxx>
 
 #include <basegfx/matrix/b2dhommatrix.hxx>
-#include <basegfx/utils/canvastools.hxx>
-#include <basegfx/polygon/b2dpolygontools.hxx>
-#include <basegfx/polygon/b2dpolypolygontools.hxx>
 
-#include <cppcanvas/basegfxfactory.hxx>
 #include <cppcanvas/customsprite.hxx>
 
-#include <com/sun/star/rendering/XIntegerBitmap.hpp>
-#include <com/sun/star/rendering/IntegerBitmapLayout.hpp>
 #include <com/sun/star/animations/TransitionType.hpp>
 #include <com/sun/star/animations/TransitionSubType.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 
 #include "slidechangebase.hxx"
 #include <transitionfactory.hxx>
 #include "transitionfactorytab.hxx"
-#include "transitiontools.hxx"
 #include "parametricpolypolygonfactory.hxx"
-#include <animationfactory.hxx>
 #include "clippingfunctor.hxx"
 #include "combtransition.hxx"
 #include <tools.hxx>
diff --git a/slideshow/source/engine/transitions/snakewipe.hxx b/slideshow/source/engine/transitions/snakewipe.hxx
index bf147209b82a..ec71f4f83629 100644
--- a/slideshow/source/engine/transitions/snakewipe.hxx
+++ b/slideshow/source/engine/transitions/snakewipe.hxx
@@ -22,9 +22,6 @@
 
 #include "parametricpolypolygon.hxx"
 
-#include <basegfx/numeric/ftools.hxx>
-#include <basegfx/point/b2dpoint.hxx>
-
 
 namespace slideshow {
 namespace internal {
diff --git a/slideshow/source/engine/transitions/spiralwipe.hxx b/slideshow/source/engine/transitions/spiralwipe.hxx
index a5906278dd94..fe89c0c8eda1 100644
--- a/slideshow/source/engine/transitions/spiralwipe.hxx
+++ b/slideshow/source/engine/transitions/spiralwipe.hxx
@@ -21,8 +21,6 @@
 #define INCLUDED_SLIDESHOW_SOURCE_ENGINE_TRANSITIONS_SPIRALWIPE_HXX
 
 #include "parametricpolypolygon.hxx"
-#include <basegfx/numeric/ftools.hxx>
-#include <basegfx/point/b2dpoint.hxx>
 
 
 namespace slideshow {
diff --git a/slideshow/source/engine/transitions/sweepwipe.cxx b/slideshow/source/engine/transitions/sweepwipe.cxx
index bf7d9292e05f..bb6a3e40e69e 100644
--- a/slideshow/source/engine/transitions/sweepwipe.cxx
+++ b/slideshow/source/engine/transitions/sweepwipe.cxx
@@ -19,7 +19,6 @@
 
 
 #include <basegfx/matrix/b2dhommatrix.hxx>
-#include <basegfx/numeric/ftools.hxx>
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
 #include "clockwipe.hxx"
 #include "sweepwipe.hxx"
diff --git a/slideshow/source/engine/transitions/transitionfactorytab.cxx b/slideshow/source/engine/transitions/transitionfactorytab.cxx
index 2e55b8471d7c..15cd451d0a0b 100644
--- a/slideshow/source/engine/transitions/transitionfactorytab.cxx
+++ b/slideshow/source/engine/transitions/transitionfactorytab.cxx
@@ -18,12 +18,11 @@
  */
 
 
-#include <basegfx/numeric/ftools.hxx>
 #include <com/sun/star/animations/TransitionType.hpp>
 #include <com/sun/star/animations/TransitionSubType.hpp>
 
-#include <transitionfactory.hxx>
 #include "transitionfactorytab.hxx"
+#include <transitioninfo.hxx>
 #include <tools.hxx>
 
 #include <algorithm>
diff --git a/slideshow/source/engine/transitions/transitiontools.cxx b/slideshow/source/engine/transitions/transitiontools.cxx
index d05b28bf9c0b..adadaa57eb70 100644
--- a/slideshow/source/engine/transitions/transitiontools.cxx
+++ b/slideshow/source/engine/transitions/transitiontools.cxx
@@ -19,10 +19,8 @@
 
 
 #include "transitiontools.hxx"
-#include <basegfx/point/b2dpoint.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
-#include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
 
 
diff --git a/slideshow/source/engine/transitions/transitiontools.hxx b/slideshow/source/engine/transitions/transitiontools.hxx
index 3acf2f797b6e..53b3b4f46cb7 100644
--- a/slideshow/source/engine/transitions/transitiontools.hxx
+++ b/slideshow/source/engine/transitions/transitiontools.hxx
@@ -20,12 +20,9 @@
 #ifndef INCLUDED_SLIDESHOW_SOURCE_ENGINE_TRANSITIONS_TRANSITIONTOOLS_HXX
 #define INCLUDED_SLIDESHOW_SOURCE_ENGINE_TRANSITIONS_TRANSITIONTOOLS_HXX
 
-#include <basegfx/numeric/ftools.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <basegfx/polygon/b2dpolypolygon.hxx>
 
-#include <algorithm>
-
 
 namespace slideshow {
 namespace internal {
diff --git a/slideshow/source/engine/transitions/veewipe.hxx b/slideshow/source/engine/transitions/veewipe.hxx
index ac2182b21cc6..537fd79e005d 100644
--- a/slideshow/source/engine/transitions/veewipe.hxx
+++ b/slideshow/source/engine/transitions/veewipe.hxx
@@ -23,7 +23,6 @@
 #include <basegfx/polygon/b2dpolypolygon.hxx>
 
 #include "parametricpolypolygon.hxx"
-#include "transitiontools.hxx"
 
 
 namespace slideshow {
diff --git a/slideshow/source/engine/transitions/waterfallwipe.cxx b/slideshow/source/engine/transitions/waterfallwipe.cxx
index 97f25eef1631..a1743993d049 100644
--- a/slideshow/source/engine/transitions/waterfallwipe.cxx
+++ b/slideshow/source/engine/transitions/waterfallwipe.cxx
@@ -18,7 +18,6 @@
  */
 
 
-#include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/point/b2dpoint.hxx>
 #include <basegfx/numeric/ftools.hxx>
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
diff --git a/slideshow/source/engine/transitions/zigzagwipe.cxx b/slideshow/source/engine/transitions/zigzagwipe.cxx
index e7f80e78cf01..0e2e64c62b64 100644
--- a/slideshow/source/engine/transitions/zigzagwipe.cxx
+++ b/slideshow/source/engine/transitions/zigzagwipe.cxx
@@ -20,7 +20,6 @@
 
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/point/b2dpoint.hxx>
-#include <basegfx/numeric/ftools.hxx>
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
 #include "transitiontools.hxx"
 #include "zigzagwipe.hxx"
diff --git a/slideshow/source/engine/usereventqueue.cxx b/slideshow/source/engine/usereventqueue.cxx
index e0ff40f4f545..44078a390cb4 100644
--- a/slideshow/source/engine/usereventqueue.cxx
+++ b/slideshow/source/engine/usereventqueue.cxx
@@ -19,9 +19,6 @@
 
 
 #include <tools/diagnose_ex.h>
-#include <sal/log.hxx>
-
-#include <cppuhelper/exc_hlp.hxx>
 
 #include <com/sun/star/awt/SystemPointer.hpp>
 #include <com/sun/star/awt/MouseButton.hpp>
@@ -30,12 +27,10 @@
 #include <delayevent.hxx>
 #include <usereventqueue.hxx>
 #include <cursormanager.hxx>
-#include <slideshowexceptions.hxx>
 
 #include <vector>
 #include <queue>
 #include <map>
-#include <functional>
 #include <algorithm>
 
 
diff --git a/slideshow/source/engine/waitsymbol.cxx b/slideshow/source/engine/waitsymbol.cxx
index 4612262358f7..c7f31906b7f5 100644
--- a/slideshow/source/engine/waitsymbol.cxx
+++ b/slideshow/source/engine/waitsymbol.cxx
@@ -20,9 +20,7 @@
 
 #include <canvas/canvastools.hxx>
 
-#include <comphelper/anytostring.hxx>
-#include <cppuhelper/exc_hlp.hxx>
-#include <sal/log.hxx>
+#include <cppcanvas/customsprite.hxx>
 
 #include <basegfx/point/b2dpoint.hxx>
 #include <basegfx/vector/b2dvector.hxx>
diff --git a/slideshow/source/engine/waitsymbol.hxx b/slideshow/source/engine/waitsymbol.hxx
index 438437fc9330..b5cdadda3fe6 100644
--- a/slideshow/source/engine/waitsymbol.hxx
+++ b/slideshow/source/engine/waitsymbol.hxx
@@ -21,7 +21,7 @@
 #define INCLUDED_SLIDESHOW_SOURCE_ENGINE_WAITSYMBOL_HXX
 
 #include <com/sun/star/rendering/XBitmap.hpp>
-#include <cppcanvas/customsprite.hxx>
+#include <cppcanvas/sprite.hxx>
 
 #include <vieweventhandler.hxx>
 #include <screenupdater.hxx>
diff --git a/slideshow/source/inc/activitiesqueue.hxx b/slideshow/source/inc/activitiesqueue.hxx
index 5dd2f8eeba97..b4f88b1b39d1 100644
--- a/slideshow/source/inc/activitiesqueue.hxx
+++ b/slideshow/source/inc/activitiesqueue.hxx
@@ -23,7 +23,6 @@
 #include <deque>
 
 #include "activity.hxx"
-#include "unoviewcontainer.hxx"
 
 #include <canvas/elapsedtime.hxx>
 
diff --git a/slideshow/source/inc/activity.hxx b/slideshow/source/inc/activity.hxx
index 9897170b9edf..5627206a56c0 100644
--- a/slideshow/source/inc/activity.hxx
+++ b/slideshow/source/inc/activity.hxx
@@ -20,8 +20,6 @@
 #ifndef INCLUDED_SLIDESHOW_SOURCE_INC_ACTIVITY_HXX
 #define INCLUDED_SLIDESHOW_SOURCE_INC_ACTIVITY_HXX
 
-#include <sal/types.h>
-
 #include <memory>
 
 #include "disposable.hxx"
diff --git a/slideshow/source/inc/animatedsprite.hxx b/slideshow/source/inc/animatedsprite.hxx
index db38190a6d32..aa7384841412 100644
--- a/slideshow/source/inc/animatedsprite.hxx
+++ b/slideshow/source/inc/animatedsprite.hxx
@@ -20,10 +20,7 @@
 #ifndef INCLUDED_SLIDESHOW_SOURCE_INC_ANIMATEDSPRITE_HXX
 #define INCLUDED_SLIDESHOW_SOURCE_INC_ANIMATEDSPRITE_HXX
 
-#include <cppcanvas/customsprite.hxx>
-
 #include <basegfx/matrix/b2dhommatrix.hxx>
-#include <basegfx/vector/b2dsize.hxx>
 #include <basegfx/point/b2dpoint.hxx>
 #include <basegfx/polygon/b2dpolypolygon.hxx>
 
diff --git a/slideshow/source/inc/animationfactory.hxx b/slideshow/source/inc/animationfactory.hxx
index 1b9891339e5d..7d2f205c63a5 100644
--- a/slideshow/source/inc/animationfactory.hxx
+++ b/slideshow/source/inc/animationfactory.hxx
@@ -28,8 +28,6 @@
 #include "boolanimation.hxx"
 #include "pairanimation.hxx"
 
-#include "shape.hxx"
-#include "shapeattributelayer.hxx"
 #include "shapemanager.hxx"
 
 /* Definition of AnimationFactory class */
diff --git a/slideshow/source/inc/animationnodefactory.hxx b/slideshow/source/inc/animationnodefactory.hxx
index f23428449255..681cc8518451 100644
--- a/slideshow/source/inc/animationnodefactory.hxx
+++ b/slideshow/source/inc/animationnodefactory.hxx
@@ -21,17 +21,12 @@
 #define INCLUDED_SLIDESHOW_SOURCE_INC_ANIMATIONNODEFACTORY_HXX
 
 #include <com/sun/star/uno/Reference.hxx>
-#include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/animations/XAnimationNode.hpp>
 
-#include "subsettableshapemanager.hxx"
+#include <basegfx/vector/b2dvector.hxx>
+
 #include "animationnode.hxx"
 #include "slideshowcontext.hxx"
-#include "eventqueue.hxx"
-#include "activitiesqueue.hxx"
-#include "usereventqueue.hxx"
-
-#include <vector>
 
 
 namespace slideshow
diff --git a/slideshow/source/inc/basenode.hxx b/slideshow/source/inc/basenode.hxx
index bc4eb9420b83..7bbf0c13b6a8 100644
--- a/slideshow/source/inc/basenode.hxx
+++ b/slideshow/source/inc/basenode.hxx
@@ -19,6 +19,7 @@
 #ifndef INCLUDED_SLIDESHOW_SOURCE_INC_BASENODE_HXX
 #define INCLUDED_SLIDESHOW_SOURCE_INC_BASENODE_HXX
 
+#include <basegfx/vector/b2dvector.hxx>
 #include <tools/diagnose_ex.h>
 #include <osl/diagnose.hxx>
 
diff --git a/slideshow/source/inc/cursormanager.hxx b/slideshow/source/inc/cursormanager.hxx
index 48b6ded2cd7b..b470020abae8 100644
--- a/slideshow/source/inc/cursormanager.hxx
+++ b/slideshow/source/inc/cursormanager.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_SLIDESHOW_SOURCE_INC_CURSORMANAGER_HXX
 
 #include <sal/types.h>
-#include <memory>
 
 
 /* Definition of CursorManager interface */
diff --git a/slideshow/source/inc/disposable.hxx b/slideshow/source/inc/disposable.hxx
index f1f693a23e33..c3be8bb4091a 100644
--- a/slideshow/source/inc/disposable.hxx
+++ b/slideshow/source/inc/disposable.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_SLIDESHOW_SOURCE_INC_DISPOSABLE_HXX
 #define INCLUDED_SLIDESHOW_SOURCE_INC_DISPOSABLE_HXX
 
-#include <sal/types.h>
 #include <memory>
 
 
diff --git a/slideshow/source/inc/expressionnode.hxx b/slideshow/source/inc/expressionnode.hxx
index 2928f0f7ae88..fef80fc7cc9c 100644
--- a/slideshow/source/inc/expressionnode.hxx
+++ b/slideshow/source/inc/expressionnode.hxx
@@ -20,8 +20,6 @@
 #ifndef INCLUDED_SLIDESHOW_SOURCE_INC_EXPRESSIONNODE_HXX
 #define INCLUDED_SLIDESHOW_SOURCE_INC_EXPRESSIONNODE_HXX
 
-#include <memory>
-
 /* Definition of ExpressionNode interface */
 
 namespace slideshow
diff --git a/slideshow/source/inc/expressionnodefactory.hxx b/slideshow/source/inc/expressionnodefactory.hxx
index d4a60b3c72c9..56244e843540 100644
--- a/slideshow/source/inc/expressionnodefactory.hxx
+++ b/slideshow/source/inc/expressionnodefactory.hxx
@@ -22,8 +22,7 @@
 
 #include "expressionnode.hxx"
 
-#include <basegfx/vector/b2dsize.hxx>
-#include <basegfx/range/b2drectangle.hxx>
+#include <memory>
 
 
 /* Definition of ExpressionNodeFactory class */
diff --git a/slideshow/source/inc/hslcolor.hxx b/slideshow/source/inc/hslcolor.hxx
index 2c3dca71bd3b..74b38995af22 100644
--- a/slideshow/source/inc/hslcolor.hxx
+++ b/slideshow/source/inc/hslcolor.hxx
@@ -20,8 +20,6 @@
 #ifndef INCLUDED_SLIDESHOW_SOURCE_INC_HSLCOLOR_HXX
 #define INCLUDED_SLIDESHOW_SOURCE_INC_HSLCOLOR_HXX
 
-#include <cppcanvas/color.hxx>
-
 
 /* Definition of HSLColor class */
 
diff --git a/slideshow/source/inc/hyperlinkarea.hxx b/slideshow/source/inc/hyperlinkarea.hxx
index 52e51f8224d9..631c3f26fc4e 100644
--- a/slideshow/source/inc/hyperlinkarea.hxx
+++ b/slideshow/source/inc/hyperlinkarea.hxx
@@ -20,6 +20,8 @@
 #ifndef INCLUDED_SLIDESHOW_SOURCE_INC_HYPERLINKAREA_HXX
 #define INCLUDED_SLIDESHOW_SOURCE_INC_HYPERLINKAREA_HXX
 
+#include <rtl/ustring.hxx>
+
 #include <memory>
 #include <vector>
 #include <utility>
diff --git a/slideshow/source/inc/listenercontainer.hxx b/slideshow/source/inc/listenercontainer.hxx
index d1f47d78b38a..3cdcb10b42cf 100644
--- a/slideshow/source/inc/listenercontainer.hxx
+++ b/slideshow/source/inc/listenercontainer.hxx
@@ -19,8 +19,8 @@
 #ifndef INCLUDED_SLIDESHOW_SOURCE_INC_LISTENERCONTAINER_HXX
 #define INCLUDED_SLIDESHOW_SOURCE_INC_LISTENERCONTAINER_HXX
 
-#include <osl/mutex.hxx>
 #include <algorithm>
+#include <memory>
 #include <vector>
 #include <iterator>
 
diff --git a/slideshow/source/inc/mediafilemanager.hxx b/slideshow/source/inc/mediafilemanager.hxx
index 1c6bee62e78d..6588defa8e68 100644
--- a/slideshow/source/inc/mediafilemanager.hxx
+++ b/slideshow/source/inc/mediafilemanager.hxx
@@ -11,7 +11,8 @@
 #ifndef INCLUDED_SLIDESHOW_SOURCE_INC_MEDIAFILEMANAGER_HXX
 #define INCLUDED_SLIDESHOW_SOURCE_INC_MEDIAFILEMANAGER_HXX
 
-#include <com/sun/star/uno/Reference.hxx>
+#include <rtl/ustring.hxx>
+
 #include <memory>
 
 namespace avmedia
diff --git a/slideshow/source/inc/mouseeventhandler.hxx b/slideshow/source/inc/mouseeventhandler.hxx
index 0a25b4170bab..485cc34d3ff5 100644
--- a/slideshow/source/inc/mouseeventhandler.hxx
+++ b/slideshow/source/inc/mouseeventhandler.hxx
@@ -20,6 +20,8 @@
 #ifndef INCLUDED_SLIDESHOW_SOURCE_INC_MOUSEEVENTHANDLER_HXX
 #define INCLUDED_SLIDESHOW_SOURCE_INC_MOUSEEVENTHANDLER_HXX
 
+#include <sal/types.h>
+
 #include <memory>
 
 namespace com { namespace sun { namespace star { namespace awt
diff --git a/slideshow/source/inc/shape.hxx b/slideshow/source/inc/shape.hxx
index adb6683bba75..9b6099462ab6 100644
--- a/slideshow/source/inc/shape.hxx
+++ b/slideshow/source/inc/shape.hxx
@@ -22,7 +22,6 @@
 
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/drawing/XShape.hpp>
-#include <com/sun/star/drawing/XDrawPage.hpp>
 
 #include <basegfx/range/b2drectangle.hxx>
 
@@ -30,7 +29,6 @@
 
 #include <memory>
 #include <set>
-#include <vector>
 
 namespace basegfx {
     class B2DRange;
diff --git a/slideshow/source/inc/shapeattributelayer.hxx b/slideshow/source/inc/shapeattributelayer.hxx
index d0b285c9b6fa..0614ff285e7f 100644
--- a/slideshow/source/inc/shapeattributelayer.hxx
+++ b/slideshow/source/inc/shapeattributelayer.hxx
@@ -26,12 +26,10 @@
 
 #include <basegfx/vector/b2dsize.hxx>
 #include <basegfx/point/b2dpoint.hxx>
-#include <basegfx/range/b2drectangle.hxx>
 #include <basegfx/polygon/b2dpolypolygon.hxx>
 
 #include "rgbcolor.hxx"
 
-#include <stack>
 #include <memory>
 
 
diff --git a/slideshow/source/inc/shapeimporter.hxx b/slideshow/source/inc/shapeimporter.hxx
index b29c0b079d0c..eaa7f0876790 100644
--- a/slideshow/source/inc/shapeimporter.hxx
+++ b/slideshow/source/inc/shapeimporter.hxx
@@ -20,10 +20,13 @@
 #define INCLUDED_SLIDESHOW_SOURCE_INC_SHAPEIMPORTER_HXX
 
 #include <com/sun/star/drawing/XDrawPage.hpp>
+#include <com/sun/star/drawing/XDrawPagesSupplier.hpp>
 #include <com/sun/star/drawing/XShapes.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/drawing/XLayer.hpp>
-#include "unoviewcontainer.hxx"
+
+#include <cppcanvas/canvasgraphic.hxx>
+
 #include "unoview.hxx"
 
 #include "shape.hxx"
diff --git a/slideshow/source/inc/shapesubset.hxx b/slideshow/source/inc/shapesubset.hxx
index 8ca6b50f1e6c..18aaaacfb560 100644
--- a/slideshow/source/inc/shapesubset.hxx
+++ b/slideshow/source/inc/shapesubset.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_SLIDESHOW_SOURCE_INC_SHAPESUBSET_HXX
 #define INCLUDED_SLIDESHOW_SOURCE_INC_SHAPESUBSET_HXX
 
-#include "attributableshape.hxx"
 #include "subsettableshapemanager.hxx"
 #include "doctreenode.hxx"
 
diff --git a/slideshow/source/inc/slide.hxx b/slideshow/source/inc/slide.hxx
index c269b9f4164d..8f7c6bb33725 100644
--- a/slideshow/source/inc/slide.hxx
+++ b/slideshow/source/inc/slide.hxx
@@ -20,8 +20,6 @@
 #ifndef INCLUDED_SLIDESHOW_SOURCE_INC_SLIDE_HXX
 #define INCLUDED_SLIDESHOW_SOURCE_INC_SLIDE_HXX
 
-#include "shapemanager.hxx"
-#include "subsettableshapemanager.hxx"
 #include "unoviewcontainer.hxx"
 #include "slidebitmap.hxx"
 #include "shapemaps.hxx"
diff --git a/slideshow/source/inc/smilfunctionparser.hxx b/slideshow/source/inc/smilfunctionparser.hxx
index 59e9157d1a4c..4842e39a9b7b 100644
--- a/slideshow/source/inc/smilfunctionparser.hxx
+++ b/slideshow/source/inc/smilfunctionparser.hxx
@@ -21,10 +21,11 @@
 #define INCLUDED_SLIDESHOW_SOURCE_INC_SMILFUNCTIONPARSER_HXX
 
 #include "expressionnode.hxx"
-#include "slideshowexceptions.hxx"
 
 #include <basegfx/range/b2drectangle.hxx>
 
+#include <memory>
+
 
 /* Definition of SmilFunctionParser class */
 
diff --git a/slideshow/source/inc/soundplayer.hxx b/slideshow/source/inc/soundplayer.hxx
index 82bc223ef819..e571a694a2af 100644
--- a/slideshow/source/inc/soundplayer.hxx
+++ b/slideshow/source/inc/soundplayer.hxx
@@ -23,7 +23,6 @@
 #include <rtl/ustring.hxx>
 
 #include <com/sun/star/uno/XComponentContext.hpp>
-#include <com/sun/star/media/XManager.hpp>
 #include <com/sun/star/media/XPlayer.hpp>
 #include <avmedia/mediaitem.hxx>
 
diff --git a/slideshow/source/inc/tools.hxx b/slideshow/source/inc/tools.hxx
index 308d25c8efc2..39ee1f8b83e7 100644
--- a/slideshow/source/inc/tools.hxx
+++ b/slideshow/source/inc/tools.hxx
@@ -29,7 +29,6 @@
 #include <comphelper/random.hxx>
 #include <osl/diagnose.h>
 #include <sal/log.hxx>
-#include <vector>
 
 #include <cppcanvas/color.hxx>
 
@@ -39,9 +38,6 @@
 #include "hslcolor.hxx"
 
 #include <memory>
-#include <cstdlib>
-#include <string.h>
-#include <algorithm>
 
 namespace com { namespace sun { namespace star { namespace beans {
     struct NamedValue;
diff --git a/slideshow/source/inc/transitionfactory.hxx b/slideshow/source/inc/transitionfactory.hxx
index a2e50aa2b206..f863bca3b46b 100644
--- a/slideshow/source/inc/transitionfactory.hxx
+++ b/slideshow/source/inc/transitionfactory.hxx
@@ -23,15 +23,14 @@
 #include <com/sun/star/animations/XTransitionFilter.hpp>
 #include <com/sun/star/presentation/XTransitionFactory.hpp>
 
-#include "animatableshape.hxx"
 #include "rgbcolor.hxx"
 #include "slide.hxx"
 #include "screenupdater.hxx"
 #include "animationactivity.hxx"
 #include "activitiesfactory.hxx"
 #include "numberanimation.hxx"
-#include "transitioninfo.hxx"
 #include "soundplayer.hxx"
+#include "shapemanager.hxx"
 
 namespace slideshow
 {
diff --git a/slideshow/source/inc/unoviewcontainer.hxx b/slideshow/source/inc/unoviewcontainer.hxx
index cae48c11bd1f..159fd0707dfa 100644
--- a/slideshow/source/inc/unoviewcontainer.hxx
+++ b/slideshow/source/inc/unoviewcontainer.hxx
@@ -22,9 +22,6 @@
 
 #include <com/sun/star/uno/Reference.hxx>
 
-#include <vector>
-#include <memory>
-
 #include "unoview.hxx"
 
 
diff --git a/slideshow/source/inc/viewupdate.hxx b/slideshow/source/inc/viewupdate.hxx
index 8c2e512ba3d9..f083347ce415 100644
--- a/slideshow/source/inc/viewupdate.hxx
+++ b/slideshow/source/inc/viewupdate.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_SLIDESHOW_SOURCE_INC_VIEWUPDATE_HXX
 
 #include "disposable.hxx"
-#include "view.hxx"
 #include <memory>
 
 /* Definition of ViewUpdate interface */
diff --git a/slideshow/test/slidetest.cxx b/slideshow/test/slidetest.cxx
index 7b3691a96ec2..e47d4a749dbf 100644
--- a/slideshow/test/slidetest.cxx
+++ b/slideshow/test/slidetest.cxx
@@ -23,14 +23,8 @@
 #include <cppunit/extensions/HelperMacros.h>
 #include <cppunit/plugin/TestPlugIn.h>
 
-#include <basegfx/matrix/b2dhommatrix.hxx>
-#include <basegfx/range/b2drectangle.hxx>
-#include <cppcanvas/spritecanvas.hxx>
-
-#include <view.hxx>
 #include <unoview.hxx>
 #include <unoviewcontainer.hxx>
-#include <shape.hxx>
 #include "tests.hxx"
 #include <../engine/slide/layermanager.hxx>
 #include <../engine/slide/layer.hxx>
diff --git a/slideshow/test/testshape.cxx b/slideshow/test/testshape.cxx
index f00ae08cbb59..db7031070ba8 100644
--- a/slideshow/test/testshape.cxx
+++ b/slideshow/test/testshape.cxx
@@ -19,17 +19,13 @@
 
 #include <sal/types.h>
 #include <cppunit/TestAssert.h>
-#include <cppunit/TestFixture.h>
-#include <cppunit/extensions/HelperMacros.h>
 
 #include <cppuhelper/compbase.hxx>
 #include <cppuhelper/basemutex.hxx>
 #include <comphelper/make_shared_from_uno.hxx>
 
-#include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/range/b2drange.hxx>
 
-#include <shape.hxx>
 #include "tests.hxx"
 
 namespace target = slideshow::internal;
diff --git a/slideshow/test/testview.cxx b/slideshow/test/testview.cxx
index 99a385681e17..c4884516d490 100644
--- a/slideshow/test/testview.cxx
+++ b/slideshow/test/testview.cxx
@@ -18,9 +18,6 @@
  */
 
 #include <sal/types.h>
-#include <cppunit/TestAssert.h>
-#include <cppunit/TestFixture.h>
-#include <cppunit/extensions/HelperMacros.h>
 
 #include <cppuhelper/compbase.hxx>
 #include <cppuhelper/basemutex.hxx>
@@ -28,13 +25,10 @@
 
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/range/b1drange.hxx>
-#include <basegfx/range/b2drectangle.hxx>
 #include <basegfx/polygon/b2dpolypolygon.hxx>
-#include <cppcanvas/spritecanvas.hxx>
 
 #include "tests.hxx"
 #include <view.hxx>
-#include <unoview.hxx>
 #include <com/sun/star/presentation/XSlideShowView.hpp>
 
 #include <vector>
diff --git a/slideshow/test/views.cxx b/slideshow/test/views.cxx
index 39345661d14f..be8d6ecb0c82 100644
--- a/slideshow/test/views.cxx
+++ b/slideshow/test/views.cxx
@@ -22,14 +22,8 @@
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
 
-#include <basegfx/matrix/b2dhommatrix.hxx>
-#include <basegfx/range/b2drectangle.hxx>
-#include <cppcanvas/spritecanvas.hxx>
-
-#include <view.hxx>
 #include <unoview.hxx>
 #include <unoviewcontainer.hxx>
-#include <shape.hxx>
 #include "tests.hxx"
 
 namespace target = slideshow::internal;
-- 
cgit