loplugin:includeform: UNO API include files

Change these back to consistently use the "..." form to include other UNO API include files, for the benefit of external users of this API. Change-Id: I9c9188e895eb3495e20a71ad44abfa2f6061fa94
author: Stephan Bergmann <sbergman@redhat.com> 2017-10-23 22:22:50 +0200
committer: Stephan Bergmann <sbergman@redhat.com> 2017-10-23 22:22:50 +0200
commit: 189abcf0db61c41a565bd355294bf6e712fc3e5a (patch)
tree: 97886355fdcdd9cca038611d67e0d889d3f77dd7
parent: 340c5c20c264277b3ac1cb9cfcdbb0499ae471d7 (diff)
173 files changed, 580 insertions, 580 deletions
diff --git a/include/com/sun/star/uno/Any.h b/include/com/sun/star/uno/Any.h
index 0a5f595cbb9d..93be8c4ce5fd 100644
--- a/include/com/sun/star/uno/Any.h
+++ b/include/com/sun/star/uno/Any.h
@@ -19,16 +19,16 @@
 #ifndef INCLUDED_COM_SUN_STAR_UNO_ANY_H
 #define INCLUDED_COM_SUN_STAR_UNO_ANY_H
 
-#include <sal/config.h>
+#include "sal/config.h"
 
 #include <cstddef>
 
-#include <rtl/ustring.hxx>
-#include <uno/any2.h>
-#include <typelib/typedescription.h>
-#include <cppu/unotype.hxx>
-#include <com/sun/star/uno/TypeClass.hdl>
-#include <rtl/alloc.h>
+#include "rtl/ustring.hxx"
+#include "uno/any2.h"
+#include "typelib/typedescription.h"
+#include "cppu/unotype.hxx"
+#include "com/sun/star/uno/TypeClass.hdl"
+#include "rtl/alloc.h"
 
 namespace com
 {
diff --git a/include/com/sun/star/uno/Any.hxx b/include/com/sun/star/uno/Any.hxx
index 7171c1dbbbf8..52ca0fc571fe 100644
--- a/include/com/sun/star/uno/Any.hxx
+++ b/include/com/sun/star/uno/Any.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_COM_SUN_STAR_UNO_ANY_HXX
 #define INCLUDED_COM_SUN_STAR_UNO_ANY_HXX
 
-#include <sal/config.h>
+#include "sal/config.h"
 
 #include <algorithm>
 #include <cassert>
@@ -27,15 +27,15 @@
 #include <iomanip>
 #include <ostream>
 
-#include <com/sun/star/uno/Any.h>
-#include <uno/data.h>
-#include <uno/sequence2.h>
-#include <com/sun/star/uno/Type.hxx>
-#include <com/sun/star/uno/Reference.h>
-#include <com/sun/star/uno/genfunc.hxx>
-#include <com/sun/star/uno/RuntimeException.hpp>
-#include <cppu/cppudllapi.h>
-#include <cppu/unotype.hxx>
+#include "com/sun/star/uno/Any.h"
+#include "uno/data.h"
+#include "uno/sequence2.h"
+#include "com/sun/star/uno/Type.hxx"
+#include "com/sun/star/uno/Reference.h"
+#include "com/sun/star/uno/genfunc.hxx"
+#include "com/sun/star/uno/RuntimeException.hpp"
+#include "cppu/cppudllapi.h"
+#include "cppu/unotype.hxx"
 
 extern "C" CPPU_DLLPUBLIC rtl_uString * SAL_CALL cppu_Any_extraction_failure_msg(
     uno_Any const * pAny, typelib_TypeDescriptionReference * pType )
diff --git a/include/com/sun/star/uno/Reference.h b/include/com/sun/star/uno/Reference.h
index c24509a51568..a7b62926a0c7 100644
--- a/include/com/sun/star/uno/Reference.h
+++ b/include/com/sun/star/uno/Reference.h
@@ -19,12 +19,12 @@
 #ifndef INCLUDED_COM_SUN_STAR_UNO_REFERENCE_H
 #define INCLUDED_COM_SUN_STAR_UNO_REFERENCE_H
 
-#include <sal/config.h>
+#include "sal/config.h"
 
 #include <cassert>
 #include <cstddef>
 
-#include <rtl/alloc.h>
+#include "rtl/alloc.h"
 
 namespace com
 {
diff --git a/include/com/sun/star/uno/Reference.hxx b/include/com/sun/star/uno/Reference.hxx
index e99cc15f8941..d822c97aeb2d 100644
--- a/include/com/sun/star/uno/Reference.hxx
+++ b/include/com/sun/star/uno/Reference.hxx
@@ -19,16 +19,16 @@
 #ifndef INCLUDED_COM_SUN_STAR_UNO_REFERENCE_HXX
 #define INCLUDED_COM_SUN_STAR_UNO_REFERENCE_HXX
 
-#include <sal/config.h>
+#include "sal/config.h"
 
 #include <cstddef>
 #include <ostream>
 
-#include <com/sun/star/uno/Reference.h>
-#include <com/sun/star/uno/RuntimeException.hpp>
-#include <com/sun/star/uno/XInterface.hpp>
-#include <com/sun/star/uno/Any.hxx>
-#include <cppu/cppudllapi.h>
+#include "com/sun/star/uno/Reference.h"
+#include "com/sun/star/uno/RuntimeException.hpp"
+#include "com/sun/star/uno/XInterface.hpp"
+#include "com/sun/star/uno/Any.hxx"
+#include "cppu/cppudllapi.h"
 
 extern "C" CPPU_DLLPUBLIC rtl_uString * SAL_CALL cppu_unsatisfied_iquery_msg(
     typelib_TypeDescriptionReference * pType )
diff --git a/include/com/sun/star/uno/Sequence.h b/include/com/sun/star/uno/Sequence.h
index 15a792bc9860..c6cb36cc71ff 100644
--- a/include/com/sun/star/uno/Sequence.h
+++ b/include/com/sun/star/uno/Sequence.h
@@ -19,10 +19,10 @@
 #ifndef INCLUDED_COM_SUN_STAR_UNO_SEQUENCE_H
 #define INCLUDED_COM_SUN_STAR_UNO_SEQUENCE_H
 
-#include <typelib/typedescription.h>
-#include <uno/sequence2.h>
-#include <com/sun/star/uno/Type.h>
-#include <rtl/alloc.h>
+#include "typelib/typedescription.h"
+#include "uno/sequence2.h"
+#include "com/sun/star/uno/Type.h"
+#include "rtl/alloc.h"
 
 #include <new>
 
diff --git a/include/com/sun/star/uno/Sequence.hxx b/include/com/sun/star/uno/Sequence.hxx
index dfebf3693b69..7fe9f0bda64f 100644
--- a/include/com/sun/star/uno/Sequence.hxx
+++ b/include/com/sun/star/uno/Sequence.hxx
@@ -19,17 +19,17 @@
 #ifndef INCLUDED_COM_SUN_STAR_UNO_SEQUENCE_HXX
 #define INCLUDED_COM_SUN_STAR_UNO_SEQUENCE_HXX
 
-#include <sal/config.h>
+#include "sal/config.h"
 
 #include <cassert>
 #include <cstddef>
 
-#include <osl/interlck.h>
-#include <com/sun/star/uno/Sequence.h>
-#include <typelib/typedescription.h>
-#include <uno/data.h>
-#include <com/sun/star/uno/genfunc.hxx>
-#include <cppu/unotype.hxx>
+#include "osl/interlck.h"
+#include "com/sun/star/uno/Sequence.h"
+#include "typelib/typedescription.h"
+#include "uno/data.h"
+#include "com/sun/star/uno/genfunc.hxx"
+#include "cppu/unotype.hxx"
 
 namespace com
 {
diff --git a/include/com/sun/star/uno/Type.h b/include/com/sun/star/uno/Type.h
index 041314e9778d..55b9c8317aef 100644
--- a/include/com/sun/star/uno/Type.h
+++ b/include/com/sun/star/uno/Type.h
@@ -19,10 +19,10 @@
 #ifndef INCLUDED_COM_SUN_STAR_UNO_TYPE_H
 #define INCLUDED_COM_SUN_STAR_UNO_TYPE_H
 
-#include <typelib/typedescription.h>
-#include <com/sun/star/uno/TypeClass.hdl>
-#include <rtl/ustring.hxx>
-#include <rtl/alloc.h>
+#include "typelib/typedescription.h"
+#include "com/sun/star/uno/TypeClass.hdl"
+#include "rtl/ustring.hxx"
+#include "rtl/alloc.h"
 
 
 namespace com
diff --git a/include/com/sun/star/uno/Type.hxx b/include/com/sun/star/uno/Type.hxx
index 4a7b86e72c05..171f52e113ee 100644
--- a/include/com/sun/star/uno/Type.hxx
+++ b/include/com/sun/star/uno/Type.hxx
@@ -19,13 +19,13 @@
 #ifndef INCLUDED_COM_SUN_STAR_UNO_TYPE_HXX
 #define INCLUDED_COM_SUN_STAR_UNO_TYPE_HXX
 
-#include <sal/config.h>
+#include "sal/config.h"
 
 #include <cstddef>
 #include <ostream>
 
-#include <com/sun/star/uno/Type.h>
-#include <cppu/unotype.hxx>
+#include "com/sun/star/uno/Type.h"
+#include "cppu/unotype.hxx"
 
 namespace com
 {
diff --git a/include/com/sun/star/uno/genfunc.h b/include/com/sun/star/uno/genfunc.h
index d1603e250bef..eb1b028cce4a 100644
--- a/include/com/sun/star/uno/genfunc.h
+++ b/include/com/sun/star/uno/genfunc.h
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_COM_SUN_STAR_UNO_GENFUNC_H
 #define INCLUDED_COM_SUN_STAR_UNO_GENFUNC_H
 
-#include <sal/types.h>
+#include "sal/types.h"
 
 typedef struct _typelib_TypeDescriptionReference typelib_TypeDescriptionReference;
 
diff --git a/include/com/sun/star/uno/genfunc.hxx b/include/com/sun/star/uno/genfunc.hxx
index d32f2a35219d..45acb99edcd9 100644
--- a/include/com/sun/star/uno/genfunc.hxx
+++ b/include/com/sun/star/uno/genfunc.hxx
@@ -19,13 +19,13 @@
 #ifndef INCLUDED_COM_SUN_STAR_UNO_GENFUNC_HXX
 #define INCLUDED_COM_SUN_STAR_UNO_GENFUNC_HXX
 
-#include <sal/config.h>
+#include "sal/config.h"
 
 #include <cstddef>
 
-#include <com/sun/star/uno/genfunc.h>
-#include <com/sun/star/uno/Any.hxx>
-#include <com/sun/star/uno/XInterface.hpp>
+#include "com/sun/star/uno/genfunc.h"
+#include "com/sun/star/uno/Any.hxx"
+#include "com/sun/star/uno/XInterface.hpp"
 
 
 namespace com
diff --git a/include/cppu/Enterable.hxx b/include/cppu/Enterable.hxx
index 9e6970d8e4e0..927db6d0fb08 100644
--- a/include/cppu/Enterable.hxx
+++ b/include/cppu/Enterable.hxx
@@ -20,8 +20,8 @@
 #ifndef INCLUDED_CPPU_ENTERABLE_HXX
 #define INCLUDED_CPPU_ENTERABLE_HXX
 
-#include <uno/Enterable.h>
-#include <rtl/ustring.hxx>
+#include "uno/Enterable.h"
+#include "rtl/ustring.hxx"
 
 namespace cppu
 {
diff --git a/include/cppu/EnvDcp.hxx b/include/cppu/EnvDcp.hxx
index 0fff995d1c3a..7f879573b42c 100644
--- a/include/cppu/EnvDcp.hxx
+++ b/include/cppu/EnvDcp.hxx
@@ -20,8 +20,8 @@
 #ifndef INCLUDED_CPPU_ENVDCP_HXX
 #define INCLUDED_CPPU_ENVDCP_HXX
 
-#include <rtl/ustring.hxx>
-#include <uno/EnvDcp.h>
+#include "rtl/ustring.hxx"
+#include "uno/EnvDcp.h"
 
 
 namespace cppu
diff --git a/include/cppu/EnvGuards.hxx b/include/cppu/EnvGuards.hxx
index c95d8dfb4f5c..49cf195b11d0 100644
--- a/include/cppu/EnvGuards.hxx
+++ b/include/cppu/EnvGuards.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_CPPU_ENVGUARDS_HXX
 #define INCLUDED_CPPU_ENVGUARDS_HXX
 
-#include <uno/environment.hxx>
+#include "uno/environment.hxx"
 
 
 namespace cppu
diff --git a/include/cppu/Map.hxx b/include/cppu/Map.hxx
index f38aabb60278..94a3b3a5aaba 100644
--- a/include/cppu/Map.hxx
+++ b/include/cppu/Map.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_CPPU_MAP_HXX
 #define INCLUDED_CPPU_MAP_HXX
 
-#include <uno/mapping.hxx>
+#include "uno/mapping.hxx"
 
 
 namespace cppu
diff --git a/include/cppu/cppudllapi.h b/include/cppu/cppudllapi.h
index 9ceab4344e57..c2bcc559bbea 100644
--- a/include/cppu/cppudllapi.h
+++ b/include/cppu/cppudllapi.h
@@ -2,7 +2,7 @@
 #ifndef INCLUDED_CPPU_CPPUDLLAPI_H
 #define INCLUDED_CPPU_CPPUDLLAPI_H
 
-#include <sal/types.h>
+#include "sal/types.h"
 
 #if defined(CPPU_DLLIMPLEMENTATION)
 #define CPPU_DLLPUBLIC  SAL_DLLPUBLIC_EXPORT
diff --git a/include/cppu/helper/purpenv/Environment.hxx b/include/cppu/helper/purpenv/Environment.hxx
index 35614b1a84e6..de14710fb1de 100644
--- a/include/cppu/helper/purpenv/Environment.hxx
+++ b/include/cppu/helper/purpenv/Environment.hxx
@@ -20,8 +20,8 @@
 #ifndef INCLUDED_CPPU_HELPER_PURPENV_ENVIRONMENT_HXX
 #define INCLUDED_CPPU_HELPER_PURPENV_ENVIRONMENT_HXX
 
-#include <cppu/cppudllapi.h>
-#include <uno/environment.h>
+#include "cppu/cppudllapi.h"
+#include "uno/environment.h"
 
 namespace cppu { class Enterable; }
 
diff --git a/include/cppu/helper/purpenv/Mapping.hxx b/include/cppu/helper/purpenv/Mapping.hxx
index 01c998c07c07..7ac49a1d10c9 100644
--- a/include/cppu/helper/purpenv/Mapping.hxx
+++ b/include/cppu/helper/purpenv/Mapping.hxx
@@ -20,11 +20,11 @@
 #ifndef INCLUDED_CPPU_HELPER_PURPENV_MAPPING_HXX
 #define INCLUDED_CPPU_HELPER_PURPENV_MAPPING_HXX
 
-#include <cppu/cppudllapi.h>
-#include <typelib/typedescription.h>
-#include <uno/any2.h>
-#include <uno/environment.h>
-#include <uno/mapping.h>
+#include "cppu/cppudllapi.h"
+#include "typelib/typedescription.h"
+#include "uno/any2.h"
+#include "uno/environment.h"
+#include "uno/mapping.h"
 
 
 namespace cppu { namespace helper { namespace purpenv {
diff --git a/include/cppu/macros.hxx b/include/cppu/macros.hxx
index 916fc8b4f0db..493a21ac6501 100644
--- a/include/cppu/macros.hxx
+++ b/include/cppu/macros.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_CPPU_MACROS_HXX
 #define INCLUDED_CPPU_MACROS_HXX
 
-#include <sal/types.h>
+#include "sal/types.h"
 
 /** Namespace name for compiler/ platform, e.g. gcc3, msci
 
diff --git a/include/cppu/unotype.hxx b/include/cppu/unotype.hxx
index 904621fc6756..f040159ce1e6 100644
--- a/include/cppu/unotype.hxx
+++ b/include/cppu/unotype.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_CPPU_UNOTYPE_HXX
 #define INCLUDED_CPPU_UNOTYPE_HXX
 
-#include <sal/config.h>
+#include "sal/config.h"
 
 #include <cstddef>
 
@@ -28,9 +28,9 @@
 #include <type_traits>
 #endif
 
-#include <sal/types.h>
-#include <typelib/typeclass.h>
-#include <typelib/typedescription.h>
+#include "sal/types.h"
+#include "typelib/typeclass.h"
+#include "typelib/typedescription.h"
 
 namespace com { namespace sun { namespace star { namespace uno {
     class Type;
diff --git a/include/cppuhelper/access_control.hxx b/include/cppuhelper/access_control.hxx
index 9158c8e0a783..816eb07829e0 100644
--- a/include/cppuhelper/access_control.hxx
+++ b/include/cppuhelper/access_control.hxx
@@ -19,9 +19,9 @@
 #ifndef INCLUDED_CPPUHELPER_ACCESS_CONTROL_HXX
 #define INCLUDED_CPPUHELPER_ACCESS_CONTROL_HXX
 
-#include <com/sun/star/uno/XComponentContext.hpp>
-#include <com/sun/star/security/XAccessController.hpp>
-#include <cppuhelper/cppuhelperdllapi.h>
+#include "com/sun/star/uno/XComponentContext.hpp"
+#include "com/sun/star/security/XAccessController.hpp"
+#include "cppuhelper/cppuhelperdllapi.h"
 
 
 namespace cppu
diff --git a/include/cppuhelper/basemutex.hxx b/include/cppuhelper/basemutex.hxx
index 648529619061..643919d6d509 100644
--- a/include/cppuhelper/basemutex.hxx
+++ b/include/cppuhelper/basemutex.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_CPPUHELPER_BASEMUTEX_HXX
 #define INCLUDED_CPPUHELPER_BASEMUTEX_HXX
 
-#include <osl/mutex.hxx>
+#include "osl/mutex.hxx"
 
 namespace cppu
 {
diff --git a/include/cppuhelper/bootstrap.hxx b/include/cppuhelper/bootstrap.hxx
index e9a0c2d1c4f6..bdb4d90584dd 100644
--- a/include/cppuhelper/bootstrap.hxx
+++ b/include/cppuhelper/bootstrap.hxx
@@ -19,11 +19,11 @@
 #ifndef INCLUDED_CPPUHELPER_BOOTSTRAP_HXX
 #define INCLUDED_CPPUHELPER_BOOTSTRAP_HXX
 
-#include <sal/config.h>
-#include <com/sun/star/uno/Reference.hxx>
-#include <rtl/ustring.hxx>
-#include <sal/types.h>
-#include <cppuhelper/cppuhelperdllapi.h>
+#include "sal/config.h"
+#include "com/sun/star/uno/Reference.hxx"
+#include "rtl/ustring.hxx"
+#include "sal/types.h"
+#include "cppuhelper/cppuhelperdllapi.h"
 
 namespace com { namespace sun { namespace star {
     namespace container { class XHierarchicalNameAccess; }
diff --git a/include/cppuhelper/compbase.hxx b/include/cppuhelper/compbase.hxx
index e7e196e9e2af..d9230482753d 100644
--- a/include/cppuhelper/compbase.hxx
+++ b/include/cppuhelper/compbase.hxx
@@ -20,20 +20,20 @@
 #ifndef INCLUDED_CPPUHELPER_COMPBASE_HXX
 #define INCLUDED_CPPUHELPER_COMPBASE_HXX
 
-#include <sal/config.h>
+#include "sal/config.h"
 
 #include <exception>
 
-#include <com/sun/star/lang/XTypeProvider.hpp>
-#include <com/sun/star/uno/Any.hxx>
-#include <com/sun/star/uno/Reference.hxx>
-#include <com/sun/star/uno/RuntimeException.hpp>
-#include <com/sun/star/uno/Sequence.hxx>
-#include <com/sun/star/uno/Type.hxx>
-#include <cppuhelper/compbase_ex.hxx>
-#include <cppuhelper/implbase.hxx>
-#include <rtl/instance.hxx>
-#include <sal/types.h>
+#include "com/sun/star/lang/XTypeProvider.hpp"
+#include "com/sun/star/uno/Any.hxx"
+#include "com/sun/star/uno/Reference.hxx"
+#include "com/sun/star/uno/RuntimeException.hpp"
+#include "com/sun/star/uno/Sequence.hxx"
+#include "com/sun/star/uno/Type.hxx"
+#include "cppuhelper/compbase_ex.hxx"
+#include "cppuhelper/implbase.hxx"
+#include "rtl/instance.hxx"
+#include "sal/types.h"
 
 namespace com { namespace sun { namespace star { namespace lang {
     class XEventListener;
diff --git a/include/cppuhelper/compbase1.hxx b/include/cppuhelper/compbase1.hxx
index ab55d4fca1ac..54f22319c810 100644
--- a/include/cppuhelper/compbase1.hxx
+++ b/include/cppuhelper/compbase1.hxx
@@ -19,8 +19,8 @@
 #ifndef INCLUDED_CPPUHELPER_COMPBASE1_HXX
 #define INCLUDED_CPPUHELPER_COMPBASE1_HXX
 
-#include <cppuhelper/implbase1.hxx>
-#include <cppuhelper/compbase_ex.hxx>
+#include "cppuhelper/implbase1.hxx"
+#include "cppuhelper/compbase_ex.hxx"
 
 namespace cppu
 {
diff --git a/include/cppuhelper/compbase10.hxx b/include/cppuhelper/compbase10.hxx
index fabcf4d8035d..dd6959d879c3 100644
--- a/include/cppuhelper/compbase10.hxx
+++ b/include/cppuhelper/compbase10.hxx
@@ -19,8 +19,8 @@
 #ifndef INCLUDED_CPPUHELPER_COMPBASE10_HXX
 #define INCLUDED_CPPUHELPER_COMPBASE10_HXX
 
-#include <cppuhelper/implbase10.hxx>
-#include <cppuhelper/compbase_ex.hxx>
+#include "cppuhelper/implbase10.hxx"
+#include "cppuhelper/compbase_ex.hxx"
 
 namespace cppu
 {
diff --git a/include/cppuhelper/compbase11.hxx b/include/cppuhelper/compbase11.hxx
index d914bc4aac9e..6f9ead47ee13 100644
--- a/include/cppuhelper/compbase11.hxx
+++ b/include/cppuhelper/compbase11.hxx
@@ -19,8 +19,8 @@
 #ifndef INCLUDED_CPPUHELPER_COMPBASE11_HXX
 #define INCLUDED_CPPUHELPER_COMPBASE11_HXX
 
-#include <cppuhelper/implbase11.hxx>
-#include <cppuhelper/compbase_ex.hxx>
+#include "cppuhelper/implbase11.hxx"
+#include "cppuhelper/compbase_ex.hxx"
 
 namespace cppu
 {
diff --git a/include/cppuhelper/compbase12.hxx b/include/cppuhelper/compbase12.hxx
index e7f6c9ca3671..38706782e2b5 100644
--- a/include/cppuhelper/compbase12.hxx
+++ b/include/cppuhelper/compbase12.hxx
@@ -19,8 +19,8 @@
 #ifndef INCLUDED_CPPUHELPER_COMPBASE12_HXX
 #define INCLUDED_CPPUHELPER_COMPBASE12_HXX
 
-#include <cppuhelper/implbase12.hxx>
-#include <cppuhelper/compbase_ex.hxx>
+#include "cppuhelper/implbase12.hxx"
+#include "cppuhelper/compbase_ex.hxx"
 
 namespace cppu
 {
diff --git a/include/cppuhelper/compbase2.hxx b/include/cppuhelper/compbase2.hxx
index 3534f8a1885e..dda2507e34f9 100644
--- a/include/cppuhelper/compbase2.hxx
+++ b/include/cppuhelper/compbase2.hxx
@@ -19,8 +19,8 @@
 #ifndef INCLUDED_CPPUHELPER_COMPBASE2_HXX
 #define INCLUDED_CPPUHELPER_COMPBASE2_HXX
 
-#include <cppuhelper/implbase2.hxx>
-#include <cppuhelper/compbase_ex.hxx>
+#include "cppuhelper/implbase2.hxx"
+#include "cppuhelper/compbase_ex.hxx"
 
 namespace cppu
 {
diff --git a/include/cppuhelper/compbase3.hxx b/include/cppuhelper/compbase3.hxx
index 34fb477582b9..f36eecf9c7ad 100644
--- a/include/cppuhelper/compbase3.hxx
+++ b/include/cppuhelper/compbase3.hxx
@@ -19,8 +19,8 @@
 #ifndef INCLUDED_CPPUHELPER_COMPBASE3_HXX
 #define INCLUDED_CPPUHELPER_COMPBASE3_HXX
 
-#include <cppuhelper/implbase3.hxx>
-#include <cppuhelper/compbase_ex.hxx>
+#include "cppuhelper/implbase3.hxx"
+#include "cppuhelper/compbase_ex.hxx"
 
 namespace cppu
 {
diff --git a/include/cppuhelper/compbase4.hxx b/include/cppuhelper/compbase4.hxx
index b3d1a263ed03..eeabc6995d77 100644
--- a/include/cppuhelper/compbase4.hxx
+++ b/include/cppuhelper/compbase4.hxx
@@ -19,8 +19,8 @@
 #ifndef INCLUDED_CPPUHELPER_COMPBASE4_HXX
 #define INCLUDED_CPPUHELPER_COMPBASE4_HXX
 
-#include <cppuhelper/implbase4.hxx>
-#include <cppuhelper/compbase_ex.hxx>
+#include "cppuhelper/implbase4.hxx"
+#include "cppuhelper/compbase_ex.hxx"
 
 namespace cppu
 {
diff --git a/include/cppuhelper/compbase5.hxx b/include/cppuhelper/compbase5.hxx
index 5e583aa3ff13..7f279e553dc0 100644
--- a/include/cppuhelper/compbase5.hxx
+++ b/include/cppuhelper/compbase5.hxx
@@ -19,8 +19,8 @@
 #ifndef INCLUDED_CPPUHELPER_COMPBASE5_HXX
 #define INCLUDED_CPPUHELPER_COMPBASE5_HXX
 
-#include <cppuhelper/implbase5.hxx>
-#include <cppuhelper/compbase_ex.hxx>
+#include "cppuhelper/implbase5.hxx"
+#include "cppuhelper/compbase_ex.hxx"
 
 namespace cppu
 {
diff --git a/include/cppuhelper/compbase6.hxx b/include/cppuhelper/compbase6.hxx
index 1ae3a95dd443..a491abc9b40d 100644
--- a/include/cppuhelper/compbase6.hxx
+++ b/include/cppuhelper/compbase6.hxx
@@ -19,8 +19,8 @@
 #ifndef INCLUDED_CPPUHELPER_COMPBASE6_HXX
 #define INCLUDED_CPPUHELPER_COMPBASE6_HXX
 
-#include <cppuhelper/implbase6.hxx>
-#include <cppuhelper/compbase_ex.hxx>
+#include "cppuhelper/implbase6.hxx"
+#include "cppuhelper/compbase_ex.hxx"
 
 namespace cppu
 {
diff --git a/include/cppuhelper/compbase7.hxx b/include/cppuhelper/compbase7.hxx
index ee4a9b445a56..8d3ed55d635e 100644
--- a/include/cppuhelper/compbase7.hxx
+++ b/include/cppuhelper/compbase7.hxx
@@ -19,8 +19,8 @@
 #ifndef INCLUDED_CPPUHELPER_COMPBASE7_HXX
 #define INCLUDED_CPPUHELPER_COMPBASE7_HXX
 
-#include <cppuhelper/implbase7.hxx>
-#include <cppuhelper/compbase_ex.hxx>
+#include "cppuhelper/implbase7.hxx"
+#include "cppuhelper/compbase_ex.hxx"
 
 namespace cppu
 {
diff --git a/include/cppuhelper/compbase8.hxx b/include/cppuhelper/compbase8.hxx
index 89b30358c805..b9dab2ceefc5 100644
--- a/include/cppuhelper/compbase8.hxx
+++ b/include/cppuhelper/compbase8.hxx
@@ -19,8 +19,8 @@
 #ifndef INCLUDED_CPPUHELPER_COMPBASE8_HXX
 #define INCLUDED_CPPUHELPER_COMPBASE8_HXX
 
-#include <cppuhelper/implbase8.hxx>
-#include <cppuhelper/compbase_ex.hxx>
+#include "cppuhelper/implbase8.hxx"
+#include "cppuhelper/compbase_ex.hxx"
 
 namespace cppu
 {
diff --git a/include/cppuhelper/compbase9.hxx b/include/cppuhelper/compbase9.hxx
index 78cd2b96e0d9..c07f56bd467b 100644
--- a/include/cppuhelper/compbase9.hxx
+++ b/include/cppuhelper/compbase9.hxx
@@ -19,8 +19,8 @@
 #ifndef INCLUDED_CPPUHELPER_COMPBASE9_HXX
 #define INCLUDED_CPPUHELPER_COMPBASE9_HXX
 
-#include <cppuhelper/implbase9.hxx>
-#include <cppuhelper/compbase_ex.hxx>
+#include "cppuhelper/implbase9.hxx"
+#include "cppuhelper/compbase_ex.hxx"
 
 namespace cppu
 {
diff --git a/include/cppuhelper/compbase_ex.hxx b/include/cppuhelper/compbase_ex.hxx
index 28535e8bb6ca..6a3f0000c992 100644
--- a/include/cppuhelper/compbase_ex.hxx
+++ b/include/cppuhelper/compbase_ex.hxx
@@ -19,10 +19,10 @@
 #ifndef INCLUDED_CPPUHELPER_COMPBASE_EX_HXX
 #define INCLUDED_CPPUHELPER_COMPBASE_EX_HXX
 
-#include <cppuhelper/implbase_ex.hxx>
-#include <cppuhelper/interfacecontainer.h>
-#include <com/sun/star/lang/XComponent.hpp>
-#include <cppuhelper/cppuhelperdllapi.h>
+#include "cppuhelper/implbase_ex.hxx"
+#include "cppuhelper/interfacecontainer.h"
+#include "com/sun/star/lang/XComponent.hpp"
+#include "cppuhelper/cppuhelperdllapi.h"
 
 /// @cond INTERNAL
 
diff --git a/include/cppuhelper/component.hxx b/include/cppuhelper/component.hxx
index d6b45a825222..e9f50a8f8bd7 100644
--- a/include/cppuhelper/component.hxx
+++ b/include/cppuhelper/component.hxx
@@ -19,14 +19,14 @@
 #ifndef INCLUDED_CPPUHELPER_COMPONENT_HXX
 #define INCLUDED_CPPUHELPER_COMPONENT_HXX
 
-#include <cppuhelper/weakagg.hxx>
-#include <cppuhelper/interfacecontainer.h>
+#include "cppuhelper/weakagg.hxx"
+#include "cppuhelper/interfacecontainer.h"
 
-#include <cppuhelper/implbase1.hxx>
+#include "cppuhelper/implbase1.hxx"
 
-#include <com/sun/star/lang/XComponent.hpp>
+#include "com/sun/star/lang/XComponent.hpp"
 
-#include <cppuhelper/cppuhelperdllapi.h>
+#include "cppuhelper/cppuhelperdllapi.h"
 
 namespace osl { class Mutex; }
 
diff --git a/include/cppuhelper/component_context.hxx b/include/cppuhelper/component_context.hxx
index bd52ce92d9f0..e0a67845b770 100644
--- a/include/cppuhelper/component_context.hxx
+++ b/include/cppuhelper/component_context.hxx
@@ -19,12 +19,12 @@
 #ifndef INCLUDED_CPPUHELPER_COMPONENT_CONTEXT_HXX
 #define INCLUDED_CPPUHELPER_COMPONENT_CONTEXT_HXX
 
-#include <com/sun/star/uno/XComponentContext.hpp>
-#include <com/sun/star/uno/Any.hxx>
-#include <com/sun/star/uno/Reference.hxx>
-#include <cppuhelper/cppuhelperdllapi.h>
-#include <rtl/ustring.hxx>
-#include <sal/types.h>
+#include "com/sun/star/uno/XComponentContext.hpp"
+#include "com/sun/star/uno/Any.hxx"
+#include "com/sun/star/uno/Reference.hxx"
+#include "cppuhelper/cppuhelperdllapi.h"
+#include "rtl/ustring.hxx"
+#include "sal/types.h"
 
 
 namespace cppu
diff --git a/include/cppuhelper/cppuhelperdllapi.h b/include/cppuhelper/cppuhelperdllapi.h
index c7662763556a..1eff7bedc313 100644
--- a/include/cppuhelper/cppuhelperdllapi.h
+++ b/include/cppuhelper/cppuhelperdllapi.h
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_CPPUHELPER_CPPUHELPERDLLAPI_H
 #define INCLUDED_CPPUHELPER_CPPUHELPERDLLAPI_H
 
-#include <sal/types.h>
+#include "sal/types.h"
 
 #if defined(CPPUHELPER_DLLIMPLEMENTATION)
 #define CPPUHELPER_DLLPUBLIC  SAL_DLLPUBLIC_EXPORT
diff --git a/include/cppuhelper/exc_hlp.hxx b/include/cppuhelper/exc_hlp.hxx
index 3d54b59c269a..ea7353693936 100644
--- a/include/cppuhelper/exc_hlp.hxx
+++ b/include/cppuhelper/exc_hlp.hxx
@@ -20,8 +20,8 @@
 #ifndef INCLUDED_CPPUHELPER_EXC_HLP_HXX
 #define INCLUDED_CPPUHELPER_EXC_HLP_HXX
 
-#include <com/sun/star/uno/Any.hxx>
-#include <cppuhelper/cppuhelperdllapi.h>
+#include "com/sun/star/uno/Any.hxx"
+#include "cppuhelper/cppuhelperdllapi.h"
 
 namespace cppu
 {
diff --git a/include/cppuhelper/factory.hxx b/include/cppuhelper/factory.hxx
index 062252e92f4e..aa5fdf6dad7c 100644
--- a/include/cppuhelper/factory.hxx
+++ b/include/cppuhelper/factory.hxx
@@ -19,19 +19,19 @@
 #ifndef INCLUDED_CPPUHELPER_FACTORY_HXX
 #define INCLUDED_CPPUHELPER_FACTORY_HXX
 
-#include <sal/config.h>
+#include "sal/config.h"
 
 #include <cstddef>
 
-#include <rtl/ustring.hxx>
-#include <rtl/unload.h>
+#include "rtl/ustring.hxx"
+#include "rtl/unload.h"
 
-#include <com/sun/star/uno/XComponentContext.hpp>
-#include <com/sun/star/lang/XSingleComponentFactory.hpp>
-#include <com/sun/star/lang/XSingleServiceFactory.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/registry/XRegistryKey.hpp>
-#include <cppuhelper/cppuhelperdllapi.h>
+#include "com/sun/star/uno/XComponentContext.hpp"
+#include "com/sun/star/lang/XSingleComponentFactory.hpp"
+#include "com/sun/star/lang/XSingleServiceFactory.hpp"
+#include "com/sun/star/lang/XMultiServiceFactory.hpp"
+#include "com/sun/star/registry/XRegistryKey.hpp"
+#include "cppuhelper/cppuhelperdllapi.h"
 
 
 #define COMPONENT_GETENV            "component_getImplementationEnvironment"
diff --git a/include/cppuhelper/findsofficepath.h b/include/cppuhelper/findsofficepath.h
index d06cc32cbf1c..d7e2d3847e65 100644
--- a/include/cppuhelper/findsofficepath.h
+++ b/include/cppuhelper/findsofficepath.h
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_CPPUHELPER_FINDSOFFICEPATH_H
 #define INCLUDED_CPPUHELPER_FINDSOFFICEPATH_H
 
-#include <sal/config.h>
+#include "sal/config.h"
 
 #if defined __cplusplus
 extern "C" {
diff --git a/include/cppuhelper/implbase.hxx b/include/cppuhelper/implbase.hxx
index 7d46d47edd31..cfd68022c1e6 100644
--- a/include/cppuhelper/implbase.hxx
+++ b/include/cppuhelper/implbase.hxx
@@ -20,21 +20,21 @@
 #ifndef INCLUDED_CPPUHELPER_IMPLBASE_HXX
 #define INCLUDED_CPPUHELPER_IMPLBASE_HXX
 
-#include <sal/config.h>
+#include "sal/config.h"
 
 #include <cstddef>
 #include <exception>
 #include <utility>
 
-#include <com/sun/star/lang/XTypeProvider.hpp>
-#include <com/sun/star/uno/Any.hxx>
-#include <com/sun/star/uno/RuntimeException.hpp>
-#include <com/sun/star/uno/Sequence.hxx>
-#include <com/sun/star/uno/Type.hxx>
-#include <cppuhelper/implbase_ex.hxx>
-#include <cppuhelper/weak.hxx>
-#include <rtl/instance.hxx>
-#include <sal/types.h>
+#include "com/sun/star/lang/XTypeProvider.hpp"
+#include "com/sun/star/uno/Any.hxx"
+#include "com/sun/star/uno/RuntimeException.hpp"
+#include "com/sun/star/uno/Sequence.hxx"
+#include "com/sun/star/uno/Type.hxx"
+#include "cppuhelper/implbase_ex.hxx"
+#include "cppuhelper/weak.hxx"
+#include "rtl/instance.hxx"
+#include "sal/types.h"
 
 #if defined LIBO_INTERNAL_ONLY
 
diff --git a/include/cppuhelper/implbase1.hxx b/include/cppuhelper/implbase1.hxx
index 3f93735a823d..395723fe98e0 100644
--- a/include/cppuhelper/implbase1.hxx
+++ b/include/cppuhelper/implbase1.hxx
@@ -19,8 +19,8 @@
 #ifndef INCLUDED_CPPUHELPER_IMPLBASE1_HXX
 #define INCLUDED_CPPUHELPER_IMPLBASE1_HXX
 
-#include <cppuhelper/implbase_ex.hxx>
-#include <rtl/instance.hxx>
+#include "cppuhelper/implbase_ex.hxx"
+#include "rtl/instance.hxx"
 
 namespace cppu
 {
diff --git a/include/cppuhelper/implbase10.hxx b/include/cppuhelper/implbase10.hxx
index 7b1e5920505d..75d4e10d1203 100644
--- a/include/cppuhelper/implbase10.hxx
+++ b/include/cppuhelper/implbase10.hxx
@@ -19,8 +19,8 @@
 #ifndef INCLUDED_CPPUHELPER_IMPLBASE10_HXX
 #define INCLUDED_CPPUHELPER_IMPLBASE10_HXX
 
-#include <cppuhelper/implbase_ex.hxx>
-#include <rtl/instance.hxx>
+#include "cppuhelper/implbase_ex.hxx"
+#include "rtl/instance.hxx"
 
 namespace cppu
 {
diff --git a/include/cppuhelper/implbase11.hxx b/include/cppuhelper/implbase11.hxx
index 2eccf402e3f9..6082880d88e7 100644
--- a/include/cppuhelper/implbase11.hxx
+++ b/include/cppuhelper/implbase11.hxx
@@ -19,8 +19,8 @@
 #ifndef INCLUDED_CPPUHELPER_IMPLBASE11_HXX
 #define INCLUDED_CPPUHELPER_IMPLBASE11_HXX
 
-#include <cppuhelper/implbase_ex.hxx>
-#include <rtl/instance.hxx>
+#include "cppuhelper/implbase_ex.hxx"
+#include "rtl/instance.hxx"
 
 namespace cppu
 {
diff --git a/include/cppuhelper/implbase12.hxx b/include/cppuhelper/implbase12.hxx
index e63e1bab0be5..b126d925cb67 100644
--- a/include/cppuhelper/implbase12.hxx
+++ b/include/cppuhelper/implbase12.hxx
@@ -19,8 +19,8 @@
 #ifndef INCLUDED_CPPUHELPER_IMPLBASE12_HXX
 #define INCLUDED_CPPUHELPER_IMPLBASE12_HXX
 
-#include <cppuhelper/implbase_ex.hxx>
-#include <rtl/instance.hxx>
+#include "cppuhelper/implbase_ex.hxx"
+#include "rtl/instance.hxx"
 
 namespace cppu
 {
diff --git a/include/cppuhelper/implbase13.hxx b/include/cppuhelper/implbase13.hxx
index 4f4aac6c6613..61dd1646dafd 100644
--- a/include/cppuhelper/implbase13.hxx
+++ b/include/cppuhelper/implbase13.hxx
@@ -19,8 +19,8 @@
 #ifndef INCLUDED_CPPUHELPER_IMPLBASE13_HXX
 #define INCLUDED_CPPUHELPER_IMPLBASE13_HXX
 
-#include <cppuhelper/implbase_ex.hxx>
-#include <rtl/instance.hxx>
+#include "cppuhelper/implbase_ex.hxx"
+#include "rtl/instance.hxx"
 
 namespace cppu
 {
diff --git a/include/cppuhelper/implbase2.hxx b/include/cppuhelper/implbase2.hxx
index de6c716c652f..ce67df2c4671 100644
--- a/include/cppuhelper/implbase2.hxx
+++ b/include/cppuhelper/implbase2.hxx
@@ -19,8 +19,8 @@
 #ifndef INCLUDED_CPPUHELPER_IMPLBASE2_HXX
 #define INCLUDED_CPPUHELPER_IMPLBASE2_HXX
 
-#include <cppuhelper/implbase_ex.hxx>
-#include <rtl/instance.hxx>
+#include "cppuhelper/implbase_ex.hxx"
+#include "rtl/instance.hxx"
 
 namespace cppu
 {
diff --git a/include/cppuhelper/implbase3.hxx b/include/cppuhelper/implbase3.hxx
index 47941db70929..11b78b19d585 100644
--- a/include/cppuhelper/implbase3.hxx
+++ b/include/cppuhelper/implbase3.hxx
@@ -19,8 +19,8 @@
 #ifndef INCLUDED_CPPUHELPER_IMPLBASE3_HXX
 #define INCLUDED_CPPUHELPER_IMPLBASE3_HXX
 
-#include <cppuhelper/implbase_ex.hxx>
-#include <rtl/instance.hxx>
+#include "cppuhelper/implbase_ex.hxx"
+#include "rtl/instance.hxx"
 
 namespace cppu
 {
diff --git a/include/cppuhelper/implbase4.hxx b/include/cppuhelper/implbase4.hxx
index 2a2e2cb288de..2fe3d6757418 100644
--- a/include/cppuhelper/implbase4.hxx
+++ b/include/cppuhelper/implbase4.hxx
@@ -19,8 +19,8 @@
 #ifndef INCLUDED_CPPUHELPER_IMPLBASE4_HXX
 #define INCLUDED_CPPUHELPER_IMPLBASE4_HXX
 
-#include <cppuhelper/implbase_ex.hxx>
-#include <rtl/instance.hxx>
+#include "cppuhelper/implbase_ex.hxx"
+#include "rtl/instance.hxx"
 
 namespace cppu
 {
diff --git a/include/cppuhelper/implbase5.hxx b/include/cppuhelper/implbase5.hxx
index fe6fa2653b5b..8321089e3fd0 100644
--- a/include/cppuhelper/implbase5.hxx
+++ b/include/cppuhelper/implbase5.hxx
@@ -19,8 +19,8 @@
 #ifndef INCLUDED_CPPUHELPER_IMPLBASE5_HXX
 #define INCLUDED_CPPUHELPER_IMPLBASE5_HXX
 
-#include <cppuhelper/implbase_ex.hxx>
-#include <rtl/instance.hxx>
+#include "cppuhelper/implbase_ex.hxx"
+#include "rtl/instance.hxx"
 
 namespace cppu
 {
diff --git a/include/cppuhelper/implbase6.hxx b/include/cppuhelper/implbase6.hxx
index 1dbb48167bc1..50c07d0ae314 100644
--- a/include/cppuhelper/implbase6.hxx
+++ b/include/cppuhelper/implbase6.hxx
@@ -19,8 +19,8 @@
 #ifndef INCLUDED_CPPUHELPER_IMPLBASE6_HXX
 #define INCLUDED_CPPUHELPER_IMPLBASE6_HXX
 
-#include <cppuhelper/implbase_ex.hxx>
-#include <rtl/instance.hxx>
+#include "cppuhelper/implbase_ex.hxx"
+#include "rtl/instance.hxx"
 
 namespace cppu
 {
diff --git a/include/cppuhelper/implbase7.hxx b/include/cppuhelper/implbase7.hxx
index e1ca12482e83..9c6c041d7b69 100644
--- a/include/cppuhelper/implbase7.hxx
+++ b/include/cppuhelper/implbase7.hxx
@@ -19,8 +19,8 @@
 #ifndef INCLUDED_CPPUHELPER_IMPLBASE7_HXX
 #define INCLUDED_CPPUHELPER_IMPLBASE7_HXX
 
-#include <cppuhelper/implbase_ex.hxx>
-#include <rtl/instance.hxx>
+#include "cppuhelper/implbase_ex.hxx"
+#include "rtl/instance.hxx"
 
 namespace cppu
 {
diff --git a/include/cppuhelper/implbase8.hxx b/include/cppuhelper/implbase8.hxx
index 279b3206d613..1c02b961c00d 100644
--- a/include/cppuhelper/implbase8.hxx
+++ b/include/cppuhelper/implbase8.hxx
@@ -19,8 +19,8 @@
 #ifndef INCLUDED_CPPUHELPER_IMPLBASE8_HXX
 #define INCLUDED_CPPUHELPER_IMPLBASE8_HXX
 
-#include <cppuhelper/implbase_ex.hxx>
-#include <rtl/instance.hxx>
+#include "cppuhelper/implbase_ex.hxx"
+#include "rtl/instance.hxx"
 
 namespace cppu
 {
diff --git a/include/cppuhelper/implbase9.hxx b/include/cppuhelper/implbase9.hxx
index 09bb6c69a4c1..ece67befea76 100644
--- a/include/cppuhelper/implbase9.hxx
+++ b/include/cppuhelper/implbase9.hxx
@@ -19,8 +19,8 @@
 #ifndef INCLUDED_CPPUHELPER_IMPLBASE9_HXX
 #define INCLUDED_CPPUHELPER_IMPLBASE9_HXX
 
-#include <cppuhelper/implbase_ex.hxx>
-#include <rtl/instance.hxx>
+#include "cppuhelper/implbase_ex.hxx"
+#include "rtl/instance.hxx"
 
 namespace cppu
 {
diff --git a/include/cppuhelper/implbase_ex.hxx b/include/cppuhelper/implbase_ex.hxx
index d8711f17bb79..922f5ac68475 100644
--- a/include/cppuhelper/implbase_ex.hxx
+++ b/include/cppuhelper/implbase_ex.hxx
@@ -19,9 +19,9 @@
 #ifndef INCLUDED_CPPUHELPER_IMPLBASE_EX_HXX
 #define INCLUDED_CPPUHELPER_IMPLBASE_EX_HXX
 
-#include <cppuhelper/weak.hxx>
-#include <cppuhelper/weakagg.hxx>
-#include <com/sun/star/lang/XTypeProvider.hpp>
+#include "cppuhelper/weak.hxx"
+#include "cppuhelper/weakagg.hxx"
+#include "com/sun/star/lang/XTypeProvider.hpp"
 
 
 /* If you need to define implementation helper classes that deal with more than
diff --git a/include/cppuhelper/implementationentry.hxx b/include/cppuhelper/implementationentry.hxx
index 36bf15af138d..23f40a7f7453 100644
--- a/include/cppuhelper/implementationentry.hxx
+++ b/include/cppuhelper/implementationentry.hxx
@@ -19,8 +19,8 @@
 #ifndef INCLUDED_CPPUHELPER_IMPLEMENTATIONENTRY_HXX
 #define INCLUDED_CPPUHELPER_IMPLEMENTATIONENTRY_HXX
 
-#include <cppuhelper/factory.hxx>
-#include <cppuhelper/cppuhelperdllapi.h>
+#include "cppuhelper/factory.hxx"
+#include "cppuhelper/cppuhelperdllapi.h"
 
 namespace cppu
 {
diff --git a/include/cppuhelper/interfacecontainer.h b/include/cppuhelper/interfacecontainer.h
index 0049cb8e2b75..58298e3e9490 100644
--- a/include/cppuhelper/interfacecontainer.h
+++ b/include/cppuhelper/interfacecontainer.h
@@ -19,22 +19,22 @@
 #ifndef INCLUDED_CPPUHELPER_INTERFACECONTAINER_H
 #define INCLUDED_CPPUHELPER_INTERFACECONTAINER_H
 
-#include <sal/config.h>
+#include "sal/config.h"
 
 #include <cstddef>
 #include <functional>
 #include <vector>
 #include <utility>
 
-#include <osl/diagnose.h>
-#include <osl/mutex.hxx>
-#include <rtl/alloc.h>
-#include <com/sun/star/uno/Sequence.hxx>
-#include <com/sun/star/uno/XInterface.hpp>
-#include <com/sun/star/lang/EventObject.hpp>
+#include "osl/diagnose.h"
+#include "osl/mutex.hxx"
+#include "rtl/alloc.h"
+#include "com/sun/star/uno/Sequence.hxx"
+#include "com/sun/star/uno/XInterface.hpp"
+#include "com/sun/star/lang/EventObject.hpp"
 
-#include <com/sun/star/lang/DisposedException.hpp>
-#include <cppuhelper/cppuhelperdllapi.h>
+#include "com/sun/star/lang/DisposedException.hpp"
+#include "cppuhelper/cppuhelperdllapi.h"
 
 /** */ //for docpp
 namespace cppu
diff --git a/include/cppuhelper/interfacecontainer.hxx b/include/cppuhelper/interfacecontainer.hxx
index 6b765ba2bccd..b30adbab96c3 100644
--- a/include/cppuhelper/interfacecontainer.hxx
+++ b/include/cppuhelper/interfacecontainer.hxx
@@ -19,11 +19,11 @@
 #ifndef INCLUDED_CPPUHELPER_INTERFACECONTAINER_HXX
 #define INCLUDED_CPPUHELPER_INTERFACECONTAINER_HXX
 
-#include <sal/config.h>
+#include "sal/config.h"
 
 #include <cstddef>
 
-#include <cppuhelper/interfacecontainer.h>
+#include "cppuhelper/interfacecontainer.h"
 
 
 namespace cppu
diff --git a/include/cppuhelper/propertysetmixin.hxx b/include/cppuhelper/propertysetmixin.hxx
index fb112fea09cb..c50da4591b70 100644
--- a/include/cppuhelper/propertysetmixin.hxx
+++ b/include/cppuhelper/propertysetmixin.hxx
@@ -20,22 +20,22 @@
 #ifndef INCLUDED_CPPUHELPER_PROPERTYSETMIXIN_HXX
 #define INCLUDED_CPPUHELPER_PROPERTYSETMIXIN_HXX
 
-#include <sal/config.h>
+#include "sal/config.h"
 
 #include <exception>
 
-#include <com/sun/star/beans/PropertyVetoException.hpp>
-#include <com/sun/star/beans/UnknownPropertyException.hpp>
-#include <com/sun/star/beans/XFastPropertySet.hpp>
-#include <com/sun/star/beans/XPropertyAccess.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/lang/IllegalArgumentException.hpp>
-#include <com/sun/star/lang/WrappedTargetException.hpp>
-#include <com/sun/star/uno/Reference.hxx>
-#include <com/sun/star/uno/RuntimeException.hpp>
-#include <com/sun/star/uno/Sequence.hxx>
-#include <sal/types.h>
-#include <cppuhelper/cppuhelperdllapi.h>
+#include "com/sun/star/beans/PropertyVetoException.hpp"
+#include "com/sun/star/beans/UnknownPropertyException.hpp"
+#include "com/sun/star/beans/XFastPropertySet.hpp"
+#include "com/sun/star/beans/XPropertyAccess.hpp"
+#include "com/sun/star/beans/XPropertySet.hpp"
+#include "com/sun/star/lang/IllegalArgumentException.hpp"
+#include "com/sun/star/lang/WrappedTargetException.hpp"
+#include "com/sun/star/uno/Reference.hxx"
+#include "com/sun/star/uno/RuntimeException.hpp"
+#include "com/sun/star/uno/Sequence.hxx"
+#include "sal/types.h"
+#include "cppuhelper/cppuhelperdllapi.h"
 
 namespace com { namespace sun { namespace star {
     namespace beans {
diff --git a/include/cppuhelper/propshlp.hxx b/include/cppuhelper/propshlp.hxx
index 31a91b425112..d9eb0c493741 100644
--- a/include/cppuhelper/propshlp.hxx
+++ b/include/cppuhelper/propshlp.hxx
@@ -20,16 +20,16 @@
 #ifndef INCLUDED_CPPUHELPER_PROPSHLP_HXX
 #define INCLUDED_CPPUHELPER_PROPSHLP_HXX
 
-#include <rtl/alloc.h>
+#include "rtl/alloc.h"
 
-#include <cppuhelper/interfacecontainer.h>
+#include "cppuhelper/interfacecontainer.h"
 
-#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/beans/XPropertySetOption.hpp>
-#include <com/sun/star/beans/XMultiPropertySet.hpp>
-#include <com/sun/star/beans/XFastPropertySet.hpp>
+#include "com/sun/star/beans/XPropertySet.hpp"
+#include "com/sun/star/beans/XPropertySetOption.hpp"
+#include "com/sun/star/beans/XMultiPropertySet.hpp"
+#include "com/sun/star/beans/XFastPropertySet.hpp"
 
-#include <cppuhelper/cppuhelperdllapi.h>
+#include "cppuhelper/cppuhelperdllapi.h"
 
 
 namespace cppu
diff --git a/include/cppuhelper/proptypehlp.h b/include/cppuhelper/proptypehlp.h
index ad44bdf39781..dcd2cd16c6bc 100644
--- a/include/cppuhelper/proptypehlp.h
+++ b/include/cppuhelper/proptypehlp.h
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_CPPUHELPER_PROPTYPEHLP_H
 #define INCLUDED_CPPUHELPER_PROPTYPEHLP_H
 
-#include <com/sun/star/uno/Any.h>
+#include "com/sun/star/uno/Any.h"
 
 
 namespace cppu {
diff --git a/include/cppuhelper/proptypehlp.hxx b/include/cppuhelper/proptypehlp.hxx
index bcaefca97470..d598f9d1f2aa 100644
--- a/include/cppuhelper/proptypehlp.hxx
+++ b/include/cppuhelper/proptypehlp.hxx
@@ -20,9 +20,9 @@
 #ifndef INCLUDED_CPPUHELPER_PROPTYPEHLP_HXX
 #define INCLUDED_CPPUHELPER_PROPTYPEHLP_HXX
 
-#include <cppuhelper/proptypehlp.h>
-#include <com/sun/star/lang/IllegalArgumentException.hpp>
-#include <com/sun/star/uno/TypeClass.hpp>
+#include "cppuhelper/proptypehlp.h"
+#include "com/sun/star/lang/IllegalArgumentException.hpp"
+#include "com/sun/star/uno/TypeClass.hpp"
 
 namespace cppu
 {
diff --git a/include/cppuhelper/queryinterface.hxx b/include/cppuhelper/queryinterface.hxx
index 0fe2f5a99605..0d662943695c 100644
--- a/include/cppuhelper/queryinterface.hxx
+++ b/include/cppuhelper/queryinterface.hxx
@@ -20,10 +20,10 @@
 #ifndef INCLUDED_CPPUHELPER_QUERYINTERFACE_HXX
 #define INCLUDED_CPPUHELPER_QUERYINTERFACE_HXX
 
-#include <sal/config.h>
-#include <com/sun/star/uno/Any.hxx>
-#include <com/sun/star/uno/Type.hxx>
-#include <sal/types.h>
+#include "sal/config.h"
+#include "com/sun/star/uno/Any.hxx"
+#include "com/sun/star/uno/Type.hxx"
+#include "sal/types.h"
 
 namespace cppu
 {
diff --git a/include/cppuhelper/shlib.hxx b/include/cppuhelper/shlib.hxx
index 8fec1fd4e6bd..83e77daa3145 100644
--- a/include/cppuhelper/shlib.hxx
+++ b/include/cppuhelper/shlib.hxx
@@ -19,9 +19,9 @@
 #ifndef INCLUDED_CPPUHELPER_SHLIB_HXX
 #define INCLUDED_CPPUHELPER_SHLIB_HXX
 
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/registry/XRegistryKey.hpp>
-#include <cppuhelper/cppuhelperdllapi.h>
+#include "com/sun/star/lang/XMultiServiceFactory.hpp"
+#include "com/sun/star/registry/XRegistryKey.hpp"
+#include "cppuhelper/cppuhelperdllapi.h"
 
 
 namespace cppu
diff --git a/include/cppuhelper/supportsservice.hxx b/include/cppuhelper/supportsservice.hxx
index 0a1bee42f926..4a21e0faa693 100644
--- a/include/cppuhelper/supportsservice.hxx
+++ b/include/cppuhelper/supportsservice.hxx
@@ -10,9 +10,9 @@
 #ifndef INCLUDED_CPPUHELPER_SUPPORTSSERVICE_HXX
 #define INCLUDED_CPPUHELPER_SUPPORTSSERVICE_HXX
 
-#include <sal/config.h>
+#include "sal/config.h"
 
-#include <cppuhelper/cppuhelperdllapi.h>
+#include "cppuhelper/cppuhelperdllapi.h"
 
 namespace com { namespace sun { namespace star { namespace lang {
     class XServiceInfo;
diff --git a/include/cppuhelper/typeprovider.hxx b/include/cppuhelper/typeprovider.hxx
index 912f90865e04..fec7ea2efc84 100644
--- a/include/cppuhelper/typeprovider.hxx
+++ b/include/cppuhelper/typeprovider.hxx
@@ -19,13 +19,13 @@
 #ifndef INCLUDED_CPPUHELPER_TYPEPROVIDER_HXX
 #define INCLUDED_CPPUHELPER_TYPEPROVIDER_HXX
 
-#include <sal/config.h>
+#include "sal/config.h"
 
 #include <cstddef>
 
-#include <rtl/alloc.h>
-#include <com/sun/star/uno/Sequence.hxx>
-#include <cppuhelper/cppuhelperdllapi.h>
+#include "rtl/alloc.h"
+#include "com/sun/star/uno/Sequence.hxx"
+#include "cppuhelper/cppuhelperdllapi.h"
 
 
 namespace cppu
diff --git a/include/cppuhelper/unourl.hxx b/include/cppuhelper/unourl.hxx
index e31ef6bf5cff..8771c0c44396 100644
--- a/include/cppuhelper/unourl.hxx
+++ b/include/cppuhelper/unourl.hxx
@@ -20,9 +20,9 @@
 #ifndef INCLUDED_CPPUHELPER_UNOURL_HXX
 #define INCLUDED_CPPUHELPER_UNOURL_HXX
 
-#include <sal/config.h>
+#include "sal/config.h"
 
-#include <cppuhelper/cppuhelperdllapi.h>
+#include "cppuhelper/cppuhelperdllapi.h"
 
 namespace rtl { class OUString; }
 
diff --git a/include/cppuhelper/weak.hxx b/include/cppuhelper/weak.hxx
index 44e026743d2a..a6471149c39e 100644
--- a/include/cppuhelper/weak.hxx
+++ b/include/cppuhelper/weak.hxx
@@ -21,10 +21,10 @@
 
 #include <cassert>
 #include <cstddef>
-#include <osl/interlck.h>
-#include <rtl/alloc.h>
-#include <com/sun/star/uno/XWeak.hpp>
-#include <cppuhelper/cppuhelperdllapi.h>
+#include "osl/interlck.h"
+#include "rtl/alloc.h"
+#include "com/sun/star/uno/XWeak.hpp"
+#include "cppuhelper/cppuhelperdllapi.h"
 
 
 namespace cppu
diff --git a/include/cppuhelper/weakagg.hxx b/include/cppuhelper/weakagg.hxx
index 03754f3ec06f..3ca7a51cdf85 100644
--- a/include/cppuhelper/weakagg.hxx
+++ b/include/cppuhelper/weakagg.hxx
@@ -19,10 +19,10 @@
 #ifndef INCLUDED_CPPUHELPER_WEAKAGG_HXX
 #define INCLUDED_CPPUHELPER_WEAKAGG_HXX
 
-#include <cppuhelper/weak.hxx>
-#include <cppuhelper/weakref.hxx>
-#include <com/sun/star/uno/XAggregation.hpp>
-#include <cppuhelper/cppuhelperdllapi.h>
+#include "cppuhelper/weak.hxx"
+#include "cppuhelper/weakref.hxx"
+#include "com/sun/star/uno/XAggregation.hpp"
+#include "cppuhelper/cppuhelperdllapi.h"
 
 
 namespace cppu
diff --git a/include/cppuhelper/weakref.hxx b/include/cppuhelper/weakref.hxx
index 1afdd864f136..cd05d3bee39b 100644
--- a/include/cppuhelper/weakref.hxx
+++ b/include/cppuhelper/weakref.hxx
@@ -19,13 +19,13 @@
 #ifndef INCLUDED_CPPUHELPER_WEAKREF_HXX
 #define INCLUDED_CPPUHELPER_WEAKREF_HXX
 
-#include <sal/config.h>
+#include "sal/config.h"
 
 #include <cstddef>
 
-#include <com/sun/star/uno/Reference.hxx>
-#include <com/sun/star/uno/XInterface.hpp>
-#include <cppuhelper/cppuhelperdllapi.h>
+#include "com/sun/star/uno/Reference.hxx"
+#include "com/sun/star/uno/XInterface.hpp"
+#include "cppuhelper/cppuhelperdllapi.h"
 
 
 namespace com
diff --git a/include/osl/conditn.h b/include/osl/conditn.h
index ace66c624d15..785834bb103f 100644
--- a/include/osl/conditn.h
+++ b/include/osl/conditn.h
@@ -20,10 +20,10 @@
 #ifndef INCLUDED_OSL_CONDITN_H
 #define INCLUDED_OSL_CONDITN_H
 
-#include <sal/config.h>
+#include "sal/config.h"
 
-#include <osl/time.h>
-#include <sal/saldllapi.h>
+#include "osl/time.h"
+#include "sal/saldllapi.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/osl/conditn.hxx b/include/osl/conditn.hxx
index d7bd1d9a7c13..2bfe5466ba34 100644
--- a/include/osl/conditn.hxx
+++ b/include/osl/conditn.hxx
@@ -20,12 +20,12 @@
 #ifndef INCLUDED_OSL_CONDITN_HXX
 #define INCLUDED_OSL_CONDITN_HXX
 
-#include <sal/config.h>
+#include "sal/config.h"
 
 #include <cstddef>
 
-#include <osl/time.h>
-#include <osl/conditn.h>
+#include "osl/time.h"
+#include "osl/conditn.h"
 
 #if defined(MACOSX) && defined(__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES)
 #   if __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES == 1
diff --git a/include/osl/detail/file.h b/include/osl/detail/file.h
index ee5a172920ad..23c41efbe77c 100644
--- a/include/osl/detail/file.h
+++ b/include/osl/detail/file.h
@@ -10,7 +10,7 @@
 #ifndef INCLUDED_OSL_DETAIL_FILE_H
 #define INCLUDED_OSL_DETAIL_FILE_H
 
-#include <sal/config.h>
+#include "sal/config.h"
 
 /** @cond INTERNAL */
 
diff --git a/include/osl/diagnose.h b/include/osl/diagnose.h
index 748f0e472dca..9f0d90468d76 100644
--- a/include/osl/diagnose.h
+++ b/include/osl/diagnose.h
@@ -21,11 +21,11 @@
 #ifndef INCLUDED_OSL_DIAGNOSE_H
 #define INCLUDED_OSL_DIAGNOSE_H
 
-#include <sal/config.h>
+#include "sal/config.h"
 
-#include <sal/detail/log.h>
-#include <sal/saldllapi.h>
-#include <sal/types.h>
+#include "sal/detail/log.h"
+#include "sal/saldllapi.h"
+#include "sal/types.h"
 
 /** @file
     Provides simple diagnostic support.
diff --git a/include/osl/diagnose.hxx b/include/osl/diagnose.hxx
index 0472ea42ea66..0dc140faef83 100644
--- a/include/osl/diagnose.hxx
+++ b/include/osl/diagnose.hxx
@@ -21,19 +21,19 @@
 
 /// @cond INTERNAL
 
-#include <sal/config.h>
+#include "sal/config.h"
 
 #include <cstddef>
 #include <typeinfo>
 #include <unordered_set>
 
-#include <osl/diagnose.h>
-#include <osl/interlck.h>
-#include <osl/mutex.hxx>
-#include <rtl/instance.hxx>
-#include <sal/log.hxx>
-#include <sal/saldllapi.h>
-#include <sal/types.h>
+#include "osl/diagnose.h"
+#include "osl/interlck.h"
+#include "osl/mutex.hxx"
+#include "rtl/instance.hxx"
+#include "sal/log.hxx"
+#include "sal/saldllapi.h"
+#include "sal/types.h"
 
 namespace osl {
 namespace detail {
diff --git a/include/osl/endian.h b/include/osl/endian.h
index 9a92e25eb98c..9ead0044aea5 100644
--- a/include/osl/endian.h
+++ b/include/osl/endian.h
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_OSL_ENDIAN_H
 #define INCLUDED_OSL_ENDIAN_H
 
-#include <sal/types.h>
+#include "sal/types.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/osl/file.h b/include/osl/file.h
index 21a5de488c48..16690882cfe1 100644
--- a/include/osl/file.h
+++ b/include/osl/file.h
@@ -20,11 +20,11 @@
 #ifndef INCLUDED_OSL_FILE_H
 #define INCLUDED_OSL_FILE_H
 
-#include <sal/config.h>
+#include "sal/config.h"
 
-#include <osl/time.h>
-#include <rtl/ustring.h>
-#include <sal/saldllapi.h>
+#include "osl/time.h"
+#include "rtl/ustring.h"
+#include "sal/saldllapi.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/osl/file.hxx b/include/osl/file.hxx
index af2ac6a0ce95..a5823fbe1174 100644
--- a/include/osl/file.hxx
+++ b/include/osl/file.hxx
@@ -20,20 +20,20 @@
 #ifndef INCLUDED_OSL_FILE_HXX
 #define INCLUDED_OSL_FILE_HXX
 
-#include <sal/config.h>
+#include "sal/config.h"
 
 #include <string.h>
 
 #include <cassert>
 #include <cstddef>
 
-#include <sal/log.hxx>
-#include <osl/time.h>
-#include <rtl/ustring.hxx>
+#include "sal/log.hxx"
+#include "osl/time.h"
+#include "rtl/ustring.hxx"
 
-#include <osl/file.h>
-#include <osl/diagnose.h>
-#include <rtl/byteseq.hxx>
+#include "osl/file.h"
+#include "osl/diagnose.h"
+#include "rtl/byteseq.hxx"
 
 #include <stdio.h>
 
diff --git a/include/osl/getglobalmutex.hxx b/include/osl/getglobalmutex.hxx
index 7ac2c673f4a9..4fbd32a3e4b5 100644
--- a/include/osl/getglobalmutex.hxx
+++ b/include/osl/getglobalmutex.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_OSL_GETGLOBALMUTEX_HXX
 #define INCLUDED_OSL_GETGLOBALMUTEX_HXX
 
-#include <osl/mutex.hxx>
+#include "osl/mutex.hxx"
 
 namespace osl {
 
diff --git a/include/osl/interlck.h b/include/osl/interlck.h
index 0b26f9a02712..a98c08cb511c 100644
--- a/include/osl/interlck.h
+++ b/include/osl/interlck.h
@@ -20,10 +20,10 @@
 #ifndef INCLUDED_OSL_INTERLCK_H
 #define INCLUDED_OSL_INTERLCK_H
 
-#include <sal/config.h>
+#include "sal/config.h"
 
-#include <sal/saldllapi.h>
-#include <sal/types.h>
+#include "sal/saldllapi.h"
+#include "sal/types.h"
 
 #if defined(_WIN32)
 #include <intrin.h>
diff --git a/include/osl/module.h b/include/osl/module.h
index 6f8468878fba..03c9a80d114a 100644
--- a/include/osl/module.h
+++ b/include/osl/module.h
@@ -20,11 +20,11 @@
 #ifndef INCLUDED_OSL_MODULE_H
 #define INCLUDED_OSL_MODULE_H
 
-#include <sal/config.h>
+#include "sal/config.h"
 
-#include <rtl/tencinfo.h>
-#include <rtl/ustring.h>
-#include <sal/saldllapi.h>
+#include "rtl/tencinfo.h"
+#include "rtl/ustring.h"
+#include "sal/saldllapi.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/osl/module.hxx b/include/osl/module.hxx
index ef5065a297c6..dcbfd373b79f 100644
--- a/include/osl/module.hxx
+++ b/include/osl/module.hxx
@@ -20,12 +20,12 @@
 #ifndef INCLUDED_OSL_MODULE_HXX
 #define INCLUDED_OSL_MODULE_HXX
 
-#include <sal/config.h>
+#include "sal/config.h"
 
 #include <cstddef>
 
-#include <rtl/ustring.hxx>
-#include <osl/module.h>
+#include "rtl/ustring.hxx"
+#include "osl/module.h"
 
 namespace osl
 {
diff --git a/include/osl/mutex.h b/include/osl/mutex.h
index 8761f33737f7..d624beb0cd86 100644
--- a/include/osl/mutex.h
+++ b/include/osl/mutex.h
@@ -20,10 +20,10 @@
 #ifndef INCLUDED_OSL_MUTEX_H
 #define INCLUDED_OSL_MUTEX_H
 
-#include <sal/config.h>
+#include "sal/config.h"
 
-#include <sal/saldllapi.h>
-#include <sal/types.h>
+#include "sal/saldllapi.h"
+#include "sal/types.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/osl/mutex.hxx b/include/osl/mutex.hxx
index f42323b9fd0a..c2ee448d868e 100644
--- a/include/osl/mutex.hxx
+++ b/include/osl/mutex.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_OSL_MUTEX_HXX
 #define INCLUDED_OSL_MUTEX_HXX
 
-#include <osl/mutex.h>
+#include "osl/mutex.h"
 
 
 namespace osl
diff --git a/include/osl/nlsupport.h b/include/osl/nlsupport.h
index 3c07707f3a19..9173151f4054 100644
--- a/include/osl/nlsupport.h
+++ b/include/osl/nlsupport.h
@@ -21,11 +21,11 @@
 #ifndef INCLUDED_OSL_NLSUPPORT_H
 #define INCLUDED_OSL_NLSUPPORT_H
 
-#include <sal/config.h>
+#include "sal/config.h"
 
-#include <rtl/locale.h>
-#include <rtl/textenc.h>
-#include <sal/saldllapi.h>
+#include "rtl/locale.h"
+#include "rtl/textenc.h"
+#include "sal/saldllapi.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/osl/pipe.h b/include/osl/pipe.h
index 5c176dd48250..4bb482e20b2a 100644
--- a/include/osl/pipe.h
+++ b/include/osl/pipe.h
@@ -21,11 +21,11 @@
 #ifndef INCLUDED_OSL_PIPE_H
 #define INCLUDED_OSL_PIPE_H
 
-#include <sal/config.h>
+#include "sal/config.h"
 
-#include <osl/security.h>
-#include <rtl/ustring.h>
-#include <sal/saldllapi.h>
+#include "osl/security.h"
+#include "rtl/ustring.h"
+#include "sal/saldllapi.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/osl/pipe.hxx b/include/osl/pipe.hxx
index 743dec393f57..40362de287a7 100644
--- a/include/osl/pipe.hxx
+++ b/include/osl/pipe.hxx
@@ -19,11 +19,11 @@
 #ifndef INCLUDED_OSL_PIPE_HXX
 #define INCLUDED_OSL_PIPE_HXX
 
-#include <sal/config.h>
+#include "sal/config.h"
 
 #include <cstddef>
 
-#include <osl/pipe_decl.hxx>
+#include "osl/pipe_decl.hxx"
 
 namespace osl
 {
diff --git a/include/osl/pipe_decl.hxx b/include/osl/pipe_decl.hxx
index 4de7bc8585ba..88247766a530 100644
--- a/include/osl/pipe_decl.hxx
+++ b/include/osl/pipe_decl.hxx
@@ -19,9 +19,9 @@
 #ifndef INCLUDED_OSL_PIPE_DECL_HXX
 #define INCLUDED_OSL_PIPE_DECL_HXX
 
-#include <osl/pipe.h>
-#   include <osl/security.hxx>
-#include <rtl/ustring.hxx>
+#include "osl/pipe.h"
+#   include "osl/security.hxx"
+#include "rtl/ustring.hxx"
 
 namespace osl {
 
diff --git a/include/osl/process.h b/include/osl/process.h
index 3c58419420d0..52aa8bd0f311 100644
--- a/include/osl/process.h
+++ b/include/osl/process.h
@@ -21,17 +21,17 @@
 #ifndef INCLUDED_OSL_PROCESS_H
 #define INCLUDED_OSL_PROCESS_H
 
-#include <sal/config.h>
-
-#include <osl/file.h>
-#include <osl/pipe.h>
-#include <osl/security.h>
-#include <osl/socket.h>
-#include <osl/time.h>
-#include <rtl/locale.h>
-#include <rtl/textenc.h>
-#include <rtl/ustring.h>
-#include <sal/saldllapi.h>
+#include "sal/config.h"
+
+#include "osl/file.h"
+#include "osl/pipe.h"
+#include "osl/security.h"
+#include "osl/socket.h"
+#include "osl/time.h"
+#include "rtl/locale.h"
+#include "rtl/textenc.h"
+#include "rtl/ustring.h"
+#include "sal/saldllapi.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/osl/profile.h b/include/osl/profile.h
index fad2670b173e..3eb87583272f 100644
--- a/include/osl/profile.h
+++ b/include/osl/profile.h
@@ -20,11 +20,11 @@
 #ifndef INCLUDED_OSL_PROFILE_H
 #define INCLUDED_OSL_PROFILE_H
 
-#include <sal/config.h>
+#include "sal/config.h"
 
-#include <rtl/ustring.h>
-#include <sal/saldllapi.h>
-#include <sal/types.h>
+#include "rtl/ustring.h"
+#include "sal/saldllapi.h"
+#include "sal/types.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/osl/profile.hxx b/include/osl/profile.hxx
index a95967d4abdf..48b6b8c861f4 100644
--- a/include/osl/profile.hxx
+++ b/include/osl/profile.hxx
@@ -20,8 +20,8 @@
 #ifndef INCLUDED_OSL_PROFILE_HXX
 #define INCLUDED_OSL_PROFILE_HXX
 
-#include <osl/profile.h>
-#include <rtl/ustring.hxx>
+#include "osl/profile.h"
+#include "rtl/ustring.hxx"
 
 #include <string.h>
 #include <exception>
diff --git a/include/osl/security.h b/include/osl/security.h
index 03acf0a51755..33483d4283fc 100644
--- a/include/osl/security.h
+++ b/include/osl/security.h
@@ -20,10 +20,10 @@
 #ifndef INCLUDED_OSL_SECURITY_H
 #define INCLUDED_OSL_SECURITY_H
 
-#include <sal/config.h>
+#include "sal/config.h"
 
-#include <rtl/ustring.h>
-#include <sal/saldllapi.h>
+#include "rtl/ustring.h"
+#include "sal/saldllapi.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/osl/security.hxx b/include/osl/security.hxx
index a1a905ee888a..af0d4016c4c3 100644
--- a/include/osl/security.hxx
+++ b/include/osl/security.hxx
@@ -20,12 +20,12 @@
 #ifndef INCLUDED_OSL_SECURITY_HXX
 #define INCLUDED_OSL_SECURITY_HXX
 
-#include <sal/config.h>
+#include "sal/config.h"
 
 #include <cstddef>
 
-#include <rtl/ustring.hxx>
-#include <osl/security_decl.hxx>
+#include "rtl/ustring.hxx"
+#include "osl/security_decl.hxx"
 
 namespace osl
 {
diff --git a/include/osl/security_decl.hxx b/include/osl/security_decl.hxx
index 9b41e5a960ff..a0346a69c519 100644
--- a/include/osl/security_decl.hxx
+++ b/include/osl/security_decl.hxx
@@ -20,8 +20,8 @@
 #ifndef INCLUDED_OSL_SECURITY_DECL_HXX
 #define INCLUDED_OSL_SECURITY_DECL_HXX
 
-#include <rtl/ustring.hxx>
-#include <osl/security.h>
+#include "rtl/ustring.hxx"
+#include "osl/security.h"
 
 namespace osl
 {
diff --git a/include/osl/signal.h b/include/osl/signal.h
index a4a5cb0caa80..dd05b0a6889d 100644
--- a/include/osl/signal.h
+++ b/include/osl/signal.h
@@ -20,10 +20,10 @@
 #ifndef INCLUDED_OSL_SIGNAL_H
 #define INCLUDED_OSL_SIGNAL_H
 
-#include <sal/config.h>
+#include "sal/config.h"
 
-#include <sal/saldllapi.h>
-#include <sal/types.h>
+#include "sal/saldllapi.h"
+#include "sal/types.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/osl/socket.h b/include/osl/socket.h
index 00d0d4f931fe..36e6b0b35bad 100644
--- a/include/osl/socket.h
+++ b/include/osl/socket.h
@@ -20,11 +20,11 @@
 #ifndef INCLUDED_OSL_SOCKET_H
 #define INCLUDED_OSL_SOCKET_H
 
-#include <rtl/ustring.h>
-#include <rtl/byteseq.h>
+#include "rtl/ustring.h"
+#include "rtl/byteseq.h"
 
-#include <osl/time.h>
-#include <rtl/tencinfo.h>
+#include "osl/time.h"
+#include "rtl/tencinfo.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/osl/socket.hxx b/include/osl/socket.hxx
index b803be69376a..8a1a291dcc8a 100644
--- a/include/osl/socket.hxx
+++ b/include/osl/socket.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_OSL_SOCKET_HXX
 #define INCLUDED_OSL_SOCKET_HXX
 
-#include <osl/socket_decl.hxx>
+#include "osl/socket_decl.hxx"
 
 namespace osl
 {
diff --git a/include/osl/socket_decl.hxx b/include/osl/socket_decl.hxx
index e0114c1ee4e1..ebf831dfb0e4 100644
--- a/include/osl/socket_decl.hxx
+++ b/include/osl/socket_decl.hxx
@@ -20,13 +20,13 @@
 #ifndef INCLUDED_OSL_SOCKET_DECL_HXX
 #define INCLUDED_OSL_SOCKET_DECL_HXX
 
-#include <sal/config.h>
+#include "sal/config.h"
 
 #include <cstddef>
 
-#include <osl/socket.h>
-#include <rtl/ustring.hxx>
-#include <rtl/byteseq.hxx>
+#include "osl/socket.h"
+#include "rtl/ustring.hxx"
+#include "rtl/byteseq.hxx"
 
 namespace osl
 {
diff --git a/include/osl/test/uniquepipename.hxx b/include/osl/test/uniquepipename.hxx
index fb0be8f4ad7a..bbeedcafb2b1 100644
--- a/include/osl/test/uniquepipename.hxx
+++ b/include/osl/test/uniquepipename.hxx
@@ -17,12 +17,12 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <sal/types.h>
-#include <rtl/ustring.h>
-#include <rtl/ustring.hxx>
+#include "sal/types.h"
+#include "rtl/ustring.h"
+#include "rtl/ustring.hxx"
 #include <cppunit/TestAssert.h>
 
-#include <osl/process.h>
+#include "osl/process.h"
 
 namespace osl {
 namespace test {
diff --git a/include/osl/thread.h b/include/osl/thread.h
index 4025f608693c..5673eb2694a3 100644
--- a/include/osl/thread.h
+++ b/include/osl/thread.h
@@ -20,11 +20,11 @@
 #ifndef INCLUDED_OSL_THREAD_H
 #define INCLUDED_OSL_THREAD_H
 
-#include <sal/config.h>
+#include "sal/config.h"
 
-#include <osl/time.h>
-#include <rtl/textenc.h>
-#include <sal/saldllapi.h>
+#include "osl/time.h"
+#include "rtl/textenc.h"
+#include "sal/saldllapi.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/osl/thread.hxx b/include/osl/thread.hxx
index a459f12bf48d..215836c5e189 100644
--- a/include/osl/thread.hxx
+++ b/include/osl/thread.hxx
@@ -20,14 +20,14 @@
 #ifndef INCLUDED_OSL_THREAD_HXX
 #define INCLUDED_OSL_THREAD_HXX
 
-#include <sal/config.h>
+#include "sal/config.h"
 
 #include <cassert>
 #include <cstddef>
 
-#include <osl/time.h>
-#include <osl/thread.h>
-#include <rtl/alloc.h>
+#include "osl/time.h"
+#include "osl/thread.h"
+#include "rtl/alloc.h"
 
 namespace osl
 {
diff --git a/include/osl/time.h b/include/osl/time.h
index 4843a9d02e25..490fc9f3e36e 100644
--- a/include/osl/time.h
+++ b/include/osl/time.h
@@ -20,14 +20,14 @@
 #ifndef INCLUDED_OSL_TIME_H
 #define INCLUDED_OSL_TIME_H
 
-#include <sal/config.h>
+#include "sal/config.h"
 
 #if defined LIBO_INTERNAL_ONLY && defined __cplusplus
 #include <chrono>
 #endif
 
-#include <sal/saldllapi.h>
-#include <sal/types.h>
+#include "sal/saldllapi.h"
+#include "sal/types.h"
 
 #ifdef SAL_W32
 #   pragma pack(push, 8)
diff --git a/include/rtl/alloc.h b/include/rtl/alloc.h
index 8e59f4b8712d..bd3149fece87 100644
--- a/include/rtl/alloc.h
+++ b/include/rtl/alloc.h
@@ -20,10 +20,10 @@
 #ifndef INCLUDED_RTL_ALLOC_H
 #define INCLUDED_RTL_ALLOC_H
 
-#include <sal/config.h>
+#include "sal/config.h"
 
-#include <sal/saldllapi.h>
-#include <sal/types.h>
+#include "sal/saldllapi.h"
+#include "sal/types.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/rtl/bootstrap.h b/include/rtl/bootstrap.h
index 5aa636356d2d..620a3a577944 100644
--- a/include/rtl/bootstrap.h
+++ b/include/rtl/bootstrap.h
@@ -19,10 +19,10 @@
 #ifndef INCLUDED_RTL_BOOTSTRAP_H
 #define INCLUDED_RTL_BOOTSTRAP_H
 
-#include <sal/config.h>
+#include "sal/config.h"
 
-#include <rtl/ustring.h>
-#include <sal/saldllapi.h>
+#include "rtl/ustring.h"
+#include "sal/saldllapi.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/rtl/bootstrap.hxx b/include/rtl/bootstrap.hxx
index 7820ecef3c01..35006eb05e8e 100644
--- a/include/rtl/bootstrap.hxx
+++ b/include/rtl/bootstrap.hxx
@@ -19,12 +19,12 @@
 #ifndef INCLUDED_RTL_BOOTSTRAP_HXX
 #define INCLUDED_RTL_BOOTSTRAP_HXX
 
-#include <sal/config.h>
+#include "sal/config.h"
 
 #include <cstddef>
 
-#include <rtl/ustring.hxx>
-#include <rtl/bootstrap.h>
+#include "rtl/ustring.hxx"
+#include "rtl/bootstrap.h"
 
 namespace rtl
 {
diff --git a/include/rtl/byteseq.h b/include/rtl/byteseq.h
index d03d3f86d0bf..064f91ca201a 100644
--- a/include/rtl/byteseq.h
+++ b/include/rtl/byteseq.h
@@ -19,12 +19,12 @@
 #ifndef INCLUDED_RTL_BYTESEQ_H
 #define INCLUDED_RTL_BYTESEQ_H
 
-#include <sal/config.h>
+#include "sal/config.h"
 
-#include <rtl/alloc.h>
-#include <rtl/ustring.h>
-#include <sal/saldllapi.h>
-#include <sal/types.h>
+#include "rtl/alloc.h"
+#include "rtl/ustring.h"
+#include "sal/saldllapi.h"
+#include "sal/types.h"
 
 #ifdef __cplusplus
 extern "C"
diff --git a/include/rtl/byteseq.hxx b/include/rtl/byteseq.hxx
index 122d1bc611ba..bf287830c77d 100644
--- a/include/rtl/byteseq.hxx
+++ b/include/rtl/byteseq.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_RTL_BYTESEQ_HXX
 #define INCLUDED_RTL_BYTESEQ_HXX
 
-#include <rtl/byteseq.h>
+#include "rtl/byteseq.h"
 
 #include <cstddef>
 #include <new>
diff --git a/include/rtl/character.hxx b/include/rtl/character.hxx
index db3f41f16999..a18d05d6a5e8 100644
--- a/include/rtl/character.hxx
+++ b/include/rtl/character.hxx
@@ -20,12 +20,12 @@
 #ifndef INCLUDED_RTL_CHARACTER_HXX
 #define INCLUDED_RTL_CHARACTER_HXX
 
-#include <sal/config.h>
+#include "sal/config.h"
 
 #include <cassert>
 #include <cstddef>
 
-#include <sal/types.h>
+#include "sal/types.h"
 
 namespace rtl
 {
diff --git a/include/rtl/cipher.h b/include/rtl/cipher.h
index 2b442c2cebd0..d75f7bea0dcc 100644
--- a/include/rtl/cipher.h
+++ b/include/rtl/cipher.h
@@ -20,10 +20,10 @@
 #ifndef INCLUDED_RTL_CIPHER_H
 #define INCLUDED_RTL_CIPHER_H
 
-#include <sal/config.h>
+#include "sal/config.h"
 
-#include <sal/saldllapi.h>
-#include <sal/types.h>
+#include "sal/saldllapi.h"
+#include "sal/types.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/rtl/crc.h b/include/rtl/crc.h
index 272cff0a2e6a..24499572c8a6 100644
--- a/include/rtl/crc.h
+++ b/include/rtl/crc.h
@@ -20,10 +20,10 @@
 #ifndef INCLUDED_RTL_CRC_H
 #define INCLUDED_RTL_CRC_H
 
-#include <sal/config.h>
+#include "sal/config.h"
 
-#include <sal/saldllapi.h>
-#include <sal/types.h>
+#include "sal/saldllapi.h"
+#include "sal/types.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/rtl/digest.h b/include/rtl/digest.h
index b74639e88ab8..7e225e18d0ea 100644
--- a/include/rtl/digest.h
+++ b/include/rtl/digest.h
@@ -20,10 +20,10 @@
 #ifndef INCLUDED_RTL_DIGEST_H
 #define INCLUDED_RTL_DIGEST_H
 
-#include <sal/config.h>
+#include "sal/config.h"
 
-#include <sal/saldllapi.h>
-#include <sal/types.h>
+#include "sal/saldllapi.h"
+#include "sal/types.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/rtl/instance.hxx b/include/rtl/instance.hxx
index 79d234308b96..7ff19049f101 100644
--- a/include/rtl/instance.hxx
+++ b/include/rtl/instance.hxx
@@ -20,12 +20,12 @@
 #ifndef INCLUDED_RTL_INSTANCE_HXX
 #define INCLUDED_RTL_INSTANCE_HXX
 
-#include <sal/config.h>
+#include "sal/config.h"
 
 #include <cstddef>
 
-#include <osl/doublecheckedlocking.h>
-#include <osl/getglobalmutex.hxx>
+#include "osl/doublecheckedlocking.h"
+#include "osl/getglobalmutex.hxx"
 
 namespace {
 
diff --git a/include/rtl/locale.h b/include/rtl/locale.h
index de73e9780f14..127a81b87c4c 100644
--- a/include/rtl/locale.h
+++ b/include/rtl/locale.h
@@ -20,10 +20,10 @@
 #ifndef INCLUDED_RTL_LOCALE_H
 #define INCLUDED_RTL_LOCALE_H
 
-#include <sal/config.h>
+#include "sal/config.h"
 
-#include <rtl/ustring.h>
-#include <sal/saldllapi.h>
+#include "rtl/ustring.h"
+#include "sal/saldllapi.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/rtl/malformeduriexception.hxx b/include/rtl/malformeduriexception.hxx
index 3e294516a21f..a1d2b51a93ca 100644
--- a/include/rtl/malformeduriexception.hxx
+++ b/include/rtl/malformeduriexception.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_RTL_MALFORMEDURIEXCEPTION_HXX
 #define INCLUDED_RTL_MALFORMEDURIEXCEPTION_HXX
 
-#include <rtl/ustring.hxx>
+#include "rtl/ustring.hxx"
 
 namespace rtl {
 
diff --git a/include/rtl/math.h b/include/rtl/math.h
index 7c3f09a7823e..8d23ce22a8b4 100644
--- a/include/rtl/math.h
+++ b/include/rtl/math.h
@@ -20,11 +20,11 @@
 #ifndef INCLUDED_RTL_MATH_H
 #define INCLUDED_RTL_MATH_H
 
-#include <sal/config.h>
+#include "sal/config.h"
 
-#include <rtl/ustring.h>
-#include <sal/saldllapi.h>
-#include <sal/types.h>
+#include "rtl/ustring.h"
+#include "sal/saldllapi.h"
+#include "sal/types.h"
 
 #if defined __cplusplus
 extern "C" {
diff --git a/include/rtl/math.hxx b/include/rtl/math.hxx
index fc53828610ee..4cd21eae91fb 100644
--- a/include/rtl/math.hxx
+++ b/include/rtl/math.hxx
@@ -20,13 +20,13 @@
 #ifndef INCLUDED_RTL_MATH_HXX
 #define INCLUDED_RTL_MATH_HXX
 
-#include <rtl/math.h>
-#include <rtl/strbuf.hxx>
-#include <rtl/string.hxx>
-#include <rtl/ustring.hxx>
-#include <rtl/ustrbuf.hxx>
-#include <sal/mathconf.h>
-#include <sal/types.h>
+#include "rtl/math.h"
+#include "rtl/strbuf.hxx"
+#include "rtl/string.hxx"
+#include "rtl/ustring.hxx"
+#include "rtl/ustrbuf.hxx"
+#include "sal/mathconf.h"
+#include "sal/types.h"
 
 #include <cstddef>
 #include <math.h>
diff --git a/include/rtl/process.h b/include/rtl/process.h
index d393b5cc651f..388bd91e36aa 100644
--- a/include/rtl/process.h
+++ b/include/rtl/process.h
@@ -19,11 +19,11 @@
 #ifndef INCLUDED_RTL_PROCESS_H
 #define INCLUDED_RTL_PROCESS_H
 
-#include <sal/config.h>
+#include "sal/config.h"
 
-#include <osl/process.h>
-#include <sal/saldllapi.h>
-#include <sal/types.h>
+#include "osl/process.h"
+#include "sal/saldllapi.h"
+#include "sal/types.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/rtl/random.h b/include/rtl/random.h
index 7b6a25f3c7f6..a8dea31f52b1 100644
--- a/include/rtl/random.h
+++ b/include/rtl/random.h
@@ -20,10 +20,10 @@
 #ifndef INCLUDED_RTL_RANDOM_H
 #define INCLUDED_RTL_RANDOM_H
 
-#include <sal/config.h>
+#include "sal/config.h"
 
-#include <sal/saldllapi.h>
-#include <sal/types.h>
+#include "sal/saldllapi.h"
+#include "sal/types.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/rtl/ref.hxx b/include/rtl/ref.hxx
index 7b80da98218d..437f7a34fc05 100644
--- a/include/rtl/ref.hxx
+++ b/include/rtl/ref.hxx
@@ -20,11 +20,11 @@
 #ifndef INCLUDED_RTL_REF_HXX
 #define INCLUDED_RTL_REF_HXX
 
-#include <sal/config.h>
+#include "sal/config.h"
 
 #include <cassert>
 
-#include <sal/types.h>
+#include "sal/types.h"
 
 namespace rtl
 {
diff --git a/include/rtl/strbuf.h b/include/rtl/strbuf.h
index 3f682db37615..7bd11e895085 100644
--- a/include/rtl/strbuf.h
+++ b/include/rtl/strbuf.h
@@ -20,10 +20,10 @@
 #ifndef INCLUDED_RTL_STRBUF_H
 #define INCLUDED_RTL_STRBUF_H
 
-#include <sal/config.h>
+#include "sal/config.h"
 
-#include <rtl/string.h>
-#include <sal/saldllapi.h>
+#include "rtl/string.h"
+#include "sal/saldllapi.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/rtl/strbuf.hxx b/include/rtl/strbuf.hxx
index eb5d4f738568..638c30bb957a 100644
--- a/include/rtl/strbuf.hxx
+++ b/include/rtl/strbuf.hxx
@@ -20,18 +20,18 @@
 #ifndef INCLUDED_RTL_STRBUF_HXX
 #define INCLUDED_RTL_STRBUF_HXX
 
-#include <sal/config.h>
+#include "sal/config.h"
 
 #include <cassert>
 #include <cstddef>
 #include <cstring>
 
-#include <rtl/strbuf.h>
-#include <rtl/string.hxx>
-#include <rtl/stringutils.hxx>
+#include "rtl/strbuf.h"
+#include "rtl/string.hxx"
+#include "rtl/stringutils.hxx"
 
 #ifdef LIBO_INTERNAL_ONLY // "RTL_FAST_STRING"
-#include <rtl/stringconcat.hxx>
+#include "rtl/stringconcat.hxx"
 #endif
 
 #ifdef RTL_STRING_UNITTEST
diff --git a/include/rtl/string.h b/include/rtl/string.h
index ef41bd229f6d..1aa11fd06a88 100644
--- a/include/rtl/string.h
+++ b/include/rtl/string.h
@@ -20,12 +20,12 @@
 #ifndef INCLUDED_RTL_STRING_H
 #define INCLUDED_RTL_STRING_H
 
-#include <sal/config.h>
+#include "sal/config.h"
 
-#include <osl/interlck.h>
-#include <rtl/textcvt.h>
-#include <sal/saldllapi.h>
-#include <sal/types.h>
+#include "osl/interlck.h"
+#include "rtl/textcvt.h"
+#include "sal/saldllapi.h"
+#include "sal/types.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/rtl/string.hxx b/include/rtl/string.hxx
index 6ea56c3f48e2..e113c264fc32 100644
--- a/include/rtl/string.hxx
+++ b/include/rtl/string.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_RTL_STRING_HXX
 #define INCLUDED_RTL_STRING_HXX
 
-#include <sal/config.h>
+#include "sal/config.h"
 
 #include <cassert>
 #include <cstddef>
@@ -28,15 +28,15 @@
 #include <ostream>
 #include <string.h>
 
-#include <rtl/textenc.h>
-#include <rtl/string.h>
-#include <rtl/stringutils.hxx>
+#include "rtl/textenc.h"
+#include "rtl/string.h"
+#include "rtl/stringutils.hxx"
 
 #ifdef LIBO_INTERNAL_ONLY // "RTL_FAST_STRING"
-#include <rtl/stringconcat.hxx>
+#include "rtl/stringconcat.hxx"
 #endif
 
-#include <sal/log.hxx>
+#include "sal/log.hxx"
 
 #ifdef RTL_STRING_UNITTEST
 extern bool rtl_string_unittest_const_literal;
diff --git a/include/rtl/stringconcat.hxx b/include/rtl/stringconcat.hxx
index e3d933e3a2a3..cc3a9516b676 100644
--- a/include/rtl/stringconcat.hxx
+++ b/include/rtl/stringconcat.hxx
@@ -10,7 +10,7 @@
 #ifndef INCLUDED_RTL_STRINGCONCAT_HXX
 #define INCLUDED_RTL_STRINGCONCAT_HXX
 
-#include <rtl/stringutils.hxx>
+#include "rtl/stringutils.hxx"
 
 #include <cstddef>
 #include <string.h>
diff --git a/include/rtl/stringutils.hxx b/include/rtl/stringutils.hxx
index a88f5be861fd..0223e71d1d41 100644
--- a/include/rtl/stringutils.hxx
+++ b/include/rtl/stringutils.hxx
@@ -10,12 +10,12 @@
 #ifndef INCLUDED_RTL_STRINGUTILS_HXX
 #define INCLUDED_RTL_STRINGUTILS_HXX
 
-#include <sal/config.h>
+#include "sal/config.h"
 
 #include <cstddef>
 #include <cstring>
 
-#include <sal/types.h>
+#include "sal/types.h"
 
 // The unittest uses slightly different code to help check that the proper
 // calls are made. The class is put into a different namespace to make
diff --git a/include/rtl/tencinfo.h b/include/rtl/tencinfo.h
index c6980112410c..74c3bb04f071 100644
--- a/include/rtl/tencinfo.h
+++ b/include/rtl/tencinfo.h
@@ -20,11 +20,11 @@
 #ifndef INCLUDED_RTL_TENCINFO_H
 #define INCLUDED_RTL_TENCINFO_H
 
-#include <sal/config.h>
+#include "sal/config.h"
 
-#include <rtl/textenc.h>
-#include <sal/saldllapi.h>
-#include <sal/types.h>
+#include "rtl/textenc.h"
+#include "sal/saldllapi.h"
+#include "sal/types.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/rtl/textcvt.h b/include/rtl/textcvt.h
index 77663068ef73..09c33b1cb0ed 100644
--- a/include/rtl/textcvt.h
+++ b/include/rtl/textcvt.h
@@ -20,11 +20,11 @@
 #ifndef INCLUDED_RTL_TEXTCVT_H
 #define INCLUDED_RTL_TEXTCVT_H
 
-#include <sal/config.h>
+#include "sal/config.h"
 
-#include <rtl/textenc.h>
-#include <sal/saldllapi.h>
-#include <sal/types.h>
+#include "rtl/textenc.h"
+#include "sal/saldllapi.h"
+#include "sal/types.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/rtl/textenc.h b/include/rtl/textenc.h
index 067011e1f94a..e51016445718 100644
--- a/include/rtl/textenc.h
+++ b/include/rtl/textenc.h
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_RTL_TEXTENC_H
 #define INCLUDED_RTL_TEXTENC_H
 
-#include <sal/types.h>
+#include "sal/types.h"
 
 /** The various supported text encodings.
 
diff --git a/include/rtl/unload.h b/include/rtl/unload.h
index 412fad8a277b..6d5c90648f22 100644
--- a/include/rtl/unload.h
+++ b/include/rtl/unload.h
@@ -19,12 +19,12 @@
 #ifndef INCLUDED_RTL_UNLOAD_H
 #define INCLUDED_RTL_UNLOAD_H
 
-#include <sal/config.h>
+#include "sal/config.h"
 
-#include <osl/interlck.h>
-#include <osl/time.h>
-#include <sal/saldllapi.h>
-#include <sal/types.h>
+#include "osl/interlck.h"
+#include "osl/time.h"
+#include "sal/saldllapi.h"
+#include "sal/types.h"
 
 /** @file
     Backwards-compatibility remainders of a removed library unloading feature.
diff --git a/include/rtl/uri.h b/include/rtl/uri.h
index 248a0d42b55f..af472dae4d52 100644
--- a/include/rtl/uri.h
+++ b/include/rtl/uri.h
@@ -20,12 +20,12 @@
 #ifndef INCLUDED_RTL_URI_H
 #define INCLUDED_RTL_URI_H
 
-#include <sal/config.h>
+#include "sal/config.h"
 
-#include <rtl/textenc.h>
-#include <rtl/ustring.h>
-#include <sal/saldllapi.h>
-#include <sal/types.h>
+#include "rtl/textenc.h"
+#include "rtl/ustring.h"
+#include "sal/saldllapi.h"
+#include "sal/types.h"
 
 #if defined __cplusplus
 extern "C" {
diff --git a/include/rtl/uri.hxx b/include/rtl/uri.hxx
index 84f9b012d152..48f543b2535c 100644
--- a/include/rtl/uri.hxx
+++ b/include/rtl/uri.hxx
@@ -20,11 +20,11 @@
 #ifndef INCLUDED_RTL_URI_HXX
 #define INCLUDED_RTL_URI_HXX
 
-#include <rtl/malformeduriexception.hxx>
-#include <rtl/uri.h>
-#include <rtl/textenc.h>
-#include <rtl/ustring.hxx>
-#include <sal/types.h>
+#include "rtl/malformeduriexception.hxx"
+#include "rtl/uri.h"
+#include "rtl/textenc.h"
+#include "rtl/ustring.hxx"
+#include "sal/types.h"
 
 namespace rtl {
 
diff --git a/include/rtl/ustrbuf.h b/include/rtl/ustrbuf.h
index 926da0141cc4..9c24724f540e 100644
--- a/include/rtl/ustrbuf.h
+++ b/include/rtl/ustrbuf.h
@@ -20,10 +20,10 @@
 #ifndef INCLUDED_RTL_USTRBUF_H
 #define INCLUDED_RTL_USTRBUF_H
 
-#include <sal/config.h>
+#include "sal/config.h"
 
-#include <rtl/ustring.h>
-#include <sal/saldllapi.h>
+#include "rtl/ustring.h"
+#include "sal/saldllapi.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/rtl/ustrbuf.hxx b/include/rtl/ustrbuf.hxx
index 9dbc2621a7ae..16ca211d3f5b 100644
--- a/include/rtl/ustrbuf.hxx
+++ b/include/rtl/ustrbuf.hxx
@@ -20,19 +20,19 @@
 #ifndef INCLUDED_RTL_USTRBUF_HXX
 #define INCLUDED_RTL_USTRBUF_HXX
 
-#include <sal/config.h>
+#include "sal/config.h"
 
 #include <cassert>
 #include <cstddef>
 #include <cstring>
 
-#include <rtl/ustrbuf.h>
-#include <rtl/ustring.hxx>
-#include <rtl/stringutils.hxx>
-#include <sal/types.h>
+#include "rtl/ustrbuf.h"
+#include "rtl/ustring.hxx"
+#include "rtl/stringutils.hxx"
+#include "sal/types.h"
 
 #ifdef LIBO_INTERNAL_ONLY // "RTL_FAST_STRING"
-#include <rtl/stringconcat.hxx>
+#include "rtl/stringconcat.hxx"
 #endif
 
 #ifdef RTL_STRING_UNITTEST
diff --git a/include/rtl/ustring.h b/include/rtl/ustring.h
index 50dbd75a5ecc..dfc099f93852 100644
--- a/include/rtl/ustring.h
+++ b/include/rtl/ustring.h
@@ -20,13 +20,13 @@
 #ifndef INCLUDED_RTL_USTRING_H
 #define INCLUDED_RTL_USTRING_H
 
-#include <sal/config.h>
+#include "sal/config.h"
 
-#include <osl/interlck.h>
-#include <rtl/string.h>
-#include <rtl/textenc.h>
-#include <sal/saldllapi.h>
-#include <sal/types.h>
+#include "osl/interlck.h"
+#include "rtl/string.h"
+#include "rtl/textenc.h"
+#include "sal/saldllapi.h"
+#include "sal/types.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/rtl/ustring.hxx b/include/rtl/ustring.hxx
index 96afdc438c83..74b46fdc0887 100644
--- a/include/rtl/ustring.hxx
+++ b/include/rtl/ustring.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_RTL_USTRING_HXX
 #define INCLUDED_RTL_USTRING_HXX
 
-#include <sal/config.h>
+#include "sal/config.h"
 
 #include <cassert>
 #include <cstddef>
@@ -28,15 +28,15 @@
 #include <ostream>
 #include <string.h>
 
-#include <rtl/ustring.h>
-#include <rtl/string.hxx>
-#include <rtl/stringutils.hxx>
-#include <rtl/textenc.h>
-#include <sal/log.hxx>
+#include "rtl/ustring.h"
+#include "rtl/string.hxx"
+#include "rtl/stringutils.hxx"
+#include "rtl/textenc.h"
+#include "sal/log.hxx"
 
 #ifdef LIBO_INTERNAL_ONLY // "RTL_FAST_STRING"
-#include <config_global.h>
-#include <rtl/stringconcat.hxx>
+#include "config_global.h"
+#include "rtl/stringconcat.hxx"
 #endif
 
 #ifdef RTL_STRING_UNITTEST
diff --git a/include/rtl/uuid.h b/include/rtl/uuid.h
index b31e2760e649..4e7089bee9e6 100644
--- a/include/rtl/uuid.h
+++ b/include/rtl/uuid.h
@@ -19,11 +19,11 @@
 #ifndef INCLUDED_RTL_UUID_H
 #define INCLUDED_RTL_UUID_H
 
-#include <sal/config.h>
+#include "sal/config.h"
 
-#include <rtl/string.h>
-#include <sal/saldllapi.h>
-#include <sal/types.h>
+#include "rtl/string.h"
+#include "sal/saldllapi.h"
+#include "sal/types.h"
 
 /**
    @file
diff --git a/include/sal/backtrace.hxx b/include/sal/backtrace.hxx
index f471549b7f7a..62dfb590fae7 100644
--- a/include/sal/backtrace.hxx
+++ b/include/sal/backtrace.hxx
@@ -10,10 +10,10 @@
 #ifndef INCLUDED_SAL_BACKTRACE_HXX
 #define INCLUDED_SAL_BACKTRACE_HXX
 
-#include <sal/config.h>
-#include <sal/saldllapi.h>
-#include <sal/types.h>
-#include <rtl/ustring.hxx>
+#include "sal/config.h"
+#include "sal/saldllapi.h"
+#include "sal/types.h"
+#include "rtl/ustring.hxx"
 #include <memory>
 
 /// @cond INTERNAL
diff --git a/include/sal/detail/log.h b/include/sal/detail/log.h
index 11ece36c3279..3062f47b5952 100644
--- a/include/sal/detail/log.h
+++ b/include/sal/detail/log.h
@@ -10,10 +10,10 @@
 #ifndef INCLUDED_SAL_DETAIL_LOG_H
 #define INCLUDED_SAL_DETAIL_LOG_H
 
-#include <sal/config.h>
+#include "sal/config.h"
 
-#include <sal/saldllapi.h>
-#include <sal/types.h>
+#include "sal/saldllapi.h"
+#include "sal/types.h"
 
 /** @cond INTERNAL */
 
diff --git a/include/sal/log.hxx b/include/sal/log.hxx
index 51b218a2732c..a01dc8988e20 100644
--- a/include/sal/log.hxx
+++ b/include/sal/log.hxx
@@ -10,15 +10,15 @@
 #ifndef INCLUDED_SAL_LOG_HXX
 #define INCLUDED_SAL_LOG_HXX
 
-#include <sal/config.h>
+#include "sal/config.h"
 
 #include <cstdlib>
 #include <sstream>
 #include <string>
 
-#include <sal/detail/log.h>
-#include <sal/saldllapi.h>
-#include <sal/types.h>
+#include "sal/detail/log.h"
+#include "sal/saldllapi.h"
+#include "sal/types.h"
 
 // Avoid the use of other sal code in this header as much as possible, so that
 // this code can be called from other sal code without causing endless
diff --git a/include/sal/main.h b/include/sal/main.h
index 7c79fad5f0f9..4519e8690cb1 100644
--- a/include/sal/main.h
+++ b/include/sal/main.h
@@ -20,10 +20,10 @@
 #ifndef INCLUDED_SAL_MAIN_H
 #define INCLUDED_SAL_MAIN_H
 
-#include <sal/config.h>
+#include "sal/config.h"
 
-#include <sal/saldllapi.h>
-#include <sal/types.h>
+#include "sal/saldllapi.h"
+#include "sal/types.h"
 
 #if defined AIX
 #include <unistd.h>
diff --git a/include/sal/mathconf.h b/include/sal/mathconf.h
index 4b977f5bb4f4..6232bcc10f2a 100644
--- a/include/sal/mathconf.h
+++ b/include/sal/mathconf.h
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_SAL_MATHCONF_H
 #define INCLUDED_SAL_MATHCONF_H
 
-#include <osl/endian.h>
+#include "osl/endian.h"
 
 #include <float.h>
 
diff --git a/include/sal/saldllapi.h b/include/sal/saldllapi.h
index 71051726f722..2eca05de7e18 100644
--- a/include/sal/saldllapi.h
+++ b/include/sal/saldllapi.h
@@ -20,9 +20,9 @@
 #ifndef INCLUDED_SAL_SALDLLAPI_H
 #define INCLUDED_SAL_SALDLLAPI_H
 
-#include <sal/config.h>
+#include "sal/config.h"
 
-#include <sal/types.h>
+#include "sal/types.h"
 
 #if defined(SAL_DLLIMPLEMENTATION)
 #define SAL_DLLPUBLIC  SAL_DLLPUBLIC_EXPORT
diff --git a/include/sal/types.h b/include/sal/types.h
index 14c8e90d293d..90ebae5560da 100644
--- a/include/sal/types.h
+++ b/include/sal/types.h
@@ -20,12 +20,12 @@
 #ifndef INCLUDED_SAL_TYPES_H
 #define INCLUDED_SAL_TYPES_H
 
-#include <sal/config.h>
+#include "sal/config.h"
 
 #include <stddef.h>
 
-#include <sal/macros.h>
-#include <sal/typesizes.h>
+#include "sal/macros.h"
+#include "sal/typesizes.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/salhelper/condition.hxx b/include/salhelper/condition.hxx
index a124a65cb7bb..0359a6de807e 100644
--- a/include/salhelper/condition.hxx
+++ b/include/salhelper/condition.hxx
@@ -22,9 +22,9 @@
 #define INCLUDED_SALHELPER_CONDITION_HXX
 
 
-#include <osl/conditn.hxx>
-#include <osl/mutex.hxx>
-#include <salhelper/salhelperdllapi.h>
+#include "osl/conditn.hxx"
+#include "osl/mutex.hxx"
+#include "salhelper/salhelperdllapi.h"
 
 namespace salhelper
 {
diff --git a/include/salhelper/dynload.hxx b/include/salhelper/dynload.hxx
index 071a83049771..98fe9af1f0ed 100644
--- a/include/salhelper/dynload.hxx
+++ b/include/salhelper/dynload.hxx
@@ -20,10 +20,10 @@
 #ifndef INCLUDED_SALHELPER_DYNLOAD_HXX
 #define INCLUDED_SALHELPER_DYNLOAD_HXX
 
-#include <sal/types.h>
-#include <rtl/ustring.hxx>
-#include <osl/module.h>
-#include <salhelper/salhelperdllapi.h>
+#include "sal/types.h"
+#include "rtl/ustring.hxx"
+#include "osl/module.h"
+#include "salhelper/salhelperdllapi.h"
 
 namespace salhelper
 {
diff --git a/include/salhelper/linkhelper.hxx b/include/salhelper/linkhelper.hxx
index a646668a661a..5eb5b051dce3 100644
--- a/include/salhelper/linkhelper.hxx
+++ b/include/salhelper/linkhelper.hxx
@@ -10,8 +10,8 @@
 #ifndef INCLUDED_SALHELPER_LINKHELPER_HXX
 #define INCLUDED_SALHELPER_LINKHELPER_HXX
 
-#include <rtl/ustring.hxx>
-#include <osl/file.hxx>
+#include "rtl/ustring.hxx"
+#include "osl/file.hxx"
 
 namespace salhelper
 {
diff --git a/include/salhelper/refobj.hxx b/include/salhelper/refobj.hxx
index 1a646d4cb0fb..1d21661b7de8 100644
--- a/include/salhelper/refobj.hxx
+++ b/include/salhelper/refobj.hxx
@@ -22,10 +22,10 @@
 
 #include <cassert>
 
-#include <sal/types.h>
-#include <rtl/alloc.h>
-#include <osl/diagnose.h>
-#include <osl/interlck.h>
+#include "sal/types.h"
+#include "rtl/alloc.h"
+#include "osl/diagnose.h"
+#include "osl/interlck.h"
 
 namespace salhelper
 {
diff --git a/include/salhelper/salhelperdllapi.h b/include/salhelper/salhelperdllapi.h
index 4eb4989b28a2..3fec057609f4 100644
--- a/include/salhelper/salhelperdllapi.h
+++ b/include/salhelper/salhelperdllapi.h
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_SALHELPER_SALHELPERDLLAPI_H
 #define INCLUDED_SALHELPER_SALHELPERDLLAPI_H
 
-#include <sal/types.h>
+#include "sal/types.h"
 
 #if defined(SALHELPER_DLLIMPLEMENTATION)
 #define SALHELPER_DLLPUBLIC  SAL_DLLPUBLIC_EXPORT
diff --git a/include/salhelper/simplereferenceobject.hxx b/include/salhelper/simplereferenceobject.hxx
index 6671d92ad3b4..662c31a72350 100644
--- a/include/salhelper/simplereferenceobject.hxx
+++ b/include/salhelper/simplereferenceobject.hxx
@@ -20,8 +20,8 @@
 #ifndef INCLUDED_SALHELPER_SIMPLEREFERENCEOBJECT_HXX
 #define INCLUDED_SALHELPER_SIMPLEREFERENCEOBJECT_HXX
 
-#include <osl/interlck.h>
-#include <salhelper/salhelperdllapi.h>
+#include "osl/interlck.h"
+#include "salhelper/salhelperdllapi.h"
 
 #include <cstddef>
 #include <new>
diff --git a/include/salhelper/singletonref.hxx b/include/salhelper/singletonref.hxx
index 1dd7ef74597c..e83df522abee 100644
--- a/include/salhelper/singletonref.hxx
+++ b/include/salhelper/singletonref.hxx
@@ -20,14 +20,14 @@
 #ifndef INCLUDED_SALHELPER_SINGLETONREF_HXX
 #define INCLUDED_SALHELPER_SINGLETONREF_HXX
 
-#include <sal/config.h>
+#include "sal/config.h"
 
 #include <cstddef>
 
-#include <osl/mutex.hxx>
-#include <rtl/instance.hxx>
-#include <osl/diagnose.h>
-#include <osl/getglobalmutex.hxx>
+#include "osl/mutex.hxx"
+#include "rtl/instance.hxx"
+#include "osl/diagnose.h"
+#include "osl/getglobalmutex.hxx"
 
 
 namespace salhelper{
diff --git a/include/salhelper/thread.hxx b/include/salhelper/thread.hxx
index 9cf827f0edc9..b4fac5493a6a 100644
--- a/include/salhelper/thread.hxx
+++ b/include/salhelper/thread.hxx
@@ -10,14 +10,14 @@
 #ifndef INCLUDED_SALHELPER_THREAD_HXX
 #define INCLUDED_SALHELPER_THREAD_HXX
 
-#include <sal/config.h>
+#include "sal/config.h"
 
 #include <cstddef>
 
-#include <osl/thread.hxx>
-#include <sal/types.h>
-#include <salhelper/salhelperdllapi.h>
-#include <salhelper/simplereferenceobject.hxx>
+#include "osl/thread.hxx"
+#include "sal/types.h"
+#include "salhelper/salhelperdllapi.h"
+#include "salhelper/simplereferenceobject.hxx"
 
 namespace salhelper {
 
diff --git a/include/salhelper/timer.hxx b/include/salhelper/timer.hxx
index ab02090d46da..ed20aadcaed1 100644
--- a/include/salhelper/timer.hxx
+++ b/include/salhelper/timer.hxx
@@ -21,9 +21,9 @@
 #ifndef INCLUDED_SALHELPER_TIMER_HXX
 #define INCLUDED_SALHELPER_TIMER_HXX
 
-#include <salhelper/simplereferenceobject.hxx>
-#include <osl/time.h>
-#include <salhelper/salhelperdllapi.h>
+#include "salhelper/simplereferenceobject.hxx"
+#include "osl/time.h"
+#include "salhelper/salhelperdllapi.h"
 
 namespace salhelper
 {
diff --git a/include/typelib/typeclass.h b/include/typelib/typeclass.h
index 1c6b0d64458e..2da05b143645 100644
--- a/include/typelib/typeclass.h
+++ b/include/typelib/typeclass.h
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_TYPELIB_TYPECLASS_H
 #define INCLUDED_TYPELIB_TYPECLASS_H
 
-#include <sal/types.h>
+#include "sal/types.h"
 
 /** This type class enum is binary compatible with the IDL enum com.sun.star.uno.TypeClass.
 */
diff --git a/include/typelib/typedescription.h b/include/typelib/typedescription.h
index c866ae88d614..a0c60e68f93b 100644
--- a/include/typelib/typedescription.h
+++ b/include/typelib/typedescription.h
@@ -19,10 +19,10 @@
 #ifndef INCLUDED_TYPELIB_TYPEDESCRIPTION_H
 #define INCLUDED_TYPELIB_TYPEDESCRIPTION_H
 
-#include <cppu/cppudllapi.h>
-#include <typelib/uik.h>
-#include <typelib/typeclass.h>
-#include <rtl/ustring.h>
+#include "cppu/cppudllapi.h"
+#include "typelib/uik.h"
+#include "typelib/typeclass.h"
+#include "rtl/ustring.h"
 
 #ifdef __cplusplus
 extern "C"
diff --git a/include/typelib/typedescription.hxx b/include/typelib/typedescription.hxx
index 8ec814173604..ae8599bb1fdd 100644
--- a/include/typelib/typedescription.hxx
+++ b/include/typelib/typedescription.hxx
@@ -19,14 +19,14 @@
 #ifndef INCLUDED_TYPELIB_TYPEDESCRIPTION_HXX
 #define INCLUDED_TYPELIB_TYPEDESCRIPTION_HXX
 
-#include <sal/config.h>
+#include "sal/config.h"
 
 #include <cstddef>
 
-#include <rtl/alloc.h>
-#include <rtl/ustring.hxx>
-#include <com/sun/star/uno/Type.h>
-#include <typelib/typedescription.h>
+#include "rtl/alloc.h"
+#include "rtl/ustring.hxx"
+#include "com/sun/star/uno/Type.h"
+#include "typelib/typedescription.h"
 
 
 namespace com
diff --git a/include/typelib/uik.h b/include/typelib/uik.h
index 78e57bf5202f..4899e95161b2 100644
--- a/include/typelib/uik.h
+++ b/include/typelib/uik.h
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_TYPELIB_UIK_H
 #define INCLUDED_TYPELIB_UIK_H
 
-#include <sal/types.h>
+#include "sal/types.h"
 
 #if defined( SAL_W32)
 #pragma pack(push, 8)
diff --git a/include/uno/Enterable.h b/include/uno/Enterable.h
index 876cc79bfbd7..5a4b8d33a2d7 100644
--- a/include/uno/Enterable.h
+++ b/include/uno/Enterable.h
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_UNO_ENTERABLE_H
 #define INCLUDED_UNO_ENTERABLE_H
 
-#include <uno/environment.h>
+#include "uno/environment.h"
 
 
 #ifdef __cplusplus
diff --git a/include/uno/EnvDcp.h b/include/uno/EnvDcp.h
index 954f686a266c..4d6f5f4a4617 100644
--- a/include/uno/EnvDcp.h
+++ b/include/uno/EnvDcp.h
@@ -20,8 +20,8 @@
 #ifndef INCLUDED_UNO_ENVDCP_H
 #define INCLUDED_UNO_ENVDCP_H
 
-#include <cppu/cppudllapi.h>
-#include <rtl/ustring.h>
+#include "cppu/cppudllapi.h"
+#include "rtl/ustring.h"
 
 #ifdef __cplusplus
 extern "C"
diff --git a/include/uno/any2.h b/include/uno/any2.h
index 556476dd5d89..29e10485a93c 100644
--- a/include/uno/any2.h
+++ b/include/uno/any2.h
@@ -19,8 +19,8 @@
 #ifndef INCLUDED_UNO_ANY2_H
 #define INCLUDED_UNO_ANY2_H
 
-#include <cppu/cppudllapi.h>
-#include <uno/data.h>
+#include "cppu/cppudllapi.h"
+#include "uno/data.h"
 
 #ifdef __cplusplus
 extern "C"
diff --git a/include/uno/current_context.h b/include/uno/current_context.h
index 7dbb41452888..edc9fe4d4d41 100644
--- a/include/uno/current_context.h
+++ b/include/uno/current_context.h
@@ -19,8 +19,8 @@
 #ifndef INCLUDED_UNO_CURRENT_CONTEXT_H
 #define INCLUDED_UNO_CURRENT_CONTEXT_H
 
-#include <cppu/cppudllapi.h>
-#include <rtl/ustring.h>
+#include "cppu/cppudllapi.h"
+#include "rtl/ustring.h"
 
 #ifdef __cplusplus
 extern "C"
diff --git a/include/uno/current_context.hxx b/include/uno/current_context.hxx
index 8031f9bcbfee..02169b0f6746 100644
--- a/include/uno/current_context.hxx
+++ b/include/uno/current_context.hxx
@@ -19,14 +19,14 @@
 #ifndef INCLUDED_UNO_CURRENT_CONTEXT_HXX
 #define INCLUDED_UNO_CURRENT_CONTEXT_HXX
 
-#include <sal/config.h>
+#include "sal/config.h"
 
 #include <cstddef>
 
-#include <uno/current_context.h>
-#include <uno/lbnames.h>
+#include "uno/current_context.h"
+#include "uno/lbnames.h"
 
-#include <com/sun/star/uno/XCurrentContext.hpp>
+#include "com/sun/star/uno/XCurrentContext.hpp"
 
 
 namespace com
diff --git a/include/uno/data.h b/include/uno/data.h
index ea3ab5f3b277..fa44558989dc 100644
--- a/include/uno/data.h
+++ b/include/uno/data.h
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_UNO_DATA_H
 #define INCLUDED_UNO_DATA_H
 
-#include <cppu/cppudllapi.h>
+#include "cppu/cppudllapi.h"
 
 #ifdef __cplusplus
 extern "C"
diff --git a/include/uno/dispatcher.h b/include/uno/dispatcher.h
index d4bde04d077e..44b319a04b6f 100644
--- a/include/uno/dispatcher.h
+++ b/include/uno/dispatcher.h
@@ -19,8 +19,8 @@
 #ifndef INCLUDED_UNO_DISPATCHER_H
 #define INCLUDED_UNO_DISPATCHER_H
 
-#include <sal/types.h>
-#include <uno/any2.h>
+#include "sal/types.h"
+#include "uno/any2.h"
 
 #ifdef __cplusplus
 extern "C"
diff --git a/include/uno/dispatcher.hxx b/include/uno/dispatcher.hxx
index 67e77ab56105..bfd00d46b374 100644
--- a/include/uno/dispatcher.hxx
+++ b/include/uno/dispatcher.hxx
@@ -20,11 +20,11 @@
 #ifndef INCLUDED_UNO_DISPATCHER_HXX
 #define INCLUDED_UNO_DISPATCHER_HXX
 
-#include <sal/config.h>
+#include "sal/config.h"
 
 #include <cstddef>
 
-#include <uno/dispatcher.h>
+#include "uno/dispatcher.h"
 
 /// @cond INTERNAL
 
diff --git a/include/uno/environment.h b/include/uno/environment.h
index d0c1879e2b5f..8874d1680e03 100644
--- a/include/uno/environment.h
+++ b/include/uno/environment.h
@@ -19,8 +19,8 @@
 #ifndef INCLUDED_UNO_ENVIRONMENT_H
 #define INCLUDED_UNO_ENVIRONMENT_H
 
-#include <cppu/cppudllapi.h>
-#include <rtl/ustring.h>
+#include "cppu/cppudllapi.h"
+#include "rtl/ustring.h"
 
 #include <stdarg.h>
 
diff --git a/include/uno/environment.hxx b/include/uno/environment.hxx
index 31eca6f04fad..8f10711ad687 100644
--- a/include/uno/environment.hxx
+++ b/include/uno/environment.hxx
@@ -19,15 +19,15 @@
 #ifndef INCLUDED_UNO_ENVIRONMENT_HXX
 #define INCLUDED_UNO_ENVIRONMENT_HXX
 
-#include <sal/config.h>
+#include "sal/config.h"
 
 #include <cstddef>
 
-#include <rtl/alloc.h>
-#include <rtl/ustring.hxx>
-#include <uno/environment.h>
+#include "rtl/alloc.h"
+#include "rtl/ustring.hxx"
+#include "uno/environment.h"
 
-#include <uno/lbnames.h>
+#include "uno/lbnames.h"
 
 /** */ //for docpp
 namespace com
diff --git a/include/uno/lbnames.h b/include/uno/lbnames.h
index a4c967616f63..b8f0ef758870 100644
--- a/include/uno/lbnames.h
+++ b/include/uno/lbnames.h
@@ -21,9 +21,9 @@
 
 /* I assume "LB" means "Language Binding" */
 
-#include <sal/config.h>
+#include "sal/config.h"
 
-#include <sal/macros.h>
+#include "sal/macros.h"
 
 #ifdef __cplusplus
 
diff --git a/include/uno/mapping.h b/include/uno/mapping.h
index 5a55fbf68b45..c1fae966ee30 100644
--- a/include/uno/mapping.h
+++ b/include/uno/mapping.h
@@ -19,8 +19,8 @@
 #ifndef INCLUDED_UNO_MAPPING_H
 #define INCLUDED_UNO_MAPPING_H
 
-#include <cppu/cppudllapi.h>
-#include <rtl/ustring.h>
+#include "cppu/cppudllapi.h"
+#include "rtl/ustring.h"
 
 
 #ifdef __cplusplus
diff --git a/include/uno/mapping.hxx b/include/uno/mapping.hxx
index f520b6f5b2bf..07518b0fcf3c 100644
--- a/include/uno/mapping.hxx
+++ b/include/uno/mapping.hxx
@@ -19,19 +19,19 @@
 #ifndef INCLUDED_UNO_MAPPING_HXX
 #define INCLUDED_UNO_MAPPING_HXX
 
-#include <sal/config.h>
+#include "sal/config.h"
 
 #include <cstddef>
 
-#include <uno/lbnames.h>
-#include <rtl/alloc.h>
-#include <rtl/ustring.hxx>
-#include <osl/diagnose.h>
-#include <uno/mapping.h>
-#include <com/sun/star/uno/Type.hxx>
-#include <com/sun/star/uno/Reference.hxx>
-#include <cppu/unotype.hxx>
-#include <uno/environment.hxx>
+#include "uno/lbnames.h"
+#include "rtl/alloc.h"
+#include "rtl/ustring.hxx"
+#include "osl/diagnose.h"
+#include "uno/mapping.h"
+#include "com/sun/star/uno/Type.hxx"
+#include "com/sun/star/uno/Reference.hxx"
+#include "cppu/unotype.hxx"
+#include "uno/environment.hxx"
 
 typedef struct _typelib_TypeDescription typelib_TypeDescription;
 typedef struct _typelib_InterfaceTypeDescription typelib_InterfaceTypeDescription;
diff --git a/include/uno/sequence2.h b/include/uno/sequence2.h
index 3b55ba007cf1..ae2cc31153e5 100644
--- a/include/uno/sequence2.h
+++ b/include/uno/sequence2.h
@@ -19,8 +19,8 @@
 #ifndef INCLUDED_UNO_SEQUENCE2_H
 #define INCLUDED_UNO_SEQUENCE2_H
 
-#include <cppu/cppudllapi.h>
-#include <uno/data.h>
+#include "cppu/cppudllapi.h"
+#include "uno/data.h"
 
 #ifdef __cplusplus
 extern "C"
diff --git a/include/uno/threadpool.h b/include/uno/threadpool.h
index 49f46db8ec29..bd5e42d83911 100644
--- a/include/uno/threadpool.h
+++ b/include/uno/threadpool.h
@@ -20,8 +20,8 @@
 #ifndef INCLUDED_UNO_THREADPOOL_H
 #define INCLUDED_UNO_THREADPOOL_H
 
-#include <cppu/cppudllapi.h>
-#include <sal/types.h>
+#include "cppu/cppudllapi.h"
+#include "sal/types.h"
 
 #ifdef __cplusplus
 extern "C" {
author	Stephan Bergmann <sbergman@redhat.com>	2017-10-23 22:22:50 +0200
committer	Stephan Bergmann <sbergman@redhat.com>	2017-10-23 22:22:50 +0200
commit	189abcf0db61c41a565bd355294bf6e712fc3e5a (patch)
tree	97886355fdcdd9cca038611d67e0d889d3f77dd7
parent	340c5c20c264277b3ac1cb9cfcdbb0499ae471d7 (diff)