diff --git a/javaunohelper/source/bootstrap.cxx b/javaunohelper/source/bootstrap.cxx
index e8e0107ac784..a517d2a7378c 100644
--- a/javaunohelper/source/bootstrap.cxx
+++ b/javaunohelper/source/bootstrap.cxx
@@ -17,26 +17,26 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "sal/config.h"
+#include <sal/config.h>
 
-#include "osl/diagnose.h"
+#include <osl/diagnose.h>
 
-#include "rtl/alloc.h"
-#include "rtl/bootstrap.hxx"
-#include "rtl/string.hxx"
+#include <rtl/alloc.h>
+#include <rtl/bootstrap.hxx>
+#include <rtl/string.hxx>
 
 #include <uno/lbnames.h>
-#include "uno/mapping.hxx"
-#include "uno/environment.hxx"
+#include <uno/mapping.hxx>
+#include <uno/environment.hxx>
 
-#include "cppuhelper/bootstrap.hxx"
+#include <cppuhelper/bootstrap.hxx>
 
-#include "com/sun/star/lang/XComponent.hpp"
-#include "com/sun/star/lang/XSingleComponentFactory.hpp"
+#include <com/sun/star/lang/XComponent.hpp>
+#include <com/sun/star/lang/XSingleComponentFactory.hpp>
 
-#include "jni.h"
-#include "jvmaccess/virtualmachine.hxx"
-#include "jvmaccess/unovirtualmachine.hxx"
+#include <jni.h>
+#include <jvmaccess/virtualmachine.hxx>
+#include <jvmaccess/unovirtualmachine.hxx>
 
 #include "juhx-export-functions.hxx"
 #include "vm.hxx"
diff --git a/javaunohelper/source/javaunohelper.cxx b/javaunohelper/source/javaunohelper.cxx
index aa48e4258f7b..43c385bed20a 100644
--- a/javaunohelper/source/javaunohelper.cxx
+++ b/javaunohelper/source/javaunohelper.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "sal/config.h"
+#include <sal/config.h>
 
 #include <osl/module.hxx>
 #include <osl/thread.h>
@@ -33,9 +33,9 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/registry/XRegistryKey.hpp>
 
-#include "jni.h"
-#include "jvmaccess/virtualmachine.hxx"
-#include "jvmaccess/unovirtualmachine.hxx"
+#include <jni.h>
+#include <jvmaccess/virtualmachine.hxx>
+#include <jvmaccess/unovirtualmachine.hxx>
 
 #include "juhx-export-functions.hxx"
 #include "vm.hxx"
diff --git a/javaunohelper/source/juhx-export-functions.hxx b/javaunohelper/source/juhx-export-functions.hxx
index 0012cf4832bf..569822f2c53a 100644
--- a/javaunohelper/source/juhx-export-functions.hxx
+++ b/javaunohelper/source/juhx-export-functions.hxx
@@ -20,9 +20,9 @@
 #ifndef INCLUDED_JAVAUNOHELPER_SOURCE_JUHX_EXPORT_FUNCTIONS_HXX
 #define INCLUDED_JAVAUNOHELPER_SOURCE_JUHX_EXPORT_FUNCTIONS_HXX
 
-#include "sal/config.h"
+#include <sal/config.h>
 
-#include "sal/types.h"
+#include <sal/types.h>
 
 #include "juhx-export-types.hxx"
 
diff --git a/javaunohelper/source/juhx-export-types.hxx b/javaunohelper/source/juhx-export-types.hxx
index b58d2e8cff7f..571f5fd39dd9 100644
--- a/javaunohelper/source/juhx-export-types.hxx
+++ b/javaunohelper/source/juhx-export-types.hxx
@@ -20,9 +20,9 @@
 #ifndef INCLUDED_JAVAUNOHELPER_SOURCE_JUHX_EXPORT_TYPES_HXX
 #define INCLUDED_JAVAUNOHELPER_SOURCE_JUHX_EXPORT_TYPES_HXX
 
-#include "sal/config.h"
+#include <sal/config.h>
 
-#include "jni.h"
+#include <jni.h>
 
 #if defined DISABLE_DYNLOADING
 #define JAVAUNOHELPER_DETAIL_CALLCONV JNICALL
diff --git a/javaunohelper/source/preload.cxx b/javaunohelper/source/preload.cxx
index ac05c394a964..2e4964bab575 100644
--- a/javaunohelper/source/preload.cxx
+++ b/javaunohelper/source/preload.cxx
@@ -17,12 +17,12 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "sal/config.h"
+#include <sal/config.h>
 
-#include "jni.h"
+#include <jni.h>
 
-#include "rtl/ustring.hxx"
-#include "osl/module.hxx"
+#include <rtl/ustring.hxx>
+#include <osl/module.hxx>
 
 #include "juhx-export-types.hxx"
 
diff --git a/javaunohelper/source/vm.cxx b/javaunohelper/source/vm.cxx
index 763fc4c98aee..b3643acc78e2 100644
--- a/javaunohelper/source/vm.cxx
+++ b/javaunohelper/source/vm.cxx
@@ -18,17 +18,17 @@
  */
 
 
-#include "sal/config.h"
+#include <sal/config.h>
 
 #include "vm.hxx"
 
-#include "com/sun/star/beans/NamedValue.hpp"
-#include "com/sun/star/lang/XSingleComponentFactory.hpp"
+#include <com/sun/star/beans/NamedValue.hpp>
+#include <com/sun/star/lang/XSingleComponentFactory.hpp>
 #include <cppuhelper/compbase.hxx>
-#include "cppuhelper/component_context.hxx"
-#include "jvmaccess/virtualmachine.hxx"
-#include "jvmaccess/unovirtualmachine.hxx"
-#include "osl/mutex.hxx"
+#include <cppuhelper/component_context.hxx>
+#include <jvmaccess/virtualmachine.hxx>
+#include <jvmaccess/unovirtualmachine.hxx>
+#include <osl/mutex.hxx>
 
 namespace {
 
diff --git a/javaunohelper/source/vm.hxx b/javaunohelper/source/vm.hxx
index 1b007d30e5ee..81dd5be69f60 100644
--- a/javaunohelper/source/vm.hxx
+++ b/javaunohelper/source/vm.hxx
@@ -20,11 +20,11 @@
 #ifndef INCLUDED_JAVAUNOHELPER_SOURCE_VM_HXX
 #define INCLUDED_JAVAUNOHELPER_SOURCE_VM_HXX
 
-#include "sal/config.h"
+#include <sal/config.h>
 
-#include "jni.h"
-#include "com/sun/star/uno/Reference.hxx"
-#include "rtl/ref.hxx"
+#include <jni.h>
+#include <com/sun/star/uno/Reference.hxx>
+#include <rtl/ref.hxx>
 
 namespace com { namespace sun { namespace star { namespace uno {
     class XComponentContext;