loplugin:includeform: svx

Change-Id: I4057fe05983fb2b63b592ffd325894c12b9cb5b2
author: Stephan Bergmann <sbergman@redhat.com> 2017-10-23 22:30:42 +0200
committer: Stephan Bergmann <sbergman@redhat.com> 2017-10-23 22:45:50 +0200
commit: 97059fbd09fedce0ff830599f8df5f41d42336f2 (patch)
tree: 26d42a7daca4b104dde5f527e64dfc67ed49d401 /svx
parent: 62f47bb2a54536d6e1cf14b16d2e3b963ba651a6 (diff)
329 files changed, 1061 insertions, 1061 deletions
diff --git a/svx/inc/GalleryControl.hxx b/svx/inc/GalleryControl.hxx
index 2fa7040f56f3..5ca673a2dffe 100644
--- a/svx/inc/GalleryControl.hxx
+++ b/svx/inc/GalleryControl.hxx
@@ -22,7 +22,7 @@
 #include <vcl/window.hxx>
 #include <vcl/graph.hxx>
 #include <tools/urlobj.hxx>
-#include "svx/svxdllapi.h"
+#include <svx/svxdllapi.h>
 
 class SfxBindings;
 
diff --git a/svx/inc/extrusiondepthdialog.hxx b/svx/inc/extrusiondepthdialog.hxx
index 69d03b5a0766..fb306b992c5b 100644
--- a/svx/inc/extrusiondepthdialog.hxx
+++ b/svx/inc/extrusiondepthdialog.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_SVX_INC_EXTRUSIONDEPTHDIALOG_HXX
 #define INCLUDED_SVX_INC_EXTRUSIONDEPTHDIALOG_HXX
 
-#include "svx/svxdllapi.h"
+#include <svx/svxdllapi.h>
 
 #include <vcl/fixed.hxx>
 #include <vcl/dialog.hxx>
diff --git a/svx/inc/galobj.hxx b/svx/inc/galobj.hxx
index aeeab93e1187..aa0af5922553 100644
--- a/svx/inc/galobj.hxx
+++ b/svx/inc/galobj.hxx
@@ -22,7 +22,7 @@
 
 #include <tools/urlobj.hxx>
 #include <vcl/graph.hxx>
-#include "svx/galmisc.hxx"
+#include <svx/galmisc.hxx>
 
 #define S_THUMB 80
 
diff --git a/svx/inc/page.hrc b/svx/inc/page.hrc
index 03036b1e095d..2907c6ee72f2 100644
--- a/svx/inc/page.hrc
+++ b/svx/inc/page.hrc
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_SVX_INC_PAGE_HRC
 #define INCLUDED_SVX_INC_PAGE_HRC
 
-#include "page.h"
+#include <page.h>
 #include <utility>
 
 #define NC_(Context, String) (Context "\004" u8##String)
diff --git a/svx/inc/svxerr.hrc b/svx/inc/svxerr.hrc
index 0259fa403bfb..8a02afa34acc 100644
--- a/svx/inc/svxerr.hrc
+++ b/svx/inc/svxerr.hrc
@@ -24,7 +24,7 @@
 
 #define NC_(Context, String) (Context "\004" u8##String)
 
-#include "svx/svxerr.hxx"
+#include <svx/svxerr.hxx>
 #include <editeng/editerr.hxx>
 
 // Error-Context ---------------------------------------------------------
diff --git a/svx/source/accessibility/AccessibleControlShape.cxx b/svx/source/accessibility/AccessibleControlShape.cxx
index 7691ed9d868c..32b085e47bfa 100644
--- a/svx/source/accessibility/AccessibleControlShape.cxx
+++ b/svx/source/accessibility/AccessibleControlShape.cxx
@@ -19,7 +19,7 @@
 
 #include <svx/AccessibleControlShape.hxx>
 #include <svx/AccessibleShapeInfo.hxx>
-#include "svx/DescriptionGenerator.hxx"
+#include <svx/DescriptionGenerator.hxx>
 #include <com/sun/star/drawing/XControlShape.hpp>
 #include <com/sun/star/accessibility/AccessibleRelationType.hpp>
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
@@ -37,14 +37,14 @@
 #include <unotools/accessiblerelationsethelper.hxx>
 #include <svx/IAccessibleParent.hxx>
 #include <svx/svdouno.hxx>
-#include "svx/unoapi.hxx"
+#include <svx/unoapi.hxx>
 #include <svx/ShapeTypeHandler.hxx>
 #include <svx/SvxShapeTypes.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <comphelper/accessiblewrapper.hxx>
 #include <svx/svdview.hxx>
 #include <svx/svdpagv.hxx>
-#include "svx/strings.hrc"
+#include <svx/strings.hrc>
 #include <vcl/svapp.hxx>
 #include <algorithm>
 
diff --git a/svx/source/accessibility/AccessibleFrameSelector.cxx b/svx/source/accessibility/AccessibleFrameSelector.cxx
index b7a1a0dd829f..a668d9dc7618 100644
--- a/svx/source/accessibility/AccessibleFrameSelector.cxx
+++ b/svx/source/accessibility/AccessibleFrameSelector.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "AccessibleFrameSelector.hxx"
+#include <AccessibleFrameSelector.hxx>
 #include <com/sun/star/awt/KeyEvent.hpp>
 #include <com/sun/star/awt/KeyModifier.hpp>
 #include <com/sun/star/awt/Key.hpp>
@@ -33,10 +33,10 @@
 #include <vcl/settings.hxx>
 #include <svx/frmsel.hxx>
 #include <svx/dialmgr.hxx>
-#include "editeng/unolingu.hxx"
+#include <editeng/unolingu.hxx>
 
 #include <svx/strings.hrc>
-#include "frmsel.hrc"
+#include <frmsel.hrc>
 
 namespace svx {
 namespace a11y {
diff --git a/svx/source/accessibility/AccessibleShape.cxx b/svx/source/accessibility/AccessibleShape.cxx
index ecf4c478774f..810fa68dbc3d 100644
--- a/svx/source/accessibility/AccessibleShape.cxx
+++ b/svx/source/accessibility/AccessibleShape.cxx
@@ -18,7 +18,7 @@
  */
 
 #include <svx/AccessibleShape.hxx>
-#include "svx/DescriptionGenerator.hxx"
+#include <svx/DescriptionGenerator.hxx>
 #include <svx/AccessibleShapeInfo.hxx>
 #include <com/sun/star/view/XSelectionSupplier.hpp>
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
@@ -48,7 +48,7 @@
 #include <svx/ShapeTypeHandler.hxx>
 #include <svx/SvxShapeTypes.hxx>
 
-#include "svx/strings.hrc"
+#include <svx/strings.hrc>
 #include <svx/dialmgr.hxx>
 #include <vcl/svapp.hxx>
 #include <unotools/accessiblestatesethelper.hxx>
diff --git a/svx/source/accessibility/AccessibleTextEventQueue.cxx b/svx/source/accessibility/AccessibleTextEventQueue.cxx
index c932ea7c9cd6..6a586117ddd3 100644
--- a/svx/source/accessibility/AccessibleTextEventQueue.cxx
+++ b/svx/source/accessibility/AccessibleTextEventQueue.cxx
@@ -20,11 +20,11 @@
 #include <memory>
 #include "AccessibleTextEventQueue.hxx"
 #include <svx/unoshape.hxx>
-#include "editeng/unolingu.hxx"
+#include <editeng/unolingu.hxx>
 #include <editeng/unotext.hxx>
 
-#include "editeng/unoedhlp.hxx"
-#include "editeng/unopracc.hxx"
+#include <editeng/unoedhlp.hxx>
+#include <editeng/unopracc.hxx>
 #include <svx/svdmodel.hxx>
 #include <svx/svdpntv.hxx>
 #include <editeng/editdata.hxx>
diff --git a/svx/source/accessibility/AccessibleTextHelper.cxx b/svx/source/accessibility/AccessibleTextHelper.cxx
index 4859d2e15031..84758eb4f64b 100644
--- a/svx/source/accessibility/AccessibleTextHelper.cxx
+++ b/svx/source/accessibility/AccessibleTextHelper.cxx
@@ -53,16 +53,16 @@
 #include "AccessibleTextEventQueue.hxx"
 #include <svx/AccessibleTextHelper.hxx>
 #include <svx/unoshape.hxx>
-#include "editeng/unolingu.hxx"
+#include <editeng/unolingu.hxx>
 #include <editeng/unotext.hxx>
 
-#include "editeng/unoedhlp.hxx"
-#include "editeng/unopracc.hxx"
-#include "editeng/AccessibleParaManager.hxx"
-#include "editeng/AccessibleEditableTextPara.hxx"
+#include <editeng/unoedhlp.hxx>
+#include <editeng/unopracc.hxx>
+#include <editeng/AccessibleParaManager.hxx>
+#include <editeng/AccessibleEditableTextPara.hxx>
 #include <svx/svdmodel.hxx>
 #include <svx/svdpntv.hxx>
-#include "cell.hxx"
+#include <cell.hxx>
 #include "../table/accessiblecell.hxx"
 #include <editeng/editdata.hxx>
 #include <editeng/editeng.hxx>
diff --git a/svx/source/accessibility/DescriptionGenerator.cxx b/svx/source/accessibility/DescriptionGenerator.cxx
index ec5b127f96dc..460ac069be5c 100644
--- a/svx/source/accessibility/DescriptionGenerator.cxx
+++ b/svx/source/accessibility/DescriptionGenerator.cxx
@@ -18,7 +18,7 @@
  */
 
 
-#include "svx/DescriptionGenerator.hxx"
+#include <svx/DescriptionGenerator.hxx>
 #include <com/sun/star/beans/PropertyState.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/beans/XPropertyState.hpp>
@@ -38,11 +38,11 @@
 #include <com/sun/star/uno/Exception.hpp>
 
 // Includes for string resources.
-#include "svx/strings.hrc"
+#include <svx/strings.hrc>
 #include <svx/dialmgr.hxx>
 
 #include <svx/xdef.hxx>
-#include "svx/unoapi.hxx"
+#include <svx/unoapi.hxx>
 #include "lookupcolorname.hxx"
 
 using namespace ::com::sun::star;
diff --git a/svx/source/accessibility/GraphCtlAccessibleContext.cxx b/svx/source/accessibility/GraphCtlAccessibleContext.cxx
index 274caf4badf3..d92e34f4e1c2 100644
--- a/svx/source/accessibility/GraphCtlAccessibleContext.cxx
+++ b/svx/source/accessibility/GraphCtlAccessibleContext.cxx
@@ -38,7 +38,7 @@
 
 #include <svx/ShapeTypeHandler.hxx>
 #include <svx/AccessibleShapeInfo.hxx>
-#include "GraphCtlAccessibleContext.hxx"
+#include <GraphCtlAccessibleContext.hxx>
 #include <svx/graphctl.hxx>
 #include <svx/strings.hrc>
 #include <svx/svdpage.hxx>
diff --git a/svx/source/accessibility/ShapeTypeHandler.cxx b/svx/source/accessibility/ShapeTypeHandler.cxx
index a64a09c3f56b..376c6e0ad24f 100644
--- a/svx/source/accessibility/ShapeTypeHandler.cxx
+++ b/svx/source/accessibility/ShapeTypeHandler.cxx
@@ -27,9 +27,9 @@
 
 #include <svx/unoshape.hxx>
 #include <svx/svdoashp.hxx>
-#include "svx/unoapi.hxx"
+#include <svx/unoapi.hxx>
 
-#include "svx/strings.hrc"
+#include <svx/strings.hrc>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::accessibility;
diff --git a/svx/source/accessibility/charmapacc.cxx b/svx/source/accessibility/charmapacc.cxx
index a0034b8beb40..fcb0a790e272 100644
--- a/svx/source/accessibility/charmapacc.cxx
+++ b/svx/source/accessibility/charmapacc.cxx
@@ -22,7 +22,7 @@
 #include <vcl/svapp.hxx>
 #include <stdio.h>
 #include <svx/charmap.hxx>
-#include "charmapacc.hxx"
+#include <charmapacc.hxx>
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
diff --git a/svx/source/accessibility/lookupcolorname.cxx b/svx/source/accessibility/lookupcolorname.cxx
index b94434f885fd..83f6627bd2d6 100644
--- a/svx/source/accessibility/lookupcolorname.cxx
+++ b/svx/source/accessibility/lookupcolorname.cxx
@@ -17,22 +17,22 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "sal/config.h"
-
-#include "com/sun/star/container/XNameAccess.hpp"
-#include "com/sun/star/container/XNameContainer.hpp"
-#include "com/sun/star/drawing/ColorTable.hpp"
-#include "com/sun/star/lang/XMultiServiceFactory.hpp"
-#include "com/sun/star/uno/Any.hxx"
-#include "com/sun/star/uno/Reference.hxx"
-#include "com/sun/star/uno/RuntimeException.hpp"
-#include "com/sun/star/uno/Sequence.hxx"
-#include "comphelper/processfactory.hxx"
-#include "rtl/ustring.h"
-#include "rtl/ustring.hxx"
+#include <sal/config.h>
+
+#include <com/sun/star/container/XNameAccess.hpp>
+#include <com/sun/star/container/XNameContainer.hpp>
+#include <com/sun/star/drawing/ColorTable.hpp>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <com/sun/star/uno/Any.hxx>
+#include <com/sun/star/uno/Reference.hxx>
+#include <com/sun/star/uno/RuntimeException.hpp>
+#include <com/sun/star/uno/Sequence.hxx>
+#include <comphelper/processfactory.hxx>
+#include <rtl/ustring.h>
+#include <rtl/ustring.hxx>
 #include <vcl/svapp.hxx>
 
-#include <lookupcolorname.hxx>
+#include "lookupcolorname.hxx"
 #include <unordered_map>
 
 namespace {
diff --git a/svx/source/accessibility/lookupcolorname.hxx b/svx/source/accessibility/lookupcolorname.hxx
index ae33ee3eb6ce..394a8543698c 100644
--- a/svx/source/accessibility/lookupcolorname.hxx
+++ b/svx/source/accessibility/lookupcolorname.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_SVX_SOURCE_ACCESSIBILITY_LOOKUPCOLORNAME_HXX
 #define INCLUDED_SVX_SOURCE_ACCESSIBILITY_LOOKUPCOLORNAME_HXX
 
-#include "sal/config.h"
+#include <sal/config.h>
 
 
 namespace accessibility {
diff --git a/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx b/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx
index ba05aa98b0db..37c0aabd7b47 100644
--- a/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx
+++ b/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx
@@ -42,7 +42,7 @@
 
 #include <unotools/accessiblerelationsethelper.hxx>
 
-#include "svxpixelctlaccessiblecontext.hxx"
+#include <svxpixelctlaccessiblecontext.hxx>
 #include <com/sun/star/accessibility/AccessibleRelationType.hpp>
 
 using namespace ::cppu;
diff --git a/svx/source/accessibility/svxrectctaccessiblecontext.cxx b/svx/source/accessibility/svxrectctaccessiblecontext.cxx
index 7b2f9df5d44c..542abb8278d3 100644
--- a/svx/source/accessibility/svxrectctaccessiblecontext.cxx
+++ b/svx/source/accessibility/svxrectctaccessiblecontext.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "svxrectctaccessiblecontext.hxx"
+#include <svxrectctaccessiblecontext.hxx>
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
 #include <unotools/accessiblestatesethelper.hxx>
diff --git a/svx/source/core/coreservices.cxx b/svx/source/core/coreservices.cxx
index 4a79dc74d069..f91442c6282c 100644
--- a/svx/source/core/coreservices.cxx
+++ b/svx/source/core/coreservices.cxx
@@ -20,8 +20,8 @@
 /** this file contains the uno service registrations for all services in the svxcore lib */
 
 
-#include "sal/types.h"
-#include "cppuhelper/factory.hxx"
+#include <sal/types.h>
+#include <cppuhelper/factory.hxx>
 
 #include <coreservices.hxx>
 
diff --git a/svx/source/customshapes/EnhancedCustomShape2d.cxx b/svx/source/customshapes/EnhancedCustomShape2d.cxx
index dd71997a7a35..6329bd469d56 100644
--- a/svx/source/customshapes/EnhancedCustomShape2d.cxx
+++ b/svx/source/customshapes/EnhancedCustomShape2d.cxx
@@ -17,9 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "svx/EnhancedCustomShape2d.hxx"
-#include "svx/EnhancedCustomShapeGeometry.hxx"
-#include "svx/EnhancedCustomShapeTypeNames.hxx"
+#include <svx/EnhancedCustomShape2d.hxx>
+#include <svx/EnhancedCustomShapeGeometry.hxx>
+#include <svx/EnhancedCustomShapeTypeNames.hxx>
 #include <svx/svdoashp.hxx>
 #include <svx/svdtrans.hxx>
 #include <svx/svdocirc.hxx>
diff --git a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx
index 3e3f8c88d6f1..d4a6fc657fea 100644
--- a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx
@@ -27,14 +27,14 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/drawing/XCustomShapeEngine.hpp>
 #include <rtl/ref.hxx>
-#include "svx/EnhancedCustomShape2d.hxx"
+#include <svx/EnhancedCustomShape2d.hxx>
 #include "EnhancedCustomShape3d.hxx"
 #include "EnhancedCustomShapeFontWork.hxx"
 #include "EnhancedCustomShapeHandle.hxx"
-#include "svx/EnhancedCustomShapeGeometry.hxx"
+#include <svx/EnhancedCustomShapeGeometry.hxx>
 #include <svx/unoshape.hxx>
-#include "svx/unopage.hxx"
-#include "svx/unoapi.hxx"
+#include <svx/unopage.hxx>
+#include <svx/unoapi.hxx>
 #include <svx/svdobj.hxx>
 #include <svx/svdoashp.hxx>
 #include <svx/svdogrp.hxx>
@@ -46,7 +46,7 @@
 #include <svx/svdopath.hxx>
 #include <svx/svdpage.hxx>
 #include <svx/svdmodel.hxx>
-#include "svx/svditer.hxx"
+#include <svx/svditer.hxx>
 #include <uno/mapping.hxx>
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
 #include <basegfx/utils/unotools.hxx>
diff --git a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
index 3211065f868b..fb34312cae6b 100644
--- a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
@@ -34,7 +34,7 @@
 #include <editeng/postitem.hxx>
 #include <editeng/wghtitem.hxx>
 #include <editeng/charscaleitem.hxx>
-#include "svx/EnhancedCustomShapeTypeNames.hxx"
+#include <svx/EnhancedCustomShapeTypeNames.hxx>
 #include <svx/svdorect.hxx>
 #include <svx/svdoashp.hxx>
 #include <editeng/outliner.hxx>
diff --git a/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx b/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx
index 515d249b4bdb..9adb80e53c8d 100644
--- a/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "svx/EnhancedCustomShape2d.hxx"
+#include <svx/EnhancedCustomShape2d.hxx>
 #include <rtl/ustring.hxx>
 #include <osl/diagnose.h>
 #include <tools/fract.hxx>
diff --git a/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx b/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx
index 72cc92e3f479..d66009b51422 100644
--- a/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx
@@ -22,7 +22,7 @@
 #include <cmath>
 #include <limits>
 
-#include "svx/EnhancedCustomShapeGeometry.hxx"
+#include <svx/EnhancedCustomShapeGeometry.hxx>
 #include <com/sun/star/drawing/EnhancedCustomShapeGluePointType.hpp>
 
 static const sal_Int32 MIN_INT32 = std::numeric_limits<sal_Int32>::min();
diff --git a/svx/source/customshapes/EnhancedCustomShapeHandle.cxx b/svx/source/customshapes/EnhancedCustomShapeHandle.cxx
index 813af7230cbd..b541eb410978 100644
--- a/svx/source/customshapes/EnhancedCustomShapeHandle.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeHandle.cxx
@@ -18,8 +18,8 @@
  */
 
 #include "EnhancedCustomShapeHandle.hxx"
-#include "svx/EnhancedCustomShape2d.hxx"
-#include "svx/unoapi.hxx"
+#include <svx/EnhancedCustomShape2d.hxx>
+#include <svx/unoapi.hxx>
 
 
 EnhancedCustomShapeHandle::EnhancedCustomShapeHandle( css::uno::Reference< css::drawing::XShape > const & xCustomShape, sal_uInt32 nIndex ) :
diff --git a/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx b/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx
index 4e48445c0c89..6fbf4c8c9c42 100644
--- a/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "svx/EnhancedCustomShapeTypeNames.hxx"
+#include <svx/EnhancedCustomShapeTypeNames.hxx>
 #include <osl/mutex.hxx>
 #include <unordered_map>
 #include <memory>
diff --git a/svx/source/dialog/_bmpmask.cxx b/svx/source/dialog/_bmpmask.cxx
index 3f69bb61eb6f..5ad9ab460727 100644
--- a/svx/source/dialog/_bmpmask.cxx
+++ b/svx/source/dialog/_bmpmask.cxx
@@ -34,7 +34,7 @@
 #include <svx/strings.hrc>
 #include <svx/svxids.hrc>
 #include <memory>
-#include "helpids.h"
+#include <helpids.h>
 
 #define OWN_CALLMODE    SfxCallMode::ASYNCHRON | SfxCallMode::RECORD
 
diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx
index cd8ea4850087..52ff542f264d 100644
--- a/svx/source/dialog/_contdlg.cxx
+++ b/svx/source/dialog/_contdlg.cxx
@@ -31,7 +31,7 @@
 #include <comphelper/processfactory.hxx>
 
 #include <svx/dialmgr.hxx>
-#include "svx/xoutbmp.hxx"
+#include <svx/xoutbmp.hxx>
 #include <svx/strings.hrc>
 #include <svx/svxids.hrc>
 #include <svx/contdlg.hxx>
@@ -39,7 +39,7 @@
 #include "contwnd.hxx"
 #include <svx/svdtrans.hxx>
 #include <svx/svdopath.hxx>
-#include "svx/dlgutil.hxx"
+#include <svx/dlgutil.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/virdev.hxx>
diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx
index d4643b5988b2..39de2ab5ecbe 100644
--- a/svx/source/dialog/charmap.cxx
+++ b/svx/source/dialog/charmap.cxx
@@ -33,8 +33,8 @@
 #include <svx/dialmgr.hxx>
 #include <svx/svxdlg.hxx>
 
-#include "charmapacc.hxx"
-#include "uiobject.hxx"
+#include <charmapacc.hxx>
+#include <uiobject.hxx>
 
 #include <com/sun/star/accessibility/AccessibleEventObject.hpp>
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
@@ -49,7 +49,7 @@
 #include <svl/itemset.hxx>
 #include <unicode/uchar.h>
 #include <vcl/textview.hxx>
-#include "rtl/ustrbuf.hxx"
+#include <rtl/ustrbuf.hxx>
 
 using namespace ::com::sun::star::accessibility;
 using namespace ::com::sun::star::uno;
diff --git a/svx/source/dialog/compressgraphicdialog.cxx b/svx/source/dialog/compressgraphicdialog.cxx
index f17266966875..32be4f4838b2 100644
--- a/svx/source/dialog/compressgraphicdialog.cxx
+++ b/svx/source/dialog/compressgraphicdialog.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <dlgunit.hxx>
+#include "dlgunit.hxx"
 #include <vcl/fixed.hxx>
 #include <vcl/graph.hxx>
 #include <vcl/graphicfilter.hxx>
diff --git a/svx/source/dialog/connctrl.cxx b/svx/source/dialog/connctrl.cxx
index 3b3c57eb1c17..909c70e7e034 100644
--- a/svx/source/dialog/connctrl.cxx
+++ b/svx/source/dialog/connctrl.cxx
@@ -19,8 +19,8 @@
 
 #include <vcl/svapp.hxx>
 
-#include "svx/connctrl.hxx"
-#include "svx/dlgutil.hxx"
+#include <svx/connctrl.hxx>
+#include <svx/dlgutil.hxx>
 
 #include <svx/dialmgr.hxx>
 #include <svx/sdr/contact/displayinfo.hxx>
diff --git a/svx/source/dialog/contwnd.cxx b/svx/source/dialog/contwnd.cxx
index 7130510e4489..23b92b927ff7 100644
--- a/svx/source/dialog/contwnd.cxx
+++ b/svx/source/dialog/contwnd.cxx
@@ -20,14 +20,14 @@
 #include <svx/xoutbmp.hxx>
 #include <svx/strings.hrc>
 #include <svx/svxids.hrc>
-#include <contwnd.hxx>
+#include "contwnd.hxx"
 #include <svx/svdpage.hxx>
 #include <svx/svdopath.hxx>
 #include <svx/xfltrit.hxx>
 #include <svx/xfillit.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
-#include "svx/sdrpaintwindow.hxx"
+#include <svx/sdrpaintwindow.hxx>
 
 using namespace css;
 
diff --git a/svx/source/dialog/ctredlin.cxx b/svx/source/dialog/ctredlin.cxx
index aba6e7abe925..b51229a6f687 100644
--- a/svx/source/dialog/ctredlin.cxx
+++ b/svx/source/dialog/ctredlin.cxx
@@ -27,14 +27,14 @@
 #include <sfx2/module.hxx>
 #include <unotools/textsearch.hxx>
 #include <svtools/svlbitm.hxx>
-#include "svtools/viewdataentry.hxx"
+#include <svtools/viewdataentry.hxx>
 #include <unotools/charclass.hxx>
 
 #include <editeng/unolingu.hxx>
 #include <svx/dialmgr.hxx>
-#include "svx/strings.hrc"
+#include <svx/strings.hrc>
 #include <svx/ctredlin.hxx>
-#include "helpids.h"
+#include <helpids.h>
 
 #define WRITER_DATE     2
 #define CALC_DATE       3
diff --git a/svx/source/dialog/databaseregistrationui.cxx b/svx/source/dialog/databaseregistrationui.cxx
index ea4ee37041f3..980ab961e1be 100644
--- a/svx/source/dialog/databaseregistrationui.cxx
+++ b/svx/source/dialog/databaseregistrationui.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "svx/databaseregistrationui.hxx"
+#include <svx/databaseregistrationui.hxx>
 
 #include <svx/svxdlg.hxx>
 #include <svx/dialogs.hrc>
diff --git a/svx/source/dialog/dialcontrol.cxx b/svx/source/dialog/dialcontrol.cxx
index d1fa4671cdb4..7808f1735b8b 100644
--- a/svx/source/dialog/dialcontrol.cxx
+++ b/svx/source/dialog/dialcontrol.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "svx/dialcontrol.hxx"
+#include <svx/dialcontrol.hxx>
 #include <svx/dialmgr.hxx>
 #include <svx/strings.hrc>
 #include <cmath>
diff --git a/svx/source/dialog/dlgctl3d.cxx b/svx/source/dialog/dlgctl3d.cxx
index a1c1aec005f3..60c2f4161358 100644
--- a/svx/source/dialog/dlgctl3d.cxx
+++ b/svx/source/dialog/dlgctl3d.cxx
@@ -34,7 +34,7 @@
 #include <svx/polygn3d.hxx>
 #include <svx/xlnclit.hxx>
 #include <svx/xlnwtit.hxx>
-#include "helpids.h"
+#include <helpids.h>
 #include <algorithm>
 #include <svx/dialmgr.hxx>
 #include <vcl/settings.hxx>
diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx
index 3a109baa72d1..6cfcb037a11f 100644
--- a/svx/source/dialog/dlgctrl.cxx
+++ b/svx/source/dialog/dlgctrl.cxx
@@ -24,7 +24,7 @@
 #include <svx/xtable.hxx>
 #include <svx/xpool.hxx>
 #include <svx/strings.hrc>
-#include "bitmaps.hlst"
+#include <bitmaps.hlst>
 #include <svx/dlgctrl.hxx>
 #include <svx/dialmgr.hxx>
 #include <tools/poly.hxx>
@@ -34,7 +34,7 @@
 #include <com/sun/star/accessibility/AccessibleEventObject.hpp>
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
-#include "svxpixelctlaccessiblecontext.hxx"
+#include <svxpixelctlaccessiblecontext.hxx>
 #include <svtools/colorcfg.hxx>
 #include <svxrectctaccessiblecontext.hxx>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
diff --git a/svx/source/dialog/dlgutil.cxx b/svx/source/dialog/dlgutil.cxx
index f97ad97c71c2..77abee970fe0 100644
--- a/svx/source/dialog/dlgutil.cxx
+++ b/svx/source/dialog/dlgutil.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "svx/dlgutil.hxx"
+#include <svx/dlgutil.hxx>
 #include <svl/itemset.hxx>
 #include <sfx2/sfxsids.hrc>
 #include <sfx2/module.hxx>
diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx
index b71546962395..6306beaaf566 100644
--- a/svx/source/dialog/docrecovery.cxx
+++ b/svx/source/dialog/docrecovery.cxx
@@ -23,8 +23,8 @@
 
 #include <svx/dialmgr.hxx>
 #include <svx/strings.hrc>
-#include "bitmaps.hlst"
-#include "docrecovery.hxx"
+#include <bitmaps.hlst>
+#include <docrecovery.hxx>
 
 #include <comphelper/processfactory.hxx>
 #include <comphelper/sequenceashashmap.hxx>
@@ -54,7 +54,7 @@
 #include <osl/security.hxx>
 #include <rtl/bootstrap.hxx>
 #include <unotools/pathoptions.hxx>
-#include "svtools/treelistentry.hxx"
+#include <svtools/treelistentry.hxx>
 #include <officecfg/Office/Recovery.hxx>
 #include <o3tl/make_unique.hxx>
 namespace svx{
diff --git a/svx/source/dialog/fontlb.cxx b/svx/source/dialog/fontlb.cxx
index 3c2a445b8372..6ba989d88690 100644
--- a/svx/source/dialog/fontlb.cxx
+++ b/svx/source/dialog/fontlb.cxx
@@ -17,13 +17,13 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "svx/fontlb.hxx"
+#include <svx/fontlb.hxx>
 #include <o3tl/make_unique.hxx>
 #include <vcl/builderfactory.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
-#include "svtools/treelistentry.hxx"
-#include "svtools/viewdataentry.hxx"
+#include <svtools/treelistentry.hxx>
+#include <svtools/viewdataentry.hxx>
 
 SvLBoxFontString::SvLBoxFontString()
     : SvLBoxString()
diff --git a/svx/source/dialog/fontwork.cxx b/svx/source/dialog/fontwork.cxx
index 568ae81cbfc5..66279bf51775 100644
--- a/svx/source/dialog/fontwork.cxx
+++ b/svx/source/dialog/fontwork.cxx
@@ -28,11 +28,11 @@
 #include <svx/xtextit.hxx>
 
 #include <svx/dialmgr.hxx>
-#include "svx/dlgutil.hxx"
+#include <svx/dlgutil.hxx>
 
 #include <svx/svxids.hrc>
 #include <svx/strings.hrc>
-#include "bitmaps.hlst"
+#include <bitmaps.hlst>
 #include <svx/fontwork.hxx>
 #include <editeng/outlobj.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
diff --git a/svx/source/dialog/frmsel.cxx b/svx/source/dialog/frmsel.cxx
index 291d47903361..af41b254815d 100644
--- a/svx/source/dialog/frmsel.cxx
+++ b/svx/source/dialog/frmsel.cxx
@@ -31,7 +31,7 @@
 #include <drawinglayer/processor2d/processor2dtools.hxx>
 
 #include <svx/strings.hrc>
-#include "bitmaps.hlst"
+#include <bitmaps.hlst>
 
 using namespace ::com::sun::star;
 using namespace ::editeng;
diff --git a/svx/source/dialog/graphctl.cxx b/svx/source/dialog/graphctl.cxx
index d3843dc8cd0a..b8eaa0f38a84 100644
--- a/svx/source/dialog/graphctl.cxx
+++ b/svx/source/dialog/graphctl.cxx
@@ -29,11 +29,11 @@
 #include <vcl/svapp.hxx>
 
 #include <svx/graphctl.hxx>
-#include "GraphCtlAccessibleContext.hxx"
-#include "svx/xoutbmp.hxx"
+#include <GraphCtlAccessibleContext.hxx>
+#include <svx/xoutbmp.hxx>
 #include <svx/svxids.hrc>
 #include <svx/svdpage.hxx>
-#include "svx/sdrpaintwindow.hxx"
+#include <svx/sdrpaintwindow.hxx>
 
 void GraphCtrlUserCall::Changed( const SdrObject& rObj, SdrUserCallType eType, const tools::Rectangle& /*rOldBoundRect*/ )
 {
diff --git a/svx/source/dialog/hdft.cxx b/svx/source/dialog/hdft.cxx
index 5ae16c739c10..e15a422f4886 100644
--- a/svx/source/dialog/hdft.cxx
+++ b/svx/source/dialog/hdft.cxx
@@ -32,7 +32,7 @@
 #include <svx/hdft.hxx>
 #include <svx/pageitem.hxx>
 
-#include "svx/dlgutil.hxx"
+#include <svx/dlgutil.hxx>
 #include <svx/dialmgr.hxx>
 #include <sfx2/htmlmode.hxx>
 
diff --git a/svx/source/dialog/hyperdlg.cxx b/svx/source/dialog/hyperdlg.cxx
index 2bc82c4a2503..24eedbfd78f1 100644
--- a/svx/source/dialog/hyperdlg.cxx
+++ b/svx/source/dialog/hyperdlg.cxx
@@ -19,7 +19,7 @@
 
 #include <vcl/settings.hxx>
 #include <unotools/viewoptions.hxx>
-#include "svx/hyperdlg.hxx"
+#include <svx/hyperdlg.hxx>
 #include <svx/svxdlg.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/sfxsids.hrc>
diff --git a/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx
index 65a25fc87fe6..8182bb8b692d 100644
--- a/svx/source/dialog/imapdlg.cxx
+++ b/svx/source/dialog/imapdlg.cxx
@@ -29,7 +29,7 @@
 #include <sfx2/dispatch.hxx>
 #include <sfx2/module.hxx>
 #include <sfx2/filedlghelper.hxx>
-#include "com/sun/star/ui/dialogs/TemplateDescription.hpp"
+#include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
 #include <svl/urihelper.hxx>
 #include <svtools/miscopt.hxx>
 #include <svtools/ehdl.hxx>
@@ -46,7 +46,7 @@
 #include <svx/svxids.hrc>
 #include "imapwnd.hxx"
 #include "imapimp.hxx"
-#include "svx/dlgutil.hxx"
+#include <svx/dlgutil.hxx>
 #include <svx/svdtrans.hxx>
 #include <svx/svdopath.hxx>
 #include <vcl/svapp.hxx>
diff --git a/svx/source/dialog/imapwnd.cxx b/svx/source/dialog/imapwnd.cxx
index 59d3a7fd613f..0fdf35cd8430 100644
--- a/svx/source/dialog/imapwnd.cxx
+++ b/svx/source/dialog/imapwnd.cxx
@@ -30,7 +30,7 @@
 #include <svx/dialmgr.hxx>
 #include <svx/strings.hrc>
 #include <svx/svxids.hrc>
-#include <imapwnd.hxx>
+#include "imapwnd.hxx"
 #include <svx/svdpage.hxx>
 #include <svx/svdorect.hxx>
 #include <svx/svdocirc.hxx>
diff --git a/svx/source/dialog/langbox.cxx b/svx/source/dialog/langbox.cxx
index 478f5ca9336a..9ba9c5052b25 100644
--- a/svx/source/dialog/langbox.cxx
+++ b/svx/source/dialog/langbox.cxx
@@ -31,7 +31,7 @@
 #include <svx/langbox.hxx>
 #include <svx/dialmgr.hxx>
 #include <svx/strings.hrc>
-#include "bitmaps.hlst"
+#include <bitmaps.hlst>
 #include <vcl/builderfactory.hxx>
 #include <vcl/i18nhelp.hxx>
 
diff --git a/svx/source/dialog/measctrl.cxx b/svx/source/dialog/measctrl.cxx
index d9610abb17a9..a2c3997eb3bf 100644
--- a/svx/source/dialog/measctrl.cxx
+++ b/svx/source/dialog/measctrl.cxx
@@ -20,9 +20,9 @@
 #include <sfx2/dialoghelper.hxx>
 #include <svx/svdomeas.hxx>
 #include <svx/svdmodel.hxx>
-#include "svx/measctrl.hxx"
+#include <svx/measctrl.hxx>
 #include <svx/dialmgr.hxx>
-#include "svx/dlgutil.hxx"
+#include <svx/dlgutil.hxx>
 #include <vcl/builderfactory.hxx>
 #include <vcl/settings.hxx>
 #include <memory>
diff --git a/svx/source/dialog/optgrid.cxx b/svx/source/dialog/optgrid.cxx
index d517dd7fb6df..bf5c831640ea 100644
--- a/svx/source/dialog/optgrid.cxx
+++ b/svx/source/dialog/optgrid.cxx
@@ -23,9 +23,9 @@
 
 #include <svx/svxids.hrc>
 #include <svx/dialmgr.hxx>
-#include "svx/optgrid.hxx"
+#include <svx/optgrid.hxx>
 #include <svx/strings.hrc>
-#include "svx/dlgutil.hxx"
+#include <svx/dlgutil.hxx>
 
 // local functions
 static void    lcl_GetMinMax(MetricField const & rField, long& nFirst, long& nLast, long& nMin, long& nMax)
diff --git a/svx/source/dialog/orienthelper.cxx b/svx/source/dialog/orienthelper.cxx
index 01180a7494e1..b08d121706e7 100644
--- a/svx/source/dialog/orienthelper.cxx
+++ b/svx/source/dialog/orienthelper.cxx
@@ -17,13 +17,13 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "svx/orienthelper.hxx"
+#include <svx/orienthelper.hxx>
 
 #include <vector>
 #include <utility>
 
 #include <vcl/button.hxx>
-#include "svx/dialcontrol.hxx"
+#include <svx/dialcontrol.hxx>
 
 namespace svx {
 
diff --git a/svx/source/dialog/pagenumberlistbox.cxx b/svx/source/dialog/pagenumberlistbox.cxx
index 0670d6856320..3c40fe73ee33 100644
--- a/svx/source/dialog/pagenumberlistbox.cxx
+++ b/svx/source/dialog/pagenumberlistbox.cxx
@@ -22,7 +22,7 @@
 #include <editeng/numitem.hxx>
 #include <vcl/builderfactory.hxx>
 #include <com/sun/star/style/NumberingType.hpp>
-#include "numberingtype.hrc"
+#include <numberingtype.hrc>
 
 PageNumberListBox::PageNumberListBox(vcl::Window* pParent)
     : ListBox( pParent, WB_BORDER | WB_DROPDOWN)
diff --git a/svx/source/dialog/papersizelistbox.cxx b/svx/source/dialog/papersizelistbox.cxx
index 1ec9c17c0da4..94d93aa92caa 100644
--- a/svx/source/dialog/papersizelistbox.cxx
+++ b/svx/source/dialog/papersizelistbox.cxx
@@ -21,7 +21,7 @@
 #include <svx/dialmgr.hxx>
 #include <svx/papersizelistbox.hxx>
 #include <vcl/builderfactory.hxx>
-#include "page.hrc"
+#include <page.hrc>
 
 PaperSizeListBox::PaperSizeListBox(vcl::Window* pParent)
     : ListBox( pParent, WB_BORDER | WB_DROPDOWN)
diff --git a/svx/source/dialog/passwd.cxx b/svx/source/dialog/passwd.cxx
index 24a9db6167f9..e44397770bab 100644
--- a/svx/source/dialog/passwd.cxx
+++ b/svx/source/dialog/passwd.cxx
@@ -19,7 +19,7 @@
 
 #include <comphelper/string.hxx>
 #include <vcl/layout.hxx>
-#include "svx/passwd.hxx"
+#include <svx/passwd.hxx>
 #include <svx/dialmgr.hxx>
 #include <svx/strings.hrc>
 
diff --git a/svx/source/dialog/relfld.cxx b/svx/source/dialog/relfld.cxx
index 4bb9ba59caf4..e3780f10cc8a 100644
--- a/svx/source/dialog/relfld.cxx
+++ b/svx/source/dialog/relfld.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "svx/relfld.hxx"
+#include <svx/relfld.hxx>
 #include <vcl/builderfactory.hxx>
 
 SvxRelativeField::SvxRelativeField(
diff --git a/svx/source/dialog/rlrcitem.cxx b/svx/source/dialog/rlrcitem.cxx
index cf7413968749..19e68c3f54c2 100644
--- a/svx/source/dialog/rlrcitem.cxx
+++ b/svx/source/dialog/rlrcitem.cxx
@@ -27,9 +27,9 @@
 #include <editeng/lrspitem.hxx>
 #include <editeng/ulspitem.hxx>
 #include <editeng/tstpitem.hxx>
-#include "editeng/protitem.hxx"
+#include <editeng/protitem.hxx>
 #include "rlrcitem.hxx"
-#include "svx/rulritem.hxx"
+#include <svx/rulritem.hxx>
 #include <svl/eitem.hxx>
 
 SvxRulerItem::SvxRulerItem(sal_uInt16 _nId, SvxRuler &rRul, SfxBindings &rBindings)
diff --git a/svx/source/dialog/rulritem.cxx b/svx/source/dialog/rulritem.cxx
index 145a552f8f87..e7426f0e0adc 100644
--- a/svx/source/dialog/rulritem.cxx
+++ b/svx/source/dialog/rulritem.cxx
@@ -19,7 +19,7 @@
 
 #include <svx/strings.hrc>
 #include <svx/svxids.hrc>
-#include "svx/rulritem.hxx"
+#include <svx/rulritem.hxx>
 #include <tools/mapunit.hxx>
 #include <osl/diagnose.h>
 #include <com/sun/star/awt/Rectangle.hpp>
diff --git a/svx/source/dialog/samecontentlistbox.cxx b/svx/source/dialog/samecontentlistbox.cxx
index 2cc3b8f5e07f..2f27e5d210bf 100644
--- a/svx/source/dialog/samecontentlistbox.cxx
+++ b/svx/source/dialog/samecontentlistbox.cxx
@@ -20,7 +20,7 @@
 #include <svx/dialmgr.hxx>
 #include <svx/samecontentlistbox.hxx>
 #include <vcl/builderfactory.hxx>
-#include "samecontent.hrc"
+#include <samecontent.hrc>
 
 SameContentListBox::SameContentListBox(vcl::Window* pParent)
     : ListBox( pParent, WB_BORDER | WB_DROPDOWN)
diff --git a/svx/source/dialog/searchcharmap.cxx b/svx/source/dialog/searchcharmap.cxx
index 0e25f4fceaf3..db6f4e37bbcd 100644
--- a/svx/source/dialog/searchcharmap.cxx
+++ b/svx/source/dialog/searchcharmap.cxx
@@ -34,8 +34,8 @@
 #include <svx/dialmgr.hxx>
 #include <svx/svxdlg.hxx>
 
-#include "charmapacc.hxx"
-#include "uiobject.hxx"
+#include <charmapacc.hxx>
+#include <uiobject.hxx>
 
 #include <com/sun/star/accessibility/AccessibleEventObject.hpp>
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
@@ -43,7 +43,7 @@
 #include <comphelper/types.hxx>
 #include <svl/itemset.hxx>
 #include <unicode/uchar.h>
-#include "rtl/ustrbuf.hxx"
+#include <rtl/ustrbuf.hxx>
 
 using namespace ::com::sun::star::accessibility;
 using namespace ::com::sun::star::uno;
diff --git a/svx/source/dialog/spacinglistbox.cxx b/svx/source/dialog/spacinglistbox.cxx
index ff50306f7942..c20569de019f 100644
--- a/svx/source/dialog/spacinglistbox.cxx
+++ b/svx/source/dialog/spacinglistbox.cxx
@@ -20,7 +20,7 @@
 #include <svx/dialmgr.hxx>
 #include <svx/spacinglistbox.hxx>
 #include <vcl/builderfactory.hxx>
-#include "spacing.hrc"
+#include <spacing.hrc>
 
 SpacingListBox::SpacingListBox(vcl::Window* pParent)
     : ListBox( pParent, WB_BORDER | WB_DROPDOWN)
diff --git a/svx/source/dialog/srchctrl.cxx b/svx/source/dialog/srchctrl.cxx
index 421623684396..8160a11ea0a4 100644
--- a/svx/source/dialog/srchctrl.cxx
+++ b/svx/source/dialog/srchctrl.cxx
@@ -23,7 +23,7 @@
 #include <svx/svxids.hrc>
 
 #include "srchctrl.hxx"
-#include "svx/srchdlg.hxx"
+#include <svx/srchdlg.hxx>
 #include <svl/srchitem.hxx>
 
 SvxSearchController::SvxSearchController
diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx
index 20f588cf9949..c20c18523071 100644
--- a/svx/source/dialog/srchdlg.cxx
+++ b/svx/source/dialog/srchdlg.cxx
@@ -52,8 +52,8 @@
 #include <sfx2/app.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 
-#include "svx/srchdlg.hxx"
-#include "svx/strarray.hxx"
+#include <svx/srchdlg.hxx>
+#include <svx/strarray.hxx>
 
 #include <svx/strings.hrc>
 #include <svx/svxids.hrc>
@@ -64,7 +64,7 @@
 #include <svx/pageitem.hxx>
 #include "srchctrl.hxx"
 #include <svx/dialmgr.hxx>
-#include "svx/dlgutil.hxx"
+#include <svx/dlgutil.hxx>
 #include <editeng/brushitem.hxx>
 #include <tools/resary.hxx>
 #include <svx/svxdlg.hxx>
diff --git a/svx/source/dialog/strarray.cxx b/svx/source/dialog/strarray.cxx
index aeceec078475..7239f4993431 100644
--- a/svx/source/dialog/strarray.cxx
+++ b/svx/source/dialog/strarray.cxx
@@ -22,8 +22,8 @@
 #include <svx/strarray.hxx>
 #include <tools/resary.hxx>
 #include <svx/svxitems.hrc>
-#include "fieldunit.hrc"
-#include "numberingtype.hrc"
+#include <fieldunit.hrc>
+#include <numberingtype.hrc>
 
 sal_uInt32 SvxFieldUnitTable::Count()
 {
diff --git a/svx/source/dialog/svxgrahicitem.cxx b/svx/source/dialog/svxgrahicitem.cxx
index ff6bf9ec8085..4a036ed5dd7f 100644
--- a/svx/source/dialog/svxgrahicitem.cxx
+++ b/svx/source/dialog/svxgrahicitem.cxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "svx/svxgrahicitem.hxx"
-#include "svx/svxids.hrc"
+#include <svx/svxgrahicitem.hxx>
+#include <svx/svxids.hrc>
 
 SvxGraphicItem::SvxGraphicItem( const Graphic& rGraphic )
     : SfxPoolItem( SID_GRAPHIC ), aGraphic( rGraphic )
diff --git a/svx/source/dialog/swframeposstrings.cxx b/svx/source/dialog/swframeposstrings.cxx
index 3c667bc1f71a..9b194865333a 100644
--- a/svx/source/dialog/swframeposstrings.cxx
+++ b/svx/source/dialog/swframeposstrings.cxx
@@ -25,7 +25,7 @@
 #include <tools/resary.hxx>
 #include <svx/dialmgr.hxx>
 #include <svx/strings.hrc>
-#include "swframeposstrings.hrc"
+#include <swframeposstrings.hrc>
 
 OUString SvxSwFramePosString::GetString(StringId eId)
 {
diff --git a/svx/source/dialog/txencbox.cxx b/svx/source/dialog/txencbox.cxx
index 2a1999cf6e0b..7183271e6fe5 100644
--- a/svx/source/dialog/txencbox.cxx
+++ b/svx/source/dialog/txencbox.cxx
@@ -19,12 +19,12 @@
 
 #include <config_features.h>
 
-#include "svx/txencbox.hxx"
+#include <svx/txencbox.hxx>
 #include <svx/dialmgr.hxx>
-#include "svx/txenctab.hxx"
+#include <svx/txenctab.hxx>
 #include <svx/strings.hrc>
 #if HAVE_FEATURE_DBCONNECTIVITY
-#include "svx/dbcharsethelper.hxx"
+#include <svx/dbcharsethelper.hxx>
 #endif
 #include <vcl/builderfactory.hxx>
 #include <vcl/svapp.hxx>
@@ -33,7 +33,7 @@
 #include <rtl/locale.h>
 #include <rtl/strbuf.hxx>
 #include <osl/nlsupport.h>
-#include "txenctab.hrc"
+#include <txenctab.hrc>
 
 SvxTextEncodingBox::SvxTextEncodingBox( vcl::Window* pParent, WinBits nBits )
     : ListBox( pParent, nBits )
diff --git a/svx/source/dialog/txenctab.cxx b/svx/source/dialog/txenctab.cxx
index 4a17c73fc28a..6755b6365eb2 100644
--- a/svx/source/dialog/txenctab.cxx
+++ b/svx/source/dialog/txenctab.cxx
@@ -20,8 +20,8 @@
 
 #include <svx/strings.hrc>
 #include <svx/dialmgr.hxx>
-#include "svx/txenctab.hxx"
-#include "txenctab.hrc"
+#include <svx/txenctab.hxx>
+#include <txenctab.hrc>
 
 const OUString SvxTextEncodingTable::GetTextString(const rtl_TextEncoding nEnc)
 {
diff --git a/svx/source/engine3d/cube3d.cxx b/svx/source/engine3d/cube3d.cxx
index 1f9b21998aad..4dfe5ba4ea12 100644
--- a/svx/source/engine3d/cube3d.cxx
+++ b/svx/source/engine3d/cube3d.cxx
@@ -18,10 +18,10 @@
  */
 
 
-#include "svx/strings.hrc"
-#include "svdglob.hxx"
+#include <svx/strings.hrc>
+#include <svdglob.hxx>
 #include <svx/cube3d.hxx>
-#include "svx/globl3d.hxx"
+#include <svx/globl3d.hxx>
 #include <basegfx/point/b3dpoint.hxx>
 #include <basegfx/polygon/b3dpolygon.hxx>
 #include <sdr/contact/viewcontactofe3dcube.hxx>
diff --git a/svx/source/engine3d/extrud3d.cxx b/svx/source/engine3d/extrud3d.cxx
index ec58bb16b729..be2b99b9ac61 100644
--- a/svx/source/engine3d/extrud3d.cxx
+++ b/svx/source/engine3d/extrud3d.cxx
@@ -18,10 +18,10 @@
  */
 
 
-#include "svx/strings.hrc"
-#include "svdglob.hxx"
+#include <svx/strings.hrc>
+#include <svdglob.hxx>
 #include <svx/svdpage.hxx>
-#include "svx/globl3d.hxx"
+#include <svx/globl3d.hxx>
 #include <svx/extrud3d.hxx>
 #include <svx/scene3d.hxx>
 
diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx
index 8841ad2ac0b1..f31996e29fb2 100644
--- a/svx/source/engine3d/float3d.cxx
+++ b/svx/source/engine3d/float3d.cxx
@@ -54,7 +54,7 @@
 #include <svl/whiter.hxx>
 
 #include <svx/float3d.hxx>
-#include "bitmaps.hlst"
+#include <bitmaps.hlst>
 
 using namespace com::sun::star;
 
diff --git a/svx/source/engine3d/helperminimaldepth3d.cxx b/svx/source/engine3d/helperminimaldepth3d.cxx
index acc655f2cbf1..c32f6f74b703 100644
--- a/svx/source/engine3d/helperminimaldepth3d.cxx
+++ b/svx/source/engine3d/helperminimaldepth3d.cxx
@@ -18,7 +18,7 @@
  */
 
 
-#include <helperminimaldepth3d.hxx>
+#include "helperminimaldepth3d.hxx"
 #include <drawinglayer/processor3d/baseprocessor3d.hxx>
 #include <drawinglayer/primitive3d/drawinglayer_primitivetypes3d.hxx>
 #include <drawinglayer/primitive3d/transformprimitive3d.hxx>
diff --git a/svx/source/engine3d/lathe3d.cxx b/svx/source/engine3d/lathe3d.cxx
index a4a3a013f13a..7a6f54efe540 100644
--- a/svx/source/engine3d/lathe3d.cxx
+++ b/svx/source/engine3d/lathe3d.cxx
@@ -18,11 +18,11 @@
  */
 
 
-#include "svx/strings.hrc"
-#include "svdglob.hxx"
+#include <svx/strings.hrc>
+#include <svdglob.hxx>
 #include <tools/poly.hxx>
 #include <svx/svdpage.hxx>
-#include "svx/globl3d.hxx"
+#include <svx/globl3d.hxx>
 #include <svx/lathe3d.hxx>
 #include <svx/xpoly.hxx>
 #include <svx/svxids.hrc>
diff --git a/svx/source/engine3d/obj3d.cxx b/svx/source/engine3d/obj3d.cxx
index 6ea6e5e5f93b..2aed4d22e4f8 100644
--- a/svx/source/engine3d/obj3d.cxx
+++ b/svx/source/engine3d/obj3d.cxx
@@ -19,14 +19,14 @@
 
 #include <o3tl/numeric.hxx>
 
-#include "svx/strings.hrc"
-#include "svdglob.hxx"
+#include <svx/strings.hrc>
+#include <svdglob.hxx>
 #include <svx/svdview.hxx>
 #include <svx/svdattr.hxx>
 #include <svx/svdpage.hxx>
 #include <svx/svdmodel.hxx>
-#include "svx/svditer.hxx"
-#include "svx/globl3d.hxx"
+#include <svx/svditer.hxx>
+#include <svx/globl3d.hxx>
 #include <svx/camera3d.hxx>
 #include <svx/scene3d.hxx>
 #include <svx/cube3d.hxx>
diff --git a/svx/source/engine3d/objfac3d.cxx b/svx/source/engine3d/objfac3d.cxx
index 1e0e426f876a..b704cf2b848d 100644
--- a/svx/source/engine3d/objfac3d.cxx
+++ b/svx/source/engine3d/objfac3d.cxx
@@ -18,13 +18,13 @@
  */
 
 #include <svx/svdpage.hxx>
-#include "svx/globl3d.hxx"
+#include <svx/globl3d.hxx>
 #include <svx/cube3d.hxx>
 #include <svx/sphere3d.hxx>
 #include <svx/extrud3d.hxx>
 #include <svx/lathe3d.hxx>
 #include <svx/polygn3d.hxx>
-#include "svx/objfac3d.hxx"
+#include <svx/objfac3d.hxx>
 #include <svx/svdobj.hxx>
 #include <svx/scene3d.hxx>
 
diff --git a/svx/source/engine3d/polygn3d.cxx b/svx/source/engine3d/polygn3d.cxx
index 037f997f3642..dc41fd66cb6d 100644
--- a/svx/source/engine3d/polygn3d.cxx
+++ b/svx/source/engine3d/polygn3d.cxx
@@ -19,7 +19,7 @@
 
 #include <svx/polygn3d.hxx>
 #include <svx/svdpage.hxx>
-#include "svx/globl3d.hxx"
+#include <svx/globl3d.hxx>
 #include <basegfx/point/b3dpoint.hxx>
 #include <sdr/contact/viewcontactofe3dpolygon.hxx>
 #include <basegfx/polygon/b3dpolygon.hxx>
diff --git a/svx/source/engine3d/scene3d.cxx b/svx/source/engine3d/scene3d.cxx
index 9e2e3ebde355..bec310a686a9 100644
--- a/svx/source/engine3d/scene3d.cxx
+++ b/svx/source/engine3d/scene3d.cxx
@@ -18,9 +18,9 @@
  */
 
 
-#include "svx/strings.hrc"
-#include "svdglob.hxx"
-#include "svx/svditer.hxx"
+#include <svx/strings.hrc>
+#include <svdglob.hxx>
+#include <svx/svditer.hxx>
 
 #include <stdlib.h>
 #include <svx/globl3d.hxx>
@@ -40,7 +40,7 @@
 #include <sdr/properties/e3dsceneproperties.hxx>
 #include <svx/sdr/contact/viewcontactofe3dscene.hxx>
 #include <svx/svddrag.hxx>
-#include <helperminimaldepth3d.hxx>
+#include "helperminimaldepth3d.hxx"
 #include <algorithm>
 #include <drawinglayer/geometry/viewinformation3d.hxx>
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
diff --git a/svx/source/engine3d/sphere3d.cxx b/svx/source/engine3d/sphere3d.cxx
index 168e8af898c9..4c70359c21ff 100644
--- a/svx/source/engine3d/sphere3d.cxx
+++ b/svx/source/engine3d/sphere3d.cxx
@@ -18,11 +18,11 @@
  */
 
 
-#include "svx/strings.hrc"
-#include "svdglob.hxx"
+#include <svx/strings.hrc>
+#include <svdglob.hxx>
 #include <svx/svdmodel.hxx>
 #include <svx/svdpage.hxx>
-#include "svx/globl3d.hxx"
+#include <svx/globl3d.hxx>
 #include <svx/sphere3d.hxx>
 
 #include <svx/svxids.hrc>
diff --git a/svx/source/engine3d/view3d.cxx b/svx/source/engine3d/view3d.cxx
index 7ce414051170..d7edf4da5655 100644
--- a/svx/source/engine3d/view3d.cxx
+++ b/svx/source/engine3d/view3d.cxx
@@ -21,7 +21,7 @@
 #include <vcl/wrkwin.hxx>
 #include <svx/svdogrp.hxx>
 #include <svx/svdopath.hxx>
-#include "svx/svditer.hxx"
+#include <svx/svditer.hxx>
 #include <svx/svdpool.hxx>
 #include <svx/svdorect.hxx>
 #include <svx/svdmodel.hxx>
@@ -33,13 +33,13 @@
 #include <svx/svdview.hxx>
 #include <svx/strings.hrc>
 #include <svx/dialmgr.hxx>
-#include "svx/globl3d.hxx"
+#include <svx/globl3d.hxx>
 #include <svx/obj3d.hxx>
 #include <svx/lathe3d.hxx>
 #include <svx/sphere3d.hxx>
 #include <svx/extrud3d.hxx>
 #include <svx/cube3d.hxx>
-#include "dragmt3d.hxx"
+#include <dragmt3d.hxx>
 #include <svx/view3d.hxx>
 #include <svx/svdundo.hxx>
 #include <svx/xflclit.hxx>
diff --git a/svx/source/engine3d/view3d1.cxx b/svx/source/engine3d/view3d1.cxx
index d3560ea3f466..e4e38726ddb4 100644
--- a/svx/source/engine3d/view3d1.cxx
+++ b/svx/source/engine3d/view3d1.cxx
@@ -18,7 +18,7 @@
  */
 
 
-#include "svx/svditer.hxx"
+#include <svx/svditer.hxx>
 #include <svx/svdpool.hxx>
 #include <svx/svdmodel.hxx>
 #include <svx/svxids.hrc>
@@ -26,7 +26,7 @@
 #include <svx/fmview.hxx>
 #include <svx/strings.hrc>
 #include <svx/dialmgr.hxx>
-#include "svx/globl3d.hxx"
+#include <svx/globl3d.hxx>
 #include <svx/obj3d.hxx>
 #include <svx/e3ditem.hxx>
 #include <editeng/colritem.hxx>
diff --git a/svx/source/fmcomp/dbaexchange.cxx b/svx/source/fmcomp/dbaexchange.cxx
index 1b36f332d18c..777ba28b61af 100644
--- a/svx/source/fmcomp/dbaexchange.cxx
+++ b/svx/source/fmcomp/dbaexchange.cxx
@@ -22,7 +22,7 @@
 #include <com/sun/star/sdb/CommandType.hpp>
 #include <com/sun/star/sdbcx/XTablesSupplier.hpp>
 #include <com/sun/star/sdb/XSQLQueryComposerFactory.hpp>
-#include "fmprop.hxx"
+#include <fmprop.hxx>
 #include <comphelper/extract.hxx>
 #include <sot/formats.hxx>
 #include <sot/exchange.hxx>
diff --git a/svx/source/fmcomp/dbaobjectex.cxx b/svx/source/fmcomp/dbaobjectex.cxx
index 465f8a85f2fe..8dbd59722a1d 100644
--- a/svx/source/fmcomp/dbaobjectex.cxx
+++ b/svx/source/fmcomp/dbaobjectex.cxx
@@ -21,7 +21,7 @@
 #include <osl/diagnose.h>
 #include <com/sun/star/sdbcx/XTablesSupplier.hpp>
 #include <com/sun/star/sdb/XSQLQueryComposerFactory.hpp>
-#include "fmprop.hxx"
+#include <fmprop.hxx>
 #include <comphelper/extract.hxx>
 #include <sot/formats.hxx>
 #include <sot/exchange.hxx>
diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx
index 252cdf95c30b..a93864bf1b70 100644
--- a/svx/source/fmcomp/fmgridcl.cxx
+++ b/svx/source/fmcomp/fmgridcl.cxx
@@ -17,22 +17,22 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "svx/fmgridif.hxx"
-#include "fmitems.hxx"
-#include "fmprop.hxx"
-#include "svx/fmtools.hxx"
-#include "fmservs.hxx"
-#include "fmurl.hxx"
-#include "formcontrolfactory.hxx"
-#include "gridcell.hxx"
-#include "gridcols.hxx"
-#include "svx/dbaexchange.hxx"
-#include "svx/dialmgr.hxx"
-#include "svx/strings.hrc"
-#include "svx/fmgridcl.hxx"
-#include "svx/svxdlg.hxx"
-#include "svx/svxids.hrc"
-#include "bitmaps.hlst"
+#include <svx/fmgridif.hxx>
+#include <fmitems.hxx>
+#include <fmprop.hxx>
+#include <svx/fmtools.hxx>
+#include <fmservs.hxx>
+#include <fmurl.hxx>
+#include <formcontrolfactory.hxx>
+#include <gridcell.hxx>
+#include <gridcols.hxx>
+#include <svx/dbaexchange.hxx>
+#include <svx/dialmgr.hxx>
+#include <svx/strings.hrc>
+#include <svx/fmgridcl.hxx>
+#include <svx/svxdlg.hxx>
+#include <svx/svxids.hrc>
+#include <bitmaps.hlst>
 
 #include <com/sun/star/form/XConfirmDeleteListener.hpp>
 #include <com/sun/star/form/XFormComponent.hpp>
diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx
index 0ca5e5922a49..8237fdf34f8e 100644
--- a/svx/source/fmcomp/fmgridif.cxx
+++ b/svx/source/fmcomp/fmgridif.cxx
@@ -18,16 +18,16 @@
  */
 
 
-#include "svx/fmgridif.hxx"
-#include "fmprop.hxx"
-#include "fmservs.hxx"
-#include "svx/fmtools.hxx"
-#include "fmurl.hxx"
-#include "formcontrolfactory.hxx"
-#include "gridcell.hxx"
-#include "sdbdatacolumn.hxx"
-#include "svx/fmgridcl.hxx"
-#include "svx/svxids.hrc"
+#include <svx/fmgridif.hxx>
+#include <fmprop.hxx>
+#include <fmservs.hxx>
+#include <svx/fmtools.hxx>
+#include <fmurl.hxx>
+#include <formcontrolfactory.hxx>
+#include <gridcell.hxx>
+#include <sdbdatacolumn.hxx>
+#include <svx/fmgridcl.hxx>
+#include <svx/svxids.hrc>
 #include <tools/urlobj.hxx>
 
 #include <com/sun/star/awt/PosSize.hpp>
diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx
index f3045b1a94d1..1b3b2d3c25c4 100644
--- a/svx/source/fmcomp/gridcell.cxx
+++ b/svx/source/fmcomp/gridcell.cxx
@@ -20,12 +20,12 @@
 
 #include <memory>
 #include <sal/macros.h>
-#include "fmprop.hxx"
-#include "svx/strings.hrc"
-#include "svx/fmtools.hxx"
-#include "gridcell.hxx"
-#include "gridcols.hxx"
-#include "sdbdatacolumn.hxx"
+#include <fmprop.hxx>
+#include <svx/strings.hrc>
+#include <svx/fmtools.hxx>
+#include <gridcell.hxx>
+#include <gridcols.hxx>
+#include <sdbdatacolumn.hxx>
 
 #include <com/sun/star/awt/LineEndFormat.hpp>
 #include <com/sun/star/awt/MouseWheelBehavior.hpp>
diff --git a/svx/source/fmcomp/gridcols.cxx b/svx/source/fmcomp/gridcols.cxx
index 5f8bab6af218..be80d793e4f4 100644
--- a/svx/source/fmcomp/gridcols.cxx
+++ b/svx/source/fmcomp/gridcols.cxx
@@ -17,11 +17,11 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "gridcols.hxx"
+#include <gridcols.hxx>
 #include <tools/debug.hxx>
 #include <comphelper/types.hxx>
-#include "fmservs.hxx"
-#include "svx/fmtools.hxx"
+#include <fmservs.hxx>
+#include <svx/fmtools.hxx>
 using namespace ::com::sun::star::uno;
 
 
diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx
index 7fb2883aad2b..55d374de2025 100644
--- a/svx/source/fmcomp/gridctrl.cxx
+++ b/svx/source/fmcomp/gridctrl.cxx
@@ -18,15 +18,15 @@
  */
 
 #include <sal/macros.h>
-#include "helpids.h"
+#include <helpids.h>
 #include <svx/gridctrl.hxx>
-#include "gridcell.hxx"
-#include "svx/fmtools.hxx"
+#include <gridcell.hxx>
+#include <svx/fmtools.hxx>
 #include <svtools/stringtransfer.hxx>
 #include <connectivity/dbtools.hxx>
 #include <connectivity/dbconversion.hxx>
 
-#include "fmprop.hxx"
+#include <fmprop.hxx>
 #include <com/sun/star/sdbc/ResultSetConcurrency.hpp>
 #include <com/sun/star/accessibility/XAccessible.hpp>
 #include <com/sun/star/sdb/XResultSetAccess.hpp>
@@ -47,12 +47,12 @@
 #include <vcl/menu.hxx>
 #include <vcl/settings.hxx>
 
-#include "svx/strings.hrc"
+#include <svx/strings.hrc>
 
 #include <svx/svxids.hrc>
 #include <svx/dialmgr.hxx>
-#include "fmservs.hxx"
-#include "sdbdatacolumn.hxx"
+#include <fmservs.hxx>
+#include <sdbdatacolumn.hxx>
 
 #include <comphelper/property.hxx>
 #include <cppuhelper/implbase.hxx>
diff --git a/svx/source/fmcomp/xmlexchg.cxx b/svx/source/fmcomp/xmlexchg.cxx
index b543f431bd5f..7fe8e4b88bd7 100644
--- a/svx/source/fmcomp/xmlexchg.cxx
+++ b/svx/source/fmcomp/xmlexchg.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "svx/xmlexchg.hxx"
+#include <svx/xmlexchg.hxx>
 #include <sot/formats.hxx>
 #include <sot/exchange.hxx>
 
diff --git a/svx/source/form/ParseContext.cxx b/svx/source/form/ParseContext.cxx
index 6464b9879b99..ab4cc7fcbcf8 100644
--- a/svx/source/form/ParseContext.cxx
+++ b/svx/source/form/ParseContext.cxx
@@ -19,15 +19,15 @@
 
 
 #include <sal/macros.h>
-#include "svx/ParseContext.hxx"
-#include "svx/strings.hrc"
+#include <svx/ParseContext.hxx>
+#include <svx/strings.hrc>
 
 #include <svx/dialmgr.hxx>
 
 #include <unotools/syslocale.hxx>
 #include <vcl/svapp.hxx>
 #include <osl/mutex.hxx>
-#include "fmstring.hrc"
+#include <fmstring.hrc>
 
 using namespace svxform;
 using namespace ::connectivity;
diff --git a/svx/source/form/databaselocationinput.cxx b/svx/source/form/databaselocationinput.cxx
index 43ba59216af8..fd2497e38a11 100644
--- a/svx/source/form/databaselocationinput.cxx
+++ b/svx/source/form/databaselocationinput.cxx
@@ -18,10 +18,10 @@
  */
 
 
-#include "svx/databaselocationinput.hxx"
-#include "svx/dialmgr.hxx"
+#include <svx/databaselocationinput.hxx>
+#include <svx/dialmgr.hxx>
 
-#include "svx/strings.hrc"
+#include <svx/strings.hrc>
 
 #include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
 
diff --git a/svx/source/form/datalistener.cxx b/svx/source/form/datalistener.cxx
index 7b50b9f065d7..aced6bff8f4a 100644
--- a/svx/source/form/datalistener.cxx
+++ b/svx/source/form/datalistener.cxx
@@ -18,8 +18,8 @@
  */
 
 
-#include "datalistener.hxx"
-#include "datanavi.hxx"
+#include <datalistener.hxx>
+#include <datanavi.hxx>
 
 using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::frame;
diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx
index 2bd2fcab389d..55fc1004e21e 100644
--- a/svx/source/form/datanavi.cxx
+++ b/svx/source/form/datanavi.cxx
@@ -22,12 +22,12 @@
 #include <memory>
 
 #include <sal/macros.h>
-#include "datanavi.hxx"
-#include "fmservs.hxx"
+#include <datanavi.hxx>
+#include <fmservs.hxx>
 
-#include "helpids.h"
-#include "bitmaps.hlst"
-#include "fpicker/strings.hrc"
+#include <helpids.h>
+#include <bitmaps.hlst>
+#include <fpicker/strings.hrc>
 #include <svx/svxids.hrc>
 #include <tools/diagnose_ex.h>
 #include <unotools/resmgr.hxx>
@@ -36,7 +36,7 @@
 #include <svtools/miscopt.hxx>
 #include <unotools/pathoptions.hxx>
 #include <unotools/viewoptions.hxx>
-#include "svtools/treelistentry.hxx"
+#include <svtools/treelistentry.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/filedlghelper.hxx>
 #include <sfx2/objitem.hxx>
@@ -51,7 +51,7 @@
 #include <com/sun/star/datatransfer/XTransferable.hpp>
 #include <com/sun/star/frame/XController.hpp>
 #include <com/sun/star/frame/XModel.hpp>
-#include "com/sun/star/ui/dialogs/TemplateDescription.hpp"
+#include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
 #include <com/sun/star/xforms/XFormsSupplier.hpp>
 #include <com/sun/star/xml/dom/XDocument.hpp>
 #include <com/sun/star/xml/dom/DOMException.hpp>
diff --git a/svx/source/form/dbcharsethelper.cxx b/svx/source/form/dbcharsethelper.cxx
index 184be709c7de..cee4cc927f1c 100644
--- a/svx/source/form/dbcharsethelper.cxx
+++ b/svx/source/form/dbcharsethelper.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "svx/dbcharsethelper.hxx"
+#include <svx/dbcharsethelper.hxx>
 
 #include <connectivity/dbtools.hxx>
 #include <connectivity/dbcharset.hxx>
diff --git a/svx/source/form/delayedevent.cxx b/svx/source/form/delayedevent.cxx
index f17c3dcae461..7484705ef797 100644
--- a/svx/source/form/delayedevent.cxx
+++ b/svx/source/form/delayedevent.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "delayedevent.hxx"
+#include <delayedevent.hxx>
 #include <vcl/svapp.hxx>
 
 namespace svxform
diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx
index 455962328932..10b47ae09f61 100644
--- a/svx/source/form/filtnav.cxx
+++ b/svx/source/form/filtnav.cxx
@@ -18,11 +18,11 @@
  */
 
 #include <memory>
-#include "filtnav.hxx"
-#include "fmexch.hxx"
-#include "helpids.h"
-#include "fmitems.hxx"
-#include "fmprop.hxx"
+#include <filtnav.hxx>
+#include <fmexch.hxx>
+#include <helpids.h>
+#include <fmitems.hxx>
+#include <fmprop.hxx>
 #include <svx/strings.hrc>
 
 #include <com/sun/star/awt/XControlModel.hpp>
@@ -54,10 +54,10 @@
 #include <vcl/settings.hxx>
 #include <tools/diagnose_ex.h>
 #include <svtools/svlbitm.hxx>
-#include "svtools/treelistentry.hxx"
-#include "svtools/viewdataentry.hxx"
+#include <svtools/treelistentry.hxx>
+#include <svtools/viewdataentry.hxx>
 
-#include "bitmaps.hlst"
+#include <bitmaps.hlst>
 
 #include <functional>
 
diff --git a/svx/source/form/fmPropBrw.cxx b/svx/source/form/fmPropBrw.cxx
index 4431f27c7e0f..89d3a2262c57 100644
--- a/svx/source/form/fmPropBrw.cxx
+++ b/svx/source/form/fmPropBrw.cxx
@@ -20,20 +20,20 @@
 
 #include <sal/macros.h>
 
-#include "helpids.h"
-#include "fmprop.hxx"
-#include "fmPropBrw.hxx"
-#include "svx/strings.hrc"
-#include "fmservs.hxx"
-#include "fmshimp.hxx"
-#include "fmpgeimp.hxx"
-
-#include "svx/dialmgr.hxx"
-#include "svx/fmpage.hxx"
-#include "svx/fmshell.hxx"
-#include "svx/sdrpagewindow.hxx"
-#include "svx/svdpagv.hxx"
-#include "svx/svxids.hrc"
+#include <helpids.h>
+#include <fmprop.hxx>
+#include <fmPropBrw.hxx>
+#include <svx/strings.hrc>
+#include <fmservs.hxx>
+#include <fmshimp.hxx>
+#include <fmpgeimp.hxx>
+
+#include <svx/dialmgr.hxx>
+#include <svx/fmpage.hxx>
+#include <svx/fmshell.hxx>
+#include <svx/sdrpagewindow.hxx>
+#include <svx/svdpagv.hxx>
+#include <svx/svxids.hrc>
 
 #include <com/sun/star/awt/XLayoutConstrains.hpp>
 #include <com/sun/star/awt/XControlContainer.hpp>
diff --git a/svx/source/form/fmcontrolbordermanager.cxx b/svx/source/form/fmcontrolbordermanager.cxx
index 0b396c425264..3e4824f4e762 100644
--- a/svx/source/form/fmcontrolbordermanager.cxx
+++ b/svx/source/form/fmcontrolbordermanager.cxx
@@ -18,9 +18,9 @@
  */
 
 
-#include "fmcontrolbordermanager.hxx"
+#include <fmcontrolbordermanager.hxx>
 
-#include "fmprop.hxx"
+#include <fmprop.hxx>
 
 #include <com/sun/star/form/validation/XValidatableFormComponent.hpp>
 #include <com/sun/star/awt/XTextComponent.hpp>
diff --git a/svx/source/form/fmcontrollayout.cxx b/svx/source/form/fmcontrollayout.cxx
index 55b6568779c5..4ba08f31c67a 100644
--- a/svx/source/form/fmcontrollayout.cxx
+++ b/svx/source/form/fmcontrollayout.cxx
@@ -18,8 +18,8 @@
  */
 
 
-#include "fmcontrollayout.hxx"
-#include "fmprop.hxx"
+#include <fmcontrollayout.hxx>
+#include <fmprop.hxx>
 
 #include <com/sun/star/form/FormComponentType.hpp>
 #include <com/sun/star/awt/VisualEffect.hpp>
diff --git a/svx/source/form/fmdmod.cxx b/svx/source/form/fmdmod.cxx
index 32700e9d70f3..d487399fedf9 100644
--- a/svx/source/form/fmdmod.cxx
+++ b/svx/source/form/fmdmod.cxx
@@ -19,7 +19,7 @@
 
 #include <sal/macros.h>
 #include <svx/fmdmod.hxx>
-#include "fmservs.hxx"
+#include <fmservs.hxx>
 #include <fmobj.hxx>
 #include <svx/unoshape.hxx>
 #include <comphelper/processfactory.hxx>
diff --git a/svx/source/form/fmdocumentclassification.cxx b/svx/source/form/fmdocumentclassification.cxx
index ec8c171c8f42..a3da6f381119 100644
--- a/svx/source/form/fmdocumentclassification.cxx
+++ b/svx/source/form/fmdocumentclassification.cxx
@@ -18,7 +18,7 @@
  */
 
 
-#include "fmdocumentclassification.hxx"
+#include <fmdocumentclassification.hxx>
 
 #include <com/sun/star/container/XChild.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
diff --git a/svx/source/form/fmdpage.cxx b/svx/source/form/fmdpage.cxx
index bcdd906f83f5..1e81e8fe08e8 100644
--- a/svx/source/form/fmdpage.cxx
+++ b/svx/source/form/fmdpage.cxx
@@ -18,7 +18,7 @@
  */
 
 #include <svx/fmpage.hxx>
-#include "fmobj.hxx"
+#include <fmobj.hxx>
 #include <svx/fmglob.hxx>
 #include <svx/fmdpage.hxx>
 #include <svx/unoshape.hxx>
diff --git a/svx/source/form/fmexch.cxx b/svx/source/form/fmexch.cxx
index c43ad1da2ea0..653f93aca274 100644
--- a/svx/source/form/fmexch.cxx
+++ b/svx/source/form/fmexch.cxx
@@ -17,14 +17,14 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "fmexch.hxx"
+#include <fmexch.hxx>
 
 #include <sot/storage.hxx>
 #include <svl/itempool.hxx>
 
 #include <sot/formats.hxx>
 #include <svtools/treelistbox.hxx>
-#include "svtools/treelistentry.hxx"
+#include <svtools/treelistentry.hxx>
 #include <tools/diagnose_ex.h>
 
 
diff --git a/svx/source/form/fmexpl.cxx b/svx/source/form/fmexpl.cxx
index 3f6182207b91..7c0377254b1a 100644
--- a/svx/source/form/fmexpl.cxx
+++ b/svx/source/form/fmexpl.cxx
@@ -19,22 +19,22 @@
 
 
 #include <svx/strings.hrc>
-#include "fmexpl.hxx"
+#include <fmexpl.hxx>
 
-#include "helpids.h"
+#include <helpids.h>
 #include <svx/fmglob.hxx>
-#include "fmservs.hxx"
+#include <fmservs.hxx>
 #include <svx/fmmodel.hxx>
-#include "fmexch.hxx"
-#include "fmundo.hxx"
-#include "fmpgeimp.hxx"
+#include <fmexch.hxx>
+#include <fmundo.hxx>
+#include <fmpgeimp.hxx>
 
 #include <svx/svxids.hrc>
 
-#include "fmprop.hxx"
-#include "bitmaps.hlst"
+#include <fmprop.hxx>
+#include <bitmaps.hlst>
 #include <svx/dialmgr.hxx>
-#include "svx/svditer.hxx"
+#include <svx/svditer.hxx>
 #include <svx/svdouno.hxx>
 #include <svx/svdobj.hxx>
 #include <vcl/msgbox.hxx>
@@ -51,7 +51,7 @@
 
 #include <vcl/wrkwin.hxx>
 #include <svx/fmshell.hxx>
-#include "fmshimp.hxx"
+#include <fmshimp.hxx>
 #include <svx/fmpage.hxx>
 #include <com/sun/star/io/XPersistObject.hpp>
 #include <com/sun/star/sdb/CommandType.hpp>
diff --git a/svx/source/form/fmitems.cxx b/svx/source/form/fmitems.cxx
index 2d09ce0e3fe4..832da669928f 100644
--- a/svx/source/form/fmitems.cxx
+++ b/svx/source/form/fmitems.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "fmitems.hxx"
+#include <fmitems.hxx>
 
 #include <svx/svxids.hrc>
 #include <tools/stream.hxx>
diff --git a/svx/source/form/fmmodel.cxx b/svx/source/form/fmmodel.cxx
index 823632e7f46f..1fc2b4844f59 100644
--- a/svx/source/form/fmmodel.cxx
+++ b/svx/source/form/fmmodel.cxx
@@ -18,9 +18,9 @@
  */
 
 
-#include "fmundo.hxx"
-#include "fmdocumentclassification.hxx"
-#include "fmcontrollayout.hxx"
+#include <fmundo.hxx>
+#include <fmdocumentclassification.hxx>
+#include <fmcontrollayout.hxx>
 
 #include <svx/fmmodel.hxx>
 #include <svx/fmpage.hxx>
diff --git a/svx/source/form/fmobj.cxx b/svx/source/form/fmobj.cxx
index d3aae131f909..10a0644669e0 100644
--- a/svx/source/form/fmobj.cxx
+++ b/svx/source/form/fmobj.cxx
@@ -17,17 +17,17 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "fmobj.hxx"
-#include "fmprop.hxx"
-#include "fmvwimp.hxx"
-#include "fmpgeimp.hxx"
-#include "svx/fmview.hxx"
-#include "svx/fmglob.hxx"
-#include "svx/fmpage.hxx"
-#include "editeng/editeng.hxx"
-#include "svx/svdovirt.hxx"
-#include "svx/fmmodel.hxx"
-#include "svx/dialmgr.hxx"
+#include <fmobj.hxx>
+#include <fmprop.hxx>
+#include <fmvwimp.hxx>
+#include <fmpgeimp.hxx>
+#include <svx/fmview.hxx>
+#include <svx/fmglob.hxx>
+#include <svx/fmpage.hxx>
+#include <editeng/editeng.hxx>
+#include <svx/svdovirt.hxx>
+#include <svx/fmmodel.hxx>
+#include <svx/dialmgr.hxx>
 
 #include <com/sun/star/awt/XDevice.hpp>
 #include <com/sun/star/awt/XControlContainer.hpp>
@@ -35,7 +35,7 @@
 #include <com/sun/star/io/XPersistObject.hpp>
 #include <com/sun/star/script/XEventAttacherManager.hpp>
 #include <com/sun/star/util/XCloneable.hpp>
-#include "svx/fmtools.hxx"
+#include <svx/fmtools.hxx>
 
 #include <comphelper/property.hxx>
 #include <comphelper/processfactory.hxx>
diff --git a/svx/source/form/fmobjfac.cxx b/svx/source/form/fmobjfac.cxx
index 2ec2a56d8bf6..dd21067f6644 100644
--- a/svx/source/form/fmobjfac.cxx
+++ b/svx/source/form/fmobjfac.cxx
@@ -21,29 +21,29 @@
 
 #include <tools/diagnose_ex.h>
 #include <svx/svdobj.hxx>
-#include "svx/fmtools.hxx"
-#include "fmservs.hxx"
+#include <svx/fmtools.hxx>
+#include <fmservs.hxx>
 
-#include "svx/fmobjfac.hxx"
+#include <svx/fmobjfac.hxx>
 
 #include <svx/fmglob.hxx>
 
-#include "fmobj.hxx"
-#include "fmshimp.hxx"
+#include <fmobj.hxx>
+#include <fmshimp.hxx>
 
 #include <svx/fmshell.hxx>
 
 #include <svx/svxids.hrc>
-#include "tbxform.hxx"
+#include <tbxform.hxx>
 
 #include <svx/dialmgr.hxx>
-#include "tabwin.hxx"
-#include "fmexpl.hxx"
-#include "filtnav.hxx"
+#include <tabwin.hxx>
+#include <fmexpl.hxx>
+#include <filtnav.hxx>
 
-#include "fmprop.hxx"
-#include "fmPropBrw.hxx"
-#include "datanavi.hxx"
+#include <fmprop.hxx>
+#include <fmPropBrw.hxx>
+#include <datanavi.hxx>
 
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::beans;
diff --git a/svx/source/form/fmpage.cxx b/svx/source/form/fmpage.cxx
index 1711206e1036..980e954c20ee 100644
--- a/svx/source/form/fmpage.cxx
+++ b/svx/source/form/fmpage.cxx
@@ -24,11 +24,11 @@
 
 #include <svx/fmmodel.hxx>
 
-#include "fmobj.hxx"
+#include <fmobj.hxx>
 
 #include <svx/dialmgr.hxx>
 
-#include "fmpgeimp.hxx"
+#include <fmpgeimp.hxx>
 
 #include <sfx2/objsh.hxx>
 #include <svx/svditer.hxx>
@@ -38,9 +38,9 @@
 
 
 #include <svx/fmglob.hxx>
-#include "fmprop.hxx"
-#include "fmundo.hxx"
-#include "svx/fmtools.hxx"
+#include <fmprop.hxx>
+#include <fmundo.hxx>
+#include <svx/fmtools.hxx>
 using namespace ::svxform;
 #include <comphelper/property.hxx>
 
diff --git a/svx/source/form/fmpgeimp.cxx b/svx/source/form/fmpgeimp.cxx
index 4468fa0751f9..6409103bdcf5 100644
--- a/svx/source/form/fmpgeimp.cxx
+++ b/svx/source/form/fmpgeimp.cxx
@@ -18,17 +18,17 @@
  */
 
 
-#include "svx/svxerr.hxx"
-#include "fmpgeimp.hxx"
-#include "fmundo.hxx"
-#include "svx/fmtools.hxx"
-#include "fmprop.hxx"
-#include "fmservs.hxx"
-#include "fmobj.hxx"
-#include "formcontrolfactory.hxx"
-#include "svx/svditer.hxx"
-#include "svx/strings.hrc"
-#include "treevisitor.hxx"
+#include <svx/svxerr.hxx>
+#include <fmpgeimp.hxx>
+#include <fmundo.hxx>
+#include <svx/fmtools.hxx>
+#include <fmprop.hxx>
+#include <fmservs.hxx>
+#include <fmobj.hxx>
+#include <formcontrolfactory.hxx>
+#include <svx/svditer.hxx>
+#include <svx/strings.hrc>
+#include <treevisitor.hxx>
 
 #include <com/sun/star/sdb/CommandType.hpp>
 #include <com/sun/star/container/EnumerableMap.hpp>
diff --git a/svx/source/form/fmscriptingenv.cxx b/svx/source/form/fmscriptingenv.cxx
index 5442e89420b8..8fc9171bfee5 100644
--- a/svx/source/form/fmscriptingenv.cxx
+++ b/svx/source/form/fmscriptingenv.cxx
@@ -19,8 +19,8 @@
 
 #include <config_features.h>
 
-#include "fmscriptingenv.hxx"
-#include "svx/fmmodel.hxx"
+#include <fmscriptingenv.hxx>
+#include <svx/fmmodel.hxx>
 
 #include <com/sun/star/awt/XControl.hpp>
 #include <com/sun/star/frame/Desktop.hpp>
diff --git a/svx/source/form/fmservs.cxx b/svx/source/form/fmservs.cxx
index 3f8d2ac789e3..981bc1bb6e00 100644
--- a/svx/source/form/fmservs.cxx
+++ b/svx/source/form/fmservs.cxx
@@ -20,7 +20,7 @@
 #include <com/sun/star/container/XSet.hpp>
 #include <cppuhelper/factory.hxx>
 #include <comphelper/processfactory.hxx>
-#include "fmservs.hxx"
+#include <fmservs.hxx>
 
 using namespace com::sun::star;
 
diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx
index 900d5c243624..d5b2a670ee98 100644
--- a/svx/source/form/fmshell.cxx
+++ b/svx/source/form/fmshell.cxx
@@ -17,14 +17,14 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "fmvwimp.hxx"
+#include <fmvwimp.hxx>
 #include <svx/fmshell.hxx>
-#include "svx/fmtools.hxx"
-#include "fmservs.hxx"
-#include "fmprop.hxx"
-#include "fmpgeimp.hxx"
-#include "fmitems.hxx"
-#include "fmundo.hxx"
+#include <svx/fmtools.hxx>
+#include <fmservs.hxx>
+#include <fmprop.hxx>
+#include <fmpgeimp.hxx>
+#include <fmitems.hxx>
+#include <fmundo.hxx>
 #include <vcl/waitobj.hxx>
 #include <com/sun/star/form/XLoadable.hpp>
 #include <com/sun/star/container/XNamed.hpp>
@@ -50,40 +50,40 @@
 #include <sfx2/objsh.hxx>
 #include <svx/svdobj.hxx>
 #include <svx/fmpage.hxx>
-#include "svx/svditer.hxx"
-#include "fmobj.hxx"
+#include <svx/svditer.hxx>
+#include <fmobj.hxx>
 
 #include <svx/svxids.hrc>
 
-#include "fmexch.hxx"
+#include <fmexch.hxx>
 #include <svx/fmglob.hxx>
 #include <svl/eitem.hxx>
 #include <tools/diagnose_ex.h>
 #include <svx/svdpage.hxx>
 #include <svx/fmmodel.hxx>
 #include <svx/dialmgr.hxx>
-#include "fmshimp.hxx"
+#include <fmshimp.hxx>
 #include <svx/svdpagv.hxx>
 #include <sfx2/objitem.hxx>
 #include <sfx2/viewsh.hxx>
-#include "fmexpl.hxx"
-#include "formcontrolling.hxx"
+#include <fmexpl.hxx>
+#include <formcontrolling.hxx>
 #include <svl/numuno.hxx>
 #include <connectivity/dbtools.hxx>
 #include <comphelper/types.hxx>
 #include <comphelper/processfactory.hxx>
-#include "fmdocumentclassification.hxx"
-#include "formtoolbars.hxx"
+#include <fmdocumentclassification.hxx>
+#include <formtoolbars.hxx>
 
 #include <svx/svxdlg.hxx>
 #include <svx/strings.hrc>
 
-#include "svx/sdrobjectfilter.hxx"
+#include <svx/sdrobjectfilter.hxx>
 
 #define FmFormShell
-#include "svxslots.hxx"
+#include <svxslots.hxx>
 
-#include "tbxform.hxx"
+#include <tbxform.hxx>
 #include <comphelper/property.hxx>
 #include <com/sun/star/beans/PropertyValue.hpp>
 
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx
index 2eb69a433a93..dd9778b19063 100644
--- a/svx/source/form/fmshimp.cxx
+++ b/svx/source/form/fmshimp.cxx
@@ -19,32 +19,32 @@
 
 
 #include <sal/macros.h>
-#include "fmitems.hxx"
-#include "fmobj.hxx"
-#include "fmpgeimp.hxx"
-#include "svx/fmtools.hxx"
-#include "fmprop.hxx"
-#include "fmservs.hxx"
-#include "fmshimp.hxx"
-#include "fmtextcontrolshell.hxx"
-#include "fmundo.hxx"
-#include "fmurl.hxx"
-#include "fmvwimp.hxx"
-#include "formtoolbars.hxx"
-#include "gridcols.hxx"
-#include "svx/svditer.hxx"
-#include "svx/dialmgr.hxx"
-#include "svx/strings.hrc"
-#include "svx/fmglob.hxx"
-#include "svx/fmmodel.hxx"
-#include "svx/fmpage.hxx"
-#include "svx/fmshell.hxx"
-#include "svx/obj3d.hxx"
-#include "svx/sdrpagewindow.hxx"
-#include "svx/svdpagv.hxx"
-#include "svx/svxdlg.hxx"
-#include "svx/svxids.hrc"
-#include "bitmaps.hlst"
+#include <fmitems.hxx>
+#include <fmobj.hxx>
+#include <fmpgeimp.hxx>
+#include <svx/fmtools.hxx>
+#include <fmprop.hxx>
+#include <fmservs.hxx>
+#include <fmshimp.hxx>
+#include <fmtextcontrolshell.hxx>
+#include <fmundo.hxx>
+#include <fmurl.hxx>
+#include <fmvwimp.hxx>
+#include <formtoolbars.hxx>
+#include <gridcols.hxx>
+#include <svx/svditer.hxx>
+#include <svx/dialmgr.hxx>
+#include <svx/strings.hrc>
+#include <svx/fmglob.hxx>
+#include <svx/fmmodel.hxx>
+#include <svx/fmpage.hxx>
+#include <svx/fmshell.hxx>
+#include <svx/obj3d.hxx>
+#include <svx/sdrpagewindow.hxx>
+#include <svx/svdpagv.hxx>
+#include <svx/svxdlg.hxx>
+#include <svx/svxids.hrc>
+#include <bitmaps.hlst>
 
 #include <com/sun/star/awt/XWindow2.hpp>
 #include <com/sun/star/awt/XCheckBox.hpp>
diff --git a/svx/source/form/fmsrccfg.cxx b/svx/source/form/fmsrccfg.cxx
index fdd943f2b03b..6cd469c72dda 100644
--- a/svx/source/form/fmsrccfg.cxx
+++ b/svx/source/form/fmsrccfg.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "svx/fmsrccfg.hxx"
+#include <svx/fmsrccfg.hxx>
 
 #include <osl/diagnose.h>
 #include <comphelper/processfactory.hxx>
diff --git a/svx/source/form/fmsrcimp.cxx b/svx/source/form/fmsrcimp.cxx
index ed18ac1fe9b8..9d14412dde93 100644
--- a/svx/source/form/fmsrcimp.cxx
+++ b/svx/source/form/fmsrcimp.cxx
@@ -19,8 +19,8 @@
 
 
 #include <rtl/strbuf.hxx>
-#include "svx/fmtools.hxx"
-#include "svx/fmsrccfg.hxx"
+#include <svx/fmtools.hxx>
+#include <svx/fmsrccfg.hxx>
 #include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
 #include <tools/wldcrd.hxx>
@@ -41,9 +41,9 @@
 #include <com/sun/star/util/XNumberFormats.hpp>
 #include <comphelper/processfactory.hxx>
 
-#include "fmprop.hxx"
-#include "fmservs.hxx"
-#include "svx/fmsrcimp.hxx"
+#include <fmprop.hxx>
+#include <fmservs.hxx>
+#include <svx/fmsrcimp.hxx>
 #include <svx/fmsearch.hxx>
 
 #include <comphelper/numbers.hxx>
diff --git a/svx/source/form/fmtextcontroldialogs.cxx b/svx/source/form/fmtextcontroldialogs.cxx
index e2b298b99728..f75cad21bb56 100644
--- a/svx/source/form/fmtextcontroldialogs.cxx
+++ b/svx/source/form/fmtextcontroldialogs.cxx
@@ -17,14 +17,14 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "fmtextcontroldialogs.hxx"
+#include <fmtextcontroldialogs.hxx>
 #include <svx/dialmgr.hxx>
 #include <svx/dialogs.hrc>
 #include <svx/strings.hrc>
 
 #include <editeng/eeitem.hxx>
 
-#include "svx/flagsdef.hxx"
+#include <svx/flagsdef.hxx>
 #include <svl/intitem.hxx>
 
 #include <svl/cjkoptions.hxx>
diff --git a/svx/source/form/fmtextcontrolfeature.cxx b/svx/source/form/fmtextcontrolfeature.cxx
index 4f1d69215730..9b7263408a7b 100644
--- a/svx/source/form/fmtextcontrolfeature.cxx
+++ b/svx/source/form/fmtextcontrolfeature.cxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "fmtextcontrolfeature.hxx"
-#include "fmtextcontrolshell.hxx"
+#include <fmtextcontrolfeature.hxx>
+#include <fmtextcontrolshell.hxx>
 
 #include <osl/diagnose.h>
 
diff --git a/svx/source/form/fmtextcontrolshell.cxx b/svx/source/form/fmtextcontrolshell.cxx
index 23490582a59a..b4a1108a6766 100644
--- a/svx/source/form/fmtextcontrolshell.cxx
+++ b/svx/source/form/fmtextcontrolshell.cxx
@@ -18,18 +18,18 @@
  */
 
 
-#include "fmprop.hxx"
-#include "fmtextcontroldialogs.hxx"
-#include "fmtextcontrolfeature.hxx"
-#include "fmtextcontrolshell.hxx"
-#include "editeng/crossedoutitem.hxx"
-#include "svx/dialmgr.hxx"
-#include "editeng/editeng.hxx"
-#include "editeng/eeitem.hxx"
-#include "svx/fmglob.hxx"
-#include "editeng/scriptspaceitem.hxx"
-#include "svx/svxids.hrc"
-#include "editeng/udlnitem.hxx"
+#include <fmprop.hxx>
+#include <fmtextcontroldialogs.hxx>
+#include <fmtextcontrolfeature.hxx>
+#include <fmtextcontrolshell.hxx>
+#include <editeng/crossedoutitem.hxx>
+#include <svx/dialmgr.hxx>
+#include <editeng/editeng.hxx>
+#include <editeng/eeitem.hxx>
+#include <svx/fmglob.hxx>
+#include <editeng/scriptspaceitem.hxx>
+#include <svx/svxids.hrc>
+#include <editeng/udlnitem.hxx>
 
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/awt/FontDescriptor.hpp>
diff --git a/svx/source/form/fmtools.cxx b/svx/source/form/fmtools.cxx
index 7e8c759bec79..7b2655e6e0b9 100644
--- a/svx/source/form/fmtools.cxx
+++ b/svx/source/form/fmtools.cxx
@@ -18,10 +18,10 @@
  */
 
 
-#include "fmprop.hxx"
-#include "fmservs.hxx"
-#include "svx/fmtools.hxx"
-#include "svx/fmglob.hxx"
+#include <fmprop.hxx>
+#include <fmservs.hxx>
+#include <svx/fmtools.hxx>
+#include <svx/fmglob.hxx>
 
 #include <com/sun/star/awt/LineEndFormat.hpp>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
diff --git a/svx/source/form/fmundo.cxx b/svx/source/form/fmundo.cxx
index 8bef3f5c52cb..a2f57d862acb 100644
--- a/svx/source/form/fmundo.cxx
+++ b/svx/source/form/fmundo.cxx
@@ -22,16 +22,16 @@
 #include <map>
 
 #include <sal/macros.h>
-#include "fmundo.hxx"
-#include "fmpgeimp.hxx"
-#include "svx/svditer.hxx"
-#include "fmobj.hxx"
-#include "fmprop.hxx"
-#include "svx/strings.hrc"
-#include "svx/fmglob.hxx"
-#include "svx/dialmgr.hxx"
-#include "svx/fmmodel.hxx"
-#include "svx/fmpage.hxx"
+#include <fmundo.hxx>
+#include <fmpgeimp.hxx>
+#include <svx/svditer.hxx>
+#include <fmobj.hxx>
+#include <fmprop.hxx>
+#include <svx/strings.hrc>
+#include <svx/fmglob.hxx>
+#include <svx/dialmgr.hxx>
+#include <svx/fmmodel.hxx>
+#include <svx/fmpage.hxx>
 
 #include <com/sun/star/util/XModifyBroadcaster.hpp>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
@@ -43,7 +43,7 @@
 #include <com/sun/star/reflection/XInterfaceMethodTypeDescription.hpp>
 #include <com/sun/star/sdbc/XConnection.hpp>
 
-#include "svx/fmtools.hxx"
+#include <svx/fmtools.hxx>
 #include <svl/macitem.hxx>
 #include <tools/diagnose_ex.h>
 #include <sfx2/objsh.hxx>
diff --git a/svx/source/form/fmview.cxx b/svx/source/form/fmview.cxx
index 012206cffe5f..cc952a1948f7 100644
--- a/svx/source/form/fmview.cxx
+++ b/svx/source/form/fmview.cxx
@@ -29,7 +29,7 @@
 #include <com/sun/star/sdbc/DataType.hpp>
 #include <com/sun/star/form/XLoadable.hpp>
 #include <com/sun/star/form/XReset.hpp>
-#include "fmvwimp.hxx"
+#include <fmvwimp.hxx>
 #include <sfx2/objsh.hxx>
 #include <sfx2/viewsh.hxx>
 #include <sfx2/viewfrm.hxx>
@@ -37,21 +37,21 @@
 #include <sfx2/dispatch.hxx>
 #include <basic/sbuno.hxx>
 #include <basic/sbx.hxx>
-#include "fmitems.hxx"
-#include "fmobj.hxx"
-#include "svx/svditer.hxx"
+#include <fmitems.hxx>
+#include <fmobj.hxx>
+#include <svx/svditer.hxx>
 #include <svx/svdpagv.hxx>
 #include <svx/svdogrp.hxx>
 #include <svx/fmview.hxx>
 #include <svx/fmmodel.hxx>
 #include <svx/fmpage.hxx>
 #include <svx/fmshell.hxx>
-#include "fmpgeimp.hxx"
-#include "svx/fmtools.hxx"
-#include "fmshimp.hxx"
-#include "fmservs.hxx"
-#include "fmprop.hxx"
-#include "fmundo.hxx"
+#include <fmpgeimp.hxx>
+#include <svx/fmtools.hxx>
+#include <fmshimp.hxx>
+#include <fmservs.hxx>
+#include <fmprop.hxx>
+#include <fmundo.hxx>
 #include <svx/dataaccessdescriptor.hxx>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/namedvaluecollection.hxx>
@@ -64,7 +64,7 @@
 #include <vcl/stdtext.hxx>
 #include <svx/fmglob.hxx>
 #include <svx/sdrpagewindow.hxx>
-#include "svx/sdrpaintwindow.hxx"
+#include <svx/sdrpaintwindow.hxx>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx
index e6dbcd631a71..63a3608ffb3a 100644
--- a/svx/source/form/fmvwimp.cxx
+++ b/svx/source/form/fmvwimp.cxx
@@ -19,30 +19,30 @@
 
 
 #include <memory>
-#include "fmdocumentclassification.hxx"
-#include "fmobj.hxx"
-#include "fmpgeimp.hxx"
-#include "fmprop.hxx"
-#include "svx/strings.hrc"
-#include "fmservs.hxx"
-#include "fmshimp.hxx"
-#include "svx/fmtools.hxx"
-#include "fmundo.hxx"
-#include "fmvwimp.hxx"
-#include "formcontrolfactory.hxx"
-#include "svx/sdrpaintwindow.hxx"
-#include "svx/svditer.hxx"
-#include "svx/dataaccessdescriptor.hxx"
-#include "svx/dialmgr.hxx"
-#include "svx/fmglob.hxx"
-#include "svx/fmmodel.hxx"
-#include "svx/fmpage.hxx"
-#include "svx/fmshell.hxx"
-#include "svx/fmview.hxx"
-#include "svx/sdrpagewindow.hxx"
-#include "svx/svdogrp.hxx"
-#include "svx/svdpagv.hxx"
-#include "svx/xmlexchg.hxx"
+#include <fmdocumentclassification.hxx>
+#include <fmobj.hxx>
+#include <fmpgeimp.hxx>
+#include <fmprop.hxx>
+#include <svx/strings.hrc>
+#include <fmservs.hxx>
+#include <fmshimp.hxx>
+#include <svx/fmtools.hxx>
+#include <fmundo.hxx>
+#include <fmvwimp.hxx>
+#include <formcontrolfactory.hxx>
+#include <svx/sdrpaintwindow.hxx>
+#include <svx/svditer.hxx>
+#include <svx/dataaccessdescriptor.hxx>
+#include <svx/dialmgr.hxx>
+#include <svx/fmglob.hxx>
+#include <svx/fmmodel.hxx>
+#include <svx/fmpage.hxx>
+#include <svx/fmshell.hxx>
+#include <svx/fmview.hxx>
+#include <svx/sdrpagewindow.hxx>
+#include <svx/svdogrp.hxx>
+#include <svx/svdpagv.hxx>
+#include <svx/xmlexchg.hxx>
 
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
diff --git a/svx/source/form/formcontrolfactory.cxx b/svx/source/form/formcontrolfactory.cxx
index 35eb98aaf7d5..c2b31731a8b0 100644
--- a/svx/source/form/formcontrolfactory.cxx
+++ b/svx/source/form/formcontrolfactory.cxx
@@ -18,13 +18,13 @@
  */
 
 
-#include "formcontrolfactory.hxx"
-#include "fmcontrollayout.hxx"
-#include "fmprop.hxx"
-#include "svx/strings.hrc"
-#include "fmservs.hxx"
-#include "svx/dialmgr.hxx"
-#include "svx/svdouno.hxx"
+#include <formcontrolfactory.hxx>
+#include <fmcontrollayout.hxx>
+#include <fmprop.hxx>
+#include <svx/strings.hrc>
+#include <fmservs.hxx>
+#include <svx/dialmgr.hxx>
+#include <svx/svdouno.hxx>
 
 #include <com/sun/star/form/XFormComponent.hpp>
 #include <com/sun/star/form/FormComponentType.hpp>
diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx
index d8583aa16a53..15be71774403 100644
--- a/svx/source/form/formcontroller.cxx
+++ b/svx/source/form/formcontroller.cxx
@@ -18,18 +18,18 @@
  */
 
 
-#include "fmcontrolbordermanager.hxx"
-#include "fmcontrollayout.hxx"
-#include "formcontroller.hxx"
-#include "formfeaturedispatcher.hxx"
-#include "fmdocumentclassification.hxx"
-#include "formcontrolling.hxx"
-#include "fmprop.hxx"
-#include "svx/dialmgr.hxx"
-#include "svx/strings.hrc"
-#include "fmservs.hxx"
-#include "svx/fmtools.hxx"
-#include "fmurl.hxx"
+#include <fmcontrolbordermanager.hxx>
+#include <fmcontrollayout.hxx>
+#include <formcontroller.hxx>
+#include <formfeaturedispatcher.hxx>
+#include <fmdocumentclassification.hxx>
+#include <formcontrolling.hxx>
+#include <fmprop.hxx>
+#include <svx/dialmgr.hxx>
+#include <svx/strings.hrc>
+#include <fmservs.hxx>
+#include <svx/fmtools.hxx>
+#include <fmurl.hxx>
 
 #include <com/sun/star/awt/FocusChangeReason.hpp>
 #include <com/sun/star/awt/XCheckBox.hpp>
diff --git a/svx/source/form/formcontrolling.cxx b/svx/source/form/formcontrolling.cxx
index e0ad57f183dc..6144fecc933f 100644
--- a/svx/source/form/formcontrolling.cxx
+++ b/svx/source/form/formcontrolling.cxx
@@ -19,11 +19,11 @@
 
 
 #include <sal/macros.h>
-#include "formcontrolling.hxx"
-#include "fmurl.hxx"
-#include "svx/svxids.hrc"
-#include "fmprop.hxx"
-#include "svx/fmtools.hxx"
+#include <formcontrolling.hxx>
+#include <fmurl.hxx>
+#include <svx/svxids.hrc>
+#include <fmprop.hxx>
+#include <svx/fmtools.hxx>
 
 #include <com/sun/star/form/runtime/FormOperations.hpp>
 #include <com/sun/star/form/runtime/FormFeature.hpp>
diff --git a/svx/source/form/formdispatchinterceptor.cxx b/svx/source/form/formdispatchinterceptor.cxx
index e490119fa7a7..e5d1d9de826a 100644
--- a/svx/source/form/formdispatchinterceptor.cxx
+++ b/svx/source/form/formdispatchinterceptor.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "formdispatchinterceptor.hxx"
+#include <formdispatchinterceptor.hxx>
 
 namespace svxform
 {
diff --git a/svx/source/form/formfeaturedispatcher.cxx b/svx/source/form/formfeaturedispatcher.cxx
index 5570aa975767..8442df2f0cdc 100644
--- a/svx/source/form/formfeaturedispatcher.cxx
+++ b/svx/source/form/formfeaturedispatcher.cxx
@@ -18,7 +18,7 @@
  */
 
 
-#include "formfeaturedispatcher.hxx"
+#include <formfeaturedispatcher.hxx>
 
 #include <comphelper/namedvaluecollection.hxx>
 #include <tools/diagnose_ex.h>
diff --git a/svx/source/form/formtoolbars.cxx b/svx/source/form/formtoolbars.cxx
index 71439b7da34a..fdf299b5ac18 100644
--- a/svx/source/form/formtoolbars.cxx
+++ b/svx/source/form/formtoolbars.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "formtoolbars.hxx"
+#include <formtoolbars.hxx>
 
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <osl/diagnose.h>
diff --git a/svx/source/form/legacyformcontroller.cxx b/svx/source/form/legacyformcontroller.cxx
index 85b26fff6b78..0f35b70d4f35 100644
--- a/svx/source/form/legacyformcontroller.cxx
+++ b/svx/source/form/legacyformcontroller.cxx
@@ -18,7 +18,7 @@
  */
 
 
-#include "fmservs.hxx"
+#include <fmservs.hxx>
 
 #include <com/sun/star/form/XFormController.hpp>
 #include <com/sun/star/form/runtime/FormController.hpp>
diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx
index 2131a14c4e05..0528be0da8ac 100644
--- a/svx/source/form/navigatortree.cxx
+++ b/svx/source/form/navigatortree.cxx
@@ -23,17 +23,17 @@
 #include <svx/fmmodel.hxx>
 #include <svx/fmpage.hxx>
 #include <svx/svdpagv.hxx>
-#include "svx/svditer.hxx"
-
-#include "helpids.h"
-#include "fmexpl.hxx"
-#include "fmshimp.hxx"
-#include "fmservs.hxx"
-#include "fmundo.hxx"
-#include "fmpgeimp.hxx"
-#include "fmitems.hxx"
-#include "fmobj.hxx"
-#include "fmprop.hxx"
+#include <svx/svditer.hxx>
+
+#include <helpids.h>
+#include <fmexpl.hxx>
+#include <fmshimp.hxx>
+#include <fmservs.hxx>
+#include <fmundo.hxx>
+#include <fmpgeimp.hxx>
+#include <fmitems.hxx>
+#include <fmobj.hxx>
+#include <fmprop.hxx>
 #include <vcl/wrkwin.hxx>
 #include <sfx2/viewsh.hxx>
 #include <sfx2/dispatch.hxx>
@@ -50,8 +50,8 @@
 
 #include <svx/svxdlg.hxx>
 #include <svx/strings.hrc>
-#include "bitmaps.hlst"
-#include "svtools/treelistentry.hxx"
+#include <bitmaps.hlst>
+#include <svtools/treelistentry.hxx>
 
 namespace svxform
 {
diff --git a/svx/source/form/navigatortreemodel.cxx b/svx/source/form/navigatortreemodel.cxx
index cf0f494b0af1..f9e1d3385877 100644
--- a/svx/source/form/navigatortreemodel.cxx
+++ b/svx/source/form/navigatortreemodel.cxx
@@ -22,18 +22,18 @@
 #include <svx/fmmodel.hxx>
 #include <svx/fmpage.hxx>
 #include <svx/fmglob.hxx>
-#include "svx/svditer.hxx"
+#include <svx/svditer.hxx>
 #include <svx/svdogrp.hxx>
 #include <svx/svdpagv.hxx>
 
-#include "fmprop.hxx"
+#include <fmprop.hxx>
 
-#include "fmundo.hxx"
-#include "helpids.h"
-#include "fmexpl.hxx"
-#include "svx/strings.hrc"
-#include "fmshimp.hxx"
-#include "fmobj.hxx"
+#include <fmundo.hxx>
+#include <helpids.h>
+#include <fmexpl.hxx>
+#include <svx/strings.hrc>
+#include <fmshimp.hxx>
+#include <fmobj.hxx>
 #include <sfx2/objsh.hxx>
 #include <tools/diagnose_ex.h>
 #include <com/sun/star/container/XContainer.hpp>
diff --git a/svx/source/form/sdbdatacolumn.cxx b/svx/source/form/sdbdatacolumn.cxx
index d53525059f2e..19a7fd016da5 100644
--- a/svx/source/form/sdbdatacolumn.cxx
+++ b/svx/source/form/sdbdatacolumn.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "sdbdatacolumn.hxx"
+#include <sdbdatacolumn.hxx>
 
 
 namespace svxform
diff --git a/svx/source/form/sqlparserclient.cxx b/svx/source/form/sqlparserclient.cxx
index 8665ab4639c0..2664229ef55c 100644
--- a/svx/source/form/sqlparserclient.cxx
+++ b/svx/source/form/sqlparserclient.cxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "sqlparserclient.hxx"
-#include "svx/ParseContext.hxx"
+#include <sqlparserclient.hxx>
+#include <svx/ParseContext.hxx>
 
 #include <connectivity/dbtools.hxx>
 #include <connectivity/sqlparse.hxx>
diff --git a/svx/source/form/tabwin.cxx b/svx/source/form/tabwin.cxx
index 7bbdf77adb2e..a7258b6bd459 100644
--- a/svx/source/form/tabwin.cxx
+++ b/svx/source/form/tabwin.cxx
@@ -18,9 +18,9 @@
  */
 
 
-#include "tabwin.hxx"
-#include "svx/fmtools.hxx"
-#include "fmservs.hxx"
+#include <tabwin.hxx>
+#include <svx/fmtools.hxx>
+#include <fmservs.hxx>
 
 #include <svx/strings.hrc>
 #include <svx/svxids.hrc>
@@ -33,14 +33,14 @@
 #include <com/sun/star/util/XLocalizedAliases.hpp>
 #include <comphelper/processfactory.hxx>
 
-#include "helpids.h"
+#include <helpids.h>
 #include <svx/fmshell.hxx>
-#include "fmshimp.hxx"
+#include <fmshimp.hxx>
 #include <svx/fmpage.hxx>
 
-#include "fmpgeimp.hxx"
+#include <fmpgeimp.hxx>
 
-#include "fmprop.hxx"
+#include <fmprop.hxx>
 
 #include <svx/dialmgr.hxx>
 #include <svx/svdpagv.hxx>
@@ -49,9 +49,9 @@
 #include <comphelper/property.hxx>
 #include <sfx2/frame.hxx>
 #include <svx/dataaccessdescriptor.hxx>
-#include "svtools/treelistentry.hxx"
+#include <svtools/treelistentry.hxx>
 #include <vcl/settings.hxx>
-#include "tabwin.hrc"
+#include <tabwin.hrc>
 
 const long STD_WIN_SIZE_X = 120;
 const long STD_WIN_SIZE_Y = 150;
diff --git a/svx/source/form/tbxform.cxx b/svx/source/form/tbxform.cxx
index b0993f984eef..dac444874da8 100644
--- a/svx/source/form/tbxform.cxx
+++ b/svx/source/form/tbxform.cxx
@@ -25,16 +25,16 @@
 #include <vcl/toolbox.hxx>
 #include <vcl/fixed.hxx>
 #include <vcl/settings.hxx>
-#include "fmitems.hxx"
-#include "formtoolbars.hxx"
+#include <fmitems.hxx>
+#include <formtoolbars.hxx>
 
 
 #include <svx/dialmgr.hxx>
 #include <svx/svxids.hrc>
 #include <svx/strings.hrc>
-#include "svx/tbxctl.hxx"
-#include "tbxform.hxx"
-#include "helpids.h"
+#include <svx/tbxctl.hxx>
+#include <tbxform.hxx>
+#include <helpids.h>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/viewsh.hxx>
 
diff --git a/svx/source/form/typemap.cxx b/svx/source/form/typemap.cxx
index 70c94f5edf4b..23ac73f9821b 100644
--- a/svx/source/form/typemap.cxx
+++ b/svx/source/form/typemap.cxx
@@ -29,9 +29,9 @@
 #include <editeng/contouritem.hxx>
 #include <editeng/shdditem.hxx>
 #include <editeng/postitem.hxx>
-#include "svx/clipfmtitem.hxx"
+#include <svx/clipfmtitem.hxx>
 #include <editeng/fhgtitem.hxx>
-#include "editeng/fontitem.hxx"
+#include <editeng/fontitem.hxx>
 #include <editeng/charreliefitem.hxx>
 #include <editeng/escapementitem.hxx>
 #include <editeng/colritem.hxx>
@@ -49,6 +49,6 @@
 
 #include <editeng/memberids.h>
 #define SFX_TYPEMAP
-#include "svxslots.hxx"
+#include <svxslots.hxx>
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/form/xfm_addcondition.cxx b/svx/source/form/xfm_addcondition.cxx
index e33fe49e917e..78382e66f87d 100644
--- a/svx/source/form/xfm_addcondition.cxx
+++ b/svx/source/form/xfm_addcondition.cxx
@@ -18,12 +18,12 @@
  */
 
 
-#include "xfm_addcondition.hxx"
+#include <xfm_addcondition.hxx>
 
 #include <comphelper/processfactory.hxx>
 #include <cppuhelper/typeprovider.hxx>
-#include "datanavi.hxx"
-#include "fmservs.hxx"
+#include <datanavi.hxx>
+#include <fmservs.hxx>
 #include <vcl/msgbox.hxx>
 
 
diff --git a/svx/source/gallery2/GalleryControl.cxx b/svx/source/gallery2/GalleryControl.cxx
index 755c162850b2..aafa1161ce4d 100644
--- a/svx/source/gallery2/GalleryControl.cxx
+++ b/svx/source/gallery2/GalleryControl.cxx
@@ -17,13 +17,13 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "GalleryControl.hxx"
+#include <GalleryControl.hxx>
 
-#include "svx/strings.hrc"
-#include "svx/galmisc.hxx"
-#include "svx/gallery1.hxx"
+#include <svx/strings.hrc>
+#include <svx/galmisc.hxx>
+#include <svx/gallery1.hxx>
 #include "galbrws1.hxx"
-#include "galbrws2.hxx"
+#include <galbrws2.hxx>
 #include "GallerySplitter.hxx"
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
diff --git a/svx/source/gallery2/galbrws1.cxx b/svx/source/gallery2/galbrws1.cxx
index 2ef9a5ce5922..cd34c6397357 100644
--- a/svx/source/gallery2/galbrws1.cxx
+++ b/svx/source/gallery2/galbrws1.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "sal/config.h"
+#include <sal/config.h>
 
 #include <comphelper/processfactory.hxx>
 #include <tools/datetime.hxx>
@@ -26,19 +26,19 @@
 #include <vcl/settings.hxx>
 #include <ucbhelper/content.hxx>
 #include <sfx2/app.hxx>
-#include "helpids.h"
-#include "svx/gallery1.hxx"
-#include "svx/galtheme.hxx"
-#include "svx/galmisc.hxx"
+#include <helpids.h>
+#include <svx/gallery1.hxx>
+#include <svx/galtheme.hxx>
+#include <svx/galmisc.hxx>
 #include "galbrws1.hxx"
 #include <com/sun/star/util/DateTime.hpp>
-#include "svx/strings.hrc"
+#include <svx/strings.hrc>
 #include <algorithm>
 #include <svx/dialmgr.hxx>
 
 #include <svx/svxdlg.hxx>
 #include <memory>
-#include "bitmaps.hlst"
+#include <bitmaps.hlst>
 
 using namespace ::com::sun::star;
 
diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx
index 01a87998c156..0a77441323f4 100644
--- a/svx/source/gallery2/galbrws2.cxx
+++ b/svx/source/gallery2/galbrws2.cxx
@@ -32,23 +32,23 @@
 #include <sfx2/sfxsids.hrc>
 #include <vcl/graphicfilter.hxx>
 #include <editeng/brushitem.hxx>
-#include "helpids.h"
-#include "svx/gallery.hxx"
-#include "svx/svxids.hrc"
-#include "galobj.hxx"
-#include "svx/gallery1.hxx"
-#include "svx/galtheme.hxx"
-#include "svx/galctrl.hxx"
-#include "svx/galmisc.hxx"
-#include "galbrws2.hxx"
+#include <helpids.h>
+#include <svx/gallery.hxx>
+#include <svx/svxids.hrc>
+#include <galobj.hxx>
+#include <svx/gallery1.hxx>
+#include <svx/galtheme.hxx>
+#include <svx/galctrl.hxx>
+#include <svx/galmisc.hxx>
+#include <galbrws2.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 #include <svx/fmmodel.hxx>
 #include <svx/dialmgr.hxx>
 #include <svx/svxdlg.hxx>
 #include <svx/strings.hrc>
-#include "GalleryControl.hxx"
-#include "bitmaps.hlst"
+#include <GalleryControl.hxx>
+#include <bitmaps.hlst>
 
 #include <svx/svxcommands.h>
 #include <svx/galleryitem.hxx>
diff --git a/svx/source/gallery2/galctrl.cxx b/svx/source/gallery2/galctrl.cxx
index 616fc808e2fb..0c156cd165d5 100644
--- a/svx/source/gallery2/galctrl.cxx
+++ b/svx/source/gallery2/galctrl.cxx
@@ -22,21 +22,21 @@
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/dispatch.hxx>
 #include <avmedia/mediaplayer.hxx>
-#include "helpids.h"
-#include "galbrws2.hxx"
-#include "svx/dialmgr.hxx"
-#include "svx/galtheme.hxx"
-#include "svx/galmisc.hxx"
-#include "svx/galctrl.hxx"
-#include "editeng/AccessibleStringWrap.hxx"
+#include <helpids.h>
+#include <galbrws2.hxx>
+#include <svx/dialmgr.hxx>
+#include <svx/galtheme.hxx>
+#include <svx/galmisc.hxx>
+#include <svx/galctrl.hxx>
+#include <editeng/AccessibleStringWrap.hxx>
 #include <editeng/svxfont.hxx>
-#include "galobj.hxx"
+#include <galobj.hxx>
 #include <avmedia/mediawindow.hxx>
-#include "svx/strings.hrc"
+#include <svx/strings.hrc>
 #include <vcl/graphicfilter.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/builderfactory.hxx>
-#include "bitmaps.hlst"
+#include <bitmaps.hlst>
 
 #define GALLERY_BRWBOX_TITLE    1
 
diff --git a/svx/source/gallery2/galexpl.cxx b/svx/source/gallery2/galexpl.cxx
index 5d05b80d7a61..f99c3f652f7d 100644
--- a/svx/source/gallery2/galexpl.cxx
+++ b/svx/source/gallery2/galexpl.cxx
@@ -21,10 +21,10 @@
 #include <unotools/pathoptions.hxx>
 #include <rtl/instance.hxx>
 #include <sfx2/viewfrm.hxx>
-#include "svx/gallery1.hxx"
-#include "svx/galtheme.hxx"
-#include "svx/gallery.hxx"
-#include "galobj.hxx"
+#include <svx/gallery1.hxx>
+#include <svx/galtheme.hxx>
+#include <svx/gallery.hxx>
+#include <galobj.hxx>
 
 namespace
 {
diff --git a/svx/source/gallery2/gallery1.cxx b/svx/source/gallery2/gallery1.cxx
index 2fd0e69bbabe..a5b832c4ad03 100644
--- a/svx/source/gallery2/gallery1.cxx
+++ b/svx/source/gallery2/gallery1.cxx
@@ -26,7 +26,7 @@
 #include <postmac.h>
 #endif
 
-#include "sal/config.h"
+#include <sal/config.h>
 
 #include <comphelper/processfactory.hxx>
 #include <comphelper/string.hxx>
@@ -38,13 +38,13 @@
 #include <unotools/ucbstreamhelper.hxx>
 #include <unotools/pathoptions.hxx>
 #include <sfx2/docfile.hxx>
-#include "svx/dialmgr.hxx"
-#include "svx/gallery.hxx"
-#include "svx/strings.hrc"
-#include "strings.hxx"
-#include "svx/galmisc.hxx"
-#include "svx/galtheme.hxx"
-#include "svx/gallery1.hxx"
+#include <svx/dialmgr.hxx>
+#include <svx/gallery.hxx>
+#include <svx/strings.hrc>
+#include <strings.hxx>
+#include <svx/galmisc.hxx>
+#include <svx/galtheme.hxx>
+#include <svx/gallery1.hxx>
 #include <com/sun/star/sdbc/XResultSet.hpp>
 #include <com/sun/star/ucb/XContentAccess.hpp>
 #include <memory>
diff --git a/svx/source/gallery2/galmisc.cxx b/svx/source/gallery2/galmisc.cxx
index c32441d09fac..a92204122ea5 100644
--- a/svx/source/gallery2/galmisc.cxx
+++ b/svx/source/gallery2/galmisc.cxx
@@ -42,10 +42,10 @@
 #include <svx/fmview.hxx>
 #include <svx/unomodel.hxx>
 #include "codec.hxx"
-#include "svx/strings.hrc"
-#include "svx/gallery1.hxx"
-#include "svx/galtheme.hxx"
-#include "svx/galmisc.hxx"
+#include <svx/strings.hrc>
+#include <svx/gallery1.hxx>
+#include <svx/galtheme.hxx>
+#include <svx/galmisc.hxx>
 #include <com/sun/star/sdbc/XResultSet.hpp>
 #include <com/sun/star/ucb/XContentAccess.hpp>
 #include <com/sun/star/ucb/TransferInfo.hpp>
diff --git a/svx/source/gallery2/galobj.cxx b/svx/source/gallery2/galobj.cxx
index cf712c30a116..d5fe56acde82 100644
--- a/svx/source/gallery2/galobj.cxx
+++ b/svx/source/gallery2/galobj.cxx
@@ -32,15 +32,15 @@
 #include <svx/fmmodel.hxx>
 #include <svx/fmview.hxx>
 #include <svx/fmpage.hxx>
-#include "svx/strings.hrc"
-#include "svx/galmisc.hxx"
-#include "galobj.hxx"
+#include <svx/strings.hrc>
+#include <svx/galmisc.hxx>
+#include <galobj.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/dibtools.hxx>
 #include "gallerydrawmodel.hxx"
 #include <memory>
-#include "bitmaps.hlst"
+#include <bitmaps.hlst>
 
 using namespace ::com::sun::star;
 
diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx
index 4ae50c793001..53aa456eb004 100644
--- a/svx/source/gallery2/galtheme.cxx
+++ b/svx/source/gallery2/galtheme.cxx
@@ -19,7 +19,7 @@
 
 #include <config_features.h>
 
-#include "sal/config.h"
+#include <sal/config.h>
 
 #include <algorithm>
 
@@ -47,12 +47,12 @@
 #include <svx/unomodel.hxx>
 #include <svx/fmmodel.hxx>
 #include <svx/fmview.hxx>
-#include "svx/galmisc.hxx"
-#include "svx/galtheme.hxx"
+#include <svx/galmisc.hxx>
+#include <svx/galtheme.hxx>
 #include <com/sun/star/sdbc/XResultSet.hpp>
 #include <com/sun/star/ucb/XContentAccess.hpp>
 #include <com/sun/star/io/XInputStream.hpp>
-#include "galobj.hxx"
+#include <galobj.hxx>
 #include <svx/gallery1.hxx>
 #include <vcl/lstbox.hxx>
 #include "gallerydrawmodel.hxx"
diff --git a/svx/source/inc/cell.hxx b/svx/source/inc/cell.hxx
index 3a061c58475d..b7905acf7b70 100644
--- a/svx/source/inc/cell.hxx
+++ b/svx/source/inc/cell.hxx
@@ -27,10 +27,10 @@
 
 #include <rtl/ref.hxx>
 #include <svl/style.hxx>
-#include "svx/sdtaitm.hxx"
+#include <svx/sdtaitm.hxx>
 #include "tablemodel.hxx"
-#include "editeng/unotext.hxx"
-#include "svx/svdtext.hxx"
+#include <editeng/unotext.hxx>
+#include <svx/svdtext.hxx>
 
 
 class SfxItemSet;
diff --git a/svx/source/inc/filtnav.hxx b/svx/source/inc/filtnav.hxx
index 2e8b89007ad9..f018c1f25ef6 100644
--- a/svx/source/inc/filtnav.hxx
+++ b/svx/source/inc/filtnav.hxx
@@ -37,7 +37,7 @@
 #include <vcl/dialog.hxx>
 #include <vcl/group.hxx>
 #include <vcl/dockwin.hxx>
-#include "svx/fmtools.hxx"
+#include <svx/fmtools.hxx>
 #include "fmexch.hxx"
 #include "sqlparserclient.hxx"
 
diff --git a/svx/source/inc/fmPropBrw.hxx b/svx/source/inc/fmPropBrw.hxx
index 5c7ca1cfb643..c78294a6dbdc 100644
--- a/svx/source/inc/fmPropBrw.hxx
+++ b/svx/source/inc/fmPropBrw.hxx
@@ -27,7 +27,7 @@
 #include <sfx2/basedlgs.hxx>
 #include <sfx2/ctrlitem.hxx>
 #include <sfx2/childwin.hxx>
-#include "svx/fmtools.hxx"
+#include <svx/fmtools.hxx>
 
 
 class FmPropBrwMgr : public SfxChildWindow
diff --git a/svx/source/inc/fmpgeimp.hxx b/svx/source/inc/fmpgeimp.hxx
index be2559b94aa5..1237019f01b1 100644
--- a/svx/source/inc/fmpgeimp.hxx
+++ b/svx/source/inc/fmpgeimp.hxx
@@ -32,7 +32,7 @@
 #include <comphelper/uno3.hxx>
 #include <cppuhelper/weakref.hxx>
 
-#include "svx/svxdllapi.h"
+#include <svx/svxdllapi.h>
 #include <map>
 
 class FmFormObj;
diff --git a/svx/source/inc/fmshimp.hxx b/svx/source/inc/fmshimp.hxx
index 37aa7c74b46f..0b07b6f063b2 100644
--- a/svx/source/inc/fmshimp.hxx
+++ b/svx/source/inc/fmshimp.hxx
@@ -45,8 +45,8 @@
 #include <svx/svxids.hrc>
 #include <svl/lstner.hxx>
 
-#include "svx/fmtools.hxx"
-#include "svx/fmsrccfg.hxx"
+#include <svx/fmtools.hxx>
+#include <svx/fmsrccfg.hxx>
 #include <osl/mutex.hxx>
 #include <cppuhelper/component.hxx>
 #include <comphelper/container.hxx>
diff --git a/svx/source/inc/fmvwimp.hxx b/svx/source/inc/fmvwimp.hxx
index 7eb299d12a05..b47db7c0e57c 100644
--- a/svx/source/inc/fmvwimp.hxx
+++ b/svx/source/inc/fmvwimp.hxx
@@ -24,7 +24,7 @@
 #include <map>
 #include <memory>
 
-#include "svx/svdmark.hxx"
+#include <svx/svdmark.hxx>
 #include "fmdocumentclassification.hxx"
 
 #include <com/sun/star/form/XForm.hpp>
diff --git a/svx/source/inc/sqlparserclient.hxx b/svx/source/inc/sqlparserclient.hxx
index 0151f2cae9c3..06341d76120b 100644
--- a/svx/source/inc/sqlparserclient.hxx
+++ b/svx/source/inc/sqlparserclient.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_SVX_SOURCE_INC_SQLPARSERCLIENT_HXX
 #define INCLUDED_SVX_SOURCE_INC_SQLPARSERCLIENT_HXX
 
-#include "svx/ParseContext.hxx"
+#include <svx/ParseContext.hxx>
 
 namespace com { namespace sun { namespace star {
 namespace util {
diff --git a/svx/source/inc/xmlxtexp.hxx b/svx/source/inc/xmlxtexp.hxx
index 0f8312a26310..b48e26b17e8d 100644
--- a/svx/source/inc/xmlxtexp.hxx
+++ b/svx/source/inc/xmlxtexp.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_SVX_SOURCE_INC_XMLXTEXP_HXX
 #define INCLUDED_SVX_SOURCE_INC_XMLXTEXP_HXX
 
-#include "xmloff/xmlexp.hxx"
+#include <xmloff/xmlexp.hxx>
 
 namespace com { namespace sun { namespace star {
     namespace frame { class XModel; }
diff --git a/svx/source/items/chrtitem.cxx b/svx/source/items/chrtitem.cxx
index 30b3497ec035..9fa9e59e5b8c 100644
--- a/svx/source/items/chrtitem.cxx
+++ b/svx/source/items/chrtitem.cxx
@@ -25,7 +25,7 @@
 
 #include <float.h>
 
-#include "svx/chrtitem.hxx"
+#include <svx/chrtitem.hxx>
 
 using namespace ::com::sun::star;
 
diff --git a/svx/source/items/hlnkitem.cxx b/svx/source/items/hlnkitem.cxx
index 513a3b9673ac..1783f1245f3d 100644
--- a/svx/source/items/hlnkitem.cxx
+++ b/svx/source/items/hlnkitem.cxx
@@ -22,7 +22,7 @@
 #include <svl/memberid.h>
 #include <basic/sbxvar.hxx>
 #include <sfx2/event.hxx>
-#include "svx/hlnkitem.hxx"
+#include <svx/hlnkitem.hxx>
 
 
 SfxPoolItem* SvxHyperlinkItem::CreateDefault() { return new  SvxHyperlinkItem(0);}
diff --git a/svx/source/items/ofaitem.cxx b/svx/source/items/ofaitem.cxx
index b3b92c233abd..6d487ee6b52e 100644
--- a/svx/source/items/ofaitem.cxx
+++ b/svx/source/items/ofaitem.cxx
@@ -18,7 +18,7 @@
  */
 
 
-#include "svx/ofaitem.hxx"
+#include <svx/ofaitem.hxx>
 
 OfaPtrItem::OfaPtrItem( sal_uInt16 _nWhich, void *_pPtr )
     : SfxPoolItem( _nWhich ), pPtr( _pPtr )
diff --git a/svx/source/items/postattr.cxx b/svx/source/items/postattr.cxx
index 282631f22ca4..eb906bf6fd72 100644
--- a/svx/source/items/postattr.cxx
+++ b/svx/source/items/postattr.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "svx/postattr.hxx"
+#include <svx/postattr.hxx>
 #include <editeng/itemtype.hxx>
 #include <svx/strings.hrc>
 #include <svx/svxitems.hrc>
diff --git a/svx/source/items/rotmodit.cxx b/svx/source/items/rotmodit.cxx
index 559f35a9e254..0652f38f5d97 100644
--- a/svx/source/items/rotmodit.cxx
+++ b/svx/source/items/rotmodit.cxx
@@ -31,7 +31,7 @@
 #include <com/sun/star/table/CellOrientation.hpp>
 #include <com/sun/star/table/CellAddress.hpp>
 
-#include "svx/rotmodit.hxx"
+#include <svx/rotmodit.hxx>
 
 using namespace ::com::sun::star;
 
diff --git a/svx/source/items/svxerr.cxx b/svx/source/items/svxerr.cxx
index 57f81b01733b..ec8a4059bcbb 100644
--- a/svx/source/items/svxerr.cxx
+++ b/svx/source/items/svxerr.cxx
@@ -17,11 +17,11 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "svx/svxerr.hxx"
+#include <svx/svxerr.hxx>
 #include <svx/dialmgr.hxx>
 #include <svx/strings.hrc>
 #include <rtl/instance.hxx>
-#include "svxerr.hrc"
+#include <svxerr.hrc>
 
 SvxErrorHandler::SvxErrorHandler() :
   SfxErrorHandler(
diff --git a/svx/source/sdr/contact/objectcontact.cxx b/svx/source/sdr/contact/objectcontact.cxx
index 5150328d4d6c..9afa1bd6ed2c 100644
--- a/svx/source/sdr/contact/objectcontact.cxx
+++ b/svx/source/sdr/contact/objectcontact.cxx
@@ -25,7 +25,7 @@
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <svx/sdr/animation/objectanimator.hxx>
 
-#include "eventhandler.hxx"
+#include <eventhandler.hxx>
 
 using namespace com::sun::star;
 
diff --git a/svx/source/sdr/contact/objectcontactofpageview.cxx b/svx/source/sdr/contact/objectcontactofpageview.cxx
index b5ff022157f6..d99c335a31bb 100644
--- a/svx/source/sdr/contact/objectcontactofpageview.cxx
+++ b/svx/source/sdr/contact/objectcontactofpageview.cxx
@@ -38,7 +38,7 @@
 #include <unotools/configmgr.hxx>
 #include <comphelper/lok.hxx>
 
-#include "eventhandler.hxx"
+#include <eventhandler.hxx>
 #include <memory>
 
 using namespace com::sun::star;
diff --git a/svx/source/sdr/contact/viewcontactofgraphic.cxx b/svx/source/sdr/contact/viewcontactofgraphic.cxx
index 04ed83668424..40a88daa4962 100644
--- a/svx/source/sdr/contact/viewcontactofgraphic.cxx
+++ b/svx/source/sdr/contact/viewcontactofgraphic.cxx
@@ -29,7 +29,7 @@
 #include <svx/sdr/contact/objectcontact.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <sdr/primitive2d/sdrgrafprimitive2d.hxx>
-#include "svx/strings.hrc"
+#include <svx/strings.hrc>
 #include <svdglob.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
@@ -45,8 +45,8 @@
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
 #include <drawinglayer/primitive2d/sdrdecompositiontools2d.hxx>
 
-#include "eventhandler.hxx"
-#include "bitmaps.hlst"
+#include <eventhandler.hxx>
+#include <bitmaps.hlst>
 
 namespace sdr
 {
diff --git a/svx/source/sdr/contact/viewcontactofsdrpage.cxx b/svx/source/sdr/contact/viewcontactofsdrpage.cxx
index 75d6dfe9b7f8..fd49657dd723 100644
--- a/svx/source/sdr/contact/viewcontactofsdrpage.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrpage.cxx
@@ -40,7 +40,7 @@
 #include <svdglob.hxx>
 #include <drawinglayer/primitive2d/discreteshadowprimitive2d.hxx>
 #include <drawinglayer/attribute/sdrfillattribute.hxx>
-#include "bitmaps.hlst"
+#include <bitmaps.hlst>
 
 namespace sdr { namespace contact {
 
diff --git a/svx/source/sdr/contact/viewcontactofunocontrol.cxx b/svx/source/sdr/contact/viewcontactofunocontrol.cxx
index 7df1f041631d..547e2ebc5339 100644
--- a/svx/source/sdr/contact/viewcontactofunocontrol.cxx
+++ b/svx/source/sdr/contact/viewcontactofunocontrol.cxx
@@ -28,7 +28,7 @@
 #include <svx/svdview.hxx>
 #include <svx/sdrpagewindow.hxx>
 
-#include "svx/sdrpaintwindow.hxx"
+#include <svx/sdrpaintwindow.hxx>
 #include <tools/diagnose_ex.h>
 #include <vcl/pdfextoutdevdata.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
diff --git a/svx/source/sdr/contact/viewobjectcontactofgraphic.cxx b/svx/source/sdr/contact/viewobjectcontactofgraphic.cxx
index 66592354a9cc..95ed93a42b4c 100644
--- a/svx/source/sdr/contact/viewobjectcontactofgraphic.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofgraphic.cxx
@@ -24,7 +24,7 @@
 #include <svx/svdmodel.hxx>
 #include <svx/svdpage.hxx>
 
-#include "eventhandler.hxx"
+#include <eventhandler.hxx>
 
 namespace sdr
 {
diff --git a/svx/source/sdr/contact/viewobjectcontactofsdrobj.cxx b/svx/source/sdr/contact/viewobjectcontactofsdrobj.cxx
index 27216f237357..f0c545e7151b 100644
--- a/svx/source/sdr/contact/viewobjectcontactofsdrobj.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofsdrobj.cxx
@@ -32,7 +32,7 @@
 #include <vcl/outdev.hxx>
 #include <vcl/canvastools.hxx>
 
-#include "fmobj.hxx"
+#include <fmobj.hxx>
 
 namespace sdr { namespace contact {
 
diff --git a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
index 9f5e8debaf24..ad7415abc495 100644
--- a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
@@ -28,7 +28,7 @@
 #include <svx/svdpagv.hxx>
 #include <svx/svdview.hxx>
 #include <svx/sdrpagewindow.hxx>
-#include "svx/sdrpaintwindow.hxx"
+#include <svx/sdrpaintwindow.hxx>
 
 #include <com/sun/star/awt/XControl.hpp>
 #include <com/sun/star/awt/XControlModel.hpp>
diff --git a/svx/source/sdr/event/eventhandler.cxx b/svx/source/sdr/event/eventhandler.cxx
index 1a29a146a606..990c10defa0e 100644
--- a/svx/source/sdr/event/eventhandler.cxx
+++ b/svx/source/sdr/event/eventhandler.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "eventhandler.hxx"
+#include <eventhandler.hxx>
 
 #include <algorithm>
 #include <tools/debug.hxx>
diff --git a/svx/source/sidebar/ContextChangeEventMultiplexer.cxx b/svx/source/sidebar/ContextChangeEventMultiplexer.cxx
index 43a15143e53e..5591ee389200 100644
--- a/svx/source/sidebar/ContextChangeEventMultiplexer.cxx
+++ b/svx/source/sidebar/ContextChangeEventMultiplexer.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "svx/sidebar/ContextChangeEventMultiplexer.hxx"
+#include <svx/sidebar/ContextChangeEventMultiplexer.hxx>
 
 #include <com/sun/star/ui/ContextChangeEventObject.hpp>
 #include <com/sun/star/ui/XContextChangeEventMultiplexer.hpp>
diff --git a/svx/source/sidebar/EmptyPanel.cxx b/svx/source/sidebar/EmptyPanel.cxx
index 74c9f45beb9e..a43bb33e9c04 100644
--- a/svx/source/sidebar/EmptyPanel.cxx
+++ b/svx/source/sidebar/EmptyPanel.cxx
@@ -18,8 +18,8 @@
  */
 
 #include "EmptyPanel.hxx"
-#include "svx/strings.hrc"
-#include "svx/dialmgr.hxx"
+#include <svx/strings.hrc>
+#include <svx/dialmgr.hxx>
 
 namespace svx { namespace sidebar {
 
diff --git a/svx/source/sidebar/PanelFactory.cxx b/svx/source/sidebar/PanelFactory.cxx
index 837a6ca486b1..d834a7bd4b7b 100644
--- a/svx/source/sidebar/PanelFactory.cxx
+++ b/svx/source/sidebar/PanelFactory.cxx
@@ -25,9 +25,9 @@
 #include "graphic/GraphicPropertyPanel.hxx"
 #include "line/LinePropertyPanel.hxx"
 #include "possize/PosSizePropertyPanel.hxx"
-#include "DefaultShapesPanel.hxx"
+#include <DefaultShapesPanel.hxx>
 #include "media/MediaPlaybackPanel.hxx"
-#include "GalleryControl.hxx"
+#include <GalleryControl.hxx>
 #include "EmptyPanel.hxx"
 #include <sfx2/sidebar/SidebarPanelBase.hxx>
 #include <sfx2/sidebar/Tools.hxx>
diff --git a/svx/source/sidebar/SelectionAnalyzer.cxx b/svx/source/sidebar/SelectionAnalyzer.cxx
index 45986676aa77..f39fbc217b81 100644
--- a/svx/source/sidebar/SelectionAnalyzer.cxx
+++ b/svx/source/sidebar/SelectionAnalyzer.cxx
@@ -17,13 +17,13 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "svx/sidebar/SelectionAnalyzer.hxx"
-#include "svx/svdmrkv.hxx"
-#include "svx/svdobj.hxx"
-#include "svx/svdotext.hxx"
-#include "svx/svdpage.hxx"
-#include "svx/fmglob.hxx"
-#include "svx/globl3d.hxx"
+#include <svx/sidebar/SelectionAnalyzer.hxx>
+#include <svx/svdmrkv.hxx>
+#include <svx/svdobj.hxx>
+#include <svx/svdotext.hxx>
+#include <svx/svdpage.hxx>
+#include <svx/fmglob.hxx>
+#include <svx/globl3d.hxx>
 
 using vcl::EnumContext;
 
diff --git a/svx/source/sidebar/SelectionChangeHandler.cxx b/svx/source/sidebar/SelectionChangeHandler.cxx
index 1b6c624380e4..6ec2baed0d86 100644
--- a/svx/source/sidebar/SelectionChangeHandler.cxx
+++ b/svx/source/sidebar/SelectionChangeHandler.cxx
@@ -16,10 +16,10 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#include "svx/sidebar/SelectionChangeHandler.hxx"
-#include "svx/sidebar/SelectionAnalyzer.hxx"
-#include "svx/sidebar/ContextChangeEventMultiplexer.hxx"
-#include "svx/svdmrkv.hxx"
+#include <svx/sidebar/SelectionChangeHandler.hxx>
+#include <svx/sidebar/SelectionAnalyzer.hxx>
+#include <svx/sidebar/ContextChangeEventMultiplexer.hxx>
+#include <svx/svdmrkv.hxx>
 
 #include <vcl/EnumContext.hxx>
 #include <sfx2/shell.hxx>
diff --git a/svx/source/sidebar/area/AreaPropertyPanel.cxx b/svx/source/sidebar/area/AreaPropertyPanel.cxx
index 31c20e00e10c..7d6526bcaf0f 100644
--- a/svx/source/sidebar/area/AreaPropertyPanel.cxx
+++ b/svx/source/sidebar/area/AreaPropertyPanel.cxx
@@ -18,7 +18,7 @@
  */
 
 #include <sfx2/sidebar/ControlFactory.hxx>
-#include <AreaPropertyPanel.hxx>
+#include "AreaPropertyPanel.hxx"
 #include <svx/strings.hrc>
 #include <svx/svxids.hrc>
 #include <svx/dialmgr.hxx>
diff --git a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
index 5c736b620b2b..6238a607f2f7 100644
--- a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
+++ b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
@@ -37,9 +37,9 @@
 #include <vcl/salbtype.hxx>
 #include <svtools/toolbarmenu.hxx>
 #include <svx/tbcontrl.hxx>
-#include "sfx2/opengrf.hxx"
+#include <sfx2/opengrf.hxx>
 #include <o3tl/make_unique.hxx>
-#include "bitmaps.hlst"
+#include <bitmaps.hlst>
 
 using namespace css;
 using namespace css::uno;
diff --git a/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx b/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx
index 6ac50e56ab38..464b9a1d43b2 100644
--- a/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx
+++ b/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 #include <sfx2/sidebar/ControlFactory.hxx>
-#include <GraphicPropertyPanel.hxx>
+#include "GraphicPropertyPanel.hxx"
 #include <svx/strings.hrc>
 #include <svx/svxids.hrc>
 #include <svx/dialmgr.hxx>
diff --git a/svx/source/sidebar/line/LinePropertyPanel.cxx b/svx/source/sidebar/line/LinePropertyPanel.cxx
index a2285eb6ad04..4047cd5f89c7 100644
--- a/svx/source/sidebar/line/LinePropertyPanel.cxx
+++ b/svx/source/sidebar/line/LinePropertyPanel.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 #include <sfx2/sidebar/ControlFactory.hxx>
-#include <LinePropertyPanel.hxx>
+#include "LinePropertyPanel.hxx"
 #include <svx/strings.hrc>
 #include <svx/svxids.hrc>
 #include <svx/dialmgr.hxx>
diff --git a/svx/source/sidebar/line/LinePropertyPanelBase.cxx b/svx/source/sidebar/line/LinePropertyPanelBase.cxx
index b0cc6c354e66..43a1867ae3cf 100644
--- a/svx/source/sidebar/line/LinePropertyPanelBase.cxx
+++ b/svx/source/sidebar/line/LinePropertyPanelBase.cxx
@@ -46,7 +46,7 @@
 #include <svx/xlnedit.hxx>
 #include <svx/xlncapit.hxx>
 #include <svx/xlinjoit.hxx>
-#include "bitmaps.hlst"
+#include <bitmaps.hlst>
 
 using namespace css;
 using namespace css::uno;
diff --git a/svx/source/sidebar/line/LineWidthPopup.cxx b/svx/source/sidebar/line/LineWidthPopup.cxx
index b811fe90dc4f..bb9df56b2afa 100644
--- a/svx/source/sidebar/line/LineWidthPopup.cxx
+++ b/svx/source/sidebar/line/LineWidthPopup.cxx
@@ -24,7 +24,7 @@
 #include <unotools/viewoptions.hxx>
 #include <vcl/svapp.hxx>
 #include "LineWidthValueSet.hxx"
-#include "bitmaps.hlst"
+#include <bitmaps.hlst>
 
 namespace svx { namespace sidebar {
 
diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
index 86c17ccf8198..4b7fbf56c016 100644
--- a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
+++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
@@ -28,7 +28,7 @@
 #include <vcl/settings.hxx>
 #include <svx/svxids.hrc>
 #include <svl/intitem.hxx>
-#include "svx/dialmgr.hxx"
+#include <svx/dialmgr.hxx>
 #include <sfx2/objsh.hxx>
 #include <svtools/unitconv.hxx>
 
diff --git a/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx b/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx
index eacdf09ad734..ccad5be1d498 100644
--- a/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx
+++ b/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx
@@ -7,7 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <ShadowPropertyPanel.hxx>
+#include "ShadowPropertyPanel.hxx"
 #include <comphelper/string.hxx>
 #include <sfx2/sidebar/ControlFactory.hxx>
 #include <svx/colorbox.hxx>
diff --git a/svx/source/sidebar/shapes/DefaultShapesPanel.cxx b/svx/source/sidebar/shapes/DefaultShapesPanel.cxx
index c67e24a2328f..dc074df94e6c 100644
--- a/svx/source/sidebar/shapes/DefaultShapesPanel.cxx
+++ b/svx/source/sidebar/shapes/DefaultShapesPanel.cxx
@@ -16,7 +16,7 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#include "DefaultShapesPanel.hxx"
+#include <DefaultShapesPanel.hxx>
 
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
 #include <comphelper/dispatchcommand.hxx>
diff --git a/svx/source/sidebar/shapes/ShapesUtil.cxx b/svx/source/sidebar/shapes/ShapesUtil.cxx
index c17972756727..0c87543edc27 100644
--- a/svx/source/sidebar/shapes/ShapesUtil.cxx
+++ b/svx/source/sidebar/shapes/ShapesUtil.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "ShapesUtil.hxx"
+#include <ShapesUtil.hxx>
 #include <map>
 #include <rtl/ustring.hxx>
 
diff --git a/svx/source/sidebar/text/TextCharacterSpacingControl.cxx b/svx/source/sidebar/text/TextCharacterSpacingControl.cxx
index e43c423fc694..aee423d0b99e 100644
--- a/svx/source/sidebar/text/TextCharacterSpacingControl.cxx
+++ b/svx/source/sidebar/text/TextCharacterSpacingControl.cxx
@@ -29,7 +29,7 @@
 #include <vcl/settings.hxx>
 #include <vcl/lstbox.hxx>
 #include <svl/itempool.hxx>
-#include "helpids.h"
+#include <helpids.h>
 
 #define SPACING_VERY_TIGHT  -30
 #define SPACING_TIGHT       -15
diff --git a/svx/source/sidebar/text/TextUnderlineControl.cxx b/svx/source/sidebar/text/TextUnderlineControl.cxx
index 1e2870f80503..408602fb1053 100644
--- a/svx/source/sidebar/text/TextUnderlineControl.cxx
+++ b/svx/source/sidebar/text/TextUnderlineControl.cxx
@@ -25,7 +25,7 @@
 #include <editeng/editids.hrc>
 #include <editeng/udlnitem.hxx>
 #include <vcl/settings.hxx>
-#include "helpids.h"
+#include <helpids.h>
 
 namespace svx {
 
diff --git a/svx/source/sidebar/tools/ValueSetWithTextControl.cxx b/svx/source/sidebar/tools/ValueSetWithTextControl.cxx
index 8330edccb1b0..da7800057b48 100644
--- a/svx/source/sidebar/tools/ValueSetWithTextControl.cxx
+++ b/svx/source/sidebar/tools/ValueSetWithTextControl.cxx
@@ -16,7 +16,7 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#include "svx/sidebar/ValueSetWithTextControl.hxx"
+#include <svx/sidebar/ValueSetWithTextControl.hxx>
 #include <svx/strings.hrc>
 #include <svx/dialmgr.hxx>
 #include <sfx2/sidebar/Theme.hxx>
diff --git a/svx/source/stbctrls/insctrl.cxx b/svx/source/stbctrls/insctrl.cxx
index 42bdbe3718e0..dc3bb8222dbd 100644
--- a/svx/source/stbctrls/insctrl.cxx
+++ b/svx/source/stbctrls/insctrl.cxx
@@ -24,7 +24,7 @@
 
 #include <svx/strings.hrc>
 
-#include "svx/insctrl.hxx"
+#include <svx/insctrl.hxx>
 #include <svx/dialmgr.hxx>
 
 SFX_IMPL_STATUSBAR_CONTROL(SvxInsertStatusBarControl, SfxBoolItem);
diff --git a/svx/source/stbctrls/modctrl.cxx b/svx/source/stbctrls/modctrl.cxx
index d152013e86c0..b7d92a7063da 100644
--- a/svx/source/stbctrls/modctrl.cxx
+++ b/svx/source/stbctrls/modctrl.cxx
@@ -30,7 +30,7 @@
 
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include "modctrl_internal.hxx"
-#include "bitmaps.hlst"
+#include <bitmaps.hlst>
 
 using ::com::sun::star::uno::Sequence;
 using ::com::sun::star::beans::PropertyValue;
diff --git a/svx/source/stbctrls/pszctrl.cxx b/svx/source/stbctrls/pszctrl.cxx
index afa7e6a6da54..1ad57366f88a 100644
--- a/svx/source/stbctrls/pszctrl.cxx
+++ b/svx/source/stbctrls/pszctrl.cxx
@@ -32,18 +32,18 @@
 #include <sfx2/objsh.hxx>
 #include <svl/intitem.hxx>
 
-#include "svx/pszctrl.hxx"
+#include <svx/pszctrl.hxx>
 
 #define PAINT_OFFSET    5
 
 #include <editeng/sizeitem.hxx>
 #include <svx/dialmgr.hxx>
-#include "svx/dlgutil.hxx"
+#include <svx/dlgutil.hxx>
 #include "stbctrls.h"
 
 #include <svx/strings.hrc>
 #include <svx/svxids.hrc>
-#include "bitmaps.hlst"
+#include <bitmaps.hlst>
 #include <unotools/localedatawrapper.hxx>
 #include <comphelper/processfactory.hxx>
 
diff --git a/svx/source/stbctrls/selctrl.cxx b/svx/source/stbctrls/selctrl.cxx
index 79e7237c350c..6a59e61d4864 100644
--- a/svx/source/stbctrls/selctrl.cxx
+++ b/svx/source/stbctrls/selctrl.cxx
@@ -29,7 +29,7 @@
 #include <svx/strings.hrc>
 
 #include "stbctrls.h"
-#include "bitmaps.hlst"
+#include <bitmaps.hlst>
 
 SFX_IMPL_STATUSBAR_CONTROL(SvxSelectionModeControl, SfxUInt16Item);
 
diff --git a/svx/source/stbctrls/xmlsecctrl.cxx b/svx/source/stbctrls/xmlsecctrl.cxx
index 0d7f9035db7e..90e8b55fbe36 100644
--- a/svx/source/stbctrls/xmlsecctrl.cxx
+++ b/svx/source/stbctrls/xmlsecctrl.cxx
@@ -35,9 +35,9 @@
 
 #include <svx/strings.hrc>
 #include <svx/dialmgr.hxx>
-#include "svx/xmlsecctrl.hxx"
+#include <svx/xmlsecctrl.hxx>
 #include <tools/urlobj.hxx>
-#include "bitmaps.hlst"
+#include <bitmaps.hlst>
 
 SFX_IMPL_STATUSBAR_CONTROL( XmlSecStatusBarControl, SfxUInt16Item );
 
diff --git a/svx/source/stbctrls/zoomctrl.cxx b/svx/source/stbctrls/zoomctrl.cxx
index 74474e78a71f..cf9b42cbc833 100644
--- a/svx/source/stbctrls/zoomctrl.cxx
+++ b/svx/source/stbctrls/zoomctrl.cxx
@@ -34,7 +34,7 @@
 #include "stbctrls.h"
 #include <svx/dialmgr.hxx>
 #include "modctrl_internal.hxx"
-#include "bitmaps.hlst"
+#include <bitmaps.hlst>
 
 SFX_IMPL_STATUSBAR_CONTROL(SvxZoomStatusBarControl,SvxZoomItem);
 
diff --git a/svx/source/stbctrls/zoomsliderctrl.cxx b/svx/source/stbctrls/zoomsliderctrl.cxx
index b4a491319a00..53ad2619b4b4 100644
--- a/svx/source/stbctrls/zoomsliderctrl.cxx
+++ b/svx/source/stbctrls/zoomsliderctrl.cxx
@@ -27,7 +27,7 @@
 #include <svx/dialmgr.hxx>
 #include <svx/strings.hrc>
 #include <basegfx/utils/zoomtools.hxx>
-#include "bitmaps.hlst"
+#include <bitmaps.hlst>
 
 #include <set>
 
diff --git a/svx/source/svdraw/ActionDescriptionProvider.cxx b/svx/source/svdraw/ActionDescriptionProvider.cxx
index 9ca98e9f7d2e..4c3c939143d7 100644
--- a/svx/source/svdraw/ActionDescriptionProvider.cxx
+++ b/svx/source/svdraw/ActionDescriptionProvider.cxx
@@ -18,9 +18,9 @@
  */
 
 
-#include "svx/ActionDescriptionProvider.hxx"
-#include "svdglob.hxx"
-#include "svx/strings.hrc"
+#include <svx/ActionDescriptionProvider.hxx>
+#include <svdglob.hxx>
+#include <svx/strings.hrc>
 
 OUString ActionDescriptionProvider::createDescription( ActionType eActionType
                         , const OUString& rObjectName )
diff --git a/svx/source/svdraw/polypolygoneditor.cxx b/svx/source/svdraw/polypolygoneditor.cxx
index a3edb77872e8..e9d9ee6d58cb 100644
--- a/svx/source/svdraw/polypolygoneditor.cxx
+++ b/svx/source/svdraw/polypolygoneditor.cxx
@@ -21,7 +21,7 @@
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
 
-#include "svx/polypolygoneditor.hxx"
+#include <svx/polypolygoneditor.hxx>
 
 namespace sdr {
 
diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx
index 583df3f853de..1bde1afca7f0 100644
--- a/svx/source/svdraw/svdattr.cxx
+++ b/svx/source/svdraw/svdattr.cxx
@@ -30,10 +30,10 @@
 #include <com/sun/star/drawing/CircleKind.hpp>
 #include <com/sun/star/uno/Sequence.hxx>
 
-#include "editeng/boxitem.hxx"
-#include "editeng/lineitem.hxx"
-#include "editeng/shaditem.hxx"
-#include "editeng/xmlcnitm.hxx"
+#include <editeng/boxitem.hxx>
+#include <editeng/lineitem.hxx>
+#include <editeng/shaditem.hxx>
+#include <editeng/xmlcnitm.hxx>
 #include <comphelper/processfactory.hxx>
 #include <editeng/adjustitem.hxx>
 #include <editeng/editdata.hxx>
@@ -47,8 +47,8 @@
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 
-#include "svdglob.hxx"
-#include "svx/strings.hrc"
+#include <svdglob.hxx>
+#include <svx/strings.hrc>
 
 #include <svx/dialmgr.hxx>
 #include <svx/sdgcpitm.hxx>
diff --git a/svx/source/svdraw/svdcrtv.cxx b/svx/source/svdraw/svdcrtv.cxx
index 165cfde3e8e1..bb9b66ad7beb 100644
--- a/svx/source/svdraw/svdcrtv.cxx
+++ b/svx/source/svdraw/svdcrtv.cxx
@@ -19,7 +19,7 @@
 
 
 #include <svx/svdcrtv.hxx>
-#include "svx/xattr.hxx"
+#include <svx/xattr.hxx>
 #include <svx/svdundo.hxx>
 #include <svx/svdocapt.hxx>
 #include <svx/svdoedge.hxx>
@@ -35,7 +35,7 @@
 #include <svx/sdr/overlay/overlaypolypolygon.hxx>
 #include <svx/sdr/overlay/overlaymanager.hxx>
 #include <svx/sdrpaintwindow.hxx>
-#include "fmobj.hxx"
+#include <fmobj.hxx>
 #include <svx/svdocirc.hxx>
 #include <svx/sdr/contact/viewcontact.hxx>
 #include <svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx>
diff --git a/svx/source/svdraw/svddrgmt.cxx b/svx/source/svdraw/svddrgmt.cxx
index 77107880917c..714d4e66a334 100644
--- a/svx/source/svdraw/svddrgmt.cxx
+++ b/svx/source/svdraw/svddrgmt.cxx
@@ -24,7 +24,7 @@
 #include <o3tl/numeric.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
-#include "svx/xattr.hxx"
+#include <svx/xattr.hxx>
 #include <svx/xpoly.hxx>
 #include <svx/svdetc.hxx>
 #include <svx/svdtrans.hxx>
@@ -32,7 +32,7 @@
 #include <svx/svdmark.hxx>
 #include <svx/svdocapt.hxx>
 #include <svx/svdpagv.hxx>
-#include "svdglob.hxx"
+#include <svdglob.hxx>
 #include <svx/svddrgv.hxx>
 #include <svx/svdograf.hxx>
 #include <svx/strings.hrc>
@@ -53,7 +53,7 @@
 #include <svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx>
 #include <drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx>
 #include <svx/sdr/contact/objectcontact.hxx>
-#include "svx/svditer.hxx"
+#include <svx/svditer.hxx>
 #include <svx/svdopath.hxx>
 #include <svx/polypolygoneditor.hxx>
 #include <drawinglayer/primitive2d/polypolygonprimitive2d.hxx>
diff --git a/svx/source/svdraw/svddrgv.cxx b/svx/source/svdraw/svddrgv.cxx
index 738d19496dee..d5734123d5f9 100644
--- a/svx/source/svdraw/svddrgv.cxx
+++ b/svx/source/svdraw/svddrgv.cxx
@@ -20,7 +20,7 @@
 
 #include <svx/svddrgv.hxx>
 #include <svx/svdview.hxx>
-#include "svx/xattr.hxx"
+#include <svx/xattr.hxx>
 #include <svx/xpoly.hxx>
 #include <svx/svdetc.hxx>
 #include <svx/svdtrans.hxx>
@@ -29,8 +29,8 @@
 #include <svx/svdpagv.hxx>
 #include <svx/svdopath.hxx>
 #include <svx/svdoedge.hxx>
-#include "svx/strings.hrc"
-#include "svdglob.hxx"
+#include <svx/strings.hrc>
+#include <svdglob.hxx>
 #include "svddrgm1.hxx"
 #include <svx/obj3d.hxx>
 #include <svx/svdoashp.hxx>
diff --git a/svx/source/svdraw/svdedtv.cxx b/svx/source/svdraw/svdedtv.cxx
index e8360d172314..48466c060487 100644
--- a/svx/source/svdraw/svdedtv.cxx
+++ b/svx/source/svdraw/svdedtv.cxx
@@ -29,8 +29,8 @@
 #include <svx/svdpagv.hxx>
 #include <svx/svdpage.hxx>
 #include <svx/svdpoev.hxx>
-#include "svx/strings.hrc"
-#include "svdglob.hxx"
+#include <svx/strings.hrc>
+#include <svdglob.hxx>
 #include <svx/e3dsceneupdater.hxx>
 #include <rtl/strbuf.hxx>
 #include <svx/svdview.hxx>
diff --git a/svx/source/svdraw/svdedtv1.cxx b/svx/source/svdraw/svdedtv1.cxx
index 4ca76bccc993..fa3f7e43b2eb 100644
--- a/svx/source/svdraw/svdedtv1.cxx
+++ b/svx/source/svdraw/svdedtv1.cxx
@@ -28,10 +28,10 @@
 #include <tools/bigint.hxx>
 #include <vcl/msgbox.hxx>
 
-#include "getallcharpropids.hxx"
-#include "svdglob.hxx"
-#include "svx/svditer.hxx"
-#include "svx/strings.hrc"
+#include <getallcharpropids.hxx>
+#include <svdglob.hxx>
+#include <svx/svditer.hxx>
+#include <svx/strings.hrc>
 
 #include <svx/AffineMatrixItem.hxx>
 #include <svx/e3dsceneupdater.hxx>
diff --git a/svx/source/svdraw/svdedtv2.cxx b/svx/source/svdraw/svdedtv2.cxx
index 8d39724d7356..64a26a2553db 100644
--- a/svx/source/svdraw/svdedtv2.cxx
+++ b/svx/source/svdraw/svdedtv2.cxx
@@ -25,10 +25,10 @@
 #include <svx/svdopath.hxx>
 #include <svx/svdpage.hxx>
 #include <svx/svdpagv.hxx>
-#include "svx/svditer.hxx"
+#include <svx/svditer.hxx>
 #include <svx/svdograf.hxx>
 #include <svx/svdoole2.hxx>
-#include "svdglob.hxx"
+#include <svdglob.hxx>
 #include "svdfmtf.hxx"
 #include <svx/svdetc.hxx>
 #include <sfx2/basedlgs.hxx>
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index c8ee3a7b5fff..d20912eb62d9 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -37,19 +37,19 @@
 #include <svx/sdtfchim.hxx>
 #include <svx/svdotext.hxx>
 #include <svx/svdundo.hxx>
-#include "svx/svditer.hxx"
-#include "svx/svdpagv.hxx"
-#include "svx/svdpage.hxx"
-#include "svx/svdetc.hxx"
-#include "svx/svdotable.hxx"
+#include <svx/svditer.hxx>
+#include <svx/svdpagv.hxx>
+#include <svx/svdpage.hxx>
+#include <svx/svdetc.hxx>
+#include <svx/svdotable.hxx>
 #include <svx/selectioncontroller.hxx>
 #ifdef DBG_UTIL
 #include <svdibrow.hxx>
 #endif
 #include <svx/svddrgv.hxx>
-#include "svx/strings.hrc"
-#include "svdglob.hxx"
-#include "svx/globl3d.hxx"
+#include <svx/strings.hrc>
+#include <svdglob.hxx>
+#include <svx/globl3d.hxx>
 #include <svx/textchain.hxx>
 #include <svx/textchaincursor.hxx>
 #include <editeng/outliner.hxx>
diff --git a/svx/source/svdraw/svdetc.cxx b/svx/source/svdraw/svdetc.cxx
index f866ace9b8db..9816a4db0327 100644
--- a/svx/source/svdraw/svdetc.cxx
+++ b/svx/source/svdraw/svdetc.cxx
@@ -17,17 +17,17 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "sal/config.h"
+#include <sal/config.h>
 
-#include "editeng/forbiddencharacterstable.hxx"
-#include "officecfg/Office/Common.hxx"
+#include <editeng/forbiddencharacterstable.hxx>
+#include <officecfg/Office/Common.hxx>
 #include <svx/dialmgr.hxx>
 #include <svx/svdetc.hxx>
 #include <svx/svdmodel.hxx>
 #include <svx/svdtrans.hxx>
-#include "svdglob.hxx"
-#include "svx/strings.hrc"
-#include "svx/svdviter.hxx"
+#include <svdglob.hxx>
+#include <svx/strings.hrc>
+#include <svx/svdviter.hxx>
 #include <svx/svdview.hxx>
 #include <svx/svdoutl.hxx>
 #include <vcl/bitmapaccess.hxx>
@@ -35,7 +35,7 @@
 #include <editeng/eeitem.hxx>
 #include <svl/itemset.hxx>
 #include <svl/whiter.hxx>
-#include "editeng/fontitem.hxx"
+#include <editeng/fontitem.hxx>
 #include <editeng/colritem.hxx>
 #include <editeng/fhgtitem.hxx>
 #include <svx/xgrad.hxx>
diff --git a/svx/source/svdraw/svdglev.cxx b/svx/source/svdraw/svdglev.cxx
index 01445226af17..86f3212841b1 100644
--- a/svx/source/svdraw/svdglev.cxx
+++ b/svx/source/svdraw/svdglev.cxx
@@ -22,8 +22,8 @@
 #include <math.h>
 
 #include <svx/svdundo.hxx>
-#include "svx/strings.hrc"
-#include "svdglob.hxx"
+#include <svx/strings.hrc>
+#include <svdglob.hxx>
 #include <svx/svdpagv.hxx>
 #include <svx/svdglue.hxx>
 #include <svx/svdtrans.hxx>
diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx
index 78d21f265bfe..20333046bb89 100644
--- a/svx/source/svdraw/svdhdl.cxx
+++ b/svx/source/svdraw/svdhdl.cxx
@@ -32,8 +32,8 @@
 #include <vcl/bitmapaccess.hxx>
 
 #include <svx/sxekitm.hxx>
-#include "svx/strings.hrc"
-#include "svdglob.hxx"
+#include <svx/strings.hrc>
+#include <svdglob.hxx>
 
 #include <svx/svdmodel.hxx>
 #include "gradtrns.hxx"
@@ -67,7 +67,7 @@
 #include <drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx>
 #include <drawinglayer/primitive2d/polygonprimitive2d.hxx>
 #include <memory>
-#include "bitmaps.hlst"
+#include <bitmaps.hlst>
 
 // #i15222#
 // Due to the resource problems in Win95/98 with bitmap resources I
diff --git a/svx/source/svdraw/svdibrow.cxx b/svx/source/svdraw/svdibrow.cxx
index cf739d14adca..71fc3f5c29f7 100644
--- a/svx/source/svdraw/svdibrow.cxx
+++ b/svx/source/svdraw/svdibrow.cxx
@@ -20,8 +20,8 @@
 #include <stdlib.h>
 #include <limits>
 
-#include "editeng/fontitem.hxx"
-#include "svdibrow.hxx"
+#include <editeng/fontitem.hxx>
+#include <svdibrow.hxx>
 #include <editeng/charscaleitem.hxx>
 #include <editeng/colritem.hxx>
 #include <editeng/editdata.hxx>
diff --git a/svx/source/svdraw/svditer.cxx b/svx/source/svdraw/svditer.cxx
index 39a1b2c19d39..859b9d3390a4 100644
--- a/svx/source/svdraw/svditer.cxx
+++ b/svx/source/svdraw/svditer.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "svx/svditer.hxx"
+#include <svx/svditer.hxx>
 #include <svx/svdpage.hxx>
 #include <svx/svdogrp.hxx>
 #include <svx/svdobj.hxx>
diff --git a/svx/source/svdraw/svdlayer.cxx b/svx/source/svdraw/svdlayer.cxx
index 0cfa87c62b5a..a3b0cf980370 100644
--- a/svx/source/svdraw/svdlayer.cxx
+++ b/svx/source/svdraw/svdlayer.cxx
@@ -21,8 +21,8 @@
 
 #include <svx/svdlayer.hxx>
 #include <svx/svdmodel.hxx>
-#include "svdglob.hxx"
-#include "svx/strings.hrc"
+#include <svdglob.hxx>
+#include <svx/strings.hrc>
 
 bool SdrLayerIDSet::IsEmpty() const
 {
diff --git a/svx/source/svdraw/svdmark.cxx b/svx/source/svdraw/svdmark.cxx
index 8eb0cb86a504..a21f14874bdb 100644
--- a/svx/source/svdraw/svdmark.cxx
+++ b/svx/source/svdraw/svdmark.cxx
@@ -24,13 +24,13 @@
 #include <svx/svdetc.hxx>
 #include <svx/svdobj.hxx>
 #include <svx/svdpage.hxx>
-#include "svx/svditer.hxx"
+#include <svx/svditer.hxx>
 #include <svx/svdpagv.hxx>
 #include <svx/svdopath.hxx>
 #include <svx/svdogrp.hxx>
 #include <svx/svdorect.hxx>
-#include "svx/strings.hrc"
-#include "svdglob.hxx"
+#include <svx/strings.hrc>
+#include <svdglob.hxx>
 
 
 #include <svx/obj3d.hxx>
diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx
index 124fd1741b29..3c5d2fb245b8 100644
--- a/svx/source/svdraw/svdmodel.cxx
+++ b/svx/source/svdraw/svdmodel.cxx
@@ -50,7 +50,7 @@
 
 #include <svx/xtable.hxx>
 
-#include "svx/svditer.hxx"
+#include <svx/svditer.hxx>
 #include <svx/svdtrans.hxx>
 #include <svx/svdpage.hxx>
 #include <svx/svdlayer.hxx>
@@ -62,22 +62,22 @@
 #include <svx/svdetc.hxx>
 #include <svx/svdoutl.hxx>
 #include <svx/svdoole2.hxx>
-#include "svdglob.hxx"
-#include "svx/strings.hrc"
-#include "svdoutlinercache.hxx"
+#include <svdglob.hxx>
+#include <svx/strings.hrc>
+#include <svdoutlinercache.hxx>
 
-#include "svx/xflclit.hxx"
-#include "svx/xlnclit.hxx"
+#include <svx/xflclit.hxx>
+#include <svx/xlnclit.hxx>
 
-#include "officecfg/Office/Common.hxx"
-#include "editeng/fontitem.hxx"
+#include <officecfg/Office/Common.hxx>
+#include <editeng/fontitem.hxx>
 #include <editeng/colritem.hxx>
 #include <editeng/fhgtitem.hxx>
 #include <svl/style.hxx>
 #include <editeng/numitem.hxx>
 #include <editeng/bulletitem.hxx>
 #include <editeng/outlobj.hxx>
-#include "editeng/forbiddencharacterstable.hxx"
+#include <editeng/forbiddencharacterstable.hxx>
 #include <svl/zforlist.hxx>
 #include <comphelper/servicehelper.hxx>
 #include <comphelper/storagehelper.hxx>
diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx
index 61286258cc0f..e44ece39364f 100644
--- a/svx/source/svdraw/svdmrkv.cxx
+++ b/svx/source/svdraw/svdmrkv.cxx
@@ -21,7 +21,7 @@
 #include <svx/svdmrkv.hxx>
 #include <svx/svdetc.hxx>
 #include <svx/svdoedge.hxx>
-#include "svdglob.hxx"
+#include <svdglob.hxx>
 #include <svx/svdview.hxx>
 #include <svx/svdpagv.hxx>
 #include <svx/svdpage.hxx>
@@ -37,7 +37,7 @@
 #include "gradtrns.hxx"
 #include <svx/xflftrit.hxx>
 #include <svx/dialmgr.hxx>
-#include "svx/strings.hrc"
+#include <svx/strings.hrc>
 #include <svx/svdundo.hxx>
 #include <svx/svdopath.hxx>
 #include <svx/scene3d.hxx>
diff --git a/svx/source/svdraw/svdmrkv1.cxx b/svx/source/svdraw/svdmrkv1.cxx
index 5957c18331e6..b83a99f82c84 100644
--- a/svx/source/svdraw/svdmrkv1.cxx
+++ b/svx/source/svdraw/svdmrkv1.cxx
@@ -21,7 +21,7 @@
 #include <svx/svdmrkv.hxx>
 #include <svx/svdetc.hxx>
 #include <svx/svdoedge.hxx>
-#include "svdglob.hxx"
+#include <svdglob.hxx>
 #include <svx/svdpagv.hxx>
 #include <svx/svdpage.hxx>
 #include "svddrgm1.hxx"
diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx
index 0f2946b8a236..2e22f915fd5c 100644
--- a/svx/source/svdraw/svdoashp.cxx
+++ b/svx/source/svdraw/svdoashp.cxx
@@ -18,7 +18,7 @@
  */
 
 #include <svx/svdoashp.hxx>
-#include "svx/unoapi.hxx"
+#include <svx/unoapi.hxx>
 #include <svx/unoshape.hxx>
 #include <ucbhelper/content.hxx>
 #include <unotools/datetime.hxx>
@@ -40,22 +40,22 @@
 #include <svx/svddrgmt.hxx>
 #include <svx/svdmodel.hxx>
 #include <svx/svdpage.hxx>
-#include "svx/svditer.hxx"
+#include <svx/svditer.hxx>
 #include <svx/svdobj.hxx>
 #include <svx/svdtrans.hxx>
 #include <svx/svdetc.hxx>
 #include <svx/svdoedge.hxx>
-#include "svdglob.hxx"
-#include "svx/strings.hrc"
+#include <svdglob.hxx>
+#include <svx/strings.hrc>
 #include <editeng/eeitem.hxx>
-#include "editeng/editstat.hxx"
+#include <editeng/editstat.hxx>
 #include <editeng/adjustitem.hxx>
 #include <svx/svdoutl.hxx>
 #include <editeng/outlobj.hxx>
 #include <svx/sdtfchim.hxx>
-#include "svx/EnhancedCustomShapeGeometry.hxx"
-#include "svx/EnhancedCustomShapeTypeNames.hxx"
-#include "svx/EnhancedCustomShape2d.hxx"
+#include <svx/EnhancedCustomShapeGeometry.hxx>
+#include <svx/EnhancedCustomShapeTypeNames.hxx>
+#include <svx/EnhancedCustomShape2d.hxx>
 #include <com/sun/star/beans/PropertyValues.hpp>
 #include <com/sun/star/drawing/EnhancedCustomShapeAdjustmentValue.hpp>
 #include <com/sun/star/drawing/EnhancedCustomShapeParameterPair.hpp>
diff --git a/svx/source/svdraw/svdoattr.cxx b/svx/source/svdraw/svdoattr.cxx
index 1897e2194364..08e27c156d94 100644
--- a/svx/source/svdraw/svdoattr.cxx
+++ b/svx/source/svdraw/svdoattr.cxx
@@ -46,7 +46,7 @@
 
 #include <editeng/editdata.hxx>
 #include <editeng/colritem.hxx>
-#include "editeng/fontitem.hxx"
+#include <editeng/fontitem.hxx>
 #include <editeng/fhgtitem.hxx>
 
 #include <svx/xlnstcit.hxx>
@@ -70,7 +70,7 @@
 #include <svx/xlnstit.hxx>
 #include <sdr/properties/attributeproperties.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
-#include "svx/xlinjoit.hxx"
+#include <svx/xlinjoit.hxx>
 
 using namespace com::sun::star;
 
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index b2dd3a2fc6c8..27783e1c9111 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -20,7 +20,7 @@
 #include <svx/svdobj.hxx>
 #include <config_features.h>
 
-#include "sal/config.h"
+#include <sal/config.h>
 
 #include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/text/RelOrientation.hpp>
@@ -54,10 +54,10 @@
 #include <vcl/virdev.hxx>
 #include <vector>
 
-#include "svx/shapepropertynotifier.hxx"
-#include "svdglob.hxx"
-#include "svx/svdotable.hxx"
-#include "svx/xlinjoit.hxx"
+#include <svx/shapepropertynotifier.hxx>
+#include <svdglob.hxx>
+#include <svx/svdotable.hxx>
+#include <svx/xlinjoit.hxx>
 
 #include <svx/fmmodel.hxx>
 #include <svx/sdr/contact/displayinfo.hxx>
diff --git a/svx/source/svdraw/svdocapt.cxx b/svx/source/svdraw/svdocapt.cxx
index f28001060498..803cc72b6313 100644
--- a/svx/source/svdraw/svdocapt.cxx
+++ b/svx/source/svdraw/svdocapt.cxx
@@ -32,8 +32,8 @@
 #include <tools/helpers.hxx>
 
 #include "svdconv.hxx"
-#include "svdglob.hxx"
-#include "svx/strings.hrc"
+#include <svdglob.hxx>
+#include <svx/strings.hrc>
 
 #include <sdr/contact/viewcontactofsdrcaptionobj.hxx>
 #include <sdr/properties/captionproperties.hxx>
diff --git a/svx/source/svdraw/svdocirc.cxx b/svx/source/svdraw/svdocirc.cxx
index 19e54d9f655b..6809d0cd95b5 100644
--- a/svx/source/svdraw/svdocirc.cxx
+++ b/svx/source/svdraw/svdocirc.cxx
@@ -26,8 +26,8 @@
 #include <math.h>
 #include <svl/style.hxx>
 
-#include "svdglob.hxx"
-#include "svx/strings.hrc"
+#include <svdglob.hxx>
+#include <svx/strings.hrc>
 
 #include <sdr/contact/viewcontactofsdrcircobj.hxx>
 #include <sdr/properties/circleproperties.hxx>
diff --git a/svx/source/svdraw/svdoedge.cxx b/svx/source/svdraw/svdoedge.cxx
index 1b4cd734e72c..7e45a2b3cdae 100644
--- a/svx/source/svdraw/svdoedge.cxx
+++ b/svx/source/svdraw/svdoedge.cxx
@@ -18,8 +18,8 @@
  */
 
 #include "svddrgm1.hxx"
-#include "svdglob.hxx"
-#include "svx/strings.hrc"
+#include <svdglob.hxx>
+#include <svx/strings.hrc>
 
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx
index b20dee08c4aa..d34c02ed9f9e 100644
--- a/svx/source/svdraw/svdograf.cxx
+++ b/svx/source/svdraw/svdograf.cxx
@@ -36,14 +36,14 @@
 #include <sfx2/linkmgr.hxx>
 #include <sfx2/docfile.hxx>
 #include <svx/svdetc.hxx>
-#include "svdglob.hxx"
-#include "svx/strings.hrc"
+#include <svdglob.hxx>
+#include <svx/strings.hrc>
 #include <svx/svdpool.hxx>
 #include <svx/svdmodel.hxx>
 #include <svx/svdpage.hxx>
 #include <svx/svdmrkv.hxx>
 #include <svx/svdpagv.hxx>
-#include "svx/svdviter.hxx"
+#include <svx/svdviter.hxx>
 #include <svx/svdview.hxx>
 #include <svx/svdograf.hxx>
 #include <svx/svdogrp.hxx>
diff --git a/svx/source/svdraw/svdogrp.cxx b/svx/source/svdraw/svdogrp.cxx
index a0aa17fc7852..b0eb00aeebd6 100644
--- a/svx/source/svdraw/svdogrp.cxx
+++ b/svx/source/svdraw/svdogrp.cxx
@@ -32,13 +32,13 @@
 
 #include <svx/svdmodel.hxx>
 #include <svx/svdpage.hxx>
-#include "svx/svditer.hxx"
+#include <svx/svditer.hxx>
 #include <svx/svdobj.hxx>
 #include <svx/svdtrans.hxx>
 #include <svx/svdetc.hxx>
 #include <svx/svdoedge.hxx>
-#include "svdglob.hxx"
-#include "svx/strings.hrc"
+#include <svdglob.hxx>
+#include <svx/strings.hrc>
 
 #include <svx/svxids.hrc>
 #include <svl/whiter.hxx>
diff --git a/svx/source/svdraw/svdomeas.cxx b/svx/source/svdraw/svdomeas.cxx
index 9d557e38e30f..5e472c7bc277 100644
--- a/svx/source/svdraw/svdomeas.cxx
+++ b/svx/source/svdraw/svdomeas.cxx
@@ -18,8 +18,8 @@
  */
 
 #include "svdconv.hxx"
-#include "svdglob.hxx"
-#include "svx/strings.hrc"
+#include <svdglob.hxx>
+#include <svx/strings.hrc>
 
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
diff --git a/svx/source/svdraw/svdomedia.cxx b/svx/source/svdraw/svdomedia.cxx
index 94156e43d939..1dc58e0e258b 100644
--- a/svx/source/svdraw/svdomedia.cxx
+++ b/svx/source/svdraw/svdomedia.cxx
@@ -34,8 +34,8 @@
 #include <vcl/svapp.hxx>
 
 #include <svx/svdmodel.hxx>
-#include "svdglob.hxx"
-#include "svx/strings.hrc"
+#include <svdglob.hxx>
+#include <svx/strings.hrc>
 #include <svx/sdr/contact/viewcontactofsdrmediaobj.hxx>
 #include <avmedia/mediawindow.hxx>
 
diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx
index d2b0470196b7..a6141cbdbfde 100644
--- a/svx/source/svdraw/svdoole2.cxx
+++ b/svx/source/svdraw/svdoole2.cxx
@@ -68,11 +68,11 @@
 
 #include <svx/charthelper.hxx>
 #include <svx/svdmodel.hxx>
-#include "svdglob.hxx"
-#include "svx/strings.hrc"
+#include <svdglob.hxx>
+#include <svx/strings.hrc>
 #include <svx/svdetc.hxx>
 #include <svx/svdview.hxx>
-#include "unomlstr.hxx"
+#include <unomlstr.hxx>
 #include <sdr/contact/viewcontactofsdrole2obj.hxx>
 #include <svx/svdograf.hxx>
 #include <sdr/properties/oleproperties.hxx>
@@ -85,7 +85,7 @@
 #include <editeng/outlobj.hxx>
 #include <svx/svdpage.hxx>
 #include <rtl/ref.hxx>
-#include "bitmaps.hlst"
+#include <bitmaps.hlst>
 
 using namespace ::com::sun::star;
 
diff --git a/svx/source/svdraw/svdopage.cxx b/svx/source/svdraw/svdopage.cxx
index 315af8d7f0bd..a2a6592037ee 100644
--- a/svx/source/svdraw/svdopage.cxx
+++ b/svx/source/svdraw/svdopage.cxx
@@ -19,8 +19,8 @@
 
 
 #include <svx/svdopage.hxx>
-#include "svdglob.hxx"
-#include "svx/strings.hrc"
+#include <svdglob.hxx>
+#include <svx/strings.hrc>
 #include <svx/svdtrans.hxx>
 #include <svx/svdetc.hxx>
 #include <svx/svdmodel.hxx>
diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx
index f6cb2bcf48e7..c4f6e5acd8ff 100644
--- a/svx/source/svdraw/svdopath.cxx
+++ b/svx/source/svdraw/svdopath.cxx
@@ -31,8 +31,8 @@
 #include <svx/svdpage.hxx>
 #include <svx/svdhdl.hxx>
 #include <svx/svdview.hxx>
-#include "svdglob.hxx"
-#include "svx/strings.hrc"
+#include <svdglob.hxx>
+#include <svx/strings.hrc>
 
 #include <svx/xlnwtit.hxx>
 #include <svx/xlnclit.hxx>
diff --git a/svx/source/svdraw/svdorect.cxx b/svx/source/svdraw/svdorect.cxx
index e0e48dc5a720..fea7ecd0fc2a 100644
--- a/svx/source/svdraw/svdorect.cxx
+++ b/svx/source/svdraw/svdorect.cxx
@@ -34,8 +34,8 @@
 #include <svx/svdview.hxx>
 #include <svx/svdundo.hxx>
 #include <svx/svdopath.hxx>
-#include "svdglob.hxx"
-#include "svx/strings.hrc"
+#include <svdglob.hxx>
+#include <svx/strings.hrc>
 #include <svx/xflclit.hxx>
 #include <svx/xlnclit.hxx>
 #include <svx/xlnwtit.hxx>
diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index 0664ccb84a61..f6ef59cdddf8 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -26,8 +26,8 @@
 #include <svx/svdetc.hxx>
 #include <svx/svdoutl.hxx>
 #include <svx/svdmodel.hxx>
-#include "svdglob.hxx"
-#include "svx/strings.hrc"
+#include <svdglob.hxx>
+#include <svx/strings.hrc>
 #include <editeng/writingmodeitem.hxx>
 #include <svx/sdtfchim.hxx>
 #include <svtools/colorcfg.hxx>
diff --git a/svx/source/svdraw/svdotxdr.cxx b/svx/source/svdraw/svdotxdr.cxx
index 9d04162eb189..7f8973e78b4b 100644
--- a/svx/source/svdraw/svdotxdr.cxx
+++ b/svx/source/svdraw/svdotxdr.cxx
@@ -23,8 +23,8 @@
 #include <svx/svddrag.hxx>
 #include <svx/svdview.hxx>
 #include <svx/svdorect.hxx>
-#include "svdglob.hxx"
-#include "svx/strings.hrc"
+#include <svdglob.hxx>
+#include <svx/strings.hrc>
 #include <svx/svdoashp.hxx>
 #include <tools/bigint.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
diff --git a/svx/source/svdraw/svdotxln.cxx b/svx/source/svdraw/svdotxln.cxx
index eeb2d1409ea7..0f28c039e00b 100644
--- a/svx/source/svdraw/svdotxln.cxx
+++ b/svx/source/svdraw/svdotxln.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "sal/config.h"
+#include <sal/config.h>
 
 #include <comphelper/processfactory.hxx>
 #include <osl/file.hxx>
diff --git a/svx/source/svdraw/svdouno.cxx b/svx/source/svdraw/svdouno.cxx
index bf4058831da6..37bf711b05d2 100644
--- a/svx/source/svdraw/svdouno.cxx
+++ b/svx/source/svdraw/svdouno.cxx
@@ -37,12 +37,12 @@
 #include <svx/svdouno.hxx>
 #include <svx/svdpagv.hxx>
 #include <svx/svdmodel.hxx>
-#include "svdglob.hxx"
-#include "svx/strings.hrc"
+#include <svdglob.hxx>
+#include <svx/strings.hrc>
 #include <svx/svdetc.hxx>
 #include <svx/svdview.hxx>
 #include <svx/svdorect.hxx>
-#include "svx/svdviter.hxx"
+#include <svx/svdviter.hxx>
 #include <rtl/ref.hxx>
 #include <set>
 #include <svx/sdrpagewindow.hxx>
diff --git a/svx/source/svdraw/svdoutlinercache.cxx b/svx/source/svdraw/svdoutlinercache.cxx
index 65c29b44ad02..bd95f359fe1a 100644
--- a/svx/source/svdraw/svdoutlinercache.cxx
+++ b/svx/source/svdraw/svdoutlinercache.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "svdoutlinercache.hxx"
+#include <svdoutlinercache.hxx>
 #include <svx/svdoutl.hxx>
 #include <svx/svdmodel.hxx>
 #include <svx/svdetc.hxx>
diff --git a/svx/source/svdraw/svdpage.cxx b/svx/source/svdraw/svdpage.cxx
index cbb88446eec2..30b6c306348b 100644
--- a/svx/source/svdraw/svdpage.cxx
+++ b/svx/source/svdraw/svdpage.cxx
@@ -38,7 +38,7 @@
 #include <svx/svdograf.hxx>
 #include <svx/svdoedge.hxx>
 #include <svx/svdoole2.hxx>
-#include "svx/svditer.hxx"
+#include <svx/svditer.hxx>
 #include <svx/svdmodel.hxx>
 #include <svx/svdlayer.hxx>
 #include <svx/svdotext.hxx>
diff --git a/svx/source/svdraw/svdpagv.cxx b/svx/source/svdraw/svdpagv.cxx
index 1d7b060b4796..5f502bf1ed0d 100644
--- a/svx/source/svdraw/svdpagv.cxx
+++ b/svx/source/svdraw/svdpagv.cxx
@@ -31,7 +31,7 @@
 #include <editeng/outliner.hxx>
 #include <svx/svdetc.hxx>
 #include <svx/svdobj.hxx>
-#include "svx/svditer.hxx"
+#include <svx/svditer.hxx>
 #include <svx/svdogrp.hxx>
 #include <svx/svdtypes.hxx>
 #include <svx/svdoole2.hxx>
diff --git a/svx/source/svdraw/svdpntv.cxx b/svx/source/svdraw/svdpntv.cxx
index 55d03f0b8bbb..51174785edff 100644
--- a/svx/source/svdraw/svdpntv.cxx
+++ b/svx/source/svdraw/svdpntv.cxx
@@ -37,7 +37,7 @@
 #include <svx/svdobj.hxx>
 #include <svx/svdograf.hxx>
 #include <svdibrow.hxx>
-#include "svx/svditer.hxx"
+#include <svx/svditer.hxx>
 #include <svx/svdouno.hxx>
 #include <svx/sdr/overlay/overlayobjectlist.hxx>
 #include <sdr/overlay/overlayrollingrectangle.hxx>
diff --git a/svx/source/svdraw/svdpoev.cxx b/svx/source/svdraw/svdpoev.cxx
index 71dbd1c800b5..0ea5fc21ee64 100644
--- a/svx/source/svdraw/svdpoev.cxx
+++ b/svx/source/svdraw/svdpoev.cxx
@@ -24,8 +24,8 @@
 #include <svx/svdpage.hxx>
 #include <svx/svdopath.hxx>
 #include <svx/svdundo.hxx>
-#include "svx/strings.hrc"
-#include "svdglob.hxx"
+#include <svx/strings.hrc>
+#include <svdglob.hxx>
 #include <svx/svdtrans.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
diff --git a/svx/source/svdraw/svdsnpv.cxx b/svx/source/svdraw/svdsnpv.cxx
index 7a3113e88ea0..24478a7ac13e 100644
--- a/svx/source/svdraw/svdsnpv.cxx
+++ b/svx/source/svdraw/svdsnpv.cxx
@@ -25,7 +25,7 @@
 #include <svx/svdobj.hxx>
 #include <svx/svdpagv.hxx>
 #include <svx/svdpage.hxx>
-#include "svx/svditer.hxx"
+#include <svx/svditer.hxx>
 #include <svx/sdr/overlay/overlayobjectlist.hxx>
 #include <sdr/overlay/overlaycrosshair.hxx>
 #include <sdr/overlay/overlayhelpline.hxx>
diff --git a/svx/source/svdraw/svdtext.cxx b/svx/source/svdraw/svdtext.cxx
index 0390a58e2c32..3e76f3fec202 100644
--- a/svx/source/svdraw/svdtext.cxx
+++ b/svx/source/svdraw/svdtext.cxx
@@ -17,12 +17,12 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "svx/svdotext.hxx"
-#include "svx/svdetc.hxx"
-#include "editeng/outlobj.hxx"
-#include "svx/svdoutl.hxx"
-#include "svx/svdmodel.hxx"
-#include "editeng/fhgtitem.hxx"
+#include <svx/svdotext.hxx>
+#include <svx/svdetc.hxx>
+#include <editeng/outlobj.hxx>
+#include <svx/svdoutl.hxx>
+#include <svx/svdmodel.hxx>
+#include <editeng/fhgtitem.hxx>
 #include <editeng/eeitem.hxx>
 #include <svl/itemset.hxx>
 #include <libxml/xmlwriter.h>
diff --git a/svx/source/svdraw/svdundo.cxx b/svx/source/svdraw/svdundo.cxx
index c7a27c9140ef..ba26e624d777 100644
--- a/svx/source/svdraw/svdundo.cxx
+++ b/svx/source/svdraw/svdundo.cxx
@@ -29,8 +29,8 @@
 #include <svx/svdmodel.hxx>
 #include <svx/svdview.hxx>
 #include <svx/xfillit0.hxx>
-#include "svx/strings.hrc"
-#include "svdglob.hxx"
+#include <svx/strings.hrc>
+#include <svdglob.hxx>
 #include <svx/scene3d.hxx>
 #include <editeng/editdata.hxx>
 #include <editeng/outlobj.hxx>
diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx
index 02087710a195..b93bd1da7afc 100644
--- a/svx/source/svdraw/svdview.cxx
+++ b/svx/source/svdraw/svdview.cxx
@@ -20,8 +20,8 @@
 #include <editeng/eeitem.hxx>
 #include <editeng/outlobj.hxx>
 
-#include "svx/strings.hrc"
-#include "svdglob.hxx"
+#include <svx/strings.hrc>
+#include <svdglob.hxx>
 #include <svx/svdpagv.hxx>
 #include <svx/svdmrkv.hxx>
 #include <svx/svdedxv.hxx>
@@ -35,13 +35,13 @@
 #include <svdibrow.hxx>
 #endif
 
-#include "svx/svdoutl.hxx"
-#include "svx/svdview.hxx"
-#include "editeng/editview.hxx"
-#include "editeng/flditem.hxx"
-#include "svx/obj3d.hxx"
-#include "svx/svddrgmt.hxx"
-#include "svx/svdotable.hxx"
+#include <svx/svdoutl.hxx>
+#include <svx/svdview.hxx>
+#include <editeng/editview.hxx>
+#include <editeng/flditem.hxx>
+#include <svx/obj3d.hxx>
+#include <svx/svddrgmt.hxx>
+#include <svx/svdotable.hxx>
 #include <tools/tenccvt.hxx>
 #include <svx/sdr/overlay/overlaypolypolygon.hxx>
 #include <svx/sdr/overlay/overlaymanager.hxx>
diff --git a/svx/source/svdraw/svdviter.cxx b/svx/source/svdraw/svdviter.cxx
index b4e70e9432c5..3c0ab9badb08 100644
--- a/svx/source/svdraw/svdviter.cxx
+++ b/svx/source/svdraw/svdviter.cxx
@@ -18,7 +18,7 @@
  */
 
 
-#include "svx/svdviter.hxx"
+#include <svx/svdviter.hxx>
 #include <svx/svdobj.hxx>
 #include <svx/svdpage.hxx>
 #include <svx/svdmodel.hxx>
diff --git a/svx/source/svdraw/svdxcgv.cxx b/svx/source/svdraw/svdxcgv.cxx
index 38db94a5aa37..6be43e323202 100644
--- a/svx/source/svdraw/svdxcgv.cxx
+++ b/svx/source/svdraw/svdxcgv.cxx
@@ -35,9 +35,9 @@
 #include <svx/svdpage.hxx>
 #include <svx/svdpagv.hxx>
 #include <svx/svdtrans.hxx>
-#include "svx/strings.hrc"
-#include "svdglob.hxx"
-#include "svx/xoutbmp.hxx"
+#include <svx/strings.hrc>
+#include <svdglob.hxx>
+#include <svx/xoutbmp.hxx>
 #include <vcl/metaact.hxx>
 #include <svl/poolitem.hxx>
 #include <svl/itempool.hxx>
diff --git a/svx/source/table/accessiblecell.cxx b/svx/source/table/accessiblecell.cxx
index 15dddd2e571f..08754ad21160 100644
--- a/svx/source/table/accessiblecell.cxx
+++ b/svx/source/table/accessiblecell.cxx
@@ -22,9 +22,9 @@
 #include <memory>
 #include <utility>
 
-#include <accessiblecell.hxx>
+#include "accessiblecell.hxx"
 
-#include "svx/DescriptionGenerator.hxx"
+#include <svx/DescriptionGenerator.hxx>
 
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
diff --git a/svx/source/table/accessiblecell.hxx b/svx/source/table/accessiblecell.hxx
index ab62d8b24f3b..aae99550d083 100644
--- a/svx/source/table/accessiblecell.hxx
+++ b/svx/source/table/accessiblecell.hxx
@@ -36,7 +36,7 @@
 
 #include <cppuhelper/implbase.hxx>
 
-#include "cell.hxx"
+#include <cell.hxx>
 
 
 namespace accessibility
diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx
index 45508802c0d7..234b4665bb85 100644
--- a/svx/source/table/cell.cxx
+++ b/svx/source/table/cell.cxx
@@ -36,24 +36,24 @@
 #include <vcl/svapp.hxx>
 #include <libxml/xmlwriter.h>
 
-#include "sdr/properties/textproperties.hxx"
-#include "editeng/outlobj.hxx"
-#include "editeng/writingmodeitem.hxx"
-#include "svx/svdotable.hxx"
-#include "svx/svdoutl.hxx"
-#include "svx/unoshtxt.hxx"
-#include "svx/svdmodel.hxx"
-
-#include "getallcharpropids.hxx"
+#include <sdr/properties/textproperties.hxx>
+#include <editeng/outlobj.hxx>
+#include <editeng/writingmodeitem.hxx>
+#include <svx/svdotable.hxx>
+#include <svx/svdoutl.hxx>
+#include <svx/unoshtxt.hxx>
+#include <svx/svdmodel.hxx>
+
+#include <getallcharpropids.hxx>
 #include "tableundo.hxx"
-#include "cell.hxx"
-#include "svx/unoshprp.hxx"
-#include "svx/unoshape.hxx"
-#include "editeng/editobj.hxx"
-#include "editeng/boxitem.hxx"
+#include <cell.hxx>
+#include <svx/unoshprp.hxx>
+#include <svx/unoshape.hxx>
+#include <editeng/editobj.hxx>
+#include <editeng/boxitem.hxx>
 #include <editeng/charrotateitem.hxx>
-#include "svx/xflbstit.hxx"
-#include "svx/xflbmtit.hxx"
+#include <svx/xflbstit.hxx>
+#include <svx/xflbmtit.hxx>
 #include <svx/svdpool.hxx>
 
 
diff --git a/svx/source/table/cellcursor.cxx b/svx/source/table/cellcursor.cxx
index a0289ae3f95b..db68fdb61ab4 100644
--- a/svx/source/table/cellcursor.cxx
+++ b/svx/source/table/cellcursor.cxx
@@ -17,16 +17,16 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "sal/config.h"
+#include <sal/config.h>
 
-#include "com/sun/star/lang/NoSupportException.hpp"
-#include "svx/svdotable.hxx"
+#include <com/sun/star/lang/NoSupportException.hpp>
+#include <svx/svdotable.hxx>
 #include "cellcursor.hxx"
 #include "tablelayouter.hxx"
-#include "cell.hxx"
-#include "svx/svdmodel.hxx"
-#include "svx/strings.hrc"
-#include "svdglob.hxx"
+#include <cell.hxx>
+#include <svx/svdmodel.hxx>
+#include <svx/strings.hrc>
+#include <svdglob.hxx>
 
 
 using namespace ::com::sun::star::uno;
diff --git a/svx/source/table/cellrange.hxx b/svx/source/table/cellrange.hxx
index c3955c415778..43ced6fc8756 100644
--- a/svx/source/table/cellrange.hxx
+++ b/svx/source/table/cellrange.hxx
@@ -23,7 +23,7 @@
 #include <com/sun/star/table/XCellRange.hpp>
 #include <cppuhelper/implbase1.hxx>
 
-#include "tablemodel.hxx"
+#include <tablemodel.hxx>
 
 
 namespace sdr { namespace table {
diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx
index dd80fa44dbac..1e8b2a59e6bf 100644
--- a/svx/source/table/svdotable.cxx
+++ b/svx/source/table/svdotable.cxx
@@ -30,33 +30,33 @@
 #include <basegfx/polygon/b2dpolypolygon.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <svl/style.hxx>
-#include "editeng/editstat.hxx"
-#include "editeng/outlobj.hxx"
-#include "svx/svdview.hxx"
-#include "sdr/properties/textproperties.hxx"
-#include "svx/svdotable.hxx"
-#include "svx/svdhdl.hxx"
+#include <editeng/editstat.hxx>
+#include <editeng/outlobj.hxx>
+#include <svx/svdview.hxx>
+#include <sdr/properties/textproperties.hxx>
+#include <svx/svdotable.hxx>
+#include <svx/svdhdl.hxx>
 #include "viewcontactoftableobj.hxx"
-#include "svx/svdoutl.hxx"
-#include "svx/svddrag.hxx"
-#include "svx/svdpagv.hxx"
-#include "tablemodel.hxx"
-#include "cell.hxx"
-#include "svx/xflclit.hxx"
+#include <svx/svdoutl.hxx>
+#include <svx/svddrag.hxx>
+#include <svx/svdpagv.hxx>
+#include <tablemodel.hxx>
+#include <cell.hxx>
+#include <svx/xflclit.hxx>
 #include "tablelayouter.hxx"
-#include "svx/svdetc.hxx"
+#include <svx/svdetc.hxx>
 #include "tablehandles.hxx"
-#include "editeng/boxitem.hxx"
-#include "svx/framelink.hxx"
-#include "svx/sdr/table/tabledesign.hxx"
-#include "svx/svdundo.hxx"
-#include "svx/strings.hrc"
-#include "svdglob.hxx"
-#include "editeng/writingmodeitem.hxx"
-#include "editeng/frmdiritem.hxx"
-#include "svx/xflhtit.hxx"
-#include "svx/xflftrit.hxx"
-#include "svx/xfltrit.hxx"
+#include <editeng/boxitem.hxx>
+#include <svx/framelink.hxx>
+#include <svx/sdr/table/tabledesign.hxx>
+#include <svx/svdundo.hxx>
+#include <svx/strings.hrc>
+#include <svdglob.hxx>
+#include <editeng/writingmodeitem.hxx>
+#include <editeng/frmdiritem.hxx>
+#include <svx/xflhtit.hxx>
+#include <svx/xflftrit.hxx>
+#include <svx/xfltrit.hxx>
 #include <cppuhelper/implbase.hxx>
 #include <libxml/xmlwriter.h>
 
diff --git a/svx/source/table/tablecolumn.cxx b/svx/source/table/tablecolumn.cxx
index c7fc17be00f5..e6f1c4a77b6b 100644
--- a/svx/source/table/tablecolumn.cxx
+++ b/svx/source/table/tablecolumn.cxx
@@ -23,8 +23,8 @@
 
 #include "tablecolumn.hxx"
 #include "tableundo.hxx"
-#include "svx/svdmodel.hxx"
-#include "svx/svdotable.hxx"
+#include <svx/svdmodel.hxx>
+#include <svx/svdotable.hxx>
 
 
 using namespace ::com::sun::star::uno;
diff --git a/svx/source/table/tablecolumn.hxx b/svx/source/table/tablecolumn.hxx
index 711a4c0c3847..691bb69b4593 100644
--- a/svx/source/table/tablecolumn.hxx
+++ b/svx/source/table/tablecolumn.hxx
@@ -25,7 +25,7 @@
 #include <cppuhelper/implbase.hxx>
 
 #include "propertyset.hxx"
-#include "tablemodel.hxx"
+#include <tablemodel.hxx>
 
 
 namespace sdr { namespace table {
diff --git a/svx/source/table/tablecolumns.hxx b/svx/source/table/tablecolumns.hxx
index 778a1cae6031..97d77d3e9054 100644
--- a/svx/source/table/tablecolumns.hxx
+++ b/svx/source/table/tablecolumns.hxx
@@ -23,7 +23,7 @@
 #include <com/sun/star/table/XTableColumns.hpp>
 #include <cppuhelper/implbase1.hxx>
 
-#include "tablemodel.hxx"
+#include <tablemodel.hxx>
 
 
 namespace sdr { namespace table {
diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx
index 7c8e2992f698..2ffa6c6b1f83 100644
--- a/svx/source/table/tablecontroller.cxx
+++ b/svx/source/table/tablecontroller.cxx
@@ -47,21 +47,21 @@
 #include <svx/svdpagv.hxx>
 #include <svx/svdetc.hxx>
 #include <editeng/editobj.hxx>
-#include "editeng/editstat.hxx"
-#include "editeng/unolingu.hxx"
-#include "svx/sdrpagewindow.hxx"
+#include <editeng/editstat.hxx>
+#include <editeng/unolingu.hxx>
+#include <svx/sdrpagewindow.hxx>
 #include <svx/selectioncontroller.hxx>
 #include <svx/svdmodel.hxx>
-#include "svx/sdrpaintwindow.hxx"
+#include <svx/sdrpaintwindow.hxx>
 #include <svx/svxdlg.hxx>
 #include <editeng/boxitem.hxx>
-#include "cell.hxx"
+#include <cell.hxx>
 #include <editeng/borderline.hxx>
 #include <editeng/colritem.hxx>
-#include "editeng/lineitem.hxx"
-#include "svx/strings.hrc"
-#include "svdglob.hxx"
-#include "svx/svdpage.hxx"
+#include <editeng/lineitem.hxx>
+#include <svx/strings.hrc>
+#include <svdglob.hxx>
+#include <svx/svdpage.hxx>
 #include "tableundo.hxx"
 #include "tablelayouter.hxx"
 #include <vcl/msgbox.hxx>
diff --git a/svx/source/table/tabledesign.cxx b/svx/source/table/tabledesign.cxx
index 8796bb7e649e..69701ad708d7 100644
--- a/svx/source/table/tabledesign.cxx
+++ b/svx/source/table/tabledesign.cxx
@@ -39,12 +39,12 @@
 #include <cppuhelper/supportsservice.hxx>
 #include <comphelper/sequence.hxx>
 
-#include "svx/unoprov.hxx"
-#include "svx/sdr/table/tabledesign.hxx"
-#include "svx/dialmgr.hxx"
-#include "svx/strings.hrc"
+#include <svx/unoprov.hxx>
+#include <svx/sdr/table/tabledesign.hxx>
+#include <svx/dialmgr.hxx>
+#include <svx/strings.hrc>
 
-#include "celltypes.hxx"
+#include <celltypes.hxx>
 
 #include <vector>
 #include <map>
diff --git a/svx/source/table/tablelayouter.cxx b/svx/source/table/tablelayouter.cxx
index 359df376c1c6..2c38af69da0d 100644
--- a/svx/source/table/tablelayouter.cxx
+++ b/svx/source/table/tablelayouter.cxx
@@ -23,20 +23,20 @@
 #include <tools/gen.hxx>
 #include <libxml/xmlwriter.h>
 
-#include "cell.hxx"
+#include <cell.hxx>
 #include "cellrange.hxx"
-#include "tablemodel.hxx"
+#include <tablemodel.hxx>
 #include "tablerow.hxx"
 #include "tablerows.hxx"
 #include "tablecolumn.hxx"
 #include "tablecolumns.hxx"
 #include "tablelayouter.hxx"
-#include "svx/svdotable.hxx"
-#include "editeng/borderline.hxx"
-#include "editeng/boxitem.hxx"
-#include "svx/svdmodel.hxx"
-#include "svx/strings.hrc"
-#include "svdglob.hxx"
+#include <svx/svdotable.hxx>
+#include <editeng/borderline.hxx>
+#include <editeng/boxitem.hxx>
+#include <svx/svdmodel.hxx>
+#include <svx/strings.hrc>
+#include <svdglob.hxx>
 
 using ::editeng::SvxBorderLine;
 using namespace ::com::sun::star::uno;
diff --git a/svx/source/table/tablelayouter.hxx b/svx/source/table/tablelayouter.hxx
index cf577e905437..c5f1ca99c367 100644
--- a/svx/source/table/tablelayouter.hxx
+++ b/svx/source/table/tablelayouter.hxx
@@ -29,7 +29,7 @@
 #include <vector>
 #include <map>
 
-#include "svx/svdotable.hxx"
+#include <svx/svdotable.hxx>
 
 namespace tools { class Rectangle; }
 
diff --git a/svx/source/table/tablemodel.cxx b/svx/source/table/tablemodel.cxx
index 31a5e5ac3a0e..2f8c94dc4636 100644
--- a/svx/source/table/tablemodel.cxx
+++ b/svx/source/table/tablemodel.cxx
@@ -28,18 +28,18 @@
 #include <osl/mutex.hxx>
 #include <libxml/xmlwriter.h>
 
-#include "cell.hxx"
+#include <cell.hxx>
 #include "cellcursor.hxx"
-#include "tablemodel.hxx"
+#include <tablemodel.hxx>
 #include "tablerow.hxx"
 #include "tablerows.hxx"
 #include "tablecolumn.hxx"
 #include "tablecolumns.hxx"
 #include "tableundo.hxx"
-#include "svx/svdotable.hxx"
-#include "svx/svdmodel.hxx"
-#include "svx/strings.hrc"
-#include "svdglob.hxx"
+#include <svx/svdotable.hxx>
+#include <svx/svdmodel.hxx>
+#include <svx/strings.hrc>
+#include <svdglob.hxx>
 
 using namespace ::osl;
 using namespace ::com::sun::star::uno;
diff --git a/svx/source/table/tablerow.cxx b/svx/source/table/tablerow.cxx
index 2f0df692c9bf..43010ad698fe 100644
--- a/svx/source/table/tablerow.cxx
+++ b/svx/source/table/tablerow.cxx
@@ -21,11 +21,11 @@
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 
-#include "cell.hxx"
+#include <cell.hxx>
 #include "tablerow.hxx"
 #include "tableundo.hxx"
-#include "svx/svdmodel.hxx"
-#include "svx/svdotable.hxx"
+#include <svx/svdmodel.hxx>
+#include <svx/svdotable.hxx>
 
 
 using namespace ::com::sun::star::uno;
diff --git a/svx/source/table/tablerow.hxx b/svx/source/table/tablerow.hxx
index 57c836d64548..5c14452831b1 100644
--- a/svx/source/table/tablerow.hxx
+++ b/svx/source/table/tablerow.hxx
@@ -25,7 +25,7 @@
 #include <cppuhelper/implbase.hxx>
 
 #include "propertyset.hxx"
-#include "tablemodel.hxx"
+#include <tablemodel.hxx>
 
 
 namespace sdr { namespace table {
diff --git a/svx/source/table/tablerows.cxx b/svx/source/table/tablerows.cxx
index f0c4e7593ab2..572210ce1bb3 100644
--- a/svx/source/table/tablerows.cxx
+++ b/svx/source/table/tablerows.cxx
@@ -20,7 +20,7 @@
 
 #include <com/sun/star/lang/DisposedException.hpp>
 
-#include "cell.hxx"
+#include <cell.hxx>
 #include "tablerow.hxx"
 #include "tablerows.hxx"
 
diff --git a/svx/source/table/tablerows.hxx b/svx/source/table/tablerows.hxx
index cdd665d56d9b..f2d5ca571271 100644
--- a/svx/source/table/tablerows.hxx
+++ b/svx/source/table/tablerows.hxx
@@ -23,7 +23,7 @@
 #include <com/sun/star/table/XTableRows.hpp>
 #include <cppuhelper/implbase1.hxx>
 
-#include "tablemodel.hxx"
+#include <tablemodel.hxx>
 
 
 namespace sdr { namespace table {
diff --git a/svx/source/table/tablertfexporter.cxx b/svx/source/table/tablertfexporter.cxx
index 23808e5a70d3..cf54d971184e 100644
--- a/svx/source/table/tablertfexporter.cxx
+++ b/svx/source/table/tablertfexporter.cxx
@@ -33,12 +33,12 @@
 #include <editeng/postitem.hxx>
 #include <editeng/udlnitem.hxx>
 
-#include "cell.hxx"
-#include "celltypes.hxx"
-#include "svx/svdotable.hxx"
-#include "svx/svdoutl.hxx"
-#include "editeng/editeng.hxx"
-#include "editeng/outlobj.hxx"
+#include <cell.hxx>
+#include <celltypes.hxx>
+#include <svx/svdotable.hxx>
+#include <svx/svdoutl.hxx>
+#include <editeng/editeng.hxx>
+#include <editeng/outlobj.hxx>
 
 
 using namespace ::com::sun::star::uno;
diff --git a/svx/source/table/tablertfimporter.cxx b/svx/source/table/tablertfimporter.cxx
index 61aa8c405bc9..eb09145f52db 100644
--- a/svx/source/table/tablertfimporter.cxx
+++ b/svx/source/table/tablertfimporter.cxx
@@ -32,14 +32,14 @@
 #include <editeng/fhgtitem.hxx>
 #include <editeng/outlobj.hxx>
 
-#include "cell.hxx"
-#include "celltypes.hxx"
-#include "svx/svdotable.hxx"
-#include "svx/svdoutl.hxx"
-#include "editeng/editeng.hxx"
-#include "editeng/editdata.hxx"
-#include "svx/svdmodel.hxx"
-#include "editeng/svxrtf.hxx"
+#include <cell.hxx>
+#include <celltypes.hxx>
+#include <svx/svdotable.hxx>
+#include <svx/svdoutl.hxx>
+#include <editeng/editeng.hxx>
+#include <editeng/editdata.hxx>
+#include <svx/svdmodel.hxx>
+#include <editeng/svxrtf.hxx>
 
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::table;
diff --git a/svx/source/table/tableundo.cxx b/svx/source/table/tableundo.cxx
index 70d5a2acea35..6a8573d81556 100644
--- a/svx/source/table/tableundo.cxx
+++ b/svx/source/table/tableundo.cxx
@@ -18,12 +18,12 @@
  */
 
 
-#include "sdr/properties/textproperties.hxx"
-#include "editeng/outlobj.hxx"
+#include <sdr/properties/textproperties.hxx>
+#include <editeng/outlobj.hxx>
 
-#include "cell.hxx"
+#include <cell.hxx>
 #include "tableundo.hxx"
-#include "svx/svdotable.hxx"
+#include <svx/svdotable.hxx>
 #include "tablerow.hxx"
 #include "tablecolumn.hxx"
 
diff --git a/svx/source/table/tableundo.hxx b/svx/source/table/tableundo.hxx
index 2f1d48844f29..e8077a0bceaf 100644
--- a/svx/source/table/tableundo.hxx
+++ b/svx/source/table/tableundo.hxx
@@ -23,12 +23,12 @@
 #include <com/sun/star/container/XIndexAccess.hpp>
 #include <com/sun/star/table/CellContentType.hpp>
 
-#include "svx/svdotable.hxx"
-#include "svx/svdobj.hxx"
-#include "svx/svdundo.hxx"
+#include <svx/svdotable.hxx>
+#include <svx/svdobj.hxx>
+#include <svx/svdundo.hxx>
 #include <svx/sdrobjectuser.hxx>
 
-#include "celltypes.hxx"
+#include <celltypes.hxx>
 
 namespace sdr { namespace properties {
     class TextProperties;
diff --git a/svx/source/table/viewcontactoftableobj.cxx b/svx/source/table/viewcontactoftableobj.cxx
index 13d4f7019667..e84aee4e3219 100644
--- a/svx/source/table/viewcontactoftableobj.cxx
+++ b/svx/source/table/viewcontactoftableobj.cxx
@@ -39,7 +39,7 @@
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
 #include <svx/framelink.hxx>
 
-#include "cell.hxx"
+#include <cell.hxx>
 #include "tablelayouter.hxx"
 
 
diff --git a/svx/source/tbxctrls/Palette.cxx b/svx/source/tbxctrls/Palette.cxx
index 746fc7dbbfae..a5c12db487e1 100644
--- a/svx/source/tbxctrls/Palette.cxx
+++ b/svx/source/tbxctrls/Palette.cxx
@@ -20,7 +20,7 @@
 #include <svx/Palette.hxx>
 #include <tools/stream.hxx>
 
-#include "palettes.hxx"
+#include <palettes.hxx>
 
 Palette::~Palette()
 {
diff --git a/svx/source/tbxctrls/PaletteManager.cxx b/svx/source/tbxctrls/PaletteManager.cxx
index bb5fd87bdf73..9a89e6ac4a48 100644
--- a/svx/source/tbxctrls/PaletteManager.cxx
+++ b/svx/source/tbxctrls/PaletteManager.cxx
@@ -35,7 +35,7 @@
 #include <cppu/unotype.hxx>
 #include <officecfg/Office/Common.hxx>
 
-#include "palettes.hxx"
+#include <palettes.hxx>
 
 PaletteManager::PaletteManager() :
     mnMaxRecentColors(Application::GetSettings().GetStyleSettings().GetColorValueSetColumnCount()),
diff --git a/svx/source/tbxctrls/colrctrl.cxx b/svx/source/tbxctrls/colrctrl.cxx
index 572e9fb5fbf3..7cd9995beb87 100644
--- a/svx/source/tbxctrls/colrctrl.cxx
+++ b/svx/source/tbxctrls/colrctrl.cxx
@@ -32,13 +32,13 @@
 #include <svx/colrctrl.hxx>
 
 #include <svx/svdview.hxx>
-#include "svx/drawitem.hxx"
+#include <svx/drawitem.hxx>
 #include <editeng/colritem.hxx>
-#include "svx/xattr.hxx"
+#include <svx/xattr.hxx>
 #include <svx/xtable.hxx>
 #include <svx/dialmgr.hxx>
-#include "svx/xexch.hxx"
-#include "helpids.h"
+#include <svx/xexch.hxx>
+#include <helpids.h>
 #include <vcl/svapp.hxx>
 
 using namespace com::sun::star;
diff --git a/svx/source/tbxctrls/extrusioncontrols.cxx b/svx/source/tbxctrls/extrusioncontrols.cxx
index f65b24a25a3c..1bd7380c39a7 100644
--- a/svx/source/tbxctrls/extrusioncontrols.cxx
+++ b/svx/source/tbxctrls/extrusioncontrols.cxx
@@ -36,12 +36,12 @@
 #include <svx/sdasitm.hxx>
 #include <svx/dialmgr.hxx>
 
-#include "coreservices.hxx"
-#include "helpids.h"
+#include <coreservices.hxx>
+#include <helpids.h>
 #include "extrusioncontrols.hxx"
-#include "extrusiondepthdialog.hxx"
+#include <extrusiondepthdialog.hxx>
 
-#include "bitmaps.hlst"
+#include <bitmaps.hlst>
 
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
diff --git a/svx/source/tbxctrls/extrusioncontrols.hxx b/svx/source/tbxctrls/extrusioncontrols.hxx
index d479b50279c9..1dfb6f521ad9 100644
--- a/svx/source/tbxctrls/extrusioncontrols.hxx
+++ b/svx/source/tbxctrls/extrusioncontrols.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_SVX_SOURCE_TBXCTRLS_EXTRUSIONCONTROLS_HXX
 #define INCLUDED_SVX_SOURCE_TBXCTRLS_EXTRUSIONCONTROLS_HXX
 
-#include "svx/svxdllapi.h"
+#include <svx/svxdllapi.h>
 
 #include <svtools/treelistbox.hxx>
 #include <vcl/button.hxx>
diff --git a/svx/source/tbxctrls/fillctrl.cxx b/svx/source/tbxctrls/fillctrl.cxx
index 32e421083af9..00ff498e3b63 100644
--- a/svx/source/tbxctrls/fillctrl.cxx
+++ b/svx/source/tbxctrls/fillctrl.cxx
@@ -32,13 +32,13 @@
 #define TMP_STR_BEGIN   "["
 #define TMP_STR_END     "]"
 
-#include "svx/drawitem.hxx"
-#include "svx/xattr.hxx"
+#include <svx/drawitem.hxx>
+#include <svx/xattr.hxx>
 #include <svx/xtable.hxx>
 #include <svx/fillctrl.hxx>
 #include <svx/itemwin.hxx>
 #include <svx/dialmgr.hxx>
-#include "helpids.h"
+#include <helpids.h>
 #include <memory>
 #include <o3tl/make_unique.hxx>
 
diff --git a/svx/source/tbxctrls/fontworkgallery.cxx b/svx/source/tbxctrls/fontworkgallery.cxx
index 5656adce63f3..e57e9b624a3a 100644
--- a/svx/source/tbxctrls/fontworkgallery.cxx
+++ b/svx/source/tbxctrls/fontworkgallery.cxx
@@ -44,17 +44,17 @@
 #include <svx/svdview.hxx>
 #include <svx/svdoutl.hxx>
 
-#include "svx/gallery.hxx"
+#include <svx/gallery.hxx>
 #include <svx/dlgutil.hxx>
 
 #include <svx/fontworkgallery.hxx>
-#include "coreservices.hxx"
+#include <coreservices.hxx>
 
 #include <algorithm>
 #include <memory>
 
-#include "helpids.h"
-#include "bitmaps.hlst"
+#include <helpids.h>
+#include <bitmaps.hlst>
 
 using ::svtools::ToolbarMenu;
 
diff --git a/svx/source/tbxctrls/formatpaintbrushctrl.cxx b/svx/source/tbxctrls/formatpaintbrushctrl.cxx
index 9cf36f8e1af2..43352b79098b 100644
--- a/svx/source/tbxctrls/formatpaintbrushctrl.cxx
+++ b/svx/source/tbxctrls/formatpaintbrushctrl.cxx
@@ -18,7 +18,7 @@
  */
 
 
-#include "svx/formatpaintbrushctrl.hxx"
+#include <svx/formatpaintbrushctrl.hxx>
 
 #include <svl/eitem.hxx>
 #include <sfx2/app.hxx>
diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx
index 46d95d62874c..3d4d53df8803 100644
--- a/svx/source/tbxctrls/grafctrl.cxx
+++ b/svx/source/tbxctrls/grafctrl.cxx
@@ -51,9 +51,9 @@
 #include <svx/svdograf.hxx>
 #include <svx/svdundo.hxx>
 #include <svx/svdtrans.hxx>
-#include "svx/grafctrl.hxx"
-#include "svx/tbxcolor.hxx"
-#include "bitmaps.hlst"
+#include <svx/grafctrl.hxx>
+#include <svx/tbxcolor.hxx>
+#include <bitmaps.hlst>
 
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::frame;
diff --git a/svx/source/tbxctrls/itemwin.cxx b/svx/source/tbxctrls/itemwin.cxx
index 01a189ec6ba5..c59cd6721944 100644
--- a/svx/source/tbxctrls/itemwin.cxx
+++ b/svx/source/tbxctrls/itemwin.cxx
@@ -39,11 +39,11 @@
 #include <svx/xlineit0.hxx>
 #include <svx/xlndsit.hxx>
 #include <svx/xtable.hxx>
-#include "svx/drawitem.hxx"
+#include <svx/drawitem.hxx>
 #include <svx/dialmgr.hxx>
-#include "svx/dlgutil.hxx"
+#include <svx/dlgutil.hxx>
 #include <svx/itemwin.hxx>
-#include "svx/linectrl.hxx"
+#include <svx/linectrl.hxx>
 #include <svtools/colorcfg.hxx>
 
 using namespace ::com::sun::star;
diff --git a/svx/source/tbxctrls/layctrl.cxx b/svx/source/tbxctrls/layctrl.cxx
index 9a4cecdc7453..157dca24d298 100644
--- a/svx/source/tbxctrls/layctrl.cxx
+++ b/svx/source/tbxctrls/layctrl.cxx
@@ -27,7 +27,7 @@
 
 #include <svx/strings.hrc>
 #include <svx/svxids.hrc>
-#include "svx/layctrl.hxx"
+#include <svx/layctrl.hxx>
 #include <svx/dialmgr.hxx>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/string.hxx>
diff --git a/svx/source/tbxctrls/linectrl.cxx b/svx/source/tbxctrls/linectrl.cxx
index 59a36954c913..987796504f43 100644
--- a/svx/source/tbxctrls/linectrl.cxx
+++ b/svx/source/tbxctrls/linectrl.cxx
@@ -29,12 +29,12 @@
 
 #include <svx/strings.hrc>
 #include <svx/svxids.hrc>
-#include "helpids.h"
+#include <helpids.h>
 
-#include "svx/drawitem.hxx"
-#include "svx/xattr.hxx"
+#include <svx/drawitem.hxx>
+#include <svx/xattr.hxx>
 #include <svx/xtable.hxx>
-#include "svx/linectrl.hxx"
+#include <svx/linectrl.hxx>
 #include <svx/itemwin.hxx>
 #include <svx/dialmgr.hxx>
 #include <svx/unoapi.hxx>
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 3b51e31795db..d37c0ab717cb 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -62,7 +62,7 @@
 #include <svx/strings.hrc>
 #include <svx/svxitems.hrc>
 #include <svx/svxids.hrc>
-#include "helpids.h"
+#include <helpids.h>
 #include <sfx2/htmlmode.hxx>
 #include <sfx2/sidebar/Sidebar.hxx>
 #include <sfx2/sidebar/SidebarToolBox.hxx>
@@ -86,9 +86,9 @@
 #include <editeng/cmapitem.hxx>
 #include <svx/colorwindow.hxx>
 #include <svx/colorbox.hxx>
-#include "svx/drawitem.hxx"
+#include <svx/drawitem.hxx>
 #include <svx/tbcontrl.hxx>
-#include "svx/dlgutil.hxx"
+#include <svx/dlgutil.hxx>
 #include <svx/dialmgr.hxx>
 #include <memory>
 
@@ -104,7 +104,7 @@
 #include <cppu/unotype.hxx>
 #include <officecfg/Office/Common.hxx>
 #include <o3tl/typed_flags_set.hxx>
-#include "bitmaps.hlst"
+#include <bitmaps.hlst>
 
 #define MAX_MRU_FONTNAME_ENTRIES    5
 
diff --git a/svx/source/tbxctrls/tbxcolor.cxx b/svx/source/tbxctrls/tbxcolor.cxx
index 0895fd78b24b..30a403a83d99 100644
--- a/svx/source/tbxctrls/tbxcolor.cxx
+++ b/svx/source/tbxctrls/tbxcolor.cxx
@@ -18,7 +18,7 @@
  */
 
 
-#include "svx/tbxcolor.hxx"
+#include <svx/tbxcolor.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
 
diff --git a/svx/source/tbxctrls/tbxdrctl.cxx b/svx/source/tbxctrls/tbxdrctl.cxx
index 134dc4d90559..2d0dc4c745be 100644
--- a/svx/source/tbxctrls/tbxdrctl.cxx
+++ b/svx/source/tbxctrls/tbxdrctl.cxx
@@ -28,8 +28,8 @@
 
 #include <svx/dialmgr.hxx>
 #include <svx/strings.hrc>
-#include "svx/tbxctl.hxx"
-#include "svx/tbxcolor.hxx"
+#include <svx/tbxctl.hxx>
+#include <svx/tbxcolor.hxx>
 #include <com/sun/star/frame/XLayoutManager.hpp>
 
 SFX_IMPL_TOOLBOX_CONTROL(SvxTbxCtlDraw, SfxBoolItem);
diff --git a/svx/source/toolbars/extrusionbar.cxx b/svx/source/toolbars/extrusionbar.cxx
index 3245a65aacd1..cbb57ccab32b 100644
--- a/svx/source/toolbars/extrusionbar.cxx
+++ b/svx/source/toolbars/extrusionbar.cxx
@@ -37,10 +37,10 @@
 #include <svx/strings.hrc>
 #include <svx/svdview.hxx>
 #include <editeng/colritem.hxx>
-#include "svx/chrtitem.hxx"
+#include <svx/chrtitem.hxx>
 
 #include <svx/extrusionbar.hxx>
-#include "extrusiondepthdialog.hxx"
+#include <extrusiondepthdialog.hxx>
 
 using namespace ::svx;
 using namespace ::cppu;
diff --git a/svx/source/toolbars/fontworkbar.cxx b/svx/source/toolbars/fontworkbar.cxx
index ed9f00b333b1..01a8c424117b 100644
--- a/svx/source/toolbars/fontworkbar.cxx
+++ b/svx/source/toolbars/fontworkbar.cxx
@@ -22,7 +22,7 @@
 #include <sfx2/request.hxx>
 #include <sfx2/objface.hxx>
 #include <sfx2/viewsh.hxx>
-#include "svx/unoapi.hxx"
+#include <svx/unoapi.hxx>
 #include <com/sun/star/drawing/XShape.hpp>
 #include <com/sun/star/drawing/XEnhancedCustomShapeDefaulter.hpp>
 #include <svx/dialmgr.hxx>
@@ -30,7 +30,7 @@
 #include <svx/strings.hrc>
 #include <svx/svdview.hxx>
 #include <svx/sdasitm.hxx>
-#include "svx/gallery.hxx"
+#include <svx/gallery.hxx>
 #include <svx/fmmodel.hxx>
 #include <svx/fmpage.hxx>
 #include <svl/itempool.hxx>
@@ -43,7 +43,7 @@
 
 #include <svx/svxids.hrc>
 #include <svx/fontworkbar.hxx>
-#include "svx/fontworkgallery.hxx"
+#include <svx/fontworkgallery.hxx>
 
 
 using namespace ::svx;
diff --git a/svx/source/uitest/uiobject.cxx b/svx/source/uitest/uiobject.cxx
index 8ad4827df260..496a5d179686 100644
--- a/svx/source/uitest/uiobject.cxx
+++ b/svx/source/uitest/uiobject.cxx
@@ -8,7 +8,7 @@
  */
 
 #include <memory>
-#include "uiobject.hxx"
+#include <uiobject.hxx>
 
 #include <svx/charmap.hxx>
 
diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx
index d5111a5fb29a..0653a54837b3 100644
--- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx
@@ -29,7 +29,7 @@
 #include <com/sun/star/lang/Locale.hpp>
 #include <svtools/headbar.hxx>
 #include <svtools/svlbitm.hxx>
-#include "svtools/treelistentry.hxx"
+#include <svtools/treelistentry.hxx>
 #include <vcl/msgbox.hxx>
 #include <vcl/settings.hxx>
 #include <unotools/lingucfg.hxx>
@@ -37,7 +37,7 @@
 #include <unotools/intlwrapper.hxx>
 #include <comphelper/processfactory.hxx>
 #include <vcl/svapp.hxx>
-#include "helpids.h"
+#include <helpids.h>
 
 
 namespace textconversiondlgs
diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx
index 33e9278d8e7e..d28f066fc8d5 100644
--- a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx
@@ -24,7 +24,7 @@
 #include <vcl/msgbox.hxx>
 #include <unotools/lingucfg.hxx>
 #include <unotools/linguprops.hxx>
-#include "helpids.h"
+#include <helpids.h>
 
 
 namespace textconversiondlgs
diff --git a/svx/source/unodraw/UnoGraphicExporter.cxx b/svx/source/unodraw/UnoGraphicExporter.cxx
index be8cbf8a3ebf..6da4491a778e 100644
--- a/svx/source/unodraw/UnoGraphicExporter.cxx
+++ b/svx/source/unodraw/UnoGraphicExporter.cxx
@@ -52,9 +52,9 @@
 #include <editeng/numitem.hxx>
 #include <svx/svdpagv.hxx>
 #include <svx/svdograf.hxx>
-#include "svx/xoutbmp.hxx"
+#include <svx/xoutbmp.hxx>
 #include <vcl/graphicfilter.hxx>
-#include "svx/unoapi.hxx"
+#include <svx/unoapi.hxx>
 #include <svx/svdpage.hxx>
 #include <svx/svdmodel.hxx>
 #include <svx/fmview.hxx>
@@ -64,7 +64,7 @@
 #include <editeng/eeitem.hxx>
 #include <svx/svdoutl.hxx>
 #include <editeng/flditem.hxx>
-#include <UnoGraphicExporter.hxx>
+#include "UnoGraphicExporter.hxx"
 #include <memory>
 
 #define MAX_EXT_PIX         2048
diff --git a/svx/source/unodraw/UnoNameItemTable.cxx b/svx/source/unodraw/UnoNameItemTable.cxx
index 33b72e5949f2..7e7a5e3f49d1 100644
--- a/svx/source/unodraw/UnoNameItemTable.cxx
+++ b/svx/source/unodraw/UnoNameItemTable.cxx
@@ -33,7 +33,7 @@
 #include "UnoNameItemTable.hxx"
 #include <vcl/svapp.hxx>
 
-#include "svx/unoapi.hxx"
+#include <svx/unoapi.hxx>
 #include <memory>
 
 using namespace ::com::sun::star;
diff --git a/svx/source/unodraw/UnoNamespaceMap.cxx b/svx/source/unodraw/UnoNamespaceMap.cxx
index 4eb77feb7986..9e3f264bc32b 100644
--- a/svx/source/unodraw/UnoNamespaceMap.cxx
+++ b/svx/source/unodraw/UnoNamespaceMap.cxx
@@ -20,7 +20,7 @@
 
 #include <set>
 
-#include "svx/UnoNamespaceMap.hxx"
+#include <svx/UnoNamespaceMap.hxx>
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 
@@ -28,8 +28,8 @@
 #include <cppuhelper/implbase.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <svl/itempool.hxx>
-#include "svx/unoapi.hxx"
-#include "editeng/xmlcnitm.hxx"
+#include <svx/unoapi.hxx>
+#include <editeng/xmlcnitm.hxx>
 
 using namespace ::cppu;
 using namespace ::com::sun::star;
diff --git a/svx/source/unodraw/XPropertyTable.cxx b/svx/source/unodraw/XPropertyTable.cxx
index 983f3ab9a671..bef11412087e 100644
--- a/svx/source/unodraw/XPropertyTable.cxx
+++ b/svx/source/unodraw/XPropertyTable.cxx
@@ -19,7 +19,7 @@
 
 
 #include <memory>
-#include "svx/XPropertyTable.hxx"
+#include <svx/XPropertyTable.hxx>
 #include <com/sun/star/drawing/PolyPolygonBezierCoords.hpp>
 #include <com/sun/star/drawing/LineDash.hpp>
 #include <com/sun/star/awt/Gradient.hpp>
@@ -34,7 +34,7 @@
 #include <cppuhelper/supportsservice.hxx>
 #include <svx/xdef.hxx>
 
-#include "svx/unoapi.hxx"
+#include <svx/unoapi.hxx>
 #include <editeng/unoprnms.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <basegfx/utils/unotools.hxx>
diff --git a/svx/source/unodraw/gluepts.cxx b/svx/source/unodraw/gluepts.cxx
index d3c27b391c91..a0769b73ccfe 100644
--- a/svx/source/unodraw/gluepts.cxx
+++ b/svx/source/unodraw/gluepts.cxx
@@ -29,7 +29,7 @@
 #include <svx/svdglue.hxx>
 #include <svx/svdpage.hxx>
 
-#include <gluepts.hxx>
+#include "gluepts.hxx"
 
 using namespace ::com::sun::star;
 using namespace ::cppu;
diff --git a/svx/source/unodraw/shapepropertynotifier.cxx b/svx/source/unodraw/shapepropertynotifier.cxx
index 14bef235b355..2172ae081c90 100644
--- a/svx/source/unodraw/shapepropertynotifier.cxx
+++ b/svx/source/unodraw/shapepropertynotifier.cxx
@@ -18,7 +18,7 @@
  */
 
 
-#include "svx/shapepropertynotifier.hxx"
+#include <svx/shapepropertynotifier.hxx>
 
 #include <com/sun/star/beans/XPropertySet.hpp>
 
diff --git a/svx/source/unodraw/tableshape.cxx b/svx/source/unodraw/tableshape.cxx
index aa31209b4144..2529334735d0 100644
--- a/svx/source/unodraw/tableshape.cxx
+++ b/svx/source/unodraw/tableshape.cxx
@@ -21,8 +21,8 @@
 
 #include "UnoGraphicExporter.hxx"
 #include "shapeimpl.hxx"
-#include "svx/unoshprp.hxx"
-#include "svx/svdotable.hxx"
+#include <svx/unoshprp.hxx>
+#include <svx/svdotable.hxx>
 #include <svx/svdpool.hxx>
 
 
diff --git a/svx/source/unodraw/unobtabl.cxx b/svx/source/unodraw/unobtabl.cxx
index bd8ed0861b8f..047f0b842841 100644
--- a/svx/source/unodraw/unobtabl.cxx
+++ b/svx/source/unodraw/unobtabl.cxx
@@ -26,10 +26,10 @@
 #include <svx/xbtmpit.hxx>
 #include <svx/svdmodel.hxx>
 #include <svx/xflhtit.hxx>
-#include "svx/unoapi.hxx"
+#include <svx/unoapi.hxx>
 #include <svx/unomid.hxx>
 #include <editeng/unoprnms.hxx>
-#include "svx/unofill.hxx"
+#include <svx/unofill.hxx>
 #include <editeng/memberids.h>
 
 using namespace ::com::sun::star;
diff --git a/svx/source/unodraw/unodtabl.cxx b/svx/source/unodraw/unodtabl.cxx
index 786e4d8603d4..77f0a6e8e67f 100644
--- a/svx/source/unodraw/unodtabl.cxx
+++ b/svx/source/unodraw/unodtabl.cxx
@@ -28,7 +28,7 @@
 
 #include <svx/xdash.hxx>
 #include <svx/svdmodel.hxx>
-#include "svx/unofill.hxx"
+#include <svx/unofill.hxx>
 
 using namespace ::com::sun::star;
 using namespace ::cppu;
diff --git a/svx/source/unodraw/unogtabl.cxx b/svx/source/unodraw/unogtabl.cxx
index 2b9b11071398..bfea79bcbd5d 100644
--- a/svx/source/unodraw/unogtabl.cxx
+++ b/svx/source/unodraw/unogtabl.cxx
@@ -26,7 +26,7 @@
 #include <svx/svdmodel.hxx>
 #include <svx/xdef.hxx>
 #include <svx/xflgrit.hxx>
-#include "svx/unofill.hxx"
+#include <svx/unofill.hxx>
 #include <svx/unomid.hxx>
 
 using namespace ::com::sun::star;
diff --git a/svx/source/unodraw/unohtabl.cxx b/svx/source/unodraw/unohtabl.cxx
index 5ada87d34f9f..e596d2233bd7 100644
--- a/svx/source/unodraw/unohtabl.cxx
+++ b/svx/source/unodraw/unohtabl.cxx
@@ -27,7 +27,7 @@
 #include <svx/xdef.hxx>
 #include <svx/xflhtit.hxx>
 #include <svx/unomid.hxx>
-#include "svx/unofill.hxx"
+#include <svx/unofill.hxx>
 
 using namespace ::com::sun::star;
 using namespace ::cppu;
diff --git a/svx/source/unodraw/unomlstr.cxx b/svx/source/unodraw/unomlstr.cxx
index 733404e5f075..b040dc179347 100644
--- a/svx/source/unodraw/unomlstr.cxx
+++ b/svx/source/unodraw/unomlstr.cxx
@@ -20,7 +20,7 @@
 #include <svx/svdobj.hxx>
 #include <vcl/svapp.hxx>
 
-#include "unomlstr.hxx"
+#include <unomlstr.hxx>
 
 using namespace ::com::sun::star;
 
diff --git a/svx/source/unodraw/unomod.cxx b/svx/source/unodraw/unomod.cxx
index 814c81cdc9b7..8aeb91bf8dcb 100644
--- a/svx/source/unodraw/unomod.cxx
+++ b/svx/source/unodraw/unomod.cxx
@@ -42,7 +42,7 @@
 #include <svx/unoapi.hxx>
 
 #include <svx/svdmodel.hxx>
-#include "svx/globl3d.hxx"
+#include <svx/globl3d.hxx>
 #include <svx/svdtypes.hxx>
 #include <svx/unoprov.hxx>
 #include <svx/unopage.hxx>
diff --git a/svx/source/unodraw/unomtabl.cxx b/svx/source/unodraw/unomtabl.cxx
index f64aa6449b13..1b02a964b702 100644
--- a/svx/source/unodraw/unomtabl.cxx
+++ b/svx/source/unodraw/unomtabl.cxx
@@ -43,9 +43,9 @@
 #include <vcl/svapp.hxx>
 
 
-#include "svx/unofill.hxx"
+#include <svx/unofill.hxx>
 
-#include "svx/unoapi.hxx"
+#include <svx/unoapi.hxx>
 
 using namespace ::com::sun::star;
 using namespace ::cppu;
diff --git a/svx/source/unodraw/unopage.cxx b/svx/source/unodraw/unopage.cxx
index 171a511e7e11..d437f4e07afe 100644
--- a/svx/source/unodraw/unopage.cxx
+++ b/svx/source/unodraw/unopage.cxx
@@ -39,11 +39,11 @@
 #include <svx/svdundo.hxx>
 #include <svx/unopage.hxx>
 #include "shapeimpl.hxx"
-#include "svdglob.hxx"
-#include "svx/globl3d.hxx"
+#include <svdglob.hxx>
+#include <svx/globl3d.hxx>
 #include <svx/unoprov.hxx>
 #include <svx/svdopath.hxx>
-#include "svx/unoapi.hxx"
+#include <svx/unoapi.hxx>
 #include <svx/svdomeas.hxx>
 #include <svx/extrud3d.hxx>
 #include <svx/lathe3d.hxx>
diff --git a/svx/source/unodraw/unopool.cxx b/svx/source/unodraw/unopool.cxx
index 7d7b81c58cb1..b1578b520698 100644
--- a/svx/source/unodraw/unopool.cxx
+++ b/svx/source/unodraw/unopool.cxx
@@ -24,7 +24,7 @@
 #include <comphelper/servicehelper.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <vcl/svapp.hxx>
-#include "svx/unopool.hxx"
+#include <svx/unopool.hxx>
 #include <svx/svdmodel.hxx>
 #include <svx/svdpool.hxx>
 #include <svx/unoprov.hxx>
@@ -36,7 +36,7 @@
 #include <svx/svdetc.hxx>
 #include <editeng/editeng.hxx>
 
-#include "svx/unoapi.hxx"
+#include <svx/unoapi.hxx>
 #include <memory>
 
 using namespace ::com::sun::star;
diff --git a/svx/source/unodraw/unoprov.cxx b/svx/source/unodraw/unoprov.cxx
index d3ec2aee9ee1..52576b596a3d 100644
--- a/svx/source/unodraw/unoprov.cxx
+++ b/svx/source/unodraw/unoprov.cxx
@@ -32,17 +32,17 @@
 #include <comphelper/propertysetinfo.hxx>
 #include <comphelper/sequence.hxx>
 #include <svx/dialmgr.hxx>
-#include "svx/unoapi.hxx"
+#include <svx/unoapi.hxx>
 #include <editeng/unotext.hxx>
 #include <svx/unoshprp.hxx>
 #include <editeng/editeng.hxx>
-#include "svx/globl3d.hxx"
+#include <svx/globl3d.hxx>
 #include <svx/strings.hrc>
-#include "strings.hxx"
+#include <strings.hxx>
 #include <svx/svdpool.hxx>
 #include <svx/svdobj.hxx>
 
-#include <shapeimpl.hxx>
+#include "shapeimpl.hxx"
 #include <unordered_map>
 
 using namespace ::com::sun::star;
diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx
index 3a13bdf8dedd..6b68c7dc6421 100644
--- a/svx/source/unodraw/unoshap2.cxx
+++ b/svx/source/unodraw/unoshap2.cxx
@@ -49,9 +49,9 @@
 #include <svx/svdmodel.hxx>
 #include <svx/svdouno.hxx>
 #include "shapeimpl.hxx"
-#include "svx/unoshprp.hxx"
+#include <svx/unoshprp.hxx>
 #include <svx/svdoashp.hxx>
-#include "svx/svdviter.hxx"
+#include <svx/svdviter.hxx>
 #include <svx/svdview.hxx>
 #include <svx/svdopath.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
diff --git a/svx/source/unodraw/unoshap3.cxx b/svx/source/unodraw/unoshap3.cxx
index d1e3ff9d2cb0..8b9d1b3debc3 100644
--- a/svx/source/unodraw/unoshap3.cxx
+++ b/svx/source/unodraw/unoshap3.cxx
@@ -32,14 +32,14 @@
 #include <svx/unoshape.hxx>
 #include <svx/unopage.hxx>
 #include <editeng/unoprnms.hxx>
-#include "svx/globl3d.hxx"
+#include <svx/globl3d.hxx>
 #include <svx/cube3d.hxx>
 #include <svx/sphere3d.hxx>
 #include <svx/lathe3d.hxx>
 #include <svx/extrud3d.hxx>
 #include <svx/polygn3d.hxx>
-#include "svx/unoshprp.hxx"
-#include "svx/svdmodel.hxx"
+#include <svx/unoshprp.hxx>
+#include <svx/svdmodel.hxx>
 #include <svx/scene3d.hxx>
 #include <basegfx/polygon/b3dpolygon.hxx>
 #include <basegfx/polygon/b3dpolygontools.hxx>
diff --git a/svx/source/unodraw/unoshap4.cxx b/svx/source/unodraw/unoshap4.cxx
index 3f309e678b82..0c0da807f5e2 100644
--- a/svx/source/unodraw/unoshap4.cxx
+++ b/svx/source/unodraw/unoshap4.cxx
@@ -46,11 +46,11 @@
 
 #include <svx/unoshprp.hxx>
 
-#include "svx/unoapi.hxx"
-#include "svx/svdpagv.hxx"
-#include "svx/svdview.hxx"
-#include "svdglob.hxx"
-#include "svx/strings.hrc"
+#include <svx/unoapi.hxx>
+#include <svx/svdpagv.hxx>
+#include <svx/svdview.hxx>
+#include <svdglob.hxx>
+#include <svx/strings.hrc>
 #include <vcl/wmf.hxx>
 #include <svtools/embedhlp.hxx>
 
diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx
index 031707e1d8d4..4ab0f675625f 100644
--- a/svx/source/unodraw/unoshape.cxx
+++ b/svx/source/unodraw/unoshape.cxx
@@ -32,7 +32,7 @@
 #include <editeng/unotext.hxx>
 #include <svx/svdobj.hxx>
 #include <svx/svdoole2.hxx>
-#include "svx/shapepropertynotifier.hxx"
+#include <svx/shapepropertynotifier.hxx>
 #include <comphelper/extract.hxx>
 #include <comphelper/scopeguard.hxx>
 #include <comphelper/servicehelper.hxx>
@@ -42,43 +42,43 @@
 #include <vcl/virdev.hxx>
 #include <sfx2/objsh.hxx>
 #include <sfx2/viewsh.hxx>
-#include "svx/svdopage.hxx"
-#include "svx/xflbstit.hxx"
-#include "svx/xflbmtit.hxx"
-#include "svx/xlnstit.hxx"
-#include "svx/xlnedit.hxx"
-#include "svx/svdogrp.hxx"
-#include "svx/scene3d.hxx"
-#include "svx/svdmodel.hxx"
-#include "svx/globl3d.hxx"
-#include "svx/fmglob.hxx"
-#include "svx/unopage.hxx"
-#include "svx/view3d.hxx"
-#include "svx/unoshape.hxx"
-#include "svx/svxids.hrc"
-#include "svx/unoshtxt.hxx"
-#include "svx/svdpage.hxx"
-#include "svx/unoshprp.hxx"
-#include "svx/sxciaitm.hxx"
-#include "svx/svdograf.hxx"
-#include "svx/unoapi.hxx"
-#include "svx/svdomeas.hxx"
-#include "svx/svdpagv.hxx"
-#include "svx/svdpool.hxx"
+#include <svx/svdopage.hxx>
+#include <svx/xflbstit.hxx>
+#include <svx/xflbmtit.hxx>
+#include <svx/xlnstit.hxx>
+#include <svx/xlnedit.hxx>
+#include <svx/svdogrp.hxx>
+#include <svx/scene3d.hxx>
+#include <svx/svdmodel.hxx>
+#include <svx/globl3d.hxx>
+#include <svx/fmglob.hxx>
+#include <svx/unopage.hxx>
+#include <svx/view3d.hxx>
+#include <svx/unoshape.hxx>
+#include <svx/svxids.hrc>
+#include <svx/unoshtxt.hxx>
+#include <svx/svdpage.hxx>
+#include <svx/unoshprp.hxx>
+#include <svx/sxciaitm.hxx>
+#include <svx/svdograf.hxx>
+#include <svx/unoapi.hxx>
+#include <svx/svdomeas.hxx>
+#include <svx/svdpagv.hxx>
+#include <svx/svdpool.hxx>
 #include <tools/gen.hxx>
-#include "svx/dialmgr.hxx"
-#include "svx/strings.hrc"
-#include "svx/svdocapt.hxx"
+#include <svx/dialmgr.hxx>
+#include <svx/strings.hrc>
+#include <svx/svdocapt.hxx>
 #include <svx/obj3d.hxx>
 #include <tools/diagnose_ex.h>
-#include "svx/xflftrit.hxx"
-#include "svx/xtable.hxx"
-#include "svx/xbtmpit.hxx"
-#include "svx/xflgrit.hxx"
-#include "svx/xflhtit.hxx"
-#include "svx/xlndsit.hxx"
-#include "svdglob.hxx"
-#include "svx/unomaster.hxx"
+#include <svx/xflftrit.hxx>
+#include <svx/xtable.hxx>
+#include <svx/xbtmpit.hxx>
+#include <svx/xflgrit.hxx>
+#include <svx/xflhtit.hxx>
+#include <svx/xlndsit.hxx>
+#include <svdglob.hxx>
+#include <svx/unomaster.hxx>
 #include <editeng/outlobj.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
@@ -88,8 +88,8 @@
 #include "shapeimpl.hxx"
 #include <sal/log.hxx>
 
-#include "svx/lathe3d.hxx"
-#include "svx/extrud3d.hxx"
+#include <svx/lathe3d.hxx>
+#include <svx/extrud3d.hxx>
 
 #include <vcl/wmf.hxx>
 
@@ -97,7 +97,7 @@
 #include <vector>
 #include <iostream>
 
-#include "bitmaps.hlst"
+#include <bitmaps.hlst>
 
 using namespace ::osl;
 using namespace ::cppu;
diff --git a/svx/source/unodraw/unoshtxt.cxx b/svx/source/unodraw/unoshtxt.cxx
index 21a46709095f..e16e823d2448 100644
--- a/svx/source/unodraw/unoshtxt.cxx
+++ b/svx/source/unodraw/unoshtxt.cxx
@@ -47,7 +47,7 @@
 #include <com/sun/star/linguistic2/LinguServiceManager.hpp>
 #include <comphelper/processfactory.hxx>
 #include <svx/svdotable.hxx>
-#include "cell.hxx"
+#include <cell.hxx>
 #include <svx/sdrpaintwindow.hxx>
 
 
diff --git a/svx/source/unodraw/unottabl.cxx b/svx/source/unodraw/unottabl.cxx
index 3f29ce5b39eb..149487f44f79 100644
--- a/svx/source/unodraw/unottabl.cxx
+++ b/svx/source/unodraw/unottabl.cxx
@@ -25,7 +25,7 @@
 
 #include <svx/svdmodel.hxx>
 #include <svx/xflhtit.hxx>
-#include "svx/unofill.hxx"
+#include <svx/unofill.hxx>
 #include <svx/unomid.hxx>
 #include "UnoNameItemTable.hxx"
 
diff --git a/svx/source/unogallery/unogalitem.cxx b/svx/source/unogallery/unogalitem.cxx
index ea8543a839a8..ebc113b56441 100644
--- a/svx/source/unogallery/unogalitem.cxx
+++ b/svx/source/unogallery/unogalitem.cxx
@@ -20,8 +20,8 @@
 
 #include "unogalitem.hxx"
 #include "unogaltheme.hxx"
-#include "svx/galtheme.hxx"
-#include "svx/galmisc.hxx"
+#include <svx/galtheme.hxx>
+#include <svx/galmisc.hxx>
 #include <svx/fmmodel.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/graph.hxx>
@@ -29,7 +29,7 @@
 #include <svl/itempool.hxx>
 #include <comphelper/servicehelper.hxx>
 #include <cppuhelper/supportsservice.hxx>
-#include "galobj.hxx"
+#include <galobj.hxx>
 
 #include <com/sun/star/beans/PropertyState.hpp>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
diff --git a/svx/source/unogallery/unogaltheme.cxx b/svx/source/unogallery/unogaltheme.cxx
index 43b31ddfa98a..713f6d7f826a 100644
--- a/svx/source/unogallery/unogaltheme.cxx
+++ b/svx/source/unogallery/unogaltheme.cxx
@@ -21,9 +21,9 @@
 
 #include "unogaltheme.hxx"
 #include "unogalitem.hxx"
-#include "svx/galtheme.hxx"
-#include "svx/gallery1.hxx"
-#include "svx/galmisc.hxx"
+#include <svx/galtheme.hxx>
+#include <svx/gallery1.hxx>
+#include <svx/galmisc.hxx>
 #include <svx/fmmodel.hxx>
 #include <svx/svdpage.hxx>
 #include <svx/unopage.hxx>
diff --git a/svx/source/unogallery/unogalthemeprovider.cxx b/svx/source/unogallery/unogalthemeprovider.cxx
index c497a86d830e..229229b56f0c 100644
--- a/svx/source/unogallery/unogalthemeprovider.cxx
+++ b/svx/source/unogallery/unogalthemeprovider.cxx
@@ -20,7 +20,7 @@
 #include <sal/config.h>
 
 #include "unogaltheme.hxx"
-#include "svx/gallery1.hxx"
+#include <svx/gallery1.hxx>
 #include <rtl/ref.hxx>
 #include <vcl/svapp.hxx>
 #include <unotools/pathoptions.hxx>
diff --git a/svx/source/xml/xmleohlp.cxx b/svx/source/xml/xmleohlp.cxx
index ed3babc126a7..e53823b47fda 100644
--- a/svx/source/xml/xmleohlp.cxx
+++ b/svx/source/xml/xmleohlp.cxx
@@ -43,7 +43,7 @@
 
 #include <comphelper/classids.hxx>
 #include <cppuhelper/implbase.hxx>
-#include "svx/xmleohlp.hxx"
+#include <svx/xmleohlp.hxx>
 #include <map>
 #include <memory>
 
diff --git a/svx/source/xml/xmlgrhlp.cxx b/svx/source/xml/xmlgrhlp.cxx
index 171138e98050..3f1d67e38b0c 100644
--- a/svx/source/xml/xmlgrhlp.cxx
+++ b/svx/source/xml/xmlgrhlp.cxx
@@ -42,8 +42,8 @@
 #include <tools/zcodec.hxx>
 
 #include <vcl/graphicfilter.hxx>
-#include "svx/xmlgrhlp.hxx"
-#include "svx/xmleohlp.hxx"
+#include <svx/xmlgrhlp.hxx>
+#include <svx/xmleohlp.hxx>
 
 #include <algorithm>
 #include <memory>
diff --git a/svx/source/xml/xmlxtexp.cxx b/svx/source/xml/xmlxtexp.cxx
index 645cc47ef175..8162ff851112 100644
--- a/svx/source/xml/xmlxtexp.cxx
+++ b/svx/source/xml/xmlxtexp.cxx
@@ -31,22 +31,22 @@
 #include <sax/tools/converter.hxx>
 #include <sfx2/docfile.hxx>
 #include <rtl/ustrbuf.hxx>
-#include "xmloff/xmlnmspe.hxx"
-#include "xmloff/nmspmap.hxx"
-
-#include "xmloff/xmltoken.hxx"
-#include "xmloff/xmlmetae.hxx"
-#include "xmloff/DashStyle.hxx"
-#include "xmloff/GradientStyle.hxx"
-#include "xmloff/HatchStyle.hxx"
-#include "xmloff/ImageStyle.hxx"
-#include "xmloff/MarkerStyle.hxx"
+#include <xmloff/xmlnmspe.hxx>
+#include <xmloff/nmspmap.hxx>
+
+#include <xmloff/xmltoken.hxx>
+#include <xmloff/xmlmetae.hxx>
+#include <xmloff/DashStyle.hxx>
+#include <xmloff/GradientStyle.hxx>
+#include <xmloff/HatchStyle.hxx>
+#include <xmloff/ImageStyle.hxx>
+#include <xmloff/MarkerStyle.hxx>
 #include <com/sun/star/embed/XTransactedObject.hpp>
 #include <comphelper/processfactory.hxx>
 #include <unotools/streamwrap.hxx>
-#include "svx/xmlgrhlp.hxx"
+#include <svx/xmlgrhlp.hxx>
 
-#include "xmlxtexp.hxx"
+#include <xmlxtexp.hxx>
 
 #include <comphelper/storagehelper.hxx>
 #include <memory>
diff --git a/svx/source/xml/xmlxtimp.cxx b/svx/source/xml/xmlxtimp.cxx
index 937c544a085c..ade13897ecf2 100644
--- a/svx/source/xml/xmlxtimp.cxx
+++ b/svx/source/xml/xmlxtimp.cxx
@@ -37,21 +37,21 @@
 #include <rtl/ustrbuf.hxx>
 #include <sax/tools/converter.hxx>
 #include <sfx2/docfile.hxx>
-#include "xmloff/xmlnmspe.hxx"
-#include "xmloff/nmspmap.hxx"
-
-#include "xmloff/xmltoken.hxx"
-#include "xmloff/xmlmetae.hxx"
-#include "xmloff/DashStyle.hxx"
-#include "xmloff/GradientStyle.hxx"
-#include "xmloff/HatchStyle.hxx"
-#include "xmloff/ImageStyle.hxx"
-#include "xmloff/MarkerStyle.hxx"
+#include <xmloff/xmlnmspe.hxx>
+#include <xmloff/nmspmap.hxx>
+
+#include <xmloff/xmltoken.hxx>
+#include <xmloff/xmlmetae.hxx>
+#include <xmloff/DashStyle.hxx>
+#include <xmloff/GradientStyle.hxx>
+#include <xmloff/HatchStyle.hxx>
+#include <xmloff/ImageStyle.hxx>
+#include <xmloff/MarkerStyle.hxx>
 #include <xmloff/xmlictxt.hxx>
-#include "svx/xmlgrhlp.hxx"
-#include "xmloff/attrlist.hxx"
+#include <svx/xmlgrhlp.hxx>
+#include <xmloff/attrlist.hxx>
 
-#include "xmlxtimp.hxx"
+#include <xmlxtimp.hxx>
 
 #include <cstdio>
 
diff --git a/svx/source/xoutdev/_xoutbmp.cxx b/svx/source/xoutdev/_xoutbmp.cxx
index 294da818f420..60f809d566fe 100644
--- a/svx/source/xoutdev/_xoutbmp.cxx
+++ b/svx/source/xoutdev/_xoutbmp.cxx
@@ -26,7 +26,7 @@
 #include <svl/solar.hrc>
 #include <sfx2/docfile.hxx>
 #include <sfx2/app.hxx>
-#include "svx/xoutbmp.hxx"
+#include <svx/xoutbmp.hxx>
 #include <vcl/dibtools.hxx>
 #include <vcl/FilterConfigItem.hxx>
 #include <vcl/graphicfilter.hxx>
diff --git a/svx/source/xoutdev/_xpoly.cxx b/svx/source/xoutdev/_xpoly.cxx
index 52f08a13ca05..e8ea3ee0392a 100644
--- a/svx/source/xoutdev/_xpoly.cxx
+++ b/svx/source/xoutdev/_xpoly.cxx
@@ -25,7 +25,7 @@
 #include <tools/gen.hxx>
 
 #include <svx/xpoly.hxx>
-#include "xpolyimp.hxx"
+#include <xpolyimp.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <basegfx/point/b2dpoint.hxx>
 #include <basegfx/vector/b2dvector.hxx>
diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx
index b360aded371b..895a7d06d422 100644
--- a/svx/source/xoutdev/xattr.cxx
+++ b/svx/source/xoutdev/xattr.cxx
@@ -39,13 +39,13 @@
 #include <tools/stream.hxx>
 #include <tools/mapunit.hxx>
 
-#include "svx/unoapi.hxx"
+#include <svx/unoapi.hxx>
 #include <svl/style.hxx>
 
 #include <tools/bigint.hxx>
 #include <svl/itemset.hxx>
 #include <svx/strings.hrc>
-#include "svx/xattr.hxx"
+#include <svx/xattr.hxx>
 #include <svx/xtable.hxx>
 #include <svx/dialmgr.hxx>
 #include <editeng/itemtype.hxx>
diff --git a/svx/source/xoutdev/xattr2.cxx b/svx/source/xoutdev/xattr2.cxx
index 5bfb97c0b831..3a1fd0404a0c 100644
--- a/svx/source/xoutdev/xattr2.cxx
+++ b/svx/source/xoutdev/xattr2.cxx
@@ -24,7 +24,7 @@
 #include <i18nutil/unicode.hxx>
 #include <svx/strings.hrc>
 #include <svx/svxids.hrc>
-#include "svx/xattr.hxx"
+#include <svx/xattr.hxx>
 #include <svx/xtable.hxx>
 #include <svx/dialmgr.hxx>
 #include <editeng/itemtype.hxx>
diff --git a/svx/source/xoutdev/xattrbmp.cxx b/svx/source/xoutdev/xattrbmp.cxx
index 0c02ff92896a..fad22b1c546d 100644
--- a/svx/source/xoutdev/xattrbmp.cxx
+++ b/svx/source/xoutdev/xattrbmp.cxx
@@ -27,7 +27,7 @@
 #include <svl/style.hxx>
 #include <editeng/memberids.h>
 #include <svx/strings.hrc>
-#include "svx/xattr.hxx"
+#include <svx/xattr.hxx>
 #include <svx/xtable.hxx>
 #include <svx/xdef.hxx>
 #include <svx/unomid.hxx>
diff --git a/svx/source/xoutdev/xexch.cxx b/svx/source/xoutdev/xexch.cxx
index 73145abe31cc..478ffa394b47 100644
--- a/svx/source/xoutdev/xexch.cxx
+++ b/svx/source/xoutdev/xexch.cxx
@@ -29,7 +29,7 @@
 #include <svl/whiter.hxx>
 #include <svl/itemset.hxx>
 #include <svx/xdef.hxx>
-#include "svx/xexch.hxx"
+#include <svx/xexch.hxx>
 #include <memory>
 #include <utility>
 
diff --git a/svx/source/xoutdev/xtabbtmp.cxx b/svx/source/xoutdev/xtabbtmp.cxx
index 735009e07e48..ac84810ae467 100644
--- a/svx/source/xoutdev/xtabbtmp.cxx
+++ b/svx/source/xoutdev/xtabbtmp.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "svx/XPropertyTable.hxx"
+#include <svx/XPropertyTable.hxx>
 
 #include <vcl/virdev.hxx>
 #include <svl/itemset.hxx>
diff --git a/svx/source/xoutdev/xtabcolr.cxx b/svx/source/xoutdev/xtabcolr.cxx
index e1c001dab4de..04376c564dff 100644
--- a/svx/source/xoutdev/xtabcolr.cxx
+++ b/svx/source/xoutdev/xtabcolr.cxx
@@ -18,7 +18,7 @@
  */
 
 #include <memory>
-#include "svx/XPropertyTable.hxx"
+#include <svx/XPropertyTable.hxx>
 #include <unotools/pathoptions.hxx>
 
 #include <svx/strings.hrc>
diff --git a/svx/source/xoutdev/xtabdash.cxx b/svx/source/xoutdev/xtabdash.cxx
index eaa36a6cae82..815f0b1105f5 100644
--- a/svx/source/xoutdev/xtabdash.cxx
+++ b/svx/source/xoutdev/xtabdash.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "svx/XPropertyTable.hxx"
+#include <svx/XPropertyTable.hxx>
 
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
diff --git a/svx/source/xoutdev/xtabgrdt.cxx b/svx/source/xoutdev/xtabgrdt.cxx
index d690976c69d5..f8257a6bfbcf 100644
--- a/svx/source/xoutdev/xtabgrdt.cxx
+++ b/svx/source/xoutdev/xtabgrdt.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "svx/XPropertyTable.hxx"
+#include <svx/XPropertyTable.hxx>
 
 #include <vcl/virdev.hxx>
 #include <svx/strings.hrc>
diff --git a/svx/source/xoutdev/xtabhtch.cxx b/svx/source/xoutdev/xtabhtch.cxx
index d7799ac88fdd..97dd8fd76ee9 100644
--- a/svx/source/xoutdev/xtabhtch.cxx
+++ b/svx/source/xoutdev/xtabhtch.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "svx/XPropertyTable.hxx"
+#include <svx/XPropertyTable.hxx>
 #include <vcl/svapp.hxx>
 
 #include <vcl/virdev.hxx>
diff --git a/svx/source/xoutdev/xtable.cxx b/svx/source/xoutdev/xtable.cxx
index 6bb2105988c3..7d0f1c149d28 100644
--- a/svx/source/xoutdev/xtable.cxx
+++ b/svx/source/xoutdev/xtable.cxx
@@ -19,8 +19,8 @@
 
 #include <memory>
 #include <svx/XPropertyTable.hxx>
-#include "xmlxtexp.hxx"
-#include "xmlxtimp.hxx"
+#include <xmlxtexp.hxx>
+#include <xmlxtimp.hxx>
 #include <tools/urlobj.hxx>
 #include <svx/xtable.hxx>
 #include <svx/xpool.hxx>
diff --git a/svx/source/xoutdev/xtablend.cxx b/svx/source/xoutdev/xtablend.cxx
index d90e37c492ac..0cf7502ba55d 100644
--- a/svx/source/xoutdev/xtablend.cxx
+++ b/svx/source/xoutdev/xtablend.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "svx/XPropertyTable.hxx"
+#include <svx/XPropertyTable.hxx>
 #include <vcl/virdev.hxx>
 
 #include <vcl/svapp.hxx>
diff --git a/svx/source/xoutdev/xtabptrn.cxx b/svx/source/xoutdev/xtabptrn.cxx
index 5fcc3afebef0..9dd126dd3126 100644
--- a/svx/source/xoutdev/xtabptrn.cxx
+++ b/svx/source/xoutdev/xtabptrn.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "svx/XPropertyTable.hxx"
+#include <svx/XPropertyTable.hxx>
 
 #include <vcl/virdev.hxx>
 #include <svl/itemset.hxx>
author	Stephan Bergmann <sbergman@redhat.com>	2017-10-23 22:30:42 +0200
committer	Stephan Bergmann <sbergman@redhat.com>	2017-10-23 22:45:50 +0200
commit	97059fbd09fedce0ff830599f8df5f41d42336f2 (patch)
tree	26d42a7daca4b104dde5f527e64dfc67ed49d401 /svx
parent	62f47bb2a54536d6e1cf14b16d2e3b963ba651a6 (diff)