tdf#42949 Fix IWYU warnings in oox/source/[e-v]*/*cxx

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

Change-Id: I6cd335e3055ca1dcebcaf0b26ec843b1937f0bce
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90773
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>

59 files changed, 97 insertions, 232 deletions

diff --git a/oox/IwyuFilter_oox.yaml b/oox/IwyuFilter_oox.yaml
index 41091bc9b4eb..7cbf5b194322 100644
--- a/oox/IwyuFilter_oox.yaml
+++ b/oox/IwyuFilter_oox.yaml
@@ -70,3 +70,90 @@ blacklist:
     oox/source/drawingml/diagram/diagram.cxx:
     # Actually used
     - com/sun/star/xml/dom/XDocument.hpp
+    oox/source/helper/binarystreambase.cxx:
+    # Actually used
+    - com/sun/star/io/XSeekable.hpp
+    oox/source/helper/binaryinputstream.cxx:
+    # Actually used
+    - com/sun/star/io/XInputStream.hpp
+    - vector
+    oox/source/helper/binaryoutputstream.cxx:
+    # Actually used
+    - com/sun/star/io/XOutputStream.hpp
+    oox/source/helper/progressbar.cxx:
+    # Actually used
+    - com/sun/star/task/XStatusIndicator.hpp
+    oox/source/helper/modelobjecthelper.cxx:
+    # Actually used
+    - com/sun/star/awt/Gradient.hpp
+    - com/sun/star/drawing/LineDash.hpp
+    - com/sun/star/drawing/Hatch.hpp
+    - com/sun/star/drawing/PolyPolygonBezierCoords.hpp
+    - com/sun/star/lang/XMultiServiceFactory.hpp
+    - com/sun/star/graphic/XGraphic.hpp
+    oox/source/helper/propertyset.cxx:
+    # Actually used
+    - com/sun/star/beans/XPropertySet.hpp
+    oox/source/helper/storagebase.cxx:
+    # Actually used
+    - com/sun/star/io/XStream.hpp
+    oox/source/helper/zipstorage.cxx:
+    # Actually used
+    - com/sun/star/embed/XStorage.hpp
+    - com/sun/star/uno/XComponentContext.hpp
+    oox/source/helper/propertymap.cxx:
+    # Actually used
+    - com/sun/star/beans/PropertyValue.hpp
+    oox/source/mathml/importutils.cxx:
+    # Actually used
+    - com/sun/star/xml/sax/XFastAttributeList.hpp
+    oox/source/ole/oleobjecthelper.cxx:
+    # Actually used
+    - com/sun/star/awt/Size.hpp
+    - com/sun/star/lang/XMultiServiceFactory.hpp
+    oox/source/ole/vbamodule.cxx:
+    # Actually used
+    - com/sun/star/container/XNameContainer.hpp
+    oox/source/ole/olestorage.cxx:
+    # Actually used
+     - com/sun/star/uno/XComponentContext.hpp
+    oox/source/ole/olehelper.cxx:
+    # Actually used
+     - com/sun/star/frame/XModel.hpp
+     - com/sun/star/awt/Size.hpp
+     - com/sun/star/uno/XComponentContext.hpp
+    oox/source/ole/vbaproject.cxx:
+    # Actually used
+     - com/sun/star/frame/XModel.hpp
+     - com/sun/star/uno/XComponentContext.hpp
+    oox/source/ole/vbacontrol.cxx:
+    # Actually used
+     - com/sun/star/uno/XComponentContext.hpp
+    oox/source/ppt/comments.cxx:
+    # Needed for rtl::math::round
+     - rtl/math.hxx
+    oox/source/ppt/pptimport.cxx:
+    # Actually used
+    - comphelper/scopeguard.hxx
+    oox/source/ppt/slidetransition.cxx:
+    # Actually used
+    - com/sun/star/animations/XTransitionFilter.hpp
+    oox/source/shape/ShapeContextHandler.cxx:
+    # Actually used
+    - com/sun/star/xml/dom/XDocument.hpp
+    oox/source/token/propertynames.cxx:
+    # Auto-generated C array of property names
+    - propertynames.inc
+    oox/source/token/relationship.cxx:
+    # Auto-generated C array of relationship names
+    - relationship.inc
+    oox/source/token/namespacemap.cxx:
+    # Auto-generated C array of transitional and strict namespace names
+    - namespacenames.inc
+    - namespaces-strictnames.inc
+    oox/source/token/tokenmap.cxx:
+    # Auto-generated C array of token names
+    - tokennames.inc
+    oox/source/vml/vmlinputstream.cxx:
+    # Needed for direct member access
+    - com/sun/star/io/XTextInputStream2.hpp
diff --git a/oox/source/export/chartexport.cxx b/oox/source/export/chartexport.cxx
index 3e0ed3ff9eef..78685f38b5d3 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -35,10 +35,7 @@
 #include <com/sun/star/chart/XTwoAxisXSupplier.hpp>
 #include <com/sun/star/chart/XTwoAxisYSupplier.hpp>
 #include <com/sun/star/chart/XAxisZSupplier.hpp>
-#include <com/sun/star/chart/XChartDataArray.hpp>
 #include <com/sun/star/chart/ChartDataRowSource.hpp>
-#include <com/sun/star/chart/ChartAxisAssign.hpp>
-#include <com/sun/star/chart/ChartSeriesAddress.hpp>
 #include <com/sun/star/chart/X3DDisplay.hpp>
 #include <com/sun/star/chart/XStatisticDisplay.hpp>
 #include <com/sun/star/chart/XSecondAxisTitleSupplier.hpp>
@@ -60,28 +57,22 @@
 #include <com/sun/star/chart2/XRegressionCurveContainer.hpp>
 #include <com/sun/star/chart2/XChartTypeContainer.hpp>
 #include <com/sun/star/chart2/XDataSeriesContainer.hpp>
-#include <com/sun/star/chart2/DataPointGeometry3D.hpp>
 #include <com/sun/star/chart2/DataPointLabel.hpp>
-#include <com/sun/star/chart2/DataPointCustomLabelField.hpp>
+#include <com/sun/star/chart2/XDataPointCustomLabelField.hpp>
 #include <com/sun/star/chart2/DataPointCustomLabelFieldType.hpp>
 #include <com/sun/star/chart2/Symbol.hpp>
 #include <com/sun/star/chart2/data/XDataSource.hpp>
-#include <com/sun/star/chart2/data/XDataSink.hpp>
-#include <com/sun/star/chart2/data/XDataReceiver.hpp>
 #include <com/sun/star/chart2/data/XDataProvider.hpp>
-#include <com/sun/star/chart2/XInternalDataProvider.hpp>
-#include <com/sun/star/chart2/data/XDatabaseDataProvider.hpp>
-#include <com/sun/star/chart2/data/XRangeXMLConversion.hpp>
 #include <com/sun/star/chart2/data/XTextualDataSequence.hpp>
 #include <com/sun/star/chart2/data/XNumericalDataSequence.hpp>
 #include <com/sun/star/chart2/data/XLabeledDataSequence.hpp>
 #include <com/sun/star/chart2/XAnyDescriptionAccess.hpp>
 
 #include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/drawing/XShape.hpp>
 #include <com/sun/star/drawing/FillStyle.hpp>
 #include <com/sun/star/drawing/LineStyle.hpp>
-#include <com/sun/star/drawing/BitmapMode.hpp>
 #include <com/sun/star/awt/XBitmap.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/lang/XServiceName.hpp>
@@ -91,7 +82,6 @@
 #include <com/sun/star/sheet/FormulaToken.hpp>
 #include <com/sun/star/sheet/AddressConvention.hpp>
 
-#include <com/sun/star/text/WritingMode.hpp>
 #include <com/sun/star/container/XNamed.hpp>
 #include <com/sun/star/embed/XVisualObject.hpp>
 #include <com/sun/star/embed/Aspects.hpp>
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index d80b6a3bea7e..63f1088970d8 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -40,7 +40,6 @@
 #include <comphelper/processfactory.hxx>
 #include <i18nlangtag/languagetag.hxx>
 
-#include <cstdio>
 #include <numeric>
 #include <com/sun/star/awt/CharSet.hpp>
 #include <com/sun/star/awt/FontDescriptor.hpp>
@@ -51,15 +50,13 @@
 #include <com/sun/star/awt/Gradient.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/beans/XPropertyState.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/container/XIndexAccess.hpp>
-#include <com/sun/star/document/XStorageBasedDocument.hpp>
+#include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/drawing/BitmapMode.hpp>
 #include <com/sun/star/drawing/ColorMode.hpp>
 #include <com/sun/star/drawing/EnhancedCustomShapeAdjustmentValue.hpp>
-#include <com/sun/star/drawing/EnhancedCustomShapeParameterType.hpp>
 #include <com/sun/star/drawing/EnhancedCustomShapeParameterPair.hpp>
 #include <com/sun/star/drawing/EnhancedCustomShapeSegment.hpp>
 #include <com/sun/star/drawing/EnhancedCustomShapeSegmentCommand.hpp>
@@ -73,7 +70,6 @@
 #include <com/sun/star/drawing/XShape.hpp>
 #include <com/sun/star/drawing/XShapes.hpp>
 #include <com/sun/star/drawing/FillStyle.hpp>
-#include <com/sun/star/embed/ElementModes.hpp>
 #include <com/sun/star/graphic/XGraphic.hpp>
 #include <com/sun/star/i18n/ScriptType.hpp>
 #include <com/sun/star/i18n/BreakIterator.hpp>
@@ -104,12 +100,8 @@
 #include <unotools/fontdefs.hxx>
 #include <vcl/cvtgrf.hxx>
 #include <vcl/graph.hxx>
-#include <vcl/settings.hxx>
-#include <vcl/GraphicObject.hxx>
 #include <vcl/svapp.hxx>
 #include <rtl/strbuf.hxx>
-#include <sfx2/app.hxx>
-#include <svl/languageoptions.hxx>
 #include <filter/msfilter/escherex.hxx>
 #include <filter/msfilter/util.hxx>
 #include <editeng/outlobj.hxx>
@@ -117,7 +109,6 @@
 #include <editeng/unonames.hxx>
 #include <editeng/unoprnms.hxx>
 #include <editeng/flditem.hxx>
-#include <svx/sdtfsitm.hxx>
 #include <svx/svdoashp.hxx>
 #include <svx/svdomedia.hxx>
 #include <svx/unoapi.hxx>
diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx
index 4b2a66b89487..214c4bcfbbb3 100644
--- a/oox/source/export/shapes.cxx
+++ b/oox/source/export/shapes.cxx
@@ -19,9 +19,7 @@
 
 #include <sal/config.h>
 
-#include <config_global.h>
 #include <sal/log.hxx>
-#include <unotools/mediadescriptor.hxx>
 #include <filter/msfilter/util.hxx>
 #include <oox/core/xmlfilterbase.hxx>
 #include <oox/export/shapes.hxx>
@@ -30,32 +28,18 @@
 #include <oox/token/relationship.hxx>
 #include <oox/token/tokens.hxx>
 
-#include <cstdio>
 #include <initializer_list>
 
-#include <com/sun/star/awt/CharSet.hpp>
-#include <com/sun/star/awt/FontDescriptor.hpp>
-#include <com/sun/star/awt/FontSlant.hpp>
-#include <com/sun/star/awt/FontWeight.hpp>
-#include <com/sun/star/awt/FontUnderline.hpp>
-#include <com/sun/star/awt/Gradient.hpp>
 #include <com/sun/star/beans/PropertyValues.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/beans/XPropertySetInfo.hpp>
 #include <com/sun/star/beans/XPropertyState.hpp>
 #include <com/sun/star/container/XChild.hpp>
-#include <com/sun/star/container/XEnumerationAccess.hpp>
 #include <com/sun/star/document/XExporter.hpp>
 #include <com/sun/star/document/XStorageBasedDocument.hpp>
 #include <com/sun/star/drawing/CircleKind.hpp>
 #include <com/sun/star/drawing/FillStyle.hpp>
-#include <com/sun/star/drawing/BitmapMode.hpp>
 #include <com/sun/star/drawing/ConnectorType.hpp>
-#include <com/sun/star/drawing/LineDash.hpp>
-#include <com/sun/star/drawing/LineJoint.hpp>
-#include <com/sun/star/drawing/LineStyle.hpp>
-#include <com/sun/star/drawing/TextHorizontalAdjust.hpp>
-#include <com/sun/star/drawing/TextVerticalAdjust.hpp>
 #include <com/sun/star/drawing/EnhancedCustomShapeParameterPair.hpp>
 #include <com/sun/star/drawing/EnhancedCustomShapeParameterType.hpp>
 #include <com/sun/star/embed/EmbedStates.hpp>
@@ -65,40 +49,25 @@
 #include <com/sun/star/graphic/XGraphic.hpp>
 #include <com/sun/star/i18n/ScriptType.hpp>
 #include <com/sun/star/io/XOutputStream.hpp>
-#include <com/sun/star/style/ParagraphAdjust.hpp>
 #include <com/sun/star/text/XSimpleText.hpp>
 #include <com/sun/star/text/XText.hpp>
-#include <com/sun/star/text/XTextContent.hpp>
-#include <com/sun/star/text/XTextDocument.hpp>
-#include <com/sun/star/text/XTextField.hpp>
-#include <com/sun/star/text/XTextRange.hpp>
 #include <com/sun/star/table/XTable.hpp>
-#include <com/sun/star/table/XColumnRowRange.hpp>
-#include <com/sun/star/table/XCellRange.hpp>
 #include <com/sun/star/table/XMergeableCell.hpp>
 #include <com/sun/star/chart2/XChartDocument.hpp>
 #include <com/sun/star/frame/XModel.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
-#include <tools/stream.hxx>
 #include <tools/globname.hxx>
 #include <comphelper/classids.hxx>
 #include <comphelper/propertysequence.hxx>
 #include <comphelper/storagehelper.hxx>
 #include <sot/exchange.hxx>
 #include <utility>
-#include <vcl/cvtgrf.hxx>
-#include <unotools/fontcvt.hxx>
 #include <vcl/graph.hxx>
 #include <vcl/outdev.hxx>
-#include <vcl/GraphicObject.hxx>
-#include <rtl/strbuf.hxx>
-#include <sfx2/app.hxx>
-#include <svl/languageoptions.hxx>
 #include <filter/msfilter/escherex.hxx>
 #include <svx/svdoashp.hxx>
 #include <svx/svdoole2.hxx>
 #include <tools/diagnose_ex.h>
-#include <editeng/svxenum.hxx>
 #include <svx/unoapi.hxx>
 #include <oox/export/chartexport.hxx>
 #include <oox/mathml/export.hxx>
diff --git a/oox/source/helper/attributelist.cxx b/oox/source/helper/attributelist.cxx
index da58fc076672..4c9bfb46c3c5 100644
--- a/oox/source/helper/attributelist.cxx
+++ b/oox/source/helper/attributelist.cxx
@@ -19,7 +19,6 @@
 
 #include <oox/helper/attributelist.hxx>
 
-#include <cassert>
 #include <osl/diagnose.h>
 #include <rtl/ustrbuf.hxx>
 #include <sax/fastattribs.hxx>
diff --git a/oox/source/helper/binaryinputstream.cxx b/oox/source/helper/binaryinputstream.cxx
index 7bfec5ace97c..27cbc6ad6e1f 100644
--- a/oox/source/helper/binaryinputstream.cxx
+++ b/oox/source/helper/binaryinputstream.cxx
@@ -24,7 +24,6 @@
 #include <string.h>
 #include <algorithm>
 #include <vector>
-#include <rtl/strbuf.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <osl/diagnose.h>
 #include <oox/helper/binaryoutputstream.hxx>
diff --git a/oox/source/helper/containerhelper.cxx b/oox/source/helper/containerhelper.cxx
index 32296fbbd8c8..60e225e17fcd 100644
--- a/oox/source/helper/containerhelper.cxx
+++ b/oox/source/helper/containerhelper.cxx
@@ -21,13 +21,8 @@
 
 #include <oox/helper/containerhelper.hxx>
 
-#include <com/sun/star/container/XIndexContainer.hpp>
 #include <com/sun/star/container/XNameContainer.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
 #include <osl/diagnose.h>
-#include <rtl/ustrbuf.hxx>
-#include <oox/helper/helper.hxx>
 
 namespace oox {
 
diff --git a/oox/source/helper/graphichelper.cxx b/oox/source/helper/graphichelper.cxx
index 8e56f58ccabb..85490fb43a8e 100644
--- a/oox/source/helper/graphichelper.cxx
+++ b/oox/source/helper/graphichelper.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <com/sun/star/container/XNameContainer.hpp>
 #include <oox/helper/graphichelper.hxx>
 
 #include <com/sun/star/awt/Point.hpp>
@@ -26,14 +25,11 @@
 #include <com/sun/star/awt/XUnitConversion.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/frame/Desktop.hpp>
-#include <com/sun/star/graphic/GraphicObject.hpp>
 #include <com/sun/star/graphic/GraphicProvider.hpp>
-#include <com/sun/star/graphic/XGraphicProvider.hpp>
 #include <com/sun/star/util/MeasureUnit.hpp>
 #include <osl/diagnose.h>
 #include <sal/log.hxx>
 #include <comphelper/seqstream.hxx>
-#include <vcl/wmf.hxx>
 #include <vcl/wmfexternal.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/outdev.hxx>
diff --git a/oox/source/helper/modelobjecthelper.cxx b/oox/source/helper/modelobjecthelper.cxx
index f8160fa6f7ed..7b8c8600703b 100644
--- a/oox/source/helper/modelobjecthelper.cxx
+++ b/oox/source/helper/modelobjecthelper.cxx
@@ -28,7 +28,6 @@
 #include <com/sun/star/graphic/XGraphic.hpp>
 #include <com/sun/star/awt/XBitmap.hpp>
 #include <oox/helper/containerhelper.hxx>
-#include <oox/helper/helper.hxx>
 #include <osl/diagnose.h>
 
 namespace oox {
diff --git a/oox/source/helper/propertymap.cxx b/oox/source/helper/propertymap.cxx
index 75716b851534..d21b8f0418b8 100644
--- a/oox/source/helper/propertymap.cxx
+++ b/oox/source/helper/propertymap.cxx
@@ -18,12 +18,10 @@
  */
 
 #include <oox/helper/propertymap.hxx>
-#include <oox/helper/helper.hxx>
 
 #if OSL_DEBUG_LEVEL > 0
 # include <cstdio>
 # include <com/sun/star/style/LineSpacing.hpp>
-# include <com/sun/star/style/LineSpacingMode.hpp>
 # include <com/sun/star/text/WritingMode.hpp>
 using ::com::sun::star::style::LineSpacing;
 using ::com::sun::star::text::WritingMode;
diff --git a/oox/source/helper/propertyset.cxx b/oox/source/helper/propertyset.cxx
index 8bf9aec42991..98151d5fbe29 100644
--- a/oox/source/helper/propertyset.cxx
+++ b/oox/source/helper/propertyset.cxx
@@ -22,7 +22,6 @@
 #include <com/sun/star/beans/XMultiPropertySet.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <osl/diagnose.h>
-#include <rtl/strbuf.hxx>
 #include <sal/log.hxx>
 #include <tools/diagnose_ex.h>
 #include <oox/helper/propertymap.hxx>
diff --git a/oox/source/helper/storagebase.cxx b/oox/source/helper/storagebase.cxx
index 2fb8a708fd70..4738eda6fead 100644
--- a/oox/source/helper/storagebase.cxx
+++ b/oox/source/helper/storagebase.cxx
@@ -19,7 +19,6 @@
 
 #include <oox/helper/storagebase.hxx>
 
-#include <com/sun/star/embed/XTransactedObject.hpp>
 #include <com/sun/star/io/XStream.hpp>
 #include <osl/diagnose.h>
 #include <rtl/ustrbuf.hxx>
diff --git a/oox/source/helper/textinputstream.cxx b/oox/source/helper/textinputstream.cxx
index 3d284cfc8e72..923f49396059 100644
--- a/oox/source/helper/textinputstream.cxx
+++ b/oox/source/helper/textinputstream.cxx
@@ -20,7 +20,6 @@
 #include <oox/helper/textinputstream.hxx>
 
 #include <com/sun/star/io/NotConnectedException.hpp>
-#include <com/sun/star/io/XActiveDataSink.hpp>
 #include <com/sun/star/io/TextInputStream.hpp>
 #include <cppuhelper/implbase.hxx>
 #include <osl/diagnose.h>
diff --git a/oox/source/helper/zipstorage.cxx b/oox/source/helper/zipstorage.cxx
index 3de75bf68b94..b9e7c80e1390 100644
--- a/oox/source/helper/zipstorage.cxx
+++ b/oox/source/helper/zipstorage.cxx
@@ -24,13 +24,11 @@
 #include <com/sun/star/embed/XTransactedObject.hpp>
 #include <com/sun/star/io/XInputStream.hpp>
 #include <com/sun/star/io/XOutputStream.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <osl/diagnose.h>
 #include <sal/log.hxx>
 #include <tools/diagnose_ex.h>
 #include <comphelper/storagehelper.hxx>
-#include <oox/helper/helper.hxx>
 
 namespace oox {
 
diff --git a/oox/source/mathml/import.cxx b/oox/source/mathml/import.cxx
index 84056b027a98..bff603d2b83a 100644
--- a/oox/source/mathml/import.cxx
+++ b/oox/source/mathml/import.cxx
@@ -12,7 +12,6 @@
 #include <oox/mathml/importutils.hxx>
 #include <oox/core/contexthandler.hxx>
 #include <oox/token/namespaces.hxx>
-#include <oox/token/tokens.hxx>
 
 #include <drawingml/textparagraph.hxx>
 
diff --git a/oox/source/mathml/importutils.cxx b/oox/source/mathml/importutils.cxx
index e50aa70e6f0f..d2727d17e326 100644
--- a/oox/source/mathml/importutils.cxx
+++ b/oox/source/mathml/importutils.cxx
@@ -13,7 +13,6 @@
 
 #include <com/sun/star/xml/FastAttribute.hpp>
 #include <com/sun/star/xml/sax/XFastAttributeList.hpp>
-#include <oox/token/namespacemap.hxx>
 #include <oox/token/tokenmap.hxx>
 #include <oox/token/tokens.hxx>
 #include <oox/token/namespaces.hxx>
diff --git a/oox/source/ole/axbinarywriter.cxx b/oox/source/ole/axbinarywriter.cxx
index 7e08d0992fae..b9c4b66bec72 100644
--- a/oox/source/ole/axbinarywriter.cxx
+++ b/oox/source/ole/axbinarywriter.cxx
@@ -8,8 +8,6 @@
  */
 #include <oox/ole/axbinarywriter.hxx>
 
-#include <oox/ole/olehelper.hxx>
-
 namespace oox::ole {
 
 namespace {
diff --git a/oox/source/ole/axcontrol.cxx b/oox/source/ole/axcontrol.cxx
index ebdf845310e5..5d5c8a41ff9d 100644
--- a/oox/source/ole/axcontrol.cxx
+++ b/oox/source/ole/axcontrol.cxx
@@ -49,14 +49,12 @@
 #include <com/sun/star/table/CellRangeAddress.hpp>
 #include <rtl/tencinfo.h>
 #include <osl/diagnose.h>
-#include <sal/log.hxx>
 #include <vcl/font.hxx>
 #include <vcl/outdev.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/svapp.hxx>
 #include <oox/helper/attributelist.hxx>
 #include <oox/helper/binaryinputstream.hxx>
-#include <oox/helper/containerhelper.hxx>
 #include <oox/helper/graphichelper.hxx>
 #include <oox/helper/propertymap.hxx>
 #include <oox/ole/axbinarywriter.hxx>
diff --git a/oox/source/ole/axcontrolfragment.cxx b/oox/source/ole/axcontrolfragment.cxx
index c08ce2f21e9d..54020a033e40 100644
--- a/oox/source/ole/axcontrolfragment.cxx
+++ b/oox/source/ole/axcontrolfragment.cxx
@@ -22,7 +22,6 @@
 #include <oox/core/xmlfilterbase.hxx>
 #include <oox/helper/attributelist.hxx>
 #include <oox/helper/binaryinputstream.hxx>
-#include <oox/helper/binaryoutputstream.hxx>
 #include <oox/ole/axcontrol.hxx>
 #include <oox/ole/olehelper.hxx>
 #include <oox/ole/olestorage.hxx>
diff --git a/oox/source/ole/olehelper.cxx b/oox/source/ole/olehelper.cxx
index ec7dad6c181f..4b7bc6e11975 100644
--- a/oox/source/ole/olehelper.cxx
+++ b/oox/source/ole/olehelper.cxx
@@ -30,7 +30,6 @@
 #include <oox/ole/axcontrol.hxx>
 #include <oox/helper/propertymap.hxx>
 #include <oox/helper/propertyset.hxx>
-#include <oox/ole/olestorage.hxx>
 
 #include <com/sun/star/awt/XControlModel.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/oox/source/ole/olestorage.cxx b/oox/source/ole/olestorage.cxx
index 0eec7ad679bf..f5113ebc62c4 100644
--- a/oox/source/ole/olestorage.cxx
+++ b/oox/source/ole/olestorage.cxx
@@ -19,7 +19,6 @@
 
 #include <oox/ole/olestorage.hxx>
 
-#include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/container/XNameContainer.hpp>
 #include <com/sun/star/embed/XTransactedObject.hpp>
 #include <com/sun/star/io/IOException.hpp>
@@ -36,11 +35,9 @@
 #include <oox/helper/binaryinputstream.hxx>
 #include <oox/helper/binaryoutputstream.hxx>
 #include <oox/helper/containerhelper.hxx>
-#include <oox/helper/helper.hxx>
 
 namespace oox::ole {
 
-using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::embed;
 using namespace ::com::sun::star::io;
diff --git a/oox/source/ole/vbaexport.cxx b/oox/source/ole/vbaexport.cxx
index b4f2db17ccf5..306e1753c82a 100644
--- a/oox/source/ole/vbaexport.cxx
+++ b/oox/source/ole/vbaexport.cxx
@@ -10,7 +10,6 @@
 #include <sal/config.h>
 
 #include <cassert>
-#include <cmath>
 #include <random>
 
 #include <oox/ole/vbaexport.hxx>
@@ -25,7 +24,6 @@
 
 #include <ooo/vba/excel/XWorkbook.hpp>
 
-#include <oox/helper/binaryoutputstream.hxx>
 #include <oox/helper/propertyset.hxx>
 #include <oox/token/properties.hxx>
 
diff --git a/oox/source/ole/vbahelper.cxx b/oox/source/ole/vbahelper.cxx
index dd523ea9d5ee..6b48055aa679 100644
--- a/oox/source/ole/vbahelper.cxx
+++ b/oox/source/ole/vbahelper.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <oox/ole/vbahelper.hxx>
-#include <rtl/ustrbuf.hxx>
 #include <osl/diagnose.h>
 #include <oox/helper/binaryinputstream.hxx>
 
diff --git a/oox/source/ole/vbamodule.cxx b/oox/source/ole/vbamodule.cxx
index d0d05a35cd08..7e913124730b 100644
--- a/oox/source/ole/vbamodule.cxx
+++ b/oox/source/ole/vbamodule.cxx
@@ -19,7 +19,6 @@
 
 #include <oox/ole/vbamodule.hxx>
 #include <com/sun/star/container/XNameContainer.hpp>
-#include <com/sun/star/container/XIndexContainer.hpp>
 #include <com/sun/star/script/ModuleInfo.hpp>
 #include <com/sun/star/script/ModuleType.hpp>
 #include <com/sun/star/script/vba/XVBAModuleInfo.hpp>
diff --git a/oox/source/ole/vbaproject.cxx b/oox/source/ole/vbaproject.cxx
index cf9ad880ed9a..91738efddbfa 100644
--- a/oox/source/ole/vbaproject.cxx
+++ b/oox/source/ole/vbaproject.cxx
@@ -35,10 +35,8 @@
 #include <comphelper/storagehelper.hxx>
 #include <osl/diagnose.h>
 #include <rtl/tencinfo.h>
-#include <rtl/ustrbuf.h>
 #include <sal/log.hxx>
 #include <oox/helper/binaryinputstream.hxx>
-#include <oox/helper/containerhelper.hxx>
 #include <oox/helper/propertyset.hxx>
 #include <oox/helper/textinputstream.hxx>
 #include <oox/ole/olestorage.hxx>
diff --git a/oox/source/ppt/animationspersist.cxx b/oox/source/ppt/animationspersist.cxx
index baae105d5d6d..544b5e4626aa 100644
--- a/oox/source/ppt/animationspersist.cxx
+++ b/oox/source/ppt/animationspersist.cxx
@@ -30,7 +30,6 @@
 #include <com/sun/star/animations/XAnimationNode.hpp>
 
 #include <oox/drawingml/shape.hxx>
-#include <oox/helper/attributelist.hxx>
 #include <oox/helper/addtosequence.hxx>
 #include <oox/token/namespaces.hxx>
 #include <oox/token/tokens.hxx>
diff --git a/oox/source/ppt/animvariantcontext.cxx b/oox/source/ppt/animvariantcontext.cxx
index d4185a337bd5..00adaaa1599c 100644
--- a/oox/source/ppt/animvariantcontext.cxx
+++ b/oox/source/ppt/animvariantcontext.cxx
@@ -19,19 +19,14 @@
 
 #include "animvariantcontext.hxx"
 
-#include <cppuhelper/exc_hlp.hxx>
-
 #include <com/sun/star/uno/Any.hxx>
-#include <com/sun/star/drawing/FillStyle.hpp>
 #include <rtl/ustring.hxx>
 
 #include <oox/helper/attributelist.hxx>
-#include <oox/core/fragmenthandler.hxx>
 #include <oox/core/xmlfilterbase.hxx>
 #include <drawingml/colorchoicecontext.hxx>
 #include <oox/token/namespaces.hxx>
 #include <oox/token/tokens.hxx>
-#include <oox/ppt/pptfilterhelpers.hxx>
 
 using namespace ::oox::core;
 using namespace ::com::sun::star::uno;
diff --git a/oox/source/ppt/backgroundproperties.cxx b/oox/source/ppt/backgroundproperties.cxx
index 75524ec5e6fb..2ffde9e5e038 100644
--- a/oox/source/ppt/backgroundproperties.cxx
+++ b/oox/source/ppt/backgroundproperties.cxx
@@ -19,10 +19,8 @@
 
 #include <oox/ppt/backgroundproperties.hxx>
 #include <drawingml/misccontexts.hxx>
-#include <oox/drawingml/drawingmltypes.hxx>
 #include <oox/core/contexthandler2.hxx>
 #include <oox/token/namespaces.hxx>
-#include <oox/token/tokens.hxx>
 
 using namespace ::oox::core;
 using namespace ::com::sun::star::uno;
diff --git a/oox/source/ppt/buildlistcontext.cxx b/oox/source/ppt/buildlistcontext.cxx
index 495eb83b97bf..011d303468c3 100644
--- a/oox/source/ppt/buildlistcontext.cxx
+++ b/oox/source/ppt/buildlistcontext.cxx
@@ -18,10 +18,8 @@
  */
 
 #include "buildlistcontext.hxx"
-#include <rtl/ustring.hxx>
 #include <oox/helper/attributelist.hxx>
 #include <oox/token/namespaces.hxx>
-#include <oox/token/tokens.hxx>
 
 namespace oox::ppt {
 
diff --git a/oox/source/ppt/commonbehaviorcontext.cxx b/oox/source/ppt/commonbehaviorcontext.cxx
index b136052c88f3..f0fd42c9d075 100644
--- a/oox/source/ppt/commonbehaviorcontext.cxx
+++ b/oox/source/ppt/commonbehaviorcontext.cxx
@@ -17,17 +17,13 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <cppuhelper/exc_hlp.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <sal/log.hxx>
 
-#include <oox/core/fragmenthandler.hxx>
 #include <oox/helper/attributelist.hxx>
 #include <oox/token/namespaces.hxx>
-#include <oox/token/tokens.hxx>
 #include <oox/ppt/pptfilterhelpers.hxx>
 
-#include "conditioncontext.hxx"
 #include "commonbehaviorcontext.hxx"
 #include "commontimenodecontext.hxx"
 #include "timetargetelementcontext.hxx"
diff --git a/oox/source/ppt/commontimenodecontext.cxx b/oox/source/ppt/commontimenodecontext.cxx
index 4af1a972d321..649d6eca2f84 100644
--- a/oox/source/ppt/commontimenodecontext.cxx
+++ b/oox/source/ppt/commontimenodecontext.cxx
@@ -20,10 +20,6 @@
 #include "commontimenodecontext.hxx"
 #include "conditioncontext.hxx"
 
-#include <algorithm>
-
-#include <cppuhelper/exc_hlp.hxx>
-
 #include <com/sun/star/animations/AnimationFill.hpp>
 #include <com/sun/star/animations/AnimationRestart.hpp>
 #include <com/sun/star/presentation/TextAnimationType.hpp>
@@ -31,8 +27,6 @@
 #include <com/sun/star/presentation/EffectNodeType.hpp>
 
 #include <oox/helper/attributelist.hxx>
-#include <oox/core/fragmenthandler.hxx>
-#include <oox/ppt/pptimport.hxx>
 #include <oox/ppt/pptfilterhelpers.hxx>
 #include <oox/drawingml/drawingmltypes.hxx>
 #include <oox/token/namespaces.hxx>
diff --git a/oox/source/ppt/conditioncontext.cxx b/oox/source/ppt/conditioncontext.cxx
index 77996aacfee9..50e10ae429c8 100644
--- a/oox/source/ppt/conditioncontext.cxx
+++ b/oox/source/ppt/conditioncontext.cxx
@@ -19,8 +19,6 @@
 
 #include "conditioncontext.hxx"
 
-#include <cppuhelper/exc_hlp.hxx>
-
 #include <com/sun/star/animations/AnimationEndSync.hpp>
 #include <com/sun/star/animations/EventTrigger.hpp>
 
diff --git a/oox/source/ppt/extdrawingfragmenthandler.cxx b/oox/source/ppt/extdrawingfragmenthandler.cxx
index 74eca3da7da0..9bb24cbbd846 100644
--- a/oox/source/ppt/extdrawingfragmenthandler.cxx
+++ b/oox/source/ppt/extdrawingfragmenthandler.cxx
@@ -11,7 +11,6 @@
 
 #include <oox/ppt/pptshapegroupcontext.hxx>
 #include <oox/token/namespaces.hxx>
-#include <oox/token/tokens.hxx>
 #include <oox/core/xmlfilterbase.hxx>
 
 using namespace ::oox::core;
diff --git a/oox/source/ppt/layoutfragmenthandler.cxx b/oox/source/ppt/layoutfragmenthandler.cxx
index 626af14203a4..f04a96bb4636 100644
--- a/oox/source/ppt/layoutfragmenthandler.cxx
+++ b/oox/source/ppt/layoutfragmenthandler.cxx
@@ -17,14 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <cppuhelper/exc_hlp.hxx>
-
-#include <com/sun/star/beans/XMultiPropertySet.hpp>
-#include <com/sun/star/container/XNamed.hpp>
-
 #include "headerfootercontext.hxx"
 #include <oox/ppt/layoutfragmenthandler.hxx>
-#include <oox/drawingml/shapegroupcontext.hxx>
 #include <oox/helper/attributelist.hxx>
 #include <oox/token/namespaces.hxx>
 #include <oox/token/tokens.hxx>
@@ -35,7 +29,6 @@ using namespace ::oox::core;
 using namespace ::oox::drawingml;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::xml::sax;
-using namespace ::com::sun::star::container;
 
 namespace oox::ppt {
 
diff --git a/oox/source/ppt/pptfilterhelpers.cxx b/oox/source/ppt/pptfilterhelpers.cxx
index 20be11f77e21..295628adc712 100644
--- a/oox/source/ppt/pptfilterhelpers.cxx
+++ b/oox/source/ppt/pptfilterhelpers.cxx
@@ -27,7 +27,6 @@
 #include <com/sun/star/drawing/FillStyle.hpp>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <oox/ppt/pptfilterhelpers.hxx>
-#include <rtl/ustrbuf.hxx>
 #include <tools/color.hxx>
 
 namespace {
diff --git a/oox/source/ppt/pptgraphicshapecontext.cxx b/oox/source/ppt/pptgraphicshapecontext.cxx
index 32483139746e..f16eb4a454d7 100644
--- a/oox/source/ppt/pptgraphicshapecontext.cxx
+++ b/oox/source/ppt/pptgraphicshapecontext.cxx
@@ -17,21 +17,12 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <com/sun/star/xml/sax/FastToken.hpp>
-#include <com/sun/star/drawing/LineStyle.hpp>
-#include <com/sun/star/beans/XMultiPropertySet.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/container/XNamed.hpp>
-
 #include <oox/ppt/pptshape.hxx>
 #include <oox/ppt/pptgraphicshapecontext.hxx>
 #include <oox/ppt/pptshapepropertiescontext.hxx>
 #include <oox/ppt/slidepersist.hxx>
 #include <drawingml/shapestylecontext.hxx>
-#include <drawingml/misccontexts.hxx>
-#include <drawingml/lineproperties.hxx>
 #include <oox/drawingml/drawingmltypes.hxx>
-#include <drawingml/customshapegeometry.hxx>
 #include <drawingml/textbodycontext.hxx>
 #include <oox/helper/attributelist.hxx>
 #include <oox/token/namespaces.hxx>
@@ -40,10 +31,7 @@
 using namespace oox::core;
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::drawing;
-using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::text;
-using namespace ::com::sun::star::xml::sax;
 
 namespace oox::ppt {
 
diff --git a/oox/source/ppt/pptimport.cxx b/oox/source/ppt/pptimport.cxx
index 868165182c33..9ce8dc2b4824 100644
--- a/oox/source/ppt/pptimport.cxx
+++ b/oox/source/ppt/pptimport.cxx
@@ -27,7 +27,6 @@
 #include <com/sun/star/document/XUndoManagerSupplier.hpp>
 #include <comphelper/propertysequence.hxx>
 #include <comphelper/scopeguard.hxx>
-#include <osl/diagnose.h>
 #include <vcl/svapp.hxx>
 #include <vcl/weld.hxx>
 #include <svtools/sfxecode.hxx>
diff --git a/oox/source/ppt/pptshape.cxx b/oox/source/ppt/pptshape.cxx
index 44bdb3e76cec..4f1350a7c7e8 100644
--- a/oox/source/ppt/pptshape.cxx
+++ b/oox/source/ppt/pptshape.cxx
@@ -22,18 +22,14 @@
 #include <drawingml/textbody.hxx>
 #include <drawingml/table/tableproperties.hxx>
 
-#include <com/sun/star/awt/Rectangle.hpp>
 #include <com/sun/star/container/XNamed.hpp>
-#include <com/sun/star/beans/XMultiPropertySet.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/drawing/HomogenMatrix3.hpp>
 #include <com/sun/star/drawing/XShapes.hpp>
 #include <com/sun/star/text/XText.hpp>
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <sal/log.hxx>
 #include <oox/ppt/slidepersist.hxx>
 #include <oox/token/tokens.hxx>
-#include <unotools/fltrcfg.hxx>
 
 using namespace ::oox::core;
 using namespace ::oox::drawingml;
diff --git a/oox/source/ppt/pptshapecontext.cxx b/oox/source/ppt/pptshapecontext.cxx
index 76741bee3869..c8677bdd8371 100644
--- a/oox/source/ppt/pptshapecontext.cxx
+++ b/oox/source/ppt/pptshapecontext.cxx
@@ -19,22 +19,13 @@
 
 #include <sal/log.hxx>
 
-#include <com/sun/star/xml/sax/FastToken.hpp>
-#include <com/sun/star/drawing/LineStyle.hpp>
-#include <com/sun/star/beans/XMultiPropertySet.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/container/XNamed.hpp>
-
 #include <oox/helper/attributelist.hxx>
 #include <oox/ppt/pptshape.hxx>
 #include <oox/ppt/pptshapecontext.hxx>
 #include <oox/ppt/pptshapepropertiescontext.hxx>
 #include <oox/ppt/slidepersist.hxx>
 #include <drawingml/shapestylecontext.hxx>
-#include <drawingml/misccontexts.hxx>
-#include <drawingml/lineproperties.hxx>
 #include <oox/drawingml/drawingmltypes.hxx>
-#include <drawingml/customshapegeometry.hxx>
 #include <drawingml/textbodycontext.hxx>
 #include <drawingml/transform2dcontext.hxx>
 #include <oox/token/namespaces.hxx>
@@ -44,10 +35,7 @@
 using namespace oox::core;
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::drawing;
-using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::text;
-using namespace ::com::sun::star::xml::sax;
 
 namespace oox::ppt {
 
diff --git a/oox/source/ppt/pptshapegroupcontext.cxx b/oox/source/ppt/pptshapegroupcontext.cxx
index ce9fd1cd7ab1..98ba3a4d259f 100644
--- a/oox/source/ppt/pptshapegroupcontext.cxx
+++ b/oox/source/ppt/pptshapegroupcontext.cxx
@@ -19,8 +19,6 @@
 
 #include <memory>
 #include <com/sun/star/xml/sax/FastToken.hpp>
-#include <com/sun/star/beans/XMultiPropertySet.hpp>
-#include <com/sun/star/container/XNamed.hpp>
 
 #include <oox/core/xmlfilterbase.hxx>
 #include <oox/core/fragmenthandler2.hxx>
@@ -30,11 +28,8 @@
 #include <oox/ppt/pptshapecontext.hxx>
 #include <oox/ppt/pptshapegroupcontext.hxx>
 #include <oox/drawingml/graphicshapecontext.hxx>
-#include <drawingml/lineproperties.hxx>
 #include <oox/drawingml/drawingmltypes.hxx>
-#include <drawingml/customshapegeometry.hxx>
 #include <drawingml/shapepropertiescontext.hxx>
-#include <drawingml/textbodycontext.hxx>
 #include <oox/drawingml/connectorshapecontext.hxx>
 #include <drawingml/fillproperties.hxx>
 #include "extdrawingfragmenthandler.hxx"
@@ -45,7 +40,6 @@ using namespace oox::core;
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::drawing;
-using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::text;
 using namespace ::com::sun::star::xml::sax;
 
diff --git a/oox/source/ppt/pptshapepropertiescontext.cxx b/oox/source/ppt/pptshapepropertiescontext.cxx
index 31ea812a1886..128272054b21 100644
--- a/oox/source/ppt/pptshapepropertiescontext.cxx
+++ b/oox/source/ppt/pptshapepropertiescontext.cxx
@@ -17,32 +17,13 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <com/sun/star/xml/sax/FastToken.hpp>
-#include <com/sun/star/drawing/LineStyle.hpp>
-#include <com/sun/star/beans/XMultiPropertySet.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/container/XNamed.hpp>
-
-#include <oox/ppt/pptshape.hxx>
 #include <oox/ppt/pptshapepropertiescontext.hxx>
-#include <oox/ppt/slidepersist.hxx>
-#include <drawingml/shapestylecontext.hxx>
-#include <drawingml/misccontexts.hxx>
-#include <drawingml/lineproperties.hxx>
-#include <oox/drawingml/drawingmltypes.hxx>
-#include <drawingml/customshapegeometry.hxx>
-#include <drawingml/textbodycontext.hxx>
 #include <oox/token/namespaces.hxx>
 #include <oox/token/properties.hxx>
-#include <oox/token/tokens.hxx>
 
 using namespace oox::core;
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::drawing;
-using namespace ::com::sun::star::beans;
-using namespace ::com::sun::star::text;
-using namespace ::com::sun::star::xml::sax;
 
 namespace oox::ppt {
 
diff --git a/oox/source/ppt/presPropsfragmenthandler.cxx b/oox/source/ppt/presPropsfragmenthandler.cxx
index fe4ffdfc2fc6..60ce67133556 100644
--- a/oox/source/ppt/presPropsfragmenthandler.cxx
+++ b/oox/source/ppt/presPropsfragmenthandler.cxx
@@ -10,8 +10,8 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/presentation/XPresentationSupplier.hpp>
 
+#include <oox/core/xmlfilterbase.hxx>
 #include <oox/helper/attributelist.hxx>
-#include <oox/ppt/pptimport.hxx>
 #include <oox/ppt/presPropsfragmenthandler.hxx>
 #include <oox/token/namespaces.hxx>
 
diff --git a/oox/source/ppt/presentationfragmenthandler.cxx b/oox/source/ppt/presentationfragmenthandler.cxx
index dcad8358bd49..5c4bfe987249 100644
--- a/oox/source/ppt/presentationfragmenthandler.cxx
+++ b/oox/source/ppt/presentationfragmenthandler.cxx
@@ -19,12 +19,11 @@
 
 #include <comphelper/anytostring.hxx>
 #include <comphelper/sequenceashashmap.hxx>
-#include <cppuhelper/exc_hlp.hxx>
-#include <osl/diagnose.h>
 #include <sal/log.hxx>
 #include <tools/multisel.hxx>
 #include <tools/diagnose_ex.h>
 
+#include <com/sun/star/container/XNamed.hpp>
 #include <com/sun/star/drawing/XMasterPagesSupplier.hpp>
 #include <com/sun/star/drawing/XDrawPages.hpp>
 #include <com/sun/star/drawing/XDrawPagesSupplier.hpp>
@@ -32,8 +31,6 @@
 #include <com/sun/star/io/XInputStream.hpp>
 #include <com/sun/star/xml/dom/XDocument.hpp>
 #include <com/sun/star/xml/sax/XFastSAXSerializable.hpp>
-#include <com/sun/star/style/XStyleFamiliesSupplier.hpp>
-#include <com/sun/star/style/XStyle.hpp>
 #include <com/sun/star/presentation/XPresentationPage.hpp>
 #include <com/sun/star/task/XStatusIndicator.hpp>
 
diff --git a/oox/source/ppt/slidefragmenthandler.cxx b/oox/source/ppt/slidefragmenthandler.cxx
index e2f80adc1942..58a9a60c09f2 100644
--- a/oox/source/ppt/slidefragmenthandler.cxx
+++ b/oox/source/ppt/slidefragmenthandler.cxx
@@ -17,13 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <comphelper/anytostring.hxx>
-#include <cppuhelper/exc_hlp.hxx>
-
-#include <com/sun/star/beans/XMultiPropertySet.hpp>
+#include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/container/XNamed.hpp>
-#include <osl/diagnose.h>
-#include <sal/log.hxx>
 #include <tools/diagnose_ex.h>
 
 #include <oox/helper/attributelist.hxx>
@@ -40,7 +35,7 @@
 #include <oox/vml/vmldrawing.hxx>
 #include <oox/vml/vmldrawingfragment.hxx>
 #include <drawingml/clrschemecontext.hxx>
-#include <drawingml/textliststyle.hxx>
+#include <drawingml/fillproperties.hxx>
 #include <oox/ppt/pptimport.hxx>
 #include <oox/token/namespaces.hxx>
 #include <oox/token/properties.hxx>
diff --git a/oox/source/ppt/slidemastertextstylescontext.cxx b/oox/source/ppt/slidemastertextstylescontext.cxx
index f3b041fcb894..4d98fd5a5839 100644
--- a/oox/source/ppt/slidemastertextstylescontext.cxx
+++ b/oox/source/ppt/slidemastertextstylescontext.cxx
@@ -21,7 +21,6 @@
 #include <drawingml/textliststylecontext.hxx>
 #include <oox/ppt/slidemastertextstylescontext.hxx>
 #include <oox/token/namespaces.hxx>
-#include <oox/token/tokens.hxx>
 
 using namespace ::oox::core;
 using namespace ::com::sun::star::uno;
diff --git a/oox/source/ppt/slidepersist.cxx b/oox/source/ppt/slidepersist.cxx
index abfe49163745..ba8fb4ace641 100644
--- a/oox/source/ppt/slidepersist.cxx
+++ b/oox/source/ppt/slidepersist.cxx
@@ -38,7 +38,6 @@
 #include <com/sun/star/style/XStyle.hpp>
 #include <com/sun/star/style/XStyleFamiliesSupplier.hpp>
 #include <com/sun/star/container/XNamed.hpp>
-#include <com/sun/star/beans/XMultiPropertySet.hpp>
 #include <com/sun/star/animations/XAnimationNodeSupplier.hpp>
 
 using namespace ::com::sun::star;
diff --git a/oox/source/ppt/slidetimingcontext.cxx b/oox/source/ppt/slidetimingcontext.cxx
index dc93ae4c1c65..f05caf97cee7 100644
--- a/oox/source/ppt/slidetimingcontext.cxx
+++ b/oox/source/ppt/slidetimingcontext.cxx
@@ -19,17 +19,10 @@
 
 #include <oox/ppt/slidetimingcontext.hxx>
 
-#include <cppuhelper/exc_hlp.hxx>
-
-#include <com/sun/star/drawing/XShapes.hpp>
-#include <oox/ppt/backgroundproperties.hxx>
-#include <oox/ppt/slidefragmenthandler.hxx>
-#include <oox/drawingml/shapegroupcontext.hxx>
 #include <oox/helper/attributelist.hxx>
 #include <oox/ppt/timenodelistcontext.hxx>
 #include "buildlistcontext.hxx"
 #include <oox/token/namespaces.hxx>
-#include <oox/token/tokens.hxx>
 
 
 using namespace ::com::sun::star;
diff --git a/oox/source/ppt/slidetransition.cxx b/oox/source/ppt/slidetransition.cxx
index 721f3666bfbf..5f3e5c8edb96 100644
--- a/oox/source/ppt/slidetransition.cxx
+++ b/oox/source/ppt/slidetransition.cxx
@@ -19,7 +19,6 @@
 
 #include <oox/ppt/slidetransition.hxx>
 
-#include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/animations/TransitionType.hpp>
 #include <com/sun/star/animations/TransitionSubType.hpp>
 #include <com/sun/star/animations/XTransitionFilter.hpp>
@@ -27,7 +26,6 @@
 #include <osl/diagnose.h>
 #include <sal/log.hxx>
 
-#include <oox/helper/helper.hxx>
 #include <oox/helper/propertymap.hxx>
 #include <oox/token/namespaces.hxx>
 #include <oox/token/properties.hxx>
@@ -35,7 +33,6 @@
 #include <oox/ppt/pptfilterhelpers.hxx>
 
 using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::animations;
 using namespace ::com::sun::star::presentation;
 
diff --git a/oox/source/ppt/slidetransitioncontext.cxx b/oox/source/ppt/slidetransitioncontext.cxx
index 558f2f50a0f5..4241d202eb9e 100644
--- a/oox/source/ppt/slidetransitioncontext.cxx
+++ b/oox/source/ppt/slidetransitioncontext.cxx
@@ -19,26 +19,17 @@
 
 #include <oox/ppt/slidetransitioncontext.hxx>
 
-#include <cppuhelper/exc_hlp.hxx>
-
-#include <com/sun/star/beans/XMultiPropertySet.hpp>
-#include <com/sun/star/container/XNamed.hpp>
-
 #include <oox/ppt/backgroundproperties.hxx>
-#include <oox/ppt/slidefragmenthandler.hxx>
 #include <oox/ppt/soundactioncontext.hxx>
-#include <oox/drawingml/shapegroupcontext.hxx>
 #include <oox/helper/attributelist.hxx>
 #include <oox/token/namespaces.hxx>
 #include <oox/token/tokens.hxx>
-#include <oox/token/properties.hxx>
 
 using namespace ::com::sun::star;
 using namespace ::oox::core;
 using namespace ::oox::drawingml;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::xml::sax;
-using namespace ::com::sun::star::container;
 
 namespace oox::ppt {
 
diff --git a/oox/source/ppt/soundactioncontext.cxx b/oox/source/ppt/soundactioncontext.cxx
index 7ce2a8119c53..51e709b9f577 100644
--- a/oox/source/ppt/soundactioncontext.cxx
+++ b/oox/source/ppt/soundactioncontext.cxx
@@ -21,8 +21,6 @@
 
 #include <oox/ppt/soundactioncontext.hxx>
 
-#include <cppuhelper/exc_hlp.hxx>
-
 #include <com/sun/star/io/XInputStream.hpp>
 
 #include <oox/helper/attributelist.hxx>
diff --git a/oox/source/ppt/timenode.cxx b/oox/source/ppt/timenode.cxx
index 3debf4066441..efc632ebf514 100644
--- a/oox/source/ppt/timenode.cxx
+++ b/oox/source/ppt/timenode.cxx
@@ -19,7 +19,6 @@
 
 #include <oox/ppt/timenode.hxx>
 
-#include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/beans/NamedValue.hpp>
 #include <com/sun/star/container/XEnumerationAccess.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
@@ -37,7 +36,6 @@
 #include <com/sun/star/presentation/EffectNodeType.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 
-#include <oox/helper/helper.hxx>
 #include <oox/core/xmlfilterbase.hxx>
 #include <oox/ppt/pptfilterhelpers.hxx>
 #include <oox/token/tokens.hxx>
diff --git a/oox/source/ppt/timenodelistcontext.cxx b/oox/source/ppt/timenodelistcontext.cxx
index 361a6a68e72f..278fcde198f6 100644
--- a/oox/source/ppt/timenodelistcontext.cxx
+++ b/oox/source/ppt/timenodelistcontext.cxx
@@ -19,7 +19,6 @@
 
 #include <oox/ppt/timenodelistcontext.hxx>
 
-#include <cppuhelper/exc_hlp.hxx>
 #include <rtl/math.hxx>
 #include <sal/log.hxx>
 
@@ -28,7 +27,6 @@
 #include <com/sun/star/animations/AnimationColorSpace.hpp>
 #include <com/sun/star/animations/AnimationNodeType.hpp>
 #include <com/sun/star/animations/ValuePair.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/presentation/EffectCommands.hpp>
 #include <com/sun/star/beans/NamedValue.hpp>
 
diff --git a/oox/source/ppt/timetargetelementcontext.cxx b/oox/source/ppt/timetargetelementcontext.cxx
index 266c46fdaf72..5c1ceb88523f 100644
--- a/oox/source/ppt/timetargetelementcontext.cxx
+++ b/oox/source/ppt/timetargetelementcontext.cxx
@@ -21,7 +21,6 @@
 
 #include "timetargetelementcontext.hxx"
 
-#include <cppuhelper/exc_hlp.hxx>
 #include <osl/diagnose.h>
 #include <sal/log.hxx>
 
diff --git a/oox/source/shape/ShapeDrawingFragmentHandler.cxx b/oox/source/shape/ShapeDrawingFragmentHandler.cxx
index 2c9552dca65f..3c65844f27de 100644
--- a/oox/source/shape/ShapeDrawingFragmentHandler.cxx
+++ b/oox/source/shape/ShapeDrawingFragmentHandler.cxx
@@ -11,7 +11,6 @@
 
 #include <oox/drawingml/shapegroupcontext.hxx>
 #include <oox/token/namespaces.hxx>
-#include <oox/token/tokens.hxx>
 
 using namespace com::sun::star;
 
diff --git a/oox/source/token/tokenmap.cxx b/oox/source/token/tokenmap.cxx
index 185bc1afcab2..9318971226e7 100644
--- a/oox/source/token/tokenmap.cxx
+++ b/oox/source/token/tokenmap.cxx
@@ -20,7 +20,6 @@
 #include <oox/token/tokenmap.hxx>
 
 #include <string.h>
-#include <rtl/strbuf.hxx>
 #include <rtl/string.hxx>
 #include <oox/token/tokens.hxx>
 
diff --git a/oox/source/vml/vmlinputstream.cxx b/oox/source/vml/vmlinputstream.cxx
index dd05b90c81a1..9a9515685944 100644
--- a/oox/source/vml/vmlinputstream.cxx
+++ b/oox/source/vml/vmlinputstream.cxx
@@ -25,7 +25,6 @@
 #include <string.h>
 #include <rtl/strbuf.hxx>
 #include <osl/diagnose.h>
-#include <oox/helper/helper.hxx>
 #include <oox/helper/textinputstream.hxx>
 
 namespace oox::vml {
diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx
index 0e9770a6cdbb..1c53a87b463e 100644
--- a/oox/source/vml/vmlshape.cxx
+++ b/oox/source/vml/vmlshape.cxx
@@ -24,13 +24,11 @@
 
 #include <o3tl/safeint.hxx>
 #include <oox/vml/vmlshape.hxx>
-#include <vcl/wmf.hxx>
 #include <vcl/wmfexternal.hxx>
-#include <vcl/virdev.hxx>
 
-#include <com/sun/star/beans/PropertyValues.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/awt/XControlModel.hpp>
+#include <com/sun/star/drawing/EnhancedCustomShapeAdjustmentValue.hpp>
+#include <com/sun/star/drawing/FillStyle.hpp>
 #include <com/sun/star/drawing/PointSequenceSequence.hpp>
 #include <com/sun/star/drawing/PolyPolygonBezierCoords.hpp>
 #include <com/sun/star/drawing/TextVerticalAdjust.hpp>
@@ -44,19 +42,13 @@
 #include <com/sun/star/text/SizeType.hpp>
 #include <com/sun/star/text/VertOrientation.hpp>
 #include <com/sun/star/text/WrapTextMode.hpp>
-#include <com/sun/star/text/XTextContent.hpp>
-#include <com/sun/star/text/XTextDocument.hpp>
-#include <com/sun/star/text/XTextFrame.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/text/TextContentAnchorType.hpp>
 #include <com/sun/star/text/GraphicCrop.hpp>
 #include <com/sun/star/security/DocumentDigitalSignatures.hpp>
 #include <com/sun/star/security/XDocumentDigitalSignatures.hpp>
 #include <com/sun/star/text/WritingMode2.hpp>
-#include <rtl/math.hxx>
-#include <rtl/ustrbuf.hxx>
 #include <sal/log.hxx>
-#include <svx/svdtrans.hxx>
 #include <oox/drawingml/shapepropertymap.hxx>
 #include <oox/helper/graphichelper.hxx>
 #include <oox/helper/propertyset.hxx>
@@ -72,14 +64,12 @@
 #include <oox/helper/containerhelper.hxx>
 #include <svx/EnhancedCustomShapeTypeNames.hxx>
 #include <svx/unoapi.hxx>
-#include <svx/svdoashp.hxx>
 #include <svx/sdtagitm.hxx>
-#include <svx/xfillit0.hxx>
+#include <svx/svdobj.hxx>
 #include <comphelper/sequence.hxx>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/propertyvalue.hxx>
 #include <comphelper/storagehelper.hxx>
-#include <vcl/svapp.hxx>
 
 using ::com::sun::star::beans::XPropertySet;
 using ::com::sun::star::uno::Any;
diff --git a/oox/source/vml/vmltextbox.cxx b/oox/source/vml/vmltextbox.cxx
index c4e66bc8f4a5..215966ded6f5 100644
--- a/oox/source/vml/vmltextbox.cxx
+++ b/oox/source/vml/vmltextbox.cxx
@@ -20,7 +20,6 @@
 #include <oox/vml/vmltextbox.hxx>
 
 #include <rtl/ustrbuf.hxx>
-#include <svx/unopage.hxx>
 #include <tools/diagnose_ex.h>
 #include <com/sun/star/awt/FontWeight.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/oox/source/vml/vmltextboxcontext.cxx b/oox/source/vml/vmltextboxcontext.cxx
index 2b90adb14995..d878c6dcdf3d 100644
--- a/oox/source/vml/vmltextboxcontext.cxx
+++ b/oox/source/vml/vmltextboxcontext.cxx
@@ -23,7 +23,6 @@
 #include <oox/vml/vmlshape.hxx>
 #include <oox/token/namespaces.hxx>
 #include <oox/token/tokens.hxx>
-#include <com/sun/star/drawing/XShape.hpp>
 #include <osl/diagnose.h>
 #include <sal/log.hxx>