From d261d883b2149b37bdee739ee92bbea11b1fb7a1 Mon Sep 17 00:00:00 2001
From: Gabor Kelemen <kelemen.gabor2@nisz.hu>
Date: Thu, 21 Feb 2019 07:30:53 +0100
Subject: tdf#42949 Fix IWYU warnings in sd/source/filter/*/*cxx

Also a few hxx files had missing headers and obsolete fw decls

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

Change-Id: I9a35c566d30678af445da3fec9570af235afb353
Reviewed-on: https://gerrit.libreoffice.org/68131
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
---
 include/filter/msfilter/svdfppt.hxx         |  1 +
 sd/IwyuFilter_sd.yaml                       | 19 ++++++++++++
 sd/inc/animations.hxx                       |  4 +++
 sd/source/filter/cgm/sdcgmfilter.cxx        |  3 --
 sd/source/filter/eppt/eppt.cxx              | 16 +---------
 sd/source/filter/eppt/epptooxml.hxx         | 11 +------
 sd/source/filter/eppt/epptso.cxx            | 46 +++++----------------------
 sd/source/filter/eppt/pptexanimations.cxx   |  8 ++---
 sd/source/filter/eppt/pptx-animations.cxx   |  4 ---
 sd/source/filter/eppt/pptx-epptbase.cxx     | 37 +++-------------------
 sd/source/filter/eppt/pptx-epptooxml.cxx    | 14 ---------
 sd/source/filter/eppt/pptx-text.cxx         |  4 +--
 sd/source/filter/grf/sdgrffilter.cxx        | 23 --------------
 sd/source/filter/html/HtmlOptionsDialog.cxx |  9 ------
 sd/source/filter/html/htmlattr.cxx          |  1 -
 sd/source/filter/html/htmlex.cxx            | 17 ----------
 sd/source/filter/html/pubdlg.cxx            | 12 ++------
 sd/source/filter/html/sdhtmlfilter.cxx      | 13 --------
 sd/source/filter/pdf/sdpdffilter.cxx        | 48 -----------------------------
 sd/source/filter/ppt/ppt97animations.cxx    |  3 --
 sd/source/filter/ppt/pptin.cxx              | 24 ++-------------
 sd/source/filter/ppt/pptinanimations.cxx    |  6 ----
 sd/source/filter/ppt/pptinanimations.hxx    |  5 ++-
 sd/source/filter/sdfilter.cxx               |  8 ++---
 sd/source/filter/sdpptwrp.cxx               |  7 +----
 sd/source/filter/xml/sdtransform.cxx        |  3 --
 sd/source/filter/xml/sdxmlwrp.cxx           |  9 ------
 27 files changed, 53 insertions(+), 302 deletions(-)

diff --git a/include/filter/msfilter/svdfppt.hxx b/include/filter/msfilter/svdfppt.hxx
index 59fa807c35ff..78fbeecee368 100644
--- a/include/filter/msfilter/svdfppt.hxx
+++ b/include/filter/msfilter/svdfppt.hxx
@@ -34,6 +34,7 @@
 #include <filter/msfilter/msfilterdllapi.h>
 #include <filter/msfilter/msocximex.hxx>
 #include <o3tl/enumarray.hxx>
+#include <rtl/ref.hxx>
 #include <rtl/textenc.h>
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
diff --git a/sd/IwyuFilter_sd.yaml b/sd/IwyuFilter_sd.yaml
index 5a3bd62b3d8c..ee20735d14da 100644
--- a/sd/IwyuFilter_sd.yaml
+++ b/sd/IwyuFilter_sd.yaml
@@ -381,3 +381,22 @@ blacklist:
     sd/source/core/text/textapi.cxx:
     # Needed for macro defines
     - editeng/unoprnms.hxx
+    sd/source/filter/eppt/epptso.cxx:
+    # Needed for direct member access
+    - com/sun/star/table/XTable.hpp
+    sd/source/filter/eppt/pptx-epptooxml.cxx:
+    # Needed for direct member access
+    - com/sun/star/task/XStatusIndicator.hpp
+    - com/sun/star/frame/XModel.hpp
+    sd/source/filter/eppt/pptx-text.cxx:
+    # Needed for direct member access
+    - com/sun/star/awt/XBitmap.hpp
+    - com/sun/star/beans/XPropertyState.hpp
+    - com/sun/star/style/TabStop.hpp
+    - com/sun/star/graphic/XGraphic.hpp
+    sd/source/filter/xml/sdxmlwrp.cxx:
+    # Needed for implicit dtor
+    - editeng/outlobj.hxx
+    sd/source/filter/xml/sdtransform.cxx:
+    # Needed for implicit dtor
+    - editeng/outlobj.hxx
diff --git a/sd/inc/animations.hxx b/sd/inc/animations.hxx
index 9d9505c5f0e0..f5f8abf95917 100644
--- a/sd/inc/animations.hxx
+++ b/sd/inc/animations.hxx
@@ -22,6 +22,10 @@
 
 #include "sddllapi.h"
 
+#include <com/sun/star/uno/Reference.hxx>
+
+namespace com::sun::star::animations { class XAnimationNode; }
+
 namespace sd
 {
 
diff --git a/sd/source/filter/cgm/sdcgmfilter.cxx b/sd/source/filter/cgm/sdcgmfilter.cxx
index c8841c42fdb5..80b11519d45a 100644
--- a/sd/source/filter/cgm/sdcgmfilter.cxx
+++ b/sd/source/filter/cgm/sdcgmfilter.cxx
@@ -18,12 +18,9 @@
  */
 
 #include <memory>
-#include <osl/module.hxx>
 #include <tools/urlobj.hxx>
 #include <unotools/ucbstreamhelper.hxx>
-#include <svl/itemset.hxx>
 #include <sfx2/docfile.hxx>
-#include <sfx2/docfilt.hxx>
 #include <svx/xflclit.hxx>
 #include <svx/xfillit0.hxx>
 
diff --git a/sd/source/filter/eppt/eppt.cxx b/sd/source/filter/eppt/eppt.cxx
index a953c2bc8910..7a378baa3bbf 100644
--- a/sd/source/filter/eppt/eppt.cxx
+++ b/sd/source/filter/eppt/eppt.cxx
@@ -22,21 +22,11 @@
 #include "pptexanimations.hxx"
 #include <o3tl/any.hxx>
 #include <tools/globname.hxx>
-#include <tools/poly.hxx>
-#include <vcl/graph.hxx>
-#include <vcl/bitmapaccess.hxx>
-#include <vcl/gradient.hxx>
 #include <rtl/ustring.hxx>
 #include <tools/stream.hxx>
-#include <vcl/fltcall.hxx>
-#include <sfx2/docfile.hxx>
 #include <svx/unoapi.hxx>
 #include <svx/svdobj.hxx>
 #include <svx/svdoole2.hxx>
-#include <svx/svdmodel.hxx>
-#include <svx/svdpage.hxx>
-#include <com/sun/star/view/PaperOrientation.hpp>
-#include <com/sun/star/view/PaperFormat.hpp>
 #include <com/sun/star/container/XIndexContainer.hpp>
 #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
 #include <com/sun/star/office/XAnnotation.hpp>
@@ -49,12 +39,8 @@
 #include <com/sun/star/util/DateTime.hpp>
 #include <com/sun/star/task/XStatusIndicator.hpp>
 #include <tools/zcodec.hxx>
-#include <editeng/svxenum.hxx>
-#include <sot/storinfo.hxx>
 #include <filter/msfilter/classids.hxx>
 #include <filter/msfilter/msoleexp.hxx>
-#include <vcl/virdev.hxx>
-#include <vcl/wmf.hxx>
 #include <filter/msfilter/msdffimp.hxx>
 #include <filter/msfilter/svxmsbas.hxx>
 #include <editeng/flditem.hxx>
@@ -64,7 +50,7 @@
 #include <rtl/math.hxx>
 #include <memory>
 
-#include <sfx2/objsh.hxx>
+class SfxObjectShell;
     // complete SfxObjectShell for SaveVBA under -fsanitize=function
 
 using namespace com::sun::star;
diff --git a/sd/source/filter/eppt/epptooxml.hxx b/sd/source/filter/eppt/epptooxml.hxx
index 52289a48b11f..5d6be2286af9 100644
--- a/sd/source/filter/eppt/epptooxml.hxx
+++ b/sd/source/filter/eppt/epptooxml.hxx
@@ -27,17 +27,8 @@
 
 using ::sax_fastparser::FSHelperPtr;
 
-namespace com { namespace sun { namespace star {
-    namespace animations {
-        class XAnimate;
-        class XAnimationNode;
-    }
-}}}
-
 namespace oox {
-    namespace drawingml {
-        class ShapeExport;
-    }
+
 namespace core {
 
 struct LayoutInfo
diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx
index 17692924be74..7d6ee3090263 100644
--- a/sd/source/filter/eppt/epptso.cxx
+++ b/sd/source/filter/eppt/epptso.cxx
@@ -20,68 +20,38 @@
 #include <memory>
 #include <sal/config.h>
 
-#include <cstdlib>
-
 #include <basegfx/numeric/ftools.hxx>
 #include <o3tl/any.hxx>
-#include <osl/endian.h>
 #include "eppt.hxx"
 #include "text.hxx"
 #include "epptdef.hxx"
 #include "escherex.hxx"
 #include <tools/poly.hxx>
-#include <vcl/bitmapaccess.hxx>
-#include <vcl/gradient.hxx>
-#include <vcl/gfxlink.hxx>
 #include <tools/stream.hxx>
+#include <tools/fontenum.hxx>
 #include <sot/storage.hxx>
-#include <vcl/outdev.hxx>
-#include <vcl/virdev.hxx>
 #include <vcl/graph.hxx>
-#include <sfx2/app.hxx>
-#include <svl/languageoptions.hxx>
 #include <editeng/svxenum.hxx>
+#include <svx/svdobj.hxx>
 #include <svx/unoapi.hxx>
-#include <svx/svdoashp.hxx>
-#include <com/sun/star/style/VerticalAlignment.hpp>
-#include <com/sun/star/container/XIndexReplace.hpp>
-#include <com/sun/star/awt/XFont.hpp>
-#include <com/sun/star/awt/FontWeight.hpp>
-#include <com/sun/star/awt/FontUnderline.hpp>
 #include <com/sun/star/awt/FontFamily.hpp>
 #include <com/sun/star/awt/FontPitch.hpp>
-#include <com/sun/star/style/ParagraphAdjust.hpp>
-#include <com/sun/star/style/LineSpacing.hpp>
-#include <com/sun/star/style/LineSpacingMode.hpp>
-#include <com/sun/star/style/XStyleFamiliesSupplier.hpp>
-#include <com/sun/star/style/XStyle.hpp>
+#include <com/sun/star/awt/Rectangle.hpp>
+#include <com/sun/star/awt/FontDescriptor.hpp>
 #include <com/sun/star/style/TabStop.hpp>
 #include <com/sun/star/drawing/CircleKind.hpp>
-#include <com/sun/star/drawing/PointSequence.hpp>
-#include <com/sun/star/drawing/FlagSequence.hpp>
-#include <com/sun/star/drawing/PolygonFlags.hpp>
-#include <com/sun/star/drawing/XMasterPagesSupplier.hpp>
-#include <com/sun/star/beans/PropertyValue.hpp>
+#include <com/sun/star/drawing/FillStyle.hpp>
 #include <com/sun/star/beans/XPropertyState.hpp>
 #include <com/sun/star/drawing/XControlShape.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/i18n/XBreakIterator.hpp>
-#include <com/sun/star/i18n/XScriptTypeDetector.hpp>
-#include <com/sun/star/i18n/ScriptType.hpp>
-#include <com/sun/star/i18n/ScriptDirection.hpp>
 #include <com/sun/star/embed/Aspects.hpp>
-#include <vcl/cvtgrf.hxx>
 #include <tools/urlobj.hxx>
-#include <rtl/crc.h>
-#include <comphelper/classids.hxx>
-#include <com/sun/star/text/FontRelief.hpp>
 #include <com/sun/star/text/XSimpleText.hpp>
-#include <editeng/frmdiritem.hxx>
-#include <vcl/fltcall.hxx>
+#include <com/sun/star/task/XStatusIndicator.hpp>
 #include <com/sun/star/table/XTable.hpp>
 #include <com/sun/star/table/XMergeableCell.hpp>
 #include <com/sun/star/table/BorderLine.hpp>
-#include <set>
+#include <com/sun/star/table/XColumnRowRange.hpp>
+#include <com/sun/star/table/XCellRange.hpp>
 #include <oox/ole/olehelper.hxx>
 #include <i18nlangtag/languagetag.hxx>
 
diff --git a/sd/source/filter/eppt/pptexanimations.cxx b/sd/source/filter/eppt/pptexanimations.cxx
index bf9c12891a39..cf2ed32f21f2 100644
--- a/sd/source/filter/eppt/pptexanimations.cxx
+++ b/sd/source/filter/eppt/pptexanimations.cxx
@@ -49,18 +49,14 @@
 #include <com/sun/star/text/XSimpleText.hpp>
 #include <com/sun/star/animations/XIterateContainer.hpp>
 #include <com/sun/star/presentation/TextAnimationType.hpp>
-#include <rtl/ustrbuf.hxx>
 
-#include <vcl/vclenum.hxx>
 #include <oox/ppt/pptfilterhelpers.hxx>
-#include <svx/svdotext.hxx>
-#include <editeng/outlobj.hxx>
-#include <editeng/editobj.hxx>
 #include "pptexanimations.hxx"
 #include "pptexsoundcollection.hxx"
 #include "../ppt/pptanimations.hxx"
 #include <filter/msfilter/escherex.hxx>
-#include <osl/endian.h>
+#include <osl/diagnose.h>
+#include <tools/debug.hxx>
 
 #include <algorithm>
 
diff --git a/sd/source/filter/eppt/pptx-animations.cxx b/sd/source/filter/eppt/pptx-animations.cxx
index 65125b98e2e3..23a2ba7c2378 100644
--- a/sd/source/filter/eppt/pptx-animations.cxx
+++ b/sd/source/filter/eppt/pptx-animations.cxx
@@ -18,11 +18,9 @@
  */
 
 #include <o3tl/any.hxx>
-#include <oox/token/namespaces.hxx>
 #include <oox/token/tokens.hxx>
 #include "epptooxml.hxx"
 #include <sax/fshelper.hxx>
-#include <rtl/ustrbuf.hxx>
 #include <sal/log.hxx>
 
 #include <com/sun/star/animations/AnimationAdditiveMode.hpp>
@@ -46,7 +44,6 @@
 #include <com/sun/star/animations/XTransitionFilter.hpp>
 #include <com/sun/star/animations/XIterateContainer.hpp>
 #include <com/sun/star/container/XEnumerationAccess.hpp>
-#include <com/sun/star/presentation/AnimationSpeed.hpp>
 #include <com/sun/star/presentation/EffectCommands.hpp>
 #include <com/sun/star/presentation/EffectNodeType.hpp>
 #include <com/sun/star/presentation/EffectPresetClass.hpp>
@@ -54,7 +51,6 @@
 #include <com/sun/star/presentation/TextAnimationType.hpp>
 #include <com/sun/star/text/XSimpleText.hpp>
 #include <com/sun/star/drawing/XShape.hpp>
-#include <com/sun/star/drawing/XDrawPage.hpp>
 #include <oox/export/utils.hxx>
 #include <oox/ppt/pptfilterhelpers.hxx>
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
diff --git a/sd/source/filter/eppt/pptx-epptbase.cxx b/sd/source/filter/eppt/pptx-epptbase.cxx
index e63c90884e7e..da99752ae3d5 100644
--- a/sd/source/filter/eppt/pptx-epptbase.cxx
+++ b/sd/source/filter/eppt/pptx-epptbase.cxx
@@ -17,44 +17,21 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "eppt.hxx"
+#include "epptbase.hxx"
 #include "epptdef.hxx"
-#include "pptexanimations.hxx"
 #include "../ppt/pptanimations.hxx"
 
 #include <o3tl/any.hxx>
-#include <tools/globname.hxx>
-#include <tools/datetime.hxx>
-#include <tools/poly.hxx>
-#include <tools/stream.hxx>
-#include <vcl/graph.hxx>
-#include <vcl/bitmapaccess.hxx>
-#include <vcl/gradient.hxx>
-#include <vcl/virdev.hxx>
+#include <vcl/outdev.hxx>
 #include <rtl/ustring.hxx>
 #include <rtl/strbuf.hxx>
 #include <sal/log.hxx>
-#include <vcl/fltcall.hxx>
-#include <vcl/wmf.hxx>
-#include <sfx2/docfile.hxx>
-#include <sfx2/docinf.hxx>
-#include <svx/unoapi.hxx>
-#include <svx/svdobj.hxx>
-#include <svx/svdoole2.hxx>
-#include <svx/svdmodel.hxx>
-#include <svx/svdpage.hxx>
-#include <com/sun/star/view/PaperOrientation.hpp>
-#include <com/sun/star/view/PaperFormat.hpp>
-#include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
+#include <com/sun/star/awt/Rectangle.hpp>
+#include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/drawing/XMasterPageTarget.hpp>
 #include <com/sun/star/drawing/XMasterPagesSupplier.hpp>
 #include <com/sun/star/drawing/XDrawPagesSupplier.hpp>
 #include <com/sun/star/drawing/XDrawPages.hpp>
-#include <com/sun/star/office/XAnnotation.hpp>
-#include <com/sun/star/office/XAnnotationAccess.hpp>
-#include <com/sun/star/office/XAnnotationEnumeration.hpp>
-#include <com/sun/star/geometry/RealPoint2D.hpp>
-#include <com/sun/star/util/DateTime.hpp>
 #include <com/sun/star/animations/TransitionType.hpp>
 #include <com/sun/star/animations/TransitionSubType.hpp>
 #include <com/sun/star/awt/FontFamily.hpp>
@@ -66,12 +43,6 @@
 #include <com/sun/star/style/XStyle.hpp>
 #include <com/sun/star/style/XStyleFamiliesSupplier.hpp>
 #include <com/sun/star/task/XStatusIndicator.hpp>
-#include <editeng/svxenum.hxx>
-#include <editeng/flditem.hxx>
-#include <sot/storinfo.hxx>
-#include <filter/msfilter/msoleexp.hxx>
-#include <filter/msfilter/msdffimp.hxx>
-#include <filter/msfilter/svxmsbas.hxx>
 
 
 using namespace com::sun::star;
diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx b/sd/source/filter/eppt/pptx-epptooxml.cxx
index ee6fb0b81569..cdec562c51ba 100644
--- a/sd/source/filter/eppt/pptx-epptooxml.cxx
+++ b/sd/source/filter/eppt/pptx-epptooxml.cxx
@@ -18,33 +18,23 @@
  */
 
 #include <stdio.h>
-#include <o3tl/any.hxx>
-#include <oox/drawingml/chart/chartconverter.hxx>
 #include <oox/drawingml/clrscheme.hxx>
 #include <oox/token/namespaces.hxx>
 #include <oox/token/tokens.hxx>
 #include <oox/token/relationship.hxx>
 #include <oox/ole/vbaproject.hxx>
 #include "epptooxml.hxx"
-#include "epptdef.hxx"
 #include <oox/export/shapes.hxx>
 
 #include <comphelper/sequenceashashmap.hxx>
 #include <comphelper/storagehelper.hxx>
-#include <cppuhelper/implementationentry.hxx>
-#include <cppuhelper/factory.hxx>
 #include <sax/fshelper.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <sal/log.hxx>
-#include <filter/msfilter/escherex.hxx>
-#include <tools/poly.hxx>
 #include <com/sun/star/animations/TransitionType.hpp>
 #include <com/sun/star/animations/TransitionSubType.hpp>
-#include <com/sun/star/beans/Property.hpp>
 #include <com/sun/star/beans/XPropertySetInfo.hpp>
-#include <com/sun/star/container/XEnumerationAccess.hpp>
 #include <com/sun/star/drawing/FillStyle.hpp>
-#include <com/sun/star/drawing/RectanglePoint.hpp>
 #include <com/sun/star/drawing/XDrawPages.hpp>
 #include <com/sun/star/drawing/XDrawPagesSupplier.hpp>
 #include <com/sun/star/embed/ElementModes.hpp>
@@ -58,14 +48,10 @@
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 
 #include <oox/export/utils.hxx>
-#include <oox/ppt/pptfilterhelpers.hxx>
-#include <basegfx/polygon/b2dpolypolygontools.hxx>
 
-#include "pptexanimations.hxx"
 #include "pptx-animations.hxx"
 #include "../ppt/pptanimations.hxx"
 
-#include <com/sun/star/document/XDocumentProperties.hpp>
 #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
 #include <com/sun/star/document/XStorageBasedDocument.hpp>
 #include <utility>
diff --git a/sd/source/filter/eppt/pptx-text.cxx b/sd/source/filter/eppt/pptx-text.cxx
index e3fb70e4b6a1..3b858a6dc556 100644
--- a/sd/source/filter/eppt/pptx-text.cxx
+++ b/sd/source/filter/eppt/pptx-text.cxx
@@ -46,16 +46,14 @@
 #include <filter/msfilter/util.hxx>
 #include <i18nutil/scripttypedetector.hxx>
 #include <o3tl/any.hxx>
-#include <sfx2/app.hxx>
 #include <svl/languageoptions.hxx>
-#include <oox/export/drawingml.hxx>
 #include <osl/diagnose.h>
 #include <i18nlangtag/languagetag.hxx>
 
 #include <vcl/settings.hxx>
 #include <vcl/metric.hxx>
-#include <vcl/outdev.hxx>
 #include <vcl/virdev.hxx>
+#include <vcl/svapp.hxx>
 
 using namespace css;
 
diff --git a/sd/source/filter/grf/sdgrffilter.cxx b/sd/source/filter/grf/sdgrffilter.cxx
index b643f883ae16..7da570315bbb 100644
--- a/sd/source/filter/grf/sdgrffilter.cxx
+++ b/sd/source/filter/grf/sdgrffilter.cxx
@@ -18,37 +18,20 @@
  */
 
 #include <com/sun/star/drawing/GraphicExportFilter.hpp>
-#include <com/sun/star/graphic/GraphicProvider.hpp>
-#include <com/sun/star/graphic/XGraphicProvider.hpp>
-#include <com/sun/star/graphic/GraphicType.hpp>
-#include <com/sun/star/ucb/SimpleFileAccess.hpp>
-#include <com/sun/star/ucb/XSimpleFileAccess2.hpp>
 
-#include <unotools/localfilehelper.hxx>
 #include <vcl/errinf.hxx>
 #include <vcl/weld.hxx>
-#include <vcl/metaact.hxx>
-#include <vcl/virdev.hxx>
 #include <sfx2/sfxsids.hrc>
 #include <sfx2/docfile.hxx>
 #include <sfx2/docfilt.hxx>
-#include <sfx2/frame.hxx>
 #include <svx/svdograf.hxx>
-#include <svx/svdpagv.hxx>
 
 #include <strings.hrc>
 #include <DrawViewShell.hxx>
 #include <DrawDocShell.hxx>
-#include <ClientView.hxx>
-#include <FrameView.hxx>
-
-#include <cppuhelper/exc_hlp.hxx>
 
 #include <comphelper/processfactory.hxx>
-#include <unotools/pathoptions.hxx>
-#include <sfx2/filedlghelper.hxx>
 #include <vcl/graphicfilter.hxx>
-#include <svx/xoutbmp.hxx>
 
 #include <sdpage.hxx>
 #include <drawdoc.hxx>
@@ -57,15 +40,9 @@
 #include <ViewShellBase.hxx>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/beans/PropertyValues.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/lang/XComponent.hpp>
-#include <com/sun/star/document/XFilter.hpp>
-#include <com/sun/star/document/XExporter.hpp>
 #include <com/sun/star/view/XSelectionSupplier.hpp>
-#include <com/sun/star/drawing/XDrawView.hpp>
-#include <DrawController.hxx>
 #include <cppuhelper/implbase.hxx>
-#include <com/sun/star/drawing/XShape.hpp>
 #include <com/sun/star/task/XInteractionHandler.hpp>
 #include <com/sun/star/task/XInteractionRequest.hpp>
 #include <com/sun/star/drawing/GraphicFilterRequest.hpp>
diff --git a/sd/source/filter/html/HtmlOptionsDialog.cxx b/sd/source/filter/html/HtmlOptionsDialog.cxx
index 092554f0e58c..9135e4016732 100644
--- a/sd/source/filter/html/HtmlOptionsDialog.cxx
+++ b/sd/source/filter/html/HtmlOptionsDialog.cxx
@@ -17,11 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <osl/file.hxx>
-#include <osl/module.hxx>
-#include <com/sun/star/document/XViewDataSupplier.hpp>
-#include <com/sun/star/container/XIndexAccess.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/uno/Sequence.h>
 #include <com/sun/star/uno/Any.h>
@@ -34,18 +29,14 @@
 #include <cppuhelper/supportsservice.hxx>
 #include <vcl/svapp.hxx>
 
-#include <facreg.hxx>
-
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
 using namespace com::sun::star::document;
 using namespace com::sun::star::beans;
-using namespace com::sun::star::container;
 using namespace com::sun::star::ui::dialogs;
 
 #include <pres.hxx>
 #include <sdabstdlg.hxx>
-#include <memory>
 
 class SdHtmlOptionsDialog : public cppu::WeakImplHelper
 <
diff --git a/sd/source/filter/html/htmlattr.cxx b/sd/source/filter/html/htmlattr.cxx
index b40313b614ff..686a35666c12 100644
--- a/sd/source/filter/html/htmlattr.cxx
+++ b/sd/source/filter/html/htmlattr.cxx
@@ -18,7 +18,6 @@
  */
 
 #include "htmlattr.hxx"
-#include "htmlex.hxx"
 #include <sdresid.hxx>
 #include <strings.hrc>
 #include <vcl/decoview.hxx>
diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx
index 94d55a5e79b5..55b2c1820979 100644
--- a/sd/source/filter/html/htmlex.cxx
+++ b/sd/source/filter/html/htmlex.cxx
@@ -19,30 +19,20 @@
 
 #include "htmlex.hxx"
 #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
-#include <com/sun/star/document/XExporter.hpp>
-#include <com/sun/star/document/XFilter.hpp>
 #include <com/sun/star/drawing/GraphicExportFilter.hpp>
 #include <com/sun/star/ucb/SimpleFileAccess.hpp>
 
-#include <rtl/uri.hxx>
 #include <sal/log.hxx>
 #include <rtl/tencinfo.h>
 #include <comphelper/processfactory.hxx>
 #include <osl/file.hxx>
 #include <unotools/pathoptions.hxx>
-#include <vcl/FilterConfigItem.hxx>
 #include <unotools/ucbstreamhelper.hxx>
 #include <com/sun/star/frame/XStorable.hpp>
-#include <sfx2/app.hxx>
-#include <sfx2/dispatch.hxx>
-#include <sfx2/docfile.hxx>
-#include <sfx2/fcontnr.hxx>
 #include <sfx2/frmhtmlw.hxx>
 #include <sfx2/progress.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/weld.hxx>
-#include <vcl/wrkwin.hxx>
-#include <svl/aeitem.hxx>
 #include <svx/svditer.hxx>
 #include <vcl/imaprect.hxx>
 #include <vcl/imapcirc.hxx>
@@ -50,11 +40,8 @@
 #include <editeng/outlobj.hxx>
 #include <editeng/editobj.hxx>
 #include <svx/svdopath.hxx>
-#include <svx/xoutbmp.hxx>
 #include <svtools/htmlout.hxx>
-#include <vcl/cvtgrf.hxx>
 #include <svtools/colorcfg.hxx>
-#include <vcl/graphicfilter.hxx>
 #include <editeng/colritem.hxx>
 #include <editeng/editeng.hxx>
 #include <editeng/wghtitem.hxx>
@@ -68,10 +55,7 @@
 #include <svx/svdogrp.hxx>
 #include <svx/svdotable.hxx>
 #include <tools/urlobj.hxx>
-#include <vcl/bitmapaccess.hxx>
 #include <svtools/sfxecode.hxx>
-#include <com/sun/star/beans/PropertyState.hpp>
-#include <unotools/resmgr.hxx>
 #include <comphelper/anytostring.hxx>
 #include <cppuhelper/exc_hlp.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
@@ -82,7 +66,6 @@
 #include "htmlpublishmode.hxx"
 #include <Outliner.hxx>
 #include <sdpage.hxx>
-#include <sdattr.hxx>
 #include <strings.hrc>
 #include <strings.hxx>
 #include <anminfo.hxx>
diff --git a/sd/source/filter/html/pubdlg.cxx b/sd/source/filter/html/pubdlg.cxx
index 4ceea567d0af..3cbc42135894 100644
--- a/sd/source/filter/html/pubdlg.cxx
+++ b/sd/source/filter/html/pubdlg.cxx
@@ -24,28 +24,20 @@
 #include <vcl/FilterConfigItem.hxx>
 #include <vcl/button.hxx>
 #include <vcl/fixed.hxx>
-#include <svtools/svmedit.hxx>
-#include <svl/intitem.hxx>
-#include <svl/aeitem.hxx>
-#include <svl/itemset.hxx>
-#include <svl/stritem.hxx>
+#include <vcl/vclmedit.hxx>
 #include <vcl/weld.hxx>
 #include <svtools/valueset.hxx>
-#include <vcl/graph.hxx>
-#include <svl/eitem.hxx>
 #include <svtools/colrdlg.hxx>
-#include <editeng/colritem.hxx>
+#include <tools/debug.hxx>
 #include <tools/urlobj.hxx>
 #include <sdiocmpt.hxx>
 #include <sfx2/docfile.hxx>
-#include <sfx2/app.hxx>
 #include <pres.hxx>
 #include <unotools/useroptions.hxx>
 #include <unotools/pathoptions.hxx>
 
 #include <sdresid.hxx>
 #include <strings.hrc>
-#include <sdattr.hxx>
 #include <pubdlg.hxx>
 #include "htmlattr.hxx"
 #include "htmlex.hxx"
diff --git a/sd/source/filter/html/sdhtmlfilter.cxx b/sd/source/filter/html/sdhtmlfilter.cxx
index 670980d45ce0..a722d1c53d53 100644
--- a/sd/source/filter/html/sdhtmlfilter.cxx
+++ b/sd/source/filter/html/sdhtmlfilter.cxx
@@ -17,23 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <unotools/localfilehelper.hxx>
-#include <vcl/errinf.hxx>
-#include <vcl/metaact.hxx>
-#include <vcl/virdev.hxx>
-#include <vcl/FilterConfigItem.hxx>
 #include <sfx2/docfile.hxx>
-#include <sfx2/docfilt.hxx>
 #include <sfx2/frame.hxx>
 #include <sfx2/sfxsids.hrc>
-#include <svx/svdograf.hxx>
-#include <svx/svdpagv.hxx>
-#include <svx/xoutbmp.hxx>
-#include <osl/file.hxx>
 
-#include <sdpage.hxx>
-#include <drawdoc.hxx>
-#include <sdattr.hxx>
 #include "htmlex.hxx"
 #include <sdhtmlfilter.hxx>
 
diff --git a/sd/source/filter/pdf/sdpdffilter.cxx b/sd/source/filter/pdf/sdpdffilter.cxx
index db7af07b58ce..8474410f0b15 100644
--- a/sd/source/filter/pdf/sdpdffilter.cxx
+++ b/sd/source/filter/pdf/sdpdffilter.cxx
@@ -17,59 +17,12 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <com/sun/star/drawing/GraphicExportFilter.hpp>
-#include <com/sun/star/graphic/GraphicProvider.hpp>
-#include <com/sun/star/graphic/XGraphicProvider.hpp>
-#include <com/sun/star/graphic/GraphicType.hpp>
-#include <com/sun/star/ucb/SimpleFileAccess.hpp>
-#include <com/sun/star/ucb/XSimpleFileAccess2.hpp>
-
-#include <unotools/localfilehelper.hxx>
-#include <vcl/errinf.hxx>
-#include <vcl/weld.hxx>
-#include <vcl/metaact.hxx>
-#include <vcl/virdev.hxx>
-#include <sfx2/sfxsids.hrc>
 #include <sfx2/docfile.hxx>
-#include <sfx2/docfilt.hxx>
-#include <sfx2/frame.hxx>
 #include <svx/svdograf.hxx>
-#include <svx/svdpagv.hxx>
-
-#include <strings.hrc>
-#include <DrawViewShell.hxx>
-#include <DrawDocShell.hxx>
-#include <ClientView.hxx>
-#include <FrameView.hxx>
-
-#include <comphelper/anytostring.hxx>
-#include <cppuhelper/exc_hlp.hxx>
-
-#include <comphelper/processfactory.hxx>
-#include <unotools/pathoptions.hxx>
-#include <sfx2/filedlghelper.hxx>
-#include <vcl/graphicfilter.hxx>
-#include <svx/xoutbmp.hxx>
 
 #include <sdpage.hxx>
 #include <drawdoc.hxx>
-#include <sdresid.hxx>
 #include <sdpdffilter.hxx>
-#include <ViewShellBase.hxx>
-#include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/beans/PropertyValues.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/lang/XComponent.hpp>
-#include <com/sun/star/document/XFilter.hpp>
-#include <com/sun/star/document/XExporter.hpp>
-#include <com/sun/star/view/XSelectionSupplier.hpp>
-#include <com/sun/star/drawing/XDrawView.hpp>
-#include <DrawController.hxx>
-#include <cppuhelper/implbase.hxx>
-#include <com/sun/star/drawing/XShape.hpp>
-#include <com/sun/star/task/XInteractionHandler.hpp>
-#include <com/sun/star/task/XInteractionRequest.hpp>
-#include <com/sun/star/drawing/GraphicFilterRequest.hpp>
 
 #include <vcl/bitmap.hxx>
 #include <vcl/graph.hxx>
@@ -82,7 +35,6 @@ using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::graphic;
 using namespace ::com::sun::star::io;
 using namespace ::com::sun::star::ucb;
-using namespace com::sun::star::ui::dialogs;
 using namespace ::sfx2;
 
 SdPdfFilter::SdPdfFilter(SfxMedium& rMedium, ::sd::DrawDocShell& rDocShell)
diff --git a/sd/source/filter/ppt/ppt97animations.cxx b/sd/source/filter/ppt/ppt97animations.cxx
index 6b65319ba2f3..c2ec7c1bb4b6 100644
--- a/sd/source/filter/ppt/ppt97animations.cxx
+++ b/sd/source/filter/ppt/ppt97animations.cxx
@@ -21,13 +21,10 @@
 
 #include <svx/svdobj.hxx>
 #include <sdpage.hxx>
-#include <tools/debug.hxx>
 #include <tools/stream.hxx>
 #include <svx/unoapi.hxx>
 #include <sal/log.hxx>
-#include <EffectMigration.hxx>
 #include <CustomAnimationPreset.hxx>
-#include <com/sun/star/drawing/XShape.hpp>
 #include <com/sun/star/presentation/TextAnimationType.hpp>
 #include <com/sun/star/presentation/EffectNodeType.hpp>
 #include <com/sun/star/presentation/ShapeAnimationSubType.hpp>
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx
index 161137e2d143..957f052925c7 100644
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -17,42 +17,27 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <editeng/numitem.hxx>
 #include <osl/file.hxx>
 #include <sal/log.hxx>
 #include <unotools/configmgr.hxx>
 #include <unotools/ucbstreamhelper.hxx>
-#include <vcl/wrkwin.hxx>
 #include <svl/urihelper.hxx>
 #include <svx/svxids.hrc>
 #include <filter/msfilter/svdfppt.hxx>
 #include <svx/svditer.hxx>
 #include <sfx2/docfile.hxx>
-#include <sfx2/app.hxx>
 #include <svx/svdograf.hxx>
 #include <svx/svdlayer.hxx>
 #include <svl/style.hxx>
-#include <svx/xflclit.hxx>
 #include <editeng/eeitem.hxx>
-#include <editeng/colritem.hxx>
-#include <svl/whiter.hxx>
-#include <svx/xgrad.hxx>
-#include <svx/xflgrit.hxx>
-#include <svx/xbtmpit.hxx>
-#include <svx/xlnclit.hxx>
-#include <editeng/adjustitem.hxx>
 #include <editeng/editeng.hxx>
-#include <editeng/bulletitem.hxx>
-#include <editeng/lrspitem.hxx>
-#include <editeng/lspcitem.hxx>
-#include <editeng/tstpitem.hxx>
+#include <svx/svdoutl.hxx>
 
 #include <sfx2/docinf.hxx>
 
 #include <strings.hrc>
 #include <strings.hxx>
 #include "pptin.hxx"
-#include <Outliner.hxx>
 #include <drawdoc.hxx>
 #include <sdpage.hxx>
 #include <sdresid.hxx>
@@ -61,8 +46,6 @@
 #include <anminfo.hxx>
 #include <svx/gallery.hxx>
 #include <tools/urlobj.hxx>
-#include <svl/itempool.hxx>
-#include <editeng/fhgtitem.hxx>
 #include <svx/svdopage.hxx>
 #include <svx/svdomedia.hxx>
 #include <svx/svdogrp.hxx>
@@ -75,17 +58,15 @@
 
 #include <DrawDocShell.hxx>
 #include <FrameView.hxx>
-#include <optsitem.hxx>
 #include <unokywds.hxx>
 
 #include <unotools/fltrcfg.hxx>
 #include <sfx2/progress.hxx>
 #include <editeng/editstat.hxx>
 #include <unotools/pathoptions.hxx>
-#include <sfx2/docfac.hxx>
+
 #define MAX_USER_MOVE       2
 
-#include <animations.hxx>
 #include "pptanimations.hxx"
 #include "pptinanimations.hxx"
 #include "ppt97animations.hxx"
@@ -98,7 +79,6 @@
 
 #include <comphelper/string.hxx>
 #include <oox/ole/olehelper.hxx>
-#include <oox/ppt/pptfilterhelpers.hxx>
 
 #include <boost/optional.hpp>
 
diff --git a/sd/source/filter/ppt/pptinanimations.cxx b/sd/source/filter/ppt/pptinanimations.cxx
index 6b7c253291fa..e4f0db29015d 100644
--- a/sd/source/filter/ppt/pptinanimations.cxx
+++ b/sd/source/filter/ppt/pptinanimations.cxx
@@ -46,11 +46,6 @@
 #include <com/sun/star/presentation/ShapeAnimationSubType.hpp>
 #include <com/sun/star/presentation/EffectCommands.hpp>
 #include <com/sun/star/beans/NamedValue.hpp>
-#include <com/sun/star/drawing/FillStyle.hpp>
-#include <com/sun/star/drawing/LineStyle.hpp>
-#include <com/sun/star/awt/FontWeight.hpp>
-#include <com/sun/star/awt/FontUnderline.hpp>
-#include <com/sun/star/awt/FontSlant.hpp>
 #include <com/sun/star/container/XEnumerationAccess.hpp>
 #include <com/sun/star/presentation/ParagraphTarget.hpp>
 #include <com/sun/star/presentation/TextAnimationType.hpp>
@@ -60,7 +55,6 @@
 #include <rtl/ustrbuf.hxx>
 #include <rtl/math.hxx>
 
-#include <vcl/vclenum.hxx>
 #include <svx/svdotext.hxx>
 #include <editeng/outlobj.hxx>
 #include <editeng/editobj.hxx>
diff --git a/sd/source/filter/ppt/pptinanimations.hxx b/sd/source/filter/ppt/pptinanimations.hxx
index beac67618acc..7964304c1abb 100644
--- a/sd/source/filter/ppt/pptinanimations.hxx
+++ b/sd/source/filter/ppt/pptinanimations.hxx
@@ -20,7 +20,10 @@
 #ifndef INCLUDED_SD_SOURCE_FILTER_PPT_PPTINANIMATIONS_HXX
 #define INCLUDED_SD_SOURCE_FILTER_PPT_PPTINANIMATIONS_HXX
 
-#include <oox/ppt/pptfilterhelpers.hxx>
+#include <com/sun/star/uno/Reference.hxx>
+
+#include <vector>
+#include <animations.hxx>
 
 #ifdef DBG_ANIM_LOG
 #include <stdio.h>
diff --git a/sd/source/filter/sdfilter.cxx b/sd/source/filter/sdfilter.cxx
index fbffe2cf5ed9..abed23b79780 100644
--- a/sd/source/filter/sdfilter.cxx
+++ b/sd/source/filter/sdfilter.cxx
@@ -17,21 +17,19 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <com/sun/star/task/XStatusIndicatorFactory.hpp>
-
 #include <memory>
+#include <map>
 
 #include <osl/module.hxx>
 #include <tools/svlibrary.h>
 #include <sfx2/docfile.hxx>
-#include <sfx2/viewfrm.hxx>
-#include <sfx2/progress.hxx>
+#include <sfx2/frame.hxx>
+#include <sfx2/sfxsids.hrc>
 #include <svl/itemset.hxx>
 
 #include <DrawDocShell.hxx>
 
 #include <pres.hxx>
-#include <drawdoc.hxx>
 #include <sdfilter.hxx>
 
 
diff --git a/sd/source/filter/sdpptwrp.cxx b/sd/source/filter/sdpptwrp.cxx
index feb9adaa15c9..edc21c482d45 100644
--- a/sd/source/filter/sdpptwrp.cxx
+++ b/sd/source/filter/sdpptwrp.cxx
@@ -19,18 +19,13 @@
 
 #include <sfx2/docfile.hxx>
 #include <sfx2/docfilt.hxx>
-#include <sfx2/objsh.hxx>
-#include <osl/module.hxx>
 #include <filter/msfilter/msoleexp.hxx>
-#include <filter/msfilter/svxmsbas.hxx>
 #include <svx/svxerr.hxx>
 #include <unotools/fltrcfg.hxx>
+#include <sot/storage.hxx>
 
 #include <sdpptwrp.hxx>
-#include "ppt/pptin.hxx"
-#include <drawdoc.hxx>
 #include <DrawDocShell.hxx>
-#include <tools/urlobj.hxx>
 
 
 using namespace ::com::sun::star::uno;
diff --git a/sd/source/filter/xml/sdtransform.cxx b/sd/source/filter/xml/sdtransform.cxx
index 6ede79796b5b..fa0cced78971 100644
--- a/sd/source/filter/xml/sdtransform.cxx
+++ b/sd/source/filter/xml/sdtransform.cxx
@@ -19,7 +19,6 @@
 
 #include <svl/style.hxx>
 #include <svl/itemset.hxx>
-#include <svl/itempool.hxx>
 #include <svl/whiter.hxx>
 
 #include <svx/svdoutl.hxx>
@@ -28,11 +27,9 @@
 #include <svx/svdogrp.hxx>
 #include <editeng/eeitem.hxx>
 #include <editeng/lrspitem.hxx>
-#include <editeng/numitem.hxx>
 #include <editeng/outlobj.hxx>
 
 #include <drawdoc.hxx>
-#include <glob.hxx>
 #include "sdtransform.hxx"
 
 using namespace ::com::sun::star::style;
diff --git a/sd/source/filter/xml/sdxmlwrp.cxx b/sd/source/filter/xml/sdxmlwrp.cxx
index 91591779e4cf..6c038cb5dac6 100644
--- a/sd/source/filter/xml/sdxmlwrp.cxx
+++ b/sd/source/filter/xml/sdxmlwrp.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <vcl/errinf.hxx>
-#include <rtl/strbuf.hxx>
 #include <sal/log.hxx>
 #include <com/sun/star/container/XChild.hpp>
 #include <com/sun/star/beans/XPropertySetInfo.hpp>
@@ -42,7 +41,6 @@
 #include <DrawDocShell.hxx>
 
 #include <sdxmlwrp.hxx>
-#include <strmname.h>
 #include <svx/xmleohlp.hxx>
 #include <com/sun/star/xml/sax/XDocumentHandler.hpp>
 #include <com/sun/star/xml/sax/XFastParser.hpp>
@@ -51,21 +49,14 @@
 #include <com/sun/star/document/XExporter.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/lang/WrappedTargetRuntimeException.hpp>
-#include <com/sun/star/document/XGraphicStorageHandler.hpp>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
-#include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/packages/WrongPasswordException.hpp>
 #include <com/sun/star/packages/zip/ZipIOException.hpp>
 
-#include <com/sun/star/xml/sax/XErrorHandler.hpp>
-#include <com/sun/star/xml/sax/XEntityResolver.hpp>
 #include <com/sun/star/xml/sax/InputSource.hpp>
-#include <com/sun/star/xml/sax/XDTDHandler.hpp>
 #include <com/sun/star/xml/sax/Parser.hpp>
 #include <com/sun/star/xml/sax/Writer.hpp>
 #include <com/sun/star/io/XActiveDataSource.hpp>
-#include <com/sun/star/io/XActiveDataControl.hpp>
 #include <comphelper/genericpropertyset.hxx>
 #include <comphelper/propertysetinfo.hxx>
 #include <editeng/eeitem.hxx>
-- 
cgit