tdf#42949 Fix IWYU warnings in include/[a-r]*/*hxx

Recheck after 7-0 branchoff

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

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

40 files changed, 24 insertions, 66 deletions

diff --git a/include/IwyuFilter_include.yaml b/include/IwyuFilter_include.yaml
index c1fb63e1cf6a..ff20b0691aef 100644
--- a/include/IwyuFilter_include.yaml
+++ b/include/IwyuFilter_include.yaml
@@ -208,6 +208,9 @@ excludelist:
     # base class has to be a complete type
     - com/sun/star/lang/XEventListener.hpp
     - com/sun/star/lang/XComponent.hpp
+    include/basegfx/numeric/ftools.hxx:
+    # MSVC does not compile when this is removed
+    - math.h
     include/basegfx/utils/unopolypolygon.hxx:
     # base class has to be a complete type
     - com/sun/star/lang/XServiceInfo.hpp
@@ -517,6 +520,8 @@ excludelist:
     - com/sun/star/sdbcx/XColumnsSupplier.hpp
     # Needed for macro defines
     - cppuhelper/supportsservice.hxx
+    # Needed for HAVE_FEATURE_JAVA
+    - rtl/ref.hxx
     include/connectivity/ConnectionWrapper.hxx:
     # base class has to be a complete type
     - com/sun/star/lang/XUnoTunnel.hpp
@@ -785,6 +790,7 @@ excludelist:
     - com/sun/star/awt/FontDescriptor.hpp
     - com/sun/star/style/LineSpacing.hpp
     - com/sun/star/style/TabStop.hpp
+    - editeng/eeitem.hxx
     include/formula/FormulaOpCodeMapperObj.hxx:
     # base class has to be a complete type
     - com/sun/star/lang/XServiceInfo.hpp
@@ -909,3 +915,12 @@ excludelist:
     include/oox/helper/helper.hxx:
     # OSL_BIGENDIAN is being checked
     - osl/endian.h
+    include/codemaker/global.hxx:
+    # Don't propose hxx -> h change in URE libs
+    - osl/file.hxx
+    include/comphelper/crashzone.hxx:
+    # Needed for sig_atomic_t
+    - csignal
+    include/comphelper/parallelsort.hxx:
+    # Needed when PARALLELSORT_ENABLEPZ is defined
+    - chrono
diff --git a/include/LibreOfficeKit/LibreOfficeKit.hxx b/include/LibreOfficeKit/LibreOfficeKit.hxx
index db6c87725bce..23b79c742c09 100644
--- a/include/LibreOfficeKit/LibreOfficeKit.hxx
+++ b/include/LibreOfficeKit/LibreOfficeKit.hxx
@@ -9,8 +9,6 @@
 
 #pragma once
 
-#include <cstddef>
-
 #include <LibreOfficeKit/LibreOfficeKit.h>
 #include <LibreOfficeKit/LibreOfficeKitInit.h>
 
diff --git a/include/basegfx/point/b2ipoint.hxx b/include/basegfx/point/b2ipoint.hxx
index 171fcbc9c8be..4c0802b572ae 100644
--- a/include/basegfx/point/b2ipoint.hxx
+++ b/include/basegfx/point/b2ipoint.hxx
@@ -20,7 +20,6 @@
 #pragma once
 
 #include <basegfx/tuple/b2ituple.hxx>
-#include <basegfx/basegfxdllapi.h>
 
 namespace basegfx
 {
diff --git a/include/basegfx/raster/bzpixelraster.hxx b/include/basegfx/raster/bzpixelraster.hxx
index d1b166fb0361..52ebc3c6ecd2 100644
--- a/include/basegfx/raster/bzpixelraster.hxx
+++ b/include/basegfx/raster/bzpixelraster.hxx
@@ -22,6 +22,7 @@
 #include <basegfx/pixel/bpixel.hxx>
 #include <sal/types.h>
 #include <memory>
+#include <cassert>
 #include <string.h>
 
 namespace basegfx
diff --git a/include/codemaker/exceptiontree.hxx b/include/codemaker/exceptiontree.hxx
index eec504a396e7..e42850c101e5 100644
--- a/include/codemaker/exceptiontree.hxx
+++ b/include/codemaker/exceptiontree.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_CODEMAKER_EXCEPTIONTREE_HXX
 #define INCLUDED_CODEMAKER_EXCEPTIONTREE_HXX
 
-#include <codemaker/global.hxx>
 #include <rtl/ref.hxx>
 #include <rtl/string.hxx>
 
diff --git a/include/codemaker/global.hxx b/include/codemaker/global.hxx
index d453a0e0b59c..256b3786ce90 100644
--- a/include/codemaker/global.hxx
+++ b/include/codemaker/global.hxx
@@ -24,8 +24,6 @@
 #include <vector>
 #include <set>
 
-#include <stdio.h>
-
 #include <osl/file.hxx>
 #include <rtl/ustring.hxx>
 #include <rtl/strbuf.hxx>
diff --git a/include/comphelper/crashzone.hxx b/include/comphelper/crashzone.hxx
index 6cbbe718f8a4..f15f848cdf9e 100644
--- a/include/comphelper/crashzone.hxx
+++ b/include/comphelper/crashzone.hxx
@@ -11,8 +11,6 @@
 #define INCLUDED_COMPHELPER_CRASHZONE_H
 
 #include <sal/config.h>
-#include <sal/types.h>
-#include <comphelper/comphelperdllapi.h>
 
 #include <atomic>
 #include <csignal>
diff --git a/include/comphelper/interaction.hxx b/include/comphelper/interaction.hxx
index 3c4074eafeb9..b138023329fb 100644
--- a/include/comphelper/interaction.hxx
+++ b/include/comphelper/interaction.hxx
@@ -25,7 +25,6 @@
 #include <com/sun/star/task/XInteractionDisapprove.hpp>
 #include <com/sun/star/task/XInteractionAbort.hpp>
 #include <com/sun/star/task/XInteractionRetry.hpp>
-#include <com/sun/star/task/XInteractionPassword.hpp>
 #include <com/sun/star/task/XInteractionRequest.hpp>
 #include <comphelper/comphelperdllapi.h>
 #include <vector>
diff --git a/include/comphelper/interfacecontainer3.hxx b/include/comphelper/interfacecontainer3.hxx
index 6e256488f584..d912777fe724 100644
--- a/include/comphelper/interfacecontainer3.hxx
+++ b/include/comphelper/interfacecontainer3.hxx
@@ -23,7 +23,6 @@
 
 #include <com/sun/star/lang/EventObject.hpp>
 #include <com/sun/star/lang/DisposedException.hpp>
-#include <comphelper/comphelperdllapi.h>
 #include <o3tl/cow_wrapper.hxx>
 #include <vector>
 
diff --git a/include/comphelper/parallelsort.hxx b/include/comphelper/parallelsort.hxx
index 363cdd56ee0b..57eccc4770e3 100644
--- a/include/comphelper/parallelsort.hxx
+++ b/include/comphelper/parallelsort.hxx
@@ -10,7 +10,6 @@
 #ifndef INCLUDED_COMPHELPER_PARALLELSORT_HXX
 #define INCLUDED_COMPHELPER_PARALLELSORT_HXX
 
-#include <comphelper/comphelperdllapi.h>
 #include <comphelper/threadpool.hxx>
 #include <tools/cpuid.hxx>
 
diff --git a/include/comphelper/types.hxx b/include/comphelper/types.hxx
index 2cb47f2218bc..203bbbe0235e 100644
--- a/include/comphelper/types.hxx
+++ b/include/comphelper/types.hxx
@@ -22,7 +22,6 @@
 
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/lang/XComponent.hpp>
-#include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <comphelper/comphelperdllapi.h>
 
 namespace com::sun::star::awt {
diff --git a/include/comphelper/unwrapargs.hxx b/include/comphelper/unwrapargs.hxx
index 041c69da1818..76eb8b838dff 100644
--- a/include/comphelper/unwrapargs.hxx
+++ b/include/comphelper/unwrapargs.hxx
@@ -24,7 +24,6 @@
 
 #include <optional>
 
-#include <rtl/ustrbuf.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/uno/XInterface.hpp>
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
diff --git a/include/connectivity/internalnode.hxx b/include/connectivity/internalnode.hxx
index 1b878f8b5542..13ace88dc67a 100644
--- a/include/connectivity/internalnode.hxx
+++ b/include/connectivity/internalnode.hxx
@@ -18,7 +18,6 @@
  */
 #pragma once
 
-#include <connectivity/dbtoolsdllapi.hxx>
 #include <connectivity/sqlnode.hxx>
 
 namespace connectivity
diff --git a/include/connectivity/sdbcx/VTable.hxx b/include/connectivity/sdbcx/VTable.hxx
index 706700f878e9..3489fc9b8245 100644
--- a/include/connectivity/sdbcx/VTable.hxx
+++ b/include/connectivity/sdbcx/VTable.hxx
@@ -31,6 +31,7 @@
 #include <cppuhelper/compbase.hxx>
 #include <cppuhelper/implbase4.hxx>
 #include <cppuhelper/basemutex.hxx>
+#include <rtl/ref.hxx>
 #include <com/sun/star/container/XNamed.hpp>
 #include <connectivity/sdbcx/IRefreshable.hxx>
 #include <connectivity/sdbcx/VDescriptor.hxx>
diff --git a/include/connectivity/sqlscan.hxx b/include/connectivity/sqlscan.hxx
index 0c976682b8a3..be6d4178f0a8 100644
--- a/include/connectivity/sqlscan.hxx
+++ b/include/connectivity/sqlscan.hxx
@@ -19,7 +19,6 @@
 #pragma once
 
 #include <connectivity/IParseContext.hxx>
-#include <connectivity/dbtoolsdllapi.hxx>
 
 namespace connectivity
 {
diff --git a/include/drawinglayer/attribute/sdrglowattribute.hxx b/include/drawinglayer/attribute/sdrglowattribute.hxx
index b17560bd76af..8dbbdbb98431 100644
--- a/include/drawinglayer/attribute/sdrglowattribute.hxx
+++ b/include/drawinglayer/attribute/sdrglowattribute.hxx
@@ -11,10 +11,6 @@
 #define INCLUDED_DRAWINGLAYER_ATTRIBUTE_SDRGLOWATTRIBUTE_HXX
 
 #include <drawinglayer/drawinglayerdllapi.h>
-#include <o3tl/cow_wrapper.hxx>
-#include <basegfx/matrix/b2dhommatrix.hxx>
-#include <basegfx/color/bcolor.hxx>
-#include <basegfx/range/b2drange.hxx>
 #include <tools/color.hxx>
 
 namespace drawinglayer
diff --git a/include/drawinglayer/primitive2d/PolyPolygonColorPrimitive2D.hxx b/include/drawinglayer/primitive2d/PolyPolygonColorPrimitive2D.hxx
index 8bb4000d12b8..04f096108ba1 100644
--- a/include/drawinglayer/primitive2d/PolyPolygonColorPrimitive2D.hxx
+++ b/include/drawinglayer/primitive2d/PolyPolygonColorPrimitive2D.hxx
@@ -21,7 +21,6 @@
 
 #include <drawinglayer/drawinglayerdllapi.h>
 #include <drawinglayer/primitive2d/baseprimitive2d.hxx>
-#include <drawinglayer/primitive2d/primitivetools2d.hxx>
 #include <basegfx/polygon/b2dpolypolygon.hxx>
 #include <basegfx/color/bcolor.hxx>
 
diff --git a/include/drawinglayer/primitive2d/PolyPolygonGradientPrimitive2D.hxx b/include/drawinglayer/primitive2d/PolyPolygonGradientPrimitive2D.hxx
index 3b20921b5ccb..8bd253c5e3dd 100644
--- a/include/drawinglayer/primitive2d/PolyPolygonGradientPrimitive2D.hxx
+++ b/include/drawinglayer/primitive2d/PolyPolygonGradientPrimitive2D.hxx
@@ -21,7 +21,6 @@
 
 #include <drawinglayer/drawinglayerdllapi.h>
 #include <drawinglayer/primitive2d/baseprimitive2d.hxx>
-#include <drawinglayer/primitive2d/primitivetools2d.hxx>
 #include <basegfx/polygon/b2dpolypolygon.hxx>
 #include <drawinglayer/attribute/fillgradientattribute.hxx>
 
diff --git a/include/drawinglayer/primitive2d/PolyPolygonGraphicPrimitive2D.hxx b/include/drawinglayer/primitive2d/PolyPolygonGraphicPrimitive2D.hxx
index 0b3910936dd5..ea49c2da78fe 100644
--- a/include/drawinglayer/primitive2d/PolyPolygonGraphicPrimitive2D.hxx
+++ b/include/drawinglayer/primitive2d/PolyPolygonGraphicPrimitive2D.hxx
@@ -21,7 +21,6 @@
 
 #include <drawinglayer/drawinglayerdllapi.h>
 #include <drawinglayer/primitive2d/baseprimitive2d.hxx>
-#include <drawinglayer/primitive2d/primitivetools2d.hxx>
 #include <basegfx/polygon/b2dpolypolygon.hxx>
 #include <drawinglayer/attribute/fillgraphicattribute.hxx>
 
diff --git a/include/drawinglayer/primitive2d/PolyPolygonHairlinePrimitive2D.hxx b/include/drawinglayer/primitive2d/PolyPolygonHairlinePrimitive2D.hxx
index 482345140306..11ef188daba9 100644
--- a/include/drawinglayer/primitive2d/PolyPolygonHairlinePrimitive2D.hxx
+++ b/include/drawinglayer/primitive2d/PolyPolygonHairlinePrimitive2D.hxx
@@ -22,13 +22,7 @@
 #include <drawinglayer/drawinglayerdllapi.h>
 
 #include <drawinglayer/primitive2d/baseprimitive2d.hxx>
-#include <drawinglayer/attribute/fillgraphicattribute.hxx>
 #include <basegfx/polygon/b2dpolypolygon.hxx>
-#include <drawinglayer/attribute/lineattribute.hxx>
-#include <drawinglayer/attribute/strokeattribute.hxx>
-#include <drawinglayer/attribute/fillgradientattribute.hxx>
-#include <drawinglayer/attribute/fillhatchattribute.hxx>
-#include <drawinglayer/primitive2d/primitivetools2d.hxx>
 #include <basegfx/color/bcolor.hxx>
 
 namespace drawinglayer::primitive2d
diff --git a/include/drawinglayer/primitive2d/PolyPolygonHatchPrimitive2D.hxx b/include/drawinglayer/primitive2d/PolyPolygonHatchPrimitive2D.hxx
index 4078c87858f3..10080446dccc 100644
--- a/include/drawinglayer/primitive2d/PolyPolygonHatchPrimitive2D.hxx
+++ b/include/drawinglayer/primitive2d/PolyPolygonHatchPrimitive2D.hxx
@@ -21,7 +21,6 @@
 
 #include <drawinglayer/drawinglayerdllapi.h>
 #include <drawinglayer/primitive2d/baseprimitive2d.hxx>
-#include <drawinglayer/primitive2d/primitivetools2d.hxx>
 #include <basegfx/polygon/b2dpolypolygon.hxx>
 #include <basegfx/color/bcolor.hxx>
 #include <drawinglayer/attribute/fillhatchattribute.hxx>
diff --git a/include/drawinglayer/primitive2d/PolyPolygonMarkerPrimitive2D.hxx b/include/drawinglayer/primitive2d/PolyPolygonMarkerPrimitive2D.hxx
index dabd673ab1fa..e3fb007833ea 100644
--- a/include/drawinglayer/primitive2d/PolyPolygonMarkerPrimitive2D.hxx
+++ b/include/drawinglayer/primitive2d/PolyPolygonMarkerPrimitive2D.hxx
@@ -22,13 +22,7 @@
 #include <drawinglayer/drawinglayerdllapi.h>
 
 #include <drawinglayer/primitive2d/baseprimitive2d.hxx>
-#include <drawinglayer/attribute/fillgraphicattribute.hxx>
 #include <basegfx/polygon/b2dpolypolygon.hxx>
-#include <drawinglayer/attribute/lineattribute.hxx>
-#include <drawinglayer/attribute/strokeattribute.hxx>
-#include <drawinglayer/attribute/fillgradientattribute.hxx>
-#include <drawinglayer/attribute/fillhatchattribute.hxx>
-#include <drawinglayer/primitive2d/primitivetools2d.hxx>
 #include <basegfx/color/bcolor.hxx>
 
 namespace drawinglayer::primitive2d
diff --git a/include/drawinglayer/primitive2d/PolyPolygonStrokePrimitive2D.hxx b/include/drawinglayer/primitive2d/PolyPolygonStrokePrimitive2D.hxx
index 8463c80783e1..13b7e3ecaf0b 100644
--- a/include/drawinglayer/primitive2d/PolyPolygonStrokePrimitive2D.hxx
+++ b/include/drawinglayer/primitive2d/PolyPolygonStrokePrimitive2D.hxx
@@ -22,14 +22,9 @@
 #include <drawinglayer/drawinglayerdllapi.h>
 
 #include <drawinglayer/primitive2d/baseprimitive2d.hxx>
-#include <drawinglayer/attribute/fillgraphicattribute.hxx>
 #include <basegfx/polygon/b2dpolypolygon.hxx>
 #include <drawinglayer/attribute/lineattribute.hxx>
 #include <drawinglayer/attribute/strokeattribute.hxx>
-#include <drawinglayer/attribute/fillgradientattribute.hxx>
-#include <drawinglayer/attribute/fillhatchattribute.hxx>
-#include <drawinglayer/primitive2d/primitivetools2d.hxx>
-#include <basegfx/color/bcolor.hxx>
 
 namespace drawinglayer::primitive2d
 {
diff --git a/include/drawinglayer/primitive2d/baseprimitive2d.hxx b/include/drawinglayer/primitive2d/baseprimitive2d.hxx
index 693dcc4b1e32..45d0e3519c40 100644
--- a/include/drawinglayer/primitive2d/baseprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/baseprimitive2d.hxx
@@ -22,7 +22,6 @@
 #include <drawinglayer/drawinglayerdllapi.h>
 
 #include <cppuhelper/compbase.hxx>
-#include <drawinglayer/primitive2d/CommonTypes.hxx>
 #include <drawinglayer/primitive2d/Primitive2DContainer.hxx>
 #include <com/sun/star/util/XAccounting.hpp>
 #include <cppuhelper/basemutex.hxx>
diff --git a/include/drawinglayer/primitive2d/epsprimitive2d.hxx b/include/drawinglayer/primitive2d/epsprimitive2d.hxx
index 8ec8682e59a4..5c71ee88ce28 100644
--- a/include/drawinglayer/primitive2d/epsprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/epsprimitive2d.hxx
@@ -19,8 +19,6 @@
 
 #pragma once
 
-#include <drawinglayer/drawinglayerdllapi.h>
-
 #include <drawinglayer/primitive2d/baseprimitive2d.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <vcl/gfxlink.hxx>
diff --git a/include/drawinglayer/primitive2d/fillhatchprimitive2d.hxx b/include/drawinglayer/primitive2d/fillhatchprimitive2d.hxx
index bab7e47b03e8..03bc12139fcb 100644
--- a/include/drawinglayer/primitive2d/fillhatchprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/fillhatchprimitive2d.hxx
@@ -19,8 +19,6 @@
 
 #pragma once
 
-#include <drawinglayer/drawinglayerdllapi.h>
-
 #include <drawinglayer/primitive2d/baseprimitive2d.hxx>
 #include <drawinglayer/primitive2d/primitivetools2d.hxx>
 #include <drawinglayer/attribute/fillhatchattribute.hxx>
diff --git a/include/drawinglayer/primitive2d/glowprimitive2d.hxx b/include/drawinglayer/primitive2d/glowprimitive2d.hxx
index 62a585276b85..b91d40a21419 100644
--- a/include/drawinglayer/primitive2d/glowprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/glowprimitive2d.hxx
@@ -22,8 +22,6 @@
 #include <drawinglayer/drawinglayerdllapi.h>
 
 #include <drawinglayer/primitive2d/groupprimitive2d.hxx>
-#include <basegfx/matrix/b2dhommatrix.hxx>
-#include <basegfx/color/bcolor.hxx>
 #include <tools/color.hxx>
 
 namespace drawinglayer::primitive2d
diff --git a/include/drawinglayer/primitive2d/pointarrayprimitive2d.hxx b/include/drawinglayer/primitive2d/pointarrayprimitive2d.hxx
index 613b8969828d..7e516555162a 100644
--- a/include/drawinglayer/primitive2d/pointarrayprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/pointarrayprimitive2d.hxx
@@ -19,8 +19,6 @@
 
 #pragma once
 
-#include <drawinglayer/drawinglayerdllapi.h>
-
 #include <drawinglayer/primitive2d/baseprimitive2d.hxx>
 #include <basegfx/color/bcolor.hxx>
 
diff --git a/include/drawinglayer/primitive2d/sdrdecompositiontools2d.hxx b/include/drawinglayer/primitive2d/sdrdecompositiontools2d.hxx
index adb6501ee01d..408abe952a7a 100644
--- a/include/drawinglayer/primitive2d/sdrdecompositiontools2d.hxx
+++ b/include/drawinglayer/primitive2d/sdrdecompositiontools2d.hxx
@@ -21,7 +21,8 @@
 
 #include <drawinglayer/drawinglayerdllapi.h>
 
-#include <drawinglayer/primitive2d/baseprimitive2d.hxx>
+#include <basegfx/range/b2drange.hxx>
+#include <drawinglayer/primitive2d/CommonTypes.hxx>
 
 
 // predefines
diff --git a/include/drawinglayer/primitive2d/shadowprimitive2d.hxx b/include/drawinglayer/primitive2d/shadowprimitive2d.hxx
index f384049862a9..37258d8f34ed 100644
--- a/include/drawinglayer/primitive2d/shadowprimitive2d.hxx
+++ b/include/drawinglayer/primitive2d/shadowprimitive2d.hxx
@@ -24,7 +24,6 @@
 #include <drawinglayer/primitive2d/groupprimitive2d.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/color/bcolor.hxx>
-#include <tools/color.hxx>
 
 
 namespace drawinglayer::primitive2d
diff --git a/include/drawinglayer/primitive2d/textbreakuphelper.hxx b/include/drawinglayer/primitive2d/textbreakuphelper.hxx
index 2f5d44befe95..de233da8ea07 100644
--- a/include/drawinglayer/primitive2d/textbreakuphelper.hxx
+++ b/include/drawinglayer/primitive2d/textbreakuphelper.hxx
@@ -20,7 +20,7 @@
 #pragma once
 
 #include <drawinglayer/drawinglayerdllapi.h>
-#include <drawinglayer/primitive2d/baseprimitive2d.hxx>
+#include <drawinglayer/primitive2d/Primitive2DContainer.hxx>
 #include <drawinglayer/primitive2d/textlayoutdevice.hxx>
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
 
diff --git a/include/editeng/charrotateitem.hxx b/include/editeng/charrotateitem.hxx
index 25af247428d3..0ce60bb1a05b 100644
--- a/include/editeng/charrotateitem.hxx
+++ b/include/editeng/charrotateitem.hxx
@@ -19,7 +19,6 @@
 #ifndef INCLUDED_EDITENG_CHARROTATEITEM_HXX
 #define INCLUDED_EDITENG_CHARROTATEITEM_HXX
 
-#include <config_options.h>
 #include <svl/intitem.hxx>
 #include <editeng/editengdllapi.h>
 
diff --git a/include/editeng/misspellrange.hxx b/include/editeng/misspellrange.hxx
index 5b8b4d03f742..611546c99c6d 100644
--- a/include/editeng/misspellrange.hxx
+++ b/include/editeng/misspellrange.hxx
@@ -10,7 +10,7 @@
 #ifndef INCLUDED_EDITENG_MISSPELLRANGE_HXX
 #define INCLUDED_EDITENG_MISSPELLRANGE_HXX
 
-#include <editeng/editengdllapi.h>
+#include <sal/types.h>
 
 #include <vector>
 
diff --git a/include/editeng/section.hxx b/include/editeng/section.hxx
index 819c210f18d4..19a506a12d0f 100644
--- a/include/editeng/section.hxx
+++ b/include/editeng/section.hxx
@@ -10,7 +10,7 @@
 #ifndef INCLUDED_EDITENG_SECTION_HXX
 #define INCLUDED_EDITENG_SECTION_HXX
 
-#include <editeng/editengdllapi.h>
+#include <sal/types.h>
 
 #include <vector>
 
diff --git a/include/formula/formula.hxx b/include/formula/formula.hxx
index dd4586c29ab1..aed0e1b0d714 100644
--- a/include/formula/formula.hxx
+++ b/include/formula/formula.hxx
@@ -30,7 +30,6 @@
 #include <sal/types.h>
 #include <sfx2/basedlgs.hxx>
 #include <tools/gen.hxx>
-#include <tools/link.hxx>
 
 class NotifyEvent;
 class SfxBindings;
diff --git a/include/framework/addonsoptions.hxx b/include/framework/addonsoptions.hxx
index d8b87563e27d..3c00e5a9fb6f 100644
--- a/include/framework/addonsoptions.hxx
+++ b/include/framework/addonsoptions.hxx
@@ -21,7 +21,7 @@
 
 #include <config_options.h>
 #include <sal/types.h>
-#include <vcl/image.hxx>
+#include <vcl/bitmapex.hxx>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/uno/Sequence.h>
 #include <framework/fwkdllapi.h>
diff --git a/include/oox/core/fasttokenhandler.hxx b/include/oox/core/fasttokenhandler.hxx
index a89186c5218c..9180d7df976c 100644
--- a/include/oox/core/fasttokenhandler.hxx
+++ b/include/oox/core/fasttokenhandler.hxx
@@ -23,7 +23,6 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
-#include <com/sun/star/xml/sax/XFastTokenHandler.hpp>
 #include <cppuhelper/implbase.hxx>
 #include <oox/dllapi.h>
 #include <rtl/ustring.hxx>
diff --git a/include/oox/crypto/DocumentDecryption.hxx b/include/oox/crypto/DocumentDecryption.hxx
index 2c058121c1b7..2db38b442386 100644
--- a/include/oox/crypto/DocumentDecryption.hxx
+++ b/include/oox/crypto/DocumentDecryption.hxx
@@ -11,10 +11,7 @@
 #ifndef INCLUDED_OOX_CRYPTO_DOCUMENTDECRYPTION_HXX
 #define INCLUDED_OOX_CRYPTO_DOCUMENTDECRYPTION_HXX
 
-#include <oox/dllapi.h>
-
-#include <memory>
-
+#include <com/sun/star/beans/NamedValue.hpp>
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <rtl/ustring.hxx>
diff --git a/include/oox/crypto/DocumentEncryption.hxx b/include/oox/crypto/DocumentEncryption.hxx
index 44bcedf4a22c..72173f188a07 100644
--- a/include/oox/crypto/DocumentEncryption.hxx
+++ b/include/oox/crypto/DocumentEncryption.hxx
@@ -11,11 +11,8 @@
 #ifndef INCLUDED_OOX_CRYPTO_DOCUMENTENCRYPTION_HXX
 #define INCLUDED_OOX_CRYPTO_DOCUMENTENCRYPTION_HXX
 
-#include <oox/dllapi.h>
-
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
-#include <rtl/ustring.hxx>
 
 namespace com::sun::star {
     namespace io { class XStream; }
diff --git a/include/oox/helper/helper.hxx b/include/oox/helper/helper.hxx
index 412b2d049c34..9d6befb90c54 100644
--- a/include/oox/helper/helper.hxx
+++ b/include/oox/helper/helper.hxx
@@ -28,7 +28,6 @@
 #include <o3tl/safeint.hxx>
 #include <osl/endian.h>
 #include <rtl/math.hxx>
-#include <rtl/textenc.h>
 #include <sal/macros.h>
 #include <sal/types.h>
 #include <tools/color.hxx>