tdf#146619 Recheck include/d* with IWYU

Change-Id: Ib17953b49e5035255203e33778a262211d1491f7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156985
Tested-by: Jenkins
Reviewed-by: Gabor Kelemen <kelemeng@ubuntu.com>

14 files changed, 7 insertions, 18 deletions

diff --git a/docmodel/source/color/ComplexColorJSON.cxx b/docmodel/source/color/ComplexColorJSON.cxx
index 9be3ec0c0303..7c09a1e8221d 100644
--- a/docmodel/source/color/ComplexColorJSON.cxx
+++ b/docmodel/source/color/ComplexColorJSON.cxx
@@ -9,6 +9,7 @@
  */
 
 #include <docmodel/color/ComplexColorJSON.hxx>
+#include <boost/property_tree/json_parser.hpp>
 #include <sstream>
 #include <utility>
 #include <sal/log.hxx>
diff --git a/include/dbaccess/genericcontroller.hxx b/include/dbaccess/genericcontroller.hxx
index efe193b28e7d..0438c091a86d 100644
--- a/include/dbaccess/genericcontroller.hxx
+++ b/include/dbaccess/genericcontroller.hxx
@@ -58,7 +58,6 @@
 #include <dbaccess/controllerframe.hxx>
 #include <dbaccess/dbaccessdllapi.h>
 #include <dbaccess/IController.hxx>
-#include <osl/mutex.hxx>
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
 #include <tools/link.hxx>
diff --git a/include/docmodel/color/ComplexColor.hxx b/include/docmodel/color/ComplexColor.hxx
index 0fc99a12617b..b12db79411c5 100644
--- a/include/docmodel/color/ComplexColor.hxx
+++ b/include/docmodel/color/ComplexColor.hxx
@@ -16,6 +16,8 @@
 #include <docmodel/color/Transformation.hxx>
 #include <o3tl/hash_combine.hxx>
 
+#include <vector>
+
 namespace model
 {
 enum class ColorType
diff --git a/include/docmodel/color/ComplexColorJSON.hxx b/include/docmodel/color/ComplexColorJSON.hxx
index b4aa4bfb3354..0f95bb2288c3 100644
--- a/include/docmodel/color/ComplexColorJSON.hxx
+++ b/include/docmodel/color/ComplexColorJSON.hxx
@@ -12,7 +12,7 @@
 
 #include <docmodel/dllapi.h>
 #include <docmodel/color/ComplexColor.hxx>
-#include <boost/property_tree/json_parser.hpp>
+#include <boost/property_tree/ptree_fwd.hpp>
 
 namespace model::color
 {
diff --git a/include/docmodel/color/Transformation.hxx b/include/docmodel/color/Transformation.hxx
index 7a05d88aa9e9..fa98b013d035 100644
--- a/include/docmodel/color/Transformation.hxx
+++ b/include/docmodel/color/Transformation.hxx
@@ -11,7 +11,6 @@
 #pragma once
 
 #include <docmodel/dllapi.h>
-#include <vector>
 #include <o3tl/hash_combine.hxx>
 
 namespace model
diff --git a/include/docmodel/theme/FormatScheme.hxx b/include/docmodel/theme/FormatScheme.hxx
index d6812e749aba..eb1eea3fbdca 100644
--- a/include/docmodel/theme/FormatScheme.hxx
+++ b/include/docmodel/theme/FormatScheme.hxx
@@ -11,7 +11,6 @@
 #pragma once
 
 #include <docmodel/dllapi.h>
-#include <tools/color.hxx>
 #include <docmodel/color/ComplexColor.hxx>
 #include <com/sun/star/graphic/XGraphic.hpp>
 
diff --git a/include/docmodel/theme/Theme.hxx b/include/docmodel/theme/Theme.hxx
index c81d04ef5a5c..898cf3d787a7 100644
--- a/include/docmodel/theme/Theme.hxx
+++ b/include/docmodel/theme/Theme.hxx
@@ -15,7 +15,6 @@
 
 #include <rtl/ustring.hxx>
 #include <docmodel/theme/ThemeColorType.hxx>
-#include <docmodel/theme/Theme.hxx>
 #include <docmodel/theme/ColorSet.hxx>
 #include <docmodel/theme/FormatScheme.hxx>
 #include <tools/color.hxx>
diff --git a/include/docmodel/theme/ThemeColorType.hxx b/include/docmodel/theme/ThemeColorType.hxx
index 04e7f5068f1b..cab4174c6859 100644
--- a/include/docmodel/theme/ThemeColorType.hxx
+++ b/include/docmodel/theme/ThemeColorType.hxx
@@ -10,6 +10,8 @@
 
 #pragma once
 
+#include <sal/types.h>
+
 namespace model
 {
 /// Offsets into the color list of a theme.
diff --git a/include/docmodel/uno/UnoComplexColor.hxx b/include/docmodel/uno/UnoComplexColor.hxx
index 3783c0b2e95f..f80e75454c3f 100644
--- a/include/docmodel/uno/UnoComplexColor.hxx
+++ b/include/docmodel/uno/UnoComplexColor.hxx
@@ -10,14 +10,10 @@
 #pragma once
 
 #include <cppuhelper/implbase.hxx>
-#include <cppuhelper/supportsservice.hxx>
-#include <comphelper/servicehelper.hxx>
 
 #include <com/sun/star/util/Color.hpp>
 #include <com/sun/star/util/XComplexColor.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
 
-#include <utility>
 #include <docmodel/dllapi.h>
 #include <docmodel/color/ComplexColor.hxx>
 
diff --git a/include/docmodel/uno/UnoTheme.hxx b/include/docmodel/uno/UnoTheme.hxx
index 4ca033b8e9c4..2fde5096f3aa 100644
--- a/include/docmodel/uno/UnoTheme.hxx
+++ b/include/docmodel/uno/UnoTheme.hxx
@@ -10,14 +10,9 @@
 #pragma once
 
 #include <cppuhelper/implbase.hxx>
-#include <cppuhelper/supportsservice.hxx>
-#include <comphelper/servicehelper.hxx>
 
-#include <com/sun/star/util/Color.hpp>
 #include <com/sun/star/util/XTheme.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
 
-#include <utility>
 #include <docmodel/dllapi.h>
 
 namespace model
diff --git a/include/drawinglayer/attribute/fillgradientattribute.hxx b/include/drawinglayer/attribute/fillgradientattribute.hxx
index 124afddea18c..462d7fc8151e 100644
--- a/include/drawinglayer/attribute/fillgradientattribute.hxx
+++ b/include/drawinglayer/attribute/fillgradientattribute.hxx
@@ -22,7 +22,6 @@
 #include <drawinglayer/drawinglayerdllapi.h>
 #include <o3tl/cow_wrapper.hxx>
 #include <com/sun/star/awt/GradientStyle.hpp>
-#include <vector>
 
 namespace basegfx
 {
diff --git a/include/drawinglayer/primitive2d/Tools.hxx b/include/drawinglayer/primitive2d/Tools.hxx
index 3eaa322d9a4f..dd3e714a76c9 100644
--- a/include/drawinglayer/primitive2d/Tools.hxx
+++ b/include/drawinglayer/primitive2d/Tools.hxx
@@ -22,7 +22,6 @@
 #include <drawinglayer/drawinglayerdllapi.h>
 #include <drawinglayer/primitive2d/CommonTypes.hxx>
 #include <drawinglayer/geometry/viewinformation2d.hxx>
-#include <drawinglayer/primitive2d/baseprimitive2d.hxx>
 #include <basegfx/range/b2drange.hxx>
 
 namespace drawinglayer::primitive2d
diff --git a/include/drawinglayer/primitive2d/textbreakuphelper.hxx b/include/drawinglayer/primitive2d/textbreakuphelper.hxx
index d7dbeabb3cd0..8bee843e88e5 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/drawinglayer/primitive3d/baseprimitive3d.hxx b/include/drawinglayer/primitive3d/baseprimitive3d.hxx
index abcc6c5a4d4e..4a636835b51c 100644
--- a/include/drawinglayer/primitive3d/baseprimitive3d.hxx
+++ b/include/drawinglayer/primitive3d/baseprimitive3d.hxx
@@ -22,7 +22,6 @@
 #include <drawinglayer/drawinglayerdllapi.h>
 
 #include <comphelper/compbase.hxx>
-#include <cppuhelper/basemutex.hxx>
 #include <com/sun/star/graphic/XPrimitive3D.hpp>
 #include <basegfx/range/b3drange.hxx>
 #include <deque>