fdo#65108 inter-module includes <>

Change-Id: Ie672de68f6a87713a379e794fa3ad255ad52a71e

161 files changed, 366 insertions, 366 deletions

diff --git a/include/oox/core/binarycodec.hxx b/include/oox/core/binarycodec.hxx
index c4fbd82fa152..08ea66ecb4c3 100644
--- a/include/oox/core/binarycodec.hxx
+++ b/include/oox/core/binarycodec.hxx
@@ -25,7 +25,7 @@
 
 #include <rtl/cipher.h>
 #include <rtl/digest.h>
-#include "oox/dllapi.h"
+#include <oox/dllapi.h>
 
 namespace oox { class AttributeList; }
 
diff --git a/include/oox/core/contexthandler.hxx b/include/oox/core/contexthandler.hxx
index 0baf9e4b136e..6111f986ac3c 100644
--- a/include/oox/core/contexthandler.hxx
+++ b/include/oox/core/contexthandler.hxx
@@ -24,9 +24,9 @@
 #include <boost/shared_ptr.hpp>
 #include <cppuhelper/implbase1.hxx>
 #include <rtl/ref.hxx>
-#include "oox/token/namespaces.hxx"
-#include "oox/token/tokens.hxx"
-#include "oox/dllapi.h"
+#include <oox/token/namespaces.hxx>
+#include <oox/token/tokens.hxx>
+#include <oox/dllapi.h>
 
 namespace com { namespace sun { namespace star {
     namespace xml { namespace sax { class XLocator; } }
diff --git a/include/oox/core/contexthandler2.hxx b/include/oox/core/contexthandler2.hxx
index b537c59ee499..d60cf3821916 100644
--- a/include/oox/core/contexthandler2.hxx
+++ b/include/oox/core/contexthandler2.hxx
@@ -22,10 +22,10 @@
 
 #include <vector>
 #include <boost/shared_ptr.hpp>
-#include "oox/helper/attributelist.hxx"
-#include "oox/helper/binaryinputstream.hxx"
-#include "oox/core/contexthandler.hxx"
-#include "oox/dllapi.h"
+#include <oox/helper/attributelist.hxx>
+#include <oox/helper/binaryinputstream.hxx>
+#include <oox/core/contexthandler.hxx>
+#include <oox/dllapi.h>
 
 namespace oox {
 namespace core {
diff --git a/include/oox/core/filterbase.hxx b/include/oox/core/filterbase.hxx
index 5b2624c96603..8d1836f9ce6f 100644
--- a/include/oox/core/filterbase.hxx
+++ b/include/oox/core/filterbase.hxx
@@ -33,9 +33,9 @@
 #include <cppuhelper/basemutex.hxx>
 #include <cppuhelper/implbase5.hxx>
 #include <comphelper/sequenceashashmap.hxx>
-#include "oox/helper/binarystreambase.hxx"
-#include "oox/helper/storagebase.hxx"
-#include "oox/dllapi.h"
+#include <oox/helper/binarystreambase.hxx>
+#include <oox/helper/storagebase.hxx>
+#include <oox/dllapi.h>
 
 namespace com { namespace sun { namespace star {
     namespace awt { struct DeviceInfo; }
diff --git a/include/oox/core/filterdetect.hxx b/include/oox/core/filterdetect.hxx
index 7a63aedd1127..c3379a340c6a 100644
--- a/include/oox/core/filterdetect.hxx
+++ b/include/oox/core/filterdetect.hxx
@@ -26,7 +26,7 @@
 #include <com/sun/star/xml/sax/XFastDocumentHandler.hpp>
 #include <cppuhelper/implbase1.hxx>
 #include <cppuhelper/implbase2.hxx>
-#include "oox/dllapi.h"
+#include <oox/dllapi.h>
 
 namespace com { namespace sun { namespace star {
     namespace io { class XInputStream; }
diff --git a/include/oox/core/fragmenthandler.hxx b/include/oox/core/fragmenthandler.hxx
index da531dad994e..9bdfcb55a161 100644
--- a/include/oox/core/fragmenthandler.hxx
+++ b/include/oox/core/fragmenthandler.hxx
@@ -22,9 +22,9 @@
 
 #include <com/sun/star/xml/sax/XFastDocumentHandler.hpp>
 #include <cppuhelper/implbase1.hxx>
-#include "oox/core/contexthandler.hxx"
-#include "oox/core/relations.hxx"
-#include "oox/dllapi.h"
+#include <oox/core/contexthandler.hxx>
+#include <oox/core/relations.hxx>
+#include <oox/dllapi.h>
 
 namespace com { namespace sun { namespace star {
     namespace io { class XInputStream; }
diff --git a/include/oox/core/fragmenthandler2.hxx b/include/oox/core/fragmenthandler2.hxx
index bdd73f0c185f..c4d2bdae07ef 100644
--- a/include/oox/core/fragmenthandler2.hxx
+++ b/include/oox/core/fragmenthandler2.hxx
@@ -20,10 +20,10 @@
 #ifndef INCLUDED_OOX_CORE_FRAGMENTHANDLER2_HXX
 #define INCLUDED_OOX_CORE_FRAGMENTHANDLER2_HXX
 
-#include "oox/core/contexthandler2.hxx"
-#include "oox/core/fragmenthandler.hxx"
+#include <oox/core/contexthandler2.hxx>
+#include <oox/core/fragmenthandler.hxx>
 #include <vector>
-#include "oox/dllapi.h"
+#include <oox/dllapi.h>
 
 namespace oox {
 namespace core {
diff --git a/include/oox/core/recordparser.hxx b/include/oox/core/recordparser.hxx
index 79bcbd86f477..d358c13552ac 100644
--- a/include/oox/core/recordparser.hxx
+++ b/include/oox/core/recordparser.hxx
@@ -24,8 +24,8 @@
 #include <com/sun/star/io/IOException.hpp>
 #include <com/sun/star/xml/sax/SAXException.hpp>
 #include <rtl/ref.hxx>
-#include "oox/helper/binaryinputstream.hxx"
-#include "oox/core/fragmenthandler.hxx"
+#include <oox/helper/binaryinputstream.hxx>
+#include <oox/core/fragmenthandler.hxx>
 
 namespace oox {
 namespace core {
diff --git a/include/oox/core/relations.hxx b/include/oox/core/relations.hxx
index b1c2ea8499f6..c94e293efafc 100644
--- a/include/oox/core/relations.hxx
+++ b/include/oox/core/relations.hxx
@@ -22,8 +22,8 @@
 
 #include <map>
 #include <boost/shared_ptr.hpp>
-#include "oox/helper/helper.hxx"
-#include "oox/dllapi.h"
+#include <oox/helper/helper.hxx>
+#include <oox/dllapi.h>
 
 namespace oox {
 namespace core {
diff --git a/include/oox/core/relationshandler.hxx b/include/oox/core/relationshandler.hxx
index 4d3a8ff41802..eb0cd7850427 100644
--- a/include/oox/core/relationshandler.hxx
+++ b/include/oox/core/relationshandler.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_OOX_CORE_RELATIONSHANDLER_HXX
 #define INCLUDED_OOX_CORE_RELATIONSHANDLER_HXX
 
-#include "oox/core/fragmenthandler.hxx"
+#include <oox/core/fragmenthandler.hxx>
 
 namespace oox {
 namespace core {
diff --git a/include/oox/core/xmlfilterbase.hxx b/include/oox/core/xmlfilterbase.hxx
index 54a4d75e4306..648b50da97aa 100644
--- a/include/oox/core/xmlfilterbase.hxx
+++ b/include/oox/core/xmlfilterbase.hxx
@@ -26,10 +26,10 @@
 #include <rtl/ref.hxx>
 #include <rtl/string.hxx>
 #include <rtl/ustring.hxx>
-#include "oox/core/filterbase.hxx"
-#include "oox/core/relations.hxx"
-#include "oox/drawingml/table/tablestylelist.hxx"
-#include "oox/dllapi.h"
+#include <oox/core/filterbase.hxx>
+#include <oox/core/relations.hxx>
+#include <oox/drawingml/table/tablestylelist.hxx>
+#include <oox/dllapi.h>
 
 namespace com { namespace sun { namespace star {
     namespace container { class XNameContainer; }
diff --git a/include/oox/crypto/AgileEngine.hxx b/include/oox/crypto/AgileEngine.hxx
index e6cf73bc924f..4ca67edfaf69 100644
--- a/include/oox/crypto/AgileEngine.hxx
+++ b/include/oox/crypto/AgileEngine.hxx
@@ -11,8 +11,8 @@
 #ifndef INCLUDED_OOX_CRYPTO_AGILEENGINE_HXX
 #define INCLUDED_OOX_CRYPTO_AGILEENGINE_HXX
 
-#include "CryptTools.hxx"
-#include "CryptoEngine.hxx"
+#include <oox/crypto/CryptTools.hxx>
+#include <oox/crypto/CryptoEngine.hxx>
 
 namespace oox {
 namespace core {
diff --git a/include/oox/crypto/CryptoEngine.hxx b/include/oox/crypto/CryptoEngine.hxx
index c653ec6ff724..1f9f0d129b45 100644
--- a/include/oox/crypto/CryptoEngine.hxx
+++ b/include/oox/crypto/CryptoEngine.hxx
@@ -13,8 +13,8 @@
 
 #include <vector>
 
-#include "oox/helper/binaryinputstream.hxx"
-#include "oox/helper/binaryoutputstream.hxx"
+#include <oox/helper/binaryinputstream.hxx>
+#include <oox/helper/binaryoutputstream.hxx>
 
 namespace oox {
 namespace core {
diff --git a/include/oox/crypto/DocumentDecryption.hxx b/include/oox/crypto/DocumentDecryption.hxx
index 561aaaf32817..1f2d3bc5bc25 100644
--- a/include/oox/crypto/DocumentDecryption.hxx
+++ b/include/oox/crypto/DocumentDecryption.hxx
@@ -11,19 +11,19 @@
 #ifndef INCLUDED_OOX_CRYPTO_DOCUMENTDECRYPTION_HXX
 #define INCLUDED_OOX_CRYPTO_DOCUMENTDECRYPTION_HXX
 
-#include "oox/dllapi.h"
+#include <oox/dllapi.h>
 
-#include "oox/ole/olestorage.hxx"
-#include "oox/helper/binaryinputstream.hxx"
-#include "oox/helper/binaryoutputstream.hxx"
+#include <oox/ole/olestorage.hxx>
+#include <oox/helper/binaryinputstream.hxx>
+#include <oox/helper/binaryoutputstream.hxx>
 
 #include <com/sun/star/io/XStream.hpp>
 #include <com/sun/star/beans/NamedValue.hpp>
 #include <com/sun/star/uno/Sequence.hxx>
 
-#include "CryptTools.hxx"
-#include "AgileEngine.hxx"
-#include "Standard2007Engine.hxx"
+#include <oox/crypto/CryptTools.hxx>
+#include <oox/crypto/AgileEngine.hxx>
+#include <oox/crypto/Standard2007Engine.hxx>
 
 #include <boost/scoped_ptr.hpp>
 #include <vector>
diff --git a/include/oox/crypto/DocumentEncryption.hxx b/include/oox/crypto/DocumentEncryption.hxx
index 960eda15beb1..4410357bbbad 100644
--- a/include/oox/crypto/DocumentEncryption.hxx
+++ b/include/oox/crypto/DocumentEncryption.hxx
@@ -11,16 +11,16 @@
 #ifndef INCLUDED_OOX_CRYPTO_DOCUMENTENCRYPTION_HXX
 #define INCLUDED_OOX_CRYPTO_DOCUMENTENCRYPTION_HXX
 
-#include "oox/dllapi.h"
+#include <oox/dllapi.h>
 
-#include "oox/ole/olestorage.hxx"
+#include <oox/ole/olestorage.hxx>
 
 #include <com/sun/star/io/XStream.hpp>
 #include <com/sun/star/beans/NamedValue.hpp>
 #include <com/sun/star/uno/Sequence.hxx>
 
-#include "CryptTools.hxx"
-#include "Standard2007Engine.hxx"
+#include <oox/crypto/CryptTools.hxx>
+#include <oox/crypto/Standard2007Engine.hxx>
 
 #include <vector>
 
diff --git a/include/oox/crypto/Standard2007Engine.hxx b/include/oox/crypto/Standard2007Engine.hxx
index a248deaed716..37ae0a08f563 100644
--- a/include/oox/crypto/Standard2007Engine.hxx
+++ b/include/oox/crypto/Standard2007Engine.hxx
@@ -11,8 +11,8 @@
 #ifndef INCLUDED_OOX_CRYPTO_STANDARD2007ENGINE_HXX
 #define INCLUDED_OOX_CRYPTO_STANDARD2007ENGINE_HXX
 
-#include "CryptTools.hxx"
-#include "CryptoEngine.hxx"
+#include <oox/crypto/CryptTools.hxx>
+#include <oox/crypto/CryptoEngine.hxx>
 
 namespace oox {
 namespace core {
diff --git a/include/oox/dllapi.h b/include/oox/dllapi.h
index 6026aef0ae58..a03fd0b210aa 100644
--- a/include/oox/dllapi.h
+++ b/include/oox/dllapi.h
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_OOX_DLLAPI_H
 #define INCLUDED_OOX_DLLAPI_H
 
-#include "sal/types.h"
+#include <sal/types.h>
 
 #if defined OOX_DLLIMPLEMENTATION
 #define OOX_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
diff --git a/include/oox/drawingml/chart/axiscontext.hxx b/include/oox/drawingml/chart/axiscontext.hxx
index 2c00475f614f..3b996592e46f 100644
--- a/include/oox/drawingml/chart/axiscontext.hxx
+++ b/include/oox/drawingml/chart/axiscontext.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_OOX_DRAWINGML_CHART_AXISCONTEXT_HXX
 #define INCLUDED_OOX_DRAWINGML_CHART_AXISCONTEXT_HXX
 
-#include "oox/drawingml/chart/chartcontextbase.hxx"
+#include <oox/drawingml/chart/chartcontextbase.hxx>
 
 namespace oox {
 namespace drawingml {
diff --git a/include/oox/drawingml/chart/axisconverter.hxx b/include/oox/drawingml/chart/axisconverter.hxx
index cf21cc7a9cf0..e107057ad5d4 100644
--- a/include/oox/drawingml/chart/axisconverter.hxx
+++ b/include/oox/drawingml/chart/axisconverter.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_OOX_DRAWINGML_CHART_AXISCONVERTER_HXX
 #define INCLUDED_OOX_DRAWINGML_CHART_AXISCONVERTER_HXX
 
-#include "oox/drawingml/chart/converterbase.hxx"
+#include <oox/drawingml/chart/converterbase.hxx>
 
 namespace com { namespace sun { namespace star {
     namespace chart2 { class XAxis; }
diff --git a/include/oox/drawingml/chart/axismodel.hxx b/include/oox/drawingml/chart/axismodel.hxx
index 403a96656a0a..dd543d057746 100644
--- a/include/oox/drawingml/chart/axismodel.hxx
+++ b/include/oox/drawingml/chart/axismodel.hxx
@@ -20,8 +20,8 @@
 #ifndef INCLUDED_OOX_DRAWINGML_CHART_AXISMODEL_HXX
 #define INCLUDED_OOX_DRAWINGML_CHART_AXISMODEL_HXX
 
-#include "oox/drawingml/shape.hxx"
-#include "oox/drawingml/chart/titlemodel.hxx"
+#include <oox/drawingml/shape.hxx>
+#include <oox/drawingml/chart/titlemodel.hxx>
 
 namespace oox {
 namespace drawingml {
diff --git a/include/oox/drawingml/chart/chartcontextbase.hxx b/include/oox/drawingml/chart/chartcontextbase.hxx
index 2e5874e42f87..057f133a5cdd 100644
--- a/include/oox/drawingml/chart/chartcontextbase.hxx
+++ b/include/oox/drawingml/chart/chartcontextbase.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_OOX_DRAWINGML_CHART_CHARTCONTEXTBASE_HXX
 #define INCLUDED_OOX_DRAWINGML_CHART_CHARTCONTEXTBASE_HXX
 
-#include "oox/core/fragmenthandler2.hxx"
+#include <oox/core/fragmenthandler2.hxx>
 
 namespace oox { namespace drawingml { class Shape; } }
 
diff --git a/include/oox/drawingml/chart/chartdrawingfragment.hxx b/include/oox/drawingml/chart/chartdrawingfragment.hxx
index e423a4c313c5..e86bffd4c645 100644
--- a/include/oox/drawingml/chart/chartdrawingfragment.hxx
+++ b/include/oox/drawingml/chart/chartdrawingfragment.hxx
@@ -20,8 +20,8 @@
 #ifndef INCLUDED_OOX_DRAWINGML_CHART_CHARTDRAWINGFRAGMENT_HXX
 #define INCLUDED_OOX_DRAWINGML_CHART_CHARTDRAWINGFRAGMENT_HXX
 
-#include "oox/core/fragmenthandler2.hxx"
-#include "oox/drawingml/shape.hxx"
+#include <oox/core/fragmenthandler2.hxx>
+#include <oox/drawingml/shape.hxx>
 
 namespace oox {
 namespace drawingml {
diff --git a/include/oox/drawingml/chart/chartspaceconverter.hxx b/include/oox/drawingml/chart/chartspaceconverter.hxx
index 2d6244cd9233..e79cb70f1685 100644
--- a/include/oox/drawingml/chart/chartspaceconverter.hxx
+++ b/include/oox/drawingml/chart/chartspaceconverter.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_OOX_DRAWINGML_CHART_CHARTSPACECONVERTER_HXX
 #define INCLUDED_OOX_DRAWINGML_CHART_CHARTSPACECONVERTER_HXX
 
-#include "oox/drawingml/chart/converterbase.hxx"
+#include <oox/drawingml/chart/converterbase.hxx>
 
 namespace com { namespace sun { namespace star {
     namespace drawing { class XShapes; }
diff --git a/include/oox/drawingml/chart/chartspacefragment.hxx b/include/oox/drawingml/chart/chartspacefragment.hxx
index 1a63a82b02ae..653bbf7d048e 100644
--- a/include/oox/drawingml/chart/chartspacefragment.hxx
+++ b/include/oox/drawingml/chart/chartspacefragment.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_OOX_DRAWINGML_CHART_CHARTSPACEFRAGMENT_HXX
 #define INCLUDED_OOX_DRAWINGML_CHART_CHARTSPACEFRAGMENT_HXX
 
-#include "oox/drawingml/chart/chartcontextbase.hxx"
+#include <oox/drawingml/chart/chartcontextbase.hxx>
 
 namespace oox {
 namespace drawingml {
diff --git a/include/oox/drawingml/chart/chartspacemodel.hxx b/include/oox/drawingml/chart/chartspacemodel.hxx
index f79a0fe8411d..f1a27d80e706 100644
--- a/include/oox/drawingml/chart/chartspacemodel.hxx
+++ b/include/oox/drawingml/chart/chartspacemodel.hxx
@@ -20,9 +20,9 @@
 #ifndef INCLUDED_OOX_DRAWINGML_CHART_CHARTSPACEMODEL_HXX
 #define INCLUDED_OOX_DRAWINGML_CHART_CHARTSPACEMODEL_HXX
 
-#include "oox/drawingml/shape.hxx"
-#include "oox/drawingml/chart/plotareamodel.hxx"
-#include "oox/drawingml/chart/titlemodel.hxx"
+#include <oox/drawingml/shape.hxx>
+#include <oox/drawingml/chart/plotareamodel.hxx>
+#include <oox/drawingml/chart/titlemodel.hxx>
 
 namespace oox {
 namespace drawingml {
diff --git a/include/oox/drawingml/chart/converterbase.hxx b/include/oox/drawingml/chart/converterbase.hxx
index 7b6f718b5971..4bf233be1e59 100644
--- a/include/oox/drawingml/chart/converterbase.hxx
+++ b/include/oox/drawingml/chart/converterbase.hxx
@@ -20,8 +20,8 @@
 #ifndef INCLUDED_OOX_DRAWINGML_CHART_CONVERTERBASE_HXX
 #define INCLUDED_OOX_DRAWINGML_CHART_CONVERTERBASE_HXX
 
-#include "oox/drawingml/chart/chartcontextbase.hxx"
-#include "oox/drawingml/chart/objectformatter.hxx"
+#include <oox/drawingml/chart/chartcontextbase.hxx>
+#include <oox/drawingml/chart/objectformatter.hxx>
 
 namespace com { namespace sun { namespace star {
     namespace awt { struct Rectangle; }
diff --git a/include/oox/drawingml/chart/datasourcecontext.hxx b/include/oox/drawingml/chart/datasourcecontext.hxx
index 1d5f404aeb4a..9fbe866944a2 100644
--- a/include/oox/drawingml/chart/datasourcecontext.hxx
+++ b/include/oox/drawingml/chart/datasourcecontext.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_OOX_DRAWINGML_CHART_DATASOURCECONTEXT_HXX
 #define INCLUDED_OOX_DRAWINGML_CHART_DATASOURCECONTEXT_HXX
 
-#include "oox/drawingml/chart/chartcontextbase.hxx"
+#include <oox/drawingml/chart/chartcontextbase.hxx>
 
 namespace oox {
 namespace drawingml {
diff --git a/include/oox/drawingml/chart/datasourceconverter.hxx b/include/oox/drawingml/chart/datasourceconverter.hxx
index a45009b18367..4f8b2523c355 100644
--- a/include/oox/drawingml/chart/datasourceconverter.hxx
+++ b/include/oox/drawingml/chart/datasourceconverter.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_OOX_DRAWINGML_CHART_DATASOURCECONVERTER_HXX
 #define INCLUDED_OOX_DRAWINGML_CHART_DATASOURCECONVERTER_HXX
 
-#include "oox/drawingml/chart/converterbase.hxx"
+#include <oox/drawingml/chart/converterbase.hxx>
 
 namespace com { namespace sun { namespace star {
     namespace chart2 { namespace data { class XDataSequence; } }
diff --git a/include/oox/drawingml/chart/datasourcemodel.hxx b/include/oox/drawingml/chart/datasourcemodel.hxx
index 4e4579c0b298..efbcf6868274 100644
--- a/include/oox/drawingml/chart/datasourcemodel.hxx
+++ b/include/oox/drawingml/chart/datasourcemodel.hxx
@@ -21,7 +21,7 @@
 #define INCLUDED_OOX_DRAWINGML_CHART_DATASOURCEMODEL_HXX
 
 #include <com/sun/star/uno/Any.hxx>
-#include "oox/drawingml/chart/modelbase.hxx"
+#include <oox/drawingml/chart/modelbase.hxx>
 
 namespace oox {
 namespace drawingml {
diff --git a/include/oox/drawingml/chart/modelbase.hxx b/include/oox/drawingml/chart/modelbase.hxx
index 61bc90432a68..12370e273c5f 100644
--- a/include/oox/drawingml/chart/modelbase.hxx
+++ b/include/oox/drawingml/chart/modelbase.hxx
@@ -20,9 +20,9 @@
 #ifndef INCLUDED_OOX_DRAWINGML_CHART_MODELBASE_HXX
 #define INCLUDED_OOX_DRAWINGML_CHART_MODELBASE_HXX
 
-#include "oox/helper/helper.hxx"
-#include "oox/helper/refmap.hxx"
-#include "oox/helper/refvector.hxx"
+#include <oox/helper/helper.hxx>
+#include <oox/helper/refmap.hxx>
+#include <oox/helper/refvector.hxx>
 
 namespace oox { class AttributeList; }
 
diff --git a/include/oox/drawingml/chart/objectformatter.hxx b/include/oox/drawingml/chart/objectformatter.hxx
index bde717406158..dd3d15aa5653 100644
--- a/include/oox/drawingml/chart/objectformatter.hxx
+++ b/include/oox/drawingml/chart/objectformatter.hxx
@@ -20,9 +20,9 @@
 #ifndef INCLUDED_OOX_DRAWINGML_CHART_OBJECTFORMATTER_HXX
 #define INCLUDED_OOX_DRAWINGML_CHART_OBJECTFORMATTER_HXX
 
-#include "oox/helper/propertyset.hxx"
-#include "oox/drawingml/drawingmltypes.hxx"
-#include "oox/drawingml/chart/modelbase.hxx"
+#include <oox/helper/propertyset.hxx>
+#include <oox/drawingml/drawingmltypes.hxx>
+#include <oox/drawingml/chart/modelbase.hxx>
 
 namespace com { namespace sun { namespace star {
     namespace chart2 { class XChartDocument; }
diff --git a/include/oox/drawingml/chart/plotareacontext.hxx b/include/oox/drawingml/chart/plotareacontext.hxx
index 7bff6a4cbf2c..da337c74e0e7 100644
--- a/include/oox/drawingml/chart/plotareacontext.hxx
+++ b/include/oox/drawingml/chart/plotareacontext.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_OOX_DRAWINGML_CHART_PLOTAREACONTEXT_HXX
 #define INCLUDED_OOX_DRAWINGML_CHART_PLOTAREACONTEXT_HXX
 
-#include "oox/drawingml/chart/chartcontextbase.hxx"
+#include <oox/drawingml/chart/chartcontextbase.hxx>
 
 namespace oox {
 namespace drawingml {
diff --git a/include/oox/drawingml/chart/plotareaconverter.hxx b/include/oox/drawingml/chart/plotareaconverter.hxx
index e041733bd5a4..2185d21c3298 100644
--- a/include/oox/drawingml/chart/plotareaconverter.hxx
+++ b/include/oox/drawingml/chart/plotareaconverter.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_OOX_DRAWINGML_CHART_PLOTAREACONVERTER_HXX
 #define INCLUDED_OOX_DRAWINGML_CHART_PLOTAREACONVERTER_HXX
 
-#include "oox/drawingml/chart/converterbase.hxx"
+#include <oox/drawingml/chart/converterbase.hxx>
 
 namespace com { namespace sun { namespace star {
     namespace chart2 { class XDiagram; }
diff --git a/include/oox/drawingml/chart/plotareamodel.hxx b/include/oox/drawingml/chart/plotareamodel.hxx
index 140d6baf0328..262bf19df922 100644
--- a/include/oox/drawingml/chart/plotareamodel.hxx
+++ b/include/oox/drawingml/chart/plotareamodel.hxx
@@ -20,10 +20,10 @@
 #ifndef INCLUDED_OOX_DRAWINGML_CHART_PLOTAREAMODEL_HXX
 #define INCLUDED_OOX_DRAWINGML_CHART_PLOTAREAMODEL_HXX
 
-#include "oox/drawingml/shape.hxx"
-#include "oox/drawingml/chart/axismodel.hxx"
-#include "oox/drawingml/chart/seriesmodel.hxx"
-#include "oox/drawingml/chart/typegroupmodel.hxx"
+#include <oox/drawingml/shape.hxx>
+#include <oox/drawingml/chart/axismodel.hxx>
+#include <oox/drawingml/chart/seriesmodel.hxx>
+#include <oox/drawingml/chart/typegroupmodel.hxx>
 
 namespace oox {
 namespace drawingml {
diff --git a/include/oox/drawingml/chart/seriescontext.hxx b/include/oox/drawingml/chart/seriescontext.hxx
index 0df07d3ecadc..730ea6735ccb 100644
--- a/include/oox/drawingml/chart/seriescontext.hxx
+++ b/include/oox/drawingml/chart/seriescontext.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_OOX_DRAWINGML_CHART_SERIESCONTEXT_HXX
 #define INCLUDED_OOX_DRAWINGML_CHART_SERIESCONTEXT_HXX
 
-#include "oox/drawingml/chart/chartcontextbase.hxx"
+#include <oox/drawingml/chart/chartcontextbase.hxx>
 
 namespace oox {
 namespace drawingml {
diff --git a/include/oox/drawingml/chart/seriesconverter.hxx b/include/oox/drawingml/chart/seriesconverter.hxx
index c914ed0a6ac5..0e7a5493649f 100644
--- a/include/oox/drawingml/chart/seriesconverter.hxx
+++ b/include/oox/drawingml/chart/seriesconverter.hxx
@@ -20,8 +20,8 @@
 #ifndef INCLUDED_OOX_DRAWINGML_CHART_SERIESCONVERTER_HXX
 #define INCLUDED_OOX_DRAWINGML_CHART_SERIESCONVERTER_HXX
 
-#include "oox/drawingml/chart/converterbase.hxx"
-#include "oox/drawingml/chart/seriesmodel.hxx"
+#include <oox/drawingml/chart/converterbase.hxx>
+#include <oox/drawingml/chart/seriesmodel.hxx>
 
 namespace com { namespace sun { namespace star {
     namespace chart2 { class XDataSeries; }
diff --git a/include/oox/drawingml/chart/seriesmodel.hxx b/include/oox/drawingml/chart/seriesmodel.hxx
index 26b6ad391bf9..c374e522867e 100644
--- a/include/oox/drawingml/chart/seriesmodel.hxx
+++ b/include/oox/drawingml/chart/seriesmodel.hxx
@@ -20,8 +20,8 @@
 #ifndef INCLUDED_OOX_DRAWINGML_CHART_SERIESMODEL_HXX
 #define INCLUDED_OOX_DRAWINGML_CHART_SERIESMODEL_HXX
 
-#include "oox/drawingml/chart/datasourcemodel.hxx"
-#include "oox/drawingml/chart/titlemodel.hxx"
+#include <oox/drawingml/chart/datasourcemodel.hxx>
+#include <oox/drawingml/chart/titlemodel.hxx>
 
 namespace oox {
 namespace drawingml {
diff --git a/include/oox/drawingml/chart/titlecontext.hxx b/include/oox/drawingml/chart/titlecontext.hxx
index 0e38fe46c367..75305ac03d84 100644
--- a/include/oox/drawingml/chart/titlecontext.hxx
+++ b/include/oox/drawingml/chart/titlecontext.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_OOX_DRAWINGML_CHART_TITLECONTEXT_HXX
 #define INCLUDED_OOX_DRAWINGML_CHART_TITLECONTEXT_HXX
 
-#include "oox/drawingml/chart/chartcontextbase.hxx"
+#include <oox/drawingml/chart/chartcontextbase.hxx>
 
 namespace oox {
 namespace drawingml {
diff --git a/include/oox/drawingml/chart/titleconverter.hxx b/include/oox/drawingml/chart/titleconverter.hxx
index ad6a607037c3..c93682dd4a32 100644
--- a/include/oox/drawingml/chart/titleconverter.hxx
+++ b/include/oox/drawingml/chart/titleconverter.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_OOX_DRAWINGML_CHART_TITLECONVERTER_HXX
 #define INCLUDED_OOX_DRAWINGML_CHART_TITLECONVERTER_HXX
 
-#include "oox/drawingml/chart/converterbase.hxx"
+#include <oox/drawingml/chart/converterbase.hxx>
 
 namespace com { namespace sun { namespace star {
     namespace chart2 { class XDiagram; }
diff --git a/include/oox/drawingml/chart/titlemodel.hxx b/include/oox/drawingml/chart/titlemodel.hxx
index 571c3cec1f32..0a138be9d3cd 100644
--- a/include/oox/drawingml/chart/titlemodel.hxx
+++ b/include/oox/drawingml/chart/titlemodel.hxx
@@ -20,8 +20,8 @@
 #ifndef INCLUDED_OOX_DRAWINGML_CHART_TITLEMODEL_HXX
 #define INCLUDED_OOX_DRAWINGML_CHART_TITLEMODEL_HXX
 
-#include "oox/drawingml/shape.hxx"
-#include "oox/drawingml/chart/datasourcemodel.hxx"
+#include <oox/drawingml/shape.hxx>
+#include <oox/drawingml/chart/datasourcemodel.hxx>
 
 namespace oox {
 namespace drawingml {
diff --git a/include/oox/drawingml/chart/typegroupcontext.hxx b/include/oox/drawingml/chart/typegroupcontext.hxx
index 4269808bc6e1..ef3d5d19c199 100644
--- a/include/oox/drawingml/chart/typegroupcontext.hxx
+++ b/include/oox/drawingml/chart/typegroupcontext.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_OOX_DRAWINGML_CHART_TYPEGROUPCONTEXT_HXX
 #define INCLUDED_OOX_DRAWINGML_CHART_TYPEGROUPCONTEXT_HXX
 
-#include "oox/drawingml/chart/chartcontextbase.hxx"
+#include <oox/drawingml/chart/chartcontextbase.hxx>
 
 namespace oox {
 namespace drawingml {
diff --git a/include/oox/drawingml/chart/typegroupconverter.hxx b/include/oox/drawingml/chart/typegroupconverter.hxx
index 0cc87129c66e..510ebfae231e 100644
--- a/include/oox/drawingml/chart/typegroupconverter.hxx
+++ b/include/oox/drawingml/chart/typegroupconverter.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_OOX_DRAWINGML_CHART_TYPEGROUPCONVERTER_HXX
 #define INCLUDED_OOX_DRAWINGML_CHART_TYPEGROUPCONVERTER_HXX
 
-#include "oox/drawingml/chart/converterbase.hxx"
+#include <oox/drawingml/chart/converterbase.hxx>
 
 namespace com { namespace sun { namespace star {
     namespace chart2 { class XChartType; }
diff --git a/include/oox/drawingml/chart/typegroupmodel.hxx b/include/oox/drawingml/chart/typegroupmodel.hxx
index 9741d1c1553e..5d705a47d5c4 100644
--- a/include/oox/drawingml/chart/typegroupmodel.hxx
+++ b/include/oox/drawingml/chart/typegroupmodel.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_OOX_DRAWINGML_CHART_TYPEGROUPMODEL_HXX
 #define INCLUDED_OOX_DRAWINGML_CHART_TYPEGROUPMODEL_HXX
 
-#include "oox/drawingml/chart/seriesmodel.hxx"
+#include <oox/drawingml/chart/seriesmodel.hxx>
 
 namespace oox {
 namespace drawingml {
diff --git a/include/oox/drawingml/clrscheme.hxx b/include/oox/drawingml/clrscheme.hxx
index 41495b65c76a..2ebddb4d5f51 100644
--- a/include/oox/drawingml/clrscheme.hxx
+++ b/include/oox/drawingml/clrscheme.hxx
@@ -23,8 +23,8 @@
 #include <boost/shared_ptr.hpp>
 #include <map>
 #include <vector>
-#include "oox/drawingml/color.hxx"
-#include "oox/dllapi.h"
+#include <oox/drawingml/color.hxx>
+#include <oox/dllapi.h>
 
 namespace oox { namespace drawingml {
 
diff --git a/include/oox/drawingml/clrschemecontext.hxx b/include/oox/drawingml/clrschemecontext.hxx
index 9208affd8534..85ce9ada5f80 100644
--- a/include/oox/drawingml/clrschemecontext.hxx
+++ b/include/oox/drawingml/clrschemecontext.hxx
@@ -20,10 +20,10 @@
 #ifndef INCLUDED_OOX_DRAWINGML_CLRSCHEMECONTEXT_HXX
 #define INCLUDED_OOX_DRAWINGML_CLRSCHEMECONTEXT_HXX
 
-#include "oox/core/contexthandler2.hxx"
-#include "oox/drawingml/clrscheme.hxx"
-#include "oox/drawingml/color.hxx"
-#include "oox/drawingml/colorchoicecontext.hxx"
+#include <oox/core/contexthandler2.hxx>
+#include <oox/drawingml/clrscheme.hxx>
+#include <oox/drawingml/color.hxx>
+#include <oox/drawingml/colorchoicecontext.hxx>
 
 namespace oox { namespace drawingml {
 
diff --git a/include/oox/drawingml/color.hxx b/include/oox/drawingml/color.hxx
index f5e1a661ca69..2b01e643c91c 100644
--- a/include/oox/drawingml/color.hxx
+++ b/include/oox/drawingml/color.hxx
@@ -25,8 +25,8 @@
 #include <sal/types.h>
 #include <rtl/instance.hxx>
 #include <rtl/ustring.hxx>
-#include "oox/helper/helper.hxx"
-#include "oox/dllapi.h"
+#include <oox/helper/helper.hxx>
+#include <oox/dllapi.h>
 
 namespace oox { class GraphicHelper; }
 
diff --git a/include/oox/drawingml/colorchoicecontext.hxx b/include/oox/drawingml/colorchoicecontext.hxx
index 5b0d28a0f091..b2246db719c0 100644
--- a/include/oox/drawingml/colorchoicecontext.hxx
+++ b/include/oox/drawingml/colorchoicecontext.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_OOX_DRAWINGML_COLORCHOICECONTEXT_HXX
 #define INCLUDED_OOX_DRAWINGML_COLORCHOICECONTEXT_HXX
 
-#include "oox/core/contexthandler2.hxx"
+#include <oox/core/contexthandler2.hxx>
 
 namespace oox {
 namespace drawingml {
diff --git a/include/oox/drawingml/connectorshapecontext.hxx b/include/oox/drawingml/connectorshapecontext.hxx
index f91ba39e96ad..737c91dec576 100644
--- a/include/oox/drawingml/connectorshapecontext.hxx
+++ b/include/oox/drawingml/connectorshapecontext.hxx
@@ -20,9 +20,9 @@
 #ifndef INCLUDED_OOX_DRAWINGML_CONNECTORSHAPECONTEXT_HXX
 #define INCLUDED_OOX_DRAWINGML_CONNECTORSHAPECONTEXT_HXX
 
-#include "oox/drawingml/shape.hxx"
-#include "oox/drawingml/shapecontext.hxx"
-#include "oox/dllapi.h"
+#include <oox/drawingml/shape.hxx>
+#include <oox/drawingml/shapecontext.hxx>
+#include <oox/dllapi.h>
 
 namespace oox { namespace drawingml {
 
diff --git a/include/oox/drawingml/customshapegeometry.hxx b/include/oox/drawingml/customshapegeometry.hxx
index 8d4c35933e6e..9843138dc312 100644
--- a/include/oox/drawingml/customshapegeometry.hxx
+++ b/include/oox/drawingml/customshapegeometry.hxx
@@ -21,9 +21,9 @@
 #define INCLUDED_OOX_DRAWINGML_CUSTOMSHAPEGEOMETRY_HXX
 
 #include <com/sun/star/beans/XPropertySet.hpp>
-#include "oox/helper/propertymap.hxx"
-#include "oox/core/contexthandler2.hxx"
-#include "oox/drawingml/shape.hxx"
+#include <oox/helper/propertymap.hxx>
+#include <oox/core/contexthandler2.hxx>
+#include <oox/drawingml/shape.hxx>
 
 namespace oox { namespace drawingml {
 
diff --git a/include/oox/drawingml/customshapeproperties.hxx b/include/oox/drawingml/customshapeproperties.hxx
index 2bbf0c34aa77..e6df846c7fa2 100644
--- a/include/oox/drawingml/customshapeproperties.hxx
+++ b/include/oox/drawingml/customshapeproperties.hxx
@@ -36,11 +36,11 @@
 #include <com/sun/star/drawing/ProjectionMode.hpp>
 #include <com/sun/star/drawing/XShape.hpp>
 #include <com/sun/star/graphic/XGraphic.hpp>
-#include "oox/core/xmlfilterbase.hxx"
-#include "oox/drawingml/color.hxx"
-#include "oox/helper/helper.hxx"
-#include "oox/helper/propertymap.hxx"
-#include "oox/token/tokens.hxx"
+#include <oox/core/xmlfilterbase.hxx>
+#include <oox/drawingml/color.hxx>
+#include <oox/helper/helper.hxx>
+#include <oox/helper/propertymap.hxx>
+#include <oox/token/tokens.hxx>
 
 namespace oox { namespace drawingml {
 
diff --git a/include/oox/drawingml/diagram/diagram.hxx b/include/oox/drawingml/diagram/diagram.hxx
index 920c9f74b1e5..d2bca17c0ba6 100644
--- a/include/oox/drawingml/diagram/diagram.hxx
+++ b/include/oox/drawingml/diagram/diagram.hxx
@@ -21,8 +21,8 @@
 #define INCLUDED_OOX_DRAWINGML_DIAGRAM_DIAGRAM_HXX
 
 #include <rtl/ustring.hxx>
-#include "oox/drawingml/shape.hxx"
-#include "oox/core/xmlfilterbase.hxx"
+#include <oox/drawingml/shape.hxx>
+#include <oox/core/xmlfilterbase.hxx>
 
 #include <com/sun/star/xml/dom/XDocument.hpp>
 
diff --git a/include/oox/drawingml/drawingmltypes.hxx b/include/oox/drawingml/drawingmltypes.hxx
index fad74b5db3dc..aa00f2a28d98 100644
--- a/include/oox/drawingml/drawingmltypes.hxx
+++ b/include/oox/drawingml/drawingmltypes.hxx
@@ -27,7 +27,7 @@
 #include <com/sun/star/awt/Point.hpp>
 #include <com/sun/star/awt/Size.hpp>
 #include <com/sun/star/xml/sax/XFastAttributeList.hpp>
-#include "oox/helper/helper.hxx"
+#include <oox/helper/helper.hxx>
 
 namespace oox {
 namespace drawingml {
diff --git a/include/oox/drawingml/effectproperties.hxx b/include/oox/drawingml/effectproperties.hxx
index 6aa005961cc1..ed64d34bd1cd 100644
--- a/include/oox/drawingml/effectproperties.hxx
+++ b/include/oox/drawingml/effectproperties.hxx
@@ -10,7 +10,7 @@
 #ifndef INCLUDED_OOX_DRAWINGML_EFFECTPROPERTIES_HXX
 #define INCLUDED_OOX_DRAWINGML_EFFECTPROPERTIES_HXX
 
-#include "oox/drawingml/fillproperties.hxx"
+#include <oox/drawingml/fillproperties.hxx>
 
 namespace oox {
 namespace drawingml {
diff --git a/include/oox/drawingml/effectpropertiescontext.hxx b/include/oox/drawingml/effectpropertiescontext.hxx
index c127b651a67a..dde9015085a4 100644
--- a/include/oox/drawingml/effectpropertiescontext.hxx
+++ b/include/oox/drawingml/effectpropertiescontext.hxx
@@ -10,8 +10,8 @@
 #ifndef INCLUDED_OOX_DRAWINGML_EFFECTPROPERTIESCONTEXT_HXX
 #define INCLUDED_OOX_DRAWINGML_EFFECTPROPERTIESCONTEXT_HXX
 
-#include "oox/core/contexthandler2.hxx"
-#include "oox/dllapi.h"
+#include <oox/core/contexthandler2.hxx>
+#include <oox/dllapi.h>
 
 namespace oox { namespace drawingml {
 
diff --git a/include/oox/drawingml/embeddedwavaudiofile.hxx b/include/oox/drawingml/embeddedwavaudiofile.hxx
index 7a4863ddb0c0..c1b199243f87 100644
--- a/include/oox/drawingml/embeddedwavaudiofile.hxx
+++ b/include/oox/drawingml/embeddedwavaudiofile.hxx
@@ -23,7 +23,7 @@
 #include <rtl/ustring.hxx>
 #include <com/sun/star/xml/sax/XFastAttributeList.hpp>
 
-#include "oox/core/fragmenthandler.hxx"
+#include <oox/core/fragmenthandler.hxx>
 
 namespace oox { namespace drawingml {
 
diff --git a/include/oox/drawingml/fillproperties.hxx b/include/oox/drawingml/fillproperties.hxx
index c2e27f667a34..fba56a617997 100644
--- a/include/oox/drawingml/fillproperties.hxx
+++ b/include/oox/drawingml/fillproperties.hxx
@@ -23,9 +23,9 @@
 #include <map>
 #include <com/sun/star/graphic/XGraphic.hpp>
 #include <com/sun/star/geometry/IntegerRectangle2D.hpp>
-#include "oox/drawingml/color.hxx"
-#include "oox/helper/helper.hxx"
-#include "oox/drawingml/embeddedwavaudiofile.hxx"
+#include <oox/drawingml/color.hxx>
+#include <oox/helper/helper.hxx>
+#include <oox/drawingml/embeddedwavaudiofile.hxx>
 
 namespace oox {
     class GraphicHelper;
diff --git a/include/oox/drawingml/fillpropertiesgroupcontext.hxx b/include/oox/drawingml/fillpropertiesgroupcontext.hxx
index 98592ca04c94..3e8795e4a554 100644
--- a/include/oox/drawingml/fillpropertiesgroupcontext.hxx
+++ b/include/oox/drawingml/fillpropertiesgroupcontext.hxx
@@ -20,8 +20,8 @@
 #ifndef INCLUDED_OOX_DRAWINGML_FILLPROPERTIESGROUPCONTEXT_HXX
 #define INCLUDED_OOX_DRAWINGML_FILLPROPERTIESGROUPCONTEXT_HXX
 
-#include "oox/drawingml/colorchoicecontext.hxx"
-#include "oox/drawingml/fillproperties.hxx"
+#include <oox/drawingml/colorchoicecontext.hxx>
+#include <oox/drawingml/fillproperties.hxx>
 
 namespace oox {
 namespace drawingml {
diff --git a/include/oox/drawingml/graphicshapecontext.hxx b/include/oox/drawingml/graphicshapecontext.hxx
index 18f78f1b031a..322f08e2f95c 100644
--- a/include/oox/drawingml/graphicshapecontext.hxx
+++ b/include/oox/drawingml/graphicshapecontext.hxx
@@ -20,9 +20,9 @@
 #ifndef INCLUDED_OOX_DRAWINGML_GRAPHICSHAPECONTEXT_HXX
 #define INCLUDED_OOX_DRAWINGML_GRAPHICSHAPECONTEXT_HXX
 
-#include "oox/drawingml/shape.hxx"
-#include "oox/drawingml/shapecontext.hxx"
-#include "oox/dllapi.h"
+#include <oox/drawingml/shape.hxx>
+#include <oox/drawingml/shapecontext.hxx>
+#include <oox/dllapi.h>
 
 namespace oox { namespace vml { struct OleObjectInfo; } }
 
diff --git a/include/oox/drawingml/guidcontext.hxx b/include/oox/drawingml/guidcontext.hxx
index e029def6756d..285a5677ef4d 100644
--- a/include/oox/drawingml/guidcontext.hxx
+++ b/include/oox/drawingml/guidcontext.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_OOX_DRAWINGML_GUIDCONTEXT_HXX
 #define INCLUDED_OOX_DRAWINGML_GUIDCONTEXT_HXX
 
-#include "oox/core/contexthandler2.hxx"
+#include <oox/core/contexthandler2.hxx>
 
 namespace oox { namespace drawingml {
 
diff --git a/include/oox/drawingml/lineproperties.hxx b/include/oox/drawingml/lineproperties.hxx
index c1da26a7a462..7cc31a35a77f 100644
--- a/include/oox/drawingml/lineproperties.hxx
+++ b/include/oox/drawingml/lineproperties.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_OOX_DRAWINGML_LINEPROPERTIES_HXX
 #define INCLUDED_OOX_DRAWINGML_LINEPROPERTIES_HXX
 
-#include "oox/drawingml/fillproperties.hxx"
+#include <oox/drawingml/fillproperties.hxx>
 
 namespace oox {
 namespace drawingml {
diff --git a/include/oox/drawingml/linepropertiescontext.hxx b/include/oox/drawingml/linepropertiescontext.hxx
index 43c8aac3066c..f888e9d76ba8 100644
--- a/include/oox/drawingml/linepropertiescontext.hxx
+++ b/include/oox/drawingml/linepropertiescontext.hxx
@@ -20,8 +20,8 @@
 #ifndef INCLUDED_OOX_DRAWINGML_LINEPROPERTIESCONTEXT_HXX
 #define INCLUDED_OOX_DRAWINGML_LINEPROPERTIESCONTEXT_HXX
 
-#include "oox/core/contexthandler2.hxx"
-#include "oox/dllapi.h"
+#include <oox/core/contexthandler2.hxx>
+#include <oox/dllapi.h>
 
 namespace oox { namespace drawingml {
 
diff --git a/include/oox/drawingml/objectdefaultcontext.hxx b/include/oox/drawingml/objectdefaultcontext.hxx
index b12fec6d0474..f92e245d154c 100644
--- a/include/oox/drawingml/objectdefaultcontext.hxx
+++ b/include/oox/drawingml/objectdefaultcontext.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_OOX_DRAWINGML_OBJECTDEFAULTCONTEXT_HXX
 #define INCLUDED_OOX_DRAWINGML_OBJECTDEFAULTCONTEXT_HXX
 
-#include "oox/core/contexthandler2.hxx"
+#include <oox/core/contexthandler2.hxx>
 
 namespace oox { namespace drawingml {
 
diff --git a/include/oox/drawingml/scene3dcontext.hxx b/include/oox/drawingml/scene3dcontext.hxx
index 8499910d8779..2ebe581270c0 100644
--- a/include/oox/drawingml/scene3dcontext.hxx
+++ b/include/oox/drawingml/scene3dcontext.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_OOX_DRAWINGML_SCENE3DCONTEXT_HXX
 #define INCLUDED_OOX_DRAWINGML_SCENE3DCONTEXT_HXX
 
-#include "oox/core/contexthandler2.hxx"
+#include <oox/core/contexthandler2.hxx>
 
 namespace oox { namespace drawingml {
 
diff --git a/include/oox/drawingml/shape.hxx b/include/oox/drawingml/shape.hxx
index d38da80f229c..9c8faa9c95db 100644
--- a/include/oox/drawingml/shape.hxx
+++ b/include/oox/drawingml/shape.hxx
@@ -20,11 +20,11 @@
 #ifndef INCLUDED_OOX_DRAWINGML_SHAPE_HXX
 #define INCLUDED_OOX_DRAWINGML_SHAPE_HXX
 
-#include "oox/helper/propertymap.hxx"
-#include "oox/drawingml/drawingmltypes.hxx"
-#include "oox/drawingml/customshapeproperties.hxx"
-#include "oox/drawingml/textliststyle.hxx"
-#include "oox/drawingml/shape3dproperties.hxx"
+#include <oox/helper/propertymap.hxx>
+#include <oox/drawingml/drawingmltypes.hxx>
+#include <oox/drawingml/customshapeproperties.hxx>
+#include <oox/drawingml/textliststyle.hxx>
+#include <oox/drawingml/shape3dproperties.hxx>
 
 #include <com/sun/star/frame/XModel.hpp>
 #include <com/sun/star/drawing/XDrawPage.hpp>
@@ -33,7 +33,7 @@
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <vector>
 #include <map>
-#include "oox/dllapi.h"
+#include <oox/dllapi.h>
 
 namespace oox { namespace vml {
     struct OleObjectInfo;
diff --git a/include/oox/drawingml/shape3dproperties.hxx b/include/oox/drawingml/shape3dproperties.hxx
index 01d854fe90db..8e5d4fae7fa1 100644
--- a/include/oox/drawingml/shape3dproperties.hxx
+++ b/include/oox/drawingml/shape3dproperties.hxx
@@ -23,9 +23,9 @@
 #include <map>
 #include <com/sun/star/graphic/XGraphic.hpp>
 #include <com/sun/star/geometry/IntegerRectangle2D.hpp>
-#include "oox/core/xmlfilterbase.hxx"
-#include "oox/drawingml/color.hxx"
-#include "oox/helper/helper.hxx"
+#include <oox/core/xmlfilterbase.hxx>
+#include <oox/drawingml/color.hxx>
+#include <oox/helper/helper.hxx>
 
 namespace oox { class PropertyMap; }
 namespace oox { class PropertySet; }
diff --git a/include/oox/drawingml/shapecontext.hxx b/include/oox/drawingml/shapecontext.hxx
index eb9ba5522eef..0ff0360eded4 100644
--- a/include/oox/drawingml/shapecontext.hxx
+++ b/include/oox/drawingml/shapecontext.hxx
@@ -22,10 +22,10 @@
 
 #include <com/sun/star/drawing/XShapes.hpp>
 
-#include "oox/core/contexthandler2.hxx"
-#include "oox/drawingml/shape.hxx"
-#include "oox/drawingml/shapepropertiescontext.hxx"
-#include "oox/dllapi.h"
+#include <oox/core/contexthandler2.hxx>
+#include <oox/drawingml/shape.hxx>
+#include <oox/drawingml/shapepropertiescontext.hxx>
+#include <oox/dllapi.h>
 
 namespace oox { namespace drawingml {
 
diff --git a/include/oox/drawingml/shapegroupcontext.hxx b/include/oox/drawingml/shapegroupcontext.hxx
index 4480a7a07d5f..f5f9137265ed 100644
--- a/include/oox/drawingml/shapegroupcontext.hxx
+++ b/include/oox/drawingml/shapegroupcontext.hxx
@@ -20,9 +20,9 @@
 #ifndef INCLUDED_OOX_DRAWINGML_SHAPEGROUPCONTEXT_HXX
 #define INCLUDED_OOX_DRAWINGML_SHAPEGROUPCONTEXT_HXX
 
-#include "oox/drawingml/shape.hxx"
-#include "oox/drawingml/shapecontext.hxx"
-#include "oox/dllapi.h"
+#include <oox/drawingml/shape.hxx>
+#include <oox/drawingml/shapecontext.hxx>
+#include <oox/dllapi.h>
 
 namespace oox { namespace drawingml {
 
diff --git a/include/oox/drawingml/shapepropertiescontext.hxx b/include/oox/drawingml/shapepropertiescontext.hxx
index 56f016b0b1e3..4718e3b9a05d 100644
--- a/include/oox/drawingml/shapepropertiescontext.hxx
+++ b/include/oox/drawingml/shapepropertiescontext.hxx
@@ -20,8 +20,8 @@
 #ifndef INCLUDED_OOX_DRAWINGML_SHAPEPROPERTIESCONTEXT_HXX
 #define INCLUDED_OOX_DRAWINGML_SHAPEPROPERTIESCONTEXT_HXX
 
-#include "oox/core/contexthandler2.hxx"
-#include "oox/drawingml/shape.hxx"
+#include <oox/core/contexthandler2.hxx>
+#include <oox/drawingml/shape.hxx>
 
 namespace oox { namespace drawingml {
 
diff --git a/include/oox/drawingml/shapepropertymap.hxx b/include/oox/drawingml/shapepropertymap.hxx
index 6c0bbdf9586c..6a6628b02805 100644
--- a/include/oox/drawingml/shapepropertymap.hxx
+++ b/include/oox/drawingml/shapepropertymap.hxx
@@ -20,8 +20,8 @@
 #ifndef INCLUDED_OOX_DRAWINGML_SHAPEPROPERTYMAP_HXX
 #define INCLUDED_OOX_DRAWINGML_SHAPEPROPERTYMAP_HXX
 
-#include "oox/helper/propertymap.hxx"
-#include "oox/dllapi.h"
+#include <oox/helper/propertymap.hxx>
+#include <oox/dllapi.h>
 
 namespace oox { class ModelObjectHelper; }
 
diff --git a/include/oox/drawingml/shapestylecontext.hxx b/include/oox/drawingml/shapestylecontext.hxx
index d59277a8f335..7be239389d7a 100644
--- a/include/oox/drawingml/shapestylecontext.hxx
+++ b/include/oox/drawingml/shapestylecontext.hxx
@@ -20,8 +20,8 @@
 #ifndef INCLUDED_OOX_DRAWINGML_SHAPESTYLECONTEXT_HXX
 #define INCLUDED_OOX_DRAWINGML_SHAPESTYLECONTEXT_HXX
 
-#include "oox/drawingml/shape.hxx"
-#include "oox/core/contexthandler2.hxx"
+#include <oox/drawingml/shape.hxx>
+#include <oox/core/contexthandler2.hxx>
 
 namespace oox { namespace drawingml {
 
diff --git a/include/oox/drawingml/spdefcontext.hxx b/include/oox/drawingml/spdefcontext.hxx
index e3a0fa71ad1c..2488197cac51 100644
--- a/include/oox/drawingml/spdefcontext.hxx
+++ b/include/oox/drawingml/spdefcontext.hxx
@@ -20,8 +20,8 @@
 #ifndef INCLUDED_OOX_DRAWINGML_SPDEFCONTEXT_HXX
 #define INCLUDED_OOX_DRAWINGML_SPDEFCONTEXT_HXX
 
-#include "oox/drawingml/shape.hxx"
-#include "oox/core/contexthandler2.hxx"
+#include <oox/drawingml/shape.hxx>
+#include <oox/core/contexthandler2.hxx>
 
 namespace oox { namespace drawingml {
 
diff --git a/include/oox/drawingml/table/tablebackgroundstylecontext.hxx b/include/oox/drawingml/table/tablebackgroundstylecontext.hxx
index 5082362c64f2..6be484408295 100644
--- a/include/oox/drawingml/table/tablebackgroundstylecontext.hxx
+++ b/include/oox/drawingml/table/tablebackgroundstylecontext.hxx
@@ -21,8 +21,8 @@
 #ifndef OOX_DRAWINGML_TABLEBACKGROUNDSTYLECONTEXT
 #define OOX_DRAWINGML_TABLEBACKGROUNDSTYLECONTEXT
 
-#include "oox/core/contexthandler2.hxx"
-#include "oox/drawingml/table/tablestyle.hxx"
+#include <oox/core/contexthandler2.hxx>
+#include <oox/drawingml/table/tablestyle.hxx>
 
 namespace oox { namespace drawingml { namespace table {
 
diff --git a/include/oox/drawingml/table/tablecell.hxx b/include/oox/drawingml/table/tablecell.hxx
index 5253c31b74ff..373070bb14a4 100644
--- a/include/oox/drawingml/table/tablecell.hxx
+++ b/include/oox/drawingml/table/tablecell.hxx
@@ -20,12 +20,12 @@
 #ifndef INCLUDED_OOX_DRAWINGML_TABLE_TABLECELL_HXX
 #define INCLUDED_OOX_DRAWINGML_TABLE_TABLECELL_HXX
 
-#include "oox/helper/propertymap.hxx"
-#include "oox/drawingml/color.hxx"
-#include "oox/drawingml/drawingmltypes.hxx"
-#include "oox/drawingml/lineproperties.hxx"
-#include "oox/drawingml/fillproperties.hxx"
-#include "oox/drawingml/textliststyle.hxx"
+#include <oox/helper/propertymap.hxx>
+#include <oox/drawingml/color.hxx>
+#include <oox/drawingml/drawingmltypes.hxx>
+#include <oox/drawingml/lineproperties.hxx>
+#include <oox/drawingml/fillproperties.hxx>
+#include <oox/drawingml/textliststyle.hxx>
 #include <com/sun/star/table/XCell.hpp>
 
 #include <boost/shared_ptr.hpp>
diff --git a/include/oox/drawingml/table/tablecellcontext.hxx b/include/oox/drawingml/table/tablecellcontext.hxx
index 24de66c19566..2d06136f1604 100644
--- a/include/oox/drawingml/table/tablecellcontext.hxx
+++ b/include/oox/drawingml/table/tablecellcontext.hxx
@@ -21,8 +21,8 @@
 #ifndef OOX_DRAWINGML_TABLECELLCONTEXT
 #define OOX_DRAWINGML_TABLECELLCONTEXT
 
-#include "oox/drawingml/shapecontext.hxx"
-#include "oox/drawingml/table/tablecell.hxx"
+#include <oox/drawingml/shapecontext.hxx>
+#include <oox/drawingml/table/tablecell.hxx>
 
 namespace oox { namespace drawingml { namespace table {
 
diff --git a/include/oox/drawingml/table/tablecontext.hxx b/include/oox/drawingml/table/tablecontext.hxx
index 311bf90d19f7..25471b78cdac 100644
--- a/include/oox/drawingml/table/tablecontext.hxx
+++ b/include/oox/drawingml/table/tablecontext.hxx
@@ -21,7 +21,7 @@
 #ifndef OOX_DRAWINGML_TABLECONTEXT
 #define OOX_DRAWINGML_TABLECONTEXT
 
-#include "oox/drawingml/shapecontext.hxx"
+#include <oox/drawingml/shapecontext.hxx>
 
 namespace oox { namespace drawingml { namespace table {
 
diff --git a/include/oox/drawingml/table/tablepartstylecontext.hxx b/include/oox/drawingml/table/tablepartstylecontext.hxx
index 4a0df7c4d0e7..f11e542d3a15 100644
--- a/include/oox/drawingml/table/tablepartstylecontext.hxx
+++ b/include/oox/drawingml/table/tablepartstylecontext.hxx
@@ -21,8 +21,8 @@
 #ifndef OOX_DRAWINGML_TABLEPARTSTYLECONTEXT
 #define OOX_DRAWINGML_TABLEPARTSTYLECONTEXT
 
-#include "oox/core/contexthandler2.hxx"
-#include "oox/drawingml/table/tablestylepart.hxx"
+#include <oox/core/contexthandler2.hxx>
+#include <oox/drawingml/table/tablestylepart.hxx>
 
 namespace oox { namespace drawingml { namespace table {
 
diff --git a/include/oox/drawingml/table/tableproperties.hxx b/include/oox/drawingml/table/tableproperties.hxx
index e8aaf7e09556..59c975a588b3 100644
--- a/include/oox/drawingml/table/tableproperties.hxx
+++ b/include/oox/drawingml/table/tableproperties.hxx
@@ -20,10 +20,10 @@
 #ifndef INCLUDED_OOX_DRAWINGML_TABLE_TABLEPROPERTIES_HXX
 #define INCLUDED_OOX_DRAWINGML_TABLE_TABLEPROPERTIES_HXX
 
-#include "oox/drawingml/table/tablerow.hxx"
-#include "oox/drawingml/table/tablestyle.hxx"
-#include "oox/helper/propertymap.hxx"
-#include "oox/drawingml/color.hxx"
+#include <oox/drawingml/table/tablerow.hxx>
+#include <oox/drawingml/table/tablestyle.hxx>
+#include <oox/helper/propertymap.hxx>
+#include <oox/drawingml/color.hxx>
 
 #include <boost/shared_ptr.hpp>
 #include <boost/optional.hpp>
diff --git a/include/oox/drawingml/table/tablerow.hxx b/include/oox/drawingml/table/tablerow.hxx
index 51e14897bcb9..9e58ddd3428f 100644
--- a/include/oox/drawingml/table/tablerow.hxx
+++ b/include/oox/drawingml/table/tablerow.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_OOX_DRAWINGML_TABLE_TABLEROW_HXX
 #define INCLUDED_OOX_DRAWINGML_TABLE_TABLEROW_HXX
 
-#include "oox/drawingml/table/tablecell.hxx"
+#include <oox/drawingml/table/tablecell.hxx>
 #include <vector>
 
 namespace oox { namespace drawingml { namespace table {
diff --git a/include/oox/drawingml/table/tablerowcontext.hxx b/include/oox/drawingml/table/tablerowcontext.hxx
index 68e35d433246..abe483de98dc 100644
--- a/include/oox/drawingml/table/tablerowcontext.hxx
+++ b/include/oox/drawingml/table/tablerowcontext.hxx
@@ -21,7 +21,7 @@
 #ifndef OOX_DRAWINGML_TABLEROWCONTEXT
 #define OOX_DRAWINGML_TABLEROWCONTEXT
 
-#include "oox/core/contexthandler2.hxx"
+#include <oox/core/contexthandler2.hxx>
 
 namespace oox { namespace drawingml { namespace table {
 
diff --git a/include/oox/drawingml/table/tablestyle.hxx b/include/oox/drawingml/table/tablestyle.hxx
index 5ecd4db8e20e..8d1c6b850b67 100644
--- a/include/oox/drawingml/table/tablestyle.hxx
+++ b/include/oox/drawingml/table/tablestyle.hxx
@@ -20,9 +20,9 @@
 #ifndef INCLUDED_OOX_DRAWINGML_TABLE_TABLESTYLE_HXX
 #define INCLUDED_OOX_DRAWINGML_TABLE_TABLESTYLE_HXX
 
-#include "oox/drawingml/table/tablestylepart.hxx"
-#include "oox/drawingml/drawingmltypes.hxx"
-#include "oox/drawingml/shape.hxx"
+#include <oox/drawingml/table/tablestylepart.hxx>
+#include <oox/drawingml/drawingmltypes.hxx>
+#include <oox/drawingml/shape.hxx>
 
 namespace oox { namespace drawingml { namespace table {
 
diff --git a/include/oox/drawingml/table/tablestylecellstylecontext.hxx b/include/oox/drawingml/table/tablestylecellstylecontext.hxx
index 8eb477fd339f..523d51f4300f 100644
--- a/include/oox/drawingml/table/tablestylecellstylecontext.hxx
+++ b/include/oox/drawingml/table/tablestylecellstylecontext.hxx
@@ -21,8 +21,8 @@
 #ifndef OOX_DRAWINGML_TABLESTYLECELLSTYLECONTEXT
 #define OOX_DRAWINGML_TABLESTYLECELLSTYLECONTEXT
 
-#include "oox/core/contexthandler2.hxx"
-#include "oox/drawingml/table/tablestylepart.hxx"
+#include <oox/core/contexthandler2.hxx>
+#include <oox/drawingml/table/tablestylepart.hxx>
 
 namespace oox { namespace drawingml { namespace table {
 
diff --git a/include/oox/drawingml/table/tablestylecontext.hxx b/include/oox/drawingml/table/tablestylecontext.hxx
index 9dd1be81172c..922d3fe4b2c4 100644
--- a/include/oox/drawingml/table/tablestylecontext.hxx
+++ b/include/oox/drawingml/table/tablestylecontext.hxx
@@ -21,8 +21,8 @@
 #ifndef OOX_DRAWINGML_TABLESTYLECONTEXT
 #define OOX_DRAWINGML_TABLESTYLECONTEXT
 
-#include "oox/core/contexthandler2.hxx"
-#include "oox/drawingml/table/tablestyle.hxx"
+#include <oox/core/contexthandler2.hxx>
+#include <oox/drawingml/table/tablestyle.hxx>
 
 namespace oox { namespace drawingml { namespace table {
 
diff --git a/include/oox/drawingml/table/tablestylelistfragmenthandler.hxx b/include/oox/drawingml/table/tablestylelistfragmenthandler.hxx
index 15a1b8ad7df7..725f7b95c599 100644
--- a/include/oox/drawingml/table/tablestylelistfragmenthandler.hxx
+++ b/include/oox/drawingml/table/tablestylelistfragmenthandler.hxx
@@ -20,8 +20,8 @@
 #ifndef INCLUDED_OOX_DRAWINGML_TABLE_TABLESTYLELISTFRAGMENTHANDLER_HXX
 #define INCLUDED_OOX_DRAWINGML_TABLE_TABLESTYLELISTFRAGMENTHANDLER_HXX
 
-#include "oox/drawingml/table/tablestylelist.hxx"
-#include "oox/core/fragmenthandler2.hxx"
+#include <oox/drawingml/table/tablestylelist.hxx>
+#include <oox/core/fragmenthandler2.hxx>
 
 namespace oox {
 namespace drawingml {
diff --git a/include/oox/drawingml/table/tablestylepart.hxx b/include/oox/drawingml/table/tablestylepart.hxx
index 5eb0a0934119..4b56d4edee1a 100644
--- a/include/oox/drawingml/table/tablestylepart.hxx
+++ b/include/oox/drawingml/table/tablestylepart.hxx
@@ -22,11 +22,11 @@
 
 #include <rtl/ustring.hxx>
 #include <boost/optional.hpp>
-#include "oox/drawingml/color.hxx"
-#include "oox/drawingml/textfont.hxx"
-#include "oox/drawingml/fillproperties.hxx"
-#include "oox/drawingml/lineproperties.hxx"
-#include "oox/drawingml/shape.hxx"
+#include <oox/drawingml/color.hxx>
+#include <oox/drawingml/textfont.hxx>
+#include <oox/drawingml/fillproperties.hxx>
+#include <oox/drawingml/lineproperties.hxx>
+#include <oox/drawingml/shape.hxx>
 #include <map>
 
 namespace oox { namespace drawingml { namespace table {
diff --git a/include/oox/drawingml/table/tablestyletextstylecontext.hxx b/include/oox/drawingml/table/tablestyletextstylecontext.hxx
index eb10bb89d6ab..71ab67445a3a 100644
--- a/include/oox/drawingml/table/tablestyletextstylecontext.hxx
+++ b/include/oox/drawingml/table/tablestyletextstylecontext.hxx
@@ -21,8 +21,8 @@
 #ifndef OOX_DRAWINGML_TABLESTYLETEXTSTYLECONTEXT
 #define OOX_DRAWINGML_TABLESTYLETEXTSTYLECONTEXT
 
-#include "oox/core/contexthandler.hxx"
-#include "oox/drawingml/table/tablestylepart.hxx"
+#include <oox/core/contexthandler.hxx>
+#include <oox/drawingml/table/tablestylepart.hxx>
 
 namespace oox { namespace drawingml { namespace table {
 
diff --git a/include/oox/drawingml/textbody.hxx b/include/oox/drawingml/textbody.hxx
index 0bcec9021ab8..8475031e15be 100644
--- a/include/oox/drawingml/textbody.hxx
+++ b/include/oox/drawingml/textbody.hxx
@@ -20,9 +20,9 @@
 #ifndef INCLUDED_OOX_DRAWINGML_TEXTBODY_HXX
 #define INCLUDED_OOX_DRAWINGML_TEXTBODY_HXX
 
-#include "oox/drawingml/drawingmltypes.hxx"
-#include "oox/drawingml/textbodyproperties.hxx"
-#include "oox/drawingml/textliststyle.hxx"
+#include <oox/drawingml/drawingmltypes.hxx>
+#include <oox/drawingml/textbodyproperties.hxx>
+#include <oox/drawingml/textliststyle.hxx>
 
 namespace com { namespace sun { namespace star {
     namespace text { class XText; }
diff --git a/include/oox/drawingml/textbodycontext.hxx b/include/oox/drawingml/textbodycontext.hxx
index 9304ef07352f..74c5cdd780ee 100644
--- a/include/oox/drawingml/textbodycontext.hxx
+++ b/include/oox/drawingml/textbodycontext.hxx
@@ -22,9 +22,9 @@
 
 #include <com/sun/star/text/XText.hpp>
 
-#include "oox/drawingml/textbody.hxx"
-#include "oox/drawingml/textrun.hxx"
-#include "oox/core/contexthandler2.hxx"
+#include <oox/drawingml/textbody.hxx>
+#include <oox/drawingml/textrun.hxx>
+#include <oox/core/contexthandler2.hxx>
 
 namespace oox { namespace drawingml {
 
diff --git a/include/oox/drawingml/textbodyproperties.hxx b/include/oox/drawingml/textbodyproperties.hxx
index 306a278e8ba7..3fb0684ec95a 100644
--- a/include/oox/drawingml/textbodyproperties.hxx
+++ b/include/oox/drawingml/textbodyproperties.hxx
@@ -21,8 +21,8 @@
 #define INCLUDED_OOX_DRAWINGML_TEXTBODYPROPERTIES_HXX
 
 #include <com/sun/star/drawing/TextVerticalAdjust.hpp>
-#include "oox/helper/helper.hxx"
-#include "oox/helper/propertymap.hxx"
+#include <oox/helper/helper.hxx>
+#include <oox/helper/propertymap.hxx>
 #include <boost/optional.hpp>
 
 namespace oox {
diff --git a/include/oox/drawingml/textbodypropertiescontext.hxx b/include/oox/drawingml/textbodypropertiescontext.hxx
index b14169c865a3..b3ec0326d0b4 100644
--- a/include/oox/drawingml/textbodypropertiescontext.hxx
+++ b/include/oox/drawingml/textbodypropertiescontext.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_OOX_DRAWINGML_TEXTBODYPROPERTIESCONTEXT_HXX
 #define INCLUDED_OOX_DRAWINGML_TEXTBODYPROPERTIESCONTEXT_HXX
 
-#include "oox/core/contexthandler2.hxx"
+#include <oox/core/contexthandler2.hxx>
 
 namespace oox { namespace drawingml {
 
diff --git a/include/oox/drawingml/textcharacterproperties.hxx b/include/oox/drawingml/textcharacterproperties.hxx
index 309d28c0c23c..c07901554fac 100644
--- a/include/oox/drawingml/textcharacterproperties.hxx
+++ b/include/oox/drawingml/textcharacterproperties.hxx
@@ -20,10 +20,10 @@
 #ifndef INCLUDED_OOX_DRAWINGML_TEXTCHARACTERPROPERTIES_HXX
 #define INCLUDED_OOX_DRAWINGML_TEXTCHARACTERPROPERTIES_HXX
 
-#include "oox/helper/helper.hxx"
-#include "oox/helper/propertymap.hxx"
-#include "oox/drawingml/color.hxx"
-#include "oox/drawingml/textfont.hxx"
+#include <oox/helper/helper.hxx>
+#include <oox/helper/propertymap.hxx>
+#include <oox/drawingml/color.hxx>
+#include <oox/drawingml/textfont.hxx>
 
 namespace oox { class PropertySet; }
 
diff --git a/include/oox/drawingml/textcharacterpropertiescontext.hxx b/include/oox/drawingml/textcharacterpropertiescontext.hxx
index d7e1bd06d373..d44227c96320 100644
--- a/include/oox/drawingml/textcharacterpropertiescontext.hxx
+++ b/include/oox/drawingml/textcharacterpropertiescontext.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_OOX_DRAWINGML_TEXTCHARACTERPROPERTIESCONTEXT_HXX
 #define INCLUDED_OOX_DRAWINGML_TEXTCHARACTERPROPERTIESCONTEXT_HXX
 
-#include "oox/core/contexthandler2.hxx"
+#include <oox/core/contexthandler2.hxx>
 
 namespace oox { namespace drawingml {
 
diff --git a/include/oox/drawingml/textfield.hxx b/include/oox/drawingml/textfield.hxx
index f031f91fe28d..e191c7dcafdb 100644
--- a/include/oox/drawingml/textfield.hxx
+++ b/include/oox/drawingml/textfield.hxx
@@ -22,8 +22,8 @@
 
 #include <boost/shared_ptr.hpp>
 
-#include "oox/drawingml/textrun.hxx"
-#include "oox/drawingml/textparagraphproperties.hxx"
+#include <oox/drawingml/textrun.hxx>
+#include <oox/drawingml/textparagraphproperties.hxx>
 
 namespace oox { namespace drawingml {
 
diff --git a/include/oox/drawingml/textfieldcontext.hxx b/include/oox/drawingml/textfieldcontext.hxx
index ee6284b952e0..425122497c57 100644
--- a/include/oox/drawingml/textfieldcontext.hxx
+++ b/include/oox/drawingml/textfieldcontext.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_OOX_DRAWINGML_TEXTFIELDCONTEXT_HXX
 #define INCLUDED_OOX_DRAWINGML_TEXTFIELDCONTEXT_HXX
 
-#include "oox/core/contexthandler2.hxx"
+#include <oox/core/contexthandler2.hxx>
 
 namespace oox { namespace drawingml {
 
diff --git a/include/oox/drawingml/textliststyle.hxx b/include/oox/drawingml/textliststyle.hxx
index b7b33fb17f30..09d341e497a3 100644
--- a/include/oox/drawingml/textliststyle.hxx
+++ b/include/oox/drawingml/textliststyle.hxx
@@ -20,8 +20,8 @@
 #ifndef INCLUDED_OOX_DRAWINGML_TEXTLISTSTYLE_HXX
 #define INCLUDED_OOX_DRAWINGML_TEXTLISTSTYLE_HXX
 
-#include "oox/drawingml/textparagraphproperties.hxx"
-#include "oox/helper/refvector.hxx"
+#include <oox/drawingml/textparagraphproperties.hxx>
+#include <oox/helper/refvector.hxx>
 
 namespace oox { namespace drawingml {
 
diff --git a/include/oox/drawingml/textliststylecontext.hxx b/include/oox/drawingml/textliststylecontext.hxx
index 46c8c682ea48..5dba0ab9a91e 100644
--- a/include/oox/drawingml/textliststylecontext.hxx
+++ b/include/oox/drawingml/textliststylecontext.hxx
@@ -20,8 +20,8 @@
 #ifndef INCLUDED_OOX_DRAWINGML_TEXTLISTSTYLECONTEXT_HXX
 #define INCLUDED_OOX_DRAWINGML_TEXTLISTSTYLECONTEXT_HXX
 
-#include "oox/drawingml/textliststyle.hxx"
-#include "oox/core/contexthandler2.hxx"
+#include <oox/drawingml/textliststyle.hxx>
+#include <oox/core/contexthandler2.hxx>
 
 namespace oox { namespace drawingml {
 
diff --git a/include/oox/drawingml/textparagraph.hxx b/include/oox/drawingml/textparagraph.hxx
index b58a5ee3075f..add0cef0ba4e 100644
--- a/include/oox/drawingml/textparagraph.hxx
+++ b/include/oox/drawingml/textparagraph.hxx
@@ -23,10 +23,10 @@
 #include <com/sun/star/text/XTextCursor.hpp>
 #include <com/sun/star/text/XText.hpp>
 
-#include "oox/core/xmlfilterbase.hxx"
-#include "oox/drawingml/textrun.hxx"
-#include "oox/drawingml/textliststyle.hxx"
-#include "oox/drawingml/textparagraphproperties.hxx"
+#include <oox/core/xmlfilterbase.hxx>
+#include <oox/drawingml/textrun.hxx>
+#include <oox/drawingml/textliststyle.hxx>
+#include <oox/drawingml/textparagraphproperties.hxx>
 
 namespace oox { namespace drawingml {
 
diff --git a/include/oox/drawingml/textparagraphproperties.hxx b/include/oox/drawingml/textparagraphproperties.hxx
index 9a7df53da893..8014929fc584 100644
--- a/include/oox/drawingml/textparagraphproperties.hxx
+++ b/include/oox/drawingml/textparagraphproperties.hxx
@@ -21,11 +21,11 @@
 #define INCLUDED_OOX_DRAWINGML_TEXTPARAGRAPHPROPERTIES_HXX
 
 #include <com/sun/star/beans/XPropertySet.hpp>
-#include "oox/drawingml/fillpropertiesgroupcontext.hxx"
-#include "oox/drawingml/textcharacterproperties.hxx"
+#include <oox/drawingml/fillpropertiesgroupcontext.hxx>
+#include <oox/drawingml/textcharacterproperties.hxx>
 #include <com/sun/star/style/NumberingType.hpp>
-#include "oox/drawingml/textfont.hxx"
-#include "textspacing.hxx"
+#include <oox/drawingml/textfont.hxx>
+#include <oox/drawingml/textspacing.hxx>
 #include <boost/optional.hpp>
 
 namespace com { namespace sun { namespace star {
diff --git a/include/oox/drawingml/textparagraphpropertiescontext.hxx b/include/oox/drawingml/textparagraphpropertiescontext.hxx
index b17c3310f73e..d1a5fa85e46f 100644
--- a/include/oox/drawingml/textparagraphpropertiescontext.hxx
+++ b/include/oox/drawingml/textparagraphpropertiescontext.hxx
@@ -23,10 +23,10 @@
 #include <list>
 
 #include <com/sun/star/style/TabStop.hpp>
-#include "oox/drawingml/drawingmltypes.hxx"
-#include "oox/drawingml/textparagraphproperties.hxx"
-#include "oox/drawingml/textspacing.hxx"
-#include "oox/core/contexthandler2.hxx"
+#include <oox/drawingml/drawingmltypes.hxx>
+#include <oox/drawingml/textparagraphproperties.hxx>
+#include <oox/drawingml/textspacing.hxx>
+#include <oox/core/contexthandler2.hxx>
 
 namespace oox { namespace drawingml {
 
diff --git a/include/oox/drawingml/textrun.hxx b/include/oox/drawingml/textrun.hxx
index ec4390dcf2f7..9c925f030ef5 100644
--- a/include/oox/drawingml/textrun.hxx
+++ b/include/oox/drawingml/textrun.hxx
@@ -23,7 +23,7 @@
 #include <com/sun/star/text/XTextCursor.hpp>
 #include <com/sun/star/text/XText.hpp>
 #include <com/sun/star/frame/XModel.hpp>
-#include "oox/drawingml/textcharacterproperties.hxx"
+#include <oox/drawingml/textcharacterproperties.hxx>
 
 namespace oox { namespace drawingml {
 
diff --git a/include/oox/drawingml/theme.hxx b/include/oox/drawingml/theme.hxx
index 9f8fedb8a914..2f0938f62295 100644
--- a/include/oox/drawingml/theme.hxx
+++ b/include/oox/drawingml/theme.hxx
@@ -20,11 +20,11 @@
 #ifndef INCLUDED_OOX_DRAWINGML_THEME_HXX
 #define INCLUDED_OOX_DRAWINGML_THEME_HXX
 
-#include "oox/drawingml/clrscheme.hxx"
-#include "oox/drawingml/shape.hxx"
-#include "oox/drawingml/textfont.hxx"
+#include <oox/drawingml/clrscheme.hxx>
+#include <oox/drawingml/shape.hxx>
+#include <oox/drawingml/textfont.hxx>
 #include <com/sun/star/xml/dom/XDocument.hpp>
-#include "oox/dllapi.h"
+#include <oox/dllapi.h>
 
 namespace oox {
 namespace drawingml {
diff --git a/include/oox/drawingml/themeelementscontext.hxx b/include/oox/drawingml/themeelementscontext.hxx
index b4e8579fe406..47acdc9a6290 100644
--- a/include/oox/drawingml/themeelementscontext.hxx
+++ b/include/oox/drawingml/themeelementscontext.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_OOX_DRAWINGML_THEMEELEMENTSCONTEXT_HXX
 #define INCLUDED_OOX_DRAWINGML_THEMEELEMENTSCONTEXT_HXX
 
-#include "oox/core/contexthandler2.hxx"
+#include <oox/core/contexthandler2.hxx>
 
 namespace oox {
 namespace drawingml {
diff --git a/include/oox/drawingml/themefragmenthandler.hxx b/include/oox/drawingml/themefragmenthandler.hxx
index 09fec7e3bfb2..cf17903da7df 100644
--- a/include/oox/drawingml/themefragmenthandler.hxx
+++ b/include/oox/drawingml/themefragmenthandler.hxx
@@ -20,8 +20,8 @@
 #ifndef INCLUDED_OOX_DRAWINGML_THEMEFRAGMENTHANDLER_HXX
 #define INCLUDED_OOX_DRAWINGML_THEMEFRAGMENTHANDLER_HXX
 
-#include "oox/core/fragmenthandler2.hxx"
-#include "oox/dllapi.h"
+#include <oox/core/fragmenthandler2.hxx>
+#include <oox/dllapi.h>
 
 namespace oox {
 namespace drawingml {
diff --git a/include/oox/drawingml/transform2dcontext.hxx b/include/oox/drawingml/transform2dcontext.hxx
index 4636f45e48da..dfe49cb0fc08 100644
--- a/include/oox/drawingml/transform2dcontext.hxx
+++ b/include/oox/drawingml/transform2dcontext.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_OOX_DRAWINGML_TRANSFORM2DCONTEXT_HXX
 #define INCLUDED_OOX_DRAWINGML_TRANSFORM2DCONTEXT_HXX
 
-#include "oox/core/contexthandler2.hxx"
+#include <oox/core/contexthandler2.hxx>
 
 namespace oox {
 namespace drawingml {
diff --git a/include/oox/dump/dffdumper.hxx b/include/oox/dump/dffdumper.hxx
index fd4ccd83aecc..1a269553c50a 100644
--- a/include/oox/dump/dffdumper.hxx
+++ b/include/oox/dump/dffdumper.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_OOX_DUMP_DFFDUMPER_HXX
 #define INCLUDED_OOX_DUMP_DFFDUMPER_HXX
 
-#include "oox/dump/dumperbase.hxx"
+#include <oox/dump/dumperbase.hxx>
 
 #if OOX_INCLUDE_DUMPER
 
diff --git a/include/oox/dump/dumperbase.hxx b/include/oox/dump/dumperbase.hxx
index 68e3d32cb646..ae879556e6ab 100644
--- a/include/oox/dump/dumperbase.hxx
+++ b/include/oox/dump/dumperbase.hxx
@@ -30,9 +30,9 @@
 #include <rtl/ustrbuf.hxx>
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/util/DateTime.hpp>
-#include "oox/helper/binaryinputstream.hxx"
-#include "oox/helper/helper.hxx"
-#include "oox/helper/storagebase.hxx"
+#include <oox/helper/binaryinputstream.hxx>
+#include <oox/helper/helper.hxx>
+#include <oox/helper/storagebase.hxx>
 
 #define OOX_INCLUDE_DUMPER (OSL_DEBUG_LEVEL > 0)
 
diff --git a/include/oox/dump/oledumper.hxx b/include/oox/dump/oledumper.hxx
index 2a90dbb8a61e..b9cac39f7adb 100644
--- a/include/oox/dump/oledumper.hxx
+++ b/include/oox/dump/oledumper.hxx
@@ -20,8 +20,8 @@
 #ifndef INCLUDED_OOX_DUMP_OLEDUMPER_HXX
 #define INCLUDED_OOX_DUMP_OLEDUMPER_HXX
 
-#include "oox/helper/storagebase.hxx"
-#include "oox/dump/dumperbase.hxx"
+#include <oox/helper/storagebase.hxx>
+#include <oox/dump/dumperbase.hxx>
 
 #if OOX_INCLUDE_DUMPER
 
diff --git a/include/oox/dump/pptxdumper.hxx b/include/oox/dump/pptxdumper.hxx
index f77e3dd54bff..05f9dc61200f 100644
--- a/include/oox/dump/pptxdumper.hxx
+++ b/include/oox/dump/pptxdumper.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_OOX_DUMP_PPTXDUMPER_HXX
 #define INCLUDED_OOX_DUMP_PPTXDUMPER_HXX
 
-#include "oox/dump/dumperbase.hxx"
+#include <oox/dump/dumperbase.hxx>
 
 #if OOX_INCLUDE_DUMPER
 
diff --git a/include/oox/dump/xlsbdumper.hxx b/include/oox/dump/xlsbdumper.hxx
index 06a6ef5d42da..72b57d20cdfe 100644
--- a/include/oox/dump/xlsbdumper.hxx
+++ b/include/oox/dump/xlsbdumper.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_OOX_DUMP_XLSBDUMPER_HXX
 #define INCLUDED_OOX_DUMP_XLSBDUMPER_HXX
 
-#include "oox/dump/dumperbase.hxx"
+#include <oox/dump/dumperbase.hxx>
 
 #if OOX_INCLUDE_DUMPER
 
diff --git a/include/oox/helper/attributelist.hxx b/include/oox/helper/attributelist.hxx
index 8654a7480c69..3fb6e8df113c 100644
--- a/include/oox/helper/attributelist.hxx
+++ b/include/oox/helper/attributelist.hxx
@@ -22,10 +22,10 @@
 
 #include <com/sun/star/util/DateTime.hpp>
 #include <com/sun/star/xml/sax/XFastAttributeList.hpp>
-#include "oox/helper/helper.hxx"
-#include "oox/token/namespaces.hxx"
-#include "oox/token/tokens.hxx"
-#include "oox/dllapi.h"
+#include <oox/helper/helper.hxx>
+#include <oox/token/namespaces.hxx>
+#include <oox/token/tokens.hxx>
+#include <oox/dllapi.h>
 
 namespace oox {
 
diff --git a/include/oox/helper/binaryinputstream.hxx b/include/oox/helper/binaryinputstream.hxx
index 4488ad665fe0..a63a36b6708a 100644
--- a/include/oox/helper/binaryinputstream.hxx
+++ b/include/oox/helper/binaryinputstream.hxx
@@ -22,7 +22,7 @@
 
 #include <vector>
 #include <com/sun/star/io/XInputStream.hpp>
-#include "oox/helper/binarystreambase.hxx"
+#include <oox/helper/binarystreambase.hxx>
 
 namespace com { namespace sun { namespace star {
     namespace io { class XInputStream; }
diff --git a/include/oox/helper/binaryoutputstream.hxx b/include/oox/helper/binaryoutputstream.hxx
index 8899117b253e..19fabc20217e 100644
--- a/include/oox/helper/binaryoutputstream.hxx
+++ b/include/oox/helper/binaryoutputstream.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_OOX_HELPER_BINARYOUTPUTSTREAM_HXX
 #define INCLUDED_OOX_HELPER_BINARYOUTPUTSTREAM_HXX
 
-#include "oox/helper/binarystreambase.hxx"
+#include <oox/helper/binarystreambase.hxx>
 
 namespace com { namespace sun { namespace star {
     namespace io { class XOutputStream; }
diff --git a/include/oox/helper/binarystreambase.hxx b/include/oox/helper/binarystreambase.hxx
index 65b4827dda3b..29deac9d6424 100644
--- a/include/oox/helper/binarystreambase.hxx
+++ b/include/oox/helper/binarystreambase.hxx
@@ -22,8 +22,8 @@
 
 #include <com/sun/star/uno/Sequence.hxx>
 #include <boost/shared_ptr.hpp>
-#include "oox/helper/helper.hxx"
-#include "oox/dllapi.h"
+#include <oox/helper/helper.hxx>
+#include <oox/dllapi.h>
 
 namespace com { namespace sun { namespace star {
     namespace io { class XSeekable; }
diff --git a/include/oox/helper/containerhelper.hxx b/include/oox/helper/containerhelper.hxx
index 10590a93e963..7e3b98b22daf 100644
--- a/include/oox/helper/containerhelper.hxx
+++ b/include/oox/helper/containerhelper.hxx
@@ -24,7 +24,7 @@
 #include <vector>
 #include <com/sun/star/uno/Reference.h>
 #include <com/sun/star/uno/Sequence.h>
-#include "oox/dllapi.h"
+#include <oox/dllapi.h>
 
 
 namespace com { namespace sun { namespace star {
diff --git a/include/oox/helper/graphichelper.hxx b/include/oox/helper/graphichelper.hxx
index 9ba378ad1b7b..b96e99395708 100644
--- a/include/oox/helper/graphichelper.hxx
+++ b/include/oox/helper/graphichelper.hxx
@@ -25,8 +25,8 @@
 #include <rtl/ustring.hxx>
 #include <com/sun/star/awt/DeviceInfo.hpp>
 #include <com/sun/star/uno/Reference.hxx>
-#include "oox/helper/binarystreambase.hxx"
-#include "oox/helper/storagebase.hxx"
+#include <oox/helper/binarystreambase.hxx>
+#include <oox/helper/storagebase.hxx>
 
 struct WMF_EXTERNALHEADER;
 
diff --git a/include/oox/helper/modelobjecthelper.hxx b/include/oox/helper/modelobjecthelper.hxx
index b008d5aed10f..5efa05440165 100644
--- a/include/oox/helper/modelobjecthelper.hxx
+++ b/include/oox/helper/modelobjecthelper.hxx
@@ -21,7 +21,7 @@
 #define INCLUDED_OOX_HELPER_MODELOBJECTHELPER_HXX
 
 #include <com/sun/star/uno/Reference.hxx>
-#include "oox/dllapi.h"
+#include <oox/dllapi.h>
 
 namespace com { namespace sun { namespace star {
     namespace awt { struct Gradient; }
diff --git a/include/oox/helper/progressbar.hxx b/include/oox/helper/progressbar.hxx
index 425f519f23c7..1f6105888b0b 100644
--- a/include/oox/helper/progressbar.hxx
+++ b/include/oox/helper/progressbar.hxx
@@ -22,7 +22,7 @@
 
 #include <boost/shared_ptr.hpp>
 #include <com/sun/star/uno/Reference.hxx>
-#include "oox/dllapi.h"
+#include <oox/dllapi.h>
 
 
 namespace com { namespace sun { namespace star {
diff --git a/include/oox/helper/propertymap.hxx b/include/oox/helper/propertymap.hxx
index 90811d59f80b..e1dcb3989458 100644
--- a/include/oox/helper/propertymap.hxx
+++ b/include/oox/helper/propertymap.hxx
@@ -25,8 +25,8 @@
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <rtl/ustring.hxx>
-#include "oox/token/properties.hxx"
-#include "oox/dllapi.h"
+#include <oox/token/properties.hxx>
+#include <oox/dllapi.h>
 
 namespace com { namespace sun { namespace star { namespace beans {
     struct PropertyValue;
diff --git a/include/oox/helper/propertyset.hxx b/include/oox/helper/propertyset.hxx
index 7aee8ab2cf7c..0e9170537559 100644
--- a/include/oox/helper/propertyset.hxx
+++ b/include/oox/helper/propertyset.hxx
@@ -23,7 +23,7 @@
 #include <com/sun/star/beans/XMultiPropertySet.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/beans/XPropertySetInfo.hpp>
-#include "oox/dllapi.h"
+#include <oox/dllapi.h>
 
 namespace oox {
 
diff --git a/include/oox/helper/storagebase.hxx b/include/oox/helper/storagebase.hxx
index 8df2f786fa9b..68f594015e91 100644
--- a/include/oox/helper/storagebase.hxx
+++ b/include/oox/helper/storagebase.hxx
@@ -22,8 +22,8 @@
 
 #include <vector>
 #include <com/sun/star/uno/Reference.hxx>
-#include "oox/helper/refmap.hxx"
-#include "oox/dllapi.h"
+#include <oox/helper/refmap.hxx>
+#include <oox/dllapi.h>
 
 namespace com { namespace sun { namespace star {
     namespace embed { class XStorage; }
diff --git a/include/oox/helper/zipstorage.hxx b/include/oox/helper/zipstorage.hxx
index 59dc01c5a4c7..0338b8b7cc58 100644
--- a/include/oox/helper/zipstorage.hxx
+++ b/include/oox/helper/zipstorage.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_OOX_HELPER_ZIPSTORAGE_HXX
 #define INCLUDED_OOX_HELPER_ZIPSTORAGE_HXX
 
-#include "oox/helper/storagebase.hxx"
+#include <oox/helper/storagebase.hxx>
 
 namespace com { namespace sun { namespace star {
     namespace uno { class XComponentContext; }
diff --git a/include/oox/ole/axbinaryreader.hxx b/include/oox/ole/axbinaryreader.hxx
index 2ad30d523993..c334d380dcf2 100644
--- a/include/oox/ole/axbinaryreader.hxx
+++ b/include/oox/ole/axbinaryreader.hxx
@@ -21,9 +21,9 @@
 #define INCLUDED_OOX_OLE_AXBINARYREADER_HXX
 
 #include <utility>
-#include "oox/helper/binaryinputstream.hxx"
-#include "oox/helper/refvector.hxx"
-#include "oox/ole/axfontdata.hxx"
+#include <oox/helper/binaryinputstream.hxx>
+#include <oox/helper/refvector.hxx>
+#include <oox/ole/axfontdata.hxx>
 
 namespace oox {
 namespace ole {
diff --git a/include/oox/ole/axbinarywriter.hxx b/include/oox/ole/axbinarywriter.hxx
index 2ef0b720fcfa..ba7a4866c50b 100644
--- a/include/oox/ole/axbinarywriter.hxx
+++ b/include/oox/ole/axbinarywriter.hxx
@@ -11,8 +11,8 @@
 #define INCLUDED_OOX_OLE_AXBINARYWRITER_HXX
 
 #include <utility>
-#include "oox/helper/binaryoutputstream.hxx"
-#include "oox/helper/refvector.hxx"
+#include <oox/helper/binaryoutputstream.hxx>
+#include <oox/helper/refvector.hxx>
 
 namespace oox {
 namespace ole {
diff --git a/include/oox/ole/axcontrol.hxx b/include/oox/ole/axcontrol.hxx
index 8c24d2e29c1a..90d48a51e2f7 100644
--- a/include/oox/ole/axcontrol.hxx
+++ b/include/oox/ole/axcontrol.hxx
@@ -21,11 +21,11 @@
 #define INCLUDED_OOX_OLE_AXCONTROL_HXX
 
 #include <boost/shared_ptr.hpp>
-#include "oox/helper/binarystreambase.hxx"
-#include "oox/helper/propertyset.hxx"
-#include "oox/ole/axbinaryreader.hxx"
-#include "oox/ole/olehelper.hxx"
-#include "oox/dllapi.h"
+#include <oox/helper/binarystreambase.hxx>
+#include <oox/helper/propertyset.hxx>
+#include <oox/ole/axbinaryreader.hxx>
+#include <oox/ole/olehelper.hxx>
+#include <oox/dllapi.h>
 
 namespace com { namespace sun { namespace star {
     namespace awt { class XControlModel; }
diff --git a/include/oox/ole/axcontrolfragment.hxx b/include/oox/ole/axcontrolfragment.hxx
index a43019e07210..92173c1851b7 100644
--- a/include/oox/ole/axcontrolfragment.hxx
+++ b/include/oox/ole/axcontrolfragment.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_OOX_OLE_AXCONTROLFRAGMENT_HXX
 #define INCLUDED_OOX_OLE_AXCONTROLFRAGMENT_HXX
 
-#include "oox/core/fragmenthandler2.hxx"
+#include <oox/core/fragmenthandler2.hxx>
 
 namespace oox {
 namespace ole {
diff --git a/include/oox/ole/axfontdata.hxx b/include/oox/ole/axfontdata.hxx
index 09dbba015922..ce1b0f6aaaf5 100644
--- a/include/oox/ole/axfontdata.hxx
+++ b/include/oox/ole/axfontdata.hxx
@@ -20,10 +20,10 @@
 #ifndef INCLUDED_OOX_OLE_AXFONTDATA_HXX
 #define INCLUDED_OOX_OLE_AXFONTDATA_HXX
 
-#include "oox/helper/binaryinputstream.hxx"
-#include "oox/helper/binaryoutputstream.hxx"
-#include "oox/helper/refvector.hxx"
-#include "oox/dllapi.h"
+#include <oox/helper/binaryinputstream.hxx>
+#include <oox/helper/binaryoutputstream.hxx>
+#include <oox/helper/refvector.hxx>
+#include <oox/dllapi.h>
 
 namespace oox {
 namespace ole {
diff --git a/include/oox/ole/olehelper.hxx b/include/oox/ole/olehelper.hxx
index 038b7885e7ce..0b5dc4f03a3d 100644
--- a/include/oox/ole/olehelper.hxx
+++ b/include/oox/ole/olehelper.hxx
@@ -21,23 +21,23 @@
 #define INCLUDED_OOX_OLE_OLEHELPER_HXX
 
 #include <rtl/ustring.hxx>
-#include "oox/helper/binarystreambase.hxx"
-#include "oox/helper/storagebase.hxx"
-#include "oox/helper/graphichelper.hxx"
-#include "com/sun/star/form/XFormComponent.hpp"
-#include "com/sun/star/uno/XComponentContext.hpp"
-#include "com/sun/star/lang/XMultiServiceFactory.hpp"
-#include "com/sun/star/frame/XModel.hpp"
-#include "com/sun/star/frame/XFrame.hpp"
-#include "com/sun/star/drawing/XShapes.hpp"
-#include "com/sun/star/awt/XControlModel.hpp"
-#include "com/sun/star/io/XInputStream.hpp"
-#include "com/sun/star/io/XOutputStream.hpp"
+#include <oox/helper/binarystreambase.hxx>
+#include <oox/helper/storagebase.hxx>
+#include <oox/helper/graphichelper.hxx>
+#include <com/sun/star/form/XFormComponent.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <com/sun/star/frame/XModel.hpp>
+#include <com/sun/star/frame/XFrame.hpp>
+#include <com/sun/star/drawing/XShapes.hpp>
+#include <com/sun/star/awt/XControlModel.hpp>
+#include <com/sun/star/io/XInputStream.hpp>
+#include <com/sun/star/io/XOutputStream.hpp>
 #include <com/sun/star/drawing/XDrawPage.hpp>
-#include "com/sun/star/container/XIndexContainer.hpp"
+#include <com/sun/star/container/XIndexContainer.hpp>
 #include <filter/msfilter/msocximex.hxx>
-#include "oox/dllapi.h"
-#include "sot/storage.hxx"
+#include <oox/dllapi.h>
+#include <sot/storage.hxx>
 
 class SvGlobalName;
 
diff --git a/include/oox/ole/oleobjecthelper.hxx b/include/oox/ole/oleobjecthelper.hxx
index 1cde8dff5493..d869712067f2 100644
--- a/include/oox/ole/oleobjecthelper.hxx
+++ b/include/oox/ole/oleobjecthelper.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_OOX_OLE_OLEOBJECTHELPER_HXX
 #define INCLUDED_OOX_OLE_OLEOBJECTHELPER_HXX
 
-#include "oox/helper/binarystreambase.hxx"
+#include <oox/helper/binarystreambase.hxx>
 
 namespace com { namespace sun { namespace star {
     namespace awt { struct Size; }
diff --git a/include/oox/ole/olestorage.hxx b/include/oox/ole/olestorage.hxx
index 008ba6184890..78e4c4c442a6 100644
--- a/include/oox/ole/olestorage.hxx
+++ b/include/oox/ole/olestorage.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_OOX_OLE_OLESTORAGE_HXX
 #define INCLUDED_OOX_OLE_OLESTORAGE_HXX
 
-#include "oox/helper/storagebase.hxx"
+#include <oox/helper/storagebase.hxx>
 
 namespace com { namespace sun { namespace star {
     namespace container { class XNameContainer; }
diff --git a/include/oox/ole/vbacontrol.hxx b/include/oox/ole/vbacontrol.hxx
index e9135875854d..fa0ed5ebeda0 100644
--- a/include/oox/ole/vbacontrol.hxx
+++ b/include/oox/ole/vbacontrol.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_OOX_OLE_VBACONTROL_HXX
 #define INCLUDED_OOX_OLE_VBACONTROL_HXX
 
-#include "oox/ole/axcontrol.hxx"
+#include <oox/ole/axcontrol.hxx>
 #include <com/sun/star/frame/XModel.hpp>
 
 namespace com { namespace sun { namespace star {
diff --git a/include/oox/ole/vbahelper.hxx b/include/oox/ole/vbahelper.hxx
index 6d4f80ce02f2..a593a176ba4b 100644
--- a/include/oox/ole/vbahelper.hxx
+++ b/include/oox/ole/vbahelper.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_OOX_OLE_VBAHELPER_HXX
 #define INCLUDED_OOX_OLE_VBAHELPER_HXX
 
-#include "oox/helper/binarystreambase.hxx"
+#include <oox/helper/binarystreambase.hxx>
 
 namespace oox { class BinaryInputStream; }
 
diff --git a/include/oox/ole/vbainputstream.hxx b/include/oox/ole/vbainputstream.hxx
index 54da72eb7e58..c4c4f0c1aa51 100644
--- a/include/oox/ole/vbainputstream.hxx
+++ b/include/oox/ole/vbainputstream.hxx
@@ -21,7 +21,7 @@
 #define INCLUDED_OOX_OLE_VBAINPUTSTREAM_HXX
 
 #include <vector>
-#include "oox/helper/binaryinputstream.hxx"
+#include <oox/helper/binaryinputstream.hxx>
 
 namespace oox {
 namespace ole {
diff --git a/include/oox/ole/vbaproject.hxx b/include/oox/ole/vbaproject.hxx
index 64fe2e7183dc..9c83c67f4eba 100644
--- a/include/oox/ole/vbaproject.hxx
+++ b/include/oox/ole/vbaproject.hxx
@@ -22,10 +22,10 @@
 
 #include <map>
 #include <com/sun/star/uno/XInterface.hpp>
-#include "oox/helper/refvector.hxx"
-#include "oox/helper/storagebase.hxx"
-#include "oox/dllapi.h"
-#include "oox/ole/vbamodule.hxx"
+#include <oox/helper/refvector.hxx>
+#include <oox/helper/storagebase.hxx>
+#include <oox/dllapi.h>
+#include <oox/ole/vbamodule.hxx>
 
 namespace com { namespace sun { namespace star {
     namespace container { class XNameContainer; }
diff --git a/include/oox/ppt/animationspersist.hxx b/include/oox/ppt/animationspersist.hxx
index ba63991def2a..8b05268b1f7e 100644
--- a/include/oox/ppt/animationspersist.hxx
+++ b/include/oox/ppt/animationspersist.hxx
@@ -30,8 +30,8 @@
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/drawing/XShape.hpp>
 
-#include "oox/drawingml/drawingmltypes.hxx"
-#include "oox/ppt/slidepersist.hxx"
+#include <oox/drawingml/drawingmltypes.hxx>
+#include <oox/ppt/slidepersist.hxx>
 
 namespace oox { namespace ppt {
 
diff --git a/include/oox/ppt/backgroundproperties.hxx b/include/oox/ppt/backgroundproperties.hxx
index ae055c80913d..e01ac84eff5d 100644
--- a/include/oox/ppt/backgroundproperties.hxx
+++ b/include/oox/ppt/backgroundproperties.hxx
@@ -20,8 +20,8 @@
 #ifndef INCLUDED_OOX_PPT_BACKGROUNDPROPERTIES_HXX
 #define INCLUDED_OOX_PPT_BACKGROUNDPROPERTIES_HXX
 
-#include "oox/core/fragmenthandler2.hxx"
-#include "oox/drawingml/fillproperties.hxx"
+#include <oox/core/fragmenthandler2.hxx>
+#include <oox/drawingml/fillproperties.hxx>
 
 namespace oox { namespace ppt {
 
diff --git a/include/oox/ppt/customshowlistcontext.hxx b/include/oox/ppt/customshowlistcontext.hxx
index b00096f0386e..d32d331c6052 100644
--- a/include/oox/ppt/customshowlistcontext.hxx
+++ b/include/oox/ppt/customshowlistcontext.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_OOX_PPT_CUSTOMSHOWLISTCONTEXT_HXX
 #define INCLUDED_OOX_PPT_CUSTOMSHOWLISTCONTEXT_HXX
 
-#include "oox/core/fragmenthandler2.hxx"
+#include <oox/core/fragmenthandler2.hxx>
 #include <vector>
 
 namespace oox { namespace ppt {
diff --git a/include/oox/ppt/dgmimport.hxx b/include/oox/ppt/dgmimport.hxx
index 33c9412906fd..6252ad558dcf 100644
--- a/include/oox/ppt/dgmimport.hxx
+++ b/include/oox/ppt/dgmimport.hxx
@@ -20,12 +20,12 @@
 #ifndef INCLUDED_OOX_PPT_DGMIMPORT_HXX
 #define INCLUDED_OOX_PPT_DGMIMPORT_HXX
 
-#include "oox/core/xmlfilterbase.hxx"
+#include <oox/core/xmlfilterbase.hxx>
 
 #include <com/sun/star/animations/XAnimationNode.hpp>
 #include <oox/drawingml/theme.hxx>
-#include "oox/ppt/presentationfragmenthandler.hxx"
-#include "oox/ppt/slidepersist.hxx"
+#include <oox/ppt/presentationfragmenthandler.hxx>
+#include <oox/ppt/slidepersist.hxx>
 #include <vector>
 #include <map>
 
diff --git a/include/oox/ppt/dgmlayout.hxx b/include/oox/ppt/dgmlayout.hxx
index 0c5f942bc892..3030c2465251 100644
--- a/include/oox/ppt/dgmlayout.hxx
+++ b/include/oox/ppt/dgmlayout.hxx
@@ -20,12 +20,12 @@
 #ifndef INCLUDED_OOX_PPT_DGMLAYOUT_HXX
 #define INCLUDED_OOX_PPT_DGMLAYOUT_HXX
 
-#include "oox/core/xmlfilterbase.hxx"
+#include <oox/core/xmlfilterbase.hxx>
 
 #include <com/sun/star/animations/XAnimationNode.hpp>
 #include <oox/drawingml/theme.hxx>
-#include "oox/ppt/presentationfragmenthandler.hxx"
-#include "oox/ppt/slidepersist.hxx"
+#include <oox/ppt/presentationfragmenthandler.hxx>
+#include <oox/ppt/slidepersist.hxx>
 #include <vector>
 #include <map>
 
diff --git a/include/oox/ppt/layoutfragmenthandler.hxx b/include/oox/ppt/layoutfragmenthandler.hxx
index 80983182b73d..739ba253d5b2 100644
--- a/include/oox/ppt/layoutfragmenthandler.hxx
+++ b/include/oox/ppt/layoutfragmenthandler.hxx
@@ -20,7 +20,7 @@
 #ifndef OOX_PPT_LAYOUTFRAGMENTHANDLER
 #define OOX_PPT_LAYOUTFRAGMENTHANDLER
 
-#include "oox/ppt/slidefragmenthandler.hxx"
+#include <oox/ppt/slidefragmenthandler.hxx>
 
 #include <vector>
 
diff --git a/include/oox/ppt/pptgraphicshapecontext.hxx b/include/oox/ppt/pptgraphicshapecontext.hxx
index 304b359fb865..a72721e069ac 100644
--- a/include/oox/ppt/pptgraphicshapecontext.hxx
+++ b/include/oox/ppt/pptgraphicshapecontext.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_OOX_PPT_PPTGRAPHICSHAPECONTEXT_HXX
 #define INCLUDED_OOX_PPT_PPTGRAPHICSHAPECONTEXT_HXX
 
-#include "oox/drawingml/graphicshapecontext.hxx"
+#include <oox/drawingml/graphicshapecontext.hxx>
 
 namespace oox { namespace ppt {
 
diff --git a/include/oox/ppt/pptimport.hxx b/include/oox/ppt/pptimport.hxx
index c218c0cfab03..ffde992a91f0 100644
--- a/include/oox/ppt/pptimport.hxx
+++ b/include/oox/ppt/pptimport.hxx
@@ -20,12 +20,12 @@
 #ifndef INCLUDED_OOX_PPT_PPTIMPORT_HXX
 #define INCLUDED_OOX_PPT_PPTIMPORT_HXX
 
-#include "oox/core/xmlfilterbase.hxx"
+#include <oox/core/xmlfilterbase.hxx>
 
 #include <com/sun/star/animations/XAnimationNode.hpp>
 #include <oox/drawingml/theme.hxx>
-#include "oox/ppt/presentationfragmenthandler.hxx"
-#include "oox/ppt/slidepersist.hxx"
+#include <oox/ppt/presentationfragmenthandler.hxx>
+#include <oox/ppt/slidepersist.hxx>
 #include <vector>
 #include <map>
 
diff --git a/include/oox/ppt/pptshape.hxx b/include/oox/ppt/pptshape.hxx
index f551d478e888..ffe6ae1b2530 100644
--- a/include/oox/ppt/pptshape.hxx
+++ b/include/oox/ppt/pptshape.hxx
@@ -20,8 +20,8 @@
 #ifndef INCLUDED_OOX_PPT_PPTSHAPE_HXX
 #define INCLUDED_OOX_PPT_PPTSHAPE_HXX
 
-#include "oox/drawingml/shape.hxx"
-#include "oox/ppt/slidepersist.hxx"
+#include <oox/drawingml/shape.hxx>
+#include <oox/ppt/slidepersist.hxx>
 
 namespace oox { namespace ppt {
 
diff --git a/include/oox/ppt/pptshapecontext.hxx b/include/oox/ppt/pptshapecontext.hxx
index 4b225894ec07..00c87cf57d05 100644
--- a/include/oox/ppt/pptshapecontext.hxx
+++ b/include/oox/ppt/pptshapecontext.hxx
@@ -20,8 +20,8 @@
 #ifndef INCLUDED_OOX_PPT_PPTSHAPECONTEXT_HXX
 #define INCLUDED_OOX_PPT_PPTSHAPECONTEXT_HXX
 
-#include "oox/drawingml/shapecontext.hxx"
-#include "oox/ppt/slidepersist.hxx"
+#include <oox/drawingml/shapecontext.hxx>
+#include <oox/ppt/slidepersist.hxx>
 
 namespace oox { namespace ppt {
 
diff --git a/include/oox/ppt/pptshapegroupcontext.hxx b/include/oox/ppt/pptshapegroupcontext.hxx
index 96dc727de417..f4e1d7a3e892 100644
--- a/include/oox/ppt/pptshapegroupcontext.hxx
+++ b/include/oox/ppt/pptshapegroupcontext.hxx
@@ -20,8 +20,8 @@
 #ifndef INCLUDED_OOX_PPT_PPTSHAPEGROUPCONTEXT_HXX
 #define INCLUDED_OOX_PPT_PPTSHAPEGROUPCONTEXT_HXX
 
-#include "oox/drawingml/shapegroupcontext.hxx"
-#include "oox/ppt/slidepersist.hxx"
+#include <oox/drawingml/shapegroupcontext.hxx>
+#include <oox/ppt/slidepersist.hxx>
 
 namespace oox { namespace ppt {
 
diff --git a/include/oox/ppt/pptshapepropertiescontext.hxx b/include/oox/ppt/pptshapepropertiescontext.hxx
index 43ad546b2bb6..d3094432ef52 100644
--- a/include/oox/ppt/pptshapepropertiescontext.hxx
+++ b/include/oox/ppt/pptshapepropertiescontext.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_OOX_PPT_PPTSHAPEPROPERTIESCONTEXT_HXX
 #define INCLUDED_OOX_PPT_PPTSHAPEPROPERTIESCONTEXT_HXX
 
-#include "oox/drawingml/shapepropertiescontext.hxx"
+#include <oox/drawingml/shapepropertiescontext.hxx>
 
 namespace oox { namespace ppt {
 
diff --git a/include/oox/ppt/presentationfragmenthandler.hxx b/include/oox/ppt/presentationfragmenthandler.hxx
index ae26cb233e8c..a0b51ef0de1b 100644
--- a/include/oox/ppt/presentationfragmenthandler.hxx
+++ b/include/oox/ppt/presentationfragmenthandler.hxx
@@ -22,14 +22,14 @@
 
 #include <com/sun/star/drawing/XDrawPage.hpp>
 #include <com/sun/star/awt/Size.hpp>
-#include "oox/drawingml/textliststyle.hxx"
-#include "oox/ppt/slidepersist.hxx"
-#include "oox/core/contexthandler.hxx"
-#include "oox/core/fragmenthandler.hxx"
-#include "oox/core/fragmenthandler2.hxx"
-#include "oox/core/relations.hxx"
-#include "oox/ppt/customshowlistcontext.hxx"
-#include "oox/ppt/comments.hxx"
+#include <oox/drawingml/textliststyle.hxx>
+#include <oox/ppt/slidepersist.hxx>
+#include <oox/core/contexthandler.hxx>
+#include <oox/core/fragmenthandler.hxx>
+#include <oox/core/fragmenthandler2.hxx>
+#include <oox/core/relations.hxx>
+#include <oox/ppt/customshowlistcontext.hxx>
+#include <oox/ppt/comments.hxx>
 #include <stack>
 #include <vector>
 
diff --git a/include/oox/ppt/slidefragmenthandler.hxx b/include/oox/ppt/slidefragmenthandler.hxx
index 045f6ff1ccda..7fde32356fb3 100644
--- a/include/oox/ppt/slidefragmenthandler.hxx
+++ b/include/oox/ppt/slidefragmenthandler.hxx
@@ -21,9 +21,9 @@
 #define OOX_PPT_SLIDEFRAGMENTHANDLER
 
 #include <com/sun/star/drawing/XDrawPage.hpp>
-#include "oox/helper/propertymap.hxx"
-#include "oox/core/fragmenthandler2.hxx"
-#include "oox/ppt/slidepersist.hxx"
+#include <oox/helper/propertymap.hxx>
+#include <oox/core/fragmenthandler2.hxx>
+#include <oox/ppt/slidepersist.hxx>
 
 #include <stack>
 #include <vector>
diff --git a/include/oox/ppt/slidemastertextstylescontext.hxx b/include/oox/ppt/slidemastertextstylescontext.hxx
index 25696b3f329f..fecdfba17ce5 100644
--- a/include/oox/ppt/slidemastertextstylescontext.hxx
+++ b/include/oox/ppt/slidemastertextstylescontext.hxx
@@ -20,10 +20,10 @@
 #ifndef INCLUDED_OOX_PPT_SLIDEMASTERTEXTSTYLESCONTEXT_HXX
 #define INCLUDED_OOX_PPT_SLIDEMASTERTEXTSTYLESCONTEXT_HXX
 
-#include "oox/drawingml/theme.hxx"
-#include "oox/core/contexthandler.hxx"
-#include "oox/core/fragmenthandler2.hxx"
-#include "oox/ppt/slidepersist.hxx"
+#include <oox/drawingml/theme.hxx>
+#include <oox/core/contexthandler.hxx>
+#include <oox/core/fragmenthandler2.hxx>
+#include <oox/ppt/slidepersist.hxx>
 
 namespace oox { namespace ppt {
 
diff --git a/include/oox/ppt/slidepersist.hxx b/include/oox/ppt/slidepersist.hxx
index 38f144a57a61..ce23fbe600da 100644
--- a/include/oox/ppt/slidepersist.hxx
+++ b/include/oox/ppt/slidepersist.hxx
@@ -21,17 +21,17 @@
 #define INCLUDED_OOX_PPT_SLIDEPERSIST_HXX
 
 #include <boost/shared_ptr.hpp>
-#include "oox/drawingml/shape.hxx"
-#include "oox/drawingml/theme.hxx"
-#include "oox/drawingml/clrscheme.hxx"
-#include "oox/drawingml/textliststyle.hxx"
-#include "oox/drawingml/textparagraphproperties.hxx"
+#include <oox/drawingml/shape.hxx>
+#include <oox/drawingml/theme.hxx>
+#include <oox/drawingml/clrscheme.hxx>
+#include <oox/drawingml/textliststyle.hxx>
+#include <oox/drawingml/textparagraphproperties.hxx>
 #include <oox/ppt/headerfooter.hxx>
 #include <com/sun/star/frame/XModel.hpp>
 #include <com/sun/star/drawing/XDrawPage.hpp>
 #include <com/sun/star/animations/XAnimationNode.hpp>
-#include "oox/core/fragmenthandler.hxx"
-#include "oox/ppt/comments.hxx"
+#include <oox/core/fragmenthandler.hxx>
+#include <oox/ppt/comments.hxx>
 
 #include <list>
 
diff --git a/include/oox/ppt/slidetimingcontext.hxx b/include/oox/ppt/slidetimingcontext.hxx
index a50e8be60fd3..fd6724d89857 100644
--- a/include/oox/ppt/slidetimingcontext.hxx
+++ b/include/oox/ppt/slidetimingcontext.hxx
@@ -21,8 +21,8 @@
 #define OOX_PPT_SLIDETIMINGCONTEXT
 
 #include <com/sun/star/animations/XTimeContainer.hpp>
-#include "oox/ppt/timenode.hxx"
-#include "oox/core/fragmenthandler2.hxx"
+#include <oox/ppt/timenode.hxx>
+#include <oox/core/fragmenthandler2.hxx>
 
 #include <stack>
 #include <vector>
diff --git a/include/oox/ppt/slidetransitioncontext.hxx b/include/oox/ppt/slidetransitioncontext.hxx
index 077d5a8f5813..e52068373c7f 100644
--- a/include/oox/ppt/slidetransitioncontext.hxx
+++ b/include/oox/ppt/slidetransitioncontext.hxx
@@ -20,8 +20,8 @@
 #ifndef OOX_PPT_SLIDETRANSITIONCONTEXT
 #define OOX_PPT_SLIDETRANSITIONCONTEXT
 
-#include "oox/core/fragmenthandler2.hxx"
-#include "oox/ppt/slidetransition.hxx"
+#include <oox/core/fragmenthandler2.hxx>
+#include <oox/ppt/slidetransition.hxx>
 
 namespace oox { class PropertyMap; }
 
diff --git a/include/oox/ppt/soundactioncontext.hxx b/include/oox/ppt/soundactioncontext.hxx
index d1f1040c75ba..a823ffc5b000 100644
--- a/include/oox/ppt/soundactioncontext.hxx
+++ b/include/oox/ppt/soundactioncontext.hxx
@@ -21,7 +21,7 @@
 #ifndef OOX_PPT_SOUNDACTIONCONTEXT
 #define OOX_PPT_SOUNDACTIONCONTEXT
 
-#include "oox/core/fragmenthandler2.hxx"
+#include <oox/core/fragmenthandler2.hxx>
 
 namespace oox { class PropertyMap; }
 
diff --git a/include/oox/ppt/timenode.hxx b/include/oox/ppt/timenode.hxx
index fc8e3ef8a893..fd9a7e893f7a 100644
--- a/include/oox/ppt/timenode.hxx
+++ b/include/oox/ppt/timenode.hxx
@@ -28,11 +28,11 @@
 
 #include <com/sun/star/frame/XModel.hpp>
 #include <com/sun/star/animations/XAnimationNode.hpp>
-#include "oox/helper/propertymap.hxx"
-#include "oox/ppt/slidetransition.hxx"
-#include "oox/ppt/slidepersist.hxx"
-#include "oox/ppt/animationspersist.hxx"
-#include "oox/ppt/timenode.hxx"
+#include <oox/helper/propertymap.hxx>
+#include <oox/ppt/slidetransition.hxx>
+#include <oox/ppt/slidepersist.hxx>
+#include <oox/ppt/animationspersist.hxx>
+#include <oox/ppt/timenode.hxx>
 
 namespace oox { namespace ppt {
 
diff --git a/include/oox/ppt/timenodelistcontext.hxx b/include/oox/ppt/timenodelistcontext.hxx
index baacbc94add4..786b333664b2 100644
--- a/include/oox/ppt/timenodelistcontext.hxx
+++ b/include/oox/ppt/timenodelistcontext.hxx
@@ -20,8 +20,8 @@
 #ifndef OOX_PPT_TIMENODELISTCONTEXT
 #define OOX_PPT_TIMENODELISTCONTEXT
 
-#include "oox/core/fragmenthandler2.hxx"
-#include "oox/ppt/timenode.hxx"
+#include <oox/core/fragmenthandler2.hxx>
+#include <oox/ppt/timenode.hxx>
 
 #include <com/sun/star/animations/XTimeContainer.hpp>
 
diff --git a/include/oox/vml/vmldrawing.hxx b/include/oox/vml/vmldrawing.hxx
index 9ced842bb221..ae6f79e3375b 100644
--- a/include/oox/vml/vmldrawing.hxx
+++ b/include/oox/vml/vmldrawing.hxx
@@ -26,7 +26,7 @@
 #include <oox/ole/axcontrol.hxx>
 #include <oox/ole/oleobjecthelper.hxx>
 #include <oox/vml/vmlshapecontainer.hxx>
-#include "oox/dllapi.h"
+#include <oox/dllapi.h>
 
 namespace com { namespace sun { namespace star {
     namespace awt { struct Rectangle; }
diff --git a/include/oox/vml/vmldrawingfragment.hxx b/include/oox/vml/vmldrawingfragment.hxx
index 36dbb7da6700..d896f1e92621 100644
--- a/include/oox/vml/vmldrawingfragment.hxx
+++ b/include/oox/vml/vmldrawingfragment.hxx
@@ -20,8 +20,8 @@
 #ifndef INCLUDED_OOX_VML_VMLDRAWINGFRAGMENT_HXX
 #define INCLUDED_OOX_VML_VMLDRAWINGFRAGMENT_HXX
 
-#include "oox/core/fragmenthandler2.hxx"
-#include "oox/dllapi.h"
+#include <oox/core/fragmenthandler2.hxx>
+#include <oox/dllapi.h>
 
 namespace oox {
 namespace vml {
diff --git a/include/oox/vml/vmlformatting.hxx b/include/oox/vml/vmlformatting.hxx
index a2fe15bc58f2..c7d84ffe8ffc 100644
--- a/include/oox/vml/vmlformatting.hxx
+++ b/include/oox/vml/vmlformatting.hxx
@@ -20,8 +20,8 @@
 #ifndef INCLUDED_OOX_VML_VMLFORMATTING_HXX
 #define INCLUDED_OOX_VML_VMLFORMATTING_HXX
 
-#include "oox/helper/helper.hxx"
-#include "oox/dllapi.h"
+#include <oox/helper/helper.hxx>
+#include <oox/dllapi.h>
 #include <com/sun/star/awt/Point.hpp>
 #include <com/sun/star/drawing/PolyPolygonBezierCoords.hpp>
 #include <com/sun/star/drawing/XShape.hpp>
diff --git a/include/oox/vml/vmlshape.hxx b/include/oox/vml/vmlshape.hxx
index 90e40377b311..fcfb9671c643 100644
--- a/include/oox/vml/vmlshape.hxx
+++ b/include/oox/vml/vmlshape.hxx
@@ -23,9 +23,9 @@
 #include <memory>
 #include <vector>
 #include <com/sun/star/awt/Point.hpp>
-#include "oox/vml/vmlformatting.hxx"
-#include "oox/vml/vmltextbox.hxx"
-#include "oox/dllapi.h"
+#include <oox/vml/vmlformatting.hxx>
+#include <oox/vml/vmltextbox.hxx>
+#include <oox/dllapi.h>
 
 namespace com { namespace sun { namespace star {
     namespace awt { struct Rectangle; }
diff --git a/include/oox/vml/vmlshapecontainer.hxx b/include/oox/vml/vmlshapecontainer.hxx
index 637254e989c9..f927ec83f599 100644
--- a/include/oox/vml/vmlshapecontainer.hxx
+++ b/include/oox/vml/vmlshapecontainer.hxx
@@ -21,8 +21,8 @@
 #define INCLUDED_OOX_VML_VMLSHAPECONTAINER_HXX
 
 #include <com/sun/star/awt/Rectangle.hpp>
-#include "oox/helper/refmap.hxx"
-#include "oox/helper/refvector.hxx"
+#include <oox/helper/refmap.hxx>
+#include <oox/helper/refvector.hxx>
 #include <stack>
 
 namespace com { namespace sun { namespace star {
diff --git a/include/oox/vml/vmlshapecontext.hxx b/include/oox/vml/vmlshapecontext.hxx
index 769eede4e361..1509fc9b4700 100644
--- a/include/oox/vml/vmlshapecontext.hxx
+++ b/include/oox/vml/vmlshapecontext.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_OOX_VML_VMLSHAPECONTEXT_HXX
 #define INCLUDED_OOX_VML_VMLSHAPECONTEXT_HXX
 
-#include "oox/core/contexthandler2.hxx"
+#include <oox/core/contexthandler2.hxx>
 
 namespace oox {
 namespace vml {
diff --git a/include/oox/vml/vmltextbox.hxx b/include/oox/vml/vmltextbox.hxx
index 483aa79142b1..ecc04c097f26 100644
--- a/include/oox/vml/vmltextbox.hxx
+++ b/include/oox/vml/vmltextbox.hxx
@@ -22,8 +22,8 @@
 
 #include <vector>
 #include <rtl/ustring.hxx>
-#include "oox/helper/helper.hxx"
-#include "oox/dllapi.h"
+#include <oox/helper/helper.hxx>
+#include <oox/dllapi.h>
 #include <com/sun/star/uno/Reference.h>
 
 namespace com { namespace sun { namespace star {
diff --git a/include/oox/vml/vmltextboxcontext.hxx b/include/oox/vml/vmltextboxcontext.hxx
index 0befe8847e78..740b816ecb82 100644
--- a/include/oox/vml/vmltextboxcontext.hxx
+++ b/include/oox/vml/vmltextboxcontext.hxx
@@ -20,8 +20,8 @@
 #ifndef INCLUDED_OOX_VML_VMLTEXTBOXCONTEXT_HXX
 #define INCLUDED_OOX_VML_VMLTEXTBOXCONTEXT_HXX
 
-#include "oox/core/contexthandler2.hxx"
-#include "oox/vml/vmltextbox.hxx"
+#include <oox/core/contexthandler2.hxx>
+#include <oox/vml/vmltextbox.hxx>
 
 namespace oox {
     class GraphicHelper;