tdf#42949 Fix IWYU warnings in writerfilter/

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

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

80 files changed, 101 insertions, 138 deletions

diff --git a/writerfilter/IwyuFilter_writerfilter.yaml b/writerfilter/IwyuFilter_writerfilter.yaml
index ac1671096241..d333bf61a060 100644
--- a/writerfilter/IwyuFilter_writerfilter.yaml
+++ b/writerfilter/IwyuFilter_writerfilter.yaml
@@ -1,6 +1,54 @@
 ---
 assumeFilename: writerfilter/source/filter/WriterFilter.cxx
 blacklist:
+    writerfilter/source/dmapper/BorderHandler.cxx:
+    # Needed for method parameter type
+    - tools/color.hxx
+    writerfilter/source/dmapper/ConversionHelper.cxx:
+    # Actually used
+    - com/sun/star/table/BorderLine2.hpp
+    - com/sun/star/lang/Locale.hpp
+    writerfilter/source/dmapper/DomainMapperTableManager.cxx:
+    # Needed for rtl::math::round
+    - rtl/math.hxx
+    writerfilter/source/dmapper/GraphicImport.cxx:
+    # Actually used
+    - com/sun/star/drawing/XShape.hpp
+    - com/sun/star/graphic/XGraphic.hpp
+    - com/sun/star/lang/XMultiServiceFactory.hpp
+    - com/sun/star/uno/XComponentContext.hpp
+    # Needed for rtl::math::round
+    - rtl/math.hxx
+    writerfilter/source/dmapper/NumberingManager.cxx:
+    # Actually used
+    - com/sun/star/lang/XMultiServiceFactory.hpp
+    - com/sun/star/container/XNameContainer.hpp
+    writerfilter/source/dmapper/DomainMapper_Impl.cxx:
+    # Actually used
+    - com/sun/star/uno/XComponentContext.hpp
+    writerfilter/source/dmapper/OLEHandler.cxx:
+    # Actually used
+    - com/sun/star/drawing/XShape.hpp
+    - com/sun/star/graphic/XGraphic.hpp
+    - com/sun/star/text/XTextDocument.hpp
+    - com/sun/star/text/WrapTextMode.hpp
+    - com/sun/star/uno/XComponentContext.hpp
+    writerfilter/source/dmapper/TDefTableHandler.cxx:
+    # Needed for method parameter type
+    - tools/color.hxx
+    writerfilter/source/dmapper/TablePositionHandler.cxx:
+    # Actually used
+    - com/sun/star/beans/PropertyValue.hpp
+    writerfilter/source/dmapper/PropertyMap.cxx:
+    # Actually used
+    - com/sun/star/beans/PropertyValue.hpp
+    - com/sun/star/text/XTextColumns.hpp
+    writerfilter/source/dmapper/StyleSheetTable.cxx:
+    # Actually used
+    - com/sun/star/text/XTextDocument.hpp
+    writerfilter/source/ooxml/OOXMLPropertySet.cxx:
+    # Actually used
+    - com/sun/star/drawing/XShape.hpp
     writerfilter/source/rtftok/rtfsdrimport.hxx:
     # IWYU assumes std::stack<IncompleteType> in a header is OK, but that's not
     # the case for all of LO's supported platforms.
@@ -9,3 +57,6 @@ blacklist:
     writerfilter/source/rtftok/rtfvalue.cxx:
     # complete type is needed
     - com/sun/star/embed/XEmbeddedObject.hpp
+    writerfilter/source/rtftok/rtftokenizer.cxx:
+    # Actually used
+    - com/sun/star/task/XStatusIndicator.hpp
diff --git a/writerfilter/inc/dmapper/resourcemodel.hxx b/writerfilter/inc/dmapper/resourcemodel.hxx
index bd528d1a1e59..284e9982fad7 100644
--- a/writerfilter/inc/dmapper/resourcemodel.hxx
+++ b/writerfilter/inc/dmapper/resourcemodel.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_WRITERFILTER_INC_DMAPPER_RESOURCEMODEL_HXX
 
 #include <string>
-#include <memory>
 #include <sal/types.h>
 #include <com/sun/star/drawing/XShape.hpp>
 #include <com/sun/star/uno/Any.hxx>
diff --git a/writerfilter/inc/ooxml/OOXMLDocument.hxx b/writerfilter/inc/ooxml/OOXMLDocument.hxx
index 7856a6a4dced..82dd78c779b5 100644
--- a/writerfilter/inc/ooxml/OOXMLDocument.hxx
+++ b/writerfilter/inc/ooxml/OOXMLDocument.hxx
@@ -25,7 +25,6 @@
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <dmapper/resourcemodel.hxx>
 #include <com/sun/star/task/XStatusIndicator.hpp>
-#include <com/sun/star/xml/sax/XParser.hpp>
 #include <com/sun/star/xml/sax/XFastParser.hpp>
 #include <com/sun/star/xml/sax/XFastTokenHandler.hpp>
 #include <com/sun/star/xml/sax/XFastShapeContextHandler.hpp>
diff --git a/writerfilter/inc/ooxml/QNameToString.hxx b/writerfilter/inc/ooxml/QNameToString.hxx
index c076047e13a4..2f3376edbd93 100644
--- a/writerfilter/inc/ooxml/QNameToString.hxx
+++ b/writerfilter/inc/ooxml/QNameToString.hxx
@@ -19,12 +19,9 @@
 #ifndef INCLUDED_WRITERFILTER_INC_OOXML_QNAMETOSTRING_HXX
 #define INCLUDED_WRITERFILTER_INC_OOXML_QNAMETOSTRING_HXX
 
-#include <memory>
 #include <map>
 #include <string>
-#include <iostream>
 #include <dmapper/resourcemodel.hxx>
-#include <com/sun/star/beans/XPropertySet.hpp>
 
 namespace writerfilter
 {
diff --git a/writerfilter/qa/cppunittests/dmapper/CellColorHandler.cxx b/writerfilter/qa/cppunittests/dmapper/CellColorHandler.cxx
index 8f78ac1558b6..646d0968b7e5 100644
--- a/writerfilter/qa/cppunittests/dmapper/CellColorHandler.cxx
+++ b/writerfilter/qa/cppunittests/dmapper/CellColorHandler.cxx
@@ -10,14 +10,11 @@
 #include <test/bootstrapfixture.hxx>
 #include <unotest/macros_test.hxx>
 
-#include <com/sun/star/drawing/XDrawPagesSupplier.hpp>
 #include <com/sun/star/frame/Desktop.hpp>
 #include <com/sun/star/text/XTextDocument.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/drawing/FillStyle.hpp>
 
-#include <comphelper/processfactory.hxx>
-
 using namespace ::com::sun::star;
 
 namespace
diff --git a/writerfilter/qa/cppunittests/dmapper/DomainMapperTableHandler.cxx b/writerfilter/qa/cppunittests/dmapper/DomainMapperTableHandler.cxx
index 1552d762fc0f..a1a7595cee76 100644
--- a/writerfilter/qa/cppunittests/dmapper/DomainMapperTableHandler.cxx
+++ b/writerfilter/qa/cppunittests/dmapper/DomainMapperTableHandler.cxx
@@ -16,8 +16,6 @@
 #include <com/sun/star/text/XTextTable.hpp>
 #include <com/sun/star/text/XTextTablesSupplier.hpp>
 
-#include <comphelper/processfactory.hxx>
-
 using namespace ::com::sun::star;
 
 namespace
diff --git a/writerfilter/qa/cppunittests/dmapper/DomainMapper_Impl.cxx b/writerfilter/qa/cppunittests/dmapper/DomainMapper_Impl.cxx
index e5f8c09cd640..ade216411c54 100644
--- a/writerfilter/qa/cppunittests/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/qa/cppunittests/dmapper/DomainMapper_Impl.cxx
@@ -10,15 +10,11 @@
 #include <test/bootstrapfixture.hxx>
 #include <unotest/macros_test.hxx>
 
-#include <com/sun/star/drawing/XDrawPagesSupplier.hpp>
 #include <com/sun/star/frame/Desktop.hpp>
 #include <com/sun/star/text/XTextDocument.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/drawing/FillStyle.hpp>
 #include <com/sun/star/style/BreakType.hpp>
 
-#include <comphelper/processfactory.hxx>
-
 using namespace ::com::sun::star;
 
 namespace
diff --git a/writerfilter/qa/cppunittests/dmapper/TextEffectsHandler.cxx b/writerfilter/qa/cppunittests/dmapper/TextEffectsHandler.cxx
index fef468a80b4d..d48a35e25dc1 100644
--- a/writerfilter/qa/cppunittests/dmapper/TextEffectsHandler.cxx
+++ b/writerfilter/qa/cppunittests/dmapper/TextEffectsHandler.cxx
@@ -14,8 +14,6 @@
 #include <com/sun/star/frame/Desktop.hpp>
 #include <com/sun/star/text/XTextDocument.hpp>
 
-#include <comphelper/processfactory.hxx>
-
 using namespace ::com::sun::star;
 
 namespace
diff --git a/writerfilter/qa/cppunittests/misc/misc.cxx b/writerfilter/qa/cppunittests/misc/misc.cxx
index f59695ae368f..983e6fc87129 100644
--- a/writerfilter/qa/cppunittests/misc/misc.cxx
+++ b/writerfilter/qa/cppunittests/misc/misc.cxx
@@ -7,7 +7,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <limits>
 #include <tuple>
 #include <vector>
 
@@ -20,7 +19,7 @@
 
 #include <rtl/ustring.hxx>
 #include <dmapper/ConversionHelper.hxx>
-#include <dmapper/DomainMapper_Impl.hxx>
+#include <dmapper/DomainMapperFactory.hxx>
 
 namespace {
 
diff --git a/writerfilter/source/dmapper/BorderHandler.hxx b/writerfilter/source/dmapper/BorderHandler.hxx
index 230cae5dcac3..97bc7802973f 100644
--- a/writerfilter/source/dmapper/BorderHandler.hxx
+++ b/writerfilter/source/dmapper/BorderHandler.hxx
@@ -19,7 +19,6 @@
 #ifndef INCLUDED_WRITERFILTER_SOURCE_DMAPPER_BORDERHANDLER_HXX
 #define INCLUDED_WRITERFILTER_SOURCE_DMAPPER_BORDERHANDLER_HXX
 
-#include <memory>
 #include <vector>
 #include "LoggedResources.hxx"
 #include "PropertyMap.hxx"
diff --git a/writerfilter/source/dmapper/CellColorHandler.cxx b/writerfilter/source/dmapper/CellColorHandler.cxx
index bf705eb74915..805f6e1bb6da 100644
--- a/writerfilter/source/dmapper/CellColorHandler.cxx
+++ b/writerfilter/source/dmapper/CellColorHandler.cxx
@@ -18,12 +18,10 @@
  */
 #include "CellColorHandler.hxx"
 #include "PropertyMap.hxx"
-#include "ConversionHelper.hxx"
 #include "TDefTableHandler.hxx"
 #include <ooxml/resourceids.hxx>
 #include <com/sun/star/drawing/FillStyle.hpp>
 #include <com/sun/star/drawing/ShadingPattern.hpp>
-#include <sal/macros.h>
 #include <filter/msfilter/util.hxx>
 #include <comphelper/sequence.hxx>
 #include <tools/color.hxx>
diff --git a/writerfilter/source/dmapper/CellColorHandler.hxx b/writerfilter/source/dmapper/CellColorHandler.hxx
index 3c98b8368b2c..4ec63c217f7c 100644
--- a/writerfilter/source/dmapper/CellColorHandler.hxx
+++ b/writerfilter/source/dmapper/CellColorHandler.hxx
@@ -21,7 +21,6 @@
 
 #include "LoggedResources.hxx"
 #include "PropertyMap.hxx"
-#include <memory>
 #include <vector>
 
 #include <com/sun/star/beans/PropertyValue.hpp>
diff --git a/writerfilter/source/dmapper/CellMarginHandler.cxx b/writerfilter/source/dmapper/CellMarginHandler.cxx
index 7b9340ef45a4..8434092592a7 100644
--- a/writerfilter/source/dmapper/CellMarginHandler.cxx
+++ b/writerfilter/source/dmapper/CellMarginHandler.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 #include "CellMarginHandler.hxx"
-#include "PropertyMap.hxx"
 #include "ConversionHelper.hxx"
 #include <ooxml/resourceids.hxx>
 #include <comphelper/propertysequence.hxx>
diff --git a/writerfilter/source/dmapper/ConversionHelper.cxx b/writerfilter/source/dmapper/ConversionHelper.cxx
index 9efd355b05ef..04ce9528b0c3 100644
--- a/writerfilter/source/dmapper/ConversionHelper.cxx
+++ b/writerfilter/source/dmapper/ConversionHelper.cxx
@@ -18,7 +18,6 @@
  */
 #include "ConversionHelper.hxx"
 #include <com/sun/star/table/BorderLine2.hpp>
-#include <com/sun/star/table/BorderLineStyle.hpp>
 #include <com/sun/star/lang/Locale.hpp>
 #include <com/sun/star/text/HoriOrientation.hpp>
 #include <com/sun/star/style/NumberingType.hpp>
@@ -27,8 +26,6 @@
 #include <rtl/ustrbuf.hxx>
 #include <tools/color.hxx>
 #include <tools/mapunit.hxx>
-#include <algorithm>
-#include <functional>
 
 using namespace com::sun::star;
 
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx
index d17f1978cb8f..c92e70a10f2a 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -16,10 +16,12 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
+#include "BorderHandler.hxx"
 #include "PageBordersHandler.hxx"
 
 #include "util.hxx"
 #include "SdtHelper.hxx"
+#include "TagLogger.hxx"
 #include "TDefTableHandler.hxx"
 #include "DomainMapper_Impl.hxx"
 #include "ConversionHelper.hxx"
@@ -27,6 +29,7 @@
 #include "MeasureHandler.hxx"
 #include <i18nlangtag/languagetag.hxx>
 #include <i18nutil/paper.hxx>
+#include <ooxml/resourceids.hxx>
 #include <oox/token/tokens.hxx>
 #include <oox/drawingml/drawingmltypes.hxx>
 #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
@@ -81,9 +84,6 @@
 #include <dmapper/GraphicZOrderHelper.hxx>
 #include <tools/diagnose_ex.h>
 #include <sal/log.hxx>
-#include <vcl/svapp.hxx>
-#include <vcl/outdev.hxx>
-#include <vcl/font.hxx>
 
 using namespace ::com::sun::star;
 using namespace oox;
diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
index d02e26abf96e..25e9cd2ba261 100644
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
@@ -25,7 +25,6 @@
 #include <com/sun/star/table/BorderLineStyle.hpp>
 #include <com/sun/star/table/XCellRange.hpp>
 #include <com/sun/star/text/HoriOrientation.hpp>
-#include <com/sun/star/text/RelOrientation.hpp>
 #include <com/sun/star/text/SizeType.hpp>
 #include <com/sun/star/text/XTextRangeCompare.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
@@ -33,7 +32,7 @@
 #include <com/sun/star/container/XEnumeration.hpp>
 #include <com/sun/star/container/XEnumerationAccess.hpp>
 #include "TablePositionHandler.hxx"
-#include "ConversionHelper.hxx"
+#include "TagLogger.hxx"
 #include "util.hxx"
 #include <osl/diagnose.h>
 #include <sal/log.hxx>
diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.hxx b/writerfilter/source/dmapper/DomainMapperTableHandler.hxx
index bb0ea2e01804..9733a3fd908c 100644
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.hxx
+++ b/writerfilter/source/dmapper/DomainMapperTableHandler.hxx
@@ -19,7 +19,6 @@
 #ifndef INCLUDED_WRITERFILTER_SOURCE_DMAPPER_DOMAINMAPPERTABLEHANDLER_HXX
 #define INCLUDED_WRITERFILTER_SOURCE_DMAPPER_DOMAINMAPPERTABLEHANDLER_HXX
 
-#include "TableManager.hxx"
 #include "PropertyMap.hxx"
 #include <vector>
 
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
index 313a918a3eb4..552d30daf8ce 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
@@ -18,21 +18,15 @@
  */
 #include <o3tl/optional.hxx>
 #include "DomainMapperTableManager.hxx"
-#include "BorderHandler.hxx"
-#include "CellColorHandler.hxx"
-#include "CellMarginHandler.hxx"
 #include "ConversionHelper.hxx"
 #include "MeasureHandler.hxx"
-#include "TDefTableHandler.hxx"
-#include <com/sun/star/text/HoriOrientation.hpp>
+#include "TagLogger.hxx"
 #include <com/sun/star/text/SizeType.hpp>
 #include <com/sun/star/text/TableColumnSeparator.hpp>
-#include <com/sun/star/text/VertOrientation.hpp>
 #include <com/sun/star/text/WritingMode2.hpp>
 #include <o3tl/numeric.hxx>
 #include <o3tl/safeint.hxx>
 #include <ooxml/resourceids.hxx>
-#include "DomainMapper.hxx"
 #include <rtl/math.hxx>
 #include <sal/log.hxx>
 #include <numeric>
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.hxx b/writerfilter/source/dmapper/DomainMapperTableManager.hxx
index 1020d67fc8ad..67c49938f975 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.hxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.hxx
@@ -24,8 +24,6 @@
 
 #include "TableManager.hxx"
 #include "PropertyMap.hxx"
-#include "StyleSheetTable.hxx"
-#include <com/sun/star/text/XTextRange.hpp>
 #include <vector>
 #include <memory>
 #include <comphelper/sequenceashashmap.hxx>
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 0ee4c6d1989d..22cf36388b48 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -19,12 +19,13 @@
 
 #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/beans/XPropertyContainer.hpp>
 #include <com/sun/star/document/XDocumentProperties.hpp>
+#include <ooxml/resourceids.hxx>
 #include "DomainMapper_Impl.hxx"
 #include "ConversionHelper.hxx"
 #include "SdtHelper.hxx"
 #include "DomainMapperTableHandler.hxx"
+#include "TagLogger.hxx"
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/graphic/XGraphic.hpp>
 #include <com/sun/star/beans/XPropertyState.hpp>
@@ -59,6 +60,7 @@
 #include <com/sun/star/text/XParagraphCursor.hpp>
 #include <com/sun/star/text/XRedline.hpp>
 #include <com/sun/star/text/XTextFieldsSupplier.hpp>
+#include <com/sun/star/text/XTextFrame.hpp>
 #include <com/sun/star/text/RubyPosition.hpp>
 #include <com/sun/star/text/XTextRangeCompare.hpp>
 #include <com/sun/star/style/DropCapFormat.hpp>
@@ -67,8 +69,6 @@
 #include <com/sun/star/util/XNumberFormatter.hpp>
 #include <com/sun/star/document/XViewDataSupplier.hpp>
 #include <com/sun/star/container/XIndexContainer.hpp>
-#include <com/sun/star/awt/XControlModel.hpp>
-#include <com/sun/star/drawing/XControlShape.hpp>
 #include <com/sun/star/text/ControlCharacter.hpp>
 #include <com/sun/star/text/XTextColumns.hpp>
 #include <com/sun/star/awt/CharSet.hpp>
@@ -79,7 +79,6 @@
 #include <oox/mathml/import.hxx>
 #include <xmloff/odffields.hxx>
 #include <rtl/uri.hxx>
-#include "GraphicHelpers.hxx"
 #include <dmapper/GraphicZOrderHelper.hxx>
 
 #include <oox/token/tokens.hxx>
@@ -89,8 +88,6 @@
 #include <tuple>
 #include <unordered_map>
 
-#include <vcl/svapp.hxx>
-#include <vcl/outdev.hxx>
 #include <officecfg/Office/Common.hxx>
 #include <filter/msfilter/util.hxx>
 #include <comphelper/sequence.hxx>
@@ -99,7 +96,6 @@
 #include <unotools/configmgr.hxx>
 #include <unotools/mediadescriptor.hxx>
 #include <tools/diagnose_ex.h>
-#include <tools/lineend.hxx>
 #include <sal/log.hxx>
 
 
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
index 6138bb738e56..c7b50dcdc730 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
@@ -23,19 +23,14 @@
 #include <com/sun/star/text/XTextDocument.hpp>
 #include <com/sun/star/text/XTextCursor.hpp>
 #include <com/sun/star/text/XTextAppend.hpp>
-#include <com/sun/star/text/XTextAppendAndConvert.hpp>
-#include <com/sun/star/text/XTextFrame.hpp>
 #include <com/sun/star/style/TabStop.hpp>
 #include <com/sun/star/container/XNameContainer.hpp>
 #include <queue>
 #include <stack>
-#include <tuple>
 #include <unordered_map>
 #include <vector>
 #include <o3tl/optional.hxx>
 
-#include <ooxml/resourceids.hxx>
-
 #include "DomainMapper.hxx"
 #include "DomainMapperTableManager.hxx"
 #include "DomainMapperTableHandler.hxx"
@@ -52,8 +47,6 @@
 #include "FormControlHelper.hxx"
 #include <map>
 
-#include <string.h>
-
 namespace com{ namespace sun{ namespace star{
         namespace awt{
             struct Size;
diff --git a/writerfilter/source/dmapper/FFDataHandler.cxx b/writerfilter/source/dmapper/FFDataHandler.cxx
index 58a0e130513d..6fcf06cf81f4 100644
--- a/writerfilter/source/dmapper/FFDataHandler.cxx
+++ b/writerfilter/source/dmapper/FFDataHandler.cxx
@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 #include "FFDataHandler.hxx"
+#include "TagLogger.hxx"
 
 #include <ooxml/resourceids.hxx>
 
diff --git a/writerfilter/source/dmapper/FontTable.cxx b/writerfilter/source/dmapper/FontTable.cxx
index 533eb41008dd..4a76c0ac51de 100644
--- a/writerfilter/source/dmapper/FontTable.cxx
+++ b/writerfilter/source/dmapper/FontTable.cxx
@@ -21,11 +21,9 @@
 #include <ooxml/resourceids.hxx>
 #include <vector>
 #include <sal/log.hxx>
-#include <osl/file.hxx>
 #include <rtl/tencinfo.h>
 #include <vcl/embeddedfontshelper.hxx>
 #include <unotools/fontdefs.hxx>
-#include <com/sun/star/awt/FontPitch.hpp>
 
 using namespace com::sun::star;
 
diff --git a/writerfilter/source/dmapper/FontTable.hxx b/writerfilter/source/dmapper/FontTable.hxx
index dd45e46c2c34..26b2fd027f7a 100644
--- a/writerfilter/source/dmapper/FontTable.hxx
+++ b/writerfilter/source/dmapper/FontTable.hxx
@@ -22,7 +22,6 @@
 
 #include <memory>
 #include "LoggedResources.hxx"
-#include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/io/XInputStream.hpp>
 
 namespace writerfilter {
diff --git a/writerfilter/source/dmapper/GraphicHelpers.cxx b/writerfilter/source/dmapper/GraphicHelpers.cxx
index abe881592161..34a7bac660eb 100644
--- a/writerfilter/source/dmapper/GraphicHelpers.cxx
+++ b/writerfilter/source/dmapper/GraphicHelpers.cxx
@@ -16,8 +16,9 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#include "ConversionHelper.hxx"
+
 #include "GraphicHelpers.hxx"
+#include "TagLogger.hxx"
 #include <dmapper/GraphicZOrderHelper.hxx>
 #include "PropertyIds.hxx"
 
@@ -29,14 +30,10 @@
 
 #include <oox/drawingml/drawingmltypes.hxx>
 #include <sal/log.hxx>
-#include <unotools/resmgr.hxx>
-#include <vcl/settings.hxx>
-#include <vcl/svapp.hxx>
 #include <svx/dialmgr.hxx>
 #include <svx/strings.hrc>
 
 #include <iostream>
-#include <memory>
 
 namespace writerfilter::dmapper {
 
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx b/writerfilter/source/dmapper/GraphicImport.cxx
index 7c4c9d37eb04..96d784f7cad1 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -64,6 +64,7 @@
 #include "GraphicHelpers.hxx"
 #include "GraphicImport.hxx"
 #include "PropertyMap.hxx"
+#include "TagLogger.hxx"
 #include "WrapPolygonHandler.hxx"
 #include "util.hxx"
 
diff --git a/writerfilter/source/dmapper/GraphicImport.hxx b/writerfilter/source/dmapper/GraphicImport.hxx
index 7807e48ede00..60cd279c5b88 100644
--- a/writerfilter/source/dmapper/GraphicImport.hxx
+++ b/writerfilter/source/dmapper/GraphicImport.hxx
@@ -24,6 +24,7 @@
 
 #include "LoggedResources.hxx"
 
+#include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/graphic/XGraphic.hpp>
 
 namespace com { namespace sun { namespace star {
diff --git a/writerfilter/source/dmapper/LatentStyleHandler.cxx b/writerfilter/source/dmapper/LatentStyleHandler.cxx
index 484948bfb70e..0d463214f604 100644
--- a/writerfilter/source/dmapper/LatentStyleHandler.cxx
+++ b/writerfilter/source/dmapper/LatentStyleHandler.cxx
@@ -7,6 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 #include "LatentStyleHandler.hxx"
+#include "TagLogger.hxx"
 #include <ooxml/resourceids.hxx>
 
 namespace writerfilter::dmapper
diff --git a/writerfilter/source/dmapper/LoggedResources.cxx b/writerfilter/source/dmapper/LoggedResources.cxx
index aa24829aff32..9fedb159efa8 100644
--- a/writerfilter/source/dmapper/LoggedResources.cxx
+++ b/writerfilter/source/dmapper/LoggedResources.cxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <rtl/ustrbuf.hxx>
 #include "LoggedResources.hxx"
+#include "TagLogger.hxx"
 #include <ooxml/QNameToString.hxx>
 
 using namespace ::com::sun::star;
diff --git a/writerfilter/source/dmapper/LoggedResources.hxx b/writerfilter/source/dmapper/LoggedResources.hxx
index 3177224d4664..44bb043c6117 100644
--- a/writerfilter/source/dmapper/LoggedResources.hxx
+++ b/writerfilter/source/dmapper/LoggedResources.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_WRITERFILTER_SOURCE_DMAPPER_LOGGEDRESOURCES_HXX
 
 #include <dmapper/resourcemodel.hxx>
-#include "TagLogger.hxx"
 
 
 namespace writerfilter
diff --git a/writerfilter/source/dmapper/MeasureHandler.cxx b/writerfilter/source/dmapper/MeasureHandler.cxx
index cd9145d1f6ea..5eea9a5c613b 100644
--- a/writerfilter/source/dmapper/MeasureHandler.cxx
+++ b/writerfilter/source/dmapper/MeasureHandler.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 #include "MeasureHandler.hxx"
-#include "PropertyMap.hxx"
 #include "ConversionHelper.hxx"
 #include <ooxml/resourceids.hxx>
 #include <osl/diagnose.h>
diff --git a/writerfilter/source/dmapper/MeasureHandler.hxx b/writerfilter/source/dmapper/MeasureHandler.hxx
index caf631e0a49d..abf4beb8807b 100644
--- a/writerfilter/source/dmapper/MeasureHandler.hxx
+++ b/writerfilter/source/dmapper/MeasureHandler.hxx
@@ -20,7 +20,6 @@
 #define INCLUDED_WRITERFILTER_SOURCE_DMAPPER_MEASUREHANDLER_HXX
 
 #include "LoggedResources.hxx"
-#include <memory>
 #include <vector>
 #include <com/sun/star/beans/PropertyValue.hpp>
 
diff --git a/writerfilter/source/dmapper/ModelEventListener.cxx b/writerfilter/source/dmapper/ModelEventListener.cxx
index fa8a688ed9ea..8e20f7ad90e5 100644
--- a/writerfilter/source/dmapper/ModelEventListener.cxx
+++ b/writerfilter/source/dmapper/ModelEventListener.cxx
@@ -20,8 +20,6 @@
 #include "PropertyIds.hxx"
 #include <rtl/ustring.hxx>
 #include <com/sun/star/document/XEventBroadcaster.hpp>
-#include <com/sun/star/text/XDocumentIndex.hpp>
-#include <com/sun/star/text/XDocumentIndexesSupplier.hpp>
 #include <com/sun/star/text/XTextFieldsSupplier.hpp>
 #include <com/sun/star/util/XRefreshable.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/writerfilter/source/dmapper/NumberingManager.hxx b/writerfilter/source/dmapper/NumberingManager.hxx
index ff87787f2ace..31bb400a36d8 100644
--- a/writerfilter/source/dmapper/NumberingManager.hxx
+++ b/writerfilter/source/dmapper/NumberingManager.hxx
@@ -24,11 +24,11 @@
 
 #include "DomainMapper.hxx"
 #include "LoggedResources.hxx"
+#include "StyleSheetTable.hxx"
 
 #include <editeng/numitem.hxx>
 
 #include <com/sun/star/container/XIndexReplace.hpp>
-#include <com/sun/star/graphic/XGraphic.hpp>
 #include <com/sun/star/awt/XBitmap.hpp>
 
 namespace writerfilter {
diff --git a/writerfilter/source/dmapper/OLEHandler.cxx b/writerfilter/source/dmapper/OLEHandler.cxx
index ab9e9861fcee..1c437f8d2819 100644
--- a/writerfilter/source/dmapper/OLEHandler.cxx
+++ b/writerfilter/source/dmapper/OLEHandler.cxx
@@ -18,10 +18,8 @@
  */
 #include "OLEHandler.hxx"
 #include "DomainMapper.hxx"
-#include "PropertyMap.hxx"
 #include "GraphicHelpers.hxx"
 
-#include <editeng/unoprnms.hxx>
 #include <oox/ole/oleobjecthelper.hxx>
 #include <ooxml/resourceids.hxx>
 #include <rtl/ustring.hxx>
@@ -30,20 +28,15 @@
 #include <tools/diagnose_ex.h>
 #include <unotools/mediadescriptor.hxx>
 #include <officecfg/Office/Common.hxx>
-#include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/document/XEmbeddedObjectResolver.hpp>
 #include <com/sun/star/document/XEmbeddedObjectSupplier.hpp>
 #include <com/sun/star/document/XFilter.hpp>
 #include <com/sun/star/document/XImporter.hpp>
-#include <com/sun/star/document/XStorageBasedDocument.hpp>
 #include <com/sun/star/drawing/XShape.hpp>
-#include <com/sun/star/embed/XEmbeddedObject.hpp>
-#include <com/sun/star/embed/XEmbedObjectCreator.hpp>
 #include <com/sun/star/graphic/XGraphic.hpp>
-#include <com/sun/star/io/XStream.hpp>
+#include <com/sun/star/io/XOutputStream.hpp>
 #include <com/sun/star/lang/XComponent.hpp>
-#include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/text/XTextDocument.hpp>
diff --git a/writerfilter/source/dmapper/OLEHandler.hxx b/writerfilter/source/dmapper/OLEHandler.hxx
index 2060c8163f30..131326fe2a61 100644
--- a/writerfilter/source/dmapper/OLEHandler.hxx
+++ b/writerfilter/source/dmapper/OLEHandler.hxx
@@ -21,7 +21,6 @@
 
 #include "LoggedResources.hxx"
 #include <com/sun/star/awt/Size.hpp>
-#include <com/sun/star/awt/Point.hpp>
 #include <com/sun/star/drawing/XShape.hpp>
 #include <com/sun/star/text/WrapTextMode.hpp>
 
diff --git a/writerfilter/source/dmapper/PageBordersHandler.cxx b/writerfilter/source/dmapper/PageBordersHandler.cxx
index 4a48b0e854be..7f97faf320ee 100644
--- a/writerfilter/source/dmapper/PageBordersHandler.cxx
+++ b/writerfilter/source/dmapper/PageBordersHandler.cxx
@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include "BorderHandler.hxx"
 #include "PageBordersHandler.hxx"
 
 #include <ooxml/resourceids.hxx>
diff --git a/writerfilter/source/dmapper/PageBordersHandler.hxx b/writerfilter/source/dmapper/PageBordersHandler.hxx
index c5a83d37a39a..3bfe23ee6746 100644
--- a/writerfilter/source/dmapper/PageBordersHandler.hxx
+++ b/writerfilter/source/dmapper/PageBordersHandler.hxx
@@ -19,11 +19,9 @@
 #ifndef INCLUDED_WRITERFILTER_SOURCE_DMAPPER_PAGEBORDERSHANDLER_HXX
 #define INCLUDED_WRITERFILTER_SOURCE_DMAPPER_PAGEBORDERSHANDLER_HXX
 
-#include "BorderHandler.hxx"
 #include "PropertyMap.hxx"
 
 #include "LoggedResources.hxx"
-#include <memory>
 
 #include <com/sun/star/table/BorderLine2.hpp>
 
diff --git a/writerfilter/source/dmapper/PropertyIds.hxx b/writerfilter/source/dmapper/PropertyIds.hxx
index ce238f340a59..9fe42ee69ac1 100644
--- a/writerfilter/source/dmapper/PropertyIds.hxx
+++ b/writerfilter/source/dmapper/PropertyIds.hxx
@@ -19,6 +19,8 @@
 #ifndef INCLUDED_WRITERFILTER_SOURCE_DMAPPER_PROPERTYIDS_HXX
 #define INCLUDED_WRITERFILTER_SOURCE_DMAPPER_PROPERTYIDS_HXX
 
+#include <rtl/ustring.hxx>
+
 namespace writerfilter {
 namespace dmapper{
 // Ensure that Character Properties are placed between PROP_CHARACTER_STYLES and PROP_CHARACTER_END
diff --git a/writerfilter/source/dmapper/PropertyMap.cxx b/writerfilter/source/dmapper/PropertyMap.cxx
index b15e17696a78..d851c000c99b 100644
--- a/writerfilter/source/dmapper/PropertyMap.cxx
+++ b/writerfilter/source/dmapper/PropertyMap.cxx
@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 #include "PropertyMap.hxx"
+#include "TagLogger.hxx"
 #include <ooxml/resourceids.hxx>
 #include "DomainMapper_Impl.hxx"
 #include "ConversionHelper.hxx"
@@ -28,7 +29,6 @@
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/beans/XMultiPropertySet.hpp>
-#include <com/sun/star/drawing/XDrawPageSupplier.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/table/BorderLine2.hpp>
 #include <com/sun/star/container/XEnumeration.hpp>
@@ -36,7 +36,6 @@
 #include <com/sun/star/container/XNameContainer.hpp>
 #include <com/sun/star/style/BreakType.hpp>
 #include <com/sun/star/style/PageStyleLayout.hpp>
-#include <com/sun/star/style/XStyle.hpp>
 #include <com/sun/star/style/XStyleFamiliesSupplier.hpp>
 #include <com/sun/star/table/ShadowFormat.hpp>
 #include <com/sun/star/text/RelOrientation.hpp>
diff --git a/writerfilter/source/dmapper/PropertyMap.hxx b/writerfilter/source/dmapper/PropertyMap.hxx
index 11df0d8fad9c..9f5d54536abe 100644
--- a/writerfilter/source/dmapper/PropertyMap.hxx
+++ b/writerfilter/source/dmapper/PropertyMap.hxx
@@ -20,18 +20,19 @@
 #define INCLUDED_WRITERFILTER_SOURCE_DMAPPER_PROPERTYMAP_HXX
 
 #include <rtl/ustring.hxx>
+#include <tools/ref.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/table/BorderLine2.hpp>
 #include <com/sun/star/text/WrapTextMode.hpp>
 #include <com/sun/star/uno/Any.h>
+#include <com/sun/star/drawing/XShape.hpp>
 #include "PropertyIds.hxx"
 #include <memory>
 #include <o3tl/optional.hxx>
 #include <map>
 #include <vector>
-#include "TagLogger.hxx"
 
 namespace com { namespace sun { namespace star {
     namespace beans {
diff --git a/writerfilter/source/dmapper/PropertyMapHelper.hxx b/writerfilter/source/dmapper/PropertyMapHelper.hxx
index 1e1c37611b70..4b7bee2d7b1d 100644
--- a/writerfilter/source/dmapper/PropertyMapHelper.hxx
+++ b/writerfilter/source/dmapper/PropertyMapHelper.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_WRITERFILTER_SOURCE_DMAPPER_PROPERTYMAPHELPER_HXX
 #define INCLUDED_WRITERFILTER_SOURCE_DMAPPER_PROPERTYMAPHELPER_HXX
 
-#include "PropertyMap.hxx"
 #include <com/sun/star/beans/PropertyValues.hpp>
 
 namespace writerfilter
diff --git a/writerfilter/source/dmapper/SectionColumnHandler.cxx b/writerfilter/source/dmapper/SectionColumnHandler.cxx
index 1e299b93cb88..8d5be18a1cf1 100644
--- a/writerfilter/source/dmapper/SectionColumnHandler.cxx
+++ b/writerfilter/source/dmapper/SectionColumnHandler.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 #include "SectionColumnHandler.hxx"
-#include "PropertyMap.hxx"
 #include "ConversionHelper.hxx"
 #include <ooxml/resourceids.hxx>
 #include <osl/diagnose.h>
diff --git a/writerfilter/source/dmapper/SectionColumnHandler.hxx b/writerfilter/source/dmapper/SectionColumnHandler.hxx
index 632129c10f04..e05d54b8075d 100644
--- a/writerfilter/source/dmapper/SectionColumnHandler.hxx
+++ b/writerfilter/source/dmapper/SectionColumnHandler.hxx
@@ -20,7 +20,6 @@
 #define INCLUDED_WRITERFILTER_SOURCE_DMAPPER_SECTIONCOLUMNHANDLER_HXX
 
 #include "LoggedResources.hxx"
-#include <memory>
 #include <vector>
 
 namespace writerfilter {
diff --git a/writerfilter/source/dmapper/SettingsTable.cxx b/writerfilter/source/dmapper/SettingsTable.cxx
index 9dfa89eefbe8..7658d299e712 100644
--- a/writerfilter/source/dmapper/SettingsTable.cxx
+++ b/writerfilter/source/dmapper/SettingsTable.cxx
@@ -18,6 +18,7 @@
  */
 
 #include "SettingsTable.hxx"
+#include "TagLogger.hxx"
 
 #include <vector>
 
diff --git a/writerfilter/source/dmapper/SettingsTable.hxx b/writerfilter/source/dmapper/SettingsTable.hxx
index 26c69d907b35..d8473e423041 100644
--- a/writerfilter/source/dmapper/SettingsTable.hxx
+++ b/writerfilter/source/dmapper/SettingsTable.hxx
@@ -21,9 +21,7 @@
 #define INCLUDED_WRITERFILTER_SOURCE_DMAPPER_SETTINGSTABLE_HXX
 
 #include "LoggedResources.hxx"
-#include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/text/XTextDocument.hpp>
-#include <map>
 #include <memory>
 
 namespace com{ namespace sun{ namespace star{
diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx b/writerfilter/source/dmapper/StyleSheetTable.cxx
index ceeb95a55d24..2f0eda1f7565 100644
--- a/writerfilter/source/dmapper/StyleSheetTable.cxx
+++ b/writerfilter/source/dmapper/StyleSheetTable.cxx
@@ -18,9 +18,9 @@
  */
 #include "StyleSheetTable.hxx"
 #include "util.hxx"
-#include "NumberingManager.hxx"
 #include "ConversionHelper.hxx"
 #include "TblStylePrHandler.hxx"
+#include "TagLogger.hxx"
 #include "BorderHandler.hxx"
 #include "LatentStyleHandler.hxx"
 #include <ooxml/resourceids.hxx>
@@ -30,14 +30,15 @@
 #include <com/sun/star/beans/XPropertyState.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/container/XNameContainer.hpp>
+#include <com/sun/star/container/XIndexReplace.hpp>
 #include <com/sun/star/text/XTextDocument.hpp>
+#include <com/sun/star/style/NumberingType.hpp>
 #include <com/sun/star/style/XStyleFamiliesSupplier.hpp>
 #include <com/sun/star/style/XStyle.hpp>
 #include <com/sun/star/style/ParagraphAdjust.hpp>
 #include <com/sun/star/text/WritingMode.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <map>
-#include <set>
 #include <osl/diagnose.h>
 #include <rtl/ustrbuf.hxx>
 #include <sal/log.hxx>
diff --git a/writerfilter/source/dmapper/StyleSheetTable.hxx b/writerfilter/source/dmapper/StyleSheetTable.hxx
index 0d367de59f52..c192449eb388 100644
--- a/writerfilter/source/dmapper/StyleSheetTable.hxx
+++ b/writerfilter/source/dmapper/StyleSheetTable.hxx
@@ -23,7 +23,6 @@
 #include "TblStylePrHandler.hxx"
 
 #include "DomainMapper.hxx"
-#include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/beans/PropertyValues.hpp>
 #include "PropertyMap.hxx"
 #include "FontTable.hxx"
diff --git a/writerfilter/source/dmapper/TDefTableHandler.cxx b/writerfilter/source/dmapper/TDefTableHandler.cxx
index 8f0011ceeb89..3b9bd40282bf 100644
--- a/writerfilter/source/dmapper/TDefTableHandler.cxx
+++ b/writerfilter/source/dmapper/TDefTableHandler.cxx
@@ -23,8 +23,6 @@
 #include <filter/msfilter/util.hxx>
 #include <tools/color.hxx>
 #include <com/sun/star/table/BorderLine2.hpp>
-#include <com/sun/star/text/TableColumnSeparator.hpp>
-#include <com/sun/star/text/VertOrientation.hpp>
 #include <comphelper/sequence.hxx>
 
 namespace writerfilter::dmapper {
diff --git a/writerfilter/source/dmapper/TDefTableHandler.hxx b/writerfilter/source/dmapper/TDefTableHandler.hxx
index 76b3e60b0e85..08a8e06353f7 100644
--- a/writerfilter/source/dmapper/TDefTableHandler.hxx
+++ b/writerfilter/source/dmapper/TDefTableHandler.hxx
@@ -20,7 +20,6 @@
 #define INCLUDED_WRITERFILTER_SOURCE_DMAPPER_TDEFTABLEHANDLER_HXX
 
 #include "LoggedResources.hxx"
-#include <memory>
 #include <vector>
 namespace com{ namespace sun{ namespace star{
     namespace table {
diff --git a/writerfilter/source/dmapper/TableData.hxx b/writerfilter/source/dmapper/TableData.hxx
index 6326dbe33704..66bf4294158c 100644
--- a/writerfilter/source/dmapper/TableData.hxx
+++ b/writerfilter/source/dmapper/TableData.hxx
@@ -20,10 +20,11 @@
 #ifndef INCLUDED_WRITERFILTER_SOURCE_DMAPPER_TABLEDATA_HXX
 #define INCLUDED_WRITERFILTER_SOURCE_DMAPPER_TABLEDATA_HXX
 
-#include <dmapper/resourcemodel.hxx>
+#include <com/sun/star/text/XTextRange.hpp>
+
+#include "PropertyMap.hxx"
 
 #include <vector>
-#include <memory>
 
 namespace writerfilter
 {
diff --git a/writerfilter/source/dmapper/TableManager.cxx b/writerfilter/source/dmapper/TableManager.cxx
index 7572e6b39c0d..51ca1ab69af2 100644
--- a/writerfilter/source/dmapper/TableManager.cxx
+++ b/writerfilter/source/dmapper/TableManager.cxx
@@ -17,7 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <ooxml/resourceids.hxx>
 #include "TableManager.hxx"
+#include "TagLogger.hxx"
 #include "DomainMapperTableHandler.hxx"
 #include "DomainMapper_Impl.hxx"
 #include "util.hxx"
diff --git a/writerfilter/source/dmapper/TableManager.hxx b/writerfilter/source/dmapper/TableManager.hxx
index 47947ee724ee..d5814df6d8e7 100644
--- a/writerfilter/source/dmapper/TableManager.hxx
+++ b/writerfilter/source/dmapper/TableManager.hxx
@@ -26,6 +26,8 @@
 #include "PropertyMap.hxx"
 #include "TableData.hxx"
 
+#include <dmapper/resourcemodel.hxx>
+
 namespace writerfilter
 {
 namespace dmapper
diff --git a/writerfilter/source/dmapper/TablePositionHandler.cxx b/writerfilter/source/dmapper/TablePositionHandler.cxx
index ab7886b1d764..57c22d265b62 100644
--- a/writerfilter/source/dmapper/TablePositionHandler.cxx
+++ b/writerfilter/source/dmapper/TablePositionHandler.cxx
@@ -8,6 +8,7 @@
  */
 #include "TablePositionHandler.hxx"
 #include "ConversionHelper.hxx"
+#include "TagLogger.hxx"
 #include <ooxml/resourceids.hxx>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/text/HoriOrientation.hpp>
diff --git a/writerfilter/source/dmapper/TablePropertiesHandler.cxx b/writerfilter/source/dmapper/TablePropertiesHandler.cxx
index 13adf771b89d..bd8fde34d36d 100644
--- a/writerfilter/source/dmapper/TablePropertiesHandler.cxx
+++ b/writerfilter/source/dmapper/TablePropertiesHandler.cxx
@@ -24,15 +24,14 @@
 #include "MeasureHandler.hxx"
 #include "TrackChangesHandler.hxx"
 #include "TablePropertiesHandler.hxx"
+#include "TagLogger.hxx"
 #include "TDefTableHandler.hxx"
 #include "DomainMapperTableManager.hxx"
 
 #include <ooxml/resourceids.hxx>
 
-#include <com/sun/star/text/SizeType.hpp>
 #include <com/sun/star/text/VertOrientation.hpp>
 #include <oox/token/tokens.hxx>
-#include "DomainMapper.hxx"
 
 using namespace com::sun::star;
 using namespace oox;
diff --git a/writerfilter/source/dmapper/TablePropertiesHandler.hxx b/writerfilter/source/dmapper/TablePropertiesHandler.hxx
index c39106af258c..16c28da8c9d1 100644
--- a/writerfilter/source/dmapper/TablePropertiesHandler.hxx
+++ b/writerfilter/source/dmapper/TablePropertiesHandler.hxx
@@ -25,8 +25,6 @@
 #include "TableManager.hxx"
 #include <dmapper/resourcemodel.hxx>
 
-#include <memory>
-
 #include <vector>
 
 namespace writerfilter {
diff --git a/writerfilter/source/dmapper/TagLogger.cxx b/writerfilter/source/dmapper/TagLogger.cxx
index 3f2c730ff266..94b65fbebece 100644
--- a/writerfilter/source/dmapper/TagLogger.cxx
+++ b/writerfilter/source/dmapper/TagLogger.cxx
@@ -19,8 +19,6 @@
 
 #include <string.h>
 #include "TagLogger.hxx"
-#include <ooxml/QNameToString.hxx>
-#include <unordered_map>
 #ifdef DBG_UTIL
 #include <unotools/pathoptions.hxx>
 #endif
diff --git a/writerfilter/source/dmapper/TagLogger.hxx b/writerfilter/source/dmapper/TagLogger.hxx
index c6332a25b372..e61895a30a50 100644
--- a/writerfilter/source/dmapper/TagLogger.hxx
+++ b/writerfilter/source/dmapper/TagLogger.hxx
@@ -21,10 +21,9 @@
 #define INCLUDED_WRITERFILTER_SOURCE_DMAPPER_TAGLOGGER_HXX
 
 #include <rtl/ustring.hxx>
+#include <tools/ref.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
-#include <dmapper/resourcemodel.hxx>
 #include <string>
-#include <memory>
 #include <libxml/xmlwriter.h>
 
 namespace writerfilter
diff --git a/writerfilter/source/dmapper/TblStylePrHandler.cxx b/writerfilter/source/dmapper/TblStylePrHandler.cxx
index c6c7d2d60688..85ea80ab780f 100644
--- a/writerfilter/source/dmapper/TblStylePrHandler.cxx
+++ b/writerfilter/source/dmapper/TblStylePrHandler.cxx
@@ -18,6 +18,7 @@
  */
 
 #include "TblStylePrHandler.hxx"
+#include "TagLogger.hxx"
 #include "CellMarginHandler.hxx"
 #include "PropertyMap.hxx"
 #include <ooxml/resourceids.hxx>
diff --git a/writerfilter/source/dmapper/TextEffectsHandler.hxx b/writerfilter/source/dmapper/TextEffectsHandler.hxx
index 42718440991a..54cf86392b7c 100644
--- a/writerfilter/source/dmapper/TextEffectsHandler.hxx
+++ b/writerfilter/source/dmapper/TextEffectsHandler.hxx
@@ -14,7 +14,6 @@
 #include "LoggedResources.hxx"
 
 #include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/lang/XComponent.hpp>
 
 #include "PropertyIds.hxx"
 
diff --git a/writerfilter/source/dmapper/ThemeTable.cxx b/writerfilter/source/dmapper/ThemeTable.cxx
index 48c01a57cbe5..255dba1e0b1e 100644
--- a/writerfilter/source/dmapper/ThemeTable.cxx
+++ b/writerfilter/source/dmapper/ThemeTable.cxx
@@ -17,10 +17,13 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include "TagLogger.hxx"
 #include "ThemeTable.hxx"
 #include <i18nlangtag/languagetag.hxx>
 #include <ooxml/resourceids.hxx>
 
+#include <map>
+
 using namespace com::sun::star;
 
 namespace writerfilter::dmapper
diff --git a/writerfilter/source/dmapper/ThemeTable.hxx b/writerfilter/source/dmapper/ThemeTable.hxx
index dda016928833..c72c53c9a652 100644
--- a/writerfilter/source/dmapper/ThemeTable.hxx
+++ b/writerfilter/source/dmapper/ThemeTable.hxx
@@ -22,9 +22,7 @@
 
 #include "LoggedResources.hxx"
 #include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/lang/XComponent.hpp>
 #include <i18nlangtag/lang.h>
-#include <map>
 #include <memory>
 
 namespace writerfilter {
diff --git a/writerfilter/source/dmapper/TrackChangesHandler.hxx b/writerfilter/source/dmapper/TrackChangesHandler.hxx
index 9143986e2ab6..e57a1ac65a77 100644
--- a/writerfilter/source/dmapper/TrackChangesHandler.hxx
+++ b/writerfilter/source/dmapper/TrackChangesHandler.hxx
@@ -11,7 +11,7 @@
 
 #include "LoggedResources.hxx"
 #include <com/sun/star/beans/PropertyValue.hpp>
-#include "DomainMapper_Impl.hxx"
+#include <dmapper/PropertyMap.hxx>
 
 namespace writerfilter {
 namespace dmapper
diff --git a/writerfilter/source/dmapper/WrapPolygonHandler.cxx b/writerfilter/source/dmapper/WrapPolygonHandler.cxx
index 862dae53e2e2..7d2526c0bbaf 100644
--- a/writerfilter/source/dmapper/WrapPolygonHandler.cxx
+++ b/writerfilter/source/dmapper/WrapPolygonHandler.cxx
@@ -22,7 +22,6 @@
 
 #include <ooxml/resourceids.hxx>
 
-#include "ConversionHelper.hxx"
 #include "WrapPolygonHandler.hxx"
 #include "util.hxx"
 
diff --git a/writerfilter/source/dmapper/WrapPolygonHandler.hxx b/writerfilter/source/dmapper/WrapPolygonHandler.hxx
index 807e78362924..db486d54953b 100644
--- a/writerfilter/source/dmapper/WrapPolygonHandler.hxx
+++ b/writerfilter/source/dmapper/WrapPolygonHandler.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_WRITERFILTER_SOURCE_DMAPPER_WRAPPOLYGONHANDLER_HXX
 #define INCLUDED_WRITERFILTER_SOURCE_DMAPPER_WRAPPOLYGONHANDLER_HXX
 
-#include <deque>
 #include <com/sun/star/drawing/PointSequenceSequence.hpp>
 #include "LoggedResources.hxx"
 #include <tools/fract.hxx>
diff --git a/writerfilter/source/dmapper/domainmapperfactory.cxx b/writerfilter/source/dmapper/domainmapperfactory.cxx
index cc581a9eabed..5b5570ad0ad1 100644
--- a/writerfilter/source/dmapper/domainmapperfactory.cxx
+++ b/writerfilter/source/dmapper/domainmapperfactory.cxx
@@ -8,6 +8,7 @@
  */
 
 #include "DomainMapper.hxx"
+#include "TagLogger.hxx"
 #include <unotools/mediadescriptor.hxx>
 
 namespace writerfilter::dmapper
diff --git a/writerfilter/source/dmapper/util.cxx b/writerfilter/source/dmapper/util.cxx
index 9c2535dea2e4..de1e2c9db24e 100644
--- a/writerfilter/source/dmapper/util.cxx
+++ b/writerfilter/source/dmapper/util.cxx
@@ -16,8 +16,7 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#include <stdlib.h>
-#include <fstream>
+
 #include <string>
 #include "util.hxx"
 
diff --git a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
index 3b963c1e34cf..285028cc9053 100644
--- a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
+++ b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
@@ -19,13 +19,10 @@
 
 #include <comphelper/sequenceashashmap.hxx>
 
-#include <com/sun/star/xml/sax/XParser.hpp>
-
 #include <com/sun/star/lang/WrappedTargetRuntimeException.hpp>
 #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
 #include <com/sun/star/xml/sax/SAXException.hpp>
 #include <com/sun/star/xml/dom/DocumentBuilder.hpp>
-#include <com/sun/star/embed/XHierarchicalStorageAccess.hpp>
 #include <ooxml/resourceids.hxx>
 #include "OOXMLStreamImpl.hxx"
 #include "OOXMLDocumentImpl.hxx"
@@ -35,9 +32,6 @@
 
 #include <sal/log.hxx>
 #include <tools/diagnose_ex.h>
-#include <unotools/resmgr.hxx>
-#include <vcl/svapp.hxx>
-#include <vcl/settings.hxx>
 #include <svx/dialmgr.hxx>
 #include <svx/strings.hrc>
 #include <comphelper/sequence.hxx>
diff --git a/writerfilter/source/ooxml/OOXMLDocumentImpl.hxx b/writerfilter/source/ooxml/OOXMLDocumentImpl.hxx
index 2bcc1e746ab0..3bc039f5c9e2 100644
--- a/writerfilter/source/ooxml/OOXMLDocumentImpl.hxx
+++ b/writerfilter/source/ooxml/OOXMLDocumentImpl.hxx
@@ -21,7 +21,6 @@
 
 #include <ooxml/OOXMLDocument.hxx>
 
-#include <com/sun/star/xml/sax/XFastTokenHandler.hpp>
 #include <com/sun/star/xml/dom/XDocument.hpp>
 
 #include "OOXMLPropertySet.hxx"
diff --git a/writerfilter/source/ooxml/OOXMLFactory.cxx b/writerfilter/source/ooxml/OOXMLFactory.cxx
index f9ba5df7e9da..6b2f1261f4f9 100644
--- a/writerfilter/source/ooxml/OOXMLFactory.cxx
+++ b/writerfilter/source/ooxml/OOXMLFactory.cxx
@@ -17,10 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <rtl/instance.hxx>
 #include <sax/fastattribs.hxx>
 #include "OOXMLFactory.hxx"
-#include "OOXMLFastHelper.hxx"
 
 namespace writerfilter::ooxml {
 
diff --git a/writerfilter/source/ooxml/OOXMLFactory.hxx b/writerfilter/source/ooxml/OOXMLFactory.hxx
index 04a71bbc92f4..abcf9c425f8e 100644
--- a/writerfilter/source/ooxml/OOXMLFactory.hxx
+++ b/writerfilter/source/ooxml/OOXMLFactory.hxx
@@ -20,14 +20,9 @@
 #ifndef INCLUDED_WRITERFILTER_SOURCE_OOXML_OOXMLFACTORY_HXX
 #define INCLUDED_WRITERFILTER_SOURCE_OOXML_OOXMLFACTORY_HXX
 
-#include <memory>
-
 #include <dmapper/resourcemodel.hxx>
 
-#include <oox/token/tokens.hxx>
-
 #include "OOXMLFastContextHandler.hxx"
-#include <boost/intrusive_ptr.hpp>
 
 namespace writerfilter {
 namespace ooxml {
diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
index 14f40a0494d8..3c57e245d9c7 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
@@ -20,10 +20,10 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/text/RelOrientation.hpp>
 #include <com/sun/star/lang/WrappedTargetRuntimeException.hpp>
-#include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/xml/sax/FastShapeContextHandler.hpp>
 #include <com/sun/star/xml/sax/SAXException.hpp>
 #include <ooxml/resourceids.hxx>
+#include <oox/mathml/import.hxx>
 #include <oox/token/namespaces.hxx>
 #include <sal/log.hxx>
 #include <comphelper/embeddedobjectcontainer.hxx>
diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
index 0cc3fb1791a9..079d49d695c2 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
@@ -25,8 +25,8 @@
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/xml/sax/XFastContextHandler.hpp>
 #include <com/sun/star/xml/sax/XFastShapeContextHandler.hpp>
-#include <oox/mathml/import.hxx>
 #include <oox/mathml/importutils.hxx>
+#include <rtl/ref.hxx>
 #include "OOXMLParserState.hxx"
 #include "OOXMLPropertySet.hxx"
 
diff --git a/writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx b/writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx
index 066781095749..e7f8225b13b1 100644
--- a/writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx
+++ b/writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx
@@ -24,9 +24,8 @@
 #include <cppuhelper/implbase.hxx>
 #include <com/sun/star/xml/sax/XFastDocumentHandler.hpp>
 #include <dmapper/resourcemodel.hxx>
-#include <ooxml/OOXMLDocument.hxx>
+#include <ooxml/OOXMLDocumentImpl.hxx>
 #include <rtl/ref.hxx>
-#include "OOXMLParserState.hxx"
 
 namespace writerfilter {
 namespace ooxml
diff --git a/writerfilter/source/ooxml/OOXMLFastHelper.hxx b/writerfilter/source/ooxml/OOXMLFastHelper.hxx
index 7c92553a9639..fcf162f44949 100644
--- a/writerfilter/source/ooxml/OOXMLFastHelper.hxx
+++ b/writerfilter/source/ooxml/OOXMLFastHelper.hxx
@@ -19,8 +19,6 @@
 #ifndef INCLUDED_WRITERFILTER_SOURCE_OOXML_OOXMLFASTHELPER_HXX
 #define INCLUDED_WRITERFILTER_SOURCE_OOXML_OOXMLFASTHELPER_HXX
 
-#include <iostream>
-#include <ooxml/QNameToString.hxx>
 #include "OOXMLFastContextHandler.hxx"
 
 namespace writerfilter {
diff --git a/writerfilter/source/ooxml/OOXMLParserState.cxx b/writerfilter/source/ooxml/OOXMLParserState.cxx
index fb7ad574457f..576e97c8ce7a 100644
--- a/writerfilter/source/ooxml/OOXMLParserState.cxx
+++ b/writerfilter/source/ooxml/OOXMLParserState.cxx
@@ -17,8 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <stdio.h>
-#include <iostream>
 #include "OOXMLParserState.hxx"
 #include "Handler.hxx"
 
diff --git a/writerfilter/source/ooxml/OOXMLPropertySet.cxx b/writerfilter/source/ooxml/OOXMLPropertySet.cxx
index 15e3fc5523ea..23a6e7861231 100644
--- a/writerfilter/source/ooxml/OOXMLPropertySet.cxx
+++ b/writerfilter/source/ooxml/OOXMLPropertySet.cxx
@@ -22,7 +22,6 @@
 #include <iostream>
 #include <ooxml/QNameToString.hxx>
 #include <com/sun/star/drawing/XShape.hpp>
-#include <oox/token/tokens.hxx>
 #include <sax/tools/converter.hxx>
 #include <tools/color.hxx>
 
diff --git a/writerfilter/source/ooxml/OOXMLStreamImpl.cxx b/writerfilter/source/ooxml/OOXMLStreamImpl.cxx
index d29cdf5b6a00..73e527a5543e 100644
--- a/writerfilter/source/ooxml/OOXMLStreamImpl.cxx
+++ b/writerfilter/source/ooxml/OOXMLStreamImpl.cxx
@@ -19,11 +19,9 @@
 
 #include "OOXMLStreamImpl.hxx"
 #include <oox/core/fasttokenhandler.hxx>
-#include <iostream>
 
 #include <com/sun/star/embed/XHierarchicalStorageAccess.hpp>
 #include <com/sun/star/uri/UriReferenceFactory.hpp>
-#include <com/sun/star/xml/sax/Parser.hpp>
 #include <comphelper/storagehelper.hxx>
 
 namespace writerfilter::ooxml
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.hxx b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
index 99e91aace902..d55217c708b5 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.hxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
@@ -10,6 +10,7 @@
 #ifndef INCLUDED_WRITERFILTER_SOURCE_RTFTOK_RTFDOCUMENTIMPL_HXX
 #define INCLUDED_WRITERFILTER_SOURCE_RTFTOK_RTFDOCUMENTIMPL_HXX
 
+#include <memory>
 #include <queue>
 #include <tuple>
 #include <vector>
diff --git a/writerfilter/source/rtftok/rtffly.hxx b/writerfilter/source/rtftok/rtffly.hxx
index 9b40332fea93..7dff01d67a19 100644
--- a/writerfilter/source/rtftok/rtffly.hxx
+++ b/writerfilter/source/rtftok/rtffly.hxx
@@ -14,6 +14,7 @@
 #include <com/sun/star/text/RelOrientation.hpp>
 #include <com/sun/star/text/VertOrientation.hpp>
 
+#include <ooxml/resourceids.hxx>
 #include <osl/endian.h>
 
 namespace writerfilter