tdf#42949 Fix IWYU warnings in jvmfwk/ & jvmaccess/

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

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

14 files changed, 8 insertions, 23 deletions

diff --git a/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx b/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
index 2a1a6b13baf2..f7c295ec1728 100644
--- a/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
+++ b/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
@@ -22,7 +22,6 @@
 #include <memory>
 
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 #include <iostream>
 #include <sal/main.h>
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/diagnostics.h b/jvmfwk/plugins/sunmajor/pluginlib/diagnostics.h
index 20e3f4bfea2e..599c40438535 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/diagnostics.h
+++ b/jvmfwk/plugins/sunmajor/pluginlib/diagnostics.h
@@ -22,7 +22,6 @@
 
 #include <sal/config.h>
 
-#include <rtl/ustring.hxx>
 #include <sal/log.hxx>
 
 #define JFW_ENSURE(c, m) SAL_WARN_IF(!(c), "jfw", m)
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx b/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx
index ce4bc77bc69c..199b3fcb67d0 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx
@@ -19,7 +19,6 @@
 
 
 #include <osl/file.hxx>
-#include <osl/thread.h>
 #include "gnujre.hxx"
 #include "util.hxx"
 
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/gnujre.hxx b/jvmfwk/plugins/sunmajor/pluginlib/gnujre.hxx
index c9835ce8a743..4826ea720d7f 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/gnujre.hxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/gnujre.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_JVMFWK_PLUGINS_SUNMAJOR_PLUGINLIB_GNUJRE_HXX
 
 #include <vendorbase.hxx>
-#include "vendorlist.hxx"
 
 namespace jfw_plugin
 {
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx b/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx
index 14faf56762d7..8a10d39a89e3 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx
@@ -18,7 +18,6 @@
  */
 
 
-#include <osl/thread.h>
 #include "otherjre.hxx"
 
 using namespace std;
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/otherjre.hxx b/jvmfwk/plugins/sunmajor/pluginlib/otherjre.hxx
index 986040962045..57b3a5e39639 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/otherjre.hxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/otherjre.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_JVMFWK_PLUGINS_SUNMAJOR_PLUGINLIB_OTHERJRE_HXX
 
 #include <vendorbase.hxx>
-#include "vendorlist.hxx"
 
 namespace jfw_plugin
 {
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
index 395ef332e0e8..5981e325f080 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
@@ -49,19 +49,19 @@
 #include <osl/file.hxx>
 #include <rtl/instance.hxx>
 #include <sal/log.hxx>
-#include <osl/getglobalmutex.hxx>
 #include <o3tl/char16_t2wchar_t.hxx>
 #include <setjmp.h>
 #include <signal.h>
-#include <stack>
 
 #include <jni.h>
 #include <rtl/byteseq.hxx>
 #include <fwkbase.hxx>
+#include <elements.hxx>
+#include <vendorbase.hxx>
 #include <vendorplugin.hxx>
+#include <jvmfwk/framework.hxx>
 #include "util.hxx"
 #include "sunversion.hxx"
-#include "vendorlist.hxx"
 #include "diagnostics.h"
 
 #ifdef MACOSX
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx
index 1e833a9faeef..89731ad15ddc 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx
@@ -18,7 +18,6 @@
  */
 
 
-#include <osl/thread.h>
 #include "sunjre.hxx"
 #include "sunversion.hxx"
 #include "diagnostics.h"
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjre.hxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjre.hxx
index a334fc8d3778..781e2dd782b4 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunjre.hxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjre.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_JVMFWK_PLUGINS_SUNMAJOR_PLUGINLIB_SUNJRE_HXX
 
 #include <vendorbase.hxx>
-#include "vendorlist.hxx"
 
 namespace jfw_plugin
 {
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx
index 9a5c7c28a25c..09c75f9a3064 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx
@@ -19,14 +19,9 @@
 
 
 #include "sunversion.hxx"
-#include <osl/diagnose.h>
 #include <osl/thread.h>
-#include <osl/process.h>
-#include <osl/security.hxx>
 #include <rtl/character.hxx>
 #include <string.h>
-#include "diagnostics.h"
-using namespace osl;
 
 namespace jfw_plugin  { //stoc_javadetect
 
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
index a21aa4ff933f..5824448b51d7 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
@@ -17,18 +17,16 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <config_features.h>
 #include <config_folders.h>
 
 #include "util.hxx"
 
 #include <osl/process.h>
-#include <osl/security.hxx>
 #include <osl/file.hxx>
 #include <osl/module.hxx>
 #include <osl/diagnose.h>
 #include <osl/getglobalmutex.hxx>
-#include <rtl/byteseq.hxx>
+#include <rtl/bootstrap.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <rtl/instance.hxx>
 #include <sal/log.hxx>
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util.hxx b/jvmfwk/plugins/sunmajor/pluginlib/util.hxx
index 56e487b45b76..7f10e2748f7a 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/util.hxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/util.hxx
@@ -20,14 +20,14 @@
 #define INCLUDED_JVMFWK_PLUGINS_SUNMAJOR_PLUGINLIB_UTIL_HXX
 
 #include <rtl/ustring.hxx>
-#include <rtl/bootstrap.hxx>
 #include <vector>
 #include <vendorbase.hxx>
 
+namespace rtl { class Bootstrap; }
+
 namespace jfw_plugin
 {
 
-class VendorBase;
 std::vector<OUString> getVectorFromCharArray(char const * const * ar, int size);
 
 /*   The function uses the relative paths, such as "bin/java.exe" and the provided
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx b/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx
index 254f17e16de9..efd6b92d550f 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx
@@ -22,7 +22,6 @@
 
 #include <vendorbase.hxx>
 #include "util.hxx"
-#include "sunjre.hxx"
 
 using namespace std;
 using namespace osl;
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.hxx b/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.hxx
index a0e682a9e09b..e10958d24cb7 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.hxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.hxx
@@ -20,7 +20,8 @@
 #define INCLUDED_JVMFWK_PLUGINS_SUNMAJOR_PLUGINLIB_VENDORLIST_HXX
 
 #include <rtl/ref.hxx>
-#include <vendorbase.hxx>
+
+namespace jfw_plugin { class VendorBase; }
 
 namespace jfw_plugin
 {