tdf#42949 Fix IWYU warnings in include/basic/*

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

Change-Id: I9dd7984affc4343f148c66077feaac19176adf51
Reviewed-on: https://gerrit.libreoffice.org/68769
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>

14 files changed, 44 insertions, 47 deletions

diff --git a/include/IwyuFilter_include.yaml b/include/IwyuFilter_include.yaml
index 6c92cdbc2c81..3f2140512c76 100644
--- a/include/IwyuFilter_include.yaml
+++ b/include/IwyuFilter_include.yaml
@@ -578,3 +578,9 @@ blacklist:
     include/cppcanvas/renderer.hxx:
     # Used in boost::optional type
     - basegfx/matrix/b2dhommatrix.hxx
+    include/basic/modsizeexceeded.hxx:
+    # base class has to be a complete type
+    - com/sun/star/task/XInteractionRequest.hpp
+    include/basic/sberrors.hxx:
+    # Needed for macro defines
+    - vcl/errcode.hxx
diff --git a/include/basic/basicmanagerrepository.hxx b/include/basic/basicmanagerrepository.hxx
index 4104a4e1e12b..e9e906685ed6 100644
--- a/include/basic/basicmanagerrepository.hxx
+++ b/include/basic/basicmanagerrepository.hxx
@@ -20,10 +20,11 @@
 #ifndef INCLUDED_BASIC_BASICMANAGERREPOSITORY_HXX
 #define INCLUDED_BASIC_BASICMANAGERREPOSITORY_HXX
 
-#include <com/sun/star/frame/XModel.hpp>
-#include <com/sun/star/embed/XStorage.hpp>
 #include <basic/basicdllapi.h>
 
+namespace com::sun::star::frame { class XModel; }
+namespace com::sun::star::uno { template <typename > class Reference; }
+
 class BasicManager;
 
 
diff --git a/include/basic/basmgr.hxx b/include/basic/basmgr.hxx
index 3229155c6ede..fd94a6aa477f 100644
--- a/include/basic/basmgr.hxx
+++ b/include/basic/basmgr.hxx
@@ -19,15 +19,19 @@
 #ifndef INCLUDED_BASIC_BASMGR_HXX
 #define INCLUDED_BASIC_BASMGR_HXX
 
-#include <vcl/errinf.hxx>
+#include <vcl/errcode.hxx>
 #include <svl/SfxBroadcaster.hxx>
 #include <basic/sbstar.hxx>
-#include <com/sun/star/script/XPersistentLibraryContainer.hpp>
-#include <com/sun/star/script/XStarBasicAccess.hpp>
 #include <basic/basicdllapi.h>
 #include <memory>
 #include <vector>
 
+namespace com::sun::star::script { class XLibraryContainer; }
+namespace com::sun::star::script { class XPersistentLibraryContainer; }
+namespace com::sun::star::script { class XStarBasicAccess; }
+
+class BasicManager;
+
 // Basic XML Import/Export
 BASIC_DLLPUBLIC css::uno::Reference< css::script::XStarBasicAccess >
     getStarBasicAccess( BasicManager* pMgr );
@@ -58,7 +62,6 @@ public:
     ErrCode const & GetErrorId() const                  { return nErrorId; }
 };
 
-class ErrorManager;
 class BasicLibInfo;
 
 namespace basic { class ImplRepository; }
diff --git a/include/basic/codecompletecache.hxx b/include/basic/codecompletecache.hxx
index c2b6502e1d55..d7ce0f69f0d4 100644
--- a/include/basic/codecompletecache.hxx
+++ b/include/basic/codecompletecache.hxx
@@ -20,13 +20,10 @@
 #ifndef INCLUDED_BASIC_CODECOMPLETECACHE_HXX
 #define INCLUDED_BASIC_CODECOMPLETECACHE_HXX
 
-#include <basic/sbdef.hxx>
-#include <basic/sbxobj.hxx>
-#include <basic/sbxdef.hxx>
+#include <basic/basicdllapi.h>
 #include <rtl/ustring.hxx>
 #include <svtools/miscopt.hxx>
 #include <unordered_map>
-#include <vector>
 
 typedef std::unordered_map< OUString, OUString > CodeCompleteVarTypes;
 /* variable name, type */
diff --git a/include/basic/modsizeexceeded.hxx b/include/basic/modsizeexceeded.hxx
index 0aee5d237c0f..3c1ffba97f3b 100644
--- a/include/basic/modsizeexceeded.hxx
+++ b/include/basic/modsizeexceeded.hxx
@@ -20,11 +20,13 @@
 #ifndef INCLUDED_BASIC_MODSIZEEXCEEDED_HXX
 #define INCLUDED_BASIC_MODSIZEEXCEEDED_HXX
 
-#include <com/sun/star/task/XInteractionHandler.hpp>
+#include <com/sun/star/task/XInteractionRequest.hpp>
 #include <cppuhelper/implbase.hxx>
 #include <basic/basicdllapi.h>
 #include <vector>
 
+namespace com::sun::star::task { class XInteractionContinuation; }
+
 class BASIC_DLLPUBLIC ModuleSizeExceeded : public cppu::WeakImplHelper< css::task::XInteractionRequest >
 {
 // C++ interface
diff --git a/include/basic/sbdef.hxx b/include/basic/sbdef.hxx
index 7d677f1c9be6..201a9de37b37 100644
--- a/include/basic/sbdef.hxx
+++ b/include/basic/sbdef.hxx
@@ -23,9 +23,10 @@
 #include <basic/sbxdef.hxx>
 #include <rtl/ustring.hxx>
 #include <basic/basicdllapi.h>
-#include <svtools/ehdl.hxx>
 #include <o3tl/typed_flags_set.hxx>
 
+class ErrCode;
+
 // Returns type name for Basic type, array flag is ignored
 // implementation: basic/source/runtime/methods.cxx
 BASIC_DLLPUBLIC OUString getBasicTypeName( SbxDataType eType );
diff --git a/include/basic/sbmod.hxx b/include/basic/sbmod.hxx
index c38c7435ccef..8b9b78e9a07f 100644
--- a/include/basic/sbmod.hxx
+++ b/include/basic/sbmod.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_BASIC_SBMOD_HXX
 #define INCLUDED_BASIC_SBMOD_HXX
 
-#include <com/sun/star/script/XInvocation.hpp>
 #include <basic/sbdef.hxx>
 #include <basic/sbxobj.hxx>
 #include <basic/sbxdef.hxx>
@@ -30,15 +29,16 @@
 #include <deque>
 #include <memory>
 #include <basic/basicdllapi.h>
-#include <basic/codecompletecache.hxx>
+#include <com/sun/star/uno/Reference.hxx>
+
+namespace com::sun::star::script { class XInvocation; }
 
 class SbMethod;
 class SbProperty;
-class SbiRuntime;
 typedef std::deque< sal_uInt16 > SbiBreakpoints;
 class SbiImage;
-class SbIfaceMapperMethod;
 class SbClassModuleObject;
+class CodeCompleteDataCache;
 
 
 class ModuleInitDependencyMap;
diff --git a/include/basic/sbstar.hxx b/include/basic/sbstar.hxx
index 884974597388..9275701137be 100644
--- a/include/basic/sbstar.hxx
+++ b/include/basic/sbstar.hxx
@@ -27,25 +27,19 @@
 #include <tools/link.hxx>
 
 #include <basic/sbdef.hxx>
-#include <basic/sberrors.hxx>
-#include <com/sun/star/script/ModuleInfo.hpp>
-#include <com/sun/star/frame/XModel.hpp>
 #include <basic/basicdllapi.h>
 
-class SbiInstance;                  // runtime instance
-class SbiRuntime;                   // currently running procedure
-class SbiImage;                     // compiled image
-class BasicLibInfo;                 // info block for basic manager
+namespace com::sun::star::frame { class XModel; }
+namespace com::sun::star::script { struct ModuleInfo; }
+
 class SbMethod;
-class BasicManager;
-class DocBasicItem;
 
 class BASIC_DLLPUBLIC StarBASIC : public SbxObject
 {
     friend class SbiScanner;
     friend class SbiExpression; // Access to RTL
-    friend class SbiInstance;
-    friend class SbiRuntime;
+    friend class SbiInstance;   // runtime instance
+    friend class SbiRuntime;    // currently running procedure
     friend class DocBasicItem;
 
     SbModules       pModules;               // List of all modules
diff --git a/include/basic/sbuno.hxx b/include/basic/sbuno.hxx
index d690a35ce01a..29a9e68c8d6e 100644
--- a/include/basic/sbuno.hxx
+++ b/include/basic/sbuno.hxx
@@ -20,13 +20,14 @@
 #ifndef INCLUDED_BASIC_SBUNO_HXX
 #define INCLUDED_BASIC_SBUNO_HXX
 
-#include <com/sun/star/beans/Property.hpp>
-#include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Type.hxx>
-#include <basic/sbxobj.hxx>
+#include <basic/sbxvar.hxx>
 #include <basic/basicdllapi.h>
 
-namespace com { namespace sun { namespace star { namespace uno { class Any; }}}}
+namespace com::sun::star::uno { class Any; }
+namespace com::sun::star::beans { struct Property; }
+
+class SbxObject;
 
 // Returns a SbxObject that wraps an Uno Interface
 // Implementation in basic/source/classes/sbunoobj.cxx
diff --git a/include/basic/sbx.hxx b/include/basic/sbx.hxx
index 97014fc6fdef..55b7fcaae8c3 100644
--- a/include/basic/sbx.hxx
+++ b/include/basic/sbx.hxx
@@ -22,27 +22,15 @@
 
 #include <tools/ref.hxx>
 #include <svl/hint.hxx>
-#include <svl/lstner.hxx>
 
 #include <basic/sbxdef.hxx>
-#include <basic/sbxform.hxx>
 #include <basic/sbxobj.hxx>
-#include <basic/sbxprop.hxx>
-#include <basic/sbxmeth.hxx>
 #include <basic/basicdllapi.h>
 
 #include <vector>
 #include <memory>
 
 class SvStream;
-class SbxBase;
-class SbxVariable;
-class SbxProperty;
-class SbxMethod;
-class SbxObject;
-class SbxArray;
-class SbxDimArray;
-class SbxFactory;
 
 class SfxBroadcaster;
 
diff --git a/include/basic/sbxcore.hxx b/include/basic/sbxcore.hxx
index 9d6b45652a16..aee3b428d29c 100644
--- a/include/basic/sbxcore.hxx
+++ b/include/basic/sbxcore.hxx
@@ -24,9 +24,9 @@
 #include <basic/sbxdef.hxx>
 #include <rtl/ustring.hxx>
 #include <tools/ref.hxx>
-#include <vcl/errcode.hxx>
 
 class SvStream;
+class ErrCode;
 
 // The following Macro defines four (five) necessary methods within a
 // SBX object. LoadPrivateData() and StorePrivateData() must be implemented.
diff --git a/include/basic/sbxfac.hxx b/include/basic/sbxfac.hxx
index 04358d899425..5192cc858fd8 100644
--- a/include/basic/sbxfac.hxx
+++ b/include/basic/sbxfac.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_BASIC_SBXFAC_HXX
 #define INCLUDED_BASIC_SBXFAC_HXX
 
-#include <basic/sbxdef.hxx>
 #include <rtl/ustring.hxx>
 #include <basic/basicdllapi.h>
 
diff --git a/include/basic/sbxvar.hxx b/include/basic/sbxvar.hxx
index ae41a2b069a1..b0add15b4f47 100644
--- a/include/basic/sbxvar.hxx
+++ b/include/basic/sbxvar.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_BASIC_SBXVAR_HXX
 
 #include <rtl/ustring.hxx>
-#include <com/sun/star/bridge/oleautomation/Decimal.hpp>
 #include <basic/sbxcore.hxx>
 #include <basic/basicdllapi.h>
 
@@ -30,6 +29,10 @@
 #include <memory>
 
 
+namespace com::sun::star::bridge::oleautomation { struct Decimal; }
+namespace com::sun::star::uno { class XInterface; }
+namespace com::sun::star::uno { template <typename > class Reference; }
+
 class SbxDecimal;
 enum class SfxHintId;
 
diff --git a/include/basic/vbahelper.hxx b/include/basic/vbahelper.hxx
index ce0d689e730e..10372abf392b 100644
--- a/include/basic/vbahelper.hxx
+++ b/include/basic/vbahelper.hxx
@@ -20,10 +20,12 @@
 #ifndef INCLUDED_BASIC_VBAHELPER_HXX
 #define INCLUDED_BASIC_VBAHELPER_HXX
 
-#include <com/sun/star/frame/XModel.hpp>
 #include <rtl/ustring.hxx>
 #include <basic/basicdllapi.h>
 
+namespace com::sun::star::frame { class XModel; }
+namespace com::sun::star::uno { template <typename > class Reference; }
+
 namespace basic {
 namespace vba {