13 files changed, 5 insertions, 23 deletions
diff --git a/xmloff/inc/AutoStyleEntry.hxx b/xmloff/inc/AutoStyleEntry.hxx
index 15f99f1b113f..9e3aadbd32df 100644
--- a/xmloff/inc/AutoStyleEntry.hxx
+++ b/xmloff/inc/AutoStyleEntry.hxx
@@ -13,7 +13,6 @@
 #include <sal/config.h>
 #include <rtl/ustring.hxx>
 #include <com/sun/star/uno/Any.hxx>
-#include <xmloff/dllapi.h>
 #include <utility>
 #include <vector>
 
diff --git a/xmloff/inc/DomExport.hxx b/xmloff/inc/DomExport.hxx
index b6646214f7e8..ebf3779b0bff 100644
--- a/xmloff/inc/DomExport.hxx
+++ b/xmloff/inc/DomExport.hxx
@@ -18,14 +18,12 @@
  */
 #pragma once
 
-// the Solaris compiler apparently needs the following include:
-#include <com/sun/star/uno/Reference.hxx>
+#include <sal/types.h>
 
 class SvXMLExport;
 namespace com::sun::star {
     namespace uno { template<typename T> class Reference; }
     namespace xml::dom { class XDocument; }
-    namespace xml::dom { class XNode; }
 }
 
 void exportDom( SvXMLExport&, const css::uno::Reference<css::xml::dom::XDocument>& );
diff --git a/xmloff/inc/StyleMap.hxx b/xmloff/inc/StyleMap.hxx
index 796245f52fc7..0e7fe1b40b06 100644
--- a/xmloff/inc/StyleMap.hxx
+++ b/xmloff/inc/StyleMap.hxx
@@ -19,7 +19,6 @@
 
 #pragma once
 
-#include <comphelper/servicehelper.hxx>
 #include <cppuhelper/implbase.hxx>
 #include <o3tl/hash_combine.hxx>
 #include <unordered_map>
diff --git a/xmloff/inc/XMLFootnoteConfigurationImportContext.hxx b/xmloff/inc/XMLFootnoteConfigurationImportContext.hxx
index 2bd8efc40364..4b1b50fc45da 100644
--- a/xmloff/inc/XMLFootnoteConfigurationImportContext.hxx
+++ b/xmloff/inc/XMLFootnoteConfigurationImportContext.hxx
@@ -19,7 +19,6 @@
 
 #pragma once
 
-#include <memory>
 #include <xmloff/xmlstyle.hxx>
 
 namespace com::sun::star {
diff --git a/xmloff/inc/XMLImageMapContext.hxx b/xmloff/inc/XMLImageMapContext.hxx
index aec96fb29e9c..0579494b7213 100644
--- a/xmloff/inc/XMLImageMapContext.hxx
+++ b/xmloff/inc/XMLImageMapContext.hxx
@@ -20,7 +20,6 @@
 #pragma once
 
 #include <xmloff/xmlictxt.hxx>
-#include <rtl/ustring.hxx>
 #include <com/sun/star/uno/Reference.h>
 
 namespace com::sun::star {
diff --git a/xmloff/inc/XMLThemeContext.hxx b/xmloff/inc/XMLThemeContext.hxx
index c3056fa74216..7b24671eb3ff 100644
--- a/xmloff/inc/XMLThemeContext.hxx
+++ b/xmloff/inc/XMLThemeContext.hxx
@@ -7,12 +7,10 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <utility>
-#include <xmloff/xmlprcon.hxx>
+#include <xmloff/xmlictxt.hxx>
 
 #include <com/sun/star/uno/XInterface.hpp>
 #include <com/sun/star/util/Color.hpp>
-#include <com/sun/star/container/XNameContainer.hpp>
 
 #include <docmodel/theme/ColorSet.hxx>
 
diff --git a/xmloff/inc/animimp.hxx b/xmloff/inc/animimp.hxx
index b26c138ab6a5..9653d810b32e 100644
--- a/xmloff/inc/animimp.hxx
+++ b/xmloff/inc/animimp.hxx
@@ -19,8 +19,6 @@
 
 #pragma once
 
-#include <memory>
-
 #include <xmloff/xmlictxt.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
 
diff --git a/xmloff/inc/fasttokenhandler.hxx b/xmloff/inc/fasttokenhandler.hxx
index 528ecde17546..ed64c6938065 100644
--- a/xmloff/inc/fasttokenhandler.hxx
+++ b/xmloff/inc/fasttokenhandler.hxx
@@ -9,12 +9,9 @@
 
 #pragma once
 
-#include <com/sun/star/xml/sax/XFastTokenHandler.hpp>
-#include <cppuhelper/implbase.hxx>
 #include <sax/fastattribs.hxx>
 #include <xmloff/token/tokens.hxx>
 #include <sal/log.hxx>
-#include <xmloff/dllapi.h>
 
 namespace xmloff::token {
 
diff --git a/xmloff/inc/forms/property_handler.hxx b/xmloff/inc/forms/property_handler.hxx
index 822baaf3c9e6..1eadd2d88444 100644
--- a/xmloff/inc/forms/property_handler.hxx
+++ b/xmloff/inc/forms/property_handler.hxx
@@ -27,7 +27,6 @@
 #include <salhelper/simplereferenceobject.hxx>
 
 #include <map>
-#include <vector>
 
 namespace xmloff
 {
diff --git a/xmloff/inc/txtflde.hxx b/xmloff/inc/txtflde.hxx
index f21b85eb1b2a..06d5edcaa2b4 100644
--- a/xmloff/inc/txtflde.hxx
+++ b/xmloff/inc/txtflde.hxx
@@ -35,19 +35,15 @@
 #include <optional>
 #include <string_view>
 
-#include "txtfld.hxx"
-
 class SvXMLExport;
 struct XMLPropertyState;
 
 namespace com::sun::star {
     namespace util { struct DateTime; }
-    namespace util { struct Date; }
     namespace text { class XTextField; }
     namespace text { class XText; }
     namespace beans { class XPropertySet; }
     namespace beans { class XPropertySetInfo; }
-    namespace frame { class XModel; }
     namespace uno { template<typename A> class Sequence; }
 }
 
diff --git a/xmloff/inc/txtfldi.hxx b/xmloff/inc/txtfldi.hxx
index 3d56c547811e..4639ec43f38b 100644
--- a/xmloff/inc/txtfldi.hxx
+++ b/xmloff/inc/txtfldi.hxx
@@ -30,11 +30,10 @@
 #include <com/sun/star/text/PageNumberType.hpp>
 #include <com/sun/star/util/DateTime.hpp>
 #include <xmloff/xmlictxt.hxx>
+#include <xmloff/XMLEventsImportContext.hxx>
 #include <xmloff/txtimp.hxx>
-#include <xmloff/xmltkmap.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <vector>
-#include "txtfld.hxx"
 
 namespace com::sun::star {
     namespace xml::sax { class XAttributeList; }
diff --git a/xmloff/inc/xmlprop.hxx b/xmloff/inc/xmlprop.hxx
index 89c53b72a8ea..50978ed0fa75 100644
--- a/xmloff/inc/xmlprop.hxx
+++ b/xmloff/inc/xmlprop.hxx
@@ -8,6 +8,8 @@
  */
 #pragma once
 
+#include <rtl/ustring.hxx>
+
 inline constexpr OUString PROP_ = u""_ustr;
 inline constexpr OUString PROP_AdjustBlue = u"AdjustBlue"_ustr;
 inline constexpr OUString PROP_AdjustContrast = u"AdjustContrast"_ustr;
diff --git a/xmloff/inc/xmltabe.hxx b/xmloff/inc/xmltabe.hxx
index ad28e77147e3..5239648935cb 100644
--- a/xmloff/inc/xmltabe.hxx
+++ b/xmloff/inc/xmltabe.hxx
@@ -21,7 +21,6 @@
 
 // prevent funny things like "#define sun 1" from the compiler
 #include <sal/config.h>
-#include <sal/types.h>
 
 class SvXMLExport;
 namespace com::sun::star {