loplugin:includeform: jvmfwk

Change-Id: I7292ced23647692fdc85a3c234fb1469a91ad0ea

28 files changed, 120 insertions, 120 deletions

diff --git a/include/jvmfwk/framework.hxx b/include/jvmfwk/framework.hxx
index ac7087b320d2..63062849fb0c 100644
--- a/include/jvmfwk/framework.hxx
+++ b/include/jvmfwk/framework.hxx
@@ -30,7 +30,7 @@
 #include <jvmfwk/jvmfwkdllapi.hxx>
 #include <rtl/byteseq.hxx>
 #include <rtl/ustring.hxx>
-#include "jni.h"
+#include <jni.h>
 
 /** @file
     <p>This library can operate in two modes, application mode and direct mode.</p>
diff --git a/jvmfwk/inc/elements.hxx b/jvmfwk/inc/elements.hxx
index 047c5aab85bc..eb174a4be3e9 100644
--- a/jvmfwk/inc/elements.hxx
+++ b/jvmfwk/inc/elements.hxx
@@ -23,12 +23,12 @@
 
 #include <memory>
 #include <vector>
-#include "jvmfwk/framework.hxx"
+#include <jvmfwk/framework.hxx>
 #include "fwkutil.hxx"
-#include "rtl/ustring.hxx"
-#include "rtl/byteseq.hxx"
-#include "libxml/parser.h"
-#include "boost/optional.hpp"
+#include <rtl/ustring.hxx>
+#include <rtl/byteseq.hxx>
+#include <libxml/parser.h>
+#include <boost/optional.hpp>
 
 #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/fwkutil.hxx b/jvmfwk/inc/fwkutil.hxx
index cf676ce74637..8ee28601a110 100644
--- a/jvmfwk/inc/fwkutil.hxx
+++ b/jvmfwk/inc/fwkutil.hxx
@@ -22,13 +22,13 @@
 #include <config_features.h>
 #include <config_folders.h>
 
-#include "sal/config.h"
-#include "osl/mutex.hxx"
-#include "rtl/bootstrap.hxx"
-#include "rtl/instance.hxx"
-#include "rtl/ustrbuf.hxx"
-#include "rtl/byteseq.hxx"
-#include "osl/thread.hxx"
+#include <sal/config.h>
+#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 jfw
 {
diff --git a/jvmfwk/inc/vendorbase.hxx b/jvmfwk/inc/vendorbase.hxx
index c9ebcb256913..b2ae34915459 100644
--- a/jvmfwk/inc/vendorbase.hxx
+++ b/jvmfwk/inc/vendorbase.hxx
@@ -20,12 +20,12 @@
 #ifndef INCLUDED_JVMFWK_PLUGINS_SUNMAJOR_PLUGINLIB_VENDORBASE_HXX
 #define INCLUDED_JVMFWK_PLUGINS_SUNMAJOR_PLUGINLIB_VENDORBASE_HXX
 
-#include "config_java.h"
+#include <config_java.h>
 
-#include "rtl/ustring.hxx"
-#include "rtl/ref.hxx"
-#include "osl/endian.h"
-#include "salhelper/simplereferenceobject.hxx"
+#include <rtl/ustring.hxx>
+#include <rtl/ref.hxx>
+#include <osl/endian.h>
+#include <salhelper/simplereferenceobject.hxx>
 #include <vector>
 
 namespace jfw_plugin
diff --git a/jvmfwk/inc/vendorplugin.hxx b/jvmfwk/inc/vendorplugin.hxx
index a8a7a4b3c7ae..f370f1123375 100644
--- a/jvmfwk/inc/vendorplugin.hxx
+++ b/jvmfwk/inc/vendorplugin.hxx
@@ -24,13 +24,13 @@
 #include <jvmfwk/framework.hxx>
 #include <rtl/ref.hxx>
 #include <rtl/ustring.h>
-#include "jni.h"
+#include <jni.h>
 
 #include <memory>
 #include <vector>
 #include <utility>
 #include "elements.hxx"
-#include <vendorbase.hxx>
+#include "vendorbase.hxx"
 
 /**
    @file
diff --git a/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx b/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
index 0c5e26398d9e..2a1a6b13baf2 100644
--- a/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
+++ b/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
@@ -25,12 +25,12 @@
 #include <stdlib.h>
 #include <string.h>
 #include <iostream>
-#include "sal/main.h"
-#include "sal/types.h"
-#include "osl/thread.h"
-#include "rtl/ustring.hxx"
-#include "rtl/byteseq.hxx"
-#include "jvmfwk/framework.hxx"
+#include <sal/main.h>
+#include <sal/types.h>
+#include <osl/thread.h>
+#include <rtl/ustring.hxx>
+#include <rtl/byteseq.hxx>
+#include <jvmfwk/framework.hxx>
 
 
 static bool hasOption(char const * szOption, int argc, char** argv);
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/diagnostics.h b/jvmfwk/plugins/sunmajor/pluginlib/diagnostics.h
index 59f85017d3a8..20e3f4bfea2e 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/diagnostics.h
+++ b/jvmfwk/plugins/sunmajor/pluginlib/diagnostics.h
@@ -20,9 +20,9 @@
 #ifndef INCLUDED_JVMFWK_PLUGINS_SUNMAJOR_PLUGINLIB_DIAGNOSTICS_H
 #define INCLUDED_JVMFWK_PLUGINS_SUNMAJOR_PLUGINLIB_DIAGNOSTICS_H
 
-#include "sal/config.h"
+#include <sal/config.h>
 
-#include "rtl/ustring.hxx"
+#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 22285bb0c18c..ce4bc77bc69c 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx
@@ -18,8 +18,8 @@
  */
 
 
-#include "osl/file.hxx"
-#include "osl/thread.h"
+#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 e753b873beb5..c9835ce8a743 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/gnujre.hxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/gnujre.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_JVMFWK_PLUGINS_SUNMAJOR_PLUGINLIB_GNUJRE_HXX
 #define INCLUDED_JVMFWK_PLUGINS_SUNMAJOR_PLUGINLIB_GNUJRE_HXX
 
-#include "vendorbase.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 8407e3be53e7..034b0687d5e6 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx
@@ -18,7 +18,7 @@
  */
 
 
-#include "osl/thread.h"
+#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 16a08f225e77..986040962045 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/otherjre.hxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/otherjre.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_JVMFWK_PLUGINS_SUNMAJOR_PLUGINLIB_OTHERJRE_HXX
 #define INCLUDED_JVMFWK_PLUGINS_SUNMAJOR_PLUGINLIB_OTHERJRE_HXX
 
-#include "vendorbase.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 21050dd8f50d..ab51add16edb 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
@@ -38,25 +38,25 @@
 #include <utility>
 #include <vector>
 
-#include "config_options.h"
-#include "osl/diagnose.h"
-#include "rtl/ustring.hxx"
-#include "rtl/ustrbuf.hxx"
-#include "osl/module.hxx"
-#include "osl/mutex.hxx"
-#include "osl/process.h"
-#include "osl/thread.hxx"
-#include "osl/file.hxx"
-#include "rtl/instance.hxx"
-#include "osl/getglobalmutex.hxx"
+#include <config_options.h>
+#include <osl/diagnose.h>
+#include <rtl/ustring.hxx>
+#include <rtl/ustrbuf.hxx>
+#include <osl/module.hxx>
+#include <osl/mutex.hxx>
+#include <osl/process.h>
+#include <osl/thread.hxx>
+#include <osl/file.hxx>
+#include <rtl/instance.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 "vendorplugin.hxx"
+#include <jni.h>
+#include <rtl/byteseq.hxx>
+#include <vendorplugin.hxx>
 #include "util.hxx"
 #include "sunversion.hxx"
 #include "vendorlist.hxx"
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx
index 7543f497eb83..1e833a9faeef 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx
@@ -18,7 +18,7 @@
  */
 
 
-#include "osl/thread.h"
+#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 7da3c7ba8b1a..a334fc8d3778 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunjre.hxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjre.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_JVMFWK_PLUGINS_SUNMAJOR_PLUGINLIB_SUNJRE_HXX
 #define INCLUDED_JVMFWK_PLUGINS_SUNMAJOR_PLUGINLIB_SUNJRE_HXX
 
-#include "vendorbase.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 f5b60e6702d4..a786d9f7f644 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx
@@ -19,10 +19,10 @@
 
 
 #include "sunversion.hxx"
-#include "osl/diagnose.h"
-#include "osl/thread.h"
-#include "osl/process.h"
-#include "osl/security.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"
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx b/jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx
index 7bda1f920b50..9f3283795e44 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunversion.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_JVMFWK_PLUGINS_SUNMAJOR_PLUGINLIB_SUNVERSION_HXX
 #define INCLUDED_JVMFWK_PLUGINS_SUNMAJOR_PLUGINLIB_SUNVERSION_HXX
 
-#include "rtl/ustring.hxx"
+#include <rtl/ustring.hxx>
 
 namespace jfw_plugin {
 // Define OSL_DEBUG_LEVEL >= 2 to run a test when this lib is loaded
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
index 79b3bcb45d76..1a1ad9656dd7 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
@@ -22,17 +22,17 @@
 
 #include "util.hxx"
 
-#include "osl/process.h"
-#include "osl/security.hxx"
-#include "osl/file.hxx"
-#include "osl/module.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/ustrbuf.hxx"
-#include "rtl/instance.hxx"
-#include "salhelper/linkhelper.hxx"
-#include "salhelper/thread.hxx"
+#include <rtl/byteseq.hxx>
+#include <rtl/ustrbuf.hxx>
+#include <rtl/instance.hxx>
+#include <salhelper/linkhelper.hxx>
+#include <salhelper/thread.hxx>
 #include <memory>
 #include <utility>
 #include <algorithm>
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util.hxx b/jvmfwk/plugins/sunmajor/pluginlib/util.hxx
index 413e6aa771f9..02ee2a4f62ba 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/util.hxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/util.hxx
@@ -19,10 +19,10 @@
 #ifndef INCLUDED_JVMFWK_PLUGINS_SUNMAJOR_PLUGINLIB_UTIL_HXX
 #define INCLUDED_JVMFWK_PLUGINS_SUNMAJOR_PLUGINLIB_UTIL_HXX
 
-#include "rtl/ustring.hxx"
-#include "rtl/bootstrap.hxx"
+#include <rtl/ustring.hxx>
+#include <rtl/bootstrap.hxx>
 #include <vector>
-#include "vendorbase.hxx"
+#include <vendorbase.hxx>
 
 namespace jfw_plugin
 {
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx b/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx
index 3a4c65ca0b37..5aaf385ecc69 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx
@@ -18,9 +18,9 @@
  */
 
 
-#include "osl/file.hxx"
+#include <osl/file.hxx>
 
-#include "vendorbase.hxx"
+#include <vendorbase.hxx>
 #include "util.hxx"
 #include "sunjre.hxx"
 
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx b/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx
index 104b69508209..2960d118cf38 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx
@@ -22,7 +22,7 @@
 #include "gnujre.hxx"
 #include "sunjre.hxx"
 #include "otherjre.hxx"
-#include "osl/thread.h"
+#include <osl/thread.h>
 #include <stdio.h>
 
 
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.hxx b/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.hxx
index 3947a4d6756f..b7a12685d9c4 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.hxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.hxx
@@ -19,8 +19,8 @@
 #ifndef INCLUDED_JVMFWK_PLUGINS_SUNMAJOR_PLUGINLIB_VENDORLIST_HXX
 #define INCLUDED_JVMFWK_PLUGINS_SUNMAJOR_PLUGINLIB_VENDORLIST_HXX
 
-#include "rtl/ref.hxx"
-#include "vendorbase.hxx"
+#include <rtl/ref.hxx>
+#include <vendorbase.hxx>
 
 namespace jfw_plugin
 {
diff --git a/jvmfwk/source/elements.cxx b/jvmfwk/source/elements.cxx
index 2e1109aa9f69..696d6b616d75 100644
--- a/jvmfwk/source/elements.cxx
+++ b/jvmfwk/source/elements.cxx
@@ -22,20 +22,20 @@
 #include <cassert>
 #include <memory>
 
-#include "elements.hxx"
-#include "osl/mutex.hxx"
-#include "osl/file.hxx"
-#include "fwkutil.hxx"
+#include <elements.hxx>
+#include <osl/mutex.hxx>
+#include <osl/file.hxx>
+#include <fwkutil.hxx>
 #include "fwkbase.hxx"
 #include "framework.hxx"
 #include "libxmlutil.hxx"
-#include "osl/thread.hxx"
+#include <osl/thread.hxx>
 #include <algorithm>
-#include "libxml/parser.h"
-#include "libxml/xpath.h"
-#include "libxml/xpathInternals.h"
-#include "rtl/bootstrap.hxx"
-#include "boost/optional.hpp"
+#include <libxml/parser.h>
+#include <libxml/xpath.h>
+#include <libxml/xpathInternals.h>
+#include <rtl/bootstrap.hxx>
+#include <boost/optional.hpp>
 #include <string.h>
 
 // For backwards compatibility, the nFeatures and nRequirements flag words are
diff --git a/jvmfwk/source/framework.cxx b/jvmfwk/source/framework.cxx
index 6da84fb6576f..af5621addeb7 100644
--- a/jvmfwk/source/framework.cxx
+++ b/jvmfwk/source/framework.cxx
@@ -23,17 +23,17 @@
 #include <memory>
 #include <utility>
 
-#include "rtl/ustring.hxx"
-#include "rtl/bootstrap.hxx"
-#include "osl/thread.hxx"
-#include "osl/file.hxx"
-#include "jvmfwk/framework.hxx"
-#include "vendorplugin.hxx"
+#include <rtl/ustring.hxx>
+#include <rtl/bootstrap.hxx>
+#include <osl/thread.hxx>
+#include <osl/file.hxx>
+#include <jvmfwk/framework.hxx>
+#include <vendorplugin.hxx>
 #include <vector>
 #include <algorithm>
 #include "framework.hxx"
-#include "fwkutil.hxx"
-#include "elements.hxx"
+#include <fwkutil.hxx>
+#include <elements.hxx>
 #include "fwkbase.hxx"
 
 namespace {
diff --git a/jvmfwk/source/framework.hxx b/jvmfwk/source/framework.hxx
index 590543b8d6ba..f45965095068 100644
--- a/jvmfwk/source/framework.hxx
+++ b/jvmfwk/source/framework.hxx
@@ -19,10 +19,10 @@
 #ifndef INCLUDED_JVMFWK_SOURCE_FRAMEWORK_HXX
 #define INCLUDED_JVMFWK_SOURCE_FRAMEWORK_HXX
 
-#include "rtl/ustring.hxx"
-#include "rtl/byteseq.hxx"
-#include "jvmfwk/framework.hxx"
-#include "vendorplugin.hxx"
+#include <rtl/ustring.hxx>
+#include <rtl/byteseq.hxx>
+#include <jvmfwk/framework.hxx>
+#include <vendorplugin.hxx>
 
 namespace jfw
 {
diff --git a/jvmfwk/source/fwkbase.cxx b/jvmfwk/source/fwkbase.cxx
index 155e07c813da..c48acac4cec7 100644
--- a/jvmfwk/source/fwkbase.cxx
+++ b/jvmfwk/source/fwkbase.cxx
@@ -17,17 +17,17 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "rtl/ustring.hxx"
-#include "rtl/ustrbuf.hxx"
-#include "rtl/uri.hxx"
-#include "osl/thread.hxx"
-#include "osl/process.h"
-#include "libxml/xpathInternals.h"
-#include "osl/file.hxx"
-#include "osl/module.hxx"
+#include <rtl/ustring.hxx>
+#include <rtl/ustrbuf.hxx>
+#include <rtl/uri.hxx>
+#include <osl/thread.hxx>
+#include <osl/process.h>
+#include <libxml/xpathInternals.h>
+#include <osl/file.hxx>
+#include <osl/module.hxx>
 #include "framework.hxx"
-#include "fwkutil.hxx"
-#include "elements.hxx"
+#include <fwkutil.hxx>
+#include <elements.hxx>
 #include "fwkbase.hxx"
 
 using namespace osl;
diff --git a/jvmfwk/source/fwkbase.hxx b/jvmfwk/source/fwkbase.hxx
index 1a86cb9f6a1a..e1f9edda354c 100644
--- a/jvmfwk/source/fwkbase.hxx
+++ b/jvmfwk/source/fwkbase.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_JVMFWK_SOURCE_FWKBASE_HXX
 #define INCLUDED_JVMFWK_SOURCE_FWKBASE_HXX
 
-#include "rtl/ustring.hxx"
+#include <rtl/ustring.hxx>
 #include "libxmlutil.hxx"
 
 namespace jfw
diff --git a/jvmfwk/source/fwkutil.cxx b/jvmfwk/source/fwkutil.cxx
index 95fa21503bc0..3d0a2ac22804 100644
--- a/jvmfwk/source/fwkutil.cxx
+++ b/jvmfwk/source/fwkutil.cxx
@@ -33,21 +33,21 @@
 
 #include <string>
 #include <string.h>
-#include "osl/module.hxx"
-#include "osl/thread.hxx"
-#include "rtl/ustring.hxx"
-#include "rtl/ustrbuf.hxx"
-#include "rtl/bootstrap.hxx"
-#include "osl/file.hxx"
-#include "osl/process.h"
-#include "rtl/instance.hxx"
-#include "rtl/uri.hxx"
-#include "osl/getglobalmutex.hxx"
-#include "com/sun/star/lang/IllegalArgumentException.hpp"
-#include "cppuhelper/bootstrap.hxx"
+#include <osl/module.hxx>
+#include <osl/thread.hxx>
+#include <rtl/ustring.hxx>
+#include <rtl/ustrbuf.hxx>
+#include <rtl/bootstrap.hxx>
+#include <osl/file.hxx>
+#include <osl/process.h>
+#include <rtl/instance.hxx>
+#include <rtl/uri.hxx>
+#include <osl/getglobalmutex.hxx>
+#include <com/sun/star/lang/IllegalArgumentException.hpp>
+#include <cppuhelper/bootstrap.hxx>
 
 #include "framework.hxx"
-#include "fwkutil.hxx"
+#include <fwkutil.hxx>
 #include <memory>
 
 using namespace osl;
diff --git a/jvmfwk/source/libxmlutil.hxx b/jvmfwk/source/libxmlutil.hxx
index ac536306610e..8a58280b406d 100644
--- a/jvmfwk/source/libxmlutil.hxx
+++ b/jvmfwk/source/libxmlutil.hxx
@@ -19,9 +19,9 @@
 #ifndef INCLUDED_JVMFWK_SOURCE_LIBXMLUTIL_HXX
 #define INCLUDED_JVMFWK_SOURCE_LIBXMLUTIL_HXX
 
-#include "libxml/parser.h"
-#include "libxml/xpath.h"
-#include "rtl/ustring.hxx"
+#include <libxml/parser.h>
+#include <libxml/xpath.h>
+#include <rtl/ustring.hxx>
 
 namespace jfw
 {