tdf#42949 Fix IWYU warnings in include/xmloff/*

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

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

65 files changed, 208 insertions, 251 deletions

diff --git a/include/xmloff/AutoStyleEntry.hxx b/include/xmloff/AutoStyleEntry.hxx
index 7cca2d868ef4..c961e09f107a 100644
--- a/include/xmloff/AutoStyleEntry.hxx
+++ b/include/xmloff/AutoStyleEntry.hxx
@@ -12,8 +12,11 @@
 #define INCLUDED_XMLOFF_AUTOSTYLEENTRY_HXX
 
 #include <sal/config.h>
+#include <rtl/ustring.hxx>
+#include <com/sun/star/uno/Any.hxx>
 #include <xmloff/dllapi.h>
-#include <memory>
+#include <utility>
+#include <vector>
 
 namespace xmloff
 {
diff --git a/include/xmloff/DocumentSettingsContext.hxx b/include/xmloff/DocumentSettingsContext.hxx
index 9fd34a38a44d..ca993b17efee 100644
--- a/include/xmloff/DocumentSettingsContext.hxx
+++ b/include/xmloff/DocumentSettingsContext.hxx
@@ -23,7 +23,6 @@
 #include <sal/config.h>
 #include <xmloff/dllapi.h>
 #include <xmloff/xmlictxt.hxx>
-#include <com/sun/star/beans/PropertyValue.hpp>
 
 #include <memory>
 
diff --git a/include/xmloff/EnumPropertyHdl.hxx b/include/xmloff/EnumPropertyHdl.hxx
index 4d3e8c5e19fe..7256dd69ffa0 100644
--- a/include/xmloff/EnumPropertyHdl.hxx
+++ b/include/xmloff/EnumPropertyHdl.hxx
@@ -21,9 +21,9 @@
 #define INCLUDED_XMLOFF_ENUMPROPERTYHDL_HXX
 
 #include <xmloff/xmlprhdl.hxx>
-#include <com/sun/star/uno/Type.h>
 #include <cppu/unotype.hxx>
-#include <xmloff/xmlement.hxx>
+
+template <typename EnumT> struct SvXMLEnumMapEntry;
 
 /**
     PropertyHandler for a generic xml enumeration type:
diff --git a/include/xmloff/GradientStyle.hxx b/include/xmloff/GradientStyle.hxx
index 58cc2e885377..e365d57560c8 100644
--- a/include/xmloff/GradientStyle.hxx
+++ b/include/xmloff/GradientStyle.hxx
@@ -22,7 +22,6 @@
 
 #include <sal/config.h>
 #include <xmloff/dllapi.h>
-#include <sal/types.h>
 #include <rtl/ustring.hxx>
 
 class SvXMLImport;
diff --git a/include/xmloff/HatchStyle.hxx b/include/xmloff/HatchStyle.hxx
index 6fe2dacc703b..f272ed161ed0 100644
--- a/include/xmloff/HatchStyle.hxx
+++ b/include/xmloff/HatchStyle.hxx
@@ -22,7 +22,6 @@
 
 #include <sal/config.h>
 #include <xmloff/dllapi.h>
-#include <sal/types.h>
 #include <rtl/ustring.hxx>
 
 class SvXMLImport;
diff --git a/include/xmloff/ImageStyle.hxx b/include/xmloff/ImageStyle.hxx
index 80f873d386fc..99d0d3394673 100644
--- a/include/xmloff/ImageStyle.hxx
+++ b/include/xmloff/ImageStyle.hxx
@@ -22,12 +22,12 @@
 
 #include <sal/config.h>
 #include <xmloff/dllapi.h>
-#include <sal/types.h>
-#include <com/sun/star/xml/sax/XDocumentHandler.hpp>
+#include <rtl/ustring.hxx>
+
+namespace com { namespace sun { namespace star { namespace uno { class Any; } } } }
+namespace com { namespace sun { namespace star { namespace uno { template <typename > class Reference; } } } }
+namespace com { namespace sun { namespace star { namespace xml { namespace sax { class XAttributeList; } } } } }
 
-class SvXMLNamespaceMap;
-class SvXMLAttributeList;
-class SvXMLUnitConverter;
 class SvXMLExport;
 class SvXMLImport;
 
diff --git a/include/xmloff/MarkerStyle.hxx b/include/xmloff/MarkerStyle.hxx
index 679c4706eb34..2f2df0570640 100644
--- a/include/xmloff/MarkerStyle.hxx
+++ b/include/xmloff/MarkerStyle.hxx
@@ -22,7 +22,6 @@
 
 #include <sal/config.h>
 #include <xmloff/dllapi.h>
-#include <sal/types.h>
 #include <rtl/ustring.hxx>
 
 class SvXMLImport;
diff --git a/include/xmloff/NamedBoolPropertyHdl.hxx b/include/xmloff/NamedBoolPropertyHdl.hxx
index 05f7489f4d7a..d5fe6eb83927 100644
--- a/include/xmloff/NamedBoolPropertyHdl.hxx
+++ b/include/xmloff/NamedBoolPropertyHdl.hxx
@@ -22,7 +22,6 @@
 
 #include <xmloff/xmlprhdl.hxx>
 #include <xmloff/xmltoken.hxx>
-#include <xmloff/xmlement.hxx>
 
 /**
     PropertyHandler for a named xml bool type:
diff --git a/include/xmloff/SchXMLExportHelper.hxx b/include/xmloff/SchXMLExportHelper.hxx
index 38544067c63d..dbabc6932ea1 100644
--- a/include/xmloff/SchXMLExportHelper.hxx
+++ b/include/xmloff/SchXMLExportHelper.hxx
@@ -21,16 +21,9 @@
 
 #include <sal/config.h>
 #include <xmloff/dllapi.h>
-#include <sal/types.h>
+#include <rtl/ustring.hxx>
 #include <salhelper/simplereferenceobject.hxx>
-#include <rtl/ustrbuf.hxx>
-#include <com/sun/star/util/XStringMapping.hpp>
-#include <com/sun/star/awt/Size.hpp>
-#include <com/sun/star/awt/Point.hpp>
-#include <xmloff/xmlprmap.hxx>
 
-#include <queue>
-#include <vector>
 #include <memory>
 
 class SvXMLAutoStylePoolP;
diff --git a/include/xmloff/SchXMLImportHelper.hxx b/include/xmloff/SchXMLImportHelper.hxx
index a842fd470560..e6ffd80f543f 100644
--- a/include/xmloff/SchXMLImportHelper.hxx
+++ b/include/xmloff/SchXMLImportHelper.hxx
@@ -23,35 +23,27 @@
 
 #include <salhelper/simplereferenceobject.hxx>
 #include <xmloff/families.hxx>
-#include <com/sun/star/util/XStringMapping.hpp>
-#include <com/sun/star/chart/XChartDocument.hpp>
+#include <xmloff/xmltkmap.hxx>
+
+namespace com { namespace sun { namespace star { namespace chart { class XChartDocument; } } } }
+namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } }
 
 namespace com { namespace sun { namespace star {
     namespace frame {
         class XModel;
     }
-    namespace task {
-        class XStatusIndicator;
-    }
     namespace xml {
         namespace sax {
             class XAttributeList;
         }
     }
     namespace chart2 {
-        namespace data {
-            class XDataProvider;
-            class XLabeledDataSequence;
-        }
         class XChartDocument;
         class XDataSeries;
     }
 }}}
 
-class SvXMLUnitConverter;
 class SvXMLStylesContext;
-class XMLChartImportPropertyMapper;
-class SvXMLTokenMap;
 class SvXMLImportContext;
 class SvXMLImport;
 
diff --git a/include/xmloff/SchXMLSeriesHelper.hxx b/include/xmloff/SchXMLSeriesHelper.hxx
index 567ad0c4c2b6..c8857ae06370 100644
--- a/include/xmloff/SchXMLSeriesHelper.hxx
+++ b/include/xmloff/SchXMLSeriesHelper.hxx
@@ -20,17 +20,17 @@
 #ifndef INCLUDED_XMLOFF_SCHXMLSERIESHELPER_HXX
 #define INCLUDED_XMLOFF_SCHXMLSERIESHELPER_HXX
 
-#include <com/sun/star/chart2/data/XDataSequence.hpp>
-#include <com/sun/star/chart2/data/XDataSource.hpp>
-#include <com/sun/star/chart2/XDataSeries.hpp>
-#include <com/sun/star/chart2/XDiagram.hpp>
-#include <com/sun/star/frame/XModel.hpp>
+#include <com/sun/star/uno/Reference.hxx>
 
 #include <xmloff/dllapi.h>
 
 #include <vector>
 #include <map>
-#include <iterator>
+
+namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } }
+namespace com { namespace sun { namespace star { namespace chart2 { class XDataSeries; } } } }
+namespace com { namespace sun { namespace star { namespace chart2 { class XDiagram; } } } }
+namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } }
 
 class XMLOFF_DLLPUBLIC SchXMLSeriesHelper
 {
diff --git a/include/xmloff/SettingsExportHelper.hxx b/include/xmloff/SettingsExportHelper.hxx
index ff503b2b2749..505ecce1b00a 100644
--- a/include/xmloff/SettingsExportHelper.hxx
+++ b/include/xmloff/SettingsExportHelper.hxx
@@ -22,10 +22,11 @@
 
 #include <xmloff/dllapi.h>
 
-#include <com/sun/star/awt/Rectangle.hpp>
-#include <com/sun/star/formula/SymbolDescriptor.hpp>
-#include <com/sun/star/util/XStringSubstitution.hpp>
-#include <xmloff/xmlexp.hxx>
+#include <com/sun/star/uno/Reference.hxx>
+
+namespace com { namespace sun { namespace star { namespace beans { struct PropertyValue; } } } }
+namespace com { namespace sun { namespace star { namespace formula { struct SymbolDescriptor; } } } }
+namespace com { namespace sun { namespace star { namespace util { class XStringSubstitution; } } } }
 
 namespace com
 {
diff --git a/include/xmloff/SinglePropertySetInfoCache.hxx b/include/xmloff/SinglePropertySetInfoCache.hxx
index 6a15d2c348c8..75ec174f5b92 100644
--- a/include/xmloff/SinglePropertySetInfoCache.hxx
+++ b/include/xmloff/SinglePropertySetInfoCache.hxx
@@ -24,7 +24,10 @@
 
 #include <map>
 
-#include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/uno/Reference.hxx>
+
+namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } }
+namespace com { namespace sun { namespace star { namespace beans { class XPropertySetInfo; } } } }
 
 class SinglePropertySetInfoCache
 {
diff --git a/include/xmloff/WordWrapPropertyHdl.hxx b/include/xmloff/WordWrapPropertyHdl.hxx
index 81b681674084..5552958feefc 100644
--- a/include/xmloff/WordWrapPropertyHdl.hxx
+++ b/include/xmloff/WordWrapPropertyHdl.hxx
@@ -21,8 +21,6 @@
 #define INCLUDED_XMLOFF_WORDWRAPPROPERTYHDL_HXX
 
 #include <xmloff/xmlprhdl.hxx>
-#include <xmloff/xmltoken.hxx>
-#include <xmloff/xmlement.hxx>
 
 /**
     PropertyHandler for a named xml bool type:
diff --git a/include/xmloff/XMLBase64ImportContext.hxx b/include/xmloff/XMLBase64ImportContext.hxx
index 1c347b3fbf82..0c3e4ac2075d 100644
--- a/include/xmloff/XMLBase64ImportContext.hxx
+++ b/include/xmloff/XMLBase64ImportContext.hxx
@@ -22,9 +22,10 @@
 
 #include <sal/config.h>
 #include <xmloff/dllapi.h>
-#include <com/sun/star/xml/sax/XDocumentHandler.hpp>
 #include <xmloff/xmlictxt.hxx>
 
+namespace com { namespace sun { namespace star { namespace xml { namespace sax { class XAttributeList; } } } } }
+
 namespace com { namespace sun { namespace star { namespace io {
     class XOutputStream; } } } }
 
diff --git a/include/xmloff/XMLCharContext.hxx b/include/xmloff/XMLCharContext.hxx
index 584d993d6563..282421458820 100644
--- a/include/xmloff/XMLCharContext.hxx
+++ b/include/xmloff/XMLCharContext.hxx
@@ -20,9 +20,10 @@
 #define INCLUDED_XMLOFF_XMLCHARCONTEXT_HXX
 
 #include <xmloff/dllapi.h>
-#include <com/sun/star/uno/Reference.h>
 #include <xmloff/xmlictxt.hxx>
 
+namespace com { namespace sun { namespace star { namespace uno { template <typename > class Reference; } } } }
+
 class XMLOFF_DLLPUBLIC XMLCharContext : public SvXMLImportContext
 {
     XMLCharContext(const XMLCharContext&) = delete;
diff --git a/include/xmloff/XMLEventExport.hxx b/include/xmloff/XMLEventExport.hxx
index 8dba84465ace..98caf8502232 100644
--- a/include/xmloff/XMLEventExport.hxx
+++ b/include/xmloff/XMLEventExport.hxx
@@ -23,8 +23,6 @@
 #include <sal/config.h>
 #include <xmloff/dllapi.h>
 #include <sal/types.h>
-#include <com/sun/star/uno/Sequence.hxx>
-#include <com/sun/star/uno/Reference.hxx>
 #include <rtl/ustring.hxx>
 #include <xmloff/xmlevent.hxx>
 
@@ -39,6 +37,9 @@ namespace com { namespace sun { namespace star {
     namespace beans { struct PropertyValue; }
 } } }
 
+namespace com { namespace sun { namespace star { namespace uno { template <class interface_type> class Reference; } } } }
+namespace com { namespace sun { namespace star { namespace uno { template <typename > class Sequence; } } } }
+
 typedef ::std::map< OUString, std::unique_ptr<XMLEventExportHandler> > HandlerMap;
 typedef ::std::map< OUString, XMLEventName > NameMap;
 
diff --git a/include/xmloff/XMLEventsImportContext.hxx b/include/xmloff/XMLEventsImportContext.hxx
index ee45e1b95f0e..0dd1a0194f4b 100644
--- a/include/xmloff/XMLEventsImportContext.hxx
+++ b/include/xmloff/XMLEventsImportContext.hxx
@@ -23,11 +23,8 @@
 #include <sal/config.h>
 #include <xmloff/dllapi.h>
 #include <com/sun/star/uno/Reference.hxx>
-#include <com/sun/star/uno/Sequence.hxx>
 #include <xmloff/xmlictxt.hxx>
-#include <xmloff/xmlevent.hxx>
 
-#include <map>
 #include <vector>
 
 namespace com { namespace sun { namespace star {
@@ -37,6 +34,8 @@ namespace com { namespace sun { namespace star {
     namespace document { class XEventsSupplier; }
 } } }
 
+namespace com { namespace sun { namespace star { namespace uno { template <class E> class Sequence; } } } }
+
 typedef ::std::pair<
             OUString,
             css::uno::Sequence<css::beans::PropertyValue> > EventNameValuesPair;
diff --git a/include/xmloff/XMLGraphicsDefaultStyle.hxx b/include/xmloff/XMLGraphicsDefaultStyle.hxx
index 816ff0db2f46..a52e2745a9b4 100644
--- a/include/xmloff/XMLGraphicsDefaultStyle.hxx
+++ b/include/xmloff/XMLGraphicsDefaultStyle.hxx
@@ -24,11 +24,6 @@
 #include <xmloff/dllapi.h>
 #include <xmloff/prstylei.hxx>
 
-namespace com { namespace sun { namespace star { namespace container
-{
-    class XNameContainer;
-} } } }
-
 class XMLOFF_DLLPUBLIC XMLGraphicsDefaultStyle : public XMLPropStyleContext
 {
 public:
diff --git a/include/xmloff/XMLPageExport.hxx b/include/xmloff/XMLPageExport.hxx
index 4df54310e731..818b79b66c24 100644
--- a/include/xmloff/XMLPageExport.hxx
+++ b/include/xmloff/XMLPageExport.hxx
@@ -25,14 +25,13 @@
 #include <sal/types.h>
 #include <rtl/ustring.hxx>
 #include <vector>
-#include <xmloff/attrlist.hxx>
 #include <rtl/ref.hxx>
 #include <salhelper/simplereferenceobject.hxx>
-#include <com/sun/star/container/XIndexAccess.hpp>
+#include <com/sun/star/uno/Reference.hxx>
 
 namespace com { namespace sun { namespace star {
     namespace style { class XStyle; }
-    namespace container { class XIndexReplace; class XNameAccess;}
+    namespace container { class XNameAccess;}
     namespace beans { class XPropertySet; }
 } } }
 
diff --git a/include/xmloff/XMLSettingsExportContext.hxx b/include/xmloff/XMLSettingsExportContext.hxx
index 542333942a9c..aad2db51ecd8 100644
--- a/include/xmloff/XMLSettingsExportContext.hxx
+++ b/include/xmloff/XMLSettingsExportContext.hxx
@@ -20,10 +20,10 @@
 #ifndef INCLUDED_XMLOFF_XMLSETTINGSEXPORTCONTEXT_HXX
 #define INCLUDED_XMLOFF_XMLSETTINGSEXPORTCONTEXT_HXX
 
-#include <com/sun/star/uno/XComponentContext.hpp>
-
 #include <xmloff/xmltoken.hxx>
 
+namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
+
 
 namespace xmloff
 {
diff --git a/include/xmloff/XMLShapeStyleContext.hxx b/include/xmloff/XMLShapeStyleContext.hxx
index a0eace1100a9..15f754d04db9 100644
--- a/include/xmloff/XMLShapeStyleContext.hxx
+++ b/include/xmloff/XMLShapeStyleContext.hxx
@@ -23,7 +23,6 @@
 #include <sal/config.h>
 #include <xmloff/dllapi.h>
 #include <xmloff/prstylei.hxx>
-#include <xmloff/families.hxx>
 
 class SvXMLImport;
 
diff --git a/include/xmloff/XMLTextListAutoStylePool.hxx b/include/xmloff/XMLTextListAutoStylePool.hxx
index 3b6ba2906c13..dc3690802b2a 100644
--- a/include/xmloff/XMLTextListAutoStylePool.hxx
+++ b/include/xmloff/XMLTextListAutoStylePool.hxx
@@ -24,12 +24,13 @@
 #include <xmloff/dllapi.h>
 #include <sal/types.h>
 #include <rtl/ustring.hxx>
-#include <com/sun/star/ucb/XAnyCompare.hpp>
+#include <com/sun/star/uno/Reference.hxx>
 #include <memory>
 #include <set>
 
 namespace com { namespace sun { namespace star { namespace container {
     class XIndexReplace; } } } }
+namespace com { namespace sun { namespace star { namespace ucb { class XAnyCompare; } } } }
 
 
 class XMLTextListAutoStylePool_Impl;
diff --git a/include/xmloff/XMLTextMasterPageExport.hxx b/include/xmloff/XMLTextMasterPageExport.hxx
index c56e90116c31..907652e898e5 100644
--- a/include/xmloff/XMLTextMasterPageExport.hxx
+++ b/include/xmloff/XMLTextMasterPageExport.hxx
@@ -22,8 +22,6 @@
 
 #include <sal/config.h>
 #include <xmloff/dllapi.h>
-#include <rtl/ustring.hxx>
-#include <xmloff/attrlist.hxx>
 #include <xmloff/XMLPageExport.hxx>
 
 namespace com { namespace sun { namespace star {
diff --git a/include/xmloff/XMLTextTableContext.hxx b/include/xmloff/XMLTextTableContext.hxx
index 6077ccd5ae18..f781ee102f43 100644
--- a/include/xmloff/XMLTextTableContext.hxx
+++ b/include/xmloff/XMLTextTableContext.hxx
@@ -24,10 +24,6 @@
 #include <xmloff/dllapi.h>
 #include <xmloff/xmlictxt.hxx>
 
-namespace com { namespace sun { namespace star {
-    namespace text { class XTextContent; }
-} } }
-
 class XMLOFF_DLLPUBLIC XMLTextTableContext : public SvXMLImportContext
 {
 
diff --git a/include/xmloff/animationexport.hxx b/include/xmloff/animationexport.hxx
index 10bbd50fae31..b50f5ae53dff 100644
--- a/include/xmloff/animationexport.hxx
+++ b/include/xmloff/animationexport.hxx
@@ -22,13 +22,14 @@
 
 #include <sal/config.h>
 #include <xmloff/dllapi.h>
-#include <sal/types.h>
 
-#include <com/sun/star/animations/XAnimationNode.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
 #include <salhelper/simplereferenceobject.hxx>
 #include <memory>
 
+namespace com { namespace sun { namespace star { namespace animations { class XAnimationNode; } } } }
+namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } }
+namespace com { namespace sun { namespace star { namespace uno { template <typename > class Reference; } } } }
+
 class SvXMLExport;
 
 namespace xmloff
diff --git a/include/xmloff/animexp.hxx b/include/xmloff/animexp.hxx
index 78c23e416c66..9dfdbc6bdccf 100644
--- a/include/xmloff/animexp.hxx
+++ b/include/xmloff/animexp.hxx
@@ -20,10 +20,12 @@
 #ifndef INCLUDED_XMLOFF_ANIMEXP_HXX
 #define INCLUDED_XMLOFF_ANIMEXP_HXX
 
-#include <com/sun/star/drawing/XShape.hpp>
 #include <salhelper/simplereferenceobject.hxx>
 #include <memory>
 
+namespace com { namespace sun { namespace star { namespace drawing { class XShape; } } } }
+namespace com { namespace sun { namespace star { namespace uno { template <typename > class Reference; } } } }
+
 class AnimExpImpl;
 class SvXMLExport;
 class XMLShapeExport;
diff --git a/include/xmloff/attrlist.hxx b/include/xmloff/attrlist.hxx
index 5bd306400406..0d8aa945c4c4 100644
--- a/include/xmloff/attrlist.hxx
+++ b/include/xmloff/attrlist.hxx
@@ -23,12 +23,7 @@
 #include <sal/config.h>
 #include <xmloff/dllapi.h>
 #include <com/sun/star/util/XCloneable.hpp>
-#include <com/sun/star/xml/sax/SAXParseException.hpp>
-#include <com/sun/star/xml/sax/XExtendedDocumentHandler.hpp>
-#include <com/sun/star/xml/sax/SAXException.hpp>
-#include <com/sun/star/xml/sax/XDocumentHandler.hpp>
 #include <com/sun/star/xml/sax/XAttributeList.hpp>
-#include <com/sun/star/xml/sax/XLocator.hpp>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
 
 #include <cppuhelper/implbase.hxx>
diff --git a/include/xmloff/controlpropertyhdl.hxx b/include/xmloff/controlpropertyhdl.hxx
index 8aec6d46178d..141111816dad 100644
--- a/include/xmloff/controlpropertyhdl.hxx
+++ b/include/xmloff/controlpropertyhdl.hxx
@@ -26,23 +26,14 @@
 
 #include <xmloff/dllapi.h>
 #include <xmloff/prhdlfac.hxx>
-#include <rtl/ref.hxx>
 #include <rtl/ustring.hxx>
-#include <xmloff/xmlexppr.hxx>
 #include <xmloff/XMLConstantsPropertyHandler.hxx>
 #include <xmloff/NamedBoolPropertyHdl.hxx>
 
-template<typename EnumT> struct SvXMLEnumMapEntry;
-class Color;
-
 namespace xmloff
 {
 
 
-    class IFormsExportContext;
-    class OFormLayerXMLImport_Impl;
-
-
     //= ORotationAngleHandler
 
     class ORotationAngleHandler : public XMLPropertyHandler
diff --git a/include/xmloff/formlayerexport.hxx b/include/xmloff/formlayerexport.hxx
index 1e0da3dde3ba..abe6f30ad943 100644
--- a/include/xmloff/formlayerexport.hxx
+++ b/include/xmloff/formlayerexport.hxx
@@ -22,18 +22,18 @@
 
 #include <sal/config.h>
 #include <xmloff/dllapi.h>
-#include <com/sun/star/drawing/XDrawPage.hpp>
-#include <com/sun/star/container/XIndexAccess.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
-#include <rtl/ref.hxx>
+#include <rtl/ustring.hxx>
 #include <salhelper/simplereferenceobject.hxx>
-#include <xmloff/xmlexppr.hxx>
 #include <memory>
 
 namespace com { namespace sun { namespace star { namespace awt {
     class XControlModel;
 } } } }
 
+namespace com { namespace sun { namespace star { namespace drawing { class XDrawPage; } } } }
+namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } }
+namespace com { namespace sun { namespace star { namespace uno { template <typename > class Reference; } } } }
+
 class SvXMLExport;
 
 namespace xmloff
diff --git a/include/xmloff/formlayerimport.hxx b/include/xmloff/formlayerimport.hxx
index cbb9dbfe477b..1835528873fe 100644
--- a/include/xmloff/formlayerimport.hxx
+++ b/include/xmloff/formlayerimport.hxx
@@ -22,18 +22,17 @@
 
 #include <sal/config.h>
 #include <xmloff/dllapi.h>
-#include <com/sun/star/drawing/XDrawPage.hpp>
-#include <com/sun/star/xml/sax/XAttributeList.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
-#include <rtl/ref.hxx>
+#include <com/sun/star/uno/Reference.hxx>
 #include <salhelper/simplereferenceobject.hxx>
-#include <xmloff/xmlimppr.hxx>
 #include <memory>
 
+namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } }
+namespace com { namespace sun { namespace star { namespace drawing { class XDrawPage; } } } }
+namespace com { namespace sun { namespace star { namespace xml { namespace sax { class XAttributeList; } } } } }
+
 class SvXMLImport;
 class SvXMLImportContext;
 class SvXMLStylesContext;
-class XMLPropStyleContext;
 
 
 namespace xmloff
diff --git a/include/xmloff/numehelp.hxx b/include/xmloff/numehelp.hxx
index b60da6822661..9e0292e6380e 100644
--- a/include/xmloff/numehelp.hxx
+++ b/include/xmloff/numehelp.hxx
@@ -24,10 +24,13 @@
 #include <xmloff/xmlnmspe.hxx>
 #include <xmloff/dllapi.h>
 #include <sal/types.h>
-#include <com/sun/star/util/XNumberFormatsSupplier.hpp>
+#include <com/sun/star/uno/Reference.hxx>
 
 #include <set>
 
+namespace com { namespace sun { namespace star { namespace util { class XNumberFormats; } } } }
+namespace com { namespace sun { namespace star { namespace util { class XNumberFormatsSupplier; } } } }
+
 class SvXMLExport;
 
 struct XMLNumberFormat
diff --git a/include/xmloff/prstylei.hxx b/include/xmloff/prstylei.hxx
index 8b506b6dc4ad..db1700cb9e2f 100644
--- a/include/xmloff/prstylei.hxx
+++ b/include/xmloff/prstylei.hxx
@@ -22,19 +22,19 @@
 #include <sal/config.h>
 #include <xmloff/dllapi.h>
 #include <sal/types.h>
-#include <com/sun/star/style/XStyle.hpp>
 #include <vector>
 #include <xmloff/xmlstyle.hxx>
 
 #include <unordered_set>
 
 struct XMLPropertyState;
-class SvXMLStylesContext;
 
 namespace com { namespace sun { namespace star {
     namespace beans { class XPropertySet; }
 } } }
 
+namespace com { namespace sun { namespace star { namespace style { class XStyle; } } } }
+
 typedef std::unordered_set<OUString> OldFillStyleDefinitionSet;
 
 class XMLOFF_DLLPUBLIC XMLPropStyleContext : public SvXMLStyleContext
diff --git a/include/xmloff/settingsstore.hxx b/include/xmloff/settingsstore.hxx
index 0878a5ec288f..2cd0bc196e04 100644
--- a/include/xmloff/settingsstore.hxx
+++ b/include/xmloff/settingsstore.hxx
@@ -12,9 +12,11 @@
 #ifndef INCLUDED_XMLOFF_SETTINGSSTORE_HXX
 #define INCLUDED_XMLOFF_SETTINGSSTORE_HXX
 
-#include <vector>
-#include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/embed/XStorage.hpp>
+#include <com/sun/star/uno/Sequence.hxx>
+
+namespace com { namespace sun { namespace star { namespace beans { struct PropertyValue; } } } }
+namespace com { namespace sun { namespace star { namespace embed { class XStorage; } } } }
+namespace com { namespace sun { namespace star { namespace uno { template <typename > class Reference; } } } }
 
 // Scans list of properties for certain URL properties that could refer
 // to internal objects, and initializes from these.
diff --git a/include/xmloff/shapeexport.hxx b/include/xmloff/shapeexport.hxx
index 6dbbde2b8b82..13cd97505fab 100644
--- a/include/xmloff/shapeexport.hxx
+++ b/include/xmloff/shapeexport.hxx
@@ -28,20 +28,20 @@
 #include <rtl/ustrbuf.hxx>
 #include <salhelper/simplereferenceobject.hxx>
 
-#include <com/sun/star/drawing/XShape.hpp>
-#include <com/sun/star/drawing/XShapes.hpp>
-#include <com/sun/star/awt/Point.hpp>
-#include <com/sun/star/beans/PropertyValue.hpp>
-
 #include <map>
-#include <xmloff/xmlprmap.hxx>
-#include <xmloff/xmlexppr.hxx>
 #include <xmloff/animexp.hxx>
 #include <xmloff/families.hxx>
 #include <xmloff/txtparae.hxx>
 #include <o3tl/typed_flags_set.hxx>
 
-#include <xmloff/table/XMLTableExport.hxx>
+namespace com { namespace sun { namespace star { namespace awt { struct Point; } } } }
+namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } }
+namespace com { namespace sun { namespace star { namespace drawing { class XShape; } } } }
+namespace com { namespace sun { namespace star { namespace drawing { class XShapes; } } } }
+
+class XMLTableExport;
+class SvXMLAttributeList;
+class XMLPropertyHandlerFactory;
 
 // shape export features are bits used for the nFeature
 // parameter of XMLShapeExport::exportShape
diff --git a/include/xmloff/shapeimport.hxx b/include/xmloff/shapeimport.hxx
index 1bc00431d51d..0bf3999dcb9e 100644
--- a/include/xmloff/shapeimport.hxx
+++ b/include/xmloff/shapeimport.hxx
@@ -22,28 +22,28 @@
 
 #include <sal/config.h>
 #include <xmloff/dllapi.h>
-#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/frame/XModel.hpp>
-#include <com/sun/star/xml/sax/XAttributeList.hpp>
-#include <com/sun/star/drawing/XShapes.hpp>
 #include <com/sun/star/drawing/HomogenMatrix.hpp>
 #include <com/sun/star/drawing/ProjectionMode.hpp>
 #include <com/sun/star/drawing/ShadeMode.hpp>
 #include <salhelper/simplereferenceobject.hxx>
 #include <xmloff/xmlictxt.hxx>
 
-#include <xmloff/table/XMLTableImport.hxx>
 #include <basegfx/vector/b3dvector.hxx>
 #include <vector>
 #include <memory>
 
+namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } }
+namespace com { namespace sun { namespace star { namespace drawing { class XShape; } } } }
+namespace com { namespace sun { namespace star { namespace drawing { class XShapes; } } } }
+namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } }
+namespace com { namespace sun { namespace star { namespace xml { namespace sax { class XAttributeList; } } } } }
+
 class SvXMLImport;
-class SvXMLImportContext;
 class SvXMLTokenMap;
 class SvXMLStylesContext;
 class XMLSdPropHdlFactory;
-class XMLPropertySetMapper;
 class SvXMLImportPropertyMapper;
+class XMLTableImport;
 
 
 enum SdXMLGroupShapeElemTokenMap
@@ -213,7 +213,6 @@ public:
 };
 
 
-class ShapeSortContext;
 struct XMLShapeImportHelperImpl;
 struct XMLShapeImportPageContextImpl;
 
diff --git a/include/xmloff/styleexp.hxx b/include/xmloff/styleexp.hxx
index 66a23053005e..84f687713911 100644
--- a/include/xmloff/styleexp.hxx
+++ b/include/xmloff/styleexp.hxx
@@ -21,12 +21,13 @@
 
 #include <sal/config.h>
 #include <xmloff/dllapi.h>
-#include <rtl/ref.hxx>
 #include <rtl/ustring.hxx>
-#include <com/sun/star/uno/Reference.h>
 
 #include <salhelper/simplereferenceobject.hxx>
 
+namespace com { namespace sun { namespace star { namespace uno { template <class interface_type> class Reference; } } } }
+namespace rtl { template <class reference_type> class Reference; }
+
 namespace com { namespace sun { namespace star
 {
     namespace style
@@ -44,7 +45,6 @@ namespace com { namespace sun { namespace star
 
 } } }
 
-class XMLPropertySetMapper;
 class SvXMLExportPropertyMapper;
 class SvXMLAutoStylePoolP;
 class SvXMLExport;
diff --git a/include/xmloff/txtimp.hxx b/include/xmloff/txtimp.hxx
index 2caeff3ea689..596d09352b82 100644
--- a/include/xmloff/txtimp.hxx
+++ b/include/xmloff/txtimp.hxx
@@ -22,28 +22,24 @@
 #include <sal/config.h>
 #include <xmloff/dllapi.h>
 #include <sal/types.h>
+#include <rtl/ustring.hxx>
 #include <com/sun/star/uno/Reference.h>
+#include <com/sun/star/uno/Sequence.hxx>
 
 #include <map>
 #include <memory>
 
-#include <xmloff/xmltkmap.hxx>
-#include <rtl/ref.hxx>
 #include <salhelper/simplereferenceobject.hxx>
 
 class XMLTextListsHelper;
 class SvXMLImportContext;
 class SvXMLTokenMap;
 class SvXMLImportPropertyMapper;
-class SvXMLNamespaceMap;
 class SvXMLImport;
 class SvXMLStylesContext;
-class XMLTextListBlockContext;
 class SvxXMLListStyleContext;
 class XMLPropStyleContext;
 class SvI18NMap;
-class XMLSectionImportContext;
-class XMLFontStylesContext;
 template<class A> class XMLPropertyBackpatcher;
 class XMLEventsImportContext;
 
@@ -60,13 +56,14 @@ namespace text {
     class XFormField;
 }
 namespace frame { class XModel; }
-namespace container { class XNameContainer; class XIndexReplace; class XNameAccess; }
+namespace container { class XNameContainer; class XIndexReplace; }
 namespace beans { class XPropertySet; }
 namespace xml { namespace sax { class XAttributeList; } }
 namespace util { struct DateTime; }
-namespace lang { class XMultiServiceFactory; }
 } } }
 
+namespace rtl { template <class reference_type> class Reference; }
+
 enum SwXMLTextElemTokens
 {
     XML_TOK_TEXT_P,
diff --git a/include/xmloff/txtimppr.hxx b/include/xmloff/txtimppr.hxx
index 3786de22f478..377a032edb19 100644
--- a/include/xmloff/txtimppr.hxx
+++ b/include/xmloff/txtimppr.hxx
@@ -23,8 +23,6 @@
 #include <xmloff/xmlimppr.hxx>
 #include <memory>
 
-class XMLFontStylesContext;
-
 class XMLOFF_DLLPUBLIC XMLTextImportPropertyMapper : public SvXMLImportPropertyMapper
 {
     sal_Int32 nSizeTypeIndex;
diff --git a/include/xmloff/txtparae.hxx b/include/xmloff/txtparae.hxx
index 5b2099714c0d..b85f78f1dbfe 100644
--- a/include/xmloff/txtparae.hxx
+++ b/include/xmloff/txtparae.hxx
@@ -21,11 +21,10 @@
 #define INCLUDED_XMLOFF_TXTPARAE_HXX
 
 #include <sal/config.h>
+#include <rtl/ref.hxx>
 #include <xmloff/dllapi.h>
 #include <rtl/ustring.hxx>
 #include <com/sun/star/uno/Reference.h>
-#include <com/sun/star/beans/PropertyValue.hpp>
-#include <xmloff/xmlexppr.hxx>
 #include <xmloff/styleexp.hxx>
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/SinglePropertySetInfoCache.hxx>
@@ -38,23 +37,22 @@ class SvXMLExport;
 class SvXMLAutoStylePoolP;
 class XMLTextFieldExport;
 class XMLTextNumRuleInfo;
-class XMLTextListAutoStylePool;
 class XMLSectionExport;
 class XMLIndexMarkExport;
 class XMLRedlineExport;
 struct XMLPropertyState;
 class MultiPropertySetHelper;
 enum class XMLShapeExportFlags;
+class SvXMLExportPropertyMapper;
 
 namespace com { namespace sun { namespace star
 {
     namespace beans { class XPropertySet; class XPropertyState;
                       class XPropertySetInfo; }
-    namespace container { class XEnumerationAccess; class XEnumeration; class XIndexAccess; }
+    namespace container { class XEnumeration; class XIndexAccess; }
     namespace text { class XTextContent; class XTextRange; class XText;
                      class XFootnote; class XTextFrame; class XTextSection;
-                     class XTextField;
-                     class XDocumentIndex; class XTextShapesSupplier; }
+                     class XTextField; }
 } } }
 
 namespace xmloff
diff --git a/include/xmloff/txtstyli.hxx b/include/xmloff/txtstyli.hxx
index 85efa3f79d7c..be117980df59 100644
--- a/include/xmloff/txtstyli.hxx
+++ b/include/xmloff/txtstyli.hxx
@@ -23,7 +23,6 @@
 #include <xmloff/dllapi.h>
 #include <xmloff/prstylei.hxx>
 
-class SvXMLTokenMap;
 class XMLEventsImportContext;
 
 class XMLOFF_DLLPUBLIC XMLTextStyleContext : public XMLPropStyleContext
diff --git a/include/xmloff/unoatrcn.hxx b/include/xmloff/unoatrcn.hxx
index 54b2db7841ef..4880f74fde7c 100644
--- a/include/xmloff/unoatrcn.hxx
+++ b/include/xmloff/unoatrcn.hxx
@@ -26,7 +26,6 @@
 
 #include <xmloff/dllapi.h>
 #include <sal/types.h>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/container/XNameContainer.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
diff --git a/include/xmloff/xformsexport.hxx b/include/xmloff/xformsexport.hxx
index 5fb10ec782e0..5911d4a0c41f 100644
--- a/include/xmloff/xformsexport.hxx
+++ b/include/xmloff/xformsexport.hxx
@@ -26,7 +26,6 @@ class SvXMLExport;
 namespace com { namespace sun { namespace star {
     namespace uno { template<typename T> class Reference; }
     namespace uno { template<typename T> class Sequence; }
-    namespace frame { class XModel; }
     namespace beans { class XPropertySet; struct PropertyValue; }
     namespace container { class XNameAccess; }
 } } }
diff --git a/include/xmloff/xformsimport.hxx b/include/xmloff/xformsimport.hxx
index 99c511790883..5975ea993416 100644
--- a/include/xmloff/xformsimport.hxx
+++ b/include/xmloff/xformsimport.hxx
@@ -21,14 +21,14 @@
 
 #include <sal/config.h>
 #include <xmloff/dllapi.h>
-
-#include <com/sun/star/uno/Reference.hxx>
+#include <rtl/ustring.hxx>
 
 class SvXMLImport;
 class SvXMLImportContext;
 
 namespace com { namespace sun { namespace star {
     namespace uno { template<typename T> class Reference; }
+    namespace uno { template <typename > class Sequence; }
     namespace beans { class XPropertySet; struct PropertyValue; }
     namespace frame { class XModel; }
     namespace container { class XNameAccess; }
diff --git a/include/xmloff/xmlaustp.hxx b/include/xmloff/xmlaustp.hxx
index 1d708ad12806..6902dd9aa106 100644
--- a/include/xmloff/xmlaustp.hxx
+++ b/include/xmloff/xmlaustp.hxx
@@ -22,21 +22,29 @@
 
 #include <sal/config.h>
 #include <xmloff/dllapi.h>
-#include <com/sun/star/xml/sax/XDocumentHandler.hpp>
-#include <xmloff/xmlprmap.hxx>
-#include <xmloff/AutoStyleEntry.hxx>
+#include <rtl/ustring.hxx>
 #include <salhelper/simplereferenceobject.hxx>
 #include <memory>
+#include <vector>
 
 class SvXMLExportPropertyMapper;
 class SvXMLNamespaceMap;
 class SvXMLAutoStylePoolP_Impl;
 class SvXMLAttributeList;
 class SvXMLExport;
+class SvXMLUnitConverter;
+struct XMLPropertyState;
+
 namespace com { namespace sun { namespace star { namespace uno
     { template<typename A> class Sequence; }
 } } }
 
+namespace com { namespace sun { namespace star { namespace uno { template <typename > class Reference; } } } }
+
+namespace com { namespace sun { namespace star { namespace xml { namespace sax { class XDocumentHandler; } } } } }
+namespace xmloff { struct AutoStyleEntry; }
+namespace rtl { template <class reference_type> class Reference; }
+
 class XMLOFF_DLLPUBLIC SvXMLAutoStylePoolP : public salhelper::SimpleReferenceObject
 {
     friend class Test;
diff --git a/include/xmloff/xmlerror.hxx b/include/xmloff/xmlerror.hxx
index 3a7c2b20d256..f6b0479c0a30 100644
--- a/include/xmloff/xmlerror.hxx
+++ b/include/xmloff/xmlerror.hxx
@@ -20,8 +20,8 @@
 #ifndef INCLUDED_XMLOFF_XMLERROR_HXX
 #define INCLUDED_XMLOFF_XMLERROR_HXX
 
-#include <com/sun/star/xml/sax/SAXParseException.hpp>
 #include <sal/types.h>
+#include <rtl/ustring.hxx>
 #include <o3tl/typed_flags_set.hxx>
 
 #include <vector>
diff --git a/include/xmloff/xmlevent.hxx b/include/xmloff/xmlevent.hxx
index 811cd719c789..d300c8d06679 100644
--- a/include/xmloff/xmlevent.hxx
+++ b/include/xmloff/xmlevent.hxx
@@ -20,8 +20,10 @@
 #ifndef INCLUDED_XMLOFF_XMLEVENT_HXX
 #define INCLUDED_XMLOFF_XMLEVENT_HXX
 
-#include <com/sun/star/uno/Sequence.hxx>
-#include <com/sun/star/uno/Reference.hxx>
+#include <rtl/ustring.hxx>
+
+namespace com { namespace sun { namespace star { namespace uno { template <class interface_type> class Reference; } } } }
+namespace com { namespace sun { namespace star { namespace uno { template <typename > class Sequence; } } } }
 
 
 /**
diff --git a/include/xmloff/xmlexp.hxx b/include/xmloff/xmlexp.hxx
index 89ebac095657..7bed9eb22643 100644
--- a/include/xmloff/xmlexp.hxx
+++ b/include/xmloff/xmlexp.hxx
@@ -24,16 +24,9 @@
 #include <xmloff/dllapi.h>
 #include <sal/types.h>
 
-#include <com/sun/star/embed/XStorage.hpp>
-#include <com/sun/star/xml/sax/SAXParseException.hpp>
-#include <com/sun/star/xml/sax/XExtendedDocumentHandler.hpp>
-#include <com/sun/star/xml/sax/SAXException.hpp>
-#include <com/sun/star/xml/sax/XDocumentHandler.hpp>
-#include <com/sun/star/xml/sax/XAttributeList.hpp>
-#include <com/sun/star/xml/sax/XLocator.hpp>
-#include <com/sun/star/util/XNumberFormatsSupplier.hpp>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <rtl/ustring.hxx>
+#include <xmloff/attrlist.hxx>
 #include <xmloff/txtparae.hxx>
 #include <xmloff/formlayerexport.hxx>
 #include <xmloff/xmlnumfe.hxx>
@@ -46,35 +39,38 @@
 #include <com/sun/star/document/XFilter.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/document/XExporter.hpp>
-#include <com/sun/star/document/XGraphicStorageHandler.hpp>
-#include <com/sun/star/document/XEmbeddedObjectResolver.hpp>
-#include <com/sun/star/graphic/XGraphic.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
-#include <com/sun/star/lang/XEventListener.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/container/XNamed.hpp>
 
 #include <unotools/saveopt.hxx>
 
 #include <xmloff/XMLPageExport.hxx>
-#include <xmloff/ProgressBarHelper.hxx>
 #include <cppuhelper/implbase.hxx>
 #include <tools/fldunit.hxx>
 #include <vcl/errcode.hxx>
 
-#include <list>
 #include <vector>
 #include <memory>
 #include <o3tl/typed_flags_set.hxx>
 
+namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } }
+namespace com { namespace sun { namespace star { namespace document { class XEmbeddedObjectResolver; } } } }
+namespace com { namespace sun { namespace star { namespace document { class XGraphicStorageHandler; } } } }
+namespace com { namespace sun { namespace star { namespace embed { class XStorage; } } } }
+namespace com { namespace sun { namespace star { namespace graphic { class XGraphic; } } } }
+namespace com { namespace sun { namespace star { namespace lang { class XEventListener; } } } }
+namespace com { namespace sun { namespace star { namespace task { class XStatusIndicator; } } } }
+namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
+namespace com { namespace sun { namespace star { namespace util { class XNumberFormatsSupplier; } } } }
+namespace com { namespace sun { namespace star { namespace xml { namespace sax { class XAttributeList; } } } } }
+namespace com { namespace sun { namespace star { namespace xml { namespace sax { class XDocumentHandler; } } } } }
+namespace com { namespace sun { namespace star { namespace xml { namespace sax { class XExtendedDocumentHandler; } } } } }
+namespace com { namespace sun { namespace star { namespace xml { namespace sax { class XLocator; } } } } }
+
 class SvXMLNamespaceMap;
-class SvXMLAttributeList;
 class SvXMLExport_Impl;
-class SvXMLUnitConverter;
 class ProgressBarHelper;
 class XMLEventExport;
-class XMLSettingsExportHelper;
 class XMLImageMapExport;
 class XMLErrors;
 class LanguageTag;
@@ -85,7 +81,6 @@ enum class SvXMLErrorFlags;
 
 namespace com { namespace sun { namespace star {
     namespace frame { class XModel; }
-    namespace container { class XIndexContainer; }
     namespace lang { struct Locale; }
 } } }
 namespace comphelper { class UnoInterfaceToUniqueIdentifierMapper; }
diff --git a/include/xmloff/xmlexppr.hxx b/include/xmloff/xmlexppr.hxx
index 770572c3bd99..28be918474ee 100644
--- a/include/xmloff/xmlexppr.hxx
+++ b/include/xmloff/xmlexppr.hxx
@@ -20,15 +20,21 @@
 #ifndef INCLUDED_XMLOFF_XMLEXPPR_HXX
 #define INCLUDED_XMLOFF_XMLEXPPR_HXX
 
-#include <rtl/ref.hxx>
 #include <sal/config.h>
 #include <xmloff/dllapi.h>
-#include <xmloff/xmlprmap.hxx>
 #include <salhelper/simplereferenceobject.hxx>
 #include <o3tl/typed_flags_set.hxx>
+#include <rtl/ustring.hxx>
 
-#include <com/sun/star/beans/XPropertySet.hpp>
 #include <memory>
+#include <vector>
+
+namespace com { namespace sun { namespace star { namespace uno { template <typename > class Reference; } } } }
+namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } }
+namespace rtl { template <class reference_type> class Reference; }
+
+class XMLPropertySetMapper;
+struct XMLPropertyState;
 
 enum class SvXmlExportFlags {
     NONE        = 0x0000,
@@ -42,7 +48,6 @@ namespace o3tl
 class SvXMLUnitConverter;
 class SvXMLAttributeList;
 class SvXMLNamespaceMap;
-class FilterPropertiesInfos_Impl;
 class SvXMLExport;
 
 class XMLOFF_DLLPUBLIC SvXMLExportPropertyMapper : public salhelper::SimpleReferenceObject
diff --git a/include/xmloff/xmlictxt.hxx b/include/xmloff/xmlictxt.hxx
index 6a15d4e7c589..bc3943cefb6a 100644
--- a/include/xmloff/xmlictxt.hxx
+++ b/include/xmloff/xmlictxt.hxx
@@ -23,15 +23,14 @@
 #include <sal/config.h>
 #include <xmloff/dllapi.h>
 #include <sal/types.h>
-#include <com/sun/star/xml/sax/XAttributeList.hpp>
 #include <com/sun/star/xml/sax/XFastContextHandler.hpp>
-#include <tools/ref.hxx>
 #include <rtl/ustring.hxx>
 #include <cppuhelper/implbase.hxx>
 #include <xmloff/nmspmap.hxx>
 #include <memory>
 
-class SvXMLNamespaceMap;
+namespace com { namespace sun { namespace star { namespace xml { namespace sax { class XAttributeList; } } } } }
+
 class SvXMLImport;
 
 class SvXMLImportContext;
diff --git a/include/xmloff/xmlimp.hxx b/include/xmloff/xmlimp.hxx
index 39415336591a..885bab2ab1fe 100644
--- a/include/xmloff/xmlimp.hxx
+++ b/include/xmloff/xmlimp.hxx
@@ -27,45 +27,42 @@
 
 #include <xmloff/dllapi.h>
 #include <sal/types.h>
-#include <com/sun/star/graphic/XGraphic.hpp>
-#include <com/sun/star/embed/XStorage.hpp>
-#include <com/sun/star/xml/sax/SAXParseException.hpp>
 #include <com/sun/star/xml/sax/XExtendedDocumentHandler.hpp>
-#include <com/sun/star/xml/sax/SAXException.hpp>
-#include <com/sun/star/xml/sax/XAttributeList.hpp>
 #include <com/sun/star/xml/sax/XFastParser.hpp>
-#include <com/sun/star/xml/sax/XLocator.hpp>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
-#include <com/sun/star/util/XNumberFormatsSupplier.hpp>
-#include <com/sun/star/container/XNameContainer.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/document/XImporter.hpp>
 #include <com/sun/star/document/XFilter.hpp>
-#include <com/sun/star/document/XGraphicStorageHandler.hpp>
-#include <com/sun/star/document/XEmbeddedObjectResolver.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
-#include <cppuhelper/weak.hxx>
 #include <xmloff/txtimp.hxx>
 #include <xmloff/shapeimport.hxx>
 #include <xmloff/SchXMLImportHelper.hxx>
-#include <xmloff/ProgressBarHelper.hxx>
 #include <cppuhelper/implbase.hxx>
 #include <xmloff/formlayerimport.hxx>
-#include <comphelper/attributelist.hxx>
 #include <sax/fastattribs.hxx>
 #include <rtl/ustring.hxx>
 #include <unordered_map>
 
-#include <com/sun/star/beans/NamedValue.hpp>
-
 #include <com/sun/star/xml/sax/XFastDocumentHandler.hpp>
-#include <com/sun/star/xml/sax/XFastContextHandler.hpp>
-#include <com/sun/star/xml/sax/XFastAttributeList.hpp>
 #include <o3tl/typed_flags_set.hxx>
 #include <memory>
 
+namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } }
+namespace com { namespace sun { namespace star { namespace beans { struct NamedValue; } } } }
+namespace com { namespace sun { namespace star { namespace document { class XEmbeddedObjectResolver; } } } }
+namespace com { namespace sun { namespace star { namespace document { class XGraphicStorageHandler; } } } }
+namespace com { namespace sun { namespace star { namespace embed { class XStorage; } } } }
+namespace com { namespace sun { namespace star { namespace graphic { class XGraphic; } } } }
+namespace com { namespace sun { namespace star { namespace task { class XStatusIndicator; } } } }
+namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
+namespace com { namespace sun { namespace star { namespace util { class XNumberFormatsSupplier; } } } }
+namespace com { namespace sun { namespace star { namespace xml { namespace sax { class XAttributeList; } } } } }
+namespace com { namespace sun { namespace star { namespace xml { namespace sax { class XFastAttributeList; } } } } }
+namespace com { namespace sun { namespace star { namespace xml { namespace sax { class XFastContextHandler; } } } } }
+namespace comphelper { class AttributeList; }
+
+class ProgressBarHelper;
+
 #define NAMESPACE_TOKEN( prefixToken ) ( ( sal_Int32( prefixToken + 1 ) ) << NMSP_SHIFT )
 #define XML_ELEMENT( prefix, name ) ( NAMESPACE_TOKEN( XML_NAMESPACE_##prefix ) | name )
 
@@ -81,7 +78,6 @@ namespace com { namespace sun { namespace star {
 namespace comphelper { class UnoInterfaceToUniqueIdentifierMapper; }
 
 class SvXMLNamespaceMap;
-class SvXMLImportContext;
 class SvXMLImport_Impl;
 class SvXMLUnitConverter;
 class SvXMLNumFmtHelper;
diff --git a/include/xmloff/xmlimppr.hxx b/include/xmloff/xmlimppr.hxx
index fe4cf515ea49..4b557ca0a580 100644
--- a/include/xmloff/xmlimppr.hxx
+++ b/include/xmloff/xmlimppr.hxx
@@ -23,15 +23,21 @@
 #include <sal/config.h>
 #include <xmloff/dllapi.h>
 #include <sal/types.h>
-#include <com/sun/star/xml/sax/XAttributeList.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/beans/XMultiPropertySet.hpp>
-#include <com/sun/star/beans/XTolerantMultiPropertySet.hpp>
+#include <rtl/ustring.hxx>
 
 #include <vector>
 #include <salhelper/simplereferenceobject.hxx>
 
+namespace com { namespace sun { namespace star { namespace beans { class XMultiPropertySet; } } } }
+namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } }
+namespace com { namespace sun { namespace star { namespace beans { class XPropertySetInfo; } } } }
+namespace com { namespace sun { namespace star { namespace beans { class XTolerantMultiPropertySet; } } } }
+namespace com { namespace sun { namespace star { namespace beans { struct PropertyValue; } } } }
+namespace com { namespace sun { namespace star { namespace uno { class Any; } } } }
+namespace com { namespace sun { namespace star { namespace uno { template <typename > class Reference; } } } }
+namespace com { namespace sun { namespace star { namespace uno { template <typename > class Sequence; } } } }
+namespace com { namespace sun { namespace star { namespace xml { namespace sax { class XAttributeList; } } } } }
+
 struct XMLPropertyState;
 class XMLPropertySetMapper;
 
diff --git a/include/xmloff/xmlmetae.hxx b/include/xmloff/xmlmetae.hxx
index c4f62f609684..af269e00ec78 100644
--- a/include/xmloff/xmlmetae.hxx
+++ b/include/xmloff/xmlmetae.hxx
@@ -30,9 +30,10 @@
 #include <vector>
 
 #include <com/sun/star/beans/StringPair.hpp>
-#include <com/sun/star/util/DateTime.hpp>
 #include <com/sun/star/xml/sax/XDocumentHandler.hpp>
-#include <com/sun/star/document/XDocumentProperties.hpp>
+
+namespace com { namespace sun { namespace star { namespace document { class XDocumentProperties; } } } }
+namespace com { namespace sun { namespace star { namespace util { struct DateTime; } } } }
 
 
 class SvXMLExport;
diff --git a/include/xmloff/xmlmetai.hxx b/include/xmloff/xmlmetai.hxx
index 9b9f59da7f10..ca908b41c114 100644
--- a/include/xmloff/xmlmetai.hxx
+++ b/include/xmloff/xmlmetai.hxx
@@ -24,10 +24,10 @@
 #include <xmloff/dllapi.h>
 #include <xmloff/xmlictxt.hxx>
 
-#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/document/XDocumentProperties.hpp>
-#include <com/sun/star/xml/dom/XSAXDocumentBuilder2.hpp>
 
+namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } }
+namespace com { namespace sun { namespace star { namespace document { class XDocumentProperties; } } } }
+namespace com { namespace sun { namespace star { namespace xml { namespace dom { class XSAXDocumentBuilder2; } } } } }
 
 /// handles the top-level office:document-meta element of meta.xml documents
 // NB: virtual inheritance is needed so that the context that handles the
diff --git a/include/xmloff/xmlnume.hxx b/include/xmloff/xmlnume.hxx
index f8d905e522f4..a7615930db4b 100644
--- a/include/xmloff/xmlnume.hxx
+++ b/include/xmloff/xmlnume.hxx
@@ -21,19 +21,17 @@
 #define INCLUDED_XMLOFF_XMLNUME_HXX
 
 #include <rtl/ustring.hxx>
-#include <tools/mapunit.hxx>
-#include <xmloff/attrlist.hxx>
+#include <xmloff/dllapi.h>
 
 namespace com { namespace sun { namespace star {
-    namespace frame { class XModel; }
     namespace style { class XStyle; }
     namespace container { class XIndexReplace; }
     namespace beans { struct PropertyValue; }
 } } }
 
-class SvXMLNamespaceMap;
-class SvXMLUnitConverter;
-class SvXMLExportItemMapper;
+namespace com { namespace sun { namespace star { namespace uno { template <class E> class Sequence; } } } }
+namespace com { namespace sun { namespace star { namespace uno { template <class interface_type> class Reference; } } } }
+
 class SvXMLExport;
 class XMLTextListAutoStylePool;
 
diff --git a/include/xmloff/xmlnumfe.hxx b/include/xmloff/xmlnumfe.hxx
index ec7d3878aa59..5db3352540ee 100644
--- a/include/xmloff/xmlnumfe.hxx
+++ b/include/xmloff/xmlnumfe.hxx
@@ -23,25 +23,25 @@
 #include <sal/config.h>
 #include <xmloff/dllapi.h>
 #include <sal/types.h>
-#include <com/sun/star/util/XNumberFormatsSupplier.hpp>
 #include <com/sun/star/uno/Sequence.h>
 #include <rtl/ustrbuf.hxx>
 #include <i18nlangtag/lang.h>
 #include <memory>
 
+namespace com { namespace sun { namespace star { namespace lang { struct Locale; } } } }
+namespace com { namespace sun { namespace star { namespace uno { template <typename > class Reference; } } } }
+namespace com { namespace sun { namespace star { namespace util { class XNumberFormatsSupplier; } } } }
+
 #define XML_WRITTENNUMBERSTYLES "WrittenNumberStyles"
 
 class Color;
 class LocaleDataWrapper;
 class CharClass;
 class SvXMLExport;
-class SvXMLNamespaceMap;
-class SvXMLAttributeList;
 class SvNumberFormatter;
 class SvNumberformat;
 class SvXMLNumUsedList_Impl;
 
-struct SvXMLEmbeddedTextEntry;
 class SvXMLEmbeddedTextEntryArr;
 
 class XMLOFF_DLLPUBLIC SvXMLNumFmtExport final
diff --git a/include/xmloff/xmlnumfi.hxx b/include/xmloff/xmlnumfi.hxx
index 67fe154e9911..9a50b34a6555 100644
--- a/include/xmloff/xmlnumfi.hxx
+++ b/include/xmloff/xmlnumfi.hxx
@@ -23,14 +23,15 @@
 #include <sal/config.h>
 #include <xmloff/dllapi.h>
 #include <sal/types.h>
-#include <com/sun/star/util/XNumberFormatsSupplier.hpp>
-#include <com/sun/star/xml/sax/XAttributeList.hpp>
 #include <xmloff/xmlstyle.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <i18nlangtag/lang.h>
 #include <memory>
 #include <vector>
-#include <unotools/localedatawrapper.hxx>
+
+namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
+namespace com { namespace sun { namespace star { namespace util { class XNumberFormatsSupplier; } } } }
+namespace com { namespace sun { namespace star { namespace xml { namespace sax { class XAttributeList; } } } } }
 
 #define XML_NUMBERSTYLES "NumberStyles"
 
@@ -58,14 +59,9 @@ enum SvXMLDateElementAttributes
 class Color;
 class SvXMLNumImpData;
 class SvXMLImport;
-class SvXMLStyleContext;
-class SvXMLStylesContext;
 struct SvXMLNumberInfo;
 class SvNumberFormatter;
-class SvtSysLocale;
-namespace com { namespace sun { namespace star { namespace lang {
-    class XMultiServiceFactory;
-}}}}
+class LocaleDataWrapper;
 
 
 //  use SvXMLNumFmtHelper in the context for <office:styles> to create
diff --git a/include/xmloff/xmlnumi.hxx b/include/xmloff/xmlnumi.hxx
index caecd76f3b4f..0ba540415f69 100644
--- a/include/xmloff/xmlnumi.hxx
+++ b/include/xmloff/xmlnumi.hxx
@@ -25,12 +25,10 @@
 #include <memory>
 #include <vector>
 
-#include <com/sun/star/container/XIndexReplace.hpp>
-
 #include <xmloff/xmlstyle.hxx>
-#include <com/sun/star/style/NumberingType.hpp>
 
 namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } }
+namespace com { namespace sun { namespace star { namespace container { class XIndexReplace; } } } }
 
 class SvxXMLListLevelStyleContext_Impl;
 typedef std::vector<rtl::Reference<SvxXMLListLevelStyleContext_Impl>> SvxXMLListStyle_Impl;
diff --git a/include/xmloff/xmlprcon.hxx b/include/xmloff/xmlprcon.hxx
index fb2cba45f6db..dc528233e187 100644
--- a/include/xmloff/xmlprcon.hxx
+++ b/include/xmloff/xmlprcon.hxx
@@ -21,11 +21,11 @@
 #define INCLUDED_XMLOFF_XMLPRCON_HXX
 
 #include <xmloff/xmlictxt.hxx>
-#include <xmloff/xmlimppr.hxx>
-#include <xmloff/xmlprmap.hxx>
 
+#include <vector>
 
 class SvXMLImportPropertyMapper;
+struct XMLPropertyState;
 
 class XMLOFF_DLLPUBLIC SvXMLPropertySetContext : public SvXMLImportContext
 {
diff --git a/include/xmloff/xmlprhdl.hxx b/include/xmloff/xmlprhdl.hxx
index 9c9a6f79b8de..7e98304349f8 100644
--- a/include/xmloff/xmlprhdl.hxx
+++ b/include/xmloff/xmlprhdl.hxx
@@ -22,13 +22,11 @@
 
 #include <sal/config.h>
 #include <xmloff/dllapi.h>
-#include <sal/types.h>
 #include <rtl/ustring.hxx>
 
 namespace com{ namespace sun{ namespace star{ namespace uno{ class Any; } } } }
 
 class SvXMLUnitConverter;
-struct XMLPropertyState;
 
 
 /** Abstract base-class for different XML-types. Derivations of this class
diff --git a/include/xmloff/xmlprmap.hxx b/include/xmloff/xmlprmap.hxx
index ab1690da7078..baf01aa2eadd 100644
--- a/include/xmloff/xmlprmap.hxx
+++ b/include/xmloff/xmlprmap.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_XMLOFF_XMLPRMAP_HXX
 #define INCLUDED_XMLOFF_XMLPRMAP_HXX
 
-#include <rtl/ref.hxx>
 #include <xmloff/dllapi.h>
 #include <unotools/saveopt.hxx>
 #include <rtl/ustring.hxx>
@@ -28,6 +27,8 @@
 #include <salhelper/simplereferenceobject.hxx>
 #include <memory>
 
+namespace rtl { template <class reference_type> class Reference; }
+
 class SvXMLUnitConverter;
 class XMLPropertyHandler;
 class XMLPropertyHandlerFactory;
diff --git a/include/xmloff/xmlstyle.hxx b/include/xmloff/xmlstyle.hxx
index 6d60a1114b73..00e9d7b285bc 100644
--- a/include/xmloff/xmlstyle.hxx
+++ b/include/xmloff/xmlstyle.hxx
@@ -24,14 +24,12 @@
 #include <sal/config.h>
 #include <xmloff/dllapi.h>
 #include <sal/types.h>
-#include <svl/style.hxx>
-#include <xmloff/xmltkmap.hxx>
 #include <xmloff/xmlictxt.hxx>
 #include <memory>
 
 class SvXMLStylesContext_Impl;
-class SvXMLUnitConverter;
 class SvXMLImportPropertyMapper;
+class SvXMLTokenMap;
 
 namespace com { namespace sun { namespace star {
 namespace container { class XNameContainer; }
diff --git a/include/xmloff/xmltabe.hxx b/include/xmloff/xmltabe.hxx
index 3bdd0a368406..7d4fb76dc53a 100644
--- a/include/xmloff/xmltabe.hxx
+++ b/include/xmloff/xmltabe.hxx
@@ -22,6 +22,7 @@
 
 // prevent funny things like "#define sun 1" from the compiler
 #include <sal/config.h>
+#include <sal/types.h>
 
 class SvXMLExport;
 namespace com { namespace sun { namespace star {
diff --git a/include/xmloff/xmltoken.hxx b/include/xmloff/xmltoken.hxx
index 2d1906016039..01467992f3d2 100644
--- a/include/xmloff/xmltoken.hxx
+++ b/include/xmloff/xmltoken.hxx
@@ -22,7 +22,6 @@
 
 #include <sal/config.h>
 #include <xmloff/dllapi.h>
-#include <sal/types.h>
 #include <rtl/ustring.hxx>
 #include <sax/fastattribs.hxx>
 
diff --git a/include/xmloff/xmluconv.hxx b/include/xmloff/xmluconv.hxx
index 142ecaa6d620..cc7c4736e6c7 100644
--- a/include/xmloff/xmluconv.hxx
+++ b/include/xmloff/xmluconv.hxx
@@ -25,25 +25,14 @@
 #include <sal/types.h>
 
 #include <memory>
-#include <limits.h>
 
 #include <rtl/ustring.hxx>
 #include <rtl/ustrbuf.hxx>
-#include <xmloff/xmlement.hxx>
 #include <xmloff/xmltoken.hxx>
-#include <com/sun/star/util/Date.hpp>
-#include <com/sun/star/frame/XModel.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/drawing/Position3D.hpp>
 
-#include <com/sun/star/uno/XComponentContext.hpp>
 #include <tools/fldunit.hxx>
-#include <tools/mapunit.hxx>
-
-namespace tools { class Time; }
 
 namespace com { namespace sun { namespace star {
-    namespace util { struct DateTime; }
     namespace text { class XNumberingTypeInfo; }
 }}}
 
@@ -52,6 +41,16 @@ namespace basegfx
     class B3DVector;
 }
 
+namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } }
+namespace com { namespace sun { namespace star { namespace beans { struct PropertyValue; } } } }
+namespace com { namespace sun { namespace star { namespace drawing { struct Position3D; } } } }
+namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } }
+namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
+namespace com { namespace sun { namespace star { namespace uno { template <class E> class Sequence; } } } }
+namespace com { namespace sun { namespace star { namespace util { struct Date; } } } }
+template <typename EnumT> struct SvXMLEnumMapEntry;
+template <typename EnumT> struct SvXMLEnumStringMapEntry;
+
 class XMLOFF_DLLPUBLIC SvXMLTokenEnumerator
 {
 private: