5 files changed, 11 insertions, 20 deletions
diff --git a/jvmfwk/Library_jvmfwk.mk b/jvmfwk/Library_jvmfwk.mk
index 5b99f5869acc..15f1a26fcb3a 100644
--- a/jvmfwk/Library_jvmfwk.mk
+++ b/jvmfwk/Library_jvmfwk.mk
@@ -19,6 +19,11 @@ $(eval $(call gb_Library_add_defs,jvmfwk,\
 ))
 endif
 
+$(eval $(call gb_Library_set_include,jvmfwk,\
+    -I$(SRCDIR)/jvmfwk/inc \
+    $$(INCLUDE) \
+))
+
 $(eval $(call gb_Library_use_api,jvmfwk,\
     udkapi \
 ))
diff --git a/include/jvmfwk/vendorplugin.h b/jvmfwk/inc/vendorplugin.hxx
index d51943ea400a..02ea040d2b91 100644
--- a/include/jvmfwk/vendorplugin.h
+++ b/jvmfwk/inc/vendorplugin.hxx
@@ -18,18 +18,13 @@
  */
 
 /** @HTML */
-#ifndef INCLUDED_JVMFWK_VENDORPLUGIN_H
-#define INCLUDED_JVMFWK_VENDORPLUGIN_H
+#ifndef INCLUDED_JVMFWK_INC_VENDORPLUGIN_HXX
+#define INCLUDED_JVMFWK_INC_VENDORPLUGIN_HXX
 
 #include <jvmfwk/framework.h>
 #include <rtl/ustring.h>
 #include "jni.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
 /**
    @file
    <p>
@@ -247,11 +242,6 @@ javaPluginError jfw_plugin_startJavaVirtualMachine(
  */
 javaPluginError jfw_plugin_existJRE(const JavaInfo *pInfo, sal_Bool *exist);
 
-#ifdef __cplusplus
-}
-#endif
-
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
index ab5153dd033f..d1e02ce35b3d 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
@@ -51,7 +51,7 @@
 
 #include "jni.h"
 #include "rtl/byteseq.hxx"
-#include "jvmfwk/vendorplugin.h"
+#include "vendorplugin.hxx"
 #include "util.hxx"
 #include "sunversion.hxx"
 #include "vendorlist.hxx"
@@ -200,7 +200,6 @@ extern "C" void JNICALL abort_handler()
 
 }
 
-extern "C"
 javaPluginError jfw_plugin_getAllJavaInfos(
     rtl_uString *sVendor,
     rtl_uString *sMinVersion,
@@ -330,7 +329,6 @@ javaPluginError jfw_plugin_getAllJavaInfos(
     return JFW_PLUGIN_E_NONE;
 }
 
-extern "C"
 javaPluginError jfw_plugin_getJavaInfoByPath(
     rtl_uString *path,
     rtl_uString *sVendor,
@@ -585,7 +583,6 @@ static void do_msvcr_magic(rtl_uString *jvm_dll)
     during instantiation.
     </p>
  */
-extern "C"
 javaPluginError jfw_plugin_startJavaVirtualMachine(
     const JavaInfo *pInfo,
     const JavaVMOption* arOptions,
@@ -782,7 +779,6 @@ javaPluginError jfw_plugin_startJavaVirtualMachine(
    return errorcode;
 }
 
-extern "C"
 javaPluginError jfw_plugin_existJRE(const JavaInfo *pInfo, sal_Bool *exist)
 {
     javaPluginError ret = JFW_PLUGIN_E_NONE;
diff --git a/jvmfwk/source/framework.cxx b/jvmfwk/source/framework.cxx
index cd7d55194d92..bdb75f7185fc 100644
--- a/jvmfwk/source/framework.cxx
+++ b/jvmfwk/source/framework.cxx
@@ -23,7 +23,7 @@
 #include "osl/thread.hxx"
 #include "osl/file.hxx"
 #include "jvmfwk/framework.h"
-#include "jvmfwk/vendorplugin.h"
+#include "vendorplugin.hxx"
 #include <cassert>
 #include <vector>
 #include <functional>
diff --git a/jvmfwk/source/framework.hxx b/jvmfwk/source/framework.hxx
index 808bff5d8dd8..0d0ba187936a 100644
--- a/jvmfwk/source/framework.hxx
+++ b/jvmfwk/source/framework.hxx
@@ -22,9 +22,9 @@
 #include "rtl/ustring.hxx"
 #include "rtl/byteseq.hxx"
 #include "jvmfwk/framework.h"
-#include "jvmfwk/vendorplugin.h"
+#include "vendorplugin.hxx"
 
-/** typedefs for functions from vendorplugin.h
+/** typedefs for functions from vendorplugin.hxx
  */
 typedef javaPluginError (*jfw_plugin_getAllJavaInfos_ptr)(
     rtl_uString * sVendor,