tdf#42949 Fix IWYU warnings in oox/source/[cd]*/*cxx

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

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

64 files changed, 77 insertions, 190 deletions

diff --git a/oox/IwyuFilter_oox.yaml b/oox/IwyuFilter_oox.yaml
index 8b3931312af3..41091bc9b4eb 100644
--- a/oox/IwyuFilter_oox.yaml
+++ b/oox/IwyuFilter_oox.yaml
@@ -4,3 +4,69 @@ blacklist:
     oox/source/docprop/docprophandler.hxx:
     # Needed for macro defines
     - oox/token/namespaces.hxx
+    oox/source/core/filterbase.cxx:
+    # Actually used
+    - comphelper/scopeguard.hxx
+    oox/source/core/xmlfilterbase.cxx:
+    # Actually used
+    - com/sun/star/xml/sax/XFastSAXSerializable.hpp
+    oox/source/crypto/DocumentEncryption.cxx:
+    # Actually used
+    - com/sun/star/io/XStream.hpp
+    oox/source/crypto/DocumentDecryption.cxx:
+    # Actually used
+    - com/sun/star/beans/NamedValue.hpp
+    - com/sun/star/io/XStream.hpp
+    oox/source/docprop/ooxmldocpropimport.cxx:
+    # Actually used
+    - com/sun/star/embed/XStorage.hpp
+    oox/source/docprop/docprophandler.cxx:
+    # Actually used
+    - boost/algorithm/string.hpp
+    oox/source/drawingml/drawingmltypes.cxx:
+    # Actually used
+    - com/sun/star/drawing/Hatch.hpp
+    - com/sun/star/xml/sax/XFastAttributeList.hpp
+    oox/source/drawingml/customshapeproperties.cxx:
+    # Actually used
+    - com/sun/star/awt/Size.hpp
+    - com/sun/star/beans/XPropertySet.hpp
+    - com/sun/star/drawing/XShape.hpp
+    oox/source/drawingml/lineproperties.cxx:
+    # Actually used
+    - com/sun/star/drawing/LineCap.hpp
+    - com/sun/star/drawing/LineJoint.hpp
+    - com/sun/star/drawing/LineStyle.hpp
+    oox/source/drawingml/shape.cxx:
+    # Actually used
+    - diagram/datamodel.hxx
+    # Needed for direct member access
+    - com/sun/star/xml/dom/XDocument.hpp
+    oox/source/drawingml/textparagraph.cxx:
+    # Actually used
+    - com/sun/star/text/XText.hpp
+    - com/sun/star/text/XTextCursor.hpp
+    oox/source/drawingml/textparagraphproperties.cxx:
+    # Actually used
+    - com/sun/star/graphic/XGraphic.hpp
+    - com/sun/star/style/ParagraphAdjust.hpp
+    oox/source/drawingml/chart/axisconverter.cxx:
+    # Actually used
+    - com/sun/star/chart2/XCoordinateSystem.hpp
+    oox/source/drawingml/chart/chartconverter.cxx:
+    # Actually used
+    - com/sun/star/chart2/XChartDocument.hpp
+    oox/source/drawingml/chart/converterbase.cxx:
+    # Actually used
+    - com/sun/star/chart2/XChartDocument.hpp
+    - com/sun/star/uno/XComponentContext.hpp
+    oox/source/drawingml/chart/titleconverter.cxx:
+    # Actually used
+    - com/sun/star/chart2/XDiagram.hpp
+    - com/sun/star/chart2/XTitled.hpp
+    oox/source/drawingml/chart/typegroupconverter.cxx:
+    # Actually used
+    - com/sun/star/chart2/XCoordinateSystem.hpp
+    oox/source/drawingml/diagram/diagram.cxx:
+    # Actually used
+    - com/sun/star/xml/dom/XDocument.hpp
diff --git a/oox/source/core/binarycodec.cxx b/oox/source/core/binarycodec.cxx
index d257be6dace7..7266e254b570 100644
--- a/oox/source/core/binarycodec.cxx
+++ b/oox/source/core/binarycodec.cxx
@@ -19,8 +19,6 @@
 
 #include <oox/core/binarycodec.hxx>
 
-#include <algorithm>
-#include <string.h>
 #include <oox/helper/attributelist.hxx>
 
 #include <osl/diagnose.h>
diff --git a/oox/source/core/fastparser.cxx b/oox/source/core/fastparser.cxx
index 34246a16548a..9524b1403a90 100644
--- a/oox/source/core/fastparser.cxx
+++ b/oox/source/core/fastparser.cxx
@@ -20,12 +20,10 @@
 #include <sal/config.h>
 
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
-#include <com/sun/star/xml/sax/FastParser.hpp>
 #include <oox/core/fastparser.hxx>
 
 #include <oox/core/fasttokenhandler.hxx>
 #include <oox/helper/containerhelper.hxx>
-#include <oox/helper/helper.hxx>
 #include <oox/helper/storagebase.hxx>
 #include <oox/token/namespacemap.hxx>
 
diff --git a/oox/source/core/fasttokenhandler.cxx b/oox/source/core/fasttokenhandler.cxx
index d6639136b3ca..a57be30e0c2c 100644
--- a/oox/source/core/fasttokenhandler.cxx
+++ b/oox/source/core/fasttokenhandler.cxx
@@ -20,7 +20,6 @@
 #include <oox/core/fasttokenhandler.hxx>
 
 #include <com/sun/star/uno/XComponentContext.hpp>
-#include <oox/helper/helper.hxx>
 #include <oox/token/tokenmap.hxx>
 #include <cppuhelper/supportsservice.hxx>
 
diff --git a/oox/source/core/filterdetect.cxx b/oox/source/core/filterdetect.cxx
index b76ed613d95c..b63d355ed506 100644
--- a/oox/source/core/filterdetect.cxx
+++ b/oox/source/core/filterdetect.cxx
@@ -19,7 +19,6 @@
 
 #include <oox/core/filterdetect.hxx>
 
-#include <com/sun/star/io/TempFile.hpp>
 #include <com/sun/star/io/XStream.hpp>
 #include <comphelper/docpasswordhelper.hxx>
 #include <unotools/mediadescriptor.hxx>
diff --git a/oox/source/core/relations.cxx b/oox/source/core/relations.cxx
index 6f443abcf3b4..90573ba2f9b0 100644
--- a/oox/source/core/relations.cxx
+++ b/oox/source/core/relations.cxx
@@ -19,9 +19,6 @@
 
 #include <oox/core/relations.hxx>
 
-#include <rtl/ustrbuf.hxx>
-#include <oox/helper/helper.hxx>
-
 namespace oox::core {
 
 namespace {
diff --git a/oox/source/core/relationshandler.cxx b/oox/source/core/relationshandler.cxx
index 6e80a0834dab..af6481c3b576 100644
--- a/oox/source/core/relationshandler.cxx
+++ b/oox/source/core/relationshandler.cxx
@@ -19,11 +19,8 @@
 
 #include <sal/config.h>
 
-#include <string_view>
-
 #include <oox/core/relationshandler.hxx>
 
-#include <rtl/ustrbuf.hxx>
 #include <sal/log.hxx>
 #include <oox/helper/attributelist.hxx>
 #include <oox/token/namespaces.hxx>
diff --git a/oox/source/core/xmlfilterbase.cxx b/oox/source/core/xmlfilterbase.cxx
index 281f994d18a8..f59b0cbc5821 100644
--- a/oox/source/core/xmlfilterbase.cxx
+++ b/oox/source/core/xmlfilterbase.cxx
@@ -23,17 +23,12 @@
 #include <set>
 #include <com/sun/star/beans/XPropertyAccess.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/container/XNameContainer.hpp>
+#include <com/sun/star/beans/Pair.hpp>
 #include <com/sun/star/embed/XRelationshipAccess.hpp>
 #include <com/sun/star/frame/XModel.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/xml/sax/InputSource.hpp>
-#include <com/sun/star/xml/sax/XFastParser.hpp>
 #include <com/sun/star/xml/sax/XFastSAXSerializable.hpp>
-#include <com/sun/star/xml/dom/XDocument.hpp>
 #include <com/sun/star/xml/sax/XSAXSerializable.hpp>
 #include <com/sun/star/xml/sax/Writer.hpp>
-#include <com/sun/star/document/XDocumentProperties.hpp>
 #include <o3tl/any.hxx>
 #include <unotools/mediadescriptor.hxx>
 #include <unotools/docinfohelper.hxx>
@@ -48,7 +43,6 @@
 #include <oox/core/fragmenthandler.hxx>
 #include <oox/core/recordparser.hxx>
 #include <oox/core/relationshandler.hxx>
-#include <oox/helper/containerhelper.hxx>
 #include <oox/helper/propertyset.hxx>
 #include <oox/helper/zipstorage.hxx>
 #include <oox/ole/olestorage.hxx>
@@ -66,9 +60,8 @@
 #include <comphelper/ofopxmlhelper.hxx>
 
 #include <oox/crypto/DocumentEncryption.hxx>
-#include <tools/date.hxx>
-#include <tools/datetime.hxx>
 #include <tools/urlobj.hxx>
+#include <com/sun/star/util/Date.hpp>
 #include <com/sun/star/util/Duration.hpp>
 #include <sax/tools/converter.hxx>
 #include <oox/token/namespacemap.hxx>
diff --git a/oox/source/crypto/AgileEngine.cxx b/oox/source/crypto/AgileEngine.cxx
index 5f0f9aab5653..eb2257f94f5f 100644
--- a/oox/source/crypto/AgileEngine.cxx
+++ b/oox/source/crypto/AgileEngine.cxx
@@ -26,9 +26,6 @@
 #include <tools/stream.hxx>
 #include <tools/XmlWriter.hxx>
 
-#include <com/sun/star/io/XSeekable.hpp>
-#include <com/sun/star/io/XStream.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/xml/sax/XFastParser.hpp>
 #include <com/sun/star/xml/sax/XFastTokenHandler.hpp>
 #include <com/sun/star/xml/sax/FastParser.hpp>
diff --git a/oox/source/crypto/CryptTools.cxx b/oox/source/crypto/CryptTools.cxx
index 30832eb6bc16..cc8c5a925b43 100644
--- a/oox/source/crypto/CryptTools.cxx
+++ b/oox/source/crypto/CryptTools.cxx
@@ -9,7 +9,6 @@
  */
 
 #include <oox/crypto/CryptTools.hxx>
-#include <filter/msfilter/mscodec.hxx>
 #include <com/sun/star/uno/RuntimeException.hpp>
 
 #include <config_oox.h>
@@ -23,7 +22,6 @@
 #if USE_TLS_NSS
 #include <nss.h>
 #include <pk11pub.h>
-#include <sechash.h>
 #endif // USE_TLS_NSS
 
 namespace oox::core {
diff --git a/oox/source/crypto/DocumentDecryption.cxx b/oox/source/crypto/DocumentDecryption.cxx
index a90bdada7bc9..1ed26f4d341c 100644
--- a/oox/source/crypto/DocumentDecryption.cxx
+++ b/oox/source/crypto/DocumentDecryption.cxx
@@ -11,11 +11,9 @@
 #include <oox/crypto/DocumentDecryption.hxx>
 
 #include <comphelper/sequenceashashmap.hxx>
-#include <cppuhelper/implbase.hxx>
 
 #include <com/sun/star/beans/NamedValue.hpp>
 #include <com/sun/star/io/XStream.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
 #include <oox/crypto/AgileEngine.hxx>
 #include <oox/crypto/Standard2007Engine.hxx>
 #include <oox/helper/binaryinputstream.hxx>
diff --git a/oox/source/crypto/DocumentEncryption.cxx b/oox/source/crypto/DocumentEncryption.cxx
index 13019246514f..1ea421c8392f 100644
--- a/oox/source/crypto/DocumentEncryption.cxx
+++ b/oox/source/crypto/DocumentEncryption.cxx
@@ -15,7 +15,6 @@
 #include <com/sun/star/io/XStream.hpp>
 #include <com/sun/star/io/XSeekable.hpp>
 
-#include <oox/helper/binaryinputstream.hxx>
 #include <oox/helper/binaryoutputstream.hxx>
 #include <oox/ole/olestorage.hxx>
 
diff --git a/oox/source/crypto/Standard2007Engine.cxx b/oox/source/crypto/Standard2007Engine.cxx
index c3b23aa426d5..0ad782522450 100644
--- a/oox/source/crypto/Standard2007Engine.cxx
+++ b/oox/source/crypto/Standard2007Engine.cxx
@@ -13,7 +13,6 @@
 #include <oox/crypto/CryptTools.hxx>
 #include <oox/helper/binaryinputstream.hxx>
 #include <oox/helper/binaryoutputstream.hxx>
-#include <rtl/digest.h>
 #include <rtl/random.h>
 
 #include <comphelper/hash.hxx>
diff --git a/oox/source/docprop/docprophandler.cxx b/oox/source/docprop/docprophandler.cxx
index 15bf005e84a4..47882a0749de 100644
--- a/oox/source/docprop/docprophandler.cxx
+++ b/oox/source/docprop/docprophandler.cxx
@@ -22,7 +22,6 @@
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/beans/PropertyExistException.hpp>
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
-#include <com/sun/star/lang/Locale.hpp>
 #include <com/sun/star/xml/sax/SAXException.hpp>
 #include <cppuhelper/exc_hlp.hxx>
 
diff --git a/oox/source/docprop/ooxmldocpropimport.cxx b/oox/source/docprop/ooxmldocpropimport.cxx
index 0d64fc6b6f19..8731ecf56897 100644
--- a/oox/source/docprop/ooxmldocpropimport.cxx
+++ b/oox/source/docprop/ooxmldocpropimport.cxx
@@ -30,7 +30,6 @@
 #include <oox/core/fastparser.hxx>
 #include <oox/core/relations.hxx>
 #include <oox/helper/containerhelper.hxx>
-#include <oox/helper/helper.hxx>
 #include "docprophandler.hxx"
 
 #include <cppuhelper/supportsservice.hxx>
diff --git a/oox/source/drawingml/ThemeOverrideFragmentHandler.cxx b/oox/source/drawingml/ThemeOverrideFragmentHandler.cxx
index 45ccbdf44804..1be56980cff8 100644
--- a/oox/source/drawingml/ThemeOverrideFragmentHandler.cxx
+++ b/oox/source/drawingml/ThemeOverrideFragmentHandler.cxx
@@ -10,7 +10,6 @@
 #include <drawingml/ThemeOverrideFragmentHandler.hxx>
 #include <oox/drawingml/theme.hxx>
 #include <oox/token/namespaces.hxx>
-#include <oox/token/tokens.hxx>
 #include <drawingml/themeelementscontext.hxx>
 
 using namespace ::oox::core;
diff --git a/oox/source/drawingml/chart/chartspaceconverter.cxx b/oox/source/drawingml/chart/chartspaceconverter.cxx
index 9ea5d8a6c97f..342b6190a67d 100644
--- a/oox/source/drawingml/chart/chartspaceconverter.cxx
+++ b/oox/source/drawingml/chart/chartspaceconverter.cxx
@@ -28,13 +28,10 @@
 #include <com/sun/star/chart2/XDataSeriesContainer.hpp>
 #include <com/sun/star/chart2/XTitled.hpp>
 #include <com/sun/star/drawing/XDrawPageSupplier.hpp>
-#include <com/sun/star/drawing/FillStyle.hpp>
 #include <oox/core/xmlfilterbase.hxx>
 #include <oox/drawingml/chart/chartconverter.hxx>
-#include <oox/token/namespaces.hxx>
 #include <oox/token/properties.hxx>
 #include <oox/token/tokens.hxx>
-#include <oox/helper/graphichelper.hxx>
 #include <drawingml/chart/chartdrawingfragment.hxx>
 #include <drawingml/chart/chartspacemodel.hxx>
 #include <drawingml/chart/plotareaconverter.hxx>
diff --git a/oox/source/drawingml/chart/converterbase.cxx b/oox/source/drawingml/chart/converterbase.cxx
index 31b31083ab25..46494ebd8d8f 100644
--- a/oox/source/drawingml/chart/converterbase.cxx
+++ b/oox/source/drawingml/chart/converterbase.cxx
@@ -27,17 +27,13 @@
 #include <com/sun/star/chart2/XChartDocument.hpp>
 #include <com/sun/star/chart2/RelativePosition.hpp>
 #include <com/sun/star/chart2/RelativeSize.hpp>
-#include <com/sun/star/drawing/FillStyle.hpp>
-#include <com/sun/star/drawing/LineStyle.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <osl/diagnose.h>
 #include <basegfx/numeric/ftools.hxx>
 #include <oox/core/xmlfilterbase.hxx>
-#include <oox/drawingml/theme.hxx>
 #include <oox/token/properties.hxx>
 #include <oox/token/tokens.hxx>
-#include <comphelper/processfactory.hxx>
 
 
 namespace oox::drawingml::chart {
diff --git a/oox/source/drawingml/chart/datasourcecontext.cxx b/oox/source/drawingml/chart/datasourcecontext.cxx
index 9c69b723ec8c..7ad910af65d4 100644
--- a/oox/source/drawingml/chart/datasourcecontext.cxx
+++ b/oox/source/drawingml/chart/datasourcecontext.cxx
@@ -21,7 +21,6 @@
 
 #include <oox/drawingml/chart/datasourcemodel.hxx>
 
-#include <comphelper/processfactory.hxx>
 #include <oox/core/xmlfilterbase.hxx>
 #include <oox/helper/attributelist.hxx>
 #include <oox/token/namespaces.hxx>
diff --git a/oox/source/drawingml/chart/plotareacontext.cxx b/oox/source/drawingml/chart/plotareacontext.cxx
index f4a9dc9d4102..76f7c7ef1956 100644
--- a/oox/source/drawingml/chart/plotareacontext.cxx
+++ b/oox/source/drawingml/chart/plotareacontext.cxx
@@ -23,7 +23,6 @@
 #include <drawingml/chart/axiscontext.hxx>
 #include <drawingml/chart/plotareamodel.hxx>
 #include <drawingml/chart/seriescontext.hxx>
-#include <drawingml/chart/titlecontext.hxx>
 #include <drawingml/chart/typegroupcontext.hxx>
 #include <oox/core/xmlfilterbase.hxx>
 #include <oox/helper/attributelist.hxx>
diff --git a/oox/source/drawingml/chart/seriesconverter.cxx b/oox/source/drawingml/chart/seriesconverter.cxx
index 61ee198d006f..6ade0b4cfd07 100644
--- a/oox/source/drawingml/chart/seriesconverter.cxx
+++ b/oox/source/drawingml/chart/seriesconverter.cxx
@@ -31,10 +31,7 @@
 #include <com/sun/star/chart2/XRegressionCurveContainer.hpp>
 #include <com/sun/star/chart2/data/XDataSink.hpp>
 #include <com/sun/star/chart2/data/LabeledDataSequence.hpp>
-#include <com/sun/star/chart2/XFormattedString2.hpp>
-#include <com/sun/star/chart2/FormattedString.hpp>
 #include <osl/diagnose.h>
-#include <basegfx/numeric/ftools.hxx>
 #include <drawingml/chart/datasourceconverter.hxx>
 #include <drawingml/chart/seriesmodel.hxx>
 #include <drawingml/chart/titleconverter.hxx>
@@ -42,8 +39,6 @@
 #include <drawingml/chart/typegroupmodel.hxx>
 #include <oox/core/xmlfilterbase.hxx>
 #include <oox/helper/containerhelper.hxx>
-#include <oox/helper/attributelist.hxx>
-#include <oox/token/namespaces.hxx>
 #include <oox/token/properties.hxx>
 #include <oox/token/tokens.hxx>
 #include <drawingml/lineproperties.hxx>
diff --git a/oox/source/drawingml/chart/titlecontext.cxx b/oox/source/drawingml/chart/titlecontext.cxx
index 955fc2ac50be..f62d8ced995f 100644
--- a/oox/source/drawingml/chart/titlecontext.cxx
+++ b/oox/source/drawingml/chart/titlecontext.cxx
@@ -28,7 +28,6 @@
 #include <oox/token/namespaces.hxx>
 #include <oox/token/tokens.hxx>
 
-#include <rtl/ustrbuf.hxx>
 #include <osl/diagnose.h>
 
 
diff --git a/oox/source/drawingml/chart/typegroupcontext.cxx b/oox/source/drawingml/chart/typegroupcontext.cxx
index b41169229451..96c4d6fc2bfc 100644
--- a/oox/source/drawingml/chart/typegroupcontext.cxx
+++ b/oox/source/drawingml/chart/typegroupcontext.cxx
@@ -24,7 +24,6 @@
 #include <oox/core/xmlfilterbase.hxx>
 #include <oox/helper/attributelist.hxx>
 #include <oox/token/namespaces.hxx>
-#include <oox/token/properties.hxx>
 #include <oox/token/tokens.hxx>
 
 namespace oox::drawingml::chart {
diff --git a/oox/source/drawingml/connectorshapecontext.cxx b/oox/source/drawingml/connectorshapecontext.cxx
index 7e5a4b516c9d..e815d56994d9 100644
--- a/oox/source/drawingml/connectorshapecontext.cxx
+++ b/oox/source/drawingml/connectorshapecontext.cxx
@@ -19,24 +19,18 @@
 
 #include <com/sun/star/xml/sax/FastToken.hpp>
 #include <com/sun/star/beans/XMultiPropertySet.hpp>
-#include <com/sun/star/container/XNamed.hpp>
 
 #include <oox/drawingml/connectorshapecontext.hxx>
-#include <oox/drawingml/graphicshapecontext.hxx>
-#include <drawingml/lineproperties.hxx>
 #include <oox/drawingml/drawingmltypes.hxx>
 #include <oox/helper/attributelist.hxx>
 #include <oox/token/namespaces.hxx>
 #include <oox/token/tokens.hxx>
-#include <drawingml/customshapegeometry.hxx>
-#include <drawingml/textbodycontext.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::drawingml {
diff --git a/oox/source/drawingml/customshapegeometry.cxx b/oox/source/drawingml/customshapegeometry.cxx
index d77ae8a618d6..c24f35abd4e9 100644
--- a/oox/source/drawingml/customshapegeometry.cxx
+++ b/oox/source/drawingml/customshapegeometry.cxx
@@ -27,7 +27,6 @@
 #include <sal/log.hxx>
 #include <oox/helper/helper.hxx>
 #include <oox/helper/attributelist.hxx>
-#include <oox/helper/propertymap.hxx>
 #include <oox/token/namespaces.hxx>
 #include <oox/token/tokens.hxx>
 #include <unordered_map>
diff --git a/oox/source/drawingml/diagram/datamodel.cxx b/oox/source/drawingml/diagram/datamodel.cxx
index 3a090c1276d8..469f404367f6 100644
--- a/oox/source/drawingml/diagram/datamodel.cxx
+++ b/oox/source/drawingml/diagram/datamodel.cxx
@@ -20,18 +20,14 @@
 #include "datamodel.hxx"
 #include <rtl/ustrbuf.hxx>
 #include <sal/log.hxx>
-#include <drawingml/customshapeproperties.hxx>
 #include <drawingml/fillproperties.hxx>
 #include <drawingml/textbody.hxx>
 #include <drawingml/textparagraph.hxx>
 #include <drawingml/textrun.hxx>
 #include <oox/drawingml/shape.hxx>
-#include <oox/token/namespaces.hxx>
-#include <svx/DiagramDataInterface.hxx>
 #include <comphelper/xmltools.hxx>
 
 #include <unordered_set>
-#include <iostream>
 #include <fstream>
 
 using namespace ::com::sun::star;
diff --git a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
index 41f38b744d1b..71e9f1970aa6 100644
--- a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
+++ b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
@@ -32,7 +32,6 @@
 #include <drawingml/textparagraph.hxx>
 #include <drawingml/textrun.hxx>
 #include <drawingml/customshapeproperties.hxx>
-#include <tools/gen.hxx>
 #include <com/sun/star/drawing/TextFitToSizeType.hpp>
 
 using namespace ::com::sun::star;
diff --git a/oox/source/drawingml/diagram/layoutnodecontext.cxx b/oox/source/drawingml/diagram/layoutnodecontext.cxx
index 06973178a0c7..944f8dc6e390 100644
--- a/oox/source/drawingml/diagram/layoutnodecontext.cxx
+++ b/oox/source/drawingml/diagram/layoutnodecontext.cxx
@@ -22,7 +22,6 @@
 #include <oox/helper/attributelist.hxx>
 #include <oox/drawingml/shapecontext.hxx>
 #include <drawingml/customshapeproperties.hxx>
-#include "diagramdefinitioncontext.hxx"
 #include "constraintlistcontext.hxx"
 #include <oox/token/namespaces.hxx>
 #include <oox/token/tokens.hxx>
diff --git a/oox/source/drawingml/effectproperties.cxx b/oox/source/drawingml/effectproperties.cxx
index e4e9eaddcb32..a090f700a734 100644
--- a/oox/source/drawingml/effectproperties.cxx
+++ b/oox/source/drawingml/effectproperties.cxx
@@ -9,10 +9,8 @@
 
 #include "effectproperties.hxx"
 #include <oox/drawingml/drawingmltypes.hxx>
-#include <oox/drawingml/shapepropertymap.hxx>
 #include <oox/helper/graphichelper.hxx>
 #include <oox/token/properties.hxx>
-#include <oox/token/tokens.hxx>
 
 #include <basegfx/numeric/ftools.hxx>
 
diff --git a/oox/source/drawingml/effectpropertiescontext.cxx b/oox/source/drawingml/effectpropertiescontext.cxx
index 6424e99d8458..982fa9f00bd3 100644
--- a/oox/source/drawingml/effectpropertiescontext.cxx
+++ b/oox/source/drawingml/effectpropertiescontext.cxx
@@ -9,14 +9,11 @@
 
 #include "effectpropertiescontext.hxx"
 #include "effectproperties.hxx"
-#include <oox/drawingml/drawingmltypes.hxx>
-#include <drawingml/misccontexts.hxx>
+#include <drawingml/colorchoicecontext.hxx>
 #include <oox/helper/attributelist.hxx>
 #include <oox/token/namespaces.hxx>
 #include <oox/token/tokens.hxx>
 
-#include <sal/log.hxx>
-
 using namespace ::oox::core;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::xml::sax;
diff --git a/oox/source/drawingml/fillproperties.cxx b/oox/source/drawingml/fillproperties.cxx
index 3574d9054cc1..c8cc88f7b470 100644
--- a/oox/source/drawingml/fillproperties.cxx
+++ b/oox/source/drawingml/fillproperties.cxx
@@ -23,26 +23,22 @@
 
 #include <drawingml/graphicproperties.hxx>
 
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/awt/Gradient.hpp>
 #include <com/sun/star/text/GraphicCrop.hpp>
 #include <com/sun/star/awt/Size.hpp>
-#include <com/sun/star/awt/XBitmap.hpp>
 #include <com/sun/star/drawing/BitmapMode.hpp>
 #include <com/sun/star/drawing/ColorMode.hpp>
 #include <com/sun/star/drawing/FillStyle.hpp>
 #include <com/sun/star/drawing/Hatch.hpp>
 #include <com/sun/star/drawing/RectanglePoint.hpp>
 #include <com/sun/star/graphic/XGraphicTransformer.hpp>
-#include <oox/core/fragmenthandler.hxx>
 #include <oox/helper/graphichelper.hxx>
 #include <oox/drawingml/drawingmltypes.hxx>
 #include <oox/drawingml/shapepropertymap.hxx>
 #include <oox/token/namespaces.hxx>
 #include <oox/token/properties.hxx>
 #include <oox/token/tokens.hxx>
-#include <rtl/math.hxx>
 #include <osl/diagnose.h>
 #include <sal/log.hxx>
 
diff --git a/oox/source/drawingml/graphicshapecontext.cxx b/oox/source/drawingml/graphicshapecontext.cxx
index 0b81825086c8..39a090bf43c4 100644
--- a/oox/source/drawingml/graphicshapecontext.cxx
+++ b/oox/source/drawingml/graphicshapecontext.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <com/sun/star/io/TempFile.hpp>
 #include <oox/drawingml/graphicshapecontext.hxx>
 
 #include <osl/diagnose.h>
@@ -31,15 +30,8 @@
 #include <drawingml/table/tablecontext.hxx>
 #include <oox/core/xmlfilterbase.hxx>
 #include <oox/helper/attributelist.hxx>
-#include <oox/helper/graphichelper.hxx>
-#include <oox/helper/propertyset.hxx>
 #include <oox/vml/vmldrawing.hxx>
-#include <oox/vml/vmlshape.hxx>
-#include <oox/vml/vmlshapecontainer.hxx>
-#include <drawingml/fillproperties.hxx>
 #include <drawingml/transform2dcontext.hxx>
-#include <oox/helper/binaryinputstream.hxx>
-#include <oox/helper/binaryoutputstream.hxx>
 #include <oox/ppt/pptshapegroupcontext.hxx>
 #include <oox/token/namespaces.hxx>
 #include <oox/token/tokens.hxx>
diff --git a/oox/source/drawingml/hyperlinkcontext.cxx b/oox/source/drawingml/hyperlinkcontext.cxx
index c58e8fb9b7e5..3c19892815d4 100644
--- a/oox/source/drawingml/hyperlinkcontext.cxx
+++ b/oox/source/drawingml/hyperlinkcontext.cxx
@@ -21,13 +21,13 @@
 
 #include <com/sun/star/xml/sax/XFastContextHandler.hpp>
 
+#include <oox/helper/attributelist.hxx>
 #include <oox/helper/propertymap.hxx>
 #include <oox/core/relations.hxx>
 #include <oox/core/xmlfilterbase.hxx>
 #include <oox/token/namespaces.hxx>
 #include <oox/token/properties.hxx>
 #include <oox/token/tokens.hxx>
-#include <drawingml/embeddedwavaudiofile.hxx>
 
 using namespace ::oox::core;
 using namespace ::com::sun::star::uno;
diff --git a/oox/source/drawingml/lineproperties.cxx b/oox/source/drawingml/lineproperties.cxx
index 90f79f760cae..8b6418f995e4 100644
--- a/oox/source/drawingml/lineproperties.cxx
+++ b/oox/source/drawingml/lineproperties.cxx
@@ -18,16 +18,13 @@
  */
 
 #include <drawingml/lineproperties.hxx>
-#include <vector>
 #include <rtl/ustrbuf.hxx>
 #include <osl/diagnose.h>
 #include <com/sun/star/beans/NamedValue.hpp>
-#include <com/sun/star/drawing/FlagSequence.hpp>
 #include <com/sun/star/drawing/LineCap.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/PointSequence.hpp>
 #include <com/sun/star/drawing/PolyPolygonBezierCoords.hpp>
 #include <oox/drawingml/drawingmltypes.hxx>
 #include <oox/drawingml/shapepropertymap.hxx>
diff --git a/oox/source/drawingml/linepropertiescontext.cxx b/oox/source/drawingml/linepropertiescontext.cxx
index 6b04bcd42210..dd9af49bf2db 100644
--- a/oox/source/drawingml/linepropertiescontext.cxx
+++ b/oox/source/drawingml/linepropertiescontext.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <drawingml/linepropertiescontext.hxx>
-#include <oox/drawingml/drawingmltypes.hxx>
 #include <drawingml/misccontexts.hxx>
 #include <drawingml/lineproperties.hxx>
 #include <oox/helper/attributelist.hxx>
diff --git a/oox/source/drawingml/misccontexts.cxx b/oox/source/drawingml/misccontexts.cxx
index 7ee6d25911f3..9e1fa739400c 100644
--- a/oox/source/drawingml/misccontexts.cxx
+++ b/oox/source/drawingml/misccontexts.cxx
@@ -25,9 +25,8 @@
 #include <drawingml/fillproperties.hxx>
 #include <oox/token/namespaces.hxx>
 #include <oox/token/tokens.hxx>
-#include <sfx2/docfile.hxx>
-#include <vcl/GraphicLoader.hxx>
 #include <vcl/GraphicExternalLink.hxx>
+#include <vcl/graph.hxx>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
diff --git a/oox/source/drawingml/objectdefaultcontext.cxx b/oox/source/drawingml/objectdefaultcontext.cxx
index 8466b353accc..bdb30090eb69 100644
--- a/oox/source/drawingml/objectdefaultcontext.cxx
+++ b/oox/source/drawingml/objectdefaultcontext.cxx
@@ -21,7 +21,6 @@
 #include <drawingml/spdefcontext.hxx>
 #include <oox/drawingml/theme.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/drawingml/presetgeometrynames.cxx b/oox/source/drawingml/presetgeometrynames.cxx
index dea972dc1476..d9f71c3c59e1 100644
--- a/oox/source/drawingml/presetgeometrynames.cxx
+++ b/oox/source/drawingml/presetgeometrynames.cxx
@@ -7,7 +7,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <osl/mutex.hxx>
 #include <rtl/string.hxx>
 #include <rtl/ustring.hxx>
 #include <unordered_map>
diff --git a/oox/source/drawingml/scene3dcontext.cxx b/oox/source/drawingml/scene3dcontext.cxx
index 3e99c8adc504..262d2dfe61ea 100644
--- a/oox/source/drawingml/scene3dcontext.cxx
+++ b/oox/source/drawingml/scene3dcontext.cxx
@@ -18,12 +18,7 @@
  */
 
 #include <drawingml/scene3dcontext.hxx>
-#include <com/sun/star/io/XInputStream.hpp>
-#include <cppuhelper/exc_hlp.hxx>
 #include <drawingml/colorchoicecontext.hxx>
-#include <oox/drawingml/drawingmltypes.hxx>
-#include <drawingml/fillproperties.hxx>
-#include <oox/core/xmlfilterbase.hxx>
 #include <oox/helper/attributelist.hxx>
 #include <oox/token/namespaces.hxx>
 #include <oox/token/tokens.hxx>
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index 1c307ff38371..2b2cec3debbf 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -22,9 +22,9 @@
 #include <oox/drawingml/theme.hxx>
 #include <drawingml/fillproperties.hxx>
 #include <drawingml/graphicproperties.hxx>
-#include <drawingml/scene3dcontext.hxx>
 #include <drawingml/lineproperties.hxx>
 #include <drawingml/presetgeometrynames.hxx>
+#include <drawingml/shape3dproperties.hxx>
 #include "effectproperties.hxx"
 #include <oox/drawingml/shapepropertymap.hxx>
 #include <drawingml/textbody.hxx>
@@ -46,7 +46,7 @@
 #include <oox/mathml/importutils.hxx>
 #include <oox/mathml/import.hxx>
 #include <oox/token/properties.hxx>
-#include "diagram/diagram.hxx"
+#include "diagram/datamodel.hxx"
 
 #include <comphelper/classids.hxx>
 #include <comphelper/propertysequence.hxx>
@@ -62,12 +62,10 @@
 #include <com/sun/star/awt/FontWeight.hpp>
 #include <com/sun/star/graphic/XGraphic.hpp>
 #include <com/sun/star/container/XNamed.hpp>
-#include <com/sun/star/container/XNameContainer.hpp>
-#include <com/sun/star/beans/XMultiPropertySet.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/xml/AttributeData.hpp>
 #include <com/sun/star/xml/dom/XDocument.hpp>
 #include <com/sun/star/xml/sax/XFastSAXSerializable.hpp>
+#include <com/sun/star/drawing/FillStyle.hpp>
 #include <com/sun/star/drawing/HomogenMatrix3.hpp>
 #include <com/sun/star/drawing/TextVerticalAdjust.hpp>
 #include <com/sun/star/drawing/GraphicExportFilter.hpp>
@@ -87,8 +85,8 @@
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <com/sun/star/document/XActionLockable.hpp>
 #include <com/sun/star/chart2/data/XDataReceiver.hpp>
-#include <svl/outstrm.hxx>
 #include <svx/svdtrans.hxx>
+#include <tools/stream.hxx>
 #include <unotools/streamwrap.hxx>
 #include <unotools/fltrcfg.hxx>
 #include <vcl/graph.hxx>
@@ -98,11 +96,7 @@
 #include <sal/log.hxx>
 #include <svx/unoapi.hxx>
 #include <svx/unoshape.hxx>
-#include <svx/xfillit0.hxx>
 #include <svx/sdtaitm.hxx>
-#include <svx/DiagramDataInterface.hxx>
-
-#include <vcl/wmf.hxx>
 
 using namespace ::oox::core;
 using namespace ::com::sun::star;
diff --git a/oox/source/drawingml/shape3dproperties.cxx b/oox/source/drawingml/shape3dproperties.cxx
index 8045b27660a4..ceb3b2f15dbe 100644
--- a/oox/source/drawingml/shape3dproperties.cxx
+++ b/oox/source/drawingml/shape3dproperties.cxx
@@ -18,18 +18,8 @@
  */
 
 #include <drawingml/shape3dproperties.hxx>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/awt/Gradient.hpp>
-#include <com/sun/star/awt/Size.hpp>
-#include <com/sun/star/awt/XBitmap.hpp>
-#include <com/sun/star/awt/XDevice.hpp>
 #include <com/sun/star/drawing/BitmapMode.hpp>
-#include <com/sun/star/drawing/FillStyle.hpp>
-#include <com/sun/star/drawing/RectanglePoint.hpp>
 #include <com/sun/star/graphic/XGraphicTransformer.hpp>
-#include <oox/helper/propertymap.hxx>
-#include <oox/helper/propertyset.hxx>
 #include <oox/token/tokens.hxx>
 #include <sal/log.hxx>
 
diff --git a/oox/source/drawingml/shapecontext.cxx b/oox/source/drawingml/shapecontext.cxx
index d32e448c6227..c6ee29a9f89e 100644
--- a/oox/source/drawingml/shapecontext.cxx
+++ b/oox/source/drawingml/shapecontext.cxx
@@ -20,17 +20,12 @@
 #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/drawingml/shapecontext.hxx>
 #include <drawingml/shapepropertiescontext.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/textbodypropertiescontext.hxx>
 #include "hyperlinkcontext.hxx"
diff --git a/oox/source/drawingml/shapegroupcontext.cxx b/oox/source/drawingml/shapegroupcontext.cxx
index 24ff3ec36943..84fc719f0e50 100644
--- a/oox/source/drawingml/shapegroupcontext.cxx
+++ b/oox/source/drawingml/shapegroupcontext.cxx
@@ -19,17 +19,13 @@
 
 #include <com/sun/star/xml/sax/FastToken.hpp>
 #include <com/sun/star/beans/XMultiPropertySet.hpp>
-#include <com/sun/star/container/XNamed.hpp>
 
 #include <oox/helper/attributelist.hxx>
 #include <oox/drawingml/shapegroupcontext.hxx>
 #include <oox/drawingml/connectorshapecontext.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/token/namespaces.hxx>
 #include <oox/token/tokens.hxx>
 #include <sal/log.hxx>
@@ -39,7 +35,6 @@ 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::drawingml {
diff --git a/oox/source/drawingml/shapepropertiescontext.cxx b/oox/source/drawingml/shapepropertiescontext.cxx
index 0b6956ef87c3..bbe621786742 100644
--- a/oox/source/drawingml/shapepropertiescontext.cxx
+++ b/oox/source/drawingml/shapepropertiescontext.cxx
@@ -19,12 +19,6 @@
 
 #include <drawingml/shapepropertiescontext.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 <drawingml/scene3dcontext.hxx>
 #include <drawingml/linepropertiescontext.hxx>
 #include <drawingml/misccontexts.hxx>
diff --git a/oox/source/drawingml/spdefcontext.cxx b/oox/source/drawingml/spdefcontext.cxx
index 68b169919780..3697bdfe8578 100644
--- a/oox/source/drawingml/spdefcontext.cxx
+++ b/oox/source/drawingml/spdefcontext.cxx
@@ -23,7 +23,6 @@
 #include <drawingml/textbodypropertiescontext.hxx>
 #include <drawingml/textliststylecontext.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/drawingml/table/tablecell.cxx b/oox/source/drawingml/table/tablecell.cxx
index 01d1fe7f1d96..c2deb715048e 100644
--- a/oox/source/drawingml/table/tablecell.cxx
+++ b/oox/source/drawingml/table/tablecell.cxx
@@ -25,19 +25,12 @@
 #include <oox/drawingml/theme.hxx>
 #include <oox/core/xmlfilterbase.hxx>
 #include <oox/helper/propertyset.hxx>
-#include <oox/token/namespaces.hxx>
 #include <oox/token/properties.hxx>
 #include <oox/token/tokens.hxx>
 #include <tools/color.hxx>
-#include <com/sun/star/container/XNameContainer.hpp>
-#include <com/sun/star/beans/XMultiPropertySet.hpp>
-#include <com/sun/star/table/XTable.hpp>
-#include <com/sun/star/table/XMergeableCellRange.hpp>
 #include <com/sun/star/table/BorderLineStyle.hpp>
 #include <com/sun/star/table/BorderLine2.hpp>
-#include <com/sun/star/drawing/LineStyle.hpp>
 #include <com/sun/star/drawing/TextVerticalAdjust.hpp>
-#include <com/sun/star/drawing/TextHorizontalAdjust.hpp>
 #include <com/sun/star/text/XText.hpp>
 #include <com/sun/star/text/WritingMode.hpp>
 
diff --git a/oox/source/drawingml/table/tablecontext.cxx b/oox/source/drawingml/table/tablecontext.cxx
index f84bad88782f..bbfc94845369 100644
--- a/oox/source/drawingml/table/tablecontext.cxx
+++ b/oox/source/drawingml/table/tablecontext.cxx
@@ -18,8 +18,8 @@
  */
 
 #include <oox/helper/attributelist.hxx>
+#include <drawingml/colorchoicecontext.hxx>
 #include <drawingml/guidcontext.hxx>
-#include <drawingml/misccontexts.hxx>
 #include <drawingml/table/tablecontext.hxx>
 #include <drawingml/table/tableproperties.hxx>
 #include <drawingml/table/tablestylecontext.hxx>
diff --git a/oox/source/drawingml/table/tablepartstylecontext.cxx b/oox/source/drawingml/table/tablepartstylecontext.cxx
index 4438c9a43e1f..2d97173223cc 100644
--- a/oox/source/drawingml/table/tablepartstylecontext.cxx
+++ b/oox/source/drawingml/table/tablepartstylecontext.cxx
@@ -22,7 +22,6 @@
 #include <drawingml/table/tablestyletextstylecontext.hxx>
 #include <drawingml/table/tablestylecellstylecontext.hxx>
 #include <oox/token/namespaces.hxx>
-#include <oox/token/tokens.hxx>
 
 using namespace ::oox::core;
 using namespace ::com::sun::star;
diff --git a/oox/source/drawingml/table/tableproperties.cxx b/oox/source/drawingml/table/tableproperties.cxx
index 47c9cefe7c9f..1c59b4ef47f2 100644
--- a/oox/source/drawingml/table/tableproperties.cxx
+++ b/oox/source/drawingml/table/tableproperties.cxx
@@ -23,15 +23,9 @@
 #include <drawingml/textparagraph.hxx>
 #include <oox/drawingml/drawingmltypes.hxx>
 #include <com/sun/star/table/XTable.hpp>
-#include <com/sun/star/container/XNameContainer.hpp>
-#include <com/sun/star/beans/XMultiPropertySet.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/table/XMergeableCellRange.hpp>
-#include <com/sun/star/table/BorderLine2.hpp>
 #include <rtl/instance.hxx>
 #include <oox/core/xmlfilterbase.hxx>
-#include <oox/helper/propertyset.hxx>
-#include <oox/token/tokens.hxx>
 #include "predefined-table-styles.cxx"
 
 using namespace ::oox::core;
diff --git a/oox/source/drawingml/table/tablerow.cxx b/oox/source/drawingml/table/tablerow.cxx
index 51ad03c8f614..a45e9a7ac302 100644
--- a/oox/source/drawingml/table/tablerow.cxx
+++ b/oox/source/drawingml/table/tablerow.cxx
@@ -18,13 +18,6 @@
  */
 
 #include <drawingml/table/tablerow.hxx>
-#include <oox/drawingml/drawingmltypes.hxx>
-#include <com/sun/star/container/XNameContainer.hpp>
-#include <com/sun/star/beans/XMultiPropertySet.hpp>
-#include <oox/helper/propertyset.hxx>
-#include <com/sun/star/table/XTable.hpp>
-#include <com/sun/star/table/XMergeableCellRange.hpp>
-#include <com/sun/star/table/BorderLine2.hpp>
 
 using namespace ::oox::core;
 using namespace ::com::sun::star;
diff --git a/oox/source/drawingml/textbody.cxx b/oox/source/drawingml/textbody.cxx
index 4c3564b4d63b..e013a5069b80 100644
--- a/oox/source/drawingml/textbody.cxx
+++ b/oox/source/drawingml/textbody.cxx
@@ -18,8 +18,6 @@
  */
 
 #include <drawingml/textbody.hxx>
-#include <com/sun/star/text/XText.hpp>
-#include <com/sun/star/text/XTextCursor.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <drawingml/textparagraph.hxx>
 #include <oox/helper/propertyset.hxx>
diff --git a/oox/source/drawingml/textbodycontext.cxx b/oox/source/drawingml/textbodycontext.cxx
index 32b08575bc8a..f4c33f7253e0 100644
--- a/oox/source/drawingml/textbodycontext.cxx
+++ b/oox/source/drawingml/textbodycontext.cxx
@@ -27,7 +27,6 @@
 #include <drawingml/textfieldcontext.hxx>
 #include <oox/drawingml/shape.hxx>
 #include <oox/token/namespaces.hxx>
-#include <oox/token/tokens.hxx>
 
 #include <oox/mathml/import.hxx>
 
diff --git a/oox/source/drawingml/textbodyproperties.cxx b/oox/source/drawingml/textbodyproperties.cxx
index 97f6a5eee74f..94163ce10c8b 100644
--- a/oox/source/drawingml/textbodyproperties.cxx
+++ b/oox/source/drawingml/textbodyproperties.cxx
@@ -19,7 +19,6 @@
 
 #include <com/sun/star/text/WritingMode.hpp>
 #include <com/sun/star/drawing/TextHorizontalAdjust.hpp>
-#include <oox/drawingml/drawingmltypes.hxx>
 #include <drawingml/textbodyproperties.hxx>
 #include <oox/token/properties.hxx>
 #include <oox/token/tokens.hxx>
diff --git a/oox/source/drawingml/textbodypropertiescontext.cxx b/oox/source/drawingml/textbodypropertiescontext.cxx
index 6118fffa2543..c70b50273b2f 100644
--- a/oox/source/drawingml/textbodypropertiescontext.cxx
+++ b/oox/source/drawingml/textbodypropertiescontext.cxx
@@ -22,8 +22,6 @@
 #include <com/sun/star/text/WritingMode.hpp>
 #include <com/sun/star/drawing/TextFitToSizeType.hpp>
 #include <com/sun/star/drawing/TextHorizontalAdjust.hpp>
-#include <com/sun/star/drawing/XEnhancedCustomShapeDefaulter.hpp>
-#include <com/sun/star/drawing/CircleKind.hpp>
 #include <drawingml/textbodyproperties.hxx>
 #include <drawingml/textbody.hxx>
 #include <drawingml/customshapegeometry.hxx>
@@ -34,11 +32,6 @@
 #include <oox/token/namespaces.hxx>
 #include <oox/token/properties.hxx>
 #include <oox/token/tokens.hxx>
-#include <svx/EnhancedCustomShapeGeometry.hxx>
-#include <comphelper/propertysequence.hxx>
-#include <comphelper/propertyvalue.hxx>
-#include <comphelper/processfactory.hxx>
-#include <comphelper/sequence.hxx>
 
 using namespace ::oox::core;
 using namespace ::com::sun::star;
diff --git a/oox/source/drawingml/textcharacterpropertiescontext.cxx b/oox/source/drawingml/textcharacterpropertiescontext.cxx
index 2fe7a267bbec..a126c258cd11 100644
--- a/oox/source/drawingml/textcharacterpropertiescontext.cxx
+++ b/oox/source/drawingml/textcharacterpropertiescontext.cxx
@@ -20,13 +20,10 @@
 #include <drawingml/textcharacterpropertiescontext.hxx>
 
 #include <oox/helper/attributelist.hxx>
-#include <oox/drawingml/drawingmltypes.hxx>
 #include <drawingml/colorchoicecontext.hxx>
 #include <drawingml/misccontexts.hxx>
+#include <drawingml/textcharacterproperties.hxx>
 #include <drawingml/texteffectscontext.hxx>
-#include <drawingml/lineproperties.hxx>
-#include <drawingml/textparagraphproperties.hxx>
-#include <oox/core/relations.hxx>
 #include "hyperlinkcontext.hxx"
 #include <oox/token/namespaces.hxx>
 #include <oox/token/tokens.hxx>
diff --git a/oox/source/drawingml/texteffectscontext.cxx b/oox/source/drawingml/texteffectscontext.cxx
index 8b42d2061379..e380b6425413 100644
--- a/oox/source/drawingml/texteffectscontext.cxx
+++ b/oox/source/drawingml/texteffectscontext.cxx
@@ -11,7 +11,6 @@
 #include <drawingml/texteffectscontext.hxx>
 #include <oox/helper/attributelist.hxx>
 #include <oox/token/namespaces.hxx>
-#include <oox/token/tokens.hxx>
 
 #include <map>
 
diff --git a/oox/source/drawingml/textfield.cxx b/oox/source/drawingml/textfield.cxx
index 8d22d0f57161..ad1d9e61e399 100644
--- a/oox/source/drawingml/textfield.cxx
+++ b/oox/source/drawingml/textfield.cxx
@@ -19,11 +19,8 @@
 
 #include <drawingml/textfield.hxx>
 
-#include <list>
-
 #include <rtl/ustring.hxx>
 #include <rtl/string.hxx>
-#include <sal/log.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/text/XTextField.hpp>
diff --git a/oox/source/drawingml/textliststylecontext.cxx b/oox/source/drawingml/textliststylecontext.cxx
index 25323c314016..c1d865b2adc9 100644
--- a/oox/source/drawingml/textliststylecontext.cxx
+++ b/oox/source/drawingml/textliststylecontext.cxx
@@ -21,7 +21,6 @@
 #include <drawingml/textparagraphpropertiescontext.hxx>
 #include <oox/helper/attributelist.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/drawingml/textparagraphproperties.cxx b/oox/source/drawingml/textparagraphproperties.cxx
index 37cf3394411f..9a0a4bc6319d 100644
--- a/oox/source/drawingml/textparagraphproperties.cxx
+++ b/oox/source/drawingml/textparagraphproperties.cxx
@@ -28,21 +28,17 @@
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/style/NumberingType.hpp>
 #include <com/sun/star/style/TabStop.hpp>
-#include <com/sun/star/text/PositionAndSpaceMode.hpp>
 #include <com/sun/star/style/ParagraphAdjust.hpp>
 #include <com/sun/star/drawing/XDrawPage.hpp>
 
 #include <osl/diagnose.h>
 
-#include <oox/helper/helper.hxx>
 #include <oox/helper/propertyset.hxx>
 #include <oox/core/xmlfilterbase.hxx>
-#include <oox/drawingml/drawingmltypes.hxx>
 #include <oox/token/properties.hxx>
 #include <oox/token/tokens.hxx>
 
 #if OSL_DEBUG_LEVEL > 0
-#include <vcl/unohelp.hxx>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/text/XText.hpp>
 #include <com/sun/star/drawing/XShape.hpp>
diff --git a/oox/source/drawingml/textrun.cxx b/oox/source/drawingml/textrun.cxx
index ea51f1472a0e..702ac6454cc3 100644
--- a/oox/source/drawingml/textrun.cxx
+++ b/oox/source/drawingml/textrun.cxx
@@ -20,7 +20,6 @@
 #include <drawingml/textrun.hxx>
 
 #include <com/sun/star/text/ControlCharacter.hpp>
-#include <com/sun/star/beans/XMultiPropertySet.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/beans/XPropertyState.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
diff --git a/oox/source/drawingml/texttabstoplistcontext.cxx b/oox/source/drawingml/texttabstoplistcontext.cxx
index f20493a4bf6b..09809a9d891a 100644
--- a/oox/source/drawingml/texttabstoplistcontext.cxx
+++ b/oox/source/drawingml/texttabstoplistcontext.cxx
@@ -17,9 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <vector>
-#include <algorithm>
-
 #include <rtl/ustring.hxx>
 
 #include <oox/drawingml/drawingmltypes.hxx>
diff --git a/oox/source/drawingml/themefragmenthandler.cxx b/oox/source/drawingml/themefragmenthandler.cxx
index 0f46fb380e07..5c5d4a6ab07a 100644
--- a/oox/source/drawingml/themefragmenthandler.cxx
+++ b/oox/source/drawingml/themefragmenthandler.cxx
@@ -21,7 +21,6 @@
 #include <drawingml/objectdefaultcontext.hxx>
 #include <oox/drawingml/theme.hxx>
 #include <oox/token/namespaces.hxx>
-#include <oox/token/tokens.hxx>
 #include <drawingml/themeelementscontext.hxx>
 
 using namespace ::oox::core;
diff --git a/oox/source/dump/dumperbase.cxx b/oox/source/dump/dumperbase.cxx
index f1b783a5fc68..067d4a3b35f4 100644
--- a/oox/source/dump/dumperbase.cxx
+++ b/oox/source/dump/dumperbase.cxx
@@ -23,7 +23,6 @@
 #include <string_view>
 
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/io/XActiveDataSource.hpp>
 #include <com/sun/star/io/TextOutputStream.hpp>
 #include <com/sun/star/ucb/SimpleFileAccess.hpp>
 #include <osl/file.hxx>
diff --git a/oox/source/dump/oledumper.cxx b/oox/source/dump/oledumper.cxx
index a2c6c98b1661..61115283b5d3 100644
--- a/oox/source/dump/oledumper.cxx
+++ b/oox/source/dump/oledumper.cxx
@@ -19,14 +19,7 @@
 
 #include <oox/dump/oledumper.hxx>
 
-#include <com/sun/star/io/XInputStream.hpp>
-#include <com/sun/star/io/XOutputStream.hpp>
-#include <osl/file.hxx>
-#include <osl/thread.h>
 #include <rtl/tencinfo.h>
-#include <oox/core/filterbase.hxx>
-#include <oox/helper/binaryoutputstream.hxx>
-#include <oox/ole/olestorage.hxx>
 #include <oox/ole/vbainputstream.hxx>
 
 #ifdef DBG_UTIL