tdf#42949 Fix IWYU warnings in xmloff/source/*/*hxx

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

Change-Id: Iaad32419c49406a11f7cfb5856b33539d2a2894b
Reviewed-on: https://gerrit.libreoffice.org/79077
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>

66 files changed, 81 insertions, 74 deletions

diff --git a/xmloff/IwyuFilter_xmloff.yaml b/xmloff/IwyuFilter_xmloff.yaml
index 51d2715014db..c9ecaf5bef5e 100644
--- a/xmloff/IwyuFilter_xmloff.yaml
+++ b/xmloff/IwyuFilter_xmloff.yaml
@@ -7,3 +7,26 @@ blacklist:
     xmloff/inc/XMLTextColumnsExport.hxx:
     # Needed for css shortcut
     - sal/types.h
+    xmloff/source/chart/PropertyMap.hxx:
+    # Needed for constants used in arrays
+    - xmloff/maptype.hxx
+    - xmloff/xmlnmspe.hxx
+    - xmloff/xmlement.hxx
+    - com/sun/star/chart/ChartAxisArrangeOrderType.hpp
+    - com/sun/star/chart/ChartAxisLabelPosition.hpp
+    - com/sun/star/chart/ChartAxisMarkPosition.hpp
+    - com/sun/star/chart/ErrorBarStyle.hpp
+    - com/sun/star/chart/ChartSolidType.hpp
+    - com/sun/star/chart/ChartDataRowSource.hpp
+    - com/sun/star/chart/DataLabelPlacement.hpp
+    - com/sun/star/chart/MissingValueTreatment.hpp
+    xmloff/source/forms/logging.hxx:
+    # Used after #ifdef TIMELOG
+    - stack
+    - sal/types.h
+    xmloff/source/forms/propertyexport.hxx:
+    # Used after #ifdef in non-DBG_UTIL builds
+    - xmloff/xmlexp.hxx
+    xmloff/source/xforms/XFormsModelExport.hxx:
+    # Needed for css shortcut
+    - sal/types.h
diff --git a/xmloff/source/chart/MultiPropertySetHandler.hxx b/xmloff/source/chart/MultiPropertySetHandler.hxx
index 0184b4e7a110..ddbd9881f5de 100644
--- a/xmloff/source/chart/MultiPropertySetHandler.hxx
+++ b/xmloff/source/chart/MultiPropertySetHandler.hxx
@@ -20,6 +20,7 @@
 #ifndef INCLUDED_XMLOFF_SOURCE_CHART_MULTIPROPERTYSETHANDLER_HXX
 #define INCLUDED_XMLOFF_SOURCE_CHART_MULTIPROPERTYSETHANDLER_HXX
 
+#include <map>
 #include <memory>
 
 #include <rtl/ustring.hxx>
diff --git a/xmloff/source/chart/PropertyMap.hxx b/xmloff/source/chart/PropertyMap.hxx
index f00726a65b3e..aa132990bc3b 100644
--- a/xmloff/source/chart/PropertyMap.hxx
+++ b/xmloff/source/chart/PropertyMap.hxx
@@ -21,7 +21,6 @@
 
 #include <xmloff/maptype.hxx>
 #include <xmloff/xmlnmspe.hxx>
-#include <xmloff/xmltoken.hxx>
 #include <xmloff/xmltypes.hxx>
 #include <xmloff/contextid.hxx>
 #include <xmloff/xmlement.hxx>
@@ -29,7 +28,6 @@
 #include <com/sun/star/chart/ChartAxisLabelPosition.hpp>
 #include <com/sun/star/chart/ChartAxisMarkPosition.hpp>
 #include <com/sun/star/chart/ErrorBarStyle.hpp>
-#include <com/sun/star/chart/ChartErrorIndicatorType.hpp>
 #include <com/sun/star/chart/ChartSolidType.hpp>
 #include <com/sun/star/chart/ChartDataRowSource.hpp>
 #include <com/sun/star/chart/DataLabelPlacement.hpp>
diff --git a/xmloff/source/chart/SchXMLAxisContext.cxx b/xmloff/source/chart/SchXMLAxisContext.cxx
index 2af9b89b3ffb..aaa3b6f75bf1 100644
--- a/xmloff/source/chart/SchXMLAxisContext.cxx
+++ b/xmloff/source/chart/SchXMLAxisContext.cxx
@@ -22,6 +22,7 @@
 #include "SchXMLAxisContext.hxx"
 #include "SchXMLChartContext.hxx"
 #include "SchXMLTools.hxx"
+#include <xmloff/xmlimp.hxx>
 #include <xmloff/xmlnmspe.hxx>
 #include <xmloff/xmlement.hxx>
 #include <xmloff/xmlstyle.hxx>
@@ -41,6 +42,7 @@
 #include <com/sun/star/chart/TimeUnit.hpp>
 #include <com/sun/star/chart/XAxis.hpp>
 #include <com/sun/star/chart/XAxisSupplier.hpp>
+#include <com/sun/star/chart/XChartDocument.hpp>
 #include <com/sun/star/chart2/AxisType.hpp>
 #include <com/sun/star/chart2/XChartDocument.hpp>
 #include <com/sun/star/chart2/XCoordinateSystemContainer.hpp>
diff --git a/xmloff/source/chart/SchXMLAxisContext.hxx b/xmloff/source/chart/SchXMLAxisContext.hxx
index e553f6e0a95b..f5e16577f61e 100644
--- a/xmloff/source/chart/SchXMLAxisContext.hxx
+++ b/xmloff/source/chart/SchXMLAxisContext.hxx
@@ -19,10 +19,13 @@
 #ifndef INCLUDED_XMLOFF_SOURCE_CHART_SCHXMLAXISCONTEXT_HXX
 #define INCLUDED_XMLOFF_SOURCE_CHART_SCHXMLAXISCONTEXT_HXX
 
-#include <SchXMLImport.hxx>
+#include <xmloff/SchXMLImportHelper.hxx>
+#include <xmloff/xmlictxt.hxx>
+
 #include "transporttypes.hxx"
 
-#include <com/sun/star/chart/XChartDocument.hpp>
+#include <com/sun/star/chart/XDiagram.hpp>
+#include <com/sun/star/xml/sax/XAttributeList.hpp>
 
 class SchXMLAxisContext : public SvXMLImportContext
 {
diff --git a/xmloff/source/chart/SchXMLChartContext.hxx b/xmloff/source/chart/SchXMLChartContext.hxx
index c1d872eeeee3..c0dca6e654fc 100644
--- a/xmloff/source/chart/SchXMLChartContext.hxx
+++ b/xmloff/source/chart/SchXMLChartContext.hxx
@@ -22,12 +22,10 @@
 #include <xmloff/xmlictxt.hxx>
 #include <com/sun/star/drawing/XShape.hpp>
 #include <com/sun/star/chart/ChartDataRowSource.hpp>
-#include <com/sun/star/chart2/XChartDocument.hpp>
 #include <com/sun/star/awt/Size.hpp>
 
 #include "transporttypes.hxx"
 
-#include <list>
 #include <vector>
 
 class SchXMLImportHelper;
diff --git a/xmloff/source/chart/SchXMLLegendContext.cxx b/xmloff/source/chart/SchXMLLegendContext.cxx
index c1c3da637a5d..29b7ba09e960 100644
--- a/xmloff/source/chart/SchXMLLegendContext.cxx
+++ b/xmloff/source/chart/SchXMLLegendContext.cxx
@@ -20,6 +20,7 @@
 #include "SchXMLLegendContext.hxx"
 #include "SchXMLEnumConverter.hxx"
 
+#include <xmloff/xmlimp.hxx>
 #include <xmloff/xmlnmspe.hxx>
 #include <xmloff/xmlement.hxx>
 #include <xmloff/prstylei.hxx>
diff --git a/xmloff/source/chart/SchXMLLegendContext.hxx b/xmloff/source/chart/SchXMLLegendContext.hxx
index 3b29fde944c1..2d0c46981229 100644
--- a/xmloff/source/chart/SchXMLLegendContext.hxx
+++ b/xmloff/source/chart/SchXMLLegendContext.hxx
@@ -19,7 +19,10 @@
 #ifndef INCLUDED_XMLOFF_SOURCE_CHART_SCHXMLLEGENDCONTEXT_HXX
 #define INCLUDED_XMLOFF_SOURCE_CHART_SCHXMLLEGENDCONTEXT_HXX
 
-#include <SchXMLImport.hxx>
+#include <com/sun/star/xml/sax/XAttributeList.hpp>
+
+#include <xmloff/SchXMLImportHelper.hxx>
+#include <xmloff/xmlictxt.hxx>
 
 class SchXMLLegendContext : public SvXMLImportContext
 {
diff --git a/xmloff/source/chart/SchXMLPlotAreaContext.cxx b/xmloff/source/chart/SchXMLPlotAreaContext.cxx
index 8f50bf322fbe..9fe59162480a 100644
--- a/xmloff/source/chart/SchXMLPlotAreaContext.cxx
+++ b/xmloff/source/chart/SchXMLPlotAreaContext.cxx
@@ -46,7 +46,9 @@
 #include <com/sun/star/chart/X3DDisplay.hpp>
 #include <com/sun/star/chart/XStatisticDisplay.hpp>
 #include <com/sun/star/chart/XDiagramPositioning.hpp>
+#include <com/sun/star/chart/XChartDocument.hpp>
 #include <com/sun/star/chart2/RelativePosition.hpp>
+#include <com/sun/star/chart2/XChartDocument.hpp>
 #include <com/sun/star/chart2/XChartTypeContainer.hpp>
 #include <com/sun/star/chart2/XDataSeriesContainer.hpp>
 #include <com/sun/star/chart2/data/XDataSink.hpp>
diff --git a/xmloff/source/chart/SchXMLPlotAreaContext.hxx b/xmloff/source/chart/SchXMLPlotAreaContext.hxx
index a35723150403..c6e89274ac95 100644
--- a/xmloff/source/chart/SchXMLPlotAreaContext.hxx
+++ b/xmloff/source/chart/SchXMLPlotAreaContext.hxx
@@ -19,10 +19,11 @@
 #ifndef INCLUDED_XMLOFF_SOURCE_CHART_SCHXMLPLOTAREACONTEXT_HXX
 #define INCLUDED_XMLOFF_SOURCE_CHART_SCHXMLPLOTAREACONTEXT_HXX
 
-#include <SchXMLImport.hxx>
 #include "SchXMLChartContext.hxx"
+#include <xmloff/txtimp.hxx>
 #include <xmloff/xmlictxt.hxx>
 #include <xmloff/shapeimport.hxx>
+#include <com/sun/star/awt/Rectangle.hpp>
 #include <com/sun/star/chart/ChartDataRowSource.hpp>
 
 #include "transporttypes.hxx"
diff --git a/xmloff/source/chart/SchXMLPropertyMappingContext.cxx b/xmloff/source/chart/SchXMLPropertyMappingContext.cxx
index 7f193316cb69..893748edf83b 100644
--- a/xmloff/source/chart/SchXMLPropertyMappingContext.cxx
+++ b/xmloff/source/chart/SchXMLPropertyMappingContext.cxx
@@ -19,6 +19,7 @@
 #include <com/sun/star/chart2/data/XLabeledDataSequence2.hpp>
 #include <com/sun/star/chart2/data/XDataSource.hpp>
 #include <com/sun/star/chart2/data/XDataSink.hpp>
+#include <com/sun/star/chart2/XChartDocument.hpp>
 
 using namespace com::sun::star;
 using namespace com::sun::star::uno;
diff --git a/xmloff/source/chart/SchXMLPropertyMappingContext.hxx b/xmloff/source/chart/SchXMLPropertyMappingContext.hxx
index 2c9e82c2a6a5..127c259b748e 100644
--- a/xmloff/source/chart/SchXMLPropertyMappingContext.hxx
+++ b/xmloff/source/chart/SchXMLPropertyMappingContext.hxx
@@ -11,7 +11,6 @@
 #define INCLUDED_XMLOFF_SOURCE_CHART_SCHXMLPROPERTYMAPPINGCONTEXT_HXX
 
 #include "transporttypes.hxx"
-#include "SchXMLChartContext.hxx"
 #include <xmloff/xmlictxt.hxx>
 #include <xmloff/SchXMLImportHelper.hxx>
 
diff --git a/xmloff/source/chart/SchXMLRegressionCurveObjectContext.cxx b/xmloff/source/chart/SchXMLRegressionCurveObjectContext.cxx
index 1f4d7ef504fe..96ffce0f921f 100644
--- a/xmloff/source/chart/SchXMLRegressionCurveObjectContext.cxx
+++ b/xmloff/source/chart/SchXMLRegressionCurveObjectContext.cxx
@@ -19,6 +19,8 @@
 
 #include "SchXMLRegressionCurveObjectContext.hxx"
 
+#include <SchXMLImport.hxx>
+
 #include <sax/tools/converter.hxx>
 
 #include <xmloff/nmspmap.hxx>
@@ -33,6 +35,7 @@
 #include <com/sun/star/awt/Point.hpp>
 #include <com/sun/star/chart2/RegressionEquation.hpp>
 #include <com/sun/star/chart2/RelativePosition.hpp>
+#include <com/sun/star/xml/sax/XAttributeList.hpp>
 
 using namespace com::sun::star;
 using namespace xmloff::token;
diff --git a/xmloff/source/chart/SchXMLRegressionCurveObjectContext.hxx b/xmloff/source/chart/SchXMLRegressionCurveObjectContext.hxx
index 46376c447374..72cf7cdb0116 100644
--- a/xmloff/source/chart/SchXMLRegressionCurveObjectContext.hxx
+++ b/xmloff/source/chart/SchXMLRegressionCurveObjectContext.hxx
@@ -19,12 +19,9 @@
 #ifndef INCLUDED_XMLOFF_SOURCE_CHART_SCHXMLREGRESSIONCURVEOBJECTCONTEXT_HXX
 #define INCLUDED_XMLOFF_SOURCE_CHART_SCHXMLREGRESSIONCURVEOBJECTCONTEXT_HXX
 
-#include <SchXMLImport.hxx>
-
 #include <com/sun/star/awt/Size.hpp>
 #include <xmloff/xmlictxt.hxx>
-#include <xmloff/shapeimport.hxx>
-#include <list>
+#include <xmloff/SchXMLImportHelper.hxx>
 
 #include "transporttypes.hxx"
 
diff --git a/xmloff/source/chart/SchXMLSeries2Context.cxx b/xmloff/source/chart/SchXMLSeries2Context.cxx
index 0640bc98881f..8dccecc0f564 100644
--- a/xmloff/source/chart/SchXMLSeries2Context.cxx
+++ b/xmloff/source/chart/SchXMLSeries2Context.cxx
@@ -32,6 +32,7 @@
 #include <com/sun/star/chart2/data/XDataReceiver.hpp>
 #include <com/sun/star/chart2/data/XPivotTableDataProvider.hpp>
 
+#include <com/sun/star/awt/Rectangle.hpp>
 #include <com/sun/star/chart/ChartAxisAssign.hpp>
 #include <com/sun/star/chart/ChartSymbolType.hpp>
 #include <com/sun/star/chart/XChartDocument.hpp>
diff --git a/xmloff/source/chart/SchXMLSeries2Context.hxx b/xmloff/source/chart/SchXMLSeries2Context.hxx
index effb996a1217..cbf0b2a52cdd 100644
--- a/xmloff/source/chart/SchXMLSeries2Context.hxx
+++ b/xmloff/source/chart/SchXMLSeries2Context.hxx
@@ -26,7 +26,6 @@
 #include <xmloff/xmlstyle.hxx>
 
 #include <vector>
-#include <list>
 
 namespace com { namespace sun { namespace star {
     namespace chart2 {
diff --git a/xmloff/source/chart/SchXMLTableContext.hxx b/xmloff/source/chart/SchXMLTableContext.hxx
index df6d0999475f..c633a37f7966 100644
--- a/xmloff/source/chart/SchXMLTableContext.hxx
+++ b/xmloff/source/chart/SchXMLTableContext.hxx
@@ -20,7 +20,7 @@
 #define INCLUDED_XMLOFF_SOURCE_CHART_SCHXMLTABLECONTEXT_HXX
 
 #include <xmloff/xmlictxt.hxx>
-#include <SchXMLImport.hxx>
+#include <xmloff/SchXMLImportHelper.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 
 #include <com/sun/star/chart/ChartDataRowSource.hpp>
diff --git a/xmloff/source/chart/contexts.hxx b/xmloff/source/chart/contexts.hxx
index c2980d800682..26f988b433ee 100644
--- a/xmloff/source/chart/contexts.hxx
+++ b/xmloff/source/chart/contexts.hxx
@@ -20,9 +20,7 @@
 #define INCLUDED_XMLOFF_SOURCE_CHART_CONTEXTS_HXX
 
 #include <SchXMLImport.hxx>
-#include "SchXMLTableContext.hxx"
 #include <xmloff/xmlictxt.hxx>
-#include <xmloff/xmltkmap.hxx>
 
 #include <xmloff/xmlmetai.hxx>
 
diff --git a/xmloff/source/draw/XMLShapePropertySetContext.cxx b/xmloff/source/draw/XMLShapePropertySetContext.cxx
index 6ac505750b54..692138804377 100644
--- a/xmloff/source/draw/XMLShapePropertySetContext.cxx
+++ b/xmloff/source/draw/XMLShapePropertySetContext.cxx
@@ -21,6 +21,7 @@
 #include <xmloff/xmlimp.hxx>
 #include <xmloff/xmlnumi.hxx>
 #include <xmltabi.hxx>
+#include <xmlsdtypes.hxx>
 #include <xmloff/txtprmap.hxx>
 #include <xmloff/xmlimppr.hxx>
 
diff --git a/xmloff/source/draw/XMLShapeStyleContext.cxx b/xmloff/source/draw/XMLShapeStyleContext.cxx
index 51c74f523799..42d55cc022c0 100644
--- a/xmloff/source/draw/XMLShapeStyleContext.cxx
+++ b/xmloff/source/draw/XMLShapeStyleContext.cxx
@@ -36,6 +36,7 @@
 #include <xmloff/maptype.hxx>
 #include <xmloff/xmlimppr.hxx>
 
+#include <xmlsdtypes.hxx>
 #include "sdpropls.hxx"
 
 using namespace ::com::sun::star;
diff --git a/xmloff/source/draw/animationexport.cxx b/xmloff/source/draw/animationexport.cxx
index 7382888d08f9..efe49b08e4aa 100644
--- a/xmloff/source/draw/animationexport.cxx
+++ b/xmloff/source/draw/animationexport.cxx
@@ -61,6 +61,7 @@
 #include <xmloff/unointerfacetouniqueidentifiermapper.hxx>
 #include "sdxmlexp_impl.hxx"
 #include "sdpropls.hxx"
+#include <xmlsdtypes.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmlnmspe.hxx>
 #include <xmloff/xmluconv.hxx>
diff --git a/xmloff/source/draw/animationimport.cxx b/xmloff/source/draw/animationimport.cxx
index ec503602ee26..437bd1a3c531 100644
--- a/xmloff/source/draw/animationimport.cxx
+++ b/xmloff/source/draw/animationimport.cxx
@@ -65,6 +65,7 @@
 #include <xmloff/xmlprhdl.hxx>
 #include <anim.hxx>
 #include <facreg.hxx>
+#include <xmlsdtypes.hxx>
 
 #include <animations.hxx>
 #include <animationimport.hxx>
diff --git a/xmloff/source/draw/sdpropls.hxx b/xmloff/source/draw/sdpropls.hxx
index cbbcd024b11c..4e2bedb5a79d 100644
--- a/xmloff/source/draw/sdpropls.hxx
+++ b/xmloff/source/draw/sdpropls.hxx
@@ -25,12 +25,10 @@
 #include <com/sun/star/drawing/CircleKind.hpp>
 #include <xmloff/xmlnume.hxx>
 #include <xmloff/maptype.hxx>
-#include <xmloff/xmltypes.hxx>
 #include <xmloff/xmlement.hxx>
 #include <xmloff/prhdlfac.hxx>
 #include <xmloff/xmlprmap.hxx>
 #include <xmloff/xmlexppr.hxx>
-#include <xmlsdtypes.hxx>
 
 // entry list for graphic properties
 
diff --git a/xmloff/source/draw/sdxmlexp_impl.hxx b/xmloff/source/draw/sdxmlexp_impl.hxx
index 79d728d47ed8..1ececf77ff0d 100644
--- a/xmloff/source/draw/sdxmlexp_impl.hxx
+++ b/xmloff/source/draw/sdxmlexp_impl.hxx
@@ -22,7 +22,6 @@
 
 #include <xmloff/xmlexp.hxx>
 
-#include <com/sun/star/task/XStatusIndicator.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/drawing/XDrawPage.hpp>
 
diff --git a/xmloff/source/draw/ximp3dobject.cxx b/xmloff/source/draw/ximp3dobject.cxx
index ed0a701d5976..ccdbee0317b9 100644
--- a/xmloff/source/draw/ximp3dobject.cxx
+++ b/xmloff/source/draw/ximp3dobject.cxx
@@ -30,6 +30,8 @@
 #include <xmloff/xmltoken.hxx>
 #include <com/sun/star/drawing/PolyPolygonShape3D.hpp>
 #include <com/sun/star/drawing/DoubleSequence.hpp>
+#include <com/sun/star/drawing/Direction3D.hpp>
+#include <com/sun/star/drawing/Position3D.hpp>
 #include <osl/diagnose.h>
 #include <basegfx/polygon/b2dpolypolygon.hxx>
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
diff --git a/xmloff/source/draw/ximp3dobject.hxx b/xmloff/source/draw/ximp3dobject.hxx
index dbafadbe5615..5aad793478b7 100644
--- a/xmloff/source/draw/ximp3dobject.hxx
+++ b/xmloff/source/draw/ximp3dobject.hxx
@@ -20,13 +20,8 @@
 #ifndef INCLUDED_XMLOFF_SOURCE_DRAW_XIMP3DOBJECT_HXX
 #define INCLUDED_XMLOFF_SOURCE_DRAW_XIMP3DOBJECT_HXX
 
-#include <xmloff/xmlictxt.hxx>
-#include "sdxmlimp_impl.hxx"
-#include <xmloff/nmspmap.hxx>
 #include <com/sun/star/drawing/XShapes.hpp>
 #include <com/sun/star/drawing/HomogenMatrix.hpp>
-#include <com/sun/star/drawing/Direction3D.hpp>
-#include <com/sun/star/drawing/Position3D.hpp>
 #include "ximpshap.hxx"
 
 // common shape context
diff --git a/xmloff/source/draw/ximp3dscene.hxx b/xmloff/source/draw/ximp3dscene.hxx
index 89a838b2d5f6..7597857a9205 100644
--- a/xmloff/source/draw/ximp3dscene.hxx
+++ b/xmloff/source/draw/ximp3dscene.hxx
@@ -21,8 +21,6 @@
 #define INCLUDED_XMLOFF_SOURCE_DRAW_XIMP3DSCENE_HXX
 
 #include <xmloff/xmlictxt.hxx>
-#include "sdxmlimp_impl.hxx"
-#include <xmloff/nmspmap.hxx>
 #include <com/sun/star/drawing/XShapes.hpp>
 #include "ximpshap.hxx"
 
diff --git a/xmloff/source/draw/ximpbody.hxx b/xmloff/source/draw/ximpbody.hxx
index bb6df0fcef2d..a23826462a78 100644
--- a/xmloff/source/draw/ximpbody.hxx
+++ b/xmloff/source/draw/ximpbody.hxx
@@ -22,7 +22,6 @@
 
 #include <xmloff/xmlictxt.hxx>
 #include "sdxmlimp_impl.hxx"
-#include <xmloff/nmspmap.hxx>
 #include "ximppage.hxx"
 
 // draw:page context
diff --git a/xmloff/source/draw/ximpcustomshape.hxx b/xmloff/source/draw/ximpcustomshape.hxx
index 218f6e5267bb..da9a9d7613e3 100644
--- a/xmloff/source/draw/ximpcustomshape.hxx
+++ b/xmloff/source/draw/ximpcustomshape.hxx
@@ -28,7 +28,6 @@
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/beans/PropertyValues.hpp>
 #include <com/sun/star/drawing/XShape.hpp>
-#include <com/sun/star/drawing/EnhancedCustomShapeParameter.hpp>
 
 namespace com { namespace sun { namespace star {
     namespace container { class XIndexContainer; }
diff --git a/xmloff/source/draw/ximpgrp.hxx b/xmloff/source/draw/ximpgrp.hxx
index 7c585ebf2342..c3f6726238eb 100644
--- a/xmloff/source/draw/ximpgrp.hxx
+++ b/xmloff/source/draw/ximpgrp.hxx
@@ -21,8 +21,6 @@
 #define INCLUDED_XMLOFF_SOURCE_DRAW_XIMPGRP_HXX
 
 #include <xmloff/xmlictxt.hxx>
-#include "sdxmlimp_impl.hxx"
-#include <xmloff/nmspmap.hxx>
 #include <com/sun/star/drawing/XShapes.hpp>
 #include "ximpshap.hxx"
 
diff --git a/xmloff/source/draw/ximplink.cxx b/xmloff/source/draw/ximplink.cxx
index 1e891ff1f167..9de9cb753cca 100644
--- a/xmloff/source/draw/ximplink.cxx
+++ b/xmloff/source/draw/ximplink.cxx
@@ -17,7 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include<xmloff/xmlnmspe.hxx>
+#include <xmloff/xmlimp.hxx>
+#include <xmloff/xmlnmspe.hxx>
 #include "ximplink.hxx"
 #include <xmloff/xmltoken.hxx>
 
diff --git a/xmloff/source/draw/ximplink.hxx b/xmloff/source/draw/ximplink.hxx
index 3a52244cb7e2..e3b42ff9f6c5 100644
--- a/xmloff/source/draw/ximplink.hxx
+++ b/xmloff/source/draw/ximplink.hxx
@@ -21,10 +21,8 @@
 #define INCLUDED_XMLOFF_SOURCE_DRAW_XIMPLINK_HXX
 
 #include <xmloff/xmlictxt.hxx>
-#include "sdxmlimp_impl.hxx"
-#include <xmloff/nmspmap.hxx>
+#include <xmloff/shapeimport.hxx>
 #include <com/sun/star/drawing/XShapes.hpp>
-#include "ximpshap.hxx"
 
 // draw:a context
 
diff --git a/xmloff/source/draw/ximpnote.hxx b/xmloff/source/draw/ximpnote.hxx
index 7c16c041bc7d..1e66b3ce1ced 100644
--- a/xmloff/source/draw/ximpnote.hxx
+++ b/xmloff/source/draw/ximpnote.hxx
@@ -20,9 +20,7 @@
 #ifndef INCLUDED_XMLOFF_SOURCE_DRAW_XIMPNOTE_HXX
 #define INCLUDED_XMLOFF_SOURCE_DRAW_XIMPNOTE_HXX
 
-#include <xmloff/xmlictxt.hxx>
 #include "sdxmlimp_impl.hxx"
-#include <xmloff/nmspmap.hxx>
 #include "ximppage.hxx"
 
 // presentation:notes context
diff --git a/xmloff/source/draw/ximppage.hxx b/xmloff/source/draw/ximppage.hxx
index 024d35284b62..4705726c6a2f 100644
--- a/xmloff/source/draw/ximppage.hxx
+++ b/xmloff/source/draw/ximppage.hxx
@@ -22,10 +22,8 @@
 
 #include <xmloff/xmlictxt.hxx>
 #include "sdxmlimp_impl.hxx"
-#include <xmloff/nmspmap.hxx>
 #include <com/sun/star/drawing/XShapes.hpp>
 #include <com/sun/star/office/XAnnotationAccess.hpp>
-#include "ximpshap.hxx"
 
 // draw:g context (RECURSIVE)
 
diff --git a/xmloff/source/draw/ximpshap.hxx b/xmloff/source/draw/ximpshap.hxx
index c1e34a138093..acdd2de8ff13 100644
--- a/xmloff/source/draw/ximpshap.hxx
+++ b/xmloff/source/draw/ximpshap.hxx
@@ -20,8 +20,6 @@
 #ifndef INCLUDED_XMLOFF_SOURCE_DRAW_XIMPSHAP_HXX
 #define INCLUDED_XMLOFF_SOURCE_DRAW_XIMPSHAP_HXX
 
-#include <config_features.h>
-
 #include <com/sun/star/io/XOutputStream.hpp>
 #include <com/sun/star/document/XActionLockable.hpp>
 #include <com/sun/star/drawing/Alignment.hpp>
@@ -30,8 +28,6 @@
 #include <com/sun/star/drawing/EscapeDirection.hpp>
 #include <com/sun/star/container/XIdentifierContainer.hpp>
 #include <xmloff/xmlictxt.hxx>
-#include "sdxmlimp_impl.hxx"
-#include <xmloff/nmspmap.hxx>
 #include <com/sun/star/drawing/XShapes.hpp>
 #include <com/sun/star/text/XTextCursor.hpp>
 #include <com/sun/star/awt/Point.hpp>
diff --git a/xmloff/source/draw/ximpstyl.cxx b/xmloff/source/draw/ximpstyl.cxx
index 4259097e9540..08b345dcaa48 100644
--- a/xmloff/source/draw/ximpstyl.cxx
+++ b/xmloff/source/draw/ximpstyl.cxx
@@ -23,6 +23,7 @@
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmluconv.hxx>
 #include "ximpnote.hxx"
+#include <xmlsdtypes.hxx>
 #include <tools/debug.hxx>
 #include <osl/diagnose.h>
 #include <sal/log.hxx>
diff --git a/xmloff/source/draw/ximpstyl.hxx b/xmloff/source/draw/ximpstyl.hxx
index 5b9a73e2b7de..bc0a2b09aa23 100644
--- a/xmloff/source/draw/ximpstyl.hxx
+++ b/xmloff/source/draw/ximpstyl.hxx
@@ -20,7 +20,10 @@
 #ifndef INCLUDED_XMLOFF_SOURCE_DRAW_XIMPSTYL_HXX
 #define INCLUDED_XMLOFF_SOURCE_DRAW_XIMPSTYL_HXX
 
+#include <svl/zforlist.hxx>
 #include <xmloff/xmlictxt.hxx>
+#include <xmloff/xmlimppr.hxx>
+#include <xmloff/xmlnumfi.hxx>
 #include "sdxmlimp_impl.hxx"
 #include "ximppage.hxx"
 #include <xmloff/xmlstyle.hxx>
diff --git a/xmloff/source/forms/callbacks.hxx b/xmloff/source/forms/callbacks.hxx
index afd36ba9b632..99b8840e8904 100644
--- a/xmloff/source/forms/callbacks.hxx
+++ b/xmloff/source/forms/callbacks.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_XMLOFF_SOURCE_FORMS_CALLBACKS_HXX
 
 #include <com/sun/star/container/XIndexAccess.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/script/ScriptEventDescriptor.hpp>
 #include <rtl/ref.hxx>
diff --git a/xmloff/source/forms/elementexport.hxx b/xmloff/source/forms/elementexport.hxx
index 18717f29c273..58b66c4f3604 100644
--- a/xmloff/source/forms/elementexport.hxx
+++ b/xmloff/source/forms/elementexport.hxx
@@ -26,8 +26,8 @@
 #include <set>
 
 #include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/container/XIndexAccess.hpp>
 #include <com/sun/star/script/ScriptEventDescriptor.hpp>
+#include <xmloff/xmlexp.hxx>
 #include "propertyexport.hxx"
 #include "callbacks.hxx"
 #include "controlelement.hxx"
diff --git a/xmloff/source/forms/elementimport.hxx b/xmloff/source/forms/elementimport.hxx
index 8f4939d911de..aa7cdfcc3d52 100644
--- a/xmloff/source/forms/elementimport.hxx
+++ b/xmloff/source/forms/elementimport.hxx
@@ -31,7 +31,6 @@
 
 #include <com/sun/star/text/XTextCursor.hpp>
 #include <com/sun/star/container/XNameContainer.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/form/XGridColumnFactory.hpp>
 #include <com/sun/star/graphic/XGraphic.hpp>
 #include <osl/diagnose.h>
diff --git a/xmloff/source/forms/formattributes.hxx b/xmloff/source/forms/formattributes.hxx
index 6de21b913e3b..285ba25fb407 100644
--- a/xmloff/source/forms/formattributes.hxx
+++ b/xmloff/source/forms/formattributes.hxx
@@ -24,9 +24,9 @@
 
 #include <map>
 
-#include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/uno/Type.hxx>
+#include <rtl/ustring.hxx>
 #include <sal/types.h>
-#include <salhelper/simplereferenceobject.hxx>
 #include <xmloff/xmlnmspe.hxx>
 #include <o3tl/typed_flags_set.hxx>
 
diff --git a/xmloff/source/forms/formcellbinding.hxx b/xmloff/source/forms/formcellbinding.hxx
index d2422fccba48..c59da3917e6f 100644
--- a/xmloff/source/forms/formcellbinding.hxx
+++ b/xmloff/source/forms/formcellbinding.hxx
@@ -26,7 +26,6 @@
 #include <com/sun/star/table/CellRangeAddress.hpp>
 #include <com/sun/star/form/binding/XValueBinding.hpp>
 #include <com/sun/star/form/binding/XListEntrySource.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/frame/XModel.hpp>
 
 namespace xmloff
diff --git a/xmloff/source/forms/layerimport.hxx b/xmloff/source/forms/layerimport.hxx
index 515fffe464ff..6913803384af 100644
--- a/xmloff/source/forms/layerimport.hxx
+++ b/xmloff/source/forms/layerimport.hxx
@@ -29,9 +29,7 @@
 #include <com/sun/star/form/XFormsSupplier2.hpp>
 #include <rtl/ref.hxx>
 #include "formattributes.hxx"
-#include "callbacks.hxx"
 #include "eventimport.hxx"
-#include <tools/ref.hxx>
 
 class SvXMLImport;
 class SvXMLImportContext;
diff --git a/xmloff/source/forms/officeforms.hxx b/xmloff/source/forms/officeforms.hxx
index 2567f665219a..1011f523c1b0 100644
--- a/xmloff/source/forms/officeforms.hxx
+++ b/xmloff/source/forms/officeforms.hxx
@@ -20,6 +20,8 @@
 #ifndef INCLUDED_XMLOFF_SOURCE_FORMS_OFFICEFORMS_HXX
 #define INCLUDED_XMLOFF_SOURCE_FORMS_OFFICEFORMS_HXX
 
+#include <com/sun/star/beans/XPropertySet.hpp>
+
 #include "formattributes.hxx"
 #include <xmloff/xmlictxt.hxx>
 #include <memory>
diff --git a/xmloff/source/forms/propertyexport.hxx b/xmloff/source/forms/propertyexport.hxx
index e1779d041b6b..d79c8cdb08ca 100644
--- a/xmloff/source/forms/propertyexport.hxx
+++ b/xmloff/source/forms/propertyexport.hxx
@@ -27,6 +27,7 @@
 #include "formattributes.hxx"
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/beans/XPropertyState.hpp>
+#include <xmloff/xmltoken.hxx>
 #include <xmloff/xmlexp.hxx>
 #include "callbacks.hxx"
 #include "strings.hxx"
diff --git a/xmloff/source/style/impastpl.hxx b/xmloff/source/style/impastpl.hxx
index cd632d76edca..e6d04d3c1a73 100644
--- a/xmloff/source/style/impastpl.hxx
+++ b/xmloff/source/style/impastpl.hxx
@@ -26,15 +26,11 @@
 #include <set>
 #include <memory>
 #include <vector>
-#include <com/sun/star/uno/Reference.h>
-#include <com/sun/star/xml/sax/XAttributeList.hpp>
-#include <com/sun/star/xml/sax/XDocumentHandler.hpp>
 
 #include <comphelper/stl_types.hxx>
 
 #include <xmloff/maptype.hxx>
 #include <xmloff/xmlexppr.hxx>
-#include <xmloff/xmlprmap.hxx>
 #include <xmloff/AutoStyleEntry.hxx>
 
 class SvXMLAutoStylePoolP;
diff --git a/xmloff/source/style/xmlaustp.cxx b/xmloff/source/style/xmlaustp.cxx
index 139e26a2182c..6e4cc47eea08 100644
--- a/xmloff/source/style/xmlaustp.cxx
+++ b/xmloff/source/style/xmlaustp.cxx
@@ -25,6 +25,7 @@
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmlexp.hxx>
 #include <xmloff/xmlprhdl.hxx>
+#include <xmloff/xmlprmap.hxx>
 #include <xmloff/XMLTextListAutoStylePool.hxx>
 
 #include <xmloff/PageMasterStyleMap.hxx>
diff --git a/xmloff/source/style/xmlbahdl.hxx b/xmloff/source/style/xmlbahdl.hxx
index 02efce218be3..4e6ce48b6c6d 100644
--- a/xmloff/source/style/xmlbahdl.hxx
+++ b/xmloff/source/style/xmlbahdl.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_XMLOFF_SOURCE_STYLE_XMLBAHDL_HXX
 
 #include <xmloff/xmlprhdl.hxx>
-#include <rtl/ustrbuf.hxx>
 #include <xmloff/xmltoken.hxx>
 
 
diff --git a/xmloff/source/text/XMLAutoTextEventExport.hxx b/xmloff/source/text/XMLAutoTextEventExport.hxx
index 99386c8239bb..890eafaa771f 100644
--- a/xmloff/source/text/XMLAutoTextEventExport.hxx
+++ b/xmloff/source/text/XMLAutoTextEventExport.hxx
@@ -22,8 +22,6 @@
 
 #include <xmloff/xmlexp.hxx>
 
-#include <set>
-
 
 namespace com { namespace sun { namespace star {
     namespace container { class XNameAccess; }
diff --git a/xmloff/source/text/XMLIndexAlphabeticalSourceContext.hxx b/xmloff/source/text/XMLIndexAlphabeticalSourceContext.hxx
index f1b380acc619..cdf0894b65d8 100644
--- a/xmloff/source/text/XMLIndexAlphabeticalSourceContext.hxx
+++ b/xmloff/source/text/XMLIndexAlphabeticalSourceContext.hxx
@@ -23,7 +23,6 @@
 #include "XMLIndexSourceBaseContext.hxx"
 #include <xmloff/languagetagodf.hxx>
 #include <com/sun/star/uno/Reference.h>
-#include <com/sun/star/lang/Locale.hpp>
 
 
 namespace com { namespace sun { namespace star {
diff --git a/xmloff/source/text/XMLLineNumberingExport.hxx b/xmloff/source/text/XMLLineNumberingExport.hxx
index b078feb0d7c9..9b96219c71b2 100644
--- a/xmloff/source/text/XMLLineNumberingExport.hxx
+++ b/xmloff/source/text/XMLLineNumberingExport.hxx
@@ -21,8 +21,6 @@
 #define INCLUDED_XMLOFF_SOURCE_TEXT_XMLLINENUMBERINGEXPORT_HXX
 
 
-#include <rtl/ustring.hxx>
-
 class SvXMLExport;
 
 /** export <text:linenumbering-configuration> and its child elements */
diff --git a/xmloff/source/text/XMLPropertyBackpatcher.hxx b/xmloff/source/text/XMLPropertyBackpatcher.hxx
index 9cdda65f11d6..b829f008e787 100644
--- a/xmloff/source/text/XMLPropertyBackpatcher.hxx
+++ b/xmloff/source/text/XMLPropertyBackpatcher.hxx
@@ -21,6 +21,8 @@
 #ifndef INCLUDED_XMLOFF_SOURCE_TEXT_XMLPROPERTYBACKPATCHER_HXX
 #define INCLUDED_XMLOFF_SOURCE_TEXT_XMLPROPERTYBACKPATCHER_HXX
 
+#include <rtl/ustring.hxx>
+
 #include <map>
 #include <memory>
 #include <vector>
diff --git a/xmloff/source/text/XMLRedlineExport.hxx b/xmloff/source/text/XMLRedlineExport.hxx
index 26b82f552696..3d78a7338aae 100644
--- a/xmloff/source/text/XMLRedlineExport.hxx
+++ b/xmloff/source/text/XMLRedlineExport.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_XMLOFF_SOURCE_TEXT_XMLREDLINEEXPORT_HXX
 #define INCLUDED_XMLOFF_SOURCE_TEXT_XMLREDLINEEXPORT_HXX
 
-#include <rtl/ustrbuf.hxx>
 #include <com/sun/star/uno/Reference.h>
 #include <com/sun/star/uno/Sequence.h>
 
diff --git a/xmloff/source/text/XMLTextFrameHyperlinkContext.hxx b/xmloff/source/text/XMLTextFrameHyperlinkContext.hxx
index aefa263098c2..132db87150f2 100644
--- a/xmloff/source/text/XMLTextFrameHyperlinkContext.hxx
+++ b/xmloff/source/text/XMLTextFrameHyperlinkContext.hxx
@@ -20,8 +20,9 @@
 #ifndef INCLUDED_XMLOFF_SOURCE_TEXT_XMLTEXTFRAMEHYPERLINKCONTEXT_HXX
 #define INCLUDED_XMLOFF_SOURCE_TEXT_XMLTEXTFRAMEHYPERLINKCONTEXT_HXX
 
+#include <com/sun/star/drawing/XShape.hpp>
+#include <com/sun/star/text/XTextContent.hpp>
 #include <com/sun/star/text/TextContentAnchorType.hpp>
-#include <com/sun/star/text/XTextFrame.hpp>
 #include <xmloff/xmlictxt.hxx>
 
 namespace com { namespace sun { namespace star {
diff --git a/xmloff/source/text/XMLTextListItemContext.hxx b/xmloff/source/text/XMLTextListItemContext.hxx
index 5a88db902a3e..2507480c961d 100644
--- a/xmloff/source/text/XMLTextListItemContext.hxx
+++ b/xmloff/source/text/XMLTextListItemContext.hxx
@@ -20,6 +20,8 @@
 #ifndef INCLUDED_XMLOFF_SOURCE_TEXT_XMLTEXTLISTITEMCONTEXT_HXX
 #define INCLUDED_XMLOFF_SOURCE_TEXT_XMLTEXTLISTITEMCONTEXT_HXX
 
+#include <com/sun/star/container/XIndexReplace.hpp>
+
 #include <xmloff/xmlictxt.hxx>
 
 class XMLTextImportHelper;
diff --git a/xmloff/source/text/txtdrope.hxx b/xmloff/source/text/txtdrope.hxx
index a921a82e3bc1..28eb57502be8 100644
--- a/xmloff/source/text/txtdrope.hxx
+++ b/xmloff/source/text/txtdrope.hxx
@@ -20,6 +20,8 @@
 #define INCLUDED_XMLOFF_SOURCE_TEXT_TXTDROPE_HXX
 
 
+#include <rtl/ustring.hxx>
+
 class SvXMLExport;
 namespace com { namespace sun { namespace star { namespace uno {
     class Any; } } } }
diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx
index a5f3fe0b3b86..bd563f14a041 100644
--- a/xmloff/source/text/txtimp.cxx
+++ b/xmloff/source/text/txtimp.cxx
@@ -26,6 +26,7 @@
 #include <com/sun/star/style/XStyleFamiliesSupplier.hpp>
 #include <com/sun/star/text/ReferenceFieldSource.hpp>
 #include <com/sun/star/text/XChapterNumberingSupplier.hpp>
+#include <com/sun/star/text/XTextFrame.hpp>
 #include <com/sun/star/text/XTextFieldsSupplier.hpp>
 #include <com/sun/star/text/XTextFramesSupplier.hpp>
 #include <com/sun/star/text/XTextGraphicObjectsSupplier.hpp>
diff --git a/xmloff/source/text/txtparai.hxx b/xmloff/source/text/txtparai.hxx
index 095eb688fc1b..0624864e84a9 100644
--- a/xmloff/source/text/txtparai.hxx
+++ b/xmloff/source/text/txtparai.hxx
@@ -20,6 +20,7 @@
 #define INCLUDED_XMLOFF_SOURCE_TEXT_TXTPARAI_HXX
 
 
+#include <com/sun/star/container/XIndexReplace.hpp>
 #include <com/sun/star/uno/Reference.h>
 #include <xmloff/xmlictxt.hxx>
 
diff --git a/xmloff/source/text/txtparaimphint.hxx b/xmloff/source/text/txtparaimphint.hxx
index ca9e887e8eed..fb532af457bb 100644
--- a/xmloff/source/text/txtparaimphint.hxx
+++ b/xmloff/source/text/txtparaimphint.hxx
@@ -20,9 +20,8 @@
 #define INCLUDED_XMLOFF_SOURCE_TEXT_TXTPARAIMPHINT_HXX
 
 #include <rtl/ustring.hxx>
-#include <rtl/ustrbuf.hxx>
-#include <xmloff/xmlimp.hxx>
 #include "XMLTextFrameContext.hxx"
+#include "XMLTextFrameHyperlinkContext.hxx"
 #include <xmloff/XMLEventsImportContext.hxx>
 
 #define XML_HINT_STYLE 1
diff --git a/xmloff/source/transform/CreateElemTContext.hxx b/xmloff/source/transform/CreateElemTContext.hxx
index 13ad49b6ee8d..a7ce38981fd8 100644
--- a/xmloff/source/transform/CreateElemTContext.hxx
+++ b/xmloff/source/transform/CreateElemTContext.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_XMLOFF_SOURCE_TRANSFORM_CREATEELEMTCONTEXT_HXX
 #define INCLUDED_XMLOFF_SOURCE_TRANSFORM_CREATEELEMTCONTEXT_HXX
 
-#include <xmloff/xmltoken.hxx>
 #include "TransformerContext.hxx"
 
 class XMLCreateElemTransformerContext : public XMLTransformerContext
diff --git a/xmloff/source/transform/EventMap.hxx b/xmloff/source/transform/EventMap.hxx
index c615439d7550..4665a3571215 100644
--- a/xmloff/source/transform/EventMap.hxx
+++ b/xmloff/source/transform/EventMap.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_XMLOFF_SOURCE_TRANSFORM_EVENTMAP_HXX
 #define INCLUDED_XMLOFF_SOURCE_TRANSFORM_EVENTMAP_HXX
 
-#include "TransformerContext.hxx"
+#include <sal/types.h>
 
 struct XMLTransformerEventMapEntry
 {
diff --git a/xmloff/source/transform/PersMixedContentTContext.hxx b/xmloff/source/transform/PersMixedContentTContext.hxx
index b7c1f5221fc4..955e270cfd00 100644
--- a/xmloff/source/transform/PersMixedContentTContext.hxx
+++ b/xmloff/source/transform/PersMixedContentTContext.hxx
@@ -20,9 +20,6 @@
 #ifndef INCLUDED_XMLOFF_SOURCE_TRANSFORM_PERSMIXEDCONTENTTCONTEXT_HXX
 #define INCLUDED_XMLOFF_SOURCE_TRANSFORM_PERSMIXEDCONTENTTCONTEXT_HXX
 
-#include <rtl/ref.hxx>
-
-#include <vector>
 #include "DeepTContext.hxx"
 
 class XMLPersMixedContentTContext : public XMLPersElemContentTContext
diff --git a/xmloff/source/transform/PropertyActionsOASIS.hxx b/xmloff/source/transform/PropertyActionsOASIS.hxx
index 8efabfd256c2..1f0cd92f891c 100644
--- a/xmloff/source/transform/PropertyActionsOASIS.hxx
+++ b/xmloff/source/transform/PropertyActionsOASIS.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_XMLOFF_SOURCE_TRANSFORM_PROPERTYACTIONSOASIS_HXX
 #define INCLUDED_XMLOFF_SOURCE_TRANSFORM_PROPERTYACTIONSOASIS_HXX
 
-#include "TransformerAction.hxx"
 #include "TransformerActionInit.hxx"
 #include "AttrTransformerAction.hxx"
 
diff --git a/xmloff/source/transform/PropertyActionsOOo.hxx b/xmloff/source/transform/PropertyActionsOOo.hxx
index b255a4548a23..5d693a00bcee 100644
--- a/xmloff/source/transform/PropertyActionsOOo.hxx
+++ b/xmloff/source/transform/PropertyActionsOOo.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_XMLOFF_SOURCE_TRANSFORM_PROPERTYACTIONSOOO_HXX
 #define INCLUDED_XMLOFF_SOURCE_TRANSFORM_PROPERTYACTIONSOOO_HXX
 
-#include "TransformerAction.hxx"
 #include "TransformerActionInit.hxx"
 #include "AttrTransformerAction.hxx"
 
diff --git a/xmloff/source/transform/TransformerBase.hxx b/xmloff/source/transform/TransformerBase.hxx
index fd3bebde167e..9649f12ad286 100644
--- a/xmloff/source/transform/TransformerBase.hxx
+++ b/xmloff/source/transform/TransformerBase.hxx
@@ -25,8 +25,6 @@
 #include <vector>
 #include <memory>
 
-#include <com/sun/star/xml/sax/SAXParseException.hpp>
-#include <com/sun/star/xml/sax/SAXException.hpp>
 #include <com/sun/star/xml/sax/XAttributeList.hpp>
 #include <com/sun/star/xml/sax/XLocator.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/xmloff/source/transform/XMLFilterRegistration.hxx b/xmloff/source/transform/XMLFilterRegistration.hxx
index 2baee48de757..f06b0ed87d79 100644
--- a/xmloff/source/transform/XMLFilterRegistration.hxx
+++ b/xmloff/source/transform/XMLFilterRegistration.hxx
@@ -22,6 +22,8 @@
 
 #include <sal/config.h>
 
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+
 OUString OOo2OasisTransformer_getImplementationName() throw();
 css::uno::Sequence< OUString > OOo2OasisTransformer_getSupportedServiceNames() throw();
 /// @throws css::uno::Exception