fdo#65108 inter-module includes <>

Change-Id: Iac3debc892d420ab50c1b38446334d30488648dc

78 files changed, 130 insertions, 130 deletions

diff --git a/include/comphelper/ChainablePropertySet.hxx b/include/comphelper/ChainablePropertySet.hxx
index 262dfd1b2230..beb6942c05ba 100644
--- a/include/comphelper/ChainablePropertySet.hxx
+++ b/include/comphelper/ChainablePropertySet.hxx
@@ -24,8 +24,8 @@
 #include <com/sun/star/beans/XPropertyState.hpp>
 #include <com/sun/star/beans/XMultiPropertySet.hpp>
 #include <comphelper/PropertyInfoHash.hxx>
-#include "comphelper/comphelperdllapi.h"
-#include "comphelper/solarmutex.hxx"
+#include <comphelper/comphelperdllapi.h>
+#include <comphelper/solarmutex.hxx>
 
 namespace comphelper
 {
diff --git a/include/comphelper/ChainablePropertySetInfo.hxx b/include/comphelper/ChainablePropertySetInfo.hxx
index 1de74e1cd41e..5e8e546d0354 100644
--- a/include/comphelper/ChainablePropertySetInfo.hxx
+++ b/include/comphelper/ChainablePropertySetInfo.hxx
@@ -24,7 +24,7 @@
 #include <comphelper/PropertyInfoHash.hxx>
 #include <cppuhelper/implbase1.hxx>
 #include <comphelper/TypeGeneration.hxx>
-#include "comphelper/comphelperdllapi.h"
+#include <comphelper/comphelperdllapi.h>
 
 /*
  * A ChainablePropertySetInfo is usually initialised with a pointer to the first element
diff --git a/include/comphelper/MasterPropertySet.hxx b/include/comphelper/MasterPropertySet.hxx
index 7047b2258069..c11e2ccdd6ba 100644
--- a/include/comphelper/MasterPropertySet.hxx
+++ b/include/comphelper/MasterPropertySet.hxx
@@ -23,8 +23,8 @@
 #include <com/sun/star/beans/XPropertyState.hpp>
 #include <com/sun/star/beans/XMultiPropertySet.hpp>
 #include <comphelper/PropertyInfoHash.hxx>
-#include "comphelper/comphelperdllapi.h"
-#include "comphelper/solarmutex.hxx"
+#include <comphelper/comphelperdllapi.h>
+#include <comphelper/solarmutex.hxx>
 #include <map>
 
 namespace comphelper
diff --git a/include/comphelper/MasterPropertySetInfo.hxx b/include/comphelper/MasterPropertySetInfo.hxx
index 9a81588cfabf..15664f185f01 100644
--- a/include/comphelper/MasterPropertySetInfo.hxx
+++ b/include/comphelper/MasterPropertySetInfo.hxx
@@ -23,7 +23,7 @@
 #include <comphelper/PropertyInfoHash.hxx>
 #include <cppuhelper/implbase1.hxx>
 #include <comphelper/TypeGeneration.hxx>
-#include "comphelper/comphelperdllapi.h"
+#include <comphelper/comphelperdllapi.h>
 
 namespace comphelper
 {
diff --git a/include/comphelper/SelectionMultiplex.hxx b/include/comphelper/SelectionMultiplex.hxx
index 72b1ad8189de..114373df8db0 100644
--- a/include/comphelper/SelectionMultiplex.hxx
+++ b/include/comphelper/SelectionMultiplex.hxx
@@ -23,7 +23,7 @@
 #include <com/sun/star/view/XSelectionChangeListener.hpp>
 #include <com/sun/star/view/XSelectionSupplier.hpp>
 #include <cppuhelper/implbase1.hxx>
-#include "comphelper/comphelperdllapi.h"
+#include <comphelper/comphelperdllapi.h>
 
 //=========================================================================
 //= selection helper classes
diff --git a/include/comphelper/TypeGeneration.hxx b/include/comphelper/TypeGeneration.hxx
index a2435729c4a5..6e03c0b688b2 100644
--- a/include/comphelper/TypeGeneration.hxx
+++ b/include/comphelper/TypeGeneration.hxx
@@ -21,7 +21,7 @@
 #define INCLUDED_COMPHELPER_TYPEGENERATION_HXX
 
 #include <sal/types.h>
-#include "comphelper/comphelperdllapi.h"
+#include <comphelper/comphelperdllapi.h>
 
 #define CPPU_E2T(type)      ((com::sun::star::uno::Type*)type)
 
diff --git a/include/comphelper/accessiblecomponenthelper.hxx b/include/comphelper/accessiblecomponenthelper.hxx
index 53ec9e10a58a..b352371537fe 100644
--- a/include/comphelper/accessiblecomponenthelper.hxx
+++ b/include/comphelper/accessiblecomponenthelper.hxx
@@ -25,7 +25,7 @@
 #include <comphelper/accessiblecontexthelper.hxx>
 #include <cppuhelper/implbase1.hxx>
 #include <comphelper/uno3.hxx>
-#include "comphelper/comphelperdllapi.h"
+#include <comphelper/comphelperdllapi.h>
 
 //.........................................................................
 namespace comphelper
diff --git a/include/comphelper/accessiblecontexthelper.hxx b/include/comphelper/accessiblecontexthelper.hxx
index 6e523d96afec..3cab201feabb 100644
--- a/include/comphelper/accessiblecontexthelper.hxx
+++ b/include/comphelper/accessiblecontexthelper.hxx
@@ -25,7 +25,7 @@
 #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp>
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <comphelper/broadcasthelper.hxx>
-#include "comphelper/comphelperdllapi.h"
+#include <comphelper/comphelperdllapi.h>
 
 //.........................................................................
 namespace comphelper
diff --git a/include/comphelper/accessiblekeybindinghelper.hxx b/include/comphelper/accessiblekeybindinghelper.hxx
index 527a8e99034b..03a838845dbb 100644
--- a/include/comphelper/accessiblekeybindinghelper.hxx
+++ b/include/comphelper/accessiblekeybindinghelper.hxx
@@ -26,7 +26,7 @@
 
 #include <vector>
 
-#include "comphelper/comphelperdllapi.h"
+#include <comphelper/comphelperdllapi.h>
 
 //..............................................................................
 namespace comphelper
diff --git a/include/comphelper/accessibleselectionhelper.hxx b/include/comphelper/accessibleselectionhelper.hxx
index 2ed234872caf..4876ace41739 100644
--- a/include/comphelper/accessibleselectionhelper.hxx
+++ b/include/comphelper/accessibleselectionhelper.hxx
@@ -24,7 +24,7 @@
 #include <comphelper/accessiblecomponenthelper.hxx>
 #include <cppuhelper/implbase1.hxx>
 #include <com/sun/star/accessibility/XAccessibleSelection.hpp>
-#include "comphelper/comphelperdllapi.h"
+#include <comphelper/comphelperdllapi.h>
 
 #define ACCESSIBLE_SELECTION_CHILD_ALL  ((sal_Int32)-1)
 #define ACCESSIBLE_SELECTION_CHILD_SELF ((sal_Int32)-2)
diff --git a/include/comphelper/accessibletexthelper.hxx b/include/comphelper/accessibletexthelper.hxx
index a3e80b6f3536..38f834e9f8d5 100644
--- a/include/comphelper/accessibletexthelper.hxx
+++ b/include/comphelper/accessibletexthelper.hxx
@@ -26,7 +26,7 @@
 #include <com/sun/star/i18n/XCharacterClassification.hpp>
 #include <comphelper/accessiblecomponenthelper.hxx>
 #include <cppuhelper/implbase1.hxx>
-#include "comphelper/comphelperdllapi.h"
+#include <comphelper/comphelperdllapi.h>
 
 
 //..............................................................................
diff --git a/include/comphelper/accessiblewrapper.hxx b/include/comphelper/accessiblewrapper.hxx
index 36e39dafa1d1..f97dc43051d8 100644
--- a/include/comphelper/accessiblewrapper.hxx
+++ b/include/comphelper/accessiblewrapper.hxx
@@ -36,7 +36,7 @@
 #include <comphelper/broadcasthelper.hxx>
 #include <comphelper/accessibleeventnotifier.hxx>
 #include <comphelper/stl_types.hxx>
-#include "comphelper/comphelperdllapi.h"
+#include <comphelper/comphelperdllapi.h>
 
 //.............................................................................
 namespace comphelper
diff --git a/include/comphelper/accimplaccess.hxx b/include/comphelper/accimplaccess.hxx
index 4406f9981338..defc617fe66c 100644
--- a/include/comphelper/accimplaccess.hxx
+++ b/include/comphelper/accimplaccess.hxx
@@ -22,7 +22,7 @@
 
 #include <cppuhelper/implbase1.hxx>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
-#include "comphelper/comphelperdllapi.h"
+#include <comphelper/comphelperdllapi.h>
 
 // forward declaration
 namespace com { namespace sun { namespace star { namespace accessibility {
diff --git a/include/comphelper/anycompare.hxx b/include/comphelper/anycompare.hxx
index 9ddcbf92683b..7bff8d456f17 100644
--- a/include/comphelper/anycompare.hxx
+++ b/include/comphelper/anycompare.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_COMPHELPER_ANYCOMPARE_HXX
 #define INCLUDED_COMPHELPER_ANYCOMPARE_HXX
 
-#include "comphelper/comphelperdllapi.h"
+#include <comphelper/comphelperdllapi.h>
 
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
 #include <com/sun/star/i18n/XCollator.hpp>
diff --git a/include/comphelper/anytostring.hxx b/include/comphelper/anytostring.hxx
index e68779854292..542fe4964461 100644
--- a/include/comphelper/anytostring.hxx
+++ b/include/comphelper/anytostring.hxx
@@ -20,9 +20,9 @@
 #ifndef INCLUDED_COMPHELPER_ANYTOSTRING_HXX
 #define INCLUDED_COMPHELPER_ANYTOSTRING_HXX
 
-#include "rtl/ustring.hxx"
-#include "com/sun/star/uno/Any.hxx"
-#include "comphelper/comphelperdllapi.h"
+#include <rtl/ustring.hxx>
+#include <com/sun/star/uno/Any.hxx>
+#include <comphelper/comphelperdllapi.h>
 
 namespace comphelper
 {
diff --git a/include/comphelper/asyncnotification.hxx b/include/comphelper/asyncnotification.hxx
index 64bbae4352c8..03c083106e0e 100644
--- a/include/comphelper/asyncnotification.hxx
+++ b/include/comphelper/asyncnotification.hxx
@@ -20,13 +20,13 @@
 #ifndef INCLUDED_COMPHELPER_ASYNCNOTIFICATION_HXX
 #define INCLUDED_COMPHELPER_ASYNCNOTIFICATION_HXX
 
-#include "sal/config.h"
+#include <sal/config.h>
 
-#include "boost/scoped_ptr.hpp"
-#include "comphelper/comphelperdllapi.h"
-#include "rtl/ref.hxx"
-#include "sal/types.h"
-#include "salhelper/thread.hxx"
+#include <boost/scoped_ptr.hpp>
+#include <comphelper/comphelperdllapi.h>
+#include <rtl/ref.hxx>
+#include <sal/types.h>
+#include <salhelper/thread.hxx>
 
 //........................................................................
 namespace comphelper
diff --git a/include/comphelper/basicio.hxx b/include/comphelper/basicio.hxx
index 9b7389c88847..119608d8d48e 100644
--- a/include/comphelper/basicio.hxx
+++ b/include/comphelper/basicio.hxx
@@ -22,7 +22,7 @@
 
 #include <com/sun/star/io/XPersistObject.hpp>
 #include <com/sun/star/awt/FontDescriptor.hpp>
-#include "comphelper/comphelperdllapi.h"
+#include <comphelper/comphelperdllapi.h>
 
 //.........................................................................
 namespace comphelper
diff --git a/include/comphelper/comphelperdllapi.h b/include/comphelper/comphelperdllapi.h
index 271e141c3f1b..3416513b94eb 100644
--- a/include/comphelper/comphelperdllapi.h
+++ b/include/comphelper/comphelperdllapi.h
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_COMPHELPER_COMPHELPERDLLAPI_H
 #define INCLUDED_COMPHELPER_COMPHELPERDLLAPI_H
 
-#include "sal/types.h"
+#include <sal/types.h>
 
 #if defined(COMPHELPER_DLLIMPLEMENTATION)
 #define COMPHELPER_DLLPUBLIC  SAL_DLLPUBLIC_EXPORT
diff --git a/include/comphelper/componentbase.hxx b/include/comphelper/componentbase.hxx
index d71e80569438..474313e03f54 100644
--- a/include/comphelper/componentbase.hxx
+++ b/include/comphelper/componentbase.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_COMPHELPER_COMPONENTBASE_HXX
 #define INCLUDED_COMPHELPER_COMPONENTBASE_HXX
 
-#include "comphelper/comphelperdllapi.h"
+#include <comphelper/comphelperdllapi.h>
 #include <cppuhelper/interfacecontainer.hxx>
 
 //........................................................................
diff --git a/include/comphelper/configuration.hxx b/include/comphelper/configuration.hxx
index 8eecc7facd91..9be907c2ef69 100644
--- a/include/comphelper/configuration.hxx
+++ b/include/comphelper/configuration.hxx
@@ -10,16 +10,16 @@
 #ifndef INCLUDED_COMPHELPER_CONFIGURATION_HXX
 #define INCLUDED_COMPHELPER_CONFIGURATION_HXX
 
-#include "sal/config.h"
-
-#include "boost/noncopyable.hpp"
-#include "boost/optional.hpp"
-#include "boost/shared_ptr.hpp"
-#include "com/sun/star/uno/Any.hxx"
-#include "com/sun/star/uno/Reference.hxx"
-#include "comphelper/comphelperdllapi.h"
-#include "comphelper/processfactory.hxx"
-#include "sal/types.h"
+#include <sal/config.h>
+
+#include <boost/noncopyable.hpp>
+#include <boost/optional.hpp>
+#include <boost/shared_ptr.hpp>
+#include <com/sun/star/uno/Any.hxx>
+#include <com/sun/star/uno/Reference.hxx>
+#include <comphelper/comphelperdllapi.h>
+#include <comphelper/processfactory.hxx>
+#include <sal/types.h>
 
 namespace com { namespace sun { namespace star {
     namespace configuration { class XReadWriteAccess; }
diff --git a/include/comphelper/configurationhelper.hxx b/include/comphelper/configurationhelper.hxx
index 9d1a93448ced..41d42238f24b 100644
--- a/include/comphelper/configurationhelper.hxx
+++ b/include/comphelper/configurationhelper.hxx
@@ -29,7 +29,7 @@
 #include <comphelper/sequenceasvector.hxx>
 #include <rtl/ustring.hxx>
 #include <rtl/ustrbuf.hxx>
-#include "comphelper/comphelperdllapi.h"
+#include <comphelper/comphelperdllapi.h>
 
 //_______________________________________________
 // namespaces
diff --git a/include/comphelper/container.hxx b/include/comphelper/container.hxx
index 27c3d7916507..715424fcbc27 100644
--- a/include/comphelper/container.hxx
+++ b/include/comphelper/container.hxx
@@ -21,8 +21,8 @@
 #define INCLUDED_COMPHELPER_CONTAINER_HXX
 
 #include <vector>
-#include "com/sun/star/uno/Reference.hxx"
-#include "comphelper/comphelperdllapi.h"
+#include <com/sun/star/uno/Reference.hxx>
+#include <comphelper/comphelperdllapi.h>
 
 //.........................................................................
 namespace comphelper
diff --git a/include/comphelper/containermultiplexer.hxx b/include/comphelper/containermultiplexer.hxx
index 8903af3e9240..3ae623f8013f 100644
--- a/include/comphelper/containermultiplexer.hxx
+++ b/include/comphelper/containermultiplexer.hxx
@@ -23,7 +23,7 @@
 #include <com/sun/star/container/XContainer.hpp>
 #include <cppuhelper/implbase1.hxx>
 #include <osl/mutex.hxx>
-#include "comphelper/comphelperdllapi.h"
+#include <comphelper/comphelperdllapi.h>
 
 //.........................................................................
 namespace comphelper
diff --git a/include/comphelper/docpasswordhelper.hxx b/include/comphelper/docpasswordhelper.hxx
index 991d73bd43af..716309840226 100644
--- a/include/comphelper/docpasswordhelper.hxx
+++ b/include/comphelper/docpasswordhelper.hxx
@@ -21,9 +21,9 @@
 #define INCLUDED_COMPHELPER_DOCPASSWORDHELPER_HXX
 
 #include <com/sun/star/beans/NamedValue.hpp>
-#include "comphelper/comphelperdllapi.h"
+#include <comphelper/comphelperdllapi.h>
 #include <vector>
-#include "comphelper/docpasswordrequest.hxx"
+#include <comphelper/docpasswordrequest.hxx>
 
 namespace com { namespace sun { namespace star { namespace task { class XInteractionHandler; } } } }
 namespace com { namespace sun { namespace star { namespace beans { struct PropertyValue; } } } }
diff --git a/include/comphelper/docpasswordrequest.hxx b/include/comphelper/docpasswordrequest.hxx
index e2260c501bc5..1360a4342e13 100644
--- a/include/comphelper/docpasswordrequest.hxx
+++ b/include/comphelper/docpasswordrequest.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_COMPHELPER_DOCPASSWORDREQUEST_HXX
 #define INCLUDED_COMPHELPER_DOCPASSWORDREQUEST_HXX
 
-#include "comphelper/comphelperdllapi.h"
+#include <comphelper/comphelperdllapi.h>
 #include <com/sun/star/task/PasswordRequestMode.hpp>
 #include <com/sun/star/task/XInteractionRequest.hpp>
 #include <cppuhelper/implbase1.hxx>
diff --git a/include/comphelper/documentinfo.hxx b/include/comphelper/documentinfo.hxx
index fa3df30435dc..90e5975a2cd4 100644
--- a/include/comphelper/documentinfo.hxx
+++ b/include/comphelper/documentinfo.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_COMPHELPER_DOCUMENTINFO_HXX
 #define INCLUDED_COMPHELPER_DOCUMENTINFO_HXX
 
-#include "comphelper/comphelperdllapi.h"
+#include <comphelper/comphelperdllapi.h>
 
 #include <com/sun/star/frame/XModel.hpp>
 
diff --git a/include/comphelper/embeddedobjectcontainer.hxx b/include/comphelper/embeddedobjectcontainer.hxx
index af2f422a2023..7ce0566c926c 100644
--- a/include/comphelper/embeddedobjectcontainer.hxx
+++ b/include/comphelper/embeddedobjectcontainer.hxx
@@ -27,7 +27,7 @@
 #include <com/sun/star/io/XInputStream.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/frame/XModel.hpp>
-#include "comphelper/comphelperdllapi.h"
+#include <comphelper/comphelperdllapi.h>
 
 #include <rtl/ustring.hxx>
 
diff --git a/include/comphelper/enumhelper.hxx b/include/comphelper/enumhelper.hxx
index f2d8841ac4fb..3753772bd4d0 100644
--- a/include/comphelper/enumhelper.hxx
+++ b/include/comphelper/enumhelper.hxx
@@ -28,7 +28,7 @@
 #include <cppuhelper/implbase1.hxx>
 #include <cppuhelper/implbase2.hxx>
 #include <osl/mutex.hxx>
-#include "comphelper/comphelperdllapi.h"
+#include <comphelper/comphelperdllapi.h>
 
 //.........................................................................
 namespace comphelper
diff --git a/include/comphelper/eventattachermgr.hxx b/include/comphelper/eventattachermgr.hxx
index 3c9ef129ef51..335aa20c4dd1 100644
--- a/include/comphelper/eventattachermgr.hxx
+++ b/include/comphelper/eventattachermgr.hxx
@@ -21,7 +21,7 @@
 #define INCLUDED_COMPHELPER_EVENTATTACHERMGR_HXX
 
 #include <com/sun/star/uno/Reference.hxx>
-#include "comphelper/comphelperdllapi.h"
+#include <comphelper/comphelperdllapi.h>
 
 namespace com { namespace sun { namespace star {
 namespace uno {
diff --git a/include/comphelper/evtlistenerhlp.hxx b/include/comphelper/evtlistenerhlp.hxx
index 3398e303bf39..8359a4c3a2bc 100644
--- a/include/comphelper/evtlistenerhlp.hxx
+++ b/include/comphelper/evtlistenerhlp.hxx
@@ -23,7 +23,7 @@
 #include <com/sun/star/lang/XEventListener.hpp>
 #include <osl/diagnose.h>
 #include <cppuhelper/weakref.hxx>
-#include "comphelper/comphelperdllapi.h"
+#include <comphelper/comphelperdllapi.h>
 
 //........................................................................
 namespace comphelper
diff --git a/include/comphelper/expandmacro.hxx b/include/comphelper/expandmacro.hxx
index b795357c7785..e85c55b42046 100644
--- a/include/comphelper/expandmacro.hxx
+++ b/include/comphelper/expandmacro.hxx
@@ -10,8 +10,8 @@
 #ifndef INCLUDED_COMPHELPER_EXPANDMACRO_HXX
 #define INCLUDED_COMPHELPER_EXPANDMACRO_HXX
 
-#include "rtl/ustring.hxx"
-#include "comphelper/comphelperdllapi.h"
+#include <rtl/ustring.hxx>
+#include <comphelper/comphelperdllapi.h>
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/uno/XComponentContext.hpp>
 
diff --git a/include/comphelper/extract.hxx b/include/comphelper/extract.hxx
index 2cc12c2abceb..04be9ec3f55b 100644
--- a/include/comphelper/extract.hxx
+++ b/include/comphelper/extract.hxx
@@ -24,7 +24,7 @@
 #include <com/sun/star/uno/TypeClass.hpp>
 #include <com/sun/star/uno/Type.hxx>
 #include <com/sun/star/uno/Any.hxx>
-#include "cppu/unotype.hxx"
+#include <cppu/unotype.hxx>
 
 namespace cppu
 {
diff --git a/include/comphelper/flagguard.hxx b/include/comphelper/flagguard.hxx
index 713e624e9b47..30b43b67eb52 100644
--- a/include/comphelper/flagguard.hxx
+++ b/include/comphelper/flagguard.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_COMPHELPER_FLAGGUARD_HXX
 #define INCLUDED_COMPHELPER_FLAGGUARD_HXX
 
-#include "comphelper/scopeguard.hxx"
+#include <comphelper/scopeguard.hxx>
 
 //......................................................................................................................
 namespace comphelper
diff --git a/include/comphelper/genericpropertyset.hxx b/include/comphelper/genericpropertyset.hxx
index 359d182b6ed8..0eba44325c91 100644
--- a/include/comphelper/genericpropertyset.hxx
+++ b/include/comphelper/genericpropertyset.hxx
@@ -22,7 +22,7 @@
 
 #include <comphelper/propertysetinfo.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
-#include "comphelper/comphelperdllapi.h"
+#include <comphelper/comphelperdllapi.h>
 
 namespace comphelper
 {
diff --git a/include/comphelper/ihwrapnofilter.hxx b/include/comphelper/ihwrapnofilter.hxx
index 513bb225731d..28b3ffc5db31 100644
--- a/include/comphelper/ihwrapnofilter.hxx
+++ b/include/comphelper/ihwrapnofilter.hxx
@@ -28,7 +28,7 @@
 #include <com/sun/star/frame/DoubleInitializationException.hpp>
 
 #include <cppuhelper/implbase2.hxx>
-#include "comphelper/comphelperdllapi.h"
+#include <comphelper/comphelperdllapi.h>
 
 namespace comphelper {
 
diff --git a/include/comphelper/implbase_var.hxx b/include/comphelper/implbase_var.hxx
index fee9eb695c08..bb02de5200d8 100644
--- a/include/comphelper/implbase_var.hxx
+++ b/include/comphelper/implbase_var.hxx
@@ -41,7 +41,7 @@
     #ifndef INCLUDED_COMPHELPER_IMPLBASE_VAR_HXX_<N>
     #define INCLUDED_COMPHELPER_IMPLBASE_VAR_HXX_<N>
     #define COMPHELPER_IMPLBASE_INTERFACE_NUMBER <N>
-    #include "comphelper/implbase_var.hxx"
+    #include <comphelper/implbase_var.hxx>
     #endif
 
     Additionally you can
@@ -65,13 +65,13 @@
 #define COMPHELPER_IMPLBASE_MAX_CTOR_ARGS 6 // default
 #endif
 
-#include "cppuhelper/implbase_ex.hxx"
-#include "rtl/instance.hxx"
-#include "cppuhelper/compbase_ex.hxx"
+#include <cppuhelper/implbase_ex.hxx>
+#include <rtl/instance.hxx>
+#include <cppuhelper/compbase_ex.hxx>
 
-#include "boost/preprocessor/cat.hpp"
-#include "boost/preprocessor/repetition.hpp"
-#include "boost/preprocessor/arithmetic/add.hpp"
+#include <boost/preprocessor/cat.hpp>
+#include <boost/preprocessor/repetition.hpp>
+#include <boost/preprocessor/arithmetic/add.hpp>
 
 namespace comphelper {
 
diff --git a/include/comphelper/interaction.hxx b/include/comphelper/interaction.hxx
index 68ef19dd1543..85cbc6acddb8 100644
--- a/include/comphelper/interaction.hxx
+++ b/include/comphelper/interaction.hxx
@@ -28,7 +28,7 @@
 #include <com/sun/star/task/XInteractionRetry.hpp>
 #include <com/sun/star/task/XInteractionPassword.hpp>
 #include <com/sun/star/task/XInteractionRequest.hpp>
-#include "comphelper/comphelperdllapi.h"
+#include <comphelper/comphelperdllapi.h>
 
 //.........................................................................
 namespace comphelper
diff --git a/include/comphelper/listenernotification.hxx b/include/comphelper/listenernotification.hxx
index 888508b6b328..ecf77873d507 100644
--- a/include/comphelper/listenernotification.hxx
+++ b/include/comphelper/listenernotification.hxx
@@ -23,7 +23,7 @@
 #include <cppuhelper/interfacecontainer.hxx>
 
 #include <com/sun/star/lang/XEventListener.hpp>
-#include "comphelper/comphelperdllapi.h"
+#include <comphelper/comphelperdllapi.h>
 
 #include <memory>
 
diff --git a/include/comphelper/make_shared_from_uno.hxx b/include/comphelper/make_shared_from_uno.hxx
index 2a70094a3f94..03bc03c6036c 100644
--- a/include/comphelper/make_shared_from_uno.hxx
+++ b/include/comphelper/make_shared_from_uno.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_COMPHELPER_MAKE_SHARED_FROM_UNO_HXX
 #define INCLUDED_COMPHELPER_MAKE_SHARED_FROM_UNO_HXX
 
-#include "boost/shared_ptr.hpp"
+#include <boost/shared_ptr.hpp>
 #include <functional>
 
 namespace comphelper {
diff --git a/include/comphelper/makesequence.hxx b/include/comphelper/makesequence.hxx
index 19d1e8e7e257..48bb57c17910 100644
--- a/include/comphelper/makesequence.hxx
+++ b/include/comphelper/makesequence.hxx
@@ -20,10 +20,10 @@
 #ifndef INCLUDED_COMPHELPER_MAKESEQUENCE_HXX
 #define INCLUDED_COMPHELPER_MAKESEQUENCE_HXX
 
-#include "com/sun/star/uno/Sequence.hxx"
-#include "boost/preprocessor/cat.hpp"
-#include "boost/preprocessor/repetition.hpp"
-#include "boost/preprocessor/arithmetic/add.hpp"
+#include <com/sun/star/uno/Sequence.hxx>
+#include <boost/preprocessor/cat.hpp>
+#include <boost/preprocessor/repetition.hpp>
+#include <boost/preprocessor/arithmetic/add.hpp>
 
 namespace comphelper {
 
diff --git a/include/comphelper/mediadescriptor.hxx b/include/comphelper/mediadescriptor.hxx
index 3ca74d95ddf6..3080c496aab2 100644
--- a/include/comphelper/mediadescriptor.hxx
+++ b/include/comphelper/mediadescriptor.hxx
@@ -22,7 +22,7 @@
 
 #include <comphelper/sequenceashashmap.hxx>
 #include <rtl/ustring.hxx>
-#include "comphelper/comphelperdllapi.h"
+#include <comphelper/comphelperdllapi.h>
 
 namespace com { namespace sun { namespace star { namespace io {
     class XInputStream;
diff --git a/include/comphelper/mimeconfighelper.hxx b/include/comphelper/mimeconfighelper.hxx
index 293d21154603..c8fcfddaf81b 100644
--- a/include/comphelper/mimeconfighelper.hxx
+++ b/include/comphelper/mimeconfighelper.hxx
@@ -29,7 +29,7 @@
 #include <com/sun/star/beans/NamedValue.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/embed/VerbDescriptor.hpp>
-#include "comphelper/comphelperdllapi.h"
+#include <comphelper/comphelperdllapi.h>
 
 
 namespace comphelper {
diff --git a/include/comphelper/namecontainer.hxx b/include/comphelper/namecontainer.hxx
index 1e600ae5eda8..b3374836d0bc 100644
--- a/include/comphelper/namecontainer.hxx
+++ b/include/comphelper/namecontainer.hxx
@@ -22,7 +22,7 @@
 
 #include <com/sun/star/uno/Type.hxx>
 #include <com/sun/star/container/XNameContainer.hpp>
-#include "comphelper/comphelperdllapi.h"
+#include <comphelper/comphelperdllapi.h>
 
 namespace comphelper
 {
diff --git a/include/comphelper/numberedcollection.hxx b/include/comphelper/numberedcollection.hxx
index 351b1014abec..868b89d74985 100644
--- a/include/comphelper/numberedcollection.hxx
+++ b/include/comphelper/numberedcollection.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_COMPHELPER_NUMBEREDCOLLECTION_HXX
 #define INCLUDED_COMPHELPER_NUMBEREDCOLLECTION_HXX
 
-#include "comphelper/comphelperdllapi.h"
+#include <comphelper/comphelperdllapi.h>
 
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
diff --git a/include/comphelper/numbers.hxx b/include/comphelper/numbers.hxx
index 18c7e2e44473..f02604794749 100644
--- a/include/comphelper/numbers.hxx
+++ b/include/comphelper/numbers.hxx
@@ -23,7 +23,7 @@
 #include <com/sun/star/util/XNumberFormats.hpp>
 #include <com/sun/star/util/XNumberFormatter.hpp>
 #include <com/sun/star/lang/Locale.hpp>
-#include "comphelper/comphelperdllapi.h"
+#include <comphelper/comphelperdllapi.h>
 
 //.........................................................................
 namespace comphelper
diff --git a/include/comphelper/optional.hxx b/include/comphelper/optional.hxx
index 031a30328340..a1ffba09cdf9 100644
--- a/include/comphelper/optional.hxx
+++ b/include/comphelper/optional.hxx
@@ -19,8 +19,8 @@
 #ifndef INCLUDED_COMPHELPER_OPTIONAL_HXX
 #define INCLUDED_COMPHELPER_OPTIONAL_HXX
 
-#include "com/sun/star/beans/Optional.hpp"
-#include "boost/optional.hpp"
+#include <com/sun/star/beans/Optional.hpp>
+#include <boost/optional.hpp>
 
 namespace comphelper {
 
diff --git a/include/comphelper/oslfile2streamwrap.hxx b/include/comphelper/oslfile2streamwrap.hxx
index d0ccbef4e05e..bb1b79b00eed 100644
--- a/include/comphelper/oslfile2streamwrap.hxx
+++ b/include/comphelper/oslfile2streamwrap.hxx
@@ -24,7 +24,7 @@
 #include <com/sun/star/io/XInputStream.hpp>
 #include <cppuhelper/implbase1.hxx>
 #include <osl/file.hxx>
-#include "comphelper/comphelperdllapi.h"
+#include <comphelper/comphelperdllapi.h>
 
 namespace comphelper
 {
diff --git a/include/comphelper/processfactory.hxx b/include/comphelper/processfactory.hxx
index 36f54ba4f885..c795757ec3dc 100644
--- a/include/comphelper/processfactory.hxx
+++ b/include/comphelper/processfactory.hxx
@@ -22,7 +22,7 @@
 
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/uno/Sequence.hxx>
-#include "comphelper/comphelperdllapi.h"
+#include <comphelper/comphelperdllapi.h>
 
 namespace com { namespace sun { namespace star { namespace lang {
     class XMultiServiceFactory;
diff --git a/include/comphelper/propagg.hxx b/include/comphelper/propagg.hxx
index ecd8f9812975..62a3d59509c5 100644
--- a/include/comphelper/propagg.hxx
+++ b/include/comphelper/propagg.hxx
@@ -22,7 +22,7 @@
 
 #include <com/sun/star/uno/XAggregation.hpp>
 #include <comphelper/propstate.hxx>
-#include "comphelper/comphelperdllapi.h"
+#include <comphelper/comphelperdllapi.h>
 
 #include <map>
 
diff --git a/include/comphelper/property.hxx b/include/comphelper/property.hxx
index 086565a7d87d..911df7fd9f56 100644
--- a/include/comphelper/property.hxx
+++ b/include/comphelper/property.hxx
@@ -25,8 +25,8 @@
 #include <com/sun/star/beans/Property.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <functional>
-#include "comphelper/comphelperdllapi.h"
-#include "cppu/unotype.hxx"
+#include <comphelper/comphelperdllapi.h>
+#include <cppu/unotype.hxx>
 
 //=========================================================================
 //= property helper classes
diff --git a/include/comphelper/propertybag.hxx b/include/comphelper/propertybag.hxx
index 1327055f03f5..b8caf54868de 100644
--- a/include/comphelper/propertybag.hxx
+++ b/include/comphelper/propertybag.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_COMPHELPER_PROPERTYBAG_HXX
 #define INCLUDED_COMPHELPER_PROPERTYBAG_HXX
 
-#include "comphelper/comphelperdllapi.h"
+#include <comphelper/comphelperdllapi.h>
 #include <comphelper/propertycontainerhelper.hxx>
 
 #include <memory>
diff --git a/include/comphelper/propertycontainer.hxx b/include/comphelper/propertycontainer.hxx
index 4c44310837b6..e34822564a40 100644
--- a/include/comphelper/propertycontainer.hxx
+++ b/include/comphelper/propertycontainer.hxx
@@ -23,7 +23,7 @@
 #include <comphelper/propertycontainerhelper.hxx>
 #include <cppuhelper/propshlp.hxx>
 #include <com/sun/star/uno/Type.hxx>
-#include "comphelper/comphelperdllapi.h"
+#include <comphelper/comphelperdllapi.h>
 
 //.........................................................................
 namespace comphelper
diff --git a/include/comphelper/propertycontainerhelper.hxx b/include/comphelper/propertycontainerhelper.hxx
index f0b4eef554c0..a70b73aea26c 100644
--- a/include/comphelper/propertycontainerhelper.hxx
+++ b/include/comphelper/propertycontainerhelper.hxx
@@ -24,7 +24,7 @@
 #include <com/sun/star/uno/Type.hxx>
 #include <com/sun/star/beans/Property.hpp>
 #include <vector>
-#include "comphelper/comphelperdllapi.h"
+#include <comphelper/comphelperdllapi.h>
 
 //.........................................................................
 namespace comphelper
diff --git a/include/comphelper/propertysethelper.hxx b/include/comphelper/propertysethelper.hxx
index 29793b2cb54a..cd86c29e1181 100644
--- a/include/comphelper/propertysethelper.hxx
+++ b/include/comphelper/propertysethelper.hxx
@@ -23,7 +23,7 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/beans/XPropertyState.hpp>
 #include <com/sun/star/beans/XMultiPropertySet.hpp>
-#include "comphelper/comphelperdllapi.h"
+#include <comphelper/comphelperdllapi.h>
 
 //=========================================================================
 //= property helper classes
diff --git a/include/comphelper/propertysetinfo.hxx b/include/comphelper/propertysetinfo.hxx
index ea11ba07b5f1..bc2b8a4ac64f 100644
--- a/include/comphelper/propertysetinfo.hxx
+++ b/include/comphelper/propertysetinfo.hxx
@@ -23,7 +23,7 @@
 #include <com/sun/star/beans/XPropertySetInfo.hpp>
 #include <cppuhelper/implbase1.hxx>
 #include <comphelper/stl_types.hxx>
-#include "comphelper/comphelperdllapi.h"
+#include <comphelper/comphelperdllapi.h>
 
 //=========================================================================
 //= property helper classes
diff --git a/include/comphelper/propertystatecontainer.hxx b/include/comphelper/propertystatecontainer.hxx
index 68ead5bf8c3e..23567916db6f 100644
--- a/include/comphelper/propertystatecontainer.hxx
+++ b/include/comphelper/propertystatecontainer.hxx
@@ -25,7 +25,7 @@
 #include <cppuhelper/implbase1.hxx>
 #include <comphelper/uno3.hxx>
 #include <osl/diagnose.h>
-#include "comphelper/comphelperdllapi.h"
+#include <comphelper/comphelperdllapi.h>
 
 #include <map>
 
diff --git a/include/comphelper/propmultiplex.hxx b/include/comphelper/propmultiplex.hxx
index ab2c36a1f6b6..02799f9ab049 100644
--- a/include/comphelper/propmultiplex.hxx
+++ b/include/comphelper/propmultiplex.hxx
@@ -22,7 +22,7 @@
 
 #include <comphelper/propstate.hxx>
 #include <cppuhelper/implbase1.hxx>
-#include "comphelper/comphelperdllapi.h"
+#include <comphelper/comphelperdllapi.h>
 
 //=========================================================================
 //= property helper classes
diff --git a/include/comphelper/propstate.hxx b/include/comphelper/propstate.hxx
index 0354e68f36b8..c6da2a5c8e81 100644
--- a/include/comphelper/propstate.hxx
+++ b/include/comphelper/propstate.hxx
@@ -30,7 +30,7 @@
 #include <comphelper/uno3.hxx>
 #include <comphelper/broadcasthelper.hxx>
 #include <com/sun/star/lang/XTypeProvider.hpp>
-#include "comphelper/comphelperdllapi.h"
+#include <comphelper/comphelperdllapi.h>
 
 //=========================================================================
 //= property helper classes
diff --git a/include/comphelper/proxyaggregation.hxx b/include/comphelper/proxyaggregation.hxx
index 2c01a7a3587f..040eac6b1e5f 100644
--- a/include/comphelper/proxyaggregation.hxx
+++ b/include/comphelper/proxyaggregation.hxx
@@ -28,7 +28,7 @@
 #include <comphelper/uno3.hxx>
 #include <comphelper/broadcasthelper.hxx>
 #include <cppuhelper/compbase_ex.hxx>
-#include "comphelper/comphelperdllapi.h"
+#include <comphelper/comphelperdllapi.h>
 
 /* class hierarchy herein:
 
diff --git a/include/comphelper/scopeguard.hxx b/include/comphelper/scopeguard.hxx
index 5bc2aafaa781..7e7d0e3e8300 100644
--- a/include/comphelper/scopeguard.hxx
+++ b/include/comphelper/scopeguard.hxx
@@ -20,10 +20,10 @@
 #ifndef INCLUDED_COMPHELPER_SCOPEGUARD_HXX
 #define INCLUDED_COMPHELPER_SCOPEGUARD_HXX
 
-#include "comphelper/comphelperdllapi.h"
-#include "boost/function.hpp"
-#include "boost/noncopyable.hpp"
-#include "boost/bind.hpp"
+#include <comphelper/comphelperdllapi.h>
+#include <boost/function.hpp>
+#include <boost/noncopyable.hpp>
+#include <boost/bind.hpp>
 
 namespace comphelper {
 
diff --git a/include/comphelper/seekableinput.hxx b/include/comphelper/seekableinput.hxx
index 603ecc62e943..11dd6685353b 100644
--- a/include/comphelper/seekableinput.hxx
+++ b/include/comphelper/seekableinput.hxx
@@ -25,7 +25,7 @@
 #include <com/sun/star/io/XInputStream.hpp>
 #include <com/sun/star/io/XSeekable.hpp>
 #include <cppuhelper/implbase2.hxx>
-#include "comphelper/comphelperdllapi.h"
+#include <comphelper/comphelperdllapi.h>
 
 namespace comphelper
 {
diff --git a/include/comphelper/seqstream.hxx b/include/comphelper/seqstream.hxx
index 3c82e2e237e5..4c73af24d484 100644
--- a/include/comphelper/seqstream.hxx
+++ b/include/comphelper/seqstream.hxx
@@ -27,7 +27,7 @@
 #include <osl/mutex.hxx>
 #include <cppuhelper/implbase1.hxx>
 #include <cppuhelper/implbase2.hxx>
-#include "comphelper/comphelperdllapi.h"
+#include <comphelper/comphelperdllapi.h>
 
 namespace comphelper
 {
diff --git a/include/comphelper/sequence.hxx b/include/comphelper/sequence.hxx
index 3d324769a4cc..3cafedf0f622 100644
--- a/include/comphelper/sequence.hxx
+++ b/include/comphelper/sequence.hxx
@@ -23,7 +23,7 @@
 #include <algorithm>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <osl/diagnose.h>
-#include "comphelper/comphelperdllapi.h"
+#include <comphelper/comphelperdllapi.h>
 
 #include <vector>
 
diff --git a/include/comphelper/sequenceashashmap.hxx b/include/comphelper/sequenceashashmap.hxx
index 9caa63abb7db..e6d44a3678be 100644
--- a/include/comphelper/sequenceashashmap.hxx
+++ b/include/comphelper/sequenceashashmap.hxx
@@ -28,7 +28,7 @@
 #include <com/sun/star/beans/NamedValue.hpp>
 
 #include <com/sun/star/beans/IllegalTypeException.hpp>
-#include "comphelper/comphelperdllapi.h"
+#include <comphelper/comphelperdllapi.h>
 
 
 namespace comphelper{
diff --git a/include/comphelper/serviceinfohelper.hxx b/include/comphelper/serviceinfohelper.hxx
index f0ff655bc86b..0d9f939ef1fd 100644
--- a/include/comphelper/serviceinfohelper.hxx
+++ b/include/comphelper/serviceinfohelper.hxx
@@ -21,7 +21,7 @@
 #define INCLUDED_COMPHELPER_SERVICEINFOHELPER_HXX
 
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include "comphelper/comphelperdllapi.h"
+#include <comphelper/comphelperdllapi.h>
 
 namespace comphelper {
 
diff --git a/include/comphelper/sharedmutex.hxx b/include/comphelper/sharedmutex.hxx
index 9dbe2e72d208..a7282e291825 100644
--- a/include/comphelper/sharedmutex.hxx
+++ b/include/comphelper/sharedmutex.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_COMPHELPER_SHAREDMUTEX_HXX
 #define INCLUDED_COMPHELPER_SHAREDMUTEX_HXX
 
-#include "comphelper/comphelperdllapi.h"
+#include <comphelper/comphelperdllapi.h>
 
 #include <osl/mutex.hxx>
 
diff --git a/include/comphelper/solarmutex.hxx b/include/comphelper/solarmutex.hxx
index f8fce1e3a608..6bb93f17aa27 100644
--- a/include/comphelper/solarmutex.hxx
+++ b/include/comphelper/solarmutex.hxx
@@ -20,10 +20,10 @@
 #ifndef INCLUDED_COMPHELPER_SOLARMUTEX_HXX
 #define INCLUDED_COMPHELPER_SOLARMUTEX_HXX
 
-#include "sal/config.h"
+#include <sal/config.h>
 
-#include "boost/noncopyable.hpp"
-#include "comphelper/comphelperdllapi.h"
+#include <boost/noncopyable.hpp>
+#include <comphelper/comphelperdllapi.h>
 
 namespace comphelper {
 
diff --git a/include/comphelper/stillreadwriteinteraction.hxx b/include/comphelper/stillreadwriteinteraction.hxx
index a3501d7b7a6c..dee1cfaa0f31 100644
--- a/include/comphelper/stillreadwriteinteraction.hxx
+++ b/include/comphelper/stillreadwriteinteraction.hxx
@@ -24,7 +24,7 @@
 
 #include <com/sun/star/task/XInteractionHandler.hpp>
 
-#include "comphelper/comphelperdllapi.h"
+#include <comphelper/comphelperdllapi.h>
 
 
 namespace comphelper{
diff --git a/include/comphelper/stl_types.hxx b/include/comphelper/stl_types.hxx
index de9e2ff7f5ff..4ed995ae3d7d 100644
--- a/include/comphelper/stl_types.hxx
+++ b/include/comphelper/stl_types.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_COMPHELPER_STL_TYPES_HXX
 #define INCLUDED_COMPHELPER_STL_TYPES_HXX
 
-#include "sal/config.h"
+#include <sal/config.h>
 
 #include <vector>
 #include <map>
diff --git a/include/comphelper/storagehelper.hxx b/include/comphelper/storagehelper.hxx
index 1c5a62c8ad68..1bf5f9a5b8c3 100644
--- a/include/comphelper/storagehelper.hxx
+++ b/include/comphelper/storagehelper.hxx
@@ -24,7 +24,7 @@
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/embed/ElementModes.hpp>
-#include "comphelper/comphelperdllapi.h"
+#include <comphelper/comphelperdllapi.h>
 
 
 #define PACKAGE_STORAGE_FORMAT_STRING   OUString( "PackageFormat" )
diff --git a/include/comphelper/streamsection.hxx b/include/comphelper/streamsection.hxx
index 787f6964f625..becf3fece45c 100644
--- a/include/comphelper/streamsection.hxx
+++ b/include/comphelper/streamsection.hxx
@@ -23,7 +23,7 @@
 #include <com/sun/star/io/XMarkableStream.hpp>
 #include <com/sun/star/io/XDataInputStream.hpp>
 #include <com/sun/star/io/XDataOutputStream.hpp>
-#include "comphelper/comphelperdllapi.h"
+#include <comphelper/comphelperdllapi.h>
 
 namespace comphelper
 {
diff --git a/include/comphelper/string.hxx b/include/comphelper/string.hxx
index 73f3ab9a706c..aa1b98532b61 100644
--- a/include/comphelper/string.hxx
+++ b/include/comphelper/string.hxx
@@ -20,10 +20,10 @@
 #ifndef INCLUDED_COMPHELPER_STRING_HXX
 #define INCLUDED_COMPHELPER_STRING_HXX
 
-#include "sal/config.h"
+#include <sal/config.h>
 
 #include <cstddef>
-#include "comphelper/comphelperdllapi.h"
+#include <comphelper/comphelperdllapi.h>
 #include <sal/types.h>
 #include <rtl/strbuf.hxx>
 #include <rtl/ustrbuf.hxx>
diff --git a/include/comphelper/synchronousdispatch.hxx b/include/comphelper/synchronousdispatch.hxx
index 1e945171b377..a61dbd69e257 100644
--- a/include/comphelper/synchronousdispatch.hxx
+++ b/include/comphelper/synchronousdispatch.hxx
@@ -20,12 +20,12 @@
 #ifndef INCLUDED_COMPHELPER_SYNCHRONOUSDISPATCH_HXX
 #define INCLUDED_COMPHELPER_SYNCHRONOUSDISPATCH_HXX
 
-#include "comphelper/comphelperdllapi.h"
+#include <comphelper/comphelperdllapi.h>
 
-#include "com/sun/star/uno/Reference.hxx"
-#include "com/sun/star/uno/Sequence.hxx"
+#include <com/sun/star/uno/Reference.hxx>
+#include <com/sun/star/uno/Sequence.hxx>
 
-#include "com/sun/star/beans/PropertyValue.hpp"
+#include <com/sun/star/beans/PropertyValue.hpp>
 
 namespace com { namespace sun { namespace star {
     namespace uno {
diff --git a/include/comphelper/types.hxx b/include/comphelper/types.hxx
index 8125f818c3d7..b57ff3595c89 100644
--- a/include/comphelper/types.hxx
+++ b/include/comphelper/types.hxx
@@ -27,8 +27,8 @@
 #include <com/sun/star/lang/XTypeProvider.hpp>
 #include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
-#include "comphelper/comphelperdllapi.h"
-#include "cppu/unotype.hxx"
+#include <comphelper/comphelperdllapi.h>
+#include <cppu/unotype.hxx>
 
 namespace com { namespace sun { namespace star { namespace awt {
     struct FontDescriptor;
diff --git a/include/comphelper/unwrapargs.hxx b/include/comphelper/unwrapargs.hxx
index 97ef629a31d3..3679fddb2edb 100644
--- a/include/comphelper/unwrapargs.hxx
+++ b/include/comphelper/unwrapargs.hxx
@@ -20,14 +20,14 @@
 #ifndef INCLUDED_COMPHELPER_UNWRAPARGS_HXX
 #define INCLUDED_COMPHELPER_UNWRAPARGS_HXX
 
-#include "rtl/ustrbuf.hxx"
-#include "com/sun/star/uno/Sequence.hxx"
-#include "com/sun/star/lang/IllegalArgumentException.hpp"
-#include "boost/optional.hpp"
-#include "boost/preprocessor/cat.hpp"
-#include "boost/preprocessor/repetition.hpp"
-#include "boost/preprocessor/arithmetic/add.hpp"
-#include "cppu/unotype.hxx"
+#include <rtl/ustrbuf.hxx>
+#include <com/sun/star/uno/Sequence.hxx>
+#include <com/sun/star/lang/IllegalArgumentException.hpp>
+#include <boost/optional.hpp>
+#include <boost/preprocessor/cat.hpp>
+#include <boost/preprocessor/repetition.hpp>
+#include <boost/preprocessor/arithmetic/add.hpp>
+#include <cppu/unotype.hxx>
 
 namespace comphelper {
 
diff --git a/include/comphelper/weak.hxx b/include/comphelper/weak.hxx
index 633f334fedba..0e9797829dde 100644
--- a/include/comphelper/weak.hxx
+++ b/include/comphelper/weak.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_COMPHELPER_WEAK_HXX
 #define INCLUDED_COMPHELPER_WEAK_HXX
 
-#include "comphelper/comphelperdllapi.h"
+#include <comphelper/comphelperdllapi.h>
 
 #include <com/sun/star/lang/XTypeProvider.hpp>
 #include <cppuhelper/weak.hxx>
diff --git a/include/comphelper/weakbag.hxx b/include/comphelper/weakbag.hxx
index b654baa2bda4..9ed55fb41489 100644
--- a/include/comphelper/weakbag.hxx
+++ b/include/comphelper/weakbag.hxx
@@ -20,12 +20,12 @@
 #ifndef INCLUDED_COMPHELPER_WEAKBAG_HXX
 #define INCLUDED_COMPHELPER_WEAKBAG_HXX
 
-#include "sal/config.h"
+#include <sal/config.h>
 
 #include <list>
-#include "com/sun/star/uno/Reference.hxx"
-#include "cppuhelper/weakref.hxx"
-#include "osl/diagnose.h"
+#include <com/sun/star/uno/Reference.hxx>
+#include <cppuhelper/weakref.hxx>
+#include <osl/diagnose.h>
 
 namespace comphelper {
 
diff --git a/include/comphelper/weakeventlistener.hxx b/include/comphelper/weakeventlistener.hxx
index 608d75ba3c60..734f91511d53 100644
--- a/include/comphelper/weakeventlistener.hxx
+++ b/include/comphelper/weakeventlistener.hxx
@@ -25,7 +25,7 @@
 #include <com/sun/star/uno/XWeak.hpp>
 #include <cppuhelper/weakref.hxx>
 #include <comphelper/broadcasthelper.hxx>
-#include "comphelper/comphelperdllapi.h"
+#include <comphelper/comphelperdllapi.h>
 
 //.........................................................................
 namespace comphelper