tdf#146619 Recheck include/c* with IWYU

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

36 files changed, 23 insertions, 20 deletions

diff --git a/accessibility/source/standard/vclxaccessiblecombobox.cxx b/accessibility/source/standard/vclxaccessiblecombobox.cxx
index e537f7199eaa..363c9b4c7514 100644
--- a/accessibility/source/standard/vclxaccessiblecombobox.cxx
+++ b/accessibility/source/standard/vclxaccessiblecombobox.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <standard/vclxaccessiblecombobox.hxx>
+#include <comphelper/sequence.hxx>
 #include <vcl/window.hxx>
 
 using namespace ::com::sun::star;
diff --git a/accessibility/source/standard/vclxaccessibledropdowncombobox.cxx b/accessibility/source/standard/vclxaccessibledropdowncombobox.cxx
index 97fcebb04a2b..b5de8062450e 100644
--- a/accessibility/source/standard/vclxaccessibledropdowncombobox.cxx
+++ b/accessibility/source/standard/vclxaccessibledropdowncombobox.cxx
@@ -19,6 +19,7 @@
 
 #include <standard/vclxaccessibledropdowncombobox.hxx>
 
+#include <comphelper/sequence.hxx>
 #include <toolkit/awt/vclxwindow.hxx>
 #include <vcl/vclevent.hxx>
 
diff --git a/accessibility/source/standard/vclxaccessibledropdownlistbox.cxx b/accessibility/source/standard/vclxaccessibledropdownlistbox.cxx
index 641c1bdc4b3f..f76b00a41231 100644
--- a/accessibility/source/standard/vclxaccessibledropdownlistbox.cxx
+++ b/accessibility/source/standard/vclxaccessibledropdownlistbox.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <standard/vclxaccessibledropdownlistbox.hxx>
+#include <comphelper/sequence.hxx>
 #include <toolkit/awt/vclxwindow.hxx>
 
 using namespace ::com::sun::star;
diff --git a/accessibility/source/standard/vclxaccessiblelist.cxx b/accessibility/source/standard/vclxaccessiblelist.cxx
index 62ac35a82aff..36573dcbb385 100644
--- a/accessibility/source/standard/vclxaccessiblelist.cxx
+++ b/accessibility/source/standard/vclxaccessiblelist.cxx
@@ -27,6 +27,7 @@
 #include <com/sun/star/accessibility/AccessibleRelationType.hpp>
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
+#include <comphelper/sequence.hxx>
 #include <comphelper/types.hxx>
 #include <o3tl/safeint.hxx>
 #include <vcl/svapp.hxx>
diff --git a/accessibility/source/standard/vclxaccessiblelistbox.cxx b/accessibility/source/standard/vclxaccessiblelistbox.cxx
index 4b5ed9377442..673000f22165 100644
--- a/accessibility/source/standard/vclxaccessiblelistbox.cxx
+++ b/accessibility/source/standard/vclxaccessiblelistbox.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <standard/vclxaccessiblelistbox.hxx>
+#include <comphelper/sequence.hxx>
 #include <toolkit/awt/vclxwindow.hxx>
 
 using namespace ::com::sun::star;
diff --git a/accessibility/source/standard/vclxaccessibleradiobutton.cxx b/accessibility/source/standard/vclxaccessibleradiobutton.cxx
index b6937b38c27e..0e66dde4c300 100644
--- a/accessibility/source/standard/vclxaccessibleradiobutton.cxx
+++ b/accessibility/source/standard/vclxaccessibleradiobutton.cxx
@@ -24,6 +24,7 @@
 #include <unotools/accessiblerelationsethelper.hxx>
 #include <comphelper/accessiblecontexthelper.hxx>
 #include <comphelper/accessiblekeybindinghelper.hxx>
+#include <comphelper/sequence.hxx>
 #include <com/sun/star/awt/KeyModifier.hpp>
 #include <com/sun/star/accessibility/AccessibleRelationType.hpp>
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
diff --git a/accessibility/source/standard/vclxaccessibletextfield.cxx b/accessibility/source/standard/vclxaccessibletextfield.cxx
index aaaa86593506..6b37f44be5f9 100644
--- a/accessibility/source/standard/vclxaccessibletextfield.cxx
+++ b/accessibility/source/standard/vclxaccessibletextfield.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <standard/vclxaccessibletextfield.hxx>
+#include <comphelper/sequence.hxx>
 #include <vcl/toolkit/lstbox.hxx>
 
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
diff --git a/comphelper/source/misc/compbase.cxx b/comphelper/source/misc/compbase.cxx
index f8a8897b7bb7..d88a534777f1 100644
--- a/comphelper/source/misc/compbase.cxx
+++ b/comphelper/source/misc/compbase.cxx
@@ -8,6 +8,7 @@
  */
 
 #include <comphelper/compbase.hxx>
+#include <cppuhelper/queryinterface.hxx>
 #include <sal/log.hxx>
 #include <osl/diagnose.h>
 
diff --git a/comphelper/source/misc/syntaxhighlight.cxx b/comphelper/source/misc/syntaxhighlight.cxx
index 3ce8086e64d5..89dcb73752e4 100644
--- a/comphelper/source/misc/syntaxhighlight.cxx
+++ b/comphelper/source/misc/syntaxhighlight.cxx
@@ -22,6 +22,7 @@
 #include <cassert>
 
 #include <rtl/character.hxx>
+#include <rtl/ustring.hxx>
 #include <unicode/uchar.h>
 #include <comphelper/syntaxhighlight.hxx>
 #include <o3tl/typed_flags_set.hxx>
diff --git a/cppcanvas/source/mtfrenderer/polypolyaction.cxx b/cppcanvas/source/mtfrenderer/polypolyaction.cxx
index 7f499be1ebe0..955727a31309 100644
--- a/cppcanvas/source/mtfrenderer/polypolyaction.cxx
+++ b/cppcanvas/source/mtfrenderer/polypolyaction.cxx
@@ -28,6 +28,7 @@
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <canvas/canvastools.hxx>
+#include <osl/diagnose.h>
 #include <sal/log.hxx>
 
 #include "cachedprimitivebase.hxx"
diff --git a/cppcanvas/source/tools/canvasgraphichelper.cxx b/cppcanvas/source/tools/canvasgraphichelper.cxx
index 2bb6d976b76e..491c743f5216 100644
--- a/cppcanvas/source/tools/canvasgraphichelper.cxx
+++ b/cppcanvas/source/tools/canvasgraphichelper.cxx
@@ -25,6 +25,7 @@
 #include <canvas/canvastools.hxx>
 #include <basegfx/utils/canvastools.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
+#include <osl/diagnose.h>
 #include <utility>
 
 
diff --git a/cppcanvas/source/wrapper/implcanvas.cxx b/cppcanvas/source/wrapper/implcanvas.cxx
index 8a412e805b87..81b5a3759fd6 100644
--- a/cppcanvas/source/wrapper/implcanvas.cxx
+++ b/cppcanvas/source/wrapper/implcanvas.cxx
@@ -21,6 +21,7 @@
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/polygon/b2dpolypolygon.hxx>
 #include <basegfx/utils/canvastools.hxx>
+#include <osl/diagnose.h>
 
 #include <com/sun/star/rendering/XCanvas.hpp>
 
diff --git a/cppcanvas/source/wrapper/implsprite.cxx b/cppcanvas/source/wrapper/implsprite.cxx
index 66434f941271..d0b2d617944e 100644
--- a/cppcanvas/source/wrapper/implsprite.cxx
+++ b/cppcanvas/source/wrapper/implsprite.cxx
@@ -21,6 +21,7 @@
 #include <basegfx/utils/canvastools.hxx>
 #include <basegfx/polygon/b2dpolypolygon.hxx>
 #include <canvas/canvastools.hxx>
+#include <osl/diagnose.h>
 #include <utility>
 
 #include "implsprite.hxx"
diff --git a/helpcompiler/source/BasCodeTagger.cxx b/helpcompiler/source/BasCodeTagger.cxx
index 415dec04c470..3511617f4dfb 100644
--- a/helpcompiler/source/BasCodeTagger.cxx
+++ b/helpcompiler/source/BasCodeTagger.cxx
@@ -8,6 +8,7 @@
  */
 
 #include <BasCodeTagger.hxx>
+#include <rtl/ustring.hxx>
 #include <iostream>
 
 LibXmlTreeWalker::LibXmlTreeWalker( xmlDocPtr doc )
diff --git a/include/comphelper/accessiblecomponenthelper.hxx b/include/comphelper/accessiblecomponenthelper.hxx
index 328d61316b15..5d10b2b17eb2 100644
--- a/include/comphelper/accessiblecomponenthelper.hxx
+++ b/include/comphelper/accessiblecomponenthelper.hxx
@@ -28,7 +28,6 @@
 #include <cppuhelper/basemutex.hxx>
 #include <cppuhelper/compbase.hxx>
 #include <cppuhelper/implbase.hxx>
-#include <comphelper/uno3.hxx>
 #include <comphelper/comphelperdllapi.h>
 
 
diff --git a/include/comphelper/accessibleselectionhelper.hxx b/include/comphelper/accessibleselectionhelper.hxx
index 033802e94673..f291707e1a91 100644
--- a/include/comphelper/accessibleselectionhelper.hxx
+++ b/include/comphelper/accessibleselectionhelper.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_COMPHELPER_ACCESSIBLESELECTIONHELPER_HXX
 
 #include <config_options.h>
-#include <comphelper/uno3.hxx>
 #include <comphelper/accessiblecomponenthelper.hxx>
 #include <cppuhelper/implbase.hxx>
 #include <com/sun/star/accessibility/XAccessibleSelection.hpp>
diff --git a/include/comphelper/asyncnotification.hxx b/include/comphelper/asyncnotification.hxx
index ea6b067ccd94..5c2416488957 100644
--- a/include/comphelper/asyncnotification.hxx
+++ b/include/comphelper/asyncnotification.hxx
@@ -28,7 +28,6 @@
 #include <salhelper/thread.hxx>
 #include <salhelper/simplereferenceobject.hxx>
 #include <memory>
-#include <utility>
 
 namespace comphelper
 {
diff --git a/include/comphelper/bytereader.hxx b/include/comphelper/bytereader.hxx
index 8ee308fb00fa..f683473bf3de 100644
--- a/include/comphelper/bytereader.hxx
+++ b/include/comphelper/bytereader.hxx
@@ -10,7 +10,6 @@
 
 #include <sal/types.h>
 #include <comphelper/comphelperdllapi.h>
-#include <com/sun/star/uno/Sequence.hxx>
 
 namespace comphelper
 {
diff --git a/include/comphelper/compbase.hxx b/include/comphelper/compbase.hxx
index 280d3d26b554..2d06a71047a6 100644
--- a/include/comphelper/compbase.hxx
+++ b/include/comphelper/compbase.hxx
@@ -15,7 +15,6 @@
 #include <comphelper/interfacecontainer4.hxx>
 #include <comphelper/unoimplbase.hxx>
 #include <cppuhelper/weak.hxx>
-#include <cppuhelper/queryinterface.hxx>
 #include <cppuhelper/implbase.hxx>
 #include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/lang/XTypeProvider.hpp>
diff --git a/include/comphelper/fileurl.hxx b/include/comphelper/fileurl.hxx
index 0da07cdeb495..e3a03f0d251b 100644
--- a/include/comphelper/fileurl.hxx
+++ b/include/comphelper/fileurl.hxx
@@ -23,7 +23,8 @@
 #include <sal/config.h>
 
 #include <comphelper/comphelperdllapi.h>
-#include <rtl/ustring.hxx>
+
+#include <string_view>
 
 namespace comphelper
 {
diff --git a/include/comphelper/propshlp.hxx b/include/comphelper/propshlp.hxx
index 9be8f7397687..e3a177783cca 100644
--- a/include/comphelper/propshlp.hxx
+++ b/include/comphelper/propshlp.hxx
@@ -21,7 +21,6 @@
 #include <comphelper/multiinterfacecontainer4.hxx>
 
 #include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/beans/XPropertySetOption.hpp>
 #include <com/sun/star/beans/XMultiPropertySet.hpp>
 #include <com/sun/star/beans/XFastPropertySet.hpp>
 
diff --git a/include/comphelper/seqstream.hxx b/include/comphelper/seqstream.hxx
index 1fd695bddf0d..8e2ae36d17c2 100644
--- a/include/comphelper/seqstream.hxx
+++ b/include/comphelper/seqstream.hxx
@@ -24,7 +24,6 @@
 #include <com/sun/star/io/XInputStream.hpp>
 #include <com/sun/star/io/XOutputStream.hpp>
 #include <com/sun/star/io/XSeekable.hpp>
-#include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <cppuhelper/implbase.hxx>
 #include <comphelper/comphelperdllapi.h>
 #include <comphelper/bytereader.hxx>
diff --git a/include/comphelper/sequence.hxx b/include/comphelper/sequence.hxx
index bc67559dfbee..30c7d00e4b42 100644
--- a/include/comphelper/sequence.hxx
+++ b/include/comphelper/sequence.hxx
@@ -23,7 +23,6 @@
 #include <com/sun/star/uno/Sequence.hxx>
 #include <osl/diagnose.h>
 
-#include <algorithm>
 #include <vector>
 
 namespace comphelper
diff --git a/include/comphelper/singletonref.hxx b/include/comphelper/singletonref.hxx
index 7e9e85522562..5a9da0903981 100644
--- a/include/comphelper/singletonref.hxx
+++ b/include/comphelper/singletonref.hxx
@@ -20,7 +20,6 @@
 
 #include <sal/config.h>
 #include <osl/diagnose.h>
-#include <cstddef>
 #include <mutex>
 
 namespace comphelper
diff --git a/include/comphelper/stl_types.hxx b/include/comphelper/stl_types.hxx
index a1df3cc363c5..b44bd6a06bcb 100644
--- a/include/comphelper/stl_types.hxx
+++ b/include/comphelper/stl_types.hxx
@@ -25,12 +25,9 @@
 #include <memory>
 #include <string_view>
 
-#include <rtl/ustring.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <o3tl/string_view.hxx>
 
-namespace com::sun::star::uno { template <typename > class Reference; }
-
 namespace comphelper
 {
 
diff --git a/include/comphelper/syntaxhighlight.hxx b/include/comphelper/syntaxhighlight.hxx
index c8bc100d362b..b6b01c4f36a8 100644
--- a/include/comphelper/syntaxhighlight.hxx
+++ b/include/comphelper/syntaxhighlight.hxx
@@ -19,10 +19,9 @@
 #ifndef INCLUDED_COMPHELPER_SYNTAXHIGHLIGHT_HXX
 #define INCLUDED_COMPHELPER_SYNTAXHIGHLIGHT_HXX
 
-#include <rtl/ustring.hxx>
-
 #include <comphelper/comphelperdllapi.h>
 
+#include <string_view>
 #include <vector>
 #include <memory>
 
diff --git a/include/comphelper/weakeventlistener.hxx b/include/comphelper/weakeventlistener.hxx
index c4b4e79704c4..dae191ed8598 100644
--- a/include/comphelper/weakeventlistener.hxx
+++ b/include/comphelper/weakeventlistener.hxx
@@ -22,7 +22,6 @@
 
 #include <config_options.h>
 #include <comphelper/compbase.hxx>
-#include <cppuhelper/basemutex.hxx>
 #include <cppuhelper/weakref.hxx>
 #include <comphelper/comphelperdllapi.h>
 #include <com/sun/star/lang/XEventListener.hpp>
diff --git a/include/connectivity/paramwrapper.hxx b/include/connectivity/paramwrapper.hxx
index 5ad0fa1c1972..4905e4fc2fe7 100644
--- a/include/connectivity/paramwrapper.hxx
+++ b/include/connectivity/paramwrapper.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_CONNECTIVITY_PARAMWRAPPER_HXX
 #define INCLUDED_CONNECTIVITY_PARAMWRAPPER_HXX
 
-#include <config_options.h>
 #include <connectivity/dbtoolsdllapi.hxx>
 #include <connectivity/FValue.hxx>
 
diff --git a/include/connectivity/sdbcx/VCollection.hxx b/include/connectivity/sdbcx/VCollection.hxx
index 997df0dd2242..dc1ceccb2ae2 100644
--- a/include/connectivity/sdbcx/VCollection.hxx
+++ b/include/connectivity/sdbcx/VCollection.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_CONNECTIVITY_SDBCX_VCOLLECTION_HXX
 #define INCLUDED_CONNECTIVITY_SDBCX_VCOLLECTION_HXX
 
-#include <config_options.h>
 #include <cppuhelper/implbase10.hxx>
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/container/XIndexAccess.hpp>
diff --git a/include/cui/cuicharmap.hxx b/include/cui/cuicharmap.hxx
index 8b85b1883ea5..b2d4ac23c425 100644
--- a/include/cui/cuicharmap.hxx
+++ b/include/cui/cuicharmap.hxx
@@ -31,9 +31,7 @@
 #include <cui/cuidllapi.h>
 #include <com/sun/star/frame/XFrame.hpp>
 
-#include <deque>
 #include <memory>
-#include <utility>
 
 using namespace ::com::sun::star;
 class SubsetMap;
diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index 9ba02be536dc..956e13436de6 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -45,6 +45,7 @@
 #include <svl/zformat.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <float.h>
+#include <cppuhelper/queryinterface.hxx>
 #include <comphelper/diagnose_ex.hxx>
 #include <tools/UnitConversion.hxx>
 
diff --git a/sc/source/ui/unoobj/dapiuno.cxx b/sc/source/ui/unoobj/dapiuno.cxx
index 4fed56dd2000..bc46bcf93786 100644
--- a/sc/source/ui/unoobj/dapiuno.cxx
+++ b/sc/source/ui/unoobj/dapiuno.cxx
@@ -64,6 +64,7 @@
 
 #include <comphelper/extract.hxx>
 #include <comphelper/propertysequence.hxx>
+#include <cppuhelper/queryinterface.hxx>
 #include <comphelper/sequence.hxx>
 #include <comphelper/servicehelper.hxx>
 #include <cppuhelper/exc_hlp.hxx>
diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index 9100b6668066..edd08b4c1151 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -76,6 +76,7 @@
 #include <comphelper/profilezone.hxx>
 #include <comphelper/servicehelper.hxx>
 #include <comphelper/string.hxx>
+#include <cppuhelper/queryinterface.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #if HAVE_FEATURE_OPENCL
 #include <opencl/platforminfo.hxx>
diff --git a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
index 61d4bd154ee3..1b0f87caa546 100644
--- a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
+++ b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx
@@ -24,6 +24,7 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
+#include <comphelper/sequence.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
diff --git a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
index 82f692bb272a..3ec3efb2be91 100644
--- a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
+++ b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx
@@ -31,6 +31,7 @@
 #include <com/sun/star/view/XSelectionSupplier.hpp>
 #include <cppuhelper/queryinterface.hxx>
 #include <comphelper/processfactory.hxx>
+#include <comphelper/sequence.hxx>
 #include <sal/log.hxx>
 #include <tools/debug.hxx>
 
diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx
index a9806505d8c8..b8e10ad4e048 100644
--- a/svx/source/dialog/charmap.cxx
+++ b/svx/source/dialog/charmap.cxx
@@ -44,6 +44,7 @@
 #include <com/sun/star/datatransfer/clipboard/SystemClipboard.hpp>
 #include <officecfg/Office/Common.hxx>
 #include <comphelper/processfactory.hxx>
+#include <comphelper/sequence.hxx>
 #include <unicode/uchar.h>
 #include <vcl/textview.hxx>
 #include <rtl/ustrbuf.hxx>