From 0505a00a9ba827e39338b295ab6f73743d5c80b9 Mon Sep 17 00:00:00 2001
From: Gabor Kelemen <kelemen.gabor2@nisz.hu>
Date: Sat, 31 Oct 2020 14:28:47 +0100
Subject: [PATCH] tdf#42949 Fix new IWYU warnings in directories [ab]*

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

Change-Id: Ib0008b9bb095f27e5e436d6b507dc709ab7bf01a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105313
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
---
 accessibility/IwyuFilter_accessibility.yaml                 | 6 ++++++
 .../source/extended/AccessibleBrowseBoxTableCell.cxx        | 1 -
 accessibility/source/standard/vclxaccessiblebutton.cxx      | 2 +-
 accessibility/source/standard/vclxaccessibleradiobutton.cxx | 2 +-
 animations/source/animcore/animcore.cxx                     | 1 -
 avmedia/source/framework/MediaControlBase.cxx               | 2 --
 avmedia/source/framework/mediacontrol.cxx                   | 6 ------
 basctl/IwyuFilter_basctl.yaml                               | 3 +++
 basctl/source/basicide/ObjectCatalog.cxx                    | 1 -
 basctl/source/basicide/bastype2.cxx                         | 2 --
 basctl/source/basicide/bastype3.cxx                         | 1 -
 basctl/source/basicide/textwindowpeer.cxx                   | 1 -
 basctl/source/basicide/unomodel.hxx                         | 1 -
 basegfx/source/color/bcolormodifier.cxx                     | 1 -
 basegfx/source/numeric/ftools.cxx                           | 1 -
 basegfx/source/polygon/b2dpolygon.cxx                       | 1 -
 basegfx/source/polygon/b2dpolypolygon.cxx                   | 1 -
 basegfx/source/polygon/b3dpolygon.cxx                       | 2 +-
 basegfx/source/polygon/b3dpolygontools.cxx                  | 2 +-
 basegfx/source/polygon/b3dpolypolygontools.cxx              | 1 -
 basegfx/source/range/b2drangeclipper.cxx                    | 2 +-
 basic/IwyuFilter_basic.yaml                                 | 6 ++++++
 basic/inc/sbobjmod.hxx                                      | 1 -
 basic/inc/sbstdobj.hxx                                      | 1 -
 basic/inc/sbxfac.hxx                                        | 1 -
 basic/qa/cppunit/test_language_conditionals.cxx             | 1 -
 basic/source/classes/sb.cxx                                 | 1 +
 basic/source/classes/sbunoobj.cxx                           | 1 +
 basic/source/comp/exprnode.cxx                              | 3 +--
 basic/source/inc/runtime.hxx                                | 2 +-
 basic/source/inc/sbintern.hxx                               | 1 -
 basic/source/runtime/methods1.cxx                           | 1 +
 basic/source/runtime/stdobj1.cxx                            | 1 -
 basic/source/sbx/sbxdate.cxx                                | 1 +
 basic/source/sbx/sbxscan.cxx                                | 2 +-
 basic/source/sbx/sbxvar.cxx                                 | 1 +
 binaryurp/source/bridgefactory.cxx                          | 2 --
 37 files changed, 28 insertions(+), 38 deletions(-)

diff --git a/accessibility/IwyuFilter_accessibility.yaml b/accessibility/IwyuFilter_accessibility.yaml
index c679188d1dd7..543ac74d9236 100644
--- a/accessibility/IwyuFilter_accessibility.yaml
+++ b/accessibility/IwyuFilter_accessibility.yaml
@@ -4,3 +4,9 @@ excludelist:
     accessibility/source/standard/vclxaccessiblecombobox.cxx:
     # Needed for implicit dtor
     - vcl/window.hxx
+    accessibility/source/extended/accessibletabbar.cxx:
+    # Needed for implicit dtor
+    - com/sun/star/awt/XWindowPeer.hpp
+    accessibility/source/standard/accessiblemenucomponent.cxx:
+    # Needed for implicit dtor
+    - com/sun/star/awt/XWindowPeer.hpp
diff --git a/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx b/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx
index 9727e2f0131c..1ff6fae2abd7 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx
@@ -21,7 +21,6 @@
 #include <extended/AccessibleBrowseBoxTableCell.hxx>
 #include <toolkit/helper/convert.hxx>
 #include <vcl/accessibletableprovider.hxx>
-#include <com/sun/star/accessibility/AccessibleEventId.hpp>
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 
diff --git a/accessibility/source/standard/vclxaccessiblebutton.cxx b/accessibility/source/standard/vclxaccessiblebutton.cxx
index 4c912530f8bf..f0ade105ce27 100644
--- a/accessibility/source/standard/vclxaccessiblebutton.cxx
+++ b/accessibility/source/standard/vclxaccessiblebutton.cxx
@@ -29,7 +29,7 @@
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 #include <strings.hxx>
 
-#include <vcl/toolkit/button.hxx>
+#include <vcl/button.hxx>
 #include <vcl/event.hxx>
 #include <vcl/vclevent.hxx>
 
diff --git a/accessibility/source/standard/vclxaccessibleradiobutton.cxx b/accessibility/source/standard/vclxaccessibleradiobutton.cxx
index aae9c76731f7..4b408cb35b57 100644
--- a/accessibility/source/standard/vclxaccessibleradiobutton.cxx
+++ b/accessibility/source/standard/vclxaccessibleradiobutton.cxx
@@ -30,7 +30,7 @@
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 #include <vcl/window.hxx>
-#include <vcl/toolkit/button.hxx>
+#include <vcl/button.hxx>
 #include <vcl/event.hxx>
 #include <vcl/vclevent.hxx>
 #include <strings.hxx>
diff --git a/animations/source/animcore/animcore.cxx b/animations/source/animcore/animcore.cxx
index b87482a0c4cd..2347dc08a231 100644
--- a/animations/source/animcore/animcore.cxx
+++ b/animations/source/animcore/animcore.cxx
@@ -59,7 +59,6 @@
 #include <array>
 #include <vector>
 #include <algorithm>
-#include <string.h>
 
 namespace com::sun::star::uno { class XComponentContext; }
 namespace com::sun::star::beans { struct NamedValue; }
diff --git a/avmedia/source/framework/MediaControlBase.cxx b/avmedia/source/framework/MediaControlBase.cxx
index 1e0b44b757b1..7c3450d802e1 100644
--- a/avmedia/source/framework/MediaControlBase.cxx
+++ b/avmedia/source/framework/MediaControlBase.cxx
@@ -19,10 +19,8 @@
 #include <avmedia/MediaControlBase.hxx>
 #include <avmedia/mediaplayer.hxx>
 #include <avmedia/mediaitem.hxx>
-#include <svtools/miscopt.hxx>
 #include <tools/time.hxx>
 #include <unotools/localedatawrapper.hxx>
-#include <bitmaps.hlst>
 #include <strings.hrc>
 #include <helpids.h>
 #include <mediamisc.hxx>
diff --git a/avmedia/source/framework/mediacontrol.cxx b/avmedia/source/framework/mediacontrol.cxx
index a0ab139279f7..035430ab9089 100644
--- a/avmedia/source/framework/mediacontrol.cxx
+++ b/avmedia/source/framework/mediacontrol.cxx
@@ -22,13 +22,7 @@
 #include <mediamisc.hxx>
 #include <avmedia/mediawindow.hxx>
 #include <helpids.h>
-#include <vcl/svapp.hxx>
-#include <vcl/settings.hxx>
 #include <vcl/weld.hxx>
-#include <unotools/syslocale.hxx>
-#include <sfx2/viewfrm.hxx>
-#include <math.h>
-#include <algorithm>
 #include <avmedia/MediaControlBase.hxx>
 
 namespace avmedia
diff --git a/basctl/IwyuFilter_basctl.yaml b/basctl/IwyuFilter_basctl.yaml
index 1f0eb6a81094..a4275b943e48 100644
--- a/basctl/IwyuFilter_basctl.yaml
+++ b/basctl/IwyuFilter_basctl.yaml
@@ -5,3 +5,6 @@ excludelist:
     # Needed for TypedWhichId defines is basslots.hxx
     - sfx2/dinfdlg.hxx
     - sfx2/minfitem.hxx
+    basctl/source/basicide/baside2b.cxx:
+    # Needed for implicit dtor
+    - com/sun/star/container/XHierarchicalNameAccess.hpp
diff --git a/basctl/source/basicide/ObjectCatalog.cxx b/basctl/source/basicide/ObjectCatalog.cxx
index 5142a71e837c..5ad7913ae139 100644
--- a/basctl/source/basicide/ObjectCatalog.cxx
+++ b/basctl/source/basicide/ObjectCatalog.cxx
@@ -24,7 +24,6 @@
 #include <helpids.h>
 
 #include <vcl/taskpanelist.hxx>
-#include <vcl/svapp.hxx>
 
 namespace basctl
 {
diff --git a/basctl/source/basicide/bastype2.cxx b/basctl/source/basicide/bastype2.cxx
index 6fd2fb522fd4..904ff8307670 100644
--- a/basctl/source/basicide/bastype2.cxx
+++ b/basctl/source/basicide/bastype2.cxx
@@ -26,14 +26,12 @@
 #include <iderid.hxx>
 #include <tools/urlobj.hxx>
 #include <tools/diagnose_ex.h>
-#include <tools/debug.hxx>
 #include <svtools/imagemgr.hxx>
 #include <com/sun/star/script/XLibraryContainerPassword.hpp>
 #include <com/sun/star/frame/ModuleManager.hpp>
 #include <comphelper/processfactory.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/sfxsids.hrc>
-#include <vcl/event.hxx>
 
 #include <initializer_list>
 #include <memory>
diff --git a/basctl/source/basicide/bastype3.cxx b/basctl/source/basicide/bastype3.cxx
index da39ee5350a4..aedc8ee307f8 100644
--- a/basctl/source/basicide/bastype3.cxx
+++ b/basctl/source/basicide/bastype3.cxx
@@ -25,7 +25,6 @@
 #include <bastypes.hxx>
 #include <com/sun/star/script/XLibraryContainer.hpp>
 #include <com/sun/star/script/XLibraryContainerPassword.hpp>
-#include <deque>
 #include <string_view>
 #include <osl/diagnose.h>
 #include <tools/debug.hxx>
diff --git a/basctl/source/basicide/textwindowpeer.cxx b/basctl/source/basicide/textwindowpeer.cxx
index eb42c896a192..8375f353f8a3 100644
--- a/basctl/source/basicide/textwindowpeer.cxx
+++ b/basctl/source/basicide/textwindowpeer.cxx
@@ -23,7 +23,6 @@
 #include <vcl/accessiblefactory.hxx>
 
 #include <com/sun/star/accessibility/XAccessibleContext.hpp>
-#include <com/sun/star/awt/XWindowPeer.hpp>
 #include <com/sun/star/uno/Reference.hxx>
 #include <toolkit/awt/vclxwindow.hxx>
 #include <vcl/texteng.hxx>
diff --git a/basctl/source/basicide/unomodel.hxx b/basctl/source/basicide/unomodel.hxx
index 47094fa2a854..23b458fd8220 100644
--- a/basctl/source/basicide/unomodel.hxx
+++ b/basctl/source/basicide/unomodel.hxx
@@ -18,7 +18,6 @@
  */
 #pragma once
 
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <sfx2/sfxbasemodel.hxx>
 
diff --git a/basegfx/source/color/bcolormodifier.cxx b/basegfx/source/color/bcolormodifier.cxx
index 5cf2a5a86c80..1002e607f6d2 100644
--- a/basegfx/source/color/bcolormodifier.cxx
+++ b/basegfx/source/color/bcolormodifier.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <config_options.h>
 #include <sal/config.h>
 
 #include <algorithm>
diff --git a/basegfx/source/numeric/ftools.cxx b/basegfx/source/numeric/ftools.cxx
index d1eca66ca2fc..246d8d548aac 100644
--- a/basegfx/source/numeric/ftools.cxx
+++ b/basegfx/source/numeric/ftools.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <basegfx/numeric/ftools.hxx>
-#include <algorithm>
 
 namespace basegfx
 {
diff --git a/basegfx/source/polygon/b2dpolygon.cxx b/basegfx/source/polygon/b2dpolygon.cxx
index 18695ec2be19..9c8604e6ad32 100644
--- a/basegfx/source/polygon/b2dpolygon.cxx
+++ b/basegfx/source/polygon/b2dpolygon.cxx
@@ -25,7 +25,6 @@
 #include <basegfx/curve/b2dcubicbezier.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
 #include <basegfx/utils/systemdependentdata.hxx>
-#include <algorithm>
 #include <memory>
 #include <vector>
 
diff --git a/basegfx/source/polygon/b2dpolypolygon.cxx b/basegfx/source/polygon/b2dpolypolygon.cxx
index bbdc54a15481..dcd6133abc4a 100644
--- a/basegfx/source/polygon/b2dpolypolygon.cxx
+++ b/basegfx/source/polygon/b2dpolypolygon.cxx
@@ -22,7 +22,6 @@
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/utils/systemdependentdata.hxx>
-#include <algorithm>
 
 class ImplB2DPolyPolygon
 {
diff --git a/basegfx/source/polygon/b3dpolygon.cxx b/basegfx/source/polygon/b3dpolygon.cxx
index 9be2f882c526..aac10925c234 100644
--- a/basegfx/source/polygon/b3dpolygon.cxx
+++ b/basegfx/source/polygon/b3dpolygon.cxx
@@ -24,7 +24,7 @@
 #include <basegfx/point/b2dpoint.hxx>
 #include <basegfx/color/bcolor.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
-#include <rtl/math.hxx>
+#include <cassert>
 #include <vector>
 #include <algorithm>
 
diff --git a/basegfx/source/polygon/b3dpolygontools.cxx b/basegfx/source/polygon/b3dpolygontools.cxx
index ac1f3a5a8d7e..19f885b2e826 100644
--- a/basegfx/source/polygon/b3dpolygontools.cxx
+++ b/basegfx/source/polygon/b3dpolygontools.cxx
@@ -25,7 +25,7 @@
 #include <basegfx/range/b3drange.hxx>
 #include <basegfx/point/b2dpoint.hxx>
 #include <basegfx/tuple/b3ituple.hxx>
-#include <rtl/math.hxx>
+#include <cassert>
 #include <numeric>
 
 namespace basegfx::utils
diff --git a/basegfx/source/polygon/b3dpolypolygontools.cxx b/basegfx/source/polygon/b3dpolypolygontools.cxx
index 74b145957731..3badd683d248 100644
--- a/basegfx/source/polygon/b3dpolypolygontools.cxx
+++ b/basegfx/source/polygon/b3dpolypolygontools.cxx
@@ -26,7 +26,6 @@
 #include <basegfx/numeric/ftools.hxx>
 #include <com/sun/star/drawing/DoubleSequence.hpp>
 #include <com/sun/star/drawing/PolyPolygonShape3D.hpp>
-#include <sal/log.hxx>
 
 // predefines
 #define nMinSegments sal_uInt32(1)
diff --git a/basegfx/source/range/b2drangeclipper.cxx b/basegfx/source/range/b2drangeclipper.cxx
index 9cf24d53428c..5dc452728772 100644
--- a/basegfx/source/range/b2drangeclipper.cxx
+++ b/basegfx/source/range/b2drangeclipper.cxx
@@ -24,11 +24,11 @@
 #include <basegfx/range/b2drangeclipper.hxx>
 #include <basegfx/polygon/b2dpolypolygon.hxx>
 #include <basegfx/range/b2drectangle.hxx>
-#include <rtl/math.hxx>
 
 #include <o3tl/vector_pool.hxx>
 
 #include <algorithm>
+#include <cassert>
 #include <list>
 #include <iterator>
 
diff --git a/basic/IwyuFilter_basic.yaml b/basic/IwyuFilter_basic.yaml
index f422d724c9ca..b3a926c37315 100644
--- a/basic/IwyuFilter_basic.yaml
+++ b/basic/IwyuFilter_basic.yaml
@@ -1,6 +1,12 @@
 ---
 assumeFilename: basic/source/classes/global.cxx
 excludelist:
+    basic/source/runtime/dllmgr.hxx:
+    # Needed on WIN
+    - memory
+    basic/qa/cppunit/test_compiler_checks.cxx:
+    # Keep for system-cppunit; see also commit 456d61ec526e250fd1af894e109d5914ac9c9e6e
+    - unotest/bootstrapfixturebase.hxx
     basic/source/runtime/methods.cxx:
     # Needed on WIN
     - o3tl/char16_t2wchar_t.hxx
diff --git a/basic/inc/sbobjmod.hxx b/basic/inc/sbobjmod.hxx
index 788be5fe43dd..7cfa0cd81f9b 100644
--- a/basic/inc/sbobjmod.hxx
+++ b/basic/inc/sbobjmod.hxx
@@ -24,7 +24,6 @@
 #include <com/sun/star/script/ModuleInfo.hpp>
 #include <com/sun/star/awt/XDialog.hpp>
 #include <com/sun/star/frame/XModel.hpp>
-#include <basic/basicdllapi.h>
 
 // Basic-Module for excel object.
 
diff --git a/basic/inc/sbstdobj.hxx b/basic/inc/sbstdobj.hxx
index 93e9abf6887e..001e332ae245 100644
--- a/basic/inc/sbstdobj.hxx
+++ b/basic/inc/sbstdobj.hxx
@@ -22,7 +22,6 @@
 #include <basic/sbxobj.hxx>
 #include <vcl/graph.hxx>
 #include "sbxfac.hxx"
-#include <basic/basicdllapi.h>
 
 class SbStdFactory final : public SbxFactory
 {
diff --git a/basic/inc/sbxfac.hxx b/basic/inc/sbxfac.hxx
index e9b130eec192..7e92f895adaf 100644
--- a/basic/inc/sbxfac.hxx
+++ b/basic/inc/sbxfac.hxx
@@ -20,7 +20,6 @@
 #pragma once
 
 #include <rtl/ustring.hxx>
-#include <basic/basicdllapi.h>
 
 class SbxBase;
 class SbxObject;
diff --git a/basic/qa/cppunit/test_language_conditionals.cxx b/basic/qa/cppunit/test_language_conditionals.cxx
index 190a34ead874..c35d5571e9db 100644
--- a/basic/qa/cppunit/test_language_conditionals.cxx
+++ b/basic/qa/cppunit/test_language_conditionals.cxx
@@ -8,7 +8,6 @@
  */
 
 #include "basictest.hxx"
-#include <rtl/ustring.hxx>
 
 #include <cppunit/TestAssert.h>
 #include <cppunit/TestFixture.h>
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx
index a2c1e165c8db..6ae3692cc833 100644
--- a/basic/source/classes/sb.cxx
+++ b/basic/source/classes/sb.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <sb.hxx>
+#include <rtl/ustrbuf.hxx>
 #include <tools/stream.hxx>
 #include <tools/debug.hxx>
 #include <vcl/errinf.hxx>
diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx
index 018362e2d544..db7859bf181b 100644
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.cxx
@@ -33,6 +33,7 @@
 #include <cppuhelper/weakref.hxx>
 
 #include <rtl/instance.hxx>
+#include <rtl/math.hxx>
 #include <rtl/ustrbuf.hxx>
 
 #include <com/sun/star/script/ArrayWrapper.hpp>
diff --git a/basic/source/comp/exprnode.cxx b/basic/source/comp/exprnode.cxx
index 3b0bbc4ceaec..02f8801f1aea 100644
--- a/basic/source/comp/exprnode.cxx
+++ b/basic/source/comp/exprnode.cxx
@@ -18,10 +18,9 @@
  */
 
 
-#include <math.h>
+#include <cmath>
 
 #include <o3tl/temporary.hxx>
-#include <rtl/math.hxx>
 #include <parser.hxx>
 #include <expr.hxx>
 #include <tools/long.hxx>
diff --git a/basic/source/inc/runtime.hxx b/basic/source/inc/runtime.hxx
index 030b9c2041db..b98d986debce 100644
--- a/basic/source/inc/runtime.hxx
+++ b/basic/source/inc/runtime.hxx
@@ -27,9 +27,9 @@
 #include <rtl/ustring.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <osl/file.hxx>
-#include <rtl/math.hxx>
 #include <i18nlangtag/lang.h>
 
+#include <cmath>
 #include <vector>
 #include <memory>
 #include <com/sun/star/lang/XComponent.hpp>
diff --git a/basic/source/inc/sbintern.hxx b/basic/source/inc/sbintern.hxx
index a79cbb59dd1e..ea119593340e 100644
--- a/basic/source/inc/sbintern.hxx
+++ b/basic/source/inc/sbintern.hxx
@@ -19,7 +19,6 @@
 
 #pragma once
 
-#include <basic/basicdllapi.h>
 #include <basic/sbstar.hxx>
 #include <sbxfac.hxx>
 #include <unotools/transliterationwrapper.hxx>
diff --git a/basic/source/runtime/methods1.cxx b/basic/source/runtime/methods1.cxx
index 44f080544408..c847df8d26e6 100644
--- a/basic/source/runtime/methods1.cxx
+++ b/basic/source/runtime/methods1.cxx
@@ -25,6 +25,7 @@
 #include <cstddef>
 
 #include <stdlib.h>
+#include <rtl/math.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/mapmod.hxx>
 #include <vcl/outdev.hxx>
diff --git a/basic/source/runtime/stdobj1.cxx b/basic/source/runtime/stdobj1.cxx
index 20268bfbf44b..a5ace17b4941 100644
--- a/basic/source/runtime/stdobj1.cxx
+++ b/basic/source/runtime/stdobj1.cxx
@@ -20,7 +20,6 @@
 #include <basic/sberrors.hxx>
 #include <basic/sbstar.hxx>
 #include <vcl/outdev.hxx>
-#include <vcl/svapp.hxx>
 #include <sbstdobj.hxx>
 
 #define ATTR_IMP_TYPE           1
diff --git a/basic/source/sbx/sbxdate.cxx b/basic/source/sbx/sbxdate.cxx
index ebfbda55aa02..07947bffe313 100644
--- a/basic/source/sbx/sbxdate.cxx
+++ b/basic/source/sbx/sbxdate.cxx
@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <rtl/math.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 #include <svl/zforlist.hxx>
diff --git a/basic/source/sbx/sbxscan.cxx b/basic/source/sbx/sbxscan.cxx
index 922d892df367..d2f5c91e3483 100644
--- a/basic/source/sbx/sbxscan.cxx
+++ b/basic/source/sbx/sbxscan.cxx
@@ -44,7 +44,7 @@
 #include <strings.hrc>
 
 #include <rtl/character.hxx>
-#include <sal/log.hxx>
+#include <rtl/math.hxx>
 #include <svl/zforlist.hxx>
 
 
diff --git a/basic/source/sbx/sbxvar.cxx b/basic/source/sbx/sbxvar.cxx
index 5134ff751aaa..8e5b80ef1e08 100644
--- a/basic/source/sbx/sbxvar.cxx
+++ b/basic/source/sbx/sbxvar.cxx
@@ -28,6 +28,7 @@
 #include "sbxconv.hxx"
 #include <sbunoobj.hxx>
 #include <rtl/character.hxx>
+#include <rtl/ustrbuf.hxx>
 #include <sal/log.hxx>
 
 #include <com/sun/star/uno/XInterface.hpp>
diff --git a/binaryurp/source/bridgefactory.cxx b/binaryurp/source/bridgefactory.cxx
index fc1f8b071362..2178351015c0 100644
--- a/binaryurp/source/bridgefactory.cxx
+++ b/binaryurp/source/bridgefactory.cxx
@@ -30,8 +30,6 @@
 #include <com/sun/star/uno/RuntimeException.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/uno/XInterface.hpp>
-#include <cppuhelper/factory.hxx>
-#include <cppuhelper/implementationentry.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <o3tl/safeint.hxx>
 #include <rtl/ref.hxx>