5 files changed, 12 insertions, 11 deletions
diff --git a/jvmfwk/inc/elements.hxx b/jvmfwk/inc/elements.hxx
index 88a785a381fb..2bdaf4a7033a 100644
--- a/jvmfwk/inc/elements.hxx
+++ b/jvmfwk/inc/elements.hxx
@@ -23,13 +23,14 @@
 
 #include <memory>
 #include <vector>
-#include <jvmfwk/framework.hxx>
 #include "fwkutil.hxx"
 #include <rtl/ustring.hxx>
 #include <rtl/byteseq.hxx>
 #include <libxml/parser.h>
 #include <boost/optional.hpp>
 
+struct JavaInfo;
+
 #define NS_JAVA_FRAMEWORK "http://openoffice.org/2004/java/framework/1.0"
 #define NS_SCHEMA_INSTANCE "http://www.w3.org/2001/XMLSchema-instance"
 
diff --git a/jvmfwk/inc/fwkbase.hxx b/jvmfwk/inc/fwkbase.hxx
index 8d9ae93a995e..790b9a40d8f7 100644
--- a/jvmfwk/inc/fwkbase.hxx
+++ b/jvmfwk/inc/fwkbase.hxx
@@ -24,12 +24,13 @@
 #include <boost/optional.hpp>
 
 #include <rtl/ustring.hxx>
-#include "elements.hxx"
 #include "libxmlutil.hxx"
 
 namespace jfw
 {
 
+struct VersionInfo;
+
 class VendorSettings
 {
     OUString m_xmlDocVendorSettingsFileUrl;
diff --git a/jvmfwk/inc/fwkutil.hxx b/jvmfwk/inc/fwkutil.hxx
index 890ccb15bbcc..f2f6fcbdfb30 100644
--- a/jvmfwk/inc/fwkutil.hxx
+++ b/jvmfwk/inc/fwkutil.hxx
@@ -19,17 +19,16 @@
 #ifndef INCLUDED_JVMFWK_SOURCE_FWKUTIL_HXX
 #define INCLUDED_JVMFWK_SOURCE_FWKUTIL_HXX
 
-#include <config_features.h>
 #include <config_folders.h>
 
 #include <sal/config.h>
 #include <sal/log.hxx>
-#include <osl/mutex.hxx>
 #include <rtl/bootstrap.hxx>
 #include <rtl/instance.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <rtl/byteseq.hxx>
-#include <osl/thread.hxx>
+
+namespace osl { class Mutex; }
 
 namespace jfw
 {
diff --git a/jvmfwk/inc/vendorbase.hxx b/jvmfwk/inc/vendorbase.hxx
index 02684a62b675..c510a0cb866e 100644
--- a/jvmfwk/inc/vendorbase.hxx
+++ b/jvmfwk/inc/vendorbase.hxx
@@ -20,8 +20,6 @@
 #ifndef INCLUDED_JVMFWK_PLUGINS_SUNMAJOR_PLUGINLIB_VENDORBASE_HXX
 #define INCLUDED_JVMFWK_PLUGINS_SUNMAJOR_PLUGINLIB_VENDORBASE_HXX
 
-#include <config_java.h>
-
 #include <rtl/ustring.hxx>
 #include <rtl/ref.hxx>
 #include <osl/endian.h>
diff --git a/jvmfwk/inc/vendorplugin.hxx b/jvmfwk/inc/vendorplugin.hxx
index 0aa6d84276e3..4c24903baa19 100644
--- a/jvmfwk/inc/vendorplugin.hxx
+++ b/jvmfwk/inc/vendorplugin.hxx
@@ -21,14 +21,16 @@
 #ifndef INCLUDED_JVMFWK_INC_VENDORPLUGIN_HXX
 #define INCLUDED_JVMFWK_INC_VENDORPLUGIN_HXX
 
-#include <jvmfwk/framework.hxx>
-#include <rtl/ref.hxx>
-#include <rtl/ustring.h>
+#include <rtl/ustring.hxx>
 #include <jni.h>
 
 #include <memory>
 #include <vector>
-#include "vendorbase.hxx"
+
+namespace jfw_plugin { class VendorBase; }
+namespace rtl { template <class reference_type> class Reference; }
+
+struct JavaInfo;
 
 namespace jfw { class VendorSettings; }