fdo#65108 inter-module includes <> include/unotools

Change-Id: Icd9b46da88366f5b260c8e20931b5dbdbedf3a66

57 files changed, 70 insertions, 70 deletions

diff --git a/include/unotools/accessiblerelationsethelper.hxx b/include/unotools/accessiblerelationsethelper.hxx
index 2d4fb57ab42e..0c75eba47cb4 100644
--- a/include/unotools/accessiblerelationsethelper.hxx
+++ b/include/unotools/accessiblerelationsethelper.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_UNOTOOLS_ACCESSIBLERELATIONSETHELPER_HXX
 #define INCLUDED_UNOTOOLS_ACCESSIBLERELATIONSETHELPER_HXX
 
-#include "unotools/unotoolsdllapi.h"
+#include <unotools/unotoolsdllapi.h>
 
 #include <com/sun/star/accessibility/XAccessibleRelationSet.hpp>
 #include <com/sun/star/uno/Reference.hxx>
diff --git a/include/unotools/accessiblestatesethelper.hxx b/include/unotools/accessiblestatesethelper.hxx
index 4e4622b0c9b0..fc2822858da2 100644
--- a/include/unotools/accessiblestatesethelper.hxx
+++ b/include/unotools/accessiblestatesethelper.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_UNOTOOLS_ACCESSIBLESTATESETHELPER_HXX
 #define INCLUDED_UNOTOOLS_ACCESSIBLESTATESETHELPER_HXX
 
-#include "unotools/unotoolsdllapi.h"
+#include <unotools/unotoolsdllapi.h>
 
 #include <com/sun/star/accessibility/XAccessibleStateSet.hpp>
 #include <com/sun/star/uno/Reference.hxx>
diff --git a/include/unotools/atom.hxx b/include/unotools/atom.hxx
index b9ca11e6bda7..617fc421d5e1 100644
--- a/include/unotools/atom.hxx
+++ b/include/unotools/atom.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_UNOTOOLS_ATOM_HXX
 #define INCLUDED_UNOTOOLS_ATOM_HXX
 
-#include "unotools/unotoolsdllapi.h"
+#include <unotools/unotoolsdllapi.h>
 #include <rtl/ustring.hxx>
 #include <osl/mutex.hxx>
 #include <cppuhelper/implbase1.hxx>
diff --git a/include/unotools/bootstrap.hxx b/include/unotools/bootstrap.hxx
index 93d009a857a3..e7afaee98097 100644
--- a/include/unotools/bootstrap.hxx
+++ b/include/unotools/bootstrap.hxx
@@ -16,7 +16,7 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#include "unotools/unotoolsdllapi.h"
+#include <unotools/unotoolsdllapi.h>
 
 #ifndef INCLUDED_UNOTOOLS_BOOTSTRAP_HXX
 #define INCLUDED_UNOTOOLS_BOOTSTRAP_HXX
diff --git a/include/unotools/calendarwrapper.hxx b/include/unotools/calendarwrapper.hxx
index ff9c4f67a290..d6b691c357a9 100644
--- a/include/unotools/calendarwrapper.hxx
+++ b/include/unotools/calendarwrapper.hxx
@@ -25,7 +25,7 @@
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/i18n/Calendar2.hpp>
 #include <com/sun/star/lang/Locale.hpp>
-#include "unotools/unotoolsdllapi.h"
+#include <unotools/unotoolsdllapi.h>
 
 namespace com { namespace sun { namespace star {
     namespace uno {
diff --git a/include/unotools/caserotate.hxx b/include/unotools/caserotate.hxx
index 38d1e0d596dd..36a93b1ee0d2 100644
--- a/include/unotools/caserotate.hxx
+++ b/include/unotools/caserotate.hxx
@@ -11,7 +11,7 @@
 
 #include <sal/config.h>
 
-#include "unotools/unotoolsdllapi.h"
+#include <unotools/unotoolsdllapi.h>
 
 //TODO Use XCharacterClassification::getStringType to determine the current
 //(possibly mixed) case type and rotate to the next one
diff --git a/include/unotools/charclass.hxx b/include/unotools/charclass.hxx
index f86f47b49be4..e0de7e1aeee4 100644
--- a/include/unotools/charclass.hxx
+++ b/include/unotools/charclass.hxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "unotools/unotoolsdllapi.h"
+#include <unotools/unotoolsdllapi.h>
 
 #ifndef INCLUDED_UNOTOOLS_CHARCLASS_HXX
 #define INCLUDED_UNOTOOLS_CHARCLASS_HXX
diff --git a/include/unotools/closeveto.hxx b/include/unotools/closeveto.hxx
index aa03500bf509..45086de72f21 100644
--- a/include/unotools/closeveto.hxx
+++ b/include/unotools/closeveto.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_UNOTOOLS_CLOSEVETO_HXX
 #define INCLUDED_UNOTOOLS_CLOSEVETO_HXX
 
-#include "unotools/unotoolsdllapi.h"
+#include <unotools/unotoolsdllapi.h>
 
 #include <com/sun/star/uno/XInterface.hpp>
 
diff --git a/include/unotools/cmdoptions.hxx b/include/unotools/cmdoptions.hxx
index c00e2d1807fa..8ba740ae4327 100644
--- a/include/unotools/cmdoptions.hxx
+++ b/include/unotools/cmdoptions.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_UNOTOOLS_CMDOPTIONS_HXX
 #define INCLUDED_UNOTOOLS_CMDOPTIONS_HXX
 
-#include "unotools/unotoolsdllapi.h"
+#include <unotools/unotoolsdllapi.h>
 #include <sal/types.h>
 #include <osl/mutex.hxx>
 #include <com/sun/star/uno/Sequence.h>
diff --git a/include/unotools/collatorwrapper.hxx b/include/unotools/collatorwrapper.hxx
index fbc645167957..e1fe3edba13e 100644
--- a/include/unotools/collatorwrapper.hxx
+++ b/include/unotools/collatorwrapper.hxx
@@ -16,7 +16,7 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#include "unotools/unotoolsdllapi.h"
+#include <unotools/unotoolsdllapi.h>
 
 #ifndef INCLUDED_UNOTOOLS_COLLATORWRAPPER_HXX
 #define INCLUDED_UNOTOOLS_COLLATORWRAPPER_HXX
diff --git a/include/unotools/compatibility.hxx b/include/unotools/compatibility.hxx
index 3e1b974a1c18..2583e051a16e 100644
--- a/include/unotools/compatibility.hxx
+++ b/include/unotools/compatibility.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_UNOTOOLS_COMPATIBILITY_HXX
 #define INCLUDED_UNOTOOLS_COMPATIBILITY_HXX
 
-#include "unotools/unotoolsdllapi.h"
+#include <unotools/unotoolsdllapi.h>
 #include <sal/types.h>
 #include <osl/mutex.hxx>
 #include <com/sun/star/uno/Sequence.h>
diff --git a/include/unotools/configitem.hxx b/include/unotools/configitem.hxx
index 552da5f435c3..99aeae948d2a 100644
--- a/include/unotools/configitem.hxx
+++ b/include/unotools/configitem.hxx
@@ -24,8 +24,8 @@
 #include <rtl/ustring.hxx>
 #include <com/sun/star/uno/Sequence.h>
 #include <com/sun/star/uno/Reference.h>
-#include "unotools/unotoolsdllapi.h"
-#include "unotools/options.hxx"
+#include <unotools/unotoolsdllapi.h>
+#include <unotools/options.hxx>
 
 //-----------------------------------------------------------------------------
 namespace com{ namespace sun{ namespace star{
diff --git a/include/unotools/configmgr.hxx b/include/unotools/configmgr.hxx
index 1b24feb026a1..4b63803ed96d 100644
--- a/include/unotools/configmgr.hxx
+++ b/include/unotools/configmgr.hxx
@@ -20,14 +20,14 @@
 #ifndef INCLUDED_UNOTOOLS_CONFIGMGR_HXX
 #define INCLUDED_UNOTOOLS_CONFIGMGR_HXX
 
-#include "sal/config.h"
+#include <sal/config.h>
 
 #include <list>
 
-#include "boost/noncopyable.hpp"
-#include "com/sun/star/uno/Reference.hxx"
-#include "sal/types.h"
-#include "unotools/unotoolsdllapi.h"
+#include <boost/noncopyable.hpp>
+#include <com/sun/star/uno/Reference.hxx>
+#include <sal/types.h>
+#include <unotools/unotoolsdllapi.h>
 
 namespace com { namespace sun { namespace star {
     namespace container{ class XHierarchicalNameAccess; }
diff --git a/include/unotools/confignode.hxx b/include/unotools/confignode.hxx
index a2240a3d3ac7..32c7706be4ec 100644
--- a/include/unotools/confignode.hxx
+++ b/include/unotools/confignode.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_UNOTOOLS_CONFIGNODE_HXX
 #define INCLUDED_UNOTOOLS_CONFIGNODE_HXX
 
-#include "unotools/unotoolsdllapi.h"
+#include <unotools/unotoolsdllapi.h>
 #include <com/sun/star/container/XHierarchicalNameAccess.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/container/XNameContainer.hpp>
diff --git a/include/unotools/configpaths.hxx b/include/unotools/configpaths.hxx
index 1e46a43de410..20f3a20e3de6 100644
--- a/include/unotools/configpaths.hxx
+++ b/include/unotools/configpaths.hxx
@@ -16,7 +16,7 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#include "unotools/unotoolsdllapi.h"
+#include <unotools/unotoolsdllapi.h>
 
 #ifndef INCLUDED_UNOTOOLS_CONFIGPATHS_HXX
 #define INCLUDED_UNOTOOLS_CONFIGPATHS_HXX
diff --git a/include/unotools/configvaluecontainer.hxx b/include/unotools/configvaluecontainer.hxx
index c510d0faf9f0..b095d239fe6b 100644
--- a/include/unotools/configvaluecontainer.hxx
+++ b/include/unotools/configvaluecontainer.hxx
@@ -16,7 +16,7 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#include "unotools/unotoolsdllapi.h"
+#include <unotools/unotoolsdllapi.h>
 
 #ifndef INCLUDED_UNOTOOLS_CONFIGVALUECONTAINER_HXX
 #define INCLUDED_UNOTOOLS_CONFIGVALUECONTAINER_HXX
diff --git a/include/unotools/datetime.hxx b/include/unotools/datetime.hxx
index bca409dafe35..c1e494d2c503 100644
--- a/include/unotools/datetime.hxx
+++ b/include/unotools/datetime.hxx
@@ -18,7 +18,7 @@
  */
 
 //= conversions UNO3.TimeClass <-> Tools.TimeClass (Date/Time/DateTime)
-#include "unotools/unotoolsdllapi.h"
+#include <unotools/unotoolsdllapi.h>
 
 #ifndef INCLUDED_UNOTOOLS_DATETIME_HXX
 #define INCLUDED_UNOTOOLS_DATETIME_HXX
diff --git a/include/unotools/defaultoptions.hxx b/include/unotools/defaultoptions.hxx
index 08063f8023d8..54969d5f12ab 100644
--- a/include/unotools/defaultoptions.hxx
+++ b/include/unotools/defaultoptions.hxx
@@ -19,9 +19,9 @@
 #ifndef INCLUDED_UNOTOOLS_DEFAULTOPTIONS_HXX
 #define INCLUDED_UNOTOOLS_DEFAULTOPTIONS_HXX
 
-#include "unotools/unotoolsdllapi.h"
+#include <unotools/unotoolsdllapi.h>
 #include <rtl/ustring.hxx>
-#include "tools/solar.h"
+#include <tools/solar.h>
 #include <unotools/options.hxx>
 
 class SvtDefaultOptions_Impl;
diff --git a/include/unotools/desktopterminationobserver.hxx b/include/unotools/desktopterminationobserver.hxx
index 9f637fa954d7..d817a1b8d7f8 100644
--- a/include/unotools/desktopterminationobserver.hxx
+++ b/include/unotools/desktopterminationobserver.hxx
@@ -16,7 +16,7 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#include "unotools/unotoolsdllapi.h"
+#include <unotools/unotoolsdllapi.h>
 
 #ifndef INCLUDED_UNOTOOLS_DESKTOPTERMINATIONOBSERVER_HXX
 #define INCLUDED_UNOTOOLS_DESKTOPTERMINATIONOBSERVER_HXX
diff --git a/include/unotools/dynamicmenuoptions.hxx b/include/unotools/dynamicmenuoptions.hxx
index ac6f9e7f4133..5475c46f8cdb 100644
--- a/include/unotools/dynamicmenuoptions.hxx
+++ b/include/unotools/dynamicmenuoptions.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_UNOTOOLS_DYNAMICMENUOPTIONS_HXX
 #define INCLUDED_UNOTOOLS_DYNAMICMENUOPTIONS_HXX
 
-#include "unotools/unotoolsdllapi.h"
+#include <unotools/unotoolsdllapi.h>
 #include <sal/types.h>
 #include <osl/mutex.hxx>
 #include <com/sun/star/uno/Sequence.h>
diff --git a/include/unotools/eventcfg.hxx b/include/unotools/eventcfg.hxx
index 5feb640f8718..d2288659ea70 100644
--- a/include/unotools/eventcfg.hxx
+++ b/include/unotools/eventcfg.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_UNOTOOLS_EVENTCFG_HXX
 #define INCLUDED_UNOTOOLS_EVENTCFG_HXX
 
-#include "unotools/unotoolsdllapi.h"
+#include <unotools/unotoolsdllapi.h>
 #include <unotools/configitem.hxx>
 #include <com/sun/star/document/XEventsSupplier.hpp>
 #include <com/sun/star/container/XNameReplace.hpp>
diff --git a/include/unotools/eventlisteneradapter.hxx b/include/unotools/eventlisteneradapter.hxx
index 138b4f5fb86e..394c910be956 100644
--- a/include/unotools/eventlisteneradapter.hxx
+++ b/include/unotools/eventlisteneradapter.hxx
@@ -16,7 +16,7 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#include "unotools/unotoolsdllapi.h"
+#include <unotools/unotoolsdllapi.h>
 
 #ifndef INCLUDED_UNOTOOLS_EVENTLISTENERADAPTER_HXX
 #define INCLUDED_UNOTOOLS_EVENTLISTENERADAPTER_HXX
diff --git a/include/unotools/extendedsecurityoptions.hxx b/include/unotools/extendedsecurityoptions.hxx
index 405f75c94e1a..9963b919c04d 100644
--- a/include/unotools/extendedsecurityoptions.hxx
+++ b/include/unotools/extendedsecurityoptions.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_UNOTOOLS_EXTENDEDSECURITYOPTIONS_HXX
 #define INCLUDED_UNOTOOLS_EXTENDEDSECURITYOPTIONS_HXX
 
-#include "unotools/unotoolsdllapi.h"
+#include <unotools/unotoolsdllapi.h>
 #include <sal/types.h>
 #include <osl/mutex.hxx>
 #include <com/sun/star/uno/Sequence.h>
diff --git a/include/unotools/fltrcfg.hxx b/include/unotools/fltrcfg.hxx
index 5257c819cfa5..39331232fe27 100644
--- a/include/unotools/fltrcfg.hxx
+++ b/include/unotools/fltrcfg.hxx
@@ -21,7 +21,7 @@
 
 // -----------------------------------------------------------------------
 
-#include "unotools/unotoolsdllapi.h"
+#include <unotools/unotoolsdllapi.h>
 #include <unotools/configitem.hxx>
 
 struct SvtFilterOptions_Impl;
diff --git a/include/unotools/fontoptions.hxx b/include/unotools/fontoptions.hxx
index 2a3bbf872fba..1b86ccc6da40 100644
--- a/include/unotools/fontoptions.hxx
+++ b/include/unotools/fontoptions.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_UNOTOOLS_FONTOPTIONS_HXX
 #define INCLUDED_UNOTOOLS_FONTOPTIONS_HXX
 
-#include "unotools/unotoolsdllapi.h"
+#include <unotools/unotoolsdllapi.h>
 #include <sal/types.h>
 #include <osl/mutex.hxx>
 #include <rtl/ustring.hxx>
diff --git a/include/unotools/historyoptions.hxx b/include/unotools/historyoptions.hxx
index 0c7d423dc426..3722b6ef3453 100644
--- a/include/unotools/historyoptions.hxx
+++ b/include/unotools/historyoptions.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_UNOTOOLS_HISTORYOPTIONS_HXX
 #define INCLUDED_UNOTOOLS_HISTORYOPTIONS_HXX
 
-#include "unotools/unotoolsdllapi.h"
+#include <unotools/unotoolsdllapi.h>
 #include <sal/types.h>
 #include <osl/mutex.hxx>
 #include <com/sun/star/uno/Sequence.h>
diff --git a/include/unotools/intlwrapper.hxx b/include/unotools/intlwrapper.hxx
index 7030f11d9568..6df81e901161 100644
--- a/include/unotools/intlwrapper.hxx
+++ b/include/unotools/intlwrapper.hxx
@@ -16,7 +16,7 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#include "unotools/unotoolsdllapi.h"
+#include <unotools/unotoolsdllapi.h>
 
 #ifndef INCLUDED_UNOTOOLS_INTLWRAPPER_HXX
 #define INCLUDED_UNOTOOLS_INTLWRAPPER_HXX
diff --git a/include/unotools/lingucfg.hxx b/include/unotools/lingucfg.hxx
index 412f3bedf40b..c6520adbf338 100644
--- a/include/unotools/lingucfg.hxx
+++ b/include/unotools/lingucfg.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_UNOTOOLS_LINGUCFG_HXX
 #define INCLUDED_UNOTOOLS_LINGUCFG_HXX
 
-#include "unotools/unotoolsdllapi.h"
+#include <unotools/unotoolsdllapi.h>
 #include <com/sun/star/beans/PropertyValues.hpp>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/uno/Any.h>
diff --git a/include/unotools/localedatawrapper.hxx b/include/unotools/localedatawrapper.hxx
index f43daa72a603..3f206f4cafe6 100644
--- a/include/unotools/localedatawrapper.hxx
+++ b/include/unotools/localedatawrapper.hxx
@@ -28,7 +28,7 @@
 #include <rtl/ustring.hxx>
 #include <i18nlangtag/languagetag.hxx>
 #include <unotools/readwritemutexguard.hxx>
-#include "unotools/unotoolsdllapi.h"
+#include <unotools/unotoolsdllapi.h>
 
 namespace com { namespace sun { namespace star {
     namespace uno {
diff --git a/include/unotools/localfilehelper.hxx b/include/unotools/localfilehelper.hxx
index 9028ff8f0847..a059e5e49f19 100644
--- a/include/unotools/localfilehelper.hxx
+++ b/include/unotools/localfilehelper.hxx
@@ -20,7 +20,7 @@
 #define INCLUDED_UNOTOOLS_LOCALFILEHELPER_HXX
 
 #include <com/sun/star/uno/Sequence.hxx>
-#include "unotools/unotoolsdllapi.h"
+#include <unotools/unotoolsdllapi.h>
 
 #include <rtl/ustring.hxx>
 
diff --git a/include/unotools/localisationoptions.hxx b/include/unotools/localisationoptions.hxx
index 90745010a6f1..12d5caffc4ad 100644
--- a/include/unotools/localisationoptions.hxx
+++ b/include/unotools/localisationoptions.hxx
@@ -20,7 +20,7 @@
 #define INCLUDED_UNOTOOLS_LOCALISATIONOPTIONS_HXX
 
 #include <sal/types.h>
-#include "unotools/unotoolsdllapi.h"
+#include <unotools/unotoolsdllapi.h>
 #include <osl/mutex.hxx>
 #include <unotools/options.hxx>
 
diff --git a/include/unotools/misccfg.hxx b/include/unotools/misccfg.hxx
index aa208c631f97..6f4f61a1c80f 100644
--- a/include/unotools/misccfg.hxx
+++ b/include/unotools/misccfg.hxx
@@ -19,9 +19,9 @@
 #ifndef INCLUDED_UNOTOOLS_MISCCFG_HXX
 #define INCLUDED_UNOTOOLS_MISCCFG_HXX
 
-#include "unotools/unotoolsdllapi.h"
-#include "tools/solar.h"
-#include "unotools/options.hxx"
+#include <unotools/unotoolsdllapi.h>
+#include <tools/solar.h>
+#include <unotools/options.hxx>
 
 namespace utl
 {
diff --git a/include/unotools/moduleoptions.hxx b/include/unotools/moduleoptions.hxx
index dd42e2bffbea..747a20371f1a 100644
--- a/include/unotools/moduleoptions.hxx
+++ b/include/unotools/moduleoptions.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_UNOTOOLS_MODULEOPTIONS_HXX
 #define INCLUDED_UNOTOOLS_MODULEOPTIONS_HXX
 
-#include "unotools/unotoolsdllapi.h"
+#include <unotools/unotoolsdllapi.h>
 #include <salhelper/singletonref.hxx>
 #include <com/sun/star/frame/XModel.hpp>
 #include <com/sun/star/uno/Sequence.hxx>
diff --git a/include/unotools/nativenumberwrapper.hxx b/include/unotools/nativenumberwrapper.hxx
index 2c6e079ab45a..32b2555db2a7 100644
--- a/include/unotools/nativenumberwrapper.hxx
+++ b/include/unotools/nativenumberwrapper.hxx
@@ -16,7 +16,7 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#include "unotools/unotoolsdllapi.h"
+#include <unotools/unotoolsdllapi.h>
 
 #ifndef INCLUDED_UNOTOOLS_NATIVENUMBERWRAPPER_HXX
 #define INCLUDED_UNOTOOLS_NATIVENUMBERWRAPPER_HXX
diff --git a/include/unotools/numberformatcodewrapper.hxx b/include/unotools/numberformatcodewrapper.hxx
index ee7a14f07d3a..31f8a6050a6f 100644
--- a/include/unotools/numberformatcodewrapper.hxx
+++ b/include/unotools/numberformatcodewrapper.hxx
@@ -21,7 +21,7 @@
 #define INCLUDED_UNOTOOLS_NUMBERFORMATCODEWRAPPER_HXX
 
 #include <com/sun/star/i18n/XNumberFormatCode.hpp>
-#include "unotools/unotoolsdllapi.h"
+#include <unotools/unotoolsdllapi.h>
 
 namespace com { namespace sun { namespace star {
     namespace uno {
diff --git a/include/unotools/options.hxx b/include/unotools/options.hxx
index 6bacefe03fc0..86b9bea021e6 100644
--- a/include/unotools/options.hxx
+++ b/include/unotools/options.hxx
@@ -20,8 +20,8 @@
 #ifndef INCLUDED_UNOTOOLS_OPTIONS_HXX
 #define INCLUDED_UNOTOOLS_OPTIONS_HXX
 
-#include "sal/config.h"
-#include "unotools/unotoolsdllapi.h"
+#include <sal/config.h>
+#include <unotools/unotoolsdllapi.h>
 #include <vector>
 
 /*
diff --git a/include/unotools/optionsdlg.hxx b/include/unotools/optionsdlg.hxx
index a3fc1f85b2ab..ec6f2ed6f7f5 100644
--- a/include/unotools/optionsdlg.hxx
+++ b/include/unotools/optionsdlg.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_UNOTOOLS_OPTIONSDLG_HXX
 #define INCLUDED_UNOTOOLS_OPTIONSDLG_HXX
 
-#include "unotools/unotoolsdllapi.h"
+#include <unotools/unotoolsdllapi.h>
 #include <rtl/ustring.hxx>
 #include <unotools/options.hxx>
 
diff --git a/include/unotools/pathoptions.hxx b/include/unotools/pathoptions.hxx
index 6952e21c5848..07bf3eb3e16d 100644
--- a/include/unotools/pathoptions.hxx
+++ b/include/unotools/pathoptions.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_UNOTOOLS_PATHOPTIONS_HXX
 #define INCLUDED_UNOTOOLS_PATHOPTIONS_HXX
 
-#include "unotools/unotoolsdllapi.h"
+#include <unotools/unotoolsdllapi.h>
 #include <i18nlangtag/languagetag.hxx>
 #include <unotools/options.hxx>
 
diff --git a/include/unotools/printwarningoptions.hxx b/include/unotools/printwarningoptions.hxx
index b32adabb2739..30f35cd0d709 100644
--- a/include/unotools/printwarningoptions.hxx
+++ b/include/unotools/printwarningoptions.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_UNOTOOLS_PRINTWARNINGOPTIONS_HXX
 #define INCLUDED_UNOTOOLS_PRINTWARNINGOPTIONS_HXX
 
-#include "unotools/unotoolsdllapi.h"
+#include <unotools/unotoolsdllapi.h>
 #include <sal/types.h>
 #include <osl/mutex.hxx>
 #include <rtl/ustring.hxx>
diff --git a/include/unotools/progresshandlerwrap.hxx b/include/unotools/progresshandlerwrap.hxx
index 04faadf24258..0e902048ee17 100644
--- a/include/unotools/progresshandlerwrap.hxx
+++ b/include/unotools/progresshandlerwrap.hxx
@@ -16,7 +16,7 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#include "unotools/unotoolsdllapi.h"
+#include <unotools/unotoolsdllapi.h>
 
 #ifndef INCLUDED_UNOTOOLS_PROGRESSHANDLERWRAP_HXX
 #define INCLUDED_UNOTOOLS_PROGRESSHANDLERWRAP_HXX
diff --git a/include/unotools/saveopt.hxx b/include/unotools/saveopt.hxx
index e51b25d956f1..5e7a9c205efc 100644
--- a/include/unotools/saveopt.hxx
+++ b/include/unotools/saveopt.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_UNOTOOLS_SAVEOPT_HXX
 #define INCLUDED_UNOTOOLS_SAVEOPT_HXX
 
-#include "unotools/unotoolsdllapi.h"
+#include <unotools/unotoolsdllapi.h>
 #include <unotools/options.hxx>
 
 struct SvtLoadSaveOptions_Impl;
diff --git a/include/unotools/searchopt.hxx b/include/unotools/searchopt.hxx
index 56bb0eb18c61..1285d9035873 100644
--- a/include/unotools/searchopt.hxx
+++ b/include/unotools/searchopt.hxx
@@ -20,8 +20,8 @@
 #ifndef INCLUDED_UNOTOOLS_SEARCHOPT_HXX
 #define INCLUDED_UNOTOOLS_SEARCHOPT_HXX
 
-#include "unotools/unotoolsdllapi.h"
-#include "tools/solar.h"
+#include <unotools/unotoolsdllapi.h>
+#include <tools/solar.h>
 
 class SvtSearchOptions_Impl;
 
diff --git a/include/unotools/securityoptions.hxx b/include/unotools/securityoptions.hxx
index a11aff9e8bb7..b454c556691a 100644
--- a/include/unotools/securityoptions.hxx
+++ b/include/unotools/securityoptions.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_UNOTOOLS_SECURITYOPTIONS_HXX
 #define INCLUDED_UNOTOOLS_SECURITYOPTIONS_HXX
 
-#include "unotools/unotoolsdllapi.h"
+#include <unotools/unotoolsdllapi.h>
 #include <sal/types.h>
 #include <osl/mutex.hxx>
 #include <com/sun/star/uno/Sequence.h>
diff --git a/include/unotools/sharedunocomponent.hxx b/include/unotools/sharedunocomponent.hxx
index bf0bc405e7c4..fe980db0fbd3 100644
--- a/include/unotools/sharedunocomponent.hxx
+++ b/include/unotools/sharedunocomponent.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_UNOTOOLS_SHAREDUNOCOMPONENT_HXX
 #define INCLUDED_UNOTOOLS_SHAREDUNOCOMPONENT_HXX
 
-#include "unotoolsdllapi.h"
+#include <unotools/unotoolsdllapi.h>
 
 #include <boost/shared_ptr.hpp>
 #include <com/sun/star/uno/Reference.hxx>
diff --git a/include/unotools/streamhelper.hxx b/include/unotools/streamhelper.hxx
index ea4fb8c1fef3..9aede74cc4f4 100644
--- a/include/unotools/streamhelper.hxx
+++ b/include/unotools/streamhelper.hxx
@@ -16,7 +16,7 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#include "unotools/unotoolsdllapi.h"
+#include <unotools/unotoolsdllapi.h>
 
 #ifndef INCLUDED_UNOTOOLS_STREAMHELPER_HXX
 #define INCLUDED_UNOTOOLS_STREAMHELPER_HXX
diff --git a/include/unotools/streamwrap.hxx b/include/unotools/streamwrap.hxx
index 5b0aa67105f6..7060742afba9 100644
--- a/include/unotools/streamwrap.hxx
+++ b/include/unotools/streamwrap.hxx
@@ -16,7 +16,7 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#include "unotools/unotoolsdllapi.h"
+#include <unotools/unotoolsdllapi.h>
 
 #ifndef INCLUDED_UNOTOOLS_STREAMWRAP_HXX
 #define INCLUDED_UNOTOOLS_STREAMWRAP_HXX
diff --git a/include/unotools/syslocale.hxx b/include/unotools/syslocale.hxx
index 5f4f5ab70c4b..b384083b13d1 100644
--- a/include/unotools/syslocale.hxx
+++ b/include/unotools/syslocale.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_UNOTOOLS_SYSLOCALE_HXX
 #define INCLUDED_UNOTOOLS_SYSLOCALE_HXX
 
-#include "unotools/unotoolsdllapi.h"
+#include <unotools/unotoolsdllapi.h>
 #include <unotools/localedatawrapper.hxx>
 #include <unotools/charclass.hxx>
 #include <i18nlangtag/languagetag.hxx>
diff --git a/include/unotools/syslocaleoptions.hxx b/include/unotools/syslocaleoptions.hxx
index 0d528b54b6c6..3821128fd18b 100644
--- a/include/unotools/syslocaleoptions.hxx
+++ b/include/unotools/syslocaleoptions.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_UNOTOOLS_SYSLOCALEOPTIONS_HXX
 #define INCLUDED_UNOTOOLS_SYSLOCALEOPTIONS_HXX
 
-#include "unotools/unotoolsdllapi.h"
+#include <unotools/unotoolsdllapi.h>
 #include <sal/types.h>
 #include <rtl/ustring.hxx>
 #include <tools/solar.h>
diff --git a/include/unotools/tempfile.hxx b/include/unotools/tempfile.hxx
index e1281f0d2bf2..85eda3dc75bd 100644
--- a/include/unotools/tempfile.hxx
+++ b/include/unotools/tempfile.hxx
@@ -16,7 +16,7 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#include "unotools/unotoolsdllapi.h"
+#include <unotools/unotoolsdllapi.h>
 
 #ifndef INCLUDED_UNOTOOLS_TEMPFILE_HXX
 #define INCLUDED_UNOTOOLS_TEMPFILE_HXX
diff --git a/include/unotools/textsearch.hxx b/include/unotools/textsearch.hxx
index 7b218e11f67d..96b00dc97ba9 100644
--- a/include/unotools/textsearch.hxx
+++ b/include/unotools/textsearch.hxx
@@ -16,7 +16,7 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#include "unotools/unotoolsdllapi.h"
+#include <unotools/unotoolsdllapi.h>
 
 #ifndef INCLUDED_UNOTOOLS_TEXTSEARCH_HXX
 #define INCLUDED_UNOTOOLS_TEXTSEARCH_HXX
diff --git a/include/unotools/transliterationwrapper.hxx b/include/unotools/transliterationwrapper.hxx
index af05f210a48c..5ba115f04dd7 100644
--- a/include/unotools/transliterationwrapper.hxx
+++ b/include/unotools/transliterationwrapper.hxx
@@ -16,7 +16,7 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#include "unotools/unotoolsdllapi.h"
+#include <unotools/unotoolsdllapi.h>
 
 #ifndef INCLUDED_UNOTOOLS_TRANSLITERATIONWRAPPER_HXX
 #define INCLUDED_UNOTOOLS_TRANSLITERATIONWRAPPER_HXX
diff --git a/include/unotools/ucbhelper.hxx b/include/unotools/ucbhelper.hxx
index 998fe82c5b3c..ee291b6f42a2 100644
--- a/include/unotools/ucbhelper.hxx
+++ b/include/unotools/ucbhelper.hxx
@@ -20,11 +20,11 @@
 #ifndef INCLUDED_UNOTOOLS_UCBHELPER_HXX
 #define INCLUDED_UNOTOOLS_UCBHELPER_HXX
 
-#include "sal/config.h"
+#include <sal/config.h>
 
-#include "com/sun/star/uno/Sequence.hxx"
-#include "sal/types.h"
-#include "unotools/unotoolsdllapi.h"
+#include <com/sun/star/uno/Sequence.hxx>
+#include <sal/types.h>
+#include <unotools/unotoolsdllapi.h>
 
 namespace com { namespace sun { namespace star {
     namespace uno {
diff --git a/include/unotools/ucblockbytes.hxx b/include/unotools/ucblockbytes.hxx
index 2258fe19d38b..75e9ef2d8eff 100644
--- a/include/unotools/ucblockbytes.hxx
+++ b/include/unotools/ucblockbytes.hxx
@@ -23,7 +23,7 @@
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/ucb/XContent.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
-#include "unotools/unotoolsdllapi.h"
+#include <unotools/unotoolsdllapi.h>
 
 #include <osl/thread.hxx>
 #include <osl/conditn.hxx>
diff --git a/include/unotools/ucbstreamhelper.hxx b/include/unotools/ucbstreamhelper.hxx
index eb814b4128a0..def98536354e 100644
--- a/include/unotools/ucbstreamhelper.hxx
+++ b/include/unotools/ucbstreamhelper.hxx
@@ -22,7 +22,7 @@
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/io/XInputStream.hpp>
 #include <com/sun/star/io/XStream.hpp>
-#include "unotools/unotoolsdllapi.h"
+#include <unotools/unotoolsdllapi.h>
 
 #include <tools/stream.hxx>
 
diff --git a/include/unotools/unotoolsdllapi.h b/include/unotools/unotoolsdllapi.h
index 5d7e76a3a3dd..88f426b2fed3 100644
--- a/include/unotools/unotoolsdllapi.h
+++ b/include/unotools/unotoolsdllapi.h
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_UNOTOOLS_UNOTOOLSDLLAPI_H
 #define INCLUDED_UNOTOOLS_UNOTOOLSDLLAPI_H
 
-#include "sal/types.h"
+#include <sal/types.h>
 
 #if defined(UNOTOOLS_DLLIMPLEMENTATION)
 #define UNOTOOLS_DLLPUBLIC  SAL_DLLPUBLIC_EXPORT
diff --git a/include/unotools/useroptions.hxx b/include/unotools/useroptions.hxx
index 10aa5c7be657..e61394a37dd0 100644
--- a/include/unotools/useroptions.hxx
+++ b/include/unotools/useroptions.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_UNOTOOLS_USEROPTIONS_HXX
 #define INCLUDED_UNOTOOLS_USEROPTIONS_HXX
 
-#include "unotools/unotoolsdllapi.h"
+#include <unotools/unotoolsdllapi.h>
 #include <unotools/configitem.hxx>
 #include <osl/mutex.hxx>
 #include <unotools/options.hxx>
diff --git a/include/unotools/viewoptions.hxx b/include/unotools/viewoptions.hxx
index 9e17357db723..15587cc246d4 100644
--- a/include/unotools/viewoptions.hxx
+++ b/include/unotools/viewoptions.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_UNOTOOLS_VIEWOPTIONS_HXX
 #define INCLUDED_UNOTOOLS_VIEWOPTIONS_HXX
 
-#include "unotools/unotoolsdllapi.h"
+#include <unotools/unotoolsdllapi.h>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/beans/NamedValue.hpp>
 #include <unotools/configmgr.hxx>